From 774b9ae12d43542caeafdfd181fdf4dbe44c21c0 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sat, 19 Dec 2020 00:49:36 -0600
Subject: [PATCH 001/412] Added thumbnail task and database table

---
 .gitignore             |   1 +
 cps.py                 |   4 ++
 cps/constants.py       |   1 +
 cps/helper.py          |   9 ++-
 cps/tasks/thumbnail.py | 154 +++++++++++++++++++++++++++++++++++++++++
 cps/thumbnails.py      |  63 +++++++++++++++++
 cps/ub.py              |  36 +++++++++-
 7 files changed, 264 insertions(+), 4 deletions(-)
 create mode 100644 cps/tasks/thumbnail.py
 create mode 100644 cps/thumbnails.py

diff --git a/.gitignore b/.gitignore
index f06dcd446..cef580949 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ vendor/
 # calibre-web
 *.db
 *.log
+cps/cache
 
 .idea/
 *.bak
diff --git a/cps.py b/cps.py
index 50ab00763..e90a38d9c 100755
--- a/cps.py
+++ b/cps.py
@@ -43,6 +43,7 @@ from cps.gdrive import gdrive
 from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.error_handler import init_errorhandler
+from cps.thumbnails import generate_thumbnails
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -78,6 +79,9 @@ def main():
         app.register_blueprint(kobo_auth)
     if oauth_available:
         app.register_blueprint(oauth)
+
+    generate_thumbnails()
+
     success = web_server.start()
     sys.exit(0 if success else 1)
 
diff --git a/cps/constants.py b/cps/constants.py
index c1bcbe592..0a9f9cd59 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -33,6 +33,7 @@ else:
 STATIC_DIR          = os.path.join(BASE_DIR, 'cps', 'static')
 TEMPLATES_DIR       = os.path.join(BASE_DIR, 'cps', 'templates')
 TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
+CACHE_DIR           = os.path.join(BASE_DIR, 'cps', 'cache')
 
 if HOME_CONFIG:
     home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
diff --git a/cps/helper.py b/cps/helper.py
index da5ea2b32..6fc6b02a4 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -551,6 +551,11 @@ def get_book_cover_with_uuid(book_uuid,
 
 def get_book_cover_internal(book, use_generic_cover_on_failure):
     if book and book.has_cover:
+        # if thumbnails.cover_thumbnail_exists_for_book(book):
+        #     thumbnail = ub.session.query(ub.Thumbnail).filter(ub.Thumbnail.book_id == book.id).first()
+        #     return send_from_directory(thumbnails.get_thumbnail_cache_dir(), thumbnail.filename)
+        # else:
+            # WorkerThread.add(None, TaskThumbnail(book, _(u'Generating cover thumbnail for: ' + book.title)))
         if config.config_use_google_drive:
             try:
                 if not gd.is_gdrive_ready():
@@ -561,8 +566,8 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
                 else:
                     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.debug_or_exception(e)
+            except Exception as ex:
+                log.debug_or_exception(ex)
                 return get_cover_on_failure(use_generic_cover_on_failure)
         else:
             cover_file_path = os.path.join(config.config_calibre_dir, book.path)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
new file mode 100644
index 000000000..c452ab41c
--- /dev/null
+++ b/cps/tasks/thumbnail.py
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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 os
+
+from cps import config, db, gdriveutils, logger, ub
+from cps.constants import CACHE_DIR as _CACHE_DIR
+from cps.services.worker import CalibreTask
+from datetime import datetime, timedelta
+from sqlalchemy import func
+
+try:
+    from wand.image import Image
+    use_IM = True
+except (ImportError, RuntimeError) as e:
+    use_IM = False
+
+THUMBNAIL_RESOLUTION_1X = 1.0
+THUMBNAIL_RESOLUTION_2X = 2.0
+
+
+class TaskThumbnail(CalibreTask):
+    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
+        super(TaskThumbnail, self).__init__(task_message)
+        self.limit = limit
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.worker_db = db.CalibreDB(expire_on_commit=False)
+
+    def run(self, worker_thread):
+        if self.worker_db.session and use_IM:
+            thumbnails = self.get_thumbnail_book_ids()
+            thumbnail_book_ids = list(map(lambda t: t.book_id, thumbnails))
+            self.log.info(','.join([str(elem) for elem in thumbnail_book_ids]))
+            self.log.info(len(thumbnail_book_ids))
+
+            books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
+
+            count = len(books_without_thumbnails)
+            for i, book in enumerate(books_without_thumbnails):
+                thumbnails = self.get_thumbnails_for_book(thumbnails, book)
+                if thumbnails:
+                    for thumbnail in thumbnails:
+                        self.update_book_thumbnail(book, thumbnail)
+
+                else:
+                    self.create_book_thumbnail(book, THUMBNAIL_RESOLUTION_1X)
+                    self.create_book_thumbnail(book, THUMBNAIL_RESOLUTION_2X)
+
+                self.progress = (1.0 / count) * i
+
+        self._handleSuccess()
+        self.app_db_session.close()
+
+    def get_thumbnail_book_ids(self):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .group_by(ub.Thumbnail.book_id)\
+            .having(func.min(ub.Thumbnail.expiration) > datetime.utcnow())\
+            .all()
+
+    def get_books_without_thumbnails(self, thumbnail_book_ids):
+        return self.worker_db.session\
+            .query(db.Books)\
+            .filter(db.Books.has_cover == 1)\
+            .filter(db.Books.id.notin_(thumbnail_book_ids))\
+            .limit(self.limit)\
+            .all()
+
+    def get_thumbnails_for_book(self, thumbnails, book):
+        results = list()
+        for thumbnail in thumbnails:
+            if thumbnail.book_id == book.id:
+                results.append(thumbnail)
+
+        return results
+
+    def update_book_thumbnail(self, book, thumbnail):
+        thumbnail.expiration = datetime.utcnow() + timedelta(days=30)
+
+        try:
+            self.app_db_session.commit()
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def create_book_thumbnail(self, book, resolution):
+        thumbnail = ub.Thumbnail()
+        thumbnail.book_id = book.id
+        thumbnail.resolution = resolution
+
+        self.app_db_session.add(thumbnail)
+        try:
+            self.app_db_session.commit()
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def generate_book_thumbnail(self, book, thumbnail):
+        if book and thumbnail:
+            if config.config_use_google_drive:
+                self.log.info('google drive thumbnail')
+            else:
+                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                if os.path.isfile(book_cover_filepath):
+                    with Image(filename=book_cover_filepath) as img:
+                        height = self.get_thumbnail_height(thumbnail)
+                        if img.height > height:
+                            width = self.get_thumbnail_width(height, img)
+                            img.resize(width=width, height=height, filter='lanczos')
+                            img.save(filename=self.get_thumbnail_cache_path(thumbnail))
+
+    def get_thumbnail_height(self, thumbnail):
+        return int(225 * thumbnail.resolution)
+
+    def get_thumbnail_width(self, height, img):
+        percent = (height / float(img.height))
+        return int((float(img.width) * float(percent)))
+
+    def get_thumbnail_cache_dir(self):
+        if not os.path.isdir(_CACHE_DIR):
+            os.makedirs(_CACHE_DIR)
+
+        if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
+            os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
+
+        return os.path.join(_CACHE_DIR, 'thumbnails')
+
+    def get_thumbnail_cache_path(self, thumbnail):
+        if thumbnail:
+            return os.path.join(self.get_thumbnail_cache_dir(), thumbnail.filename)
+        return None
+
+    @property
+    def name(self):
+        return "Thumbnail"
diff --git a/cps/thumbnails.py b/cps/thumbnails.py
new file mode 100644
index 000000000..6ccff56f6
--- /dev/null
+++ b/cps/thumbnails.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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 os
+
+from . import logger, ub
+from .constants import CACHE_DIR as _CACHE_DIR
+from .services.worker import WorkerThread
+from .tasks.thumbnail import TaskThumbnail
+
+from datetime import datetime
+
+THUMBNAIL_RESOLUTION_1X = 1.0
+THUMBNAIL_RESOLUTION_2X = 2.0
+
+log = logger.create()
+
+
+def get_thumbnail_cache_dir():
+    if not os.path.isdir(_CACHE_DIR):
+        os.makedirs(_CACHE_DIR)
+
+    if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
+        os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
+
+    return os.path.join(_CACHE_DIR, 'thumbnails')
+
+
+def get_thumbnail_cache_path(thumbnail):
+    if thumbnail:
+        return os.path.join(get_thumbnail_cache_dir(), thumbnail.filename)
+
+    return None
+
+
+def cover_thumbnail_exists_for_book(book):
+    if book and book.has_cover:
+        thumbnail = ub.session.query(ub.Thumbnail).filter(ub.Thumbnail.book_id == book.id).first()
+        if thumbnail and thumbnail.expiration > datetime.utcnow():
+            thumbnail_path = get_thumbnail_cache_path(thumbnail)
+            return thumbnail_path and os.path.isfile(thumbnail_path)
+
+    return False
+
+
+def generate_thumbnails():
+    WorkerThread.add(None, TaskThumbnail())
diff --git a/cps/ub.py b/cps/ub.py
index dbc3b4190..4500160f2 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -40,13 +40,14 @@ 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, JSON
+from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON, Numeric
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.orm import backref, relationship, sessionmaker, Session, scoped_session
 from werkzeug.security import generate_password_hash
 
-from . import constants
+from . import cli, constants
 
 
 session = None
@@ -434,6 +435,28 @@ class RemoteAuthToken(Base):
         return '<Token %r>' % self.id
 
 
+class Thumbnail(Base):
+    __tablename__ = 'thumbnail'
+
+    id = Column(Integer, primary_key=True)
+    book_id = Column(Integer)
+    uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
+    format = Column(String, default='jpeg')
+    resolution = Column(Numeric(precision=2, scale=1, asdecimal=False), default=1.0)
+    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
+
+    @hybrid_property
+    def extension(self):
+        if self.format == 'jpeg':
+            return 'jpg'
+        else:
+            return self.format
+
+    @hybrid_property
+    def filename(self):
+        return self.uuid + '.' + self.extension
+
+
 # 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
@@ -451,6 +474,8 @@ def migrate_Database(session):
         KoboStatistics.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "archived_book"):
         ArchivedBook.__table__.create(bind=engine)
+    if not engine.dialect.has_table(engine.connect(), "thumbnail"):
+        Thumbnail.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "registration"):
         ReadBook.__table__.create(bind=engine)
         with engine.connect() as conn:
@@ -676,6 +701,13 @@ def init_db(app_db_path):
         create_anonymous_user(session)
 
 
+def get_new_session_instance():
+    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settingspath), echo=False)
+    new_session = scoped_session(sessionmaker())
+    new_session.configure(bind=new_engine)
+    return new_session
+
+
 def dispose():
     global session
 

From 21fce9a5b5b004c1fcf16aa74e96d27f7e4bde0f Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sat, 19 Dec 2020 02:58:40 -0600
Subject: [PATCH 002/412] Added background scheduler and scheduled thumbnail
 generation job

---
 cps.py                               |  4 ---
 cps/__init__.py                      |  9 ++++-
 cps/services/background_scheduler.py | 52 ++++++++++++++++++++++++++++
 cps/tasks/thumbnail.py               | 12 +++----
 cps/thumbnails.py                    |  4 ---
 requirements.txt                     |  1 +
 6 files changed, 66 insertions(+), 16 deletions(-)
 create mode 100644 cps/services/background_scheduler.py

diff --git a/cps.py b/cps.py
index e90a38d9c..50ab00763 100755
--- a/cps.py
+++ b/cps.py
@@ -43,7 +43,6 @@ from cps.gdrive import gdrive
 from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.error_handler import init_errorhandler
-from cps.thumbnails import generate_thumbnails
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -79,9 +78,6 @@ def main():
         app.register_blueprint(kobo_auth)
     if oauth_available:
         app.register_blueprint(oauth)
-
-    generate_thumbnails()
-
     success = web_server.start()
     sys.exit(0 if success else 1)
 
diff --git a/cps/__init__.py b/cps/__init__.py
index 1a7dc8683..fa85e15c5 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -36,6 +36,8 @@ from flask_principal import Principal
 from . import config_sql, logger, cache_buster, cli, ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
+from .services.background_scheduler import BackgroundScheduler
+from .tasks.thumbnail import TaskThumbnail
 
 
 mimetypes.init()
@@ -95,7 +97,7 @@ def create_app():
         app.instance_path = app.instance_path.decode('utf-8')
 
     if os.environ.get('FLASK_DEBUG'):
-    	cache_buster.init_cache_busting(app)
+        cache_buster.init_cache_busting(app)
 
     log.info('Starting Calibre Web...')
     Principal(app)
@@ -115,8 +117,13 @@ def create_app():
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
 
+    scheduler = BackgroundScheduler()
+    # Generate 100 book cover thumbnails every 5 minutes
+    scheduler.add_task(user=None, task=lambda: TaskThumbnail(config=config, limit=100), trigger='interval', minutes=5)
+
     return app
 
+
 @babel.localeselector
 def get_locale():
     # if a user is logged in, use the locale from the user settings
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
new file mode 100644
index 000000000..efa573799
--- /dev/null
+++ b/cps/services/background_scheduler.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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 atexit
+
+from .. import logger
+from .worker import WorkerThread
+from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+
+
+class BackgroundScheduler:
+    _instance = None
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(BackgroundScheduler, cls).__new__(cls)
+
+            scheduler = BScheduler()
+            atexit.register(lambda: scheduler.shutdown())
+
+            cls.log = logger.create()
+            cls.scheduler = scheduler
+            cls.scheduler.start()
+
+        return cls._instance
+
+    def add(self, func, trigger, **trigger_args):
+        self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+
+    def add_task(self, user, task, trigger, **trigger_args):
+        def scheduled_task():
+            worker_task = task()
+            self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
+            WorkerThread.add(user, worker_task)
+
+        self.add(func=scheduled_task, trigger=trigger, **trigger_args)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index c452ab41c..378b688e0 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -19,7 +19,7 @@
 from __future__ import division, print_function, unicode_literals
 import os
 
-from cps import config, db, gdriveutils, logger, ub
+from cps import db, logger, ub
 from cps.constants import CACHE_DIR as _CACHE_DIR
 from cps.services.worker import CalibreTask
 from datetime import datetime, timedelta
@@ -36,8 +36,9 @@ THUMBNAIL_RESOLUTION_2X = 2.0
 
 
 class TaskThumbnail(CalibreTask):
-    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
+    def __init__(self, config, limit=100, task_message=u'Generating cover thumbnails'):
         super(TaskThumbnail, self).__init__(task_message)
+        self.config = config
         self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -47,9 +48,6 @@ class TaskThumbnail(CalibreTask):
         if self.worker_db.session and use_IM:
             thumbnails = self.get_thumbnail_book_ids()
             thumbnail_book_ids = list(map(lambda t: t.book_id, thumbnails))
-            self.log.info(','.join([str(elem) for elem in thumbnail_book_ids]))
-            self.log.info(len(thumbnail_book_ids))
-
             books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
 
             count = len(books_without_thumbnails)
@@ -116,10 +114,10 @@ class TaskThumbnail(CalibreTask):
 
     def generate_book_thumbnail(self, book, thumbnail):
         if book and thumbnail:
-            if config.config_use_google_drive:
+            if self.config.config_use_google_drive:
                 self.log.info('google drive thumbnail')
             else:
-                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                book_cover_filepath = os.path.join(self.config.config_calibre_dir, book.path, 'cover.jpg')
                 if os.path.isfile(book_cover_filepath):
                     with Image(filename=book_cover_filepath) as img:
                         height = self.get_thumbnail_height(thumbnail)
diff --git a/cps/thumbnails.py b/cps/thumbnails.py
index 6ccff56f6..89e68f505 100644
--- a/cps/thumbnails.py
+++ b/cps/thumbnails.py
@@ -57,7 +57,3 @@ def cover_thumbnail_exists_for_book(book):
             return thumbnail_path and os.path.isfile(thumbnail_path)
 
     return False
-
-
-def generate_thumbnails():
-    WorkerThread.add(None, TaskThumbnail())
diff --git a/requirements.txt b/requirements.txt
index f154dd5b9..9d0a86541 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+APScheduler==3.6.3
 Babel>=1.3, <2.9
 Flask-Babel>=0.11.1,<2.1.0
 Flask-Login>=0.3.2,<0.5.1

From e48bdf9d5a038d169046c0e5352d3c9d074769c6 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sun, 20 Dec 2020 03:11:21 -0600
Subject: [PATCH 003/412] Display thumbnails on the frontend, generate
 thumbnails from google drive

---
 cps.py                        |  5 ++++
 cps/__init__.py               |  6 -----
 cps/helper.py                 | 37 ++++++++++++++++++++---------
 cps/schedule.py               | 34 +++++++++++++++++++++++++++
 cps/tasks/thumbnail.py        | 44 +++++++++++++++++++++++++----------
 cps/templates/author.html     |  2 +-
 cps/templates/book_cover.html |  8 +++++++
 cps/templates/book_edit.html  |  4 +++-
 cps/templates/detail.html     |  3 ++-
 cps/templates/discover.html   |  3 ++-
 cps/templates/fragment.html   |  1 +
 cps/templates/grid.html       |  3 ++-
 cps/templates/index.html      |  5 ++--
 cps/templates/layout.html     |  1 +
 cps/templates/search.html     |  3 ++-
 cps/templates/shelf.html      |  3 ++-
 cps/thumbnails.py             |  9 ++-----
 cps/ub.py                     |  4 ++--
 cps/web.py                    | 11 ++++-----
 19 files changed, 133 insertions(+), 53 deletions(-)
 create mode 100644 cps/schedule.py
 create mode 100644 cps/templates/book_cover.html

diff --git a/cps.py b/cps.py
index 50ab00763..d63771eb7 100755
--- a/cps.py
+++ b/cps.py
@@ -43,6 +43,7 @@ from cps.gdrive import gdrive
 from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.error_handler import init_errorhandler
+from cps.schedule import register_jobs
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -78,6 +79,10 @@ def main():
         app.register_blueprint(kobo_auth)
     if oauth_available:
         app.register_blueprint(oauth)
+
+    # Register scheduled jobs
+    register_jobs()
+
     success = web_server.start()
     sys.exit(0 if success else 1)
 
diff --git a/cps/__init__.py b/cps/__init__.py
index fa85e15c5..6a6d361a6 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -36,8 +36,6 @@ from flask_principal import Principal
 from . import config_sql, logger, cache_buster, cli, ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
-from .services.background_scheduler import BackgroundScheduler
-from .tasks.thumbnail import TaskThumbnail
 
 
 mimetypes.init()
@@ -117,10 +115,6 @@ def create_app():
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
 
-    scheduler = BackgroundScheduler()
-    # Generate 100 book cover thumbnails every 5 minutes
-    scheduler.add_task(user=None, task=lambda: TaskThumbnail(config=config, limit=100), trigger='interval', minutes=5)
-
     return app
 
 
diff --git a/cps/helper.py b/cps/helper.py
index 6fc6b02a4..d3420a11a 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -52,7 +52,7 @@ except ImportError:
 
 from . import calibre_db
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub
+from . import logger, config, get_locale, db, thumbnails, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
@@ -538,24 +538,27 @@ def get_cover_on_failure(use_generic_cover):
         return None
 
 
-def get_book_cover(book_id):
+def get_book_cover(book_id, resolution=1):
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-    return get_book_cover_internal(book, use_generic_cover_on_failure=True)
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
 
 
-def get_book_cover_with_uuid(book_uuid,
-                             use_generic_cover_on_failure=True):
+def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
     book = calibre_db.get_book_by_uuid(book_uuid)
     return get_book_cover_internal(book, use_generic_cover_on_failure)
 
 
-def get_book_cover_internal(book, use_generic_cover_on_failure):
+def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=1, disable_thumbnail=False):
     if book and book.has_cover:
-        # if thumbnails.cover_thumbnail_exists_for_book(book):
-        #     thumbnail = ub.session.query(ub.Thumbnail).filter(ub.Thumbnail.book_id == book.id).first()
-        #     return send_from_directory(thumbnails.get_thumbnail_cache_dir(), thumbnail.filename)
-        # else:
-            # WorkerThread.add(None, TaskThumbnail(book, _(u'Generating cover thumbnail for: ' + book.title)))
+
+        # Send the book cover thumbnail if it exists in cache
+        if not disable_thumbnail:
+            thumbnail = get_book_cover_thumbnail(book, resolution)
+            if thumbnail:
+                if os.path.isfile(thumbnails.get_thumbnail_cache_path(thumbnail)):
+                    return send_from_directory(thumbnails.get_thumbnail_cache_dir(), thumbnail.filename)
+
+        # Send the book cover from Google Drive if configured
         if config.config_use_google_drive:
             try:
                 if not gd.is_gdrive_ready():
@@ -569,6 +572,8 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
             except Exception as ex:
                 log.debug_or_exception(ex)
                 return get_cover_on_failure(use_generic_cover_on_failure)
+
+        # Send the book cover from the Calibre directory
         else:
             cover_file_path = os.path.join(config.config_calibre_dir, book.path)
             if os.path.isfile(os.path.join(cover_file_path, "cover.jpg")):
@@ -579,6 +584,16 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
         return get_cover_on_failure(use_generic_cover_on_failure)
 
 
+def get_book_cover_thumbnail(book, resolution=1):
+    if book and book.has_cover:
+        return ub.session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book.id)\
+            .filter(ub.Thumbnail.resolution == resolution)\
+            .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+            .first()
+
+
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
diff --git a/cps/schedule.py b/cps/schedule.py
new file mode 100644
index 000000000..5d2c94b95
--- /dev/null
+++ b/cps/schedule.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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
+
+from . import logger
+from .services.background_scheduler import BackgroundScheduler
+from .tasks.thumbnail import TaskThumbnail
+
+log = logger.create()
+
+
+def register_jobs():
+    scheduler = BackgroundScheduler()
+
+    # Generate 100 book cover thumbnails every 5 minutes
+    scheduler.add_task(user=None, task=lambda: TaskThumbnail(limit=100), trigger='interval', minutes=5)
+
+    # TODO: validate thumbnail scheduled task
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 378b688e0..4e0c6db4c 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -19,11 +19,13 @@
 from __future__ import division, print_function, unicode_literals
 import os
 
-from cps import db, logger, ub
+from cps import config, db, gdriveutils, logger, ub
 from cps.constants import CACHE_DIR as _CACHE_DIR
 from cps.services.worker import CalibreTask
+from cps.thumbnails import THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X
 from datetime import datetime, timedelta
 from sqlalchemy import func
+from urllib.request import urlopen
 
 try:
     from wand.image import Image
@@ -31,14 +33,10 @@ try:
 except (ImportError, RuntimeError) as e:
     use_IM = False
 
-THUMBNAIL_RESOLUTION_1X = 1.0
-THUMBNAIL_RESOLUTION_2X = 2.0
-
 
 class TaskThumbnail(CalibreTask):
-    def __init__(self, config, limit=100, task_message=u'Generating cover thumbnails'):
+    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
         super(TaskThumbnail, self).__init__(task_message)
-        self.config = config
         self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -114,17 +112,39 @@ class TaskThumbnail(CalibreTask):
 
     def generate_book_thumbnail(self, book, thumbnail):
         if book and thumbnail:
-            if self.config.config_use_google_drive:
-                self.log.info('google drive thumbnail')
-            else:
-                book_cover_filepath = os.path.join(self.config.config_calibre_dir, book.path, 'cover.jpg')
-                if os.path.isfile(book_cover_filepath):
-                    with Image(filename=book_cover_filepath) as img:
+            if config.config_use_google_drive:
+                if not gdriveutils.is_gdrive_ready():
+                    raise Exception('Google Drive is configured but not ready')
+
+                web_content_link = gdriveutils.get_cover_via_gdrive(book.path)
+                if not web_content_link:
+                    raise Exception('Google Drive cover url not found')
+
+                stream = None
+                try:
+                    stream = urlopen(web_content_link)
+                    with Image(file=stream) as img:
                         height = self.get_thumbnail_height(thumbnail)
                         if img.height > height:
                             width = self.get_thumbnail_width(height, img)
                             img.resize(width=width, height=height, filter='lanczos')
                             img.save(filename=self.get_thumbnail_cache_path(thumbnail))
+                except Exception as ex:
+                    # Bubble exception to calling function
+                    raise ex
+                finally:
+                    stream.close()
+            else:
+                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                if not os.path.isfile(book_cover_filepath):
+                    raise Exception('Book cover file not found')
+
+                with Image(filename=book_cover_filepath) as img:
+                    height = self.get_thumbnail_height(thumbnail)
+                    if img.height > height:
+                        width = self.get_thumbnail_width(height, img)
+                        img.resize(width=width, height=height, filter='lanczos')
+                        img.save(filename=self.get_thumbnail_cache_path(thumbnail))
 
     def get_thumbnail_height(self, thumbnail):
         return int(225 * thumbnail.resolution)
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 7887aa4a8..24ce876a8 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -36,7 +36,7 @@
     <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) }}" />
+            {{ book_cover_image(entry.id, entry.title) }}
         </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
new file mode 100644
index 000000000..878c14a8c
--- /dev/null
+++ b/cps/templates/book_cover.html
@@ -0,0 +1,8 @@
+{% macro book_cover_image(book_id, book_title) -%}
+    <img
+        srcset="{{ url_for('web.get_cover', book_id=book_id, resolution=1) }} 1x,
+                {{ url_for('web.get_cover', book_id=book_id, resolution=2) }} 2x"
+        src="{{ url_for('web.get_cover', book_id=book_id) }}"
+        alt="{{ book_title }}"
+    />
+{%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 003b33f9c..881fa8ffb 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -1,9 +1,11 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 {% 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, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/>
+        {{ book_cover_image(book.id, 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">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 503d1dbd4..d3615563c 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,8 @@
   <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, edit=1|uuidfilter) }}" alt="{{ entry.title }}" />
+          {{ book_cover_image(entry.id, 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">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 3c858feb1..33bafbbec 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover load-more">
@@ -8,7 +9,7 @@
       <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 }}" />
+              {{ book_cover_image(entry.id, entry.title) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/fragment.html b/cps/templates/fragment.html
index 1421ea6af..901dd1931 100644
--- a/cps/templates/fragment.html
+++ b/cps/templates/fragment.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 <div class="container-fluid">
   {% block body %}{% endblock %}
 </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index ce2c05ac9..bc3ca4a2a 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <h1 class="{{page}}">{{_(title)}}</h1>
@@ -28,7 +29,7 @@
               <div class="col-sm-3 col-lg-2 col-xs-6 book sortable" {% if entry[0].sort %}data-name="{{entry[0].series[0].name}}"{% endif %} data-id="{% if entry[0].series[0].name %}{{entry[0].series[0].name}}{% endif %}">
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
-                          <img src="{{ url_for('web.get_cover', book_id=entry[0].id) }}" alt="{{ entry[0].name }}"/>
+                          {{ book_cover_image(entry[0].id, entry[0].name) }}
                           <span class="badge">{{entry.count}}</span>
                       </a>
                   </div>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 1db73c89b..c536884f3 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if g.user.show_detail_random() %}
@@ -8,7 +9,7 @@
     <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 }}" />
+              {{ book_cover_image(entry.id, entry.title) }}
           </a>
       </div>
       <div class="meta">
@@ -82,7 +83,7 @@
     <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">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/>
+              {{ book_cover_image(entry.id, entry.title) }}
           </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 3b89a7cea..5df471a92 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -1,4 +1,5 @@
 {% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal %}
+{% from 'book_cover.html' import book_cover_image %}
 <!DOCTYPE html>
 <html lang="{{ g.user.locale }}">
   <head>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index aedb6f45c..56b12154e 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -43,7 +44,7 @@
       <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 }}" />
+               {{ book_cover_image(entry.id, entry.title) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index f7e3c1aeb..7a678ea63 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -30,7 +31,7 @@
     <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 }}" />
+                {{ book_cover_image(entry.id, entry.title) }}
             </a>
       </div>
       <div class="meta">
diff --git a/cps/thumbnails.py b/cps/thumbnails.py
index 89e68f505..ea7aac866 100644
--- a/cps/thumbnails.py
+++ b/cps/thumbnails.py
@@ -21,13 +21,11 @@ import os
 
 from . import logger, ub
 from .constants import CACHE_DIR as _CACHE_DIR
-from .services.worker import WorkerThread
-from .tasks.thumbnail import TaskThumbnail
 
 from datetime import datetime
 
-THUMBNAIL_RESOLUTION_1X = 1.0
-THUMBNAIL_RESOLUTION_2X = 2.0
+THUMBNAIL_RESOLUTION_1X = 1
+THUMBNAIL_RESOLUTION_2X = 2
 
 log = logger.create()
 
@@ -35,17 +33,14 @@ log = logger.create()
 def get_thumbnail_cache_dir():
     if not os.path.isdir(_CACHE_DIR):
         os.makedirs(_CACHE_DIR)
-
     if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
         os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
-
     return os.path.join(_CACHE_DIR, 'thumbnails')
 
 
 def get_thumbnail_cache_path(thumbnail):
     if thumbnail:
         return os.path.join(get_thumbnail_cache_dir(), thumbnail.filename)
-
     return None
 
 
diff --git a/cps/ub.py b/cps/ub.py
index 4500160f2..0b5a65e77 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -40,7 +40,7 @@ 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, JSON, Numeric
+from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm.attributes import flag_modified
@@ -442,7 +442,7 @@ class Thumbnail(Base):
     book_id = Column(Integer)
     uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
     format = Column(String, default='jpeg')
-    resolution = Column(Numeric(precision=2, scale=1, asdecimal=False), default=1.0)
+    resolution = Column(SmallInteger, default=1)
     expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
 
     @hybrid_property
diff --git a/cps/web.py b/cps/web.py
index 4baf82cbd..27a5849b1 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1171,14 +1171,17 @@ def advanced_search_form():
 
 
 @web.route("/cover/<int:book_id>")
+@web.route("/cover/<int:book_id>/<int:resolution>")
 @login_required_if_no_ano
-def get_cover(book_id):
-    return get_book_cover(book_id)
+def get_cover(book_id, resolution=1):
+    return get_book_cover(book_id, resolution)
+
 
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")
 
+
 @web.route("/show/<int:book_id>/<book_format>", defaults={'anyname': 'None'})
 @web.route("/show/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
@@ -1205,7 +1208,6 @@ def serve_book(book_id, book_format, anyname):
         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
@@ -1387,9 +1389,6 @@ def logout():
     return redirect(url_for('web.login'))
 
 
-
-
-
 # ################################### Users own configuration #########################################################
 
 

From 541fc7e14ebe3716fce58593a2ff3f5b23403e3d Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Tue, 22 Dec 2020 17:49:21 -0600
Subject: [PATCH 004/412] fixed thumbnail generate tasks, added thumbnail
 cleanup task, added reconnect db scheduled job

---
 cps/fs.py              |  61 ++++++++++++++
 cps/helper.py          |   7 +-
 cps/schedule.py        |  18 ++++-
 cps/services/worker.py |  17 +++-
 cps/tasks/thumbnail.py | 177 +++++++++++++++++++++++++++++++----------
 cps/thumbnails.py      |  54 -------------
 cps/ub.py              |  28 ++++---
 7 files changed, 245 insertions(+), 117 deletions(-)
 create mode 100644 cps/fs.py
 delete mode 100644 cps/thumbnails.py

diff --git a/cps/fs.py b/cps/fs.py
new file mode 100644
index 000000000..699d59912
--- /dev/null
+++ b/cps/fs.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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
+from .constants import CACHE_DIR
+from os import listdir, makedirs, remove
+from os.path import isdir, isfile, join
+from shutil import rmtree
+
+CACHE_TYPE_THUMBNAILS = 'thumbnails'
+
+
+class FileSystem:
+    _instance = None
+    _cache_dir = CACHE_DIR
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(FileSystem, cls).__new__(cls)
+        return cls._instance
+
+    def get_cache_dir(self, cache_type=None):
+        if not isdir(self._cache_dir):
+            makedirs(self._cache_dir)
+
+        if cache_type and not isdir(join(self._cache_dir, cache_type)):
+            makedirs(join(self._cache_dir, cache_type))
+
+        return join(self._cache_dir, cache_type) if cache_type else self._cache_dir
+
+    def get_cache_file_path(self, filename, cache_type=None):
+        return join(self.get_cache_dir(cache_type), filename) if filename else None
+
+    def list_cache_files(self, cache_type=None):
+        path = self.get_cache_dir(cache_type)
+        return [file for file in listdir(path) if isfile(join(path, file))]
+
+    def delete_cache_dir(self, cache_type=None):
+        if not cache_type and isdir(self._cache_dir):
+            rmtree(self._cache_dir)
+        if cache_type and isdir(join(self._cache_dir, cache_type)):
+            rmtree(join(self._cache_dir, cache_type))
+
+    def delete_cache_file(self, filename, cache_type=None):
+        if isfile(join(self.get_cache_dir(cache_type), filename)):
+            remove(join(self.get_cache_dir(cache_type), filename))
diff --git a/cps/helper.py b/cps/helper.py
index d3420a11a..271ab3e96 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -52,7 +52,7 @@ except ImportError:
 
 from . import calibre_db
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, thumbnails, ub
+from . import logger, config, get_locale, db, fs, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
@@ -555,8 +555,9 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=1, di
         if not disable_thumbnail:
             thumbnail = get_book_cover_thumbnail(book, resolution)
             if thumbnail:
-                if os.path.isfile(thumbnails.get_thumbnail_cache_path(thumbnail)):
-                    return send_from_directory(thumbnails.get_thumbnail_cache_dir(), thumbnail.filename)
+                cache = fs.FileSystem()
+                if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                    return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
 
         # Send the book cover from Google Drive if configured
         if config.config_use_google_drive:
diff --git a/cps/schedule.py b/cps/schedule.py
index 5d2c94b95..5c658e412 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -18,9 +18,9 @@
 
 from __future__ import division, print_function, unicode_literals
 
-from . import logger
+from . import config, db, logger, ub
 from .services.background_scheduler import BackgroundScheduler
-from .tasks.thumbnail import TaskThumbnail
+from .tasks.thumbnail import TaskCleanupCoverThumbnailCache, TaskGenerateCoverThumbnails
 
 log = logger.create()
 
@@ -29,6 +29,16 @@ def register_jobs():
     scheduler = BackgroundScheduler()
 
     # Generate 100 book cover thumbnails every 5 minutes
-    scheduler.add_task(user=None, task=lambda: TaskThumbnail(limit=100), trigger='interval', minutes=5)
+    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='interval', minutes=5)
 
-    # TODO: validate thumbnail scheduled task
+    # Cleanup book cover cache every day at 4am
+    scheduler.add_task(user=None, task=lambda: TaskCleanupCoverThumbnailCache(), trigger='cron', hour=4)
+
+    # Reconnect metadata.db every 4 hours
+    scheduler.add(func=reconnect_db_job, trigger='interval', hours=4)
+
+
+def reconnect_db_job():
+    log.info('Running background task: reconnect to calibre database')
+    calibre_db = db.CalibreDB()
+    calibre_db.reconnect_db(config, ub.app_DB_path)
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 072674a04..2b6816db5 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -35,7 +35,6 @@ def _get_main_thread():
     raise Exception("main thread not found?!")
 
 
-
 class ImprovedQueue(queue.Queue):
     def to_list(self):
         """
@@ -45,7 +44,8 @@ class ImprovedQueue(queue.Queue):
         with self.mutex:
             return list(self.queue)
 
-#Class for all worker tasks in the background
+
+# Class for all worker tasks in the background
 class WorkerThread(threading.Thread):
     _instance = None
 
@@ -127,6 +127,10 @@ class WorkerThread(threading.Thread):
                 # CalibreTask.start() should wrap all exceptions in it's own error handling
                 item.task.start(self)
 
+            # remove self_cleanup tasks from list
+            if item.task.self_cleanup:
+                self.dequeued.remove(item)
+
             self.queue.task_done()
 
 
@@ -141,6 +145,7 @@ class CalibreTask:
         self.end_time = None
         self.message = message
         self.id = uuid.uuid4()
+        self.self_cleanup = False
 
     @abc.abstractmethod
     def run(self, worker_thread):
@@ -209,6 +214,14 @@ class CalibreTask:
         # todo: throw error if outside of [0,1]
         self._progress = x
 
+    @property
+    def self_cleanup(self):
+        return self._self_cleanup
+
+    @self_cleanup.setter
+    def self_cleanup(self, is_self_cleanup):
+        self._self_cleanup = is_self_cleanup
+
     def _handleError(self, error_message):
         self.stat = STAT_FAIL
         self.progress = 1
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 4e0c6db4c..f61eb4a78 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -19,13 +19,15 @@
 from __future__ import division, print_function, unicode_literals
 import os
 
-from cps import config, db, gdriveutils, logger, ub
-from cps.constants import CACHE_DIR as _CACHE_DIR
+from cps import config, db, fs, gdriveutils, logger, ub
 from cps.services.worker import CalibreTask
-from cps.thumbnails import THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X
 from datetime import datetime, timedelta
 from sqlalchemy import func
-from urllib.request import urlopen
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
 
 try:
     from wand.image import Image
@@ -33,73 +35,92 @@ try:
 except (ImportError, RuntimeError) as e:
     use_IM = False
 
+THUMBNAIL_RESOLUTION_1X = 1
+THUMBNAIL_RESOLUTION_2X = 2
 
-class TaskThumbnail(CalibreTask):
+
+class TaskGenerateCoverThumbnails(CalibreTask):
     def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
-        super(TaskThumbnail, self).__init__(task_message)
+        super(TaskGenerateCoverThumbnails, self).__init__(task_message)
+        self.self_cleanup = True
         self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
-        self.worker_db = db.CalibreDB(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
+        self.resolutions = [
+            THUMBNAIL_RESOLUTION_1X,
+            THUMBNAIL_RESOLUTION_2X
+        ]
 
     def run(self, worker_thread):
-        if self.worker_db.session and use_IM:
-            thumbnails = self.get_thumbnail_book_ids()
-            thumbnail_book_ids = list(map(lambda t: t.book_id, thumbnails))
+        if self.calibre_db.session and use_IM:
+            expired_thumbnails = self.get_expired_thumbnails()
+            thumbnail_book_ids = self.get_thumbnail_book_ids()
             books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
 
             count = len(books_without_thumbnails)
             for i, book in enumerate(books_without_thumbnails):
-                thumbnails = self.get_thumbnails_for_book(thumbnails, book)
-                if thumbnails:
-                    for thumbnail in thumbnails:
-                        self.update_book_thumbnail(book, thumbnail)
-
-                else:
-                    self.create_book_thumbnail(book, THUMBNAIL_RESOLUTION_1X)
-                    self.create_book_thumbnail(book, THUMBNAIL_RESOLUTION_2X)
+                for resolution in self.resolutions:
+                    expired_thumbnail = self.get_expired_thumbnail_for_book_and_resolution(
+                        book,
+                        resolution,
+                        expired_thumbnails
+                    )
+                    if expired_thumbnail:
+                        self.update_book_thumbnail(book, expired_thumbnail)
+                    else:
+                        self.create_book_thumbnail(book, resolution)
 
                 self.progress = (1.0 / count) * i
 
         self._handleSuccess()
-        self.app_db_session.close()
+        self.app_db_session.remove()
+
+    def get_expired_thumbnails(self):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.expiration < datetime.utcnow())\
+            .all()
 
     def get_thumbnail_book_ids(self):
         return self.app_db_session\
-            .query(ub.Thumbnail)\
+            .query(ub.Thumbnail.book_id)\
             .group_by(ub.Thumbnail.book_id)\
             .having(func.min(ub.Thumbnail.expiration) > datetime.utcnow())\
-            .all()
+            .distinct()
 
     def get_books_without_thumbnails(self, thumbnail_book_ids):
-        return self.worker_db.session\
+        return self.calibre_db.session\
             .query(db.Books)\
             .filter(db.Books.has_cover == 1)\
             .filter(db.Books.id.notin_(thumbnail_book_ids))\
             .limit(self.limit)\
             .all()
 
-    def get_thumbnails_for_book(self, thumbnails, book):
-        results = list()
-        for thumbnail in thumbnails:
-            if thumbnail.book_id == book.id:
-                results.append(thumbnail)
+    def get_expired_thumbnail_for_book_and_resolution(self, book, resolution, expired_thumbnails):
+        for thumbnail in expired_thumbnails:
+            if thumbnail.book_id == book.id and thumbnail.resolution == resolution:
+                return thumbnail
 
-        return results
+        return None
 
     def update_book_thumbnail(self, book, thumbnail):
+        thumbnail.generated_at = datetime.utcnow()
         thumbnail.expiration = datetime.utcnow() + timedelta(days=30)
 
         try:
             self.app_db_session.commit()
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
+            self.log.info(u'Error updating book thumbnail: ' + str(ex))
             self._handleError(u'Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def create_book_thumbnail(self, book, resolution):
         thumbnail = ub.Thumbnail()
         thumbnail.book_id = book.id
+        thumbnail.format = 'jpeg'
         thumbnail.resolution = resolution
 
         self.app_db_session.add(thumbnail)
@@ -107,6 +128,7 @@ class TaskThumbnail(CalibreTask):
             self.app_db_session.commit()
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
+            self.log.info(u'Error creating book thumbnail: ' + str(ex))
             self._handleError(u'Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -128,9 +150,12 @@ class TaskThumbnail(CalibreTask):
                         if img.height > height:
                             width = self.get_thumbnail_width(height, img)
                             img.resize(width=width, height=height, filter='lanczos')
-                            img.save(filename=self.get_thumbnail_cache_path(thumbnail))
+                            img.format = thumbnail.format
+                            filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                            img.save(filename=filename)
                 except Exception as ex:
                     # Bubble exception to calling function
+                    self.log.info(u'Error generating thumbnail file: ' + str(ex))
                     raise ex
                 finally:
                     stream.close()
@@ -144,7 +169,9 @@ class TaskThumbnail(CalibreTask):
                     if img.height > height:
                         width = self.get_thumbnail_width(height, img)
                         img.resize(width=width, height=height, filter='lanczos')
-                        img.save(filename=self.get_thumbnail_cache_path(thumbnail))
+                        img.format = thumbnail.format
+                        filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                        img.save(filename=filename)
 
     def get_thumbnail_height(self, thumbnail):
         return int(225 * thumbnail.resolution)
@@ -153,20 +180,88 @@ class TaskThumbnail(CalibreTask):
         percent = (height / float(img.height))
         return int((float(img.width) * float(percent)))
 
-    def get_thumbnail_cache_dir(self):
-        if not os.path.isdir(_CACHE_DIR):
-            os.makedirs(_CACHE_DIR)
+    @property
+    def name(self):
+        return "GenerateCoverThumbnails"
 
-        if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
-            os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
 
-        return os.path.join(_CACHE_DIR, 'thumbnails')
+class TaskCleanupCoverThumbnailCache(CalibreTask):
+    def __init__(self, task_message=u'Validating cover thumbnail cache'):
+        super(TaskCleanupCoverThumbnailCache, self).__init__(task_message)
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
 
-    def get_thumbnail_cache_path(self, thumbnail):
-        if thumbnail:
-            return os.path.join(self.get_thumbnail_cache_dir(), thumbnail.filename)
-        return None
+    def run(self, worker_thread):
+        cached_thumbnail_files = self.cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
+
+        # Expire thumbnails in the database if the cached file is missing
+        # This case will happen if a user deletes the cache dir or cached files
+        if self.app_db_session:
+            self.expire_missing_thumbnails(cached_thumbnail_files)
+            self.progress = 0.33
+
+        # Delete thumbnails in the database if the book has been removed
+        # This case will happen if a book is removed in Calibre and the metadata.db file is updated in the filesystem
+        if self.app_db_session and self.calibre_db:
+            book_ids = self.get_book_ids()
+            self.delete_thumbnails_for_missing_books(book_ids)
+            self.progress = 0.66
+
+        # Delete extraneous cached thumbnail files
+        # This case will happen if a book was deleted and the thumbnail OR the metadata.db file was changed externally
+        if self.app_db_session:
+            db_thumbnail_files = self.get_thumbnail_filenames()
+            self.delete_extraneous_thumbnail_files(cached_thumbnail_files, db_thumbnail_files)
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def expire_missing_thumbnails(self, filenames):
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.filename.notin_(filenames))\
+                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(u'Error expiring thumbnails for missing cache files: ' + str(ex))
+            self._handleError(u'Error expiring thumbnails for missing cache files: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def get_book_ids(self):
+        results = self.calibre_db.session\
+            .query(db.Books.id)\
+            .filter(db.Books.has_cover == 1)\
+            .distinct()
+
+        return [value for value, in results]
+
+    def delete_thumbnails_for_missing_books(self, book_ids):
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.book_id.notin_(book_ids))\
+                .delete(synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(str(ex))
+            self._handleError(u'Error deleting thumbnails for missing books: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def get_thumbnail_filenames(self):
+        results = self.app_db_session\
+            .query(ub.Thumbnail.filename)\
+            .all()
+
+        return [thumbnail for thumbnail, in results]
+
+    def delete_extraneous_thumbnail_files(self, cached_thumbnail_files, db_thumbnail_files):
+        extraneous_files = list(set(cached_thumbnail_files).difference(db_thumbnail_files))
+        for file in extraneous_files:
+            self.cache.delete_cache_file(file, fs.CACHE_TYPE_THUMBNAILS)
 
     @property
     def name(self):
-        return "Thumbnail"
+        return "CleanupCoverThumbnailCache"
diff --git a/cps/thumbnails.py b/cps/thumbnails.py
deleted file mode 100644
index ea7aac866..000000000
--- a/cps/thumbnails.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-#     Copyright (C) 2020 mmonkey
-#
-#   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 os
-
-from . import logger, ub
-from .constants import CACHE_DIR as _CACHE_DIR
-
-from datetime import datetime
-
-THUMBNAIL_RESOLUTION_1X = 1
-THUMBNAIL_RESOLUTION_2X = 2
-
-log = logger.create()
-
-
-def get_thumbnail_cache_dir():
-    if not os.path.isdir(_CACHE_DIR):
-        os.makedirs(_CACHE_DIR)
-    if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
-        os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
-    return os.path.join(_CACHE_DIR, 'thumbnails')
-
-
-def get_thumbnail_cache_path(thumbnail):
-    if thumbnail:
-        return os.path.join(get_thumbnail_cache_dir(), thumbnail.filename)
-    return None
-
-
-def cover_thumbnail_exists_for_book(book):
-    if book and book.has_cover:
-        thumbnail = ub.session.query(ub.Thumbnail).filter(ub.Thumbnail.book_id == book.id).first()
-        if thumbnail and thumbnail.expiration > datetime.utcnow():
-            thumbnail_path = get_thumbnail_cache_path(thumbnail)
-            return thumbnail_path and os.path.isfile(thumbnail_path)
-
-    return False
diff --git a/cps/ub.py b/cps/ub.py
index 0b5a65e77..30abd728d 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -18,6 +18,7 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import division, print_function, unicode_literals
+import atexit
 import os
 import sys
 import datetime
@@ -42,12 +43,11 @@ from sqlalchemy import create_engine, exc, exists, event
 from sqlalchemy import Column, ForeignKey
 from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.orm import backref, relationship, sessionmaker, Session, scoped_session
 from werkzeug.security import generate_password_hash
 
-from . import cli, constants
+from . import cli, constants, logger
 
 
 session = None
@@ -435,6 +435,14 @@ class RemoteAuthToken(Base):
         return '<Token %r>' % self.id
 
 
+def filename(context):
+    file_format = context.get_current_parameters()['format']
+    if file_format == 'jpeg':
+        return context.get_current_parameters()['uuid'] + '.jpg'
+    else:
+        return context.get_current_parameters()['uuid'] + '.' + file_format
+
+
 class Thumbnail(Base):
     __tablename__ = 'thumbnail'
 
@@ -443,19 +451,10 @@ class Thumbnail(Base):
     uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
     format = Column(String, default='jpeg')
     resolution = Column(SmallInteger, default=1)
+    filename = Column(String, default=filename)
+    generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
     expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
 
-    @hybrid_property
-    def extension(self):
-        if self.format == 'jpeg':
-            return 'jpg'
-        else:
-            return self.format
-
-    @hybrid_property
-    def filename(self):
-        return self.uuid + '.' + self.extension
-
 
 # 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
@@ -705,6 +704,9 @@ def get_new_session_instance():
     new_engine = create_engine(u'sqlite:///{0}'.format(cli.settingspath), echo=False)
     new_session = scoped_session(sessionmaker())
     new_session.configure(bind=new_engine)
+
+    atexit.register(lambda: new_session.remove() if new_session else True)
+
     return new_session
 
 

From 626051e4892ef42d65e16f01932ae8ce48342c22 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Wed, 23 Dec 2020 03:25:25 -0600
Subject: [PATCH 005/412] Added clear cache button to admin settings, updated
 cache busting for book cover images

---
 cps/admin.py                  | 19 +++++++-
 cps/editbooks.py              |  2 +
 cps/helper.py                 | 23 +++++++---
 cps/jinjia.py                 |  6 +++
 cps/schedule.py               | 12 +----
 cps/static/css/caliBlur.css   | 82 ++++++++++++++++++++++++++++-------
 cps/static/js/main.js         | 12 +++++
 cps/tasks/database.py         | 49 +++++++++++++++++++++
 cps/tasks/thumbnail.py        | 58 ++++++++++++++++++++++++-
 cps/templates/admin.html      | 36 +++++++++++----
 cps/templates/author.html     |  2 +-
 cps/templates/book_cover.html |  8 ++--
 cps/templates/book_edit.html  |  3 +-
 cps/templates/detail.html     |  3 +-
 cps/templates/discover.html   |  2 +-
 cps/templates/grid.html       |  2 +-
 cps/templates/index.html      |  4 +-
 cps/templates/search.html     |  2 +-
 cps/templates/shelf.html      |  2 +-
 cps/web.py                    |  8 +++-
 20 files changed, 278 insertions(+), 57 deletions(-)
 create mode 100644 cps/tasks/database.py

diff --git a/cps/admin.py b/cps/admin.py
index 8b3ca247a..dbc1b7084 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -38,7 +38,7 @@ from sqlalchemy import and_
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_
 
-from . import constants, logger, helper, services
+from . import constants, logger, helper, services, fs
 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
@@ -157,6 +157,23 @@ def shutdown():
     return json.dumps(showtext), 400
 
 
+@admi.route("/clear-cache")
+@login_required
+@admin_required
+def clear_cache():
+    cache_type = request.args.get('cache_type'.strip())
+    showtext = {}
+
+    if cache_type == fs.CACHE_TYPE_THUMBNAILS:
+        log.info('clearing cover thumbnail cache')
+        showtext['text'] = _(u'Cleared cover thumbnail cache')
+        helper.clear_cover_thumbnail_cache()
+        return json.dumps(showtext)
+
+    showtext['text'] = _(u'Unknown command')
+    return json.dumps(showtext)
+
+
 @admi.route("/admin/view")
 @login_required
 @admin_required
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 08ee93b13..6d26ebca2 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -595,6 +595,7 @@ def upload_cover(request, book):
                 abort(403)
             ret, message = helper.save_cover(requested_file, book.path)
             if ret is True:
+                helper.clear_cover_thumbnail_cache(book.id)
                 return True
             else:
                 flash(message, category="error")
@@ -684,6 +685,7 @@ def edit_book(book_id):
                         if result is True:
                             book.has_cover = 1
                             modif_date = True
+                            helper.clear_cover_thumbnail_cache(book.id)
                         else:
                             flash(error, category="error")
 
diff --git a/cps/helper.py b/cps/helper.py
index 271ab3e96..0b0c675f2 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -58,6 +58,7 @@ from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
 from .tasks.mail import TaskEmail
+from .tasks.thumbnail import TaskClearCoverThumbnailCache
 
 log = logger.create()
 
@@ -525,6 +526,7 @@ def update_dir_stucture(book_id, calibrepath, first_author=None, orignal_filepat
 
 
 def delete_book(book, calibrepath, book_format):
+    clear_cover_thumbnail_cache(book.id)
     if config.config_use_google_drive:
         return delete_book_gdrive(book, book_format)
     else:
@@ -538,9 +540,9 @@ def get_cover_on_failure(use_generic_cover):
         return None
 
 
-def get_book_cover(book_id, resolution=1):
+def get_book_cover(book_id):
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True)
 
 
 def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
@@ -548,11 +550,19 @@ def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
     return get_book_cover_internal(book, use_generic_cover_on_failure)
 
 
-def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=1, disable_thumbnail=False):
+def get_cached_book_cover(cache_id):
+    parts = cache_id.split('_')
+    book_uuid = parts[0] if len(parts) else None
+    resolution = parts[2] if len(parts) > 2 else None
+    book = calibre_db.get_book_by_uuid(book_uuid) if book_uuid else None
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
+
+
+def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
     if book and book.has_cover:
 
         # Send the book cover thumbnail if it exists in cache
-        if not disable_thumbnail:
+        if resolution:
             thumbnail = get_book_cover_thumbnail(book, resolution)
             if thumbnail:
                 cache = fs.FileSystem()
@@ -585,7 +595,7 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=1, di
         return get_cover_on_failure(use_generic_cover_on_failure)
 
 
-def get_book_cover_thumbnail(book, resolution=1):
+def get_book_cover_thumbnail(book, resolution):
     if book and book.has_cover:
         return ub.session\
             .query(ub.Thumbnail)\
@@ -846,3 +856,6 @@ def get_download_link(book_id, book_format, client):
     else:
         abort(404)
 
+
+def clear_cover_thumbnail_cache(book_id=None):
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 688d1fbad..bf81c059d 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -128,8 +128,14 @@ def formatseriesindex_filter(series_index):
             return series_index
     return 0
 
+
 @jinjia.app_template_filter('uuidfilter')
 def uuidfilter(var):
     return uuid4()
 
 
+@jinjia.app_template_filter('book_cover_cache_id')
+def book_cover_cache_id(book, resolution=None):
+    timestamp = int(book.last_modified.timestamp() * 1000)
+    cache_bust = str(book.uuid) + '_' + str(timestamp)
+    return cache_bust if not resolution else cache_bust + '_' + str(resolution)
diff --git a/cps/schedule.py b/cps/schedule.py
index 5c658e412..f349a231d 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -18,12 +18,10 @@
 
 from __future__ import division, print_function, unicode_literals
 
-from . import config, db, logger, ub
 from .services.background_scheduler import BackgroundScheduler
+from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskCleanupCoverThumbnailCache, TaskGenerateCoverThumbnails
 
-log = logger.create()
-
 
 def register_jobs():
     scheduler = BackgroundScheduler()
@@ -35,10 +33,4 @@ def register_jobs():
     scheduler.add_task(user=None, task=lambda: TaskCleanupCoverThumbnailCache(), trigger='cron', hour=4)
 
     # Reconnect metadata.db every 4 hours
-    scheduler.add(func=reconnect_db_job, trigger='interval', hours=4)
-
-
-def reconnect_db_job():
-    log.info('Running background task: reconnect to calibre database')
-    calibre_db = db.CalibreDB()
-    calibre_db.reconnect_db(config, ub.app_DB_path)
+    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='interval', hours=4)
diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index d085608d3..da5d29338 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -5167,7 +5167,7 @@ body.login > div.navbar.navbar-default.navbar-static-top > div > div.navbar-head
     pointer-events: none
 }
 
-#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
+#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #ClearCacheDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
     cursor: pointer
 }
 
@@ -5254,7 +5254,7 @@ body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > d
     margin-bottom: 20px
 }
 
-body.admin:not(.modal-open) .btn-default {
+body.admin .btn-default {
     margin-bottom: 10px
 }
 
@@ -5485,7 +5485,7 @@ body.admin.modal-open .navbar {
     z-index: 0 !important
 }
 
-#RestartDialog, #ShutdownDialog, #StatusDialog, #deleteModal {
+#RestartDialog, #ShutdownDialog, #StatusDialog, #ClearCacheDialog, #deleteModal {
     top: 0;
     overflow: hidden;
     padding-top: 70px;
@@ -5495,7 +5495,7 @@ body.admin.modal-open .navbar {
     background: rgba(0, 0, 0, .5)
 }
 
-#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #deleteModal:before {
+#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #ClearCacheDialog:before, #deleteModal:before {
     content: "\E208";
     padding-right: 10px;
     display: block;
@@ -5517,18 +5517,18 @@ body.admin.modal-open .navbar {
     z-index: 99
 }
 
-#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
     -webkit-transform: translate(0, 0);
     -ms-transform: translate(0, 0);
     transform: translate(0, 0)
 }
 
-#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
     width: 450px;
     margin: auto
 }
 
-#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
     max-height: calc(100% - 90px);
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
@@ -5539,7 +5539,7 @@ body.admin.modal-open .navbar {
     width: 450px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
     padding: 15px 20px;
     border-radius: 3px 3px 0 0;
     line-height: 1.71428571;
@@ -5552,7 +5552,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     padding-right: 10px;
     font-size: 18px;
     color: #999;
@@ -5576,6 +5576,11 @@ body.admin.modal-open .navbar {
     font-family: plex-icons-new, serif
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before {
+    content: "\EA15";
+    font-family: plex-icons-new, serif
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
     font-family: plex-icons-new, serif
@@ -5599,6 +5604,12 @@ body.admin.modal-open .navbar {
     font-size: 20px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:after {
+    content: "Clear Cover Thumbnail Cache";
+    display: inline-block;
+    font-size: 20px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-header:after {
     content: "Delete Book";
     display: inline-block;
@@ -5629,7 +5640,17 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body {
+    padding: 20px 20px 10px;
+    font-size: 16px;
+    line-height: 1.6em;
+    font-family: Open Sans Regular, Helvetica Neue, Helvetica, Arial, sans-serif;
+    color: #eee;
+    background: #282828;
+    text-align: left
+}
+
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
     padding: 20px 20px 0 0;
     font-size: 16px;
     line-height: 1.6em;
@@ -5638,7 +5659,7 @@ body.admin.modal-open .navbar {
     background: #282828
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     float: right;
     z-index: 9;
     position: relative;
@@ -5674,6 +5695,18 @@ body.admin.modal-open .navbar {
     border-radius: 3px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > #clear_cache {
+    float: right;
+    z-index: 9;
+    position: relative;
+    margin: 25px 0 0 10px;
+    min-width: 80px;
+    padding: 10px 18px;
+    font-size: 16px;
+    line-height: 1.33;
+    border-radius: 3px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
     float: right;
     z-index: 9;
@@ -5694,11 +5727,15 @@ body.admin.modal-open .navbar {
     margin: 55px 0 0 10px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache) {
+    margin: 25px 0 0 10px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     margin: 0 0 0 10px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
     background-color: hsla(0, 0%, 100%, .3)
 }
 
@@ -5732,6 +5769,21 @@ body.admin.modal-open .navbar {
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body:after {
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 72px;
+    background-color: #323232;
+    border-radius: 0 0 3px 3px;
+    left: 0;
+    margin-top: 10px;
+    z-index: 0;
+    border-top: 1px solid #222;
+    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+    box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
+}
+
 #deleteButton {
     position: fixed;
     top: 60px;
@@ -7322,11 +7374,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         background-color: transparent !important
     }
 
-    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
         max-width: calc(100vw - 40px)
     }
 
-    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
         max-width: calc(100vw - 40px);
         left: 0
     }
@@ -7476,7 +7528,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         padding: 30px 15px
     }
 
-    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
         left: auto;
         right: 34px
     }
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 3fbaed881..d8c1863f3 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -405,6 +405,18 @@ $(function() {
             }
         });
     });
+    $("#clear_cache").click(function () {
+        $("#spinner3").show();
+        $.ajax({
+            dataType: "json",
+            url: window.location.pathname + "/../../clear-cache",
+            data: {"cache_type":"thumbnails"},
+            success: function(data) {
+                $("#spinner3").hide();
+                $("#ClearCacheDialog").modal("hide");
+            }
+        });
+    });
 
     // Init all data control handlers to default
     $("input[data-control]").trigger("change");
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
new file mode 100644
index 000000000..11f0186d4
--- /dev/null
+++ b/cps/tasks/database.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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
+
+from cps import config, logger
+from cps.services.worker import CalibreTask
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
+
+
+class TaskReconnectDatabase(CalibreTask):
+    def __init__(self, task_message=u'Reconnecting Calibre database'):
+        super(TaskReconnectDatabase, self).__init__(task_message)
+        self.log = logger.create()
+        self.listen_address = config.get_config_ipaddress()
+        self.listen_port = config.config_port
+
+    def run(self, worker_thread):
+        address = self.listen_address if self.listen_address else 'localhost'
+        port = self.listen_port if self.listen_port else 8083
+
+        try:
+            urlopen('http://' + address + ':' + str(port) + '/reconnect')
+            self._handleSuccess()
+        except Exception as ex:
+            self._handleError(u'Unable to reconnect Calibre database: ' + str(ex))
+
+    @property
+    def name(self):
+        return "Reconnect Database"
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index f61eb4a78..b541bc707 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -42,7 +42,6 @@ THUMBNAIL_RESOLUTION_2X = 2
 class TaskGenerateCoverThumbnails(CalibreTask):
     def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
         super(TaskGenerateCoverThumbnails, self).__init__(task_message)
-        self.self_cleanup = True
         self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -186,7 +185,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
 
 class TaskCleanupCoverThumbnailCache(CalibreTask):
-    def __init__(self, task_message=u'Validating cover thumbnail cache'):
+    def __init__(self, task_message=u'Cleaning up cover thumbnail cache'):
         super(TaskCleanupCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -265,3 +264,58 @@ class TaskCleanupCoverThumbnailCache(CalibreTask):
     @property
     def name(self):
         return "CleanupCoverThumbnailCache"
+
+
+class TaskClearCoverThumbnailCache(CalibreTask):
+    def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
+        super(TaskClearCoverThumbnailCache, self).__init__(task_message)
+        self.log = logger.create()
+        self.book_id = book_id
+        self.app_db_session = ub.get_new_session_instance()
+        self.cache = fs.FileSystem()
+
+    def run(self, worker_thread):
+        if self.app_db_session:
+            if self.book_id:
+                thumbnails = self.get_thumbnails_for_book(self.book_id)
+                for thumbnail in thumbnails:
+                    self.expire_and_delete_thumbnail(thumbnail)
+            else:
+                self.expire_and_delete_all_thumbnails()
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def get_thumbnails_for_book(self, book_id):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book_id)\
+            .all()
+
+    def expire_and_delete_thumbnail(self, thumbnail):
+        thumbnail.expiration = datetime.utcnow()
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error expiring book thumbnail: ' + str(ex))
+            self._handleError(u'Error expiring book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def expire_and_delete_all_thumbnails(self):
+        self.app_db_session\
+            .query(ub.Thumbnail)\
+            .update({'expiration': datetime.utcnow()})
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_dir(fs.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error expiring book thumbnails: ' + str(ex))
+            self._handleError(u'Error expiring book thumbnails: ' + str(ex))
+            self.app_db_session.rollback()
+
+    @property
+    def name(self):
+        return "ClearCoverThumbnailCache"
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 1ef641575..e3d20db3e 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -139,15 +139,18 @@
     </div>
   </div>
 
-    <div class="row form-group">
+  <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 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="clear_cover_thumbnail_cache" data-toggle="modal" data-target="#ClearCacheDialog">{{_('Clear Cover Thumbnail Cache')}}</div>
+  </div>
+  <div class="row form-group">
+    <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 class="row">
@@ -226,4 +229,21 @@
     </div>
   </div>
 </div>
+<div id="ClearCacheDialog" class="modal fade" role="dialog">
+  <div class="modal-dialog modal-sm">
+    <!-- Modal content-->
+    <div class="modal-content">
+      <div class="modal-header bg-info"></div>
+      <div class="modal-body text-center">
+        <p>{{_('Are you sure you want to clear the cover thumbnail cache?')}}</p>
+        <div id="spinner3" class="spinner" style="display:none;">
+          <img id="img-spinner3" src="{{ url_for('static', filename='css/libs/images/loading-icon.gif') }}"/>
+        </div>
+        <p></p>
+        <button type="button" class="btn btn-default" id="clear_cache" >{{_('OK')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
 {% endblock %}
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 24ce876a8..3cf3fb4be 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -36,7 +36,7 @@
     <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) }}">
-            {{ book_cover_image(entry.id, entry.title) }}
+            {{ book_cover_image(entry, entry.title) }}
         </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index 878c14a8c..3f0ed1542 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,8 +1,8 @@
-{% macro book_cover_image(book_id, book_title) -%}
+{% macro book_cover_image(book, book_title) -%}
     <img
-        srcset="{{ url_for('web.get_cover', book_id=book_id, resolution=1) }} 1x,
-                {{ url_for('web.get_cover', book_id=book_id, resolution=2) }} 2x"
-        src="{{ url_for('web.get_cover', book_id=book_id) }}"
+        srcset="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id(1)) }} 1x,
+                {{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id(2)) }} 2x"
+        src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
         alt="{{ book_title }}"
     />
 {%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 881fa8ffb..369b8d052 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -4,8 +4,7 @@
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ book_cover_image(book.id, book.title) }}
-<!--        <img src="{{ url_for('web.get_cover', book_id=book.id, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/>-->
+        {{ book_cover_image(book, book.title) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index d3615563c..cdf6ab2b7 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,8 +4,7 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ book_cover_image(entry.id, entry.title) }}
-<!--          <img src="{{ url_for('web.get_cover', book_id=entry.id, edit=1|uuidfilter) }}" alt="{{ entry.title }}" />-->
+          {{ book_cover_image(entry, entry.title) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 33bafbbec..5d4666f6d 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -9,7 +9,7 @@
       <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">
-              {{ book_cover_image(entry.id, entry.title) }}
+              {{ book_cover_image(entry, entry.title) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index bc3ca4a2a..67594b4e5 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -29,7 +29,7 @@
               <div class="col-sm-3 col-lg-2 col-xs-6 book sortable" {% if entry[0].sort %}data-name="{{entry[0].series[0].name}}"{% endif %} data-id="{% if entry[0].series[0].name %}{{entry[0].series[0].name}}{% endif %}">
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
-                          {{ book_cover_image(entry[0].id, entry[0].name) }}
+                          {{ book_cover_image(entry[0], entry[0].name) }}
                           <span class="badge">{{entry.count}}</span>
                       </a>
                   </div>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index c536884f3..531a535c1 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -9,7 +9,7 @@
     <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">
-              {{ book_cover_image(entry.id, entry.title) }}
+              {{ book_cover_image(entry, entry.title) }}
           </a>
       </div>
       <div class="meta">
@@ -83,7 +83,7 @@
     <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">
-              {{ book_cover_image(entry.id, entry.title) }}
+              {{ book_cover_image(entry, entry.title) }}
           </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 56b12154e..8e0cf6688 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -44,7 +44,7 @@
       <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">
-               {{ book_cover_image(entry.id, entry.title) }}
+               {{ book_cover_image(entry, entry.title) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 7a678ea63..bebc0b1f5 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -31,7 +31,7 @@
     <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">
-                {{ book_cover_image(entry.id, entry.title) }}
+                {{ book_cover_image(entry, entry.title) }}
             </a>
       </div>
       <div class="meta">
diff --git a/cps/web.py b/cps/web.py
index 27a5849b1..16c14fcf2 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,7 +50,7 @@ from . import babel, db, ub, config, get_locale, app
 from . import calibre_db, shelf
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
 from .helper import check_valid_domain, render_task_status, \
-    get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
+    get_cc_columns, get_book_cover, get_cached_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
@@ -1177,6 +1177,12 @@ def get_cover(book_id, resolution=1):
     return get_book_cover(book_id, resolution)
 
 
+@web.route("/cached-cover/<string:cache_id>")
+@login_required_if_no_ano
+def get_cached_cover(cache_id):
+    return get_cached_book_cover(cache_id)
+
+
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")

From 242a2767a1e374a938de2f1b3fdb7cb2175c5fd1 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 24 Dec 2020 02:35:32 -0600
Subject: [PATCH 006/412] Added thumbnail urls to book cover srcsets with cache
 busting ids

---
 cps/db.py                     |  3 +-
 cps/helper.py                 | 38 +++++++++++++++
 cps/jinjia.py                 | 16 +++++++
 cps/schedule.py               | 10 ++--
 cps/tasks/thumbnail.py        | 61 ++++++++++++++++++++----
 cps/templates/author.html     |  2 +-
 cps/templates/book_cover.html | 19 +++++---
 cps/templates/book_edit.html  |  2 +-
 cps/templates/detail.html     |  2 +-
 cps/templates/discover.html   |  2 +-
 cps/templates/grid.html       |  2 +-
 cps/templates/index.html      |  4 +-
 cps/templates/search.html     |  2 +-
 cps/templates/shelf.html      |  2 +-
 cps/web.py                    | 89 +++++++++++++++++++++++++----------
 15 files changed, 199 insertions(+), 55 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 2e428f725..8b8db10a0 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -609,7 +609,8 @@ class CalibreDB():
             randm = self.session.query(Books) \
                 .filter(self.common_filters(allow_show_archived)) \
                 .order_by(func.random()) \
-                .limit(self.config.config_random_books)
+                .limit(self.config.config_random_books) \
+                .all()
         else:
             randm = false()
         off = int(int(pagesize) * (page - 1))
diff --git a/cps/helper.py b/cps/helper.py
index 0b0c675f2..c33a69e1e 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -533,6 +533,21 @@ def delete_book(book, calibrepath, book_format):
         return delete_book_file(book, calibrepath, book_format)
 
 
+def get_thumbnails_for_books(books):
+    books_with_covers = list(filter(lambda b: b.has_cover, books))
+    book_ids = list(map(lambda b: b.id, books_with_covers))
+    return ub.session\
+        .query(ub.Thumbnail)\
+        .filter(ub.Thumbnail.book_id.in_(book_ids))\
+        .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+        .all()
+
+
+def get_thumbnails_for_book_series(series):
+    books = list(map(lambda s: s[0], series))
+    return get_thumbnails_for_books(books)
+
+
 def get_cover_on_failure(use_generic_cover):
     if use_generic_cover:
         return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
@@ -558,6 +573,29 @@ def get_cached_book_cover(cache_id):
     return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
 
 
+def get_cached_book_cover_thumbnail(cache_id):
+    parts = cache_id.split('_')
+    thumbnail_uuid = parts[0] if len(parts) else None
+    thumbnail = None
+    if thumbnail_uuid:
+        thumbnail = ub.session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.uuid == thumbnail_uuid)\
+            .first()
+
+    if thumbnail and thumbnail.expiration > datetime.utcnow():
+        cache = fs.FileSystem()
+        if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+            return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
+
+    elif thumbnail:
+        book = calibre_db.get_book(thumbnail.book_id)
+        return get_book_cover_internal(book, use_generic_cover_on_failure=True)
+
+    else:
+        return get_cover_on_failure(True)
+
+
 def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
     if book and book.has_cover:
 
diff --git a/cps/jinjia.py b/cps/jinjia.py
index bf81c059d..b2479adca 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -139,3 +139,19 @@ def book_cover_cache_id(book, resolution=None):
     timestamp = int(book.last_modified.timestamp() * 1000)
     cache_bust = str(book.uuid) + '_' + str(timestamp)
     return cache_bust if not resolution else cache_bust + '_' + str(resolution)
+
+
+@jinjia.app_template_filter('get_book_thumbnails')
+def get_book_thumbnails(book_id, thumbnails=None):
+    return list(filter(lambda t: t.book_id == book_id, thumbnails)) if book_id > -1 and thumbnails else list()
+
+
+@jinjia.app_template_filter('get_book_thumbnail_srcset')
+def get_book_thumbnail_srcset(thumbnails):
+    srcset = list()
+    for thumbnail in thumbnails:
+        timestamp = int(thumbnail.generated_at.timestamp() * 1000)
+        cache_id = str(thumbnail.uuid) + '_' + str(timestamp)
+        url = url_for('web.get_cached_cover_thumbnail', cache_id=cache_id)
+        srcset.append(url + ' ' + str(thumbnail.resolution) + 'x')
+    return ', '.join(srcset)
diff --git a/cps/schedule.py b/cps/schedule.py
index f349a231d..7ee434102 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -20,17 +20,17 @@ from __future__ import division, print_function, unicode_literals
 
 from .services.background_scheduler import BackgroundScheduler
 from .tasks.database import TaskReconnectDatabase
-from .tasks.thumbnail import TaskCleanupCoverThumbnailCache, TaskGenerateCoverThumbnails
+from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
 
 
 def register_jobs():
     scheduler = BackgroundScheduler()
 
     # Generate 100 book cover thumbnails every 5 minutes
-    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='interval', minutes=5)
+    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='cron', minute='*/5')
 
-    # Cleanup book cover cache every day at 4am
-    scheduler.add_task(user=None, task=lambda: TaskCleanupCoverThumbnailCache(), trigger='cron', hour=4)
+    # Cleanup book cover cache every 6 hours
+    scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', minute='15', hour='*/6')
 
     # Reconnect metadata.db every 4 hours
-    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='interval', hours=4)
+    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', minute='5', hour='*/4')
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index b541bc707..e9df170e1 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -59,6 +59,10 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
 
             count = len(books_without_thumbnails)
+            if count == 0:
+                # Do not display this task on the frontend if there are no covers to update
+                self.self_cleanup = True
+
             for i, book in enumerate(books_without_thumbnails):
                 for resolution in self.resolutions:
                     expired_thumbnail = self.get_expired_thumbnail_for_book_and_resolution(
@@ -71,6 +75,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                     else:
                         self.create_book_thumbnail(book, resolution)
 
+                self.message(u'Generating cover thumbnail {0} of {1}'.format(i, count))
                 self.progress = (1.0 / count) * i
 
         self._handleSuccess()
@@ -181,12 +186,12 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return "GenerateCoverThumbnails"
+        return "ThumbnailsGenerate"
 
 
-class TaskCleanupCoverThumbnailCache(CalibreTask):
-    def __init__(self, task_message=u'Cleaning up cover thumbnail cache'):
-        super(TaskCleanupCoverThumbnailCache, self).__init__(task_message)
+class TaskSyncCoverThumbnailCache(CalibreTask):
+    def __init__(self, task_message=u'Syncing cover thumbnail cache'):
+        super(TaskSyncCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
         self.calibre_db = db.CalibreDB(expire_on_commit=False)
@@ -199,14 +204,23 @@ class TaskCleanupCoverThumbnailCache(CalibreTask):
         # This case will happen if a user deletes the cache dir or cached files
         if self.app_db_session:
             self.expire_missing_thumbnails(cached_thumbnail_files)
-            self.progress = 0.33
+            self.progress = 0.25
 
         # Delete thumbnails in the database if the book has been removed
         # This case will happen if a book is removed in Calibre and the metadata.db file is updated in the filesystem
         if self.app_db_session and self.calibre_db:
             book_ids = self.get_book_ids()
             self.delete_thumbnails_for_missing_books(book_ids)
-            self.progress = 0.66
+            self.progress = 0.50
+
+        # Expire thumbnails in the database if their corresponding book has been updated since they were generated
+        # This case will happen if the book was updated externally
+        if self.app_db_session and self.cache:
+            books = self.get_books_updated_in_the_last_day()
+            book_ids = list(map(lambda b: b.id, books))
+            thumbnails = self.get_thumbnails_for_updated_books(book_ids)
+            self.expire_thumbnails_for_updated_book(books, thumbnails)
+            self.progress = 0.75
 
         # Delete extraneous cached thumbnail files
         # This case will happen if a book was deleted and the thumbnail OR the metadata.db file was changed externally
@@ -261,9 +275,40 @@ class TaskCleanupCoverThumbnailCache(CalibreTask):
         for file in extraneous_files:
             self.cache.delete_cache_file(file, fs.CACHE_TYPE_THUMBNAILS)
 
+    def get_books_updated_in_the_last_day(self):
+        return self.calibre_db.session\
+            .query(db.Books)\
+            .filter(db.Books.has_cover == 1)\
+            .filter(db.Books.last_modified > datetime.utcnow() - timedelta(days=1, hours=1))\
+            .all()
+
+    def get_thumbnails_for_updated_books(self, book_ids):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id.in_(book_ids))\
+            .all()
+
+    def expire_thumbnails_for_updated_book(self, books, thumbnails):
+        thumbnail_ids = list()
+        for book in books:
+            for thumbnail in thumbnails:
+                if thumbnail.book_id == book.id and thumbnail.generated_at < book.last_modified:
+                    thumbnail_ids.append(thumbnail.id)
+
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.id.in_(thumbnail_ids)) \
+                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(u'Error expiring thumbnails for updated books: ' + str(ex))
+            self._handleError(u'Error expiring thumbnails for updated books: ' + str(ex))
+            self.app_db_session.rollback()
+
     @property
     def name(self):
-        return "CleanupCoverThumbnailCache"
+        return "ThumbnailsSync"
 
 
 class TaskClearCoverThumbnailCache(CalibreTask):
@@ -318,4 +363,4 @@ class TaskClearCoverThumbnailCache(CalibreTask):
 
     @property
     def name(self):
-        return "ClearCoverThumbnailCache"
+        return "ThumbnailsClear"
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 3cf3fb4be..e5acdd2ff 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -36,7 +36,7 @@
     <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) }}">
-            {{ book_cover_image(entry, entry.title) }}
+            {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
         </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index 3f0ed1542..c52817976 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,8 +1,13 @@
-{% macro book_cover_image(book, book_title) -%}
-    <img
-        srcset="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id(1)) }} 1x,
-                {{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id(2)) }} 2x"
-        src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
-        alt="{{ book_title }}"
-    />
+{% macro book_cover_image(book, thumbnails) -%}
+    {%- set book_title = book.title if book.title else book.name -%}
+    {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
+    {%- if srcset|length -%}
+        <img
+            srcset="{{ srcset }}"
+            src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
+            alt="{{ book_title }}"
+        />
+    {%- else -%}
+        <img src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}" alt="{{ book_title }}" />
+    {%- endif -%}
 {%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 369b8d052..c538d5ca3 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -4,7 +4,7 @@
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ book_cover_image(book, book.title) }}
+        {{ book_cover_image(book, book.id|get_book_thumbnails(thumbnails)) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index cdf6ab2b7..671186c75 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,7 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ book_cover_image(entry, entry.title) }}
+          {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 5d4666f6d..c5c12db20 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -9,7 +9,7 @@
       <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">
-              {{ book_cover_image(entry, entry.title) }}
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 67594b4e5..0f669d51b 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -29,7 +29,7 @@
               <div class="col-sm-3 col-lg-2 col-xs-6 book sortable" {% if entry[0].sort %}data-name="{{entry[0].series[0].name}}"{% endif %} data-id="{% if entry[0].series[0].name %}{{entry[0].series[0].name}}{% endif %}">
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
-                          {{ book_cover_image(entry[0], entry[0].name) }}
+                          {{ book_cover_image(entry[0], entry[0].id|get_book_thumbnails(thumbnails)) }}
                           <span class="badge">{{entry.count}}</span>
                       </a>
                   </div>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 531a535c1..2be15ba70 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -9,7 +9,7 @@
     <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">
-              {{ book_cover_image(entry, entry.title) }}
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
           </a>
       </div>
       <div class="meta">
@@ -83,7 +83,7 @@
     <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">
-              {{ book_cover_image(entry, entry.title) }}
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
           </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 8e0cf6688..a5871afba 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -44,7 +44,7 @@
       <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">
-               {{ book_cover_image(entry, entry.title) }}
+               {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index bebc0b1f5..cb55c50cb 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -31,7 +31,7 @@
     <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">
-                {{ book_cover_image(entry, entry.title) }}
+                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
             </a>
       </div>
       <div class="meta">
diff --git a/cps/web.py b/cps/web.py
index 16c14fcf2..c400b96e5 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -49,9 +49,10 @@ from . import constants, logger, isoLanguages, services
 from . import babel, db, ub, config, get_locale, app
 from . import calibre_db, shelf
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
-from .helper import check_valid_domain, render_task_status, \
-    get_cc_columns, get_book_cover, get_cached_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 .helper import check_valid_domain, render_task_status, get_cc_columns, get_book_cover, get_cached_book_cover, \
+    get_cached_book_cover_thumbnail, get_thumbnails_for_books, get_thumbnails_for_book_series, 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
@@ -386,16 +387,18 @@ def render_books_list(data, sort, book_id, page):
                                                                     db.Books,
                                                                     db.Books.ratings.any(db.Ratings.rating > 9),
                                                                     order)
+            thumbnails = get_thumbnails_for_books(entries + random)
             return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                         id=book_id, title=_(u"Top Rated Books"), page="rated")
+                                         id=book_id, title=_(u"Top Rated Books"), page="rated", thumbnails=thumbnails)
         else:
             abort(404)
     elif data == "discover":
         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)
+            thumbnails = get_thumbnails_for_books(entries)
             return render_title_template('discover.html', entries=entries, pagination=pagination, id=book_id,
-                                         title=_(u"Discover (Random Books)"), page="discover")
+                                         title=_(u"Discover (Random Books)"), page="discover", thumbnails=thumbnails)
         else:
             abort(404)
     elif data == "unread":
@@ -433,8 +436,9 @@ def render_books_list(data, sort, book_id, page):
     else:
         website = data or "newest"
         entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Books"), page=website)
+                                     title=_(u"Books"), page=website, thumbnails=thumbnails)
 
 
 def render_hot_books(page):
@@ -458,8 +462,9 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Hot Books (Most Downloaded)"), page="hot")
+                                     title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -490,12 +495,14 @@ def render_downloaded_books(page, order):
                              .filter(db.Books.id == book.id).first():
                 ub.delete_download(book.id)
 
+        thumbnails = get_thumbnails_for_books(entries + random)
         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")
+                                     page="download",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -521,9 +528,10 @@ def render_author_books(page, author_id, order):
         author_info = services.goodreads_support.get_author_info(author_name)
         other_books = services.goodreads_support.get_other_books(author_info, entries)
 
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
                                  title=_(u"Author: %(name)s", name=author_name), author=author_info,
-                                 other_books=other_books, page="author")
+                                 other_books=other_books, page="author", thumbnails=thumbnails)
 
 
 def render_publisher_books(page, book_id, order):
@@ -535,8 +543,10 @@ def render_publisher_books(page, book_id, order):
                                                                 [db.Series.name, order[0], db.Books.series_index],
                                                                 db.books_series_link,
                                                                 db.Series)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher")
+                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -548,8 +558,10 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
+        thumbnails = get_thumbnails_for_books(entries + random)
         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")
+                                     title=_(u"Series: %(serie)s", serie=name.name), page="series",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -561,8 +573,10 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
+        thumbnails = get_thumbnails_for_books(entries + random)
         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")
+                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -574,8 +588,10 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
+        thumbnails = get_thumbnails_for_books(entries + random)
         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")
+                                     title=_(u"File format: %(format)s", format=name.format), page="formats",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -588,8 +604,10 @@ def render_category_books(page, book_id, order):
                                                                 db.Books.tags.any(db.Tags.id == book_id),
                                                                 [order[0], db.Series.name, db.Books.series_index],
                                                                 db.books_series_link, db.Series)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Category: %(name)s", name=name.name), page="category")
+                                     title=_(u"Category: %(name)s", name=name.name), page="category",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -607,8 +625,9 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
+    thumbnails = get_thumbnails_for_books(entries + random)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
-                                 title=_(u"Language: %(name)s", name=lang_name), page="language")
+                                 title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
 
 
 def render_read_books(page, are_read, as_xml=False, order=None):
@@ -652,8 +671,10 @@ def render_read_books(page, are_read, as_xml=False, order=None):
         else:
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
+
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=name, page=pagename)
+                                     title=name, page=pagename, thumbnails=thumbnails)
 
 
 def render_archived_books(page, order):
@@ -676,8 +697,9 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
+    thumbnails = get_thumbnails_for_books(entries + random)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=name, page=pagename)
+                                 title=name, page=pagename, thumbnails=thumbnails)
 
 
 def render_prepare_search_form(cc):
@@ -710,6 +732,7 @@ def render_prepare_search_form(cc):
 
 def render_search_results(term, offset=None, order=None, limit=None):
     entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit)
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  searchterm=term,
                                  pagination=pagination,
@@ -718,7 +741,8 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                  entries=entries,
                                  result_count=result_count,
                                  title=_(u"Search"),
-                                 page="search")
+                                 page="search",
+                                 thumbnails=thumbnails)
 
 
 # ################################### View Books list ##################################################################
@@ -748,6 +772,7 @@ def books_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():
@@ -780,6 +805,7 @@ def list_books():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @web.route("/ajax/table_settings", methods=['POST'])
 @login_required
 def update_table_settings():
@@ -834,6 +860,7 @@ def publisher_list():
         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()
+
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher")
     else:
@@ -865,8 +892,10 @@ def series_list():
                 .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()
 
+            thumbnails = get_thumbnails_for_book_series(entries)
             return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                         title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view")
+                                         title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view",
+                                         thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -1150,13 +1179,16 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     else:
         offset = 0
         limit_all = result_count
+
+    thumbnails = get_thumbnails_for_books(entries)
     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")
-
+                                 title=_(u"Advanced Search"),
+                                 page="advsearch",
+                                 thumbnails=thumbnails)
 
 
 @web.route("/advsearch", methods=['GET'])
@@ -1171,10 +1203,9 @@ def advanced_search_form():
 
 
 @web.route("/cover/<int:book_id>")
-@web.route("/cover/<int:book_id>/<int:resolution>")
 @login_required_if_no_ano
-def get_cover(book_id, resolution=1):
-    return get_book_cover(book_id, resolution)
+def get_cover(book_id):
+    return get_book_cover(book_id)
 
 
 @web.route("/cached-cover/<string:cache_id>")
@@ -1183,6 +1214,12 @@ def get_cached_cover(cache_id):
     return get_cached_book_cover(cache_id)
 
 
+@web.route("/cached-cover-thumbnail/<string:cache_id>")
+@login_required_if_no_ano
+def get_cached_cover_thumbnail(cache_id):
+    return get_cached_book_cover_thumbnail(cache_id)
+
+
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")
@@ -1591,6 +1628,7 @@ def show_book(book_id):
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
                 audioentries.append(media_format.format.lower())
 
+        thumbnails = get_thumbnails_for_books([entries])
         return render_title_template('detail.html',
                                      entry=entries,
                                      audioentries=audioentries,
@@ -1602,7 +1640,8 @@ def show_book(book_id):
                                      is_archived=is_archived,
                                      kindle_list=kindle_list,
                                      reader_list=reader_list,
-                                     page="book")
+                                     page="book",
+                                     thumbnails=thumbnails)
     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")

From eef21759cd56c28560ee2007726fab18c8595df5 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 24 Dec 2020 03:00:26 -0600
Subject: [PATCH 007/412] Fix generate thumbnail task messages, don't load
 thumbnails when the cache file has been deleted

---
 cps/helper.py          | 4 ++++
 cps/tasks/thumbnail.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cps/helper.py b/cps/helper.py
index c33a69e1e..add1b067c 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -536,9 +536,13 @@ def delete_book(book, calibrepath, book_format):
 def get_thumbnails_for_books(books):
     books_with_covers = list(filter(lambda b: b.has_cover, books))
     book_ids = list(map(lambda b: b.id, books_with_covers))
+    cache = fs.FileSystem()
+    thumbnail_files = cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
+
     return ub.session\
         .query(ub.Thumbnail)\
         .filter(ub.Thumbnail.book_id.in_(book_ids))\
+        .filter(ub.Thumbnail.filename.in_(thumbnail_files))\
         .filter(ub.Thumbnail.expiration > datetime.utcnow())\
         .all()
 
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index e9df170e1..70ddc06bd 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -75,7 +75,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                     else:
                         self.create_book_thumbnail(book, resolution)
 
-                self.message(u'Generating cover thumbnail {0} of {1}'.format(i, count))
+                self.message = u'Generating cover thumbnail {0} of {1}'.format(i + 1, count)
                 self.progress = (1.0 / count) * i
 
         self._handleSuccess()

From 8cc06683df25684793d1d6154a74a3b11408d980 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Mon, 4 Jan 2021 12:28:05 -0600
Subject: [PATCH 008/412] only python3 supported now

---
 cps/tasks/database.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 11f0186d4..62208c0c1 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -20,11 +20,7 @@ from __future__ import division, print_function, unicode_literals
 
 from cps import config, logger
 from cps.services.worker import CalibreTask
-
-try:
-    from urllib.request import urlopen
-except ImportError as e:
-    from urllib2 import urlopen
+from urllib.request import urlopen
 
 
 class TaskReconnectDatabase(CalibreTask):

From 2c8d055ca4e9b92842615516834bb2472348b15e Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Mon, 4 Jan 2021 12:36:40 -0600
Subject: [PATCH 009/412] support python2.7 for the mean time

---
 cps/tasks/database.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 62208c0c1..11f0186d4 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -20,7 +20,11 @@ from __future__ import division, print_function, unicode_literals
 
 from cps import config, logger
 from cps.services.worker import CalibreTask
-from urllib.request import urlopen
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
 
 
 class TaskReconnectDatabase(CalibreTask):

From dd30ac4fbdc9699dc4462b1a9a7efeddb53ffe3a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 20 Mar 2021 11:32:50 +0100
Subject: [PATCH 010/412] Added thumbnails Merge remote-tracking branch
 'cover/thumbnails' into development

# Conflicts:
#	cps/admin.py
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
Update join for sqlalchemy 1.4
---
 .gitignore                           |   1 +
 cps.py                               |   5 +
 cps/__init__.py                      |   3 +-
 cps/admin.py                         |  19 +-
 cps/constants.py                     |   1 +
 cps/db.py                            |  13 +-
 cps/editbooks.py                     |   2 +
 cps/fs.py                            |  61 +++++
 cps/helper.py                        |  89 ++++++-
 cps/jinjia.py                        |  22 ++
 cps/schedule.py                      |  36 +++
 cps/services/background_scheduler.py |  52 ++++
 cps/services/worker.py               |  17 +-
 cps/shelf.py                         |   2 +-
 cps/static/css/caliBlur.css          |  82 ++++--
 cps/static/js/main.js                |  12 +
 cps/tasks/database.py                |  49 ++++
 cps/tasks/thumbnail.py               | 366 +++++++++++++++++++++++++++
 cps/templates/admin.html             |  36 ++-
 cps/templates/author.html            |   2 +-
 cps/templates/book_cover.html        |  13 +
 cps/templates/book_edit.html         |   3 +-
 cps/templates/detail.html            |   2 +-
 cps/templates/discover.html          |   3 +-
 cps/templates/fragment.html          |   1 +
 cps/templates/grid.html              |   3 +-
 cps/templates/index.html             |   5 +-
 cps/templates/layout.html            |   1 +
 cps/templates/search.html            |   3 +-
 cps/templates/shelf.html             |   3 +-
 cps/ub.py                            |  34 +++
 cps/web.py                           |  96 +++++--
 requirements.txt                     |   1 +
 33 files changed, 965 insertions(+), 73 deletions(-)
 create mode 100644 cps/fs.py
 create mode 100644 cps/schedule.py
 create mode 100644 cps/services/background_scheduler.py
 create mode 100644 cps/tasks/database.py
 create mode 100644 cps/tasks/thumbnail.py
 create mode 100644 cps/templates/book_cover.html

diff --git a/.gitignore b/.gitignore
index 109de4efe..903cfd363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ vendor/
 # calibre-web
 *.db
 *.log
+cps/cache
 
 .idea/
 *.bak
diff --git a/cps.py b/cps.py
index 737b0d97d..19ca89b88 100755
--- a/cps.py
+++ b/cps.py
@@ -43,6 +43,7 @@ from cps.gdrive import gdrive
 from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.error_handler import init_errorhandler
+from cps.schedule import register_jobs
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -78,6 +79,10 @@ def main():
         app.register_blueprint(kobo_auth)
     if oauth_available:
         app.register_blueprint(oauth)
+
+    # Register scheduled jobs
+    register_jobs()
+
     success = web_server.start()
     sys.exit(0 if success else 1)
 
diff --git a/cps/__init__.py b/cps/__init__.py
index 627cca0b1..30029428a 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -96,7 +96,7 @@ def create_app():
         app.instance_path = app.instance_path.decode('utf-8')
 
     if os.environ.get('FLASK_DEBUG'):
-    	cache_buster.init_cache_busting(app)
+        cache_buster.init_cache_busting(app)
 
     log.info('Starting Calibre Web...')
     if sys.version_info < (3, 0):
@@ -121,6 +121,7 @@ def create_app():
 
     return app
 
+
 @babel.localeselector
 def get_locale():
     # if a user is logged in, use the locale from the user settings
diff --git a/cps/admin.py b/cps/admin.py
index 78cfebf13..cd548bfbd 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -40,7 +40,7 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_
 
-from . import constants, logger, helper, services, isoLanguages
+from . import constants, logger, helper, services, isoLanguages, fs
 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
@@ -164,6 +164,23 @@ def shutdown():
     return json.dumps(showtext), 400
 
 
+@admi.route("/clear-cache")
+@login_required
+@admin_required
+def clear_cache():
+    cache_type = request.args.get('cache_type'.strip())
+    showtext = {}
+
+    if cache_type == fs.CACHE_TYPE_THUMBNAILS:
+        log.info('clearing cover thumbnail cache')
+        showtext['text'] = _(u'Cleared cover thumbnail cache')
+        helper.clear_cover_thumbnail_cache()
+        return json.dumps(showtext)
+
+    showtext['text'] = _(u'Unknown command')
+    return json.dumps(showtext)
+
+
 @admi.route("/admin/view")
 @login_required
 @admin_required
diff --git a/cps/constants.py b/cps/constants.py
index e9c26cb16..0eb947097 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -37,6 +37,7 @@ else:
 STATIC_DIR          = os.path.join(BASE_DIR, 'cps', 'static')
 TEMPLATES_DIR       = os.path.join(BASE_DIR, 'cps', 'templates')
 TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
+CACHE_DIR           = os.path.join(BASE_DIR, 'cps', 'cache')
 
 if HOME_CONFIG:
     home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
diff --git a/cps/db.py b/cps/db.py
index ac59ac2b1..f43cc8114 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -620,15 +620,18 @@ class CalibreDB():
             randm = self.session.query(Books) \
                 .filter(self.common_filters(allow_show_archived)) \
                 .order_by(func.random()) \
-                .limit(self.config.config_random_books)
+                .limit(self.config.config_random_books) \
+                .all()
         else:
             randm = false()
         off = int(int(pagesize) * (page - 1))
-        query = self.session.query(database) \
-            .filter(db_filter) \
+        query = self.session.query(database)
+        if len(join) == 3:
+            query = query.join(join[0], join[1]).join(join[2], isouter=True)
+        elif len(join) == 2:
+            query = query.join(join[0], join[1], isouter=True)
+        query = query.filter(db_filter)\
             .filter(self.common_filters(allow_show_archived))
-        if len(join):
-            query = query.join(*join, isouter=True)
         entries = list()
         pagination = list()
         try:
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 28cad5c5a..b7f496d0b 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -614,6 +614,7 @@ def upload_cover(request, book):
                 abort(403)
             ret, message = helper.save_cover(requested_file, book.path)
             if ret is True:
+                helper.clear_cover_thumbnail_cache(book.id)
                 return True
             else:
                 flash(message, category="error")
@@ -710,6 +711,7 @@ def edit_book(book_id):
                         if result is True:
                             book.has_cover = 1
                             modif_date = True
+                            helper.clear_cover_thumbnail_cache(book.id)
                         else:
                             flash(error, category="error")
 
diff --git a/cps/fs.py b/cps/fs.py
new file mode 100644
index 000000000..699d59912
--- /dev/null
+++ b/cps/fs.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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
+from .constants import CACHE_DIR
+from os import listdir, makedirs, remove
+from os.path import isdir, isfile, join
+from shutil import rmtree
+
+CACHE_TYPE_THUMBNAILS = 'thumbnails'
+
+
+class FileSystem:
+    _instance = None
+    _cache_dir = CACHE_DIR
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(FileSystem, cls).__new__(cls)
+        return cls._instance
+
+    def get_cache_dir(self, cache_type=None):
+        if not isdir(self._cache_dir):
+            makedirs(self._cache_dir)
+
+        if cache_type and not isdir(join(self._cache_dir, cache_type)):
+            makedirs(join(self._cache_dir, cache_type))
+
+        return join(self._cache_dir, cache_type) if cache_type else self._cache_dir
+
+    def get_cache_file_path(self, filename, cache_type=None):
+        return join(self.get_cache_dir(cache_type), filename) if filename else None
+
+    def list_cache_files(self, cache_type=None):
+        path = self.get_cache_dir(cache_type)
+        return [file for file in listdir(path) if isfile(join(path, file))]
+
+    def delete_cache_dir(self, cache_type=None):
+        if not cache_type and isdir(self._cache_dir):
+            rmtree(self._cache_dir)
+        if cache_type and isdir(join(self._cache_dir, cache_type)):
+            rmtree(join(self._cache_dir, cache_type))
+
+    def delete_cache_file(self, filename, cache_type=None):
+        if isfile(join(self.get_cache_dir(cache_type), filename)):
+            remove(join(self.get_cache_dir(cache_type), filename))
diff --git a/cps/helper.py b/cps/helper.py
index e18ae33b0..e3c79dea8 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -52,12 +52,13 @@ except ImportError:
 
 from . import calibre_db
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub
+from . import logger, config, get_locale, db, fs, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
 from .tasks.mail import TaskEmail
+from .tasks.thumbnail import TaskClearCoverThumbnailCache
 
 log = logger.create()
 
@@ -514,12 +515,32 @@ def update_dir_stucture(book_id, calibrepath, first_author=None, orignal_filepat
 
 
 def delete_book(book, calibrepath, book_format):
+    clear_cover_thumbnail_cache(book.id)
     if config.config_use_google_drive:
         return delete_book_gdrive(book, book_format)
     else:
         return delete_book_file(book, calibrepath, book_format)
 
 
+def get_thumbnails_for_books(books):
+    books_with_covers = list(filter(lambda b: b.has_cover, books))
+    book_ids = list(map(lambda b: b.id, books_with_covers))
+    cache = fs.FileSystem()
+    thumbnail_files = cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
+
+    return ub.session\
+        .query(ub.Thumbnail)\
+        .filter(ub.Thumbnail.book_id.in_(book_ids))\
+        .filter(ub.Thumbnail.filename.in_(thumbnail_files))\
+        .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+        .all()
+
+
+def get_thumbnails_for_book_series(series):
+    books = list(map(lambda s: s[0], series))
+    return get_thumbnails_for_books(books)
+
+
 def get_cover_on_failure(use_generic_cover):
     if use_generic_cover:
         return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
@@ -532,14 +553,54 @@ def get_book_cover(book_id):
     return get_book_cover_internal(book, use_generic_cover_on_failure=True)
 
 
-def get_book_cover_with_uuid(book_uuid,
-                             use_generic_cover_on_failure=True):
+def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
     book = calibre_db.get_book_by_uuid(book_uuid)
     return get_book_cover_internal(book, use_generic_cover_on_failure)
 
 
-def get_book_cover_internal(book, use_generic_cover_on_failure):
+def get_cached_book_cover(cache_id):
+    parts = cache_id.split('_')
+    book_uuid = parts[0] if len(parts) else None
+    resolution = parts[2] if len(parts) > 2 else None
+    book = calibre_db.get_book_by_uuid(book_uuid) if book_uuid else None
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
+
+
+def get_cached_book_cover_thumbnail(cache_id):
+    parts = cache_id.split('_')
+    thumbnail_uuid = parts[0] if len(parts) else None
+    thumbnail = None
+    if thumbnail_uuid:
+        thumbnail = ub.session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.uuid == thumbnail_uuid)\
+            .first()
+
+    if thumbnail and thumbnail.expiration > datetime.utcnow():
+        cache = fs.FileSystem()
+        if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+            return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
+
+    elif thumbnail:
+        book = calibre_db.get_book(thumbnail.book_id)
+        return get_book_cover_internal(book, use_generic_cover_on_failure=True)
+
+    else:
+        return get_cover_on_failure(True)
+
+
+def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
     if book and book.has_cover:
+
+        # Send the book cover thumbnail if it exists in cache
+        if resolution:
+            thumbnail = get_book_cover_thumbnail(book, resolution)
+            if thumbnail:
+                cache = fs.FileSystem()
+                if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                    return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
+
+        # Send the book cover from Google Drive if configured
         if config.config_use_google_drive:
             try:
                 if not gd.is_gdrive_ready():
@@ -550,9 +611,11 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
                 else:
                     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.debug_or_exception(e)
+            except Exception as ex:
+                log.debug_or_exception(ex)
                 return get_cover_on_failure(use_generic_cover_on_failure)
+
+        # Send the book cover from the Calibre directory
         else:
             cover_file_path = os.path.join(config.config_calibre_dir, book.path)
             if os.path.isfile(os.path.join(cover_file_path, "cover.jpg")):
@@ -563,6 +626,16 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
         return get_cover_on_failure(use_generic_cover_on_failure)
 
 
+def get_book_cover_thumbnail(book, resolution):
+    if book and book.has_cover:
+        return ub.session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book.id)\
+            .filter(ub.Thumbnail.resolution == resolution)\
+            .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+            .first()
+
+
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
@@ -820,3 +893,7 @@ def get_download_link(book_id, book_format, client):
         return do_download_file(book, book_format, client, data1, headers)
     else:
         abort(404)
+
+
+def clear_cover_thumbnail_cache(book_id=None):
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 688d1fbad..b2479adca 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -128,8 +128,30 @@ def formatseriesindex_filter(series_index):
             return series_index
     return 0
 
+
 @jinjia.app_template_filter('uuidfilter')
 def uuidfilter(var):
     return uuid4()
 
 
+@jinjia.app_template_filter('book_cover_cache_id')
+def book_cover_cache_id(book, resolution=None):
+    timestamp = int(book.last_modified.timestamp() * 1000)
+    cache_bust = str(book.uuid) + '_' + str(timestamp)
+    return cache_bust if not resolution else cache_bust + '_' + str(resolution)
+
+
+@jinjia.app_template_filter('get_book_thumbnails')
+def get_book_thumbnails(book_id, thumbnails=None):
+    return list(filter(lambda t: t.book_id == book_id, thumbnails)) if book_id > -1 and thumbnails else list()
+
+
+@jinjia.app_template_filter('get_book_thumbnail_srcset')
+def get_book_thumbnail_srcset(thumbnails):
+    srcset = list()
+    for thumbnail in thumbnails:
+        timestamp = int(thumbnail.generated_at.timestamp() * 1000)
+        cache_id = str(thumbnail.uuid) + '_' + str(timestamp)
+        url = url_for('web.get_cached_cover_thumbnail', cache_id=cache_id)
+        srcset.append(url + ' ' + str(thumbnail.resolution) + 'x')
+    return ', '.join(srcset)
diff --git a/cps/schedule.py b/cps/schedule.py
new file mode 100644
index 000000000..7ee434102
--- /dev/null
+++ b/cps/schedule.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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
+
+from .services.background_scheduler import BackgroundScheduler
+from .tasks.database import TaskReconnectDatabase
+from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
+
+
+def register_jobs():
+    scheduler = BackgroundScheduler()
+
+    # Generate 100 book cover thumbnails every 5 minutes
+    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='cron', minute='*/5')
+
+    # Cleanup book cover cache every 6 hours
+    scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', minute='15', hour='*/6')
+
+    # Reconnect metadata.db every 4 hours
+    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', minute='5', hour='*/4')
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
new file mode 100644
index 000000000..efa573799
--- /dev/null
+++ b/cps/services/background_scheduler.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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 atexit
+
+from .. import logger
+from .worker import WorkerThread
+from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+
+
+class BackgroundScheduler:
+    _instance = None
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(BackgroundScheduler, cls).__new__(cls)
+
+            scheduler = BScheduler()
+            atexit.register(lambda: scheduler.shutdown())
+
+            cls.log = logger.create()
+            cls.scheduler = scheduler
+            cls.scheduler.start()
+
+        return cls._instance
+
+    def add(self, func, trigger, **trigger_args):
+        self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+
+    def add_task(self, user, task, trigger, **trigger_args):
+        def scheduled_task():
+            worker_task = task()
+            self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
+            WorkerThread.add(user, worker_task)
+
+        self.add(func=scheduled_task, trigger=trigger, **trigger_args)
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 072674a04..2b6816db5 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -35,7 +35,6 @@ def _get_main_thread():
     raise Exception("main thread not found?!")
 
 
-
 class ImprovedQueue(queue.Queue):
     def to_list(self):
         """
@@ -45,7 +44,8 @@ class ImprovedQueue(queue.Queue):
         with self.mutex:
             return list(self.queue)
 
-#Class for all worker tasks in the background
+
+# Class for all worker tasks in the background
 class WorkerThread(threading.Thread):
     _instance = None
 
@@ -127,6 +127,10 @@ class WorkerThread(threading.Thread):
                 # CalibreTask.start() should wrap all exceptions in it's own error handling
                 item.task.start(self)
 
+            # remove self_cleanup tasks from list
+            if item.task.self_cleanup:
+                self.dequeued.remove(item)
+
             self.queue.task_done()
 
 
@@ -141,6 +145,7 @@ class CalibreTask:
         self.end_time = None
         self.message = message
         self.id = uuid.uuid4()
+        self.self_cleanup = False
 
     @abc.abstractmethod
     def run(self, worker_thread):
@@ -209,6 +214,14 @@ class CalibreTask:
         # todo: throw error if outside of [0,1]
         self._progress = x
 
+    @property
+    def self_cleanup(self):
+        return self._self_cleanup
+
+    @self_cleanup.setter
+    def self_cleanup(self, is_self_cleanup):
+        self._self_cleanup = is_self_cleanup
+
     def _handleError(self, error_message):
         self.stat = STAT_FAIL
         self.progress = 1
diff --git a/cps/shelf.py b/cps/shelf.py
index 5c6037ac7..7b00c32b1 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -403,7 +403,7 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
                                                             db.Books,
                                                             ub.BookShelf.shelf == shelf_id,
                                                             [ub.BookShelf.order.asc()],
-                                                            ub.BookShelf,ub.BookShelf.book_id == db.Books.id)
+                                                            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)\
diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index 14e5c286f..aa747c0ba 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -5148,7 +5148,7 @@ body.login > div.navbar.navbar-default.navbar-static-top > div > div.navbar-head
     pointer-events: none
 }
 
-#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
+#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #ClearCacheDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
     cursor: pointer
 }
 
@@ -5235,7 +5235,7 @@ body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > d
     margin-bottom: 20px
 }
 
-body.admin:not(.modal-open) .btn-default {
+body.admin .btn-default {
     margin-bottom: 10px
 }
 
@@ -5466,7 +5466,7 @@ body.admin.modal-open .navbar {
     z-index: 0 !important
 }
 
-#RestartDialog, #ShutdownDialog, #StatusDialog, #deleteModal {
+#RestartDialog, #ShutdownDialog, #StatusDialog, #ClearCacheDialog, #deleteModal {
     top: 0;
     overflow: hidden;
     padding-top: 70px;
@@ -5476,7 +5476,7 @@ body.admin.modal-open .navbar {
     background: rgba(0, 0, 0, .5)
 }
 
-#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #deleteModal:before {
+#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #ClearCacheDialog:before, #deleteModal:before {
     content: "\E208";
     padding-right: 10px;
     display: block;
@@ -5498,18 +5498,18 @@ body.admin.modal-open .navbar {
     z-index: 99
 }
 
-#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
     -webkit-transform: translate(0, 0);
     -ms-transform: translate(0, 0);
     transform: translate(0, 0)
 }
 
-#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
     width: 450px;
     margin: auto
 }
 
-#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
     max-height: calc(100% - 90px);
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
@@ -5520,7 +5520,7 @@ body.admin.modal-open .navbar {
     width: 450px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
     padding: 15px 20px;
     border-radius: 3px 3px 0 0;
     line-height: 1.71428571;
@@ -5533,7 +5533,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     padding-right: 10px;
     font-size: 18px;
     color: #999;
@@ -5557,6 +5557,11 @@ body.admin.modal-open .navbar {
     font-family: plex-icons-new, serif
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before {
+    content: "\EA15";
+    font-family: plex-icons-new, serif
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
     font-family: plex-icons-new, serif
@@ -5580,6 +5585,12 @@ body.admin.modal-open .navbar {
     font-size: 20px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:after {
+    content: "Clear Cover Thumbnail Cache";
+    display: inline-block;
+    font-size: 20px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-header:after {
     content: "Delete Book";
     display: inline-block;
@@ -5610,7 +5621,17 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body {
+    padding: 20px 20px 10px;
+    font-size: 16px;
+    line-height: 1.6em;
+    font-family: Open Sans Regular, Helvetica Neue, Helvetica, Arial, sans-serif;
+    color: #eee;
+    background: #282828;
+    text-align: left
+}
+
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
     padding: 20px 20px 0 0;
     font-size: 16px;
     line-height: 1.6em;
@@ -5619,7 +5640,7 @@ body.admin.modal-open .navbar {
     background: #282828
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     float: right;
     z-index: 9;
     position: relative;
@@ -5655,6 +5676,18 @@ body.admin.modal-open .navbar {
     border-radius: 3px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > #clear_cache {
+    float: right;
+    z-index: 9;
+    position: relative;
+    margin: 25px 0 0 10px;
+    min-width: 80px;
+    padding: 10px 18px;
+    font-size: 16px;
+    line-height: 1.33;
+    border-radius: 3px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
     float: right;
     z-index: 9;
@@ -5675,11 +5708,15 @@ body.admin.modal-open .navbar {
     margin: 55px 0 0 10px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache) {
+    margin: 25px 0 0 10px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     margin: 0 0 0 10px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
     background-color: hsla(0, 0%, 100%, .3)
 }
 
@@ -5713,6 +5750,21 @@ body.admin.modal-open .navbar {
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body:after {
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 72px;
+    background-color: #323232;
+    border-radius: 0 0 3px 3px;
+    left: 0;
+    margin-top: 10px;
+    z-index: 0;
+    border-top: 1px solid #222;
+    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+    box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
+}
+
 #deleteButton {
     position: fixed;
     top: 60px;
@@ -7299,11 +7351,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         background-color: transparent !important
     }
 
-    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
         max-width: calc(100vw - 40px)
     }
 
-    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
         max-width: calc(100vw - 40px);
         left: 0
     }
@@ -7453,7 +7505,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         padding: 30px 15px
     }
 
-    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
         left: auto;
         right: 34px
     }
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 834b9b30a..51d6095d4 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -430,6 +430,18 @@ $(function() {
             }
         });
     });
+    $("#clear_cache").click(function () {
+        $("#spinner3").show();
+        $.ajax({
+            dataType: "json",
+            url: window.location.pathname + "/../../clear-cache",
+            data: {"cache_type":"thumbnails"},
+            success: function(data) {
+                $("#spinner3").hide();
+                $("#ClearCacheDialog").modal("hide");
+            }
+        });
+    });
 
     // Init all data control handlers to default
     $("input[data-control]").trigger("change");
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
new file mode 100644
index 000000000..11f0186d4
--- /dev/null
+++ b/cps/tasks/database.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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
+
+from cps import config, logger
+from cps.services.worker import CalibreTask
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
+
+
+class TaskReconnectDatabase(CalibreTask):
+    def __init__(self, task_message=u'Reconnecting Calibre database'):
+        super(TaskReconnectDatabase, self).__init__(task_message)
+        self.log = logger.create()
+        self.listen_address = config.get_config_ipaddress()
+        self.listen_port = config.config_port
+
+    def run(self, worker_thread):
+        address = self.listen_address if self.listen_address else 'localhost'
+        port = self.listen_port if self.listen_port else 8083
+
+        try:
+            urlopen('http://' + address + ':' + str(port) + '/reconnect')
+            self._handleSuccess()
+        except Exception as ex:
+            self._handleError(u'Unable to reconnect Calibre database: ' + str(ex))
+
+    @property
+    def name(self):
+        return "Reconnect Database"
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
new file mode 100644
index 000000000..70ddc06bd
--- /dev/null
+++ b/cps/tasks/thumbnail.py
@@ -0,0 +1,366 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   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 os
+
+from cps import config, db, fs, gdriveutils, logger, ub
+from cps.services.worker import CalibreTask
+from datetime import datetime, timedelta
+from sqlalchemy import func
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
+
+try:
+    from wand.image import Image
+    use_IM = True
+except (ImportError, RuntimeError) as e:
+    use_IM = False
+
+THUMBNAIL_RESOLUTION_1X = 1
+THUMBNAIL_RESOLUTION_2X = 2
+
+
+class TaskGenerateCoverThumbnails(CalibreTask):
+    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
+        super(TaskGenerateCoverThumbnails, self).__init__(task_message)
+        self.limit = limit
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
+        self.resolutions = [
+            THUMBNAIL_RESOLUTION_1X,
+            THUMBNAIL_RESOLUTION_2X
+        ]
+
+    def run(self, worker_thread):
+        if self.calibre_db.session and use_IM:
+            expired_thumbnails = self.get_expired_thumbnails()
+            thumbnail_book_ids = self.get_thumbnail_book_ids()
+            books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
+
+            count = len(books_without_thumbnails)
+            if count == 0:
+                # Do not display this task on the frontend if there are no covers to update
+                self.self_cleanup = True
+
+            for i, book in enumerate(books_without_thumbnails):
+                for resolution in self.resolutions:
+                    expired_thumbnail = self.get_expired_thumbnail_for_book_and_resolution(
+                        book,
+                        resolution,
+                        expired_thumbnails
+                    )
+                    if expired_thumbnail:
+                        self.update_book_thumbnail(book, expired_thumbnail)
+                    else:
+                        self.create_book_thumbnail(book, resolution)
+
+                self.message = u'Generating cover thumbnail {0} of {1}'.format(i + 1, count)
+                self.progress = (1.0 / count) * i
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def get_expired_thumbnails(self):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.expiration < datetime.utcnow())\
+            .all()
+
+    def get_thumbnail_book_ids(self):
+        return self.app_db_session\
+            .query(ub.Thumbnail.book_id)\
+            .group_by(ub.Thumbnail.book_id)\
+            .having(func.min(ub.Thumbnail.expiration) > datetime.utcnow())\
+            .distinct()
+
+    def get_books_without_thumbnails(self, thumbnail_book_ids):
+        return self.calibre_db.session\
+            .query(db.Books)\
+            .filter(db.Books.has_cover == 1)\
+            .filter(db.Books.id.notin_(thumbnail_book_ids))\
+            .limit(self.limit)\
+            .all()
+
+    def get_expired_thumbnail_for_book_and_resolution(self, book, resolution, expired_thumbnails):
+        for thumbnail in expired_thumbnails:
+            if thumbnail.book_id == book.id and thumbnail.resolution == resolution:
+                return thumbnail
+
+        return None
+
+    def update_book_thumbnail(self, book, thumbnail):
+        thumbnail.generated_at = datetime.utcnow()
+        thumbnail.expiration = datetime.utcnow() + timedelta(days=30)
+
+        try:
+            self.app_db_session.commit()
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error updating book thumbnail: ' + str(ex))
+            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def create_book_thumbnail(self, book, resolution):
+        thumbnail = ub.Thumbnail()
+        thumbnail.book_id = book.id
+        thumbnail.format = 'jpeg'
+        thumbnail.resolution = resolution
+
+        self.app_db_session.add(thumbnail)
+        try:
+            self.app_db_session.commit()
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error creating book thumbnail: ' + str(ex))
+            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def generate_book_thumbnail(self, book, thumbnail):
+        if book and thumbnail:
+            if config.config_use_google_drive:
+                if not gdriveutils.is_gdrive_ready():
+                    raise Exception('Google Drive is configured but not ready')
+
+                web_content_link = gdriveutils.get_cover_via_gdrive(book.path)
+                if not web_content_link:
+                    raise Exception('Google Drive cover url not found')
+
+                stream = None
+                try:
+                    stream = urlopen(web_content_link)
+                    with Image(file=stream) as img:
+                        height = self.get_thumbnail_height(thumbnail)
+                        if img.height > height:
+                            width = self.get_thumbnail_width(height, img)
+                            img.resize(width=width, height=height, filter='lanczos')
+                            img.format = thumbnail.format
+                            filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                            img.save(filename=filename)
+                except Exception as ex:
+                    # Bubble exception to calling function
+                    self.log.info(u'Error generating thumbnail file: ' + str(ex))
+                    raise ex
+                finally:
+                    stream.close()
+            else:
+                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                if not os.path.isfile(book_cover_filepath):
+                    raise Exception('Book cover file not found')
+
+                with Image(filename=book_cover_filepath) as img:
+                    height = self.get_thumbnail_height(thumbnail)
+                    if img.height > height:
+                        width = self.get_thumbnail_width(height, img)
+                        img.resize(width=width, height=height, filter='lanczos')
+                        img.format = thumbnail.format
+                        filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                        img.save(filename=filename)
+
+    def get_thumbnail_height(self, thumbnail):
+        return int(225 * thumbnail.resolution)
+
+    def get_thumbnail_width(self, height, img):
+        percent = (height / float(img.height))
+        return int((float(img.width) * float(percent)))
+
+    @property
+    def name(self):
+        return "ThumbnailsGenerate"
+
+
+class TaskSyncCoverThumbnailCache(CalibreTask):
+    def __init__(self, task_message=u'Syncing cover thumbnail cache'):
+        super(TaskSyncCoverThumbnailCache, self).__init__(task_message)
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
+
+    def run(self, worker_thread):
+        cached_thumbnail_files = self.cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
+
+        # Expire thumbnails in the database if the cached file is missing
+        # This case will happen if a user deletes the cache dir or cached files
+        if self.app_db_session:
+            self.expire_missing_thumbnails(cached_thumbnail_files)
+            self.progress = 0.25
+
+        # Delete thumbnails in the database if the book has been removed
+        # This case will happen if a book is removed in Calibre and the metadata.db file is updated in the filesystem
+        if self.app_db_session and self.calibre_db:
+            book_ids = self.get_book_ids()
+            self.delete_thumbnails_for_missing_books(book_ids)
+            self.progress = 0.50
+
+        # Expire thumbnails in the database if their corresponding book has been updated since they were generated
+        # This case will happen if the book was updated externally
+        if self.app_db_session and self.cache:
+            books = self.get_books_updated_in_the_last_day()
+            book_ids = list(map(lambda b: b.id, books))
+            thumbnails = self.get_thumbnails_for_updated_books(book_ids)
+            self.expire_thumbnails_for_updated_book(books, thumbnails)
+            self.progress = 0.75
+
+        # Delete extraneous cached thumbnail files
+        # This case will happen if a book was deleted and the thumbnail OR the metadata.db file was changed externally
+        if self.app_db_session:
+            db_thumbnail_files = self.get_thumbnail_filenames()
+            self.delete_extraneous_thumbnail_files(cached_thumbnail_files, db_thumbnail_files)
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def expire_missing_thumbnails(self, filenames):
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.filename.notin_(filenames))\
+                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(u'Error expiring thumbnails for missing cache files: ' + str(ex))
+            self._handleError(u'Error expiring thumbnails for missing cache files: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def get_book_ids(self):
+        results = self.calibre_db.session\
+            .query(db.Books.id)\
+            .filter(db.Books.has_cover == 1)\
+            .distinct()
+
+        return [value for value, in results]
+
+    def delete_thumbnails_for_missing_books(self, book_ids):
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.book_id.notin_(book_ids))\
+                .delete(synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(str(ex))
+            self._handleError(u'Error deleting thumbnails for missing books: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def get_thumbnail_filenames(self):
+        results = self.app_db_session\
+            .query(ub.Thumbnail.filename)\
+            .all()
+
+        return [thumbnail for thumbnail, in results]
+
+    def delete_extraneous_thumbnail_files(self, cached_thumbnail_files, db_thumbnail_files):
+        extraneous_files = list(set(cached_thumbnail_files).difference(db_thumbnail_files))
+        for file in extraneous_files:
+            self.cache.delete_cache_file(file, fs.CACHE_TYPE_THUMBNAILS)
+
+    def get_books_updated_in_the_last_day(self):
+        return self.calibre_db.session\
+            .query(db.Books)\
+            .filter(db.Books.has_cover == 1)\
+            .filter(db.Books.last_modified > datetime.utcnow() - timedelta(days=1, hours=1))\
+            .all()
+
+    def get_thumbnails_for_updated_books(self, book_ids):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id.in_(book_ids))\
+            .all()
+
+    def expire_thumbnails_for_updated_book(self, books, thumbnails):
+        thumbnail_ids = list()
+        for book in books:
+            for thumbnail in thumbnails:
+                if thumbnail.book_id == book.id and thumbnail.generated_at < book.last_modified:
+                    thumbnail_ids.append(thumbnail.id)
+
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.id.in_(thumbnail_ids)) \
+                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(u'Error expiring thumbnails for updated books: ' + str(ex))
+            self._handleError(u'Error expiring thumbnails for updated books: ' + str(ex))
+            self.app_db_session.rollback()
+
+    @property
+    def name(self):
+        return "ThumbnailsSync"
+
+
+class TaskClearCoverThumbnailCache(CalibreTask):
+    def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
+        super(TaskClearCoverThumbnailCache, self).__init__(task_message)
+        self.log = logger.create()
+        self.book_id = book_id
+        self.app_db_session = ub.get_new_session_instance()
+        self.cache = fs.FileSystem()
+
+    def run(self, worker_thread):
+        if self.app_db_session:
+            if self.book_id:
+                thumbnails = self.get_thumbnails_for_book(self.book_id)
+                for thumbnail in thumbnails:
+                    self.expire_and_delete_thumbnail(thumbnail)
+            else:
+                self.expire_and_delete_all_thumbnails()
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def get_thumbnails_for_book(self, book_id):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book_id)\
+            .all()
+
+    def expire_and_delete_thumbnail(self, thumbnail):
+        thumbnail.expiration = datetime.utcnow()
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error expiring book thumbnail: ' + str(ex))
+            self._handleError(u'Error expiring book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def expire_and_delete_all_thumbnails(self):
+        self.app_db_session\
+            .query(ub.Thumbnail)\
+            .update({'expiration': datetime.utcnow()})
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_dir(fs.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error expiring book thumbnails: ' + str(ex))
+            self._handleError(u'Error expiring book thumbnails: ' + str(ex))
+            self.app_db_session.rollback()
+
+    @property
+    def name(self):
+        return "ThumbnailsClear"
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 576652d47..20d0802c3 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -142,15 +142,18 @@
     </div>
   </div>
 
-    <div class="row form-group">
+  <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 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="clear_cover_thumbnail_cache" data-toggle="modal" data-target="#ClearCacheDialog">{{_('Clear Cover Thumbnail Cache')}}</div>
+  </div>
+  <div class="row form-group">
+    <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 class="row">
@@ -231,4 +234,21 @@
     </div>
   </div>
 </div>
+<div id="ClearCacheDialog" class="modal fade" role="dialog">
+  <div class="modal-dialog modal-sm">
+    <!-- Modal content-->
+    <div class="modal-content">
+      <div class="modal-header bg-info"></div>
+      <div class="modal-body text-center">
+        <p>{{_('Are you sure you want to clear the cover thumbnail cache?')}}</p>
+        <div id="spinner3" class="spinner" style="display:none;">
+          <img id="img-spinner3" src="{{ url_for('static', filename='css/libs/images/loading-icon.gif') }}"/>
+        </div>
+        <p></p>
+        <button type="button" class="btn btn-default" id="clear_cache" >{{_('OK')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
 {% endblock %}
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 4e32db80a..990f60ad2 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -37,7 +37,7 @@
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
             <span class="img">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" />
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
new file mode 100644
index 000000000..c52817976
--- /dev/null
+++ b/cps/templates/book_cover.html
@@ -0,0 +1,13 @@
+{% macro book_cover_image(book, thumbnails) -%}
+    {%- set book_title = book.title if book.title else book.name -%}
+    {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
+    {%- if srcset|length -%}
+        <img
+            srcset="{{ srcset }}"
+            src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
+            alt="{{ book_title }}"
+        />
+    {%- else -%}
+        <img src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}" alt="{{ book_title }}" />
+    {%- endif -%}
+{%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index c0fc141ed..091beffcb 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -1,9 +1,10 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 {% 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, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/>
+        {{ book_cover_image(book, book.id|get_book_thumbnails(thumbnails)) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 342cce536..3e2b65ac7 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,7 @@
   <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, edit=1|uuidfilter) }}" alt="{{ entry.title }}" />
+          {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index d57994b4f..02eff6583 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover load-more">
@@ -9,7 +10,7 @@
         {% 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">
             <span class="img">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/fragment.html b/cps/templates/fragment.html
index 1421ea6af..901dd1931 100644
--- a/cps/templates/fragment.html
+++ b/cps/templates/fragment.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 <div class="container-fluid">
   {% block body %}{% endblock %}
 </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 9724e31db..2eecd6c6f 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <h1 class="{{page}}">{{_(title)}}</h1>
@@ -29,7 +30,7 @@
                   <div class="cover">
                       <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 }}"/>
+                              {{ book_cover_image(entry[0], entry[0].id|get_book_thumbnails(thumbnails)) }}
                               <span class="badge">{{entry.count}}</span>
                             </span>
                       </a>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index d300fc65a..579f19f73 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if g.user.show_detail_random() %}
@@ -9,7 +10,7 @@
       <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 }}" />
+                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
@@ -86,7 +87,7 @@
       <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 }}"/>
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 318140faa..fef082bb5 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -1,4 +1,5 @@
 {% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal, delete_confirm_modal, change_confirm_modal %}
+{% from 'book_cover.html' import book_cover_image %}
 <!DOCTYPE html>
 <html lang="{{ g.user.locale }}">
   <head>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index d11f3ec85..428655ead 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -44,7 +45,7 @@
         {% 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">
             <span class="img">
-                <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 1ad79dbd7..e49a008fe 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -31,7 +32,7 @@
       <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 }}" />
+                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>
diff --git a/cps/ub.py b/cps/ub.py
index ecf986791..af53e4f8b 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -18,6 +18,7 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import division, print_function, unicode_literals
+import atexit
 import os
 import sys
 import datetime
@@ -441,6 +442,27 @@ class RemoteAuthToken(Base):
         return '<Token %r>' % self.id
 
 
+def filename(context):
+    file_format = context.get_current_parameters()['format']
+    if file_format == 'jpeg':
+        return context.get_current_parameters()['uuid'] + '.jpg'
+    else:
+        return context.get_current_parameters()['uuid'] + '.' + file_format
+
+
+class Thumbnail(Base):
+    __tablename__ = 'thumbnail'
+
+    id = Column(Integer, primary_key=True)
+    book_id = Column(Integer)
+    uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
+    format = Column(String, default='jpeg')
+    resolution = Column(SmallInteger, default=1)
+    filename = Column(String, default=filename)
+    generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
+    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
+
+
 # Add missing tables during migration of database
 def add_missing_tables(engine, session):
     if not engine.dialect.has_table(engine.connect(), "book_read_link"):
@@ -455,6 +477,8 @@ def add_missing_tables(engine, session):
         KoboStatistics.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "archived_book"):
         ArchivedBook.__table__.create(bind=engine)
+    if not engine.dialect.has_table(engine.connect(), "thumbnail"):
+        Thumbnail.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "registration"):
         Registration.__table__.create(bind=engine)
         with engine.connect() as conn:
@@ -725,6 +749,16 @@ def init_db(app_db_path):
             sys.exit(3)
 
 
+def get_new_session_instance():
+    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settingspath), echo=False)
+    new_session = scoped_session(sessionmaker())
+    new_session.configure(bind=new_engine)
+
+    atexit.register(lambda: new_session.remove() if new_session else True)
+
+    return new_session
+
+
 def dispose():
     global session
 
diff --git a/cps/web.py b/cps/web.py
index ad8cd5daa..5bf226abb 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,9 +50,10 @@ 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, \
-    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 .helper import check_valid_domain, render_task_status, get_cc_columns, get_book_cover, get_cached_book_cover, \
+    get_cached_book_cover_thumbnail, get_thumbnails_for_books, get_thumbnails_for_book_series, 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
@@ -411,8 +412,9 @@ def render_books_list(data, sort, book_id, page):
     else:
         website = data or "newest"
         entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Books"), page=website)
+                                     title=_(u"Books"), page=website, thumbnails=thumbnails)
 
 
 def render_rated_books(page, book_id, order):
@@ -457,8 +459,9 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Hot Books (Most Downloaded)"), page="hot")
+                                     title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -482,12 +485,14 @@ def render_downloaded_books(page, order):
                              .filter(db.Books.id == book.id).first():
                 ub.delete_download(book.id)
 
+        thumbnails = get_thumbnails_for_books(entries + random)
         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")
+                                     page="download",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -498,6 +503,7 @@ def render_author_books(page, author_id, order):
                                                         db.Books.authors.any(db.Authors.id == author_id),
                                                         [order[0], db.Series.name, db.Books.series_index],
                                                         db.books_series_link,
+                                                        db.Books.id==db.books_series_link.c.book,
                                                         db.Series)
     if entries is None or not len(entries):
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
@@ -513,9 +519,10 @@ def render_author_books(page, author_id, order):
         author_info = services.goodreads_support.get_author_info(author_name)
         other_books = services.goodreads_support.get_other_books(author_info, entries)
 
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
                                  title=_(u"Author: %(name)s", name=author_name), author=author_info,
-                                 other_books=other_books, page="author")
+                                 other_books=other_books, page="author", thumbnails=thumbnails)
 
 
 def render_publisher_books(page, book_id, order):
@@ -526,9 +533,12 @@ def render_publisher_books(page, book_id, order):
                                                                 db.Books.publishers.any(db.Publishers.id == book_id),
                                                                 [db.Series.name, order[0], db.Books.series_index],
                                                                 db.books_series_link,
+                                                                db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher")
+                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -540,8 +550,10 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
+        thumbnails = get_thumbnails_for_books(entries + random)
         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")
+                                     title=_(u"Series: %(serie)s", serie=name.name), page="series",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -553,8 +565,10 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
+        thumbnails = get_thumbnails_for_books(entries + random)
         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")
+                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -566,8 +580,10 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
+        thumbnails = get_thumbnails_for_books(entries + random)
         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")
+                                     title=_(u"File format: %(format)s", format=name.format), page="formats",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -579,9 +595,13 @@ def render_category_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.tags.any(db.Tags.id == book_id),
                                                                 [order[0], db.Series.name, db.Books.series_index],
-                                                                db.books_series_link, db.Series)
+                                                                db.books_series_link,
+                                                                db.Books.id == db.books_series_link.c.book,
+                                                                db.Series)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Category: %(name)s", name=name.name), page="category")
+                                     title=_(u"Category: %(name)s", name=name.name), page="category",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -599,8 +619,9 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
+    thumbnails = get_thumbnails_for_books(entries + random)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
-                                 title=_(u"Language: %(name)s", name=lang_name), page="language")
+                                 title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
 
 
 def render_read_books(page, are_read, as_xml=False, order=None):
@@ -644,8 +665,10 @@ def render_read_books(page, are_read, as_xml=False, order=None):
         else:
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
+
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=name, page=pagename)
+                                     title=name, page=pagename, thumbnails=thumbnails)
 
 
 def render_archived_books(page, order):
@@ -668,8 +691,9 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
+    thumbnails = get_thumbnails_for_books(entries + random)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=name, page=pagename)
+                                 title=name, page=pagename, thumbnails=thumbnails)
 
 
 def render_prepare_search_form(cc):
@@ -702,6 +726,7 @@ def render_prepare_search_form(cc):
 
 def render_search_results(term, offset=None, order=None, limit=None):
     entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit)
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  searchterm=term,
                                  pagination=pagination,
@@ -710,7 +735,8 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                  entries=entries,
                                  result_count=result_count,
                                  title=_(u"Search"),
-                                 page="search")
+                                 page="search",
+                                 thumbnails=thumbnails)
 
 
 # ################################### View Books list ##################################################################
@@ -740,6 +766,7 @@ def books_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():
@@ -772,6 +799,7 @@ def list_books():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @web.route("/ajax/table_settings", methods=['POST'])
 @login_required
 def update_table_settings():
@@ -826,6 +854,7 @@ def publisher_list():
         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()
+
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher")
     else:
@@ -857,8 +886,10 @@ def series_list():
                 .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()
 
+            thumbnails = get_thumbnails_for_book_series(entries)
             return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                         title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view")
+                                         title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view",
+                                         thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -1235,13 +1266,16 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     else:
         offset = 0
         limit_all = result_count
+
+    thumbnails = get_thumbnails_for_books(entries)
     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")
-
+                                 title=_(u"Advanced Search"),
+                                 page="advsearch",
+                                 thumbnails=thumbnails)
 
 
 @web.route("/advsearch", methods=['GET'])
@@ -1260,10 +1294,24 @@ def advanced_search_form():
 def get_cover(book_id):
     return get_book_cover(book_id)
 
+
+@web.route("/cached-cover/<string:cache_id>")
+@login_required_if_no_ano
+def get_cached_cover(cache_id):
+    return get_cached_book_cover(cache_id)
+
+
+@web.route("/cached-cover-thumbnail/<string:cache_id>")
+@login_required_if_no_ano
+def get_cached_cover_thumbnail(cache_id):
+    return get_cached_book_cover_thumbnail(cache_id)
+
+
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")
 
+
 @web.route("/show/<int:book_id>/<book_format>", defaults={'anyname': 'None'})
 @web.route("/show/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
@@ -1293,7 +1341,6 @@ def serve_book(book_id, book_format, anyname):
         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
@@ -1481,9 +1528,6 @@ def logout():
     return redirect(url_for('web.login'))
 
 
-
-
-
 # ################################### 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:
@@ -1683,6 +1727,7 @@ def show_book(book_id):
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
                 audioentries.append(media_format.format.lower())
 
+        thumbnails = get_thumbnails_for_books([entries])
         return render_title_template('detail.html',
                                      entry=entries,
                                      audioentries=audioentries,
@@ -1694,7 +1739,8 @@ def show_book(book_id):
                                      is_archived=is_archived,
                                      kindle_list=kindle_list,
                                      reader_list=reader_list,
-                                     page="book")
+                                     page="book",
+                                     thumbnails=thumbnails)
     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/requirements.txt b/requirements.txt
index ca11eff91..5a26381ef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+APScheduler>=3.6.3, <3.8.0
 Babel>=1.3, <2.9
 Flask-Babel>=0.11.1,<2.1.0
 Flask-Login>=0.3.2,<0.5.1

From 1e7a2c400ba6c6a6b661c1a086d85a95cd813806 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 20 Mar 2021 14:06:15 +0100
Subject: [PATCH 011/412] Fixed misstyping

---
 cps/config_sql.py  | 2 +-
 cps/db.py          | 2 +-
 cps/gdriveutils.py | 2 +-
 cps/ub.py          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index 17f1c613b..78e6c9c92 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -24,7 +24,7 @@ import sys
 from sqlalchemy import exc, Column, String, Integer, SmallInteger, Boolean, BLOB, JSON
 from sqlalchemy.exc import OperationalError
 try:
-    # Compability with sqlalchemy 2.0
+    # Compatibility with sqlalchemy 2.0
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
diff --git a/cps/db.py b/cps/db.py
index f43cc8114..883eec051 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -32,7 +32,7 @@ from sqlalchemy.orm import relationship, sessionmaker, scoped_session
 from sqlalchemy.orm.collections import InstrumentedList
 from sqlalchemy.ext.declarative import DeclarativeMeta
 try:
-    # Compability with sqlalchemy 2.0
+    # Compatibility with sqlalchemy 2.0
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 5f9705547..c7a95ca57 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -29,7 +29,7 @@ from sqlalchemy import Column, UniqueConstraint
 from sqlalchemy import String, Integer
 from sqlalchemy.orm import sessionmaker, scoped_session
 try:
-    # Compability with sqlalchemy 2.0
+    # Compatibility with sqlalchemy 2.0
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
diff --git a/cps/ub.py b/cps/ub.py
index af53e4f8b..4a76ea490 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -45,7 +45,7 @@ from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float,
 from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.sql.expression import func
 try:
-    # Compability with sqlalchemy 2.0
+    # Compatibility with sqlalchemy 2.0
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base

From 9a08bcd2bc0a5280cbb293d1306b7c4e2ad6d792 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 16 Sep 2021 23:20:11 -0500
Subject: [PATCH 012/412] Started addressing some PR comments

---
 cps/admin.py                  |  1 -
 cps/templates/book_cover.html |  3 ++-
 cps/updater.py                |  2 +-
 cps/web.py                    | 26 ++++++++++++++------------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 32d66a6f1..98535320f 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -41,7 +41,6 @@ from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
 from . import constants, logger, helper, services, isoLanguages, fs
-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, check_email, \
     valid_email, check_username
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index c52817976..67e7c24bc 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,5 +1,6 @@
-{% macro book_cover_image(book, thumbnails) -%}
+{% macro book_cover_image(book, thumbnails, title) -%}
     {%- set book_title = book.title if book.title else book.name -%}
+    {%- set book_title = title if title else book_title -%}
     {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
     {%- if srcset|length -%}
         <img
diff --git a/cps/updater.py b/cps/updater.py
index 63ea23bfb..8c6c9f7c2 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -265,7 +265,7 @@ class Updater(threading.Thread):
             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', os.sep + 'cps' + os.sep + '.HOMEDIR',
-            os.sep + 'gmail.json'
+            os.sep + 'gmail.json', os.sep + 'cps' + os.sep + 'cache'
         )
         additional_path = self.is_venv()
         if additional_path:
diff --git a/cps/web.py b/cps/web.py
index 1b7148ea8..64bdd8e4a 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -415,7 +415,8 @@ def render_books_list(data, sort, book_id, page):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random)
+
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Books"), page=website, thumbnails=thumbnails)
 
@@ -466,7 +467,7 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
     else:
@@ -497,7 +498,7 @@ def render_downloaded_books(page, order, user_id):
                 ub.delete_download(book.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
 
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html',
                                      random=random,
                                      entries=entries,
@@ -550,7 +551,7 @@ def render_publisher_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
                                      thumbnails=thumbnails)
@@ -565,7 +566,7 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         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",
                                      thumbnails=thumbnails)
@@ -580,7 +581,7 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         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",
                                      thumbnails=thumbnails)
@@ -595,7 +596,7 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         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",
                                      thumbnails=thumbnails)
@@ -613,7 +614,7 @@ def render_category_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Category: %(name)s", name=name.name), page="category",
                                      thumbnails=thumbnails)
@@ -634,7 +635,7 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
-    thumbnails = get_thumbnails_for_books(entries + random)
+    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
 
@@ -687,7 +688,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
 
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=name, page=pagename, thumbnails=thumbnails)
 
@@ -712,7 +713,7 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
-    thumbnails = get_thumbnails_for_books(entries + random)
+    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                  title=name, page=pagename, thumbnails=thumbnails)
 
@@ -1392,11 +1393,12 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         offset = 0
         limit_all = result_count
 
+    entries = q[offset:limit_all]
     thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
-                                 entries=q[offset:limit_all],
+                                 entries=entries,
                                  result_count=result_count,
                                  title=_(u"Advanced Search"),
                                  page="advsearch",

From d648785471b8213dc0d080c563aafba07f5408ab Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Fri, 17 Sep 2021 01:42:56 -0500
Subject: [PATCH 013/412] Review feedback fixes

---
 cps/helper.py                        |  5 +++--
 cps/jinjia.py                        |  2 ++
 cps/schedule.py                      |  7 +++++--
 cps/services/background_scheduler.py |  4 ++--
 cps/tasks/thumbnail.py               |  1 +
 cps/templates/book_cover.html        |  2 +-
 cps/ub.py                            |  2 +-
 cps/web.py                           | 22 +++++++++++-----------
 8 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 758d2531b..6f22a7017 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -554,13 +554,14 @@ def get_thumbnails_for_books(books):
     cache = fs.FileSystem()
     thumbnail_files = cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
 
-    return ub.session\
+    thumbnails = ub.session\
         .query(ub.Thumbnail)\
         .filter(ub.Thumbnail.book_id.in_(book_ids))\
-        .filter(ub.Thumbnail.filename.in_(thumbnail_files))\
         .filter(ub.Thumbnail.expiration > datetime.utcnow())\
         .all()
 
+    return list(filter(lambda t: t.filename in thumbnail_files, thumbnails))
+
 
 def get_thumbnails_for_book_series(series):
     books = list(map(lambda s: s[0], series))
diff --git a/cps/jinjia.py b/cps/jinjia.py
index ac6d3d335..5f86478cd 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -129,10 +129,12 @@ def formatseriesindex_filter(series_index):
             return series_index
     return 0
 
+
 @jinjia.app_template_filter('escapedlink')
 def escapedlink_filter(url, text):
     return "<a href='{}'>{}</a>".format(url, escape(text))
 
+
 @jinjia.app_template_filter('uuidfilter')
 def uuidfilter(var):
     return uuid4()
diff --git a/cps/schedule.py b/cps/schedule.py
index 7ee434102..8ab9c7328 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -18,6 +18,7 @@
 
 from __future__ import division, print_function, unicode_literals
 
+from datetime import datetime
 from .services.background_scheduler import BackgroundScheduler
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
@@ -26,8 +27,10 @@ from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumb
 def register_jobs():
     scheduler = BackgroundScheduler()
 
-    # Generate 100 book cover thumbnails every 5 minutes
-    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='cron', minute='*/5')
+    # Generate up to 1000 book covers daily
+    generate_thumbnails_task = scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=1000),
+                                                  trigger='interval', days=1)
+    generate_thumbnails_task.modify(next_run_time=datetime.now())
 
     # Cleanup book cover cache every 6 hours
     scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', minute='15', hour='*/6')
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index efa573799..122168e8c 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -41,7 +41,7 @@ class BackgroundScheduler:
         return cls._instance
 
     def add(self, func, trigger, **trigger_args):
-        self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+        return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
 
     def add_task(self, user, task, trigger, **trigger_args):
         def scheduled_task():
@@ -49,4 +49,4 @@ class BackgroundScheduler:
             self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
             WorkerThread.add(user, worker_task)
 
-        self.add(func=scheduled_task, trigger=trigger, **trigger_args)
+        return self.add(func=scheduled_task, trigger=trigger, **trigger_args)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 70ddc06bd..fed12e8ba 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -37,6 +37,7 @@ except (ImportError, RuntimeError) as e:
 
 THUMBNAIL_RESOLUTION_1X = 1
 THUMBNAIL_RESOLUTION_2X = 2
+THUMBNAIL_RESOLUTION_3X = 3
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index 67e7c24bc..884ff4cd6 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,4 +1,4 @@
-{% macro book_cover_image(book, thumbnails, title) -%}
+{% macro book_cover_image(book, thumbnails, title=None) -%}
     {%- set book_title = book.title if book.title else book.name -%}
     {%- set book_title = title if title else book_title -%}
     {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
diff --git a/cps/ub.py b/cps/ub.py
index 9d3a5845c..e0bee4efd 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -532,7 +532,7 @@ class Thumbnail(Base):
     resolution = Column(SmallInteger, default=1)
     filename = Column(String, default=filename)
     generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
-    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
+    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=90))
 
 
 # Add missing tables during migration of database
diff --git a/cps/web.py b/cps/web.py
index 64bdd8e4a..f43bc6ad1 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -416,7 +416,7 @@ def render_books_list(data, sort, book_id, page):
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
 
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Books"), page=website, thumbnails=thumbnails)
 
@@ -467,7 +467,7 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
     else:
@@ -498,7 +498,7 @@ def render_downloaded_books(page, order, user_id):
                 ub.delete_download(book.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
 
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html',
                                      random=random,
                                      entries=entries,
@@ -551,7 +551,7 @@ def render_publisher_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
                                      thumbnails=thumbnails)
@@ -566,7 +566,7 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         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",
                                      thumbnails=thumbnails)
@@ -581,7 +581,7 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         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",
                                      thumbnails=thumbnails)
@@ -596,7 +596,7 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         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",
                                      thumbnails=thumbnails)
@@ -614,7 +614,7 @@ def render_category_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Category: %(name)s", name=name.name), page="category",
                                      thumbnails=thumbnails)
@@ -635,7 +635,7 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
-    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+    thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
 
@@ -688,7 +688,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
 
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=name, page=pagename, thumbnails=thumbnails)
 
@@ -713,7 +713,7 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
-    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+    thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                  title=name, page=pagename, thumbnails=thumbnails)
 

From 8bee2b9552f3ad2e0b3b04b1f3302d67e98b4614 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sun, 19 Sep 2021 22:45:19 -0500
Subject: [PATCH 014/412] Added CACHE_DIR env variable, graceful handling when
 APScheduler is not installed

---
 cps/constants.py                     |  5 ++++-
 cps/fs.py                            |  8 ++++++++
 cps/helper.py                        |  2 ++
 cps/schedule.py                      | 15 +++++++--------
 cps/services/background_scheduler.py | 26 +++++++++++++++++++-------
 5 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/cps/constants.py b/cps/constants.py
index 1e44796a3..6a6b8f2bb 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -40,7 +40,10 @@ else:
 STATIC_DIR          = os.path.join(BASE_DIR, 'cps', 'static')
 TEMPLATES_DIR       = os.path.join(BASE_DIR, 'cps', 'templates')
 TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
-CACHE_DIR           = os.path.join(BASE_DIR, 'cps', 'cache')
+
+# Cache dir - use CACHE_DIR environment variable, otherwise use the default directory: cps/cache
+DEFAULT_CACHE_DIR   = os.path.join(BASE_DIR, 'cps', 'cache')
+CACHE_DIR           = os.environ.get("CACHE_DIR", DEFAULT_CACHE_DIR)
 
 if HOME_CONFIG:
     home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
diff --git a/cps/fs.py b/cps/fs.py
index 699d59912..8528e39c7 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -50,6 +50,14 @@ class FileSystem:
         path = self.get_cache_dir(cache_type)
         return [file for file in listdir(path) if isfile(join(path, file))]
 
+    def list_existing_cache_files(self, filenames, cache_type=None):
+        path = self.get_cache_dir(cache_type)
+        return [file for file in listdir(path) if isfile(join(path, file)) and file in filenames]
+
+    def list_missing_cache_files(self, filenames, cache_type=None):
+        path = self.get_cache_dir(cache_type)
+        return [file for file in listdir(path) if isfile(join(path, file)) and file not in filenames]
+
     def delete_cache_dir(self, cache_type=None):
         if not cache_type and isdir(self._cache_dir):
             rmtree(self._cache_dir)
diff --git a/cps/helper.py b/cps/helper.py
index 6f22a7017..688bc6150 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -405,6 +405,7 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                      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,6 +506,7 @@ def uniq(inpt):
             output.append(x)
     return output
 
+
 def check_email(email):
     email = valid_email(email)
     if ub.session.query(ub.User).filter(func.lower(ub.User.email) == email.lower()).first():
diff --git a/cps/schedule.py b/cps/schedule.py
index 8ab9c7328..649b65a3a 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -27,13 +27,12 @@ from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumb
 def register_jobs():
     scheduler = BackgroundScheduler()
 
-    # Generate up to 1000 book covers daily
-    generate_thumbnails_task = scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=1000),
-                                                  trigger='interval', days=1)
-    generate_thumbnails_task.modify(next_run_time=datetime.now())
+    if scheduler:
+        # Reconnect metadata.db once every 12 hours
+        scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='interval', hours=12)
 
-    # Cleanup book cover cache every 6 hours
-    scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', minute='15', hour='*/6')
+        # Cleanup book cover cache once every 24 hours
+        scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='interval', days=1)
 
-    # Reconnect metadata.db every 4 hours
-    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', minute='5', hour='*/4')
+        # Generate all missing book cover thumbnails once every 24 hours
+        scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='interval', days=1)
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index 122168e8c..f2688b7f9 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -21,13 +21,23 @@ import atexit
 
 from .. import logger
 from .worker import WorkerThread
-from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+
+try:
+    from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+    use_APScheduler = True
+except (ImportError, RuntimeError) as e:
+    use_APScheduler = False
+    log = logger.create()
+    log.info(f'APScheduler not found. Unable to schedule tasks.')
 
 
 class BackgroundScheduler:
     _instance = None
 
     def __new__(cls):
+        if not use_APScheduler:
+            return False
+
         if cls._instance is None:
             cls._instance = super(BackgroundScheduler, cls).__new__(cls)
 
@@ -41,12 +51,14 @@ class BackgroundScheduler:
         return cls._instance
 
     def add(self, func, trigger, **trigger_args):
-        return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+        if use_APScheduler:
+            return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
 
     def add_task(self, user, task, trigger, **trigger_args):
-        def scheduled_task():
-            worker_task = task()
-            self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
-            WorkerThread.add(user, worker_task)
+        if use_APScheduler:
+            def scheduled_task():
+                worker_task = task()
+                self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
+                WorkerThread.add(user, worker_task)
 
-        return self.add(func=scheduled_task, trigger=trigger, **trigger_args)
+            return self.add(func=scheduled_task, trigger=trigger, **trigger_args)

From 524ed07a6c3daf6c8e746a9b5e69f76742fe2301 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Tue, 21 Sep 2021 23:39:00 -0500
Subject: [PATCH 015/412] Handle read only access to cache dir gracefully.
 minor cleanup

---
 cps.py                               |  3 +-
 cps/fs.py                            | 44 ++++++++++++++++++++++------
 cps/schedule.py                      | 12 +++++---
 cps/services/background_scheduler.py |  4 +--
 4 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/cps.py b/cps.py
index 82137bbc3..fe0065519 100755
--- a/cps.py
+++ b/cps.py
@@ -44,7 +44,7 @@ from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.search_metadata import meta
 from cps.error_handler import init_errorhandler
-from cps.schedule import register_jobs
+from cps.schedule import register_jobs, register_startup_jobs
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -83,6 +83,7 @@ def main():
 
     # Register scheduled jobs
     register_jobs()
+    # register_startup_jobs()
 
     success = web_server.start()
     sys.exit(0 if success else 1)
diff --git a/cps/fs.py b/cps/fs.py
index 8528e39c7..4f835fa64 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -17,6 +17,7 @@
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import division, print_function, unicode_literals
+from . import logger
 from .constants import CACHE_DIR
 from os import listdir, makedirs, remove
 from os.path import isdir, isfile, join
@@ -32,16 +33,26 @@ class FileSystem:
     def __new__(cls):
         if cls._instance is None:
             cls._instance = super(FileSystem, cls).__new__(cls)
+            cls.log = logger.create()
         return cls._instance
 
     def get_cache_dir(self, cache_type=None):
         if not isdir(self._cache_dir):
-            makedirs(self._cache_dir)
+            try:
+                makedirs(self._cache_dir)
+            except OSError:
+                self.log.info(f'Failed to create path {self._cache_dir} (Permission denied).')
+                return False
 
-        if cache_type and not isdir(join(self._cache_dir, cache_type)):
-            makedirs(join(self._cache_dir, cache_type))
+        path = join(self._cache_dir, cache_type)
+        if cache_type and not isdir(path):
+            try:
+                makedirs(path)
+            except OSError:
+                self.log.info(f'Failed to create path {path} (Permission denied).')
+                return False
 
-        return join(self._cache_dir, cache_type) if cache_type else self._cache_dir
+        return path if cache_type else self._cache_dir
 
     def get_cache_file_path(self, filename, cache_type=None):
         return join(self.get_cache_dir(cache_type), filename) if filename else None
@@ -60,10 +71,25 @@ class FileSystem:
 
     def delete_cache_dir(self, cache_type=None):
         if not cache_type and isdir(self._cache_dir):
-            rmtree(self._cache_dir)
-        if cache_type and isdir(join(self._cache_dir, cache_type)):
-            rmtree(join(self._cache_dir, cache_type))
+            try:
+                rmtree(self._cache_dir)
+            except OSError:
+                self.log.info(f'Failed to delete path {self._cache_dir} (Permission denied).')
+                return False
+
+        path = join(self._cache_dir, cache_type)
+        if cache_type and isdir(path):
+            try:
+                rmtree(path)
+            except OSError:
+                self.log.info(f'Failed to delete path {path} (Permission denied).')
+                return False
 
     def delete_cache_file(self, filename, cache_type=None):
-        if isfile(join(self.get_cache_dir(cache_type), filename)):
-            remove(join(self.get_cache_dir(cache_type), filename))
+        path = join(self.get_cache_dir(cache_type), filename)
+        if isfile(path):
+            try:
+                remove(path)
+            except OSError:
+                self.log.info(f'Failed to delete path {path} (Permission denied).')
+                return False
diff --git a/cps/schedule.py b/cps/schedule.py
index 649b65a3a..d427d908d 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -18,8 +18,8 @@
 
 from __future__ import division, print_function, unicode_literals
 
-from datetime import datetime
 from .services.background_scheduler import BackgroundScheduler
+from .services.worker import WorkerThread
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
 
@@ -29,10 +29,14 @@ def register_jobs():
 
     if scheduler:
         # Reconnect metadata.db once every 12 hours
-        scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='interval', hours=12)
+        scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
 
         # Cleanup book cover cache once every 24 hours
-        scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='interval', days=1)
+        scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', hour=4)
 
         # Generate all missing book cover thumbnails once every 24 hours
-        scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='interval', days=1)
+        scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
+
+
+def register_startup_jobs():
+    WorkerThread.add(None, TaskGenerateCoverThumbnails())
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index f2688b7f9..1b588ac20 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -28,7 +28,7 @@ try:
 except (ImportError, RuntimeError) as e:
     use_APScheduler = False
     log = logger.create()
-    log.info(f'APScheduler not found. Unable to schedule tasks.')
+    log.info('APScheduler not found. Unable to schedule tasks.')
 
 
 class BackgroundScheduler:
@@ -58,7 +58,7 @@ class BackgroundScheduler:
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
-                self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
+                self.log.info(f'Running scheduled task in background: {worker_task.name} - {worker_task.message}')
                 WorkerThread.add(user, worker_task)
 
             return self.add(func=scheduled_task, trigger=trigger, **trigger_args)

From be28a9131553b7f29df6c712096530bdb62ae122 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Fri, 24 Sep 2021 03:11:14 -0500
Subject: [PATCH 016/412] Simplified all of the thumbnail generation and
 loading.

---
 cps/fs.py                     |  14 +-
 cps/helper.py                 |  61 +--------
 cps/jinjia.py                 |  26 ++--
 cps/schedule.py               |   5 +-
 cps/tasks/thumbnail.py        | 250 +++++++---------------------------
 cps/templates/author.html     |   3 +-
 cps/templates/book_cover.html |  19 ++-
 cps/templates/book_edit.html  |   3 +-
 cps/templates/detail.html     |   3 +-
 cps/templates/discover.html   |   3 +-
 cps/templates/grid.html       |   3 +-
 cps/templates/index.html      |   6 +-
 cps/templates/search.html     |   3 +-
 cps/templates/shelf.html      |   3 +-
 cps/ub.py                     |   2 +-
 cps/web.py                    |  83 +++--------
 16 files changed, 111 insertions(+), 376 deletions(-)

diff --git a/cps/fs.py b/cps/fs.py
index 4f835fa64..30ab552a9 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -57,17 +57,9 @@ class FileSystem:
     def get_cache_file_path(self, filename, cache_type=None):
         return join(self.get_cache_dir(cache_type), filename) if filename else None
 
-    def list_cache_files(self, cache_type=None):
-        path = self.get_cache_dir(cache_type)
-        return [file for file in listdir(path) if isfile(join(path, file))]
-
-    def list_existing_cache_files(self, filenames, cache_type=None):
-        path = self.get_cache_dir(cache_type)
-        return [file for file in listdir(path) if isfile(join(path, file)) and file in filenames]
-
-    def list_missing_cache_files(self, filenames, cache_type=None):
-        path = self.get_cache_dir(cache_type)
-        return [file for file in listdir(path) if isfile(join(path, file)) and file not in filenames]
+    def get_cache_file_exists(self, filename, cache_type=None):
+        path = self.get_cache_file_path(filename, cache_type)
+        return isfile(path)
 
     def delete_cache_dir(self, cache_type=None):
         if not cache_type and isdir(self._cache_dir):
diff --git a/cps/helper.py b/cps/helper.py
index 688bc6150..1652be236 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -35,7 +35,7 @@ from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_login import current_user
-from sqlalchemy.sql.expression import true, false, and_, text, func
+from sqlalchemy.sql.expression import true, false, and_, or_, text, func
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash
 from markupsafe import escape
@@ -550,26 +550,6 @@ def delete_book(book, calibrepath, book_format):
         return delete_book_file(book, calibrepath, book_format)
 
 
-def get_thumbnails_for_books(books):
-    books_with_covers = list(filter(lambda b: b.has_cover, books))
-    book_ids = list(map(lambda b: b.id, books_with_covers))
-    cache = fs.FileSystem()
-    thumbnail_files = cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
-
-    thumbnails = ub.session\
-        .query(ub.Thumbnail)\
-        .filter(ub.Thumbnail.book_id.in_(book_ids))\
-        .filter(ub.Thumbnail.expiration > datetime.utcnow())\
-        .all()
-
-    return list(filter(lambda t: t.filename in thumbnail_files, thumbnails))
-
-
-def get_thumbnails_for_book_series(series):
-    books = list(map(lambda s: s[0], series))
-    return get_thumbnails_for_books(books)
-
-
 def get_cover_on_failure(use_generic_cover):
     if use_generic_cover:
         return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
@@ -577,9 +557,9 @@ def get_cover_on_failure(use_generic_cover):
         return None
 
 
-def get_book_cover(book_id):
+def get_book_cover(book_id, resolution=None):
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-    return get_book_cover_internal(book, use_generic_cover_on_failure=True)
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
 
 
 def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
@@ -587,37 +567,6 @@ def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
     return get_book_cover_internal(book, use_generic_cover_on_failure)
 
 
-def get_cached_book_cover(cache_id):
-    parts = cache_id.split('_')
-    book_uuid = parts[0] if len(parts) else None
-    resolution = parts[2] if len(parts) > 2 else None
-    book = calibre_db.get_book_by_uuid(book_uuid) if book_uuid else None
-    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
-
-
-def get_cached_book_cover_thumbnail(cache_id):
-    parts = cache_id.split('_')
-    thumbnail_uuid = parts[0] if len(parts) else None
-    thumbnail = None
-    if thumbnail_uuid:
-        thumbnail = ub.session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.uuid == thumbnail_uuid)\
-            .first()
-
-    if thumbnail and thumbnail.expiration > datetime.utcnow():
-        cache = fs.FileSystem()
-        if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
-            return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
-
-    elif thumbnail:
-        book = calibre_db.get_book(thumbnail.book_id)
-        return get_book_cover_internal(book, use_generic_cover_on_failure=True)
-
-    else:
-        return get_cover_on_failure(True)
-
-
 def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
     if book and book.has_cover:
 
@@ -626,7 +575,7 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None)
             thumbnail = get_book_cover_thumbnail(book, resolution)
             if thumbnail:
                 cache = fs.FileSystem()
-                if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                if cache.get_cache_file_exists(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
                     return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
 
         # Send the book cover from Google Drive if configured
@@ -661,7 +610,7 @@ def get_book_cover_thumbnail(book, resolution):
             .query(ub.Thumbnail)\
             .filter(ub.Thumbnail.book_id == book.id)\
             .filter(ub.Thumbnail.resolution == resolution)\
-            .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow()))\
             .first()
 
 
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 5f86478cd..8c8b72a92 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -33,6 +33,7 @@ from flask_babel import get_locale
 from flask_login import current_user
 from markupsafe import escape
 from . import logger
+from .tasks.thumbnail import THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X, THUMBNAIL_RESOLUTION_3X
 
 
 jinjia = Blueprint('jinjia', __name__)
@@ -140,24 +141,17 @@ def uuidfilter(var):
     return uuid4()
 
 
-@jinjia.app_template_filter('book_cover_cache_id')
-def book_cover_cache_id(book, resolution=None):
+@jinjia.app_template_filter('last_modified')
+def book_cover_cache_id(book):
     timestamp = int(book.last_modified.timestamp() * 1000)
-    cache_bust = str(book.uuid) + '_' + str(timestamp)
-    return cache_bust if not resolution else cache_bust + '_' + str(resolution)
+    return str(timestamp)
 
 
-@jinjia.app_template_filter('get_book_thumbnails')
-def get_book_thumbnails(book_id, thumbnails=None):
-    return list(filter(lambda t: t.book_id == book_id, thumbnails)) if book_id > -1 and thumbnails else list()
-
-
-@jinjia.app_template_filter('get_book_thumbnail_srcset')
-def get_book_thumbnail_srcset(thumbnails):
+@jinjia.app_template_filter('get_cover_srcset')
+def get_cover_srcset(book):
     srcset = list()
-    for thumbnail in thumbnails:
-        timestamp = int(thumbnail.generated_at.timestamp() * 1000)
-        cache_id = str(thumbnail.uuid) + '_' + str(timestamp)
-        url = url_for('web.get_cached_cover_thumbnail', cache_id=cache_id)
-        srcset.append(url + ' ' + str(thumbnail.resolution) + 'x')
+    for resolution in [THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X, THUMBNAIL_RESOLUTION_3X]:
+        timestamp = int(book.last_modified.timestamp() * 1000)
+        url = url_for('web.get_cover', book_id=book.id, resolution=resolution, cache_bust=str(timestamp))
+        srcset.append(f'{url} {resolution}x')
     return ', '.join(srcset)
diff --git a/cps/schedule.py b/cps/schedule.py
index d427d908d..8c350bd5d 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -21,7 +21,7 @@ from __future__ import division, print_function, unicode_literals
 from .services.background_scheduler import BackgroundScheduler
 from .services.worker import WorkerThread
 from .tasks.database import TaskReconnectDatabase
-from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
+from .tasks.thumbnail import TaskGenerateCoverThumbnails
 
 
 def register_jobs():
@@ -31,9 +31,6 @@ def register_jobs():
         # Reconnect metadata.db once every 12 hours
         scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
 
-        # Cleanup book cover cache once every 24 hours
-        scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', hour=4)
-
         # Generate all missing book cover thumbnails once every 24 hours
         scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
 
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index fed12e8ba..688f6e4b4 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -22,7 +22,7 @@ import os
 from cps import config, db, fs, gdriveutils, logger, ub
 from cps.services.worker import CalibreTask
 from datetime import datetime, timedelta
-from sqlalchemy import func
+from sqlalchemy import or_
 
 try:
     from urllib.request import urlopen
@@ -41,9 +41,8 @@ THUMBNAIL_RESOLUTION_3X = 3
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
-    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
+    def __init__(self, task_message=u'Generating cover thumbnails'):
         super(TaskGenerateCoverThumbnails, self).__init__(task_message)
-        self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
         self.calibre_db = db.CalibreDB(expire_on_commit=False)
@@ -55,74 +54,51 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def run(self, worker_thread):
         if self.calibre_db.session and use_IM:
-            expired_thumbnails = self.get_expired_thumbnails()
-            thumbnail_book_ids = self.get_thumbnail_book_ids()
-            books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
+            books_with_covers = self.get_books_with_covers()
+            count = len(books_with_covers)
 
-            count = len(books_without_thumbnails)
-            if count == 0:
-                # Do not display this task on the frontend if there are no covers to update
-                self.self_cleanup = True
+            updated = 0
+            generated = 0
+            for i, book in enumerate(books_with_covers):
+                book_cover_thumbnails = self.get_book_cover_thumbnails(book.id)
 
-            for i, book in enumerate(books_without_thumbnails):
-                for resolution in self.resolutions:
-                    expired_thumbnail = self.get_expired_thumbnail_for_book_and_resolution(
-                        book,
-                        resolution,
-                        expired_thumbnails
-                    )
-                    if expired_thumbnail:
-                        self.update_book_thumbnail(book, expired_thumbnail)
-                    else:
-                        self.create_book_thumbnail(book, resolution)
+                # Generate new thumbnails for missing covers
+                resolutions = list(map(lambda t: t.resolution, book_cover_thumbnails))
+                missing_resolutions = list(set(self.resolutions).difference(resolutions))
+                for resolution in missing_resolutions:
+                    generated += 1
+                    self.create_book_cover_thumbnail(book, resolution)
 
-                self.message = u'Generating cover thumbnail {0} of {1}'.format(i + 1, count)
+                # Replace outdated or missing thumbnails
+                for thumbnail in book_cover_thumbnails:
+                    if book.last_modified > thumbnail.generated_at:
+                        updated += 1
+                        self.update_book_cover_thumbnail(book, thumbnail)
+
+                    elif not self.cache.get_cache_file_exists(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                        updated += 1
+                        self.update_book_cover_thumbnail(book, thumbnail)
+
+                self.message = u'Processing book {0} of {1}'.format(i + 1, count)
                 self.progress = (1.0 / count) * i
 
         self._handleSuccess()
         self.app_db_session.remove()
 
-    def get_expired_thumbnails(self):
-        return self.app_db_session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.expiration < datetime.utcnow())\
-            .all()
-
-    def get_thumbnail_book_ids(self):
-        return self.app_db_session\
-            .query(ub.Thumbnail.book_id)\
-            .group_by(ub.Thumbnail.book_id)\
-            .having(func.min(ub.Thumbnail.expiration) > datetime.utcnow())\
-            .distinct()
-
-    def get_books_without_thumbnails(self, thumbnail_book_ids):
+    def get_books_with_covers(self):
         return self.calibre_db.session\
             .query(db.Books)\
             .filter(db.Books.has_cover == 1)\
-            .filter(db.Books.id.notin_(thumbnail_book_ids))\
-            .limit(self.limit)\
             .all()
 
-    def get_expired_thumbnail_for_book_and_resolution(self, book, resolution, expired_thumbnails):
-        for thumbnail in expired_thumbnails:
-            if thumbnail.book_id == book.id and thumbnail.resolution == resolution:
-                return thumbnail
+    def get_book_cover_thumbnails(self, book_id):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book_id)\
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow()))\
+            .all()
 
-        return None
-
-    def update_book_thumbnail(self, book, thumbnail):
-        thumbnail.generated_at = datetime.utcnow()
-        thumbnail.expiration = datetime.utcnow() + timedelta(days=30)
-
-        try:
-            self.app_db_session.commit()
-            self.generate_book_thumbnail(book, thumbnail)
-        except Exception as ex:
-            self.log.info(u'Error updating book thumbnail: ' + str(ex))
-            self._handleError(u'Error updating book thumbnail: ' + str(ex))
-            self.app_db_session.rollback()
-
-    def create_book_thumbnail(self, book, resolution):
+    def create_book_cover_thumbnail(self, book, resolution):
         thumbnail = ub.Thumbnail()
         thumbnail.book_id = book.id
         thumbnail.format = 'jpeg'
@@ -137,6 +113,18 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self._handleError(u'Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
+    def update_book_cover_thumbnail(self, book, thumbnail):
+        thumbnail.generated_at = datetime.utcnow()
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error updating book thumbnail: ' + str(ex))
+            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
     def generate_book_thumbnail(self, book, thumbnail):
         if book and thumbnail:
             if config.config_use_google_drive:
@@ -190,128 +178,6 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         return "ThumbnailsGenerate"
 
 
-class TaskSyncCoverThumbnailCache(CalibreTask):
-    def __init__(self, task_message=u'Syncing cover thumbnail cache'):
-        super(TaskSyncCoverThumbnailCache, self).__init__(task_message)
-        self.log = logger.create()
-        self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB(expire_on_commit=False)
-        self.cache = fs.FileSystem()
-
-    def run(self, worker_thread):
-        cached_thumbnail_files = self.cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
-
-        # Expire thumbnails in the database if the cached file is missing
-        # This case will happen if a user deletes the cache dir or cached files
-        if self.app_db_session:
-            self.expire_missing_thumbnails(cached_thumbnail_files)
-            self.progress = 0.25
-
-        # Delete thumbnails in the database if the book has been removed
-        # This case will happen if a book is removed in Calibre and the metadata.db file is updated in the filesystem
-        if self.app_db_session and self.calibre_db:
-            book_ids = self.get_book_ids()
-            self.delete_thumbnails_for_missing_books(book_ids)
-            self.progress = 0.50
-
-        # Expire thumbnails in the database if their corresponding book has been updated since they were generated
-        # This case will happen if the book was updated externally
-        if self.app_db_session and self.cache:
-            books = self.get_books_updated_in_the_last_day()
-            book_ids = list(map(lambda b: b.id, books))
-            thumbnails = self.get_thumbnails_for_updated_books(book_ids)
-            self.expire_thumbnails_for_updated_book(books, thumbnails)
-            self.progress = 0.75
-
-        # Delete extraneous cached thumbnail files
-        # This case will happen if a book was deleted and the thumbnail OR the metadata.db file was changed externally
-        if self.app_db_session:
-            db_thumbnail_files = self.get_thumbnail_filenames()
-            self.delete_extraneous_thumbnail_files(cached_thumbnail_files, db_thumbnail_files)
-
-        self._handleSuccess()
-        self.app_db_session.remove()
-
-    def expire_missing_thumbnails(self, filenames):
-        try:
-            self.app_db_session\
-                .query(ub.Thumbnail)\
-                .filter(ub.Thumbnail.filename.notin_(filenames))\
-                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
-            self.app_db_session.commit()
-        except Exception as ex:
-            self.log.info(u'Error expiring thumbnails for missing cache files: ' + str(ex))
-            self._handleError(u'Error expiring thumbnails for missing cache files: ' + str(ex))
-            self.app_db_session.rollback()
-
-    def get_book_ids(self):
-        results = self.calibre_db.session\
-            .query(db.Books.id)\
-            .filter(db.Books.has_cover == 1)\
-            .distinct()
-
-        return [value for value, in results]
-
-    def delete_thumbnails_for_missing_books(self, book_ids):
-        try:
-            self.app_db_session\
-                .query(ub.Thumbnail)\
-                .filter(ub.Thumbnail.book_id.notin_(book_ids))\
-                .delete(synchronize_session=False)
-            self.app_db_session.commit()
-        except Exception as ex:
-            self.log.info(str(ex))
-            self._handleError(u'Error deleting thumbnails for missing books: ' + str(ex))
-            self.app_db_session.rollback()
-
-    def get_thumbnail_filenames(self):
-        results = self.app_db_session\
-            .query(ub.Thumbnail.filename)\
-            .all()
-
-        return [thumbnail for thumbnail, in results]
-
-    def delete_extraneous_thumbnail_files(self, cached_thumbnail_files, db_thumbnail_files):
-        extraneous_files = list(set(cached_thumbnail_files).difference(db_thumbnail_files))
-        for file in extraneous_files:
-            self.cache.delete_cache_file(file, fs.CACHE_TYPE_THUMBNAILS)
-
-    def get_books_updated_in_the_last_day(self):
-        return self.calibre_db.session\
-            .query(db.Books)\
-            .filter(db.Books.has_cover == 1)\
-            .filter(db.Books.last_modified > datetime.utcnow() - timedelta(days=1, hours=1))\
-            .all()
-
-    def get_thumbnails_for_updated_books(self, book_ids):
-        return self.app_db_session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.book_id.in_(book_ids))\
-            .all()
-
-    def expire_thumbnails_for_updated_book(self, books, thumbnails):
-        thumbnail_ids = list()
-        for book in books:
-            for thumbnail in thumbnails:
-                if thumbnail.book_id == book.id and thumbnail.generated_at < book.last_modified:
-                    thumbnail_ids.append(thumbnail.id)
-
-        try:
-            self.app_db_session\
-                .query(ub.Thumbnail)\
-                .filter(ub.Thumbnail.id.in_(thumbnail_ids)) \
-                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
-            self.app_db_session.commit()
-        except Exception as ex:
-            self.log.info(u'Error expiring thumbnails for updated books: ' + str(ex))
-            self._handleError(u'Error expiring thumbnails for updated books: ' + str(ex))
-            self.app_db_session.rollback()
-
-    @property
-    def name(self):
-        return "ThumbnailsSync"
-
-
 class TaskClearCoverThumbnailCache(CalibreTask):
     def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
@@ -325,9 +191,9 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             if self.book_id:
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
                 for thumbnail in thumbnails:
-                    self.expire_and_delete_thumbnail(thumbnail)
+                    self.delete_thumbnail(thumbnail)
             else:
-                self.expire_and_delete_all_thumbnails()
+                self.delete_all_thumbnails()
 
         self._handleSuccess()
         self.app_db_session.remove()
@@ -338,29 +204,19 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             .filter(ub.Thumbnail.book_id == book_id)\
             .all()
 
-    def expire_and_delete_thumbnail(self, thumbnail):
-        thumbnail.expiration = datetime.utcnow()
-
+    def delete_thumbnail(self, thumbnail):
         try:
-            self.app_db_session.commit()
             self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
-            self.log.info(u'Error expiring book thumbnail: ' + str(ex))
-            self._handleError(u'Error expiring book thumbnail: ' + str(ex))
-            self.app_db_session.rollback()
-
-    def expire_and_delete_all_thumbnails(self):
-        self.app_db_session\
-            .query(ub.Thumbnail)\
-            .update({'expiration': datetime.utcnow()})
+            self.log.info(u'Error deleting book thumbnail: ' + str(ex))
+            self._handleError(u'Error deleting book thumbnail: ' + str(ex))
 
+    def delete_all_thumbnails(self):
         try:
-            self.app_db_session.commit()
             self.cache.delete_cache_dir(fs.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
-            self.log.info(u'Error expiring book thumbnails: ' + str(ex))
-            self._handleError(u'Error expiring book thumbnails: ' + str(ex))
-            self.app_db_session.rollback()
+            self.log.info(u'Error deleting book thumbnails: ' + str(ex))
+            self._handleError(u'Error deleting book thumbnails: ' + str(ex))
 
     @property
     def name(self):
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 3a4e6c570..2ff1ce7ae 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -37,8 +37,7 @@
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
             <span class="img">
-              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-              <!-- <img title="{{author.name|safe}}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" /> -->
+              {{ book_cover_image(entry, title=author.name|safe) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index 884ff4cd6..7d3a84f43 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,14 +1,11 @@
-{% macro book_cover_image(book, thumbnails, title=None) -%}
+{% macro book_cover_image(book, title=None) -%}
     {%- set book_title = book.title if book.title else book.name -%}
     {%- set book_title = title if title else book_title -%}
-    {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
-    {%- if srcset|length -%}
-        <img
-            srcset="{{ srcset }}"
-            src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
-            alt="{{ book_title }}"
-        />
-    {%- else -%}
-        <img src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}" alt="{{ book_title }}" />
-    {%- endif -%}
+    {% set srcset = book|get_cover_srcset %}
+    <img
+        srcset="{{ srcset }}"
+        src="{{ url_for('web.get_cover', book_id=book.id, resolution=0, cache_bust=book|last_modified) }}"
+        title="{{ book_title }}"
+        alt="{{ book_title }}"
+    />
 {%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index bce329d0d..8525b8e3b 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -4,8 +4,7 @@
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ book_cover_image(book, book.id|get_book_thumbnails(thumbnails)) }}
-        <!-- <img id="detailcover" title="{{book.title}}" src="{{ url_for('web.get_cover', book_id=book.id, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/> -->
+        {{ book_cover_image(book) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index ea870d4c3..b538ff9a0 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,8 +4,7 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-          <!-- <img id="detailcover" title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry.id, edit=1|uuidfilter) }}" alt="{{ entry.title }}" /> -->
+          {{ book_cover_image(entry) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index ecfc83d08..01cd393d4 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -10,8 +10,7 @@
         {% 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">
             <span class="img">
-              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-              <!-- <img title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" /> -->
+              {{ book_cover_image(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 5a3c1e010..45fb53bf6 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -29,8 +29,7 @@
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].series[0].id )}}">
                           <span class="img">
-                              {{ book_cover_image(entry[0], entry[0].id|get_book_thumbnails(thumbnails)) }}
-                              <!-- <img title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry[0].id) }}" alt="{{ entry[0].name }}"/> -->
+                              {{ book_cover_image(entry[0], title=entry[0].series[0].name|shortentitle) }}
                               <span class="badge">{{entry.count}}</span>
                             </span>
                       </a>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index c38ba01e2..e47c6c703 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -10,8 +10,7 @@
       <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">
-                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-                <!-- <img title="{{ entry.title }}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" /> -->
+                {{ book_cover_image(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
@@ -88,8 +87,7 @@
       <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">
-              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-              <!-- <img title="{{ entry.title }}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/> -->
+              {{ book_cover_image(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index cf9c4fe73..872b6dc1e 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -45,8 +45,7 @@
         {% 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">
             <span class="img">
-                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-                <!-- <img title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" /> -->
+                {{ book_cover_image(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index cb08be906..0e5865c96 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -32,8 +32,7 @@
       <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">
-                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-                <!-- <img title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" /> -->
+                {{ book_cover_image(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>
diff --git a/cps/ub.py b/cps/ub.py
index e0bee4efd..f108a1cea 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -532,7 +532,7 @@ class Thumbnail(Base):
     resolution = Column(SmallInteger, default=1)
     filename = Column(String, default=filename)
     generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
-    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=90))
+    expiration = Column(DateTime, nullable=True)
 
 
 # Add missing tables during migration of database
diff --git a/cps/web.py b/cps/web.py
index f43bc6ad1..8f78ff32a 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -51,7 +51,6 @@ 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, check_email, check_username, \
-    get_cached_book_cover, get_cached_book_cover_thumbnail, get_thumbnails_for_books, get_thumbnails_for_book_series, \
     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, valid_email
 from .pagination import Pagination
@@ -415,10 +414,8 @@ def render_books_list(data, sort, book_id, page):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Books"), page=website, thumbnails=thumbnails)
+                                     title=_(u"Books"), page=website)
 
 
 def render_rated_books(page, book_id, order):
@@ -467,9 +464,8 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
+                                     title=_(u"Hot Books (Most Downloaded)"), page="hot")
     else:
         abort(404)
 
@@ -497,16 +493,13 @@ def render_downloaded_books(page, order, user_id):
                              .filter(db.Books.id == book.id).first():
                 ub.delete_download(book.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
-
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html',
                                      random=random,
                                      entries=entries,
                                      pagination=pagination,
                                      id=user_id,
                                      title=_(u"Downloaded books by %(user)s",user=user.name),
-                                     page="download",
-                                     thumbnails=thumbnails)
+                                     page="download")
     else:
         abort(404)
 
@@ -535,10 +528,9 @@ def render_author_books(page, author_id, order):
         author_info = services.goodreads_support.get_author_info(author_name)
         other_books = services.goodreads_support.get_other_books(author_info, entries)
 
-    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
                                  title=_(u"Author: %(name)s", name=author_name), author=author_info,
-                                 other_books=other_books, page="author", thumbnails=thumbnails)
+                                 other_books=other_books, page="author")
 
 
 def render_publisher_books(page, book_id, order):
@@ -551,10 +543,8 @@ def render_publisher_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
-                                     thumbnails=thumbnails)
+                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher")
     else:
         abort(404)
 
@@ -566,10 +556,8 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         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",
-                                     thumbnails=thumbnails)
+                                     title=_(u"Series: %(serie)s", serie=name.name), page="series")
     else:
         abort(404)
 
@@ -581,10 +569,8 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         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",
-                                     thumbnails=thumbnails)
+                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings")
     else:
         abort(404)
 
@@ -596,10 +582,8 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         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",
-                                     thumbnails=thumbnails)
+                                     title=_(u"File format: %(format)s", format=name.format), page="formats")
     else:
         abort(404)
 
@@ -614,10 +598,8 @@ def render_category_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Category: %(name)s", name=name.name), page="category",
-                                     thumbnails=thumbnails)
+                                     title=_(u"Category: %(name)s", name=name.name), page="category")
     else:
         abort(404)
 
@@ -635,9 +617,8 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
-    thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
-                                 title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
+                                 title=_(u"Language: %(name)s", name=lang_name), page="language")
 
 
 def render_read_books(page, are_read, as_xml=False, order=None):
@@ -687,10 +668,8 @@ def render_read_books(page, are_read, as_xml=False, order=None):
         else:
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
-
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=name, page=pagename, thumbnails=thumbnails)
+                                     title=name, page=pagename)
 
 
 def render_archived_books(page, order):
@@ -713,9 +692,8 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
-    thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=name, page=pagename, thumbnails=thumbnails)
+                                 title=name, page=pagename)
 
 
 def render_prepare_search_form(cc):
@@ -752,7 +730,6 @@ def render_prepare_search_form(cc):
 def render_search_results(term, offset=None, order=None, limit=None):
     join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
     entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit, *join)
-    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  searchterm=term,
                                  pagination=pagination,
@@ -761,8 +738,7 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                  entries=entries,
                                  result_count=result_count,
                                  title=_(u"Search"),
-                                 page="search",
-                                 thumbnails=thumbnails)
+                                 page="search")
 
 
 # ################################### View Books list ##################################################################
@@ -973,10 +949,9 @@ def series_list():
                 .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()
 
-            thumbnails = get_thumbnails_for_book_series(entries)
             return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=charlist,
                                          title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view",
-                                         order=order_no, thumbnails=thumbnails)
+                                         order=order_no)
     else:
         abort(404)
 
@@ -1392,17 +1367,13 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     else:
         offset = 0
         limit_all = result_count
-
-    entries = q[offset:limit_all]
-    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
-                                 entries=entries,
+                                 entries=q[offset:limit_all],
                                  result_count=result_count,
                                  title=_(u"Advanced Search"),
-                                 page="advsearch",
-                                 thumbnails=thumbnails)
+                                 page="advsearch")
 
 
 @web.route("/advsearch", methods=['GET'])
@@ -1417,21 +1388,11 @@ def advanced_search_form():
 
 
 @web.route("/cover/<int:book_id>")
+@web.route("/cover/<int:book_id>/<int:resolution>")
+@web.route("/cover/<int:book_id>/<int:resolution>/<string:cache_bust>")
 @login_required_if_no_ano
-def get_cover(book_id):
-    return get_book_cover(book_id)
-
-
-@web.route("/cached-cover/<string:cache_id>")
-@login_required_if_no_ano
-def get_cached_cover(cache_id):
-    return get_cached_book_cover(cache_id)
-
-
-@web.route("/cached-cover-thumbnail/<string:cache_id>")
-@login_required_if_no_ano
-def get_cached_cover_thumbnail(cache_id):
-    return get_cached_book_cover_thumbnail(cache_id)
+def get_cover(book_id, resolution=None, cache_bust=None):
+    return get_book_cover(book_id, resolution)
 
 
 @web.route("/robots.txt")
@@ -1841,7 +1802,6 @@ def show_book(book_id):
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
                 audioentries.append(media_format.format.lower())
 
-        thumbnails = get_thumbnails_for_books([entries])
         return render_title_template('detail.html',
                                      entry=entries,
                                      audioentries=audioentries,
@@ -1853,8 +1813,7 @@ def show_book(book_id):
                                      is_archived=is_archived,
                                      kindle_list=kindle_list,
                                      reader_list=reader_list,
-                                     page="book",
-                                     thumbnails=thumbnails)
+                                     page="book")
     else:
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),

From 0bd544704d2060efa544d176b582826838d306ec Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sat, 25 Sep 2021 03:04:38 -0500
Subject: [PATCH 017/412] Added series cover thumbnail generation. Better cache
 file handling.

---
 cps/admin.py                  |   2 +-
 cps/constants.py              |  13 ++
 cps/fs.py                     |  19 ++-
 cps/helper.py                 |  57 ++++++-
 cps/jinjia.py                 |  43 ++++--
 cps/schedule.py               |   3 +-
 cps/tasks/thumbnail.py        | 280 ++++++++++++++++++++++++++++++----
 cps/templates/author.html     |   2 +-
 cps/templates/book_cover.html |  11 --
 cps/templates/book_edit.html  |   4 +-
 cps/templates/detail.html     |   2 +-
 cps/templates/discover.html   |   4 +-
 cps/templates/fragment.html   |   2 +-
 cps/templates/grid.html       |   4 +-
 cps/templates/image.html      |  23 +++
 cps/templates/index.html      |   6 +-
 cps/templates/layout.html     |   2 +-
 cps/templates/search.html     |   4 +-
 cps/templates/shelf.html      |   4 +-
 cps/ub.py                     |   5 +-
 cps/web.py                    |  32 +++-
 21 files changed, 430 insertions(+), 92 deletions(-)
 delete mode 100644 cps/templates/book_cover.html
 create mode 100644 cps/templates/image.html

diff --git a/cps/admin.py b/cps/admin.py
index 98535320f..92c8bd702 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -166,7 +166,7 @@ def clear_cache():
     cache_type = request.args.get('cache_type'.strip())
     showtext = {}
 
-    if cache_type == fs.CACHE_TYPE_THUMBNAILS:
+    if cache_type == constants.CACHE_TYPE_THUMBNAILS:
         log.info('clearing cover thumbnail cache')
         showtext['text'] = _(u'Cleared cover thumbnail cache')
         helper.clear_cover_thumbnail_cache()
diff --git a/cps/constants.py b/cps/constants.py
index 6a6b8f2bb..306d28723 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -169,6 +169,19 @@ NIGHTLY_VERSION[1] = '$Format:%cI$'
 # NIGHTLY_VERSION[0] = 'bb7d2c6273ae4560e83950d36d64533343623a57'
 # NIGHTLY_VERSION[1] = '2018-09-09T10:13:08+02:00'
 
+# CACHE
+CACHE_TYPE_THUMBNAILS    = 'thumbnails'
+
+# Thumbnail Types
+THUMBNAIL_TYPE_COVER     = 1
+THUMBNAIL_TYPE_SERIES    = 2
+THUMBNAIL_TYPE_AUTHOR    = 3
+
+# Thumbnails Sizes
+COVER_THUMBNAIL_ORIGINAL = 0
+COVER_THUMBNAIL_SMALL    = 1
+COVER_THUMBNAIL_MEDIUM   = 2
+COVER_THUMBNAIL_LARGE    = 3
 
 # clean-up the module namespace
 del sys, os, namedtuple
diff --git a/cps/fs.py b/cps/fs.py
index 30ab552a9..0171a5d51 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -19,12 +19,10 @@
 from __future__ import division, print_function, unicode_literals
 from . import logger
 from .constants import CACHE_DIR
-from os import listdir, makedirs, remove
+from os import makedirs, remove
 from os.path import isdir, isfile, join
 from shutil import rmtree
 
-CACHE_TYPE_THUMBNAILS = 'thumbnails'
-
 
 class FileSystem:
     _instance = None
@@ -54,8 +52,19 @@ class FileSystem:
 
         return path if cache_type else self._cache_dir
 
+    def get_cache_file_dir(self, filename, cache_type=None):
+        path = join(self.get_cache_dir(cache_type), filename[:2])
+        if not isdir(path):
+            try:
+                makedirs(path)
+            except OSError:
+                self.log.info(f'Failed to create path {path} (Permission denied).')
+                return False
+
+        return path
+
     def get_cache_file_path(self, filename, cache_type=None):
-        return join(self.get_cache_dir(cache_type), filename) if filename else None
+        return join(self.get_cache_file_dir(filename, cache_type), filename) if filename else None
 
     def get_cache_file_exists(self, filename, cache_type=None):
         path = self.get_cache_file_path(filename, cache_type)
@@ -78,7 +87,7 @@ class FileSystem:
                 return False
 
     def delete_cache_file(self, filename, cache_type=None):
-        path = join(self.get_cache_dir(cache_type), filename)
+        path = self.get_cache_file_path(filename, cache_type)
         if isfile(path):
             try:
                 remove(path)
diff --git a/cps/helper.py b/cps/helper.py
index 1652be236..2f2df0e07 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -55,7 +55,7 @@ from . import calibre_db
 from .tasks.convert import TaskConvert
 from . import logger, config, get_locale, db, fs, ub
 from . import gdriveutils as gd
-from .constants import STATIC_DIR as _STATIC_DIR
+from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
 from .tasks.mail import TaskEmail
@@ -575,8 +575,9 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None)
             thumbnail = get_book_cover_thumbnail(book, resolution)
             if thumbnail:
                 cache = fs.FileSystem()
-                if cache.get_cache_file_exists(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
-                    return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
+                if cache.get_cache_file_exists(thumbnail.filename, CACHE_TYPE_THUMBNAILS):
+                    return send_from_directory(cache.get_cache_file_dir(thumbnail.filename, CACHE_TYPE_THUMBNAILS),
+                                               thumbnail.filename)
 
         # Send the book cover from Google Drive if configured
         if config.config_use_google_drive:
@@ -606,14 +607,54 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None)
 
 def get_book_cover_thumbnail(book, resolution):
     if book and book.has_cover:
-        return ub.session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.book_id == book.id)\
-            .filter(ub.Thumbnail.resolution == resolution)\
-            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow()))\
+        return ub.session \
+            .query(ub.Thumbnail) \
+            .filter(ub.Thumbnail.type == THUMBNAIL_TYPE_COVER) \
+            .filter(ub.Thumbnail.entity_id == book.id) \
+            .filter(ub.Thumbnail.resolution == resolution) \
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
             .first()
 
 
+def get_series_thumbnail_on_failure(series_id, resolution):
+    book = calibre_db.session \
+        .query(db.Books) \
+        .join(db.books_series_link) \
+        .join(db.Series) \
+        .filter(db.Series.id == series_id) \
+        .filter(db.Books.has_cover == 1) \
+        .first()
+
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
+
+
+def get_series_cover_thumbnail(series_id, resolution=None):
+    return get_series_cover_internal(series_id, resolution)
+
+
+def get_series_cover_internal(series_id, resolution=None):
+    # Send the series thumbnail if it exists in cache
+    if resolution:
+        thumbnail = get_series_thumbnail(series_id, resolution)
+        if thumbnail:
+            cache = fs.FileSystem()
+            if cache.get_cache_file_exists(thumbnail.filename, CACHE_TYPE_THUMBNAILS):
+                return send_from_directory(cache.get_cache_file_dir(thumbnail.filename, CACHE_TYPE_THUMBNAILS),
+                                           thumbnail.filename)
+
+    return get_series_thumbnail_on_failure(series_id, resolution)
+
+
+def get_series_thumbnail(series_id, resolution):
+    return ub.session \
+        .query(ub.Thumbnail) \
+        .filter(ub.Thumbnail.type == THUMBNAIL_TYPE_SERIES) \
+        .filter(ub.Thumbnail.entity_id == series_id) \
+        .filter(ub.Thumbnail.resolution == resolution) \
+        .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
+        .first()
+
+
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 8c8b72a92..1a58416a1 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -32,9 +32,7 @@ from flask import Blueprint, request, url_for
 from flask_babel import get_locale
 from flask_login import current_user
 from markupsafe import escape
-from . import logger
-from .tasks.thumbnail import THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X, THUMBNAIL_RESOLUTION_3X
-
+from . import constants, logger
 
 jinjia = Blueprint('jinjia', __name__)
 log = logger.create()
@@ -141,17 +139,44 @@ def uuidfilter(var):
     return uuid4()
 
 
+@jinjia.app_template_filter('cache_timestamp')
+def cache_timestamp(rolling_period='month'):
+    if rolling_period == 'day':
+        return str(int(datetime.datetime.today().replace(hour=1, minute=1).timestamp()))
+    elif rolling_period == 'year':
+        return str(int(datetime.datetime.today().replace(day=1).timestamp()))
+    else:
+        return str(int(datetime.datetime.today().replace(month=1, day=1).timestamp()))
+
+
 @jinjia.app_template_filter('last_modified')
-def book_cover_cache_id(book):
-    timestamp = int(book.last_modified.timestamp() * 1000)
-    return str(timestamp)
+def book_last_modified(book):
+    return str(int(book.last_modified.timestamp()))
 
 
 @jinjia.app_template_filter('get_cover_srcset')
 def get_cover_srcset(book):
     srcset = list()
-    for resolution in [THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X, THUMBNAIL_RESOLUTION_3X]:
-        timestamp = int(book.last_modified.timestamp() * 1000)
-        url = url_for('web.get_cover', book_id=book.id, resolution=resolution, cache_bust=str(timestamp))
+    resolutions = {
+        constants.COVER_THUMBNAIL_SMALL: 'sm',
+        constants.COVER_THUMBNAIL_MEDIUM: 'md',
+        constants.COVER_THUMBNAIL_LARGE: 'lg'
+    }
+    for resolution, shortname in resolutions.items():
+        url = url_for('web.get_cover', book_id=book.id, resolution=shortname, c=book_last_modified(book))
+        srcset.append(f'{url} {resolution}x')
+    return ', '.join(srcset)
+
+
+@jinjia.app_template_filter('get_series_srcset')
+def get_cover_srcset(series):
+    srcset = list()
+    resolutions = {
+        constants.COVER_THUMBNAIL_SMALL: 'sm',
+        constants.COVER_THUMBNAIL_MEDIUM: 'md',
+        constants.COVER_THUMBNAIL_LARGE: 'lg'
+    }
+    for resolution, shortname in resolutions.items():
+        url = url_for('web.get_series_cover', series_id=series.id, resolution=shortname, c=cache_timestamp())
         srcset.append(f'{url} {resolution}x')
     return ', '.join(srcset)
diff --git a/cps/schedule.py b/cps/schedule.py
index 8c350bd5d..dc153b9ae 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -21,7 +21,7 @@ from __future__ import division, print_function, unicode_literals
 from .services.background_scheduler import BackgroundScheduler
 from .services.worker import WorkerThread
 from .tasks.database import TaskReconnectDatabase
-from .tasks.thumbnail import TaskGenerateCoverThumbnails
+from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails
 
 
 def register_jobs():
@@ -37,3 +37,4 @@ def register_jobs():
 
 def register_startup_jobs():
     WorkerThread.add(None, TaskGenerateCoverThumbnails())
+    # WorkerThread.add(None, TaskGenerateSeriesThumbnails())
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 688f6e4b4..152b87727 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -19,10 +19,11 @@
 from __future__ import division, print_function, unicode_literals
 import os
 
+from .. import constants
 from cps import config, db, fs, gdriveutils, logger, ub
 from cps.services.worker import CalibreTask
 from datetime import datetime, timedelta
-from sqlalchemy import or_
+from sqlalchemy import func, text, or_
 
 try:
     from urllib.request import urlopen
@@ -35,9 +36,34 @@ try:
 except (ImportError, RuntimeError) as e:
     use_IM = False
 
-THUMBNAIL_RESOLUTION_1X = 1
-THUMBNAIL_RESOLUTION_2X = 2
-THUMBNAIL_RESOLUTION_3X = 3
+
+def get_resize_height(resolution):
+    return int(225 * resolution)
+
+
+def get_resize_width(resolution, original_width, original_height):
+    height = get_resize_height(resolution)
+    percent = (height / float(original_height))
+    width = int((float(original_width) * float(percent)))
+    return width if width % 2 == 0 else width + 1
+
+
+def get_best_fit(width, height, image_width, image_height):
+    resize_width = int(width / 2.0)
+    resize_height = int(height / 2.0)
+    aspect_ratio = image_width / image_height
+
+    # If this image's aspect ratio is different than the first image, then resize this image
+    # to fill the width and height of the first image
+    if aspect_ratio < width / height:
+        resize_width = int(width / 2.0)
+        resize_height = image_height * int(width / 2.0) / image_width
+
+    elif aspect_ratio > width / height:
+        resize_width = image_width * int(height / 2.0) / image_height
+        resize_height = int(height / 2.0)
+
+    return {'width': resize_width, 'height': resize_height}
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
@@ -48,8 +74,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self.calibre_db = db.CalibreDB(expire_on_commit=False)
         self.cache = fs.FileSystem()
         self.resolutions = [
-            THUMBNAIL_RESOLUTION_1X,
-            THUMBNAIL_RESOLUTION_2X
+            constants.COVER_THUMBNAIL_SMALL,
+            constants.COVER_THUMBNAIL_MEDIUM
         ]
 
     def run(self, worker_thread):
@@ -75,7 +101,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                         updated += 1
                         self.update_book_cover_thumbnail(book, thumbnail)
 
-                    elif not self.cache.get_cache_file_exists(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                    elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
                         updated += 1
                         self.update_book_cover_thumbnail(book, thumbnail)
 
@@ -86,21 +112,23 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self.app_db_session.remove()
 
     def get_books_with_covers(self):
-        return self.calibre_db.session\
-            .query(db.Books)\
-            .filter(db.Books.has_cover == 1)\
+        return self.calibre_db.session \
+            .query(db.Books) \
+            .filter(db.Books.has_cover == 1) \
             .all()
 
     def get_book_cover_thumbnails(self, book_id):
-        return self.app_db_session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.book_id == book_id)\
-            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow()))\
+        return self.app_db_session \
+            .query(ub.Thumbnail) \
+            .filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_COVER) \
+            .filter(ub.Thumbnail.entity_id == book_id) \
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
             .all()
 
     def create_book_cover_thumbnail(self, book, resolution):
         thumbnail = ub.Thumbnail()
-        thumbnail.book_id = book.id
+        thumbnail.type = constants.THUMBNAIL_TYPE_COVER
+        thumbnail.entity_id = book.id
         thumbnail.format = 'jpeg'
         thumbnail.resolution = resolution
 
@@ -118,7 +146,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
         try:
             self.app_db_session.commit()
-            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+            self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
             self.log.info(u'Error updating book thumbnail: ' + str(ex))
@@ -144,7 +172,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                             width = self.get_thumbnail_width(height, img)
                             img.resize(width=width, height=height, filter='lanczos')
                             img.format = thumbnail.format
-                            filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                            filename = self.cache.get_cache_file_path(thumbnail.filename,
+                                                                      constants.CACHE_TYPE_THUMBNAILS)
                             img.save(filename=filename)
                 except Exception as ex:
                     # Bubble exception to calling function
@@ -158,26 +187,212 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                     raise Exception('Book cover file not found')
 
                 with Image(filename=book_cover_filepath) as img:
-                    height = self.get_thumbnail_height(thumbnail)
+                    height = get_resize_height(thumbnail.resolution)
                     if img.height > height:
-                        width = self.get_thumbnail_width(height, img)
+                        width = get_resize_width(thumbnail.resolution, img.width, img.height)
                         img.resize(width=width, height=height, filter='lanczos')
                         img.format = thumbnail.format
-                        filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                        filename = self.cache.get_cache_file_path(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
                         img.save(filename=filename)
 
-    def get_thumbnail_height(self, thumbnail):
-        return int(225 * thumbnail.resolution)
-
-    def get_thumbnail_width(self, height, img):
-        percent = (height / float(img.height))
-        return int((float(img.width) * float(percent)))
-
     @property
     def name(self):
         return "ThumbnailsGenerate"
 
 
+class TaskGenerateSeriesThumbnails(CalibreTask):
+    def __init__(self, task_message=u'Generating series thumbnails'):
+        super(TaskGenerateSeriesThumbnails, self).__init__(task_message)
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
+        self.resolutions = [
+            constants.COVER_THUMBNAIL_SMALL,
+            constants.COVER_THUMBNAIL_MEDIUM
+        ]
+
+    # get all series
+    # get all books in series with covers and count >= 4 books
+    # get the dimensions from the first book in the series & pop the first book from the series list of books
+    # randomly select three other books in the series
+
+    # resize the covers in the sequence?
+    # create an image sequence from the 4 selected books of the series
+    # join pairs of books in the series with wand's concat
+    # join the two sets of pairs with wand's
+
+    def run(self, worker_thread):
+        if self.calibre_db.session and use_IM:
+            all_series = self.get_series_with_four_plus_books()
+            count = len(all_series)
+
+            updated = 0
+            generated = 0
+            for i, series in enumerate(all_series):
+                series_thumbnails = self.get_series_thumbnails(series.id)
+                series_books = self.get_series_books(series.id)
+
+                # Generate new thumbnails for missing covers
+                resolutions = list(map(lambda t: t.resolution, series_thumbnails))
+                missing_resolutions = list(set(self.resolutions).difference(resolutions))
+                for resolution in missing_resolutions:
+                    generated += 1
+                    self.create_series_thumbnail(series, series_books, resolution)
+
+                # Replace outdated or missing thumbnails
+                for thumbnail in series_thumbnails:
+                    if any(book.last_modified > thumbnail.generated_at for book in series_books):
+                        updated += 1
+                        self.update_series_thumbnail(series_books, thumbnail)
+
+                    elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
+                        updated += 1
+                        self.update_series_thumbnail(series_books, thumbnail)
+
+                self.message = u'Processing series {0} of {1}'.format(i + 1, count)
+                self.progress = (1.0 / count) * i
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def get_series_with_four_plus_books(self):
+        return self.calibre_db.session \
+            .query(db.Series) \
+            .join(db.books_series_link) \
+            .join(db.Books) \
+            .filter(db.Books.has_cover == 1) \
+            .group_by(text('books_series_link.series')) \
+            .having(func.count('book_series_link') > 3) \
+            .all()
+
+    def get_series_books(self, series_id):
+        return self.calibre_db.session \
+            .query(db.Books) \
+            .join(db.books_series_link) \
+            .join(db.Series) \
+            .filter(db.Books.has_cover == 1) \
+            .filter(db.Series.id == series_id) \
+            .all()
+
+    def get_series_thumbnails(self, series_id):
+        return self.app_db_session \
+            .query(ub.Thumbnail) \
+            .filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_SERIES) \
+            .filter(ub.Thumbnail.entity_id == series_id) \
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
+            .all()
+
+    def create_series_thumbnail(self, series, series_books, resolution):
+        thumbnail = ub.Thumbnail()
+        thumbnail.type = constants.THUMBNAIL_TYPE_SERIES
+        thumbnail.entity_id = series.id
+        thumbnail.format = 'jpeg'
+        thumbnail.resolution = resolution
+
+        self.app_db_session.add(thumbnail)
+        try:
+            self.app_db_session.commit()
+            self.generate_series_thumbnail(series_books, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error creating book thumbnail: ' + str(ex))
+            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def update_series_thumbnail(self, series_books, thumbnail):
+        thumbnail.generated_at = datetime.utcnow()
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
+            self.generate_series_thumbnail(series_books, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error updating book thumbnail: ' + str(ex))
+            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def generate_series_thumbnail(self, series_books, thumbnail):
+        books = series_books[:4]
+
+        top = 0
+        left = 0
+        width = 0
+        height = 0
+        with Image() as canvas:
+            for book in books:
+                if config.config_use_google_drive:
+                    if not gdriveutils.is_gdrive_ready():
+                        raise Exception('Google Drive is configured but not ready')
+
+                    web_content_link = gdriveutils.get_cover_via_gdrive(book.path)
+                    if not web_content_link:
+                        raise Exception('Google Drive cover url not found')
+
+                    stream = None
+                    try:
+                        stream = urlopen(web_content_link)
+                        with Image(file=stream) as img:
+                            # Use the first image in this set to determine the width and height to scale the
+                            # other images in this set
+                            if width == 0 or height == 0:
+                                width = get_resize_width(thumbnail.resolution, img.width, img.height)
+                                height = get_resize_height(thumbnail.resolution)
+                                canvas.blank(width, height)
+
+                            dimensions = get_best_fit(width, height, img.width, img.height)
+
+                            # resize and crop the image
+                            img.resize(width=int(dimensions['width']), height=int(dimensions['height']), filter='lanczos')
+                            img.crop(width=int(width / 2.0), height=int(height / 2.0), gravity='center')
+
+                            # add the image to the canvas
+                            canvas.composite(img, left, top)
+
+                    except Exception as ex:
+                        self.log.info(u'Error generating thumbnail file: ' + str(ex))
+                        raise ex
+                    finally:
+                        stream.close()
+
+                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                if not os.path.isfile(book_cover_filepath):
+                    raise Exception('Book cover file not found')
+
+                with Image(filename=book_cover_filepath) as img:
+                    # Use the first image in this set to determine the width and height to scale the
+                    # other images in this set
+                    if width == 0 or height == 0:
+                        width = get_resize_width(thumbnail.resolution, img.width, img.height)
+                        height = get_resize_height(thumbnail.resolution)
+                        canvas.blank(width, height)
+
+                    dimensions = get_best_fit(width, height, img.width, img.height)
+
+                    # resize and crop the image
+                    img.resize(width=int(dimensions['width']), height=int(dimensions['height']), filter='lanczos')
+                    img.crop(width=int(width / 2.0), height=int(height / 2.0), gravity='center')
+
+                    # add the image to the canvas
+                    canvas.composite(img, left, top)
+
+                # set the coordinates for the next iteration
+                if left == 0 and top == 0:
+                    left = int(width / 2.0)
+                elif left == int(width / 2.0) and top == 0:
+                    left = 0
+                    top = int(height / 2.0)
+                else:
+                    left = int(width / 2.0)
+
+            canvas.format = thumbnail.format
+            filename = self.cache.get_cache_file_path(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
+            canvas.save(filename=filename)
+
+    @property
+    def name(self):
+        return "SeriesThumbnailGenerate"
+
+
 class TaskClearCoverThumbnailCache(CalibreTask):
     def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
@@ -199,21 +414,22 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         self.app_db_session.remove()
 
     def get_thumbnails_for_book(self, book_id):
-        return self.app_db_session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.book_id == book_id)\
+        return self.app_db_session \
+            .query(ub.Thumbnail) \
+            .filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_COVER) \
+            .filter(ub.Thumbnail.entity_id == book_id) \
             .all()
 
     def delete_thumbnail(self, thumbnail):
         try:
-            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+            self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
             self.log.info(u'Error deleting book thumbnail: ' + str(ex))
             self._handleError(u'Error deleting book thumbnail: ' + str(ex))
 
     def delete_all_thumbnails(self):
         try:
-            self.cache.delete_cache_dir(fs.CACHE_TYPE_THUMBNAILS)
+            self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
             self.log.info(u'Error deleting book thumbnails: ' + str(ex))
             self._handleError(u'Error deleting book thumbnails: ' + str(ex))
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 2ff1ce7ae..df891d5b2 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -37,7 +37,7 @@
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
             <span class="img">
-              {{ book_cover_image(entry, title=author.name|safe) }}
+              {{ image.book_cover(entry, title=author.name|safe) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
deleted file mode 100644
index 7d3a84f43..000000000
--- a/cps/templates/book_cover.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% macro book_cover_image(book, title=None) -%}
-    {%- set book_title = book.title if book.title else book.name -%}
-    {%- set book_title = title if title else book_title -%}
-    {% set srcset = book|get_cover_srcset %}
-    <img
-        srcset="{{ srcset }}"
-        src="{{ url_for('web.get_cover', book_id=book.id, resolution=0, cache_bust=book|last_modified) }}"
-        title="{{ book_title }}"
-        alt="{{ book_title }}"
-    />
-{%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 8525b8e3b..b5f5df7a4 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -1,10 +1,10 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ book_cover_image(book) }}
+        {{ image.book_cover(book) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index b538ff9a0..7985691a9 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,7 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ book_cover_image(entry) }}
+          {{ image.book_cover(entry) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 01cd393d4..d697ff0a9 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover load-more">
@@ -10,7 +10,7 @@
         {% 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">
             <span class="img">
-              {{ book_cover_image(entry) }}
+              {{ image.book_cover(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/fragment.html b/cps/templates/fragment.html
index 901dd1931..f2e94fb2c 100644
--- a/cps/templates/fragment.html
+++ b/cps/templates/fragment.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 <div class="container-fluid">
   {% block body %}{% endblock %}
 </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 45fb53bf6..b3395fcbf 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 <h1 class="{{page}}">{{_(title)}}</h1>
@@ -29,7 +29,7 @@
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].series[0].id )}}">
                           <span class="img">
-                              {{ book_cover_image(entry[0], title=entry[0].series[0].name|shortentitle) }}
+                              {{ image.series(entry[0].series[0], title=entry[0].series[0].name|shortentitle) }}
                               <span class="badge">{{entry.count}}</span>
                             </span>
                       </a>
diff --git a/cps/templates/image.html b/cps/templates/image.html
new file mode 100644
index 000000000..ae57727b0
--- /dev/null
+++ b/cps/templates/image.html
@@ -0,0 +1,23 @@
+{% macro book_cover(book, title=None, alt=None) -%}
+    {%- set image_title = book.title if book.title else book.name -%}
+    {%- set image_title = title if title else image_title -%}
+    {%- set image_alt = alt if alt else image_title -%}
+    {% set srcset = book|get_cover_srcset %}
+    <img
+        srcset="{{ srcset }}"
+        src="{{ url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified) }}"
+        title="{{ image_title }}"
+        alt="{{ image_alt }}"
+    />
+{%- endmacro %}
+
+{% macro series(series, title=None, alt=None) -%}
+    {%- set image_alt = alt if alt else image_title -%}
+    {% set srcset = series|get_series_srcset %}
+    <img
+        srcset="{{ srcset }}"
+        src="{{ url_for('web.get_series_cover', series_id=series.id, resolution='og', c='month'|cache_timestamp) }}"
+        title="{{ title }}"
+        alt="{{ book_title }}"
+    />
+{%- endmacro %}
diff --git a/cps/templates/index.html b/cps/templates/index.html
index e47c6c703..709d6ce73 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if g.user.show_detail_random() %}
@@ -10,7 +10,7 @@
       <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">
-                {{ book_cover_image(entry) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
@@ -87,7 +87,7 @@
       <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">
-              {{ book_cover_image(entry) }}
+              {{ image.book_cover(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 63dc74694..4a664ec1e 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -1,5 +1,5 @@
 {% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal, delete_confirm_modal, change_confirm_modal %}
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 <!DOCTYPE html>
 <html lang="{{ g.user.locale }}">
   <head>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 872b6dc1e..15ff344fb 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -45,7 +45,7 @@
         {% 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">
             <span class="img">
-                {{ book_cover_image(entry) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 0e5865c96..18dbde8b1 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -32,7 +32,7 @@
       <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">
-                {{ book_cover_image(entry) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>
diff --git a/cps/ub.py b/cps/ub.py
index f108a1cea..7666f0f29 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -526,10 +526,11 @@ class Thumbnail(Base):
     __tablename__ = 'thumbnail'
 
     id = Column(Integer, primary_key=True)
-    book_id = Column(Integer)
+    entity_id = Column(Integer)
     uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
     format = Column(String, default='jpeg')
-    resolution = Column(SmallInteger, default=1)
+    type = Column(SmallInteger, default=constants.THUMBNAIL_TYPE_COVER)
+    resolution = Column(SmallInteger, default=constants.COVER_THUMBNAIL_SMALL)
     filename = Column(String, default=filename)
     generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
     expiration = Column(DateTime, nullable=True)
diff --git a/cps/web.py b/cps/web.py
index 8f78ff32a..88a5c0abf 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,8 +50,8 @@ 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, check_email, check_username, \
-    get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
+from .helper import check_valid_domain, render_task_status, check_email, check_username, get_cc_columns, \
+    get_book_cover, get_series_cover_thumbnail, get_download_link, send_mail, generate_random_password, \
     send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email
 from .pagination import Pagination
 from .redirect import redirect_back
@@ -1388,11 +1388,31 @@ def advanced_search_form():
 
 
 @web.route("/cover/<int:book_id>")
-@web.route("/cover/<int:book_id>/<int:resolution>")
-@web.route("/cover/<int:book_id>/<int:resolution>/<string:cache_bust>")
+@web.route("/cover/<int:book_id>/<string:resolution>")
 @login_required_if_no_ano
-def get_cover(book_id, resolution=None, cache_bust=None):
-    return get_book_cover(book_id, resolution)
+def get_cover(book_id, resolution=None):
+    resolutions = {
+        'og': constants.COVER_THUMBNAIL_ORIGINAL,
+        'sm': constants.COVER_THUMBNAIL_SMALL,
+        'md': constants.COVER_THUMBNAIL_MEDIUM,
+        'lg': constants.COVER_THUMBNAIL_LARGE,
+    }
+    cover_resolution = resolutions.get(resolution, None)
+    return get_book_cover(book_id, cover_resolution)
+
+
+@web.route("/series_cover/<int:series_id>")
+@web.route("/series_cover/<int:series_id>/<string:resolution>")
+@login_required_if_no_ano
+def get_series_cover(series_id, resolution=None):
+    resolutions = {
+        'og': constants.COVER_THUMBNAIL_ORIGINAL,
+        'sm': constants.COVER_THUMBNAIL_SMALL,
+        'md': constants.COVER_THUMBNAIL_MEDIUM,
+        'lg': constants.COVER_THUMBNAIL_LARGE,
+    }
+    cover_resolution = resolutions.get(resolution, None)
+    return get_series_cover_thumbnail(series_id, cover_resolution)
 
 
 @web.route("/robots.txt")

From 26071d4e7ad1943f91904804fc1b5464866d748b Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sun, 26 Sep 2021 02:02:48 -0500
Subject: [PATCH 018/412] Added Scheduled Tasks Settings

---
 cps/admin.py                         | 62 +++++++++++++++++++---------
 cps/config_sql.py                    | 15 +++++--
 cps/schedule.py                      | 19 +++++----
 cps/services/background_scheduler.py | 24 +++++++----
 cps/tasks/thumbnail.py               | 14 +------
 cps/templates/admin.html             | 43 +++++++++++--------
 cps/templates/schedule_edit.html     | 38 +++++++++++++++++
 7 files changed, 147 insertions(+), 68 deletions(-)
 create mode 100644 cps/templates/schedule_edit.html

diff --git a/cps/admin.py b/cps/admin.py
index 92c8bd702..bd292ba3a 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -159,23 +159,6 @@ def shutdown():
     return json.dumps(showtext), 400
 
 
-@admi.route("/clear-cache")
-@login_required
-@admin_required
-def clear_cache():
-    cache_type = request.args.get('cache_type'.strip())
-    showtext = {}
-
-    if cache_type == constants.CACHE_TYPE_THUMBNAILS:
-        log.info('clearing cover thumbnail cache')
-        showtext['text'] = _(u'Cleared cover thumbnail cache')
-        helper.clear_cover_thumbnail_cache()
-        return json.dumps(showtext)
-
-    showtext['text'] = _(u'Unknown command')
-    return json.dumps(showtext)
-
-
 @admi.route("/admin/view")
 @login_required
 @admin_required
@@ -205,6 +188,7 @@ def admin():
                                  feature_support=feature_support, kobo_support=kobo_support,
                                  title=_(u"Admin page"), page="admin")
 
+
 @admi.route("/admin/dbconfig", methods=["GET", "POST"])
 @login_required
 @admin_required
@@ -245,6 +229,7 @@ def ajax_db_config():
 def calibreweb_alive():
     return "", 200
 
+
 @admi.route("/admin/viewconfig")
 @login_required
 @admin_required
@@ -257,6 +242,7 @@ def view_configuration():
                                  restrictColumns=restrict_columns,
                                  title=_(u"UI Configuration"), page="uiconfig")
 
+
 @admi.route("/admin/usertable")
 @login_required
 @admin_required
@@ -339,6 +325,7 @@ def list_users():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @admi.route("/ajax/deleteuser", methods=['POST'])
 @login_required
 @admin_required
@@ -372,6 +359,7 @@ def delete_user():
     success.extend(errors)
     return Response(json.dumps(success), mimetype='application/json')
 
+
 @admi.route("/ajax/getlocale")
 @login_required
 @admin_required
@@ -517,6 +505,7 @@ def update_table_settings():
         return "Invalid request", 400
     return ""
 
+
 def check_valid_read_column(column):
     if column != "0":
         if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
@@ -524,6 +513,7 @@ def check_valid_read_column(column):
             return False
     return True
 
+
 def check_valid_restricted_column(column):
     if column != "0":
         if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
@@ -532,7 +522,6 @@ def check_valid_restricted_column(column):
     return True
 
 
-
 @admi.route("/admin/viewconfig", methods=["POST"])
 @login_required
 @admin_required
@@ -564,7 +553,6 @@ def update_view_configuration():
     _config_int(to_save, "config_books_per_page")
     _config_int(to_save, "config_authors_max")
 
-
     config.config_default_role = constants.selected_roles(to_save)
     config.config_default_role &= ~constants.ROLE_ANONYMOUS
 
@@ -1210,6 +1198,7 @@ def _db_configuration_update_helper():
     config.save()
     return _db_configuration_result(None, gdrive_error)
 
+
 def _configuration_update_helper():
     reboot_required = False
     to_save = request.form.to_dict()
@@ -1299,6 +1288,7 @@ def _configuration_update_helper():
 
     return _configuration_result(None, reboot_required)
 
+
 def _configuration_result(error_flash=None, reboot=False):
     resp = {}
     if error_flash:
@@ -1388,6 +1378,7 @@ def _handle_new_user(to_save, content, languages, translations, kobo_support):
         log.error("Settings DB is not Writeable")
         flash(_("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():
@@ -1572,6 +1563,39 @@ def update_mailsettings():
     return edit_mailsettings()
 
 
+@admi.route("/admin/scheduledtasks")
+@login_required
+@admin_required
+def edit_scheduledtasks():
+    content = config.get_scheduled_task_settings()
+    return render_title_template("schedule_edit.html", content=content, title=_(u"Edit Scheduled Tasks Settings"))
+
+
+@admi.route("/admin/scheduledtasks", methods=["POST"])
+@login_required
+@admin_required
+def update_scheduledtasks():
+    to_save = request.form.to_dict()
+    _config_int(to_save, "schedule_start_time")
+    _config_int(to_save, "schedule_end_time")
+    _config_checkbox(to_save, "schedule_generate_book_covers")
+    _config_checkbox(to_save, "schedule_generate_series_covers")
+
+    try:
+        config.save()
+        flash(_(u"Scheduled tasks settings updated"), category="success")
+    except IntegrityError as ex:
+        ub.session.rollback()
+        log.error("An unknown error occurred while saving scheduled tasks settings")
+        flash(_(u"An unknown error occurred. Please try again later."), category="error")
+    except OperationalError:
+        ub.session.rollback()
+        log.error("Settings DB is not Writeable")
+        flash(_("Settings DB is not Writeable"), category="error")
+
+    return edit_scheduledtasks()
+
+
 @admi.route("/admin/user/<int:user_id>", methods=["GET", "POST"])
 @login_required
 @admin_required
diff --git a/cps/config_sql.py b/cps/config_sql.py
index 88107f9b3..4841f03da 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -133,13 +133,18 @@ class _Settings(_Base):
     config_calibre = Column(String)
     config_rarfile_location = Column(String, default=None)
     config_upload_formats = Column(String, default=','.join(constants.EXTENSIONS_UPLOAD))
-    config_unicode_filename =Column(Boolean, default=False)
+    config_unicode_filename = Column(Boolean, default=False)
 
     config_updatechannel = Column(Integer, default=constants.UPDATE_STABLE)
 
     config_reverse_proxy_login_header_name = Column(String)
     config_allow_reverse_proxy_header_login = Column(Boolean, default=False)
 
+    schedule_start_time = Column(Integer, default=4)
+    schedule_end_time = Column(Integer, default=6)
+    schedule_generate_book_covers = Column(Boolean, default=False)
+    schedule_generate_series_covers = Column(Boolean, default=False)
+
     def __repr__(self):
         return self.__class__.__name__
 
@@ -170,7 +175,6 @@ class _ConfigSQL(object):
         if change:
             self.save()
 
-
     def _read_from_storage(self):
         if self._settings is None:
             log.debug("_ConfigSQL._read_from_storage")
@@ -254,6 +258,8 @@ class _ConfigSQL(object):
         return bool((self.mail_server != constants.DEFAULT_MAIL_SERVER and self.mail_server_type == 0)
                     or (self.mail_gmail_token != {} and self.mail_server_type == 1))
 
+    def get_scheduled_task_settings(self):
+        return {k:v for k, v in self.__dict__.items() if k.startswith('schedule_')}
 
     def set_from_dictionary(self, dictionary, field, convertor=None, default=None, encode=None):
         """Possibly updates a field of this object.
@@ -289,7 +295,6 @@ class _ConfigSQL(object):
                 storage[k] = v
         return storage
 
-
     def load(self):
         '''Load all configuration values from the underlying storage.'''
         s = self._read_from_storage()  # type: _Settings
@@ -407,6 +412,7 @@ def autodetect_calibre_binary():
             return element
     return ""
 
+
 def autodetect_unrar_binary():
     if sys.platform == "win32":
         calibre_path = ["C:\\program files\\WinRar\\unRAR.exe",
@@ -418,6 +424,7 @@ def autodetect_unrar_binary():
             return element
     return ""
 
+
 def autodetect_kepubify_binary():
     if sys.platform == "win32":
         calibre_path = ["C:\\program files\\kepubify\\kepubify-windows-64Bit.exe",
@@ -429,6 +436,7 @@ def autodetect_kepubify_binary():
             return element
     return ""
 
+
 def _migrate_database(session):
     # make sure the table is created, if it does not exist
     _Base.metadata.create_all(session.bind)
@@ -452,6 +460,7 @@ def load_configuration(session):
     #    session.commit()
     return conf
 
+
 def get_flask_session_key(session):
     flask_settings = session.query(_Flask_Settings).one_or_none()
     if flask_settings == None:
diff --git a/cps/schedule.py b/cps/schedule.py
index dc153b9ae..2cddaecb0 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -19,7 +19,6 @@
 from __future__ import division, print_function, unicode_literals
 
 from .services.background_scheduler import BackgroundScheduler
-from .services.worker import WorkerThread
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails
 
@@ -28,13 +27,19 @@ def register_jobs():
     scheduler = BackgroundScheduler()
 
     if scheduler:
-        # Reconnect metadata.db once every 12 hours
-        scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
+        # Reconnect Calibre database (metadata.db)
+        scheduler.schedule_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
 
-        # Generate all missing book cover thumbnails once every 24 hours
-        scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
+        # Generate all missing book cover thumbnails
+        scheduler.schedule_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
+
+        # Generate all missing series thumbnails
+        scheduler.schedule_task(user=None, task=lambda: TaskGenerateSeriesThumbnails(), trigger='cron', hour=4)
 
 
 def register_startup_jobs():
-    WorkerThread.add(None, TaskGenerateCoverThumbnails())
-    # WorkerThread.add(None, TaskGenerateSeriesThumbnails())
+    scheduler = BackgroundScheduler()
+
+    if scheduler:
+        scheduler.schedule_task_immediately(None, task=lambda: TaskGenerateCoverThumbnails())
+        scheduler.schedule_task_immediately(None, task=lambda: TaskGenerateSeriesThumbnails())
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index 1b588ac20..ba5789036 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -40,25 +40,31 @@ class BackgroundScheduler:
 
         if cls._instance is None:
             cls._instance = super(BackgroundScheduler, cls).__new__(cls)
-
-            scheduler = BScheduler()
-            atexit.register(lambda: scheduler.shutdown())
-
             cls.log = logger.create()
-            cls.scheduler = scheduler
+            cls.scheduler = BScheduler()
             cls.scheduler.start()
 
+            atexit.register(lambda: cls.scheduler.shutdown())
+
         return cls._instance
 
-    def add(self, func, trigger, **trigger_args):
+    def _add(self, func, trigger, **trigger_args):
         if use_APScheduler:
             return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
 
-    def add_task(self, user, task, trigger, **trigger_args):
+    # Expects a lambda expression for the task, so that the task isn't instantiated before the task is scheduled
+    def schedule_task(self, user, task, trigger, **trigger_args):
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
-                self.log.info(f'Running scheduled task in background: {worker_task.name} - {worker_task.message}')
                 WorkerThread.add(user, worker_task)
 
-            return self.add(func=scheduled_task, trigger=trigger, **trigger_args)
+            return self._add(func=scheduled_task, trigger=trigger, **trigger_args)
+
+    # Expects a lambda expression for the task, so that the task isn't instantiated before the task is scheduled
+    def schedule_task_immediately(self, user, task):
+        if use_APScheduler:
+            def scheduled_task():
+                WorkerThread.add(user, task())
+
+            return self._add(func=scheduled_task, trigger='date')
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 152b87727..a220fd8c6 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -167,9 +167,9 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                 try:
                     stream = urlopen(web_content_link)
                     with Image(file=stream) as img:
-                        height = self.get_thumbnail_height(thumbnail)
+                        height = get_resize_height(thumbnail.resolution)
                         if img.height > height:
-                            width = self.get_thumbnail_width(height, img)
+                            width = get_resize_width(thumbnail.resolution, img.width, img.height)
                             img.resize(width=width, height=height, filter='lanczos')
                             img.format = thumbnail.format
                             filename = self.cache.get_cache_file_path(thumbnail.filename,
@@ -212,16 +212,6 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             constants.COVER_THUMBNAIL_MEDIUM
         ]
 
-    # get all series
-    # get all books in series with covers and count >= 4 books
-    # get the dimensions from the first book in the series & pop the first book from the series list of books
-    # randomly select three other books in the series
-
-    # resize the covers in the sequence?
-    # create an image sequence from the 4 selected books of the series
-    # join pairs of books in the series with wand's concat
-    # join the two sets of pairs with wand's
-
     def run(self, worker_thread):
         if self.calibre_db.session and use_IM:
             all_series = self.get_series_with_four_plus_books()
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 597ba1030..ec0fc84ea 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -156,6 +156,31 @@
     </div>
   </div>
 
+  <div class="row">
+    <div class="col">
+      <h2>{{_('Scheduled Tasks')}}</h2>
+        <div class="col-xs-12 col-sm-12">
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Time at which tasks start to run')}}</div>
+            <div class="col-xs-6 col-sm-3">{{config.schedule_start_time}}:00</div>
+          </div>
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Time at which tasks stop running')}}</div>
+            <div class="col-xs-6 col-sm-3">{{config.schedule_end_time}}:00</div>
+          </div>
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Generate book cover thumbnails')}}</div>
+            <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_book_covers) }}</div>
+          </div>
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Generate series cover thumbnails')}}</div>
+            <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_series_covers) }}</div>
+          </div>
+        </div>
+      <a class="btn btn-default scheduledtasks" id="admin_edit_scheduled_tasks" href="{{url_for('admin.edit_scheduledtasks')}}">{{_('Edit Scheduled Tasks Settings')}}</a>
+    </div>
+  </div>
+
   <div class="row form-group">
     <h2>{{_('Administration')}}</h2>
     <a class="btn btn-default" id="debug" href="{{url_for('admin.download_debug')}}">{{_('Download Debug Package')}}</a>
@@ -163,7 +188,6 @@
   </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="clear_cover_thumbnail_cache" data-toggle="modal" data-target="#ClearCacheDialog">{{_('Clear Cover Thumbnail Cache')}}</div>
   </div>
   <div class="row form-group">
     <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
@@ -248,21 +272,4 @@
     </div>
   </div>
 </div>
-<div id="ClearCacheDialog" class="modal fade" role="dialog">
-  <div class="modal-dialog modal-sm">
-    <!-- Modal content-->
-    <div class="modal-content">
-      <div class="modal-header bg-info"></div>
-      <div class="modal-body text-center">
-        <p>{{_('Are you sure you want to clear the cover thumbnail cache?')}}</p>
-        <div id="spinner3" class="spinner" style="display:none;">
-          <img id="img-spinner3" src="{{ url_for('static', filename='css/libs/images/loading-icon.gif') }}"/>
-        </div>
-        <p></p>
-        <button type="button" class="btn btn-default" id="clear_cache" >{{_('OK')}}</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
-      </div>
-    </div>
-  </div>
-</div>
 {% endblock %}
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
new file mode 100644
index 000000000..f4e722242
--- /dev/null
+++ b/cps/templates/schedule_edit.html
@@ -0,0 +1,38 @@
+{% extends "layout.html" %}
+{% 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 %}
+<div class="discover">
+  <h1>{{title}}</h1>
+  <form role="form" class="col-md-10 col-lg-6" method="POST" autocomplete="off">
+    <div class="form-group">
+      <label for="schedule_start_time">{{_('Time at which tasks start to run')}}</label>
+      <select name="schedule_start_time" id="schedule_start_time" class="form-control">
+        {% for n in range(24) %}
+          <option value="{{n}}" {% if content.schedule_start_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+        {% endfor %}
+      </select>
+    </div>
+    <div class="form-group">
+      <label for="schedule_end_time">{{_('Time at which tasks stop running')}}</label>
+      <select name="schedule_end_time" id="schedule_end_time" class="form-control">
+        {% for n in range(24) %}
+          <option value="{{n}}" {% if content.schedule_end_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+        {% endfor %}
+      </select>
+    </div>
+    <div class="form-group">
+      <input type="checkbox" id="schedule_generate_book_covers" name="schedule_generate_book_covers" checked>
+      <label for="schedule_generate_book_covers">{{_('Generate Book Cover Thumbnails')}}</label>
+    </div>
+    <div class="form-group">
+      <input type="checkbox" id="schedule_generate_series_covers" name="schedule_generate_series_covers" {% if config.schedule_generate_series_covers %}checked{% endif %}>
+      <label for="schedule_generate_series_covers">{{_('Generate Series Cover Thumbnails')}}</label>
+    </div>
+    <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
+    <a href="{{ url_for('admin.admin') }}" id="email_back" class="btn btn-default">{{_('Cancel')}}</a>
+  </form>
+</div>
+{% endblock %}

From 46205a1f83ec6a81c57d5dd3348ea583f9201063 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Wed, 29 Sep 2021 02:40:12 -0500
Subject: [PATCH 019/412] Made long running tasks cancellable. Added cancel
 button to cancellable tasks in the task list. Added APP_MODE env variable for
 determining if the app is running in development, test, or production.

---
 cps.py                               |   8 +-
 cps/admin.py                         |  23 +++++-
 cps/constants.py                     |   7 +-
 cps/db.py                            |   6 +-
 cps/helper.py                        |  17 +++-
 cps/schedule.py                      |  61 ++++++++++++---
 cps/services/background_scheduler.py |  35 ++++++---
 cps/services/worker.py               |  35 +++++++--
 cps/static/css/caliBlur.css          |  93 +++++++++-------------
 cps/static/js/main.js                |  12 ---
 cps/static/js/table.js               |  34 +++++++-
 cps/tasks/convert.py                 |   4 +
 cps/tasks/database.py                |   4 +
 cps/tasks/mail.py                    |   6 +-
 cps/tasks/thumbnail.py               | 111 +++++++++++++++++++--------
 cps/tasks/upload.py                  |   4 +
 cps/templates/admin.html             |   2 +-
 cps/templates/schedule_edit.html     |   6 +-
 cps/templates/tasks.html             |  27 +++++++
 cps/web.py                           |   4 +-
 20 files changed, 346 insertions(+), 153 deletions(-)

diff --git a/cps.py b/cps.py
index fe0065519..20a27c719 100755
--- a/cps.py
+++ b/cps.py
@@ -44,7 +44,7 @@ from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.search_metadata import meta
 from cps.error_handler import init_errorhandler
-from cps.schedule import register_jobs, register_startup_jobs
+from cps.schedule import register_scheduled_tasks, register_startup_tasks
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -81,9 +81,9 @@ def main():
     if oauth_available:
         app.register_blueprint(oauth)
 
-    # Register scheduled jobs
-    register_jobs()
-    # register_startup_jobs()
+    # Register scheduled tasks
+    register_scheduled_tasks()
+    register_startup_tasks()
 
     success = web_server.start()
     sys.exit(0 if success else 1)
diff --git a/cps/admin.py b/cps/admin.py
index bd292ba3a..62b3dbe0f 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -40,12 +40,13 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
-from . import constants, logger, helper, services, isoLanguages, fs
-from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils
+from . import constants, logger, helper, services, isoLanguages
+from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username
 from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
+from .services.worker import WorkerThread
 from . import debug_info, _BABEL_TRANSLATIONS
 
 try:
@@ -1568,7 +1569,7 @@ def update_mailsettings():
 @admin_required
 def edit_scheduledtasks():
     content = config.get_scheduled_task_settings()
-    return render_title_template("schedule_edit.html", content=content, title=_(u"Edit Scheduled Tasks Settings"))
+    return render_title_template("schedule_edit.html", config=content, title=_(u"Edit Scheduled Tasks Settings"))
 
 
 @admi.route("/admin/scheduledtasks", methods=["POST"])
@@ -1584,6 +1585,12 @@ def update_scheduledtasks():
     try:
         config.save()
         flash(_(u"Scheduled tasks settings updated"), category="success")
+
+        # Cancel any running tasks
+        schedule.end_scheduled_tasks()
+
+        # Re-register tasks with new settings
+        schedule.register_scheduled_tasks()
     except IntegrityError as ex:
         ub.session.rollback()
         log.error("An unknown error occurred while saving scheduled tasks settings")
@@ -1869,3 +1876,13 @@ def extract_dynamic_field_from_filter(user, filtr):
 def extract_user_identifier(user, filtr):
     dynamic_field = extract_dynamic_field_from_filter(user, filtr)
     return extract_user_data_from_field(user, dynamic_field)
+
+
+@admi.route("/ajax/canceltask", methods=['POST'])
+@login_required
+@admin_required
+def cancel_task():
+    task_id = request.get_json().get('task_id', None)
+    worker = WorkerThread.get_instance()
+    worker.end_task(task_id)
+    return ""
diff --git a/cps/constants.py b/cps/constants.py
index 306d28723..a92a00299 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -24,10 +24,13 @@ from sqlalchemy import __version__ as sql_version
 
 sqlalchemy_version2 = ([int(x) for x in sql_version.split('.')] >= [2,0,0])
 
+# APP_MODE - production, development, or test
+APP_MODE             = os.environ.get('APP_MODE', 'production')
+
 # if installed via pip this variable is set to true (empty file with name .HOMEDIR present)
 HOME_CONFIG = os.path.isfile(os.path.join(os.path.dirname(os.path.abspath(__file__)), '.HOMEDIR'))
 
-#In executables updater is not available, so variable is set to False there
+# In executables updater is not available, so variable is set to False there
 UPDATER_AVAILABLE = True
 
 # Base dir is parent of current file, necessary if called from different folder
@@ -43,7 +46,7 @@ TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
 
 # Cache dir - use CACHE_DIR environment variable, otherwise use the default directory: cps/cache
 DEFAULT_CACHE_DIR   = os.path.join(BASE_DIR, 'cps', 'cache')
-CACHE_DIR           = os.environ.get("CACHE_DIR", DEFAULT_CACHE_DIR)
+CACHE_DIR           = os.environ.get('CACHE_DIR', DEFAULT_CACHE_DIR)
 
 if HOME_CONFIG:
     home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
diff --git a/cps/db.py b/cps/db.py
index 296db7a4a..e4cea1008 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -443,11 +443,11 @@ class CalibreDB():
         """
         self.session = None
         if self._init:
-            self.initSession(expire_on_commit)
+            self.init_session(expire_on_commit)
 
         self.instances.add(self)
 
-    def initSession(self, expire_on_commit=True):
+    def init_session(self, expire_on_commit=True):
         self.session = self.session_factory()
         self.session.expire_on_commit = expire_on_commit
         self.update_title_sort(self.config)
@@ -593,7 +593,7 @@ class CalibreDB():
                                                           autoflush=True,
                                                           bind=cls.engine))
         for inst in cls.instances:
-            inst.initSession()
+            inst.init_session()
 
         cls._init = True
         return True
diff --git a/cps/helper.py b/cps/helper.py
index 2f2df0e07..a221dbb78 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -57,7 +57,8 @@ from . import logger, config, get_locale, db, fs, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
-from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
+from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS, STAT_ENDED, \
+    STAT_CANCELLED
 from .tasks.mail import TaskEmail
 from .tasks.thumbnail import TaskClearCoverThumbnailCache
 
@@ -838,12 +839,22 @@ def render_task_status(tasklist):
                     ret['status'] = _(u'Started')
                 elif task.stat == STAT_FINISH_SUCCESS:
                     ret['status'] = _(u'Finished')
+                elif task.stat == STAT_ENDED:
+                    ret['status'] = _(u'Ended')
+                elif task.stat == STAT_CANCELLED:
+                    ret['status'] = _(u'Cancelled')
                 else:
                     ret['status'] = _(u'Unknown Status')
 
-            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message)
+            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message) if task.message else _(task.name)
             ret['progress'] = "{} %".format(int(task.progress * 100))
             ret['user'] = escape(user)  # prevent xss
+
+            # Hidden fields
+            ret['id'] = task.id
+            ret['stat'] = task.stat
+            ret['is_cancellable'] = task.is_cancellable
+
             renderedtasklist.append(ret)
 
     return renderedtasklist
@@ -914,5 +925,5 @@ def get_download_link(book_id, book_format, client):
         abort(404)
 
 
-def clear_cover_thumbnail_cache(book_id=None):
+def clear_cover_thumbnail_cache(book_id):
     WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
diff --git a/cps/schedule.py b/cps/schedule.py
index 2cddaecb0..2bb7878f7 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -17,29 +17,70 @@
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import division, print_function, unicode_literals
+import datetime
 
+from . import config, constants
 from .services.background_scheduler import BackgroundScheduler
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails
+from .services.worker import WorkerThread
 
 
-def register_jobs():
+def get_scheduled_tasks(reconnect=True):
+    tasks = list()
+
+    # Reconnect Calibre database (metadata.db)
+    if reconnect:
+        tasks.append(lambda: TaskReconnectDatabase())
+
+    # Generate all missing book cover thumbnails
+    if config.schedule_generate_book_covers:
+        tasks.append(lambda: TaskGenerateCoverThumbnails())
+
+    # Generate all missing series thumbnails
+    if config.schedule_generate_series_covers:
+        tasks.append(lambda: TaskGenerateSeriesThumbnails())
+
+    return tasks
+
+
+def end_scheduled_tasks():
+    worker = WorkerThread.get_instance()
+    for __, __, __, task in worker.tasks:
+        if task.scheduled and task.is_cancellable:
+            worker.end_task(task.id)
+
+
+def register_scheduled_tasks():
     scheduler = BackgroundScheduler()
 
     if scheduler:
-        # Reconnect Calibre database (metadata.db)
-        scheduler.schedule_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
+        # Remove all existing jobs
+        scheduler.remove_all_jobs()
 
-        # Generate all missing book cover thumbnails
-        scheduler.schedule_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
+        start = config.schedule_start_time
+        end = config.schedule_end_time
 
-        # Generate all missing series thumbnails
-        scheduler.schedule_task(user=None, task=lambda: TaskGenerateSeriesThumbnails(), trigger='cron', hour=4)
+        # Register scheduled tasks
+        if start != end:
+            scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
+            scheduler.schedule(func=end_scheduled_tasks, trigger='cron', hour=end)
+
+        # Kick-off tasks, if they should currently be running
+        now = datetime.datetime.now().hour
+        if start <= now < end:
+            scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
 
 
-def register_startup_jobs():
+def register_startup_tasks():
     scheduler = BackgroundScheduler()
 
     if scheduler:
-        scheduler.schedule_task_immediately(None, task=lambda: TaskGenerateCoverThumbnails())
-        scheduler.schedule_task_immediately(None, task=lambda: TaskGenerateSeriesThumbnails())
+        start = config.schedule_start_time
+        end = config.schedule_end_time
+        now = datetime.datetime.now().hour
+
+        # Run scheduled tasks immediately for development and testing
+        # Ignore tasks that should currently be running, as these will be added when registering scheduled tasks
+        if constants.APP_MODE in ['development', 'test'] and not (start <= now < end):
+            scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index ba5789036..971b0bf79 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -48,23 +48,38 @@ class BackgroundScheduler:
 
         return cls._instance
 
-    def _add(self, func, trigger, **trigger_args):
+    def schedule(self, func, trigger, **trigger_args):
         if use_APScheduler:
             return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
 
-    # Expects a lambda expression for the task, so that the task isn't instantiated before the task is scheduled
-    def schedule_task(self, user, task, trigger, **trigger_args):
+    # Expects a lambda expression for the task
+    def schedule_task(self, task, user=None, trigger='cron', **trigger_args):
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
+                worker_task.scheduled = True
                 WorkerThread.add(user, worker_task)
+            return self.schedule(func=scheduled_task, trigger=trigger, **trigger_args)
 
-            return self._add(func=scheduled_task, trigger=trigger, **trigger_args)
-
-    # Expects a lambda expression for the task, so that the task isn't instantiated before the task is scheduled
-    def schedule_task_immediately(self, user, task):
+    # Expects a list of lambda expressions for the tasks
+    def schedule_tasks(self, tasks, user=None, trigger='cron', **trigger_args):
         if use_APScheduler:
-            def scheduled_task():
-                WorkerThread.add(user, task())
+            for task in tasks:
+                self.schedule_task(task, user=user, trigger=trigger, **trigger_args)
 
-            return self._add(func=scheduled_task, trigger='date')
+    # Expects a lambda expression for the task
+    def schedule_task_immediately(self, task, user=None):
+        if use_APScheduler:
+            def immediate_task():
+                WorkerThread.add(user, task())
+            return self.schedule(func=immediate_task, trigger='date')
+
+    # Expects a list of lambda expressions for the tasks
+    def schedule_tasks_immediately(self, tasks, user=None):
+        if use_APScheduler:
+            for task in tasks:
+                self.schedule_task_immediately(task, user)
+
+    # Remove all jobs
+    def remove_all_jobs(self):
+        self.scheduler.remove_all_jobs()
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 97068f742..04a4c056b 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -21,6 +21,8 @@ STAT_WAITING = 0
 STAT_FAIL = 1
 STAT_STARTED = 2
 STAT_FINISH_SUCCESS = 3
+STAT_ENDED = 4
+STAT_CANCELLED = 5
 
 # Only retain this many tasks in dequeued list
 TASK_CLEANUP_TRIGGER = 20
@@ -50,7 +52,7 @@ class WorkerThread(threading.Thread):
     _instance = None
 
     @classmethod
-    def getInstance(cls):
+    def get_instance(cls):
         if cls._instance is None:
             cls._instance = WorkerThread()
         return cls._instance
@@ -67,12 +69,13 @@ class WorkerThread(threading.Thread):
 
     @classmethod
     def add(cls, user, task):
-        ins = cls.getInstance()
+        ins = cls.get_instance()
         ins.num += 1
-        log.debug("Add Task for user: {}: {}".format(user, task))
+        username = user if user is not None else 'System'
+        log.debug("Add Task for user: {}: {}".format(username, task))
         ins.queue.put(QueuedTask(
             num=ins.num,
-            user=user,
+            user=username,
             added=datetime.now(),
             task=task,
         ))
@@ -134,6 +137,12 @@ class WorkerThread(threading.Thread):
 
             self.queue.task_done()
 
+    def end_task(self, task_id):
+        ins = self.get_instance()
+        for __, __, __, task in ins.tasks:
+            if str(task.id) == str(task_id) and task.is_cancellable:
+                task.stat = STAT_CANCELLED if task.stat == STAT_WAITING else STAT_ENDED
+
 
 class CalibreTask:
     __metaclass__ = abc.ABCMeta
@@ -147,10 +156,11 @@ class CalibreTask:
         self.message = message
         self.id = uuid.uuid4()
         self.self_cleanup = False
+        self._scheduled = False
 
     @abc.abstractmethod
     def run(self, worker_thread):
-        """Provides the caller some human-readable name for this class"""
+        """The main entry-point for this task"""
         raise NotImplementedError
 
     @abc.abstractmethod
@@ -158,6 +168,11 @@ class CalibreTask:
         """Provides the caller some human-readable name for this class"""
         raise NotImplementedError
 
+    @abc.abstractmethod
+    def is_cancellable(self):
+        """Does this task gracefully handle being cancelled (STAT_ENDED, STAT_CANCELLED)?"""
+        raise NotImplementedError
+
     def start(self, *args):
         self.start_time = datetime.now()
         self.stat = STAT_STARTED
@@ -208,7 +223,7 @@ class CalibreTask:
         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)
+        return self.stat in (STAT_FINISH_SUCCESS, STAT_FAIL, STAT_ENDED, STAT_CANCELLED)
 
     '''@progress.setter
     def progress(self, x):        
@@ -226,6 +241,14 @@ class CalibreTask:
     def self_cleanup(self, is_self_cleanup):
         self._self_cleanup = is_self_cleanup
 
+    @property
+    def scheduled(self):
+        return self._scheduled
+
+    @scheduled.setter
+    def scheduled(self, is_scheduled):
+        self._scheduled = is_scheduled
+
     def _handleError(self, error_message):
         self.stat = STAT_FAIL
         self.progress = 1
diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index b4fa60450..b2b354234 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -5150,7 +5150,7 @@ body.login > div.navbar.navbar-default.navbar-static-top > div > div.navbar-head
     pointer-events: none
 }
 
-#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #ClearCacheDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
+#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before,  #deleteButton, #deleteModal:hover:before, #cancelTaskModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
     cursor: pointer
 }
 
@@ -5237,6 +5237,10 @@ body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > d
     margin-bottom: 20px
 }
 
+body.admin > div.container-fluid div.scheduled_tasks_details {
+    margin-bottom: 20px
+}
+
 body.admin .btn-default {
     margin-bottom: 10px
 }
@@ -5468,7 +5472,7 @@ body.admin.modal-open .navbar {
     z-index: 0 !important
 }
 
-#RestartDialog, #ShutdownDialog, #StatusDialog, #ClearCacheDialog, #deleteModal {
+#RestartDialog, #ShutdownDialog, #StatusDialog, #deleteModal, #cancelTaskModal {
     top: 0;
     overflow: hidden;
     padding-top: 70px;
@@ -5478,7 +5482,7 @@ body.admin.modal-open .navbar {
     background: rgba(0, 0, 0, .5)
 }
 
-#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #ClearCacheDialog:before, #deleteModal:before {
+#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #deleteModal:before, #cancelTaskModal:before {
     content: "\E208";
     padding-right: 10px;
     display: block;
@@ -5500,18 +5504,18 @@ body.admin.modal-open .navbar {
     z-index: 99
 }
 
-#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
+#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before, #cancelTaskModal.in:before {
     -webkit-transform: translate(0, 0);
     -ms-transform: translate(0, 0);
     transform: translate(0, 0)
 }
 
-#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
+#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog, #cancelTaskModal > .modal-dialog {
     width: 450px;
     margin: auto
 }
 
-#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content, #cancelTaskModal > .modal-dialog > .modal-content {
     max-height: calc(100% - 90px);
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
@@ -5522,7 +5526,7 @@ body.admin.modal-open .navbar {
     width: 450px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header, #cancelTaskModal > .modal-dialog > .modal-content > .modal-header {
     padding: 15px 20px;
     border-radius: 3px 3px 0 0;
     line-height: 1.71428571;
@@ -5535,7 +5539,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before, #cancelTaskModal > .modal-dialog > .modal-content > .modal-header:before {
     padding-right: 10px;
     font-size: 18px;
     color: #999;
@@ -5559,12 +5563,12 @@ body.admin.modal-open .navbar {
     font-family: plex-icons-new, serif
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before {
-    content: "\EA15";
+#deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+    content: "\EA6D";
     font-family: plex-icons-new, serif
 }
 
-#deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
     font-family: plex-icons-new, serif
 }
@@ -5587,19 +5591,19 @@ body.admin.modal-open .navbar {
     font-size: 20px
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:after {
-    content: "Clear Cover Thumbnail Cache";
-    display: inline-block;
-    font-size: 20px
-}
-
 #deleteModal > .modal-dialog > .modal-content > .modal-header:after {
     content: "Delete Book";
     display: inline-block;
     font-size: 20px
 }
 
-#StatusDialog > .modal-dialog > .modal-content > .modal-header > span, #deleteModal > .modal-dialog > .modal-content > .modal-header > span, #loader > center > img, .rating-mobile {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-header:after {
+    content: "Delete Book";
+    display: inline-block;
+    font-size: 20px
+}
+
+#StatusDialog > .modal-dialog > .modal-content > .modal-header > span, #deleteModal > .modal-dialog > .modal-content > .modal-header > span, #cancelTaskModal > .modal-dialog > .modal-content > .modal-header > span, #loader > center > img, .rating-mobile {
     display: none
 }
 
@@ -5613,7 +5617,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#ShutdownDialog > .modal-dialog > .modal-content > .modal-body, #StatusDialog > .modal-dialog > .modal-content > .modal-body, #deleteModal > .modal-dialog > .modal-content > .modal-body {
+#ShutdownDialog > .modal-dialog > .modal-content > .modal-body, #StatusDialog > .modal-dialog > .modal-content > .modal-body, #deleteModal > .modal-dialog > .modal-content > .modal-body, #cancelTaskModal > .modal-dialog > .modal-content > .modal-body {
     padding: 20px 20px 40px;
     font-size: 16px;
     line-height: 1.6em;
@@ -5623,17 +5627,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body {
-    padding: 20px 20px 10px;
-    font-size: 16px;
-    line-height: 1.6em;
-    font-family: Open Sans Regular, Helvetica Neue, Helvetica, Arial, sans-serif;
-    color: #eee;
-    background: #282828;
-    text-align: left
-}
-
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p, #cancelTaskModal > .modal-dialog > .modal-content > .modal-body > p {
     padding: 20px 20px 0 0;
     font-size: 16px;
     line-height: 1.6em;
@@ -5642,7 +5636,7 @@ body.admin.modal-open .navbar {
     background: #282828
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default, #cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     float: right;
     z-index: 9;
     position: relative;
@@ -5678,11 +5672,11 @@ body.admin.modal-open .navbar {
     border-radius: 3px
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > #clear_cache {
+#deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
     float: right;
     z-index: 9;
     position: relative;
-    margin: 25px 0 0 10px;
+    margin: 0 0 0 10px;
     min-width: 80px;
     padding: 10px 18px;
     font-size: 16px;
@@ -5690,7 +5684,7 @@ body.admin.modal-open .navbar {
     border-radius: 3px
 }
 
-#deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
     float: right;
     z-index: 9;
     position: relative;
@@ -5710,15 +5704,15 @@ body.admin.modal-open .navbar {
     margin: 55px 0 0 10px
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache) {
-    margin: 25px 0 0 10px
-}
-
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     margin: 0 0 0 10px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+    margin: 0 0 0 10px
+}
+
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover, #cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
     background-color: hsla(0, 0%, 100%, .3)
 }
 
@@ -5752,21 +5746,6 @@ body.admin.modal-open .navbar {
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body:after {
-    content: '';
-    position: absolute;
-    width: 100%;
-    height: 72px;
-    background-color: #323232;
-    border-radius: 0 0 3px 3px;
-    left: 0;
-    margin-top: 10px;
-    z-index: 0;
-    border-top: 1px solid #222;
-    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
-    box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
-}
-
 #deleteButton {
     position: fixed;
     top: 60px;
@@ -7355,11 +7334,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         background-color: transparent !important
     }
 
-    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
+    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog, #cancelTaskModal > .modal-dialog {
         max-width: calc(100vw - 40px)
     }
 
-    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content, #cancelTaskModal > .modal-dialog > .modal-content {
         max-width: calc(100vw - 40px);
         left: 0
     }
@@ -7509,7 +7488,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         padding: 30px 15px
     }
 
-    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
+    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before, #cancelTaskModal.in:before {
         left: auto;
         right: 34px
     }
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 5537d189d..988e3b9f7 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -454,18 +454,6 @@ $(function() {
             }
         });
     });
-    $("#clear_cache").click(function () {
-        $("#spinner3").show();
-        $.ajax({
-            dataType: "json",
-            url: window.location.pathname + "/../../clear-cache",
-            data: {"cache_type":"thumbnails"},
-            success: function(data) {
-                $("#spinner3").hide();
-                $("#ClearCacheDialog").modal("hide");
-            }
-        });
-    });
 
     // Init all data control handlers to default
     $("input[data-control]").trigger("change");
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index a55ec5d13..dc4ab4ab6 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -15,7 +15,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* exported TableActions, RestrictionActions, EbookActions, responseHandler */
+/* exported TableActions, RestrictionActions, EbookActions, TaskActions, responseHandler */
 /* global getPath, confirmDialog */
 
 var selections = [];
@@ -42,6 +42,24 @@ $(function() {
         }, 1000);
     }
 
+    $("#cancel_task_confirm").click(function() {
+        //get data-id attribute of the clicked element
+        var taskId = $(this).data("task-id");
+        $.ajax({
+            method: "post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: window.location.pathname + "/../ajax/canceltask",
+            data: JSON.stringify({"task_id": taskId}),
+        });
+    });
+    //triggered when modal is about to be shown
+    $("#cancelTaskModal").on("show.bs.modal", function(e) {
+        //get data-id attribute of the clicked element and store in button
+        var taskId = $(e.relatedTarget).data("task-id");
+        $(e.currentTarget).find("#cancel_task_confirm").data("task-id", taskId);
+    });
+
     $("#books-table").on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table",
         function (e, rowsAfter, rowsBefore) {
             var rows = rowsAfter;
@@ -576,6 +594,7 @@ function handle_header_buttons () {
         $(".header_select").removeAttr("disabled");
     }
 }
+
 /* Function for deleting domain restrictions */
 function TableActions (value, row) {
     return [
@@ -613,6 +632,19 @@ function UserActions (value, row) {
     ].join("");
 }
 
+/* Function for cancelling tasks */
+function TaskActions (value, row) {
+    var cancellableStats = [0, 1, 2];
+    if (row.id && row.is_cancellable && cancellableStats.includes(row.stat)) {
+        return [
+            "<div class=\"task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.id + "\" title=\"Cancel\">",
+            "<i class=\"glyphicon glyphicon-ban-circle\"></i>",
+            "</div>"
+        ].join("");
+    }
+    return '';
+}
+
 /* Function for keeping checked rows */
 function responseHandler(res) {
     $.each(res.rows, function (i, row) {
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 56cc7076d..f150a3976 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -234,3 +234,7 @@ class TaskConvert(CalibreTask):
     @property
     def name(self):
         return "Convert"
+
+    @property
+    def is_cancellable(self):
+        return False
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 11f0186d4..0441d5641 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -47,3 +47,7 @@ class TaskReconnectDatabase(CalibreTask):
     @property
     def name(self):
         return "Reconnect Database"
+
+    @property
+    def is_cancellable(self):
+        return False
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 292114d5a..24064bd39 100644
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -162,7 +162,6 @@ class TaskEmail(CalibreTask):
             log.debug_or_exception(ex)
             self._handleError(u'Error sending e-mail: {}'.format(ex))
 
-
     def send_standard_email(self, msg):
         use_ssl = int(self.settings.get('mail_use_ssl', 0))
         timeout = 600  # set timeout to 5mins
@@ -218,7 +217,6 @@ class TaskEmail(CalibreTask):
             self.asyncSMTP = None
             self._progress = x
 
-
     @classmethod
     def _get_attachment(cls, bookpath, filename):
         """Get file as MIMEBase message"""
@@ -260,5 +258,9 @@ class TaskEmail(CalibreTask):
     def name(self):
         return "E-mail"
 
+    @property
+    def is_cancellable(self):
+        return False
+
     def __str__(self):
         return "{}, {}".format(self.name, self.subject)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index a220fd8c6..d147f10d8 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-#     Copyright (C) 2020 mmonkey
+#     Copyright (C) 2020 monkey
 #
 #   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
@@ -21,8 +21,8 @@ import os
 
 from .. import constants
 from cps import config, db, fs, gdriveutils, logger, ub
-from cps.services.worker import CalibreTask
-from datetime import datetime, timedelta
+from cps.services.worker import CalibreTask, STAT_CANCELLED, STAT_ENDED
+from datetime import datetime
 from sqlalchemy import func, text, or_
 
 try:
@@ -67,7 +67,7 @@ def get_best_fit(width, height, image_width, image_height):
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
-    def __init__(self, task_message=u'Generating cover thumbnails'):
+    def __init__(self, task_message=''):
         super(TaskGenerateCoverThumbnails, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -79,13 +79,14 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         ]
 
     def run(self, worker_thread):
-        if self.calibre_db.session and use_IM:
+        if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
+            self.message = 'Scanning Books'
             books_with_covers = self.get_books_with_covers()
             count = len(books_with_covers)
 
-            updated = 0
-            generated = 0
+            total_generated = 0
             for i, book in enumerate(books_with_covers):
+                generated = 0
                 book_cover_thumbnails = self.get_book_cover_thumbnails(book.id)
 
                 # Generate new thumbnails for missing covers
@@ -98,16 +99,32 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                 # Replace outdated or missing thumbnails
                 for thumbnail in book_cover_thumbnails:
                     if book.last_modified > thumbnail.generated_at:
-                        updated += 1
+                        generated += 1
                         self.update_book_cover_thumbnail(book, thumbnail)
 
                     elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
-                        updated += 1
+                        generated += 1
                         self.update_book_cover_thumbnail(book, thumbnail)
 
-                self.message = u'Processing book {0} of {1}'.format(i + 1, count)
+                # Increment the progress
                 self.progress = (1.0 / count) * i
 
+                if generated > 0:
+                    total_generated += generated
+                    self.message = u'Generated {0} cover thumbnails'.format(total_generated)
+
+                # Check if job has been cancelled or ended
+                if self.stat == STAT_CANCELLED:
+                    self.log.info(f'GenerateCoverThumbnails task has been cancelled.')
+                    return
+
+                if self.stat == STAT_ENDED:
+                    self.log.info(f'GenerateCoverThumbnails task has been ended.')
+                    return
+
+            if total_generated == 0:
+                self.self_cleanup = True
+
         self._handleSuccess()
         self.app_db_session.remove()
 
@@ -180,7 +197,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                     self.log.info(u'Error generating thumbnail file: ' + str(ex))
                     raise ex
                 finally:
-                    stream.close()
+                    if stream is not None:
+                        stream.close()
             else:
                 book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
                 if not os.path.isfile(book_cover_filepath):
@@ -197,11 +215,15 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return "ThumbnailsGenerate"
+        return 'GenerateCoverThumbnails'
+
+    @property
+    def is_cancellable(self):
+        return True
 
 
 class TaskGenerateSeriesThumbnails(CalibreTask):
-    def __init__(self, task_message=u'Generating series thumbnails'):
+    def __init__(self, task_message=''):
         super(TaskGenerateSeriesThumbnails, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -209,17 +231,18 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
-            constants.COVER_THUMBNAIL_MEDIUM
+            constants.COVER_THUMBNAIL_MEDIUM,
         ]
 
     def run(self, worker_thread):
-        if self.calibre_db.session and use_IM:
+        if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
+            self.message = 'Scanning Series'
             all_series = self.get_series_with_four_plus_books()
             count = len(all_series)
 
-            updated = 0
-            generated = 0
+            total_generated = 0
             for i, series in enumerate(all_series):
+                generated = 0
                 series_thumbnails = self.get_series_thumbnails(series.id)
                 series_books = self.get_series_books(series.id)
 
@@ -233,16 +256,32 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                 # Replace outdated or missing thumbnails
                 for thumbnail in series_thumbnails:
                     if any(book.last_modified > thumbnail.generated_at for book in series_books):
-                        updated += 1
+                        generated += 1
                         self.update_series_thumbnail(series_books, thumbnail)
 
                     elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
-                        updated += 1
+                        generated += 1
                         self.update_series_thumbnail(series_books, thumbnail)
 
-                self.message = u'Processing series {0} of {1}'.format(i + 1, count)
+                # Increment the progress
                 self.progress = (1.0 / count) * i
 
+                if generated > 0:
+                    total_generated += generated
+                    self.message = u'Generated {0} series thumbnails'.format(total_generated)
+
+                # Check if job has been cancelled or ended
+                if self.stat == STAT_CANCELLED:
+                    self.log.info(f'GenerateSeriesThumbnails task has been cancelled.')
+                    return
+
+                if self.stat == STAT_ENDED:
+                    self.log.info(f'GenerateSeriesThumbnails task has been ended.')
+                    return
+
+            if total_generated == 0:
+                self.self_cleanup = True
+
         self._handleSuccess()
         self.app_db_session.remove()
 
@@ -302,7 +341,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.app_db_session.rollback()
 
     def generate_series_thumbnail(self, series_books, thumbnail):
-        books = series_books[:4]
+        # Get the last four books in the series based on series_index
+        books = sorted(series_books, key=lambda b: float(b.series_index), reverse=True)[:4]
 
         top = 0
         left = 0
@@ -342,7 +382,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                         self.log.info(u'Error generating thumbnail file: ' + str(ex))
                         raise ex
                     finally:
-                        stream.close()
+                        if stream is not None:
+                            stream.close()
 
                 book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
                 if not os.path.isfile(book_cover_filepath):
@@ -380,11 +421,15 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return "SeriesThumbnailGenerate"
+        return 'GenerateSeriesThumbnails'
+
+    @property
+    def is_cancellable(self):
+        return True
 
 
 class TaskClearCoverThumbnailCache(CalibreTask):
-    def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
+    def __init__(self, book_id, task_message=u'Clearing cover thumbnail cache'):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
@@ -397,8 +442,6 @@ class TaskClearCoverThumbnailCache(CalibreTask):
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
                 for thumbnail in thumbnails:
                     self.delete_thumbnail(thumbnail)
-            else:
-                self.delete_all_thumbnails()
 
         self._handleSuccess()
         self.app_db_session.remove()
@@ -411,19 +454,19 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             .all()
 
     def delete_thumbnail(self, thumbnail):
+        thumbnail.expiration = datetime.utcnow()
+
         try:
+            self.app_db_session.commit()
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
             self.log.info(u'Error deleting book thumbnail: ' + str(ex))
             self._handleError(u'Error deleting book thumbnail: ' + str(ex))
 
-    def delete_all_thumbnails(self):
-        try:
-            self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
-        except Exception as ex:
-            self.log.info(u'Error deleting book thumbnails: ' + str(ex))
-            self._handleError(u'Error deleting book thumbnails: ' + str(ex))
-
     @property
     def name(self):
-        return "ThumbnailsClear"
+        return 'ThumbnailsClear'
+
+    @property
+    def is_cancellable(self):
+        return False
diff --git a/cps/tasks/upload.py b/cps/tasks/upload.py
index d7ef34c21..9f58bf165 100644
--- a/cps/tasks/upload.py
+++ b/cps/tasks/upload.py
@@ -16,3 +16,7 @@ class TaskUpload(CalibreTask):
     @property
     def name(self):
         return "Upload"
+
+    @property
+    def is_cancellable(self):
+        return False
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index ec0fc84ea..3fd55ae21 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -159,7 +159,7 @@
   <div class="row">
     <div class="col">
       <h2>{{_('Scheduled Tasks')}}</h2>
-        <div class="col-xs-12 col-sm-12">
+        <div class="col-xs-12 col-sm-12 scheduled_tasks_details">
           <div class="row">
             <div class="col-xs-6 col-sm-3">{{_('Time at which tasks start to run')}}</div>
             <div class="col-xs-6 col-sm-3">{{config.schedule_start_time}}:00</div>
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index f4e722242..71bb2d1a2 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -11,7 +11,7 @@
       <label for="schedule_start_time">{{_('Time at which tasks start to run')}}</label>
       <select name="schedule_start_time" id="schedule_start_time" class="form-control">
         {% for n in range(24) %}
-          <option value="{{n}}" {% if content.schedule_start_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+          <option value="{{n}}" {% if config.schedule_start_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
         {% endfor %}
       </select>
     </div>
@@ -19,12 +19,12 @@
       <label for="schedule_end_time">{{_('Time at which tasks stop running')}}</label>
       <select name="schedule_end_time" id="schedule_end_time" class="form-control">
         {% for n in range(24) %}
-          <option value="{{n}}" {% if content.schedule_end_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+          <option value="{{n}}" {% if config.schedule_end_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
         {% endfor %}
       </select>
     </div>
     <div class="form-group">
-      <input type="checkbox" id="schedule_generate_book_covers" name="schedule_generate_book_covers" checked>
+      <input type="checkbox" id="schedule_generate_book_covers" name="schedule_generate_book_covers" {% if config.schedule_generate_book_covers %}checked{% endif %}>
       <label for="schedule_generate_book_covers">{{_('Generate Book Cover Thumbnails')}}</label>
     </div>
     <div class="form-group">
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index c13ddff9d..b36a6daaf 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -16,6 +16,9 @@
             <th data-halign="right" data-align="right" data-field="progress" data-sortable="true" data-sorter="elementSorter">{{_('Progress')}}</th>
             <th data-halign="right" data-align="right" data-field="runtime" data-sortable="true" data-sort-name="rt">{{_('Run Time')}}</th>
             <th data-halign="right" data-align="right" data-field="starttime" data-sortable="true" data-sort-name="id">{{_('Start Time')}}</th>
+            {% if g.user.role_admin() %}
+            <th data-halign="right" data-align="right" data-formatter="TaskActions" data-switchable="false">{{_('Actions')}}</th>
+            {% endif %}
             <th data-field="id" data-visible="false"></th>
             <th data-field="rt" data-visible="false"></th>
         </tr>
@@ -23,6 +26,30 @@
     </table>
 </div>
 {% endblock %}
+{% block modal %}
+{{ delete_book() }}
+{% if g.user.role_admin() %}
+<div class="modal fade" id="cancelTaskModal" role="dialog" aria-labelledby="metaCancelTaskLabel">
+  <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 task will be cancelled. Any progress made by this task will be saved.')}}</span>
+            <span>{{_('If this is a scheduled task, it will be re-ran during the next scheduled time.')}}</span>
+          </p>
+        </div>
+      <div class="modal-footer">
+        <input type="button" class="btn btn-danger" value="{{_('Ok')}}" name="cancel_task_confirm" id="cancel_task_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/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/table.js') }}"></script>
diff --git a/cps/web.py b/cps/web.py
index 88a5c0abf..c5ad22654 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -124,7 +124,7 @@ def viewer_required(f):
 @web.route("/ajax/emailstat")
 @login_required
 def get_email_status_json():
-    tasks = WorkerThread.getInstance().tasks
+    tasks = WorkerThread.get_instance().tasks
     return jsonify(render_task_status(tasks))
 
 
@@ -1055,7 +1055,7 @@ def category_list():
 @login_required
 def get_tasks_status():
     # if current user admin, show all email, otherwise only own emails
-    tasks = WorkerThread.getInstance().tasks
+    tasks = WorkerThread.get_instance().tasks
     answer = render_task_status(tasks)
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 

From 9e7f69e38a2958d63d1c0a1299687d82ff686417 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Wed, 29 Sep 2021 03:01:28 -0500
Subject: [PATCH 020/412] Updated series cache timeout to one day

---
 cps/templates/image.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/templates/image.html b/cps/templates/image.html
index ae57727b0..728384a10 100644
--- a/cps/templates/image.html
+++ b/cps/templates/image.html
@@ -16,7 +16,7 @@
     {% set srcset = series|get_series_srcset %}
     <img
         srcset="{{ srcset }}"
-        src="{{ url_for('web.get_series_cover', series_id=series.id, resolution='og', c='month'|cache_timestamp) }}"
+        src="{{ url_for('web.get_series_cover', series_id=series.id, resolution='og', c='day'|cache_timestamp) }}"
         title="{{ title }}"
         alt="{{ book_title }}"
     />

From cd3791f5f4b85581705117dcaff9f18bbe052336 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 30 Sep 2021 01:43:31 -0500
Subject: [PATCH 021/412] Always use full-sized image for book edit and details
 pages

---
 cps/__init__.py              | 3 +--
 cps/admin.py                 | 2 +-
 cps/templates/book_edit.html | 4 ++--
 cps/templates/detail.html    | 3 ++-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index 838da5b4e..af4a82e88 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -114,9 +114,8 @@ def create_app():
 
     if os.environ.get('FLASK_DEBUG'):
         cache_buster.init_cache_busting(app)
-        cache_buster.init_cache_busting(app)
-
     log.info('Starting Calibre Web...')
+
     Principal(app)
     lm.init_app(app)
     app.secret_key = os.getenv('SECRET_KEY', config_sql.get_flask_session_key(ub.session))
diff --git a/cps/admin.py b/cps/admin.py
index 62b3dbe0f..4d168aa08 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -40,7 +40,7 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
-from . import constants, logger, helper, services, isoLanguages
+from . import constants, logger, helper, services
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index b5f5df7a4..12d3bd077 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -1,10 +1,10 @@
-{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ image.book_cover(book) }}
+        <!-- Always use full-sized image for the book edit page -->
+        <img id="detailcover" title="{{book.title}}" src="{{url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified)}}" />
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 7985691a9..19cd079e3 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,8 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ image.book_cover(entry) }}
+        <!-- Always use full-sized image for the detail page -->
+        <img id="detailcover" title="{{book.title}}" src="{{url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified)}}" />
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">

From 917909cfdb931a608319a57cbfe70e72a9217116 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Oct 2021 09:48:29 +0200
Subject: [PATCH 022/412] Refactored books detail page

---
 cps/db.py                 | 52 +++++++++++++++++++++++---------
 cps/editbooks.py          |  6 ++--
 cps/templates/detail.html | 30 +++++++++----------
 cps/web.py                | 63 +++++++++++++--------------------------
 4 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index d8709335b..dc985167c 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -39,9 +39,8 @@ except ImportError:
 from sqlalchemy.pool import StaticPool
 from sqlalchemy.sql.expression import and_, true, false, text, func, or_
 from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import joinedload
 from flask_login import current_user
-from babel import Locale as LC
-from babel.core import UnknownLocaleError
 from flask_babel import gettext as _
 from flask import flash
 
@@ -338,15 +337,15 @@ class Books(Base):
     isbn = Column(String(collation='NOCASE'), default="")
     flags = Column(Integer, nullable=False, default=1)
 
-    authors = relationship('Authors', secondary=books_authors_link, backref='books')
-    tags = relationship('Tags', secondary=books_tags_link, backref='books', order_by="Tags.name")
-    comments = relationship('Comments', backref='books')
-    data = relationship('Data', backref='books')
-    series = relationship('Series', secondary=books_series_link, backref='books')
-    ratings = relationship('Ratings', secondary=books_ratings_link, backref='books')
-    languages = relationship('Languages', secondary=books_languages_link, backref='books')
-    publishers = relationship('Publishers', secondary=books_publishers_link, backref='books')
-    identifiers = relationship('Identifiers', backref='books')
+    authors = relationship(Authors, secondary=books_authors_link, backref='books')
+    tags = relationship(Tags, secondary=books_tags_link, backref='books', order_by="Tags.name")
+    comments = relationship(Comments, backref='books')
+    data = relationship(Data, backref='books')
+    series = relationship(Series, secondary=books_series_link, backref='books')
+    ratings = relationship(Ratings, secondary=books_ratings_link, backref='books')
+    languages = relationship(Languages, secondary=books_languages_link, backref='books')
+    publishers = relationship(Publishers, secondary=books_publishers_link, backref='books')
+    identifiers = relationship(Identifiers, backref='books')
 
     def __init__(self, title, sort, author_sort, timestamp, pubdate, series_index, last_modified, path, has_cover,
                  authors, tags, languages=None):
@@ -602,6 +601,33 @@ class CalibreDB():
         return self.session.query(Books).filter(Books.id == book_id). \
             filter(self.common_filters(allow_show_archived)).first()
 
+    def get_book_read_archived(self, book_id, read_column, allow_show_archived=False):
+        # Add missing relationships for inter database joins
+        #setattr(Books, "is_archived",
+        #        relationship(ub.ArchivedBook,
+        #                     uselist=False,
+        #                     foreign_keys=ub.ArchivedBook.book_id,
+        #                     primaryjoin=and_(Books.id == ub.ArchivedBook.book_id,
+        #                                      int(current_user.id) == ub.ArchivedBook.user_id)))
+        if not read_column:
+            bd = (self.session.query(Books, ub.ReadBook.read_status, ub.ArchivedBook.is_archived).select_from(Books)
+                  .join(ub.ReadBook, and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == book_id),
+                  isouter=True))
+        else:
+            try:
+                read_column = cc_classes[read_column]
+                bd = (self.session.query(Books, read_column.value, ub.ArchivedBook.is_archived).select_from(Books)
+                      .join(read_column, read_column.book == book_id,
+                      isouter=True))
+            except (KeyError, AttributeError):
+                log.error("Custom Column No.%d is not existing in calibre database", read_column)
+                # Skip linking read column and return None instead of read status
+                bd = self.session.query(Books, None, ub.ArchivedBook.is_archived)
+        return (bd.filter(Books.id == book_id)
+                .join(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
+                                            int(current_user.id) == ub.ArchivedBook.user_id), isouter=True)
+                .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()
 
@@ -709,8 +735,6 @@ class CalibreDB():
             entries = query.order_by(*order).offset(off).limit(pagesize).all()
         except Exception as ex:
             log.debug_or_exception(ex)
-        #for book in entries:
-        #    book = self.order_authors(book)
         return entries, randm, pagination
 
     # Orders all Authors in the list according to authors sort
@@ -730,7 +754,7 @@ class CalibreDB():
                     authors_ordered.append(r)
         if not error:
             entry.authors = authors_ordered
-        return entry
+        return authors_ordered
 
     def get_typeahead(self, database, query, replace=('', ''), tag_filter=true()):
         query = query or ''
diff --git a/cps/editbooks.py b/cps/editbooks.py
index d3e1f01e6..14e0e1a1b 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -376,7 +376,7 @@ def render_edit_book(book_id):
     for lang in book.languages:
         lang.language_name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
 
-    book = calibre_db.order_authors(book)
+    book.authors = calibre_db.order_authors(book)
 
     author_names = []
     for authr in book.authors:
@@ -1249,9 +1249,9 @@ def table_xchange_author_title():
             modif_date = False
             book = calibre_db.get_book(val)
             authors = book.title
-            entries = calibre_db.order_authors(book)
+            book.authors = calibre_db.order_authors(book)
             author_names = []
-            for authr in entries.authors:
+            for authr in book.authors:
                 author_names.append(authr.name.replace('|', ','))
 
             title_change = handle_title_on_edit(book, " ".join(author_names))
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 6dd1c72a3..bd8f71c19 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -36,9 +36,9 @@
             </div>
             {% endif %}
           {% endif %}
-            {% if g.user.kindle_mail and kindle_list %}
-              {% if kindle_list.__len__() == 1 %}
-                <a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" id="sendbtn" data-text="{{_('Send to Kindle')}}" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</a>
+            {% if g.user.kindle_mail and entry.kindle_list %}
+              {% if entry.kindle_list.__len__() == 1 %}
+                <a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=entry.kindle_list[0]['format'], convert=entry.kindle_list[0]['convert'])}}" id="sendbtn" data-text="{{_('Send to Kindle')}}" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.kindle_list[0]['text']}}</a>
               {% else %}
                 <div class="btn-group" role="group">
                   <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -46,52 +46,52 @@
                     <span class="caret"></span>
                   </button>
                     <ul class="dropdown-menu" aria-labelledby="send-to-kindle">
-                    {% for format in kindle_list %}
+                    {% for format in entry.kindle_list %}
                       <li><a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{format['text']}}</a></li>
                     {%endfor%}
                     </ul>
                 </div>
               {% endif %}
             {% endif %}
-          {% if reader_list and g.user.role_viewer() %}
+          {% if entry.reader_list and g.user.role_viewer() %}
               <div class="btn-group" role="group">
-              {% if reader_list|length > 1 %}
+              {% if entry.reader_list|length > 1 %}
                 <button id="read-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <span class="glyphicon glyphicon-book"></span> {{_('Read in Browser')}}
                   <span class="caret"></span>
                 </button>
                     <ul class="dropdown-menu" aria-labelledby="read-in-browser">
-                    {% for format in reader_list %}
+                    {% for format in entry.reader_list %}
                       <li><a target="_blank" href="{{ url_for('web.read_book', book_id=entry.id, book_format=format) }}">{{format}}</a></li>
                     {%endfor%}
                     </ul>
                 {% else %}
-                  <a target="_blank" href="{{url_for('web.read_book', book_id=entry.id, book_format=reader_list[0])}}" id="readbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-book"></span> {{_('Read in Browser')}} - {{reader_list[0]}}</a>
+                  <a target="_blank" href="{{url_for('web.read_book', book_id=entry.id, book_format=entry.reader_list[0])}}" id="readbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-book"></span> {{_('Read in Browser')}} - {{entry.reader_list[0]}}</a>
                 {% endif %}
               </div>
             {% endif %}
-            {% if audioentries|length > 0 and g.user.role_viewer() %}
+            {% if entry.audioentries|length > 0 and g.user.role_viewer() %}
               <div class="btn-group" role="group">
-              {% if audioentries|length > 1 %}
+              {% if entry.audioentries|length > 1 %}
                 <button id="listen-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}}
                   <span class="caret"></span>
                 </button>
                     <ul class="dropdown-menu" aria-labelledby="listen-in-browser">
-                    {% for format in reader_list %}
+                    {% for format in entry.reader_list %}
                       <li><a target="_blank" href="{{ url_for('web.read_book', book_id=entry.id, book_format=format) }}">{{format}}</a></li>
                     {%endfor%}
                     </ul>
                   <ul class="dropdown-menu" aria-labelledby="listen-in-browser">
 
               {% for format in entry.data %}
-                  {% if format.format|lower in audioentries %}
+                  {% if format.format|lower in entry.audioentries %}
                     <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>
                 {% else %}
-                  <a target="_blank" href="{{url_for('web.read_book', book_id=entry.id, book_format=audioentries[0])}}" id="listenbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}} - {{audioentries[0]}}</a>
+                  <a target="_blank" href="{{url_for('web.read_book', book_id=entry.id, book_format=entry.audioentries[0])}}" id="listenbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}} - {{entry.audioentries[0]}}</a>
                 {% endif %}
               </div>
             {% endif %}
@@ -216,7 +216,7 @@
           <form id="have_read_form" action="{{ url_for('web.toggle_read', book_id=entry.id)}}" method="POST">
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
             <label class="block-label">
-              <input id="have_read_cb" data-checked="{{_('Mark As Unread')}}" data-unchecked="{{_('Mark As Read')}}" type="checkbox" {% if have_read %}checked{% endif %} >
+              <input id="have_read_cb" data-checked="{{_('Mark As Unread')}}" data-unchecked="{{_('Mark As Read')}}" type="checkbox" {% if entry.read_status %}checked{% endif %} >
               <span>{{_('Read')}}</span>
             </label>
           </form>
@@ -226,7 +226,7 @@
             <form id="archived_form" action="{{ url_for('web.toggle_archived', book_id=entry.id)}}" method="POST">
               <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
               <label class="block-label">
-                <input id="archived_cb" data-checked="{{_('Restore from archive')}}" data-unchecked="{{_('Add to archive')}}" type="checkbox" {% if is_archived %}checked{% endif %} >
+                <input id="archived_cb" data-checked="{{_('Restore from archive')}}" data-unchecked="{{_('Add to archive')}}" type="checkbox" {% if entry.is_archived.is_archived %}checked{% endif %} >
                 <span>{{_('Archived')}}</span>
               </label>
             </form>
diff --git a/cps/web.py b/cps/web.py
index 066169eb8..ce887c98d 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -187,7 +187,7 @@ def toggle_read(book_id):
             return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column), 400
         except (OperationalError, InvalidRequestError) as e:
             calibre_db.session.rollback()
-            log.error(u"Read status could not set: %e", e)
+            log.error(u"Read status could not set: {}".format(e))
             return "Read status could not set: {}".format(e), 400
     return ""
 
@@ -1756,63 +1756,40 @@ def read_book(book_id, book_format):
 @web.route("/book/<int:book_id>")
 @login_required_if_no_ano
 def show_book(book_id):
-    entries = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
+    entries = calibre_db.get_book_read_archived(book_id, config.config_read_column, allow_show_archived=True)
     if entries:
-        for index in range(0, len(entries.languages)):
-            entries.languages[index].language_name = isoLanguages.get_language_name(get_locale(), entries.languages[
+        read_book = entries[1]
+        archived_book = entries[2]
+        entry = entries[0]
+        entry.read_status = read_book == ub.ReadBook.STATUS_FINISHED
+        entry.is_archived = archived_book
+        for index in range(0, len(entry.languages)):
+            entry.languages[index].language_name = isoLanguages.get_language_name(get_locale(), entry.languages[
                 index].lang_code)
         cc = get_cc_columns(filter_config_custom_read=True)
         book_in_shelfs = []
         shelfs = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all()
-        for entry in shelfs:
-            book_in_shelfs.append(entry.shelf)
+        for sh in shelfs:
+            book_in_shelfs.append(sh.shelf)
 
-        if not current_user.is_anonymous:
-            if not config.config_read_column:
-                matching_have_read_book = ub.session.query(ub.ReadBook). \
-                    filter(and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == book_id)).all()
-                have_read = len(
-                    matching_have_read_book) > 0 and matching_have_read_book[0].read_status == ub.ReadBook.STATUS_FINISHED
-            else:
-                try:
-                    matching_have_read_book = getattr(entries, 'custom_column_' + str(config.config_read_column))
-                    have_read = len(matching_have_read_book) > 0 and matching_have_read_book[0].value
-                except (KeyError, AttributeError):
-                    log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
-                    have_read = None
+        entry.tags = sort(entry.tags, key=lambda tag: tag.name)
 
-            archived_book = ub.session.query(ub.ArchivedBook).\
-                filter(and_(ub.ArchivedBook.user_id == int(current_user.id),
-                            ub.ArchivedBook.book_id == book_id)).first()
-            is_archived = archived_book and archived_book.is_archived
+        entry.authors = calibre_db.order_authors(entry)
 
-        else:
-            have_read = None
-            is_archived = None
+        entry.kindle_list = check_send_to_kindle(entry)
+        entry.reader_list = check_read_formats(entry)
 
-        entries.tags = sort(entries.tags, key=lambda tag: tag.name)
-
-        entries = calibre_db.order_authors(entries)
-
-        kindle_list = check_send_to_kindle(entries)
-        reader_list = check_read_formats(entries)
-
-        audioentries = []
-        for media_format in entries.data:
+        entry.audioentries = []
+        for media_format in entry.data:
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
-                audioentries.append(media_format.format.lower())
+                entry.audioentries.append(media_format.format.lower())
 
         return render_title_template('detail.html',
-                                     entry=entries,
-                                     audioentries=audioentries,
+                                     entry=entry,
                                      cc=cc,
                                      is_xhr=request.headers.get('X-Requested-With')=='XMLHttpRequest',
-                                     title=entries.title,
+                                     title=entry.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"Oops! Selected book title is unavailable. File does not exist or is not accessible")

From 4c7b5999f713dc39c1a4d9a38282c608305b1055 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Oct 2021 10:57:29 +0200
Subject: [PATCH 023/412] Archived Flag available in book list array

---
 cps/db.py  | 66 ++++++++++++++++++++++++++++++------------------------
 cps/ub.py  |  6 +++++
 cps/web.py | 43 ++++++++++++++++++++++-------------
 3 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index f5696d07d..64abbe1b3 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -685,9 +685,12 @@ class CalibreDB():
                     pos_content_cc_filter, ~neg_content_cc_filter, archived_filter)
 
     @staticmethod
-    def get_checkbox_sorted(inputlist, state, offset, limit, order):
+    def get_checkbox_sorted(inputlist, state, offset, limit, order, combo=False):
         outcome = list()
-        elementlist = {ele.id: ele for ele in inputlist}
+        if combo:
+            elementlist = {ele[0].id: ele for ele in inputlist}
+        else:
+            elementlist = {ele.id: ele for ele in inputlist}
         for entry in state:
             try:
                 outcome.append(elementlist[entry])
@@ -702,10 +705,10 @@ class CalibreDB():
 
     # Fill indexpage with all requested data from database
     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)
+        return self.fill_indexpage_with_archived_books(page, pagesize, db_filter, order, False, database, join)
 
-    def fill_indexpage_with_archived_books(self, page, pagesize, database, db_filter, order, allow_show_archived,
-                                           *join):
+    def fill_indexpage_with_archived_books(self, page, pagesize, db_filter, order, allow_show_archived,
+                                           *args):
         pagesize = pagesize or self.config.config_books_per_page
         if current_user.show_detail_random():
             randm = self.session.query(Books) \
@@ -714,20 +717,32 @@ class CalibreDB():
                 .limit(self.config.config_random_books).all()
         else:
             randm = false()
+        if len(args) > 1:
+            if isinstance(args[0], DeclarativeMeta):
+                query = self.session.query(args[0])
+            else:
+                query = self.session.query(*args[0])
+            join = args[1]
+        else:
+            join = tuple()
+            query = self.session.query(args)
         off = int(int(pagesize) * (page - 1))
-        query = self.session.query(database)
-        if len(join) == 6:
-            query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5])
-        if len(join) == 5:
-            query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4])
-        if len(join) == 4:
-            query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3])
-        if len(join) == 3:
-            query = query.outerjoin(join[0], join[1]).outerjoin(join[2])
-        elif len(join) == 2:
-            query = query.outerjoin(join[0], join[1])
-        elif len(join) == 1:
-            query = query.outerjoin(join[0])
+
+        indx = len(join)
+        element = 0
+        while indx:
+            if indx >= 3:
+                query = query.outerjoin(join[element], join[element+1]).outerjoin(join[element+2])
+                indx -= 3
+                element += 3
+            elif indx == 2:
+                query = query.outerjoin(join[element], join[element+1])
+                indx -= 2
+                element += 2
+            elif indx == 1:
+                query = query.outerjoin(join[element])
+                indx -= 1
+                element += 1
         query = query.filter(db_filter)\
             .filter(self.common_filters(allow_show_archived))
         entries = list()
@@ -785,7 +800,9 @@ class CalibreDB():
         authorterms = re.split("[, ]+", term)
         for authorterm in authorterms:
             q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + authorterm + "%")))
-        query = self.session.query(Books)
+        query = (self.session.query(Books, ub.ArchivedBook.is_archived)
+                 .outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
+                                             int(current_user.id) == ub.ArchivedBook.user_id)))
         if len(join) == 6:
             query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5])
         if len(join) == 3:
@@ -816,7 +833,7 @@ class CalibreDB():
             offset = 0
             limit_all = result_count
 
-        ub.store_ids(result)
+        ub.store_combo_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
@@ -831,15 +848,6 @@ class CalibreDB():
                 .group_by(text('books_languages_link.lang_code')).all()
         for lang in languages:
             lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
-            #try:
-            #    if lang.lang_code.lower() == "und":
-            #        lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
-            #        # lang.name = _("Undetermined")
-            #    else:
-            #        cur_l = LC.parse(lang.lang_code)
-            #        lang.name = cur_l.get_language_name(get_locale())
-            #except UnknownLocaleError:
-            #    lang.name = _(isoLanguages.get(part3=lang.lang_code).name)
         return languages
 
     def update_title_sort(self, config, conn=None):
diff --git a/cps/ub.py b/cps/ub.py
index 69ea55f6c..e9ad264fa 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -126,6 +126,12 @@ def store_ids(result):
         ids.append(element.id)
     searched_ids[current_user.id] = ids
 
+def store_combo_ids(result):
+    ids = list()
+    for element in result:
+        ids.append(element[0].id)
+    searched_ids[current_user.id] = ids
+
 
 class UserBase:
 
diff --git a/cps/web.py b/cps/web.py
index c6a5bfa1d..0fcb43f45 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -677,10 +677,10 @@ def render_archived_books(page, order):
     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)
+                                                                                True,
+                                                                                db.Books)
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
@@ -770,20 +770,19 @@ def list_books():
     sort = request.args.get("sort", "id")
     order = request.args.get("order", "").lower()
     state = None
-    join = tuple()
+    join = list()
 
     if sort == "state":
         state = json.loads(request.args.get("state", "[]"))
-        # order = [db.Books.timestamp.asc()] if order == "asc" else [db.Books.timestamp.desc()]   # ToDo wrong: sort ticked
     elif sort == "tags":
         order = [db.Tags.name.asc()] if order == "asc" else [db.Tags.name.desc()]
-        join = db.books_tags_link,db.Books.id == db.books_tags_link.c.book, db.Tags
+        join = db.books_tags_link, db.Books.id == db.books_tags_link.c.book, db.Tags
     elif sort == "series":
         order = [db.Series.name.asc()] if order == "asc" else [db.Series.name.desc()]
-        join = db.books_series_link,db.Books.id == db.books_series_link.c.book, db.Series
+        join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
     elif sort == "publishers":
         order = [db.Publishers.name.asc()] if order == "asc" else [db.Publishers.name.desc()]
-        join = db.books_publishers_link,db.Books.id == db.books_publishers_link.c.book, db.Publishers
+        join = db.books_publishers_link, db.Books.id == db.books_publishers_link.c.book, db.Publishers
     elif sort == "authors":
         order = [db.Authors.name.asc(), db.Series.name, db.Books.series_index] if order == "asc" \
             else [db.Authors.name.desc(), db.Series.name.desc(), db.Books.series_index.desc()]
@@ -798,24 +797,38 @@ def list_books():
         order = [db.Books.timestamp.desc()]
 
     total_count = filtered_count = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(False)).count()
-
     if state is not None:
         if search:
             books = calibre_db.search_query(search).all()
             filtered_count = len(books)
         else:
-            books = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).all()
-        entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order)
+            books = (calibre_db.session.query(db.Books,ub.ArchivedBook.is_archived)
+                     .outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                      int(current_user.id) == ub.ArchivedBook.user_id))
+                     .filter(calibre_db.common_filters()).all())
+        entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True)
     elif search:
-        entries, filtered_count, __ = calibre_db.get_search_results(search, off, order, limit, *join)
+        entries, filtered_count, __ = calibre_db.get_search_results(search, off, order, limit, *tuple(join))
     else:
-        entries, __, __ = calibre_db.fill_indexpage((int(off) / (int(limit)) + 1), limit, db.Books, True, order, *join)
+        join.append(ub.ArchivedBook)
+        join.append(and_(db.Books.id == ub.ArchivedBook.book_id,int(current_user.id) == ub.ArchivedBook.user_id))
+        entries, __, __ = calibre_db.fill_indexpage((int(off) / (int(limit)) + 1),
+                                                    limit,
+                                                    (db.Books, ub.ArchivedBook),
+                                                    True,
+                                                    order,
+                                                    *tuple(join))
 
+    result = list()
     for entry in entries:
-        for index in range(0, len(entry.languages)):
-            entry.languages[index].language_name = isoLanguages.get_language_name(get_locale(), entry.languages[
+        val = entry[0]
+        val.is_archived = entry[1] == True
+        for index in range(0, len(val.languages)):
+            val.languages[index].language_name = isoLanguages.get_language_name(get_locale(), val.languages[
                 index].lang_code)
-    table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": entries}
+        result.append(val)
+
+    table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": result}
     js_list = json.dumps(table_entries, cls=db.AlchemyEncoder)
 
     response = make_response(js_list)

From 516e76de4fc1e56792d8f75a3922b58fc1f0123f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Oct 2021 17:13:57 +0200
Subject: [PATCH 024/412] Updated tinymce editor, enabled raw html edit

---
 cps/static/js/edit_books.js                   |   2 +
 .../libs/tinymce/icons/default/icons.min.js   |   2 +-
 cps/static/js/libs/tinymce/langs/bg_BG.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/bn_BD.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/cs.js        | 193 +++++---
 cps/static/js/libs/tinymce/langs/cy.js        |  79 ++-
 cps/static/js/libs/tinymce/langs/da.js        |  77 ++-
 cps/static/js/libs/tinymce/langs/de.js        |  77 ++-
 cps/static/js/libs/tinymce/langs/es_ES.js     | 370 --------------
 cps/static/js/libs/tinymce/langs/es_MX.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/fa.js        |  77 ++-
 cps/static/js/libs/tinymce/langs/fa_IR.js     | 390 ---------------
 cps/static/js/libs/tinymce/langs/fr_FR.js     |  77 ++-
 cps/static/js/libs/tinymce/langs/he_IL.js     | 420 ----------------
 cps/static/js/libs/tinymce/langs/hu_HU.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/it_IT.js     | 370 --------------
 cps/static/js/libs/tinymce/langs/ko_KR.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/nb_NO.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/pl.js        |  77 ++-
 cps/static/js/libs/tinymce/langs/pt_BR.js     |  77 ++-
 cps/static/js/libs/tinymce/langs/pt_PT.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/ro.js        |  77 ++-
 cps/static/js/libs/tinymce/langs/ro_RO.js     | 370 --------------
 cps/static/js/libs/tinymce/langs/sl.js        |  73 ++-
 cps/static/js/libs/tinymce/langs/sl_SI.js     | 388 ---------------
 cps/static/js/libs/tinymce/langs/sq.js        | 219 +++++++++
 cps/static/js/libs/tinymce/langs/sv_SE.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/ta.js        |  77 ++-
 cps/static/js/libs/tinymce/langs/ta_IN.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/th_TH.js     | 419 ----------------
 cps/static/js/libs/tinymce/langs/tr_TR.js     | 389 ---------------
 cps/static/js/libs/tinymce/langs/ug.js        | 462 ++++++++++++++++++
 cps/static/js/libs/tinymce/langs/zh_CN.js     | 419 ----------------
 .../js/libs/tinymce/langs/zh_Hans_CN.js       |  89 +++-
 .../libs/tinymce/plugins/code/plugin.min.js   |   9 +
 .../skins/content/dark/content.min.css        |   7 -
 .../skins/content/document/content.min.css    |   7 -
 .../skins/content/writer/content.min.css      |   7 -
 .../skins/lightgray/content.inline.min.css    |   1 -
 .../tinymce/skins/lightgray/content.min.css   |   1 -
 .../skins/lightgray/fonts/tinymce-small.eot   | Bin 9492 -> 0 bytes
 .../skins/lightgray/fonts/tinymce-small.svg   |  63 ---
 .../skins/lightgray/fonts/tinymce-small.ttf   | Bin 9304 -> 0 bytes
 .../skins/lightgray/fonts/tinymce-small.woff  | Bin 9380 -> 0 bytes
 .../tinymce/skins/lightgray/fonts/tinymce.eot | Bin 17572 -> 0 bytes
 .../tinymce/skins/lightgray/fonts/tinymce.svg | 131 -----
 .../tinymce/skins/lightgray/fonts/tinymce.ttf | Bin 17408 -> 0 bytes
 .../skins/lightgray/fonts/tinymce.woff        | Bin 17484 -> 0 bytes
 .../tinymce/skins/lightgray/img/anchor.gif    | Bin 53 -> 0 bytes
 .../tinymce/skins/lightgray/img/loader.gif    | Bin 2608 -> 0 bytes
 .../tinymce/skins/lightgray/img/object.gif    | Bin 152 -> 0 bytes
 .../tinymce/skins/lightgray/img/trans.gif     | Bin 43 -> 0 bytes
 .../libs/tinymce/skins/lightgray/skin.min.css |   1 -
 .../ui/oxide-dark/content.inline.min.css      |   7 -
 .../skins/ui/oxide-dark/content.min.css       |   7 -
 .../ui/oxide-dark/content.mobile.min.css      |   7 -
 .../ui/oxide-dark/fonts/tinymce-mobile.woff   | Bin 4624 -> 0 bytes
 .../tinymce/skins/ui/oxide-dark/skin.min.css  |   7 -
 .../skins/ui/oxide-dark/skin.mobile.min.css   |   7 -
 .../ui/oxide-dark/skin.shadowdom.min.css      |   7 -
 .../skins/ui/oxide/content.inline.min.css     |   2 +-
 .../tinymce/skins/ui/oxide/content.min.css    |   2 +-
 .../libs/tinymce/skins/ui/oxide/skin.min.css  |   2 +-
 .../skins/ui/oxide/skin.shadowdom.min.css     |   2 +-
 .../libs/tinymce/themes/inlite/theme.min.js   |   1 -
 .../libs/tinymce/themes/mobile/theme.min.js   |   9 -
 .../libs/tinymce/themes/modern/theme.min.js   |   1 -
 .../libs/tinymce/themes/silver/theme.min.js   |   4 +-
 cps/static/js/libs/tinymce/tinymce.min.js     |   4 +-
 69 files changed, 1500 insertions(+), 7837 deletions(-)
 delete mode 100644 cps/static/js/libs/tinymce/langs/bg_BG.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/bn_BD.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/es_ES.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/es_MX.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/fa_IR.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/he_IL.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/hu_HU.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/it_IT.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/ko_KR.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/nb_NO.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/pt_PT.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/ro_RO.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/sl_SI.js
 create mode 100644 cps/static/js/libs/tinymce/langs/sq.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/sv_SE.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/ta_IN.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/th_TH.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/tr_TR.js
 create mode 100644 cps/static/js/libs/tinymce/langs/ug.js
 delete mode 100644 cps/static/js/libs/tinymce/langs/zh_CN.js
 create mode 100644 cps/static/js/libs/tinymce/plugins/code/plugin.min.js
 delete mode 100644 cps/static/js/libs/tinymce/skins/content/dark/content.min.css
 delete mode 100644 cps/static/js/libs/tinymce/skins/content/document/content.min.css
 delete mode 100644 cps/static/js/libs/tinymce/skins/content/writer/content.min.css
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/content.min.css
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.eot
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.ttf
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.woff
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.eot
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.ttf
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.woff
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/img/anchor.gif
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/img/loader.gif
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/img/object.gif
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/img/trans.gif
 delete mode 100755 cps/static/js/libs/tinymce/skins/lightgray/skin.min.css
 delete mode 100644 cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.inline.min.css
 delete mode 100644 cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.min.css
 delete mode 100644 cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.mobile.min.css
 delete mode 100644 cps/static/js/libs/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff
 delete mode 100644 cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.min.css
 delete mode 100644 cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.mobile.min.css
 delete mode 100644 cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css
 delete mode 100755 cps/static/js/libs/tinymce/themes/inlite/theme.min.js
 delete mode 100644 cps/static/js/libs/tinymce/themes/mobile/theme.min.js
 delete mode 100755 cps/static/js/libs/tinymce/themes/modern/theme.min.js

diff --git a/cps/static/js/edit_books.js b/cps/static/js/edit_books.js
index ef1eb42b7..ddc7a3e7e 100644
--- a/cps/static/js/edit_books.js
+++ b/cps/static/js/edit_books.js
@@ -6,6 +6,7 @@
 if ($("#description").length) {
     tinymce.init({
         selector: "#description",
+        plugins: 'code',
         branding: false,
         menubar: "edit view format",
         language: language
@@ -15,6 +16,7 @@ if ($("#description").length) {
 if ($(".tiny_editor").length) {
     tinymce.init({
         selector: ".tiny_editor",
+        plugins: 'code',
         branding: false,
         menubar: "edit view format",
         language: language
diff --git a/cps/static/js/libs/tinymce/icons/default/icons.min.js b/cps/static/js/libs/tinymce/icons/default/icons.min.js
index 086f297d3..2cf9ef86d 100644
--- a/cps/static/js/libs/tinymce/icons/default/icons.min.js
+++ b/cps/static/js/libs/tinymce/icons/default/icons.min.js
@@ -1 +1 @@
-tinymce.IconManager.add("default",{icons:{"accessibility-check":'<svg width="24" height="24"><path d="M12 2a2 2 0 012 2 2 2 0 01-2 2 2 2 0 01-2-2c0-1.1.9-2 2-2zm8 7h-5v12c0 .6-.4 1-1 1a1 1 0 01-1-1v-5c0-.6-.4-1-1-1a1 1 0 00-1 1v5c0 .6-.4 1-1 1a1 1 0 01-1-1V9H4a1 1 0 110-2h16c.6 0 1 .4 1 1s-.4 1-1 1z" fill-rule="nonzero"/></svg>',"action-next":'<svg width="24" height="24"><path fill-rule="nonzero" d="M5.7 7.3a1 1 0 00-1.4 1.4l7.7 7.7 7.7-7.7a1 1 0 10-1.4-1.4L12 13.6 5.7 7.3z"/></svg>',"action-prev":'<svg width="24" height="24"><path fill-rule="nonzero" d="M18.3 15.7a1 1 0 001.4-1.4L12 6.6l-7.7 7.7a1 1 0 001.4 1.4L12 9.4l6.3 6.3z"/></svg>',"align-center":'<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm3 4h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 110-2zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 010-2zm-3-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2z" fill-rule="evenodd"/></svg>',"align-justify":'<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm0 4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm0 4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2zm0 4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2z" fill-rule="evenodd"/></svg>',"align-left":'<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm0 4h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2zm0-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2z" fill-rule="evenodd"/></svg>',"align-none":'<svg width="24" height="24"><path d="M14.2 5L13 7H5a1 1 0 110-2h9.2zm4 0h.8a1 1 0 010 2h-2l1.2-2zm-6.4 4l-1.2 2H5a1 1 0 010-2h6.8zm4 0H19a1 1 0 010 2h-4.4l1.2-2zm-6.4 4l-1.2 2H5a1 1 0 010-2h4.4zm4 0H19a1 1 0 010 2h-6.8l1.2-2zM7 17l-1.2 2H5a1 1 0 010-2h2zm4 0h8a1 1 0 010 2H9.8l1.2-2zm5.2-13.5l1.3.7-9.7 16.3-1.3-.7 9.7-16.3z" fill-rule="evenodd"/></svg>',"align-right":'<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm6 4h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm-6-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2z" fill-rule="evenodd"/></svg>',"arrow-left":'<svg width="24" height="24"><path d="M5.6 13l12 6a1 1 0 001.4-1V6a1 1 0 00-1.4-.9l-12 6a1 1 0 000 1.8z" fill-rule="evenodd"/></svg>',"arrow-right":'<svg width="24" height="24"><path d="M18.5 13l-12 6A1 1 0 015 18V6a1 1 0 011.4-.9l12 6a1 1 0 010 1.8z" fill-rule="evenodd"/></svg>',bold:'<svg width="24" height="24"><path d="M7.8 19c-.3 0-.5 0-.6-.2l-.2-.5V5.7c0-.2 0-.4.2-.5l.6-.2h5c1.5 0 2.7.3 3.5 1 .7.6 1.1 1.4 1.1 2.5a3 3 0 01-.6 1.9c-.4.6-1 1-1.6 1.2.4.1.9.3 1.3.6s.8.7 1 1.2c.4.4.5 1 .5 1.6 0 1.3-.4 2.3-1.3 3-.8.7-2.1 1-3.8 1H7.8zm5-8.3c.6 0 1.2-.1 1.6-.5.4-.3.6-.7.6-1.3 0-1.1-.8-1.7-2.3-1.7H9.3v3.5h3.4zm.5 6c.7 0 1.3-.1 1.7-.4.4-.4.6-.9.6-1.5s-.2-1-.7-1.4c-.4-.3-1-.4-2-.4H9.4v3.8h4z" fill-rule="evenodd"/></svg>',bookmark:'<svg width="24" height="24"><path d="M6 4v17l6-4 6 4V4c0-.6-.4-1-1-1H7a1 1 0 00-1 1z" fill-rule="nonzero"/></svg>',"border-width":'<svg width="24" height="24"><path d="M5 14.8h14a1 1 0 010 2H5a1 1 0 010-2zm-.5 3.7h15c.3 0 .5.2.5.5s-.2.5-.5.5h-15a.5.5 0 110-1zm.5-8.3h14c.6 0 1 .4 1 1v1c0 .5-.4 1-1 1H5a1 1 0 01-1-1v-1c0-.6.4-1 1-1zm0-5.7h14c.6 0 1 .4 1 1v2c0 .6-.4 1-1 1H5a1 1 0 01-1-1v-2c0-.6.4-1 1-1z" fill-rule="evenodd"/></svg>',brightness:'<svg width="24" height="24"><path d="M12 17c.3 0 .5.1.7.3.2.2.3.4.3.7v1c0 .3-.1.5-.3.7a1 1 0 01-.7.3 1 1 0 01-.7-.3 1 1 0 01-.3-.7v-1c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3zm0-10a1 1 0 01-.7-.3A1 1 0 0111 6V5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3.3 0 .5.1.7.3.2.2.3.4.3.7v1c0 .3-.1.5-.3.7a1 1 0 01-.7.3zm7 4c.3 0 .5.1.7.3.2.2.3.4.3.7 0 .3-.1.5-.3.7a1 1 0 01-.7.3h-1a1 1 0 01-.7-.3 1 1 0 01-.3-.7c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h1zM7 12c0 .3-.1.5-.3.7a1 1 0 01-.7.3H5a1 1 0 01-.7-.3A1 1 0 014 12c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h1c.3 0 .5.1.7.3.2.2.3.4.3.7zm10 3.5l.7.8c.2.1.3.4.3.6 0 .3-.1.6-.3.8a1 1 0 01-.8.3 1 1 0 01-.6-.3l-.8-.7a1 1 0 01-.3-.8c0-.2.1-.5.3-.7a1 1 0 011.4 0zm-10-7l-.7-.8a1 1 0 01-.3-.6c0-.3.1-.6.3-.8.2-.2.5-.3.8-.3.2 0 .5.1.7.3l.7.7c.2.2.3.5.3.8 0 .2-.1.5-.3.7a1 1 0 01-.7.3 1 1 0 01-.8-.3zm10 0a1 1 0 01-.8.3 1 1 0 01-.7-.3 1 1 0 01-.3-.7c0-.3.1-.6.3-.8l.8-.7c.1-.2.4-.3.6-.3.3 0 .6.1.8.3.2.2.3.5.3.8 0 .2-.1.5-.3.7l-.7.7zm-10 7c.2-.2.5-.3.8-.3.2 0 .5.1.7.3a1 1 0 010 1.4l-.8.8a1 1 0 01-.6.3 1 1 0 01-.8-.3 1 1 0 01-.3-.8c0-.2.1-.5.3-.6l.7-.8zM12 8a4 4 0 013.7 2.4 4 4 0 010 3.2A4 4 0 0112 16a4 4 0 01-3.7-2.4 4 4 0 010-3.2A4 4 0 0112 8zm0 6.5c.7 0 1.3-.2 1.8-.7.5-.5.7-1.1.7-1.8s-.2-1.3-.7-1.8c-.5-.5-1.1-.7-1.8-.7s-1.3.2-1.8.7c-.5.5-.7 1.1-.7 1.8s.2 1.3.7 1.8c.5.5 1.1.7 1.8.7z" fill-rule="evenodd"/></svg>',browse:'<svg width="24" height="24"><path d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2h-4v-2h4V8H5v10h4v2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm-8 9.4l-2.3 2.3a1 1 0 11-1.4-1.4l4-4a1 1 0 011.4 0l4 4a1 1 0 01-1.4 1.4L13 13.4V20a1 1 0 01-2 0v-6.6z" fill-rule="nonzero"/></svg>',cancel:'<svg width="24" height="24"><path d="M12 4.6a7.4 7.4 0 110 14.8 7.4 7.4 0 010-14.8zM12 3a9 9 0 100 18 9 9 0 000-18zm0 8L14.8 8l1 1.1-2.7 2.8 2.7 2.7-1.1 1.1-2.7-2.7-2.7 2.7-1-1.1 2.6-2.7-2.7-2.7 1-1.1 2.8 2.7z" fill-rule="nonzero"/></svg>',"change-case":'<svg width="24" height="24"><path d="M18.4 18.2v-.6c-.5.8-1.3 1.2-2.4 1.2-2.2 0-3.3-1.6-3.3-4.8 0-3.1 1-4.7 3.3-4.7 1.1 0 1.8.3 2.4 1.1v-.6c0-.5.4-.8.8-.8s.8.3.8.8v8.4c0 .5-.4.8-.8.8a.8.8 0 01-.8-.8zm-2-7.4c-1.3 0-1.8.9-1.8 3.2 0 2.4.5 3.3 1.7 3.3 1.3 0 1.8-.9 1.8-3.2 0-2.4-.5-3.3-1.7-3.3zM10 15.7H5.5l-.8 2.6a1 1 0 01-1 .7h-.2a.7.7 0 01-.7-1l4-12a1 1 0 012 0l4 12a.7.7 0 01-.8 1h-.2a1 1 0 01-1-.7l-.8-2.6zm-.3-1.5l-2-6.5-1.9 6.5h3.9z" fill-rule="evenodd"/></svg>',"character-count":'<svg width="24" height="24"><path d="M4 11.5h16v1H4v-1zm4.8-6.8V10H7.7V5.8h-1v-1h2zM11 8.3V9h2v1h-3V7.7l2-1v-.9h-2v-1h3v2.4l-2 1zm6.3-3.4V10h-3.1V9h2.1V8h-2.1V6.8h2.1v-1h-2.1v-1h3.1zM5.8 16.4c0-.5.2-.8.5-1 .2-.2.6-.3 1.2-.3l.8.1c.2 0 .4.2.5.3l.4.4v2.8l.2.3H8.2v-.1-.2l-.6.3H7c-.4 0-.7 0-1-.2a1 1 0 01-.3-.9c0-.3 0-.6.3-.8.3-.2.7-.4 1.2-.4l.6-.2h.3v-.2l-.1-.2a.8.8 0 00-.5-.1 1 1 0 00-.4 0l-.3.4h-1zm2.3.8h-.2l-.2.1-.4.1a1 1 0 00-.4.2l-.2.2.1.3.5.1h.4l.4-.4v-.6zm2-3.4h1.2v1.7l.5-.3h.5c.5 0 .9.1 1.2.5.3.4.5.8.5 1.4 0 .6-.2 1.1-.5 1.5-.3.4-.7.6-1.3.6l-.6-.1-.4-.4v.4h-1.1v-5.4zm1.1 3.3c0 .3 0 .6.2.8a.7.7 0 001.2 0l.2-.8c0-.4 0-.6-.2-.8a.7.7 0 00-.6-.3l-.6.3-.2.8zm6.1-.5c0-.2 0-.3-.2-.4a.8.8 0 00-.5-.2c-.3 0-.5.1-.6.3l-.2.9c0 .3 0 .6.2.8.1.2.3.3.6.3.2 0 .4 0 .5-.2l.2-.4h1.1c0 .5-.3.8-.6 1.1a2 2 0 01-1.3.4c-.5 0-1-.2-1.3-.6a2 2 0 01-.5-1.4c0-.6.1-1.1.5-1.5.3-.4.8-.5 1.4-.5.5 0 1 0 1.2.3.4.3.5.7.5 1.2h-1v-.1z" fill-rule="evenodd"/></svg>',"checklist-rtl":'<svg width="24" height="24"><path d="M5 17h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm14.2 11c.2-.4.6-.5.9-.3.3.2.4.6.2 1L18 20c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L18 14c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L18 8c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8z" fill-rule="evenodd"/></svg>',checklist:'<svg width="24" height="24"><path d="M11 17h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0-6h8a1 1 0 010 2h-8a1 1 0 010-2zM7.2 16c.2-.4.6-.5.9-.3.3.2.4.6.2 1L6 20c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L6 14c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L6 8c-.2.3-.7.4-1 0L3.8 6.9a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8z" fill-rule="evenodd"/></svg>',checkmark:'<svg width="24" height="24"><path d="M18.2 5.4a1 1 0 011.6 1.2l-8 12a1 1 0 01-1.5.1l-5-5a1 1 0 111.4-1.4l4.1 4.1 7.4-11z" fill-rule="nonzero"/></svg>',"chevron-down":'<svg width="10" height="10"><path d="M8.7 2.2c.3-.3.8-.3 1 0 .4.4.4.9 0 1.2L5.7 7.8c-.3.3-.9.3-1.2 0L.2 3.4a.8.8 0 010-1.2c.3-.3.8-.3 1.1 0L5 6l3.7-3.8z" fill-rule="nonzero"/></svg>',"chevron-left":'<svg width="10" height="10"><path d="M7.8 1.3L4 5l3.8 3.7c.3.3.3.8 0 1-.4.4-.9.4-1.2 0L2.2 5.7a.8.8 0 010-1.2L6.6.2C7 0 7.4 0 7.8.2c.3.3.3.8 0 1.1z" fill-rule="nonzero"/></svg>',"chevron-right":'<svg width="10" height="10"><path d="M2.2 1.3a.8.8 0 010-1c.4-.4.9-.4 1.2 0l4.4 4.1c.3.4.3.9 0 1.2L3.4 9.8c-.3.3-.8.3-1.2 0a.8.8 0 010-1.1L6 5 2.2 1.3z" fill-rule="nonzero"/></svg>',"chevron-up":'<svg width="10" height="10"><path d="M8.7 7.8L5 4 1.3 7.8c-.3.3-.8.3-1 0a.8.8 0 010-1.2l4.1-4.4c.3-.3.9-.3 1.2 0l4.2 4.4c.3.3.3.9 0 1.2-.3.3-.8.3-1.1 0z" fill-rule="nonzero"/></svg>',close:'<svg width="24" height="24"><path d="M17.3 8.2L13.4 12l3.9 3.8a1 1 0 01-1.5 1.5L12 13.4l-3.8 3.9a1 1 0 01-1.5-1.5l3.9-3.8-3.9-3.8a1 1 0 011.5-1.5l3.8 3.9 3.8-3.9a1 1 0 011.5 1.5z" fill-rule="evenodd"/></svg>',"code-sample":'<svg width="24" height="26"><path d="M7.1 11a2.8 2.8 0 01-.8 2 2.8 2.8 0 01.8 2v1.7c0 .3.1.6.4.8.2.3.5.4.8.4.3 0 .4.2.4.4v.8c0 .2-.1.4-.4.4-.7 0-1.4-.3-2-.8-.5-.6-.8-1.3-.8-2V15c0-.3-.1-.6-.4-.8-.2-.3-.5-.4-.8-.4a.4.4 0 01-.4-.4v-.8c0-.2.2-.4.4-.4.3 0 .6-.1.8-.4.3-.2.4-.5.4-.8V9.3c0-.7.3-1.4.8-2 .6-.5 1.3-.8 2-.8.3 0 .4.2.4.4v.8c0 .2-.1.4-.4.4-.3 0-.6.1-.8.4-.3.2-.4.5-.4.8V11zm9.8 0V9.3c0-.3-.1-.6-.4-.8-.2-.3-.5-.4-.8-.4a.4.4 0 01-.4-.4V7c0-.2.1-.4.4-.4.7 0 1.4.3 2 .8.5.6.8 1.3.8 2V11c0 .3.1.6.4.8.2.3.5.4.8.4.2 0 .4.2.4.4v.8c0 .2-.2.4-.4.4-.3 0-.6.1-.8.4-.3.2-.4.5-.4.8v1.7c0 .7-.3 1.4-.8 2-.6.5-1.3.8-2 .8a.4.4 0 01-.4-.4v-.8c0-.2.1-.4.4-.4.3 0 .6-.1.8-.4.3-.2.4-.5.4-.8V15a2.8 2.8 0 01.8-2 2.8 2.8 0 01-.8-2zm-3.3-.4c0 .4-.1.8-.5 1.1-.3.3-.7.5-1.1.5-.4 0-.8-.2-1.1-.5-.4-.3-.5-.7-.5-1.1 0-.5.1-.9.5-1.2.3-.3.7-.4 1.1-.4.4 0 .8.1 1.1.4.4.3.5.7.5 1.2zM12 13c.4 0 .8.1 1.1.5.4.3.5.7.5 1.1 0 1-.1 1.6-.5 2a3 3 0 01-1.1 1c-.4.3-.8.4-1.1.4a.5.5 0 01-.5-.5V17a3 3 0 001-.2l.6-.6c-.6 0-1-.2-1.3-.5-.2-.3-.3-.7-.3-1 0-.5.1-1 .5-1.2.3-.4.7-.5 1.1-.5z" fill-rule="evenodd"/></svg>',"color-levels":'<svg width="24" height="24"><path d="M17.5 11.4A9 9 0 0118 14c0 .5 0 1-.2 1.4 0 .4-.3.9-.5 1.3a6.2 6.2 0 01-3.7 3 5.7 5.7 0 01-3.2 0A5.9 5.9 0 017.6 18a6.2 6.2 0 01-1.4-2.6 6.7 6.7 0 010-2.8c0-.4.1-.9.3-1.3a13.6 13.6 0 012.3-4A20 20 0 0112 4a26.4 26.4 0 013.2 3.4 18.2 18.2 0 012.3 4zm-2 4.5c.4-.7.5-1.4.5-2a7.3 7.3 0 00-1-3.2c.2.6.2 1.2.2 1.9a4.5 4.5 0 01-1.3 3 5.3 5.3 0 01-2.3 1.5 4.9 4.9 0 01-2 .1 4.3 4.3 0 002.4.8 4 4 0 002-.6 4 4 0 001.5-1.5z" fill-rule="evenodd"/></svg>',"color-picker":'<svg width="24" height="24"><path d="M12 3a9 9 0 000 18 1.5 1.5 0 001.1-2.5c-.2-.3-.4-.6-.4-1 0-.8.7-1.5 1.5-1.5H16a5 5 0 005-5c0-4.4-4-8-9-8zm-5.5 9a1.5 1.5 0 110-3 1.5 1.5 0 010 3zm3-4a1.5 1.5 0 110-3 1.5 1.5 0 010 3zm5 0a1.5 1.5 0 110-3 1.5 1.5 0 010 3zm3 4a1.5 1.5 0 110-3 1.5 1.5 0 010 3z" fill-rule="nonzero"/></svg>',"color-swatch-remove-color":'<svg width="24" height="24"><path stroke="#000" stroke-width="2" d="M21 3L3 21" fill-rule="evenodd"/></svg>',"color-swatch":'<svg width="24" height="24"><rect x="3" y="3" width="18" height="18" rx="1" fill-rule="evenodd"/></svg>',"comment-add":'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M9 19l3-2h7c.6 0 1-.4 1-1V6c0-.6-.4-1-1-1H5a1 1 0 00-1 1v10c0 .6.4 1 1 1h4v2zm-2 4v-4H5a3 3 0 01-3-3V6a3 3 0 013-3h14a3 3 0 013 3v10a3 3 0 01-3 3h-6.4L7 23z"/><path d="M13 10h2a1 1 0 010 2h-2v2a1 1 0 01-2 0v-2H9a1 1 0 010-2h2V8a1 1 0 012 0v2z"/></g></svg>',comment:'<svg width="24" height="24"><path fill-rule="nonzero" d="M9 19l3-2h7c.6 0 1-.4 1-1V6c0-.6-.4-1-1-1H5a1 1 0 00-1 1v10c0 .6.4 1 1 1h4v2zm-2 4v-4H5a3 3 0 01-3-3V6a3 3 0 013-3h14a3 3 0 013 3v10a3 3 0 01-3 3h-6.4L7 23z"/></svg>',contrast:'<svg width="24" height="24"><path d="M12 4a7.8 7.8 0 015.7 2.3A8 8 0 1112 4zm-6 8a6 6 0 006 6V6a6 6 0 00-6 6z" fill-rule="evenodd"/></svg>',copy:'<svg width="24" height="24"><path d="M16 3H6a2 2 0 00-2 2v11h2V5h10V3zm1 4a2 2 0 012 2v10a2 2 0 01-2 2h-7a2 2 0 01-2-2V9c0-1.2.9-2 2-2h7zm0 12V9h-7v10h7z" fill-rule="nonzero"/></svg>',crop:'<svg width="24" height="24"><path d="M17 8v7h2c.6 0 1 .4 1 1s-.4 1-1 1h-2v2c0 .6-.4 1-1 1a1 1 0 01-1-1v-2H7V9H5a1 1 0 110-2h2V5c0-.6.4-1 1-1s1 .4 1 1v2h7l3-3 1 1-3 3zM9 9v5l5-5H9zm1 6h5v-5l-5 5z" fill-rule="evenodd"/></svg>',"cut-column":'<svg width="24" height="24"><path fill-rule="evenodd" d="M7.2 4.5c.9 0 1.6.4 2.2 1A3.7 3.7 0 0110.5 8v.5l1 1 4-4 1-.5a3.3 3.3 0 012 0c.4 0 .7.3 1 .5L17 8h4v13h-6V10l-1.5 1.5.5.5v4l-2.5-2.5-1 1v.5c0 .4 0 .8-.3 1.2-.2.5-.4.9-.8 1.2-.6.7-1.3 1-2.2 1-.8.2-1.5 0-2-.6l-.5-.8-.2-1c0-.4 0-.8.3-1.2A3.9 3.9 0 017 12.7c.5-.2 1-.3 1.5-.2l1-1-1-1c-.5 0-1 0-1.5-.2-.5-.1-1-.4-1.4-.9-.4-.3-.6-.7-.8-1.2L4.5 7c0-.4 0-.7.2-1 0-.3.3-.6.5-.8.5-.5 1.2-.8 2-.7zm12.3 5h-3v10h3v-10zM8 13.8h-.3l-.4.2a2.8 2.8 0 00-.7.4v.1a2.8 2.8 0 00-.6.8l-.1.4v.7l.2.5.5.2h.7a2.6 2.6 0 00.8-.3 2.4 2.4 0 00.7-.7 2.5 2.5 0 00.3-.8 1.5 1.5 0 000-.8 1 1 0 00-.2-.4 1 1 0 00-.5-.2H8zm3.5-3.7c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4s.7-.1 1-.4c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4zM7 5.8h-.4a1 1 0 00-.5.3 1 1 0 00-.2.5v.7a2.5 2.5 0 00.3.8l.2.3h.1l.4.4.4.2.4.1h.7L9 9l.2-.4a1.6 1.6 0 000-.8 2.6 2.6 0 00-.3-.8A2.5 2.5 0 007.7 6l-.4-.1H7z"/></svg>',"cut-row":'<svg width="24" height="24"><path fill-rule="evenodd" d="M22 3v5H9l3 3 2-2h4l-4 4 1 1h.5c.4 0 .8 0 1.2.3.5.2.9.4 1.2.8.7.6 1 1.3 1 2.2.2.8 0 1.5-.6 2l-.8.5-1 .2c-.4 0-.8 0-1.2-.3a3.9 3.9 0 01-2.1-2.2c-.2-.5-.3-1-.2-1.5l-1-1-1 1c0 .5 0 1-.2 1.5-.1.5-.4 1-.9 1.4-.3.4-.7.6-1.2.8l-1.2.3c-.4 0-.7 0-1-.2-.3 0-.6-.3-.8-.5-.5-.5-.8-1.2-.7-2 0-.9.4-1.6 1-2.2A3.7 3.7 0 018.6 14H9l1-1-4-4-.5-1a3.3 3.3 0 010-2c0-.4.3-.7.5-1l2 2V3h14zM8.5 15.3h-.3a2.6 2.6 0 00-.8.4 2.5 2.5 0 00-.9 1.1l-.1.4v.7l.2.5.5.2h.7a2.5 2.5 0 00.8-.3L9 18V18l.4-.4.2-.4.1-.4v-.3-.4a1 1 0 00-.2-.5 1 1 0 00-.4-.2h-.5zm7 0H15a1 1 0 00-.4.3 1 1 0 00-.2.5 1.5 1.5 0 000 .7v.4a2.8 2.8 0 00.5.7h.1a2.8 2.8 0 00.8.6l.4.1h.7l.5-.2.2-.5v-.4-.3a2.6 2.6 0 00-.3-.8 2.4 2.4 0 00-.7-.7 2.5 2.5 0 00-.8-.3h-.3zM12 11.6c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4s.7-.1 1-.4c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4zm8.5-7.1h-11v2h11v-2z"/></svg>',cut:'<svg width="24" height="24"><path d="M18 15c.6.7 1 1.4 1 2.3 0 .8-.2 1.5-.7 2l-.8.5-1 .2c-.4 0-.8 0-1.2-.3a3.9 3.9 0 01-2.1-2.2c-.2-.5-.3-1-.2-1.5l-1-1-1 1c0 .5 0 1-.2 1.5-.1.5-.4 1-.9 1.4-.3.4-.7.6-1.2.8l-1.2.3c-.4 0-.7 0-1-.2-.3 0-.6-.3-.8-.5-.5-.5-.8-1.2-.7-2 0-.9.4-1.6 1-2.2A3.7 3.7 0 018.6 14H9l1-1-4-4-.5-1a3.3 3.3 0 010-2c0-.4.3-.7.5-1l6 6 6-6 .5 1a3.3 3.3 0 010 2c0 .4-.3.7-.5 1l-4 4 1 1h.5c.4 0 .8 0 1.2.3.5.2.9.4 1.2.8zm-8.5 2.2l.1-.4v-.3-.4a1 1 0 00-.2-.5 1 1 0 00-.4-.2 1.6 1.6 0 00-.8 0 2.6 2.6 0 00-.8.3 2.5 2.5 0 00-.9 1.1l-.1.4v.7l.2.5.5.2h.7a2.5 2.5 0 00.8-.3 2.8 2.8 0 001-1zm2.5-2.8c.4 0 .7-.1 1-.4.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4s-.7.1-1 .4c-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4zm5.4 4l.2-.5v-.4-.3a2.6 2.6 0 00-.3-.8 2.4 2.4 0 00-.7-.7 2.5 2.5 0 00-.8-.3 1.5 1.5 0 00-.8 0 1 1 0 00-.4.2 1 1 0 00-.2.5 1.5 1.5 0 000 .7v.4l.3.4.3.4a2.8 2.8 0 00.8.5l.4.1h.7l.5-.2z" fill-rule="evenodd"/></svg>',"document-properties":'<svg width="24" height="24"><path d="M14.4 3H7a2 2 0 00-2 2v14c0 1.1.9 2 2 2h10a2 2 0 002-2V7.6L14.4 3zM17 19H7V5h6v4h4v10z" fill-rule="nonzero"/></svg>',drag:'<svg width="24" height="24"><path d="M13 5h2v2h-2V5zm0 4h2v2h-2V9zM9 9h2v2H9V9zm4 4h2v2h-2v-2zm-4 0h2v2H9v-2zm0 4h2v2H9v-2zm4 0h2v2h-2v-2zM9 5h2v2H9V5z" fill-rule="evenodd"/></svg>',"duplicate-column":'<svg width="24" height="24"><path d="M17 6v16h-7V6h7zm-2 2h-3v12h3V8zm-2-6v2H8v15H6V2h7z"/></svg>',"duplicate-row":'<svg width="24" height="24"><path d="M22 11v7H6v-7h16zm-2 2H8v3h12v-3zm-1-6v2H4v5H2V7h17z"/></svg>',duplicate:'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M16 3v2H6v11H4V5c0-1.1.9-2 2-2h10zm3 8h-2V9h-7v10h9a2 2 0 01-2 2h-7a2 2 0 01-2-2V9c0-1.2.9-2 2-2h7a2 2 0 012 2v2z"/><path d="M17 14h1a1 1 0 010 2h-1v1a1 1 0 01-2 0v-1h-1a1 1 0 010-2h1v-1a1 1 0 012 0v1z"/></g></svg>',"edit-block":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19.8 8.8l-9.4 9.4c-.2.2-.5.4-.9.4l-5.4 1.2 1.2-5.4.5-.8 9.4-9.4c.7-.7 1.8-.7 2.5 0l2.1 2.1c.7.7.7 1.8 0 2.5zm-2-.2l1-.9v-.3l-2.2-2.2a.3.3 0 00-.3 0l-1 1L18 8.5zm-1 1l-2.5-2.4-6 6 2.5 2.5 6-6zm-7 7.1l-2.6-2.4-.3.3-.1.2-.7 3 3.1-.6h.1l.4-.5z"/></svg>',"edit-image":'<svg width="24" height="24"><path d="M18 16h2V7a2 2 0 00-2-2H7v2h11v9zM6 17h15a1 1 0 010 2h-1v1a1 1 0 01-2 0v-1H6a2 2 0 01-2-2V7H3a1 1 0 110-2h1V4a1 1 0 112 0v13zm3-5.3l1.3 2 3-4.7 3.7 6H7l2-3.3z" fill-rule="nonzero"/></svg>',"embed-page":'<svg width="24" height="24"><path d="M19 6V5H5v14h2A13 13 0 0119 6zm0 1.4c-.8.8-1.6 2.4-2.2 4.6H19V7.4zm0 5.6h-2.4c-.4 1.8-.6 3.8-.6 6h3v-6zm-4 6c0-2.2.2-4.2.6-6H13c-.7 1.8-1.1 3.8-1.1 6h3zm-4 0c0-2.2.4-4.2 1-6H9.6A12 12 0 008 19h3zM4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 01-1-1V4c0-.6.4-1 1-1zm11.8 9c.4-1.9 1-3.4 1.8-4.5a9.2 9.2 0 00-4 4.5h2.2zm-3.4 0a12 12 0 012.8-4 12 12 0 00-5 4h2.2z" fill-rule="nonzero"/></svg>',embed:'<svg width="24" height="24"><path d="M4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 01-1-1V4c0-.6.4-1 1-1zm1 2v14h14V5H5zm4.8 2.6l5.6 4a.5.5 0 010 .8l-5.6 4A.5.5 0 019 16V8a.5.5 0 01.8-.4z" fill-rule="nonzero"/></svg>',emoji:'<svg width="24" height="24"><path d="M9 11c.6 0 1-.4 1-1s-.4-1-1-1a1 1 0 00-1 1c0 .6.4 1 1 1zm6 0c.6 0 1-.4 1-1s-.4-1-1-1a1 1 0 00-1 1c0 .6.4 1 1 1zm-3 5.5c2.1 0 4-1.5 4.4-3.5H7.6c.5 2 2.3 3.5 4.4 3.5zM12 4a8 8 0 100 16 8 8 0 000-16zm0 14.5a6.5 6.5 0 110-13 6.5 6.5 0 010 13z" fill-rule="nonzero"/></svg>',"export":'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M14.4 3L18 7v1h-5V5H7v14h9a1 1 0 012 0c0 1-.8 2-1.9 2H7c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2h7.5z"/><path d="M18.1 12c.5 0 .9.4.9 1 0 .5-.3 1-.8 1h-7.3c-.5 0-.9-.4-.9-1 0-.5.3-1 .8-1h7.3z"/><path d="M16.4 9.2a1 1 0 011.4.2l2.4 3.6-2.4 3.6a1 1 0 01-1.7-1v-.2l1.7-2.4-1.6-2.4a1 1 0 01.2-1.4z"/></g></svg>',fill:'<svg width="24" height="26"><path d="M16.6 12l-9-9-1.4 1.4 2.4 2.4-5.2 5.1c-.5.6-.5 1.6 0 2.2L9 19.6a1.5 1.5 0 002.2 0l5.5-5.5c.5-.6.5-1.6 0-2.2zM5.2 13L10 8.2l4.8 4.8H5.2zM19 14.5s-2 2.2-2 3.5c0 1.1.9 2 2 2a2 2 0 002-2c0-1.3-2-3.5-2-3.5z" fill-rule="nonzero"/></svg>',"flip-horizontally":'<svg width="24" height="24"><path d="M14 19h2v-2h-2v2zm4-8h2V9h-2v2zM4 7v10c0 1.1.9 2 2 2h3v-2H6V7h3V5H6a2 2 0 00-2 2zm14-2v2h2a2 2 0 00-2-2zm-7 16h2V3h-2v18zm7-6h2v-2h-2v2zm-4-8h2V5h-2v2zm4 12a2 2 0 002-2h-2v2z" fill-rule="nonzero"/></svg>',"flip-vertically":'<svg width="24" height="24"><path d="M5 14v2h2v-2H5zm8 4v2h2v-2h-2zm4-14H7a2 2 0 00-2 2v3h2V6h10v3h2V6a2 2 0 00-2-2zm2 14h-2v2a2 2 0 002-2zM3 11v2h18v-2H3zm6 7v2h2v-2H9zm8-4v2h2v-2h-2zM5 18c0 1.1.9 2 2 2v-2H5z" fill-rule="nonzero"/></svg>',"format-painter":'<svg width="24" height="24"><path d="M18 5V4c0-.5-.4-1-1-1H5a1 1 0 00-1 1v4c0 .6.5 1 1 1h12c.6 0 1-.4 1-1V7h1v4H9v9c0 .6.4 1 1 1h2c.6 0 1-.4 1-1v-7h8V5h-3z" fill-rule="nonzero"/></svg>',format:'<svg width="24" height="24"><path fill-rule="evenodd" d="M17 5a1 1 0 010 2h-4v11a1 1 0 01-2 0V7H7a1 1 0 110-2h10z"/></svg>',fullscreen:'<svg width="24" height="24"><path d="M15.3 10l-1.2-1.3 2.9-3h-2.3a.9.9 0 110-1.7H19c.5 0 .9.4.9.9v4.4a.9.9 0 11-1.8 0V7l-2.9 3zm0 4l3 3v-2.3a.9.9 0 111.7 0V19c0 .5-.4.9-.9.9h-4.4a.9.9 0 110-1.8H17l-3-2.9 1.3-1.2zM10 15.4l-2.9 3h2.3a.9.9 0 110 1.7H5a.9.9 0 01-.9-.9v-4.4a.9.9 0 111.8 0V17l2.9-3 1.2 1.3zM8.7 10L5.7 7v2.3a.9.9 0 01-1.7 0V5c0-.5.4-.9.9-.9h4.4a.9.9 0 010 1.8H7l3 2.9-1.3 1.2z" fill-rule="nonzero"/></svg>',gallery:'<svg width="24" height="24"><path fill-rule="nonzero" d="M5 15.7l2.3-2.2c.3-.3.7-.3 1 0L11 16l5.1-5c.3-.4.8-.4 1 0l2 1.9V8H5v7.7zM5 18V19h3l1.8-1.9-2-2L5 17.9zm14-3l-2.5-2.4-6.4 6.5H19v-4zM4 6h16c.6 0 1 .4 1 1v13c0 .6-.4 1-1 1H4a1 1 0 01-1-1V7c0-.6.4-1 1-1zm6 7a2 2 0 110-4 2 2 0 010 4zM4.5 4h15a.5.5 0 110 1h-15a.5.5 0 010-1zm2-2h11a.5.5 0 110 1h-11a.5.5 0 010-1z"/></svg>',gamma:'<svg width="24" height="24"><path d="M4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 01-1-1V4c0-.6.4-1 1-1zm1 2v14h14V5H5zm6.5 11.8V14L9.2 8.7a5.1 5.1 0 00-.4-.8l-.1-.2H8 8v-1l.3-.1.3-.1h.7a1 1 0 01.6.5l.1.3a8.5 8.5 0 01.3.6l1.9 4.6 2-5.2a1 1 0 011-.6.5.5 0 01.5.6L13 14v2.8a.7.7 0 01-1.4 0z" fill-rule="nonzero"/></svg>',help:'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M12 5.5a6.5 6.5 0 00-6 9 6.3 6.3 0 001.4 2l1 1a6.3 6.3 0 003.6 1 6.5 6.5 0 006-9 6.3 6.3 0 00-1.4-2l-1-1a6.3 6.3 0 00-3.6-1zM12 4a7.8 7.8 0 015.7 2.3A8 8 0 1112 4z"/><path d="M9.6 9.7a.7.7 0 01-.7-.8c0-1.1 1.5-1.8 3.2-1.8 1.8 0 3.2.8 3.2 2.4 0 1.4-.4 2.1-1.5 2.8-.2 0-.3.1-.3.2a2 2 0 00-.8.8.8.8 0 01-1.4-.6c.3-.7.8-1 1.3-1.5l.4-.2c.7-.4.8-.6.8-1.5 0-.5-.6-.9-1.7-.9-.5 0-1 .1-1.4.3-.2 0-.3.1-.3.2v-.2c0 .4-.4.8-.8.8z" fill-rule="nonzero"/><circle cx="12" cy="16" r="1"/></g></svg>',"highlight-bg-color":'<svg width="24" height="24"><g fill-rule="evenodd"><path id="tox-icon-highlight-bg-color__color" d="M3 18h18v3H3z"/><path fill-rule="nonzero" d="M7.7 16.7H3l3.3-3.3-.7-.8L10.2 8l4 4.1-4 4.2c-.2.2-.6.2-.8 0l-.6-.7-1.1 1.1zm5-7.5L11 7.4l3-2.9a2 2 0 012.6 0L18 6c.7.7.7 2 0 2.7l-2.9 2.9-1.8-1.8-.5-.6"/></g></svg>',home:'<svg width="24" height="24"><path fill-rule="nonzero" d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/></svg>',"horizontal-rule":'<svg width="24" height="24"><path d="M4 11h16v2H4z" fill-rule="evenodd"/></svg>',"image-options":'<svg width="24" height="24"><path d="M6 10a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2zm12 0a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2zm-6 0a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2z" fill-rule="nonzero"/></svg>',image:'<svg width="24" height="24"><path d="M5 15.7l3.3-3.2c.3-.3.7-.3 1 0L12 15l4.1-4c.3-.4.8-.4 1 0l2 1.9V5H5v10.7zM5 18V19h3l2.8-2.9-2-2L5 17.9zm14-3l-2.5-2.4-6.4 6.5H19v-4zM4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 01-1-1V4c0-.6.4-1 1-1zm6 8a2 2 0 100-4 2 2 0 000 4z" fill-rule="nonzero"/></svg>',indent:'<svg width="24" height="24"><path d="M7 5h12c.6 0 1 .4 1 1s-.4 1-1 1H7a1 1 0 110-2zm5 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 010-2zm0 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 010-2zm-5 4h12a1 1 0 010 2H7a1 1 0 010-2zm-2.6-3.8L6.2 12l-1.8-1.2a1 1 0 011.2-1.6l3 2a1 1 0 010 1.6l-3 2a1 1 0 11-1.2-1.6z" fill-rule="evenodd"/></svg>',info:'<svg width="24" height="24"><path d="M12 4a7.8 7.8 0 015.7 2.3A8 8 0 1112 4zm-1 3v2h2V7h-2zm3 10v-1h-1v-5h-3v1h1v4h-1v1h4z" fill-rule="evenodd"/></svg>',"insert-character":'<svg width="24" height="24"><path d="M15 18h4l1-2v4h-6v-3.3l1.4-1a6 6 0 001.8-2.9 6.3 6.3 0 00-.1-4.1 5.8 5.8 0 00-3-3.2c-.6-.3-1.3-.5-2.1-.5a5.1 5.1 0 00-3.9 1.8 6.3 6.3 0 00-1.3 6 6.2 6.2 0 001.8 3l1.4.9V20H4v-4l1 2h4v-.5l-2-1L5.4 15A6.5 6.5 0 014 11c0-1 .2-1.9.6-2.7A7 7 0 016.3 6C7.1 5.4 8 5 9 4.5c1-.3 2-.5 3.1-.5a8.8 8.8 0 015.7 2 7 7 0 011.7 2.3 6 6 0 01.2 4.8c-.2.7-.6 1.3-1 1.9a7.6 7.6 0 01-3.6 2.5v.5z" fill-rule="evenodd"/></svg>',"insert-time":'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M12 19a7 7 0 100-14 7 7 0 000 14zm0 2a9 9 0 110-18 9 9 0 010 18z"/><path d="M16 12h-3V7c0-.6-.4-1-1-1a1 1 0 00-1 1v7h5c.6 0 1-.4 1-1s-.4-1-1-1z"/></g></svg>',invert:'<svg width="24" height="24"><path d="M18 19.3L16.5 18a5.8 5.8 0 01-3.1 1.9 6.1 6.1 0 01-5.5-1.6A5.8 5.8 0 016 14v-.3l.1-1.2A13.9 13.9 0 017.7 9l-3-3 .7-.8 2.8 2.9 9 8.9 1.5 1.6-.7.6zm0-5.5v.3l-.1 1.1-.4 1-1.2-1.2a4.3 4.3 0 00.2-1v-.2c0-.4 0-.8-.2-1.3l-.5-1.4a14.8 14.8 0 00-3-4.2L12 6a26.1 26.1 0 00-2.2 2.5l-1-1a20.9 20.9 0 012.9-3.3L12 4l1 .8a22.2 22.2 0 014 5.4c.6 1.2 1 2.4 1 3.6z" fill-rule="evenodd"/></svg>',italic:'<svg width="24" height="24"><path d="M16.7 4.7l-.1.9h-.3c-.6 0-1 0-1.4.3-.3.3-.4.6-.5 1.1l-2.1 9.8v.6c0 .5.4.8 1.4.8h.2l-.2.8H8l.2-.8h.2c1.1 0 1.8-.5 2-1.5l2-9.8.1-.5c0-.6-.4-.8-1.4-.8h-.3l.2-.9h5.8z" fill-rule="evenodd"/></svg>',"line-height":'<svg width="24" height="24"><path d="M21 5a1 1 0 01.1 2H13a1 1 0 01-.1-2H21zm0 4a1 1 0 01.1 2H13a1 1 0 01-.1-2H21zm0 4a1 1 0 01.1 2H13a1 1 0 01-.1-2H21zm0 4a1 1 0 01.1 2H13a1 1 0 01-.1-2H21zM7 3.6l3.7 3.7a1 1 0 01-1.3 1.5h-.1L8 7.3v9.2l1.3-1.3a1 1 0 011.3 0h.1c.4.4.4 1 0 1.3v.1L7 20.4l-3.7-3.7a1 1 0 011.3-1.5h.1L6 16.7V7.4L4.7 8.7a1 1 0 01-1.3 0h-.1a1 1 0 010-1.3v-.1L7 3.6z"/></svg>',line:'<svg width="24" height="24"><path d="M15 9l-8 8H4v-3l8-8 3 3zm1-1l-3-3 1-1h1c-.2 0 0 0 0 0l2 2s0 .2 0 0v1l-1 1zM4 18h16v2H4v-2z" fill-rule="evenodd"/></svg>',link:'<svg width="24" height="24"><path d="M6.2 12.3a1 1 0 011.4 1.4l-2.1 2a2 2 0 102.7 2.8l4.8-4.8a1 1 0 000-1.4 1 1 0 111.4-1.3 2.9 2.9 0 010 4L9.6 20a3.9 3.9 0 01-5.5-5.5l2-2zm11.6-.6a1 1 0 01-1.4-1.4l2-2a2 2 0 10-2.6-2.8L11 10.3a1 1 0 000 1.4A1 1 0 119.6 13a2.9 2.9 0 010-4L14.4 4a3.9 3.9 0 015.5 5.5l-2 2z" fill-rule="nonzero"/></svg>',"list-bull-circle":'<svg width="48" height="48"><g fill-rule="evenodd"><path d="M11 16a2 2 0 100-4 2 2 0 000 4zm0 1a3 3 0 110-6 3 3 0 010 6zM11 26a2 2 0 100-4 2 2 0 000 4zm0 1a3 3 0 110-6 3 3 0 010 6zM11 36a2 2 0 100-4 2 2 0 000 4zm0 1a3 3 0 110-6 3 3 0 010 6z" fill-rule="nonzero"/><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/></g></svg>',"list-bull-default":'<svg width="48" height="48"><g fill-rule="evenodd"><circle cx="11" cy="14" r="3"/><circle cx="11" cy="24" r="3"/><circle cx="11" cy="34" r="3"/><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/></g></svg>',"list-bull-square":'<svg width="48" height="48"><g fill-rule="evenodd"><path d="M8 11h6v6H8zM8 21h6v6H8zM8 31h6v6H8z"/><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/></g></svg>',"list-num-default-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M37.4 17v-4.8l-1.6 1v-1.1l1.6-1h1.2V17zM33.3 17.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm1.7 5.7c0-1.2 1-2 2.2-2 1.3 0 2.1.8 2.1 1.8 0 .7-.3 1.2-1.3 2.2l-1.2 1v.2h2.6v1h-4.3v-.9l2-1.9c.8-.8 1-1.1 1-1.5 0-.5-.4-.8-1-.8-.5 0-.9.3-.9.9H35zm-1.7 4.3c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm3.2 7.3v-1h.7c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7s-1 .3-1 .8H35c0-1.1 1-1.8 2.2-1.8 1.2 0 2.1.6 2.1 1.6 0 .7-.4 1.2-1 1.3v.1c.7.1 1.3.7 1.3 1.4 0 1-1 1.9-2.4 1.9-1.3 0-2.2-.8-2.3-2h1.2c0 .6.5 1 1.1 1 .6 0 1-.4 1-1 0-.5-.3-.8-1-.8h-.7zm-3.3 2.7c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7z"/></g></svg>',"list-num-default":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M10 17v-4.8l-1.5 1v-1.1l1.6-1h1.2V17h-1.2zm3.6.1c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7zm-5 5.7c0-1.2.8-2 2.1-2s2.1.8 2.1 1.8c0 .7-.3 1.2-1.4 2.2l-1.1 1v.2h2.6v1H8.6v-.9l2-1.9c.8-.8 1-1.1 1-1.5 0-.5-.4-.8-1-.8-.5 0-.9.3-.9.9H8.5zm6.3 4.3c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zM10 34.4v-1h.7c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7s-1 .3-1 .8H8.6c0-1.1 1-1.8 2.2-1.8 1.3 0 2.1.6 2.1 1.6 0 .7-.4 1.2-1 1.3v.1c.8.1 1.3.7 1.3 1.4 0 1-1 1.9-2.4 1.9-1.3 0-2.2-.8-2.3-2h1.2c0 .6.5 1 1.1 1 .7 0 1-.4 1-1 0-.5-.3-.8-1-.8h-.7zm4.7 2.7c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7z"/></g></svg>',"list-num-lower-alpha-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M36.5 16c-.9 0-1.5-.5-1.5-1.3s.6-1.3 1.8-1.4h1v-.4c0-.4-.2-.6-.7-.6-.4 0-.7.1-.8.4h-1.1c0-.8.8-1.4 2-1.4S39 12 39 13V16h-1.2v-.6c-.3.4-.8.7-1.4.7zm.4-.8c.6 0 1-.4 1-.9V14h-1c-.5.1-.7.3-.7.6 0 .4.3.6.7.6zM33.1 16.1c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7zM37.7 26c-.7 0-1.2-.2-1.5-.7v.7H35v-6.3h1.2v2.5c.3-.5.8-.9 1.5-.9 1.1 0 1.8 1 1.8 2.4 0 1.5-.7 2.4-1.8 2.4zm-.5-3.6c-.6 0-1 .5-1 1.3s.4 1.4 1 1.4c.7 0 1-.6 1-1.4 0-.8-.3-1.3-1-1.3zM33.2 26.1c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7zm6 7h-1c-.1-.5-.4-.8-1-.8s-1 .5-1 1.4c0 1 .4 1.4 1 1.4.5 0 .9-.2 1-.7h1c0 1-.8 1.7-2 1.7-1.4 0-2.2-.9-2.2-2.4s.8-2.4 2.2-2.4c1.2 0 2 .7 2 1.7zm-6.1 3c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-lower-alpha":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M10.3 15.2c.5 0 1-.4 1-.9V14h-1c-.5.1-.8.3-.8.6 0 .4.3.6.8.6zm-.4.9c-1 0-1.5-.6-1.5-1.4 0-.8.6-1.3 1.7-1.4h1.1v-.4c0-.4-.2-.6-.7-.6-.5 0-.8.1-.9.4h-1c0-.8.8-1.4 2-1.4 1.1 0 1.8.6 1.8 1.6V16h-1.1v-.6h-.1c-.2.4-.7.7-1.3.7zm4.6 0c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm-3.2 10c-.6 0-1.2-.3-1.4-.8v.7H8.5v-6.3H10v2.5c.3-.5.8-.9 1.4-.9 1.2 0 1.9 1 1.9 2.4 0 1.5-.7 2.4-1.9 2.4zm-.4-3.7c-.7 0-1 .5-1 1.3s.3 1.4 1 1.4c.6 0 1-.6 1-1.4 0-.8-.4-1.3-1-1.3zm4 3.7c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm-2.2 7h-1.2c0-.5-.4-.8-.9-.8-.6 0-1 .5-1 1.4 0 1 .4 1.4 1 1.4.5 0 .8-.2 1-.7h1c0 1-.8 1.7-2 1.7-1.4 0-2.2-.9-2.2-2.4s.8-2.4 2.2-2.4c1.2 0 2 .7 2 1.7zm1.8 3c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-lower-greek-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M37.4 16c-1.2 0-2-.8-2-2.3 0-1.5.8-2.4 2-2.4.6 0 1 .4 1.3 1v-.9H40v3.2c0 .4.1.5.4.5h.2v.9h-.6c-.6 0-1-.2-1-.7h-.2c-.2.4-.7.8-1.3.8zm.3-1c.6 0 1-.5 1-1.3s-.4-1.3-1-1.3-1 .5-1 1.3.4 1.4 1 1.4zM33.3 16.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zM36 21.9c0-1.5.8-2.3 2.1-2.3 1.2 0 2 .6 2 1.6 0 .6-.3 1-.9 1.3.9.3 1.3.8 1.3 1.7 0 1.2-.7 1.9-1.8 1.9-.6 0-1.1-.3-1.4-.8v2.2H36V22zm1.8 1.2v-1h.3c.5 0 .9-.2.9-.7 0-.5-.3-.8-.9-.8-.5 0-.8.3-.8 1v2.2c0 .8.4 1.3 1 1.3s1-.4 1-1-.4-1-1.2-1h-.3zM33.3 26.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zM37.1 34.6L34.8 30h1.4l1.7 3.5 1.7-3.5h1.1l-2.2 4.6v.1c.5.8.7 1.4.7 1.8 0 .4-.2.8-.4 1-.2.2-.6.3-1 .3-.9 0-1.3-.4-1.3-1.2 0-.5.2-1 .5-1.7l.1-.2zm.7 1a2 2 0 00-.4.9c0 .3.1.4.4.4.3 0 .4-.1.4-.4 0-.2-.1-.6-.4-1zM33.3 36.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-lower-greek":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M10.5 15c.7 0 1-.5 1-1.3s-.3-1.3-1-1.3c-.5 0-.9.5-.9 1.3s.4 1.4 1 1.4zm-.3 1c-1.1 0-1.8-.8-1.8-2.3 0-1.5.7-2.4 1.8-2.4.7 0 1.1.4 1.3 1h.1v-.9h1.2v3.2c0 .4.1.5.4.5h.2v.9h-.6c-.6 0-1-.2-1.1-.7h-.1c-.2.4-.7.8-1.4.8zm5 .1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7zm-4.9 7v-1h.3c.6 0 1-.2 1-.7 0-.5-.4-.8-1-.8-.5 0-.8.3-.8 1v2.2c0 .8.4 1.3 1.1 1.3.6 0 1-.4 1-1s-.5-1-1.3-1h-.3zM8.6 22c0-1.5.7-2.3 2-2.3 1.2 0 2 .6 2 1.6 0 .6-.3 1-.8 1.3.8.3 1.3.8 1.3 1.7 0 1.2-.8 1.9-1.9 1.9-.6 0-1.1-.3-1.3-.8v2.2H8.5V22zm6.2 4.2c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7zm-4.5 8.5L8 30h1.4l1.7 3.5 1.7-3.5h1.1l-2.2 4.6v.1c.5.8.7 1.4.7 1.8 0 .4-.1.8-.4 1-.2.2-.6.3-1 .3-.9 0-1.3-.4-1.3-1.2 0-.5.2-1 .5-1.7l.1-.2zm.7 1a2 2 0 00-.4.9c0 .3.1.4.4.4.3 0 .4-.1.4-.4 0-.2-.1-.6-.4-1zm4.5.5c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-lower-roman-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M32.9 16v-1.2h-1.3V16H33zm0 10v-1.2h-1.3V26H33zm0 10v-1.2h-1.3V36H33z"/><path fill-rule="nonzero" d="M36 21h-1.5v5H36zM36 31h-1.5v5H36zM39 21h-1.5v5H39zM39 31h-1.5v5H39zM42 31h-1.5v5H42zM36 11h-1.5v5H36zM36 19h-1.5v1H36zM36 29h-1.5v1H36zM39 19h-1.5v1H39zM39 29h-1.5v1H39zM42 29h-1.5v1H42zM36 9h-1.5v1H36z"/></g></svg>',"list-num-lower-roman":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M15.1 16v-1.2h1.3V16H15zm0 10v-1.2h1.3V26H15zm0 10v-1.2h1.3V36H15z"/><path fill-rule="nonzero" d="M12 21h1.5v5H12zM12 31h1.5v5H12zM9 21h1.5v5H9zM9 31h1.5v5H9zM6 31h1.5v5H6zM12 11h1.5v5H12zM12 19h1.5v1H12zM12 29h1.5v1H12zM9 19h1.5v1H9zM9 29h1.5v1H9zM6 29h1.5v1H6zM12 9h1.5v1H12z"/></g></svg>',"list-num-upper-alpha-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M39.3 17l-.5-1.4h-2l-.5 1.4H35l2-6h1.6l2 6h-1.3zm-1.6-4.7l-.7 2.3h1.6l-.8-2.3zM33.4 17c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7zm4.7 9.9h-2.7v-6H38c1.2 0 1.9.6 1.9 1.5 0 .6-.5 1.2-1 1.3.7.1 1.3.7 1.3 1.5 0 1-.8 1.7-2 1.7zm-1.4-5v1.5h1c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7h-1zm0 4h1.1c.7 0 1.1-.3 1.1-.8 0-.6-.4-.9-1.1-.9h-1.1V26zM33 27.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm4.9 10c-1.8 0-2.8-1.1-2.8-3.1s1-3.1 2.8-3.1c1.4 0 2.5.9 2.6 2.2h-1.3c0-.7-.6-1.1-1.3-1.1-1 0-1.6.7-1.6 2s.6 2 1.6 2c.7 0 1.2-.4 1.4-1h1.2c-.1 1.3-1.2 2.2-2.6 2.2zm-4.5 0c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-upper-alpha":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M12.6 17l-.5-1.4h-2L9.5 17H8.3l2-6H12l2 6h-1.3zM11 12.3l-.7 2.3h1.6l-.8-2.3zm4.7 4.8c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7zM11.4 27H8.7v-6h2.6c1.2 0 1.9.6 1.9 1.5 0 .6-.5 1.2-1 1.3.7.1 1.3.7 1.3 1.5 0 1-.8 1.7-2 1.7zM10 22v1.5h1c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7h-1zm0 4H11c.7 0 1.1-.3 1.1-.8 0-.6-.4-.9-1.1-.9H10V26zm5.4 1.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm-4.1 10c-1.8 0-2.8-1.1-2.8-3.1s1-3.1 2.8-3.1c1.4 0 2.5.9 2.6 2.2h-1.3c0-.7-.6-1.1-1.3-1.1-1 0-1.6.7-1.6 2s.6 2 1.6 2c.7 0 1.2-.4 1.4-1h1.2c-.1 1.3-1.2 2.2-2.6 2.2zm4.5 0c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-upper-roman-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M31.6 17v-1.2H33V17h-1.3zm0 10v-1.2H33V27h-1.3zm0 10v-1.2H33V37h-1.3z"/><path fill-rule="nonzero" d="M34.5 20H36v7h-1.5zM34.5 30H36v7h-1.5zM37.5 20H39v7h-1.5zM37.5 30H39v7h-1.5zM40.5 30H42v7h-1.5zM34.5 10H36v7h-1.5z"/></g></svg>',"list-num-upper-roman":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M15.1 17v-1.2h1.3V17H15zm0 10v-1.2h1.3V27H15zm0 10v-1.2h1.3V37H15z"/><path fill-rule="nonzero" d="M12 20h1.5v7H12zM12 30h1.5v7H12zM9 20h1.5v7H9zM9 30h1.5v7H9zM6 30h1.5v7H6zM12 10h1.5v7H12z"/></g></svg>',lock:'<svg width="24" height="24"><path d="M16.3 11c.2 0 .3 0 .5.2l.2.6v7.4c0 .3 0 .4-.2.6l-.6.2H7.8c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6v-7.4c0-.3 0-.4.2-.6l.5-.2H8V8c0-.8.3-1.5.9-2.1.6-.6 1.3-.9 2.1-.9h2c.8 0 1.5.3 2.1.9.6.6.9 1.3.9 2.1v3h.3zM10 8v3h4V8a1 1 0 00-.3-.7A1 1 0 0013 7h-2a1 1 0 00-.7.3 1 1 0 00-.3.7z" fill-rule="evenodd"/></svg>',ltr:'<svg width="24" height="24"><path d="M11 5h7a1 1 0 010 2h-1v11a1 1 0 01-2 0V7h-2v11a1 1 0 01-2 0v-6c-.5 0-1 0-1.4-.3A3.4 3.4 0 017.8 10a3.3 3.3 0 010-2.8 3.4 3.4 0 011.8-1.8L11 5zM4.4 16.2L6.2 15l-1.8-1.2a1 1 0 011.2-1.6l3 2a1 1 0 010 1.6l-3 2a1 1 0 11-1.2-1.6z" fill-rule="evenodd"/></svg>',"more-drawer":'<svg width="24" height="24"><path d="M6 10a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2zm12 0a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2zm-6 0a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2z" fill-rule="nonzero"/></svg>',"new-document":'<svg width="24" height="24"><path d="M14.4 3H7a2 2 0 00-2 2v14c0 1.1.9 2 2 2h10a2 2 0 002-2V7.6L14.4 3zM17 19H7V5h6v4h4v10z" fill-rule="nonzero"/></svg>',"new-tab":'<svg width="24" height="24"><path d="M15 13l2-2v8H5V7h8l-2 2H7v8h8v-4zm4-8v5.5l-2-2-5.6 5.5H10v-1.4L15.5 7l-2-2H19z" fill-rule="evenodd"/></svg>',"non-breaking":'<svg width="24" height="24"><path d="M11 11H8a1 1 0 110-2h3V6c0-.6.4-1 1-1s1 .4 1 1v3h3c.6 0 1 .4 1 1s-.4 1-1 1h-3v3c0 .6-.4 1-1 1a1 1 0 01-1-1v-3zm10 4v5H3v-5c0-.6.4-1 1-1s1 .4 1 1v3h14v-3c0-.6.4-1 1-1s1 .4 1 1z" fill-rule="evenodd"/></svg>',notice:'<svg width="24" height="24"><path d="M17.8 9.8L15.4 4 20 8.5v7L15.5 20h-7L4 15.5v-7L8.5 4h7l2.3 5.8zm0 0l2.2 5.7-2.3-5.8zM13 17v-2h-2v2h2zm0-4V7h-2v6h2z" fill-rule="evenodd"/></svg>',"ordered-list-rtl":'<svg width="24" height="24"><path d="M6 17h8a1 1 0 010 2H6a1 1 0 010-2zm0-6h8a1 1 0 010 2H6a1 1 0 010-2zm0-6h8a1 1 0 010 2H6a1 1 0 110-2zm13-1v3.5a.5.5 0 11-1 0V5h-.5a.5.5 0 110-1H19zm-1 8.8l.2.2h1.3a.5.5 0 110 1h-1.6a1 1 0 01-.9-1V13c0-.4.3-.8.6-1l1.2-.4.2-.3a.2.2 0 00-.2-.2h-1.3a.5.5 0 01-.5-.5c0-.3.2-.5.5-.5h1.6c.5 0 .9.4.9 1v.1c0 .4-.3.8-.6 1l-1.2.4-.2.3zm2 4.2v2c0 .6-.4 1-1 1h-1.5a.5.5 0 010-1h1.2a.3.3 0 100-.6h-1.3a.4.4 0 110-.8h1.3a.3.3 0 000-.6h-1.2a.5.5 0 110-1H19c.6 0 1 .4 1 1z" fill-rule="evenodd"/></svg>',"ordered-list":'<svg width="24" height="24"><path d="M10 17h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 110-2zM6 4v3.5c0 .3-.2.5-.5.5a.5.5 0 01-.5-.5V5h-.5a.5.5 0 010-1H6zm-1 8.8l.2.2h1.3c.3 0 .5.2.5.5s-.2.5-.5.5H4.9a1 1 0 01-.9-1V13c0-.4.3-.8.6-1l1.2-.4.2-.3a.2.2 0 00-.2-.2H4.5a.5.5 0 01-.5-.5c0-.3.2-.5.5-.5h1.6c.5 0 .9.4.9 1v.1c0 .4-.3.8-.6 1l-1.2.4-.2.3zM7 17v2c0 .6-.4 1-1 1H4.5a.5.5 0 010-1h1.2c.2 0 .3-.1.3-.3 0-.2-.1-.3-.3-.3H4.4a.4.4 0 110-.8h1.3c.2 0 .3-.1.3-.3 0-.2-.1-.3-.3-.3H4.5a.5.5 0 110-1H6c.6 0 1 .4 1 1z" fill-rule="evenodd"/></svg>',orientation:'<svg width="24" height="24"><path d="M7.3 6.4L1 13l6.4 6.5 6.5-6.5-6.5-6.5zM3.7 13l3.6-3.7L11 13l-3.7 3.7-3.6-3.7zM12 6l2.8 2.7c.3.3.3.8 0 1-.3.4-.9.4-1.2 0L9.2 5.7a.8.8 0 010-1.2L13.6.2c.3-.3.9-.3 1.2 0 .3.3.3.8 0 1.1L12 4h1a9 9 0 11-4.3 16.9l1.5-1.5A7 7 0 1013 6h-1z" fill-rule="nonzero"/></svg>',outdent:'<svg width="24" height="24"><path d="M7 5h12c.6 0 1 .4 1 1s-.4 1-1 1H7a1 1 0 110-2zm5 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 010-2zm0 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 010-2zm-5 4h12a1 1 0 010 2H7a1 1 0 010-2zm1.6-3.8a1 1 0 01-1.2 1.6l-3-2a1 1 0 010-1.6l3-2a1 1 0 011.2 1.6L6.8 12l1.8 1.2z" fill-rule="evenodd"/></svg>',"page-break":'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M5 11c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zm3 0h1c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 010-2zm4 0c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zm3 0h1c.6 0 1 .4 1 1s-.4 1-1 1h-1a1 1 0 010-2zm4 0c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zM7 3v5h10V3c0-.6.4-1 1-1s1 .4 1 1v7H5V3c0-.6.4-1 1-1s1 .4 1 1zM6 22a1 1 0 01-1-1v-7h14v7c0 .6-.4 1-1 1a1 1 0 01-1-1v-5H7v5c0 .6-.4 1-1 1z"/></g></svg>',paragraph:'<svg width="24" height="24"><path fill-rule="evenodd" d="M10 5h7a1 1 0 010 2h-1v11a1 1 0 01-2 0V7h-2v11a1 1 0 01-2 0v-6c-.5 0-1 0-1.4-.3A3.4 3.4 0 016.8 10a3.3 3.3 0 010-2.8 3.4 3.4 0 011.8-1.8L10 5z"/></svg>',"paste-column-after":'<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 012.8 2H18c1 0 2 .8 2 1.9V7h-2V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h7v2H6c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2H9.2A3 3 0 0112 1zm8 7v12h-6V8h6zm-1.5 1.5h-3v9h3v-9zM12 3a1 1 0 100 2 1 1 0 000-2z"/></svg>',"paste-column-before":'<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 012.8 2H18c1 0 2 .8 2 1.9V18c0 1-.8 2-1.9 2H11v-2h7V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v2H4V5c0-1 .8-2 1.9-2H9.2A3 3 0 0112 1zm-2 7v12H4V8h6zM8.5 9.5h-3v9h3v-9zM12 3a1 1 0 100 2 1 1 0 000-2z"/></svg>',"paste-row-after":'<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 012.8 2H18c1 0 2 .8 2 1.9V11h-2V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h14c0 1-.8 2-1.9 2H6c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2H9.2A3 3 0 0112 1zm10 11v5H8v-5h14zm-1.5 1.5h-11v2h11v-2zM12 3a1 1 0 100 2 1 1 0 000-2z"/></svg>',"paste-row-before":'<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 012.8 2H18c1 0 2 .8 2 1.9V7h-2V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h12v-4h2v4c0 1-.8 2-1.9 2H6c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2H9.2A3 3 0 0112 1zm10 7v5H8V8h14zm-1.5 1.5h-11v2h11v-2zM12 3a1 1 0 100 2 1 1 0 000-2z"/></svg>',"paste-text":'<svg width="24" height="24"><path d="M18 9V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h3V9h9zM9 20H6a2 2 0 01-2-2V5c0-1.1.9-2 2-2h3.2A3 3 0 0112 1a3 3 0 012.8 2H18a2 2 0 012 2v4h1v12H9v-1zm1.5-9.5v9h9v-9h-9zM12 3a1 1 0 00-1 1c0 .5.4 1 1 1s1-.5 1-1-.4-1-1-1zm0 9h6v2h-.5l-.5-1h-1v4h.8v1h-3.6v-1h.8v-4h-1l-.5 1H12v-2z" fill-rule="nonzero"/></svg>',paste:'<svg width="24" height="24"><path d="M18 9V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h3V9h9zM9 20H6a2 2 0 01-2-2V5c0-1.1.9-2 2-2h3.2A3 3 0 0112 1a3 3 0 012.8 2H18a2 2 0 012 2v4h1v12H9v-1zm1.5-9.5v9h9v-9h-9zM12 3a1 1 0 00-1 1c0 .5.4 1 1 1s1-.5 1-1-.4-1-1-1z" fill-rule="nonzero"/></svg>',"permanent-pen":'<svg width="24" height="24"><path d="M10.5 17.5L8 20H3v-3l3.5-3.5a2 2 0 010-3L14 3l1 1-7.3 7.3a1 1 0 000 1.4l3.6 3.6c.4.4 1 .4 1.4 0L20 9l1 1-7.6 7.6a2 2 0 01-2.8 0l-.1-.1z" fill-rule="nonzero"/></svg>',plus:'<svg width="24" height="24"><path d="M12 4c.5 0 1 .4 1 .9V11h6a1 1 0 01.1 2H13v6a1 1 0 01-2 .1V13H5a1 1 0 01-.1-2H11V5c0-.6.4-1 1-1z"/></svg>',preferences:'<svg width="24" height="24"><path d="M20.1 13.5l-1.9.2a5.8 5.8 0 01-.6 1.5l1.2 1.5c.4.4.3 1 0 1.4l-.7.7a1 1 0 01-1.4 0l-1.5-1.2a6.2 6.2 0 01-1.5.6l-.2 1.9c0 .5-.5.9-1 .9h-1a1 1 0 01-1-.9l-.2-1.9a5.8 5.8 0 01-1.5-.6l-1.5 1.2a1 1 0 01-1.4 0l-.7-.7a1 1 0 010-1.4l1.2-1.5a6.2 6.2 0 01-.6-1.5l-1.9-.2a1 1 0 01-.9-1v-1c0-.5.4-1 .9-1l1.9-.2a5.8 5.8 0 01.6-1.5L5.2 7.3a1 1 0 010-1.4l.7-.7a1 1 0 011.4 0l1.5 1.2a6.2 6.2 0 011.5-.6l.2-1.9c0-.5.5-.9 1-.9h1c.5 0 1 .4 1 .9l.2 1.9a5.8 5.8 0 011.5.6l1.5-1.2a1 1 0 011.4 0l.7.7c.3.4.4 1 0 1.4l-1.2 1.5a6.2 6.2 0 01.6 1.5l1.9.2c.5 0 .9.5.9 1v1c0 .5-.4 1-.9 1zM12 15a3 3 0 100-6 3 3 0 000 6z" fill-rule="evenodd"/></svg>',preview:'<svg width="24" height="24"><path d="M3.5 12.5c.5.8 1.1 1.6 1.8 2.3 2 2 4.2 3.2 6.7 3.2s4.7-1.2 6.7-3.2a16.2 16.2 0 002.1-2.8 15.7 15.7 0 00-2.1-2.8c-2-2-4.2-3.2-6.7-3.2a9.3 9.3 0 00-6.7 3.2A16.2 16.2 0 003.2 12c0 .2.2.3.3.5zm-2.4-1l.7-1.2L4 7.8C6.2 5.4 8.9 4 12 4c3 0 5.8 1.4 8.1 3.8a18.2 18.2 0 012.8 3.7v1l-.7 1.2-2.1 2.5c-2.3 2.4-5 3.8-8.1 3.8-3 0-5.8-1.4-8.1-3.8a18.2 18.2 0 01-2.8-3.7 1 1 0 010-1zm12-3.3a2 2 0 102.7 2.6 4 4 0 11-2.6-2.6z" fill-rule="nonzero"/></svg>',print:'<svg width="24" height="24"><path d="M18 8H6a3 3 0 00-3 3v6h2v3h14v-3h2v-6a3 3 0 00-3-3zm-1 10H7v-4h10v4zm.5-5c-.8 0-1.5-.7-1.5-1.5s.7-1.5 1.5-1.5 1.5.7 1.5 1.5-.7 1.5-1.5 1.5zm.5-8H6v2h12V5z" fill-rule="nonzero"/></svg>',quote:'<svg width="24" height="24"><path d="M7.5 17h.9c.4 0 .7-.2.9-.6L11 13V8c0-.6-.4-1-1-1H6a1 1 0 00-1 1v4c0 .6.4 1 1 1h2l-1.3 2.7a1 1 0 00.8 1.3zm8 0h.9c.4 0 .7-.2.9-.6L19 13V8c0-.6-.4-1-1-1h-4a1 1 0 00-1 1v4c0 .6.4 1 1 1h2l-1.3 2.7a1 1 0 00.8 1.3z" fill-rule="nonzero"/></svg>',redo:'<svg width="24" height="24"><path d="M17.6 10H12c-2.8 0-4.4 1.4-4.9 3.5-.4 2 .3 4 1.4 4.6a1 1 0 11-1 1.8c-2-1.2-2.9-4.1-2.3-6.8.6-3 3-5.1 6.8-5.1h5.6l-3.3-3.3a1 1 0 111.4-1.4l5 5a1 1 0 010 1.4l-5 5a1 1 0 01-1.4-1.4l3.3-3.3z" fill-rule="nonzero"/></svg>',reload:'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M5 22.1l-1.2-4.7v-.2a1 1 0 011-1l5 .4a1 1 0 11-.2 2l-2.2-.2a7.8 7.8 0 008.4.2 7.5 7.5 0 003.5-6.4 1 1 0 112 0 9.5 9.5 0 01-4.5 8 9.9 9.9 0 01-10.2 0l.4 1.4a1 1 0 11-2 .5zM13.6 7.4c0-.5.5-1 1-.9l2.8.2a8 8 0 00-9.5-1 7.5 7.5 0 00-3.6 7 1 1 0 01-2 0 9.5 9.5 0 014.5-8.6 10 10 0 0110.9.3l-.3-1a1 1 0 012-.5l1.1 4.8a1 1 0 01-1 1.2l-5-.4a1 1 0 01-.9-1z"/></g></svg>',"remove-formatting":'<svg width="24" height="24"><path d="M13.2 6a1 1 0 010 .2l-2.6 10a1 1 0 01-1 .8h-.2a.8.8 0 01-.8-1l2.6-10H8a1 1 0 110-2h9a1 1 0 010 2h-3.8zM5 18h7a1 1 0 010 2H5a1 1 0 010-2zm13 1.5L16.5 18 15 19.5a.7.7 0 01-1-1l1.5-1.5-1.5-1.5a.7.7 0 011-1l1.5 1.5 1.5-1.5a.7.7 0 011 1L17.5 17l1.5 1.5a.7.7 0 01-1 1z" fill-rule="evenodd"/></svg>',remove:'<svg width="24" height="24"><path d="M16 7h3a1 1 0 010 2h-1v9a3 3 0 01-3 3H9a3 3 0 01-3-3V9H5a1 1 0 110-2h3V6a3 3 0 013-3h2a3 3 0 013 3v1zm-2 0V6c0-.6-.4-1-1-1h-2a1 1 0 00-1 1v1h4zm2 2H8v9c0 .6.4 1 1 1h6c.6 0 1-.4 1-1V9zm-7 3a1 1 0 012 0v4a1 1 0 01-2 0v-4zm4 0a1 1 0 012 0v4a1 1 0 01-2 0v-4z" fill-rule="nonzero"/></svg>',"resize-handle":'<svg width="10" height="10"><g fill-rule="nonzero"><path d="M8.1 1.1A.5.5 0 119 2l-7 7A.5.5 0 111 8l7-7zM8.1 5.1A.5.5 0 119 6l-3 3A.5.5 0 115 8l3-3z"/></g></svg>',resize:'<svg width="24" height="24"><path d="M4 5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h6c.3 0 .5.1.7.3.2.2.3.4.3.7 0 .3-.1.5-.3.7a1 1 0 01-.7.3H7.4L18 16.6V13c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3.3 0 .5.1.7.3.2.2.3.4.3.7v6c0 .3-.1.5-.3.7a1 1 0 01-.7.3h-6a1 1 0 01-.7-.3 1 1 0 01-.3-.7c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h3.6L6 7.4V11c0 .3-.1.5-.3.7a1 1 0 01-.7.3 1 1 0 01-.7-.3A1 1 0 014 11V5z" fill-rule="evenodd"/></svg>',"restore-draft":'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M17 13c0 .6-.4 1-1 1h-4V8c0-.6.4-1 1-1s1 .4 1 1v4h2c.6 0 1 .4 1 1z"/><path d="M4.7 10H9a1 1 0 010 2H3a1 1 0 01-1-1V5a1 1 0 112 0v3l2.5-2.4a9.2 9.2 0 0110.8-1.5A9 9 0 0113.4 21c-2.4.1-4.7-.7-6.5-2.2a1 1 0 111.3-1.5 7.2 7.2 0 0011.6-3.7 7 7 0 00-3.5-7.7A7.2 7.2 0 008 7L4.7 10z" fill-rule="nonzero"/></g></svg>',"rotate-left":'<svg width="24" height="24"><path d="M4.7 10H9a1 1 0 010 2H3a1 1 0 01-1-1V5a1 1 0 112 0v3l2.5-2.4a9.2 9.2 0 0110.8-1.5A9 9 0 0113.4 21c-2.4.1-4.7-.7-6.5-2.2a1 1 0 111.3-1.5 7.2 7.2 0 0011.6-3.7 7 7 0 00-3.5-7.7A7.2 7.2 0 008 7L4.7 10z" fill-rule="nonzero"/></svg>',"rotate-right":'<svg width="24" height="24"><path d="M20 8V5a1 1 0 012 0v6c0 .6-.4 1-1 1h-6a1 1 0 010-2h4.3L16 7A7.2 7.2 0 007.7 6a7 7 0 003 13.1c1.9.1 3.7-.5 5-1.7a1 1 0 011.4 1.5A9.2 9.2 0 012.2 14c-.9-3.9 1-8 4.5-9.9 3.5-1.9 8-1.3 10.8 1.5L20 8z" fill-rule="nonzero"/></svg>',rtl:'<svg width="24" height="24"><path d="M8 5h8v2h-2v12h-2V7h-2v12H8v-7c-.5 0-1 0-1.4-.3A3.4 3.4 0 014.8 10a3.3 3.3 0 010-2.8 3.4 3.4 0 011.8-1.8L8 5zm12 11.2a1 1 0 11-1 1.6l-3-2a1 1 0 010-1.6l3-2a1 1 0 111 1.6L18.4 15l1.8 1.2z" fill-rule="evenodd"/></svg>',save:'<svg width="24" height="24"><path d="M5 16h14a2 2 0 012 2v2a2 2 0 01-2 2H5a2 2 0 01-2-2v-2c0-1.1.9-2 2-2zm0 2v2h14v-2H5zm10 0h2v2h-2v-2zm-4-6.4L8.7 9.3a1 1 0 10-1.4 1.4l4 4c.4.4 1 .4 1.4 0l4-4a1 1 0 10-1.4-1.4L13 11.6V4a1 1 0 00-2 0v7.6z" fill-rule="nonzero"/></svg>',search:'<svg width="24" height="24"><path d="M16 17.3a8 8 0 111.4-1.4l4.3 4.4a1 1 0 01-1.4 1.4l-4.4-4.3zm-5-.3a6 6 0 100-12 6 6 0 000 12z" fill-rule="nonzero"/></svg>',"select-all":'<svg width="24" height="24"><path d="M3 5h2V3a2 2 0 00-2 2zm0 8h2v-2H3v2zm4 8h2v-2H7v2zM3 9h2V7H3v2zm10-6h-2v2h2V3zm6 0v2h2a2 2 0 00-2-2zM5 21v-2H3c0 1.1.9 2 2 2zm-2-4h2v-2H3v2zM9 3H7v2h2V3zm2 18h2v-2h-2v2zm8-8h2v-2h-2v2zm0 8a2 2 0 002-2h-2v2zm0-12h2V7h-2v2zm0 8h2v-2h-2v2zm-4 4h2v-2h-2v2zm0-16h2V3h-2v2zM7 17h10V7H7v10zm2-8h6v6H9V9z" fill-rule="nonzero"/></svg>',selected:'<svg width="24" height="24"><path fill-rule="nonzero" d="M6 4h12a2 2 0 012 2v12a2 2 0 01-2 2H6a2 2 0 01-2-2V6c0-1.1.9-2 2-2zm3.6 10.9L7 12.3a.7.7 0 00-1 1L9.6 17 18 8.6a.7.7 0 000-1 .7.7 0 00-1 0l-7.4 7.3z"/></svg>',settings:'<svg width="24" height="24"><path d="M11 6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8v.3c0 .2 0 .3-.2.5l-.6.2H7.8c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6V8H5a1 1 0 110-2h2v-.3c0-.2 0-.3.2-.5l.5-.2h2.5c.3 0 .4 0 .6.2l.2.5V6zM8 8h2V6H8v2zm9 2.8v.2h2c.6 0 1 .4 1 1s-.4 1-1 1h-2v.3c0 .2 0 .3-.2.5l-.6.2h-2.4c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6V13H5a1 1 0 010-2h8v-.3c0-.2 0-.3.2-.5l.6-.2h2.4c.3 0 .4 0 .6.2l.2.6zM14 13h2v-2h-2v2zm-3 2.8v.2h8c.6 0 1 .4 1 1s-.4 1-1 1h-8v.3c0 .2 0 .3-.2.5l-.6.2H7.8c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6V18H5a1 1 0 010-2h2v-.3c0-.2 0-.3.2-.5l.5-.2h2.5c.3 0 .4 0 .6.2l.2.6zM8 18h2v-2H8v2z" fill-rule="evenodd"/></svg>',sharpen:'<svg width="24" height="24"><path d="M16 6l4 4-8 9-8-9 4-4h8zm-4 10.2l5.5-6.2-.1-.1H12v-.3h5.1l-.2-.2H12V9h4.6l-.2-.2H12v-.3h4.1l-.2-.2H12V8h3.6l-.2-.2H8.7L6.5 10l.1.1H12v.3H6.9l.2.2H12v.3H7.3l.2.2H12v.3H7.7l.3.2h4v.3H8.2l.2.2H12v.3H8.6l.3.2H12v.3H9l.3.2H12v.3H9.5l.2.2H12v.3h-2l.2.2H12v.3h-1.6l.2.2H12v.3h-1.1l.2.2h.9v.3h-.7l.2.2h.5v.3h-.3l.3.2z" fill-rule="evenodd"/></svg>',sourcecode:'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M9.8 15.7c.3.3.3.8 0 1-.3.4-.9.4-1.2 0l-4.4-4.1a.8.8 0 010-1.2l4.4-4.2c.3-.3.9-.3 1.2 0 .3.3.3.8 0 1.1L6 12l3.8 3.7zM14.2 15.7c-.3.3-.3.8 0 1 .4.4.9.4 1.2 0l4.4-4.1c.3-.3.3-.9 0-1.2l-4.4-4.2a.8.8 0 00-1.2 0c-.3.3-.3.8 0 1.1L18 12l-3.8 3.7z"/></g></svg>',"spell-check":'<svg width="24" height="24"><path d="M6 8v3H5V5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h2c.3 0 .5.1.7.3.2.2.3.4.3.7v6H8V8H6zm0-3v2h2V5H6zm13 0h-3v5h3v1h-3a1 1 0 01-.7-.3 1 1 0 01-.3-.7V5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h3v1zm-5 1.5l-.1.7c-.1.2-.3.3-.6.3.3 0 .5.1.6.3l.1.7V10c0 .3-.1.5-.3.7a1 1 0 01-.7.3h-3V4h3c.3 0 .5.1.7.3.2.2.3.4.3.7v1.5zM13 10V8h-2v2h2zm0-3V5h-2v2h2zm3 5l1 1-6.5 7L7 15.5l1.3-1 2.2 2.2L16 12z" fill-rule="evenodd"/></svg>',"strike-through":'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M15.6 8.5c-.5-.7-1-1.1-1.3-1.3-.6-.4-1.3-.6-2-.6-2.7 0-2.8 1.7-2.8 2.1 0 1.6 1.8 2 3.2 2.3 4.4.9 4.6 2.8 4.6 3.9 0 1.4-.7 4.1-5 4.1A6.2 6.2 0 017 16.4l1.5-1.1c.4.6 1.6 2 3.7 2 1.6 0 2.5-.4 3-1.2.4-.8.3-2-.8-2.6-.7-.4-1.6-.7-2.9-1-1-.2-3.9-.8-3.9-3.6C7.6 6 10.3 5 12.4 5c2.9 0 4.2 1.6 4.7 2.4l-1.5 1.1z"/><path d="M5 11h14a1 1 0 010 2H5a1 1 0 010-2z" fill-rule="nonzero"/></g></svg>',subscript:'<svg width="24" height="24"><path d="M10.4 10l4.6 4.6-1.4 1.4L9 11.4 4.4 16 3 14.6 7.6 10 3 5.4 4.4 4 9 8.6 13.6 4 15 5.4 10.4 10zM21 19h-5v-1l1-.8 1.7-1.6c.3-.4.5-.8.5-1.2 0-.3 0-.6-.2-.7-.2-.2-.5-.3-.9-.3a2 2 0 00-.8.2l-.7.3-.4-1.1 1-.6 1.2-.2c.8 0 1.4.3 1.8.7.4.4.6.9.6 1.5s-.2 1.1-.5 1.6a8 8 0 01-1.3 1.3l-.6.6h2.6V19z" fill-rule="nonzero"/></svg>',superscript:'<svg width="24" height="24"><path d="M15 9.4L10.4 14l4.6 4.6-1.4 1.4L9 15.4 4.4 20 3 18.6 7.6 14 3 9.4 4.4 8 9 12.6 13.6 8 15 9.4zm5.9 1.6h-5v-1l1-.8 1.7-1.6c.3-.5.5-.9.5-1.3 0-.3 0-.5-.2-.7-.2-.2-.5-.3-.9-.3l-.8.2-.7.4-.4-1.2c.2-.2.5-.4 1-.5.3-.2.8-.2 1.2-.2.8 0 1.4.2 1.8.6.4.4.6 1 .6 1.6 0 .5-.2 1-.5 1.5l-1.3 1.4-.6.5h2.6V11z" fill-rule="nonzero"/></svg>',"table-cell-properties":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm-8 9H5v5h6v-5zm8 0h-6v5h6v-5zm-8-7H5v5h6V6z"/></svg>',"table-cell-select-all":'<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm0 2H5v12h14V6z"/><path d="M13 6v5h6v2h-6v5h-2v-5H5v-2h6V6h2z" opacity=".2"/></g></svg>',"table-cell-select-inner":'<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm0 2H5v12h14V6z" opacity=".2"/><path d="M13 6v5h6v2h-6v5h-2v-5H5v-2h6V6h2z"/></g></svg>',"table-delete-column":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm-4 4h-2V6h-2v2H9V6H5v12h4v-2h2v2h2v-2h2v2h4V6h-4v2zm.3.5l1 1.2-3 2.3 3 2.3-1 1.2L12 13l-3.3 2.6-1-1.2 3-2.3-3-2.3 1-1.2L12 11l3.3-2.5z"/></svg>',"table-delete-row":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm0 2H5v3h2.5v2H5v2h2.5v2H5v3h14v-3h-2.5v-2H19v-2h-2.5V9H19V6zm-4.7 1.8l1.2 1L13 12l2.6 3.3-1.2 1-2.3-3-2.3 3-1.2-1L11 12 8.5 8.7l1.2-1 2.3 3 2.3-3z"/></svg>',"table-delete-table":'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM5 6v12h14V6H5z"/><path d="M14.4 8.6l1 1-2.3 2.4 2.3 2.4-1 1-2.4-2.3-2.4 2.3-1-1 2.3-2.4-2.3-2.4 1-1 2.4 2.3z"/></g></svg>',"table-insert-column-after":'<svg width="24" height="24"><path fill-rule="nonzero" d="M20 4c.6 0 1 .4 1 1v2a1 1 0 01-2 0V6h-8v12h8v-1a1 1 0 012 0v2c0 .5-.4 1-.9 1H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h15zM9 13H5v5h4v-5zm7-5c.5 0 1 .4 1 .9V11h2a1 1 0 01.1 2H17v2a1 1 0 01-2 .1V13h-2a1 1 0 01-.1-2H15V9c0-.6.4-1 1-1zM9 6H5v5h4V6z"/></svg>',"table-insert-column-before":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H4a1 1 0 01-1-1v-2a1 1 0 012 0v1h8V6H5v1a1 1 0 11-2 0V5c0-.6.4-1 1-1h15zm0 9h-4v5h4v-5zM8 8c.5 0 1 .4 1 .9V11h2a1 1 0 01.1 2H9v2a1 1 0 01-2 .1V13H5a1 1 0 01-.1-2H7V9c0-.6.4-1 1-1zm11-2h-4v5h4V6z"/></svg>',"table-insert-row-above":'<svg width="24" height="24"><path fill-rule="nonzero" d="M6 4a1 1 0 110 2H5v6h14V6h-1a1 1 0 010-2h2c.6 0 1 .4 1 1v13a2 2 0 01-2 2H5a2 2 0 01-2-2V5c0-.6.4-1 1-1h2zm5 10H5v4h6v-4zm8 0h-6v4h6v-4zM12 3c.5 0 1 .4 1 .9V6h2a1 1 0 010 2h-2v2a1 1 0 01-2 .1V8H9a1 1 0 010-2h2V4c0-.6.4-1 1-1z"/></svg>',"table-insert-row-after":'<svg width="24" height="24"><path fill-rule="nonzero" d="M12 13c.5 0 1 .4 1 .9V16h2a1 1 0 01.1 2H13v2a1 1 0 01-2 .1V18H9a1 1 0 01-.1-2H11v-2c0-.6.4-1 1-1zm6 7a1 1 0 010-2h1v-6H5v6h1a1 1 0 010 2H4a1 1 0 01-1-1V6c0-1.1.9-2 2-2h14a2 2 0 012 2v13c0 .5-.4 1-.9 1H18zM11 6H5v4h6V6zm8 0h-6v4h6V6z"/></svg>',"table-left-header":'<svg width="24" height="24"><path d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm0 9h-4v5h4v-5zm-6 0H9v5h4v-5zm0-7H9v5h4V6zm6 0h-4v5h4V6z"/></svg>',"table-merge-cells":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM5 15.5V18h3v-2.5H5zm14-5h-9V18h9v-7.5zM19 6h-4v2.5h4V6zM8 6H5v2.5h3V6zm5 0h-3v2.5h3V6zm-8 7.5h3v-3H5v3z"/></svg>',"table-row-properties":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM5 15v3h6v-3H5zm14 0h-6v3h6v-3zm0-9h-6v3h6V6zM5 9h6V6H5v3z"/></svg>',"table-split-cells":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM8 15.5H5V18h3v-2.5zm11-5h-9V18h9v-7.5zm-2.5 1l1 1-2 2 2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2zm-8.5-1H5v3h3v-3zM19 6h-4v2.5h4V6zM8 6H5v2.5h3V6zm5 0h-3v2.5h3V6z"/></svg>',"table-top-header":'<svg width="24" height="24"><path d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm-8 11H5v3h6v-3zm8 0h-6v3h6v-3zm0-5h-6v3h6v-3zM5 13h6v-3H5v3z"/></svg>',table:'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM5 14v4h6v-4H5zm14 0h-6v4h6v-4zm0-6h-6v4h6V8zM5 12h6V8H5v4z"/></svg>',template:'<svg width="24" height="24"><path d="M19 19v-1H5v1h14zM9 16v-4a5 5 0 116 0v4h4a2 2 0 012 2v3H3v-3c0-1.1.9-2 2-2h4zm4 0v-5l.8-.6a3 3 0 10-3.6 0l.8.6v5h2z" fill-rule="nonzero"/></svg>',"temporary-placeholder":'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M9 7.6V6h2.5V4.5a.5.5 0 111 0V6H15v1.6a8 8 0 11-6 0zm-2.6 5.3a.5.5 0 00.3.6c.3 0 .6 0 .6-.3l.1-.2a5 5 0 013.3-2.8c.3-.1.4-.4.4-.6-.1-.3-.4-.5-.6-.4a6 6 0 00-4.1 3.7z"/><circle cx="14" cy="4" r="1"/><circle cx="12" cy="2" r="1"/><circle cx="10" cy="4" r="1"/></g></svg>',"text-color":'<svg width="24" height="24"><g fill-rule="evenodd"><path id="tox-icon-text-color__color" d="M3 18h18v3H3z"/><path d="M8.7 16h-.8a.5.5 0 01-.5-.6l2.7-9c.1-.3.3-.4.5-.4h2.8c.2 0 .4.1.5.4l2.7 9a.5.5 0 01-.5.6h-.8a.5.5 0 01-.4-.4l-.7-2.2c0-.3-.3-.4-.5-.4h-3.4c-.2 0-.4.1-.5.4l-.7 2.2c0 .3-.2.4-.4.4zm2.6-7.6l-.6 2a.5.5 0 00.5.6h1.6a.5.5 0 00.5-.6l-.6-2c0-.3-.3-.4-.5-.4h-.4c-.2 0-.4.1-.5.4z"/></g></svg>',toc:'<svg width="24" height="24"><path d="M5 5c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 110-2zm3 0h11c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 110-2zm-3 8c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zm3 0h11c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 010-2zm0-4c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 110-2zm3 0h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm-3 8c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zm3 0h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2z" fill-rule="evenodd"/></svg>',translate:'<svg width="24" height="24"><path d="M12.7 14.3l-.3.7-.4.7-2.2-2.2-3.1 3c-.3.4-.8.4-1 0a.7.7 0 010-1l3.1-3A12.4 12.4 0 016.7 9H8a10.1 10.1 0 001.7 2.4c.5-.5 1-1.1 1.4-1.8l.9-2H4.7a.7.7 0 110-1.5h4.4v-.7c0-.4.3-.8.7-.8.4 0 .7.4.7.8v.7H15c.4 0 .8.3.8.7 0 .4-.4.8-.8.8h-1.4a12.3 12.3 0 01-1 2.4 13.5 13.5 0 01-1.7 2.3l1.9 1.8zm4.3-3l2.7 7.3a.5.5 0 01-.4.7 1 1 0 01-1-.7l-.6-1.5h-3.4l-.6 1.5a1 1 0 01-1 .7.5.5 0 01-.4-.7l2.7-7.4a1 1 0 012 0zm-2.2 4.4h2.4L16 12.5l-1.2 3.2z" fill-rule="evenodd"/></svg>',underline:'<svg width="24" height="24"><path d="M16 5c.6 0 1 .4 1 1v5.5a4 4 0 01-.4 1.8l-1 1.4a5.3 5.3 0 01-5.5 1 5 5 0 01-1.6-1c-.5-.4-.8-.9-1.1-1.4a4 4 0 01-.4-1.8V6c0-.6.4-1 1-1s1 .4 1 1v5.5c0 .3 0 .6.2 1l.6.7a3.3 3.3 0 002.2.8 3.4 3.4 0 002.2-.8c.3-.2.4-.5.6-.8l.2-.9V6c0-.6.4-1 1-1zM8 17h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 010-2z" fill-rule="evenodd"/></svg>',undo:'<svg width="24" height="24"><path d="M6.4 8H12c3.7 0 6.2 2 6.8 5.1.6 2.7-.4 5.6-2.3 6.8a1 1 0 01-1-1.8c1.1-.6 1.8-2.7 1.4-4.6-.5-2.1-2.1-3.5-4.9-3.5H6.4l3.3 3.3a1 1 0 11-1.4 1.4l-5-5a1 1 0 010-1.4l5-5a1 1 0 011.4 1.4L6.4 8z" fill-rule="nonzero"/></svg>',unlink:'<svg width="24" height="24"><path d="M6.2 12.3a1 1 0 011.4 1.4l-2 2a2 2 0 102.6 2.8l4.8-4.8a1 1 0 000-1.4 1 1 0 111.4-1.3 2.9 2.9 0 010 4L9.6 20a3.9 3.9 0 01-5.5-5.5l2-2zm11.6-.6a1 1 0 01-1.4-1.4l2.1-2a2 2 0 10-2.7-2.8L11 10.3a1 1 0 000 1.4A1 1 0 119.6 13a2.9 2.9 0 010-4L14.4 4a3.9 3.9 0 015.5 5.5l-2 2zM7.6 6.3a.8.8 0 01-1 1.1L3.3 4.2a.7.7 0 111-1l3.2 3.1zM5.1 8.6a.8.8 0 010 1.5H3a.8.8 0 010-1.5H5zm5-3.5a.8.8 0 01-1.5 0V3a.8.8 0 011.5 0V5zm6 11.8a.8.8 0 011-1l3.2 3.2a.8.8 0 01-1 1L16 17zm-2.2 2a.8.8 0 011.5 0V21a.8.8 0 01-1.5 0V19zm5-3.5a.7.7 0 110-1.5H21a.8.8 0 010 1.5H19z" fill-rule="nonzero"/></svg>',unlock:'<svg width="24" height="24"><path d="M16 5c.8 0 1.5.3 2.1.9.6.6.9 1.3.9 2.1v3h-2V8a1 1 0 00-.3-.7A1 1 0 0016 7h-2a1 1 0 00-.7.3 1 1 0 00-.3.7v3h.3c.2 0 .3 0 .5.2l.2.6v7.4c0 .3 0 .4-.2.6l-.6.2H4.8c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6v-7.4c0-.3 0-.4.2-.6l.5-.2H11V8c0-.8.3-1.5.9-2.1.6-.6 1.3-.9 2.1-.9h2z" fill-rule="evenodd"/></svg>',"unordered-list":'<svg width="24" height="24"><path d="M11 5h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0 6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0 6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zM4.5 6c0-.4.1-.8.4-1 .3-.4.7-.5 1.1-.5.4 0 .8.1 1 .4.4.3.5.7.5 1.1 0 .4-.1.8-.4 1-.3.4-.7.5-1.1.5-.4 0-.8-.1-1-.4-.4-.3-.5-.7-.5-1.1zm0 6c0-.4.1-.8.4-1 .3-.4.7-.5 1.1-.5.4 0 .8.1 1 .4.4.3.5.7.5 1.1 0 .4-.1.8-.4 1-.3.4-.7.5-1.1.5-.4 0-.8-.1-1-.4-.4-.3-.5-.7-.5-1.1zm0 6c0-.4.1-.8.4-1 .3-.4.7-.5 1.1-.5.4 0 .8.1 1 .4.4.3.5.7.5 1.1 0 .4-.1.8-.4 1-.3.4-.7.5-1.1.5-.4 0-.8-.1-1-.4-.4-.3-.5-.7-.5-1.1z" fill-rule="evenodd"/></svg>',unselected:'<svg width="24" height="24"><path fill-rule="nonzero" d="M6 4h12a2 2 0 012 2v12a2 2 0 01-2 2H6a2 2 0 01-2-2V6c0-1.1.9-2 2-2zm0 1a1 1 0 00-1 1v12c0 .6.4 1 1 1h12c.6 0 1-.4 1-1V6c0-.6-.4-1-1-1H6z"/></svg>',upload:'<svg width="24" height="24"><path d="M18 19v-2a1 1 0 012 0v3c0 .6-.4 1-1 1H5a1 1 0 01-1-1v-3a1 1 0 012 0v2h12zM11 6.4L8.7 8.7a1 1 0 01-1.4-1.4l4-4a1 1 0 011.4 0l4 4a1 1 0 11-1.4 1.4L13 6.4V16a1 1 0 01-2 0V6.4z" fill-rule="nonzero"/></svg>',user:'<svg width="24" height="24"><path d="M12 24a12 12 0 110-24 12 12 0 010 24zm-8.7-5.3a11 11 0 0017.4 0C19.4 16.3 14.6 15 12 15c-2.6 0-7.4 1.3-8.7 3.7zM12 13c2.2 0 4-2 4-4.5S14.2 4 12 4 8 6 8 8.5 9.8 13 12 13z" fill-rule="nonzero"/></svg>',visualblocks:'<svg width="24" height="24"><path d="M9 19v2H7v-2h2zm-4 0v2a2 2 0 01-2-2h2zm8 0v2h-2v-2h2zm8 0a2 2 0 01-2 2v-2h2zm-4 0v2h-2v-2h2zM15 7a1 1 0 010 2v7a1 1 0 01-2 0V9h-1v7a1 1 0 01-2 0v-4a2.5 2.5 0 01-.2-5H15zM5 15v2H3v-2h2zm16 0v2h-2v-2h2zM5 11v2H3v-2h2zm16 0v2h-2v-2h2zM5 7v2H3V7h2zm16 0v2h-2V7h2zM5 3v2H3c0-1.1.9-2 2-2zm8 0v2h-2V3h2zm6 0a2 2 0 012 2h-2V3zM9 3v2H7V3h2zm8 0v2h-2V3h2z" fill-rule="evenodd"/></svg>',visualchars:'<svg width="24" height="24"><path d="M10 5h7a1 1 0 010 2h-1v11a1 1 0 01-2 0V7h-2v11a1 1 0 01-2 0v-6c-.5 0-1 0-1.4-.3A3.4 3.4 0 016.8 10a3.3 3.3 0 010-2.8 3.4 3.4 0 011.8-1.8L10 5z" fill-rule="evenodd"/></svg>',warning:'<svg width="24" height="24"><path d="M19.8 18.3c.2.5.3.9 0 1.2-.1.3-.5.5-1 .5H5.2c-.5 0-.9-.2-1-.5-.3-.3-.2-.7 0-1.2L11 4.7l.5-.5.5-.2c.2 0 .3 0 .5.2.2 0 .3.3.5.5l6.8 13.6zM12 18c.3 0 .5-.1.7-.3.2-.2.3-.4.3-.7a1 1 0 00-.3-.7 1 1 0 00-.7-.3 1 1 0 00-.7.3 1 1 0 00-.3.7c0 .3.1.5.3.7.2.2.4.3.7.3zm.7-3l.3-4a1 1 0 00-.3-.7 1 1 0 00-.7-.3 1 1 0 00-.7.3 1 1 0 00-.3.7l.3 4h1.4z" fill-rule="evenodd"/></svg>',"zoom-in":'<svg width="24" height="24"><path d="M16 17.3a8 8 0 111.4-1.4l4.3 4.4a1 1 0 01-1.4 1.4l-4.4-4.3zm-5-.3a6 6 0 100-12 6 6 0 000 12zm-1-9a1 1 0 012 0v6a1 1 0 01-2 0V8zm-2 4a1 1 0 010-2h6a1 1 0 010 2H8z" fill-rule="nonzero"/></svg>',"zoom-out":'<svg width="24" height="24"><path d="M16 17.3a8 8 0 111.4-1.4l4.3 4.4a1 1 0 01-1.4 1.4l-4.4-4.3zm-5-.3a6 6 0 100-12 6 6 0 000 12zm-3-5a1 1 0 010-2h6a1 1 0 010 2H8z" fill-rule="nonzero"/></svg>'}});
\ No newline at end of file
+tinymce.IconManager.add("default",{icons:{"accessibility-check":'<svg width="24" height="24"><path d="M12 2a2 2 0 012 2 2 2 0 01-2 2 2 2 0 01-2-2c0-1.1.9-2 2-2zm8 7h-5v12c0 .6-.4 1-1 1a1 1 0 01-1-1v-5c0-.6-.4-1-1-1a1 1 0 00-1 1v5c0 .6-.4 1-1 1a1 1 0 01-1-1V9H4a1 1 0 110-2h16c.6 0 1 .4 1 1s-.4 1-1 1z" fill-rule="nonzero"/></svg>',"action-next":'<svg width="24" height="24"><path fill-rule="nonzero" d="M5.7 7.3a1 1 0 00-1.4 1.4l7.7 7.7 7.7-7.7a1 1 0 10-1.4-1.4L12 13.6 5.7 7.3z"/></svg>',"action-prev":'<svg width="24" height="24"><path fill-rule="nonzero" d="M18.3 15.7a1 1 0 001.4-1.4L12 6.6l-7.7 7.7a1 1 0 001.4 1.4L12 9.4l6.3 6.3z"/></svg>',"align-center":'<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm3 4h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 110-2zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 010-2zm-3-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2z" fill-rule="evenodd"/></svg>',"align-justify":'<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm0 4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm0 4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2zm0 4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2z" fill-rule="evenodd"/></svg>',"align-left":'<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm0 4h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2zm0-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2z" fill-rule="evenodd"/></svg>',"align-none":'<svg width="24" height="24"><path d="M14.2 5L13 7H5a1 1 0 110-2h9.2zm4 0h.8a1 1 0 010 2h-2l1.2-2zm-6.4 4l-1.2 2H5a1 1 0 010-2h6.8zm4 0H19a1 1 0 010 2h-4.4l1.2-2zm-6.4 4l-1.2 2H5a1 1 0 010-2h4.4zm4 0H19a1 1 0 010 2h-6.8l1.2-2zM7 17l-1.2 2H5a1 1 0 010-2h2zm4 0h8a1 1 0 010 2H9.8l1.2-2zm5.2-13.5l1.3.7-9.7 16.3-1.3-.7 9.7-16.3z" fill-rule="evenodd"/></svg>',"align-right":'<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm6 4h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm-6-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2z" fill-rule="evenodd"/></svg>',"arrow-left":'<svg width="24" height="24"><path d="M5.6 13l12 6a1 1 0 001.4-1V6a1 1 0 00-1.4-.9l-12 6a1 1 0 000 1.8z" fill-rule="evenodd"/></svg>',"arrow-right":'<svg width="24" height="24"><path d="M18.5 13l-12 6A1 1 0 015 18V6a1 1 0 011.4-.9l12 6a1 1 0 010 1.8z" fill-rule="evenodd"/></svg>',bold:'<svg width="24" height="24"><path d="M7.8 19c-.3 0-.5 0-.6-.2l-.2-.5V5.7c0-.2 0-.4.2-.5l.6-.2h5c1.5 0 2.7.3 3.5 1 .7.6 1.1 1.4 1.1 2.5a3 3 0 01-.6 1.9c-.4.6-1 1-1.6 1.2.4.1.9.3 1.3.6s.8.7 1 1.2c.4.4.5 1 .5 1.6 0 1.3-.4 2.3-1.3 3-.8.7-2.1 1-3.8 1H7.8zm5-8.3c.6 0 1.2-.1 1.6-.5.4-.3.6-.7.6-1.3 0-1.1-.8-1.7-2.3-1.7H9.3v3.5h3.4zm.5 6c.7 0 1.3-.1 1.7-.4.4-.4.6-.9.6-1.5s-.2-1-.7-1.4c-.4-.3-1-.4-2-.4H9.4v3.8h4z" fill-rule="evenodd"/></svg>',bookmark:'<svg width="24" height="24"><path d="M6 4v17l6-4 6 4V4c0-.6-.4-1-1-1H7a1 1 0 00-1 1z" fill-rule="nonzero"/></svg>',"border-style":'<svg width="24" height="24"><g fill-rule="evenodd"><rect width="18" height="2" x="3" y="6" rx="1"/><rect width="2.8" height="2" x="3" y="16" rx="1"/><rect width="2.8" height="2" x="6.8" y="16" rx="1"/><rect width="2.8" height="2" x="10.6" y="16" rx="1"/><rect width="2.8" height="2" x="14.4" y="16" rx="1"/><rect width="2.8" height="2" x="18.2" y="16" rx="1"/><rect width="8" height="2" x="3" y="11" rx="1"/><rect width="8" height="2" x="13" y="11" rx="1"/></g></svg>',"border-width":'<svg width="24" height="24"><g fill-rule="evenodd"><rect width="18" height="5" x="3" y="5" rx="1"/><rect width="18" height="3.5" x="3" y="11.5" rx="1"/><rect width="18" height="2" x="3" y="17" rx="1"/></g></svg>',brightness:'<svg width="24" height="24"><path d="M12 17c.3 0 .5.1.7.3.2.2.3.4.3.7v1c0 .3-.1.5-.3.7a1 1 0 01-.7.3 1 1 0 01-.7-.3 1 1 0 01-.3-.7v-1c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3zm0-10a1 1 0 01-.7-.3A1 1 0 0111 6V5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3.3 0 .5.1.7.3.2.2.3.4.3.7v1c0 .3-.1.5-.3.7a1 1 0 01-.7.3zm7 4c.3 0 .5.1.7.3.2.2.3.4.3.7 0 .3-.1.5-.3.7a1 1 0 01-.7.3h-1a1 1 0 01-.7-.3 1 1 0 01-.3-.7c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h1zM7 12c0 .3-.1.5-.3.7a1 1 0 01-.7.3H5a1 1 0 01-.7-.3A1 1 0 014 12c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h1c.3 0 .5.1.7.3.2.2.3.4.3.7zm10 3.5l.7.8c.2.1.3.4.3.6 0 .3-.1.6-.3.8a1 1 0 01-.8.3 1 1 0 01-.6-.3l-.8-.7a1 1 0 01-.3-.8c0-.2.1-.5.3-.7a1 1 0 011.4 0zm-10-7l-.7-.8a1 1 0 01-.3-.6c0-.3.1-.6.3-.8.2-.2.5-.3.8-.3.2 0 .5.1.7.3l.7.7c.2.2.3.5.3.8 0 .2-.1.5-.3.7a1 1 0 01-.7.3 1 1 0 01-.8-.3zm10 0a1 1 0 01-.8.3 1 1 0 01-.7-.3 1 1 0 01-.3-.7c0-.3.1-.6.3-.8l.8-.7c.1-.2.4-.3.6-.3.3 0 .6.1.8.3.2.2.3.5.3.8 0 .2-.1.5-.3.7l-.7.7zm-10 7c.2-.2.5-.3.8-.3.2 0 .5.1.7.3a1 1 0 010 1.4l-.8.8a1 1 0 01-.6.3 1 1 0 01-.8-.3 1 1 0 01-.3-.8c0-.2.1-.5.3-.6l.7-.8zM12 8a4 4 0 013.7 2.4 4 4 0 010 3.2A4 4 0 0112 16a4 4 0 01-3.7-2.4 4 4 0 010-3.2A4 4 0 0112 8zm0 6.5c.7 0 1.3-.2 1.8-.7.5-.5.7-1.1.7-1.8s-.2-1.3-.7-1.8c-.5-.5-1.1-.7-1.8-.7s-1.3.2-1.8.7c-.5.5-.7 1.1-.7 1.8s.2 1.3.7 1.8c.5.5 1.1.7 1.8.7z" fill-rule="evenodd"/></svg>',browse:'<svg width="24" height="24"><path d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2h-4v-2h4V8H5v10h4v2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm-8 9.4l-2.3 2.3a1 1 0 11-1.4-1.4l4-4a1 1 0 011.4 0l4 4a1 1 0 01-1.4 1.4L13 13.4V20a1 1 0 01-2 0v-6.6z" fill-rule="nonzero"/></svg>',cancel:'<svg width="24" height="24"><path d="M12 4.6a7.4 7.4 0 110 14.8 7.4 7.4 0 010-14.8zM12 3a9 9 0 100 18 9 9 0 000-18zm0 8L14.8 8l1 1.1-2.7 2.8 2.7 2.7-1.1 1.1-2.7-2.7-2.7 2.7-1-1.1 2.6-2.7-2.7-2.7 1-1.1 2.8 2.7z" fill-rule="nonzero"/></svg>',"cell-background-color":'<svg width="24" height="24"><path d="M15.7 2l1.6 1.6-2.7 2.6 5.9 5.8c.7.7.7 1.7 0 2.4l-6.3 6.1a1.7 1.7 0 01-2.4 0l-6.3-6.1c-.7-.7-.7-1.7 0-2.4L15.7 2zM18 12l-4.5-4L9 12h9zM4 16s2 2.4 2 3.8C6 21 5.1 22 4 22s-2-1-2-2.2C2 18.4 4 16 4 16z"/></svg>',"cell-border-color":'<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M5 13v5h2v2H5a2 2 0 01-2-2v-5h2zm8-7V4h6a2 2 0 012 2h-8z" opacity=".2"/><path fill-rule="nonzero" d="M13 4v2H5v7H3V6c0-1.1.9-2 2-2h8zm-2.6 14.1l.1-.1.1.1.2.3.2.2.2.2c.4.6.8 1.2.8 1.7 0 .8-.7 1.5-1.5 1.5S9 21.3 9 20.5c0-.5.4-1.1.8-1.7l.2-.2.2-.2.2-.3z"/><path d="M13 11l-2 2H5v-2h6V6h2z"/><path fill-rule="nonzero" d="M18.4 8l1 1-1.8 1.9 4 4c.5.4.5 1.1 0 1.6l-4.3 4.2a1.2 1.2 0 01-1.6 0l-4.4-4.2c-.4-.5-.4-1.2 0-1.7l7-6.8zm1.6 7l-3-3-3 3h6z"/></g></svg>',"change-case":'<svg width="24" height="24"><path d="M18.4 18.2v-.6c-.5.8-1.3 1.2-2.4 1.2-2.2 0-3.3-1.6-3.3-4.8 0-3.1 1-4.7 3.3-4.7 1.1 0 1.8.3 2.4 1.1v-.6c0-.5.4-.8.8-.8s.8.3.8.8v8.4c0 .5-.4.8-.8.8a.8.8 0 01-.8-.8zm-2-7.4c-1.3 0-1.8.9-1.8 3.2 0 2.4.5 3.3 1.7 3.3 1.3 0 1.8-.9 1.8-3.2 0-2.4-.5-3.3-1.7-3.3zM10 15.7H5.5l-.8 2.6a1 1 0 01-1 .7h-.2a.7.7 0 01-.7-1l4-12a1 1 0 012 0l4 12a.7.7 0 01-.8 1h-.2a1 1 0 01-1-.7l-.8-2.6zm-.3-1.5l-2-6.5-1.9 6.5h3.9z" fill-rule="evenodd"/></svg>',"character-count":'<svg width="24" height="24"><path d="M4 11.5h16v1H4v-1zm4.8-6.8V10H7.7V5.8h-1v-1h2zM11 8.3V9h2v1h-3V7.7l2-1v-.9h-2v-1h3v2.4l-2 1zm6.3-3.4V10h-3.1V9h2.1V8h-2.1V6.8h2.1v-1h-2.1v-1h3.1zM5.8 16.4c0-.5.2-.8.5-1 .2-.2.6-.3 1.2-.3l.8.1c.2 0 .4.2.5.3l.4.4v2.8l.2.3H8.2v-.1-.2l-.6.3H7c-.4 0-.7 0-1-.2a1 1 0 01-.3-.9c0-.3 0-.6.3-.8.3-.2.7-.4 1.2-.4l.6-.2h.3v-.2l-.1-.2a.8.8 0 00-.5-.1 1 1 0 00-.4 0l-.3.4h-1zm2.3.8h-.2l-.2.1-.4.1a1 1 0 00-.4.2l-.2.2.1.3.5.1h.4l.4-.4v-.6zm2-3.4h1.2v1.7l.5-.3h.5c.5 0 .9.1 1.2.5.3.4.5.8.5 1.4 0 .6-.2 1.1-.5 1.5-.3.4-.7.6-1.3.6l-.6-.1-.4-.4v.4h-1.1v-5.4zm1.1 3.3c0 .3 0 .6.2.8a.7.7 0 001.2 0l.2-.8c0-.4 0-.6-.2-.8a.7.7 0 00-.6-.3l-.6.3-.2.8zm6.1-.5c0-.2 0-.3-.2-.4a.8.8 0 00-.5-.2c-.3 0-.5.1-.6.3l-.2.9c0 .3 0 .6.2.8.1.2.3.3.6.3.2 0 .4 0 .5-.2l.2-.4h1.1c0 .5-.3.8-.6 1.1a2 2 0 01-1.3.4c-.5 0-1-.2-1.3-.6a2 2 0 01-.5-1.4c0-.6.1-1.1.5-1.5.3-.4.8-.5 1.4-.5.5 0 1 0 1.2.3.4.3.5.7.5 1.2h-1v-.1z" fill-rule="evenodd"/></svg>',"checklist-rtl":'<svg width="24" height="24"><path d="M5 17h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 110-2zm14.2 11c.2-.4.6-.5.9-.3.3.2.4.6.2 1L18 20c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L18 14c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L18 8c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8z" fill-rule="evenodd"/></svg>',checklist:'<svg width="24" height="24"><path d="M11 17h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0-6h8a1 1 0 010 2h-8a1 1 0 010-2zM7.2 16c.2-.4.6-.5.9-.3.3.2.4.6.2 1L6 20c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L6 14c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L6 8c-.2.3-.7.4-1 0L3.8 6.9a.7.7 0 010-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8z" fill-rule="evenodd"/></svg>',checkmark:'<svg width="24" height="24"><path d="M18.2 5.4a1 1 0 011.6 1.2l-8 12a1 1 0 01-1.5.1l-5-5a1 1 0 111.4-1.4l4.1 4.1 7.4-11z" fill-rule="nonzero"/></svg>',"chevron-down":'<svg width="10" height="10"><path d="M8.7 2.2c.3-.3.8-.3 1 0 .4.4.4.9 0 1.2L5.7 7.8c-.3.3-.9.3-1.2 0L.2 3.4a.8.8 0 010-1.2c.3-.3.8-.3 1.1 0L5 6l3.7-3.8z" fill-rule="nonzero"/></svg>',"chevron-left":'<svg width="10" height="10"><path d="M7.8 1.3L4 5l3.8 3.7c.3.3.3.8 0 1-.4.4-.9.4-1.2 0L2.2 5.7a.8.8 0 010-1.2L6.6.2C7 0 7.4 0 7.8.2c.3.3.3.8 0 1.1z" fill-rule="nonzero"/></svg>',"chevron-right":'<svg width="10" height="10"><path d="M2.2 1.3a.8.8 0 010-1c.4-.4.9-.4 1.2 0l4.4 4.1c.3.4.3.9 0 1.2L3.4 9.8c-.3.3-.8.3-1.2 0a.8.8 0 010-1.1L6 5 2.2 1.3z" fill-rule="nonzero"/></svg>',"chevron-up":'<svg width="10" height="10"><path d="M8.7 7.8L5 4 1.3 7.8c-.3.3-.8.3-1 0a.8.8 0 010-1.2l4.1-4.4c.3-.3.9-.3 1.2 0l4.2 4.4c.3.3.3.9 0 1.2-.3.3-.8.3-1.1 0z" fill-rule="nonzero"/></svg>',close:'<svg width="24" height="24"><path d="M17.3 8.2L13.4 12l3.9 3.8a1 1 0 01-1.5 1.5L12 13.4l-3.8 3.9a1 1 0 01-1.5-1.5l3.9-3.8-3.9-3.8a1 1 0 011.5-1.5l3.8 3.9 3.8-3.9a1 1 0 011.5 1.5z" fill-rule="evenodd"/></svg>',"code-sample":'<svg width="24" height="26"><path d="M7.1 11a2.8 2.8 0 01-.8 2 2.8 2.8 0 01.8 2v1.7c0 .3.1.6.4.8.2.3.5.4.8.4.3 0 .4.2.4.4v.8c0 .2-.1.4-.4.4-.7 0-1.4-.3-2-.8-.5-.6-.8-1.3-.8-2V15c0-.3-.1-.6-.4-.8-.2-.3-.5-.4-.8-.4a.4.4 0 01-.4-.4v-.8c0-.2.2-.4.4-.4.3 0 .6-.1.8-.4.3-.2.4-.5.4-.8V9.3c0-.7.3-1.4.8-2 .6-.5 1.3-.8 2-.8.3 0 .4.2.4.4v.8c0 .2-.1.4-.4.4-.3 0-.6.1-.8.4-.3.2-.4.5-.4.8V11zm9.8 0V9.3c0-.3-.1-.6-.4-.8-.2-.3-.5-.4-.8-.4a.4.4 0 01-.4-.4V7c0-.2.1-.4.4-.4.7 0 1.4.3 2 .8.5.6.8 1.3.8 2V11c0 .3.1.6.4.8.2.3.5.4.8.4.2 0 .4.2.4.4v.8c0 .2-.2.4-.4.4-.3 0-.6.1-.8.4-.3.2-.4.5-.4.8v1.7c0 .7-.3 1.4-.8 2-.6.5-1.3.8-2 .8a.4.4 0 01-.4-.4v-.8c0-.2.1-.4.4-.4.3 0 .6-.1.8-.4.3-.2.4-.5.4-.8V15a2.8 2.8 0 01.8-2 2.8 2.8 0 01-.8-2zm-3.3-.4c0 .4-.1.8-.5 1.1-.3.3-.7.5-1.1.5-.4 0-.8-.2-1.1-.5-.4-.3-.5-.7-.5-1.1 0-.5.1-.9.5-1.2.3-.3.7-.4 1.1-.4.4 0 .8.1 1.1.4.4.3.5.7.5 1.2zM12 13c.4 0 .8.1 1.1.5.4.3.5.7.5 1.1 0 1-.1 1.6-.5 2a3 3 0 01-1.1 1c-.4.3-.8.4-1.1.4a.5.5 0 01-.5-.5V17a3 3 0 001-.2l.6-.6c-.6 0-1-.2-1.3-.5-.2-.3-.3-.7-.3-1 0-.5.1-1 .5-1.2.3-.4.7-.5 1.1-.5z" fill-rule="evenodd"/></svg>',"color-levels":'<svg width="24" height="24"><path d="M17.5 11.4A9 9 0 0118 14c0 .5 0 1-.2 1.4 0 .4-.3.9-.5 1.3a6.2 6.2 0 01-3.7 3 5.7 5.7 0 01-3.2 0A5.9 5.9 0 017.6 18a6.2 6.2 0 01-1.4-2.6 6.7 6.7 0 010-2.8c0-.4.1-.9.3-1.3a13.6 13.6 0 012.3-4A20 20 0 0112 4a26.4 26.4 0 013.2 3.4 18.2 18.2 0 012.3 4zm-2 4.5c.4-.7.5-1.4.5-2a7.3 7.3 0 00-1-3.2c.2.6.2 1.2.2 1.9a4.5 4.5 0 01-1.3 3 5.3 5.3 0 01-2.3 1.5 4.9 4.9 0 01-2 .1 4.3 4.3 0 002.4.8 4 4 0 002-.6 4 4 0 001.5-1.5z" fill-rule="evenodd"/></svg>',"color-picker":'<svg width="24" height="24"><path d="M12 3a9 9 0 000 18 1.5 1.5 0 001.1-2.5c-.2-.3-.4-.6-.4-1 0-.8.7-1.5 1.5-1.5H16a5 5 0 005-5c0-4.4-4-8-9-8zm-5.5 9a1.5 1.5 0 110-3 1.5 1.5 0 010 3zm3-4a1.5 1.5 0 110-3 1.5 1.5 0 010 3zm5 0a1.5 1.5 0 110-3 1.5 1.5 0 010 3zm3 4a1.5 1.5 0 110-3 1.5 1.5 0 010 3z" fill-rule="nonzero"/></svg>',"color-swatch-remove-color":'<svg width="24" height="24"><path stroke="#000" stroke-width="2" d="M21 3L3 21" fill-rule="evenodd"/></svg>',"color-swatch":'<svg width="24" height="24"><rect x="3" y="3" width="18" height="18" rx="1" fill-rule="evenodd"/></svg>',"comment-add":'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M9 19l3-2h7c.6 0 1-.4 1-1V6c0-.6-.4-1-1-1H5a1 1 0 00-1 1v10c0 .6.4 1 1 1h4v2zm-2 4v-4H5a3 3 0 01-3-3V6a3 3 0 013-3h14a3 3 0 013 3v10a3 3 0 01-3 3h-6.4L7 23z"/><path d="M13 10h2a1 1 0 010 2h-2v2a1 1 0 01-2 0v-2H9a1 1 0 010-2h2V8a1 1 0 012 0v2z"/></g></svg>',comment:'<svg width="24" height="24"><path fill-rule="nonzero" d="M9 19l3-2h7c.6 0 1-.4 1-1V6c0-.6-.4-1-1-1H5a1 1 0 00-1 1v10c0 .6.4 1 1 1h4v2zm-2 4v-4H5a3 3 0 01-3-3V6a3 3 0 013-3h14a3 3 0 013 3v10a3 3 0 01-3 3h-6.4L7 23z"/></svg>',contrast:'<svg width="24" height="24"><path d="M12 4a7.8 7.8 0 015.7 2.3A8 8 0 1112 4zm-6 8a6 6 0 006 6V6a6 6 0 00-6 6z" fill-rule="evenodd"/></svg>',copy:'<svg width="24" height="24"><path d="M16 3H6a2 2 0 00-2 2v11h2V5h10V3zm1 4a2 2 0 012 2v10a2 2 0 01-2 2h-7a2 2 0 01-2-2V9c0-1.2.9-2 2-2h7zm0 12V9h-7v10h7z" fill-rule="nonzero"/></svg>',crop:'<svg width="24" height="24"><path d="M17 8v7h2c.6 0 1 .4 1 1s-.4 1-1 1h-2v2c0 .6-.4 1-1 1a1 1 0 01-1-1v-2H7V9H5a1 1 0 110-2h2V5c0-.6.4-1 1-1s1 .4 1 1v2h7l3-3 1 1-3 3zM9 9v5l5-5H9zm1 6h5v-5l-5 5z" fill-rule="evenodd"/></svg>',"cut-column":'<svg width="24" height="24"><path fill-rule="evenodd" d="M7.2 4.5c.9 0 1.6.4 2.2 1A3.7 3.7 0 0110.5 8v.5l1 1 4-4 1-.5a3.3 3.3 0 012 0c.4 0 .7.3 1 .5L17 8h4v13h-6V10l-1.5 1.5.5.5v4l-2.5-2.5-1 1v.5c0 .4 0 .8-.3 1.2-.2.5-.4.9-.8 1.2-.6.7-1.3 1-2.2 1-.8.2-1.5 0-2-.6l-.5-.8-.2-1c0-.4 0-.8.3-1.2A3.9 3.9 0 017 12.7c.5-.2 1-.3 1.5-.2l1-1-1-1c-.5 0-1 0-1.5-.2-.5-.1-1-.4-1.4-.9-.4-.3-.6-.7-.8-1.2L4.5 7c0-.4 0-.7.2-1 0-.3.3-.6.5-.8.5-.5 1.2-.8 2-.7zm12.3 5h-3v10h3v-10zM8 13.8h-.3l-.4.2a2.8 2.8 0 00-.7.4v.1a2.8 2.8 0 00-.6.8l-.1.4v.7l.2.5.5.2h.7a2.6 2.6 0 00.8-.3 2.4 2.4 0 00.7-.7 2.5 2.5 0 00.3-.8 1.5 1.5 0 000-.8 1 1 0 00-.2-.4 1 1 0 00-.5-.2H8zm3.5-3.7c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4s.7-.1 1-.4c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4zM7 5.8h-.4a1 1 0 00-.5.3 1 1 0 00-.2.5v.7a2.5 2.5 0 00.3.8l.2.3h.1l.4.4.4.2.4.1h.7L9 9l.2-.4a1.6 1.6 0 000-.8 2.6 2.6 0 00-.3-.8A2.5 2.5 0 007.7 6l-.4-.1H7z"/></svg>',"cut-row":'<svg width="24" height="24"><path fill-rule="evenodd" d="M22 3v5H9l3 3 2-2h4l-4 4 1 1h.5c.4 0 .8 0 1.2.3.5.2.9.4 1.2.8.7.6 1 1.3 1 2.2.2.8 0 1.5-.6 2l-.8.5-1 .2c-.4 0-.8 0-1.2-.3a3.9 3.9 0 01-2.1-2.2c-.2-.5-.3-1-.2-1.5l-1-1-1 1c0 .5 0 1-.2 1.5-.1.5-.4 1-.9 1.4-.3.4-.7.6-1.2.8l-1.2.3c-.4 0-.7 0-1-.2-.3 0-.6-.3-.8-.5-.5-.5-.8-1.2-.7-2 0-.9.4-1.6 1-2.2A3.7 3.7 0 018.6 14H9l1-1-4-4-.5-1a3.3 3.3 0 010-2c0-.4.3-.7.5-1l2 2V3h14zM8.5 15.3h-.3a2.6 2.6 0 00-.8.4 2.5 2.5 0 00-.9 1.1l-.1.4v.7l.2.5.5.2h.7a2.5 2.5 0 00.8-.3L9 18V18l.4-.4.2-.4.1-.4v-.3-.4a1 1 0 00-.2-.5 1 1 0 00-.4-.2h-.5zm7 0H15a1 1 0 00-.4.3 1 1 0 00-.2.5 1.5 1.5 0 000 .7v.4a2.8 2.8 0 00.5.7h.1a2.8 2.8 0 00.8.6l.4.1h.7l.5-.2.2-.5v-.4-.3a2.6 2.6 0 00-.3-.8 2.4 2.4 0 00-.7-.7 2.5 2.5 0 00-.8-.3h-.3zM12 11.6c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4s.7-.1 1-.4c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4zm8.5-7.1h-11v2h11v-2z"/></svg>',cut:'<svg width="24" height="24"><path d="M18 15c.6.7 1 1.4 1 2.3 0 .8-.2 1.5-.7 2l-.8.5-1 .2c-.4 0-.8 0-1.2-.3a3.9 3.9 0 01-2.1-2.2c-.2-.5-.3-1-.2-1.5l-1-1-1 1c0 .5 0 1-.2 1.5-.1.5-.4 1-.9 1.4-.3.4-.7.6-1.2.8l-1.2.3c-.4 0-.7 0-1-.2-.3 0-.6-.3-.8-.5-.5-.5-.8-1.2-.7-2 0-.9.4-1.6 1-2.2A3.7 3.7 0 018.6 14H9l1-1-4-4-.5-1a3.3 3.3 0 010-2c0-.4.3-.7.5-1l6 6 6-6 .5 1a3.3 3.3 0 010 2c0 .4-.3.7-.5 1l-4 4 1 1h.5c.4 0 .8 0 1.2.3.5.2.9.4 1.2.8zm-8.5 2.2l.1-.4v-.3-.4a1 1 0 00-.2-.5 1 1 0 00-.4-.2 1.6 1.6 0 00-.8 0 2.6 2.6 0 00-.8.3 2.5 2.5 0 00-.9 1.1l-.1.4v.7l.2.5.5.2h.7a2.5 2.5 0 00.8-.3 2.8 2.8 0 001-1zm2.5-2.8c.4 0 .7-.1 1-.4.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4s-.7.1-1 .4c-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4zm5.4 4l.2-.5v-.4-.3a2.6 2.6 0 00-.3-.8 2.4 2.4 0 00-.7-.7 2.5 2.5 0 00-.8-.3 1.5 1.5 0 00-.8 0 1 1 0 00-.4.2 1 1 0 00-.2.5 1.5 1.5 0 000 .7v.4l.3.4.3.4a2.8 2.8 0 00.8.5l.4.1h.7l.5-.2z" fill-rule="evenodd"/></svg>',"document-properties":'<svg width="24" height="24"><path d="M14.4 3H7a2 2 0 00-2 2v14c0 1.1.9 2 2 2h10a2 2 0 002-2V7.6L14.4 3zM17 19H7V5h6v4h4v10z" fill-rule="nonzero"/></svg>',drag:'<svg width="24" height="24"><path d="M13 5h2v2h-2V5zm0 4h2v2h-2V9zM9 9h2v2H9V9zm4 4h2v2h-2v-2zm-4 0h2v2H9v-2zm0 4h2v2H9v-2zm4 0h2v2h-2v-2zM9 5h2v2H9V5z" fill-rule="evenodd"/></svg>',"duplicate-column":'<svg width="24" height="24"><path d="M17 6v16h-7V6h7zm-2 2h-3v12h3V8zm-2-6v2H8v15H6V2h7z"/></svg>',"duplicate-row":'<svg width="24" height="24"><path d="M22 11v7H6v-7h16zm-2 2H8v3h12v-3zm-1-6v2H4v5H2V7h17z"/></svg>',duplicate:'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M16 3v2H6v11H4V5c0-1.1.9-2 2-2h10zm3 8h-2V9h-7v10h9a2 2 0 01-2 2h-7a2 2 0 01-2-2V9c0-1.2.9-2 2-2h7a2 2 0 012 2v2z"/><path d="M17 14h1a1 1 0 010 2h-1v1a1 1 0 01-2 0v-1h-1a1 1 0 010-2h1v-1a1 1 0 012 0v1z"/></g></svg>',"edit-block":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19.8 8.8l-9.4 9.4c-.2.2-.5.4-.9.4l-5.4 1.2 1.2-5.4.5-.8 9.4-9.4c.7-.7 1.8-.7 2.5 0l2.1 2.1c.7.7.7 1.8 0 2.5zm-2-.2l1-.9v-.3l-2.2-2.2a.3.3 0 00-.3 0l-1 1L18 8.5zm-1 1l-2.5-2.4-6 6 2.5 2.5 6-6zm-7 7.1l-2.6-2.4-.3.3-.1.2-.7 3 3.1-.6h.1l.4-.5z"/></svg>',"edit-image":'<svg width="24" height="24"><path d="M18 16h2V7a2 2 0 00-2-2H7v2h11v9zM6 17h15a1 1 0 010 2h-1v1a1 1 0 01-2 0v-1H6a2 2 0 01-2-2V7H3a1 1 0 110-2h1V4a1 1 0 112 0v13zm3-5.3l1.3 2 3-4.7 3.7 6H7l2-3.3z" fill-rule="nonzero"/></svg>',"embed-page":'<svg width="24" height="24"><path d="M19 6V5H5v14h2A13 13 0 0119 6zm0 1.4c-.8.8-1.6 2.4-2.2 4.6H19V7.4zm0 5.6h-2.4c-.4 1.8-.6 3.8-.6 6h3v-6zm-4 6c0-2.2.2-4.2.6-6H13c-.7 1.8-1.1 3.8-1.1 6h3zm-4 0c0-2.2.4-4.2 1-6H9.6A12 12 0 008 19h3zM4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 01-1-1V4c0-.6.4-1 1-1zm11.8 9c.4-1.9 1-3.4 1.8-4.5a9.2 9.2 0 00-4 4.5h2.2zm-3.4 0a12 12 0 012.8-4 12 12 0 00-5 4h2.2z" fill-rule="nonzero"/></svg>',embed:'<svg width="24" height="24"><path d="M4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 01-1-1V4c0-.6.4-1 1-1zm1 2v14h14V5H5zm4.8 2.6l5.6 4a.5.5 0 010 .8l-5.6 4A.5.5 0 019 16V8a.5.5 0 01.8-.4z" fill-rule="nonzero"/></svg>',emoji:'<svg width="24" height="24"><path d="M9 11c.6 0 1-.4 1-1s-.4-1-1-1a1 1 0 00-1 1c0 .6.4 1 1 1zm6 0c.6 0 1-.4 1-1s-.4-1-1-1a1 1 0 00-1 1c0 .6.4 1 1 1zm-3 5.5c2.1 0 4-1.5 4.4-3.5H7.6c.5 2 2.3 3.5 4.4 3.5zM12 4a8 8 0 100 16 8 8 0 000-16zm0 14.5a6.5 6.5 0 110-13 6.5 6.5 0 010 13z" fill-rule="nonzero"/></svg>',export:'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M14.4 3L18 7v1h-5V5H7v14h9a1 1 0 012 0c0 1-.8 2-1.9 2H7c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2h7.5z"/><path d="M18.1 12c.5 0 .9.4.9 1 0 .5-.3 1-.8 1h-7.3c-.5 0-.9-.4-.9-1 0-.5.3-1 .8-1h7.3z"/><path d="M16.4 9.2a1 1 0 011.4.2l2.4 3.6-2.4 3.6a1 1 0 01-1.7-1v-.2l1.7-2.4-1.6-2.4a1 1 0 01.2-1.4z"/></g></svg>',fill:'<svg width="24" height="26"><path d="M16.6 12l-9-9-1.4 1.4 2.4 2.4-5.2 5.1c-.5.6-.5 1.6 0 2.2L9 19.6a1.5 1.5 0 002.2 0l5.5-5.5c.5-.6.5-1.6 0-2.2zM5.2 13L10 8.2l4.8 4.8H5.2zM19 14.5s-2 2.2-2 3.5c0 1.1.9 2 2 2a2 2 0 002-2c0-1.3-2-3.5-2-3.5z" fill-rule="nonzero"/></svg>',"flip-horizontally":'<svg width="24" height="24"><path d="M14 19h2v-2h-2v2zm4-8h2V9h-2v2zM4 7v10c0 1.1.9 2 2 2h3v-2H6V7h3V5H6a2 2 0 00-2 2zm14-2v2h2a2 2 0 00-2-2zm-7 16h2V3h-2v18zm7-6h2v-2h-2v2zm-4-8h2V5h-2v2zm4 12a2 2 0 002-2h-2v2z" fill-rule="nonzero"/></svg>',"flip-vertically":'<svg width="24" height="24"><path d="M5 14v2h2v-2H5zm8 4v2h2v-2h-2zm4-14H7a2 2 0 00-2 2v3h2V6h10v3h2V6a2 2 0 00-2-2zm2 14h-2v2a2 2 0 002-2zM3 11v2h18v-2H3zm6 7v2h2v-2H9zm8-4v2h2v-2h-2zM5 18c0 1.1.9 2 2 2v-2H5z" fill-rule="nonzero"/></svg>',"format-painter":'<svg width="24" height="24"><path d="M18 5V4c0-.5-.4-1-1-1H5a1 1 0 00-1 1v4c0 .6.5 1 1 1h12c.6 0 1-.4 1-1V7h1v4H9v9c0 .6.4 1 1 1h2c.6 0 1-.4 1-1v-7h8V5h-3z" fill-rule="nonzero"/></svg>',format:'<svg width="24" height="24"><path fill-rule="evenodd" d="M17 5a1 1 0 010 2h-4v11a1 1 0 01-2 0V7H7a1 1 0 110-2h10z"/></svg>',fullscreen:'<svg width="24" height="24"><path d="M15.3 10l-1.2-1.3 2.9-3h-2.3a.9.9 0 110-1.7H19c.5 0 .9.4.9.9v4.4a.9.9 0 11-1.8 0V7l-2.9 3zm0 4l3 3v-2.3a.9.9 0 111.7 0V19c0 .5-.4.9-.9.9h-4.4a.9.9 0 110-1.8H17l-3-2.9 1.3-1.2zM10 15.4l-2.9 3h2.3a.9.9 0 110 1.7H5a.9.9 0 01-.9-.9v-4.4a.9.9 0 111.8 0V17l2.9-3 1.2 1.3zM8.7 10L5.7 7v2.3a.9.9 0 01-1.7 0V5c0-.5.4-.9.9-.9h4.4a.9.9 0 010 1.8H7l3 2.9-1.3 1.2z" fill-rule="nonzero"/></svg>',gallery:'<svg width="24" height="24"><path fill-rule="nonzero" d="M5 15.7l2.3-2.2c.3-.3.7-.3 1 0L11 16l5.1-5c.3-.4.8-.4 1 0l2 1.9V8H5v7.7zM5 18V19h3l1.8-1.9-2-2L5 17.9zm14-3l-2.5-2.4-6.4 6.5H19v-4zM4 6h16c.6 0 1 .4 1 1v13c0 .6-.4 1-1 1H4a1 1 0 01-1-1V7c0-.6.4-1 1-1zm6 7a2 2 0 110-4 2 2 0 010 4zM4.5 4h15a.5.5 0 110 1h-15a.5.5 0 010-1zm2-2h11a.5.5 0 110 1h-11a.5.5 0 010-1z"/></svg>',gamma:'<svg width="24" height="24"><path d="M4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 01-1-1V4c0-.6.4-1 1-1zm1 2v14h14V5H5zm6.5 11.8V14L9.2 8.7a5.1 5.1 0 00-.4-.8l-.1-.2H8 8v-1l.3-.1.3-.1h.7a1 1 0 01.6.5l.1.3a8.5 8.5 0 01.3.6l1.9 4.6 2-5.2a1 1 0 011-.6.5.5 0 01.5.6L13 14v2.8a.7.7 0 01-1.4 0z" fill-rule="nonzero"/></svg>',help:'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M12 5.5a6.5 6.5 0 00-6 9 6.3 6.3 0 001.4 2l1 1a6.3 6.3 0 003.6 1 6.5 6.5 0 006-9 6.3 6.3 0 00-1.4-2l-1-1a6.3 6.3 0 00-3.6-1zM12 4a7.8 7.8 0 015.7 2.3A8 8 0 1112 4z"/><path d="M9.6 9.7a.7.7 0 01-.7-.8c0-1.1 1.5-1.8 3.2-1.8 1.8 0 3.2.8 3.2 2.4 0 1.4-.4 2.1-1.5 2.8-.2 0-.3.1-.3.2a2 2 0 00-.8.8.8.8 0 01-1.4-.6c.3-.7.8-1 1.3-1.5l.4-.2c.7-.4.8-.6.8-1.5 0-.5-.6-.9-1.7-.9-.5 0-1 .1-1.4.3-.2 0-.3.1-.3.2v-.2c0 .4-.4.8-.8.8z" fill-rule="nonzero"/><circle cx="12" cy="16" r="1"/></g></svg>',"highlight-bg-color":'<svg width="24" height="24"><g fill-rule="evenodd"><path id="tox-icon-highlight-bg-color__color" d="M3 18h18v3H3z"/><path fill-rule="nonzero" d="M7.7 16.7H3l3.3-3.3-.7-.8L10.2 8l4 4.1-4 4.2c-.2.2-.6.2-.8 0l-.6-.7-1.1 1.1zm5-7.5L11 7.4l3-2.9a2 2 0 012.6 0L18 6c.7.7.7 2 0 2.7l-2.9 2.9-1.8-1.8-.5-.6"/></g></svg>',home:'<svg width="24" height="24"><path fill-rule="nonzero" d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/></svg>',"horizontal-rule":'<svg width="24" height="24"><path d="M4 11h16v2H4z" fill-rule="evenodd"/></svg>',"image-options":'<svg width="24" height="24"><path d="M6 10a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2zm12 0a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2zm-6 0a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2z" fill-rule="nonzero"/></svg>',image:'<svg width="24" height="24"><path d="M5 15.7l3.3-3.2c.3-.3.7-.3 1 0L12 15l4.1-4c.3-.4.8-.4 1 0l2 1.9V5H5v10.7zM5 18V19h3l2.8-2.9-2-2L5 17.9zm14-3l-2.5-2.4-6.4 6.5H19v-4zM4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 01-1-1V4c0-.6.4-1 1-1zm6 8a2 2 0 100-4 2 2 0 000 4z" fill-rule="nonzero"/></svg>',indent:'<svg width="24" height="24"><path d="M7 5h12c.6 0 1 .4 1 1s-.4 1-1 1H7a1 1 0 110-2zm5 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 010-2zm0 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 010-2zm-5 4h12a1 1 0 010 2H7a1 1 0 010-2zm-2.6-3.8L6.2 12l-1.8-1.2a1 1 0 011.2-1.6l3 2a1 1 0 010 1.6l-3 2a1 1 0 11-1.2-1.6z" fill-rule="evenodd"/></svg>',info:'<svg width="24" height="24"><path d="M12 4a7.8 7.8 0 015.7 2.3A8 8 0 1112 4zm-1 3v2h2V7h-2zm3 10v-1h-1v-5h-3v1h1v4h-1v1h4z" fill-rule="evenodd"/></svg>',"insert-character":'<svg width="24" height="24"><path d="M15 18h4l1-2v4h-6v-3.3l1.4-1a6 6 0 001.8-2.9 6.3 6.3 0 00-.1-4.1 5.8 5.8 0 00-3-3.2c-.6-.3-1.3-.5-2.1-.5a5.1 5.1 0 00-3.9 1.8 6.3 6.3 0 00-1.3 6 6.2 6.2 0 001.8 3l1.4.9V20H4v-4l1 2h4v-.5l-2-1L5.4 15A6.5 6.5 0 014 11c0-1 .2-1.9.6-2.7A7 7 0 016.3 6C7.1 5.4 8 5 9 4.5c1-.3 2-.5 3.1-.5a8.8 8.8 0 015.7 2 7 7 0 011.7 2.3 6 6 0 01.2 4.8c-.2.7-.6 1.3-1 1.9a7.6 7.6 0 01-3.6 2.5v.5z" fill-rule="evenodd"/></svg>',"insert-time":'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M12 19a7 7 0 100-14 7 7 0 000 14zm0 2a9 9 0 110-18 9 9 0 010 18z"/><path d="M16 12h-3V7c0-.6-.4-1-1-1a1 1 0 00-1 1v7h5c.6 0 1-.4 1-1s-.4-1-1-1z"/></g></svg>',invert:'<svg width="24" height="24"><path d="M18 19.3L16.5 18a5.8 5.8 0 01-3.1 1.9 6.1 6.1 0 01-5.5-1.6A5.8 5.8 0 016 14v-.3l.1-1.2A13.9 13.9 0 017.7 9l-3-3 .7-.8 2.8 2.9 9 8.9 1.5 1.6-.7.6zm0-5.5v.3l-.1 1.1-.4 1-1.2-1.2a4.3 4.3 0 00.2-1v-.2c0-.4 0-.8-.2-1.3l-.5-1.4a14.8 14.8 0 00-3-4.2L12 6a26.1 26.1 0 00-2.2 2.5l-1-1a20.9 20.9 0 012.9-3.3L12 4l1 .8a22.2 22.2 0 014 5.4c.6 1.2 1 2.4 1 3.6z" fill-rule="evenodd"/></svg>',italic:'<svg width="24" height="24"><path d="M16.7 4.7l-.1.9h-.3c-.6 0-1 0-1.4.3-.3.3-.4.6-.5 1.1l-2.1 9.8v.6c0 .5.4.8 1.4.8h.2l-.2.8H8l.2-.8h.2c1.1 0 1.8-.5 2-1.5l2-9.8.1-.5c0-.6-.4-.8-1.4-.8h-.3l.2-.9h5.8z" fill-rule="evenodd"/></svg>',language:'<svg width="24" height="24"><path d="M12 3a9 9 0 110 18 9 9 0 010-18zm4.3 13.3c-.5 1-1.2 2-2 2.9a7.5 7.5 0 003.2-2.1l-.2-.2a6 6 0 00-1-.6zm-8.6 0c-.5.2-.9.5-1.2.8.9 1 2 1.7 3.2 2a10 10 0 01-2-2.8zm3.6-.8c-.8 0-1.6.1-2.2.3.5 1 1.2 1.9 2.1 2.7zm1.5 0v3c.9-.8 1.6-1.7 2.1-2.7-.6-.2-1.4-.3-2.1-.3zm-6-2.7H4.5c.2 1 .5 2.1 1 3h.3l1.3-1a10 10 0 01-.3-2zm12.7 0h-2.3c0 .7-.1 1.4-.3 2l1.6 1.1c.5-1 .9-2 1-3.1zm-3.8 0h-3V14c1 0 2 .1 2.7.4.2-.5.3-1 .3-1.6zm-4.4 0h-3l.3 1.6c.8-.3 1.7-.4 2.7-.4v-1.3zm-5.5-5c-.7 1-1.1 2.2-1.3 3.5h2.3c0-1 .2-1.8.5-2.6l-1.5-1zm2.9 1.4v.1c-.2.6-.4 1.3-.4 2h3V9.4c-1 0-1.8-.1-2.6-.3zm6.6 0h-.1l-2.4.3v1.8h3l-.5-2.1zm3-1.4l-.3.1-1.3.8c.3.8.5 1.6.5 2.6h2.3a7.5 7.5 0 00-1.3-3.5zm-9 0l2 .2V5.5a9 9 0 00-2 2.2zm3.5-2.3V8c.6 0 1.3 0 1.9-.2a9 9 0 00-2-2.3zm-3-.7h-.1c-1.1.4-2.1 1-3 1.8l1.2.7a10 10 0 011.9-2.5zm4.4 0l.1.1a10 10 0 011.8 2.4l1.1-.7a7.5 7.5 0 00-3-1.8z"/></svg>',"line-height":'<svg width="24" height="24"><path d="M21 5a1 1 0 01.1 2H13a1 1 0 01-.1-2H21zm0 4a1 1 0 01.1 2H13a1 1 0 01-.1-2H21zm0 4a1 1 0 01.1 2H13a1 1 0 01-.1-2H21zm0 4a1 1 0 01.1 2H13a1 1 0 01-.1-2H21zM7 3.6l3.7 3.7a1 1 0 01-1.3 1.5h-.1L8 7.3v9.2l1.3-1.3a1 1 0 011.3 0h.1c.4.4.4 1 0 1.3v.1L7 20.4l-3.7-3.7a1 1 0 011.3-1.5h.1L6 16.7V7.4L4.7 8.7a1 1 0 01-1.3 0h-.1a1 1 0 010-1.3v-.1L7 3.6z"/></svg>',line:'<svg width="24" height="24"><path d="M15 9l-8 8H4v-3l8-8 3 3zm1-1l-3-3 1-1h1c-.2 0 0 0 0 0l2 2s0 .2 0 0v1l-1 1zM4 18h16v2H4v-2z" fill-rule="evenodd"/></svg>',link:'<svg width="24" height="24"><path d="M6.2 12.3a1 1 0 011.4 1.4l-2.1 2a2 2 0 102.7 2.8l4.8-4.8a1 1 0 000-1.4 1 1 0 111.4-1.3 2.9 2.9 0 010 4L9.6 20a3.9 3.9 0 01-5.5-5.5l2-2zm11.6-.6a1 1 0 01-1.4-1.4l2-2a2 2 0 10-2.6-2.8L11 10.3a1 1 0 000 1.4A1 1 0 119.6 13a2.9 2.9 0 010-4L14.4 4a3.9 3.9 0 015.5 5.5l-2 2z" fill-rule="nonzero"/></svg>',"list-bull-circle":'<svg width="48" height="48"><g fill-rule="evenodd"><path d="M11 16a2 2 0 100-4 2 2 0 000 4zm0 1a3 3 0 110-6 3 3 0 010 6zM11 26a2 2 0 100-4 2 2 0 000 4zm0 1a3 3 0 110-6 3 3 0 010 6zM11 36a2 2 0 100-4 2 2 0 000 4zm0 1a3 3 0 110-6 3 3 0 010 6z" fill-rule="nonzero"/><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/></g></svg>',"list-bull-default":'<svg width="48" height="48"><g fill-rule="evenodd"><circle cx="11" cy="14" r="3"/><circle cx="11" cy="24" r="3"/><circle cx="11" cy="34" r="3"/><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/></g></svg>',"list-bull-square":'<svg width="48" height="48"><g fill-rule="evenodd"><path d="M8 11h6v6H8zM8 21h6v6H8zM8 31h6v6H8z"/><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/></g></svg>',"list-num-default-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M37.4 17v-4.8l-1.6 1v-1.1l1.6-1h1.2V17zM33.3 17.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm1.7 5.7c0-1.2 1-2 2.2-2 1.3 0 2.1.8 2.1 1.8 0 .7-.3 1.2-1.3 2.2l-1.2 1v.2h2.6v1h-4.3v-.9l2-1.9c.8-.8 1-1.1 1-1.5 0-.5-.4-.8-1-.8-.5 0-.9.3-.9.9H35zm-1.7 4.3c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm3.2 7.3v-1h.7c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7s-1 .3-1 .8H35c0-1.1 1-1.8 2.2-1.8 1.2 0 2.1.6 2.1 1.6 0 .7-.4 1.2-1 1.3v.1c.7.1 1.3.7 1.3 1.4 0 1-1 1.9-2.4 1.9-1.3 0-2.2-.8-2.3-2h1.2c0 .6.5 1 1.1 1 .6 0 1-.4 1-1 0-.5-.3-.8-1-.8h-.7zm-3.3 2.7c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7z"/></g></svg>',"list-num-default":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M10 17v-4.8l-1.5 1v-1.1l1.6-1h1.2V17h-1.2zm3.6.1c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7zm-5 5.7c0-1.2.8-2 2.1-2s2.1.8 2.1 1.8c0 .7-.3 1.2-1.4 2.2l-1.1 1v.2h2.6v1H8.6v-.9l2-1.9c.8-.8 1-1.1 1-1.5 0-.5-.4-.8-1-.8-.5 0-.9.3-.9.9H8.5zm6.3 4.3c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zM10 34.4v-1h.7c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7s-1 .3-1 .8H8.6c0-1.1 1-1.8 2.2-1.8 1.3 0 2.1.6 2.1 1.6 0 .7-.4 1.2-1 1.3v.1c.8.1 1.3.7 1.3 1.4 0 1-1 1.9-2.4 1.9-1.3 0-2.2-.8-2.3-2h1.2c0 .6.5 1 1.1 1 .7 0 1-.4 1-1 0-.5-.3-.8-1-.8h-.7zm4.7 2.7c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7z"/></g></svg>',"list-num-lower-alpha-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M36.5 16c-.9 0-1.5-.5-1.5-1.3s.6-1.3 1.8-1.4h1v-.4c0-.4-.2-.6-.7-.6-.4 0-.7.1-.8.4h-1.1c0-.8.8-1.4 2-1.4S39 12 39 13V16h-1.2v-.6c-.3.4-.8.7-1.4.7zm.4-.8c.6 0 1-.4 1-.9V14h-1c-.5.1-.7.3-.7.6 0 .4.3.6.7.6zM33.1 16.1c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7zM37.7 26c-.7 0-1.2-.2-1.5-.7v.7H35v-6.3h1.2v2.5c.3-.5.8-.9 1.5-.9 1.1 0 1.8 1 1.8 2.4 0 1.5-.7 2.4-1.8 2.4zm-.5-3.6c-.6 0-1 .5-1 1.3s.4 1.4 1 1.4c.7 0 1-.6 1-1.4 0-.8-.3-1.3-1-1.3zM33.2 26.1c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7zm6 7h-1c-.1-.5-.4-.8-1-.8s-1 .5-1 1.4c0 1 .4 1.4 1 1.4.5 0 .9-.2 1-.7h1c0 1-.8 1.7-2 1.7-1.4 0-2.2-.9-2.2-2.4s.8-2.4 2.2-2.4c1.2 0 2 .7 2 1.7zm-6.1 3c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-lower-alpha":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M10.3 15.2c.5 0 1-.4 1-.9V14h-1c-.5.1-.8.3-.8.6 0 .4.3.6.8.6zm-.4.9c-1 0-1.5-.6-1.5-1.4 0-.8.6-1.3 1.7-1.4h1.1v-.4c0-.4-.2-.6-.7-.6-.5 0-.8.1-.9.4h-1c0-.8.8-1.4 2-1.4 1.1 0 1.8.6 1.8 1.6V16h-1.1v-.6h-.1c-.2.4-.7.7-1.3.7zm4.6 0c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm-3.2 10c-.6 0-1.2-.3-1.4-.8v.7H8.5v-6.3H10v2.5c.3-.5.8-.9 1.4-.9 1.2 0 1.9 1 1.9 2.4 0 1.5-.7 2.4-1.9 2.4zm-.4-3.7c-.7 0-1 .5-1 1.3s.3 1.4 1 1.4c.6 0 1-.6 1-1.4 0-.8-.4-1.3-1-1.3zm4 3.7c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm-2.2 7h-1.2c0-.5-.4-.8-.9-.8-.6 0-1 .5-1 1.4 0 1 .4 1.4 1 1.4.5 0 .8-.2 1-.7h1c0 1-.8 1.7-2 1.7-1.4 0-2.2-.9-2.2-2.4s.8-2.4 2.2-2.4c1.2 0 2 .7 2 1.7zm1.8 3c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-lower-greek-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M37.4 16c-1.2 0-2-.8-2-2.3 0-1.5.8-2.4 2-2.4.6 0 1 .4 1.3 1v-.9H40v3.2c0 .4.1.5.4.5h.2v.9h-.6c-.6 0-1-.2-1-.7h-.2c-.2.4-.7.8-1.3.8zm.3-1c.6 0 1-.5 1-1.3s-.4-1.3-1-1.3-1 .5-1 1.3.4 1.4 1 1.4zM33.3 16.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zM36 21.9c0-1.5.8-2.3 2.1-2.3 1.2 0 2 .6 2 1.6 0 .6-.3 1-.9 1.3.9.3 1.3.8 1.3 1.7 0 1.2-.7 1.9-1.8 1.9-.6 0-1.1-.3-1.4-.8v2.2H36V22zm1.8 1.2v-1h.3c.5 0 .9-.2.9-.7 0-.5-.3-.8-.9-.8-.5 0-.8.3-.8 1v2.2c0 .8.4 1.3 1 1.3s1-.4 1-1-.4-1-1.2-1h-.3zM33.3 26.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zM37.1 34.6L34.8 30h1.4l1.7 3.5 1.7-3.5h1.1l-2.2 4.6v.1c.5.8.7 1.4.7 1.8 0 .4-.2.8-.4 1-.2.2-.6.3-1 .3-.9 0-1.3-.4-1.3-1.2 0-.5.2-1 .5-1.7l.1-.2zm.7 1a2 2 0 00-.4.9c0 .3.1.4.4.4.3 0 .4-.1.4-.4 0-.2-.1-.6-.4-1zM33.3 36.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-lower-greek":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M10.5 15c.7 0 1-.5 1-1.3s-.3-1.3-1-1.3c-.5 0-.9.5-.9 1.3s.4 1.4 1 1.4zm-.3 1c-1.1 0-1.8-.8-1.8-2.3 0-1.5.7-2.4 1.8-2.4.7 0 1.1.4 1.3 1h.1v-.9h1.2v3.2c0 .4.1.5.4.5h.2v.9h-.6c-.6 0-1-.2-1.1-.7h-.1c-.2.4-.7.8-1.4.8zm5 .1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7zm-4.9 7v-1h.3c.6 0 1-.2 1-.7 0-.5-.4-.8-1-.8-.5 0-.8.3-.8 1v2.2c0 .8.4 1.3 1.1 1.3.6 0 1-.4 1-1s-.5-1-1.3-1h-.3zM8.6 22c0-1.5.7-2.3 2-2.3 1.2 0 2 .6 2 1.6 0 .6-.3 1-.8 1.3.8.3 1.3.8 1.3 1.7 0 1.2-.8 1.9-1.9 1.9-.6 0-1.1-.3-1.3-.8v2.2H8.5V22zm6.2 4.2c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7zm-4.5 8.5L8 30h1.4l1.7 3.5 1.7-3.5h1.1l-2.2 4.6v.1c.5.8.7 1.4.7 1.8 0 .4-.1.8-.4 1-.2.2-.6.3-1 .3-.9 0-1.3-.4-1.3-1.2 0-.5.2-1 .5-1.7l.1-.2zm.7 1a2 2 0 00-.4.9c0 .3.1.4.4.4.3 0 .4-.1.4-.4 0-.2-.1-.6-.4-1zm4.5.5c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-lower-roman-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M32.9 16v-1.2h-1.3V16H33zm0 10v-1.2h-1.3V26H33zm0 10v-1.2h-1.3V36H33z"/><path fill-rule="nonzero" d="M36 21h-1.5v5H36zM36 31h-1.5v5H36zM39 21h-1.5v5H39zM39 31h-1.5v5H39zM42 31h-1.5v5H42zM36 11h-1.5v5H36zM36 19h-1.5v1H36zM36 29h-1.5v1H36zM39 19h-1.5v1H39zM39 29h-1.5v1H39zM42 29h-1.5v1H42zM36 9h-1.5v1H36z"/></g></svg>',"list-num-lower-roman":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M15.1 16v-1.2h1.3V16H15zm0 10v-1.2h1.3V26H15zm0 10v-1.2h1.3V36H15z"/><path fill-rule="nonzero" d="M12 21h1.5v5H12zM12 31h1.5v5H12zM9 21h1.5v5H9zM9 31h1.5v5H9zM6 31h1.5v5H6zM12 11h1.5v5H12zM12 19h1.5v1H12zM12 29h1.5v1H12zM9 19h1.5v1H9zM9 29h1.5v1H9zM6 29h1.5v1H6zM12 9h1.5v1H12z"/></g></svg>',"list-num-upper-alpha-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M39.3 17l-.5-1.4h-2l-.5 1.4H35l2-6h1.6l2 6h-1.3zm-1.6-4.7l-.7 2.3h1.6l-.8-2.3zM33.4 17c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7zm4.7 9.9h-2.7v-6H38c1.2 0 1.9.6 1.9 1.5 0 .6-.5 1.2-1 1.3.7.1 1.3.7 1.3 1.5 0 1-.8 1.7-2 1.7zm-1.4-5v1.5h1c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7h-1zm0 4h1.1c.7 0 1.1-.3 1.1-.8 0-.6-.4-.9-1.1-.9h-1.1V26zM33 27.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm4.9 10c-1.8 0-2.8-1.1-2.8-3.1s1-3.1 2.8-3.1c1.4 0 2.5.9 2.6 2.2h-1.3c0-.7-.6-1.1-1.3-1.1-1 0-1.6.7-1.6 2s.6 2 1.6 2c.7 0 1.2-.4 1.4-1h1.2c-.1 1.3-1.2 2.2-2.6 2.2zm-4.5 0c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-upper-alpha":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M12.6 17l-.5-1.4h-2L9.5 17H8.3l2-6H12l2 6h-1.3zM11 12.3l-.7 2.3h1.6l-.8-2.3zm4.7 4.8c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7zM11.4 27H8.7v-6h2.6c1.2 0 1.9.6 1.9 1.5 0 .6-.5 1.2-1 1.3.7.1 1.3.7 1.3 1.5 0 1-.8 1.7-2 1.7zM10 22v1.5h1c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7h-1zm0 4H11c.7 0 1.1-.3 1.1-.8 0-.6-.4-.9-1.1-.9H10V26zm5.4 1.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm-4.1 10c-1.8 0-2.8-1.1-2.8-3.1s1-3.1 2.8-3.1c1.4 0 2.5.9 2.6 2.2h-1.3c0-.7-.6-1.1-1.3-1.1-1 0-1.6.7-1.6 2s.6 2 1.6 2c.7 0 1.2-.4 1.4-1h1.2c-.1 1.3-1.2 2.2-2.6 2.2zm4.5 0c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',"list-num-upper-roman-rtl":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M31.6 17v-1.2H33V17h-1.3zm0 10v-1.2H33V27h-1.3zm0 10v-1.2H33V37h-1.3z"/><path fill-rule="nonzero" d="M34.5 20H36v7h-1.5zM34.5 30H36v7h-1.5zM37.5 20H39v7h-1.5zM37.5 30H39v7h-1.5zM40.5 30H42v7h-1.5zM34.5 10H36v7h-1.5z"/></g></svg>',"list-num-upper-roman":'<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M15.1 17v-1.2h1.3V17H15zm0 10v-1.2h1.3V27H15zm0 10v-1.2h1.3V37H15z"/><path fill-rule="nonzero" d="M12 20h1.5v7H12zM12 30h1.5v7H12zM9 20h1.5v7H9zM9 30h1.5v7H9zM6 30h1.5v7H6zM12 10h1.5v7H12z"/></g></svg>',lock:'<svg width="24" height="24"><path d="M16.3 11c.2 0 .3 0 .5.2l.2.6v7.4c0 .3 0 .4-.2.6l-.6.2H7.8c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6v-7.4c0-.3 0-.4.2-.6l.5-.2H8V8c0-.8.3-1.5.9-2.1.6-.6 1.3-.9 2.1-.9h2c.8 0 1.5.3 2.1.9.6.6.9 1.3.9 2.1v3h.3zM10 8v3h4V8a1 1 0 00-.3-.7A1 1 0 0013 7h-2a1 1 0 00-.7.3 1 1 0 00-.3.7z" fill-rule="evenodd"/></svg>',ltr:'<svg width="24" height="24"><path d="M11 5h7a1 1 0 010 2h-1v11a1 1 0 01-2 0V7h-2v11a1 1 0 01-2 0v-6c-.5 0-1 0-1.4-.3A3.4 3.4 0 017.8 10a3.3 3.3 0 010-2.8 3.4 3.4 0 011.8-1.8L11 5zM4.4 16.2L6.2 15l-1.8-1.2a1 1 0 011.2-1.6l3 2a1 1 0 010 1.6l-3 2a1 1 0 11-1.2-1.6z" fill-rule="evenodd"/></svg>',"more-drawer":'<svg width="24" height="24"><path d="M6 10a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2zm12 0a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2zm-6 0a2 2 0 00-2 2c0 1.1.9 2 2 2a2 2 0 002-2 2 2 0 00-2-2z" fill-rule="nonzero"/></svg>',"new-document":'<svg width="24" height="24"><path d="M14.4 3H7a2 2 0 00-2 2v14c0 1.1.9 2 2 2h10a2 2 0 002-2V7.6L14.4 3zM17 19H7V5h6v4h4v10z" fill-rule="nonzero"/></svg>',"new-tab":'<svg width="24" height="24"><path d="M15 13l2-2v8H5V7h8l-2 2H7v8h8v-4zm4-8v5.5l-2-2-5.6 5.5H10v-1.4L15.5 7l-2-2H19z" fill-rule="evenodd"/></svg>',"non-breaking":'<svg width="24" height="24"><path d="M11 11H8a1 1 0 110-2h3V6c0-.6.4-1 1-1s1 .4 1 1v3h3c.6 0 1 .4 1 1s-.4 1-1 1h-3v3c0 .6-.4 1-1 1a1 1 0 01-1-1v-3zm10 4v5H3v-5c0-.6.4-1 1-1s1 .4 1 1v3h14v-3c0-.6.4-1 1-1s1 .4 1 1z" fill-rule="evenodd"/></svg>',notice:'<svg width="24" height="24"><path d="M17.8 9.8L15.4 4 20 8.5v7L15.5 20h-7L4 15.5v-7L8.5 4h7l2.3 5.8zm0 0l2.2 5.7-2.3-5.8zM13 17v-2h-2v2h2zm0-4V7h-2v6h2z" fill-rule="evenodd"/></svg>',"ordered-list-rtl":'<svg width="24" height="24"><path d="M6 17h8a1 1 0 010 2H6a1 1 0 010-2zm0-6h8a1 1 0 010 2H6a1 1 0 010-2zm0-6h8a1 1 0 010 2H6a1 1 0 110-2zm13-1v3.5a.5.5 0 11-1 0V5h-.5a.5.5 0 110-1H19zm-1 8.8l.2.2h1.3a.5.5 0 110 1h-1.6a1 1 0 01-.9-1V13c0-.4.3-.8.6-1l1.2-.4.2-.3a.2.2 0 00-.2-.2h-1.3a.5.5 0 01-.5-.5c0-.3.2-.5.5-.5h1.6c.5 0 .9.4.9 1v.1c0 .4-.3.8-.6 1l-1.2.4-.2.3zm2 4.2v2c0 .6-.4 1-1 1h-1.5a.5.5 0 010-1h1.2a.3.3 0 100-.6h-1.3a.4.4 0 110-.8h1.3a.3.3 0 000-.6h-1.2a.5.5 0 110-1H19c.6 0 1 .4 1 1z" fill-rule="evenodd"/></svg>',"ordered-list":'<svg width="24" height="24"><path d="M10 17h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 110-2zM6 4v3.5c0 .3-.2.5-.5.5a.5.5 0 01-.5-.5V5h-.5a.5.5 0 010-1H6zm-1 8.8l.2.2h1.3c.3 0 .5.2.5.5s-.2.5-.5.5H4.9a1 1 0 01-.9-1V13c0-.4.3-.8.6-1l1.2-.4.2-.3a.2.2 0 00-.2-.2H4.5a.5.5 0 01-.5-.5c0-.3.2-.5.5-.5h1.6c.5 0 .9.4.9 1v.1c0 .4-.3.8-.6 1l-1.2.4-.2.3zM7 17v2c0 .6-.4 1-1 1H4.5a.5.5 0 010-1h1.2c.2 0 .3-.1.3-.3 0-.2-.1-.3-.3-.3H4.4a.4.4 0 110-.8h1.3c.2 0 .3-.1.3-.3 0-.2-.1-.3-.3-.3H4.5a.5.5 0 110-1H6c.6 0 1 .4 1 1z" fill-rule="evenodd"/></svg>',orientation:'<svg width="24" height="24"><path d="M7.3 6.4L1 13l6.4 6.5 6.5-6.5-6.5-6.5zM3.7 13l3.6-3.7L11 13l-3.7 3.7-3.6-3.7zM12 6l2.8 2.7c.3.3.3.8 0 1-.3.4-.9.4-1.2 0L9.2 5.7a.8.8 0 010-1.2L13.6.2c.3-.3.9-.3 1.2 0 .3.3.3.8 0 1.1L12 4h1a9 9 0 11-4.3 16.9l1.5-1.5A7 7 0 1013 6h-1z" fill-rule="nonzero"/></svg>',outdent:'<svg width="24" height="24"><path d="M7 5h12c.6 0 1 .4 1 1s-.4 1-1 1H7a1 1 0 110-2zm5 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 010-2zm0 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 010-2zm-5 4h12a1 1 0 010 2H7a1 1 0 010-2zm1.6-3.8a1 1 0 01-1.2 1.6l-3-2a1 1 0 010-1.6l3-2a1 1 0 011.2 1.6L6.8 12l1.8 1.2z" fill-rule="evenodd"/></svg>',"page-break":'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M5 11c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zm3 0h1c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 010-2zm4 0c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zm3 0h1c.6 0 1 .4 1 1s-.4 1-1 1h-1a1 1 0 010-2zm4 0c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zM7 3v5h10V3c0-.6.4-1 1-1s1 .4 1 1v7H5V3c0-.6.4-1 1-1s1 .4 1 1zM6 22a1 1 0 01-1-1v-7h14v7c0 .6-.4 1-1 1a1 1 0 01-1-1v-5H7v5c0 .6-.4 1-1 1z"/></g></svg>',paragraph:'<svg width="24" height="24"><path fill-rule="evenodd" d="M10 5h7a1 1 0 010 2h-1v11a1 1 0 01-2 0V7h-2v11a1 1 0 01-2 0v-6c-.5 0-1 0-1.4-.3A3.4 3.4 0 016.8 10a3.3 3.3 0 010-2.8 3.4 3.4 0 011.8-1.8L10 5z"/></svg>',"paste-column-after":'<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 012.8 2H18c1 0 2 .8 2 1.9V7h-2V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h7v2H6c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2H9.2A3 3 0 0112 1zm8 7v12h-6V8h6zm-1.5 1.5h-3v9h3v-9zM12 3a1 1 0 100 2 1 1 0 000-2z"/></svg>',"paste-column-before":'<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 012.8 2H18c1 0 2 .8 2 1.9V18c0 1-.8 2-1.9 2H11v-2h7V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v2H4V5c0-1 .8-2 1.9-2H9.2A3 3 0 0112 1zm-2 7v12H4V8h6zM8.5 9.5h-3v9h3v-9zM12 3a1 1 0 100 2 1 1 0 000-2z"/></svg>',"paste-row-after":'<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 012.8 2H18c1 0 2 .8 2 1.9V11h-2V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h14c0 1-.8 2-1.9 2H6c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2H9.2A3 3 0 0112 1zm10 11v5H8v-5h14zm-1.5 1.5h-11v2h11v-2zM12 3a1 1 0 100 2 1 1 0 000-2z"/></svg>',"paste-row-before":'<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 012.8 2H18c1 0 2 .8 2 1.9V7h-2V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h12v-4h2v4c0 1-.8 2-1.9 2H6c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2H9.2A3 3 0 0112 1zm10 7v5H8V8h14zm-1.5 1.5h-11v2h11v-2zM12 3a1 1 0 100 2 1 1 0 000-2z"/></svg>',"paste-text":'<svg width="24" height="24"><path d="M18 9V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h3V9h9zM9 20H6a2 2 0 01-2-2V5c0-1.1.9-2 2-2h3.2A3 3 0 0112 1a3 3 0 012.8 2H18a2 2 0 012 2v4h1v12H9v-1zm1.5-9.5v9h9v-9h-9zM12 3a1 1 0 00-1 1c0 .5.4 1 1 1s1-.5 1-1-.4-1-1-1zm0 9h6v2h-.5l-.5-1h-1v4h.8v1h-3.6v-1h.8v-4h-1l-.5 1H12v-2z" fill-rule="nonzero"/></svg>',paste:'<svg width="24" height="24"><path d="M18 9V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 01-1-1V5H6v13h3V9h9zM9 20H6a2 2 0 01-2-2V5c0-1.1.9-2 2-2h3.2A3 3 0 0112 1a3 3 0 012.8 2H18a2 2 0 012 2v4h1v12H9v-1zm1.5-9.5v9h9v-9h-9zM12 3a1 1 0 00-1 1c0 .5.4 1 1 1s1-.5 1-1-.4-1-1-1z" fill-rule="nonzero"/></svg>',"permanent-pen":'<svg width="24" height="24"><path d="M10.5 17.5L8 20H3v-3l3.5-3.5a2 2 0 010-3L14 3l1 1-7.3 7.3a1 1 0 000 1.4l3.6 3.6c.4.4 1 .4 1.4 0L20 9l1 1-7.6 7.6a2 2 0 01-2.8 0l-.1-.1z" fill-rule="nonzero"/></svg>',plus:'<svg width="24" height="24"><path d="M12 4c.5 0 1 .4 1 .9V11h6a1 1 0 01.1 2H13v6a1 1 0 01-2 .1V13H5a1 1 0 01-.1-2H11V5c0-.6.4-1 1-1z"/></svg>',preferences:'<svg width="24" height="24"><path d="M20.1 13.5l-1.9.2a5.8 5.8 0 01-.6 1.5l1.2 1.5c.4.4.3 1 0 1.4l-.7.7a1 1 0 01-1.4 0l-1.5-1.2a6.2 6.2 0 01-1.5.6l-.2 1.9c0 .5-.5.9-1 .9h-1a1 1 0 01-1-.9l-.2-1.9a5.8 5.8 0 01-1.5-.6l-1.5 1.2a1 1 0 01-1.4 0l-.7-.7a1 1 0 010-1.4l1.2-1.5a6.2 6.2 0 01-.6-1.5l-1.9-.2a1 1 0 01-.9-1v-1c0-.5.4-1 .9-1l1.9-.2a5.8 5.8 0 01.6-1.5L5.2 7.3a1 1 0 010-1.4l.7-.7a1 1 0 011.4 0l1.5 1.2a6.2 6.2 0 011.5-.6l.2-1.9c0-.5.5-.9 1-.9h1c.5 0 1 .4 1 .9l.2 1.9a5.8 5.8 0 011.5.6l1.5-1.2a1 1 0 011.4 0l.7.7c.3.4.4 1 0 1.4l-1.2 1.5a6.2 6.2 0 01.6 1.5l1.9.2c.5 0 .9.5.9 1v1c0 .5-.4 1-.9 1zM12 15a3 3 0 100-6 3 3 0 000 6z" fill-rule="evenodd"/></svg>',preview:'<svg width="24" height="24"><path d="M3.5 12.5c.5.8 1.1 1.6 1.8 2.3 2 2 4.2 3.2 6.7 3.2s4.7-1.2 6.7-3.2a16.2 16.2 0 002.1-2.8 15.7 15.7 0 00-2.1-2.8c-2-2-4.2-3.2-6.7-3.2a9.3 9.3 0 00-6.7 3.2A16.2 16.2 0 003.2 12c0 .2.2.3.3.5zm-2.4-1l.7-1.2L4 7.8C6.2 5.4 8.9 4 12 4c3 0 5.8 1.4 8.1 3.8a18.2 18.2 0 012.8 3.7v1l-.7 1.2-2.1 2.5c-2.3 2.4-5 3.8-8.1 3.8-3 0-5.8-1.4-8.1-3.8a18.2 18.2 0 01-2.8-3.7 1 1 0 010-1zm12-3.3a2 2 0 102.7 2.6 4 4 0 11-2.6-2.6z" fill-rule="nonzero"/></svg>',print:'<svg width="24" height="24"><path d="M18 8H6a3 3 0 00-3 3v6h2v3h14v-3h2v-6a3 3 0 00-3-3zm-1 10H7v-4h10v4zm.5-5c-.8 0-1.5-.7-1.5-1.5s.7-1.5 1.5-1.5 1.5.7 1.5 1.5-.7 1.5-1.5 1.5zm.5-8H6v2h12V5z" fill-rule="nonzero"/></svg>',quote:'<svg width="24" height="24"><path d="M7.5 17h.9c.4 0 .7-.2.9-.6L11 13V8c0-.6-.4-1-1-1H6a1 1 0 00-1 1v4c0 .6.4 1 1 1h2l-1.3 2.7a1 1 0 00.8 1.3zm8 0h.9c.4 0 .7-.2.9-.6L19 13V8c0-.6-.4-1-1-1h-4a1 1 0 00-1 1v4c0 .6.4 1 1 1h2l-1.3 2.7a1 1 0 00.8 1.3z" fill-rule="nonzero"/></svg>',redo:'<svg width="24" height="24"><path d="M17.6 10H12c-2.8 0-4.4 1.4-4.9 3.5-.4 2 .3 4 1.4 4.6a1 1 0 11-1 1.8c-2-1.2-2.9-4.1-2.3-6.8.6-3 3-5.1 6.8-5.1h5.6l-3.3-3.3a1 1 0 111.4-1.4l5 5a1 1 0 010 1.4l-5 5a1 1 0 01-1.4-1.4l3.3-3.3z" fill-rule="nonzero"/></svg>',reload:'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M5 22.1l-1.2-4.7v-.2a1 1 0 011-1l5 .4a1 1 0 11-.2 2l-2.2-.2a7.8 7.8 0 008.4.2 7.5 7.5 0 003.5-6.4 1 1 0 112 0 9.5 9.5 0 01-4.5 8 9.9 9.9 0 01-10.2 0l.4 1.4a1 1 0 11-2 .5zM13.6 7.4c0-.5.5-1 1-.9l2.8.2a8 8 0 00-9.5-1 7.5 7.5 0 00-3.6 7 1 1 0 01-2 0 9.5 9.5 0 014.5-8.6 10 10 0 0110.9.3l-.3-1a1 1 0 012-.5l1.1 4.8a1 1 0 01-1 1.2l-5-.4a1 1 0 01-.9-1z"/></g></svg>',"remove-formatting":'<svg width="24" height="24"><path d="M13.2 6a1 1 0 010 .2l-2.6 10a1 1 0 01-1 .8h-.2a.8.8 0 01-.8-1l2.6-10H8a1 1 0 110-2h9a1 1 0 010 2h-3.8zM5 18h7a1 1 0 010 2H5a1 1 0 010-2zm13 1.5L16.5 18 15 19.5a.7.7 0 01-1-1l1.5-1.5-1.5-1.5a.7.7 0 011-1l1.5 1.5 1.5-1.5a.7.7 0 011 1L17.5 17l1.5 1.5a.7.7 0 01-1 1z" fill-rule="evenodd"/></svg>',remove:'<svg width="24" height="24"><path d="M16 7h3a1 1 0 010 2h-1v9a3 3 0 01-3 3H9a3 3 0 01-3-3V9H5a1 1 0 110-2h3V6a3 3 0 013-3h2a3 3 0 013 3v1zm-2 0V6c0-.6-.4-1-1-1h-2a1 1 0 00-1 1v1h4zm2 2H8v9c0 .6.4 1 1 1h6c.6 0 1-.4 1-1V9zm-7 3a1 1 0 012 0v4a1 1 0 01-2 0v-4zm4 0a1 1 0 012 0v4a1 1 0 01-2 0v-4z" fill-rule="nonzero"/></svg>',"resize-handle":'<svg width="10" height="10"><g fill-rule="nonzero"><path d="M8.1 1.1A.5.5 0 119 2l-7 7A.5.5 0 111 8l7-7zM8.1 5.1A.5.5 0 119 6l-3 3A.5.5 0 115 8l3-3z"/></g></svg>',resize:'<svg width="24" height="24"><path d="M4 5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h6c.3 0 .5.1.7.3.2.2.3.4.3.7 0 .3-.1.5-.3.7a1 1 0 01-.7.3H7.4L18 16.6V13c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3.3 0 .5.1.7.3.2.2.3.4.3.7v6c0 .3-.1.5-.3.7a1 1 0 01-.7.3h-6a1 1 0 01-.7-.3 1 1 0 01-.3-.7c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h3.6L6 7.4V11c0 .3-.1.5-.3.7a1 1 0 01-.7.3 1 1 0 01-.7-.3A1 1 0 014 11V5z" fill-rule="evenodd"/></svg>',"restore-draft":'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M17 13c0 .6-.4 1-1 1h-4V8c0-.6.4-1 1-1s1 .4 1 1v4h2c.6 0 1 .4 1 1z"/><path d="M4.7 10H9a1 1 0 010 2H3a1 1 0 01-1-1V5a1 1 0 112 0v3l2.5-2.4a9.2 9.2 0 0110.8-1.5A9 9 0 0113.4 21c-2.4.1-4.7-.7-6.5-2.2a1 1 0 111.3-1.5 7.2 7.2 0 0011.6-3.7 7 7 0 00-3.5-7.7A7.2 7.2 0 008 7L4.7 10z" fill-rule="nonzero"/></g></svg>',"rotate-left":'<svg width="24" height="24"><path d="M4.7 10H9a1 1 0 010 2H3a1 1 0 01-1-1V5a1 1 0 112 0v3l2.5-2.4a9.2 9.2 0 0110.8-1.5A9 9 0 0113.4 21c-2.4.1-4.7-.7-6.5-2.2a1 1 0 111.3-1.5 7.2 7.2 0 0011.6-3.7 7 7 0 00-3.5-7.7A7.2 7.2 0 008 7L4.7 10z" fill-rule="nonzero"/></svg>',"rotate-right":'<svg width="24" height="24"><path d="M20 8V5a1 1 0 012 0v6c0 .6-.4 1-1 1h-6a1 1 0 010-2h4.3L16 7A7.2 7.2 0 007.7 6a7 7 0 003 13.1c1.9.1 3.7-.5 5-1.7a1 1 0 011.4 1.5A9.2 9.2 0 012.2 14c-.9-3.9 1-8 4.5-9.9 3.5-1.9 8-1.3 10.8 1.5L20 8z" fill-rule="nonzero"/></svg>',rtl:'<svg width="24" height="24"><path d="M8 5h8v2h-2v12h-2V7h-2v12H8v-7c-.5 0-1 0-1.4-.3A3.4 3.4 0 014.8 10a3.3 3.3 0 010-2.8 3.4 3.4 0 011.8-1.8L8 5zm12 11.2a1 1 0 11-1 1.6l-3-2a1 1 0 010-1.6l3-2a1 1 0 111 1.6L18.4 15l1.8 1.2z" fill-rule="evenodd"/></svg>',save:'<svg width="24" height="24"><path d="M5 16h14a2 2 0 012 2v2a2 2 0 01-2 2H5a2 2 0 01-2-2v-2c0-1.1.9-2 2-2zm0 2v2h14v-2H5zm10 0h2v2h-2v-2zm-4-6.4L8.7 9.3a1 1 0 10-1.4 1.4l4 4c.4.4 1 .4 1.4 0l4-4a1 1 0 10-1.4-1.4L13 11.6V4a1 1 0 00-2 0v7.6z" fill-rule="nonzero"/></svg>',search:'<svg width="24" height="24"><path d="M16 17.3a8 8 0 111.4-1.4l4.3 4.4a1 1 0 01-1.4 1.4l-4.4-4.3zm-5-.3a6 6 0 100-12 6 6 0 000 12z" fill-rule="nonzero"/></svg>',"select-all":'<svg width="24" height="24"><path d="M3 5h2V3a2 2 0 00-2 2zm0 8h2v-2H3v2zm4 8h2v-2H7v2zM3 9h2V7H3v2zm10-6h-2v2h2V3zm6 0v2h2a2 2 0 00-2-2zM5 21v-2H3c0 1.1.9 2 2 2zm-2-4h2v-2H3v2zM9 3H7v2h2V3zm2 18h2v-2h-2v2zm8-8h2v-2h-2v2zm0 8a2 2 0 002-2h-2v2zm0-12h2V7h-2v2zm0 8h2v-2h-2v2zm-4 4h2v-2h-2v2zm0-16h2V3h-2v2zM7 17h10V7H7v10zm2-8h6v6H9V9z" fill-rule="nonzero"/></svg>',selected:'<svg width="24" height="24"><path fill-rule="nonzero" d="M6 4h12a2 2 0 012 2v12a2 2 0 01-2 2H6a2 2 0 01-2-2V6c0-1.1.9-2 2-2zm3.6 10.9L7 12.3a.7.7 0 00-1 1L9.6 17 18 8.6a.7.7 0 000-1 .7.7 0 00-1 0l-7.4 7.3z"/></svg>',settings:'<svg width="24" height="24"><path d="M11 6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8v.3c0 .2 0 .3-.2.5l-.6.2H7.8c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6V8H5a1 1 0 110-2h2v-.3c0-.2 0-.3.2-.5l.5-.2h2.5c.3 0 .4 0 .6.2l.2.5V6zM8 8h2V6H8v2zm9 2.8v.2h2c.6 0 1 .4 1 1s-.4 1-1 1h-2v.3c0 .2 0 .3-.2.5l-.6.2h-2.4c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6V13H5a1 1 0 010-2h8v-.3c0-.2 0-.3.2-.5l.6-.2h2.4c.3 0 .4 0 .6.2l.2.6zM14 13h2v-2h-2v2zm-3 2.8v.2h8c.6 0 1 .4 1 1s-.4 1-1 1h-8v.3c0 .2 0 .3-.2.5l-.6.2H7.8c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6V18H5a1 1 0 010-2h2v-.3c0-.2 0-.3.2-.5l.5-.2h2.5c.3 0 .4 0 .6.2l.2.6zM8 18h2v-2H8v2z" fill-rule="evenodd"/></svg>',sharpen:'<svg width="24" height="24"><path d="M16 6l4 4-8 9-8-9 4-4h8zm-4 10.2l5.5-6.2-.1-.1H12v-.3h5.1l-.2-.2H12V9h4.6l-.2-.2H12v-.3h4.1l-.2-.2H12V8h3.6l-.2-.2H8.7L6.5 10l.1.1H12v.3H6.9l.2.2H12v.3H7.3l.2.2H12v.3H7.7l.3.2h4v.3H8.2l.2.2H12v.3H8.6l.3.2H12v.3H9l.3.2H12v.3H9.5l.2.2H12v.3h-2l.2.2H12v.3h-1.6l.2.2H12v.3h-1.1l.2.2h.9v.3h-.7l.2.2h.5v.3h-.3l.3.2z" fill-rule="evenodd"/></svg>',sourcecode:'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M9.8 15.7c.3.3.3.8 0 1-.3.4-.9.4-1.2 0l-4.4-4.1a.8.8 0 010-1.2l4.4-4.2c.3-.3.9-.3 1.2 0 .3.3.3.8 0 1.1L6 12l3.8 3.7zM14.2 15.7c-.3.3-.3.8 0 1 .4.4.9.4 1.2 0l4.4-4.1c.3-.3.3-.9 0-1.2l-4.4-4.2a.8.8 0 00-1.2 0c-.3.3-.3.8 0 1.1L18 12l-3.8 3.7z"/></g></svg>',"spell-check":'<svg width="24" height="24"><path d="M6 8v3H5V5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h2c.3 0 .5.1.7.3.2.2.3.4.3.7v6H8V8H6zm0-3v2h2V5H6zm13 0h-3v5h3v1h-3a1 1 0 01-.7-.3 1 1 0 01-.3-.7V5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h3v1zm-5 1.5l-.1.7c-.1.2-.3.3-.6.3.3 0 .5.1.6.3l.1.7V10c0 .3-.1.5-.3.7a1 1 0 01-.7.3h-3V4h3c.3 0 .5.1.7.3.2.2.3.4.3.7v1.5zM13 10V8h-2v2h2zm0-3V5h-2v2h2zm3 5l1 1-6.5 7L7 15.5l1.3-1 2.2 2.2L16 12z" fill-rule="evenodd"/></svg>',"strike-through":'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M15.6 8.5c-.5-.7-1-1.1-1.3-1.3-.6-.4-1.3-.6-2-.6-2.7 0-2.8 1.7-2.8 2.1 0 1.6 1.8 2 3.2 2.3 4.4.9 4.6 2.8 4.6 3.9 0 1.4-.7 4.1-5 4.1A6.2 6.2 0 017 16.4l1.5-1.1c.4.6 1.6 2 3.7 2 1.6 0 2.5-.4 3-1.2.4-.8.3-2-.8-2.6-.7-.4-1.6-.7-2.9-1-1-.2-3.9-.8-3.9-3.6C7.6 6 10.3 5 12.4 5c2.9 0 4.2 1.6 4.7 2.4l-1.5 1.1z"/><path d="M5 11h14a1 1 0 010 2H5a1 1 0 010-2z" fill-rule="nonzero"/></g></svg>',subscript:'<svg width="24" height="24"><path d="M10.4 10l4.6 4.6-1.4 1.4L9 11.4 4.4 16 3 14.6 7.6 10 3 5.4 4.4 4 9 8.6 13.6 4 15 5.4 10.4 10zM21 19h-5v-1l1-.8 1.7-1.6c.3-.4.5-.8.5-1.2 0-.3 0-.6-.2-.7-.2-.2-.5-.3-.9-.3a2 2 0 00-.8.2l-.7.3-.4-1.1 1-.6 1.2-.2c.8 0 1.4.3 1.8.7.4.4.6.9.6 1.5s-.2 1.1-.5 1.6a8 8 0 01-1.3 1.3l-.6.6h2.6V19z" fill-rule="nonzero"/></svg>',superscript:'<svg width="24" height="24"><path d="M15 9.4L10.4 14l4.6 4.6-1.4 1.4L9 15.4 4.4 20 3 18.6 7.6 14 3 9.4 4.4 8 9 12.6 13.6 8 15 9.4zm5.9 1.6h-5v-1l1-.8 1.7-1.6c.3-.5.5-.9.5-1.3 0-.3 0-.5-.2-.7-.2-.2-.5-.3-.9-.3l-.8.2-.7.4-.4-1.2c.2-.2.5-.4 1-.5.3-.2.8-.2 1.2-.2.8 0 1.4.2 1.8.6.4.4.6 1 .6 1.6 0 .5-.2 1-.5 1.5l-1.3 1.4-.6.5h2.6V11z" fill-rule="nonzero"/></svg>',"table-caption":'<svg width="24" height="24"><g fill-rule="nonzero"><rect width="12" height="2" x="3" y="4" rx="1"/><path d="M19 8a2 2 0 012 2v8a2 2 0 01-2 2H5a2 2 0 01-2-2v-8c0-1.1.9-2 2-2h14zM5 15v3h6v-3H5zm14 0h-6v3h6v-3zm0-5h-6v3h6v-3zM5 13h6v-3H5v3z"/></g></svg>',"table-cell-classes":'<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M13 4v9H3V6c0-1.1.9-2 2-2h8zm-2 2H5v5h6V6z"/><path fill-rule="nonzero" d="M13 4h6a2 2 0 012 2v7h-8v-2h6V6h-6V4z" opacity=".2"/><path d="M18 20l-2.6 1.6.7-3-2.4-2 3.1-.2 1.2-2.9 1.2 2.9 3 .2-2.3 2 .7 3z"/><path fill-rule="nonzero" d="M3 13v5c0 1.1.9 2 2 2h8v-7h-2v5H5v-5H3z" opacity=".2"/></g></svg>',"table-cell-properties":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm-8 9H5v5h6v-5zm8 0h-6v5h6v-5zm-8-7H5v5h6V6z"/></svg>',"table-cell-select-all":'<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm0 2H5v12h14V6z"/><path d="M13 6v5h6v2h-6v5h-2v-5H5v-2h6V6h2z" opacity=".2"/></g></svg>',"table-cell-select-inner":'<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm0 2H5v12h14V6z" opacity=".2"/><path d="M13 6v5h6v2h-6v5h-2v-5H5v-2h6V6h2z"/></g></svg>',"table-classes":'<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v7h-8v7H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm-8 9H5v5h6v-5zm8-7h-6v5h6V6zm-8 0H5v5h6V6z"/><path d="M18 20l-2.6 1.6.7-3-2.4-2 3.1-.2 1.2-2.9 1.2 2.9 3 .2-2.3 2 .7 3z"/></g></svg>',"table-delete-column":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm-4 4h-2V6h-2v2H9V6H5v12h4v-2h2v2h2v-2h2v2h4V6h-4v2zm.3.5l1 1.2-3 2.3 3 2.3-1 1.2L12 13l-3.3 2.6-1-1.2 3-2.3-3-2.3 1-1.2L12 11l3.3-2.5z"/></svg>',"table-delete-row":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm0 2H5v3h2.5v2H5v2h2.5v2H5v3h14v-3h-2.5v-2H19v-2h-2.5V9H19V6zm-4.7 1.8l1.2 1L13 12l2.6 3.3-1.2 1-2.3-3-2.3 3-1.2-1L11 12 8.5 8.7l1.2-1 2.3 3 2.3-3z"/></svg>',"table-delete-table":'<svg width="24" height="24"><g fill-rule="nonzero"><path d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM5 6v12h14V6H5z"/><path d="M14.4 8.6l1 1-2.3 2.4 2.3 2.4-1 1-2.4-2.3-2.4 2.3-1-1 2.3-2.4-2.3-2.4 1-1 2.4 2.3z"/></g></svg>',"table-insert-column-after":'<svg width="24" height="24"><path fill-rule="nonzero" d="M20 4c.6 0 1 .4 1 1v2a1 1 0 01-2 0V6h-8v12h8v-1a1 1 0 012 0v2c0 .5-.4 1-.9 1H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h15zM9 13H5v5h4v-5zm7-5c.5 0 1 .4 1 .9V11h2a1 1 0 01.1 2H17v2a1 1 0 01-2 .1V13h-2a1 1 0 01-.1-2H15V9c0-.6.4-1 1-1zM9 6H5v5h4V6z"/></svg>',"table-insert-column-before":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H4a1 1 0 01-1-1v-2a1 1 0 012 0v1h8V6H5v1a1 1 0 11-2 0V5c0-.6.4-1 1-1h15zm0 9h-4v5h4v-5zM8 8c.5 0 1 .4 1 .9V11h2a1 1 0 01.1 2H9v2a1 1 0 01-2 .1V13H5a1 1 0 01-.1-2H7V9c0-.6.4-1 1-1zm11-2h-4v5h4V6z"/></svg>',"table-insert-row-above":'<svg width="24" height="24"><path fill-rule="nonzero" d="M6 4a1 1 0 110 2H5v6h14V6h-1a1 1 0 010-2h2c.6 0 1 .4 1 1v13a2 2 0 01-2 2H5a2 2 0 01-2-2V5c0-.6.4-1 1-1h2zm5 10H5v4h6v-4zm8 0h-6v4h6v-4zM12 3c.5 0 1 .4 1 .9V6h2a1 1 0 010 2h-2v2a1 1 0 01-2 .1V8H9a1 1 0 010-2h2V4c0-.6.4-1 1-1z"/></svg>',"table-insert-row-after":'<svg width="24" height="24"><path fill-rule="nonzero" d="M12 13c.5 0 1 .4 1 .9V16h2a1 1 0 01.1 2H13v2a1 1 0 01-2 .1V18H9a1 1 0 01-.1-2H11v-2c0-.6.4-1 1-1zm6 7a1 1 0 010-2h1v-6H5v6h1a1 1 0 010 2H4a1 1 0 01-1-1V6c0-1.1.9-2 2-2h14a2 2 0 012 2v13c0 .5-.4 1-.9 1H18zM11 6H5v4h6V6zm8 0h-6v4h6V6z"/></svg>',"table-left-header":'<svg width="24" height="24"><path d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm0 9h-4v5h4v-5zm-6 0H9v5h4v-5zm0-7H9v5h4V6zm6 0h-4v5h4V6z"/></svg>',"table-merge-cells":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM5 15.5V18h3v-2.5H5zm14-5h-9V18h9v-7.5zM19 6h-4v2.5h4V6zM8 6H5v2.5h3V6zm5 0h-3v2.5h3V6zm-8 7.5h3v-3H5v3z"/></svg>',"table-row-numbering-rtl":'<svg width="24" height="24"><path d="M6 4a2 2 0 00-2 2v13c0 1.1.9 2 2 2h12a2 2 0 002-2V6a2 2 0 00-2-2H6zm0 12h8v3H6v-3zm11 0c.6 0 1 .4 1 1v1a1 1 0 01-2 0v-1c0-.6.4-1 1-1zM6 11h8v3H6v-3zm11 0c.6 0 1 .4 1 1v1a1 1 0 01-2 0v-1c0-.6.4-1 1-1zM6 6h8v3H6V6zm11 0c.6 0 1 .4 1 1v1a1 1 0 11-2 0V7c0-.6.4-1 1-1z"/></svg>',"table-row-numbering":'<svg width="24" height="24"><path d="M18 4a2 2 0 012 2v13a2 2 0 01-2 2H6a2 2 0 01-2-2V6c0-1.1.9-2 2-2h12zm0 12h-8v3h8v-3zM7 16a1 1 0 00-1 1v1a1 1 0 002 0v-1c0-.6-.4-1-1-1zm11-5h-8v3h8v-3zM7 11a1 1 0 00-1 1v1a1 1 0 002 0v-1c0-.6-.4-1-1-1zm11-5h-8v3h8V6zM7 6a1 1 0 00-1 1v1a1 1 0 102 0V7c0-.6-.4-1-1-1z"/></svg>',"table-row-properties":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM5 15v3h6v-3H5zm14 0h-6v3h6v-3zm0-9h-6v3h6V6zM5 9h6V6H5v3z"/></svg>',"table-split-cells":'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM8 15.5H5V18h3v-2.5zm11-5h-9V18h9v-7.5zm-2.5 1l1 1-2 2 2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2zm-8.5-1H5v3h3v-3zM19 6h-4v2.5h4V6zM8 6H5v2.5h3V6zm5 0h-3v2.5h3V6z"/></svg>',"table-top-header":'<svg width="24" height="24"><path d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zm-8 11H5v3h6v-3zm8 0h-6v3h6v-3zm0-5h-6v3h6v-3zM5 13h6v-3H5v3z"/></svg>',table:'<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V6c0-1.1.9-2 2-2h14zM5 14v4h6v-4H5zm14 0h-6v4h6v-4zm0-6h-6v4h6V8zM5 12h6V8H5v4z"/></svg>',template:'<svg width="24" height="24"><path d="M19 19v-1H5v1h14zM9 16v-4a5 5 0 116 0v4h4a2 2 0 012 2v3H3v-3c0-1.1.9-2 2-2h4zm4 0v-5l.8-.6a3 3 0 10-3.6 0l.8.6v5h2z" fill-rule="nonzero"/></svg>',"temporary-placeholder":'<svg width="24" height="24"><g fill-rule="evenodd"><path d="M9 7.6V6h2.5V4.5a.5.5 0 111 0V6H15v1.6a8 8 0 11-6 0zm-2.6 5.3a.5.5 0 00.3.6c.3 0 .6 0 .6-.3l.1-.2a5 5 0 013.3-2.8c.3-.1.4-.4.4-.6-.1-.3-.4-.5-.6-.4a6 6 0 00-4.1 3.7z"/><circle cx="14" cy="4" r="1"/><circle cx="12" cy="2" r="1"/><circle cx="10" cy="4" r="1"/></g></svg>',"text-color":'<svg width="24" height="24"><g fill-rule="evenodd"><path id="tox-icon-text-color__color" d="M3 18h18v3H3z"/><path d="M8.7 16h-.8a.5.5 0 01-.5-.6l2.7-9c.1-.3.3-.4.5-.4h2.8c.2 0 .4.1.5.4l2.7 9a.5.5 0 01-.5.6h-.8a.5.5 0 01-.4-.4l-.7-2.2c0-.3-.3-.4-.5-.4h-3.4c-.2 0-.4.1-.5.4l-.7 2.2c0 .3-.2.4-.4.4zm2.6-7.6l-.6 2a.5.5 0 00.5.6h1.6a.5.5 0 00.5-.6l-.6-2c0-.3-.3-.4-.5-.4h-.4c-.2 0-.4.1-.5.4z"/></g></svg>',toc:'<svg width="24" height="24"><path d="M5 5c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 110-2zm3 0h11c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 110-2zm-3 8c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zm3 0h11c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 010-2zm0-4c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 110-2zm3 0h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm-3 8c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 010-2zm3 0h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2z" fill-rule="evenodd"/></svg>',translate:'<svg width="24" height="24"><path d="M12.7 14.3l-.3.7-.4.7-2.2-2.2-3.1 3c-.3.4-.8.4-1 0a.7.7 0 010-1l3.1-3A12.4 12.4 0 016.7 9H8a10.1 10.1 0 001.7 2.4c.5-.5 1-1.1 1.4-1.8l.9-2H4.7a.7.7 0 110-1.5h4.4v-.7c0-.4.3-.8.7-.8.4 0 .7.4.7.8v.7H15c.4 0 .8.3.8.7 0 .4-.4.8-.8.8h-1.4a12.3 12.3 0 01-1 2.4 13.5 13.5 0 01-1.7 2.3l1.9 1.8zm4.3-3l2.7 7.3a.5.5 0 01-.4.7 1 1 0 01-1-.7l-.6-1.5h-3.4l-.6 1.5a1 1 0 01-1 .7.5.5 0 01-.4-.7l2.7-7.4a1 1 0 012 0zm-2.2 4.4h2.4L16 12.5l-1.2 3.2z" fill-rule="evenodd"/></svg>',underline:'<svg width="24" height="24"><path d="M16 5c.6 0 1 .4 1 1v5.5a4 4 0 01-.4 1.8l-1 1.4a5.3 5.3 0 01-5.5 1 5 5 0 01-1.6-1c-.5-.4-.8-.9-1.1-1.4a4 4 0 01-.4-1.8V6c0-.6.4-1 1-1s1 .4 1 1v5.5c0 .3 0 .6.2 1l.6.7a3.3 3.3 0 002.2.8 3.4 3.4 0 002.2-.8c.3-.2.4-.5.6-.8l.2-.9V6c0-.6.4-1 1-1zM8 17h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 010-2z" fill-rule="evenodd"/></svg>',undo:'<svg width="24" height="24"><path d="M6.4 8H12c3.7 0 6.2 2 6.8 5.1.6 2.7-.4 5.6-2.3 6.8a1 1 0 01-1-1.8c1.1-.6 1.8-2.7 1.4-4.6-.5-2.1-2.1-3.5-4.9-3.5H6.4l3.3 3.3a1 1 0 11-1.4 1.4l-5-5a1 1 0 010-1.4l5-5a1 1 0 011.4 1.4L6.4 8z" fill-rule="nonzero"/></svg>',unlink:'<svg width="24" height="24"><path d="M6.2 12.3a1 1 0 011.4 1.4l-2 2a2 2 0 102.6 2.8l4.8-4.8a1 1 0 000-1.4 1 1 0 111.4-1.3 2.9 2.9 0 010 4L9.6 20a3.9 3.9 0 01-5.5-5.5l2-2zm11.6-.6a1 1 0 01-1.4-1.4l2.1-2a2 2 0 10-2.7-2.8L11 10.3a1 1 0 000 1.4A1 1 0 119.6 13a2.9 2.9 0 010-4L14.4 4a3.9 3.9 0 015.5 5.5l-2 2zM7.6 6.3a.8.8 0 01-1 1.1L3.3 4.2a.7.7 0 111-1l3.2 3.1zM5.1 8.6a.8.8 0 010 1.5H3a.8.8 0 010-1.5H5zm5-3.5a.8.8 0 01-1.5 0V3a.8.8 0 011.5 0V5zm6 11.8a.8.8 0 011-1l3.2 3.2a.8.8 0 01-1 1L16 17zm-2.2 2a.8.8 0 011.5 0V21a.8.8 0 01-1.5 0V19zm5-3.5a.7.7 0 110-1.5H21a.8.8 0 010 1.5H19z" fill-rule="nonzero"/></svg>',unlock:'<svg width="24" height="24"><path d="M16 5c.8 0 1.5.3 2.1.9.6.6.9 1.3.9 2.1v3h-2V8a1 1 0 00-.3-.7A1 1 0 0016 7h-2a1 1 0 00-.7.3 1 1 0 00-.3.7v3h.3c.2 0 .3 0 .5.2l.2.6v7.4c0 .3 0 .4-.2.6l-.6.2H4.8c-.3 0-.4 0-.6-.2a.7.7 0 01-.2-.6v-7.4c0-.3 0-.4.2-.6l.5-.2H11V8c0-.8.3-1.5.9-2.1.6-.6 1.3-.9 2.1-.9h2z" fill-rule="evenodd"/></svg>',"unordered-list":'<svg width="24" height="24"><path d="M11 5h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0 6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zm0 6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 010-2zM4.5 6c0-.4.1-.8.4-1 .3-.4.7-.5 1.1-.5.4 0 .8.1 1 .4.4.3.5.7.5 1.1 0 .4-.1.8-.4 1-.3.4-.7.5-1.1.5-.4 0-.8-.1-1-.4-.4-.3-.5-.7-.5-1.1zm0 6c0-.4.1-.8.4-1 .3-.4.7-.5 1.1-.5.4 0 .8.1 1 .4.4.3.5.7.5 1.1 0 .4-.1.8-.4 1-.3.4-.7.5-1.1.5-.4 0-.8-.1-1-.4-.4-.3-.5-.7-.5-1.1zm0 6c0-.4.1-.8.4-1 .3-.4.7-.5 1.1-.5.4 0 .8.1 1 .4.4.3.5.7.5 1.1 0 .4-.1.8-.4 1-.3.4-.7.5-1.1.5-.4 0-.8-.1-1-.4-.4-.3-.5-.7-.5-1.1z" fill-rule="evenodd"/></svg>',unselected:'<svg width="24" height="24"><path fill-rule="nonzero" d="M6 4h12a2 2 0 012 2v12a2 2 0 01-2 2H6a2 2 0 01-2-2V6c0-1.1.9-2 2-2zm0 1a1 1 0 00-1 1v12c0 .6.4 1 1 1h12c.6 0 1-.4 1-1V6c0-.6-.4-1-1-1H6z"/></svg>',upload:'<svg width="24" height="24"><path d="M18 19v-2a1 1 0 012 0v3c0 .6-.4 1-1 1H5a1 1 0 01-1-1v-3a1 1 0 012 0v2h12zM11 6.4L8.7 8.7a1 1 0 01-1.4-1.4l4-4a1 1 0 011.4 0l4 4a1 1 0 11-1.4 1.4L13 6.4V16a1 1 0 01-2 0V6.4z" fill-rule="nonzero"/></svg>',user:'<svg width="24" height="24"><path d="M12 24a12 12 0 110-24 12 12 0 010 24zm-8.7-5.3a11 11 0 0017.4 0C19.4 16.3 14.6 15 12 15c-2.6 0-7.4 1.3-8.7 3.7zM12 13c2.2 0 4-2 4-4.5S14.2 4 12 4 8 6 8 8.5 9.8 13 12 13z" fill-rule="nonzero"/></svg>',"vertical-align":'<svg width="24" height="24"><g fill-rule="nonzero"><rect width="18" height="2" x="3" y="11" rx="1"/><path d="M12 2c.6 0 1 .4 1 1v4l2-1.3a1 1 0 011.2 1.5l-.1.1-4.1 3-4-3a1 1 0 011-1.7l2 1.5V3c0-.6.4-1 1-1zm0 11.8l4 2.9a1 1 0 01-1 1.7l-2-1.5V21c0 .5-.4 1-.9 1H12a1 1 0 01-1-1v-4l-2 1.3a1 1 0 01-1.2-.1l-.1-.1a1 1 0 01.1-1.3l.1-.1 4.1-3z"/></g></svg>',visualblocks:'<svg width="24" height="24"><path d="M9 19v2H7v-2h2zm-4 0v2a2 2 0 01-2-2h2zm8 0v2h-2v-2h2zm8 0a2 2 0 01-2 2v-2h2zm-4 0v2h-2v-2h2zM15 7a1 1 0 010 2v7a1 1 0 01-2 0V9h-1v7a1 1 0 01-2 0v-4a2.5 2.5 0 01-.2-5H15zM5 15v2H3v-2h2zm16 0v2h-2v-2h2zM5 11v2H3v-2h2zm16 0v2h-2v-2h2zM5 7v2H3V7h2zm16 0v2h-2V7h2zM5 3v2H3c0-1.1.9-2 2-2zm8 0v2h-2V3h2zm6 0a2 2 0 012 2h-2V3zM9 3v2H7V3h2zm8 0v2h-2V3h2z" fill-rule="evenodd"/></svg>',visualchars:'<svg width="24" height="24"><path d="M10 5h7a1 1 0 010 2h-1v11a1 1 0 01-2 0V7h-2v11a1 1 0 01-2 0v-6c-.5 0-1 0-1.4-.3A3.4 3.4 0 016.8 10a3.3 3.3 0 010-2.8 3.4 3.4 0 011.8-1.8L10 5z" fill-rule="evenodd"/></svg>',warning:'<svg width="24" height="24"><path d="M19.8 18.3c.2.5.3.9 0 1.2-.1.3-.5.5-1 .5H5.2c-.5 0-.9-.2-1-.5-.3-.3-.2-.7 0-1.2L11 4.7l.5-.5.5-.2c.2 0 .3 0 .5.2.2 0 .3.3.5.5l6.8 13.6zM12 18c.3 0 .5-.1.7-.3.2-.2.3-.4.3-.7a1 1 0 00-.3-.7 1 1 0 00-.7-.3 1 1 0 00-.7.3 1 1 0 00-.3.7c0 .3.1.5.3.7.2.2.4.3.7.3zm.7-3l.3-4a1 1 0 00-.3-.7 1 1 0 00-.7-.3 1 1 0 00-.7.3 1 1 0 00-.3.7l.3 4h1.4z" fill-rule="evenodd"/></svg>',"zoom-in":'<svg width="24" height="24"><path d="M16 17.3a8 8 0 111.4-1.4l4.3 4.4a1 1 0 01-1.4 1.4l-4.4-4.3zm-5-.3a6 6 0 100-12 6 6 0 000 12zm-1-9a1 1 0 012 0v6a1 1 0 01-2 0V8zm-2 4a1 1 0 010-2h6a1 1 0 010 2H8z" fill-rule="nonzero"/></svg>',"zoom-out":'<svg width="24" height="24"><path d="M16 17.3a8 8 0 111.4-1.4l4.3 4.4a1 1 0 01-1.4 1.4l-4.4-4.3zm-5-.3a6 6 0 100-12 6 6 0 000 12zm-3-5a1 1 0 010-2h6a1 1 0 010 2H8z" fill-rule="nonzero"/></svg>'}});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/bg_BG.js b/cps/static/js/libs/tinymce/langs/bg_BG.js
deleted file mode 100644
index 20e8e6275..000000000
--- a/cps/static/js/libs/tinymce/langs/bg_BG.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('bg_BG',{
-"Redo": "\u041e\u0442\u043c\u0435\u043d\u044f\u043d\u0435",
-"Undo": "\u0412\u0440\u044a\u0449\u0430\u043d\u0435",
-"Cut": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435",
-"Copy": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435",
-"Paste": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435",
-"Select all": "\u041c\u0430\u0440\u043a\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0446\u044f\u043b\u043e\u0442\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
-"New document": "\u041d\u043e\u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "\u0414\u043e\u0431\u0440\u0435",
-"Cancel": "\u041e\u0442\u043a\u0430\u0437",
-"Visual aids": "\u0412\u0438\u0437\u0443\u0430\u043b\u043d\u043e \u043e\u0442\u043a\u0440\u043e\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0438 \u0431\u0435\u0437 \u043a\u0430\u043d\u0442\u043e\u0432\u0435 (\u0440\u0430\u043c\u043a\u0438)",
-"Bold": "\u0423\u0434\u0435\u0431\u0435\u043b\u0435\u043d (\u043f\u043e\u043b\u0443\u0447\u0435\u0440)",
-"Italic": "\u041d\u0430\u043a\u043b\u043e\u043d\u0435\u043d (\u043a\u0443\u0440\u0441\u0438\u0432)",
-"Underline": "\u041f\u043e\u0434\u0447\u0435\u0440\u0442\u0430\u0432\u0430\u043d\u0435",
-"Strikethrough": "\u0417\u0430\u0447\u0435\u0440\u0442\u0430\u0432\u0430\u043d\u0435",
-"Superscript": "\u0413\u043e\u0440\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
-"Subscript": "\u0414\u043e\u043b\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u0418\u0437\u0447\u0438\u0441\u0442\u0432\u0430\u043d\u0435 \u043d\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435\u0442\u043e",
-"Align left": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u043b\u044f\u0432\u043e",
-"Align center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u0435",
-"Align right": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u0434\u044f\u0441\u043d\u043e",
-"Justify": "\u0414\u0432\u0443\u0441\u0442\u0440\u0430\u043d\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Bullet list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u0432\u043e\u0434\u0430\u0447\u0438",
-"Numbered list": "\u041d\u043e\u043c\u0435\u0440\u0438\u0440\u0430\u043d \u0441\u043f\u0438\u0441\u044a\u043a",
-"Decrease indent": "\u041d\u0430\u043c\u0430\u043b\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
-"Increase indent": "\u0423\u0432\u0435\u043b\u0438\u0447\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
-"Close": "\u0417\u0430\u0442\u0432\u0430\u0440\u044f\u043d\u0435",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448\u0438\u044f\u0442 \u0431\u0440\u0430\u0443\u0437\u044a\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u0435\u043d \u0434\u043e\u0441\u0442\u044a\u043f \u0434\u043e \u043a\u043b\u0438\u043f\u0431\u043e\u0440\u0434\u0430. \u0412\u043c\u0435\u0441\u0442\u043e \u0442\u043e\u0432\u0430 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 \u043a\u043b\u0430\u0432\u0438\u0448\u043d\u0438\u0442\u0435 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u0438 Ctrl+X (\u0437\u0430 \u0438\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435), Ctrl+C (\u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435) \u0438 Ctrl+V (\u0437\u0430 \u043f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435).",
-"Headers": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u044f",
-"Header 1": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 1",
-"Header 2": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 2",
-"Header 3": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 3",
-"Header 4": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 4",
-"Header 5": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 5",
-"Header 6": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 6",
-"Headings": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u044f",
-"Heading 1": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 1",
-"Heading 2": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 2",
-"Heading 3": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 3",
-"Heading 4": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 4",
-"Heading 5": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 5",
-"Heading 6": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 6",
-"Preformatted": "\u041f\u0440\u0435\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d",
-"Div": "\u0411\u043b\u043e\u043a",
-"Pre": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u043d\u043e \u043e\u0444\u043e\u0440\u043c\u0435\u043d \u0442\u0435\u043a\u0441\u0442",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442",
-"Inline": "\u041d\u0430 \u0435\u0434\u0438\u043d \u0440\u0435\u0434",
-"Blocks": "\u0411\u043b\u043e\u043a\u043e\u0432\u0435",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435\u0442\u043e \u0432 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0435 \u0432 \u043e\u0431\u0438\u043a\u043d\u043e\u0432\u0435\u043d \u0440\u0435\u0436\u0438\u043c. \u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e \u0449\u0435 \u0431\u044a\u0434\u0435 \u043f\u043e\u0441\u0442\u0430\u0432\u0435\u043d\u043e \u043a\u0430\u0442\u043e \u043d\u0435\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442, \u0434\u043e\u043a\u0430\u0442\u043e \u0438\u0437\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0442\u0430\u0437\u0438 \u043e\u043f\u0446\u0438\u044f.",
-"Fonts": "\u0428\u0440\u0438\u0444\u0442\u043e\u0432\u0435",
-"Font Sizes": "\u0420\u0430\u0437\u043c\u0435\u0440 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u041f\u043e\u0442\u044a\u0440\u0441\u0435\u0442\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"OR": "\u0418\u041b\u0418",
-"Drop an image here": "\u041f\u0443\u0441\u043d\u0435\u0442\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e \u0442\u0443\u043a",
-"Upload": "\u041a\u0430\u0447\u0432\u0430\u043d\u0435",
-"Block": "\u0411\u043b\u043e\u043a",
-"Align": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Default": "\u041f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
-"Circle": "\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442\u0438",
-"Disc": "\u041a\u0440\u044a\u0433\u0447\u0435\u0442\u0430",
-"Square": "\u0417\u0430\u043f\u044a\u043b\u043d\u0435\u043d\u0438 \u043a\u0432\u0430\u0434\u0440\u0430\u0442\u0438",
-"Lower Alpha": "\u041c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Lower Greek": "\u041c\u0430\u043b\u043a\u0438 \u0433\u0440\u044a\u0446\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Lower Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u043c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Upper Alpha": "\u0413\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Upper Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Anchor...": "\u041a\u043e\u0442\u0432\u0430...",
-"Name": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
-"Id": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 (id)",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0430 (id) \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0437\u0430\u043f\u043e\u0447\u0432\u0430 \u0441 \u0431\u0443\u043a\u0432\u0430, \u043f\u043e\u0441\u043b\u0435\u0434\u0432\u0430\u043d \u043e\u0442 \u0431\u0443\u043a\u0432\u0438, \u0447\u0438\u0444\u0440\u0438, \u0442\u0438\u0440\u0435\u0442\u0430, \u0442\u043e\u0447\u043a\u0438, \u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u0435 \u0438 \u0434\u043e\u043b\u043d\u043e \u0442\u0438\u0440\u0435.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0412 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0438\u043c\u0430 \u043d\u0435\u0437\u0430\u043f\u0430\u0437\u0435\u043d\u0438 \u043f\u0440\u043e\u043c\u0435\u043d\u0438. \u0429\u0435 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438\u0442\u0435 \u043b\u0438?",
-"Restore last draft": "\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0430\u0442\u0430 \u0447\u0435\u0440\u043d\u043e\u0432\u0430",
-"Special character...": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u0435\u043d \u0441\u0438\u043c\u0432\u043e\u043b...",
-"Source code": "\u0418\u0437\u0445\u043e\u0434\u0435\u043d \u043a\u043e\u0434 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0432 HTML",
-"Insert\/Edit code sample": "\u0412\u043c\u044a\u043a\u043d\u0438\/ \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0439 \u043f\u0440\u0438\u043c\u0435\u0440\u0435\u043d \u043a\u043e\u0434",
-"Language": "\u0415\u0437\u0438\u043a",
-"Code sample...": "\u041f\u0440\u0438\u043c\u0435\u0440\u0435\u043d \u043a\u043e\u0434...",
-"Color Picker": "\u0418\u0437\u0431\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0446\u0432\u044f\u0442",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u041e\u0442\u043b\u044f\u0432\u043e \u043d\u0430\u0434\u044f\u0441\u043d\u043e",
-"Right to left": "\u041e\u0442\u0434\u044f\u0441\u043d\u043e \u043d\u0430\u043b\u044f\u0432\u043e",
-"Emoticons...": "\u0415\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438...",
-"Metadata and Document Properties": "\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u0438 \u0438 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
-"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0438 \u0434\u0443\u043c\u0438",
-"Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438 \u043d\u0430 \u0443\u0435\u0431 \u0442\u044a\u0440\u0441\u0430\u0447\u043a\u0438",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Encoding": "\u041a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0437\u043d\u0430\u0446\u0438\u0442\u0435",
-"Fullscreen": "\u041d\u0430 \u0446\u044f\u043b \u0435\u043a\u0440\u0430\u043d",
-"Action": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435",
-"Shortcut": "\u0411\u044a\u0440\u0437 \u043a\u043b\u0430\u0432\u0438\u0448",
-"Help": "\u041f\u043e\u043c\u043e\u0449",
-"Address": "\u0410\u0434\u0440\u0435\u0441",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u0432\u0440\u044a\u0437\u043a\u0430 (\u0430\u043a\u043e \u043f\u043b\u044a\u0433\u0438\u043d\u0430 \u0437\u0430 \u0432\u0440\u044a\u0437\u043a\u0438 \u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u043d)",
-"Save (if save plugin activated)": "\u0417\u0430\u043f\u0438\u0448\u0438 (\u0430\u043a\u043e \u043f\u043b\u044a\u0433\u0438\u043d\u0430 \u0437\u0430 \u0437\u0430\u043f\u0438\u0441 \u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u043d)",
-"Find (if searchreplace plugin activated)": "\u041d\u0430\u043c\u0435\u0440\u0438 (\u0430\u043a\u043e \u043f\u043b\u044a\u0433\u0438\u043d\u0430 \u0437\u0430 \u0442\u044a\u0440\u0441\u0435\u043d\u0435\/\u0437\u0430\u043c\u044f\u043d\u0430 \u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u043d)",
-"Plugins installed ({0}):": "\u0418\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0438 \u043f\u043b\u044a\u0433\u0438\u043d\u0438 ({0}):",
-"Premium plugins:": "\u041f\u0440\u0435\u043c\u0438\u0439\u043d\u0438 \u043f\u043b\u044a\u0433\u0438\u043d\u0438:",
-"Learn more...": "\u041d\u0430\u0443\u0447\u0435\u0442\u0435 \u043f\u043e\u0432\u0435\u0447\u0435...",
-"You are using {0}": "\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442\u0435 {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u0430 \u0447\u0435\u0440\u0442\u0430",
-"Insert\/edit image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430",
-"Image description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Source": "\u0410\u0434\u0440\u0435\u0441",
-"Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440",
-"Constrain proportions": "\u0417\u0430\u0432\u0430\u0437\u043d\u0430\u0432\u0435 \u043d\u0430 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438\u0442\u0435",
-"General": "\u041e\u0431\u0449\u043e",
-"Advanced": "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e",
-"Style": "\u0421\u0442\u0438\u043b",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
-"Horizontal space": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
-"Border": "\u041a\u0430\u043d\u0442 (\u0440\u0430\u043c\u043a\u0430)",
-"Insert image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Image...": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435...",
-"Image list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438",
-"Rotate counterclockwise": "\u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435 \u043e\u0431\u0440\u0430\u0442\u043d\u043e \u043d\u0430 \u0447\u0430\u0441\u043e\u0432\u043d\u0438\u043a\u0430",
-"Rotate clockwise": "\u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435 \u043f\u043e \u0447\u0430\u0441\u043e\u0432\u043d\u0438\u043a\u0430",
-"Flip vertically": "\u041e\u0431\u044a\u0440\u043d\u0438 \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e",
-"Flip horizontally": "\u041e\u0431\u044a\u0440\u043d\u0438 \u0445\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e",
-"Edit image": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Image options": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Zoom in": "\u041f\u0440\u0438\u0431\u043b\u0438\u0436\u0438",
-"Zoom out": "\u041e\u0442\u0434\u0430\u043b\u0435\u0447\u0438",
-"Crop": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435",
-"Resize": "\u041f\u0440\u0435\u043e\u0440\u0430\u0437\u043c\u0435\u0440\u044f\u0432\u0430\u043d\u0435",
-"Orientation": "\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
-"Brightness": "\u042f\u0440\u043a\u043e\u0441\u0442",
-"Sharpen": "\u0418\u0437\u043e\u0441\u0442\u0440\u044f\u043d\u0435",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0426\u0432\u0435\u0442\u043d\u0438 \u043d\u0438\u0432\u0430",
-"Gamma": "\u0413\u0430\u043c\u0430",
-"Invert": "\u0418\u043d\u0432\u0435\u0440\u0441\u0438\u044f",
-"Apply": "\u041f\u0440\u0438\u043b\u043e\u0436\u0438",
-"Back": "\u041d\u0430\u0437\u0430\u0434",
-"Insert date\/time": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0434\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert\/Edit Link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"Insert\/edit link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442",
-"Url": "\u0410\u0434\u0440\u0435\u0441 (URL)",
-"Open link in...": "\u041e\u0442\u0432\u0430\u0440\u044f\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 \u0432...",
-"Current window": "\u0422\u0435\u043a\u0443\u0449 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446",
-"None": "\u0411\u0435\u0437",
-"New window": "\u0412 \u043d\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446 (\u043f\u043e\u0434\u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446)",
-"Remove link": "\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430",
-"Anchors": "\u041a\u043e\u0442\u0432\u0438",
-"Link...": "\u0425\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430...",
-"Paste or type a link": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u0438\u043b\u0438 \u043d\u0430\u043f\u0438\u0448\u0435\u0442\u0435 \u0432\u0440\u044a\u0437\u043a\u0430(\u043b\u0438\u043d\u043a)",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL \u0430\u0434\u0440\u0435\u0441\u044a\u0442, \u043a\u043e\u0439\u0442\u043e \u0432\u044a\u0432\u0434\u043e\u0445\u0442\u0435 \u043f\u0440\u0438\u043b\u0438\u0447\u0430 \u043d\u0430 \u0435-\u043c\u0435\u0439\u043b \u0430\u0434\u0440\u0435\u0441. \u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0438\u044f mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL \u0430\u0434\u0440\u0435\u0441\u044a\u0442, \u043a\u043e\u0439\u0442\u043e \u0432\u044a\u0432\u0434\u043e\u0445\u0442\u0435 \u043f\u0440\u0438\u043b\u0438\u0447\u0430 \u0432\u044a\u043d\u0448\u0435\u043d \u0430\u0434\u0440\u0435\u0441. \u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0438\u044f http:\/\/ \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"Link list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u0432\u0440\u044a\u0437\u043a\u0438",
-"Insert video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit media": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043c\u0435\u0434\u0438\u044f",
-"Alternative source": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0430\u0434\u0440\u0435\u0441",
-"Alternative source URL": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0430\u0434\u0440\u0435\u0441 URL",
-"Media poster (Image URL)": "\u041c\u0435\u0434\u0438\u0435\u043d \u043f\u043b\u0430\u043a\u0430\u0442 (\u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 URL)",
-"Paste your embed code below:": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u043a\u043e\u0434\u0430 \u0437\u0430 \u0432\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435 \u0432 \u043f\u043e\u043b\u0435\u0442\u043e \u043f\u043e-\u0434\u043e\u043b\u0443:",
-"Embed": "\u0412\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435",
-"Media...": "\u041c\u0435\u0434\u0438\u044f...",
-"Nonbreaking space": "\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Page break": "\u041d\u043e\u0432\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430",
-"Paste as text": "\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u043a\u0430\u0442\u043e \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u0435\u043d \u0438\u0437\u0433\u043b\u0435\u0434",
-"Print...": "\u041e\u0442\u043f\u0435\u0447\u0430\u0442\u0432\u0430\u043d\u0435...",
-"Save": "\u0421\u044a\u0445\u0440\u0430\u043d\u044f\u0432\u0430\u043d\u0435",
-"Find": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0437\u0430",
-"Replace with": "\u0417\u0430\u043c\u044f\u043d\u0430 \u0441",
-"Replace": "\u0417\u0430\u043c\u044f\u043d\u0430",
-"Replace all": "\u0417\u0430\u043c\u044f\u043d\u0430 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u0438 \u0441\u0440\u0435\u0449\u0430\u043d\u0438\u044f",
-"Previous": "\u041f\u0440\u0435\u0434\u0438\u0448\u0435\u043d",
-"Next": "\u0421\u043b\u0435\u0434\u0432\u0430\u0449",
-"Find and replace...": "\u041d\u0430\u043c\u0438\u0440\u0430\u043d\u0435 \u0438 \u0437\u0430\u043c\u044f\u043d\u0430...",
-"Could not find the specified string.": "\u0422\u044a\u0440\u0441\u0435\u043d\u0438\u044f\u0442 \u0442\u0435\u043a\u0441\u0442 \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d.",
-"Match case": "\u0421\u044a\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u044a\u0440\u0430 (\u043c\u0430\u043b\u043a\u0438\/\u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438)",
-"Find whole words only": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0441\u0430\u043c\u043e \u043d\u0430 \u0446\u0435\u043b\u0438 \u0434\u0443\u043c\u0438",
-"Spell check": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430",
-"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435",
-"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u043e",
-"Finish": "\u041a\u0440\u0430\u0439",
-"Add to Dictionary": "\u0414\u043e\u0431\u0430\u0432\u0438 \u0432 \u0440\u0435\u0447\u043d\u0438\u043a\u0430",
-"Insert table": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430",
-"Table properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Delete table": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Cell": "\u041a\u043b\u0435\u0442\u043a\u0430",
-"Row": "\u0420\u0435\u0434",
-"Column": "\u041a\u043e\u043b\u043e\u043d\u0430",
-"Cell properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
-"Merge cells": "\u0421\u043b\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
-"Split cell": "\u0420\u0430\u0437\u0434\u0435\u043b\u044f\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430",
-"Insert row before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
-"Insert row after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
-"Delete row": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Row properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Cut row": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
-"Copy row": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
-"Paste row before": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
-"Paste row after": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
-"Insert column before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u0440\u0435\u0434\u0438",
-"Insert column after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u0441\u043b\u0435\u0434",
-"Delete column": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430\u0442\u0430",
-"Cols": "\u041a\u043e\u043b\u043e\u043d\u0438",
-"Rows": "\u0420\u0435\u0434\u043e\u0432\u0435",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Height": "\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430",
-"Cell spacing": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043c\u0435\u0436\u0434\u0443 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
-"Cell padding": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0434\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e",
-"Show caption": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u0430\u0434\u043f\u0438\u0441",
-"Left": "\u041b\u044f\u0432\u043e",
-"Center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
-"Right": "\u0414\u044f\u0441\u043d\u043e",
-"Cell type": "\u0422\u0438\u043f \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
-"Scope": "\u041e\u0431\u0445\u0432\u0430\u0442",
-"Alignment": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"H Align": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Top": "\u0413\u043e\u0440\u0435",
-"Middle": "\u041f\u043e \u0441\u0440\u0435\u0434\u0430\u0442\u0430",
-"Bottom": "\u0414\u043e\u043b\u0443",
-"Header cell": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430 (\u0430\u043d\u0442\u0435\u0442\u043a\u0430)",
-"Row group": "Row group",
-"Column group": "Column group",
-"Row type": "\u0422\u0438\u043f \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Header": "\u0413\u043e\u0440\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (header)",
-"Body": "\u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435 (body)",
-"Footer": "\u0414\u043e\u043b\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (footer)",
-"Border color": "\u0426\u0432\u044f\u0442 \u043d\u0430 \u0440\u0430\u043c\u043a\u0430\u0442\u0430",
-"Insert template...": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0448\u0430\u0431\u043b\u043e\u043d...",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u0426\u0432\u044f\u0442 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Background color": "\u0424\u043e\u043d\u043e\u0432 \u0446\u0432\u044f\u0442",
-"Custom...": "\u0418\u0437\u0431\u0440\u0430\u043d...",
-"Custom color": "\u0426\u0432\u044f\u0442 \u043f\u043e \u0438\u0437\u0431\u043e\u0440",
-"No color": "\u0411\u0435\u0437 \u0446\u0432\u044f\u0442",
-"Remove color": "\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043d\u0430 \u0446\u0432\u0435\u0442\u0430",
-"Table of Contents": "\u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0431\u043b\u043e\u043a\u043e\u0432\u0435\u0442\u0435",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u0435\u043f\u0435\u0447\u0430\u0442\u0430\u0435\u043c\u0438 \u0437\u043d\u0430\u0446\u0438",
-"Word count": "\u0411\u0440\u043e\u0435\u043d\u0435 \u043d\u0430 \u0434\u0443\u043c\u0438",
-"Count": "\u0411\u0440\u043e\u0439",
-"Document": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Selection": "\u0418\u0437\u0431\u0440\u0430\u043d\u043e",
-"Words": "\u0414\u0443\u043c\u0438",
-"Words: {0}": "\u0411\u0440\u043e\u0439 \u0434\u0443\u043c\u0438: {0}",
-"{0} words": "{0} \u0431\u0440\u043e\u0439 \u0434\u0443\u043c\u0438",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435",
-"Insert": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435",
-"View": "\u0418\u0437\u0433\u043b\u0435\u0434",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
-"Tools": "\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
-"Powered by {0}": "\u0421\u044a\u0437\u0434\u0430\u0434\u0435\u043d\u043e \u0441 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041f\u043e\u043b\u0435 \u0437\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442. \u041d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 Alt+F9 \u0437\u0430 \u043c\u0435\u043d\u044e; Alt+F10 \u0437\u0430 \u043b\u0435\u043d\u0442\u0430 \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438; Alt+0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0449.",
-"Image title": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Border width": "\u0428\u0438\u0440\u0438\u043d\u0430 \u043d\u0430 \u0440\u0430\u043c\u043a\u0430\u0442\u0430",
-"Border style": "\u0421\u0442\u0438\u043b \u043d\u0430 \u0440\u0430\u043c\u043a\u0430\u0442\u0430",
-"Error": "\u0413\u0440\u0435\u0448\u043a\u0430",
-"Warn": "\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435",
-"Valid": "\u0412\u0430\u043b\u0438\u0434\u043d\u043e",
-"To open the popup, press Shift+Enter": "\u0417\u0430 \u0434\u0430 \u043e\u0442\u0432\u043e\u0440\u0438\u0442\u0435 \u0438\u0437\u0441\u043a\u0430\u0447\u0430\u0449\u0438\u044f \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446, \u043d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "\u041f\u043e\u043b\u0435 \u0437\u0430 \u043e\u0431\u043e\u0433\u0430\u0442\u0435\u043d \u0442\u0435\u043a\u0441\u0442. \u041d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 ALT+0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0449.",
-"System Font": "\u0421\u0438\u0441\u0442\u0435\u043c\u0435\u043d \u0448\u0440\u0438\u0444\u0442",
-"Failed to upload image: {0}": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043a\u0430\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435: {0}",
-"Failed to load plugin: {0} from url {1}": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u043f\u043b\u044a\u0433\u0438\u043d {0} \u043e\u0442 URL {1}",
-"Failed to load plugin url: {0}": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 URL \u043d\u0430 \u043f\u043b\u044a\u0433\u0438\u043d: {0}",
-"Failed to initialize plugin: {0}": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u043b\u044a\u0433\u0438\u043d: {0}",
-"example": "\u043f\u0440\u0438\u043c\u0435\u0440",
-"Search": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435",
-"All": "\u0412\u0441\u0438\u0447\u043a\u0438",
-"Currency": "\u0412\u0430\u043b\u0443\u0442\u0430",
-"Text": "\u0422\u0435\u043a\u0441\u0442",
-"Quotations": "\u0426\u0438\u0442\u0430\u0442\u0438",
-"Mathematical": "\u041c\u0430\u0442\u0435\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438",
-"Extended Latin": "\u0420\u0430\u0437\u0448\u0438\u0440\u0435\u043d\u0438 \u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Symbols": "\u0421\u0438\u043c\u0432\u043e\u043b\u0438",
-"Arrows": "\u0421\u0442\u0440\u0435\u043b\u043a\u0438",
-"User Defined": "\u0417\u0430\u0434\u0430\u0434\u0435\u043d\u0438 \u043e\u0442 \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u044f",
-"dollar sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0434\u043e\u043b\u0430\u0440",
-"currency sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0432\u0430\u043b\u0443\u0442\u0430",
-"euro-currency sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0435\u0432\u0440\u043e \u0432\u0430\u043b\u0443\u0442\u0430",
-"colon sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043a\u043e\u043b\u043e\u043d",
-"cruzeiro sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043a\u0440\u0443\u0437\u0435\u0439\u0440\u043e",
-"french franc sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0444\u0440\u0435\u043d\u0441\u043a\u0438 \u0444\u0440\u0430\u043d\u043a",
-"lira sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043b\u0438\u0440\u0430",
-"mill sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043c\u0438\u043b",
-"naira sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043d\u0430\u0439\u0440\u0430",
-"peseta sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043f\u0435\u0441\u0435\u0442\u0430",
-"rupee sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0440\u0443\u043f\u0438\u044f",
-"won sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043a\u043e\u0440\u0435\u0439\u0441\u043a\u0438 \u0432\u043e\u043d",
-"new sheqel sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043d\u043e\u0432 \u0448\u0435\u043a\u0435\u043b",
-"dong sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0432\u0438\u0435\u0442\u043d\u0430\u043c\u0441\u043a\u0438 \u0434\u043e\u043d\u0433",
-"kip sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043b\u0430\u043e\u0441\u043a\u0438 \u043a\u0438\u043f",
-"tugrik sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043c\u043e\u043d\u0433\u043e\u043b\u0441\u043a\u0438 \u0442\u0443\u0433\u0440\u0438\u043a",
-"drachma sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0434\u0440\u0430\u0445\u043c\u0430",
-"german penny symbol": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u0433\u0435\u0440\u043c\u0430\u043d\u0441\u043a\u043e \u043f\u0435\u043d\u0438",
-"peso sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043f\u0435\u0441\u043e",
-"guarani sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0433\u0443\u0430\u0440\u0430\u043d\u0438",
-"austral sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0430\u0443\u0441\u0442\u0440\u0430\u043b",
-"hryvnia sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0433\u0440\u0438\u0432\u043d\u044f",
-"cedi sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0441\u0435\u0434\u0438",
-"livre tournois sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043b\u0438\u0432\u0440 \u0442\u0443\u0440\u043d\u0443\u0430",
-"spesmilo sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0441\u043f\u0435\u0441\u043c\u0438\u043b\u043e",
-"tenge sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0442\u0435\u043d\u0433\u0435",
-"indian rupee sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0438\u043d\u0434\u0438\u0439\u0441\u043a\u0430 \u0440\u0443\u043f\u0438\u044f",
-"turkish lira sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0442\u0443\u0440\u0441\u043a\u0430 \u043b\u0438\u0440\u0430",
-"nordic mark sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043d\u043e\u0440\u0434\u0441\u043a\u0430 \u043c\u0430\u0440\u043a\u0430",
-"manat sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043c\u0430\u043d\u0430\u0442",
-"ruble sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0440\u0443\u0431\u043b\u0430",
-"yen character": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u0439\u0435\u043d\u0430",
-"yuan character": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u044e\u0430\u043d",
-"yuan character, in hong kong and taiwan": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u044e\u0430\u043d \u0432 \u0425\u043e\u043d\u043a\u043e\u043d\u0433 \u0438 \u0422\u0430\u0439\u0432\u0430\u043d",
-"yen\/yuan character variant one": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u0439\u0435\u043d\u0430\/\u044e\u0430\u043d \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u0435\u0434\u043d\u043e",
-"Loading emoticons...": "\u0417\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u0435\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438...",
-"Could not load emoticons": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u0435\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438",
-"People": "\u0425\u043e\u0440\u0430",
-"Animals and Nature": "\u0416\u0438\u0432\u043e\u0442\u043d\u0438 \u0438 \u043f\u0440\u0438\u0440\u043e\u0434\u0430",
-"Food and Drink": "\u0425\u0440\u0430\u043d\u0430 \u0438 \u043d\u0430\u043f\u0438\u0442\u043a\u0438",
-"Activity": "\u0414\u0435\u0439\u043d\u043e\u0441\u0442\u0438",
-"Travel and Places": "\u041f\u044a\u0442\u0443\u0432\u0430\u043d\u0435 \u0438 \u043c\u0435\u0441\u0442\u0430",
-"Objects": "\u041f\u0440\u0435\u0434\u043c\u0435\u0442\u0438",
-"Flags": "\u0417\u043d\u0430\u043c\u0435\u043d\u0430",
-"Characters": "\u0421\u0438\u043c\u0432\u043e\u043b\u0438",
-"Characters (no spaces)": "\u0421\u0438\u043c\u0432\u043e\u043b\u0438 (\u0431\u0435\u0437 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0438)",
-"{0} characters": "{0} \u0441\u0438\u043c\u0432\u043e\u043b\u0430",
-"Error: Form submit field collision.": "\u0413\u0440\u0435\u0448\u043a\u0430: \u041d\u0435\u0441\u044a\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043d\u0430 \u043f\u043e\u043b\u0435 \u043f\u0440\u0438 \u0438\u0437\u043f\u0440\u0430\u0449\u0430\u043d\u0435 \u043d\u0430 \u0444\u043e\u0440\u043c\u0443\u043b\u044f\u0440.",
-"Error: No form element found.": "\u0413\u0440\u0435\u0448\u043a\u0430: \u041d\u0435 \u0435 \u043e\u0442\u043a\u0440\u0438\u0442 \u0435\u043b\u0435\u043c\u0435\u043d\u0442 \u043d\u0430 \u0444\u043e\u0440\u043c\u0443\u043b\u044f\u0440\u0430.",
-"Update": "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d\u0435",
-"Color swatch": "\u0426\u0432\u0435\u0442\u043d\u0430 \u043c\u043e\u0441\u0442\u0440\u0430",
-"Turquoise": "\u0422\u044e\u0440\u043a\u043e\u0430\u0437\u0435\u043d\u043e",
-"Green": "\u0417\u0435\u043b\u0435\u043d\u043e",
-"Blue": "\u0421\u0438\u043d\u044c\u043e",
-"Purple": "\u041b\u0438\u043b\u0430\u0432\u043e",
-"Navy Blue": "\u041c\u043e\u0440\u0441\u043a\u043e\u0441\u0438\u043d\u044c\u043e",
-"Dark Turquoise": "\u0422\u044a\u043c\u043d\u043e\u0442\u044e\u0440\u043a\u043e\u0430\u0437\u0435\u043d\u043e",
-"Dark Green": "\u0422\u044a\u043c\u043d\u043e\u0437\u0435\u043b\u0435\u043d\u043e",
-"Medium Blue": "\u0421\u0440\u0435\u0434\u043d\u043e\u0441\u0438\u043d\u044c\u043e",
-"Medium Purple": "\u0421\u0440\u0435\u0434\u043d\u043e\u043b\u0438\u043b\u0430\u0432\u043e",
-"Midnight Blue": "\u0421\u0440\u0435\u0434\u043d\u043e\u0449\u043d\u043e \u0441\u0438\u043d\u044c\u043e",
-"Yellow": "\u0416\u044a\u043b\u0442\u043e",
-"Orange": "\u041e\u0440\u0430\u043d\u0436\u0435\u0432\u043e",
-"Red": "\u0427\u0435\u0440\u0432\u0435\u043d\u043e",
-"Light Gray": "\u0421\u0432\u0435\u0442\u043b\u043e\u0441\u0438\u0432\u043e",
-"Gray": "\u0421\u0438\u0432\u043e",
-"Dark Yellow": "\u0422\u044a\u043c\u043d\u043e\u0436\u044a\u043b\u0442\u043e",
-"Dark Orange": "\u0422\u044a\u043c\u043d\u043e\u043e\u0440\u0430\u043d\u0436\u0435\u0432\u043e",
-"Dark Red": "\u0422\u044a\u043c\u043d\u043e\u0447\u0435\u0440\u0432\u0435\u043d\u043e",
-"Medium Gray": "\u0421\u0440\u0435\u0434\u043d\u043e\u0441\u0438\u0432\u043e",
-"Dark Gray": "\u0422\u044a\u043c\u043d\u043e\u0441\u0438\u0432\u043e",
-"Light Green": "\u0421\u0432\u0435\u0442\u043b\u043e\u0437\u0435\u043b\u0435\u043d",
-"Light Yellow": "\u0421\u0432\u0435\u0442\u043b\u043e\u0436\u044a\u043b\u0442",
-"Light Red": "\u0421\u0432\u0435\u0442\u043b\u043e\u0447\u0435\u0440\u0432\u0435\u043d",
-"Light Purple": "\u0421\u0432\u0435\u0442\u043b\u043e\u043b\u0438\u043b\u0430\u0432",
-"Light Blue": "\u0421\u0432\u0435\u0442\u043b\u043e\u0441\u0438\u043d",
-"Dark Purple": "\u0422\u044a\u043c\u043d\u043e\u043b\u0438\u043b\u0430\u0432",
-"Dark Blue": "\u0422\u044a\u043c\u043d\u043e\u0441\u0438\u043d",
-"Black": "\u0427\u0435\u0440\u043d\u043e",
-"White": "\u0411\u044f\u043b\u043e",
-"Switch to or from fullscreen mode": "\u041f\u0440\u0435\u0432\u043a\u043b\u044e\u0447\u0432\u0430\u043d\u0435 \u043a\u044a\u043c \u0438\u043b\u0438 \u043e\u0442 \u0440\u0435\u0436\u0438\u043c \u043d\u0430 \u0446\u044f\u043b \u0435\u043a\u0440\u0430\u043d",
-"Open help dialog": "\u041e\u0442\u0432\u0430\u0440\u044f\u043d\u0435 \u043d\u0430 \u0434\u0438\u0430\u043b\u043e\u0433\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446 \u0437\u0430 \u043f\u043e\u043c\u043e\u0449",
-"history": "\u0438\u0441\u0442\u043e\u0440\u0438\u044f",
-"styles": "\u0441\u0442\u0438\u043b\u043e\u0432\u0435",
-"formatting": "\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
-"alignment": "\u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"indentation": "\u043e\u0442\u0441\u0442\u044a\u043f",
-"permanent pen": "\u043f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u0430 \u0445\u0438\u043c\u0438\u043a\u0430\u043b\u043a\u0430",
-"comments": "\u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440\u0438",
-"Format Painter": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435\u0442\u043e",
-"Insert\/edit iframe": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043d\u0435 \u043d\u0430 iframe",
-"Capitalization": "\u0413\u043b\u0430\u0432\u043d\u0430 \u0431\u0443\u043a\u0432\u0430",
-"lowercase": "\u043c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"UPPERCASE": "\u0413\u041e\u041b\u0415\u041c\u0418 \u0411\u0423\u041a\u0412\u0418",
-"Title Case": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u0438 \u0411\u0443\u043a\u0432\u0438",
-"Permanent Pen Properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u041f\u0435\u0440\u043c\u0430\u043d\u0435\u043d\u0442\u043d\u0438\u044f \u041c\u0430\u0440\u043a\u0435\u0440",
-"Permanent pen properties...": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u043f\u0435\u0440\u043c\u0430\u043d\u0435\u043d\u0442\u043d\u0438\u044f \u043c\u0430\u0440\u043a\u0435\u0440...",
-"Font": "\u0428\u0440\u0438\u0444\u0442",
-"Size": "\u0420\u0430\u0437\u043c\u0435\u0440",
-"More...": "\u041e\u0449\u0435...",
-"Spellcheck Language": "\u041f\u0440\u043e\u0432\u0435\u0440\u0438 \u041f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430",
-"Select...": "\u0418\u0437\u0431\u0435\u0440\u0438...",
-"Preferences": "\u041f\u0440\u0435\u0434\u043f\u043e\u0447\u0438\u0442\u0430\u043d\u0438\u044f",
-"Yes": "\u0414\u0430",
-"No": "\u041d\u0435",
-"Keyboard Navigation": "\u041d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f \u0441 \u043a\u043b\u0430\u0432\u0438\u0430\u0442\u0443\u0440\u0430",
-"Version": "\u0412\u0435\u0440\u0441\u0438\u044f",
-"Anchor": "\u041a\u043e\u0442\u0432\u0430 (\u0432\u0440\u044a\u0437\u043a\u0430 \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430)",
-"Special character": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u0435\u043d \u0437\u043d\u0430\u043a",
-"Code sample": "\u041f\u0440\u0438\u043c\u0435\u0440\u0435\u043d \u043a\u043e\u0434",
-"Color": "\u0426\u0432\u044f\u0442",
-"Emoticons": "\u0415\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438",
-"Document properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Image": "\u041a\u0430\u0440\u0442\u0438\u043d\u043a\u0430",
-"Insert link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"Target": "\u0426\u0435\u043b \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Link": "\u0412\u0440\u044a\u0437\u043a\u0430(\u043b\u0438\u043d\u043a)",
-"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440",
-"Media": "\u041c\u0435\u0434\u0438\u044f",
-"Print": "\u041f\u0435\u0447\u0430\u0442",
-"Prev": "\u041f\u0440\u0435\u0434\u0438\u0448\u0435\u043d",
-"Find and replace": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0438 \u0437\u0430\u043c\u044f\u043d\u0430",
-"Whole words": "\u0421\u0430\u043c\u043e \u0446\u0435\u043b\u0438 \u0434\u0443\u043c\u0438",
-"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430",
-"Caption": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0437\u0430\u0433\u043b\u0430\u0432\u0438\u0435 \u043f\u0440\u0435\u0434\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Insert template": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0448\u0430\u0431\u043b\u043e\u043d"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/bn_BD.js b/cps/static/js/libs/tinymce/langs/bn_BD.js
deleted file mode 100644
index 0084ce785..000000000
--- a/cps/static/js/libs/tinymce/langs/bn_BD.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('bn_BD',{
-"Redo": "\u09aa\u09c1\u09a8\u09b0\u09be\u09af\u09bc \u0995\u09b0\u09c1\u09a8",
-"Undo": "\u09aa\u09c2\u09b0\u09cd\u09ac\u09be\u09ac\u09b8\u09cd\u09a5\u09be\u09af\u09bc \u09ab\u09bf\u09b0\u09c1\u09a8",
-"Cut": "\u0995\u09b0\u09cd\u09a4\u09a8",
-"Copy": "\u0985\u09a8\u09c1\u0995\u09b0\u09a3",
-"Paste": "\u09aa\u09cd\u09b0\u09a4\u09bf\u09b2\u09c7\u09aa\u09a8 \u0995\u09b0\u09c1\u09a8",
-"Select all": "\u09b8\u09ac \u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09a8 \u0995\u09b0\u09c1\u09a8",
-"New document": "\u09a8\u09a4\u09c1\u09a8 \u09a6\u09b8\u09cd\u09a4\u09be\u09ac\u09c7\u099c",
-"Ok": "\u09a0\u09bf\u0995 \u0986\u099b\u09c7",
-"Cancel": "\u09ac\u09be\u09a4\u09bf\u09b2",
-"Visual aids": "\u09ac\u09cd\u09af\u09be\u0996\u09cd\u09af\u09be\u09ae\u09c2\u09b2\u0995 \u09b8\u09be\u09b9\u09be\u09af\u09cd\u09af",
-"Bold": "\u09b8\u09cd\u09a5\u09c2\u09b2",
-"Italic": "\u09a4\u09bf\u09b0\u09cd\u09af\u0995",
-"Underline": "\u09a8\u09bf\u09ae\u09cd\u09a8\u09b0\u09c7\u0996\u09be",
-"Strikethrough": "\u09b8\u09cd\u099f\u09cd\u09b0\u09be\u0987\u0995\u09a5\u09cd\u09b0\u09c1",
-"Superscript": "\u098a\u09b0\u09cd\u09a7\u09cd\u09ac\u09b2\u09bf\u09aa\u09bf",
-"Subscript": "\u09a8\u09bf\u09ae\u09cd\u09a8\u09b2\u09bf\u09aa\u09bf",
-"Clear formatting": "\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8 \u0985\u09aa\u09b8\u09be\u09b0\u09a3",
-"Align left": "\u09ac\u09be\u09ae\u09c7 \u09b8\u09be\u09b0\u09bf\u0995\u09b0\u09a3",
-"Align center": "\u09ae\u09a7\u09cd\u09af\u09b8\u09cd\u09a5\u09be\u09a8\u09c7 \u09b8\u09be\u09b0\u09bf\u0995\u09b0\u09a3",
-"Align right": "\u09a1\u09be\u09a8\u09c7 \u09b8\u09be\u09b0\u09bf\u0995\u09b0\u09a3",
-"Justify": "\u0989\u09ad\u09af\u09bc\u09aa\u09cd\u09b0\u09be\u09a8\u09cd\u09a4\u09c7 \u09b8\u09ae\u09be\u09a8 \u0995\u09b0\u09c1\u09a8",
-"Bullet list": "\u09ac\u09c1\u09b2\u09c7\u099f \u09a4\u09be\u09b2\u09bf\u0995\u09be",
-"Numbered list": "\u09b8\u0982\u0996\u09cd\u09af\u09be\u09af\u09c1\u0995\u09cd\u09a4 \u09a4\u09be\u09b2\u09bf\u0995\u09be",
-"Decrease indent": "\u0987\u09a8\u09cd\u09a1\u09c7\u09a8\u09cd\u099f \u0995\u09ae\u09be\u09a8",
-"Increase indent": "\u0987\u09a8\u09cd\u09a1\u09c7\u09a8\u09cd\u099f \u09ac\u09be\u09a1\u09bc\u09be\u09a8",
-"Close": "\u09ac\u09a8\u09cd\u09a7",
-"Formats": "\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0986\u09aa\u09a8\u09be\u09b0 \u09ac\u09cd\u09b0\u09be\u0989\u099c\u09be\u09b0 \u0995\u09cd\u09b2\u09bf\u09aa\u09ac\u09cb\u09b0\u09cd\u09a1 \u09a5\u09c7\u0995\u09c7 \u09b8\u09b0\u09be\u09b8\u09b0\u09bf \u09aa\u09cd\u09b0\u09ac\u09c7\u09b6\u09be\u09a7\u09bf\u0995\u09be\u09b0 \u09b8\u09ae\u09b0\u09cd\u09a5\u09a8 \u0995\u09b0\u09c7 \u09a8\u09be\u0964 \u0985\u09a8\u09c1\u0997\u09cd\u09b0\u09b9 \u0995\u09b0\u09c7 \u0995\u09c0\u09ac\u09cb\u09b0\u09cd\u09a1 \u09b6\u09b0\u09cd\u099f\u0995\u09be\u099f Ctrl +X\/C\/V \u09ac\u09cd\u09af\u09ac\u09b9\u09be\u09b0 \u0995\u09b0\u09c1\u09a8\u0964",
-"Headers": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09b8\u09ae\u09c1\u09b9",
-"Header 1": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09e7",
-"Header 2": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09e8",
-"Header 3": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09e9",
-"Header 4": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09ea",
-"Header 5": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09eb",
-"Header 6": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09ec",
-"Headings": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae",
-"Heading 1": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09e7",
-"Heading 2": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09e8",
-"Heading 3": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09e9",
-"Heading 4": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09ea",
-"Heading 5": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09eb",
-"Heading 6": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09ec",
-"Preformatted": "\u09aa\u09c2\u09b0\u09cd\u09ac\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8\u09bf\u09a4",
-"Div": "\u09a1\u09bf\u09ad",
-"Pre": "\u09aa\u09cd\u09b0\u09be\u0995",
-"Code": "\u09b8\u0982\u0995\u09c7\u09a4\u09b2\u09bf\u09aa\u09bf",
-"Paragraph": "\u09aa\u09cd\u09af\u09be\u09b0\u09be\u0997\u09cd\u09b0\u09be\u09ab",
-"Blockquote": "\u09ac\u09cd\u09b2\u0995\u0995\u09cb\u099f",
-"Inline": "\u09b8\u0999\u09cd\u0997\u09a4\u09bf\u09aa\u09c2\u09b0\u09cd\u09a3\u09ad\u09be\u09ac\u09c7",
-"Blocks": "\u09b8\u09cd\u09a5\u09c2\u09b2 ",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u09aa\u09c7\u09b8\u09cd\u099f \u098f\u0996\u09a8 \u09aa\u09cd\u09b2\u09c7\u0987\u09a8 \u099f\u09c7\u0995\u09cd\u09b8\u099f \u09ae\u09cb\u09a1\u09c7\u0964 \u0986\u09aa\u09a8\u09bf \u098f\u0996\u09a8 \u098f\u0987 \u09ac\u09bf\u0995\u09b2\u09cd\u09aa \u09ac\u09a8\u09cd\u09a7 \u099f\u0997\u09b2 \u09aa\u09b0\u09cd\u09af\u09a8\u09cd\u09a4 \u09ac\u09bf\u09b7\u09af\u09bc\u09ac\u09b8\u09cd\u09a4\u09c1 \u098f\u0996\u09a8 \u09aa\u09cd\u09b2\u09c7\u0987\u09a8 \u099f\u09c7\u0995\u09cd\u09b8\u099f \u09b9\u09bf\u09b8\u09be\u09ac\u09c7 \u0986\u099f\u0995\u09be\u09a8\u09cb \u09b9\u09ac\u09c7\u0964",
-"Fonts": "\u09ab\u09a8\u09cd\u099f\u09b8",
-"Font Sizes": "\u09ab\u09a8\u09cd\u099f \u09ae\u09be\u09aa",
-"Class": "\u0995\u09cd\u09b2\u09be\u09b8",
-"Browse for an image": "\u098f\u0995\u099f\u09bf \u099b\u09ac\u09bf \u09ac\u09cd\u09b0\u09be\u0989\u099c \u0995\u09b0\u09c1\u09a8",
-"OR": "\u0985\u09a5\u09ac\u09be",
-"Drop an image here": "\u098f\u0996\u09be\u09a8\u09c7 \u098f\u0995\u099f\u09bf \u099b\u09ac\u09bf \u09a1\u09cd\u09b0\u09aa \u0995\u09b0\u09c1\u09a8",
-"Upload": "\u0986\u09aa\u09b2\u09cb\u09a1",
-"Block": "\u09ac\u09cd\u09b2\u0995",
-"Align": "\u09ac\u09bf\u09a8\u09cd\u09af\u09b8\u09cd\u09a4\u0995\u09b0\u09c1\u09a8",
-"Default": "\u09a1\u09bf\u09ab\u09b2\u09cd\u099f",
-"Circle": "\u09ac\u09c3\u09a4\u09cd\u09a4",
-"Disc": "\u09a1\u09bf\u09b8\u09cd\u0995",
-"Square": "\u09ac\u09b0\u09cd\u0997\u0995\u09cd\u09b7\u09c7\u09a4\u09cd\u09b0",
-"Lower Alpha": "\u09a8\u09bf\u09ae\u09cd\u09a8 \u0986\u09b2\u09ab\u09be",
-"Lower Greek": "\u09a8\u09bf\u09ae\u09cd\u09a8 \u0997\u09cd\u09b0\u09bf\u0995",
-"Lower Roman": "\u09a8\u09bf\u09ae\u09cd\u09a8 \u09b0\u09cb\u09ae\u09be\u09a8",
-"Upper Alpha": "\u0989\u099a\u09cd\u099a\u09a4\u09b0 \u0986\u09b2\u09ab\u09be",
-"Upper Roman": "\u098a\u09b0\u09cd\u09a7\u09cd\u09ac \u09b0\u09cb\u09ae\u09be\u09a8",
-"Anchor...": "\u098f\u0999\u09cd\u0995\u09b0...",
-"Name": "\u09a8\u09be\u09ae",
-"Id": "\u0986\u0987\u09a1\u09bf",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0986\u0987\u09a1\u09bf\u099f\u09bf \u0985\u0995\u09cd\u09b7\u09b0, \u09b8\u0982\u0996\u09cd\u09af\u09be, \u09a1\u09cd\u09af\u09be\u09b6, \u09a1\u099f\u09b8, \u0995\u09b2\u09cb\u09a8 \u09ac\u09be \u0986\u09a8\u09cd\u09a1\u09be\u09b0\u09b8\u09cd\u0995\u09cb\u09b0 \u09a6\u09cd\u09ac\u09be\u09b0\u09be \u0985\u09a8\u09c1\u09b8\u09b0\u09a3 \u0995\u09b0\u09be \u098f\u0995\u099f\u09bf \u099a\u09bf\u09a0\u09bf \u09a6\u09bf\u09af\u09bc\u09c7 \u09b6\u09c1\u09b0\u09c1 \u0995\u09b0\u09be \u0989\u099a\u09bf\u09a4\u0964",
-"You have unsaved changes are you sure you want to navigate away?": "\u0986\u09aa\u09a8\u09be\u09b0 \u0985\u09b8\u0982\u09b0\u0995\u09cd\u09b7\u09bf\u09a4 \u09aa\u09b0\u09bf\u09ac\u09b0\u09cd\u09a4\u09a8\u0997\u09c1\u09b2\u09bf \u0986\u09aa\u09a8\u09bf \u0995\u09bf \u09a8\u09bf\u09b6\u09cd\u099a\u09bf\u09a4 \u09af\u09c7 \u0986\u09aa\u09a8\u09bf \u09a8\u09c7\u09ad\u09bf\u0997\u09c7\u099f \u0995\u09b0\u09a4\u09c7 \u099a\u09be\u09a8?",
-"Restore last draft": "\u09b6\u09c7\u09b7 \u0996\u09b8\u09a1\u09bc\u09be\u099f\u09bf \u09aa\u09c1\u09a8\u09b0\u09c1\u09a6\u09cd\u09a7\u09be\u09b0 \u0995\u09b0\u09c1\u09a8",
-"Special character...": "\u09ac\u09bf\u09b6\u09c7\u09b7 \u09ac\u09b0\u09cd\u09a3...",
-"Source code": "\u09b8\u09cb\u09b0\u09cd\u09b8 \u0995\u09cb\u09a1",
-"Insert\/Edit code sample": "\u0995\u09cb\u09a1 \u09a8\u09ae\u09c1\u09a8\u09be \u09a2\u09cb\u0995\u09be\u09a8 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Language": "\u09ad\u09be\u09b7\u09be",
-"Code sample...": "\u09a8\u09ae\u09c1\u09a8\u09be \u0995\u09cb\u09a1",
-"Color Picker": "\u09b0\u0999 \u099a\u09af\u09bc\u09a8\u0995\u09be\u09b0\u09c0",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u09ac\u09be\u09ae \u09a5\u09c7\u0995\u09c7 \u09a1\u09be\u09a8",
-"Right to left": "\u09a1\u09be\u09a8 \u09a5\u09c7\u0995\u09c7 \u09ac\u09be\u09ae",
-"Emoticons...": "\u0987\u09ae\u09cb\u099f\u09bf\u0995\u09a8",
-"Metadata and Document Properties": "\u09ae\u09c7\u099f\u09be\u09a1\u09c7\u099f\u09be \u098f\u09ac\u0982 \u09a1\u0995\u09c1\u09ae\u09c7\u09a8\u09cd\u099f\u09c7\u09b0 \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Title": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae",
-"Keywords": "\u0995\u09c0\u0993\u09af\u09bc\u09be\u09b0\u09cd\u09a1",
-"Description": "\u09ac\u09bf\u09ac\u09b0\u09a3",
-"Robots": "\u09b0\u09cb\u09ac\u099f",
-"Author": "\u09b2\u09c7\u0996\u0995",
-"Encoding": "\u098f\u09a8\u0995\u09cb\u09a1\u09bf\u0982",
-"Fullscreen": "\u09aa\u09c2\u09b0\u09cd\u09a3 \u09aa\u09b0\u09cd\u09a6\u09be",
-"Action": "\u0995\u09b0\u09cd\u09ae",
-"Shortcut": "\u09b6\u09b0\u09cd\u099f\u0995\u09be\u099f",
-"Help": "\u09b8\u09be\u09b9\u09be\u09af\u09cd\u09af \u0995\u09b0\u09c1\u09a8",
-"Address": "\u09a0\u09bf\u0995\u09be\u09a8\u09be",
-"Focus to menubar": "\u09ae\u09c7\u09a8\u09c1\u09ac\u09be\u09b0\u09c7 \u09ab\u09cb\u0995\u09be\u09b8 \u0995\u09b0\u09c1\u09a8",
-"Focus to toolbar": "\u099f\u09c1\u09b2\u09ac\u09be\u09b0\u09c7 \u09ab\u09cb\u0995\u09be\u09b8 \u0995\u09b0\u09c1\u09a8",
-"Focus to element path": "\u0989\u09aa\u09be\u09a6\u09be\u09a8 \u09aa\u09be\u09a5 \u09ab\u09cb\u0995\u09be\u09b8 \u0995\u09b0\u09c1\u09a8",
-"Focus to contextual toolbar": "\u09aa\u09cd\u09b0\u09be\u09b8\u0999\u09cd\u0997\u09bf\u0995 \u099f\u09c1\u09b2\u09ac\u09be\u09b0\u09c7 \u09ab\u09cb\u0995\u09be\u09b8 \u0995\u09b0\u09c1\u09a8",
-"Insert link (if link plugin activated)": "\u09b2\u09bf\u0999\u09cd\u0995 \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8 (\u09af\u09a6\u09bf \u09b2\u09bf\u0999\u09cd\u0995 \u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u0985\u09cd\u09af\u09be\u0995\u09cd\u099f\u09bf\u09ad\u09c7\u099f \u0995\u09b0\u09be \u09b9\u09af\u09bc)",
-"Save (if save plugin activated)": "\u09b8\u0982\u09b0\u0995\u09cd\u09b7\u09a3 \u0995\u09b0\u09c1\u09a8 (\u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u0985\u09cd\u09af\u09be\u0995\u09cd\u099f\u09bf\u09ad\u09c7\u099f \u09b9\u09b2\u09c7)",
-"Find (if searchreplace plugin activated)": "\u09b8\u09a8\u09cd\u09a7\u09be\u09a8 \u0995\u09b0\u09c1\u09a8 (\u09af\u09a6\u09bf \u0985\u09a8\u09c1\u09b8\u09a8\u09cd\u09a7\u09be\u09a8\u09af\u09cb\u0997\u09cd\u09af \u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u09b8\u0995\u09cd\u09b0\u09bf\u09af\u09bc \u0995\u09b0\u09be \u09b9\u09af\u09bc)",
-"Plugins installed ({0}):": "\u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u0987\u09a8\u09b8\u09cd\u099f\u09b2 ({0}):",
-"Premium plugins:": "\u09aa\u09cd\u09b0\u09bf\u09ae\u09bf\u09af\u09bc\u09be\u09ae \u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8:",
-"Learn more...": "\u0986\u09b0\u0993 \u099c\u09be\u09a8\u09c1\u09a8...",
-"You are using {0}": "\u0986\u09aa\u09a8\u09bf \u09ac\u09cd\u09af\u09ac\u09b9\u09be\u09b0 \u0995\u09b0\u099b\u09c7\u09a8 {0}",
-"Plugins": "\u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8",
-"Handy Shortcuts": "\u09b8\u09b9\u099c \u09b6\u09b0\u09cd\u099f\u0995\u09be\u099f ",
-"Horizontal line": "\u0985\u09a8\u09c1\u09ad\u09c2\u09ae\u09bf\u0995 \u09b0\u09c7\u0996\u09be",
-"Insert\/edit image": "\u0987\u09ae\u09c7\u099c \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Image description": "\u099b\u09ac\u09bf\u09b0 \u09ac\u09b0\u09cd\u09a3\u09a8\u09be",
-"Source": "\u0989\u09ce\u09b8",
-"Dimensions": "\u09ae\u09be\u09a4\u09cd\u09b0\u09be",
-"Constrain proportions": "\u0985\u09a8\u09c1\u09aa\u09be\u09a4 \u09b8\u09c0\u09ae\u09be\u09ac\u09a6\u09cd\u09a7",
-"General": "\u09b8\u09be\u09a7\u09be\u09b0\u09a3",
-"Advanced": "\u0985\u0997\u09cd\u09b0\u09b8\u09b0",
-"Style": "\u09b6\u09c8\u09b2\u09c0",
-"Vertical space": "\u0989\u09b2\u09cd\u09b2\u09ae\u09cd\u09ac \u09b8\u09cd\u09a5\u09be\u09a8",
-"Horizontal space": "\u0985\u09a8\u09c1\u09ad\u09c2\u09ae\u09bf\u0995 \u09b8\u09cd\u09a5\u09be\u09a8",
-"Border": "\u09b8\u09c0\u09ae\u09be\u09a8\u09cd\u09a4",
-"Insert image": "\u099a\u09bf\u09a4\u09cd\u09b0 \u09a2\u09cb\u0995\u09be\u09a8",
-"Image...": "\u0987\u09ae\u09c7\u099c...",
-"Image list": "\u099a\u09bf\u09a4\u09cd\u09b0 \u09a4\u09be\u09b2\u09bf\u0995\u09be",
-"Rotate counterclockwise": "\u09ac\u09be\u09ae\u09be\u09ac\u09b0\u09cd\u09a4\u09c7 \u0998\u09cb\u09b0\u09be\u09a4\u09c7",
-"Rotate clockwise": "\u0998\u09a1\u09bc\u09bf\u09b0 \u0995\u09be\u0981\u099f\u09be\u09b0 \u09a6\u09bf\u0995\u09c7 \u0998\u09cb\u09b0\u09be\u09a8",
-"Flip vertically": "\u0989\u09b2\u09cd\u09b2\u09ae\u09cd\u09ac\u09ad\u09be\u09ac\u09c7 \u09ab\u09cd\u09b2\u09bf\u09aa \u0995\u09b0\u09c1\u09a8",
-"Flip horizontally": "\u0985\u09a8\u09c1\u09ad\u09c2\u09ae\u09bf\u0995\u09ad\u09be\u09ac\u09c7 \u09ab\u09cd\u09b2\u09bf\u09aa \u0995\u09b0\u09c1\u09a8",
-"Edit image": "\u099a\u09bf\u09a4\u09cd\u09b0 \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Image options": "\u099a\u09bf\u09a4\u09cd\u09b0 \u09ac\u09bf\u0995\u09b2\u09cd\u09aa\u0997\u09c1\u09b2\u09bf",
-"Zoom in": "\u09aa\u09cd\u09b0\u09b8\u09be\u09b0\u09bf\u09a4 \u0995\u09b0\u09cb",
-"Zoom out": "\u099b\u09cb\u099f \u0995\u09b0\u09be",
-"Crop": "\u0995\u09be\u099f\u09be",
-"Resize": "\u09ae\u09be\u09aa \u09aa\u09b0\u09bf\u09ac\u09b0\u09cd\u09a4\u09a8 \u0995\u09b0\u09c1\u09a8",
-"Orientation": "\u099d\u09cb\u0981\u0995",
-"Brightness": "\u0989\u099c\u09cd\u099c\u09cd\u09ac\u09b2\u09a4\u09be",
-"Sharpen": "\u09a7\u09be\u09b0 \u0995\u09b0\u09be",
-"Contrast": "\u09ac\u09bf\u09aa\u09b0\u09c0\u09a4 \u09b9\u09a4\u09cd\u09a4\u09af\u09bc\u09be",
-"Color levels": "\u09b0\u0999\u09c7\u09b0 \u09ae\u09be\u09a4\u09cd\u09b0\u09be",
-"Gamma": "Gamma",
-"Invert": "\u09ac\u09bf\u09a8\u09b7\u09cd\u099f \u0995\u09b0\u09be",
-"Apply": "\u09aa\u09cd\u09b0\u09af\u09bc\u09cb\u0997 \u0995\u09b0\u09be",
-"Back": "\u09aa\u09bf\u099b\u09a8\u09c7",
-"Insert date\/time": "\u09a4\u09be\u09b0\u09bf\u0996 \/ \u09b8\u09ae\u09af\u09bc \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8",
-"Date\/time": "\u09a4\u09be\u09b0\u09bf\u0996 \/ \u09b8\u09ae\u09af\u09bc",
-"Insert\/Edit Link": "\u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6\/\u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u09b2\u09bf\u0999\u09cd\u0995",
-"Insert\/edit link": "\u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u09b2\u09bf\u0999\u09cd\u0995",
-"Text to display": "\u09aa\u09cd\u09b0\u09a6\u09b0\u09cd\u09b6\u09a8 \u099f\u09c7\u0995\u09cd\u09b8\u099f",
-"Url": "URL",
-"Open link in...": "\u09b2\u09bf\u0999\u09cd\u0995\u099f\u09bf \u0996\u09c1\u09b2\u09c1\u09a8...",
-"Current window": "\u09ac\u09b0\u09cd\u09a4\u09ae\u09be\u09a8 \u0989\u0987\u09a8\u09cd\u09a1\u09cb",
-"None": "\u09a8\u09be",
-"New window": "\u09a8\u09a4\u09c1\u09a8 \u0989\u0987\u09a8\u09cd\u09a1\u09cb",
-"Remove link": "\u09b2\u09bf\u0999\u09cd\u0995 \u09b8\u09b0\u09be\u09a8",
-"Anchors": "\u09a8\u09cb\u0999\u09cd\u0997\u09b0",
-"Link...": "\u09b2\u09bf\u0982\u0995...",
-"Paste or type a link": "\u098f\u0995\u099f\u09bf \u09b2\u09bf\u0999\u09cd\u0995 \u0986\u099f\u0995\u09be\u09a8 \u09ac\u09be \u099f\u09be\u0987\u09aa \u0995\u09b0\u09c1\u09a8",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0986\u09aa\u09a8\u09be\u09b0 \u09aa\u09cd\u09b0\u09ac\u09c7\u09b6 \u0995\u09b0\u09be URL\u099f\u09bf \u098f\u0995\u099f\u09bf \u0987\u09ae\u09c7\u09b2 \u09a0\u09bf\u0995\u09be\u09a8\u09be \u09ac\u09b2\u09c7 \u09ae\u09a8\u09c7 \u09b9\u099a\u09cd\u099b\u09c7\u0964 \u0986\u09aa\u09a8\u09bf \u09aa\u09cd\u09b0\u09af\u09bc\u09cb\u099c\u09a8\u09c0\u09af\u09bc \u09ae\u09c7\u0987\u09b2\u099f\u09cb \u09af\u09cb\u0997 \u0995\u09b0\u09a4\u09c7 \u099a\u09be\u09a8: \u0989\u09aa\u09b8\u09b0\u09cd\u0997?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0986\u09aa\u09a8\u09be\u09b0 \u09aa\u09cd\u09b0\u09ac\u09c7\u09b6 \u0995\u09b0\u09be URL\u099f\u09bf \u098f\u0995\u099f\u09bf \u09ac\u09b9\u09bf\u09b0\u09be\u0997\u09a4 \u09b2\u09bf\u0999\u09cd\u0995 \u09ac\u09b2\u09c7 \u09ae\u09a8\u09c7 \u09b9\u099a\u09cd\u099b\u09c7\u0964 \u0986\u09aa\u09a8\u09bf \u0995\u09bf \u09aa\u09cd\u09b0\u09af\u09bc\u09cb\u099c\u09a8\u09c0\u09af\u09bc http:\/\/ \u09aa\u09cd\u09b0\u09bf\u09ab\u09bf\u0995\u09cd\u09b8 \u09af\u09cb\u0997 \u0995\u09b0\u09a4\u09c7 \u099a\u09be\u09a8?",
-"Link list": "\u09b2\u09bf\u0999\u09cd\u0995 \u09a4\u09be\u09b2\u09bf\u0995\u09be",
-"Insert video": "\u09ad\u09bf\u09a1\u09bf\u0993 \u09a2\u09cb\u0995\u09be\u09a8",
-"Insert\/edit video": "\u09ad\u09bf\u09a1\u09bf\u0993 \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Insert\/edit media": "\u09ae\u09bf\u09a1\u09bf\u09af\u09bc\u09be \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Alternative source": "\u09ac\u09bf\u0995\u09b2\u09cd\u09aa \u0989\u09ce\u09b8",
-"Alternative source URL": "\u09ac\u09bf\u0995\u09b2\u09cd\u09aa \u0989\u09ce\u09b8 \u0987\u0986\u09b0\u098f\u09b2",
-"Media poster (Image URL)": "\u09ae\u09bf\u09a1\u09bf\u09af\u09bc\u09be \u09aa\u09cb\u09b8\u09cd\u099f\u09be\u09b0 (\u0987\u09ae\u09c7\u099c \u0987\u0989\u0986\u09b0\u098f\u09b2)",
-"Paste your embed code below:": "\u09a8\u09c0\u099a\u09c7\u09b0 \u0986\u09aa\u09a8\u09be\u09b0 \u098f\u09ae\u09cd\u09ac\u09c7\u09a1 \u0995\u09cb\u09a1 \u0986\u099f\u0995\u09be\u09a8:",
-"Embed": "\u098f\u09ae\u09cd\u09ac\u09c7\u09a1",
-"Media...": "\u09ae\u09bf\u09a1\u09bf\u09af\u09bc\u09be...",
-"Nonbreaking space": "\u0985\u09ac\u09bf\u099a\u09cd\u099b\u09bf\u09a8\u09cd\u09a8 \u09b8\u09cd\u09a5\u09be\u09a8",
-"Page break": "\u09aa\u09c3\u09b7\u09cd\u09a0\u09be \u09ac\u09bf\u09b0\u09a4\u09bf",
-"Paste as text": "\u09aa\u09be\u09a0\u09cd\u09af \u09b9\u09bf\u09b8\u09be\u09ac\u09c7 \u09aa\u09c7\u09b8\u09cd\u099f \u0995\u09b0\u09c1\u09a8",
-"Preview": "\u09aa\u09c2\u09b0\u09cd\u09ac\u09b0\u09c2\u09aa",
-"Print...": "\u09ae\u09c1\u09a6\u09cd\u09b0\u09a8...",
-"Save": "\u09b8\u0982\u09b0\u0995\u09cd\u09b7\u09a3",
-"Find": "\u0986\u09ac\u09bf\u09b7\u09cd\u0995\u09be\u09b0",
-"Replace with": "\u09aa\u09cd\u09b0\u09a4\u09bf\u09b8\u09cd\u09a5\u09be\u09aa\u09a8",
-"Replace": "\u09aa\u09cd\u09b0\u09a4\u09bf\u09b8\u09cd\u09a5\u09be\u09aa\u09a8 \u0995\u09b0\u09be",
-"Replace all": "\u09b8\u09ae\u09b8\u09cd\u09a4 \u09aa\u09cd\u09b0\u09a4\u09bf\u09b8\u09cd\u09a5\u09be\u09aa\u09a8",
-"Previous": "\u09aa\u09c2\u09b0\u09cd\u09ac\u09ac\u09b0\u09cd\u09a4\u09c0",
-"Next": "\u09aa\u09b0\u09ac\u09b0\u09cd\u09a4\u09c0",
-"Find and replace...": "\u0996\u09c1\u0981\u099c\u09c1\u09a8 \u0993 \u09aa\u09cd\u09b0\u09a4\u09bf\u09b8\u09cd\u09a5\u09be\u09aa\u09a8 \u0995\u09b0\u09c1\u09a8...",
-"Could not find the specified string.": "\u09a8\u09bf\u09b0\u09cd\u09a6\u09bf\u09b7\u09cd\u099f \u09b8\u09cd\u099f\u09cd\u09b0\u09bf\u0982\u099f\u09bf \u0996\u09c1\u0981\u099c\u09c7 \u09aa\u09be\u0993\u09af\u09bc\u09be \u09af\u09be\u09af\u09bc\u09a8\u09bf\u0964",
-"Match case": "\u09ae\u09cd\u09af\u09be\u099a \u0995\u09cd\u09b7\u09c7\u09a4\u09cd\u09b0\u09c7",
-"Find whole words only": "\u09b6\u09c1\u09a7\u09c1\u09ae\u09be\u09a4\u09cd\u09b0 \u09aa\u09c1\u09b0\u09cb \u09b6\u09ac\u09cd\u09a6\u0997\u09c1\u09b2\u09bf \u09b8\u09a8\u09cd\u09a7\u09be\u09a8 \u0995\u09b0\u09c1\u09a8",
-"Spell check": "\u09ac\u09be\u09a8\u09be\u09a8 \u09af\u09be\u099a\u09be\u0987",
-"Ignore": "\u0989\u09aa\u09c7\u0995\u09cd\u09b7\u09be \u0995\u09b0\u09be",
-"Ignore all": "\u09b8\u09ac\u0997\u09c1\u09b2\u09cb \u0989\u09aa\u09c7\u0995\u09cd\u09b7\u09be \u0995\u09b0\u09c1\u09a8",
-"Finish": "\u09b6\u09c7\u09b7",
-"Add to Dictionary": "\u0985\u09ad\u09bf\u09a7\u09be\u09a8 \u09af\u09cb\u0997 \u0995\u09b0\u09c1\u09a8",
-"Insert table": "\u099f\u09c7\u09ac\u09bf\u09b2 \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8",
-"Table properties": "\u099f\u09c7\u09ac\u09bf\u09b2 \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Delete table": "\u09b8\u09be\u09b0\u09a3\u09bf \u09ae\u09c1\u099b\u09c1\u09a8",
-"Cell": "\u09b8\u09c7\u09b2",
-"Row": "\u09b8\u09be\u09b0\u09bf",
-"Column": "\u0995\u09b2\u09be\u09ae",
-"Cell properties": "\u09b8\u09c7\u09b2 \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Merge cells": "\u09b8\u09c7\u09b2 \u09ae\u09be\u09b0\u09cd\u099c \u0995\u09b0\u09c1\u09a8",
-"Split cell": "\u09b8\u09cd\u09aa\u09cd\u09b2\u09bf\u099f \u09b8\u09c7\u09b2",
-"Insert row before": "\u0986\u0997\u09c7 \u09b8\u09be\u09b0\u09bf \u09a2\u09cb\u0995\u09be\u09a8",
-"Insert row after": "\u09aa\u09b0\u09c7 \u09b8\u09be\u09b0\u09bf \u09a2\u09cb\u0995\u09be\u09a8",
-"Delete row": "\u09b8\u09be\u09b0\u09bf \u09ae\u09c1\u099b\u09c1\u09a8",
-"Row properties": "\u09b8\u09be\u09b0\u09bf \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Cut row": "\u09b8\u09be\u09b0\u09bf \u0995\u09be\u099f\u09c1\u09a8",
-"Copy row": "\u09b8\u09be\u09b0\u09bf \u0985\u09a8\u09c1\u09b2\u09bf\u09aa\u09bf \u0995\u09b0\u09c1\u09a8",
-"Paste row before": "\u0986\u0997\u09c7 \u09b8\u09be\u09b0\u09bf \u09aa\u09c7\u09b8\u09cd\u099f \u0995\u09b0\u09c1\u09a8",
-"Paste row after": "\u09aa\u09b0\u09c7 \u09b8\u09be\u09b0\u09bf \u09aa\u09c7\u09b8\u09cd\u099f \u0995\u09b0\u09c1\u09a8",
-"Insert column before": "\u0986\u0997\u09c7 \u0995\u09b2\u09be\u09ae \u09a2\u09cb\u0995\u09be\u09a8",
-"Insert column after": "\u09aa\u09b0\u09c7 \u0995\u09b2\u09be\u09ae \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8",
-"Delete column": "\u0995\u09b2\u09be\u09ae \u09ae\u09c1\u099b\u09c1\u09a8",
-"Cols": "\u0995\u09b2\u09be\u09ae \u0997\u09c1\u09b2\u09cb",
-"Rows": "\u09b8\u09be\u09b0\u09bf\u0997\u09c1\u09b2\u09cb",
-"Width": "\u09aa\u09cd\u09b0\u09b8\u09cd\u09a5",
-"Height": "\u0989\u099a\u09cd\u099a\u09a4\u09be",
-"Cell spacing": "\u09b8\u09c7\u09b2 \u09ab\u09be\u0981\u0995\u09be",
-"Cell padding": "\u09b8\u09c7\u09b2 \u09aa\u09cd\u09af\u09be\u09a1\u09bf\u0982",
-"Show caption": "\u0995\u09cd\u09af\u09be\u09aa\u09b6\u09a8 \u09a6\u09c7\u0996\u09be\u09a8",
-"Left": "\u09ac\u09be\u09ae",
-"Center": "\u0995\u09c7\u09a8\u09cd\u09a6\u09cd\u09b0",
-"Right": "\u09a1\u09be\u09a8",
-"Cell type": "\u09b8\u09c7\u09b2 \u099f\u09be\u0987\u09aa",
-"Scope": "\u09ac\u09cd\u09af\u09be\u09aa\u09cd\u09a4\u09bf",
-"Alignment": "\u09b6\u09cd\u09b0\u09c7\u09a3\u09c0\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8",
-"H Align": "H \u09b8\u09be\u09b0\u09bf\u09ac\u09a6\u09cd\u09a7",
-"V Align": "V \u09b8\u09be\u09b0\u09bf\u09ac\u09a6\u09cd\u09a7",
-"Top": "\u0989\u09aa\u09b0",
-"Middle": "\u09ae\u09a7\u09cd\u09af\u09ae",
-"Bottom": "\u09a8\u09bf\u099a\u09c7",
-"Header cell": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09b8\u09c7\u09b2",
-"Row group": "\u09b8\u09be\u09b0\u09bf \u0997\u09cd\u09b0\u09c1\u09aa",
-"Column group": "\u0995\u09b2\u09be\u09ae \u0997\u09cd\u09b0\u09c1\u09aa",
-"Row type": "\u09b8\u09be\u09b0\u09bf\u09b0 \u09a7\u09b0\u09a8",
-"Header": "\u09b9\u09c7\u09a1\u09be\u09b0",
-"Body": "\u09ac\u09a1\u09bf",
-"Footer": "\u09ab\u09c1\u099f\u09be\u09b0",
-"Border color": "\u09b8\u09c0\u09ae\u09be\u09a8\u09cd\u09a4 \u09b0\u0999",
-"Insert template...": "\u099f\u09c7\u09ae\u09aa\u09cd\u09b2\u09c7\u099f \u09a2\u09cb\u0995\u09be\u09a8...",
-"Templates": "\u099f\u09c7\u09ae\u09aa\u09cd\u09b2\u09c7\u099f",
-"Template": "\u099f\u09c7\u09ae\u09aa\u09cd\u09b2\u09c7\u099f",
-"Text color": "\u09b2\u09c7\u0996\u09be\u09b0 \u09b0\u0999",
-"Background color": "\u09aa\u09c7\u099b\u09a8\u09c7\u09b0 \u09b0\u0982",
-"Custom...": "\u0995\u09be\u09b8\u09cd\u099f\u09ae...",
-"Custom color": "\u0995\u09be\u09b8\u09cd\u099f\u09ae \u09b0\u0982",
-"No color": "\u0995\u09cb\u09a8 \u09b0\u0982 \u09a8\u09c7\u0987",
-"Remove color": "\u09b0\u0999 \u09b8\u09b0\u09be\u09a8",
-"Table of Contents": "\u09b8\u09c1\u099a\u09bf\u09aa\u09a4\u09cd\u09b0",
-"Show blocks": "\u09ac\u09cd\u09b2\u0995 \u09a6\u09c7\u0996\u09be\u09a8",
-"Show invisible characters": "\u0985\u09a6\u09c3\u09b6\u09cd\u09af \u0985\u0995\u09cd\u09b7\u09b0 \u09a6\u09c7\u0996\u09be\u09a8",
-"Word count": "\u09b6\u09ac\u09cd\u09a6 \u0997\u09a3\u09a8\u09be",
-"Count": "\u0997\u09a3\u09a8\u09be",
-"Document": "\u09a6\u09b2\u09bf\u09b2",
-"Selection": "\u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09a8",
-"Words": "\u09b6\u09ac\u09cd\u09a6\u09b8\u09ae\u09c2\u09b9",
-"Words: {0}": "\u09b6\u09ac\u09cd\u09a6: {0}",
-"{0} words": "{0} \u09b6\u09ac\u09cd\u09a6",
-"File": "\u09ab\u09be\u0987\u09b2",
-"Edit": "\u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8 \u0995\u09b0\u09be",
-"Insert": "\u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6",
-"View": "\u09a6\u09c3\u09b6\u09cd\u09af",
-"Format": "\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8",
-"Table": "\u099f\u09c7\u09ac\u09bf\u09b2",
-"Tools": "\u09b8\u09b0\u099e\u09cd\u099c\u09be\u09ae\u09b8\u09ae\u09c2\u09b9",
-"Powered by {0}": "{0} \u09a6\u09cd\u09ac\u09be\u09b0\u09be \u099a\u09be\u09b2\u09bf\u09a4",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u09b0\u09bf\u099a \u099f\u09c7\u0995\u09cd\u09b8\u099f \u098f\u09b0\u09bf\u09af\u09bc\u09be \u09ae\u09c7\u09a8\u09c1 \u099c\u09a8\u09cd\u09af ALT-F9 \u099a\u09be\u09aa\u09c1\u09a8 \u099f\u09c1\u09b2\u09ac\u09be\u09b0\u09c7\u09b0 \u099c\u09a8\u09cd\u09af ALT-F10 \u099f\u09bf\u09aa\u09c1\u09a8 \u09b8\u09be\u09b9\u09be\u09af\u09cd\u09af\u09c7\u09b0 \u099c\u09a8\u09cd\u09af ALT-0 \u099a\u09be\u09aa\u09c1\u09a8",
-"Image title": "\u0987\u09ae\u09c7\u099c\u09c7\u09b0 \u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae",
-"Border width": "\u09b8\u09c0\u09ae\u09be\u09a8\u09be\u09b0 \u09aa\u09cd\u09b0\u09b6\u09b8\u09cd\u09a5\u09a4\u09be",
-"Border style": "\u09b8\u09c0\u09ae\u09be\u09a8\u09be \u09b6\u09c8\u09b2\u09c0",
-"Error": "\u09a4\u09cd\u09b0\u09c1\u099f\u09bf",
-"Warn": "\u09b8\u09be\u09ac\u09a7\u09be\u09a8",
-"Valid": "\u09ac\u09c8\u09a7",
-"To open the popup, press Shift+Enter": "\u09aa\u09aa\u0986\u09aa \u0996\u09c1\u09b2\u09a4\u09c7, \u09b6\u09bf\u09ab\u099f + \u098f\u09a8\u09cd\u099f\u09be\u09b0 \u099f\u09bf\u09aa\u09c1\u09a8",
-"Rich Text Area. Press ALT-0 for help.": "\u09b8\u09ae\u09c3\u09a6\u09cd\u09a7 \u09aa\u09be\u09a0\u09cd\u09af \u0985\u099e\u09cd\u099a\u09b2\u0964 \u09b8\u09b9\u09be\u09af\u09bc\u09a4\u09be\u09b0 \u099c\u09a8\u09cd\u09af ALT-0 \u099f\u09bf\u09aa\u09c1\u09a8\u0964",
-"System Font": "\u09b8\u09bf\u09b8\u09cd\u099f\u09c7\u09ae \u09ab\u09a8\u09cd\u099f",
-"Failed to upload image: {0}": "\u099a\u09bf\u09a4\u09cd\u09b0 \u0986\u09aa\u09b2\u09cb\u09a1 \u0995\u09b0\u09a4\u09c7 \u09ac\u09cd\u09af\u09b0\u09cd\u09a5 \u09b9\u09df\u09c7\u099b\u09c7: {0}",
-"Failed to load plugin: {0} from url {1}": "\u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u09b2\u09cb\u09a1 \u0995\u09b0\u09a4\u09c7 \u09ac\u09cd\u09af\u09b0\u09cd\u09a5: {0} \u0987\u0989\u0986\u09b0\u098f\u09b2 \u09a5\u09c7\u0995\u09c7 {1}",
-"Failed to load plugin url: {0}": "\u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u0987\u0989\u0986\u09b0\u098f\u09b2 \u09b2\u09cb\u09a1 \u0995\u09b0\u09a4\u09c7 \u09ac\u09cd\u09af\u09b0\u09cd\u09a5: {0}",
-"Failed to initialize plugin: {0}": "\u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u099a\u09be\u09b2\u09c1 \u0995\u09b0\u09a4\u09c7 \u09ac\u09cd\u09af\u09b0\u09cd\u09a5 \u09b9\u09df\u09c7\u099b\u09c7: {0}",
-"example": "\u0989\u09a6\u09be\u09b9\u09b0\u09a3",
-"Search": "\u0985\u09a8\u09c1\u09b8\u09a8\u09cd\u09a7\u09be\u09a8 \u0995\u09b0\u09c1\u09a8",
-"All": "\u09b8\u0995\u09b2",
-"Currency": "\u09ae\u09c1\u09a6\u09cd\u09b0\u09be",
-"Text": "\u099f\u09c7\u0995\u09cd\u09b8\u099f",
-"Quotations": "\u0989\u09a6\u09cd\u09a7\u09c3\u09a4\u09bf",
-"Mathematical": "\u0997\u09be\u09a3\u09bf\u09a4\u09bf\u0995",
-"Extended Latin": "\u09ac\u09b0\u09cd\u09a7\u09bf\u09a4 \u09b2\u09be\u09a4\u09bf\u09a8",
-"Symbols": "\u09aa\u09cd\u09b0\u09a4\u09c0\u0995",
-"Arrows": "\u09a4\u09c0\u09b0",
-"User Defined": "\u09ac\u09cd\u09af\u09ac\u09b9\u09be\u09b0\u0995\u09be\u09b0\u09c0 \u09b8\u0982\u099c\u09cd\u099e\u09be\u09af\u09bc\u09bf\u09a4",
-"dollar sign": "\u09a1\u09b2\u09be\u09b0 \u099a\u09bf\u09b9\u09cd\u09a8",
-"currency sign": "\u09ae\u09c1\u09a6\u09cd\u09b0\u09be\u09b0 \u099a\u09bf\u09b9\u09cd\u09a8",
-"euro-currency sign": "\u0987\u0989\u09b0\u09cb-\u09ae\u09c1\u09a6\u09cd\u09b0\u09be \u09b8\u09be\u0987\u09a8",
-"colon sign": "\u0995\u09cb\u09b2\u09a8 \u099a\u09bf\u09b9\u09cd\u09a8",
-"cruzeiro sign": "\u0995\u09cd\u09b0\u09c1\u099c\u09c1\u0987\u09b0\u09cb \u099a\u09bf\u09b9\u09cd\u09a8",
-"french franc sign": "\u09ab\u09cd\u09b0\u09c7\u099e\u09cd\u099a \u09ab\u09cd\u09b0\u09cd\u09af\u09be\u0999\u09cd\u0995 \u099a\u09bf\u09b9\u09cd\u09a8",
-"lira sign": "\u09b2\u09bf\u09b0\u09be \u099a\u09bf\u09b9\u09cd\u09a8",
-"mill sign": "\u09ae\u09bf\u09b2 \u099a\u09bf\u09b9\u09cd\u09a8",
-"naira sign": "\u09a8\u09be\u09df\u09b0\u09be \u099a\u09bf\u09b9\u09cd\u09a8",
-"peseta sign": "\u09aa\u09c7\u09b8\u09c7\u099f\u09be \u099a\u09bf\u09b9\u09cd\u09a8",
-"rupee sign": "\u09b0\u09c1\u09aa\u09bf \u099a\u09bf\u09b9\u09cd\u09a8",
-"won sign": "\u0989\u09a8 \u099a\u09bf\u09b9\u09cd\u09a8",
-"new sheqel sign": "\u09a8\u09a4\u09c1\u09a8 \u09b6\u09bf\u0995\u09c7\u09b2 \u099a\u09bf\u09b9\u09cd\u09a8",
-"dong sign": "\u09a1\u0982 \u099a\u09bf\u09b9\u09cd\u09a8",
-"kip sign": "\u0995\u09bf\u09aa \u099a\u09bf\u09b9\u09cd\u09a8",
-"tugrik sign": "\u09a4\u09c1\u0997\u09b0\u09bf\u0995 \u099a\u09bf\u09b9\u09cd\u09a8",
-"drachma sign": "\u09a1\u09cd\u09b0\u09be\u099a\u09ae\u09be \u099a\u09bf\u09b9\u09cd\u09a8",
-"german penny symbol": "\u099c\u09be\u09b0\u09cd\u09ae\u09be\u09a8 \u09aa\u09c7\u09a8\u09bf \u099a\u09bf\u09b9\u09cd\u09a8",
-"peso sign": "\u09aa\u09c7\u09b8\u09cb \u099a\u09bf\u09b9\u09cd\u09a8",
-"guarani sign": "\u0997\u09c1\u09df\u09be\u09b0\u09be\u09a8\u09c0 \u099a\u09bf\u09b9\u09cd\u09a8",
-"austral sign": "\u0993\u09b8\u09cd\u099f\u09cd\u09b0\u09be\u09b2 \u099a\u09bf\u09b9\u09cd\u09a8",
-"hryvnia sign": "\u09b9\u09be\u09b0\u09ad\u09a8\u09bf\u09df\u09be \u099a\u09bf\u09b9\u09cd\u09a8",
-"cedi sign": "\u09b8\u09c7\u09a1\u09bf \u099a\u09bf\u09b9\u09cd\u09a8",
-"livre tournois sign": "\u09b2\u09bf\u09ad\u09cd\u09b0\u09c7 \u099f\u09c1\u09b0\u09a8\u0987\u09b8 \u099a\u09bf\u09b9\u09cd\u09a8",
-"spesmilo sign": "\u09b8\u09cd\u09aa\u09c7\u09b8\u09ae\u09bf\u09b2\u09cb \u099a\u09bf\u09b9\u09cd\u09a8",
-"tenge sign": "\u099f\u09bf\u09a8\u0997\u09c7 \u099a\u09bf\u09b9\u09cd\u09a8",
-"indian rupee sign": "\u0987\u09a8\u09cd\u09a1\u09bf\u09df\u09be\u09a8 \u09b0\u09c1\u09aa\u09bf \u099a\u09bf\u09b9\u09cd\u09a8",
-"turkish lira sign": "\u09a4\u09c1\u0995\u09bf\u09b8\u09cd\u09a4\u09be\u09a8 \u09b2\u09bf\u09b0\u09be \u099a\u09bf\u09b9\u09cd\u09a8",
-"nordic mark sign": "\u09a8\u09b0\u09a1\u09bf\u0995 \u09ae\u09be\u09b0\u09cd\u0995 \u099a\u09bf\u09b9\u09cd\u09a8",
-"manat sign": "\u09ae\u09be\u09a8\u09be\u099f \u099a\u09bf\u09b9\u09cd\u09a8",
-"ruble sign": "\u09b0\u09c1\u09ac\u09c7\u09b2 \u099a\u09bf\u09b9\u09cd\u09a8",
-"yen character": "\u0987\u09df\u09c7\u09a8 \u0985\u0995\u09cd\u09b7\u09b0",
-"yuan character": "\u0987\u0989\u09af\u09bc\u09be\u09a8 \u0985\u0995\u09cd\u09b7\u09b0",
-"yuan character, in hong kong and taiwan": "\u09b9\u0982\u0995\u0982 \u098f\u09ac\u0982 \u09a4\u09be\u0987\u0993\u09af\u09bc\u09be\u09a8\u09c7 \u0987\u0989\u09af\u09bc\u09be\u09a8 \u0985\u0995\u09cd\u09b7\u09b0",
-"yen\/yuan character variant one": "\u0987\u09af\u09bc\u09c7\u09a8\/\u0987\u0989\u09af\u09bc\u09be\u09a8 \u0985\u0995\u09cd\u09b7\u09b0\u09c7\u09b0 \u098f\u0995\u099f\u09bf \u09ac\u09c8\u0995\u09b2\u09cd\u09aa\u09bf\u0995",
-"Loading emoticons...": "\u0987\u09ae\u09cb\u099f\u09bf\u0995\u09a8 \u09b2\u09cb\u09a1 \u09b9\u099a\u09cd\u099b\u09c7...",
-"Could not load emoticons": "\u0987\u09ae\u09cb\u099f\u09bf\u0995\u09a8 \u09b2\u09cb\u09a1 \u0995\u09b0\u09be \u09af\u09be\u09af\u09bc\u09a8\u09bf",
-"People": "\u099c\u09a8\u09b8\u09be\u09a7\u09be\u09b0\u09a3",
-"Animals and Nature": "\u09aa\u09cd\u09b0\u09be\u09a3\u09c0 \u098f\u09ac\u0982 \u09aa\u09cd\u09b0\u0995\u09c3\u09a4\u09bf",
-"Food and Drink": "\u0996\u09be\u09a6\u09cd\u09af \u0993 \u09aa\u09be\u09a8\u09c0\u09af\u09bc",
-"Activity": "\u0995\u09be\u09b0\u09cd\u09af\u0995\u09b2\u09be\u09aa",
-"Travel and Places": "\u09ad\u09cd\u09b0\u09ae\u09a3 \u098f\u09ac\u0982 \u09b8\u09cd\u09a5\u09be\u09a8",
-"Objects": "\u0989\u09a6\u09cd\u09a6\u09c7\u09b6\u09cd\u09af",
-"Flags": "\u09aa\u09a4\u09be\u0995\u09be",
-"Characters": "\u0985\u0995\u09cd\u09b7\u09b0",
-"Characters (no spaces)": "\u0985\u0995\u09cd\u09b7\u09b0 (\u0995\u09cb\u09a8\u0993 \u09b8\u09cd\u09aa\u09c7\u09b8 \u09a8\u09c7\u0987)",
-"{0} characters": "{0} \u0985\u0995\u09cd\u09b7\u09b0",
-"Error: Form submit field collision.": "\u09a4\u09cd\u09b0\u09c1\u099f\u09bf: \u09ab\u09b0\u09cd\u09ae \u099c\u09ae\u09be \u09a6\u09c7\u0993\u09af\u09bc\u09be\u09b0 \u0995\u09cd\u09b7\u09c7\u09a4\u09cd\u09b0\u09c7 \u09b8\u0982\u0998\u09b0\u09cd\u09b7\u0964",
-"Error: No form element found.": "\u09a4\u09cd\u09b0\u09c1\u099f\u09bf: \u0995\u09cb\u09a8\u0993 \u09ab\u09b0\u09cd\u09ae \u0989\u09aa\u09be\u09a6\u09be\u09a8 \u09aa\u09be\u0993\u09af\u09bc\u09be \u09af\u09be\u09af\u09bc \u09a8\u09bf\u0964",
-"Update": "\u09b9\u09be\u09b2\u09a8\u09be\u0997\u09be\u09a6",
-"Color swatch": "\u09b0\u0999\u09cd\u0997\u09c7\u09b0 \u09aa\u09cd\u09b2\u09c7\u099f",
-"Turquoise": "\u09ab\u09bf\u09b0\u09cb\u099c\u09be",
-"Green": "\u09b8\u09ac\u09c1\u099c",
-"Blue": "\u09a8\u09c0\u09b2",
-"Purple": "\u09ac\u09c7\u0997\u09c1\u09a8\u09c0",
-"Navy Blue": "\u0986\u0995\u09be\u09b6\u09c0",
-"Dark Turquoise": "\u0997\u09be\u09a2\u09bc \u09ab\u09bf\u09b0\u09cb\u099c\u09be",
-"Dark Green": "\u0997\u09be\u09a2\u09bc \u09b8\u09ac\u09c1\u099c",
-"Medium Blue": "\u09ae\u09be\u099d\u09be\u09b0\u09bf \u09a8\u09c0\u09b2",
-"Medium Purple": "\u09ae\u09be\u099d\u09be\u09b0\u09bf \u09ac\u09c7\u0997\u09c1\u09a8\u09bf",
-"Midnight Blue": "\u09ae\u09be\u099d\u09b0\u09be\u09a4\u09c7\u09b0 \u09a8\u09c0\u09b2",
-"Yellow": "\u09b9\u09b2\u09c1\u09a6",
-"Orange": "\u0995\u09ae\u09b2\u09be",
-"Red": "\u09b2\u09be\u09b2",
-"Light Gray": "\u09b9\u09be\u09b2\u0995\u09be \u09a7\u09c2\u09b8\u09b0",
-"Gray": "\u09a7\u09c2\u09b8\u09b0",
-"Dark Yellow": "\u0997\u09be\u09a2\u09bc \u09b9\u09b2\u09c1\u09a6",
-"Dark Orange": "\u0997\u09be\u09a2\u09bc \u0995\u09ae\u09b2\u09be",
-"Dark Red": "\u0997\u09be\u09a2\u09bc \u09b2\u09be\u09b2",
-"Medium Gray": "\u09ae\u09cb\u099f\u09be\u09ae\u09c1\u099f\u09bf \u09a7\u09c2\u09b8\u09b0",
-"Dark Gray": "\u0997\u09be\u09a2\u09bc \u09a7\u09c2\u09b8\u09b0",
-"Light Green": "\u09b9\u09be\u09b2\u0995\u09be \u09b8\u09ac\u09c1\u099c",
-"Light Yellow": "\u09b9\u09be\u09b2\u0995\u09be \u09b9\u09b2\u09c1\u09a6",
-"Light Red": "\u09b9\u09be\u09b2\u0995\u09be \u09b2\u09be\u09b2",
-"Light Purple": "\u09b9\u09be\u09b2\u0995\u09be \u09b0\u0995\u09cd\u09a4\u09ac\u09b0\u09cd\u09a3",
-"Light Blue": "\u09b9\u09be\u09b2\u0995\u09be \u09a8\u09c0\u09b2",
-"Dark Purple": "\u0997\u09be\u09a2\u09bc \u09b0\u0995\u09cd\u09a4\u09ac\u09b0\u09cd\u09a3",
-"Dark Blue": "\u0997\u09be\u09a2\u09bc \u09a8\u09c0\u09b2",
-"Black": "\u0995\u09be\u09b2\u09cb",
-"White": "\u09b8\u09be\u09a6\u09be",
-"Switch to or from fullscreen mode": "\u09aa\u09c2\u09b0\u09cd\u09a3\u09b8\u09cd\u0995\u09cd\u09b0\u09bf\u09a8 \u09ae\u09cb\u09a1\u09c7 \u09ac\u09be \u09a5\u09c7\u0995\u09c7 \u09b8\u09cd\u09af\u09c1\u0987\u099a \u0995\u09b0\u09c1\u09a8",
-"Open help dialog": "\u09b8\u09b9\u09be\u09af\u09bc\u09a4\u09be \u09a1\u09be\u09af\u09bc\u09be\u09b2\u0997 \u0996\u09c1\u09b2\u09c1\u09a8",
-"history": "\u0987\u09a4\u09bf\u09b9\u09be\u09b8",
-"styles": "\u09b6\u09c8\u09b2\u09c0",
-"formatting": "\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8",
-"alignment": "\u09b8\u09ae\u09a4\u09b2\u09a4\u09be",
-"indentation": "\u0996\u09be\u0981\u099c",
-"permanent pen": "\u09b8\u09cd\u09a5\u09be\u09af\u09bc\u09c0 \u0995\u09b2\u09ae",
-"comments": "\u09ae\u09a8\u09cd\u09a4\u09ac\u09cd\u09af",
-"Format Painter": "\u099a\u09bf\u09a4\u09cd\u09b0\u0995\u09b0 \u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8",
-"Insert\/edit iframe": "\u0986\u0987\u09ab\u09cd\u09b0\u09c7\u09ae \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6\/\u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8",
-"Capitalization": "\u09aa\u09cd\u09b0\u09a5\u09ae \u0985\u0995\u09cd\u09b7\u09b0 \u09ac\u09dc \u09b9\u09be\u09a4\u09c7\u09b0",
-"lowercase": "\u099a\u09cb\u099f \u09b9\u09be\u09a4\u09c7\u09b0",
-"UPPERCASE": "\u09ac\u09dc \u09b9\u09be\u09a4\u09c7\u09b0",
-"Title Case": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u0995\u09c7\u09b8",
-"Permanent Pen Properties": "\u09b8\u09cd\u09a5\u09be\u09af\u09bc\u09c0 \u0995\u09b2\u09ae\u09c7\u09b0 \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Permanent pen properties...": "\u09b8\u09cd\u09a5\u09be\u09af\u09bc\u09c0 \u0995\u09b2\u09ae\u09c7\u09b0 \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af...",
-"Font": "\u09ab\u09a8\u09cd\u099f",
-"Size": "\u0986\u09df\u09a4\u09a8",
-"More...": "\u0986\u09b0\u09cb...",
-"Spellcheck Language": "\u09ad\u09be\u09b7\u09be\u09b0 \u09ac\u09be\u09a8\u09be\u09a8 \u099a\u09c7\u0995",
-"Select...": "\u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09a8...",
-"Preferences": "\u09aa\u099b\u09a8\u09cd\u09a6\u09b8\u09ae\u09c2\u09b9",
-"Yes": "\u09b9\u09cd\u09af\u09be\u0981",
-"No": "\u09a8\u09be",
-"Keyboard Navigation": "\u0995\u09c0\u09ac\u09cb\u09b0\u09cd\u09a1 \u09a8\u09c7\u09ad\u09bf\u0997\u09c7\u09b6\u09a8",
-"Version": "\u09b8\u0982\u09b8\u09cd\u0995\u09b0\u09a3",
-"Anchor": "\u09a8\u09cb\u0999\u09cd\u0997\u09b0",
-"Special character": "\u09ac\u09bf\u09b6\u09c7\u09b7 \u099a\u09b0\u09bf\u09a4\u09cd\u09b0",
-"Code sample": "\u09a8\u09ae\u09c1\u09a8\u09be \u0995\u09cb\u09a1",
-"Color": "\u09b0\u0999",
-"Emoticons": "\u0987\u09ae\u09cb\u099f\u09bf\u0995\u09a8",
-"Document properties": "\u09a8\u09a5\u09bf\u09b0 \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Image": "\u099b\u09ac\u09bf",
-"Insert link": "\u09b2\u09bf\u0999\u09cd\u0995 \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8",
-"Target": "\u09b2\u0995\u09cd\u09b7\u09cd\u09af",
-"Link": "\u09b2\u09bf\u0982\u0995",
-"Poster": "\u09aa\u09cb\u09b8\u09cd\u099f\u09be\u09b0",
-"Media": "\u09ae\u09bf\u09a1\u09bf\u09af\u09bc\u09be",
-"Print": "\u099b\u09be\u09aa\u09be",
-"Prev": "\u09aa\u09c2\u09b0\u09cd\u09ac\u09ac\u09b0\u09cd\u09a4\u09c0",
-"Find and replace": "\u0996\u09c1\u0981\u099c\u09c1\u09a8 \u0993 \u09aa\u09cd\u09b0\u09a4\u09bf\u09b8\u09cd\u09a5\u09be\u09aa\u09a8 \u0995\u09b0\u09c1\u09a8",
-"Whole words": "\u09b8\u09ae\u09cd\u09aa\u09c2\u09b0\u09cd\u09a3 \u09b6\u09ac\u09cd\u09a6\u09c7\u09b0",
-"Spellcheck": "\u09ac\u09be\u09a8\u09be\u09a8 \u09af\u09be\u099a\u09be\u0987",
-"Caption": "\u0995\u09cd\u09af\u09be\u09aa\u09b6\u09a8",
-"Insert template": "\u099f\u09c7\u09ae\u09aa\u09cd\u09b2\u09c7\u099f \u09a2\u09cb\u0995\u09be\u09a8"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/cs.js b/cps/static/js/libs/tinymce/langs/cs.js
index 49b6dd857..14877f9b6 100644
--- a/cps/static/js/libs/tinymce/langs/cs.js
+++ b/cps/static/js/libs/tinymce/langs/cs.js
@@ -1,5 +1,5 @@
 tinymce.addI18n('cs',{
-"Redo": "Opakovat",
+"Redo": "Znovu",
 "Undo": "Zp\u011bt",
 "Cut": "Vyjmout",
 "Copy": "Kop\u00edrovat",
@@ -7,19 +7,19 @@ tinymce.addI18n('cs',{
 "Select all": "Vybrat v\u0161e",
 "New document": "Nov\u00fd dokument",
 "Ok": "OK",
-"Cancel": "Storno",
+"Cancel": "Zru\u0161it",
 "Visual aids": "Vizu\u00e1ln\u00ed pom\u016fcky",
 "Bold": "Tu\u010dn\u00e9",
 "Italic": "Kurz\u00edva",
-"Underline": "Podtr\u017een\u00ed",
+"Underline": "Podtr\u017een\u00e9",
 "Strikethrough": "P\u0159e\u0161krtnut\u00e9",
 "Superscript": "Horn\u00ed index",
 "Subscript": "Doln\u00ed index",
 "Clear formatting": "Vymazat form\u00e1tov\u00e1n\u00ed",
-"Align left": "Zarovnat doleva",
+"Align left": "Zarovnat vlevo",
 "Align center": "Zarovnat na st\u0159ed",
-"Align right": "Zarovnat doprava",
-"Justify": "Zarovnat do bloku",
+"Align right": "Zarovnat vpravo",
+"Justify": "Do bloku",
 "Bullet list": "Odr\u00e1\u017eky",
 "Numbered list": "\u010c\u00edslov\u00e1n\u00ed",
 "Decrease indent": "Zmen\u0161it odsazen\u00ed",
@@ -42,23 +42,23 @@ tinymce.addI18n('cs',{
 "Heading 5": "Nadpis 5",
 "Heading 6": "Nadpis 6",
 "Preformatted": "P\u0159edform\u00e1tovan\u00fd text",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "K\u00f3d",
+"Div": "Div (blok)",
+"Pre": "Pre (p\u0159edform\u00e1tov\u00e1no)",
+"Code": "Code (k\u00f3d)",
 "Paragraph": "Odstavec",
-"Blockquote": "Blokov\u00e1 citace",
+"Blockquote": "Citace",
 "Inline": "\u0158\u00e1dkov\u00e9 zobrazen\u00ed (inline)",
-"Blocks": "Bloky",
+"Blocks": "Blokov\u00e9 zobrazen\u00ed (block)",
 "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Je zapnuto vkl\u00e1d\u00e1n\u00ed \u010dist\u00e9ho textu. Dokud nebude tato volba vypnuta, bude ve\u0161ker\u00fd obsah vlo\u017een jako \u010dist\u00fd text.",
-"Fonts": "P\u00edsma",
+"Fonts": "Typ p\u00edsma",
 "Font Sizes": "Velikost p\u00edsma",
 "Class": "T\u0159\u00edda",
 "Browse for an image": "Vyhledat obr\u00e1zek",
-"OR": "OR",
-"Drop an image here": "P\u0159esu\u0148te obr\u00e1zek sem",
+"OR": "NEBO",
+"Drop an image here": "P\u0159et\u00e1hn\u011bte obr\u00e1zek do tohoto um\u00edst\u011bn\u00ed",
 "Upload": "Nahr\u00e1t",
 "Block": "Do bloku",
-"Align": "Zarovnat",
+"Align": "Zarovn\u00e1n\u00ed",
 "Default": "V\u00fdchoz\u00ed",
 "Circle": "Kole\u010dko",
 "Disc": "Punt\u00edk",
@@ -68,7 +68,7 @@ tinymce.addI18n('cs',{
 "Lower Roman": "Mal\u00e9 \u0159\u00edmsk\u00e9 \u010d\u00edslice",
 "Upper Alpha": "velk\u00e9 p\u00edsmenkov\u00e1n\u00ed",
 "Upper Roman": "\u0158\u00edmsk\u00e9 \u010d\u00edslice",
-"Anchor...": "Kotva...",
+"Anchor...": "Kotva",
 "Name": "N\u00e1zev",
 "Id": "Id",
 "Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id by m\u011blo za\u010d\u00ednat p\u00edsmenem a d\u00e1le obsahovat pouze p\u00edsmena, \u010d\u00edsla, poml\u010dky, te\u010dky, dvojte\u010dky, nebo podtr\u017e\u00edtka.",
@@ -78,14 +78,15 @@ tinymce.addI18n('cs',{
 "Source code": "Zdrojov\u00fd k\u00f3d",
 "Insert\/Edit code sample": "Vlo\u017eit \/ Upravit uk\u00e1zkov\u00fd k\u00f3d",
 "Language": "Jazyk",
-"Code sample...": "Uk\u00e1zkov\u00fd k\u00f3d...",
+"Code sample...": "Uk\u00e1zka k\u00f3du",
 "Color Picker": "V\u00fdb\u011br barvy",
 "R": "R",
 "G": "G",
 "B": "B",
 "Left to right": "Zleva doprava",
 "Right to left": "Zprava doleva",
-"Emoticons...": "Emotikony...",
+"Emoticons": "Emotikony",
+"Emoticons...": "Emotikony",
 "Metadata and Document Properties": "Metadata a vlastnosti dokumentu",
 "Title": "Titulek",
 "Keywords": "Kl\u00ed\u010dov\u00e1 slova",
@@ -113,7 +114,9 @@ tinymce.addI18n('cs',{
 "Handy Shortcuts": "U\u017eite\u010dn\u00e9 kl\u00e1vesov\u00e9 zkratky",
 "Horizontal line": "Vodorovn\u00e1 \u010d\u00e1ra",
 "Insert\/edit image": "Vlo\u017eit \/ upravit obr\u00e1zek",
-"Image description": "Popis obr\u00e1zku",
+"Alternative description": "Alternativn\u00ed text",
+"Accessibility": "Bez alternativn\u00edho textu",
+"Image is decorative": "(dekorativn\u00ed obr\u00e1zek bez alternativn\u00edho textu)",
 "Source": "URL",
 "Dimensions": "Rozm\u011bry",
 "Constrain proportions": "Zachovat proporce",
@@ -124,7 +127,7 @@ tinymce.addI18n('cs',{
 "Horizontal space": "Horizont\u00e1ln\u00ed mezera",
 "Border": "R\u00e1me\u010dek",
 "Insert image": "Vlo\u017eit obr\u00e1zek",
-"Image...": "Obr\u00e1zek\u2026",
+"Image...": "Obr\u00e1zek",
 "Image list": "Seznam obr\u00e1zk\u016f",
 "Rotate counterclockwise": "Oto\u010dit doleva",
 "Rotate clockwise": "Oto\u010dit doprava",
@@ -147,30 +150,31 @@ tinymce.addI18n('cs',{
 "Back": "Zp\u011bt",
 "Insert date\/time": "Vlo\u017eit datum \/ \u010das",
 "Date\/time": "Datum\/\u010das",
-"Insert\/Edit Link": "P\u0159idat\/upravit odkaz",
 "Insert\/edit link": "Vlo\u017eit \/ upravit odkaz",
 "Text to display": "Text k zobrazen\u00ed",
 "Url": "URL",
-"Open link in...": "Otev\u0159\u00edt odkaz v...",
-"Current window": "Aktu\u00e1ln\u00ed okno",
+"Open link in...": "C\u00edlov\u00e9 okno URL",
+"Current window": "Otev\u0159\u00edt v nad\u0159azen\u00e9 okn\u011b",
 "None": "\u017d\u00e1dn\u00e9",
 "New window": "Nov\u00e9 okno",
+"Open link": "C\u00edlov\u00e9 okno URL",
 "Remove link": "Odstranit odkaz",
 "Anchors": "Kotvy",
-"Link...": "Odkaz...",
+"Link...": "Odkaz",
 "Paste or type a link": "Vlo\u017eit nebo napsat odkaz",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Zadan\u00e9 URL vypad\u00e1 jako e-mailov\u00e1 adresa. Chcete doplnit povinn\u00fd prefix mailto:?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Zadan\u00e9 URL vypad\u00e1 jako odkaz na jin\u00fd web. Chcete doplnit povinn\u00fd prefix http:\/\/?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Zadan\u00e9 URL vypad\u00e1 jako odkaz na jin\u00fd web. Chcete doplnit povinn\u00fd prefix https:\/\/?",
 "Link list": "Seznam odkaz\u016f",
 "Insert video": "Vlo\u017eit video",
 "Insert\/edit video": "Vlo\u017eit \/ upravit video",
 "Insert\/edit media": "Vlo\u017eit \/ upravit m\u00e9dia",
 "Alternative source": "Alternativn\u00ed zdroj",
 "Alternative source URL": "Alternativn\u00ed zdrojov\u00e1 URL",
-"Media poster (Image URL)": "Medi\u00e1ln\u00ed plak\u00e1t (URL obr\u00e1zku)",
+"Media poster (Image URL)": "URL n\u00e1hledu",
 "Paste your embed code below:": "Vlo\u017ete k\u00f3d pro vlo\u017een\u00ed n\u00ed\u017ee:",
 "Embed": "Vlo\u017eit",
-"Media...": "M\u00e9dium...",
+"Media...": "M\u00e9dia",
 "Nonbreaking space": "Pevn\u00e1 mezera",
 "Page break": "Konec str\u00e1nky",
 "Paste as text": "Vlo\u017eit jako \u010dist\u00fd text",
@@ -183,11 +187,15 @@ tinymce.addI18n('cs',{
 "Replace all": "Nahradit v\u0161e",
 "Previous": "P\u0159edchoz\u00ed",
 "Next": "Dal\u0161\u00ed",
-"Find and replace...": "Naj\u00edt a nahradit...",
+"Find and Replace": "Naj\u00edt a nahradit",
+"Find and replace...": "Naj\u00edt a nahradit",
 "Could not find the specified string.": "Zadan\u00fd \u0159et\u011bzec nebyl nalezen.",
 "Match case": "Rozli\u0161ovat mal\u00e1 a velk\u00e1 p\u00edsmena",
-"Find whole words only": "Hledat pouze cel\u00e1 slova",
-"Spell check": "Kontrola pravopisu",
+"Find whole words only": "Pouze cel\u00e1 slova",
+"Find in selection": "Ozna\u010den\u00fd text",
+"Spellcheck": "Kontrola pravopisu",
+"Spellcheck Language": "Jazyk kontroly pravopisu",
+"No misspellings found.": "Nebyly nalezeny \u017e\u00e1dn\u00e9 p\u0159eklepy.",
 "Ignore": "Ignorovat",
 "Ignore all": "Ignorovat v\u0161e",
 "Finish": "Ukon\u010dit",
@@ -218,7 +226,8 @@ tinymce.addI18n('cs',{
 "Height": "V\u00fd\u0161ka",
 "Cell spacing": "Vn\u011bj\u0161\u00ed okraj bun\u011bk",
 "Cell padding": "Vnit\u0159n\u00ed okraj bun\u011bk",
-"Show caption": "Zobrazit titulku",
+"Caption": "Nadpis",
+"Show caption": "Zobrazit titulek",
 "Left": "Vlevo",
 "Center": "Na st\u0159ed",
 "Right": "Vpravo",
@@ -238,7 +247,7 @@ tinymce.addI18n('cs',{
 "Body": "T\u011blo",
 "Footer": "Pati\u010dka",
 "Border color": "Barva r\u00e1me\u010dku",
-"Insert template...": "Vlo\u017eit \u0161ablonu...",
+"Insert template...": "Vlo\u017eit \u0161ablonu",
 "Templates": "\u0160ablony",
 "Template": "\u0160ablona",
 "Text color": "Barva p\u00edsma",
@@ -274,11 +283,11 @@ tinymce.addI18n('cs',{
 "Valid": "Platn\u00fd",
 "To open the popup, press Shift+Enter": "Vyskakovac\u00ed okno otev\u0159ete stisknut\u00edm Shift+Enter",
 "Rich Text Area. Press ALT-0 for help.": "Oblast Rich Text, stiskn\u011bte ALT-0 pro n\u00e1pov\u011bdu.",
-"System Font": "Syst\u00e9mov\u00e9 p\u00edsmo",
-"Failed to upload image: {0}": "Nahr\u00e1n\u00ed obr\u00e1zku selhalo:",
-"Failed to load plugin: {0} from url {1}": "Na\u010dten\u00ed z\u00e1suvn\u00e9ho modulu selhalo: {0} z URL {1}",
-"Failed to load plugin url: {0}": "Na\u010dten\u00ed z\u00e1suvn\u00e9ho modulu URL selhalo: {0}",
-"Failed to initialize plugin: {0}": "Inicializace z\u00e1suvn\u00e9ho modulu selhala:",
+"System Font": "Typ p\u00edsma",
+"Failed to upload image: {0}": "Selhalo nahr\u00e1n\u00ed obr\u00e1zku: {0}",
+"Failed to load plugin: {0} from url {1}": "Selhalo na\u010dten\u00ed pluginu: {0} z URL {1}",
+"Failed to load plugin url: {0}": "Selhalo na\u010dten\u00ed URL pluginu: {0}",
+"Failed to initialize plugin: {0}": "Selhala inicializace pluginu: {0}",
 "example": "p\u0159\u00edklad",
 "Search": "Hledat",
 "All": "V\u0161e",
@@ -286,43 +295,43 @@ tinymce.addI18n('cs',{
 "Text": "Text",
 "Quotations": "Citace",
 "Mathematical": "Matematick\u00e9 symboly",
-"Extended Latin": "Roz\u0161\u00ed\u0159en\u00e9 Latin",
+"Extended Latin": "Roz\u0161\u00ed\u0159en\u00e1 latinka",
 "Symbols": "Symboly",
 "Arrows": "\u0160ipky",
 "User Defined": "Definovan\u00e9 u\u017eivatelem",
-"dollar sign": "znak dolaru",
+"dollar sign": "znak dolar",
 "currency sign": "znak m\u011bny",
-"euro-currency sign": "znak m\u011bny euro",
-"colon sign": "znak dvojte\u010dky",
+"euro-currency sign": "znak eura",
+"colon sign": "znak colon",
 "cruzeiro sign": "znak cruzeiro",
-"french franc sign": "znak francouzsk\u00e9ho franku",
-"lira sign": "znak liry",
+"french franc sign": "znak francouzsk\u00fdo frank",
+"lira sign": "znak lira",
 "mill sign": "znak mill",
-"naira sign": "znak nairy",
-"peseta sign": "znak pesety",
+"naira sign": "znak nairo",
+"peseta sign": "znak peseto",
 "rupee sign": "znak rupie",
-"won sign": "znak wonu",
-"new sheqel sign": "znak nov\u00e9ho \u0161ekelu",
-"dong sign": "znak dongu",
-"kip sign": "znak kipu",
-"tugrik sign": "znak tugriku",
-"drachma sign": "znak drachmy",
-"german penny symbol": "znak n\u011bmeck\u00e9ho feniku",
-"peso sign": "znak pesa",
+"won sign": "znak won",
+"new sheqel sign": "znak nov\u00fd \u0161ekel",
+"dong sign": "znak dong",
+"kip sign": "znak kip",
+"tugrik sign": "znak tugrik",
+"drachma sign": "znak drachma",
+"german penny symbol": "znak n\u011bmeck\u00fd fenik",
+"peso sign": "znak peso",
 "guarani sign": "znak guaran\u00ed",
 "austral sign": "znak austral",
-"hryvnia sign": "znak h\u0159ivny",
+"hryvnia sign": "znak h\u0159ivna",
 "cedi sign": "znak cedi",
-"livre tournois sign": "znak tournois libry",
+"livre tournois sign": "znak tournois libra",
 "spesmilo sign": "znak spesmilo",
 "tenge sign": "znak tenge",
-"indian rupee sign": "znak indick\u00e9 rupie",
-"turkish lira sign": "znak tureck\u00e9 liry",
-"nordic mark sign": "znak norsk\u00e9 marky",
-"manat sign": "znak manatu",
-"ruble sign": "znak rublu",
-"yen character": "znak jenu",
-"yuan character": "znak juanu",
+"indian rupee sign": "znak indick\u00e1 rupie",
+"turkish lira sign": "znak tureck\u00e1 liry",
+"nordic mark sign": "znak norsk\u00e1 marka",
+"manat sign": "znak manat",
+"ruble sign": "znak rubl",
+"yen character": "znak jen",
+"yuan character": "znak juan",
 "yuan character, in hong kong and taiwan": "znak juanu v hongkongu a tchaj-wanu",
 "yen\/yuan character variant one": "znak jenu\/juanu, varianta 1",
 "Loading emoticons...": "Na\u010d\u00edt\u00e1n\u00ed emotikon\u016f...",
@@ -377,7 +386,21 @@ tinymce.addI18n('cs',{
 "formatting": "form\u00e1tov\u00e1n\u00ed",
 "alignment": "zarovn\u00e1n\u00ed",
 "indentation": "odsazen\u00ed",
-"permanent pen": "permanentn\u00ed pero",
+"Font": "P\u00edsmo",
+"Size": "Velikost",
+"More...": "Dal\u0161\u00ed\u2026",
+"Select...": "Vybrat",
+"Preferences": "P\u0159edvolby",
+"Yes": "Ano",
+"No": "Ne",
+"Keyboard Navigation": "Navigace pomoc\u00ed kl\u00e1vesnice",
+"Version": "Verze",
+"Code view": "Zobrazit k\u00f3d",
+"Open popup menu for split buttons": "Otev\u0159ete vyskakovac\u00ed nab\u00eddku pro rozd\u011blen\u00e1 tla\u010d\u00edtka",
+"List Properties": "Vlastnosti seznamu",
+"List properties...": "Vlastnosti seznamu...",
+"Start list at number": "Po\u010d\u00e1te\u010dn\u00ed \u010d\u00edslo seznamu",
+"Line height": "V\u00fd\u0161ka \u0159\u00e1dku",
 "comments": "koment\u00e1\u0159e",
 "Format Painter": "Kop\u00edrovat form\u00e1t",
 "Insert\/edit iframe": "Vlo\u017eit\/upravit prvek iframe",
@@ -385,24 +408,46 @@ tinymce.addI18n('cs',{
 "lowercase": "mal\u00e1 p\u00edsmena",
 "UPPERCASE": "VELK\u00c1 P\u00cdSMENA",
 "Title Case": "V\u0161echna Prvn\u00ed Velk\u00e1",
+"permanent pen": "Permanentn\u00ed pero",
 "Permanent Pen Properties": "Vlastnosti permanentn\u00edho pera",
 "Permanent pen properties...": "Vlastnosti permanentn\u00edho pera\u2026",
-"Font": "P\u00edsmo",
-"Size": "Velikost",
-"More...": "Dal\u0161\u00ed\u2026",
-"Spellcheck Language": "Jazyk kontroly pravopisu",
-"Select...": "Vybrat\u2026",
-"Preferences": "P\u0159edvolby",
-"Yes": "Ano",
-"No": "Ne",
-"Keyboard Navigation": "Navigace pomoc\u00ed kl\u00e1vesnice",
-"Version": "Verze",
+"case change": "Zm\u011bna velikosti p\u00edsma",
+"page embed": "Vlo\u017een\u00ed str\u00e1nky",
+"Advanced sort...": "Roz\u0161\u00ed\u0159en\u00e9 \u0159azen\u00ed...",
+"Advanced Sort": "Roz\u0161\u00ed\u0159en\u00e9 \u0159azen\u00ed",
+"Sort table by column ascending": "Se\u0159adit tabulku podle sloupce vzestupn\u011b",
+"Sort table by column descending": "Se\u0159adit tabulku podle sloupce sestupn\u011b",
+"Sort": "\u0158adit",
+"Order": "\u0158azen\u00ed",
+"Sort by": "\u0158adit dle",
+"Ascending": "Vzestupn\u011b",
+"Descending": "Sestupn\u011b",
+"Column {0}": "Sloupec {0}",
+"Row {0}": "\u0158\u00e1dek {0}",
+"Spellcheck...": "Kontrola pravopisu",
+"Misspelled word": "\u0160patn\u011b napsan\u00e9 slovo",
+"Suggestions": "N\u00e1vrhy",
+"Change": "Zm\u011bnit",
+"Finding word suggestions": "Hled\u00e1n\u00ed n\u00e1vrh\u016f slov",
+"Success": "\u00dasp\u011b\u0161n\u00e9",
+"Repair": "Opraveno",
+"Issue {0} of {1}": "Probl\u00e9m {0} z {1}",
+"Images must be marked as decorative or have an alternative text description": "Obr\u00e1zky mus\u00ed b\u00fdt ozna\u010deny jako dekorativn\u00ed nebo mus\u00ed m\u00edt alternativn\u00ed textov\u00fd popis.",
+"Images must have an alternative text description. Decorative images are not allowed.": "Obr\u00e1zky mus\u00ed m\u00edt alternativn\u00ed textov\u00fd popis. Dekorativn\u00ed obr\u00e1zky nejsou povoleny.",
+"Or provide alternative text:": "Nebo zadejte alternativn\u00ed text:",
+"Make image decorative:": "Nastavit obr\u00e1zek jako dekorativn\u00ed:",
+"ID attribute must be unique": "ID atributu mus\u00ed b\u00fdt jedine\u010dn\u00e9",
+"Make ID unique": "Nastavit ID jako jedine\u010dn\u00e9",
+"Keep this ID and remove all others": "Ponechat toto ID a odstranit v\u0161echny ostatn\u00ed",
+"Remove this ID": "Odebrat toto ID",
+"Remove all IDs": "Odebrat v\u0161echna ID",
+"Checklist": "Kontroln\u00ed seznam",
 "Anchor": "Kotva",
 "Special character": "Speci\u00e1ln\u00ed znak",
 "Code sample": "Uk\u00e1zkov\u00fd k\u00f3d",
 "Color": "Barva",
-"Emoticons": "Emotikony",
 "Document properties": "Vlastnosti dokumentu",
+"Image description": "Popis obr\u00e1zku",
 "Image": "Obr\u00e1zek",
 "Insert link": "Vlo\u017eit odkaz",
 "Target": "C\u00edl",
@@ -413,7 +458,5 @@ tinymce.addI18n('cs',{
 "Prev": "P\u0159edchoz\u00ed",
 "Find and replace": "Naj\u00edt a nahradit",
 "Whole words": "Pouze cel\u00e1 slova",
-"Spellcheck": "Kontrola pravopisu",
-"Caption": "Nadpis",
 "Insert template": "Vlo\u017eit \u0161ablonu"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/cy.js b/cps/static/js/libs/tinymce/langs/cy.js
index 77e8b1245..775b20de3 100644
--- a/cps/static/js/libs/tinymce/langs/cy.js
+++ b/cps/static/js/libs/tinymce/langs/cy.js
@@ -9,7 +9,7 @@ tinymce.addI18n('cy',{
 "Ok": "Iawn",
 "Cancel": "Canslo",
 "Visual aids": "Cymorth gweledol",
-"Bold": "Bras",
+"Bold": "Trwm",
 "Italic": "Italig",
 "Underline": "Tanlinellu",
 "Strikethrough": "Llinell drwodd",
@@ -85,6 +85,7 @@ tinymce.addI18n('cy',{
 "B": "Gl",
 "Left to right": "Chwith i'r dde",
 "Right to left": "De i'r chwith",
+"Emoticons": "Gwenogluniau",
 "Emoticons...": "Gwenogluniau...",
 "Metadata and Document Properties": "Metaddata a Priodweddau'r ddogfen",
 "Title": "Teitl",
@@ -113,7 +114,9 @@ tinymce.addI18n('cy',{
 "Handy Shortcuts": "Llwybrau byr cyfleus",
 "Horizontal line": "Llinell lorweddol",
 "Insert\/edit image": "Mewnosod\/golygu delwedd",
-"Image description": "Disgrifiad y ddelwedd",
+"Alternative description": "Disgrifiad arall",
+"Accessibility": "Hygyrchedd",
+"Image is decorative": "Delwedd yn addurniadol",
 "Source": "Ffynhonnell",
 "Dimensions": "Dimensiynau",
 "Constrain proportions": "Gorfodi cyfrannedd",
@@ -147,7 +150,6 @@ tinymce.addI18n('cy',{
 "Back": "Nol",
 "Insert date\/time": "Mewnosod dyddiad\/amser",
 "Date\/time": "Dyddiad\/amser",
-"Insert\/Edit Link": "Mewnosod\/Golygu dolen",
 "Insert\/edit link": "Mewnosod\/golygu dolen",
 "Text to display": "Testun i'w ddangos",
 "Url": "Url",
@@ -155,12 +157,14 @@ tinymce.addI18n('cy',{
 "Current window": "Ffenestr gyfredol",
 "None": "Dim",
 "New window": "Ffenest newydd",
+"Open link": "Agor dolen",
 "Remove link": "Tynnu dolen",
 "Anchors": "Angorau",
 "Link...": "Dolen...",
 "Paste or type a link": "Pastio neu deipio dolen",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Mae'n debyg mai cyfeiriad e-bost yw'r URL hwn. Ydych chi am ychwanegu'r rhagddoddiad mailto:?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Mae'n debyg mai dolen allanol yw'r URL hwn. Ydych chi am ychwanegu'r rhagddodiad http:\/\/ ?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Ymddengys mai dolen allannol yw'r URL a roddoch chi. Ydych chi eisiau ychwanegu'r rhagddodiad https:\/\/ gofynnol?",
 "Link list": "Rhestr dolenni",
 "Insert video": "Mewnosod fideo",
 "Insert\/edit video": "Mewnosod\/golygu fideo",
@@ -183,11 +187,15 @@ tinymce.addI18n('cy',{
 "Replace all": "Amnewid y cwbl",
 "Previous": "Blaenorol",
 "Next": "Nesaf",
+"Find and Replace": "Canfod a Newid",
 "Find and replace...": "Chwilio ac amnewid",
 "Could not find the specified string.": "Methu ffeindio'r llinyn hwnnw.",
 "Match case": "Cas yn cyfateb",
 "Find whole words only": "Canfod geiriau llawn yn unig",
-"Spell check": "Gwirwr sillafu",
+"Find in selection": "Canfod yn y dewisiad",
+"Spellcheck": "Sillafydd",
+"Spellcheck Language": "Iaith Gwirio Sillafu",
+"No misspellings found.": "Dim camsillafiadau.",
 "Ignore": "Anwybyddu",
 "Ignore all": "Amwybyddu pob",
 "Finish": "Gorffen",
@@ -218,6 +226,7 @@ tinymce.addI18n('cy',{
 "Height": "Uchder",
 "Cell spacing": "Bylchiad celloedd",
 "Cell padding": "Padio celloedd",
+"Caption": "Pennawd",
 "Show caption": "Dangos capsiwn",
 "Left": "Chwith",
 "Center": "Canol",
@@ -377,31 +386,67 @@ tinymce.addI18n('cy',{
 "formatting": "fformatio",
 "alignment": "aliniad",
 "indentation": "mewnoli",
-"permanent pen": "pen sefydlog",
-"comments": "Sylwadau",
-"Format Painter": "Brwsh Fformat",
-"Insert\/edit iframe": "Mewnosod\/golygu iframe",
-"Capitalization": "Priflythrennu",
-"lowercase": "llythrennau bach",
-"UPPERCASE": "Priflythrennau",
-"Title Case": "Priflythyren i bob gair",
-"Permanent Pen Properties": "Priodweddau Yswgrifbin Parhaol",
-"Permanent pen properties...": "Priodweddau ysgrifbin parhaol...",
 "Font": "Ffont",
 "Size": "Maint",
 "More...": "Mwy...",
-"Spellcheck Language": "Iaith Gwirio Sillafu",
 "Select...": "Dewis...",
 "Preferences": "Dewisiadau",
 "Yes": "Iawn",
 "No": "Na",
 "Keyboard Navigation": "Llywio Bysellfwrdd",
 "Version": "Fersiwn",
+"Code view": "Golwg cod",
+"Open popup menu for split buttons": "Agor naidlen ar gyfer botymau hollt",
+"List Properties": "Rhestru Priodweddau",
+"List properties...": "Rhestru priodweddau...",
+"Start list at number": "Dechrau rhestr efo rhif",
+"Line height": "Uchder llinell",
+"comments": "Sylwadau",
+"Format Painter": "Brwsh Fformat",
+"Insert\/edit iframe": "Mewnosod\/golygu iframe",
+"Capitalization": "Priflythrennu",
+"lowercase": "llythrennau bach",
+"UPPERCASE": "PRIFLYTHRENNAU",
+"Title Case": "Priflythyren i bob gair",
+"permanent pen": "pen sefydlog",
+"Permanent Pen Properties": "Priodweddau Yswgrifbin Parhaol",
+"Permanent pen properties...": "Priodweddau ysgrifbin parhaol...",
+"case change": "Newid Cas",
+"page embed": "Mewnblannu i'r dudalen",
+"Advanced sort...": "Trefnu uwch...",
+"Advanced Sort": "Trefnu Uwch",
+"Sort table by column ascending": "Trefnu tabl yn \u00f4l colofn yn esgynnol",
+"Sort table by column descending": "Trefnu tabl yn \u00f4l colofn yn ddisgynnol",
+"Sort": "Trefnu",
+"Order": "Trefn",
+"Sort by": "Trefnu yn \u00f4l",
+"Ascending": "yn Esgynnol",
+"Descending": "yn Ddisgynnol",
+"Column {0}": "Colofn {0}",
+"Row {0}": "Rhes {0}",
+"Spellcheck...": "Gwirydd sillafu...",
+"Misspelled word": "Gair wedi ei gamsillafu",
+"Suggestions": "Awgrymiadau",
+"Change": "Newid",
+"Finding word suggestions": "Darganfod geiriau a awgrymir",
+"Success": "Llwyddiant",
+"Repair": "Trwsio",
+"Issue {0} of {1}": "Problem  {0} o {1}",
+"Images must be marked as decorative or have an alternative text description": "Rhaid bod delwedd wedi ei marcio yn addurniadol neu gyda disgrifiad testun arall",
+"Images must have an alternative text description. Decorative images are not allowed.": "Rhaid bod gan ddelwedd ddisgrifiad testun arall. Ni chaniateir delweddau addurniadol.",
+"Or provide alternative text:": "Neu darparu testun arall:",
+"Make image decorative:": "Gwneud delwedd yn addurniadol:",
+"ID attribute must be unique": "Rhaid i'r priodoledd ID fod yn unigryw",
+"Make ID unique": "Gwneud yr ID yn unigryw",
+"Keep this ID and remove all others": "Cadwch yr ID hwn a dileu pob un arall",
+"Remove this ID": "Dileu'r ID hwn",
+"Remove all IDs": "Dileu pob ID",
+"Checklist": "Rhestr wirio",
 "Anchor": "Angor",
 "Special character": "Nod arbennig",
 "Color": "Lliw",
-"Emoticons": "Gwenogluniau",
 "Document properties": "Priodweddau'r ddogfen",
+"Image description": "Disgrifiad y ddelwedd",
 "Image": "Delwedd",
 "Insert link": "Mewnosod dolen",
 "Link": "Dolen",
@@ -412,7 +457,5 @@ tinymce.addI18n('cy',{
 "Whole words": "Geiriau cyfan",
 "Find and replace": "Chwilio ac amnewid",
 "Prev": "Blaenorol",
-"Spellcheck": "Sillafydd",
-"Caption": "Pennawd",
 "Insert template": "Mewnosod templed"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/da.js b/cps/static/js/libs/tinymce/langs/da.js
index aadff6d9c..a5bddaf75 100644
--- a/cps/static/js/libs/tinymce/langs/da.js
+++ b/cps/static/js/libs/tinymce/langs/da.js
@@ -85,6 +85,7 @@ tinymce.addI18n('da',{
 "B": "B",
 "Left to right": "Venstre til h\u00f8jre",
 "Right to left": "H\u00f8jre til venstre",
+"Emoticons": "Emot-ikoner",
 "Emoticons...": "Emotikoner...",
 "Metadata and Document Properties": "Metadata og dokumentegenskaber",
 "Title": "Titel",
@@ -113,7 +114,9 @@ tinymce.addI18n('da',{
 "Handy Shortcuts": "Praktiske Genveje",
 "Horizontal line": "Vandret linie",
 "Insert\/edit image": "Inds\u00e6t\/ret billede",
-"Image description": "Billede beskrivelse",
+"Alternative description": "Alternativ beskrivelse",
+"Accessibility": "Tilg\u00e6ngelighed",
+"Image is decorative": "Billede er dekorativt",
 "Source": "Kilde",
 "Dimensions": "Dimensioner",
 "Constrain proportions": "Behold propertioner",
@@ -147,7 +150,6 @@ tinymce.addI18n('da',{
 "Back": "Tilbage",
 "Insert date\/time": "Inds\u00e6t dato\/klokkeslet",
 "Date\/time": "Dato\/klokkeslet",
-"Insert\/Edit Link": "Inds\u00e6t\/rediger link",
 "Insert\/edit link": "Inds\u00e6t\/ret link",
 "Text to display": "Vis tekst",
 "Url": "Url",
@@ -155,12 +157,14 @@ tinymce.addI18n('da',{
 "Current window": "Aktuelle vindue",
 "None": "Ingen",
 "New window": "Nyt vindue",
+"Open link": "\u00c5ben link",
 "Remove link": "Fjern link",
 "Anchors": "Ankre",
 "Link...": "Link...",
 "Paste or type a link": "Inds\u00e6t eller skriv et link",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URLen som du angav ser ud til at v\u00e6re en email adresse. \u00d8nsker du at tilf\u00f8je det kr\u00e6vede prefiks  mailto: ?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URLen som du angav ser ud til at v\u00e6re et eksternt link. \u00d8nsker du at tilf\u00f8je det kr\u00e6vede prefiks http:\/\/ ?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "URL'en som du angav ser ud til at v\u00e6re et eksternt link. \u00d8nsker du at tilf\u00f8je det n\u00f8dvendige https:\/\/ pr\u00e6fiks?",
 "Link list": "Link liste",
 "Insert video": "Inds\u00e6t video",
 "Insert\/edit video": "Inds\u00e6t\/ret video",
@@ -183,11 +187,15 @@ tinymce.addI18n('da',{
 "Replace all": "Erstat alt",
 "Previous": "Forrige",
 "Next": "N\u00e6ste",
+"Find and Replace": "Find og erstat",
 "Find and replace...": "Find og erstat...",
 "Could not find the specified string.": "Kunne ikke finde s\u00f8getekst",
 "Match case": "STORE og sm\u00e5 bogstaver",
 "Find whole words only": "Find kun hele ord",
-"Spell check": "Stavekontrol",
+"Find in selection": "Find i det valgte",
+"Spellcheck": "Stavekontrol",
+"Spellcheck Language": "Sprog til stavekontrol",
+"No misspellings found.": "Ingen stavefejl fundet.",
 "Ignore": "Ignorer",
 "Ignore all": "Ignorer alt",
 "Finish": "F\u00e6rdig",
@@ -218,6 +226,7 @@ tinymce.addI18n('da',{
 "Height": "H\u00f8jde",
 "Cell spacing": "Celle afstand",
 "Cell padding": "Celle padding",
+"Caption": "Tekst",
 "Show caption": "Vis overskrift",
 "Left": "Venstre",
 "Center": "Centrering",
@@ -377,7 +386,21 @@ tinymce.addI18n('da',{
 "formatting": "formatering",
 "alignment": "justering",
 "indentation": "indrykning",
-"permanent pen": "permanent pen",
+"Font": "Skrifttype",
+"Size": "St\u00f8rrelse",
+"More...": "Mere...",
+"Select...": "V\u00e6lg...",
+"Preferences": "Pr\u00e6ferencer",
+"Yes": "Ja",
+"No": "Nej",
+"Keyboard Navigation": "Navigation med tastatur",
+"Version": "Version",
+"Code view": "Kodevisning",
+"Open popup menu for split buttons": "\u00c5ben popup menu for split knapper",
+"List Properties": "List indstillinger",
+"List properties...": "List indstillinger...",
+"Start list at number": "Start liste ved nummer",
+"Line height": "Linjeh\u00f8jde",
 "comments": "kommentarer",
 "Format Painter": "Formatpensel",
 "Insert\/edit iframe": "Inds\u00e6t\/rediger iframe",
@@ -385,24 +408,46 @@ tinymce.addI18n('da',{
 "lowercase": "sm\u00e5 bogstaver",
 "UPPERCASE": "STORE BOGSTAVER",
 "Title Case": "Stort begyndelsesbogstav",
+"permanent pen": "permanent pen",
 "Permanent Pen Properties": "Permanente penegenskaber",
 "Permanent pen properties...": "Permanente penegenskaber...",
-"Font": "Skrifttype",
-"Size": "St\u00f8rrelse",
-"More...": "Mere...",
-"Spellcheck Language": "Sprog til stavekontrol",
-"Select...": "V\u00e6lg...",
-"Preferences": "Pr\u00e6ferencer",
-"Yes": "Ja",
-"No": "Nej",
-"Keyboard Navigation": "Navigation med tastatur",
-"Version": "Version",
+"case change": "\u00e6ndring af stort\/sm\u00e5t",
+"page embed": "side indlejring",
+"Advanced sort...": "Avanceret sortering...",
+"Advanced Sort": "Avanceret sortering",
+"Sort table by column ascending": "Sorter tabel efter kolonne stigende",
+"Sort table by column descending": "Sorter tabel efter kolonne faldende",
+"Sort": "Sorter",
+"Order": "R\u00e6kkef\u00f8lge",
+"Sort by": "Sorter efter",
+"Ascending": "Stigende",
+"Descending": "Faldende",
+"Column {0}": "Kolonne {0}",
+"Row {0}": "R\u00e6kke {0}",
+"Spellcheck...": "Stavekontrol...",
+"Misspelled word": "Ord med stavefejl",
+"Suggestions": "Forslag",
+"Change": "\u00c6ndring",
+"Finding word suggestions": "Finder ord forslag",
+"Success": "Succes",
+"Repair": "Reparer",
+"Issue {0} of {1}": "Problem {0} ud af {1}",
+"Images must be marked as decorative or have an alternative text description": "Billeder skal markeres som dekorative eller have en alternativ tekstbeskrivelse",
+"Images must have an alternative text description. Decorative images are not allowed.": "Billeder skal have en alternativ tekstbeskrivelse. Dekorative billeder er ikke tilladte.",
+"Or provide alternative text:": "Eller angiv en alternativ tekst:",
+"Make image decorative:": "G\u00f8r billede dekorativ:",
+"ID attribute must be unique": "ID attribut skal v\u00e6re unik",
+"Make ID unique": "G\u00f8r ID unik",
+"Keep this ID and remove all others": "Behold dette ID og fjern alle andre",
+"Remove this ID": "Fjern dette ID",
+"Remove all IDs": "Fjern alle ID'er",
+"Checklist": "Kontrolliste",
 "Anchor": "Anchor",
 "Special character": "Specielle tegn",
 "Code sample": "Kodepr\u00f8ve",
 "Color": "Farve",
-"Emoticons": "Emot-ikoner",
 "Document properties": "Dokument egenskaber",
+"Image description": "Billede beskrivelse",
 "Image": "Billede",
 "Insert link": "Inds\u00e6t link",
 "Target": "Target",
@@ -413,7 +458,5 @@ tinymce.addI18n('da',{
 "Prev": "Forrige",
 "Find and replace": "Find og erstat",
 "Whole words": "Hele ord",
-"Spellcheck": "Stavekontrol",
-"Caption": "Tekst",
 "Insert template": "Inds\u00e6t skabelon"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/de.js b/cps/static/js/libs/tinymce/langs/de.js
index 007238f0f..def1e0bb1 100644
--- a/cps/static/js/libs/tinymce/langs/de.js
+++ b/cps/static/js/libs/tinymce/langs/de.js
@@ -85,6 +85,7 @@ tinymce.addI18n('de',{
 "B": "B",
 "Left to right": "Von links nach rechts",
 "Right to left": "Von rechts nach links",
+"Emoticons": "Emoticons",
 "Emoticons...": "Emoticons...",
 "Metadata and Document Properties": "Dokument-Eigenschaften und -Metadaten",
 "Title": "Titel",
@@ -113,7 +114,9 @@ tinymce.addI18n('de',{
 "Handy Shortcuts": "Praktische Tastenkombinationen",
 "Horizontal line": "Horizontale Linie",
 "Insert\/edit image": "Bild einf\u00fcgen\/bearbeiten",
-"Image description": "Bildbeschreibung",
+"Alternative description": "Alternative Beschreibung",
+"Accessibility": "Barrierefreiheit",
+"Image is decorative": "Bild ist dekorativ",
 "Source": "Quelle",
 "Dimensions": "Abmessungen",
 "Constrain proportions": "Seitenverh\u00e4ltnis beibehalten",
@@ -147,7 +150,6 @@ tinymce.addI18n('de',{
 "Back": "Zur\u00fcck",
 "Insert date\/time": "Datum\/Uhrzeit einf\u00fcgen ",
 "Date\/time": "Datum\/Uhrzeit",
-"Insert\/Edit Link": "Link einf\u00fcgen\/bearbeiten",
 "Insert\/edit link": "Link einf\u00fcgen\/bearbeiten",
 "Text to display": "Anzuzeigender Text",
 "Url": "URL",
@@ -155,12 +157,14 @@ tinymce.addI18n('de',{
 "Current window": "Aktuelles Fenster",
 "None": "Keine",
 "New window": "Neues Fenster",
+"Open link": "Link \u00f6ffnen",
 "Remove link": "Link entfernen",
 "Anchors": "Textmarken",
 "Link...": "Link...",
 "Paste or type a link": "Link einf\u00fcgen oder eintippen",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Diese Adresse scheint eine E-Mail-Adresse zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"mailto:\" voranstellen?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Diese Adresse scheint ein externer Link zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"http:\/\/\" voranstellen?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Die eingegebene URL scheint ein externer Link zu sein. Soll das fehlende https:\/\/ davor erg\u00e4nzt werden?",
 "Link list": "Linkliste",
 "Insert video": "Video einf\u00fcgen",
 "Insert\/edit video": "Video einf\u00fcgen\/bearbeiten",
@@ -183,11 +187,15 @@ tinymce.addI18n('de',{
 "Replace all": "Alles ersetzen",
 "Previous": "Vorherige",
 "Next": "Weiter",
+"Find and Replace": "Suchen und Ersetzen",
 "Find and replace...": "Suchen und ersetzen...",
 "Could not find the specified string.": "Die Zeichenfolge wurde nicht gefunden.",
 "Match case": "Gro\u00df-\/Kleinschreibung beachten",
 "Find whole words only": "Nur ganze W\u00f6rter suchen",
-"Spell check": "Rechschreibpr\u00fcfung",
+"Find in selection": "In Auswahl suchen",
+"Spellcheck": "Rechtschreibpr\u00fcfung",
+"Spellcheck Language": "Sprache f\u00fcr die Rechtschreibpr\u00fcfung",
+"No misspellings found.": "Keine Rechtschreibfehler gefunden",
 "Ignore": "Ignorieren",
 "Ignore all": "Alles Ignorieren",
 "Finish": "Ende",
@@ -218,6 +226,7 @@ tinymce.addI18n('de',{
 "Height": "H\u00f6he",
 "Cell spacing": "Zellenabstand",
 "Cell padding": "Zelleninnenabstand",
+"Caption": "Beschriftung",
 "Show caption": "Beschriftung anzeigen",
 "Left": "Linksb\u00fcndig",
 "Center": "Zentriert",
@@ -377,7 +386,21 @@ tinymce.addI18n('de',{
 "formatting": "Formatierung",
 "alignment": "Ausrichtung",
 "indentation": "Einr\u00fcckungen",
-"permanent pen": "Textmarker",
+"Font": "Schriftart",
+"Size": "Schriftgr\u00f6\u00dfe",
+"More...": "Mehr...",
+"Select...": "Auswahl...",
+"Preferences": "Einstellungen",
+"Yes": "Ja",
+"No": "Nein",
+"Keyboard Navigation": "Tastaturnavigation",
+"Version": "Version",
+"Code view": "Code Ansicht",
+"Open popup menu for split buttons": "\u00d6ffne Popup Menge um Buttons zu trennen",
+"List Properties": "Liste Eigenschaften",
+"List properties...": "Liste Eigenschaften",
+"Start list at number": "Beginne Liste mit Nummer",
+"Line height": "Liniendicke",
 "comments": "Anmerkungen",
 "Format Painter": "Format-Painter",
 "Insert\/edit iframe": "iframe einf\u00fcgen\/bearbeiten",
@@ -385,24 +408,46 @@ tinymce.addI18n('de',{
 "lowercase": "Kleinbuchstaben",
 "UPPERCASE": "Gro\u00dfbuchstaben",
 "Title Case": "Gro\u00df-\/Kleinschreibung des Titels",
+"permanent pen": "Textmarker",
 "Permanent Pen Properties": "Eigenschaften von Permanent Pen",
 "Permanent pen properties...": "Eigenschaften von Permanent Pen...",
-"Font": "Schriftart",
-"Size": "Schriftgr\u00f6\u00dfe",
-"More...": "Mehr...",
-"Spellcheck Language": "Sprache f\u00fcr die Rechtschreibpr\u00fcfung",
-"Select...": "Auswahl...",
-"Preferences": "Einstellungen",
-"Yes": "Ja",
-"No": "Nein",
-"Keyboard Navigation": "Tastaturnavigation",
-"Version": "Version",
+"case change": "Gro\u00df-\/Kleinschreibung",
+"page embed": "Seite einbetten",
+"Advanced sort...": "Erweiterte Sortierung...",
+"Advanced Sort": "Erweiterte Sortierung",
+"Sort table by column ascending": "Tabelle aufsteigend nach Spalten sortieren",
+"Sort table by column descending": "Tabelle absteigend nach Spalten sortieren",
+"Sort": "Sortieren",
+"Order": "Reihenfolge",
+"Sort by": "Sortieren nach",
+"Ascending": "Aufsteigend",
+"Descending": "Absteigend",
+"Column {0}": "Spalte {0}",
+"Row {0}": "Reihe {0}",
+"Spellcheck...": "Rechtschreibpr\u00fcfung...",
+"Misspelled word": "Rechtschreibfehler",
+"Suggestions": "Vorschl\u00e4ge",
+"Change": "Ver\u00e4ndere",
+"Finding word suggestions": "Finde Wort Vorschl\u00e4ge",
+"Success": "Erfolg",
+"Repair": "Reparieren",
+"Issue {0} of {1}": "Fehler {0} von {1}",
+"Images must be marked as decorative or have an alternative text description": "Bilder m\u00fcssen entweder als dekorativ markiert werden oder eine alternative Beschreibung bekommen",
+"Images must have an alternative text description. Decorative images are not allowed.": "Bilder ben\u00f6tigen alternativen Text. Dekorative Bilder nicht erlaubt!",
+"Or provide alternative text:": "Oder definiere alternativen Text:",
+"Make image decorative:": "Markiere Bild als dekorativ:",
+"ID attribute must be unique": "ID muss einzigartig sein",
+"Make ID unique": "Mache diese ID einzigartig",
+"Keep this ID and remove all others": "Behalte diese ID und entferne alle anderen",
+"Remove this ID": "Entferne diese ID",
+"Remove all IDs": "Entferne alle IDs",
+"Checklist": "Checkliste",
 "Anchor": "Textmarke",
 "Special character": "Sonderzeichen",
 "Code sample": "Codebeispiel",
 "Color": "Farbe",
-"Emoticons": "Emoticons",
 "Document properties": "Dokumenteigenschaften",
+"Image description": "Bildbeschreibung",
 "Image": "Bild",
 "Insert link": "Link einf\u00fcgen",
 "Target": "Ziel",
@@ -413,7 +458,5 @@ tinymce.addI18n('de',{
 "Prev": "Zur\u00fcck",
 "Find and replace": "Suchen und ersetzen",
 "Whole words": "Nur ganze W\u00f6rter",
-"Spellcheck": "Rechtschreibpr\u00fcfung",
-"Caption": "Beschriftung",
 "Insert template": "Vorlage einf\u00fcgen "
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/es_ES.js b/cps/static/js/libs/tinymce/langs/es_ES.js
deleted file mode 100644
index a10b46d71..000000000
--- a/cps/static/js/libs/tinymce/langs/es_ES.js
+++ /dev/null
@@ -1,370 +0,0 @@
-tinymce.addI18n('es_ES',{
-"Redo": "Rehacer",
-"Undo": "Deshacer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar todo",
-"New document": "Nuevo documento",
-"Ok": "Ok",
-"Cancel": "Cancelar",
-"Visual aids": "Ayudas visuales",
-"Bold": "Negrita",
-"Italic": "Cursiva",
-"Underline": "Subrayado",
-"Strikethrough": "Tachado",
-"Superscript": "Super\u00edndice",
-"Subscript": "Sub\u00edndice",
-"Clear formatting": "Limpiar formato",
-"Align left": "Alinear a la izquierda",
-"Align center": "Alinear al centro",
-"Align right": "Alinear a la derecha",
-"Justify": "Justificar",
-"Bullet list": "Lista de vi\u00f1etas",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Disminuir sangr\u00eda",
-"Increase indent": "Incrementar sangr\u00eda",
-"Close": "Cerrar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Su navegador no es compatible con el acceso directo al portapapeles. Use las teclas Crtl+X\/C\/V de su teclado.",
-"Headers": "Encabezados",
-"Header 1": "Encabezado 1",
-"Header 2": "Encabezado 2",
-"Header 3": "Encabezado 3",
-"Header 4": "Encabezado 4",
-"Header 5": "Encabezado 5",
-"Header 6": "Encabezado 6",
-"Headings": "Encabezados",
-"Heading 1": "Encabezado 1",
-"Heading 2": "Encabezado 2",
-"Heading 3": "Encabezado 3",
-"Heading 4": "Encabezado 4",
-"Heading 5": "Encabezado 5",
-"Heading 6": "Encabezado 6",
-"Preformatted": "Con formato previo",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "P\u00e1rrafo",
-"Blockquote": "Blockquote",
-"Inline": "Alineado",
-"Blocks": "Bloques",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Pegar est\u00e1 ahora en modo de texto sin formato. El contenido se pegar\u00e1 ahora como texto sin formato hasta que desactive esta opci\u00f3n.",
-"Fonts": "Fuentes",
-"Font Sizes": "Tama\u00f1os de fuente",
-"Class": "Clase",
-"Browse for an image": "Buscar una imagen",
-"OR": "O",
-"Drop an image here": "Arrastre una imagen aqu\u00ed",
-"Upload": "Cargar",
-"Block": "Bloque",
-"Align": "Alinear",
-"Default": "Por defecto",
-"Circle": "C\u00edrculo",
-"Disc": "Disco",
-"Square": "Cuadrado",
-"Lower Alpha": "Letras min\u00fasculas",
-"Lower Greek": "Griego en min\u00fasculas",
-"Lower Roman": "Romano en min\u00fasculas",
-"Upper Alpha": "Letras may\u00fasculas",
-"Upper Roman": "Romano en may\u00fasculas",
-"Anchor...": "Anclaje...",
-"Name": "Nombre",
-"Id": "Id.",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "El Id. debe comenzar por una letra, seguida solo de letras, n\u00fameros, guiones, puntos, dos puntos o guiones bajos.",
-"You have unsaved changes are you sure you want to navigate away?": "Tiene cambios sin guardar. \u00bfEst\u00e1 seguro de que quiere salir?",
-"Restore last draft": "Restaurar el \u00faltimo borrador",
-"Special characters...": "Caracteres especiales...",
-"Source code": "C\u00f3digo fuente",
-"Insert\/Edit code sample": "Insertar\/editar ejemplo de c\u00f3digo",
-"Language": "Idioma",
-"Code sample...": "Ejemplo de c\u00f3digo...",
-"Color Picker": "Selector de colores",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Izquierda a derecha",
-"Right to left": "Derecha a izquierda",
-"Emoticons...": "Emoticones...",
-"Metadata and Document Properties": "Metadatos y propiedades del documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Description": "Descripci\u00f3n",
-"Robots": "Robots",
-"Author": "Autor",
-"Encoding": "Codificaci\u00f3n",
-"Fullscreen": "Pantalla completa",
-"Action": "Acci\u00f3n",
-"Shortcut": "Acceso directo",
-"Help": "Ayuda",
-"Address": "Direcci\u00f3n",
-"Focus to menubar": "Enfocar la barra del men\u00fa",
-"Focus to toolbar": "Enfocar la barra de herramientas",
-"Focus to element path": "Enfocar la ruta del elemento",
-"Focus to contextual toolbar": "Enfocar la barra de herramientas contextual",
-"Insert link (if link plugin activated)": "Insertar enlace (si el complemento de enlace est\u00e1 activado)",
-"Save (if save plugin activated)": "Guardar (si el complemento de guardar est\u00e1 activado)",
-"Find (if searchreplace plugin activated)": "Buscar (si el complemento buscar-reemplazar est\u00e1 activado)",
-"Plugins installed ({0}):": "Complementos instalados ({0}):",
-"Premium plugins:": "Complementos premium:",
-"Learn more...": "M\u00e1s informaci\u00f3n...",
-"You are using {0}": "Est\u00e1 usando {0}",
-"Plugins": "Complementos",
-"Handy Shortcuts": "Accesos pr\u00e1cticos",
-"Horizontal line": "L\u00ednea horizontal",
-"Insert\/edit image": "Insertar\/editar imagen",
-"Image description": "Descripci\u00f3n de la imagen",
-"Source": "C\u00f3digo fuente",
-"Dimensions": "Dimensiones",
-"Constrain proportions": "Restringir proporciones",
-"General": "General",
-"Advanced": "Avanzado",
-"Style": "Estilo",
-"Vertical space": "Espacio vertical",
-"Horizontal space": "Espacio horizontal",
-"Border": "Borde",
-"Insert image": "Insertar imagen",
-"Image...": "Imagen...",
-"Image list": "Lista de im\u00e1genes",
-"Rotate counterclockwise": "Girar a la izquierda",
-"Rotate clockwise": "Girar a la derecha",
-"Flip vertically": "Invertir verticalmente",
-"Flip horizontally": "Invertir horizontalmente",
-"Edit image": "Editar imagen",
-"Image options": "Opciones de imagen",
-"Zoom in": "Acercar",
-"Zoom out": "Alejar",
-"Crop": "Recortar",
-"Resize": "Redimensionar",
-"Orientation": "Orientaci\u00f3n",
-"Brightness": "Brillo",
-"Sharpen": "Enfocar",
-"Contrast": "Contraste",
-"Color levels": "Niveles de color",
-"Gamma": "Gama",
-"Invert": "Invertir",
-"Apply": "Aplicar",
-"Back": "Atr\u00e1s",
-"Insert date\/time": "Insertar fecha\/hora",
-"Date\/time": "Fecha\/hora",
-"Insert\/Edit Link": "Insertar\/editar enlace",
-"Insert\/edit link": "Insertar\/editar enlace",
-"Text to display": "Texto que mostrar",
-"Url": "URL",
-"Open link in...": "Abrir enlace en...",
-"Current window": "Ventana actual",
-"None": "Ninguno",
-"New window": "Nueva ventana",
-"Remove link": "Quitar enlace",
-"Anchors": "Anclajes",
-"Link...": "Enlace...",
-"Paste or type a link": "Pegue o escriba un enlace",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "La URL que ha introducido parece ser una direcci\u00f3n de correo electr\u00f3nico. \u00bfQuiere a\u00f1adir el prefijo necesario mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "La URL que ha introducido parece ser un enlace externo. \u00bfQuiere a\u00f1adir el prefijo necesario http:\/\/?",
-"Link list": "Lista de enlaces",
-"Insert video": "Insertar v\u00eddeo",
-"Insert\/edit video": "Insertar\/editar v\u00eddeo",
-"Insert\/edit media": "Insertar\/editar medio",
-"Alternative source": "Enlace alternativo",
-"Alternative source URL": "Origen de URL alternativo",
-"Media poster (Image URL)": "P\u00f3ster de medio (URL de imagen)",
-"Paste your embed code below:": "Pegue el c\u00f3digo para insertar a continuaci\u00f3n:",
-"Embed": "Insertar",
-"Media...": "Medios...",
-"Nonbreaking space": "Espacio de no separaci\u00f3n",
-"Page break": "Salto de p\u00e1gina",
-"Paste as text": "Pegar como texto",
-"Preview": "Previsualizar",
-"Print...": "Imprimir...",
-"Save": "Guardar",
-"Find": "Buscar",
-"Replace with": "Reemplazar por",
-"Replace": "Reemplazar",
-"Replace all": "Reemplazar todo",
-"Previous": "Anterior",
-"Next": "Siguiente",
-"Find and replace...": "Buscar y reemplazar...",
-"Could not find the specified string.": "No se encuentra la cadena especificada.",
-"Match case": "Coincidir may\u00fasculas y min\u00fasculas",
-"Find whole words only": "Solo palabras completas",
-"Spell check": "Revisar ortograf\u00eda",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar todo",
-"Finish": "Fin\u00e9s",
-"Add to Dictionary": "A\u00f1adir al Diccionario",
-"Insert table": "Insertar tabla",
-"Table properties": "Propiedades de la tabla",
-"Delete table": "Eliminar tabla",
-"Cell": "Celda",
-"Row": "Fila",
-"Column": "Columna",
-"Cell properties": "Propiedades de la celda",
-"Merge cells": "Combinar celdas",
-"Split cell": "Dividir celda",
-"Insert row before": "Insertar fila antes",
-"Insert row after": "Insertar fila despu\u00e9s",
-"Delete row": "Eliminar fila",
-"Row properties": "Propiedades de la fila",
-"Cut row": "Cortar fila",
-"Copy row": "Copiar fila",
-"Paste row before": "Pegar la fila antes",
-"Paste row after": "Pegar la fila despu\u00e9s",
-"Insert column before": "Insertar columna antes",
-"Insert column after": "Insertar columna despu\u00e9s",
-"Delete column": "Eliminar columna",
-"Cols": "Columnas",
-"Rows": "Filas",
-"Width": "Ancho",
-"Height": "Altura",
-"Cell spacing": "Espacio entre celdas",
-"Cell padding": "Relleno de celda",
-"Show caption": "Mostrar t\u00edtulo",
-"Left": "Izquierda",
-"Center": "Centro",
-"Right": "Derecha",
-"Cell type": "Tipo de celda",
-"Scope": "\u00c1mbito",
-"Alignment": "Alineaci\u00f3n",
-"H Align": "Alineaci\u00f3n horizontal",
-"V Align": "Alineaci\u00f3n vertical",
-"Top": "Superior",
-"Middle": "Central",
-"Bottom": "Inferior",
-"Header cell": "Celda de encabezado",
-"Row group": "Grupo de filas",
-"Column group": "Grupo de columnas",
-"Row type": "Tipo de fila",
-"Header": "Encabezado",
-"Body": "Cuerpo",
-"Footer": "Pie de p\u00e1gina",
-"Border color": "Color de borde",
-"Insert template...": "Insertar plantilla...",
-"Templates": "Plantillas",
-"Template": "Plantilla",
-"Text color": "Color del texto",
-"Background color": "Color de fondo",
-"Custom...": "Personalizado...",
-"Custom color": "Color personalizado",
-"No color": "Sin color",
-"Remove color": "Quitar color",
-"Table of Contents": "Tabla de contenido",
-"Show blocks": "Mostrar bloques",
-"Show invisible characters": "Mostrar caracteres invisibles",
-"Word count": "Contar palabras",
-"Words: {0}": "Palabras: {0}",
-"{0} words": "{0} palabras",
-"File": "Archivo",
-"Edit": "Editar",
-"Insert": "Insertar",
-"View": "Ver",
-"Format": "Formato",
-"Table": "Tabla",
-"Tools": "Herramientas",
-"Powered by {0}": "Con tecnolog\u00eda de {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto enriquecido. Pulse ALT-F9 para el men\u00fa. Pulse ALT-F10 para la barra de herramientas. Pulse ALT-0 para la ayuda.",
-"Image title": "Titulo de imagen",
-"Border width": "Ancho de borde",
-"Border style": "Estilo de borde",
-"Error": "Error",
-"Warn": "Advertencia",
-"Valid": "V\u00e1lido",
-"To open the popup, press Shift+Enter": "Para abrir el elemento emergente, pulse May\u00fas+Intro",
-"Rich Text Area. Press ALT-0 for help.": "\u00c1rea de texto enriquecido. Pulse ALT-0 para abrir la ayuda.",
-"System Font": "Fuente de sistema",
-"Failed to upload image: {0}": "Fallo al cargar imagen: {0}",
-"Failed to load plugin: {0} from url {1}": "Fallo al cargar complemento: {0} desde URL {1}",
-"Failed to load plugin url: {0}": "Fallo al cargar URL del complemento: {0}",
-"Failed to initialize plugin: {0}": "Fallo al iniciar el complemento: {0}",
-"example": "ejemplo",
-"Search": "Buscar",
-"All": "Todo",
-"Currency": "Divisa",
-"Text": "Texto",
-"Quotations": "Comillas",
-"Mathematical": "S\u00edmbolo matem\u00e1tico",
-"Extended Latin": "Latino extendido A",
-"Symbols": "S\u00edmbolos",
-"Arrows": "Flechas",
-"User Defined": "Definido por el usuario",
-"dollar sign": "signo de d\u00f3lar",
-"currency sign": "signo de divisa",
-"euro-currency sign": "signo de euro",
-"colon sign": "signo de dos puntos",
-"cruzeiro sign": "signo de cruceiro",
-"french franc sign": "signo de franco franc\u00e9s",
-"lira sign": "signo de lira",
-"mill sign": "signo de mill",
-"naira sign": "signo de naira",
-"peseta sign": "signo de peseta",
-"rupee sign": "signo de rupia",
-"won sign": "signo de won",
-"new sheqel sign": "signo de nuevo s\u00e9quel",
-"dong sign": "signo de dong",
-"kip sign": "signo de kip",
-"tugrik sign": "signo de tugrik",
-"drachma sign": "signo de dracma",
-"german penny symbol": "signo de penique alem\u00e1n",
-"peso sign": "signo de peso",
-"guarani sign": "signo de guaran\u00ed",
-"austral sign": "signo de austral",
-"hryvnia sign": "signo de grivna",
-"cedi sign": "signo de cedi",
-"livre tournois sign": "signo de libra tornesa",
-"spesmilo sign": "signo de spesmilo",
-"tenge sign": "signo de tenge",
-"indian rupee sign": "signo de rupia india",
-"turkish lira sign": "signo de lira turca",
-"nordic mark sign": "signo de marco n\u00f3rdico",
-"manat sign": "signo de manat",
-"ruble sign": "signo de rublo",
-"yen character": "car\u00e1cter de yen",
-"yuan character": "car\u00e1cter de yuan",
-"yuan character, in hong kong and taiwan": "car\u00e1cter de yuan en Hong Kong y Taiw\u00e1n",
-"yen\/yuan character variant one": "Variante uno de car\u00e1cter de yen\/yuan",
-"Loading emoticons...": "Cargando emoticonos...",
-"Could not load emoticons": "No se han podido cargar los emoticonos",
-"People": "Personas",
-"Animals and Nature": "Animales y naturaleza",
-"Food and Drink": "Comida y bebida",
-"Activity": "Actividad",
-"Travel and Places": "Viajes y lugares",
-"Objects": "Objetos",
-"Flags": "Banderas",
-"Characters": "Caracteres",
-"Characters (no spaces)": "Caracteres (sin espacios)",
-"Error: Form submit field collision.": "Error: Colisi\u00f3n de campo al enviar formulario.",
-"Error: No form element found.": "Error: No se encuentra ning\u00fan elemento de formulario.",
-"Update": "Actualizar",
-"Color swatch": "Muestrario de colores",
-"Turquoise": "Turquesa",
-"Green": "Verde",
-"Blue": "Azul",
-"Purple": "P\u00farpura",
-"Navy Blue": "Azul marino",
-"Dark Turquoise": "Turquesa oscuro",
-"Dark Green": "Verde oscuro",
-"Medium Blue": "Azul medio",
-"Medium Purple": "P\u00farpura medio",
-"Midnight Blue": "Azul medio",
-"Yellow": "Amarillo",
-"Orange": "Naranja",
-"Red": "Rojo",
-"Light Gray": "Gris claro",
-"Gray": "Gris",
-"Dark Yellow": "Amarillo oscuro",
-"Dark Orange": "Naranja oscuro",
-"Dark Red": "Rojo oscuro",
-"Medium Gray": "Gris medio",
-"Dark Gray": "Gris oscuro",
-"Black": "Negro",
-"White": "Blanco",
-"Switch to or from fullscreen mode": "Activar o desactivar modo pantalla completa",
-"Open help dialog": "Abrir di\u00e1logo de ayuda",
-"history": "historial",
-"styles": "estilos",
-"formatting": "formato",
-"alignment": "alineaci\u00f3n",
-"indentation": "sangr\u00eda",
-"permanent pen": "bol\u00edgrafo permanente",
-"comments": "comentarios"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/es_MX.js b/cps/static/js/libs/tinymce/langs/es_MX.js
deleted file mode 100644
index bff27cad1..000000000
--- a/cps/static/js/libs/tinymce/langs/es_MX.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('es_MX',{
-"Redo": "Rehacer",
-"Undo": "Deshacer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar todo",
-"New document": "Nuevo documento",
-"Ok": "Aceptar",
-"Cancel": "Cancelar",
-"Visual aids": "Ayudas visuales",
-"Bold": "Negrita",
-"Italic": "Cursiva",
-"Underline": "Subrayado",
-"Strikethrough": "Tachado",
-"Superscript": "Super\u00edndice",
-"Subscript": "Sub\u00edndice",
-"Clear formatting": "Borrar formato",
-"Align left": "Alinear a la izquierda",
-"Align center": "Alinear al centro",
-"Align right": "Alinear a la derecha",
-"Justify": "Justificar",
-"Bullet list": "Lista de vi\u00f1etas",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Reducir sangr\u00eda",
-"Increase indent": "Aumentar sangr\u00eda",
-"Close": "Cerrar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Su navegador no admite el acceso directo al portapapeles. Utilice los m\u00e9todos abreviados de teclado Ctrl+ X\/C\/V.",
-"Headers": "Encabezados",
-"Header 1": "Encabezado 1",
-"Header 2": "Encabezado 2",
-"Header 3": "Encabezado 3",
-"Header 4": "Encabezado 4",
-"Header 5": "Encabezado 5",
-"Header 6": "Encabezado 6",
-"Headings": "T\u00edtulos",
-"Heading 1": "T\u00edtulo 1",
-"Heading 2": "T\u00edtulo 2",
-"Heading 3": "T\u00edtulo 3",
-"Heading 4": "T\u00edtulo 4",
-"Heading 5": "T\u00edtulo 5",
-"Heading 6": "T\u00edtulo 6",
-"Preformatted": "Con formato previo",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "P\u00e1rrafo",
-"Blockquote": "Blockquote",
-"Inline": "En l\u00ednea",
-"Blocks": "Bloques",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Se pegar\u00e1 en texto plano. El contenido se pegar\u00e1 como texto plano hasta que desactive esta opci\u00f3n.",
-"Fonts": "Fuentes",
-"Font Sizes": "Tama\u00f1os de fuente",
-"Class": "Clase",
-"Browse for an image": "Buscar una imagen",
-"OR": "O",
-"Drop an image here": "Soltar una imagen aqu\u00ed",
-"Upload": "Cargar",
-"Block": "Bloque",
-"Align": "Alinear",
-"Default": "Por defecto",
-"Circle": "Circulo",
-"Disc": "Disco",
-"Square": "Cuadro",
-"Lower Alpha": "Alfa min\u00fascula",
-"Lower Greek": "Griega min\u00fascula",
-"Lower Roman": "Romano min\u00fascula",
-"Upper Alpha": "Alfa may\u00fascula",
-"Upper Roman": "May\u00fascula Romana",
-"Anchor...": "Marcador...",
-"Name": "Nombre",
-"Id": "Identificador",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "El Identificador debe comenzar con una letra, seguido solo por letras, n\u00fameros, puntos, guiones medios o guiones bajos.  ",
-"You have unsaved changes are you sure you want to navigate away?": "No se  han guardado los cambios. \u00bfSeguro que desea abandonar la p\u00e1gina?",
-"Restore last draft": "Restaurar el \u00faltimo borrador",
-"Special character...": "Car\u00e1cter especial...",
-"Source code": "C\u00f3digo fuente",
-"Insert\/Edit code sample": "Insertar\/Editar c\u00f3digo muestra",
-"Language": "idioma",
-"Code sample...": "Ejemplo de c\u00f3digo...",
-"Color Picker": "Selector de colores",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Izquierda a derecha",
-"Right to left": "Derecha a Izquierda",
-"Emoticons...": "Emoticonos...",
-"Metadata and Document Properties": "Metadatos y propiedades del documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Description": "Descripci\u00f3n ",
-"Robots": "Robots",
-"Author": "Autor",
-"Encoding": "Codificaci\u00f3n",
-"Fullscreen": "Pantalla completa",
-"Action": "Acci\u00f3n",
-"Shortcut": "Atajo",
-"Help": "Ayuda",
-"Address": "Direcci\u00f3n",
-"Focus to menubar": "Enfocar en barra de menu",
-"Focus to toolbar": "Enfocar en barra de herramientas",
-"Focus to element path": "Enfocar ruta del elemento",
-"Focus to contextual toolbar": "Enfocar en barra de herramientas contextual",
-"Insert link (if link plugin activated)": "Insertar enlace (si enlace del plugin est\u00e1 activo)",
-"Save (if save plugin activated)": "Guardar (si el plugin guardar est\u00e1 activo)",
-"Find (if searchreplace plugin activated)": "Buscar (si el plugin buscar\/reemplazar est\u00e1 activo)",
-"Plugins installed ({0}):": "Plugins instalados ({0}):",
-"Premium plugins:": "Plugins premium:",
-"Learn more...": "Aprende m\u00e1s...",
-"You are using {0}": "est\u00e1s usando {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Atajos \u00fatiles",
-"Horizontal line": "L\u00ednea Horizontal",
-"Insert\/edit image": "Insertar\/editar imagen",
-"Image description": "Descripci\u00f3n de imagen",
-"Source": "Origen",
-"Dimensions": "Dimensiones",
-"Constrain proportions": "Restringir proporciones",
-"General": "General",
-"Advanced": "Avanzado",
-"Style": "Estilo",
-"Vertical space": "Espacio vertical",
-"Horizontal space": "Espacio horizontal",
-"Border": "Borde",
-"Insert image": "Insertar imagen",
-"Image...": "Imagen...",
-"Image list": "Lista de im\u00e1genes",
-"Rotate counterclockwise": "Rotar en sentido contrario a las manecillas",
-"Rotate clockwise": "Rotar en sentido de las manecillas",
-"Flip vertically": "Voltear verticalmente",
-"Flip horizontally": "Volter horizontalmente",
-"Edit image": "Editar imagen",
-"Image options": "Opciones de la imagen",
-"Zoom in": "Acercar",
-"Zoom out": "Alejar",
-"Crop": "Recortar",
-"Resize": "Cambiar tama\u00f1o",
-"Orientation": "Orientaci\u00f3n",
-"Brightness": "Brillo",
-"Sharpen": "Nitidez",
-"Contrast": "Contraste",
-"Color levels": "Niveles de Color",
-"Gamma": "Gamma",
-"Invert": "Invertir",
-"Apply": "Aplicar",
-"Back": "Regresar",
-"Insert date\/time": "Insertar fecha\/hora",
-"Date\/time": "Fecha\/hora",
-"Insert\/Edit Link": "Insertar\/editar v\u00ednculo",
-"Insert\/edit link": "Inserta\/editar enlace",
-"Text to display": "Texto a mostrar",
-"Url": "Url",
-"Open link in...": "Abrir v\u00ednculo en...",
-"Current window": "Ventana actual",
-"None": "Ninguno",
-"New window": "Nueva ventana",
-"Remove link": "Eliminar elnace",
-"Anchors": "Anclas",
-"Link...": "V\u00ednculo...",
-"Paste or type a link": "Pega o escribe un enlace",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "El URL que ha insertado tiene formato de correo electr\u00f3nico. \u00bfDesea agregar con prefijo \"mailto:\"?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "El URL que ha ingresado es un enlace externo. \u00bfDesea agregar el prefijo \"http:\/\/\"?",
-"Link list": "Lista de enlaces",
-"Insert video": "Insertar video",
-"Insert\/edit video": "Insertar\/editar video",
-"Insert\/edit media": "Insertar\/editar multimedia",
-"Alternative source": "Fuente alternativa",
-"Alternative source URL": "URL de origen alternativo",
-"Media poster (Image URL)": "P\u00f3ster multimedia (URL de la imagen)",
-"Paste your embed code below:": "Pegue su c\u00f3digo de inserci\u00f3n abajo:",
-"Embed": "Incrustar",
-"Media...": "Elemento multimedia...",
-"Nonbreaking space": "Espacio de no separaci\u00f3n",
-"Page break": "Salto de p\u00e1gina ",
-"Paste as text": "Copiar como texto",
-"Preview": "Vista previa ",
-"Print...": "Imprimir...",
-"Save": "Guardar",
-"Find": "Buscar",
-"Replace with": "Remplazar con",
-"Replace": "Remplazar",
-"Replace all": "Remplazar todo",
-"Previous": "Anterior",
-"Next": "Siguiente",
-"Find and replace...": "Buscar y reemplazar...",
-"Could not find the specified string.": "No se ha encontrado la cadena especificada.",
-"Match case": "Coincidencia",
-"Find whole words only": "Buscar solo palabras completas",
-"Spell check": "Corrector ortogr\u00e1fico",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar todo",
-"Finish": "Terminar",
-"Add to Dictionary": "Agregar al diccionario ",
-"Insert table": "Insertar tabla",
-"Table properties": "Propiedades de tabla",
-"Delete table": "Eliminar tabla",
-"Cell": "Celda",
-"Row": "Rengl\u00f3n ",
-"Column": "Columna",
-"Cell properties": "Propiedades de celda",
-"Merge cells": "Unir celdas",
-"Split cell": "Dividir celdas",
-"Insert row before": "Insertar rengl\u00f3n antes",
-"Insert row after": "Insertar rengl\u00f3n despu\u00e9s",
-"Delete row": "Eliminar rengl\u00f3n ",
-"Row properties": "Propiedades del rengl\u00f3n ",
-"Cut row": "Cortar renglon",
-"Copy row": "Copiar rengl\u00f3n ",
-"Paste row before": "Pegar rengl\u00f3n antes",
-"Paste row after": "Pegar rengl\u00f3n despu\u00e9s",
-"Insert column before": "Insertar columna antes",
-"Insert column after": "Insertar columna despu\u00e9s",
-"Delete column": "Eliminar columna",
-"Cols": "Columnas",
-"Rows": "Renglones ",
-"Width": "Ancho",
-"Height": "Alto",
-"Cell spacing": "Espacio entre celdas",
-"Cell padding": "Relleno de la celda",
-"Show caption": "Mostrar leyenda",
-"Left": "Izquierda",
-"Center": "Centro",
-"Right": "Derecha",
-"Cell type": "Tipo de celda",
-"Scope": "Alcance",
-"Alignment": "Alineaci\u00f3n ",
-"H Align": "Alineaci\u00f3n Horizontal",
-"V Align": "Alineaci\u00f3n Vertical",
-"Top": "Arriba",
-"Middle": "Centrado",
-"Bottom": "Abajo",
-"Header cell": "Celda de encabezado",
-"Row group": "Grupo de renglones",
-"Column group": "Grupo de columnas",
-"Row type": "Tipo de rengl\u00f3n ",
-"Header": "Encabezado",
-"Body": "Cuerpo",
-"Footer": "Pie",
-"Border color": "Color del borde",
-"Insert template...": "Insertar plantilla...",
-"Templates": "Plantilla",
-"Template": "Plantilla",
-"Text color": "Color de letra",
-"Background color": "Color de fondo",
-"Custom...": "Personalizar",
-"Custom color": "Perzonalizar color",
-"No color": "Sin color",
-"Remove color": "Eliminar color",
-"Table of Contents": "Tabla de Contenidos",
-"Show blocks": "Mostrar bloques",
-"Show invisible characters": "Mostrar caracteres invisibles",
-"Word count": "Contar palabras",
-"Count": "Recuento",
-"Document": "Documento",
-"Selection": "Selecci\u00f3n",
-"Words": "Palabras",
-"Words: {0}": "Palabras:{0}",
-"{0} words": "{0} palabras",
-"File": "Archivo",
-"Edit": "Editar",
-"Insert": "Insertar",
-"View": "Vistas",
-"Format": "Formato",
-"Table": "Tabla",
-"Tools": "Herramientas",
-"Powered by {0}": "Creado con {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Presione dentro del \u00e1rea de texto ALT-F9 para invocar el men\u00fa, ALT-F10 para la barra de herramientas y ALT-0 para la ayuda.",
-"Image title": "T\u00edtulo de la imagen",
-"Border width": "Ancho del borde",
-"Border style": "Estilo del borde",
-"Error": "Error",
-"Warn": "Advertencia",
-"Valid": "V\u00e1lido",
-"To open the popup, press Shift+Enter": "Para abrir la ventana emergente, pulse May\u00fas+Intro",
-"Rich Text Area. Press ALT-0 for help.": "\u00c1rea de texto enriquecido. Pulse ALT-0 para obtener ayuda.",
-"System Font": "Fuente del sistema",
-"Failed to upload image: {0}": "Error al cargar la imagen: {0}",
-"Failed to load plugin: {0} from url {1}": "Error al cargar el complemento: {0} desde la url {1}",
-"Failed to load plugin url: {0}": "Error al cargar la url del complemento: {0}",
-"Failed to initialize plugin: {0}": "Error al inicializar el complemento: {0}",
-"example": "ejemplo",
-"Search": "Buscar",
-"All": "Todo",
-"Currency": "Moneda",
-"Text": "Texto",
-"Quotations": "Comillas",
-"Mathematical": "Matem\u00e1ticos",
-"Extended Latin": "Lat\u00edn extendido",
-"Symbols": "S\u00edmbolos",
-"Arrows": "Flechas",
-"User Defined": "Definido por el usuario",
-"dollar sign": "signo de d\u00f3lar",
-"currency sign": "signo de moneda",
-"euro-currency sign": "signo de euro",
-"colon sign": "signo del col\u00f3n",
-"cruzeiro sign": "signo del cruzeiro",
-"french franc sign": "signo del franco franc\u00e9s",
-"lira sign": "signo de la lira",
-"mill sign": "signo de mil",
-"naira sign": "signo del naira",
-"peseta sign": "signo de la peseta",
-"rupee sign": "signo de la rupia",
-"won sign": "signo del won",
-"new sheqel sign": "signo de nuevo shequel",
-"dong sign": "signo del dong",
-"kip sign": "signo del kip",
-"tugrik sign": "signo del tugrik",
-"drachma sign": "signo del dracma",
-"german penny symbol": "signo del penique alem\u00e1n",
-"peso sign": "signo del peso",
-"guarani sign": "signo del guaran\u00ed",
-"austral sign": "signo del austral",
-"hryvnia sign": "signo de hryvnia",
-"cedi sign": "signo de cedi",
-"livre tournois sign": "signo de livre tournois",
-"spesmilo sign": "signo de spesmilo",
-"tenge sign": "signo de tenge",
-"indian rupee sign": "signo de la rupia india",
-"turkish lira sign": "signo de la lira turca",
-"nordic mark sign": "signo del marco n\u00f3rdico",
-"manat sign": "signo de manat",
-"ruble sign": "signo de rublo",
-"yen character": "car\u00e1cter del yen",
-"yuan character": "car\u00e1cter del yuan",
-"yuan character, in hong kong and taiwan": "car\u00e1cter del yuan, en Hong Kong y Taiw\u00e1n",
-"yen\/yuan character variant one": "variante uno del car\u00e1cter del yen\/yuan",
-"Loading emoticons...": "Cargando emoticonos...",
-"Could not load emoticons": "No se pudieron cargar los emoticonos",
-"People": "Personas",
-"Animals and Nature": "Animales y naturaleza",
-"Food and Drink": "Comida y bebida",
-"Activity": "Actividad",
-"Travel and Places": "Viajes y lugares",
-"Objects": "Objetos",
-"Flags": "Banderas",
-"Characters": "Caracteres",
-"Characters (no spaces)": "Caracteres (sin espacios)",
-"{0} characters": "{0} caracteres",
-"Error: Form submit field collision.": "Error: colisi\u00f3n de campo env\u00edo de formulario.",
-"Error: No form element found.": "Error: no se encontr\u00f3 ning\u00fan elemento de formulario.",
-"Update": "Actualizar",
-"Color swatch": "Muestrario de colores",
-"Turquoise": "Turquesa",
-"Green": "Verde",
-"Blue": "Azul",
-"Purple": "Morado",
-"Navy Blue": "Azul marino",
-"Dark Turquoise": "Turquesa oscuro",
-"Dark Green": "Verde oscuro",
-"Medium Blue": "Azul medio",
-"Medium Purple": "Morado medio",
-"Midnight Blue": "Azul noche",
-"Yellow": "Amarillo",
-"Orange": "Anaranjado",
-"Red": "Rojo",
-"Light Gray": "Gris claro",
-"Gray": "Gris",
-"Dark Yellow": "Amarillo oscuro",
-"Dark Orange": "Anaranjado oscuro",
-"Dark Red": "Rojo oscuro",
-"Medium Gray": "Gris medio",
-"Dark Gray": "Gris oscuro",
-"Light Green": "Verde claro",
-"Light Yellow": "Amarillo claro",
-"Light Red": "Rojo claro",
-"Light Purple": "Morado claro",
-"Light Blue": "Azul claro",
-"Dark Purple": "Morado oscuro",
-"Dark Blue": "Azul oscuro",
-"Black": "Negro",
-"White": "Blanco",
-"Switch to or from fullscreen mode": "Cambiar a modo de pantalla completa o salir de \u00e9l",
-"Open help dialog": "Abrir di\u00e1logo de ayuda",
-"history": "historial",
-"styles": "estilos",
-"formatting": "formato",
-"alignment": "alineaci\u00f3n",
-"indentation": "sangr\u00eda",
-"permanent pen": "l\u00e1piz permanente",
-"comments": "comentarios",
-"Format Painter": "Copiar formato",
-"Insert\/edit iframe": "Insertar\/editar marco flotante",
-"Capitalization": "Uso de may\u00fasculas",
-"lowercase": "min\u00fascula",
-"UPPERCASE": "MAY\u00daSCULA",
-"Title Case": "Tipo t\u00edtulo",
-"Permanent Pen Properties": "Propiedades del l\u00e1piz permanente",
-"Permanent pen properties...": "Propiedades del l\u00e1piz permanente...",
-"Font": "Fuente",
-"Size": "Tama\u00f1o",
-"More...": "M\u00e1s...",
-"Spellcheck Language": "Idioma de la revisi\u00f3n ortogr\u00e1fica",
-"Select...": "Seleccionar...",
-"Preferences": "Preferencias",
-"Yes": "S\u00ed",
-"No": "No",
-"Keyboard Navigation": "Navegaci\u00f3n con el teclado",
-"Version": "Versi\u00f3n",
-"Anchor": "Anclar",
-"Special character": "Caracter especial",
-"Code sample": "C\u00f3digo muestra",
-"Color": "Color",
-"Emoticons": "Emoticones",
-"Document properties": "Propiedades del documento",
-"Image": "Imagen",
-"Insert link": "Insertar enlace",
-"Target": "Objetivo",
-"Link": "Enlace",
-"Poster": "Cartel",
-"Media": "Multimedia",
-"Print": "Imprimir",
-"Prev": "Anterior",
-"Find and replace": "Buscar y reemplazar",
-"Whole words": "Palabras completas",
-"Spellcheck": "Revisi\u00f3n ortogr\u00e1fica",
-"Caption": "Subt\u00edtulo",
-"Insert template": "Insertar plantilla"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/fa.js b/cps/static/js/libs/tinymce/langs/fa.js
index 9968edc9d..0a24c8691 100644
--- a/cps/static/js/libs/tinymce/langs/fa.js
+++ b/cps/static/js/libs/tinymce/langs/fa.js
@@ -85,6 +85,7 @@ tinymce.addI18n('fa',{
 "B": "\u0622\u0628\u06cc",
 "Left to right": "\u0686\u067e \u0628\u0647 \u0631\u0627\u0633\u062a",
 "Right to left": "\u0631\u0627\u0633\u062a \u0628\u0647 \u0686\u067e",
+"Emoticons": "\u0634\u06a9\u0644\u06a9\u200c\u0647\u0627",
 "Emoticons...": "\u0635\u0648\u0631\u062a\u06a9\u200c\u0647\u0627...",
 "Metadata and Document Properties": "\u0641\u0631\u0627\u062f\u0627\u062f\u0647 \u0648 \u0645\u0634\u062e\u0635\u0627\u062a \u0633\u0646\u062f",
 "Title": "\u0639\u0646\u0648\u0627\u0646",
@@ -113,7 +114,9 @@ tinymce.addI18n('fa',{
 "Handy Shortcuts": "\u0645\u06cc\u0627\u0646\u0628\u0631\u0647\u0627\u06cc \u0645\u0641\u06cc\u062f",
 "Horizontal line": "\u062e\u0637 \u0627\u0641\u0642\u06cc",
 "Insert\/edit image": "\u0627\u0636\u0627\u0641\u0647\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f\u0646 \u062a\u0635\u0648\u06cc\u0631",
-"Image description": "\u062a\u0648\u0636\u06cc\u062d\u0627\u062a \u0639\u06a9\u0633",
+"Alternative description": "\u062a\u0648\u0636\u06cc\u062d\u0627\u062a \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646",
+"Accessibility": "\u062f\u0633\u062a\u0631\u0633\u06cc",
+"Image is decorative": "\u0627\u06cc\u0646 \u062a\u0635\u0648\u06cc\u0631 \u062f\u06a9\u0648\u0631\u06cc \u0627\u0633\u062a",
 "Source": "\u0645\u0646\u0628\u0639",
 "Dimensions": "\u0627\u0628\u0639\u0627\u062f",
 "Constrain proportions": "\u062d\u0641\u0638 \u062a\u0646\u0627\u0633\u0628",
@@ -147,7 +150,6 @@ tinymce.addI18n('fa',{
 "Back": "Back",
 "Insert date\/time": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062a\u0627\u0631\u06cc\u062e\/\u0632\u0645\u0627\u0646",
 "Date\/time": "Date\/time",
-"Insert\/Edit Link": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u067e\u06cc\u0648\u0646\u062f",
 "Insert\/edit link": "\u0627\u0636\u0627\u0641\u0647\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f\u0646 \u0644\u06cc\u0646\u06a9",
 "Text to display": "\u0645\u062a\u0646 \u0628\u0631\u0627\u06cc \u0646\u0645\u0627\u06cc\u0634",
 "Url": "\u0627\u062f\u0631\u0633 \u0644\u06cc\u0646\u06a9",
@@ -155,12 +157,14 @@ tinymce.addI18n('fa',{
 "Current window": "\u067e\u0646\u062c\u0631\u0647 \u062c\u0627\u0631\u06cc",
 "None": "\u0647\u06cc\u0686 \u06a9\u062f\u0627\u0645",
 "New window": "\u067e\u0646\u062c\u0631\u0647 \u062c\u062f\u06cc\u062f",
+"Open link": "\u0628\u0627\u0632\u06a9\u0631\u062f\u0646 \u0644\u06cc\u0646\u06a9",
 "Remove link": "\u062d\u0630\u0641 \u0644\u06cc\u0646\u06a9",
 "Anchors": "\u0644\u0646\u06af\u0631 - \u0644\u06cc\u0646\u06a9 \u062f\u0627\u062e\u0644 \u0635\u0641\u062d\u0647",
 "Link...": "\u067e\u06cc\u0648\u0646\u062f...",
 "Paste or type a link": "Paste or type a link",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "\u0622\u062f\u0631\u0633 \u0627\u06cc\u0646\u062a\u0631\u0646\u062a\u06cc \u06a9\u0647 \u0634\u0645\u0627 \u0648\u0627\u0631\u062f \u06a9\u0631\u062f\u0647 \u0627\u06cc\u062f \u06af\u0648\u06cc\u0627 \u06cc\u06a9 \u0622\u062f\u0631\u0633 \u0627\u06cc\u0646\u062a\u0631\u0646\u062a\u06cc \u062e\u0627\u0631\u062c\u06cc \u0627\u0633\u062a. \u0622\u06cc\u0627 \u0645\u06cc\u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0647 \u067e\u06cc\u0634\u0648\u0646\u062f \u0636\u0631\u0648\u0631\u06cc https:\/\/ \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u0645\u061f",
 "Link list": "\u0641\u0647\u0631\u0633\u062a \u067e\u06cc\u0648\u0646\u062f\u0647\u0627",
 "Insert video": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0641\u0627\u06cc\u0644 \u062a\u0635\u0648\u06cc\u0631\u06cc",
 "Insert\/edit video": "\u0627\u0636\u0627\u0641\u0647\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f\u0646 \u0641\u0627\u06cc\u0644 \u062a\u0635\u0648\u06cc\u0631\u06cc",
@@ -183,11 +187,15 @@ tinymce.addI18n('fa',{
 "Replace all": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646 \u0647\u0645\u0647",
 "Previous": "\u0642\u0628\u0644\u06cc",
 "Next": "\u0628\u0639\u062f\u06cc",
+"Find and Replace": "\u062c\u0633\u062a\u200c\u0648\u200c\u062c\u0648 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646",
 "Find and replace...": "\u06cc\u0627\u0641\u062a\u0646 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646...",
 "Could not find the specified string.": "\u0631\u0634\u062a\u0647 \u0645\u062a\u0646\u06cc \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u067e\u06cc\u062f\u0627 \u0646\u0634\u062f.",
 "Match case": "\u062d\u0633\u0627\u0633 \u0628\u0647 \u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9 \u0648 \u0628\u0632\u0631\u06af",
 "Find whole words only": "\u06cc\u0627\u0641\u062a\u0646 \u062f\u0642\u06cc\u0642\u0627\u064b \u06a9\u0644 \u0648\u0627\u0698\u0647",
-"Spell check": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627",
+"Find in selection": "\u062f\u0631 \u06af\u0644\u0686\u06cc\u0646 \u0628\u06cc\u0627\u0628\u06cc\u062f",
+"Spellcheck": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627\u06cc\u06cc",
+"Spellcheck Language": "\u0632\u0628\u0627\u0646 \u0686\u06a9 \u0627\u0633\u067e\u0644\u06cc\u0646\u06af",
+"No misspellings found.": "\u063a\u0644\u0637 \u0627\u0645\u0644\u0627\u06cc\u06cc \u06cc\u0627\u0641\u062a \u0646\u0634\u062f.",
 "Ignore": "\u0646\u0627\u062f\u06cc\u062f\u0647 \u06af\u0631\u0641\u062a\u0646",
 "Ignore all": "\u0646\u0627\u062f\u06cc\u062f\u0647 \u06af\u0631\u0641\u062a\u0646 \u0647\u0645\u0647",
 "Finish": "\u067e\u0627\u06cc\u0627\u0646",
@@ -218,6 +226,7 @@ tinymce.addI18n('fa',{
 "Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
 "Cell spacing": "\u0641\u0627\u0635\u0644\u0647\u200c\u06cc \u0628\u06cc\u0646 \u0633\u0644\u0648\u0644 \u0647\u0627",
 "Cell padding": "\u062d\u0627\u0634\u06cc\u0647 \u0633\u0644\u0648\u0644 \u0647\u0627",
+"Caption": "\u0639\u0646\u0648\u0627\u0646",
 "Show caption": "\u0646\u0645\u0627\u06cc\u0634 \u0639\u0646\u0648\u0627\u0646",
 "Left": "\u0686\u067e",
 "Center": "\u0648\u0633\u0637",
@@ -377,7 +386,21 @@ tinymce.addI18n('fa',{
 "formatting": "\u0642\u0627\u0644\u0628\u200c\u0628\u0646\u062f\u06cc",
 "alignment": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc",
 "indentation": "\u062a\u0648\u0631\u0641\u062a\u06af\u06cc",
-"permanent pen": "\u0642\u0644\u0645 \u062f\u0627\u0626\u0645\u06cc",
+"Font": "\u0641\u0648\u0646\u062a",
+"Size": "\u0627\u0646\u062f\u0627\u0632\u0647",
+"More...": "\u0628\u06cc\u0634\u062a\u0631...",
+"Select...": "\u0627\u0646\u062a\u062e\u0627\u0628...",
+"Preferences": "\u062a\u0631\u062c\u06cc\u062d\u0627\u062a",
+"Yes": "\u0628\u0644\u0647",
+"No": "\u062e\u06cc\u0631",
+"Keyboard Navigation": "\u0645\u0631\u0648\u0631 \u0628\u0627 \u0635\u0641\u062d\u0647 \u06a9\u0644\u06cc\u062f",
+"Version": "\u0646\u0633\u062e\u0647",
+"Code view": "\u0646\u0645\u0627\u06cc \u06a9\u062f",
+"Open popup menu for split buttons": "\u0645\u0646\u0648\u06cc \u0628\u0627\u0632\u0634\u0648 \u0628\u0631\u0627\u06cc \u062f\u06a9\u0645\u0647 \u0647\u0627\u06cc \u062a\u0642\u0633\u06cc\u0645 \u0634\u062f\u0647 \u0631\u0627 \u0628\u0627\u0632 \u06a9\u0646\u06cc\u062f",
+"List Properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0641\u0647\u0631\u0633\u062a",
+"List properties...": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0641\u0647\u0631\u0633\u062a",
+"Start list at number": "\u0644\u06cc\u0633\u062a \u0631\u0627 \u062f\u0631 \u0634\u0645\u0627\u0631\u0647 \u0634\u0631\u0648\u0639 \u06a9\u0646\u06cc\u062f",
+"Line height": "\u0628\u0644\u0646\u062f\u06cc \u062e\u0637 ",
 "comments": "\u0646\u0638\u0631\u0627\u062a",
 "Format Painter": "\u0646\u0642\u0627\u0634 \u0641\u0631\u0645\u062a",
 "Insert\/edit iframe": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 iframe",
@@ -385,23 +408,45 @@ tinymce.addI18n('fa',{
 "lowercase": "\u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9",
 "UPPERCASE": "\u062d\u0631\u0648\u0641 \u0628\u0632\u0631\u06af",
 "Title Case": "\u062d\u0631\u0648\u0641 \u062a\u06cc\u062a\u0631\u06cc",
+"permanent pen": "\u0642\u0644\u0645 \u062f\u0627\u0626\u0645\u06cc",
 "Permanent Pen Properties": "\u0645\u0634\u062e\u0635\u0627\u062a \u062f\u0627\u0626\u0645\u06cc \u0642\u0644\u0645",
 "Permanent pen properties...": "\u0645\u0634\u062e\u0635\u0627\u062a \u062f\u0627\u0626\u0645\u06cc \u0642\u0644\u0645...",
-"Font": "\u0641\u0648\u0646\u062a",
-"Size": "\u0627\u0646\u062f\u0627\u0632\u0647",
-"More...": "\u0628\u06cc\u0634\u062a\u0631...",
-"Spellcheck Language": "\u0632\u0628\u0627\u0646 \u0686\u06a9 \u0627\u0633\u067e\u0644\u06cc\u0646\u06af",
-"Select...": "\u0627\u0646\u062a\u062e\u0627\u0628...",
-"Preferences": "\u062a\u0631\u062c\u06cc\u062d\u0627\u062a",
-"Yes": "\u0628\u0644\u0647",
-"No": "\u062e\u06cc\u0631",
-"Keyboard Navigation": "\u0645\u0631\u0648\u0631 \u0628\u0627 \u0635\u0641\u062d\u0647 \u06a9\u0644\u06cc\u062f",
-"Version": "\u0646\u0633\u062e\u0647",
+"case change": "\u062a\u063a\u06cc\u06cc\u0631 \u0645\u0648\u0631\u062f",
+"page embed": "\u0635\u0641\u062d\u0647 \u062c\u0627\u0633\u0627\u0632\u06cc\u00a0",
+"Advanced sort...": "\u0645\u0631\u062a\u0628 \u0633\u0627\u0632\u06cc \u067e\u06cc\u0634\u0631\u0641\u062a\u0647",
+"Advanced Sort": "\u0645\u0631\u062a\u0628 \u0633\u0627\u0632\u06cc \u067e\u06cc\u0634\u0631\u0641\u062a\u0647",
+"Sort table by column ascending": "\u062c\u062f\u0648\u0644 \u0631\u0627 \u0628\u0631 \u0627\u0633\u0627\u0633 \u0633\u062a\u0648\u0646 \u0628\u0647 \u0635\u0648\u0631\u062a \u0635\u0639\u0648\u062f\u06cc \u0645\u0631\u062a\u0628 \u06a9\u0646\u06cc\u062f",
+"Sort table by column descending": "\u062c\u062f\u0648\u0644 \u0631\u0627 \u0628\u0631 \u0627\u0633\u0627\u0633 \u0633\u062a\u0648\u0646 \u0628\u0647 \u0635\u0648\u0631\u062a \u0646\u0632\u0648\u0644\u06cc \u0645\u0631\u062a\u0628 \u06a9\u0646\u06cc\u062f",
+"Sort": "\u0645\u0631\u062a\u0628 \u0633\u0627\u0632\u06cc",
+"Order": "\u062a\u0631\u062a\u06cc\u0628",
+"Sort by": "\u0645\u0631\u062a\u0628 \u0634\u062f\u0647 \u062a\u0648\u0633\u0637",
+"Ascending": "\u0635\u0639\u0648\u062f\u06cc",
+"Descending": "\u0646\u0632\u0648\u0644\u06cc",
+"Column {0}": "\u0633\u062a\u0648\u0646 {0}",
+"Row {0}": "\u0631\u062f\u06cc\u0641 {0}",
+"Spellcheck...": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627\u06cc\u06cc",
+"Misspelled word": "\u06a9\u0644\u0645\u0647 \u063a\u0644\u0637 \u0627\u0645\u0644\u0627\u06cc\u06cc",
+"Suggestions": "\u067e\u06cc\u0634\u0646\u0647\u0627\u062f\u0627\u062a",
+"Change": "\u062a\u063a\u06cc\u06cc\u0631 \u062f\u0627\u062f\u0646",
+"Finding word suggestions": "\u067e\u06cc\u062f\u0627 \u06a9\u0631\u062f\u0646 \u067e\u06cc\u0634\u0646\u0647\u0627\u062f\u0627\u062a \u06a9\u0644\u0645\u0647",
+"Success": "\u0645\u0648\u0641\u0642",
+"Repair": "\u062a\u0639\u0645\u06cc\u0631",
+"Issue {0} of {1}": "\u0645\u0634\u06a9\u0644 {0} \u0627\u0632 {1}",
+"Images must be marked as decorative or have an alternative text description": "\u062a\u0635\u0648\u06cc\u0631 \u0647\u0627 \u0628\u0627\u06cc\u062f \u0628\u0647 \u0635\u0648\u0631\u062a \u0646\u0645\u0627\u06cc\u0634\u06cc \u0645\u0634\u062e\u0635 \u0634\u0648\u062f \u06cc\u0627 \u06cc\u06a9 \u0645\u062a\u0646 \u062a\u0648\u0636\u06cc\u062d\u06cc \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f",
+"Images must have an alternative text description. Decorative images are not allowed.": "\u0639\u06a9\u0633 \u0647\u0627 \u0628\u0627\u06cc\u062f \u06cc\u06a9 \u0645\u062a\u0646 \u062a\u0648\u0636\u06cc\u062d\u06cc \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u0646\u062f. \u0639\u06a9\u0633 \u0647\u0627\u06cc \u0646\u0645\u0627\u06cc\u0634\u06cc \u0645\u062c\u0627\u0632 \u0646\u06cc\u0633\u062a\u0646\u062f.",
+"Or provide alternative text:": "\u06cc\u0627 \u06cc\u06a9 \u0645\u062a\u0646 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u062a\u0647\u06cc\u0647 \u06a9\u0646\u06cc\u062f:",
+"Make image decorative:": "\u0639\u06a9\u0633 \u0631\u0627 \u0646\u0645\u0627\u06cc\u0634\u06cc \u06a9\u0646\u06cc\u062f:",
+"ID attribute must be unique": "\u0634\u0646\u0627\u0633\u0647 \u0635\u0641\u062a \u0628\u0627\u06cc\u062f \u06cc\u06a9\u062a\u0627 \u0628\u0627\u0634\u062f",
+"Make ID unique": "\u0634\u0646\u0627\u0633\u0647 \u0631\u0627 \u06cc\u06a9\u062a\u0627 \u06a9\u0646\u06cc\u062f",
+"Keep this ID and remove all others": "\u0627\u06cc\u0646 \u0634\u0646\u0627\u0633\u0647 \u0631\u0627 \u0646\u06af\u0647 \u062f\u0627\u0631 \u0648 \u0647\u0645\u0647 \u0634\u0646\u0627\u0633\u0647 \u0647\u0627\u06cc \u062f\u06cc\u06af\u0631 \u0631\u0627 \u062d\u0630\u0641 \u06a9\u0646",
+"Remove this ID": "\u0627\u06cc\u0646 \u0634\u0646\u0627\u0633\u0647 \u0631\u0627 \u062d\u0630\u0641 \u06a9\u0646",
+"Remove all IDs": "\u062a\u0645\u0627\u0645 \u0634\u0646\u0627\u0633\u0647 \u0647\u0627 \u0631\u0627 \u0627\u0632 \u0628\u06cc\u0646 \u0628\u0628\u0631",
+"Checklist": "\u0686\u06a9 \u0644\u06cc\u0633\u062a",
 "Anchor": "\u0644\u0646\u06af\u0631 - \u0644\u06cc\u0646\u06a9",
 "Special character": "\u06a9\u0627\u0631\u0627\u06a9\u062a\u0631 \u0647\u0627\u06cc \u062e\u0627\u0635",
 "Color": "Color",
-"Emoticons": "\u0634\u06a9\u0644\u06a9\u200c\u0647\u0627",
 "Document properties": "\u0648\u06cc\u0698\u06af\u06cc\u200c\u0647\u0627\u06cc \u0633\u0646\u062f",
+"Image description": "\u062a\u0648\u0636\u06cc\u062d\u0627\u062a \u0639\u06a9\u0633",
 "Image": "\u0639\u06a9\u0633",
 "Insert link": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0644\u06cc\u0646\u06a9",
 "Link": "Link",
@@ -412,8 +457,6 @@ tinymce.addI18n('fa',{
 "Whole words": "\u0647\u0645\u0647 \u06a9\u0644\u0645\u0647\u200c\u0647\u0627",
 "Find and replace": "\u062c\u0633\u062a\u200c\u0648\u200c\u062c\u0648 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646",
 "Prev": "\u0642\u0628\u0644\u06cc",
-"Spellcheck": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627\u06cc\u06cc",
-"Caption": "\u0639\u0646\u0648\u0627\u0646",
 "Insert template": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0627\u0644\u06af\u0648",
 "_dir": "rtl"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/fa_IR.js b/cps/static/js/libs/tinymce/langs/fa_IR.js
deleted file mode 100644
index e944666ab..000000000
--- a/cps/static/js/libs/tinymce/langs/fa_IR.js
+++ /dev/null
@@ -1,390 +0,0 @@
-tinymce.addI18n('fa_IR',{
-"Redo": "\u0628\u0627\u0632\u0627\u0646\u062c\u0627\u0645",
-"Undo": "\u0648\u0627\u06af\u0631\u062f",
-"Cut": "\u0628\u0631\u0634",
-"Copy": "\u06a9\u067e\u06cc",
-"Paste": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646",
-"Select all": "\u0627\u0646\u062a\u062e\u0627\u0628 \u0647\u0645\u0647",
-"New document": "\u0633\u0646\u062f \u062c\u062f\u06cc\u062f",
-"Ok": "\u062a\u0623\u06cc\u06cc\u062f",
-"Cancel": "\u0644\u063a\u0648",
-"Visual aids": "\u06a9\u0645\u06a9\u200c\u0647\u0627\u06cc \u0628\u0635\u0631\u06cc",
-"Bold": "\u067e\u0631\u0631\u0646\u06af",
-"Italic": "\u06a9\u062c",
-"Underline": "\u0632\u06cc\u0631 \u062e\u0637 \u062f\u0627\u0631",
-"Strikethrough": "\u062e\u0637 \u0632\u062f\u0646",
-"Superscript": "\u0628\u0627\u0644\u0627\u0646\u06af\u0627\u0634\u062a",
-"Subscript": "\u0632\u06cc\u0631\u0646\u06af\u0627\u0634\u062a",
-"Clear formatting": "\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0642\u0627\u0644\u0628\u200c\u0628\u0646\u062f\u06cc",
-"Align left": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc \u0627\u0632 \u0686\u067e",
-"Align center": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc \u0627\u0632 \u0648\u0633\u0637",
-"Align right": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc \u0627\u0632 \u0631\u0627\u0633\u062a",
-"Justify": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc \u062f\u0648\u0637\u0631\u0641\u0647",
-"Bullet list": "\u0641\u0647\u0631\u0633\u062a \u0646\u0634\u0627\u0646\u0647\u200c\u062f\u0627\u0631",
-"Numbered list": "\u0641\u0647\u0631\u0633\u062a \u0634\u0645\u0627\u0631\u0647\u200c\u062f\u0627\u0631",
-"Decrease indent": "\u06a9\u0627\u0647\u0634 \u062a\u0648\u0631\u0641\u062a\u06af\u06cc",
-"Increase indent": "\u0627\u0641\u0632\u0627\u06cc\u0634 \u062a\u0648\u0631\u0641\u062a\u06af\u06cc",
-"Close": "\u0628\u0633\u062a\u0646",
-"Formats": "\u0642\u0627\u0644\u0628\u200c\u0628\u0646\u062f\u06cc\u200c\u0647\u0627",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0645\u0631\u0648\u0631\u06af\u0631 \u0634\u0645\u0627 \u0627\u0632 \u062f\u0633\u062a\u0631\u0633\u06cc \u0645\u0633\u062a\u0642\u06cc\u0645 \u0628\u0647 \u06a9\u0644\u06cc\u067e\u200c\u0628\u0648\u0631\u062f \u067e\u0634\u062a\u06cc\u0628\u0627\u0646\u06cc \u0646\u0645\u06cc\u200c\u06a9\u0646\u062f\u060c \u0644\u0637\u0641\u0627\u064b \u0627\u0632 \u0645\u06cc\u0627\u0646\u0628\u0631\u0647\u0627\u06cc Ctrl+X\/C\/V \u0635\u0641\u062d\u0647 \u06a9\u0644\u06cc\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f.",
-"Headers": "\u0633\u0631\u0628\u0631\u06af\u200c\u0647\u0627",
-"Header 1": "\u0633\u0631\u0628\u0631\u06af 1",
-"Header 2": "\u0633\u0631\u0628\u0631\u06af 2",
-"Header 3": "\u0633\u0631\u0628\u0631\u06af 3",
-"Header 4": "\u0633\u0631\u0628\u0631\u06af 4",
-"Header 5": "\u0633\u0631\u0628\u0631\u06af 5",
-"Header 6": "\u0633\u0631\u0628\u0631\u06af 6",
-"Headings": "\u0633\u0631\u0641\u0635\u0644\u200c\u0647\u0627",
-"Heading 1": "\u0633\u0631\u0641\u0635\u0644\u200c 1",
-"Heading 2": "\u0633\u0631\u0641\u0635\u0644 2",
-"Heading 3": "\u0633\u0631\u0641\u0635\u0644 3",
-"Heading 4": "\u0633\u0631\u0641\u0635\u0644 4",
-"Heading 5": "\u0633\u0631\u0641\u0635\u0644 5",
-"Heading 6": "\u0633\u0631\u0641\u0635\u0644 6",
-"Preformatted": "\u0627\u0632 \u067e\u06cc\u0634 \u0642\u0627\u0644\u0628\u200c\u0628\u0646\u062f\u06cc\u200c\u0634\u062f\u0647",
-"Div": "\u0628\u062e\u0634",
-"Pre": "\u067e\u06cc\u0634",
-"Code": "\u06a9\u062f",
-"Paragraph": "\u067e\u0627\u0631\u0627\u06af\u0631\u0627\u0641",
-"Blockquote": "\u0646\u0642\u0644 \u0642\u0648\u0644 \u0628\u0644\u0648\u06a9\u06cc",
-"Inline": "\u0647\u0645\u200c\u0631\u0627\u0633\u062a\u0627",
-"Blocks": "\u0628\u0644\u0648\u06a9\u200c\u0647\u0627",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0627\u0645\u06a9\u0627\u0646 \u0686\u0633\u0628\u0627\u0646\u062f\u0646\u060c \u062f\u0631 \u062d\u0627\u0644\u062a \u0645\u062a\u0646 \u062e\u0627\u0644\u0635 \u062a\u0646\u0638\u06cc\u0645 \u06af\u0634\u062a\u0647. \u062a\u0627 \u0632\u0645\u0627\u0646 \u062a\u063a\u06cc\u06cc\u0631 \u0627\u06cc\u0646 \u062d\u0627\u0644\u062a\u060c \u0645\u062d\u062a\u0648\u0627\u06cc \u0645\u0648\u0631\u062f \u0686\u0633\u0628\u0627\u0646\u062f\u0646\u060c \u0628\u0647 \u0635\u0648\u0631\u062a \u0645\u062a\u0646 \u062e\u0627\u0644\u0635 \u062e\u0648\u0627\u0647\u062f \u0686\u0633\u0628\u06cc\u062f.",
-"Fonts": "\u0641\u0648\u0646\u062a\u200c\u200c\u0647\u0627",
-"Font Sizes": "\u0627\u0646\u062f\u0627\u0632\u0647\u0654 \u0641\u0648\u0646\u062a",
-"Class": "\u0637\u0628\u0642\u0647",
-"Browse for an image": "\u06af\u0634\u062a\u0646 \u0628\u0631\u0627\u06cc \u0639\u06a9\u0633 \u0645\u0648\u0631\u062f \u0646\u0638\u0631",
-"OR": "\u06cc\u0627",
-"Drop an image here": "\u062a\u0635\u0648\u06cc\u0631 \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u0631\u0627 \u0627\u06cc\u0646\u062c\u0627 \u0631\u0647\u0627 \u06a9\u0646\u06cc\u062f",
-"Upload": "\u0622\u067e\u0644\u0648\u062f",
-"Block": "\u0628\u0644\u0648\u06a9",
-"Align": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc",
-"Default": "\u067e\u06cc\u0634 \u0641\u0631\u0636",
-"Circle": "\u062f\u0627\u06cc\u0631\u0647",
-"Disc": "\u062f\u0627\u06cc\u0631\u0647\u0621 \u062a\u0648\u067e\u0631",
-"Square": "\u0686\u0647\u0627\u0631 \u06af\u0648\u0634",
-"Lower Alpha": "\u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9",
-"Lower Greek": "\u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9 \u06cc\u0648\u0646\u0627\u0646\u06cc",
-"Lower Roman": "\u0627\u0631\u0642\u0627\u0645 \u06a9\u0648\u0686\u06a9 \u0631\u0648\u0645\u06cc",
-"Upper Alpha": "\u062d\u0631\u0648\u0641 \u0628\u0632\u0631\u06af",
-"Upper Roman": "\u0627\u0631\u0642\u0627\u0645 \u0628\u0632\u0631\u06af \u0631\u0648\u0645\u06cc",
-"Anchor...": "\u0642\u0644\u0627\u0628...",
-"Name": "\u0646\u0627\u0645",
-"Id": "\u0634\u0646\u0627\u0633\u0647",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0634\u0646\u0627\u0633\u0647 \u0645\u06cc \u0628\u0627\u06cc\u0633\u062a \u0628\u0627 \u06cc\u06a9 \u062d\u0631\u0641 \u0627\u0644\u0641\u0628\u0627 \u0622\u063a\u0627\u0632 \u0648 \u0628\u0627 \u062f\u0646\u0628\u0627\u0644\u0647 \u0627\u06cc \u0627\u0632 \u062d\u0631\u0648\u0641\u060c \u0627\u0639\u062f\u0627\u062f\u060c \u0639\u0644\u0627\u0645\u062a \u0645\u0650\u0646\u0647\u0627\u060c \u0646\u0642\u0637\u0647\u060c \u062f\u0648 \u0646\u0642\u0637\u0647 \u06cc\u0627 \u062e\u0637 \u062a\u06cc\u0631\u0647 \u0627\u062f\u0627\u0645\u0647 \u06cc\u0627\u0628\u062f.",
-"You have unsaved changes are you sure you want to navigate away?": "\u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0634\u0645\u0627 \u0630\u062e\u06cc\u0631\u0647 \u0646\u0634\u062f\u0647 \u0627\u0646\u062f\u060c \u0622\u06cc\u0627 \u062c\u0647\u062a \u062e\u0631\u0648\u062c \u0627\u0637\u0645\u06cc\u0646\u0627\u0646 \u062f\u0627\u0631\u06cc\u062f\u061f",
-"Restore last draft": "\u0628\u0627\u0632\u06cc\u0627\u0628\u06cc \u0622\u062e\u0631\u06cc\u0646 \u067e\u06cc\u0634 \u0646\u0648\u06cc\u0633",
-"Special characters...": "\u0646\u0648\u06cc\u0633\u0647\u200c\u0647\u0627\u06cc \u0648\u06cc\u0698\u0647...",
-"Source code": "\u0645\u062a\u0646 \u06a9\u062f \u0645\u0646\u0628\u0639",
-"Insert\/Edit code sample": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u0646\u0645\u0648\u0646\u0647\u0621 \u06a9\u062f",
-"Language": "\u0632\u0628\u0627\u0646",
-"Code sample...": "\u0646\u0645\u0648\u0646\u0647 \u06a9\u062f...",
-"Color Picker": "\u0627\u0646\u062a\u062e\u0627\u0628\u200c\u06a9\u0646\u0646\u062f\u0647 \u0631\u0646\u06af",
-"R": "\u0642\u0631\u0645\u0632",
-"G": "\u0633\u0628\u0632",
-"B": "\u0622\u0628\u06cc",
-"Left to right": "\u0686\u067e \u0628\u0647 \u0631\u0627\u0633\u062a",
-"Right to left": "\u0631\u0627\u0633\u062a \u0628\u0647 \u0686\u067e",
-"Emoticons...": "\u0635\u0648\u0631\u062a\u06a9\u200c\u0647\u0627...",
-"Metadata and Document Properties": "\u0641\u0631\u0627\u062f\u0627\u062f\u0647 \u0648 \u0645\u0634\u062e\u0635\u0627\u062a \u0633\u0646\u062f",
-"Title": "\u0639\u0646\u0648\u0627\u0646",
-"Keywords": "\u0648\u0627\u0698\u06af\u0627\u0646 \u06a9\u0644\u06cc\u062f\u06cc",
-"Description": "\u062a\u0648\u0636\u06cc\u062d",
-"Robots": "\u0631\u0648\u0628\u0627\u062a\u0647\u0627",
-"Author": "\u0645\u0648\u0644\u0641",
-"Encoding": "\u06a9\u062f\u06af\u0632\u0627\u0631\u06cc \u0645\u062a\u0646",
-"Fullscreen": "\u062a\u0645\u0627\u0645 \u0635\u0641\u062d\u0647",
-"Action": "\u0639\u0645\u0644",
-"Shortcut": "\u0645\u06cc\u0627\u0646\u0628\u064f\u0631",
-"Help": "\u0631\u0627\u0647\u0646\u0645\u0627",
-"Address": "\u0646\u0634\u0627\u0646\u06cc",
-"Focus to menubar": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0646\u0648\u0627\u0631 \u0645\u0646\u0648",
-"Focus to toolbar": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631",
-"Focus to element path": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0645\u0633\u06cc\u0631 \u0627\u0650\u0644\u0650\u0645\u0627\u0646",
-"Focus to contextual toolbar": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631 \u0645\u062a\u0646\u06cc",
-"Insert link (if link plugin activated)": "\u062f\u0631\u062c \u067e\u06cc\u0648\u0646\u062f (\u0627\u06af\u0631 \u0627\u0641\u0632\u0648\u0646\u0647\u0621 \u067e\u06cc\u0648\u0646\u062f \u0641\u0639\u0627\u0644 \u0634\u062f)",
-"Save (if save plugin activated)": "\u062b\u0628\u062a\u00a0(\u0627\u06af\u0631 \u0627\u0641\u0632\u0648\u0646\u0647\u0621 \u0630\u062e\u06cc\u0631\u0647 \u0633\u0627\u0632\u06cc \u0641\u0639\u0627\u0644 \u0634\u062f)",
-"Find (if searchreplace plugin activated)": "\u06cc\u0627\u0641\u062a\u0646 (\u0627\u06af\u0631 \u0627\u0641\u0632\u0648\u0646\u0647\u0621 \u062c\u0633\u062a\u062c\u0648\/\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc \u0641\u0639\u0627\u0644 \u0634\u062f)",
-"Plugins installed ({0}):": "\u0627\u0641\u0632\u0648\u0646\u0647 \u0647\u0627\u06cc\u06cc \u06a9\u0647 \u0646\u0635\u0628 \u0634\u062f\u0646\u062f ({0}):",
-"Premium plugins:": "\u0627\u0641\u0632\u0648\u0646\u0647 \u0647\u0627\u06cc \u0645\u062e\u0635\u0648\u0635:",
-"Learn more...": "\u06cc\u0627\u062f\u06af\u06cc\u0631\u06cc \u0628\u06cc\u0634\u062a\u0631...",
-"You are using {0}": "\u0634\u0645\u0627 \u062f\u0631 \u062d\u0627\u0644 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 {0} \u0645\u06cc \u0628\u0627\u0634\u06cc\u062f",
-"Plugins": "\u0627\u0641\u0632\u0648\u0646\u0647 \u0647\u0627",
-"Handy Shortcuts": "\u0645\u06cc\u0627\u0646\u0628\u064f\u0631\u0647\u0627\u06cc \u0633\u0648\u062f\u0645\u0646\u062f",
-"Horizontal line": "\u062e\u0637 \u0627\u0641\u0642\u06cc",
-"Insert\/edit image": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u062a\u0635\u0648\u06cc\u0631",
-"Image description": "\u062a\u0648\u0635\u06cc\u0641 \u062a\u0635\u0648\u06cc\u0631",
-"Source": "\u0645\u0646\u0628\u0639",
-"Dimensions": "\u0627\u0628\u0639\u0627\u062f",
-"Constrain proportions": "\u062d\u0641\u0638 \u062a\u0646\u0627\u0633\u0628",
-"General": "\u0639\u0645\u0648\u0645\u06cc",
-"Advanced": "\u067e\u06cc\u0634\u0631\u0641\u062a\u0647",
-"Style": "\u0633\u0628\u06a9",
-"Vertical space": "\u0641\u0636\u0627\u06cc \u0639\u0645\u0648\u062f\u06cc",
-"Horizontal space": "\u0641\u0636\u0627\u06cc \u0627\u0641\u0642\u06cc",
-"Border": "\u0644\u0628\u0647",
-"Insert image": "\u062f\u0631\u062c \u062a\u0635\u0648\u06cc\u0631",
-"Image...": "\u062a\u0635\u0648\u06cc\u0631...",
-"Image list": "\u0641\u0647\u0631\u0633\u062a \u062a\u0635\u0648\u06cc\u0631\u06cc",
-"Rotate counterclockwise": "\u062f\u064e\u0648\u064e\u0631\u0627\u0646 \u067e\u0627\u062f \u0633\u0627\u0639\u062a \u06af\u0631\u062f",
-"Rotate clockwise": "\u062f\u064e\u0648\u064e\u0631\u0627\u0646 \u0633\u0627\u0639\u062a \u06af\u0631\u062f",
-"Flip vertically": "\u0642\u0631\u06cc\u0646\u0647 \u0639\u0645\u0648\u062f\u06cc",
-"Flip horizontally": "\u0642\u0631\u06cc\u0646\u0647 \u0627\u0641\u0642\u06cc",
-"Edit image": "\u0648\u06cc\u0631\u0627\u0633\u062a \u062a\u0635\u0648\u06cc\u0631",
-"Image options": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u062a\u0635\u0648\u06cc\u0631",
-"Zoom in": "\u0628\u0632\u0631\u06af \u0646\u0645\u0627\u06cc\u06cc",
-"Zoom out": "\u06a9\u0648\u0686\u06a9 \u0646\u0645\u0627\u06cc\u06cc",
-"Crop": "\u0628\u064f\u0631\u0634 \u062f\u064f\u0648\u0631",
-"Resize": "\u062a\u063a\u06cc\u06cc\u0631 \u0627\u0646\u062f\u0627\u0632\u0647",
-"Orientation": "\u06af\u0650\u0631\u0627",
-"Brightness": "\u0631\u0648\u0634\u0646\u0627\u06cc\u06cc",
-"Sharpen": "\u0628\u0647\u0628\u0648\u062f \u0644\u0628\u0647",
-"Contrast": "\u062a\u0636\u0627\u062f \u0631\u0646\u06af",
-"Color levels": "\u0633\u0637\u0648\u062d \u0631\u0646\u06af",
-"Gamma": "\u06af\u0627\u0645\u0627",
-"Invert": "\u0628\u0631\u06af\u0634\u062a \u0631\u0646\u06af",
-"Apply": "\u0627\u0650\u0639\u0645\u0627\u0644",
-"Back": "\u0628\u0627\u0632\u06af\u0634\u062a",
-"Insert date\/time": "\u062f\u0631\u062c \u062a\u0627\u0631\u06cc\u062e\/\u0632\u0645\u0627\u0646",
-"Date\/time": "\u062a\u0627\u0631\u06cc\u062e\/\u0632\u0645\u0627\u0646",
-"Insert\/Edit Link": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u067e\u06cc\u0648\u0646\u062f",
-"Insert\/edit link": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u067e\u06cc\u0648\u0646\u062f",
-"Text to display": "\u0645\u062a\u0646 \u0646\u0645\u0627\u06cc\u0634\u06cc",
-"Url": "\u0622\u062f\u0631\u0633",
-"Open link in...": "\u0628\u0627\u0632 \u06a9\u0631\u062f\u0646 \u067e\u06cc\u0648\u0646\u062f \u062f\u0631...",
-"Current window": "\u067e\u0646\u062c\u0631\u0647 \u062c\u0627\u0631\u06cc",
-"None": "\u0647\u06cc\u0686",
-"New window": "\u067e\u0646\u062c\u0631\u0647\u0621 \u062c\u062f\u06cc\u062f",
-"Remove link": "\u062d\u0630\u0641 \u067e\u06cc\u0648\u0646\u062f",
-"Anchors": "\u0642\u0644\u0627\u0628 \u0647\u0627",
-"Link...": "\u067e\u06cc\u0648\u0646\u062f...",
-"Paste or type a link": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u06cc\u0627 \u062a\u0627\u06cc\u067e \u067e\u06cc\u0648\u0646\u062f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0628\u0647 \u0646\u0638\u0631 \u0645\u06cc \u0631\u0633\u062f \u0622\u062f\u0631\u0633 \u0648\u0631\u0648\u062f\u06cc \u06cc\u06a9 \u0631\u0627\u06cc\u0627\u0646\u0627\u0645\u0647 \u0628\u0627\u0634\u062f. \u0622\u06cc\u0627 \u062a\u0645\u0627\u06cc\u0644 \u0628\u0647 \u0627\u0641\u0632\u0648\u0631\u062f\u0646 \u067e\u06cc\u0634\u0648\u0646\u062f mailto: \u062f\u0627\u0631\u06cc\u062f\u061f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0628\u0647 \u0646\u0638\u0631 \u0645\u06cc \u0631\u0633\u062f \u0622\u062f\u0631\u0633 \u0648\u0631\u0648\u062f\u06cc \u0627\u0631\u062c\u0627\u0639\u06cc \u0628\u0647 \u062e\u0627\u0631\u062c \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0627\u06cc\u062a \u0645\u06cc \u0628\u0627\u0634\u062f. \u0622\u06cc\u0627 \u062a\u0645\u0627\u06cc\u0644 \u0628\u0647 \u0627\u0641\u0632\u0648\u0631\u062f\u0646 \u067e\u06cc\u0634\u0648\u0646\u062f http:\/\/ \u062f\u0627\u0631\u06cc\u062f\u061f",
-"Link list": "\u0641\u0647\u0631\u0633\u062a \u067e\u06cc\u0648\u0646\u062f",
-"Insert video": "\u062f\u0631\u062c \u0648\u06cc\u062f\u06cc\u0648",
-"Insert\/edit video": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u0648\u06cc\u062f\u06cc\u0648",
-"Insert\/edit media": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u0631\u0633\u0627\u0646\u0647",
-"Alternative source": "\u0645\u0646\u0628\u0639 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646",
-"Alternative source URL": "\u0646\u0634\u0627\u0646\u06cc \u0648\u0628 \u0645\u0646\u0628\u0639 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646",
-"Media poster (Image URL)": "\u067e\u0648\u0633\u062a\u0631 \u0631\u0633\u0627\u0646\u0647 (\u0646\u0634\u0627\u0646\u06cc \u0648\u0628 \u062a\u0635\u0648\u06cc\u0631)",
-"Paste your embed code below:": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u06a9\u062f \u062c\u0627\u0633\u0627\u0632\u06cc \u0634\u0645\u0627 \u062f\u0631 \u0632\u06cc\u0631: ",
-"Embed": "\u062c\u0627\u0633\u0627\u0632\u06cc",
-"Media...": "\u0631\u0633\u0627\u0646\u0647...",
-"Nonbreaking space": "\u0641\u0636\u0627\u06cc \u062e\u0627\u0644\u06cc \u0628\u0631\u0634 \u0646\u0627\u067e\u0630\u06cc\u0631",
-"Page break": "\u0628\u0631\u0634 \u0635\u0641\u062d\u0647",
-"Paste as text": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0645\u062a\u0646",
-"Preview": "\u067e\u06cc\u0634 \u0646\u0645\u0627\u06cc\u0634",
-"Print...": "\u0686\u0627\u067e...",
-"Save": "\u0630\u062e\u06cc\u0631\u0647",
-"Find": "\u062c\u0633\u062a\u062c\u0648",
-"Replace with": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc \u0628\u0627",
-"Replace": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc",
-"Replace all": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u0647\u0645\u0647",
-"Previous": "\u0642\u0628\u0644\u06cc",
-"Next": "\u0628\u0639\u062f\u06cc",
-"Find and replace...": "\u06cc\u0627\u0641\u062a\u0646 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646...",
-"Could not find the specified string.": "\u0631\u0634\u062a\u0647\u0621 \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u06cc\u0627\u0641\u062a \u0646\u06af\u0631\u062f\u06cc\u062f.",
-"Match case": "\u062a\u0637\u0627\u0628\u0642 \u062d\u0631\u0648\u0641",
-"Find whole words only": "\u06cc\u0627\u0641\u062a\u0646 \u062f\u0642\u06cc\u0642\u0627\u064b \u06a9\u0644 \u0648\u0627\u0698\u0647",
-"Spell check": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627",
-"Ignore": "\u0628\u06cc \u062e\u06cc\u0627\u0644",
-"Ignore all": "\u0628\u06cc \u062e\u06cc\u0627\u0644 \u0647\u0645\u0647",
-"Finish": "\u0627\u062a\u0645\u0627\u0645",
-"Add to Dictionary": "\u0628\u0647 \u0648\u0627\u0698\u0647 \u0646\u0627\u0645\u0647 \u0628\u06cc \u0627\u0641\u0632\u0627",
-"Insert table": "\u062f\u0631\u062c \u062c\u062f\u0648\u0644",
-"Table properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u062c\u062f\u0648\u0644",
-"Delete table": "\u062d\u0630\u0641 \u062c\u062f\u0648\u0644",
-"Cell": "\u0633\u0644\u0648\u0644",
-"Row": "\u0633\u0637\u0631",
-"Column": "\u0633\u062a\u0648\u0646",
-"Cell properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0633\u0644\u0648\u0644",
-"Merge cells": "\u067e\u06cc\u0648\u0646\u062f \u0633\u0644\u0648\u0644 \u0647\u0627",
-"Split cell": "\u062c\u062f\u0627 \u0633\u0627\u0632\u06cc \u0633\u0644\u0648\u0644",
-"Insert row before": "\u062f\u0631\u062c \u0633\u0637\u0631 \u062f\u0631 \u0628\u0627\u0644\u0627",
-"Insert row after": "\u062f\u0631\u062c \u0633\u0637\u0631 \u062f\u0631 \u067e\u0627\u06cc\u06cc\u0646",
-"Delete row": "\u062d\u0630\u0641 \u0633\u0637\u0631",
-"Row properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0633\u0637\u0631",
-"Cut row": "\u0628\u0631\u0634 \u0633\u0637\u0631",
-"Copy row": "\u0631\u0648\u0646\u0648\u06cc\u0633\u06cc \u0633\u0637\u0631",
-"Paste row before": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631 \u062f\u0631 \u0628\u0627\u0644\u0627",
-"Paste row after": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631 \u062f\u0631 \u067e\u0627\u06cc\u06cc\u0646",
-"Insert column before": "\u062f\u0631\u062c \u0633\u062a\u0648\u0646 \u0642\u0628\u0644",
-"Insert column after": "\u062f\u0631\u062c \u0633\u062a\u0648\u0646 \u0628\u0639\u062f",
-"Delete column": "\u062d\u0630\u0641 \u0633\u062a\u0648\u0646",
-"Cols": "\u0633\u062a\u0648\u0646 \u0647\u0627",
-"Rows": "\u0633\u0637\u0631 \u0647\u0627",
-"Width": "\u0639\u0631\u0636",
-"Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
-"Cell spacing": "\u0641\u0627\u0635\u0644\u0647 \u0645\u06cc\u0627\u0646 \u0633\u0644\u0648\u0644\u06cc",
-"Cell padding": "\u062d\u0627\u0634\u06cc\u0647 \u062f\u0631\u0648\u0646 \u0633\u0644\u0648\u0644\u06cc",
-"Show caption": "\u0646\u0645\u0627\u06cc\u0634 \u0639\u0646\u0648\u0627\u0646",
-"Left": "\u0686\u067e",
-"Center": "\u0645\u06cc\u0627\u0646\u0647",
-"Right": "\u0631\u0627\u0633\u062a",
-"Cell type": "\u0646\u0648\u0639 \u0633\u0644\u0648\u0644",
-"Scope": "\u062d\u0648\u0632\u0647",
-"Alignment": "\u0647\u0645 \u062a\u0631\u0627\u0632\u06cc",
-"H Align": "\u062a\u0631\u0627\u0632 \u0627\u0641\u0642\u06cc",
-"V Align": "\u062a\u0631\u0627\u0632 \u0639\u0645\u0648\u062f\u06cc",
-"Top": "\u0628\u0627\u0644\u0627",
-"Middle": "\u0645\u06cc\u0627\u0646\u0647",
-"Bottom": "\u067e\u0627\u06cc\u06cc\u0646",
-"Header cell": "\u0633\u0644\u0648\u0644 \u0633\u0631 \u0633\u062a\u0648\u0646",
-"Row group": "\u06af\u0631\u0648\u0647 \u0633\u0637\u0631\u06cc",
-"Column group": "\u06af\u0631\u0648\u0647 \u0633\u062a\u0648\u0646\u06cc",
-"Row type": "\u0646\u0648\u0639 \u0633\u0637\u0631",
-"Header": "\u0633\u0631 \u0622\u0645\u062f",
-"Body": "\u0628\u062f\u0646\u0647",
-"Footer": "\u067e\u0627 \u0646\u0648\u0634\u062a",
-"Border color": "\u0631\u0646\u06af \u0644\u0628\u0647",
-"Insert template...": "\u062f\u0631\u062c \u0627\u0644\u06af\u0648...",
-"Templates": "\u0627\u0644\u06af\u0648\u0647\u0627",
-"Template": "\u0627\u0644\u06af\u0648",
-"Text color": "\u0631\u0646\u06af \u0645\u062a\u0646",
-"Background color": "\u0631\u0646\u06af \u067e\u0633 \u0632\u0645\u06cc\u0646\u0647",
-"Custom...": "\u062f\u0644\u062e\u0648\u0627\u0647...",
-"Custom color": "\u0631\u0646\u06af \u062f\u0644\u062e\u0648\u0627\u0647",
-"No color": "\u0628\u062f\u0648\u0646 \u0631\u0646\u06af",
-"Remove color": "\u062d\u0630\u0641 \u0631\u0646\u06af",
-"Table of Contents": "\u0641\u0647\u0631\u0633\u062a \u0639\u0646\u0627\u0648\u06cc\u0646",
-"Show blocks": "\u0646\u0645\u0627\u06cc\u0634 \u0628\u0644\u0648\u06a9 \u0647\u0627",
-"Show invisible characters": "\u0646\u0645\u0627\u06cc\u0634 \u0646\u0648\u06cc\u0633\u0647 \u0647\u0627\u06cc \u0646\u0627\u067e\u06cc\u062f\u0627",
-"Word count": "\u062a\u0639\u062f\u0627\u062f \u0648\u0627\u0698\u0647\u200c\u0647\u0627",
-"Words: {0}": "\u0648\u0627\u0698\u0647 \u0647\u0627: {0}",
-"{0} words": "{0} \u0648\u0627\u0698\u0647",
-"File": "\u067e\u0631\u0648\u0646\u062f\u0647",
-"Edit": "\u0648\u06cc\u0631\u0627\u06cc\u0634",
-"Insert": "\u062f\u0631\u062c",
-"View": "\u0646\u0645\u0627\u06cc\u0634",
-"Format": "\u0642\u0627\u0644\u0628",
-"Table": "\u062c\u062f\u0648\u0644",
-"Tools": "\u0627\u0628\u0632\u0627\u0631\u0647\u0627",
-"Powered by {0}": "\u062a\u0648\u0627\u0646 \u06af\u0631\u0641\u062a\u0647 \u0627\u0632 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0646\u0627\u062d\u06cc\u0647 \u0645\u062a\u0646 \u063a\u0646\u06cc.\n\u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647 \u0645\u0646\u0648 \u0627\u0632 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc \u062a\u0631\u06a9\u06cc\u0628\u06cc ALT + F9 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f.\n\u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647 \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631 \u0627\u0632 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc \u062a\u0631\u06a9\u06cc\u0628\u06cc ALT + F10 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f.\n\u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647 \u0631\u0627\u0647\u0646\u0645\u0627 \u0627\u0632 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc \u062a\u0631\u06a9\u06cc\u0628\u06cc ALT + 0 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f.",
-"Image title": "\u0639\u0646\u0648\u0627\u0646 \u062a\u0635\u0648\u06cc\u0631",
-"Border width": "\u0639\u0631\u0636 \u062d\u0627\u0634\u06cc\u0647",
-"Border style": "\u0633\u0628\u06a9 \u062d\u0627\u0634\u06cc\u0647",
-"Error": "\u062e\u0637\u0627",
-"Warn": "\u0647\u0634\u062f\u0627\u0631",
-"Valid": "\u0645\u0639\u062a\u0628\u0631",
-"To open the popup, press Shift+Enter": "\u062c\u0647\u062a \u0628\u0627\u0632 \u06a9\u0631\u062f\u0646 \u067e\u0646\u062c\u0631\u0647 \u0628\u0627\u0632\u0634\u0648\u060c \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc Shift + Enter \u0631\u0627 \u0641\u0634\u0627\u0631 \u062f\u0647\u06cc\u062f.",
-"Rich Text Area. Press ALT-0 for help.": "\u0646\u0627\u062d\u06cc\u0647 \u0645\u062a\u0646 \u063a\u0646\u06cc. \u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647\u0654 \u0631\u0627\u0647\u0646\u0645\u0627 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc ALT + 0 \u0631\u0627 \u0641\u0634\u0627\u0631 \u062f\u0647\u06cc\u062f.",
-"System Font": "\u0641\u0648\u0646\u062a \u0633\u06cc\u0633\u062a\u0645\u06cc",
-"Failed to upload image: {0}": "\u0639\u062f\u0645 \u0645\u0648\u0641\u0642\u06cc\u062a \u062f\u0631 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u062a\u0635\u0648\u06cc\u0631: {0}",
-"Failed to load plugin: {0} from url {1}": "\u0639\u062f\u0645 \u0645\u0648\u0641\u0642\u06cc\u062a \u062f\u0631 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u0627\u0641\u0632\u0648\u0646\u0647: {0} \u0627\u0632 \u0646\u0634\u0627\u0646\u06cc \u0648\u0628 {1}",
-"Failed to load plugin url: {0}": "\u0639\u062f\u0645 \u0645\u0648\u0641\u0642\u06cc\u062a \u062f\u0631 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u0646\u0634\u0627\u0646\u06cc \u0648\u0628 \u0627\u0641\u0632\u0648\u0646\u0647: {0}",
-"Failed to initialize plugin: {0}": "\u0639\u062f\u0645 \u0645\u0648\u0641\u0642\u06cc\u062a \u062f\u0631 \u0631\u0627\u0647\u200c\u0627\u0646\u062f\u0627\u0632\u06cc \u0627\u0641\u0632\u0648\u0646\u0647: {0}",
-"example": "\u0645\u062b\u0627\u0644",
-"Search": "\u062c\u0633\u062a\u062c\u0648",
-"All": "\u0647\u0645\u0647",
-"Currency": "\u0627\u0631\u0632",
-"Text": "\u0645\u062a\u0646",
-"Quotations": "\u0646\u0642\u0644\u200c\u0642\u0648\u0644\u200c\u0647\u0627",
-"Mathematical": "\u0631\u06cc\u0627\u0636\u06cc",
-"Extended Latin": "\u0644\u0627\u062a\u06cc\u0646 \u06af\u0633\u062a\u0631\u062f\u0647",
-"Symbols": "\u0646\u0645\u0627\u062f\u0647\u0627",
-"Arrows": "\u067e\u06cc\u06a9\u0627\u0646\u200c\u0647\u0627",
-"User Defined": "\u0628\u0647 \u062e\u0648\u0627\u0633\u062a \u06a9\u0627\u0631\u0628\u0631",
-"dollar sign": "\u0646\u0645\u0627\u062f \u062f\u0644\u0627\u0631",
-"currency sign": "\u0646\u0645\u0627\u062f \u0627\u0631\u0632",
-"euro-currency sign": "\u0646\u0645\u0627\u062f \u06cc\u0648\u0631\u0648",
-"colon sign": "\u0646\u0645\u0627\u062f \u062f\u0648\u0646\u0642\u0637\u0647",
-"cruzeiro sign": "\u0646\u0645\u0627\u062f \u06a9\u0631\u0648\u0632\u06cc\u0631\u0648",
-"french franc sign": "\u0646\u0645\u0627\u062f \u0641\u0631\u0627\u0646\u06a9 \u0641\u0631\u0627\u0646\u0633\u0647",
-"lira sign": "\u0646\u0645\u0627\u062f \u0644\u06cc\u0631\u0647",
-"mill sign": "\u0646\u0645\u0627\u062f \u0645\u06cc\u0644",
-"naira sign": "\u0646\u0645\u0627\u062f \u0646\u0627\u06cc\u0631\u0627",
-"peseta sign": "\u0646\u0645\u0627\u062f \u067e\u0632\u062a\u0627",
-"rupee sign": "\u0646\u0645\u0627\u062f \u0631\u0648\u067e\u06cc\u0647",
-"won sign": "\u0646\u0645\u0627\u062f \u0648\u0648\u0646",
-"new sheqel sign": "\u0646\u0645\u0627\u062f \u0634\u06a9\u0644 \u062c\u062f\u06cc\u062f",
-"dong sign": "\u0646\u0645\u0627\u062f \u062f\u0627\u0646\u06af",
-"kip sign": "\u0646\u0645\u0627\u062f \u06a9\u06cc\u067e",
-"tugrik sign": "\u0646\u0645\u0627\u062f \u062a\u0648\u06af\u0631\u0648\u06af",
-"drachma sign": "\u0646\u0645\u0627\u062f \u062f\u0631\u0627\u062e\u0645\u0627",
-"german penny symbol": "\u0646\u0645\u0627\u062f \u067e\u0646\u06cc \u0622\u0644\u0645\u0627\u0646\u06cc",
-"peso sign": "\u0646\u0645\u0627\u062f \u067e\u0632\u0648",
-"guarani sign": "\u0646\u0645\u0627\u062f \u06af\u0648\u0627\u0631\u0627\u0646\u06cc",
-"austral sign": "\u0646\u0645\u0627\u062f \u0622\u0633\u062a\u0631\u0627\u0644",
-"hryvnia sign": "\u0646\u0645\u0627\u062f \u06af\u0631\u06cc\u0648\u0646\u0627",
-"cedi sign": "\u0646\u0645\u0627\u062f \u0633\u062f\u06cc",
-"livre tournois sign": "\u0646\u0645\u0627\u062f \u0644\u06cc\u0648\u0631\u0647 \u062a\u0648\u0631\u0646\u0648\u0627",
-"spesmilo sign": "\u0646\u0645\u0627\u062f \u0627\u0633\u067e\u0633\u0645\u06cc\u0644\u0648",
-"tenge sign": "\u0646\u0645\u0627\u062f \u062a\u0646\u06af\u0647",
-"indian rupee sign": "\u0646\u0645\u0627\u062f \u0631\u0648\u067e\u06cc\u0647 \u0647\u0646\u062f\u06cc",
-"turkish lira sign": "\u0646\u0645\u0627\u062f \u0644\u06cc\u0631\u0647 \u062a\u0631\u06a9\u06cc",
-"nordic mark sign": "\u0646\u0645\u0627\u062f \u0645\u0627\u0631\u06a9 \u0646\u0631\u0648\u0698",
-"manat sign": "\u0646\u0645\u0627\u062f \u0645\u0646\u0627\u062a",
-"ruble sign": "\u0646\u0645\u0627\u062f \u0631\u0648\u0628\u0644",
-"yen character": "\u0646\u0648\u06cc\u0633\u0647 \u06cc\u0646",
-"yuan character": "\u0646\u0648\u06cc\u0633\u0647 \u06cc\u0648\u0627\u0646",
-"yuan character, in hong kong and taiwan": "\u0646\u0648\u06cc\u0633\u0647 \u06cc\u0648\u0627\u0646\u060c \u062f\u0631 \u0647\u0646\u06af\u200c\u06a9\u0646\u06af \u0648 \u062a\u0627\u06cc\u0648\u0627\u0646",
-"yen\/yuan character variant one": "\u0646\u0648\u06cc\u0633\u0647 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06cc\u0646\/\u06cc\u0648\u0627\u0646",
-"Loading emoticons...": "\u062f\u0631 \u062d\u0627\u0644 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u0634\u06a9\u0644\u06a9\u200c\u0647\u0627...",
-"Could not load emoticons": "\u0634\u06a9\u0644\u06a9\u200c\u0647\u0627 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u0646\u0634\u062f\u0646\u062f",
-"People": "\u0627\u0641\u0631\u0627\u062f",
-"Animals and Nature": "\u062d\u06cc\u0648\u0627\u0646\u0627\u062a \u0648 \u0637\u0628\u06cc\u0639\u062a",
-"Food and Drink": "\u063a\u0630\u0627 \u0648 \u0646\u0648\u0634\u06cc\u062f\u0646\u06cc",
-"Activity": "\u0641\u0639\u0627\u0644\u06cc\u062a",
-"Travel and Places": "\u0633\u0641\u0631 \u0648 \u0627\u0645\u0627\u06a9\u0646",
-"Objects": "\u0627\u0634\u06cc\u0627",
-"Flags": "\u067e\u0631\u0686\u0645\u200c\u0647\u0627",
-"Characters": "\u0646\u0648\u06cc\u0633\u0647\u200c\u0647\u0627",
-"Characters (no spaces)": "\u0646\u0648\u06cc\u0633\u0647 \u0647\u0627 (\u0628\u062f\u0648\u0646 \u0641\u0627\u0635\u0644\u0647)",
-"Error: Form submit field collision.": "\u062e\u0637\u0627: \u062a\u062f\u0627\u062e\u0644 \u062f\u0631 \u062b\u0628\u062a \u0641\u0631\u0645.",
-"Error: No form element found.": "\u062e\u0637\u0627: \u0647\u06cc\u0686 \u0627\u0644\u0645\u0627\u0646 \u0641\u0631\u0645\u06cc \u06cc\u0627\u0641\u062a \u0646\u0634\u062f.",
-"Update": "\u0628\u0647\u200c\u0631\u0648\u0632\u0631\u0633\u0627\u0646\u06cc",
-"Color swatch": "\u0646\u0645\u0648\u0646\u0647 \u0631\u0646\u06af",
-"Turquoise": "\u0641\u06cc\u0631\u0648\u0632\u0647\u200c\u0627\u06cc",
-"Green": "\u0633\u0628\u0632",
-"Blue": "\u0622\u0628\u06cc",
-"Purple": "\u0628\u0646\u0641\u0634",
-"Navy Blue": "\u0633\u0631\u0645\u0647\u200c\u0627\u06cc",
-"Dark Turquoise": "\u0641\u06cc\u0631\u0648\u0632\u0647\u200c\u0627\u06cc \u062a\u06cc\u0631\u0647",
-"Dark Green": "\u0633\u0628\u0632 \u062a\u06cc\u0631\u0647",
-"Medium Blue": "\u0622\u0628\u06cc \u0633\u06cc\u0631",
-"Medium Purple": "\u0622\u0628\u06cc \u0628\u0646\u0641\u0634",
-"Midnight Blue": "\u0622\u0628\u06cc \u0646\u0641\u062a\u06cc",
-"Yellow": "\u0632\u0631\u062f",
-"Orange": "\u0646\u0627\u0631\u0646\u062c\u06cc",
-"Red": "\u0642\u0631\u0645\u0632",
-"Light Gray": "\u062e\u0627\u06a9\u0633\u062a\u0631\u06cc \u0631\u0648\u0634\u0646",
-"Gray": "\u062e\u0627\u06a9\u0633\u062a\u0631\u06cc",
-"Dark Yellow": "\u0632\u0631\u062f \u062a\u06cc\u0631\u0647",
-"Dark Orange": "\u0646\u0627\u0631\u0646\u062c\u06cc \u062a\u06cc\u0631\u0647",
-"Dark Red": "\u0642\u0631\u0645\u0632 \u062a\u06cc\u0631\u0647",
-"Medium Gray": "\u062e\u0627\u06a9\u0633\u062a\u0631\u06cc \u0646\u06cc\u0645\u0647\u200c\u0631\u0648\u0634\u0646",
-"Dark Gray": "\u062e\u0627\u06a9\u0633\u062a\u0631\u06cc \u062a\u06cc\u0631\u0647",
-"Black": "\u0633\u06cc\u0627\u0647",
-"White": "\u0633\u0641\u06cc\u062f",
-"Switch to or from fullscreen mode": "\u062a\u063a\u06cc\u06cc\u0631 \u0627\u0632 \u062d\u0627\u0644\u062a \u062a\u0645\u0627\u0645\u200c\u0635\u0641\u062d\u0647 \u06cc\u0627 \u0628\u0647 \u062d\u0627\u0644\u062a \u062a\u0645\u0627\u0645\u200c\u0635\u0641\u062d\u0647",
-"Open help dialog": "\u0628\u0627\u0632 \u06a9\u0631\u062f\u0646 \u06a9\u0627\u062f\u0631 \u0631\u0627\u0647\u0646\u0645\u0627",
-"history": "\u062a\u0627\u0631\u06cc\u062e\u0686\u0647",
-"styles": "\u0633\u0628\u06a9\u200c\u0647\u0627",
-"formatting": "\u0642\u0627\u0644\u0628\u200c\u0628\u0646\u062f\u06cc",
-"alignment": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc",
-"indentation": "\u062a\u0648\u0631\u0641\u062a\u06af\u06cc",
-"permanent pen": "\u0642\u0644\u0645 \u062f\u0627\u0626\u0645\u06cc",
-"comments": "\u0646\u0638\u0631\u0627\u062a",
-"Anchor": "\u0642\u0644\u0627\u0628",
-"Special character": "\u0646\u0648\u06cc\u0633\u0647 \u0647\u0627\u06cc \u062e\u0627\u0635",
-"Code sample": "\u0646\u0645\u0648\u0646\u0647 \u06a9\u064f\u062f",
-"Color": "\u0631\u0646\u06af",
-"Emoticons": "\u0635\u0648\u0631\u062a\u06a9 \u0647\u0627",
-"Document properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0633\u0646\u062f",
-"Image": "\u062a\u0635\u0648\u06cc\u0631",
-"Insert link": "\u062f\u0631\u062c \u067e\u06cc\u0648\u0646\u062f",
-"Target": "\u0645\u0642\u0635\u062f",
-"Link": "\u067e\u06cc\u0648\u0646\u062f",
-"Poster": "\u067e\u0648\u0633\u062a\u0631",
-"Media": "\u0631\u0633\u0627\u0646\u0647",
-"Print": "\u0686\u0627\u067e",
-"Prev": "\u0642\u0628\u0644\u06cc",
-"Find and replace": "\u062c\u0633\u062a\u062c\u0648 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc",
-"Whole words": "\u062a\u0645\u0627\u0645 \u0648\u0627\u0698\u06af\u0627\u0646",
-"Spellcheck": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627\u0621",
-"Caption": "\u0639\u0646\u0648\u0627\u0646",
-"Insert template": "\u062f\u0631\u062c \u0627\u0644\u06af\u0648",
-"_dir": "rtl"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/fr_FR.js b/cps/static/js/libs/tinymce/langs/fr_FR.js
index 67c6e21ed..3126171f9 100644
--- a/cps/static/js/libs/tinymce/langs/fr_FR.js
+++ b/cps/static/js/libs/tinymce/langs/fr_FR.js
@@ -85,6 +85,7 @@ tinymce.addI18n('fr_FR',{
 "B": "B",
 "Left to right": "Gauche \u00e0 droite",
 "Right to left": "Droite \u00e0 gauche",
+"Emoticons": "Emotic\u00f4nes",
 "Emoticons...": "\u00c9motic\u00f4nes...",
 "Metadata and Document Properties": "M\u00e9tadonn\u00e9es et propri\u00e9t\u00e9s du document",
 "Title": "Titre",
@@ -113,7 +114,9 @@ tinymce.addI18n('fr_FR',{
 "Handy Shortcuts": "Raccourcis utiles",
 "Horizontal line": "Ligne horizontale",
 "Insert\/edit image": "Ins\u00e9rer\/modifier une image",
-"Image description": "Description de l'image",
+"Alternative description": "Description alternative",
+"Accessibility": "Accessibilit\u00e9",
+"Image is decorative": "L'image est d\u00e9corative",
 "Source": "Source",
 "Dimensions": "Dimensions",
 "Constrain proportions": "Conserver les proportions",
@@ -147,7 +150,6 @@ tinymce.addI18n('fr_FR',{
 "Back": "Retour",
 "Insert date\/time": "Ins\u00e9rer date\/heure",
 "Date\/time": "Date\/heure",
-"Insert\/Edit Link": "Ins\u00e9rer\/Modifier lien",
 "Insert\/edit link": "Ins\u00e9rer\/modifier un lien",
 "Text to display": "Texte \u00e0 afficher",
 "Url": "Url",
@@ -155,12 +157,14 @@ tinymce.addI18n('fr_FR',{
 "Current window": "Fen\u00eatre active",
 "None": "n\/a",
 "New window": "Nouvelle fen\u00eatre",
+"Open link": "Ouvrir le lien",
 "Remove link": "Enlever le lien",
 "Anchors": "Ancres",
 "Link...": "Lien...",
 "Paste or type a link": "Coller ou taper un lien",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "L'URL que vous avez saisie semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe https:\/\/ requis\u00a0?",
 "Link list": "Liste de liens",
 "Insert video": "Ins\u00e9rer une vid\u00e9o",
 "Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o",
@@ -183,11 +187,15 @@ tinymce.addI18n('fr_FR',{
 "Replace all": "Tout remplacer",
 "Previous": "Pr\u00e9c\u00e9dente",
 "Next": "Suiv",
+"Find and Replace": "Trouver et remplacer",
 "Find and replace...": "Trouver et remplacer...",
 "Could not find the specified string.": "Impossible de trouver la cha\u00eene sp\u00e9cifi\u00e9e.",
 "Match case": "Respecter la casse",
 "Find whole words only": "Mot entier",
-"Spell check": "V\u00e9rification de l'orthographe",
+"Find in selection": "Trouver dans la s\u00e9lection",
+"Spellcheck": "V\u00e9rification orthographique",
+"Spellcheck Language": "Langue du correcteur orthographique",
+"No misspellings found.": "Aucune faute d'orthographe trouv\u00e9e.",
 "Ignore": "Ignorer",
 "Ignore all": "Tout ignorer",
 "Finish": "Finie",
@@ -218,6 +226,7 @@ tinymce.addI18n('fr_FR',{
 "Height": "Hauteur",
 "Cell spacing": "Espacement inter-cellulles",
 "Cell padding": "Espacement interne cellule",
+"Caption": "Titre",
 "Show caption": "Afficher le sous-titrage",
 "Left": "Gauche",
 "Center": "Centr\u00e9",
@@ -377,7 +386,21 @@ tinymce.addI18n('fr_FR',{
 "formatting": "mise en forme",
 "alignment": "alignement",
 "indentation": "retrait",
-"permanent pen": "feutre ind\u00e9l\u00e9bile",
+"Font": "Police",
+"Size": "Taille",
+"More...": "Plus...",
+"Select...": "S\u00e9lectionner...",
+"Preferences": "Pr\u00e9f\u00e9rences",
+"Yes": "Oui",
+"No": "Non",
+"Keyboard Navigation": "Navigation au clavier",
+"Version": "Version",
+"Code view": "Affichage du code",
+"Open popup menu for split buttons": "Ouvrir le menu contextuel pour les boutons partag\u00e9s",
+"List Properties": "Propri\u00e9t\u00e9s de la liste",
+"List properties...": "Lister les propri\u00e9t\u00e9s...",
+"Start list at number": "Liste de d\u00e9part au num\u00e9ro",
+"Line height": "Hauteur de la ligne",
 "comments": "commentaires",
 "Format Painter": "Reproduire la mise en forme",
 "Insert\/edit iframe": "Ins\u00e9rer\/modifier iframe",
@@ -385,24 +408,46 @@ tinymce.addI18n('fr_FR',{
 "lowercase": "minuscule",
 "UPPERCASE": "MAJUSCULE",
 "Title Case": "Casse du titre",
+"permanent pen": "feutre ind\u00e9l\u00e9bile",
 "Permanent Pen Properties": "Propri\u00e9t\u00e9s du feutre ind\u00e9l\u00e9bile",
 "Permanent pen properties...": "Propri\u00e9t\u00e9s du feutre ind\u00e9l\u00e9bile...",
-"Font": "Police",
-"Size": "Taille",
-"More...": "Plus...",
-"Spellcheck Language": "Langue du correcteur orthographique",
-"Select...": "S\u00e9lectionner...",
-"Preferences": "Pr\u00e9f\u00e9rences",
-"Yes": "Oui",
-"No": "Non",
-"Keyboard Navigation": "Navigation au clavier",
-"Version": "Version",
+"case change": "changement de cas",
+"page embed": "int\u00e9gration de page",
+"Advanced sort...": "Tri avanc\u00e9...",
+"Advanced Sort": "Tri avanc\u00e9",
+"Sort table by column ascending": "Trier le tableau par colonne ascendante",
+"Sort table by column descending": "Trier le tableau par colonne en ordre d\u00e9croissant",
+"Sort": "Sorte",
+"Order": "Ordre",
+"Sort by": "Trier par",
+"Ascending": "Ascendant",
+"Descending": "Descendant",
+"Column {0}": "Colonne {0}",
+"Row {0}": "Ligne {0}",
+"Spellcheck...": "V\u00e9rification orthographique...",
+"Misspelled word": "Mot mal orthographi\u00e9",
+"Suggestions": "Suggestions",
+"Change": "Changement",
+"Finding word suggestions": "Trouver des suggestions de mots",
+"Success": "Succ\u00e8s",
+"Repair": "R\u00e9paration",
+"Issue {0} of {1}": " {0} Erreur sur  {1}",
+"Images must be marked as decorative or have an alternative text description": "Les images doivent \u00eatre marqu\u00e9es comme d\u00e9coratives ou avoir une description textuelle alternative",
+"Images must have an alternative text description. Decorative images are not allowed.": "Les images doivent avoir une description textuelle alternative. Les images d\u00e9coratives ne sont pas autoris\u00e9es.",
+"Or provide alternative text:": "Ou fournissez un texte alternatif\u00a0:",
+"Make image decorative:": "Rendre l'image d\u00e9corative\u00a0:",
+"ID attribute must be unique": "L'attribut ID doit \u00eatre unique",
+"Make ID unique": "Rendre l'identifiant unique",
+"Keep this ID and remove all others": "Conservez cet identifiant et supprimez tous les autres",
+"Remove this ID": "Supprimer cet identifiant",
+"Remove all IDs": "Supprimer tous les identifiants",
+"Checklist": "Liste de contr\u00f4le",
 "Anchor": "Ancre",
 "Special character": "Caract\u00e8res sp\u00e9ciaux",
 "Code sample": "Extrait de code",
 "Color": "Couleur",
-"Emoticons": "Emotic\u00f4nes",
 "Document properties": "Propri\u00e9t\u00e9 du document",
+"Image description": "Description de l'image",
 "Image": "Image",
 "Insert link": "Ins\u00e9rer un lien",
 "Target": "Cible",
@@ -413,7 +458,5 @@ tinymce.addI18n('fr_FR',{
 "Prev": "Pr\u00e9c ",
 "Find and replace": "Trouver et remplacer",
 "Whole words": "Mots entiers",
-"Spellcheck": "V\u00e9rification orthographique",
-"Caption": "Titre",
 "Insert template": "Ajouter un th\u00e8me"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/he_IL.js b/cps/static/js/libs/tinymce/langs/he_IL.js
deleted file mode 100644
index c16c51ad6..000000000
--- a/cps/static/js/libs/tinymce/langs/he_IL.js
+++ /dev/null
@@ -1,420 +0,0 @@
-tinymce.addI18n('he_IL',{
-"Redo": "\u05d1\u05e6\u05e2 \u05e9\u05d5\u05d1",
-"Undo": "\u05d1\u05d8\u05dc",
-"Cut": "\u05d2\u05d6\u05d5\u05e8",
-"Copy": "\u05d4\u05e2\u05ea\u05e7",
-"Paste": "\u05d4\u05d3\u05d1\u05e7",
-"Select all": "\u05d1\u05d7\u05e8 \u05d4\u05db\u05dc",
-"New document": "\u05de\u05e1\u05de\u05da \u05d7\u05d3\u05e9",
-"Ok": "\u05d0\u05d9\u05e9\u05d5\u05e8",
-"Cancel": "\u05d1\u05d9\u05d8\u05d5\u05dc",
-"Visual aids": "\u05e2\u05d6\u05e8\u05d9\u05dd \u05d7\u05d6\u05d5\u05ea\u05d9\u05d9\u05dd",
-"Bold": "\u05de\u05d5\u05d3\u05d2\u05e9",
-"Italic": "\u05e0\u05d8\u05d5\u05d9",
-"Underline": "\u05e7\u05d5 \u05ea\u05d7\u05ea\u05d5\u05df",
-"Strikethrough": "\u05e7\u05d5 \u05d7\u05d5\u05e6\u05d4",
-"Superscript": "\u05db\u05ea\u05d1 \u05e2\u05d9\u05dc\u05d9",
-"Subscript": "\u05db\u05ea\u05d1 \u05ea\u05d7\u05ea\u05d9",
-"Clear formatting": "\u05e0\u05e7\u05d4 \u05e2\u05d9\u05e6\u05d5\u05d1",
-"Align left": "\u05d9\u05e9\u05e8 \u05dc\u05e9\u05de\u05d0\u05dc",
-"Align center": "\u05de\u05e8\u05db\u05d6",
-"Align right": "\u05d9\u05e9\u05e8 \u05dc\u05d9\u05de\u05d9\u05df",
-"Justify": "\u05d9\u05d9\u05e9\u05e8",
-"Bullet list": "\u05e8\u05e9\u05d9\u05de\u05ea \u05ea\u05d1\u05dc\u05d9\u05d8\u05d9\u05dd",
-"Numbered list": "\u05e8\u05e9\u05d9\u05de\u05d4 \u05de\u05de\u05d5\u05e1\u05e4\u05e8\u05ea",
-"Decrease indent": "\u05d4\u05e7\u05d8\u05df \u05d4\u05d6\u05d7\u05d4",
-"Increase indent": "\u05d4\u05d2\u05d3\u05dc \u05d4\u05d6\u05d7\u05d4",
-"Close": "\u05e1\u05d2\u05d5\u05e8",
-"Formats": "\u05e2\u05d9\u05e6\u05d5\u05d1\u05d9\u05dd",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u05d4\u05d3\u05e4\u05d3\u05e4\u05df \u05e9\u05dc\u05da \u05d0\u05d9\u05e0\u05d5 \u05de\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05e9\u05d4 \u05d9\u05e9\u05d9\u05e8\u05d4 \u05dc\u05dc\u05d5\u05d7. \u05d0\u05e0\u05d0 \u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e7\u05d9\u05e6\u05d5\u05e8\u05d9 \u05d4\u05de\u05e7\u05dc\u05d3\u05ea Ctrl+X\/C\/V \u05d1\u05de\u05e7\u05d5\u05dd.",
-"Headers": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea",
-"Header 1": "\u05db\u05d5\u05ea\u05e8\u05ea 1",
-"Header 2": "\u05db\u05d5\u05ea\u05e8\u05ea 2",
-"Header 3": "\u05db\u05d5\u05ea\u05e8\u05ea 3",
-"Header 4": "\u05db\u05d5\u05ea\u05e8\u05ea 4",
-"Header 5": "\u05db\u05d5\u05ea\u05e8\u05ea 5",
-"Header 6": "\u05db\u05d5\u05ea\u05e8\u05ea 6",
-"Headings": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea",
-"Heading 1": "\u05db\u05d5\u05ea\u05e8\u05ea 1",
-"Heading 2": "\u05db\u05d5\u05ea\u05e8\u05ea 2",
-"Heading 3": "\u05db\u05d5\u05ea\u05e8\u05ea 3",
-"Heading 4": "\u05db\u05d5\u05ea\u05e8\u05ea 4",
-"Heading 5": "\u05db\u05d5\u05ea\u05e8\u05ea 5",
-"Heading 6": "\u05db\u05d5\u05ea\u05e8\u05ea 6",
-"Preformatted": "\u05de\u05e2\u05d5\u05e6\u05d1 \u05de\u05e8\u05d0\u05e9",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u05e7\u05d5\u05d3",
-"Paragraph": "\u05e4\u05e1\u05e7\u05d4",
-"Blockquote": "Blockquote",
-"Inline": "\u05d1\u05ea\u05d5\u05da \u05e9\u05d5\u05e8\u05d4",
-"Blocks": "\u05d1\u05dc\u05d5\u05e7\u05d9\u05dd",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u05d4\u05d3\u05d1\u05e7\u05d4 \u05d1\u05de\u05e6\u05d1 \u05d8\u05e7\u05e1\u05d8 \u05e8\u05d2\u05d9\u05dc. \u05ea\u05db\u05e0\u05d9\u05dd \u05d9\u05d5\u05d3\u05d1\u05e7\u05d5 \u05de\u05e2\u05ea\u05d4 \u05db\u05d8\u05e7\u05e1\u05d8 \u05e8\u05d2\u05d9\u05dc \u05e2\u05d3 \u05e9\u05ea\u05db\u05d1\u05d4 \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05d6\u05d5.",
-"Fonts": "\u05d2\u05d5\u05e4\u05e0\u05d9\u05dd",
-"Font Sizes": "\u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05e0\u05d9\u05dd",
-"Class": "\u05de\u05d7\u05dc\u05e7\u05d4",
-"Browse for an image": "\u05d7\u05e4\u05e9 \u05ea\u05de\u05d5\u05e0\u05d4",
-"OR": "OR",
-"Drop an image here": "\u05e9\u05d7\u05e8\u05e8 \u05ea\u05de\u05d5\u05e0\u05d4 \u05db\u05d0\u05df",
-"Upload": "\u05d4\u05e2\u05dc\u05d4",
-"Block": "\u05d1\u05dc\u05d5\u05e7",
-"Align": "\u05d9\u05e9\u05e8",
-"Default": "\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc",
-"Circle": "\u05e2\u05d9\u05d2\u05d5\u05dc",
-"Disc": "\u05d7\u05d9\u05e9\u05d5\u05e7",
-"Square": "\u05e8\u05d9\u05d1\u05d5\u05e2",
-"Lower Alpha": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d0\u05e0\u05d2\u05dc\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"Lower Greek": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d9\u05d5\u05d5\u05e0\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"Lower Roman": "\u05e1\u05e4\u05e8\u05d5\u05ea \u05e8\u05d5\u05de\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"Upper Alpha": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d0\u05e0\u05d2\u05dc\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
-"Upper Roman": "\u05e1\u05e4\u05e8\u05d5\u05ea \u05e8\u05d5\u05de\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
-"Anchor...": "\u05e2\u05d5\u05d2\u05df...",
-"Name": "\u05e9\u05dd",
-"Id": "\u05de\u05d6\u05d4\u05d4",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u05d4\u05de\u05d6\u05d4\u05d4 \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05ea\u05d7\u05d9\u05dc \u05d1\u05d0\u05d5\u05ea \u05d5\u05dc\u05d0\u05d7\u05e8\u05d9\u05d4 \u05e8\u05e7 \u05d0\u05d5\u05ea\u05d9\u05d5\u05ea, \u05de\u05e1\u05e4\u05e8\u05d9\u05dd, \u05de\u05e7\u05e4\u05d9\u05dd, \u05e0\u05e7\u05d5\u05d3\u05d5\u05ea, \u05e0\u05e7\u05d5\u05d3\u05ea\u05d9\u05d9\u05dd \u05d0\u05d5 \u05e7\u05d5\u05d5\u05d9\u05dd \u05ea\u05d7\u05ea\u05d9\u05d9\u05dd.",
-"You have unsaved changes are you sure you want to navigate away?": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d5. \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05e6\u05d0\u05ea \u05de\u05d4\u05d3\u05e3?",
-"Restore last draft": "\u05e9\u05d7\u05d6\u05e8 \u05d8\u05d9\u05d5\u05d8\u05d4 \u05d0\u05d7\u05e8\u05d5\u05e0\u05d4",
-"Special character...": "\u05ea\u05d5\u05d5\u05d9\u05dd \u05de\u05d9\u05d5\u05d7\u05d3\u05d9\u05dd...",
-"Source code": "\u05e7\u05d5\u05d3 \u05de\u05e7\u05d5\u05e8",
-"Insert\/Edit code sample": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05d3\u05d5\u05d2\u05de\u05ea \u05e7\u05d5\u05d3",
-"Language": "\u05e9\u05e4\u05d4",
-"Code sample...": "\u05d3\u05d5\u05d2\u05de\u05ea \u05e7\u05d5\u05d3...",
-"Color Picker": "\u05d1\u05d5\u05e8\u05e8 \u05e6\u05d1\u05e2\u05d9\u05dd",
-"R": "\u05d0'",
-"G": "\u05d9'",
-"B": "\u05db'",
-"Left to right": "\u05de\u05e9\u05de\u05d0\u05dc \u05dc\u05d9\u05de\u05d9\u05df",
-"Right to left": "\u05de\u05d9\u05de\u05d9\u05df \u05dc\u05e9\u05de\u05d0\u05dc",
-"Emoticons...": "\u05e1\u05de\u05dc\u05d9 \u05d4\u05d1\u05e2\u05d4...",
-"Metadata and Document Properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05de\u05d8\u05d4-\u05e0\u05ea\u05d5\u05e0\u05d9\u05dd \u05d5\u05de\u05e1\u05de\u05da",
-"Title": "\u05db\u05d5\u05ea\u05e8\u05ea",
-"Keywords": "\u05de\u05d9\u05dc\u05d5\u05ea \u05de\u05e4\u05ea\u05d7",
-"Description": "\u05ea\u05d9\u05d0\u05d5\u05e8",
-"Robots": "\u05e8\u05d5\u05d1\u05d5\u05d8\u05d9\u05dd",
-"Author": "\u05de\u05d7\u05d1\u05e8",
-"Encoding": "\u05e7\u05d9\u05d3\u05d5\u05d3",
-"Fullscreen": "\u05de\u05e1\u05da \u05de\u05dc\u05d0",
-"Action": "\u05e4\u05e2\u05d5\u05dc\u05d4",
-"Shortcut": "\u05e7\u05d9\u05e6\u05d5\u05e8",
-"Help": "\u05e2\u05d6\u05e8\u05d4",
-"Address": "\u05db\u05ea\u05d5\u05d1\u05ea",
-"Focus to menubar": "\u05d4\u05e2\u05d1\u05e8 \u05de\u05d9\u05e7\u05d5\u05d3 \u05dc\u05e1\u05e8\u05d2\u05dc \u05d4\u05ea\u05e4\u05e8\u05d8\u05d9\u05dd",
-"Focus to toolbar": "\u05d4\u05e2\u05d1\u05e8 \u05de\u05d9\u05e7\u05d5\u05d3 \u05dc\u05e1\u05e8\u05d2\u05dc \u05d4\u05db\u05dc\u05d9\u05dd",
-"Focus to element path": "\u05e2\u05d1\u05e8 \u05de\u05d9\u05e7\u05d5\u05d3 \u05dc\u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05e4\u05e8\u05d9\u05d8",
-"Focus to contextual toolbar": "\u05d4\u05e2\u05d1\u05e8 \u05de\u05d9\u05e7\u05d5\u05d3 \u05dc\u05e1\u05e8\u05d2\u05dc \u05ea\u05d5\u05db\u05df",
-"Insert link (if link plugin activated)": "\u05d4\u05db\u05e0\u05e1 \u05e7\u05d9\u05e9\u05d5\u05e8 (\u05d0\u05dd \u05ea\u05d5\u05e1\u05e3 \"\u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd\" \u05e4\u05e2\u05d9\u05dc)",
-"Save (if save plugin activated)": "\u05e9\u05de\u05d5\u05e8 (\u05d0\u05dd \u05ea\u05d5\u05e1\u05e3 \"\u05e9\u05de\u05d9\u05e8\u05d4\" \u05e4\u05e2\u05d9\u05dc)",
-"Find (if searchreplace plugin activated)": "\u05d7\u05e4\u05e9 (\u05d0\u05dd \u05ea\u05d5\u05e1\u05e3 \"\u05d7\u05e4\u05e9 \u05d5\u05d4\u05d7\u05dc\u05e3\" \u05e4\u05e2\u05d9\u05dc)",
-"Plugins installed ({0}):": "\u05ea\u05d5\u05e1\u05e4\u05d9\u05dd \u05de\u05d5\u05ea\u05e7\u05e0\u05d9\u05dd ({0}):",
-"Premium plugins:": "\u05ea\u05d5\u05e1\u05e4\u05d9\u05dd \u05d1\u05ea\u05e9\u05dc\u05d5\u05dd:",
-"Learn more...": "\u05dc\u05de\u05d3 \u05e2\u05d5\u05d3...",
-"You are using {0}": "\u05d0\u05ea\\\u05d4 \u05de\u05e9\u05ea\u05de\u05e9\\\u05ea {0}",
-"Plugins": "\u05ea\u05d5\u05e1\u05e4\u05d9\u05dd",
-"Handy Shortcuts": "\u05e7\u05d9\u05e6\u05d5\u05e8\u05d9\u05dd \u05e9\u05d9\u05de\u05d5\u05e9\u05d9\u05d9\u05dd",
-"Horizontal line": "\u05e7\u05d5 \u05d0\u05d5\u05e4\u05e7\u05d9",
-"Insert\/edit image": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05ea\u05de\u05d5\u05e0\u05d4",
-"Image description": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05ea\u05de\u05d5\u05e0\u05d4",
-"Source": "\u05de\u05e7\u05d5\u05e8",
-"Dimensions": "\u05de\u05d9\u05de\u05d3\u05d9\u05dd",
-"Constrain proportions": "\u05d4\u05d2\u05d1\u05dc\u05ea \u05e4\u05e8\u05d5\u05e4\u05d5\u05e8\u05e6\u05d9\u05d5\u05ea",
-"General": "\u05db\u05dc\u05dc\u05d9",
-"Advanced": "\u05de\u05ea\u05e7\u05d3\u05dd",
-"Style": "\u05e1\u05d2\u05e0\u05d5\u05df",
-"Vertical space": "\u05de\u05e8\u05d5\u05d5\u05d7 \u05d0\u05e0\u05db\u05d9",
-"Horizontal space": "\u05de\u05e8\u05d5\u05d5\u05d7 \u05d0\u05d5\u05e4\u05e7\u05d9",
-"Border": "\u05de\u05e1\u05d2\u05e8\u05ea",
-"Insert image": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05de\u05d5\u05e0\u05d4",
-"Image...": "\u05ea\u05de\u05d5\u05e0\u05d4...",
-"Image list": "\u05e8\u05e9\u05d9\u05de\u05ea \u05ea\u05de\u05d5\u05e0\u05d5\u05ea",
-"Rotate counterclockwise": "\u05e1\u05d5\u05d1\u05d1 \u05d1\u05db\u05d9\u05d5\u05d5\u05df \u05d4\u05e4\u05d5\u05da \u05dc\u05e9\u05e2\u05d5\u05df",
-"Rotate clockwise": "\u05e1\u05d5\u05d1\u05d1 \u05d1\u05db\u05d9\u05d5\u05d5\u05df \u05d4\u05e9\u05e2\u05d5\u05df",
-"Flip vertically": "\u05d4\u05e4\u05d5\u05da \u05d0\u05e0\u05db\u05d9\u05ea",
-"Flip horizontally": "\u05d4\u05e4\u05d5\u05da \u05d0\u05d5\u05e4\u05e7\u05d9\u05ea",
-"Edit image": "\u05e2\u05e8\u05d5\u05da \u05ea\u05de\u05d5\u05e0\u05d4",
-"Image options": "\u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea \u05ea\u05de\u05d5\u05e0\u05d4",
-"Zoom in": "\u05d4\u05d2\u05d3\u05dc \u05ea\u05e6\u05d5\u05d2\u05d4",
-"Zoom out": "\u05d4\u05e7\u05d8\u05df \u05ea\u05e6\u05d5\u05d2\u05d4",
-"Crop": "\u05e7\u05e6\u05e5",
-"Resize": "\u05e9\u05e0\u05d4 \u05d2\u05d5\u05d3\u05dc",
-"Orientation": "\u05db\u05d9\u05d5\u05d5\u05df \u05dc\u05d0\u05d5\u05e8\u05da \/ \u05dc\u05e8\u05d5\u05d7\u05d1",
-"Brightness": "\u05d1\u05d4\u05d9\u05e8\u05d5\u05ea",
-"Sharpen": "\u05d7\u05d3\u05d3",
-"Contrast": "\u05e0\u05d9\u05d2\u05d5\u05d3\u05d9\u05d5\u05ea",
-"Color levels": "\u05e8\u05de\u05d5\u05ea \u05e6\u05d1\u05e2\u05d9\u05dd",
-"Gamma": "\u05d2\u05d0\u05de\u05d4",
-"Invert": "\u05d4\u05d9\u05e4\u05d5\u05da \u05e6\u05d1\u05e2\u05d9\u05dd",
-"Apply": "\u05d9\u05d9\u05e9\u05dd",
-"Back": "\u05d7\u05d6\u05d5\u05e8",
-"Insert date\/time": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05d0\u05e8\u05d9\u05da\/\u05e9\u05e2\u05d4",
-"Date\/time": "\u05ea\u05d0\u05e8\u05d9\u05da\/\u05e9\u05e2\u05d4",
-"Insert\/Edit Link": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Insert\/edit link": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Text to display": "\u05d8\u05e7\u05e1\u05d8 \u05dc\u05d4\u05e6\u05d2\u05d4",
-"Url": "\u05db\u05ea\u05d5\u05d1\u05ea \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Open link in...": "\u05e4\u05ea\u05d7 \u05e7\u05d9\u05e9\u05d5\u05e8 \u05d1...",
-"Current window": "\u05d7\u05dc\u05d5\u05df \u05e0\u05d5\u05db\u05d7\u05d9",
-"None": "\u05dc\u05dc\u05d0",
-"New window": "\u05d7\u05dc\u05d5\u05df \u05d7\u05d3\u05e9",
-"Remove link": "\u05de\u05d7\u05e7 \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Anchors": "\u05e2\u05d5\u05d2\u05e0\u05d9\u05dd",
-"Link...": "\u05e7\u05d9\u05e9\u05d5\u05e8...",
-"Paste or type a link": "\u05d4\u05d3\u05d1\u05e7 \u05d0\u05d5 \u05d4\u05e7\u05dc\u05d3 \u05e7\u05d9\u05e9\u05d5\u05e8",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u05e0\u05e8\u05d0\u05d4 \u05e9\u05d4\u05db\u05ea\u05d5\u05d1\u05ea \u05e9\u05d4\u05db\u05e0\u05e1\u05ea \u05d4\u05d9\u05d0 \u05db\u05ea\u05d5\u05d1\u05ea \u05d0\u05d9\u05de\u05d9\u05d9\u05dc. \u05d4\u05d0\u05dd \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d0\u05ea \u05d4\u05e7\u05d9\u05d3\u05d5\u05de\u05ea :mailto?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u05e0\u05e8\u05d0\u05d4 \u05e9\u05d4\u05db\u05ea\u05d5\u05d1\u05ea \u05e9\u05d4\u05db\u05e0\u05e1\u05ea \u05d4\u05d9\u05d0 \u05e7\u05d9\u05e9\u05d5\u05e8 \u05d7\u05d9\u05e6\u05d5\u05e0\u05d9 \u05d4\u05d0\u05dd \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05e7\u05d9\u05d3\u05d5\u05de\u05ea http:\/\/?",
-"Link list": "\u05e8\u05e9\u05d9\u05de\u05ea \u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd",
-"Insert video": "\u05d4\u05db\u05e0\u05e1 \u05e1\u05e8\u05d8\u05d5\u05df",
-"Insert\/edit video": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05e1\u05e8\u05d8\u05d5\u05df",
-"Insert\/edit media": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05de\u05d3\u05d9\u05d4",
-"Alternative source": "\u05de\u05e7\u05d5\u05e8 \u05de\u05e9\u05e0\u05d9",
-"Alternative source URL": "\u05db\u05ea\u05d5\u05d1\u05ea URL \u05dc\u05de\u05e7\u05d5\u05e8 \u05d7\u05dc\u05d5\u05e4\u05d9",
-"Media poster (Image URL)": "\u05e4\u05d5\u05e1\u05d8\u05e8 \u05de\u05d3\u05d9\u05d4 (\u05db\u05ea\u05d5\u05d1\u05ea URL \u05dc\u05ea\u05de\u05d5\u05e0\u05d4)",
-"Paste your embed code below:": "\u05d4\u05d3\u05d1\u05e7 \u05e7\u05d5\u05d3 \u05d4\u05d8\u05de\u05e2\u05d4 \u05de\u05ea\u05d7\u05ea:",
-"Embed": "\u05d4\u05d8\u05de\u05e2",
-"Media...": "\u05de\u05d3\u05d9\u05d4...",
-"Nonbreaking space": "\u05e8\u05d5\u05d5\u05d7 (\u05dc\u05dc\u05d0 \u05e9\u05d1\u05d9\u05e8\u05ea \u05e9\u05d5\u05e8\u05d4)",
-"Page break": "\u05d3\u05e3 \u05d7\u05d3\u05e9",
-"Paste as text": "\u05d4\u05d3\u05d1\u05e7 \u05db\u05d8\u05e7\u05e1\u05d8",
-"Preview": "\u05ea\u05e6\u05d5\u05d2\u05d4 \u05de\u05e7\u05d3\u05d9\u05de\u05d4",
-"Print...": "\u05d4\u05d3\u05e4\u05e1...",
-"Save": "\u05e9\u05de\u05d9\u05e8\u05d4",
-"Find": "\u05d7\u05e4\u05e9",
-"Replace with": "\u05d4\u05d7\u05dc\u05e3 \u05d1",
-"Replace": "\u05d4\u05d7\u05dc\u05e3",
-"Replace all": "\u05d4\u05d7\u05dc\u05e3 \u05d4\u05db\u05dc",
-"Previous": "\u05d4\u05e7\u05d5\u05d3\u05dd",
-"Next": "\u05d4\u05d1\u05d0",
-"Find and replace...": "\u05d7\u05d9\u05e4\u05d5\u05e9 \u05d5\u05d4\u05d7\u05dc\u05e4\u05d4...",
-"Could not find the specified string.": "\u05de\u05d7\u05e8\u05d5\u05d6\u05ea \u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d4",
-"Match case": "\u05d4\u05d1\u05d7\u05df \u05d1\u05d9\u05df \u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea \u05dc\u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
-"Find whole words only": "\u05d7\u05e4\u05e9 \u05de\u05d9\u05dc\u05d9\u05dd \u05e9\u05dc\u05de\u05d5\u05ea \u05d1\u05dc\u05d1\u05d3",
-"Spell check": "\u05d1\u05d3\u05d9\u05e7\u05ea \u05d0\u05d9\u05d5\u05ea",
-"Ignore": "\u05d4\u05ea\u05e2\u05dc\u05dd",
-"Ignore all": "\u05d4\u05ea\u05e2\u05dc\u05dd \u05de\u05d4\u05db\u05dc",
-"Finish": "\u05e1\u05d9\u05d9\u05dd",
-"Add to Dictionary": "\u05d4\u05d5\u05e1\u05e3 \u05dc\u05de\u05d9\u05dc\u05d5\u05df",
-"Insert table": "\u05d4\u05db\u05e0\u05e1 \u05d8\u05d1\u05dc\u05d4",
-"Table properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05d8\u05d1\u05dc\u05d4",
-"Delete table": "\u05de\u05d7\u05e7 \u05d8\u05d1\u05dc\u05d4",
-"Cell": "\u05ea\u05d0",
-"Row": "\u05e9\u05d5\u05e8\u05d4",
-"Column": "\u05e2\u05de\u05d5\u05d3\u05d4",
-"Cell properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05ea\u05d0",
-"Merge cells": "\u05de\u05d6\u05d2 \u05ea\u05d0\u05d9\u05dd",
-"Split cell": "\u05e4\u05e6\u05dc \u05ea\u05d0",
-"Insert row before": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05d5\u05e8\u05d4 \u05dc\u05e4\u05e0\u05d9",
-"Insert row after": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05d5\u05e8\u05d4 \u05d0\u05d7\u05e8\u05d9",
-"Delete row": "\u05de\u05d7\u05e7 \u05e9\u05d5\u05e8\u05d4",
-"Row properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05e9\u05d5\u05e8\u05d4",
-"Cut row": "\u05d2\u05d6\u05d5\u05e8 \u05e9\u05d5\u05e8\u05d4",
-"Copy row": "\u05d4\u05e2\u05ea\u05e7 \u05e9\u05d5\u05e8\u05d4",
-"Paste row before": "\u05d4\u05d3\u05d1\u05e7 \u05e9\u05d5\u05e8\u05d4 \u05dc\u05e4\u05e0\u05d9",
-"Paste row after": "\u05d4\u05e2\u05ea\u05e7 \u05e9\u05d5\u05e8\u05d4 \u05d0\u05d7\u05e8\u05d9",
-"Insert column before": "\u05d4\u05e2\u05ea\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4 \u05dc\u05e4\u05e0\u05d9",
-"Insert column after": "\u05d4\u05e2\u05ea\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4 \u05d0\u05d7\u05e8\u05d9",
-"Delete column": "\u05de\u05d7\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4",
-"Cols": "\u05e2\u05de\u05d5\u05d3\u05d5\u05ea",
-"Rows": "\u05e9\u05d5\u05e8\u05d5\u05ea",
-"Width": "\u05e8\u05d5\u05d7\u05d1",
-"Height": "\u05d2\u05d5\u05d1\u05d4",
-"Cell spacing": "\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05d7\u05d9\u05e6\u05d5\u05e0\u05d9\u05dd \u05dc\u05ea\u05d0",
-"Cell padding": "\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05e4\u05e0\u05d9\u05de\u05d9\u05d9\u05dd \u05dc\u05ea\u05d0",
-"Show caption": "\u05d4\u05e6\u05d2 \u05db\u05ea\u05d5\u05d1\u05d9\u05ea",
-"Left": "\u05e9\u05de\u05d0\u05dc",
-"Center": "\u05de\u05e8\u05db\u05d6",
-"Right": "\u05d9\u05de\u05d9\u05df",
-"Cell type": "\u05e1\u05d5\u05d2 \u05ea\u05d0",
-"Scope": "\u05d4\u05d9\u05e7\u05e3",
-"Alignment": "\u05d9\u05d9\u05e9\u05d5\u05e8",
-"H Align": "\u05d9\u05d9\u05e9\u05d5\u05e8 \u05d0\u05d5\u05e4\u05e7\u05d9",
-"V Align": "\u05d9\u05d9\u05e9\u05d5\u05e8 \u05d0\u05e0\u05db\u05d9",
-"Top": "\u05e2\u05dc\u05d9\u05d5\u05df",
-"Middle": "\u05d0\u05de\u05e6\u05e2",
-"Bottom": "\u05ea\u05d7\u05ea\u05d9\u05ea",
-"Header cell": "\u05db\u05d5\u05ea\u05e8\u05ea \u05dc\u05ea\u05d0",
-"Row group": "\u05e7\u05d9\u05d1\u05d5\u05e5 \u05e9\u05d5\u05e8\u05d5\u05ea",
-"Column group": "\u05e7\u05d9\u05d1\u05d5\u05e5 \u05e2\u05de\u05d5\u05d3\u05d5\u05ea",
-"Row type": "\u05e1\u05d5\u05d2 \u05e9\u05d5\u05e8\u05d4",
-"Header": "\u05db\u05d5\u05ea\u05e8\u05ea",
-"Body": "\u05d2\u05d5\u05e3 \u05d4\u05d8\u05d1\u05dc\u05d0",
-"Footer": "\u05db\u05d5\u05ea\u05e8\u05ea \u05ea\u05d7\u05ea\u05d5\u05e0\u05d4",
-"Border color": "\u05e6\u05d1\u05e2 \u05d2\u05d1\u05d5\u05dc",
-"Insert template...": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05d1\u05e0\u05d9\u05ea...",
-"Templates": "\u05ea\u05d1\u05e0\u05d9\u05d5\u05ea",
-"Template": "\u05ea\u05d1\u05e0\u05d9\u05ea",
-"Text color": "\u05e6\u05d1\u05e2 \u05d4\u05db\u05ea\u05d1",
-"Background color": "\u05e6\u05d1\u05e2 \u05e8\u05e7\u05e2",
-"Custom...": "\u05de\u05d5\u05ea\u05d0\u05dd \u05d0\u05d9\u05e9\u05d9\u05ea...",
-"Custom color": "\u05e6\u05d1\u05e2 \u05de\u05d5\u05ea\u05d0\u05dd \u05d0\u05d9\u05e9\u05d9\u05ea",
-"No color": "\u05dc\u05dc\u05d0 \u05e6\u05d1\u05e2",
-"Remove color": "\u05d4\u05e1\u05e8 \u05e6\u05d1\u05e2",
-"Table of Contents": "\u05ea\u05d5\u05db\u05df \u05e2\u05e0\u05d9\u05d9\u05e0\u05d9\u05dd",
-"Show blocks": "\u05d4\u05e6\u05d2 \u05ea\u05d9\u05d1\u05d5\u05ea",
-"Show invisible characters": "\u05d4\u05e6\u05d2 \u05ea\u05d5\u05d5\u05d9\u05dd \u05dc\u05d0 \u05e0\u05e8\u05d0\u05d9\u05dd",
-"Word count": "\u05e1\u05e4\u05d9\u05e8\u05ea \u05de\u05d9\u05dc\u05d9\u05dd",
-"Count": "\u05e1\u05e4\u05d9\u05e8\u05d4",
-"Document": "\u05de\u05e1\u05de\u05da",
-"Selection": "\u05d1\u05d7\u05d9\u05e8\u05d4",
-"Words": "\u05de\u05d9\u05dc\u05d9\u05dd",
-"Words: {0}": "\u05de\u05d9\u05dc\u05d9\u05dd: {0}",
-"{0} words": "{0} \u05de\u05d9\u05dc\u05d9\u05dd",
-"File": "\u05e7\u05d5\u05d1\u05e5",
-"Edit": "\u05e2\u05e8\u05d9\u05db\u05d4",
-"Insert": "\u05d4\u05d5\u05e1\u05e4\u05d4",
-"View": "\u05ea\u05e6\u05d5\u05d2\u05d4",
-"Format": "\u05e4\u05d5\u05e8\u05de\u05d8",
-"Table": "\u05d8\u05d1\u05dc\u05d4",
-"Tools": "\u05db\u05dc\u05d9\u05dd",
-"Powered by {0}": "\u05de\u05d5\u05e4\u05e2\u05dc \u05e2\"\u05d9 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u05ea\u05d9\u05d1\u05ea \u05e2\u05e8\u05d9\u05db\u05d4 \u05d7\u05db\u05de\u05d4. \u05dc\u05d7\u05e5 Alt-F9 \u05dc\u05ea\u05e4\u05e8\u05d9\u05d8. Alt-F10 \u05dc\u05ea\u05e6\u05d5\u05d2\u05ea \u05db\u05e4\u05ea\u05d5\u05e8\u05d9\u05dd, Alt-0 \u05dc\u05e2\u05d6\u05e8\u05d4",
-"Image title": "\u05db\u05d5\u05ea\u05e8\u05ea \u05ea\u05de\u05d5\u05e0\u05d4",
-"Border width": "\u05e8\u05d5\u05d7\u05d1 \u05d2\u05d1\u05d5\u05dc",
-"Border style": "\u05e1\u05d2\u05e0\u05d5\u05df \u05d2\u05d1\u05d5\u05dc",
-"Error": "\u05e9\u05d2\u05d9\u05d0\u05d4",
-"Warn": "\u05d0\u05d6\u05d4\u05e8\u05d4",
-"Valid": "\u05d7\u05d5\u05e7\u05d9",
-"To open the popup, press Shift+Enter": "\u05db\u05d3\u05d9 \u05dc\u05e4\u05ea\u05d5\u05d7 \u05d0\u05ea \u05d4\u05e4\u05e8\u05d9\u05d8 \u05d4\u05de\u05d5\u05e7\u05e4\u05e5, \u05d4\u05e7\u05e9 \u05e2\u05dc Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "\u05d0\u05d6\u05d5\u05e8 \u05d8\u05e7\u05e1\u05d8 \u05e2\u05e9\u05d9\u05e8. \u05d4\u05e7\u05e9 \u05e2\u05dc ALT-0 \u05dc\u05e2\u05d6\u05e8\u05d4.",
-"System Font": "\u05d2\u05d5\u05e4\u05df \u05de\u05e2\u05e8\u05db\u05ea",
-"Failed to upload image: {0}": "\u05db\u05e9\u05dc \u05d1\u05d4\u05e2\u05dc\u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05d4: {0}",
-"Failed to load plugin: {0} from url {1}": "\u05db\u05e9\u05dc \u05d1\u05d8\u05e2\u05d9\u05e0\u05ea \u05d9\u05d9\u05e9\u05d5\u05dd Plugin: {0} \u05de\u05db\u05ea\u05d5\u05d1\u05ea URL\u200f {1}",
-"Failed to load plugin url: {0}": "\u05db\u05e9\u05dc \u05d1\u05d8\u05e2\u05d9\u05e0\u05ea \u05db\u05ea\u05d5\u05d1\u05ea URL \u05e9\u05dc \u05d9\u05d9\u05e9\u05d5\u05dd Plugin\u200f: {0}",
-"Failed to initialize plugin: {0}": "\u05db\u05e9\u05dc \u05d1\u05d0\u05ea\u05d7\u05d5\u05dc \u05d9\u05d9\u05e9\u05d5\u05dd Plugin\u200f: {0}",
-"example": "\u05d3\u05d5\u05d2\u05de\u05d4",
-"Search": "\u05d7\u05e4\u05e9",
-"All": "\u05d4\u05db\u05dc",
-"Currency": "\u05de\u05d8\u05d1\u05e2",
-"Text": "\u05d8\u05e7\u05e1\u05d8",
-"Quotations": "\u05e9\u05d0\u05dc\u05d5\u05ea",
-"Mathematical": "\u05de\u05ea\u05de\u05d8\u05d9",
-"Extended Latin": "\u05dc\u05d8\u05d9\u05e0\u05d9\u05ea \u05de\u05d5\u05e8\u05d7\u05d1\u05ea",
-"Symbols": "\u05e1\u05de\u05dc\u05d9\u05dd",
-"Arrows": "\u05d7\u05d9\u05e6\u05d9\u05dd",
-"User Defined": "\u05de\u05d5\u05d2\u05d3\u05e8 \u05e2\u05dc-\u05d9\u05d3\u05d9 \u05d4\u05de\u05e9\u05ea\u05de\u05e9",
-"dollar sign": "\u05e1\u05d9\u05de\u05df \u05d3\u05d5\u05dc\u05e8",
-"currency sign": "\u05e1\u05d9\u05de\u05df \u05de\u05d8\u05d1\u05e2",
-"euro-currency sign": "\u05e1\u05d9\u05de\u05df \u05de\u05d8\u05d1\u05e2 \u05d0\u05d9\u05e8\u05d5",
-"colon sign": "\u05e1\u05d9\u05de\u05df \u05e7\u05d5\u05dc\u05d5\u05df",
-"cruzeiro sign": "\u05e1\u05d9\u05de\u05df \u05e7\u05e8\u05d5\u05d6\u05e8\u05d5",
-"french franc sign": "\u05e1\u05d9\u05de\u05df \u05e4\u05e8\u05e0\u05e7 \u05e6\u05e8\u05e4\u05ea\u05d9",
-"lira sign": "\u05e1\u05d9\u05de\u05df \u05dc\u05d9\u05e8\u05d4",
-"mill sign": "\u05e1\u05d9\u05de\u05df \u05de\u05d9\u05dc",
-"naira sign": "\u05e1\u05d9\u05de\u05df \u05e0\u05d0\u05d9\u05e8\u05d4",
-"peseta sign": "\u05e1\u05d9\u05de\u05df \u05e4\u05d6\u05d8\u05d4",
-"rupee sign": "\u05e1\u05d9\u05de\u05df \u05e8\u05d5\u05e4\u05d9",
-"won sign": "\u05e1\u05d9\u05de\u05df \u05d5\u05d5\u05df",
-"new sheqel sign": "\u05e1\u05d9\u05de\u05df \u05e9\u05e7\u05dc \u05d7\u05d3\u05e9",
-"dong sign": "\u05e1\u05d9\u05de\u05df \u05d3\u05d5\u05e0\u05d2",
-"kip sign": "\u05e1\u05d9\u05de\u05df \u05e7\u05d9\u05e4",
-"tugrik sign": "\u05e1\u05d9\u05de\u05df \u05d8\u05d5\u05d2\u05e8\u05d9\u05e7",
-"drachma sign": "\u05e1\u05d9\u05de\u05df \u05d3\u05e8\u05db\u05de\u05d4",
-"german penny symbol": "\u05e1\u05de\u05dc \u05e4\u05e0\u05d9 \u05d2\u05e8\u05de\u05e0\u05d9",
-"peso sign": "\u05e1\u05d9\u05de\u05df \u05e4\u05d6\u05d5",
-"guarani sign": "\u05e1\u05d9\u05de\u05df \u05d2\u05d5\u05d0\u05e8\u05e0\u05d9\u05ea",
-"austral sign": "\u05e1\u05d9\u05de\u05df \u05d0\u05d5\u05e1\u05d8\u05e8\u05dc",
-"hryvnia sign": "\u05e1\u05d9\u05de\u05df \u05e8\u05d9\u05d1\u05e0\u05d9\u05d4",
-"cedi sign": "\u05e1\u05d9\u05de\u05df \u05e1\u05d3\u05d9",
-"livre tournois sign": "\u05e1\u05d9\u05de\u05df \u05dc\u05d1\u05e8\u05d4 \u05d8\u05d5\u05e8\u05e0\u05d5",
-"spesmilo sign": "\u05e1\u05d9\u05de\u05df \u05e1\u05e4\u05e1\u05de\u05d9\u05dc\u05d5",
-"tenge sign": "\u05e1\u05d9\u05de\u05df \u05d8\u05e0\u05d2\u05d4",
-"indian rupee sign": "\u05e1\u05d9\u05de\u05df \u05e8\u05d5\u05e4\u05d9 \u05d4\u05d5\u05d3\u05d9",
-"turkish lira sign": "\u05e1\u05d9\u05de\u05df \u05dc\u05d9\u05e8\u05d4 \u05d8\u05d5\u05e8\u05e7\u05d9\u05ea",
-"nordic mark sign": "\u05e1\u05d9\u05de\u05df \u05de\u05d0\u05e8\u05e7 \u05e1\u05e7\u05e0\u05d3\u05d9\u05e0\u05d1\u05d9",
-"manat sign": "\u05e1\u05d9\u05de\u05df \u05de\u05d0\u05e0\u05d0\u05d8",
-"ruble sign": "\u05e1\u05d9\u05de\u05df \u05e8\u05d5\u05d1\u05dc",
-"yen character": "\u05ea\u05d5 \u05d9\u05df",
-"yuan character": "\u05ea\u05d5 \u05d9\u05d5\u05d0\u05df",
-"yuan character, in hong kong and taiwan": "\u05ea\u05d5 \u05d9\u05d5\u05d0\u05df, \u05d1\u05d4\u05d5\u05e0\u05d2 \u05e7\u05d5\u05e0\u05d2 \u05d5\u05d1\u05d8\u05d9\u05d9\u05d5\u05d5\u05d0\u05df",
-"yen\/yuan character variant one": "\u05de\u05e9\u05ea\u05e0\u05d4 \u05d0\u05d7\u05d3 \u05e9\u05dc \u05ea\u05d5 \u05d9\u05d5\u05d0\u05df\/\u05d9\u05df",
-"Loading emoticons...": "\u05d8\u05d5\u05e2\u05df \u05e1\u05de\u05dc\u05d9 \u05d4\u05d1\u05e2\u05d4...",
-"Could not load emoticons": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05d4\u05d9\u05d4 \u05dc\u05d8\u05e2\u05d5\u05df \u05e1\u05de\u05dc\u05d9 \u05d4\u05d1\u05e2\u05d4",
-"People": "\u05d0\u05e0\u05e9\u05d9\u05dd",
-"Animals and Nature": "\u05d1\u05e2\u05dc\u05d9-\u05d7\u05d9\u05d9\u05dd \u05d5\u05d8\u05d1\u05e2",
-"Food and Drink": "\u05d0\u05d5\u05db\u05dc \u05d5\u05e9\u05ea\u05d9\u05d9\u05d4",
-"Activity": "\u05e4\u05e2\u05d9\u05dc\u05d5\u05ea",
-"Travel and Places": "\u05e0\u05e1\u05d9\u05e2\u05d4 \u05d5\u05de\u05e7\u05d5\u05de\u05d5\u05ea",
-"Objects": "\u05d0\u05d5\u05d1\u05d9\u05d9\u05e7\u05d8\u05d9\u05dd",
-"Flags": "\u05d3\u05d2\u05dc\u05d9\u05dd",
-"Characters": "\u05ea\u05d5\u05d5\u05d9\u05dd",
-"Characters (no spaces)": "\u05ea\u05d5\u05d5\u05d9\u05dd (\u05dc\u05dc\u05d0 \u05e8\u05d5\u05d5\u05d7\u05d9\u05dd)",
-"{0} characters": "{0} \u05ea\u05d5\u05d5\u05d9\u05dd",
-"Error: Form submit field collision.": "\u05e9\u05d2\u05d9\u05d0\u05d4: \u05d4\u05ea\u05e0\u05d2\u05e9\u05d5\u05ea \u05d1\u05e9\u05d3\u05d4 \u05e9\u05dc\u05d9\u05d7\u05ea \u05d8\u05d5\u05e4\u05e1.",
-"Error: No form element found.": "\u05e9\u05d2\u05d9\u05d0\u05d4: \u05dc\u05d0 \u05e0\u05de\u05e6\u05d0 \u05e8\u05db\u05d9\u05d1 \u05d8\u05d5\u05e4\u05e1.",
-"Update": "\u05e2\u05d3\u05db\u05df",
-"Color swatch": "\u05d3\u05d5\u05d2\u05de\u05d0\u05d5\u05ea \u05e6\u05d1\u05e2",
-"Turquoise": "\u05d8\u05d5\u05e8\u05e7\u05d9\u05d6",
-"Green": "\u05d9\u05e8\u05d5\u05e7",
-"Blue": "\u05db\u05d7\u05d5\u05dc",
-"Purple": "\u05e1\u05d2\u05d5\u05dc",
-"Navy Blue": "\u05db\u05d7\u05d5\u05dc \u05e6\u05d9",
-"Dark Turquoise": "\u05d8\u05d5\u05e8\u05e7\u05d9\u05d6 \u05db\u05d4\u05d4",
-"Dark Green": "\u05d9\u05e8\u05d5\u05e7 \u05db\u05d4\u05d4",
-"Medium Blue": "\u05db\u05d7\u05d5\u05dc \u05d1\u05d9\u05e0\u05d5\u05e0\u05d9",
-"Medium Purple": "\u05e1\u05d2\u05d5\u05dc \u05d1\u05d9\u05e0\u05d5\u05e0\u05d9",
-"Midnight Blue": "\u05db\u05d7\u05d5\u05dc \u05d7\u05e6\u05d5\u05ea",
-"Yellow": "\u05e6\u05d4\u05d5\u05d1",
-"Orange": "\u05db\u05ea\u05d5\u05dd",
-"Red": "\u05d0\u05d3\u05d5\u05dd",
-"Light Gray": "\u05d0\u05e4\u05d5\u05e8 \u05d1\u05d4\u05d9\u05e8",
-"Gray": "\u05d0\u05e4\u05d5\u05e8",
-"Dark Yellow": "\u05e6\u05d4\u05d5\u05d1 \u05db\u05d4\u05d4",
-"Dark Orange": "\u05db\u05ea\u05d5\u05dd \u05db\u05d4\u05d4",
-"Dark Red": "\u05d0\u05d3\u05d5\u05dd \u05db\u05d4\u05d4",
-"Medium Gray": "\u05d0\u05e4\u05d5\u05e8 \u05d1\u05d9\u05e0\u05d5\u05e0\u05d9",
-"Dark Gray": "\u05d0\u05e4\u05d5\u05e8 \u05db\u05d4\u05d4",
-"Light Green": "\u05d9\u05e8\u05d5\u05e7 \u05d1\u05d4\u05d9\u05e8",
-"Light Yellow": "\u05e6\u05d4\u05d5\u05d1 \u05d1\u05d4\u05d9\u05e8",
-"Light Red": "\u05d0\u05d3\u05d5\u05dd \u05d1\u05d4\u05d9\u05e8",
-"Light Purple": "\u05e1\u05d2\u05d5\u05dc \u05d1\u05d4\u05d9\u05e8",
-"Light Blue": "\u05db\u05d7\u05d5\u05dc \u05d1\u05d4\u05d9\u05e8",
-"Dark Purple": "\u05e1\u05d2\u05d5\u05dc \u05db\u05d4\u05d4",
-"Dark Blue": "\u05db\u05d7\u05d5\u05dc \u05db\u05d4\u05d4",
-"Black": "\u05e9\u05d7\u05d5\u05e8",
-"White": "\u05dc\u05d1\u05df",
-"Switch to or from fullscreen mode": "\u05d4\u05d7\u05dc\u05e3 \u05dc\u05de\u05e6\u05d1 \u05de\u05e1\u05da \u05de\u05dc\u05d0 \u05d0\u05d5 \u05e6\u05d0 \u05de\u05de\u05e0\u05d5",
-"Open help dialog": "\u05e4\u05ea\u05d7 \u05ea\u05d9\u05d1\u05ea \u05d3\u05d5-\u05e9\u05d9\u05d7 \u05e9\u05dc \u05e2\u05d6\u05e8\u05d4",
-"history": "\u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05d4",
-"styles": "\u05e1\u05d2\u05e0\u05d5\u05e0\u05d5\u05ea",
-"formatting": "\u05e2\u05d9\u05e6\u05d5\u05d1",
-"alignment": "\u05d9\u05d9\u05e9\u05d5\u05e8",
-"indentation": "\u05d4\u05d6\u05d7\u05d4",
-"permanent pen": "\u05e2\u05d8 \u05e7\u05d1\u05d5\u05e2",
-"comments": "\u05d4\u05e2\u05e8\u05d5\u05ea",
-"Format Painter": "\u05e6\u05d9\u05d9\u05e8 \u05e2\u05d9\u05e6\u05d5\u05d1",
-"Insert\/edit iframe": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05d7\u05dc\u05d5\u05df \u05de\u05e1\u05d2\u05e8\u05ea",
-"Capitalization": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05e8\u05d9\u05e9\u05d9\u05d5\u05ea",
-"lowercase": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"UPPERCASE": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05e8\u05d9\u05e9\u05d9\u05d5\u05ea",
-"Title Case": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05db\u05d5\u05ea\u05e8\u05ea",
-"Permanent Pen Properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05e2\u05d8 \u05e7\u05d1\u05d5\u05e2\u05d9\u05dd",
-"Permanent pen properties...": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05e2\u05d8 \u05e7\u05d1\u05d5\u05e2\u05d9\u05dd...",
-"Font": "\u05d2\u05d5\u05e4\u05df",
-"Size": "\u05d2\u05d5\u05d3\u05dc",
-"More...": "\u05e2\u05d5\u05d3...",
-"Spellcheck Language": "\u05e9\u05e4\u05ea \u05d1\u05d3\u05d9\u05e7\u05ea \u05d0\u05d9\u05d5\u05ea",
-"Select...": "\u05d1\u05d7\u05e8...",
-"Preferences": "\u05d4\u05e2\u05d3\u05e4\u05d5\u05ea",
-"Yes": "\u05db\u05df",
-"No": "\u05dc\u05d0",
-"Keyboard Navigation": "\u05e0\u05d9\u05d5\u05d5\u05d8 \u05d1\u05de\u05e7\u05dc\u05d3\u05ea",
-"Version": "\u05d2\u05e8\u05e1\u05d4",
-"Anchor": "\u05de\u05e7\u05d5\u05dd \u05e2\u05d9\u05d2\u05d5\u05df",
-"Special character": "\u05ea\u05d5\u05d5\u05d9\u05dd \u05de\u05d9\u05d5\u05d7\u05d3\u05d9\u05dd",
-"Code sample": "\u05d3\u05d5\u05d2\u05de\u05ea \u05e7\u05d5\u05d3",
-"Color": "\u05e6\u05d1\u05e2",
-"Emoticons": "\u05de\u05d7\u05d5\u05d5\u05ea",
-"Document properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05de\u05e1\u05de\u05da",
-"Image": "\u05ea\u05de\u05d5\u05e0\u05d4",
-"Insert link": "\u05d4\u05db\u05e0\u05e1 \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Target": "\u05de\u05d8\u05e8\u05d4",
-"Link": "\u05e7\u05d9\u05e9\u05d5\u05e8",
-"Poster": "\u05e4\u05d5\u05e1\u05d8\u05e8",
-"Media": "\u05de\u05d3\u05d9\u05d4",
-"Print": "\u05d4\u05d3\u05e4\u05e1",
-"Prev": "\u05e7\u05d5\u05d3\u05dd",
-"Find and replace": "\u05d7\u05e4\u05e9 \u05d5\u05d4\u05d7\u05dc\u05e3",
-"Whole words": "\u05de\u05d9\u05dc\u05d4 \u05e9\u05dc\u05de\u05d4",
-"Spellcheck": "\u05d1\u05d5\u05d3\u05e7 \u05d0\u05d9\u05d5\u05ea",
-"Caption": "\u05db\u05d9\u05ea\u05d5\u05d1",
-"Insert template": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05d1\u05e0\u05d9\u05ea",
-"_dir": "rtl"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/hu_HU.js b/cps/static/js/libs/tinymce/langs/hu_HU.js
deleted file mode 100644
index 038b83856..000000000
--- a/cps/static/js/libs/tinymce/langs/hu_HU.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('hu_HU',{
-"Redo": "Ism\u00e9t",
-"Undo": "Visszavon\u00e1s",
-"Cut": "Kiv\u00e1g\u00e1s",
-"Copy": "M\u00e1sol\u00e1s",
-"Paste": "Beilleszt\u00e9s",
-"Select all": "Minden kijel\u00f6l\u00e9se",
-"New document": "\u00daj dokumentum",
-"Ok": "Rendben",
-"Cancel": "M\u00e9gse",
-"Visual aids": "Vizu\u00e1lis seg\u00e9deszk\u00f6z\u00f6k",
-"Bold": "F\u00e9lk\u00f6v\u00e9r",
-"Italic": "D\u0151lt",
-"Underline": "Al\u00e1h\u00fazott",
-"Strikethrough": "\u00c1th\u00fazott",
-"Superscript": "Fels\u0151 index",
-"Subscript": "Als\u00f3 index",
-"Clear formatting": "Form\u00e1z\u00e1s t\u00f6rl\u00e9se",
-"Align left": "Balra igaz\u00edt",
-"Align center": "K\u00f6z\u00e9pre igaz\u00edt",
-"Align right": "Jobbra igaz\u00edt",
-"Justify": "Sorkiz\u00e1rt",
-"Bullet list": "Listajeles lista",
-"Numbered list": "Sz\u00e1mozott lista",
-"Decrease indent": "Beh\u00faz\u00e1s cs\u00f6kkent\u00e9se",
-"Increase indent": "Beh\u00faz\u00e1s n\u00f6vel\u00e9se",
-"Close": "Bez\u00e1r",
-"Formats": "Form\u00e1tumok",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "A b\u00f6ng\u00e9sz\u0151d nem t\u00e1mogatja a k\u00f6zvetlen hozz\u00e1f\u00e9r\u00e9st a v\u00e1g\u00f3laphoz. K\u00e9rlek, haszn\u00e1ld a Ctrl+X\/C\/V billenty\u0171ket.",
-"Headers": "C\u00edmsorok",
-"Header 1": "C\u00edmsor 1",
-"Header 2": "C\u00edmsor 2",
-"Header 3": "C\u00edmsor 3",
-"Header 4": "C\u00edmsor 4",
-"Header 5": "C\u00edmsor 5",
-"Header 6": "C\u00edmsor 6",
-"Headings": "Fejl\u00e9cek",
-"Heading 1": "1. fejl\u00e9c",
-"Heading 2": "2. fejl\u00e9c",
-"Heading 3": "3. fejl\u00e9c",
-"Heading 4": "4. fejl\u00e9c",
-"Heading 5": "5. fejl\u00e9c",
-"Heading 6": "6. fejl\u00e9c",
-"Preformatted": "El\u0151form\u00e1zott",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "K\u00f3d",
-"Paragraph": "Bekezd\u00e9s",
-"Blockquote": "Id\u00e9zetblokk",
-"Inline": "Foly\u00f3 sz\u00f6veg",
-"Blocks": "Blokkok",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Beilleszt\u00e9s mostant\u00f3l egyszer\u0171 sz\u00f6veg m\u00f3dban. A tartalmak mostant\u00f3l egyszer\u0171 sz\u00f6vegk\u00e9nt lesznek beillesztve, am\u00edg nem kapcsolod ki ezt az opci\u00f3t.",
-"Fonts": "Bet\u0171t\u00edpusok",
-"Font Sizes": "Bet\u0171m\u00e9retek",
-"Class": "Oszt\u00e1ly",
-"Browse for an image": "K\u00e9p keres\u00e9se tall\u00f3z\u00e1ssal",
-"OR": "VAGY",
-"Drop an image here": "H\u00fazz ide egy k\u00e9pet",
-"Upload": "Felt\u00f6lt\u00e9s",
-"Block": "Blokk",
-"Align": "Igaz\u00edt\u00e1s",
-"Default": "Alap\u00e9rtelmezett",
-"Circle": "K\u00f6r",
-"Disc": "Pont",
-"Square": "N\u00e9gyzet",
-"Lower Alpha": "Kisbet\u0171",
-"Lower Greek": "Kis g\u00f6r\u00f6g sz\u00e1m",
-"Lower Roman": "Kis r\u00f3mai sz\u00e1m",
-"Upper Alpha": "Nagybet\u0171",
-"Upper Roman": "Nagy r\u00f3mai sz\u00e1m",
-"Anchor...": "Horgony...",
-"Name": "N\u00e9v",
-"Id": "Azonos\u00edt\u00f3",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Az azonos\u00edt\u00f3nak bet\u0171vel kell kezd\u0151dnie, azut\u00e1n csak bet\u0171ket, sz\u00e1mokat, gondolatjeleket, pontokat, kett\u0151spontokat vagy al\u00e1h\u00faz\u00e1st tartalmazhat.",
-"You have unsaved changes are you sure you want to navigate away?": "Nem mentett m\u00f3dos\u00edt\u00e1said vannak, biztos hogy el akarsz navig\u00e1lni?",
-"Restore last draft": "Utols\u00f3 piszkozat vissza\u00e1ll\u00edt\u00e1sa",
-"Special character...": "Speci\u00e1lis karakter...",
-"Source code": "Forr\u00e1sk\u00f3d",
-"Insert\/Edit code sample": "K\u00f3dminta besz\u00far\u00e1sa\/szerkeszt\u00e9se",
-"Language": "Nyelv",
-"Code sample...": "K\u00f3dminta...",
-"Color Picker": "Sz\u00ednv\u00e1laszt\u00f3",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Balr\u00f3l jobbra",
-"Right to left": "Jobbr\u00f3l balra",
-"Emoticons...": "Hangulatjelek...",
-"Metadata and Document Properties": "Metaadatok \u00e9s a dokumentum tulajdons\u00e1gai",
-"Title": "C\u00edm",
-"Keywords": "Kulcsszavak",
-"Description": "Le\u00edr\u00e1s",
-"Robots": "Robotok",
-"Author": "Szerz\u0151",
-"Encoding": "K\u00f3dol\u00e1s",
-"Fullscreen": "Teljes k\u00e9perny\u0151",
-"Action": "M\u0171velet",
-"Shortcut": "Parancsikon",
-"Help": "S\u00fag\u00f3",
-"Address": "C\u00edm",
-"Focus to menubar": "F\u00f3kusz a men\u00fcre",
-"Focus to toolbar": "F\u00f3kusz az eszk\u00f6zt\u00e1rra",
-"Focus to element path": "F\u00f3kusz az elemek \u00fatvonal\u00e1ra",
-"Focus to contextual toolbar": "F\u00f3kusz a k\u00f6rnyezetf\u00fcgg\u0151 eszk\u00f6zt\u00e1rra",
-"Insert link (if link plugin activated)": "Hivatkoz\u00e1s besz\u00far\u00e1sa (ha a hivatkoz\u00e1s b\u0151v\u00edtm\u00e9ny enged\u00e9lyezett)",
-"Save (if save plugin activated)": "Ment\u00e9s (ha a ment\u00e9s b\u0151v\u00edtm\u00e9ny enged\u00e9lyezett)",
-"Find (if searchreplace plugin activated)": "Keres\u00e9s (ha a keres\u00e9s \u00e9s csere b\u0151v\u00edtm\u00e9ny enged\u00e9lyezett)",
-"Plugins installed ({0}):": "Telep\u00edtett b\u0151v\u00edtm\u00e9nyek ({0}):",
-"Premium plugins:": "Pr\u00e9mium b\u0151v\u00edtm\u00e9nyek:",
-"Learn more...": "Tudj meg t\u00f6bbet...",
-"You are using {0}": "Haszn\u00e1latban: {0}",
-"Plugins": "Pluginek",
-"Handy Shortcuts": "Hasznos linkek",
-"Horizontal line": "V\u00edzszintes vonal",
-"Insert\/edit image": "K\u00e9p beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Image description": "K\u00e9p le\u00edr\u00e1sa",
-"Source": "Forr\u00e1s",
-"Dimensions": "M\u00e9retek",
-"Constrain proportions": "M\u00e9retar\u00e1ny",
-"General": "\u00c1ltal\u00e1nos",
-"Advanced": "Halad\u00f3",
-"Style": "St\u00edlus",
-"Vertical space": "Vertik\u00e1lis hely",
-"Horizontal space": "Horizont\u00e1lis hely",
-"Border": "Szeg\u00e9ly",
-"Insert image": "K\u00e9p beilleszt\u00e9se",
-"Image...": "K\u00e9p...",
-"Image list": "K\u00e9p lista",
-"Rotate counterclockwise": "Forgat\u00e1s az \u00f3ramutat\u00f3 j\u00e1r\u00e1s\u00e1val ellent\u00e9tesen",
-"Rotate clockwise": "Forgat\u00e1s az \u00f3ramutat\u00f3 j\u00e1r\u00e1s\u00e1val megegyez\u0151en",
-"Flip vertically": "F\u00fcgg\u0151leges t\u00fckr\u00f6z\u00e9s",
-"Flip horizontally": "V\u00edzszintes t\u00fckr\u00f6z\u00e9s",
-"Edit image": "K\u00e9p szerkeszt\u00e9se",
-"Image options": "K\u00e9p be\u00e1ll\u00edt\u00e1sok",
-"Zoom in": "Nagy\u00edt\u00e1s",
-"Zoom out": "Kicsiny\u00edt\u00e9s",
-"Crop": "K\u00e9p v\u00e1g\u00e1s",
-"Resize": "\u00c1tm\u00e9retez\u00e9s",
-"Orientation": "K\u00e9p t\u00e1jol\u00e1s",
-"Brightness": "F\u00e9nyer\u0151",
-"Sharpen": "\u00c9less\u00e9g",
-"Contrast": "Kontraszt",
-"Color levels": "Sz\u00ednszint",
-"Gamma": "Gamma",
-"Invert": "Inverz k\u00e9p",
-"Apply": "Ment\u00e9s",
-"Back": "Vissza",
-"Insert date\/time": "D\u00e1tum\/id\u0151 beilleszt\u00e9se",
-"Date\/time": "D\u00e1tum\/id\u0151",
-"Insert\/Edit Link": "Hivatkoz\u00e1s beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Insert\/edit link": "Hivatkoz\u00e1s beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Text to display": "Megjelen\u0151 sz\u00f6veg",
-"Url": "Url",
-"Open link in...": "Hivatkoz\u00e1s megnyit\u00e1sa...",
-"Current window": "Jelenlegi ablak",
-"None": "Nincs",
-"New window": "\u00daj ablak",
-"Remove link": "Hivatkoz\u00e1s t\u00f6rl\u00e9se",
-"Anchors": "Horgonyok",
-"Link...": "Hivatkoz\u00e1s...",
-"Paste or type a link": "Hivatkoz\u00e1s be\u00edr\u00e1sa vagy beilleszt\u00e9se",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "A megadott URL email c\u00edmnek t\u0171nik. Szeretn\u00e9d hozz\u00e1adni a sz\u00fcks\u00e9ges mailto: el\u0151tagot?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "A megadott URL k\u00fcls\u0151 c\u00edmnek t\u0171nik. Szeretn\u00e9d hozz\u00e1adni a sz\u00fcks\u00e9ges http:\/\/ el\u0151tagot?",
-"Link list": "Hivatkoz\u00e1slista",
-"Insert video": "Vide\u00f3 beilleszt\u00e9se",
-"Insert\/edit video": "Vide\u00f3 beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Insert\/edit media": "M\u00e9dia besz\u00far\u00e1sa\/beilleszt\u00e9se",
-"Alternative source": "Alternat\u00edv forr\u00e1s",
-"Alternative source URL": "Alternat\u00edv forr\u00e1s URL",
-"Media poster (Image URL)": "M\u00e9dia poszter (k\u00e9p URL)",
-"Paste your embed code below:": "Illeszd be a be\u00e1gyaz\u00f3 k\u00f3dot alulra:",
-"Embed": "Be\u00e1gyaz\u00e1s",
-"Media...": "M\u00e9dia...",
-"Nonbreaking space": "Nem t\u00f6rhet\u0151 sz\u00f3k\u00f6z",
-"Page break": "Oldalt\u00f6r\u00e9s",
-"Paste as text": "Beilleszt\u00e9s sz\u00f6vegk\u00e9nt",
-"Preview": "El\u0151n\u00e9zet",
-"Print...": "Nyomtat\u00e1s...",
-"Save": "Ment\u00e9s",
-"Find": "Keres\u00e9s",
-"Replace with": "Csere erre",
-"Replace": "Csere",
-"Replace all": "Az \u00f6sszes cser\u00e9je",
-"Previous": "El\u0151z\u0151",
-"Next": "K\u00f6vetkez\u0151",
-"Find and replace...": "Keres\u00e9s \u00e9s csere...",
-"Could not find the specified string.": "A be\u00edrt kifejez\u00e9s nem tal\u00e1lhat\u00f3.",
-"Match case": "Kis \u00e9s nagybet\u0171k megk\u00fcl\u00f6nb\u00f6ztet\u00e9se",
-"Find whole words only": "Csak teljes szavak keres\u00e9se",
-"Spell check": "Helyes\u00edr\u00e1s-ellen\u0151rz\u00e9s",
-"Ignore": "Figyelmen k\u00edv\u00fcl hagy",
-"Ignore all": "Mindent figyelmen k\u00edv\u00fcl hagy",
-"Finish": "Befejez\u00e9s",
-"Add to Dictionary": "Sz\u00f3t\u00e1rhoz ad",
-"Insert table": "T\u00e1bl\u00e1zat beilleszt\u00e9se",
-"Table properties": "T\u00e1bl\u00e1zat tulajdons\u00e1gok",
-"Delete table": "T\u00e1bl\u00e1zat t\u00f6rl\u00e9se",
-"Cell": "Cella",
-"Row": "Sor",
-"Column": "Oszlop",
-"Cell properties": "Cella tulajdons\u00e1gok",
-"Merge cells": "Cell\u00e1k egyes\u00edt\u00e9se",
-"Split cell": "Cell\u00e1k sz\u00e9tv\u00e1laszt\u00e1sa",
-"Insert row before": "Sor besz\u00far\u00e1sa el\u00e9",
-"Insert row after": "Sor besz\u00far\u00e1sa m\u00f6g\u00e9",
-"Delete row": "Sor t\u00f6rl\u00e9se",
-"Row properties": "Sor tulajdons\u00e1gai",
-"Cut row": "Sor kiv\u00e1g\u00e1sa",
-"Copy row": "Sor m\u00e1sol\u00e1sa",
-"Paste row before": "Sor beilleszt\u00e9se el\u00e9",
-"Paste row after": "Sor beilleszt\u00e9se m\u00f6g\u00e9",
-"Insert column before": "Oszlop besz\u00far\u00e1sa el\u00e9",
-"Insert column after": "Oszlop besz\u00far\u00e1sa m\u00f6g\u00e9",
-"Delete column": "Oszlop t\u00f6rl\u00e9se",
-"Cols": "Oszlopok",
-"Rows": "Sorok",
-"Width": "Sz\u00e9less\u00e9g",
-"Height": "Magass\u00e1g",
-"Cell spacing": "Cell\u00e1k t\u00e1vols\u00e1ga",
-"Cell padding": "Cella m\u00e9rete",
-"Show caption": "C\u00edm megjelen\u00edt\u00e9se",
-"Left": "Bal",
-"Center": "K\u00f6z\u00e9p",
-"Right": "Jobb",
-"Cell type": "Cella t\u00edpusa",
-"Scope": "Hat\u00f3k\u00f6r",
-"Alignment": "Igaz\u00edt\u00e1s",
-"H Align": "V\u00edzszintes igaz\u00edt\u00e1s",
-"V Align": "F\u00fcgg\u0151leges igaz\u00edt\u00e1s",
-"Top": "Fel\u00fcl",
-"Middle": "K\u00f6z\u00e9pen",
-"Bottom": "Alul",
-"Header cell": "Fejl\u00e9c cella",
-"Row group": "Sor csoport",
-"Column group": "Oszlop csoport",
-"Row type": "Sor t\u00edpus",
-"Header": "Fejl\u00e9c",
-"Body": "Sz\u00f6vegt\u00f6rzs",
-"Footer": "L\u00e1bl\u00e9c",
-"Border color": "Szeg\u00e9ly sz\u00edne",
-"Insert template...": "Sablon besz\u00far\u00e1sa...",
-"Templates": "Sablonok",
-"Template": "Sablon",
-"Text color": "Sz\u00f6veg sz\u00edne",
-"Background color": "H\u00e1tt\u00e9r sz\u00edn",
-"Custom...": "Egy\u00e9ni...",
-"Custom color": "Egy\u00e9ni sz\u00edn",
-"No color": "Nincs sz\u00edn",
-"Remove color": "Sz\u00edn t\u00f6rl\u00e9se",
-"Table of Contents": "Tartalomjegyz\u00e9k",
-"Show blocks": "Blokkok mutat\u00e1sa",
-"Show invisible characters": "L\u00e1thatatlan karakterek mutat\u00e1sa",
-"Word count": "Szavak sz\u00e1ma",
-"Count": "Sz\u00e1m",
-"Document": "Dokumentum",
-"Selection": "Kiv\u00e1laszt\u00e1s",
-"Words": "Szavak",
-"Words: {0}": "Szavak: {0}",
-"{0} words": "{0} sz\u00f3",
-"File": "F\u00e1jl",
-"Edit": "Szerkeszt\u00e9s",
-"Insert": "Beilleszt\u00e9s",
-"View": "N\u00e9zet",
-"Format": "Form\u00e1tum",
-"Table": "T\u00e1bl\u00e1zat",
-"Tools": "Eszk\u00f6z\u00f6k",
-"Powered by {0}": "\u00dczemelteti: {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text ter\u00fclet. Nyomj ALT-F9-et a men\u00fch\u00f6z. Nyomj ALT-F10-et az eszk\u00f6zt\u00e1rhoz. Nyomj ALT-0-t a s\u00fag\u00f3hoz",
-"Image title": "K\u00e9p c\u00edme",
-"Border width": "Szeg\u00e9ly vastags\u00e1ga",
-"Border style": "Szeg\u00e9ly st\u00edlusa",
-"Error": "Hiba",
-"Warn": "Figyelmeztet\u00e9s",
-"Valid": "\u00c9rv\u00e9nyes",
-"To open the popup, press Shift+Enter": "A felugr\u00f3 ablak megnyit\u00e1s\u00e1hoz nyomja meg a Shift+Enter billenty\u0171t",
-"Rich Text Area. Press ALT-0 for help.": "Vizu\u00e1lis szerkeszt\u0151 ter\u00fclet. Nyomjon ALT-0-t a s\u00fag\u00f3hoz.",
-"System Font": "Rendszer-bet\u0171t\u00edpus",
-"Failed to upload image: {0}": "Nem siker\u00fclt felt\u00f6lteni a k\u00e9pet: {0}",
-"Failed to load plugin: {0} from url {1}": "Nem siker\u00fclt bet\u00f6lteni a be\u00e9p\u00fcl\u0151 modult: {0} err\u0151l a webc\u00edmr\u0151l: {1}",
-"Failed to load plugin url: {0}": "Nem siker\u00fclt bet\u00f6lteni a be\u00e9p\u00fcl\u0151 modul url-\u00e9t: {0}",
-"Failed to initialize plugin: {0}": "Nem siker\u00fclt inicializ\u00e1lni a be\u00e9p\u00fcl\u0151 modult: {0}",
-"example": "p\u00e9lda",
-"Search": "Keres\u00e9s",
-"All": "Minden",
-"Currency": "P\u00e9nznem",
-"Text": "Sz\u00f6veg",
-"Quotations": "Id\u00e9z\u0151jelek",
-"Mathematical": "Matematikai",
-"Extended Latin": "B\u0151v\u00edtett latin",
-"Symbols": "Szimb\u00f3lumok",
-"Arrows": "Nyilak",
-"User Defined": "Felhaszn\u00e1l\u00f3 \u00e1ltal meghat\u00e1rozott",
-"dollar sign": "doll\u00e1r jel",
-"currency sign": "valuta jel",
-"euro-currency sign": "euro-valuta jel",
-"colon sign": "kett\u0151spont",
-"cruzeiro sign": "cruzeiro jel",
-"french franc sign": "francia frank jel",
-"lira sign": "l\u00edra jel",
-"mill sign": "mill jel",
-"naira sign": "naira jel",
-"peseta sign": "peseta jel",
-"rupee sign": "r\u00fapia jel",
-"won sign": "won jel",
-"new sheqel sign": "\u00faj shekel jel",
-"dong sign": "dong jel",
-"kip sign": "kip jel",
-"tugrik sign": "tugrik jel",
-"drachma sign": "drachma jel",
-"german penny symbol": "n\u00e9met penny jel",
-"peso sign": "peso jel",
-"guarani sign": "guarani jel",
-"austral sign": "austral jel",
-"hryvnia sign": "hrivnya jel",
-"cedi sign": "cedi jel",
-"livre tournois sign": "livre tournois jel",
-"spesmilo sign": "spesmilo jel",
-"tenge sign": "tenge jel",
-"indian rupee sign": "r\u00fapel jel",
-"turkish lira sign": "t\u00f6r\u00f6k l\u00edra jel",
-"nordic mark sign": "\u00e9szaki m\u00e1rka jel",
-"manat sign": "manat jel",
-"ruble sign": "rubel jel",
-"yen character": "jen karakter",
-"yuan character": "j\u00fcan karakter",
-"yuan character, in hong kong and taiwan": "hongkongi \u00e9s tajvani j\u00fcan karakter",
-"yen\/yuan character variant one": "jen\/j\u00fcan karaktervari\u00e1ns",
-"Loading emoticons...": "Hangulatjelek bet\u00f6lt\u00e9se...",
-"Could not load emoticons": "Nem siker\u00fclt a hangulatjelek bet\u00f6lt\u00e9se",
-"People": "Emberek",
-"Animals and Nature": "\u00c1llatok \u00e9s term\u00e9szet",
-"Food and Drink": "\u00c9tel, ital",
-"Activity": "Tev\u00e9kenys\u00e9gek",
-"Travel and Places": "Utaz\u00e1s \u00e9s helyek",
-"Objects": "T\u00e1rgyak",
-"Flags": "Z\u00e1szl\u00f3k",
-"Characters": "Karakterek",
-"Characters (no spaces)": "Karakterek (sz\u00f3k\u00f6z\u00f6k n\u00e9lk\u00fcl)",
-"{0} characters": "{0} karakter",
-"Error: Form submit field collision.": "Hiba: \u00dctk\u00f6z\u00e9s t\u00f6rt\u00e9nt az \u0171rlap elk\u00fcld\u00e9sekor.",
-"Error: No form element found.": "Hiba: Nem tal\u00e1lhat\u00f3 \u0171rlap elem.",
-"Update": "Friss\u00edt\u00e9s",
-"Color swatch": "Sz\u00ednpaletta",
-"Turquoise": "T\u00fcrkiz",
-"Green": "Z\u00f6ld",
-"Blue": "K\u00e9k",
-"Purple": "Lila",
-"Navy Blue": "Tengerk\u00e9k",
-"Dark Turquoise": "S\u00f6t\u00e9tt\u00fcrkiz",
-"Dark Green": "S\u00f6t\u00e9tz\u00f6ld",
-"Medium Blue": "Kir\u00e1lyk\u00e9k",
-"Medium Purple": "K\u00f6z\u00e9plila",
-"Midnight Blue": "\u00c9jf\u00e9lk\u00e9k",
-"Yellow": "S\u00e1rga",
-"Orange": "Narancss\u00e1rga",
-"Red": "Piros",
-"Light Gray": "Vil\u00e1gossz\u00fcrke",
-"Gray": "Sz\u00fcrke",
-"Dark Yellow": "S\u00f6t\u00e9ts\u00e1rga",
-"Dark Orange": "S\u00f6t\u00e9t narancss\u00e1rga",
-"Dark Red": "S\u00f6t\u00e9tv\u00f6r\u00f6s",
-"Medium Gray": "K\u00f6z\u00e9psz\u00fcrke",
-"Dark Gray": "S\u00f6t\u00e9tsz\u00fcrke",
-"Light Green": "Vil\u00e1gosz\u00f6ld",
-"Light Yellow": "Vil\u00e1goss\u00e1rga",
-"Light Red": "Vil\u00e1gospiros",
-"Light Purple": "Vil\u00e1goslila",
-"Light Blue": "Vil\u00e1gosk\u00e9k",
-"Dark Purple": "S\u00f6t\u00e9tlila",
-"Dark Blue": "S\u00f6t\u00e9tk\u00e9k",
-"Black": "Fekete",
-"White": "Feh\u00e9r",
-"Switch to or from fullscreen mode": "Teljes vagy norm\u00e1l k\u00e9perny\u0151s m\u00f3dra v\u00e1lt\u00e1s",
-"Open help dialog": "S\u00fag\u00f3ablak megnyit\u00e1sa",
-"history": "el\u0151zm\u00e9nyek",
-"styles": "st\u00edlusok",
-"formatting": "form\u00e1z\u00e1s",
-"alignment": "igaz\u00edt\u00e1s",
-"indentation": "beh\u00faz\u00e1s",
-"permanent pen": "sz\u00f6vegkiemel\u0151",
-"comments": "megjegyz\u00e9sek",
-"Format Painter": "Form\u00e1tumm\u00e1sol\u00f3",
-"Insert\/edit iframe": "iframe besz\u00far\u00e1sa\/szerkeszt\u00e9se",
-"Capitalization": "Nagybet\u0171s \u00edr\u00e1s",
-"lowercase": "kisbet\u0171s",
-"UPPERCASE": "NAGYBET\u0170S",
-"Title Case": "C\u00edm szerinti \u00edr\u00e1sm\u00f3d",
-"Permanent Pen Properties": "Tart\u00f3s toll tulajdons\u00e1gai",
-"Permanent pen properties...": "Tart\u00f3s toll tulajdons\u00e1gai...",
-"Font": "Bet\u0171t\u00edpus",
-"Size": "M\u00e9ret",
-"More...": "Tov\u00e1bbiak...",
-"Spellcheck Language": "Helyes\u00edr\u00e1s-ellen\u0151rz\u00e9s nyelve",
-"Select...": "V\u00e1lasszon...",
-"Preferences": "Preferenci\u00e1k",
-"Yes": "Igen",
-"No": "Nem",
-"Keyboard Navigation": "Billenty\u0171zettel val\u00f3 navig\u00e1l\u00e1s",
-"Version": "Verzi\u00f3",
-"Anchor": "Horgony",
-"Special character": "Speci\u00e1lis karakter",
-"Code sample": "K\u00f3d p\u00e9lda",
-"Color": "Sz\u00edn",
-"Emoticons": "Vigyorok",
-"Document properties": "Dokumentum tulajdons\u00e1gai",
-"Image": "K\u00e9p",
-"Insert link": "Hivatkoz\u00e1s beilleszt\u00e9se",
-"Target": "C\u00e9l",
-"Link": "Hivatkoz\u00e1s",
-"Poster": "El\u0151n\u00e9zeti k\u00e9p",
-"Media": "M\u00e9dia",
-"Print": "Nyomtat\u00e1s",
-"Prev": "El\u0151z\u0151",
-"Find and replace": "Keres\u00e9s \u00e9s csere",
-"Whole words": "Csak ha ez a teljes sz\u00f3",
-"Spellcheck": "Helyes\u00edr\u00e1s ellen\u0151rz\u00e9s",
-"Caption": "Felirat",
-"Insert template": "Sablon beilleszt\u00e9se"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/it_IT.js b/cps/static/js/libs/tinymce/langs/it_IT.js
deleted file mode 100644
index 73b332267..000000000
--- a/cps/static/js/libs/tinymce/langs/it_IT.js
+++ /dev/null
@@ -1,370 +0,0 @@
-tinymce.addI18n('it_IT',{
-"Redo": "Ripristina",
-"Undo": "Annulla",
-"Cut": "Taglia",
-"Copy": "Copia",
-"Paste": "Incolla",
-"Select all": "Seleziona tutto",
-"New document": "Nuovo documento",
-"Ok": "OK",
-"Cancel": "Annulla",
-"Visual aids": "Aiuti visivi",
-"Bold": "Grassetto",
-"Italic": "Corsivo",
-"Underline": "Sottolineato",
-"Strikethrough": "Barrato",
-"Superscript": "Apice",
-"Subscript": "Pedice",
-"Clear formatting": "Cancella la formattazione",
-"Align left": "Allinea a sinistra",
-"Align center": "Allinea al centro",
-"Align right": "Allinea a destra",
-"Justify": "Giustifica",
-"Bullet list": "Elenco puntato",
-"Numbered list": "Elenco numerato",
-"Decrease indent": "Riduci rientro",
-"Increase indent": "Aumenta rientro",
-"Close": "Chiudi",
-"Formats": "Formati",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Il browser non supporta l'accesso diretto alla cartella degli appunti. Usare i tasti di scelta rapida Ctrl+X\/C\/V.",
-"Headers": "Intestazioni",
-"Header 1": "Intestazione 1",
-"Header 2": "Intestazione 2",
-"Header 3": "Intestazione 3",
-"Header 4": "Intestazione 4",
-"Header 5": "Intestazione 5",
-"Header 6": "Intestazione 6",
-"Headings": "Titoli",
-"Heading 1": "Titolo 1",
-"Heading 2": "Titolo 2",
-"Heading 3": "Titolo 3",
-"Heading 4": "Titolo 4",
-"Heading 5": "Titolo 5",
-"Heading 6": "Titolo 6",
-"Preformatted": "Preformattato",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Codice",
-"Paragraph": "Paragrafo",
-"Blockquote": "Blockquote",
-"Inline": "In linea",
-"Blocks": "Blocchi",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Incolla \u00e8 in modalit\u00e0 testo normale. I contenuti saranno incollati come testo normale se non viene disattivata questa opzione.",
-"Fonts": "Caratteri",
-"Font Sizes": "Dimensioni caratteri",
-"Class": "Classe",
-"Browse for an image": "Cerca un'immagine",
-"OR": "OPPURE",
-"Drop an image here": "Rilasciare un'immagine qui",
-"Upload": "Carica",
-"Block": "Blocco",
-"Align": "Allinea",
-"Default": "Predefinito",
-"Circle": "Circolo",
-"Disc": "Disco",
-"Square": "Quadrato",
-"Lower Alpha": "Alfabetico minuscolo",
-"Lower Greek": "Greco minuscolo",
-"Lower Roman": "Romano minuscolo",
-"Upper Alpha": "Alfabetico maiuscolo",
-"Upper Roman": "Romano maiuscolo",
-"Anchor...": "Ancoraggio...",
-"Name": "Nome",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'ID dovrebbe cominciare con una lettera, seguita unicamente da lettere, numeri, linee, punti, due punti o caratteri di sottolineatura.",
-"You have unsaved changes are you sure you want to navigate away?": "Ci sono modifiche non salvate, si \u00e8 sicuro di volere uscire?",
-"Restore last draft": "Ripristina l'ultima bozza",
-"Special characters...": "Caratteri speciali...",
-"Source code": "Codice sorgente",
-"Insert\/Edit code sample": "Inserisci\/modifica esempio di codice",
-"Language": "Lingua",
-"Code sample...": "Esempio di codice...",
-"Color Picker": "Selezione colori",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Da sinistra a destra",
-"Right to left": "Da destra a sinistra",
-"Emoticons...": "Emoticon...",
-"Metadata and Document Properties": "Metadata e propriet\u00e0 del documento",
-"Title": "Titolo",
-"Keywords": "Parole chiave",
-"Description": "Descrizione",
-"Robots": "Robot",
-"Author": "Autore",
-"Encoding": "Codifica",
-"Fullscreen": "A tutto schermo",
-"Action": "Azione",
-"Shortcut": "Collegamento",
-"Help": "Guida",
-"Address": "Indirizzo",
-"Focus to menubar": "Imposta stato attivo per la barra dei menu",
-"Focus to toolbar": "Imposta stato attivo per la barra degli strumenti",
-"Focus to element path": "Imposta stato attivo per il percorso dell'elemento",
-"Focus to contextual toolbar": "Imposta stato attivo per la barra degli strumenti contestuale",
-"Insert link (if link plugin activated)": "Inserisci un collegamento (se \u00e8 attivato l'apposito plugin)",
-"Save (if save plugin activated)": "Salva (se \u00e8 attivato l'apposito plugin)",
-"Find (if searchreplace plugin activated)": "Trova (se \u00e8 attivato l'apposito plugin)",
-"Plugins installed ({0}):": "Plugin installati ({0}):",
-"Premium plugins:": "Plugin Premium:",
-"Learn more...": "Maggiori informazioni...",
-"You are using {0}": "Si sta utilizzando {0}",
-"Plugins": "Plugin",
-"Handy Shortcuts": "Scorciatoie utili",
-"Horizontal line": "Linea orizzontale",
-"Insert\/edit image": "Inserisci\/modifica immagine",
-"Image description": "Descrizione immagine",
-"Source": "Fonte",
-"Dimensions": "Dimensioni",
-"Constrain proportions": "Mantieni proporzioni",
-"General": "Generali",
-"Advanced": "Avanzate",
-"Style": "Stile",
-"Vertical space": "Spazio verticale",
-"Horizontal space": "Spazio orizzontale",
-"Border": "Bordo",
-"Insert image": "Inserisci immagine",
-"Image...": "Immagine...",
-"Image list": "Elenco immagini",
-"Rotate counterclockwise": "Ruota in senso antiorario",
-"Rotate clockwise": "Ruota in senso orario",
-"Flip vertically": "Rifletti verticalmente",
-"Flip horizontally": "Rifletti orizzontalmente",
-"Edit image": "Modifica immagine",
-"Image options": "Opzioni immagine",
-"Zoom in": "Ingrandisci",
-"Zoom out": "Zoom indietro",
-"Crop": "Ritaglia",
-"Resize": "Ridimensiona",
-"Orientation": "Orientamento",
-"Brightness": "Luminosit\u00e0",
-"Sharpen": "Nitidezza",
-"Contrast": "Contrasto",
-"Color levels": "Livelli di colore",
-"Gamma": "Gamma",
-"Invert": "Inverti",
-"Apply": "Applica",
-"Back": "Indietro",
-"Insert date\/time": "Inserisci data\/ora",
-"Date\/time": "Data\/ora",
-"Insert\/Edit Link": "Inserisci\/modifica collegamento",
-"Insert\/edit link": "Inserisci\/modifica collegamento",
-"Text to display": "Testo da visualizzare",
-"Url": "URL",
-"Open link in...": "Apri collegamento in...",
-"Current window": "Finestra corrente",
-"None": "Nessuno",
-"New window": "Nuova finestra",
-"Remove link": "Rimuovi collegamento",
-"Anchors": "Ancoraggi",
-"Link...": "Collegamento...",
-"Paste or type a link": "Incolla o digita un collegamento",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL inserito sembra essere un indirizzo email. Si vuole aggiungere il necessario prefisso mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL inserito sembra essere un collegamento esterno. Si vuole aggiungere il necessario prefisso http:\/\/?",
-"Link list": "Elenco collegamenti",
-"Insert video": "Inserisci video",
-"Insert\/edit video": "Inserisci\/modifica video",
-"Insert\/edit media": "Inserisci\/modifica oggetti multimediali",
-"Alternative source": "Sorgente alternativa",
-"Alternative source URL": "URL sorgente alternativa",
-"Media poster (Image URL)": "Poster dell'oggetto multimediale (URL dell'immagine)",
-"Paste your embed code below:": "Incolla il codice d'incorporamento di seguito:",
-"Embed": "Incorpora",
-"Media...": "Oggetto multimediale...",
-"Nonbreaking space": "Spazio indivisibile",
-"Page break": "Interruzione di pagina",
-"Paste as text": "Incolla senza formattazioni",
-"Preview": "Anteprima",
-"Print...": "Stampa...",
-"Save": "Salva",
-"Find": "Trova",
-"Replace with": "Sostituisci con",
-"Replace": "Sostituisci",
-"Replace all": "Sostituisci tutto",
-"Previous": "Indietro",
-"Next": "Avanti",
-"Find and replace...": "Trova e sostituisci...",
-"Could not find the specified string.": "Impossibile trovare la stringa specificata.",
-"Match case": "Maiuscole\/minuscole",
-"Find whole words only": "Trova solo parole intere",
-"Spell check": "Controllo ortografia",
-"Ignore": "Ignora",
-"Ignore all": "Ignora tutto",
-"Finish": "Fine",
-"Add to Dictionary": "Aggiungi al dizionario",
-"Insert table": "Inserisci tabella",
-"Table properties": "Propriet\u00e0 della tabella",
-"Delete table": "Elimina tabella",
-"Cell": "Cella",
-"Row": "Riga",
-"Column": "Colonna",
-"Cell properties": "Propriet\u00e0 cella",
-"Merge cells": "Unisci le celle",
-"Split cell": "Dividi la cella",
-"Insert row before": "Inserisci riga prima",
-"Insert row after": "Inserisci riga dopo",
-"Delete row": "Elimina riga",
-"Row properties": "Propriet\u00e0 della riga",
-"Cut row": "Taglia riga",
-"Copy row": "Copia riga",
-"Paste row before": "Incolla riga prima",
-"Paste row after": "Incolla riga dopo",
-"Insert column before": "Inserisci colonna prima",
-"Insert column after": "Inserisci colonna dopo",
-"Delete column": "Elimina colonna",
-"Cols": "Colonne",
-"Rows": "Righe",
-"Width": "Larghezza",
-"Height": "Altezza",
-"Cell spacing": "Spaziatura tra celle",
-"Cell padding": "Spaziatura interna celle",
-"Show caption": "Mostra didascalia",
-"Left": "Sinistra",
-"Center": "Centro",
-"Right": "Destra",
-"Cell type": "Tipo di cella",
-"Scope": "Ambito",
-"Alignment": "Allineamento",
-"H Align": "Allineamento H",
-"V Align": "Allineamento V",
-"Top": "In alto",
-"Middle": "Centrato",
-"Bottom": "In basso",
-"Header cell": "Cella d'intestazione",
-"Row group": "Gruppo di righe",
-"Column group": "Gruppo di colonne",
-"Row type": "Tipo di riga",
-"Header": "Intestazione",
-"Body": "Corpo",
-"Footer": "Pi\u00e8 di pagina",
-"Border color": "Colore del bordo",
-"Insert template...": "Inserisci modello...",
-"Templates": "Modelli",
-"Template": "Modello",
-"Text color": "Colore testo",
-"Background color": "Colore dello sfondo",
-"Custom...": "Personalizzato...",
-"Custom color": "Colore personalizzato",
-"No color": "Nessun colore",
-"Remove color": "Rimuovi colore",
-"Table of Contents": "Sommario",
-"Show blocks": "Mostra blocchi",
-"Show invisible characters": "Mostra caratteri invisibili",
-"Word count": "Conteggio parole",
-"Words: {0}": "Parole: {0}",
-"{0} words": "{0} parole",
-"File": "File",
-"Edit": "Modifica",
-"Insert": "Inserisci",
-"View": "Visualizza",
-"Format": "Formato",
-"Table": "Tabella",
-"Tools": "Strumenti",
-"Powered by {0}": "Con tecnologia {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Area di testo RTF. Premere ALT-F9 per il menu. Premere ALT-F10 per la barra degli strumenti. Premere ALT-0 per la guida.",
-"Image title": "Titolo immagine",
-"Border width": "Larghezza del bordo",
-"Border style": "Stile del bordo",
-"Error": "Errore",
-"Warn": "Avviso",
-"Valid": "Valido",
-"To open the popup, press Shift+Enter": "Per aprire il popup, premere Shift+Invio",
-"Rich Text Area. Press ALT-0 for help.": "Area di testo RTF. Premere ALT-0 per la guida.",
-"System Font": "Carattere di sistema",
-"Failed to upload image: {0}": "Caricamento immagine fallito: {0}",
-"Failed to load plugin: {0} from url {1}": "Caricamento plugin fallito: {0} dall'URL {1}",
-"Failed to load plugin url: {0}": "Caricamento URL plugin fallito: {0}",
-"Failed to initialize plugin: {0}": "Inizializzazione plugin fallita: {0}",
-"example": "esempio",
-"Search": "Cerca",
-"All": "Tutto",
-"Currency": "Valuta",
-"Text": "Testo",
-"Quotations": "Citazioni",
-"Mathematical": "Caratteri matematici",
-"Extended Latin": "Latino esteso",
-"Symbols": "Simboli",
-"Arrows": "Frecce",
-"User Defined": "Definito dall'utente",
-"dollar sign": "simbolo del dollaro",
-"currency sign": "simbolo di valuta",
-"euro-currency sign": "simbolo dell'euro",
-"colon sign": "simbolo del col\u00f3n",
-"cruzeiro sign": "simbolo del cruzeiro",
-"french franc sign": "simbolo del franco francese",
-"lira sign": "simbolo della lira",
-"mill sign": "simbolo del mill",
-"naira sign": "simbolo della naira",
-"peseta sign": "simbolo della peseta",
-"rupee sign": "simbolo della rup\u00eca",
-"won sign": "simbolo del won",
-"new sheqel sign": "simbolo del nuovo shekel",
-"dong sign": "simbolo del dong",
-"kip sign": "simbolo del kip",
-"tugrik sign": "simbolo del tugrik",
-"drachma sign": "simbolo della dracma",
-"german penny symbol": "simbolo del pfennig tedesco",
-"peso sign": "simbolo del peso",
-"guarani sign": "simbolo del guaran\u00ec",
-"austral sign": "simbolo dell'austral",
-"hryvnia sign": "simbolo della hryvnia",
-"cedi sign": "simbolo del cedi",
-"livre tournois sign": "simbolo della lira di Tours",
-"spesmilo sign": "simbolo dello spesmilo",
-"tenge sign": "simbolo del tenge",
-"indian rupee sign": "simbolo della rup\u00eca indiana",
-"turkish lira sign": "simbolo della lira turca",
-"nordic mark sign": "simbolo del marco nordico",
-"manat sign": "simbolo del manat",
-"ruble sign": "simbolo del rublo",
-"yen character": "simbolo dello yen",
-"yuan character": "simbolo dello yuan",
-"yuan character, in hong kong and taiwan": "simbolo dello yuan, Hong Kong e Taiwan",
-"yen\/yuan character variant one": "simbolo yen\/yuan variante uno",
-"Loading emoticons...": "Caricamento emoticon in corso",
-"Could not load emoticons": "Impossibile caricare emoticon",
-"People": "Persone",
-"Animals and Nature": "Animali e natura",
-"Food and Drink": "Cibi e bevande",
-"Activity": "Attivit\u00e0",
-"Travel and Places": "Viaggi e luoghi",
-"Objects": "Oggetti",
-"Flags": "Bandiere",
-"Characters": "Caratteri",
-"Characters (no spaces)": "Caratteri (senza spazi)",
-"Error: Form submit field collision.": "Errore: Conflitto di campi nel modulo inviato.",
-"Error: No form element found.": "Errore: Nessun elemento di modulo trovato.",
-"Update": "Aggiorna",
-"Color swatch": "Campione di colore",
-"Turquoise": "Turchese",
-"Green": "Verde",
-"Blue": "Blu",
-"Purple": "Viola",
-"Navy Blue": "Blu scuro",
-"Dark Turquoise": "Turchese scuro",
-"Dark Green": "Verde scuro",
-"Medium Blue": "Blu medio",
-"Medium Purple": "Viola medio",
-"Midnight Blue": "Blu notte",
-"Yellow": "Giallo",
-"Orange": "Arancio",
-"Red": "Rosso",
-"Light Gray": "Grigio chiaro",
-"Gray": "Grigio",
-"Dark Yellow": "Giallo scuro",
-"Dark Orange": "Arancio scuro",
-"Dark Red": "Rosso scuro",
-"Medium Gray": "Grigio medio",
-"Dark Gray": "Grigio scuro",
-"Black": "Nero",
-"White": "Bianco",
-"Switch to or from fullscreen mode": "Attiva\/disattiva la modalit\u00e0 schermo intero",
-"Open help dialog": "Apri la finestra di aiuto",
-"history": "cronologia",
-"styles": "stili",
-"formatting": "formattazione",
-"alignment": "allineamento",
-"indentation": "indentazione",
-"permanent pen": "penna indelebile",
-"comments": "commenti"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/ko_KR.js b/cps/static/js/libs/tinymce/langs/ko_KR.js
deleted file mode 100644
index 08b685131..000000000
--- a/cps/static/js/libs/tinymce/langs/ko_KR.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('ko_KR',{
-"Redo": "\ub2e4\uc2dc \uc2e4\ud589",
-"Undo": "\uc2e4\ud589 \ucde8\uc18c",
-"Cut": "\uc798\ub77c\ub0b4\uae30",
-"Copy": "\ubcf5\uc0ac",
-"Paste": "\ubd99\uc5ec\ub123\uae30",
-"Select all": "\uc804\uccb4\uc120\ud0dd",
-"New document": "\uc0c8 \ubb38\uc11c",
-"Ok": "\ud655\uc778",
-"Cancel": "\ucde8\uc18c",
-"Visual aids": "\uc2dc\uac01\uad50\uc7ac",
-"Bold": "\uad75\uac8c",
-"Italic": "\uae30\uc6b8\uc784\uaf34",
-"Underline": "\ubc11\uc904",
-"Strikethrough": "\ucde8\uc18c\uc120",
-"Superscript": "\uc704 \ucca8\uc790",
-"Subscript": "\uc544\ub798 \ucca8\uc790",
-"Clear formatting": "\uc11c\uc2dd \uc9c0\uc6b0\uae30",
-"Align left": "\uc67c\ucabd \ub9de\ucda4",
-"Align center": "\uac00\uc6b4\ub370 \ub9de\ucda4",
-"Align right": "\uc624\ub978\ucabd \ub9de\ucda4",
-"Justify": "\uc591\ucabd \ub9de\ucda4",
-"Bullet list": "\uae00\uba38\ub9ac \uae30\ud638 \ubaa9\ub85d",
-"Numbered list": "\ubc88\ud638 \ub9e4\uae30\uae30 \ubaa9\ub85d",
-"Decrease indent": "\ub0b4\uc5b4\uc4f0\uae30",
-"Increase indent": "\ub4e4\uc5ec\uc4f0\uae30",
-"Close": "\ub2eb\uae30",
-"Formats": "\uc11c\uc2dd",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\ube0c\ub77c\uc6b0\uc800\uac00 \ud074\ub9bd\ubcf4\ub4dc \uc811\uadfc\uc744 \uc9c0\uc6d0\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Ctrl+X\/C\/V \ub2e8\ucd95\ud0a4\ub97c \uc774\uc6a9\ud558\uc2ed\uc2dc\uc624.",
-"Headers": "\uba38\ub9ac\uae00",
-"Header 1": "\uba38\ub9ac\uae00 1",
-"Header 2": "\uba38\ub9ac\uae00 2",
-"Header 3": "\uba38\ub9ac\uae00 3",
-"Header 4": "\uba38\ub9ac\uae00 4",
-"Header 5": "\uba38\ub9ac\uae00 5",
-"Header 6": "\uba38\ub9ac\uae00 6",
-"Headings": "\uc81c\ubaa9",
-"Heading 1": "\uc81c\ubaa9 1",
-"Heading 2": "\uc81c\ubaa9 2",
-"Heading 3": "\uc81c\ubaa9 3",
-"Heading 4": "\uc81c\ubaa9 4",
-"Heading 5": "\uc81c\ubaa9 5",
-"Heading 6": "\uc81c\ubaa9 6",
-"Preformatted": "\uc11c\uc2dd \ubbf8\uc124\uc815",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\ucf54\ub4dc",
-"Paragraph": "\ub2e8\ub77d",
-"Blockquote": "\uc778\uc6a9\ubb38",
-"Inline": "\uc778\ub77c\uc778",
-"Blocks": "\ube14\ub85d",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\uc2a4\ud0c0\uc77c\ubcf5\uc0ac \ub044\uae30. \uc774 \uc635\uc158\uc744 \ub044\uae30 \uc804\uc5d0\ub294 \ubcf5\uc0ac \uc2dc, \uc2a4\ud0c0\uc77c\uc774 \ubcf5\uc0ac\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.",
-"Fonts": "\uae00\uaf34",
-"Font Sizes": "\uae00\uaf34 \ud06c\uae30",
-"Class": "\ud074\ub798\uc2a4",
-"Browse for an image": "\uc774\ubbf8\uc9c0 \ucc3e\uae30",
-"OR": "\ub610\ub294",
-"Drop an image here": "\uc5ec\uae30\ub85c \uc774\ubbf8\uc9c0 \ub04c\uc5b4\uc624\uae30",
-"Upload": "\uc5c5\ub85c\ub4dc",
-"Block": "\ube14\ub85d",
-"Align": "\uc815\ub82c",
-"Default": "\uae30\ubcf8",
-"Circle": "\uc6d0",
-"Disc": "\uc6d0\ubc18",
-"Square": "\uc0ac\uac01",
-"Lower Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
-"Lower Greek": "\uadf8\ub9ac\uc2a4\uc5b4 \uc18c\ubb38\uc790",
-"Lower Roman": "\ub85c\ub9c8\uc790 \uc18c\ubb38\uc790",
-"Upper Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
-"Upper Roman": "\ub85c\ub9c8\uc790 \ub300\ubb38\uc790",
-"Anchor...": "\uc575\ucee4...",
-"Name": "\uc774\ub984",
-"Id": "\uc544\uc774\ub514",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\uc544\uc774\ub514\ub294 \ubb38\uc790, \uc22b\uc790, \ub300\uc2dc, \uc810, \ucf5c\ub860 \ub610\ub294 \ubc11\uc904\ub85c \uc2dc\uc791\ud574\uc57c\ud569\ub2c8\ub2e4.",
-"You have unsaved changes are you sure you want to navigate away?": "\uc800\uc7a5\ud558\uc9c0 \uc54a\uc740 \uc815\ubcf4\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc774 \ud398\uc774\uc9c0\ub97c \ubc97\uc5b4\ub098\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
-"Restore last draft": "\ub9c8\uc9c0\ub9c9 \ucd08\uc548 \ubcf5\uc6d0",
-"Special character...": "\ud2b9\uc218 \ubb38\uc790...",
-"Source code": "\uc18c\uc2a4\ucf54\ub4dc",
-"Insert\/Edit code sample": "\ucf54\ub4dc\uc0d8\ud50c \uc0bd\uc785\/\ud3b8\uc9d1",
-"Language": "\uc5b8\uc5b4",
-"Code sample...": "\ucf54\ub4dc \uc0d8\ud50c...",
-"Color Picker": "\uc0c9 \uc120\ud0dd\uae30",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\uc67c\ucabd\uc5d0\uc11c \uc624\ub978\ucabd",
-"Right to left": "\uc624\ub978\ucabd\uc5d0\uc11c \uc67c\ucabd",
-"Emoticons...": "\uc774\ubaa8\ud2f0\ucf58...",
-"Metadata and Document Properties": "\uba54\ud0c0\ub370\uc774\ud130\uc640 \ubb38\uc11c \uc18d\uc131",
-"Title": "\uc81c\ubaa9",
-"Keywords": "\ud0a4\uc6cc\ub4dc",
-"Description": "\uc124\uba85",
-"Robots": "\ub85c\ubd07",
-"Author": "\uc800\uc790",
-"Encoding": "\uc778\ucf54\ub529",
-"Fullscreen": "\uc804\uccb4\ud654\uba74",
-"Action": "\ub3d9\uc791",
-"Shortcut": "\ub2e8\ucd95\ud0a4",
-"Help": "\ub3c4\uc6c0\ub9d0",
-"Address": "\uc8fc\uc18c",
-"Focus to menubar": "\uba54\ub274\uc5d0 \ud3ec\ucee4\uc2a4",
-"Focus to toolbar": "\ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
-"Focus to element path": "element path\uc5d0 \ud3ec\ucee4\uc2a4",
-"Focus to contextual toolbar": "\ucf04\ud14d\uc2a4\ud2b8 \ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
-"Insert link (if link plugin activated)": "\ub9c1\ud06c \uc0bd\uc785 (link \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
-"Save (if save plugin activated)": "\uc800\uc7a5 (save \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
-"Find (if searchreplace plugin activated)": "\ucc3e\uae30(searchreplace \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
-"Plugins installed ({0}):": "\uc124\uce58\ub41c \ud50c\ub7ec\uadf8\uc778 ({0}):",
-"Premium plugins:": "\uace0\uae09 \ud50c\ub7ec\uadf8\uc778",
-"Learn more...": "\uc880 \ub354 \uc0b4\ud3b4\ubcf4\uae30",
-"You are using {0}": "{0}\ub97c \uc0ac\uc6a9\uc911",
-"Plugins": "\ud50c\ub7ec\uadf8\uc778",
-"Handy Shortcuts": "\ub2e8\ucd95\ud0a4",
-"Horizontal line": "\uac00\ub85c",
-"Insert\/edit image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785\/\uc218\uc815",
-"Image description": "\uc774\ubbf8\uc9c0 \uc124\uba85",
-"Source": "\uc18c\uc2a4",
-"Dimensions": "\ud06c\uae30",
-"Constrain proportions": "\uc791\uc5c5 \uc81c\ud55c",
-"General": "\uc77c\ubc18",
-"Advanced": "\uace0\uae09",
-"Style": "\uc2a4\ud0c0\uc77c",
-"Vertical space": "\uc218\uc9c1 \uacf5\ubc31",
-"Horizontal space": "\uc218\ud3c9 \uacf5\ubc31",
-"Border": "\ud14c\ub450\ub9ac",
-"Insert image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785",
-"Image...": "\uc774\ubbf8\uc9c0...",
-"Image list": "\uc774\ubbf8\uc9c0 \ubaa9\ub85d",
-"Rotate counterclockwise": "\uc2dc\uacc4\ubc18\ub300\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
-"Rotate clockwise": "\uc2dc\uacc4\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
-"Flip vertically": "\uc218\uc9c1 \ub4a4\uc9d1\uae30",
-"Flip horizontally": "\uc218\ud3c9 \ub4a4\uc9d1\uae30",
-"Edit image": "\uc774\ubbf8\uc9c0 \ud3b8\uc9d1",
-"Image options": "\uc774\ubbf8\uc9c0 \uc635\uc158",
-"Zoom in": "\ud655\ub300",
-"Zoom out": "\ucd95\uc18c",
-"Crop": "\uc790\ub974\uae30",
-"Resize": "\ud06c\uae30 \uc870\uc808",
-"Orientation": "\ubc29\ud5a5",
-"Brightness": "\ubc1d\uae30",
-"Sharpen": "\uc120\uba85\ud558\uac8c",
-"Contrast": "\ub300\ube44",
-"Color levels": "\uc0c9\uc0c1\ub808\ubca8",
-"Gamma": "\uac10\ub9c8",
-"Invert": "\ubc18\uc804",
-"Apply": "\uc801\uc6a9",
-"Back": "\ub4a4\ub85c",
-"Insert date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04\uc0bd\uc785",
-"Date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04",
-"Insert\/Edit Link": "\ub9c1\ud06c \uc0bd\uc785\/\ud3b8\uc9d1",
-"Insert\/edit link": "\ub9c1\ud06c \uc0bd\uc785\/\uc218\uc815",
-"Text to display": "\ubcf8\ubb38",
-"Url": "\uc8fc\uc18c",
-"Open link in...": "...\uc5d0\uc11c \ub9c1\ud06c \uc5f4\uae30",
-"Current window": "\ud604\uc7ac \ucc3d",
-"None": "\uc5c6\uc74c",
-"New window": "\uc0c8\ucc3d",
-"Remove link": "\ub9c1\ud06c\uc0ad\uc81c",
-"Anchors": "\ucc45\uac08\ud53c",
-"Link...": "\ub9c1\ud06c...",
-"Paste or type a link": "\ub9c1\ud06c\ub97c \ubd99\uc5ec\ub123\uac70\ub098 \uc785\ub825\ud558\uc138\uc694",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\ud604\uc7ac E-mail\uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. E-mail \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\ud604\uc7ac \uc6f9\uc0ac\uc774\ud2b8 \uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. \ud574\ub2f9 \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
-"Link list": "\ub9c1\ud06c \ub9ac\uc2a4\ud2b8",
-"Insert video": "\ube44\ub514\uc624 \uc0bd\uc785",
-"Insert\/edit video": "\ube44\ub514\uc624 \uc0bd\uc785\/\uc218\uc815",
-"Insert\/edit media": "\ubbf8\ub514\uc5b4 \uc0bd\uc785\/\uc218\uc815",
-"Alternative source": "\ub300\uccb4 \uc18c\uc2a4",
-"Alternative source URL": "\ub300\uccb4 \uc6d0\ubcf8 URL",
-"Media poster (Image URL)": "\ub300\ud45c \uc774\ubbf8\uc9c0(\uc774\ubbf8\uc9c0 URL)",
-"Paste your embed code below:": "\uc544\ub798\uc5d0 \ucf54\ub4dc\ub97c \ubd99\uc5ec\ub123\uc73c\uc138\uc694:",
-"Embed": "\uc0bd\uc785",
-"Media...": "\ubbf8\ub514\uc5b4...",
-"Nonbreaking space": "\ub744\uc5b4\uc4f0\uae30",
-"Page break": "\ud398\uc774\uc9c0 \uad6c\ubd84\uc790",
-"Paste as text": "\ud14d\uc2a4\ud2b8\ub85c \ubd99\uc5ec\ub123\uae30",
-"Preview": "\ubbf8\ub9ac\ubcf4\uae30",
-"Print...": "\uc778\uc1c4...",
-"Save": "\uc800\uc7a5",
-"Find": "\ucc3e\uae30",
-"Replace with": "\uad50\uccb4",
-"Replace": "\uad50\uccb4",
-"Replace all": "\uc804\uccb4 \uad50\uccb4",
-"Previous": "\uc774\uc804",
-"Next": "\ub2e4\uc74c",
-"Find and replace...": "\ucc3e\uae30 \ubc0f \ubc14\uafb8\uae30...",
-"Could not find the specified string.": "\ubb38\uc790\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
-"Match case": "\ub300\uc18c\ubb38\uc790 \uc77c\uce58",
-"Find whole words only": "\ubaa8\ub450 \uc77c\uce58\ud558\ub294 \ubb38\uc790 \ucc3e\uae30",
-"Spell check": "\ub9de\ucda4\ubc95 \uac80\uc0ac",
-"Ignore": "\ubb34\uc2dc",
-"Ignore all": "\uc804\uccb4\ubb34\uc2dc",
-"Finish": "\uc644\ub8cc",
-"Add to Dictionary": "\uc0ac\uc804\uc5d0 \ucd94\uac00",
-"Insert table": "\ud14c\uc774\ube14 \uc0bd\uc785",
-"Table properties": "\ud14c\uc774\ube14 \uc18d\uc131",
-"Delete table": "\ud14c\uc774\ube14 \uc0ad\uc81c",
-"Cell": "\uc140",
-"Row": "\uc5f4",
-"Column": "\ud589",
-"Cell properties": "\uc140 \uc18d",
-"Merge cells": "\uc140 \ud569\uce58\uae30",
-"Split cell": "\uc140 \ub098\ub204\uae30",
-"Insert row before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
-"Insert row after": "\ub2e4\uc74c\uc5d0 \ud589 \uc0bd\uc785",
-"Delete row": "\ud589 \uc9c0\uc6b0\uae30",
-"Row properties": "\ud589 \uc18d\uc131",
-"Cut row": "\ud589 \uc798\ub77c\ub0b4\uae30",
-"Copy row": "\ud589 \ubcf5\uc0ac",
-"Paste row before": "\uc774\uc804\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
-"Paste row after": "\ub2e4\uc74c\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
-"Insert column before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
-"Insert column after": "\ub2e4\uc74c\uc5d0 \uc5f4 \uc0bd\uc785",
-"Delete column": "\uc5f4 \uc9c0\uc6b0\uae30",
-"Cols": "\uc5f4",
-"Rows": "\ud589",
-"Width": "\ub113\uc774",
-"Height": "\ub192\uc774",
-"Cell spacing": "\uc140 \uac04\uaca9",
-"Cell padding": "\uc140 \uc548\ucabd \uc5ec\ubc31",
-"Show caption": "\ucea1\uc158 \ud45c\uc2dc",
-"Left": "\uc67c\ucabd",
-"Center": "\uac00\uc6b4\ub370",
-"Right": "\uc624\ub978\ucabd",
-"Cell type": "\uc140 \ud0c0\uc785",
-"Scope": "\ubc94\uc704",
-"Alignment": "\uc815\ub82c",
-"H Align": "\uac00\ub85c \uc815\ub82c",
-"V Align": "\uc138\ub85c \uc815\ub82c",
-"Top": "\uc0c1\ub2e8",
-"Middle": "\uc911\uac04",
-"Bottom": "\ud558\ub2e8",
-"Header cell": "\ud5e4\ub354 \uc140",
-"Row group": "\ud589 \uadf8\ub8f9",
-"Column group": "\uc5f4 \uadf8\ub8f9",
-"Row type": "\ud589 \ud0c0\uc785",
-"Header": "\ud5e4\ub354",
-"Body": "\ubc14\ub514",
-"Footer": "\ud478\ud130",
-"Border color": "\ud14c\ub450\ub9ac \uc0c9",
-"Insert template...": "\ud15c\ud50c\ub9bf \uc0bd\uc785...",
-"Templates": "\ud15c\ud50c\ub9bf",
-"Template": "\ud15c\ud50c\ub9bf",
-"Text color": "\ubb38\uc790 \uc0c9\uae54",
-"Background color": "\ubc30\uacbd\uc0c9",
-"Custom...": "\uc9c1\uc811 \uc0c9\uae54 \uc9c0\uc815\ud558\uae30",
-"Custom color": "\uc9c1\uc811 \uc9c0\uc815\ud55c \uc0c9\uae54",
-"No color": "\uc0c9\uc0c1 \uc5c6\uc74c",
-"Remove color": "\uc0c9 \uc81c\uac70",
-"Table of Contents": "\ubaa9\ucc28",
-"Show blocks": "\ube14\ub7ed \ubcf4\uc5ec\uc8fc\uae30",
-"Show invisible characters": "\uc548\ubcf4\uc774\ub294 \ubb38\uc790 \ubcf4\uc774\uae30",
-"Word count": "\ub2e8\uc5b4 \uc218",
-"Count": "\uac1c\uc218",
-"Document": "\ubb38\uc11c",
-"Selection": "\uc120\ud0dd",
-"Words": "\ub2e8\uc5b4",
-"Words: {0}": "\ub2e8\uc5b4: {0}",
-"{0} words": "{0} \ub2e8\uc5b4",
-"File": "\ud30c\uc77c",
-"Edit": "\uc218\uc815",
-"Insert": "\uc0bd\uc785",
-"View": "\ubcf4\uae30",
-"Format": "\ud3ec\ub9f7",
-"Table": "\ud14c\uc774\ube14",
-"Tools": "\ub3c4\uad6c",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \ud3b8\uc9d1\uae30 \uc785\ub2c8\ub2e4. ALT-F9\ub97c \ub204\ub974\uba74 \uba54\ub274, ALT-F10\ub97c \ub204\ub974\uba74 \ud234\ubc14, ALT-0\uc744 \ub204\ub974\uba74 \ub3c4\uc6c0\ub9d0\uc744 \ubcfc \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
-"Image title": "\uc774\ubbf8\uc9c0 \uc81c\ubaa9",
-"Border width": "\ud14c\ub450\ub9ac \ub450\uaed8",
-"Border style": "\ud14c\ub450\ub9ac \uc2a4\ud0c0\uc77c",
-"Error": "\uc624\ub958",
-"Warn": "\uacbd\uace0",
-"Valid": "\uc720\ud6a8\ud568",
-"To open the popup, press Shift+Enter": "\ud31d\uc5c5\uc744 \uc5f4\ub824\uba74 Shift+Enter\ub97c \ub204\ub974\uc2ed\uc2dc\uc624.",
-"Rich Text Area. Press ALT-0 for help.": "\uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \uc601\uc5ed. ALT-0\uc744 \ub204\ub974\uba74 \ub3c4\uc6c0\ub9d0\uc744 \ubcfc \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
-"System Font": "\uc2dc\uc2a4\ud15c \uae00\uaf34",
-"Failed to upload image: {0}": "\uc774\ubbf8\uc9c0 \uc5c5\ub85c\ub4dc \uc2e4\ud328: {0}",
-"Failed to load plugin: {0} from url {1}": "\ud50c\ub7ec\uadf8\uc778 \ub85c\ub4dc \uc2e4\ud328:  URL: {1}\uc5d0\uc11c\uc758 {0}",
-"Failed to load plugin url: {0}": "\ud50c\ub7ec\uadf8\uc778 URL \ub85c\ub4dc \uc2e4\ud328: {0}",
-"Failed to initialize plugin: {0}": "\ud50c\ub7ec\uadf8\uc778 \ucd08\uae30\ud654 \uc2e4\ud328: {0}",
-"example": "\uc608\uc81c",
-"Search": "\uac80\uc0c9",
-"All": "\ubaa8\ub450",
-"Currency": "\ud1b5\ud654",
-"Text": "\ud14d\uc2a4\ud2b8",
-"Quotations": "\uc778\uc6a9\ubb38",
-"Mathematical": "\uc218\ud559",
-"Extended Latin": "\ud655\uc7a5 \ub77c\ud2f4\uc5b4",
-"Symbols": "\uae30\ud638",
-"Arrows": "\ud654\uc0b4\ud45c",
-"User Defined": "\uc0ac\uc6a9\uc790 \uc815\uc758",
-"dollar sign": "\ub2ec\ub7ec \uae30\ud638",
-"currency sign": "\ud1b5\ud654 \uae30\ud638",
-"euro-currency sign": "\uc720\ub85c\ud654 \uae30\ud638",
-"colon sign": "\ucf5c\ub860 \uae30\ud638",
-"cruzeiro sign": "\ud06c\ub8e8\uc81c\uc774\ub8e8 \uae30\ud638",
-"french franc sign": "\ud504\ub791\uc2a4 \ud504\ub791 \uae30\ud638",
-"lira sign": "\ub9ac\ub77c \uae30\ud638",
-"mill sign": "\ubc00 \uae30\ud638",
-"naira sign": "\ub098\uc774\ub77c \uae30\ud638",
-"peseta sign": "\ud398\uc138\ud0c0 \uae30\ud638",
-"rupee sign": "\ub8e8\ud53c \uae30\ud638",
-"won sign": "\uc6d0 \uae30\ud638",
-"new sheqel sign": "\ub274 \uc138\ucf08 \uae30\ud638",
-"dong sign": "\ub3d9 \uae30\ud638",
-"kip sign": "\ud0b5 \uae30\ud638",
-"tugrik sign": "\ud22c\uadf8\ub9ac\ud06c \uae30\ud638",
-"drachma sign": "\ub4dc\ub77c\ud06c\ub9c8 \uae30\ud638",
-"german penny symbol": "\ub3c5\uc77c \ud398\ub2c8 \uae30\ud638",
-"peso sign": "\ud398\uc18c \uae30\ud638",
-"guarani sign": "\uacfc\ub77c\ub2c8 \uae30\ud638",
-"austral sign": "\uc544\uc6b0\uc2a4\ud2b8\ub784 \uae30\ud638",
-"hryvnia sign": "\uadf8\ub9ac\ube0c\ub098 \uae30\ud638",
-"cedi sign": "\uc138\ub514 \uae30\ud638",
-"livre tournois sign": "\ub9ac\ube0c\ub974 \ud2b8\ub974\ub204\uc544 \uae30\ud638",
-"spesmilo sign": "\uc2a4\ud398\uc2a4\ubc00\ub85c \uae30\ud638",
-"tenge sign": "\ud161\uac8c \uae30\ud638",
-"indian rupee sign": "\uc778\ub3c4 \ub8e8\ud53c \uae30\ud638",
-"turkish lira sign": "\ud130\ud0a4 \ub9ac\ub77c \uae30\ud638",
-"nordic mark sign": "\ub178\ub974\ub515 \ub9c8\ub974\ud06c \uae30\ud638",
-"manat sign": "\ub9c8\ub098\ud2b8 \uae30\ud638",
-"ruble sign": "\ub8e8\ube14 \uae30\ud638",
-"yen character": "\uc5d4 \uae30\ud638",
-"yuan character": "\uc704\uc548 \uae30\ud638",
-"yuan character, in hong kong and taiwan": "\ub300\ub9cc \uc704\uc548 \uae30\ud638",
-"yen\/yuan character variant one": "\uc5d4\/\uc704\uc548 \ubb38\uc790 \ubcc0\ud615",
-"Loading emoticons...": "\uc774\ubaa8\ud2f0\ucf58 \ubd88\ub7ec\uc624\ub294 \uc911...",
-"Could not load emoticons": "\uc774\ubaa8\ud2f0\ucf58\uc744 \ubd88\ub7ec\uc62c \uc218 \uc5c6\uc74c",
-"People": "\uc0ac\ub78c",
-"Animals and Nature": "\ub3d9\ubb3c\uacfc \uc790\uc5f0",
-"Food and Drink": "\uc74c\uc2dd\uacfc \uc74c\ub8cc",
-"Activity": "\ud65c\ub3d9",
-"Travel and Places": "\uc5ec\ud589\uacfc \uc7a5\uc18c",
-"Objects": "\ubb3c\uac74",
-"Flags": "\uae43\ubc1c",
-"Characters": "\ubb38\uc790",
-"Characters (no spaces)": "\ubb38\uc790(\uacf5\ubc31 \uc5c6\uc74c)",
-"{0} characters": "{0} \ubb38\uc790",
-"Error: Form submit field collision.": "\uc624\ub958: \uc591\uc2dd \uc81c\ucd9c \ud544\ub4dc \ubd88\uc77c\uce58",
-"Error: No form element found.": "\uc624\ub958: \uc591\uc2dd \ud56d\ubaa9 \uc5c6\uc74c",
-"Update": "\uc5c5\ub370\uc774\ud2b8",
-"Color swatch": "\uc0c9\uc0c1 \uacac\ubcf8",
-"Turquoise": "\uccad\ub85d\uc0c9",
-"Green": "\ucd08\ub85d\uc0c9",
-"Blue": "\ud30c\ub780\uc0c9",
-"Purple": "\ubcf4\ub77c\uc0c9",
-"Navy Blue": "\ub0a8\uc0c9",
-"Dark Turquoise": "\uc9c4\ud55c \uccad\ub85d\uc0c9",
-"Dark Green": "\uc9c4\ud55c \ucd08\ub85d\uc0c9",
-"Medium Blue": "\uc911\uac04 \ud30c\ub780\uc0c9",
-"Medium Purple": "\uc911\uac04 \ubcf4\ub77c\uc0c9",
-"Midnight Blue": "\uc9c4\ud55c \ud30c\ub780\uc0c9",
-"Yellow": "\ub178\ub780\uc0c9",
-"Orange": "\uc8fc\ud669\uc0c9",
-"Red": "\ube68\uac04\uc0c9",
-"Light Gray": "\ubc1d\uc740 \ud68c\uc0c9",
-"Gray": "\ud68c\uc0c9",
-"Dark Yellow": "\uc9c4\ud55c \ub178\ub780\uc0c9",
-"Dark Orange": "\uc9c4\ud55c \uc8fc\ud669\uc0c9",
-"Dark Red": "\uc9c4\ud55c \ube68\uac04\uc0c9",
-"Medium Gray": "\uc911\uac04 \ud68c\uc0c9",
-"Dark Gray": "\uc9c4\ud55c \ud68c\uc0c9",
-"Light Green": "\ubc1d\uc740 \ub179\uc0c9",
-"Light Yellow": "\ubc1d\uc740 \ub178\ub780\uc0c9",
-"Light Red": "\ubc1d\uc740 \ube68\uac04\uc0c9",
-"Light Purple": "\ubc1d\uc740 \ubcf4\ub77c\uc0c9",
-"Light Blue": "\ubc1d\uc740 \ud30c\ub780\uc0c9",
-"Dark Purple": "\uc9c4\ud55c \ubcf4\ub77c\uc0c9",
-"Dark Blue": "\uc9c4\ud55c \ud30c\ub780\uc0c9",
-"Black": "\uac80\uc740\uc0c9",
-"White": "\ud770\uc0c9",
-"Switch to or from fullscreen mode": "\uc804\uccb4 \ud654\uba74\uc73c\ub85c\/\uc5d0\uc11c \uc804\ud658",
-"Open help dialog": "\ub3c4\uc6c0\ub9d0 \ub300\ud654\ucc3d \uc5f4\uae30",
-"history": "\uae30\ub85d",
-"styles": "\uc2a4\ud0c0\uc77c",
-"formatting": "\ud3ec\ub9f7\ud305",
-"alignment": "\uc815\ub82c",
-"indentation": "\ub4e4\uc5ec\uc4f0\uae30",
-"permanent pen": "\uc720\uc131\ud39c",
-"comments": "\uc8fc\uc11d",
-"Format Painter": "\uc11c\uc2dd \ubcf5\uc0ac",
-"Insert\/edit iframe": "\uc544\uc774\ud504\ub808\uc784 \uc0bd\uc785\/\ud3b8\uc9d1",
-"Capitalization": "\ub300\ubb38\uc790\ud654",
-"lowercase": "\uc18c\ubb38\uc790",
-"UPPERCASE": "\ub300\ubb38\uc790",
-"Title Case": "\uc81c\ubaa9\uc744 \ub300\ubb38\uc790\ud654",
-"Permanent Pen Properties": "\uc601\uad6c \ud39c \ud2b9\uc131",
-"Permanent pen properties...": "\uc601\uad6c \ud39c \ud2b9\uc131...",
-"Font": "\uae00\uaf34",
-"Size": "\ud06c\uae30",
-"More...": "\ub354 \ubcf4\uae30...",
-"Spellcheck Language": "\ub9de\ucda4\ubc95 \uac80\uc0ac \uc5b8\uc5b4",
-"Select...": "\uc120\ud0dd...",
-"Preferences": "\ud658\uacbd\uc124\uc815",
-"Yes": "\ub124",
-"No": "\uc544\ub2c8\uc624",
-"Keyboard Navigation": "\ud0a4 \uc120\ud0dd",
-"Version": "\ubc84\uc804",
-"Anchor": "\uc575\ucee4",
-"Special character": "\ud2b9\uc218\ubb38\uc790",
-"Code sample": "\ucf54\ub4dc\uc0d8\ud50c",
-"Color": "\uc0c9\uc0c1",
-"Emoticons": "\uc774\ubaa8\ud2f0\ucf58",
-"Document properties": "\ubb38\uc11c \uc18d\uc131",
-"Image": "\uc774\ubbf8\uc9c0",
-"Insert link": "\ub9c1\ud06c \uc0bd\uc785 ",
-"Target": "\ub300\uc0c1",
-"Link": "\ub9c1\ud06c",
-"Poster": "\ud3ec\uc2a4\ud130",
-"Media": "\ubbf8\ub514\uc5b4",
-"Print": "\ucd9c\ub825",
-"Prev": "\uc774\uc804",
-"Find and replace": "\ucc3e\uc544\uc11c \uad50\uccb4",
-"Whole words": "\uc804\uccb4 \ub2e8\uc5b4",
-"Spellcheck": "\ubb38\ubc95\uccb4\ud06c",
-"Caption": "\ucea1\uc158",
-"Insert template": "\ud15c\ud50c\ub9bf \uc0bd\uc785"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/nb_NO.js b/cps/static/js/libs/tinymce/langs/nb_NO.js
deleted file mode 100644
index b76a2efd1..000000000
--- a/cps/static/js/libs/tinymce/langs/nb_NO.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('nb_NO',{
-"Redo": "Gj\u00f8r om",
-"Undo": "Angre",
-"Cut": "Klipp ut",
-"Copy": "Kopier",
-"Paste": "Lim inn",
-"Select all": "Marker alt",
-"New document": "Nytt dokument",
-"Ok": "Ok",
-"Cancel": "Avbryt",
-"Visual aids": "Visuelle hjelpemidler",
-"Bold": "Fet",
-"Italic": "Kursiv",
-"Underline": "Understreking",
-"Strikethrough": "Gjennomstreking",
-"Superscript": "Hevet skrift",
-"Subscript": "Senket skrift",
-"Clear formatting": "Fjern formateringer",
-"Align left": "Venstrejuster",
-"Align center": "Midtstill",
-"Align right": "H\u00f8yrejuster",
-"Justify": "Blokkjuster",
-"Bullet list": "Punktliste",
-"Numbered list": "Nummerliste",
-"Decrease indent": "Reduser innrykk",
-"Increase indent": "\u00d8k innrykk",
-"Close": "Lukk",
-"Formats": "Stiler",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nettleseren din st\u00f8tter ikke direkte tilgang til utklippsboken. Bruk istedet tastatursnarveiene Ctrl+X\/C\/V.",
-"Headers": "Overskrifter",
-"Header 1": "Overskrift 1",
-"Header 2": "Overskrift 2",
-"Header 3": "Overskrift 3",
-"Header 4": "Overskrift 4",
-"Header 5": "Overskrift 5",
-"Header 6": "Overskrift 6",
-"Headings": "Overskrifter",
-"Heading 1": "Overskrift 1",
-"Heading 2": "Overskrift 2",
-"Heading 3": "Overskrift 3",
-"Heading 4": "Overskrift 4",
-"Heading 5": "Overskrift 5",
-"Heading 6": "Overskrift 6",
-"Preformatted": "Forh\u00e5ndsformatert",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kode",
-"Paragraph": "Avsnitt",
-"Blockquote": "Blockquote",
-"Inline": "Innkapslet",
-"Blocks": "Blokker",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Lim inn er n\u00e5 i ren-tekst modus. Kopiert innhold vil bli limt inn som ren tekst inntil du sl\u00e5r av dette valget.",
-"Fonts": "Fonter",
-"Font Sizes": "Fontst\u00f8rrelser",
-"Class": "Klasse",
-"Browse for an image": "S\u00f8k etter bilde",
-"OR": "OR",
-"Drop an image here": "Slipp et bilde her",
-"Upload": "Last opp",
-"Block": "Blokk",
-"Align": "Juster",
-"Default": "Normal",
-"Circle": "\u00c5pen sirkel",
-"Disc": "Fylt sirkel",
-"Square": "Fylt firkant",
-"Lower Alpha": "Minuskler",
-"Lower Greek": "Greske minuskler",
-"Lower Roman": "Romerske minuskler",
-"Upper Alpha": "Versaler",
-"Upper Roman": "Romerske versaler",
-"Anchor...": "Lenke",
-"Name": "Navn",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id burde starte med en bokstav, bare fulgt av bokstaver, nummer, streker, punktum, koloner eller understreker.",
-"You have unsaved changes are you sure you want to navigate away?": "Du har ikke arkivert endringene. Vil du fortsette uten \u00e5 arkivere?",
-"Restore last draft": "Gjenopprett siste utkast",
-"Special character...": "Spesialtegn...",
-"Source code": "Kildekode",
-"Insert\/Edit code sample": "Sett inn\/endre kodeeksempel",
-"Language": "Spr\u00e5k",
-"Code sample...": "Kodeeksempel",
-"Color Picker": "Fargevelger",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Venstre til h\u00f8yre",
-"Right to left": "H\u00f8yre til venstre",
-"Emoticons...": "Emoticons..",
-"Metadata and Document Properties": "Metadata og dokumentverdier",
-"Title": "Tittel",
-"Keywords": "N\u00f8kkelord",
-"Description": "Beskrivelse",
-"Robots": "Roboter",
-"Author": "Forfatter",
-"Encoding": "Tegnkoding",
-"Fullscreen": "Fullskjerm",
-"Action": "Handling",
-"Shortcut": "Snarvei",
-"Help": "Hjelp",
-"Address": "Adresse",
-"Focus to menubar": "Fokus p\u00e5 menylinje",
-"Focus to toolbar": "Fokus p\u00e5 verkt\u00f8ylinje",
-"Focus to element path": "Fokus p\u00e5 elementsti",
-"Focus to contextual toolbar": "Fokus p\u00e5 kontekstuell verkt\u00f8ylinje",
-"Insert link (if link plugin activated)": "Sett inn lenke (dersom lenketillegg er aktivert)",
-"Save (if save plugin activated)": "Lagre (dersom lagretillegg er aktivert)",
-"Find (if searchreplace plugin activated)": "Finn (dersom tillegg for s\u00f8k og erstatt er aktivert)",
-"Plugins installed ({0}):": "Installerte tillegg ({0}):",
-"Premium plugins:": "Premiumtillegg:",
-"Learn more...": "Les mer ...",
-"You are using {0}": "Du bruker {0}",
-"Plugins": "Tillegg",
-"Handy Shortcuts": "Nyttige snarveier",
-"Horizontal line": "Horisontal linje",
-"Insert\/edit image": "Sett inn\/endre bilde",
-"Image description": "Bildebeskrivelse",
-"Source": "Bildelenke",
-"Dimensions": "Dimensjoner",
-"Constrain proportions": "Behold proporsjoner",
-"General": "Generelt",
-"Advanced": "Avansert",
-"Style": "Stil",
-"Vertical space": "Vertikal marg",
-"Horizontal space": "Horisontal marg",
-"Border": "Ramme",
-"Insert image": "Sett inn bilde",
-"Image...": "Bilde...",
-"Image list": "Bildeliste",
-"Rotate counterclockwise": "Roter mot venstre",
-"Rotate clockwise": "Roter mot h\u00f8yre",
-"Flip vertically": "Speilvend vertikalt",
-"Flip horizontally": "Speilvend horisontalt",
-"Edit image": "Rediger bilde",
-"Image options": "Bilde innstillinger",
-"Zoom in": "Zoom inn",
-"Zoom out": "Zoom ut",
-"Crop": "Beskj\u00e6r",
-"Resize": "Skaler",
-"Orientation": "Orientering",
-"Brightness": "Lysstyrke",
-"Sharpen": "Skarphet",
-"Contrast": "Kontrast",
-"Color levels": "Fargeniv\u00e5",
-"Gamma": "Gamma",
-"Invert": "Inverter",
-"Apply": "Utf\u00f8r",
-"Back": "Tilbake",
-"Insert date\/time": "Sett inn dato\/tid",
-"Date\/time": "Dato\/tid",
-"Insert\/Edit Link": "Sett inn \/ Rediger lenke",
-"Insert\/edit link": "Sett inn\/endre lenke",
-"Text to display": "Tekst som skal vises",
-"Url": "Url",
-"Open link in...": "\u00c5pne lenke i..",
-"Current window": "N\u00e5v\u00e6rende vindu",
-"None": "Ingen",
-"New window": "Nytt vindu",
-"Remove link": "Fjern lenke",
-"Anchors": "Anker",
-"Link...": "Lenke...",
-"Paste or type a link": "Lim inn eller skriv en lenke",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Oppgitte URL ser ut til \u00e5 v\u00e6re en epost-adresse. \u00d8nsker du \u00e5 sette inn p\u00e5krevet mailto: prefiks forran epost-adressen?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Oppgitt URL ser ut til \u00e5 v\u00e6re en e-postadresse. \u00d8nsker du \u00e5 sette inn p\u00e5krevd mailto:-prefiks foran e-postadressen?",
-"Link list": "Lenkeliste",
-"Insert video": "Sett inn video",
-"Insert\/edit video": "Sett inn\/rediger video",
-"Insert\/edit media": "Sett inn\/endre media",
-"Alternative source": "Alternativ kilde",
-"Alternative source URL": "Alternativ kilde URL",
-"Media poster (Image URL)": "Mediaposter (bilde-URL)",
-"Paste your embed code below:": "Lim inn  inkluderings-koden nedenfor",
-"Embed": "Inkluder",
-"Media...": "Media..",
-"Nonbreaking space": "Hardt mellomrom",
-"Page break": "Sideskifte",
-"Paste as text": "Lim inn som tekst",
-"Preview": "Forh\u00e5ndsvisning",
-"Print...": "Skriv ut...",
-"Save": "Arkiver",
-"Find": "Finn",
-"Replace with": "Erstatt med",
-"Replace": "Erstatt",
-"Replace all": "Erstatt alle",
-"Previous": "Forrige",
-"Next": "Neste",
-"Find and replace...": "Finn og erstatt...",
-"Could not find the specified string.": "Kunne ikke finne den spesifiserte teksten",
-"Match case": "Match store og sm\u00e5 bokstaver",
-"Find whole words only": "Finn kun hele ord",
-"Spell check": "Stavekontroll",
-"Ignore": "Ignorer",
-"Ignore all": "Ignorer alle",
-"Finish": "Avslutt",
-"Add to Dictionary": "Legg til i ordliste",
-"Insert table": "Sett inn tabell",
-"Table properties": "Tabell egenskaper",
-"Delete table": "Slett tabell",
-"Cell": "Celle",
-"Row": "Rad",
-"Column": "Kolonne",
-"Cell properties": "Celle egenskaper",
-"Merge cells": "Sl\u00e5 sammen celler",
-"Split cell": "Splitt celle",
-"Insert row before": "Sett inn rad f\u00f8r",
-"Insert row after": "Sett in rad etter",
-"Delete row": "Slett rad",
-"Row properties": "Rad egenskaper",
-"Cut row": "Klipp ut rad",
-"Copy row": "Kopier rad",
-"Paste row before": "Lim inn rad f\u00f8r",
-"Paste row after": "Lim inn rad etter",
-"Insert column before": "Sett inn kolonne f\u00f8r",
-"Insert column after": "Sett inn kolonne etter",
-"Delete column": "Slett kolonne",
-"Cols": "Kolonner",
-"Rows": "Rader",
-"Width": "Bredde",
-"Height": "H\u00f8yde",
-"Cell spacing": "Celleavstand",
-"Cell padding": "Cellemarg",
-"Show caption": "Vis bildetekst",
-"Left": "Venstre",
-"Center": "Midtstilt",
-"Right": "H\u00f8yre",
-"Cell type": "Celletype",
-"Scope": "Omfang",
-"Alignment": "Justering",
-"H Align": "H Justering",
-"V Align": "V Justering",
-"Top": "Topp",
-"Middle": "Midten",
-"Bottom": "Bunn",
-"Header cell": "Topptekst-celle",
-"Row group": "Radgruppe",
-"Column group": "Kolonnegruppe",
-"Row type": "Rad-type",
-"Header": "Topptekst",
-"Body": "Br\u00f8dtekst",
-"Footer": "Bunntekst",
-"Border color": "Rammefarge",
-"Insert template...": "Sett inn mal..",
-"Templates": "Maler",
-"Template": "Mal",
-"Text color": "Tekstfarge",
-"Background color": "Bakgrunnsfarge",
-"Custom...": "Tilpass...",
-"Custom color": "Tilpasset farge",
-"No color": "Ingen farge",
-"Remove color": "Fjern farge",
-"Table of Contents": "Innholdsfortegnelse",
-"Show blocks": "Vis blokker",
-"Show invisible characters": "Vis skjulte tegn",
-"Word count": "Ordtelling",
-"Count": "Opptelling",
-"Document": "Dokument",
-"Selection": "Utvalg",
-"Words": "Ord",
-"Words: {0}": "Antall ord: {0}",
-"{0} words": "{0} ord",
-"File": "Arkiv",
-"Edit": "Rediger",
-"Insert": "Sett inn",
-"View": "Vis",
-"Format": "Format",
-"Table": "Tabell",
-"Tools": "Verkt\u00f8y",
-"Powered by {0}": "Redigert med {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Tekstredigering. Tast ALT-F9 for meny. Tast ALT-F10 for verkt\u00f8ys-rader. Tast ALT-0 for hjelp.",
-"Image title": "Bildetittel",
-"Border width": "Bordbredde",
-"Border style": "Bordstil",
-"Error": "Feil",
-"Warn": "Advarsel",
-"Valid": "Gyldig",
-"To open the popup, press Shift+Enter": "For \u00e5 \u00e5pne popup, trykk Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "Rik-tekstomr\u00e5de. Trykk ALT-0 for hjelp.",
-"System Font": "Systemfont",
-"Failed to upload image: {0}": "Opplasting av bilde feilet: {0}",
-"Failed to load plugin: {0} from url {1}": "Kunne ikke laste tillegg: {0} from url {1}",
-"Failed to load plugin url: {0}": "Kunne ikke laste tillegg url: {0}",
-"Failed to initialize plugin: {0}": "Kunne ikke initialisere tillegg: {0}",
-"example": "eksempel",
-"Search": "S\u00f8k",
-"All": "Alle",
-"Currency": "Valuta",
-"Text": "Tekst",
-"Quotations": "Sitater",
-"Mathematical": "Matematisk",
-"Extended Latin": "Utvidet latin",
-"Symbols": "Symboler",
-"Arrows": "Piler",
-"User Defined": "Brukerdefinert",
-"dollar sign": "dollartegn",
-"currency sign": "valutasymbol",
-"euro-currency sign": "Euro-valutasymbol",
-"colon sign": "kolon-symbol",
-"cruzeiro sign": "cruzeiro-symbol",
-"french franc sign": "franske franc-symbol",
-"lira sign": "lire-symbol",
-"mill sign": "mill-symbol",
-"naira sign": "naira-symbol",
-"peseta sign": "peseta-symbol",
-"rupee sign": "rupee-symbol",
-"won sign": "won-symbol",
-"new sheqel sign": "Ny sheqel-symbol",
-"dong sign": "dong-symbol",
-"kip sign": "kip-symbol",
-"tugrik sign": "tugrik-symbol",
-"drachma sign": "drachma-symbol",
-"german penny symbol": "tysk penny-symbol",
-"peso sign": "peso-symbol",
-"guarani sign": "quarani-symbol",
-"austral sign": "austral-symbol",
-"hryvnia sign": "hryvina-symbol",
-"cedi sign": "credi-symbol",
-"livre tournois sign": "livre tournois-symbol",
-"spesmilo sign": "spesmilo-symbol",
-"tenge sign": "tenge-symbol",
-"indian rupee sign": "indisk rupee-symbol",
-"turkish lira sign": "tyrkisk lire-symbol",
-"nordic mark sign": "nordisk mark-symbol",
-"manat sign": "manat-symbol",
-"ruble sign": "ruble-symbol",
-"yen character": "yen-symbol",
-"yuan character": "yuan-symbol",
-"yuan character, in hong kong and taiwan": "yuan-symbol, i Hongkong og Taiwan",
-"yen\/yuan character variant one": "yen\/yuan-symbol variant en",
-"Loading emoticons...": "Laster emoticons..",
-"Could not load emoticons": "Kunne ikke laste emoticons",
-"People": "Mennesker",
-"Animals and Nature": "Dyr og natur",
-"Food and Drink": "Mat og drikke",
-"Activity": "Aktivitet",
-"Travel and Places": "Reise og steder",
-"Objects": "Objekter",
-"Flags": "Flagg",
-"Characters": "Tegn",
-"Characters (no spaces)": "Tegn (uten mellomrom)",
-"{0} characters": "{0} tegn",
-"Error: Form submit field collision.": "Feil: Skjemafelt innsendingskollisjon.",
-"Error: No form element found.": "Feil: Intet skjemafelt funnet.",
-"Update": "Oppdater",
-"Color swatch": "Fargepalett",
-"Turquoise": "Turkis",
-"Green": "Gr\u00f8nn",
-"Blue": "Bl\u00e5",
-"Purple": "Lilla",
-"Navy Blue": "Marinebl\u00e5",
-"Dark Turquoise": "M\u00f8rk turkis",
-"Dark Green": "M\u00f8rkegr\u00f8nn",
-"Medium Blue": "Mellombl\u00e5",
-"Medium Purple": "Medium lilla",
-"Midnight Blue": "Midnattbl\u00e5",
-"Yellow": "Gul",
-"Orange": "Oransje",
-"Red": "R\u00f8d",
-"Light Gray": "Lys gr\u00e5",
-"Gray": "Gr\u00e5",
-"Dark Yellow": "M\u00f8rk gul",
-"Dark Orange": "M\u00f8rk oransje",
-"Dark Red": "M\u00f8rker\u00f8d",
-"Medium Gray": "Medium gr\u00e5",
-"Dark Gray": "M\u00f8rk gr\u00e5",
-"Light Green": "Lys gr\u00f8nn",
-"Light Yellow": "Lys gul",
-"Light Red": "Lys r\u00f8d",
-"Light Purple": "Lys lilla",
-"Light Blue": "Lys bl\u00e5",
-"Dark Purple": "M\u00f8rk lilla",
-"Dark Blue": "M\u00f8rk bl\u00e5",
-"Black": "Svart",
-"White": "Hvit",
-"Switch to or from fullscreen mode": "Bytt til eller fra fullskjermmodus",
-"Open help dialog": "\u00c5pne hjelp-dialog",
-"history": "historikk",
-"styles": "stiler",
-"formatting": "formatering",
-"alignment": "justering",
-"indentation": "innrykk",
-"permanent pen": "permanent penn",
-"comments": "kommentarer",
-"Format Painter": "Kopier format",
-"Insert\/edit iframe": "Sett inn \/ rediger iframe",
-"Capitalization": "Store\/sm\u00e5 bokstaver",
-"lowercase": "sm\u00e5 bokstaver",
-"UPPERCASE": "STORE BOKSTAVER",
-"Title Case": "Tittelbokstav",
-"Permanent Pen Properties": "Permanente egenskaper for penn",
-"Permanent pen properties...": "Permanente egenskaper for penn...",
-"Font": "Skrift",
-"Size": "St\u00f8rrelse",
-"More...": "Mer...",
-"Spellcheck Language": "Stavekontroller spr\u00e5k",
-"Select...": "Velg...",
-"Preferences": "Innstillinger",
-"Yes": "Ja",
-"No": "Nei",
-"Keyboard Navigation": "Navigering med tastaturet",
-"Version": "Versjon",
-"Anchor": "Anker",
-"Special character": "Spesialtegn",
-"Code sample": "Kodeeksempel",
-"Color": "Farge",
-"Emoticons": "Hum\u00f8rfjes",
-"Document properties": "Dokumentegenskaper",
-"Image": "Bilde",
-"Insert link": "Sett inn lenke",
-"Target": "M\u00e5l",
-"Link": "Lenke",
-"Poster": "Plakatbilde",
-"Media": "Media",
-"Print": "Skriv ut",
-"Prev": "Forrige",
-"Find and replace": "Finn og erstatt",
-"Whole words": "Hele ord",
-"Spellcheck": "Stavekontroll",
-"Caption": "Tittel",
-"Insert template": "Sett inn mal"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/pl.js b/cps/static/js/libs/tinymce/langs/pl.js
index 63ae27f6f..80f390994 100644
--- a/cps/static/js/libs/tinymce/langs/pl.js
+++ b/cps/static/js/libs/tinymce/langs/pl.js
@@ -85,6 +85,7 @@ tinymce.addI18n('pl',{
 "B": "B",
 "Left to right": "Od lewej do prawej",
 "Right to left": "Od prawej do lewej",
+"Emoticons": "Ikony emocji",
 "Emoticons...": "Emotikony...",
 "Metadata and Document Properties": "Metadane i w\u0142a\u015bciwo\u015bci dokumentu",
 "Title": "Tytu\u0142",
@@ -113,7 +114,9 @@ tinymce.addI18n('pl',{
 "Handy Shortcuts": "Przydatne skr\u00f3ty",
 "Horizontal line": "Pozioma linia",
 "Insert\/edit image": "Wstaw\/edytuj obrazek",
-"Image description": "Opis obrazka",
+"Alternative description": "Alternatywny opis",
+"Accessibility": "Dost\u0119pno\u015b\u0107",
+"Image is decorative": "Obraz jest dekoracyjny",
 "Source": "\u0179r\u00f3d\u0142o",
 "Dimensions": "Wymiary",
 "Constrain proportions": "Zachowaj proporcje",
@@ -147,7 +150,6 @@ tinymce.addI18n('pl',{
 "Back": "Cofnij",
 "Insert date\/time": "Wstaw dat\u0119\/czas",
 "Date\/time": "Data\/Czas",
-"Insert\/Edit Link": "Wstaw\/Edytuj \u0142\u0105cze",
 "Insert\/edit link": "Wstaw\/edytuj \u0142\u0105cze",
 "Text to display": "Tekst do wy\u015bwietlenia",
 "Url": "URL",
@@ -155,12 +157,14 @@ tinymce.addI18n('pl',{
 "Current window": "Bie\u017c\u0105ce okno",
 "None": "\u017baden",
 "New window": "Nowe okno",
+"Open link": "Otw\u00f3rz \u0142\u0105cze",
 "Remove link": "Usu\u0144 \u0142\u0105cze",
 "Anchors": "Kotwice",
 "Link...": "\u0141\u0105cze...",
 "Paste or type a link": "Wklej lub wpisz adres \u0142\u0105cza",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL, kt\u00f3ry wprowadzi\u0142e\u015b wygl\u0105da na adres e-mail. Czy chcesz doda\u0107 mailto: jako prefiks?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL, kt\u00f3ry wprowadzi\u0142e\u015b wygl\u0105da na link zewn\u0119trzny. Czy chcesz doda\u0107 http:\/\/ jako prefiks?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Wprowadzony przez Ciebie adres URL wydaje si\u0119 by\u0107 \u0142\u0105czem zewn\u0119trznym. Czy chcesz doda\u0107 wymagany prefiks https:\/\/?",
 "Link list": "Lista link\u00f3w",
 "Insert video": "Wstaw wideo",
 "Insert\/edit video": "Wstaw\/edytuj wideo",
@@ -183,11 +187,15 @@ tinymce.addI18n('pl',{
 "Replace all": "Zamie\u0144 wszystko",
 "Previous": "Poprzedni",
 "Next": "Nast.",
+"Find and Replace": "Znajd\u017a i Zamie\u0144",
 "Find and replace...": "Znajd\u017a i zamie\u0144...",
 "Could not find the specified string.": "Nie znaleziono szukanego tekstu.",
 "Match case": "Dopasuj wielko\u015b\u0107 liter",
 "Find whole words only": "Znajd\u017a tylko ca\u0142e wyrazy",
-"Spell check": "Sprawd\u017a pisowni\u0119",
+"Find in selection": "Znajd\u017a w zaznaczeniu",
+"Spellcheck": "Sprawdzanie pisowni",
+"Spellcheck Language": "J\u0119zyk sprawdzania pisowni",
+"No misspellings found.": "Brak b\u0142\u0119d\u00f3w pisowni",
 "Ignore": "Ignoruj",
 "Ignore all": "Ignoruj wszystko",
 "Finish": "Zako\u0144cz",
@@ -218,6 +226,7 @@ tinymce.addI18n('pl',{
 "Height": "Wysoko\u015b\u0107",
 "Cell spacing": "Odst\u0119py kom\u00f3rek",
 "Cell padding": "Dope\u0142nienie kom\u00f3rki",
+"Caption": "Tytu\u0142",
 "Show caption": "Poka\u017c podpis",
 "Left": "Lewo",
 "Center": "\u015arodek",
@@ -377,7 +386,21 @@ tinymce.addI18n('pl',{
 "formatting": "formatowanie",
 "alignment": "wyr\u00f3wnanie",
 "indentation": "wci\u0119cie",
-"permanent pen": "marker",
+"Font": "Font",
+"Size": "Rozmiar",
+"More...": "Wi\u0119cej...",
+"Select...": "Wybierz...",
+"Preferences": "Ustawienia",
+"Yes": "Tak",
+"No": "Nie",
+"Keyboard Navigation": "Nawigacja za pomoc\u0105 klawiatury",
+"Version": "Wersja",
+"Code view": "Widok kodu",
+"Open popup menu for split buttons": "Otw\u00f3rz menu podr\u0119czne dla przycisk\u00f3w",
+"List Properties": "Ustawienia Listy",
+"List properties...": "Ustawienia listy...",
+"Start list at number": "Rozpocznij numeracj\u0119 od",
+"Line height": "Wysoko\u015b\u0107 Linii",
 "comments": "komentarze",
 "Format Painter": "Malarz format\u00f3w",
 "Insert\/edit iframe": "Wstaw\/edytuj iframe",
@@ -385,24 +408,46 @@ tinymce.addI18n('pl',{
 "lowercase": "ma\u0142e litery",
 "UPPERCASE": "WIELKIE LITERY",
 "Title Case": "Jak Nazwy W\u0142asne",
+"permanent pen": "marker",
 "Permanent Pen Properties": "W\u0142a\u015bciwo\u015bci markera",
 "Permanent pen properties...": "W\u0142a\u015bciwo\u015bci markera...",
-"Font": "Font",
-"Size": "Rozmiar",
-"More...": "Wi\u0119cej...",
-"Spellcheck Language": "J\u0119zyk sprawdzania pisowni",
-"Select...": "Wybierz...",
-"Preferences": "Ustawienia",
-"Yes": "Tak",
-"No": "Nie",
-"Keyboard Navigation": "Nawigacja za pomoc\u0105 klawiatury",
-"Version": "Wersja",
+"case change": "Zmie\u0144 wielko\u015b\u0107",
+"page embed": "strona osadzona",
+"Advanced sort...": "Sortowanie zaawansowane...",
+"Advanced Sort": "Sortowanie Zaawansowane",
+"Sort table by column ascending": "Sortuj tabel\u0119 po kolumnie rosn\u0105co",
+"Sort table by column descending": "Sortuj tabel\u0119 po kolumnie malej\u0105co",
+"Sort": "Sortuj",
+"Order": "Kolejno\u015b\u0107",
+"Sort by": "Sortuj wed\u0142ug",
+"Ascending": "Rosn\u0105co",
+"Descending": "Malej\u0105co",
+"Column {0}": "Kolumna {0}",
+"Row {0}": "Wiersz {0}",
+"Spellcheck...": "Sprawd\u017a pisowni\u0119...",
+"Misspelled word": "B\u0142\u0119dna pisownia",
+"Suggestions": "Sugestie",
+"Change": "Zmie\u0144",
+"Finding word suggestions": "Wyszukiwanie propozycji s\u0142\u00f3w",
+"Success": "Sukces",
+"Repair": "Napraw",
+"Issue {0} of {1}": "Problem {0} z {1}",
+"Images must be marked as decorative or have an alternative text description": "Obrazy musz\u0105 by\u0107 oznaczone jako dekoracyjne lub posiada\u0107 alternatywny opis tekstowy.",
+"Images must have an alternative text description. Decorative images are not allowed.": "Obrazki musz\u0105 mie\u0107 tekst alternatywny. Dekoracyjne obrazy nie s\u0105 dozwolone.",
+"Or provide alternative text:": "lub dodaj tekst alternatywny:",
+"Make image decorative:": "Uczy\u0144 obraz dekoracyjnym:",
+"ID attribute must be unique": "ID atrybutu musi by\u0107 unikalny",
+"Make ID unique": "Utw\u00f3rz unikalny ID",
+"Keep this ID and remove all others": "Zachowaj to ID oraz usu\u0144 inne",
+"Remove this ID": "Usu\u0144 to ID",
+"Remove all IDs": "Usu\u0144 wszystkie ID",
+"Checklist": "Checklista",
 "Anchor": "Kotwica",
 "Special character": "Znak specjalny",
 "Code sample": "Przyk\u0142ad kodu \u017ar\u00f3d\u0142owego",
 "Color": "Kolor",
-"Emoticons": "Ikony emocji",
 "Document properties": "W\u0142a\u015bciwo\u015bci dokumentu",
+"Image description": "Opis obrazka",
 "Image": "Obraz",
 "Insert link": "Wstaw \u0142\u0105cze",
 "Target": "Cel",
@@ -413,7 +458,5 @@ tinymce.addI18n('pl',{
 "Prev": "Poprz.",
 "Find and replace": "Znajd\u017a i zamie\u0144",
 "Whole words": "Ca\u0142e s\u0142owa",
-"Spellcheck": "Sprawdzanie pisowni",
-"Caption": "Tytu\u0142",
 "Insert template": "Wstaw szablon"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/pt_BR.js b/cps/static/js/libs/tinymce/langs/pt_BR.js
index e7dd33c2e..49ca0ce4a 100644
--- a/cps/static/js/libs/tinymce/langs/pt_BR.js
+++ b/cps/static/js/libs/tinymce/langs/pt_BR.js
@@ -85,6 +85,7 @@ tinymce.addI18n('pt_BR',{
 "B": "B",
 "Left to right": "Da esquerda para a direita",
 "Right to left": "Da direita para a esquerda",
+"Emoticons": "Emoticons",
 "Emoticons...": "Emojis...",
 "Metadata and Document Properties": "Metadados e Propriedades do Documento",
 "Title": "T\u00edtulo",
@@ -113,7 +114,9 @@ tinymce.addI18n('pt_BR',{
 "Handy Shortcuts": "Atalhos \u00fateis",
 "Horizontal line": "Linha horizontal",
 "Insert\/edit image": "Inserir\/editar imagem",
-"Image description": "Inserir descri\u00e7\u00e3o",
+"Alternative description": "Descri\u00e7\u00e3o alternativa",
+"Accessibility": "Acessibilidade",
+"Image is decorative": "A imagem \u00e9 decorativa",
 "Source": "Endere\u00e7o da imagem",
 "Dimensions": "Dimens\u00f5es",
 "Constrain proportions": "Manter propor\u00e7\u00f5es",
@@ -147,7 +150,6 @@ tinymce.addI18n('pt_BR',{
 "Back": "Voltar",
 "Insert date\/time": "Inserir data\/hora",
 "Date\/time": "data\/hora",
-"Insert\/Edit Link": "Inserir\/Editar Link",
 "Insert\/edit link": "Inserir\/editar link",
 "Text to display": "Texto para mostrar",
 "Url": "Url",
@@ -155,12 +157,14 @@ tinymce.addI18n('pt_BR',{
 "Current window": "Janela atual",
 "None": "Nenhum",
 "New window": "Nova janela",
+"Open link": "Abrir link",
 "Remove link": "Remover link",
 "Anchors": "\u00c2ncoras",
 "Link...": "Link...",
 "Paste or type a link": "Cole ou digite um Link",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "A URL que voc\u00ea informou parece ser um link externo. Deseja incluir o prefixo http:\/\/?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "A URL informada parece ser um link externo. Voc\u00ea quer adicionar o prefixo necess\u00e1rio https:\/\/ ?",
 "Link list": "Lista de Links",
 "Insert video": "Inserir v\u00eddeo",
 "Insert\/edit video": "Inserir\/editar v\u00eddeo",
@@ -183,11 +187,15 @@ tinymce.addI18n('pt_BR',{
 "Replace all": "Substituir tudo",
 "Previous": "Anterior",
 "Next": "Pr\u00f3ximo",
+"Find and Replace": "Localizar e substituir",
 "Find and replace...": "Encontrar e substituir...",
 "Could not find the specified string.": "N\u00e3o foi poss\u00edvel encontrar o termo especificado",
 "Match case": "Diferenciar mai\u00fasculas e min\u00fasculas",
 "Find whole words only": "Encontrar somente palavras inteiras",
-"Spell check": "Verifica\u00e7\u00e3o ortogr\u00e1fica",
+"Find in selection": "Localizar na sele\u00e7\u00e3o",
+"Spellcheck": "Corretor ortogr\u00e1fico",
+"Spellcheck Language": "Idioma de verifica\u00e7\u00e3o ortogr\u00e1fica",
+"No misspellings found.": "Sem erros ortogr\u00e1ficos",
 "Ignore": "Ignorar",
 "Ignore all": "Ignorar tudo",
 "Finish": "Finalizar",
@@ -218,6 +226,7 @@ tinymce.addI18n('pt_BR',{
 "Height": "Altura",
 "Cell spacing": "Espa\u00e7amento da c\u00e9lula",
 "Cell padding": "Espa\u00e7amento interno da c\u00e9lula",
+"Caption": "Legenda",
 "Show caption": "Mostrar descri\u00e7\u00e3o",
 "Left": "Esquerdo",
 "Center": "Centro",
@@ -377,7 +386,21 @@ tinymce.addI18n('pt_BR',{
 "formatting": "formata\u00e7\u00e3o",
 "alignment": "alinhamento",
 "indentation": "indenta\u00e7\u00e3o",
-"permanent pen": "caneta permanente",
+"Font": "Fonte",
+"Size": "Tamanho",
+"More...": "Mais...",
+"Select...": "Selecionar...",
+"Preferences": "Prefer\u00eancias",
+"Yes": "Sim",
+"No": "N\u00e3o",
+"Keyboard Navigation": "Navega\u00e7\u00e3o por Teclado",
+"Version": "Vers\u00e3o",
+"Code view": "Ver c\u00f3digo",
+"Open popup menu for split buttons": "Abrir menu popup para bot\u00f5es com divis\u00e3o",
+"List Properties": "Listar Propriedades",
+"List properties...": "Listar propriedades...",
+"Start list at number": "Iniciar a lista no n\u00famero",
+"Line height": "Altura da linha",
 "comments": "coment\u00e1rios",
 "Format Painter": "Pincel de Formata\u00e7\u00e3o",
 "Insert\/edit iframe": "Inserir\/editar iframe",
@@ -385,24 +408,46 @@ tinymce.addI18n('pt_BR',{
 "lowercase": "min\u00fasculos",
 "UPPERCASE": "MAI\u00daSCULAS",
 "Title Case": "T\u00edtulo do caso",
+"permanent pen": "caneta permanente",
 "Permanent Pen Properties": "Propriedades da caneta permanente",
 "Permanent pen properties...": "Propriedades de caneta permanentes...",
-"Font": "Fonte",
-"Size": "Tamanho",
-"More...": "Mais...",
-"Spellcheck Language": "Idioma de verifica\u00e7\u00e3o ortogr\u00e1fica",
-"Select...": "Selecionar...",
-"Preferences": "Prefer\u00eancias",
-"Yes": "Sim",
-"No": "N\u00e3o",
-"Keyboard Navigation": "Navega\u00e7\u00e3o por Teclado",
-"Version": "Vers\u00e3o",
+"case change": "mudar caixa",
+"page embed": "embutir p\u00e1gina",
+"Advanced sort...": "Ordena\u00e7\u00e3o avan\u00e7ada...",
+"Advanced Sort": "Ordena\u00e7\u00e3o Avan\u00e7ada...",
+"Sort table by column ascending": "Ordenar tabela por coluna ascendente",
+"Sort table by column descending": "Ordenar tabela por coluna descendente",
+"Sort": "Ordenar",
+"Order": "Ordem",
+"Sort by": "Ordenar por",
+"Ascending": "Ascendente",
+"Descending": "Descendente",
+"Column {0}": "Coluna {0}",
+"Row {0}": "Linha {0}",
+"Spellcheck...": "Verifica\u00e7\u00e3o ortogr\u00e1fica",
+"Misspelled word": "Palavra com erro ortogr\u00e1fico",
+"Suggestions": "Sugest\u00f5es",
+"Change": "Mudar",
+"Finding word suggestions": "Encontrando sugest\u00f5es de palavras",
+"Success": "Sucesso",
+"Repair": "Reparo",
+"Issue {0} of {1}": "Problema {0} de {1}",
+"Images must be marked as decorative or have an alternative text description": "Imagens precisam ser marcadas como decorativas ou terem uma descri\u00e7\u00e3o alternativa de texto",
+"Images must have an alternative text description. Decorative images are not allowed.": "Imagens precisam ter uma descri\u00e7\u00e3o alternativa de texto. Imagens decorativas n\u00e3o s\u00e3o permitidas.",
+"Or provide alternative text:": "Ou informe um texto alternativo:",
+"Make image decorative:": "Fa\u00e7a imagem decorativa:",
+"ID attribute must be unique": "O atributo ID precisa ser \u00fanico",
+"Make ID unique": "Fa\u00e7a um ID \u00fanico",
+"Keep this ID and remove all others": "Mantenha esse ID e remova todos os outros",
+"Remove this ID": "Remova esse ID",
+"Remove all IDs": "Remova todos os IDs",
+"Checklist": "Lista de checagem",
 "Anchor": "\u00c2ncora",
 "Special character": "Caracteres especiais",
 "Code sample": "Exemplo de c\u00f3digo",
 "Color": "Cor",
-"Emoticons": "Emoticons",
 "Document properties": "Propriedades do documento",
+"Image description": "Inserir descri\u00e7\u00e3o",
 "Image": "Imagem",
 "Insert link": "Inserir link",
 "Target": "Alvo",
@@ -413,7 +458,5 @@ tinymce.addI18n('pt_BR',{
 "Prev": "Anterior",
 "Find and replace": "Localizar e substituir",
 "Whole words": "Palavras inteiras",
-"Spellcheck": "Corretor ortogr\u00e1fico",
-"Caption": "Legenda",
 "Insert template": "Inserir modelo"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/pt_PT.js b/cps/static/js/libs/tinymce/langs/pt_PT.js
deleted file mode 100644
index a3ec7dfc5..000000000
--- a/cps/static/js/libs/tinymce/langs/pt_PT.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('pt_PT',{
-"Redo": "Refazer",
-"Undo": "Anular",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Colar",
-"Select all": "Selecionar tudo",
-"New document": "Novo documento",
-"Ok": "Ok",
-"Cancel": "Cancelar",
-"Visual aids": "Ajuda visual",
-"Bold": "Negrito",
-"Italic": "It\u00e1lico",
-"Underline": "Sublinhado",
-"Strikethrough": "Rasurado",
-"Superscript": "Superior \u00e0 linha",
-"Subscript": "Inferior \u00e0 linha",
-"Clear formatting": "Limpar formata\u00e7\u00e3o",
-"Align left": "Alinhar \u00e0 esquerda",
-"Align center": "Alinhar ao centro",
-"Align right": "Alinhar \u00e0 direita",
-"Justify": "Justificar",
-"Bullet list": "Lista com marcas",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Diminuir avan\u00e7o",
-"Increase indent": "Aumentar avan\u00e7o",
-"Close": "Fechar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "O seu navegador n\u00e3o suporta acesso direto \u00e0 \u00e1rea de transfer\u00eancia. Por favor, use os atalhos Ctrl+X\/C\/V do seu teclado.",
-"Headers": "Cabe\u00e7alhos",
-"Header 1": "Cabe\u00e7alho 1",
-"Header 2": "Cabe\u00e7alho 2",
-"Header 3": "Cabe\u00e7alho 3",
-"Header 4": "Cabe\u00e7alho 4",
-"Header 5": "Cabe\u00e7alho 5",
-"Header 6": "Cabe\u00e7alho 6",
-"Headings": "T\u00edtulos",
-"Heading 1": "T\u00edtulo 1",
-"Heading 2": "T\u00edtulo 2",
-"Heading 3": "T\u00edtulo 3",
-"Heading 4": "T\u00edtulo 4",
-"Heading 5": "T\u00edtulo 5",
-"Heading 6": "T\u00edtulo 6",
-"Preformatted": "Pr\u00e9-formatado",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "Par\u00e1grafo",
-"Blockquote": "Blockquote",
-"Inline": "Inline",
-"Blocks": "Blocos",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "O comando colar est\u00e1 em modo de texto simples. O conte\u00fado ser\u00e1 colado como texto simples at\u00e9 desativar esta op\u00e7\u00e3o.",
-"Fonts": "Tipos de letra",
-"Font Sizes": "Tamanhos dos tipos de letra",
-"Class": "Classe",
-"Browse for an image": "Procurar uma imagem",
-"OR": "OU",
-"Drop an image here": "Largar aqui uma imagem",
-"Upload": "Carregar",
-"Block": "Bloco",
-"Align": "Alinhar",
-"Default": "Padr\u00e3o",
-"Circle": "C\u00edrculo",
-"Disc": "Disco",
-"Square": "Quadrado",
-"Lower Alpha": "a. b. c. ...",
-"Lower Greek": "\\u03b1. \\u03b2. \\u03b3. ...",
-"Lower Roman": "i. ii. iii. ...",
-"Upper Alpha": "A. B. C. ...",
-"Upper Roman": "I. II. III. ...",
-"Anchor...": "\u00c2ncora...",
-"Name": "Nome",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "O ID deve come\u00e7ar com uma letra, seguido apenas por letras, n\u00fameros, pontos, dois pontos, tra\u00e7os ou sobtra\u00e7os.",
-"You have unsaved changes are you sure you want to navigate away?": "Existem altera\u00e7\u00f5es que ainda n\u00e3o foram guardadas. Tem a certeza que pretende sair?",
-"Restore last draft": "Restaurar o \u00faltimo rascunho",
-"Special character...": "Car\u00e1ter especial...",
-"Source code": "C\u00f3digo fonte",
-"Insert\/Edit code sample": "Inserir\/editar amostra de c\u00f3digo",
-"Language": "Idioma",
-"Code sample...": "Amostra de c\u00f3digo...",
-"Color Picker": "Seletor de cores",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Da esquerda para a direita",
-"Right to left": "Da direita para a esquerda",
-"Emoticons...": "\u00cdcones expressivos...",
-"Metadata and Document Properties": "Metadados e propriedades do documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palavras-chave",
-"Description": "Descri\u00e7\u00e3o",
-"Robots": "Rob\u00f4s",
-"Author": "Autor",
-"Encoding": "Codifica\u00e7\u00e3o",
-"Fullscreen": "Ecr\u00e3 completo",
-"Action": "A\u00e7\u00e3o",
-"Shortcut": "Atalho",
-"Help": "Ajuda",
-"Address": "Endere\u00e7o",
-"Focus to menubar": "Foco na barra de menu",
-"Focus to toolbar": "Foco na barra de ferramentas",
-"Focus to element path": "Foco no caminho do elemento",
-"Focus to contextual toolbar": "Foco na barra de contexto",
-"Insert link (if link plugin activated)": "Inserir hiperliga\u00e7\u00e3o (se o plugin de liga\u00e7\u00f5es estiver ativado)",
-"Save (if save plugin activated)": "Guardar (se o plugin de guardar estiver ativado)",
-"Find (if searchreplace plugin activated)": "Pesquisar (se o plugin pesquisar e substituir estiver ativado)",
-"Plugins installed ({0}):": "Plugins instalados ({0}):",
-"Premium plugins:": "Plugins comerciais:",
-"Learn more...": "Saiba mais...",
-"You are using {0}": "Est\u00e1 a usar {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Atalhos \u00fateis",
-"Horizontal line": "Linha horizontal",
-"Insert\/edit image": "Inserir\/editar imagem",
-"Image description": "Descri\u00e7\u00e3o da imagem",
-"Source": "Localiza\u00e7\u00e3o",
-"Dimensions": "Dimens\u00f5es",
-"Constrain proportions": "Manter propor\u00e7\u00f5es",
-"General": "Geral",
-"Advanced": "Avan\u00e7ado",
-"Style": "Estilo",
-"Vertical space": "Espa\u00e7amento vertical",
-"Horizontal space": "Espa\u00e7amento horizontal",
-"Border": "Contorno",
-"Insert image": "Inserir imagem",
-"Image...": "Imagem...",
-"Image list": "Lista de imagens",
-"Rotate counterclockwise": "Rota\u00e7\u00e3o anti-hor\u00e1ria",
-"Rotate clockwise": "Rota\u00e7\u00e3o hor\u00e1ria",
-"Flip vertically": "Inverter verticalmente",
-"Flip horizontally": "Inverter horizontalmente",
-"Edit image": "Editar imagem",
-"Image options": "Op\u00e7\u00f5es de imagem",
-"Zoom in": "Mais zoom",
-"Zoom out": "Menos zoom",
-"Crop": "Recortar",
-"Resize": "Redimensionar",
-"Orientation": "Orienta\u00e7\u00e3o",
-"Brightness": "Brilho",
-"Sharpen": "Mais nitidez",
-"Contrast": "Contraste",
-"Color levels": "N\u00edveis de cor",
-"Gamma": "Gama",
-"Invert": "Inverter",
-"Apply": "Aplicar",
-"Back": "Voltar",
-"Insert date\/time": "Inserir data\/hora",
-"Date\/time": "Data\/hora",
-"Insert\/Edit Link": "Inserir\/editar liga\u00e7\u00e3o",
-"Insert\/edit link": "Inserir\/editar liga\u00e7\u00e3o",
-"Text to display": "Texto a exibir",
-"Url": "URL",
-"Open link in...": "Abrir liga\u00e7\u00e3o em...",
-"Current window": "Janela atual",
-"None": "Nenhum",
-"New window": "Nova janela",
-"Remove link": "Remover liga\u00e7\u00e3o",
-"Anchors": "\u00c2ncora",
-"Link...": "Liga\u00e7\u00e3o...",
-"Paste or type a link": "Copiar ou escrever uma hiperliga\u00e7\u00e3o",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "O URL que indicou parece ser um endere\u00e7o de email. Quer adicionar o prefixo mailto: tal como necess\u00e1rio?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "O URL que indicou parece ser um endere\u00e7o web. Quer adicionar o prefixo http:\/\/ tal como necess\u00e1rio?",
-"Link list": "Lista de liga\u00e7\u00f5es",
-"Insert video": "Inserir v\u00eddeo",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Insert\/edit media": "Inserir\/editar media",
-"Alternative source": "Localiza\u00e7\u00e3o alternativa",
-"Alternative source URL": "URL da origem alternativa",
-"Media poster (Image URL)": "Publicador de media (URL da imagem)",
-"Paste your embed code below:": "Colar c\u00f3digo para embeber:",
-"Embed": "Embeber",
-"Media...": "Media...",
-"Nonbreaking space": "Espa\u00e7o n\u00e3o quebr\u00e1vel",
-"Page break": "Quebra de p\u00e1gina",
-"Paste as text": "Colar como texto",
-"Preview": "Pr\u00e9-visualizar",
-"Print...": "Imprimir...",
-"Save": "Guardar",
-"Find": "Pesquisar",
-"Replace with": "Substituir por",
-"Replace": "Substituir",
-"Replace all": "Substituir tudo",
-"Previous": "Anterior",
-"Next": "Pr\u00f3ximo",
-"Find and replace...": "Localizar e substituir...",
-"Could not find the specified string.": "N\u00e3o foi poss\u00edvel localizar o termo especificado.",
-"Match case": "Diferenciar mai\u00fasculas e min\u00fasculas",
-"Find whole words only": "Localizar apenas palavras inteiras",
-"Spell check": "Verifica\u00e7\u00e3o ortogr\u00e1fica",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar tudo",
-"Finish": "Concluir",
-"Add to Dictionary": "Adicionar ao dicion\u00e1rio",
-"Insert table": "Inserir tabela",
-"Table properties": "Propriedades da tabela",
-"Delete table": "Eliminar tabela",
-"Cell": "C\u00e9lula",
-"Row": "Linha",
-"Column": "Coluna",
-"Cell properties": "Propriedades da c\u00e9lula",
-"Merge cells": "Unir c\u00e9lulas",
-"Split cell": "Dividir c\u00e9lula",
-"Insert row before": "Inserir linha antes",
-"Insert row after": "Inserir linha depois",
-"Delete row": "Eliminar linha",
-"Row properties": "Propriedades da linha",
-"Cut row": "Cortar linha",
-"Copy row": "Copiar linha",
-"Paste row before": "Colar linha antes",
-"Paste row after": "Colar linha depois",
-"Insert column before": "Inserir coluna antes",
-"Insert column after": "Inserir coluna depois",
-"Delete column": "Eliminar coluna",
-"Cols": "Colunas",
-"Rows": "Linhas",
-"Width": "Largura",
-"Height": "Altura",
-"Cell spacing": "Espa\u00e7amento entre c\u00e9lulas",
-"Cell padding": "Espa\u00e7amento interno da c\u00e9lula",
-"Show caption": "Mostrar legenda",
-"Left": "Esquerda",
-"Center": "Centro",
-"Right": "Direita",
-"Cell type": "Tipo de c\u00e9lula",
-"Scope": "Escopo",
-"Alignment": "Alinhamento",
-"H Align": "Alinhamento H",
-"V Align": "Alinhamento V",
-"Top": "Superior",
-"Middle": "Meio",
-"Bottom": "Inferior",
-"Header cell": "C\u00e9lula de cabe\u00e7alho",
-"Row group": "Agrupar linha",
-"Column group": "Agrupar coluna",
-"Row type": "Tipo de linha",
-"Header": "Cabe\u00e7alho",
-"Body": "Corpo",
-"Footer": "Rodap\u00e9",
-"Border color": "Cor de contorno",
-"Insert template...": "Inserir modelo...",
-"Templates": "Modelos",
-"Template": "Tema",
-"Text color": "Cor do texto",
-"Background color": "Cor de fundo",
-"Custom...": "Personalizada...",
-"Custom color": "Cor personalizada",
-"No color": "Sem cor",
-"Remove color": "Remover cor",
-"Table of Contents": "\u00cdndice",
-"Show blocks": "Mostrar blocos",
-"Show invisible characters": "Mostrar caracteres invis\u00edveis",
-"Word count": "Contagem de palavras",
-"Count": "Contagem",
-"Document": "Documento",
-"Selection": "Sele\u00e7\u00e3o",
-"Words": "Palavras",
-"Words: {0}": "Palavras: {0}",
-"{0} words": "{0} palavras",
-"File": "Ficheiro",
-"Edit": "Editar",
-"Insert": "Inserir",
-"View": "Ver",
-"Format": "Formatar",
-"Table": "Tabela",
-"Tools": "Ferramentas",
-"Powered by {0}": "Criado em {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Caixa de texto formatado. Pressione ALT-F9 para exibir o menu. Pressione ALT-F10 para exibir a barra de ferramentas. Pressione ALT-0 para exibir a ajuda",
-"Image title": "T\u00edtulo da imagem",
-"Border width": "Largura do limite",
-"Border style": "Estilo do limite",
-"Error": "Erro",
-"Warn": "Aviso",
-"Valid": "V\u00e1lido",
-"To open the popup, press Shift+Enter": "Para abrir o pop-up, prima Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "\u00c1rea de texto formatado. Prima ALT-0 para exibir a ajuda.",
-"System Font": "Tipo de letra do sistema",
-"Failed to upload image: {0}": "Falha ao carregar imagem: {0}",
-"Failed to load plugin: {0} from url {1}": "Falha ao carregar plugin: {0} do URL {1}",
-"Failed to load plugin url: {0}": "Falha ao carregar o URL do plugin: {0}",
-"Failed to initialize plugin: {0}": "Falha ao inicializar plugin: {0}",
-"example": "exemplo",
-"Search": "Pesquisar",
-"All": "Tudo",
-"Currency": "Moeda",
-"Text": "Texto",
-"Quotations": "Aspas",
-"Mathematical": "Matem\u00e1tico",
-"Extended Latin": "Carateres latinos estendidos",
-"Symbols": "S\u00edmbolos",
-"Arrows": "Setas",
-"User Defined": "Definido pelo utilizador",
-"dollar sign": "cifr\u00e3o",
-"currency sign": "sinal monet\u00e1rio",
-"euro-currency sign": "sinal monet\u00e1rio do euro",
-"colon sign": "sinal de dois pontos",
-"cruzeiro sign": "sinal de cruzeiro",
-"french franc sign": "sinal de franco franc\u00eas",
-"lira sign": "sinal de lira",
-"mill sign": "sinal de por mil",
-"naira sign": "sinal de naira",
-"peseta sign": "sinal de peseta",
-"rupee sign": "sinal de r\u00fapia",
-"won sign": "sinal de won",
-"new sheqel sign": "sinal de novo sheqel",
-"dong sign": "sinal de dong",
-"kip sign": "sinal kip",
-"tugrik sign": "sinal tugrik",
-"drachma sign": "sinal drachma",
-"german penny symbol": "sinal de penny alem\u00e3o",
-"peso sign": "sinal de peso",
-"guarani sign": "sinal de guarani",
-"austral sign": "sinal de austral",
-"hryvnia sign": "sinal hryvnia",
-"cedi sign": "sinal de cedi",
-"livre tournois sign": "sinal de libra de tours",
-"spesmilo sign": "sinal de spesmilo",
-"tenge sign": "sinal de tengue",
-"indian rupee sign": "sinal de rupia indiana",
-"turkish lira sign": "sinal de lira turca",
-"nordic mark sign": "sinal de marca n\u00f3rdica",
-"manat sign": "sinal manat",
-"ruble sign": "sinal de rublo",
-"yen character": "sinal de iene",
-"yuan character": "sinal de iuane",
-"yuan character, in hong kong and taiwan": "sinal de iuane, em Hong Kong e Taiwan",
-"yen\/yuan character variant one": "variante um de sinal de iene\/iuane",
-"Loading emoticons...": "A carregar \u00edcones expressivos...",
-"Could not load emoticons": "N\u00e3o foi poss\u00edvel carregar \u00edcones expressivos",
-"People": "Pessoas",
-"Animals and Nature": "Animais e natureza",
-"Food and Drink": "Comida e bebida",
-"Activity": "Atividade",
-"Travel and Places": "Viagens e lugares",
-"Objects": "Objetos",
-"Flags": "Bandeiras",
-"Characters": "Carateres",
-"Characters (no spaces)": "Carateres (sem espa\u00e7os)",
-"{0} characters": "{0} carateres",
-"Error: Form submit field collision.": "Erro: conflito no campo de submiss\u00e3o de formul\u00e1rio.",
-"Error: No form element found.": "Erro: nenhum elemento de formul\u00e1rio encontrado.",
-"Update": "Atualizar",
-"Color swatch": "Cole\u00e7\u00e3o de cores",
-"Turquoise": "Turquesa",
-"Green": "Verde",
-"Blue": "Azul",
-"Purple": "P\u00farpura",
-"Navy Blue": "Azul-atl\u00e2ntico",
-"Dark Turquoise": "Turquesa escuro",
-"Dark Green": "Verde escuro",
-"Medium Blue": "Azul interm\u00e9dio",
-"Medium Purple": "P\u00farpura interm\u00e9dio",
-"Midnight Blue": "Azul muito escuro",
-"Yellow": "Amarelo",
-"Orange": "Laranja",
-"Red": "Vermelho",
-"Light Gray": "Cinzento claro",
-"Gray": "Cinzento",
-"Dark Yellow": "Amarelo escuro",
-"Dark Orange": "Laranja escuro",
-"Dark Red": "Vermelho escuro",
-"Medium Gray": "Cinzento m\u00e9dio",
-"Dark Gray": "Cinzento escuro",
-"Light Green": "Verde claro",
-"Light Yellow": "Amarelo claro",
-"Light Red": "Vermelho claro",
-"Light Purple": "P\u00farpura claro",
-"Light Blue": "Azul claro",
-"Dark Purple": "P\u00farpura escuro",
-"Dark Blue": "Azul escuro",
-"Black": "Preto",
-"White": "Branco",
-"Switch to or from fullscreen mode": "Entrar ou sair do modo de ecr\u00e3 inteiro",
-"Open help dialog": "Abrir caixa de di\u00e1logo Ajuda",
-"history": "hist\u00f3rico",
-"styles": "estilos",
-"formatting": "formata\u00e7\u00e3o",
-"alignment": "alinhamento",
-"indentation": "avan\u00e7o",
-"permanent pen": "caneta permanente",
-"comments": "coment\u00e1rios",
-"Format Painter": "Pincel de formata\u00e7\u00e3o",
-"Insert\/edit iframe": "Inserir\/editar iframe",
-"Capitalization": "Capitaliza\u00e7\u00e3o",
-"lowercase": "min\u00fasculas",
-"UPPERCASE": "MAI\u00daSCULAS",
-"Title Case": "Iniciais mai\u00fasculas",
-"Permanent Pen Properties": "Propriedades da Caneta Permanente",
-"Permanent pen properties...": "Propriedades da caneta permanente...",
-"Font": "Tipo de letra",
-"Size": "Tamanho",
-"More...": "Mais...",
-"Spellcheck Language": "Idioma de verifica\u00e7\u00e3o lingu\u00edstica",
-"Select...": "Selecionar...",
-"Preferences": "Prefer\u00eancias",
-"Yes": "Sim",
-"No": "N\u00e3o",
-"Keyboard Navigation": "Navega\u00e7\u00e3o com teclado",
-"Version": "Vers\u00e3o",
-"Anchor": "\u00c2ncora",
-"Special character": "Car\u00e1cter especial",
-"Code sample": "Amostra de c\u00f3digo",
-"Color": "Cor",
-"Emoticons": "Emo\u00e7\u00f5es",
-"Document properties": "Propriedades do documento",
-"Image": "Imagem",
-"Insert link": "Inserir liga\u00e7\u00e3o",
-"Target": "Alvo",
-"Link": "Liga\u00e7\u00e3o",
-"Poster": "Autor",
-"Media": "Media",
-"Print": "Imprimir",
-"Prev": "Anterior",
-"Find and replace": "Pesquisar e substituir",
-"Whole words": "Palavras completas",
-"Spellcheck": "Corretor ortogr\u00e1fico",
-"Caption": "Legenda",
-"Insert template": "Inserir modelo"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/ro.js b/cps/static/js/libs/tinymce/langs/ro.js
index 717f4e805..dc812b4ae 100644
--- a/cps/static/js/libs/tinymce/langs/ro.js
+++ b/cps/static/js/libs/tinymce/langs/ro.js
@@ -85,6 +85,7 @@ tinymce.addI18n('ro',{
 "B": "B",
 "Left to right": "St\u00e2nga la dreapta",
 "Right to left": "Dreapta la st\u00e2nga",
+"Emoticons": "Emoticoane",
 "Emoticons...": "Emoticoane\u2026",
 "Metadata and Document Properties": "Meta date \u0219i Propriet\u0103\u021bi Document",
 "Title": "Titlu",
@@ -113,7 +114,9 @@ tinymce.addI18n('ro',{
 "Handy Shortcuts": "Comenzi rapide accesibile",
 "Horizontal line": "Linie orizontal\u0103",
 "Insert\/edit image": "Inserare\/editarea imaginilor",
-"Image description": "Descrierea imaginii",
+"Alternative description": "Descriere alternativ\u0103",
+"Accessibility": "Accesibilitate",
+"Image is decorative": "Imaginea este decorativ\u0103",
 "Source": "Surs\u0103",
 "Dimensions": "Dimensiuni",
 "Constrain proportions": "Constr\u00e2nge propor\u021biile",
@@ -147,7 +150,6 @@ tinymce.addI18n('ro',{
 "Back": "\u00cenapoi",
 "Insert date\/time": "Insereaz\u0103 data\/ora",
 "Date\/time": "Data\/ora",
-"Insert\/Edit Link": "Inserare\/Editare link",
 "Insert\/edit link": "Inserare\/editare link",
 "Text to display": "Text de afi\u0219at",
 "Url": "Url",
@@ -155,12 +157,14 @@ tinymce.addI18n('ro',{
 "Current window": "Fereastra curent\u0103",
 "None": "Nici unul",
 "New window": "Fereastr\u0103 nou\u0103",
+"Open link": "Deschide leg\u0103tur\u0103",
 "Remove link": "\u0218terge link-ul",
 "Anchors": "Ancor\u0103",
 "Link...": "Link\u2026",
 "Paste or type a link": "Introduce\u021bi un link",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL-ul introdus pare s\u0103 fie o adres\u0103 de e-mail. Dori\u021bi s\u0103 ad\u0103uga\u021bi prefixul mailto: ?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL-ul introdus pare s\u0103 fie o adres\u0103 web. Dori\u021bi s\u0103 ad\u0103uga\u021bi prefixul http:\/\/ ?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Adresa URL pe care a\u021bi introdus-o pare a fi un leg\u0103tur\u0103 extern\u0103. Dori\u021bi s\u0103 ad\u0103uga\u021bi prefixul https:\/\/ necesar?",
 "Link list": "List\u0103 linkuri",
 "Insert video": "Inserare video",
 "Insert\/edit video": "Inserare\/editare video",
@@ -183,11 +187,15 @@ tinymce.addI18n('ro',{
 "Replace all": "\u00cenlocuie\u015fte toate",
 "Previous": "Anterior",
 "Next": "Precedent",
+"Find and Replace": "G\u0103si\u021bi \u0219i \u00eenlocui\u021bi",
 "Find and replace...": "C\u0103utare \u0219i \u00eenlocuire\u2026",
 "Could not find the specified string.": "Nu am putut g\u0103si \u0219irul specificat.",
 "Match case": "Distinge majuscule\/minuscule",
 "Find whole words only": "G\u0103se\u0219te doar cuvintele \u00eentregi",
-"Spell check": "Verificare ortografic\u0103",
+"Find in selection": "G\u0103si\u021bi \u00een selec\u021bie",
+"Spellcheck": "Verificarea ortografic\u0103",
+"Spellcheck Language": "Verificare ortografic\u0103 a limbii",
+"No misspellings found.": "Nu s-au g\u0103sit gre\u0219eli de ortografie.",
 "Ignore": "Ignor\u0103",
 "Ignore all": "Ignor\u0103 toate",
 "Finish": "Finalizeaz\u0103",
@@ -218,6 +226,7 @@ tinymce.addI18n('ro',{
 "Height": "\u00cen\u0103l\u0163ime",
 "Cell spacing": "Spa\u021biere celule",
 "Cell padding": "Spa\u021biere",
+"Caption": "Titlu",
 "Show caption": "Afi\u0219are captur\u0103",
 "Left": "St\u00e2nga",
 "Center": "Centru",
@@ -377,7 +386,21 @@ tinymce.addI18n('ro',{
 "formatting": "formatare",
 "alignment": "aliniere",
 "indentation": "indentare",
-"permanent pen": "stilou permanent",
+"Font": "Font",
+"Size": "Dimensiuni",
+"More...": "Mai multe...",
+"Select...": "Selectare...",
+"Preferences": "Preferin\u021be",
+"Yes": "Da",
+"No": "Nu",
+"Keyboard Navigation": "Navigare de la tastatur\u0103",
+"Version": "Versiune",
+"Code view": "Vizualizare cod",
+"Open popup menu for split buttons": "Deschide\u021bi meniul pop-up pentru butoanele divizate",
+"List Properties": "Propriet\u0103\u021bi list\u0103",
+"List properties...": "Propriet\u0103\u021bi list\u0103...",
+"Start list at number": "\u00cencepe\u021bi lista la num\u0103rul",
+"Line height": "\u00cen\u0103l\u021bimea liniei",
 "comments": "comentarii",
 "Format Painter": "Descriptor de formate",
 "Insert\/edit iframe": "Inserare\/editare icadru",
@@ -385,23 +408,45 @@ tinymce.addI18n('ro',{
 "lowercase": "litere mici",
 "UPPERCASE": "MAJUSCULE",
 "Title Case": "Ini\u021bial\u0103 majuscul\u0103",
+"permanent pen": "stilou permanent",
 "Permanent Pen Properties": "Propriet\u0103\u021bile stiloului permanent",
 "Permanent pen properties...": "Propriet\u0103\u021bile stiloului permanent...",
-"Font": "Font",
-"Size": "Dimensiuni",
-"More...": "Mai multe...",
-"Spellcheck Language": "Verificare ortografic\u0103 a limbii",
-"Select...": "Selectare...",
-"Preferences": "Preferin\u021be",
-"Yes": "Da",
-"No": "Nu",
-"Keyboard Navigation": "Navigare de la tastatur\u0103",
-"Version": "Versiune",
+"case change": "schimbarea cazului",
+"page embed": "\u00eencorporare pagin\u0103",
+"Advanced sort...": "Sortare avansat\u0103...",
+"Advanced Sort": "Sortare avansat\u0103",
+"Sort table by column ascending": "Sorta\u021bi tabelul dup\u0103 coloan\u0103 cresc\u0103toare",
+"Sort table by column descending": "Sorta\u021bi tabelul dup\u0103 coloan\u0103 descresc\u0103toare",
+"Sort": "Sortare",
+"Order": "Ordonare",
+"Sort by": "Soreaz\u0103 dup\u0103",
+"Ascending": "Cresc\u0103tor",
+"Descending": "Descresc\u0103tor",
+"Column {0}": "Coloan\u0103 {0}",
+"Row {0}": "R\u00e2nd {0}",
+"Spellcheck...": "Verificare a ortografiei...",
+"Misspelled word": "Cuv\u00e2nt scris gre\u0219it",
+"Suggestions": "Sugestii",
+"Change": "Schimbare",
+"Finding word suggestions": "G\u0103se\u0219te sugestii de cuvinte",
+"Success": "Succes",
+"Repair": "Repar\u0103",
+"Issue {0} of {1}": "Num\u0103rul {0} din {1}",
+"Images must be marked as decorative or have an alternative text description": "Imaginile trebuie s\u0103 fie marcate ca decorative sau s\u0103 aib\u0103 o descriere alternativ\u0103 a textului",
+"Images must have an alternative text description. Decorative images are not allowed.": "Imaginile trebuie s\u0103 aib\u0103 o descriere alternativ\u0103 a textului. Imaginile decorative nu sunt permise.",
+"Or provide alternative text:": "Sau furniza\u021bi un text alternativ:",
+"Make image decorative:": "Face\u021bi imaginea decorativ\u0103:",
+"ID attribute must be unique": "Atributul ID trebuie s\u0103 fie unic",
+"Make ID unique": "Face\u021bi ID-ul unic",
+"Keep this ID and remove all others": "P\u0103stra\u021bi acest ID \u0219i elimina\u021bi pe toate celelalte",
+"Remove this ID": "Elimina\u021bi acest ID",
+"Remove all IDs": "Elimina\u021bi toate ID-urile",
+"Checklist": "Lista de verificare",
 "Anchor": "Ancor\u0103",
 "Special character": "Caractere speciale",
 "Color": "Culoare",
-"Emoticons": "Emoticoane",
 "Document properties": "Propriet\u0103\u021bi document",
+"Image description": "Descrierea imaginii",
 "Image": "Imagine",
 "Insert link": "Inserare link",
 "Link": "Link",
@@ -412,7 +457,5 @@ tinymce.addI18n('ro',{
 "Whole words": "Doar cuv\u00eentul \u00eentreg",
 "Find and replace": "Caut\u0103 \u015fi \u00eenlocuie\u015fte",
 "Prev": "Anterior",
-"Spellcheck": "Verificarea ortografic\u0103",
-"Caption": "Titlu",
 "Insert template": "Insereaz\u0103 \u0219ablon"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/ro_RO.js b/cps/static/js/libs/tinymce/langs/ro_RO.js
deleted file mode 100644
index 6df227397..000000000
--- a/cps/static/js/libs/tinymce/langs/ro_RO.js
+++ /dev/null
@@ -1,370 +0,0 @@
-tinymce.addI18n('ro_RO',{
-"Redo": "Refacere",
-"Undo": "Anulare",
-"Cut": "Decupare",
-"Copy": "Copiere",
-"Paste": "Lipire",
-"Select all": "Selecteaz\u0103 tot",
-"New document": "Document nou",
-"Ok": "Ok",
-"Cancel": "Revocare",
-"Visual aids": "Ajutoare vizuale",
-"Bold": "Aldin",
-"Italic": "Cursiv",
-"Underline": "Subliniere",
-"Strikethrough": "T\u0103iere",
-"Superscript": "Exponent",
-"Subscript": "Indice",
-"Clear formatting": "\u00cendep\u0103rtare formatare",
-"Align left": "Aliniere st\u00e2nga",
-"Align center": "Aliniere centru",
-"Align right": "Aliniere dreapta",
-"Justify": "Aliniere st\u00e2nga-dreapta",
-"Bullet list": "List\u0103 marcatori",
-"Numbered list": "List\u0103 numerotat\u0103",
-"Decrease indent": "Mic\u0219orare indent",
-"Increase indent": "M\u0103rire indent",
-"Close": "\u00cenchidere",
-"Formats": "Formate",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Browser-ul dumneavoastr\u0103 nu are acces direct la clipboard. V\u0103 rug\u0103m s\u0103 folosi\u021bi \u00een schimb scurt\u0103turile de tastatur\u0103 Ctrl+X\/C\/V.",
-"Headers": "Antete",
-"Header 1": "Antet 1",
-"Header 2": "Antet 2",
-"Header 3": "Antet 3",
-"Header 4": "Antet 4",
-"Header 5": "Antet 5",
-"Header 6": "Antet 6",
-"Headings": "Rubrici",
-"Heading 1": "Titlu 1",
-"Heading 2": "Titlu 2",
-"Heading 3": "Titlu 3",
-"Heading 4": "Titlu 4",
-"Heading 5": "Titlu 5",
-"Heading 6": "Titlu 6",
-"Preformatted": "Preformatat",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Cod",
-"Paragraph": "Paragraf",
-"Blockquote": "Blockquote",
-"Inline": "\u00cen linie",
-"Blocks": "Blocuri",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Lipirea este \u00een mod text simplu. Con\u021binutul va fi lipit ca text simplu p\u00e2n\u0103 dezactiva\u021bi aceast\u0103 op\u021biune.",
-"Fonts": "Fonturi",
-"Font Sizes": "Dimensiuni font",
-"Class": "Clas\u0103",
-"Browse for an image": "C\u0103uta\u021bi o imagine",
-"OR": "SAU",
-"Drop an image here": "Glisa\u021bi o imagine aici",
-"Upload": "\u00cenc\u0103rcare",
-"Block": "Sec\u021biune",
-"Align": "Aliniere",
-"Default": "Implicit",
-"Circle": "Cerc",
-"Disc": "Disc",
-"Square": "P\u0103trat",
-"Lower Alpha": "Litere mici",
-"Lower Greek": "Grecesc mic",
-"Lower Roman": "Cifre romane mici",
-"Upper Alpha": "Litere mari",
-"Upper Roman": "Cifre romane mari",
-"Anchor...": "Ancor\u0103\u2026",
-"Name": "Nume",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id-ul ar trebui s\u0103 \u00eenceap\u0103 cu o liter\u0103, urmat\u0103 doar de litere, numere, cratime, puncte, virgule sau sublinieri.",
-"You have unsaved changes are you sure you want to navigate away?": "Ave\u021bi modific\u0103ri nesalvate. Sigur dori\u021bi s\u0103 naviga\u021bi \u00een alt\u0103 parte?",
-"Restore last draft": "Restabili\u021bi ultima ciorn\u0103",
-"Special characters...": "Caractere speciale\u2026",
-"Source code": "Cod surs\u0103",
-"Insert\/Edit code sample": "Inserare\/Editare mostr\u0103 cod",
-"Language": "Limb\u0103",
-"Code sample...": "Mostr\u0103 cod\u2026",
-"Color Picker": "Selector culori",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "St\u00e2nga la dreapta",
-"Right to left": "Dreapta la st\u00e2nga",
-"Emoticons...": "Emoticoane\u2026",
-"Metadata and Document Properties": "Meta date \u0219i Propriet\u0103\u021bi Document",
-"Title": "Titlu",
-"Keywords": "Cuvinte cheie",
-"Description": "Descriere",
-"Robots": "Robo\u0163i",
-"Author": "Autor",
-"Encoding": "Codare",
-"Fullscreen": "Ecran complet",
-"Action": "Ac\u0163iune",
-"Shortcut": "Comand\u0103 rapid\u0103",
-"Help": "Ajutor",
-"Address": "Adres\u0103",
-"Focus to menubar": "Centrare pe bara de meniuri",
-"Focus to toolbar": "Centrare pe bara de unelte",
-"Focus to element path": "Centrare pe calea elementului",
-"Focus to contextual toolbar": "Centrare pe bara de unelte contextual\u0103",
-"Insert link (if link plugin activated)": "Inserare link (dac\u0103 modulul de link-uri este activat)",
-"Save (if save plugin activated)": "Salvare (dac\u0103 modulul de salvare este activat)",
-"Find (if searchreplace plugin activated)": "C\u0103utare (dac\u0103 modulul de c\u0103utare \u0219i \u00eenlocuire este activat)",
-"Plugins installed ({0}):": "Module instalate ({0}):",
-"Premium plugins:": "Module premium:",
-"Learn more...": "Afla\u021bi mai multe\u2026",
-"You are using {0}": "Folosi\u021bi {0}",
-"Plugins": "Inserturi",
-"Handy Shortcuts": "Comenzi rapide accesibile",
-"Horizontal line": "Linie orizontal\u0103",
-"Insert\/edit image": "Inserare\/editare imagini",
-"Image description": "Descriere imagine",
-"Source": "Surs\u0103",
-"Dimensions": "Dimensiuni",
-"Constrain proportions": "Restric\u021bionare propor\u021bii",
-"General": "General",
-"Advanced": "Complex",
-"Style": "Stil",
-"Vertical space": "Spa\u0163iu vertical",
-"Horizontal space": "Spa\u0163iu orizontal",
-"Border": "Chenar",
-"Insert image": "Inserare imagine",
-"Image...": "Imagine\u2026",
-"Image list": "List\u0103 de imagini",
-"Rotate counterclockwise": "Rotire invers sensului acelor de ceasornic",
-"Rotate clockwise": "Rotire \u00een sensul acelor de ceasornic",
-"Flip vertically": "Inversare vertical\u0103",
-"Flip horizontally": "Inversare orizontal\u0103",
-"Edit image": "Editare imagine",
-"Image options": "Op\u021biuni imagine",
-"Zoom in": "Apropiere",
-"Zoom out": "Dep\u0103rtare",
-"Crop": "Decupare",
-"Resize": "Redimensionare",
-"Orientation": "Orientare",
-"Brightness": "Luminozitate",
-"Sharpen": "Accentuare",
-"Contrast": "Contrast",
-"Color levels": "Niveluri culori",
-"Gamma": "Gamma",
-"Invert": "Inversare",
-"Apply": "Aplicare",
-"Back": "\u00cenapoi",
-"Insert date\/time": "Inserare dat\u0103\/or\u0103",
-"Date\/time": "Dat\u0103\/or\u0103",
-"Insert\/Edit Link": "Inserare\/Editare link",
-"Insert\/edit link": "Inserare\/editare link",
-"Text to display": "Text de afi\u0219at",
-"Url": "Url",
-"Open link in...": "Deschide link \u00een\u2026",
-"Current window": "Fereastra curent\u0103",
-"None": "Nu se utilizeaz\u0103 (acest c\u00e2mp)",
-"New window": "Fereastr\u0103 nou\u0103",
-"Remove link": "Eliminare link",
-"Anchors": "Ancore",
-"Link...": "Link\u2026",
-"Paste or type a link": "Lipi\u021bi sau scrie\u021bi un link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL-ul introdus pare a fi o adres\u0103 de e-mail. Dori\u021bi s\u0103 ad\u0103uga\u021bi prefixul mailto: necesar?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL-ul introdus pare a fi un link extern. Dori\u021bi s\u0103 ad\u0103uga\u021bi prefixul http:\/\/ necesar?",
-"Link list": "List\u0103 linkuri",
-"Insert video": "Inserare video",
-"Insert\/edit video": "Inserare\/editare video",
-"Insert\/edit media": "Inserare\/editare media",
-"Alternative source": "Surs\u0103 alternativ\u0103",
-"Alternative source URL": "URL surs\u0103 alternativ\u0103",
-"Media poster (Image URL)": "Poster media (URL imagine)",
-"Paste your embed code below:": "Lipi\u021bi codul de \u00eencorporare mai jos:",
-"Embed": "\u00cencorporare",
-"Media...": "Media\u2026",
-"Nonbreaking space": "Spa\u021biu f\u0103r\u0103 \u00eentreruperi",
-"Page break": "\u00centrerupere de pagin\u0103",
-"Paste as text": "Lipire ca text",
-"Preview": "Previzualizare",
-"Print...": "Tip\u0103rire\u2026",
-"Save": "Salvare",
-"Find": "G\u0103sire",
-"Replace with": "\u00cenlocuire cu",
-"Replace": "\u00cenlocuire",
-"Replace all": "\u00cenlocuire peste tot",
-"Previous": "Anterior",
-"Next": "Urm\u0103torul",
-"Find and replace...": "C\u0103utare \u0219i \u00eenlocuire\u2026",
-"Could not find the specified string.": "Nu s-a g\u0103sit \u0219irul indicat.",
-"Match case": "Potrivire litere mari \u0219i mici",
-"Find whole words only": "G\u0103se\u0219te doar cuvintele \u00eentregi",
-"Spell check": "Verificare ortografic\u0103",
-"Ignore": "Ignorare",
-"Ignore all": "Ignor\u0103 tot",
-"Finish": "Finalizare",
-"Add to Dictionary": "Ad\u0103ugare \u00een Dic\u021bionar",
-"Insert table": "Inserare tabel",
-"Table properties": "Propriet\u0103\u021bi tabel",
-"Delete table": "Eliminare tabel",
-"Cell": "Celul\u0103",
-"Row": "R\u00e2nd",
-"Column": "Coloan\u0103",
-"Cell properties": "Propriet\u0103\u021bi celul\u0103",
-"Merge cells": "\u00cembinare celule",
-"Split cell": "Scindare celul\u0103",
-"Insert row before": "Inserare r\u00e2nd \u00eenainte",
-"Insert row after": "Inserare r\u00e2nd dup\u0103",
-"Delete row": "Eliminare r\u00e2nd",
-"Row properties": "Propriet\u0103\u021bi r\u00e2nd",
-"Cut row": "Decupare r\u00e2nd",
-"Copy row": "Copiere r\u00e2nd",
-"Paste row before": "Lipire r\u00e2nd \u00eenainte",
-"Paste row after": "Lipire r\u00e2nd dup\u0103",
-"Insert column before": "Inserare coloan\u0103 \u00eenainte",
-"Insert column after": "Inserare coloan\u0103 dup\u0103",
-"Delete column": "Eliminare coloan\u0103",
-"Cols": "Coloane",
-"Rows": "R\u00e2nduri",
-"Width": "L\u0103\u021bime",
-"Height": "\u00cen\u0103l\u021bime",
-"Cell spacing": "Spa\u021biere celul\u0103",
-"Cell padding": "Spa\u021biere \u00een celul\u0103",
-"Show caption": "Afi\u0219are captur\u0103",
-"Left": "St\u00e2nga",
-"Center": "Centru",
-"Right": "Dreapta",
-"Cell type": "Tip celul\u0103",
-"Scope": "Domeniu",
-"Alignment": "Aliniere",
-"H Align": "Aliniere O",
-"V Align": "Aliniere V",
-"Top": "Sus",
-"Middle": "Mijloc",
-"Bottom": "Jos",
-"Header cell": "Celul\u0103 de antet",
-"Row group": "Grupare r\u00e2nduri",
-"Column group": "Grup coloane",
-"Row type": "Tip r\u00e2nd",
-"Header": "Antet",
-"Body": "Corp",
-"Footer": "Subsol de pagin\u0103",
-"Border color": "Culoare chenar",
-"Insert template...": "Inserare \u0219ablon\u2026",
-"Templates": "\u0218abloane",
-"Template": "\u0218ablon",
-"Text color": "Culoare text",
-"Background color": "Culoare fundal",
-"Custom...": "Particularizare...",
-"Custom color": "Culoare personalizat\u0103",
-"No color": "F\u0103r\u0103 culoare",
-"Remove color": "Eliminare culoare",
-"Table of Contents": "Cuprins",
-"Show blocks": "Arat\u0103 rubricile",
-"Show invisible characters": "Arat\u0103 caracterele invizibile",
-"Word count": "Num\u0103r\u0103toare cuvinte",
-"Words: {0}": "Cuvinte: {0}",
-"{0} words": "{0} cuvinte",
-"File": "Fi\u0219ier",
-"Edit": "Editare",
-"Insert": "Inserare",
-"View": "Vizualizare",
-"Format": "Formatare",
-"Table": "Tabel",
-"Tools": "Unelte",
-"Powered by {0}": "Sus\u021binut de {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zon\u0103 Text Formatat. Ap\u0103sa\u021bi ALT-F9 pentru a accesa meniul. Ap\u0103sa\u021bi ALT-F10 pentru a accesa bara de unelte. Ap\u0103sa\u021bi ALT-0 pentru ajutor",
-"Image title": "Titlu imagine",
-"Border width": "Grosime chenar",
-"Border style": "Stil chenar",
-"Error": "Eroare",
-"Warn": "Aten\u021bionare",
-"Valid": "Valid",
-"To open the popup, press Shift+Enter": "Pentru a deschide fereastra popup, ap\u0103sa\u021bi Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "Zon\u0103 Text Formatat. Ap\u0103sa\u021bi ALT-0 pentru ajutor.",
-"System Font": "Font Sistem",
-"Failed to upload image: {0}": "Nu s-a putut \u00eenc\u0103rca imaginea: {0}",
-"Failed to load plugin: {0} from url {1}": "Nu s-a putut \u00eenc\u0103rca modulul: {0} de la URL-ul {1}",
-"Failed to load plugin url: {0}": "Nu s-a putut \u00eenc\u0103rca URL-ul modulului: {0}",
-"Failed to initialize plugin: {0}": "Nu s-a putut ini\u021bializa modulul: {0}",
-"example": "exemplu",
-"Search": "C\u0103utare",
-"All": "Tot",
-"Currency": "Moned\u0103",
-"Text": "Text",
-"Quotations": "Ghilimele",
-"Mathematical": "Simboluri matematice",
-"Extended Latin": "Simboluri alfabet latin extins",
-"Symbols": "Simboluri",
-"Arrows": "S\u0103ge\u021bi",
-"User Defined": "Definite de utilizator",
-"dollar sign": "simbol dolar",
-"currency sign": "simbol moned\u0103",
-"euro-currency sign": "simbol euro",
-"colon sign": "dou\u0103 puncte",
-"cruzeiro sign": "simbol cruzeiro",
-"french franc sign": "simbol franc francez",
-"lira sign": "simbol lir\u0103",
-"mill sign": "simbol mill",
-"naira sign": "simbol naira",
-"peseta sign": "simbol peset\u0103",
-"rupee sign": "simbol rupie",
-"won sign": "simbol won",
-"new sheqel sign": "simbol shekel nou",
-"dong sign": "simbol dong",
-"kip sign": "simbol kip",
-"tugrik sign": "simbol tugrik",
-"drachma sign": "simbol drahm\u0103",
-"german penny symbol": "simbol peni german",
-"peso sign": "simbol peso",
-"guarani sign": "simbol guarani",
-"austral sign": "simbol austral",
-"hryvnia sign": "simbol grivn\u0103",
-"cedi sign": "simbol cedi",
-"livre tournois sign": "simbol livr\u0103 tournois",
-"spesmilo sign": "simbol spesmilo",
-"tenge sign": "simbol tenge",
-"indian rupee sign": "simbol rupie indian\u0103",
-"turkish lira sign": "simbol lir\u0103 turceasc\u0103",
-"nordic mark sign": "simbol marc\u0103 nordic\u0103",
-"manat sign": "simbol manat",
-"ruble sign": "simbol rubl\u0103",
-"yen character": "simbol yen",
-"yuan character": "simbol yuan",
-"yuan character, in hong kong and taiwan": "simbol yuan \u00een Hong Kong \u0219i Taiwan",
-"yen\/yuan character variant one": "simbol yen\/yuan prima variant\u0103",
-"Loading emoticons...": "Se \u00eencarc\u0103 emoticoanele\u2026",
-"Could not load emoticons": "Nu s-au putut \u00eenc\u0103rca emoticoanele",
-"People": "Persoane",
-"Animals and Nature": "Animale \u0219i natur\u0103",
-"Food and Drink": "M\u00e2ncare \u0219i b\u0103uturi",
-"Activity": "Activit\u0103\u021bi",
-"Travel and Places": "C\u0103l\u0103torii \u0219i loca\u021bii",
-"Objects": "Obiecte",
-"Flags": "Steaguri",
-"Characters": "Caractere",
-"Characters (no spaces)": "Caractere (f\u0103r\u0103 spa\u021bii)",
-"Error: Form submit field collision.": "Eroare: Coliziune c\u00e2mpuri la trimiterea formularului.",
-"Error: No form element found.": "Eroare: Niciun element de formular g\u0103sit.",
-"Update": "Actualizare",
-"Color swatch": "Mostr\u0103 de culori",
-"Turquoise": "Turcoaz",
-"Green": "Verde",
-"Blue": "Albastru",
-"Purple": "Mov",
-"Navy Blue": "Albastru marin",
-"Dark Turquoise": "Turcoaz \u00eenchis",
-"Dark Green": "Verde \u00eenchis",
-"Medium Blue": "Albastru mediu",
-"Medium Purple": "Mov mediu",
-"Midnight Blue": "Albastru \u00eenchis",
-"Yellow": "Galben",
-"Orange": "Portocaliu",
-"Red": "Ro\u0219u",
-"Light Gray": "Gri deschis",
-"Gray": "Gri",
-"Dark Yellow": "Galben \u00eenchis",
-"Dark Orange": "Portocaliu \u00eenchis",
-"Dark Red": "Ro\u0219u \u00eenchis",
-"Medium Gray": "Gri mediu",
-"Dark Gray": "Gri \u00eenchis",
-"Black": "Negru",
-"White": "Alb",
-"Switch to or from fullscreen mode": "Comutare pe sau de la modul ecran complet",
-"Open help dialog": "Deschide dialogul de ajutor",
-"history": "istoric",
-"styles": "stiluri",
-"formatting": "formatare",
-"alignment": "aliniere",
-"indentation": "indentare",
-"permanent pen": "stilou permanent",
-"comments": "comentarii"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/sl.js b/cps/static/js/libs/tinymce/langs/sl.js
index 25fc73d7d..3a4bb3424 100644
--- a/cps/static/js/libs/tinymce/langs/sl.js
+++ b/cps/static/js/libs/tinymce/langs/sl.js
@@ -85,6 +85,7 @@ tinymce.addI18n('sl',{
 "B": "B",
 "Left to right": "Od leve proti desni",
 "Right to left": "Od desne proti levi",
+"Emoticons": "\u010custveni simboli",
 "Emoticons...": "\u010custveni simboli ...",
 "Metadata and Document Properties": "Metapodatki in lastnosti dokumenta",
 "Title": "Naslov",
@@ -113,7 +114,9 @@ tinymce.addI18n('sl',{
 "Handy Shortcuts": "Uporabne bli\u017enjice",
 "Horizontal line": "Vodoravna \u010drta",
 "Insert\/edit image": "Vstavi\/uredi sliko",
-"Image description": "Opis slike",
+"Alternative description": "Nadomestni opis",
+"Accessibility": "Dostopnost",
+"Image is decorative": "Slika je okrasna",
 "Source": "Pot",
 "Dimensions": "Dimenzije",
 "Constrain proportions": "Obdr\u017ei razmerje",
@@ -147,7 +150,6 @@ tinymce.addI18n('sl',{
 "Back": "Nazaj",
 "Insert date\/time": "Vstavi datum\/\u010das",
 "Date\/time": "Datum\/\u010das",
-"Insert\/Edit Link": "Vstavi\/uredi povezavo",
 "Insert\/edit link": "Vstavi\/uredi povezavo",
 "Text to display": "Besedilo za prikaz",
 "Url": "Povezava",
@@ -155,12 +157,14 @@ tinymce.addI18n('sl',{
 "Current window": "Trenutno okno",
 "None": "Brez",
 "New window": "Novo okno",
+"Open link": "Odpri povezavo",
 "Remove link": "Odstrani povezavo",
 "Anchors": "Sidra",
 "Link...": "Povezava ...",
 "Paste or type a link": "Prilepite ali vnesite povezavo",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Vneseni URL predstavlja e-po\u0161tni naslov. Ali \u017eelite dodati potrebno predpono \"mailto:\"?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Vneseni URL predstavlja zunanjo povezavo. Ali \u017eelite dodati predpono \"http:\/\/\"?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Vneseni URL naslov predstavlja zunanjo povezavo. Ali mu \u017eelite dodati predpono https:\/\/ ?",
 "Link list": "Seznam povezav",
 "Insert video": "Vstavi video",
 "Insert\/edit video": "Vstavi\/uredi video",
@@ -183,11 +187,15 @@ tinymce.addI18n('sl',{
 "Replace all": "Zamenjaj vse",
 "Previous": "Prej\u0161nja",
 "Next": "Naslednja",
+"Find and Replace": "Najdi in zamenjaj",
 "Find and replace...": "Najdi in zamenjaj ...",
 "Could not find the specified string.": "Iskanje ni vrnilo rezultatov.",
 "Match case": "Ujemanje malih in velikih \u010drk",
 "Find whole words only": "I\u0161\u010di samo cele besede",
-"Spell check": "\u010crkovanje",
+"Find in selection": "I\u0161\u010di v izboru",
+"Spellcheck": "\u010crkovalnik",
+"Spellcheck Language": "Jezik \u010drkovalnika",
+"No misspellings found.": "Ni najdenih napak v \u010drkovanju.",
 "Ignore": "Prezri",
 "Ignore all": "Prezri vse",
 "Finish": "Zaklju\u010di",
@@ -218,6 +226,7 @@ tinymce.addI18n('sl',{
 "Height": "Vi\u0161ina",
 "Cell spacing": "Razmik med celicami",
 "Cell padding": "Polnilo med celicami",
+"Caption": "Naslov",
 "Show caption": "Poka\u017ei napis",
 "Left": "Leva",
 "Center": "Sredinska",
@@ -377,7 +386,21 @@ tinymce.addI18n('sl',{
 "formatting": "oblikovanje",
 "alignment": "poravnava",
 "indentation": "zamik",
-"permanent pen": "permanentno pisalo",
+"Font": "Pisava",
+"Size": "Velikost",
+"More...": "Ve\u010d ...",
+"Select...": "Izberi ...",
+"Preferences": "Preference",
+"Yes": "Da",
+"No": "Ne",
+"Keyboard Navigation": "Krmarjenje s tipkovnico",
+"Version": "Razli\u010dica",
+"Code view": "Prikaz kode",
+"Open popup menu for split buttons": "Odpri pojavni meni za razdeljene gumbe",
+"List Properties": "Lastnosti seznama",
+"List properties...": "Lastnosti seznama...",
+"Start list at number": "Za\u010dni seznam s \u0161tevilko",
+"Line height": "Vi\u0161ina vrstice",
 "comments": "komentarji",
 "Format Painter": "Preslikovalnik Oblik",
 "Insert\/edit iframe": "Vstavi\/uredi iFrame",
@@ -385,16 +408,38 @@ tinymce.addI18n('sl',{
 "lowercase": "male \u010drke",
 "UPPERCASE": "VELIKE \u010cRKE",
 "Title Case": "Velike za\u010detnice naslovov",
+"permanent pen": "permanentno pisalo",
 "Permanent Pen Properties": "Lastnosti permanentnega pisala",
 "Permanent pen properties...": "Lastnosti permanentnega pisala ...",
-"Font": "Pisava",
-"Size": "Velikost",
-"More...": "Ve\u010d ...",
-"Spellcheck Language": "Jezik \u010drkovalnika",
-"Select...": "Izberi ...",
-"Preferences": "Preference",
-"Yes": "Da",
-"No": "Ne",
-"Keyboard Navigation": "Krmarjenje s tipkovnico",
-"Version": "Razli\u010dica"
+"case change": "sprememba male\/velike \u010drke",
+"page embed": "vstavi stran",
+"Advanced sort...": "Napredno razvr\u0161\u010danje",
+"Advanced Sort": "Napredno razvr\u0161\u010danje...",
+"Sort table by column ascending": "Razvrsti tabelo po stolpcu nara\u0161\u010dajo\u010de",
+"Sort table by column descending": "Razvrsti tabelo po stolpcu padajo\u010de",
+"Sort": "Razvrsti",
+"Order": "Vrstni red",
+"Sort by": "Razvrsti po",
+"Ascending": "Nara\u0161\u010dajo\u010de",
+"Descending": "Padajo\u010de",
+"Column {0}": "Stolpec {0}",
+"Row {0}": "Vrstica {0}",
+"Spellcheck...": "\u010crkovalnik...",
+"Misspelled word": "\u00b8Nepravilno \u010drkovana beseda",
+"Suggestions": "Predlogi",
+"Change": "Spremeni",
+"Finding word suggestions": "Iskanje predlogov besed",
+"Success": "Uspe\u0161no",
+"Repair": "Popravi",
+"Issue {0} of {1}": "Te\u017eava {0} od {1}",
+"Images must be marked as decorative or have an alternative text description": "Slike morajo biti ozna\u010dene kot okrasne ali morajo imeti nadomestni opis v obliki besedila",
+"Images must have an alternative text description. Decorative images are not allowed.": "Slike morajo imeti nadomestni opis v obliki besedila.  Okrasne slike niso dovoljene.",
+"Or provide alternative text:": "Ali podajte nadomestno besedilo:",
+"Make image decorative:": "Dolo\u010di sliko kot okrasno:",
+"ID attribute must be unique": "ID atribut mora biti edinstven",
+"Make ID unique": "Ustvari edinstven ID",
+"Keep this ID and remove all others": "Obdr\u017ei ta ID in odstrani vse ostale",
+"Remove this ID": "Odstrani ta ID",
+"Remove all IDs": "Odstrani vse IDje",
+"Checklist": "Seznam preverjanj"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/sl_SI.js b/cps/static/js/libs/tinymce/langs/sl_SI.js
deleted file mode 100644
index 3665d9cb2..000000000
--- a/cps/static/js/libs/tinymce/langs/sl_SI.js
+++ /dev/null
@@ -1,388 +0,0 @@
-tinymce.addI18n('sl_SI',{
-"Redo": "Ponovno uveljavi",
-"Undo": "Razveljavi",
-"Cut": "Izre\u017ei",
-"Copy": "Kopiraj",
-"Paste": "Prilepi",
-"Select all": "Izberi vse",
-"New document": "Nov dokument",
-"Ok": "V redu",
-"Cancel": "Prekli\u010di",
-"Visual aids": "Vizualni pripomo\u010dki",
-"Bold": "Krepko",
-"Italic": "Po\u0161evno",
-"Underline": "Pod\u010drtano",
-"Strikethrough": "Pre\u010drtano",
-"Superscript": "Nadpisano",
-"Subscript": "Podpisano",
-"Clear formatting": "Odstrani oblikovanje",
-"Align left": "Leva poravnava",
-"Align center": "Sredinska poravnava",
-"Align right": "Desna poravnava",
-"Justify": "Obojestranska poravnava",
-"Bullet list": "Ozna\u010den seznam",
-"Numbered list": "O\u0161tevil\u010den seznam",
-"Decrease indent": "Zmanj\u0161aj zamik",
-"Increase indent": "Pove\u010daj zamik",
-"Close": "Zapri",
-"Formats": "Oblika",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Varnostne nastavitve brskalnika ne dopu\u0161\u010dajo direktnega dostopa do odlo\u017ei\u0161\u010da. Uporabite kombinacijo tipk Ctrl + X\/C\/V na tipkovnici.",
-"Headers": "Naslovi",
-"Header 1": "Naslov 1",
-"Header 2": "Naslov 2",
-"Header 3": "Naslov 3",
-"Header 4": "Naslov 4",
-"Header 5": "Naslov 5",
-"Header 6": "Naslov 6",
-"Headings": "Naslovi",
-"Heading 1": "Naslov 1",
-"Heading 2": "Naslov 2",
-"Heading 3": "Naslov 3",
-"Heading 4": "Naslov 4",
-"Heading 5": "Naslov 5",
-"Heading 6": "Naslov 6",
-"Preformatted": "Predformatirano",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Koda",
-"Paragraph": "Odstavek",
-"Blockquote": "Blockquote",
-"Inline": "Med besedilom",
-"Blocks": "Bloki",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Odlagali\u0161\u010de je zdaj v tekstovnem na\u010dinu. Vsebina bo preslikana kot golo besedilo brez oblike, dokler te mo\u017enosti ne izklju\u010dite.",
-"Fonts": "Pisave",
-"Font Sizes": "Velikosti pisave",
-"Class": "Razred",
-"Browse for an image": "Prebrskaj za sliko",
-"OR": "ALI",
-"Drop an image here": "Spusti sliko sem",
-"Upload": "Nalo\u017ei",
-"Block": "Blok",
-"Align": "Poravnava",
-"Default": "Privzeto",
-"Circle": "Pikica",
-"Disc": "Kroglica",
-"Square": "Kvadratek",
-"Lower Alpha": "Male tiskane \u010drke",
-"Lower Greek": "Male gr\u0161ke \u010drke",
-"Lower Roman": "Male rimske \u0161tevilke",
-"Upper Alpha": "Velike tiskane \u010drke",
-"Upper Roman": "Velike rimske \u0161tevilke",
-"Anchor...": "Sidro ...",
-"Name": "Naziv zaznamka",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id se mora za\u010deti s \u010drko, sledijo samo \u010drke, \u0161tevilke, pomi\u0161ljaj, pike, dvopi\u010dje ali pod\u010drtaj.",
-"You have unsaved changes are you sure you want to navigate away?": "Imate neshranjene spremembe. Ste prepri\u010dati, da \u017eelite zapustiti stran?",
-"Restore last draft": "Obnovi zadnji osnutek",
-"Special characters...": "Posebni znaki ...",
-"Source code": "Izvorna koda",
-"Insert\/Edit code sample": "Vstavi\/Uredi vzor\u010dno kodo",
-"Language": "Jezik",
-"Code sample...": "Vzor\u010dna koda ...",
-"Color Picker": "Izbirnik barve",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Od leve proti desni",
-"Right to left": "Od desne proti levi",
-"Emoticons...": "\u010custveni simboli ...",
-"Metadata and Document Properties": "Metapodatki in lastnosti dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne besede",
-"Description": "Opis",
-"Robots": "Robotki",
-"Author": "Avtor",
-"Encoding": "Kodiranje",
-"Fullscreen": "\u010cez cel zaslon",
-"Action": "Dejanje",
-"Shortcut": "Bli\u017enjica",
-"Help": "Pomo\u010d",
-"Address": "Naslov",
-"Focus to menubar": "Poudarek na menijski vrstici",
-"Focus to toolbar": "Poudarek na orodni vrstici",
-"Focus to element path": "Poudarek na poti elementa",
-"Focus to contextual toolbar": "Poudarek na kontekstualni orodni vrstici",
-"Insert link (if link plugin activated)": "Vstavi povezavo (\u010de je aktiviran vti\u010dnik za povezavo)",
-"Save (if save plugin activated)": "Shrani (\u010de je aktiviran vti\u010dnik za shranjevanje)",
-"Find (if searchreplace plugin activated)": "I\u0161\u010di (\u010de je aktiviran vti\u010dnik za iskanje\/zamenjavo)",
-"Plugins installed ({0}):": "Name\u0161\u010deni vti\u010dniki ({0}):",
-"Premium plugins:": "Premium vti\u010dniki:",
-"Learn more...": "Ve\u010d ...",
-"You are using {0}": "Uporabljate {0}",
-"Plugins": "Vti\u010dniki",
-"Handy Shortcuts": "Uporabne bli\u017enjice",
-"Horizontal line": "Vodoravna \u010drta",
-"Insert\/edit image": "Vstavi\/uredi sliko",
-"Image description": "Opis slike",
-"Source": "Pot",
-"Dimensions": "Dimenzije",
-"Constrain proportions": "Obdr\u017ei razmerje",
-"General": "Splo\u0161no",
-"Advanced": "Napredno",
-"Style": "Slog",
-"Vertical space": "Navpi\u010dni prostor",
-"Horizontal space": "Vodoravni prostor",
-"Border": "Obroba",
-"Insert image": "Vnesi sliko",
-"Image...": "Slika ...",
-"Image list": "Seznam slik",
-"Rotate counterclockwise": "Zavrti v nasprotni smeri urnega kazalca",
-"Rotate clockwise": "Zavrti v smeri urinega kazalca",
-"Flip vertically": "Obrni navpi\u010dno",
-"Flip horizontally": "Obrni vodoravno",
-"Edit image": "Uredi sliko",
-"Image options": "Mo\u017enosti slike",
-"Zoom in": "Pove\u010daj",
-"Zoom out": "Pomanj\u0161aj",
-"Crop": "Obre\u017ei",
-"Resize": "Spremeni velikost",
-"Orientation": "Usmerjenost",
-"Brightness": "Svetlost",
-"Sharpen": "Izostri",
-"Contrast": "Kontrast",
-"Color levels": "Barvni nivo",
-"Gamma": "Gama",
-"Invert": "Obrni",
-"Apply": "Uporabi",
-"Back": "Nazaj",
-"Insert date\/time": "Vstavi datum\/\u010das",
-"Date\/time": "Datum\/\u010das",
-"Insert\/Edit Link": "Vstavi\/uredi povezavo",
-"Insert\/edit link": "Vstavi\/uredi povezavo",
-"Text to display": "Prikazno besedilo",
-"Url": "Povezava",
-"Open link in...": "Odpri povezavo v ...",
-"Current window": "Trenutno okno",
-"None": "Brez",
-"New window": "Novo okno",
-"Remove link": "Odstrani povezavo",
-"Anchors": "Sidra",
-"Link...": "Povezava ...",
-"Paste or type a link": "Prilepite ali vnesite povezavo",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Vne\u0161eni URL predstavlja e-po\u0161tni naslov. Ali \u017eelite dodati potrebno \"mailto:\" predpono?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Vne\u0161eni URL predstavlja zunanjo povezavo. Ali \u017eelite dodati \"http:\/\/\" predpono?",
-"Link list": "Seznam povezav",
-"Insert video": "Vstavi video",
-"Insert\/edit video": "Vstavi\/uredi video",
-"Insert\/edit media": "Vstavi\/uredi medij",
-"Alternative source": "Nadomestni vir",
-"Alternative source URL": "Nadomestni vir URL",
-"Media poster (Image URL)": "Medijski poster (URL slike)",
-"Paste your embed code below:": "Prilepite kodo za vdelavo:",
-"Embed": "Vdelaj",
-"Media...": "Mediji ...",
-"Nonbreaking space": "Nedeljivi presledek",
-"Page break": "Prelom strani",
-"Paste as text": "Vnesi kot besedilo",
-"Preview": "Predogled",
-"Print...": "Natisni ...",
-"Save": "Shrani",
-"Find": "I\u0161\u010di",
-"Replace with": "Zamenjaj z",
-"Replace": "Zamenjaj",
-"Replace all": "Zamenjaj vse",
-"Previous": "Prej\u0161nja",
-"Next": "Naprej",
-"Find and replace...": "Najdi in zamenjaj ...",
-"Could not find the specified string.": "Iskanje ni vrnilo rezultatov.",
-"Match case": "Ujemanje malih in velikih \u010drk",
-"Find whole words only": "I\u0161\u010di samo cele besede",
-"Spell check": "\u010crkovanje",
-"Ignore": "Prezri",
-"Ignore all": "Prezri vse",
-"Finish": "Zaklju\u010di",
-"Add to Dictionary": "Dodaj v slovar",
-"Insert table": "Vstavi tabelo",
-"Table properties": "Lastnosti tabele",
-"Delete table": "Izbri\u0161i tabelo",
-"Cell": "Celica",
-"Row": "Vrstica",
-"Column": "Stolpec",
-"Cell properties": "Lastnosti celice",
-"Merge cells": "Zdru\u017ei celice",
-"Split cell": "Razdeli celico",
-"Insert row before": "Vstavi vrstico pred",
-"Insert row after": "Vstavi vrstico za",
-"Delete row": "Izbri\u0161i vrstico",
-"Row properties": "Lastnosti vrstice",
-"Cut row": "Izre\u017ei vrstico",
-"Copy row": "Kopiraj vrstico",
-"Paste row before": "Prilepi vrstico pred",
-"Paste row after": "Prilepi vrstico za",
-"Insert column before": "Vstavi stolpec pred",
-"Insert column after": "Vstavi stolpec za",
-"Delete column": "Izbri\u0161i stolpec",
-"Cols": "Stolpci",
-"Rows": "Vrstice",
-"Width": "\u0160irina",
-"Height": "Vi\u0161ina",
-"Cell spacing": "Razmik med celicami",
-"Cell padding": "Polnilo med celicami",
-"Show caption": "Poka\u017ei napis",
-"Left": "Levo",
-"Center": "Sredinsko",
-"Right": "Desno",
-"Cell type": "Tip celice",
-"Scope": "Obseg",
-"Alignment": "Poravnava",
-"H Align": "Horizontalna poravnava",
-"V Align": "Vertikalna poravnava",
-"Top": "Vrh",
-"Middle": "Sredina",
-"Bottom": "Dno",
-"Header cell": "Celica glave",
-"Row group": "Grupiranje vrstic",
-"Column group": "Grupiranje stolpcev",
-"Row type": "Tip vrstice",
-"Header": "Glava",
-"Body": "Vsebina",
-"Footer": "Noga",
-"Border color": "Barva obrobe",
-"Insert template...": "Vstavi predlogo ...",
-"Templates": "Predloge",
-"Template": "Predloga",
-"Text color": "Barva besedila",
-"Background color": "Barva ozadja",
-"Custom...": "Po meri ...",
-"Custom color": "Barva po meri",
-"No color": "Brezbarvno",
-"Remove color": "Odstrani barvo",
-"Table of Contents": "Kazalo",
-"Show blocks": "Prika\u017ei bloke",
-"Show invisible characters": "Prika\u017ei skrite znake",
-"Word count": "\u0160tevilo besed",
-"Words: {0}": "Besed: {0}",
-"{0} words": "{0} besed",
-"File": "Datoteka",
-"Edit": "Uredi",
-"Insert": "Vstavi",
-"View": "Pogled",
-"Format": "Oblika",
-"Table": "Tabela",
-"Tools": "Orodja",
-"Powered by {0}": "Uporablja tehnologijo {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Bogato besedilo. Pritisnite ALT-F9 za meni. Pritisnite ALT-F10 za orodno vrstico. Pritisnite ALT-0 za pomo\u010d",
-"Image title": "Naslov slike",
-"Border width": "\u0160irina obrobe",
-"Border style": "Slog obrobe",
-"Error": "Napaka",
-"Warn": "Opozorilo",
-"Valid": "Veljavno",
-"To open the popup, press Shift+Enter": "Za odpiranje pojavnega okna pritisnite Shift + Enter.",
-"Rich Text Area. Press ALT-0 for help.": "Bogato besedilo. Pritisnite ALT-0 za pomo\u010d.",
-"System Font": "Sistemska pisava",
-"Failed to upload image: {0}": "Napaka nalaganja slike: {0}",
-"Failed to load plugin: {0} from url {1}": "Napaka nalaganja vti\u010dnika: {0} z url {1}",
-"Failed to load plugin url: {0}": "Napaka nalaganja url: {0}",
-"Failed to initialize plugin: {0}": "Napaka inicializacije vti\u010dnika: {0}",
-"example": "primer",
-"Search": "Iskanje",
-"All": "Vse",
-"Currency": "Valuta",
-"Text": "Besedilo",
-"Quotations": "Citati",
-"Mathematical": "Matemati\u010dno",
-"Extended Latin": "Raz\u0161irjena latinica",
-"Symbols": "Simboli",
-"Arrows": "Pu\u0161\u010dice",
-"User Defined": "Uporabnik dolo\u010den",
-"dollar sign": "znak za dolar",
-"currency sign": "znak za valuto",
-"euro-currency sign": "znak za evro",
-"colon sign": "znak za dvopi\u010dje",
-"cruzeiro sign": "znak za cruzeiro",
-"french franc sign": "znak za francoski frank",
-"lira sign": "znak za liro",
-"mill sign": "znak za mill",
-"naira sign": "znak za nairo",
-"peseta sign": "znak za peseto",
-"rupee sign": "znak za rupijo",
-"won sign": "znak za won",
-"new sheqel sign": "znak za novi \u0161ekl",
-"dong sign": "znak za dong",
-"kip sign": "znak za kip",
-"tugrik sign": "znak za tugrik",
-"drachma sign": "znak za drahmo",
-"german penny symbol": "znak za nem\u0161ki peni",
-"peso sign": "znak za peso",
-"guarani sign": "znak za guarani",
-"austral sign": "znak za austral",
-"hryvnia sign": "znak za hrivnijo",
-"cedi sign": "znak za cedi",
-"livre tournois sign": "znak za livre tournois",
-"spesmilo sign": "znak za spesmilo",
-"tenge sign": "znak za tenge",
-"indian rupee sign": "znak za indijsko rupijo",
-"turkish lira sign": "znak za tur\u0161ko liro",
-"nordic mark sign": "znak za nordijsko marko",
-"manat sign": "znak za manat",
-"ruble sign": "znak za rubelj",
-"yen character": "znak za jen",
-"yuan character": "znak za yuan",
-"yuan character, in hong kong and taiwan": "znak za yuan, v Hongkongu in na Tajvanu",
-"yen\/yuan character variant one": "znak za jen\/yuan, prva razli\u010dica",
-"Loading emoticons...": "Nalaganje \u010dustvenih simbolov ...",
-"Could not load emoticons": "\u010custvenih simbolov ni mogo\u010de nalo\u017eiti.",
-"People": "Ljudje",
-"Animals and Nature": "\u017divali in narava",
-"Food and Drink": "Hrana in pija\u010da",
-"Activity": "Dejavnost",
-"Travel and Places": "Potovanja in kraji",
-"Objects": "Predmeti",
-"Flags": "Zastave",
-"Characters": "Znaki",
-"Characters (no spaces)": "Znaki (brez presledkov)",
-"Error: Form submit field collision.": "Napaka: navzkri\u017eje polja za oddajo obrazca",
-"Error: No form element found.": "Napaka: elementa oblike ni mogo\u010de najti",
-"Update": "Posodobitev",
-"Color swatch": "Vzorec barv",
-"Turquoise": "Turkizna",
-"Green": "Zelena",
-"Blue": "Modra",
-"Purple": "\u0160krlatna",
-"Navy Blue": "Mornarsko modra",
-"Dark Turquoise": "Temno turkizna",
-"Dark Green": "Temno zelena",
-"Medium Blue": "Srednje modra",
-"Medium Purple": "Srednje \u0161krlatna",
-"Midnight Blue": "Polno\u010dno modra",
-"Yellow": "Rumena",
-"Orange": "Oran\u017ena",
-"Red": "Rde\u010da",
-"Light Gray": "Svetlo siva",
-"Gray": "Siva",
-"Dark Yellow": "Temno rumena",
-"Dark Orange": "Temno oran\u017ena",
-"Dark Red": "Temno rde\u010da",
-"Medium Gray": "Srednje siva",
-"Dark Gray": "Temno siva",
-"Black": "\u010crna",
-"White": "Bela",
-"Switch to or from fullscreen mode": "Preklopi v ali iz celozaslonskega na\u010dina",
-"Open help dialog": "Odpri pogovorno okno za pomo\u010d",
-"history": "zgodovina",
-"styles": "slogi",
-"formatting": "oblikovanje",
-"alignment": "poravnava",
-"indentation": "zamik",
-"permanent pen": "permanentno pisalo",
-"comments": "komentarji",
-"Anchor": "Zaznamek",
-"Special character": "Posebni znaki",
-"Color": "Barva",
-"Emoticons": "Sme\u0161ki",
-"Document properties": "Lastnosti dokumenta",
-"Image": "Slika",
-"Insert link": "Vstavi povezavo",
-"Link": "Povezava",
-"Target": "Cilj",
-"Media": "Medij",
-"Poster": "Poster",
-"Print": "Natisni",
-"Whole words": "Cele besede",
-"Find and replace": "Poi\u0161\u010di in zamenjaj",
-"Prev": "Nazaj",
-"Spellcheck": "Preverjanje \u010drkovanja",
-"Caption": "Naslov",
-"Insert template": "Vstavi predlogo"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/sq.js b/cps/static/js/libs/tinymce/langs/sq.js
new file mode 100644
index 000000000..5286da631
--- /dev/null
+++ b/cps/static/js/libs/tinymce/langs/sq.js
@@ -0,0 +1,219 @@
+tinymce.addI18n('sq',{
+"Cut": "prerje",
+"Heading 5": "titull 5",
+"Header 2": "titull 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Shfletuesi juaj nuk supurton qasje t\u00eb drejtp\u00ebrdrejt\u00eb n\u00eb clipboard. Ju lutemi p\u00ebrdorni Ctrl+X\/C\/V shkurtesat e tastier\u00ebs n\u00eb vend. ",
+"Heading 4": "titull 4",
+"Div": "ndarje",
+"Heading 2": "titull 2",
+"Paste": "ngjit",
+"Close": "Mbylle",
+"Font Family": "soj g\u00ebrmave",
+"Pre": "para",
+"Align right": "Radhit djathtas",
+"New document": "Dokument i ri",
+"Blockquote": "citat",
+"Numbered list": "list\u00eb e num\u00ebruara",
+"Heading 1": "titull 1",
+"Headings": "titull",
+"Increase indent": "rrit gjurm\u00eb",
+"Formats": "form\u00eb",
+"Headers": "titull",
+"Select all": "Selektoj t\u00eb gjitha",
+"Header 3": "titull 3",
+"Blocks": "bllok",
+"Undo": "Anuloj",
+"Strikethrough": "Vij\u00eb nga",
+"Bullet list": "list\u00eb plumb",
+"Header 1": "titull 1",
+"Superscript": "indeks i sip\u00ebrm",
+"Clear formatting": "spastroj formate",
+"Font Sizes": "p\u00ebrmasa e germave",
+"Subscript": "Indeksin e",
+"Header 6": "titull 6",
+"Redo": "rib\u00ebj",
+"Paragraph": "paragraf",
+"Ok": "Ok",
+"Bold": "i zi",
+"Code": "kod",
+"Italic": "kursiv",
+"Align center": "Radhit n\u00eb mes",
+"Header 5": "titull 5",
+"Heading 6": "titull 6",
+"Heading 3": "titull 3",
+"Decrease indent": "ulja gjurm\u00eb",
+"Header 4": "titull 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
+"Underline": "n\u00ebnvizoj",
+"Cancel": "Moho",
+"Justify": "justifikuar",
+"Inline": "nj\u00ebshkolon\u00eb",
+"Copy": "kopjoj",
+"Align left": "Radhit majtas",
+"Visual aids": "ndihm\u00ebsit vizuale",
+"Lower Greek": "Lower Greek",
+"Square": "Katror",
+"Default": "Default",
+"Lower Alpha": "Lower Alpha",
+"Circle": "Rreth",
+"Disc": "Disc",
+"Upper Alpha": "Upper Alpha",
+"Upper Roman": "Upper Roman",
+"Lower Roman": "Lower Roman",
+"Name": "Emri",
+"Anchor": "Anchor",
+"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?",
+"Restore last draft": "Restore last draft",
+"Special character": "Karakter i veqant",
+"Source code": "Kodi burimor",
+"B": "Kalt\u00ebr",
+"R": "Kuqe",
+"G": "Gjelb\u00ebr",
+"Color": "Ngjyra",
+"Right to left": "Nga e djathta n\u00eb t\u00eb majt\u00eb",
+"Left to right": "Nga e majta n\u00eb t\u00eb djatht\u00eb",
+"Emoticons": "Emoticons",
+"Robots": "Robot\u00ebt",
+"Document properties": "Vetit\u00eb e dokumentit",
+"Title": "Titulli",
+"Keywords": "Fjal\u00ebt kyqe",
+"Encoding": "Encoding",
+"Description": "Description",
+"Author": "Autori",
+"Fullscreen": "Fullscreen",
+"Horizontal line": "Vij\u00eb horizontale",
+"Horizontal space": "Hapsir\u00eb horizontale",
+"Insert\/edit image": "Shto\/ndrysho imazh",
+"General": "General",
+"Advanced": "T\u00eb p\u00ebrparuar",
+"Source": "Burimi",
+"Border": "Border",
+"Constrain proportions": "Constrain proportions",
+"Vertical space": "Hapsir\u00eb vertikale",
+"Image description": "P\u00ebrshkrimi i imazhit",
+"Style": "Stili",
+"Dimensions": "Dimensions",
+"Insert image": "Shto imazh",
+"Zoom in": "Zoom in",
+"Contrast": "Contrast",
+"Back": "Back",
+"Gamma": "Gamma",
+"Flip horizontally": "Flip horizontally",
+"Resize": "Resize",
+"Sharpen": "Sharpen",
+"Zoom out": "Zoom out",
+"Image options": "Image options",
+"Apply": "Apply",
+"Brightness": "Brightness",
+"Rotate clockwise": "Rotate clockwise",
+"Rotate counterclockwise": "Rotate counterclockwise",
+"Edit image": "Edit image",
+"Color levels": "Color levels",
+"Crop": "Crop",
+"Orientation": "Orientation",
+"Flip vertically": "Flip vertically",
+"Invert": "Invert",
+"Insert date\/time": "Insert date\/time",
+"Remove link": "Remove link",
+"Url": "Url",
+"Text to display": "Text to display",
+"Anchors": "Anchors",
+"Insert link": "Insert link",
+"New window": "New window",
+"None": "None",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "Target",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Insert\/edit link",
+"Insert\/edit video": "Insert\/edit video",
+"Poster": "Poster",
+"Alternative source": "Alternative source",
+"Paste your embed code below:": "Paste your embed code below:",
+"Insert video": "Insert video",
+"Embed": "Embed",
+"Nonbreaking space": "Nonbreaking space",
+"Page break": "Page break",
+"Paste as text": "Paste as text",
+"Preview": "Preview",
+"Print": "Print",
+"Save": "Save",
+"Could not find the specified string.": "Could not find the specified string.",
+"Replace": "Replace",
+"Next": "Next",
+"Whole words": "Whole words",
+"Find and replace": "Find and replace",
+"Replace with": "Replace with",
+"Find": "Find",
+"Replace all": "Replace all",
+"Match case": "Match case",
+"Prev": "Prev",
+"Spellcheck": "Spellcheck",
+"Finish": "Finish",
+"Ignore all": "Ignore all",
+"Ignore": "Ignore",
+"Add to Dictionary": "Add to Dictionary",
+"Insert row before": "Insert row before",
+"Rows": "Rows",
+"Height": "Height",
+"Paste row after": "Paste row after",
+"Alignment": "Alignment",
+"Border color": "Border color",
+"Column group": "Column group",
+"Row": "Row",
+"Insert column before": "Insert column before",
+"Split cell": "Split cell",
+"Cell padding": "Cell padding",
+"Cell spacing": "Cell spacing",
+"Row type": "Row type",
+"Insert table": "Insert table",
+"Body": "Body",
+"Caption": "Caption",
+"Footer": "Footer",
+"Delete row": "Delete row",
+"Paste row before": "Paste row before",
+"Scope": "Scope",
+"Delete table": "Delete table",
+"H Align": "H Align",
+"Top": "Top",
+"Header cell": "Header cell",
+"Column": "Column",
+"Row group": "Row group",
+"Cell": "Cell",
+"Middle": "Middle",
+"Cell type": "Cell type",
+"Copy row": "Copy row",
+"Row properties": "Row properties",
+"Table properties": "Table properties",
+"Bottom": "Bottom",
+"V Align": "V Align",
+"Header": "Header",
+"Right": "Right",
+"Insert column after": "Insert column after",
+"Cols": "Cols",
+"Insert row after": "Insert row after",
+"Width": "Width",
+"Cell properties": "Cell properties",
+"Left": "Left",
+"Cut row": "Cut row",
+"Delete column": "Delete column",
+"Center": "Center",
+"Merge cells": "Merge cells",
+"Insert template": "Insert template",
+"Templates": "Templates",
+"Background color": "Background color",
+"Custom...": "Custom...",
+"Custom color": "Custom color",
+"No color": "No color",
+"Text color": "Text color",
+"Show blocks": "Show blocks",
+"Show invisible characters": "Show invisible characters",
+"Words: {0}": "Words: {0}",
+"Insert": "Insert",
+"File": "File",
+"Edit": "Edit",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help",
+"Tools": "Tools",
+"View": "View",
+"Table": "Table",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/sv_SE.js b/cps/static/js/libs/tinymce/langs/sv_SE.js
deleted file mode 100644
index 6d78400a4..000000000
--- a/cps/static/js/libs/tinymce/langs/sv_SE.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('sv_SE',{
-"Redo": "G\u00f6r om",
-"Undo": "\u00c5ngra",
-"Cut": "Klipp ut",
-"Copy": "Kopiera",
-"Paste": "Klistra in",
-"Select all": "Markera allt",
-"New document": "Nytt dokument",
-"Ok": "Ok",
-"Cancel": "Avbryt",
-"Visual aids": "Visuella hj\u00e4lpmedel",
-"Bold": "Fet",
-"Italic": "Kursiv",
-"Underline": "Understruken",
-"Strikethrough": "Genomstruken",
-"Superscript": "Upph\u00f6jd",
-"Subscript": "Neds\u00e4nkt",
-"Clear formatting": "Rensa formatering",
-"Align left": "V\u00e4nsterjustera",
-"Align center": "Centrera",
-"Align right": "H\u00f6gerjustera",
-"Justify": "Verifiera",
-"Bullet list": "Punktlista",
-"Numbered list": "Nummerlista",
-"Decrease indent": "Minska indrag",
-"Increase indent": "\u00d6ka indrag",
-"Close": "St\u00e4ng",
-"Formats": "Format",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Din webbl\u00e4sare st\u00f6djer inte direkt \u00e5tkomst till klippboken. Anv\u00e4nd kortkommandona Ctrl\u00a0+\u00a0X\/C\/V i st\u00e4llet.",
-"Headers": "Rubriker",
-"Header 1": "Rubrik 1",
-"Header 2": "Rubrik 2",
-"Header 3": "Rubrik 3",
-"Header 4": "Rubrik 4",
-"Header 5": "Rubrik 5",
-"Header 6": "Rubrik 6",
-"Headings": "Rubriker",
-"Heading 1": "Rubrik 1",
-"Heading 2": "Rubrik 2",
-"Heading 3": "Rubrik 3",
-"Heading 4": "Rubrik 4",
-"Heading 5": "Rubrik 5",
-"Heading 6": "Rubrik 6",
-"Preformatted": "F\u00f6rformaterad",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kod",
-"Paragraph": "Avsnitt",
-"Blockquote": "Blockquote",
-"Inline": "Inline",
-"Blocks": "Block",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Klistra in \u00e4r nu i textl\u00e4ge. Inneh\u00e5ll kommer att konverteras till text tills du sl\u00e5r av detta l\u00e4ge.",
-"Fonts": "Typsnitt",
-"Font Sizes": "Teckenstorlek",
-"Class": "Klass",
-"Browse for an image": "Bl\u00e4ddra efter en bild",
-"OR": "OR",
-"Drop an image here": "Sl\u00e4pp en bild h\u00e4r",
-"Upload": "Ladda upp",
-"Block": "Block",
-"Align": "Justera",
-"Default": "Original",
-"Circle": "Cirkel",
-"Disc": "Disk",
-"Square": "Fyrkant",
-"Lower Alpha": "Gemener",
-"Lower Greek": "Grekiska gemener",
-"Lower Roman": "Romerska gemener",
-"Upper Alpha": "Versaler",
-"Upper Roman": "Romerska versaler",
-"Anchor...": "Ankare...",
-"Name": "Namn",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id skall b\u00f6rja med en bokstav och f\u00f6ljande tecken ska vara bokst\u00e4ver, nummer, punkter, understr\u00e4ck eller kolon.",
-"You have unsaved changes are you sure you want to navigate away?": "Du har f\u00f6r\u00e4ndringar som du inte har sparat. \u00c4r du s\u00e4ker p\u00e5 att du vill navigera vidare?",
-"Restore last draft": "\u00c5terst\u00e4ll senaste utkast",
-"Special character...": "Specialtecken...",
-"Source code": "K\u00e4llkod",
-"Insert\/Edit code sample": "Infoga\/Redigera k\u00e5d exempel",
-"Language": "Spr\u00e5k",
-"Code sample...": "Kodexempel...",
-"Color Picker": "F\u00e4rgv\u00e4ljare",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "V\u00e4nster till h\u00f6ger",
-"Right to left": "H\u00f6ger till v\u00e4nster",
-"Emoticons...": "Emoticons...",
-"Metadata and Document Properties": "Metadata och dokumentegenskaper",
-"Title": "Titel",
-"Keywords": "Nyckelord",
-"Description": "Beskrivning",
-"Robots": "Robotar",
-"Author": "F\u00f6rfattare",
-"Encoding": "Encoding",
-"Fullscreen": "Fullsk\u00e4rm",
-"Action": "H\u00e4ndelse",
-"Shortcut": "Kortkommando",
-"Help": "Hj\u00e4lp",
-"Address": "Adress",
-"Focus to menubar": "Fokusera p\u00e5 menyrad",
-"Focus to toolbar": "Fokusera p\u00e5 verktygsrad",
-"Focus to element path": "Fokusera p\u00e5 elements\u00f6kv\u00e4gsrad",
-"Focus to contextual toolbar": "Fokusera p\u00e5 den kontextuella verktygsraden",
-"Insert link (if link plugin activated)": "Infoga l\u00e4nk (om link-pluginet \u00e4r aktiverat)",
-"Save (if save plugin activated)": "Spara (om save-pluginet \u00e4r aktiverat)",
-"Find (if searchreplace plugin activated)": "S\u00f6k (om searchreplace-pluginet \u00e4r aktiverat)",
-"Plugins installed ({0}):": "Installerade plugins ({0}):",
-"Premium plugins:": "Premiumplugins:",
-"Learn more...": "L\u00e4s mer...",
-"You are using {0}": "Du anv\u00e4nder {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Kortkommandon",
-"Horizontal line": "Horisontell linje",
-"Insert\/edit image": "Infoga\/redigera bild",
-"Image description": "Bildbeskrivning",
-"Source": "K\u00e4lla",
-"Dimensions": "Dimensioner",
-"Constrain proportions": "Begr\u00e4nsa proportioner",
-"General": "Generella",
-"Advanced": "Avancerat",
-"Style": "Stil",
-"Vertical space": "Vertikaltutrymme",
-"Horizontal space": "Horisontellt utrymme",
-"Border": "Ram",
-"Insert image": "Infoga bild",
-"Image...": "Bild...",
-"Image list": "Bildlista",
-"Rotate counterclockwise": "Rotera moturs",
-"Rotate clockwise": "Rotera medurs",
-"Flip vertically": "Spegelv\u00e4nd vertikalt",
-"Flip horizontally": "Spegelv\u00e4nd horisontellt",
-"Edit image": "Redigera bild",
-"Image options": "Bild inst\u00e4llningar",
-"Zoom in": "Zooma in",
-"Zoom out": "Zooma ut",
-"Crop": "Besk\u00e4r",
-"Resize": "Skala om",
-"Orientation": "Orientera",
-"Brightness": "Ljusstyrka",
-"Sharpen": "Sk\u00e4rpa",
-"Contrast": "Kontrast",
-"Color levels": "F\u00e4rgniv\u00e5er",
-"Gamma": "Gamma",
-"Invert": "Invertera",
-"Apply": "Applicera",
-"Back": "Tillbaka",
-"Insert date\/time": "Infoga datum\/tid",
-"Date\/time": "Datum\/tid",
-"Insert\/Edit Link": "Infoga\/redigera l\u00e4nk",
-"Insert\/edit link": "Infoga\/redigera l\u00e4nk",
-"Text to display": "Text att visa",
-"Url": "Url",
-"Open link in...": "\u00d6ppna l\u00e4nk i...",
-"Current window": "Nuvarande f\u00f6nster",
-"None": "Ingen",
-"New window": "Nytt f\u00f6nster",
-"Remove link": "Ta bort l\u00e4nk",
-"Anchors": "Bokm\u00e4rken",
-"Link...": "L\u00e4nk...",
-"Paste or type a link": "Klistra in eller skriv en l\u00e4nk",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Urlen du angav verkar vara en epost adress. Vill du l\u00e4gga till ett mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Urlen du angav verkar vara en extern l\u00e4nk. Vill du l\u00e4gga till http:\/\/ prefixet?",
-"Link list": "L\u00e4nklista",
-"Insert video": "Infoga video",
-"Insert\/edit video": "Infoga\/redigera video",
-"Insert\/edit media": "Infoga\/redigera media",
-"Alternative source": "Alternativ k\u00e4lla",
-"Alternative source URL": "Alternativ k\u00e4llwebbadress",
-"Media poster (Image URL)": "Mediaposter (bildwebbadress)",
-"Paste your embed code below:": "Klistra in din inb\u00e4ddningskod nedan:",
-"Embed": "Inb\u00e4ddning",
-"Media...": "Media...",
-"Nonbreaking space": "Avbrottsfritt mellanrum",
-"Page break": "Sidbrytning",
-"Paste as text": "Klistra in som text",
-"Preview": "F\u00f6rhandsgranska",
-"Print...": "Skriv ut...",
-"Save": "Spara",
-"Find": "S\u00f6k",
-"Replace with": "Ers\u00e4tt med",
-"Replace": "Ers\u00e4tt",
-"Replace all": "Ers\u00e4tt alla",
-"Previous": "F\u00f6reg\u00e5ende",
-"Next": "N\u00e4sta",
-"Find and replace...": "S\u00f6k och ers\u00e4tt...",
-"Could not find the specified string.": "Kunde inte hitta den specifierade st\u00e4ngen.",
-"Match case": "Matcha gemener\/versaler",
-"Find whole words only": "Hitta endast hela ord",
-"Spell check": "Stavningskontroll",
-"Ignore": "Ignorera",
-"Ignore all": "Ignorera alla",
-"Finish": "Avsluta",
-"Add to Dictionary": "L\u00e4gg till i ordlista",
-"Insert table": "Infoga tabell",
-"Table properties": "Tabellegenskaper",
-"Delete table": "Radera tabell",
-"Cell": "Cell",
-"Row": "Rad",
-"Column": "Kolumn",
-"Cell properties": "Cellegenskaper",
-"Merge cells": "Sammanfoga celler",
-"Split cell": "Bryt is\u00e4r celler",
-"Insert row before": "Infoga rad f\u00f6re",
-"Insert row after": "Infoga rad efter",
-"Delete row": "Radera rad",
-"Row properties": "Radegenskaper",
-"Cut row": "Klipp ut rad",
-"Copy row": "Kopiera rad",
-"Paste row before": "Klista in rad f\u00f6re",
-"Paste row after": "Klistra in rad efter",
-"Insert column before": "Infoga kolumn f\u00f6re",
-"Insert column after": "Infoga kolumn efter",
-"Delete column": "Radera kolumn",
-"Cols": "Kolumner",
-"Rows": "Rader",
-"Width": "Bredd",
-"Height": "H\u00f6jd",
-"Cell spacing": "Cellmellanrum",
-"Cell padding": "Cellpaddning",
-"Show caption": "Visa bildtext",
-"Left": "V\u00e4nster",
-"Center": "Centrum",
-"Right": "H\u00f6ger",
-"Cell type": "Celltyp",
-"Scope": "Omf\u00e5ng",
-"Alignment": "Justering",
-"H Align": "H-justering",
-"V Align": "V-justering",
-"Top": "Toppen",
-"Middle": "Mitten",
-"Bottom": "Botten",
-"Header cell": "Huvudcell",
-"Row group": "Radgrupp",
-"Column group": "Kolumngrupp",
-"Row type": "Radtyp",
-"Header": "Huvud",
-"Body": "Kropp",
-"Footer": "Fot",
-"Border color": "Ramf\u00e4rg",
-"Insert template...": "Infoga mall...",
-"Templates": "Mallar",
-"Template": "Mall",
-"Text color": "Textf\u00e4rg",
-"Background color": "Bakgrundsf\u00e4rg",
-"Custom...": "Anpassad...",
-"Custom color": "Anpassad f\u00e4rg",
-"No color": "Ingen f\u00e4rg",
-"Remove color": "Ta bort f\u00e4rg",
-"Table of Contents": "Inneh\u00e5llsf\u00f6rteckning",
-"Show blocks": "Visa block",
-"Show invisible characters": "Visa onsynliga tecken",
-"Word count": "Ordantal",
-"Count": "Antal",
-"Document": "Dokument",
-"Selection": "Val",
-"Words": "Ord",
-"Words: {0}": "Ord: {0}",
-"{0} words": "{0} ord",
-"File": "Fil",
-"Edit": "Redigera",
-"Insert": "Infoga",
-"View": "Visa",
-"Format": "Format",
-"Table": "Tabell",
-"Tools": "Verktyg",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textredigerare. Tryck ALT-F9 f\u00f6r menyn. Tryck ALT-F10 f\u00f6r verktygsrader. Tryck ALT-0 f\u00f6r hj\u00e4lp.",
-"Image title": "Bildtitel",
-"Border width": "Kantlinjebredd",
-"Border style": "Kantlinjestil",
-"Error": "Fel",
-"Warn": "Varning",
-"Valid": "Giltig",
-"To open the popup, press Shift+Enter": "Tryck p\u00e5 Shift\u00a0+\u00a0Enter f\u00f6r att \u00f6ppna popup-f\u00f6nstret",
-"Rich Text Area. Press ALT-0 for help.": "Omr\u00e5de med formaterad text. Tryck p\u00e5 ALT-0 f\u00f6r hj\u00e4lp.",
-"System Font": "Systemtypsnitt",
-"Failed to upload image: {0}": "Kunde inte ladda upp bild: {0}",
-"Failed to load plugin: {0} from url {1}": "Kunde inte l\u00e4sa in insticksprogram: {0} fr\u00e5n webbadress {1}",
-"Failed to load plugin url: {0}": "Kunde inte l\u00e4sa in webbadress f\u00f6r insticksprogram: {0}",
-"Failed to initialize plugin: {0}": "Kunde inte initiera insticksprogram: {0}",
-"example": "exempel",
-"Search": "S\u00f6k",
-"All": "Alla",
-"Currency": "Valuta",
-"Text": "Text",
-"Quotations": "Citattecken",
-"Mathematical": "Matematiskt",
-"Extended Latin": "Ut\u00f6kad latin",
-"Symbols": "Symboler",
-"Arrows": "Pilar",
-"User Defined": "Anv\u00e4ndardefinierade",
-"dollar sign": "dollartecken",
-"currency sign": "valutatecken",
-"euro-currency sign": "eurotecken",
-"colon sign": "kolon",
-"cruzeiro sign": "cruzeirotecken",
-"french franc sign": "franctecken",
-"lira sign": "liratecken",
-"mill sign": "milltecken",
-"naira sign": "nairatecken",
-"peseta sign": "pesetastecken",
-"rupee sign": "rupeetecken",
-"won sign": "wontecken",
-"new sheqel sign": "schekeltecken",
-"dong sign": "dongtecken",
-"kip sign": "kiptecken",
-"tugrik sign": "tugriktecken",
-"drachma sign": "drachmertecken",
-"german penny symbol": "tecken f\u00f6r tysk penny",
-"peso sign": "pesotecken",
-"guarani sign": "guaranitecken",
-"austral sign": "australtecken",
-"hryvnia sign": "hryvniatecken",
-"cedi sign": "ceditecken",
-"livre tournois sign": "tecken f\u00f6r livre tournois",
-"spesmilo sign": "spesmilotecken",
-"tenge sign": "tengetecken",
-"indian rupee sign": "tecken f\u00f6r indisk rupee",
-"turkish lira sign": "tecken f\u00f6r turkisk lira",
-"nordic mark sign": "tecken f\u00f6r nordisk mark",
-"manat sign": "manattecken",
-"ruble sign": "rubeltecken",
-"yen character": "yentecken",
-"yuan character": "yuantecken",
-"yuan character, in hong kong and taiwan": "yuantecken i Hongkong och Taiwan",
-"yen\/yuan character variant one": "yen-\/yuantecken variant ett",
-"Loading emoticons...": "L\u00e4ser in emoticons...",
-"Could not load emoticons": "Kunde inte l\u00e4sa in emoticons",
-"People": "M\u00e4nniskor",
-"Animals and Nature": "Djur och natur",
-"Food and Drink": "Mat och dryck",
-"Activity": "Aktivitet",
-"Travel and Places": "Resa och platser",
-"Objects": "F\u00f6rem\u00e5l",
-"Flags": "Flaggor",
-"Characters": "Tecken",
-"Characters (no spaces)": "Tecken (inga mellanrum)",
-"{0} characters": "{0} tecken",
-"Error: Form submit field collision.": "Fel: Kollision f\u00e4lt f\u00f6r s\u00e4ndning av formul\u00e4r.",
-"Error: No form element found.": "Fel: Inget formul\u00e4relement hittades.",
-"Update": "Uppdatera",
-"Color swatch": "F\u00e4rgpalett",
-"Turquoise": "Turkos",
-"Green": "Gr\u00f6n",
-"Blue": "Bl\u00e5",
-"Purple": "Lila",
-"Navy Blue": "M\u00f6rkbl\u00e5",
-"Dark Turquoise": "M\u00f6rkturkos",
-"Dark Green": "M\u00f6rkgr\u00f6n",
-"Medium Blue": "Mellanbl\u00e5",
-"Medium Purple": "Mellanlila",
-"Midnight Blue": "Midnattsbl\u00e5",
-"Yellow": "Gul",
-"Orange": "Orange",
-"Red": "R\u00f6d",
-"Light Gray": "Ljusgr\u00e5",
-"Gray": "Gr\u00e5",
-"Dark Yellow": "M\u00f6rkgul",
-"Dark Orange": "M\u00f6rkorange",
-"Dark Red": "M\u00f6rkr\u00f6d",
-"Medium Gray": "Mellangr\u00e5",
-"Dark Gray": "M\u00f6rkgr\u00e5",
-"Light Green": "Ljusgr\u00f6n",
-"Light Yellow": "Ljusgul",
-"Light Red": "Ljusr\u00f6d",
-"Light Purple": "Ljuslila",
-"Light Blue": "Ljusbl\u00e5",
-"Dark Purple": "M\u00f6rklila",
-"Dark Blue": "M\u00f6rkbl\u00e5",
-"Black": "Svart",
-"White": "Vit",
-"Switch to or from fullscreen mode": "V\u00e4xla till eller fr\u00e5n fullsk\u00e4rmsl\u00e4ge",
-"Open help dialog": "\u00d6ppna hj\u00e4lpdialogrutan",
-"history": "historik",
-"styles": "stilar",
-"formatting": "formatering",
-"alignment": "justering",
-"indentation": "indragning",
-"permanent pen": "permanent penna",
-"comments": "kommentarer",
-"Format Painter": "H\u00e4mta format",
-"Insert\/edit iframe": "Infoga\/redigera iframe",
-"Capitalization": "Versaler",
-"lowercase": "gemener",
-"UPPERCASE": "VERSALER",
-"Title Case": "Inledande versal",
-"Permanent Pen Properties": "Permanenta pennegenskaper",
-"Permanent pen properties...": "Permanenta pennegenskaper\u00a0\u2026",
-"Font": "Teckensnitt",
-"Size": "Storlek",
-"More...": "Mer...",
-"Spellcheck Language": "Spr\u00e5k f\u00f6r stavningskontroll",
-"Select...": "V\u00e4lj...",
-"Preferences": "Inst\u00e4llningar",
-"Yes": "Ja",
-"No": "Nej",
-"Keyboard Navigation": "Tangentbordsnavigering",
-"Version": "Version",
-"Anchor": "Ankare",
-"Special character": "Specialtecken",
-"Code sample": "K\u00e5dexempel",
-"Color": "F\u00e4rg",
-"Emoticons": "Emoticons",
-"Document properties": "Dokumentegenskaper",
-"Image": "Bild",
-"Insert link": "Infoga l\u00e4nk",
-"Target": "M\u00e5l",
-"Link": "L\u00e4nk",
-"Poster": "Affish",
-"Media": "Media",
-"Print": "Skriv ut",
-"Prev": "F\u00f6reg\u00e5ende",
-"Find and replace": "S\u00f6k och ers\u00e4tt",
-"Whole words": "Hela ord",
-"Spellcheck": "R\u00e4ttstava",
-"Caption": "Rubrik",
-"Insert template": "Infoga mall"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/ta.js b/cps/static/js/libs/tinymce/langs/ta.js
index 9149acd9e..31ff4c769 100644
--- a/cps/static/js/libs/tinymce/langs/ta.js
+++ b/cps/static/js/libs/tinymce/langs/ta.js
@@ -85,6 +85,7 @@ tinymce.addI18n('ta',{
 "B": "B",
 "Left to right": "\u0b87\u0b9f\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0bb5\u0bb2\u0bae\u0bcd",
 "Right to left": "\u0bb5\u0bb2\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0b87\u0b9f\u0bae\u0bcd",
+"Emoticons": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
 "Emoticons...": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
 "Metadata and Document Properties": "\u0bae\u0bc0\u0ba4\u0bcd\u0ba4\u0bb0\u0bb5\u0bc1 \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b86\u0bb5\u0ba3\u0baa\u0bcd \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
 "Title": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
@@ -113,7 +114,9 @@ tinymce.addI18n('ta',{
 "Handy Shortcuts": "\u0b8e\u0bb3\u0bbf\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0bc8\u0baf\u0bbe\u0bb3\u0b95\u0bcd\u0b95\u0bc2\u0b9f\u0bbf\u0baf \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bcd",
 "Horizontal line": "\u0b95\u0bbf\u0b9f\u0bc8 \u0b95\u0bcb\u0b9f\u0bc1",
 "Insert\/edit image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Image description": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
+"Alternative description": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
+"Accessibility": "\u0b85\u0ba3\u0bc1\u0b95\u0bb2\u0bcd\u0ba4\u0ba9\u0bcd\u0bae\u0bc8",
+"Image is decorative": "\u0baa\u0b9f\u0bae\u0bcd \u0b85\u0bb2\u0b99\u0bcd\u0b95\u0bbe\u0bb0\u0bae\u0bbe\u0ba9\u0ba4\u0bc1",
 "Source": "\u0bae\u0bc2\u0bb2\u0bae\u0bcd",
 "Dimensions": "\u0baa\u0bb0\u0bbf\u0bae\u0bbe\u0ba3\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
 "Constrain proportions": "\u0bb5\u0bbf\u0b95\u0bbf\u0ba4\u0bbe\u0b9a\u0bcd\u0b9a\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0b9f\u0bcd\u0b9f\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
@@ -147,7 +150,6 @@ tinymce.addI18n('ta',{
 "Back": "\u0baa\u0bbf\u0ba9\u0bcd",
 "Insert date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
 "Date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd",
-"Insert\/Edit Link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
 "Insert\/edit link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
 "Text to display": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bbf\u0baf \u0b89\u0bb0\u0bc8",
 "Url": "\u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
@@ -155,12 +157,14 @@ tinymce.addI18n('ta',{
 "Current window": "\u0ba4\u0bb1\u0bcd\u0baa\u0bcb\u0ba4\u0bc8\u0baf \u0b9a\u0bbe\u0bb3\u0bb0\u0bae\u0bcd",
 "None": "\u0b8f\u0ba4\u0bc1\u0bae\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
 "New window": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b9a\u0bbe\u0bb3\u0bb0\u0bae\u0bcd",
+"Open link": "\u0ba4\u0bbf\u0bb1\u0ba8\u0bcd\u0ba4 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
 "Remove link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc8 \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
 "Anchors": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
 "Link...": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1...",
 "Paste or type a link": "\u0b92\u0bb0\u0bc1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95 \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0ba4\u0b9f\u0bcd\u0b9f\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bae\u0bbf\u0ba9\u0bcd-\u0b85\u0b9e\u0bcd\u0b9a\u0bb2\u0bcd \u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 mailto: \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bb5\u0bc6\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0bc1\u0bb1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 (external link) \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 http:\/\/ \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bb5\u0bc6\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0bc1\u0bb1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 (external link) \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 https:\/\/ \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8 (prefix) \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0bb5\u0bbf\u0bb0\u0bc1\u0bae\u0bcd\u0baa\u0bc1\u0b95\u0bbf\u0bb1\u0bc0\u0bb0\u0bcd\u0b95\u0bb3\u0bbe?",
 "Link list": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0baa\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
 "Insert video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
 "Insert\/edit video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
@@ -183,11 +187,15 @@ tinymce.addI18n('ta',{
 "Replace all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
 "Previous": "\u0bae\u0bc1\u0ba8\u0bcd\u0ba4\u0bc8\u0baf",
 "Next": "\u0b85\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4",
+"Find and Replace": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
 "Find and replace...": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95...",
 "Could not find the specified string.": "\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bbf\u0b9f\u0bcd\u0b9f \u0b9a\u0bb0\u0bae\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 \u0bae\u0bc1\u0b9f\u0bbf\u0baf\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
 "Match case": "\u0bb5\u0b9f\u0bbf\u0bb5\u0ba4\u0bcd\u0ba4\u0bc8 \u0baa\u0bca\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
 "Find whole words only": "\u0bae\u0bc1\u0bb4\u0bc1 \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd \u0bae\u0b9f\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Spell check": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1",
+"Find in selection": "\u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bbf\u0bb2\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
+"Spellcheck": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
+"Spellcheck Language": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1 \u0bae\u0bca\u0bb4\u0bbf",
+"No misspellings found.": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0b95\u0bb3\u0bcd \u0b95\u0bbe\u0ba3\u0baa\u0bcd\u0baa\u0b9f\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8.",
 "Ignore": "\u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
 "Ignore all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
 "Finish": "\u0bae\u0bc1\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
@@ -218,6 +226,7 @@ tinymce.addI18n('ta',{
 "Height": "\u0b89\u0baf\u0bb0\u0bae\u0bcd",
 "Cell spacing": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
 "Cell padding": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0ba8\u0bbf\u0bb0\u0baa\u0bcd\u0baa\u0bb2\u0bcd",
+"Caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
 "Show caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
 "Left": "\u0b87\u0b9f\u0bae\u0bcd",
 "Center": "\u0bae\u0bc8\u0baf\u0bae\u0bcd",
@@ -377,7 +386,21 @@ tinymce.addI18n('ta',{
 "formatting": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd",
 "alignment": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8\u0bb5\u0bc1",
 "indentation": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bcd",
-"permanent pen": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe",
+"Font": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
+"Size": "\u0b85\u0bb3\u0bb5\u0bc1",
+"More...": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd...",
+"Select...": "\u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95...",
+"Preferences": "\u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
+"Yes": "\u0b86\u0bae\u0bcd",
+"No": "\u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
+"Keyboard Navigation": "\u0bb5\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0bb2\u0b95\u0bc8 \u0bb5\u0bb4\u0bbf\u0b9a\u0bcd\u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd",
+"Version": "\u0baa\u0ba4\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
+"Code view": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1",
+"Open popup menu for split buttons": "\u0baa\u0bbf\u0bb3\u0bb5\u0bc1 \u0baa\u0bca\u0ba4\u0bcd\u0ba4\u0bbe\u0ba9\u0bcd\u0b95\u0bb3\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0bae\u0bc7\u0bb2\u0bcd\u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1 \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bc8 \u0ba4\u0bbf\u0bb1\u0b95\u0bcd\u0b95",
+"List Properties": "\u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bbf\u0b9f\u0bc1\u0b95",
+"List properties...": "\u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bbf\u0b9f\u0bc1\u0b95..",
+"Start list at number": "\u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bc8 \u0b87\u0ba8\u0bcd\u0ba4 \u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0bb2\u0bcd \u0ba4\u0bca\u0b9f\u0b99\u0bcd\u0b95\u0bc1\u0b95",
+"Line height": "\u0bb5\u0bb0\u0bbf \u0b89\u0baf\u0bb0\u0bae\u0bcd",
 "comments": "\u0b95\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bb3\u0bcd",
 "Format Painter": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0baa\u0bc2\u0b9a\u0bbe\u0bb3\u0ba9\u0bcd",
 "Insert\/edit iframe": "iframe \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
@@ -385,24 +408,46 @@ tinymce.addI18n('ta',{
 "lowercase": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bc6\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
 "UPPERCASE": "\u0baa\u0bc7\u0bb0\u0bc6\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
 "Title Case": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bcd",
+"permanent pen": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe",
 "Permanent Pen Properties": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
 "Permanent pen properties...": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd...",
-"Font": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
-"Size": "\u0b85\u0bb3\u0bb5\u0bc1",
-"More...": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd...",
-"Spellcheck Language": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1 \u0bae\u0bca\u0bb4\u0bbf",
-"Select...": "\u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95...",
-"Preferences": "\u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Yes": "\u0b86\u0bae\u0bcd",
-"No": "\u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
-"Keyboard Navigation": "\u0bb5\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0bb2\u0b95\u0bc8 \u0bb5\u0bb4\u0bbf\u0b9a\u0bcd\u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd",
-"Version": "\u0baa\u0ba4\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
+"case change": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bae\u0bcd",
+"page embed": "\u0baa\u0b95\u0bcd\u0b95\u0bae\u0bcd \u0b89\u0b9f\u0bcd\u0baa\u0bca\u0ba4\u0bbf\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd",
+"Advanced sort...": "\u0bae\u0bc7\u0bae\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baf\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd...",
+"Advanced Sort": "\u0bae\u0bc7\u0bae\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baf\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd",
+"Sort table by column ascending": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8\u0baf\u0bc8 \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b8f\u0bb1\u0bc1\u0bae\u0bc1\u0b95\u0bae\u0bbe\u0b95 \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
+"Sort table by column descending": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8\u0baf\u0bc8 \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b87\u0bb1\u0b99\u0bcd\u0b95\u0bc1\u0bae\u0bc1\u0b95\u0bae\u0bbe\u0b95 \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
+"Sort": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
+"Order": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0bae\u0bc1\u0bb1\u0bc8",
+"Sort by": "\u0b87\u0ba4\u0ba9\u0bbe\u0bb2\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
+"Ascending": "\u0b8f\u0bb1\u0bc1\u0bae\u0bc1\u0b95\u0bae\u0bcd",
+"Descending": "\u0b87\u0bb1\u0b99\u0bcd\u0b95\u0bc1\u0bae\u0bc1\u0b95\u0bae\u0bcd",
+"Column {0}": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 {0}",
+"Row {0}": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 {0}",
+"Spellcheck...": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95...",
+"Misspelled word": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc1\u0bb3\u0bcd\u0bb3 \u0b9a\u0bca\u0bb2\u0bcd",
+"Suggestions": "\u0baa\u0bb0\u0bbf\u0ba8\u0bcd\u0ba4\u0bc1\u0bb0\u0bc8\u0b95\u0bb3\u0bcd",
+"Change": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
+"Finding word suggestions": "\u0b9a\u0bca\u0bb2\u0bcd \u0baa\u0bb0\u0bbf\u0ba8\u0bcd\u0ba4\u0bc1\u0bb0\u0bc8\u0b95\u0bb3\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bb1\u0bbf\u0baf\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1",
+"Success": "\u0bb5\u0bc6\u0bb1\u0bcd\u0bb1\u0bbf",
+"Repair": "\u0b9a\u0bb0\u0bbf \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
+"Issue {0} of {1}": "\u0baa\u0bbf\u0bb0\u0b9a\u0bcd\u0b9a\u0bbf\u0ba9\u0bc8 {0} \/ {1}",
+"Images must be marked as decorative or have an alternative text description": "\u0baa\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b85\u0bb2\u0b99\u0bcd\u0b95\u0bbe\u0bb0\u0bae\u0bbe\u0b95 \u0b95\u0bc1\u0bb1\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0b89\u0bb0\u0bc8 \u0bb5\u0bbf\u0bb3\u0b95\u0bcd\u0b95\u0ba4\u0bcd\u0ba4\u0bc8 \u0b95\u0bca\u0ba3\u0bcd\u0b9f\u0bbf\u0bb0\u0bc1\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd",
+"Images must have an alternative text description. Decorative images are not allowed.": "\u0baa\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0b89\u0bb0\u0bc8 \u0bb5\u0bbf\u0bb3\u0b95\u0bcd\u0b95\u0ba4\u0bcd\u0ba4\u0bc8 \u0b95\u0bca\u0ba3\u0bcd\u0b9f\u0bbf\u0bb0\u0bc1\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd. \u0b85\u0bb2\u0b99\u0bcd\u0b95\u0bbe\u0bb0\u0baa\u0bcd \u0baa\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0b85\u0ba9\u0bc1\u0bae\u0ba4\u0bbf\u0baf\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8.",
+"Or provide alternative text:": "\u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0b89\u0bb0\u0bc8\u0baf\u0bc8 \u0bb5\u0bb4\u0b99\u0bcd\u0b95\u0bb5\u0bc1\u0bae\u0bcd",
+"Make image decorative:": "\u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0b85\u0bb2\u0b99\u0bcd\u0b95\u0bbe\u0bb0\u0bae\u0bbe\u0ba9\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1\u0b95",
+"ID attribute must be unique": "ID \u0baa\u0ba3\u0bcd\u0baa\u0bc1 \u0ba4\u0ba9\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1\u0bb5\u0bae\u0bbe\u0b95 \u0b87\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd",
+"Make ID unique": "ID-\u0baf\u0bc8 \u0ba4\u0ba9\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1\u0bb5\u0bae\u0bbe\u0b95\u0bcd\u0b95\u0bc1\u0b95",
+"Keep this ID and remove all others": "\u0b87\u0ba8\u0bcd\u0ba4 ID-\u0baf\u0bc8 \u0bb5\u0bc8\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bca\u0ba3\u0bcd\u0b9f\u0bc1 \u0bae\u0bb1\u0bcd\u0bb1 \u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bb5\u0bc1\u0bae\u0bcd",
+"Remove this ID": "\u0b87\u0ba8\u0bcd\u0ba4 ID \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
+"Remove all IDs": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc1 ID-\u0b95\u0bb3\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
+"Checklist": "\u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1 \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
 "Anchor": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0bae\u0bcd",
 "Special character": "\u0b9a\u0bbf\u0bb1\u0baa\u0bcd\u0baa\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
 "Code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf",
 "Color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Emoticons": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
 "Document properties": "\u0b86\u0bb5\u0ba3\u0ba4\u0bcd\u0ba4\u0bbf\u0ba9\u0bcd \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
+"Image description": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
 "Image": "\u0baa\u0b9f\u0bae\u0bcd",
 "Insert link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
 "Target": "\u0b87\u0bb2\u0b95\u0bcd\u0b95\u0bc1",
@@ -413,7 +458,5 @@ tinymce.addI18n('ta',{
 "Prev": "\u0bae\u0bc1\u0ba8\u0bcd\u0ba4\u0bc8\u0baf",
 "Find and replace": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
 "Whole words": "\u0bae\u0bc1\u0bb4\u0bc1 \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Spellcheck": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
 "Insert template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/ta_IN.js b/cps/static/js/libs/tinymce/langs/ta_IN.js
deleted file mode 100644
index d738e6a6c..000000000
--- a/cps/static/js/libs/tinymce/langs/ta_IN.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('ta_IN',{
-"Redo": "\u0bae\u0bc0\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Undo": "\u0b9a\u0bc6\u0baf\u0bb2\u0bcd\u0ba4\u0bb5\u0bbf\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Cut": "\u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Copy": "\u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Paste": "\u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Select all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"New document": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b86\u0bb5\u0ba3\u0bae\u0bcd",
-"Ok": "\u0b9a\u0bb0\u0bbf",
-"Cancel": "\u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Visual aids": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0ba4\u0bcd \u0ba4\u0bc1\u0ba3\u0bc8\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd",
-"Bold": "\u0ba4\u0b9f\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Italic": "\u0b9a\u0bbe\u0baf\u0bcd\u0bb5\u0bc1",
-"Underline": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
-"Strikethrough": "\u0ba8\u0b9f\u0bc1\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
-"Superscript": "\u0bae\u0bc7\u0bb2\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
-"Subscript": "\u0b95\u0bc0\u0bb4\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
-"Clear formatting": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b85\u0bb4\u0bbf\u0b95\u0bcd\u0b95",
-"Align left": "\u0b87\u0b9f\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Align center": "\u0bae\u0bc8\u0baf \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Align right": "\u0bb5\u0bb2\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Justify": "\u0ba8\u0bc7\u0bb0\u0bcd\u0ba4\u0bcd\u0ba4\u0bbf \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Bullet list": "\u0baa\u0bca\u0b9f\u0bcd\u0b9f\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f  \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Numbered list": "\u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Decrease indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b95\u0bc1\u0bb1\u0bc8\u0b95\u0bcd\u0b95",
-"Increase indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b85\u0ba4\u0bbf\u0b95\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Close": "\u0bae\u0bc2\u0b9f\u0bc1\u0b95",
-"Formats": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0ba8\u0b95\u0bb2\u0b95\u0ba4\u0bcd\u0ba4\u0bbf\u0bb1\u0bcd\u0b95\u0bc1 \u0ba8\u0bc7\u0bb0\u0b9f\u0bbf \u0b85\u0ba3\u0bc1\u0b95\u0bb2\u0bc8 \u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb2\u0bbe\u0bb5\u0bbf \u0b86\u0ba4\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8. \u0b86\u0b95\u0bb5\u0bc7 \u0bb5\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0bb2\u0b95\u0bc8 \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bbe\u0ba9 Ctrl+X\/C\/V \u0b87\u0bb5\u0bb1\u0bcd\u0bb1\u0bc8 \u0ba4\u0baf\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0ba4\u0bc1 \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95.",
-"Headers": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Header 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
-"Header 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
-"Header 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
-"Header 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
-"Header 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
-"Header 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
-"Headings": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Heading 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
-"Heading 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
-"Heading 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
-"Heading 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
-"Heading 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
-"Heading 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
-"Preformatted": "\u0bae\u0bc1\u0ba9\u0bcd\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
-"Div": "\u0baa\u0bbf\u0bb0\u0bbf\u0bb5\u0bc1 (Div)",
-"Pre": "\u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1 (Pre)",
-"Code": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
-"Paragraph": "\u0baa\u0ba4\u0bcd\u0ba4\u0bbf",
-"Blockquote": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf \u0bae\u0bc7\u0bb1\u0bcd\u0b95\u0bcb\u0bb3\u0bcd",
-"Inline": "\u0b89\u0bb3\u0bcd\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bcd",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8 \u0bae\u0bc1\u0bb1\u0bc8\u0bae\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0ba4\u0bb1\u0bcd\u0baa\u0bcb\u0ba4\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0ba4\u0bb2\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba4\u0bc1. \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0ba8\u0bcd\u0ba4 \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc8 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0bb5\u0bb0\u0bc8 \u0b89\u0bb3\u0bcd\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0bae\u0bcd.",
-"Fonts": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Font Sizes": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1 \u0b85\u0bb3\u0bb5\u0bc1\u0b95\u0bb3\u0bcd",
-"Class": "Class",
-"Browse for an image": "\u0b92\u0bb0\u0bc1 \u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0b89\u0bb2\u0bbe\u0bb5\u0bc1\u0b95",
-"OR": "\u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1",
-"Drop an image here": "\u0b92\u0bb0\u0bc1 \u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0b87\u0b99\u0bcd\u0b95\u0bc1 \u0b87\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd \u0baa\u0bcb\u0b9f\u0bb5\u0bc1\u0bae\u0bcd",
-"Upload": "\u0baa\u0ba4\u0bbf\u0bb5\u0bc7\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Block": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf",
-"Align": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Default": "\u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1",
-"Circle": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bae\u0bcd",
-"Disc": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bc1",
-"Square": "\u0b9a\u0ba4\u0bc1\u0bb0\u0bae\u0bcd",
-"Lower Alpha": "\u0b95\u0bc0\u0bb4\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Lower Greek": "\u0b95\u0bc0\u0bb4\u0bcd \u0b95\u0bbf\u0bb0\u0bc7\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Lower Roman": "\u0b95\u0bc0\u0bb4\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
-"Upper Alpha": "\u0bae\u0bc7\u0bb2\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Upper Roman": "\u0bae\u0bc7\u0bb2\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
-"Anchor...": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0bae\u0bcd...",
-"Name": "\u0baa\u0bc6\u0baf\u0bb0\u0bcd",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0b86\u0ba9\u0ba4\u0bc1 \u0b92\u0bb0\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0ba4\u0bca\u0b9f\u0b99\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd; \u0b87\u0ba4\u0ba9\u0bc8\u0ba4\u0bcd \u0ba4\u0bca\u0b9f\u0bb0\u0bcd\u0ba8\u0bcd\u0ba4\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd, \u0b8e\u0ba3\u0bcd\u0b95\u0bb3\u0bcd, \u0b87\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (-), \u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (.), \u0bae\u0bc1\u0b95\u0bcd\u0b95\u0bbe\u0bb1\u0bcd\u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (:) \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (_) \u0bae\u0b9f\u0bcd\u0b9f\u0bc1\u0bae\u0bc7 \u0b87\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bbe\u0ba4 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba9; \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb1\u0bc1\u0ba4\u0bbf\u0baf\u0bbe\u0b95 \u0bb5\u0bc6\u0bb3\u0bbf\u0baf\u0bc7\u0bb1 \u0bb5\u0bbf\u0bb0\u0bc1\u0bae\u0bcd\u0baa\u0bc1\u0b95\u0bbf\u0bb1\u0bc0\u0bb0\u0bcd\u0b95\u0bbe\u0bb3\u0bbe?",
-"Restore last draft": "\u0b95\u0b9f\u0ba8\u0bcd\u0ba4 \u0bb5\u0bb0\u0bc8\u0bb5\u0bc8 \u0bae\u0bc0\u0b9f\u0bcd\u0b9f\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Special character...": "\u0b9a\u0bbf\u0bb1\u0baa\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc1...",
-"Source code": "\u0bae\u0bc2\u0bb2 \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
-"Insert\/Edit code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Language": "\u0bae\u0bca\u0bb4\u0bbf",
-"Code sample...": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf...",
-"Color Picker": "\u0ba8\u0bbf\u0bb1\u0ba4\u0bcd \u0ba4\u0bc6\u0bb0\u0bbf\u0bb5\u0bc1",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0b87\u0b9f\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0bb5\u0bb2\u0bae\u0bcd",
-"Right to left": "\u0bb5\u0bb2\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0b87\u0b9f\u0bae\u0bcd",
-"Emoticons...": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Metadata and Document Properties": "\u0bae\u0bc0\u0ba4\u0bcd\u0ba4\u0bb0\u0bb5\u0bc1 \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b86\u0bb5\u0ba3\u0baa\u0bcd \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Title": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Keywords": "\u0bae\u0bc1\u0ba4\u0ba9\u0bcd\u0bae\u0bc8\u0b9a\u0bcd\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Description": "\u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
-"Robots": "\u0baa\u0bca\u0bb1\u0bbf\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd (Robots)",
-"Author": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0bb3\u0bb0\u0bcd",
-"Encoding": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Fullscreen": "\u0bae\u0bc1\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb0\u0bc8",
-"Action": "\u0b9a\u0bc6\u0baf\u0bb2\u0bcd",
-"Shortcut": "\u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf",
-"Help": "\u0b89\u0ba4\u0bb5\u0bbf",
-"Address": "\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Focus to menubar": "\u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to toolbar": "\u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to element path": "\u0bae\u0bc2\u0bb2\u0b95\u0baa\u0bcd \u0baa\u0bbe\u0ba4\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to contextual toolbar": "\u0b9a\u0bc2\u0bb4\u0bcd\u0ba8\u0bbf\u0bb2\u0bc8 \u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Insert link (if link plugin activated)": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95 (\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Save (if save plugin activated)": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95 (\u0b9a\u0bc7\u0bae\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Find (if searchreplace plugin activated)": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 (\u0ba4\u0bc7\u0b9f\u0bbf\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bb2\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Plugins installed ({0}):": "\u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc1\u0bb3\u0bcd\u0bb3 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd ({0}):",
-"Premium plugins:": "\u0b89\u0baf\u0bb0\u0bcd\u0bae\u0ba4\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd:",
-"Learn more...": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd \u0b85\u0bb1\u0bbf\u0b95...",
-"You are using {0}": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb5\u0ba4\u0bc1 {0}",
-"Plugins": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd",
-"Handy Shortcuts": "\u0b8e\u0bb3\u0bbf\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0bc8\u0baf\u0bbe\u0bb3\u0b95\u0bcd\u0b95\u0bc2\u0b9f\u0bbf\u0baf \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bcd",
-"Horizontal line": "\u0b95\u0bbf\u0b9f\u0bc8 \u0b95\u0bcb\u0b9f\u0bc1",
-"Insert\/edit image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Image description": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
-"Source": "\u0bae\u0bc2\u0bb2\u0bae\u0bcd",
-"Dimensions": "\u0baa\u0bb0\u0bbf\u0bae\u0bbe\u0ba3\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Constrain proportions": "\u0bb5\u0bbf\u0b95\u0bbf\u0ba4\u0bbe\u0b9a\u0bcd\u0b9a\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0b9f\u0bcd\u0b9f\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"General": "\u0baa\u0bca\u0ba4\u0bc1",
-"Advanced": "\u0bae\u0bc7\u0bae\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
-"Style": "\u0baa\u0bbe\u0ba3\u0bbf",
-"Vertical space": "\u0ba8\u0bc6\u0b9f\u0bc1\u0ba4\u0bb3 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Horizontal space": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Border": "\u0b95\u0bb0\u0bc8",
-"Insert image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Image...": "\u0baa\u0b9f\u0bae\u0bcd...",
-"Image list": "\u0baa\u0b9f\u0baa\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Rotate counterclockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0 \u0b8e\u0ba4\u0bbf\u0bb0\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
-"Rotate clockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
-"Flip vertically": "\u0b9a\u0bc6\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
-"Flip horizontally": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f\u0bae\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
-"Edit image": "\u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0ba4\u0bca\u0b95\u0bc1",
-"Image options": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Zoom in": "\u0baa\u0bc6\u0bb0\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Zoom out": "\u0b9a\u0bbf\u0bb1\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Crop": "\u0b9a\u0bc6\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bc1",
-"Resize": "\u0bae\u0bb1\u0bc1\u0b85\u0bb3\u0bb5\u0bbf\u0b9f\u0bc1",
-"Orientation": "\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bae\u0bc8\u0bb5\u0bc1",
-"Brightness": "\u0b92\u0bb3\u0bbf\u0bb0\u0bcd\u0bb5\u0bc1",
-"Sharpen": "\u0b95\u0bc2\u0bb0\u0bcd\u0bae\u0bc8\u0baf\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Contrast": "\u0ba8\u0bbf\u0bb1\u0bae\u0bbe\u0bb1\u0bc1\u0baa\u0bbe\u0b9f\u0bc1",
-"Color levels": "\u0bb5\u0ba3\u0bcd\u0ba3 \u0ba8\u0bbf\u0bb2\u0bc8\u0b95\u0bb3\u0bcd",
-"Gamma": "Gamma",
-"Invert": "\u0ba8\u0bc7\u0bb0\u0bcd\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1",
-"Apply": "\u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Back": "\u0baa\u0bbf\u0ba9\u0bcd",
-"Insert date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd",
-"Insert\/Edit Link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Insert\/edit link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Text to display": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bbf\u0baf \u0b89\u0bb0\u0bc8",
-"Url": "\u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Open link in...": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc8 \u0b87\u0ba4\u0bbf\u0bb2\u0bcd \u0ba4\u0bbf\u0bb1\u0b95\u0bcd\u0b95...",
-"Current window": "\u0ba4\u0bb1\u0bcd\u0baa\u0bcb\u0ba4\u0bc8\u0baf \u0b9a\u0bbe\u0bb3\u0bb0\u0bae\u0bcd",
-"None": "\u0b8f\u0ba4\u0bc1\u0bae\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"New window": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b9a\u0bbe\u0bb3\u0bb0\u0bae\u0bcd",
-"Remove link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc8 \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Anchors": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Link...": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1...",
-"Paste or type a link": "\u0b92\u0bb0\u0bc1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95 \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0ba4\u0b9f\u0bcd\u0b9f\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bae\u0bbf\u0ba9\u0bcd-\u0b85\u0b9e\u0bcd\u0b9a\u0bb2\u0bcd \u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 mailto: \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bb5\u0bc6\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0bc1\u0bb1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 (external link) \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 http:\/\/ \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
-"Link list": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0baa\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Insert video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert\/edit video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Insert\/edit media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Alternative source": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bae\u0bc2\u0bb2\u0bae\u0bcd",
-"Alternative source URL": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bae\u0bc2\u0bb2 \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Media poster (Image URL)": "\u0b8a\u0b9f\u0b95 \u0b9a\u0bc1\u0bb5\u0bb0\u0bca\u0b9f\u0bcd\u0b9f\u0bbf (\u0b89\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf)",
-"Paste your embed code below:": "\u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0b9f\u0bcd\u0baa\u0bc6\u0bbe\u0ba4\u0bbf \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bcd\u0b9f\u0bc8 \u0b95\u0bc0\u0bb4\u0bc7 \u0b92\u0b9f\u0bcd\u0b9f\u0bb5\u0bc1\u0bae\u0bcd:",
-"Embed": "\u0b89\u0b9f\u0bcd\u0baa\u0bca\u0ba4\u0bbf",
-"Media...": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd...",
-"Nonbreaking space": "\u0baa\u0bbf\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Page break": "\u0baa\u0b95\u0bcd\u0b95 \u0baa\u0bbf\u0bb0\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Paste as text": "\u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Preview": "\u0bae\u0bc1\u0ba9\u0bcd\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1",
-"Print...": "\u0b85\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95...",
-"Save": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95",
-"Find": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Replace with": "\u0b87\u0ba4\u0ba9\u0bc1\u0b9f\u0ba9\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Replace": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Replace all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Previous": "\u0bae\u0bc1\u0ba8\u0bcd\u0ba4\u0bc8\u0baf",
-"Next": "\u0b85\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4",
-"Find and replace...": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95...",
-"Could not find the specified string.": "\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bbf\u0b9f\u0bcd\u0b9f \u0b9a\u0bb0\u0bae\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 \u0bae\u0bc1\u0b9f\u0bbf\u0baf\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"Match case": "\u0bb5\u0b9f\u0bbf\u0bb5\u0ba4\u0bcd\u0ba4\u0bc8 \u0baa\u0bca\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Find whole words only": "\u0bae\u0bc1\u0bb4\u0bc1 \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd \u0bae\u0b9f\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Spell check": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1",
-"Ignore": "\u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
-"Ignore all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
-"Finish": "\u0bae\u0bc1\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Add to Dictionary": "\u0b85\u0b95\u0bb0\u0bbe\u0ba4\u0bbf\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Insert table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Table properties": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Delete table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
-"Row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Cell properties": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Merge cells": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Split cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0bbf\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Insert row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Delete row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Row properties": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Cut row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Copy row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Paste row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Paste row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Insert column before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert column after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Delete column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Cols": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
-"Rows": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
-"Width": "\u0b85\u0b95\u0bb2\u0bae\u0bcd",
-"Height": "\u0b89\u0baf\u0bb0\u0bae\u0bcd",
-"Cell spacing": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Cell padding": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0ba8\u0bbf\u0bb0\u0baa\u0bcd\u0baa\u0bb2\u0bcd",
-"Show caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Left": "\u0b87\u0b9f\u0bae\u0bcd",
-"Center": "\u0bae\u0bc8\u0baf\u0bae\u0bcd",
-"Right": "\u0bb5\u0bb2\u0bae\u0bcd",
-"Cell type": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0bb5\u0b95\u0bc8",
-"Scope": "\u0bb5\u0bb0\u0bc8\u0baf\u0bc6\u0bb2\u0bcd\u0bb2\u0bc8",
-"Alignment": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8\u0bb5\u0bc1",
-"H Align": "\u0b95\u0bbf (H) \u0b87\u0b9a\u0bc8\u0bb5\u0bc1",
-"V Align": "\u0b9a\u0bc6 (V) \u0b87\u0b9a\u0bc8\u0bb5\u0bc1",
-"Top": "\u0bae\u0bc7\u0bb2\u0bcd",
-"Middle": "\u0ba8\u0b9f\u0bc1",
-"Bottom": "\u0bae\u0bc7\u0bb2\u0bcd",
-"Header cell": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
-"Row group": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
-"Column group": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
-"Row type": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0b95\u0bc8",
-"Header": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Body": "\u0b89\u0b9f\u0bb2\u0bcd",
-"Footer": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Border color": "\u0b95\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Insert template...": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95...",
-"Templates": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1",
-"Text color": "\u0b89\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Background color": "\u0baa\u0bbf\u0ba9\u0bcd\u0ba9\u0ba3\u0bbf \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Custom...": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd...",
-"Custom color": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"No color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd \u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
-"Remove color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Table of Contents": "\u0baa\u0bca\u0bb0\u0bc1\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Show blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Show invisible characters": "\u0b95\u0ba3\u0bcd\u0ba3\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0ba4\u0bcd \u0ba4\u0bc6\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Word count": "\u0b9a\u0bca\u0bb2\u0bcd \u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0b95\u0bcd\u0b95\u0bc8",
-"Count": "\u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0b95\u0bcd\u0b95\u0bc8",
-"Document": "\u0b86\u0bb5\u0ba3\u0bae\u0bcd",
-"Selection": "\u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1",
-"Words": "\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Words: {0}": "\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd: {0}",
-"{0} words": "{0} \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"File": "\u0b95\u0bcb\u0baa\u0bcd\u0baa\u0bc1",
-"Edit": "\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Insert": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"View": "\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Format": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8",
-"Tools": "\u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0b95\u0bb3\u0bcd",
-"Powered by {0}": "\u0bb5\u0bb2\u0bc1\u0bb5\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0ba4\u0bc1 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0b89\u0baf\u0bb0\u0bcd \u0b89\u0bb0\u0bc8 \u0baa\u0b95\u0bc1\u0ba4\u0bbf. \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-F9 , \u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc1 ALT-F10 , \u0b89\u0ba4\u0bb5\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-0",
-"Image title": "\u0baa\u0b9f\u0ba4\u0bcd \u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Border width": "\u0b95\u0bb0\u0bc8 \u0b85\u0b95\u0bb2\u0bae\u0bcd",
-"Border style": "\u0b95\u0bb0\u0bc8 \u0baa\u0bbe\u0ba3\u0bbf",
-"Error": "\u0baa\u0bbf\u0bb4\u0bc8",
-"Warn": "\u0b8e\u0b9a\u0bcd\u0b9a\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Valid": "\u0b9a\u0bc6\u0bb2\u0bcd\u0bb2\u0ba4\u0bcd\u0ba4\u0b95\u0bcd\u0b95\u0ba4\u0bc1",
-"To open the popup, press Shift+Enter": "\u0bae\u0bc7\u0bb2\u0bcd\u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1-\u0bb5\u0bc8\u0ba4\u0bcd \u0ba4\u0bbf\u0bb1\u0b95\u0bcd\u0b95 Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "\u0b89\u0baf\u0bb0\u0bcd \u0b89\u0bb0\u0bc8 \u0baa\u0b95\u0bc1\u0ba4\u0bbf. \u0b89\u0ba4\u0bb5\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-0",
-"System Font": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
-"Failed to upload image: {0}": "\u0baa\u0b9f\u0bae\u0bcd \u0baa\u0ba4\u0bbf\u0bb5\u0bc7\u0bb1\u0bcd\u0bb1\u0bb2\u0bcd \u0ba4\u0bcb\u0bb2\u0bcd\u0bb5\u0bbf\u0baf\u0bc1\u0bb1\u0bcd\u0bb1\u0ba4\u0bc1: {0}",
-"Failed to load plugin: {0} from url {1}": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b8f\u0bb1\u0bcd\u0bb1\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0bcb\u0bb2\u0bcd\u0bb5\u0bbf\u0baf\u0bc1\u0bb1\u0bcd\u0bb1\u0ba4\u0bc1: {0} - {1} \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf\u0baf\u0bbf\u0bb2\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1",
-"Failed to load plugin url: {0}": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf \u0b8f\u0bb1\u0bcd\u0bb1\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0bcb\u0bb2\u0bcd\u0bb5\u0bbf\u0baf\u0bc1\u0bb1\u0bcd\u0bb1\u0ba4\u0bc1: {0}",
-"Failed to initialize plugin: {0}": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0ba4\u0bc1\u0bb5\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0bcb\u0bb2\u0bcd\u0bb5\u0bbf\u0baf\u0bc1\u0bb1\u0bcd\u0bb1\u0ba4\u0bc1: {0}",
-"example": "\u0b89\u0ba4\u0bbe\u0bb0\u0ba3\u0bae\u0bcd",
-"Search": "\u0ba4\u0bc7\u0b9f\u0bc1\u0b95",
-"All": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc1\u0bae\u0bcd",
-"Currency": "\u0b9a\u0bc6\u0bb2\u0bbe\u0bb5\u0ba3\u0bbf (Currency)",
-"Text": "\u0b89\u0bb0\u0bc8",
-"Quotations": "\u0bae\u0bc7\u0bb1\u0bcd\u0b95\u0bc7\u0bbe\u0bb3\u0bcd\u0b95\u0bb3\u0bcd",
-"Mathematical": "\u0b95\u0ba3\u0b95\u0bcd\u0b95\u0bbf\u0baf\u0bb2\u0bcd",
-"Extended Latin": "\u0ba8\u0bc0\u0b9f\u0bcd\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0b87\u0bb2\u0ba4\u0bcd\u0ba4\u0bc0\u0ba9\u0bcd",
-"Symbols": "\u0b87\u0b9f\u0bc1\u0b95\u0bc1\u0bb1\u0bbf\u0b95\u0bb3\u0bcd",
-"Arrows": "\u0b85\u0bae\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"User Defined": "\u0baa\u0baf\u0ba9\u0bb0\u0bcd \u0bb5\u0bb0\u0bc8\u0baf\u0bb1\u0bc1\u0ba4\u0bcd\u0ba4",
-"dollar sign": "dollar \u0b95\u0bc1\u0bb1\u0bbf",
-"currency sign": "\u0b9a\u0bc6\u0bb2\u0bbe\u0bb5\u0ba3\u0bbf\u0b95\u0bcd \u0b95\u0bc1\u0bb1\u0bbf",
-"euro-currency sign": "euro-currency \u0b95\u0bc1\u0bb1\u0bbf",
-"colon sign": "colon \u0b95\u0bc1\u0bb1\u0bbf",
-"cruzeiro sign": "cruzeiro \u0b95\u0bc1\u0bb1\u0bbf",
-"french franc sign": "french franc \u0b95\u0bc1\u0bb1\u0bbf",
-"lira sign": "lira \u0b95\u0bc1\u0bb1\u0bbf",
-"mill sign": "mill \u0b95\u0bc1\u0bb1\u0bbf",
-"naira sign": "naira \u0b95\u0bc1\u0bb1\u0bbf",
-"peseta sign": "peseta \u0b95\u0bc1\u0bb1\u0bbf",
-"rupee sign": "rupee \u0b95\u0bc1\u0bb1\u0bbf",
-"won sign": "won \u0b95\u0bc1\u0bb1\u0bbf",
-"new sheqel sign": "new sheqel \u0b95\u0bc1\u0bb1\u0bbf",
-"dong sign": "dong \u0b95\u0bc1\u0bb1\u0bbf",
-"kip sign": "kip \u0b95\u0bc1\u0bb1\u0bbf",
-"tugrik sign": "tugrik \u0b95\u0bc1\u0bb1\u0bbf",
-"drachma sign": "drachma \u0b95\u0bc1\u0bb1\u0bbf",
-"german penny symbol": "german penny \u0b87\u0b9f\u0bc1\u0b95\u0bc1\u0bb1\u0bbf",
-"peso sign": "peso \u0b95\u0bc1\u0bb1\u0bbf",
-"guarani sign": "guarani \u0b95\u0bc1\u0bb1\u0bbf",
-"austral sign": "austral \u0b95\u0bc1\u0bb1\u0bbf",
-"hryvnia sign": "hryvnia \u0b95\u0bc1\u0bb1\u0bbf",
-"cedi sign": "cedi \u0b95\u0bc1\u0bb1\u0bbf",
-"livre tournois sign": "livre tournois \u0b95\u0bc1\u0bb1\u0bbf",
-"spesmilo sign": "spesmilo \u0b95\u0bc1\u0bb1\u0bbf",
-"tenge sign": "tenge \u0b95\u0bc1\u0bb1\u0bbf",
-"indian rupee sign": "indian rupee \u0b95\u0bc1\u0bb1\u0bbf",
-"turkish lira sign": "turkish lira \u0b95\u0bc1\u0bb1\u0bbf",
-"nordic mark sign": "nordic mark \u0b95\u0bc1\u0bb1\u0bbf",
-"manat sign": "manat \u0b95\u0bc1\u0bb1\u0bbf",
-"ruble sign": "ruble \u0b95\u0bc1\u0bb1\u0bbf",
-"yen character": "yen \u0b89\u0bb0\u0bc1",
-"yuan character": "yuan \u0b89\u0bb0\u0bc1",
-"yuan character, in hong kong and taiwan": "yuan \u0b89\u0bb0\u0bc1, \u0bb9\u0bbe\u0b99\u0bcd\u0b95\u0bbe\u0b99\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0ba4\u0bbe\u0baf\u0bcd\u0bb5\u0bbe\u0ba9\u0bcd \u0b87\u0bb2\u0bcd",
-"yen\/yuan character variant one": "yen\/yuan \u0b89\u0bb0\u0bc1 \u0bae\u0bbe\u0bb1\u0bc1\u0baa\u0bbe\u0b9f\u0bc1",
-"Loading emoticons...": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b8f\u0bb1\u0bcd\u0bb1\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0b95\u0bbf\u0ba9\u0bcd\u0bb1\u0ba9...",
-"Could not load emoticons": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bc8 \u0b8f\u0bb1\u0bcd\u0bb1 \u0bae\u0bc1\u0b9f\u0bbf\u0baf\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"People": "\u0bae\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Animals and Nature": "\u0bae\u0bbf\u0bb0\u0bc1\u0b95\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b87\u0baf\u0bb1\u0bcd\u0b95\u0bc8",
-"Food and Drink": "\u0b89\u0ba3\u0bb5\u0bc1 \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0baa\u0bbe\u0ba9\u0bae\u0bcd",
-"Activity": "\u0b9a\u0bc6\u0baf\u0bb1\u0bcd\u0baa\u0bbe\u0b9f\u0bc1",
-"Travel and Places": "\u0baa\u0baf\u0ba3\u0bae\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b87\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Objects": "\u0baa\u0bca\u0bb0\u0bc1\u0b9f\u0bcd\u0b95\u0bb3\u0bcd",
-"Flags": "\u0b95\u0bca\u0b9f\u0bbf\u0b95\u0bb3\u0bcd",
-"Characters": "\u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Characters (no spaces)": "\u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd (\u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf\u0b95\u0bb3\u0bcd \u0b87\u0bb2\u0bcd\u0bb2\u0bc8)",
-"{0} characters": "{0} \u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Error: Form submit field collision.": "\u0baa\u0bbf\u0bb4\u0bc8: \u0baa\u0b9f\u0bbf\u0bb5\u0bae\u0bcd \u0b9a\u0bae\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bbf\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd \u0baa\u0bc1\u0bb2\u0bae\u0bcd \u0bae\u0bcb\u0ba4\u0bb2\u0bcd.",
-"Error: No form element found.": "\u0baa\u0bbf\u0bb4\u0bc8: \u0baa\u0bc1\u0bb2\u0bae\u0bcd \u0bae\u0bc2\u0bb2\u0b95\u0bae\u0bcd \u0b8e\u0ba4\u0bc1\u0bb5\u0bc1\u0bae\u0bcd \u0b95\u0bbe\u0ba3\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8.",
-"Update": "\u0baa\u0bc1\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0b95\u0bcd\u0b95",
-"Color swatch": "\u0ba8\u0bbf\u0bb1\u0b9a\u0bcd \u0b9a\u0bcb\u0ba4\u0ba9\u0bc8\u0b95\u0bcd\u0b95\u0bb2\u0bb5\u0bc8",
-"Turquoise": "\u0ba8\u0bc0\u0bb2\u0baa\u0bcd\u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Green": "\u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Blue": "\u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Purple": "\u0b8a\u0ba4\u0bbe",
-"Navy Blue": "\u0b95\u0b9f\u0bb1\u0bcd\u0baa\u0b9f\u0bc8 \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Dark Turquoise": "\u0b85\u0b9f\u0bb0\u0bcd \u0ba8\u0bc0\u0bb2\u0baa\u0bcd\u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Dark Green": "\u0b85\u0b9f\u0bb0\u0bcd \u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Medium Blue": "\u0ba8\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bb0 \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Medium Purple": "\u0ba8\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bb0 \u0b8a\u0ba4\u0bbe",
-"Midnight Blue": "\u0ba8\u0bb3\u0bcd\u0bb3\u0bbf\u0bb0\u0bb5\u0bc1 \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Yellow": "\u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Orange": "\u0b9a\u0bbf\u0bb5\u0ba8\u0bcd\u0ba4 \u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Red": "\u0b9a\u0bbf\u0bb5\u0baa\u0bcd\u0baa\u0bc1",
-"Light Gray": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0b9a\u0bbe\u0bae\u0bcd\u0baa\u0bb2\u0bcd",
-"Gray": "\u0b9a\u0bbe\u0bae\u0bcd\u0baa\u0bb2\u0bcd",
-"Dark Yellow": "\u0b85\u0b9f\u0bb0\u0bcd \u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Dark Orange": "\u0b85\u0b9f\u0bb0\u0bcd \u0b9a\u0bbf\u0bb5\u0ba8\u0bcd\u0ba4 \u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Dark Red": "\u0b85\u0b9f\u0bb0\u0bcd \u0b9a\u0bbf\u0bb5\u0baa\u0bcd\u0baa\u0bc1",
-"Medium Gray": "\u0ba8\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bb0 \u0b9a\u0bbe\u0bae\u0bcd\u0baa\u0bb2\u0bcd",
-"Dark Gray": "\u0b85\u0b9f\u0bb0\u0bcd \u0b9a\u0bbe\u0bae\u0bcd\u0baa\u0bb2\u0bcd",
-"Light Green": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Light Yellow": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Light Red": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd\u00a0\u0b9a\u0bbf\u0bb5\u0baa\u0bcd\u0baa\u0bc1",
-"Light Purple": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0b8a\u0ba4\u0bbe",
-"Light Blue": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Dark Purple": "\u0b85\u0b9f\u0bb0\u0bcd \u0b8a\u0ba4\u0bbe",
-"Dark Blue": "\u0b85\u0b9f\u0bb0\u0bcd \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Black": "\u0b95\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1",
-"White": "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bc8",
-"Switch to or from fullscreen mode": "\u0bae\u0bc1\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb0\u0bc8 \u0bae\u0bc1\u0bb1\u0bc8\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0bc1\/\u0bae\u0bc1\u0bb1\u0bc8\u0bae\u0bc8\u0baf\u0bbf\u0bb2\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bc1\u0b95",
-"Open help dialog": "\u0b89\u0ba4\u0bb5\u0bbf \u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b9f\u0bb2\u0bcd \u0ba4\u0bbf\u0bb1\u0b95\u0bcd\u0b95",
-"history": "\u0bb5\u0bb0\u0bb2\u0bbe\u0bb1\u0bc1",
-"styles": "\u0baa\u0bbe\u0ba3\u0bbf\u0b95\u0bb3\u0bcd",
-"formatting": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd",
-"alignment": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8\u0bb5\u0bc1",
-"indentation": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bcd",
-"permanent pen": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe",
-"comments": "\u0b95\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bb3\u0bcd",
-"Format Painter": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0baa\u0bc2\u0b9a\u0bbe\u0bb3\u0ba9\u0bcd",
-"Insert\/edit iframe": "iframe \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Capitalization": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"lowercase": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bc6\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"UPPERCASE": "\u0baa\u0bc7\u0bb0\u0bc6\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Title Case": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bcd",
-"Permanent Pen Properties": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Permanent pen properties...": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd...",
-"Font": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
-"Size": "\u0b85\u0bb3\u0bb5\u0bc1",
-"More...": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd...",
-"Spellcheck Language": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1 \u0bae\u0bca\u0bb4\u0bbf",
-"Select...": "\u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95...",
-"Preferences": "\u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Yes": "\u0b86\u0bae\u0bcd",
-"No": "\u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
-"Keyboard Navigation": "\u0bb5\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0bb2\u0b95\u0bc8 \u0bb5\u0bb4\u0bbf\u0b9a\u0bcd\u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd",
-"Version": "\u0baa\u0ba4\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Anchor": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0bae\u0bcd",
-"Special character": "\u0b9a\u0bbf\u0bb1\u0baa\u0bcd\u0baa\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
-"Code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf",
-"Color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Emoticons": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Document properties": "\u0b86\u0bb5\u0ba3\u0ba4\u0bcd\u0ba4\u0bbf\u0ba9\u0bcd \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Image": "\u0baa\u0b9f\u0bae\u0bcd",
-"Insert link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Target": "\u0b87\u0bb2\u0b95\u0bcd\u0b95\u0bc1",
-"Link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Poster": "\u0b9a\u0bc1\u0bb5\u0bb0\u0bca\u0b9f\u0bcd\u0b9f\u0bbf",
-"Media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd",
-"Print": "\u0b85\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
-"Prev": "\u0bae\u0bc1\u0ba8\u0bcd\u0ba4\u0bc8\u0baf",
-"Find and replace": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Whole words": "\u0bae\u0bc1\u0bb4\u0bc1 \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Spellcheck": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Insert template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/th_TH.js b/cps/static/js/libs/tinymce/langs/th_TH.js
deleted file mode 100644
index 8df0abcc6..000000000
--- a/cps/static/js/libs/tinymce/langs/th_TH.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('th_TH',{
-"Redo": "\u0e17\u0e33\u0e43\u0e2b\u0e21\u0e48\u0e2d\u0e35\u0e01",
-"Undo": "\u0e40\u0e1b\u0e25\u0e35\u0e48\u0e22\u0e19\u0e01\u0e25\u0e31\u0e1a\u0e04\u0e37\u0e19",
-"Cut": "\u0e15\u0e31\u0e14",
-"Copy": "\u0e04\u0e31\u0e14\u0e25\u0e2d\u0e01",
-"Paste": "\u0e27\u0e32\u0e07",
-"Select all": "\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"New document": "\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23\u0e43\u0e2b\u0e21\u0e48",
-"Ok": "\u0e15\u0e01\u0e25\u0e07",
-"Cancel": "\u0e22\u0e01\u0e40\u0e25\u0e34\u0e01",
-"Visual aids": "\u0e17\u0e31\u0e28\u0e19\u0e39\u0e1b\u0e01\u0e23\u0e13\u0e4c",
-"Bold": "\u0e15\u0e31\u0e27\u0e2b\u0e19\u0e32",
-"Italic": "\u0e15\u0e31\u0e27\u0e40\u0e2d\u0e35\u0e22\u0e07",
-"Underline": "\u0e02\u0e35\u0e14\u0e40\u0e2a\u0e49\u0e19\u0e43\u0e15\u0e49",
-"Strikethrough": "\u0e02\u0e35\u0e14\u0e04\u0e23\u0e48\u0e2d\u0e21",
-"Superscript": "\u0e15\u0e31\u0e27\u0e22\u0e01",
-"Subscript": "\u0e15\u0e31\u0e27\u0e2b\u0e49\u0e2d\u0e22",
-"Clear formatting": "\u0e25\u0e49\u0e32\u0e07\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Align left": "\u0e08\u0e31\u0e14\u0e0a\u0e34\u0e14\u0e0b\u0e49\u0e32\u0e22",
-"Align center": "\u0e08\u0e31\u0e14\u0e01\u0e36\u0e48\u0e07\u0e01\u0e25\u0e32\u0e07",
-"Align right": "\u0e08\u0e31\u0e14\u0e0a\u0e34\u0e14\u0e02\u0e27\u0e32",
-"Justify": "\u0e40\u0e15\u0e47\u0e21\u0e41\u0e19\u0e27",
-"Bullet list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2b\u0e31\u0e27\u0e02\u0e49\u0e2d\u0e22\u0e48\u0e2d\u0e22",
-"Numbered list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e25\u0e33\u0e14\u0e31\u0e1a\u0e40\u0e25\u0e02",
-"Decrease indent": "\u0e25\u0e14\u0e01\u0e32\u0e23\u0e40\u0e22\u0e37\u0e49\u0e2d\u0e07",
-"Increase indent": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e01\u0e32\u0e23\u0e40\u0e22\u0e37\u0e49\u0e2d\u0e07",
-"Close": "\u0e1b\u0e34\u0e14",
-"Formats": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0e40\u0e1a\u0e23\u0e32\u0e27\u0e4c\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e44\u0e21\u0e48\u0e2a\u0e19\u0e31\u0e1a\u0e2a\u0e19\u0e38\u0e19\u0e01\u0e32\u0e23\u0e40\u0e02\u0e49\u0e32\u0e16\u0e36\u0e07\u0e42\u0e14\u0e22\u0e15\u0e23\u0e07\u0e44\u0e1b\u0e22\u0e31\u0e07\u0e04\u0e25\u0e34\u0e1b\u0e1a\u0e2d\u0e23\u0e4c\u0e14 \u0e01\u0e23\u0e38\u0e13\u0e32\u0e43\u0e0a\u0e49\u0e41\u0e1b\u0e49\u0e19\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e25\u0e31\u0e14 Ctrl+X\/C\/V \u0e41\u0e17\u0e19",
-"Headers": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
-"Header 1": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 1",
-"Header 2": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 2",
-"Header 3": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 3",
-"Header 4": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 4",
-"Header 5": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 5",
-"Header 6": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 6",
-"Headings": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07",
-"Heading 1": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e17\u0e35\u0e48 1",
-"Heading 2": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e17\u0e35\u0e48 2",
-"Heading 3": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e17\u0e35\u0e48 3",
-"Heading 4": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e17\u0e35\u0e48 4",
-"Heading 5": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e17\u0e35\u0e48 5",
-"Heading 6": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e17\u0e35\u0e48 6",
-"Preformatted": "\u0e1f\u0e2d\u0e23\u0e4c\u0e41\u0e21\u0e15\u0e44\u0e27\u0e49\u0e01\u0e48\u0e2d\u0e19",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u0e23\u0e2b\u0e31\u0e2a",
-"Paragraph": "\u0e22\u0e48\u0e2d\u0e2b\u0e19\u0e49\u0e32",
-"Blockquote": "Blockquote",
-"Inline": "\u0e41\u0e1a\u0e1a\u0e2d\u0e34\u0e19\u0e44\u0e25\u0e19\u0e4c",
-"Blocks": "\u0e1a\u0e25\u0e4a\u0e2d\u0e04",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0e01\u0e32\u0e23\u0e27\u0e32\u0e07\u0e15\u0e2d\u0e19\u0e19\u0e35\u0e49\u0e2d\u0e22\u0e39\u0e48\u0e43\u0e19\u0e42\u0e2b\u0e21\u0e14\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e18\u0e23\u0e23\u0e21\u0e14\u0e32 \u0e40\u0e19\u0e37\u0e49\u0e2d\u0e2b\u0e32\u0e08\u0e30\u0e16\u0e39\u0e01\u0e27\u0e32\u0e07\u0e40\u0e1b\u0e47\u0e19\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e18\u0e23\u0e23\u0e21\u0e14\u0e32\u0e08\u0e19\u0e01\u0e27\u0e48\u0e32\u0e04\u0e38\u0e13\u0e08\u0e30\u0e1b\u0e34\u0e14\u0e15\u0e31\u0e27\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e19\u0e35\u0e49",
-"Fonts": "\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23",
-"Font Sizes": "\u0e02\u0e19\u0e32\u0e14\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23",
-"Class": "\u0e0a\u0e31\u0e49\u0e19",
-"Browse for an image": "\u0e40\u0e23\u0e35\u0e22\u0e01\u0e14\u0e39\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"OR": "OR",
-"Drop an image here": "\u0e27\u0e32\u0e07\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e\u0e17\u0e35\u0e48\u0e19\u0e35\u0e48",
-"Upload": "\u0e2d\u0e31\u0e1b\u0e42\u0e2b\u0e25\u0e14",
-"Block": "\u0e1a\u0e25\u0e47\u0e2d\u0e01",
-"Align": "Align",
-"Default": "\u0e04\u0e48\u0e32\u0e40\u0e23\u0e34\u0e48\u0e21\u0e15\u0e49\u0e19",
-"Circle": "\u0e27\u0e07\u0e01\u0e25\u0e21",
-"Disc": "\u0e14\u0e34\u0e2a\u0e01\u0e4c",
-"Square": "\u0e08\u0e31\u0e15\u0e38\u0e23\u0e31\u0e2a",
-"Lower Alpha": "\u0e2d\u0e31\u0e25\u0e1f\u0e32\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
-"Lower Greek": "\u0e01\u0e23\u0e35\u0e01\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
-"Lower Roman": "\u0e42\u0e23\u0e21\u0e31\u0e19\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
-"Upper Alpha": "\u0e2d\u0e31\u0e25\u0e1f\u0e32\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07\u0e01\u0e27\u0e48\u0e32",
-"Upper Roman": "\u0e42\u0e23\u0e21\u0e31\u0e19\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07\u0e01\u0e27\u0e48\u0e32",
-"Anchor...": "\u0e08\u0e38\u0e14\u0e22\u0e36\u0e14...",
-"Name": "\u0e0a\u0e37\u0e48\u0e2d",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0e04\u0e27\u0e23\u0e08\u0e30\u0e02\u0e36\u0e49\u0e19\u0e15\u0e49\u0e19\u0e14\u0e49\u0e27\u0e22\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23 \u0e15\u0e32\u0e21\u0e14\u0e49\u0e27\u0e22\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23 \u0e15\u0e31\u0e27\u0e40\u0e25\u0e02 \u0e02\u0e35\u0e14\u0e01\u0e25\u0e32\u0e07 \u0e08\u0e38\u0e14 \u0e2d\u0e31\u0e12\u0e20\u0e32\u0e04 \u0e2b\u0e23\u0e37\u0e2d \u0e02\u0e35\u0e14\u0e25\u0e48\u0e32\u0e07",
-"You have unsaved changes are you sure you want to navigate away?": "\u0e04\u0e38\u0e13\u0e21\u0e35\u0e01\u0e32\u0e23\u0e40\u0e1b\u0e25\u0e35\u0e48\u0e22\u0e19\u0e41\u0e1b\u0e25\u0e07\u0e17\u0e35\u0e48\u0e44\u0e21\u0e48\u0e44\u0e14\u0e49\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01 \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e17\u0e35\u0e48\u0e08\u0e30\u0e2d\u0e2d\u0e01\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48?",
-"Restore last draft": "\u0e04\u0e37\u0e19\u0e04\u0e48\u0e32\u0e41\u0e1a\u0e1a\u0e23\u0e48\u0e32\u0e07\u0e25\u0e48\u0e32\u0e2a\u0e38\u0e14",
-"Special character...": "\u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30\u0e1e\u0e34\u0e40\u0e28\u0e29...",
-"Source code": "\u0e42\u0e04\u0e49\u0e14\u0e15\u0e49\u0e19\u0e09\u0e1a\u0e31\u0e1a",
-"Insert\/Edit code sample": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14",
-"Language": "\u0e20\u0e32\u0e29\u0e32",
-"Code sample...": "\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14...",
-"Color Picker": "\u0e15\u0e31\u0e27\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e2a\u0e35",
-"R": "\u0e41\u0e14\u0e07",
-"G": "\u0e40\u0e02\u0e35\u0e22\u0e27",
-"B": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19",
-"Left to right": "\u0e0b\u0e49\u0e32\u0e22\u0e44\u0e1b\u0e02\u0e27\u0e32",
-"Right to left": "\u0e02\u0e27\u0e32\u0e44\u0e1b\u0e0b\u0e49\u0e32\u0e22",
-"Emoticons...": "\u0e2d\u0e35\u0e42\u0e21\u0e15\u0e34\u0e04\u0e2d\u0e19...",
-"Metadata and Document Properties": "\u0e40\u0e21\u0e15\u0e32\u0e14\u0e32\u0e15\u0e49\u0e32\u0e41\u0e25\u0e30\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23",
-"Title": "\u0e0a\u0e37\u0e48\u0e2d\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07",
-"Keywords": "\u0e04\u0e33\u0e2a\u0e33\u0e04\u0e31\u0e0d",
-"Description": "\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22",
-"Robots": "\u0e2b\u0e38\u0e48\u0e19\u0e22\u0e19\u0e15\u0e4c",
-"Author": "\u0e1c\u0e39\u0e49\u0e40\u0e02\u0e35\u0e22\u0e19",
-"Encoding": "\u0e01\u0e32\u0e23\u0e40\u0e02\u0e49\u0e32\u0e23\u0e2b\u0e31\u0e2a",
-"Fullscreen": "\u0e40\u0e15\u0e47\u0e21\u0e08\u0e2d",
-"Action": "\u0e01\u0e32\u0e23\u0e01\u0e23\u0e30\u0e17\u0e33",
-"Shortcut": "\u0e17\u0e32\u0e07\u0e25\u0e31\u0e14",
-"Help": "\u0e0a\u0e48\u0e27\u0e22\u0e40\u0e2b\u0e25\u0e37\u0e2d",
-"Address": "\u0e17\u0e35\u0e48\u0e2d\u0e22\u0e39\u0e48",
-"Focus to menubar": "\u0e42\u0e1f\u0e01\u0e31\u0e2a\u0e44\u0e1b\u0e17\u0e35\u0e48\u0e40\u0e21\u0e19\u0e39\u0e1a\u0e32\u0e23\u0e4c",
-"Focus to toolbar": "\u0e42\u0e1f\u0e01\u0e31\u0e2a\u0e44\u0e1b\u0e17\u0e35\u0e48\u0e41\u0e16\u0e1a\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d",
-"Focus to element path": "\u0e42\u0e1f\u0e01\u0e31\u0e2a\u0e44\u0e1b\u0e17\u0e35\u0e48\u0e40\u0e2a\u0e49\u0e19\u0e17\u0e32\u0e07\u0e02\u0e2d\u0e07\u0e2d\u0e07\u0e04\u0e4c\u0e1b\u0e23\u0e30\u0e01\u0e2d\u0e1a",
-"Focus to contextual toolbar": "\u0e42\u0e1f\u0e01\u0e31\u0e2a\u0e44\u0e1b\u0e17\u0e35\u0e48\u0e41\u0e16\u0e1a\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d\u0e15\u0e32\u0e21\u0e1a\u0e23\u0e34\u0e1a\u0e17",
-"Insert link (if link plugin activated)": "\u0e41\u0e17\u0e23\u0e01\u0e25\u0e34\u0e07\u0e01\u0e4c (\u0e2b\u0e32\u0e01\u0e40\u0e1b\u0e34\u0e14\u0e43\u0e0a\u0e49\u0e07\u0e32\u0e19\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c)",
-"Save (if save plugin activated)": "\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01 (\u0e2b\u0e32\u0e01\u0e40\u0e1b\u0e34\u0e14\u0e43\u0e0a\u0e49\u0e07\u0e32\u0e19\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01)",
-"Find (if searchreplace plugin activated)": "\u0e04\u0e49\u0e19\u0e2b\u0e32 (\u0e2b\u0e32\u0e01\u0e40\u0e1b\u0e34\u0e14\u0e43\u0e0a\u0e49\u0e07\u0e32\u0e19\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19 searchreplace)",
-"Plugins installed ({0}):": "\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19\u0e17\u0e35\u0e48\u0e15\u0e34\u0e14\u0e15\u0e31\u0e49\u0e07\u0e41\u0e25\u0e49\u0e27 ({0}):",
-"Premium plugins:": "\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19\u0e1e\u0e23\u0e35\u0e40\u0e21\u0e35\u0e22\u0e21:",
-"Learn more...": "\u0e40\u0e23\u0e35\u0e22\u0e19\u0e23\u0e39\u0e49\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e40\u0e15\u0e34\u0e21...",
-"You are using {0}": "\u0e04\u0e38\u0e13\u0e01\u0e33\u0e25\u0e31\u0e07\u0e43\u0e0a\u0e49 {0}",
-"Plugins": "\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19",
-"Handy Shortcuts": "\u0e17\u0e32\u0e07\u0e25\u0e31\u0e14\u0e14\u0e49\u0e27\u0e22\u0e21\u0e37\u0e2d",
-"Horizontal line": "\u0e40\u0e2a\u0e49\u0e19\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Insert\/edit image": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e23\u0e39\u0e1b",
-"Image description": "\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22\u0e23\u0e39\u0e1b",
-"Source": "\u0e41\u0e2b\u0e25\u0e48\u0e07\u0e17\u0e35\u0e48\u0e21\u0e32",
-"Dimensions": "\u0e02\u0e19\u0e32\u0e14",
-"Constrain proportions": "\u0e08\u0e33\u0e01\u0e31\u0e14\u0e2a\u0e31\u0e14\u0e2a\u0e48\u0e27\u0e19",
-"General": "\u0e17\u0e31\u0e48\u0e27\u0e44\u0e1b",
-"Advanced": "\u0e02\u0e31\u0e49\u0e19\u0e2a\u0e39\u0e07",
-"Style": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Vertical space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
-"Horizontal space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Border": "\u0e40\u0e2a\u0e49\u0e19\u0e02\u0e2d\u0e1a",
-"Insert image": "\u0e41\u0e17\u0e23\u0e01\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Image...": "\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e...",
-"Image list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Rotate counterclockwise": "\u0e2b\u0e21\u0e38\u0e19\u0e17\u0e27\u0e19\u0e40\u0e02\u0e47\u0e21\u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32",
-"Rotate clockwise": "\u0e2b\u0e21\u0e38\u0e19\u0e15\u0e32\u0e21\u0e40\u0e02\u0e47\u0e21\u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32",
-"Flip vertically": "\u0e1e\u0e25\u0e34\u0e01\u0e15\u0e32\u0e21\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
-"Flip horizontally": "\u0e1e\u0e25\u0e34\u0e01\u0e15\u0e32\u0e21\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Edit image": "\u0e41\u0e01\u0e49\u0e44\u0e02\u0e23\u0e39\u0e1b",
-"Image options": "\u0e15\u0e31\u0e27\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Zoom in": "\u0e02\u0e22\u0e32\u0e22\u0e40\u0e02\u0e49\u0e32",
-"Zoom out": "\u0e22\u0e48\u0e2d\u0e2d\u0e2d\u0e01",
-"Crop": "\u0e04\u0e23\u0e2d\u0e1b\u0e15\u0e31\u0e14",
-"Resize": "\u0e1b\u0e23\u0e31\u0e1a\u0e02\u0e19\u0e32\u0e14",
-"Orientation": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e27\u0e32\u0e07",
-"Brightness": "\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e27\u0e48\u0e32\u0e07",
-"Sharpen": "\u0e04\u0e27\u0e32\u0e21\u0e04\u0e21",
-"Contrast": "\u0e04\u0e27\u0e32\u0e21\u0e40\u0e1b\u0e23\u0e35\u0e22\u0e1a\u0e15\u0e48\u0e32\u0e07",
-"Color levels": "\u0e23\u0e30\u0e14\u0e31\u0e1a\u0e2a\u0e35",
-"Gamma": "\u0e41\u0e01\u0e21\u0e21\u0e32",
-"Invert": "\u0e22\u0e49\u0e2d\u0e19\u0e01\u0e25\u0e31\u0e1a",
-"Apply": "\u0e19\u0e33\u0e44\u0e1b\u0e43\u0e0a\u0e49",
-"Back": "\u0e01\u0e25\u0e31\u0e1a",
-"Insert date\/time": "\u0e41\u0e17\u0e23\u0e01\u0e27\u0e31\u0e19\u0e17\u0e35\u0e48\/\u0e40\u0e27\u0e25\u0e32",
-"Date\/time": "\u0e27\u0e31\u0e19\u0e17\u0e35\u0e48\/\u0e40\u0e27\u0e25\u0e32",
-"Insert\/Edit Link": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Insert\/edit link": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Text to display": "\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e41\u0e2a\u0e14\u0e07",
-"Url": "URL",
-"Open link in...": "\u0e40\u0e1b\u0e34\u0e14\u0e25\u0e34\u0e07\u0e01\u0e4c\u0e43\u0e19...",
-"Current window": "\u0e2b\u0e19\u0e49\u0e32\u0e15\u0e48\u0e32\u0e07\u0e1b\u0e31\u0e08\u0e08\u0e38\u0e1a\u0e31\u0e19",
-"None": "\u0e44\u0e21\u0e48\u0e21\u0e35",
-"New window": "\u0e40\u0e1b\u0e34\u0e14\u0e2b\u0e19\u0e49\u0e32\u0e15\u0e48\u0e32\u0e07\u0e43\u0e2b\u0e21\u0e48",
-"Remove link": "\u0e40\u0e2d\u0e32\u0e25\u0e34\u0e07\u0e01\u0e4c\u0e2d\u0e2d\u0e01",
-"Anchors": "\u0e08\u0e38\u0e14\u0e22\u0e36\u0e14",
-"Link...": "\u0e25\u0e34\u0e07\u0e01\u0e4c...",
-"Paste or type a link": "\u0e27\u0e32\u0e07\u0e2b\u0e23\u0e37\u0e2d\u0e1b\u0e49\u0e2d\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL \u0e17\u0e35\u0e48\u0e04\u0e38\u0e13\u0e23\u0e30\u0e1a\u0e38\u0e14\u0e39\u0e40\u0e2b\u0e21\u0e37\u0e2d\u0e19\u0e27\u0e48\u0e32\u0e40\u0e1b\u0e47\u0e19\u0e2d\u0e35\u0e40\u0e21\u0e25\u0e41\u0e2d\u0e14\u0e40\u0e14\u0e23\u0e2a \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e43\u0e2a\u0e48 mailto: \u0e19\u0e33\u0e2b\u0e19\u0e49\u0e32\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL \u0e17\u0e35\u0e48\u0e04\u0e38\u0e13\u0e23\u0e30\u0e1a\u0e38\u0e14\u0e39\u0e40\u0e2b\u0e21\u0e37\u0e2d\u0e19\u0e27\u0e48\u0e32\u0e40\u0e1b\u0e47\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c\u0e20\u0e32\u0e22\u0e19\u0e2d\u0e01 \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e43\u0e2a\u0e48 http:\/\/ \u0e19\u0e33\u0e2b\u0e19\u0e49\u0e32\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48",
-"Link list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Insert video": "\u0e41\u0e17\u0e23\u0e01\u0e27\u0e34\u0e14\u0e35\u0e42\u0e2d",
-"Insert\/edit video": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e27\u0e34\u0e14\u0e35\u0e42\u0e2d",
-"Insert\/edit media": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e2a\u0e37\u0e48\u0e2d",
-"Alternative source": "\u0e41\u0e2b\u0e25\u0e48\u0e07\u0e17\u0e35\u0e48\u0e21\u0e32\u0e2a\u0e33\u0e23\u0e2d\u0e07",
-"Alternative source URL": "URL \u0e41\u0e2b\u0e25\u0e48\u0e07\u0e17\u0e35\u0e48\u0e21\u0e32\u0e2a\u0e33\u0e23\u0e2d\u0e07",
-"Media poster (Image URL)": "\u0e42\u0e1b\u0e2a\u0e40\u0e15\u0e2d\u0e23\u0e4c\u0e21\u0e35\u0e40\u0e14\u0e35\u0e22 (URL \u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e)",
-"Paste your embed code below:": "\u0e27\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14\u0e1d\u0e31\u0e07\u0e15\u0e31\u0e27\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07:",
-"Embed": "\u0e1d\u0e31\u0e07",
-"Media...": "\u0e21\u0e35\u0e40\u0e14\u0e35\u0e22...",
-"Nonbreaking space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e44\u0e21\u0e48\u0e41\u0e22\u0e01",
-"Page break": "\u0e15\u0e31\u0e27\u0e41\u0e1a\u0e48\u0e07\u0e2b\u0e19\u0e49\u0e32",
-"Paste as text": "\u0e27\u0e32\u0e07\u0e40\u0e1b\u0e47\u0e19\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Preview": "\u0e41\u0e2a\u0e14\u0e07\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07",
-"Print...": "\u0e1e\u0e34\u0e21\u0e1e\u0e4c...",
-"Save": "\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01",
-"Find": "\u0e04\u0e49\u0e19\u0e2b\u0e32",
-"Replace with": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48\u0e14\u0e49\u0e27\u0e22",
-"Replace": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48",
-"Replace all": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"Previous": "\u0e01\u0e48\u0e2d\u0e19\u0e2b\u0e19\u0e49\u0e32\u0e19\u0e35\u0e49",
-"Next": "\u0e16\u0e31\u0e14\u0e44\u0e1b",
-"Find and replace...": "\u0e04\u0e49\u0e19\u0e2b\u0e32\u0e41\u0e25\u0e30\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48...",
-"Could not find the specified string.": "\u0e44\u0e21\u0e48\u0e1e\u0e1a\u0e2a\u0e15\u0e23\u0e34\u0e07\u0e17\u0e35\u0e48\u0e23\u0e30\u0e1a\u0e38",
-"Match case": "\u0e15\u0e23\u0e07\u0e15\u0e32\u0e21\u0e15\u0e31\u0e27\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e43\u0e2b\u0e0d\u0e48-\u0e40\u0e25\u0e47\u0e01",
-"Find whole words only": "\u0e04\u0e49\u0e19\u0e2b\u0e32\u0e17\u0e31\u0e49\u0e07\u0e04\u0e33\u0e40\u0e17\u0e48\u0e32\u0e19\u0e31\u0e49\u0e19",
-"Spell check": "\u0e15\u0e23\u0e27\u0e08\u0e2a\u0e2d\u0e1a\u0e04\u0e33\u0e1c\u0e34\u0e14",
-"Ignore": "\u0e25\u0e30\u0e40\u0e27\u0e49\u0e19",
-"Ignore all": "\u0e25\u0e30\u0e40\u0e27\u0e49\u0e19\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"Finish": "\u0e40\u0e2a\u0e23\u0e47\u0e08\u0e2a\u0e34\u0e49\u0e19",
-"Add to Dictionary": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e43\u0e19\u0e1e\u0e08\u0e19\u0e32\u0e19\u0e38\u0e01\u0e23\u0e21",
-"Insert table": "\u0e41\u0e17\u0e23\u0e01\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Table properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Delete table": "\u0e25\u0e1a\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Cell": "\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Row": "\u0e41\u0e16\u0e27",
-"Column": "\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Cell properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Merge cells": "\u0e1c\u0e2a\u0e32\u0e19\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Split cell": "\u0e41\u0e22\u0e01\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Insert row before": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e1a\u0e19",
-"Insert row after": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07",
-"Delete row": "\u0e25\u0e1a\u0e41\u0e16\u0e27",
-"Row properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e41\u0e16\u0e27",
-"Cut row": "\u0e15\u0e31\u0e14\u0e41\u0e16\u0e27",
-"Copy row": "\u0e04\u0e31\u0e14\u0e25\u0e2d\u0e01\u0e41\u0e16\u0e27",
-"Paste row before": "\u0e27\u0e32\u0e07\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e1a\u0e19",
-"Paste row after": "\u0e27\u0e32\u0e07\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07",
-"Insert column before": "\u0e41\u0e17\u0e23\u0e01\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c\u0e02\u0e49\u0e32\u0e07\u0e2b\u0e19\u0e49\u0e32",
-"Insert column after": "\u0e41\u0e17\u0e23\u0e01\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c\u0e02\u0e49\u0e32\u0e07\u0e2b\u0e25\u0e31\u0e07",
-"Delete column": "\u0e25\u0e1a\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Cols": "\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Rows": "\u0e41\u0e16\u0e27",
-"Width": "\u0e04\u0e27\u0e32\u0e21\u0e01\u0e27\u0e49\u0e32\u0e07",
-"Height": "\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e39\u0e07",
-"Cell spacing": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e23\u0e30\u0e2b\u0e27\u0e48\u0e32\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Cell padding": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e20\u0e32\u0e22\u0e43\u0e19\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Show caption": "\u0e41\u0e2a\u0e14\u0e07\u0e04\u0e33\u0e1a\u0e23\u0e23\u0e22\u0e32\u0e22",
-"Left": "\u0e0b\u0e49\u0e32\u0e22",
-"Center": "\u0e01\u0e36\u0e48\u0e07\u0e01\u0e25\u0e32\u0e07",
-"Right": "\u0e02\u0e27\u0e32",
-"Cell type": "\u0e0a\u0e19\u0e34\u0e14\u0e02\u0e2d\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Scope": "\u0e02\u0e2d\u0e1a\u0e40\u0e02\u0e15",
-"Alignment": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e41\u0e19\u0e27",
-"H Align": "\u0e01\u0e32\u0e23\u0e40\u0e23\u0e35\u0e22\u0e07\u0e43\u0e19\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"V Align": "\u0e01\u0e32\u0e23\u0e40\u0e23\u0e35\u0e22\u0e07\u0e43\u0e19\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
-"Top": "\u0e1a\u0e19",
-"Middle": "\u0e01\u0e25\u0e32\u0e07",
-"Bottom": "\u0e25\u0e48\u0e32\u0e07",
-"Header cell": "\u0e40\u0e0b\u0e25\u0e25\u0e4c\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
-"Row group": "\u0e01\u0e25\u0e38\u0e48\u0e21\u0e41\u0e16\u0e27",
-"Column group": "\u0e01\u0e25\u0e38\u0e48\u0e21\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Row type": "\u0e0a\u0e19\u0e34\u0e14\u0e02\u0e2d\u0e07\u0e41\u0e16\u0e27",
-"Header": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
-"Body": "\u0e40\u0e19\u0e37\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Footer": "\u0e2a\u0e48\u0e27\u0e19\u0e17\u0e49\u0e32\u0e22",
-"Border color": "\u0e2a\u0e35\u0e02\u0e2d\u0e1a",
-"Insert template...": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a...",
-"Templates": "\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a",
-"Template": "\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a",
-"Text color": "\u0e2a\u0e35\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Background color": "\u0e2a\u0e35\u0e1e\u0e37\u0e49\u0e19\u0e2b\u0e25\u0e31\u0e07",
-"Custom...": "\u0e01\u0e33\u0e2b\u0e19\u0e14\u0e40\u0e2d\u0e07",
-"Custom color": "\u0e2a\u0e35\u0e17\u0e35\u0e48\u0e01\u0e33\u0e2b\u0e19\u0e14\u0e40\u0e2d\u0e07",
-"No color": "\u0e44\u0e21\u0e48\u0e21\u0e35\u0e2a\u0e35",
-"Remove color": "\u0e25\u0e1a\u0e2a\u0e35",
-"Table of Contents": "\u0e2a\u0e32\u0e23\u0e1a\u0e31\u0e0d",
-"Show blocks": "\u0e41\u0e2a\u0e14\u0e07\u0e1a\u0e25\u0e47\u0e2d\u0e01",
-"Show invisible characters": "\u0e41\u0e2a\u0e14\u0e07\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23\u0e17\u0e35\u0e48\u0e21\u0e2d\u0e07\u0e44\u0e21\u0e48\u0e40\u0e2b\u0e47\u0e19",
-"Word count": "\u0e19\u0e31\u0e1a\u0e08\u0e33\u0e19\u0e27\u0e19\u0e04\u0e33",
-"Count": "\u0e19\u0e31\u0e1a",
-"Document": "\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23",
-"Selection": "\u0e01\u0e32\u0e23\u0e40\u0e25\u0e37\u0e2d\u0e01",
-"Words": "\u0e04\u0e33",
-"Words: {0}": "\u0e04\u0e33: {0}",
-"{0} words": "{0} \u0e04\u0e33",
-"File": "\u0e44\u0e1f\u0e25\u0e4c",
-"Edit": "\u0e41\u0e01\u0e49\u0e44\u0e02",
-"Insert": "\u0e41\u0e17\u0e23\u0e01",
-"View": "\u0e21\u0e38\u0e21\u0e21\u0e2d\u0e07",
-"Format": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Table": "\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Tools": "\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d",
-"Powered by {0}": "\u0e02\u0e31\u0e1a\u0e40\u0e04\u0e25\u0e37\u0e48\u0e2d\u0e19\u0e42\u0e14\u0e22 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0e1e\u0e37\u0e49\u0e19\u0e17\u0e35\u0e48 Rich Text \u0e01\u0e14 ALT-F9 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e40\u0e21\u0e19\u0e39 \u0e01\u0e14 ALT-F10 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e41\u0e16\u0e1a\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d \u0e01\u0e14 ALT-0 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e0a\u0e48\u0e27\u0e22\u0e40\u0e2b\u0e25\u0e37\u0e2d",
-"Image title": "\u0e0a\u0e37\u0e48\u0e2d\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Border width": "\u0e04\u0e27\u0e32\u0e21\u0e01\u0e27\u0e49\u0e32\u0e07\u0e40\u0e2a\u0e49\u0e19\u0e02\u0e2d\u0e1a",
-"Border style": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a\u0e40\u0e2a\u0e49\u0e19\u0e02\u0e2d\u0e1a",
-"Error": "\u0e04\u0e27\u0e32\u0e21\u0e1c\u0e34\u0e14\u0e1e\u0e25\u0e32\u0e14",
-"Warn": "\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e40\u0e15\u0e37\u0e2d\u0e19",
-"Valid": "\u0e16\u0e39\u0e01\u0e15\u0e49\u0e2d\u0e07",
-"To open the popup, press Shift+Enter": "\u0e01\u0e14 Shift+Enter \u0e40\u0e1e\u0e37\u0e48\u0e2d\u0e40\u0e1b\u0e34\u0e14\u0e1b\u0e4a\u0e2d\u0e1a\u0e2d\u0e31\u0e1e",
-"Rich Text Area. Press ALT-0 for help.": "\u0e1e\u0e37\u0e49\u0e19\u0e17\u0e35\u0e48 Rich Text \u0e01\u0e14 ALT-0 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e0a\u0e48\u0e27\u0e22\u0e40\u0e2b\u0e25\u0e37\u0e2d",
-"System Font": "\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23\u0e02\u0e2d\u0e07\u0e23\u0e30\u0e1a\u0e1a",
-"Failed to upload image: {0}": "\u0e44\u0e21\u0e48\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e2d\u0e31\u0e1b\u0e42\u0e2b\u0e25\u0e14\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e: {0}",
-"Failed to load plugin: {0} from url {1}": "\u0e44\u0e21\u0e48\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e42\u0e2b\u0e25\u0e14\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19: {0} \u0e08\u0e32\u0e01 url {1}",
-"Failed to load plugin url: {0}": "\u0e44\u0e21\u0e48\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e42\u0e2b\u0e25\u0e14 url \u0e02\u0e2d\u0e07\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19: {0}",
-"Failed to initialize plugin: {0}": "\u0e44\u0e21\u0e48\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e40\u0e23\u0e34\u0e48\u0e21\u0e15\u0e49\u0e19\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19: {0}",
-"example": "\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07",
-"Search": "\u0e04\u0e49\u0e19\u0e2b\u0e32",
-"All": "\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"Currency": "\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19",
-"Text": "\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Quotations": "\u0e43\u0e1a\u0e40\u0e2a\u0e19\u0e2d\u0e23\u0e32\u0e04\u0e32",
-"Mathematical": "\u0e40\u0e01\u0e35\u0e48\u0e22\u0e27\u0e01\u0e31\u0e1a\u0e04\u0e13\u0e34\u0e15\u0e28\u0e32\u0e2a\u0e15\u0e23\u0e4c",
-"Extended Latin": "\u0e20\u0e32\u0e29\u0e32\u0e25\u0e32\u0e15\u0e34\u0e19\u0e2a\u0e48\u0e27\u0e19\u0e02\u0e22\u0e32\u0e22",
-"Symbols": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c",
-"Arrows": "\u0e25\u0e39\u0e01\u0e28\u0e23",
-"User Defined": "\u0e1c\u0e39\u0e49\u0e43\u0e0a\u0e49\u0e01\u0e33\u0e2b\u0e19\u0e14\u0e40\u0e2d\u0e07",
-"dollar sign": "\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e2b\u0e21\u0e32\u0e22\u0e14\u0e2d\u0e25\u0e25\u0e48\u0e32\u0e23\u0e4c",
-"currency sign": "\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e2b\u0e21\u0e32\u0e22\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19",
-"euro-currency sign": "\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e2b\u0e21\u0e32\u0e22\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e22\u0e39\u0e42\u0e23",
-"colon sign": "\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e2b\u0e21\u0e32\u0e22\u0e08\u0e38\u0e14\u0e04\u0e39\u0e48",
-"cruzeiro sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e04\u0e23\u0e39\u0e40\u0e0b\u0e42\u0e35\u0e23",
-"french franc sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e1f\u0e23\u0e31\u0e07\u0e01\u0e4c\u0e1d\u0e23\u0e31\u0e48\u0e07\u0e40\u0e28\u0e2a",
-"lira sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e25\u0e35\u0e23\u0e32",
-"mill sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e21\u0e34\u0e25\u0e25\u0e4c",
-"naira sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e44\u0e19\u0e23\u0e32",
-"peseta sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e40\u0e1b\u0e40\u0e0b\u0e15\u0e32",
-"rupee sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e23\u0e39\u0e1b\u0e35",
-"won sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e27\u0e2d\u0e19",
-"new sheqel sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e19\u0e34\u0e27\u0e40\u0e0a\u0e40\u0e01\u0e25",
-"dong sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e14\u0e2d\u0e07",
-"kip sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e01\u0e35\u0e1a",
-"tugrik sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e17\u0e39\u0e01\u0e23\u0e34\u0e01",
-"drachma sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e14\u0e23\u0e31\u0e04\u0e21\u0e32",
-"german penny symbol": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e40\u0e1e\u0e19\u0e19\u0e35\u0e40\u0e22\u0e2d\u0e23\u0e21\u0e31\u0e19",
-"peso sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e40\u0e1b\u0e42\u0e0b",
-"guarani sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e01\u0e27\u0e32\u0e23\u0e32\u0e19\u0e35",
-"austral sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e2d\u0e2d\u0e2a\u0e15\u0e23\u0e31\u0e25",
-"hryvnia sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e2e\u0e23\u0e34\u0e1f\u0e40\u0e19\u0e35\u0e22",
-"cedi sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e40\u0e0b\u0e14\u0e35",
-"livre tournois sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e1b\u0e2d\u0e19\u0e14\u0e4c\u0e15\u0e39\u0e23\u0e4c",
-"spesmilo sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e2a\u0e40\u0e1b\u0e2a\u0e21\u0e34\u0e42\u0e25",
-"tenge sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e40\u0e17\u0e07\u0e40\u0e08",
-"indian rupee sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e23\u0e39\u0e1b\u0e35\u0e2d\u0e34\u0e19\u0e40\u0e14\u0e35\u0e22",
-"turkish lira sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e25\u0e35\u0e23\u0e32\u0e15\u0e38\u0e23\u0e01\u0e35",
-"nordic mark sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e21\u0e32\u0e23\u0e4c\u0e04\u0e19\u0e2d\u0e23\u0e4c\u0e14\u0e34\u0e01",
-"manat sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e21\u0e32\u0e19\u0e31\u0e15",
-"ruble sign": "\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2a\u0e01\u0e38\u0e25\u0e40\u0e07\u0e34\u0e19\u0e23\u0e39\u0e40\u0e1a\u0e34\u0e25",
-"yen character": "\u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30\u0e40\u0e07\u0e34\u0e19\u0e40\u0e22\u0e19",
-"yuan character": "\u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30\u0e40\u0e07\u0e34\u0e19\u0e2b\u0e22\u0e27\u0e19",
-"yuan character, in hong kong and taiwan": "\u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30\u0e40\u0e07\u0e34\u0e19\u0e2b\u0e22\u0e27\u0e19 \u0e43\u0e19\u0e2e\u0e48\u0e2d\u0e07\u0e01\u0e07\u0e41\u0e25\u0e30\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19",
-"yen\/yuan character variant one": "\u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30\u0e40\u0e07\u0e34\u0e19\u0e40\u0e22\u0e19\/\u0e2b\u0e22\u0e27\u0e19 \u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a\u0e17\u0e35\u0e48 1",
-"Loading emoticons...": "\u0e01\u0e33\u0e25\u0e31\u0e07\u0e42\u0e2b\u0e25\u0e14\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e2b\u0e21\u0e32\u0e22\u0e41\u0e2a\u0e14\u0e07\u0e2d\u0e32\u0e23\u0e21\u0e13\u0e4c...",
-"Could not load emoticons": "\u0e44\u0e21\u0e48\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e42\u0e2b\u0e25\u0e14\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e2b\u0e21\u0e32\u0e22\u0e41\u0e2a\u0e14\u0e07\u0e2d\u0e32\u0e23\u0e21\u0e13\u0e4c\u0e44\u0e14\u0e49",
-"People": "\u0e1c\u0e39\u0e49\u0e04\u0e19",
-"Animals and Nature": "\u0e2a\u0e31\u0e15\u0e27\u0e4c\u0e41\u0e25\u0e30\u0e18\u0e23\u0e23\u0e21\u0e0a\u0e32\u0e15\u0e34",
-"Food and Drink": "\u0e2d\u0e32\u0e2b\u0e32\u0e23\u0e41\u0e25\u0e30\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e14\u0e37\u0e48\u0e21",
-"Activity": "\u0e01\u0e34\u0e08\u0e01\u0e23\u0e23\u0e21",
-"Travel and Places": "\u0e01\u0e32\u0e23\u0e17\u0e48\u0e2d\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e27\u0e41\u0e25\u0e30\u0e2a\u0e16\u0e32\u0e19\u0e17\u0e35\u0e48",
-"Objects": "\u0e27\u0e31\u0e15\u0e16\u0e38",
-"Flags": "\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e2b\u0e21\u0e32\u0e22",
-"Characters": "\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23",
-"Characters (no spaces)": "\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23 (\u0e44\u0e21\u0e48\u0e21\u0e35\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07)",
-"{0} characters": "{0} \u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30",
-"Error: Form submit field collision.": "\u0e02\u0e49\u0e2d\u0e1c\u0e34\u0e14\u0e1e\u0e25\u0e32\u0e14: \u0e0a\u0e48\u0e2d\u0e07\u0e2a\u0e48\u0e07\u0e41\u0e1a\u0e1a\u0e1f\u0e2d\u0e23\u0e4c\u0e21\u0e02\u0e31\u0e14\u0e41\u0e22\u0e49\u0e07\u0e01\u0e31\u0e19",
-"Error: No form element found.": "\u0e02\u0e49\u0e2d\u0e1c\u0e34\u0e14\u0e1e\u0e25\u0e32\u0e14: \u0e44\u0e21\u0e48\u0e1e\u0e1a\u0e2d\u0e07\u0e04\u0e4c\u0e1b\u0e23\u0e30\u0e01\u0e2d\u0e1a\u0e02\u0e2d\u0e07\u0e1f\u0e2d\u0e23\u0e4c\u0e21",
-"Update": "\u0e1b\u0e23\u0e31\u0e1a\u0e1b\u0e23\u0e38\u0e07\u0e43\u0e2b\u0e49\u0e17\u0e31\u0e19\u0e2a\u0e21\u0e31\u0e22",
-"Color swatch": "\u0e41\u0e16\u0e1a\u0e2a\u0e35",
-"Turquoise": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19\u0e2d\u0e21\u0e40\u0e02\u0e35\u0e22\u0e27",
-"Green": "\u0e40\u0e02\u0e35\u0e22\u0e27",
-"Blue": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19",
-"Purple": "\u0e21\u0e48\u0e27\u0e07",
-"Navy Blue": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19\u0e40\u0e02\u0e49\u0e21",
-"Dark Turquoise": "\u0e2a\u0e35\u0e1f\u0e49\u0e32\u0e04\u0e23\u0e32\u0e21\u0e40\u0e02\u0e49\u0e21",
-"Dark Green": "\u0e40\u0e02\u0e35\u0e22\u0e27\u0e40\u0e02\u0e49\u0e21",
-"Medium Blue": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19\u0e1b\u0e32\u0e19\u0e01\u0e25\u0e32\u0e07",
-"Medium Purple": "\u0e2a\u0e35\u0e21\u0e48\u0e27\u0e07\u0e01\u0e25\u0e32\u0e07\u0e46",
-"Midnight Blue": "\u0e2a\u0e35\u0e1f\u0e49\u0e32\u0e40\u0e02\u0e49\u0e21",
-"Yellow": "\u0e40\u0e2b\u0e25\u0e37\u0e2d\u0e07",
-"Orange": "\u0e2a\u0e49\u0e21",
-"Red": "\u0e41\u0e14\u0e07",
-"Light Gray": "\u0e2a\u0e35\u0e40\u0e17\u0e32\u0e2d\u0e48\u0e2d\u0e19",
-"Gray": "\u0e40\u0e17\u0e32",
-"Dark Yellow": "\u0e2a\u0e35\u0e40\u0e2b\u0e25\u0e37\u0e2d\u0e07\u0e40\u0e02\u0e49\u0e21",
-"Dark Orange": "\u0e2a\u0e49\u0e21\u0e40\u0e02\u0e49\u0e21",
-"Dark Red": "\u0e41\u0e14\u0e07\u0e40\u0e02\u0e49\u0e21",
-"Medium Gray": "\u0e2a\u0e35\u0e40\u0e17\u0e32\u0e01\u0e25\u0e32\u0e07\u0e46",
-"Dark Gray": "\u0e2a\u0e35\u0e40\u0e17\u0e32\u0e40\u0e02\u0e49\u0e21",
-"Light Green": "\u0e40\u0e02\u0e35\u0e22\u0e27\u0e2d\u0e48\u0e2d\u0e19",
-"Light Yellow": "\u0e40\u0e2b\u0e25\u0e37\u0e2d\u0e07\u0e2d\u0e48\u0e2d\u0e19",
-"Light Red": "\u0e41\u0e14\u0e07\u0e2d\u0e48\u0e2d\u0e19",
-"Light Purple": "\u0e21\u0e48\u0e27\u0e07\u0e2d\u0e48\u0e2d\u0e19",
-"Light Blue": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19\u0e2d\u0e48\u0e2d\u0e19",
-"Dark Purple": "\u0e21\u0e48\u0e27\u0e07\u0e40\u0e02\u0e49\u0e21",
-"Dark Blue": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19\u0e40\u0e02\u0e49\u0e21",
-"Black": "\u0e14\u0e33",
-"White": "\u0e02\u0e32\u0e27",
-"Switch to or from fullscreen mode": "\u0e2a\u0e25\u0e31\u0e1a\u0e44\u0e1b\u0e22\u0e31\u0e07\u0e2b\u0e23\u0e37\u0e2d\u0e08\u0e32\u0e01\u0e42\u0e2b\u0e21\u0e14\u0e40\u0e15\u0e47\u0e21\u0e2b\u0e19\u0e49\u0e32\u0e08\u0e2d",
-"Open help dialog": "\u0e40\u0e1b\u0e34\u0e14\u0e2b\u0e19\u0e49\u0e32\u0e01\u0e32\u0e23\u0e0a\u0e48\u0e27\u0e22\u0e40\u0e2b\u0e25\u0e37\u0e2d",
-"history": "\u0e1b\u0e23\u0e30\u0e27\u0e31\u0e15\u0e34",
-"styles": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"formatting": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"alignment": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e41\u0e19\u0e27",
-"indentation": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e22\u0e48\u0e2d\u0e2b\u0e19\u0e49\u0e32",
-"permanent pen": "\u0e1b\u0e32\u0e01\u0e01\u0e32\u0e40\u0e04\u0e21\u0e35\u0e0a\u0e19\u0e34\u0e14\u0e25\u0e1a\u0e44\u0e21\u0e48\u0e44\u0e14\u0e49",
-"comments": "\u0e02\u0e49\u0e2d\u0e04\u0e34\u0e14\u0e40\u0e2b\u0e47\u0e19",
-"Format Painter": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a\u0e40\u0e1e\u0e19\u0e40\u0e15\u0e2d\u0e23\u0e4c",
-"Insert\/edit iframe": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02 iframe",
-"Capitalization": "\u0e01\u0e32\u0e23\u0e43\u0e0a\u0e49\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23\u0e15\u0e31\u0e27\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e43\u0e2b\u0e0d\u0e48",
-"lowercase": "\u0e15\u0e31\u0e27\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e40\u0e25\u0e47\u0e01",
-"UPPERCASE": "\u0e15\u0e31\u0e27\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e43\u0e2b\u0e0d\u0e48",
-"Title Case": "\u0e15\u0e31\u0e27\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e02\u0e2d\u0e07\u0e2b\u0e31\u0e27\u0e02\u0e49\u0e2d",
-"Permanent Pen Properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e1b\u0e32\u0e01\u0e01\u0e32\u0e21\u0e32\u0e23\u0e4c\u0e04\u0e40\u0e01\u0e2d\u0e23\u0e4c",
-"Permanent pen properties...": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e1b\u0e32\u0e01\u0e01\u0e32\u0e21\u0e32\u0e23\u0e4c\u0e04\u0e40\u0e01\u0e2d\u0e23\u0e4c...",
-"Font": "\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23",
-"Size": "\u0e02\u0e19\u0e32\u0e14",
-"More...": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e40\u0e15\u0e34\u0e21...",
-"Spellcheck Language": "\u0e20\u0e32\u0e29\u0e32\u0e43\u0e19\u0e01\u0e32\u0e23\u0e15\u0e23\u0e27\u0e08\u0e01\u0e32\u0e23\u0e2a\u0e30\u0e01\u0e14",
-"Select...": "\u0e40\u0e25\u0e37\u0e2d\u0e01...",
-"Preferences": "\u0e04\u0e48\u0e32\u0e01\u0e33\u0e2b\u0e19\u0e14",
-"Yes": "\u0e43\u0e0a\u0e48",
-"No": "\u0e44\u0e21\u0e48\u0e43\u0e0a\u0e48",
-"Keyboard Navigation": "\u0e01\u0e32\u0e23\u0e19\u0e33\u0e17\u0e32\u0e07\u0e14\u0e49\u0e27\u0e22\u0e41\u0e1b\u0e49\u0e19\u0e1e\u0e34\u0e21\u0e1e\u0e4c",
-"Version": "\u0e23\u0e38\u0e48\u0e19",
-"Anchor": "\u0e08\u0e38\u0e14\u0e22\u0e36\u0e14",
-"Special character": "\u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30\u0e1e\u0e34\u0e40\u0e28\u0e29",
-"Code sample": "\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14",
-"Color": "\u0e2a\u0e35",
-"Emoticons": "\u0e2d\u0e34\u0e42\u0e21\u0e15\u0e34\u0e04\u0e2d\u0e19",
-"Document properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23",
-"Image": "\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Insert link": "\u0e41\u0e17\u0e23\u0e01\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Target": "\u0e40\u0e1b\u0e49\u0e32\u0e2b\u0e21\u0e32\u0e22",
-"Link": "\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Poster": "\u0e42\u0e1b\u0e2a\u0e40\u0e15\u0e2d\u0e23\u0e4c",
-"Media": "\u0e2a\u0e37\u0e48\u0e2d",
-"Print": "\u0e1e\u0e34\u0e21\u0e1e\u0e4c",
-"Prev": "\u0e01\u0e48\u0e2d\u0e19\u0e2b\u0e19\u0e49\u0e32",
-"Find and replace": "\u0e04\u0e49\u0e19\u0e2b\u0e32\u0e41\u0e25\u0e30\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48",
-"Whole words": "\u0e17\u0e31\u0e49\u0e07\u0e04\u0e33",
-"Spellcheck": "\u0e15\u0e23\u0e27\u0e08\u0e01\u0e32\u0e23\u0e2a\u0e30\u0e01\u0e14",
-"Caption": "\u0e1b\u0e49\u0e32\u0e22\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22",
-"Insert template": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/tr_TR.js b/cps/static/js/libs/tinymce/langs/tr_TR.js
deleted file mode 100644
index 4a4327df9..000000000
--- a/cps/static/js/libs/tinymce/langs/tr_TR.js
+++ /dev/null
@@ -1,389 +0,0 @@
-tinymce.addI18n('tr_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": "ya da",
-"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 ABC",
-"Lower Greek": "K\u00fc\u00e7\u00fck Yunan alfabesi",
-"Lower Roman": "K\u00fc\u00e7\u00fck Roman alfabesi",
-"Upper Alpha": "B\u00fcy\u00fck ABC",
-"Upper Roman": "B\u00fcy\u00fck Roman alfabesi",
-"Anchor...": "\u00c7apa...",
-"Name": "\u0130sim",
-"Id": "Id",
-"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 sadece harfleri, rakamlar\u0131, \u00e7izgileri, noktalar\u0131, virg\u00fclleri veya alt \u00e7izgileri i\u00e7ermelidir.",
-"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 kurtar",
-"Special characters...": "\u00d6zel karakterler...",
-"Source code": "Kaynak kodu",
-"Insert\/Edit code sample": "Kod \u00f6rne\u011fini Kaydet\/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\u00fc \u00e7ubu\u011funa odaklan.",
-"Focus to toolbar": "Ara\u00e7 \u00e7ubu\u011funa odaklan.",
-"Focus to element path": "Eleman yoluna odaklan",
-"Focus to contextual toolbar": "Ba\u011flamsal ara\u00e7 \u00e7ubu\u011funa odaklan",
-"Insert link (if link plugin activated)": "Link ekle (Link eklentisi aktif ise)",
-"Save (if save plugin activated)": "Kaydet (Kay\u0131t eklentisi aktif ise)",
-"Find (if searchreplace plugin activated)": "Bul (SearchReplace eklentisi aktif ise)",
-"Plugins installed ({0}):": "Y\u00fckl\u00fc eklenti say\u0131s\u0131 : ({0}):",
-"Premium plugins:": "Premium eklentileri",
-"Learn more...": "Daha fazla bilgi edinin.",
-"You are using {0}": "{0} kullan\u0131yorsun.",
-"Plugins": "Eklentiler",
-"Handy Shortcuts": "Kullan\u0131\u015fl\u0131 K\u0131sayollar",
-"Horizontal line": "Yatay \u00e7izgi",
-"Insert\/edit image": "Resim ekle\/d\u00fczenle",
-"Image description": "Resim a\u00e7\u0131klamas\u0131",
-"Source": "Kaynak",
-"Dimensions": "Boyutlar",
-"Constrain proportions": "En - Boy oran\u0131n\u0131 koru",
-"General": "Genel",
-"Advanced": "Geli\u015fmi\u015f",
-"Style": "Stil",
-"Vertical space": "Dikey bo\u015fluk",
-"Horizontal space": "Yatay bo\u015fluk",
-"Border": "\u00c7er\u00e7eve",
-"Insert image": "Resim ekle",
-"Image...": "Resim...",
-"Image list": "Resim listesi",
-"Rotate counterclockwise": "Saat y\u00f6n\u00fcn\u00fcn tersine d\u00f6nd\u00fcr",
-"Rotate clockwise": "Saat y\u00f6n\u00fcnde d\u00f6nd\u00fcr",
-"Flip vertically": "Dikey \u00e7evir",
-"Flip horizontally": "Yatay \u00e7evir",
-"Edit image": "G\u00f6r\u00fcnt\u00fcy\u00fc d\u00fczenle",
-"Image options": "G\u00f6r\u00fcnt\u00fc se\u00e7enekleri",
-"Zoom in": "Yak\u0131nla\u015ft\u0131r",
-"Zoom out": "Uzakla\u015ft\u0131r",
-"Crop": "Kes",
-"Resize": "Yeniden Boyutland\u0131r",
-"Orientation": "Y\u00f6n\u00fcn\u00fc Belirle",
-"Brightness": "Parlakl\u0131k",
-"Sharpen": "Keskinle\u015ftir",
-"Contrast": "Kontrast",
-"Color levels": "Renk seviyesi",
-"Gamma": "Gama",
-"Invert": "Tersine \u00e7evir",
-"Apply": "Uygula",
-"Back": "Geri",
-"Insert date\/time": "Tarih \/ Zaman ekle",
-"Date\/time": "Tarih\/zaman",
-"Insert\/Edit Link": "Ba\u011flant\u0131 Ekle\/D\u00fczenle",
-"Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle",
-"Text to display": "G\u00f6r\u00fcnen yaz\u0131",
-"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 yap\u0131\u015ft\u0131r\u0131n yada yaz\u0131n.",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Girdi\u011finiz URL bir eposta adresi gibi g\u00f6z\u00fck\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\u00f6z\u00fck\u00fcyor. Gerekli olan http:\/\/ \u00f6nekini eklemek ister misiniz?",
-"Link list": "Link 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:": "Medya g\u00f6mme kodunu buraya yap\u0131\u015ft\u0131r:",
-"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 harfe 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": "Tabloyu sil",
-"Cell": "H\u00fccre",
-"Row": "Sat\u0131r",
-"Column": "S\u00fctun",
-"Cell properties": "H\u00fccre \u00f6zellikleri",
-"Merge cells": "H\u00fccreleri birle\u015ftir",
-"Split cell": "H\u00fccreleri ay\u0131r",
-"Insert row before": "\u00d6ncesine yeni sat\u0131r ekle",
-"Insert row after": "Sonras\u0131na yeni sat\u0131r ekle",
-"Delete row": "Sat\u0131r\u0131 sil",
-"Row properties": "Sat\u0131r \u00f6zellikleri",
-"Cut row": "Sat\u0131r\u0131 kes",
-"Copy row": "Sat\u0131r\u0131 kopyala",
-"Paste row before": "\u00d6ncesine sat\u0131r yap\u0131\u015ft\u0131r",
-"Paste row after": "Sonras\u0131na sat\u0131r  yap\u0131\u015ft\u0131r",
-"Insert column before": "\u00d6ncesine yeni s\u00fctun ekle",
-"Insert column after": "Sonras\u0131na yeni s\u00fctun ekle",
-"Delete column": "S\u00fctunu 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 i\u00e7 bo\u015flu\u011fu",
-"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": "Tema",
-"Text color": "Yaz\u0131 rengi",
-"Background color": "Arkaplan rengi",
-"Custom...": "\u00d6zel",
-"Custom color": "\u00d6zel Renk",
-"No color": "Renk Yok",
-"Remove color": "Rengi kald\u0131r",
-"Table of Contents": "\u0130\u00e7indekiler",
-"Show blocks": "Bloklar\u0131 g\u00f6r\u00fcnt\u00fcle",
-"Show invisible characters": "G\u00f6r\u00fcnmez karakterleri g\u00f6ster",
-"Word count": "Kelime say\u0131s\u0131",
-"Words: {0}": "Kelime: {0}",
-"{0} words": "{0} kelime",
-"File": "Dosya",
-"Edit": "D\u00fczenle",
-"Insert": "Ekle",
-"View": "G\u00f6r\u00fcnt\u00fcle",
-"Format": "Bi\u00e7im",
-"Table": "Tablo",
-"Tools": "Ara\u00e7lar",
-"Powered by {0}": "{0} taraf\u0131ndan yap\u0131lm\u0131\u015ft\u0131r ",
-"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 k\u0131sayolunu kullan\u0131n. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 k\u0131sayolunu kullan\u0131n. Yard\u0131m i\u00e7in ALT-0 k\u0131sayolunu kullan\u0131n.",
-"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)",
-"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",
-"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",
-"Anchor": "\u00c7apa",
-"Special character": "\u00d6zel karakter",
-"Code sample": "Kod \u00f6rne\u011fi",
-"Color": "Renk",
-"Emoticons": "G\u00fcl\u00fcc\u00fckler",
-"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 s\u00f6zc\u00fckler",
-"Spellcheck": "Yaz\u0131m denetimi",
-"Caption": "Ba\u015fl\u0131k",
-"Insert template": "\u015eablon ekle"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/ug.js b/cps/static/js/libs/tinymce/langs/ug.js
new file mode 100644
index 000000000..972f3ed3d
--- /dev/null
+++ b/cps/static/js/libs/tinymce/langs/ug.js
@@ -0,0 +1,462 @@
+tinymce.addI18n('ug',{
+"Redo": "\u0642\u0627\u064a\u062a\u0627 \u0642\u0649\u0644\u0649\u0634",
+"Undo": "\u0626\u0627\u0631\u0642\u0649\u063a\u0627 \u064a\u06d0\u0646\u0649\u0634",
+"Cut": "\u0643\u06d0\u0633\u0649\u0634",
+"Copy": "\u0643\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Paste": "\u0686\u0627\u067e\u0644\u0627\u0634",
+"Select all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u062a\u0627\u0644\u0644\u0627\u0634",
+"New document": "\u064a\u06d0\u06ad\u0649 \u067e\u06c8\u062a\u06c8\u0643",
+"Ok": "\u062c\u06d5\u0632\u0649\u0645\u0644\u06d5\u0634",
+"Cancel": "\u0642\u0627\u0644\u062f\u06c7\u0631\u06c7\u0634",
+"Visual aids": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
+"Bold": "\u062a\u0648\u0645",
+"Italic": "\u064a\u0627\u0646\u062a\u06c7",
+"Underline": "\u0626\u0627\u0633\u062a\u0649 \u0633\u0649\u0632\u0649\u0642",
+"Strikethrough": "\u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634 \u0633\u0649\u0632\u0649\u0642\u0649",
+"Superscript": "\u0626\u06c8\u0633\u062a\u06c8\u0646\u0643\u0649 \u0628\u06d5\u0644\u06af\u06d5",
+"Subscript": "\u0626\u0627\u0633\u062a\u0649\u0646\u0642\u0649 \u0628\u06d5\u0644\u06af\u06d5",
+"Clear formatting": "\u0641\u0648\u0631\u0645\u0627\u062a\u0646\u0649 \u062a\u0627\u0632\u0644\u0627\u0634",
+"Align left": "\u0633\u0648\u0644\u063a\u0627 \u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
+"Align center": "\u0645\u06d5\u0631\u0643\u06d5\u0632\u06af\u06d5 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
+"Align right": "\u0626\u0648\u06ad\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
+"Justify": "\u0626\u0649\u0643\u0643\u0649 \u064a\u0627\u0646\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
+"Bullet list": "\u0628\u06d5\u0644\u06af\u06d5 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
+"Numbered list": "\u0633\u0627\u0646\u0644\u0649\u0642 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
+"Decrease indent": "\u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0633\u06c8\u0631\u06c8\u0634",
+"Increase indent": "\u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0633\u06c8\u0631\u06c8\u0634",
+"Close": "\u062a\u0627\u0642\u0627\u0634",
+"Formats": "\u0641\u0648\u0631\u0645\u0627\u062a",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0633\u0649\u0632\u0646\u0649\u06ad \u062a\u0648\u0631 \u0643\u06c6\u0631\u06af\u06c8\u0686\u0649\u06ad\u0649\u0632 \u0642\u0649\u064a\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u0627\u062e\u062a\u0649\u0633\u0649 \u0632\u0649\u064a\u0627\u0631\u06d5\u062a \u0642\u0649\u0644\u0649\u0634\u0646\u0649 \u0642\u0648\u0644\u0644\u0649\u0645\u0627\u064a\u062f\u06c7.  Ctrl+X\/C\/V \u062a\u06d0\u0632\u0644\u06d5\u062a\u0645\u06d5 \u0643\u06c7\u0646\u06c7\u067e\u0643\u0649\u0633\u0649 \u0626\u0627\u0631\u0642\u0649\u0644\u0649\u0642 \u0643\u06d0\u0633\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u0645\u06d5\u0634\u063a\u06c7\u0644\u0627\u062a\u0649 \u0642\u0649\u0644\u0649\u06ad.",
+"Headers": "\u0628\u06d0\u0634\u0649",
+"Header 1": "\u062a\u06d0\u0645\u0627 1",
+"Header 2": "\u062a\u06d0\u0645\u0627 2",
+"Header 3": "\u062a\u06d0\u0645\u0627 3",
+"Header 4": "\u062a\u06d0\u0645\u0627 4",
+"Header 5": "\u062a\u06d0\u0645\u0627 5",
+"Header 6": "\u062a\u06d0\u0645\u0627 6",
+"Headings": "\u0645\u0627\u06cb\u0632\u06c7",
+"Heading 1": "1 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
+"Heading 2": "2 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
+"Heading 3": "3 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
+"Heading 4": "4 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
+"Heading 5": "5 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
+"Heading 6": "6 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
+"Preformatted": "\u0626\u0627\u0644\u062f\u0649\u0646 \u0641\u0648\u0631\u0645\u0627\u062a\u0644\u0627\u0646\u063a\u0627\u0646",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "\u0643\u0648\u062f",
+"Paragraph": "\u067e\u0627\u0631\u0627\u06af\u0649\u0631\u0627 \u0641",
+"Blockquote": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
+"Inline": "\u0626\u0649\u0686\u0643\u0649",
+"Blocks": "\u0631\u0627\u064a\u0648\u0646",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u06be\u0627\u0632\u0649\u0631 \u0686\u0627\u067e\u0644\u0649\u0633\u0649\u06ad\u0649\u0632 \u0633\u0627\u067e \u062a\u06d0\u0643\u0649\u0634 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0649 \u0686\u0627\u067e\u0644\u0649\u0646\u0649\u062f\u06c7. \u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u06d5\u06ad\u0634\u0649\u0643\u0649\u0646\u0649 \u062a\u0627\u0642\u0649\u06cb\u06d5\u062a\u0643\u06d5\u0646\u06af\u06d5 \u0642\u06d5\u062f\u06d5\u0631.",
+"Fonts": "\u062e\u06d5\u062a \u0646\u06c7\u0633\u062e\u0649\u0644\u0649\u0631\u0649",
+"Font Sizes": "\u062e\u06d5\u062a \u0686\u0648\u06ad\u0644\u06c7\u0642\u0649",
+"Class": "\u062a\u06c8\u0631",
+"Browse for an image": "\u0631\u06d5\u0633\u0649\u0645\u0646\u0649  \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
+"OR": "\u064a\u0627\u0643\u0649",
+"Drop an image here": "\u0628\u06c7 \u064a\u06d5\u0631\u062f\u0649\u0643\u0649 \u0631\u06d5\u0633\u0649\u0645\u0646\u0649 \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Upload": "\u0686\u0649\u0642\u0649\u0631\u0649\u0634",
+"Block": "\u067e\u0627\u0631\u0686\u06d5",
+"Align": "\u062a\u0648\u063a\u0631\u0649\u0644\u0649\u0646\u0649\u0634\u0649",
+"Default": "\u0633\u06c8\u0643\u06c8\u062a",
+"Circle": "\u0686\u06d5\u0645\u0628\u06d5\u0631",
+"Disc": "\u062f\u06d0\u0633\u0643\u0627",
+"Square": "\u0643\u06cb\u0627\u062f\u0631\u0627\u062a",
+"Lower Alpha": "\u0626\u0649\u0646\u06af\u0649\u0644\u0649\u0632\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Lower Greek": "\u06af\u0631\u06d0\u062a\u0633\u0649\u064a\u0649\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Lower Roman": "\u0631\u0649\u0645\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Upper Alpha": "\u0626\u0649\u0646\u06af\u0649\u0644\u0649\u0632\u0686\u06d5 \u0686\u0648\u06ad \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Upper Roman": "\u0631\u0649\u0645\u0686\u06d5 \u0686\u0648\u06ad \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Anchor...": "\u0644\u06d5\u06ad\u06af\u06d5\u0631...",
+"Name": "\u0646\u0627\u0645\u0649",
+"Id": "Id",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID \u0686\u0648\u0642\u06c7\u0645 \u06be\u06d5\u0631\u0649\u067e \u0628\u0649\u0644\u06d5\u0646 \u0628\u0627\u0634\u0644\u0649\u0646\u0649\u0634\u0649 \u0643\u06d0\u0631\u06d5\u0643 \u060c \u0626\u0627\u0631\u0642\u0649\u0633\u0649 \u067e\u06d5\u0642\u06d5\u062a \u06be\u06d5\u0631\u0649\u067e \u060c \u0633\u0627\u0646 \u060c \u0626\u0627\u064a\u0631\u0649\u0634 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649 \u060c \u0686\u0649\u0643\u0649\u062a \u06cb\u06d5 \u0626\u0627\u0633\u062a\u0649 \u0633\u0649\u0632\u0649\u0642\u0649 \u062f\u0649\u0646 \u0626\u0649\u0628\u0627\u0631\u06d5\u062a .",
+"You have unsaved changes are you sure you want to navigate away?": "\u0633\u0649\u0632 \u062a\u06d0\u062e\u0649 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0646\u0649 \u0633\u0627\u0642\u0644\u0649\u0645\u0649\u062f\u0649\u06ad\u0649\u0632\u060c \u0626\u0627\u064a\u0631\u0649\u0644\u0627\u0645\u0633\u0649\u0632\u061f",
+"Restore last draft": "\u0626\u0627\u062e\u0649\u0631\u0642\u0649 \u0643\u06c7\u067e\u0649\u064a\u0649\u06af\u06d5 \u0642\u0627\u064a\u062a\u0649\u0634",
+"Special character...": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5 \u06be\u06d5\u0631\u067e-\u0628\u06d5\u0644\u06af\u0649\u0644\u06d5\u0631...",
+"Source code": "\u0626\u06d5\u0633\u0644\u0649 \u0643\u0648\u062f\u0649",
+"Insert\/Edit code sample": "\u0643\u0648\u062f \u0645\u0649\u0633\u0627\u0644\u0649\\\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Language": "\u062a\u0649\u0644",
+"Code sample...": "\u0626\u06c8\u0644\u06af\u06d5 \u0643\u0648\u062f...",
+"Color Picker": "\u0631\u06d5\u06ad \u062a\u0627\u0644\u0644\u0649\u063a\u06c7\u0686",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "\u0633\u0648\u0644\u062f\u0649\u0646 \u0626\u0648\u06ad\u063a\u0627 ",
+"Right to left": "\u0626\u0648\u06ad\u062f\u0649\u0646 \u0633\u0648\u0644\u063a\u0627",
+"Emoticons": "\u0686\u0649\u0631\u0627\u064a \u0626\u0649\u067e\u0627\u062f\u06d5",
+"Emoticons...": "\u0686\u0649\u0631\u0627\u064a \u0626\u0649\u067e\u0627\u062f\u0649\u0644\u0649\u0631\u0649...",
+"Metadata and Document Properties": "\u0645\u06d0\u062a\u0627\u0645\u06d5\u0644\u06c7\u0645\u0627\u062a \u06cb\u06d5 \u06be\u06c6\u062c\u062c\u06d5\u062a \u062e\u0627\u0633\u0644\u0649\u0642\u0644\u0649\u0631\u0649",
+"Title": "\u062a\u06d0\u0645\u0627",
+"Keywords": "\u06be\u0627\u0644\u0642\u0649\u0644\u0649\u0642 \u0633\u06c6\u0632",
+"Description": "\u062a\u06d5\u0633\u0649\u06cb\u0649\u0631",
+"Robots": "\u0645\u0627\u0634\u0649\u0646\u0627 \u0626\u0627\u062f\u06d5\u0645",
+"Author": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627",
+"Encoding": "\u0643\u0648\u062f\u0644\u0627\u0634",
+"Fullscreen": "\u067e\u06c8\u062a\u06c8\u0646 \u0626\u06d0\u0643\u0631\u0627\u0646",
+"Action": "\u06be\u06d5\u0631\u0649\u0643\u06d5\u062a",
+"Shortcut": "\u0642\u0649\u0633\u0642\u0627 \u064a\u0648\u0644",
+"Help": "\u064a\u0627\u0631\u062f\u06d5\u0645",
+"Address": "\u0626\u0627\u062f\u0649\u0631\u0649\u0633",
+"Focus to menubar": "\u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643 \u0633\u0649\u062a\u0648\u0646\u0649\u063a\u0627 \u062f\u0649\u0642\u06d5\u062a",
+"Focus to toolbar": "\u0642\u06c7\u0631\u0627\u0644 \u0633\u0649\u062a\u0648\u0646\u0649\u063a\u0627 \u062f\u0649\u0642\u06d5\u062a",
+"Focus to element path": "\u0626\u06d0\u0644\u0649\u0645\u0649\u0646\u062a\u0644\u0627\u0631 \u064a\u0648\u0644\u0649\u063a\u0627 \u062f\u0649\u0642\u06d5\u062a",
+"Focus to contextual toolbar": "\u0643\u0648\u0646\u062a\u06d0\u0643\u0649\u0633\u062a \u0642\u0648\u0631\u0627\u0644 \u0626\u0649\u0633\u062a\u0648\u0646\u0649\u063a\u0627 \u062f\u06d0\u0642\u06d5\u062a",
+"Insert link (if link plugin activated)": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u06ad (\u0626\u06c7\u0644\u0627\u0646\u0645\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0649\u0633\u0649\u0646\u0649 \u0642\u0648\u0632\u063a\u0627\u062a\u0642\u0627\u0646 \u0626\u06d5\u06be\u06cb\u0627\u0644\u062f\u0627)",
+"Save (if save plugin activated)": "\u0633\u0627\u0642\u0644\u0627\u0634 (\u0633\u0627\u0642\u0644\u0627\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0649\u0633\u0649\u0646\u0649 \u0642\u0648\u0632\u063a\u0627\u062a\u0642\u0627\u0646 \u0626\u06d5\u06be\u06cb\u0627\u0644\u062f\u0627)",
+"Find (if searchreplace plugin activated)": "\u0626\u0649\u0632\u062f\u06d5\u0634 (\u0626\u0649\u0632\u062f\u06d5\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0649\u0633\u0649 \u0642\u0648\u0632\u063a\u0649\u062a\u0649\u0644\u063a\u0627\u0646 \u0626\u06d5\u06be\u06cb\u0627\u0644\u062f\u0627)",
+"Plugins installed ({0}):": "\u0642\u0627\u0686\u0649\u0644\u0627\u0646\u063a\u0627\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0644\u0645\u0627 ({0}):",
+"Premium plugins:": "\u064a\u06c7\u0642\u0649\u0631\u0649 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0644\u0645\u0627 :",
+"Learn more...": "\u062a\u06d0\u062e\u0649\u0645\u06c7 \u0686\u06c8\u0634\u0649\u0646\u0649\u0634 ...",
+"You are using {0}": "\u0626\u0649\u0634\u0644\u0649\u062a\u0649\u06cb\u0627\u062a\u0642\u0649\u0646\u0649\u06ad\u0649\u0632 {0}",
+"Plugins": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0644\u0645\u0627",
+"Handy Shortcuts": "\u0642\u0648\u0644\u0627\u064a\u0644\u0649\u0642 \u0642\u0649\u0633\u0642\u0627 \u064a\u0648\u0644",
+"Horizontal line": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u0642\u06c7\u0631",
+"Insert\/edit image": "\u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634 \u064a\u0627\u0643\u0649 \u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Alternative description": "\u062a\u0627\u0644\u0644\u0627\u0646\u0645\u0627 \u0686\u06c8\u0634\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634\u0649",
+"Accessibility": "\u064a\u0627\u0631\u062f\u06d5\u0645\u0686\u06d5 \u0626\u0649\u0642\u062a\u0649\u062f\u0627\u0631",
+"Image is decorative": "\u0628\u06d0\u0632\u06d5\u0643 \u0631\u06d5\u0633\u0649\u0645",
+"Source": "\u0645\u06d5\u0646\u0628\u06d5",
+"Dimensions": "\u0686\u0648\u06ad-\u0643\u0649\u0686\u0649\u0643",
+"Constrain proportions": "\u0626\u06d0\u06af\u0649\u0632\u0644\u0649\u0643-\u0643\u06d5\u06ad\u0644\u0649\u0643 \u0646\u0649\u0633\u067e\u0649\u062a\u0649\u0646\u0649 \u0633\u0627\u0642\u0644\u0627\u0634",
+"General": "\u0626\u0627\u062f\u06d5\u062a\u062a\u0649\u0643\u0649",
+"Advanced": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5",
+"Style": "\u0626\u06c7\u0633\u0644\u06c7\u067e",
+"Vertical space": "\u06cb\u06d0\u0631\u062a\u0649\u0643\u0627\u0644 \u0628\u0648\u0634\u0644\u06c7\u0642",
+"Horizontal space": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u0628\u0648\u0634\u0644\u06c7\u0642",
+"Border": "\u064a\u0627\u0642\u0627",
+"Insert image": "\u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Image...": "\u0631\u06d5\u0633\u0649\u0645...",
+"Image list": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643\u0649",
+"Rotate counterclockwise": "\u200f\u200f\u0633\u0627\u0626\u06d5\u062a\u0643\u06d5 \u0642\u0627\u0631\u0634\u0649 \u0686\u06c6\u0631\u06c8\u0634",
+"Rotate clockwise": "\u200f\u200f\u0633\u0627\u0626\u06d5\u062a \u064a\u06c6\u0646\u0649\u0644\u0649\u0634\u0649\u062f\u06d5 \u0686\u06c6\u0631\u06c8\u0634",
+"Flip vertically": "\u06cb\u06d0\u0631\u062a\u0649\u0643\u0627\u0644 \u0626\u06c6\u0631\u06c8\u0634",
+"Flip horizontally": "\u06af\u0648\u0631\u0649\u0632\u0648\u0646\u062a\u0627\u0644 \u0626\u06c6\u0631\u06c8\u0634",
+"Edit image": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Image options": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u0627\u0644\u0644\u0627\u0646\u0645\u0649\u0644\u0649\u0631\u0649",
+"Zoom in": "\u064a\u06d0\u0642\u0649\u0646\u0644\u0627\u062a\u0645\u0627\u0642",
+"Zoom out": "\u064a\u0649\u0631\u0627\u0642\u0644\u0627\u062a\u0645\u0627\u0642",
+"Crop": "\u0642\u0649\u064a\u0649\u0634",
+"Resize": "\u0686\u0648\u06ad\u0644\u06c7\u0642\u0649\u0646\u0649 \u0626\u06c6\u0632\u06af\u06d5\u0631\u062a\u0649\u0634",
+"Orientation": "\u064a\u06c6\u0646\u0649\u0644\u0649\u0634",
+"Brightness": "\u064a\u0648\u0631\u06c7\u0642\u0644\u06c7\u0642\u0649",
+"Sharpen": "\u0626\u06c6\u062a\u0643\u06c8\u0631\u0644\u06d5\u0634\u062a\u06c8\u0631\u06c8\u0634",
+"Contrast": "\u0633\u06d0\u0644\u0649\u0634\u062a\u06c7\u0631\u0645\u0627",
+"Color levels": "\u0631\u06d5\u06ad \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0631\u0649",
+"Gamma": "\u06af\u0627\u0645\u0645\u0627",
+"Invert": "\u062a\u06d5\u062a\u06c8\u0631",
+"Apply": "\u0642\u0648\u0644\u0644\u0649\u0646\u0649\u0634",
+"Back": "\u0642\u0627\u064a\u062a\u0649\u0634",
+"Insert date\/time": "\u0686\u0649\u0633\u0644\u0627\/\u06cb\u0627\u0642\u0649\u062a \u0643\u0649\u0631\u06af\u06c8\u0632\u06c8\u0634",
+"Date\/time": "\u0686\u06d0\u0633\u0644\u0627\\\u06cb\u0627\u0642\u0649\u062a",
+"Insert\/edit link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u06c7\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Text to display": "\u0643\u06c6\u0631\u06c8\u0646\u0649\u062f\u0649\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646",
+"Url": "\u0626\u0627\u062f\u0631\u0649\u0633",
+"Open link in...": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627 \u0626\u06d0\u0686\u0649\u0634 \u0626\u0648\u0631\u0646\u0649...",
+"Current window": "\u0646\u06c6\u06cb\u06d5\u062a\u062a\u0649\u0643\u0649 \u0643\u06c6\u0632\u0646\u06d5\u0643",
+"None": "\u064a\u0648\u0642",
+"New window": "\u064a\u06d0\u06ad\u0649 \u0643\u06c6\u0632\u0646\u06d5\u0643",
+"Open link": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627 \u0626\u06d0\u0686\u0649\u0634",
+"Remove link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Anchors": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634",
+"Link...": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627...",
+"Paste or type a link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0686\u0627\u067e\u0644\u0627\u06ad \u064a\u0627\u0643\u0649 \u0643\u0649\u0631\u06af\u06c8\u0632\u06c8\u06ad",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0633\u0649\u0632 \u0643\u0649\u0631\u06af\u06c8\u0632\u06af\u06d5\u0646 URL \u0628\u0649\u0631 \u0626\u06d0\u0644\u062e\u06d5\u062a \u0626\u0627\u062f\u0631\u06d0\u0633\u0649\u062f\u06d5\u0643 \u0642\u0649\u0644\u0649\u067e \u062a\u06c7\u0631\u0649\u062f\u06c7\u060c\u062a\u06d5\u0644\u06d5\u067e \u0642\u0649\u0644\u0649\u0646\u063a\u0627\u0646 mailto \u0646\u0649 \u0642\u06c7\u0634\u0627\u0645\u0633\u0649\u0632\u061f",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0633\u0649\u0632 \u0643\u0649\u0631\u06af\u06c8\u0632\u06af\u06d5\u0646 \u062a\u0648\u0631 \u0626\u0627\u062f\u0631\u06d0\u0633\u0649 \u0633\u0649\u0631\u062a\u0642\u0649 \u0626\u06c7\u0644\u0627\u0646\u0645\u0649\u062f\u06d5\u0643 \u0642\u0649\u0644\u0649\u067e \u062a\u06c7\u0631\u0649\u062f\u06c7 \u060c\u062a\u06d5\u0644\u06d5\u067e \u0642\u0649\u0644\u0649\u0646\u063a\u0627\u0646 http:\/\/ \u0646\u0649 \u0642\u0648\u0634\u0627\u0645\u0633\u0649\u0632\u061f",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "\u0633\u0649\u0632 \u0643\u0649\u0631\u06af\u06c8\u0632\u06af\u06d5\u0646 \u0626\u0627\u062f\u0631\u06d0\u0633 \u0633\u0649\u0631\u062a\u0642\u0649 \u0626\u06c7\u0644\u0627\u0646\u0645\u0649\u062f\u06d5\u0643 \u062a\u06c7\u0631\u0649\u062f\u06c7. \u062a\u06d5\u0644\u06d5\u067e \u0642\u0649\u0644\u0649\u0646\u063a\u0627\u0646 https:\/\/ \u0626\u0627\u0644\u062f\u0649 \u0642\u0648\u0634\u06c7\u0645\u0686\u0649\u0633\u0649\u0646\u0649 \u0642\u0648\u0634\u0627\u0645\u0633\u0649\u0632\u061f",
+"Link list": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u062a\u06c8\u0631\u0649",
+"Insert video": "\u0633\u0649\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Insert\/edit video": "\u0633\u0649\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Insert\/edit media": "\u0645\u06d0\u062f\u0649\u064a\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Alternative source": "\u062a\u06d5\u0633\u06cb\u0649\u0631\u0649",
+"Alternative source URL": "\u062a\u0627\u0644\u0644\u0627\u0646\u0645\u0627 \u0645\u06d5\u0646\u0628\u06d5 \u0626\u0627\u062f\u0631\u06d0\u0633\u0649",
+"Media poster (Image URL)": "\u0645\u06d0\u062f\u0649\u064a\u0627 \u0645\u06c7\u0642\u0627\u06cb\u0649\u0633\u0649 (\u0631\u06d5\u0633\u0649\u0645 \u0626\u0627\u062f\u0631\u06d0\u0633\u0649)",
+"Paste your embed code below:": "\u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0627\u0642\u0686\u0649 \u0628\u0648\u0644\u063a\u0627\u0646 \u0643\u0648\u062f\u0646\u0649 \u0686\u0627\u067e\u0644\u0627\u06ad",
+"Embed": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Media...": "\u0645\u06d0\u062f\u0649\u064a\u0627...",
+"Nonbreaking space": "\u0628\u0648\u0634\u0644\u06c7\u0642",
+"Page break": "\u0628\u06d5\u062a \u0626\u0627\u062e\u0649\u0631\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Paste as text": "\u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634",
+"Preview": "\u0643\u06c6\u0631\u06c8\u0634",
+"Print...": "\u0628\u06d0\u0633\u0649\u0634...",
+"Save": "\u0633\u0627\u0642\u0644\u0627\u0634",
+"Find": "\u0626\u0649\u0632\u062f\u06d5\u0634",
+"Replace with": "\u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Replace": "\u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Replace all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Previous": "\u0626\u0627\u0644\u062f\u0649\u0646\u0642\u0649",
+"Next": "\u0643\u06d0\u064a\u0649\u0646\u0643\u0649\u0633\u0649",
+"Find and Replace": "\u0626\u0649\u0632\u062f\u06d5\u0634 \u06cb\u06d5 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Find and replace...": "\u0626\u0649\u0632\u062f\u06d5\u0634 \u06cb\u06d5 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634...",
+"Could not find the specified string.": "\u0626\u0649\u0632\u062f\u0649\u0645\u06d5\u0643\u0686\u0649 \u0628\u0648\u0644\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0646\u0649 \u062a\u0627\u067e\u0627\u0644\u0645\u0649\u062f\u0649.",
+"Match case": "\u0686\u0648\u06ad \u0643\u0649\u0686\u0649\u0643 \u06be\u06d5\u0631\u0649\u067e\u0646\u0649 \u067e\u06d5\u0631\u0649\u0642\u0644\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634",
+"Find whole words only": "\u067e\u06c8\u062a\u06c8\u0646 \u0633\u06c6\u0632\u0646\u0649\u0644\u0627 \u0626\u0649\u0632\u062f\u06d5\u0634",
+"Find in selection": "\u062a\u0627\u0644\u0644\u0627\u0646\u063a\u0627\u0646\u062f\u0649\u0646 \u0626\u0649\u0632\u062f\u06d5\u0634",
+"Spellcheck": "\u0626\u0649\u0645\u0644\u0627 \u062a\u06d5\u0643\u0634\u06c8\u0631\u06c8\u0634",
+"Spellcheck Language": "\u0626\u0649\u0645\u0644\u0627 \u062a\u06d5\u0643\u0634\u06c8\u0631\u06c8\u0634 \u062a\u0649\u0644\u0649",
+"No misspellings found.": "\u0626\u0649\u0645\u0644\u0627 \u062e\u0627\u062a\u0627\u0644\u0649\u0642\u0649 \u062a\u06d0\u067e\u0649\u0644\u0645\u0649\u062f\u0649.",
+"Ignore": "\u0626\u06c6\u062a\u0643\u06c8\u0632\u06c8\u0634",
+"Ignore all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u0626\u06c6\u062a\u0643\u06c8\u0632\u06c8\u0634",
+"Finish": "\u0626\u0627\u062e\u0649\u0631\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Add to Dictionary": "\u0644\u06c7\u063a\u06d5\u062a \u0642\u0648\u0634\u06c7\u0634",
+"Insert table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Table properties": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
+"Delete table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u0626\u06c6\u0686\u06c8\u0631\u0634",
+"Cell": "\u0643\u0627\u062a\u06d5\u0643",
+"Row": "\u0642\u06c7\u0631",
+"Column": "\u0631\u06d5\u062a",
+"Cell properties": "\u0643\u0627\u062a\u06d5\u0643 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
+"Merge cells": "\u0643\u0627\u062a\u06d5\u0643 \u0628\u0649\u0631\u0644\u06d5\u0634\u062a\u06c8\u0631\u06c8\u0634",
+"Split cell": "\u0643\u0627\u062a\u06d5\u0643 \u067e\u0627\u0631\u0686\u0649\u0644\u0627\u0634",
+"Insert row before": "\u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0642\u06c7\u0631 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Insert row after": "\u0626\u0627\u0631\u0642\u0649\u063a\u0627 \u0642\u06c7\u0631 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Delete row": "\u0642\u06c7\u0631 \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Row properties": "\u0642\u06c7\u0631 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
+"Cut row": "\u0642\u06c7\u0631 \u0643\u06d0\u0633\u0649\u0634",
+"Copy row": "\u0642\u06c7\u0631 \u0643\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Paste row before": "\u0642\u06c7\u0631 \u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0686\u0627\u067e\u0644\u0627\u0634",
+"Paste row after": "\u0642\u06c7\u0631 \u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634",
+"Insert column before": "\u0631\u06d5\u062a \u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Insert column after": "\u0631\u06d5\u062a \u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Delete column": "\u0631\u06d5\u062a \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Cols": "\u0631\u06d5\u062a",
+"Rows": "\u0642\u06c7\u0631",
+"Width": "\u0643\u06d5\u06ad\u0644\u0649\u0643\u0649",
+"Height": "\u0626\u06d0\u06af\u0649\u0632\u0644\u0649\u0643\u0649",
+"Cell spacing": "\u0643\u0627\u062a\u06d5\u0643 \u0633\u0649\u0631\u062a\u0642\u0649 \u0626\u0627\u0631\u0649\u0644\u0649\u0642\u0649",
+"Cell padding": "\u0643\u0627\u062a\u06d5\u0643 \u0626\u0649\u0686\u0643\u0649 \u0626\u0627\u0631\u0649\u0644\u0649\u0642\u0649",
+"Caption": "\u0686\u06c8\u0634\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634",
+"Show caption": "\u062a\u06d0\u0645\u0649\u0633\u0649\u0646\u0649 \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
+"Left": "\u0633\u0648\u0644",
+"Center": "\u0645\u06d5\u0631\u0643\u06d5\u0632",
+"Right": "\u0626\u0648\u06ad",
+"Cell type": "\u0643\u0627\u062a\u06d5\u0643 \u062a\u0649\u067e\u0649",
+"Scope": "\u062f\u0627\u0626\u0649\u0631\u06d5",
+"Alignment": "\u064a\u06c6\u0644\u0649\u0646\u0649\u0634\u0649",
+"H Align": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
+"V Align": "\u06cb\u06d0\u0631\u062a\u0649\u0643\u0627\u0644 \u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
+"Top": "\u0626\u06c8\u0633\u062a\u0649",
+"Middle": "\u0626\u0648\u062a\u062a\u06c7\u0631\u0633\u0649",
+"Bottom": "\u0626\u0627\u0633\u062a\u0649",
+"Header cell": "\u0628\u0627\u0634 \u0643\u0627\u062a\u06d5\u0643",
+"Row group": "\u0642\u06c7\u0631 \u06af\u06c7\u0631\u06c7\u067e\u067e\u0649\u0633\u0649",
+"Column group": "\u0631\u06d5\u062a \u06af\u06c7\u0631\u06c7\u067e\u067e\u0649\u0633\u0649",
+"Row type": "\u0642\u06c7\u0631 \u062a\u0649\u067e\u0649",
+"Header": "\u0628\u06d0\u0634\u0649",
+"Body": "\u0628\u06d5\u062f\u0649\u0646\u0649",
+"Footer": "\u067e\u06c7\u062a\u0649",
+"Border color": "\u0631\u0627\u0645\u0643\u0627 \u0631\u06d5\u06ad\u06af\u0649",
+"Insert template...": "\u0642\u06d0\u0644\u0649\u067e \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634...",
+"Templates": "\u0626\u06c8\u0644\u06af\u0649\u0644\u06d5\u0631",
+"Template": "\u0626\u06c8\u0644\u06af\u0649\u0644\u06d5\u0631",
+"Text color": "\u062e\u06d5\u062a \u0631\u06d5\u06ad\u06af\u0649",
+"Background color": "\u0626\u0627\u0631\u0642\u0627 \u0631\u06d5\u06ad\u06af\u0649",
+"Custom...": "\u0626\u0649\u062e\u062a\u0649\u064a\u0627\u0631\u0649",
+"Custom color": "\u0626\u0649\u062e\u062a\u0649\u064a\u0627\u0631\u0649 \u0631\u06d5\u06ad",
+"No color": "\u0631\u06d5\u06ad \u064a\u0648\u0642",
+"Remove color": "\u0631\u06d5\u06ad\u0646\u0649 \u0686\u0649\u0642\u0649\u0631\u0649\u06cb\u06d0\u062a\u0649\u0634",
+"Table of Contents": "\u062c\u06d5\u062f\u06d5\u0644\u0646\u0649\u06ad \u0645\u06d5\u0632\u0645\u06c7\u0646\u0649",
+"Show blocks": "\u0631\u0627\u064a\u0648\u0646 \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
+"Show invisible characters": "\u0643\u06c6\u0631\u06c8\u0646\u0645\u06d5\u064a\u062f\u0649\u063a\u0627\u0646 \u06be\u06d5\u0631\u0649\u067e\u0644\u06d5\u0631\u0646\u0649 \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
+"Word count": "\u0633\u06c6\u0632 \u0633\u0627\u0646\u0649",
+"Count": "\u0633\u0627\u0646\u0627\u0634",
+"Document": "\u06be\u06c6\u062c\u062c\u06d5\u062a",
+"Selection": "\u062a\u0627\u0644\u0644\u0627\u0646\u063a\u0627\u0646",
+"Words": "\u0633\u06c6\u0632\u0644\u06d5\u0631",
+"Words: {0}": "\u0633\u06c6\u0632: {0}",
+"{0} words": "{0} \u0633\u06c6\u0632",
+"File": "\u06be\u06c6\u062c\u062c\u06d5\u062a",
+"Edit": "\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Insert": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"View": "\u0643\u06c6\u0631\u06c8\u0634",
+"Format": "\u0641\u0648\u0631\u0645\u0627\u062a",
+"Table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644",
+"Tools": "\u0642\u06c7\u0631\u0627\u0644",
+"Powered by {0}": "\u062a\u06d0\u062e\u0646\u0649\u0643\u0649\u062f\u0627 {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0645\u0648\u0644 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0644\u06c7\u0642 \u062a\u06d0\u0643\u06d0\u0633\u0649\u062a \u0631\u0627\u0645\u0643\u0649\u0633\u0649 \u0631\u0627\u064a\u0648\u0646\u0649\u062f\u0627 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643 \u0626\u06c8\u0686\u06c8\u0646 ALT-F9 \u0646\u0649\u060c \u0642\u0648\u0631\u0627\u0644 \u0628\u0627\u0644\u062f\u0649\u0642\u0649 \u0626\u06c8\u0686\u06c8\u0646 ALT-F10 \u0646\u0649\u060c \u064a\u0627\u0631\u062f\u06d5\u0645 \u0626\u06c8\u0686\u06c8\u0646 ALT-0 \u0646\u0649 \u0628\u06d0\u0633\u0649\u06ad",
+"Image title": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u06d0\u0645\u0649\u0633\u0649",
+"Border width": "\u06af\u0649\u0631\u06cb\u06d5\u0643 \u0643\u06d5\u06ad\u0644\u0649\u0643\u0649",
+"Border style": "\u06af\u0649\u0631\u06cb\u06d5\u0643 \u0626\u06c7\u0633\u0644\u06c7\u0628\u0649",
+"Error": "\u062e\u0627\u062a\u0627\u0644\u0649\u0642",
+"Warn": "\u0626\u0627\u06af\u0627\u06be\u0644\u0627\u0646\u062f\u06c7\u0631\u06c7\u0634",
+"Valid": "\u0626\u06c8\u0646\u06c8\u0645\u0644\u06c8\u0643",
+"To open the popup, press Shift+Enter": "\u0633\u06d5\u0643\u0631\u0649\u0645\u06d5 \u0643\u06c6\u0632\u0646\u06d5\u0643\u0646\u0649 \u0626\u06d0\u0686\u0649\u0634 \u0626\u06c8\u0686\u06c8\u0646 Shift+Enter \u0646\u0649 \u0628\u06d0\u0633\u0649\u06ad",
+"Rich Text Area. Press ALT-0 for help.": "\u0641\u0648\u0631\u0645\u0627\u062a\u0644\u0649\u0642 \u062a\u06d0\u0643\u0649\u0633\u062a \u0631\u0627\u064a\u0648\u0646\u0649. \u064a\u0627\u0631\u062f\u06d5\u0645 \u0626\u06c8\u0686\u06c8\u0646 ALT-0 \u0646\u0649 \u0628\u06d0\u0633\u0649\u06ad.",
+"System Font": "\u0633\u0649\u0633\u062a\u06d0\u0645\u0627 \u062e\u06d5\u062a \u0646\u06c7\u0633\u062e\u0649\u0633\u0649",
+"Failed to upload image: {0}": "\u0631\u06d5\u0633\u0649\u0645\u0646\u0649 \u064a\u06c8\u0643\u0644\u0649\u064a\u06d5\u0644\u0645\u0649\u062f\u0649: {0}",
+"Failed to load plugin: {0} from url {1}": "\u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0649\u0646\u0649 \u064a\u06c8\u0643\u0644\u0649\u064a\u06d5\u0644\u0645\u0649\u062f\u0649: {0} \u0646\u0649\u06ad \u0645\u06d5\u0646\u0628\u06d5 \u0626\u0627\u062f\u0631\u06d0\u0633\u0649 {1}",
+"Failed to load plugin url: {0}": "\u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0649\u0646\u0649 \u064a\u06c8\u0643\u0644\u0649\u064a\u06d5\u0644\u0645\u0649\u062f\u0649 \u0626\u0627\u062f\u0631\u06d0\u0633\u0649: {0}",
+"Failed to initialize plugin: {0}": "\u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0649\u0646\u0649 \u062f\u06d5\u0633\u0644\u06d5\u067e\u0644\u06d5\u0634\u062a\u06c8\u0631\u06d5\u0644\u0645\u0649\u062f\u0649: {0}",
+"example": "\u0645\u06d5\u0633\u0649\u0644\u06d5\u0646",
+"Search": "\u0626\u0649\u0632\u062f\u06d5\u0634",
+"All": "\u06be\u06d5\u0645\u0645\u06d5",
+"Currency": "\u067e\u06c7\u0644",
+"Text": "\u062a\u06d0\u0643\u0649\u0633\u062a",
+"Quotations": "\u0646\u06d5\u0642\u0649\u0644\u0644\u06d5\u0631",
+"Mathematical": "\u0645\u0627\u062a\u06d0\u0645\u0627\u062a\u0649\u0643\u0649\u0644\u0649\u0642",
+"Extended Latin": "\u0643\u06d0\u06ad\u06d5\u064a\u062a\u0649\u0644\u06af\u06d5\u0646 \u0644\u0627\u062a\u0649\u0646 \u06be\u06d5\u0631\u067e\u0644\u0649\u0631\u0649",
+"Symbols": "\u0628\u06d5\u0644\u06af\u0649\u0644\u06d5\u0631",
+"Arrows": "\u0626\u0649\u0633\u062a\u0631\u06d0\u0644\u0643\u0649\u0644\u0627\u0631",
+"User Defined": "\u0626\u0649\u0634\u0644\u06d5\u062a\u0643\u06c8\u0686\u0649 \u0628\u06d5\u0644\u06af\u0649\u0644\u0649\u06af\u06d5\u0646",
+"dollar sign": "\u062f\u0648\u0644\u0644\u0627\u0631 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"currency sign": "\u067e\u06c7\u0644 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"euro-currency sign": "\u064a\u0627\u06cb\u0631\u0648 \u067e\u06c7\u0644 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"colon sign": "\u0642\u0648\u0634 \u0686\u06d0\u0643\u0649\u062a \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"cruzeiro sign": "\u0643\u0631\u06c7 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"french franc sign": "\u0641\u0649\u0631\u0627\u0646\u0633\u0649\u064a\u06d5 \u0641\u0649\u0631\u0627\u0646\u0643 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"lira sign": "\u0644\u0649\u0631\u0627 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"mill sign": "\u0645\u0649\u0644 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"naira sign": "\u0646\u0627\u064a\u0631\u0627 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"peseta sign": "\u067e\u06d0\u0633\u06d0\u062a\u0627 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"rupee sign": "\u0631\u06c7\u067e\u0649\u064a\u06d5 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"won sign": "\u06cb\u0648\u0646 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"new sheqel sign": "\u064a\u06d0\u06ad\u0649 \u0634\u0649\u0643\u0649\u0644 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"dong sign": "\u06cb\u0649\u064a\u06d0\u062a\u0646\u0627\u0645 \u062f\u0648\u06ad\u0649 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"kip sign": "\u0643\u0649\u067e \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"tugrik sign": "\u062a\u06c8\u06af\u0631\u0649\u0643 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"drachma sign": "\u062f\u0649\u0631\u0627\u062e\u0645\u0627 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"german penny symbol": "\u06af\u06d0\u0631\u0645\u0627\u0646\u0649\u064a\u06d5 \u067e\u06d0\u0646\u0646\u0649 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"peso sign": "\u067e\u06d0\u0633\u0648 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"guarani sign": "\u06af\u06c7\u0626\u0627\u0631\u0627\u0646\u0649 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"austral sign": "\u0626\u0627\u06cb\u0633\u062a\u0631\u0627\u0644\u0649\u064a\u06d5 \u067e\u06c7\u0644 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"hryvnia sign": "hryvnia \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"cedi sign": "\u0633\u06d0\u062f\u0649 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"livre tournois sign": "livre tournois \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"spesmilo sign": "spesmilo \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"tenge sign": "tenge \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"indian rupee sign": "\u06be\u0649\u0646\u062f\u0649\u0633\u062a\u0627\u0646 \u0631\u06c7\u067e\u0649\u064a\u06d5 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"turkish lira sign": "\u062a\u06c8\u0631\u0643\u0649\u064a\u06d5 \u0644\u0649\u0631\u0627 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"nordic mark sign": "\u0634\u0649\u0645\u0627\u0644\u0649\u064a \u064a\u0627\u06cb\u0631\u0648\u067e\u0627 \u0645\u0627\u0631\u0643 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"manat sign": "manat \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"ruble sign": "\u0631\u06c7\u0628\u0644\u0649 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"yen character": "\u064a\u06d0\u0646 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"yuan character": "\u064a\u06c8\u06d5\u0646 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"yuan character, in hong kong and taiwan": "\u064a\u06c8\u06d5\u0646 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649 (\u0634\u064a\u0627\u06ad\u06af\u0627\u06ad \u06cb\u06d5 \u062a\u06d5\u064a\u06cb\u06d5\u0646)",
+"yen\/yuan character variant one": "\u064a\u06d0\u0646 \u06cb\u06d5 \u064a\u06c8\u06d5\u0646 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649",
+"Loading emoticons...": "\u0686\u0649\u0631\u0627\u064a \u0626\u0649\u067e\u0627\u062f\u0649\u0644\u0649\u0631\u0649 \u064a\u06c8\u0643\u0644\u0649\u0646\u0649\u06cb\u0627\u062a\u0649\u062f\u06c7...",
+"Could not load emoticons": "\u0686\u0649\u0631\u0627\u064a \u0626\u0649\u067e\u0627\u062f\u0649\u0644\u0649\u0631\u0649 \u064a\u06c8\u0643\u0644\u06d5\u0646\u0645\u0649\u062f\u0649",
+"People": "\u0626\u0627\u062f\u06d5\u0645\u0644\u06d5\u0631",
+"Animals and Nature": "\u06be\u0627\u064a\u06cb\u0627\u0646\u0644\u0627\u0631 \u06cb\u06d5 \u062a\u06d5\u0628\u0649\u0626\u06d5\u062a",
+"Food and Drink": "\u064a\u06d0\u0645\u06d5\u0643-\u0626\u0649\u0686\u0645\u06d5\u0643",
+"Activity": "\u067e\u0627\u0626\u0627\u0644\u0649\u064a\u06d5\u062a",
+"Travel and Places": "\u0633\u0627\u064a\u0627\u06be\u06d5\u062a \u06cb\u06d5 \u062c\u0627\u064a\u0644\u0627\u0631",
+"Objects": "\u0646\u06d5\u0631\u0633\u0649\u0644\u06d5\u0631",
+"Flags": "\u0628\u0627\u064a\u0631\u0627\u0642\u0644\u0627\u0631",
+"Characters": "\u06be\u06d5\u0631\u067e-\u0628\u06d5\u0644\u06af\u0649\u0644\u06d5\u0631",
+"Characters (no spaces)": "\u06be\u06d5\u0631\u067e-\u0628\u06d5\u0644\u06af\u0649\u0644\u06d5\u0631 (\u0628\u0648\u0634\u0644\u06c7\u0642\u0646\u0649 \u0626\u06c6\u0632 \u0626\u0649\u0686\u0649\u06af\u06d5 \u0626\u0627\u0644\u0645\u0627\u064a\u062f\u06c7)",
+"{0} characters": "{0} \u06be\u06d5\u0631\u067e-\u0628\u06d5\u0644\u06af\u06d5",
+"Error: Form submit field collision.": "\u062e\u0627\u062a\u0627\u0644\u0649\u0642: \u0631\u0627\u0645\u0643\u0627 (form) \u064a\u0648\u0644\u0644\u0627\u0634 \u0628\u06c6\u0644\u0649\u0643\u0649 \u062a\u0648\u0642\u06c7\u0646\u06c7\u0634\u062a\u0649.",
+"Error: No form element found.": "\u062e\u0627\u062a\u0627\u0644\u0649\u0642: \u0631\u0627\u0645\u0643\u0627 (form) \u0626\u06d0\u0644\u06d0\u0645\u06d0\u0646\u062a\u0649 \u062a\u06d0\u067e\u0649\u0644\u0645\u0649\u062f\u0649.",
+"Update": "\u064a\u06d0\u06ad\u0649\u0644\u0627\u0634",
+"Color swatch": "\u0631\u06d5\u06ad \u0626\u06c8\u0644\u06af\u0649\u0633\u0649",
+"Turquoise": "\u0643\u06c6\u0643\u06c8\u0686 \u064a\u06d0\u0634\u0649\u0644",
+"Green": "\u064a\u06d0\u0634\u0649\u0644",
+"Blue": "\u0643\u06c6\u0643",
+"Purple": "\u0628\u0649\u0646\u06d5\u067e\u0634\u06d5",
+"Navy Blue": "\u062f\u06d0\u06ad\u0649\u0632 \u0643\u06c6\u0643",
+"Dark Turquoise": "\u062a\u0648\u0642 \u0643\u06c6\u0643\u06c8\u0686 \u064a\u06d0\u0634\u0649\u0644",
+"Dark Green": "\u062a\u0648\u0642 \u064a\u06d0\u0634\u0649\u0644",
+"Medium Blue": "\u0626\u0627\u0631\u0627 \u0643\u06c6\u0643",
+"Medium Purple": "\u0626\u0627\u0631\u0627 \u0628\u0649\u0646\u06d5\u067e\u0634\u06d5",
+"Midnight Blue": "\u0642\u0627\u0631\u0627 \u0643\u06c6\u0643",
+"Yellow": "\u0633\u06d0\u0631\u0649\u0642",
+"Orange": "\u0642\u0649\u0632\u063a\u06c7\u0686 \u0633\u06d0\u0631\u0649\u0642",
+"Red": "\u0642\u0649\u0632\u0649\u0644",
+"Light Gray": "\u0626\u0627\u0686 \u0643\u06c8\u0644\u0631\u06d5\u06ad",
+"Gray": "\u0643\u06c8\u0644\u0631\u06d5\u06ad",
+"Dark Yellow": "\u062a\u0648\u0642 \u0633\u06d0\u0631\u0649\u0642",
+"Dark Orange": "\u062a\u0648\u0642 \u0642\u0649\u0632\u063a\u06c7\u0686",
+"Dark Red": "\u062a\u0648\u0642 \u0642\u0649\u0632\u0649\u0644",
+"Medium Gray": "\u0626\u0648\u062a\u062a\u06c7\u0631\u06be\u0627\u0644 \u0643\u06c8\u0644\u0631\u06d5\u06ad",
+"Dark Gray": "\u062a\u0648\u0642 \u0643\u06c8\u0644\u0631\u06d5\u06ad",
+"Light Green": "\u0626\u0627\u0686 \u064a\u06d0\u0634\u0649\u0644",
+"Light Yellow": "\u0626\u0627\u0686 \u0633\u06d0\u0631\u0649\u0642",
+"Light Red": "\u0626\u0627\u0686 \u0642\u0649\u0632\u0649\u0644",
+"Light Purple": "\u0626\u0627\u0686 \u0628\u0649\u0646\u06d5\u067e\u0634\u06d5",
+"Light Blue": "\u0626\u0627\u0686 \u0643\u06c6\u0643",
+"Dark Purple": "\u062a\u0648\u0642 \u0628\u0649\u0646\u06d5\u067e\u0634\u06d5",
+"Dark Blue": "\u062a\u0648\u0642 \u0643\u06c6\u0643",
+"Black": "\u0642\u0627\u0631\u0627",
+"White": "\u0626\u0627\u0642",
+"Switch to or from fullscreen mode": "\u062a\u0648\u0644\u06c7\u0642 \u0626\u06d0\u0643\u0631\u0627\u0646 \u06be\u0627\u0644\u0649\u062a\u0649\u0646\u0649 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Open help dialog": "\u064a\u0627\u0631\u062f\u06d5\u0645 \u062f\u0649\u064a\u0627\u0644\u0648\u06af\u0649\u0646\u0649 \u0626\u06d0\u0686\u0649\u0634",
+"history": "\u062a\u0627\u0631\u0649\u062e\u0649\u064a \u0626\u06c7\u0686\u06c7\u0631",
+"styles": "\u0626\u06c7\u0633\u0644\u06c7\u0628\u0644\u0627\u0631",
+"formatting": "\u0641\u0648\u0631\u0645\u0627\u062a\u0644\u0627\u0634",
+"alignment": "\u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
+"indentation": "\u062a\u0627\u0631\u0627\u064a\u062a\u0649\u0634",
+"Font": "\u062e\u06d5\u062a \u0646\u06c7\u0633\u062e\u0649\u0633\u0649",
+"Size": "\u0686\u0648\u06ad\u0644\u06c7\u0642\u0649",
+"More...": "\u062a\u06d0\u062e\u0649\u0645\u06c7 \u0643\u06c6\u067e...",
+"Select...": "\u062a\u0627\u0644\u0644\u0627\u0634...",
+"Preferences": "\u0645\u0627\u064a\u0649\u0644\u0644\u0649\u0642\u0644\u0649\u0631\u0649",
+"Yes": "\u06be\u06d5\u0626\u06d5",
+"No": "\u064a\u0627\u0642",
+"Keyboard Navigation": "\u064a\u06c6\u062a\u0643\u0649\u0644\u0649\u0634\u0686\u0627\u0646 \u0643\u06c7\u0646\u06c7\u067e\u0643\u0627 \u062a\u0627\u062e\u062a\u0649\u0633\u0649",
+"Version": "\u0646\u06d5\u0634\u0631\u0649",
+"Code view": "\u0643\u0648\u062f \u0643\u06c6\u0631\u06c8\u0646\u06c8\u0634\u0649",
+"Open popup menu for split buttons": "\u0628\u06c6\u0644\u06c8\u0646\u0645\u06d5 \u0643\u06c7\u0646\u06c7\u067e\u0643\u0649\u0644\u0627\u0631 \u0626\u06c8\u0686\u06c8\u0646 \u0633\u06d5\u0643\u0631\u0649\u0645\u06d5 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643 \u0626\u06d0\u0686\u0649\u0634",
+"List Properties": "\u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643 \u062e\u0627\u0633\u0644\u0649\u0642\u0644\u0649\u0631\u0649",
+"List properties...": "\u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643 \u062e\u0627\u0633\u0644\u0649\u0642\u0644\u0649\u0631\u0649...",
+"Start list at number": "\u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643\u0646\u0649 \u0633\u0627\u0646 \u0628\u0649\u0644\u06d5\u0646 \u0628\u0627\u0634\u0644\u0627\u0634",
+"Line height": "\u0642\u06c7\u0631 \u0626\u0627\u0631\u0649\u0644\u0649\u0642\u0649",
+"comments": "\u0626\u0649\u0646\u0643\u0627\u0633\u0644\u0627\u0631",
+"Format Painter": "\u0641\u0648\u0631\u0645\u0627\u062a \u0643\u06c6\u0686\u06c8\u0631\u06af\u06c8\u0686",
+"Insert\/edit iframe": "\u0631\u0627\u0645\u0643\u0627 (iframe) \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634 \u064a\u0627\u0643\u0649 \u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Capitalization": "\u0686\u0648\u06ad \u06be\u06d5\u0631\u067e\u0643\u06d5 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"lowercase": "\u0643\u0649\u0686\u0649\u0643 \u06be\u06d5\u0631\u067e",
+"UPPERCASE": "\u0686\u0648\u06ad \u06be\u06d5\u0631\u067e",
+"Title Case": "\u062a\u06d0\u0645\u0627 \u0626\u06c7\u0633\u0644\u06c7\u0628\u0649",
+"permanent pen": "\u062f\u0627\u0626\u0649\u0645\u0644\u0649\u0642 \u0642\u06d5\u0644\u06d5\u0645",
+"Permanent Pen Properties": "\u062f\u0627\u0626\u0649\u0645\u0644\u0649\u0642 \u0642\u06d5\u0644\u06d5\u0645 \u062e\u0627\u0633\u0644\u0649\u0642\u0644\u0649\u0631\u0649",
+"Permanent pen properties...": "\u062f\u0627\u0626\u0649\u0645\u0644\u0649\u0642 \u0642\u06d5\u0644\u06d5\u0645 \u062e\u0627\u0633\u0644\u0649\u0642\u0644\u0649\u0631\u0649...",
+"case change": "\u0686\u0648\u06ad\u0644\u06c7\u0642\u0649\u0646\u0649 \u0626\u06c6\u0632\u06af\u06d5\u0631\u062a\u0649\u0634",
+"page embed": "\u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0627 \u0628\u06d5\u062a",
+"Advanced sort...": "\u0626\u0627\u0644\u0649\u064a \u062a\u0649\u0632\u0649\u0634...",
+"Advanced Sort": "\u0626\u0627\u0644\u0649\u064a \u062a\u0649\u0632\u0649\u0634",
+"Sort table by column ascending": "\u062c\u06d5\u062f\u06cb\u06d5\u0644\u0646\u0649 \u0626\u0649\u0633\u062a\u0648\u0646\u0646\u0649\u06ad \u0626\u06d0\u0634\u0649\u0634\u0649 \u0628\u0648\u064a\u0649\u0686\u06d5 \u062a\u0649\u0632\u0649\u0634",
+"Sort table by column descending": "\u062c\u06d5\u062f\u06cb\u06d5\u0644\u0646\u0649 \u0626\u0649\u0633\u062a\u0648\u0646\u0646\u0649\u06ad \u0643\u06d0\u0645\u0649\u064a\u0649\u0634\u0649 \u0628\u0648\u064a\u0649\u0686\u06d5 \u062a\u0649\u0632\u0649\u0634",
+"Sort": "\u062a\u0649\u0632\u0649\u0634",
+"Order": "\u062a\u06d5\u0631\u062a\u0649\u067e\u0649",
+"Sort by": "\u062a\u0649\u0632\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649",
+"Ascending": "\u0626\u06d0\u0634\u0649\u0634",
+"Descending": "\u0643\u06d0\u0645\u0649\u064a\u0649\u0634",
+"Column {0}": "{0} \u0626\u0649\u0633\u062a\u0648\u0646",
+"Row {0}": "{0}-\u0642\u06c7\u0631",
+"Spellcheck...": "\u0626\u0649\u0645\u0644\u0627 \u062a\u06d5\u0643\u0634\u06c8\u0631\u06c8\u0634...",
+"Misspelled word": "\u062e\u0627\u062a\u0627 \u0633\u06c6\u0632",
+"Suggestions": "\u062a\u06d5\u06cb\u0633\u0649\u064a\u06d5\u0644\u06d5\u0631",
+"Change": "\u0626\u06c6\u0632\u06af\u06d5\u0631\u062a\u0649\u0634",
+"Finding word suggestions": "\u062a\u06d5\u06cb\u0633\u0649\u064a\u06d5 \u0633\u06c6\u0632\u0644\u06d5\u0631\u0646\u0649 \u0626\u0649\u0632\u062f\u06d5\u0634",
+"Success": "\u0626\u0648\u06ad\u06c7\u0634\u0644\u06c7\u0642 \u0628\u0648\u0644\u062f\u0649",
+"Repair": "\u0626\u0648\u06ad\u0634\u0627\u0634",
+"Issue {0} of {1}": "{0}-\u0645\u06d5\u0633\u0649\u0644\u06d5\u060c \u062c\u06d5\u0645\u0626\u0649\u064a {1} \u0645\u06d5\u0633\u0649\u0644\u06d5",
+"Images must be marked as decorative or have an alternative text description": "\u0631\u06d5\u0633\u0649\u0645\u0644\u06d5\u0631\u0646\u0649\u06ad \u0686\u0648\u0642\u06c7\u0645 \u0628\u06d0\u0632\u06d5\u0643 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649 \u064a\u0627\u0643\u0649 \u062a\u0627\u0644\u0644\u0627\u0646\u0645\u0627 \u062a\u06d0\u0643\u0649\u0633\u062a \u0686\u06c8\u0634\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634\u0649 \u0628\u0648\u0644\u06c7\u0634\u0649 \u0643\u06d0\u0631\u06d5\u0643",
+"Images must have an alternative text description. Decorative images are not allowed.": "\u0631\u06d5\u0633\u0649\u0645\u0644\u06d5\u0631\u0646\u0649\u06ad \u0686\u0648\u0642\u06c7\u0645 \u062a\u0627\u0644\u0644\u0627\u0646\u0645\u0627 \u062a\u06d0\u0643\u0649\u0633\u062a \u0686\u06c8\u0634\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634\u0649 \u0628\u0648\u0644\u06c7\u0634\u0649 \u0643\u06d0\u0631\u06d5\u0643. \u0628\u06d0\u0632\u06d5\u0643 \u0631\u06d5\u0633\u0649\u0645\u0644\u06d5\u0631\u06af\u06d5 \u0631\u06c7\u062e\u0633\u06d5\u062a \u0642\u0649\u0644\u0649\u0646\u0645\u0627\u064a\u062f\u06c7.",
+"Or provide alternative text:": "\u064a\u0627\u0643\u0649 \u062a\u0627\u0644\u0644\u0627\u0646\u0645\u0627 \u062a\u06d0\u0643\u0649\u0633\u062a\u0646\u0649 \u0643\u0649\u0631\u06af\u06c8\u0632\u06c8\u06ad:",
+"Make image decorative:": "\u0628\u06d0\u0632\u06d5\u0643 \u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0644\u0649\u06ad:",
+"ID attribute must be unique": "ID \u062e\u0627\u0633\u0644\u0649\u0642\u0649 \u0628\u0649\u0631\u062f\u0649\u0646\u0628\u0649\u0631 \u0628\u0648\u0644\u06c7\u0634\u0649 \u0643\u06d0\u0631\u06d5\u0643",
+"Make ID unique": "ID \u0646\u0649 \u0628\u0649\u0631\u062f\u0649\u0646\u0628\u0649\u0631 \u0642\u0649\u0644\u0649\u0634",
+"Keep this ID and remove all others": "\u0628\u06c7 ID \u062f\u0649\u0646 \u0628\u0627\u0634\u0642\u0649\u0644\u0649\u0631\u0649\u0646\u0649 \u0686\u0649\u0642\u0649\u0631\u0649\u06cb\u06d0\u062a\u0649\u0634",
+"Remove this ID": "\u0628\u06c7 ID \u0646\u0649 \u0686\u0649\u0642\u0649\u0631\u0649\u06cb\u06d0\u062a\u0649\u0634",
+"Remove all IDs": "\u0628\u0627\u0631\u0644\u0649\u0642 ID \u0646\u0649 \u0686\u0649\u0642\u0649\u0631\u0649\u06cb\u06d0\u062a\u0649\u0634",
+"Checklist": "\u062a\u0627\u0644\u0644\u0627\u0646\u0645\u0627 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
+"Anchor": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627",
+"Special character": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5 \u0628\u06d5\u0644\u06af\u0649\u0644\u06d5\u0631",
+"Code sample": "\u0643\u0648\u062f \u0645\u0649\u0633\u0627\u0644\u0649",
+"Color": "\u0631\u06d5\u06ad",
+"Document properties": "\u06be\u06c6\u062c\u062c\u06d5\u062a \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
+"Image description": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u06d5\u0633\u06cb\u0649\u0631\u0649",
+"Image": "\u0631\u06d5\u0633\u0649\u0645",
+"Insert link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Target": "\u0646\u0649\u0634\u0627\u0646",
+"Link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634",
+"Poster": "\u064a\u0648\u0644\u0644\u0649\u063a\u06c7\u0686\u0649",
+"Media": "\u0645\u06d0\u062f\u0649\u064a\u0627",
+"Print": "\u0628\u06d0\u0633\u0649\u0634",
+"Prev": "\u0626\u0627\u0644\u062f\u0649\u0646\u0642\u0649\u0633\u0649",
+"Find and replace": "\u0626\u0649\u0632\u062f\u06d5\u0634 \u06cb\u06d5 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Whole words": "\u062a\u0648\u0644\u06c7\u0642  \u0645\u0627\u0633\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Insert template": "\u0626\u06c8\u0644\u06af\u06d5 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634"
+});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/zh_CN.js b/cps/static/js/libs/tinymce/langs/zh_CN.js
deleted file mode 100644
index 89b106c29..000000000
--- a/cps/static/js/libs/tinymce/langs/zh_CN.js
+++ /dev/null
@@ -1,419 +0,0 @@
-tinymce.addI18n('zh_CN',{
-"Redo": "\u91cd\u505a",
-"Undo": "\u64a4\u9500",
-"Cut": "\u526a\u5207",
-"Copy": "\u590d\u5236",
-"Paste": "\u7c98\u8d34",
-"Select all": "\u5168\u9009",
-"New document": "\u65b0\u6587\u4ef6",
-"Ok": "\u786e\u5b9a",
-"Cancel": "\u53d6\u6d88",
-"Visual aids": "\u7f51\u683c\u7ebf",
-"Bold": "\u7c97\u4f53",
-"Italic": "\u659c\u4f53",
-"Underline": "\u4e0b\u5212\u7ebf",
-"Strikethrough": "\u5220\u9664\u7ebf",
-"Superscript": "\u4e0a\u6807",
-"Subscript": "\u4e0b\u6807",
-"Clear formatting": "\u6e05\u9664\u683c\u5f0f",
-"Align left": "\u5de6\u8fb9\u5bf9\u9f50",
-"Align center": "\u4e2d\u95f4\u5bf9\u9f50",
-"Align right": "\u53f3\u8fb9\u5bf9\u9f50",
-"Justify": "\u4e24\u7aef\u5bf9\u9f50",
-"Bullet list": "\u9879\u76ee\u7b26\u53f7",
-"Numbered list": "\u7f16\u53f7\u5217\u8868",
-"Decrease indent": "\u51cf\u5c11\u7f29\u8fdb",
-"Increase indent": "\u589e\u52a0\u7f29\u8fdb",
-"Close": "\u5173\u95ed",
-"Formats": "\u683c\u5f0f",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u4f60\u7684\u6d4f\u89c8\u5668\u4e0d\u652f\u6301\u6253\u5f00\u526a\u8d34\u677f\uff0c\u8bf7\u4f7f\u7528Ctrl+X\/C\/V\u7b49\u5feb\u6377\u952e\u3002",
-"Headers": "\u6807\u9898",
-"Header 1": "\u6807\u98981",
-"Header 2": "\u6807\u98982",
-"Header 3": "\u6807\u98983",
-"Header 4": "\u6807\u98984",
-"Header 5": "\u6807\u98985",
-"Header 6": "\u6807\u98986",
-"Headings": "\u6807\u9898",
-"Heading 1": "\u6807\u98981",
-"Heading 2": "\u6807\u98982",
-"Heading 3": "\u6807\u98983",
-"Heading 4": "\u6807\u98984",
-"Heading 5": "\u6807\u98985",
-"Heading 6": "\u6807\u98986",
-"Preformatted": "\u9884\u5148\u683c\u5f0f\u5316\u7684",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u4ee3\u7801",
-"Paragraph": "\u6bb5\u843d",
-"Blockquote": "\u5f15\u6587\u533a\u5757",
-"Inline": "\u6587\u672c",
-"Blocks": "\u57fa\u5757",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u5f53\u524d\u4e3a\u7eaf\u6587\u672c\u7c98\u8d34\u6a21\u5f0f\uff0c\u518d\u6b21\u70b9\u51fb\u53ef\u4ee5\u56de\u5230\u666e\u901a\u7c98\u8d34\u6a21\u5f0f\u3002",
-"Fonts": "\u5b57\u4f53",
-"Font Sizes": "\u5b57\u53f7",
-"Class": "\u7c7b\u578b",
-"Browse for an image": "\u6d4f\u89c8\u56fe\u50cf",
-"OR": "\u6216",
-"Drop an image here": "\u62d6\u653e\u4e00\u5f20\u56fe\u50cf\u81f3\u6b64",
-"Upload": "\u4e0a\u4f20",
-"Block": "\u5757",
-"Align": "\u5bf9\u9f50",
-"Default": "\u9ed8\u8ba4",
-"Circle": "\u7a7a\u5fc3\u5706",
-"Disc": "\u5b9e\u5fc3\u5706",
-"Square": "\u65b9\u5757",
-"Lower Alpha": "\u5c0f\u5199\u82f1\u6587\u5b57\u6bcd",
-"Lower Greek": "\u5c0f\u5199\u5e0c\u814a\u5b57\u6bcd",
-"Lower Roman": "\u5c0f\u5199\u7f57\u9a6c\u5b57\u6bcd",
-"Upper Alpha": "\u5927\u5199\u82f1\u6587\u5b57\u6bcd",
-"Upper Roman": "\u5927\u5199\u7f57\u9a6c\u5b57\u6bcd",
-"Anchor...": "\u951a\u70b9...",
-"Name": "\u540d\u79f0",
-"Id": "\u6807\u8bc6\u7b26",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u6807\u8bc6\u7b26\u5e94\u8be5\u4ee5\u5b57\u6bcd\u5f00\u5934\uff0c\u540e\u8ddf\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7834\u6298\u53f7\u3001\u70b9\u3001\u5192\u53f7\u6216\u4e0b\u5212\u7ebf\u3002",
-"You have unsaved changes are you sure you want to navigate away?": "\u4f60\u8fd8\u6709\u6587\u6863\u5c1a\u672a\u4fdd\u5b58\uff0c\u786e\u5b9a\u8981\u79bb\u5f00\uff1f",
-"Restore last draft": "\u6062\u590d\u4e0a\u6b21\u7684\u8349\u7a3f",
-"Special character...": "\u7279\u6b8a\u5b57\u7b26...",
-"Source code": "\u6e90\u4ee3\u7801",
-"Insert\/Edit code sample": "\u63d2\u5165\/\u7f16\u8f91\u4ee3\u7801\u793a\u4f8b",
-"Language": "\u8bed\u8a00",
-"Code sample...": "\u793a\u4f8b\u4ee3\u7801...",
-"Color Picker": "\u9009\u8272\u5668",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u4ece\u5de6\u5230\u53f3",
-"Right to left": "\u4ece\u53f3\u5230\u5de6",
-"Emoticons...": "\u8868\u60c5\u7b26\u53f7...",
-"Metadata and Document Properties": "\u5143\u6570\u636e\u548c\u6587\u6863\u5c5e\u6027",
-"Title": "\u6807\u9898",
-"Keywords": "\u5173\u952e\u8bcd",
-"Description": "\u63cf\u8ff0",
-"Robots": "\u673a\u5668\u4eba",
-"Author": "\u4f5c\u8005",
-"Encoding": "\u7f16\u7801",
-"Fullscreen": "\u5168\u5c4f",
-"Action": "\u64cd\u4f5c",
-"Shortcut": "\u5feb\u6377\u952e",
-"Help": "\u5e2e\u52a9",
-"Address": "\u5730\u5740",
-"Focus to menubar": "\u79fb\u52a8\u7126\u70b9\u5230\u83dc\u5355\u680f",
-"Focus to toolbar": "\u79fb\u52a8\u7126\u70b9\u5230\u5de5\u5177\u680f",
-"Focus to element path": "\u79fb\u52a8\u7126\u70b9\u5230\u5143\u7d20\u8def\u5f84",
-"Focus to contextual toolbar": "\u79fb\u52a8\u7126\u70b9\u5230\u4e0a\u4e0b\u6587\u83dc\u5355",
-"Insert link (if link plugin activated)": "\u63d2\u5165\u94fe\u63a5 (\u5982\u679c\u94fe\u63a5\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
-"Save (if save plugin activated)": "\u4fdd\u5b58(\u5982\u679c\u4fdd\u5b58\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
-"Find (if searchreplace plugin activated)": "\u67e5\u627e(\u5982\u679c\u67e5\u627e\u66ff\u6362\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
-"Plugins installed ({0}):": "\u5df2\u5b89\u88c5\u63d2\u4ef6 ({0}):",
-"Premium plugins:": "\u4f18\u79c0\u63d2\u4ef6\uff1a",
-"Learn more...": "\u4e86\u89e3\u66f4\u591a...",
-"You are using {0}": "\u4f60\u6b63\u5728\u4f7f\u7528 {0}",
-"Plugins": "\u63d2\u4ef6",
-"Handy Shortcuts": "\u5feb\u6377\u952e",
-"Horizontal line": "\u6c34\u5e73\u5206\u5272\u7ebf",
-"Insert\/edit image": "\u63d2\u5165\/\u7f16\u8f91\u56fe\u7247",
-"Image description": "\u56fe\u7247\u63cf\u8ff0",
-"Source": "\u5730\u5740",
-"Dimensions": "\u5927\u5c0f",
-"Constrain proportions": "\u4fdd\u6301\u7eb5\u6a2a\u6bd4",
-"General": "\u666e\u901a",
-"Advanced": "\u9ad8\u7ea7",
-"Style": "\u6837\u5f0f",
-"Vertical space": "\u5782\u76f4\u8fb9\u8ddd",
-"Horizontal space": "\u6c34\u5e73\u8fb9\u8ddd",
-"Border": "\u8fb9\u6846",
-"Insert image": "\u63d2\u5165\u56fe\u7247",
-"Image...": "\u56fe\u7247...",
-"Image list": "\u56fe\u7247\u5217\u8868",
-"Rotate counterclockwise": "\u9006\u65f6\u9488\u65cb\u8f6c",
-"Rotate clockwise": "\u987a\u65f6\u9488\u65cb\u8f6c",
-"Flip vertically": "\u5782\u76f4\u7ffb\u8f6c",
-"Flip horizontally": "\u6c34\u5e73\u7ffb\u8f6c",
-"Edit image": "\u7f16\u8f91\u56fe\u7247",
-"Image options": "\u56fe\u7247\u9009\u9879",
-"Zoom in": "\u653e\u5927",
-"Zoom out": "\u7f29\u5c0f",
-"Crop": "\u88c1\u526a",
-"Resize": "\u8c03\u6574\u5927\u5c0f",
-"Orientation": "\u65b9\u5411",
-"Brightness": "\u4eae\u5ea6",
-"Sharpen": "\u9510\u5316",
-"Contrast": "\u5bf9\u6bd4\u5ea6",
-"Color levels": "\u989c\u8272\u5c42\u6b21",
-"Gamma": "\u4f3d\u9a6c\u503c",
-"Invert": "\u53cd\u8f6c",
-"Apply": "\u5e94\u7528",
-"Back": "\u540e\u9000",
-"Insert date\/time": "\u63d2\u5165\u65e5\u671f\/\u65f6\u95f4",
-"Date\/time": "\u65e5\u671f\/\u65f6\u95f4",
-"Insert\/Edit Link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
-"Insert\/edit link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
-"Text to display": "\u663e\u793a\u6587\u5b57",
-"Url": "\u5730\u5740",
-"Open link in...": "\u94fe\u63a5\u6253\u5f00\u4f4d\u7f6e...",
-"Current window": "\u5f53\u524d\u7a97\u53e3",
-"None": "\u65e0",
-"New window": "\u5728\u65b0\u7a97\u53e3\u6253\u5f00",
-"Remove link": "\u5220\u9664\u94fe\u63a5",
-"Anchors": "\u951a\u70b9",
-"Link...": "\u94fe\u63a5...",
-"Paste or type a link": "\u7c98\u8d34\u6216\u8f93\u5165\u94fe\u63a5",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u4e3a\u90ae\u4ef6\u5730\u5740\uff0c\u9700\u8981\u52a0\u4e0amailto:\u524d\u7f00\u5417\uff1f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u5c5e\u4e8e\u5916\u90e8\u94fe\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttp:\/\/:\u524d\u7f00\u5417\uff1f",
-"Link list": "\u94fe\u63a5\u5217\u8868",
-"Insert video": "\u63d2\u5165\u89c6\u9891",
-"Insert\/edit video": "\u63d2\u5165\/\u7f16\u8f91\u89c6\u9891",
-"Insert\/edit media": "\u63d2\u5165\/\u7f16\u8f91\u5a92\u4f53",
-"Alternative source": "\u955c\u50cf",
-"Alternative source URL": "\u66ff\u4ee3\u6765\u6e90\u7f51\u5740",
-"Media poster (Image URL)": "\u5c01\u9762(\u56fe\u7247\u5730\u5740)",
-"Paste your embed code below:": "\u5c06\u5185\u5d4c\u4ee3\u7801\u7c98\u8d34\u5728\u4e0b\u9762:",
-"Embed": "\u5185\u5d4c",
-"Media...": "\u591a\u5a92\u4f53...",
-"Nonbreaking space": "\u4e0d\u95f4\u65ad\u7a7a\u683c",
-"Page break": "\u5206\u9875\u7b26",
-"Paste as text": "\u7c98\u8d34\u4e3a\u6587\u672c",
-"Preview": "\u9884\u89c8",
-"Print...": "\u6253\u5370...",
-"Save": "\u4fdd\u5b58",
-"Find": "\u67e5\u627e",
-"Replace with": "\u66ff\u6362\u4e3a",
-"Replace": "\u66ff\u6362",
-"Replace all": "\u5168\u90e8\u66ff\u6362",
-"Previous": "\u4e0a\u4e00\u4e2a",
-"Next": "\u4e0b\u4e00\u4e2a",
-"Find and replace...": "\u67e5\u627e\u5e76\u66ff\u6362...",
-"Could not find the specified string.": "\u672a\u627e\u5230\u641c\u7d22\u5185\u5bb9.",
-"Match case": "\u533a\u5206\u5927\u5c0f\u5199",
-"Find whole words only": "\u5168\u5b57\u5339\u914d",
-"Spell check": "\u62fc\u5199\u68c0\u67e5",
-"Ignore": "\u5ffd\u7565",
-"Ignore all": "\u5168\u90e8\u5ffd\u7565",
-"Finish": "\u5b8c\u6210",
-"Add to Dictionary": "\u6dfb\u52a0\u5230\u5b57\u5178",
-"Insert table": "\u63d2\u5165\u8868\u683c",
-"Table properties": "\u8868\u683c\u5c5e\u6027",
-"Delete table": "\u5220\u9664\u8868\u683c",
-"Cell": "\u5355\u5143\u683c",
-"Row": "\u884c",
-"Column": "\u5217",
-"Cell properties": "\u5355\u5143\u683c\u5c5e\u6027",
-"Merge cells": "\u5408\u5e76\u5355\u5143\u683c",
-"Split cell": "\u62c6\u5206\u5355\u5143\u683c",
-"Insert row before": "\u5728\u4e0a\u65b9\u63d2\u5165",
-"Insert row after": "\u5728\u4e0b\u65b9\u63d2\u5165",
-"Delete row": "\u5220\u9664\u884c",
-"Row properties": "\u884c\u5c5e\u6027",
-"Cut row": "\u526a\u5207\u884c",
-"Copy row": "\u590d\u5236\u884c",
-"Paste row before": "\u7c98\u8d34\u5230\u4e0a\u65b9",
-"Paste row after": "\u7c98\u8d34\u5230\u4e0b\u65b9",
-"Insert column before": "\u5728\u5de6\u4fa7\u63d2\u5165",
-"Insert column after": "\u5728\u53f3\u4fa7\u63d2\u5165",
-"Delete column": "\u5220\u9664\u5217",
-"Cols": "\u5217",
-"Rows": "\u884c",
-"Width": "\u5bbd",
-"Height": "\u9ad8",
-"Cell spacing": "\u5355\u5143\u683c\u5916\u95f4\u8ddd",
-"Cell padding": "\u5355\u5143\u683c\u5185\u8fb9\u8ddd",
-"Show caption": "\u663e\u793a\u6807\u9898",
-"Left": "\u5de6\u5bf9\u9f50",
-"Center": "\u5c45\u4e2d",
-"Right": "\u53f3\u5bf9\u9f50",
-"Cell type": "\u5355\u5143\u683c\u7c7b\u578b",
-"Scope": "\u8303\u56f4",
-"Alignment": "\u5bf9\u9f50\u65b9\u5f0f",
-"H Align": "\u6c34\u5e73\u5bf9\u9f50",
-"V Align": "\u5782\u76f4\u5bf9\u9f50",
-"Top": "\u9876\u90e8\u5bf9\u9f50",
-"Middle": "\u5782\u76f4\u5c45\u4e2d",
-"Bottom": "\u5e95\u90e8\u5bf9\u9f50",
-"Header cell": "\u8868\u5934\u5355\u5143\u683c",
-"Row group": "\u884c\u7ec4",
-"Column group": "\u5217\u7ec4",
-"Row type": "\u884c\u7c7b\u578b",
-"Header": "\u8868\u5934",
-"Body": "\u8868\u4f53",
-"Footer": "\u8868\u5c3e",
-"Border color": "\u8fb9\u6846\u989c\u8272",
-"Insert template...": "\u63d2\u5165\u6a21\u677f...",
-"Templates": "\u6a21\u677f",
-"Template": "\u6a21\u677f",
-"Text color": "\u6587\u5b57\u989c\u8272",
-"Background color": "\u80cc\u666f\u8272",
-"Custom...": "\u81ea\u5b9a\u4e49...",
-"Custom color": "\u81ea\u5b9a\u4e49\u989c\u8272",
-"No color": "\u65e0",
-"Remove color": "\u79fb\u9664\u989c\u8272",
-"Table of Contents": "\u5185\u5bb9\u5217\u8868",
-"Show blocks": "\u663e\u793a\u533a\u5757\u8fb9\u6846",
-"Show invisible characters": "\u663e\u793a\u4e0d\u53ef\u89c1\u5b57\u7b26",
-"Word count": "\u5b57\u6570",
-"Count": "\u8ba1\u6570",
-"Document": "\u6587\u6863",
-"Selection": "\u9009\u62e9",
-"Words": "\u5355\u8bcd",
-"Words: {0}": "\u5b57\u6570\uff1a{0}",
-"{0} words": "{0} \u5b57",
-"File": "\u6587\u4ef6",
-"Edit": "\u7f16\u8f91",
-"Insert": "\u63d2\u5165",
-"View": "\u89c6\u56fe",
-"Format": "\u683c\u5f0f",
-"Table": "\u8868\u683c",
-"Tools": "\u5de5\u5177",
-"Powered by {0}": "\u7531{0}\u9a71\u52a8",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u5728\u7f16\u8f91\u533a\u6309ALT-F9\u6253\u5f00\u83dc\u5355\uff0c\u6309ALT-F10\u6253\u5f00\u5de5\u5177\u680f\uff0c\u6309ALT-0\u67e5\u770b\u5e2e\u52a9",
-"Image title": "\u56fe\u7247\u6807\u9898",
-"Border width": "\u8fb9\u6846\u5bbd\u5ea6",
-"Border style": "\u8fb9\u6846\u6837\u5f0f",
-"Error": "\u9519\u8bef",
-"Warn": "\u8b66\u544a",
-"Valid": "\u6709\u6548",
-"To open the popup, press Shift+Enter": "\u6309Shitf+Enter\u952e\u6253\u5f00\u5bf9\u8bdd\u6846",
-"Rich Text Area. Press ALT-0 for help.": "\u7f16\u8f91\u533a\u3002\u6309Alt+0\u952e\u6253\u5f00\u5e2e\u52a9\u3002",
-"System Font": "\u7cfb\u7edf\u5b57\u4f53",
-"Failed to upload image: {0}": "\u56fe\u7247\u4e0a\u4f20\u5931\u8d25: {0}",
-"Failed to load plugin: {0} from url {1}": "\u63d2\u4ef6\u52a0\u8f7d\u5931\u8d25: {0} \u6765\u81ea\u94fe\u63a5 {1}",
-"Failed to load plugin url: {0}": "\u63d2\u4ef6\u52a0\u8f7d\u5931\u8d25 \u94fe\u63a5: {0}",
-"Failed to initialize plugin: {0}": "\u63d2\u4ef6\u521d\u59cb\u5316\u5931\u8d25: {0}",
-"example": "\u793a\u4f8b",
-"Search": "\u641c\u7d22",
-"All": "\u5168\u90e8",
-"Currency": "\u8d27\u5e01",
-"Text": "\u6587\u5b57",
-"Quotations": "\u5f15\u7528",
-"Mathematical": "\u6570\u5b66",
-"Extended Latin": "\u62c9\u4e01\u8bed\u6269\u5145",
-"Symbols": "\u7b26\u53f7",
-"Arrows": "\u7bad\u5934",
-"User Defined": "\u81ea\u5b9a\u4e49",
-"dollar sign": "\u7f8e\u5143\u7b26\u53f7",
-"currency sign": "\u8d27\u5e01\u7b26\u53f7",
-"euro-currency sign": "\u6b27\u5143\u7b26\u53f7",
-"colon sign": "\u5192\u53f7",
-"cruzeiro sign": "\u514b\u9c81\u8d5b\u7f57\u5e01\u7b26\u53f7",
-"french franc sign": "\u6cd5\u90ce\u7b26\u53f7",
-"lira sign": "\u91cc\u62c9\u7b26\u53f7",
-"mill sign": "\u5bc6\u5c14\u7b26\u53f7",
-"naira sign": "\u5948\u62c9\u7b26\u53f7",
-"peseta sign": "\u6bd4\u585e\u5854\u7b26\u53f7",
-"rupee sign": "\u5362\u6bd4\u7b26\u53f7",
-"won sign": "\u97e9\u5143\u7b26\u53f7",
-"new sheqel sign": "\u65b0\u8c22\u514b\u5c14\u7b26\u53f7",
-"dong sign": "\u8d8a\u5357\u76fe\u7b26\u53f7",
-"kip sign": "\u8001\u631d\u57fa\u666e\u7b26\u53f7",
-"tugrik sign": "\u56fe\u683c\u91cc\u514b\u7b26\u53f7",
-"drachma sign": "\u5fb7\u62c9\u514b\u9a6c\u7b26\u53f7",
-"german penny symbol": "\u5fb7\u56fd\u4fbf\u58eb\u7b26\u53f7",
-"peso sign": "\u6bd4\u7d22\u7b26\u53f7",
-"guarani sign": "\u74dc\u62c9\u5c3c\u7b26\u53f7",
-"austral sign": "\u6fb3\u5143\u7b26\u53f7",
-"hryvnia sign": "\u683c\u91cc\u592b\u5c3c\u4e9a\u7b26\u53f7",
-"cedi sign": "\u585e\u5730\u7b26\u53f7",
-"livre tournois sign": "\u91cc\u5f17\u5f17\u5c14\u7b26\u53f7",
-"spesmilo sign": "spesmilo\u7b26\u53f7",
-"tenge sign": "\u575a\u6208\u7b26\u53f7",
-"indian rupee sign": "\u5370\u5ea6\u5362\u6bd4",
-"turkish lira sign": "\u571f\u8033\u5176\u91cc\u62c9",
-"nordic mark sign": "\u5317\u6b27\u9a6c\u514b",
-"manat sign": "\u9a6c\u7eb3\u7279\u7b26\u53f7",
-"ruble sign": "\u5362\u5e03\u7b26\u53f7",
-"yen character": "\u65e5\u5143\u5b57\u6837",
-"yuan character": "\u4eba\u6c11\u5e01\u5143\u5b57\u6837",
-"yuan character, in hong kong and taiwan": "\u5143\u5b57\u6837\uff08\u6e2f\u53f0\u5730\u533a\uff09",
-"yen\/yuan character variant one": "\u5143\u5b57\u6837\uff08\u5927\u5199\uff09",
-"Loading emoticons...": "\u52a0\u8f7d\u8868\u60c5\u7b26\u53f7...",
-"Could not load emoticons": "\u4e0d\u80fd\u52a0\u8f7d\u8868\u60c5\u7b26\u53f7",
-"People": "\u4eba\u7c7b",
-"Animals and Nature": "\u52a8\u7269\u548c\u81ea\u7136",
-"Food and Drink": "\u98df\u7269\u548c\u996e\u54c1",
-"Activity": "\u6d3b\u52a8",
-"Travel and Places": "\u65c5\u6e38\u548c\u5730\u70b9",
-"Objects": "\u7269\u4ef6",
-"Flags": "\u65d7\u5e1c",
-"Characters": "\u5b57\u7b26",
-"Characters (no spaces)": "\u5b57\u7b26(\u65e0\u7a7a\u683c)",
-"{0} characters": "{0} \u4e2a\u5b57\u7b26",
-"Error: Form submit field collision.": "\u9519\u8bef: \u8868\u5355\u63d0\u4ea4\u5b57\u6bb5\u51b2\u7a81\u3002",
-"Error: No form element found.": "\u9519\u8bef: \u6ca1\u6709\u8868\u5355\u63a7\u4ef6\u3002",
-"Update": "\u66f4\u65b0",
-"Color swatch": "\u989c\u8272\u6837\u672c",
-"Turquoise": "\u9752\u7eff\u8272",
-"Green": "\u7eff\u8272",
-"Blue": "\u84dd\u8272",
-"Purple": "\u7d2b\u8272",
-"Navy Blue": "\u6d77\u519b\u84dd",
-"Dark Turquoise": "\u6df1\u84dd\u7eff\u8272",
-"Dark Green": "\u6df1\u7eff\u8272",
-"Medium Blue": "\u4e2d\u84dd\u8272",
-"Medium Purple": "\u4e2d\u7d2b\u8272",
-"Midnight Blue": "\u6df1\u84dd\u8272",
-"Yellow": "\u9ec4\u8272",
-"Orange": "\u6a59\u8272",
-"Red": "\u7ea2\u8272",
-"Light Gray": "\u6d45\u7070\u8272",
-"Gray": "\u7070\u8272",
-"Dark Yellow": "\u6697\u9ec4\u8272",
-"Dark Orange": "\u6df1\u6a59\u8272",
-"Dark Red": "\u6df1\u7ea2\u8272",
-"Medium Gray": "\u4e2d\u7070\u8272",
-"Dark Gray": "\u6df1\u7070\u8272",
-"Light Green": "\u6d45\u7eff\u8272",
-"Light Yellow": "\u6d45\u9ec4\u8272",
-"Light Red": "\u6d45\u7ea2\u8272",
-"Light Purple": "\u6d45\u7d2b\u8272",
-"Light Blue": "\u6d45\u84dd\u8272",
-"Dark Purple": "\u6df1\u7d2b\u8272",
-"Dark Blue": "\u6df1\u84dd\u8272",
-"Black": "\u9ed1\u8272",
-"White": "\u767d\u8272",
-"Switch to or from fullscreen mode": "\u5207\u6362\u5168\u5c4f\u6a21\u5f0f",
-"Open help dialog": "\u6253\u5f00\u5e2e\u52a9\u5bf9\u8bdd\u6846",
-"history": "\u5386\u53f2",
-"styles": "\u6837\u5f0f",
-"formatting": "\u683c\u5f0f\u5316",
-"alignment": "\u5bf9\u9f50",
-"indentation": "\u7f29\u8fdb",
-"permanent pen": "\u8bb0\u53f7\u7b14",
-"comments": "\u5907\u6ce8",
-"Format Painter": "\u683c\u5f0f\u5237",
-"Insert\/edit iframe": "\u63d2\u5165\/\u7f16\u8f91\u6846\u67b6",
-"Capitalization": "\u5927\u5199",
-"lowercase": "\u5c0f\u5199",
-"UPPERCASE": "\u5927\u5199",
-"Title Case": "\u9996\u5b57\u6bcd\u5927\u5199",
-"Permanent Pen Properties": "\u6c38\u4e45\u7b14\u5c5e\u6027",
-"Permanent pen properties...": "\u6c38\u4e45\u7b14\u5c5e\u6027...",
-"Font": "\u5b57\u4f53",
-"Size": "\u5b57\u53f7",
-"More...": "\u66f4\u591a...",
-"Spellcheck Language": "\u62fc\u5199\u68c0\u67e5\u8bed\u8a00",
-"Select...": "\u9009\u62e9...",
-"Preferences": "\u9996\u9009\u9879",
-"Yes": "\u662f",
-"No": "\u5426",
-"Keyboard Navigation": "\u952e\u76d8\u6307\u5f15",
-"Version": "\u7248\u672c",
-"Anchor": "\u951a\u70b9",
-"Special character": "\u7279\u6b8a\u7b26\u53f7",
-"Code sample": "\u4ee3\u7801\u793a\u4f8b",
-"Color": "\u989c\u8272",
-"Emoticons": "\u8868\u60c5",
-"Document properties": "\u6587\u6863\u5c5e\u6027",
-"Image": "\u56fe\u7247",
-"Insert link": "\u63d2\u5165\u94fe\u63a5",
-"Target": "\u6253\u5f00\u65b9\u5f0f",
-"Link": "\u94fe\u63a5",
-"Poster": "\u5c01\u9762",
-"Media": "\u5a92\u4f53",
-"Print": "\u6253\u5370",
-"Prev": "\u4e0a\u4e00\u4e2a",
-"Find and replace": "\u67e5\u627e\u548c\u66ff\u6362",
-"Whole words": "\u5168\u5b57\u5339\u914d",
-"Spellcheck": "\u62fc\u5199\u68c0\u67e5",
-"Caption": "\u6807\u9898",
-"Insert template": "\u63d2\u5165\u6a21\u677f"
-});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js b/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js
index f9d8b5cfd..2a784f579 100644
--- a/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js
+++ b/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js
@@ -74,7 +74,7 @@ tinymce.addI18n('zh_CN',{
 "Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u6807\u8bc6\u7b26\u5e94\u8be5\u4ee5\u5b57\u6bcd\u5f00\u5934\uff0c\u540e\u8ddf\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7834\u6298\u53f7\u3001\u70b9\u3001\u5192\u53f7\u6216\u4e0b\u5212\u7ebf\u3002",
 "You have unsaved changes are you sure you want to navigate away?": "\u4f60\u8fd8\u6709\u6587\u6863\u5c1a\u672a\u4fdd\u5b58\uff0c\u786e\u5b9a\u8981\u79bb\u5f00\uff1f",
 "Restore last draft": "\u6062\u590d\u4e0a\u6b21\u7684\u8349\u7a3f",
-"Special characters...": "\u7279\u6b8a\u5b57\u7b26...",
+"Special character...": "\u7279\u6b8a\u5b57\u7b26...",
 "Source code": "\u6e90\u4ee3\u7801",
 "Insert\/Edit code sample": "\u63d2\u5165\/\u7f16\u8f91\u4ee3\u7801\u793a\u4f8b",
 "Language": "\u8bed\u8a00",
@@ -85,6 +85,7 @@ tinymce.addI18n('zh_CN',{
 "B": "B",
 "Left to right": "\u4ece\u5de6\u5230\u53f3",
 "Right to left": "\u4ece\u53f3\u5230\u5de6",
+"Emoticons": "\u8868\u60c5",
 "Emoticons...": "\u8868\u60c5\u7b26\u53f7...",
 "Metadata and Document Properties": "\u5143\u6570\u636e\u548c\u6587\u6863\u5c5e\u6027",
 "Title": "\u6807\u9898",
@@ -113,7 +114,9 @@ tinymce.addI18n('zh_CN',{
 "Handy Shortcuts": "\u5feb\u6377\u952e",
 "Horizontal line": "\u6c34\u5e73\u5206\u5272\u7ebf",
 "Insert\/edit image": "\u63d2\u5165\/\u7f16\u8f91\u56fe\u7247",
-"Image description": "\u56fe\u7247\u63cf\u8ff0",
+"Alternative description": "\u66ff\u4ee3\u63cf\u8ff0",
+"Accessibility": "\u8f85\u52a9\u529f\u80fd",
+"Image is decorative": "\u56fe\u50cf\u662f\u88c5\u9970\u6027\u7684",
 "Source": "\u5730\u5740",
 "Dimensions": "\u5927\u5c0f",
 "Constrain proportions": "\u4fdd\u6301\u7eb5\u6a2a\u6bd4",
@@ -147,7 +150,6 @@ tinymce.addI18n('zh_CN',{
 "Back": "\u540e\u9000",
 "Insert date\/time": "\u63d2\u5165\u65e5\u671f\/\u65f6\u95f4",
 "Date\/time": "\u65e5\u671f\/\u65f6\u95f4",
-"Insert\/Edit Link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
 "Insert\/edit link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
 "Text to display": "\u663e\u793a\u6587\u5b57",
 "Url": "\u5730\u5740",
@@ -155,12 +157,14 @@ tinymce.addI18n('zh_CN',{
 "Current window": "\u5f53\u524d\u7a97\u53e3",
 "None": "\u65e0",
 "New window": "\u5728\u65b0\u7a97\u53e3\u6253\u5f00",
+"Open link": "\u6253\u5f00\u94fe\u63a5",
 "Remove link": "\u5220\u9664\u94fe\u63a5",
 "Anchors": "\u951a\u70b9",
 "Link...": "\u94fe\u63a5...",
 "Paste or type a link": "\u7c98\u8d34\u6216\u8f93\u5165\u94fe\u63a5",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u4e3a\u90ae\u4ef6\u5730\u5740\uff0c\u9700\u8981\u52a0\u4e0amailto:\u524d\u7f00\u5417\uff1f",
 "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u5c5e\u4e8e\u5916\u90e8\u94fe\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttp:\/\/:\u524d\u7f00\u5417\uff1f",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "\u60a8\u8f93\u5165\u7684 URL \u4f3c\u4e4e\u662f\u4e00\u4e2a\u5916\u90e8\u94fe\u63a5\u3002\u60a8\u60f3\u6dfb\u52a0\u6240\u9700\u7684 https:\/\/ \u524d\u7f00\u5417\uff1f",
 "Link list": "\u94fe\u63a5\u5217\u8868",
 "Insert video": "\u63d2\u5165\u89c6\u9891",
 "Insert\/edit video": "\u63d2\u5165\/\u7f16\u8f91\u89c6\u9891",
@@ -183,11 +187,15 @@ tinymce.addI18n('zh_CN',{
 "Replace all": "\u5168\u90e8\u66ff\u6362",
 "Previous": "\u4e0a\u4e00\u4e2a",
 "Next": "\u4e0b\u4e00\u4e2a",
+"Find and Replace": "\u67e5\u627e\u548c\u66ff\u6362",
 "Find and replace...": "\u67e5\u627e\u5e76\u66ff\u6362...",
 "Could not find the specified string.": "\u672a\u627e\u5230\u641c\u7d22\u5185\u5bb9.",
 "Match case": "\u533a\u5206\u5927\u5c0f\u5199",
 "Find whole words only": "\u5168\u5b57\u5339\u914d",
-"Spell check": "\u62fc\u5199\u68c0\u67e5",
+"Find in selection": "\u5728\u9009\u533a\u4e2d\u67e5\u627e",
+"Spellcheck": "\u62fc\u5199\u68c0\u67e5",
+"Spellcheck Language": "\u62fc\u5199\u68c0\u67e5\u8bed\u8a00",
+"No misspellings found.": "\u6ca1\u6709\u53d1\u73b0\u62fc\u5199\u9519\u8bef",
 "Ignore": "\u5ffd\u7565",
 "Ignore all": "\u5168\u90e8\u5ffd\u7565",
 "Finish": "\u5b8c\u6210",
@@ -218,6 +226,7 @@ tinymce.addI18n('zh_CN',{
 "Height": "\u9ad8",
 "Cell spacing": "\u5355\u5143\u683c\u5916\u95f4\u8ddd",
 "Cell padding": "\u5355\u5143\u683c\u5185\u8fb9\u8ddd",
+"Caption": "\u6807\u9898",
 "Show caption": "\u663e\u793a\u6807\u9898",
 "Left": "\u5de6\u5bf9\u9f50",
 "Center": "\u5c45\u4e2d",
@@ -251,6 +260,10 @@ tinymce.addI18n('zh_CN',{
 "Show blocks": "\u663e\u793a\u533a\u5757\u8fb9\u6846",
 "Show invisible characters": "\u663e\u793a\u4e0d\u53ef\u89c1\u5b57\u7b26",
 "Word count": "\u5b57\u6570",
+"Count": "\u8ba1\u6570",
+"Document": "\u6587\u6863",
+"Selection": "\u9009\u62e9",
+"Words": "\u5355\u8bcd",
 "Words: {0}": "\u5b57\u6570\uff1a{0}",
 "{0} words": "{0} \u5b57",
 "File": "\u6587\u4ef6",
@@ -332,6 +345,7 @@ tinymce.addI18n('zh_CN',{
 "Flags": "\u65d7\u5e1c",
 "Characters": "\u5b57\u7b26",
 "Characters (no spaces)": "\u5b57\u7b26(\u65e0\u7a7a\u683c)",
+"{0} characters": "{0} \u4e2a\u5b57\u7b26",
 "Error: Form submit field collision.": "\u9519\u8bef: \u8868\u5355\u63d0\u4ea4\u5b57\u6bb5\u51b2\u7a81\u3002",
 "Error: No form element found.": "\u9519\u8bef: \u6ca1\u6709\u8868\u5355\u63a7\u4ef6\u3002",
 "Update": "\u66f4\u65b0",
@@ -356,6 +370,13 @@ tinymce.addI18n('zh_CN',{
 "Dark Red": "\u6df1\u7ea2\u8272",
 "Medium Gray": "\u4e2d\u7070\u8272",
 "Dark Gray": "\u6df1\u7070\u8272",
+"Light Green": "\u6d45\u7eff\u8272",
+"Light Yellow": "\u6d45\u9ec4\u8272",
+"Light Red": "\u6d45\u7ea2\u8272",
+"Light Purple": "\u6d45\u7d2b\u8272",
+"Light Blue": "\u6d45\u84dd\u8272",
+"Dark Purple": "\u6df1\u7d2b\u8272",
+"Dark Blue": "\u6df1\u84dd\u8272",
 "Black": "\u9ed1\u8272",
 "White": "\u767d\u8272",
 "Switch to or from fullscreen mode": "\u5207\u6362\u5168\u5c4f\u6a21\u5f0f",
@@ -365,14 +386,68 @@ tinymce.addI18n('zh_CN',{
 "formatting": "\u683c\u5f0f\u5316",
 "alignment": "\u5bf9\u9f50",
 "indentation": "\u7f29\u8fdb",
-"permanent pen": "\u8bb0\u53f7\u7b14",
+"Font": "\u5b57\u4f53",
+"Size": "\u5b57\u53f7",
+"More...": "\u66f4\u591a...",
+"Select...": "\u9009\u62e9...",
+"Preferences": "\u9996\u9009\u9879",
+"Yes": "\u662f",
+"No": "\u5426",
+"Keyboard Navigation": "\u952e\u76d8\u6307\u5f15",
+"Version": "\u7248\u672c",
+"Code view": "\u4ee3\u7801\u89c6\u56fe",
+"Open popup menu for split buttons": "\u6253\u5f00\u5f39\u51fa\u5f0f\u83dc\u5355\uff0c\u7528\u4e8e\u62c6\u5206\u6309\u94ae",
+"List Properties": "\u5217\u8868\u5c5e\u6027",
+"List properties...": "\u6807\u9898\u5b57\u4f53\u5c5e\u6027",
+"Start list at number": "\u4ee5\u6570\u5b57\u5f00\u59cb\u5217\u8868",
+"Line height": "\u884c\u9ad8",
 "comments": "\u5907\u6ce8",
+"Format Painter": "\u683c\u5f0f\u5237",
+"Insert\/edit iframe": "\u63d2\u5165\/\u7f16\u8f91\u6846\u67b6",
+"Capitalization": "\u5927\u5199",
+"lowercase": "\u5c0f\u5199",
+"UPPERCASE": "\u5927\u5199",
+"Title Case": "\u9996\u5b57\u6bcd\u5927\u5199",
+"permanent pen": "\u8bb0\u53f7\u7b14",
+"Permanent Pen Properties": "\u6c38\u4e45\u7b14\u5c5e\u6027",
+"Permanent pen properties...": "\u6c38\u4e45\u7b14\u5c5e\u6027...",
+"case change": "\u6848\u4f8b\u66f4\u6539",
+"page embed": "\u9875\u9762\u5d4c\u5165",
+"Advanced sort...": "\u9ad8\u7ea7\u6392\u5e8f...",
+"Advanced Sort": "\u9ad8\u7ea7\u6392\u5e8f",
+"Sort table by column ascending": "\u6309\u5217\u5347\u5e8f\u8868",
+"Sort table by column descending": "\u6309\u5217\u964d\u5e8f\u8868",
+"Sort": "\u6392\u5e8f",
+"Order": "\u6392\u5e8f",
+"Sort by": "\u6392\u5e8f\u65b9\u5f0f",
+"Ascending": "\u5347\u5e8f",
+"Descending": "\u964d\u5e8f",
+"Column {0}": "\u5217{0}",
+"Row {0}": "\u884c{0}",
+"Spellcheck...": "\u62fc\u5199\u68c0\u67e5...",
+"Misspelled word": "\u62fc\u5199\u9519\u8bef\u7684\u5355\u8bcd",
+"Suggestions": "\u5efa\u8bae",
+"Change": "\u66f4\u6539",
+"Finding word suggestions": "\u67e5\u627e\u5355\u8bcd\u5efa\u8bae",
+"Success": "\u6210\u529f",
+"Repair": "\u4fee\u590d",
+"Issue {0} of {1}": "\u5171\u8ba1{1}\u95ee\u9898{0}",
+"Images must be marked as decorative or have an alternative text description": "\u56fe\u50cf\u5fc5\u987b\u6807\u8bb0\u4e3a\u88c5\u9970\u6027\u6216\u5177\u6709\u66ff\u4ee3\u6587\u672c\u63cf\u8ff0",
+"Images must have an alternative text description. Decorative images are not allowed.": "\u56fe\u50cf\u5fc5\u987b\u5177\u6709\u66ff\u4ee3\u6587\u672c\u63cf\u8ff0\u3002\u4e0d\u5141\u8bb8\u4f7f\u7528\u88c5\u9970\u56fe\u50cf\u3002",
+"Or provide alternative text:": "\u6216\u63d0\u4f9b\u5907\u9009\u6587\u672c\uff1a",
+"Make image decorative:": "\u4f7f\u56fe\u50cf\u88c5\u9970\uff1a",
+"ID attribute must be unique": "ID \u5c5e\u6027\u5fc5\u987b\u662f\u552f\u4e00\u7684",
+"Make ID unique": "\u4f7f ID \u72ec\u4e00\u65e0\u4e8c",
+"Keep this ID and remove all others": "\u4fdd\u7559\u6b64 ID \u5e76\u5220\u9664\u6240\u6709\u5176\u4ed6",
+"Remove this ID": "\u5220\u9664\u6b64 ID",
+"Remove all IDs": "\u6e05\u9664\u5168\u90e8IDs",
+"Checklist": "\u6e05\u5355",
 "Anchor": "\u951a\u70b9",
 "Special character": "\u7279\u6b8a\u7b26\u53f7",
 "Code sample": "\u4ee3\u7801\u793a\u4f8b",
 "Color": "\u989c\u8272",
-"Emoticons": "\u8868\u60c5",
 "Document properties": "\u6587\u6863\u5c5e\u6027",
+"Image description": "\u56fe\u7247\u63cf\u8ff0",
 "Image": "\u56fe\u7247",
 "Insert link": "\u63d2\u5165\u94fe\u63a5",
 "Target": "\u6253\u5f00\u65b9\u5f0f",
@@ -383,7 +458,5 @@ tinymce.addI18n('zh_CN',{
 "Prev": "\u4e0a\u4e00\u4e2a",
 "Find and replace": "\u67e5\u627e\u548c\u66ff\u6362",
 "Whole words": "\u5168\u5b57\u5339\u914d",
-"Spellcheck": "\u62fc\u5199\u68c0\u67e5",
-"Caption": "\u6807\u9898",
 "Insert template": "\u63d2\u5165\u6a21\u677f"
 });
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/plugins/code/plugin.min.js b/cps/static/js/libs/tinymce/plugins/code/plugin.min.js
new file mode 100644
index 000000000..d83339a21
--- /dev/null
+++ b/cps/static/js/libs/tinymce/plugins/code/plugin.min.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ *
+ * Version: 5.10.0 (2021-10-11)
+ */
+!function(){"use strict";tinymce.util.Tools.resolve("tinymce.PluginManager").add("code",function(e){var t,o;function n(){return o.execCommand("mceCodeEditor")}return(t=e).addCommand("mceCodeEditor",function(){var n,e;e=(n=t).getContent({source_view:!0}),n.windowManager.open({title:"Source Code",size:"large",body:{type:"panel",items:[{type:"textarea",name:"code"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:{code:e},onSubmit:function(e){var t=n,o=e.getData().code;t.focus(),t.undoManager.transact(function(){t.setContent(o)}),t.selection.setCursorLocation(),t.nodeChanged(),e.close()}})}),(o=e).ui.registry.addButton("code",{icon:"sourcecode",tooltip:"Source code",onAction:n}),o.ui.registry.addMenuItem("code",{icon:"sourcecode",text:"Source code",onAction:n}),{}})}();
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/skins/content/dark/content.min.css b/cps/static/js/libs/tinymce/skins/content/dark/content.min.css
deleted file mode 100644
index 07d40c265..000000000
--- a/cps/static/js/libs/tinymce/skins/content/dark/content.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-body{background-color:#2f3742;color:#dfe0e4;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}a{color:#4099ff}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border="0"]):not([style*=border-width]) td,table[border]:not([border="0"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border="0"]):not([style*=border-style]) td,table[border]:not([border="0"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border="0"]):not([style*=border-color]) td,table[border]:not([border="0"]):not([style*=border-color]) th{border-color:#6d737b}figure{display:table;margin:1rem auto}figure figcaption{color:#8a8f97;display:block;margin-top:.25rem;text-align:center}hr{border-color:#6d737b;border-style:solid;border-width:1px 0 0 0}code{background-color:#6d737b;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #6d737b;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #6d737b;margin-right:1.5rem;padding-right:1rem}
diff --git a/cps/static/js/libs/tinymce/skins/content/document/content.min.css b/cps/static/js/libs/tinymce/skins/content/document/content.min.css
deleted file mode 100644
index a1feef4c1..000000000
--- a/cps/static/js/libs/tinymce/skins/content/document/content.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-@media screen{html{background:#f4f4f4;min-height:100%}}body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif}@media screen{body{background-color:#fff;box-shadow:0 0 4px rgba(0,0,0,.15);box-sizing:border-box;margin:1rem auto 0;max-width:820px;min-height:calc(100vh - 1rem);padding:4rem 6rem 6rem 6rem}}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border="0"]):not([style*=border-width]) td,table[border]:not([border="0"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border="0"]):not([style*=border-style]) td,table[border]:not([border="0"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border="0"]):not([style*=border-color]) td,table[border]:not([border="0"]):not([style*=border-color]) th{border-color:#ccc}figure figcaption{color:#999;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}
diff --git a/cps/static/js/libs/tinymce/skins/content/writer/content.min.css b/cps/static/js/libs/tinymce/skins/content/writer/content.min.css
deleted file mode 100644
index 0d8f5d340..000000000
--- a/cps/static/js/libs/tinymce/skins/content/writer/content.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem auto;max-width:900px}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border="0"]):not([style*=border-width]) td,table[border]:not([border="0"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border="0"]):not([style*=border-style]) td,table[border]:not([border="0"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border="0"]):not([style*=border-color]) td,table[border]:not([border="0"]):not([style*=border-color]) th{border-color:#ccc}figure{display:table;margin:1rem auto}figure figcaption{color:#999;display:block;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}code{background-color:#e8e8e8;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css b/cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css
deleted file mode 100755
index db4868a0d..000000000
--- a/cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-content-body a[data-mce-selected],.mce-content-body code[data-mce-selected]{background:#bfe6ff}.mce-content-body hr{cursor:default}.mce-content-body{line-height:1.3}
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/content.min.css b/cps/static/js/libs/tinymce/skins/lightgray/content.min.css
deleted file mode 100755
index cfbfe204e..000000000
--- a/cps/static/js/libs/tinymce/skins/lightgray/content.min.css
+++ /dev/null
@@ -1 +0,0 @@
-body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;line-height:1.3;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-content-body a[data-mce-selected],.mce-content-body code[data-mce-selected]{background:#bfe6ff}.mce-content-body hr{cursor:default}
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.eot b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.eot
deleted file mode 100755
index b144ba0bd949de3c0f87abdd78b517067169884f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9492
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
a@gt-tewA|!qxK@v&x`Qu4XoB(um1(SgK0(p

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg
deleted file mode 100755
index b4ee6f408..000000000
--- a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
-<defs>
-<font id="tinymce-small" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe000;" glyph-name="save" d="M960 80v591.938l-223.938 224.062h-592.062c-44.182 0-80-35.816-80-80v-736c0-44.184 35.818-80 80-80h736c44.184 0 80 35.816 80 80zM576 768h64v-192h-64v192zM704 128h-384v255.882c0.034 0.042 0.076 0.082 0.116 0.118h383.77c0.040-0.036 0.082-0.076 0.116-0.118l-0.002-255.882zM832 128h-64v256c0 35.2-28.8 64-64 64h-384c-35.2 0-64-28.8-64-64v-256h-64v640h64v-192c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v171.010l128-128.072v-490.938z" />
-<glyph unicode="&#xe001;" glyph-name="newdocument" d="M850.746 717.254l-133.492 133.49c-24.888 24.892-74.054 45.256-109.254 45.256h-416c-35.2 0-64-28.8-64-64v-768c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v544c0 35.2-20.366 84.364-45.254 109.254zM805.49 672.002c6.792-6.796 13.792-19.162 18.894-32.002h-184.384v184.386c12.84-5.1 25.204-12.1 32-18.896l133.49-133.488zM831.884 64h-639.77c-0.040 0.034-0.082 0.076-0.114 0.116v767.77c0.034 0.040 0.076 0.082 0.114 0.114h383.886v-256h256v-511.884c-0.034-0.040-0.076-0.082-0.116-0.116z" />
-<glyph unicode="&#xe002;" glyph-name="fullpage" d="M1024 367.542v160.916l-159.144 15.914c-8.186 30.042-20.088 58.548-35.21 84.98l104.596 127.838-113.052 113.050-127.836-104.596c-26.434 15.124-54.942 27.026-84.982 35.208l-15.914 159.148h-160.916l-15.914-159.146c-30.042-8.186-58.548-20.086-84.98-35.208l-127.838 104.594-113.050-113.050 104.596-127.836c-15.124-26.432-27.026-54.94-35.21-84.98l-159.146-15.916v-160.916l159.146-15.914c8.186-30.042 20.086-58.548 35.21-84.982l-104.596-127.836 113.048-113.048 127.838 104.596c26.432-15.124 54.94-27.028 84.98-35.21l15.916-159.148h160.916l15.914 159.144c30.042 8.186 58.548 20.088 84.982 35.21l127.836-104.596 113.048 113.048-104.596 127.836c15.124 26.434 27.028 54.942 35.21 84.98l159.148 15.92zM704 384l-128-128h-128l-128 128v128l128 128h128l128-128v-128z" />
-<glyph unicode="&#xe003;" glyph-name="alignleft" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM64 576h576v-128h-576zM64 192h576v-128h-576z" />
-<glyph unicode="&#xe004;" glyph-name="aligncenter" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM256 576h512v-128h-512zM256 192h512v-128h-512z" />
-<glyph unicode="&#xe005;" glyph-name="alignright" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM384 576h576v-128h-576zM384 192h576v-128h-576z" />
-<glyph unicode="&#xe006;" glyph-name="alignjustify" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM64 576h896v-128h-896zM64 192h896v-128h-896z" />
-<glyph unicode="&#xe007;" glyph-name="cut" d="M864.408 289.868c-46.47 46.47-106.938 68.004-161.082 62.806l-63.326 63.326 192 192c0 0 128 128 0 256l-320-320-320 320c-128-128 0-256 0-256l192-192-63.326-63.326c-54.144 5.198-114.61-16.338-161.080-62.806-74.98-74.98-85.112-186.418-22.626-248.9 62.482-62.482 173.92-52.354 248.9 22.626 46.47 46.468 68.002 106.938 62.806 161.080l63.326 63.326 63.328-63.328c-5.196-54.144 16.336-114.61 62.806-161.078 74.978-74.98 186.418-85.112 248.898-22.626 62.488 62.482 52.356 173.918-22.624 248.9zM353.124 201.422c-2.212-24.332-15.020-49.826-35.14-69.946-22.212-22.214-51.080-35.476-77.218-35.476-10.524 0-25.298 2.228-35.916 12.848-21.406 21.404-17.376 73.132 22.626 113.136 22.212 22.214 51.080 35.476 77.218 35.476 10.524 0 25.298-2.228 35.916-12.848 13.112-13.11 13.47-32.688 12.514-43.19zM512 352c-35.346 0-64 28.654-64 64s28.654 64 64 64 64-28.654 64-64-28.654-64-64-64zM819.152 108.848c-10.62-10.62-25.392-12.848-35.916-12.848-26.138 0-55.006 13.262-77.218 35.476-20.122 20.12-32.928 45.614-35.138 69.946-0.958 10.502-0.6 30.080 12.514 43.192 10.618 10.622 25.39 12.848 35.916 12.848 26.136 0 55.006-13.262 77.216-35.474 40.004-40.008 44.032-91.736 22.626-113.14z" />
-<glyph unicode="&#xe008;" glyph-name="paste" d="M704 576v160c0 17.6-14.4 32-32 32h-160v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-160c-17.602 0-32-14.4-32-32v-512c0-17.6 14.398-32 32-32h224v-192h384l192 192v384h-192zM320 831.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 640v64h384v-64h-384zM704 90.51v101.49h101.49l-101.49-101.49zM832 256h-192v-192h-256v448h448v-256z" />
-<glyph unicode="&#xe009;" glyph-name="searchreplace" d="M888 576h-56v256h64v64h-320v-64h64v-256h-256v256h64v64h-320v-64h64v-256h-56c-39.6 0-72-32.4-72-72v-432c0-39.6 32.4-72 72-72h240c39.6 0 72 32.4 72 72v312h128v-312c0-39.6 32.4-72 72-72h240c39.6 0 72 32.4 72 72v432c0 39.6-32.4 72-72 72zM348 64h-184c-19.8 0-36 14.4-36 32s16.2 32 36 32h184c19.8 0 36-14.4 36-32s-16.2-32-36-32zM544 448h-64c-17.6 0-32 14.4-32 32s14.4 32 32 32h64c17.6 0 32-14.4 32-32s-14.4-32-32-32zM860 64h-184c-19.8 0-36 14.4-36 32s16.2 32 36 32h184c19.8 0 36-14.4 36-32s-16.2-32-36-32z" />
-<glyph unicode="&#xe00a;" glyph-name="bullist" d="M384 832h576v-128h-576zM384 512h576v-128h-576zM384 192h576v-128h-576zM128 768c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM128 448c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM128 128c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64z" />
-<glyph unicode="&#xe00b;" glyph-name="numlist" d="M384 832h576v-128h-576zM384 512h576v-128h-576zM384 192h576v-128h-576zM320 430v146h-64v320h-128v-64h64v-256h-64v-64h128v-50l-128-60v-146h128v-64h-128v-64h128v-64h-128v-64h192v320h-128v50z" />
-<glyph unicode="&#xe00c;" glyph-name="indent" d="M64 768h896v-128h-896zM384 384h576v-128h-576zM384 576h576v-128h-576zM64 192h896v-128h-896zM64 576l224-160-224-160z" />
-<glyph unicode="&#xe00d;" glyph-name="outdent" d="M64 768h896v-128h-896zM64 384h576v-128h-576zM64 576h576v-128h-576zM64 192h896v-128h-896zM960 576l-224-160 224-160z" />
-<glyph unicode="&#xe00e;" glyph-name="blockquote" d="M256.428 535.274c105.8 0 191.572-91.17 191.572-203.638 0-112.464-85.772-203.636-191.572-203.636-105.802 0-191.572 91.17-191.572 203.636l-0.856 29.092c0 224.93 171.54 407.272 383.144 407.272v-116.364c-73.1 0-141.826-30.26-193.516-85.204-9.954-10.578-19.034-21.834-27.224-33.656 9.784 1.64 19.806 2.498 30.024 2.498zM768.428 535.274c105.8 0 191.572-91.17 191.572-203.638 0-112.464-85.772-203.636-191.572-203.636-105.802 0-191.572 91.17-191.572 203.636l-0.856 29.092c0 224.93 171.54 407.272 383.144 407.272v-116.364c-73.1 0-141.826-30.26-193.516-85.204-9.956-10.578-19.036-21.834-27.224-33.656 9.784 1.64 19.806 2.498 30.024 2.498z" />
-<glyph unicode="&#xe00f;" glyph-name="undo" d="M704 0c59 199 134.906 455.266-256 446.096v-222.096l-336.002 336 336.002 336v-217.326c468.092 12.2 544-358.674 256-678.674z" />
-<glyph unicode="&#xe010;" glyph-name="redo" d="M576 678.674v217.326l336.002-336-336.002-336v222.096c-390.906 9.17-315-247.096-256-446.096-288 320-212.092 690.874 256 678.674z" />
-<glyph unicode="&#xe011;" glyph-name="unlink" d="M927.274 729.784l-133.49 133.488c-21.104 21.104-49.232 32.728-79.198 32.728s-58.094-11.624-79.196-32.726l-165.492-165.49c-43.668-43.668-43.668-114.724 0-158.392l2.746-2.746 67.882 67.882-2.746 2.746c-6.132 6.132-6.132 16.494 0 22.626l165.492 165.492c4.010 4.008 8.808 4.608 11.312 4.608s7.302-0.598 11.312-4.61l133.49-133.488c6.132-6.134 6.132-16.498 0.002-22.628l-165.494-165.494c-4.008-4.008-8.806-4.608-11.31-4.608s-7.302 0.6-11.312 4.612l-2.746 2.746-67.88-67.884 2.742-2.742c21.106-21.108 49.23-32.728 79.2-32.728s58.094 11.624 79.196 32.726l165.494 165.492c43.662 43.666 43.662 114.72-0.004 158.39zM551.356 359.356l-67.882-67.882 2.746-2.746c4.008-4.008 4.61-8.806 4.61-11.31 0-2.506-0.598-7.302-4.606-11.314l-165.494-165.49c-4.010-4.010-8.81-4.61-11.314-4.61s-7.304 0.6-11.314 4.61l-133.492 133.486c-4.010 4.010-4.61 8.81-4.61 11.314s0.598 7.3 4.61 11.312l165.49 165.488c4.010 4.012 8.81 4.612 11.314 4.612s7.304-0.6 11.314-4.612l2.746-2.742 67.882 67.88-2.746 2.746c-21.104 21.104-49.23 32.726-79.196 32.726s-58.092-11.624-79.196-32.726l-165.488-165.486c-21.106-21.104-32.73-49.234-32.73-79.198s11.624-58.094 32.726-79.198l133.49-133.49c21.106-21.102 49.232-32.726 79.198-32.726s58.092 11.624 79.196 32.726l165.494 165.492c21.104 21.104 32.722 49.23 32.722 79.196s-11.624 58.094-32.726 79.196l-2.744 2.746zM352 250c-9.724 0-19.45 3.71-26.87 11.128-14.84 14.84-14.84 38.898 0 53.738l320 320c14.84 14.84 38.896 14.84 53.736 0 14.844-14.84 14.844-38.9 0-53.74l-320-320c-7.416-7.416-17.142-11.126-26.866-11.126z" />
-<glyph unicode="&#xe012;" glyph-name="link" d="M927.274 729.784l-133.49 133.488c-21.104 21.104-49.232 32.728-79.198 32.728s-58.094-11.624-79.196-32.726l-165.492-165.49c-43.668-43.668-43.668-114.724 0-158.392l2.746-2.746 67.882 67.882-2.746 2.746c-6.132 6.132-6.132 16.494 0 22.626l165.492 165.492c4.010 4.008 8.808 4.608 11.312 4.608s7.302-0.598 11.312-4.61l133.49-133.488c6.132-6.134 6.132-16.498 0.002-22.628l-165.494-165.494c-4.008-4.008-8.806-4.608-11.31-4.608s-7.302 0.6-11.312 4.612l-2.746 2.746-67.88-67.884 2.742-2.742c21.106-21.108 49.23-32.728 79.2-32.728s58.094 11.624 79.196 32.726l165.494 165.492c43.662 43.666 43.662 114.72-0.004 158.39zM551.356 359.356l-67.882-67.882 2.746-2.746c4.008-4.008 4.61-8.806 4.61-11.31 0-2.506-0.598-7.302-4.606-11.314l-165.494-165.49c-4.010-4.010-8.81-4.61-11.314-4.61s-7.304 0.6-11.314 4.61l-133.492 133.486c-4.010 4.010-4.61 8.81-4.61 11.314s0.598 7.3 4.61 11.312l165.49 165.488c4.010 4.012 8.81 4.612 11.314 4.612s7.304-0.6 11.314-4.612l2.746-2.742 67.882 67.88-2.746 2.746c-21.104 21.104-49.23 32.726-79.196 32.726s-58.092-11.624-79.196-32.726l-165.488-165.486c-21.106-21.104-32.73-49.234-32.73-79.198s11.624-58.094 32.726-79.198l133.49-133.49c21.106-21.102 49.232-32.726 79.198-32.726s58.092 11.624 79.196 32.726l165.494 165.492c21.104 21.104 32.722 49.23 32.722 79.196s-11.624 58.094-32.726 79.196l-2.744 2.746zM800 122c-9.724 0-19.45 3.708-26.87 11.13l-128 127.998c-14.844 14.84-14.844 38.898 0 53.738 14.84 14.844 38.896 14.844 53.736 0l128-128c14.844-14.84 14.844-38.896 0-53.736-7.416-7.422-17.142-11.13-26.866-11.13zM608 0c-17.674 0-32 14.326-32 32v128c0 17.674 14.326 32 32 32s32-14.326 32-32v-128c0-17.674-14.326-32-32-32zM928 320h-128c-17.674 0-32 14.326-32 32s14.326 32 32 32h128c17.674 0 32-14.326 32-32s-14.326-32-32-32zM224 774c9.724 0 19.45-3.708 26.87-11.13l128-128c14.842-14.84 14.842-38.898 0-53.738-14.84-14.844-38.898-14.844-53.738 0l-128 128c-14.842 14.84-14.842 38.898 0 53.738 7.418 7.422 17.144 11.13 26.868 11.13zM416 896c17.674 0 32-14.326 32-32v-128c0-17.674-14.326-32-32-32s-32 14.326-32 32v128c0 17.674 14.326 32 32 32zM96 576h128c17.674 0 32-14.326 32-32s-14.326-32-32-32h-128c-17.674 0-32 14.326-32 32s14.326 32 32 32z" />
-<glyph unicode="&#xe013;" glyph-name="bookmark" d="M256 896v-896l256 256 256-256v896h-512zM704 170.51l-192 192-192-192v661.49h384v-661.49z" />
-<glyph unicode="&#xe014;" glyph-name="image" d="M896 832h-768c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64v640c0 35.2-28.8 64-64 64zM896 128.116c-0.012-0.014-0.030-0.028-0.042-0.042l-191.958 319.926-160-128-224 288-191.968-479.916c-0.010 0.010-0.022 0.022-0.032 0.032v639.77c0.034 0.040 0.076 0.082 0.114 0.114h767.77c0.040-0.034 0.082-0.076 0.116-0.116v-639.768zM640 608c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96s-96-42.981-96-96z" />
-<glyph unicode="&#xe015;" glyph-name="media" d="M896 832h-768c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64v640c0 35.2-28.8 64-64 64zM256 128h-128v128h128v-128zM256 384h-128v128h128v-128zM256 640h-128v128h128v-128zM704 128h-384v640h384v-640zM896 128h-128v128h128v-128zM896 384h-128v128h128v-128zM896 640h-128v128h128v-128zM384 640v-384l288 192z" />
-<glyph unicode="&#xe016;" glyph-name="help" d="M448 256h128v-128h-128v128zM704 704c35.346 0 64-28.654 64-64v-166l-228-154h-92v64l192 128v64h-320v128h384zM512 896c-119.666 0-232.166-46.6-316.784-131.216-84.614-84.618-131.216-197.118-131.216-316.784 0-119.664 46.602-232.168 131.216-316.784 84.618-84.616 197.118-131.216 316.784-131.216 119.664 0 232.168 46.6 316.784 131.216s131.216 197.12 131.216 316.784c0 119.666-46.6 232.166-131.216 316.784-84.616 84.616-197.12 131.216-316.784 131.216z" />
-<glyph unicode="&#xe017;" glyph-name="code" d="M416 256l-192 192 192 192-64 64-256-256 256-256zM672 704l-64-64 192-192-192-192 64-64 256 256z" />
-<glyph unicode="&#xe018;" glyph-name="insertdatetime" d="M77.798 655.376l81.414-50.882c50.802 81.114 128.788 143.454 221.208 174.246l-30.366 91.094c-113.748-37.898-209.728-114.626-272.256-214.458zM673.946 869.834l-30.366-91.094c92.422-30.792 170.404-93.132 221.208-174.248l81.412 50.882c-62.526 99.834-158.506 176.562-272.254 214.46zM607.974 255.992c-4.808 0-9.692 1.090-14.286 3.386l-145.688 72.844v211.778c0 17.672 14.328 32 32 32s32-14.328 32-32v-172.222l110.31-55.156c15.806-7.902 22.214-27.124 14.31-42.932-5.604-11.214-16.908-17.696-28.646-17.698zM512 768c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384s-171.922 384-384 384zM512 96c-159.058 0-288 128.942-288 288s128.942 288 288 288c159.058 0 288-128.942 288-288s-128.942-288-288-288z" />
-<glyph unicode="&#xe019;" glyph-name="preview" d="M64 504.254c45.318 49.92 97.162 92.36 153.272 125.124 90.332 52.744 192.246 80.622 294.728 80.622 102.48 0 204.396-27.878 294.726-80.624 56.112-32.764 107.956-75.204 153.274-125.124v117.432c-33.010 28.118-68.124 53.14-104.868 74.594-105.006 61.314-223.658 93.722-343.132 93.722s-238.128-32.408-343.134-93.72c-36.742-21.454-71.856-46.478-104.866-74.596v-117.43zM512 640c-183.196 0-345.838-100.556-448-256 102.162-155.448 264.804-256 448-256s345.838 100.552 448 256c-102.162 155.444-264.804 256-448 256zM512 448c0-35.346-28.654-64-64-64s-64 28.654-64 64c0 35.348 28.654 64 64 64s64-28.652 64-64zM728.066 263.338c-67.434-39.374-140.128-59.338-216.066-59.338s-148.632 19.964-216.066 59.338c-51.554 30.104-98.616 71.31-138.114 120.662 39.498 49.35 86.56 90.558 138.116 120.66 13.276 7.752 26.758 14.74 40.426 20.982-10.512-23.742-16.362-50.008-16.362-77.642 0-106.040 85.962-192 192-192 106.040 0 192 85.96 192 192 0 27.634-5.85 53.9-16.36 77.642 13.668-6.244 27.15-13.23 40.426-20.982 51.554-30.102 98.616-71.31 138.116-120.66-39.498-49.352-86.56-90.558-138.116-120.662z" />
-<glyph unicode="&#xe01a;" glyph-name="forecolor" d="M651.168 676.166c-24.612 81.962-28.876 91.834-107.168 91.834h-64c-79.618 0-82.664-10.152-108.418-96 0-0.002 0-0.002-0.002-0.004l-143.998-479.996h113.636l57.6 192h226.366l57.6-192h113.63l-145.246 484.166zM437.218 512l38.4 136c10.086 33.618 36.38 30 36.38 30s26.294 3.618 36.38-30h0.004l38.4-136h-149.564z" />
-<glyph unicode="&#xe01b;" glyph-name="table" d="M64 768v-704h896v704h-896zM384 320v128h256v-128h-256zM640 256v-128h-256v128h256zM640 640v-128h-256v128h256zM320 640v-128h-192v128h192zM128 448h192v-128h-192v128zM704 448h192v-128h-192v128zM704 512v128h192v-128h-192zM128 256h192v-128h-192v128zM704 128v128h192v-128h-192z" />
-<glyph unicode="&#xe01c;" glyph-name="hr" d="M64 512h896v-128h-896z" />
-<glyph unicode="&#xe01d;" glyph-name="removeformat" d="M64 192h512v-128h-512v128zM768 768h-220.558l-183.766-512h-132.288l183.762 512h-223.15v128h576v-128zM929.774 64l-129.774 129.774-129.774-129.774-62.226 62.226 129.774 129.774-129.774 129.774 62.226 62.226 129.774-129.774 129.774 129.774 62.226-62.226-129.774-129.774 129.774-129.774-62.226-62.226z" />
-<glyph unicode="&#xe01e;" glyph-name="subscript" d="M768 50v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
-<glyph unicode="&#xe01f;" glyph-name="superscript" d="M768 754v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
-<glyph unicode="&#xe020;" glyph-name="charmap" d="M704 128v37.004c151.348 61.628 256 193.82 256 346.996 0 212.078-200.576 384-448 384s-448-171.922-448-384c0-153.176 104.654-285.368 256-346.996v-37.004h-192l-64 96v-224h320v222.812c-100.9 51.362-170.666 161.54-170.666 289.188 0 176.732 133.718 320 298.666 320s298.666-143.268 298.666-320c0-127.648-69.766-237.826-170.666-289.188v-222.812h320v224l-64-96h-192z" />
-<glyph unicode="&#xe021;" glyph-name="emoticons" d="M512 820c99.366 0 192.782-38.694 263.042-108.956s108.958-163.678 108.958-263.044-38.696-192.782-108.958-263.042-163.676-108.958-263.042-108.958-192.782 38.696-263.044 108.958-108.956 163.676-108.956 263.042 38.694 192.782 108.956 263.044 163.678 108.956 263.044 108.956zM512 896c-247.424 0-448-200.576-448-448s200.576-448 448-448 448 200.576 448 448-200.576 448-448 448v0zM320 576c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM576 576c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM512 304c-101.84 0-192.56 36.874-251.166 94.328 23.126-117.608 126.778-206.328 251.166-206.328s228.040 88.72 251.168 206.328c-58.608-57.454-149.328-94.328-251.168-94.328z" />
-<glyph unicode="&#xe022;" glyph-name="print" d="M256 832h512v-128h-512v128zM896 640h-768c-35.2 0-64-28.8-64-64v-256c0-35.2 28.796-64 64-64h128v-192h512v192h128c35.2 0 64 28.8 64 64v256c0 35.2-28.8 64-64 64zM704 128h-384v256h384v-256zM910.4 544c0-25.626-20.774-46.4-46.398-46.4s-46.402 20.774-46.402 46.4 20.778 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
-<glyph unicode="&#xe023;" glyph-name="fullscreen" d="M480 576l-192 192 128 128h-352v-352l128 128 192-192zM640 480l192 192 128-128v352h-352l128-128-192-192zM544 320l192-192-128-128h352v352l-128-128-192 192zM384 416l-192-192-128 128v-352h352l-128 128 192 192z" />
-<glyph unicode="&#xe024;" glyph-name="spellcheck" d="M960 832v64h-192c-35.202 0-64-28.8-64-64v-320c0-15.856 5.858-30.402 15.496-41.614l-303.496-260.386-142 148-82-70 224-288 416 448h128v64h-192v320h192zM256 448h64v384c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-384h64v192h128v-192zM128 704v128h128v-128h-128zM640 512v96c0 35.2-8.8 64-44 64 35.2 0 44 28.8 44 64v96c0 35.2-28.8 64-64 64h-192v-448h192c35.2 0 64 28.8 64 64zM448 832h128v-128h-128v128zM448 640h128v-128h-128v128z" />
-<glyph unicode="&#xe025;" glyph-name="nonbreaking" d="M448 448h-128v128h128v128h128v-128h128v-128h-128v-128h-128v128zM960 384v-320h-896v320h128v-192h640v192h128z" />
-<glyph unicode="&#xe026;" glyph-name="template" d="M512 576h128v-64h-128zM512 192h128v-64h-128zM576 384h128v-64h-128zM768 384v-192h-64v-64h128v256zM384 384h128v-64h-128zM320 192h128v-64h-128zM320 576h128v-64h-128zM192 768v-256h64v192h64v64zM704 512h128v256h-64v-192h-64zM64 896v-896h896v896h-896zM896 64h-768v768h768v-768zM192 384v-256h64v192h64v64zM576 768h128v-64h-128zM384 768h128v-64h-128z" />
-<glyph unicode="&#xe027;" glyph-name="pagebreak" d="M816 896l16-384h-640l16 384h32l16-320h512l16 320h32zM208 0l-16 320h640l-16-320h-32l-16 256h-512l-16-256h-32zM64 448h128v-64h-128zM256 448h128v-64h-128zM448 448h128v-64h-128zM640 448h128v-64h-128zM832 448h128v-64h-128z" />
-<glyph unicode="&#xe028;" glyph-name="restoredraft" d="M576 896c247.424 0 448-200.576 448-448s-200.576-448-448-448v96c94.024 0 182.418 36.614 248.902 103.098s103.098 154.878 103.098 248.902c0 94.022-36.614 182.418-103.098 248.902s-154.878 103.098-248.902 103.098c-94.022 0-182.418-36.614-248.902-103.098-51.14-51.138-84.582-115.246-97.306-184.902h186.208l-224-256-224 256h164.57c31.060 217.102 217.738 384 443.43 384zM768 512v-128h-256v320h128v-192z" />
-<glyph unicode="&#xe02a;" glyph-name="bold" d="M625.442 465.818c48.074 38.15 78.558 94.856 78.558 158.182 0 114.876-100.29 208-224 208h-224v-768h288c123.712 0 224 93.124 224 208 0 88.196-59.118 163.562-142.558 193.818zM384 656c0 26.51 21.49 48 48 48h67.204c42.414 0 76.796-42.98 76.796-96s-34.382-96-76.796-96h-115.204v144zM547.2 192h-115.2c-26.51 0-48 21.49-48 48v144h163.2c42.418 0 76.8-42.98 76.8-96s-34.382-96-76.8-96z" />
-<glyph unicode="&#xe02b;" glyph-name="italic" d="M832 832v-64h-144l-256-640h144v-64h-448v64h144l256 640h-144v64h448z" />
-<glyph unicode="&#xe02c;" glyph-name="underline" d="M192 128h576v-64h-576v64zM640 832v-384c0-31.312-14.7-61.624-41.39-85.352-30.942-27.502-73.068-42.648-118.61-42.648-45.544 0-87.668 15.146-118.608 42.648-26.692 23.728-41.392 54.040-41.392 85.352v384h-128v-384c0-141.382 128.942-256 288-256s288 114.618 288 256v384h-128z" />
-<glyph unicode="&#xe02d;" glyph-name="strikethrough" d="M960 448h-265.876c-50.078 35.42-114.43 54.86-182.124 54.86-89.206 0-164.572 50.242-164.572 109.712s75.366 109.714 164.572 109.714c75.058 0 140.308-35.576 159.12-82.286h113.016c-7.93 50.644-37.58 97.968-84.058 132.826-50.88 38.16-117.676 59.174-188.078 59.174-70.404 0-137.196-21.014-188.074-59.174-54.788-41.090-86.212-99.502-86.212-160.254s31.424-119.164 86.212-160.254c1.956-1.466 3.942-2.898 5.946-4.316h-265.872v-64h512.532c58.208-17.106 100.042-56.27 100.042-100.572 0-59.468-75.368-109.71-164.572-109.71-75.060 0-140.308 35.574-159.118 82.286h-113.016c7.93-50.64 37.582-97.968 84.060-132.826 50.876-38.164 117.668-59.18 188.072-59.18 70.402 0 137.198 21.016 188.074 59.174 54.79 41.090 86.208 99.502 86.208 160.254 0 35.298-10.654 69.792-30.294 100.572h204.012v64z" />
-<glyph unicode="&#xe02e;" glyph-name="visualchars" d="M384 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448z" />
-<glyph unicode="&#xe02f;" glyph-name="ltr" d="M448 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448zM64 64l224 192-224 192z" />
-<glyph unicode="&#xe030;" glyph-name="rtl" d="M320 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448zM960 448l-224-192 224-192z" />
-<glyph unicode="&#xe031;" glyph-name="copy" d="M832 640h-192v64l-192 192h-384v-704h384v-192h576v448l-192 192zM832 549.49l101.49-101.49h-101.49v101.49zM448 805.49l101.49-101.49h-101.49v101.49zM128 832h256v-192h192v-384h-448v576zM960 64h-448v128h128v384h128v-192h192v-320z" />
-<glyph unicode="&#xe032;" glyph-name="resize" d="M768 704h64v-64h-64zM640 576h64v-64h-64zM640 448h64v-64h-64zM640 320h64v-64h-64zM512 448h64v-64h-64zM512 320h64v-64h-64zM384 320h64v-64h-64zM768 576h64v-64h-64zM768 448h64v-64h-64zM768 320h64v-64h-64zM768 192h64v-64h-64zM640 192h64v-64h-64zM512 192h64v-64h-64zM384 192h64v-64h-64zM256 192h64v-64h-64z" />
-<glyph unicode="&#xe034;" glyph-name="browse" d="M928 832h-416l-32 64h-352l-64-128h896zM840.34 256h87.66l32 448h-896l64-640h356.080c-104.882 37.776-180.080 138.266-180.080 256 0 149.982 122.018 272 272 272 149.98 0 272-122.018 272-272 0-21.678-2.622-43.15-7.66-64zM874.996 110.25l-134.496 110.692c17.454 28.922 27.5 62.814 27.5 99.058 0 106.040-85.96 192-192 192s-192-85.96-192-192 85.96-192 192-192c36.244 0 70.138 10.046 99.058 27.5l110.692-134.496c22.962-26.678 62.118-28.14 87.006-3.252l5.492 5.492c24.888 24.888 23.426 64.044-3.252 87.006zM576 196c-68.484 0-124 55.516-124 124s55.516 124 124 124 124-55.516 124-124-55.516-124-124-124z" />
-<glyph unicode="&#xe035;" glyph-name="pastetext" d="M704 576v160c0 17.6-14.4 32-32 32h-160v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-160c-17.602 0-32-14.4-32-32v-512c0-17.6 14.398-32 32-32h224v-192h576v576h-192zM320 831.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 640v64h384v-64h-384zM832 64h-448v448h448v-448zM448 448v-128h32l32 64h64v-192h-48v-64h160v64h-48v192h64l32-64h32v128z" />
-<glyph unicode="&#xe603;" glyph-name="codesample" d="M200.015 577.994v103.994c0 43.077 34.919 77.997 77.997 77.997h26v103.994h-26c-100.51 0-181.991-81.481-181.991-181.991v-103.994c0-43.077-34.919-77.997-77.997-77.997h-26v-103.994h26c43.077 0 77.997-34.919 77.997-77.997v-103.994c0-100.509 81.481-181.991 181.991-181.991h26v103.994h-26c-43.077 0-77.997 34.919-77.997 77.997v103.994c0 50.927-20.928 96.961-54.642 129.994 33.714 33.032 54.642 79.065 54.642 129.994zM823.985 577.994v103.994c0 43.077-34.919 77.997-77.997 77.997h-26v103.994h26c100.509 0 181.991-81.481 181.991-181.991v-103.994c0-43.077 34.919-77.997 77.997-77.997h26v-103.994h-26c-43.077 0-77.997-34.919-77.997-77.997v-103.994c0-100.509-81.482-181.991-181.991-181.991h-26v103.994h26c43.077 0 77.997 34.919 77.997 77.997v103.994c0 50.927 20.928 96.961 54.642 129.994-33.714 33.032-54.642 79.065-54.642 129.994zM615.997 603.277c0-57.435-46.56-103.994-103.994-103.994s-103.994 46.56-103.994 103.994c0 57.435 46.56 103.994 103.994 103.994s103.994-46.56 103.994-103.994zM512 448.717c-57.435 0-103.994-46.56-103.994-103.994 0-55.841 26-100.107 105.747-103.875-23.715-33.413-59.437-46.608-105.747-50.94v-61.747c0 0 207.991-18.144 207.991 216.561-0.202 57.437-46.56 103.996-103.994 103.996z" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.ttf b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.ttf
deleted file mode 100755
index a983e2dc4cb30880fffe00e1f0879be4d95eb4cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9304
zcmcgyYj7Lab-s5Ozyf??34$wvB!~xr6$uf90D>SbkzA3IY?+cwJtDttQZgecqA2QN
zS8_A$#<3iwZW2{-ovAyiIrXDI+=r%r>Si?Q&5S4YbR3WCaoZ$KV@#^abf)c$o3^go
z5tjYVU4W!$N%fy*!MpdlXV1O&-0wV=j5EgSnaxy|yYIk2zPUy1LCZCynIk7>7r*~U
z-+PuZ-iiAB(b=<$$b+a~Lhe60f8q0iyQAMj{W4?So?~;fPiRNQuQC>U0sTYA(4f7c
z{sQ%PQ13Z*^4$3!D=oi^`bVf=pFeeE_Pw4TKEzo31Juu*oIStDcCq&uOWcEcY+?4~
zoU{8UUqbyD-tq3@sk7(6C$64h>SwC@UwE^ZG39p@dc!x|oc}W`@Boclb8)bJ^JOvi
zb5#|~f>|mOI%zFxS4<Y@ZIn9E=jN&$)yX_;8tp;+sGYM|d1E<WF8*9yt}HL3g`tI&
z`^tmW7QXzCF;7g5DUl+cSo<b97%d#nHLvMW7%Pp)fvcnM+~%QKs6w?_6AQ5@D>0VR
z&3M8W)?3>O@%&Jc7sAP6D6S9l&2c2Xkkkj$NjV~^7sBqSQEup}C|9n=2L|FwIX>Xn
zmSsCOw{0sOaqLLiLe8y7+MZUX%LDOBOpd%NM8)Q88FPrF(~)JS*n$dg*iIO8w!xbX
z-de#~7E5Mkx%=iSZ{Wn#qTEOpqr97kB!9%GF4<KNJlC=<;>-|1#g3#qTC%=6_02ln
zd$9v=#e0<>JlE2Zj#T8!l~`n3OTSmIdsD6RU92prV9TME#tJSA4_1lg*a)~Nf(^4|
zYFR$OlUftkOwDNG%{**?70oCSFNM+=FBv6sjF0n_mNbi{f)Vzxmwheu$4=X!j1gQ4
z8kvxN`dEF7@8#PxJHnP1U;GS%*U$*Mj}h;*zZUkFWKzSaZDuSK4`YE=lcm}>u*f%T
z#i|HOSodXSbBpdEaVHuzS}Qb!f;FSGj>sMO;8k8$XmIP+oZNv%Z9XeBYI9o02Ilfr
z)~o)CI>Y*~GJDt&>}M7`Sjvs@v>D({Jjyp4TH1$wHQI)-i)P92wP9yVLuu2C&2Hk!
zMA}SKS0PUwS}Bn(4i2FbZuKQGg!&;NYlo;ai9@~PqGv-x&Jm8tHEie+<GqIxBaH(C
zSB8@@&-l0}mK?q^Fwi*SaHXYL?+y7|{Xu_J?`=gP;NdTKq*5J}cmWNeUcI?R;hq4>
zt-X5GALI!lBR1Xh2wuUh+#~mF601b%^{X#@u%#y$40-**$*A7q@z+KC-*Rbpr2gIS
z4F!WeE&fQI-_xQ;Cxgr@F#;k2Of%UgoC2T(FAk<N?k(Z#!ki^yY~kT}Nl$Vd!U7VI
zLn~r?d9k3Ck|c7vB0`Nz=?ISFQe!C8Smw464#_JATqtaA&K5uep;+j)=;T_VMu#<q
zgrEa!S;Dd^e?K?(n&24c$|jTe)rYfr54#_n0haL60$%3kE4%^C^a5~g3#SrLjJ66}
zhq~Om(9P9#z3Ta4%MsQxqx*2QuP^#hw9l6JzG&t8o6X^Hv%I}!(ahwHZ(VIxEaIP_
zj_!R?XPRj6Vdrg`Uyb%TEYwJkHio!eD>*AA=EHHcFjotQi_Y=}mSTC#7YkhbaR4Lc
zhN)E%{MHq2*G?Ga%dEEf>vPqz1%8UC$)0nI63&zjcoC2fm#@^#JgLQ`p2T(_g*7C~
zWxaSa8&DYdlb5ioZ{`bEIIWhI-+INu#Vt&j<dN0^FO}=i%vxMjt09TZ4b37DSOpUY
z9Nw_Y<+YHYu%)Hj)2pEh<y<o)z1qUL0CNj!q%SOHOa8jqIMyN`Rl==JN-~jEiss;$
zQV1sqUNitm{0@DbZQMB+jSlYIXd>rZkNxI-r6<z<M$O->DR=5KVx@cgGWV8Z$TM9B
zUpQr*+tlX|1~|WM2ZVAFjAMmh2e8x_VPZJI!$VQ-(-hIxleqXz=PIAR`p)=$^K5GA
z*#n-R@@YQ(BhQ7mK0c3g$hn2>xa>a9iveCtH}N(j%g4B(SbW;K`pt`pp0@e>#^1TB
z{K1c$tIpM*dJa6hG<E*tw=Q^SC+Yc@@qCV*WWNrAfKUi=GxxQ2^OBh!90w_2Y&UOf
zZ3ax^s19IHqG%f$=R<?0tN?*mI<r70bXA`!)#x>G*eu<EdHLWNK^O=Tqz{((P~K>3
z)rh?M^2K0po6#G5Ego05t6uMGs-|#Fy(mju(Ntx-66`hF<Ot`|c2!jrwKk|)zIj+s
z*Ml{pR962|Yx33CbE`g9UtjMCUz4W%_#*YZ7JoDj^4><g6;v<Q3Sgwx?R;&!;&S8;
zQ8jv*EZ0W4+_?nZxhN-nUc3x%tViYuuMb<t{BrGS@7=ZkI{P;J6ZT#9gJ1S87__I@
zhM_#|GHF`u%P5z+wTnZ!u0v$NwjAh7$j7kLrF@$lSbdBH1|pH+u7>_)?CF1FPi?up
zxMN3!3+SOn*i%%Lw~BSUQ84*dM*V*a!@v5xwiG?Odwow=nF9kHO1G+rzJJ?6j;IZS
z3@PMrs0=dXg=S)04{$xsO$|yIZVG-5<AQX!#ALRNk(G=P%5PUr$g^(&FD-aRJ!~_c
zUh995o+jr*)#}NtSn)${QgxsvZFp7Q#Zp<2^*+3D<1i%^zDETXhwBDZENlgjIWfhC
z7f^PG3~yvCP}M8MN0>!eH@NAA-%(&gx8R8<i-oYha^qy&6jrLTBd(`zW~}0>H=D!c
zf#KuUurjgr9Ksx8Zh|!pHrLc`ft8kP#;|5Kw6D(Y0)OPD;Xrh8Em<rT<Hfj{Xi~H$
zHQX9ijHp`3k13@wwK$kn%&eN^csXYssq2pjSc|skKeTUGES5{?dLkE#?b>&!|I;m!
zC6VfQ{UvB>Tijvf%CpdgGfb#UieRo>z;A*c(%>d>z9h(+f^fj96BY@HY=9HU+y>0k
z%l2Zjf2w|-)nQM1*%&(jU2nj-GMiK_Mb2L-tC}hyhiim)ak9w?!7+cDJk6Y@ozzJI
zlm4wK-M#zLXLdw0dv|Oxl!MV7XVUwOEj#vRCOn#Yg=Bl7A>i{i2WF<9KfZPA@#m*&
z`PSom`}_A&o0}`&D2zUAJlvESnn?d03ZsSe#89TG@{+=LeL&~v4@<uGhCo1JYpD>m
z%FJ3iL=ST&KgY)2w!!Nypge~eW5QCAVQxkd&IPtmZZFhyiVD>YMl(4fD-H?#QdGzr
zkpxOo`MDON2}<~b9bzT+^lg7}&z={z_w7lv4|bXd4?Wo5|KOp6X6Il#7dz~;htui9
zXYC!UrJAAm!@~T?$b7-v+10hvtZS|F`xmFD7yW(|-8TM7dVIsi-rkKH#?w!QQ$ZuS
zp`l?z(g>!)PhIMneEhDv9-r)~<txVJpLa#0UB+lCHEMY4y)9;VdU0_&Y__1{wn9X%
zL#{eu1M2Wf$cF>S`!vFd0$lBas$so0=h}?TMpAjcCA!7h+7-Hd`mUedb^5pd*3`PX
zH1kE})v;*Ia$<m`>#tsF_j=neLCUPEZRr6XP)uY4>tYG%_W+qfIOOnVU=Mo3IAS{8
z;y8E(jgDWOZliP(<!ST+Ad;4Agt{>fl6Fdtke326M*swgN-C>Zif}9&hs#Fb1ec(j
zW!rGX>4I#)c>snAg%Ch`@{+zn7P!O&OD#)GXas(-68J3QAS6TJEgUl8=E9pT;qYk|
z`RI!Hhd;ac=7);)`_DWxw(=)zTd~NAx9y6x(ux9Jf!5AtpbpM+Ju_e_k}VIoA>31w
znwbnh2O9+r8yjTAPcB`%c8R7;`7+Drtt(rRl>OJPEu;0?HPRYH6MKnSxitA2n%e(K
zQ~5=e=)z4ju})YJP-TPQvgiUI9T^FS;iQR`$pQ^m(Lh6smQ=*ZW7|_ZpMK@hM_+k*
zXKMRnBS0oAJ>K6wu<zv9*vWkZ?fv6vLM%IF-2KoOMrxQa@`Z=)Hc~U?4?|m~9>`5R
zd4E2C|C1BB2d1`!J}l2L*M}y4HbA3nfv5T)HdDqAaA2!J1!=L;IWMk<uFdLN$1c9M
z0_ZcVryqx1VN+iz7Kew6#ji}QmS`@uIZ+M}cRf13;`&*;zq~2XKY3ta;J{>mVAGd(
ztAp!^NOHT^k|DCI9^s0Q_)#IVX==E;dw6P7rhxq=JhQMD7E0~Fv<zlWlIg9gc?ud7
z36x0HtE5LmYcULAI+E3@hPNS?q{*cQeYYbN>Y$`rkT!}RM$!T~MH8V`A!2;V9ncYS
z`EX^z#~Kk+>;NBTDXy1{c*)S?hNc@@T-VIFX6kXX#LL2VmTUpFBy(Z&846CgIZo^?
zTHQ9x*|#EpA&DL%&|H&vU$N?#8?cQ+*l5HmcmeY!^a>+hfn$V}^pXpoAA;?R9-Y=k
zrGq9<hAKoP?bn>Y{`&qh2Y;eMu~jSz)&NJBwL~H<SRV`$)SyzYBO1a1=f(>=oiZnZ
zCi8<<(ZS=S*2N6faC0yi=8-LcHsr@*-*DC&pnDk^Jm3v{fD<oSJG5<NNYJIQ8@K_u
zgsj>Y1)+q%QUFD*>RELCbsf~&fvU->bv439**4GzWzbB9kV-N_KzK^PO06m_4ua7L
zBP3y30)<IXur{(42O47tvLs##%dX-m)h&ubTNPWn>{bOhi50Wtw863kPEn!A67IG|
z>jS}YO%u#P#zqC6Vceo-4q6t|R_5e~26E>UM?8ih3LPp?;%Z!lG$Vnt(z>MPf)zU$
z3o0xat1JZ-Dmy4&mMbr6cNH-)#Kj~R*fb#}THyWeg|$_d%Ou#ql{6xAtFeY+o&uDR
zBG>Jua6_S<7sk{=2w}KFSg~rDaJQY$7mNA4eK$(!eBe9f@@w^bpZeD41hkH7*UtM)
zZ3qocKR!rmY~R<8Zb9r0`^;1zxdr>*g2s$7STXRs$>@Ug#-;t0HqDhl8{&o(YJ;Y9
z<8I37o=kFdf40nH+5Mx*>G6N-Y@Lkt_s7n@a<;Ye6)N%fI}Z$Gb`QrZEIzzDGjZJb
zZfhsm_LrSpXX|Aufgu|_;0JkSTq<D_Q0P9@y1dLTJJw~+E^~nsQL!ycu`SX)qRO|2
z#cLW<UyI0kQm+}2dQwpMhl_CQhS5Y~bVF;{uGw!SVhTXX=-0z-ZDGCNpnzua(VZJN
z?tB!HE(Vq$GdNG+52}>MvsG^vi(nMUq(hxF0m2hxm;oW9D3dW~CZ(+g7^v=Pp{NSy
z<J4n?$-{>yhaYS@?aL(7v&G_Uy0^c-m#d2NvBEPWpXzIFeus;W&TajhwhbiHJ0hLk
z-JRVB`?CkTxx%f+p~TJY9R&kR1iqK5>)MJ+O*J8sDu2Z|w`tdC18vL3!BZ_NQ=22m
zc>yY5ooVhi=H5zn!>y>4OfGIF<WRKk)5I#w#TD``-1WRIO}H7>%`}x;(<C6oRGHM%
z@;uc6w_1Qx32>V%nm`*I95ak>P4vAf<p!8J1PrICpsT<-I;)B$=H?t5NkDJVS`ZLn
z87xt;AUWdUxjBv~cLzp8mKYupj$o{rGn_U^5Ua&BLs+K{_@GJHo*6a(PoM<5L82sK
zqQqh3gnLw`oDj6uUTdTFT2h$>fRmTZaFb|OYeC)pQ-o|HOr#6u&dryrOIxIU<pq)t
zN!=EQ=8OYi;-UCj)5@nA@II<BX=%BXAm51DrOnieqXIcsmz<fHvjizQ|3K`9ZSg0}
ziCjnK-Xp`qNAAsdJjv%8o5;IZobJfCoze>-Z%Ao%{-&^NSAh~vwM{{WirrM0*tdzE
zp=SZCS5CF%JLtLT#iqvRS`|E4&=0v!6?Rqk9I|O+z0+9h9Axzl-#2dYc|)qAFdPqB
ze=>%RLUH|v4oJr8cMhBqiUGu8R&FV0#bU~*K6fY<;DXkl@CKuSFQ^F1#@a7`!eSo3
zIs<((#U5ZM;0egD7-U>f_$vbwS_Z=Kr2}mgLQB&Y#IXs$-j%-a%6KxrD9~1d32Lr2
zzBHI6z$2)SaE{#Qbn@+NEE1VILHAhp#1!4TB9Sg-@z(9{jb<{Vl#XRavs+t=$!&YL
zjb@aIW3lY96H|20#*R&$pnH0<y?ru$+m3dZ&S>VP(M;bKwcSw1l+;5HWJVb-93M)-
zXD0vR@#d}n$?84S%HGe7(pMsxFPHHZ*AFj)BAyDh;=(iXdp>k1`akjbB_+4dy^pw*
z+zLI0x`kv@d$mmUTKejmGL4~B>!W<p!}yvyXY2ZBP~Tf^yS}ck6Lm^!p1)Ojxr}!Z
zT^mVM$1hd$88=`1UdR(&b@Ds=JiChccaHDp=lF|CPWd(EKcG|3t4r$Jo`h$@bJ!d6
zP55SfuloK++p8^T|Kxw#|GNL<fG02%m<jww;QhMkx)<vHs(w@bbp3bgorZ~qXB&R6
z;e*Cp<Nn4kHoo5Yv!=V6mYP0kenzhJ2z!^lN#m;Rh^$m^P3(`W`@vzcySq#yHTGh)
zT}Asn)v^cWH>zcdHks8jS^KA|<vRGq?*n7;<rFOu^tfdOX#eeM89_w$xoX*i@|)GN
zm$l)0n>*fz_Age;b?`C&<=pXw3n!1v^`AXCJ3r6PvEyukUBIV|BM9I0v$H78vUxUt
zXzt9}<EIv4o3lA~2wi8;bsXF+uoxnrS(f{ZbUx#-{c}g3oS!|z_TyDY*^}U4mYw;G
z&+a_6a4vRqZei}s?76uoVuvrpb{#pj=hUf%EZZqLJ_nwUg7AWz$1Em2$DTmjVN5)R
V|H?UnQG1YRcKGiNtkxZ`{{_U;RE_`u

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.woff b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.woff
deleted file mode 100755
index d8962df76e50488c6520c0dadf3220080aaae9fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9380
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

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.eot b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.eot
deleted file mode 100755
index f99c13f32f5c968849f08a3d8a399157bfb0cccb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17572
zcmdsfd3+pKo#%U1eW)dMt6P0kt97_r?e3N(t97(WE!&b@wru%O6f1Uo#KeglTk(M%
z%U1{)GE>-$0W%3+t{Jik7VBil1_FE*$ZkUBGqnR`2R7l851V0tnXrN^83YL*K7pA8
zR$bcf?^Tu5lI?hy{p>$m-LKw#|L*s?AKSnfgX2s>p#0(N5~ui0W96w77Rm7cF8vdo
z;)|aEJHw8!d)Rx~adv=BATz+W!#~8%vSVyNJB5@O+l7=<>@-TAK-nbgVtLjn$}X*q
zMC!1L=}cyw+jewx*VI;h1}V?MjUPC^fAW9cefj4o)Bx9WX#eR+qz4(3XxtTtj=lHp
z2P&T$Kzt8l{hv5IvHxIIM<T@7;OofmJ&XkJ=Uu&wtzC}z^25i^-1iG9@_xiOqrKlA
zJ8@wD_a=UND`V^Wkw1HU|9z9}LH0?;*7qTvyl4OMi7U58+=!!neqr*&=`$E7o}p>V
zXR<uYFEQjxpO#)g%114q|B@BB5ApJcW7vxyjj><dCmVAH(_}bg(porAQUs_sat+9{
zd|8xgU@jg<`g+uJV|zJEPPa^}uT{Mkc&+W{e5PWiY9=%jooSqDnQ5JApHXK9X4cK@
z|HYHP_`)xHfBCuBkG}rm>o31?^bO;U-~H;oxzgO6=q)+TrdwZQulZkV{W+UqqK(K*
z!%SAR(K)kfW-Z!y0&S?GjTe@*!RKC0x{`8YRiZD^7~i6dC|i^b%6g?==}`(wm(roE
zRN9p4==0HUMF%1;MykS3h93*p)IM8#uGWS5mCs)c=-=?-jAJ%6Wo-fYi>pM_3+=yi
z8diGFz<><qVigSV#8V-B3ZXOt1q2I<tk3E$W-?vpdWmV0HloVLER*#)B+AS*xTeC_
z<_sAh7RC;Cp`Bcwr&G<IXebgZq`G_6P*2v|#Fey)S2*H9UKVM+$crh_LKBb5AABf2
zmNJv6j*gTxo$5$!lwHyl*&}_;=Pf0@KA)FQyDD5J=hE*UiX(q^N)#PWjm0F7d_{7}
zvrkhodED#c+(cP`>-_vWSP`RAF|1rM=gspDp7sW~H|JFXyoN^=49lw&oA@$bC=T+X
zQq19<^QLoZv7orvWlwF@;gfo}O$kl~mA0^c@^DqH=km3aKdXy}Pu{p_Sqn)~i7{Xq
z!*<9-DZHQ<HCR&?PDRBhgty~RXqHKONhe2Pa<Z;#*czRSH#K$L_7uA<+4e<!!)egC
zUW?al&uzEE%iH5(bkwN%ZyBRC>xH)%qcbwc7jxDyZ%r3VcO0<zajaiA2=ra-gN$YJ
zyp89=gS;o3^YH+W#FVf%-RuDbVB-tjz1Z?xQSrp=SZ_Ax25^XPx;YD=QG2M2^(_Eo
z0k9EI5ikr8?v5dh@>WTLFsHm#5{0euUipujZ*6JR=HhtF_nYr0e@<&`xwUy9P>8Kb
zw(Ll^G<(;r^ES7nceEte#0r6d(rcbjRaHDtT~}4zSY2J=aeIPQRds>tc(oOOIHRf=
zINptTRb6!;UR4!BsS1%FuMX5zRRu--e>bN!&f*(3Z-|>Z*F|8CY3b&H%Y|4h-Q02@
zzkYrGKudEv7AssH_^`jOa=xW1^jF?;RdwCx)GT$KRcFPhLRFP@{_48wDtnaHsN)m|
z41zugI#bWGtd+I10%2oMw#|Aqdm6EPHnoVRiXq;|y9#j8wCYt;(Xd)5rU~+8E$pAp
zCiFyh+8+-4d6FAO35a7zOrNMXO!$&M<qvC#Y&L<iCEXu3kjR;)8Jbpl*Mw$B8uQH4
z1;VivpbZ<@4hzdNfL@*^Du~bgn23TE%4ivFHuioE7n>hm6kD99aX>x>fH%LdZ;sKY
zuc@`QiFY=&>Xz49y6|>QG+INiuW2+fdhrwUi898n&0!XnYi%mMB$~L-{1EvPnkwmG
zKh^Yyx#5INtbmmUyjVQvDyFbB>%cD9*h*A|JJ5{z5OEfhTM}MCXbY)FRCVN94oC?y
zgs-gG1<bE44PZ<TTv)U&#2T?1jP}5xa=B1iO{?K(0iaMss1S`Jr9dIL#iOBB(hWcZ
z96bOEe2qC~Xr(v1wU70~{mP_Lnt*|;=xoe_0itBihr)H-EeOxz-YkL!afL{(^#M=T
z4Qs9cwQciI<{jFeD{ox_3>geOjcG0p*4@M)5r(^)q-Z1{rJM7Tn(G;q3Q<AWyn{S-
z{j8tlw-2P#1KacD^Wpoi?9<M+`-0wzT4~GmvzSwZ{N%nX_Ydox`HFC*#IKtH0HZyY
zeh=Be4`wvT^V}Qt@n~-om!#jfW&1w=1QDZezdF248-4oW32=Bs-*!Lpy7>m<++)iX
z0W_rgxS9>{n39zSxgu$VQ%`)pFWYux+wiO3mj3o_6A7kk;^C)9Px0{UkGR1>^Qiwl
z(YHoIJCF4iIf#AM;{_im3Nl`U5P-Y`BLhmWMK;mxA_SObPYw4(mT|!&C?n?;f(@mE
zb)d*X1u6wTU^kY7umirbmiP8>&7TYK{s8yGH@_L+Ps*-J-<8U^-yioKsPy?NulVBr
ziW={_Xjfg+D&<N(e?VE))U;Z;(&|aC<Ns{MVvkYmMpZfUV`Tk-oF6_q%LTnP73k**
z^>YCIApDrG(j~7824m>zT>Ak9&z07*`E^q5Lin9(J=T5>AP9Mp*)+WyYS0lVN++Ql
zy_Y?JRW4tO|5xjpbAx3UK^EL_klu1$^2xn&qgA@W0zYQ0)3x`eq!@YQh^7G*4Vl9K
zQPVgx4BmKyHETZ@QxxptAGXr%7tqCwVQA*xBe25YhK9A5m;t!f0M{-C{VN>u@sJFc
zGPuTxQ_P_ViRoN3!FOl>J#h}12n`<aVGWq!g<J{EDhxI!gW9^w=zTa9=0%j#W_6PD
z`&wH1$QdPOa3bil=)1%uW6DbJGdD|61jZSS1+>X&-;!MwR?n8PW~(Q@K)MU0YlO?<
zZi^Bcf^_SWX3{jRND2K?moh79BE=GVtxO_{crZ5`9%abPeQXqPNYKz7Yvf+y9VxZg
z9FV*LIT~q_lqR{*Jt!3iWwj?S<??b`?J6giAf()Y&co_6h7P&HXdN5b(Ad<zEErtY
z-qg5ZWUTe-l%rq&$k^CNzJAp9u~w3nsW$|3n0kkL^DT{+)fTN_UJ}!oAsdpx+|UM?
zPb&C$D(&M1&NUJTut8uukoXyi{n!=SeM+%>)Ph|={*JsA``w1H#<pT*uoAQkv<9>Q
zVMlxgL4%ZQ39cY#JQt9?3M5~5F)tHQbEl(_p1YtQNo?#RNBaAZ(3FM$z7<DSuRgM(
zW#!72`H;E2Ei<&bGrX&5ykE-i3U{s^%Cz;5n@?(9_f*R#WL8#Rv{U-(qWV@#k}_Yj
z>Dl=PdyNXeOYgqd+Iyx0?vj|}GPVUK8Zkq!y~%mm>xeR#9|$Bwdr*8!R3}9b-vFq0
z3?v&uX-)|2Pz=KW3js1<SyT!jLy*H26+*tmwtejU<jR$k=RdY>KJ?N0Or{==?{8Y0
zY~GMgZ)i@gZR*&WPVelf>rMnhlVf9(p+KU$PNcQ0*tvUeKEHSO&J`=SXIl5G+0n5b
zt*tx8MziYv*39;mlD>TC&ef~$99r)9x@aGLm~%Dp3h~5i;_F&k*2Vo1Z>+a*Y;tm}
zu{Y+8_(dxJT69^ostT{zs?_n7Tk6A&;mS(9>bI;so>~<He7yvm?u0y1!Kxv96;nz<
zPRoUGK}qxVt9ixhQ^vG$>fz0+p99Gg>LD|*=9O?jx<z`bh3jdSv#}kbdm~S&JepD=
zzN;kD3E2+mBzLCZqluD$T>@Cml5ZtDVOIDQBP)cgmkba>66fI?km^8n@d9!h7!Yh8
z955gO*wH&$N6XNUnJ$J2+8|GZURrXd0!s->P^o&Z$nKmMRsnDm*Z`QMp&Q94X**wh
z-#4X-bLR$~uZHIJk|qa}rJ&&?BA0Nq0qyI+QIe}!rc7Fu)7~6mYf&jcW)srsKYr-B
z=RQQ!C4Y`}+mflY{ki7|XP<jcm~YS~@LtE5MVq{=P45lclpJyQo<(h<VVg!m|H?qm
zN~snBBrq3b5rVgpQuCmSkR)w_=#{X}V0c~I`%}eneajYoyqN0W-eu|<XT$gI>~N@7
z$Ig3)HGPhKKf3wO$-%KdJG5rap+6fNoV;^$^!uPtsk$A<^i3o-lEAr1KenR|d*hxT
zQy6elU~5SeTS}i~l5Wd}B*TQ{Xy5L#FejQG0M>%0H^~xPLXnT&_L;LAHk|#;ZMOeI
z2buUhTFo(a|Mv9}Z{N=20|Uo*_IV@gx9^t?XNrzLJ66_=Xil26ai8#?ocZZUb9-Dn
zaZ5+XEhn^idvk<=N6q65;R^7C@W5?b%GQ8`hlmEjT1MP4Q$8~Q891Ub3*9%HFn|N_
z&DThF=7IWfxSkxTBH4tAEJCDgf<q4mc4^aAcD>cT0|OpN<PnU5@sL0OHwjUp6bD!U
z8)~=$SSY&K#g~u0e9^p@-stOJE}A-0et;zSvLRwGUlfJ7K5J)-vKL>b{=6jr3)`R{
z7RF^TkoSN)4+2LE(E=vg#!2xngutsas;zLZ;c7bM74`vIj{z8N(%rq_;zIB9ak;2)
zF;y&vrt7jsi;;lZN3TS-Hj$`BGO=%Se0uvsd|U#lKv}E})@y!|G_H-0C$c8i3|{tm
zFlv*T8cz;?g6C=MASQ$_0<XhZCmH}o9Zh4bv{i60KtMn+bV-{98D(gl;yU$1dq4*V
z&UzE=A#0w3RUjJK0cbA*-iH`j>Cq}lvl&~vC8<`#sXHtVR_h(}g*4Sg1H$|aOkIQA
zVQL}_l~>32n#q!&tQb6OxOhN=b<IEkwF&7dxHJ({)k(M%(2O~i&(D(i>M=jsUu(o=
zz6{Z_K;osG0*^_7AY!=;&<4i~21_iM3`%;iqy=RPmh>QmUgv>WsBr)tKn-gRA49}G
z%}v{Qm4S@IxFgA_!n8*$U1)P;(JNH(!l2AS=L%6tTOdZ=-KyH%t#8_-cW1kO&rVN2
zUUl=mf6k+1!O)3bQPFXy2o=uW*+V;g%Y%p3m}0$&^I$NL%XL-@yjqTt3_?ZBOKBjp
zkhHQST0yRA<6&&72uj~<NVW{`Q(;Nh)qTS)8_W+(wD$L}xcl<u%PR*5`9Cz@+Ck~F
zI+Yqe!-vV-f|)b&(FN1dCk9E<Ar~r8N-Y3XK@3a)qJ}j>E~IBo!yW^soiUPJ4!8?B
z)&pVTf_MXrgG8hfWs(fNd-vJ(>(B1)*6ZU9TUuJSG{oychx8KKG{^go+}z%N^O1f&
zWsW!XDe?OHxYE~TPGLyE9eYpu7*3rmop4_8QVWi>WeH-7<jyqE9Yldj#1s-3q<`pC
z)y|bC2M15C>{RtrH{X2f)XgG%t<+M6I6wdT^1D>^uH~ua_}-=V+;me<&rKqDb)s9N
zb)2%-kuW_4q_aLY=Yj19P^#;;bp(qm)DgxF$M%8gN?2b8TBifcVN1G3D}K(6MGcu>
zBuU^J&6)c2G@3-4$s4rU&gtN@Y;e-A2r#eF=B#10xxjOMkojs@6m~ZTkjVi~@yS8*
zQ_@&?5IBf$M4Jnsu?A32mvm!d!qmxu#NY@BB-79h$<T}vCL(DQ6MSL<Dif%N0piGN
zKm>JJlMG;obDpsvC$`yCa1Htgogf`v&{z05J4`<1IqBq6TDc?QrEB659$s7oC<%f2
zFUDy-me1|jyoX@`pLED_(+sN=_VFCg={(7&b#rP8U_Nby2(;PU_gt7i$~7{TtwYsR
zF6B)@bcSSEE<$;{3bYK6AqT2^i$F6Nhq4(*hyhKIfkR1iN|W`zk@i`p@&A=u-&x<b
z^*~?Wfvs&W*MaB#0a70($LhOdUkVk%?yzLOzp!OX0ZzsoO~#Fq9w@B8WhK?1nxLQG
z`%<jCo@$Lv2K>)QBvdPWPSim?z}JFpz6O?gm8~MHBBaeCP64Cfw>SeVs5!xl#cPSJ
zeyORR_z*xgsdY|wYVelW>xpoH*h^Su((k#U6L--#({y90-Ci<~Ow6dHNgAMs*|KXB
zYi3!DQ5HunSktr$?M$4?kaAYf3o?ww9Dq!Q4gTuKy#co?;H|EayfI%qTkZC_-9G95
zPwjhtx7p~jtQ@eLjD;J#6>fRhElZWv?tr&4Qf<D%Pn)gN(_oU=?^$dOP?2@c{fqp7
zyjsBX3X-Ek*mZO?2wMXN5W%^Ul+DG+x&S{fVf(RFr%Qh&4Q(-R;$Jm?xc>1kJieZu
z{PBDLXia|n&OMpFeotpl`<XxflfGT%k78r|!A(G>O`;GLZtrh!hb!fVLT1&)hyJvu
zz0;jtu}k4OhDB_LeD#!Ufb$)}c0ywp;xA55`nig4S7(pf+0!*BlZt~>I$Kd>k=>P-
zyE<VLAq^kjE>e7Dr8BZhYT(fZzDmMekf+YKB|oq?p>4gT?dFR|200HkW@1MB)6(h#
z?XLSidN#9WBs1*xyO;IH<NeE4tX&!BZue+)D0W*@XLESX-5(y4#KUDdw{3K5+GzjJ
zrT=!2cgn8!{N&5;POjeGHSDeRX4l8#>$5!v?%17kQE?t>3XLw?wA`u-yqkNQC0!Nr
zILojRwwoOVmV$eb$Vi|`yfq5Gfly4OWl4G@^h;SVJf9bxFRxlMW-l3Zb7eBOS1=(M
z0=&^qvXf-ff16Jx5+m=XcQXI(5qdW!5{=U2wbNf3XlolFcergJ-(Rby*WJ8spiNqT
zIGI2E?h$(DlZQv%P4DbbUENUjx*2s=I|JVuXlq>~*D3O#l-awd4XEm6cmy3<Okag%
z4|2}D_U&G*b(=ad388aKI%iku+K|W~Dp-%LVhj7;wfZ7?_NxA_qwSaVOWjl7G?44}
zzeLf8-C5Web%B57Hb!d%Fe=aod~1<UF$}$=S+j<L>>435GQiYekgX96%>?nWUYc=(
zbtb_(x?ttt_F7YqI%HO3k!{18t7X%eH6YGvl2~Wrm{@YGHs<Jov(|di9HAr4D<MSU
zh~7GL74z1fetOrl&zeVF%!I*2(iY}PGykin_dboU^bMNotRWdCnj@xnz5ayV0pyf=
zC7owcU+7yhM1Q4Em9H)J1WJ$IrSn#YC96Nt7s&ZL^atI_nW8m675cH|RO;_5mxeFl
zTN-sbv?gf1sTW?lbZO|)C9c_B($Ws_Z!kR9SyMi*)v0Oflg|7|?4-37YdUK6X?}&a
zli(G?I^Na}(quV0#Me@$baV(_{EY$3Qk;`q6F)(^$@Wft$)XqPiQv}iQ-&_?7^MIP
zR=1i1ybB9Vq49z9=bf)LCLIH?*BZ)`QF_$LMmdZLymWp{6|e!oUItq{Mw6l|F=gG(
zvH|)0>;uvp<1fDGd_@n8HnH?SoHS%olSGTO>(Zh{v$SSQZ_Li22^J|>46y{JHa=n^
z4z&I&`*NVw@o6RJ7jdDVg-}^<3)o+_Ue&mjw;ZyEmuw~WLUAk{%zO|@l|mE~D#GR9
z<a-~P8l8G{bn43Jl}ESCUWBL-({}CE62Sjn&AiA@YvzlPGzT7~Vp~PAQ9eXq3%wg3
z@uGEwBx>&$-P5WD=c7ATO4O^m71c}q1B`NXQ-WRqAf<?b&@1G|IO%E=EcQi`c7=mD
zgZp^QUzlSBKS5Bsk+aSqWU}c;G1y0L5+mZj(frzjquND{zeI!53;v$Hdwcwal6G&p
z@$~7=;11~<M<1ctjfx78MYK6x=s$j;QK;@r)E$xwB$9=4Jw;q8P@w*LVZ6&_VLQ^G
zQD{0%RG)5WXlZG{LvINQI$08tk5b&=Y<fPkq2Y$MXKV%8cS%zy_k~TREFC%%Kx@_@
zfm9cADfL#Ocv&(gPJ>zO1P;yp2(bQ_Vn<+46}QQJvdoJa5*cuyu*!q8l6if4l}Fei
za#H1nUAuOfm-v?@k9q5E^Y>{<d(vIwi$$ucef8DViAtY867z;!^2dinL32#<@UP7N
z2FF;1E$*7?ct;q8Dyu82aVaOfvc9^8;Dhv$X^dwI&}!*fOKy#YEQ>hl#*X8a`cX~V
zWk{{oy-1n0LYDl#{1hNA2(6I$pcLYuJ6G)OUdCgQ8V;2<rAn`wmCy3Gp3$Be3blof
zg+fCmul$ACTcy)x<um-PX9u1g3Wbg%YpA48(oI&J3(oxpW4na0`Ot2PZNlBG!?<Mo
zQKCJdw4`jSZrU*WmWN{p6Sq8^6Dbnvlr+SCaef1-j}GNYF2j|FG!~ui^jXI^McmuN
znT=&)Ark}id1b-m;K7wJRI<xbO-B(^(qeUZ=g<%jU-<Tg3*YA97e0)qG$X5OV_Tr6
zN~+ijVKkJCt?10F+3KoDIIPG+A9q#z65()dDAeH7w}zJCtZSe%-Wb@lsWBF7tdBz?
zy&x$OGLb|SX;a18&f@x^Rgf!(__W4<Z9c_=LqF;r`m|OYdiY`UsiC1wLqnz5%9cQN
zbuuv-sjl?8y@9H>RCCVjmAqb`KTuPUTwYg=uR2f@O20B$UAeKidNder;Jdz`%;l1)
zOpXV`ndar0NK|ewY+BX7sT)>J+olP9p$<3X7`M*2q6OQ!u0WOXhHaBju9ylHtwS_b
zzCXQl{AeFp)W_GI{EJ=r-P<-ceu|G@$S%apsSERk<V1F`O(A>vuD>|BF1);uq{8N3
z&c{&LDM927JZbI?0V7G)!d7BrIjAfJa0nb7MN_~i?0Xs-3K6sJ-mVPJsBky4kSQu@
zsr5ZgJ#A_KMe~_`=ChI~zPXU<joqHu(DufLnM?9=?%DU!zQQYoedbq2M<3>$_cm`C
z9c$T#XXsCg%STtPKH51mG;?X+8>N>Xd~oJF-=XnTa1D!P$of1!k>%F5nOW9|48WCW
z3i$-O<ddaBB5DEZ1*;$&`3oUIO(?;75Jg{(t?aYFJJ^eT60W+y5-&a+>=7SaY-4DO
zKCr@{;t!gq{{y`~L6$&~mbCbUCeL9h9U4HktYX-^0z3lDDNWJ^`I7dV7k)GQTdJwi
z*zACG`IgdWZ;=dGjxlu|3qUPtpb4PrpmPfD9FZjtCj)rNp+z@*VS7|@(j{+-E_0dx
zb=k(~Gv+06MHd%!A<|A!FVgR#8<+95u4Pg48LrP?;_al{6f_3WAG7uRT0kh-rDz$7
zi@JjSwg9aTwiyLi0(3sEn~d%vNJdLvvNSa%jqfSF-N~mr`II>&>3UyFNfY^uPl@c!
zdrCUxqdx~9$YzW4C~kLzvlv{U5=Sv|$_q0{N}ifU^L;H-IC?*hz-IGLzh%e_=9(7j
zo!BTwfKbW!(wDeFbAkN=3uwsW!d{W*U7fwf?%rHaFHs-dWQuxXxcl7I35$UoO~Fts
zod|h0RyHaP6^R{t_wGnkG$@Ug8$F@=$&))}edozZ&gH>f+QGW&-FIx=ddKeSx`W!T
zLD|(lytlJ+?{GW%6!VdEz-=9AWgy_z8B5s>OKVyg>;57RXr-~>$!+?!lfg(sLqtmA
zZQd>}SwcNy#<r6uw;2r)lhPx6I?{j>7M!!7E6fjjCHOt{L`wHUZ$x@SP^RZ^dV^dS
zWVY=j4ry={Bl;?#HMDu@<ThDHCsxCYy4rS<`dN_M2?OcWWScl8T$mcrkMw;yD@v(u
zwGeeXvnGD;WPzD@%kv0pojeF^l*cjEDa_IGa2U*VJBid8JI{cCwxpP0=&~jz71V7H
z82)9N-#aGQ_=QzOh)&3u0_$N0qFgG9qj)t1#S792#vuVeAQu83aonJ5P#GboXquq`
z#JG-)r#-juo)Mly_!AD~f(V4|=t7SszF1e81+af_qVF2(ydr~3aKubG029!kE4NP;
z)3S9(NPg2C@h=O7mif(*x=ca7yO60f1NNzBXitPrKUd0!lvqre{q#yrTPac~)u8({
znR-UDiUC?rbN>J7t_}#VJumAlo89OfJ6xviUVU1<<butY4NyslrdJ<E>r1cEz%);V
zvBg;7g)u3RysjD(DK25M@&nRBg{wyKB%loN0yw+6W8eYPK;-BQZlNEa1;-f<u}(N#
zt`df17c-|J^H1|6B>JQ|Jq0+{r={ugRFcLCngQ;Y0h>5_2hYI`Cdest7b!s8$GN)&
z>#8h7H{95<ZgX+#?v7X9UpI35(PHuF?IU$HK`9ce+kD%Es!rUtxh@uwf;E4fdf)Jh
zn^TpM%9Xcn9f&l`{;IGyRNc(~Y2&%~9P8*f_MUSa+xG0)wIY90Z)0QcP5BkO_Uvgh
ze>yl)AD4K%eQi$D)mUq!^Bm0n7#zMD&WSZZGYgYc3FHx{*5D>A?3WF?hCPd0-BMBn
z>1EZk;f3gDYW_4FwMf)0q;Tb&h#GFrSnbKv=2X~^+U69s$j3#5k0T;!!t-CN0J@?v
ziaSyob7PE(j~8KUg4r7uE({(a@M!Q3lrwC8k8&KprBOI8HQU)TS*NUm)E?%HZKrbh
zU4<8tijym$Rn$S#xWmi1CNoLHjzY4LL5Dz%G{Nnc<dK8`83E)8jZ1Jk>KUkq9(<Ay
zDfGc`@sR+O2#YsLXaGP1^v_2Wlx{HCHu+GFG?<)Z=tMwuVrZP5H$U?(e&9S#%IPOe
z;$=>qHy?c$zw11*lT4GRWleBTx)+mHis`buC+VntX)Z0{zTT03<E^)hwyg(OtvX0&
zE(cdRSSxFUm2bV}q?3P-gQytfqJHSay5P+f=&;zin-_I1z3{33i+*TNnV_{|9bxII
z<CZ2UX*flPBV1#GkK1d_Ln#Q1PPTp2Px$=<`RB5M)0bYh9_Jo7RL3oIalY*g87Ie{
z7+r-f_GY;=eET$>XdU=1Y;9^<o_;f&3$}GR%RxR)-gz+e-TIOGgsXIpj=br>+xDx7
zROtF`-wg#hPU)RBCcmpKm<zwz<Vw_!aH*_{sLBmd4@<Ck{Hy=)@zd|5{@`){GhI^n
z!$+;@v?pTUG;H3@0GAZtU&W#44V|z(k^M<HsKL0%2ZzzmJ1zr@2p1&yQcY-CpnXkX
z%bvj9X9DN`UEuOlfv<nN<_E6@eruXFJY@bPz}wAl1^5>83GYW<{`=rRy%jWn$CaS@
zLtYF*j^ABjepc4z7zs$`Svh!}r{W{?Srz74?1u(CGq5eT%;NmUjkG<@GGhu0t}ZhJ
z+{eIj;Lf2<Fa3~L=yyBA>{k3h_Y}LpK876?$38GF(V0(g*z&CN9*^})9b7gNzuCf_
zF*`^<;c+W5*rb{}cortAZk(zKp9~&I&3Is|>cL?xOjl$8v3)!BY6idXn=nZTJGNXz
zH^TVi6w&Ba!o^?_z)O0dJsb|JwfWlGuo^C1D2qvlkWz~r6(!nB7s_LNU<r<>>+iT@
zJsj?`%{N^Zo@35!H<61`l<amztNfegF)<W-AZCAgjQ?~gj+x`4TXc;r0$nRGxBMZ{
zi3B3h*_&_x8jvl<EY2B`CcV%;-j(mIO0~3{`rs!=nnv=sf9J0sQ`LCk{@Z0ek@WOG
z_{l%tIDB|ryfQbG5Xray_rJaZIe_qDUdAGAbe{BBH<>w6>JUiJRf3EebEwVLf{e+C
zl9cE=vNebEYzSw(1L95%@iwqQ;+Q!9G+!}a*~^>FAMfR9p5ANzSb7yN-n=M7tiu#&
z>NwWH4Hj9Xiv-e?!xf3&TI><)<;<rAe3^b@My%ekPJ!>!Z9s8UNf&d-*hLzu*h}g0
zpAjr^o!<4C(z`^|L=+Zek@&OHyR1#O%KS`v+=^m+L=O$Y7iwXV!!H5o_pW4Y0kMGM
zAjmYNHwC{eAne0EB9agAB5?tF2-hS7>5wyV)L`hKbCgDsAi;oe`cKk-cV|uiKeH+b
z{CHjt|Kb;pKQ}$6;}q9Gyn^;rJg6srCk~Q_{I^{dq9r?1cn?@DSxHol;&7VnJ8{Q9
zz9esHImEdKW%71?V@W$yzSmBBX-QrK;^f#8M|H~5$STVWINkOc{3$pME(wP?hZFha
zYgQWTgx`*pc-xLs-XH3mww!vci`yWnb-vB(g{dy`xDG#1R-V$yU0#xASaF(@<L2j@
zTvC?mlhbU!VEgCcPuXFVz*C8HswT)C53!%~Anq{S#Xlr%mmZcQ@*VOc_<h6Mt})j=
zu7}+H?%#W2o?*`iJiqn^z2_>D75x<-sQ6gL-&DNri}}WV->-~Uj#YlK@}(-R>Ri?H
z)eJ`To2nnHe!lwG{)B(b|Aha!Kr(P9@Ly_J&3!=@><!)*{A%#^(DKmjp-+Wgs!h}m
z*S@dzKh?e&9uD6helFsQWFy<7@#w+m7otCnd19Th!?CH@ca;idP&uVc$EA2vd~f{u
zx?tUgx?^>JQ}^RUB+-)SPmCq*NE}O?OFWVI$NFG>bA3<!C+c5sxV_=t#?6iQH9pz+
zLgRE(L(^7)0S~Z`lV*X(!4wg(Ujg<-QHpTRi!{PMD(Pk8c9=M9uN`(FeAW)rFG`|z
z*n{*DJ6s9ceGwFbyL?CqAjb+z2p_V;upQv0kd^L2_<eTRjhk;tJM2OFb~{{&d%usJ
zIdac?j~|#={O=mOCQh9`a^jw3SHAPwf2ncJTGve6K5^*mvHhnO|5wK~OAep7=S=d@
z#61(I_Me$Jn7r$~$t?#?jGj1gPaZM_{hh}d%;FG!*>(@yDg5Qf8Tbd0b{Br*mc(yN
S4xrR19F>Jx9kYDL=l=i@ywbP;

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg
deleted file mode 100755
index 5727cea42..000000000
--- a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
-<defs>
-<font id="tinymce" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe000;" glyph-name="save" d="M896 960h-896v-1024h1024v896l-128 128zM512 832h128v-256h-128v256zM896 64h-768v768h64v-320h576v320h74.978l53.022-53.018v-714.982z" />
-<glyph unicode="&#xe001;" glyph-name="newdocument" d="M903.432 760.57l-142.864 142.862c-31.112 31.112-92.568 56.568-136.568 56.568h-480c-44 0-80-36-80-80v-864c0-44 36-80 80-80h736c44 0 80 36 80 80v608c0 44-25.456 105.458-56.568 136.57zM858.178 715.314c3.13-3.13 6.25-6.974 9.28-11.314h-163.458v163.456c4.34-3.030 8.184-6.15 11.314-9.28l142.864-142.862zM896 16c0-8.672-7.328-16-16-16h-736c-8.672 0-16 7.328-16 16v864c0 8.672 7.328 16 16 16h480c4.832 0 10.254-0.61 16-1.704v-254.296h254.296c1.094-5.746 1.704-11.166 1.704-16v-608z" />
-<glyph unicode="&#xe002;" glyph-name="fullpage" d="M1024 367.542v160.916l-159.144 15.914c-8.186 30.042-20.088 58.548-35.21 84.98l104.596 127.838-113.052 113.050-127.836-104.596c-26.434 15.124-54.942 27.026-84.982 35.208l-15.914 159.148h-160.916l-15.914-159.146c-30.042-8.186-58.548-20.086-84.98-35.208l-127.838 104.594-113.050-113.050 104.596-127.836c-15.124-26.432-27.026-54.94-35.21-84.98l-159.146-15.916v-160.916l159.146-15.914c8.186-30.042 20.086-58.548 35.21-84.982l-104.596-127.836 113.048-113.048 127.838 104.596c26.432-15.124 54.94-27.028 84.98-35.21l15.916-159.148h160.916l15.914 159.144c30.042 8.186 58.548 20.088 84.982 35.21l127.836-104.596 113.048 113.048-104.596 127.836c15.124 26.434 27.028 54.942 35.21 84.98l159.148 15.92zM704 384l-128-128h-128l-128 128v128l128 128h128l128-128v-128z" />
-<glyph unicode="&#xe003;" glyph-name="alignleft" d="M0 896h1024v-128h-1024zM0 704h640v-128h-640zM0 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
-<glyph unicode="&#xe004;" glyph-name="aligncenter" d="M0 896h1024v-128h-1024zM192 704h640v-128h-640zM192 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
-<glyph unicode="&#xe005;" glyph-name="alignright" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
-<glyph unicode="&#xe006;" glyph-name="alignjustify" d="M0 896h1024v-128h-1024zM0 704h1024v-128h-1024zM0 512h1024v-128h-1024zM0 320h1024v-128h-1024zM0 128h1024v-128h-1024z" />
-<glyph unicode="&#xe007;" glyph-name="cut" d="M890.774 250.846c-45.654 45.556-103.728 69.072-157.946 69.072h-29.112l-63.904 64.008 255.62 256.038c63.904 64.010 63.904 192.028 0 256.038l-383.43-384.056-383.432 384.054c-63.904-64.008-63.904-192.028 0-256.038l255.622-256.034-63.906-64.008h-29.114c-54.22 0-112.292-23.518-157.948-69.076-81.622-81.442-92.65-202.484-24.63-270.35 29.97-29.902 70.288-44.494 112.996-44.494 54.216 0 112.29 23.514 157.946 69.072 53.584 53.464 76.742 124 67.084 185.348l65.384 65.488 65.376-65.488c-9.656-61.348 13.506-131.882 67.084-185.348 45.662-45.558 103.732-69.072 157.948-69.072 42.708 0 83.024 14.592 112.994 44.496 68.020 67.866 56.988 188.908-24.632 270.35zM353.024 114.462c-7.698-17.882-19.010-34.346-33.626-48.926-14.636-14.604-31.172-25.918-49.148-33.624-16.132-6.916-32.96-10.568-48.662-10.568-15.146 0-36.612 3.402-52.862 19.612-16.136 16.104-19.52 37.318-19.52 52.288 0 15.542 3.642 32.21 10.526 48.212 7.7 17.884 19.014 34.346 33.626 48.926 14.634 14.606 31.172 25.914 49.15 33.624 16.134 6.914 32.96 10.568 48.664 10.568 15.146 0 36.612-3.4 52.858-19.614 16.134-16.098 19.522-37.316 19.522-52.284 0.002-15.542-3.638-32.216-10.528-48.214zM512.004 293.404c-49.914 0-90.376 40.532-90.376 90.526 0 49.992 40.462 90.52 90.376 90.52s90.372-40.528 90.372-90.52c0-49.998-40.46-90.526-90.372-90.526zM855.272 40.958c-16.248-16.208-37.712-19.612-52.86-19.612-15.704 0-32.53 3.652-48.666 10.568-17.972 7.706-34.508 19.020-49.142 33.624-14.614 14.58-25.926 31.042-33.626 48.926-6.886 15.998-10.526 32.672-10.526 48.212 0 14.966 3.384 36.188 19.52 52.286 16.246 16.208 37.712 19.614 52.86 19.614 15.7 0 32.53-3.654 48.66-10.568 17.978-7.708 34.516-19.018 49.15-33.624 14.61-14.58 25.924-31.042 33.626-48.926 6.884-15.998 10.526-32.67 10.526-48.212-0.002-14.97-3.39-36.186-19.522-52.288z" />
-<glyph unicode="&#xe008;" glyph-name="paste" d="M832 640v160c0 17.6-14.4 32-32 32h-224v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-224c-17.602 0-32-14.4-32-32v-640c0-17.6 14.398-32 32-32h288v-192h448l192 192v512h-192zM384 895.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 704v64h512v-64h-512zM832 26.51v101.49h101.49l-101.49-101.49zM960 192h-192v-192h-320v576h512v-384z" />
-<glyph unicode="&#xe009;" glyph-name="searchreplace" d="M64 960h384v-64h-384zM576 960h384v-64h-384zM952 640h-56v256h-256v-256h-256v256h-256v-256h-56c-39.6 0-72-32.4-72-72v-560c0-39.6 32.4-72 72-72h304c39.6 0 72 32.4 72 72v376h128v-376c0-39.6 32.4-72 72-72h304c39.6 0 72 32.4 72 72v560c0 39.6-32.4 72-72 72zM348 0h-248c-19.8 0-36 14.4-36 32s16.2 32 36 32h248c19.8 0 36-14.4 36-32s-16.2-32-36-32zM544 448h-64c-17.6 0-32 14.4-32 32s14.4 32 32 32h64c17.6 0 32-14.4 32-32s-14.4-32-32-32zM924 0h-248c-19.8 0-36 14.4-36 32s16.2 32 36 32h248c19.8 0 36-14.4 36-32s-16.2-32-36-32z" />
-<glyph unicode="&#xe00a;" glyph-name="bullist" d="M384 896h640v-128h-640v128zM384 512h640v-128h-640v128zM384 128h640v-128h-640v128zM0 832c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM0 448c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM0 64c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128z" />
-<glyph unicode="&#xe00b;" glyph-name="numlist" d="M384 128h640v-128h-640zM384 512h640v-128h-640zM384 896h640v-128h-640zM192 960v-256h-64v192h-64v64zM128 434v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM256 256v-320h-192v64h128v64h-128v64h128v64h-128v64z" />
-<glyph unicode="&#xe00c;" glyph-name="indent" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 512h640v-128h-640zM384 320h640v-128h-640zM0 128h1024v-128h-1024zM0 256v384l256-192z" />
-<glyph unicode="&#xe00d;" glyph-name="outdent" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 512h640v-128h-640zM384 320h640v-128h-640zM0 128h1024v-128h-1024zM256 640v-384l-256 192z" />
-<glyph unicode="&#xe00e;" glyph-name="blockquote" d="M225 512c123.712 0 224-100.29 224-224 0-123.712-100.288-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.634-11.636-22.252-24.016-31.83-37.020 11.438 1.8 23.16 2.746 35.104 2.746zM801 512c123.71 0 224-100.29 224-224 0-123.712-100.29-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.636-11.636-22.254-24.016-31.832-37.020 11.44 1.8 23.16 2.746 35.106 2.746z" />
-<glyph unicode="&#xe00f;" glyph-name="undo" d="M761.862-64c113.726 206.032 132.888 520.306-313.862 509.824v-253.824l-384 384 384 384v-248.372c534.962 13.942 594.57-472.214 313.862-775.628z" />
-<glyph unicode="&#xe010;" glyph-name="redo" d="M576 711.628v248.372l384-384-384-384v253.824c-446.75 10.482-427.588-303.792-313.86-509.824-280.712 303.414-221.1 789.57 313.86 775.628z" />
-<glyph unicode="&#xe011;" glyph-name="link" d="M320 256c17.6-17.6 47.274-16.726 65.942 1.942l316.118 316.116c18.668 18.668 19.54 48.342 1.94 65.942s-47.274 16.726-65.942-1.942l-316.116-316.116c-18.668-18.668-19.542-48.342-1.942-65.942zM476.888 284.888c4.56-9.050 6.99-19.16 6.99-29.696 0-17.616-6.744-34.060-18.992-46.308l-163.382-163.382c-12.248-12.248-28.694-18.992-46.308-18.992s-34.060 6.744-46.308 18.992l-99.382 99.382c-12.248 12.248-18.992 28.694-18.992 46.308s6.744 34.060 18.992 46.308l163.382 163.382c12.248 12.248 28.694 18.994 46.308 18.994 10.536 0 20.644-2.43 29.696-6.99l65.338 65.338c-27.87 21.41-61.44 32.16-95.034 32.16-39.986 0-79.972-15.166-110.308-45.502l-163.382-163.382c-60.67-60.67-60.67-159.948 0-220.618l99.382-99.382c30.334-30.332 70.32-45.5 110.306-45.5 39.988 0 79.974 15.168 110.308 45.502l163.382 163.382c55.82 55.82 60.238 144.298 13.344 205.344l-65.34-65.34zM978.498 815.116l-99.382 99.382c-30.334 30.336-70.32 45.502-110.308 45.502-39.986 0-79.972-15.166-110.308-45.502l-163.382-163.382c-55.82-55.82-60.238-144.298-13.342-205.342l65.338 65.34c-4.558 9.050-6.988 19.16-6.988 29.694 0 17.616 6.744 34.060 18.992 46.308l163.382 163.382c12.248 12.248 28.694 18.994 46.308 18.994s34.060-6.746 46.308-18.994l99.382-99.382c12.248-12.248 18.992-28.694 18.992-46.308s-6.744-34.060-18.992-46.308l-163.382-163.382c-12.248-12.248-28.694-18.992-46.308-18.992-10.536 0-20.644 2.43-29.696 6.99l-65.338-65.338c27.872-21.41 61.44-32.16 95.034-32.16 39.988 0 79.974 15.168 110.308 45.502l163.382 163.382c60.67 60.666 60.67 159.944 0 220.614z" />
-<glyph unicode="&#xe012;" glyph-name="unlink" d="M476.888 284.886c4.56-9.048 6.99-19.158 6.99-29.696 0-17.616-6.744-34.058-18.992-46.308l-163.38-163.38c-12.248-12.248-28.696-18.992-46.308-18.992s-34.060 6.744-46.308 18.992l-99.38 99.38c-12.248 12.25-18.992 28.696-18.992 46.308s6.744 34.060 18.992 46.308l163.38 163.382c12.248 12.246 28.696 18.992 46.308 18.992 10.538 0 20.644-2.43 29.696-6.988l65.338 65.336c-27.87 21.41-61.44 32.16-95.034 32.16-39.986 0-79.972-15.166-110.308-45.502l-163.38-163.382c-60.67-60.67-60.67-159.95 0-220.618l99.38-99.382c30.334-30.332 70.32-45.5 110.306-45.5 39.988 0 79.974 15.168 110.308 45.502l163.38 163.38c55.82 55.82 60.238 144.298 13.344 205.346l-65.34-65.338zM978.496 815.116l-99.38 99.382c-30.334 30.336-70.32 45.502-110.308 45.502-39.986 0-79.97-15.166-110.306-45.502l-163.382-163.382c-55.82-55.82-60.238-144.298-13.342-205.342l65.338 65.34c-4.558 9.050-6.988 19.16-6.988 29.694 0 17.616 6.744 34.060 18.992 46.308l163.382 163.382c12.246 12.248 28.694 18.994 46.306 18.994 17.616 0 34.060-6.746 46.308-18.994l99.38-99.382c12.248-12.248 18.992-28.694 18.992-46.308s-6.744-34.060-18.992-46.308l-163.38-163.382c-12.248-12.248-28.694-18.992-46.308-18.992-10.536 0-20.644 2.43-29.696 6.99l-65.338-65.338c27.872-21.41 61.44-32.16 95.034-32.16 39.988 0 79.974 15.168 110.308 45.504l163.38 163.38c60.672 60.666 60.672 159.944 0 220.614zM233.368 681.376l-191.994 191.994 45.256 45.256 191.994-191.994zM384 960h64v-192h-64zM0 576h192v-64h-192zM790.632 214.624l191.996-191.996-45.256-45.256-191.996 191.996zM576 128h64v-192h-64zM832 384h192v-64h-192z" />
-<glyph unicode="&#xe013;" glyph-name="anchor" d="M192 960v-1024l320 320 320-320v1024h-640zM768 90.51l-256 256-256-256v805.49h512v-805.49z" />
-<glyph unicode="&#xe014;" glyph-name="image" d="M0 832v-832h1024v832h-1024zM960 64h-896v704h896v-704zM704 608c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96s-96 42.981-96 96zM896 128h-768l192 512 256-320 128 96z" />
-<glyph unicode="&#xe015;" glyph-name="media" d="M0 832v-768h1024v768h-1024zM192 128h-128v128h128v-128zM192 384h-128v128h128v-128zM192 640h-128v128h128v-128zM768 128h-512v640h512v-640zM960 128h-128v128h128v-128zM960 384h-128v128h128v-128zM960 640h-128v128h128v-128zM384 640v-384l256 192z" />
-<glyph unicode="&#xe016;" glyph-name="help" d="M448 256h128v-128h-128zM704 704c35.346 0 64-28.654 64-64v-192l-192-128h-128v64l192 128v64h-320v128h384zM512 864c-111.118 0-215.584-43.272-294.156-121.844s-121.844-183.038-121.844-294.156c0-111.118 43.272-215.584 121.844-294.156s183.038-121.844 294.156-121.844c111.118 0 215.584 43.272 294.156 121.844s121.844 183.038 121.844 294.156c0 111.118-43.272 215.584-121.844 294.156s-183.038 121.844-294.156 121.844zM512 960v0c282.77 0 512-229.23 512-512s-229.23-512-512-512c-282.77 0-512 229.23-512 512s229.23 512 512 512z" />
-<glyph unicode="&#xe017;" glyph-name="code" d="M320 704l-256-256 256-256h128l-256 256 256 256zM704 704h-128l256-256-256-256h128l256 256z" />
-<glyph unicode="&#xe018;" glyph-name="inserttime" d="M512 768c-212.076 0-384-171.922-384-384s171.922-384 384-384c212.074 0 384 171.922 384 384s-171.926 384-384 384zM715.644 180.354c-54.392-54.396-126.716-84.354-203.644-84.354s-149.25 29.958-203.646 84.354c-54.396 54.394-84.354 126.718-84.354 203.646s29.958 149.25 84.354 203.646c54.396 54.396 126.718 84.354 203.646 84.354s149.252-29.958 203.642-84.354c54.402-54.396 84.358-126.718 84.358-203.646s-29.958-149.252-84.356-203.646zM325.93 756.138l-42.94 85.878c-98.874-49.536-179.47-130.132-229.006-229.008l85.876-42.94c40.248 80.336 105.732 145.822 186.070 186.070zM884.134 570.070l85.878 42.938c-49.532 98.876-130.126 179.472-229.004 229.008l-42.944-85.878c80.338-40.248 145.824-105.732 186.070-186.068zM512 576h-64v-192c0-10.11 4.7-19.11 12.022-24.972l-0.012-0.016 160-128 39.976 49.976-147.986 118.39v176.622z" />
-<glyph unicode="&#xe019;" glyph-name="preview" d="M512 640c-209.368 0-395.244-100.556-512-256 116.756-155.446 302.632-256 512-256s395.244 100.554 512 256c-116.756 155.444-302.632 256-512 256zM448 512c35.346 0 64-28.654 64-64s-28.654-64-64-64-64 28.654-64 64 28.654 64 64 64zM773.616 254.704c-39.648-20.258-81.652-35.862-124.846-46.376-44.488-10.836-90.502-16.328-136.77-16.328-46.266 0-92.282 5.492-136.768 16.324-43.194 10.518-85.198 26.122-124.846 46.376-63.020 32.202-120.222 76.41-167.64 129.298 47.418 52.888 104.62 97.1 167.64 129.298 32.336 16.522 66.242 29.946 101.082 40.040-19.888-30.242-31.468-66.434-31.468-105.336 0-106.040 85.962-192 192-192s192 85.96 192 192c0 38.902-11.582 75.094-31.466 105.34 34.838-10.096 68.744-23.52 101.082-40.042 63.022-32.198 120.218-76.408 167.638-129.298-47.42-52.886-104.618-97.1-167.638-129.296zM860.918 716.278c-108.72 55.554-226.112 83.722-348.918 83.722s-240.198-28.168-348.918-83.722c-58.772-30.032-113.732-67.904-163.082-112.076v-109.206c55.338 58.566 120.694 107.754 192.194 144.29 99.62 50.904 207.218 76.714 319.806 76.714s220.186-25.81 319.804-76.716c71.502-36.536 136.858-85.724 192.196-144.29v109.206c-49.35 44.174-104.308 82.046-163.082 112.078z" />
-<glyph unicode="&#xe01a;" glyph-name="forecolor" d="M322.018 128l57.6 192h264.764l57.6-192h113.632l-191.996 640h-223.236l-192-640h113.636zM475.618 640h72.764l57.6-192h-187.964l57.6 192z" />
-<glyph unicode="&#xe01b;" glyph-name="table" d="M0 896v-896h1024v896h-1024zM384 320v192h256v-192h-256zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
-<glyph unicode="&#xe01c;" glyph-name="hr" d="M0 512h1024v-128h-1024z" />
-<glyph unicode="&#xe01d;" glyph-name="removeformat" d="M0 64h576v-128h-576zM192 960h704v-128h-704zM277.388 128l204.688 784.164 123.85-32.328-196.25-751.836zM929.774-64l-129.774 129.774-129.774-129.774-62.226 62.226 129.774 129.774-129.774 129.774 62.226 62.226 129.774-129.774 129.774 129.774 62.226-62.226-129.774-129.774 129.774-129.774z" />
-<glyph unicode="&#xe01e;" glyph-name="sub" d="M768 50v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
-<glyph unicode="&#xe01f;" glyph-name="sup" d="M768 754v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
-<glyph unicode="&#xe020;" glyph-name="charmap" d="M704 64h256l64 128v-256h-384v214.214c131.112 56.484 224 197.162 224 361.786 0 214.432-157.598 382.266-352 382.266-194.406 0-352-167.832-352-382.266 0-164.624 92.886-305.302 224-361.786v-214.214h-384v256l64-128h256v32.59c-187.63 66.46-320 227.402-320 415.41 0 247.424 229.23 448 512 448s512-200.576 512-448c0-188.008-132.37-348.95-320-415.41v-32.59z" />
-<glyph unicode="&#xe021;" glyph-name="emoticons" d="M512 960c-282.77 0-512-229.228-512-512 0-282.77 229.228-512 512-512 282.77 0 512 229.23 512 512 0 282.772-229.23 512-512 512zM512 16c-238.586 0-432 193.412-432 432 0 238.586 193.414 432 432 432 238.59 0 432-193.414 432-432 0-238.588-193.41-432-432-432zM384 640c0-35.346-28.654-64-64-64s-64 28.654-64 64 28.654 64 64 64 64-28.654 64-64zM768 640c0-35.346-28.652-64-64-64s-64 28.654-64 64 28.652 64 64 64 64-28.654 64-64zM512 308c141.074 0 262.688 57.532 318.462 123.192-20.872-171.22-156.288-303.192-318.462-303.192-162.118 0-297.498 132.026-318.444 303.168 55.786-65.646 177.386-123.168 318.444-123.168z" />
-<glyph unicode="&#xe022;" glyph-name="print" d="M256 896h512v-128h-512zM960 704h-896c-35.2 0-64-28.8-64-64v-320c0-35.2 28.796-64 64-64h192v-256h512v256h192c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM704 64h-384v320h384v-320zM974.4 608c0-25.626-20.774-46.4-46.398-46.4-25.626 0-46.402 20.774-46.402 46.4s20.776 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
-<glyph unicode="&#xe023;" glyph-name="fullscreen" d="M1024 960v-384l-138.26 138.26-212-212-107.48 107.48 212 212-138.26 138.26zM245.74 821.74l212-212-107.48-107.48-212 212-138.26-138.26v384h384zM885.74 181.74l138.26 138.26v-384h-384l138.26 138.26-212 212 107.48 107.48zM457.74 286.26l-212-212 138.26-138.26h-384v384l138.26-138.26 212 212z" />
-<glyph unicode="&#xe024;" glyph-name="spellchecker" d="M128 704h128v-192h64v384c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-384h64v192zM128 896h128v-128h-128v128zM960 896v64h-192c-35.202 0-64-28.8-64-64v-320c0-35.2 28.798-64 64-64h192v64h-192v320h192zM640 800v96c0 35.2-28.8 64-64 64h-192v-448h192c35.2 0 64 28.8 64 64v96c0 35.2-8.8 64-44 64 35.2 0 44 28.8 44 64zM576 576h-128v128h128v-128zM576 768h-128v128h128v-128zM832 384l-416-448-224 288 82 70 142-148 352 302z" />
-<glyph unicode="&#xe025;" glyph-name="nonbreaking" d="M448 384h-192v128h192v192h128v-192h192v-128h-192v-192h-128zM1024 320v-384h-1024v384h128v-256h768v256z" />
-<glyph unicode="&#xe026;" glyph-name="template" d="M384 768h128v-64h-128zM576 768h128v-64h-128zM896 768v-256h-192v64h128v128h-64v64zM320 576h128v-64h-128zM512 576h128v-64h-128zM192 704v-128h64v-64h-128v256h192v-64zM384 384h128v-64h-128zM576 384h128v-64h-128zM896 384v-256h-192v64h128v128h-64v64zM320 192h128v-64h-128zM512 192h128v-64h-128zM192 320v-128h64v-64h-128v256h192v-64zM960 896h-896v-896h896v896zM1024 960v0-1024h-1024v1024h1024z" />
-<glyph unicode="&#xe027;" glyph-name="pagebreak" d="M0 448h128v-64h-128zM192 448h192v-64h-192zM448 448h128v-64h-128zM640 448h192v-64h-192zM896 448h128v-64h-128zM880 960l16-448h-768l16 448h32l16-384h640l16 384zM144-64l-16 384h768l-16-384h-32l-16 320h-640l-16-320z" />
-<glyph unicode="&#xe028;" glyph-name="restoredraft" d="M576 896c247.424 0 448-200.576 448-448s-200.576-448-448-448v96c94.024 0 182.418 36.614 248.902 103.098s103.098 154.878 103.098 248.902c0 94.022-36.614 182.418-103.098 248.902s-154.878 103.098-248.902 103.098c-94.022 0-182.418-36.614-248.902-103.098-51.14-51.138-84.582-115.246-97.306-184.902h186.208l-224-256-224 256h164.57c31.060 217.102 217.738 384 443.43 384zM768 512v-128h-256v320h128v-192z" />
-<glyph unicode="&#xe02a;" glyph-name="bold" d="M707.88 475.348c37.498 44.542 60.12 102.008 60.12 164.652 0 141.16-114.842 256-256 256h-320v-896h384c141.158 0 256 114.842 256 256 0 92.956-49.798 174.496-124.12 219.348zM384 768h101.5c55.968 0 101.5-57.42 101.5-128s-45.532-128-101.5-128h-101.5v256zM543 128h-159v256h159c58.45 0 106-57.42 106-128s-47.55-128-106-128z" />
-<glyph unicode="&#xe02b;" glyph-name="italic" d="M896 896v-64h-128l-320-768h128v-64h-448v64h128l320 768h-128v64z" />
-<glyph unicode="&#xe02c;" glyph-name="underline" d="M704 896h128v-416c0-159.058-143.268-288-320-288-176.73 0-320 128.942-320 288v416h128v-416c0-40.166 18.238-78.704 51.354-108.506 36.896-33.204 86.846-51.494 140.646-51.494s103.75 18.29 140.646 51.494c33.116 29.802 51.354 68.34 51.354 108.506v416zM192 128h640v-128h-640z" />
-<glyph unicode="&#xe02d;" glyph-name="strikethrough" d="M731.42 442.964c63.92-47.938 100.58-116.086 100.58-186.964s-36.66-139.026-100.58-186.964c-59.358-44.518-137.284-69.036-219.42-69.036-82.138 0-160.062 24.518-219.42 69.036-63.92 47.938-100.58 116.086-100.58 186.964h128c0-69.382 87.926-128 192-128s192 58.618 192 128c0 69.382-87.926 128-192 128-82.138 0-160.062 24.518-219.42 69.036-63.92 47.94-100.58 116.086-100.58 186.964s36.66 139.024 100.58 186.964c59.358 44.518 137.282 69.036 219.42 69.036 82.136 0 160.062-24.518 219.42-69.036 63.92-47.94 100.58-116.086 100.58-186.964h-128c0 69.382-87.926 128-192 128s-192-58.618-192-128c0-69.382 87.926-128 192-128 82.136 0 160.062-24.518 219.42-69.036zM0 448h1024v-64h-1024z" />
-<glyph unicode="&#xe02e;" glyph-name="visualchars" d="M384 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224z" />
-<glyph unicode="&#xe02f;" glyph-name="ltr" d="M448 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224zM64 512l256-224-256-224z" />
-<glyph unicode="&#xe030;" glyph-name="rtl" d="M256 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224zM960 64l-256 224 256 224z" />
-<glyph unicode="&#xe031;" glyph-name="copy" d="M832 704h-192v64l-192 192h-448v-768h384v-256h640v576l-192 192zM832 613.49l101.49-101.49h-101.49v101.49zM448 869.49l101.49-101.49h-101.49v101.49zM64 896h320v-192h192v-448h-512v640zM960 0h-512v192h192v448h128v-192h192v-448z" />
-<glyph unicode="&#xe032;" glyph-name="resize" d="M768 704h64v-64h-64zM640 576h64v-64h-64zM640 448h64v-64h-64zM640 320h64v-64h-64zM512 448h64v-64h-64zM512 320h64v-64h-64zM384 320h64v-64h-64zM768 576h64v-64h-64zM768 448h64v-64h-64zM768 320h64v-64h-64zM768 192h64v-64h-64zM640 192h64v-64h-64zM512 192h64v-64h-64zM384 192h64v-64h-64zM256 192h64v-64h-64z" />
-<glyph unicode="&#xe033;" glyph-name="checkbox" d="M128 416l288-288 480 480-128 128-352-352-160 160z" />
-<glyph unicode="&#xe034;" glyph-name="browse" d="M928 832h-416l-32 64h-352l-64-128h896zM904.34 256h74.86l44.8 448h-1024l64-640h484.080c-104.882 37.776-180.080 138.266-180.080 256 0 149.982 122.018 272 272 272 149.98 0 272-122.018 272-272 0-21.678-2.622-43.15-7.66-64zM1002.996 46.25l-198.496 174.692c17.454 28.92 27.5 62.814 27.5 99.058 0 106.040-85.96 192-192 192s-192-85.96-192-192 85.96-192 192-192c36.244 0 70.138 10.046 99.058 27.5l174.692-198.496c22.962-26.678 62.118-28.14 87.006-3.252l5.492 5.492c24.888 24.888 23.426 64.044-3.252 87.006zM640 196c-68.484 0-124 55.516-124 124s55.516 124 124 124 124-55.516 124-124-55.516-124-124-124z" />
-<glyph unicode="&#xe035;" glyph-name="pastetext" d="M512 448v-128h32l32 64h64v-256h-48v-64h224v64h-48v256h64l32-64h32v128zM832 640v160c0 17.6-14.4 32-32 32h-224v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-224c-17.602 0-32-14.4-32-32v-640c0-17.6 14.398-32 32-32h288v-192h640v704h-192zM384 895.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 704v64h512v-64h-512zM960 0h-512v576h512v-576z" />
-<glyph unicode="&#xe600;" glyph-name="gamma" d="M483.2 320l-147.2 336c-9.6 25.6-19.2 44.8-25.6 54.4s-16 12.8-25.6 12.8c-16 0-25.6-3.2-28.8-3.2v70.4c9.6 6.4 25.6 6.4 38.4 9.6 32 0 57.6-6.4 73.6-22.4 6.4-6.4 12.8-16 19.2-25.6 6.4-12.8 12.8-25.6 16-41.6l121.6-291.2 150.4 371.2h92.8l-198.4-470.4v-224h-86.4v224zM0 960v-1024h1024v1024h-1024zM960 0h-896v896h896v-896z" />
-<glyph unicode="&#xe601;" glyph-name="orientation" d="M627.2 80h-579.2v396.8h579.2v-396.8zM553.6 406.4h-435.2v-256h435.2v256zM259.2 732.8c176 176 457.6 176 633.6 0s176-457.6 0-633.6c-121.6-121.6-297.6-160-454.4-108.8 121.6-28.8 262.4 9.6 361.6 108.8 150.4 150.4 160 384 22.4 521.6-121.6 121.6-320 128-470.4 19.2l86.4-86.4-294.4-22.4 22.4 294.4 92.8-92.8z" />
-<glyph unicode="&#xe602;" glyph-name="invert" d="M892.8-22.4l-89.6 89.6c-70.4-80-172.8-131.2-288-131.2-208 0-380.8 166.4-384 377.6 0 0 0 0 0 0 0 3.2 0 3.2 0 6.4s0 3.2 0 6.4v0c0 0 0 0 0 3.2 0 0 0 3.2 0 3.2 3.2 105.6 48 211.2 105.6 304l-192 192 44.8 44.8 182.4-182.4c0 0 0 0 0 0l569.6-569.6c0 0 0 0 0 0l99.2-99.2-48-44.8zM896 326.4c0 0 0 0 0 0 0 3.2 0 6.4 0 6.4-9.6 316.8-384 627.2-384 627.2s-108.8-89.6-208-220.8l70.4-70.4c6.4 9.6 16 22.4 22.4 32 41.6 51.2 83.2 96 115.2 128v0c32-32 73.6-76.8 115.2-128 108.8-137.6 169.6-265.6 172.8-371.2 0 0 0-3.2 0-3.2v0 0c0-3.2 0-3.2 0-6.4s0-3.2 0-3.2v0 0c0-22.4-3.2-41.6-9.6-64l76.8-76.8c16 41.6 28.8 89.6 28.8 137.6 0 0 0 0 0 0 0 3.2 0 3.2 0 6.4s0 3.2 0 6.4z" />
-<glyph unicode="&#xe603;" glyph-name="codesample" d="M199.995 578.002v104.002c0 43.078 34.923 78.001 78.001 78.001h26v104.002h-26c-100.518 0-182.003-81.485-182.003-182.003v-104.002c0-43.078-34.923-78.001-78.001-78.001h-26v-104.002h26c43.078 0 78.001-34.923 78.001-78.001v-104.002c0-100.515 81.485-182.003 182.003-182.003h26v104.002h-26c-43.078 0-78.001 34.923-78.001 78.001v104.002c0 50.931-20.928 96.966-54.646 130.002 33.716 33.036 54.646 79.072 54.646 130.002zM824.005 578.002v104.002c0 43.078-34.923 78.001-78.001 78.001h-26v104.002h26c100.515 0 182.003-81.485 182.003-182.003v-104.002c0-43.078 34.923-78.001 78.001-78.001h26v-104.002h-26c-43.078 0-78.001-34.923-78.001-78.001v-104.002c0-100.515-81.488-182.003-182.003-182.003h-26v104.002h26c43.078 0 78.001 34.923 78.001 78.001v104.002c0 50.931 20.928 96.966 54.646 130.002-33.716 33.036-54.646 79.072-54.646 130.002zM616.002 603.285c0-57.439-46.562-104.002-104.002-104.002s-104.002 46.562-104.002 104.002c0 57.439 46.562 104.002 104.002 104.002s104.002-46.562 104.002-104.002zM512 448.717c-57.439 0-104.002-46.562-104.002-104.002 0-55.845 26-100.115 105.752-103.88-23.719-33.417-59.441-46.612-105.752-50.944v-61.751c0 0 208.003-18.144 208.003 216.577-0.202 57.441-46.56 104.004-104.002 104.004z" />
-<glyph unicode="&#xe604;" glyph-name="tablerowprops" d="M0 896v-896h1024v896h-1024zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
-<glyph unicode="&#xe605;" glyph-name="tablecellprops" d="M0 896v-896h1024v896h-1024zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
-<glyph unicode="&#xe606;" glyph-name="table2" d="M0 896v-832h1024v832h-1024zM320 128h-256v192h256v-192zM320 384h-256v192h256v-192zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192zM960 640h-896v192h896v-192z" />
-<glyph unicode="&#xe607;" glyph-name="tablemergecells" d="M0 896v-896h1024v896h-1024zM384 64v448h576v-448h-576zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192z" />
-<glyph unicode="&#xe608;" glyph-name="tableinsertcolbefore" d="M320 188.8v182.4h-182.4v89.6h182.4v182.4h86.4v-182.4h185.6v-89.6h-185.6v-182.4zM0 896v-896h1024v896h-1024zM640 64h-576v704h576v-704zM960 64h-256v192h256v-192zM960 320h-256v192h256v-192zM960 576h-256v192h256v-192z" />
-<glyph unicode="&#xe609;" glyph-name="tableinsertcolafter" d="M704 643.2v-182.4h182.4v-89.6h-182.4v-182.4h-86.4v182.4h-185.6v89.6h185.6v182.4zM0 896v-896h1024v896h-1024zM320 64h-256v192h256v-192zM320 320h-256v192h256v-192zM320 576h-256v192h256v-192zM960 64h-576v704h576v-704z" />
-<glyph unicode="&#xe60a;" glyph-name="tableinsertrowbefore" d="M691.2 508.8h-144v-144h-70.4v144h-144v67.2h144v144h70.4v-144h144zM0 896v-896h1024v896h-1024zM320 64h-256v192h256v-192zM640 64h-256v192h256v-192zM960 64h-256v192h256v-192zM960 316.8h-896v451.2h896v-451.2z" />
-<glyph unicode="&#xe60b;" glyph-name="tableinsertrowafter" d="M332.8 323.2h144v144h70.4v-144h144v-67.2h-144v-144h-70.4v144h-144zM0 896v-896h1024v896h-1024zM384 768h256v-192h-256v192zM64 768h256v-192h-256v192zM960 64h-896v451.2h896v-451.2zM960 576h-256v192h256v-192z" />
-<glyph unicode="&#xe60d;" glyph-name="tablesplitcells" d="M0 896v-896h1024v896h-1024zM384 768h256v-192h-256v192zM320 64h-256v192h256v-192zM320 320h-256v192h256v-192zM320 576h-256v192h256v-192zM960 64h-576v448h576v-448zM960 576h-256v192h256v-192zM864 156.8l-60.8-60.8-131.2 131.2-131.2-131.2-60.8 60.8 131.2 131.2-131.2 131.2 60.8 60.8 131.2-131.2 131.2 131.2 60.8-60.8-131.2-131.2z" />
-<glyph unicode="&#xe60e;" glyph-name="tabledelete" d="M0 896h1024v-896h-1024v896zM60.8 768v-704h899.2v704h-899.2zM809.6 211.2l-96-96-204.8 204.8-204.8-204.8-96 96 204.8 204.8-204.8 204.8 96 96 204.8-204.8 204.8 204.8 96-96-204.8-204.8z" />
-<glyph unicode="&#xe62a;" glyph-name="tableleftheader" d="M0 896v-832h1024v832h-1024zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM640 640h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192zM960 640h-256v192h256v-192z" />
-<glyph unicode="&#xe62b;" glyph-name="tabletopheader" d="M0 896v-832h1024v832h-1024zM320 128h-256v192h256v-192zM320 384h-256v192h256v-192zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192z" />
-<glyph unicode="&#xe800;" glyph-name="tabledeleterow" d="M886.4 572.8l-156.8-156.8 160-160-76.8-76.8-160 160-156.8-156.8-76.8 73.6 160 160-163.2 163.2 76.8 76.8 163.2-163.2 156.8 156.8 73.6-76.8zM0 896v-896h1024v896h-1024zM960 576h-22.4l-64-64h86.4v-192h-89.6l64-64h25.6v-192h-896v192h310.4l64 64h-374.4v192h371.2l-64 64h-307.2v192h896v-192z" />
-<glyph unicode="&#xe801;" glyph-name="tabledeletecol" d="M320 499.2l64-64v-12.8l-64-64v140.8zM640 422.4l64-64v137.6l-64-64v-9.6zM1024 896v-896h-1024v896h1024zM960 768h-256v-51.2l-12.8 12.8-51.2-51.2v89.6h-256v-89.6l-51.2 51.2-12.8-12.8v51.2h-256v-704h256v118.4l35.2-35.2 28.8 28.8v-115.2h256v115.2l48-48 16 16v-83.2h256v707.2zM672 662.4l-156.8-156.8-163.2 163.2-76.8-76.8 163.2-163.2-156.8-156.8 76.8-76.8 156.8 156.8 160-160 76.8 76.8-160 160 156.8 156.8-76.8 76.8z" />
-<glyph unicode="&#xe900;" glyph-name="a11y" d="M960 704v64l-448-128-448 128v-64l320-128v-256l-128-448h64l192 448 192-448h64l-128 448v256zM416 800q0 40 28 68t68 28 68-28 28-68-28-68-68-28-68 28-28 68z" />
-<glyph unicode="&#xe901;" glyph-name="toc" d="M0 896h128v-128h-128v128zM192 896h832v-128h-832v128zM192 704h128v-128h-128v128zM384 704h640v-128h-640v128zM384 512h128v-128h-128v128zM576 512h448v-128h-448v128zM0 320h128v-128h-128v128zM192 320h832v-128h-832v128zM192 128h128v-128h-128v128zM384 128h640v-128h-640v128z" />
-<glyph unicode="&#xe902;" glyph-name="fill" d="M521.6 915.2l-67.2-67.2-86.4 86.4-86.4-86.4 86.4-86.4-368-368 432-432 518.4 518.4-428.8 435.2zM435.2 134.4l-262.4 262.4 35.2 35.2 576 51.2-348.8-348.8zM953.6 409.6c-6.4-6.4-16-16-28.8-32-28.8-32-41.6-64-41.6-89.6v0 0 0 0 0 0 0c0-16 6.4-35.2 22.4-48 12.8-12.8 32-22.4 48-22.4s35.2 6.4 48 22.4 22.4 32 22.4 48v0 0 0 0 0 0 0c0 25.6-12.8 54.4-41.6 89.6-9.6 16-22.4 25.6-28.8 32v0z" />
-<glyph unicode="&#xe903;" glyph-name="borderwidth" d="M0 265.6h1024v-128h-1024v128zM0 32h1024v-64h-1024v64zM0 566.4h1024v-192h-1024v192zM0 928h1024v-256h-1024v256z" />
-<glyph unicode="&#xe904;" glyph-name="line" d="M739.2 627.2l-502.4-502.4h-185.6v185.6l502.4 502.4 185.6-185.6zM803.2 688l-185.6 185.6 67.2 67.2c22.4 22.4 54.4 22.4 76.8 0l108.8-108.8c22.4-22.4 22.4-54.4 0-76.8l-67.2-67.2zM41.6 48h940.8v-112h-940.8v112z" />
-<glyph unicode="&#xe905;" glyph-name="count" d="M0 480h1024v-64h-1024v64zM304 912v-339.2h-67.2v272h-67.2v67.2zM444.8 694.4v-54.4h134.4v-67.2h-201.6v153.6l134.4 64v54.4h-134.4v67.2h201.6v-153.6zM854.4 912v-339.2h-204.8v67.2h137.6v67.2h-137.6v70.4h137.6v67.2h-137.6v67.2zM115.2 166.4c3.2 57.6 38.4 83.2 108.8 83.2 38.4 0 67.2-9.6 86.4-25.6s25.6-35.2 25.6-70.4v-112c0-25.6 0-28.8 9.6-41.6h-73.6c-3.2 9.6-3.2 9.6-6.4 19.2-22.4-19.2-41.6-25.6-70.4-25.6-54.4 0-89.6 32-89.6 76.8s28.8 70.4 99.2 80l38.4 6.4c16 3.2 22.4 6.4 22.4 16 0 12.8-12.8 22.4-38.4 22.4s-41.6-9.6-44.8-28.8h-67.2zM262.4 115.2c-6.4-3.2-12.8-6.4-25.6-6.4l-25.6-6.4c-25.6-6.4-38.4-16-38.4-28.8 0-16 12.8-25.6 35.2-25.6s41.6 9.6 54.4 32v35.2zM390.4 336h73.6v-112c22.4 16 41.6 22.4 67.2 22.4 64 0 105.6-51.2 105.6-124.8 0-76.8-44.8-134.4-108.8-134.4-32 0-48 9.6-67.2 35.2v-28.8h-70.4v342.4zM460.8 121.6c0-41.6 22.4-70.4 51.2-70.4s51.2 28.8 51.2 70.4c0 44.8-19.2 70.4-51.2 70.4-28.8 0-51.2-28.8-51.2-70.4zM851.2 153.6c-3.2 22.4-19.2 35.2-44.8 35.2-32 0-51.2-25.6-51.2-70.4 0-48 19.2-73.6 51.2-73.6 25.6 0 41.6 12.8 44.8 41.6l70.4-3.2c-9.6-60.8-54.4-96-118.4-96-73.6 0-121.6 51.2-121.6 128 0 80 48 131.2 124.8 131.2 64 0 108.8-35.2 112-96h-67.2z" />
-<glyph unicode="&#xe906;" glyph-name="reload" d="M889.68 793.68c-93.608 102.216-228.154 166.32-377.68 166.32-282.77 0-512-229.23-512-512h96c0 229.75 186.25 416 416 416 123.020 0 233.542-53.418 309.696-138.306l-149.696-149.694h352v352l-134.32-134.32zM928 448c0-229.75-186.25-416-416-416-123.020 0-233.542 53.418-309.694 138.306l149.694 149.694h-352v-352l134.32 134.32c93.608-102.216 228.154-166.32 377.68-166.32 282.77 0 512 229.23 512 512h-96z" />
-<glyph unicode="&#xe907;" glyph-name="translate" d="M553.6 304l-118.4 118.4c80 89.6 137.6 195.2 172.8 304h137.6v92.8h-326.4v92.8h-92.8v-92.8h-326.4v-92.8h518.4c-32-89.6-80-176-147.2-249.6-44.8 48-80 99.2-108.8 156.8h-92.8c35.2-76.8 80-147.2 137.6-211.2l-236.8-233.6 67.2-67.2 233.6 233.6 144-144c3.2 0 38.4 92.8 38.4 92.8zM816 540.8h-92.8l-208-560h92.8l51.2 140.8h220.8l51.2-140.8h92.8l-208 560zM691.2 214.4l76.8 201.6 76.8-201.6h-153.6z" />
-<glyph unicode="&#xe908;" glyph-name="drag" d="M576 896h128v-128h-128v128zM576 640h128v-128h-128v128zM320 640h128v-128h-128v128zM576 384h128v-128h-128v128zM320 384h128v-128h-128v128zM320 128h128v-128h-128v128zM576 128h128v-128h-128v128zM320 896h128v-128h-128v128z" />
-<glyph unicode="&#xe90b;" glyph-name="home" d="M1024 369.556l-512 397.426-512-397.428v162.038l512 397.426 512-397.428zM896 384v-384h-256v256h-256v-256h-256v384l384 288z" />
-<glyph unicode="&#xe911;" glyph-name="books" d="M576.234 670.73l242.712 81.432 203.584-606.784-242.712-81.432zM0 64h256v704h-256v-704zM64 640h128v-64h-128v64zM320 64h256v704h-256v-704zM384 640h128v-64h-128v64z" />
-<glyph unicode="&#xe914;" glyph-name="upload" d="M839.432 760.57c27.492-27.492 50.554-78.672 55.552-120.57h-318.984v318.984c41.898-4.998 93.076-28.060 120.568-55.552l142.864-142.862zM512 576v384h-368c-44 0-80-36-80-80v-864c0-44 36-80 80-80h672c44 0 80 36 80 80v560h-384zM576 192v-192h-192v192h-160l256 256 256-256h-160z" />
-<glyph unicode="&#xe915;" glyph-name="editimage" d="M768 416v-352h-640v640h352l128 128h-512c-52.8 0-96-43.2-96-96v-704c0-52.8 43.2-96 96-96h704c52.798 0 96 43.2 96 96v512l-128-128zM864 960l-608-608v-160h160l608 608c0 96-64 160-160 160zM416 320l-48 48 480 480 48-48-480-480z" />
-<glyph unicode="&#xe91c;" glyph-name="bubble" d="M928 896h-832c-52.8 0-96-43.2-96-96v-512c0-52.8 43.2-96 96-96h160v-256l307.2 256h364.8c52.8 0 96 43.2 96 96v512c0 52.8-43.2 96-96 96zM896 320h-379.142l-196.858-174.714v174.714h-192v448h768v-448z" />
-<glyph unicode="&#xe91d;" glyph-name="user" d="M622.826 257.264c-22.11 3.518-22.614 64.314-22.614 64.314s64.968 64.316 79.128 150.802c38.090 0 61.618 91.946 23.522 124.296 1.59 34.054 48.96 267.324-190.862 267.324s-192.45-233.27-190.864-267.324c-38.094-32.35-14.57-124.296 23.522-124.296 14.158-86.486 79.128-150.802 79.128-150.802s-0.504-60.796-22.614-64.314c-71.22-11.332-337.172-128.634-337.172-257.264h896c0 128.63-265.952 245.932-337.174 257.264z" />
-<glyph unicode="&#xe926;" glyph-name="lock" d="M592 512h-16v192c0 105.87-86.13 192-192 192h-128c-105.87 0-192-86.13-192-192v-192h-16c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h544c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48zM192 704c0 35.29 28.71 64 64 64h128c35.29 0 64-28.71 64-64v-192h-256v192z" />
-<glyph unicode="&#xe927;" glyph-name="unlock" d="M768 896c105.87 0 192-86.13 192-192v-192h-128v192c0 35.29-28.71 64-64 64h-128c-35.29 0-64-28.71-64-64v-192h16c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48h-544c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h400v192c0 105.87 86.13 192 192 192h128z" />
-<glyph unicode="&#xe928;" glyph-name="settings" d="M448 832v16c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-192v-128h192v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h576v128h-576zM256 704v128h128v-128h-128zM832 528c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-576v-128h576v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h192v128h-192v16zM640 384v128h128v-128h-128zM448 208c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-192v-128h192v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h576v128h-576v16zM256 64v128h128v-128h-128z" />
-<glyph unicode="&#xe92a;" glyph-name="remove2" d="M192-64h640l64 704h-768zM640 832v128h-256v-128h-320v-192l64 64h768l64-64v192h-320zM576 832h-128v64h128v-64z" />
-<glyph unicode="&#xe92d;" glyph-name="menu" d="M384 896h256v-256h-256zM384 576h256v-256h-256zM384 256h256v-256h-256z" />
-<glyph unicode="&#xe930;" glyph-name="warning" d="M1009.956 44.24l-437.074 871.112c-16.742 29.766-38.812 44.648-60.882 44.648s-44.14-14.882-60.884-44.648l-437.074-871.112c-33.486-59.532-5-108.24 63.304-108.24h869.308c68.302 0 96.792 48.708 63.302 108.24zM512 64c-35.346 0-64 28.654-64 64 0 35.348 28.654 64 64 64 35.348 0 64-28.652 64-64 0-35.346-28.652-64-64-64zM556 256h-88l-20 256c0 35.346 28.654 64 64 64s64-28.654 64-64l-20-256z" />
-<glyph unicode="&#xe931;" glyph-name="question" d="M448 256h128v-128h-128zM704 704c35.346 0 64-28.654 64-64v-192l-192-128h-128v64l192 128v64h-320v128h384zM512 864c-111.118 0-215.584-43.272-294.156-121.844s-121.844-183.038-121.844-294.156c0-111.118 43.272-215.584 121.844-294.156s183.038-121.844 294.156-121.844c111.118 0 215.584 43.272 294.156 121.844s121.844 183.038 121.844 294.156c0 111.118-43.272 215.584-121.844 294.156s-183.038 121.844-294.156 121.844zM512 960v0c282.77 0 512-229.23 512-512s-229.23-512-512-512c-282.77 0-512 229.23-512 512s229.23 512 512 512z" />
-<glyph unicode="&#xe932;" glyph-name="pluscircle" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM512 64c-212.078 0-384 171.922-384 384s171.922 384 384 384c212.078 0 384-171.922 384-384s-171.922-384-384-384zM768 384h-192v-192h-128v192h-192v128h192v192h128v-192h192z" />
-<glyph unicode="&#xe933;" glyph-name="info" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM448 768h128v-128h-128v128zM640 128h-256v64h64v256h-64v64h192v-320h64v-64z" />
-<glyph unicode="&#xe934;" glyph-name="notice" d="M1024 224l-288 736h-448l-288-288v-448l288-288h448l288 288v448l-288 288zM576 128h-128v128h128v-128zM576 384h-128v384h128v-384z" />
-<glyph unicode="&#xe935;" glyph-name="drop" d="M864.626 486.838c-65.754 183.44-205.11 348.15-352.626 473.162-147.516-125.012-286.87-289.722-352.626-473.162-40.664-113.436-44.682-236.562 12.584-345.4 65.846-125.14 198.632-205.438 340.042-205.438s274.196 80.298 340.040 205.44c57.27 108.838 53.25 231.962 12.586 345.398zM738.764 201.044c-43.802-83.252-132.812-137.044-226.764-137.044-55.12 0-108.524 18.536-152.112 50.652 13.242-1.724 26.632-2.652 40.112-2.652 117.426 0 228.668 67.214 283.402 171.242 44.878 85.292 40.978 173.848 23.882 244.338 14.558-28.15 26.906-56.198 36.848-83.932 22.606-63.062 40.024-156.34-5.368-242.604z" />
-<glyph unicode="&#xe939;" glyph-name="minus" d="M0 544v-192c0-17.672 14.328-32 32-32h960c17.672 0 32 14.328 32 32v192c0 17.672-14.328 32-32 32h-960c-17.672 0-32-14.328-32-32z" />
-<glyph unicode="&#xe93a;" glyph-name="plus" d="M992 576h-352v352c0 17.672-14.328 32-32 32h-192c-17.672 0-32-14.328-32-32v-352h-352c-17.672 0-32-14.328-32-32v-192c0-17.672 14.328-32 32-32h352v-352c0-17.672 14.328-32 32-32h192c17.672 0 32 14.328 32 32v352h352c17.672 0 32 14.328 32 32v192c0 17.672-14.328 32-32 32z" />
-<glyph unicode="&#xe93b;" glyph-name="arrowup" d="M0 320l192-192 320 320 320-320 192 192-511.998 512z" />
-<glyph unicode="&#xe93c;" glyph-name="arrowright" d="M384 960l-192-192 320-320-320-320 192-192 512 512z" />
-<glyph unicode="&#xe93d;" glyph-name="arrowdown" d="M1024 576l-192 192-320-320-320 320-192-192 512-511.998z" />
-<glyph unicode="&#xe93f;" glyph-name="arrowup2" d="M768 320l-256 256-256-256z" />
-<glyph unicode="&#xe940;" glyph-name="arrowdown2" d="M256 576l256-256 256 256z" />
-<glyph unicode="&#xe941;" glyph-name="menu2" d="M256 704l256-256 256 256zM255.996 384.004l256-256 256 256z" />
-<glyph unicode="&#xe961;" glyph-name="newtab" d="M704 384l128 128v-512h-768v768h512l-128-128h-256v-512h512zM960 896v-352l-130.744 130.744-354.746-354.744h-90.51v90.512l354.744 354.744-130.744 130.744z" />
-<glyph unicode="&#xeaa8;" glyph-name="rotateleft" d="M607.998 831.986c-212.070 0-383.986-171.916-383.986-383.986h-191.994l246.848-246.848 246.848 246.848h-191.994c0 151.478 122.798 274.276 274.276 274.276 151.48 0 274.276-122.798 274.276-274.276 0-151.48-122.796-274.276-274.276-274.276v-109.71c212.070 0 383.986 171.916 383.986 383.986s-171.916 383.986-383.986 383.986z" />
-<glyph unicode="&#xeaa9;" glyph-name="rotateright" d="M416.002 831.986c212.070 0 383.986-171.916 383.986-383.986h191.994l-246.848-246.848-246.848 246.848h191.994c0 151.478-122.798 274.276-274.276 274.276-151.48 0-274.276-122.798-274.276-274.276 0-151.48 122.796-274.276 274.276-274.276v-109.71c-212.070 0-383.986 171.916-383.986 383.986s171.916 383.986 383.986 383.986z" />
-<glyph unicode="&#xeaaa;" glyph-name="flipv" d="M0 576h1024v384zM1024 0v384h-1024z" />
-<glyph unicode="&#xeaac;" glyph-name="fliph" d="M576 960v-1024h384zM0-64h384v1024z" />
-<glyph unicode="&#xeb35;" glyph-name="zoomin" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256zM448 768h-128v-128h-128v-128h128v-128h128v128h128v128h-128z" />
-<glyph unicode="&#xeb36;" glyph-name="zoomout" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256zM192 640h384v-128h-384z" />
-<glyph unicode="&#xeba7;" glyph-name="sharpen" d="M768 832h-512l-256-256 512-576 512 576-256 256zM512 181.334v2.666h-2.37l-14.222 16h16.592v16h-30.814l-14.222 16h45.036v16h-59.258l-14.222 16h73.48v16h-87.704l-14.222 16h101.926v16h-116.148l-14.222 16h130.37v16h-144.592l-14.222 16h158.814v16h-173.038l-14.222 16h187.26v16h-201.482l-14.222 16h215.704v16h-229.926l-14.222 16h244.148v16h-258.372l-14.222 16h272.594v16h-286.816l-14.222 16h301.038v16h-315.26l-14.222 16h329.482v16h-343.706l-7.344 8.262 139.072 139.072h211.978v-3.334h215.314l16-16h-231.314v-16h247.314l16-16h-263.314v-16h279.314l16-16h-295.314v-16h311.314l16-16h-327.314v-16h343.312l7.738-7.738-351.050-394.928z" />
-<glyph unicode="&#xec6a;" glyph-name="options" d="M64 768h896v-192h-896zM64 512h896v-192h-896zM64 256h896v-192h-896z" />
-<glyph unicode="&#xeccc;" glyph-name="sun" d="M512 128c35.346 0 64-28.654 64-64v-64c0-35.346-28.654-64-64-64s-64 28.654-64 64v64c0 35.346 28.654 64 64 64zM512 768c-35.346 0-64 28.654-64 64v64c0 35.346 28.654 64 64 64s64-28.654 64-64v-64c0-35.346-28.654-64-64-64zM960 512c35.346 0 64-28.654 64-64s-28.654-64-64-64h-64c-35.348 0-64 28.654-64 64s28.652 64 64 64h64zM192 448c0-35.346-28.654-64-64-64h-64c-35.346 0-64 28.654-64 64s28.654 64 64 64h64c35.346 0 64-28.654 64-64zM828.784 221.726l45.256-45.258c24.992-24.99 24.992-65.516 0-90.508-24.994-24.992-65.518-24.992-90.51 0l-45.256 45.256c-24.992 24.99-24.992 65.516 0 90.51 24.994 24.992 65.518 24.992 90.51 0zM195.216 674.274l-45.256 45.256c-24.994 24.994-24.994 65.516 0 90.51s65.516 24.994 90.51 0l45.256-45.256c24.994-24.994 24.994-65.516 0-90.51s-65.516-24.994-90.51 0zM828.784 674.274c-24.992-24.992-65.516-24.992-90.51 0-24.992 24.994-24.992 65.516 0 90.51l45.256 45.254c24.992 24.994 65.516 24.994 90.51 0 24.992-24.994 24.992-65.516 0-90.51l-45.256-45.254zM195.216 221.726c24.992 24.992 65.518 24.992 90.508 0 24.994-24.994 24.994-65.52 0-90.51l-45.254-45.256c-24.994-24.992-65.516-24.992-90.51 0s-24.994 65.518 0 90.508l45.256 45.258zM512 704c-141.384 0-256-114.616-256-256 0-141.382 114.616-256 256-256 141.382 0 256 114.618 256 256 0 141.384-114.616 256-256 256zM512 288c-88.366 0-160 71.634-160 160s71.634 160 160 160 160-71.634 160-160-71.634-160-160-160z" />
-<glyph unicode="&#xeccd;" glyph-name="moon" d="M715.812 895.52c-60.25 34.784-124.618 55.904-189.572 64.48 122.936-160.082 144.768-384.762 37.574-570.42-107.2-185.67-312.688-279.112-512.788-252.68 39.898-51.958 90.376-97.146 150.628-131.934 245.908-141.974 560.37-57.72 702.344 188.198 141.988 245.924 57.732 560.372-188.186 702.356z" />
-<glyph unicode="&#xecd4;" glyph-name="contrast" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM128 448c0 212.078 171.922 384 384 384v-768c-212.078 0-384 171.922-384 384z" />
-<glyph unicode="&#xed6a;" glyph-name="remove22" d="M893.254 738.746l-90.508 90.508-290.746-290.744-290.746 290.744-90.508-90.506 290.746-290.748-290.746-290.746 90.508-90.508 290.746 290.746 290.746-290.746 90.508 90.51-290.744 290.744z" />
-<glyph unicode="&#xedc0;" glyph-name="arrowleft" d="M672-64l192 192-320 320 320 320-192 192-512-512z" />
-<glyph unicode="&#xedf9;" glyph-name="resize2" d="M0 896v-384c0-35.346 28.654-64 64-64s64 28.654 64 64v229.488l677.488-677.488h-229.488c-35.346 0-64-28.652-64-64 0-35.346 28.654-64 64-64h384c35.346 0 64 28.654 64 64v384c0 35.348-28.654 64-64 64s-64-28.652-64-64v-229.488l-677.488 677.488h229.488c35.346 0 64 28.654 64 64s-28.652 64-64 64h-384c-35.346 0-64-28.654-64-64z" />
-<glyph unicode="&#xee78;" glyph-name="crop" d="M832 704l192 192-64 64-192-192h-448v192h-128v-192h-192v-128h192v-512h512v-192h128v192h192v128h-192v448zM320 640h320l-320-320v320zM384 256l320 320v-320h-320z" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.ttf b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.ttf
deleted file mode 100755
index 16536bfd7a292e7090b9d4e0ae61061da9bc042f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17408
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
N%EGLUS-#`*e*qFO!Ds*g

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.woff b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.woff
deleted file mode 100755
index 74b50f4c3001da7fdfffd8638213dcf1a396da78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17484
zcmdsed3+pKo#%U1eW)dMt6P0kt97_r?e3O!v|4JFTDB#*EZOp*C|2y)PMkQAV=F%J
zeT0x9Glk8VU?#!KHA6PRVw?<_K!DEz*-glNrgnhrz$Se1VY3V{6IPHVgCOC<C%`1I
z>e7CHud1b%Y{!$C&;GO3{p#KK?|!e|yJcjAafWBz4XjG|%!*TZ@v~)HXE!n{kUBxG
zrnc%cdyninj<f@CJ>>q^-Isp8f6pnTNspiml_lrjfB1cOBkeK9`aePL{>rBY4ovRZ
z$Jm-a<oA-R>Wl>rAQ5S(&z6&Of8No1;K=EFk%oHwx8!~yg+6fj*j|)d`vA(!lKbA|
zPj5c5=U&ts`XJ(Q;T~k4Ji6z|B+}3?KTq!R%^~OUW2a7IzU}knWQ1gSmS1E}jPcXb
z3y6Qz^7$`Wo_i24f4ILqMq!PyU)?Jka|Y97IHZU*g-=ghyhSevH6V||4R}+j2Ik;V
z_(Q1YWD?Ti(=F5LYgMoLUTga~pQ)IsnhDH=XBuZ(W?E-DX4IL1nYA-}e(~flzVOT5
zUw-cOL$AO1`pa(|dc%0*_rJP#t~fV`w$SG^n{IuLz2<$b_2+Dci8ewr4Kr!cMs8;1
z%o?=u1lmwV8!s$rgU`Jhcf{q`%2;2lF}g_^RW>Q>lp&>G=~41Zm(r=UD{V@3`1$a+
z!ULffLsh{igO3GkYM-q=TkEiACI<5FcyY!tn;Nl7Rx=V~g_UAy7uNTk)3DNW1_op>
z2Ou$kjY$OX%LkGO<Ppp(vOcRjn8|dV>qVwX+NdfUvrN|KkSH_L;F=0wn=@qmSP(nb
zg?2Joo=h~m!hujEpXlyY13hVX6IYTdUcrzHd1<8eA}^wZ^G!S~f9Rp;c*2Y)Iy)26
zbfPn{UUo>AWta3dkGmLmdpvGF?Wk~=oJ+rdD2n{qDN%GHF&>dz@@2^(&pu7X<O#Qj
za}#9&uJiNjWCe^$#jrAkj62IadD89U?u=XU@fsdhFf6xHXyVIwzA(rON+E-H#+}Tl
zg}mZmmt3_~2Tth0HpM^XSK5O5i33%&u1i->{;Vz@e*F4H%UXzwN{j)^7`8*!v8rxR
zof@nu3ns$i7r?vZP-vD(dQm4wVREvrYuFl{i#IiO&Gr<#E!p-(eWTQ%ajh1w*`CvG
zhnKg<#ptL}^WQQ?Yt{>IF~-u!O1_x0hIwncSh^#C#gAkCy4enP7yA%nsVr~fncyJr
zNoPFV$3qb%=uS4f00G$ee0MLlJX26y5j)nK&Nu-a;-73z18CG9Dr5cg09gQR$W;Ig
z1BAOH2&24Jk|3;9-YSX0R(ZGlN6k04G-`8EJmv??50F2nHMZQ`JmAYmR>xbmC0m-^
zYuCD)Taw#a;;SQh-$3y-SD>mY>Z`7+s&1^Vu5dYB{;H}vUv;$Fia(rE)f61>M!c%7
z+83>=3ZPVl$d6Y0>Z+>zBL07xlNx8ybsN`3O`Yo^FvqlH^T4HiB$8}y*_$02%I<Ax
zPDUd6O9LPF)>Y28RE7S^Tdu0E`<$AluG8wQ7*(LEvd&vwS6yX~(i(M?;($TW2SI1*
zS(>%74wffu>`Av-uVz;xmd~aZ;Y1<8`*>F#E}T@|Y9bs|^MxcqzN`hk)9IKVOHX@)
zK`)PU!zcoA42kKJ^@a&w(x<#ZEtXElP`0Rhg9Z{g(=<cVinmQ_hNLmqJY66hTLIdz
zo^7+RECuN0Nuq-I&5wyFSiX#w(Pm@sS97uX!9}sfc^U`gV*q&bd;8`X{rZ|(Tbp>U
zsa3bU*5diMYr^3gdVNi!iP4K6n@^N6c5M!`uv}|X@g>p3z2*btOK7U72fb9&8{|eQ
zWMT!ZG~mVJIae`-C0QqS!NyjiD!c^Em=6(WF}Wq-1%$ScdQ??MujYW1AVc`enq9#B
z+R^~VRDuhO)&*E2c7xF#l&D-LkW`auFq{V{6cEaX!$`?f2yXFcXq9vW&;UmdfC7JG
zju~3<&2H^u{cyiBsgx#Q;0ih$v0#8GS?NdNI_?yNXK`;9L4&wLB-i?ZC+mi_*8keJ
zc_8%;ZO@grE&+xN2A;+=2M6nJVgnd&caszj`J`lXR#G!PgHk>$2%CG5C$63KlkC=k
zWO86@mV7>P-{sxfnGTQNT~RA-x^@;T)gV8<`|^DwdM;ZLtd#gQGXP+;$I>4l8+gHt
z26>jd!yX>)ZQ_#jhqiRz=bs>A^zBziwrFEdKRgKzkLcUZM_xDIV4S;bxx$BrR1a6v
zJ|0oh(jZqPjd1FT&-bO<4sIEF_1n_lzilGHbWA?{^w>!reEkt8IA|92zbE?E*h#bz
z=`C;&`?SjqK2Q*3yapivc_&5&lwN~uqT2-sFwL$S?g}mAf=5tB#w`RJN(bvek%bCW
z3VgtBECXQ&d}R&q?ctg?<Kz84?uBoD)5o8b9hIKTl~J!Z>e*ZA@l;;+M7<R??zQ2r
zx~7%N<!pAZva+dZm2$b&m0ZhzXT>6qQS5qEIrCy<{l1JBK03?z-8B{H=Q8!P7yTgo
zn5WVqul4&Q=<008UIowP)-&0)Qtd+cooYSSaTXv*nu|@-yV)c=$d0fR><oJ!yC17u
zz7+qj)-~e<%PxQ{IN>0@W!&VGd*ynobe#o$%vz_b?@duLvc^G811cIah5uU9I5Q01
zc%3!t*cVY0?Bcsy>5lX0V#Y8u^B)jcVQ@pk+Dps;Tx)=92ZR0<40w1zhD#V+<HRZE
zP=v&Eu9@Jwv;UDehfIV95BRVK%y2`lgk}{4o0CCpon`bsm<aL$%4xGY$@zUPEq&yS
zA~QG<^jY*>WRfvurT3W|B`5+DjK%`mRBGRnT@_Z(ma%55C%!<s^Q3D8%i>Op5*mVZ
z>yl>DG_6Px{Zf}QD{3Oe5_+vnB8qr0Hya*h$jp6g3~)%$&>d;yZsHvYwb1O7+&(!R
zYLb*DIo~}f6$WLsCo5&La#HOoCzl|k+<?x*>Qjaexx#22A6?hj)UnL(U)IsoxNda3
z^~#h(U;oJX_(#5e$o8>Tl9sAB1ap{rhkElZO_bFZtzcdf)0iO}lEIv0gYZas4^JdL
zJkPmC;s7=XYzGoQBe5U5Lc32XmXBJnAIRU4H)Frs5Z2gctPECymVwrQ79dy>UqR3y
z<ywL($QjT0WVZsz*ICHQMAV$gFr?=$=tmM8|H#4q{)04S;lF>y!Bwjcu4rj*Z<!C7
zTia5@t8&2|O%wf6c1JL`YB<%_KVd$pxt&ujpO9HuebG+wtBdMeElJ9J&8BDP8|*bI
zybitl9&7KJ4!DbBj?364cG#Ms+ur1?>@JBim>&ovM0-$tOH?OC4}Tx1cLXFGLTN?_
z>`)AY01E*!U|CcOAVZMD6%|6h#I}6w-0}AI<L5rMWj^%L`c$eOj_+w&6K`IZOs;E=
zuW9Pso=k4<tm}^X0>{V4j|Y6Q?mCgyvSRzrUD@oeo!eKmZ%wuCQPX4N+ge+<jgO_(
zJ*}y&?UKHH_|8?U?i^lT@^#TZ`Y`8eq7~wa)<oB~w5*MKL+(g#<M{F8<Bh!$cgQPJ
z`PahB!c|pxMOG$`v~Q{pHU=vz@v7g{ek8Fn0{D6fIGuw$QNgMqdleE&UQWvSU|vb`
zp;f$M)k$O8IQj6#RnLLs3H6W}So2CaAl)K8)xz~8%h=cs(Y=u;R31*K5Z_gj>4a>D
zbdoz0@X<t3z%Bu-X34jboiHnWijfsU){6!RA&K+w4M=sMx_ALO4Gai24-OcR0PN@;
zt)pe=$4nQ)1Z|L~K`$*iQ-P%fC8$(AS7c|#4XXgS32XpN($I}$6t(RyzW<w2#o4oi
zrN4&e^`a*G<3+zwN<=Q<Xam~Ufukf>vs9V1Dkt3;!q$S4hs-9V(|>y4x#u3B>5@Ok
zx^2l++WOpcgtN~*C(Ji!6L_y<%%V+R)~5TqZAv9^_voTF(XdS;p?{^IXC+jN01}uB
zvIxOjNvK&+MM#o1L3B%4XE403t^J9@guZE$K2b>YZ|yR5jkA$^ws)4OR_FG6Ml^kn
zeLuYM&f|mQf3|=1>ivH<K6w1jjp6TuLM7_99o9FH*hm8B2L151I_!;eeoR5YO`feG
zO>8NBl1aKP8<GqYQc3%EmW4UdbRV!5G`&fd*b<6-=+@7iS-0-YXKuCqAC{1b&!g2G
zQ}=8g3c35X9~l@pvc1n88rr%?HcC@0`Lp9?&4}it<2LRS{*yC59cu1~YR7Ks?7Zoi
z7VT&bG4QB)oFQBRo)8{5ZA;l|aPR=pAXv+YJEqEK1|S1RG-jdureg+h0KWMe$<EwY
z9}L!$BUL0FGm%Azl#X%e!N4wU+RCoCx-Y?i3lez<qhLHB5Wq=7R3O0t7QluYt^gJa
z4tC+?!!KVj@1ZyP`j-o)j+7rD3BGKI*vl70A+FEb*`n-)m#IHD$^XJO=!J!G8OyOA
zaOXkbXg-|BMB6wi{`mlSbxO4r?$umP2He6vK<hC8!%ecg7hGKEeI70s6fUNU#n5zJ
z)@U(eQ2Xc=OV`F?wMZuRZB9&YeTYv;AQdQ!wZVGLFOtT!iHTU+#G1iNKMzK2GE?L6
zkx%d}jUB{<@I~Nt5bHz(z^KDXjFq+u4h9Ga2!<|cvmm1kty5g5erOLEgXS_Xm$-#B
zPr)h>jqC)p7Xa_WY$Mu6t0c{)Z0(k$S`nx2usB$)cgz>kR2K~h^D{7Y4RVL6i7-@N
z9sjE)OM<du@UY?H0S(qQ0|C?~q^IE0L`+pD;Zi^|_P2a~mdsa=`O*GbBQEo0h?aR0
zFXaSyOacTE%VmHzlsvz`$oz4?r2C7SU#4JD_e1C{JrD~u4xj_5VXfg~h}fsOX&bLn
zkZ~9<Nph+%?GZ~C+8kN*@>M)PD09%cd|1*Jh*5X9s&;ql8#d_O>2A-n)6<Vv-FVNR
z^DtR3bfQ;ObfQ#*3a9Vvp&h>I!TqaEvEIaaFc`??I;#a<EyqX(p(19bB#>E1T4@rk
zAXl~VAU0J5rEfOGTSj)Pu%zqi?va*t<_9NR`}<eied*Gr_Q65^kIgrCQu?e;rAAKk
z5i+-6=8SxF!F2SAL6UUHg$k5V^8i&40~3I#VU3Ur=~>gT$AIb57)dS%+yzS317YEU
zcms@sM5GdBk_^3j=b53QGdsKW`e?(ZmX=Ko(R$D!y@)o=iT;B(c68i$u%Azv6HR?e
zw7x#7^fj4N7!q*D-jhDokA8$sI4^jq`I59{31W-n&Lq$sM1e{~6cQMuf6S?BuKmQ|
z;EDE}s-L{^#*-&+6yd9-7E{Fe`PY}<rK)!=Pb|m(F16=|8+v+f5Wy=Gof@s<l)a9G
z=?Ng6^|Lt-Y(IcfUAL_xSX`lwFm9A=ADFI$^<|)SI^<B;lCIK<mvduLL*^Gr61Ylp
zranE5Cedd6I&F4vi2db*lYT{jd6hP24Xe!sp6h|kSHr@vyD@-F25^dB29lqW#KMEX
zL3|_HoCl3HfO@*58<Uf!P7WjnM?fH%hHglPW)v|INt>MHlao-HKs5{yM^*zOsLPsU
z06R+O84Ge^n@t5*qkqr|(%}Vtg`cs*<WpWLoqS3wcSO8&O+3QGi;DmyAu#{PIIYL>
zxgDGLFbv?64q0xRVU>a&p5Ymt$N98wPE7&Kr>ziyHk<pN1M^3@My9g0sG7(m+zE)z
zkSxnZD3@D-mH{$Ug6iG^&<w_*bgCr8fF{Vmp}0Av$$H;t$1KzM|IQ5M>f1K&?d#jS
zxy|9&`@Gjj>cjEz`tHb=0{NgbD48F~Z`zcHlQBn=aiggF@<TVZQw^#K`uV*tMY`*$
z*7$Ls_xX^7YWdHJI;aQuTCmO6z%sA0m1I?fv{}F@U>N)sXMlM%BY3fREwR-vHPsUz
z0?5X-+;mQZx5QpggagE0!ZMS7&kdcpi^iFz8%yo>l7VDmMnz5106om+qfM-tr7=cX
z9JOFglPa_`aVkT~Sv}9oFcxzFG8s1bs~>m!oDQG6x<+zGJkfNu)8lk{r29U#`}v(_
zqr<Xtz-}@gY;adN<q@YWRaQHF?#fWL`3gT}woXrjNn*ceu{A(NmYe$*`F?qofaet?
zM+dO$=x7kO1`HsCb0sOAiI8;xepbTvW2;UT|3(_#WZuBPYW{HO@h?0+L{Ij}J%6-1
zJ8|bNslI+!uBYSlAOA_;4)aHmasJ>2Akzj>hzfV~H#mcpazj3~^1?%Z+S8G9rdRAx
zc!psSJ0M>@B^%&;2eF;d*oF9u)02L#;@_3)QFA?AgEFZ&NTstCMHbmzS-C3*n+R$6
z_;-=wD=WFsN~wW|8~92Ib3vXu-<Ev;u9&v@rnVa|93134(3pxC9ZyTE_I5b#{pgw0
z>e1AQ)9YN;AC2}eTd}4+%AL-!>Okbyrd)Gy_1zyHm&C(mIkRPKbJFPe&&B_?kLP5^
zdw=rf_rzCi?HX~{y3<3^=uo<6?;Sfc4l2$AO@Xmx8<tyjfp>Fnv$&%|o?t09%676t
zz*2Az5*Z0JiMNKqHxP=5v@}VNgnkJNhUfFb^W{}b#_T17Zl+A;b_*s1Lx4M+BRfet
z`S;m)EH?TcddIWx8Krk)EY>I;zk2#h18r>s<PNkAWczE?<k}n84zx)_2jbZS?-`|c
zHhy6AJ@ifw*VPTDubEM2wKMRofwtDwa-AX%N~vA9v;kG!43D5gi|MPd>_N_%*S?*L
zwQf@<CLwfgN$2beT^kY^L<Q@yRcvA3yINl)&tB2rHMIS*eyMxvn+9_2{+B5FusaJI
zqb~5T+{S2)07eD+fp0DHDTbjJHEY%|kX<E2Mh2J~46-$Xp_w2))=M+4v(6-VhZn3I
z++J(yQHRWGEV6A_bG2+5vj)UjO%m%&91}~9)y5oMaMoHcnj>_ic_oBM9MRj-T*bV#
zr=Q;O?6c+}2Qy(Xk+g+*(#-$n>0M9bFMWfiI%`Nqk>-f$U8_G~cK|u1UP<R!)ED}e
z4AEclQ{`(*J%Q4rcj=tfVbSVO^aXPM4*fy5DoxRvp9=lhaw_%rm5U=6@h^^*I<zKe
zy{Q*oym)c=;zh36UDDDH@NY0Y*H}|NuhpqZ>XXj=NbIDw6>B<X^=W>Ewv*r$!aCm8
z4$@>fI>g^nrgU@&Ui^&#%+k8yW$oi)`~>MH+dK6oi(aTFf?KOk8M=7MD23`)w^|8!
z7Z#X869ebYmHyV4bPT{=YbZ}f@zGK?%3)04rSmkS0yY5H%V3MgXcBZKrmWjpHXxsy
zy<d7`;>8zBf6)V@O)UP8QW`R;NuovCHEGeJSz5EDH)dC&2^J|>46y{JHa=n^C20Lu
z_Emz`l20o+zlaO{EQHE>TfqLZ^{Qrmwj8pDn`|ZaLUAk{%zO|@m3$ZzD!^sn<a-{O
z8k>4_Z0hpZ<wrNoUVx|((RS?8V!;1i&Ah-*Y37TNGzT7~Vw**=F+NOS3%wgZ@uGEw
zBx>&$-P5WD=c7ATO4zMB71d4s1B^0sQ-WRqAf<qT&@14?IO%E=EcOMGc7=mDgZp^Q
zo1bHOFF{bUk+Ym1GTHQ_80;fAh!OGMXkP8XG3|oJU!p<jd2i3IT|M4>QM)JEc<NNn
zzfJnap+{(TW1<3N5p7Nv`j1y=6sj{7b_V1;iDZFHPXSj76sW&$81FJ^*p4)46q-&G
z)u$U8T3Q<L&|5-+PL@REqZBtdo1V{XXt=KJ8Cya2UD6cFePL56ONY(`(3&+!Ak~Fj
zO1%{+UY3lB(_j`mfkSgY0<8a)*b&%M#ceW=Eb~H&L<SrvtaRb5WL}?M=@NE`j8wU9
z$BrH5MgC>UW!}8g{6kXGo^;lDBB82kPknWDtkUBRMce_0{PAH?&>WXs{42A+!7)~T
zle4Be+8IQl%IeB$T*?Wy*H_mNe2_jejqywYS}i?m$*r+~Wf3Rcxa4@Hen^vc7*eZs
zFH&Z$kR`t_KLv>MLn~w+D1|ua&J=pPm+?rbhC`)IsM4!u<+J>)XS8RA18srBfxvLl
zEq`J5X6ck!`3!&S*@0(=1A!yR8ZPR`>9#7)1?PT)v0cR2JZLw;HsEg70d|^wlxPnq
zEh*colQzu0<x#SOiCZ3}6DbnvlqAG{aef1-j}GNYF2j|FBo>|S^jXI^1>D=inT=&)
zArk}id1b-m;KG$KRI<xb&5|OfB*p6R-0(0Dp8xjw^WWyd7e0)qI3ufSW1Fw0N~+il
zVKfkrtjJ~6bahoI7*yopk2|V8v0$(^5NPn|n*+;m)-{leHu^SfXpBS}>!XlJ&r3>(
zOe7&i+EB43R~Q;z3Au8ZPiy?w=2P51{G;CCPiuwYhaWbd8Xn#-JY0;lxA>~7<FVtR
z>PolM?W<}_G-upy$?f)deKmQ>;daz`s(m$q<SWOkE7uoRjroHOe8>0WnM^#9%5Z-$
z)x10v3d<e&4J-RMbi=A?+ccps)ZvC4<JK8hIB#3m6{s@qpluS$6cT}gb%>_Q_a(Pa
z9O@&B`o!83f3YLGbIbb1Pw|QK>4lg%b$-5(97_+jDP%9-@fRo72AAjKRM`Bh`4|e9
zN)UMiPnvr}z(}06Fx)@p8K^9Ia0nb7g%iLi?0XU#3K6sJ-mVnRsBkwkpDHLxsr9{0
zJ#9(v1@oER=ChJ3x-p;Vjocnv*Y?J`nTzsr?%Ms*?))qH-R4)u#vbOmdzv?mjkoN^
zGyEro<zwxu4&`QsXD;r3qxjN;56*n&J2ajOu3@nZS)a$JAkKDdo0(;eNC8}lrjSpd
zOFmgDB%&6eUa$(nk-rcU)PxeO2T}A@vXy-ncn5p2N5WMXSmMQxgFWJhi){=|(GOPm
zll(#R)L+u;6J!Y#X>p5BX!0DEvP1*OmQ@J4SAa)=IVDNDAYamc^TKate@itr8k-%E
zF5Oi8>`jsZ%Q2>|V*#io4Kx8%9du5?og=d3;bZ_WIk4!4FKmx0PP*g`;bji<zb;!J
ze#X2guIS>TE=1ZX>P7l}c>OZI#<47HKEw6-OT0O{O+jN2{V`k5uLXpXU5b{Wu&688
zZ}ZUVV4G2JB|zsBy2<D+f@HMx#fwu@(!?#rw{v_t$EVCGN!R;Yikir0d`e_*yrrm9
zKKd)+1KDhG9>wjBa2A6LRN^Q`PPkzPNyt;PXuhvy3P<lp5ZGw`>9-7-!Cccqy%QV7
z2oNe7U-}X^XfCi{U;zzzLf9*^yerpR=<dz*^b+;KO{TCbg1gUMIamzjZ~}&6=~%$E
zzOqqisEBRbwQF0fqCsh_T<;3hA3w2O*0-NH&bd6eL)%wZz4MOEoA20JUAIr$F(^Aa
zMt0?LyGA<Dr<jkV18(a`D+2+y&REKBSX$FcS@#!lKr4;=Pi)b*obZPl8bVSWZ}WC>
z$r9=rGq#*KvBhWznUo&l)1d~Ou;82pU15IME5YxnCsMi>dLz;sfHFOQ(;MVEFS9Kt
za7crr7|~Y|t)b0}C$`8sI<XpF)YX;~)X#$4P8dk1CR@ZQ;lk8_ex&cySy4iDs`;?9
zG;8Abr7SQLcX=LRZ7B}|8|86KbqaH|JRAly-A*EP#?CV!pe-q87`m*9N%?i#1BQQ@
z=J$>XHhy6h5uy_^roeibf+&{=<0xKDK=Fcff^kT|56FeUM;tfk8dOHeDVk<z05Ps(
z<7v+=yk~^x5dMS%xgY{zJG#)Li9gm=W<KoSo9Mg7I<H9K5*#s84!{KTXUgr9g`{lV
z5t83DN4?7efn{EEv@VsG@6M;{OrL$~8Mq}xr=RWeekBr7W<TAoY3(9~QVqIKld5MV
zs~Dj5H0S@H?&^T>+Vir`vf1^{v4dsW?v<z2OD@=a*#MP<XnN&gw7&Ej4NUV?7+Z`L
zUKo=C$?J+Sk>V00D?cDDkiTLSPXfvSFMzWvI|d#w4MdL4;1>GvSa6);5bK1)<tkxF
zb}(}qGXFG>L!ytH(^G(BeOj6>PbF!bpc&wP39yNyckmqCV1k@NcaeO=eM)z?U|p4k
z=!P3R)@?3s-Q97^d+J7SKU63jx_z{+#xI2;bsKM;RMp8_H`YZ$lE3DU6Yn2cabuz~
zRM~#>=7CVN?5zsA1J%v^pVyy#@8QnQ!|y%2zU`J<cC5(W(A(J9dqZ}`j$3YNGk-cb
zS|62ov|~+1)7408D0dcSe+&+P4d=ufpqT|pss!?gQ)_S&7WB#nUBjNmt!^nUg7mWL
z+3-U2GckV}j#?z@<`cMbPDBkiXRP+*X>%&*MQwA6TI3TV!Y2@sG~s!#Rsdbm7{wha
zjX5z!#ls7*HNor+3l|2D5O_3r2g(^XzehQaZ)p^cOU-t+Ox7u@Ahm}%W80}5zN>IU
zQYqz1XccwPH16;+uE|W&u%nP{WY8f{BTaDoC3z$vKt=$0LgNygj(P^_p$CuTK??ma
zT>K;eCBov35*h%|0R8h21*IDdwoN{eAq^%Y89EVAofsNt=giOC#`m7XNjZJOBwps!
zIrGum_+96a9cP+6Eo*{%(!H3ZQb?BFJxPY`OLIvH_w^3;8*ja3v~AwEa^*fcbJ@4D
zgtf9pSozjlrF8O-mJk(#T+|PpSm)iDJRKI7?&gI{mtOePzoQ@8QzmGwSVvfT>bRu|
zN*Yel;Rx55;N$jM^FRUuV=3D{>L>jEf&6pX!0Agb8^XB<4%KnXT%2#0hK!SASA?!Y
z7kbmYG<^Fso@gETEo^OSQl5S@nDMuDm6n5ioV;^?;Jfvs^)W~BEFF2%fw%2f5vkDi
zTfZCdbDYwb)|mXRHh(7gW|JdUKgy-DDxxYkL_I9Q;_<I~_v5GUq~7(oe@B-T-u<XG
zo%TfRn}*H15#W*l{Hr+hysi_rC$c{Y2Q?TM`QR}6dB<g75#fRaU#bZ#^L4EDZMwyG
z_i5kR|KPjyl<(``uKB@hzTcW=4G)+<@$nAxTRy(Ye8T;am;b^4&u{t7-*d%p{*V{^
zkmGk&n4gukIYt7Kc}DhM<Ei+_d{%{d2K%7_&kSsfEwhxqaU*R{v&@*nf~(8S0QWJl
z9Jq66(@QVp75Z*xgx$>c;%5JO_A%_JIQD^YiOzg_gO+EV_qePtb#U28e6xi+V|I`}
z;c+Sv*rb{}c^W3FZk(zKp9~&IO}SvJ>cL?xOjl$8v3)!BN(R61O_(Hv9a}D<8)5u$
zifHsI;$pA};3eJP5ex>^+H7rYPz@H(m&K(0NU24RiV_{g^W`x<umnfcp*!vvg2P?5
z`KHUlbF6gRP2^$}MY~<mD*tAAObo>yh}mBr<3C-BW9EeD7F}bDK-cojDL()@5kmwz
zdlL>oeX_-v#W^F=q!&6Sy0X1hiI$d=ANu5I(`feg@BHm!sv6DTce|{|;;#M&Kl$hD
zM-HrwR%V7{BKh|J{<oJQ2M}J&%UGn1&XXSNCNn2W9RTUMLXa^dC2Dh}AY(G3Bt^Q8
zY|Y^u8^#&$fVfjbybWxSI3~_N%~#A<cJXHO$GdovCwG}YmR`k+H!sQ%>o5hHI)Qa?
zf<+eSB7rnj;)=v?E%u1@D$S<_e3`y6BUWFsPJ!>!Z9s8UNf&d-*hLzu*h}g0pAjr^
zo!<4S;%y>oA_@z#Nc>sxHfz(ZGCz|Zx1tyy(L+P<g<4qT@Ff6!?@GoN5DO>{f=okt
zQ}AU0VIS@hk$iv`i3`v}xF#7$hn$I{215s(qcoBP2?m7If0F#4ch>a(j#WY6$MbUV
z7r!X^bJKG=PH_#yD`-!}gL>jSagaRZzwM|HE!mmEyWeWbN}_5Mhtq7o6fgNlmgFrh
zhd6hkOxCV%ENO?z_u6SMEy-&@oE%%?s7_fLS!J04r`tY*KLw}3#o-X=a3Y_4%}QfA
z_#Ie@x9vFPy<1mmt5mObaT_GH&bN83Fx5pK*Wvrh%2PVIOH0xWD^7DNx%s)qmz1UY
z<TTsQ+x|KDQ+607@KoZQstIz(L+t0=k2?%^@du=>(!+8{zC(Tl-#5JN7<U|XJml<m
z{=pS-jkrGO`nB8dK3fs5=&$%-#m6fCuHto1#53Xfer2?Byz+~cFI8z(XRDsCW-y}P
zQ2ki-^VPrh#=PU+C%n)3;=a?q|5C$h?)5W&um4{ESN*RCmIrPRd@Ar#ZLD^r_Wia0
zsrJp_NbtVkb0J449oia>hWCZP5dLYz70E>oM5ZF&RVtK0<)ktlm7-12UD4<3{B`T<
z4%hu%-H&6TSWB!wHXgepb~tu6_C)NT>izZ2^*!~UsDHiT_J(^JH#Xke_+;Y?jnhpH
zO`8P<+|NEvngyN`rih6B^06<9QiOAEq!IQ}NjICY!^B~G?XUykGj^E1C<)tP7t%-V
za3yH>1yBg?@F2y994jm#yx$JPc7U5gR=NY>_uFA7Zob9sunXy1?QkXT{XTa3;L-OT
z**git|3P*XAB!CU^Pb!>dGgf3V@Km%*&I#<Cc({5A^R8##Bt7*Wx1=?x@zLq$^B;z
z?>UK1Co#}7_z+|dJ9*WTBgc-Oj_;p5I(c%>>B)WZyWSVywD;K9v13QGkSVC|)98Ia
jnmH;)v<LA?whw7{Vc2neW3m^e#^9(d%<7osJ3jvx(s0M3

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/anchor.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/anchor.gif
deleted file mode 100755
index 606348c7f53dba169a9aca7279a2a973f4b07bdb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 53
zcmZ?wbhEHbWM^P!XkcUjg8%>jEB<5wG8q|kKzxu40~1eAV&{y5e`l1KFoiKNSOWkz
C+YCGa

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/loader.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/loader.gif
deleted file mode 100755
index c69e937232b24ea30f01c68bbd2ebc798dcecfcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2608
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
T)6_**#cgp_+?JL9(ew3BlNF>u

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/object.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/object.gif
deleted file mode 100755
index cccd7f023fb80908cb33bb7d9604236cd21b7ae7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 152
zcmV;J0B8S4Nk%w1VG#fg0J9GO<>lo+KR<78Z?v?uS65g4{r%Y3*xlXT%F4>`@9+2b
z_ww@cot>Tk|Nk>HGXMYpA^8LW000jFEC2ui01*HU000C<(8)=wd#<&tyXIMjHBV`d
zBSi|xsj3(;nD0kQ0aJq8eLH~x02P|t2!_J&Wqb%0io?#xD<upxn@Dup`7Ge3XH0HH
G0028|K14A9

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/trans.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/trans.gif
deleted file mode 100755
index 388486517fa8da13ebd150e8f65d5096c3e10c3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
ncmZ?wbhEHbWMp7un7{x9ia%KxMSyG_5FaGNz{KRj$Y2csb)f_x

diff --git a/cps/static/js/libs/tinymce/skins/lightgray/skin.min.css b/cps/static/js/libs/tinymce/skins/lightgray/skin.min.css
deleted file mode 100755
index f7f5cd8ba..000000000
--- a/cps/static/js/libs/tinymce/skins/lightgray/skin.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:inherit !important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid rgba(0,0,0,0.2);width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#D9D9D9}.mce-grid td.mce-grid-cell div{border:1px solid #d6d6d6;width:15px;height:15px;margin:0;cursor:pointer}.mce-grid td.mce-grid-cell div:focus{border-color:#3498db}.mce-grid td.mce-grid-cell div[disabled]{cursor:not-allowed}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover,.mce-grid a:focus{border-color:#3498db}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#3498db;background:#3498db}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%}.mce-colorbtn-trans div{text-align:center;vertical-align:middle;font-weight:bold;font-size:20px;line-height:16px;color:#707070}.mce-monospace{font-family:"Courier New",Courier,monospace}.mce-toolbar-grp{padding:2px 0}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-container b{font-weight:bold}.mce-container p{margin-bottom:5px}.mce-container a{cursor:pointer;color:#2980b9}.mce-container a:hover{text-decoration:underline}.mce-container ul{margin-left:15px}.mce-container .mce-table-striped{border-collapse:collapse;margin:10px}.mce-container .mce-table-striped thead>tr{background-color:#fafafa}.mce-container .mce-table-striped thead>tr th{font-weight:bold}.mce-container .mce-table-striped td,.mce-container .mce-table-striped th{padding:5px}.mce-container .mce-table-striped tr:nth-child(even){background-color:#fafafa}.mce-container .mce-table-striped tbody>tr:hover{background-color:#e1e1e1}.mce-branding-powered-by{background-color:#f0f0f0;position:absolute;right:0;bottom:0;width:91px;height:9px;margin-right:-1px;margin-bottom:-1px;border:1px solid #c5c5c5;border-width:1px 1px 0 1px;padding:6px 6px 0 6px;background-image:url('data:image/gif;base64,R0lGODlhXwAJAIABAIiIiAAAACH5BAEKAAEALAAAAABfAAkAAAJxhBGpy+2PUnzqGNpmPNJqDIZSJY4m+KXLF3At2V6xPFfuvMF6J6fINTnhTr9XcaRC6pKvFYlZjDIszaXRSA3ijlXo9AlWindaldSJthJ55XAz6+ZWbVCOdojP77p8J8vlUSI4SHEnaEiYqOhARdhIWAAAOw');background-repeat:no-repeat;background-position:center center}.mce-croprect-container{position:absolute;top:0;left:0}.mce-croprect-handle{position:absolute;top:0;left:0;width:20px;height:20px;border:2px solid white}.mce-croprect-handle-nw{border-width:2px 0 0 2px;margin:-2px 0 0 -2px;cursor:nw-resize;top:100px;left:100px}.mce-croprect-handle-ne{border-width:2px 2px 0 0;margin:-2px 0 0 -20px;cursor:ne-resize;top:100px;left:200px}.mce-croprect-handle-sw{border-width:0 0 2px 2px;margin:-20px 2px 0 -2px;cursor:sw-resize;top:200px;left:100px}.mce-croprect-handle-se{border-width:0 2px 2px 0;margin:-20px 0 0 -20px;cursor:se-resize;top:200px;left:200px}.mce-croprect-handle-move{position:absolute;cursor:move;border:0}.mce-croprect-block{opacity:.3;filter:alpha(opacity=30);zoom:1;position:absolute;background:black}.mce-croprect-handle:focus{border-color:#3498db}.mce-croprect-handle-move:focus{outline:1px solid #3498db}.mce-imagepanel{overflow:auto;background:black}.mce-imagepanel-bg{position:absolute;background:url('data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==')}.mce-imagepanel img{position:absolute}.mce-imagetool.mce-btn .mce-ico{display:block;width:20px;height:20px;text-align:center;line-height:20px;font-size:20px;padding:5px}.mce-arrow-up{margin-top:12px}.mce-arrow-down{margin-top:-12px}.mce-arrow:before,.mce-arrow:after{position:absolute;left:50%;display:block;width:0;height:0;border-style:solid;border-color:transparent;content:""}.mce-arrow.mce-arrow-up:before{top:-9px;border-bottom-color:rgba(0,0,0,0.2);border-width:0 9px 9px;margin-left:-9px}.mce-arrow.mce-arrow-down:before{bottom:-9px;border-top-color:rgba(0,0,0,0.2);border-width:9px 9px 0;margin-left:-9px}.mce-arrow.mce-arrow-up:after{top:-8px;border-bottom-color:#f0f0f0;border-width:0 8px 8px;margin-left:-8px}.mce-arrow.mce-arrow-down:after{bottom:-8px;border-top-color:#f0f0f0;border-width:8px 8px 0;margin-left:-8px}.mce-arrow.mce-arrow-left:before,.mce-arrow.mce-arrow-left:after{margin:0}.mce-arrow.mce-arrow-left:before{left:8px}.mce-arrow.mce-arrow-left:after{left:9px}.mce-arrow.mce-arrow-right:before,.mce-arrow.mce-arrow-right:after{left:auto;margin:0}.mce-arrow.mce-arrow-right:before{right:8px}.mce-arrow.mce-arrow-right:after{right:9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:before{left:-9px;top:50%;border-right-color:rgba(0,0,0,0.2);border-width:9px 9px 9px 0;margin-top:-9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:after{left:-8px;top:50%;border-right-color:#f0f0f0;border-width:8px 8px 8px 0;margin-top:-8px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left{margin-left:12px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:before{right:-9px;top:50%;border-left-color:rgba(0,0,0,0.2);border-width:9px 0 9px 9px;margin-top:-9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:after{right:-8px;top:50%;border-left-color:#f0f0f0;border-width:8px 0 8px 8px;margin-top:-8px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right{margin-left:-14px}.mce-edit-aria-container>.mce-container-body{display:flex}.mce-edit-aria-container>.mce-container-body .mce-edit-area{flex:1}.mce-edit-aria-container>.mce-container-body .mce-sidebar>.mce-container-body{display:flex;align-items:stretch;height:100%}.mce-edit-aria-container>.mce-container-body .mce-sidebar-panel{min-width:250px;max-width:250px;position:relative}.mce-edit-aria-container>.mce-container-body .mce-sidebar-panel>.mce-container-body{position:absolute;width:100%;height:100%;overflow:auto;top:0;left:0}.mce-sidebar-toolbar{border:0 solid rgba(0,0,0,0.2);border-left-width:1px}.mce-sidebar-toolbar .mce-btn.mce-active,.mce-sidebar-toolbar .mce-btn.mce-active:hover{border:1px solid transparent;border-color:transparent;background-color:#2d8ac7}.mce-sidebar-toolbar .mce-btn.mce-active button,.mce-sidebar-toolbar .mce-btn.mce-active:hover button,.mce-sidebar-toolbar .mce-btn.mce-active button i,.mce-sidebar-toolbar .mce-btn.mce-active:hover button i{color:#fff;text-shadow:1px 1px none}.mce-sidebar-panel{border:0 solid rgba(0,0,0,0.2);border-left-width:1px}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1}.mce-scroll{position:relative}.mce-panel{border:0 solid #cacaca;border:0 solid rgba(0,0,0,0.2);background-color:#f0f0f0}.mce-floatpanel{position:absolute}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;top:0;left:0;background:#FFF;border:1px solid rgba(0,0,0,0.2);border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:rgba(0,0,0,0.2);border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#FFF}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;transform:scale(.1);transition:transform 100ms ease-in,opacity 150ms ease-in}.mce-window.mce-in{transform:scale(1);opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:0;top:0;height:38px;width:38px;text-align:center;cursor:pointer}.mce-window-head .mce-close i{color:#858585}.mce-close:hover i{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:20px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#FFF;border-top:1px solid #c5c5c5}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window-body .mce-listbox{border-color:#ccc}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:white;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-ne,.mce-tooltip-se{margin-left:14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-progress{display:inline-block;position:relative;height:20px}.mce-progress .mce-bar-container{display:inline-block;width:100px;height:100%;margin-right:8px;border:1px solid #ccc;overflow:hidden}.mce-progress .mce-text{display:inline-block;margin-top:auto;margin-bottom:auto;font-size:14px;width:40px;color:#333}.mce-bar{display:block;width:0;height:100%;background-color:#d7d7d7;-webkit-transition:width .2s ease;transition:width .2s ease}.mce-notification{position:absolute;background-color:#F0F0F0;padding:5px;margin-top:5px;border-width:1px;border-style:solid;border-color:#CCCCCC;transition:transform 100ms ease-in,opacity 150ms ease-in;opacity:0}.mce-notification.mce-in{opacity:1}.mce-notification-success{background-color:#dff0d8;border-color:#d6e9c6}.mce-notification-info{background-color:#d9edf7;border-color:#779ECB}.mce-notification-warning{background-color:#fcf8e3;border-color:#faebcc}.mce-notification-error{background-color:#f2dede;border-color:#ebccd1}.mce-notification.mce-has-close{padding-right:15px}.mce-notification .mce-ico{margin-top:5px}.mce-notification-inner{display:inline-block;font-size:14px;margin:5px 8px 4px 8px;text-align:center;white-space:normal;color:#31708f}.mce-notification-inner a{text-decoration:underline;cursor:pointer}.mce-notification .mce-progress{margin-right:8px}.mce-notification .mce-progress .mce-text{margin-top:5px}.mce-notification *,.mce-notification .mce-progress .mce-text{color:#333333}.mce-notification .mce-progress .mce-bar-container{border-color:#CCCCCC}.mce-notification .mce-progress .mce-bar-container .mce-bar{background-color:#333333}.mce-notification-success *,.mce-notification-success .mce-progress .mce-text{color:#3c763d}.mce-notification-success .mce-progress .mce-bar-container{border-color:#d6e9c6}.mce-notification-success .mce-progress .mce-bar-container .mce-bar{background-color:#3c763d}.mce-notification-info *,.mce-notification-info .mce-progress .mce-text{color:#31708f}.mce-notification-info .mce-progress .mce-bar-container{border-color:#779ECB}.mce-notification-info .mce-progress .mce-bar-container .mce-bar{background-color:#31708f}.mce-notification-warning *,.mce-notification-warning .mce-progress .mce-text{color:#8a6d3b}.mce-notification-warning .mce-progress .mce-bar-container{border-color:#faebcc}.mce-notification-warning .mce-progress .mce-bar-container .mce-bar{background-color:#8a6d3b}.mce-notification-error *,.mce-notification-error .mce-progress .mce-text{color:#a94442}.mce-notification-error .mce-progress .mce-bar-container{border-color:#ebccd1}.mce-notification-error .mce-progress .mce-bar-container .mce-bar{background-color:#a94442}.mce-notification .mce-close{position:absolute;top:6px;right:8px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-btn{border:1px solid #b1b1b1;border-color:transparent transparent transparent transparent;position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;background-color:#f0f0f0}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;border-color:#ccc}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#dbdbdb;border-color:#ccc}.mce-btn:active{background-color:#e0e0e0;border-color:#ccc}.mce-btn button{padding:4px 8px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px none}.mce-primary.mce-btn-has-text{min-width:50px}.mce-primary{color:#fff;border:1px solid transparent;border-color:transparent;background-color:#2d8ac7}.mce-primary:hover,.mce-primary:focus{background-color:#257cb6;border-color:transparent}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#206ea1}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px none}.mce-btn .mce-txt{font-size:inherit;line-height:inherit;color:inherit}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-btn-flat{border:0;background:transparent;filter:none}.mce-btn-flat:hover,.mce-btn-flat.mce-active,.mce-btn-flat:focus,.mce-btn-flat:active{border:0;background:#e6e6e6;filter:none}.mce-btn-has-text .mce-ico{padding-right:5px}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px;margin:0;margin-left:2px}.mce-btn-group:not(:first-child){border-left:1px solid #d9d9d9;padding-left:3px;margin-left:3px}.mce-btn-group .mce-first{margin-left:0}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-rtl .mce-btn-group .mce-btn{margin-left:0;margin-right:2px}.mce-rtl .mce-btn-group .mce-first{margin-right:0}.mce-rtl .mce-btn-group:not(:first-child){border-left:none;border-right:1px solid #d9d9d9;padding-right:4px;margin-right:4px}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;background-color:#f0f0f0;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-checkbox .mce-label{vertical-align:middle}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-combobox{position:relative;display:inline-block;*display:inline;*zoom:1;*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox .mce-btn{border:1px solid #c5c5c5;border-left:0;margin:0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-combobox .mce-status{position:absolute;right:2px;top:50%;line-height:16px;margin-top:-8px;font-size:12px;width:15px;height:15px;text-align:center;cursor:pointer}.mce-combobox.mce-has-status input{padding-right:20px}.mce-combobox.mce-has-open .mce-status{right:37px}.mce-combobox .mce-status.mce-i-warning{color:#c09853}.mce-combobox .mce-status.mce-i-checkmark{color:#468847}.mce-menu.mce-combobox-menu{border-top:0;margin-top:0;max-height:200px}.mce-menu.mce-combobox-menu .mce-menu-item{padding:4px 6px 4px 4px;font-size:11px}.mce-menu.mce-combobox-menu .mce-menu-item-sep{padding:0}.mce-menu.mce-combobox-menu .mce-text{font-size:11px}.mce-menu.mce-combobox-menu .mce-menu-item-link,.mce-menu.mce-combobox-menu .mce-menu-item-link b{font-size:11px}.mce-menu.mce-combobox-menu .mce-text b{font-size:11px}.mce-colorbox i{border:1px solid #c5c5c5;width:14px;height:14px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:6px;padding-left:6px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-17px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:1px solid transparent}.mce-colorbutton:hover .mce-open{border-color:#ccc}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:3px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;padding-left:2px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:0}.mce-colorpicker{position:relative;width:250px;height:220px}.mce-colorpicker-sv{position:absolute;top:0;left:0;width:90%;height:100%;border:1px solid #c5c5c5;cursor:crosshair;overflow:hidden}.mce-colorpicker-h-chunk{width:100%}.mce-colorpicker-overlay1,.mce-colorpicker-overlay2{width:100%;height:100%;position:absolute;top:0;left:0}.mce-colorpicker-overlay1{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr='#ffffff', endColorstr='#00ffffff');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff')";background:linear-gradient(to right, #fff, rgba(255,255,255,0))}.mce-colorpicker-overlay2{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#00000000', endColorstr='#000000');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00000000', endColorstr='#000000')";background:linear-gradient(to bottom, rgba(0,0,0,0), #000)}.mce-colorpicker-selector1{background:none;position:absolute;width:12px;height:12px;margin:-8px 0 0 -8px;border:1px solid black;border-radius:50%}.mce-colorpicker-selector2{position:absolute;width:10px;height:10px;border:1px solid white;border-radius:50%}.mce-colorpicker-h{position:absolute;top:0;right:0;width:6.5%;height:100%;border:1px solid #c5c5c5;cursor:crosshair}.mce-colorpicker-h-marker{margin-top:-4px;position:absolute;top:0;left:-1px;width:100%;border:1px solid #333;background:#fff;height:4px;z-index:100}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9E9E9E}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid rgba(0,0,0,0.2);width:100%;height:100%}.mce-infobox{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden;border:1px solid red}.mce-infobox div{display:block;margin:5px}.mce-infobox div button{position:absolute;top:50%;right:4px;cursor:pointer;margin-top:-8px;display:none}.mce-infobox div button:focus{outline:2px solid #ccc}.mce-infobox.mce-has-help div{margin-right:25px}.mce-infobox.mce-has-help button{display:block}.mce-infobox.mce-success{background:#dff0d8;border-color:#d6e9c6}.mce-infobox.mce-success div{color:#3c763d}.mce-infobox.mce-warning{background:#fcf8e3;border-color:#faebcc}.mce-infobox.mce-warning div{color:#8a6d3b}.mce-infobox.mce-error{background:#f2dede;border-color:#ebccd1}.mce-infobox.mce-error div{color:#a94442}.mce-rtl .mce-infobox div{text-align:right;direction:rtl}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-label.mce-success{color:#468847}.mce-label.mce-warning{color:#c09853}.mce-label.mce-error{color:#b94a48}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;filter:none}.mce-menubar .mce-menubtn button{color:#333}.mce-menubar{border:1px solid rgba(217,217,217,0.52)}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:#ccc;background:#fff;filter:none}.mce-menubtn button{color:#333}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text,.mce-menu-item:focus .mce-text{color:white}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-item.mce-disabled:hover{background:#CCC}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:white}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:white}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#3498db}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:white}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:white}.mce-menu-item-normal.mce-active:focus .mce-text,.mce-menu-item-normal.mce-active:focus .mce-ico{color:white}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:white;background-color:#2d8ac7}.mce-menu-item-link{color:#093;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mce-menu-item-link b{color:#093}.mce-menu-item-ellipsis{display:block;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.mce-menu-item:hover *,.mce-menu-item.mce-selected *,.mce-menu-item:focus *{color:white}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:transparent;border-bottom:1px solid rgba(0,0,0,0.1);cursor:default;filter:none}div.mce-menu .mce-menu-item b{font-weight:bold}.mce-menu-item-indent-1{padding-left:20px}.mce-menu-item-indent-2{padding-left:35px}.mce-menu-item-indent-2{padding-left:35px}.mce-menu-item-indent-3{padding-left:40px}.mce-menu-item-indent-4{padding-left:45px}.mce-menu-item-indent-5{padding-left:50px}.mce-menu-item-indent-6{padding-left:55px}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:white}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}.mce-throbber-inline{position:static;height:50px}.mce-menu .mce-throbber-inline{height:25px;background-size:contain}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:-1px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-selectbox{background:#fff;border:1px solid #c5c5c5}.mce-slider{border:1px solid #AAA;background:#EEE;width:100px;height:10px;position:relative;display:block}.mce-slider.mce-vertical{width:10px;height:100px}.mce-slider-handle{border:1px solid #BBB;background:#DDD;display:block;width:13px;height:13px;position:absolute;top:0;left:0;margin-left:-1px;margin-top:-2px}.mce-slider-handle:focus{background:#BBB}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#ccc}.mce-splitbtn button{padding-right:6px;padding-left:6px}.mce-splitbtn .mce-open{padding-right:4px;padding-left:4px}.mce-splitbtn .mce-open.mce-active{background-color:#dbdbdb;outline:1px solid #ccc}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:4px;padding-left:4px}.mce-rtl .mce-splitbtn .mce-open{border-left:0}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tabs,.mce-tabs+.mce-container-body{background:#FFF}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#ffffff;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#FDFDFD}.mce-tab.mce-active{background:#FDFDFD;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;display:inline-block;-webkit-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:#3498db}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px;height:auto}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-variant:normal;font-size:16px;line-height:16px;speak:none;vertical-align:text-top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;background:transparent center center;background-size:cover;width:16px;height:16px;color:#333}.mce-btn-small .mce-ico{font-family:'tinymce-small',Arial}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-alignnone:before{content:"\e003"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-insertdatetime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e02e"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-pastetext:before{content:"\e035"}.mce-i-rotateleft:before{content:"\eaa8"}.mce-i-rotateright:before{content:"\eaa9"}.mce-i-crop:before{content:"\ee78"}.mce-i-editimage:before{content:"\e915"}.mce-i-options:before{content:"\ec6a"}.mce-i-flipv:before{content:"\eaaa"}.mce-i-fliph:before{content:"\eaac"}.mce-i-zoomin:before{content:"\eb35"}.mce-i-zoomout:before{content:"\eb36"}.mce-i-sun:before{content:"\eccc"}.mce-i-moon:before{content:"\eccd"}.mce-i-arrowleft:before{content:"\edc0"}.mce-i-arrowright:before{content:"\e93c"}.mce-i-drop:before{content:"\e935"}.mce-i-contrast:before{content:"\ecd4"}.mce-i-sharpen:before{content:"\eba7"}.mce-i-resize2:before{content:"\edf9"}.mce-i-orientation:before{content:"\e601"}.mce-i-invert:before{content:"\e602"}.mce-i-gamma:before{content:"\e600"}.mce-i-remove:before{content:"\ed6a"}.mce-i-tablerowprops:before{content:"\e604"}.mce-i-tablecellprops:before{content:"\e605"}.mce-i-table2:before{content:"\e606"}.mce-i-tablemergecells:before{content:"\e607"}.mce-i-tableinsertcolbefore:before{content:"\e608"}.mce-i-tableinsertcolafter:before{content:"\e609"}.mce-i-tableinsertrowbefore:before{content:"\e60a"}.mce-i-tableinsertrowafter:before{content:"\e60b"}.mce-i-tablesplitcells:before{content:"\e60d"}.mce-i-tabledelete:before{content:"\e60e"}.mce-i-tableleftheader:before{content:"\e62a"}.mce-i-tabletopheader:before{content:"\e62b"}.mce-i-tabledeleterow:before{content:"\e800"}.mce-i-tabledeletecol:before{content:"\e801"}.mce-i-codesample:before{content:"\e603"}.mce-i-fill:before{content:"\e902"}.mce-i-borderwidth:before{content:"\e903"}.mce-i-line:before{content:"\e904"}.mce-i-count:before{content:"\e905"}.mce-i-translate:before{content:"\e907"}.mce-i-drag:before{content:"\e908"}.mce-i-home:before{content:"\e90b"}.mce-i-upload:before{content:"\e914"}.mce-i-bubble:before{content:"\e91c"}.mce-i-user:before{content:"\e91d"}.mce-i-lock:before{content:"\e926"}.mce-i-unlock:before{content:"\e927"}.mce-i-settings:before{content:"\e928"}.mce-i-remove2:before{content:"\e92a"}.mce-i-menu:before{content:"\e92d"}.mce-i-warning:before{content:"\e930"}.mce-i-question:before{content:"\e931"}.mce-i-pluscircle:before{content:"\e932"}.mce-i-info:before{content:"\e933"}.mce-i-notice:before{content:"\e934"}.mce-i-arrowup:before{content:"\e93b"}.mce-i-arrowdown:before{content:"\e93d"}.mce-i-arrowup2:before{content:"\e93f"}.mce-i-arrowdown2:before{content:"\e940"}.mce-i-menu2:before{content:"\e941"}.mce-i-newtab:before{content:"\e961"}.mce-i-a11y:before{content:"\e900"}.mce-i-plus:before{content:"\e93a"}.mce-i-insert:before{content:"\e93a"}.mce-i-minus:before{content:"\e939"}.mce-i-books:before{content:"\e911"}.mce-i-reload:before{content:"\e906"}.mce-i-toc:before{content:"\e901"}.mce-i-checkmark:before{content:"\e033"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-insert{font-size:14px}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#BBB}
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.inline.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.inline.min.css
deleted file mode 100644
index 0a3d965c0..000000000
--- a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.inline.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;-ms-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment{background-color:#fff0b7}.tox-comments-visible .tox-comment--active{background-color:#ffe168}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:10000}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img::-moz-selection{background:0 0}.mce-content-body img::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.min.css
deleted file mode 100644
index 07067404c..000000000
--- a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;-ms-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment{background-color:#fff0b7}.tox-comments-visible .tox-comment--active{background-color:#ffe168}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%236d737b%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#f8f8f2;background:0 0;text-shadow:0 1px rgba(0,0,0,.3);font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;-ms-hyphens:none;hyphens:none}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto;border-radius:.3em}:not(pre)>code[class*=language-],pre[class*=language-]{background:#282a36}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#6272a4}.token.punctuation{color:#f8f8f2}.namespace{opacity:.7}.token.constant,.token.deleted,.token.property,.token.symbol,.token.tag{color:#ff79c6}.token.boolean,.token.number{color:#bd93f9}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#50fa7b}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url,.token.variable{color:#f8f8f2}.token.atrule,.token.attr-value,.token.class-name,.token.function{color:#f1fa8c}.token.keyword{color:#8be9fd}.token.important,.token.regex{color:#ffb86c}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:10000}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #4099ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #4099ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #4099ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #4099ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #4099ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#4099ff}.mce-content-body .mce-edit-focus{outline:3px solid #4099ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid transparent;bottom:-1px;content:'';left:-1px;mix-blend-mode:lighten;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img::-moz-selection{background:0 0}.mce-content-body img::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#4099ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}body{font-family:sans-serif}table{border-collapse:collapse}
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.mobile.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.mobile.min.css
deleted file mode 100644
index 35f7dc08b..000000000
--- a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/content.mobile.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection{background-color:green;display:inline-block;opacity:.5;position:absolute}body{-webkit-text-size-adjust:none}body img{max-width:96vw}body table img{max-width:95%}body{font-family:sans-serif}table{border-collapse:collapse}
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff b/cps/static/js/libs/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff
deleted file mode 100644
index 1e3be038a607cb7c2544ed8ae3d6621f77bf4c38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4624
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

diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.min.css
deleted file mode 100644
index 776a5af0c..000000000
--- a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.tox{box-shadow:none;box-sizing:content-box;color:#2a3746;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #000;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox-tinymce-inline{border:none;box-shadow:none}.tox-tinymce-inline .tox-editor-header{background-color:transparent;border:1px solid #000;border-radius:0;box-shadow:none}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border:1px solid #000;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>:last-child:not(:only-child){border-color:#000;border-style:solid}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(32,122,183,.5);border-color:#207ab7;color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description>:last-child{border-color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a .tox-icon{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.5);border-color:rgba(255,165,0,.8);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description>:last-child{border-color:rgba(255,165,0,.8)}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn a .tox-icon{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.5);border-color:rgba(204,0,0,.8);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description>:last-child{border-color:rgba(204,0,0,.8)}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--error a .tox-icon{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.5);border-color:rgba(120,171,70,.8);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{border-color:rgba(120,171,70,.8)}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--success a .tox-icon{color:#fff}.tox .tox-dialog__body-content .accessibility-issue__header h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description>:last-child{border-left-width:1px;padding-left:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description>:last-child{border-right-width:1px;padding-right:4px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;text-align:center;text-decoration:none;text-transform:capitalize;white-space:nowrap}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button--secondary{background-color:#3d546f;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#3d546f;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#fff;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:capitalize}.tox .tox-button--secondary[disabled]{background-color:#3d546f;background-image:none;border-color:#3d546f;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:hover:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:active:not(:disabled){background-color:#2b3b4e;background-image:none;border-color:#2b3b4e;box-shadow:none;color:#fff}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#fff}.tox .tox-button--naked[disabled]{background-color:#3d546f;border-color:#3d546f;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#34485f;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--naked:focus:not(:disabled){background-color:#34485f;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--naked:active:not(:disabled){background-color:#2b3b4e;border-color:#2b3b4e;box-shadow:none;color:#fff}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#fff}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(255,255,255,.2)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(255,255,255,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#1a1a1a;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#333;color:#fff;cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;color:#fff;cursor:pointer;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#2b3b4e;color:#fff}.tox .tox-collection--list .tox-collection__item--active{background-color:#4a5562}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#757d87;color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#4a5562}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#757d87;color:#fff}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#4a5562;color:#fff}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;-ms-flex-preferred-size:auto;font-size:14px;font-style:normal;font-weight:400;line-height:24px;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(255,255,255,.5);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#fff}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#2b3b4e;border:1px solid #1a1a1a;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:2px 0 3px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{-ms-grid-row-align:center;align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{-ms-grid-row-align:center;align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #000}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #000}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-icon-rtl .tox-collection__item-icon svg{transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#4a5562}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#2b3b4e;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#2b3b4e;border:1px solid #000;border-radius:3px;box-shadow:0 4px 8px 0 rgba(42,55,70,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#fff;display:flex;justify-content:space-between}.tox .tox-comment__date{color:rgba(255,255,255,.5);font-size:12px}.tox .tox-comment__body{color:#fff;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(255,255,255,.5);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#2b3b4e;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(43,59,78,0),#2b3b4e);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#2b3b4e;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#fff;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#2b3b4e;box-shadow:0 0 8px 8px #2b3b4e;color:#fff;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#2b3b4e;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(255,255,255,.5)}.tox .tox-user__name{color:rgba(255,255,255,.5);font-size:12px;font-style:normal;font-weight:700;text-transform:uppercase}.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(34,47,62,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#222f3e}.tox .tox-dialog{background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(42,55,70,.15),0 0 40px 1px rgba(42,55,70,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#2b3b4e;border-bottom:none;color:#fff;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#fff;display:flex;flex:1;-ms-flex-preferred-size:auto;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;padding:16px 16px}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(255,255,255,.5);display:inline-block;font-size:14px;line-height:1.3;margin-bottom:8px;text-decoration:none;white-space:nowrap}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto;max-height:650px;overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:none}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#185d8c;text-decoration:none}.tox .tox-dialog__body-content a:active{color:#185d8c;text-decoration:none}.tox .tox-dialog__body-content svg{fill:#fff}.tox .tox-dialog__body-content ul{display:block;list-style-type:disc;margin-bottom:16px;-webkit-margin-end:0;margin-inline-end:0;-webkit-margin-start:0;margin-inline-start:0;-webkit-padding-start:2.5rem;padding-inline-start:2.5rem}.tox .tox-dialog__body-content .tox-form__group h1{color:#fff;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#fff;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#2b3b4e;border-top:1px solid #000;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(34,47,62,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #000}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;-ms-flex-preferred-size:auto;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}.tox.tox-platform-ie .tox-dialog-wrap{position:-ms-device-fixed}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #000;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(255,255,255,.5);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;-ms-flex-preferred-size:auto;overflow:hidden;position:relative}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;-ms-flex-preferred-size:auto;height:100%;position:absolute;width:100%}.tox.tox-inline-edit-area{border:1px dotted #000}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{z-index:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{box-shadow:none;transition:box-shadow .5s}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(42,55,70,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(255,255,255,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(255,255,255,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #2b3b4e;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(255,255,255,.5);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-textarea{flex:1;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;-ms-flex-preferred-size:auto;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#222f3e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#2b3b4e;border-color:#207ab7;box-shadow:none;outline:0}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#fff}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#fff}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#2b3b4e;border-color:#207ab7;box-shadow:none;outline:0}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox-fullscreen{border:0;height:100%;left:0;margin:0;overflow:hidden;-ms-scroll-chaining:none;overscroll-behavior:none;padding:0;position:fixed;top:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox.tox-tinymce.tox-fullscreen{background-color:transparent;z-index:1200}.tox-shadowhost.tox-fullscreen{z-index:1200}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-image-tools{width:100%}.tox .tox-image-tools__toolbar{align-items:center;display:flex;justify-content:center}.tox .tox-image-tools__image{background-color:#666;height:380px;overflow:auto;position:relative;width:100%}.tox .tox-image-tools__image,.tox .tox-image-tools__image+.tox-image-tools__toolbar{margin-top:8px}.tox .tox-image-tools__image-bg{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools__toolbar>.tox-spacer{flex:1;-ms-flex-preferred-size:auto}.tox .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-slider:not(:first-of-type){margin-left:8px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-button+.tox-slider{margin-left:32px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-slider+.tox-button{margin-left:32px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-slider:not(:first-of-type){margin-right:8px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-button+.tox-slider{margin-right:32px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-slider+.tox-button{margin-right:32px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#000;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:#fff;display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#2b3b4e;border:1px solid #000;border-radius:3px;box-shadow:0 4px 8px 0 rgba(42,55,70,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E") left 0 top 0 #222f3e;background-color:#222f3e;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 4px 0 4px}.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #000}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn--active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:-ms-grid;display:grid;font-size:14px;font-weight:400;-ms-grid-columns:minmax(40px,1fr) auto minmax(40px,1fr);grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#e4eeda;border-color:#d7e6c8;color:#fff}.tox .tox-notification--success p{color:#fff}.tox .tox-notification--success a{color:#547831}.tox .tox-notification--success svg{fill:#fff}.tox .tox-notification--error{background-color:#f8dede;border-color:#f2bfbf;color:#fff}.tox .tox-notification--error p{color:#fff}.tox .tox-notification--error a{color:#c00}.tox .tox-notification--error svg{fill:#fff}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#fffaea;border-color:#ffe89d;color:#fff}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#fff}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#fff}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#fff}.tox .tox-notification--info{background-color:#d9edf7;border-color:#779ecb;color:#fff}.tox .tox-notification--info p{color:#fff}.tox .tox-notification--info a{color:#fff}.tox .tox-notification--info svg{fill:#fff}.tox .tox-notification__body{-ms-grid-row-align:center;align-self:center;color:#fff;font-size:14px;-ms-grid-column-span:1;grid-column-end:3;-ms-grid-column:2;grid-column-start:2;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{-ms-grid-row-align:center;align-self:center;-ms-grid-column-span:1;grid-column-end:2;-ms-grid-column:1;grid-column-start:1;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;-ms-grid-column-align:end;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{-ms-grid-row-align:start;align-self:start;-ms-grid-column-span:1;grid-column-end:4;-ms-grid-column:3;grid-column-start:3;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;-ms-grid-column-align:end;justify-self:end}.tox .tox-notification .tox-progress-bar{-ms-grid-column-span:3;grid-column-end:4;-ms-grid-column:1;grid-column-start:1;-ms-grid-row-span:1;grid-row-end:3;-ms-grid-row:2;grid-row-start:2;-ms-grid-column-align:center;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar{flex-wrap:nowrap}.tox .tox-pop__dialog{background-color:#222f3e;border:1px solid #000;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;position:absolute;width:0}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#222f3e transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#000 transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #222f3e transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #000 transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #222f3e transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #000 transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #222f3e;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #000;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;-ms-flex-preferred-size:0;min-height:0}.tox .tox-sidebar{background-color:#222f3e;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;-ms-flex-preferred-size:auto;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #000;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(255,255,255,.5);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#222f3e;border-top:1px solid #000;color:#fff;display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:flex-end;overflow:hidden}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;margin-right:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:#fff;text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){cursor:pointer;text-decoration:underline}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-left:1ch}.tox .tox-statusbar__resize-handle svg{display:block;fill:#fff}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(34,47,62,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#fff}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#4a5562;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:hover svg{fill:#fff}.tox .tox-tbtn:active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:active svg{fill:#fff}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#fff}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#fff}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#fff}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{-ms-grid-row-align:stretch;align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tbtn--select{margin:2px 0 3px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:2px 0 3px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #4a5562 inset}.tox .tox-split-button:focus{background:#4a5562;box-shadow:none;color:#fff}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-toolbar-overlord{background-color:#222f3e}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E") left 0 top 0 #222f3e;background-color:#222f3e;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #000;margin-top:-1px}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #000}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#222f3e;border:1px solid #000;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15)}.tox[dir=rtl] .tox-tbtn__icon-rtl svg{transform:rotateY(180deg)}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #000}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #000}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#3d546f;border-radius:3px;box-shadow:0 2px 4px rgba(42,55,70,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #3d546f;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #3d546f;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #3d546f;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #3d546f;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-well{border:1px solid #000;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #000;border-radius:3px;display:flex;flex:1;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-image-tools-edit-panel{height:60px}.tox .tox-image-tools__sidebar{height:60px}
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.mobile.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.mobile.min.css
deleted file mode 100644
index 3a45cacf0..000000000
--- a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.mobile.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.tinymce-mobile-outer-container{all:initial;display:block}.tinymce-mobile-outer-container *{border:0;box-sizing:initial;cursor:inherit;float:none;line-height:1;margin:0;outline:0;padding:0;-webkit-tap-highlight-color:transparent;text-shadow:none;white-space:nowrap}.tinymce-mobile-icon-arrow-back::before{content:"\e5cd"}.tinymce-mobile-icon-image::before{content:"\e412"}.tinymce-mobile-icon-cancel-circle::before{content:"\e5c9"}.tinymce-mobile-icon-full-dot::before{content:"\e061"}.tinymce-mobile-icon-align-center::before{content:"\e234"}.tinymce-mobile-icon-align-left::before{content:"\e236"}.tinymce-mobile-icon-align-right::before{content:"\e237"}.tinymce-mobile-icon-bold::before{content:"\e238"}.tinymce-mobile-icon-italic::before{content:"\e23f"}.tinymce-mobile-icon-unordered-list::before{content:"\e241"}.tinymce-mobile-icon-ordered-list::before{content:"\e242"}.tinymce-mobile-icon-font-size::before{content:"\e245"}.tinymce-mobile-icon-underline::before{content:"\e249"}.tinymce-mobile-icon-link::before{content:"\e157"}.tinymce-mobile-icon-unlink::before{content:"\eca2"}.tinymce-mobile-icon-color::before{content:"\e891"}.tinymce-mobile-icon-previous::before{content:"\e314"}.tinymce-mobile-icon-next::before{content:"\e315"}.tinymce-mobile-icon-large-font::before,.tinymce-mobile-icon-style-formats::before{content:"\e264"}.tinymce-mobile-icon-undo::before{content:"\e166"}.tinymce-mobile-icon-redo::before{content:"\e15a"}.tinymce-mobile-icon-removeformat::before{content:"\e239"}.tinymce-mobile-icon-small-font::before{content:"\e906"}.tinymce-mobile-format-matches::after,.tinymce-mobile-icon-readonly-back::before{content:"\e5ca"}.tinymce-mobile-icon-small-heading::before{content:"small"}.tinymce-mobile-icon-large-heading::before{content:"large"}.tinymce-mobile-icon-large-heading::before,.tinymce-mobile-icon-small-heading::before{font-family:sans-serif;font-size:80%}.tinymce-mobile-mask-edit-icon::before{content:"\e254"}.tinymce-mobile-icon-back::before{content:"\e5c4"}.tinymce-mobile-icon-heading::before{content:"Headings";font-family:sans-serif;font-size:80%;font-weight:700}.tinymce-mobile-icon-h1::before{content:"H1";font-weight:700}.tinymce-mobile-icon-h2::before{content:"H2";font-weight:700}.tinymce-mobile-icon-h3::before{content:"H3";font-weight:700}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask{align-items:center;display:flex;justify-content:center;background:rgba(51,51,51,.5);height:100%;position:absolute;top:0;width:100%}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container{align-items:center;border-radius:50%;display:flex;flex-direction:column;font-family:sans-serif;font-size:1em;justify-content:space-between}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .mixin-menu-item{align-items:center;display:flex;justify-content:center;border-radius:50%;height:2.1em;width:2.1em}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section{align-items:center;display:flex;justify-content:center;flex-direction:column;font-size:1em}@media only screen and (min-device-width:700px){.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section{font-size:1.2em}}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon{align-items:center;display:flex;justify-content:center;border-radius:50%;height:2.1em;width:2.1em;background-color:#fff;color:#207ab7}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon::before{content:"\e900";font-family:tinymce-mobile,sans-serif}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section:not(.tinymce-mobile-mask-tap-icon-selected) .tinymce-mobile-mask-tap-icon{z-index:2}.tinymce-mobile-android-container.tinymce-mobile-android-maximized{background:#fff;border:none;bottom:0;display:flex;flex-direction:column;left:0;position:fixed;right:0;top:0}.tinymce-mobile-android-container:not(.tinymce-mobile-android-maximized){position:relative}.tinymce-mobile-android-container .tinymce-mobile-editor-socket{display:flex;flex-grow:1}.tinymce-mobile-android-container .tinymce-mobile-editor-socket iframe{display:flex!important;flex-grow:1;height:auto!important}.tinymce-mobile-android-scroll-reload{overflow:hidden}:not(.tinymce-mobile-readonly-mode)>.tinymce-mobile-android-selection-context-toolbar{margin-top:23px}.tinymce-mobile-toolstrip{background:#fff;display:flex;flex:0 0 auto;z-index:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar{align-items:center;background-color:#fff;border-bottom:1px solid #ccc;display:flex;flex:1;height:2.5em;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group{align-items:center;display:flex;height:100%;flex-shrink:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group>div{align-items:center;display:flex;height:100%;flex:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-exit-container{background:#f44336}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-toolbar-scrollable-group{flex-grow:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item{padding-left:.5em;padding-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button{align-items:center;display:flex;height:80%;margin-left:2px;margin-right:2px}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button.tinymce-mobile-toolbar-button-selected{background:#c8cbcf;color:#ccc}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:first-of-type,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:last-of-type{background:#207ab7;color:#eceff1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group{align-items:center;display:flex;height:100%;flex:1;padding-bottom:.4em;padding-top:.4em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog{display:flex;min-height:1.5em;overflow:hidden;padding-left:0;padding-right:0;position:relative;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain{display:flex;height:100%;transition:left cubic-bezier(.4,0,1,1) .15s;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen{display:flex;flex:0 0 auto;justify-content:space-between;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen input{font-family:Sans-serif}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container{display:flex;flex-grow:1;position:relative}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container .tinymce-mobile-input-container-x{-ms-grid-row-align:center;align-self:center;background:inherit;border:none;border-radius:50%;color:#888;font-size:.6em;font-weight:700;height:100%;padding-right:2px;position:absolute;right:0}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container.tinymce-mobile-input-container-empty .tinymce-mobile-input-container-x{display:none}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous{align-items:center;display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous::before{align-items:center;display:flex;font-weight:700;height:100%;padding-left:.5em;padding-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next.tinymce-mobile-toolbar-navigation-disabled::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous.tinymce-mobile-toolbar-navigation-disabled::before{visibility:hidden}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item{color:#ccc;font-size:10px;line-height:10px;margin:0 2px;padding-top:3px}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item.tinymce-mobile-dot-active{color:#c8cbcf}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-font::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-heading::before{margin-left:.5em;margin-right:.9em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-font::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-heading::before{margin-left:.9em;margin-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider{display:flex;flex:1;margin-left:0;margin-right:0;padding:.28em 0;position:relative}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container{align-items:center;display:flex;flex-grow:1;height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container .tinymce-mobile-slider-size-line{background:#ccc;display:flex;flex:1;height:.2em;margin-bottom:.3em;margin-top:.3em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container{padding-left:2em;padding-right:2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container{align-items:center;display:flex;flex-grow:1;height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container .tinymce-mobile-slider-gradient{background:linear-gradient(to right,red 0,#feff00 17%,#0f0 33%,#00feff 50%,#00f 67%,#ff00fe 83%,red 100%);display:flex;flex:1;height:.2em;margin-bottom:.3em;margin-top:.3em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-black{background:#000;height:.2em;margin-bottom:.3em;margin-top:.3em;width:1.2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-white{background:#fff;height:.2em;margin-bottom:.3em;margin-top:.3em;width:1.2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb{align-items:center;background-clip:padding-box;background-color:#455a64;border:.5em solid rgba(136,136,136,0);border-radius:3em;bottom:0;color:#fff;display:flex;height:.5em;justify-content:center;left:-10px;margin:auto;position:absolute;top:0;transition:border 120ms cubic-bezier(.39,.58,.57,1);width:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb.tinymce-mobile-thumb-active{border:.5em solid rgba(136,136,136,.39)}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group>div{align-items:center;display:flex;height:100%;flex:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper{flex-direction:column;justify-content:center}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item{align-items:center;display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item:not(.tinymce-mobile-serialised-dialog){height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-container{display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input{background:#fff;border:none;border-radius:0;color:#455a64;flex-grow:1;font-size:.85em;padding-bottom:.1em;padding-left:5px;padding-top:.1em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::-webkit-input-placeholder{color:#888}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::placeholder{color:#888}.tinymce-mobile-dropup{background:#fff;display:flex;overflow:hidden;width:100%}.tinymce-mobile-dropup.tinymce-mobile-dropup-shrinking{transition:height .3s ease-out}.tinymce-mobile-dropup.tinymce-mobile-dropup-growing{transition:height .3s ease-in}.tinymce-mobile-dropup.tinymce-mobile-dropup-closed{flex-grow:0}.tinymce-mobile-dropup.tinymce-mobile-dropup-open:not(.tinymce-mobile-dropup-growing){flex-grow:1}.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:200px}@media only screen and (orientation:landscape){.tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:200px}}@media only screen and (min-device-width :320px) and (max-device-width :568px) and (orientation :landscape){.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:150px}}.tinymce-mobile-styles-menu{font-family:sans-serif;outline:4px solid #000;overflow:hidden;position:relative;width:100%}.tinymce-mobile-styles-menu [role=menu]{display:flex;flex-direction:column;height:100%;position:absolute;width:100%}.tinymce-mobile-styles-menu [role=menu].transitioning{transition:transform .5s ease-in-out}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item{border-bottom:1px solid #ddd;color:#455a64;cursor:pointer;display:flex;padding:1em 1em;position:relative}.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser .tinymce-mobile-styles-collapse-icon::before{color:#455a64;content:"\e314";font-family:tinymce-mobile,sans-serif}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-styles-item-is-menu::after{color:#455a64;content:"\e315";font-family:tinymce-mobile,sans-serif;padding-left:1em;padding-right:1em;position:absolute;right:0}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-format-matches::after{font-family:tinymce-mobile,sans-serif;padding-left:1em;padding-right:1em;position:absolute;right:0}.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser,.tinymce-mobile-styles-menu .tinymce-mobile-styles-separator{align-items:center;background:#fff;border-top:#455a64;color:#455a64;display:flex;min-height:2.5em;padding-left:1em;padding-right:1em}.tinymce-mobile-styles-menu [data-transitioning-destination=before][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state=before]{transform:translate(-100%)}.tinymce-mobile-styles-menu [data-transitioning-destination=current][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state=current]{transform:translate(0)}.tinymce-mobile-styles-menu [data-transitioning-destination=after][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state=after]{transform:translate(100%)}@font-face{font-family:tinymce-mobile;font-style:normal;font-weight:400;src:url(fonts/tinymce-mobile.woff?8x92w3) format('woff')}@media (min-device-width:700px){.tinymce-mobile-outer-container,.tinymce-mobile-outer-container input{font-size:25px}}@media (max-device-width:700px){.tinymce-mobile-outer-container,.tinymce-mobile-outer-container input{font-size:18px}}.tinymce-mobile-icon{font-family:tinymce-mobile,sans-serif}.mixin-flex-and-centre{align-items:center;display:flex;justify-content:center}.mixin-flex-bar{align-items:center;display:flex;height:100%}.tinymce-mobile-outer-container .tinymce-mobile-editor-socket iframe{background-color:#fff;width:100%}.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{background-color:#207ab7;border-radius:50%;bottom:1em;color:#fff;font-size:1em;height:2.1em;position:fixed;right:2em;width:2.1em;align-items:center;display:flex;justify-content:center}@media only screen and (min-device-width:700px){.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{font-size:1.2em}}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket{height:300px;overflow:hidden}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket iframe{height:100%}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-toolstrip{display:none}input[type=file]::-webkit-file-upload-button{display:none}@media only screen and (min-device-width :320px) and (max-device-width :568px) and (orientation :landscape){.tinymce-mobile-ios-container .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{bottom:50%}}
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css
deleted file mode 100644
index 9ba6e02c8..000000000
--- a/cps/static/js/libs/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;left:0;margin:0;overflow:hidden;-ms-scroll-chaining:none;overscroll-behavior:none;padding:0;position:fixed;top:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox.tox-tinymce.tox-fullscreen{background-color:transparent;z-index:1200}.tox-shadowhost.tox-fullscreen{z-index:1200}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide/content.inline.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide/content.inline.min.css
index 0a3d965c0..b4ab9a3a5 100644
--- a/cps/static/js/libs/tinymce/skins/ui/oxide/content.inline.min.css
+++ b/cps/static/js/libs/tinymce/skins/ui/oxide/content.inline.min.css
@@ -4,4 +4,4 @@
  * For LGPL see License.txt in the project root for license information.
  * For commercial licenses see https://www.tiny.cloud/
  */
-.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;-ms-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment{background-color:#fff0b7}.tox-comments-visible .tox-comment--active{background-color:#ffe168}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:10000}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img::-moz-selection{background:0 0}.mce-content-body img::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}
+.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;-ms-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment{background-color:#fff0b7}.tox-comments-visible .tox-comment--active{background-color:#ffe168}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img::-moz-selection{background:0 0}.mce-content-body img::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide/content.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide/content.min.css
index 40b3378dc..844858d06 100644
--- a/cps/static/js/libs/tinymce/skins/ui/oxide/content.min.css
+++ b/cps/static/js/libs/tinymce/skins/ui/oxide/content.min.css
@@ -4,4 +4,4 @@
  * For LGPL see License.txt in the project root for license information.
  * For commercial licenses see https://www.tiny.cloud/
  */
-.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;-ms-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment{background-color:#fff0b7}.tox-comments-visible .tox-comment--active{background-color:#ffe168}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:10000}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img::-moz-selection{background:0 0}.mce-content-body img::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}body{font-family:sans-serif}table{border-collapse:collapse}
+.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;-ms-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment{background-color:#fff0b7}.tox-comments-visible .tox-comment--active{background-color:#ffe168}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img::-moz-selection{background:0 0}.mce-content-body img::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}body{font-family:sans-serif}table{border-collapse:collapse}
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide/skin.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide/skin.min.css
index 13037c134..f570b8e49 100644
--- a/cps/static/js/libs/tinymce/skins/ui/oxide/skin.min.css
+++ b/cps/static/js/libs/tinymce/skins/ui/oxide/skin.min.css
@@ -4,4 +4,4 @@
  * For LGPL see License.txt in the project root for license information.
  * For commercial licenses see https://www.tiny.cloud/
  */
-.tox{box-shadow:none;box-sizing:content-box;color:#222f3e;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #ccc;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox-tinymce-inline{border:none;box-shadow:none}.tox-tinymce-inline .tox-editor-header{background-color:transparent;border:1px solid #ccc;border-radius:0;box-shadow:none}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border:1px solid #ccc;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>:last-child:not(:only-child){border-color:#ccc;border-style:solid}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(32,122,183,.1);border-color:rgba(32,122,183,.4);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description>:last-child{border-color:rgba(32,122,183,.4)}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info a .tox-icon{color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.1);border-color:rgba(255,165,0,.5);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description>:last-child{border-color:rgba(255,165,0,.5)}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#cc8500}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#cc8500}.tox .tox-dialog__body-content .accessibility-issue--warn a .tox-icon{color:#cc8500}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.1);border-color:rgba(204,0,0,.4);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description>:last-child{border-color:rgba(204,0,0,.4)}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#c00}.tox .tox-dialog__body-content .accessibility-issue--error a .tox-icon{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.1);border-color:rgba(120,171,70,.4);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{border-color:rgba(120,171,70,.4)}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#78ab46}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#78ab46}.tox .tox-dialog__body-content .accessibility-issue--success a .tox-icon{color:#78ab46}.tox .tox-dialog__body-content .accessibility-issue__header h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description>:last-child{border-left-width:1px;padding-left:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description>:last-child{border-right-width:1px;padding-right:4px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;text-align:center;text-decoration:none;text-transform:capitalize;white-space:nowrap}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button--secondary{background-color:#f0f0f0;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#f0f0f0;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#222f3e;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:capitalize}.tox .tox-button--secondary[disabled]{background-color:#f0f0f0;background-image:none;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:hover:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:active:not(:disabled){background-color:#d6d6d6;background-image:none;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked[disabled]{background-color:#f0f0f0;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:focus:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:active:not(:disabled){background-color:#d6d6d6;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#222f3e}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(34,47,62,.3)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(34,47,62,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#ccc;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#e6e6e6;color:rgba(34,47,62,.7);cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;color:#222f3e;cursor:pointer;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#fff;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#dee0e2;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;-ms-flex-preferred-size:auto;font-size:14px;font-style:normal;font-weight:400;line-height:24px;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(34,47,62,.7);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#222f3e}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:2px 0 3px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{-ms-grid-row-align:center;align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{-ms-grid-row-align:center;align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #ccc}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #ccc}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-icon-rtl .tox-collection__item-icon svg{transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#dee0e2}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#fff;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#222f3e;display:flex;justify-content:space-between}.tox .tox-comment__date{color:rgba(34,47,62,.7);font-size:12px}.tox .tox-comment__body{color:#222f3e;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(34,47,62,.7);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#fff;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(255,255,255,0),#fff);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#fff;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#222f3e;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#fff;box-shadow:0 0 8px 8px #fff;color:#222f3e;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#fff;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(34,47,62,.7)}.tox .tox-user__name{color:rgba(34,47,62,.7);font-size:12px;font-style:normal;font-weight:700;text-transform:uppercase}.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(255,255,255,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#fff}.tox .tox-dialog{background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(34,47,62,.15),0 0 40px 1px rgba(34,47,62,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#fff;border-bottom:none;color:#222f3e;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#222f3e;display:flex;flex:1;-ms-flex-preferred-size:auto;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;padding:16px 16px}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(34,47,62,.7);display:inline-block;font-size:14px;line-height:1.3;margin-bottom:8px;text-decoration:none;white-space:nowrap}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto;max-height:650px;overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:none}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#185d8c;text-decoration:none}.tox .tox-dialog__body-content a:active{color:#185d8c;text-decoration:none}.tox .tox-dialog__body-content svg{fill:#222f3e}.tox .tox-dialog__body-content ul{display:block;list-style-type:disc;margin-bottom:16px;-webkit-margin-end:0;margin-inline-end:0;-webkit-margin-start:0;margin-inline-start:0;-webkit-padding-start:2.5rem;padding-inline-start:2.5rem}.tox .tox-dialog__body-content .tox-form__group h1{color:#222f3e;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#222f3e;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#fff;border-top:1px solid #ccc;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(255,255,255,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #ccc}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;-ms-flex-preferred-size:auto;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}.tox.tox-platform-ie .tox-dialog-wrap{position:-ms-device-fixed}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #ccc;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(34,47,62,.7);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;-ms-flex-preferred-size:auto;overflow:hidden;position:relative}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;-ms-flex-preferred-size:auto;height:100%;position:absolute;width:100%}.tox.tox-inline-edit-area{border:1px dotted #ccc}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{z-index:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{box-shadow:none;transition:box-shadow .5s}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(34,47,62,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(0,0,0,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(0,0,0,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #fff;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(34,47,62,.7);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-textarea{flex:1;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;-ms-flex-preferred-size:auto;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:0}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#222f3e}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#222f3e}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:0}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox-fullscreen{border:0;height:100%;left:0;margin:0;overflow:hidden;-ms-scroll-chaining:none;overscroll-behavior:none;padding:0;position:fixed;top:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox.tox-tinymce.tox-fullscreen{background-color:transparent;z-index:1200}.tox-shadowhost.tox-fullscreen{z-index:1200}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-image-tools{width:100%}.tox .tox-image-tools__toolbar{align-items:center;display:flex;justify-content:center}.tox .tox-image-tools__image{background-color:#666;height:380px;overflow:auto;position:relative;width:100%}.tox .tox-image-tools__image,.tox .tox-image-tools__image+.tox-image-tools__toolbar{margin-top:8px}.tox .tox-image-tools__image-bg{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools__toolbar>.tox-spacer{flex:1;-ms-flex-preferred-size:auto}.tox .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-slider:not(:first-of-type){margin-left:8px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-button+.tox-slider{margin-left:32px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-slider+.tox-button{margin-left:32px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-slider:not(:first-of-type){margin-right:8px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-button+.tox-slider{margin-right:32px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-slider+.tox-button{margin-right:32px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#ccc;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:rgba(34,47,62,.7);display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 4px 0 4px}.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #ccc}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn--active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:-ms-grid;display:grid;font-size:14px;font-weight:400;-ms-grid-columns:minmax(40px,1fr) auto minmax(40px,1fr);grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#e4eeda;border-color:#d7e6c8;color:#222f3e}.tox .tox-notification--success p{color:#222f3e}.tox .tox-notification--success a{color:#547831}.tox .tox-notification--success svg{fill:#222f3e}.tox .tox-notification--error{background-color:#f8dede;border-color:#f2bfbf;color:#222f3e}.tox .tox-notification--error p{color:#222f3e}.tox .tox-notification--error a{color:#c00}.tox .tox-notification--error svg{fill:#222f3e}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#fffaea;border-color:#ffe89d;color:#222f3e}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#222f3e}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#222f3e}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#222f3e}.tox .tox-notification--info{background-color:#d9edf7;border-color:#779ecb;color:#222f3e}.tox .tox-notification--info p{color:#222f3e}.tox .tox-notification--info a{color:#222f3e}.tox .tox-notification--info svg{fill:#222f3e}.tox .tox-notification__body{-ms-grid-row-align:center;align-self:center;color:#222f3e;font-size:14px;-ms-grid-column-span:1;grid-column-end:3;-ms-grid-column:2;grid-column-start:2;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{-ms-grid-row-align:center;align-self:center;-ms-grid-column-span:1;grid-column-end:2;-ms-grid-column:1;grid-column-start:1;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;-ms-grid-column-align:end;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{-ms-grid-row-align:start;align-self:start;-ms-grid-column-span:1;grid-column-end:4;-ms-grid-column:3;grid-column-start:3;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;-ms-grid-column-align:end;justify-self:end}.tox .tox-notification .tox-progress-bar{-ms-grid-column-span:3;grid-column-end:4;-ms-grid-column:1;grid-column-start:1;-ms-grid-row-span:1;grid-row-end:3;-ms-grid-row:2;grid-row-start:2;-ms-grid-column-align:center;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar{flex-wrap:nowrap}.tox .tox-pop__dialog{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;position:absolute;width:0}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#fff transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#ccc transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #fff transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #ccc transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #fff transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #ccc transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #fff;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #ccc;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;-ms-flex-preferred-size:0;min-height:0}.tox .tox-sidebar{background-color:#fff;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;-ms-flex-preferred-size:auto;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #ccc;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(34,47,62,.7);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#fff;border-top:1px solid #ccc;color:rgba(34,47,62,.7);display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:flex-end;overflow:hidden}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;margin-right:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:rgba(34,47,62,.7);text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){cursor:pointer;text-decoration:underline}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-left:1ch}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(34,47,62,.7)}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(255,255,255,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#222f3e}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#dee0e2;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:hover svg{fill:#222f3e}.tox .tox-tbtn:active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:active svg{fill:#222f3e}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#222f3e}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{-ms-grid-row-align:stretch;align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tbtn--select{margin:2px 0 3px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:2px 0 3px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #dee0e2 inset}.tox .tox-split-button:focus{background:#dee0e2;box-shadow:none;color:#222f3e}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-toolbar-overlord{background-color:#fff}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #ccc;margin-top:-1px}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #ccc}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15)}.tox[dir=rtl] .tox-tbtn__icon-rtl svg{transform:rotateY(180deg)}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #ccc}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #ccc}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#222f3e;border-radius:3px;box-shadow:0 2px 4px rgba(34,47,62,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #222f3e;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #222f3e;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #222f3e;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #222f3e;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-well{border:1px solid #ccc;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #ccc;border-radius:3px;display:flex;flex:1;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-image-tools-edit-panel{height:60px}.tox .tox-image-tools__sidebar{height:60px}
+.tox{box-shadow:none;box-sizing:content-box;color:#222f3e;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #ccc;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox-tinymce-inline{border:none;box-shadow:none}.tox-tinymce-inline .tox-editor-header{background-color:transparent;border:1px solid #ccc;border-radius:0;box-shadow:none}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border:1px solid #ccc;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>:last-child:not(:only-child){border-color:#ccc;border-style:solid}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(32,122,183,.1);border-color:rgba(32,122,183,.4);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description>:last-child{border-color:rgba(32,122,183,.4)}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info a .tox-icon{color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.1);border-color:rgba(255,165,0,.5);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description>:last-child{border-color:rgba(255,165,0,.5)}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#cc8500}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#cc8500}.tox .tox-dialog__body-content .accessibility-issue--warn a .tox-icon{color:#cc8500}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.1);border-color:rgba(204,0,0,.4);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description>:last-child{border-color:rgba(204,0,0,.4)}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#c00}.tox .tox-dialog__body-content .accessibility-issue--error a .tox-icon{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.1);border-color:rgba(120,171,70,.4);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{border-color:rgba(120,171,70,.4)}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#78ab46}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#78ab46}.tox .tox-dialog__body-content .accessibility-issue--success a .tox-icon{color:#78ab46}.tox .tox-dialog__body-content .accessibility-issue__header h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description>:last-child{border-left-width:1px;padding-left:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description>:last-child{border-right-width:1px;padding-right:4px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button--secondary{background-color:#f0f0f0;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#f0f0f0;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#222f3e;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#f0f0f0;background-image:none;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:hover:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:active:not(:disabled){background-color:#d6d6d6;background-image:none;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked[disabled]{background-color:#f0f0f0;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:focus:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:active:not(:disabled){background-color:#d6d6d6;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#222f3e}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(34,47,62,.3)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(34,47,62,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#ccc;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#e6e6e6;color:rgba(34,47,62,.7);cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;color:#222f3e;cursor:pointer;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#fff;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#dee0e2;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;-ms-flex-preferred-size:auto;font-size:14px;font-style:normal;font-weight:400;line-height:24px;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(34,47,62,.7);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#222f3e}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(34,47,62,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:2px 0 3px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{-ms-grid-row-align:center;align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{-ms-grid-row-align:center;align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #ccc}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #ccc}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#dee0e2}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#fff;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#222f3e;display:flex;justify-content:space-between}.tox .tox-comment__date{color:rgba(34,47,62,.7);font-size:12px}.tox .tox-comment__body{color:#222f3e;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(34,47,62,.7);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#fff;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(255,255,255,0),#fff);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#fff;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#222f3e;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#fff;box-shadow:0 0 8px 8px #fff;color:#222f3e;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#fff;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(34,47,62,.7)}.tox .tox-user__name{color:rgba(34,47,62,.7);font-size:12px;font-style:normal;font-weight:700;text-transform:uppercase}.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(255,255,255,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#fff}.tox .tox-dialog{background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(34,47,62,.15),0 0 40px 1px rgba(34,47,62,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#fff;border-bottom:none;color:#222f3e;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#222f3e;display:flex;flex:1;-ms-flex-preferred-size:auto;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;padding:16px 16px}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(34,47,62,.7);display:inline-block;font-size:14px;line-height:1.3;margin-bottom:8px;text-decoration:none;white-space:nowrap}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto;max-height:650px;overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:none}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#185d8c;text-decoration:none}.tox .tox-dialog__body-content a:active{color:#185d8c;text-decoration:none}.tox .tox-dialog__body-content svg{fill:#222f3e}.tox .tox-dialog__body-content ul{display:block;list-style-type:disc;margin-bottom:16px;-webkit-margin-end:0;margin-inline-end:0;-webkit-margin-start:0;margin-inline-start:0;-webkit-padding-start:2.5rem;padding-inline-start:2.5rem}.tox .tox-dialog__body-content .tox-form__group h1{color:#222f3e;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#222f3e;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#fff;border-top:1px solid #ccc;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(255,255,255,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #ccc}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;-ms-flex-preferred-size:auto;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}.tox.tox-platform-ie .tox-dialog-wrap{position:-ms-device-fixed}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #ccc;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(34,47,62,.7);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;-ms-flex-preferred-size:auto;overflow:hidden;position:relative}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;-ms-flex-preferred-size:auto;height:100%;position:absolute;width:100%}.tox.tox-inline-edit-area{border:1px dotted #ccc}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{z-index:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{box-shadow:none;transition:box-shadow .5s}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(34,47,62,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(0,0,0,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(0,0,0,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #fff;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(34,47,62,.7);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-textarea{flex:1;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;-ms-flex-preferred-size:auto;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:0}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#222f3e}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#222f3e}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:0}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;-ms-scroll-chaining:none;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-image-tools{width:100%}.tox .tox-image-tools__toolbar{align-items:center;display:flex;justify-content:center}.tox .tox-image-tools__image{background-color:#666;height:380px;overflow:auto;position:relative;width:100%}.tox .tox-image-tools__image,.tox .tox-image-tools__image+.tox-image-tools__toolbar{margin-top:8px}.tox .tox-image-tools__image-bg{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools__toolbar>.tox-spacer{flex:1;-ms-flex-preferred-size:auto}.tox .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-slider:not(:first-of-type){margin-left:8px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-button+.tox-slider{margin-left:32px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-slider+.tox-button{margin-left:32px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-slider:not(:first-of-type){margin-right:8px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-button+.tox-slider{margin-right:32px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-slider+.tox-button{margin-right:32px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#ccc;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:rgba(34,47,62,.7);display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 4px 0 4px}.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #ccc}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn--active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:-ms-grid;display:grid;font-size:14px;font-weight:400;-ms-grid-columns:minmax(40px,1fr) auto minmax(40px,1fr);grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#e4eeda;border-color:#d7e6c8;color:#222f3e}.tox .tox-notification--success p{color:#222f3e}.tox .tox-notification--success a{color:#547831}.tox .tox-notification--success svg{fill:#222f3e}.tox .tox-notification--error{background-color:#f8dede;border-color:#f2bfbf;color:#222f3e}.tox .tox-notification--error p{color:#222f3e}.tox .tox-notification--error a{color:#c00}.tox .tox-notification--error svg{fill:#222f3e}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#fffaea;border-color:#ffe89d;color:#222f3e}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#222f3e}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#222f3e}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#222f3e}.tox .tox-notification--info{background-color:#d9edf7;border-color:#779ecb;color:#222f3e}.tox .tox-notification--info p{color:#222f3e}.tox .tox-notification--info a{color:#222f3e}.tox .tox-notification--info svg{fill:#222f3e}.tox .tox-notification__body{-ms-grid-row-align:center;align-self:center;color:#222f3e;font-size:14px;-ms-grid-column-span:1;grid-column-end:3;-ms-grid-column:2;grid-column-start:2;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{-ms-grid-row-align:center;align-self:center;-ms-grid-column-span:1;grid-column-end:2;-ms-grid-column:1;grid-column-start:1;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;-ms-grid-column-align:end;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{-ms-grid-row-align:start;align-self:start;-ms-grid-column-span:1;grid-column-end:4;-ms-grid-column:3;grid-column-start:3;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;-ms-grid-column-align:end;justify-self:end}.tox .tox-notification .tox-progress-bar{-ms-grid-column-span:3;grid-column-end:4;-ms-grid-column:1;grid-column-start:1;-ms-grid-row-span:1;grid-row-end:3;-ms-grid-row:2;grid-row-start:2;-ms-grid-column-align:center;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#fff transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#ccc transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #fff transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #ccc transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #fff transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #ccc transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #fff;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #ccc;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;-ms-flex-preferred-size:0;min-height:0}.tox .tox-sidebar{background-color:#fff;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;-ms-flex-preferred-size:auto;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #ccc;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(34,47,62,.7);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#fff;border-top:1px solid #ccc;color:rgba(34,47,62,.7);display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:flex-end;overflow:hidden}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;margin-right:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:rgba(34,47,62,.7);text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){cursor:pointer;text-decoration:underline}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-left:1ch}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(34,47,62,.7)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#dee0e2;border-radius:1px;box-shadow:0 0 0 2px #dee0e2}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(255,255,255,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#222f3e}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#dee0e2;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:hover svg{fill:#222f3e}.tox .tox-tbtn:active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:active svg{fill:#222f3e}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#222f3e}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{-ms-grid-row-align:stretch;align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tbtn--select{margin:2px 0 3px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:2px 0 3px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #dee0e2 inset}.tox .tox-split-button:focus{background:#dee0e2;box-shadow:none;color:#222f3e}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-toolbar-overlord{background-color:#fff}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #ccc;margin-top:-1px}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #ccc}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15)}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #ccc}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #ccc}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#222f3e;border-radius:3px;box-shadow:0 2px 4px rgba(34,47,62,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #222f3e;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #222f3e;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #222f3e;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #222f3e;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-well{border:1px solid #ccc;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #ccc;border-radius:3px;display:flex;flex:1;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-image-tools-edit-panel{height:60px}.tox .tox-image-tools__sidebar{height:60px}
diff --git a/cps/static/js/libs/tinymce/skins/ui/oxide/skin.shadowdom.min.css b/cps/static/js/libs/tinymce/skins/ui/oxide/skin.shadowdom.min.css
index 9ba6e02c8..a0893b913 100644
--- a/cps/static/js/libs/tinymce/skins/ui/oxide/skin.shadowdom.min.css
+++ b/cps/static/js/libs/tinymce/skins/ui/oxide/skin.shadowdom.min.css
@@ -4,4 +4,4 @@
  * For LGPL see License.txt in the project root for license information.
  * For commercial licenses see https://www.tiny.cloud/
  */
-body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;left:0;margin:0;overflow:hidden;-ms-scroll-chaining:none;overscroll-behavior:none;padding:0;position:fixed;top:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox.tox-tinymce.tox-fullscreen{background-color:transparent;z-index:1200}.tox-shadowhost.tox-fullscreen{z-index:1200}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}
+body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;-ms-scroll-chaining:none;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}
diff --git a/cps/static/js/libs/tinymce/themes/inlite/theme.min.js b/cps/static/js/libs/tinymce/themes/inlite/theme.min.js
deleted file mode 100755
index 25996d255..000000000
--- a/cps/static/js/libs/tinymce/themes/inlite/theme.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){var a={},b=function(b){for(var c=a[b],e=c.deps,f=c.defn,g=e.length,h=new Array(g),i=0;i<g;++i)h[i]=d(e[i]);var j=f.apply(null,h);if(void 0===j)throw"module ["+b+"] returned undefined";c.instance=j},c=function(b,c,d){if("string"!=typeof b)throw"module id must be a string";if(void 0===c)throw"no dependencies for "+b;if(void 0===d)throw"no definition function for "+b;a[b]={deps:c,defn:d,instance:void 0}},d=function(c){var d=a[c];if(void 0===d)throw"module ["+c+"] was undefined";return void 0===d.instance&&b(c),d.instance},e=function(a,b){for(var c=a.length,e=new Array(c),f=0;f<c;++f)e.push(d(a[f]));b.apply(null,b)},f={};f.bolt={module:{api:{define:c,require:e,demand:d}}};var g=c,h=function(a,b){g(a,[],function(){return b})};h("d",tinymce.util.Tools.resolve),g("1",["d"],function(a){return a("tinymce.ThemeManager")}),g("2",["d"],function(a){return a("tinymce.ui.Api")}),g("3",["d"],function(a){return a("tinymce.util.Delay")}),g("4",[],function(){var a=function(b){return b.reduce(function(b,c){return Array.isArray(c)?b.concat(a(c)):b.concat(c)},[])};return{flatten:a}}),g("e",[],function(){var a=function(a){return function(b){return typeof b===a}},b=function(a){return Array.isArray(a)},c=function(a){return null===a},d=function(a){return function(d){return!c(d)&&!b(d)&&a(d)}};return{isString:a("string"),isNumber:a("number"),isBoolean:a("boolean"),isFunction:a("function"),isObject:d(a("object")),isNull:c,isArray:b}}),g("5",["e"],function(a){var b=function(a,b){if(b(a))return!0;throw new Error("Default value doesn't match requested type.")},c=function(a){return function(c,d,e){var f=c.settings;return b(e,a),d in f&&a(f[d])?f[d]:e}},d=function(a,b){return a.split(b).filter(function(a){return a.length>0})},e=function(b,c){var e=function(a){return"string"==typeof a?d(a,/[ ,]/):a},f=function(a,b){return a===!1?[]:b};return a.isArray(b)?b:a.isString(b)?e(b):a.isBoolean(b)?f(b,c):c},f=function(a){return function(c,d,f){var g=d in c.settings?c.settings[d]:f;return b(f,a),e(g,f)}};return{getStringOr:c(a.isString),getBoolOr:c(a.isBoolean),getNumberOr:c(a.isNumber),getHandlerOr:c(a.isFunction),getToolbarItemsOr:f(a.isArray)}}),g("7",[],function(){var a=function(a,b){return{id:a,rect:b}},b=function(a,b){for(var c=0;c<b.length;c++){var d=b[c],e=d(a);if(e)return e}return null};return{match:b,result:a}}),g("i",["d"],function(a){return a("tinymce.dom.DOMUtils")}),g("q",["d"],function(a){return a("tinymce.geom.Rect")}),g("r",[],function(){var a=function(a){return{x:a.left,y:a.top,w:a.width,h:a.height}},b=function(a){return{left:a.x,top:a.y,width:a.w,height:a.h,right:a.x+a.w,bottom:a.y+a.h}};return{fromClientRect:a,toClientRect:b}}),g("f",["i","q","r"],function(a,b,c){var d=function(b){var c=a.DOM.getViewPort();return{x:b.x+c.x,y:b.y+c.y,w:b.w,h:b.h}},e=function(a){var b=a.getBoundingClientRect();return d({x:b.left,y:b.top,w:Math.max(a.clientWidth,a.offsetWidth),h:Math.max(a.clientHeight,a.offsetHeight)})},f=function(a,b){return e(b)},g=function(a){return e(a.getElement().ownerDocument.body)},h=function(a){return e(a.getContentAreaContainer()||a.getBody())},i=function(a){var b=a.selection.getBoundingClientRect();return b?d(c.fromClientRect(b)):null};return{getElementRect:f,getPageAreaRect:g,getContentAreaRect:h,getSelectionRect:i}}),g("6",["7","f"],function(a,b){var c=function(c,d){return function(e){for(var f=0;f<d.length;f++)if(d[f].predicate(c))return a.result(d[f].id,b.getElementRect(e,c));return null}},d=function(c,d){return function(e){for(var f=0;f<c.length;f++)for(var g=0;g<d.length;g++)if(d[g].predicate(c[f]))return a.result(d[g].id,b.getElementRect(e,c[f]));return null}};return{element:c,parent:d}}),g("g",["d"],function(a){return a("tinymce.util.Tools")}),g("8",["g"],function(a){var b=function(a,b){return{id:a,predicate:b}},c=function(c){return a.map(c,function(a){return b(a.id,a.predicate)})};return{create:b,fromContextToolbars:c}}),g("9",["7","f"],function(a,b){var c=function(c){return function(d){return d.selection.isCollapsed()?null:a.result(c,b.getSelectionRect(d))}},d=function(c,d){return function(e){var f,g=e.schema.getTextBlockElements();for(f=0;f<c.length;f++)if("TABLE"===c[f].nodeName)return null;for(f=0;f<c.length;f++)if(c[f].nodeName in g)return e.dom.isEmpty(c[f])?a.result(d,b.getSelectionRect(e)):null;return null}};return{textSelection:c,emptyTextBlock:d}}),g("h",["d"],function(a){return a("tinymce.EditorManager")}),g("a",["h","i"],function(a,b){var c=function(a,b){var c=function(){a._skinLoaded=!0,a.fire("SkinLoaded"),b()};a.initialized?c():a.on("init",c)},d=function(b){var c=a.baseURL+"/skins/";return b?c+b:c+"lightgray"},e=function(a,b){return a.documentBaseURI.toAbsolute(b)},f=function(a,f){var g=a.settings,h=g.skin_url?e(a,g.skin_url):d(g.skin),i=function(){c(a,f)};b.DOM.styleSheetLoader.load(h+"/skin.min.css",i),a.contentCSS.push(h+"/content.inline.min.css")};return{load:f}}),g("j",["d"],function(a){return a("tinymce.ui.Factory")}),g("k",["g","j","e"],function(a,b,c){var d=function(a,b){var c=function(a,b){return{selector:a,handler:b}},d=function(a){b.active(a)},e=function(a){b.disabled(a)};return b.settings.stateSelector?c(b.settings.stateSelector,d):b.settings.disabledStateSelector?c(b.settings.disabledStateSelector,e):null},e=function(a,b,c){return function(){var e=d(b,c);null!==e&&a.selection.selectorChanged(e.selector,e.handler)}},f=function(a){return c.isArray(a)?a:c.isString(a)?a.split(/[ ,]/):[]},g=function(c,d,g){var h,i=[];if(g)return a.each(f(g),function(a){var d;"|"==a?h=null:c.buttons[a]&&(h||(h={type:"buttongroup",items:[]},i.push(h)),d=a,a=c.buttons[d],"function"==typeof a&&(a=a()),a.type=a.type||"button",a=b.create(a),a.on("postRender",e(c,d,a)),h.items.push(a))}),b.create({type:"toolbar",layout:"flow",name:d,items:i})};return{create:g}}),g("s",["d"],function(a){return a("tinymce.util.Promise")}),g("t",[],function(){var a=0,b=function(){var a=function(){return Math.round(4294967295*Math.random()).toString(36)};return"s"+Date.now().toString(36)+a()+a()+a()},c=function(c){return c+a++ +b()};return{uuid:c}}),g("w",[],function(){var a=function(a,b){function c(c){var e,f,g;f=b[c?"startContainer":"endContainer"],g=b[c?"startOffset":"endOffset"],1==f.nodeType&&(e=a.create("span",{"data-mce-type":"bookmark"}),f.hasChildNodes()?(g=Math.min(g,f.childNodes.length-1),c?f.insertBefore(e,f.childNodes[g]):a.insertAfter(e,f.childNodes[g])):f.appendChild(e),f=e,g=0),d[c?"startContainer":"endContainer"]=f,d[c?"startOffset":"endOffset"]=g}var d={};return c(!0),b.collapsed||c(),d},b=function(a,b){function c(c){function d(a){for(var b=a.parentNode.firstChild,c=0;b;){if(b==a)return c;1==b.nodeType&&"bookmark"==b.getAttribute("data-mce-type")||c++,b=b.nextSibling}return-1}var e,f,g;e=g=b[c?"startContainer":"endContainer"],f=b[c?"startOffset":"endOffset"],e&&(1==e.nodeType&&(f=d(e),e=e.parentNode,a.remove(g)),b[c?"startContainer":"endContainer"]=e,b[c?"startOffset":"endOffset"]=f)}c(!0),c();var d=a.createRng();return d.setStart(b.startContainer,b.startOffset),b.endContainer&&d.setEnd(b.endContainer,b.endOffset),d};return{create:a,resolve:b}}),g("x",["d"],function(a){return a("tinymce.dom.TreeWalker")}),g("y",["d"],function(a){return a("tinymce.dom.RangeUtils")}),g("u",["w","g","x","y"],function(a,b,c,d){var e=function(a,b,d){var e,f,g=[];for(e=new c(b,a),f=b;f&&(1===f.nodeType&&g.push(f),f!==d);f=e.next());return g},f=function(c,d){var e,f,g;f=c.dom,g=c.selection,e=a.create(f,g.getRng()),b.each(d,function(a){c.dom.remove(a,!0)}),g.setRng(a.resolve(f,e))},g=function(a){return"A"===a.nodeName&&a.hasAttribute("href")},h=function(a,b){var c=a.getParent(b,g);return c?c:b},i=function(a){var c,f,i,j,k,l,m;return k=a.selection,l=a.dom,m=k.getRng(),c=h(l,d.getNode(m.startContainer,m.startOffset)),f=d.getNode(m.endContainer,m.endOffset),i=a.getBody(),j=b.grep(e(i,c,f),g)},j=function(a){f(a,i(a))};return{unlinkSelection:j}}),g("p",["t","u"],function(a,b){var c=function(a,b){var c,d,e;for(e='<table data-mce-id="mce" style="width: 100%">',e+="<tbody>",d=0;d<b;d++){for(e+="<tr>",c=0;c<a;c++)e+="<td><br></td>";e+="</tr>"}return e+="</tbody>",e+="</table>"},d=function(a){var b=a.dom.select("*[data-mce-id]");return b[0]},e=function(a,b,e){a.undoManager.transact(function(){var f,g;a.insertContent(c(b,e)),f=d(a),f.removeAttribute("data-mce-id"),g=a.dom.select("td,th",f),a.selection.setCursorLocation(g[0],0)})},f=function(a,b){a.execCommand("FormatBlock",!1,b)},g=function(b,c,d){var e,f;e=b.editorUpload.blobCache,f=e.create(a.uuid("mceu"),d,c),e.add(f),b.insertContent(b.dom.createHTML("img",{src:f.blobUri()}))},h=function(a){a.selection.collapse(!1)},i=function(a){a.focus(),b.unlinkSelection(a),h(a)},j=function(a,b,c){a.focus(),a.dom.setAttrib(b,"href",c),h(a)},k=function(a,b){a.execCommand("mceInsertLink",!1,{href:b}),h(a)},l=function(a,b){var c=a.dom.getParent(a.selection.getStart(),"a[href]");c?j(a,c,b):k(a,b)},m=function(a,b){0===b.trim().length?i(a):l(a,b)};return{insertTable:e,formatBlock:f,insertBlob:g,createLink:m,unlink:i}}),g("v",[],function(){var a=function(a){return/^www\.|\.(com|org|edu|gov|uk|net|ca|de|jp|fr|au|us|ru|ch|it|nl|se|no|es|mil)$/i.test(a.trim())},b=function(a){return/^https?:\/\//.test(a.trim())};return{isDomainLike:a,isAbsolute:b}}),g("l",["g","j","s","p","v"],function(a,b,c,d,e){var f=function(a){a.find("textbox").eq(0).each(function(a){a.focus()})},g=function(c,d){var e=b.create(a.extend({type:"form",layout:"flex",direction:"row",padding:5,name:c,spacing:3},d));return e.on("show",function(){f(e)}),e},h=function(a,b){return b?a.show():a.hide()},i=function(a,b){return new c(function(c){a.windowManager.confirm("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(a){var d=a===!0?"http://"+b:b;c(d)})})},j=function(a,b){return!e.isAbsolute(b)&&e.isDomainLike(b)?i(a,b):c.resolve(b)},k=function(a,b){var c={},e=function(){a.focus(),d.unlink(a),b()},f=function(a){var b=a.meta;b&&b.attach&&(c={href:this.value(),attach:b.attach})},i=function(b){if(b.control===this){var c,d="";c=a.dom.getParent(a.selection.getStart(),"a[href]"),c&&(d=a.dom.getAttrib(c,"href")),this.fromJSON({linkurl:d}),h(this.find("#unlink"),c),this.find("#linkurl")[0].focus()}};return g("quicklink",{items:[{type:"button",name:"unlink",icon:"unlink",onclick:e,tooltip:"Remove link"},{type:"filepicker",name:"linkurl",placeholder:"Paste or type a link",filetype:"file",onchange:f},{type:"button",icon:"checkmark",subtype:"primary",tooltip:"Ok",onclick:"submit"}],onshow:i,onsubmit:function(e){j(a,e.data.linkurl).then(function(e){a.undoManager.transact(function(){e===c.href&&(c.attach(),c={}),d.createLink(a,e)}),b()})}})};return{createQuickLinkForm:k}}),g("m",["q","r"],function(a,b){var c=function(a,b){return{rect:a,position:b}},d=function(a,b){return{x:b.x,y:b.y,w:a.w,h:a.h}},e=function(b,e,f,g,h){var i,j,k;return i=a.findBestRelativePosition(h,f,g,b),f=a.clamp(f,g),i?(j=a.relativePosition(h,f,i),k=d(h,j),c(k,i)):(f=a.intersect(g,f),f?(i=a.findBestRelativePosition(h,f,g,e))?(j=a.relativePosition(h,f,i),k=d(h,j),c(k,i)):(k=d(h,f),c(k,i)):null)},f=function(a,b,c){return e(["cr-cl","cl-cr"],["bc-tc","bl-tl","br-tr"],a,b,c)},g=function(a,b,c){return e(["tc-bc","bc-tc","tl-bl","bl-tl","tr-br","br-tr"],["bc-tc","bl-tl","br-tr"],a,b,c)},h=function(a,c,d,e){var f;return"function"==typeof a?(f=a({elementRect:b.toClientRect(c),contentAreaRect:b.toClientRect(d),panelRect:b.toClientRect(e)}),b.fromClientRect(f)):e},i=function(a){return a.panelRect};return{calcInsert:f,calc:g,userConstrain:h,defaultHandler:i}}),g("c",["g","j","i","k","l","f","m","5"],function(a,b,c,d,e,f,g,h){return function(){var i,j,k=["bold","italic","|","quicklink","h2","h3","blockquote"],l=["quickimage","quicktable"],m=function(b,c){return a.map(c,function(a){return d.create(b,a.id,a.items)})},n=function(a){return h.getToolbarItemsOr(a,"selection_toolbar",k)},o=function(a){return h.getToolbarItemsOr(a,"insert_toolbar",l)},p=function(a){return a.items().length>0},q=function(c,f){var g=m(c,f).concat([d.create(c,"text",n(c)),d.create(c,"insert",o(c)),e.createQuickLinkForm(c,B)]);return b.create({type:"floatpanel",role:"dialog",classes:"tinymce tinymce-inline arrow",ariaLabel:"Inline toolbar",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!0,border:1,items:a.grep(g,p),oncancel:function(){c.focus()}})},r=function(a){a&&a.show()},s=function(a,b){a.moveTo(b.x,b.y)},t=function(b,c){c=c?c.substr(0,2):"",a.each({t:"down",b:"up",c:"center"},function(a,d){b.classes.toggle("arrow-"+a,d===c.substr(0,1))}),"cr"===c?(b.classes.toggle("arrow-left",!0),b.classes.toggle("arrow-right",!1)):"cl"===c?(b.classes.toggle("arrow-left",!0),b.classes.toggle("arrow-right",!0)):a.each({l:"left",r:"right"},function(a,d){b.classes.toggle("arrow-"+a,d===c.substr(1,1))})},u=function(a,b){var c=a.items().filter("#"+b);return c.length>0&&(c[0].show(),a.reflow(),!0)},v=function(a,b,d,e){var i,k,l,m;return m=h.getHandlerOr(d,"inline_toolbar_position_handler",g.defaultHandler),i=f.getContentAreaRect(d),k=c.DOM.getRect(a.getEl()),l="insert"===b?g.calcInsert(e,i,k):g.calc(e,i,k),!!l&&(k=l.rect,j=e,s(a,g.userConstrain(m,e,i,k)),t(a,l.position),!0)},w=function(a,b,c,d){return r(a),a.items().hide(),u(a,b)?void(v(a,b,c,d)===!1&&B(a)):void B(a)},x=function(){return i.items().filter("form:visible").length>0},y=function(a,b){if(i){if(i.items().hide(),!u(i,b))return void B(i);var d,e,k,l;r(i),i.items().hide(),u(i,b),l=h.getHandlerOr(a,"inline_toolbar_position_handler",g.defaultHandler),d=f.getContentAreaRect(a),e=c.DOM.getRect(i.getEl()),k=g.calc(j,d,e),k&&(e=k.rect,s(i,g.userConstrain(l,j,d,e)),t(i,k.position))}},z=function(a,b,c,d){i||(i=q(a,d),i.renderTo(document.body).reflow().moveTo(c.x,c.y),a.nodeChanged()),w(i,b,a,c)},A=function(a,b,c){i&&v(i,b,a,c)},B=function(){i&&i.hide()},C=function(){i&&i.find("toolbar:visible").eq(0).each(function(a){a.focus(!0)})},D=function(){i&&(i.remove(),i=null)},E=function(){return i&&i.visible()&&x()};return{show:z,showForm:y,reposition:A,inForm:E,hide:B,focus:C,remove:D}}}),g("n",["s"],function(a){var b=function(b){return new a(function(a){var c=new FileReader;c.onloadend=function(){a(c.result.split(",")[1])},c.readAsDataURL(b)})};return{blobToBase64:b}}),g("o",["s"],function(a){var b=function(){return new a(function(a){var b;b=document.createElement("input"),b.type="file",b.style.position="fixed",b.style.left=0,b.style.top=0,b.style.opacity=.001,document.body.appendChild(b),b.onchange=function(b){a(Array.prototype.slice.call(b.target.files))},b.click(),b.parentNode.removeChild(b)})};return{pickFile:b}}),g("b",["c","n","o","p"],function(a,b,c,d){var e=function(a){for(var b=function(b){return function(){d.formatBlock(a,b)}},c=1;c<6;c++){var e="h"+c;a.addButton(e,{text:e.toUpperCase(),tooltip:"Heading "+c,stateSelector:e,onclick:b(e),onPostRender:function(){var a=this.getEl().firstChild.firstChild;a.style.fontWeight="bold"}})}},f=function(a,f){a.addButton("quicklink",{icon:"link",tooltip:"Insert/Edit link",stateSelector:"a[href]",onclick:function(){f.showForm(a,"quicklink")}}),a.addButton("quickimage",{icon:"image",tooltip:"Insert image",onclick:function(){c.pickFile().then(function(c){var e=c[0];b.blobToBase64(e).then(function(b){d.insertBlob(a,b,e)})})}}),a.addButton("quicktable",{icon:"table",tooltip:"Insert table",onclick:function(){f.hide(),d.insertTable(a,2,2)}}),e(a)};return{addToEditor:f}}),g("0",["1","2","3","4","5","6","7","8","9","a","b","c"],function(a,b,c,d,e,f,g,h,i,j,k,l){var m=function(a){var b=a.selection.getNode(),c=a.dom.getParents(b);return c},n=function(a,b,c,d){var e=function(c){return a.dom.is(c,b)};return{predicate:e,id:c,items:d}},o=function(a){var b=a.contextToolbars;return d.flatten([b?b:[],n(a,"img","image","alignleft aligncenter alignright")])},p=function(a,b){var c,d,e;return d=m(a),e=h.fromContextToolbars(b),c=g.match(a,[f.element(d[0],e),i.textSelection("text"),i.emptyTextBlock(d,"insert"),f.parent(d,e)]),c&&c.rect?c:null},q=function(a,b){var c=function(){var c=o(a),d=p(a,c);d?b.show(a,d.id,d.rect,c):b.hide()};return function(){a.removed||c()}},r=function(a,b){return function(){var c=o(a),d=p(a,c);d&&b.reposition(a,d.id,d.rect)}},s=function(a,b,c){return function(){a.removed||b.inForm()||c()}},t=function(a,b){var d=c.throttle(q(a,b),0),e=c.throttle(s(a,b,q(a,b)),0);a.on("blur hide ObjectResizeStart",b.hide),a.on("click",d),a.on("nodeChange mouseup",e),a.on("ResizeEditor keyup",d),a.on("ResizeWindow",r(a,b)),a.on("remove",b.remove),a.shortcuts.add("Alt+F10","",b.focus)},u=function(a,b){a.shortcuts.remove("meta+k"),a.shortcuts.add("meta+k","",function(){var c=o(a),d=d=g.match(a,[i.textSelection("quicklink")]);d&&b.show(a,d.id,d.rect,c)})},v=function(a,b){return j.load(a,function(){t(a,b),u(a,b)}),{}},w=function(a){throw new Error(a)};return a.add("inlite",function(a){var b=new l;k.addToEditor(a,b);var c=function(){return a.inline?v(a,b):w("inlite theme only supports inline mode.")};return{renderUI:c}}),b.appendTo(window.tinymce?window.tinymce:{}),function(){}}),d("0")()}();
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/themes/mobile/theme.min.js b/cps/static/js/libs/tinymce/themes/mobile/theme.min.js
deleted file mode 100644
index 07e35bf55..000000000
--- a/cps/static/js/libs/tinymce/themes/mobile/theme.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- *
- * Version: 5.7.1 (2021-03-17)
- */
-!function(){"use strict";var x=function(){return(x=Object.assign||function(n){for(var e,t=1,r=arguments.length;t<r;t++)for(var o in e=arguments[t])Object.prototype.hasOwnProperty.call(e,o)&&(n[o]=e[o]);return n}).apply(this,arguments)};function c(n,e){var t={};for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&e.indexOf(r)<0&&(t[r]=n[r]);if(null!=n&&"function"==typeof Object.getOwnPropertySymbols)for(var o=0,r=Object.getOwnPropertySymbols(n);o<r.length;o++)e.indexOf(r[o])<0&&Object.prototype.propertyIsEnumerable.call(n,r[o])&&(t[r[o]]=n[r[o]]);return t}function u(){for(var n=0,e=0,t=arguments.length;e<t;e++)n+=arguments[e].length;for(var r=Array(n),o=0,e=0;e<t;e++)for(var i=arguments[e],u=0,c=i.length;u<c;u++,o++)r[o]=i[u];return r}var O=function(){},i=function(t,r){return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return t(r.apply(null,n))}},y=function(n){return function(){return n}},v=function(n){return n};function b(r){for(var o=[],n=1;n<arguments.length;n++)o[n-1]=arguments[n];return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var t=o.concat(n);return r.apply(null,t)}}var n,e,t,r,o,a,m=function(e){return function(n){return!e(n)}},f=function(n){return function(){throw new Error(n)}},s=function(n){return n()},l=y(!1),w=y(!0),d=function(t){var r,o=!1;return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return o||(o=!0,r=t.apply(null,n)),r}},g=function(){return p},p=(n=function(n){return n.isNone()},{fold:function(n,e){return n()},is:l,isSome:l,isNone:w,getOr:t=function(n){return n},getOrThunk:e=function(n){return n()},getOrDie:function(n){throw new Error(n||"error: getOrDie called on none.")},getOrNull:y(null),getOrUndefined:y(undefined),or:t,orThunk:e,map:g,each:O,bind:g,exists:l,forall:w,filter:g,equals:n,equals_:n,toArray:function(){return[]},toString:y("none()")}),h=function(t){var n=y(t),e=function(){return o},r=function(n){return n(t)},o={fold:function(n,e){return e(t)},is:function(n){return t===n},isSome:w,isNone:l,getOr:n,getOrThunk:n,getOrDie:n,getOrNull:n,getOrUndefined:n,or:e,orThunk:e,map:function(n){return h(n(t))},each:function(n){n(t)},bind:r,exists:r,forall:r,filter:function(n){return n(t)?o:p},toArray:function(){return[t]},toString:function(){return"some("+t+")"},equals:function(n){return n.is(t)},equals_:function(n,e){return n.fold(l,function(n){return e(t,n)})}};return o},T={some:h,none:g,from:function(n){return null===n||n===undefined?p:h(n)}},S=function(r){return function(n){return t=typeof(e=n),(null===e?"null":"object"==t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"==t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t)===r;var e,t}},k=function(e){return function(n){return typeof n===e}},E=S("string"),C=S("object"),M=S("array"),D=k("boolean"),_=function(n){return!(null===(e=n)||e===undefined);var e},I=k("function"),F=k("number"),R=Array.prototype.slice,V=Array.prototype.indexOf,B=Array.prototype.push,A=function(n,e){return t=n,r=e,-1<V.call(t,r);var t,r},j=function(n,e){for(var t=0,r=n.length;t<r;t++){if(e(n[t],t))return!0}return!1},N=function(n,e){for(var t=n.length,r=new Array(t),o=0;o<t;o++){var i=n[o];r[o]=e(i,o)}return r},P=function(n,e){for(var t=0,r=n.length;t<r;t++){e(n[t],t)}},H=function(n,e){for(var t=[],r=0,o=n.length;r<o;r++){var i=n[r];e(i,r)&&t.push(i)}return t},z=function(n,e,t){return function(n,e){for(var t=n.length-1;0<=t;t--){e(n[t],t)}}(n,function(n){t=e(t,n)}),t},L=function(n,e,t){return P(n,function(n){t=e(t,n)}),t},G=function(n,e){return function(n,e,t){for(var r=0,o=n.length;r<o;r++){var i=n[r];if(e(i,r))return T.some(i);if(t(i,r))break}return T.none()}(n,e,l)},$=function(n,e){for(var t=0,r=n.length;t<r;t++){if(e(n[t],t))return T.some(t)}return T.none()},U=function(n){for(var e=[],t=0,r=n.length;t<r;++t){if(!M(n[t]))throw new Error("Arr.flatten item "+t+" was not an array, input: "+n);B.apply(e,n[t])}return e},W=function(n,e){return U(N(n,e))},X=function(n,e){for(var t=0,r=n.length;t<r;++t){if(!0!==e(n[t],t))return!1}return!0},q=function(n){var e=R.call(n,0);return e.reverse(),e},Y=function(n,e){return H(n,function(n){return!A(e,n)})},K=function(n){return[n]},J=function(n){return e=n,(t=0)<=t&&t<e.length?T.some(e[t]):T.none();var e,t},Q=function(n,e){for(var t=0;t<n.length;t++){var r=e(n[t],t);if(r.isSome())return r}return T.none()},Z=function(n,e){var t=function(n,e){for(var t=0;t<n.length;t++){var r=n[t];if(r.test(e))return r}return undefined}(n,e);if(!t)return{major:0,minor:0};var r=function(n){return Number(e.replace(t,"$"+n))};return en(r(1),r(2))},nn=function(){return en(0,0)},en=function(n,e){return{major:n,minor:e}},tn={nu:en,detect:function(n,e){var t=String(e).toLowerCase();return 0===n.length?nn():Z(n,t)},unknown:nn},rn=function(n,e){var t=String(e).toLowerCase();return G(n,function(n){return n.search(t)})},on=function(n,t){return rn(n,t).map(function(n){var e=tn.detect(n.versionRegexes,t);return{current:n.name,version:e}})},un=function(n,t){return rn(n,t).map(function(n){var e=tn.detect(n.versionRegexes,t);return{current:n.name,version:e}})},cn=function(n,o){return n.replace(/\$\{([^{}]*)\}/g,function(n,e){var t,r=o[e];return"string"==(t=typeof r)||"number"==t?r.toString():n})},an=function(n,e){return-1!==n.indexOf(e)},fn=(r=/^\s+|\s+$/g,function(n){return n.replace(r,"")}),sn=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,ln=function(e){return function(n){return an(n,e)}},dn=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(n){return an(n,"edge/")&&an(n,"chrome")&&an(n,"safari")&&an(n,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,sn],search:function(n){return an(n,"chrome")&&!an(n,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(n){return an(n,"msie")||an(n,"trident")}},{name:"Opera",versionRegexes:[sn,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:ln("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:ln("firefox")},{name:"Safari",versionRegexes:[sn,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(n){return(an(n,"safari")||an(n,"mobile/"))&&an(n,"applewebkit")}}],mn=[{name:"Windows",search:ln("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(n){return an(n,"iphone")||an(n,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:ln("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:ln("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:ln("linux"),versionRegexes:[]},{name:"Solaris",search:ln("sunos"),versionRegexes:[]},{name:"FreeBSD",search:ln("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:ln("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],gn={browsers:y(dn),oses:y(mn)},pn="Firefox",hn=function(n){var e=n.current,t=n.version,r=function(n){return function(){return e===n}};return{current:e,version:t,isEdge:r("Edge"),isChrome:r("Chrome"),isIE:r("IE"),isOpera:r("Opera"),isFirefox:r(pn),isSafari:r("Safari")}},vn={unknown:function(){return hn({current:undefined,version:tn.unknown()})},nu:hn,edge:y("Edge"),chrome:y("Chrome"),ie:y("IE"),opera:y("Opera"),firefox:y(pn),safari:y("Safari")},yn="Windows",bn="Android",xn="Solaris",wn="FreeBSD",Sn="ChromeOS",On=function(n){var e=n.current,t=n.version,r=function(n){return function(){return e===n}};return{current:e,version:t,isWindows:r(yn),isiOS:r("iOS"),isAndroid:r(bn),isOSX:r("OSX"),isLinux:r("Linux"),isSolaris:r(xn),isFreeBSD:r(wn),isChromeOS:r(Sn)}},Tn={unknown:function(){return On({current:undefined,version:tn.unknown()})},nu:On,windows:y(yn),ios:y("iOS"),android:y(bn),linux:y("Linux"),osx:y("OSX"),solaris:y(xn),freebsd:y(wn),chromeos:y(Sn)},kn=function(n,e){var t,r,o,i,u,c,a,f,s,l,d,m,g=gn.browsers(),p=gn.oses(),h=on(g,n).fold(vn.unknown,vn.nu),v=un(p,n).fold(Tn.unknown,Tn.nu);return{browser:h,os:v,deviceType:(r=h,o=n,i=e,u=(t=v).isiOS()&&!0===/ipad/i.test(o),c=t.isiOS()&&!u,a=t.isiOS()||t.isAndroid(),f=a||i("(pointer:coarse)"),s=u||!c&&a&&i("(min-device-width:768px)"),l=c||a&&!s,d=r.isSafari()&&t.isiOS()&&!1===/safari/i.test(o),m=!l&&!s&&!d,{isiPad:y(u),isiPhone:y(c),isTablet:y(s),isPhone:y(l),isTouch:y(f),isAndroid:t.isAndroid,isiOS:t.isiOS,isWebView:y(d),isDesktop:y(m)})}},En=function(n){return window.matchMedia(n).matches},Cn=d(function(){return kn(navigator.userAgent,En)}),Mn=function(){return Cn()},Dn=y,_n=Dn("touchstart"),In=Dn("touchmove"),Fn=Dn("touchend"),Rn=Dn("mousedown"),Vn=Dn("mousemove"),Bn=Dn("mouseup"),An=Dn("mouseover"),jn=Dn("keydown"),Nn=Dn("keyup"),Pn=Dn("input"),Hn=Dn("change"),zn=Dn("click"),Ln=Dn("transitionend"),Gn=Dn("selectstart"),$n=function(n){return y("alloy."+n)},Un={tap:$n("tap")},Wn=$n("focus"),Xn=$n("blur.post"),qn=$n("paste.post"),Yn=$n("receive"),Kn=$n("execute"),Jn=$n("focus.item"),Qn=Un.tap,Zn=$n("longpress"),ne=$n("system.init"),ee=$n("system.attached"),te=$n("system.detached"),re=$n("focusmanager.shifted"),oe=$n("highlight"),ie=$n("dehighlight"),ue=function(n,e){se(n,n.element,e,{})},ce=function(n,e,t){se(n,n.element,e,t)},ae=function(n){ue(n,Kn())},fe=function(n,e,t){se(n,e,t,{})},se=function(n,e,t,r){var o=x({target:e},r);n.getSystem().triggerEvent(t,e,o)},le=function(n){if(null===n||n===undefined)throw new Error("Node cannot be null or undefined");return{dom:n}},de={fromHtml:function(n,e){var t=(e||document).createElement("div");if(t.innerHTML=n,!t.hasChildNodes()||1<t.childNodes.length)throw console.error("HTML does not have a single root node",n),new Error("HTML must have a single root node");return le(t.childNodes[0])},fromTag:function(n,e){var t=(e||document).createElement(n);return le(t)},fromText:function(n,e){var t=(e||document).createTextNode(n);return le(t)},fromDom:le,fromPoint:function(n,e,t){return T.from(n.dom.elementFromPoint(e,t)).map(le)}},me=function(n,e){var t=n.dom;if(1!==t.nodeType)return!1;var r=t;if(r.matches!==undefined)return r.matches(e);if(r.msMatchesSelector!==undefined)return r.msMatchesSelector(e);if(r.webkitMatchesSelector!==undefined)return r.webkitMatchesSelector(e);if(r.mozMatchesSelector!==undefined)return r.mozMatchesSelector(e);throw new Error("Browser lacks native selectors")},ge=function(n){return 1!==n.nodeType&&9!==n.nodeType&&11!==n.nodeType||0===n.childElementCount},pe=function(n,e){var t=e===undefined?document:e.dom;return ge(t)?[]:N(t.querySelectorAll(n),de.fromDom)},he=function(n,e){var t=e===undefined?document:e.dom;return ge(t)?T.none():T.from(t.querySelector(n)).map(de.fromDom)},ve=function(n,e){return n.dom===e.dom},ye=("undefined"!=typeof window||Function("return this;")(),function(n){return n.dom.nodeName.toLowerCase()}),be=function(e){return function(n){return n.dom.nodeType===e}},xe=be(1),we=be(3),Se=be(9),Oe=be(11),Te=function(n){return de.fromDom(n.dom.ownerDocument)},ke=function(n){return Se(n)?n:Te(n)},Ee=function(n){return T.from(n.dom.parentNode).map(de.fromDom)},Ce=function(n){return N(n.dom.childNodes,de.fromDom)},Me=function(n,e){var t=n.dom.childNodes;return T.from(t[e]).map(de.fromDom)},De=function(e,t){Ee(e).each(function(n){n.dom.insertBefore(t.dom,e.dom)})},_e=function(n,e){var t;(t=n,T.from(t.dom.nextSibling).map(de.fromDom)).fold(function(){Ee(n).each(function(n){Fe(n,e)})},function(n){De(n,e)})},Ie=function(e,t){Me(e,0).fold(function(){Fe(e,t)},function(n){e.dom.insertBefore(t.dom,n.dom)})},Fe=function(n,e){n.dom.appendChild(e.dom)},Re=function(e,n){P(n,function(n){Fe(e,n)})},Ve=function(n){n.dom.textContent="",P(Ce(n),function(n){Be(n)})},Be=function(n){var e=n.dom;null!==e.parentNode&&e.parentNode.removeChild(e)},Ae=function(n){return Oe(n)&&_(n.dom.host)},je=I(Element.prototype.attachShadow)&&I(Node.prototype.getRootNode),Ne=y(je),Pe=je?function(n){return de.fromDom(n.dom.getRootNode())}:ke,He=function(n){return de.fromDom(n.dom.host)},ze=function(n){return _(n.dom.shadowRoot)},Le=function(n){var e=we(n)?n.dom.parentNode:n.dom;if(e===undefined||null===e||null===e.ownerDocument)return!1;var t,r,o,i,u=e.ownerDocument;return o=de.fromDom(e),i=Pe(o),(Ae(i)?T.some(i):T.none()).fold(function(){return u.body.contains(e)},(t=Le,r=He,function(n){return t(r(n))}))},Ge=function(){return $e(de.fromDom(document))},$e=function(n){var e=n.dom.body;if(null===e||e===undefined)throw new Error("Body is not available yet");return de.fromDom(e)},Ue=function(n){ue(n,te());var e=n.components();P(e,Ue)},We=function(n){var e=n.components();P(e,We),ue(n,ee())},Xe=function(n,e){Fe(n.element,e.element)},qe=function(e,n){var t,r=e.components();P((t=e).components(),function(n){return Be(n.element)}),Ve(t.element),t.syncComponents();var o=Y(r,n);P(o,function(n){Ue(n),e.getSystem().removeFromWorld(n)}),P(n,function(n){n.getSystem().isConnected()?Xe(e,n):(e.getSystem().addToWorld(n),Xe(e,n),Le(e.element)&&We(n)),e.syncComponents()})},Ye=function(n,e,t){n.getSystem().addToWorld(e),t(n.element,e.element),Le(n.element)&&We(e),n.syncComponents()},Ke=function(e){var n,t=Ee(e.element).bind(function(n){return e.getSystem().getByDom(n).toOptional()});Ue(n=e),Be(n.element),n.getSystem().removeFromWorld(n),t.each(function(n){n.syncComponents()})},Je=function(n,e,t){t(n,e.element);var r=Ce(e.element);P(r,function(n){e.getByDom(n).each(We)})},Qe=Object.keys,Ze=Object.hasOwnProperty,nt=function(n,e){for(var t=Qe(n),r=0,o=t.length;r<o;r++){var i=t[r];e(n[i],i)}},et=function(n,t){return tt(n,function(n,e){return{k:e,v:t(n,e)}})},tt=function(n,r){var o={};return nt(n,function(n,e){var t=r(n,e);o[t.k]=t.v}),o},rt=function(n,e){var t,r,o,i,u={};return t=e,i=u,r=function(n,e){i[e]=n},o=O,nt(n,function(n,e){(t(n,e)?r:o)(n,e)}),u},ot=function(n,t){var r=[];return nt(n,function(n,e){r.push(t(n,e))}),r},it=function(n,e){return ut(n,e)?T.from(n[e]):T.none()},ut=function(n,e){return Ze.call(n,e)},ct=function(n,e){return ut(n,e)&&n[e]!==undefined&&null!==n[e]},at=function(n,e,t){if(!(E(t)||D(t)||F(t)))throw console.error("Invalid call to Attribute.set. Key ",e,":: Value ",t,":: Element ",n),new Error("Attribute value was not simple");n.setAttribute(e,t+"")},ft=function(n,e,t){at(n.dom,e,t)},st=function(n,e){var t=n.dom;nt(e,function(n,e){at(t,e,n)})},lt=function(n,e){var t=n.dom.getAttribute(e);return null===t?undefined:t},dt=function(n,e){return T.from(lt(n,e))},mt=function(n,e){var t=n.dom;return!(!t||!t.hasAttribute)&&t.hasAttribute(e)},gt=function(n,e){n.dom.removeAttribute(e)},pt=function(n,e){var t=lt(n,e);return t===undefined||""===t?[]:t.split(" ")},ht=function(n){return n.dom.classList!==undefined},vt=function(n,e){return o=e,i=pt(t=n,r="class").concat([o]),ft(t,r,i.join(" ")),!0;var t,r,o,i},yt=function(n,e){return o=e,0<(i=H(pt(t=n,r="class"),function(n){return n!==o})).length?ft(t,r,i.join(" ")):gt(t,r),!1;var t,r,o,i},bt=function(n,e){ht(n)?n.dom.classList.add(e):vt(n,e)},xt=function(n){0===(ht(n)?n.dom.classList:pt(n,"class")).length&&gt(n,"class")},wt=function(n,e){ht(n)?n.dom.classList.remove(e):yt(n,e),xt(n)},St=function(n,e){return ht(n)&&n.dom.classList.contains(e)},Ot=function(n,e,t){wt(n,t),bt(n,e)},Tt=/* */Object.freeze({__proto__:null,toAlpha:function(n,e,t){Ot(n.element,e.alpha,e.omega)},toOmega:function(n,e,t){Ot(n.element,e.omega,e.alpha)},isAlpha:function(n,e,t){return St(n.element,e.alpha)},isOmega:function(n,e,t){return St(n.element,e.omega)},clear:function(n,e,t){wt(n.element,e.alpha),wt(n.element,e.omega)}}),kt=function(t){return{is:function(n){return t===n},isValue:w,isError:l,getOr:y(t),getOrThunk:y(t),getOrDie:y(t),or:function(n){return kt(t)},orThunk:function(n){return kt(t)},fold:function(n,e){return e(t)},map:function(n){return kt(n(t))},mapError:function(n){return kt(t)},each:function(n){n(t)},bind:function(n){return n(t)},exists:function(n){return n(t)},forall:function(n){return n(t)},toOptional:function(){return T.some(t)}}},Et=function(t){return{is:l,isValue:l,isError:w,getOr:v,getOrThunk:function(n){return n()},getOrDie:function(){return f(String(t))()},or:function(n){return n},orThunk:function(n){return n()},fold:function(n,e){return n(t)},map:function(n){return Et(t)},mapError:function(n){return Et(n(t))},each:O,bind:function(n){return Et(t)},exists:l,forall:w,toOptional:T.none}},Ct={value:kt,error:Et,fromOption:function(n,e){return n.fold(function(){return Et(e)},kt)}};(a=o=o||{})[a.Error=0]="Error",a[a.Value=1]="Value";var Mt,Dt,_t,It,Ft,Rt=function(n,e,t){return n.stype===o.Error?e(n.serror):t(n.svalue)},Vt=function(n){return{stype:o.Value,svalue:n}},Bt=function(n){return{stype:o.Error,serror:n}},At=function(n){return n.fold(Bt,Vt)},jt=function(n){return Rt(n,Ct.error,Ct.value)},Nt=Vt,Pt=function(n){var e=[],t=[];return P(n,function(n){Rt(n,function(n){return t.push(n)},function(n){return e.push(n)})}),{values:e,errors:t}},Ht=Bt,zt=function(n,e){return n.stype===o.Value?e(n.svalue):n},Lt=function(n,e){return n.stype===o.Error?e(n.serror):n},Gt=function(n,e){return n.stype===o.Value?{stype:o.Value,svalue:e(n.svalue)}:n},$t=function(n,e){return n.stype===o.Error?{stype:o.Error,serror:e(n.serror)}:n},Ut=function(u){if(!M(u))throw new Error("cases must be an array");if(0===u.length)throw new Error("there must be at least one case");var c=[],t={};return P(u,function(n,r){var e=Qe(n);if(1!==e.length)throw new Error("one and only one name per case");var o=e[0],i=n[o];if(t[o]!==undefined)throw new Error("duplicate key detected:"+o);if("cata"===o)throw new Error("cannot have a case named cata (sorry)");if(!M(i))throw new Error("case arguments must be an array");c.push(o),t[o]=function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];var e=t.length;if(e!==i.length)throw new Error("Wrong number of arguments to case "+o+". Expected "+i.length+" ("+i+"), got "+e);return{fold:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];if(n.length!==u.length)throw new Error("Wrong number of arguments to fold. Expected "+u.length+", got "+n.length);return n[r].apply(null,t)},match:function(n){var e=Qe(n);if(c.length!==e.length)throw new Error("Wrong number of arguments to match. Expected: "+c.join(",")+"\nActual: "+e.join(","));if(!X(c,function(n){return A(e,n)}))throw new Error("Not all branches were specified when using match. Specified: "+e.join(", ")+"\nRequired: "+c.join(", "));return n[o].apply(null,t)},log:function(n){console.log(n,{constructors:c,constructor:o,params:t})}}}}),t},Wt=Object.prototype.hasOwnProperty,Xt=function(u){return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];if(0===n.length)throw new Error("Can't merge zero objects");for(var t={},r=0;r<n.length;r++){var o=n[r];for(var i in o)Wt.call(o,i)&&(t[i]=u(t[i],o[i]))}return t}},qt=Xt(function(n,e){return C(n)&&C(e)?qt(n,e):e}),Yt=Xt(function(n,e){return e}),Kt=Ut([{strict:[]},{defaultedThunk:["fallbackThunk"]},{asOption:[]},{asDefaultedOptionThunk:["fallbackThunk"]},{mergeWithThunk:["baseThunk"]}]),Jt=function(n){return Kt.defaultedThunk(y(n))},Qt=Kt.strict,Zt=Kt.asOption,nr=Kt.defaultedThunk,er=(Kt.asDefaultedOptionThunk,Kt.mergeWithThunk),tr=(Ut([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]),function(n,e){var t={};return t[n]=e,t}),rr=function(n,e){return t=e,r={},nt(n,function(n,e){A(t,e)||(r[e]=n)}),r;var t,r},or=tr,ir=function(n){return e={},P(n,function(n){e[n.key]=n.value}),e;var e},ur=function(n,e){var t,r,o,i,u,c=(t=[],r=[],P(n,function(n){n.fold(function(n){t.push(n)},function(n){r.push(n)})}),{errors:t,values:r});return 0<c.errors.length?(u=c.errors,Ct.error(U(u))):(i=e,0===(o=c.values).length?Ct.value(i):Ct.value(qt(i,Yt.apply(undefined,o))))},cr=function(n){return i(Ht,U)(n)},ar=function(n,e){var t,r,o=Pt(n);return 0<o.errors.length?cr(o.errors):(t=o.values,r=e,0<t.length?Nt(qt(r,Yt.apply(undefined,t))):Nt(r))},fr=function(n){var e=Pt(n);return 0<e.errors.length?cr(e.errors):Nt(e.values)},sr=function(n){return C(n)&&100<Qe(n).length?" removed due to size":JSON.stringify(n,null,2)},lr=function(n,e){return Ht([{path:n,getErrorInfo:e}])},dr=Ut([{field:["key","okey","presence","prop"]},{state:["okey","instantiator"]}]),mr=function(t,r,o){return it(r,o).fold(function(){return n=o,e=r,lr(t,function(){return'Could not find valid *strict* value for "'+n+'" in '+sr(e)});var n,e},Nt)},gr=function(n,e,t){var r=it(n,e).fold(function(){return t(n)},v);return Nt(r)},pr=function(c,a,n,f){return n.fold(function(o,t,n,r){var i=function(n){var e=r.extract(c.concat([o]),f,n);return Gt(e,function(n){return tr(t,f(n))})},u=function(n){return n.fold(function(){var n=tr(t,f(T.none()));return Nt(n)},function(n){var e=r.extract(c.concat([o]),f,n);return Gt(e,function(n){return tr(t,f(T.some(n)))})})};return n.fold(function(){return zt(mr(c,a,o),i)},function(n){return zt(gr(a,o,n),i)},function(){return zt(Nt(it(a,o)),u)},function(n){return zt((t=n,r=it(e=a,o).map(function(n){return!0===n?t(e):n}),Nt(r)),u);var e,t,r},function(n){var e=n(a),t=Gt(gr(a,o,y({})),function(n){return qt(e,n)});return zt(t,i)})},function(n,e){var t=e(a);return Nt(tr(n,f(t)))})},hr=function(r){return{extract:function(t,n,e){return Lt(r(e,n),function(n){return e=n,lr(t,function(){return e});var e})},toString:function(){return"val"}}},vr=function(n){var u=yr(n),c=z(n,function(e,n){return n.fold(function(n){return qt(e,or(n,!0))},y(e))},{});return{extract:function(n,e,t){var r,o=D(t)?[]:Qe(rt(t,function(n){return n!==undefined&&null!==n})),i=H(o,function(n){return!ct(c,n)});return 0===i.length?u.extract(n,e,t):(r=i,lr(n,function(){return"There are unsupported fields: ["+r.join(", ")+"] specified"}))},toString:u.toString}},yr=function(c){return{extract:function(n,e,t){return r=n,o=t,i=e,u=N(c,function(n){return pr(r,o,n,i)}),ar(u,{});var r,o,i,u},toString:function(){return"obj{\n"+N(c,function(n){return n.fold(function(n,e,t,r){return n+" -> "+r.toString()},function(n,e){return"state("+n+")"})}).join("\n")+"}"}}},br=function(t,i){var u=function(n,e){return o=hr(t),function(t,r,n){var e=N(n,function(n,e){return o.extract(t.concat(["["+e+"]"]),r,n)});return fr(e)}(n,v,e);var o};return{extract:function(t,r,o){var n=Qe(o),e=u(t,n);return zt(e,function(n){var e=N(n,function(n){return dr.field(n,n,Qt(),i)});return yr(e).extract(t,r,o)})},toString:function(){return"setOf("+i.toString()+")"}}},xr=y(hr(Nt)),wr=dr.state,Sr=dr.field,Or=function(t,e,r,o,i){return it(o,i).fold(function(){return n=o,e=i,lr(t,function(){return'The chosen schema: "'+e+'" did not exist in branches: '+sr(n)});var n,e},function(n){return n.extract(t.concat(["branch: "+i]),e,r)})},Tr=function(o,i){return{extract:function(e,t,r){return it(r,o).fold(function(){return n=o,lr(e,function(){return'Choice schema did not contain choice key: "'+n+'"'});var n},function(n){return Or(e,t,r,i,n)})},toString:function(){return"chooseOn("+o+"). Possible values: "+Qe(i)}}},kr=hr(Nt),Er=function(e){return hr(function(n){return e(n).fold(Ht,Nt)})},Cr=function(e,n){return br(function(n){return At(e(n))},n)},Mr=function(n,e,t){return jt((r=n,o=v,i=t,u=e.extract([r],o,i),$t(u,function(n){return{input:i,errors:n}})));var r,o,i,u},Dr=function(n){return n.fold(function(n){throw new Error(Ir(n))},v)},_r=function(n,e,t){return Dr(Mr(n,e,t))},Ir=function(n){return"Errors: \n"+(e=n.errors,t=10<e.length?e.slice(0,10).concat([{path:[],getErrorInfo:function(){return"... (only showing first ten failures)"}}]):e,N(t,function(n){return"Failed path: ("+n.path.join(" > ")+")\n"+n.getErrorInfo()}).join("\n"))+"\n\nInput object: "+sr(n.input);var e,t},Fr=function(n,e){return Tr(n,et(e,yr))},Rr=y(kr),Vr=(Mt=I,Dt="function",hr(function(n){var e=typeof n;return Mt(n)?Nt(n):Ht("Expected type: "+Dt+" but got: "+e)})),Br=function(n){return Sr(n,n,Qt(),xr())},Ar=function(n,e){return Sr(n,n,Qt(),e)},jr=function(n,e){return Sr(n,n,Qt(),yr(e))},Nr=function(n){return Sr(n,n,Zt(),xr())},Pr=function(n,e){return Sr(n,n,Zt(),e)},Hr=function(n,e){return Pr(n,yr(e))},zr=function(n,e){return Pr(n,vr(e))},Lr=function(n,e){return Sr(n,n,Jt(e),xr())},Gr=function(n,e,t){return Sr(n,n,Jt(e),t)},$r=function(n,e){return wr(n,e)},Ur=[Br("alpha"),Br("omega")],Wr=function(n){return I(n)?n:l},Xr=function(n,e,t){var r=e(n),o=Wr(t);return r.orThunk(function(){return o(n)?T.none():function(n,e,t){for(var r=n.dom,o=Wr(t);r.parentNode;){r=r.parentNode;var i=de.fromDom(r),u=e(i);if(u.isSome())return u;if(o(i))break}return T.none()}(n,e,o)})},qr=function(n,e){return ve(n.element,e.event.target)},Yr=function(n){if(!ct(n,"can")&&!ct(n,"abort")&&!ct(n,"run"))throw new Error("EventHandler defined by: "+JSON.stringify(n,null,2)+" does not have can, abort, or run!");return _r("Extracting event.handler",vr([Lr("can",w),Lr("abort",l),Lr("run",O)]),n)},Kr=function(t){var e,r,o,i,n=(r=function(n){return n.can},function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return L(e,function(n,e){return n&&r(e).apply(undefined,t)},!0)}),u=(o=e=t,i=function(n){return n.abort},function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return L(o,function(n,e){return n||i(e).apply(undefined,t)},!1)});return Yr({can:n,abort:u,run:function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];P(t,function(n){n.run.apply(undefined,e)})}})},Jr=ir,Qr=function(n,e){return{key:n,value:Yr({abort:e})}},Zr=function(n,e){return{key:n,value:Yr({run:e})}},no=function(n,t,r){return{key:n,value:Yr({run:function(n,e){t.apply(undefined,[n,e].concat(r))}})}},eo=function(n){return function(t){return{key:n,value:Yr({run:function(n,e){qr(n,e)&&t(n,e)}})}}},to=function(u,e){return Zr(u,function(n,i){n.getSystem().getByUid(e).each(function(n){var e,t,r,o;t=(e=n).element,r=u,o=i,e.getSystem().triggerEvent(r,t,o.event)})})},ro=function(n,e,t){var r=e.partUids[t];return to(n,r)},oo=function(n){return Zr(n,function(n,e){e.cut()})},io=eo(ee()),uo=eo(te()),co=eo(ne()),ao=(_t=Kn(),function(n){return Zr(_t,n)}),fo=function(n){return N(n,function(n){return r=e="/*",o=(t=n).length-e.length,""===r||t.length>=r.length&&t.substr(o,o+r.length)===r?n.substring(0,n.length-"/*".length):n;var e,t,r,o})},so=function(n,e){var t=n.toString(),r=t.indexOf(")")+1,o=t.indexOf("("),i=t.substring(o+1,r-1).split(/,\s*/);return n.toFunctionAnnotation=function(){return{name:e,parameters:fo(i)}},n},lo=function(n){return{classes:n.classes!==undefined?n.classes:[],attributes:n.attributes!==undefined?n.attributes:{},styles:n.styles!==undefined?n.styles:{}}},mo=function(t,r,o){return co(function(n,e){o(n,t,r)})},go=function(o,i,u){var n,e,t,r,c,a;return n=function(t){for(var n=[],e=1;e<arguments.length;e++)n[e-1]=arguments[e];var r=[t].concat(n);return t.config({name:y(o)}).fold(function(){throw new Error("We could not find any behaviour configuration for: "+o+". Using API: "+u)},function(n){var e=Array.prototype.slice.call(r,1);return i.apply(undefined,[t,n.config,n.state].concat(e))})},e=u,t=i.toString(),r=t.indexOf(")")+1,c=t.indexOf("("),a=t.substring(c+1,r-1).split(/,\s*/),n.toFunctionAnnotation=function(){return{name:e,parameters:fo(a.slice(0,1).concat(a.slice(3)))}},n},po=function(n){return{key:n,value:undefined}},ho=function(t,n,r,o,e,i,u){var c=function(n){return ct(n,r)?n[r]():T.none()},a=et(e,function(n,e){return go(r,n,e)}),f=et(i,so),s=x(x(x({},f),a),{revoke:b(po,r),config:function(n){var e=_r(r+"-config",t,n);return{key:r,value:{config:e,me:s,configAsRaw:d(function(){return _r(r+"-config",t,n)}),initialConfig:n,state:u}}},schema:y(n),exhibit:function(n,t){return c(n).bind(function(e){return it(o,"exhibit").map(function(n){return n(t,e.config,e.state)})}).getOr(lo({}))},name:y(r),handlers:function(n){return c(n).map(function(n){return it(o,"events").getOr(function(){return{}})(n.config,n.state)}).getOr({})}});return s},vo={init:function(){return yo({readState:function(){return"No State required"}})}},yo=function(n){return n},bo=ir,xo=vr([Br("fields"),Br("name"),Lr("active",{}),Lr("apis",{}),Lr("state",vo),Lr("extra",{})]),wo=function(n){var e,t,r,o,i,u,c,a,f=_r("Creating behaviour: "+n.name,xo,n);return e=f.fields,t=f.name,r=f.active,o=f.apis,i=f.extra,u=f.state,c=vr(e),a=Hr(t,[zr("config",e)]),ho(c,a,t,r,o,i,u)},So=vr([Br("branchKey"),Br("branches"),Br("name"),Lr("active",{}),Lr("apis",{}),Lr("state",vo),Lr("extra",{})]),Oo=y(undefined),To=wo({fields:Ur,name:"swapping",apis:Tt}),ko=function(n){var e=n;return{get:function(){return e},set:function(n){e=n}}},Eo=function(n){return n.dom.focus()},Co=function(n){return n.dom.blur()},Mo=function(n){return void 0===n&&(n=de.fromDom(document)),T.from(n.dom.activeElement).map(de.fromDom)},Do=function(e){return Mo(Pe(e)).filter(function(n){return e.dom.contains(n.dom)})},_o=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),Io=tinymce.util.Tools.resolve("tinymce.ThemeManager"),Fo=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}],Ro=["undo","bold","italic","link","image","bullist","styleselect"],Vo="formatChanged",Bo="orientationChanged",Ao="dropupDismissed",jo=function(n){return n.dom.innerHTML},No=function(n,e){var t,r,o=Te(n).dom,i=de.fromDom(o.createDocumentFragment()),u=(t=e,(r=(o||document).createElement("div")).innerHTML=t,Ce(de.fromDom(r)));Re(i,u),Ve(n),Fe(n,i)},Po=function(n){return e=n,t=!1,de.fromDom(e.dom.cloneNode(t));var e,t},Ho=function(n){if(Ae(n))return"#shadow-root";var e,t,r,o=Po(n);return e=o,t=de.fromTag("div"),r=de.fromDom(e.dom.cloneNode(!0)),Fe(t,r),jo(t)},zo=/* */Object.freeze({__proto__:null,events:function(a){return Jr([Zr(Yn(),function(o,n){var e,t,i=a.channels,r=Qe(i),u=n,c=(e=r,(t=u).universal?e:H(e,function(n){return A(t.channels,n)}));P(c,function(n){var e=i[n],t=e.schema,r=_r("channel["+n+"] data\nReceiver: "+Ho(o.element),t,u.data);e.onReceive(o,r)})})])}}),Lo="unknown";(Ft=It=It||{})[Ft.STOP=0]="STOP",Ft[Ft.NORMAL=1]="NORMAL",Ft[Ft.LOGGING=2]="LOGGING";var Go,$o=ko({}),Uo=["alloy/data/Fields","alloy/debugging/Debugging"],Wo=function(e,n,t){var r,o,i,u;switch(it($o.get(),e).orThunk(function(){var n=Qe($o.get());return Q(n,function(n){return-1<e.indexOf(n)?T.some($o.get()[n]):T.none()})}).getOr(It.NORMAL)){case It.NORMAL:return t(Xo());case It.LOGGING:var c=(r=e,o=n,i=[],u=(new Date).getTime(),{logEventCut:function(n,e,t){i.push({outcome:"cut",target:e,purpose:t})},logEventStopped:function(n,e,t){i.push({outcome:"stopped",target:e,purpose:t})},logNoParent:function(n,e,t){i.push({outcome:"no-parent",target:e,purpose:t})},logEventNoHandlers:function(n,e){i.push({outcome:"no-handlers-left",target:e})},logEventResponse:function(n,e,t){i.push({outcome:"response",purpose:t,target:e})},write:function(){var n=(new Date).getTime();A(["mousemove","mouseover","mouseout",ne()],r)||console.log(r,{event:r,time:n-u,target:o.dom,sequence:N(i,function(n){return A(["cut","stopped","response"],n.outcome)?"{"+n.purpose+"} "+n.outcome+" at ("+Ho(n.target)+")":n.outcome})})}}),a=t(c);return c.write(),a;case It.STOP:return!0}},Xo=y({logEventCut:O,logEventStopped:O,logNoParent:O,logEventNoHandlers:O,logEventResponse:O,write:O}),qo=y([Br("menu"),Br("selectedMenu")]),Yo=y([Br("item"),Br("selectedItem")]),Ko=(y(yr(Yo().concat(qo()))),y(yr(Yo()))),Jo=jr("initSize",[Br("numColumns"),Br("numRows")]),Qo=function(n,e,t){!function(){var n=new Error;if(n.stack===undefined)return;var e=n.stack.split("\n");G(e,function(e){return 0<e.indexOf("alloy")&&!j(Uo,function(n){return-1<e.indexOf(n)})}).getOr(Lo)}();return Sr(e,e,t,Er(function(t){return Ct.value(function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return t.apply(undefined,n)})}))},Zo=function(n){return Qo(0,n,Jt(O))},ni=function(n){return Qo(0,n,Jt(T.none))},ei=function(n){return Qo(0,n,Qt())},ti=function(n){return Qo(0,n,Qt())},ri=function(n,e){return $r(n,y(e))},oi=function(n){return $r(n,v)},ii=y(Jo),ui=[Ar("channels",Cr(Ct.value,vr([ei("onReceive"),Lr("schema",Rr())])))],ci=wo({fields:ui,name:"receiving",active:zo}),ai=function(n,e,t){var r=e.aria;r.update(n,r,t.get())},fi=function(e,n,t){n.toggleClass.each(function(n){(t.get()?bt:wt)(e.element,n)})},si=function(n,e,t){mi(n,e,t,!t.get())},li=function(n,e,t){t.set(!0),fi(n,e,t),ai(n,e,t)},di=function(n,e,t){t.set(!1),fi(n,e,t),ai(n,e,t)},mi=function(n,e,t,r){(r?li:di)(n,e,t)},gi=function(n,e,t){mi(n,e,t,e.selected)},pi=/* */Object.freeze({__proto__:null,onLoad:gi,toggle:si,isOn:function(n,e,t){return t.get()},on:li,off:di,set:mi}),hi=/* */Object.freeze({__proto__:null,exhibit:function(){return lo({})},events:function(n,e){var t,r,o,i=(t=n,r=e,o=si,ao(function(n){o(n,t,r)})),u=mo(n,e,gi);return Jr(U([n.toggleOnExecute?[i]:[],[u]]))}}),vi=function(n,e,t){ft(n.element,"aria-expanded",t)},yi=[Lr("selected",!1),Nr("toggleClass"),Lr("toggleOnExecute",!0),Gr("aria",{mode:"none"},Fr("mode",{pressed:[Lr("syncWithExpanded",!1),ri("update",function(n,e,t){ft(n.element,"aria-pressed",t),e.syncWithExpanded&&vi(n,e,t)})],checked:[ri("update",function(n,e,t){ft(n.element,"aria-checked",t)})],expanded:[ri("update",vi)],selected:[ri("update",function(n,e,t){ft(n.element,"aria-selected",t)})],none:[ri("update",O)]}))],bi=wo({fields:yi,name:"toggling",active:hi,apis:pi,state:(Go=!1,{init:function(){var e=ko(Go);return{get:function(){return e.get()},set:function(n){return e.set(n)},clear:function(){return e.set(Go)},readState:function(){return e.get()}}}})}),xi=function(t,r){return ci.config({channels:or(Vo,{onReceive:function(n,e){e.command===t&&r(n,e.state)}})})},wi=function(n){return ci.config({channels:or(Bo,{onReceive:n})})},Si=function(n,e){return{key:n,value:{onReceive:e}}},Oi="tinymce-mobile",Ti=function(n){return Oi+"-"+n},ki=function(){var n=function(n,e){e.stop(),ae(n)};return[Zr(zn(),n),Zr(Qn(),n),oo(_n()),oo(Rn())]},Ei=function(n,e){e.ignore||(Eo(n.element),e.onFocus(n))},Ci=/* */Object.freeze({__proto__:null,focus:Ei,blur:function(n,e){e.ignore||Co(n.element)},isFocused:function(n){return e=n.element,t=Pe(e).dom,e.dom===t.activeElement;var e,t}}),Mi=/* */Object.freeze({__proto__:null,exhibit:function(n,e){var t=e.ignore?{}:{attributes:{tabindex:"-1"}};return lo(t)},events:function(t){return Jr([Zr(Wn(),function(n,e){Ei(n,t),e.stop()})].concat(t.stopMousedown?[Zr(Rn(),function(n,e){e.event.prevent()})]:[]))}}),Di=[Zo("onFocus"),Lr("stopMousedown",!1),Lr("ignore",!1)],_i=wo({fields:Di,name:"focusing",active:Mi,apis:Ci}),Ii=function(n){return n.style!==undefined&&I(n.style.getPropertyValue)},Fi=function(n,e,t){if(!E(t))throw console.error("Invalid call to CSS.set. Property ",e,":: Value ",t,":: Element ",n),new Error("CSS value must be a string: "+t);Ii(n)&&n.style.setProperty(e,t)},Ri=function(n,e,t){var r=n.dom;Fi(r,e,t)},Vi=function(n,e){var t=n.dom;nt(e,function(n,e){Fi(t,e,n)})},Bi=function(n,e){var t=n.dom,r=window.getComputedStyle(t).getPropertyValue(e);return""!==r||Le(n)?r:Ai(t,e)},Ai=function(n,e){return Ii(n)?n.style.getPropertyValue(e):""},ji=function(n,e){var t=n.dom,r=Ai(t,e);return T.from(r).filter(function(n){return 0<n.length})},Ni=function(n,e){var t,r,o=n.dom;r=e,Ii(t=o)&&t.style.removeProperty(r),dt(n,"style").map(fn).is("")&&gt(n,"style")},Pi=function(n){return n.dom.offsetWidth},Hi=function(r,o){var n=function(n){var e=o(n);if(e<=0||null===e){var t=Bi(n,r);return parseFloat(t)||0}return e},i=function(o,n){return L(n,function(n,e){var t=Bi(o,e),r=t===undefined?0:parseInt(t,10);return isNaN(r)?n:n+r},0)};return{set:function(n,e){if(!F(e)&&!e.match(/^[0-9]+$/))throw new Error(r+".set accepts only positive integer values. Value was "+e);var t=n.dom;Ii(t)&&(t.style[r]=e+"px")},get:n,getOuter:n,aggregate:i,max:function(n,e,t){var r=i(n,t);return r<e?e-r:0}}},zi=Hi("height",function(n){var e=n.dom;return Le(n)?e.getBoundingClientRect().height:e.offsetHeight}),Li=function(n){return zi.get(n)},Gi=function(n,e,t){return H(function(n,e){for(var t=I(e)?e:l,r=n.dom,o=[];null!==r.parentNode&&r.parentNode!==undefined;){var i=r.parentNode,u=de.fromDom(i);if(o.push(u),!0===t(u))break;r=i}return o}(n,t),e)},$i=function(n,e){return H(Ee(t=n).map(Ce).map(function(n){return H(n,function(n){return!ve(t,n)})}).getOr([]),e);var t},Ui=function(n,e){return pe(e,n)};function Wi(n,e,t,r,o){return n(t,r)?T.some(t):I(o)&&o(t)?T.none():e(t,r,o)}var Xi,qi,Yi=function(n,e,t){for(var r=n.dom,o=I(t)?t:l;r.parentNode;){r=r.parentNode;var i=de.fromDom(r);if(e(i))return T.some(i);if(o(i))break}return T.none()},Ki=function(n){return he(n)},Ji=function(n,e,t){return Yi(n,function(n){return me(n,e)},t)},Qi=function(n,e){return he(e,n)},Zi=function(n,e,t){return Wi(me,Ji,n,e,t)},nu=[8],eu=[9],tu=[13],ru=[27],ou=[32],iu=[37],uu=[38],cu=[39],au=[40],fu=function(n,e,t){var r=q(n.slice(0,e)),o=q(n.slice(e+1));return G(r.concat(o),t)},su=function(n,e,t){var r=q(n.slice(0,e));return G(r,t)},lu=function(n,e,t){var r=n.slice(0,e),o=n.slice(e+1);return G(o.concat(r),t)},du=function(n,e,t){var r=n.slice(e+1);return G(r,t)},mu=function(t){return function(n){var e=n.raw;return A(t,e.which)}},gu=function(n){return function(e){return X(n,function(n){return n(e)})}},pu=function(n){return!0===n.raw.shiftKey},hu=function(n){return!0===n.raw.ctrlKey},vu=m(pu),yu=function(n,e){return{matches:n,classification:e}},bu=function(n,e,t,r){var o=n+e;return r<o?t:o<t?r:o},xu=function(n,e,t){return Math.min(Math.max(n,e),t)},wu=function(n){for(var e=[],t=function(n){e.push(n)},r=0;r<n.length;r++)n[r].each(t);return e},Su=function(t,r,n,o){var e=Ui(t.element,"."+r.highlightClass);P(e,function(e){j(o,function(n){return n.element===e})||(wt(e,r.highlightClass),t.getSystem().getByDom(e).each(function(n){r.onDehighlight(t,n),ue(n,ie())}))})},Ou=function(n,e,t,r){Su(n,e,0,[r]),Tu(n,e,t,r)||(bt(r.element,e.highlightClass),e.onHighlight(n,r),ue(r,oe()))},Tu=function(n,e,t,r){return St(r.element,e.highlightClass)},ku=function(n,e,t,r){var o=Ui(n.element,"."+e.itemClass);return T.from(o[r]).fold(function(){return Ct.error(new Error("No element found with index "+r))},n.getSystem().getByDom)},Eu=function(e,n,t){return Qi(e.element,"."+n.itemClass).bind(function(n){return e.getSystem().getByDom(n).toOptional()})},Cu=function(e,n,t){var r=Ui(e.element,"."+n.itemClass);return(0<r.length?T.some(r[r.length-1]):T.none()).bind(function(n){return e.getSystem().getByDom(n).toOptional()})},Mu=function(t,e,n,r){var o=Ui(t.element,"."+e.itemClass);return $(o,function(n){return St(n,e.highlightClass)}).bind(function(n){var e=bu(n,r,0,o.length-1);return t.getSystem().getByDom(o[e]).toOptional()})},Du=function(e,n,t){var r=Ui(e.element,"."+n.itemClass);return wu(N(r,function(n){return e.getSystem().getByDom(n).toOptional()}))},_u=/* */Object.freeze({__proto__:null,dehighlightAll:function(n,e,t){return Su(n,e,0,[])},dehighlight:function(n,e,t,r){Tu(n,e,t,r)&&(wt(r.element,e.highlightClass),e.onDehighlight(n,r),ue(r,ie()))},highlight:Ou,highlightFirst:function(e,t,r){Eu(e,t).each(function(n){Ou(e,t,r,n)})},highlightLast:function(e,t,r){Cu(e,t).each(function(n){Ou(e,t,r,n)})},highlightAt:function(e,t,r,n){ku(e,t,r,n).fold(function(n){throw n},function(n){Ou(e,t,r,n)})},highlightBy:function(e,t,r,n){var o=Du(e,t);G(o,n).each(function(n){Ou(e,t,r,n)})},isHighlighted:Tu,getHighlighted:function(e,n,t){return Qi(e.element,"."+n.highlightClass).bind(function(n){return e.getSystem().getByDom(n).toOptional()})},getFirst:Eu,getLast:Cu,getPrevious:function(n,e,t){return Mu(n,e,0,-1)},getNext:function(n,e,t){return Mu(n,e,0,1)},getCandidates:Du}),Iu=[Br("highlightClass"),Br("itemClass"),Zo("onHighlight"),Zo("onDehighlight")],Fu=wo({fields:Iu,name:"highlighting",apis:_u}),Ru=function(n,e,t){e.exists(function(e){return t.exists(function(n){return ve(n,e)})})||ce(n,re(),{prevFocus:e,newFocus:t})},Vu=function(){var o=function(n){return Do(n.element)};return{get:o,set:function(n,e){var t=o(n);n.getSystem().triggerFocus(e,n.element);var r=o(n);Ru(n,t,r)}}};(qi=Xi=Xi||{}).OnFocusMode="onFocus",qi.OnEnterOrSpaceMode="onEnterOrSpace",qi.OnApiMode="onApi";var Bu,Au,ju,Nu,Pu,Hu,zu,Lu,Gu,$u,Uu,Wu,Xu,qu,Yu,Ku,Ju=function(n,e,t,r,c){var a=function(e,t,n,r,o){var i,u,c=n(e,t,r,o);return i=c,u=t.event,G(i,function(n){return n.matches(u)}).map(function(n){return n.classification}).bind(function(n){return n(e,t,r,o)})},o={schema:function(){return n.concat([Lr("focusManager",Vu()),Gr("focusInside","onFocus",Er(function(n){return A(["onFocus","onEnterOrSpace","onApi"],n)?Ct.value(n):Ct.error("Invalid value for focusInside")})),ri("handler",o),ri("state",e),ri("sendFocusIn",c)])},processKey:a,toEvents:function(i,u){var n=i.focusInside!==Xi.OnFocusMode?T.none():c(i).map(function(t){return Zr(Wn(),function(n,e){t(n,i,u),e.stop()})}),e=[Zr(jn(),function(r,o){a(r,o,t,i,u).fold(function(){var e,t,n;e=r,t=o,n=mu(ou.concat(tu))(t.event),i.focusInside===Xi.OnEnterOrSpaceMode&&n&&qr(e,t)&&c(i).each(function(n){n(e,i,u),t.stop()})},function(n){o.stop()})}),Zr(Nn(),function(n,e){a(n,e,r,i,u).each(function(n){e.stop()})})];return Jr(n.toArray().concat(e))}};return o},Qu=function(n){var e=[Nr("onEscape"),Nr("onEnter"),Lr("selector",'[data-alloy-tabstop="true"]:not(:disabled)'),Lr("firstTabstop",0),Lr("useTabstopAt",w),Nr("visibilitySelector")].concat([n]),u=function(n,e){var t=n.visibilitySelector.bind(function(n){return Zi(e,n)}).getOr(e);return 0<Li(t)},t=function(e,t,n){var r,o,i;r=t,o=Ui(e.element,r.selector),i=H(o,function(n){return u(r,n)}),T.from(i[r.firstTabstop]).each(function(n){t.focusManager.set(e,n)})},c=function(e,n,t,r,o){return o(n,t,function(n){return u(e=r,t=n)&&e.useTabstopAt(t);var e,t}).fold(function(){return r.cyclic?T.some(!0):T.none()},function(n){return r.focusManager.set(e,n),T.some(!0)})},o=function(e,n,t,r){var o,i,u=Ui(e.element,t.selector);return o=e,(i=t).focusManager.get(o).bind(function(n){return Zi(n,i.selector)}).bind(function(n){return $(u,b(ve,n)).bind(function(n){return c(e,u,n,t,r)})})},r=y([yu(gu([pu,mu(eu)]),function(n,e,t){var r=t.cyclic?fu:su;return o(n,0,t,r)}),yu(mu(eu),function(n,e,t){var r=t.cyclic?lu:du;return o(n,0,t,r)}),yu(mu(ru),function(e,t,n){return n.onEscape.bind(function(n){return n(e,t)})}),yu(gu([vu,mu(tu)]),function(e,t,n){return n.onEnter.bind(function(n){return n(e,t)})})]),i=y([]);return Ju(e,vo.init,r,i,function(){return T.some(t)})},Zu=Qu($r("cyclic",l)),nc=Qu($r("cyclic",w)),ec=function(n){return"input"===ye(n)&&"radio"!==lt(n,"type")||"textarea"===ye(n)},tc=function(n,e,t){return ec(t)&&mu(ou)(e.event)?T.none():(fe(n,t,Kn()),T.some(!0))},rc=function(n,e){return T.some(!0)},oc=[Lr("execute",tc),Lr("useSpace",!1),Lr("useEnter",!0),Lr("useControlEnter",!1),Lr("useDown",!1)],ic=function(n,e,t){return t.execute(n,e,n.element)},uc=Ju(oc,vo.init,function(n,e,t,r){var o=t.useSpace&&!ec(n.element)?ou:[],i=t.useEnter?tu:[],u=t.useDown?au:[],c=o.concat(i).concat(u);return[yu(mu(c),ic)].concat(t.useControlEnter?[yu(gu([hu,mu(tu)]),ic)]:[])},function(n,e,t,r){return t.useSpace&&!ec(n.element)?[yu(mu(ou),rc)]:[]},function(){return T.none()}),cc=function(){var t=ko(T.none());return yo({readState:function(){return t.get().map(function(n){return{numRows:String(n.numRows),numColumns:String(n.numColumns)}}).getOr({numRows:"?",numColumns:"?"})},setGridSize:function(n,e){t.set(T.some({numRows:n,numColumns:e}))},getNumRows:function(){return t.get().map(function(n){return n.numRows})},getNumColumns:function(){return t.get().map(function(n){return n.numColumns})}})},ac=/* */Object.freeze({__proto__:null,flatgrid:cc,init:function(n){return n.state(n)}}),fc=function(e,t){return function(n){return"rtl"===sc(n)?t:e}},sc=function(n){return"rtl"===Bi(n,"direction")?"rtl":"ltr"},lc=function(i){return function(n,e,t,r){var o=i(n.element);return pc(o,n,e,t,r)}},dc=function(n,e){var t=fc(n,e);return lc(t)},mc=function(n,e){var t=fc(e,n);return lc(t)},gc=function(o){return function(n,e,t,r){return pc(o,n,e,t,r)}},pc=function(e,t,n,r,o){return r.focusManager.get(t).bind(function(n){return e(t.element,n,r,o)}).map(function(n){return r.focusManager.set(t,n),!0})},hc=gc,vc=gc,yc=gc,bc=function(n){return!((e=n.dom).offsetWidth<=0&&e.offsetHeight<=0);var e},xc=function(n,e,t){var r,o=Ui(n,t),i=H(o,bc);return $(r=i,function(n){return ve(n,e)}).map(function(n){return{index:n,candidates:r}})},wc=function(n,e){return $(n,function(n){return ve(e,n)})},Sc=function(t,n,r,e){return e(Math.floor(n/r),n%r).bind(function(n){var e=n.row*r+n.column;return 0<=e&&e<t.length?T.some(t[e]):T.none()})},Oc=function(o,n,i,u,c){return Sc(o,n,u,function(n,e){var t=n===i-1?o.length-n*u:u,r=bu(e,c,0,t-1);return T.some({row:n,column:r})})},Tc=function(i,n,u,c,a){return Sc(i,n,c,function(n,e){var t=bu(n,a,0,u-1),r=t===u-1?i.length-t*c:c,o=xu(e,0,r-1);return T.some({row:t,column:o})})},kc=[Br("selector"),Lr("execute",tc),ni("onEscape"),Lr("captureTab",!1),ii()],Ec=function(e,t,n){Qi(e.element,t.selector).each(function(n){t.focusManager.set(e,n)})},Cc=function(o){return function(n,e,t,r){return xc(n,e,t.selector).bind(function(n){return o(n.candidates,n.index,r.getNumRows().getOr(t.initSize.numRows),r.getNumColumns().getOr(t.initSize.numColumns))})}},Mc=function(n,e,t){return t.captureTab?T.some(!0):T.none()},Dc=Cc(function(n,e,t,r){return Oc(n,e,t,r,-1)}),_c=Cc(function(n,e,t,r){return Oc(n,e,t,r,1)}),Ic=Cc(function(n,e,t,r){return Tc(n,e,t,r,-1)}),Fc=Cc(function(n,e,t,r){return Tc(n,e,t,r,1)}),Rc=y([yu(mu(iu),dc(Dc,_c)),yu(mu(cu),mc(Dc,_c)),yu(mu(uu),hc(Ic)),yu(mu(au),vc(Fc)),yu(gu([pu,mu(eu)]),Mc),yu(gu([vu,mu(eu)]),Mc),yu(mu(ru),function(n,e,t){return t.onEscape(n,e)}),yu(mu(ou.concat(tu)),function(e,t,r,n){return o=e,(i=r).focusManager.get(o).bind(function(n){return Zi(n,i.selector)}).bind(function(n){return r.execute(e,t,n)});var o,i})]),Vc=y([yu(mu(ou),rc)]),Bc=Ju(kc,cc,Rc,Vc,function(){return T.some(Ec)}),Ac=function(n,e,t,i){var u=function(n,e,t){var r,o=bu(e,i,0,t.length-1);return o===n?T.none():(r=t[o],"button"===ye(r)&&"disabled"===lt(r,"disabled")?u(n,o,t):T.from(t[o]))};return xc(n,t,e).bind(function(n){var e=n.index,t=n.candidates;return u(e,e,t)})},jc=[Br("selector"),Lr("getInitial",T.none),Lr("execute",tc),ni("onEscape"),Lr("executeOnMove",!1),Lr("allowVertical",!0)],Nc=function(e,t,r){return n=e,(o=r).focusManager.get(n).bind(function(n){return Zi(n,o.selector)}).bind(function(n){return r.execute(e,t,n)});var n,o},Pc=function(e,t,n){t.getInitial(e).orThunk(function(){return Qi(e.element,t.selector)}).each(function(n){t.focusManager.set(e,n)})},Hc=function(n,e,t){return Ac(n,t.selector,e,-1)},zc=function(n,e,t){return Ac(n,t.selector,e,1)},Lc=function(o){return function(n,e,t,r){return o(n,e,t,r).bind(function(){return t.executeOnMove?Nc(n,e,t):T.some(!0)})}},Gc=function(n,e,t){return t.onEscape(n,e)},$c=y([yu(mu(ou),rc)]),Uc=Ju(jc,vo.init,function(n,e,t,r){var o=iu.concat(t.allowVertical?uu:[]),i=cu.concat(t.allowVertical?au:[]);return[yu(mu(o),Lc(dc(Hc,zc))),yu(mu(i),Lc(mc(Hc,zc))),yu(mu(tu),Nc),yu(mu(ou),Nc),yu(mu(ru),Gc)]},$c,function(){return T.some(Pc)}),Wc=function(n,e,t){return T.from(n[e]).bind(function(n){return T.from(n[t]).map(function(n){return{rowIndex:e,columnIndex:t,cell:n}})})},Xc=function(n,e,t,r){var o=n[e].length,i=bu(t,r,0,o-1);return Wc(n,e,i)},qc=function(n,e,t,r){var o=bu(t,r,0,n.length-1),i=n[o].length,u=xu(e,0,i-1);return Wc(n,o,u)},Yc=function(n,e,t,r){var o=n[e].length,i=xu(t+r,0,o-1);return Wc(n,e,i)},Kc=function(n,e,t,r){var o=xu(t+r,0,n.length-1),i=n[o].length,u=xu(e,0,i-1);return Wc(n,o,u)},Jc=[jr("selectors",[Br("row"),Br("cell")]),Lr("cycles",!0),Lr("previousSelector",T.none),Lr("execute",tc)],Qc=function(e,t,n){t.previousSelector(e).orThunk(function(){var n=t.selectors;return Qi(e.element,n.cell)}).each(function(n){t.focusManager.set(e,n)})},Zc=function(n,e){return function(t,r,i){var u=i.cycles?n:e;return Zi(r,i.selectors.row).bind(function(n){var e=Ui(n,i.selectors.cell);return wc(e,r).bind(function(r){var o=Ui(t,i.selectors.row);return wc(o,n).bind(function(n){var e,t=(e=i,N(o,function(n){return Ui(n,e.selectors.cell)}));return u(t,n,r).map(function(n){return n.cell})})})})}},na=Zc(function(n,e,t){return Xc(n,e,t,-1)},function(n,e,t){return Yc(n,e,t,-1)}),ea=Zc(function(n,e,t){return Xc(n,e,t,1)},function(n,e,t){return Yc(n,e,t,1)}),ta=Zc(function(n,e,t){return qc(n,t,e,-1)},function(n,e,t){return Kc(n,t,e,-1)}),ra=Zc(function(n,e,t){return qc(n,t,e,1)},function(n,e,t){return Kc(n,t,e,1)}),oa=y([yu(mu(iu),dc(na,ea)),yu(mu(cu),mc(na,ea)),yu(mu(uu),hc(ta)),yu(mu(au),vc(ra)),yu(mu(ou.concat(tu)),function(e,t,r){return Do(e.element).bind(function(n){return r.execute(e,t,n)})})]),ia=y([yu(mu(ou),rc)]),ua=Ju(Jc,vo.init,oa,ia,function(){return T.some(Qc)}),ca=[Br("selector"),Lr("execute",tc),Lr("moveOnTab",!1)],aa=function(e,t,r){return r.focusManager.get(e).bind(function(n){return r.execute(e,t,n)})},fa=function(e,t,n){Qi(e.element,t.selector).each(function(n){t.focusManager.set(e,n)})},sa=function(n,e,t){return Ac(n,t.selector,e,-1)},la=function(n,e,t){return Ac(n,t.selector,e,1)},da=y([yu(mu(uu),yc(sa)),yu(mu(au),yc(la)),yu(gu([pu,mu(eu)]),function(n,e,t,r){return t.moveOnTab?yc(sa)(n,e,t,r):T.none()}),yu(gu([vu,mu(eu)]),function(n,e,t,r){return t.moveOnTab?yc(la)(n,e,t,r):T.none()}),yu(mu(tu),aa),yu(mu(ou),aa)]),ma=y([yu(mu(ou),rc)]),ga=Ju(ca,vo.init,da,ma,function(){return T.some(fa)}),pa=[ni("onSpace"),ni("onEnter"),ni("onShiftEnter"),ni("onLeft"),ni("onRight"),ni("onTab"),ni("onShiftTab"),ni("onUp"),ni("onDown"),ni("onEscape"),Lr("stopSpaceKeyup",!1),Nr("focusIn")],ha=Ju(pa,vo.init,function(n,e,t){return[yu(mu(ou),t.onSpace),yu(gu([vu,mu(tu)]),t.onEnter),yu(gu([pu,mu(tu)]),t.onShiftEnter),yu(gu([pu,mu(eu)]),t.onShiftTab),yu(gu([vu,mu(eu)]),t.onTab),yu(mu(uu),t.onUp),yu(mu(au),t.onDown),yu(mu(iu),t.onLeft),yu(mu(cu),t.onRight),yu(mu(ou),t.onSpace),yu(mu(ru),t.onEscape)]},function(n,e,t){return t.stopSpaceKeyup?[yu(mu(ou),rc)]:[]},function(n){return n.focusIn}),va=Zu.schema(),ya=nc.schema(),ba=Uc.schema(),xa=Bc.schema(),wa=ua.schema(),Sa=uc.schema(),Oa=ga.schema(),Ta=ha.schema(),ka=($u=_r("Creating behaviour: "+(Bu={branchKey:"mode",branches:/* */Object.freeze({__proto__:null,acyclic:va,cyclic:ya,flow:ba,flatgrid:xa,matrix:wa,execution:Sa,menu:Oa,special:Ta}),name:"keying",active:{events:function(n,e){return n.handler.toEvents(n,e)}},apis:{focusIn:function(e,t,r){t.sendFocusIn(t).fold(function(){e.getSystem().triggerFocus(e.element,e.element)},function(n){n(e,t,r)})},setGridSize:function(n,e,t,r,o){ct(t,"setGridSize")?t.setGridSize(r,o):console.error("Layout does not support setGridSize")}},state:ac}).name,So,Bu),Au=Fr($u.branchKey,$u.branches),ju=$u.name,Nu=$u.active,Pu=$u.apis,Hu=$u.extra,zu=$u.state,Gu=Hr(ju,[Pr("config",Lu=Au)]),ho(Lu,Gu,ju,Nu,Pu,Hu,zu)),Ea=function(r,n){return e=r,t={},o=N(n,function(n){return e=n.name(),t="Cannot configure "+n.name()+" for "+r,Sr(e,e,Zt(),hr(function(n){return Ht("The field: "+e+" is forbidden. "+t)}));var e,t}).concat([$r("dump",v)]),Gr(e,t,yr(o));var e,t,o},Ca=function(n){return n.dump},Ma=function(n,e){return x(x({},n.dump),bo(e))},Da=Ea,_a=Ma,Ia="placeholder",Fa=Ut([{single:["required","valueThunk"]},{multiple:["required","valueThunks"]}]),Ra=function(n){return ut(n,"uiType")},Va=function(n,e,t,r){return Ra(t)&&t.uiType===Ia?(i=t,u=r,(o=n).exists(function(n){return n!==i.owner})?Fa.single(!0,y(i)):it(u,i.name).fold(function(){throw new Error("Unknown placeholder component: "+i.name+"\nKnown: ["+Qe(u)+"]\nNamespace: "+o.getOr("none")+"\nSpec: "+JSON.stringify(i,null,2))},function(n){return n.replace()})):Fa.single(!1,y(t));var o,i,u},Ba=function(i,u,c,a){return Va(i,0,c,a).fold(function(n,e){var t=Ra(c)?e(u,c.config,c.validated):e(u),r=it(t,"components").getOr([]),o=W(r,function(n){return Ba(i,u,n,a)});return[x(x({},t),{components:o})]},function(n,e){if(Ra(c)){var t=e(u,c.config,c.validated);return c.validated.preprocess.getOr(v)(t)}return e(u)})},Aa=function(e,t,n,r){var o,i,u,c=et(r,function(n,e){return r=n,o=!1,{name:y(t=e),required:function(){return r.fold(function(n,e){return n},function(n,e){return n})},used:function(){return o},replace:function(){if(o)throw new Error("Trying to use the same placeholder more than once: "+t);return o=!0,r}};var t,r,o}),a=(o=e,i=t,u=c,W(n,function(n){return Ba(o,i,n,u)}));return nt(c,function(n){if(!1===n.used()&&n.required())throw new Error("Placeholder: "+n.name()+" was not found in components list\nNamespace: "+e.getOr("none")+"\nComponents: "+JSON.stringify(t.components,null,2))}),a},ja=Fa.single,Na=Fa.multiple,Pa=y(Ia),Ha=0,za=function(n){var e=(new Date).getTime();return n+"_"+Math.floor(1e9*Math.random())+ ++Ha+String(e)},La=Ut([{required:["data"]},{external:["data"]},{optional:["data"]},{group:["data"]}]),Ga=Lr("factory",{sketch:v}),$a=Lr("schema",[]),Ua=Br("name"),Wa=Sr("pname","pname",nr(function(n){return"<alloy."+za(n.name)+">"}),Rr()),Xa=$r("schema",function(){return[Nr("preprocess")]}),qa=Lr("defaults",y({})),Ya=Lr("overrides",y({})),Ka=yr([Ga,$a,Ua,Wa,qa,Ya]),Ja=yr([Ga,$a,Ua,qa,Ya]),Qa=yr([Ga,$a,Ua,Wa,qa,Ya]),Za=yr([Ga,Xa,Ua,Br("unit"),Wa,qa,Ya]),nf=function(n){var e=function(n){return n.name};return n.fold(e,e,e,e)},ef=function(t,r){return function(n){var e=_r("Converting part type",r,n);return t(e)}},tf=ef(La.required,Ka),rf=(ef(La.external,Ja),ef(La.optional,Qa)),of=ef(La.group,Za),uf=y("entirety"),cf=function(n,e,t,r){return qt(e.defaults(n,t,r),t,{uid:n.partUids[e.name]},e.overrides(n,t,r))},af=function(o,n){var e={};return P(n,function(n){n.fold(T.some,T.none,T.some,T.some).each(function(t){var r=ff(o,t.pname);e[t.name]=function(n){var e=_r("Part: "+t.name+" in "+o,yr(t.schema),n);return x(x({},r),{config:n,validated:e})}})}),e},ff=function(n,e){return{uiType:Pa(),owner:n,name:e}},sf=function(n,e,t){return r=e,i={},o={},P(t,function(n){n.fold(function(r){i[r.pname]=ja(!0,function(n,e,t){return r.factory.sketch(cf(n,r,e,t))})},function(n){var e=r.parts[n.name];o[n.name]=y(n.factory.sketch(cf(r,n,e[uf()]),e))},function(r){i[r.pname]=ja(!1,function(n,e,t){return r.factory.sketch(cf(n,r,e,t))})},function(o){i[o.pname]=Na(!0,function(e,n,t){var r=e[o.name];return N(r,function(n){return o.factory.sketch(qt(o.defaults(e,n,t),n,o.overrides(e,n)))})})})}),{internals:y(i),externals:y(o)};var r,i,o},lf=function(n,e,t){return Aa(T.some(n),e,e.components,t)},df=function(n,e,t){var r=e.partUids[t];return n.getSystem().getByUid(r).toOptional()},mf=function(n,e,t){return df(n,e,t).getOrDie("Could not find part: "+t)},gf=function(e,n){var t=N(n,nf);return ir(N(t,function(n){return{key:n,value:e+"-"+n}}))},pf=function(e){return Sr("partUids","partUids",er(function(n){return gf(n.uid,e)}),Rr())},hf=za("alloy-premade"),vf=function(n){return or(hf,n)},yf=function(r){return n=function(n){for(var e=[],t=1;t<arguments.length;t++)e[t-1]=arguments[t];return r.apply(void 0,u([n.getApis(),n],e))},e=r.toString(),t=e.indexOf(")")+1,o=e.indexOf("("),i=e.substring(o+1,t-1).split(/,\s*/),n.toFunctionAnnotation=function(){return{name:"OVERRIDE",parameters:fo(i.slice(1))}},n;var n,e,t,o,i},bf=y("alloy-id-"),xf=y("data-alloy-id"),wf=bf(),Sf=xf(),Of=function(n,e){Object.defineProperty(n.dom,Sf,{value:e,writable:!0})},Tf=function(n){var e=xe(n)?n.dom[Sf]:null;return T.from(e)},kf=za,Ef=function(n,e,t,r,o){var i,u,c=(u=o,(0<(i=r).length?[jr("parts",i)]:[]).concat([Br("uid"),Lr("dom",{}),Lr("components",[]),oi("originalSpec"),Lr("debug.sketcher",{})]).concat(u));return _r(n+" [SpecSchema]",vr(c.concat(e)),t)},Cf=function(n,e,t,r,o){var i=Mf(o),u=W(t,function(n){return n.fold(T.none,T.some,T.none,T.none).map(function(n){return jr(n.name,n.schema.concat([oi(uf())]))}).toArray()}),c=pf(t),a=Ef(n,e,i,u,[c]),f=sf(0,a,t);return r(a,lf(n,a,f.internals()),i,f.externals())},Mf=function(n){return ut(n,"uid")?n:x(x({},n),{uid:kf("uid")})},Df=vr([Br("name"),Br("factory"),Br("configFields"),Lr("apis",{}),Lr("extraApis",{})]),_f=vr([Br("name"),Br("factory"),Br("configFields"),Br("partFields"),Lr("apis",{}),Lr("extraApis",{})]),If=function(n){var i=_r("Sketcher for "+n.name,Df,n),e=et(i.apis,yf),t=et(i.extraApis,so);return x(x({name:i.name,configFields:i.configFields,sketch:function(n){return e=i.name,t=i.configFields,r=i.factory,o=Mf(n),r(Ef(e,t,o,[],[]),o);var e,t,r,o}},e),t)},Ff=function(n){var e=_r("Sketcher for "+n.name,_f,n),t=af(e.name,e.partFields),r=et(e.apis,yf),o=et(e.extraApis,so);return x(x({name:e.name,partFields:e.partFields,configFields:e.configFields,sketch:function(n){return Cf(e.name,e.configFields,e.partFields,e.factory,n)},parts:t},r),o)},Rf=If({name:"Button",factory:function(n){var e,t=(e=n.action,Jr(U([e.map(function(t){return ao(function(n,e){t(n),e.stop()})}).toArray(),ki()]))),r=n.dom.tag,o=function(e){return it(n.dom,"attributes").bind(function(n){return it(n,e)})};return{uid:n.uid,dom:n.dom,components:n.components,events:t,behaviours:_a(n.buttonBehaviours,[_i.config({}),ka.config({mode:"execution",useSpace:!0,useEnter:!0})]),domModification:{attributes:function(){if("button"!==r)return{role:o("role").getOr("button")};var n=o("type").getOr("button"),e=o("role").map(function(n){return{role:n}}).getOr({});return x({type:n},e)}()},eventOrder:n.eventOrder}},configFields:[Lr("uid",undefined),Br("dom"),Lr("components",[]),Da("buttonBehaviours",[_i,ka]),Nr("action"),Nr("role"),Lr("eventOrder",{})]}),Vf=wo({fields:[],name:"unselecting",active:/* */Object.freeze({__proto__:null,events:function(){return Jr([Qr(Gn(),w)])},exhibit:function(){return lo({styles:{"-webkit-user-select":"none","user-select":"none","-ms-user-select":"none","-moz-user-select":"-moz-none"},attributes:{unselectable:"on"}})}})}),Bf=function(n){var e,t,r,o=de.fromHtml(n),i=Ce(o),u=(t=(e=o).dom.attributes!==undefined?e.dom.attributes:[],L(t,function(n,e){var t;return"class"===e.name?n:x(x({},n),((t={})[e.name]=e.value,t))},{})),c=(r=o,Array.prototype.slice.call(r.dom.classList,0)),a=0===i.length?{}:{innerHtml:jo(o)};return x({tag:ye(o),classes:c,attributes:u},a)},Af=function(n){var e=cn(n,{prefix:Oi});return Bf(e)},jf=function(n){return{dom:Af(n)}},Nf=function(n){return bo([bi.config({toggleClass:Ti("toolbar-button-selected"),toggleOnExecute:!1,aria:{mode:"pressed"}}),xi(n,function(n,e){(e?bi.on:bi.off)(n)})])},Pf=function(n,e,t,r){var o=Nf(t);return zf(e,r,o,n)},Hf=function(n,e){var t=e.ui.registry.getAll().icons;return T.from(t[n]).fold(function(){return Af('<span class="${prefix}-toolbar-button ${prefix}-toolbar-group-item ${prefix}-icon-'+n+' ${prefix}-icon"></span>')},function(n){return Af('<span class="${prefix}-toolbar-button ${prefix}-toolbar-group-item">'+n+"</span>")})},zf=function(n,e,t,r){return Rf.sketch({dom:Hf(n,r),action:e,buttonBehaviours:qt(bo([Vf.config({})]),t)})},Lf=rf({schema:[Br("dom")],name:"label"}),Gf=function(e){return rf({name:e+"-edge",overrides:function(n){return n.model.manager.edgeActions[e].fold(function(){return{}},function(r){return{events:Jr([no(_n(),function(n,e,t){return r(n,t)},[n]),no(Rn(),function(n,e,t){return r(n,t)},[n]),no(Vn(),function(n,e,t){t.mouseIsDown.get()&&r(n,t)},[n])])}})}})},$f=Gf("top-left"),Uf=Gf("top"),Wf=Gf("top-right"),Xf=Gf("right"),qf=Gf("bottom-right"),Yf=Gf("bottom"),Kf=Gf("bottom-left"),Jf=[Lf,Gf("left"),Xf,Uf,Yf,$f,Wf,Kf,qf,tf({name:"thumb",defaults:y({dom:{styles:{position:"absolute"}}}),overrides:function(n){return{events:Jr([ro(_n(),n,"spectrum"),ro(In(),n,"spectrum"),ro(Fn(),n,"spectrum"),ro(Rn(),n,"spectrum"),ro(Vn(),n,"spectrum"),ro(Bn(),n,"spectrum")])}}}),tf({schema:[$r("mouseIsDown",function(){return ko(!1)})],name:"spectrum",overrides:function(t){var r=t.model.manager,o=function(e,n){return r.getValueFromEvent(n).map(function(n){return r.setValueFrom(e,t,n)})};return{behaviours:bo([ka.config({mode:"special",onLeft:function(n){return r.onLeft(n,t)},onRight:function(n){return r.onRight(n,t)},onUp:function(n){return r.onUp(n,t)},onDown:function(n){return r.onDown(n,t)}}),_i.config({})]),events:Jr([Zr(_n(),o),Zr(In(),o),Zr(Rn(),o),Zr(Vn(),function(n,e){t.mouseIsDown.get()&&o(n,e)})])}}})],Qf=function(n,e,t){e.store.manager.onLoad(n,e,t)},Zf=function(n,e,t){e.store.manager.onUnload(n,e,t)},ns=/* */Object.freeze({__proto__:null,onLoad:Qf,onUnload:Zf,setValue:function(n,e,t,r){e.store.manager.setValue(n,e,t,r)},getValue:function(n,e,t){return e.store.manager.getValue(n,e,t)},getState:function(n,e,t){return t}}),es=/* */Object.freeze({__proto__:null,events:function(t,r){var n=t.resetOnDom?[io(function(n,e){Qf(n,t,r)}),uo(function(n,e){Zf(n,t,r)})]:[mo(t,r,Qf)];return Jr(n)}}),ts=function(){var n=ko(null);return yo({set:n.set,get:n.get,isNotSet:function(){return null===n.get()},clear:function(){n.set(null)},readState:function(){return{mode:"memory",value:n.get()}}})},rs=function(){var i=ko({}),u=ko({});return yo({readState:function(){return{mode:"dataset",dataByValue:i.get(),dataByText:u.get()}},lookup:function(n){return it(i.get(),n).orThunk(function(){return it(u.get(),n)})},update:function(n){var e=i.get(),t=u.get(),r={},o={};P(n,function(e){r[e.value]=e,it(e,"meta").each(function(n){it(n,"text").each(function(n){o[n]=e})})}),i.set(x(x({},e),r)),u.set(x(x({},t),o))},clear:function(){i.set({}),u.set({})}})},os=/* */Object.freeze({__proto__:null,memory:ts,dataset:rs,manual:function(){return yo({readState:O})},init:function(n){return n.store.manager.state(n)}}),is=function(n,e,t,r){var o=e.store;t.update([r]),o.setValue(n,r),e.onSetValue(n,r)},us=[Nr("initialValue"),Br("getFallbackEntry"),Br("getDataKey"),Br("setValue"),ri("manager",{setValue:is,getValue:function(n,e,t){var r=e.store,o=r.getDataKey(n);return t.lookup(o).fold(function(){return r.getFallbackEntry(o)},function(n){return n})},onLoad:function(e,t,r){t.store.initialValue.each(function(n){is(e,t,r,n)})},onUnload:function(n,e,t){t.clear()},state:rs})],cs=[Br("getValue"),Lr("setValue",O),Nr("initialValue"),ri("manager",{setValue:function(n,e,t,r){e.store.setValue(n,r),e.onSetValue(n,r)},getValue:function(n,e,t){return e.store.getValue(n)},onLoad:function(e,t,n){t.store.initialValue.each(function(n){t.store.setValue(e,n)})},onUnload:O,state:vo.init})],as=[Nr("initialValue"),ri("manager",{setValue:function(n,e,t,r){t.set(r),e.onSetValue(n,r)},getValue:function(n,e,t){return t.get()},onLoad:function(n,e,t){e.store.initialValue.each(function(n){t.isNotSet()&&t.set(n)})},onUnload:function(n,e,t){t.clear()},state:ts})],fs=[Gr("store",{mode:"memory"},Fr("mode",{memory:as,manual:cs,dataset:us})),Zo("onSetValue"),Lr("resetOnDom",!1)],ss=wo({fields:fs,name:"representing",active:es,apis:ns,extra:{setValueFrom:function(n,e){var t=ss.getValue(e);ss.setValue(n,t)}},state:os}),ls=Hi("width",function(n){return n.dom.offsetWidth}),ds=function(n,e){return ls.set(n,e)},ms=function(n){return ls.get(n)},gs=function(t,r){return{left:t,top:r,translate:function(n,e){return gs(t+n,r+e)}}},ps=gs,hs=y("slider.change.value"),vs=function(n){var e=n.event.raw;return-1===e.type.indexOf("touch")?e.clientX!==undefined?T.some(e).map(function(n){return ps(n.clientX,n.clientY)}):T.none():e.touches!==undefined&&1===e.touches.length?T.some(e.touches[0]).map(function(n){return ps(n.clientX,n.clientY)}):T.none()},ys=function(n){return n.model.minX},bs=function(n){return n.model.minY},xs=function(n){return n.model.minX-1},ws=function(n){return n.model.minY-1},Ss=function(n){return n.model.maxX},Os=function(n){return n.model.maxY},Ts=function(n){return n.model.maxX+1},ks=function(n){return n.model.maxY+1},Es=function(n,e,t){return e(n)-t(n)},Cs=function(n){return Es(n,Ss,ys)},Ms=function(n){return Es(n,Os,bs)},Ds=function(n){return Cs(n)/2},_s=function(n){return Ms(n)/2},Is=function(n){return n.stepSize},Fs=function(n){return n.snapToGrid},Rs=function(n){return n.snapStart},Vs=function(n){return n.rounded},Bs=function(n,e){return n[e+"-edge"]!==undefined},As=function(n){return Bs(n,"left")},js=function(n){return Bs(n,"right")},Ns=function(n){return Bs(n,"top")},Ps=function(n){return Bs(n,"bottom")},Hs=function(n){return n.model.value.get()},zs=function(n){return{x:n}},Ls=function(n){return{y:n}},Gs=function(n,e){return{x:n,y:e}},$s=function(n,e){ce(n,hs(),{value:e})},Us=function(n,e,t,r){return n<e?n:t<n?t:n===e?e-1:Math.max(e,n-r)},Ws=function(n,e,t,r){return t<n?n:n<e?e:n===t?t+1:Math.min(t,n+r)},Xs=function(n,e,t){return Math.max(e,Math.min(t,n))},qs=function(n){var e=n.min,t=n.max,r=n.range,o=n.value,i=n.step,u=n.snap,c=n.snapStart,a=n.rounded,f=n.hasMinEdge,s=n.hasMaxEdge,l=n.minBound,d=n.maxBound,m=n.screenRange,g=f?e-1:e,p=s?t+1:t;if(o<l)return g;if(d<o)return p;var h,v,y,b,x,w,S,O=(x=o,w=l,S=d,Math.min(S,Math.max(x,w))-w),T=Xs(O/m*r+e,g,p);return u&&e<=T&&T<=t?(h=T,v=e,y=t,b=i,c.fold(function(){var n=h-v,e=Math.round(n/b)*b;return Xs(v+e,v-1,y+1)},function(n){var e=(h-n)%b,t=Math.round(e/b),r=Math.floor((h-n)/b),o=Math.floor((y-n)/b),i=n+Math.min(o,r+t)*b;return Math.max(n,i)})):a?Math.round(T):T},Ys=function(n){var e=n.min,t=n.max,r=n.range,o=n.value,i=n.hasMinEdge,u=n.hasMaxEdge,c=n.maxBound,a=n.maxOffset,f=n.centerMinEdge,s=n.centerMaxEdge;return o<e?i?0:f:t<o?u?c:s:(o-e)/r*a},Ks="left",Js=function(n){return n.element.dom.getBoundingClientRect()},Qs=function(n,e){return n[e]},Zs=function(n){var e=Js(n);return Qs(e,Ks)},nl=function(n){var e=Js(n);return Qs(e,"right")},el=function(n){var e=Js(n);return Qs(e,"top")},tl=function(n){var e=Js(n);return Qs(e,"bottom")},rl=function(n){var e=Js(n);return Qs(e,"width")},ol=function(n){var e=Js(n);return Qs(e,"height")},il=function(n,e,t){return(n+e)/2-t},ul=function(n,e){var t=Js(n),r=Js(e),o=Qs(t,Ks),i=Qs(t,"right"),u=Qs(r,Ks);return il(o,i,u)},cl=function(n,e){var t=Js(n),r=Js(e),o=Qs(t,"top"),i=Qs(t,"bottom"),u=Qs(r,"top");return il(o,i,u)},al=function(n,e){ce(n,hs(),{value:e})},fl=function(n){return{x:n}},sl=function(n,e,t){var r={min:ys(e),max:Ss(e),range:Cs(e),value:t,step:Is(e),snap:Fs(e),snapStart:Rs(e),rounded:Vs(e),hasMinEdge:As(e),hasMaxEdge:js(e),minBound:Zs(n),maxBound:nl(n),screenRange:rl(n)};return qs(r)},ll=function(i){return function(n,e){return t=n,o=(0<i?Ws:Us)(Hs(r=e).x,ys(r),Ss(r),Is(r)),al(t,fl(o)),T.some(o).map(w);var t,r,o}},dl=function(n,e,t,r,o,i){var u,c,a,f,s,l,d,m,g,p=(c=i,a=t,f=r,s=o,l=rl(u=e),d=f.bind(function(n){return T.some(ul(n,u))}).getOr(0),m=s.bind(function(n){return T.some(ul(n,u))}).getOr(l),g={min:ys(c),max:Ss(c),range:Cs(c),value:a,hasMinEdge:As(c),hasMaxEdge:js(c),minBound:Zs(u),minOffset:0,maxBound:nl(u),maxOffset:l,centerMinEdge:d,centerMaxEdge:m},Ys(g));return Zs(e)-Zs(n)+p},ml=ll(-1),gl=ll(1),pl=T.none,hl=T.none,vl={"top-left":T.none(),top:T.none(),"top-right":T.none(),right:T.some(function(n,e){$s(n,zs(Ts(e)))}),"bottom-right":T.none(),bottom:T.none(),"bottom-left":T.none(),left:T.some(function(n,e){$s(n,zs(xs(e)))})},yl=/* */Object.freeze({__proto__:null,setValueFrom:function(n,e,t){var r=sl(n,e,t),o=fl(r);return al(n,o),r},setToMin:function(n,e){var t=ys(e);al(n,fl(t))},setToMax:function(n,e){var t=Ss(e);al(n,fl(t))},findValueOfOffset:sl,getValueFromEvent:function(n){return vs(n).map(function(n){return n.left})},findPositionOfValue:dl,setPositionFromValue:function(n,e,t,r){var o=Hs(t),i=dl(n,r.getSpectrum(n),o.x,r.getLeftEdge(n),r.getRightEdge(n),t),u=ms(e.element)/2;Ri(e.element,"left",i-u+"px")},onLeft:ml,onRight:gl,onUp:pl,onDown:hl,edgeActions:vl}),bl=function(n,e){ce(n,hs(),{value:e})},xl=function(n){return{y:n}},wl=function(n,e,t){var r={min:bs(e),max:Os(e),range:Ms(e),value:t,step:Is(e),snap:Fs(e),snapStart:Rs(e),rounded:Vs(e),hasMinEdge:Ns(e),hasMaxEdge:Ps(e),minBound:el(n),maxBound:tl(n),screenRange:ol(n)};return qs(r)},Sl=function(i){return function(n,e){return t=n,o=(0<i?Ws:Us)(Hs(r=e).y,bs(r),Os(r),Is(r)),bl(t,xl(o)),T.some(o).map(w);var t,r,o}},Ol=function(n,e,t,r,o,i){var u,c,a,f,s,l,d,m,g,p=(c=i,a=t,f=r,s=o,l=ol(u=e),d=f.bind(function(n){return T.some(cl(n,u))}).getOr(0),m=s.bind(function(n){return T.some(cl(n,u))}).getOr(l),g={min:bs(c),max:Os(c),range:Ms(c),value:a,hasMinEdge:Ns(c),hasMaxEdge:Ps(c),minBound:el(u),minOffset:0,maxBound:tl(u),maxOffset:l,centerMinEdge:d,centerMaxEdge:m},Ys(g));return el(e)-el(n)+p},Tl=T.none,kl=T.none,El=Sl(-1),Cl=Sl(1),Ml={"top-left":T.none(),top:T.some(function(n,e){$s(n,Ls(ws(e)))}),"top-right":T.none(),right:T.none(),"bottom-right":T.none(),bottom:T.some(function(n,e){$s(n,Ls(ks(e)))}),"bottom-left":T.none(),left:T.none()},Dl=/* */Object.freeze({__proto__:null,setValueFrom:function(n,e,t){var r=wl(n,e,t),o=xl(r);return bl(n,o),r},setToMin:function(n,e){var t=bs(e);bl(n,xl(t))},setToMax:function(n,e){var t=Os(e);bl(n,xl(t))},findValueOfOffset:wl,getValueFromEvent:function(n){return vs(n).map(function(n){return n.top})},findPositionOfValue:Ol,setPositionFromValue:function(n,e,t,r){var o=Hs(t),i=Ol(n,r.getSpectrum(n),o.y,r.getTopEdge(n),r.getBottomEdge(n),t),u=Li(e.element)/2;Ri(e.element,"top",i-u+"px")},onLeft:Tl,onRight:kl,onUp:El,onDown:Cl,edgeActions:Ml}),_l=function(n,e){ce(n,hs(),{value:e})},Il=function(n,e){return{x:n,y:e}},Fl=function(a,f){return function(n,e){return r=n,o=e,i=0<a?Ws:Us,u=(t=f)?Hs(o).x:i(Hs(o).x,ys(o),Ss(o),Is(o)),c=t?i(Hs(o).y,bs(o),Os(o),Is(o)):Hs(o).y,_l(r,Il(u,c)),T.some(u).map(w);var t,r,o,i,u,c}},Rl=vs,Vl=Fl(-1,!1),Bl=Fl(1,!1),Al=Fl(-1,!0),jl=Fl(1,!0),Nl={"top-left":T.some(function(n,e){$s(n,Gs(xs(e),ws(e)))}),top:T.some(function(n,e){$s(n,Gs(Ds(e),ws(e)))}),"top-right":T.some(function(n,e){$s(n,Gs(Ts(e),ws(e)))}),right:T.some(function(n,e){$s(n,Gs(Ts(e),_s(e)))}),"bottom-right":T.some(function(n,e){$s(n,Gs(Ts(e),ks(e)))}),bottom:T.some(function(n,e){$s(n,Gs(Ds(e),ks(e)))}),"bottom-left":T.some(function(n,e){$s(n,Gs(xs(e),ks(e)))}),left:T.some(function(n,e){$s(n,Gs(xs(e),_s(e)))})},Pl=/* */Object.freeze({__proto__:null,setValueFrom:function(n,e,t){var r=sl(n,e,t.left),o=wl(n,e,t.top),i=Il(r,o);return _l(n,i),i},setToMin:function(n,e){var t=ys(e),r=bs(e);_l(n,Il(t,r))},setToMax:function(n,e){var t=Ss(e),r=Os(e);_l(n,Il(t,r))},getValueFromEvent:Rl,setPositionFromValue:function(n,e,t,r){var o=Hs(t),i=dl(n,r.getSpectrum(n),o.x,r.getLeftEdge(n),r.getRightEdge(n),t),u=Ol(n,r.getSpectrum(n),o.y,r.getTopEdge(n),r.getBottomEdge(n),t),c=ms(e.element)/2,a=Li(e.element)/2;Ri(e.element,"left",i-c+"px"),Ri(e.element,"top",u-a+"px")},onLeft:Vl,onRight:Bl,onUp:Al,onDown:jl,edgeActions:Nl}),Hl=[Lr("stepSize",1),Lr("onChange",O),Lr("onChoose",O),Lr("onInit",O),Lr("onDragStart",O),Lr("onDragEnd",O),Lr("snapToGrid",!1),Lr("rounded",!0),Nr("snapStart"),Ar("model",Fr("mode",{x:[Lr("minX",0),Lr("maxX",100),$r("value",function(n){return ko(n.mode.minX)}),Br("getInitialValue"),ri("manager",yl)],y:[Lr("minY",0),Lr("maxY",100),$r("value",function(n){return ko(n.mode.minY)}),Br("getInitialValue"),ri("manager",Dl)],xy:[Lr("minX",0),Lr("maxX",100),Lr("minY",0),Lr("maxY",100),$r("value",function(n){return ko({x:n.mode.minX,y:n.mode.minY})}),Br("getInitialValue"),ri("manager",Pl)]})),Ea("sliderBehaviours",[ka,ss]),$r("mouseIsDown",function(){return ko(!1)})],zl=y("mouse.released"),Ll=Ff({name:"Slider",configFields:Hl,partFields:Jf,factory:function(i,n,e,t){var r,u=function(n){return mf(n,i,"thumb")},c=function(n){return mf(n,i,"spectrum")},o=function(n){return df(n,i,"left-edge")},a=function(n){return df(n,i,"right-edge")},f=function(n){return df(n,i,"top-edge")},s=function(n){return df(n,i,"bottom-edge")},l=i.model,d=l.manager,m=function(n,e){d.setPositionFromValue(n,e,i,{getLeftEdge:o,getRightEdge:a,getTopEdge:f,getBottomEdge:s,getSpectrum:c})},g=function(n,e){l.value.set(e);var t=u(n);return m(n,t),i.onChange(n,t,e),T.some(!0)},p=function(t){var n=i.mouseIsDown.get();i.mouseIsDown.set(!1),n&&df(t,i,"thumb").each(function(n){var e=l.value.get();i.onChoose(t,n,e)})},h=function(n,e){e.stop(),i.mouseIsDown.set(!0),i.onDragStart(n,u(n))},v=function(n,e){e.stop(),i.onDragEnd(n,u(n)),p(n)};return{uid:i.uid,dom:i.dom,components:n,behaviours:Ma(i.sliderBehaviours,[ka.config({mode:"special",focusIn:function(n){return df(n,i,"spectrum").map(ka.focusIn).map(w)}}),ss.config({store:{mode:"manual",getValue:function(n){return l.value.get()}}}),ci.config({channels:((r={})[zl()]={onReceive:p},r)})]),events:Jr([Zr(hs(),function(n,e){g(n,e.event.value)}),io(function(n,e){var t=l.getInitialValue();l.value.set(t);var r=u(n);m(n,r);var o=c(n);i.onInit(n,r,o,l.value.get())}),Zr(_n(),h),Zr(Fn(),v),Zr(Rn(),h),Zr(Bn(),v)]),apis:{resetToMin:function(n){d.setToMin(n,i)},resetToMax:function(n){d.setToMax(n,i)},changeValue:g,refresh:m},domModification:{styles:{position:"relative"}}}},apis:{resetToMin:function(n,e){n.resetToMin(e)},resetToMax:function(n,e){n.resetToMax(e)},refresh:function(n,e){n.refresh(e)}}}),Gl=function(e,t,r,n){return zf(t,function(){var n=r();e.setContextToolbar([{label:t+" group",items:n}])},{},n)},$l=function(n){return[(o=n,i=function(n){return n<0?"black":360<n?"white":"hsl("+n+", 100%, 50%)"},Ll.sketch({dom:Af('<div class="${prefix}-slider ${prefix}-hue-slider-container"></div>'),components:[Ll.parts["left-edge"](jf('<div class="${prefix}-hue-slider-black"></div>')),Ll.parts.spectrum({dom:Af('<div class="${prefix}-slider-gradient-container"></div>'),components:[jf('<div class="${prefix}-slider-gradient"></div>')],behaviours:bo([bi.config({toggleClass:Ti("thumb-active")})])}),Ll.parts["right-edge"](jf('<div class="${prefix}-hue-slider-white"></div>')),Ll.parts.thumb({dom:Af('<div class="${prefix}-slider-thumb"></div>'),behaviours:bo([bi.config({toggleClass:Ti("thumb-active")})])})],onChange:function(n,e,t){var r=i(t.x());Ri(e.element,"background-color",r),o.onChange(n,e,r)},onDragStart:function(n,e){bi.on(e)},onDragEnd:function(n,e){bi.off(e)},onInit:function(n,e,t,r){var o=i(r.x());Ri(e.element,"background-color",o)},stepSize:10,model:{mode:"x",minX:0,maxX:360,getInitialValue:function(){return{x:o.getInitialValue()}}},sliderBehaviours:bo([wi(Ll.refresh)])}))];var o,i},Ul=["9px","10px","11px","12px","14px","16px","18px","20px","24px","32px","36px"],Wl=function(e,n){return(xe(n)?T.some(n):Ee(n).filter(xe)).map(function(n){return Wi(function(n,e){return e(n)},Yi,n,function(n){return ji(n,"font-size").isSome()},e).bind(function(n){return ji(n,"font-size")}).getOrThunk(function(){return Bi(n,"font-size")})}).getOr("")},Xl=function(n){var e=n.selection.getStart(),t=de.fromDom(e),r=de.fromDom(n.getBody()),o=Wl(function(n){return ve(r,n)},t);return G(Ul,function(n){return o===n}).getOr("medium")},ql=function(n){var e,t=Xl(n);return e=t,$(Ul,function(n){return n===e}).getOr(2)},Yl=function(r,n){var e;e=n,T.from(Ul[e]).each(function(n){var e,t;t=n,Xl(e=r)!==t&&e.execCommand("fontSize",!1,t)})},Kl=y(Ul),Jl=vr([Br("getInitialValue"),Br("onChange"),Br("category"),Br("sizes")]),Ql=function(n){var i=_r("SizeSlider",Jl,n);return Ll.sketch({dom:{tag:"div",classes:[Ti("slider-"+i.category+"-size-container"),Ti("slider"),Ti("slider-size-container")]},onChange:function(n,e,t){var r,o=t.x();0<=(r=o)&&r<i.sizes.length&&i.onChange(o)},onDragStart:function(n,e){bi.on(e)},onDragEnd:function(n,e){bi.off(e)},model:{mode:"x",minX:0,maxX:i.sizes.length-1,getInitialValue:function(){return{x:i.getInitialValue()}}},stepSize:1,snapToGrid:!0,sliderBehaviours:bo([wi(Ll.refresh)]),components:[Ll.parts.spectrum({dom:Af('<div class="${prefix}-slider-size-container"></div>'),components:[jf('<div class="${prefix}-slider-size-line"></div>')]}),Ll.parts.thumb({dom:Af('<div class="${prefix}-slider-thumb"></div>'),behaviours:bo([bi.config({toggleClass:Ti("thumb-active")})])})]})},Zl=Kl(),nd=function(n){return[jf('<span class="${prefix}-toolbar-button ${prefix}-icon-small-font ${prefix}-icon"></span>'),Ql({onChange:(e=n).onChange,sizes:Zl,category:"font",getInitialValue:e.getInitialValue}),jf('<span class="${prefix}-toolbar-button ${prefix}-icon-large-font ${prefix}-icon"></span>')];var e},ed=function(n){var e=n.uid!==undefined&&ct(n,"uid")?n.uid:kf("memento");return{get:function(n){return n.getSystem().getByUid(e).getOrDie()},getOpt:function(n){return n.getSystem().getByUid(e).toOptional()},asSpec:function(){return x(x({},n),{uid:e})}}},td=window.Promise?window.Promise:(Uu=function(n){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof n)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],Ku(n,qu(od,this),qu(id,this))},Wu=window,Xu=Uu.immediateFn||"function"==typeof Wu.setImmediate&&Wu.setImmediate||function(n){return setTimeout(n,1)},qu=function(t,r){return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return t.apply(r,n)}},Yu=Array.isArray||function(n){return"[object Array]"===Object.prototype.toString.call(n)},Ku=function(n,e,t){var r=!1;try{n(function(n){r||(r=!0,e(n))},function(n){r||(r=!0,t(n))})}catch(o){if(r)return;r=!0,t(o)}},Uu.prototype["catch"]=function(n){return this.then(null,n)},Uu.prototype.then=function(t,r){var o=this;return new Uu(function(n,e){rd.call(o,new cd(t,r,n,e))})},Uu.all=function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var a=Array.prototype.slice.call(1===n.length&&Yu(n[0])?n[0]:n);return new Uu(function(o,i){if(0===a.length)return o([]);for(var u=a.length,c=function(e,n){try{if(n&&("object"==typeof n||"function"==typeof n)){var t=n.then;if("function"==typeof t)return void t.call(n,function(n){c(e,n)},i)}a[e]=n,0==--u&&o(a)}catch(r){i(r)}},n=0;n<a.length;n++)c(n,a[n])})},Uu.resolve=function(e){return e&&"object"==typeof e&&e.constructor===Uu?e:new Uu(function(n){n(e)})},Uu.reject=function(t){return new Uu(function(n,e){e(t)})},Uu.race=function(o){return new Uu(function(n,e){for(var t=0,r=o;t<r.length;t++)r[t].then(n,e)})},Uu);function rd(r){var o=this;null!==this._state?Xu(function(){var n,e=o._state?r.onFulfilled:r.onRejected;if(null!==e){try{n=e(o._value)}catch(t){return void r.reject(t)}r.resolve(n)}else(o._state?r.resolve:r.reject)(o._value)}):this._deferreds.push(r)}function od(n){try{if(n===this)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var e=n.then;if("function"==typeof e)return void Ku(qu(e,n),qu(od,this),qu(id,this))}this._state=!0,this._value=n,ud.call(this)}catch(t){id.call(this,t)}}function id(n){this._state=!1,this._value=n,ud.call(this)}function ud(){for(var n=0,e=this._deferreds;n<e.length;n++){var t=e[n];rd.call(this,t)}this._deferreds=[]}function cd(n,e,t,r){this.onFulfilled="function"==typeof n?n:null,this.onRejected="function"==typeof e?e:null,this.resolve=t,this.reject=r}var ad,fd,sd,ld,dd,md=function(n){return t=n,new td(function(n){var e=new FileReader;e.onloadend=function(){n(e.result)},e.readAsDataURL(t)}).then(function(n){return n.split(",")[1]});var t},gd=function(u){var e=ed({dom:{tag:"input",attributes:{accept:"image/*",type:"file",title:""},styles:{visibility:"hidden",position:"absolute"}},events:Jr([oo(zn()),Zr(Hn(),function(n,e){var t,r;t=e.event.raw,r=t.target.files||t.dataTransfer.files,T.from(r[0]).each(function(n){var o,i;o=u,md(i=n).then(function(r){o.undoManager.transact(function(){var n=o.editorUpload.blobCache,e=n.create(za("mceu"),i,r);n.add(e);var t=o.dom.createHTML("img",{src:e.blobUri()});o.insertContent(t)})})})})])});return Rf.sketch({dom:Hf("image",u),components:[e.asSpec()],action:function(n){e.get(n).element.dom.click()}})},pd=function(n){return n.dom.textContent},hd=function(n){return 0<n.length},vd=function(n){return n===undefined||null===n?"":n},yd=function(n){return wd(n).fold(function(){return{url:"",text:n.selection.getContent({format:"text"}),title:"",target:"",link:T.none()}},function(n){return t=pd(e=n),r=lt(e,"href"),o=lt(e,"title"),i=lt(e,"target"),{url:vd(r),text:t!==r?vd(t):"",title:vd(o),target:vd(i),link:T.some(e)};var e,t,r,o,i})},bd=function(e,t,n){return n.text.toOptional().filter(hd).fold(function(){return lt(n=e,"href")===pd(n)?T.some(t):T.none();var n},T.some)},xd=function(o,i){i.url.toOptional().filter(hd).fold(function(){var e;e=o,i.link.bind(v).each(function(n){e.execCommand("unlink")})},function(e){var n,t,r=(n=i,(t={}).href=e,n.title.toOptional().filter(hd).each(function(n){t.title=n}),n.target.toOptional().filter(hd).each(function(n){t.target=n}),t);i.link.bind(v).fold(function(){var n=i.text.toOptional().filter(hd).getOr(e);o.insertContent(o.dom.createHTML("a",r,o.dom.encode(n)))},function(t){var n=bd(t,e,i);st(t,r),n.each(function(n){var e;e=n,t.dom.textContent=e})})})},wd=function(n){var e=de.fromDom(n.selection.getStart());return Zi(e,"a")},Sd=Mn(),Od=function(n,e){var t=e.selection.getRng();n(),e.selection.setRng(t)},Td=function(n,e){var t,r;return{key:n,value:{config:{},me:(t=n,r=Jr(e),wo({fields:[Br("enabled")],name:t,active:{events:y(r)}})),configAsRaw:y({}),initialConfig:{},state:vo}}},kd=/* */Object.freeze({__proto__:null,getCurrent:function(n,e,t){return e.find(n)}}),Ed=[Br("find")],Cd=wo({fields:Ed,name:"composing",apis:kd}),Md=If({name:"Container",factory:function(n){var e=n.dom,t=e.attributes,r=c(e,["attributes"]);return{uid:n.uid,dom:x({tag:"div",attributes:x({role:"presentation"},t)},r),components:n.components,behaviours:Ca(n.containerBehaviours),events:n.events,domModification:n.domModification,eventOrder:n.eventOrder}},configFields:[Lr("components",[]),Ea("containerBehaviours",[]),Lr("events",{}),Lr("domModification",{}),Lr("eventOrder",{})]}),Dd=If({name:"DataField",factory:function(t){return{uid:t.uid,dom:t.dom,behaviours:_a(t.dataBehaviours,[ss.config({store:{mode:"memory",initialValue:t.getInitialValue()}}),Cd.config({find:T.some})]),events:Jr([io(function(n,e){ss.setValue(n,t.getInitialValue())})])}},configFields:[Br("uid"),Br("dom"),Br("getInitialValue"),Da("dataBehaviours",[ss,Cd])]}),_d=function(n){return n.dom.value},Id=function(n,e){if(e===undefined)throw new Error("Value.set was undefined");n.dom.value=e},Fd=y([Nr("data"),Lr("inputAttributes",{}),Lr("inputStyles",{}),Lr("tag","input"),Lr("inputClasses",[]),Zo("onSetValue"),Lr("styles",{}),Lr("eventOrder",{}),Ea("inputBehaviours",[ss,_i]),Lr("selectOnFocus",!0)]),Rd=function(n){return x(x({},(e=n,bo([_i.config({onFocus:e.selectOnFocus?function(n){var e=n.element,t=_d(e);e.dom.setSelectionRange(0,t.length)}:O})]))),Ma(n.inputBehaviours,[ss.config({store:x(x({mode:"manual"},n.data.map(function(n){return{initialValue:n}}).getOr({})),{getValue:function(n){return _d(n.element)},setValue:function(n,e){_d(n.element)!==e&&Id(n.element,e)}}),onSetValue:n.onSetValue})]));var e},Vd=If({name:"Input",configFields:Fd(),factory:function(n,e){return{uid:n.uid,dom:{tag:(t=n).tag,attributes:x({type:"text"},t.inputAttributes),styles:t.inputStyles,classes:t.inputClasses},components:[],behaviours:Rd(n),eventOrder:n.eventOrder};var t}}),Bd=/* */Object.freeze({__proto__:null,exhibit:function(n,e){return lo({attributes:ir([{key:e.tabAttr,value:"true"}])})}}),Ad=[Lr("tabAttr","data-alloy-tabstop")],jd=wo({fields:Ad,name:"tabstopping",active:Bd}),Nd=tinymce.util.Tools.resolve("tinymce.util.I18n"),Pd=function(n,e){var t=ed(Vd.sketch({inputAttributes:{placeholder:Nd.translate(e)},onSetValue:function(n,e){ue(n,Pn())},inputBehaviours:bo([Cd.config({find:T.some}),jd.config({}),ka.config({mode:"execution"})]),selectOnFocus:!1})),r=ed(Rf.sketch({dom:Af('<button class="${prefix}-input-container-x ${prefix}-icon-cancel-circle ${prefix}-icon"></button>'),action:function(n){var e=t.get(n);ss.setValue(e,"")}}));return{name:n,spec:Md.sketch({dom:Af('<div class="${prefix}-input-container"></div>'),components:[t.asSpec(),r.asSpec()],containerBehaviours:bo([bi.config({toggleClass:Ti("input-container-empty")}),Cd.config({find:function(n){return T.some(t.get(n))}}),Td("input-clearing",[Zr(Pn(),function(n){var e=t.get(n);(0<ss.getValue(e).length?bi.off:bi.on)(n)})])])})}},Hd=["input","button","textarea","select"],zd=function(n,e,t){(e.disabled()?Xd:qd)(n,e)},Ld=function(n,e){return!0===e.useNative&&A(Hd,ye(n.element))},Gd=function(n){ft(n.element,"disabled","disabled")},$d=function(n){gt(n.element,"disabled")},Ud=function(n){ft(n.element,"aria-disabled","true")},Wd=function(n){ft(n.element,"aria-disabled","false")},Xd=function(e,n,t){n.disableClass.each(function(n){bt(e.element,n)}),(Ld(e,n)?Gd:Ud)(e),n.onDisabled(e)},qd=function(e,n,t){n.disableClass.each(function(n){wt(e.element,n)}),(Ld(e,n)?$d:Wd)(e),n.onEnabled(e)},Yd=function(n,e){return Ld(n,e)?mt(n.element,"disabled"):"true"===lt(n.element,"aria-disabled")},Kd=/* */Object.freeze({__proto__:null,enable:qd,disable:Xd,isDisabled:Yd,onLoad:zd,set:function(n,e,t,r){(r?Xd:qd)(n,e)}}),Jd=/* */Object.freeze({__proto__:null,exhibit:function(n,e){return lo({classes:e.disabled()?e.disableClass.toArray():[]})},events:function(t,n){return Jr([Qr(Kn(),function(n,e){return Yd(n,t)}),mo(t,n,zd)])}}),Qd=[Gr("disabled",l,Vr),Lr("useNative",!0),Nr("disableClass"),Zo("onDisabled"),Zo("onEnabled")],Zd=wo({fields:Qd,name:"disabling",active:Jd,apis:Kd}),nm=[Ea("formBehaviours",[ss])],em=function(n){return"<alloy.field."+n+">"},tm=function(o,n){return{uid:o.uid,dom:o.dom,components:n,behaviours:Ma(o.formBehaviours,[ss.config({store:{mode:"manual",getValue:function(n){var e,t,r=(e=o,t=n.getSystem(),et(e.partUids,function(n,e){return y(t.getByUid(n))}));return et(r,function(n,o){return n().bind(function(n){var e,t,r=Cd.getCurrent(n);return e=r,t=new Error("Cannot find a current component to extract the value from for form part '"+o+"': "+Ho(n.element)),e.fold(function(){return Ct.error(t)},Ct.value)}).map(ss.getValue)})},setValue:function(t,n){nt(n,function(e,n){df(t,o,n).each(function(n){Cd.getCurrent(n).each(function(n){ss.setValue(n,e)})})})}}})]),apis:{getField:function(n,e){return df(n,o,e).bind(Cd.getCurrent)}}}},rm=(yf(function(n,e,t){return n.getField(e,t)}),function(n){var i,e=(i=[],{field:function(n,e){return i.push(n),t="form",r=em(n),o=e,{uiType:Pa(),owner:t,name:r,config:o,validated:{}};var t,r,o},record:function(){return i}}),t=n(e),r=e.record(),o=N(r,function(n){return tf({name:n,pname:em(n)})});return Cf("form",nm,o,tm,t)}),om=function(){var e=ko(T.none()),t=function(){return e.get().each(function(n){return n.destroy()})};return{clear:function(){t(),e.set(T.none())},isSet:function(){return e.get().isSome()},set:function(n){t(),e.set(T.some(n))},run:function(n){return e.get().each(n)}}},im=function(){var e=ko(T.none());return{clear:function(){return e.set(T.none())},set:function(n){return e.set(T.some(n))},isSet:function(){return e.get().isSome()},on:function(n){return e.get().each(n)}}},um=function(n){var r="navigateEvent",e=yr([Br("fields"),Lr("maxFieldIndex",n.fields.length-1),Br("onExecute"),Br("getInitialValue"),$r("state",function(){return{dialogSwipeState:im(),currentScreen:ko(0)}})]),u=_r("SerialisedDialog",e,n),o=function(e,n,t){return Rf.sketch({dom:Af('<span class="${prefix}-icon-'+n+' ${prefix}-icon"></span>'),action:function(n){ce(n,r,{direction:e})},buttonBehaviours:bo([Zd.config({disableClass:Ti("toolbar-navigation-disabled"),disabled:function(){return!t}})])})},i=function(n,o){var i=Ui(n.element,"."+Ti("serialised-dialog-screen"));Qi(n.element,"."+Ti("serialised-dialog-chain")).each(function(r){0<=u.state.currentScreen.get()+o&&u.state.currentScreen.get()+o<i.length&&(ji(r,"left").each(function(n){var e=parseInt(n,10),t=ms(i[0]);Ri(r,"left",e-o*t+"px")}),u.state.currentScreen.set(u.state.currentScreen.get()+o))})},c=function(r){var n=Ui(r.element,"input");T.from(n[u.state.currentScreen.get()]).each(function(n){r.getSystem().getByDom(n).each(function(n){var e,t;e=r,t=n.element,e.getSystem().triggerFocus(t,e.element)})});var e=f.get(r);Fu.highlightAt(e,u.state.currentScreen.get())},a=ed(rm(function(t){return{dom:Af('<div class="${prefix}-serialised-dialog"></div>'),components:[Md.sketch({dom:Af('<div class="${prefix}-serialised-dialog-chain" style="left: 0px; position: absolute;"></div>'),components:N(u.fields,function(n,e){return e<=u.maxFieldIndex?Md.sketch({dom:Af('<div class="${prefix}-serialised-dialog-screen"></div>'),components:[o(-1,"previous",0<e),t.field(n.name,n.spec),o(1,"next",e<u.maxFieldIndex)]}):t.field(n.name,n.spec)})})],formBehaviours:bo([wi(function(n,e){var t;t=e,Qi(n.element,"."+Ti("serialised-dialog-chain")).each(function(n){Ri(n,"left",-u.state.currentScreen.get()*t.width+"px")})}),ka.config({mode:"special",focusIn:function(n,e){c(n)},onTab:function(n,e){return i(n,1),T.some(!0)},onShiftTab:function(n,e){return i(n,-1),T.some(!0)}}),Td("form-events",[io(function(e,n){u.state.currentScreen.set(0),u.state.dialogSwipeState.clear();var t=f.get(e);Fu.highlightFirst(t),u.getInitialValue(e).each(function(n){ss.setValue(e,n)})}),ao(u.onExecute),Zr(Ln(),function(n,e){"left"===e.event.raw.propertyName&&c(n)}),Zr(r,function(n,e){var t=e.event.direction;i(n,t)})])])}})),f=ed({dom:Af('<div class="${prefix}-dot-container"></div>'),behaviours:bo([Fu.config({highlightClass:Ti("dot-active"),itemClass:Ti("dot-item")})]),components:W(u.fields,function(n,e){return e<=u.maxFieldIndex?[jf('<div class="${prefix}-dot-item ${prefix}-icon-full-dot ${prefix}-icon"></div>')]:[]})});return{dom:Af('<div class="${prefix}-serializer-wrapper"></div>'),components:[a.asSpec(),f.asSpec()],behaviours:bo([ka.config({mode:"special",focusIn:function(n){var e=a.get(n);ka.focusIn(e)}}),Td("serializer-wrapper-events",[Zr(_n(),function(n,e){var t=e.event;u.state.dialogSwipeState.set({xValue:t.raw.touches[0].clientX,points:[]})}),Zr(In(),function(n,e){var t=e.event;u.state.dialogSwipeState.on(function(n){e.event.prevent(),u.state.dialogSwipeState.set(function(n,e){if(e===n.xValue)return n;var t=0<e-n.xValue?1:-1,r={direction:t,xValue:e};return{xValue:e,points:(0===n.points.length?[]:n.points[n.points.length-1].direction===t?n.points.slice(0,n.points.length-1):n.points).concat([r])}}(n,t.raw.touches[0].clientX))})}),Zr(Fn(),function(r,n){u.state.dialogSwipeState.on(function(n){var e=a.get(r),t=-1*function(n){if(0===n.points.length)return 0;var e=n.points[0].direction,t=n.points[n.points.length-1].direction;return-1===e&&-1===t?-1:1===e&&1===t?1:0}(n);i(e,t)})})])])}},cm=d(function(r,o){return[{label:"the link group",items:[um({fields:[Pd("url","Type or paste URL"),Pd("text","Link text"),Pd("title","Link title"),Pd("target","Link target"),{name:"link",spec:Dd.sketch({dom:{tag:"span",styles:{display:"none"}},getInitialValue:function(){return T.none()}})}],maxFieldIndex:["url","text","title","target"].length-1,getInitialValue:function(){return T.some(yd(o))},onExecute:function(n,e){var t=ss.getValue(n);xd(o,t),r.restoreToolbar(),o.focus()}})]}]}),am=function(r,o){return Pf(o,"link","link",function(){var n,e,t=cm(r,o);r.setContextToolbar(t),n=o,e=function(){r.focusToolbar()},(Sd.os.isAndroid()?Od:s)(e,n),wd(o).each(function(n){o.selection.select(n.dom)})})},fm=Jr([{key:Wn(),value:Yr({can:function(n,e){var t,r,o=e.event,i=o.originator,u=o.target;return r=u,!(ve(t=i,n.element)&&!ve(t,r))||(console.warn(Wn()+" did not get interpreted by the desired target. \nOriginator: "+Ho(i)+"\nTarget: "+Ho(u)+"\nCheck the "+Wn()+" event handlers"),!1)}})}]),sm=/* */Object.freeze({__proto__:null,events:fm}),lm=v,dm=function(e){var n=function(n){return function(){throw new Error("The component must be in a context to send: "+n+(e?"\n"+Ho(e().element)+" is not in context.":""))}};return{debugInfo:y("fake"),triggerEvent:n("triggerEvent"),triggerFocus:n("triggerFocus"),triggerEscape:n("triggerEscape"),build:n("build"),addToWorld:n("addToWorld"),removeFromWorld:n("removeFromWorld"),addToGui:n("addToGui"),removeFromGui:n("removeFromGui"),getByUid:n("getByUid"),getByDom:n("getByDom"),broadcast:n("broadcast"),broadcastOn:n("broadcastOn"),broadcastEvent:n("broadcastEvent"),isConnected:l}},mm=dm(),gm=function(n,o){var i={};return nt(n,function(n,r){nt(n,function(n,e){var t=it(i,e).getOr([]);i[e]=t.concat([o(r,n)])})}),i},pm=function(u,c,n,a){try{var e=(t=n,r=function(n,e){var t=n[c],r=e[c],o=a.indexOf(t),i=a.indexOf(r);if(-1===o)throw new Error("The ordering for "+u+" does not have an entry for "+t+".\nOrder specified: "+JSON.stringify(a,null,2));if(-1===i)throw new Error("The ordering for "+u+" does not have an entry for "+r+".\nOrder specified: "+JSON.stringify(a,null,2));return o<i?-1:i<o?1:0},(o=R.call(t,0)).sort(r),o);return Ct.value(e)}catch(i){return Ct.error([i])}var t,r,o},hm=function(n){return n.cHandler},vm=function(n,e){return{name:n,handler:e}},ym=function(n,e,t){var r,o,i=x(x({},t),(r=n,o={},P(e,function(n){o[n.name()]=n.handlers(r)}),o));return gm(i,vm)},bm=function(n){var e,i=I(e=n)?{can:w,abort:l,run:e}:e;return function(n,e){for(var t=[],r=2;r<arguments.length;r++)t[r-2]=arguments[r];var o=[n,e].concat(t);i.abort.apply(undefined,o)?e.stop():i.can.apply(undefined,o)&&i.run.apply(undefined,o)}},xm=function(n,e,t){var r,o,i=e[t];return i?pm("Event: "+t,"name",n,i).map(function(n){var e=N(n,function(n){return n.handler});return Kr(e)}):(r=t,o=n,Ct.error(["The event ("+r+') has more than one behaviour that listens to it.\nWhen this occurs, you must specify an event ordering for the behaviours in your spec (e.g. [ "listing", "toggling" ]).\nThe behaviours that can trigger it are: '+JSON.stringify(N(o,function(n){return n.name}),null,2)]))},wm=function(n,i){var e=ot(n,function(r,o){return(1===r.length?Ct.value(r[0].handler):xm(r,i,o)).map(function(n){var e=bm(n),t=1<r.length?H(i[o],function(e){return j(r,function(n){return n.name===e})}).join(" > "):r[0].name;return or(o,{handler:e,purpose:t})})});return ur(e,{})},Sm="alloy.base.behaviour",Om=function(n){var e,t;return Mr("custom.definition",yr([Sr("dom","dom",Qt(),yr([Br("tag"),Lr("styles",{}),Lr("classes",[]),Lr("attributes",{}),Nr("value"),Nr("innerHtml")])),Br("components"),Br("uid"),Lr("events",{}),Lr("apis",{}),Sr("eventOrder","eventOrder",((e={})[Kn()]=["disabling",Sm,"toggling","typeaheadevents"],e[Wn()]=[Sm,"focusing","keying"],e[ne()]=[Sm,"disabling","toggling","representing"],e[Pn()]=[Sm,"representing","streaming","invalidating"],e[te()]=[Sm,"representing","item-events","tooltipping"],e[Rn()]=["focusing",Sm,"item-type-events"],e[_n()]=["focusing",Sm,"item-type-events"],e[An()]=["item-type-events","tooltipping"],e[Yn()]=["receiving","reflecting","tooltipping"],t=e,Kt.mergeWithThunk(y(t))),Rr()),Nr("domModification")]),n)},Tm=function(e,n){P(n,function(n){bt(e,n)})},km=function(e,n){P(n,function(n){wt(e,n)})},Em=function(n,e){return t=n,o=N(r=e,function(n){return Hr(n.name(),[Br("config"),Lr("state",vo)])}),i=Mr("component.behaviours",yr(o),t.behaviours).fold(function(n){throw new Error(Ir(n)+"\nComplete spec:\n"+JSON.stringify(t,null,2))},function(n){return n}),{list:r,data:et(i,function(n){var e=n.map(function(n){return{config:n.config,state:n.state.init(n.config)}});return function(){return e}})};var t,r,o,i},Cm=function(n){var e,t,r=(e=it(n,"behaviours").getOr({}),t=H(Qe(e),function(n){return e[n]!==undefined}),N(t,function(n){return e[n].me}));return Em(n,r)},Mm=function(n,e,t){var r,o,i,u=x(x({},(r=n).dom),{uid:r.uid,domChildren:N(r.components,function(n){return n.element})}),c=n.domModification.fold(function(){return lo({})},lo),a={"alloy.base.modification":c},f=0<e.length?function(e,n,t,r){var o=x({},n);P(t,function(n){o[n.name()]=n.exhibit(e,r)});var i=gm(o,function(n,e){return{name:n,modification:e}}),u=function(n){return z(n,function(n,e){return x(x({},e.modification),n)},{})},c=z(i.classes,function(n,e){return e.modification.concat(n)},[]),a=u(i.attributes),f=u(i.styles);return lo({classes:c,attributes:a,styles:f})}(t,a,e,u):c;return i=f,x(x({},o=u),{attributes:x(x({},o.attributes),i.attributes),styles:x(x({},o.styles),i.styles),classes:o.classes.concat(i.classes)})},Dm=function(n,e,t){var r,o,i,u={"alloy.base.behaviour":n.events};return r=t,o=n.eventOrder,i=ym(r,e,u),wm(i,o).getOrDie()},_m=function(t){var n=function(){return s},r=ko(mm),e=Dr(Om(t)),o=Cm(t),i=o.list,u=o.data,c=function(n){var e=de.fromTag(n.tag);st(e,n.attributes),Tm(e,n.classes),Vi(e,n.styles),n.innerHtml.each(function(n){return No(e,n)});var t=n.domChildren;return Re(e,t),n.value.each(function(n){Id(e,n)}),n.uid,Of(e,n.uid),e}(Mm(e,i,u)),a=Dm(e,i,u),f=ko(e.components),s={getSystem:r.get,config:function(n){var e=u;return(I(e[n.name()])?e[n.name()]:function(){throw new Error("Could not find "+n.name()+" in "+JSON.stringify(t,null,2))})()},hasConfigured:function(n){return I(u[n.name()])},spec:t,readState:function(n){return u[n]().map(function(n){return n.state.readState()}).getOr("not enabled")},getApis:function(){return e.apis},connect:function(n){r.set(n)},disconnect:function(){r.set(dm(n))},element:c,syncComponents:function(){var n=Ce(c),e=W(n,function(n){return r.get().getByDom(n).fold(function(){return[]},function(n){return[n]})});f.set(e)},components:f.get,events:a};return s},Im=function(n){var e,t=lm(n),r=t.events,o=c(t,["events"]),i=(e=it(o,"components").getOr([]),N(e,Bm)),u=x(x({},o),{events:x(x({},sm),r),components:i});return Ct.value(_m(u))},Fm=function(n){var e=de.fromText(n);return Rm({element:e})},Rm=function(n){var e=_r("external.component",vr([Br("element"),Nr("uid")]),n),t=ko(dm());e.uid.each(function(n){Of(e.element,n)});var r={getSystem:t.get,config:T.none,hasConfigured:l,connect:function(n){t.set(n)},disconnect:function(){t.set(dm(function(){return r}))},getApis:function(){return{}},element:e.element,spec:n,readState:y("No state"),syncComponents:O,components:y([]),events:{}};return vf(r)},Vm=kf,Bm=function(e){return it(e,hf).fold(function(){var n=e.hasOwnProperty("uid")?e:x({uid:Vm("")},e);return Im(n).getOrDie()},function(n){return n})},Am=vf,jm="alloy.item-hover",Nm="alloy.item-focus",Pm=function(n){(Do(n.element).isNone()||_i.isFocused(n))&&(_i.isFocused(n)||_i.focus(n),ce(n,jm,{item:n}))},Hm=function(n){ce(n,Nm,{item:n})},zm=y(jm),Lm=y(Nm),Gm=[Br("data"),Br("components"),Br("dom"),Lr("hasSubmenu",!1),Nr("toggling"),Da("itemBehaviours",[bi,_i,ka,ss]),Lr("ignoreFocus",!1),Lr("domModification",{}),ri("builder",function(n){return{dom:n.dom,domModification:x(x({},n.domModification),{attributes:x(x(x({role:n.toggling.isSome()?"menuitemcheckbox":"menuitem"},n.domModification.attributes),{"aria-haspopup":n.hasSubmenu}),n.hasSubmenu?{"aria-expanded":!1}:{})}),behaviours:_a(n.itemBehaviours,[n.toggling.fold(bi.revoke,function(n){return bi.config(x({aria:{mode:"checked"}},n))}),_i.config({ignore:n.ignoreFocus,stopMousedown:n.ignoreFocus,onFocus:function(n){Hm(n)}}),ka.config({mode:"execution"}),ss.config({store:{mode:"memory",initialValue:n.data}}),Td("item-type-events",u(ki(),[Zr(An(),Pm),Zr(Jn(),_i.focus)]))]),components:n.components,eventOrder:n.eventOrder}}),Lr("eventOrder",{})],$m=[Br("dom"),Br("components"),ri("builder",function(n){return{dom:n.dom,components:n.components,events:Jr([(e=Jn(),Zr(e,function(n,e){e.stop()}))])};var e})],Um=y("item-widget"),Wm=y([tf({name:"widget",overrides:function(e){return{behaviours:bo([ss.config({store:{mode:"manual",getValue:function(n){return e.data},setValue:O}})])}}})]),Xm=[Br("uid"),Br("data"),Br("components"),Br("dom"),Lr("autofocus",!1),Lr("ignoreFocus",!1),Da("widgetBehaviours",[ss,_i,ka]),Lr("domModification",{}),pf(Wm()),ri("builder",function(t){var n=sf(Um(),t,Wm()),e=lf(Um(),t,n.internals()),r=function(n){return df(n,t,"widget").map(function(n){return ka.focusIn(n),n})},o=function(n,e){return ec(e.event.target)||t.autofocus&&e.setSource(n.element),T.none()};return{dom:t.dom,components:e,domModification:t.domModification,events:Jr([ao(function(n,e){r(n).each(function(n){e.stop()})}),Zr(An(),Pm),Zr(Jn(),function(n,e){t.autofocus?r(n):_i.focus(n)})]),behaviours:_a(t.widgetBehaviours,[ss.config({store:{mode:"memory",initialValue:t.data}}),_i.config({ignore:t.ignoreFocus,onFocus:function(n){Hm(n)}}),ka.config({mode:"special",focusIn:t.autofocus?function(n){r(n)}:Oo(),onLeft:o,onRight:o,onEscape:function(n,e){return _i.isFocused(n)||t.autofocus?(t.autofocus&&e.setSource(n.element),T.none()):(_i.focus(n),T.some(!0))}})])}})],qm=Fr("type",{widget:Xm,item:Gm,separator:$m}),Ym=y([of({factory:{sketch:function(n){var e=_r("menu.spec item",qm,n);return e.builder(e)}},name:"items",unit:"item",defaults:function(n,e){return e.hasOwnProperty("uid")?e:x(x({},e),{uid:kf("item")})},overrides:function(n,e){return{type:e.type,ignoreFocus:n.fakeFocus,domModification:{classes:[n.markers.item]}}}})]),Km=y([Br("value"),Br("items"),Br("dom"),Br("components"),Lr("eventOrder",{}),Ea("menuBehaviours",[Fu,ss,Cd,ka]),Gr("movement",{mode:"menu",moveOnTab:!0},Fr("mode",{grid:[ii(),ri("config",function(n,e){return{mode:"flatgrid",selector:"."+n.markers.item,initSize:{numColumns:e.initSize.numColumns,numRows:e.initSize.numRows},focusManager:n.focusManager}})],matrix:[ri("config",function(n,e){return{mode:"matrix",selectors:{row:e.rowSelector,cell:"."+n.markers.item},focusManager:n.focusManager}}),Br("rowSelector")],menu:[Lr("moveOnTab",!0),ri("config",function(n,e){return{mode:"menu",selector:"."+n.markers.item,moveOnTab:e.moveOnTab,focusManager:n.focusManager}})]})),Ar("markers",Ko()),Lr("fakeFocus",!1),Lr("focusManager",Vu()),Zo("onHighlight")]),Jm=y("alloy.menu-focus"),Qm=Ff({name:"Menu",configFields:Km(),partFields:Ym(),factory:function(n,e,t,r){return{uid:n.uid,dom:n.dom,markers:n.markers,behaviours:Ma(n.menuBehaviours,[Fu.config({highlightClass:n.markers.selectedItem,itemClass:n.markers.item,onHighlight:n.onHighlight}),ss.config({store:{mode:"memory",initialValue:n.value}}),Cd.config({find:T.some}),ka.config(n.movement.config(n,n.movement))]),events:Jr([Zr(Lm(),function(e,t){var n=t.event;e.getSystem().getByDom(n.target).each(function(n){Fu.highlight(e,n),t.stop(),ce(e,Jm(),{menu:e,item:n})})}),Zr(zm(),function(n,e){var t=e.event.item;Fu.highlight(n,t)})]),components:e,eventOrder:n.eventOrder,domModification:{attributes:{role:"menu"}}}}}),Zm=function(n,t){var r=Pe(t),e=Mo(r).bind(function(e){var o,i,n=function(n){return ve(e,n)};return n(t)?T.some(t):(o=n,(i=function(n){for(var e=0;e<n.childNodes.length;e++){var t=de.fromDom(n.childNodes[e]);if(o(t))return T.some(t);var r=i(n.childNodes[e]);if(r.isSome())return r}return T.none()})(t.dom))}),o=n(t);return e.each(function(e){Mo(r).filter(function(n){return ve(n,e)}).fold(function(){Eo(e)},O)}),o},ng=function(n,e,t,r){var o=n.getSystem().build(r);Ye(n,o,t)},eg=function(n,e,t,r){var o=tg(n);G(o,function(n){return ve(r.element,n.element)}).each(Ke)},tg=function(n,e){return n.components()},rg=function(e,n,t,o,r){var i=tg(e);return T.from(i[o]).map(function(n){return eg(e,0,0,n),r.each(function(n){ng(e,0,function(n,e){var t,r;r=e,Me(t=n,o).fold(function(){Fe(t,r)},function(n){De(n,r)})},n)}),n})},og=wo({fields:[],name:"replacing",apis:/* */Object.freeze({__proto__:null,append:function(n,e,t,r){ng(n,0,Fe,r)},prepend:function(n,e,t,r){ng(n,0,Ie,r)},remove:eg,replaceAt:rg,replaceBy:function(e,n,t,r,o){var i=tg(e);return $(i,r).bind(function(n){return rg(e,0,0,n,o)})},set:function(e,n,t,r){Zm(function(){var n=N(r,e.getSystem().build);qe(e,n)},e.element)},contents:tg})}),ig=function(t,r,o,n){return it(o,n).bind(function(n){return it(t,n).bind(function(n){var e=ig(t,r,o,n);return T.some([n].concat(e))})}).getOr([])},ug=function(n,e){var t={};nt(n,function(n,e){P(n,function(n){t[n]=e})});var r=e,o=tt(e,function(n,e){return{k:n,v:e}}),i=et(o,function(n,e){return[e].concat(ig(t,r,o,e))});return et(t,function(n){return it(i,n).getOr([n])})},cg=function(n){return"prepared"===n.type?T.some(n.menu):T.none()},ag={init:function(){var i=ko({}),u=ko({}),c=ko({}),a=ko(T.none()),f=ko({}),s=function(t){return function(n,e){for(var t=Qe(n),r=0,o=t.length;r<o;r++){var i=t[r],u=n[i];if(e(u,i,n))return T.some(u)}return T.none()}(i.get(),function(n,e){return n===t})},l=function(n){return e(n).bind(cg)},e=function(n){return it(u.get(),n)},t=function(n){return it(i.get(),n)};return{setMenuBuilt:function(n,e){var t;u.set(x(x({},u.get()),((t={})[n]={type:"prepared",menu:e},t)))},setContents:function(n,e,t,r){a.set(T.some(n)),i.set(t),u.set(e),f.set(r);var o=ug(r,t);c.set(o)},expand:function(t){return it(i.get(),t).map(function(n){var e=it(c.get(),t).getOr([]);return[n].concat(e)})},refresh:function(n){return it(c.get(),n)},collapse:function(n){return it(c.get(),n).bind(function(n){return 1<n.length?T.some(n.slice(1)):T.none()})},lookupMenu:e,lookupItem:t,otherMenus:function(n){var e=f.get();return Y(Qe(e),n)},getPrimary:function(){return a.get().bind(l)},getMenus:function(){return u.get()},clear:function(){i.set({}),u.set({}),c.set({}),a.set(T.none())},isClear:function(){return a.get().isNone()},getTriggeringPath:function(n,u){var e=H(t(n).toArray(),function(n){return l(n).isSome()});return it(c.get(),n).bind(function(n){var i=q(e.concat(n));return function(n){for(var e=[],t=0;t<n.length;t++){var r=n[t];if(!r.isSome())return T.none();e.push(r.getOrDie())}return T.some(e)}(W(i,function(n,e){return t=n,r=u,o=i.slice(0,e+1),l(t).bind(function(e){return s(t).bind(function(n){return r(n).map(function(n){return{triggeredMenu:e,triggeringItem:n,triggeringPath:o}})})}).fold(function(){return a.get().is(n)?[]:[T.none()]},function(n){return[T.some(n)]});var t,r,o}))})}}},extractPreparedMenu:cg},fg=y("collapse-item"),sg=If({name:"TieredMenu",configFields:[ti("onExecute"),ti("onEscape"),ei("onOpenMenu"),ei("onOpenSubmenu"),Zo("onRepositionMenu"),Zo("onCollapseMenu"),Lr("highlightImmediately",!0),jr("data",[Br("primary"),Br("menus"),Br("expansions")]),Lr("fakeFocus",!1),Zo("onHighlight"),Zo("onHover"),jr("markers",[Br("backgroundMenu")].concat(qo()).concat(Yo())),Br("dom"),Lr("navigateOnHover",!0),Lr("stayInDom",!1),Ea("tmenuBehaviours",[ka,Fu,Cd,og]),Lr("eventOrder",{})],apis:{collapseMenu:function(n,e){n.collapseMenu(e)},highlightPrimary:function(n,e){n.highlightPrimary(e)},repositionMenus:function(n,e){n.repositionMenus(e)}},factory:function(c,n){var a,e,i=ko(T.none()),o=function(r,o,n){return et(n,function(n,e){var t=function(){return Qm.sketch(x(x({},n),{value:e,markers:c.markers,fakeFocus:c.fakeFocus,onHighlight:c.onHighlight,focusManager:c.fakeFocus?{get:o=function(n){return Fu.getHighlighted(n).map(function(n){return n.element})},set:function(e,n){var t=o(e);e.getSystem().getByDom(n).fold(O,function(n){Fu.highlight(e,n)});var r=o(e);Ru(e,t,r)}}:Vu()}));var o};return e===o?{type:"prepared",menu:r.getSystem().build(t())}:{type:"notbuilt",nbMenu:t}})},f=ag.init(),s=function(n){return ss.getValue(n).value},u=function(n){return et(c.data.menus,function(n,e){return W(n.items,function(n){return"separator"===n.type?[]:[n.data.value]})})},l=function(e,n){Fu.highlight(e,n),Fu.getHighlighted(n).orThunk(function(){return Fu.getFirst(n)}).each(function(n){fe(e,n.element,Jn())})},d=function(e,n){return wu(N(n,function(n){return e.lookupMenu(n).bind(function(n){return"prepared"===n.type?T.some(n.menu):T.none()})}))},m=function(e,n,t){var r=d(n,n.otherMenus(t));P(r,function(n){km(n.element,[c.markers.backgroundMenu]),c.stayInDom||og.remove(e,n)})},g=function(n,r){var o,e=(o=n,i.get().getOrThunk(function(){var t={},n=Ui(o.element,"."+c.markers.item),e=H(n,function(n){return"true"===lt(n,"aria-haspopup")});return P(e,function(n){o.getSystem().getByDom(n).each(function(n){var e=s(n);t[e]=n})}),i.set(T.some(t)),t}));nt(e,function(n,e){var t=A(r,e);ft(n.element,"aria-expanded",t)})},p=function(r,o,i){return T.from(i[0]).bind(function(n){return o.lookupMenu(n).bind(function(n){if("notbuilt"===n.type)return T.none();var e=n.menu,t=d(o,i.slice(1));return P(t,function(n){bt(n.element,c.markers.backgroundMenu)}),Le(e.element)||og.append(r,Am(e)),km(e.element,[c.markers.backgroundMenu]),l(r,e),m(r,o,i),T.some(e)})})};(e=a=a||{})[e.HighlightSubmenu=0]="HighlightSubmenu",e[e.HighlightParent=1]="HighlightParent";var h=function(o,i,u){void 0===u&&(u=a.HighlightSubmenu);var n=s(i);return f.expand(n).bind(function(r){return g(o,r),T.from(r[0]).bind(function(t){return f.lookupMenu(t).bind(function(n){var e=function(n,e,t){if("notbuilt"!==t.type)return t.menu;var r=n.getSystem().build(t.nbMenu());return f.setMenuBuilt(e,r),r}(o,t,n);return Le(e.element)||og.append(o,Am(e)),c.onOpenSubmenu(o,i,e,q(r)),u===a.HighlightSubmenu?(Fu.highlightFirst(e),p(o,f,r)):(Fu.dehighlightAll(e),T.some(i))})})})},r=function(e,t){var n=s(t);return f.collapse(n).bind(function(n){return g(e,n),p(e,f,n).map(function(n){return c.onCollapseMenu(e,t,n),n})})},t=function(t){return function(e,n){return Zi(n.getSource(),"."+c.markers.item).bind(function(n){return e.getSystem().getByDom(n).toOptional().bind(function(n){return t(e,n).map(w)})})}},v=Jr([Zr(Jm(),function(t,r){var n=r.event.item;f.lookupItem(s(n)).each(function(){var n=r.event.menu;Fu.highlight(t,n);var e=s(r.event.item);f.refresh(e).each(function(n){return m(t,f,n)})})}),ao(function(e,n){var t=n.event.target;e.getSystem().getByDom(t).each(function(n){0===s(n).indexOf("collapse-item")&&r(e,n),h(e,n,a.HighlightSubmenu).fold(function(){c.onExecute(e,n)},O)})}),io(function(e,n){var t,r;t=o(e,c.data.primary,c.data.menus),r=u(),f.setContents(c.data.primary,t,c.data.expansions,r),f.getPrimary().each(function(n){og.append(e,Am(n)),c.onOpenMenu(e,n),c.highlightImmediately&&l(e,n)})})].concat(c.navigateOnHover?[Zr(zm(),function(n,e){var t,r,o=e.event.item;t=n,r=s(o),f.refresh(r).bind(function(n){return g(t,n),p(t,f,n)}),h(n,o,a.HighlightParent),c.onHover(n,o)})]:[])),y=function(n){return Fu.getHighlighted(n).bind(Fu.getHighlighted)},b={collapseMenu:function(e){y(e).each(function(n){r(e,n)})},highlightPrimary:function(e){f.getPrimary().each(function(n){l(e,n)})},repositionMenus:function(r){f.getPrimary().bind(function(e){return y(r).bind(function(n){var e,t=s(n),r=(e=f.getMenus(),ot(e,function(n){return n})),o=wu(N(r,ag.extractPreparedMenu));return f.getTriggeringPath(t,function(n){return t=n,Q(o,function(n){if(!n.getSystem().isConnected())return T.none();var e=Fu.getCandidates(n);return G(e,function(n){return s(n)===t})});var t})}).map(function(n){return{primary:e,triggeringPath:n}})}).fold(function(){var n;n=r,T.from(n.components()[0]).filter(function(n){return"menu"===lt(n.element,"role")}).each(function(n){c.onRepositionMenu(r,n,[])})},function(n){var e=n.primary,t=n.triggeringPath;c.onRepositionMenu(r,e,t)})}};return{uid:c.uid,dom:c.dom,markers:c.markers,behaviours:Ma(c.tmenuBehaviours,[ka.config({mode:"special",onRight:t(function(n,e){return ec(e.element)?T.none():h(n,e,a.HighlightSubmenu)}),onLeft:t(function(n,e){return ec(e.element)?T.none():r(n,e)}),onEscape:t(function(n,e){return r(n,e).orThunk(function(){return c.onEscape(n,e).map(function(){return n})})}),focusIn:function(e,n){f.getPrimary().each(function(n){fe(e,n.element,Jn())})}}),Fu.config({highlightClass:c.markers.selectedMenu,itemClass:c.markers.menu}),Cd.config({find:function(n){return Fu.getHighlighted(n)}}),og.config({})]),eventOrder:c.eventOrder,apis:b,events:v}},extraApis:{tieredData:function(n,e,t){return{primary:n,menus:e,expansions:t}},singleData:function(n,e){return{primary:n,menus:or(n,e),expansions:{}}},collapseItem:function(n){return{value:za(fg()),meta:{text:n}}}}}),lg=function(n,e,t,r){return it(e.routes,r.start).bind(function(n){return it(n,r.destination)})},dg=function(n,e,t,r){return lg(0,e,0,r).bind(function(e){return e.transition.map(function(n){return{transition:n,route:e}})})},mg=function(t,r,n){var e,o,i;i=n,gg(e=t,o=r).bind(function(n){return dg(e,o,i,n)}).each(function(n){var e=n.transition;wt(t.element,e.transitionClass),gt(t.element,r.destinationAttr)})},gg=function(e,t,n){var r=e.element;return dt(r,t.destinationAttr).map(function(n){return{start:lt(e.element,t.stateAttr),destination:n}})},pg=function(n,e,t,r){mg(n,e,t),mt(n.element,e.stateAttr)&&lt(n.element,e.stateAttr)!==r&&e.onFinish(n,r),ft(n.element,e.stateAttr,r)},hg=/* */Object.freeze({__proto__:null,findRoute:lg,disableTransition:mg,getCurrentRoute:gg,jumpTo:pg,progressTo:function(t,r,o,i){var e,u;u=r,mt((e=t).element,u.destinationAttr)&&(dt(e.element,u.destinationAttr).each(function(n){ft(e.element,u.stateAttr,n)}),gt(e.element,u.destinationAttr));var n,c,a=(n=r,c=i,{start:lt(t.element,n.stateAttr),destination:c});dg(t,r,o,a).fold(function(){pg(t,r,o,i)},function(n){mg(t,r,o);var e=n.transition;bt(t.element,e.transitionClass),ft(t.element,r.destinationAttr,i)})},getState:function(n,e,t){return dt(n.element,e.stateAttr)}}),vg=/* */Object.freeze({__proto__:null,events:function(o,i){return Jr([Zr(Ln(),function(t,n){var r=n.event.raw;gg(t,o).each(function(e){lg(0,o,0,e).each(function(n){n.transition.each(function(n){r.propertyName===n.property&&(pg(t,o,i,e.destination),o.onTransition(t,e))})})})}),io(function(n,e){pg(n,o,i,o.initialState)})])}}),yg=[Lr("destinationAttr","data-transitioning-destination"),Lr("stateAttr","data-transitioning-state"),Br("initialState"),Zo("onTransition"),Zo("onFinish"),Ar("routes",Cr(Ct.value,Cr(Ct.value,vr([zr("transition",[Br("property"),Br("transitionClass")])]))))],bg=wo({fields:yg,name:"transitioning",active:vg,apis:hg,extra:{createRoutes:function(n){var r={};return nt(n,function(n,e){var t=e.split("<->");r[t[0]]=or(t[1],n),r[t[1]]=or(t[0],n)}),r},createBistate:function(n,e,t){return ir([{key:n,value:or(e,t)},{key:e,value:or(n,t)}])},createTristate:function(n,e,t,r){return ir([{key:n,value:ir([{key:e,value:r},{key:t,value:r}])},{key:e,value:ir([{key:n,value:r},{key:t,value:r}])},{key:t,value:ir([{key:n,value:r},{key:e,value:r}])}])}}}),xg=Ti("scrollable"),wg=function(n){bt(n,xg)},Sg=function(n){wt(n,xg)},Og=xg,Tg=function(n){return it(n,"format").getOr(n.title)},kg=function(n,e,t,r,o){return{data:{value:n,text:e},type:"item",dom:{tag:"div",classes:o?[Ti("styles-item-is-menu")]:[]},toggling:{toggleOnExecute:!1,toggleClass:Ti("format-matches"),selected:t},itemBehaviours:bo(o?[]:[xi(n,function(n,e){(e?bi.on:bi.off)(n)})]),components:[{dom:{tag:"div",attributes:{style:r},innerHtml:e}}]}},Eg=function(n,e,t,r){return{value:n,dom:{tag:"div"},components:[Rf.sketch({dom:{tag:"div",classes:[Ti("styles-collapser")]},components:r?[{dom:{tag:"span",classes:[Ti("styles-collapse-icon")]}},Fm(n)]:[Fm(n)],action:function(n){var e;r&&(e=t().get(n),sg.collapseMenu(e))}}),{dom:{tag:"div",classes:[Ti("styles-menu-items-container")]},components:[Qm.parts.items({})],behaviours:bo([Td("adhoc-scrollable-menu",[io(function(n,e){Ri(n.element,"overflow-y","auto"),Ri(n.element,"-webkit-overflow-scrolling","touch"),wg(n.element)}),uo(function(n){Ni(n.element,"overflow-y"),Ni(n.element,"-webkit-overflow-scrolling"),Sg(n.element)})])])}],items:e,menuBehaviours:bo([bg.config({initialState:"after",routes:bg.createTristate("before","current","after",{transition:{property:"transform",transitionClass:"transitioning"}})})])}},Cg=function(r){var o,i,n,e,t,u=(o=r.formats,i=function(){return c},n=Eg("Styles",[].concat(N(o.items,function(n){return kg(Tg(n),n.title,n.isSelected(),n.getPreview(),ct(o.expansions,Tg(n)))})),i,!1),e=et(o.menus,function(n,e){var t=N(n,function(n){return kg(Tg(n),n.title,n.isSelected!==undefined&&n.isSelected(),n.getPreview!==undefined?n.getPreview():"",ct(o.expansions,Tg(n)))});return Eg(e,t,i,!0)}),t=qt(e,or("styles",n)),{tmenu:sg.tieredData("styles",t,o.expansions)}),c=ed(sg.sketch({dom:{tag:"div",classes:[Ti("styles-menu")]},components:[],fakeFocus:!0,stayInDom:!0,onExecute:function(n,e){var t=ss.getValue(e);return r.handle(e,t.value),T.none()},onEscape:function(){return T.none()},onOpenMenu:function(n,e){var t=ms(n.element);ds(e.element,t),bg.jumpTo(e,"current")},onOpenSubmenu:function(n,e,t){var r=ms(n.element),o=Ji(e.element,'[role="menu"]').getOrDie("hacky"),i=n.getSystem().getByDom(o).getOrDie();ds(t.element,r),bg.progressTo(i,"before"),bg.jumpTo(t,"after"),bg.progressTo(t,"current")},onCollapseMenu:function(n,e,t){var r=Ji(e.element,'[role="menu"]').getOrDie("hacky"),o=n.getSystem().getByDom(r).getOrDie();bg.progressTo(o,"after"),bg.progressTo(t,"current")},navigateOnHover:!1,highlightImmediately:!0,data:u.tmenu,markers:{backgroundMenu:Ti("styles-background-menu"),menu:Ti("styles-menu"),selectedMenu:Ti("styles-selected-menu"),item:Ti("styles-item"),selectedItem:Ti("styles-selected-item")}}));return c.asSpec()},Mg=function(n){return ct(n,"items")?(t=qt(rr(e=n,["items"]),{menu:!0}),r=Dg(e.items),{item:t,menus:qt(r.menus,or(e.title,r.items)),expansions:qt(r.expansions,or(e.title,e.title))}):{item:n,menus:{},expansions:{}};var e,t,r},Dg=function(n){return z(n,function(n,e){var t=Mg(e);return{menus:qt(n.menus,t.menus),items:[t.item].concat(n.items),expansions:qt(n.expansions,t.expansions)}},{menus:{},expansions:{},items:[]})},_g=function(u){var c=function(n){return function(){return u.formatter.match(n)}},a=function(n){return function(){return u.formatter.getCssText(n)}},f=function(n){return N(n,function(n){if(ct(n,"items")){var e=f(n.items);return qt(qt(n,{isSelected:l,getPreview:y("")}),{items:e})}return ct(n,"format")?qt(i=n,{isSelected:c(i.format),getPreview:a(i.format)}):(r=za((t=n).title),o=qt(t,{format:r,isSelected:c(r),getPreview:a(r)}),u.formatter.register(r,o),o);var t,r,o,i})};return f(u.getParam("style_formats",Fo,"array"))},Ig=function(t,n,r){var e,o,i,u=(e=t,i=(o=function(n){return W(n,function(n){return n.items===undefined?!ct(n,"format")||e.formatter.canApply(n.format)?[n]:[]:0<o(n.items).length?[n]:[]})})(n),Dg(i));return Cg({formats:u,handle:function(n,e){t.undoManager.transact(function(){bi.isOn(n)?t.formatter.remove(e):t.formatter.apply(e)}),r()}})},Fg=function(n){var e=n.replace(/\|/g," ").trim();return 0<e.length?e.split(/\s+/):[]},Rg=function(n){return W(n,function(n){return(M(n)?Rg:Fg)(n)})},Vg=function(n){var e=n.getParam("toolbar",Ro,"array");return(M(e)?Rg:Fg)(e)},Bg=function(t,o){var n=function(t){return function(){return zf(e=t,function(){n.execCommand(e)},{},n=o);var n,e}},e=function(r){return function(){return n=o,t=Nf(e=r),zf(e,function(){n.execCommand(e)},t,n);var n,e,t}},r=function(n,e,t){return function(){return Pf(o,n,e,t)}},i=n("undo"),u=n("redo"),c=e("bold"),a=e("italic"),f=e("underline"),s=n("removeformat"),l=r("unlink","link",function(){o.execCommand("unlink",null,!1)}),d=r("unordered-list","ul",function(){o.execCommand("InsertUnorderedList",null,!1)}),m=r("ordered-list","ol",function(){o.execCommand("InsertOrderedList",null,!1)}),g=_g(o),p=function(){return Ig(o,g,function(){o.fire("scrollIntoView")})},h=function(n,e){return{isSupported:function(){var e=o.ui.registry.getAll().buttons;return n.forall(function(n){return ct(e,n)})},sketch:e}};return{undo:h(T.none(),i),redo:h(T.none(),u),bold:h(T.none(),c),italic:h(T.none(),a),underline:h(T.none(),f),removeformat:h(T.none(),s),link:h(T.none(),function(){return am(t,o)}),unlink:h(T.none(),l),image:h(T.none(),function(){return gd(o)}),bullist:h(T.some("bullist"),d),numlist:h(T.some("numlist"),m),fontsizeselect:h(T.none(),function(){return n={onChange:function(n){Yl(e,n)},getInitialValue:function(){return ql(e)}},Gl(t,"font-size",function(){return nd(n)},e=o);var e,n}),forecolor:h(T.none(),function(){return n={onChange:function(n,e,t){r.undoManager.transact(function(){r.formatter.apply("forecolor",{value:t}),r.nodeChanged()})},getInitialValue:function(){return-1}},Gl(t,"color-levels",function(){return $l(n)},r=o);var r,n}),styleselect:h(T.none(),function(){return zf("style-formats",function(n){o.fire("toReading"),t.dropup.appear(p,bi.on,n)},bo([bi.config({toggleClass:Ti("toolbar-button-selected"),toggleOnExecute:!1,aria:{mode:"pressed"}}),ci.config({channels:ir([Si(Bo,bi.off),Si(Ao,bi.off)])})]),o)})}},Ag=function(n){var e=de.fromDom(function(n){if(Ne()&&_(n.target)){var e=de.fromDom(n.target);if(xe(e)&&ze(e)&&n.composed&&n.composedPath){var t=n.composedPath();if(t)return J(t)}}return T.from(n.target)}(n).getOr(n.target)),t=function(){return n.stopPropagation()},r=function(){return n.preventDefault()},o=i(r,t);return{target:e,x:n.clientX,y:n.clientY,stop:t,prevent:r,kill:o,raw:n}},jg=function(n,e,t,r,o){var i,u,c=(i=t,u=r,function(n){i(n)&&u(Ag(n))});return n.dom.addEventListener(e,c,o),{unbind:b(Ng,n,e,c,o)}},Ng=function(n,e,t,r){n.dom.removeEventListener(e,t,r)},Pg=w,Hg=function(n,e,t){return jg(n,e,Pg,t,!1)},zg=function(n,e,t){return jg(n,e,Pg,t,!0)},Lg=tinymce.util.Tools.resolve("tinymce.util.Delay"),Gg=function(n){var e=n.matchMedia("(orientation: portrait)").matches;return{isPortrait:y(e)}},$g=function(r,e){var n=de.fromDom(r),o=null,t=Hg(n,"orientationchange",function(){Lg.clearInterval(o);var n=Gg(r);e.onChange(n),i(function(){e.onReady(n)})}),i=function(n){Lg.clearInterval(o);var e=r.innerHeight,t=0;o=Lg.setInterval(function(){e!==r.innerHeight?(Lg.clearInterval(o),n(T.some(r.innerHeight))):20<t&&(Lg.clearInterval(o),n(T.none())),t++},50)};return{onAdjustment:i,destroy:function(){t.unbind()}}},Ug=function(n,e,t){var r,o,i=n.document.createRange();return r=i,e.fold(function(n){r.setStartBefore(n.dom)},function(n,e){r.setStart(n.dom,e)},function(n){r.setStartAfter(n.dom)}),o=i,t.fold(function(n){o.setEndBefore(n.dom)},function(n,e){o.setEnd(n.dom,e)},function(n){o.setEndAfter(n.dom)}),i},Wg=function(n,e,t,r,o){var i=n.document.createRange();return i.setStart(e.dom,t),i.setEnd(r.dom,o),i},Xg=function(n){return{left:n.left,top:n.top,right:n.right,bottom:n.bottom,width:n.width,height:n.height}},qg=Ut([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),Yg=function(n,e,t){return e(de.fromDom(t.startContainer),t.startOffset,de.fromDom(t.endContainer),t.endOffset)},Kg=function(n,e){var o,t,r,i=(o=n,e.match({domRange:function(n){return{ltr:y(n),rtl:T.none}},relative:function(n,e){return{ltr:d(function(){return Ug(o,n,e)}),rtl:d(function(){return T.some(Ug(o,e,n))})}},exact:function(n,e,t,r){return{ltr:d(function(){return Wg(o,n,e,t,r)}),rtl:d(function(){return T.some(Wg(o,t,r,n,e))})}}}));return(r=(t=i).ltr()).collapsed?t.rtl().filter(function(n){return!1===n.collapsed}).map(function(n){return qg.rtl(de.fromDom(n.endContainer),n.endOffset,de.fromDom(n.startContainer),n.startOffset)}).getOrThunk(function(){return Yg(0,qg.ltr,r)}):Yg(0,qg.ltr,r)},Jg=(qg.ltr,qg.rtl,function(n,e,t,r){return{start:n,soffset:e,finish:t,foffset:r}}),Qg=(ad=we,fd="text",{get:function(n){if(!ad(n))throw new Error("Can only get "+fd+" value of a "+fd+" node");return sd(n).getOr("")},getOption:sd=function(n){return ad(n)?T.from(n.dom.nodeValue):T.none()},set:function(n,e){if(!ad(n))throw new Error("Can only set raw "+fd+" value of a "+fd+" node");n.dom.nodeValue=e}}),Zg=function(n){return"img"===ye(n)?1:(e=n,Qg.getOption(e).fold(function(){return Ce(n).length},function(n){return n.length}));var e},np=Ut([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),ep={before:np.before,on:np.on,after:np.after,cata:function(n,e,t,r){return n.fold(e,t,r)},getStart:function(n){return n.fold(v,v,v)}},tp=Ut([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),rp={domRange:tp.domRange,relative:tp.relative,exact:tp.exact,exactFromRange:function(n){return tp.exact(n.start,n.soffset,n.finish,n.foffset)},getWin:function(n){var e,t=n.match({domRange:function(n){return de.fromDom(n.startContainer)},relative:function(n,e){return ep.getStart(n)},exact:function(n,e,t,r){return n}});return e=t,de.fromDom(ke(e).dom.defaultView)},range:Jg},op=function(n,e){var t=ye(n);return"input"===t?ep.after(n):A(["br","img"],t)?0===e?ep.before(n):ep.after(n):ep.on(n,e)},ip=function(n,e,t,r){var o,i,u,c,a,f=(i=e,u=t,c=r,(a=Te(o=n).dom.createRange()).setStart(o.dom,i),a.setEnd(u.dom,c),a),s=ve(n,t)&&e===r;return f.collapsed&&!s},up=function(n){return T.from(n.getSelection())},cp=function(n,e,t,r,o){var i,u=Wg(n,e,t,r,o);i=u,up(n).each(function(n){n.removeAllRanges(),n.addRange(i)})},ap=function(l,n){return Kg(l,n).match({ltr:function(n,e,t,r){cp(l,n,e,t,r)},rtl:function(c,a,f,s){up(l).each(function(n){if(n.setBaseAndExtent)n.setBaseAndExtent(c.dom,a,f.dom,s);else if(n.extend)try{t=c,r=a,o=f,i=s,(e=n).collapse(t.dom,r),e.extend(o.dom,i)}catch(u){cp(l,f,s,c,a)}else cp(l,f,s,c,a);var e,t,r,o,i})}})},fp=function(n,e,t,r,o){var i,u,c,a,f=(i=r,u=o,c=op(e,t),a=op(i,u),rp.relative(c,a));ap(n,f)},sp=function(n){if(0<n.rangeCount){var e=n.getRangeAt(0),t=n.getRangeAt(n.rangeCount-1);return T.some(Jg(de.fromDom(e.startContainer),e.startOffset,de.fromDom(t.endContainer),t.endOffset))}return T.none()},lp=function(n){if(null===n.anchorNode||null===n.focusNode)return sp(n);var e=de.fromDom(n.anchorNode),t=de.fromDom(n.focusNode);return ip(e,n.anchorOffset,t,n.focusOffset)?T.some(Jg(e,n.anchorOffset,t,n.focusOffset)):sp(n)},dp=function(n){return up(n).filter(function(n){return 0<n.rangeCount}).bind(lp)},mp=function(n,e){var i,t,r,o,u=Kg(i=n,e).match({ltr:function(n,e,t,r){var o=i.document.createRange();return o.setStart(n.dom,e),o.setEnd(t.dom,r),o},rtl:function(n,e,t,r){var o=i.document.createRange();return o.setStart(t.dom,r),o.setEnd(n.dom,e),o}});return r=(t=u).getClientRects(),0<(o=0<r.length?r[0]:t.getBoundingClientRect()).width||0<o.height?T.some(o).map(Xg):T.none()},gp=function(n){return T.from(n.dom.contentWindow)},pp=function(n){return gp(n).bind(dp)},hp=function(n){return n.getFrame()},vp=function(n,e,t,r){return n[t].getOrThunk(function(){return function(n){return Hg(e,r,n)}})},yp=function(c){var n,a=hp(c);return n=a,T.some(de.fromDom(n.dom.contentWindow.document.body)).bind(function(u){return n=a,T.some(de.fromDom(n.dom.contentWindow.document)).bind(function(i){return gp(a).map(function(o){var n=de.fromDom(i.dom.documentElement),e=c.getCursorBox.getOrThunk(function(){return function(){return dp(o).map(function(n){return rp.exact(n.start,n.soffset,n.finish,n.foffset)}).bind(function(n){return mp(o,n).orThunk(function(){return dp(o).filter(function(n){return ve(n.start,n.finish)&&n.soffset===n.foffset}).bind(function(n){var e=n.start.dom.getBoundingClientRect();return 0<e.width||0<e.height?T.some(e):T.none()})})})}}),t=c.setSelection.getOrThunk(function(){return function(n,e,t,r){fp(o,n,e,t,r)}}),r=c.clearSelection.getOrThunk(function(){return function(){up(o).each(function(n){return n.removeAllRanges()})}});return{body:u,doc:i,win:o,html:n,getSelection:b(pp,a),setSelection:t,clearSelection:r,frame:a,onKeyup:vp(c,i,"onKeyup","keyup"),onNodeChanged:vp(c,i,"onNodeChanged","SelectionChange"),onDomChanged:c.onDomChanged,onScrollToCursor:c.onScrollToCursor,onScrollToElement:c.onScrollToElement,onToReading:c.onToReading,onToEditing:c.onToEditing,onToolbarScrollStart:c.onToolbarScrollStart,onTouchContent:c.onTouchContent,onTapContent:c.onTapContent,onTouchToolstrip:c.onTouchToolstrip,getCursorBox:e}})});var n})},bp=(ld="getWin",dd=gp,function(e){return e[ld].getOrThunk(function(){var n=hp(e);return function(){return dd(n)}})()}),xp=function(){var e=Ki("head").getOrDie(),n=Ki('meta[name="viewport"]').getOrThunk(function(){var n=de.fromTag("meta");return ft(n,"name","viewport"),Fe(e,n),n}),t=lt(n,"content");return{maximize:function(){ft(n,"content","width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0")},restore:function(){t!==undefined&&null!==t&&0<t.length?ft(n,"content",t):ft(n,"content","user-scalable=yes")}}},wp="data-ephox-mobile-fullscreen-style",Sp="position:absolute!important;",Op="top:0!important;left:0!important;margin:0!important;padding:0!important;width:100%!important;height:100%!important;overflow:visible!important;",Tp=Mn().os.isAndroid(),kp=function(n,e){var t,r,o,i=function(r){return function(n){var e=lt(n,"style"),t=e===undefined?"no-styles":e.trim();t!==r&&(ft(n,wp,t),ft(n,"style",r))}},u=(t="*",Gi(n,function(n){return me(n,t)},r)),c=W(u,function(n){return e="*",$i(n,function(n){return me(n,e)});var e}),a=(o=Bi(e,"background-color"))!==undefined&&""!==o?"background-color:"+o+"!important":"background-color:rgb(255,255,255)!important;";P(c,i("display:none!important;")),P(u,i(Sp+Op+a)),i((!0===Tp?"":Sp)+Op+a)(n)},Ep=function(){var n=pe("["+wp+"]");P(n,function(n){var e=lt(n,wp);"no-styles"!==e?ft(n,"style",e):gt(n,"style"),gt(n,wp)})},Cp=function(n){var e=n.raw;return e.touches===undefined||1!==e.touches.length?T.none():T.some(e.touches[0])},Mp=function(t){var r,o,i,u=ko(T.none()),c=ko(!1),a=(r=function(n){t.triggerEvent(Zn(),n),c.set(!0)},o=400,i=null,{cancel:function(){null!==i&&(clearTimeout(i),i=null)},schedule:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];i=setTimeout(function(){r.apply(null,n),i=null},o)}}),f=ir([{key:_n(),value:function(t){return Cp(t).each(function(n){a.cancel();var e={x:n.clientX,y:n.clientY,target:t.target};a.schedule(t),c.set(!1),u.set(T.some(e))}),T.none()}},{key:In(),value:function(n){return a.cancel(),Cp(n).each(function(i){u.get().each(function(n){var e,t,r,o;e=i,t=n,r=Math.abs(e.clientX-t.x),o=Math.abs(e.clientY-t.y),(5<r||5<o)&&u.set(T.none())})}),T.none()}},{key:Fn(),value:function(e){a.cancel();return u.get().filter(function(n){return ve(n.target,e.target)}).map(function(n){return c.get()?(e.prevent(),!1):t.triggerEvent(Qn(),e)})}}]);return{fireIfReady:function(e,n){return it(f,n).bind(function(n){return n(e)})}}},Dp=function(t){var e=Mp({triggerEvent:function(n,e){t.onTapContent(e)}});return{fireTouchstart:function(n){e.fireIfReady(n,"touchstart")},onTouchend:function(){return Hg(t.body,"touchend",function(n){e.fireIfReady(n,"touchend")})},onTouchmove:function(){return Hg(t.body,"touchmove",function(n){e.fireIfReady(n,"touchmove")})}}},_p=6<=Mn().os.version.major,Ip=function(r,e,t){var o=Dp(r),i=Te(e),u=function(n){return!ve(n.start,n.finish)||n.soffset!==n.foffset},n=function(){var n=r.doc.dom.hasFocus()&&r.getSelection().exists(u);t.getByDom(e).each(!0===(n||Mo(i).filter(function(n){return"input"===ye(n)}).exists(function(n){return n.dom.selectionStart!==n.dom.selectionEnd}))?bi.on:bi.off)},c=[Hg(r.body,"touchstart",function(n){r.onTouchContent(),o.fireTouchstart(n)}),o.onTouchmove(),o.onTouchend(),Hg(e,"touchstart",function(n){r.onTouchToolstrip()}),r.onToReading(function(){Co(r.body)}),r.onToEditing(O),r.onScrollToCursor(function(n){n.preventDefault(),r.getCursorBox().each(function(n){var e=r.win,t=n.top>e.innerHeight||n.bottom>e.innerHeight?n.bottom-e.innerHeight+50:0;0!=t&&e.scrollTo(e.pageXOffset,e.pageYOffset+t)})})].concat(!0==_p?[]:[Hg(de.fromDom(r.win),"blur",function(){t.getByDom(e).each(bi.off)}),Hg(i,"select",n),Hg(r.doc,"selectionchange",n)]);return{destroy:function(){P(c,function(n){n.unbind()})}}},Fp=function(n,e){var t=parseInt(lt(n,e),10);return isNaN(t)?0:t},Rp=function(n){return x(x({},n),{width:2})},Vp=function(n){return{left:n.left,top:n.top,right:n.right,bottom:n.bottom,width:n.width,height:n.height}},Bp=function(n){var e=n.getSelection();return e!==undefined&&0<e.rangeCount?function(t){if(t.collapsed){var r=de.fromDom(t.startContainer);return Ee(r).bind(function(n){var e=rp.exact(r,t.startOffset,n,Zg(n));return mp(t.startContainer.ownerDocument.defaultView,e).map(Rp).map(K)}).getOr([])}return N(t.getClientRects(),Vp)}(e.getRangeAt(0)):[]},Ap=function(n){n.focus();var e=de.fromDom(n.document.body);(Mo().exists(function(n){return A(["input","textarea"],ye(n))})?function(n){Lg.setTimeout(function(){n()},0)}:s)(function(){Mo().each(Co),Eo(e)})},jp="data-"+Ti("last-outer-height"),Np=function(n,e){ft(n,jp,e)},Pp=function(n){return{top:n.top,bottom:n.top+n.height}},Hp=function(n,e){var t=Fp(e,jp),r=n.innerHeight;return r<t?T.some(t-r):T.none()},zp=function(n,u){var e=de.fromDom(u.document.body),t=Hg(de.fromDom(n),"resize",function(){Hp(n,e).each(function(i){var n;(0<(n=Bp(u)).length?T.some(n[0]).map(Pp):T.none()).each(function(n){var e,t,r,o=(e=u,r=i,(t=n).top>e.innerHeight||t.bottom>e.innerHeight?Math.min(r,t.bottom-e.innerHeight+50):0);0!==o&&u.scrollTo(u.pageXOffset,u.pageYOffset+o)})}),Np(e,n.innerHeight)});Np(e,n.innerHeight);return{toEditing:function(){Ap(u)},destroy:function(){t.unbind()}}},Lp=function(t,r){var o=null;return{cancel:function(){null!==o&&(clearTimeout(o),o=null)},throttle:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];null!==o&&clearTimeout(o),o=setTimeout(function(){t.apply(null,n),o=null},r)}}},Gp=function(n,e){var t,r,o,i=ed(Md.sketch({dom:Af('<div aria-hidden="true" class="${prefix}-mask-tap-icon"></div>'),containerBehaviours:bo([bi.config({toggleClass:Ti("mask-tap-icon-selected"),toggleOnExecute:!1})])})),u=(t=n,r=200,o=null,{cancel:function(){null!==o&&(clearTimeout(o),o=null)},throttle:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];null===o&&(o=setTimeout(function(){t.apply(null,n),o=null},r))}});return Md.sketch({dom:Af('<div class="${prefix}-disabled-mask"></div>'),components:[Md.sketch({dom:Af('<div class="${prefix}-content-container"></div>'),components:[Rf.sketch({dom:Af('<div class="${prefix}-content-tap-section"></div>'),components:[i.asSpec()],action:function(n){u.throttle()},buttonBehaviours:bo([bi.config({toggleClass:Ti("mask-tap-icon-selected")})])})]})]})},$p=y({unbind:O}),Up=yr([jr("editor",[Br("getFrame"),Nr("getBody"),Nr("getDoc"),Nr("getWin"),Nr("getSelection"),Nr("setSelection"),Nr("clearSelection"),Nr("cursorSaver"),Nr("onKeyup"),Nr("onNodeChanged"),Nr("getCursorBox"),Br("onDomChanged"),Lr("onTouchContent",O),Lr("onTapContent",O),Lr("onTouchToolstrip",O),Lr("onScrollToCursor",$p),Lr("onScrollToElement",$p),Lr("onToEditing",$p),Lr("onToReading",$p),Lr("onToolbarScrollStart",v)]),Br("socket"),Br("toolstrip"),Br("dropup"),Br("toolbar"),Br("container"),Br("alloy"),$r("win",function(n){return Te(n.socket).dom.defaultView}),$r("body",function(n){return de.fromDom(n.socket.dom.ownerDocument.body)}),Lr("translate",v),Lr("setReadOnly",O),Lr("readOnlyOnInit",w)]),Wp=function(n){var e=_r("Getting AndroidWebapp schema",Up,n);Ri(e.toolstrip,"width","100%");var t=Bm(Gp(function(){e.setReadOnly(e.readOnlyOnInit()),f.enter()},e.translate));e.alloy.add(t);var r={show:function(){e.alloy.add(t)},hide:function(){e.alloy.remove(t)}};Fe(e.container,t.element);var o,i,u,c,a,f=(o=e,i=r,u=xp(),c=om(),a=om(),{enter:function(){i.hide(),bt(o.container,Ti("fullscreen-maximized")),bt(o.container,Ti("android-maximized")),u.maximize(),bt(o.body,Ti("android-scroll-reload")),c.set(zp(o.win,bp(o.editor).getOrDie("no"))),yp(o.editor).each(function(n){kp(o.container,n.body),a.set(Ip(n,o.toolstrip,o.alloy))})},exit:function(){u.restore(),i.show(),wt(o.container,Ti("fullscreen-maximized")),wt(o.container,Ti("android-maximized")),Ep(),wt(o.body,Ti("android-scroll-reload")),a.clear(),c.clear()}});return{setReadOnly:e.setReadOnly,refreshStructure:O,enter:f.enter,exit:f.exit,destroy:O}},Xp=y([Br("dom"),Lr("shell",!0),Ea("toolbarBehaviours",[og])]),qp=y([rf({name:"groups",overrides:function(){return{behaviours:bo([og.config({})])}}})]),Yp=Ff({name:"Toolbar",configFields:Xp(),partFields:qp(),factory:function(e,n,t,r){var o=function(n){return e.shell?T.some(n):df(n,e,"groups")},i=e.shell?{behaviours:[og.config({})],components:[]}:{behaviours:[],components:n};return{uid:e.uid,dom:e.dom,components:i.components,behaviours:Ma(e.toolbarBehaviours,i.behaviours),apis:{setGroups:function(n,e){o(n).fold(function(){throw console.error("Toolbar was defined to not be a shell, but no groups container was specified in components"),new Error("Toolbar was defined to not be a shell, but no groups container was specified in components")},function(n){og.set(n,e)})}},domModification:{attributes:{role:"group"}}}},apis:{setGroups:function(n,e,t){n.setGroups(e,t)}}}),Kp=y([Br("items"),jr("markers",N(["itemSelector"],Br)),Ea("tgroupBehaviours",[ka])]),Jp=y([of({name:"items",unit:"item"})]),Qp=Ff({name:"ToolbarGroup",configFields:Kp(),partFields:Jp(),factory:function(n,e,t,r){return{uid:n.uid,dom:n.dom,components:e,behaviours:Ma(n.tgroupBehaviours,[ka.config({mode:"flow",selector:n.markers.itemSelector})]),domModification:{attributes:{role:"toolbar"}}}}}),Zp="data-"+Ti("horizontal-scroll"),nh=function(n){return"true"===lt(n,Zp)?0<(t=n).dom.scrollLeft||function(n){n.dom.scrollLeft=1;var e=0!==n.dom.scrollLeft;return n.dom.scrollLeft=0,e}(t):0<(e=n).dom.scrollTop||function(n){n.dom.scrollTop=1;var e=0!==n.dom.scrollTop;return n.dom.scrollTop=0,e}(e);var e,t},eh=function(){var e=function(n){var e=!0===n.scrollable?"${prefix}-toolbar-scrollable-group":"";return{dom:Af('<div aria-label="'+n.label+'" class="${prefix}-toolbar-group '+e+'"></div>'),tgroupBehaviours:bo([Td("adhoc-scrollable-toolbar",!0===n.scrollable?[co(function(n,e){var t;Ri(n.element,"overflow-x","auto"),t=n.element,ft(t,Zp,"true"),wg(n.element)})]:[])]),components:[Md.sketch({components:[Qp.parts.items({})]})],markers:{itemSelector:"."+Ti("toolbar-group-item")},items:n.items}},t=Bm(Yp.sketch({dom:Af('<div class="${prefix}-toolbar"></div>'),components:[Yp.parts.groups({})],toolbarBehaviours:bo([bi.config({toggleClass:Ti("context-toolbar"),toggleOnExecute:!1,aria:{mode:"none"}}),ka.config({mode:"cyclic"})]),shell:!0})),n=Bm(Md.sketch({dom:{classes:[Ti("toolstrip")]},components:[Am(t)],containerBehaviours:bo([bi.config({toggleClass:Ti("android-selection-context-toolbar"),toggleOnExecute:!1})])})),r=function(){Yp.setGroups(t,o.get()),bi.off(t)},o=ko([]);return{wrapper:n,toolbar:t,createGroups:function(n){return N(n,i(Qp.sketch,e))},setGroups:function(n){o.set(n),r()},setContextToolbar:function(n){bi.on(t),Yp.setGroups(t,n)},restoreToolbar:function(){bi.isOn(t)&&r()},refresh:function(){},focus:function(){ka.focusIn(t)}}},th=function(n){return Bm(Rf.sketch({dom:Af('<div class="${prefix}-mask-edit-icon ${prefix}-icon"></div>'),action:function(){n.run(function(n){n.setReadOnly(!1)})}}))},rh=function(){return Bm(Md.sketch({dom:Af('<div class="${prefix}-editor-socket"></div>'),components:[],containerBehaviours:bo([og.config({})])}))},oh=function(n,e){og.append(n,Am(e))},ih=function(n,e){og.remove(n,e)},uh=function(n,e,t,r){(!0===t?To.toAlpha:To.toOmega)(r),(t?oh:ih)(n,e)},ch=function(e,n){return n.getAnimationRoot.fold(function(){return e.element},function(n){return n(e)})},ah=function(n){return n.dimension.property},fh=function(n,e){return n.dimension.getDimension(e)},sh=function(n,e){var t=ch(n,e);km(t,[e.shrinkingClass,e.growingClass])},lh=function(n,e){wt(n.element,e.openClass),bt(n.element,e.closedClass),Ri(n.element,ah(e),"0px"),Pi(n.element)},dh=function(n,e){wt(n.element,e.closedClass),bt(n.element,e.openClass),Ni(n.element,ah(e))},mh=function(n,e,t,r){t.setCollapsed(),Ri(n.element,ah(e),fh(e,n.element)),Pi(n.element),sh(n,e),lh(n,e),e.onStartShrink(n),e.onShrunk(n)},gh=function(n,e,t,r){var o=r.getOrThunk(function(){return fh(e,n.element)});t.setCollapsed(),Ri(n.element,ah(e),o),Pi(n.element);var i=ch(n,e);wt(i,e.growingClass),bt(i,e.shrinkingClass),lh(n,e),e.onStartShrink(n)},ph=function(n,e,t){var r=fh(e,n.element);("0px"===r?mh:gh)(n,e,t,T.some(r))},hh=function(n,e,t){var r=ch(n,e),o=St(r,e.shrinkingClass),i=fh(e,n.element);dh(n,e);var u=fh(e,n.element);(o?function(){Ri(n.element,ah(e),i),Pi(n.element)}:function(){lh(n,e)})(),wt(r,e.shrinkingClass),bt(r,e.growingClass),dh(n,e),Ri(n.element,ah(e),u),t.setExpanded(),e.onStartGrow(n)},vh=function(n,e,t){var r=ch(n,e);return!0===St(r,e.growingClass)},yh=function(n,e,t){var r=ch(n,e);return!0===St(r,e.shrinkingClass)},bh=/* */Object.freeze({__proto__:null,refresh:function(n,e,t){var r;t.isExpanded()&&(Ni(n.element,ah(e)),r=fh(e,n.element),Ri(n.element,ah(e),r))},grow:function(n,e,t){t.isExpanded()||hh(n,e,t)},shrink:function(n,e,t){t.isExpanded()&&ph(n,e,t)},immediateShrink:function(n,e,t){t.isExpanded()&&mh(n,e,t,T.none())},hasGrown:function(n,e,t){return t.isExpanded()},hasShrunk:function(n,e,t){return t.isCollapsed()},isGrowing:vh,isShrinking:yh,isTransitioning:function(n,e,t){return vh(n,e)||yh(n,e)},toggleGrow:function(n,e,t){(t.isExpanded()?ph:hh)(n,e,t)},disableTransitions:sh}),xh=/* */Object.freeze({__proto__:null,exhibit:function(n,e,t){var r=e.expanded;return lo(r?{classes:[e.openClass],styles:{}}:{classes:[e.closedClass],styles:or(e.dimension.property,"0px")})},events:function(t,r){return Jr([(n=Ln(),eo(n)(function(n,e){e.event.raw.propertyName===t.dimension.property&&(sh(n,t),r.isExpanded()&&Ni(n.element,t.dimension.property),(r.isExpanded()?t.onGrown:t.onShrunk)(n))}))]);var n}}),wh=[Br("closedClass"),Br("openClass"),Br("shrinkingClass"),Br("growingClass"),Nr("getAnimationRoot"),Zo("onShrunk"),Zo("onStartShrink"),Zo("onGrown"),Zo("onStartGrow"),Lr("expanded",!1),Ar("dimension",Fr("property",{width:[ri("property","width"),ri("getDimension",function(n){return ms(n)+"px"})],height:[ri("property","height"),ri("getDimension",function(n){return Li(n)+"px"})]}))],Sh=wo({fields:wh,name:"sliding",active:xh,apis:bh,state:/* */Object.freeze({__proto__:null,init:function(n){var e=ko(n.expanded);return yo({isExpanded:function(){return!0===e.get()},isCollapsed:function(){return!1===e.get()},setCollapsed:b(e.set,!1),setExpanded:b(e.set,!0),readState:function(){return"expanded: "+e.get()}})}})}),Oh=function(e,t){var r=Bm(Md.sketch({dom:{tag:"div",classes:[Ti("dropup")]},components:[],containerBehaviours:bo([og.config({}),Sh.config({closedClass:Ti("dropup-closed"),openClass:Ti("dropup-open"),shrinkingClass:Ti("dropup-shrinking"),growingClass:Ti("dropup-growing"),dimension:{property:"height"},onShrunk:function(n){e(),t(),og.set(n,[])},onGrown:function(n){e(),t()}}),wi(function(n,e){o(O)})])})),o=function(n){window.requestAnimationFrame(function(){n(),Sh.shrink(r)})};return{appear:function(n,e,t){!0===Sh.hasShrunk(r)&&!1===Sh.isTransitioning(r)&&window.requestAnimationFrame(function(){e(t),og.set(r,[n()]),Sh.grow(r)})},disappear:o,component:r,element:r.element}},Th=function(n){var e,t;return n.raw.which===nu[0]&&!A(["input","textarea"],ye(n.target))&&(e=n.target,!Zi(e,'[contenteditable="true"]',t).isSome())},kh=function(){return Mn().browser.isFirefox()},Eh=vr([Ar("triggerEvent",Vr),Lr("stopBackspace",!0)]),Ch=function(e,n){var t,r,o,i,u=_r("Getting GUI events settings",Eh,n),c=Mp(u),a=N(["touchstart","touchmove","touchend","touchcancel","gesturestart","mousedown","mouseup","mouseover","mousemove","mouseout","click"].concat(["selectstart","input","contextmenu","change","transitionend","drag","dragstart","dragend","dragenter","dragleave","dragover","drop","keyup"]),function(n){return Hg(e,n,function(e){c.fireIfReady(e,n).each(function(n){n&&e.kill()}),u.triggerEvent(n,e)&&e.kill()})}),f=ko(T.none()),s=Hg(e,"paste",function(e){c.fireIfReady(e,"paste").each(function(n){n&&e.kill()}),u.triggerEvent("paste",e)&&e.kill(),f.set(T.some(setTimeout(function(){u.triggerEvent(qn(),e)},0)))}),l=Hg(e,"keydown",function(n){u.triggerEvent("keydown",n)?n.kill():!0===u.stopBackspace&&Th(n)&&n.prevent()}),d=(t=e,r=function(n){u.triggerEvent("focusin",n)&&n.kill()},kh()?zg(t,"focus",r):Hg(t,"focusin",r)),m=ko(T.none()),g=(o=e,i=function(n){u.triggerEvent("focusout",n)&&n.kill(),m.set(T.some(setTimeout(function(){u.triggerEvent(Xn(),n)},0)))},kh()?zg(o,"blur",i):Hg(o,"focusout",i));return{unbind:function(){P(a,function(n){n.unbind()}),l.unbind(),d.unbind(),g.unbind(),s.unbind(),f.get().each(clearTimeout),m.get().each(clearTimeout)}}},Mh=function(n,e){var t=it(n,"target").getOr(e);return ko(t)},Dh=Ut([{stopped:[]},{resume:["element"]},{complete:[]}]),_h=function(n,r,e,t,o,i){var u,c,a,f,s=n(r,t),l=(u=e,c=o,a=ko(!1),f=ko(!1),{stop:function(){a.set(!0)},cut:function(){f.set(!0)},isStopped:a.get,isCut:f.get,event:u,setSource:c.set,getSource:c.get});return s.fold(function(){return i.logEventNoHandlers(r,t),Dh.complete()},function(e){var t=e.descHandler;return hm(t)(l),l.isStopped()?(i.logEventStopped(r,e.element,t.purpose),Dh.stopped()):l.isCut()?(i.logEventCut(r,e.element,t.purpose),Dh.complete()):Ee(e.element).fold(function(){return i.logNoParent(r,e.element,t.purpose),Dh.complete()},function(n){return i.logEventResponse(r,e.element,t.purpose),Dh.resume(n)})})},Ih=function(e,t,r,n,o,i){return _h(e,t,r,n,o,i).fold(w,function(n){return Ih(e,t,r,n,o,i)},l)},Fh=function(n,e,t){var r,o,i=(r=e,o=ko(!1),{stop:function(){o.set(!0)},cut:O,isStopped:o.get,isCut:l,event:r,setSource:f("Cannot set source of a broadcasted event"),getSource:f("Cannot get source of a broadcasted event")});return P(n,function(n){var e=n.descHandler;hm(e)(i)}),i.isStopped()},Rh=function(n,e,t,r,o){var i=Mh(t,r);return Ih(n,e,t,r,i,o)},Vh=function(){var c={};return{registerId:function(i,u,n){nt(n,function(n,e){var t,r,o=c[e]!==undefined?c[e]:{};o[u]=(t=n,r=i,{cHandler:b.apply(undefined,[t.handler].concat(r)),purpose:t.purpose}),c[e]=o})},unregisterId:function(t){nt(c,function(n,e){n.hasOwnProperty(t)&&delete n[t]})},filterByType:function(n){return it(c,n).map(function(n){return ot(n,function(n,e){return{id:e,descHandler:n}})}).getOr([])},find:function(n,e,t){var o=it(c,e);return Xr(t,function(n){return t=o,Tf(r=n).fold(function(){return T.none()},function(e){return t.bind(function(n){return it(n,e)}).map(function(n){return{element:r,descHandler:n}})});var t,r},n)}}},Bh=function(){var r=Vh(),o={},i=function(r){var n=r.element;return Tf(n).fold(function(){return n="uid-",e=r.element,t=za(wf+n),Of(e,t),t;var n,e,t},function(n){return n})},u=function(n){Tf(n.element).each(function(n){delete o[n],r.unregisterId(n)})};return{find:function(n,e,t){return r.find(n,e,t)},filter:function(n){return r.filterByType(n)},register:function(n){var e=i(n);ct(o,e)&&function(n,e){var t=o[e];if(t!==n)throw new Error('The tagId "'+e+'" is already used by: '+Ho(t.element)+"\nCannot use it for: "+Ho(n.element)+"\nThe conflicting element is"+(Le(t.element)?" ":" not ")+"already in the DOM");u(n)}(n,e);var t=[n];r.registerId(t,e,n.events),o[e]=n},unregister:u,getById:function(n){return it(o,n)}}},Ah=function(t){var r=function(e){return Ee(t.element).fold(w,function(n){return ve(e,n)})},o=Bh(),f=function(n,e){return o.find(r,n,e)},n=Ch(t.element,{triggerEvent:function(r,o){return Wo(r,o.target,function(n){return t=n,Rh(f,r,e=o,e.target,t);var e,t})}}),i={debugInfo:y("real"),triggerEvent:function(e,t,r){Wo(e,t,function(n){return Rh(f,e,r,t,n)})},triggerFocus:function(c,a){Tf(c).fold(function(){Eo(c)},function(n){Wo(Wn(),c,function(n){var e,t,r,o,i,u;return e=f,t=Wn(),i=n,u=Mh(r={originator:a,kill:O,prevent:O,target:c},o=c),_h(e,t,r,o,u,i),!1})})},triggerEscape:function(n,e){i.triggerEvent("keydown",n.element,e.event)},getByUid:function(n){return g(n)},getByDom:function(n){return p(n)},build:Bm,addToGui:function(n){c(n)},removeFromGui:function(n){a(n)},addToWorld:function(n){e(n)},removeFromWorld:function(n){u(n)},broadcast:function(n){l(n)},broadcastOn:function(n,e){d(n,e)},broadcastEvent:function(n,e){m(n,e)},isConnected:w},e=function(n){n.connect(i),we(n.element)||(o.register(n),P(n.components(),e),i.triggerEvent(ne(),n.element,{target:n.element}))},u=function(n){we(n.element)||(P(n.components(),u),o.unregister(n)),n.disconnect()},c=function(n){Ye(t,n,Fe)},a=function(n){Ke(n)},s=function(t){var n=o.filter(Yn());P(n,function(n){var e=n.descHandler;hm(e)(t)})},l=function(n){s({universal:!0,data:n})},d=function(n,e){s({universal:!1,channels:n,data:e})},m=function(n,e){var t=o.filter(n);return Fh(t,e)},g=function(n){return o.getById(n).fold(function(){return Ct.error(new Error('Could not find component with uid: "'+n+'" in system.'))},Ct.value)},p=function(n){var e=Tf(n).getOr("not found");return g(e)};return e(t),{root:t,element:t.element,destroy:function(){n.unbind(),Be(t.element)},add:c,remove:a,getByUid:g,getByDom:p,addToWorld:e,removeFromWorld:u,broadcast:l,broadcastOn:d,broadcastEvent:m}},jh=Ti("readonly-mode"),Nh=Ti("edit-mode");function Ph(n){var e=Bm(Md.sketch({dom:{classes:[Ti("outer-container")].concat(n.classes)},containerBehaviours:bo([To.config({alpha:jh,omega:Nh})])}));return Ah(e)}var Hh=function(n,e){var t=de.fromTag("input");Vi(t,{opacity:"0",position:"absolute",top:"-1000px",left:"-1000px"}),Fe(n,t),Eo(t),e(t),Be(t)},zh=function(n){var e,t,r=n.getSelection();0<r.rangeCount&&(e=r.getRangeAt(0),(t=n.document.createRange()).setStart(e.startContainer,e.startOffset),t.setEnd(e.endContainer,e.endOffset),r.removeAllRanges(),r.addRange(t))},Lh=function(n,e){Mo().each(function(n){ve(n,e)||Co(n)}),n.focus(),Eo(de.fromDom(n.document.body)),zh(n)},Gh=function(n,e,t,r){var o=function(){Lh(e,r)},i=Hg(t,"keydown",function(n){A(["input","textarea"],ye(n.target))||o()});return{toReading:function(){Hh(n,Co)},toEditing:o,onToolbarTouch:O,destroy:function(){i.unbind()}}},$h=function(t,r,o,i,n){var u=function(){r.run(function(n){n.refreshSelection()})},e=function(n,e){var t=n-i.dom.scrollTop;r.run(function(n){n.scrollIntoView(t,t+e)})},c=function(){r.run(function(n){n.clearSelection()})},a=function(){t.getCursorBox().each(function(n){e(n.top,n.height)}),r.run(function(n){n.syncHeight()})},f=Dp(t),s=Lp(a,300),l=[t.onKeyup(function(){c(),s.throttle()}),t.onNodeChanged(u),t.onDomChanged(s.throttle),t.onDomChanged(u),t.onScrollToCursor(function(n){n.preventDefault(),s.throttle()}),t.onScrollToElement(function(n){n.element,e(r,i)}),t.onToEditing(function(){r.run(function(n){n.toEditing()})}),t.onToReading(function(){r.run(function(n){n.toReading()})}),Hg(t.doc,"touchend",function(n){ve(t.html,n.target)||ve(t.body,n.target)}),Hg(o,"transitionend",function(n){var e;"height"===n.raw.propertyName&&(e=Li(o),r.run(function(n){n.setViewportOffset(e)}),u(),a())}),zg(o,"touchstart",function(n){var e;r.run(function(n){n.highlightSelection()}),e=n,r.run(function(n){n.onToolbarTouch(e)}),t.onTouchToolstrip()}),Hg(t.body,"touchstart",function(n){c(),t.onTouchContent(),f.fireTouchstart(n)}),f.onTouchmove(),f.onTouchend(),Hg(t.body,"click",function(n){n.kill()}),Hg(o,"touchmove",function(){t.onToolbarScrollStart()})];return{destroy:function(){P(l,function(n){n.unbind()})}}};var Uh,Wh,Xh,qh,Yh={},Kh={exports:Yh};Uh=undefined,Wh=Yh,Xh=Kh,qh=undefined,function(n){"object"==typeof Wh&&void 0!==Xh?Xh.exports=n():"function"==typeof Uh&&Uh.amd?Uh([],n):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).EphoxContactWrapper=n()}(function(){return function s(i,u,c){function a(e,n){if(!u[e]){if(!i[e]){var t="function"==typeof qh&&qh;if(!n&&t)return t(e,!0);if(f)return f(e,!0);var r=new Error("Cannot find module '"+e+"'");throw r.code="MODULE_NOT_FOUND",r}var o=u[e]={exports:{}};i[e][0].call(o.exports,function(n){return a(i[e][1][n]||n)},o,o.exports,s,i,u,c)}return u[e].exports}for(var f="function"==typeof qh&&qh,n=0;n<c.length;n++)a(c[n]);return a}({1:[function(n,e,t){var r,o,i=e.exports={};function u(){throw new Error("setTimeout has not been defined")}function c(){throw new Error("clearTimeout has not been defined")}function a(n){if(r===setTimeout)return setTimeout(n,0);if((r===u||!r)&&setTimeout)return r=setTimeout,setTimeout(n,0);try{return r(n,0)}catch(e){try{return r.call(null,n,0)}catch(e){return r.call(this,n,0)}}}!function(){try{r="function"==typeof setTimeout?setTimeout:u}catch(n){r=u}try{o="function"==typeof clearTimeout?clearTimeout:c}catch(n){o=c}}();var f,s=[],l=!1,d=-1;function m(){l&&f&&(l=!1,f.length?s=f.concat(s):d=-1,s.length&&g())}function g(){if(!l){var n=a(m);l=!0;for(var e=s.length;e;){for(f=s,s=[];++d<e;)f&&f[d].run();d=-1,e=s.length}f=null,l=!1,function(n){if(o===clearTimeout)return clearTimeout(n);if((o===c||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(n);try{o(n)}catch(e){try{return o.call(null,n)}catch(e){return o.call(this,n)}}}(n)}}function p(n,e){this.fun=n,this.array=e}function h(){}i.nextTick=function(n){var e=new Array(arguments.length-1);if(1<arguments.length)for(var t=1;t<arguments.length;t++)e[t-1]=arguments[t];s.push(new p(n,e)),1!==s.length||l||a(g)},p.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=h,i.addListener=h,i.once=h,i.off=h,i.removeListener=h,i.removeAllListeners=h,i.emit=h,i.prependListener=h,i.prependOnceListener=h,i.listeners=function(n){return[]},i.binding=function(n){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(n){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},{}],2:[function(n,l,e){(function(e){function r(){}function u(n){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof n)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=undefined,this._deferreds=[],s(n,this)}function o(r,o){for(;3===r._state;)r=r._value;0!==r._state?(r._handled=!0,u._immediateFn(function(){var n,e=1===r._state?o.onFulfilled:o.onRejected;if(null!==e){try{n=e(r._value)}catch(t){return void c(o.promise,t)}i(o.promise,n)}else(1===r._state?i:c)(o.promise,r._value)})):r._deferreds.push(o)}function i(n,e){try{if(e===n)throw new TypeError("A promise cannot be resolved with itself.");if(e&&("object"==typeof e||"function"==typeof e)){var t=e.then;if(e instanceof u)return n._state=3,n._value=e,void a(n);if("function"==typeof t)return void s((r=t,o=e,function(){r.apply(o,arguments)}),n)}n._state=1,n._value=e,a(n)}catch(i){c(n,i)}var r,o}function c(n,e){n._state=2,n._value=e,a(n)}function a(n){2===n._state&&0===n._deferreds.length&&u._immediateFn(function(){n._handled||u._unhandledRejectionFn(n._value)});for(var e=0,t=n._deferreds.length;e<t;e++)o(n,n._deferreds[e]);n._deferreds=null}function f(n,e,t){this.onFulfilled="function"==typeof n?n:null,this.onRejected="function"==typeof e?e:null,this.promise=t}function s(n,e){var t=!1;try{n(function(n){t||(t=!0,i(e,n))},function(n){t||(t=!0,c(e,n))})}catch(r){if(t)return;t=!0,c(e,r)}}var n,t;n=this,t=setTimeout,u.prototype["catch"]=function(n){return this.then(null,n)},u.prototype.then=function(n,e){var t=new this.constructor(r);return o(this,new f(n,e,t)),t},u.all=function(n){var a=Array.prototype.slice.call(n);return new u(function(o,i){if(0===a.length)return o([]);var u=a.length;for(var n=0;n<a.length;n++)!function c(e,n){try{if(n&&("object"==typeof n||"function"==typeof n)){var t=n.then;if("function"==typeof t)return void t.call(n,function(n){c(e,n)},i)}a[e]=n,0==--u&&o(a)}catch(r){i(r)}}(n,a[n])})},u.resolve=function(e){return e&&"object"==typeof e&&e.constructor===u?e:new u(function(n){n(e)})},u.reject=function(t){return new u(function(n,e){e(t)})},u.race=function(o){return new u(function(n,e){for(var t=0,r=o.length;t<r;t++)o[t].then(n,e)})},u._immediateFn="function"==typeof e?function(n){e(n)}:function(n){t(n,0)},u._unhandledRejectionFn=function(n){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",n)},u._setImmediateFn=function(n){u._immediateFn=n},u._setUnhandledRejectionFn=function(n){u._unhandledRejectionFn=n},void 0!==l&&l.exports?l.exports=u:n.Promise||(n.Promise=u)}).call(this,n("timers").setImmediate)},{timers:3}],3:[function(a,n,f){(function(n,e){var r=a("process/browser.js").nextTick,t=Function.prototype.apply,o=Array.prototype.slice,i={},u=0;function c(n,e){this._id=n,this._clearFn=e}f.setTimeout=function(){return new c(t.call(setTimeout,window,arguments),clearTimeout)},f.setInterval=function(){return new c(t.call(setInterval,window,arguments),clearInterval)},f.clearTimeout=f.clearInterval=function(n){n.close()},c.prototype.unref=c.prototype.ref=function(){},c.prototype.close=function(){this._clearFn.call(window,this._id)},f.enroll=function(n,e){clearTimeout(n._idleTimeoutId),n._idleTimeout=e},f.unenroll=function(n){clearTimeout(n._idleTimeoutId),n._idleTimeout=-1},f._unrefActive=f.active=function(n){clearTimeout(n._idleTimeoutId);var e=n._idleTimeout;0<=e&&(n._idleTimeoutId=setTimeout(function(){n._onTimeout&&n._onTimeout()},e))},f.setImmediate="function"==typeof n?n:function(n){var e=u++,t=!(arguments.length<2)&&o.call(arguments,1);return i[e]=!0,r(function(){i[e]&&(t?n.apply(null,t):n.call(null),f.clearImmediate(e))}),e},f.clearImmediate="function"==typeof e?e:function(n){delete i[n]}}).call(this,a("timers").setImmediate,a("timers").clearImmediate)},{"process/browser.js":1,timers:3}],4:[function(n,e,t){var r=n("promise-polyfill"),o="undefined"!=typeof window?window:Function("return this;")();e.exports={boltExport:o.Promise||r}},{"promise-polyfill":2}]},{},[4])(4)});var Jh,Qh=Kh.exports.boltExport,Zh=function(n){var t=T.none(),e=[],r=function(n){o()?u(n):e.push(n)},o=function(){return t.isSome()},i=function(n){P(n,u)},u=function(e){t.each(function(n){setTimeout(function(){e(n)},0)})};return n(function(n){o()||(t=T.some(n),i(e),e=[])}),{get:r,map:function(t){return Zh(function(e){r(function(n){e(t(n))})})},isReady:o}},nv={nu:Zh,pure:function(e){return Zh(function(n){n(e)})}},ev=function(n){setTimeout(function(){throw n},0)},tv=function(t){var n=function(n){t().then(n,ev)};return{map:function(n){return tv(function(){return t().then(n)})},bind:function(e){return tv(function(){return t().then(function(n){return e(n).toPromise()})})},anonBind:function(n){return tv(function(){return t().then(function(){return n.toPromise()})})},toLazy:function(){return nv.nu(n)},toCached:function(){var n=null;return tv(function(){return null===n&&(n=t()),n})},toPromise:t,get:n}},rv=function(n){return tv(function(){return new Qh(n)})},ov=function(n){return tv(function(){return Qh.resolve(n)})},iv=function(r,o){return Q([{width:320,height:480,keyboard:{portrait:300,landscape:240}},{width:320,height:568,keyboard:{portrait:300,landscape:240}},{width:375,height:667,keyboard:{portrait:305,landscape:240}},{width:414,height:736,keyboard:{portrait:320,landscape:240}},{width:768,height:1024,keyboard:{portrait:320,landscape:400}},{width:1024,height:1366,keyboard:{portrait:380,landscape:460}}],function(n){return e=r<=n.width&&o<=n.height,t=n.keyboard,e?T.some(t):T.none();var e,t}).getOr({portrait:o/5,landscape:r/4})},uv=function(n){var e,t=Gg(n).isPortrait(),r=iv((e=n).screen.width,e.screen.height),o=t?r.portrait:r.landscape;return(t?n.screen.height:n.screen.width)-n.innerHeight>o?0:o},cv=function(n,e){var t=Te(n).dom.defaultView;return Li(n)+Li(e)-uv(t)},av=function(n,e,t){var r=cv(e,t),o=Li(e)+Li(t)-r;Ri(n,"padding-bottom",o+"px")},fv=Ut([{fixed:["element","property","offsetY"]},{scroller:["element","offsetY"]}]),sv="data-"+Ti("position-y-fixed"),lv="data-"+Ti("y-property"),dv="data-"+Ti("scrolling"),mv="data-"+Ti("last-window-height"),gv=function(n){return Fp(n,sv)},pv=function(n,e){var t=lt(n,lv);return fv.fixed(n,t,e)},hv=function(n,e){return fv.scroller(n,e)},vv=function(n){var e=gv(n);return("true"===lt(n,dv)?hv:pv)(n,e)},yv=function(n,e,t){var r=Te(n).dom.defaultView.innerHeight;return ft(n,mv,r+"px"),r-e-t},bv=function(r,o,i,u){var e=Te(r).dom.defaultView,n=function(n){var e=lt(n,"style");Vi(n,{position:"absolute",top:"0px"}),ft(n,sv,"0px"),ft(n,lv,"top");return{restore:function(){ft(n,"style",e||""),gt(n,sv),gt(n,lv)}}}(i),t=Li(i),c=Li(u),a=function(n,e,t){var r=lt(t,"style");wg(t),Vi(t,{position:"absolute",height:e+"px",width:"100%",top:n+"px"}),ft(t,sv,n+"px"),ft(t,dv,"true"),ft(t,lv,"top");return{restore:function(){Sg(t),ft(t,"style",r||""),gt(t,sv),gt(t,dv),gt(t,lv)}}}(t,yv(r,t,c),r),f=function(n){var e=lt(n,"style");Vi(n,{position:"absolute",bottom:"0px"}),ft(n,sv,"0px"),ft(n,lv,"bottom");return{restore:function(){ft(n,"style",e||""),gt(n,sv),gt(n,lv)}}}(u),s=!0,l=function(){var n=e.innerHeight;return Fp(r,mv)<n},d=function(){var n,e,t;s&&(n=Li(i),e=Li(u),t=yv(r,n,e),ft(r,sv,n+"px"),Ri(r,"height",t+"px"),av(o,r,u))};return av(o,r,u),{setViewportOffset:function(n){ft(r,sv,n+"px"),d()},isExpanding:l,isShrinking:m(l),refresh:d,restore:function(){s=!1,n.restore(),a.restore(),f.restore()}}},xv=(Jh=null,{animate:function(o,i,u,c,e,n){var a=!1,f=function(n){a=!0,e(n)};Lg.clearInterval(Jh);var s=function(n){Lg.clearInterval(Jh),f(n)};Jh=Lg.setInterval(function(){var n,e,t,r=o();n=r,e=i,t=u,(Math.abs(n-e)<=t?T.none():n<e?T.some(n+t):T.some(n-t)).fold(function(){Lg.clearInterval(Jh),f(i)},function(n){var e;c(n,s),a||((e=o())!==n||Math.abs(e-i)>Math.abs(r-i))&&(Lg.clearInterval(Jh),f(i))})},n)}}),wv="data-"+Ti("last-scroll-top"),Sv=function(n){var e=ji(n,"top").getOr("0");return parseInt(e,10)},Ov=function(n){return parseInt(n.dom.scrollTop,10)},Tv=function(o,i){return rv(function(n){var e=b(Ov,o);ft(o,wv,e());var t=Math.abs(i-e()),r=Math.ceil(t/10);xv.animate(e,i,r,function(n,e){Fp(o,wv)!==o.dom.scrollTop?e(o.dom.scrollTop):(o.dom.scrollTop=n,ft(o,wv,n))},function(){o.dom.scrollTop=i,ft(o,wv,i),n(i)},10)})},kv=function(n,e){var t=e+gv(n)+"px";Ri(n,"top",t)};var Ev=function(u,n){return n(function(r){var o=[],i=0;0===u.length?r([]):P(u,function(n,e){var t;n.get((t=e,function(n){o[t]=n,++i>=u.length&&r(o)}))})})},Cv=function(n,e,t){var r,o,i,u=e+t,c=ji(n,"top").getOr(t),a=u-parseInt(c,10),f=n.dom.scrollTop+a;return r=n,o=f,i=u,rv(function(n){var e=b(Ov,r);xv.animate(e,o,15,function(n){r.dom.scrollTop=n,Ri(r,"top",Sv(r)+15+"px")},function(){r.dom.scrollTop=o,Ri(r,"top",i+"px"),n(o)},10)})},Mv=function(n,o){return n.fold(function(n,e,t){return Ri(n,e,o+(r=t)+"px"),ov(r);var r},function(n,e){return Cv(n,o,e)})},Dv=function(n,e){var t,r=(t=Ui(n,"["+sv+"]"),N(t,vv)),o=N(r,function(n){return Mv(n,e)});return Ev(o,rv)},_v=function(i,u,n,t,e,r){var o,c,a=(o=function(n){return t=u,r=n,o=Te(e=i).dom.defaultView,rv(function(n){kv(e,r),kv(t,r),o.scrollTo(0,r),n(r)});var e,t,r,o},c=ko(nv.pure({})),{start:function(e){var n=nv.nu(function(n){return o(e).get(n)});c.set(n)},idle:function(n){c.get().get(function(){n()})}}),f=Lp(function(){a.idle(function(){Dv(n,t.pageYOffset).get(function(){var n;(n=Bp(r),T.from(n[0]).bind(function(n){var e=n.top-u.dom.scrollTop;return e>t.innerHeight+5||e<-5?T.some({top:e,bottom:e+n.height}):T.none()})).each(function(n){u.dom.scrollTop=u.dom.scrollTop+n.top}),a.start(0),e.refresh()})})},1e3),s=Hg(de.fromDom(t),"scroll",function(){t.pageYOffset<0||f.throttle()});return Dv(n,t.pageYOffset).get(v),{unbind:s.unbind}},Iv=function(n){var a=n.cWin,e=n.ceBody,f=n.socket,t=n.toolstrip,r=n.contentElement,o=n.keyboardType,i=n.outerWindow,s=n.dropup,u=n.outerBody,c=bv(f,e,t,s),l=o(u,a,Ge(),r),d=$g(i,{onChange:O,onReady:c.refresh});d.onAdjustment(function(){c.refresh()});var m=Hg(de.fromDom(i),"resize",function(){c.isExpanding()&&c.refresh()}),g=_v(t,f,u,i,c,a),p=function(t,e){var n=t.document,r=de.fromTag("div");bt(r,Ti("unfocused-selections")),Fe(de.fromDom(n.documentElement),r);var o=Hg(r,"touchstart",function(n){n.prevent(),Lh(t,e),u()}),i=function(n){var e=de.fromTag("span");return Tm(e,[Ti("layer-editor"),Ti("unfocused-selection")]),Vi(e,{left:n.left+"px",top:n.top+"px",width:n.width+"px",height:n.height+"px"}),e},u=function(){Ve(r)};return{update:function(){u();var n=Bp(t),e=N(n,i);Re(r,e)},isActive:function(){return 0<Ce(r).length},destroy:function(){o.unbind(),Be(r)},clear:u}}(a,r),h=function(){p.clear()};return{toEditing:function(){l.toEditing(),h()},toReading:function(){l.toReading()},onToolbarTouch:function(n){l.onToolbarTouch()},refreshSelection:function(){p.isActive()&&p.update()},clearSelection:h,highlightSelection:function(){p.update()},scrollIntoView:function(n,e){var t,r,o,i,u,c;t=a,o=n,i=e,u=cv(r=f,s),c=b(zh,t),u<o||u<i?Tv(r,r.dom.scrollTop-u+i).get(c):o<0&&Tv(r,r.dom.scrollTop+o).get(c)},updateToolbarPadding:O,setViewportOffset:function(n){var i,u;c.setViewportOffset(n),i=f,u=n,rv(function(n){var e=b(Sv,i),t=function(n){Ri(i,"top",n+"px")},r=Math.abs(u-e()),o=Math.ceil(r/10);xv.animate(e,u,o,t,function(){t(u),n(u)},10)}).get(v)},syncHeight:function(){Ri(r,"height",r.dom.contentWindow.document.body.scrollHeight+"px")},refreshStructure:c.refresh,destroy:function(){c.restore(),d.destroy(),g.unbind(),m.unbind(),l.destroy(),p.destroy(),Hh(Ge(),Co)}}},Fv=function(r,n){var o=xp(),i=im(),u=im(),c=om(),a=om();return{enter:function(){n.hide();var t=de.fromDom(document);yp(r.editor).each(function(n){var e;i.set({socketHeight:ji(r.socket,"height"),iframeHeight:ji(n.frame,"height"),outerScroll:document.body.scrollTop}),u.set({exclusives:(e="."+Og,Hg(t,"touchmove",function(n){Zi(n.target,e).filter(nh).fold(function(){n.prevent()},O)}))}),bt(r.container,Ti("fullscreen-maximized")),kp(r.container,n.body),o.maximize(),Ri(r.socket,"overflow","scroll"),Ri(r.socket,"-webkit-overflow-scrolling","touch"),Eo(n.body),c.set(Iv({cWin:n.win,ceBody:n.body,socket:r.socket,toolstrip:r.toolstrip,dropup:r.dropup.element,contentElement:n.frame,outerBody:r.body,outerWindow:r.win,keyboardType:Gh})),c.run(function(n){n.syncHeight()}),a.set($h(n,c,r.toolstrip,r.socket,r.dropup))})},refreshStructure:function(){c.run(function(n){n.refreshStructure()})},exit:function(){o.restore(),a.clear(),c.clear(),n.show(),i.on(function(n){n.socketHeight.each(function(n){Ri(r.socket,"height",n)}),n.iframeHeight.each(function(n){Ri(r.editor.getFrame(),"height",n)}),document.body.scrollTop=n.scrollTop}),i.clear(),u.on(function(n){n.exclusives.unbind()}),u.clear(),wt(r.container,Ti("fullscreen-maximized")),Ep(),Sg(r.toolbar),Ni(r.socket,"overflow"),Ni(r.socket,"-webkit-overflow-scrolling"),Co(r.editor.getFrame()),yp(r.editor).each(function(n){n.clearSelection()})}}};function Rv(n){var e=Ph({classes:[Ti("ios-container")]}),t=eh(),r=om(),o=th(r),i=rh(),u=Oh(function(){r.run(function(n){n.refreshStructure()})},n);e.add(t.wrapper),e.add(i),e.add(u.component);return{system:e,element:e.element,init:function(n){r.set(function(n){var e=_r("Getting IosWebapp schema",Up,n);Ri(e.toolstrip,"width","100%"),Ri(e.container,"position","relative");var t=Bm(Gp(function(){e.setReadOnly(e.readOnlyOnInit()),o.enter()},e.translate));e.alloy.add(t);var r={show:function(){e.alloy.add(t)},hide:function(){e.alloy.remove(t)}},o=Fv(e,r);return{setReadOnly:e.setReadOnly,refreshStructure:o.refreshStructure,enter:o.enter,exit:o.exit,destroy:O}}(n))},exit:function(){r.run(function(n){og.remove(i,o),n.exit()})},setToolbarGroups:function(n){var e=t.createGroups(n);t.setGroups(e)},setContextToolbar:function(n){var e=t.createGroups(n);t.setContextToolbar(e)},focusToolbar:function(){t.focus()},restoreToolbar:function(){t.restoreToolbar()},updateMode:function(n){uh(i,o,n,e.root)},socket:i,dropup:u}}var Vv=tinymce.util.Tools.resolve("tinymce.EditorManager"),Bv=function(n,e,t){n.system.broadcastOn([Vo],{command:e,state:t})},Av=function(e){return function(){var n=function(){e._skinLoaded=!0,e.fire("SkinLoaded")};e.initialized?n():e.on("init",n)}},jv="toReading",Nv="toEditing",Pv=function(S){return{getNotificationManagerImpl:function(){return{open:y({progressBar:{value:O},close:O,text:O,getEl:y(null),moveTo:O,moveRel:O,settings:{}}),close:O,reposition:O,getArgs:y({})}},renderUI:function(){var n,e,t,r=S.getElement(),o=(n=S,{content:(e=T.from(n.getParam("skin_url")).fold(function(){return Vv.baseURL+"/skins/ui/oxide"},function(n){return n}))+"/content.mobile.min.css",ui:e+"/skin.mobile.min.css"});!1==(!1===S.getParam("skin"))?(t=_o.DOM.styleSheetLoader,S.contentCSS.push(o.content),t.load(o.ui,Av(S)),S.on("remove",function(){return t.unload(o.ui)})):Av(S)();var i,u,c,a,f,s,l,d,m,g=function(){S.fire("ScrollIntoView")},p=Mn().os.isAndroid()?(i=g,u=Ph({classes:[Ti("android-container")]}),c=eh(),a=om(),f=th(a),s=rh(),l=Oh(O,i),u.add(c.wrapper),u.add(s),u.add(l.component),{system:u,element:u.element,init:function(n){a.set(Wp(n))},exit:function(){a.run(function(n){n.exit(),og.remove(s,f)})},setToolbarGroups:function(n){var e=c.createGroups(n);c.setGroups(e)},setContextToolbar:function(n){var e=c.createGroups(n);c.setContextToolbar(e)},focusToolbar:function(){c.focus()},restoreToolbar:function(){c.restoreToolbar()},updateMode:function(n){uh(s,f,n,u.root)},socket:s,dropup:l}):Rv(g),h=de.fromDom(r);d=h,m=p.system,Je(d,m,_e);var v=r.ownerDocument.defaultView,y=$g(v,{onChange:function(){var n,e,t;p.system.broadcastOn([Bo],{width:(n=v,e=Mn().os.isiOS(),t=Gg(n).isPortrait(),e&&!t?n.screen.height:n.screen.width)})},onReady:O}),b=function(n,e,t,r){!1===r&&S.selection.collapse();var o=x(n,e,t);p.setToolbarGroups(!0===r?o.readOnly:o.main),S.setMode(!0===r?"readonly":"design"),S.fire(!0===r?jv:Nv),p.updateMode(r)},x=function(n,e,t){var r=n.get();return{readOnly:r.backToMask.concat(e.get()),main:r.backToMask.concat(t.get())}},w=function(n,e){return S.on(n,e),{unbind:function(){S.off(n)}}};return S.on("init",function(){p.init({editor:{getFrame:function(){return de.fromDom(S.contentAreaContainer.querySelector("iframe"))},onDomChanged:function(){return{unbind:O}},onToReading:function(n){return w(jv,n)},onToEditing:function(n){return w(Nv,n)},onScrollToCursor:function(e){S.on("ScrollIntoView",function(n){e(n)});return{unbind:function(){S.off("ScrollIntoView"),y.destroy()}}},onTouchToolstrip:function(){u()},onTouchContent:function(){var n=de.fromDom(S.editorContainer.querySelector("."+Ti("toolbar")));Do(n).bind(function(n){return p.system.getByDom(n).toOptional()}).each(ae),p.restoreToolbar(),u()},onTapContent:function(n){var e=n.target;"img"===ye(e)?(S.selection.select(e.dom),n.kill()):"a"===ye(e)&&p.system.getByDom(de.fromDom(S.editorContainer)).each(function(n){To.isAlpha(n)&&function(n){var e=document.createElement("a");e.target="_blank",e.href=n.href,e.rel="noreferrer noopener";var t=document.createEvent("MouseEvents");t.initMouseEvent("click",!0,!0,window,0,0,0,0,0,!1,!1,!1,!1,0,null),document.body.appendChild(e),e.dispatchEvent(t),document.body.removeChild(e)}(e.dom)})}},container:de.fromDom(S.editorContainer),socket:de.fromDom(S.contentAreaContainer),toolstrip:de.fromDom(S.editorContainer.querySelector("."+Ti("toolstrip"))),toolbar:de.fromDom(S.editorContainer.querySelector("."+Ti("toolbar"))),dropup:p.dropup,alloy:p.system,translate:O,setReadOnly:function(n){b(g,m,d,n)},readOnlyOnInit:function(){return!1}});var t,n,r,o,i,e,u=function(){p.dropup.disappear(function(){p.system.broadcastOn([Ao],{})})},c={label:"The first group",scrollable:!1,items:[zf("back",function(){S.selection.collapse(),p.exit()},{},S)]},a={label:"Back to read only",scrollable:!1,items:[zf("readonly-back",function(){b(g,m,d,!0)},{},S)]},f=Bg(p,S),s=(t=f,n=Vg(S),r={},W(n,function(n){var e=!ct(r,n)&&ct(t,n)&&t[n].isSupported()?[t[n].sketch()]:[];return r[n]=!0,e})),l={label:"The extra group",scrollable:!1,items:[]},d=ko([{label:"the action group",scrollable:!0,items:s},l]),m=ko([{label:"The read only mode group",scrollable:!0,items:[]},l]),g=ko({backToMask:[c],backToReadOnly:[a]});o=p,e=Qe((i=S).formatter.get()),P(e,function(e){i.formatter.formatChanged(e,function(n){Bv(o,e,n)})}),P(["ul","ol"],function(t){i.selection.selectorChanged(t,function(n,e){Bv(o,t,n)})})}),S.on("remove",function(){p.exit()}),S.on("detach",function(){var e,n;e=p.system,n=Ce(e.element),P(n,function(n){e.getByDom(n).each(Ue)}),Be(e.element),p.system.destroy()}),{iframeContainer:p.socket.element.dom,editorContainer:p.element.dom}}}};Io.add("mobile",Pv)}();
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/themes/modern/theme.min.js b/cps/static/js/libs/tinymce/themes/modern/theme.min.js
deleted file mode 100755
index 524b421e8..000000000
--- a/cps/static/js/libs/tinymce/themes/modern/theme.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){var a={},b=function(b){for(var c=a[b],e=c.deps,f=c.defn,g=e.length,h=new Array(g),i=0;i<g;++i)h[i]=d(e[i]);var j=f.apply(null,h);if(void 0===j)throw"module ["+b+"] returned undefined";c.instance=j},c=function(b,c,d){if("string"!=typeof b)throw"module id must be a string";if(void 0===c)throw"no dependencies for "+b;if(void 0===d)throw"no definition function for "+b;a[b]={deps:c,defn:d,instance:void 0}},d=function(c){var d=a[c];if(void 0===d)throw"module ["+c+"] was undefined";return void 0===d.instance&&b(c),d.instance},e=function(a,b){for(var c=a.length,e=new Array(c),f=0;f<c;++f)e.push(d(a[f]));b.apply(null,b)},f={};f.bolt={module:{api:{define:c,require:e,demand:d}}};var g=c,h=function(a,b){g(a,[],function(){return b})};h("1",window),h("a",tinymce.util.Tools.resolve),g("2",["a"],function(a){return a("tinymce.AddOnManager")}),g("3",["a"],function(a){return a("tinymce.EditorManager")}),g("4",["a"],function(a){return a("tinymce.Env")}),g("5",["a"],function(a){return a("tinymce.ui.Api")}),g("b",["a"],function(a){return a("tinymce.dom.DOMUtils")}),g("c",["a"],function(a){return a("tinymce.ui.Factory")}),g("d",["a"],function(a){return a("tinymce.util.Tools")}),g("e",[],function(){var a=function(a,b){return function(){var c=a.find(b)[0];c&&c.focus(!0)}},b=function(b,c){b.shortcuts.add("Alt+F9","",a(c,"menubar")),b.shortcuts.add("Alt+F10,F10","",a(c,"toolbar")),b.shortcuts.add("Alt+F11","",a(c,"elementpath")),c.on("cancel",function(){b.focus()})};return{addKeys:b}}),g("f",["b"],function(a){var b=a.DOM,c=function(a,c,d){return function(){var e=a.getContentAreaContainer().querySelector("iframe").offsetWidth,f=Math.max(e-a.getDoc().documentElement.offsetWidth,0);b.setStyle(c,"right",f+"px"),d?b.setStyle(c,"top","-16px"):b.setStyle(c,"bottom","1px")}},d=function(a){return function(){b.hide(a)}},e=function(a,b,d){c(a,b,d)(),a.on("NodeChange ResizeEditor",c(a,b,d))},f=function(a,b,c){c.appendChild(b),e(a,b,!0)},g=function(a,b){a.getContainer().appendChild(b),e(a,b,!1)},h=function(a){a.on("SkinLoaded",function(){var c=b.create("div",{"class":"mce-branding-powered-by"}),e=a.getContainer().querySelector(".mce-statusbar");e?f(a,c,e):g(a,c),b.bind(c,"click",d(c))})},i=function(a){a.settings.branding!==!1&&h(a)};return{setup:i}}),g("n",["a"],function(a){return a("tinymce.util.Delay")}),g("o",["a"],function(a){return a("tinymce.geom.Rect")}),g("k",["d","c"],function(a,b){var c="undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",d=function(c,d,e){var f,g=[];if(d)return a.each(d.split(/[ ,]/),function(a){var d,h=function(){var b=c.selection;a.settings.stateSelector&&b.selectorChanged(a.settings.stateSelector,function(b){a.active(b)},!0),a.settings.disabledStateSelector&&b.selectorChanged(a.settings.disabledStateSelector,function(b){a.disabled(b)})};"|"==a?f=null:(f||(f={type:"buttongroup",items:[]},g.push(f)),c.buttons[a]&&(d=a,a=c.buttons[d],"function"==typeof a&&(a=a()),a.type=a.type||"button",a.size=e,a=b.create(a),f.items.push(a),c.initialized?h():c.on("init",h)))}),{type:"toolbar",layout:"flow",items:g}},e=function(b,e){var f=[],g=b.settings,h=function(a){if(a)return f.push(d(b,a,e)),!0};if(a.isArray(g.toolbar)){if(0===g.toolbar.length)return;a.each(g.toolbar,function(a,b){g["toolbar"+(b+1)]=a}),delete g.toolbar}for(var i=1;i<10&&h(g["toolbar"+i]);i++);if(f.length||g.toolbar===!1||h(g.toolbar||c),f.length)return{type:"panel",layout:"stack",classes:"toolbar-grp",ariaRoot:!0,ariaRemember:!0,items:f}};return{createToolbar:d,createToolbars:e}}),g("g",["b","d","n","c","o","k"],function(a,b,c,d,e,f){var g=a.DOM,h=function(a){return{left:a.x,top:a.y,width:a.w,height:a.h,right:a.x+a.w,bottom:a.y+a.h}},i=function(a){b.each(a.contextToolbars,function(a){a.panel&&a.panel.hide()})},j=function(a,b){a.moveTo(b.left,b.top)},k=function(a,c,d){c=c?c.substr(0,2):"",b.each({t:"down",b:"up"},function(b,e){a.classes.toggle("arrow-"+b,d(e,c.substr(0,1)))}),b.each({l:"left",r:"right"},function(b,e){a.classes.toggle("arrow-"+b,d(e,c.substr(1,1)))})},l=function(a,b,c,d,e,f){return f=h({x:b,y:c,w:f.w,h:f.h}),a&&(f=a({elementRect:h(d),contentAreaRect:h(e),panelRect:f})),f},m=function(a){var h,m=a.settings,n=function(){return a.contextToolbars||[]},o=function(b){var c,d,e;return c=g.getPos(a.getContentAreaContainer()),d=a.dom.getRect(b),e=a.dom.getRoot(),"BODY"===e.nodeName&&(d.x-=e.ownerDocument.documentElement.scrollLeft||e.scrollLeft,d.y-=e.ownerDocument.documentElement.scrollTop||e.scrollTop),d.x+=c.x,d.y+=c.y,d},p=function(b,c){var d,f,h,n,p,q,r,s,t=m.inline_toolbar_position_handler;if(!a.removed){if(!b||!b.toolbar.panel)return void i(a);r=["bc-tc","tc-bc","tl-bl","bl-tl","tr-br","br-tr"],p=b.toolbar.panel,c&&p.show(),h=o(b.element),f=g.getRect(p.getEl()),n=g.getRect(a.getContentAreaContainer()||a.getBody()),s=25,"inline"!==g.getStyle(b.element,"display",!0)&&(h.w=b.element.clientWidth,h.h=b.element.clientHeight),a.inline||(n.w=a.getDoc().documentElement.offsetWidth),a.selection.controlSelection.isResizable(b.element)&&h.w<s&&(h=e.inflate(h,0,8)),d=e.findBestRelativePosition(f,h,n,r),h=e.clamp(h,n),d?(q=e.relativePosition(f,h,d),j(p,l(t,q.x,q.y,h,n,f))):(n.h+=f.h,h=e.intersect(n,h),h?(d=e.findBestRelativePosition(f,h,n,["bc-tc","bl-tl","br-tr"]),d?(q=e.relativePosition(f,h,d),j(p,l(t,q.x,q.y,h,n,f))):j(p,l(t,h.x,h.y,h,n,f))):p.hide()),k(p,d,function(a,b){return a===b})}},q=function(b){return function(){var d=function(){a.selection&&p(u(a.selection.getNode()),b)};c.requestAnimationFrame(d)}},r=function(){h||(h=a.selection.getScrollContainer()||a.getWin(),g.bind(h,"scroll",q(!0)),a.on("remove",function(){g.unbind(h,"scroll")}))},s=function(b){var c;return b.toolbar.panel?(b.toolbar.panel.show(),void p(b)):(r(),c=d.create({type:"floatpanel",role:"dialog",classes:"tinymce tinymce-inline arrow",ariaLabel:"Inline toolbar",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!0,border:1,items:f.createToolbar(a,b.toolbar.items),oncancel:function(){a.focus()}}),b.toolbar.panel=c,c.renderTo(document.body).reflow(),void p(b))},t=function(){b.each(n(),function(a){a.panel&&a.panel.hide()})},u=function(b){var c,d,e,f=n();for(e=a.$(b).parents().add(b),c=e.length-1;c>=0;c--)for(d=f.length-1;d>=0;d--)if(f[d].predicate(e[c]))return{toolbar:f[d],element:e[c]};return null};a.on("click keyup setContent ObjectResized",function(b){("setcontent"!==b.type||b.selection)&&c.setEditorTimeout(a,function(){var b;b=u(a.selection.getNode()),b?(t(),s(b)):t()})}),a.on("blur hide contextmenu",t),a.on("ObjectResizeStart",function(){var b=u(a.selection.getNode());b&&b.toolbar.panel&&b.toolbar.panel.hide()}),a.on("ResizeEditor ResizeWindow",q(!0)),a.on("nodeChange",q(!1)),a.on("remove",function(){b.each(n(),function(a){a.panel&&a.panel.remove()}),a.contextToolbars={}}),a.shortcuts.add("ctrl+shift+e > ctrl+shift+p","",function(){var b=u(a.selection.getNode());b&&b.toolbar.panel&&b.toolbar.panel.items()[0].focus()})};return{addContextualToolbars:m}}),g("h",["d"],function(a){var b={file:{title:"File",items:"newdocument"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall"},insert:{title:"Insert",items:"|"},view:{title:"View",items:"visualaid |"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript | formats | removeformat"},table:{title:"Table"},tools:{title:"Tools"}},c=function(a,b){var c;return"|"==b?{text:"|"}:c=a[b]},d=function(d,e,f){var g,h,i,j,k;if(k=a.makeMap((e.removed_menuitems||"").split(/[ ,]/)),e.menu?(h=e.menu[f],j=!0):h=b[f],h){g={text:h.title},i=[],a.each((h.items||"").split(/[ ,]/),function(a){var b=c(d,a);b&&!k[a]&&i.push(c(d,a))}),j||a.each(d,function(a){a.context==f&&("before"==a.separator&&i.push({text:"|"}),a.prependToContext?i.unshift(a):i.push(a),"after"==a.separator&&i.push({text:"|"}))});for(var l=0;l<i.length;l++)"|"==i[l].text&&(0!==l&&l!=i.length-1||i.splice(l,1));if(g.menu=i,!g.menu.length)return null}return g},e=function(a){var c,e=[],f=a.settings,g=[];if(f.menu)for(c in f.menu)g.push(c);else for(c in b)g.push(c);for(var h="string"==typeof f.menubar?f.menubar.split(/[ ,]/):g,i=0;i<h.length;i++){var j=h[i];j=d(a.menuItems,a.settings,j),j&&e.push(j)}return e};return{createMenuButtons:e}}),g("9",["b"],function(a){var b=a.DOM,c=function(a){return{width:a.clientWidth,height:a.clientHeight}},d=function(a,d,e){var f,g,h,i,j=a.settings;f=a.getContainer(),g=a.getContentAreaContainer().firstChild,h=c(f),i=c(g),null!==d&&(d=Math.max(j.min_width||100,d),d=Math.min(j.max_width||65535,d),b.setStyle(f,"width",d+(h.width-i.width)),b.setStyle(g,"width",d)),e=Math.max(j.min_height||100,e),e=Math.min(j.max_height||65535,e),b.setStyle(g,"height",e),a.fire("ResizeEditor")},e=function(a,b,c){var e=a.getContentAreaContainer();d(a,e.clientWidth+b,e.clientHeight+c)};return{resizeTo:d,resizeBy:e}}),g("i",["d","c","4"],function(a,b,c){var d=function(a){return{element:function(){return a}}},e=function(a,b,c){var e=a.settings[c];e&&e(d(b.getEl("body")))},f=function(b,c,d){a.each(d,function(a){var d=c.items().filter("#"+a.name)[0];d&&d.visible()&&a.name!==b&&(e(a,d,"onhide"),d.visible(!1))})},g=function(a){a.items().each(function(a){a.active(!1)})},h=function(b,c){return a.grep(b,function(a){return a.name===c})[0]},i=function(a,c,d){return function(i){var j=i.control,k=j.parents().filter("panel")[0],l=k.find("#"+c)[0],m=h(d,c);f(c,k,d),g(j.parent()),l&&l.visible()?(e(m,l,"onhide"),l.hide(),j.active(!1)):(l?(l.show(),e(m,l,"onshow")):(l=b.create({type:"container",name:c,layout:"stack",classes:"sidebar-panel",html:""}),k.prepend(l),e(m,l,"onrender"),e(m,l,"onshow")),j.active(!0)),a.fire("ResizeEditor")}},j=function(){return!c.ie||c.ie>=11},k=function(a){return!(!j()||!a.sidebars)&&a.sidebars.length>0},l=function(b){var c=a.map(b.sidebars,function(a){var c=a.settings;return{type:"button",icon:c.icon,image:c.image,tooltip:c.tooltip,onclick:i(b,a.name,b.sidebars)}});return{type:"panel",name:"sidebar",layout:"stack",classes:"sidebar",items:[{type:"toolbar",layout:"stack",classes:"sidebar-toolbar",items:c}]}};return{hasSidebar:k,createSidebar:l}}),g("j",[],function(){var a=function(a){var b=function(){a._skinLoaded=!0,a.fire("SkinLoaded")};return function(){a.initialized?b():a.on("init",b)}};return{fireSkinLoaded:a}}),g("6",["b","c","d","e","f","g","h","9","i","j","k"],function(a,b,c,d,e,f,g,h,i,j,k){var l=a.DOM,m=function(a){return function(b){a.find("*").disabled("readonly"===b.mode)}},n=function(a){return{type:"panel",name:"iframe",layout:"stack",classes:"edit-area",border:a,html:""}},o=function(a){return{type:"panel",layout:"stack",classes:"edit-aria-container",border:"1 0 0 0",items:[n("0"),i.createSidebar(a)]}},p=function(a,c,p){var q,r,s,t=a.settings;return p.skinUiCss&&l.styleSheetLoader.load(p.skinUiCss,j.fireSkinLoaded(a)),q=c.panel=b.create({type:"panel",role:"application",classes:"tinymce",style:"visibility: hidden",layout:"stack",border:1,items:[t.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:g.createMenuButtons(a)},k.createToolbars(a,t.toolbar_items_size),i.hasSidebar(a)?o(a):n("1 0 0 0")]}),t.resize!==!1&&(r={type:"resizehandle",direction:t.resize,onResizeStart:function(){var b=a.getContentAreaContainer().firstChild;s={width:b.clientWidth,height:b.clientHeight}},onResize:function(b){"both"===t.resize?h.resizeTo(a,s.width+b.deltaX,s.height+b.deltaY):h.resizeTo(a,null,s.height+b.deltaY)}}),t.statusbar!==!1&&q.add({type:"panel",name:"statusbar",classes:"statusbar",layout:"flow",border:"1 0 0 0",ariaRoot:!0,items:[{type:"elementpath",editor:a},r]}),a.fire("BeforeRenderUI"),a.on("SwitchMode",m(q)),q.renderBefore(p.targetNode).reflow(),t.readonly&&a.setMode("readonly"),p.width&&l.setStyle(q.getEl(),"width",p.width),a.on("remove",function(){q.remove(),q=null}),d.addKeys(a,q),f.addContextualToolbars(a),e.setup(a),{iframeContainer:q.find("#iframe")[0].getEl(),editorContainer:q.getEl()}};return{render:p}}),g("l",["a"],function(a){return a("tinymce.ui.FloatPanel")}),g("7",["d","c","b","l","k","h","g","e","j"],function(a,b,c,d,e,f,g,h,i){var j=function(a,j,k){var l,m,n=a.settings,o=c.DOM;n.fixed_toolbar_container&&(m=o.select(n.fixed_toolbar_container)[0]);var p=function(){if(l&&l.moveRel&&l.visible()&&!l._fixed){var b=a.selection.getScrollContainer(),c=a.getBody(),d=0,e=0;if(b){var f=o.getPos(c),g=o.getPos(b);d=Math.max(0,g.x-f.x),e=Math.max(0,g.y-f.y)}l.fixed(!1).moveRel(c,a.rtl?["tr-br","br-tr"]:["tl-bl","bl-tl","tr-br"]).moveBy(d,e)}},q=function(){l&&(l.show(),p(),o.addClass(a.getBody(),"mce-edit-focus"))},r=function(){l&&(l.hide(),d.hideAll(),o.removeClass(a.getBody(),"mce-edit-focus"))},s=function(){return l?void(l.visible()||q()):(l=j.panel=b.create({type:m?"panel":"floatpanel",role:"application",classes:"tinymce tinymce-inline",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!!m,border:1,items:[n.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:f.createMenuButtons(a)},e.createToolbars(a,n.toolbar_items_size)]}),a.fire("BeforeRenderUI"),l.renderTo(m||document.body).reflow(),h.addKeys(a,l),q(),g.addContextualToolbars(a),a.on("nodeChange",p),a.on("activate",q),a.on("deactivate",r),void a.nodeChanged())};return n.content_editable=!0,a.on("focus",function(){k.skinUiCss?o.styleSheetLoader.load(k.skinUiCss,s,s):s()}),a.on("blur hide",r),a.on("remove",function(){l&&(l.remove(),l=null)}),k.skinUiCss&&o.styleSheetLoader.load(k.skinUiCss,i.fireSkinLoaded(a)),{}};return{render:j}}),g("m",["a"],function(a){return a("tinymce.ui.Throbber")}),g("8",["m"],function(a){var b=function(b,c){var d;b.on("ProgressState",function(b){d=d||new a(c.panel.getEl("body")),b.state?d.show(b.time):d.hide()})};return{setup:b}}),g("0",["1","2","3","4","5","6","7","8","9"],function(a,b,c,d,e,f,g,h,i){var j=b.ThemeManager;e.appendTo(a.tinymce?a.tinymce:{});var k=function(a,b,d){var e=a.settings,i=e.skin!==!1&&(e.skin||"lightgray");if(i){var j=e.skin_url;j=j?a.documentBaseURI.toAbsolute(j):c.baseURL+"/skins/"+i,d.skinUiCss=j+"/skin.min.css",a.contentCSS.push(j+"/content"+(a.inline?".inline":"")+".min.css")}return h.setup(a,b),e.inline?g.render(a,b,d):f.render(a,b,d)};return j.add("modern",function(a){return{renderUI:function(b){return k(a,this,b)},resizeTo:function(b,c){return i.resizeTo(a,b,c)},resizeBy:function(b,c){return i.resizeBy(a,b,c)}}}),function(){}}),d("0")()}();
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/themes/silver/theme.min.js b/cps/static/js/libs/tinymce/themes/silver/theme.min.js
index c1cebd7a8..4579cb758 100644
--- a/cps/static/js/libs/tinymce/themes/silver/theme.min.js
+++ b/cps/static/js/libs/tinymce/themes/silver/theme.min.js
@@ -4,6 +4,6 @@
  * For LGPL see License.txt in the project root for license information.
  * For commercial licenses see https://www.tiny.cloud/
  *
- * Version: 5.7.1 (2021-03-17)
+ * Version: 5.10.0 (2021-10-11)
  */
-!function(){"use strict";var at=function(){},i=function(e,o){return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e(o.apply(null,t))}},ct=function(t){return function(){return t}},st=function(t){return t};function y(o){for(var r=[],t=1;t<arguments.length;t++)r[t-1]=arguments[t];return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];var e=r.concat(t);return o.apply(null,e)}}var x=function(n){return function(t){return!n(t)}},u=function(t){return function(){throw new Error(t)}},l=ct(!1),w=ct(!0),t=tinymce.util.Tools.resolve("tinymce.ThemeManager"),lt=function(){return(lt=Object.assign||function(t){for(var n,e=1,o=arguments.length;e<o;e++)for(var r in n=arguments[e])Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r]);return t}).apply(this,arguments)};function S(t,n){var e={};for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&n.indexOf(o)<0&&(e[o]=t[o]);if(null!=t&&"function"==typeof Object.getOwnPropertySymbols)for(var r=0,o=Object.getOwnPropertySymbols(t);r<o.length;r++)n.indexOf(o[r])<0&&Object.prototype.propertyIsEnumerable.call(t,o[r])&&(e[o[r]]=t[o[r]]);return e}function k(){for(var t=0,n=0,e=arguments.length;n<e;n++)t+=arguments[n].length;for(var o=Array(t),r=0,n=0;n<e;n++)for(var i=arguments[n],u=0,a=i.length;u<a;u++,r++)o[r]=i[u];return o}var n,e,o,r,c,a,s=function(){return f},f=(n=function(t){return t.isNone()},{fold:function(t,n){return t()},is:l,isSome:l,isNone:w,getOr:o=function(t){return t},getOrThunk:e=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:ct(null),getOrUndefined:ct(undefined),or:o,orThunk:e,map:s,each:at,bind:s,exists:l,forall:w,filter:s,equals:n,equals_:n,toArray:function(){return[]},toString:ct("none()")}),d=function(e){var t=ct(e),n=function(){return r},o=function(t){return t(e)},r={fold:function(t,n){return n(e)},is:function(t){return e===t},isSome:w,isNone:l,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:n,orThunk:n,map:function(t){return d(t(e))},each:function(t){t(e)},bind:o,exists:o,forall:o,filter:function(t){return t(e)?r:f},toArray:function(){return[e]},toString:function(){return"some("+e+")"},equals:function(t){return t.is(e)},equals_:function(t,n){return t.fold(l,function(t){return n(e,t)})}};return r},ft={some:d,none:s,from:function(t){return null===t||t===undefined?f:d(t)}},m=function(o){return function(t){return e=typeof(n=t),(null===n?"null":"object"==e&&(Array.prototype.isPrototypeOf(n)||n.constructor&&"Array"===n.constructor.name)?"array":"object"==e&&(String.prototype.isPrototypeOf(n)||n.constructor&&"String"===n.constructor.name)?"string":e)===o;var n,e}},g=function(n){return function(t){return typeof t===n}},C=m("string"),O=m("object"),p=m("array"),_=g("boolean"),h=(r=undefined,function(t){return r===t}),v=function(t){return!(null===(n=t)||n===undefined);var n},T=g("function"),dt=g("number"),b=function(t,n){if(p(t)){for(var e=0,o=t.length;e<o;++e)if(!n(t[e]))return!1;return!0}return!1},E=Array.prototype.slice,D=Array.prototype.indexOf,B=Array.prototype.push,A=function(t,n){return D.call(t,n)},M=function(t,n){return-1<A(t,n)},F=function(t,n){for(var e=0,o=t.length;e<o;e++){if(n(t[e],e))return!0}return!1},I=function(t,n){for(var e=[],o=0;o<t;o++)e.push(n(o));return e},R=function(t,n){for(var e=[],o=0;o<t.length;o+=n){var r=E.call(t,o,o+n);e.push(r)}return e},V=function(t,n){for(var e=t.length,o=new Array(e),r=0;r<e;r++){var i=t[r];o[r]=n(i,r)}return o},mt=function(t,n){for(var e=0,o=t.length;e<o;e++){n(t[e],e)}},P=function(t,n){for(var e=[],o=[],r=0,i=t.length;r<i;r++){var u=t[r];(n(u,r)?e:o).push(u)}return{pass:e,fail:o}},H=function(t,n){for(var e=[],o=0,r=t.length;o<r;o++){var i=t[o];n(i,o)&&e.push(i)}return e},z=function(t,n,e){return function(t,n){for(var e=t.length-1;0<=e;e--){n(t[e],e)}}(t,function(t){e=n(e,t)}),e},N=function(t,n,e){return mt(t,function(t){e=n(e,t)}),e},L=function(t,n){return function(t,n,e){for(var o=0,r=t.length;o<r;o++){var i=t[o];if(n(i,o))return ft.some(i);if(e(i,o))break}return ft.none()}(t,n,l)},j=function(t,n){for(var e=0,o=t.length;e<o;e++){if(n(t[e],e))return ft.some(e)}return ft.none()},gt=function(t){for(var n=[],e=0,o=t.length;e<o;++e){if(!p(t[e]))throw new Error("Arr.flatten item "+e+" was not an array, input: "+t);B.apply(n,t[e])}return n},U=function(t,n){return gt(V(t,n))},W=function(t,n){for(var e=0,o=t.length;e<o;++e){if(!0!==n(t[e],e))return!1}return!0},G=function(t){var n=E.call(t,0);return n.reverse(),n},X=function(t,n){return H(t,function(t){return!M(n,t)})},Y=function(t,n){var e=E.call(t,0);return e.sort(n),e},q=function(t,n){return 0<=n&&n<t.length?ft.some(t[n]):ft.none()},K=function(t){return q(t,0)},J=function(t){return q(t,t.length-1)},$=T(Array.from)?Array.from:function(t){return E.call(t)},Q=function(t,n){for(var e=0;e<t.length;e++){var o=n(t[e],e);if(o.isSome())return o}return ft.none()},Z=function(e){return{is:function(t){return e===t},isValue:w,isError:l,getOr:ct(e),getOrThunk:ct(e),getOrDie:ct(e),or:function(t){return Z(e)},orThunk:function(t){return Z(e)},fold:function(t,n){return n(e)},map:function(t){return Z(t(e))},mapError:function(t){return Z(e)},each:function(t){t(e)},bind:function(t){return t(e)},exists:function(t){return t(e)},forall:function(t){return t(e)},toOptional:function(){return ft.some(e)}}},tt=function(e){return{is:l,isValue:l,isError:w,getOr:st,getOrThunk:function(t){return t()},getOrDie:function(){return u(String(e))()},or:function(t){return t},orThunk:function(t){return t()},fold:function(t,n){return t(e)},map:function(t){return tt(e)},mapError:function(t){return tt(t(e))},each:at,bind:function(t){return tt(e)},exists:l,forall:w,toOptional:ft.none}},pt={value:Z,error:tt,fromOption:function(t,n){return t.fold(function(){return tt(n)},Z)}};(a=c=c||{})[a.Error=0]="Error",a[a.Value=1]="Value";var nt,et,ot=function(t,n,e){return t.stype===c.Error?n(t.serror):e(t.svalue)},rt=function(t){return{stype:c.Value,svalue:t}},it=function(t){return{stype:c.Error,serror:t}},ut=function(t){return t.fold(it,rt)},ht=function(t){return ot(t,pt.error,pt.value)},vt=rt,bt=function(t){var n=[],e=[];return mt(t,function(t){ot(t,function(t){return e.push(t)},function(t){return n.push(t)})}),{values:n,errors:e}},yt=it,xt=function(t,n){return t.stype===c.Value?n(t.svalue):t},wt=function(t,n){return t.stype===c.Error?n(t.serror):t},St=function(t,n){return t.stype===c.Value?{stype:c.Value,svalue:n(t.svalue)}:t},kt=function(t,n){return t.stype===c.Error?{stype:c.Error,serror:n(t.serror)}:t},Ct=Object.keys,Ot=Object.hasOwnProperty,_t=function(t,n){for(var e=Ct(t),o=0,r=e.length;o<r;o++){var i=e[o];n(t[i],i)}},Tt=function(t,e){return Et(t,function(t,n){return{k:n,v:e(t,n)}})},Et=function(t,o){var r={};return _t(t,function(t,n){var e=o(t,n);r[e.k]=e.v}),r},Dt=function(t,n){var e,o,r,i,u={};return e=n,i=u,o=function(t,n){i[n]=t},r=at,_t(t,function(t,n){(e(t,n)?o:r)(t,n)}),u},Bt=function(t,e){var o=[];return _t(t,function(t,n){o.push(e(t,n))}),o},At=function(t,n){for(var e=Ct(t),o=0,r=e.length;o<r;o++){var i=e[o],u=t[i];if(n(u,i,t))return ft.some(u)}return ft.none()},Mt=function(t){return Bt(t,function(t){return t})},Ft=function(t,n){return It(t,n)?ft.from(t[n]):ft.none()},It=function(t,n){return Ot.call(t,n)},Rt=function(t,n){return It(t,n)&&t[n]!==undefined&&null!==t[n]},Vt=function(u){if(!p(u))throw new Error("cases must be an array");if(0===u.length)throw new Error("there must be at least one case");var a=[],e={};return mt(u,function(t,o){var n=Ct(t);if(1!==n.length)throw new Error("one and only one name per case");var r=n[0],i=t[r];if(e[r]!==undefined)throw new Error("duplicate key detected:"+r);if("cata"===r)throw new Error("cannot have a case named cata (sorry)");if(!p(i))throw new Error("case arguments must be an array");a.push(r),e[r]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=e.length;if(n!==i.length)throw new Error("Wrong number of arguments to case "+r+". Expected "+i.length+" ("+i+"), got "+n);return{fold:function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];if(t.length!==u.length)throw new Error("Wrong number of arguments to fold. Expected "+u.length+", got "+t.length);return t[o].apply(null,e)},match:function(t){var n=Ct(t);if(a.length!==n.length)throw new Error("Wrong number of arguments to match. Expected: "+a.join(",")+"\nActual: "+n.join(","));if(!W(a,function(t){return M(n,t)}))throw new Error("Not all branches were specified when using match. Specified: "+n.join(", ")+"\nRequired: "+a.join(", "));return t[r].apply(null,e)},log:function(t){console.log(t,{constructors:a,constructor:r,params:e})}}}}),e},Pt=Object.prototype.hasOwnProperty,Ht=function(u){return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];if(0===t.length)throw new Error("Can't merge zero objects");for(var e={},o=0;o<t.length;o++){var r=t[o];for(var i in r)Pt.call(r,i)&&(e[i]=u(e[i],r[i]))}return e}},zt=Ht(function(t,n){return O(t)&&O(n)?zt(t,n):n}),Nt=Ht(function(t,n){return n}),Lt=function(e){var o,r=!1;return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return r||(r=!0,o=e.apply(null,t)),o}},jt=Vt([{strict:[]},{defaultedThunk:["fallbackThunk"]},{asOption:[]},{asDefaultedOptionThunk:["fallbackThunk"]},{mergeWithThunk:["baseThunk"]}]),Ut=function(t){return jt.defaultedThunk(ct(t))},Wt=jt.strict,Gt=jt.asOption,Xt=jt.defaultedThunk,Yt=(jt.asDefaultedOptionThunk,jt.mergeWithThunk),qt=(Vt([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]),function(t,n){var e={};return e[t]=n,e}),Kt=function(t,n){return e=n,o={},_t(t,function(t,n){M(e,n)||(o[n]=t)}),o;var e,o},Jt=qt,$t=function(t){return n={},mt(t,function(t){n[t.key]=t.value}),n;var n},Qt=function(t,n){var e,o,r,i,u,a=(e=[],o=[],mt(t,function(t){t.fold(function(t){e.push(t)},function(t){o.push(t)})}),{errors:e,values:o});return 0<a.errors.length?(u=a.errors,pt.error(gt(u))):(i=n,0===(r=a.values).length?pt.value(i):pt.value(zt(i,Nt.apply(undefined,r))))},Zt=function(t){return i(yt,gt)(t)},tn=function(t,n){var e,o,r=bt(t);return 0<r.errors.length?Zt(r.errors):(e=r.values,o=n,0<e.length?vt(zt(o,Nt.apply(undefined,e))):vt(o))},nn=function(t){var n=bt(t);return 0<n.errors.length?Zt(n.errors):vt(n.values)},en=function(t){return O(t)&&100<Ct(t).length?" removed due to size":JSON.stringify(t,null,2)},on=function(t,n){return yt([{path:t,getErrorInfo:n}])},rn=Vt([{field:["key","okey","presence","prop"]},{state:["okey","instantiator"]}]),un=function(e,o,r){return Ft(o,r).fold(function(){return t=r,n=o,on(e,function(){return'Could not find valid *strict* value for "'+t+'" in '+en(n)});var t,n},vt)},an=function(t,n,e){var o=Ft(t,n).fold(function(){return e(t)},st);return vt(o)},cn=function(a,c,t,s){return t.fold(function(r,e,t,o){var i=function(t){var n=o.extract(a.concat([r]),s,t);return St(n,function(t){return qt(e,s(t))})},u=function(t){return t.fold(function(){var t=qt(e,s(ft.none()));return vt(t)},function(t){var n=o.extract(a.concat([r]),s,t);return St(n,function(t){return qt(e,s(ft.some(t)))})})};return t.fold(function(){return xt(un(a,c,r),i)},function(t){return xt(an(c,r,t),i)},function(){return xt(vt(Ft(c,r)),u)},function(t){return xt((e=t,o=Ft(n=c,r).map(function(t){return!0===t?e(n):t}),vt(o)),u);var n,e,o},function(t){var n=t(c),e=St(an(c,r,ct({})),function(t){return zt(n,t)});return xt(e,i)})},function(t,n){var e=n(c);return vt(qt(t,s(e)))})},sn=function(o){return{extract:function(e,t,n){return wt(o(n,t),function(t){return n=t,on(e,function(){return n});var n})},toString:function(){return"val"}}},ln=function(t){var u=fn(t),a=z(t,function(n,t){return t.fold(function(t){return zt(n,Jt(t,!0))},ct(n))},{});return{extract:function(t,n,e){var o,r=_(e)?[]:Ct(Dt(e,function(t){return t!==undefined&&null!==t})),i=H(r,function(t){return!Rt(a,t)});return 0===i.length?u.extract(t,n,e):(o=i,on(t,function(){return"There are unsupported fields: ["+o.join(", ")+"] specified"}))},toString:u.toString}},fn=function(a){return{extract:function(t,n,e){return o=t,r=e,i=n,u=V(a,function(t){return cn(o,r,t,i)}),tn(u,{});var o,r,i,u},toString:function(){return"obj{\n"+V(a,function(t){return t.fold(function(t,n,e,o){return t+" -> "+o.toString()},function(t,n){return"state("+t+")"})}).join("\n")+"}"}}},dn=function(r){return{extract:function(e,o,t){var n=V(t,function(t,n){return r.extract(e.concat(["["+n+"]"]),o,t)});return nn(n)},toString:function(){return"array("+r.toString()+")"}}},mn=function(a){return{extract:function(t,n,e){for(var o=[],r=0,i=a;r<i.length;r++){var u=i[r].extract(t,n,e);if(u.stype===c.Value)return u;o.push(u)}return nn(o)},toString:function(){return"oneOf("+V(a,function(t){return t.toString()}).join(", ")+")"}}},gn=function(a,c){return{extract:function(e,o,r){var t,n,i=Ct(r),u=(t=e,n=i,dn(sn(a)).extract(t,st,n));return xt(u,function(t){var n=V(t,function(t){return rn.field(t,t,Wt(),c)});return fn(n).extract(e,o,r)})},toString:function(){return"setOf("+c.toString()+")"}}},pn=ct(sn(vt)),hn=i(dn,fn),vn=rn.state,bn=rn.field,yn=function(e,n,o,r,i){return Ft(r,i).fold(function(){return t=r,n=i,on(e,function(){return'The chosen schema: "'+n+'" did not exist in branches: '+en(t)});var t,n},function(t){return t.extract(e.concat(["branch: "+i]),n,o)})},xn=function(r,i){return{extract:function(n,e,o){return Ft(o,r).fold(function(){return t=r,on(n,function(){return'Choice schema did not contain choice key: "'+t+'"'});var t},function(t){return yn(n,e,o,i,t)})},toString:function(){return"chooseOn("+r+"). Possible values: "+Ct(i)}}},wn=sn(vt),Sn=function(t){return hn(t)},kn=function(o){return{extract:function(t,n,e){return o().extract(t,n,e)},toString:function(){return o().toString()}}},Cn=function(n){return sn(function(t){return n(t).fold(yt,vt)})},On=function(n,t){return gn(function(t){return ut(n(t))},t)},_n=function(t,n,e){return ht((o=t,r=st,i=e,u=n.extract([o],r,i),kt(u,function(t){return{input:i,errors:t}})));var o,r,i,u},Tn=function(t){return t.fold(function(t){throw new Error(Dn(t))},st)},En=function(t,n,e){return Tn(_n(t,n,e))},Dn=function(t){return"Errors: \n"+(n=t.errors,e=10<n.length?n.slice(0,10).concat([{path:[],getErrorInfo:function(){return"... (only showing first ten failures)"}}]):n,V(e,function(t){return"Failed path: ("+t.path.join(" > ")+")\n"+t.getErrorInfo()}).join("\n"))+"\n\nInput object: "+en(t.input);var n,e},Bn=xn,An=function(t,n){return xn(t,Tt(n,fn))},Mn=ct(wn),Fn=function(e,o){return sn(function(t){var n=typeof t;return e(t)?vt(t):yt("Expected type: "+o+" but got: "+n)})},In=Fn(dt,"number"),Rn=Fn(C,"string"),Vn=Fn(_,"boolean"),Pn=Fn(T,"function"),Hn=function(n){var t=function(t,n){for(var e=t.next();!e.done;){if(!n(e.value))return!1;e=t.next()}return!0};if(Object(n)!==n)return!0;switch({}.toString.call(n).slice(8,-1)){case"Boolean":case"Number":case"String":case"Date":case"RegExp":case"Blob":case"FileList":case"ImageData":case"ImageBitmap":case"ArrayBuffer":return!0;case"Array":case"Object":return Object.keys(n).every(function(t){return Hn(n[t])});case"Map":return t(n.keys(),Hn)&&t(n.values(),Hn);case"Set":return t(n.keys(),Hn);default:return!1}},zn=sn(function(t){return Hn(t)?vt(t):yt("Expected value to be acceptable for sending via postMessage")}),Nn=function(n){return Cn(function(t){return M(n,t)?pt.value(t):pt.error('Unsupported value: "'+t+'", choose one of "'+n.join(", ")+'".')})},Ln=function(t){return bn(t,t,Wt(),pn())},jn=function(t,n){return bn(t,t,Wt(),n)},Un=function(t){return jn(t,Rn)},Wn=function(t,n){return bn(t,t,Wt(),Nn(n))},Gn=function(t){return jn(t,Pn)},Xn=function(t,n){return bn(t,t,Wt(),fn(n))},Yn=function(t,n){return bn(t,t,Wt(),hn(n))},qn=function(t,n){return bn(t,t,Wt(),dn(n))},Kn=function(t){return bn(t,t,Gt(),pn())},Jn=function(t,n){return bn(t,t,Gt(),n)},$n=function(t){return Jn(t,In)},Qn=function(t){return Jn(t,Rn)},Zn=function(t){return Jn(t,Pn)},te=function(t,n){return Jn(t,fn(n))},ne=function(t,n){return bn(t,t,Ut(n),pn())},ee=function(t,n,e){return bn(t,t,Ut(n),e)},oe=function(t,n){return ee(t,n,In)},re=function(t,n){return ee(t,n,Rn)},ie=function(t,n,e){return ee(t,n,Nn(e))},ue=function(t,n){return ee(t,n,Vn)},ae=function(t,n){return ee(t,n,Pn)},ce=function(t,n,e){return ee(t,n,dn(e))},se=function(t,n,e){return ee(t,n,fn(e))},le=function(t,n){return vn(t,n)},fe=function(t){var n=t;return{get:function(){return n},set:function(t){n=t}}},de=function(t){if(null===t||t===undefined)throw new Error("Node cannot be null or undefined");return{dom:t}},me={fromHtml:function(t,n){var e=(n||document).createElement("div");if(e.innerHTML=t,!e.hasChildNodes()||1<e.childNodes.length)throw console.error("HTML does not have a single root node",t),new Error("HTML must have a single root node");return de(e.childNodes[0])},fromTag:function(t,n){var e=(n||document).createElement(t);return de(e)},fromText:function(t,n){var e=(n||document).createTextNode(t);return de(e)},fromDom:de,fromPoint:function(t,n,e){return ft.from(t.dom.elementFromPoint(n,e)).map(de)}},ge=function(t,n){var e=function(t,n){for(var e=0;e<t.length;e++){var o=t[e];if(o.test(n))return o}return undefined}(t,n);if(!e)return{major:0,minor:0};var o=function(t){return Number(n.replace(e,"$"+t))};return he(o(1),o(2))},pe=function(){return he(0,0)},he=function(t,n){return{major:t,minor:n}},ve={nu:he,detect:function(t,n){var e=String(n).toLowerCase();return 0===t.length?pe():ge(t,e)},unknown:pe},be=function(t,n){var e=String(n).toLowerCase();return L(t,function(t){return t.search(e)})},ye=function(t,e){return be(t,e).map(function(t){var n=ve.detect(t.versionRegexes,e);return{current:t.name,version:n}})},xe=function(t,e){return be(t,e).map(function(t){var n=ve.detect(t.versionRegexes,e);return{current:t.name,version:n}})},we=function(t,n){return-1!==t.indexOf(n)},Se=function(t,n){return o=n,r=(e=t).length-n.length,""===o||e.length>=o.length&&e.substr(r,r+o.length)===o;var e,o,r},ke=(nt=/^\s+|\s+$/g,function(t){return t.replace(nt,"")}),Ce=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Oe=function(n){return function(t){return we(t,n)}},_e=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(t){return we(t,"edge/")&&we(t,"chrome")&&we(t,"safari")&&we(t,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Ce],search:function(t){return we(t,"chrome")&&!we(t,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(t){return we(t,"msie")||we(t,"trident")}},{name:"Opera",versionRegexes:[Ce,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Oe("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Oe("firefox")},{name:"Safari",versionRegexes:[Ce,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(t){return(we(t,"safari")||we(t,"mobile/"))&&we(t,"applewebkit")}}],Te=[{name:"Windows",search:Oe("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(t){return we(t,"iphone")||we(t,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Oe("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:Oe("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Oe("linux"),versionRegexes:[]},{name:"Solaris",search:Oe("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Oe("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:Oe("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],Ee={browsers:ct(_e),oses:ct(Te)},De="Firefox",Be=function(t){var n=t.current,e=t.version,o=function(t){return function(){return n===t}};return{current:n,version:e,isEdge:o("Edge"),isChrome:o("Chrome"),isIE:o("IE"),isOpera:o("Opera"),isFirefox:o(De),isSafari:o("Safari")}},Ae={unknown:function(){return Be({current:undefined,version:ve.unknown()})},nu:Be,edge:ct("Edge"),chrome:ct("Chrome"),ie:ct("IE"),opera:ct("Opera"),firefox:ct(De),safari:ct("Safari")},Me="Windows",Fe="Android",Ie="Solaris",Re="FreeBSD",Ve="ChromeOS",Pe=function(t){var n=t.current,e=t.version,o=function(t){return function(){return n===t}};return{current:n,version:e,isWindows:o(Me),isiOS:o("iOS"),isAndroid:o(Fe),isOSX:o("OSX"),isLinux:o("Linux"),isSolaris:o(Ie),isFreeBSD:o(Re),isChromeOS:o(Ve)}},He={unknown:function(){return Pe({current:undefined,version:ve.unknown()})},nu:Pe,windows:ct(Me),ios:ct("iOS"),android:ct(Fe),linux:ct("Linux"),osx:ct("OSX"),solaris:ct(Ie),freebsd:ct(Re),chromeos:ct(Ve)},ze=function(t,n){var e,o,r,i,u,a,c,s,l,f,d,m,g=Ee.browsers(),p=Ee.oses(),h=ye(g,t).fold(Ae.unknown,Ae.nu),v=xe(p,t).fold(He.unknown,He.nu);return{browser:h,os:v,deviceType:(o=h,r=t,i=n,u=(e=v).isiOS()&&!0===/ipad/i.test(r),a=e.isiOS()&&!u,c=e.isiOS()||e.isAndroid(),s=c||i("(pointer:coarse)"),l=u||!a&&c&&i("(min-device-width:768px)"),f=a||c&&!l,d=o.isSafari()&&e.isiOS()&&!1===/safari/i.test(r),m=!f&&!l&&!d,{isiPad:ct(u),isiPhone:ct(a),isTablet:ct(l),isPhone:ct(f),isTouch:ct(s),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:ct(d),isDesktop:ct(m)})}},Ne=function(t){return window.matchMedia(t).matches},Le=Lt(function(){return ze(navigator.userAgent,Ne)}),je=function(){return Le()},Ue=function(t,n){var e=t.dom;if(1!==e.nodeType)return!1;var o=e;if(o.matches!==undefined)return o.matches(n);if(o.msMatchesSelector!==undefined)return o.msMatchesSelector(n);if(o.webkitMatchesSelector!==undefined)return o.webkitMatchesSelector(n);if(o.mozMatchesSelector!==undefined)return o.mozMatchesSelector(n);throw new Error("Browser lacks native selectors")},We=function(t){return 1!==t.nodeType&&9!==t.nodeType&&11!==t.nodeType||0===t.childElementCount},Ge=function(t,n){return t.dom===n.dom},Xe=function(t,n){return e=t.dom,o=n.dom,r=e,i=o,u=Node.DOCUMENT_POSITION_CONTAINED_BY,0!=(r.compareDocumentPosition(i)&u);var e,o,r,i,u},Ye=function(t,n){return je().browser.isIE()?Xe(t,n):(e=n,o=t.dom,r=e.dom,o!==r&&o.contains(r));var e,o,r},qe=function(t){return T(t)?t:l},Ke=function(t,n,e){for(var o=t.dom,r=qe(e);o.parentNode;){o=o.parentNode;var i=me.fromDom(o),u=n(i);if(u.isSome())return u;if(r(i))break}return ft.none()},Je=function(t,n,e){var o=n(t),r=qe(e);return o.orThunk(function(){return r(t)?ft.none():Ke(t,n,r)})},$e=function(t,n){return Ge(t.element,n.event.target)},Qe=function(t){if(!Rt(t,"can")&&!Rt(t,"abort")&&!Rt(t,"run"))throw new Error("EventHandler defined by: "+JSON.stringify(t,null,2)+" does not have can, abort, or run!");return En("Extracting event.handler",ln([ne("can",w),ne("abort",l),ne("run",at)]),t)},Ze=function(e){var n,o,r,i,t=(o=function(t){return t.can},function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return N(n,function(t,n){return t&&o(n).apply(undefined,e)},!0)}),u=(r=n=e,i=function(t){return t.abort},function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return N(r,function(t,n){return t||i(n).apply(undefined,e)},!1)});return Qe({can:t,abort:u,run:function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];mt(e,function(t){t.run.apply(undefined,n)})}})},to=ct,no=to("touchstart"),eo=to("touchmove"),oo=to("touchend"),ro=to("touchcancel"),io=to("mousedown"),uo=to("mousemove"),ao=to("mouseout"),co=to("mouseup"),so=to("mouseover"),lo=to("focusin"),fo=to("focusout"),mo=to("keydown"),go=to("keyup"),po=to("input"),ho=to("change"),vo=to("click"),bo=to("transitionend"),yo=to("selectstart"),xo=function(t){return ct("alloy."+t)},wo={tap:xo("tap")},So=xo("focus"),ko=xo("blur.post"),Co=xo("paste.post"),Oo=xo("receive"),_o=xo("execute"),To=xo("focus.item"),Eo=wo.tap,Do=xo("longpress"),Bo=xo("sandbox.close"),Ao=xo("typeahead.cancel"),Mo=xo("system.init"),Fo=xo("system.touchmove"),Io=xo("system.touchend"),Ro=xo("system.scroll"),Vo=xo("system.resize"),Po=xo("system.attached"),Ho=xo("system.detached"),zo=xo("system.dismissRequested"),No=xo("system.repositionRequested"),Lo=xo("focusmanager.shifted"),jo=xo("slotcontainer.visibility"),Uo=xo("change.tab"),Wo=xo("dismiss.tab"),Go=xo("highlight"),Xo=xo("dehighlight"),Yo=function(t,n){$o(t,t.element,n,{})},qo=function(t,n,e){$o(t,t.element,n,e)},Ko=function(t){Yo(t,_o())},Jo=function(t,n,e){$o(t,n,e,{})},$o=function(t,n,e,o){var r=lt({target:n},o);t.getSystem().triggerEvent(e,n,r)},Qo=function(t,n,e,o){t.getSystem().triggerEvent(e,n,o.event)},Zo=$t,tr=function(t,n){return{key:t,value:Qe({abort:n})}},nr=function(t){return{key:t,value:Qe({run:function(t,n){n.event.prevent()}})}},er=function(t,n){return{key:t,value:Qe({run:n})}},or=function(t,e,o){return{key:t,value:Qe({run:function(t,n){e.apply(undefined,[t,n].concat(o))}})}},rr=function(t){return function(e){return{key:t,value:Qe({run:function(t,n){$e(t,n)&&e(t,n)}})}}},ir=function(t,n,e){var o,r,i=n.partUids[e];return r=i,er(o=t,function(t,n){t.getSystem().getByUid(r).each(function(t){Qo(t,t.element,o,n)})})},ur=function(t,r){return er(t,function(n,t){var e=t.event,o=n.getSystem().getByDom(e.target).fold(function(){return Je(e.target,function(t){return n.getSystem().getByDom(t).toOptional()},l).getOr(n)},function(t){return t});r(n,o,t)})},ar=function(t){return er(t,function(t,n){n.cut()})},cr=function(t,n){return rr(t)(n)},sr=rr(Po()),lr=rr(Ho()),fr=rr(Mo()),dr=(et=_o(),function(t){return er(et,t)}),mr=("undefined"!=typeof window||Function("return this;")(),function(t){return t.dom.nodeName.toLowerCase()}),gr=function(n){return function(t){return t.dom.nodeType===n}},pr=gr(1),hr=gr(3),vr=gr(9),br=gr(11),yr=function(t){return me.fromDom(t.dom.ownerDocument)},xr=function(t){return vr(t)?t:yr(t)},wr=function(t){return me.fromDom(xr(t).dom.documentElement)},Sr=function(t){return me.fromDom(xr(t).dom.defaultView)},kr=function(t){return ft.from(t.dom.parentNode).map(me.fromDom)},Cr=kr,Or=function(t){return ft.from(t.dom.offsetParent).map(me.fromDom)},_r=function(t){return V(t.dom.childNodes,me.fromDom)},Tr=function(t,n){var e=t.dom.childNodes;return ft.from(e[n]).map(me.fromDom)},Er=function(t){return br(t)&&v(t.dom.host)},Dr=T(Element.prototype.attachShadow)&&T(Node.prototype.getRootNode),Br=ct(Dr),Ar=Dr?function(t){return me.fromDom(t.dom.getRootNode())}:xr,Mr=function(t){return Er(t)?t:me.fromDom(xr(t).dom.body)},Fr=function(t){var n=Ar(t);return Er(n)?ft.some(n):ft.none()},Ir=function(t){return me.fromDom(t.dom.host)},Rr=function(t){return v(t.dom.shadowRoot)},Vr=function(n,e){kr(n).each(function(t){t.dom.insertBefore(e.dom,n.dom)})},Pr=function(t,n){var e;(e=t,ft.from(e.dom.nextSibling).map(me.fromDom)).fold(function(){kr(t).each(function(t){zr(t,n)})},function(t){Vr(t,n)})},Hr=function(n,e){Tr(n,0).fold(function(){zr(n,e)},function(t){n.dom.insertBefore(e.dom,t.dom)})},zr=function(t,n){t.dom.appendChild(n.dom)},Nr=function(n,t){mt(t,function(t){zr(n,t)})},Lr=function(t){t.dom.textContent="",mt(_r(t),function(t){jr(t)})},jr=function(t){var n=t.dom;null!==n.parentNode&&n.parentNode.removeChild(n)},Ur=function(t){var n,e=_r(t);0<e.length&&(n=t,mt(e,function(t){Vr(n,t)})),jr(t)},Wr=function(t){return t.dom.innerHTML},Gr=function(t,n){var e,o,r=yr(t).dom,i=me.fromDom(r.createDocumentFragment()),u=(e=n,(o=(r||document).createElement("div")).innerHTML=e,_r(me.fromDom(o)));Nr(i,u),Lr(t),zr(t,i)},Xr=function(t,n,e){if(!(C(e)||_(e)||dt(e)))throw console.error("Invalid call to Attribute.set. Key ",n,":: Value ",e,":: Element ",t),new Error("Attribute value was not simple");t.setAttribute(n,e+"")},Yr=function(t,n,e){Xr(t.dom,n,e)},qr=function(t,n){var e=t.dom.getAttribute(n);return null===e?undefined:e},Kr=function(t,n){return ft.from(qr(t,n))},Jr=function(t,n){var e=t.dom;return!(!e||!e.hasAttribute)&&e.hasAttribute(n)},$r=function(t,n){t.dom.removeAttribute(n)},Qr=function(t){return n=t,e=!1,me.fromDom(n.dom.cloneNode(e));var n,e},Zr=function(t){if(Er(t))return"#shadow-root";var n,e,o,r=Qr(t);return n=r,e=me.fromTag("div"),o=me.fromDom(n.dom.cloneNode(!0)),zr(e,o),Wr(e)},ti=Zo([{key:So(),value:Qe({can:function(t,n){var e,o,r=n.event,i=r.originator,u=r.target;return o=u,!(Ge(e=i,t.element)&&!Ge(e,o))||(console.warn(So()+" did not get interpreted by the desired target. \nOriginator: "+Zr(i)+"\nTarget: "+Zr(u)+"\nCheck the "+So()+" event handlers"),!1)}})}]),ni=/* */Object.freeze({__proto__:null,events:ti}),ei=0,oi=function(t){var n=(new Date).getTime();return t+"_"+Math.floor(1e9*Math.random())+ ++ei+String(n)},ri=ct("alloy-id-"),ii=ct("data-alloy-id"),ui=ri(),ai=ii(),ci=function(t,n){Object.defineProperty(t.dom,ai,{value:n,writable:!0})},si=function(t){var n=pr(t)?t.dom[ai]:null;return ft.from(n)},li=oi,fi=st,di=function(n){var t=function(t){return function(){throw new Error("The component must be in a context to send: "+t+(n?"\n"+Zr(n().element)+" is not in context.":""))}};return{debugInfo:ct("fake"),triggerEvent:t("triggerEvent"),triggerFocus:t("triggerFocus"),triggerEscape:t("triggerEscape"),build:t("build"),addToWorld:t("addToWorld"),removeFromWorld:t("removeFromWorld"),addToGui:t("addToGui"),removeFromGui:t("removeFromGui"),getByUid:t("getByUid"),getByDom:t("getByDom"),broadcast:t("broadcast"),broadcastOn:t("broadcastOn"),broadcastEvent:t("broadcastEvent"),isConnected:l}},mi=di(),gi=function(t){return V(t,function(t){return Se(t,"/*")?t.substring(0,t.length-"/*".length):t})},pi=function(t,n){var e=t.toString(),o=e.indexOf(")")+1,r=e.indexOf("("),i=e.substring(r+1,o-1).split(/,\s*/);return t.toFunctionAnnotation=function(){return{name:n,parameters:gi(i)}},t},hi=oi("alloy-premade"),vi=function(t){return Jt(hi,t)},bi=function(o){return t=function(t){for(var n=[],e=1;e<arguments.length;e++)n[e-1]=arguments[e];return o.apply(void 0,k([t.getApis(),t],n))},n=o.toString(),e=n.indexOf(")")+1,r=n.indexOf("("),i=n.substring(r+1,e-1).split(/,\s*/),t.toFunctionAnnotation=function(){return{name:"OVERRIDE",parameters:gi(i.slice(1))}},t;var t,n,e,r,i},yi={init:function(){return xi({readState:function(){return"No State required"}})}},xi=function(t){return t},wi=function(t,r){var i={};return _t(t,function(t,o){_t(t,function(t,n){var e=Ft(i,n).getOr([]);i[n]=e.concat([r(o,t)])})}),i},Si=function(t){return{classes:t.classes!==undefined?t.classes:[],attributes:t.attributes!==undefined?t.attributes:{},styles:t.styles!==undefined?t.styles:{}}},ki=function(t){return t.cHandler},Ci=function(t,n){return{name:t,handler:n}},Oi=function(t,n,e){var o,r,i=lt(lt({},e),(o=t,r={},mt(n,function(t){r[t.name()]=t.handlers(o)}),r));return wi(i,Ci)},_i=function(t){var n,i=T(n=t)?{can:w,abort:l,run:n}:n;return function(t,n){for(var e=[],o=2;o<arguments.length;o++)e[o-2]=arguments[o];var r=[t,n].concat(e);i.abort.apply(undefined,r)?n.stop():i.can.apply(undefined,r)&&i.run.apply(undefined,r)}},Ti=function(t,n,e){var o,r,i=n[e];return i?function(u,a,t,c){try{var n=Y(t,function(t,n){var e=t[a],o=n[a],r=c.indexOf(e),i=c.indexOf(o);if(-1===r)throw new Error("The ordering for "+u+" does not have an entry for "+e+".\nOrder specified: "+JSON.stringify(c,null,2));if(-1===i)throw new Error("The ordering for "+u+" does not have an entry for "+o+".\nOrder specified: "+JSON.stringify(c,null,2));return r<i?-1:i<r?1:0});return pt.value(n)}catch(e){return pt.error([e])}}("Event: "+e,"name",t,i).map(function(t){var n=V(t,function(t){return t.handler});return Ze(n)}):(o=e,r=t,pt.error(["The event ("+o+') has more than one behaviour that listens to it.\nWhen this occurs, you must specify an event ordering for the behaviours in your spec (e.g. [ "listing", "toggling" ]).\nThe behaviours that can trigger it are: '+JSON.stringify(V(r,function(t){return t.name}),null,2)]))},Ei=function(t,i){var n=Bt(t,function(o,r){return(1===o.length?pt.value(o[0].handler):Ti(o,i,r)).map(function(t){var n=_i(t),e=1<o.length?H(i[r],function(n){return F(o,function(t){return t.name===n})}).join(" > "):o[0].name;return Jt(r,{handler:n,purpose:e})})});return Qt(n,{})},Di="alloy.base.behaviour",Bi=function(t){var n,e;return _n("custom.definition",fn([bn("dom","dom",Wt(),fn([Ln("tag"),ne("styles",{}),ne("classes",[]),ne("attributes",{}),Kn("value"),Kn("innerHtml")])),Ln("components"),Ln("uid"),ne("events",{}),ne("apis",{}),bn("eventOrder","eventOrder",((n={})[_o()]=["disabling",Di,"toggling","typeaheadevents"],n[So()]=[Di,"focusing","keying"],n[Mo()]=[Di,"disabling","toggling","representing"],n[po()]=[Di,"representing","streaming","invalidating"],n[Ho()]=[Di,"representing","item-events","tooltipping"],n[io()]=["focusing",Di,"item-type-events"],n[no()]=["focusing",Di,"item-type-events"],n[so()]=["item-type-events","tooltipping"],n[Oo()]=["receiving","reflecting","tooltipping"],e=n,jt.mergeWithThunk(ct(e))),Mn()),Kn("domModification")]),t)},Ai=function(t,n){var e=qr(t,n);return e===undefined||""===e?[]:e.split(" ")},Mi=function(t){return t.dom.classList!==undefined},Fi=function(t,n){return r=n,i=Ai(e=t,o="class").concat([r]),Yr(e,o,i.join(" ")),!0;var e,o,r,i},Ii=function(t,n){return r=n,0<(i=H(Ai(e=t,o="class"),function(t){return t!==r})).length?Yr(e,o,i.join(" ")):$r(e,o),!1;var e,o,r,i},Ri=function(t,n){Mi(t)?t.dom.classList.add(n):Fi(t,n)},Vi=function(t){0===(Mi(t)?t.dom.classList:Ai(t,"class")).length&&$r(t,"class")},Pi=function(t,n){Mi(t)?t.dom.classList.remove(n):Ii(t,n),Vi(t)},Hi=function(t,n){return Mi(t)&&t.dom.classList.contains(n)},zi=function(n,t){mt(t,function(t){Ri(n,t)})},Ni=function(n,t){mt(t,function(t){Pi(n,t)})},Li=function(t){return t.style!==undefined&&T(t.style.getPropertyValue)},ji=function(t){var n=hr(t)?t.dom.parentNode:t.dom;if(n===undefined||null===n||null===n.ownerDocument)return!1;var e,o,r=n.ownerDocument;return Fr(me.fromDom(n)).fold(function(){return r.body.contains(n)},(e=ji,o=Ir,function(t){return e(o(t))}))},Ui=function(){return Wi(me.fromDom(document))},Wi=function(t){var n=t.dom.body;if(null===n||n===undefined)throw new Error("Body is not available yet");return me.fromDom(n)},Gi=function(t,n,e){if(!C(e))throw console.error("Invalid call to CSS.set. Property ",n,":: Value ",e,":: Element ",t),new Error("CSS value must be a string: "+e);Li(t)&&t.style.setProperty(n,e)},Xi=function(t,n){Li(t)&&t.style.removeProperty(n)},Yi=function(t,n,e){var o=t.dom;Gi(o,n,e)},qi=function(t,n){var e=t.dom;_t(n,function(t,n){Gi(e,n,t)})},Ki=function(t,n){var e=t.dom;_t(n,function(t,n){t.fold(function(){Xi(e,n)},function(t){Gi(e,n,t)})})},Ji=function(t,n){var e=t.dom,o=window.getComputedStyle(e).getPropertyValue(n);return""!==o||ji(t)?o:$i(e,n)},$i=function(t,n){return Li(t)?t.style.getPropertyValue(n):""},Qi=function(t,n){var e=t.dom,o=$i(e,n);return ft.from(o).filter(function(t){return 0<t.length})},Zi=function(t,n,e){var o=me.fromTag(t);return Yi(o,n,e),Qi(o,n).isSome()},tu=function(t,n){var e=t.dom;Xi(e,n),Kr(t,"style").map(ke).is("")&&$r(t,"style")},nu=function(t){return t.dom.offsetWidth},eu=function(t){return t.dom.value},ou=function(t,n){if(n===undefined)throw new Error("Value.set was undefined");t.dom.value=n},ru=function(t){var n,e,o,r=me.fromTag(t.tag);n=r,e=t.attributes,o=n.dom,_t(e,function(t,n){Xr(o,n,t)}),zi(r,t.classes),qi(r,t.styles),t.innerHtml.each(function(t){return Gr(r,t)});var i=t.domChildren;return Nr(r,i),t.value.each(function(t){ou(r,t)}),t.uid,ci(r,t.uid),r},iu=function(t,n){return e=t,r=V(o=n,function(t){return te(t.name(),[Ln("config"),ne("state",yi)])}),i=_n("component.behaviours",fn(r),e.behaviours).fold(function(t){throw new Error(Dn(t)+"\nComplete spec:\n"+JSON.stringify(e,null,2))},function(t){return t}),{list:o,data:Tt(i,function(t){var n=t.map(function(t){return{config:t.config,state:t.state.init(t.config)}});return function(){return n}})};var e,o,r,i},uu=function(t){var n,e,o=(n=Ft(t,"behaviours").getOr({}),e=H(Ct(n),function(t){return n[t]!==undefined}),V(e,function(t){return n[t].me}));return iu(t,o)},au=function(t,n,e){var o,r,i,u=lt(lt({},(o=t).dom),{uid:o.uid,domChildren:V(o.components,function(t){return t.element})}),a=t.domModification.fold(function(){return Si({})},Si),c={"alloy.base.modification":a},s=0<n.length?function(n,t,e,o){var r=lt({},t);mt(e,function(t){r[t.name()]=t.exhibit(n,o)});var i=wi(r,function(t,n){return{name:t,modification:n}}),u=function(t){return z(t,function(t,n){return lt(lt({},n.modification),t)},{})},a=z(i.classes,function(t,n){return n.modification.concat(t)},[]),c=u(i.attributes),s=u(i.styles);return Si({classes:a,attributes:c,styles:s})}(e,c,n,u):a;return i=s,lt(lt({},r=u),{attributes:lt(lt({},r.attributes),i.attributes),styles:lt(lt({},r.styles),i.styles),classes:r.classes.concat(i.classes)})},cu=function(t,n,e){var o,r,i,u={"alloy.base.behaviour":t.events};return o=e,r=t.eventOrder,i=Oi(o,n,u),Ei(i,r).getOrDie()},su=function(t){var n,e,o,r,i,u,a,c,s,l,f,d,m,g=fi(t),p=g.events,h=S(g,["events"]),v=(n=Ft(h,"components").getOr([]),V(n,mu)),b=lt(lt({},h),{events:lt(lt({},ni),p),components:v});return pt.value((o=function(){return m},r=fe(mi),i=Tn(Bi(e=b)),u=uu(e),a=u.list,c=u.data,s=au(i,a,c),l=ru(s),f=cu(i,a,c),d=fe(i.components),m={getSystem:r.get,config:function(t){var n=c;return(T(n[t.name()])?n[t.name()]:function(){throw new Error("Could not find "+t.name()+" in "+JSON.stringify(e,null,2))})()},hasConfigured:function(t){return T(c[t.name()])},spec:e,readState:function(t){return c[t]().map(function(t){return t.state.readState()}).getOr("not enabled")},getApis:function(){return i.apis},connect:function(t){r.set(t)},disconnect:function(){r.set(di(o))},element:l,syncComponents:function(){var t=_r(l),n=U(t,function(t){return r.get().getByDom(t).fold(function(){return[]},function(t){return[t]})});d.set(n)},components:d.get,events:f}))},lu=function(t){var n=me.fromText(t);return fu({element:n})},fu=function(t){var n=En("external.component",ln([Ln("element"),Kn("uid")]),t),e=fe(di());n.uid.each(function(t){ci(n.element,t)});var o={getSystem:e.get,config:ft.none,hasConfigured:l,connect:function(t){e.set(t)},disconnect:function(){e.set(di(function(){return o}))},getApis:function(){return{}},element:n.element,spec:t,readState:ct("No state"),syncComponents:at,components:ct([]),events:{}};return vi(o)},du=li,mu=function(n){return Ft(n,hi).fold(function(){var t=n.hasOwnProperty("uid")?n:lt({uid:du("")},n);return su(t).getOrDie()},function(t){return t})},gu=vi,pu=function(o,r){var t=function(t){var n=r(t);if(n<=0||null===n){var e=Ji(t,o);return parseFloat(e)||0}return n},i=function(r,t){return N(t,function(t,n){var e=Ji(r,n),o=e===undefined?0:parseInt(e,10);return isNaN(o)?t:t+o},0)};return{set:function(t,n){if(!dt(n)&&!n.match(/^[0-9]+$/))throw new Error(o+".set accepts only positive integer values. Value was "+n);var e=t.dom;Li(e)&&(e.style[o]=n+"px")},get:t,getOuter:t,aggregate:i,max:function(t,n,e){var o=i(t,e);return o<n?n-o:0}}},hu=pu("height",function(t){var n=t.dom;return ji(t)?n.getBoundingClientRect().height:n.offsetHeight}),vu=function(t){return hu.get(t)},bu=function(t){return hu.getOuter(t)},yu=function(e,o){return{left:e,top:o,translate:function(t,n){return yu(e+t,o+n)}}},xu=yu,wu=function(t,n){return t!==undefined?t:n!==undefined?n:0},Su=function(t){var n=t.dom.ownerDocument,e=n.body,o=n.defaultView,r=n.documentElement;if(e===t.dom)return xu(e.offsetLeft,e.offsetTop);var i=wu(null==o?void 0:o.pageYOffset,r.scrollTop),u=wu(null==o?void 0:o.pageXOffset,r.scrollLeft),a=wu(r.clientTop,e.clientTop),c=wu(r.clientLeft,e.clientLeft);return ku(t).translate(u-c,i-a)},ku=function(t){var n,e=t.dom,o=e.ownerDocument.body;return o===e?xu(o.offsetLeft,o.offsetTop):ji(t)?(n=e.getBoundingClientRect(),xu(n.left,n.top)):xu(0,0)},Cu=pu("width",function(t){return t.dom.offsetWidth}),Ou=function(t){return Cu.get(t)},_u=function(t){return Cu.getOuter(t)},Tu=function(t){var n=me.fromDom(function(t){if(Br()&&v(t.target)){var n=me.fromDom(t.target);if(pr(n)&&Rr(n)&&t.composed&&t.composedPath){var e=t.composedPath();if(e)return K(e)}}return ft.from(t.target)}(t).getOr(t.target)),e=function(){return t.stopPropagation()},o=function(){return t.preventDefault()},r=i(o,e);return{target:n,x:t.clientX,y:t.clientY,stop:e,prevent:o,kill:r,raw:t}},Eu=function(t,n,e,o,r){var i,u,a=(i=e,u=o,function(t){i(t)&&u(Tu(t))});return t.dom.addEventListener(n,a,r),{unbind:y(Du,t,n,a,r)}},Du=function(t,n,e,o){t.dom.removeEventListener(n,e,o)},Bu=function(t){var n=t!==undefined?t.dom:document,e=n.body.scrollLeft||n.documentElement.scrollLeft,o=n.body.scrollTop||n.documentElement.scrollTop;return xu(e,o)},Au=function(t,n,e){var o=(e!==undefined?e.dom:document).defaultView;o&&o.scrollTo(t,n)},Mu=function(t,n,e,o){return{x:t,y:n,width:e,height:o,right:t+e,bottom:n+o}},Fu=function(t){var n,e,o=t===undefined?window:t,r=o.document,i=Bu(me.fromDom(r));return e=(n=o)===undefined?window:n,ft.from(e.visualViewport).fold(function(){var t=o.document.documentElement,n=t.clientWidth,e=t.clientHeight;return Mu(i.left,i.top,n,e)},function(t){return Mu(Math.max(t.pageLeft,i.left),Math.max(t.pageTop,i.top),t.width,t.height)})},Iu=function(o,t){return o.view(t).fold(ct([]),function(t){var n=o.owner(t),e=Iu(o,n);return[t].concat(e)})},Ru=/* */Object.freeze({__proto__:null,view:function(t){var n;return(t.dom===document?ft.none():ft.from(null===(n=t.dom.defaultView)||void 0===n?void 0:n.frameElement)).map(me.fromDom)},owner:yr}),Vu=function(o){var t,n,e,r,i=me.fromDom(document),u=Bu(i);return(t=o,e=(n=Ru).owner(t),r=Iu(n,e),ft.some(r)).fold(y(Su,o),function(t){var n=ku(o),e=z(t,function(t,n){var e=ku(n);return{left:t.left+e.left,top:t.top+e.top}},{left:0,top:0});return xu(e.left+n.left+u.left,e.top+n.top+u.top)})},Pu=function(t,n,e,o){return{x:t,y:n,width:e,height:o,right:t+e,bottom:n+o}},Hu=function(t){var n=Su(t),e=_u(t),o=bu(t);return Pu(n.left,n.top,e,o)},zu=function(t){var n=Vu(t),e=_u(t),o=bu(t);return Pu(n.left,n.top,e,o)},Nu=function(){return Fu(window)};function Lu(t,n,e,o,r){return t(e,o)?ft.some(e):T(r)&&r(e)?ft.none():n(e,o,r)}var ju,Uu,Wu=function(t,n,e){for(var o=t.dom,r=T(e)?e:l;o.parentNode;){o=o.parentNode;var i=me.fromDom(o);if(n(i))return ft.some(i);if(r(i))break}return ft.none()},Gu=function(t,n,e){return Lu(function(t,n){return n(t)},Wu,t,n,e)},Xu=function(t,n,e){return Gu(t,n,e).isSome()},Yu=function(t,n,e){return Wu(t,function(t){return Ue(t,n)},e)},qu=function(t,n){return e=n,r=(o=t)===undefined?document:o.dom,We(r)?ft.none():ft.from(r.querySelector(e)).map(me.fromDom);var e,o,r},Ku=function(t,n,e){return Lu(Ue,Yu,t,n,e)},Ju=function(){var n=oi("aria-owns");return{id:n,link:function(t){Yr(t,"aria-owns",n)},unlink:function(t){$r(t,"aria-owns")}}},$u=function(n,t){return Gu(t,function(t){if(!pr(t))return!1;var n=qr(t,"id");return n!==undefined&&-1<n.indexOf("aria-owns")}).bind(function(t){var n=qr(t,"id"),e=Ar(t);return qu(e,'[aria-owns="'+n+'"]')}).exists(function(t){return Qu(n,t)})},Qu=function(n,t){return Xu(t,function(t){return Ge(t,n.element)},l)||$u(n,t)},Zu="unknown";(Uu=ju=ju||{})[Uu.STOP=0]="STOP",Uu[Uu.NORMAL=1]="NORMAL",Uu[Uu.LOGGING=2]="LOGGING";var ta,na,ea=fe({}),oa=["alloy/data/Fields","alloy/debugging/Debugging"],ra=function(n,t,e){var o,r,i,u;switch(Ft(ea.get(),n).orThunk(function(){var t=Ct(ea.get());return Q(t,function(t){return-1<n.indexOf(t)?ft.some(ea.get()[t]):ft.none()})}).getOr(ju.NORMAL)){case ju.NORMAL:return e(ia());case ju.LOGGING:var a=(o=n,r=t,i=[],u=(new Date).getTime(),{logEventCut:function(t,n,e){i.push({outcome:"cut",target:n,purpose:e})},logEventStopped:function(t,n,e){i.push({outcome:"stopped",target:n,purpose:e})},logNoParent:function(t,n,e){i.push({outcome:"no-parent",target:n,purpose:e})},logEventNoHandlers:function(t,n){i.push({outcome:"no-handlers-left",target:n})},logEventResponse:function(t,n,e){i.push({outcome:"response",purpose:e,target:n})},write:function(){var t=(new Date).getTime();M(["mousemove","mouseover","mouseout",Mo()],o)||console.log(o,{event:o,time:t-u,target:r.dom,sequence:V(i,function(t){return M(["cut","stopped","response"],t.outcome)?"{"+t.purpose+"} "+t.outcome+" at ("+Zr(t.target)+")":t.outcome})})}}),c=e(a);return a.write(),c;case ju.STOP:return!0}},ia=ct({logEventCut:at,logEventStopped:at,logNoParent:at,logEventNoHandlers:at,logEventResponse:at,write:at}),ua=ct([Ln("menu"),Ln("selectedMenu")]),aa=ct([Ln("item"),Ln("selectedItem")]),ca=(ct(fn(aa().concat(ua()))),ct(fn(aa()))),sa=Xn("initSize",[Ln("numColumns"),Ln("numRows")]),la=function(){return Xn("markers",[Ln("backgroundMenu")].concat(ua()).concat(aa()))},fa=function(t){return Xn("markers",V(t,Ln))},da=function(t,n,e){!function(){var t=new Error;if(t.stack===undefined)return;var n=t.stack.split("\n");L(n,function(n){return 0<n.indexOf("alloy")&&!F(oa,function(t){return-1<n.indexOf(t)})}).getOr(Zu)}();return bn(n,n,e,Cn(function(e){return pt.value(function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e.apply(undefined,t)})}))},ma=function(t){return da(0,t,Ut(at))},ga=function(t){return da(0,t,Ut(ft.none))},pa=function(t){return da(0,t,Wt())},ha=function(t){return da(0,t,Wt())},va=function(t,n){return le(t,ct(n))},ba=function(t){return le(t,st)},ya=ct(sa),xa=function(t,n,e,o,r,i){return{x:t,y:n,bubble:e,direction:o,boundsRestriction:r,label:i}},wa=Vt([{southeast:[]},{southwest:[]},{northeast:[]},{northwest:[]},{south:[]},{north:[]},{east:[]},{west:[]}]),Sa=wa.southeast,ka=wa.southwest,Ca=wa.northeast,Oa=wa.northwest,_a=wa.south,Ta=wa.north,Ea=wa.east,Da=wa.west,Ba=function(n,e){return function(t,n){for(var e={},o=0,r=t.length;o<r;o++){var i=t[o];e[String(i)]=n(i,o)}return e}(["left","right","top","bottom"],function(t){return Ft(e,t).map(function(t){return function(t,n){switch(n){case 1:return t.x;case 0:return t.x+t.width;case 2:return t.y;case 3:return t.y+t.height}}(n,t)})})},Aa=function(t){return t.x},Ma=function(t,n){return t.x+t.width/2-n.width/2},Fa=function(t,n){return t.x+t.width-n.width},Ia=function(t,n){return t.y-n.height},Ra=function(t){return t.y+t.height},Va=function(t,n){return t.y+t.height/2-n.height/2},Pa=function(t,n,e){return xa(Aa(t),Ra(t),e.southeast(),Sa(),Ba(t,{left:1,top:3}),"layout-se")},Ha=function(t,n,e){return xa(Fa(t,n),Ra(t),e.southwest(),ka(),Ba(t,{right:0,top:3}),"layout-sw")},za=function(t,n,e){return xa(Aa(t),Ia(t,n),e.northeast(),Ca(),Ba(t,{left:1,bottom:2}),"layout-ne")},Na=function(t,n,e){return xa(Fa(t,n),Ia(t,n),e.northwest(),Oa(),Ba(t,{right:0,bottom:2}),"layout-nw")},La=function(t,n,e){return xa(Ma(t,n),Ia(t,n),e.north(),Ta(),Ba(t,{bottom:2}),"layout-n")},ja=function(t,n,e){return xa(Ma(t,n),Ra(t),e.south(),_a(),Ba(t,{top:3}),"layout-s")},Ua=function(t,n,e){return xa((o=t).x+o.width,Va(t,n),e.east(),Ea(),Ba(t,{left:0}),"layout-e");var o},Wa=function(t,n,e){return xa((o=n,t.x-o.width),Va(t,n),e.west(),Da(),Ba(t,{right:1}),"layout-w");var o},Ga=function(){return[Pa,Ha,za,Na,ja,La,Ua,Wa]},Xa=function(){return[Ha,Pa,Na,za,ja,La,Ua,Wa]},Ya=function(){return[za,Na,Pa,Ha,La,ja]},qa=function(){return[Na,za,Ha,Pa,La,ja]},Ka=function(){return[Pa,Ha,za,Na,ja,La]},Ja=function(){return[Ha,Pa,Na,za,ja,La]},$a=/* */Object.freeze({__proto__:null,events:function(c){return Zo([er(Oo(),function(r,t){var n,e,i=c.channels,o=Ct(i),u=t,a=(n=o,(e=u).universal?n:H(n,function(t){return M(e.channels,t)}));mt(a,function(t){var n=i[t],e=n.schema,o=En("channel["+t+"] data\nReceiver: "+Zr(r.element),e,u.data);n.onReceive(r,o)})})])}}),Qa=[jn("channels",On(pt.value,ln([pa("onReceive"),ne("schema",Mn())])))],Za=function(e,o,r){return fr(function(t,n){r(t,e,o)})},tc=function(t,n,e,o,r,i){var u=ln(t),a=te(n,[Jn("config",ln(t))]);return oc(u,a,n,e,o,r,i)},nc=function(r,i,u){var t,n,e,o,a,c;return t=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var o=[e].concat(t);return e.config({name:ct(r)}).fold(function(){throw new Error("We could not find any behaviour configuration for: "+r+". Using API: "+u)},function(t){var n=Array.prototype.slice.call(o,1);return i.apply(undefined,[e,t.config,t.state].concat(n))})},n=u,e=i.toString(),o=e.indexOf(")")+1,a=e.indexOf("("),c=e.substring(a+1,o-1).split(/,\s*/),t.toFunctionAnnotation=function(){return{name:n,parameters:gi(c.slice(0,1).concat(c.slice(3)))}},t},ec=function(t){return{key:t,value:undefined}},oc=function(e,t,o,r,n,i,u){var a=function(t){return Rt(t,o)?t[o]():ft.none()},c=Tt(n,function(t,n){return nc(o,t,n)}),s=Tt(i,pi),l=lt(lt(lt({},s),c),{revoke:y(ec,o),config:function(t){var n=En(o+"-config",e,t);return{key:o,value:{config:n,me:l,configAsRaw:Lt(function(){return En(o+"-config",e,t)}),initialConfig:t,state:u}}},schema:ct(t),exhibit:function(t,e){return a(t).bind(function(n){return Ft(r,"exhibit").map(function(t){return t(e,n.config,n.state)})}).getOr(Si({}))},name:ct(o),handlers:function(t){return a(t).map(function(t){return Ft(r,"events").getOr(function(){return{}})(t.config,t.state)}).getOr({})}});return l},rc=$t,ic=ln([Ln("fields"),Ln("name"),ne("active",{}),ne("apis",{}),ne("state",yi),ne("extra",{})]),uc=function(t){var n=En("Creating behaviour: "+t.name,ic,t);return tc(n.fields,n.name,n.active,n.apis,n.extra,n.state)},ac=ln([Ln("branchKey"),Ln("branches"),Ln("name"),ne("active",{}),ne("apis",{}),ne("state",yi),ne("extra",{})]),cc=function(t){var n,e,o,r,i,u,a,c,s=En("Creating behaviour: "+t.name,ac,t);return n=An(s.branchKey,s.branches),e=s.name,o=s.active,r=s.apis,i=s.extra,u=s.state,c=te(e,[Jn("config",a=n)]),oc(a,c,e,o,r,i,u)},sc=ct(undefined),lc=uc({fields:Qa,name:"receiving",active:$a}),fc=/* */Object.freeze({__proto__:null,exhibit:function(t,n){return Si({classes:[],styles:n.useFixed()?{}:{position:"relative"}})}}),dc=function(t){return t.dom.focus()},mc=function(t){return void 0===t&&(t=me.fromDom(document)),ft.from(t.dom.activeElement).map(me.fromDom)},gc=function(n){return mc(Ar(n)).filter(function(t){return n.dom.contains(t.dom)})},pc=function(t,e){var o=Ar(e),n=mc(o).bind(function(n){var r,i,t=function(t){return Ge(n,t)};return t(e)?ft.some(e):(r=t,(i=function(t){for(var n=0;n<t.childNodes.length;n++){var e=me.fromDom(t.childNodes[n]);if(r(e))return ft.some(e);var o=i(t.childNodes[n]);if(o.isSome())return o}return ft.none()})(e.dom))}),r=t(e);return n.each(function(n){mc(o).filter(function(t){return Ge(t,n)}).fold(function(){dc(n)},at)}),r},hc=function(t,n,e,o,r){return{position:t,left:n,top:e,right:o,bottom:r}},vc=function(t,n){var e=function(t){return t+"px"};Ki(t,{position:ft.some(n.position),left:n.left.map(e),top:n.top.map(e),right:n.right.map(e),bottom:n.bottom.map(e)})},bc=Vt([{none:[]},{relative:["x","y","width","height"]},{fixed:["x","y","width","height"]}]),yc=function(t,n,e,o,r,i){var u,a,c,s,l,f,d,m,g,p=n.x-e,h=n.y-o,v=r-(p+n.width),b=i-(h+n.height),y=ft.some(p),x=ft.some(h),w=ft.some(v),S=ft.some(b),k=ft.none();return u=n.direction,a=function(){return hc(t,y,x,k,k)},c=function(){return hc(t,k,x,w,k)},s=function(){return hc(t,y,k,k,S)},l=function(){return hc(t,k,k,w,S)},f=function(){return hc(t,y,x,k,k)},d=function(){return hc(t,y,k,k,S)},m=function(){return hc(t,y,x,k,k)},g=function(){return hc(t,k,x,w,k)},u.fold(a,c,s,l,f,d,m,g)},xc=function(t,n){var e=y(Vu,n),o=t.fold(e,e,function(){var t=Bu();return Vu(n).translate(-t.left,-t.top)}),r=_u(n),i=bu(n);return Pu(o.left,o.top,r,i)},wc=function(t,n,e){var o=xu(n,e);return t.fold(ct(o),ct(o),function(){var t=Bu();return o.translate(-t.left,-t.top)})},Sc=(bc.none,bc.relative),kc=bc.fixed,Cc=function(t,n,e,o){var r=t+n;return o<r?e:r<e?o:r},Oc=function(t,n,e){return Math.min(Math.max(t,n),e)},_c=Vt([{fit:["reposition"]},{nofit:["reposition","deltaW","deltaH"]}]),Tc=function(t,n,e,o){var r,i,u,a,c,s,l,f,d,m,g,p,h,v,b,y,x,w,S,k,C,O,_,T,E,D,B,A,M,F,I,R,V,P=t.x,H=t.y,z=t.bubble.offset,N=z.left,L=z.top,j=(r=o,i=t.boundsRestriction,u=z,c=(a=function(n,e){var o="top"===n||"bottom"===n?u.top:u.left;return Ft(i,n).bind(st).bind(function(t){return"left"===n||"top"===n?e<=t?ft.some(t):ft.none():t<=e?ft.some(t):ft.none()}).map(function(t){return t+o}).getOr(e)})("left",r.x),s=a("top",r.y),l=a("right",r.right),f=a("bottom",r.bottom),Pu(c,s,l-c,f-s)),U=j.y,W=j.bottom,G=j.x,X=j.right,Y=H+L,q=(d=P+N,m=Y,g=n,p=e,v=(h=j).x,b=h.y,y=h.width,x=h.height,S=b<=m,k=(w=v<=d)&&S,C=d+g<=v+y&&m+p<=b+x,O=Math.abs(Math.min(g,w?v+y-d:v-(d+g))),_=Math.abs(Math.min(p,S?b+x-m:b-(m+p))),T=Math.max(h.x,h.right-g),E=Math.max(h.y,h.bottom-p),{originInBounds:k,sizeInBounds:C,limitX:Oc(d,h.x,T),limitY:Oc(m,h.y,E),deltaW:O,deltaH:_}),K=q.originInBounds,J=q.sizeInBounds,$=q.limitX,Q=q.limitY,Z=q.deltaW,tt=q.deltaH,nt=ct(Q+tt-U),et=ct(W-Q),ot=(D=t.direction,A=B=et,M=nt,D.fold(B,B,M,M,B,M,A,A)),rt=ct($+Z-G),it=ct(X-$),ut={x:$,y:Q,width:Z,height:tt,maxHeight:ot,maxWidth:(F=t.direction,R=I=it,V=rt,F.fold(I,V,I,V,R,R,I,V)),direction:t.direction,classes:{on:t.bubble.classesOn,off:t.bubble.classesOff},label:t.label,candidateYforTest:Y};return K&&J?_c.fit(ut):_c.nofit(ut,Z,tt)},Ec=function(t,n,e,o){tu(n,"max-height"),tu(n,"max-width");var r,i,u,a,c,s,l,f,d,m={width:_u(r=n),height:bu(r)};return i=o.preference,u=t,a=m,c=e,s=o.bounds,l=a.width,f=a.height,d=function(t,o,r,i){var n=t(u,a,c);return Tc(n,l,f,s).fold(_c.fit,function(t,n,e){return i<e||r<n?_c.nofit(t,n,e):_c.nofit(o,r,i)})},N(i,function(t,n){var e=y(d,n);return t.fold(_c.fit,e)},_c.nofit({x:u.x,y:u.y,width:a.width,height:a.height,maxHeight:a.height,maxWidth:a.width,direction:Sa(),classes:{on:[],off:[]},label:"none",candidateYforTest:u.y},-1,-1)).fold(st,st)},Dc=function(t,n,e){var o,r;vc(t,(o=e.origin,r=n,o.fold(function(){return hc("absolute",ft.some(r.x),ft.some(r.y),ft.none(),ft.none())},function(t,n,e,o){return yc("absolute",r,t,n,e,o)},function(t,n,e,o){return yc("fixed",r,t,n,e,o)})))},Bc=function(t,n){var e,o,r;e=t,o=Math.floor(n),r=hu.max(e,o,["margin-top","border-top-width","padding-top","padding-bottom","border-bottom-width","margin-bottom"]),Yi(e,"max-height",r+"px")},Ac=ct(function(t,n){Bc(t,n),qi(t,{"overflow-x":"hidden","overflow-y":"auto"})}),Mc=ct(function(t,n){Bc(t,n)}),Fc=function(t,n,e){return t[n]===undefined?e:t[n]},Ic=function(t,n,e,o,r,i){var u,a=Fc(i,"maxHeightFunction",Ac()),c=Fc(i,"maxWidthFunction",at),s=t.anchorBox,l=t.origin,f={bounds:(u=l,r.fold(function(){return u.fold(Nu,Nu,Pu)},function(e){return u.fold(e,e,function(){var t=e(),n=wc(u,t.x,t.y);return Pu(n.left,n.top,t.width,t.height)})})),origin:l,preference:o,maxHeightFunction:a,maxWidthFunction:c};Rc(s,n,e,f)},Rc=function(t,n,e,o){var r,i,u,a,c,s,l=Ec(t,n,e,o);Dc(n,l,o),r=n,i=l.classes,Ni(r,i.off),zi(r,i.on),u=n,a=l,(0,o.maxHeightFunction)(u,a.maxHeight),c=n,s=l,(0,o.maxWidthFunction)(c,s.maxWidth)},Vc=["valignCentre","alignLeft","alignRight","alignCentre","top","bottom","left","right"],Pc=function(t,n,e){var r=function(t){return Ft(e,t).getOr([])},o=function(t,n,e){var o=X(Vc,e);return{offset:xu(t,n),classesOn:U(e,r),classesOff:U(o,r)}};return{southeast:function(){return o(-t,n,["top","alignLeft"])},southwest:function(){return o(t,n,["top","alignRight"])},south:function(){return o(-t/2,n,["top","alignCentre"])},northeast:function(){return o(-t,-n,["bottom","alignLeft"])},northwest:function(){return o(t,-n,["bottom","alignRight"])},north:function(){return o(-t/2,-n,["bottom","alignCentre"])},east:function(){return o(t,-n/2,["valignCentre","left"])},west:function(){return o(-t,-n/2,["valignCentre","right"])},innerNorthwest:function(){return o(-t,n,["top","alignRight"])},innerNortheast:function(){return o(t,n,["top","alignLeft"])},innerNorth:function(){return o(-t/2,n,["top","alignCentre"])},innerSouthwest:function(){return o(-t,-n,["bottom","alignRight"])},innerSoutheast:function(){return o(t,-n,["bottom","alignLeft"])},innerSouth:function(){return o(-t/2,-n,["bottom","alignCentre"])},innerWest:function(){return o(t,-n/2,["valignCentre","right"])},innerEast:function(){return o(-t,-n/2,["valignCentre","left"])}}},Hc=function(){return Pc(0,0,{})},zc=function(n,e){return function(t){return"rtl"===Nc(t)?e:n}},Nc=function(t){return"rtl"===Ji(t,"direction")?"rtl":"ltr"};(na=ta=ta||{}).TopToBottom="toptobottom",na.BottomToTop="bottomtotop";var Lc,jc,Uc,Wc,Gc,Xc="data-alloy-vertical-dir",Yc=function(t){return Xu(t,function(t){return pr(t)&&qr(t,"data-alloy-vertical-dir")===ta.BottomToTop})},qc=function(){return te("layouts",[Ln("onLtr"),Ln("onRtl"),Kn("onBottomLtr"),Kn("onBottomRtl")])},Kc=function(n,t,e,o,r,i,u){var a=u.map(Yc).getOr(!1),c=t.layouts.map(function(t){return t.onLtr(n)}),s=t.layouts.map(function(t){return t.onRtl(n)}),l=a?t.layouts.bind(function(t){return t.onBottomLtr.map(function(t){return t(n)})}).or(c).getOr(r):c.getOr(e),f=a?t.layouts.bind(function(t){return t.onBottomRtl.map(function(t){return t(n)})}).or(s).getOr(i):s.getOr(o);return zc(l,f)(n)},Jc=[Ln("hotspot"),Kn("bubble"),ne("overrides",{}),qc(),va("placement",function(t,n,e){var o=n.hotspot,r=xc(e,o.element),i=Kc(t.element,n,Ka(),Ja(),Ya(),qa(),ft.some(n.hotspot.element));return ft.some({anchorBox:r,bubble:n.bubble.getOr(Hc()),overrides:n.overrides,layouts:i,placer:ft.none()})})],$c=[Ln("x"),Ln("y"),ne("height",0),ne("width",0),ne("bubble",Hc()),ne("overrides",{}),qc(),va("placement",function(t,n,e){var o=wc(e,n.x,n.y),r=Pu(o.left,o.top,n.width,n.height),i=Kc(t.element,n,Ga(),Xa(),Ga(),Xa(),ft.none());return ft.some({anchorBox:r,bubble:n.bubble,overrides:n.overrides,layouts:i,placer:ft.none()})})],Qc=Vt([{screen:["point"]},{absolute:["point","scrollLeft","scrollTop"]}]),Zc=function(t){return t.fold(st,function(t,n,e){return t.translate(-n,-e)})},ts=function(t){return t.fold(st,st)},ns=function(t){return N(t,function(t,n){return t.translate(n.left,n.top)},xu(0,0))},es=function(t){var n=V(t,ts);return ns(n)},os=Qc.screen,rs=Qc.absolute,is=function(t,n,e){var o,r,i=yr(t.element),u=Bu(i),a=(o=t,r=Sr(e.root).dom,ft.from(r.frameElement).map(me.fromDom).filter(function(t){var n=yr(t),e=yr(o.element);return Ge(n,e)}).map(Su).getOr(u));return rs(a,u.left,u.top)},us=function(t,n,e,o){var r=t,i=n,u=e,a=o;t<0&&(r=0,u=e+t),n<0&&(i=0,a=o+n);var c=os(xu(r,i));return ft.some({point:c,width:u,height:a})},as=function(t,l,f,d,m){return t.map(function(t){var n,e,o,r=[l,t.point],i=(n=function(){return es(r)},e=function(){return es(r)},o=function(){return t=V(r,Zc),ns(t);var t},d.fold(n,e,o)),u={x:i.left,y:i.top,width:t.width,height:t.height},a=(f.showAbove?Ya:Ka)(),c=(f.showAbove?qa:Ja)(),s=Kc(m,f,a,c,a,c,ft.none());return{anchorBox:u,bubble:f.bubble.getOr(Hc()),overrides:f.overrides,layouts:s,placer:ft.none()}})},cs=[Ln("node"),Ln("root"),Kn("bubble"),qc(),ne("overrides",{}),ne("showAbove",!1),va("placement",function(r,i,u){var a=is(r,0,i);return i.node.filter(ji).bind(function(t){var n=t.dom.getBoundingClientRect(),e=us(n.left,n.top,n.width,n.height),o=i.node.getOr(r.element);return as(e,a,i,u,o)})})],ss=function(t,n,e,o){return{start:t,soffset:n,finish:e,foffset:o}},ls=Vt([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),fs=(ls.before,ls.on,ls.after,function(t){return t.fold(st,st,st)}),ds=Vt([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),ms={domRange:ds.domRange,relative:ds.relative,exact:ds.exact,exactFromRange:function(t){return ds.exact(t.start,t.soffset,t.finish,t.foffset)},getWin:function(t){var n=t.match({domRange:function(t){return me.fromDom(t.startContainer)},relative:function(t,n){return fs(t)},exact:function(t,n,e,o){return t}});return Sr(n)},range:ss},gs=function(t,n,e){var o,r,i=t.document.createRange();return o=i,n.fold(function(t){o.setStartBefore(t.dom)},function(t,n){o.setStart(t.dom,n)},function(t){o.setStartAfter(t.dom)}),r=i,e.fold(function(t){r.setEndBefore(t.dom)},function(t,n){r.setEnd(t.dom,n)},function(t){r.setEndAfter(t.dom)}),i},ps=function(t,n,e,o,r){var i=t.document.createRange();return i.setStart(n.dom,e),i.setEnd(o.dom,r),i},hs=function(t){return{left:t.left,top:t.top,right:t.right,bottom:t.bottom,width:t.width,height:t.height}},vs=Vt([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),bs=function(t,n,e){return n(me.fromDom(e.startContainer),e.startOffset,me.fromDom(e.endContainer),e.endOffset)},ys=function(t,n){var r,e,o,i=(r=t,n.match({domRange:function(t){return{ltr:ct(t),rtl:ft.none}},relative:function(t,n){return{ltr:Lt(function(){return gs(r,t,n)}),rtl:Lt(function(){return ft.some(gs(r,n,t))})}},exact:function(t,n,e,o){return{ltr:Lt(function(){return ps(r,t,n,e,o)}),rtl:Lt(function(){return ft.some(ps(r,e,o,t,n))})}}}));return(o=(e=i).ltr()).collapsed?e.rtl().filter(function(t){return!1===t.collapsed}).map(function(t){return vs.rtl(me.fromDom(t.endContainer),t.endOffset,me.fromDom(t.startContainer),t.startOffset)}).getOrThunk(function(){return bs(0,vs.ltr,o)}):bs(0,vs.ltr,o)},xs=(vs.ltr,vs.rtl,Lc=hr,jc="text",{get:function(t){if(!Lc(t))throw new Error("Can only get "+jc+" value of a "+jc+" node");return Uc(t).getOr("")},getOption:Uc=function(t){return Lc(t)?ft.from(t.dom.nodeValue):ft.none()},set:function(t,n){if(!Lc(t))throw new Error("Can only set raw "+jc+" value of a "+jc+" node");t.dom.nodeValue=n}}),ws=function(t){return xs.getOption(t)},Ss=["img","br"],ks=function(t){return ws(t).filter(function(t){return 0!==t.trim().length||-1<t.indexOf("\xa0")}).isSome()||M(Ss,mr(t))},Cs=function(t,i){var u=function(t){for(var n=_r(t),e=n.length-1;0<=e;e--){var o=n[e];if(i(o))return ft.some(o);var r=u(o);if(r.isSome())return r}return ft.none()};return u(t)},Os=function(t,n){return e=n,r=(o=t)===undefined?document:o.dom,We(r)?[]:V(r.querySelectorAll(e),me.fromDom);var e,o,r},_s=function(t,n,e,o){var r,i,u,a,c,s=(i=n,u=e,a=o,(c=yr(r=t).dom.createRange()).setStart(r.dom,i),c.setEnd(u.dom,a),c),l=Ge(t,e)&&n===o;return s.collapsed&&!l},Ts=function(t){if(0<t.rangeCount){var n=t.getRangeAt(0),e=t.getRangeAt(t.rangeCount-1);return ft.some(ss(me.fromDom(n.startContainer),n.startOffset,me.fromDom(e.endContainer),e.endOffset))}return ft.none()},Es=function(t){if(null===t.anchorNode||null===t.focusNode)return Ts(t);var n=me.fromDom(t.anchorNode),e=me.fromDom(t.focusNode);return _s(n,t.anchorOffset,e,t.focusOffset)?ft.some(ss(n,t.anchorOffset,e,t.focusOffset)):Ts(t)},Ds=function(t){return n=t,ft.from(n.getSelection()).filter(function(t){return 0<t.rangeCount}).bind(Es);var n},Bs=function(t,n){var i,e,o,r,u=ys(i=t,n).match({ltr:function(t,n,e,o){var r=i.document.createRange();return r.setStart(t.dom,n),r.setEnd(e.dom,o),r},rtl:function(t,n,e,o){var r=i.document.createRange();return r.setStart(e.dom,o),r.setEnd(t.dom,n),r}});return o=(e=u).getClientRects(),0<(r=0<o.length?o[0]:e.getBoundingClientRect()).width||0<r.height?ft.some(r).map(hs):ft.none()},As=function(t,n){return{element:t,offset:n}},Ms=function(t,n){var e=_r(t);if(0===e.length)return As(t,n);if(n<e.length)return As(e[n],0);var o,r=e[e.length-1],i=hr(r)?(o=r,xs.get(o).length):_r(r).length;return As(r,i)},Fs=function(t,n){return(hr(t)?As:Ms)(t,n)},Is=function(t,n){return n.getSelection.getOrThunk(function(){return function(){return Ds(t)}})().map(function(t){var n=Fs(t.start,t.soffset),e=Fs(t.finish,t.foffset);return ms.range(n.element,n.offset,e.element,e.offset)})},Rs=[Kn("getSelection"),Ln("root"),Kn("bubble"),qc(),ne("overrides",{}),ne("showAbove",!1),va("placement",function(t,n,e){var o=Sr(n.root).dom,r=is(t,0,n),i=Is(o,n).bind(function(t){return Bs(o,ms.exactFromRange(t)).orThunk(function(){var n=me.fromText("\ufeff");return Vr(t.start,n),Bs(o,ms.exact(n,0,n,1)).map(function(t){return jr(n),t})}).bind(function(t){return us(t.left,t.top,t.width,t.height)})}),u=Is(o,n).bind(function(t){return pr(t.start)?ft.some(t.start):Cr(t.start)}).getOr(t.element);return as(i,r,n,e,u)})],Vs=function(t){return t.x+t.width},Ps=function(t,n){return t.x-n.width},Hs=function(t,n){return t.y-n.height+t.height},zs=function(t){return t.y},Ns=function(t,n,e){return xa(Vs(t),zs(t),e.southeast(),Sa(),Ba(t,{left:0,top:2}),"link-layout-se")},Ls=function(t,n,e){return xa(Ps(t,n),zs(t),e.southwest(),ka(),Ba(t,{right:1,top:2}),"link-layout-sw")},js=function(t,n,e){return xa(Vs(t),Hs(t,n),e.northeast(),Ca(),Ba(t,{left:0,bottom:3}),"link-layout-ne")},Us=function(t,n,e){return xa(Ps(t,n),Hs(t,n),e.northwest(),Oa(),Ba(t,{right:1,bottom:3}),"link-layout-nw")},Ws=function(){return[Ns,Ls,js,Us]},Gs=function(){return[Ls,Ns,Us,js]},Xs=[Ln("item"),qc(),ne("overrides",{}),va("placement",function(t,n,e){var o=xc(e,n.item.element),r=Kc(t.element,n,Ws(),Gs(),Ws(),Gs(),ft.none());return ft.some({anchorBox:o,bubble:Hc(),overrides:n.overrides,layouts:r,placer:ft.none()})})],Ys=An("anchor",{selection:Rs,node:cs,hotspot:Jc,submenu:Xs,makeshift:$c}),qs=function(t,n,e,o,r){var i={anchorBox:e.anchorBox,origin:n};Ic(i,r.element,e.bubble,e.layouts,o,e.overrides)},Ks=function(t,n,e,o,r,i){var u=i.map(Hu);return Js(t,n,e,o,r,u)},Js=function(c,s,t,n,l,f){var d=En("positioning anchor.info",Ys,n);pc(function(){Yi(l.element,"position","fixed");var t=Qi(l.element,"visibility");Yi(l.element,"visibility","hidden");var n,e,o,r,i=s.useFixed()?(r=document.documentElement,kc(0,0,r.clientWidth,r.clientHeight)):(e=Su((n=c).element),o=n.element.dom.getBoundingClientRect(),Sc(e.left,e.top,o.width,o.height)),u=d.placement,a=f.map(ct).or(s.getBounds);u(c,d,i).each(function(t){t.placer.getOr(qs)(c,i,t,a,l)}),t.fold(function(){tu(l.element,"visibility")},function(t){Yi(l.element,"visibility",t)}),Qi(l.element,"left").isNone()&&Qi(l.element,"top").isNone()&&Qi(l.element,"right").isNone()&&Qi(l.element,"bottom").isNone()&&Qi(l.element,"position").is("fixed")&&tu(l.element,"position")},l.element)},$s=/* */Object.freeze({__proto__:null,position:function(t,n,e,o,r){Ks(t,n,e,o,r,ft.none())},positionWithin:Ks,positionWithinBounds:Js,getMode:function(t,n,e){return n.useFixed()?"fixed":"absolute"}}),Qs=[ne("useFixed",l),Kn("getBounds")],Zs=uc({fields:Qs,name:"positioning",active:fc,apis:$s}),tl=function(t){Yo(t,Ho());var n=t.components();mt(n,tl)},nl=function(t){var n=t.components();mt(n,nl),Yo(t,Po())},el=function(t,n){zr(t.element,n.element)},ol=function(n,t){var e,o=n.components();mt((e=n).components(),function(t){return jr(t.element)}),Lr(e.element),e.syncComponents();var r=X(o,t);mt(r,function(t){tl(t),n.getSystem().removeFromWorld(t)}),mt(t,function(t){t.getSystem().isConnected()?el(n,t):(n.getSystem().addToWorld(t),el(n,t),ji(n.element)&&nl(t)),n.syncComponents()})},rl=function(t,n){il(t,n,zr)},il=function(t,n,e){t.getSystem().addToWorld(n),e(t.element,n.element),ji(t.element)&&nl(n),t.syncComponents()},ul=function(t){tl(t),jr(t.element),t.getSystem().removeFromWorld(t)},al=function(n){var t=kr(n.element).bind(function(t){return n.getSystem().getByDom(t).toOptional()});ul(n),t.each(function(t){t.syncComponents()})},cl=function(t){var n=t.components();mt(n,ul),Lr(t.element),t.syncComponents()},sl=function(t,n){ll(t,n,zr)},ll=function(t,n,e){e(t,n.element);var o=_r(n.element);mt(o,function(t){n.getByDom(t).each(nl)})},fl=function(n){var t=_r(n.element);mt(t,function(t){n.getByDom(t).each(tl)}),jr(n.element)},dl=function(n,t,e,o){e.get().each(function(t){cl(n)});var r=t.getAttachPoint(n);rl(r,n);var i=n.getSystem().build(o);return rl(n,i),e.set(i),i},ml=function(t,n,e,o){var r=dl(t,n,e,o);return n.onOpen(t,r),r},gl=function(n,e,o){o.get().each(function(t){cl(n),al(n),e.onClose(n,t),o.clear()})},pl=function(t,n,e){return e.isOpen()},hl=function(t,n,e){var o,r,i,u,a=n.getAttachPoint(t);Yi(t.element,"position",Zs.getMode(a)),o=t,r="visibility",i=n.cloakVisibilityAttr,u="hidden",Qi(o.element,r).fold(function(){$r(o.element,i)},function(t){Yr(o.element,i,t)}),Yi(o.element,r,u)},vl=function(t,n,e){var o,r,i,u;o=t.element,F(["top","left","right","bottom"],function(t){return Qi(o,t).isSome()})||tu(t.element,"position"),r=t,i="visibility",u=n.cloakVisibilityAttr,Kr(r.element,u).fold(function(){return tu(r.element,i)},function(t){return Yi(r.element,i,t)})},bl=/* */Object.freeze({__proto__:null,cloak:hl,decloak:vl,open:ml,openWhileCloaked:function(t,n,e,o,r){hl(t,n),ml(t,n,e,o),r(),vl(t,n)},close:gl,isOpen:pl,isPartOf:function(n,e,t,o){return pl(0,0,t)&&t.get().exists(function(t){return e.isPartOf(n,t,o)})},getState:function(t,n,e){return e.get()},setContent:function(t,n,e,o){return e.get().map(function(){return dl(t,n,e,o)})}}),yl=/* */Object.freeze({__proto__:null,events:function(e,o){return Zo([er(Bo(),function(t,n){gl(t,e,o)})])}}),xl=[ma("onOpen"),ma("onClose"),Ln("isPartOf"),Ln("getAttachPoint"),ne("cloakVisibilityAttr","data-precloak-visibility")],wl=uc({fields:xl,name:"sandboxing",active:yl,apis:bl,state:/* */Object.freeze({__proto__:null,init:function(){var n=fe(ft.none()),t=ct("not-implemented");return xi({readState:t,isOpen:function(){return n.get().isSome()},clear:function(){n.set(ft.none())},set:function(t){n.set(ft.some(t))},get:function(){return n.get()}})}})}),Sl=ct("dismiss.popups"),kl=ct("reposition.popups"),Cl=ct("mouse.released"),Ol=ln([ne("isExtraPart",l),te("fireEventInstead",[ne("event",zo())])]),_l=function(t){var e=En("Dismissal",Ol,t),n={};return n[Sl()]={schema:ln([Ln("target")]),onReceive:function(n,t){wl.isOpen(n)&&(wl.isPartOf(n,t.target)||e.isExtraPart(n,t.target)||e.fireEventInstead.fold(function(){return wl.close(n)},function(t){return Yo(n,t.event)}))}},n},Tl=ln([te("fireEventInstead",[ne("event",No())]),Gn("doReposition")]),El=function(t){var e=En("Reposition",Tl,t),n={};return n[kl()]={onReceive:function(n){wl.isOpen(n)&&e.fireEventInstead.fold(function(){return e.doReposition(n)},function(t){return Yo(n,t.event)})}},n},Dl=function(t,n,e){n.store.manager.onLoad(t,n,e)},Bl=function(t,n,e){n.store.manager.onUnload(t,n,e)},Al=/* */Object.freeze({__proto__:null,onLoad:Dl,onUnload:Bl,setValue:function(t,n,e,o){n.store.manager.setValue(t,n,e,o)},getValue:function(t,n,e){return n.store.manager.getValue(t,n,e)},getState:function(t,n,e){return e}}),Ml=/* */Object.freeze({__proto__:null,events:function(e,o){var t=e.resetOnDom?[sr(function(t,n){Dl(t,e,o)}),lr(function(t,n){Bl(t,e,o)})]:[Za(e,o,Dl)];return Zo(t)}}),Fl=function(){var t=fe(null);return xi({set:t.set,get:t.get,isNotSet:function(){return null===t.get()},clear:function(){t.set(null)},readState:function(){return{mode:"memory",value:t.get()}}})},Il=function(){var i=fe({}),u=fe({});return xi({readState:function(){return{mode:"dataset",dataByValue:i.get(),dataByText:u.get()}},lookup:function(t){return Ft(i.get(),t).orThunk(function(){return Ft(u.get(),t)})},update:function(t){var n=i.get(),e=u.get(),o={},r={};mt(t,function(n){o[n.value]=n,Ft(n,"meta").each(function(t){Ft(t,"text").each(function(t){r[t]=n})})}),i.set(lt(lt({},n),o)),u.set(lt(lt({},e),r))},clear:function(){i.set({}),u.set({})}})},Rl=/* */Object.freeze({__proto__:null,memory:Fl,dataset:Il,manual:function(){return xi({readState:at})},init:function(t){return t.store.manager.state(t)}}),Vl=function(t,n,e,o){var r=n.store;e.update([o]),r.setValue(t,o),n.onSetValue(t,o)},Pl=[Kn("initialValue"),Ln("getFallbackEntry"),Ln("getDataKey"),Ln("setValue"),va("manager",{setValue:Vl,getValue:function(t,n,e){var o=n.store,r=o.getDataKey(t);return e.lookup(r).fold(function(){return o.getFallbackEntry(r)},function(t){return t})},onLoad:function(n,e,o){e.store.initialValue.each(function(t){Vl(n,e,o,t)})},onUnload:function(t,n,e){e.clear()},state:Il})],Hl=[Ln("getValue"),ne("setValue",at),Kn("initialValue"),va("manager",{setValue:function(t,n,e,o){n.store.setValue(t,o),n.onSetValue(t,o)},getValue:function(t,n,e){return n.store.getValue(t)},onLoad:function(n,e,t){e.store.initialValue.each(function(t){e.store.setValue(n,t)})},onUnload:at,state:yi.init})],zl=[Kn("initialValue"),va("manager",{setValue:function(t,n,e,o){e.set(o),n.onSetValue(t,o)},getValue:function(t,n,e){return e.get()},onLoad:function(t,n,e){n.store.initialValue.each(function(t){e.isNotSet()&&e.set(t)})},onUnload:function(t,n,e){e.clear()},state:Fl})],Nl=[ee("store",{mode:"memory"},An("mode",{memory:zl,manual:Hl,dataset:Pl})),ma("onSetValue"),ne("resetOnDom",!1)],Ll=uc({fields:Nl,name:"representing",active:Ml,apis:Al,extra:{setValueFrom:function(t,n){var e=Ll.getValue(n);Ll.setValue(t,e)}},state:Rl}),jl=function(o,t){return se(o,{},V(t,function(t){return n=t.name(),e="Cannot configure "+t.name()+" for "+o,bn(n,n,Gt(),sn(function(t){return yt("The field: "+n+" is forbidden. "+e)}));var n,e}).concat([le("dump",st)]))},Ul=function(t){return t.dump},Wl=function(t,n){return lt(lt({},t.dump),rc(n))},Gl=jl,Xl=Wl,Yl="placeholder",ql=Vt([{single:["required","valueThunk"]},{multiple:["required","valueThunks"]}]),Kl=function(t){return It(t,"uiType")},Jl=function(t,n,e,o){return Kl(e)&&e.uiType===Yl?(i=e,u=o,(r=t).exists(function(t){return t!==i.owner})?ql.single(!0,ct(i)):Ft(u,i.name).fold(function(){throw new Error("Unknown placeholder component: "+i.name+"\nKnown: ["+Ct(u)+"]\nNamespace: "+r.getOr("none")+"\nSpec: "+JSON.stringify(i,null,2))},function(t){return t.replace()})):ql.single(!1,ct(e));var r,i,u},$l=function(i,u,a,c){return Jl(i,0,a,c).fold(function(t,n){var e=Kl(a)?n(u,a.config,a.validated):n(u),o=Ft(e,"components").getOr([]),r=U(o,function(t){return $l(i,u,t,c)});return[lt(lt({},e),{components:r})]},function(t,n){if(Kl(a)){var e=n(u,a.config,a.validated);return a.validated.preprocess.getOr(st)(e)}return n(u)})},Ql=function(n,e,t,o){var r,i,u,a=Tt(o,function(t,n){return o=t,r=!1,{name:ct(e=n),required:function(){return o.fold(function(t,n){return t},function(t,n){return t})},used:function(){return r},replace:function(){if(r)throw new Error("Trying to use the same placeholder more than once: "+e);return r=!0,o}};var e,o,r}),c=(r=n,i=e,u=a,U(t,function(t){return $l(r,i,t,u)}));return _t(a,function(t){if(!1===t.used()&&t.required())throw new Error("Placeholder: "+t.name()+" was not found in components list\nNamespace: "+n.getOr("none")+"\nComponents: "+JSON.stringify(e.components,null,2))}),c},Zl=ql.single,tf=ql.multiple,nf=ct(Yl),ef=Vt([{required:["data"]},{external:["data"]},{optional:["data"]},{group:["data"]}]),of=ne("factory",{sketch:st}),rf=ne("schema",[]),uf=Ln("name"),af=bn("pname","pname",Xt(function(t){return"<alloy."+oi(t.name)+">"}),Mn()),cf=le("schema",function(){return[Kn("preprocess")]}),sf=ne("defaults",ct({})),lf=ne("overrides",ct({})),ff=fn([of,rf,uf,af,sf,lf]),df=fn([of,rf,uf,sf,lf]),mf=fn([of,rf,uf,af,sf,lf]),gf=fn([of,cf,uf,Ln("unit"),af,sf,lf]),pf=function(t){return t.fold(ft.some,ft.none,ft.some,ft.some)},hf=function(t){var n=function(t){return t.name};return t.fold(n,n,n,n)},vf=function(e,o){return function(t){var n=En("Converting part type",o,t);return e(n)}},bf=vf(ef.required,ff),yf=vf(ef.external,df),xf=vf(ef.optional,mf),wf=vf(ef.group,gf),Sf=ct("entirety"),kf=/* */Object.freeze({__proto__:null,required:bf,external:yf,optional:xf,group:wf,asNamedPart:pf,name:hf,asCommon:function(t){return t.fold(st,st,st,st)},original:Sf}),Cf=function(t,n,e,o){return zt(n.defaults(t,e,o),e,{uid:t.partUids[n.name]},n.overrides(t,e,o))},Of=function(r,t){var n={};return mt(t,function(t){pf(t).each(function(e){var o=_f(r,e.pname);n[e.name]=function(t){var n=En("Part: "+e.name+" in "+r,fn(e.schema),t);return lt(lt({},o),{config:t,validated:n})}})}),n},_f=function(t,n){return{uiType:nf(),owner:t,name:n}},Tf=function(t,n,e){return{uiType:nf(),owner:t,name:n,config:e,validated:{}}},Ef=function(t){return U(t,function(t){return t.fold(ft.none,ft.some,ft.none,ft.none).map(function(t){return Xn(t.name,t.schema.concat([ba(Sf())]))}).toArray()})},Df=function(t){return V(t,hf)},Bf=function(t,n,e){return o=n,i={},r={},mt(e,function(t){t.fold(function(o){i[o.pname]=Zl(!0,function(t,n,e){return o.factory.sketch(Cf(t,o,n,e))})},function(t){var n=o.parts[t.name];r[t.name]=ct(t.factory.sketch(Cf(o,t,n[Sf()]),n))},function(o){i[o.pname]=Zl(!1,function(t,n,e){return o.factory.sketch(Cf(t,o,n,e))})},function(r){i[r.pname]=tf(!0,function(n,t,e){var o=n[r.name];return V(o,function(t){return r.factory.sketch(zt(r.defaults(n,t,e),t,r.overrides(n,t)))})})})}),{internals:ct(i),externals:ct(r)};var o,i,r},Af=function(t,n,e){return Ql(ft.some(t),n,n.components,e)},Mf=function(t,n,e){var o=n.partUids[e];return t.getSystem().getByUid(o).toOptional()},Ff=function(t,n,e){return Mf(t,n,e).getOrDie("Could not find part: "+e)},If=function(t,n,e){var o={},r=n.partUids,i=t.getSystem();return mt(e,function(t){o[t]=ct(i.getByUid(r[t]))}),o},Rf=function(t,n){var e=t.getSystem();return Tt(n.partUids,function(t,n){return ct(e.getByUid(t))})},Vf=function(t){return Ct(t.partUids)},Pf=function(t,n,e){var o={},r=n.partUids,i=t.getSystem();return mt(e,function(t){o[t]=ct(i.getByUid(r[t]).getOrDie())}),o},Hf=function(n,t){var e=Df(t);return $t(V(e,function(t){return{key:t,value:n+"-"+t}}))},zf=function(n){return bn("partUids","partUids",Yt(function(t){return Hf(t.uid,n)}),Mn())},Nf=/* */Object.freeze({__proto__:null,generate:Of,generateOne:Tf,schemas:Ef,names:Df,substitutes:Bf,components:Af,defaultUids:Hf,defaultUidsSchema:zf,getAllParts:Rf,getAllPartNames:Vf,getPart:Mf,getPartOrDie:Ff,getParts:If,getPartsOrDie:Pf}),Lf=function(t,n,e,o,r){var i,u,a=(u=r,(0<(i=o).length?[Xn("parts",i)]:[]).concat([Ln("uid"),ne("dom",{}),ne("components",[]),ba("originalSpec"),ne("debug.sketcher",{})]).concat(u));return En(t+" [SpecSchema]",ln(a.concat(n)),e)},jf=function(t,n,e,o,r){var i=Uf(r),u=Ef(e),a=zf(e),c=Lf(t,n,i,u,[a]),s=Bf(0,c,e);return o(c,Af(t,c,s.internals()),i,s.externals())},Uf=function(t){return It(t,"uid")?t:lt(lt({},t),{uid:li("uid")})},Wf=ln([Ln("name"),Ln("factory"),Ln("configFields"),ne("apis",{}),ne("extraApis",{})]),Gf=ln([Ln("name"),Ln("factory"),Ln("configFields"),Ln("partFields"),ne("apis",{}),ne("extraApis",{})]),Xf=function(t){var i=En("Sketcher for "+t.name,Wf,t),n=Tt(i.apis,bi),e=Tt(i.extraApis,pi);return lt(lt({name:i.name,configFields:i.configFields,sketch:function(t){return n=i.name,e=i.configFields,o=i.factory,r=Uf(t),o(Lf(n,e,r,[],[]),r);var n,e,o,r}},n),e)},Yf=function(t){var n=En("Sketcher for "+t.name,Gf,t),e=Of(n.name,n.partFields),o=Tt(n.apis,bi),r=Tt(n.extraApis,pi);return lt(lt({name:n.name,partFields:n.partFields,configFields:n.configFields,sketch:function(t){return jf(n.name,n.configFields,n.partFields,n.factory,t)},parts:e},o),r)},qf=function(t){for(var n=[],e=function(t){n.push(t)},o=0;o<t.length;o++)t[o].each(e);return n},Kf=function(t,n){return t?ft.some(n):ft.none()},Jf=function(t){return"input"===mr(t)&&"radio"!==qr(t,"type")||"textarea"===mr(t)},$f=/* */Object.freeze({__proto__:null,getCurrent:function(t,n,e){return n.find(t)}}),Qf=[Ln("find")],Zf=uc({fields:Qf,name:"composing",apis:$f}),td=function(e,o,t,r){var n=Os(e.element,"."+o.highlightClass);mt(n,function(n){F(r,function(t){return t.element===n})||(Pi(n,o.highlightClass),e.getSystem().getByDom(n).each(function(t){o.onDehighlight(e,t),Yo(t,Xo())}))})},nd=function(t,n,e,o){td(t,n,0,[o]),ed(t,n,e,o)||(Ri(o.element,n.highlightClass),n.onHighlight(t,o),Yo(o,Go()))},ed=function(t,n,e,o){return Hi(o.element,n.highlightClass)},od=function(t,n,e,o){var r=Os(t.element,"."+n.itemClass);return ft.from(r[o]).fold(function(){return pt.error(new Error("No element found with index "+o))},t.getSystem().getByDom)},rd=function(n,t,e){return qu(n.element,"."+t.itemClass).bind(function(t){return n.getSystem().getByDom(t).toOptional()})},id=function(n,t,e){var o=Os(n.element,"."+t.itemClass);return(0<o.length?ft.some(o[o.length-1]):ft.none()).bind(function(t){return n.getSystem().getByDom(t).toOptional()})},ud=function(e,n,t,o){var r=Os(e.element,"."+n.itemClass);return j(r,function(t){return Hi(t,n.highlightClass)}).bind(function(t){var n=Cc(t,o,0,r.length-1);return e.getSystem().getByDom(r[n]).toOptional()})},ad=function(n,t,e){var o=Os(n.element,"."+t.itemClass);return qf(V(o,function(t){return n.getSystem().getByDom(t).toOptional()}))},cd=/* */Object.freeze({__proto__:null,dehighlightAll:function(t,n,e){return td(t,n,0,[])},dehighlight:function(t,n,e,o){ed(t,n,e,o)&&(Pi(o.element,n.highlightClass),n.onDehighlight(t,o),Yo(o,Xo()))},highlight:nd,highlightFirst:function(n,e,o){rd(n,e).each(function(t){nd(n,e,o,t)})},highlightLast:function(n,e,o){id(n,e).each(function(t){nd(n,e,o,t)})},highlightAt:function(n,e,o,t){od(n,e,o,t).fold(function(t){throw t},function(t){nd(n,e,o,t)})},highlightBy:function(n,e,o,t){var r=ad(n,e);L(r,t).each(function(t){nd(n,e,o,t)})},isHighlighted:ed,getHighlighted:function(n,t,e){return qu(n.element,"."+t.highlightClass).bind(function(t){return n.getSystem().getByDom(t).toOptional()})},getFirst:rd,getLast:id,getPrevious:function(t,n,e){return ud(t,n,0,-1)},getNext:function(t,n,e){return ud(t,n,0,1)},getCandidates:ad}),sd=[Ln("highlightClass"),Ln("itemClass"),ma("onHighlight"),ma("onDehighlight")],ld=uc({fields:sd,name:"highlighting",apis:cd}),fd=[8],dd=[9],md=[13],gd=[27],pd=[32],hd=[37],vd=[38],bd=[39],yd=[40],xd=function(t,n,e){var o=G(t.slice(0,n)),r=G(t.slice(n+1));return L(o.concat(r),e)},wd=function(t,n,e){var o=G(t.slice(0,n));return L(o,e)},Sd=function(t,n,e){var o=t.slice(0,n),r=t.slice(n+1);return L(r.concat(o),e)},kd=function(t,n,e){var o=t.slice(n+1);return L(o,e)},Cd=function(e){return function(t){var n=t.raw;return M(e,n.which)}},Od=function(t){return function(n){return W(t,function(t){return t(n)})}},_d=function(t){return!0===t.raw.shiftKey},Td=function(t){return!0===t.raw.ctrlKey},Ed=x(_d),Dd=function(t,n){return{matches:t,classification:n}},Bd=function(t,n,e){n.exists(function(n){return e.exists(function(t){return Ge(t,n)})})||qo(t,Lo(),{prevFocus:n,newFocus:e})},Ad=function(){var r=function(t){return gc(t.element)};return{get:r,set:function(t,n){var e=r(t);t.getSystem().triggerFocus(n,t.element);var o=r(t);Bd(t,e,o)}}},Md=function(){var r=function(t){return ld.getHighlighted(t).map(function(t){return t.element})};return{get:r,set:function(n,t){var e=r(n);n.getSystem().getByDom(t).fold(at,function(t){ld.highlight(n,t)});var o=r(n);Bd(n,e,o)}}};(Gc=Wc=Wc||{}).OnFocusMode="onFocus",Gc.OnEnterOrSpaceMode="onEnterOrSpace",Gc.OnApiMode="onApi";var Fd,Id=function(t,n,e,o,a){var c=function(n,e,t,o,r){var i,u,a=t(n,e,o,r);return i=a,u=e.event,L(i,function(t){return t.matches(u)}).map(function(t){return t.classification}).bind(function(t){return t(n,e,o,r)})},r={schema:function(){return t.concat([ne("focusManager",Ad()),ee("focusInside","onFocus",Cn(function(t){return M(["onFocus","onEnterOrSpace","onApi"],t)?pt.value(t):pt.error("Invalid value for focusInside")})),va("handler",r),va("state",n),va("sendFocusIn",a)])},processKey:c,toEvents:function(i,u){var t=i.focusInside!==Wc.OnFocusMode?ft.none():a(i).map(function(e){return er(So(),function(t,n){e(t,i,u),n.stop()})}),n=[er(mo(),function(o,r){c(o,r,e,i,u).fold(function(){var n,e,t;n=o,e=r,t=Cd(pd.concat(md))(e.event),i.focusInside===Wc.OnEnterOrSpaceMode&&t&&$e(n,e)&&a(i).each(function(t){t(n,i,u),e.stop()})},function(t){r.stop()})}),er(go(),function(t,n){c(t,n,o,i,u).each(function(t){n.stop()})})];return Zo(t.toArray().concat(n))}};return r},Rd=function(t){var n=[Kn("onEscape"),Kn("onEnter"),ne("selector",'[data-alloy-tabstop="true"]:not(:disabled)'),ne("firstTabstop",0),ne("useTabstopAt",w),Kn("visibilitySelector")].concat([t]),u=function(t,n){var e=t.visibilitySelector.bind(function(t){return Ku(n,t)}).getOr(n);return 0<vu(e)},e=function(n,e,t){var o,r,i;o=e,r=Os(n.element,o.selector),i=H(r,function(t){return u(o,t)}),ft.from(i[o.firstTabstop]).each(function(t){e.focusManager.set(n,t)})},a=function(n,t,e,o,r){return r(t,e,function(t){return u(n=o,e=t)&&n.useTabstopAt(e);var n,e}).fold(function(){return o.cyclic?ft.some(!0):ft.none()},function(t){return o.focusManager.set(n,t),ft.some(!0)})},r=function(n,t,e,o){var r,i,u=Os(n.element,e.selector);return r=n,(i=e).focusManager.get(r).bind(function(t){return Ku(t,i.selector)}).bind(function(t){return j(u,y(Ge,t)).bind(function(t){return a(n,u,t,e,o)})})},o=ct([Dd(Od([_d,Cd(dd)]),function(t,n,e){var o=e.cyclic?xd:wd;return r(t,0,e,o)}),Dd(Cd(dd),function(t,n,e){var o=e.cyclic?Sd:kd;return r(t,0,e,o)}),Dd(Cd(gd),function(n,e,t){return t.onEscape.bind(function(t){return t(n,e)})}),Dd(Od([Ed,Cd(md)]),function(n,e,t){return t.onEnter.bind(function(t){return t(n,e)})})]),i=ct([]);return Id(n,yi.init,o,i,function(){return ft.some(e)})},Vd=Rd(le("cyclic",l)),Pd=Rd(le("cyclic",w)),Hd=function(t,n,e){return Jf(e)&&Cd(pd)(n.event)?ft.none():(Jo(t,e,_o()),ft.some(!0))},zd=function(t,n){return ft.some(!0)},Nd=[ne("execute",Hd),ne("useSpace",!1),ne("useEnter",!0),ne("useControlEnter",!1),ne("useDown",!1)],Ld=function(t,n,e){return e.execute(t,n,t.element)},jd=Id(Nd,yi.init,function(t,n,e,o){var r=e.useSpace&&!Jf(t.element)?pd:[],i=e.useEnter?md:[],u=e.useDown?yd:[],a=r.concat(i).concat(u);return[Dd(Cd(a),Ld)].concat(e.useControlEnter?[Dd(Od([Td,Cd(md)]),Ld)]:[])},function(t,n,e,o){return e.useSpace&&!Jf(t.element)?[Dd(Cd(pd),zd)]:[]},function(){return ft.none()}),Ud=function(){var e=fe(ft.none());return xi({readState:function(){return e.get().map(function(t){return{numRows:String(t.numRows),numColumns:String(t.numColumns)}}).getOr({numRows:"?",numColumns:"?"})},setGridSize:function(t,n){e.set(ft.some({numRows:t,numColumns:n}))},getNumRows:function(){return e.get().map(function(t){return t.numRows})},getNumColumns:function(){return e.get().map(function(t){return t.numColumns})}})},Wd=/* */Object.freeze({__proto__:null,flatgrid:Ud,init:function(t){return t.state(t)}}),Gd=function(i){return function(t,n,e,o){var r=i(t.element);return Kd(r,t,n,e,o)}},Xd=function(t,n){var e=zc(t,n);return Gd(e)},Yd=function(t,n){var e=zc(n,t);return Gd(e)},qd=function(r){return function(t,n,e,o){return Kd(r,t,n,e,o)}},Kd=function(n,e,t,o,r){return o.focusManager.get(e).bind(function(t){return n(e.element,t,o,r)}).map(function(t){return o.focusManager.set(e,t),!0})},Jd=qd,$d=qd,Qd=qd,Zd=function(t){return!((n=t.dom).offsetWidth<=0&&n.offsetHeight<=0);var n},tm=function(t,n,e){var o,r=Os(t,e),i=H(r,Zd);return j(o=i,function(t){return Ge(t,n)}).map(function(t){return{index:t,candidates:o}})},nm=function(t,n){return j(t,function(t){return Ge(n,t)})},em=function(e,t,o,n){return n(Math.floor(t/o),t%o).bind(function(t){var n=t.row*o+t.column;return 0<=n&&n<e.length?ft.some(e[n]):ft.none()})},om=function(r,t,i,u,a){return em(r,t,u,function(t,n){var e=t===i-1?r.length-t*u:u,o=Cc(n,a,0,e-1);return ft.some({row:t,column:o})})},rm=function(i,t,u,a,c){return em(i,t,a,function(t,n){var e=Cc(t,c,0,u-1),o=e===u-1?i.length-e*a:a,r=Oc(n,0,o-1);return ft.some({row:e,column:r})})},im=[Ln("selector"),ne("execute",Hd),ga("onEscape"),ne("captureTab",!1),ya()],um=function(n,e,t){qu(n.element,e.selector).each(function(t){e.focusManager.set(n,t)})},am=function(r){return function(t,n,e,o){return tm(t,n,e.selector).bind(function(t){return r(t.candidates,t.index,o.getNumRows().getOr(e.initSize.numRows),o.getNumColumns().getOr(e.initSize.numColumns))})}},cm=function(t,n,e){return e.captureTab?ft.some(!0):ft.none()},sm=am(function(t,n,e,o){return om(t,n,e,o,-1)}),lm=am(function(t,n,e,o){return om(t,n,e,o,1)}),fm=am(function(t,n,e,o){return rm(t,n,e,o,-1)}),dm=am(function(t,n,e,o){return rm(t,n,e,o,1)}),mm=ct([Dd(Cd(hd),Xd(sm,lm)),Dd(Cd(bd),Yd(sm,lm)),Dd(Cd(vd),Jd(fm)),Dd(Cd(yd),$d(dm)),Dd(Od([_d,Cd(dd)]),cm),Dd(Od([Ed,Cd(dd)]),cm),Dd(Cd(gd),function(t,n,e){return e.onEscape(t,n)}),Dd(Cd(pd.concat(md)),function(n,e,o,t){return r=n,(i=o).focusManager.get(r).bind(function(t){return Ku(t,i.selector)}).bind(function(t){return o.execute(n,e,t)});var r,i})]),gm=ct([Dd(Cd(pd),zd)]),pm=Id(im,Ud,mm,gm,function(){return ft.some(um)}),hm=function(t,n,e,i){var u=function(t,n,e){var o,r=Cc(n,i,0,e.length-1);return r===t?ft.none():(o=e[r],"button"===mr(o)&&"disabled"===qr(o,"disabled")?u(t,r,e):ft.from(e[r]))};return tm(t,e,n).bind(function(t){var n=t.index,e=t.candidates;return u(n,n,e)})},vm=[Ln("selector"),ne("getInitial",ft.none),ne("execute",Hd),ga("onEscape"),ne("executeOnMove",!1),ne("allowVertical",!0)],bm=function(n,e,o){return t=n,(r=o).focusManager.get(t).bind(function(t){return Ku(t,r.selector)}).bind(function(t){return o.execute(n,e,t)});var t,r},ym=function(n,e,t){e.getInitial(n).orThunk(function(){return qu(n.element,e.selector)}).each(function(t){e.focusManager.set(n,t)})},xm=function(t,n,e){return hm(t,e.selector,n,-1)},wm=function(t,n,e){return hm(t,e.selector,n,1)},Sm=function(r){return function(t,n,e,o){return r(t,n,e,o).bind(function(){return e.executeOnMove?bm(t,n,e):ft.some(!0)})}},km=function(t,n,e){return e.onEscape(t,n)},Cm=ct([Dd(Cd(pd),zd)]),Om=Id(vm,yi.init,function(t,n,e,o){var r=hd.concat(e.allowVertical?vd:[]),i=bd.concat(e.allowVertical?yd:[]);return[Dd(Cd(r),Sm(Xd(xm,wm))),Dd(Cd(i),Sm(Yd(xm,wm))),Dd(Cd(md),bm),Dd(Cd(pd),bm),Dd(Cd(gd),km)]},Cm,function(){return ft.some(ym)}),_m=function(t,n,e){return ft.from(t[n]).bind(function(t){return ft.from(t[e]).map(function(t){return{rowIndex:n,columnIndex:e,cell:t}})})},Tm=function(t,n,e,o){var r=t[n].length,i=Cc(e,o,0,r-1);return _m(t,n,i)},Em=function(t,n,e,o){var r=Cc(e,o,0,t.length-1),i=t[r].length,u=Oc(n,0,i-1);return _m(t,r,u)},Dm=function(t,n,e,o){var r=t[n].length,i=Oc(e+o,0,r-1);return _m(t,n,i)},Bm=function(t,n,e,o){var r=Oc(e+o,0,t.length-1),i=t[r].length,u=Oc(n,0,i-1);return _m(t,r,u)},Am=[Xn("selectors",[Ln("row"),Ln("cell")]),ne("cycles",!0),ne("previousSelector",ft.none),ne("execute",Hd)],Mm=function(n,e,t){e.previousSelector(n).orThunk(function(){var t=e.selectors;return qu(n.element,t.cell)}).each(function(t){e.focusManager.set(n,t)})},Fm=function(t,n){return function(e,o,i){var u=i.cycles?t:n;return Ku(o,i.selectors.row).bind(function(t){var n=Os(t,i.selectors.cell);return nm(n,o).bind(function(o){var r=Os(e,i.selectors.row);return nm(r,t).bind(function(t){var n,e=(n=i,V(r,function(t){return Os(t,n.selectors.cell)}));return u(e,t,o).map(function(t){return t.cell})})})})}},Im=Fm(function(t,n,e){return Tm(t,n,e,-1)},function(t,n,e){return Dm(t,n,e,-1)}),Rm=Fm(function(t,n,e){return Tm(t,n,e,1)},function(t,n,e){return Dm(t,n,e,1)}),Vm=Fm(function(t,n,e){return Em(t,e,n,-1)},function(t,n,e){return Bm(t,e,n,-1)}),Pm=Fm(function(t,n,e){return Em(t,e,n,1)},function(t,n,e){return Bm(t,e,n,1)}),Hm=ct([Dd(Cd(hd),Xd(Im,Rm)),Dd(Cd(bd),Yd(Im,Rm)),Dd(Cd(vd),Jd(Vm)),Dd(Cd(yd),$d(Pm)),Dd(Cd(pd.concat(md)),function(n,e,o){return gc(n.element).bind(function(t){return o.execute(n,e,t)})})]),zm=ct([Dd(Cd(pd),zd)]),Nm=Id(Am,yi.init,Hm,zm,function(){return ft.some(Mm)}),Lm=[Ln("selector"),ne("execute",Hd),ne("moveOnTab",!1)],jm=function(n,e,o){return o.focusManager.get(n).bind(function(t){return o.execute(n,e,t)})},Um=function(n,e,t){qu(n.element,e.selector).each(function(t){e.focusManager.set(n,t)})},Wm=function(t,n,e){return hm(t,e.selector,n,-1)},Gm=function(t,n,e){return hm(t,e.selector,n,1)},Xm=ct([Dd(Cd(vd),Qd(Wm)),Dd(Cd(yd),Qd(Gm)),Dd(Od([_d,Cd(dd)]),function(t,n,e,o){return e.moveOnTab?Qd(Wm)(t,n,e,o):ft.none()}),Dd(Od([Ed,Cd(dd)]),function(t,n,e,o){return e.moveOnTab?Qd(Gm)(t,n,e,o):ft.none()}),Dd(Cd(md),jm),Dd(Cd(pd),jm)]),Ym=ct([Dd(Cd(pd),zd)]),qm=Id(Lm,yi.init,Xm,Ym,function(){return ft.some(Um)}),Km=[ga("onSpace"),ga("onEnter"),ga("onShiftEnter"),ga("onLeft"),ga("onRight"),ga("onTab"),ga("onShiftTab"),ga("onUp"),ga("onDown"),ga("onEscape"),ne("stopSpaceKeyup",!1),Kn("focusIn")],Jm=Id(Km,yi.init,function(t,n,e){return[Dd(Cd(pd),e.onSpace),Dd(Od([Ed,Cd(md)]),e.onEnter),Dd(Od([_d,Cd(md)]),e.onShiftEnter),Dd(Od([_d,Cd(dd)]),e.onShiftTab),Dd(Od([Ed,Cd(dd)]),e.onTab),Dd(Cd(vd),e.onUp),Dd(Cd(yd),e.onDown),Dd(Cd(hd),e.onLeft),Dd(Cd(bd),e.onRight),Dd(Cd(pd),e.onSpace),Dd(Cd(gd),e.onEscape)]},function(t,n,e){return e.stopSpaceKeyup?[Dd(Cd(pd),zd)]:[]},function(t){return t.focusIn}),$m=Vd.schema(),Qm=Pd.schema(),Zm=Om.schema(),tg=pm.schema(),ng=Nm.schema(),eg=jd.schema(),og=qm.schema(),rg=Jm.schema(),ig=cc({branchKey:"mode",branches:/* */Object.freeze({__proto__:null,acyclic:$m,cyclic:Qm,flow:Zm,flatgrid:tg,matrix:ng,execution:eg,menu:og,special:rg}),name:"keying",active:{events:function(t,n){return t.handler.toEvents(t,n)}},apis:{focusIn:function(n,e,o){e.sendFocusIn(e).fold(function(){n.getSystem().triggerFocus(n.element,n.element)},function(t){t(n,e,o)})},setGridSize:function(t,n,e,o,r){Rt(e,"setGridSize")?e.setGridSize(o,r):console.error("Layout does not support setGridSize")}},state:Wd}),ug=function(t,n,e,o){var r=t.getSystem().build(o);il(t,r,e)},ag=function(t,n,e,o){var r=cg(t);L(r,function(t){return Ge(o.element,t.element)}).each(al)},cg=function(t,n){return t.components()},sg=function(n,t,e,r,o){var i=cg(n);return ft.from(i[r]).map(function(t){return ag(n,0,0,t),o.each(function(t){ug(n,0,function(t,n){var e,o;o=n,Tr(e=t,r).fold(function(){zr(e,o)},function(t){Vr(t,o)})},t)}),t})},lg=uc({fields:[],name:"replacing",apis:/* */Object.freeze({__proto__:null,append:function(t,n,e,o){ug(t,0,zr,o)},prepend:function(t,n,e,o){ug(t,0,Hr,o)},remove:ag,replaceAt:sg,replaceBy:function(n,t,e,o,r){var i=cg(n);return j(i,o).bind(function(t){return sg(n,0,0,t,r)})},set:function(n,t,e,o){pc(function(){var t=V(o,n.getSystem().build);ol(n,t)},n.element)},contents:cg})}),fg=function(t,n){var e,o;return{key:t,value:{config:{},me:(e=t,o=Zo(n),uc({fields:[Ln("enabled")],name:e,active:{events:ct(o)}})),configAsRaw:ct({}),initialConfig:{},state:yi}}},dg=function(t,n){n.ignore||(dc(t.element),n.onFocus(t))},mg=/* */Object.freeze({__proto__:null,focus:dg,blur:function(t,n){n.ignore||t.element.dom.blur()},isFocused:function(t){return n=t.element,e=Ar(n).dom,n.dom===e.activeElement;var n,e}}),gg=/* */Object.freeze({__proto__:null,exhibit:function(t,n){var e=n.ignore?{}:{attributes:{tabindex:"-1"}};return Si(e)},events:function(e){return Zo([er(So(),function(t,n){dg(t,e),n.stop()})].concat(e.stopMousedown?[er(io(),function(t,n){n.event.prevent()})]:[]))}}),pg=[ma("onFocus"),ne("stopMousedown",!1),ne("ignore",!1)],hg=uc({fields:pg,name:"focusing",active:gg,apis:mg}),vg=function(t,n,e){var o=n.aria;o.update(t,o,e.get())},bg=function(n,t,e){t.toggleClass.each(function(t){(e.get()?Ri:Pi)(n.element,t)})},yg=function(t,n,e){Sg(t,n,e,!e.get())},xg=function(t,n,e){e.set(!0),bg(t,n,e),vg(t,n,e)},wg=function(t,n,e){e.set(!1),bg(t,n,e),vg(t,n,e)},Sg=function(t,n,e,o){(o?xg:wg)(t,n,e)},kg=function(t,n,e){Sg(t,n,e,n.selected)},Cg=/* */Object.freeze({__proto__:null,onLoad:kg,toggle:yg,isOn:function(t,n,e){return e.get()},on:xg,off:wg,set:Sg}),Og=/* */Object.freeze({__proto__:null,exhibit:function(){return Si({})},events:function(t,n){var e,o,r,i=(e=t,o=n,r=yg,dr(function(t){r(t,e,o)})),u=Za(t,n,kg);return Zo(gt([t.toggleOnExecute?[i]:[],[u]]))}}),_g=function(t,n,e){Yr(t.element,"aria-expanded",e)},Tg=[ne("selected",!1),Kn("toggleClass"),ne("toggleOnExecute",!0),ee("aria",{mode:"none"},An("mode",{pressed:[ne("syncWithExpanded",!1),va("update",function(t,n,e){Yr(t.element,"aria-pressed",e),n.syncWithExpanded&&_g(t,n,e)})],checked:[va("update",function(t,n,e){Yr(t.element,"aria-checked",e)})],expanded:[va("update",_g)],selected:[va("update",function(t,n,e){Yr(t.element,"aria-selected",e)})],none:[va("update",at)]}))],Eg=uc({fields:Tg,name:"toggling",active:Og,apis:Cg,state:(Fd=!1,{init:function(){var n=fe(Fd);return{get:function(){return n.get()},set:function(t){return n.set(t)},clear:function(){return n.set(Fd)},readState:function(){return n.get()}}}})}),Dg=function(){var t=function(t,n){n.stop(),Ko(t)};return[er(vo(),t),er(Eo(),t),ar(no()),ar(io())]},Bg=function(t){return Zo(gt([t.map(function(e){return dr(function(t,n){e(t),n.stop()})}).toArray(),Dg()]))},Ag="alloy.item-hover",Mg="alloy.item-focus",Fg=function(t){(gc(t.element).isNone()||hg.isFocused(t))&&(hg.isFocused(t)||hg.focus(t),qo(t,Ag,{item:t}))},Ig=function(t){qo(t,Mg,{item:t})},Rg=ct(Ag),Vg=ct(Mg),Pg=[Ln("data"),Ln("components"),Ln("dom"),ne("hasSubmenu",!1),Kn("toggling"),Gl("itemBehaviours",[Eg,hg,ig,Ll]),ne("ignoreFocus",!1),ne("domModification",{}),va("builder",function(t){return{dom:t.dom,domModification:lt(lt({},t.domModification),{attributes:lt(lt(lt({role:t.toggling.isSome()?"menuitemcheckbox":"menuitem"},t.domModification.attributes),{"aria-haspopup":t.hasSubmenu}),t.hasSubmenu?{"aria-expanded":!1}:{})}),behaviours:Xl(t.itemBehaviours,[t.toggling.fold(Eg.revoke,function(t){return Eg.config(lt({aria:{mode:"checked"}},t))}),hg.config({ignore:t.ignoreFocus,stopMousedown:t.ignoreFocus,onFocus:function(t){Ig(t)}}),ig.config({mode:"execution"}),Ll.config({store:{mode:"memory",initialValue:t.data}}),fg("item-type-events",k(Dg(),[er(so(),Fg),er(To(),hg.focus)]))]),components:t.components,eventOrder:t.eventOrder}}),ne("eventOrder",{})],Hg=[Ln("dom"),Ln("components"),va("builder",function(t){return{dom:t.dom,components:t.components,events:Zo([(n=To(),er(n,function(t,n){n.stop()}))])};var n})],zg=ct("item-widget"),Ng=ct([bf({name:"widget",overrides:function(n){return{behaviours:rc([Ll.config({store:{mode:"manual",getValue:function(t){return n.data},setValue:at}})])}}})]),Lg=[Ln("uid"),Ln("data"),Ln("components"),Ln("dom"),ne("autofocus",!1),ne("ignoreFocus",!1),Gl("widgetBehaviours",[Ll,hg,ig]),ne("domModification",{}),zf(Ng()),va("builder",function(e){var t=Bf(zg(),e,Ng()),n=Af(zg(),e,t.internals()),o=function(t){return Mf(t,e,"widget").map(function(t){return ig.focusIn(t),t})},r=function(t,n){return Jf(n.event.target)||e.autofocus&&n.setSource(t.element),ft.none()};return{dom:e.dom,components:n,domModification:e.domModification,events:Zo([dr(function(t,n){o(t).each(function(t){n.stop()})}),er(so(),Fg),er(To(),function(t,n){e.autofocus?o(t):hg.focus(t)})]),behaviours:Xl(e.widgetBehaviours,[Ll.config({store:{mode:"memory",initialValue:e.data}}),hg.config({ignore:e.ignoreFocus,onFocus:function(t){Ig(t)}}),ig.config({mode:"special",focusIn:e.autofocus?function(t){o(t)}:sc(),onLeft:r,onRight:r,onEscape:function(t,n){return hg.isFocused(t)||e.autofocus?(e.autofocus&&n.setSource(t.element),ft.none()):(hg.focus(t),ft.some(!0))}})])}})],jg=An("type",{widget:Lg,item:Pg,separator:Hg}),Ug=ct([wf({factory:{sketch:function(t){var n=En("menu.spec item",jg,t);return n.builder(n)}},name:"items",unit:"item",defaults:function(t,n){return n.hasOwnProperty("uid")?n:lt(lt({},n),{uid:li("item")})},overrides:function(t,n){return{type:n.type,ignoreFocus:t.fakeFocus,domModification:{classes:[t.markers.item]}}}})]),Wg=ct([Ln("value"),Ln("items"),Ln("dom"),Ln("components"),ne("eventOrder",{}),jl("menuBehaviours",[ld,Ll,Zf,ig]),ee("movement",{mode:"menu",moveOnTab:!0},An("mode",{grid:[ya(),va("config",function(t,n){return{mode:"flatgrid",selector:"."+t.markers.item,initSize:{numColumns:n.initSize.numColumns,numRows:n.initSize.numRows},focusManager:t.focusManager}})],matrix:[va("config",function(t,n){return{mode:"matrix",selectors:{row:n.rowSelector,cell:"."+t.markers.item},focusManager:t.focusManager}}),Ln("rowSelector")],menu:[ne("moveOnTab",!0),va("config",function(t,n){return{mode:"menu",selector:"."+t.markers.item,moveOnTab:n.moveOnTab,focusManager:t.focusManager}})]})),jn("markers",ca()),ne("fakeFocus",!1),ne("focusManager",Ad()),ma("onHighlight")]),Gg=ct("alloy.menu-focus"),Xg=Yf({name:"Menu",configFields:Wg(),partFields:Ug(),factory:function(t,n,e,o){return{uid:t.uid,dom:t.dom,markers:t.markers,behaviours:Wl(t.menuBehaviours,[ld.config({highlightClass:t.markers.selectedItem,itemClass:t.markers.item,onHighlight:t.onHighlight}),Ll.config({store:{mode:"memory",initialValue:t.value}}),Zf.config({find:ft.some}),ig.config(t.movement.config(t,t.movement))]),events:Zo([er(Vg(),function(n,e){var t=e.event;n.getSystem().getByDom(t.target).each(function(t){ld.highlight(n,t),e.stop(),qo(n,Gg(),{menu:n,item:t})})}),er(Rg(),function(t,n){var e=n.event.item;ld.highlight(t,e)})]),components:n,eventOrder:t.eventOrder,domModification:{attributes:{role:"menu"}}}}}),Yg=function(e,o,r,t){return Ft(r,t).bind(function(t){return Ft(e,t).bind(function(t){var n=Yg(e,o,r,t);return ft.some([t].concat(n))})}).getOr([])},qg=function(t,n){var e={};_t(t,function(t,n){mt(t,function(t){e[t]=n})});var o=n,r=Et(n,function(t,n){return{k:t,v:n}}),i=Tt(r,function(t,n){return[n].concat(Yg(e,o,r,n))});return Tt(e,function(t){return Ft(i,t).getOr([t])})},Kg=function(t){return"prepared"===t.type?ft.some(t.menu):ft.none()},Jg={init:function(){var i=fe({}),u=fe({}),a=fe({}),c=fe(ft.none()),s=fe({}),r=function(t,o,r){return e(t).bind(function(n){return e=t,At(i.get(),function(t,n){return t===e}).bind(function(t){return o(t).map(function(t){return{triggeredMenu:n,triggeringItem:t,triggeringPath:r}})});var e})},e=function(t){return n(t).bind(Kg)},n=function(t){return Ft(u.get(),t)},l=function(t){return Ft(i.get(),t)};return{setMenuBuilt:function(t,n){var e;u.set(lt(lt({},u.get()),((e={})[t]={type:"prepared",menu:n},e)))},setContents:function(t,n,e,o){c.set(ft.some(t)),i.set(e),u.set(n),s.set(o);var r=qg(o,e);a.set(r)},expand:function(e){return Ft(i.get(),e).map(function(t){var n=Ft(a.get(),e).getOr([]);return[t].concat(n)})},refresh:function(t){return Ft(a.get(),t)},collapse:function(t){return Ft(a.get(),t).bind(function(t){return 1<t.length?ft.some(t.slice(1)):ft.none()})},lookupMenu:n,lookupItem:l,otherMenus:function(t){var n=s.get();return X(Ct(n),t)},getPrimary:function(){return c.get().bind(e)},getMenus:function(){return u.get()},clear:function(){i.set({}),u.set({}),a.set({}),c.set(ft.none())},isClear:function(){return c.get().isNone()},getTriggeringPath:function(t,o){var n=H(l(t).toArray(),function(t){return e(t).isSome()});return Ft(a.get(),t).bind(function(t){var e=G(n.concat(t));return function(t){for(var n=[],e=0;e<t.length;e++){var o=t[e];if(!o.isSome())return ft.none();n.push(o.getOrDie())}return ft.some(n)}(U(e,function(t,n){return r(t,o,e.slice(0,n+1)).fold(function(){return c.get().is(t)?[]:[ft.none()]},function(t){return[ft.some(t)]})}))})}}},extractPreparedMenu:Kg},$g=ct("collapse-item"),Qg=Xf({name:"TieredMenu",configFields:[ha("onExecute"),ha("onEscape"),pa("onOpenMenu"),pa("onOpenSubmenu"),ma("onRepositionMenu"),ma("onCollapseMenu"),ne("highlightImmediately",!0),Xn("data",[Ln("primary"),Ln("menus"),Ln("expansions")]),ne("fakeFocus",!1),ma("onHighlight"),ma("onHover"),la(),Ln("dom"),ne("navigateOnHover",!0),ne("stayInDom",!1),jl("tmenuBehaviours",[ig,ld,Zf,lg]),ne("eventOrder",{})],apis:{collapseMenu:function(t,n){t.collapseMenu(n)},highlightPrimary:function(t,n){t.highlightPrimary(n)},repositionMenus:function(t,n){t.repositionMenus(n)}},factory:function(a,t){var c,n,i=fe(ft.none()),s=Jg.init(),e=function(t){var o,r,n,e=(o=t,r=a.data.primary,n=a.data.menus,Tt(n,function(t,n){var e=function(){return Xg.sketch(lt(lt({},t),{value:n,markers:a.markers,fakeFocus:a.fakeFocus,onHighlight:a.onHighlight,focusManager:(a.fakeFocus?Md:Ad)()}))};return n===r?{type:"prepared",menu:o.getSystem().build(e())}:{type:"notbuilt",nbMenu:e}})),i=u();return s.setContents(a.data.primary,e,a.data.expansions,i),s.getPrimary()},l=function(t){return Ll.getValue(t).value},u=function(t){return Tt(a.data.menus,function(t,n){return U(t.items,function(t){return"separator"===t.type?[]:[t.data.value]})})},f=function(n,t){ld.highlight(n,t),ld.getHighlighted(t).orThunk(function(){return ld.getFirst(t)}).each(function(t){Jo(n,t.element,To())})},d=function(n,t){return qf(V(t,function(t){return n.lookupMenu(t).bind(function(t){return"prepared"===t.type?ft.some(t.menu):ft.none()})}))},m=function(n,t,e){var o=d(t,t.otherMenus(e));mt(o,function(t){Ni(t.element,[a.markers.backgroundMenu]),a.stayInDom||lg.remove(n,t)})},g=function(t,o){var r,n=(r=t,i.get().getOrThunk(function(){var e={},t=Os(r.element,"."+a.markers.item),n=H(t,function(t){return"true"===qr(t,"aria-haspopup")});return mt(n,function(t){r.getSystem().getByDom(t).each(function(t){var n=l(t);e[n]=t})}),i.set(ft.some(e)),e}));_t(n,function(t,n){var e=M(o,n);Yr(t.element,"aria-expanded",e)})},p=function(o,r,i){return ft.from(i[0]).bind(function(t){return r.lookupMenu(t).bind(function(t){if("notbuilt"===t.type)return ft.none();var n=t.menu,e=d(r,i.slice(1));return mt(e,function(t){Ri(t.element,a.markers.backgroundMenu)}),ji(n.element)||lg.append(o,gu(n)),Ni(n.element,[a.markers.backgroundMenu]),f(o,n),m(o,r,i),ft.some(n)})})};(n=c=c||{})[n.HighlightSubmenu=0]="HighlightSubmenu",n[n.HighlightParent=1]="HighlightParent";var h=function(r,i,u){void 0===u&&(u=c.HighlightSubmenu);var t=l(i);return s.expand(t).bind(function(o){return g(r,o),ft.from(o[0]).bind(function(e){return s.lookupMenu(e).bind(function(t){var n=function(t,n,e){if("notbuilt"!==e.type)return e.menu;var o=t.getSystem().build(e.nbMenu());return s.setMenuBuilt(n,o),o}(r,e,t);return ji(n.element)||lg.append(r,gu(n)),a.onOpenSubmenu(r,i,n,G(o)),u===c.HighlightSubmenu?(ld.highlightFirst(n),p(r,s,o)):(ld.dehighlightAll(n),ft.some(i))})})})},o=function(n,e){var t=l(e);return s.collapse(t).bind(function(t){return g(n,t),p(n,s,t).map(function(t){return a.onCollapseMenu(n,e,t),t})})},r=function(e){return function(n,t){return Ku(t.getSource(),"."+a.markers.item).bind(function(t){return n.getSystem().getByDom(t).toOptional().bind(function(t){return e(n,t).map(w)})})}},v=Zo([er(Gg(),function(e,o){var t=o.event.item;s.lookupItem(l(t)).each(function(){var t=o.event.menu;ld.highlight(e,t);var n=l(o.event.item);s.refresh(n).each(function(t){return m(e,s,t)})})}),dr(function(n,t){var e=t.event.target;n.getSystem().getByDom(e).each(function(t){0===l(t).indexOf("collapse-item")&&o(n,t),h(n,t,c.HighlightSubmenu).fold(function(){a.onExecute(n,t)},at)})}),sr(function(n,t){e(n).each(function(t){lg.append(n,gu(t)),a.onOpenMenu(n,t),a.highlightImmediately&&f(n,t)})})].concat(a.navigateOnHover?[er(Rg(),function(t,n){var e,o,r=n.event.item;e=t,o=l(r),s.refresh(o).bind(function(t){return g(e,t),p(e,s,t)}),h(t,r,c.HighlightParent),a.onHover(t,r)})]:[])),b=function(t){return ld.getHighlighted(t).bind(ld.getHighlighted)},y={collapseMenu:function(n){b(n).each(function(t){o(n,t)})},highlightPrimary:function(n){s.getPrimary().each(function(t){f(n,t)})},repositionMenus:function(o){s.getPrimary().bind(function(n){return b(o).bind(function(t){var n=l(t),e=Mt(s.getMenus()),o=qf(V(e,Jg.extractPreparedMenu));return s.getTriggeringPath(n,function(t){return e=t,Q(o,function(t){if(!t.getSystem().isConnected())return ft.none();var n=ld.getCandidates(t);return L(n,function(t){return l(t)===e})});var e})}).map(function(t){return{primary:n,triggeringPath:t}})}).fold(function(){var t;t=o,ft.from(t.components()[0]).filter(function(t){return"menu"===qr(t.element,"role")}).each(function(t){a.onRepositionMenu(o,t,[])})},function(t){var n=t.primary,e=t.triggeringPath;a.onRepositionMenu(o,n,e)})}};return{uid:a.uid,dom:a.dom,markers:a.markers,behaviours:Wl(a.tmenuBehaviours,[ig.config({mode:"special",onRight:r(function(t,n){return Jf(n.element)?ft.none():h(t,n,c.HighlightSubmenu)}),onLeft:r(function(t,n){return Jf(n.element)?ft.none():o(t,n)}),onEscape:r(function(t,n){return o(t,n).orThunk(function(){return a.onEscape(t,n).map(function(){return t})})}),focusIn:function(n,t){s.getPrimary().each(function(t){Jo(n,t.element,To())})}}),ld.config({highlightClass:a.markers.selectedMenu,itemClass:a.markers.menu}),Zf.config({find:function(t){return ld.getHighlighted(t)}}),lg.config({})]),eventOrder:a.eventOrder,apis:y,events:v}},extraApis:{tieredData:function(t,n,e){return{primary:t,menus:n,expansions:e}},singleData:function(t,n){return{primary:t,menus:Jt(t,n),expansions:{}}},collapseItem:function(t){return{value:oi($g()),meta:{text:t}}}}}),Zg=Xf({name:"InlineView",configFields:[Ln("lazySink"),ma("onShow"),ma("onHide"),Zn("onEscape"),jl("inlineBehaviours",[wl,Ll,lc]),te("fireDismissalEventInstead",[ne("event",zo())]),te("fireRepositionEventInstead",[ne("event",No())]),ne("getRelated",ft.none),ne("isExtraPart",l),ne("eventOrder",ft.none)],factory:function(m,t){var o=function(t,n,e,o){r(t,n,e,function(){return o.map(Hu)})},r=function(t,n,e,o){var r=m.lazySink(t).getOrDie();wl.openWhileCloaked(t,e,function(){return Zs.positionWithinBounds(r,n,t,o())}),Ll.setValue(t,ft.some({mode:"position",anchor:n,getBounds:o}))},i=function(t,n,e,o){var r,i,u,a,c,s,l,f,d=(r=m,i=t,u=n,c=o,s=function(){return r.lazySink(i)},l="horizontal"===(a=e).type?{layouts:{onLtr:Ka,onRtl:Ja}}:{},f=function(t){return 2===t.length?l:{}},Qg.sketch({dom:{tag:"div"},data:a.data,markers:a.menu.markers,highlightImmediately:a.menu.highlightImmediately,onEscape:function(){return wl.close(i),r.onEscape.map(function(t){return t(i)}),ft.some(!0)},onExecute:function(){return ft.some(!0)},onOpenMenu:function(t,n){Zs.positionWithinBounds(s().getOrDie(),u,n,c())},onOpenSubmenu:function(t,n,e,o){var r=s().getOrDie();Zs.position(r,lt({anchor:"submenu",item:n},f(o)),e)},onRepositionMenu:function(t,n,e){var o=s().getOrDie();Zs.positionWithinBounds(o,u,n,c()),mt(e,function(t){var n=f(t.triggeringPath);Zs.position(o,lt({anchor:"submenu",item:t.triggeringItem},n),t.triggeredMenu)})}}));wl.open(t,d),Ll.setValue(t,ft.some({mode:"menu",menu:d}))},n=function(e){wl.isOpen(e)&&Ll.getValue(e).each(function(t){switch(t.mode){case"menu":wl.getState(e).each(function(t){Qg.repositionMenus(t)});break;case"position":var n=m.lazySink(e).getOrDie();Zs.positionWithinBounds(n,t.anchor,e,t.getBounds())}})},e={setContent:function(t,n){wl.setContent(t,n)},showAt:function(t,n,e){o(t,n,e,ft.none())},showWithin:o,showWithinBounds:r,showMenuAt:function(t,n,e){i(t,n,e,function(){return ft.none()})},showMenuWithinBounds:i,hide:function(t){wl.isOpen(t)&&(Ll.setValue(t,ft.none()),wl.close(t))},getContent:function(t){return wl.getState(t)},reposition:n,isOpen:wl.isOpen};return{uid:m.uid,dom:m.dom,behaviours:Wl(m.inlineBehaviours,[wl.config({isPartOf:function(t,n,e){return Qu(n,e)||(o=t,r=e,m.getRelated(o).exists(function(t){return Qu(t,r)}));var o,r},getAttachPoint:function(t){return m.lazySink(t).getOrDie()},onOpen:function(t){m.onShow(t)},onClose:function(t){m.onHide(t)}}),Ll.config({store:{mode:"memory",initialValue:ft.none()}}),lc.config({channels:lt(lt({},_l(lt({isExtraPart:t.isExtraPart},m.fireDismissalEventInstead.map(function(t){return{fireEventInstead:{event:t.event}}}).getOr({})))),El(lt(lt({},m.fireRepositionEventInstead.map(function(t){return{fireEventInstead:{event:t.event}}}).getOr({})),{doReposition:n})))})]),eventOrder:m.eventOrder,apis:e}},apis:{showAt:function(t,n,e,o){t.showAt(n,e,o)},showWithin:function(t,n,e,o,r){t.showWithin(n,e,o,r)},showWithinBounds:function(t,n,e,o,r){t.showWithinBounds(n,e,o,r)},showMenuAt:function(t,n,e,o){t.showMenuAt(n,e,o)},showMenuWithinBounds:function(t,n,e,o,r){t.showMenuWithinBounds(n,e,o,r)},hide:function(t,n){t.hide(n)},isOpen:function(t,n){return t.isOpen(n)},getContent:function(t,n){return t.getContent(n)},setContent:function(t,n,e){t.setContent(n,e)},reposition:function(t,n){t.reposition(n)}}}),tp=function(t){return t.x},np=function(t,n){return t.x+t.width/2-n.width/2},ep=function(t,n){return t.x+t.width-n.width},op=function(t){return t.y},rp=function(t,n){return t.y+t.height-n.height},ip=function(t,n,e){return xa(ep(t,n),rp(t,n),e.innerSoutheast(),Oa(),Ba(t,{right:0,bottom:3}),"layout-inner-se")},up=function(t,n,e){return xa(tp(t),rp(t,n),e.innerSouthwest(),Ca(),Ba(t,{left:1,bottom:3}),"layout-inner-sw")},ap=function(t,n,e){return xa(ep(t,n),op(t),e.innerNortheast(),ka(),Ba(t,{right:0,top:2}),"layout-inner-ne")},cp=function(t,n,e){return xa(tp(t),op(t),e.innerNorthwest(),Sa(),Ba(t,{left:1,top:2}),"layout-inner-nw")},sp=function(t,n,e){return xa(np(t,n),op(t),e.innerNorth(),_a(),Ba(t,{top:2}),"layout-inner-n")},lp=function(t,n,e){return xa(np(t,n),rp(t,n),e.innerSouth(),Ta(),Ba(t,{bottom:3}),"layout-inner-s")},fp=tinymce.util.Tools.resolve("tinymce.util.Delay"),dp=Xf({name:"Button",factory:function(t){var n=Bg(t.action),e=t.dom.tag,o=function(n){return Ft(t.dom,"attributes").bind(function(t){return Ft(t,n)})};return{uid:t.uid,dom:t.dom,components:t.components,events:n,behaviours:Xl(t.buttonBehaviours,[hg.config({}),ig.config({mode:"execution",useSpace:!0,useEnter:!0})]),domModification:{attributes:function(){if("button"!==e)return{role:o("role").getOr("button")};var t=o("type").getOr("button"),n=o("role").map(function(t){return{role:t}}).getOr({});return lt({type:t},n)}()},eventOrder:t.eventOrder}},configFields:[ne("uid",undefined),Ln("dom"),ne("components",[]),Gl("buttonBehaviours",[hg,ig]),Kn("action"),Kn("role"),ne("eventOrder",{})]}),mp=function(t){var n=t.uid!==undefined&&Rt(t,"uid")?t.uid:li("memento");return{get:function(t){return t.getSystem().getByUid(n).getOrDie()},getOpt:function(t){return t.getSystem().getByUid(n).toOptional()},asSpec:function(){return lt(lt({},t),{uid:n})}}},gp=function(t){return ft.from(t()["temporary-placeholder"]).getOr("!not found!")},pp=function(t,n){return ft.from(n()[t.toLowerCase()]).getOrThunk(function(){return gp(n)})},hp={success:"checkmark",error:"warning",err:"error",warning:"warning",warn:"warning",info:"info"},vp=Xf({name:"Notification",factory:function(n){var t,e,o=mp({dom:{tag:"p",innerHtml:n.translationProvider(n.text)},behaviours:rc([lg.config({})])}),r=function(t){return{dom:{tag:"div",classes:["tox-bar"],attributes:{style:"width: "+t+"%"}}}},i=function(t){return{dom:{tag:"div",classes:["tox-text"],innerHtml:t+"%"}}},u=mp({dom:{tag:"div",classes:n.progress?["tox-progress-bar","tox-progress-indicator"]:["tox-progress-bar"]},components:[{dom:{tag:"div",classes:["tox-bar-container"]},components:[r(0)]},i(0)],behaviours:rc([lg.config({})])}),a={updateProgress:function(t,n){t.getSystem().isConnected()&&u.getOpt(t).each(function(t){lg.set(t,[{dom:{tag:"div",classes:["tox-bar-container"]},components:[r(n)]},i(n)])})},updateText:function(t,n){var e;t.getSystem().isConnected()&&(e=o.get(t),lg.set(e,[lu(n)]))}},c=gt([n.icon.toArray(),n.level.toArray(),n.level.bind(function(t){return ft.from(hp[t])}).toArray()]),s=mp(dp.sketch({dom:{tag:"button",classes:["tox-notification__dismiss","tox-button","tox-button--naked","tox-button--icon"]},components:[{dom:{tag:"div",classes:["tox-icon"],innerHtml:pp("close",n.iconProvider),attributes:{"aria-label":n.translationProvider("Close")}}}],action:function(t){n.onAction(t)}})),l=[{dom:{tag:"div",classes:["tox-notification__icon"],innerHtml:(t=c,e=n.iconProvider,Q(t,function(t){return ft.from(e()[t.toLowerCase()])}).getOrThunk(function(){return gp(e)}))}},{dom:{tag:"div",classes:["tox-notification__body"]},components:[o.asSpec()],behaviours:rc([lg.config({})])}];return{uid:n.uid,dom:{tag:"div",attributes:{role:"alert"},classes:n.level.map(function(t){return["tox-notification","tox-notification--in","tox-notification--"+t]}).getOr(["tox-notification","tox-notification--in"])},behaviours:rc([hg.config({}),fg("notification-events",[er(lo(),function(t){s.getOpt(t).each(hg.focus)})])]),components:l.concat(n.progress?[u.asSpec()]:[]).concat(n.closeButton?[s.asSpec()]:[]),apis:a}},configFields:[Kn("level"),Ln("progress"),Ln("icon"),Ln("onAction"),Ln("text"),Ln("iconProvider"),Ln("translationProvider"),ue("closeButton",!0)],apis:{updateProgress:function(t,n,e){t.updateProgress(n,e)},updateText:function(t,n,e){t.updateText(n,e)}}});function bp(t,u,a){var c=u.backstage;return{open:function(t,n){var e=!t.closeButton&&t.timeout&&(0<t.timeout||t.timeout<0),o=function(){n(),Zg.hide(i)},r=mu(vp.sketch({text:t.text,level:M(["success","error","warning","warn","info"],t.type)?t.type:undefined,progress:!0===t.progressBar,icon:ft.from(t.icon),closeButton:!e,onAction:o,iconProvider:c.shared.providers.icons,translationProvider:c.shared.providers.translate})),i=mu(Zg.sketch(lt({dom:{tag:"div",classes:["tox-notifications-container"]},lazySink:u.backstage.shared.getSink,fireDismissalEventInstead:{}},c.shared.header.isPositionedAtTop()?{}:{fireRepositionEventInstead:{}})));return a.add(i),0<t.timeout&&fp.setTimeout(function(){o()},t.timeout),{close:o,moveTo:function(t,n){Zg.showAt(i,{anchor:"makeshift",x:t,y:n},gu(r))},moveRel:function(t,n){var e,o;"banner"!==n?(e=function(t){switch(t){case"bc-bc":return lp;case"tc-tc":return sp;case"tc-bc":return La;case"bc-tc":default:return ja}}(n),o={anchor:"node",root:Ui(),node:ft.some(me.fromDom(t)),layouts:{onRtl:function(){return[e]},onLtr:function(){return[e]}}},Zg.showAt(i,o,gu(r))):Zg.showAt(i,u.backstage.shared.anchors.banner(),gu(r))},text:function(t){vp.updateText(r,t)},settings:t,getEl:function(){return r.element.dom},progressBar:{value:function(t){vp.updateProgress(r,t)}}}},close:function(t){t.close()},reposition:function(t){var e;mt(t,function(t){return t.moveTo(0,0)}),0<(e=t).length&&(K(e).each(function(t){return t.moveRel(null,"banner")}),mt(e,function(t,n){0<n&&t.moveRel(e[n-1].getEl(),"bc-tc")}))},getArgs:function(t){return t.settings}}}var yp,xp,wp=function(e,o){var r=null;return{cancel:function(){null!==r&&(clearTimeout(r),r=null)},throttle:function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];null!==r&&clearTimeout(r),r=setTimeout(function(){e.apply(null,t),r=null},o)}}},Sp=tinymce.util.Tools.resolve("tinymce.dom.TextSeeker"),kp=function(o,t,n,e,r){var i=Sp(o,function(t){return e=t,(n=o).isBlock(e)||M(["BR","IMG","HR","INPUT"],e.nodeName)||"false"===n.getContentEditable(e);var n,e});return ft.from(i.backwards(t,n,e,r))},Cp=function(e,n){return Op(me.fromDom(e.selection.getNode())).getOrThunk(function(){var t=me.fromHtml('<span data-mce-autocompleter="1" data-mce-bogus="1"></span>',e.getDoc());return zr(t,me.fromDom(n.extractContents())),n.insertNode(t.dom),kr(t).each(function(t){return t.dom.normalize()}),Cs(t,ks).map(function(t){var n;e.selection.setCursorLocation(t.dom,"img"===mr(n=t)?1:ws(n).fold(function(){return _r(n).length},function(t){return t.length}))}),t})},Op=function(t){return Ku(t,"[data-mce-autocompleter]")},_p=function(t){return t.toString().replace(/\u00A0/g," ").replace(/\uFEFF/g,"")},Tp=function(t){return""!==t&&-1!==" \xa0\f\n\r\t\x0B".indexOf(t)},Ep=function(t,n){return t.substring(n.length)},Dp=function(t,o,r,i){if(void 0===i&&(i=0),!(n=o).collapsed||3!==n.startContainer.nodeType)return ft.none();var n,e=t.getParent(o.startContainer,t.isBlock)||t.getRoot();return kp(t,o.startContainer,o.startOffset,function(t,n,e){return function(t,n,e){for(var o=n-1;0<=o;o--){var r=t.charAt(o);if(Tp(r))return ft.none();if(r===e)break}return ft.some(o)}(e,n,r).getOr(n)},e).bind(function(t){var n=o.cloneRange();if(n.setStart(t.container,t.offset),n.setEnd(o.endContainer,o.endOffset),n.collapsed)return ft.none();var e=_p(n);return 0!==e.lastIndexOf(r)||Ep(e,r).length<i?ft.none():ft.some({text:Ep(e,r),range:n,triggerChar:r})})},Bp=function(o,t,r,n){return void 0===n&&(n=0),Op(me.fromDom(t.startContainer)).fold(function(){return Dp(o,t,r,n)},function(t){var n=o.createRng();n.selectNode(t.dom);var e=_p(n);return ft.some({range:n,text:Ep(e,r),triggerChar:r})})},Ap=function(e,t){t.on("keypress compositionend",e.onKeypress.throttle),t.on("remove",e.onKeypress.cancel);var o=function(t,n){qo(t,mo(),{raw:n})};t.on("keydown",function(n){var t=function(){return e.getView().bind(ld.getHighlighted)};8===n.which&&e.onKeypress.throttle(n),e.isActive()&&(27===n.which&&e.cancelIfNecessary(),e.isMenuOpen()?13===n.which?(t().each(Ko),n.preventDefault()):40===n.which?(t().fold(function(){e.getView().each(ld.highlightFirst)},function(t){o(t,n)}),n.preventDefault(),n.stopImmediatePropagation()):37!==n.which&&38!==n.which&&39!==n.which||t().each(function(t){o(t,n),n.preventDefault(),n.stopImmediatePropagation()}):13!==n.which&&38!==n.which&&40!==n.which||e.cancelIfNecessary())}),t.on("NodeChange",function(t){e.isActive()&&!e.isProcessingAction()&&Op(me.fromDom(t.element)).isNone()&&e.cancelIfNecessary()})},Mp=tinymce.util.Tools.resolve("tinymce.util.Promise"),Fp=function(t,n){return{container:t,offset:n}},Ip=function(t){if(3===t.nodeType)return Fp(t,t.data.length);var n=t.childNodes;return 0<n.length?Ip(n[n.length-1]):Fp(t,n.length)},Rp=function(t,n){var e=t.childNodes;return 0<e.length&&n<e.length?Rp(e[n],0):0<e.length&&1===t.nodeType&&e.length===n?Ip(e[e.length-1]):Fp(t,n)},Vp=function(r){return function(t){var n,e,o=Rp(t.startContainer,t.startOffset);return!kp(n=r,(e=o).container,e.offset,function(t,n){return 0===n?-1:n},n.getRoot()).filter(function(t){var n=t.container.data.charAt(t.offset-1);return!Tp(n)}).isSome()}},Pp=function(n,e){var o,r,t=e(),i=n.selection.getRng();return o=n.dom,r=i,Q(t.triggerChars,function(t){return Bp(o,r,t)}).bind(function(t){return Hp(n,e,t)})},Hp=function(n,t,e,o){void 0===o&&(o={});var r=t(),i=n.selection.getRng().startContainer.nodeValue,u=H(r.lookupByChar(e.triggerChar),function(t){return e.text.length>=t.minChars&&t.matches.getOrThunk(function(){return Vp(n.dom)})(e.range,i,e.text)});if(0===u.length)return ft.none();var a=Mp.all(V(u,function(n){return n.fetch(e.text,n.maxResults,o).then(function(t){return{matchText:e.text,items:t,columns:n.columns,onAction:n.onAction,highlightOn:n.highlightOn}})}));return ft.some({lookupData:a,context:e})},zp=fn([Un("type"),Qn("text")]),Np=fn([ne("type","autocompleteitem"),ne("active",!1),ne("disabled",!1),ne("meta",{}),Un("value"),Qn("text"),Qn("icon")]),Lp=fn([Un("type"),Un("ch"),oe("minChars",1),ne("columns",1),oe("maxResults",10),Zn("matches"),Gn("fetch"),Gn("onAction"),ce("highlightOn",[],Rn)]),jp=[ue("disabled",!1),Qn("tooltip"),Qn("icon"),Qn("text"),ae("onSetup",function(){return at})],Up=fn([Un("type"),Gn("onAction")].concat(jp)),Wp=function(t){return _n("toolbarbutton",Up,t)},Gp=[ue("active",!1)].concat(jp),Xp=fn(Gp.concat([Un("type"),Gn("onAction")])),Yp=function(t){return _n("ToggleButton",Xp,t)},qp=[ae("predicate",l),ie("scope","node",["node","editor"]),ie("position","selection",["node","selection","line"])],Kp=jp.concat([ne("type","contextformbutton"),ne("primary",!1),Gn("onAction"),le("original",st)]),Jp=Gp.concat([ne("type","contextformbutton"),ne("primary",!1),Gn("onAction"),le("original",st)]),$p=jp.concat([ne("type","contextformbutton")]),Qp=Gp.concat([ne("type","contextformtogglebutton")]),Zp=An("type",{contextformbutton:Kp,contextformtogglebutton:Jp}),th=fn([ne("type","contextform"),ae("initValue",function(){return""}),Qn("label"),qn("commands",Zp),Jn("launch",An("type",{contextformbutton:$p,contextformtogglebutton:Qp}))].concat(qp)),nh=fn([ne("type","contexttoolbar"),Un("items")].concat(qp)),eh=function(t){var n,e,o=t.ui.registry.getAll().popups,r=Tt(o,function(t){return _n("Autocompleter",Lp,t).fold(function(t){throw new Error(Dn(t))},function(t){return t})}),i=(n=Bt(r,function(t){return t.ch}),e={},mt(n,function(t){e[t]={}}),Ct(e)),u=Mt(r);return{dataset:r,triggerChars:i,lookupByChar:function(n){return H(u,function(t){return t.ch===n})}}};(xp=yp=yp||{})[xp.CLOSE_ON_EXECUTE=0]="CLOSE_ON_EXECUTE",xp[xp.BUBBLE_TO_SANDBOX=1]="BUBBLE_TO_SANDBOX";var oh,rh,ih=yp,uh="tox-menu-nav__js",ah="tox-collection__item",ch="tox-swatch",sh={normal:uh,color:ch},lh="tox-collection__item--enabled",fh="tox-collection__item-label",dh="tox-collection__item-caret",mh="tox-collection__item--active",gh="tox-collection__item-container",ph="tox-collection__item-container--row",hh=function(t){return Ft(sh,t).getOr(uh)},vh=function(t){return{backgroundMenu:"tox-background-menu",selectedMenu:"tox-selected-menu",selectedItem:"tox-collection__item--active",hasIcons:"tox-menu--has-icons",menu:"color"===t?"tox-swatches":"tox-menu",tieredMenu:"tox-tiered-menu"}},bh=function(t){var n=vh(t);return{backgroundMenu:n.backgroundMenu,selectedMenu:n.selectedMenu,menu:n.menu,selectedItem:n.selectedItem,item:hh(t)}},yh=[Xg.parts.items({})],xh=function(t,n,e){var o=vh(e);return{dom:{tag:"div",classes:gt([[o.tieredMenu]])},markers:bh(e)}},wh=function(e,o){return function(t){var n=R(t,o);return V(n,function(t){return{dom:e,components:t}})}},Sh=function(t,e){var o=[],r=[];return mt(t,function(t,n){e(t,n)?(0<r.length&&o.push(r),r=[],It(t.dom,"innerHtml")&&r.push(t)):r.push(t)}),0<r.length&&o.push(r),V(o,function(t){return{dom:{tag:"div",classes:["tox-collection__group"]},components:t}})},kh=function(n,e,t){return{dom:{tag:"div",classes:["tox-menu","tox-collection"].concat(1===n?["tox-collection--list"]:["tox-collection--grid"])},components:[Xg.parts.items({preprocess:function(t){return"auto"!==n&&1<n?wh({tag:"div",classes:["tox-collection__group"]},n)(t):Sh(t,function(t,n){return"separator"===e[n].type})}})]}},Ch=function(t){return F(t,function(t){return"icon"in t&&t.icon!==undefined})},Oh=function(t){return console.error(Dn(t)),console.log(t),ft.none()},_h=function(t,n,e,o,r){var i,u=(i=e,{dom:{tag:"div",classes:["tox-collection","tox-collection--horizontal"]},components:[Xg.parts.items({preprocess:function(t){return Sh(t,function(t,n){return"separator"===i[n].type})}})]});return{value:t,dom:u.dom,components:u.components,items:e}},Th=function(t,n,e,o,r){var i,u,a,c,s,l;return"color"===r?{value:t,dom:(a=(i=o,{dom:{tag:"div",classes:["tox-menu","tox-swatches-menu"]},components:[{dom:{tag:"div",classes:["tox-swatches"]},components:[Xg.parts.items({preprocess:"auto"!==i?wh({tag:"div",classes:["tox-swatches__row"]},i):st})]}]})).dom,components:a.components,items:e}:"normal"===r&&"auto"===o?{value:t,dom:(a=kh(o,e)).dom,components:a.components,items:e}:"normal"===r&&1===o?{value:t,dom:(a=kh(1,e)).dom,components:a.components,items:e}:"normal"===r?{value:t,dom:(a=kh(o,e)).dom,components:a.components,items:e}:"listpreview"!==r||"auto"===o?{value:t,dom:(c=n,s=o,l=vh(r),{tag:"div",classes:gt([[l.menu,"tox-menu-"+s+"-column"],c?[l.hasIcons]:[]])}),components:yh,items:e}:{value:t,dom:(a=(u=o,{dom:{tag:"div",classes:["tox-menu","tox-collection","tox-collection--toolbar","tox-collection--toolbar-lg"]},components:[Xg.parts.items({preprocess:wh({tag:"div",classes:["tox-collection__group"]},u)})]})).dom,components:a.components,items:e}},Eh=[Un("type"),Un("src"),Qn("alt"),ce("classes",[],Rn)],Dh=fn(Eh),Bh=[Un("type"),Un("text"),Qn("name"),ce("classes",["tox-collection__item-label"],Rn)],Ah=fn(Bh),Mh=kn(function(){return Bn("type",{cardimage:Dh,cardtext:Ah,cardcontainer:Fh})}),Fh=fn([Un("type"),re("direction","horizontal"),re("align","left"),re("valign","middle"),qn("items",Mh)]),Ih=[ue("disabled",!1),Qn("text"),Qn("shortcut"),bn("value","value",Xt(function(){return oi("menuitem-value")}),Mn()),ne("meta",{})],Rh=fn([Un("type"),Qn("label"),qn("items",Mh),ae("onSetup",function(){return at}),ae("onAction",at)].concat(Ih)),Vh=fn([Un("type"),ue("active",!1),Qn("icon")].concat(Ih)),Ph=fn([Un("type"),Wn("fancytype",["inserttable","colorswatch"]),ae("onAction",at)]),Hh=fn([Un("type"),ae("onSetup",function(){return at}),ae("onAction",at),Qn("icon")].concat(Ih)),zh=fn([Un("type"),Gn("getSubmenuItems"),ae("onSetup",function(){return at}),Qn("icon")].concat(Ih)),Nh=fn([Un("type"),Qn("icon"),ue("active",!1),ae("onSetup",function(){return at}),Gn("onAction")].concat(Ih)),Lh=function(t,o,n){var r=Os(t.element,"."+n);if(0<r.length){var e=j(r,function(t){var n=t.dom.getBoundingClientRect().top,e=r[0].dom.getBoundingClientRect().top;return Math.abs(n-e)>o}).getOr(r.length);return ft.some({numColumns:e,numRows:Math.ceil(r.length/e)})}return ft.none()},jh=function(t,n){return rc([fg(t,n)])},Uh=function(t){return jh(oi("unnamed-events"),t)},Wh=oi("tooltip.exclusive"),Gh=oi("tooltip.show"),Xh=oi("tooltip.hide"),Yh=function(t,n,e){t.getSystem().broadcastOn([Wh],{})},qh=/* */Object.freeze({__proto__:null,hideAllExclusive:Yh,setComponents:function(t,n,e,o){e.getTooltip().each(function(t){t.getSystem().isConnected()&&lg.set(t,o)})}}),Kh=/* */Object.freeze({__proto__:null,events:function(r,i){var e=function(n){i.getTooltip().each(function(t){al(t),r.onHide(n,t),i.clearTooltip()}),i.clearTimer()};return Zo(gt([[er(Gh,function(o){i.resetTimer(function(){var n,t,e;n=o,i.isShowing()||(Yh(n),t=r.lazySink(n).getOrDie(),e=n.getSystem().build({dom:r.tooltipDom,components:r.tooltipComponents,events:Zo("normal"===r.mode?[er(so(),function(t){Yo(n,Gh)}),er(ao(),function(t){Yo(n,Xh)})]:[]),behaviours:rc([lg.config({})])}),i.setTooltip(e),rl(t,e),r.onShow(n,e),Zs.position(t,r.anchor(n),e))},r.delay)}),er(Xh,function(t){i.resetTimer(function(){e(t)},r.delay)}),er(Oo(),function(t,n){n.universal||M(n.channels,Wh)&&e(t)}),lr(function(t){e(t)})],"normal"===r.mode?[er(lo(),function(t){Yo(t,Gh)}),er(ko(),function(t){Yo(t,Xh)}),er(so(),function(t){Yo(t,Gh)}),er(ao(),function(t){Yo(t,Xh)})]:[er(Go(),function(t,n){Yo(t,Gh)}),er(Xo(),function(t){Yo(t,Xh)})]]))}}),Jh=[Ln("lazySink"),Ln("tooltipDom"),ne("exclusive",!0),ne("tooltipComponents",[]),ne("delay",300),ie("mode","normal",["normal","follow-highlight"]),ne("anchor",function(t){return{anchor:"hotspot",hotspot:t,layouts:{onLtr:ct([ja,La,Pa,za,Ha,Na]),onRtl:ct([ja,La,Pa,za,Ha,Na])}}}),ma("onHide"),ma("onShow")],$h=uc({fields:Jh,name:"tooltipping",active:Kh,state:/* */Object.freeze({__proto__:null,init:function(){var e=fe(ft.none()),n=fe(ft.none()),o=function(){e.get().each(function(t){clearTimeout(t)})},t=ct("not-implemented");return xi({getTooltip:function(){return n.get()},isShowing:function(){return n.get().isSome()},setTooltip:function(t){n.set(ft.some(t))},clearTooltip:function(){n.set(ft.none())},clearTimer:o,resetTimer:function(t,n){o(),e.set(ft.some(setTimeout(function(){t()},n)))},readState:t})}}),apis:qh}),Qh=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),Zh=tinymce.util.Tools.resolve("tinymce.util.I18n"),tv=["input","button","textarea","select"],nv=function(t,n,e){(n.disabled()?av:cv)(t,n)},ev=function(t,n){return!0===n.useNative&&M(tv,mr(t.element))},ov=function(t){Yr(t.element,"disabled","disabled")},rv=function(t){$r(t.element,"disabled")},iv=function(t){Yr(t.element,"aria-disabled","true")},uv=function(t){Yr(t.element,"aria-disabled","false")},av=function(n,t,e){t.disableClass.each(function(t){Ri(n.element,t)}),(ev(n,t)?ov:iv)(n),t.onDisabled(n)},cv=function(n,t,e){t.disableClass.each(function(t){Pi(n.element,t)}),(ev(n,t)?rv:uv)(n),t.onEnabled(n)},sv=function(t,n){return ev(t,n)?Jr(t.element,"disabled"):"true"===qr(t.element,"aria-disabled")},lv=/* */Object.freeze({__proto__:null,enable:cv,disable:av,isDisabled:sv,onLoad:nv,set:function(t,n,e,o){(o?av:cv)(t,n)}}),fv=/* */Object.freeze({__proto__:null,exhibit:function(t,n){return Si({classes:n.disabled()?n.disableClass.toArray():[]})},events:function(e,t){return Zo([tr(_o(),function(t,n){return sv(t,e)}),Za(e,t,nv)])}}),dv=[ae("disabled",l),ne("useNative",!0),Kn("disableClass"),ma("onDisabled"),ma("onEnabled")],mv=uc({fields:dv,name:"disabling",active:fv,apis:lv}),gv=tinymce.util.Tools.resolve("tinymce.EditorManager"),pv=function(t){return t.getParam("height",Math.max(t.getElement().offsetHeight,200))},hv=function(t){return t.getParam("width",Qh.DOM.getStyle(t.getElement(),"width"))},vv=function(t){return ft.from(t.getParam("min_width")).filter(dt)},bv=function(t){return ft.from(t.getParam("min_height")).filter(dt)},yv=function(t){return ft.from(t.getParam("max_width")).filter(dt)},xv=function(t){return ft.from(t.getParam("max_height")).filter(dt)},wv=function(t){return!1!==t.getParam("menubar",!0,"boolean")},Sv=function(t){var n=t.getParam("toolbar",!0),e=!0===n,o=C(n),r=p(n)&&0<n.length;return!Cv(t)&&(r||o||e)},kv=function(n){var t=I(9,function(t){return n.getParam("toolbar"+(t+1),!1,"string")}),e=H(t,function(t){return"string"==typeof t});return 0<e.length?ft.some(e):ft.none()},Cv=function(t){return kv(t).fold(function(){return 0<t.getParam("toolbar",[],"string[]").length},w)};(rh=oh=oh||{})["default"]="wrap",rh.floating="floating",rh.sliding="sliding",rh.scrolling="scrolling";var Ov,_v,Tv=function(t){return t.getParam("toolbar_mode","","string")};(_v=Ov=Ov||{}).auto="auto",_v.top="top",_v.bottom="bottom";var Ev,Dv=function(t){return t.getParam("toolbar_location",Ov.auto,"string")},Bv=function(t){return Dv(t)===Ov.bottom},Av=function(t){var n=t.getParam("fixed_toolbar_container","","string");return 0<n.length&&t.inline?qu(Ui(),n):ft.none()},Mv=function(t){return t.inline&&Av(t).isSome()},Fv=function(t){return Av(t).getOrThunk(function(){return Mr(Ar(me.fromDom(t.getElement())))})},Iv=function(t){return t.inline&&!wv(t)&&!Sv(t)&&!Cv(t)},Rv=function(t){return(t.getParam("toolbar_sticky",!1,"boolean")||t.inline)&&!Mv(t)&&!Iv(t)},Vv="silver.readonly",Pv=fn([jn("readonly",Vn)]),Hv=function(t,n){var e=t.outerContainer.element;n&&(t.mothership.broadcastOn([Sl()],{target:e}),t.uiMothership.broadcastOn([Sl()],{target:e})),t.mothership.broadcastOn([Vv],{readonly:n}),t.uiMothership.broadcastOn([Vv],{readonly:n})},zv=function(t,n){t.on("init",function(){t.mode.isReadOnly()&&Hv(n,!0)}),t.on("SwitchMode",function(){return Hv(n,t.mode.isReadOnly())}),t.getParam("readonly",!1,"boolean")&&t.setMode("readonly")},Nv=function(){var t;return lc.config({channels:((t={})[Vv]={schema:Pv,onReceive:function(t,n){mv.set(t,n.readonly)}},t)})},Lv=function(t){return mv.config({disabled:t,disableClass:"tox-collection__item--state-disabled"})},jv=function(t){return mv.config({disabled:t})},Uv=function(t){return mv.config({disabled:t,disableClass:"tox-tbtn--disabled"})},Wv=function(t){return mv.config({disabled:t,disableClass:"tox-tbtn--disabled",useNative:!1})},Gv=function(t,n){var e=t.getApi(n);return function(t){t(e)}},Xv=function(e,o){return sr(function(t){Gv(e,t)(function(t){var n=e.onSetup(t);T(n)&&o.set(n)})})},Yv=function(n,e){return lr(function(t){return Gv(n,t)(e.get())})},qv=((Ev={})[_o()]=["disabling","alloy.base.behaviour","toggling","item-events"],Ev),Kv=function(t){return U(t,function(t){return t.toArray()})},Jv=function(t,n,e,o){var r,i,u=fe(at);return{type:"item",dom:n.dom,components:Kv(n.optComponents),data:t.data,eventOrder:qv,hasSubmenu:t.triggersSubmenu,itemBehaviours:rc([fg("item-events",[(r=t,i=e,dr(function(t,n){Gv(r,t)(r.onAction),r.triggersSubmenu||i!==ih.CLOSE_ON_EXECUTE||(t.getSystem().isConnected()&&Yo(t,Bo()),n.stop())})),Xv(t,u),Yv(t,u)]),Lv(function(){return t.disabled||o.isDisabled()}),Nv(),lg.config({})].concat(t.itemBehaviours))}},$v=function(t){return{value:t.value,meta:lt({text:t.text.getOr("")},t.meta)}},Qv=tinymce.util.Tools.resolve("tinymce.Env"),Zv=function(t){return{dom:{tag:"div",classes:["tox-collection__item-icon"],innerHtml:t}}},tb=function(t){return{dom:{tag:"div",classes:[fh]},components:[lu(Zh.translate(t))]}},nb=function(t,n){return{dom:{tag:"div",classes:n,innerHtml:t}}},eb=function(t,n){return{dom:{tag:"div",classes:[fh]},components:[{dom:{tag:t.tag,styles:t.styles},components:[lu(Zh.translate(n))]}]}},ob=function(t){return{dom:{tag:"div",classes:["tox-collection__item-accessory"],innerHtml:(n=t,e=Qv.mac?{alt:"&#x2325;",ctrl:"&#x2303;",shift:"&#x21E7;",meta:"&#x2318;",access:"&#x2303;&#x2325;"}:{meta:"Ctrl",access:"Shift+Alt"},o=n.split("+"),r=V(o,function(t){var n=t.toLowerCase().trim();return It(e,n)?e[n]:t}),Qv.mac?r.join(""):r.join("+"))}};var n,e,o,r},rb=function(t){return{dom:{tag:"div",classes:["tox-collection__item-checkmark"],innerHtml:pp("checkmark",t)}}},ib=function(t,n){var e=n.map(function(t){return{attributes:{title:Zh.translate(t)}}}).getOr({});return lt({tag:"div",classes:[uh,ah].concat(t?["tox-collection__item-icon-rtl"]:[])},e)},ub=["list-num-default","list-num-lower-alpha","list-num-lower-greek","list-num-lower-roman","list-num-upper-alpha","list-num-upper-roman"],ab=["list-bull-circle","list-bull-default","list-bull-square"],cb=function(t,r,n,i){void 0===i&&(i=ft.none());var e,o,u,a,c,s,l,f,d,m,g,p,h=Zh.isRtl()&&t.iconContent.exists(function(t){return M(ab,t)}),v=t.iconContent.map(function(t){return Zh.isRtl()&&M(ub,t)?t+"-rtl":t}).map(function(t){return n=t,e=r.icons,o=i,ft.from(e()[n.toLowerCase()]).or(o).getOrThunk(function(){return gp(e)});var n,e,o}),b=ft.from(t.meta).fold(function(){return tb},function(t){return It(t,"style")?y(eb,t.style):tb});return"color"===t.presets?(f=t.ariaLabel,d=t.value,m=r,{dom:(g=v.getOr(""),p={tag:"div",attributes:f.map(function(t){return{title:m.translate(t)}}).getOr({}),classes:["tox-swatch"]},lt(lt({},p),"custom"===d?{tag:"button",classes:k(p.classes,["tox-swatches__picker-btn"]),innerHtml:g}:"remove"===d?{classes:k(p.classes,["tox-swatch--remove"]),innerHtml:g}:{attributes:lt(lt({},p.attributes),{"data-mce-color":d}),styles:{"background-color":d}})),optComponents:[]}):(e=t,o=v,u=b,a=h,c=n?o.or(ft.some("")).map(Zv):ft.none(),s=e.checkMark,l=e.htmlContent.fold(function(){return e.textContent.map(u)},function(t){return ft.some(nb(t,[fh]))}),{dom:ib(a,e.ariaLabel),optComponents:[c,l,e.shortcutContent.map(ob),s,e.caret]})},sb=function(t,n){return Ft(t,"tooltipWorker").map(function(e){return[$h.config({lazySink:n.getSink,tooltipDom:{tag:"div",classes:["tox-tooltip-worker-container"]},tooltipComponents:[],anchor:function(t){return{anchor:"submenu",item:t,overrides:{maxHeightFunction:Mc}}},mode:"follow-highlight",onShow:function(n,t){e(function(t){$h.setComponents(n,[fu({element:me.fromDom(t)})])})}})]}).getOr([])},lb=function(t,n){var e,o=Zh.translate(t),r=(e=o,Qh.DOM.encode(e));if(0<n.length){var i=new RegExp(n.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"),"gi");return r.replace(i,function(t){return'<span class="tox-autocompleter-highlight">'+t+"</span>"})}return r},fb=function(t,s){return V(t,function(t){switch(t.type){case"cardcontainer":return u=fb((i=t).items,s),a="vertical"===i.direction?"tox-collection__item-container--column":ph,c="left"===i.align?"tox-collection__item-container--align-left":"tox-collection__item-container--align-right",{dom:{tag:"div",classes:[gh,a,c,function(){switch(i.valign){case"top":return"tox-collection__item-container--valign-top";case"middle":return"tox-collection__item-container--valign-middle";case"bottom":return"tox-collection__item-container--valign-bottom"}}()]},components:u};case"cardimage":return e=t.src,o=t.classes,r=t.alt,{dom:{tag:"img",classes:o,attributes:{src:e,alt:r.getOr("")}}};case"cardtext":var n=t.name.exists(function(t){return M(s.cardText.highlightOn,t)})?ft.from(s.cardText.matchText).getOr(""):"";return nb(lb(t.text,n),t.classes)}var e,o,r,i,u,a,c})},db=Of(zg(),Ng()),mb=function(t){return{value:t}},gb=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,pb=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,hb=function(t){return gb.test(t)||pb.test(t)},vb=function(t){var n={value:t.value.replace(gb,function(t,n,e,o){return n+n+e+e+o+o})},e=pb.exec(n.value);return null===e?["FFFFFF","FF","FF","FF"]:e},bb=function(t){var n=t.toString(16);return 1===n.length?"0"+n:n},yb=function(t){var n=bb(t.red)+bb(t.green)+bb(t.blue);return mb(n)},xb=Math.min,wb=Math.max,Sb=Math.round,kb=/^rgb\((\d+),\s*(\d+),\s*(\d+)\)/,Cb=/^rgba\((\d+),\s*(\d+),\s*(\d+),\s*(\d?(?:\.\d+)?)\)/,Ob=function(t,n,e,o){return{red:t,green:n,blue:e,alpha:o}},_b=function(t){var n=parseInt(t,10);return n.toString()===t&&0<=n&&n<=255},Tb=function(t){var n,e,o,r=(t.hue||0)%360,i=t.saturation/100,u=t.value/100,i=wb(0,xb(i,1)),u=wb(0,xb(u,1));if(0===i)return n=e=o=Sb(255*u),Ob(n,e,o,1);var a=r/60,c=u*i,s=c*(1-Math.abs(a%2-1)),l=u-c;switch(Math.floor(a)){case 0:n=c,e=s,o=0;break;case 1:n=s,e=c,o=0;break;case 2:n=0,e=c,o=s;break;case 3:n=0,e=s,o=c;break;case 4:n=s,e=0,o=c;break;case 5:n=c,e=0,o=s;break;default:n=e=o=0}return n=Sb(255*(n+l)),e=Sb(255*(e+l)),o=Sb(255*(o+l)),Ob(n,e,o,1)},Eb=function(t){var n=vb(t),e=parseInt(n[1],16),o=parseInt(n[2],16),r=parseInt(n[3],16);return Ob(e,o,r,1)},Db=function(t,n,e,o){var r=parseInt(t,10),i=parseInt(n,10),u=parseInt(e,10),a=parseFloat(o);return Ob(r,i,u,a)},Bb=function(t){return"rgba("+t.red+","+t.green+","+t.blue+","+t.alpha+")"},Ab=Ob(255,0,0,1),Mb=function(t,n){return t.fire("ResizeContent",n)},Fb=tinymce.util.Tools.resolve("tinymce.util.LocalStorage"),Ib="tinymce-custom-colors";var Rb,Vb,Pb="choiceitem",Hb=[{type:Pb,text:"Light Green",value:"#BFEDD2"},{type:Pb,text:"Light Yellow",value:"#FBEEB8"},{type:Pb,text:"Light Red",value:"#F8CAC6"},{type:Pb,text:"Light Purple",value:"#ECCAFA"},{type:Pb,text:"Light Blue",value:"#C2E0F4"},{type:Pb,text:"Green",value:"#2DC26B"},{type:Pb,text:"Yellow",value:"#F1C40F"},{type:Pb,text:"Red",value:"#E03E2D"},{type:Pb,text:"Purple",value:"#B96AD9"},{type:Pb,text:"Blue",value:"#3598DB"},{type:Pb,text:"Dark Turquoise",value:"#169179"},{type:Pb,text:"Orange",value:"#E67E23"},{type:Pb,text:"Dark Red",value:"#BA372A"},{type:Pb,text:"Dark Purple",value:"#843FA1"},{type:Pb,text:"Dark Blue",value:"#236FA1"},{type:Pb,text:"Light Gray",value:"#ECF0F1"},{type:Pb,text:"Medium Gray",value:"#CED4D9"},{type:Pb,text:"Gray",value:"#95A5A6"},{type:Pb,text:"Dark Gray",value:"#7E8C8D"},{type:Pb,text:"Navy Blue",value:"#34495E"},{type:Pb,text:"Black",value:"#000000"},{type:Pb,text:"White",value:"#ffffff"}],zb=function(e){void 0===e&&(e=10);var t,n=Fb.getItem(Ib),o=C(n)?JSON.parse(n):[],r=e-(t=o).length<0?t.slice(0,e):t,i=function(t){r.splice(t,1)};return{add:function(t){var n;(-1===(n=A(r,t))?ft.none():ft.some(n)).each(i),r.unshift(t),r.length>e&&r.pop(),Fb.setItem(Ib,JSON.stringify(r))},state:function(){return r.slice(0)}}}(10),Nb=function(t){return!1!==t.getParam("custom_colors")},Lb=function(t){var n=t.getParam("color_map");return n!==undefined?function(t){var n=[],u=document.createElement("canvas");u.height=1,u.width=1;for(var a=u.getContext("2d"),c=function(t,n){var e=n/255;return("0"+Math.round(t*e+255*(1-e)).toString(16)).slice(-2).toUpperCase()},e=0;e<t.length;e+=2)n.push({text:t[e+1],value:function(t){if(/^[0-9A-Fa-f]{6}$/.test(t))return"#"+t.toUpperCase();a.clearRect(0,0,u.width,u.height),a.fillStyle="#FFFFFF",a.fillStyle=t,a.fillRect(0,0,1,1);var n=a.getImageData(0,0,1,1).data,e=n[0],o=n[1],r=n[2],i=n[3];return"#"+c(e,i)+c(o,i)+c(r,i)}(t[e]),type:"choiceitem"});return n}(n):Hb},jb=function(t){zb.add(t)},Ub=function(i){i.addCommand("mceApplyTextcolor",function(t,n){var e,o,r;o=t,r=n,(e=i).undoManager.transact(function(){e.focus(),e.formatter.apply(o,{value:r}),e.nodeChanged()})}),i.addCommand("mceRemoveTextcolor",function(t){var n,e;e=t,(n=i).undoManager.transact(function(){n.focus(),n.formatter.remove(e,{value:null},null,!0),n.nodeChanged()})})},Wb=function(t){var n,e,o=Lb(t),r=(n=o.length,Math.max(5,Math.ceil(Math.sqrt(n))));return e=r,t.getParam("color_cols",e,"number")},Gb=function(n,e,t,o){"custom"===t?$b(n)(function(t){t.each(function(t){jb(t),n.execCommand("mceApplyTextcolor",e,t),o(t)})},"#000000"):"remove"===t?(o(""),n.execCommand("mceRemoveTextcolor",e)):(o(t),n.execCommand("mceApplyTextcolor",e,t))},Xb=function(t,n){return t.concat(V(zb.state(),function(t){return{type:Pb,text:t,value:t}}).concat((o={type:e="choiceitem",text:"Remove color",icon:"color-swatch-remove-color",value:"remove"},n?[o,{type:e,text:"Custom color",icon:"color-picker",value:"custom"}]:[o])));var e,o},Yb=function(n,e){return function(t){t(Xb(n,e))}},qb=function(t,n,e){var o,r;o="forecolor"===n?"tox-icon-text-color__color":"tox-icon-highlight-bg-color__color",r=e,t.setIconFill(o,r),t.setIconStroke(o,r)},Kb=function(i,e,u,t,o){i.ui.registry.addSplitButton(e,{tooltip:t,presets:"color",icon:"forecolor"===e?"text-color":"highlight-bg-color",select:function(e){var t,o,r;return ft.from((o=u,(t=i).dom.getParents(t.selection.getStart(),function(t){var n;(n=t.style["forecolor"===o?"color":"background-color"])&&(r=r||n)}),r)).bind(function(t){return function(t){if("transparent"===t)return ft.some(Ob(0,0,0,0));var n=kb.exec(t);if(null!==n)return ft.some(Db(n[1],n[2],n[3],"1"));var e=Cb.exec(t);return null!==e?ft.some(Db(e[1],e[2],e[3],e[4])):ft.none()}(t).map(function(t){var n=yb(t).value;return we(e.toLowerCase(),n)})}).getOr(!1)},columns:Wb(i),fetch:Yb(Lb(i),Nb(i)),onAction:function(t){null!==o.get()&&Gb(i,u,o.get(),at)},onItemAction:function(t,n){Gb(i,u,n,function(t){var n;o.set(t),n={name:e,color:t},i.fire("TextColorChange",n)})},onSetup:function(n){null!==o.get()&&qb(n,e,o.get());var t=function(t){t.name===e&&qb(n,t.name,t.color)};return i.on("TextColorChange",t),function(){i.off("TextColorChange",t)}}})},Jb=function(n,t,e,o){n.ui.registry.addNestedMenuItem(t,{text:o,icon:"forecolor"===t?"text-color":"highlight-bg-color",getSubmenuItems:function(){return[{type:"fancymenuitem",fancytype:"colorswatch",onAction:function(t){Gb(n,e,t.value,at)}}]}})},$b=function(i){return function(t,n){var e,o={colorpicker:n},r=(e=t,function(t){var n=t.getData();e(ft.from(n.colorpicker)),t.close()});i.windowManager.open({title:"Color Picker",size:"normal",body:{type:"panel",items:[{type:"colorpicker",name:"colorpicker",label:"Color"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:o,onAction:function(t,n){"hex-valid"===n.name&&(n.value?t.enable("ok"):t.disable("ok"))},onSubmit:r,onClose:at,onCancel:function(){t(ft.none())}})}},Qb=function(t,n,e,o,r,i,u,a){var c=Ch(n),s=Zb(n,e,o,"color"!==r?"normal":"color",i,u,a);return Th(t,c,s,o,r)},Zb=function(e,o,r,i,u,a,c){return qf(V(e,function(n){return"choiceitem"===n.type?_n("choicemenuitem",Vh,n).fold(Oh,function(t){return ft.some(function(n,t,e,o,r,i,u,a){void 0===a&&(a=!0);var c=cb({presets:e,textContent:t?n.text:ft.none(),htmlContent:ft.none(),ariaLabel:n.text,iconContent:n.icon,shortcutContent:t?n.shortcut:ft.none(),checkMark:t?ft.some(rb(u.icons)):ft.none(),caret:ft.none(),value:n.value},u,a);return zt(Jv({data:$v(n),disabled:n.disabled,getApi:function(n){return{setActive:function(t){Eg.set(n,t)},isActive:function(){return Eg.isOn(n)},isDisabled:function(){return mv.isDisabled(n)},setDisabled:function(t){return mv.set(n,t)}}},onAction:function(t){return o(n.value)},onSetup:function(t){return t.setActive(r),at},triggersSubmenu:!1,itemBehaviours:[]},c,i,u),{toggling:{toggleClass:lh,toggleOnExecute:!1,selected:n.active}})}(t,1===r,i,o,a(n.value),u,c,Ch(e)))}):ft.none()}))},ty=function(t,n){var e=bh(n);return 1===t?{mode:"menu",moveOnTab:!0}:"auto"===t?{mode:"grid",selector:"."+e.item,initSize:{numColumns:1,numRows:1}}:{mode:"matrix",rowSelector:"."+("color"===n?"tox-swatches__row":"tox-collection__group")}},ny=oi("cell-over"),ey=oi("cell-execute"),oy=function(t,n,e){for(var o=[],r=0;r<n;r++){for(var i=[],u=0;u<e;u++)i.push(function(n,e,t){var o,r=function(t){return qo(t,ey,{row:n,col:e})},i=function(t,n){n.stop(),r(t)};return mu({dom:{tag:"div",attributes:((o={role:"button"})["aria-labelledby"]=t,o)},behaviours:rc([fg("insert-table-picker-cell",[er(so(),hg.focus),er(_o(),r),er(vo(),i),er(Eo(),i)]),Eg.config({toggleClass:"tox-insert-table-picker__selected",toggleOnExecute:!1}),hg.config({onFocus:function(t){return qo(t,ny,{row:n,col:e})}})])})}(r,u,t));o.push(i)}return o},ry={inserttable:function(o){var t=oi("size-label"),i=oy(t,10,10),u=mp({dom:{tag:"span",classes:["tox-insert-table-picker__label"],attributes:{id:t}},components:[lu("0x0")],behaviours:rc([lg.config({})])});return{type:"widget",data:{value:oi("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[db.widget({dom:{tag:"div",classes:["tox-insert-table-picker"]},components:U(i,function(t){return V(t,gu)}).concat(u.asSpec()),behaviours:rc([fg("insert-table-picker",[ur(ny,function(t,n,e){var o=e.event.row,r=e.event.col;!function(t,n,e,o,r){for(var i=0;i<o;i++)for(var u=0;u<r;u++)Eg.set(t[i][u],i<=n&&u<=e)}(i,o,r,10,10),lg.set(u.get(t),[lu(r+1+"x"+(o+1))])}),ur(ey,function(t,n,e){o.onAction({numRows:e.event.row+1,numColumns:e.event.col+1}),Yo(t,Bo())})]),ig.config({initSize:{numRows:10,numColumns:10},mode:"flatgrid",selector:'[role="button"]'})])})]}},colorswatch:function(n,t){var e=Xb(t.colorinput.getColors(),t.colorinput.hasCustomColors()),o=t.colorinput.getColorCols(),r=Qb(oi("menu-value"),e,function(t){n.onAction({value:t})},o,"color",ih.CLOSE_ON_EXECUTE,l,t.shared.providers),i=lt(lt({},r),{markers:bh("color"),movement:ty(o,"color")});return{type:"widget",data:{value:oi("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[db.widget(Xg.sketch(i))]}}},iy=function(n,e,t,o,r,i,u,a){void 0===a&&(a=!0);var c=cb({presets:o,textContent:ft.none(),htmlContent:t?n.text.map(function(t){return lb(t,e)}):ft.none(),ariaLabel:n.text,iconContent:n.icon,shortcutContent:ft.none(),checkMark:ft.none(),caret:ft.none(),value:n.value},u.providers,a,n.icon);return Jv({data:$v(n),disabled:n.disabled,getApi:ct({}),onAction:function(t){return r(n.value,n.meta)},onSetup:ct(at),triggersSubmenu:!1,itemBehaviours:sb(n.meta,u)},c,i,u.providers)},uy=function(t){var n=t.text.fold(function(){return{}},function(t){return{innerHtml:t}});return{type:"separator",dom:lt({tag:"div",classes:[ah,"tox-collection__group-heading"]},n),components:[]}},ay=function(t,n,e,o){void 0===o&&(o=!0);var r=cb({presets:"normal",iconContent:t.icon,textContent:t.text,htmlContent:ft.none(),ariaLabel:t.text,caret:ft.none(),checkMark:ft.none(),shortcutContent:t.shortcut},e,o);return Jv({data:$v(t),getApi:function(n){return{isDisabled:function(){return mv.isDisabled(n)},setDisabled:function(t){return mv.set(n,t)}}},disabled:t.disabled,onAction:t.onAction,onSetup:t.onSetup,triggersSubmenu:!1,itemBehaviours:[]},r,n,e)},cy=function(t,n,e,o,r){void 0===o&&(o=!0),void 0===r&&(r=!1);var i,u,a=r?(u=e.icons,{dom:{tag:"div",classes:[dh],innerHtml:pp("chevron-down",u)}}):(i=e.icons,{dom:{tag:"div",classes:[dh],innerHtml:pp("chevron-right",i)}}),c=cb({presets:"normal",iconContent:t.icon,textContent:t.text,htmlContent:ft.none(),ariaLabel:t.text,caret:ft.some(a),checkMark:ft.none(),shortcutContent:t.shortcut},e,o);return Jv({data:$v(t),getApi:function(n){return{isDisabled:function(){return mv.isDisabled(n)},setDisabled:function(t){return mv.set(n,t)}}},disabled:t.disabled,onAction:at,onSetup:t.onSetup,triggersSubmenu:!0,itemBehaviours:[]},c,n,e)},sy=function(t,n,e,o){void 0===o&&(o=!0);var r=cb({iconContent:t.icon,textContent:t.text,htmlContent:ft.none(),ariaLabel:t.text,checkMark:ft.some(rb(e.icons)),caret:ft.none(),shortcutContent:t.shortcut,presets:"normal",meta:t.meta},e,o);return zt(Jv({data:$v(t),disabled:t.disabled,getApi:function(n){return{setActive:function(t){Eg.set(n,t)},isActive:function(){return Eg.isOn(n)},isDisabled:function(){return mv.isDisabled(n)},setDisabled:function(t){return mv.set(n,t)}}},onAction:t.onAction,onSetup:t.onSetup,triggersSubmenu:!1,itemBehaviours:[]},r,n,e),{toggling:{toggleClass:lh,toggleOnExecute:!1,selected:t.active}})},ly=function(n,e){return t=ry,o=n.fancytype,(Object.prototype.hasOwnProperty.call(t,o)?ft.some(t[o]):ft.none()).map(function(t){return t(n,e)});var t,o},fy=function(t,n,e,o){var r={dom:ib(!1,t.label),optComponents:[ft.some({dom:{tag:"div",classes:[gh,ph]},components:fb(t.items,o)})]};return Jv({data:$v(lt({text:ft.none()},t)),disabled:t.disabled,getApi:function(e){return{isDisabled:function(){return mv.isDisabled(e)},setDisabled:function(n){mv.set(e,n),mt(Os(e.element,"*"),function(t){e.getSystem().getByDom(t).each(function(t){t.hasConfigured(mv)&&mv.set(t,n)})})}}},onAction:t.onAction,onSetup:t.onSetup,triggersSubmenu:!1,itemBehaviours:ft.from(o.itemBehaviours).getOr([])},r,n,e.providers)};(Vb=Rb=Rb||{})[Vb.ContentFocus=0]="ContentFocus",Vb[Vb.UiFocus=1]="UiFocus";var dy,my,gy,py,hy=function(t,n,e,o,r){var i=e.shared.providers,u=function(t){return r?lt(lt({},t),{shortcut:ft.none(),icon:t.text.isSome()?ft.none():t.icon}):t};switch(t.type){case"menuitem":return _n("menuitem",Hh,t).fold(Oh,function(t){return ft.some(ay(u(t),n,i,o))});case"nestedmenuitem":return _n("nestedmenuitem",zh,t).fold(Oh,function(t){return ft.some(cy(u(t),n,i,o,r))});case"togglemenuitem":return _n("togglemenuitem",Nh,t).fold(Oh,function(t){return ft.some(sy(u(t),n,i,o))});case"separator":return _n("separatormenuitem",zp,t).fold(Oh,function(t){return ft.some(uy(t))});case"fancymenuitem":return _n("fancymenuitem",Ph,t).fold(Oh,function(t){return ly(u(t),e)});default:return console.error("Unknown item in general menu",t),ft.none()}},vy=function(t,e,o,n,r,i,u){var a=1===n,c=!a||Ch(t);return qf(V(t,function(t){switch(t.type){case"separator":return _n("Autocompleter.Separator",zp,t).fold(Oh,function(t){return ft.some(uy(t))});case"cardmenuitem":return _n("cardmenuitem",Rh,t).fold(Oh,function(n){return ft.some(fy(lt(lt({},n),{onAction:function(t){n.onAction(t),o(n.value,n.meta)}}),r,i,{itemBehaviours:sb(n.meta,i),cardText:{matchText:e,highlightOn:u}}))});case"autocompleteitem":default:return _n("Autocompleter.Item",Np,t).fold(Oh,function(t){return ft.some(iy(t,e,a,"normal",o,r,i,c))})}}))},by=function(t,n,e,o,r){var i=Ch(n),u=qf(V(n,function(t){var n=function(t){return hy(t,e,o,(n=t,r?!n.hasOwnProperty("text"):i),r);var n};return"nestedmenuitem"===t.type&&t.getSubmenuItems().length<=0?n(lt(lt({},t),{disabled:!0})):n(t)}));return(r?_h:Th)(t,i,u,1,"normal")},yy=function(t){return Qg.singleData(t.value,t)},xy=function(d,c){var e=fe(ft.none()),s=fe(!1),m=mu(Zg.sketch({dom:{tag:"div",classes:["tox-autocompleter"]},components:[],fireDismissalEventInstead:{},inlineBehaviours:rc([fg("dismissAutocompleter",[er(zo(),function(){return f()})])]),lazySink:c.getSink})),o=function(){return e.get().isSome()},l=function(){o()&&Zg.hide(m)},f=function(){var t;o()&&(t=e.get().map(function(t){return t.element}),Op(t.getOr(me.fromDom(d.selection.getNode()))).each(Ur),l(),e.set(ft.none()),s.set(!1))},r=Lt(function(){return eh(d)}),g=function(t,n,e,o){t.matchLength=n.text.length;var r,i,u,a,c,s,l,f=Q(e,function(t){return ft.from(t.columns)}).getOr(1);Zg.showAt(m,{anchor:"node",root:me.fromDom(d.getBody()),node:ft.from(t.element)},Xg.sketch((r=Th("autocompleter-value",!0,o,f,"normal"),i=f,u=Rb.ContentFocus,a="normal",c=(u===Rb.ContentFocus?Md:Ad)(),s=ty(i,a),l=bh(a),{dom:r.dom,components:r.components,items:r.items,value:r.value,markers:{selectedItem:l.selectedItem,item:l.item},movement:s,fakeFocus:u===Rb.ContentFocus,focusManager:c,menuBehaviours:Uh("auto"!==i?[]:[sr(function(o,t){Lh(o,4,l.item).each(function(t){var n=t.numColumns,e=t.numRows;ig.setGridSize(o,e,n)})})])}))),Zg.getContent(m).each(ld.highlightFirst)},p=function(t){var n;n=t,e.get().map(function(t){return Bp(d.dom,d.selection.getRng(),t.triggerChar).bind(function(t){return Hp(d,r,t,n)})}).getOrThunk(function(){return Pp(d,r)}).fold(f,function(a){var t,n;t=a.context,o()||(n=Cp(d,t.range),e.set(ft.some({triggerChar:t.triggerChar,element:n,matchLength:t.text.length})),s.set(!1)),a.lookupData.then(function(u){e.get().map(function(t){var n,e,o,r,i=a.context;t.triggerChar===i.triggerChar&&(e=i.triggerChar,r=Q(o=u,function(t){return ft.from(t.columns)}).getOr(1),0<(n=U(o,function(i){var t=i.items;return vy(t,i.matchText,function(o,r){var t=d.selection.getRng();Bp(d.dom,t,e).fold(function(){return console.error("Lost context. Cursor probably moved")},function(t){var n=t.range,e={hide:function(){f()},reload:function(t){l(),p(t)}};s.set(!0),i.onAction(e,n,o,r),s.set(!1)})},r,ih.BUBBLE_TO_SANDBOX,c,i.highlightOn)})).length?g(t,i,u,n):(10<=i.text.length-t.matchLength?f:l)())})})})},t={onKeypress:wp(function(t){27!==t.which&&p()},50),cancelIfNecessary:f,isMenuOpen:function(){return Zg.isOpen(m)},isActive:o,isProcessingAction:s.get,getView:function(){return Zg.getContent(m)}};!1===d.hasPlugin("rtc")&&Ap(t,d)},wy=w,Sy=function(t,n,e){return Eu(t,n,wy,e,!1)},ky=function(t,n,e){return Eu(t,n,wy,e,!0)},Cy=Tu,Oy=function(t,n,e){return Ku(t,n,e).isSome()},_y=function(e,o){var r=null;return{cancel:function(){null!==r&&(clearTimeout(r),r=null)},schedule:function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];r=setTimeout(function(){e.apply(null,t),r=null},o)}}},Ty=function(t){var n=t.raw;return n.touches===undefined||1!==n.touches.length?ft.none():ft.some(n.touches[0])},Ey=function(e){var u=fe(ft.none()),o=fe(!1),r=_y(function(t){e.triggerEvent(Do(),t),o.set(!0)},400),i=$t([{key:no(),value:function(e){return Ty(e).each(function(t){r.cancel();var n={x:t.clientX,y:t.clientY,target:e.target};r.schedule(e),o.set(!1),u.set(ft.some(n))}),ft.none()}},{key:eo(),value:function(t){return r.cancel(),Ty(t).each(function(i){u.get().each(function(t){var n,e,o,r;n=i,e=t,o=Math.abs(n.clientX-e.x),r=Math.abs(n.clientY-e.y),(5<o||5<r)&&u.set(ft.none())})}),ft.none()}},{key:oo(),value:function(n){r.cancel();return u.get().filter(function(t){return Ge(t.target,n.target)}).map(function(t){return o.get()?(n.prevent(),!1):e.triggerEvent(Eo(),n)})}}]);return{fireIfReady:function(n,t){return Ft(i,t).bind(function(t){return t(n)})}}},Dy=function(){return je().browser.isFirefox()},By=ln([Gn("triggerEvent"),ne("stopBackspace",!0)]),Ay=function(n,t){var e,o,r,i,u=En("Getting GUI events settings",By,t),a=Ey(u),c=V(["touchstart","touchmove","touchend","touchcancel","gesturestart","mousedown","mouseup","mouseover","mousemove","mouseout","click"].concat(["selectstart","input","contextmenu","change","transitionend","drag","dragstart","dragend","dragenter","dragleave","dragover","drop","keyup"]),function(t){return Sy(n,t,function(n){a.fireIfReady(n,t).each(function(t){t&&n.kill()}),u.triggerEvent(t,n)&&n.kill()})}),s=fe(ft.none()),l=Sy(n,"paste",function(n){a.fireIfReady(n,"paste").each(function(t){t&&n.kill()}),u.triggerEvent("paste",n)&&n.kill(),s.set(ft.some(setTimeout(function(){u.triggerEvent(Co(),n)},0)))}),f=Sy(n,"keydown",function(t){var n;u.triggerEvent("keydown",t)?t.kill():!0!==u.stopBackspace||((n=t).raw.which!==fd[0]||M(["input","textarea"],mr(n.target))||Oy(n.target,'[contenteditable="true"]'))||t.prevent()}),d=(e=n,o=function(t){u.triggerEvent("focusin",t)&&t.kill()},Dy()?ky(e,"focus",o):Sy(e,"focusin",o)),m=fe(ft.none()),g=(r=n,i=function(t){u.triggerEvent("focusout",t)&&t.kill(),m.set(ft.some(setTimeout(function(){u.triggerEvent(ko(),t)},0)))},Dy()?ky(r,"blur",i):Sy(r,"focusout",i));return{unbind:function(){mt(c,function(t){t.unbind()}),f.unbind(),d.unbind(),g.unbind(),l.unbind(),s.get().each(clearTimeout),m.get().each(clearTimeout)}}},My=function(t,n){var e=Ft(t,"target").getOr(n);return fe(e)},Fy=Vt([{stopped:[]},{resume:["element"]},{complete:[]}]),Iy=function(t,o,n,e,r,i){var u,a,c,s,l=t(o,e),f=(u=n,a=r,c=fe(!1),s=fe(!1),{stop:function(){c.set(!0)},cut:function(){s.set(!0)},isStopped:c.get,isCut:s.get,event:u,setSource:a.set,getSource:a.get});return l.fold(function(){return i.logEventNoHandlers(o,e),Fy.complete()},function(n){var e=n.descHandler;return ki(e)(f),f.isStopped()?(i.logEventStopped(o,n.element,e.purpose),Fy.stopped()):f.isCut()?(i.logEventCut(o,n.element,e.purpose),Fy.complete()):kr(n.element).fold(function(){return i.logNoParent(o,n.element,e.purpose),Fy.complete()},function(t){return i.logEventResponse(o,n.element,e.purpose),Fy.resume(t)})})},Ry=function(n,e,o,t,r,i){return Iy(n,e,o,t,r,i).fold(w,function(t){return Ry(n,e,o,t,r,i)},l)},Vy=function(t,n,e){var o,r,i=(o=n,r=fe(!1),{stop:function(){r.set(!0)},cut:at,isStopped:r.get,isCut:l,event:o,setSource:u("Cannot set source of a broadcasted event"),getSource:u("Cannot get source of a broadcasted event")});return mt(t,function(t){var n=t.descHandler;ki(n)(i)}),i.isStopped()},Py=function(t,n,e,o,r){var i=My(e,o);return Ry(t,n,e,o,i,r)},Hy=function(){var a={};return{registerId:function(i,u,t){_t(t,function(t,n){var e,o,r=a[n]!==undefined?a[n]:{};r[u]=(e=t,o=i,{cHandler:y.apply(undefined,[e.handler].concat(o)),purpose:e.purpose}),a[n]=r})},unregisterId:function(e){_t(a,function(t,n){t.hasOwnProperty(e)&&delete t[e]})},filterByType:function(t){return Ft(a,t).map(function(t){return Bt(t,function(t,n){return{id:n,descHandler:t}})}).getOr([])},find:function(t,n,e){var r=Ft(a,n);return Je(e,function(t){return e=r,si(o=t).fold(function(){return ft.none()},function(n){return e.bind(function(t){return Ft(t,n)}).map(function(t){return{element:o,descHandler:t}})});var e,o},t)}}},zy=function(){var o=Hy(),r={},i=function(o){var t=o.element;return si(t).fold(function(){return t="uid-",n=o.element,e=oi(ui+t),ci(n,e),e;var t,n,e},function(t){return t})},u=function(t){si(t.element).each(function(t){delete r[t],o.unregisterId(t)})};return{find:function(t,n,e){return o.find(t,n,e)},filter:function(t){return o.filterByType(t)},register:function(t){var n=i(t);Rt(r,n)&&function(t,n){var e=r[n];if(e!==t)throw new Error('The tagId "'+n+'" is already used by: '+Zr(e.element)+"\nCannot use it for: "+Zr(t.element)+"\nThe conflicting element is"+(ji(e.element)?" ":" not ")+"already in the DOM");u(t)}(t,n);var e=[t];o.registerId(e,n,t.events),r[n]=t},unregister:u,getById:function(t){return Ft(r,t)}}},Ny=Xf({name:"Container",factory:function(t){var n=t.dom,e=n.attributes,o=S(n,["attributes"]);return{uid:t.uid,dom:lt({tag:"div",attributes:lt({role:"presentation"},e)},o),components:t.components,behaviours:Ul(t.containerBehaviours),events:t.events,domModification:t.domModification,eventOrder:t.eventOrder}},configFields:[ne("components",[]),jl("containerBehaviours",[]),ne("events",{}),ne("domModification",{}),ne("eventOrder",{})]}),Ly=function(e){var o=function(n){return kr(e.element).fold(w,function(t){return Ge(n,t)})},r=zy(),s=function(t,n){return r.find(o,t,n)},t=Ay(e.element,{triggerEvent:function(o,r){return ra(o,r.target,function(t){return e=t,Py(s,o,n=r,n.target,e);var n,e})}}),i={debugInfo:ct("real"),triggerEvent:function(n,e,o){ra(n,e,function(t){return Py(s,n,o,e,t)})},triggerFocus:function(a,c){si(a).fold(function(){dc(a)},function(t){ra(So(),a,function(t){var n,e,o,r,i,u;return n=s,e=So(),i=t,u=My(o={originator:c,kill:at,prevent:at,target:a},r=a),Iy(n,e,o,r,u,i),!1})})},triggerEscape:function(t,n){i.triggerEvent("keydown",t.element,n.event)},getByUid:function(t){return g(t)},getByDom:function(t){return p(t)},build:mu,addToGui:function(t){a(t)},removeFromGui:function(t){c(t)},addToWorld:function(t){n(t)},removeFromWorld:function(t){u(t)},broadcast:function(t){f(t)},broadcastOn:function(t,n){d(t,n)},broadcastEvent:function(t,n){m(t,n)},isConnected:w},n=function(t){t.connect(i),hr(t.element)||(r.register(t),mt(t.components(),n),i.triggerEvent(Mo(),t.element,{target:t.element}))},u=function(t){hr(t.element)||(mt(t.components(),u),r.unregister(t)),t.disconnect()},a=function(t){rl(e,t)},c=function(t){al(t)},l=function(e){var t=r.filter(Oo());mt(t,function(t){var n=t.descHandler;ki(n)(e)})},f=function(t){l({universal:!0,data:t})},d=function(t,n){l({universal:!1,channels:t,data:n})},m=function(t,n){var e=r.filter(t);return Vy(e,n)},g=function(t){return r.getById(t).fold(function(){return pt.error(new Error('Could not find component with uid: "'+t+'" in system.'))},pt.value)},p=function(t){var n=si(t).getOr("not found");return g(n)};return n(e),{root:e,element:e.element,destroy:function(){t.unbind(),jr(e.element)},add:a,remove:c,getByUid:g,getByDom:p,addToWorld:n,removeFromWorld:u,broadcast:f,broadcastOn:d,broadcastEvent:m}},jy=ct([ne("prefix","form-field"),jl("fieldBehaviours",[Zf,Ll])]),Uy=ct([xf({schema:[Ln("dom")],name:"label"}),xf({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:t.text}}}},schema:[Ln("text")],name:"aria-descriptor"}),bf({factory:{sketch:function(t){var n=Kt(t,["factory"]);return t.factory.sketch(n)}},schema:[Ln("factory")],name:"field"})]),Wy=Yf({name:"FormField",configFields:jy(),partFields:Uy(),factory:function(r,t,n,e){var o=Wl(r.fieldBehaviours,[Zf.config({find:function(t){return Mf(t,r,"field")}}),Ll.config({store:{mode:"manual",getValue:function(t){return Zf.getCurrent(t).bind(Ll.getValue)},setValue:function(t,n){Zf.getCurrent(t).each(function(t){Ll.setValue(t,n)})}}})]),i=Zo([sr(function(t,n){var o=If(t,r,["label","field","aria-descriptor"]);o.field().each(function(e){var n=oi(r.prefix);o.label().each(function(t){Yr(t.element,"for",n),Yr(e.element,"id",n)}),o["aria-descriptor"]().each(function(t){var n=oi(r.prefix);Yr(t.element,"id",n),Yr(e.element,"aria-describedby",n)})})})]),u={getField:function(t){return Mf(t,r,"field")},getLabel:function(t){return Mf(t,r,"label")}};return{uid:r.uid,dom:r.dom,components:t,behaviours:o,events:i,apis:u}},apis:{getField:function(t,n){return t.getField(n)},getLabel:function(t,n){return t.getLabel(n)}}}),Gy=/* */Object.freeze({__proto__:null,exhibit:function(t,n){return Si({attributes:$t([{key:n.tabAttr,value:"true"}])})}}),Xy=[ne("tabAttr","data-alloy-tabstop")],Yy=uc({fields:Xy,name:"tabstopping",active:Gy}),qy=tinymce.util.Tools.resolve("tinymce.html.Entities"),Ky=function(t,n,e,o){var r=Jy(t,n,e,o);return Wy.sketch(r)},Jy=function(t,n,e,o){return{dom:$y(e),components:t.toArray().concat([n]),fieldBehaviours:rc(o)}},$y=function(t){return{tag:"div",classes:["tox-form__group"].concat(t)}},Qy=function(t,n){return Wy.parts.label({dom:{tag:"label",classes:["tox-label"],innerHtml:n.translate(t)}})},Zy=oi("form-component-change"),tx=oi("form-close"),nx=oi("form-cancel"),ex=oi("form-action"),ox=oi("form-submit"),rx=oi("form-block"),ix=oi("form-unblock"),ux=oi("form-tabchange"),ax=oi("form-resize"),cx=function(u,a){var t,n,e,o=u.label.map(function(t){return Qy(t,a)}),r=function(o){return function(n,e){Ku(e.event.target,"[data-collection-item-value]").each(function(t){o(n,e,t,qr(t,"data-collection-item-value"))})}},i=r(function(t,n,e,o){n.stop(),a.isDisabled()||qo(t,ex,{name:u.name,value:o})}),c=[er(so(),r(function(t,n,e){dc(e)})),er(vo(),i),er(Eo(),i),er(lo(),r(function(t,n,e){qu(t.element,"."+mh).each(function(t){Pi(t,mh)}),Ri(e,mh)})),er(fo(),r(function(t){qu(t.element,"."+mh).each(function(t){Pi(t,mh)})})),dr(r(function(t,n,e,o){qo(t,ex,{name:u.name,value:o})}))],s=function(t,n){return V(Os(t.element,".tox-collection__item"),n)},l=Wy.parts.field({dom:{tag:"div",classes:["tox-collection"].concat(1!==u.columns?["tox-collection--grid"]:["tox-collection--list"])},components:[],factory:{sketch:st},behaviours:rc([mv.config({disabled:a.isDisabled,onDisabled:function(t){s(t,function(t){Ri(t,"tox-collection__item--state-disabled"),Yr(t,"aria-disabled",!0)})},onEnabled:function(t){s(t,function(t){Pi(t,"tox-collection__item--state-disabled"),$r(t,"aria-disabled")})}}),Nv(),lg.config({}),Ll.config({store:{mode:"memory",initialValue:[]},onSetValue:function(o,t){var n,e,r,i;n=o,e=V(t,function(t){var n=Zh.translate(t.text),e=1===u.columns?'<div class="tox-collection__item-label">'+n+"</div>":"",o='<div class="tox-collection__item-icon">'+t.icon+"</div>",r={_:" "," - ":" ","-":" "},i=n.replace(/\_| \- |\-/g,function(t){return r[t]});return'<div class="tox-collection__item'+(a.isDisabled()?" tox-collection__item--state-disabled":"")+'" tabindex="-1" data-collection-item-value="'+qy.encodeAllRaw(t.value)+'" title="'+i+'" aria-label="'+i+'">'+o+e+"</div>"}),r="auto"!==u.columns&&1<u.columns?R(e,u.columns):[e],i=V(r,function(t){return'<div class="tox-collection__group">'+t.join("")+"</div>"}),Gr(n.element,i.join("")),"auto"===u.columns&&Lh(o,5,"tox-collection__item").each(function(t){var n=t.numRows,e=t.numColumns;ig.setGridSize(o,n,e)}),Yo(o,ax)}}),Yy.config({}),ig.config((n=u.columns,e="normal",1===n?{mode:"menu",moveOnTab:!1,selector:".tox-collection__item"}:"auto"===n?{mode:"flatgrid",selector:".tox-collection__item",initSize:{numColumns:1,numRows:1}}:{mode:"matrix",selectors:{row:"color"===e?".tox-swatches__row":".tox-collection__group",cell:"color"===e?"."+ch:"."+ah}})),fg("collection-events",c)]),eventOrder:((t={})[_o()]=["disabling","alloy.base.behaviour","collection-events"],t)});return Ky(o,l,["tox-form__group--collection"],[])},sx=ct([Kn("data"),ne("inputAttributes",{}),ne("inputStyles",{}),ne("tag","input"),ne("inputClasses",[]),ma("onSetValue"),ne("styles",{}),ne("eventOrder",{}),jl("inputBehaviours",[Ll,hg]),ne("selectOnFocus",!0)]),lx=function(t){return rc([hg.config({onFocus:t.selectOnFocus?function(t){var n=t.element,e=eu(n);n.dom.setSelectionRange(0,e.length)}:at})])},fx=function(t){return{tag:t.tag,attributes:lt({type:"text"},t.inputAttributes),styles:t.inputStyles,classes:t.inputClasses}},dx=Xf({name:"Input",configFields:sx(),factory:function(t,n){return{uid:t.uid,dom:fx(t),components:[],behaviours:lt(lt({},lx(e=t)),Wl(e.inputBehaviours,[Ll.config({store:lt(lt({mode:"manual"},e.data.map(function(t){return{initialValue:t}}).getOr({})),{getValue:function(t){return eu(t.element)},setValue:function(t,n){eu(t.element)!==n&&ou(t.element,n)}}),onSetValue:e.onSetValue})])),eventOrder:t.eventOrder};var e}}),mx={},gx={exports:mx};dy=undefined,my=mx,gy=gx,py=undefined,function(t){"object"==typeof my&&void 0!==gy?gy.exports=t():"function"==typeof dy&&dy.amd?dy([],t):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).EphoxContactWrapper=t()}(function(){return function l(i,u,a){function c(n,t){if(!u[n]){if(!i[n]){var e="function"==typeof py&&py;if(!t&&e)return e(n,!0);if(s)return s(n,!0);var o=new Error("Cannot find module '"+n+"'");throw o.code="MODULE_NOT_FOUND",o}var r=u[n]={exports:{}};i[n][0].call(r.exports,function(t){return c(i[n][1][t]||t)},r,r.exports,l,i,u,a)}return u[n].exports}for(var s="function"==typeof py&&py,t=0;t<a.length;t++)c(a[t]);return c}({1:[function(t,n,e){var o,r,i=n.exports={};function u(){throw new Error("setTimeout has not been defined")}function a(){throw new Error("clearTimeout has not been defined")}function c(t){if(o===setTimeout)return setTimeout(t,0);if((o===u||!o)&&setTimeout)return o=setTimeout,setTimeout(t,0);try{return o(t,0)}catch(n){try{return o.call(null,t,0)}catch(n){return o.call(this,t,0)}}}!function(){try{o="function"==typeof setTimeout?setTimeout:u}catch(t){o=u}try{r="function"==typeof clearTimeout?clearTimeout:a}catch(t){r=a}}();var s,l=[],f=!1,d=-1;function m(){f&&s&&(f=!1,s.length?l=s.concat(l):d=-1,l.length&&g())}function g(){if(!f){var t=c(m);f=!0;for(var n=l.length;n;){for(s=l,l=[];++d<n;)s&&s[d].run();d=-1,n=l.length}s=null,f=!1,function(t){if(r===clearTimeout)return clearTimeout(t);if((r===a||!r)&&clearTimeout)return r=clearTimeout,clearTimeout(t);try{r(t)}catch(n){try{return r.call(null,t)}catch(n){return r.call(this,t)}}}(t)}}function p(t,n){this.fun=t,this.array=n}function h(){}i.nextTick=function(t){var n=new Array(arguments.length-1);if(1<arguments.length)for(var e=1;e<arguments.length;e++)n[e-1]=arguments[e];l.push(new p(t,n)),1!==l.length||f||c(g)},p.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=h,i.addListener=h,i.once=h,i.off=h,i.removeListener=h,i.removeAllListeners=h,i.emit=h,i.prependListener=h,i.prependOnceListener=h,i.listeners=function(t){return[]},i.binding=function(t){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(t){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},{}],2:[function(t,f,n){(function(n){function o(){}function u(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=undefined,this._deferreds=[],l(t,this)}function r(o,r){for(;3===o._state;)o=o._value;0!==o._state?(o._handled=!0,u._immediateFn(function(){var t,n=1===o._state?r.onFulfilled:r.onRejected;if(null!==n){try{t=n(o._value)}catch(e){return void a(r.promise,e)}i(r.promise,t)}else(1===o._state?i:a)(r.promise,o._value)})):o._deferreds.push(r)}function i(t,n){try{if(n===t)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var e=n.then;if(n instanceof u)return t._state=3,t._value=n,void c(t);if("function"==typeof e)return void l((o=e,r=n,function(){o.apply(r,arguments)}),t)}t._state=1,t._value=n,c(t)}catch(i){a(t,i)}var o,r}function a(t,n){t._state=2,t._value=n,c(t)}function c(t){2===t._state&&0===t._deferreds.length&&u._immediateFn(function(){t._handled||u._unhandledRejectionFn(t._value)});for(var n=0,e=t._deferreds.length;n<e;n++)r(t,t._deferreds[n]);t._deferreds=null}function s(t,n,e){this.onFulfilled="function"==typeof t?t:null,this.onRejected="function"==typeof n?n:null,this.promise=e}function l(t,n){var e=!1;try{t(function(t){e||(e=!0,i(n,t))},function(t){e||(e=!0,a(n,t))})}catch(o){if(e)return;e=!0,a(n,o)}}var t,e;t=this,e=setTimeout,u.prototype["catch"]=function(t){return this.then(null,t)},u.prototype.then=function(t,n){var e=new this.constructor(o);return r(this,new s(t,n,e)),e},u.all=function(t){var c=Array.prototype.slice.call(t);return new u(function(r,i){if(0===c.length)return r([]);var u=c.length;for(var t=0;t<c.length;t++)!function a(n,t){try{if(t&&("object"==typeof t||"function"==typeof t)){var e=t.then;if("function"==typeof e)return void e.call(t,function(t){a(n,t)},i)}c[n]=t,0==--u&&r(c)}catch(o){i(o)}}(t,c[t])})},u.resolve=function(n){return n&&"object"==typeof n&&n.constructor===u?n:new u(function(t){t(n)})},u.reject=function(e){return new u(function(t,n){n(e)})},u.race=function(r){return new u(function(t,n){for(var e=0,o=r.length;e<o;e++)r[e].then(t,n)})},u._immediateFn="function"==typeof n?function(t){n(t)}:function(t){e(t,0)},u._unhandledRejectionFn=function(t){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",t)},u._setImmediateFn=function(t){u._immediateFn=t},u._setUnhandledRejectionFn=function(t){u._unhandledRejectionFn=t},void 0!==f&&f.exports?f.exports=u:t.Promise||(t.Promise=u)}).call(this,t("timers").setImmediate)},{timers:3}],3:[function(c,t,s){(function(t,n){var o=c("process/browser.js").nextTick,e=Function.prototype.apply,r=Array.prototype.slice,i={},u=0;function a(t,n){this._id=t,this._clearFn=n}s.setTimeout=function(){return new a(e.call(setTimeout,window,arguments),clearTimeout)},s.setInterval=function(){return new a(e.call(setInterval,window,arguments),clearInterval)},s.clearTimeout=s.clearInterval=function(t){t.close()},a.prototype.unref=a.prototype.ref=function(){},a.prototype.close=function(){this._clearFn.call(window,this._id)},s.enroll=function(t,n){clearTimeout(t._idleTimeoutId),t._idleTimeout=n},s.unenroll=function(t){clearTimeout(t._idleTimeoutId),t._idleTimeout=-1},s._unrefActive=s.active=function(t){clearTimeout(t._idleTimeoutId);var n=t._idleTimeout;0<=n&&(t._idleTimeoutId=setTimeout(function(){t._onTimeout&&t._onTimeout()},n))},s.setImmediate="function"==typeof t?t:function(t){var n=u++,e=!(arguments.length<2)&&r.call(arguments,1);return i[n]=!0,o(function(){i[n]&&(e?t.apply(null,e):t.call(null),s.clearImmediate(n))}),n},s.clearImmediate="function"==typeof n?n:function(t){delete i[t]}}).call(this,c("timers").setImmediate,c("timers").clearImmediate)},{"process/browser.js":1,timers:3}],4:[function(t,n,e){var o=t("promise-polyfill"),r="undefined"!=typeof window?window:Function("return this;")();n.exports={boltExport:r.Promise||o}},{"promise-polyfill":2}]},{},[4])(4)});var px,hx,vx=gx.exports.boltExport,bx=function(t){var e=ft.none(),n=[],o=function(t){r()?u(t):n.push(t)},r=function(){return e.isSome()},i=function(t){mt(t,u)},u=function(n){e.each(function(t){setTimeout(function(){n(t)},0)})};return t(function(t){r()||(e=ft.some(t),i(n),n=[])}),{get:o,map:function(e){return bx(function(n){o(function(t){n(e(t))})})},isReady:r}},yx={nu:bx,pure:function(n){return bx(function(t){t(n)})}},xx=function(t){setTimeout(function(){throw t},0)},wx=function(e){var t=function(t){e().then(t,xx)};return{map:function(t){return wx(function(){return e().then(t)})},bind:function(n){return wx(function(){return e().then(function(t){return n(t).toPromise()})})},anonBind:function(t){return wx(function(){return e().then(function(){return t.toPromise()})})},toLazy:function(){return yx.nu(t)},toCached:function(){var t=null;return wx(function(){return null===t&&(t=e()),t})},toPromise:e,get:t}},Sx=function(t){return wx(function(){return new vx(t)})},kx=function(t){return wx(function(){return vx.resolve(t)})},Cx=["input","textarea"],Ox=function(t){var n=mr(t);return M(Cx,n)},_x=function(t,n){var e=n.getRoot(t).getOr(t.element);Pi(e,n.invalidClass),n.notify.each(function(n){Ox(t.element)&&Yr(t.element,"aria-invalid",!1),n.getContainer(t).each(function(t){Gr(t,n.validHtml)}),n.onValid(t)})},Tx=function(n,t,e,o){var r=t.getRoot(n).getOr(n.element);Ri(r,t.invalidClass),t.notify.each(function(t){Ox(n.element)&&Yr(n.element,"aria-invalid",!0),t.getContainer(n).each(function(t){Gr(t,o)}),t.onInvalid(n,o)})},Ex=function(n,t,e){return t.validator.fold(function(){return kx(pt.value(!0))},function(t){return t.validate(n)})},Dx=function(n,e,t){return e.notify.each(function(t){t.onValidate(n)}),Ex(n,e).map(function(t){return n.getSystem().isConnected()?t.fold(function(t){return Tx(n,e,0,t),pt.error(t)},function(t){return _x(n,e),pt.value(t)}):pt.error("No longer in system")})},Bx=/* */Object.freeze({__proto__:null,markValid:_x,markInvalid:Tx,query:Ex,run:Dx,isInvalid:function(t,n){var e=n.getRoot(t).getOr(t.element);return Hi(e,n.invalidClass)}}),Ax=/* */Object.freeze({__proto__:null,events:function(n,t){return n.validator.map(function(t){return Zo([er(t.onEvent,function(t){Dx(t,n).get(st)})].concat(t.validateOnLoad?[sr(function(t){Dx(t,n).get(at)})]:[]))}).getOr({})}}),Mx=[Ln("invalidClass"),ne("getRoot",ft.none),te("notify",[ne("aria","alert"),ne("getContainer",ft.none),ne("validHtml",""),ma("onValid"),ma("onInvalid"),ma("onValidate")]),te("validator",[Ln("validate"),ne("onEvent","input"),ne("validateOnLoad",!0)])],Fx=uc({fields:Mx,name:"invalidating",active:Ax,apis:Bx,extra:{validation:function(e){return function(t){var n=Ll.getValue(t);return kx(e(n))}}}}),Ix=/* */Object.freeze({__proto__:null,getCoupled:function(t,n,e,o){return e.getOrCreate(t,n,o)}}),Rx=[jn("others",On(pt.value,Mn()))],Vx=uc({fields:Rx,name:"coupling",apis:Ix,state:/* */Object.freeze({__proto__:null,init:function(){var i={},t=ct({});return xi({readState:t,getOrCreate:function(e,o,r){var t=Ct(o.others);if(t)return Ft(i,r).getOrThunk(function(){var t=Ft(o.others,r).getOrDie("No information found for coupled component: "+r)(e),n=e.getSystem().build(t);return i[r]=n});throw new Error("Cannot find coupled component: "+r+". Known coupled components: "+JSON.stringify(t,null,2))}})}})}),Px=ct("sink"),Hx=ct(xf({name:Px(),overrides:ct({dom:{tag:"div"},behaviours:rc([Zs.config({useFixed:w})]),events:Zo([ar(mo()),ar(io()),ar(vo())])})}));(hx=px=px||{})[hx.HighlightFirst=0]="HighlightFirst",hx[hx.HighlightNone=1]="HighlightNone";var zx,Nx,Lx,jx,Ux,Wx,Gx=function(t,n){var e=t.getHotspot(n).getOr(n),o=t.getAnchorOverrides();return t.layouts.fold(function(){return{anchor:"hotspot",hotspot:e,overrides:o}},function(t){return{anchor:"hotspot",hotspot:e,overrides:o,layouts:t}})},Xx=function(t,n,e,o,r,i,u){var a,c,s,l,f,d,m,g,p,h,v=Gx(t,e);return(c=v,l=o,f=r,d=u,m=n,g=s=e,p=(0,(a=t).fetch)(g).map(m),h=Jx(s,a),p.map(function(t){return t.bind(function(t){return ft.from(Qg.sketch(lt(lt({},f.menu()),{uid:li(""),data:t,highlightImmediately:d===px.HighlightFirst,onOpenMenu:function(t,n){var e=h().getOrDie();Zs.position(e,c,n),wl.decloak(l)},onOpenSubmenu:function(t,n,e){var o=h().getOrDie();Zs.position(o,{anchor:"submenu",item:n},e),wl.decloak(l)},onRepositionMenu:function(t,n,e){var o=h().getOrDie();Zs.position(o,c,n),mt(e,function(t){Zs.position(o,{anchor:"submenu",item:t.triggeringItem},t.triggeredMenu)})},onEscape:function(){return hg.focus(s),wl.close(l),ft.some(!0)}})))})})).map(function(t){return t.fold(function(){wl.isOpen(o)&&wl.close(o)},function(t){wl.cloak(o),wl.open(o,t),i(o)}),o})},Yx=function(t,n,e,o,r,i,u){return wl.close(o),kx(o)},qx=function(t,n,e,o,r,i){var u=Vx.getCoupled(e,"sandbox");return(wl.isOpen(u)?Yx:Xx)(t,n,e,u,o,r,i)},Kx=function(t,n,e){var o,r,i=Zf.getCurrent(n).getOr(n),u=Ou(t.element);e?Yi(i.element,"min-width",u+"px"):(o=i.element,r=u,Cu.set(o,r))},Jx=function(n,t){return n.getSystem().getByUid(t.uid+"-"+Px()).map(function(t){return function(){return pt.value(t)}}).getOrThunk(function(){return t.lazySink.fold(function(){return function(){return pt.error(new Error("No internal sink is specified, nor could an external sink be found"))}},function(t){return function(){return t(n)}})})},$x=function(t){wl.getState(t).each(function(t){Qg.repositionMenus(t)})},Qx=function(o,r,i){var u=Ju(),t=Jx(r,o);return{dom:{tag:"div",classes:o.sandboxClasses,attributes:{id:u.id,role:"listbox"}},behaviours:Xl(o.sandboxBehaviours,[Ll.config({store:{mode:"memory",initialValue:r}}),wl.config({onOpen:function(t,n){var e=Gx(o,r);u.link(r.element),o.matchWidth&&Kx(e.hotspot,n,o.useMinWidth),o.onOpen(e,t,n),i!==undefined&&i.onOpen!==undefined&&i.onOpen(t,n)},onClose:function(t,n){u.unlink(r.element),i!==undefined&&i.onClose!==undefined&&i.onClose(t,n)},isPartOf:function(t,n,e){return Qu(n,e)||Qu(r,e)},getAttachPoint:function(){return t().getOrDie()}}),Zf.config({find:function(t){return wl.getState(t).bind(function(t){return Zf.getCurrent(t)})}}),lc.config({channels:lt(lt({},_l({isExtraPart:l})),El({doReposition:$x}))})])}},Zx=function(t){var n=Vx.getCoupled(t,"sandbox");$x(n)},tw=function(){return[ne("sandboxClasses",[]),Gl("sandboxBehaviours",[Zf,lc,wl,Ll])]},nw=ct([Ln("dom"),Ln("fetch"),ma("onOpen"),ga("onExecute"),ne("getHotspot",ft.some),ne("getAnchorOverrides",ct({})),qc(),jl("dropdownBehaviours",[Eg,Vx,ig,hg]),Ln("toggleClass"),ne("eventOrder",{}),Kn("lazySink"),ne("matchWidth",!1),ne("useMinWidth",!1),Kn("role")].concat(tw())),ew=ct([yf({schema:[la()],name:"menu",defaults:function(t){return{onExecute:t.onExecute}}}),Hx()]),ow=Yf({name:"Dropdown",configFields:nw(),partFields:ew(),factory:function(n,t,e,o){var r,i,u=function(t){wl.getState(t).each(function(t){Qg.highlightPrimary(t)})},a={expand:function(t){Eg.isOn(t)||qx(n,function(t){return t},t,o,at,px.HighlightNone).get(at)},open:function(t){Eg.isOn(t)||qx(n,function(t){return t},t,o,at,px.HighlightFirst).get(at)},isOpen:Eg.isOn,close:function(t){Eg.isOn(t)&&qx(n,function(t){return t},t,o,at,px.HighlightFirst).get(at)},repositionMenus:function(t){Eg.isOn(t)&&Zx(t)}},c=function(t,n){return Ko(t),ft.some(!0)};return{uid:n.uid,dom:n.dom,components:t,behaviours:Wl(n.dropdownBehaviours,[Eg.config({toggleClass:n.toggleClass,aria:{mode:"expanded"}}),Vx.config({others:{sandbox:function(t){return Qx(n,t,{onOpen:function(){return Eg.on(t)},onClose:function(){return Eg.off(t)}})}}}),ig.config({mode:"special",onSpace:c,onEnter:c,onDown:function(t,n){var e;return ow.isOpen(t)?(e=Vx.getCoupled(t,"sandbox"),u(e)):ow.open(t),ft.some(!0)},onEscape:function(t,n){return ow.isOpen(t)?(ow.close(t),ft.some(!0)):ft.none()}}),hg.config({})]),events:Bg(ft.some(function(t){qx(n,function(t){return t},t,o,u,px.HighlightFirst).get(at)})),eventOrder:lt(lt({},n.eventOrder),((r={})[_o()]=["disabling","toggling","alloy.base.behaviour"],r)),apis:a,domModification:{attributes:lt(lt({"aria-haspopup":"true"},n.role.fold(function(){return{}},function(t){return{role:t}})),"button"===n.dom.tag?{type:(i="type",Ft(n.dom,"attributes").bind(function(t){return Ft(t,i)}).getOr("button"))}:{})}}},apis:{open:function(t,n){return t.open(n)},expand:function(t,n){return t.expand(n)},close:function(t,n){return t.close(n)},isOpen:function(t,n){return t.isOpen(n)},repositionMenus:function(t,n){return t.repositionMenus(n)}}}),rw=uc({fields:[],name:"unselecting",active:/* */Object.freeze({__proto__:null,events:function(){return Zo([tr(yo(),w)])},exhibit:function(){return Si({styles:{"-webkit-user-select":"none","user-select":"none","-ms-user-select":"none","-moz-user-select":"-moz-none"},attributes:{unselectable:"on"}})}})}),iw=oi("color-input-change"),uw=oi("color-swatch-change"),aw=oi("color-picker-cancel"),cw=function(e,n,o){var r,i,t=Wy.parts.field({factory:dx,inputClasses:["tox-textfield"],onSetValue:function(t){return Fx.run(t).get(at)},inputBehaviours:rc([mv.config({disabled:n.providers.isDisabled}),Nv(),Yy.config({}),Fx.config({invalidClass:"tox-textbox-field-invalid",getRoot:function(t){return kr(t.element)},notify:{onValid:function(t){var n=Ll.getValue(t);qo(t,iw,{color:n})}},validator:{validateOnLoad:!1,validate:function(t){var n=Ll.getValue(t);if(0===n.length)return kx(pt.value(!0));var e=me.fromTag("span");Yi(e,"background-color",n);var o=Qi(e,"background-color").fold(function(){return pt.error("blah")},function(t){return pt.value(n)});return kx(o)}}})]),selectOnFocus:!1}),u=e.label.map(function(t){return Qy(t,n.providers)}),a=function(t,n){qo(t,uw,{value:n})},c=mp((r={dom:{tag:"span",attributes:{"aria-label":n.providers.translate("Color swatch")}},layouts:{onRtl:function(){return[Ha,Pa,ja]},onLtr:function(){return[Pa,Ha,ja]}},components:[],fetch:Yb(o.getColors(),o.hasCustomColors()),columns:o.getColorCols(),presets:"color",onItemAction:function(t,e){c.getOpt(t).each(function(n){"custom"===e?o.colorPicker(function(t){t.fold(function(){return Yo(n,aw)},function(t){a(n,t),jb(t)})},"#ffffff"):a(n,"remove"===e?"":e)})}},i=n,ow.sketch({dom:r.dom,components:r.components,toggleClass:"mce-active",dropdownBehaviours:rc([jv(i.providers.isDisabled),Nv(),rw.config({}),Yy.config({})]),layouts:r.layouts,sandboxClasses:["tox-dialog__popups"],lazySink:i.getSink,fetch:function(n){return Sx(function(t){return r.fetch(t)}).map(function(t){return ft.from(yy(zt(Qb(oi("menu-value"),t,function(t){r.onItemAction(n,t)},r.columns,r.presets,ih.CLOSE_ON_EXECUTE,l,i.providers),{movement:ty(r.columns,r.presets)})))})},parts:{menu:xh(0,0,r.presets)}})));return Wy.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:u.toArray().concat([{dom:{tag:"div",classes:["tox-color-input"]},components:[t,c.asSpec()]}]),fieldBehaviours:rc([fg("form-field-events",[er(iw,function(t,n){c.getOpt(t).each(function(t){Yi(t.element,"background-color",n.event.color)}),qo(t,Zy,{name:e.name})}),er(uw,function(n,e){Wy.getField(n).each(function(t){Ll.setValue(t,e.event.value),Zf.getCurrent(n).each(hg.focus)})}),er(aw,function(n,t){Wy.getField(n).each(function(t){Zf.getCurrent(n).each(hg.focus)})})])])})},sw=function(t,n,e){return{hue:t,saturation:n,value:e}},lw=oi("rgb-hex-update"),fw=oi("slider-update"),dw=oi("palette-update"),mw=xf({schema:[Ln("dom")],name:"label"}),gw=function(n){return xf({name:n+"-edge",overrides:function(t){return t.model.manager.edgeActions[n].fold(function(){return{}},function(o){return{events:Zo([or(no(),function(t,n,e){return o(t,e)},[t]),or(io(),function(t,n,e){return o(t,e)},[t]),or(uo(),function(t,n,e){e.mouseIsDown.get()&&o(t,e)},[t])])}})}})},pw=gw("top-left"),hw=gw("top"),vw=gw("top-right"),bw=gw("right"),yw=gw("bottom-right"),xw=gw("bottom"),ww=gw("bottom-left"),Sw=[mw,gw("left"),bw,hw,xw,pw,vw,ww,yw,bf({name:"thumb",defaults:ct({dom:{styles:{position:"absolute"}}}),overrides:function(t){return{events:Zo([ir(no(),t,"spectrum"),ir(eo(),t,"spectrum"),ir(oo(),t,"spectrum"),ir(io(),t,"spectrum"),ir(uo(),t,"spectrum"),ir(co(),t,"spectrum")])}}}),bf({schema:[le("mouseIsDown",function(){return fe(!1)})],name:"spectrum",overrides:function(e){var o=e.model.manager,r=function(n,t){return o.getValueFromEvent(t).map(function(t){return o.setValueFrom(n,e,t)})};return{behaviours:rc([ig.config({mode:"special",onLeft:function(t){return o.onLeft(t,e)},onRight:function(t){return o.onRight(t,e)},onUp:function(t){return o.onUp(t,e)},onDown:function(t){return o.onDown(t,e)}}),hg.config({})]),events:Zo([er(no(),r),er(eo(),r),er(io(),r),er(uo(),function(t,n){e.mouseIsDown.get()&&r(t,n)})])}}})],kw=ct("slider.change.value"),Cw=function(t){var n=t.event.raw;return-1===n.type.indexOf("touch")?n.clientX!==undefined?ft.some(n).map(function(t){return xu(t.clientX,t.clientY)}):ft.none():n.touches!==undefined&&1===n.touches.length?ft.some(n.touches[0]).map(function(t){return xu(t.clientX,t.clientY)}):ft.none()},Ow=function(t){return t.model.minX},_w=function(t){return t.model.minY},Tw=function(t){return t.model.minX-1},Ew=function(t){return t.model.minY-1},Dw=function(t){return t.model.maxX},Bw=function(t){return t.model.maxY},Aw=function(t){return t.model.maxX+1},Mw=function(t){return t.model.maxY+1},Fw=function(t,n,e){return n(t)-e(t)},Iw=function(t){return Fw(t,Dw,Ow)},Rw=function(t){return Fw(t,Bw,_w)},Vw=function(t){return Iw(t)/2},Pw=function(t){return Rw(t)/2},Hw=function(t){return t.stepSize},zw=function(t){return t.snapToGrid},Nw=function(t){return t.snapStart},Lw=function(t){return t.rounded},jw=function(t,n){return t[n+"-edge"]!==undefined},Uw=function(t){return jw(t,"left")},Ww=function(t){return jw(t,"right")},Gw=function(t){return jw(t,"top")},Xw=function(t){return jw(t,"bottom")},Yw=function(t){return t.model.value.get()},qw=function(t){return{x:t}},Kw=function(t){return{y:t}},Jw=function(t,n){return{x:t,y:n}},$w=function(t,n){qo(t,kw(),{value:n})},Qw=function(t,n,e,o){return t<n?t:e<t?e:t===n?n-1:Math.max(n,t-o)},Zw=function(t,n,e,o){return e<t?t:t<n?n:t===e?e+1:Math.min(e,t+o)},tS=function(t,n,e){return Math.max(n,Math.min(e,t))},nS=function(t){var n=t.min,e=t.max,o=t.range,r=t.value,i=t.step,u=t.snap,a=t.snapStart,c=t.rounded,s=t.hasMinEdge,l=t.hasMaxEdge,f=t.minBound,d=t.maxBound,m=t.screenRange,g=s?n-1:n,p=l?e+1:e;if(r<f)return g;if(d<r)return p;var h,v,b,y,x,w,S,k=(x=r,w=f,S=d,Math.min(S,Math.max(x,w))-w),C=tS(k/m*o+n,g,p);return u&&n<=C&&C<=e?(h=C,v=n,b=e,y=i,a.fold(function(){var t=h-v,n=Math.round(t/y)*y;return tS(v+n,v-1,b+1)},function(t){var n=(h-t)%y,e=Math.round(n/y),o=Math.floor((h-t)/y),r=Math.floor((b-t)/y),i=t+Math.min(r,o+e)*y;return Math.max(t,i)})):c?Math.round(C):C},eS=function(t){var n=t.min,e=t.max,o=t.range,r=t.value,i=t.hasMinEdge,u=t.hasMaxEdge,a=t.maxBound,c=t.maxOffset,s=t.centerMinEdge,l=t.centerMaxEdge;return r<n?i?0:s:e<r?u?a:l:(r-n)/o*c},oS="left",rS=function(t){return t.element.dom.getBoundingClientRect()},iS=function(t,n){return t[n]},uS=function(t){var n=rS(t);return iS(n,oS)},aS=function(t){var n=rS(t);return iS(n,"right")},cS=function(t){var n=rS(t);return iS(n,"top")},sS=function(t){var n=rS(t);return iS(n,"bottom")},lS=function(t){var n=rS(t);return iS(n,"width")},fS=function(t){var n=rS(t);return iS(n,"height")},dS=function(t,n,e){return(t+n)/2-e},mS=function(t,n){var e=rS(t),o=rS(n),r=iS(e,oS),i=iS(e,"right"),u=iS(o,oS);return dS(r,i,u)},gS=function(t,n){var e=rS(t),o=rS(n),r=iS(e,"top"),i=iS(e,"bottom"),u=iS(o,"top");return dS(r,i,u)},pS=function(t,n){qo(t,kw(),{value:n})},hS=function(t){return{x:t}},vS=function(t,n,e){var o={min:Ow(n),max:Dw(n),range:Iw(n),value:e,step:Hw(n),snap:zw(n),snapStart:Nw(n),rounded:Lw(n),hasMinEdge:Uw(n),hasMaxEdge:Ww(n),minBound:uS(t),maxBound:aS(t),screenRange:lS(t)};return nS(o)},bS=function(i){return function(t,n){return e=t,r=(0<i?Zw:Qw)(Yw(o=n).x,Ow(o),Dw(o),Hw(o)),pS(e,hS(r)),ft.some(r).map(w);var e,o,r}},yS=function(t,n,e,o,r,i){var u,a,c,s,l,f,d,m,g,p=(a=i,c=e,s=o,l=r,f=lS(u=n),d=s.bind(function(t){return ft.some(mS(t,u))}).getOr(0),m=l.bind(function(t){return ft.some(mS(t,u))}).getOr(f),g={min:Ow(a),max:Dw(a),range:Iw(a),value:c,hasMinEdge:Uw(a),hasMaxEdge:Ww(a),minBound:uS(u),minOffset:0,maxBound:aS(u),maxOffset:f,centerMinEdge:d,centerMaxEdge:m},eS(g));return uS(n)-uS(t)+p},xS=bS(-1),wS=bS(1),SS=ft.none,kS=ft.none,CS={"top-left":ft.none(),top:ft.none(),"top-right":ft.none(),right:ft.some(function(t,n){$w(t,qw(Aw(n)))}),"bottom-right":ft.none(),bottom:ft.none(),"bottom-left":ft.none(),left:ft.some(function(t,n){$w(t,qw(Tw(n)))})},OS=/* */Object.freeze({__proto__:null,setValueFrom:function(t,n,e){var o=vS(t,n,e),r=hS(o);return pS(t,r),o},setToMin:function(t,n){var e=Ow(n);pS(t,hS(e))},setToMax:function(t,n){var e=Dw(n);pS(t,hS(e))},findValueOfOffset:vS,getValueFromEvent:function(t){return Cw(t).map(function(t){return t.left})},findPositionOfValue:yS,setPositionFromValue:function(t,n,e,o){var r=Yw(e),i=yS(t,o.getSpectrum(t),r.x,o.getLeftEdge(t),o.getRightEdge(t),e),u=Ou(n.element)/2;Yi(n.element,"left",i-u+"px")},onLeft:xS,onRight:wS,onUp:SS,onDown:kS,edgeActions:CS}),_S=function(t,n){qo(t,kw(),{value:n})},TS=function(t){return{y:t}},ES=function(t,n,e){var o={min:_w(n),max:Bw(n),range:Rw(n),value:e,step:Hw(n),snap:zw(n),snapStart:Nw(n),rounded:Lw(n),hasMinEdge:Gw(n),hasMaxEdge:Xw(n),minBound:cS(t),maxBound:sS(t),screenRange:fS(t)};return nS(o)},DS=function(i){return function(t,n){return e=t,r=(0<i?Zw:Qw)(Yw(o=n).y,_w(o),Bw(o),Hw(o)),_S(e,TS(r)),ft.some(r).map(w);var e,o,r}},BS=function(t,n,e,o,r,i){var u,a,c,s,l,f,d,m,g,p=(a=i,c=e,s=o,l=r,f=fS(u=n),d=s.bind(function(t){return ft.some(gS(t,u))}).getOr(0),m=l.bind(function(t){return ft.some(gS(t,u))}).getOr(f),g={min:_w(a),max:Bw(a),range:Rw(a),value:c,hasMinEdge:Gw(a),hasMaxEdge:Xw(a),minBound:cS(u),minOffset:0,maxBound:sS(u),maxOffset:f,centerMinEdge:d,centerMaxEdge:m},eS(g));return cS(n)-cS(t)+p},AS=ft.none,MS=ft.none,FS=DS(-1),IS=DS(1),RS={"top-left":ft.none(),top:ft.some(function(t,n){$w(t,Kw(Ew(n)))}),"top-right":ft.none(),right:ft.none(),"bottom-right":ft.none(),bottom:ft.some(function(t,n){$w(t,Kw(Mw(n)))}),"bottom-left":ft.none(),left:ft.none()},VS=/* */Object.freeze({__proto__:null,setValueFrom:function(t,n,e){var o=ES(t,n,e),r=TS(o);return _S(t,r),o},setToMin:function(t,n){var e=_w(n);_S(t,TS(e))},setToMax:function(t,n){var e=Bw(n);_S(t,TS(e))},findValueOfOffset:ES,getValueFromEvent:function(t){return Cw(t).map(function(t){return t.top})},findPositionOfValue:BS,setPositionFromValue:function(t,n,e,o){var r=Yw(e),i=BS(t,o.getSpectrum(t),r.y,o.getTopEdge(t),o.getBottomEdge(t),e),u=vu(n.element)/2;Yi(n.element,"top",i-u+"px")},onLeft:AS,onRight:MS,onUp:FS,onDown:IS,edgeActions:RS}),PS=function(t,n){qo(t,kw(),{value:n})},HS=function(t,n){return{x:t,y:n}},zS=function(c,s){return function(t,n){return o=t,r=n,i=0<c?Zw:Qw,u=(e=s)?Yw(r).x:i(Yw(r).x,Ow(r),Dw(r),Hw(r)),a=e?i(Yw(r).y,_w(r),Bw(r),Hw(r)):Yw(r).y,PS(o,HS(u,a)),ft.some(u).map(w);var e,o,r,i,u,a}},NS=Cw,LS=zS(-1,!1),jS=zS(1,!1),US=zS(-1,!0),WS=zS(1,!0),GS={"top-left":ft.some(function(t,n){$w(t,Jw(Tw(n),Ew(n)))}),top:ft.some(function(t,n){$w(t,Jw(Vw(n),Ew(n)))}),"top-right":ft.some(function(t,n){$w(t,Jw(Aw(n),Ew(n)))}),right:ft.some(function(t,n){$w(t,Jw(Aw(n),Pw(n)))}),"bottom-right":ft.some(function(t,n){$w(t,Jw(Aw(n),Mw(n)))}),bottom:ft.some(function(t,n){$w(t,Jw(Vw(n),Mw(n)))}),"bottom-left":ft.some(function(t,n){$w(t,Jw(Tw(n),Mw(n)))}),left:ft.some(function(t,n){$w(t,Jw(Tw(n),Pw(n)))})},XS=/* */Object.freeze({__proto__:null,setValueFrom:function(t,n,e){var o=vS(t,n,e.left),r=ES(t,n,e.top),i=HS(o,r);return PS(t,i),i},setToMin:function(t,n){var e=Ow(n),o=_w(n);PS(t,HS(e,o))},setToMax:function(t,n){var e=Dw(n),o=Bw(n);PS(t,HS(e,o))},getValueFromEvent:NS,setPositionFromValue:function(t,n,e,o){var r=Yw(e),i=yS(t,o.getSpectrum(t),r.x,o.getLeftEdge(t),o.getRightEdge(t),e),u=BS(t,o.getSpectrum(t),r.y,o.getTopEdge(t),o.getBottomEdge(t),e),a=Ou(n.element)/2,c=vu(n.element)/2;Yi(n.element,"left",i-a+"px"),Yi(n.element,"top",u-c+"px")},onLeft:LS,onRight:jS,onUp:US,onDown:WS,edgeActions:GS}),YS=Yf({name:"Slider",configFields:[ne("stepSize",1),ne("onChange",at),ne("onChoose",at),ne("onInit",at),ne("onDragStart",at),ne("onDragEnd",at),ne("snapToGrid",!1),ne("rounded",!0),Kn("snapStart"),jn("model",An("mode",{x:[ne("minX",0),ne("maxX",100),le("value",function(t){return fe(t.mode.minX)}),Ln("getInitialValue"),va("manager",OS)],y:[ne("minY",0),ne("maxY",100),le("value",function(t){return fe(t.mode.minY)}),Ln("getInitialValue"),va("manager",VS)],xy:[ne("minX",0),ne("maxX",100),ne("minY",0),ne("maxY",100),le("value",function(t){return fe({x:t.mode.minX,y:t.mode.minY})}),Ln("getInitialValue"),va("manager",XS)]})),jl("sliderBehaviours",[ig,Ll]),le("mouseIsDown",function(){return fe(!1)})],partFields:Sw,factory:function(i,t,n,e){var o,u=function(t){return Ff(t,i,"thumb")},a=function(t){return Ff(t,i,"spectrum")},r=function(t){return Mf(t,i,"left-edge")},c=function(t){return Mf(t,i,"right-edge")},s=function(t){return Mf(t,i,"top-edge")},l=function(t){return Mf(t,i,"bottom-edge")},f=i.model,d=f.manager,m=function(t,n){d.setPositionFromValue(t,n,i,{getLeftEdge:r,getRightEdge:c,getTopEdge:s,getBottomEdge:l,getSpectrum:a})},g=function(t,n){f.value.set(n);var e=u(t);return m(t,e),i.onChange(t,e,n),ft.some(!0)},p=function(e){var t=i.mouseIsDown.get();i.mouseIsDown.set(!1),t&&Mf(e,i,"thumb").each(function(t){var n=f.value.get();i.onChoose(e,t,n)})},h=function(t,n){n.stop(),i.mouseIsDown.set(!0),i.onDragStart(t,u(t))},v=function(t,n){n.stop(),i.onDragEnd(t,u(t)),p(t)};return{uid:i.uid,dom:i.dom,components:t,behaviours:Wl(i.sliderBehaviours,[ig.config({mode:"special",focusIn:function(t){return Mf(t,i,"spectrum").map(ig.focusIn).map(w)}}),Ll.config({store:{mode:"manual",getValue:function(t){return f.value.get()}}}),lc.config({channels:((o={})[Cl()]={onReceive:p},o)})]),events:Zo([er(kw(),function(t,n){g(t,n.event.value)}),sr(function(t,n){var e=f.getInitialValue();f.value.set(e);var o=u(t);m(t,o);var r=a(t);i.onInit(t,o,r,f.value.get())}),er(no(),h),er(oo(),v),er(io(),h),er(co(),v)]),apis:{resetToMin:function(t){d.setToMin(t,i)},resetToMax:function(t){d.setToMax(t,i)},changeValue:g,refresh:m},domModification:{styles:{position:"relative"}}}},apis:{resetToMin:function(t,n){t.resetToMin(n)},resetToMax:function(t,n){t.resetToMax(n)},refresh:function(t,n){t.refresh(n)}}}),qS=[jl("formBehaviours",[Ll])],KS=function(t){return"<alloy.field."+t+">"},JS=function(o,t){return{uid:o.uid,dom:o.dom,components:t,behaviours:Wl(o.formBehaviours,[Ll.config({store:{mode:"manual",getValue:function(t){var n=Rf(t,o);return Tt(n,function(t,r){return t().bind(function(t){var n,e,o=Zf.getCurrent(t);return n=o,e=new Error("Cannot find a current component to extract the value from for form part '"+r+"': "+Zr(t.element)),n.fold(function(){return pt.error(e)},pt.value)}).map(Ll.getValue)})},setValue:function(e,t){_t(t,function(n,t){Mf(e,o,t).each(function(t){Zf.getCurrent(t).each(function(t){Ll.setValue(t,n)})})})}}})]),apis:{getField:function(t,n){return Mf(t,o,n).bind(Zf.getCurrent)}}}},$S={getField:bi(function(t,n,e){return t.getField(n,e)}),sketch:function(t){var e,n=(e=[],{field:function(t,n){return e.push(t),Tf("form",KS(t),n)},record:function(){return e}}),o=t(n),r=n.record(),i=V(r,function(t){return bf({name:t,pname:KS(t)})});return jf("form",qS,i,JS,o)}},QS=oi("valid-input"),ZS=oi("invalid-input"),tk=oi("validating-input"),nk="colorcustom.rgb.",ek=function(d,m,g,p){var h=function(t,n,e,o,r){var i,u,a=d(nk+"range"),c=[Wy.parts.label({dom:{tag:"label",innerHtml:e,attributes:{"aria-label":o}}}),Wy.parts.field({data:r,factory:dx,inputAttributes:lt({type:"text"},"hex"===n?{"aria-live":"polite"}:{}),inputClasses:[m("textfield")],inputBehaviours:rc([(i=n,u=t,Fx.config({invalidClass:m("invalid"),notify:{onValidate:function(t){qo(t,tk,{type:i})},onValid:function(t){qo(t,QS,{type:i,value:Ll.getValue(t)})},onInvalid:function(t){qo(t,ZS,{type:i,value:Ll.getValue(t)})}},validator:{validate:function(t){var n=Ll.getValue(t),e=u(n)?pt.value(!0):pt.error(d("aria.input.invalid"));return kx(e)},validateOnLoad:!1}})),Yy.config({})]),onSetValue:function(t){Fx.isInvalid(t)&&Fx.run(t).get(at)}})],s="hex"!==n?[Wy.parts["aria-descriptor"]({text:a})]:[];return{dom:{tag:"div",attributes:{role:"presentation"}},components:c.concat(s)}},v=function(t,n){var e=n.red,o=n.green,r=n.blue;Ll.setValue(t,{red:e,green:o,blue:r})},b=mp({dom:{tag:"div",classes:[m("rgba-preview")],styles:{"background-color":"white"},attributes:{role:"presentation"}}}),y=function(t,n){b.getOpt(t).each(function(t){Yi(t.element,"background-color","#"+n.value)})};return Xf({factory:function(){var e={red:fe(ft.some(255)),green:fe(ft.some(255)),blue:fe(ft.some(255)),hex:fe(ft.some("ffffff"))},o=function(t){return e[t].get()},i=function(t,n){e[t].set(n)},r=function(t){var n=t.red,e=t.green,o=t.blue;i("red",ft.some(n)),i("green",ft.some(e)),i("blue",ft.some(o))},n=function(t,n){var e=n.event;"hex"!==e.type?i(e.type,ft.none()):p(t)},u=function(r,t,n){var e=parseInt(n,10);i(t,ft.some(e)),o("red").bind(function(e){return o("green").bind(function(n){return o("blue").map(function(t){return Ob(e,n,t,1)})})}).each(function(t){var n,e,o=(n=r,e=yb(t),$S.getField(n,"hex").each(function(t){hg.isFocused(t)||Ll.setValue(n,{hex:e.value})}),e);y(r,o)})},a=function(t,n){var e=n.event;"hex"===e.type?function(t,n){g(t);var e=mb(n);i("hex",ft.some(n));var o=Eb(e);v(t,o),r(o),qo(t,lw,{hex:e}),y(t,e)}(t,e.value):u(t,e.type,e.value)},t=function(t){return{label:d(nk+t+".label"),description:d(nk+t+".description")}},c=t("red"),s=t("green"),l=t("blue"),f=t("hex");return zt($S.sketch(function(t){return{dom:{tag:"form",classes:[m("rgb-form")],attributes:{"aria-label":d("aria.color.picker")}},components:[t.field("red",Wy.sketch(h(_b,"red",c.label,c.description,255))),t.field("green",Wy.sketch(h(_b,"green",s.label,s.description,255))),t.field("blue",Wy.sketch(h(_b,"blue",l.label,l.description,255))),t.field("hex",Wy.sketch(h(hb,"hex",f.label,f.description,"ffffff"))),b.asSpec()],formBehaviours:rc([Fx.config({invalidClass:m("form-invalid")}),fg("rgb-form-events",[er(QS,a),er(ZS,n),er(tk,n)])])}}),{apis:{updateHex:function(t,n){var e,o;Ll.setValue(t,{hex:n.value}),e=t,o=Eb(n),v(e,o),r(o),y(t,n)}}})},name:"RgbForm",configFields:[],apis:{updateHex:function(t,n,e){t.updateHex(n,e)}},extraApis:{}})},ok=function(t,o){var r=YS.parts.spectrum({dom:{tag:"canvas",attributes:{role:"presentation"},classes:[o("sv-palette-spectrum")]}}),i=YS.parts.thumb({dom:{tag:"div",attributes:{role:"presentation"},classes:[o("sv-palette-thumb")],innerHtml:"<div class="+o("sv-palette-inner-thumb")+' role="presentation"></div>'}}),u=function(t,n){var e,o,r=t.width,i=t.height,u=t.getContext("2d");null!==u&&(u.fillStyle=n,u.fillRect(0,0,r,i),(e=u.createLinearGradient(0,0,r,0)).addColorStop(0,"rgba(255,255,255,1)"),e.addColorStop(1,"rgba(255,255,255,0)"),u.fillStyle=e,u.fillRect(0,0,r,i),(o=u.createLinearGradient(0,0,0,i)).addColorStop(0,"rgba(0,0,0,0)"),o.addColorStop(1,"rgba(0,0,0,1)"),u.fillStyle=o,u.fillRect(0,0,r,i))};return Xf({factory:function(t){var n=ct({x:0,y:0}),e=rc([Zf.config({find:ft.some}),hg.config({})]);return YS.sketch({dom:{tag:"div",attributes:{role:"presentation"},classes:[o("sv-palette")]},model:{mode:"xy",getInitialValue:n},rounded:!1,components:[r,i],onChange:function(t,n,e){qo(t,dw,{value:e})},onInit:function(t,n,e,o){u(e.element.dom,Bb(Ab))},sliderBehaviours:e})},name:"SaturationBrightnessPalette",configFields:[],apis:{setRgba:function(t,n,e){var o,r;o=e,r=n.components()[0].element.dom,u(r,Bb(o))}},extraApis:{}})},rk=function(f,d){return Xf({name:"ColourPicker",configFields:[Ln("dom"),ne("onValidHex",at),ne("onInvalidHex",at)],factory:function(t){var a,v,n,e,o,r=ek(f,d,t.onValidHex,t.onInvalidHex),i=ok(0,d),b={paletteRgba:fe(Ab)},u=mp(i.sketch({})),c=mp(r.sketch({})),s=function(t,e){u.getOpt(t).each(function(t){var n=Eb(e);b.paletteRgba.set(n),i.setRgba(t,n)})},l=function(t,n){c.getOpt(t).each(function(t){r.updateHex(t,n)})},y=function(n,e,t){mt(t,function(t){t(n,e)})};return{uid:t.uid,dom:t.dom,components:[u.asSpec(),(n=d,e=YS.parts.spectrum({dom:{tag:"div",classes:[n("hue-slider-spectrum")],attributes:{role:"presentation"}}}),o=YS.parts.thumb({dom:{tag:"div",classes:[n("hue-slider-thumb")],attributes:{role:"presentation"}}}),YS.sketch({dom:{tag:"div",classes:[n("hue-slider")],attributes:{role:"presentation"}},rounded:!1,model:{mode:"y",getInitialValue:ct({y:0})},components:[e,o],sliderBehaviours:rc([hg.config({})]),onChange:function(t,n,e){qo(t,fw,{value:e})}})),c.asSpec()],behaviours:rc([fg("colour-picker-events",[er(dw,(v=[l],function(t,n){var e,o,r,i,u,a,c,s,l,f=n.event.value,d=b.paletteRgba.get(),m=(i=r=0,u=(e=d).red/255,a=e.green/255,c=e.blue/255,s=Math.min(u,Math.min(a,c)),l=Math.max(u,Math.max(a,c)),s===l?sw(0,0,100*(i=s)):(r=60*((r=u===s?3:c===s?1:5)-(u===s?a-c:c===s?u-a:c-u)/(l-s)),o=(l-s)/l,i=l,sw(Math.round(r),Math.round(100*o),Math.round(100*i)))),g=sw(m.hue,f.x,100-f.y),p=Tb(g),h=yb(p);y(t,h,v)})),er(fw,(a=[s,l],function(t,n){var e,o,r,i=n.event.value,u=(e=i.y,o=sw((100-e)/100*360,100,100),r=Tb(o),yb(r));y(t,u,a)}))]),Zf.config({find:function(t){return c.getOpt(t)}}),ig.config({mode:"acyclic"})])}}})},ik=function(){return Zf.config({find:ft.some})},uk=function(t){return Zf.config({find:t.getOpt})},ak=function(t){return Zf.config({find:function(n){return Tr(n.element,t).bind(function(t){return n.getSystem().getByDom(t).toOptional()})}})},ck={"colorcustom.rgb.red.label":"R","colorcustom.rgb.red.description":"Red component","colorcustom.rgb.green.label":"G","colorcustom.rgb.green.description":"Green component","colorcustom.rgb.blue.label":"B","colorcustom.rgb.blue.description":"Blue component","colorcustom.rgb.hex.label":"#","colorcustom.rgb.hex.description":"Hex color code","colorcustom.rgb.range":"Range 0 to 255","colorcustom.sb.saturation":"Saturation","colorcustom.sb.brightness":"Brightness","colorcustom.sb.picker":"Saturation and Brightness Picker","colorcustom.sb.palette":"Saturation and Brightness Palette","colorcustom.sb.instructions":"Use arrow keys to select saturation and brightness, on x and y axes","colorcustom.hue.hue":"Hue","colorcustom.hue.slider":"Hue Slider","colorcustom.hue.palette":"Hue Palette","colorcustom.hue.instructions":"Use arrow keys to select a hue","aria.color.picker":"Color Picker","aria.input.invalid":"Invalid input"},sk=function(t){return ck[t]},lk=tinymce.util.Tools.resolve("tinymce.Resource"),fk=tinymce.util.Tools.resolve("tinymce.util.Tools"),dk=fn([ne("preprocess",st),ne("postprocess",st)]),mk=function(t,n,e){return Ll.config(zt({store:{mode:"manual",getValue:n,setValue:e}},t.map(function(t){return{store:{initialValue:t}}}).getOr({})))},gk=function(t,n,e){return mk(t,function(t){return n(t.element)},function(t,n){return e(t.element,n)})},pk=function(r,t){var i=En("RepresentingConfigs.memento processors",dk,t);return Ll.config({store:{mode:"manual",getValue:function(t){var n=r.get(t),e=Ll.getValue(n);return i.postprocess(e)},setValue:function(t,n){var e=i.preprocess(n),o=r.get(t);Ll.setValue(o,e)}}})},hk=mk,vk=function(t){return gk(t,Wr,Gr)},bk=function(t){return Ll.config({store:{mode:"memory",initialValue:t}})},yk=function(i,u){var n=function(t,n){n.stop()},e=function(t){return function(n,e){mt(t,function(t){t(n,e)})}},o=function(t,n){var e;mv.isDisabled(t)||(e=n.event.raw,a(t,e.dataTransfer.files))},r=function(t,n){var e=n.event.raw.target;a(t,e.files)},a=function(t,n){var e,o,r;Ll.setValue(t,(e=n,o=u,r=fk.explode(o.getSetting("images_file_types","jpeg,jpg,jpe,jfi,jif,jfif,png,gif,bmp,webp","string")),H($(e),function(n){return F(r,function(t){return Se(n.name.toLowerCase(),"."+t.toLowerCase())})}))),qo(t,Zy,{name:i.name})},c=mp({dom:{tag:"input",attributes:{type:"file",accept:"image/*"},styles:{display:"none"}},behaviours:rc([fg("input-file-events",[ar(vo()),ar(Eo())])])}),t=i.label.map(function(t){return Qy(t,u)}),s=Wy.parts.field({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"div",classes:["tox-dropzone-container"]},behaviours:rc([bk([]),ik(),mv.config({}),Eg.config({toggleClass:"dragenter",toggleOnExecute:!1}),fg("dropzone-events",[er("dragenter",e([n,Eg.toggle])),er("dragleave",e([n,Eg.toggle])),er("dragover",n),er("drop",e([n,o])),er(ho(),r)])]),components:[{dom:{tag:"div",classes:["tox-dropzone"],styles:{}},components:[{dom:{tag:"p",innerHtml:u.translate("Drop an image here")}},dp.sketch({dom:{tag:"button",innerHtml:u.translate("Browse for an image"),styles:{position:"relative"},classes:["tox-button","tox-button--secondary"]},components:[c.asSpec()],action:function(t){c.get(t).element.dom.click()},buttonBehaviours:rc([Yy.config({}),jv(u.isDisabled),Nv()])})]}]}}}});return Ky(t,s,["tox-form__group--stretched"],[])},xk=oi("alloy-fake-before-tabstop"),wk=oi("alloy-fake-after-tabstop"),Sk=function(t){return{dom:{tag:"div",styles:{width:"1px",height:"1px",outline:"none"},attributes:{tabindex:"0"},classes:t},behaviours:rc([hg.config({ignore:!0}),Yy.config({})])}},kk=function(t){return{dom:{tag:"div",classes:["tox-navobj"]},components:[Sk([xk]),t,Sk([wk])],behaviours:rc([ak(1)])}},Ck=function(t,n){qo(t,mo(),{raw:{which:9,shiftKey:n}})},Ok=function(t,n){var e=n.element;Hi(e,xk)?Ck(t,!0):Hi(e,wk)&&Ck(t,!1)},_k=function(t){return Oy(t,["."+xk,"."+wk].join(","),l)},Tk=!(je().browser.isIE()||je().browser.isEdge()),Ek=function(t,n){var o,r,e=Tk&&t.sandboxed,i=lt(lt({},t.label.map(function(t){return{title:t}}).getOr({})),e?{sandbox:"allow-scripts allow-same-origin"}:{}),u=(o=e,r=fe(""),{getValue:function(t){return r.get()},setValue:function(t,n){var e;o?Yr(t.element,"srcdoc",n):(Yr(t.element,"src","javascript:''"),(e=t.element.dom.contentWindow.document).open(),e.write(n),e.close()),r.set(n)}}),a=t.label.map(function(t){return Qy(t,n)}),c=Wy.parts.field({factory:{sketch:function(t){return kk({uid:t.uid,dom:{tag:"iframe",attributes:i},behaviours:rc([Yy.config({}),hg.config({}),hk(ft.none(),u.getValue,u.setValue)])})}}});return Ky(a,c,["tox-form__group--stretched"],[])},Dk=function(t,n){return Mk(document.createElement("canvas"),t,n)},Bk=function(t){var n=Dk(t.width,t.height);return Ak(n).drawImage(t,0,0),n},Ak=function(t){return t.getContext("2d")},Mk=function(t,n,e){return t.width=n,t.height=e,t},Fk=function(t){return t.naturalWidth||t.width},Ik=function(t){return t.naturalHeight||t.height},Rk=window.Promise?window.Promise:(zx=function(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],Wx(t,jx(Pk,this),jx(Hk,this))},Nx=window,Lx=zx.immediateFn||"function"==typeof Nx.setImmediate&&Nx.setImmediate||function(t){return setTimeout(t,1)},jx=function(e,o){return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e.apply(o,t)}},Ux=Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)},Wx=function(t,n,e){var o=!1;try{t(function(t){o||(o=!0,n(t))},function(t){o||(o=!0,e(t))})}catch(r){if(o)return;o=!0,e(r)}},zx.prototype["catch"]=function(t){return this.then(null,t)},zx.prototype.then=function(e,o){var r=this;return new zx(function(t,n){Vk.call(r,new Nk(e,o,t,n))})},zx.all=function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];var c=Array.prototype.slice.call(1===t.length&&Ux(t[0])?t[0]:t);return new zx(function(r,i){if(0===c.length)return r([]);for(var u=c.length,a=function(n,t){try{if(t&&("object"==typeof t||"function"==typeof t)){var e=t.then;if("function"==typeof e)return void e.call(t,function(t){a(n,t)},i)}c[n]=t,0==--u&&r(c)}catch(o){i(o)}},t=0;t<c.length;t++)a(t,c[t])})},zx.resolve=function(n){return n&&"object"==typeof n&&n.constructor===zx?n:new zx(function(t){t(n)})},zx.reject=function(e){return new zx(function(t,n){n(e)})},zx.race=function(r){return new zx(function(t,n){for(var e=0,o=r;e<o.length;e++)o[e].then(t,n)})},zx);function Vk(o){var r=this;null!==this._state?Lx(function(){var t,n=r._state?o.onFulfilled:o.onRejected;if(null!==n){try{t=n(r._value)}catch(e){return void o.reject(e)}o.resolve(t)}else(r._state?o.resolve:o.reject)(r._value)}):this._deferreds.push(o)}function Pk(t){try{if(t===this)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if("function"==typeof n)return void Wx(jx(n,t),jx(Pk,this),jx(Hk,this))}this._state=!0,this._value=t,zk.call(this)}catch(e){Hk.call(this,e)}}function Hk(t){this._state=!1,this._value=t,zk.call(this)}function zk(){for(var t=0,n=this._deferreds;t<n.length;t++){var e=n[t];Vk.call(this,e)}this._deferreds=[]}function Nk(t,n,e,o){this.onFulfilled="function"==typeof t?t:null,this.onRejected="function"==typeof n?n:null,this.resolve=e,this.reject=o}var Lk,jk,Uk,Wk,Gk=function(e){return new Rk(function(t,n){(function(t){var n=t.split(","),e=/data:([^;]+)/.exec(n[0]);if(!e)return ft.none();for(var o=e[1],r=n[1],i=atob(r),u=i.length,a=Math.ceil(u/1024),c=new Array(a),s=0;s<a;++s){for(var l=1024*s,f=Math.min(1024+l,u),d=new Array(f-l),m=l,g=0;m<f;++g,++m)d[g]=i[m].charCodeAt(0);c[s]=new Uint8Array(d)}return ft.some(new Blob(c,{type:o}))})(e).fold(function(){n("uri is not base64: "+e)},t)})},Xk=function(t,o,r){return o=o||"image/png",T(HTMLCanvasElement.prototype.toBlob)?new Rk(function(n,e){t.toBlob(function(t){t?n(t):e()},o,r)}):Gk(t.toDataURL(o,r))},Yk=function(t){return a=t,new Rk(function(t,n){var e=URL.createObjectURL(a),o=new Image,r=function(){o.removeEventListener("load",i),o.removeEventListener("error",u)},i=function(){r(),t(o)},u=function(){r(),n("Unable to load data of type "+a.type+": "+e)};o.addEventListener("load",i),o.addEventListener("error",u),o.src=e,o.complete&&setTimeout(i,0)}).then(function(t){qk(t);var n=Dk(Fk(t),Ik(t));return Ak(n).drawImage(t,0,0),n});var a},qk=function(t){URL.revokeObjectURL(t.src)},Kk=function(t,n,e){var o=n.type,r=ct(o),i=ct(e),u=function(o,r){return t.then(function(t){return e=r,n=(n=o)||"image/png",t.toDataURL(n,e);var n,e})};return{getType:r,toBlob:function(){return Rk.resolve(n)},toDataURL:i,toBase64:function(){return e.split(",")[1]},toAdjustedBlob:function(n,e){return t.then(function(t){return Xk(t,n,e)})},toAdjustedDataURL:u,toAdjustedBase64:function(t,n){return u(t,n).then(function(t){return t.split(",")[1]})},toCanvas:function(){return t.then(Bk)}}},Jk=function(n,t){return Xk(n,t).then(function(t){return Kk(Rk.resolve(n),t,n.toDataURL())})},$k=function(n){return e=n,new Rk(function(t){var n=new FileReader;n.onloadend=function(){t(n.result)},n.readAsDataURL(e)}).then(function(t){return Kk(Yk(n),n,t)});var e},Qk=function(t,n,e){var o="string"==typeof t?parseFloat(t):t;return e<o?o=e:o<n&&(o=n),o},Zk=function(){return[1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1]},tC=[0,.01,.02,.04,.05,.06,.07,.08,.1,.11,.12,.14,.15,.16,.17,.18,.2,.21,.22,.24,.25,.27,.28,.3,.32,.34,.36,.38,.4,.42,.44,.46,.48,.5,.53,.56,.59,.62,.65,.68,.71,.74,.77,.8,.83,.86,.89,.92,.95,.98,1,1.06,1.12,1.18,1.24,1.3,1.36,1.42,1.48,1.54,1.6,1.66,1.72,1.78,1.84,1.9,1.96,2,2.12,2.25,2.37,2.5,2.62,2.75,2.87,3,3.2,3.4,3.6,3.8,4,4.3,4.7,4.9,5,5.5,6,6.5,6.8,7,7.3,7.5,7.8,8,8.4,8.7,9,9.4,9.6,9.8,10],nC=function(t,n){for(var e,o=[],r=new Array(25),i=0;i<5;i++){for(var u=0;u<5;u++)o[u]=n[u+5*i];for(u=0;u<5;u++){for(var a=e=0;a<5;a++)e+=t[u+5*a]*o[a];r[u+5*i]=e}}return r},eC=function(n,e){return n.toCanvas().then(function(t){return oC(t,n.getType(),e)})},oC=function(t,n,e){var o=Ak(t),r=function(t,n){for(var e,o,r,i,u=t.data,a=n[0],c=n[1],s=n[2],l=n[3],f=n[4],d=n[5],m=n[6],g=n[7],p=n[8],h=n[9],v=n[10],b=n[11],y=n[12],x=n[13],w=n[14],S=n[15],k=n[16],C=n[17],O=n[18],_=n[19],T=0;T<u.length;T+=4)e=u[T],o=u[T+1],r=u[T+2],i=u[T+3],u[T]=e*a+o*c+r*s+i*l+f,u[T+1]=e*d+o*m+r*g+i*p+h,u[T+2]=e*v+o*b+r*y+i*x+w,u[T+3]=e*S+o*k+r*C+i*O+_;return t}(o.getImageData(0,0,t.width,t.height),e);return o.putImageData(r,0,0),Jk(t,n)},rC=function(t,n,e){var o=Ak(t),r=function(t,n,e){for(var o=function(t,n,e){return e<t?t=e:t<n&&(t=n),t},r=Math.round(Math.sqrt(e.length)),i=Math.floor(r/2),u=t.data,a=n.data,c=t.width,s=t.height,l=0;l<s;l++)for(var f=0;f<c;f++){for(var d=0,m=0,g=0,p=0;p<r;p++)for(var h=0;h<r;h++){var v=o(f+h-i,0,c-1),b=4*(o(l+p-i,0,s-1)*c+v),y=e[p*r+h];d+=u[b]*y,m+=u[1+b]*y,g+=u[2+b]*y}var x=4*(l*c+f);a[x]=o(d,0,255),a[1+x]=o(m,0,255),a[2+x]=o(g,0,255)}return n}(o.getImageData(0,0,t.width,t.height),r=o.getImageData(0,0,t.width,t.height),e);return o.putImageData(r,0,0),Jk(t,n)},iC=function(e){return function(t,n){return eC(t,e(Zk(),n))}},uC=(Lk=[-1,0,0,0,255,0,-1,0,0,255,0,0,-1,0,255,0,0,0,1,0,0,0,0,0,1],function(t){return eC(t,Lk)}),aC=iC(function(t,n){return n=Qk(255*n,-255,255),nC(t,[1,0,0,0,n,0,1,0,0,n,0,0,1,0,n,0,0,0,1,0,0,0,0,0,1])}),cC=iC(function(t,n){var e;return n=Qk(n,-1,1),e=(n*=100)<0?127+n/100*127:127*(e=0===(e=n%1)?tC[n]:tC[Math.floor(n)]*(1-e)+tC[Math.floor(n)+1]*e)+127,nC(t,[e/127,0,0,0,.5*(127-e),0,e/127,0,0,.5*(127-e),0,0,e/127,0,.5*(127-e),0,0,0,1,0,0,0,0,0,1])}),sC=(jk=[0,-1,0,-1,5,-1,0,-1,0],function(t){return e=jk,(n=t).toCanvas().then(function(t){return rC(t,n.getType(),e)});var n,e}),lC=(Uk=function(t,n){return 255*Math.pow(t/255,1-n)},function(n,e){return n.toCanvas().then(function(t){return function(t,n,e){for(var o=Ak(t),r=new Array(256),i=0;i<r.length;i++)r[i]=Uk(i,e);var u=function(t,n){for(var e=t.data,o=0;o<e.length;o+=4)e[o]=n[e[o]],e[o+1]=n[e[o+1]],e[o+2]=n[e[o+2]];return t}(o.getImageData(0,0,t.width,t.height),r);return o.putImageData(u,0,0),Jk(t,n)}(t,n.getType(),e)})}),fC=function(t,n,e){var o=Fk(t),r=Ik(t),i=n/o,u=e/r,a=!1;(i<.5||2<i)&&(i=i<.5?.5:2,a=!0),(u<.5||2<u)&&(u=u<.5?.5:2,a=!0);var c=dC(t,i,u);return a?c.then(function(t){return fC(t,n,e)}):c},dC=function(u,a,c){return new Rk(function(t){var n=Fk(u),e=Ik(u),o=Math.floor(n*a),r=Math.floor(e*c),i=Dk(o,r);Ak(i).drawImage(u,0,0,n,e,0,0,o,r),t(i)})},mC=function(t,n,e){var o=Dk(t.width,t.height),r=Ak(o),i=0,u=0;return 90!==(e=e<0?360+e:e)&&270!==e||Mk(o,o.height,o.width),90!==e&&180!==e||(i=o.width),270!==e&&180!==e||(u=o.height),r.translate(i,u),r.rotate(e*Math.PI/180),r.drawImage(t,0,0),Jk(o,n)},gC=function(t,n,e){var o=Dk(t.width,t.height),r=Ak(o);return"v"===e?(r.scale(1,-1),r.drawImage(t,0,-o.height)):(r.scale(-1,1),r.drawImage(t,-o.width,0)),Jk(o,n)},pC=function(t,n,e,o,r,i){var u=Dk(r,i);return Ak(u).drawImage(t,-e,-o),Jk(u,n)},hC=function(t){return uC(t)},vC=function(t){return sC(t)},bC=function(t,n){return lC(t,n)},yC=function(t,n,e,o){return eC(t,(r=Zk(),u=e,a=o,i=Qk(i=n,0,2),u=Qk(u,0,2),a=Qk(a,0,2),nC(r,[i,0,0,0,0,0,u,0,0,0,0,0,a,0,0,0,0,0,1,0,0,0,0,0,1])));var r,i,u,a},xC=function(t,n){return aC(t,n)},wC=function(t,n){return cC(t,n)},SC=function(t,n){return o=n,(e=t).toCanvas().then(function(t){return gC(t,e.getType(),o)});var e,o},kC=function(t,n,e,o,r){return u=n,a=e,c=o,s=r,(i=t).toCanvas().then(function(t){return pC(t,i.getType(),u,a,c,s)});var i,u,a,c,s},CC=function(t,n,e){return r=n,i=e,(o=t).toCanvas().then(function(t){return fC(t,r,i).then(function(t){return Jk(t,o.getType())})});var o,r,i},OC=function(t,n){return o=n,(e=t).toCanvas().then(function(t){return mC(t,e.getType(),o)});var e,o},_C=function(t,n){return lt({dom:{tag:"span",innerHtml:t,classes:["tox-icon","tox-tbtn__icon-wrap"]}},n)},TC=function(t,n){return _C(pp(t,n),{})},EC=function(t,n){return _C(pp(t,n),{behaviours:rc([lg.config({})])})},DC=function(t,n,e){return{dom:{tag:"span",innerHtml:e.translate(t),classes:[n+"__select-label"]},behaviours:rc([lg.config({})])}},BC=oi("toolbar.button.execute"),AC=((Wk={})[_o()]=["disabling","alloy.base.behaviour","toggling","toolbar-button-events"],Wk),MC=oi("update-menu-text"),FC=oi("update-menu-icon"),IC=function(n,e,o){var t=fe(at),r=n.text.map(function(t){return mp(DC(t,e,o.providers))}),i=n.icon.map(function(t){return mp(EC(t,o.providers.icons))}),u=function(t,n){var e=Ll.getValue(t);return hg.focus(e),qo(e,"keydown",{raw:n.event.raw}),ow.close(e),ft.some(!0)},a=n.role.fold(function(){return{}},function(t){return{role:t}}),c=n.tooltip.fold(function(){return{}},function(t){var n=o.providers.translate(t);return{title:n,"aria-label":n}});return mp(ow.sketch(lt(lt(lt({},n.uid?{uid:n.uid}:{}),a),{dom:{tag:"button",classes:[e,e+"--select"].concat(V(n.classes,function(t){return e+"--"+t})),attributes:lt({},c)},components:Kv([i.map(function(t){return t.asSpec()}),r.map(function(t){return t.asSpec()}),ft.some({dom:{tag:"div",classes:[e+"__select-chevron"],innerHtml:pp("chevron-down",o.providers.icons)}})]),matchWidth:!0,useMinWidth:!0,dropdownBehaviours:rc(k(n.dropdownBehaviours,[jv(function(){return n.disabled||o.providers.isDisabled()}),Nv(),rw.config({}),lg.config({}),fg("dropdown-events",[Xv(n,t),Yv(n,t)]),fg("menubutton-update-display-text",[er(MC,function(n,e){r.bind(function(t){return t.getOpt(n)}).each(function(t){lg.set(t,[lu(o.providers.translate(e.event.text))])})}),er(FC,function(n,e){i.bind(function(t){return t.getOpt(n)}).each(function(t){lg.set(t,[EC(e.event.icon,o.providers.icons)])})})])])),eventOrder:zt(AC,{mousedown:["focusing","alloy.base.behaviour","item-type-events","normal-dropdown-events"]}),sandboxBehaviours:rc([ig.config({mode:"special",onLeft:u,onRight:u})]),lazySink:o.getSink,toggleClass:e+"--active",parts:{menu:xh(0,n.columns,n.presets)},fetch:function(t){return Sx(y(n.fetch,t))}}))).asSpec()},RC=function(t){return"separator"===t.type},VC={type:"separator"},PC=function(t,e){var n=N(t,function(t,n){return C(n)?""===n?t:"|"===n?0<t.length&&!RC(t[t.length-1])?t.concat([VC]):t:It(e,n.toLowerCase())?t.concat([e[n.toLowerCase()]]):t:t.concat([n])},[]);return 0<n.length&&RC(n[n.length-1])&&n.pop(),n},HC=function(t,n){return It(t,"getSubmenuItems")?(o=n,r=(e=t).getSubmenuItems(),i=zC(r,o),{item:e,menus:zt(i.menus,Jt(e.value,i.items)),expansions:zt(i.expansions,Jt(e.value,e.value))}):{item:t,menus:{},expansions:{}};var e,o,r,i},zC=function(t,r){var n=PC(C(t)?t.split(" "):t,r);return z(n,function(t,n){var e=function(t){if(RC(t))return t;var n=Ft(t,"value").getOrThunk(function(){return oi("generated-menu-item")});return zt({value:n},t)}(n),o=HC(e,r);return{menus:zt(t.menus,o.menus),items:[o.item].concat(t.items),expansions:zt(t.expansions,o.expansions)}},{menus:{},expansions:{},items:[]})},NC=function(t,e,o,n){var r=oi("primary-menu"),i=zC(t,o.shared.providers.menuItems());if(0===i.items.length)return ft.none();var u=by(r,i.items,e,o,n),a=Tt(i.menus,function(t,n){return by(n,t,e,o,!1)}),c=zt(a,Jt(r,u));return ft.from(Qg.tieredData(r,c,i.expansions))},LC=function(e){return{isDisabled:function(){return mv.isDisabled(e)},setDisabled:function(t){return mv.set(e,t)},setActive:function(t){var n=e.element;t?(Ri(n,"tox-tbtn--enabled"),Yr(n,"aria-pressed",!0)):(Pi(n,"tox-tbtn--enabled"),$r(n,"aria-pressed"))},isActive:function(){return Hi(e.element,"tox-tbtn--enabled")}}},jC=function(e,t,o,n){return IC({text:e.text,icon:e.icon,tooltip:e.tooltip,role:n,fetch:function(t,n){e.fetch(function(t){n(NC(t,ih.CLOSE_ON_EXECUTE,o,!1))})},onSetup:e.onSetup,getApi:LC,columns:1,presets:"normal",classes:[],dropdownBehaviours:[Yy.config({})]},t,o.shared)},UC=function(n,r,i){return function(t){t(V(n,function(t){var n,e,o=t.text.fold(function(){return{}},function(t){return{text:t}});return lt(lt({type:t.type,active:!1},o),{onAction:function(t){var n=!t.isActive();t.setActive(n),e.storage.set(n),i.shared.getSink().each(function(t){r().getOpt(t).each(function(t){dc(t.element),qo(t,ex,{name:e.name,value:e.storage.get()})})})},onSetup:(n=e=t,function(t){t.setActive(n.storage.get())})})}))}},WC=function(t,n,e,o,r,i){void 0===e&&(e=[]);var u=n.fold(function(){return{}},function(t){return{action:t}}),a=lt({buttonBehaviours:rc([jv(function(){return t.disabled||i.isDisabled()}),Nv(),Yy.config({}),fg("button press",[nr("click"),nr("mousedown")])].concat(e)),eventOrder:{click:["button press","alloy.base.behaviour"],mousedown:["button press","alloy.base.behaviour"]}},u),c=zt(a,{dom:o});return zt(c,{components:r})},GC=function(t,n,e,o){void 0===o&&(o=[]);var r={tag:"button",classes:["tox-tbtn"],attributes:t.tooltip.map(function(t){return{"aria-label":e.translate(t),title:e.translate(t)}}).getOr({})},i=t.icon.map(function(t){return TC(t,e.icons)}),u=Kv([i]);return WC(t,n,o,r,u,e)},XC=function(t,n,e,o){void 0===o&&(o=[]);var r=GC(t,ft.some(n),e,o);return dp.sketch(r)},YC=function(t,n,e,o,r){void 0===o&&(o=[]),void 0===r&&(r=[]);var i=e.translate(t.text),u=t.icon?t.icon.map(function(t){return TC(t,e.icons)}):ft.none(),a=u.isSome()?Kv([u]):[],c=u.isSome()?{}:{innerHtml:i},s=k(t.primary||t.borderless?["tox-button"]:["tox-button","tox-button--secondary"],u.isSome()?["tox-button--icon"]:[],t.borderless?["tox-button--naked"]:[],r),l=lt(lt({tag:"button",classes:s},c),{attributes:{title:i}});return WC(t,n,o,l,a,e)},qC=function(t,n,e,o,r){void 0===o&&(o=[]),void 0===r&&(r=[]);var i=YC(t,ft.some(n),e,o,r);return dp.sketch(i)},KC=function(n,e){return function(t){"custom"===e?qo(t,ex,{name:n,value:{}}):"submit"===e?Yo(t,ox):"cancel"===e?Yo(t,nx):console.error("Unknown button type: ",e)}},JC=function(n,t,e){if("menu"===t){var o=n,r=lt(lt({},n),{onSetup:function(t){return t.setDisabled(n.disabled),at},fetch:UC(o.items,function(){return i},e)}),i=mp(jC(r,"tox-tbtn",e,ft.none()));return i.asSpec()}if("custom"===(c=t)||"cancel"===c||"submit"===c){var u=KC(n.name,t),a=lt(lt({},n),{borderless:!1});return qC(a,u,e.shared.providers,[])}var c;console.error("Unknown footer button type: ",t)},$C=function(t,n){var e,o,r=KC(t.name,"custom");return e=ft.none(),o=Wy.parts.field(lt({factory:dp},YC(t,ft.some(r),n,[bk(""),ik()]))),Ky(e,o,[],[])},QC=ct([ne("field1Name","field1"),ne("field2Name","field2"),pa("onLockedChange"),fa(["lockClass"]),ne("locked",!1),Gl("coupledFieldBehaviours",[Zf,Ll])]),ZC=function(t,n){return bf({factory:Wy,name:t,overrides:function(o){return{fieldBehaviours:rc([fg("coupled-input-behaviour",[er(po(),function(e){Mf(e,o,n).bind(Zf.getCurrent).each(function(n){Mf(e,o,"lock").each(function(t){Eg.isOn(t)&&o.onLockedChange(e,n,t)})})})])])}}})},tO=ct([ZC("field1","field2"),ZC("field2","field1"),bf({factory:dp,schema:[Ln("dom")],name:"lock",overrides:function(t){return{buttonBehaviours:rc([Eg.config({selected:t.locked,toggleClass:t.markers.lockClass,aria:{mode:"pressed"}})])}}})]),nO=Yf({name:"FormCoupledInputs",configFields:QC(),partFields:tO(),factory:function(o,t,n,e){return{uid:o.uid,dom:o.dom,components:t,behaviours:Xl(o.coupledFieldBehaviours,[Zf.config({find:ft.some}),Ll.config({store:{mode:"manual",getValue:function(t){var n=Pf(t,o,["field1","field2"]),e={};return e[o.field1Name]=Ll.getValue(n.field1()),e[o.field2Name]=Ll.getValue(n.field2()),e},setValue:function(t,n){var e=Pf(t,o,["field1","field2"]);Rt(n,o.field1Name)&&Ll.setValue(e.field1(),n[o.field1Name]),Rt(n,o.field2Name)&&Ll.setValue(e.field2(),n[o.field2Name])}}})]),apis:{getField1:function(t){return Mf(t,o,"field1")},getField2:function(t){return Mf(t,o,"field2")},getLock:function(t){return Mf(t,o,"lock")}}}},apis:{getField1:function(t,n){return t.getField1(n)},getField2:function(t,n){return t.getField2(n)},getLock:function(t,n){return t.getLock(n)}}}),eO=function(t){var n=/^\s*(\d+(?:\.\d+)?)\s*(|cm|mm|in|px|pt|pc|em|ex|ch|rem|vw|vh|vmin|vmax|%)\s*$/.exec(t);if(null===n)return pt.error(t);var e=parseFloat(n[1]),o=n[2];return pt.value({value:e,unit:o})},oO=function(t,n){var e={"":96,px:96,pt:72,cm:2.54,pc:12,mm:25.4,"in":1},o=function(t){return Object.prototype.hasOwnProperty.call(e,t)};return t.unit===n?ft.some(t.value):o(t.unit)&&o(n)?e[t.unit]===e[n]?ft.some(t.value):ft.some(t.value/e[t.unit]*e[n]):ft.none()},rO=function(t){return ft.none()},iO=function(t,n){var e,o,r,i=eO(t).toOptional(),u=eO(n).toOptional();return o=u,r=function(t,o){return oO(t,o.unit).map(function(t){return o.value/t}).map(function(t){return n=t,e=o.unit,function(t){return oO(t,e).map(function(t){return{value:t*n,unit:e}})};var n,e}).getOr(rO)},((e=i).isSome()&&o.isSome()?ft.some(r(e.getOrDie(),o.getOrDie())):ft.none()).getOr(rO)},uO=function(o,n){var a=rO,r=oi("ratio-event"),t=nO.parts.lock({dom:{tag:"button",classes:["tox-lock","tox-button","tox-button--naked","tox-button--icon"],attributes:{title:n.translate(o.label.getOr("Constrain proportions"))}},components:[{dom:{tag:"span",classes:["tox-icon","tox-lock-icon__lock"],innerHtml:pp("lock",n.icons)}},{dom:{tag:"span",classes:["tox-icon","tox-lock-icon__unlock"],innerHtml:pp("unlock",n.icons)}}],buttonBehaviours:rc([mv.config({disabled:function(){return o.disabled||n.isDisabled()}}),Nv(),Yy.config({})])}),e=function(t){return{dom:{tag:"div",classes:["tox-form__group"]},components:t}},i=function(e){return Wy.parts.field({factory:dx,inputClasses:["tox-textfield"],inputBehaviours:rc([mv.config({disabled:function(){return o.disabled||n.isDisabled()}}),Nv(),Yy.config({}),fg("size-input-events",[er(lo(),function(t,n){qo(t,r,{isField1:e})}),er(ho(),function(t,n){qo(t,Zy,{name:o.name})})])]),selectOnFocus:!1})},u=function(t){return{dom:{tag:"label",classes:["tox-label"],innerHtml:n.translate(t)}}},c=nO.parts.field1(e([Wy.parts.label(u("Width")),i(!0)])),s=nO.parts.field2(e([Wy.parts.label(u("Height")),i(!1)]));return nO.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:[{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:[c,s,e([u("&nbsp;"),t])]}],field1Name:"width",field2Name:"height",locked:!0,markers:{lockClass:"tox-locked"},onLockedChange:function(t,i,n){eO(Ll.getValue(t)).each(function(t){a(t).each(function(t){var n,e,o,r;Ll.setValue(i,(o={"":0,px:0,pt:1,mm:1,pc:2,ex:2,em:2,ch:2,rem:2,cm:3,"in":4,"%":4},-1!==(r=(n=t).value.toFixed((e=n.unit)in o?o[e]:1)).indexOf(".")&&(r=r.replace(/\.?0*$/,"")),r+n.unit))})})},coupledFieldBehaviours:rc([mv.config({disabled:function(){return o.disabled||n.isDisabled()},onDisabled:function(t){nO.getField1(t).bind(Wy.getField).each(mv.disable),nO.getField2(t).bind(Wy.getField).each(mv.disable),nO.getLock(t).each(mv.disable)},onEnabled:function(t){nO.getField1(t).bind(Wy.getField).each(mv.enable),nO.getField2(t).bind(Wy.getField).each(mv.enable),nO.getLock(t).each(mv.enable)}}),Nv(),fg("size-input-events2",[er(r,function(t,n){var e=n.event.isField1,o=e?nO.getField1(t):nO.getField2(t),r=e?nO.getField2(t):nO.getField1(t),i=o.map(Ll.getValue).getOr(""),u=r.map(Ll.getValue).getOr("");a=iO(i,u)})])])})},aO={undo:ct(oi("undo")),redo:ct(oi("redo")),zoom:ct(oi("zoom")),back:ct(oi("back")),apply:ct(oi("apply")),swap:ct(oi("swap")),transform:ct(oi("transform")),tempTransform:ct(oi("temp-transform")),transformApply:ct(oi("transform-apply"))},cO=ct("save-state"),sO=ct("disable"),lO=ct("enable"),fO={formActionEvent:ex,saveState:cO,disable:sO,enable:lO},dO=function(r,c){var t=function(t,n,e,o){return mp(qC({name:t,text:t,disabled:e,primary:o,icon:ft.none(),borderless:!1},n,c))},n=function(t,n,e,o){return mp(XC({name:t,icon:ft.some(t),tooltip:ft.some(n),disabled:o,primary:!1,borderless:!1},e,c))},u=function(t,e){t.map(function(t){var n=t.get(e);n.hasConfigured(mv)&&mv.disable(n)})},a=function(t,e){t.map(function(t){var n=t.get(e);n.hasConfigured(mv)&&mv.enable(n)})},s={tag:"div",classes:["tox-image-tools__toolbar","tox-image-tools-edit-panel"]},e=at,i=function(t,n,e){qo(t,n,e)},l=function(t){return Yo(t,fO.disable())},f=function(t){return Yo(t,fO.enable())},d=function(t,n){l(t),i(t,aO.transform(),{transform:n}),f(t)},o=function(t){return function(){J.getOpt(t).each(function(t){lg.set(t,[q])})}},m=function(t,n){l(t),i(t,aO.transformApply(),{transform:n,swap:o(t)}),f(t)},g=function(){return t("Back",function(t){return i(t,aO.back(),{swap:o(t)})},!1,!1)},p=function(){return mp({dom:{tag:"div",classes:["tox-spacer"]},behaviours:rc([mv.config({})])})},h=function(){return t("Apply",function(t){return i(t,aO.apply(),{swap:o(t)})},!0,!0)},v=[g(),p(),t("Apply",function(t){m(t,function(t){var n=r.getRect();return kC(t,n.x,n.y,n.w,n.h)}),r.hideCrop()},!1,!0)],b=Ny.sketch({dom:s,components:v.map(function(t){return t.asSpec()}),containerBehaviours:rc([fg("image-tools-crop-buttons-events",[er(fO.disable(),function(t,n){u(v,t)}),er(fO.enable(),function(t,n){a(v,t)})])])}),y=mp(uO({name:"size",label:ft.none(),constrain:!0,disabled:!1},c)),x=[g(),p(),y,p(),t("Apply",function(a){y.getOpt(a).each(function(t){var n,e,o=Ll.getValue(t),r=parseInt(o.width,10),i=parseInt(o.height,10),u=(n=r,e=i,function(t){return CC(t,n,e)});m(a,u)})},!1,!0)],w=Ny.sketch({dom:s,components:x.map(function(t){return t.asSpec()}),containerBehaviours:rc([fg("image-tools-resize-buttons-events",[er(fO.disable(),function(t,n){u(x,t)}),er(fO.enable(),function(t,n){a(x,t)})])])}),S=function(n,e){return function(t){return n(t,e)}},k=S(SC,"h"),C=S(SC,"v"),O=S(OC,-90),_=S(OC,90),T=function(t,n){var e,o;o=n,l(e=t),i(e,aO.tempTransform(),{transform:o}),f(e)},E=[g(),p(),n("flip-horizontally","Flip horizontally",function(t){T(t,k)},!1),n("flip-vertically","Flip vertically",function(t){T(t,C)},!1),n("rotate-left","Rotate counterclockwise",function(t){T(t,O)},!1),n("rotate-right","Rotate clockwise",function(t){T(t,_)},!1),p(),h()],D=Ny.sketch({dom:s,components:E.map(function(t){return t.asSpec()}),containerBehaviours:rc([fg("image-tools-fliprotate-buttons-events",[er(fO.disable(),function(t,n){u(E,t)}),er(fO.enable(),function(t,n){a(E,t)})])])}),B=function(t,n,e,o,r){var i=YS.parts.label({dom:{tag:"label",classes:["tox-label"],innerHtml:c.translate(t)}}),u=YS.parts.spectrum({dom:{tag:"div",classes:["tox-slider__rail"],attributes:{role:"presentation"}}}),a=YS.parts.thumb({dom:{tag:"div",classes:["tox-slider__handle"],attributes:{role:"presentation"}}});return mp(YS.sketch({dom:{tag:"div",classes:["tox-slider"],attributes:{role:"presentation"}},model:{mode:"x",minX:e,maxX:r,getInitialValue:ct({x:o})},components:[i,u,a],sliderBehaviours:rc([hg.config({})]),onChoose:n}))},A=function(t,n,e,o,r){return[g(),(i=n,B(t,function(t,n,e){var o=S(i,e.x/100);d(t,o)},e,o,r)),h()];var i},M=function(t,n,e,o,r){var i=A(t,n,e,o,r);return Ny.sketch({dom:s,components:i.map(function(t){return t.asSpec()}),containerBehaviours:rc([fg("image-tools-filter-panel-buttons-events",[er(fO.disable(),function(t,n){u(i,t)}),er(fO.enable(),function(t,n){a(i,t)})])])})},F=[g(),p(),h()],I=Ny.sketch({dom:s,components:F.map(function(t){return t.asSpec()})}),R=M("Brightness",xC,-100,0,100),V=M("Contrast",wC,-100,0,100),P=M("Gamma",bC,-100,0,100),H=function(t){return B(t,function(l,t,n){var e=z.getOpt(l),o=L.getOpt(l),r=N.getOpt(l);e.each(function(s){o.each(function(c){r.each(function(t){var n,e,o,r=Ll.getValue(s).x/100,i=Ll.getValue(t).x/100,u=Ll.getValue(c).x/100,a=(n=r,e=i,o=u,function(t){return yC(t,n,e,o)});d(l,a)})})})},0,100,200)},z=H("R"),N=H("G"),L=H("B"),j=[g(),z,N,L,h()],U=Ny.sketch({dom:s,components:j.map(function(t){return t.asSpec()})}),W=function(n,e,o){return function(t){i(t,aO.swap(),{transform:e,swap:function(){J.getOpt(t).each(function(t){lg.set(t,[n]),o(t)})}})}},G=ft.some(vC),X=ft.some(hC),Y=[n("crop","Crop",W(b,ft.none(),function(t){r.showCrop()}),!1),n("resize","Resize",W(w,ft.none(),function(t){y.getOpt(t).each(function(t){var n=r.getMeasurements(),e=n.width,o=n.height;Ll.setValue(t,{width:e,height:o})})}),!1),n("orientation","Orientation",W(D,ft.none(),e),!1),n("brightness","Brightness",W(R,ft.none(),e),!1),n("sharpen","Sharpen",W(I,G,e),!1),n("contrast","Contrast",W(V,ft.none(),e),!1),n("color-levels","Color levels",W(U,ft.none(),e),!1),n("gamma","Gamma",W(P,ft.none(),e),!1),n("invert","Invert",W(I,X,e),!1)],q=Ny.sketch({dom:s,components:Y.map(function(t){return t.asSpec()})}),K=Ny.sketch({dom:{tag:"div"},components:[q],containerBehaviours:rc([lg.config({})])}),J=mp(K);return{memContainer:J,getApplyButton:function(t){return J.getOpt(t).map(function(t){var n=t.components()[0];return n.components()[n.components().length-1]})}}},mO=tinymce.util.Tools.resolve("tinymce.geom.Rect"),gO=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),pO=tinymce.util.Tools.resolve("tinymce.util.Observable"),hO=tinymce.util.Tools.resolve("tinymce.util.VK"),vO=function(t){var n,e;if(t.changedTouches)for(n="screenX screenY pageX pageY clientX clientY".split(" "),e=0;e<n.length;e++)t[n[e]]=t.changedTouches[0][n[e]]};function bO(t,m){var g,p,h,v,b=m.document||document,y=b.getElementById(m.handle||t),x=function(t){if(vO(t),t.button!==p)return w(t);t.deltaX=t.screenX-h,t.deltaY=t.screenY-v,t.preventDefault(),m.drag(t)},w=function(t){vO(t),gO(b).off("mousemove touchmove",x).off("mouseup touchend",w),g.remove(),m.stop&&m.stop(t)};return gO(y).on("mousedown touchstart",function(t){var n,e,o,r,i,u,a,c,s,l,f=(n=b,e=Math.max,o=n.documentElement,r=n.body,i=e(o.scrollWidth,r.scrollWidth),u=e(o.clientWidth,r.clientWidth),a=e(o.offsetWidth,r.offsetWidth),c=e(o.scrollHeight,r.scrollHeight),s=e(o.clientHeight,r.clientHeight),{width:i<a?u:i,height:c<e(o.offsetHeight,r.offsetHeight)?s:c});vO(t),t.preventDefault(),p=t.button;var d=y;h=t.screenX,v=t.screenY,l=window.getComputedStyle?window.getComputedStyle(d,null).getPropertyValue("cursor"):d.runtimeStyle.cursor,g=gO("<div></div>").css({position:"absolute",top:0,left:0,width:f.width,height:f.height,zIndex:2147483647,opacity:1e-4,cursor:l}).appendTo(b.body),gO(b).on("mousemove touchmove",x).on("mouseup touchend",w),m.start(t)}),{destroy:function(){gO(y).off()}}}var yO=0,xO=function(s,e,l,o,r){var t,n="tox-",u="tox-crid-"+yO++,a=[{name:"move",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:0,deltaH:0,label:"Crop Mask"},{name:"nw",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:-1,deltaH:-1,label:"Top Left Crop Handle"},{name:"ne",xMul:1,yMul:0,deltaX:0,deltaY:1,deltaW:1,deltaH:-1,label:"Top Right Crop Handle"},{name:"sw",xMul:0,yMul:1,deltaX:1,deltaY:0,deltaW:-1,deltaH:1,label:"Bottom Left Crop Handle"},{name:"se",xMul:1,yMul:1,deltaX:0,deltaY:0,deltaW:1,deltaH:1,label:"Bottom Right Crop Handle"}],i=["top","right","bottom","left"],f=function(t,n){return{x:n.x-t.x,y:n.y-t.y,w:n.w,h:n.h}},c=function(t,n,e,o){var r,i=n.x,u=n.y,a=n.w,c=n.h;i+=e*t.deltaX,u+=o*t.deltaY,(a+=e*t.deltaW)<20&&(a=20),(c+=o*t.deltaH)<20&&(c=20),r=s=mO.clamp({x:i,y:u,w:a,h:c},l,"move"===t.name),r=f(l,r),p.fire("updateRect",{rect:r}),g(r)},d=function(n){var t=function(t,n){n.h<0&&(n.h=0),n.w<0&&(n.w=0),gO("#"+u+"-"+t,o).css({left:n.x,top:n.y,width:n.w,height:n.h})};fk.each(a,function(t){gO("#"+u+"-"+t.name,o).css({left:n.w*t.xMul+n.x,top:n.h*t.yMul+n.y})}),t("top",{x:e.x,y:e.y,w:e.w,h:n.y-e.y}),t("right",{x:n.x+n.w,y:n.y,w:e.w-n.x-n.w+e.x,h:n.h}),t("bottom",{x:e.x,y:n.y+n.h,w:e.w,h:e.h-n.y-n.h+e.y}),t("left",{x:e.x,y:n.y,w:n.x-e.x,h:n.h}),t("move",n)},m=function(t){d(s=t)},g=function(t){var n,e;m((n=l,{x:(e=t).x+n.x,y:e.y+n.y,w:e.w,h:e.h}))};gO('<div id="'+u+'" class="'+n+'croprect-container" role="grid" aria-dropeffect="execute">').appendTo(o),fk.each(i,function(t){gO("#"+u,o).append('<div id="'+u+"-"+t+'"class="'+n+'croprect-block" style="display: none" data-mce-bogus="all">')}),fk.each(a,function(t){gO("#"+u,o).append('<div id="'+u+"-"+t.name+'" class="'+n+"croprect-handle "+n+"croprect-handle-"+t.name+'"style="display: none" data-mce-bogus="all" role="gridcell" tabindex="-1" aria-label="'+t.label+'" aria-grabbed="false" title="'+t.label+'">')}),t=fk.map(a,function(n){var e;return bO(u,{document:o.ownerDocument,handle:u+"-"+n.name,start:function(){e=s},drag:function(t){c(n,e,t.deltaX,t.deltaY)}})}),d(s),gO(o).on("focusin focusout",function(t){gO(t.target).attr("aria-grabbed","focus"===t.type?"true":"false")}),gO(o).on("keydown",function(n){var i;fk.each(a,function(t){if(n.target.id===u+"-"+t.name)return i=t,!1});var t=function(t,n,e,o,r){t.stopPropagation(),t.preventDefault(),c(i,e,o,r)};switch(n.keyCode){case hO.LEFT:t(n,0,s,-10,0);break;case hO.RIGHT:t(n,0,s,10,0);break;case hO.UP:t(n,0,s,0,-10);break;case hO.DOWN:t(n,0,s,0,10);break;case hO.ENTER:case hO.SPACEBAR:n.preventDefault(),r()}});var p=fk.extend({toggleVisibility:function(t){var n=fk.map(a,function(t){return"#"+u+"-"+t.name}).concat(fk.map(i,function(t){return"#"+u+"-"+t})).join(",");t?gO(n,o).show():gO(n,o).hide()},setClampRect:function(t){l=t,d(s)},setRect:m,getInnerRect:function(){return f(l,s)},setInnerRect:g,setViewPortRect:function(t){e=t,d(s)},destroy:function(){fk.each(t,function(t){t.destroy()}),t=[]}},pO);return p},wO=function(n){var l=mp({dom:{tag:"div",classes:["tox-image-tools__image-bg"],attributes:{role:"presentation"}}}),f=fe(1),d=fe(ft.none()),m=fe({x:0,y:0,w:1,h:1}),c=fe({x:0,y:0,w:1,h:1}),s=function(t,s){g.getOpt(t).each(function(t){var e=f.get(),o=Ou(t.element),r=vu(t.element),i=s.dom.naturalWidth*e,u=s.dom.naturalHeight*e,a=Math.max(0,o/2-i/2),c=Math.max(0,r/2-u/2),n={left:a.toString()+"px",top:c.toString()+"px",width:i.toString()+"px",height:u.toString()+"px",position:"absolute"};qi(s,n),l.getOpt(t).each(function(t){qi(t.element,n)}),d.get().each(function(t){var n=m.get();t.setRect({x:n.x*e+a,y:n.y*e+c,w:n.w*e,h:n.h*e}),t.setClampRect({x:a,y:c,w:i,h:u}),t.setViewPortRect({x:0,y:0,w:o,h:r})})})},e=function(t,n){var e,a=me.fromTag("img");return Yr(a,"src",n),e=a.dom,new Mp(function(t){var n=function(){e.removeEventListener("load",n),t(e)};e.complete?t(e):e.addEventListener("load",n)}).then(function(){return g.getOpt(t).map(function(t){var n=fu({element:a});lg.replaceAt(t,1,ft.some(n));var e=c.get(),o={x:0,y:0,w:a.dom.naturalWidth,h:a.dom.naturalHeight};c.set(o);var r,u,i=mO.inflate(o,-20,-20);return m.set(i),e.w===o.w&&e.h===o.h||(r=t,u=a,g.getOpt(r).each(function(t){var n=Ou(t.element),e=vu(t.element),o=u.dom.naturalWidth,r=u.dom.naturalHeight,i=Math.min(n/o,e/r);1<=i?f.set(1):f.set(i)})),s(t,a),a})})},t=Ny.sketch({dom:{tag:"div",classes:["tox-image-tools__image"]},components:[l.asSpec(),{dom:{tag:"img",attributes:{src:n}}},{dom:{tag:"div"},behaviours:rc([fg("image-panel-crop-events",[sr(function(t){g.getOpt(t).each(function(t){var n=t.element.dom,e=xO({x:10,y:10,w:100,h:100},{x:0,y:0,w:200,h:200},{x:0,y:0,w:200,h:200},n,at);e.toggleVisibility(!1),e.on("updateRect",function(t){var n=t.rect,e=f.get(),o={x:Math.round(n.x/e),y:Math.round(n.y/e),w:Math.round(n.w/e),h:Math.round(n.h/e)};m.set(o)}),d.set(ft.some(e))})})])])}],containerBehaviours:rc([lg.config({}),fg("image-panel-events",[sr(function(t){e(t,n)})])])}),g=mp(t);return{memContainer:g,updateSrc:e,zoom:function(t,n){var e=f.get(),o=0<n?Math.min(2,e+.1):Math.max(.1,e-.1);f.set(o),g.getOpt(t).each(function(t){var n=t.components()[1].element;s(t,n)})},showCrop:function(){d.get().each(function(t){t.toggleVisibility(!0)})},hideCrop:function(){d.get().each(function(t){t.toggleVisibility(!1)})},getRect:function(){return m.get()},getMeasurements:function(){var t=c.get();return{width:t.w,height:t.h}}}},SO=function(t,n,e,o,r){return XC({name:t,icon:ft.some(n),disabled:e,tooltip:ft.some(t),primary:!1,borderless:!1},o,r)},kO=function(t,n){n?mv.enable(t):mv.disable(t)};var CO,OO,_O,TO=function(t){var e,o,n,r,i=fe(t),u=fe(ft.none()),a=(o=-1,{data:e=[],add:function(t){var n=e.splice(++o);return e.push(t),{state:t,removed:n}},undo:function(){if(n())return e[--o]},redo:function(){if(r())return e[++o]},canUndo:n=function(){return 0<o},canRedo:r=function(){return-1!==o&&o<e.length-1}});a.add(t);var c=function(t){i.set(t)},s=function(t){return{blob:t,url:URL.createObjectURL(t)}},l=function(t){URL.revokeObjectURL(t.url)},f=function(){u.get().each(l),u.set(ft.none())},d=function(t){var n=s(t);c(n);var e,o=a.add(n).removed;return e=o,fk.each(e,l),n.url};return{getBlobState:function(){return i.get()},setBlobState:c,addBlobState:d,getTempState:function(){return u.get().fold(function(){return i.get()},function(t){return t})},updateTempState:function(t){var n=s(t);return f(),u.set(ft.some(n)),n.url},addTempState:function(t){var n=s(t);return u.set(ft.some(n)),n.url},applyTempState:function(n){return u.get().fold(at,function(t){d(t.blob),n()})},destroyTempState:f,undo:function(){var t=a.undo();return c(t),t.url},redo:function(){var t=a.redo();return c(t),t.url},getHistoryStates:function(){return{undoEnabled:a.canUndo(),redoEnabled:a.canRedo()}}}},EO=function(t,n){var e,o,r,u=TO(t.currentState),i=function(t){var n=u.getHistoryStates();p.updateButtonUndoStates(t,n.undoEnabled,n.redoEnabled),qo(t,fO.formActionEvent,{name:fO.saveState(),value:n.undoEnabled})},a=function(t){return t.toBlob()},c=function(t){qo(t,fO.formActionEvent,{name:fO.disable(),value:{}})},s=function(t){h.getApplyButton(t).each(function(t){mv.enable(t)}),qo(t,fO.formActionEvent,{name:fO.enable(),value:{}})},l=function(t,n){return c(t),g.updateSrc(t,n)},f=function(n,t,e,o,r){return c(n),$k(t).then(e).then(a).then(o).then(function(t){return l(n,t).then(function(t){return i(n),r(),s(n),t})})["catch"](function(t){return console.log(t),s(n),t})},d=function(t,n,e){var o=u.getBlobState().blob;f(t,o,n,function(t){return u.updateTempState(t)},e)},m=function(t){var n=u.getBlobState().url;return u.destroyTempState(),i(t),n},g=wO(t.currentState.url),p=(o=mp(SO("Undo","undo",!0,function(t){qo(t,aO.undo(),{direction:1})},e=n)),r=mp(SO("Redo","redo",!0,function(t){qo(t,aO.redo(),{direction:1})},e)),{container:Ny.sketch({dom:{tag:"div",classes:["tox-image-tools__toolbar","tox-image-tools__sidebar"]},components:[o.asSpec(),r.asSpec(),SO("Zoom in","zoom-in",!1,function(t){qo(t,aO.zoom(),{direction:1})},e),SO("Zoom out","zoom-out",!1,function(t){qo(t,aO.zoom(),{direction:-1})},e)]}),updateButtonUndoStates:function(t,n,e){o.getOpt(t).each(function(t){kO(t,n)}),r.getOpt(t).each(function(t){kO(t,e)})}}),h=dO(g,n);return{dom:{tag:"div",attributes:{role:"presentation"}},components:[h.memContainer.asSpec(),g.memContainer.asSpec(),p.container],behaviours:rc([Ll.config({store:{mode:"manual",getValue:function(){return u.getBlobState()}}}),fg("image-tools-events",[er(aO.undo(),function(n,t){var e=u.undo();l(n,e).then(function(t){s(n),i(n)})}),er(aO.redo(),function(n,t){var e=u.redo();l(n,e).then(function(t){s(n),i(n)})}),er(aO.zoom(),function(t,n){var e=n.event.direction;g.zoom(t,e)}),er(aO.back(),function(t,n){var e,o;o=m(e=t),l(e,o).then(function(t){s(e)}),(0,n.event.swap)(),g.hideCrop()}),er(aO.apply(),function(t,n){u.applyTempState(function(){m(t),(0,n.event.swap)()})}),er(aO.transform(),function(t,n){return d(t,n.event.transform,at)}),er(aO.tempTransform(),function(t,n){return e=t,o=n.event.transform,r=u.getTempState().blob,void f(e,r,o,function(t){return u.addTempState(t)},at);var e,o,r}),er(aO.transformApply(),function(t,n){return e=t,o=n.event.transform,r=n.event.swap,i=u.getBlobState().blob,void f(e,i,o,function(t){var n=u.addBlobState(t);return m(e),n},r);var e,o,r,i}),er(aO.swap(),function(n,t){var e;e=n,p.updateButtonUndoStates(e,!1,!1);var o=t.event.transform,r=t.event.swap;o.fold(function(){r()},function(t){d(n,t,r)})})]),ik()])}},DO=function(t){return!It(t,"items")},BO="data-value",AO=function(n,e,t,o){return V(t,function(t){return DO(t)?{type:"togglemenuitem",text:t.text,value:t.value,active:t.value===o,onAction:function(){Ll.setValue(n,t.value),qo(n,Zy,{name:e}),hg.focus(n)}}:{type:"nestedmenuitem",text:t.text,getSubmenuItems:function(){return AO(n,e,t.items,o)}}})},MO=function(t,n){return Q(t,function(t){return DO(t)?Kf(t.value===n,t):MO(t.items,n)})},FO=Xf({name:"HtmlSelect",configFields:[Ln("options"),jl("selectBehaviours",[hg,Ll]),ne("selectClasses",[]),ne("selectAttributes",{}),Kn("data")],factory:function(e,t){var n=V(e.options,function(t){return{dom:{tag:"option",value:t.value,innerHtml:t.text}}}),o=e.data.map(function(t){return Jt("initialValue",t)}).getOr({});return{uid:e.uid,dom:{tag:"select",classes:e.selectClasses,attributes:e.selectAttributes},components:n,behaviours:Wl(e.selectBehaviours,[hg.config({}),Ll.config({store:lt({mode:"manual",getValue:function(t){return eu(t.element)},setValue:function(t,n){L(e.options,function(t){return t.value===n}).isSome()&&ou(t.element,n)}},o)})])}}}),IO=function(e,n){var t=e.label.map(function(t){return Qy(t,n)}),o=[mv.config({disabled:function(){return e.disabled||n.isDisabled()}}),Nv(),ig.config({mode:"execution",useEnter:!0!==e.multiline,useControlEnter:!0===e.multiline,execute:function(t){return Yo(t,ox),ft.some(!0)}}),fg("textfield-change",[er(po(),function(t,n){qo(t,Zy,{name:e.name})}),er(Co(),function(t,n){qo(t,Zy,{name:e.name})})]),Yy.config({})],r=e.validation.map(function(o){return Fx.config({getRoot:function(t){return kr(t.element)},invalidClass:"tox-invalid",validator:{validate:function(t){var n=Ll.getValue(t),e=o.validator(n);return kx(!0===e?pt.value(n):pt.error(e))},validateOnLoad:o.validateOnLoad}})}).toArray(),i=e.placeholder.fold(ct({}),function(t){return{placeholder:n.translate(t)}}),u=e.inputMode.fold(ct({}),function(t){return{inputmode:t}}),a=lt(lt({},i),u),c=Wy.parts.field({tag:!0===e.multiline?"textarea":"input",inputAttributes:a,inputClasses:[e.classname],inputBehaviours:rc(gt([o,r])),selectOnFocus:!1,factory:dx}),s=(e.flex?["tox-form__group--stretched"]:[]).concat(e.maximized?["tox-form-group--maximize"]:[]),l=[mv.config({disabled:function(){return e.disabled||n.isDisabled()},onDisabled:function(t){Wy.getField(t).each(mv.disable)},onEnabled:function(t){Wy.getField(t).each(mv.enable)}}),Nv()];return Ky(t,c,s,l)},RO=/* */Object.freeze({__proto__:null,events:function(t,n){var e=t.stream.streams.setup(t,n);return Zo([er(t.event,e),lr(function(){return n.cancel()})].concat(t.cancelEvent.map(function(t){return[er(t,function(){return n.cancel()})]}).getOr([])))}}),VO=function(t){var n=fe(null);return xi({readState:function(){return{timer:null!==n.get()?"set":"unset"}},setTimer:function(t){n.set(t)},cancel:function(){var t=n.get();null!==t&&t.cancel()}})},PO=/* */Object.freeze({__proto__:null,throttle:VO,init:function(t){return t.stream.streams.state(t)}}),HO=[jn("stream",An("mode",{throttle:[Ln("delay"),ne("stopEvent",!0),va("streams",{setup:function(t,n){var e=t.stream,o=wp(t.onStream,e.delay);return n.setTimer(o),function(t,n){o.throttle(t,n),e.stopEvent&&n.stop()}},state:VO})]})),ne("event","input"),Kn("cancelEvent"),pa("onStream")],zO=uc({fields:HO,name:"streaming",active:RO,state:PO}),NO=function(t,n,e){var o=Ll.getValue(e);Ll.setValue(n,o),jO(n)},LO=function(t,n){var e=t.element,o=eu(e),r=e.dom;"number"!==qr(e,"type")&&n(r,o)},jO=function(t){LO(t,function(t,n){return t.setSelectionRange(n.length,n.length)})},UO=function(t,n,o){if(t.selectsOver){var e=Ll.getValue(n),r=t.getDisplayText(e),i=Ll.getValue(o);return 0===t.getDisplayText(i).indexOf(r)?ft.some(function(){var t,e;NO(0,n,o),t=n,e=r.length,LO(t,function(t,n){return t.setSelectionRange(e,n.length)})}):ft.none()}return ft.none()},WO=ct("alloy.typeahead.itemexecute"),GO=ct([Kn("lazySink"),Ln("fetch"),ne("minChars",5),ne("responseTime",1e3),ma("onOpen"),ne("getHotspot",ft.some),ne("getAnchorOverrides",ct({})),ne("layouts",ft.none()),ne("eventOrder",{}),se("model",{},[ne("getDisplayText",function(t){return t.meta!==undefined&&t.meta.text!==undefined?t.meta.text:t.value}),ne("selectsOver",!0),ne("populateFromBrowse",!0)]),ma("onSetValue"),ga("onExecute"),ma("onItemExecute"),ne("inputClasses",[]),ne("inputAttributes",{}),ne("inputStyles",{}),ne("matchWidth",!0),ne("useMinWidth",!1),ne("dismissOnBlur",!0),fa(["openClass"]),Kn("initialData"),jl("typeaheadBehaviours",[hg,Ll,zO,ig,Eg,Vx]),le("previewing",function(){return fe(!0)})].concat(sx()).concat(tw())),XO=ct([yf({schema:[la()],name:"menu",overrides:function(o){return{fakeFocus:!0,onHighlight:function(n,e){o.previewing.get()?n.getSystem().getByUid(o.uid).each(function(t){UO(o.model,t,e).fold(function(){return ld.dehighlight(n,e)},function(t){return t()})}):n.getSystem().getByUid(o.uid).each(function(t){o.model.populateFromBrowse&&NO(o.model,t,e)}),o.previewing.set(!1)},onExecute:function(t,n){return t.getSystem().getByUid(o.uid).toOptional().map(function(t){return qo(t,WO(),{item:n}),!0})},onHover:function(t,n){o.previewing.set(!1),t.getSystem().getByUid(o.uid).each(function(t){o.model.populateFromBrowse&&NO(o.model,t,n)})}}}})]),YO=Yf({name:"Typeahead",configFields:GO(),partFields:XO(),factory:function(r,t,n,i){var e=function(t,n,e){r.previewing.set(!1);var o=Vx.getCoupled(t,"sandbox");wl.isOpen(o)?Zf.getCurrent(o).each(function(t){ld.getHighlighted(t).fold(function(){e(t)},function(){Qo(o,t.element,"keydown",n)})}):Xx(r,u(t),t,o,i,function(t){Zf.getCurrent(t).each(e)},px.HighlightFirst).get(at)},o=lx(r),u=function(o){return function(t){return t.map(function(t){var n=Mt(t.menus),e=U(n,function(t){return H(t.items,function(t){return"item"===t.type})});return Ll.getState(o).update(V(e,function(t){return t.data})),t})}},a=[hg.config({}),Ll.config({onSetValue:r.onSetValue,store:lt({mode:"dataset",getDataKey:function(t){return eu(t.element)},getFallbackEntry:function(t){return{value:t,meta:{}}},setValue:function(t,n){ou(t.element,r.model.getDisplayText(n))}},r.initialData.map(function(t){return Jt("initialValue",t)}).getOr({}))}),zO.config({stream:{mode:"throttle",delay:r.responseTime,stopEvent:!1},onStream:function(t,n){var e,o=Vx.getCoupled(t,"sandbox");hg.isFocused(t)&&eu(t.element).length>=r.minChars&&(e=Zf.getCurrent(o).bind(function(t){return ld.getHighlighted(t).map(Ll.getValue)}),r.previewing.set(!0),Xx(r,u(t),t,o,i,function(t){Zf.getCurrent(o).each(function(t){e.fold(function(){r.model.selectsOver&&ld.highlightFirst(t)},function(n){ld.highlightBy(t,function(t){return Ll.getValue(t).value===n.value}),ld.getHighlighted(t).orThunk(function(){return ld.highlightFirst(t),ft.none()})})})},px.HighlightFirst).get(at))},cancelEvent:Ao()}),ig.config({mode:"special",onDown:function(t,n){return e(t,n,ld.highlightFirst),ft.some(!0)},onEscape:function(t){var n=Vx.getCoupled(t,"sandbox");return wl.isOpen(n)?(wl.close(n),ft.some(!0)):ft.none()},onUp:function(t,n){return e(t,n,ld.highlightLast),ft.some(!0)},onEnter:function(n){var t=Vx.getCoupled(n,"sandbox"),e=wl.isOpen(t);if(e&&!r.previewing.get())return Zf.getCurrent(t).bind(function(t){return ld.getHighlighted(t)}).map(function(t){return qo(n,WO(),{item:t}),!0});var o=Ll.getValue(n);return Yo(n,Ao()),r.onExecute(t,n,o),e&&wl.close(t),ft.some(!0)}}),Eg.config({toggleClass:r.markers.openClass,aria:{mode:"expanded"}}),Vx.config({others:{sandbox:function(t){return Qx(r,t,{onOpen:function(){return Eg.on(t)},onClose:function(){return Eg.off(t)}})}}}),fg("typeaheadevents",[dr(function(t){var n=at;qx(r,u(t),t,i,n,px.HighlightFirst).get(at)}),er(WO(),function(t,n){var e=Vx.getCoupled(t,"sandbox");NO(r.model,t,n.event.item),Yo(t,Ao()),r.onItemExecute(t,e,n.event.item,Ll.getValue(t)),wl.close(e),jO(t)})].concat(r.dismissOnBlur?[er(ko(),function(t){var n=Vx.getCoupled(t,"sandbox");gc(n.element).isNone()&&wl.close(n)})]:[]))];return{uid:r.uid,dom:fx(zt(r,{inputAttributes:{role:"combobox","aria-autocomplete":"list","aria-haspopup":"true"}})),behaviours:lt(lt({},o),Wl(r.typeaheadBehaviours,a)),eventOrder:r.eventOrder}}}),qO=function(i){return lt(lt({},i),{toCached:function(){return qO(i.toCached())},bindFuture:function(n){return qO(i.bind(function(t){return t.fold(function(t){return kx(pt.error(t))},function(t){return n(t)})}))},bindResult:function(n){return qO(i.map(function(t){return t.bind(n)}))},mapResult:function(n){return qO(i.map(function(t){return t.map(n)}))},mapError:function(n){return qO(i.map(function(t){return t.mapError(n)}))},foldResult:function(n,e){return i.map(function(t){return t.fold(n,e)})},withTimeout:function(t,r){return qO(Sx(function(n){var e=!1,o=setTimeout(function(){e=!0,n(pt.error(r()))},t);i.get(function(t){e||(clearTimeout(o),n(t))})}))}})},KO=function(t){return qO(Sx(t))},JO=KO,$O={type:"separator"},QO=function(t){return{type:"menuitem",value:t.url,text:t.title,meta:{attach:t.attach},onAction:at}},ZO=function(t,n){return{type:"menuitem",value:n,text:t,meta:{attach:undefined},onAction:at}},t_=function(t,n){return o=t,e=H(n,function(t){return t.type===o}),V(e,QO);var e,o},n_=function(t,n){var e=t.toLowerCase();return H(n,function(t){var n=t.meta!==undefined&&t.meta.text!==undefined?t.meta.text:t.text;return we(n.toLowerCase(),e)||we(t.value.toLowerCase(),e)})},e_=function(u,t,a){var n=Ll.getValue(t),c=n.meta.text!==undefined?n.meta.text:n.value;return a.getLinkInformation().fold(function(){return[]},function(t){var n,e,o,r,i=n_(c,(n=a.getHistory(u),V(n,function(t){return ZO(t,t)})));return"file"===u?(e=[i,n_(c,t_("header",t.targets)),n_(c,gt([(r=t,ft.from(r.anchorTop).map(function(t){return ZO("<top>",t)}).toArray()),t_("anchor",t.targets),(o=t,ft.from(o.anchorBottom).map(function(t){return ZO("<bottom>",t)}).toArray())]))],N(e,function(t,n){return 0===t.length||0===n.length?t.concat(n):t.concat($O,n)},[])):i})},o_=oi("aria-invalid"),r_=function(r,o,i){var t,n,e,u,a,c=o.shared.providers,s=function(t){var n=Ll.getValue(t);i.addToHistory(n.value,r.filetype)},l=Wy.parts.field({factory:YO,dismissOnBlur:!0,inputClasses:["tox-textfield"],sandboxClasses:["tox-dialog__popups"],inputAttributes:{"aria-errormessage":o_,type:"url"},minChars:0,responseTime:0,fetch:function(t){var n=e_(r.filetype,t,i),e=NC(n,ih.BUBBLE_TO_SANDBOX,o,!1);return kx(e)},getHotspot:function(t){return h.getOpt(t)},onSetValue:function(t,n){t.hasConfigured(Fx)&&Fx.run(t).get(at)},typeaheadBehaviours:rc(gt([i.getValidationHandler().map(function(e){return Fx.config({getRoot:function(t){return kr(t.element)},invalidClass:"tox-control-wrap--status-invalid",notify:{onInvalid:function(t,n){d.getOpt(t).each(function(t){Yr(t.element,"title",c.translate(n))})}},validator:{validate:function(t){var n=Ll.getValue(t);return JO(function(o){e({type:r.filetype,url:n.value},function(t){var n,e;"invalid"===t.status?(n=pt.error(t.message),o(n)):(e=pt.value(t.message),o(e))})})},validateOnLoad:!1}})}).toArray(),[mv.config({disabled:function(){return r.disabled||c.isDisabled()}}),Yy.config({}),fg("urlinput-events",gt(["file"===r.filetype?[er(po(),function(t){qo(t,Zy,{name:r.name})})]:[],[er(ho(),function(t){qo(t,Zy,{name:r.name}),s(t)}),er(Co(),function(t){qo(t,Zy,{name:r.name}),s(t)})]]))]])),eventOrder:((t={})[po()]=["streaming","urlinput-events","invalidating"],t),model:{getDisplayText:function(t){return t.value},selectsOver:!1,populateFromBrowse:!1},markers:{openClass:"tox-textfield--popup-open"},lazySink:o.shared.getSink,parts:{menu:xh(0,0,"normal")},onExecute:function(t,n,e){qo(n,ox,{})},onItemExecute:function(t,n,e,o){s(t),qo(t,Zy,{name:r.name})}}),f=r.label.map(function(t){return Qy(t,c)}),d=mp((n="invalid",e=ft.some(o_),void 0===(u="warning")&&(u=n),void 0===a&&(a=n),{dom:{tag:"div",classes:["tox-icon","tox-control-wrap__status-icon-"+n],innerHtml:pp(u,c.icons),attributes:lt({title:c.translate(a),"aria-live":"polite"},e.fold(function(){return{}},function(t){return{id:t}}))}})),m=mp({dom:{tag:"div",classes:["tox-control-wrap__status-icon-wrap"]},components:[d.asSpec()]}),g=i.getUrlPicker(r.filetype),p=oi("browser.url.event"),h=mp({dom:{tag:"div",classes:["tox-control-wrap"]},components:[l,m.asSpec()],behaviours:rc([mv.config({disabled:function(){return r.disabled||c.isDisabled()}})])}),v=mp(qC({name:r.name,icon:ft.some("browse"),text:r.label.getOr(""),disabled:r.disabled,primary:!1,borderless:!0},function(t){return Yo(t,p)},c,[],["tox-browse-url"]));return Wy.sketch({dom:$y([]),components:f.toArray().concat([{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:gt([[h.asSpec()],g.map(function(){return v.asSpec()}).toArray()])}]),fieldBehaviours:rc([mv.config({disabled:function(){return r.disabled||c.isDisabled()},onDisabled:function(t){Wy.getField(t).each(mv.disable),v.getOpt(t).each(mv.disable)},onEnabled:function(t){Wy.getField(t).each(mv.enable),v.getOpt(t).each(mv.enable)}}),Nv(),fg("url-input-events",[er(p,function(o){Zf.getCurrent(o).each(function(n){var t=Ll.getValue(n),e=lt({fieldname:r.name},t);g.each(function(t){t(e).get(function(t){Ll.setValue(n,t),qo(o,Zy,{name:r.name})})})})})])])})},i_=function(r){return function(n,e,o){return Ft(e,"name").fold(function(){return r(e,o)},function(t){return n.field(t,r(e,o))})}},u_={bar:i_(function(t,n){return e=t,o=n.shared,{dom:{tag:"div",classes:["tox-bar","tox-form__controls-h-stack"]},components:V(e.items,o.interpreter)};var e,o}),collection:i_(function(t,n){return cx(t,n.shared.providers)}),alertbanner:i_(function(t,n){return e=t,o=n.shared.providers,Ny.sketch({dom:{tag:"div",attributes:{role:"alert"},classes:["tox-notification","tox-notification--in","tox-notification--"+e.level]},components:[{dom:{tag:"div",classes:["tox-notification__icon"]},components:[dp.sketch({dom:{tag:"button",classes:["tox-button","tox-button--naked","tox-button--icon"],innerHtml:pp(e.icon,o.icons),attributes:{title:o.translate(e.iconTooltip)}},action:function(t){qo(t,ex,{name:"alert-banner",value:e.url})}})]},{dom:{tag:"div",classes:["tox-notification__body"],innerHtml:o.translate(e.text)}}]});var e,o}),input:i_(function(t,n){return e=t,o=n.shared.providers,IO({name:e.name,multiline:!1,label:e.label,inputMode:e.inputMode,placeholder:e.placeholder,flex:!1,disabled:e.disabled,classname:"tox-textfield",validation:ft.none(),maximized:e.maximized},o);var e,o}),textarea:i_(function(t,n){return e=t,o=n.shared.providers,IO({name:e.name,multiline:!0,label:e.label,inputMode:ft.none(),placeholder:e.placeholder,flex:!0,disabled:e.disabled,classname:"tox-textarea",validation:ft.none(),maximized:e.maximized},o);var e,o}),label:i_(function(t,n){return e=t,o=n.shared,r={dom:{tag:"label",innerHtml:o.providers.translate(e.label),classes:["tox-label"]}},i=V(e.items,o.interpreter),{dom:{tag:"div",classes:["tox-form__group"]},components:[r].concat(i),behaviours:rc([ik(),lg.config({}),vk(ft.none()),ig.config({mode:"acyclic"})])};var e,o,r,i}),iframe:(CO=function(t,n){return Ek(t,n.shared.providers)},function(t,n,e){var o=zt(n,{source:"dynamic"});return i_(CO)(t,o,e)}),button:i_(function(t,n){return $C(t,n.shared.providers)}),checkbox:i_(function(t,n){return e=t,o=n.shared.providers,r=Ll.config({store:{mode:"manual",getValue:function(t){return t.element.dom.checked},setValue:function(t,n){t.element.dom.checked=n}}}),i=function(t){return t.element.dom.click(),ft.some(!0)},u=Wy.parts.field({factory:{sketch:st},dom:{tag:"input",classes:["tox-checkbox__input"],attributes:{type:"checkbox"}},behaviours:rc([ik(),mv.config({disabled:function(){return e.disabled||o.isDisabled()}}),Yy.config({}),hg.config({}),r,ig.config({mode:"special",onEnter:i,onSpace:i,stopSpaceKeyup:!0}),fg("checkbox-events",[er(ho(),function(t,n){qo(t,Zy,{name:e.name})})])])}),a=Wy.parts.label({dom:{tag:"span",classes:["tox-checkbox__label"],innerHtml:o.translate(e.label)},behaviours:rc([rw.config({})])}),s=mp({dom:{tag:"div",classes:["tox-checkbox__icons"]},components:[(c=function(t){return{dom:{tag:"span",classes:["tox-icon","tox-checkbox-icon__"+t],innerHtml:pp("checked"===t?"selected":"unselected",o.icons)}}})("checked"),c("unchecked")]}),Wy.sketch({dom:{tag:"label",classes:["tox-checkbox"]},components:[u,s.asSpec(),a],fieldBehaviours:rc([mv.config({disabled:function(){return e.disabled||o.isDisabled()},disableClass:"tox-checkbox--disabled",onDisabled:function(t){Wy.getField(t).each(mv.disable)},onEnabled:function(t){Wy.getField(t).each(mv.enable)}}),Nv()])});var e,o,r,i,u,a,c,s}),colorinput:i_(function(t,n){return cw(t,n.shared,n.colorinput)}),colorpicker:i_(function(t){var n=function(t){return"tox-"+t},e=rk(sk,n),r=mp(e.sketch({dom:{tag:"div",classes:["tox-color-picker-container"],attributes:{role:"presentation"}},onValidHex:function(t){qo(t,ex,{name:"hex-valid",value:!0})},onInvalidHex:function(t){qo(t,ex,{name:"hex-valid",value:!1})}}));return{dom:{tag:"div"},components:[r.asSpec()],behaviours:rc([Ll.config({store:{mode:"manual",getValue:function(t){var n=r.get(t);return Zf.getCurrent(n).bind(function(t){return Ll.getValue(t).hex}).map(function(t){return"#"+t}).getOr("")},setValue:function(t,n){var e=/^#([a-fA-F0-9]{3}(?:[a-fA-F0-9]{3})?)/.exec(n),o=r.get(t);Zf.getCurrent(o).fold(function(){console.log("Can not find form")},function(t){Ll.setValue(t,{hex:ft.from(e[1]).getOr("")}),$S.getField(t,"hex").each(function(t){Yo(t,po())})})}}}),ik()])}}),dropzone:i_(function(t,n){return yk(t,n.shared.providers)}),grid:i_(function(t,n){return e=t,o=n.shared,{dom:{tag:"div",classes:["tox-form__grid","tox-form__grid--"+e.columns+"col"]},components:V(e.items,o.interpreter)};var e,o}),listbox:i_(function(t,n){return o=t,e=(r=n).shared.providers,i=K(o.items).filter(DO),u=o.label.map(function(t){return Qy(t,e)}),a={dom:{tag:"div",classes:["tox-listboxfield"]},components:[Wy.parts.field({dom:{},factory:{sketch:function(t){return IC({uid:t.uid,text:i.map(function(t){return t.text}),icon:ft.none(),tooltip:o.label,role:ft.none(),fetch:function(t,n){var e=AO(t,o.name,o.items,Ll.getValue(t));n(NC(e,ih.CLOSE_ON_EXECUTE,r,!1))},onSetup:ct(at),getApi:ct({}),columns:1,presets:"normal",classes:[],dropdownBehaviours:[Yy.config({}),Ll.config({store:{mode:"manual",initialValue:i.map(function(t){return t.value}).getOr(""),getValue:function(t){return qr(t.element,BO)},setValue:function(n,t){MO(o.items,t).each(function(t){Yr(n.element,BO,t.value),qo(n,MC,{text:t.text})})}}})]},"tox-listbox",r.shared)}}})]},Wy.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:gt([u.toArray(),[a]]),fieldBehaviours:rc([mv.config({disabled:ct(o.disabled),onDisabled:function(t){Wy.getField(t).each(mv.disable)},onEnabled:function(t){Wy.getField(t).each(mv.enable)}})])});var o,r,e,i,u,a}),selectbox:i_(function(t,n){return e=t,o=n.shared.providers,r=V(e.items,function(t){return{text:o.translate(t.text),value:t.value}}),i=e.label.map(function(t){return Qy(t,o)}),u=Wy.parts.field({dom:{},selectAttributes:{size:e.size},options:r,factory:FO,selectBehaviours:rc([mv.config({disabled:function(){return e.disabled||o.isDisabled()}}),Yy.config({}),fg("selectbox-change",[er(ho(),function(t,n){qo(t,Zy,{name:e.name})})])])}),a=1<e.size?ft.none():ft.some({dom:{tag:"div",classes:["tox-selectfield__icon-js"],innerHtml:pp("chevron-down",o.icons)}}),c={dom:{tag:"div",classes:["tox-selectfield"]},components:gt([[u],a.toArray()])},Wy.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:gt([i.toArray(),[c]]),fieldBehaviours:rc([mv.config({disabled:function(){return e.disabled||o.isDisabled()},onDisabled:function(t){Wy.getField(t).each(mv.disable)},onEnabled:function(t){Wy.getField(t).each(mv.enable)}}),Nv()])});var e,o,r,i,u,a,c}),sizeinput:i_(function(t,n){return uO(t,n.shared.providers)}),urlinput:i_(function(t,n){return r_(t,n,n.urlinput)}),customeditor:i_(function(e){var o=fe(ft.none()),n=mp({dom:{tag:e.tag}}),r=fe(ft.none());return{dom:{tag:"div",classes:["tox-custom-editor"]},behaviours:rc([fg("custom-editor-events",[sr(function(t){n.getOpt(t).each(function(n){var t;t=e,(Object.prototype.hasOwnProperty.call(t,"init")?e.init(n.element.dom):lk.load(e.scriptId,e.scriptUrl).then(function(t){return t(n.element.dom,e.settings)})).then(function(n){r.get().each(function(t){n.setValue(t)}),r.set(ft.none()),o.set(ft.some(n))})})})]),Ll.config({store:{mode:"manual",getValue:function(){return o.get().fold(function(){return r.get().getOr("")},function(t){return t.getValue()})},setValue:function(t,n){o.get().fold(function(){r.set(ft.some(n))},function(t){return t.setValue(n)})}}}),ik()]),components:[n.asSpec()]}}),htmlpanel:i_(function(t){return"presentation"===t.presets?Ny.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:t.html}}):Ny.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:t.html,attributes:{role:"document"}},containerBehaviours:rc([Yy.config({}),hg.config({})])})}),imagetools:i_(function(t,n){return EO(t,n.shared.providers)}),table:i_(function(t,n){return e=t,o=n.shared.providers,u=function(t){return{dom:{tag:"th",innerHtml:o.translate(t)}}},a=function(t){return{dom:{tag:"td",innerHtml:o.translate(t)}}},c=function(t){return{dom:{tag:"tr"},components:V(t,a)}},{dom:{tag:"table",classes:["tox-dialog__table"]},components:[(i=e.header,{dom:{tag:"thead"},components:[{dom:{tag:"tr"},components:V(i,u)}]}),(r=e.cells,{dom:{tag:"tbody"},components:V(r,c)})],behaviours:rc([Yy.config({}),hg.config({})])};var e,o,r,i,u,a,c}),panel:i_(function(t,n){return o=n,{dom:{tag:"div",classes:(e=t).classes},components:V(e.items,o.shared.interpreter)};var e,o})},a_={field:function(t,n){return n}},c_=function(n,t,e){var o=zt(e,{shared:{interpreter:function(t){return s_(n,t,o)}}});return s_(n,t,o)},s_=function(n,e,o){return Ft(u_,e.type).fold(function(){return console.error('Unknown factory type "'+e.type+'", defaulting to container: ',e),e},function(t){return t(n,e,o)})},l_={valignCentre:[],alignCentre:[],alignLeft:[],alignRight:[],right:[],left:[],bottom:[],top:[]},f_=function(t,n,e){var o=Pc(-12,12,l_),r={maxHeightFunction:Mc()};return function(){return e()?{anchor:"node",root:Mr(t()),node:ft.from(t()),bubble:o,layouts:{onRtl:function(){return[cp]},onLtr:function(){return[ap]}},overrides:r}:{anchor:"hotspot",hotspot:n(),bubble:o,layouts:{onRtl:function(){return[Pa]},onLtr:function(){return[Ha]}},overrides:r}}},d_=function(t,n,e){return function(){return e()?{anchor:"node",root:Mr(t()),node:ft.from(t()),layouts:{onRtl:function(){return[sp]},onLtr:function(){return[sp]}}}:{anchor:"hotspot",hotspot:n(),layouts:{onRtl:function(){return[ja]},onLtr:function(){return[ja]}}}}},m_=function(t,n,e){var o,r,i,u=Mv(t),a=function(){return me.fromDom(t.getBody())},c=function(){return me.fromDom(t.getContentAreaContainer())},s=function(){return u||!e()};return{inlineDialog:f_(c,n,s),banner:d_(c,n,s),cursor:(r=t,function(){return{anchor:"selection",root:i(),getSelection:function(){var t=r.selection.getRng();return ft.some(ms.range(me.fromDom(t.startContainer),t.startOffset,me.fromDom(t.endContainer),t.endOffset))}}}),node:(o=i=a,function(t){return{anchor:"node",root:o(),node:t}})}},g_=function(t){return{colorPicker:function(t,n){$b(r)(t,n)},hasCustomColors:function(){return Nb(o)},getColors:function(){return Lb(e)},getColorCols:(n=e=o=r=t,function(){return Wb(n)})};var n,e,o,r},p_=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",format:"bold"},{title:"Italic",format:"italic"},{title:"Underline",format:"underline"},{title:"Strikethrough",format:"strikethrough"},{title:"Superscript",format:"superscript"},{title:"Subscript",format:"subscript"},{title:"Code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Align",items:[{title:"Left",format:"alignleft"},{title:"Center",format:"aligncenter"},{title:"Right",format:"alignright"},{title:"Justify",format:"alignjustify"}]}],h_=function(t){return N(t,function(t,n){if(It(n,"items")){var e=h_(n.items);return{customFormats:t.customFormats.concat(e.customFormats),formats:t.formats.concat([{title:n.title,items:e.formats}])}}if(It(n,"inline")||It(n,"block")||It(n,"selector")){var o="custom-"+(C(n.name)?n.name:n.title.toLowerCase());return{customFormats:t.customFormats.concat([{name:o,format:n}]),formats:t.formats.concat([{title:n.title,format:o,icon:n.icon}])}}return lt(lt({},t),{formats:t.formats.concat(n)})},{customFormats:[],formats:[]})},v_=function(i){return t=i,ft.from(t.getParam("style_formats")).filter(p).map(function(t){var n,e,o,r=(n=i,e=h_(t),o=function(t){mt(t,function(t){n.formatter.has(t.name)||n.formatter.register(t.name,t.format)})},n.formatter?o(e.customFormats):n.on("init",function(){o(e.customFormats)}),e.formats);return i.getParam("style_formats_merge",!1,"boolean")?p_.concat(r):r}).getOr(p_);var t},b_=function(t,n,e){var o={type:"formatter",isSelected:n(t.format),getStylePreview:e(t.format)};return zt(t,o)},y_=function(c,t,s,l){var f=function(t){return V(t,function(t){var n,e,o,r,i,u=Ct(t);if(Rt(t,"items")){var a=f(t.items);return zt(zt(t,{type:"submenu"}),{getStyleItems:function(){return a}})}return Rt(t,"format")?b_(t,s,l):1===u.length&&M(u,"title")?zt(t,{type:"separator"}):(e=C((n=t).name)?n.name:oi(n.title),r={type:"formatter",format:o="custom-"+e,isSelected:s(o),getStylePreview:l(o)},i=zt(n,r),c.formatter.register(e,i),i)})};return f(t)},x_=fk.trim,w_=function(e){return function(t){if(v(n=t)&&1===n.nodeType){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}var n;return!1}},S_=w_("true"),k_=w_("false"),C_=function(t,n,e,o,r){return{type:t,title:n,url:e,level:o,attach:r}},O_=function(t){return t.innerText||t.textContent},__=function(t){return(n=t)&&"A"===n.nodeName&&(n.id||n.name)!==undefined&&E_(t);var n},T_=function(t){return t&&/^(H[1-6])$/.test(t.nodeName)},E_=function(t){return function(t){for(;t=t.parentNode;){var n=t.contentEditable;if(n&&"inherit"!==n)return S_(t)}return!1}(t)&&!k_(t)},D_=function(t){return T_(t)&&E_(t)},B_=function(t){var n,e,o=(n=t).id?n.id:oi("h");return C_("header",O_(t),"#"+o,T_(e=t)?parseInt(e.nodeName.substr(1),10):0,function(){t.id=o})},A_=function(t){var n=t.id||t.name,e=O_(t);return C_("anchor",e||"#"+n,"#"+n,0,at)},M_=function(t){var n,e;return n="h1,h2,h3,h4,h5,h6,a:not([href])",e=t,V(Os(me.fromDom(e),n),function(t){return t.dom})},F_=function(t){return 0<x_(t.title).length},I_=function(t){var n=M_(t);return H(V(H(n,D_),B_).concat(V(H(n,__),A_)),F_)},R_="tinymce-url-history",V_=function(t){return C(t)&&/^https?/.test(t)},P_=function(t){return O(t)&&At(t,function(t){return!(p(n=t)&&n.length<=5&&W(n,V_));var n}).isNone()},H_=function(){var t,n=Fb.getItem(R_);if(null===n)return{};try{t=JSON.parse(n)}catch(e){if(e instanceof SyntaxError)return console.log("Local storage "+R_+" was not valid JSON",e),{};throw e}return P_(t)?t:(console.log("Local storage "+R_+" was not valid format",t),{})},z_=function(t){var n=H_();return Object.prototype.hasOwnProperty.call(n,t)?n[t]:[]},N_=function(n,t){var e,o,r;V_(n)&&(e=H_(),o=Object.prototype.hasOwnProperty.call(e,t)?e[t]:[],r=H(o,function(t){return t!==n}),e[t]=[n].concat(r).slice(0,5),function(t){if(!P_(t))throw new Error("Bad format for history:\n"+JSON.stringify(t));Fb.setItem(R_,JSON.stringify(t))}(e))},L_=function(t){return!!t},j_=function(t){return Tt(fk.makeMap(t,/[, ]/),L_)},U_=function(t){return ft.from(t.getParam("file_picker_callback")).filter(T)},W_=function(t,n){var e,o,r,i,u=(e=t,o=ft.some(e.getParam("file_picker_types")).filter(L_),r=ft.some(e.getParam("file_browser_callback_types")).filter(L_),i=o.or(r).map(j_),U_(e).fold(l,function(t){return i.fold(w,function(t){return 0<Ct(t).length&&t})}));return _(u)?u?U_(t):ft.none():u[n]?U_(t):ft.none()},G_=function(t){return ft.from(t).filter(C).getOrUndefined()},X_=function(t){return ft.from((e=(n=t).getParam("file_picker_validator_handler",undefined,"function"))===undefined?n.getParam("filepicker_validator_handler",undefined,"function"):e);var n,e},Y_=function(n){return{getHistory:z_,addToHistory:N_,getLinkInformation:function(){return!1===(t=n).getParam("typeahead_urls")?ft.none():ft.some({targets:I_(t.getBody()),anchorTop:G_(t.getParam("anchor_top","#top")),anchorBottom:G_(t.getParam("anchor_bottom","#bottom"))});var t},getValidationHandler:function(){return X_(n)},getUrlPicker:function(t){return W_(r=n,i=t).map(function(o){return function(n){return Sx(function(e){var t=lt({filetype:i,fieldname:n.fieldname},ft.from(n.meta).getOr({}));o.call(r,function(t,n){if(!C(t))throw new Error("Expected value to be string");if(n!==undefined&&!O(n))throw new Error("Expected meta to be a object");e({value:t,meta:n})},n.value,t)})}});var r,i}}},q_=function(t,n,e){var o,r,i=fe(!1),u={isPositionedAtTop:function(){return"top"===o.get()},getDockingMode:(o=fe(Bv(n)?"bottom":"top")).get,setDockingMode:o.set},a={shared:{providers:{icons:function(){return n.ui.registry.getAll().icons},menuItems:function(){return n.ui.registry.getAll().menuItems},translate:Zh.translate,isDisabled:function(){return n.mode.isReadOnly()||n.ui.isDisabled()},getSetting:n.getParam.bind(n)},interpreter:function(t){return s_(a_,t,a)},anchors:m_(n,e,u.isPositionedAtTop),header:u,getSink:function(){return pt.value(t)}},urlinput:Y_(n),styleselect:function(o){var r=function(t){return function(){return o.formatter.match(t)}},i=function(n){return function(){var t=o.formatter.get(n);return t!==undefined?ft.some({tag:0<t.length&&(t[0].inline||t[0].block)||"div",styles:o.dom.parseStyle(o.formatter.getCssText(n))}):ft.none()}},u=function(t){var n=t.items;return n!==undefined&&0<n.length?U(n,u):[t.format]},a=fe([]),c=fe([]),e=fe([]),s=fe([]),l=fe(!1);o.on("PreInit",function(t){var n=v_(o),e=y_(o,n,r,i);a.set(e),c.set(U(e,u))}),o.on("addStyleModifications",function(t){var n=y_(o,t.items,r,i);e.set(n),l.set(t.replace),s.set(U(n,u))});return{getData:function(){var t=l.get()?[]:a.get(),n=e.get();return t.concat(n)},getFlattenedKeys:function(){var t=l.get()?[]:c.get(),n=s.get();return t.concat(n)}}}(n),colorinput:g_(n),dialog:{isDraggableModal:(r=n,function(){return r.getParam("draggable_modal",!1,"boolean")})},isContextMenuOpen:function(){return i.get()},setContextMenuState:function(t){return i.set(t)}};return a},K_=ct(function(t,n){var e,o,r;e=t,o=Math.floor(n),r=Cu.max(e,o,["margin-left","border-left-width","padding-left","padding-right","border-right-width","margin-right"]),Yi(e,"max-width",r+"px")}),J_="contexttoolbar-hide",$_=ct([Ln("dom"),ne("shell",!0),jl("toolbarBehaviours",[lg])]),Q_=ct([xf({name:"groups",overrides:function(){return{behaviours:rc([lg.config({})])}}})]),Z_=Yf({name:"Toolbar",configFields:$_(),partFields:Q_(),factory:function(n,t,e,o){var r=function(t){return n.shell?ft.some(t):Mf(t,n,"groups")},i=n.shell?{behaviours:[lg.config({})],components:[]}:{behaviours:[],components:t};return{uid:n.uid,dom:n.dom,components:i.components,behaviours:Wl(n.toolbarBehaviours,i.behaviours),apis:{setGroups:function(t,n){r(t).fold(function(){throw console.error("Toolbar was defined to not be a shell, but no groups container was specified in components"),new Error("Toolbar was defined to not be a shell, but no groups container was specified in components")},function(t){lg.set(t,n)})}},domModification:{attributes:{role:"group"}}}},apis:{setGroups:function(t,n,e){t.setGroups(n,e)}}}),tT=function(t,n,e){return{within:t,extra:n,withinWidth:e}},nT=function(t,n,o){var e,r=(e=function(t,n){var e=o(t);return ft.some({element:t,start:n,finish:n+e,width:e})},N(t,function(n,t){return e(t,n.len).fold(ct(n),function(t){return{len:t.finish,list:n.list.concat([t])}})},{len:0,list:[]}).list),i=H(r,function(t){return t.finish<=n}),u=z(i,function(t,n){return t+n.width},0);return{within:i,extra:r.slice(i.length),withinWidth:u}},eT=function(t){return V(t,function(t){return t.element})},oT=function(t,n,e,o){var r,i,u,a,c,s,l,f,d,m=(0===(r=nT(n,t,e)).extra.length?ft.some(r):ft.none()).getOrThunk(function(){return nT(n,t-e(o),e)}),g=m.within,p=m.extra,h=m.withinWidth;return 1===p.length&&p[0].width<=e(o)?(l=p,f=h,d=eT(g.concat(l)),tT(d,[],f)):1<=p.length?(u=p,a=o,c=h,s=eT(g).concat([a]),tT(s,eT(u),c)):(i=h,tT(eT(g),[],i))},rT=function(t,n){var e=V(n,function(t){return gu(t)});Z_.setGroups(t,e)},iT=function(t,n,e){var o=Ff(t,n,"primary"),r=Vx.getCoupled(t,"overflowGroup");Yi(o.element,"visibility","hidden");var i=n.builtGroups.get().concat([r]),u=Q(i,function(n){return gc(n.element).bind(function(t){return n.getSystem().getByDom(t).toOptional()})});e([]),rT(o,i);var a=Ou(o.element),c=oT(a,n.builtGroups.get(),function(t){return Ou(t.element)},r);0===c.extra.length?(lg.remove(o,r),e([])):(rT(o,c.within),e(c.extra)),tu(o.element,"visibility"),nu(o.element),u.each(hg.focus)},uT=ct([jl("splitToolbarBehaviours",[Vx]),le("builtGroups",function(){return fe([])})]),aT=ct([fa(["overflowToggledClass"]),Zn("getOverflowBounds"),Ln("lazySink"),le("overflowGroups",function(){return fe([])})].concat(uT())),cT=ct([bf({factory:Z_,schema:$_(),name:"primary"}),yf({schema:$_(),name:"overflow"}),yf({name:"overflow-button"}),yf({name:"overflow-group"})]),sT=ct([fa(["toggledClass"]),Ln("lazySink"),Gn("fetch"),Zn("getBounds"),te("fireDismissalEventInstead",[ne("event",zo())]),qc()]),lT=ct([yf({name:"button",overrides:function(t){return{dom:{attributes:{"aria-haspopup":"true"}},buttonBehaviours:rc([Eg.config({toggleClass:t.markers.toggledClass,aria:{mode:"expanded"},toggleOnExecute:!1})])}}}),yf({factory:Z_,schema:$_(),name:"toolbar",overrides:function(n){return{toolbarBehaviours:rc([ig.config({mode:"cyclic",onEscape:function(t){return Mf(t,n,"button").each(hg.focus),ft.none()}})])}}})]),fT=function(t,n){var e=Vx.getCoupled(t,"toolbarSandbox");wl.isOpen(e)?wl.close(e):wl.open(e,n.toolbar())},dT=function(t,n,e,o){var r=e.getBounds.map(function(t){return t()}),i=e.lazySink(t).getOrDie();Zs.positionWithinBounds(i,{anchor:"hotspot",hotspot:t,layouts:o,overrides:{maxWidthFunction:K_()}},n,r)},mT=function(t,n,e,o,r){Z_.setGroups(n,r),dT(t,n,e,o),Eg.on(t)},gT=Yf({name:"FloatingToolbarButton",factory:function(u,t,a,n){return lt(lt({},dp.sketch(lt(lt({},n.button()),{action:function(t){fT(t,n)},buttonBehaviours:Xl({dump:n.button().buttonBehaviours},[Vx.config({others:{toolbarSandbox:function(t){return o=t,e=a,r=u,{dom:{tag:"div",attributes:{id:(i=Ju()).id}},behaviours:rc([ig.config({mode:"special",onEscape:function(t){return wl.close(t),ft.some(!0)}}),wl.config({onOpen:function(t,n){r.fetch().get(function(t){mT(o,n,r,e.layouts,t),i.link(o.element),ig.focusIn(n)})},onClose:function(){Eg.off(o),hg.focus(o),i.unlink(o.element)},isPartOf:function(t,n,e){return Qu(n,e)||Qu(o,e)},getAttachPoint:function(){return r.lazySink(o).getOrDie()}}),lc.config({channels:lt(lt({},_l(lt({isExtraPart:l},r.fireDismissalEventInstead.map(function(t){return{fireEventInstead:{event:t.event}}}).getOr({})))),El({doReposition:function(){wl.getState(Vx.getCoupled(o,"toolbarSandbox")).each(function(t){dT(o,t,r,e.layouts)})}}))})])};var o,e,r,i}}})])}))),{apis:{setGroups:function(n,e){wl.getState(Vx.getCoupled(n,"toolbarSandbox")).each(function(t){mT(n,t,u,a.layouts,e)})},reposition:function(n){wl.getState(Vx.getCoupled(n,"toolbarSandbox")).each(function(t){dT(n,t,u,a.layouts)})},toggle:function(t){fT(t,n)},getToolbar:function(t){return wl.getState(Vx.getCoupled(t,"toolbarSandbox"))},isOpen:function(t){return wl.isOpen(Vx.getCoupled(t,"toolbarSandbox"))}}})},configFields:sT(),partFields:lT(),apis:{setGroups:function(t,n,e){t.setGroups(n,e)},reposition:function(t,n){t.reposition(n)},toggle:function(t,n){t.toggle(n)},getToolbar:function(t,n){return t.getToolbar(n)},isOpen:function(t,n){return t.isOpen(n)}}}),pT=ct([Ln("items"),fa(["itemSelector"]),jl("tgroupBehaviours",[ig])]),hT=ct([wf({name:"items",unit:"item"})]),vT=Yf({name:"ToolbarGroup",configFields:pT(),partFields:hT(),factory:function(t,n,e,o){return{uid:t.uid,dom:t.dom,components:n,behaviours:Wl(t.tgroupBehaviours,[ig.config({mode:"flow",selector:t.markers.itemSelector})]),domModification:{attributes:{role:"toolbar"}}}}}),bT=function(t){return V(t,function(t){return gu(t)})},yT=function(t,e,o){iT(t,o,function(n){o.overflowGroups.set(n),e.getOpt(t).each(function(t){gT.setGroups(t,bT(n))})})},xT=Yf({name:"SplitFloatingToolbar",configFields:aT(),partFields:cT(),factory:function(e,t,n,o){var r=mp(gT.sketch({fetch:function(){return Sx(function(t){t(bT(e.overflowGroups.get()))})},layouts:{onLtr:function(){return[Ha,Pa]},onRtl:function(){return[Pa,Ha]},onBottomLtr:function(){return[Na,za]},onBottomRtl:function(){return[za,Na]}},getBounds:n.getOverflowBounds,lazySink:e.lazySink,fireDismissalEventInstead:{},markers:{toggledClass:e.markers.overflowToggledClass},parts:{button:o["overflow-button"](),toolbar:o.overflow()}}));return{uid:e.uid,dom:e.dom,components:t,behaviours:Wl(e.splitToolbarBehaviours,[Vx.config({others:{overflowGroup:function(){return vT.sketch(lt(lt({},o["overflow-group"]()),{items:[r.asSpec()]}))}}})]),apis:{setGroups:function(t,n){e.builtGroups.set(V(n,t.getSystem().build)),yT(t,r,e)},refresh:function(t){return yT(t,r,e)},toggle:function(t){r.getOpt(t).each(function(t){gT.toggle(t)})},isOpen:function(t){return r.getOpt(t).map(gT.isOpen).getOr(!1)},reposition:function(t){r.getOpt(t).each(function(t){gT.reposition(t)})},getOverflow:function(t){return r.getOpt(t).bind(gT.getToolbar)}},domModification:{attributes:{role:"group"}}}},apis:{setGroups:function(t,n,e){t.setGroups(n,e)},refresh:function(t,n){t.refresh(n)},reposition:function(t,n){t.reposition(n)},toggle:function(t,n){t.toggle(n)},isOpen:function(t,n){return t.isOpen(n)},getOverflow:function(t,n){return t.getOverflow(n)}}}),wT=function(n,t){return t.getAnimationRoot.fold(function(){return n.element},function(t){return t(n)})},ST=function(t){return t.dimension.property},kT=function(t,n){return t.dimension.getDimension(n)},CT=function(t,n){var e=wT(t,n);Ni(e,[n.shrinkingClass,n.growingClass])},OT=function(t,n){Pi(t.element,n.openClass),Ri(t.element,n.closedClass),Yi(t.element,ST(n),"0px"),nu(t.element)},_T=function(t,n){Pi(t.element,n.closedClass),Ri(t.element,n.openClass),tu(t.element,ST(n))},TT=function(t,n,e,o){e.setCollapsed(),Yi(t.element,ST(n),kT(n,t.element)),nu(t.element),CT(t,n),OT(t,n),n.onStartShrink(t),n.onShrunk(t)},ET=function(t,n,e,o){var r=o.getOrThunk(function(){return kT(n,t.element)});e.setCollapsed(),Yi(t.element,ST(n),r),nu(t.element);var i=wT(t,n);Pi(i,n.growingClass),Ri(i,n.shrinkingClass),OT(t,n),n.onStartShrink(t)},DT=function(t,n,e){var o=kT(n,t.element);("0px"===o?TT:ET)(t,n,e,ft.some(o))},BT=function(t,n,e){var o=wT(t,n),r=Hi(o,n.shrinkingClass),i=kT(n,t.element);_T(t,n);var u=kT(n,t.element);(r?function(){Yi(t.element,ST(n),i),nu(t.element)}:function(){OT(t,n)})(),Pi(o,n.shrinkingClass),Ri(o,n.growingClass),_T(t,n),Yi(t.element,ST(n),u),e.setExpanded(),n.onStartGrow(t)},AT=function(t,n,e){var o=wT(t,n);return!0===Hi(o,n.growingClass)},MT=function(t,n,e){var o=wT(t,n);return!0===Hi(o,n.shrinkingClass)},FT=/* */Object.freeze({__proto__:null,refresh:function(t,n,e){var o;e.isExpanded()&&(tu(t.element,ST(n)),o=kT(n,t.element),Yi(t.element,ST(n),o))},grow:function(t,n,e){e.isExpanded()||BT(t,n,e)},shrink:function(t,n,e){e.isExpanded()&&DT(t,n,e)},immediateShrink:function(t,n,e){e.isExpanded()&&TT(t,n,e,ft.none())},hasGrown:function(t,n,e){return e.isExpanded()},hasShrunk:function(t,n,e){return e.isCollapsed()},isGrowing:AT,isShrinking:MT,isTransitioning:function(t,n,e){return AT(t,n)||MT(t,n)},toggleGrow:function(t,n,e){(e.isExpanded()?DT:BT)(t,n,e)},disableTransitions:CT}),IT=/* */Object.freeze({__proto__:null,exhibit:function(t,n,e){var o=n.expanded;return Si(o?{classes:[n.openClass],styles:{}}:{classes:[n.closedClass],styles:Jt(n.dimension.property,"0px")})},events:function(e,o){return Zo([cr(bo(),function(t,n){n.event.raw.propertyName===e.dimension.property&&(CT(t,e),o.isExpanded()&&tu(t.element,e.dimension.property),(o.isExpanded()?e.onGrown:e.onShrunk)(t))})])}}),RT=[Ln("closedClass"),Ln("openClass"),Ln("shrinkingClass"),Ln("growingClass"),Kn("getAnimationRoot"),ma("onShrunk"),ma("onStartShrink"),ma("onGrown"),ma("onStartGrow"),ne("expanded",!1),jn("dimension",An("property",{width:[va("property","width"),va("getDimension",function(t){return Ou(t)+"px"})],height:[va("property","height"),va("getDimension",function(t){return vu(t)+"px"})]}))],VT=uc({fields:RT,name:"sliding",active:IT,apis:FT,state:/* */Object.freeze({__proto__:null,init:function(t){var n=fe(t.expanded);return xi({isExpanded:function(){return!0===n.get()},isCollapsed:function(){return!1===n.get()},setCollapsed:y(n.set,!1),setExpanded:y(n.set,!0),readState:function(){return"expanded: "+n.get()}})}})}),PT=ct([fa(["closedClass","openClass","shrinkingClass","growingClass","overflowToggledClass"]),ma("onOpened"),ma("onClosed")].concat(uT())),HT=ct([bf({factory:Z_,schema:$_(),name:"primary"}),bf({factory:Z_,schema:$_(),name:"overflow",overrides:function(n){return{toolbarBehaviours:rc([VT.config({dimension:{property:"height"},closedClass:n.markers.closedClass,openClass:n.markers.openClass,shrinkingClass:n.markers.shrinkingClass,growingClass:n.markers.growingClass,onShrunk:function(t){Mf(t,n,"overflow-button").each(function(t){Eg.off(t),hg.focus(t)}),n.onClosed(t)},onGrown:function(t){ig.focusIn(t),n.onOpened(t)},onStartGrow:function(t){Mf(t,n,"overflow-button").each(Eg.on)}}),ig.config({mode:"acyclic",onEscape:function(t){return Mf(t,n,"overflow-button").each(hg.focus),ft.some(!0)}})])}}}),yf({name:"overflow-button",overrides:function(t){return{buttonBehaviours:rc([Eg.config({toggleClass:t.markers.overflowToggledClass,aria:{mode:"pressed"},toggleOnExecute:!1})])}}}),yf({name:"overflow-group"})]),zT=function(n,e){Mf(n,e,"overflow-button").bind(function(){return Mf(n,e,"overflow")}).each(function(t){NT(n,e),VT.toggleGrow(t)})},NT=function(t,n){Mf(t,n,"overflow").each(function(e){iT(t,n,function(t){var n=V(t,function(t){return gu(t)});Z_.setGroups(e,n)}),Mf(t,n,"overflow-button").each(function(t){VT.hasGrown(e)&&Eg.on(t)}),VT.refresh(e)})},LT=Yf({name:"SplitSlidingToolbar",configFields:PT(),partFields:HT(),factory:function(o,t,n,e){var r="alloy.toolbar.toggle";return{uid:o.uid,dom:o.dom,components:t,behaviours:Wl(o.splitToolbarBehaviours,[Vx.config({others:{overflowGroup:function(n){return vT.sketch(lt(lt({},e["overflow-group"]()),{items:[dp.sketch(lt(lt({},e["overflow-button"]()),{action:function(t){Yo(n,r)}}))]}))}}}),fg("toolbar-toggle-events",[er(r,function(t){zT(t,o)})])]),apis:{setGroups:function(t,n){var e;e=V(n,t.getSystem().build),o.builtGroups.set(e),NT(t,o)},refresh:function(t){return NT(t,o)},toggle:function(t){return zT(t,o)},isOpen:function(t){return Mf(t,o,"overflow").map(VT.hasGrown).getOr(!1)}},domModification:{attributes:{role:"group"}}}},apis:{setGroups:function(t,n,e){t.setGroups(n,e)},refresh:function(t,n){t.refresh(n)},toggle:function(t,n){t.toggle(n)},isOpen:function(t,n){return t.isOpen(n)}}}),jT=ct(oi("toolbar-height-change")),UT=function(t){var n=t.title.fold(function(){return{}},function(t){return{attributes:{title:t}}});return{dom:lt({tag:"div",classes:["tox-toolbar__group"]},n),components:[vT.parts.items({})],items:t.items,markers:{itemSelector:"*:not(.tox-split-button) > .tox-tbtn:not([disabled]), .tox-split-button:not([disabled]), .tox-toolbar-nav-js:not([disabled])"},tgroupBehaviours:rc([Yy.config({}),hg.config({})])}},WT=function(t){return vT.sketch(UT(t))},GT=function(e,t){var n=sr(function(t){var n=V(e.initGroups,WT);Z_.setGroups(t,n)});return rc([Wv(e.providers.isDisabled),Nv(),ig.config({mode:t,onEscape:e.onEscape,selector:".tox-toolbar__group"}),fg("toolbar-events",[n])])},XT=function(t){var n=t.cyclicKeying?"cyclic":"acyclic";return{uid:t.uid,dom:{tag:"div",classes:["tox-toolbar-overlord"]},parts:{"overflow-group":UT({title:ft.none(),items:[]}),"overflow-button":GC({name:"more",icon:ft.some("more-drawer"),disabled:!1,tooltip:ft.some("More..."),primary:!1,borderless:!1},ft.none(),t.providers)},splitToolbarBehaviours:GT(t,n)}},YT=function(i){var t=XT(i),n=xT.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}});return xT.sketch(lt(lt({},t),{lazySink:i.getSink,getOverflowBounds:function(){var t=i.moreDrawerData.lazyHeader().element,n=zu(t),e=wr(t),o=zu(e),r=Math.max(e.dom.scrollHeight,o.height);return Pu(n.x+4,o.y,n.width-8,r)},parts:lt(lt({},t.parts),{overflow:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:i.attributes}}}),components:[n],markers:{overflowToggledClass:"tox-tbtn--enabled"}}))},qT=function(t){var n=LT.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}}),e=LT.parts.overflow({dom:{tag:"div",classes:["tox-toolbar__overflow"]}}),o=XT(t);return LT.sketch(lt(lt({},o),{components:[n,e],markers:{openClass:"tox-toolbar__overflow--open",closedClass:"tox-toolbar__overflow--closed",growingClass:"tox-toolbar__overflow--growing",shrinkingClass:"tox-toolbar__overflow--shrinking",overflowToggledClass:"tox-tbtn--enabled"},onOpened:function(t){t.getSystem().broadcastOn([jT()],{type:"opened"})},onClosed:function(t){t.getSystem().broadcastOn([jT()],{type:"closed"})}}))},KT=function(t){var n=t.cyclicKeying?"cyclic":"acyclic";return Z_.sketch({uid:t.uid,dom:{tag:"div",classes:["tox-toolbar"].concat(t.type===oh.scrolling?["tox-toolbar--scrolling"]:[])},components:[Z_.parts.groups({})],toolbarBehaviours:GT(t,n)})},JT=fn([Un("type"),jn("items",mn([Sn([Un("name"),qn("items",Rn)]),Rn]))].concat(jp)),$T=[Qn("text"),Qn("tooltip"),Qn("icon"),Gn("fetch"),ae("onSetup",function(){return at})],QT=fn(k([Un("type")],$T)),ZT=function(t){return _n("menubutton",QT,t)},tE=fn([Un("type"),Qn("tooltip"),Qn("icon"),Qn("text"),Zn("select"),Gn("fetch"),ae("onSetup",function(){return at}),ie("presets","normal",["normal","color","listpreview"]),ne("columns",1),Gn("onAction"),Gn("onItemAction")]),nE=/* */Object.freeze({__proto__:null,events:function(i,u){var r=function(o,r){i.updateState.each(function(t){var n=t(o,r);u.set(n)}),i.renderComponents.each(function(t){var n=t(r,u.get()),e=V(n,o.getSystem().build);ol(o,e)})};return Zo([er(Oo(),function(t,n){var e,o=n;o.universal||(e=i.channel,M(o.channels,e)&&r(t,o.data))}),sr(function(n,t){i.initialData.each(function(t){r(n,t)})})])}}),eE=/* */Object.freeze({__proto__:null,getState:function(t,n,e){return e}}),oE=[Ln("channel"),Kn("renderComponents"),Kn("updateState"),Kn("initialData")],rE=uc({fields:oE,name:"reflecting",active:nE,apis:eE,state:/* */Object.freeze({__proto__:null,init:function(){var n=fe(ft.none());return{readState:function(){return n.get().fold(function(){return"none"},function(t){return t})},get:function(){return n.get()},set:function(t){return n.set(t)},clear:function(){return n.set(ft.none())}}}})}),iE=ct([Ln("toggleClass"),Ln("fetch"),pa("onExecute"),ne("getHotspot",ft.some),ne("getAnchorOverrides",ct({})),qc(),pa("onItemExecute"),Kn("lazySink"),Ln("dom"),ma("onOpen"),jl("splitDropdownBehaviours",[Vx,ig,hg]),ne("matchWidth",!1),ne("useMinWidth",!1),ne("eventOrder",{}),Kn("role")].concat(tw())),uE=bf({factory:dp,schema:[Ln("dom")],name:"arrow",defaults:function(){return{buttonBehaviours:rc([hg.revoke()])}},overrides:function(n){return{dom:{tag:"span",attributes:{role:"presentation"}},action:function(t){t.getSystem().getByUid(n.uid).each(Ko)},buttonBehaviours:rc([Eg.config({toggleOnExecute:!1,toggleClass:n.toggleClass})])}}}),aE=bf({factory:dp,schema:[Ln("dom")],name:"button",defaults:function(){return{buttonBehaviours:rc([hg.revoke()])}},overrides:function(e){return{dom:{tag:"span",attributes:{role:"presentation"}},action:function(n){n.getSystem().getByUid(e.uid).each(function(t){e.onExecute(t,n)})}}}}),cE=ct([uE,aE,xf({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:t.text}}}},schema:[Ln("text")],name:"aria-descriptor"}),yf({schema:[la()],name:"menu",defaults:function(o){return{onExecute:function(n,e){n.getSystem().getByUid(o.uid).each(function(t){o.onItemExecute(t,n,e)})}}}}),Hx()]),sE=Yf({name:"SplitDropdown",configFields:iE(),partFields:cE(),factory:function(o,t,n,e){var r,i=function(t){Zf.getCurrent(t).each(function(t){ld.highlightFirst(t),ig.focusIn(t)})},u=function(t){qx(o,function(t){return t},t,e,i,px.HighlightFirst).get(at)},a=function(t){var n=Ff(t,o,"button");return Ko(n),ft.some(!0)},c=lt(lt({},Zo([sr(function(e,t){Mf(e,o,"aria-descriptor").each(function(t){var n=oi("aria");Yr(t.element,"id",n),Yr(e.element,"aria-describedby",n)})})])),Bg(ft.some(u))),s={repositionMenus:function(t){Eg.isOn(t)&&Zx(t)}};return{uid:o.uid,dom:o.dom,components:t,apis:s,eventOrder:lt(lt({},o.eventOrder),((r={})[_o()]=["disabling","toggling","alloy.base.behaviour"],r)),events:c,behaviours:Wl(o.splitDropdownBehaviours,[Vx.config({others:{sandbox:function(t){var n=Ff(t,o,"arrow");return Qx(o,t,{onOpen:function(){Eg.on(n),Eg.on(t)},onClose:function(){Eg.off(n),Eg.off(t)}})}}}),ig.config({mode:"special",onSpace:a,onEnter:a,onDown:function(t){return u(t),ft.some(!0)}}),hg.config({}),Eg.config({toggleOnExecute:!1,aria:{mode:"expanded"}})]),domModification:{attributes:{role:o.role.getOr("button"),"aria-haspopup":!0}}}},apis:{repositionMenus:function(t,n){return t.repositionMenus(n)}}}),lE=function(n){return{isDisabled:function(){return mv.isDisabled(n)},setDisabled:function(t){return mv.set(n,t)}}},fE=function(n){return{setActive:function(t){Eg.set(n,t)},isActive:function(){return Eg.isOn(n)},isDisabled:function(){return mv.isDisabled(n)},setDisabled:function(t){return mv.set(n,t)}}},dE=function(t,n){return t.map(function(t){return{"aria-label":n.translate(t),title:n.translate(t)}}).getOr({})},mE=oi("focus-button"),gE=["checklist","ordered-list"],pE=["indent","outdent","table-insert-column-after","table-insert-column-before","unordered-list"],hE=function(n,e,t,o,r,i){var u,a=function(t){return Zh.isRtl()&&M(gE,t)?t+"-rtl":t},c=Zh.isRtl()&&n.exists(function(t){return M(pE,t)});return{dom:{tag:"button",classes:["tox-tbtn"].concat(e.isSome()?["tox-tbtn--select"]:[]).concat(c?["tox-tbtn__icon-rtl"]:[]),attributes:dE(t,i)},components:Kv([n.map(function(t){return TC(a(t),i.icons)}),e.map(function(t){return DC(t,"tox-tbtn",i)})]),eventOrder:((u={})[io()]=["focusing","alloy.base.behaviour","common-button-display-events"],u),buttonBehaviours:rc([Wv(i.isDisabled),Nv(),fg("common-button-display-events",[er(io(),function(t,n){n.event.prevent(),Yo(t,mE)})])].concat(o.map(function(t){return rE.config({channel:t,initialData:{icon:n,text:e},renderComponents:function(t,n){return Kv([t.icon.map(function(t){return TC(a(t),i.icons)}),t.text.map(function(t){return DC(t,"tox-tbtn",i)})])}})}).toArray()).concat(r.getOr([])))}},vE=function(t,n,e){var o,r=fe(at),i=hE(t.icon,t.text,t.tooltip,ft.none(),ft.none(),e);return dp.sketch({dom:i.dom,components:i.components,eventOrder:AC,buttonBehaviours:rc([fg("toolbar-button-events",[(o={onAction:t.onAction,getApi:n.getApi},dr(function(n,t){Gv(o,n)(function(t){qo(n,BC,{buttonApi:t}),o.onAction(t)})})),Xv(n,r),Yv(n,r)]),Wv(function(){return t.disabled||e.isDisabled()}),Nv()].concat(n.toolbarButtonBehaviours))})},bE=function(t,n,e){return vE(t,{toolbarButtonBehaviours:[].concat(0<e.length?[fg("toolbarButtonWith",e)]:[]),getApi:lE,onSetup:t.onSetup},n)},yE=function(t,n,e){return zt(vE(t,{toolbarButtonBehaviours:[lg.config({}),Eg.config({toggleClass:"tox-tbtn--enabled",aria:{mode:"pressed"},toggleOnExecute:!1})].concat(0<e.length?[fg("toolbarToggleButtonWith",e)]:[]),getApi:fE,onSetup:t.onSetup},n))},xE=function(n,t){var e,o,r,i,u=oi("channel-update-split-dropdown-display"),a=function(e){return{isDisabled:function(){return mv.isDisabled(e)},setDisabled:function(t){return mv.set(e,t)},setIconFill:function(t,n){qu(e.element,'svg path[id="'+t+'"], rect[id="'+t+'"]').each(function(t){Yr(t,"fill",n)})},setIconStroke:function(t,n){qu(e.element,'svg path[id="'+t+'"], rect[id="'+t+'"]').each(function(t){Yr(t,"stroke",n)})},setActive:function(n){Yr(e.element,"aria-pressed",n),qu(e.element,"span").each(function(t){e.getSystem().getByDom(t).each(function(t){return Eg.set(t,n)})})},isActive:function(){return qu(e.element,"span").exists(function(t){return e.getSystem().getByDom(t).exists(Eg.isOn)})}}},c=fe(at),s={getApi:a,onSetup:n.onSetup};return sE.sketch({dom:{tag:"div",classes:["tox-split-button"],attributes:lt({"aria-pressed":!1},dE(n.tooltip,t.providers))},onExecute:function(t){n.onAction(a(t))},onItemExecute:function(t,n,e){},splitDropdownBehaviours:rc([Uv(t.providers.isDisabled),Nv(),fg("split-dropdown-events",[er(mE,hg.focus),Xv(s,c),Yv(s,c)]),rw.config({})]),eventOrder:((e={})[Po()]=["alloy.base.behaviour","split-dropdown-events"],e),toggleClass:"tox-tbtn--enabled",lazySink:t.getSink,fetch:(o=a,r=n,i=t.providers,function(n){return Sx(function(t){return r.fetch(t)}).map(function(t){return ft.from(yy(zt(Qb(oi("menu-value"),t,function(t){r.onItemAction(o(n),t)},r.columns,r.presets,ih.CLOSE_ON_EXECUTE,r.select.getOr(l),i),{movement:ty(r.columns,r.presets),menuBehaviours:Uh("auto"!==r.columns?[]:[sr(function(o,t){Lh(o,4,hh(r.presets)).each(function(t){var n=t.numRows,e=t.numColumns;ig.setGridSize(o,n,e)})})])})))})}),parts:{menu:xh(0,n.columns,n.presets)},components:[sE.parts.button(hE(n.icon,n.text,ft.none(),ft.some(u),ft.some([Eg.config({toggleClass:"tox-tbtn--enabled",toggleOnExecute:!1})]),t.providers)),sE.parts.arrow({dom:{tag:"button",classes:["tox-tbtn","tox-split-button__chevron"],innerHtml:pp("chevron-down",t.providers.icons)},buttonBehaviours:rc([Uv(t.providers.isDisabled),Nv()])}),sE.parts["aria-descriptor"]({text:t.providers.translate("To open the popup, press Shift+Enter")})]})},wE=function(i,u){return er(BC,function(t,n){var e,o=i.get(t),r=(e=o,{hide:function(){return Yo(e,Bo())},getValue:function(){return Ll.getValue(e)}});u.onAction(r,n.event.buttonApi)})},SE=function(t,n,e){var o,r,i,u,a,c,s,l,f,d,m,g,p={backstage:{shared:{providers:e}}};return"contextformtogglebutton"===n.type?(s=t,f=p,(d=(l=n).original).primary,m=S(d,["primary"]),g=Tn(Yp(lt(lt({},m),{type:"togglebutton",onAction:at}))),yE(g,f.backstage.shared.providers,[wE(s,l)])):(o=t,i=p,(u=(r=n).original).primary,a=S(u,["primary"]),c=Tn(Wp(lt(lt({},a),{type:"button",onAction:at}))),bE(c,i.backstage.shared.providers,[wE(o,r)]))},kE=function(t,n){var e,o,r,i,u=t.label.fold(function(){return{}},function(t){return{"aria-label":t}}),a=mp(dx.sketch({inputClasses:["tox-toolbar-textfield","tox-toolbar-nav-js"],data:t.initValue(),inputAttributes:u,selectOnFocus:!0,inputBehaviours:rc([ig.config({mode:"special",onEnter:function(t){return c.findPrimary(t).map(function(t){return Ko(t),!0})},onLeft:function(t,n){return n.cut(),ft.none()},onRight:function(t,n){return n.cut(),ft.none()}})])})),c=(e=a,o=t.commands,r=n,i=V(o,function(t){return mp(SE(e,t,r))}),{asSpecs:function(){return V(i,function(t){return t.asSpec()})},findPrimary:function(e){return Q(o,function(t,n){return t.primary?ft.from(i[n]).bind(function(t){return t.getOpt(e)}).filter(x(mv.isDisabled)):ft.none()})}});return[{title:ft.none(),items:[a.asSpec()]},{title:ft.none(),items:c.asSpecs()}]},CE=kE,OE=function(t,n){var e,o,r,i,u,a=Fu(window),c=Hu(me.fromDom(t.getContentAreaContainer())),s=wv(t)||Sv(t)||Cv(t),l=(e=c,o=a,r=Math.max(o.x,e.x),i=e.right-r,u=o.width-(r-o.x),{x:r,width:Math.min(i,u)}),f=l.x,d=l.width;if(t.inline&&!s)return Pu(f,a.y,d,a.height);var m=function(t,n,e,o){var r=me.fromDom(t.getContainer()),i=qu(r,".tox-editor-header").getOr(r),u=Hu(i),a=u.y>=n.bottom,c=o&&!a;if(t.inline&&c)return{y:Math.max(u.bottom,e.y),bottom:e.bottom};if(t.inline&&!c)return{y:e.y,bottom:Math.min(u.y,e.bottom)};var s=Hu(r);return c?{y:Math.max(u.bottom,e.y),bottom:Math.min(s.bottom,e.bottom)}:{y:Math.max(s.y,e.y),bottom:Math.min(u.y,e.bottom)}}(t,c,a,n.header.isPositionedAtTop()),g=m.y,p=m.bottom;return Pu(f,g,d,p-g)},_E=function(n,t){var e=H(t,function(t){return t.predicate(n.dom)}),o=P(e,function(t){return"contexttoolbar"===t.type});return{contextToolbars:o.pass,contextForms:o.fail}},TE=function(t,n,e){var o=_E(t,n);if(0<o.contextForms.length)return ft.some({elem:t,toolbars:[o.contextForms[0]]});var r=_E(t,e);if(0<r.contextForms.length)return ft.some({elem:t,toolbars:[r.contextForms[0]]});if(0<o.contextToolbars.length||0<r.contextToolbars.length){var i=function(t){if(t.length<=1)return t;var n=function(n){return F(t,function(t){return t.position===n})},e=function(n){return H(t,function(t){return t.position===n})},o=n("selection"),r=n("node");if(o||r){if(r&&o){var i=e("node"),u=V(e("selection"),function(t){return lt(lt({},t),{position:"node"})});return i.concat(u)}return e(o?"selection":"node")}return e("line")}(o.contextToolbars.concat(r.contextToolbars));return ft.some({elem:t,toolbars:i})}return ft.none()},EE=function(t,n,i){return t(n)?ft.none():Ke(n,function(t){var n=_E(t,i.inNodeScope),e=n.contextToolbars,o=n.contextForms,r=0<o.length?o:function(t){if(t.length<=1)return t;var n=function(n){return L(t,function(t){return t.position===n})};return n("selection").orThunk(function(){return n("node")}).orThunk(function(){return n("line")}).map(function(t){return t.position}).fold(function(){return[]},function(n){return H(t,function(t){return t.position===n})})}(e);return 0<r.length?ft.some({elem:t,toolbars:r}):ft.none()},t)},DE=function(e,r){var t={},i=[],u=[],a={},c={},o=function(n,e){var o=Tn(_n("ContextForm",th,e));(t[n]=o).launch.map(function(t){a["form:"+n]=lt(lt({},e.launch),{type:"contextformtogglebutton"===t.type?"togglebutton":"button",onAction:function(){r(o)}})}),"editor"===o.scope?u.push(o):i.push(o),c[n]=o},s=function(n,e){_n("ContextToolbar",nh,e).each(function(t){"editor"===e.scope?u.push(t):i.push(t),c[n]=t})},n=Ct(e);return mt(n,function(t){var n=e[t];"contextform"===n.type?o(t,n):"contexttoolbar"===n.type&&s(t,n)}),{forms:t,inNodeScope:i,inEditorScope:u,lookupTable:c,formNavigators:a}},BE=oi("forward-slide"),AE=oi("backward-slide"),ME=oi("change-slide-event"),FE="tox-pop--resizing",IE=function(t,n,e){var u,a,r,c,s,o=e.dataset,i="basic"===o.type?function(){return V(o.data,function(t){return b_(t,e.isSelectedFor,e.getPreviewFor)})}:o.getData;return{items:(u=n,a=e,r=function(t,n,e,o){var r=u.shared.providers.translate(t.title);if("separator"===t.type)return ft.some({type:"separator",text:r});if("submenu"!==t.type)return ft.some(lt({type:"togglemenuitem",text:r,icon:t.icon,active:t.isSelected(o),disabled:e,onAction:a.onAction(t)},t.getStylePreview().fold(function(){return{}},function(t){return{meta:{style:t}}})));var i=U(t.getStyleItems(),function(t){return c(t,n,o)});return 0===n&&i.length<=0?ft.none():ft.some({type:"nestedmenuitem",text:r,disabled:i.length<=0,getSubmenuItems:function(){return U(t.getStyleItems(),function(t){return c(t,n,o)})}})},c=function(t,n,e){var o="formatter"===t.type&&a.isInvalid(t);return 0===n?o?[]:r(t,n,!1,e).toArray():r(t,n,o,e).toArray()},{validateItems:s=function(t){var n=a.getCurrentValue(),e=a.shouldHide?0:1;return U(t,function(t){return c(t,e,n)})},getFetch:function(r,i){return function(t,n){var e=i(),o=s(e);n(NC(o,ih.CLOSE_ON_EXECUTE,r,!1))}}}),getStyleItems:i}},RE=function(o,t,n){var e=IE(0,t,n),r=e.items,i=e.getStyleItems;return IC({text:n.icon.isSome()?ft.none():ft.some(""),icon:n.icon,tooltip:ft.from(n.tooltip),role:ft.none(),fetch:r.getFetch(t,i),onSetup:function(e){return n.setInitialValue.each(function(t){return t(e.getComponent())}),n.nodeChangeHandler.map(function(t){var n=t(e.getComponent());return o.on("NodeChange",n),function(){o.off("NodeChange",n)}}).getOr(at)},getApi:function(t){return{getComponent:function(){return t}}},columns:1,presets:"normal",classes:n.icon.isSome()?[]:["bespoke"],dropdownBehaviours:[]},"tox-tbtn",t.shared)};(_O=OO=OO||{})[_O.SemiColon=0]="SemiColon",_O[_O.Space=1]="Space";var VE,PE,HE,zE,NE,LE,jE=function(t,n,e,o){var r,i,u=t.getParam(n,e,"string");return{type:"basic",data:(i=u,r=o===OO.SemiColon?i.replace(/;$/,"").split(";"):i.split(" "),V(r,function(t){var n=t,e=t,o=t.split("=");return 1<o.length&&(n=o[0],e=o[1]),{title:n,format:e}}))}},UE=[{title:"Left",icon:"align-left",format:"alignleft",command:"JustifyLeft"},{title:"Center",icon:"align-center",format:"aligncenter",command:"JustifyCenter"},{title:"Right",icon:"align-right",format:"alignright",command:"JustifyRight"},{title:"Justify",icon:"align-justify",format:"alignjustify",command:"JustifyFull"}],WE=function(e){var n=function(t){var n=L(UE,function(t){return e.formatter.match(t.format)}).fold(function(){return"left"},function(t){return t.title.toLowerCase()});qo(t,FC,{icon:"align-"+n})},t=ft.some(function(t){return function(){return n(t)}}),o=ft.some(n),r={type:"basic",data:UE};return{tooltip:"Align",icon:ft.some("align-left"),isSelectedFor:function(t){return function(){return e.formatter.match(t)}},getCurrentValue:ft.none,getPreviewFor:function(t){return function(){return ft.none()}},onAction:function(n){return function(){return L(UE,function(t){return t.format===n.format}).each(function(t){return e.execCommand(t.command)})}},setInitialValue:o,nodeChangeHandler:t,dataset:r,shouldHide:!1,isInvalid:function(t){return!e.formatter.canApply(t.format)}}},GE=["-apple-system","Segoe UI","Roboto","Helvetica Neue","sans-serif"],XE=function(t){var n=t.split(/\s*,\s*/);return V(n,function(t){return t.replace(/^['"]+|['"]+$/g,"")})},YE=function(t){var n;return 0===t.indexOf("-apple-system")&&(n=XE(t.toLowerCase()),W(GE,function(t){return-1<n.indexOf(t.toLowerCase())}))},qE=function(r){var i=function(){var e=function(t){return t?XE(t)[0]:""},t=r.queryCommandValue("FontName"),n=u.data,o=t?t.toLowerCase():"";return{matchOpt:L(n,function(t){var n=t.format;return n.toLowerCase()===o||e(n).toLowerCase()===e(o).toLowerCase()}).orThunk(function(){return YE(o)?ft.from({title:"System Font",format:o}):ft.none()}),font:t}},n=function(t){var n=i(),e=n.matchOpt,o=n.font,r=e.fold(function(){return o},function(t){return t.title});qo(t,MC,{text:r})},t=ft.some(function(t){return function(){return n(t)}}),e=ft.some(n),u=jE(r,"font_formats","Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats",OO.SemiColon);return{tooltip:"Fonts",icon:ft.none(),isSelectedFor:function(n){return function(t){return t.exists(function(t){return t.format===n})}},getCurrentValue:function(){return i().matchOpt},getPreviewFor:function(t){return function(){return ft.some({tag:"div",styles:-1===t.indexOf("dings")?{"font-family":t}:{}})}},onAction:function(t){return function(){r.undoManager.transact(function(){r.focus(),r.execCommand("FontName",!1,t.format)})}},setInitialValue:e,nodeChangeHandler:t,dataset:u,shouldHide:!1,isInvalid:l}},KE={"8pt":"1","10pt":"2","12pt":"3","14pt":"4","18pt":"5","24pt":"6","36pt":"7"},JE={"xx-small":"7pt","x-small":"8pt",small:"10pt",medium:"12pt",large:"14pt","x-large":"18pt","xx-large":"24pt"},$E=function(t,n){return/[0-9.]+px$/.test(t)?(e=72*parseInt(t,10)/96,o=n||0,r=Math.pow(10,o),Math.round(e*r)/r+"pt"):Ft(JE,t).getOr(t);var e,o,r},QE=function(e){var i=function(){var o=ft.none(),r=u.data,i=e.queryCommandValue("FontSize");if(i)for(var t=function(t){var n=$E(i,t),e=Ft(KE,n).getOr("");o=L(r,function(t){return t.format===i||t.format===n||t.format===e})},n=3;o.isNone()&&0<=n;n--)t(n);return{matchOpt:o,size:i}},t=ct(ft.none),n=function(t){var n=i(),e=n.matchOpt,o=n.size,r=e.fold(function(){return o},function(t){return t.title});qo(t,MC,{text:r})},o=ft.some(function(t){return function(){return n(t)}}),r=ft.some(n),u=jE(e,"fontsize_formats","8pt 10pt 12pt 14pt 18pt 24pt 36pt",OO.Space);return{tooltip:"Font sizes",icon:ft.none(),isSelectedFor:function(n){return function(t){return t.exists(function(t){return t.format===n})}},getPreviewFor:t,getCurrentValue:function(){return i().matchOpt},onAction:function(t){return function(){e.undoManager.transact(function(){e.focus(),e.execCommand("FontSize",!1,t.format)})}},setInitialValue:r,nodeChangeHandler:o,dataset:u,shouldHide:!1,isInvalid:l}},ZE=function(t,n){var e=n(),o=V(e,function(t){return t.format});return ft.from(t.formatter.closest(o)).bind(function(n){return L(e,function(t){return t.format===n})}).orThunk(function(){return Kf(t.formatter.match("p"),{title:"Paragraph",format:"p"})})},tD=function(t){var n=fe(ft.none()),e=function(){return n.get().each(t)};return{clear:function(){e(),n.set(ft.none())},isSet:function(){return n.get().isSome()},set:function(t){e(),n.set(ft.some(t))}}},nD=function(){return tD(function(t){return t.destroy()})},eD=function(){return tD(function(t){return t.unbind()})},oD=function(o,r){return function(n){var e=eD(),t=function(){n.setActive(o.formatter.match(r));var t=o.formatter.formatChanged(r,n.setActive);e.set(t)};return o.initialized?t():o.on("init",t),e.clear}},rD=function(n){return function(t){return function(){n.undoManager.transact(function(){n.focus(),n.execCommand("mceToggleFormat",!1,t.format)})}}},iD=function(e){var n=function(t){var n=ZE(e,function(){return r.data}).fold(function(){return"Paragraph"},function(t){return t.title});qo(t,MC,{text:n})},t=ft.some(function(t){return function(){return n(t)}}),o=ft.some(n),r=jE(e,"block_formats","Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre",OO.SemiColon);return{tooltip:"Blocks",icon:ft.none(),isSelectedFor:function(t){return function(){return e.formatter.match(t)}},getCurrentValue:ft.none,getPreviewFor:function(n){return function(){var t=e.formatter.get(n);return ft.some({tag:0<t.length&&(t[0].inline||t[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(n))})}},onAction:rD(e),setInitialValue:o,nodeChangeHandler:t,dataset:r,shouldHide:!1,isInvalid:function(t){return!e.formatter.canApply(t.format)}}},uD=function(r,t){var n=function(t){var e=function(t){var n=t.items;return n!==undefined&&0<n.length?U(n,e):[{title:t.title,format:t.format}]},n=U(v_(r),e),o=ZE(r,function(){return n}).fold(function(){return"Paragraph"},function(t){return t.title});qo(t,MC,{text:o})},e=ft.some(function(t){return function(){return n(t)}}),o=ft.some(n);return{tooltip:"Formats",icon:ft.none(),isSelectedFor:function(t){return function(){return r.formatter.match(t)}},getCurrentValue:ft.none,getPreviewFor:function(n){return function(){var t=r.formatter.get(n);return t!==undefined?ft.some({tag:0<t.length&&(t[0].inline||t[0].block)||"div",styles:r.dom.parseStyle(r.formatter.getCssText(n))}):ft.none()}},onAction:rD(r),setInitialValue:o,nodeChangeHandler:e,shouldHide:r.getParam("style_formats_autohide",!1,"boolean"),isInvalid:function(t){return!r.formatter.canApply(t.format)},dataset:t}},aD=[{name:"history",items:["undo","redo"]},{name:"styles",items:["styleselect"]},{name:"formatting",items:["bold","italic"]},{name:"alignment",items:["alignleft","aligncenter","alignright","alignjustify"]},{name:"indentation",items:["outdent","indent"]},{name:"permanent pen",items:["permanentpen"]},{name:"comments",items:["addcomment"]}],cD=function(r,i){return function(t,n,e){var o=r(t).mapError(function(t){return Dn(t)}).getOrDie();return i(o,n,e)}},sD={button:cD(Wp,function(t,n){return e=t,o=n.backstage.shared.providers,bE(e,o,[]);var e,o}),togglebutton:cD(Yp,function(t,n){return e=t,o=n.backstage.shared.providers,yE(e,o,[]);var e,o}),menubutton:cD(ZT,function(t,n){return jC(t,"tox-tbtn",n.backstage,ft.none())}),splitbutton:cD(function(t){return _n("SplitButton",tE,t)},function(t,n){return xE(t,n.backstage.shared)}),grouptoolbarbutton:cD(function(t){return _n("GroupToolbarButton",JT,t)},function(t,n,e){var o,r,i,u,a,c,s=e.ui.registry.getAll().buttons,l=((o={})[Xc]=n.backstage.shared.header.isPositionedAtTop()?ta.TopToBottom:ta.BottomToTop,o);switch(Tv(e)){case oh.floating:return r=t,i=n.backstage,u=function(t){return mD(e,{buttons:s,toolbar:t,allowToolbarGroups:!1},n,ft.none())},a=l,c=i.shared,gT.sketch({lazySink:c.getSink,fetch:function(){return Sx(function(t){t(V(u(r.items),WT))})},markers:{toggledClass:"tox-tbtn--enabled"},parts:{button:hE(r.icon,r.text,r.tooltip,ft.none(),ft.none(),c.providers),toolbar:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:a}}}});default:throw new Error("Toolbar groups are only supported when using floating toolbar mode")}}),styleSelectButton:function(t,n){return e=t,o=n.backstage,r=lt({type:"advanced"},o.styleselect),RE(e,o,uD(e,r));var e,o,r},fontsizeSelectButton:function(t,n){return e=t,o=n.backstage,RE(e,o,QE(e));var e,o},fontSelectButton:function(t,n){return e=t,o=n.backstage,RE(e,o,qE(e));var e,o},formatButton:function(t,n){return e=t,o=n.backstage,RE(e,o,iD(e));var e,o},alignMenuButton:function(t,n){return e=t,o=n.backstage,RE(e,o,WE(e));var e,o}},lD={styleselect:sD.styleSelectButton,fontsizeselect:sD.fontsizeSelectButton,fontselect:sD.fontSelectButton,formatselect:sD.formatButton,align:sD.alignMenuButton},fD=function(t){var n,e,o,r=t.toolbar,i=t.buttons;return!1===r?[]:r===undefined||!0===r?(e=i,o=V(aD,function(t){var n=H(t.items,function(t){return It(e,t)||It(lD,t)});return{name:t.name,items:n}}),H(o,function(t){return 0<t.items.length})):C(r)?(n=r.split("|"),V(n,function(t){return{items:t.trim().split(" ")}})):b(r,function(t){return It(t,"name")&&It(t,"items")})?r:(console.error("Toolbar type should be string, string[], boolean or ToolbarGroup[]"),[])},dD=function(r,n,i,u,a,t){return Ft(n,i.toLowerCase()).orThunk(function(){return t.bind(function(t){return Q(t,function(t){return Ft(n,t+i.toLowerCase())})})}).fold(function(){return Ft(lD,i.toLowerCase()).map(function(t){return t(r,a)}).orThunk(function(){return ft.none()})},function(t){return"grouptoolbarbutton"!==t.type||u?(e=a,o=r,Ft(sD,(n=t).type).fold(function(){return console.error("skipping button defined by",n),ft.none()},function(t){return ft.some(t(n,e,o))})):(console.warn("Ignoring the '"+i+"' toolbar button. Group toolbar buttons are only supported when using floating toolbar mode and cannot be nested."),ft.none());var n,e,o})},mD=function(e,o,r,i){var t=fD(o),n=V(t,function(t){var n=U(t.items,function(t){return 0===t.trim().length?[]:dD(e,o.buttons,t,o.allowToolbarGroups,r,i).toArray()});return{title:ft.from(e.translate(t.name)),items:n}});return H(n,function(t){return 0<t.items.length})},gD={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"]},pD={maxHeightFunction:Mc(),maxWidthFunction:K_()},hD={onLtr:function(){return[La,ja,za,Pa,Na,Ha,sp,lp,ap,ip,cp,up]},onRtl:function(){return[La,ja,Na,Ha,za,Pa,sp,lp,cp,up,ap,ip]}},vD={onLtr:function(){return[ja,Pa,Ha,za,Na,La,sp,lp,ap,ip,cp,up]},onRtl:function(){return[ja,Ha,Pa,Na,za,La,sp,lp,cp,up,ap,ip]}},bD=function(c,t,e,s){var o,r,l=je().deviceType.isTouch,u=mu((o={sink:e,onEscape:function(){return c.focus(),ft.some(!0)}},r=fe([]),Zg.sketch({dom:{tag:"div",classes:["tox-pop"]},fireDismissalEventInstead:{event:"doNotDismissYet"},onShow:function(t){r.set([]),Zg.getContent(t).each(function(t){tu(t.element,"visibility")}),Pi(t.element,FE),tu(t.element,"width")},inlineBehaviours:rc([fg("context-toolbar-events",[cr(bo(),function(t,n){Pi(t.element,FE),tu(t.element,"width")}),er(ME,function(t,n){var e=t.element;tu(e,"width");var o=Ou(e);Zg.setContent(t,n.event.contents),Ri(e,FE);var r=Ou(e);Yi(e,"width",o+"px"),Zg.getContent(t).each(function(t){n.event.focus.bind(function(t){return dc(t),gc(e)}).orThunk(function(){return ig.focusIn(t),mc(Ar(e))})}),fp.setTimeout(function(){Yi(t.element,"width",r+"px")},0)}),er(BE,function(n,t){Zg.getContent(n).each(function(t){r.set(r.get().concat([{bar:t,focus:mc(Ar(n.element))}]))}),qo(n,ME,{contents:t.event.forwardContents,focus:ft.none()})}),er(AE,function(n,t){J(r.get()).each(function(t){r.set(r.get().slice(0,r.get().length-1)),qo(n,ME,{contents:gu(t.bar),focus:t.focus})})})]),ig.config({mode:"special",onEscape:function(n){return J(r.get()).fold(function(){return o.onEscape()},function(t){return Yo(n,AE),ft.some(!0)})}})]),lazySink:function(){return pt.value(o.sink)}}))),f=function(){return OE(c,s.backstage.shared)},a=function(){if(l()&&s.backstage.isContextMenuOpen())return!0;var t,n,e,o,r,i,u=(t=g.get().filter(function(t){return ji(me.fromDom(t))}).map(function(t){return t.getBoundingClientRect()}).getOrThunk(function(){return c.selection.getRng().getBoundingClientRect()}),n=c.inline?Bu().top:zu(me.fromDom(c.getBody())).y,{y:t.top+n,bottom:t.bottom+n}),a=f();return e=u.y,o=u.bottom,r=a.y,i=a.bottom,!(Math.max(e,r)<=Math.min(o,i))},d=function(){m.set(ft.none()),Zg.hide(u)},n=function(){Zg.hide(u)},i=function(){m.get().each(function(t){var n=u.element;tu(n,"display"),a()?Yi(n,"display","none"):Zs.positionWithinBounds(e,t,u,ft.some(f()))})},m=fe(ft.none()),g=fe(ft.none()),p=fe(null),h=function(t){return{dom:{tag:"div",classes:["tox-pop__dialog"]},components:[t],behaviours:rc([ig.config({mode:"acyclic"}),fg("pop-dialog-wrap-events",[sr(function(t){c.shortcuts.add("ctrl+F9","focus statusbar",function(){return ig.focusIn(t)})}),lr(function(t){c.shortcuts.remove("ctrl+F9")})])])}},v=Lt(function(){return DE(t,function(t){var n=b([t]);qo(u,BE,{forwardContents:h(n)})})}),b=function(t){var n=c.ui.registry.getAll().buttons,e=v(),o=lt(lt({},n),e.formNavigators),r=Tv(c)===oh.scrolling?oh.scrolling:oh["default"],i=gt(V(t,function(t){return"contexttoolbar"===t.type?mD(c,{buttons:o,toolbar:t.items,allowToolbarGroups:!1},s,ft.some(["form:"])):(n=t,e=s.backstage.shared.providers,CE(n,e));var n,e}));return KT({type:r,uid:oi("context-toolbar"),initGroups:i,onEscape:ft.none,cyclicKeying:!0,providers:s.backstage.shared.providers})};c.on("contexttoolbar-show",function(n){var t=v();Ft(t.lookupTable,n.toolbarKey).each(function(t){x([t],n.target===c?ft.none():ft.some(n)),Zg.getContent(u).each(ig.focusIn)})});var y=function(t,n){var e,o,r="node"===t?s.backstage.shared.anchors.node(n):s.backstage.shared.anchors.cursor();return zt(r,(e=t,o=l(),"line"===e?{bubble:Pc(12,0,gD),layouts:{onLtr:function(){return[Ua]},onRtl:function(){return[Wa]}},overrides:pD}:{bubble:Pc(0,12,gD),layouts:o?vD:hD,overrides:pD}))},x=function(t,n){var e,o,r,i;S(),l()&&s.backstage.isContextMenuOpen()||(e=b(t),o=n.map(me.fromDom),r=y(t[0].position,o),m.set(ft.some(r)),g.set(n),i=u.element,tu(i,"display"),Zg.showWithinBounds(u,r,h(e),function(){return ft.some(f())}),a()&&Yi(i,"display","none"))},w=function(){var t,n,e,o,r,i,u;c.hasFocus()&&(t=v(),n=t,e=c,r=me.fromDom(e.getBody()),i=function(t){return Ge(t,r)},u=me.fromDom(e.selection.getNode()),(i(o=u)||Ye(r,o)?TE(u,n.inNodeScope,n.inEditorScope).orThunk(function(){return EE(i,u,n)}):ft.none()).fold(d,function(t){x(t.toolbars,ft.some(t.elem.dom))}))},S=function(){var t=p.get();null!==t&&(fp.clearTimeout(t),p.set(null))},k=function(){S(),p.set(fp.setEditorTimeout(c,w,0))};c.on("init",function(){c.on(J_,n),c.on("ScrollContent ScrollWindow longpress",i),c.on("click keyup focus SetContent ObjectResized ResizeEditor",function(){k()}),c.on("focusout",function(t){fp.setEditorTimeout(c,function(){gc(e.element).isNone()&&gc(u.element).isNone()&&d()},0)}),c.on("SwitchMode",function(){c.mode.isReadOnly()&&d()}),c.on("AfterProgressState",function(t){t.state?d():c.hasFocus()&&k()}),c.on("NodeChange",function(t){gc(u.element).fold(k,at)})})},yD=Nf,xD=kf,wD=ct([ne("shell",!1),Ln("makeItem"),ne("setupItem",at),Gl("listBehaviours",[lg])]),SD=xf({name:"items",overrides:function(){return{behaviours:rc([lg.config({})])}}}),kD=ct([SD]),CD=Yf({name:ct("CustomList")(),configFields:wD(),partFields:kD(),factory:function(s,t,n,e){var o=s.shell?{behaviours:[lg.config({})],components:[]}:{behaviours:[],components:t},r=function(t){return s.shell?ft.some(t):Mf(t,s,"items")};return{uid:s.uid,dom:s.dom,components:o.components,behaviours:Wl(s.listBehaviours,o.behaviours),apis:{setItems:function(a,c){r(a).fold(function(){throw console.error("Custom List was defined to not be a shell, but no item container was specified in components"),new Error("Custom List was defined to not be a shell, but no item container was specified in components")},function(n){var t=lg.contents(n),e=c.length,o=e-t.length,r=0<o?I(o,function(){return s.makeItem()}):[],i=t.slice(e);mt(i,function(t){return lg.remove(n,t)}),mt(r,function(t){return lg.append(n,t)});var u=lg.contents(n);mt(u,function(t,n){s.setupItem(a,t,c[n],n)})})}}}},apis:{setItems:function(t,n,e){t.setItems(n,e)}}}),OD=ct([]),_D=/* */Object.freeze({__proto__:null,setup:at,isDocked:l,getBehaviours:OD}),TD=function(t){return(Qi(t,"position").is("fixed")?ft.none():Or(t)).orThunk(function(){var e=me.fromTag("span");return kr(t).bind(function(t){zr(t,e);var n=Or(e);return jr(e),n})})},ED=function(t){return TD(t).map(Su).getOrThunk(function(){return xu(0,0)})},DD=Vt([{"static":[]},{absolute:["positionCss"]},{fixed:["positionCss"]}]),BD=function(t,n){var e=t.element;Ri(e,n.transitionClass),Pi(e,n.fadeOutClass),Ri(e,n.fadeInClass),n.onShow(t)},AD=function(t,n){var e=t.element;Ri(e,n.transitionClass),Pi(e,n.fadeInClass),Ri(e,n.fadeOutClass),n.onHide(t)},MD=function(t,o,r){return W(t,function(t){switch(t){case"bottom":return e=r,o.bottom<=e.bottom;case"top":return n=r,o.y>=n.y}var n,e})},FD=function(n,t){return t.getInitialPosition().map(function(t){return Pu(t.bounds.x,t.bounds.y,Ou(n),vu(n))})},ID=function(t,n,e){e.setInitialPosition(ft.some({style:function(t){var n={},e=t.dom;if(Li(e))for(var o=0;o<e.style.length;o++){var r=e.style.item(o);n[r]=e.style[r]}return n}(t),position:Ji(t,"position")||"static",bounds:n}))},RD=function(e,o,r){return r.getInitialPosition().bind(function(t){switch(r.setInitialPosition(ft.none()),t.position){case"static":return ft.some(DD["static"]());case"absolute":var n=TD(e).map(Hu).getOrThunk(function(){return Hu(Ui())});return ft.some(DD.absolute(hc("absolute",Ft(t.style,"left").map(function(t){return o.x-n.x}),Ft(t.style,"top").map(function(t){return o.y-n.y}),Ft(t.style,"right").map(function(t){return n.right-o.right}),Ft(t.style,"bottom").map(function(t){return n.bottom-o.bottom}))));default:return ft.none()}})},VD=function(t,n,e){var o,r,i,u=t.element;return Qi(u,"position").is("fixed")?(r=n,FD(o=u,i=e).filter(function(t){return MD(i.getModes(),t,r)}).bind(function(t){return RD(o,t,i)})):function(t,n,e){var o=Hu(t);if(MD(e.getModes(),o,n))return ft.none();ID(t,o,e);var r=Nu(),i=o.x-r.x,u=n.y-r.y,a=r.bottom-n.bottom,c=o.y<=n.y;return ft.some(DD.fixed(hc("fixed",ft.some(i),c?ft.some(u):ft.none(),ft.none(),c?ft.none():ft.some(a))))}(u,n,e)},PD=function(n,t){mt(["left","right","top","bottom","position"],function(t){return tu(n.element,t)}),t.onUndocked(n)},HD=function(t,n,e){vc(t.element,e),("fixed"===e.position?n.onDocked:n.onUndocked)(t)},zD=function(i,t,u,a,c){void 0===c&&(c=!1),t.contextual.each(function(r){r.lazyContext(i).each(function(t){var n,e,o=(e=a,(n=t).y<e.bottom&&n.bottom>e.y);o!==u.isVisible()&&(u.setVisible(o),c&&!o?(zi(i.element,[r.fadeOutClass]),r.onHide(i)):(o?BD:AD)(i,r))})})},ND=function(n,e,t){var o,r,i=n.element;t.setDocked(!1),o=t,r=n.element,FD(r,o).bind(function(t){return RD(r,t,o)}).each(function(t){t.fold(function(){return PD(n,e)},function(t){return HD(n,e,t)},at)}),t.setVisible(!0),e.contextual.each(function(t){Ni(i,[t.fadeInClass,t.fadeOutClass,t.transitionClass]),t.onShow(n)}),LD(n,e,t)},LD=function(t,n,e){var o,r,i,u,a;t.getSystem().isConnected()&&(o=t,i=e,u=(r=n).lazyViewport(o),(a=i.isDocked())&&zD(o,r,i,u),VD(o,u,i).each(function(t){i.setDocked(!a),t.fold(function(){return PD(o,r)},function(t){return HD(o,r,t)},function(t){zD(o,r,i,u,!0),HD(o,r,t)})}))},jD=function(t,n,e){e.isDocked()&&ND(t,n,e)},UD=/* */Object.freeze({__proto__:null,refresh:LD,reset:jD,isDocked:function(t,n,e){return e.isDocked()},getModes:function(t,n,e){return e.getModes()},setModes:function(t,n,e,o){return e.setModes(o)}}),WD=/* */Object.freeze({__proto__:null,events:function(o,r){return Zo([cr(bo(),function(n,e){o.contextual.each(function(t){Hi(n.element,t.transitionClass)&&(Ni(n.element,[t.transitionClass,t.fadeInClass]),(r.isVisible()?t.onShown:t.onHidden)(n)),e.stop()})}),er(Ro(),function(t,n){LD(t,o,r)}),er(Vo(),function(t,n){jD(t,o,r)})])}}),GD=[te("contextual",[Un("fadeInClass"),Un("fadeOutClass"),Un("transitionClass"),Gn("lazyContext"),ma("onShow"),ma("onShown"),ma("onHide"),ma("onHidden")]),ae("lazyViewport",Nu),ce("modes",["top","bottom"],Rn),ma("onDocked"),ma("onUndocked")],XD=uc({fields:GD,name:"docking",active:WD,apis:UD,state:/* */Object.freeze({__proto__:null,init:function(t){var n=fe(!1),e=fe(!0),o=fe(ft.none()),r=fe(t.modes);return xi({isDocked:n.get,setDocked:n.set,getInitialPosition:o.get,setInitialPosition:o.set,isVisible:e.get,setVisible:e.set,getModes:r.get,setModes:r.set,readState:function(){return"docked:  "+n.get()+", visible: "+e.get()+", modes: "+r.get().join(",")}})}})}),YD={fadeInClass:"tox-editor-dock-fadein",fadeOutClass:"tox-editor-dock-fadeout",transitionClass:"tox-editor-dock-transition"},qD="tox-tinymce--toolbar-sticky-on",KD="tox-tinymce--toolbar-sticky-off",JD=function(r){var i=r.element;kr(i).each(function(t){var n,e,o="padding-"+XD.getModes(r)[0];XD.isDocked(r)?(n=Ou(t),Yi(i,"width",n+"px"),Yi(t,o,bu(e=i)+(parseInt(Ji(e,"margin-top"),10)||0)+(parseInt(Ji(e,"margin-bottom"),10)||0)+"px")):(tu(i,"width"),tu(t,o))})},$D=function(t,n){n?(Pi(t,YD.fadeOutClass),zi(t,[YD.transitionClass,YD.fadeInClass])):(Pi(t,YD.fadeInClass),zi(t,[YD.fadeOutClass,YD.transitionClass]))},QD=function(t,n){var e=me.fromDom(t.getContainer());n?(Ri(e,qD),Pi(e,KD)):(Ri(e,KD),Pi(e,qD))},ZD=function(c,t){var n,i=fe(ft.none()),o=t.getSink,u=function(n){o().each(function(t){return n(t.element)})},e=function(t){c.inline||JD(t),QD(c,XD.isDocked(t)),t.getSystem().broadcastOn([kl()],{}),o().each(function(t){return t.getSystem().broadcastOn([kl()],{})})},r=c.inline?[]:[lc.config({channels:((n={})[jT()]={onReceive:JD},n)})];return k([hg.config({}),XD.config({contextual:lt({lazyContext:function(t){var n,e,o=bu(t.element),r=c.inline?c.getContentAreaContainer():c.getContainer(),i=Hu(me.fromDom(r)),u=i.height-o,a=i.y+(n=t,e="top",M(XD.getModes(n),e)?0:o);return ft.some(Pu(i.x,a,i.width,u))},onShow:function(){u(function(t){return $D(t,!0)})},onShown:function(r){u(function(t){return Ni(t,[YD.transitionClass,YD.fadeInClass])}),i.get().each(function(t){var n,e,o;n=r.element,o=yr(e=t),mc(o).filter(function(t){return!Ge(e,t)}).filter(function(t){return Ge(t,me.fromDom(o.dom.body))||Ye(n,t)}).each(function(){return dc(e)}),i.set(ft.none())})},onHide:function(t){var n,e;i.set((n=t.element,e=o,gc(n).orThunk(function(){return e().toOptional().bind(function(t){return gc(t.element)})}))),u(function(t){return $D(t,!1)})},onHidden:function(){u(function(t){return Ni(t,[YD.transitionClass])})}},YD),modes:[t.header.getDockingMode()],onDocked:e,onUndocked:e})],r)},tB=/* */Object.freeze({__proto__:null,setup:function(t,n,e){t.inline||(n.header.isPositionedAtTop()||t.on("ResizeEditor",function(){e().each(XD.reset)}),t.on("ResizeWindow ResizeEditor",function(){e().each(JD)}),t.on("SkinLoaded",function(){e().each(function(t){XD.isDocked(t)?XD.reset(t):XD.refresh(t)})}),t.on("FullscreenStateChanged",function(){e().each(XD.reset)})),t.on("AfterScrollIntoView",function(y){e().each(function(t){XD.refresh(t);var n,e,o,r,i,u,a,c,s,l,f,d,m,g,p,h,v,b=t.element;Zd(b)&&(n=y,r=yr(e=b),i=r.dom.defaultView.innerHeight,u=Bu(r),a=me.fromDom(n.elm),c=zu(a),s=vu(a),l=c.y,f=l+s,d=Su(e),m=vu(e),g=d.top,p=g+m,h=Math.abs(g-u.top)<2,v=Math.abs(p-(u.top+i))<2,h&&l<p?Au(u.left,l-m,r):v&&g<f&&(o=l-i+s+m,Au(u.left,o,r)))})}),t.on("PostRender",function(){QD(t,!1)})},isDocked:function(t){return t().map(XD.isDocked).getOr(!1)},getBehaviours:ZD}),nB=Xf({factory:function(n,o){var t={focus:ig.focusIn,setMenus:function(t,n){var e=V(n,function(n){var t={type:"menubutton",text:n.text,fetch:function(t){t(n.getItems())}},e=ZT(t).mapError(function(t){return Dn(t)}).getOrDie();return jC(e,"tox-mbtn",o.backstage,ft.some("menuitem"))});lg.set(t,e)}};return{uid:n.uid,dom:n.dom,components:[],behaviours:rc([lg.config({}),fg("menubar-events",[sr(function(t){n.onSetup(t)}),er(so(),function(e,t){qu(e.element,".tox-mbtn--active").each(function(n){Ku(t.event.target,".tox-mbtn").each(function(t){Ge(n,t)||e.getSystem().getByDom(n).each(function(n){e.getSystem().getByDom(t).each(function(t){ow.expand(t),ow.close(n),hg.focus(t)})})})})}),er(Lo(),function(e,t){t.event.prevFocus.bind(function(t){return e.getSystem().getByDom(t).toOptional()}).each(function(n){t.event.newFocus.bind(function(t){return e.getSystem().getByDom(t).toOptional()}).each(function(t){ow.isOpen(n)&&(ow.expand(t),ow.close(n))})})})]),ig.config({mode:"flow",selector:".tox-mbtn",onEscape:function(t){return n.onEscape(t),ft.some(!0)}}),Yy.config({})]),apis:t,domModification:{attributes:{role:"menubar"}}}},name:"silver.Menubar",configFields:[Ln("dom"),Ln("uid"),Ln("onEscape"),Ln("backstage"),ne("onSetup",at)],apis:{focus:function(t,n){t.focus(n)},setMenus:function(t,n,e){t.setMenus(n,e)}}}),eB="container",oB=[jl("slotBehaviours",[])],rB=function(t){return"<alloy.field."+t+">"},iB=function(r,t){var e,n=function(t){return Vf(r)},o=function(e,o){return function(t,n){return Mf(t,r,n).map(function(t){return e(t,n)}).getOr(o)}},i=function(t,n){return"true"!==qr(t.element,"aria-hidden")},u=o(i,!1),a=o(function(t,n){var e;i(t)&&(e=t.element,Yi(e,"display","none"),Yr(e,"aria-hidden","true"),qo(t,jo(),{name:n,visible:!1}))}),c=function(n,t){mt(t,function(t){return e(n,t)})},s=o(function(t,n){var e;i(t)||(e=t.element,tu(e,"display"),$r(e,"aria-hidden"),qo(t,jo(),{name:n,visible:!0}))}),l={getSlotNames:n,getSlot:function(t,n){return Mf(t,r,n)},isShowing:u,hideSlot:e=a,hideAllSlots:function(t){return c(t,n())},showSlot:s};return{uid:r.uid,dom:r.dom,components:t,behaviours:Ul(r.slotBehaviours),apis:l}},uB=Tt({getSlotNames:function(t,n){return t.getSlotNames(n)},getSlot:function(t,n,e){return t.getSlot(n,e)},isShowing:function(t,n,e){return t.isShowing(n,e)},hideSlot:function(t,n,e){return t.hideSlot(n,e)},hideAllSlots:function(t,n){return t.hideAllSlots(n)},showSlot:function(t,n,e){return t.showSlot(n,e)}},bi),aB=lt(lt({},uB),{sketch:function(t){var e,n=(e=[],{slot:function(t,n){return e.push(t),Tf(eB,rB(t),n)},record:function(){return e}}),o=t(n),r=n.record(),i=V(r,function(t){return bf({name:t,pname:rB(t)})});return jf(eB,oB,i,iB,o)}}),cB=fn([Qn("icon"),Qn("tooltip"),ae("onShow",at),ae("onHide",at),ae("onSetup",function(){return at})]),sB=function(t){return{element:function(){return t.element.dom}}},lB=function(e,o){var r=V(Ct(o),function(t){var n=o[t],e=Tn(_n("sidebar",cB,n));return{name:t,getApi:sB,onSetup:e.onSetup,onShow:e.onShow,onHide:e.onHide}});return V(r,function(t){var n=fe(at);return e.slot(t.name,{dom:{tag:"div",classes:["tox-sidebar__pane"]},behaviours:Uh([Xv(t,n),Yv(t,n),er(jo(),function(n,t){var e=t.event;L(r,function(t){return t.name===e.name}).each(function(t){(e.visible?t.onShow:t.onHide)(t.getApi(n))})})])})})},fB=function(t,e){Zf.getCurrent(t).each(function(t){return lg.set(t,[(n=e,aB.sketch(function(t){return{dom:{tag:"div",classes:["tox-sidebar__pane-container"]},components:lB(t,n),slotBehaviours:Uh([sr(function(t){return aB.hideAllSlots(t)})])}}))]);var n})},dB=function(t){return Zf.getCurrent(t).bind(function(t){return VT.isGrowing(t)||VT.hasGrown(t)?Zf.getCurrent(t).bind(function(n){return L(aB.getSlotNames(n),function(t){return aB.isShowing(n,t)})}):ft.none()})},mB=oi("FixSizeEvent"),gB=oi("AutoSizeEvent"),pB=function(t){var n,e,o,r=me.fromHtml(t),i=_r(r),u=(e=(n=r).dom.attributes!==undefined?n.dom.attributes:[],N(e,function(t,n){var e;return"class"===n.name?t:lt(lt({},t),((e={})[n.name]=n.value,e))},{})),a=(o=r,Array.prototype.slice.call(o.dom.classList,0)),c=0===i.length?{}:{innerHtml:Wr(r)};return lt({tag:mr(r),classes:a,attributes:u},c)},hB=function(t,n,e){var o=t.element;!0===n?(lg.set(t,[{dom:{tag:"div",attributes:{"aria-label":e.translate("Loading...")},classes:["tox-throbber__busy-spinner"]},components:[{dom:pB('<div class="tox-spinner"><div></div><div></div><div></div></div>')}],behaviours:rc([ig.config({mode:"special",onTab:function(){return ft.some(!0)},onShiftTab:function(){return ft.some(!0)}}),hg.config({})])}]),tu(o,"display"),$r(o,"aria-hidden")):(lg.set(t,[]),Yi(o,"display","none"),Yr(o,"aria-hidden","true"))},vB=xD.optional({factory:nB,name:"menubar",schema:[Ln("backstage")]}),bB=xD.optional({factory:{sketch:function(t){return CD.sketch({uid:t.uid,dom:t.dom,listBehaviours:rc([ig.config({mode:"acyclic",selector:".tox-toolbar"})]),makeItem:function(){return KT({type:t.type,uid:oi("multiple-toolbar-item"),cyclicKeying:!1,initGroups:[],providers:t.providers,onEscape:function(){return t.onEscape(),ft.some(!0)}})},setupItem:function(t,n,e,o){Z_.setGroups(n,e)},shell:!0})}},name:"multiple-toolbar",schema:[Ln("dom"),Ln("onEscape")]}),yB=xD.optional({factory:{sketch:function(t){var n;return((n=t).type===oh.sliding?qT:n.type===oh.floating?YT:KT)({type:t.type,uid:t.uid,onEscape:function(){return t.onEscape(),ft.some(!0)},cyclicKeying:!1,initGroups:[],getSink:t.getSink,providers:t.providers,moreDrawerData:{lazyToolbar:t.lazyToolbar,lazyMoreButton:t.lazyMoreButton,lazyHeader:t.lazyHeader},attributes:t.attributes})}},name:"toolbar",schema:[Ln("dom"),Ln("onEscape"),Ln("getSink")]}),xB=xD.optional({factory:{sketch:function(t){var n=t.editor,e=t.sticky?ZD:OD;return{uid:t.uid,dom:t.dom,components:t.components,behaviours:rc(e(n,t.sharedBackstage))}}},name:"header",schema:[Ln("dom")]}),wB=xD.optional({name:"socket",schema:[Ln("dom")]}),SB=xD.optional({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"div",classes:["tox-sidebar"],attributes:{role:"complementary"}},components:[{dom:{tag:"div",classes:["tox-sidebar__slider"]},components:[],behaviours:rc([Yy.config({}),hg.config({}),VT.config({dimension:{property:"width"},closedClass:"tox-sidebar--sliding-closed",openClass:"tox-sidebar--sliding-open",shrinkingClass:"tox-sidebar--sliding-shrinking",growingClass:"tox-sidebar--sliding-growing",onShrunk:function(t){Zf.getCurrent(t).each(aB.hideAllSlots),Yo(t,gB)},onGrown:function(t){Yo(t,gB)},onStartGrow:function(t){qo(t,mB,{width:Qi(t.element,"width").getOr("")})},onStartShrink:function(t){qo(t,mB,{width:Ou(t.element)+"px"})}}),lg.config({}),Zf.config({find:function(t){var n=lg.contents(t);return K(n)}})])}],behaviours:rc([ak(0),fg("sidebar-sliding-events",[er(mB,function(t,n){Yi(t.element,"width",n.event.width)}),er(gB,function(t,n){tu(t.element,"width")})])])}}},name:"sidebar",schema:[Ln("dom")]}),kB=xD.optional({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"div",attributes:{"aria-hidden":"true"},classes:["tox-throbber"],styles:{display:"none"}},behaviours:rc([lg.config({})]),components:[]}}},name:"throbber",schema:[Ln("dom")]}),CB=Yf({name:"OuterContainer",factory:function(e,t,n){var o={getSocket:function(t){return yD.getPart(t,e,"socket")},setSidebar:function(t,n){yD.getPart(t,e,"sidebar").each(function(t){return fB(t,n)})},toggleSidebar:function(t,o){yD.getPart(t,e,"sidebar").each(function(t){return n=t,e=o,void Zf.getCurrent(n).each(function(n){Zf.getCurrent(n).each(function(t){VT.hasGrown(n)?aB.isShowing(t,e)?VT.shrink(n):(aB.hideAllSlots(t),aB.showSlot(t,e)):(aB.hideAllSlots(t),aB.showSlot(t,e),VT.grow(n))})});var n,e})},whichSidebar:function(t){return yD.getPart(t,e,"sidebar").bind(dB).getOrNull()},getHeader:function(t){return yD.getPart(t,e,"header")},getToolbar:function(t){return yD.getPart(t,e,"toolbar")},setToolbar:function(t,n){yD.getPart(t,e,"toolbar").each(function(t){t.getApis().setGroups(t,n)})},setToolbars:function(t,n){yD.getPart(t,e,"multiple-toolbar").each(function(t){CD.setItems(t,n)})},refreshToolbar:function(t){yD.getPart(t,e,"toolbar").each(function(t){return t.getApis().refresh(t)})},toggleToolbarDrawer:function(t){yD.getPart(t,e,"toolbar").each(function(n){var t,e;t=n.getApis().toggle,e=function(t){return t(n)},t!==undefined&&null!==t?ft.some(e(t)):ft.none()})},isToolbarDrawerToggled:function(t){return yD.getPart(t,e,"toolbar").bind(function(n){return ft.from(n.getApis().isOpen).map(function(t){return t(n)})}).getOr(!1)},getThrobber:function(t){return yD.getPart(t,e,"throbber")},focusToolbar:function(t){yD.getPart(t,e,"toolbar").orThunk(function(){return yD.getPart(t,e,"multiple-toolbar")}).each(function(t){ig.focusIn(t)})},setMenubar:function(t,n){yD.getPart(t,e,"menubar").each(function(t){nB.setMenus(t,n)})},focusMenubar:function(t){yD.getPart(t,e,"menubar").each(function(t){nB.focus(t)})}};return{uid:e.uid,dom:e.dom,components:t,apis:o,behaviours:e.behaviours}},configFields:[Ln("dom"),Ln("behaviours")],partFields:[xB,vB,yB,bB,wB,SB,kB],apis:{getSocket:function(t,n){return t.getSocket(n)},setSidebar:function(t,n,e){t.setSidebar(n,e)},toggleSidebar:function(t,n,e){t.toggleSidebar(n,e)},whichSidebar:function(t,n){return t.whichSidebar(n)},getHeader:function(t,n){return t.getHeader(n)},getToolbar:function(t,n){return t.getToolbar(n)},setToolbar:function(t,n,e){var o=V(e,WT);t.setToolbar(n,o)},setToolbars:function(t,n,e){var o=V(e,function(t){return V(t,WT)});t.setToolbars(n,o)},refreshToolbar:function(t,n){return t.refreshToolbar(n)},toggleToolbarDrawer:function(t,n){t.toggleToolbarDrawer(n)},isToolbarDrawerToggled:function(t,n){return t.isToolbarDrawerToggled(n)},getThrobber:function(t,n){return t.getThrobber(n)},setMenubar:function(t,n,e){t.setMenubar(n,e)},focusMenubar:function(t,n){t.focusMenubar(n)},focusToolbar:function(t,n){t.focusToolbar(n)}}}),OB={file:{title:"File",items:"newdocument restoredraft | preview | export print | deleteallconversations"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall | searchreplace"},view:{title:"View",items:"code | visualaid visualchars visualblocks | spellchecker | preview fullscreen | showcomments"},insert:{title:"Insert",items:"image link media addcomment pageembed template codesample inserttable | charmap emoticons hr | pagebreak nonbreaking anchor toc | insertdatetime"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript codeformat | formats blockformats fontformats fontsizes align lineheight | forecolor backcolor | removeformat"},tools:{title:"Tools",items:"spellchecker spellcheckerlanguage | a11ycheck code wordcount"},table:{title:"Table",items:"inserttable | cell row column | advtablesort | tableprops deletetable"},help:{title:"Help",items:"help"}},_B=function(t){return"string"==typeof t?t.split(" "):t},TB=function(i,u){var a=lt(lt({},OB),u.menus),n=0<Ct(u.menus).length,t=u.menubar===undefined||!0===u.menubar?_B("file edit view insert format tools table help"):_B(!1===u.menubar?"":u.menubar),e=H(t,function(t){return n&&u.menus.hasOwnProperty(t)&&u.menus[t].hasOwnProperty("items")||OB.hasOwnProperty(t)}),o=V(e,function(t){var n,e,o,r=a[t];return n={title:r.title,items:_B(r.items)},e=u,o=i.getParam("removed_menuitems","").split(/[ ,]/),{text:n.title,getItems:function(){return U(n.items,function(t){var n=t.toLowerCase();return 0===n.trim().length||F(o,function(t){return t===n})?[]:"separator"===n||"|"===n?[{type:"separator"}]:e.menuItems[n]?[e.menuItems[n]]:[]})}}});return H(o,function(t){return 0<t.getItems().length&&F(t.getItems(),function(t){return"separator"!==t.type})})},EB=function(t){var n=function(){t._skinLoaded=!0,t.fire("SkinLoaded")};return function(){t.initialized?n():t.on("init",n)}},DB=function(n,e){return function(){return t={message:e},n.fire("SkinLoadError",t);var t}},BB=function(e,o,r){return new Mp(function(t,n){r.load(o,t,n),e.on("remove",function(){return r.unload(o)})})},AB=function(t,n){var e;return(e=me.fromDom(t.getElement()),Fr(e).isSome())?BB(t,n+"/skin.shadowdom.min.css",Qh.DOM.styleSheetLoader):Mp.resolve()},MB=function(t,n){var e,o,r,i,u,a=(r=(e=n).getParam("skin"),i=e.getParam("skin_url"),!1!==r&&(o=r||"oxide",i=i?e.documentBaseURI.toAbsolute(i):gv.baseURL+"/skins/ui/"+o),i);a&&n.contentCSS.push(a+(t?"/content.inline":"/content")+".min.css"),!1==(!1===n.getParam("skin"))&&C(a)?Mp.all([BB(u=n,a+"/skin.min.css",u.ui.styleSheetLoader),AB(n,a)]).then(EB(n),DB(n,"Skin could not be loaded")):EB(n)()},FB=y(MB,!1),IB=y(MB,!0),RB=function(e,t,o,r){var n,i=t.outerContainer,u=o.toolbar,a=o.buttons;b(u,C)?(n=u.map(function(t){var n={toolbar:t,buttons:a,allowToolbarGroups:o.allowToolbarGroups};return mD(e,n,{backstage:r},ft.none())}),CB.setToolbars(i,n)):CB.setToolbar(i,mD(e,o,{backstage:r},ft.none()))},VB=je(),PB=VB.os.isiOS()&&VB.os.version.major<=12,HB=function(e,t){var n=e.dom,o=e.getWin(),r=e.getDoc().documentElement,i=fe(xu(o.innerWidth,o.innerHeight)),u=fe(xu(r.offsetWidth,r.offsetHeight)),a=function(){var t=i.get();t.left===o.innerWidth&&t.top===o.innerHeight||(i.set(xu(o.innerWidth,o.innerHeight)),Mb(e))},c=function(){var t=e.getDoc().documentElement,n=u.get();n.left===t.offsetWidth&&n.top===t.offsetHeight||(u.set(xu(t.offsetWidth,t.offsetHeight)),Mb(e))},s=function(t){return n=t,e.fire("ScrollContent",n);var n};n.bind(o,"resize",a),n.bind(o,"scroll",s);var l=ky(me.fromDom(e.getBody()),"load",c),f=t.uiMothership.element;e.on("hide",function(){Yi(f,"display","none")}),e.on("show",function(){tu(f,"display")}),e.on("NodeChange",c),e.on("remove",function(){l.unbind(),n.unbind(o,"resize",a),n.unbind(o,"scroll",s),o=null})},zB=/* */Object.freeze({__proto__:null,render:function(e,n,t,o,r){var i=fe(0),u=n.outerContainer;FB(e);var a,c,s=me.fromDom(r.targetNode),l=Mr(Ar(s));a=s,c=n.mothership,ll(a,c,Pr),sl(l,n.uiMothership),e.on("PostRender",function(){RB(e,n,t,o),i.set(e.getWin().innerWidth),CB.setMenubar(u,TB(e,t)),CB.setSidebar(u,t.sidebar),HB(e,n)});var f,d,m,g,p,h=CB.getSocket(u).getOrDie("Could not find expected socket element");PB&&(qi(h.element,{overflow:"scroll","-webkit-overflow-scrolling":"touch"}),m=function(){e.fire("ScrollContent")},g=20,p=null,f={cancel:function(){null!==p&&(clearTimeout(p),p=null)},throttle:function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];null===p&&(p=setTimeout(function(){m.apply(null,t),p=null},g))}},d=Sy(h.element,"scroll",f.throttle),e.on("remove",d.unbind)),zv(e,n),e.addCommand("ToggleSidebar",function(t,n){CB.toggleSidebar(u,n),e.fire("ToggleSidebar")}),e.addQueryValueHandler("ToggleSidebar",function(){return CB.whichSidebar(u)});var v=Tv(e);v!==oh.sliding&&v!==oh.floating||e.on("ResizeWindow ResizeEditor ResizeContent",function(){var t=e.getWin().innerWidth;t!==i.get()&&(CB.refreshToolbar(n.outerContainer),i.set(t))});var b={enable:function(){Hv(n,!1)},disable:function(){Hv(n,!0)},isDisabled:function(){return mv.isDisabled(u)}};return{iframeContainer:h.element.dom,editorContainer:u.element.dom,api:b}}}),NB=function(t){return/^[0-9\.]+(|px)$/i.test(""+t)?ft.some(parseInt(""+t,10)):ft.none()},LB=function(t){return dt(t)?t+"px":t},jB=function(n,t,e){var o=t.filter(function(t){return n<t}),r=e.filter(function(t){return t<n});return o.or(r).getOr(n)},UB=function(t){var n,e,o,r;return(e=pv(n=t),o=bv(n),r=xv(n),NB(e).map(function(t){return jB(t,o,r)})).getOr(pv(t))},WB=function(t){var n=hv(t),e=vv(t),o=yv(t);return NB(n).map(function(t){return jB(t,e,o)})},GB=function(a,c,t,n,s){var e=t.uiMothership,l=t.outerContainer,o=Qh.DOM,f=Mv(a),d=Rv(a),m=yv(a).or(WB(a)),r=n.shared.header,g=r.isPositionedAtTop,i=Tv(a),p=i===oh.sliding||i===oh.floating,u=fe(!1),h=function(){return u.get()&&!a.removed},v=function(t){return p?t.fold(function(){return 0},function(t){return 1<t.components().length?vu(t.components()[1].element):0}):0},b=function(){e.broadcastOn([kl()],{})},y=function(t){var n,e,o,r,i,u;void 0===t&&(t=!1),h()&&(f||(n=m.getOrThunk(function(){var t=NB(Ji(Ui(),"margin-left")).getOr(0);return Ou(Ui())-Su(c).left+t}),Yi(s.get().element,"max-width",n+"px")),p&&CB.refreshToolbar(l),f||(e=CB.getToolbar(l),o=v(e),r=Hu(c),i=g()?Math.max(r.y-vu(s.get().element)+o,0):r.bottom,qi(l.element,{position:"absolute",top:Math.round(i)+"px",left:Math.round(r.x)+"px"})),d&&(u=s.get(),t?XD.reset(u):XD.refresh(u)),b())},x=function(t){var n,e;void 0===t&&(t=!0),!f&&d&&h()&&(n=r.getDockingMode(),(e=function(t){switch(Dv(a)){case Ov.auto:var n=CB.getToolbar(l),e=v(n),o=vu(t.element)-e,r=Hu(c);if(r.y>o)return"top";var i=wr(c),u=Math.max(i.dom.scrollHeight,vu(i));return r.bottom<u-o||Nu().bottom<r.bottom-o?"bottom":"top";case Ov.bottom:return"bottom";case Ov.top:default:return"top"}}(s.get()))!==n&&(function(t){var n=s.get();XD.setModes(n,[t]),r.setDockingMode(t);var e=g()?ta.TopToBottom:ta.BottomToTop;Yr(n.element,Xc,e)}(e),t&&y(!0)))};return{isVisible:h,isPositionedAtTop:g,show:function(){u.set(!0),Yi(l.element,"display","flex"),o.addClass(a.getBody(),"mce-edit-focus"),tu(e.element,"display"),x(!1),y()},hide:function(){u.set(!1),t.outerContainer&&(Yi(l.element,"display","none"),o.removeClass(a.getBody(),"mce-edit-focus")),Yi(e.element,"display","none")},update:y,updateMode:x,repositionPopups:b}},XB=function(t,n){var e=Hu(t);return{pos:n?e.y:e.bottom,bounds:e}},YB=/* */Object.freeze({__proto__:null,render:function(n,e,o,r,t){var i=e.mothership,u=e.uiMothership,a=e.outerContainer,c=fe(null),s=me.fromDom(t.targetNode),l=GB(n,s,e,r,c),f=n.getParam("toolbar_persist",!1,"boolean");IB(n);var d=function(){var t;c.get()?l.show():(c.set(CB.getHeader(a).getOrDie()),t=Fv(n),sl(t,i),sl(t,u),RB(n,e,o,r),CB.setMenubar(a,TB(n,o)),l.show(),function(c,s,l,t){var f=fe(XB(s,l.isPositionedAtTop())),n=function(t){var n=XB(s,l.isPositionedAtTop()),e=n.pos,o=n.bounds,r=f.get(),i=r.pos,u=r.bounds,a=o.height!==u.height||o.width!==u.width;f.set({pos:e,bounds:o}),a&&Mb(c,t),l.isVisible()&&(i!==e?l.update(!0):a&&(l.updateMode(),l.repositionPopups()))};t||(c.on("activate",l.show),c.on("deactivate",l.hide)),c.on("SkinLoaded ResizeWindow",function(){return l.update(!0)}),c.on("NodeChange keydown",function(t){fp.requestAnimationFrame(function(){return n(t)})}),c.on("ScrollWindow",function(){return l.updateMode()});var e=eD();e.set(ky(me.fromDom(c.getBody()),"load",n)),c.on("remove",function(){e.clear()})}(n,s,l,f),n.nodeChanged())};n.on("show",d),n.on("hide",l.hide),f||(n.on("focus",d),n.on("blur",l.hide)),n.on("init",function(){(n.hasFocus()||f)&&d()}),zv(n,e);var m={show:function(){l.show()},hide:function(){l.hide()},enable:function(){Hv(e,!1)},disable:function(){Hv(e,!0)},isDisabled:function(){return mv.isDisabled(a)}};return{editorContainer:a.element.dom,api:m}}}),qB=function(t,n){var e,o,r,i,u,a,c,s,l,f,d,m,g,p;r=IE(0,o=n,WE(e=t)),e.ui.registry.addNestedMenuItem("align",{text:o.shared.providers.translate("Align"),getSubmenuItems:function(){return r.items.validateItems(r.getStyleItems())}}),a=IE(0,u=n,qE(i=t)),i.ui.registry.addNestedMenuItem("fontformats",{text:u.shared.providers.translate("Fonts"),getSubmenuItems:function(){return a.items.validateItems(a.getStyleItems())}}),c=t,l=lt({type:"advanced"},(s=n).styleselect),f=IE(0,s,uD(c,l)),c.ui.registry.addNestedMenuItem("formats",{text:"Formats",getSubmenuItems:function(){return f.items.validateItems(f.getStyleItems())}}),m=IE(0,n,iD(d=t)),d.ui.registry.addNestedMenuItem("blockformats",{text:"Blocks",getSubmenuItems:function(){return m.items.validateItems(m.getStyleItems())}}),p=IE(0,n,QE(g=t)),g.ui.registry.addNestedMenuItem("fontsizes",{text:"Font sizes",getSubmenuItems:function(){return p.items.validateItems(p.getStyleItems())}})},KB={unsupportedLength:["em","ex","cap","ch","ic","rem","lh","rlh","vw","vh","vi","vb","vmin","vmax","cm","mm","Q","in","pc","pt","px"],fixed:["px","pt"],relative:["%"],empty:[""]},JB=(PE="[eE][+-]?[0-9]+",zE=["Infinity",(VE="[0-9]+")+"\\."+(HE=function(t){return"(?:"+t+")?"})(VE)+HE(PE),"\\."+VE+HE(PE),VE+HE(PE)].join("|"),new RegExp("^([+-]?(?:"+zE+"))(.*)$")),$B=function(t,r){return ft.from(JB.exec(t)).bind(function(t){var n,e=Number(t[1]),o=t[2];return n=o,F(r,function(t){return F(KB[t],function(t){return n===t})})?ft.some({value:e,unit:o}):ft.none()})},QB=function(t){return $B(t,["fixed","relative","empty"]).map(function(t){return t.value+t.unit}).getOr(t)},ZB=function(o){var r=o.getParam("lineheight_formats","1 1.1 1.2 1.3 1.4 1.5 2","string").split(" "),i=new Map,u=nD(),a=function(){var t=QB(o.queryCommandValue("LineHeight"));ft.from(i.get(t)).fold(function(){return u.clear()},function(t){u.set({destroy:function(){t.setActive(!1)}}),t.setActive(!0)})};return o.on("nodeChange",a),V(r,function(n,e){return{type:"togglemenuitem",text:n,onSetup:function(t){return i.set(QB(n),t),e+1===r.length&&a(),function(){0===e&&(o.off("nodeChange",a),u.clear())}},onAction:function(){return o.execCommand("LineHeight",!1,n)}}})},tA=function(t){var n,e;(n=t).ui.registry.addNestedMenuItem("lineheight",{type:"nestedmenuitem",text:"Line height",getSubmenuItems:function(){return ZB(n)}}),(e=t).ui.registry.addMenuButton("lineheight",{tooltip:"Line height",icon:"line-height",fetch:function(t){return t(ZB(e))}})},nA=function(t,n){return function(){t.execCommand("mceToggleFormat",!1,n)}},eA=function(t){var n,e;!function(e){fk.each([{name:"bold",text:"Bold",icon:"bold"},{name:"italic",text:"Italic",icon:"italic"},{name:"underline",text:"Underline",icon:"underline"},{name:"strikethrough",text:"Strikethrough",icon:"strike-through"},{name:"subscript",text:"Subscript",icon:"subscript"},{name:"superscript",text:"Superscript",icon:"superscript"}],function(t,n){e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onSetup:oD(e,t.name),onAction:nA(e,t.name)})});for(var t=1;t<=6;t++){var n="h"+t;e.ui.registry.addToggleButton(n,{text:n.toUpperCase(),tooltip:"Heading "+t,onSetup:oD(e,n),onAction:nA(e,n)})}}(t),n=t,fk.each([{name:"cut",text:"Cut",action:"Cut",icon:"cut"},{name:"copy",text:"Copy",action:"Copy",icon:"copy"},{name:"paste",text:"Paste",action:"Paste",icon:"paste"},{name:"help",text:"Help",action:"mceHelp",icon:"help"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all"},{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document"},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting"},{name:"remove",text:"Remove",action:"Delete",icon:"remove"}],function(t){n.ui.registry.addButton(t.name,{tooltip:t.text,icon:t.icon,onAction:function(){return n.execCommand(t.action)}})}),e=t,fk.each([{name:"blockquote",text:"Blockquote",action:"mceBlockQuote",icon:"quote"}],function(t){e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onAction:function(){return e.execCommand(t.action)},onSetup:oD(e,t.name)})})},oA=function(t){var n;eA(t),n=t,fk.each([{name:"bold",text:"Bold",action:"Bold",icon:"bold",shortcut:"Meta+B"},{name:"italic",text:"Italic",action:"Italic",icon:"italic",shortcut:"Meta+I"},{name:"underline",text:"Underline",action:"Underline",icon:"underline",shortcut:"Meta+U"},{name:"strikethrough",text:"Strikethrough",action:"Strikethrough",icon:"strike-through",shortcut:""},{name:"subscript",text:"Subscript",action:"Subscript",icon:"subscript",shortcut:""},{name:"superscript",text:"Superscript",action:"Superscript",icon:"superscript",shortcut:""},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting",shortcut:""},{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document",shortcut:""},{name:"cut",text:"Cut",action:"Cut",icon:"cut",shortcut:"Meta+X"},{name:"copy",text:"Copy",action:"Copy",icon:"copy",shortcut:"Meta+C"},{name:"paste",text:"Paste",action:"Paste",icon:"paste",shortcut:"Meta+V"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all",shortcut:"Meta+A"}],function(t){n.ui.registry.addMenuItem(t.name,{text:t.text,icon:t.icon,shortcut:t.shortcut,onAction:function(){return n.execCommand(t.action)}})}),n.ui.registry.addMenuItem("codeformat",{text:"Code",icon:"sourcecode",onAction:nA(n,"code")})},rA=function(t,n,e){var o=function(){return!!n.undoManager&&n.undoManager[e]()},r=function(){t.setDisabled(n.mode.isReadOnly()||!o())};return t.setDisabled(!o()),n.on("Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",r),function(){return n.off("Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",r)}},iA=function(t){var n,e;(n=t).ui.registry.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onSetup:function(t){return rA(t,n,"hasUndo")},onAction:function(){return n.execCommand("undo")}}),n.ui.registry.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onSetup:function(t){return rA(t,n,"hasRedo")},onAction:function(){return n.execCommand("redo")}}),(e=t).ui.registry.addButton("undo",{tooltip:"Undo",icon:"undo",onSetup:function(t){return rA(t,e,"hasUndo")},onAction:function(){return e.execCommand("undo")}}),e.ui.registry.addButton("redo",{tooltip:"Redo",icon:"redo",onSetup:function(t){return rA(t,e,"hasRedo")},onAction:function(){return e.execCommand("redo")}})},uA=function(t,n){var e,o,r,i;!function(n){fk.each([{name:"alignleft",text:"Align left",cmd:"JustifyLeft",icon:"align-left"},{name:"aligncenter",text:"Align center",cmd:"JustifyCenter",icon:"align-center"},{name:"alignright",text:"Align right",cmd:"JustifyRight",icon:"align-right"},{name:"alignjustify",text:"Justify",cmd:"JustifyFull",icon:"align-justify"}],function(t){n.ui.registry.addToggleButton(t.name,{tooltip:t.text,onAction:function(){return n.execCommand(t.cmd)},icon:t.icon,onSetup:oD(n,t.name)})});var t="alignnone",e="No alignment",o="JustifyNone",r="align-none";n.ui.registry.addButton(t,{tooltip:e,onAction:function(){return n.execCommand(o)},icon:r})}(t),oA(t),qB(t,n),iA(t),function(t){Ub(t);var n=fe(null),e=fe(null);Kb(t,"forecolor","forecolor","Text color",n),Kb(t,"backcolor","hilitecolor","Background color",e),Jb(t,"forecolor","forecolor","Text color"),Jb(t,"backcolor","hilitecolor","Background color")}(t),(o=e=t).ui.registry.addButton("visualaid",{tooltip:"Visual aids",text:"Visual aids",onAction:function(){return o.execCommand("mceToggleVisualAid")}}),(r=e).ui.registry.addToggleMenuItem("visualaid",{text:"Visual aids",onSetup:function(t){return function(n,t){n.setActive(t.hasVisual);var e=function(t){n.setActive(t.hasVisual)};return t.on("VisualAid",e),function(){return t.off("VisualAid",e)}}(t,r)},onAction:function(){r.execCommand("mceToggleVisualAid")}}),(i=t).ui.registry.addButton("outdent",{tooltip:"Decrease indent",icon:"outdent",onSetup:function(t){return function(t,n){t.setDisabled(!n.queryCommandState("outdent"));var e=function(){t.setDisabled(!n.queryCommandState("outdent"))};return n.on("NodeChange",e),function(){return n.off("NodeChange",e)}}(t,i)},onAction:function(){return i.execCommand("outdent")}}),i.ui.registry.addButton("indent",{tooltip:"Increase indent",icon:"indent",onAction:function(){return i.execCommand("indent")}}),tA(t)},aA=function(t,n){return{anchor:"makeshift",x:t,y:n}},cA=function(t){return"longpress"===t.type||0===t.type.indexOf("touch")},sA=function(t,n){var e,o,r,i=Qh.DOM.getPos(t);return e=n,o=i.x,r=i.y,aA(e.x+o,e.y+r)},lA=function(t,n){return"contextmenu"===n.type||"longpress"===n.type?t.inline?function(t){if(cA(t)){var n=t.touches[0];return aA(n.pageX,n.pageY)}return aA(t.pageX,t.pageY)}(n):sA(t.getContentAreaContainer(),function(t){if(cA(t)){var n=t.touches[0];return aA(n.clientX,n.clientY)}return aA(t.clientX,t.clientY)}(n)):fA(t)},fA=function(t){return{anchor:"selection",root:me.fromDom(t.selection.getNode())}},dA=function(t){return{anchor:"node",node:ft.some(me.fromDom(t.selection.getNode())),root:me.fromDom(t.getBody())}},mA=function(t,n,e,o,r,i){var u=e(),a=i?dA(t):lA(t,n);NC(u,ih.CLOSE_ON_EXECUTE,o,!1).map(function(t){n.preventDefault(),Zg.showMenuAt(r,a,{menu:{markers:bh("normal")},data:t})})},gA={onLtr:function(){return[ja,Pa,Ha,za,Na,La,sp,lp,ap,ip,cp,up]},onRtl:function(){return[ja,Ha,Pa,Na,za,La,sp,lp,cp,up,ap,ip]}},pA={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"]},hA=function(n,e,t,o,r,i,u){var a,c,s=i?dA(n):(a=n,c=e,lt({bubble:Pc(0,12,pA),layouts:gA,overrides:{maxWidthFunction:K_(),maxHeightFunction:Mc()}},lA(a,c)));NC(t,ih.CLOSE_ON_EXECUTE,o,!0).map(function(t){e.preventDefault(),Zg.showMenuWithinBounds(r,s,{menu:{markers:bh("normal"),highlightImmediately:u},data:t,type:"horizontal"},function(){return ft.some(OE(n,o.shared))}),n.fire(J_)})},vA=function(n,e,o,r,i,u){var t,a=je(),c=a.os.isiOS(),s=a.os.isOSX(),l=a.os.isAndroid(),f=a.deviceType.isTouch(),d=function(){var t=o();hA(n,e,t,r,i,u,!(l||c||s&&f))};!s&&!c||u?(l&&!u&&n.selection.setCursorLocation(e.target,0),d()):(t=function(){!function(t){var n=t.selection.getRng(),e=function(){fp.setEditorTimeout(t,function(){t.selection.setRng(n)},10),i()};t.once("touchend",e);var o=function(t){t.preventDefault(),t.stopImmediatePropagation()};t.on("mousedown",o,!0);var r=function(){return i()};t.once("longpresscancel",r);var i=function(){t.off("touchend",e),t.off("longpresscancel",r),t.off("mousedown",o)}}(n),d()},!function(t,n){var e=t.selection;if(e.isCollapsed()||n.touches.length<1)return!1;var o=n.touches[0],r=e.getRng();return Bs(t.getWin(),ms.domRange(r)).exists(function(t){return t.left<=o.clientX&&t.right>=o.clientX&&t.top<=o.clientY&&t.bottom>=o.clientY})}(n,e)?(n.once("selectionchange",t),n.once("touchend",function(){return n.off("selectionchange",t)})):t())},bA=function(t){return"string"==typeof t?t.split(/[ ,]/):t},yA=function(t){return t.getParam("contextmenu_never_use_native",!1,"boolean")},xA=function(t){return e="contextmenu",o="link linkchecker image imagetools table spellchecker configurepermanentpen",r=(n=t).ui.registry.getAll().contextMenus,ft.from(n.getParam(e)).map(bA).getOrThunk(function(){return H(bA(o),function(t){return It(r,t)})});var n,e,o,r},wA=function(t){return C(t)?"|"===t:"separator"===t.type},SA={type:"separator"},kA=function(n){var t,e=function(t){return{text:t.text,icon:t.icon,disabled:t.disabled,shortcut:t.shortcut}};if(C(n))return n;switch(n.type){case"separator":return SA;case"submenu":return lt(lt({type:"nestedmenuitem"},e(n)),{getSubmenuItems:function(){var t=n.getSubmenuItems();return C(t)?t:V(t,kA)}});default:return lt(lt({type:"menuitem"},e(n)),{onAction:(t=n.onAction,function(){return t()})})}},CA=function(t,n){if(0===n.length)return t;var e=J(t).filter(function(t){return!wA(t)}).fold(function(){return[]},function(t){return[SA]});return t.concat(e).concat(n).concat([SA])},OA=function(t,n){return"longpress"!==n.type&&(2!==n.button||n.target===t.getBody()&&""===n.pointerType)},_A=function(t,n){return OA(t,n)?t.selection.getStart(!0):n.target},TA=function(a,t,e){var o=je().deviceType.isTouch,r=mu(Zg.sketch({dom:{tag:"div"},lazySink:t,onEscape:function(){return a.focus()},onShow:function(){return e.setContextMenuState(!0)},onHide:function(){return e.setContextMenuState(!1)},fireDismissalEventInstead:{},inlineBehaviours:rc([fg("dismissContextMenu",[er(zo(),function(t,n){wl.close(t),a.focus()})])])})),n=function(t){return Zg.hide(r)},i=function(u){var t,n;yA(a)&&u.preventDefault(),t=a,u.ctrlKey&&!yA(t)||!1===a.getParam("contextmenu")||(n=function(t,n){var e=t.getParam("contextmenu_avoid_overlap","","string");if(OA(t,n))return!0;if(e){var o=_A(t,n);return Oy(me.fromDom(o),e)}return!1}(a,u),(o()?vA:mA)(a,u,function(){var n,r,t,e=_A(a,u),o=a.ui.registry.getAll(),i=xA(a);return n=o.contextMenus,r=e,0<(t=N(i,function(o,t){return Ft(n,t.toLowerCase()).map(function(t){var n=t.update(r);if(C(n))return CA(o,n.split(" "));if(0<n.length){var e=V(n,kA);return CA(o,e)}return o}).getOrThunk(function(){return o.concat([t])})},[])).length&&wA(t[t.length-1])&&t.pop(),t},e,r,n))};a.on("init",function(){var t="ResizeEditor ScrollContent ScrollWindow longpresscancel"+(o()?"":" ResizeWindow");a.on(t,n),a.on("longpress contextmenu",i)})},EA=Vt([{offset:["x","y"]},{absolute:["x","y"]},{fixed:["x","y"]}]),DA=function(n){return function(t){return t.translate(-n.left,-n.top)}},BA=function(n){return function(t){return t.translate(n.left,n.top)}},AA=function(e){return function(t,n){return N(e,function(t,n){return n(t)},xu(t,n))}},MA=function(t,n,e){return t.fold(AA([BA(e),DA(n)]),AA([DA(n)]),AA([]))},FA=function(t,n,e){return t.fold(AA([BA(e)]),AA([]),AA([BA(n)]))},IA=function(t,n,e){return t.fold(AA([]),AA([DA(e)]),AA([BA(n),DA(e)]))},RA=function(t,n,e){var o=t.fold(function(t,n){return{position:ft.some("absolute"),left:ft.some(t+"px"),top:ft.some(n+"px")}},function(t,n){return{position:ft.some("absolute"),left:ft.some(t-e.left+"px"),top:ft.some(n-e.top+"px")}},function(t,n){return{position:ft.some("fixed"),left:ft.some(t+"px"),top:ft.some(n+"px")}});return lt({right:ft.none(),bottom:ft.none()},o)},VA=function(t,i,u,a){var n=function(o,r){return function(t,n){var e=o(i,u,a);return r(t.getOr(e.left),n.getOr(e.top))}};return t.fold(n(IA,PA),n(FA,HA),n(MA,zA))},PA=EA.offset,HA=EA.absolute,zA=EA.fixed,NA=function(t,n){var e=qr(t,n);return h(e)?NaN:parseInt(e,10)},LA=function(t,n,e,o){return r=n,i=t.element,u=NA(i,r.leftAttr),a=NA(i,r.topAttr),(isNaN(u)||isNaN(a)?ft.none():ft.some(xu(u,a))).fold(function(){return e},function(t){return zA(t.left+o.left,t.top+o.top)});var r,i,u,a},jA=function(t,n,e,o,r,i){var u,a,c,s=LA(t,n,e,o),l=(n.mustSnap?GA:XA)(t,n,s,r,i),f=MA(s,r,i);return u=n,a=f,c=t.element,Yr(c,u.leftAttr,a.left+"px"),Yr(c,u.topAttr,a.top+"px"),l.fold(function(){return{coord:zA(f.left,f.top),extra:ft.none()}},function(t){return{coord:t.output,extra:t.extra}})},UA=function(t,n){var e,o;e=n,o=t.element,$r(o,e.leftAttr),$r(o,e.topAttr)},WA=function(t,l,f,d){return Q(t,function(t){var n,e,o,r,i,u,a,c,s=t.sensor;return(n=l,e=s,o=t.range.left,r=t.range.top,a=FA(n,i=f,u=d),c=FA(e,i,u),Math.abs(a.left-c.left)<=o&&Math.abs(a.top-c.top)<=r)?ft.some({output:VA(t.output,l,f,d),extra:t.extra}):ft.none()})},GA=function(t,n,d,m,g){var e=n.getSnapPoints(t);return WA(e,d,m,g).orThunk(function(){return N(e,function(n,e){var t,o,r,i,u,a,c,s,l=e.sensor,f=(t=d,o=l,e.range.left,e.range.top,u=FA(t,r=m,i=g),a=FA(o,r,i),c=Math.abs(u.left-a.left),s=Math.abs(u.top-a.top),xu(c,s));return n.deltas.fold(function(){return{deltas:ft.some(f),snap:ft.some(e)}},function(t){return(f.left+f.top)/2<=(t.left+t.top)/2?{deltas:ft.some(f),snap:ft.some(e)}:n})},{deltas:ft.none(),snap:ft.none()}).snap.map(function(t){return{output:VA(t.output,d,m,g),extra:t.extra}})})},XA=function(t,n,e,o,r){var i=n.getSnapPoints(t);return WA(i,e,o,r)},YA=/* */Object.freeze({__proto__:null,snapTo:function(t,n,e,o){var r,i,u,a,c,s,l,f,d=n.getTarget(t.element);n.repositionTarget&&(r=yr(t.element),i=Bu(r),u=ED(d),l=i,f=u,a={coord:VA((s=o).output,s.output,l,f),extra:s.extra},c=RA(a.coord,0,u),Ki(d,c))}}),qA="data-initial-z-index",KA=function(t,n){var e;t.getSystem().addToGui(n),kr((e=n).element).filter(pr).each(function(n){Qi(n,"z-index").each(function(t){Yr(n,qA,t)}),Yi(n,"z-index",Ji(e.element,"z-index"))})},JA=function(t){kr(t.element).filter(pr).each(function(n){Kr(n,qA).fold(function(){return tu(n,"z-index")},function(t){return Yi(n,"z-index",t)}),$r(n,qA)}),t.getSystem().removeFromGui(t)},$A=function(t,n,e){return t.getSystem().build(Ny.sketch({dom:{styles:{left:"0px",top:"0px",width:"100%",height:"100%",position:"fixed","z-index":"1000000000000000"},classes:[n]},events:e}))},QA=te("snaps",[Ln("getSnapPoints"),ma("onSensor"),Ln("leftAttr"),Ln("topAttr"),ne("lazyViewport",Nu),ne("mustSnap",!1)]),ZA=[ne("useFixed",l),Ln("blockerClass"),ne("getTarget",st),ne("onDrag",at),ne("repositionTarget",!0),ne("onDrop",at),ae("getBounds",Nu),QA],tM=function(n){return t=Qi(n,"left"),e=Qi(n,"top"),o=Qi(n,"position"),r=function(t,n,e){return("fixed"===e?zA:PA)(parseInt(t,10),parseInt(n,10))},(t.isSome()&&e.isSome()&&o.isSome()?ft.some(r(t.getOrDie(),e.getOrDie(),o.getOrDie())):ft.none()).getOrThunk(function(){var t=Su(n);return HA(t.left,t.top)});var t,e,o,r},nM=function(e,t,i,u,a,c,n){var o,r,s,l,f,d,m,g,p,h=t.fold(function(){var t,e,o,n=(t=i,e=c.left,o=c.top,t.fold(function(t,n){return PA(t+e,n+o)},function(t,n){return HA(t+e,n+o)},function(t,n){return zA(t+e,n+o)})),r=MA(n,u,a);return zA(r.left,r.top)},function(n){var t=jA(e,n,i,c,u,a);return t.extra.each(function(t){n.onSensor(e,t)}),t.coord});return o=h,r=u,s=a,f=(l=n).bounds,d=FA(o,r,s),m=Oc(d.left,f.x,f.x+f.width-l.width),g=Oc(d.top,f.y,f.y+f.height-l.height),p=HA(m,g),o.fold(function(){var t=IA(p,r,s);return PA(t.left,t.top)},function(){return p},function(){var t=MA(p,r,s);return zA(t.left,t.top)})},eM=function(t,n){return{bounds:t.getBounds(),height:bu(n.element),width:_u(n.element)}},oM=function(d,m,t,n,e){var o=t.update(n,e),g=t.getStartData().getOrThunk(function(){return eM(m,d)});o.each(function(t){var n,e,o,r,i,u,a,c,s,l,f;n=d,o=g,r=t,f=(e=m).getTarget(n.element),e.repositionTarget&&(i=yr(n.element),u=Bu(i),a=ED(f),c=tM(f),s=nM(n,e.snaps,c,u,a,r,o),l=RA(s,0,a),Ki(f,l)),e.onDrag(n,f,r)})},rM=function(n,t,e,o){t.each(JA),e.snaps.each(function(t){UA(n,t)});var r=e.getTarget(n.element);o.reset(),e.onDrop(n,r)},iM=function(t){return function(n,e){var o=function(t){e.setStartData(eM(n,t))};return Zo(k([er(Ro(),function(t){e.getStartData().each(function(){return o(t)})})],t(n,e,o)))}},uM=/* */Object.freeze({__proto__:null,getData:function(t){return ft.from(xu(t.x,t.y))},getDelta:function(t,n){return xu(n.left-t.left,n.top-t.top)}}),aM=function(a,c,s){return[er(io(),function(n,t){var e,o,r,i,u;0===t.event.raw.button&&(t.stop(),r={drop:e=function(){return rM(n,ft.some(i),a,c)},delayDrop:(o=_y(e,200)).schedule,forceDrop:e,move:function(t){o.cancel(),oM(n,a,c,uM,t)}},i=$A(n,a.blockerClass,(u=r,Zo([er(io(),u.forceDrop),er(co(),u.drop),er(uo(),function(t,n){u.move(n.event)}),er(ao(),u.delayDrop)]))),s(n),KA(n,i))})]},cM=k(ZA,[va("dragger",{handlers:iM(aM)})]),sM=/* */Object.freeze({__proto__:null,getData:function(t){var n,e=t.raw.touches;return 1===e.length?(n=e[0],ft.some(xu(n.clientX,n.clientY))):ft.none()},getDelta:function(t,n){return xu(n.left-t.left,n.top-t.top)}}),lM=function(u,a,c){var s=fe(ft.none());return[er(no(),function(n,t){t.stop();var e,o=function(){rM(n,s.get(),u,a),s.set(ft.none())},r={drop:o,delayDrop:at,forceDrop:o,move:function(t){oM(n,u,a,sM,t)}},i=$A(n,u.blockerClass,(e=r,Zo([er(no(),e.forceDrop),er(oo(),e.drop),er(ro(),e.drop),er(eo(),function(t,n){e.move(n.event)})])));s.set(ft.some(i));c(n),KA(n,i)}),er(eo(),function(t,n){n.stop(),oM(t,u,a,sM,n.event)}),er(oo(),function(t,n){n.stop(),rM(t,s.get(),u,a),s.set(ft.none())}),er(ro(),function(t){rM(t,s.get(),u,a),s.set(ft.none())})]},fM=k(ZA,[va("dragger",{handlers:iM(lM)})]),dM=k(ZA,[va("dragger",{handlers:iM(function(t,n,e){return k(aM(t,n,e),lM(t,n,e))})})]),mM=cc({branchKey:"mode",branches:/* */Object.freeze({__proto__:null,mouse:cM,touch:fM,mouseOrTouch:dM}),name:"dragging",active:{events:function(t,n){return t.dragger.handlers(t,n)}},extra:{snap:function(t){return{sensor:t.sensor,range:t.range,output:t.output,extra:ft.from(t.extra)}}},state:/* */Object.freeze({__proto__:null,init:function(){var i=ft.none(),n=ft.none(),t=ct({});return xi({readState:t,reset:function(){i=ft.none(),n=ft.none()},update:function(r,t){return r.getData(t).bind(function(t){return n=r,e=t,o=i.map(function(t){return n.getDelta(t,e)}),i=ft.some(e),o;var n,e,o})},getStartData:function(){return n},setStartData:function(t){n=ft.some(t)}})}}),apis:YA}),gM=function(t,r,i,u,n,e){return t.fold(function(){return mM.snap({sensor:HA(i-20,u-20),range:xu(n,e),output:HA(ft.some(i),ft.some(u)),extra:{td:r}})},function(t){var n=i-20,e=u-20,o=t.element.dom.getBoundingClientRect();return mM.snap({sensor:HA(n,e),range:xu(40,40),output:HA(ft.some(i-o.width/2),ft.some(u-o.height/2)),extra:{td:r}})})},pM=function(t,i,u){return{getSnapPoints:t,leftAttr:"data-drag-left",topAttr:"data-drag-top",onSensor:function(t,n){var e,o,r=n.td;e=i.get(),o=r,e.exists(function(t){return Ge(t,o)})||(i.set(ft.some(r)),u(r))},mustSnap:!0}},hM=function(t){return mp(dp.sketch({dom:{tag:"div",classes:["tox-selector"]},buttonBehaviours:rc([mM.config({mode:"mouseOrTouch",blockerClass:"blocker",snaps:t}),rw.config({})]),eventOrder:{mousedown:["dragging","alloy.base.behaviour"],touchstart:["dragging","alloy.base.behaviour"]}}))},vM=function(c,e){var o=fe([]),r=fe([]),t=fe(!1),i=fe(ft.none()),u=fe(ft.none()),n=function(t){var n=zu(t);return gM(f.getOpt(e),t,n.x,n.y,n.width,n.height)},a=function(t){var n=zu(t);return gM(d.getOpt(e),t,n.right,n.bottom,n.width,n.height)},s=pM(function(){return V(o.get(),n)},i,function(n){u.get().each(function(t){c.fire("TableSelectorChange",{start:n,finish:t})})}),l=pM(function(){return V(r.get(),a)},u,function(n){i.get().each(function(t){c.fire("TableSelectorChange",{start:t,finish:n})})}),f=hM(s),d=hM(l),m=mu(f.asSpec()),g=mu(d.asSpec()),p=function(t,n,e,o){var r=e(n);mM.snapTo(t,r);!function(t,n,e,o){var r=n.dom.getBoundingClientRect();tu(t.element,"display");var i=Sr(me.fromDom(c.getBody())).dom.innerHeight,u=e(r),a=o(r,i);(u||a)&&Yi(t.element,"display","none")}(t,n,function(t){return t[o]<0},function(t,n){return t[o]>n})},h=function(t){return p(m,t,n,"top")},v=function(t){return p(g,t,a,"bottom")};je().deviceType.isTouch()&&(c.on("TableSelectionChange",function(n){t.get()||(rl(e,m),rl(e,g),t.set(!0)),i.set(ft.some(n.start)),u.set(ft.some(n.finish)),n.otherCells.each(function(t){o.set(t.upOrLeftCells),r.set(t.downOrRightCells),h(n.start),v(n.finish)})}),c.on("ResizeEditor ResizeWindow ScrollContent",function(){i.get().each(h),u.get().each(v)}),c.on("TableSelectionClear",function(){t.get()&&(al(m),al(g),t.set(!1)),i.set(ft.none()),u.set(ft.none())}))};(LE=NE=NE||{})[LE.None=0]="None",LE[LE.Both=1]="Both",LE[LE.Vertical=2]="Vertical";var bM,yM,xM,wM=function(t,n,e){var o,r,i,u,a,c,s=me.fromDom(t.getContainer()),l=(o=t,r=n,i=e,u=vu(s),a=Ou(s),(c={}).height=jB(u+r.top,bv(o),xv(o)),i===NE.Both&&(c.width=jB(a+r.left,vv(o),yv(o))),c);_t(l,function(t,n){return Yi(s,n,LB(t)),0}),t.fire("ResizeEditor")},SM=function(i,u,a){u.delimiter||(u.delimiter="\xbb");return{dom:{tag:"div",classes:["tox-statusbar__path"],attributes:{role:"navigation"}},behaviours:rc([ig.config({mode:"flow",selector:"div[role=button]"}),mv.config({disabled:a.isDisabled}),Nv(),Yy.config({}),lg.config({}),fg("elementPathEvents",[sr(function(r,t){i.shortcuts.add("alt+F11","focus statusbar elementpath",function(){return ig.focusIn(r)}),i.on("NodeChange",function(t){var n,o,e=function(t){for(var n=[],e=t.length;0<e--;){var o=t[e];if(1===o.nodeType&&!function(t){if(1===t.nodeType){if("BR"===t.nodeName||t.getAttribute("data-mce-bogus"))return!0;if("bookmark"===t.getAttribute("data-mce-type"))return!0}return!1}(o)){var r=i.fire("ResolveName",{name:o.nodeName.toLowerCase(),target:o});if(r.isDefaultPrevented()||n.push({name:r.name,element:o}),r.isPropagationStopped())break}}return n}(t.parents);0<e.length?lg.set(r,(n=V(e||[],function(n,t){return dp.sketch({dom:{tag:"div",classes:["tox-statusbar__path-item"],attributes:{role:"button","data-index":t,"tab-index":-1,"aria-level":t+1},innerHtml:n.name},action:function(t){i.focus(),i.selection.select(n.element),i.nodeChanged()},buttonBehaviours:rc([jv(a.isDisabled),Nv()])})}),o={dom:{tag:"div",classes:["tox-statusbar__path-divider"],attributes:{"aria-hidden":!0},innerHtml:" "+u.delimiter+" "}},N(n.slice(1),function(t,n){var e=t;return e.push(o),e.push(n),e},[n[0]]))):lg.set(r,[])})})])]),components:[]}},kM=function(u,a){var t,n,e,o,r,i;return{dom:{tag:"div",classes:["tox-statusbar"]},components:(r=function(){var t,o,n,r,e,i=[];return u.getParam("elementpath",!0,"boolean")&&i.push(SM(u,{},a)),u.hasPlugin("wordcount")&&i.push((t=u,o=a,r=function(t,n,e){return lg.set(t,[lu(o.translate(["{0} "+e,n[e]]))])},dp.sketch({dom:{tag:"button",classes:["tox-statusbar__wordcount"]},components:[],buttonBehaviours:rc([jv(o.isDisabled),Nv(),Yy.config({}),lg.config({}),Ll.config({store:{mode:"memory",initialValue:{mode:"words",count:{words:0,characters:0}}}}),fg("wordcount-events",[dr(function(t){var n=Ll.getValue(t),e="words"===n.mode?"characters":"words";Ll.setValue(t,{mode:e,count:n.count}),r(t,n.count,e)}),sr(function(e){t.on("wordCountUpdate",function(t){var n=Ll.getValue(e).mode;Ll.setValue(e,{mode:n,count:t.wordCount}),r(e,t.wordCount,n)})})])]),eventOrder:((n={})[_o()]=["disabling","alloy.base.behaviour","wordcount-events"],n)}))),u.getParam("branding",!0,"boolean")&&i.push({dom:{tag:"span",classes:["tox-statusbar__branding"],innerHtml:'<a href="https://www.tiny.cloud/?utm_campaign=editor_referral&amp;utm_medium=poweredby&amp;utm_source=tinymce&amp;utm_content=v5" rel="noopener" target="_blank" tabindex="-1" aria-label="'+(e=Zh.translate(["Powered by {0}","Tiny"]))+'">'+e+"</a>"}}),0<i.length?[{dom:{tag:"div",classes:["tox-statusbar__text-container"]},components:i}]:[]}(),n=!(t=u).hasPlugin("autoresize"),(i=!1===(e=t.getParam("resize",n))?NE.None:"both"===e?NE.Both:NE.Vertical)!==NE.None&&r.push((o=i,{dom:{tag:"div",classes:["tox-statusbar__resize-handle"],attributes:{title:a.translate("Resize"),"aria-hidden":"true"},innerHtml:pp("resize-handle",a.icons)},behaviours:rc([mM.config({mode:"mouse",repositionTarget:!1,onDrag:function(t,n,e){wM(u,e,o)},blockerClass:"tox-blocker"})])})),r)}},CM=function(x){var t,n,e,o,r=x.inline,w=r?YB:zB,S=Rv(x)?tB:_D,i=ft.none(),u=je(),a=u.browser.isIE()?["tox-platform-ie"]:[],c=u.deviceType.isTouch()?["tox-platform-touch"]:[],s=Bv(x),l=Fv(x),f=Zh.isRtl()?{attributes:{dir:"rtl"}}:{},d={attributes:((t={})[Xc]=s?ta.BottomToTop:ta.TopToBottom,t)},k=function(){return i.bind(CB.getHeader)},m=function(){Yi(it.element,"width",document.body.clientWidth+"px")},C=mu((n=Ge(Ui(),l)&&"grid"===Ji(l,"display"),e={dom:lt({tag:"div",classes:["tox","tox-silver-sink","tox-tinymce-aux"].concat(a).concat(c)},f),behaviours:rc([Zs.config({useFixed:function(){return S.isDocked(k)}})])},o={dom:{styles:{width:document.body.clientWidth+"px"}},events:Zo([er(Vo(),m)])},zt(e,n?o:{}))),O=function(){return pt.value(C)},g=mp({dom:{tag:"div",classes:["tox-anchorbar"]}}),_=function(){return i.bind(function(t){return CB.getThrobber(t)}).getOrDie("Could not find throbber element")},T=q_(C,x,function(){return i.bind(function(t){return g.getOpt(t)}).getOrDie("Could not find a anchor bar element")}),p=CB.parts.menubar({dom:{tag:"div",classes:["tox-menubar"]},backstage:T,onEscape:function(){x.focus()}}),E=Tv(x),h=CB.parts.toolbar(lt({dom:{tag:"div",classes:["tox-toolbar"]},getSink:O,providers:T.shared.providers,onEscape:function(){x.focus()},type:E,lazyToolbar:function(){return i.bind(function(t){return CB.getToolbar(t)}).getOrDie("Could not find more toolbar element")},lazyHeader:function(){return k().getOrDie("Could not find header element")}},d)),v=CB.parts["multiple-toolbar"]({dom:{tag:"div",classes:["tox-toolbar-overlord"]},providers:T.shared.providers,onEscape:function(){x.focus()},type:E}),b=CB.parts.socket({dom:{tag:"div",classes:["tox-edit-area"]}}),y=CB.parts.sidebar({dom:{tag:"div",classes:["tox-sidebar"]}}),D=CB.parts.throbber({dom:{tag:"div",classes:["tox-throbber"]},backstage:T}),B=x.getParam("statusbar",!0,"boolean")&&!r?ft.some(kM(x,T.shared.providers)):ft.none(),A={dom:{tag:"div",classes:["tox-sidebar-wrap"]},components:[b,y]},M=Cv(x),F=Sv(x),I=wv(x),R=CB.parts.header({dom:lt({tag:"div",classes:["tox-editor-header"]},d),components:gt([I?[p]:[],M?[v]:F?[h]:[],Mv(x)?[]:[g.asSpec()]]),sticky:Rv(x),editor:x,sharedBackstage:T.shared}),V=gt([s?[]:[R],r?[]:[A],s?[R]:[]]),P=gt([[{dom:{tag:"div",classes:["tox-editor-container"]},components:V}],r?[]:B.toArray(),[D]]),H=Iv(x),z=lt(lt({role:"application"},Zh.isRtl()?{dir:"rtl"}:{}),H?{"aria-hidden":"true"}:{}),N=mu(CB.sketch({dom:{tag:"div",classes:["tox","tox-tinymce"].concat(r?["tox-tinymce-inline"]:[]).concat(s?["tox-tinymce--toolbar-bottom"]:[]).concat(c).concat(a),styles:lt({visibility:"hidden"},H?{opacity:"0",border:"0"}:{}),attributes:z},components:P,behaviours:rc([Nv(),mv.config({disableClass:"tox-tinymce--disabled"}),ig.config({mode:"cyclic",selector:".tox-menubar, .tox-toolbar, .tox-toolbar__primary, .tox-toolbar__overflow--open, .tox-sidebar__overflow--open, .tox-statusbar__path, .tox-statusbar__wordcount, .tox-statusbar__branding a"})])})),i=ft.some(N);x.shortcuts.add("alt+F9","focus menubar",function(){CB.focusMenubar(N)}),x.shortcuts.add("alt+F10","focus toolbar",function(){CB.focusToolbar(N)}),x.addCommand("ToggleToolbarDrawer",function(){CB.toggleToolbarDrawer(N)}),x.addQueryStateHandler("ToggleToolbarDrawer",function(){return CB.isToolbarDrawerToggled(N)});var L,j,U,W,G,X,Y,q,K,J,$,Q,Z,tt,nt,et,ot,rt=Ly(N),it=Ly(C);L=x,j=rt,U=it,W=function(n,e){mt([j,U],function(t){t.broadcastEvent(n,e)})},G=function(n,e){mt([j,U],function(t){t.broadcastOn([n],e)})},X=function(t){return G(Sl(),{target:t.target})},Y=Sy(me.fromDom(document),"touchstart",X),q=Sy(me.fromDom(document),"touchmove",function(t){return W(Fo(),t)}),K=Sy(me.fromDom(document),"touchend",function(t){return W(Io(),t)}),J=Sy(me.fromDom(document),"mousedown",X),$=Sy(me.fromDom(document),"mouseup",function(t){0===t.raw.button&&G(Cl(),{target:t.target})}),Q=function(t){return G(Sl(),{target:me.fromDom(t.target)})},Z=function(t){0===t.button&&G(Cl(),{target:me.fromDom(t.target)})},tt=function(t){return W(Ro(),Cy(t))},nt=function(t){G(kl(),{}),W(Vo(),Cy(t))},et=function(){return G(kl(),{})},ot=function(t){t.state&&G(Sl(),{target:me.fromDom(L.getContainer())})},L.on("PostRender",function(){L.on("click",Q),L.on("tap",Q),L.on("mouseup",Z),L.on("ScrollWindow",tt),L.on("ResizeWindow",nt),L.on("ResizeEditor",et),L.on("AfterProgressState",ot)}),L.on("remove",function(){L.off("click",Q),L.off("tap",Q),L.off("mouseup",Z),L.off("ScrollWindow",tt),L.off("ResizeWindow",nt),L.off("ResizeEditor",et),L.off("AfterProgressState",ot),J.unbind(),Y.unbind(),q.unbind(),K.unbind(),$.unbind()}),L.on("detach",function(){fl(j),fl(U),j.destroy(),U.destroy()});var ut=function(){var t,n=LB(UB(x)),e=LB(WB(t=x).getOr(hv(t)));return x.inline||(Zi("div","width",e)&&Yi(N.element,"width",e),Zi("div","height",n)?Yi(N.element,"height",n):Yi(N.element,"height","200px")),n};return{mothership:rt,uiMothership:it,backstage:T,renderUI:function(){var o,r,e,n,i,u,a,c;S.setup(x,T.shared,k),uA(x,T),TA(x,O,T),r=(o=x).ui.registry.getAll().sidebars,mt(Ct(r),function(n){var t=r[n],e=function(){return ft.from(o.queryCommandValue("ToggleSidebar")).is(n)};o.ui.registry.addToggleButton(n,{icon:t.icon,tooltip:t.tooltip,onAction:function(t){o.execCommand("ToggleSidebar",!1,n),t.setActive(e())},onSetup:function(t){var n=function(){return t.setActive(e())};return o.on("ToggleSidebar",n),function(){o.off("ToggleSidebar",n)}}})}),e=x,n=_,i=T.shared,u=fe(!1),a=fe(ft.none()),c=function(t){t!==u.get()&&(hB(n(),t,i.providers),u.set(t),e.fire("AfterProgressState",{state:t}))},e.on("ProgressState",function(t){var n;a.get().each(fp.clearTimeout),dt(t.time)?(n=fp.setEditorTimeout(e,function(){return c(t.state)},t.time),a.set(ft.some(n))):(c(t.state),a.set(ft.none()))}),Tt(x.getParam("toolbar_groups",{},"object"),function(t,n){x.ui.registry.addGroupToolbarButton(n,t)});var t,s=x.ui.registry.getAll(),l=s.buttons,f=s.menuItems,d=s.contextToolbars,m=s.sidebars,g=kv(x),p={menuItems:f,menus:(t=x.getParam("menu"))?Tt(t,function(t){return lt(lt({},t),{items:t.items})}):{},menubar:x.getParam("menubar"),toolbar:g.getOrThunk(function(){return x.getParam("toolbar",!0)}),allowToolbarGroups:E===oh.floating,buttons:l,sidebar:m};bD(x,d,C,{backstage:T}),vM(x,C);var h=x.getElement(),v=ut(),b={mothership:rt,uiMothership:it,outerContainer:N},y={targetNode:h,height:v};return w.render(x,b,p,T,y)},getUi:function(){return{channels:{broadcastAll:it.broadcast,broadcastOn:it.broadcastOn,register:at}}}}},OM=ct([Ln("lazySink"),Kn("dragBlockClass"),ae("getBounds",Nu),ne("useTabstopAt",w),ne("eventOrder",{}),jl("modalBehaviours",[ig]),ga("onExecute"),ha("onEscape")]),_M={sketch:st},TM=ct([xf({name:"draghandle",overrides:function(t,n){return{behaviours:rc([mM.config({mode:"mouse",getTarget:function(t){return Yu(t,'[role="dialog"]').getOr(t)},blockerClass:t.dragBlockClass.getOrDie(new Error("The drag blocker class was not specified for a dialog with a drag handle: \n"+JSON.stringify(n,null,2)).message),getBounds:t.getDragBounds})])}}}),bf({schema:[Ln("dom")],name:"title"}),bf({factory:_M,schema:[Ln("dom")],name:"close"}),bf({factory:_M,schema:[Ln("dom")],name:"body"}),xf({factory:_M,schema:[Ln("dom")],name:"footer"}),yf({factory:{sketch:function(t,n){return lt(lt({},t),{dom:n.dom,components:n.components})}},schema:[ne("dom",{tag:"div",styles:{position:"fixed",left:"0px",top:"0px",right:"0px",bottom:"0px"}}),ne("components",[])],name:"blocker"})]),EM=/* */Object.freeze({__proto__:null,block:function(t,n,e,o){Yr(t.element,"aria-busy",!0);var r=n.getRoot(t).getOr(t),i=rc([ig.config({mode:"special",onTab:function(){return ft.some(!0)},onShiftTab:function(){return ft.some(!0)}}),hg.config({})]),u=o(r,i),a=r.getSystem().build(u);lg.append(r,gu(a)),a.hasConfigured(ig)&&ig.focusIn(a),e.isBlocked()||n.onBlock(t),e.blockWith(function(){return lg.remove(r,a)})},unblock:function(t,n,e){$r(t.element,"aria-busy"),e.isBlocked()&&n.onUnblock(t),e.clear()}}),DM=[ae("getRoot",ft.none),ma("onBlock"),ma("onUnblock")],BM=uc({fields:DM,name:"blocking",apis:EM,state:/* */Object.freeze({__proto__:null,init:function(){var n=nD();return xi({readState:n.isSet,blockWith:function(t){n.set({destroy:t})},clear:n.clear,isBlocked:n.isSet})}})}),AM=Yf({name:"ModalDialog",configFields:OM(),partFields:TM(),factory:function(a,t,n,r){var e,i=fe(ft.none()),o=oi("modal-events"),u=lt(lt({},a.eventOrder),((e={})[Po()]=[o].concat(a.eventOrder["alloy.system.attached"]||[]),e));return{uid:a.uid,dom:a.dom,components:t,apis:{show:function(t){i.set(ft.some(t));var n=a.lazySink(t).getOrDie(),e=r.blocker(),o=n.getSystem().build(lt(lt({},e),{components:e.components.concat([gu(t)]),behaviours:rc([hg.config({}),fg("dialog-blocker-events",[cr(lo(),function(){ig.focusIn(t)})])])}));rl(n,o),ig.focusIn(t)},hide:function(n){i.set(ft.none()),kr(n.element).each(function(t){n.getSystem().getByDom(t).each(function(t){al(t)})})},getBody:function(t){return Ff(t,a,"body")},getFooter:function(t){return Ff(t,a,"footer")},setIdle:function(t){BM.unblock(t)},setBusy:function(t,n){BM.block(t,n)}},eventOrder:u,domModification:{attributes:{role:"dialog","aria-modal":"true"}},behaviours:Wl(a.modalBehaviours,[lg.config({}),ig.config({mode:"cyclic",onEnter:a.onExecute,onEscape:a.onEscape,useTabstopAt:a.useTabstopAt}),BM.config({getRoot:i.get}),fg(o,[sr(function(t){var n,e,o,r,i,u;n=t.element,e=Ff(t,a,"title").element,o=Kr(n,"id").fold(function(){var t=oi("dialog-label");return Yr(e,"id",t),t},st),Yr(n,"aria-labelledby",o),r=t.element,i=Ff(t,a,"body").element,u=ft.from(qr(r,"id")).fold(function(){var t=oi("dialog-describe");return Yr(i,"id",t),t},st),Yr(r,"aria-describedby",u)})])])}},apis:{show:function(t,n){t.show(n)},hide:function(t,n){t.hide(n)},getBody:function(t,n){return t.getBody(n)},getFooter:function(t,n){return t.getFooter(n)},setBusy:function(t,n,e){t.setBusy(n,e)},setIdle:function(t,n){t.setIdle(n)}}}),MM=fn([Un("type"),Un("name")].concat(Ih)),FM=Vn,IM=[bn("name","name",Xt(function(){return oi("button-name")}),Rn),Qn("icon"),ie("align","end",["start","end"]),ue("primary",!1),ue("disabled",!1)],RM=k(IM,[Un("text")]),VM=k([Wn("type",["submit","cancel","custom"])],RM),PM=k([Wn("type",["menu"]),Qn("text"),Qn("tooltip"),Qn("icon"),qn("items",MM)],IM),HM=An("type",{submit:VM,cancel:VM,custom:VM,menu:PM}),zM=[Un("type"),Un("text"),Wn("level",["info","warn","error","success"]),Un("icon"),ne("url","")],NM=fn(zM),LM=[Un("type"),Un("text"),ue("disabled",!1),ue("primary",!1),bn("name","name",Xt(function(){return oi("button-name")}),Rn),Qn("icon"),ue("borderless",!1)],jM=fn(LM),UM=[Un("type"),Un("name"),Un("label"),ue("disabled",!1)],WM=fn(UM),GM=Vn,XM=[Un("type"),Un("name")],YM=XM.concat([Qn("label")]),qM=YM.concat([ne("columns","auto")]),KM=fn(qM),JM=Sn([Un("value"),Un("text"),Un("icon")]),$M=fn(YM),QM=Rn,ZM=fn(YM),tF=Rn,nF=XM.concat([re("tag","textarea"),Un("scriptId"),Un("scriptUrl"),(bM=undefined,ee("settings",bM,zn))]),eF=XM.concat([re("tag","textarea"),Gn("init")]),oF=Cn(function(t){return _n("customeditor.old",ln(eF),t).orThunk(function(){return _n("customeditor.new",ln(nF),t)})}),rF=Rn,iF=fn(YM),uF=dn(wn),aF=function(t){return[Un("type"),jn("columns",In),t]},cF=[Un("type"),Un("html"),ie("presets","presentation",["presentation","document"])],sF=fn(cF),lF=YM.concat([ue("sandboxed",!0)]),fF=fn(lF),dF=Rn,mF=YM.concat([jn("currentState",fn([Ln("blob"),Un("url")]))]),gF=fn(mF),pF=YM.concat([Qn("inputMode"),Qn("placeholder"),ue("maximized",!1),ue("disabled",!1)]),hF=fn(pF),vF=Rn,bF=[Un("text"),Un("value")],yF=[Un("text"),qn("items",(yM=function(){return xF},xM=Lt(function(){return yM()}),{extract:function(t,n,e){return xM().extract(t,n,e)},toString:function(){return xM().toString()}}))],xF=mn([fn(bF),fn(yF)]),wF=YM.concat([qn("items",xF),ue("disabled",!1)]),SF=fn(wF),kF=Rn,CF=YM.concat([Yn("items",[Un("text"),Un("value")]),oe("size",1),ue("disabled",!1)]),OF=fn(CF),_F=Rn,TF=YM.concat([ue("constrain",!0),ue("disabled",!1)]),EF=fn(TF),DF=fn([Un("width"),Un("height")]),BF=[Un("type"),qn("header",Rn),qn("cells",dn(Rn))],AF=fn(BF),MF=YM.concat([Qn("placeholder"),ue("maximized",!1),ue("disabled",!1)]),FF=fn(MF),IF=Rn,RF=YM.concat([ie("filetype","file",["image","media","file"]),ne("disabled",!1)]),VF=fn(RF),PF=fn([Un("value"),ne("meta",{})]),HF=function(n){return bn("items","items",Wt(),dn(Cn(function(t){return _n("Checking item of "+n,zF,t).fold(function(t){return pt.error(Dn(t))},function(t){return pt.value(t)})})))},zF=kn(function(){return Bn("type",{alertbanner:NM,bar:fn((n=HF("bar"),[Un("type"),n])),button:jM,checkbox:WM,colorinput:$M,colorpicker:ZM,dropzone:iF,grid:fn(aF(HF("grid"))),iframe:fF,input:hF,listbox:SF,selectbox:OF,sizeinput:EF,textarea:FF,urlinput:VF,customeditor:oF,htmlpanel:sF,imagetools:gF,collection:KM,label:fn((t=HF("label"),[Un("type"),Un("label"),t])),table:AF,panel:LF});var t,n}),NF=[Un("type"),ne("classes",[]),qn("items",zF)],LF=fn(NF),jF=[bn("name","name",Xt(function(){return oi("tab-name")}),Rn),Un("title"),qn("items",zF)],UF=[Un("type"),Yn("tabs",jF)],WF=fn(UF),GF=RM,XF=HM,YF=fn([Un("title"),jn("body",Bn("type",{panel:LF,tabpanel:WF})),re("size","normal"),qn("buttons",XF),ne("initialData",{}),ae("onAction",at),ae("onChange",at),ae("onSubmit",at),ae("onClose",at),ae("onCancel",at),ne("onTabChange",at)]),qF=fn(k([Wn("type",["cancel","custom"])],GF)),KF=fn([Un("title"),Un("url"),$n("height"),$n("width"),Jn("buttons",dn(qF)),ae("onAction",at),ae("onCancel",at),ae("onClose",at),ae("onMessage",at)]),JF=function(t){return O(t)?[t].concat(U(Mt(t),JF)):p(t)?U(t,JF):[]},$F=function(t){return C(t.type)&&C(t.name)},QF={checkbox:GM,colorinput:QM,colorpicker:tF,dropzone:uF,input:vF,iframe:dF,sizeinput:DF,selectbox:_F,listbox:kF,size:DF,textarea:IF,urlinput:PF,customeditor:rF,collection:JM,togglemenuitem:FM},ZF=function(t){var n=H(JF(t),$F),e=U(n,function(n){return t=n,ft.from(QF[t.type]).fold(function(){return[]},function(t){return[jn(n.name,t)]});var t});return fn(e)},tI=function(t){return{internalDialog:Tn(_n("dialog",YF,t)),dataValidator:ZF(t),initialData:t.initialData}},nI={open:function(t,n){var e=tI(n);return t(e.internalDialog,e.initialData,e.dataValidator)},openUrl:function(t,n){return t(Tn(_n("dialog",KF,n)))},redial:tI},eI=function(t){var e=[],o={};return _t(t,function(t,n){t.fold(function(){e.push(n)},function(t){o[n]=t})}),0<e.length?pt.error(e):pt.value(o)},oI=Xf({name:"TabButton",configFields:[ne("uid",undefined),Ln("value"),bn("dom","dom",Yt(function(){return{attributes:{role:"tab",id:oi("aria"),"aria-selected":"false"}}}),Mn()),Kn("action"),ne("domModification",{}),jl("tabButtonBehaviours",[hg,ig,Ll]),Ln("view")],factory:function(t,n){return{uid:t.uid,dom:t.dom,components:t.components,events:Bg(t.action),behaviours:Wl(t.tabButtonBehaviours,[hg.config({}),ig.config({mode:"execution",useSpace:!0,useEnter:!0}),Ll.config({store:{mode:"memory",initialValue:t.value}})]),domModification:t.domModification}}}),rI=ct([Ln("tabs"),Ln("dom"),ne("clickToDismiss",!1),jl("tabbarBehaviours",[ld,ig]),fa(["tabClass","selectedClass"])]),iI=wf({factory:oI,name:"tabs",unit:"tab",overrides:function(o){var r=function(t,n){ld.dehighlight(t,n),qo(t,Wo(),{tabbar:t,button:n})},i=function(t,n){ld.highlight(t,n),qo(t,Uo(),{tabbar:t,button:n})};return{action:function(t){var n=t.getSystem().getByUid(o.uid).getOrDie(),e=ld.isHighlighted(n,t);(e&&o.clickToDismiss?r:e?at:i)(n,t)},domModification:{classes:[o.markers.tabClass]}}}}),uI=ct([iI]),aI=Yf({name:"Tabbar",configFields:rI(),partFields:uI(),factory:function(t,n,e,o){return{uid:t.uid,dom:t.dom,components:n,"debug.sketcher":"Tabbar",domModification:{attributes:{role:"tablist"}},behaviours:Wl(t.tabbarBehaviours,[ld.config({highlightClass:t.markers.selectedClass,itemClass:t.markers.tabClass,onHighlight:function(t,n){Yr(n.element,"aria-selected","true")},onDehighlight:function(t,n){Yr(n.element,"aria-selected","false")}}),ig.config({mode:"flow",getInitial:function(t){return ld.getHighlighted(t).map(function(t){return t.element})},selector:"."+t.markers.tabClass,executeOnMove:!0})])}}}),cI=Xf({name:"Tabview",configFields:[jl("tabviewBehaviours",[lg])],factory:function(t,n){return{uid:t.uid,dom:t.dom,behaviours:Wl(t.tabviewBehaviours,[lg.config({})]),domModification:{attributes:{role:"tabpanel"}}}}}),sI=ct([ne("selectFirst",!0),ma("onChangeTab"),ma("onDismissTab"),ne("tabs",[]),jl("tabSectionBehaviours",[])]),lI=bf({factory:aI,schema:[Ln("dom"),Xn("markers",[Ln("tabClass"),Ln("selectedClass")])],name:"tabbar",defaults:function(t){return{tabs:t.tabs}}}),fI=bf({factory:cI,name:"tabview"}),dI=ct([lI,fI]),mI=Yf({name:"TabSection",configFields:sI(),partFields:dI(),factory:function(i,t,n,e){var o=function(t,n){Mf(t,i,"tabbar").each(function(t){n(t).each(Ko)})};return{uid:i.uid,dom:i.dom,components:t,behaviours:Ul(i.tabSectionBehaviours),events:Zo(gt([i.selectFirst?[sr(function(t,n){o(t,ld.getFirst)})]:[],[er(Uo(),function(t,n){var o,r,e=n.event.button;o=e,r=Ll.getValue(o),Mf(o,i,"tabview").each(function(e){L(i.tabs,function(t){return t.value===r}).each(function(t){var n=t.view();Kr(o.element,"id").each(function(t){Yr(e.element,"aria-labelledby",t)}),lg.set(e,n),i.onChangeTab(e,o,n)})})}),er(Wo(),function(t,n){var e=n.event.button;i.onDismissTab(t,e)})]])),apis:{getViewItems:function(t){return Mf(t,i,"tabview").map(function(t){return lg.contents(t)}).getOr([])},showTab:function(t,e){o(t,function(n){var t=ld.getCandidates(n);return L(t,function(t){return Ll.getValue(t)===e}).filter(function(t){return!ld.isHighlighted(n,t)})})}}}},apis:{getViewItems:function(t,n){return t.getViewItems(n)},showTab:function(t,n,e){t.showTab(n,e)}}}),gI=function(t,n){Yi(t,"height",n+"px"),je().browser.isIE()?tu(t,"flex-basis"):Yi(t,"flex-basis",n+"px")},pI=function(t,m,n){Yu(t,'[role="dialog"]').each(function(d){qu(d,'[role="tablist"]').each(function(f){n.get().map(function(t){return Yi(m,"height","0"),Yi(m,"flex-basis","0"),Math.min(t,(e=m,o=f,r=wr(n=d).dom,i=Yu(n,".tox-dialog-wrap").getOr(n),u="fixed"===Ji(i,"position")?Math.max(r.clientHeight,window.innerHeight):Math.max(r.offsetHeight,r.scrollHeight),a=vu(e),c=e.dom.offsetLeft>=o.dom.offsetLeft+Ou(o)?Math.max(vu(o),a):a,s=parseInt(Ji(n,"margin-top"),10)||0,l=parseInt(Ji(n,"margin-bottom"),10)||0,u-(vu(n)+s+l-c)));var n,e,o,r,i,u,a,c,s,l}).each(function(t){gI(m,t)})})})},hI=function(t){return qu(t,'[role="tabpanel"]')},vI=function(a){var c;return{smartTabHeight:(c=fe(ft.none()),{extraEvents:[sr(function(t){var e=t.element;hI(e).each(function(u){var n;Yi(u,"visibility","hidden"),t.getSystem().getByDom(u).toOptional().each(function(t){var o,r,i,n=(r=u,i=t,V(o=a,function(t,n){lg.set(i,o[n].view());var e=r.dom.getBoundingClientRect();return lg.set(i,[]),e.height})),e=K(Y(n,function(t,n){return n<t?-1:t<n?1:0}));c.set(e)}),pI(e,u,c),tu(u,"visibility"),n=t,K(a).each(function(t){return mI.showTab(n,t.value)}),fp.requestAnimationFrame(function(){pI(e,u,c)})})}),er(Vo(),function(t){var n=t.element;hI(n).each(function(t){pI(n,t,c)})}),er(ax,function(t,n){var r=t.element;hI(r).each(function(n){var t=mc(Ar(n));Yi(n,"visibility","hidden");var e=Qi(n,"height").map(function(t){return parseInt(t,10)});tu(n,"height"),tu(n,"flex-basis");var o=n.dom.getBoundingClientRect().height;e.forall(function(t){return t<o})?(c.set(ft.from(o)),pI(r,n,c)):e.each(function(t){gI(n,t)}),tu(n,"visibility"),t.each(dc)})})],selectFirst:!1}),naiveTabHeight:{extraEvents:[],selectFirst:!0}}},bI="send-data-to-section",yI="send-data-to-view",xI=oi("update-dialog"),wI=oi("update-title"),SI=oi("update-body"),kI=oi("update-footer"),CI=oi("body-send-message"),OI=function(t,n,d,e){return{dom:{tag:"div",classes:["tox-dialog__content-js"],attributes:lt(lt({},n.map(function(t){return{id:t}}).getOr({})),e?{"aria-live":"polite"}:{})},components:[],behaviours:rc([ak(0),rE.config({channel:SI,updateState:function(t,n){return ft.some({isTabPanel:function(){return"tabpanel"===n.body.type}})},renderComponents:function(t){switch(t.body.type){case"tabpanel":return[(r=t.body,i=d,u=fe({}),a=function(t){var n=Ll.getValue(t),e=eI(n).getOr({}),o=u.get(),r=zt(o,e);u.set(r)},c=function(t){var n=u.get();Ll.setValue(t,n)},s=fe(null),l=V(r.tabs,function(t){return{value:t.name,dom:{tag:"div",classes:["tox-dialog__body-nav-item"],innerHtml:i.shared.providers.translate(t.title)},view:function(){return[$S.sketch(function(n){return{dom:{tag:"div",classes:["tox-form"]},components:V(t.items,function(t){return c_(n,t,i)}),formBehaviours:rc([ig.config({mode:"acyclic",useTabstopAt:x(_k)}),fg("TabView.form.events",[sr(c),lr(a)]),lc.config({channels:$t([{key:bI,value:{onReceive:a}},{key:yI,value:{onReceive:c}}])})])}})]}}}),f=vI(l).smartTabHeight,mI.sketch({dom:{tag:"div",classes:["tox-dialog__body"]},onChangeTab:function(t,n,e){var o=Ll.getValue(n);qo(t,ux,{name:o,oldName:s.get()}),s.set(o)},tabs:l,components:[mI.parts.tabbar({dom:{tag:"div",classes:["tox-dialog__body-nav"]},components:[aI.parts.tabs({})],markers:{tabClass:"tox-tab",selectedClass:"tox-dialog__body-nav-item--active"},tabbarBehaviours:rc([Yy.config({})])}),mI.parts.tabview({dom:{tag:"div",classes:["tox-dialog__body-content"]}})],selectFirst:f.selectFirst,tabSectionBehaviours:rc([fg("tabpanel",f.extraEvents),ig.config({mode:"acyclic"}),Zf.config({find:function(t){return K(mI.getViewItems(t))}}),Ll.config({store:{mode:"manual",getValue:function(t){return t.getSystem().broadcastOn([bI],{}),u.get()},setValue:function(t,n){u.set(n),t.getSystem().broadcastOn([yI],{})}}})])}))];default:return[(e=t.body,o=d,{dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[(n=mp($S.sketch(function(n){return{dom:{tag:"div",classes:["tox-form"].concat(e.classes)},components:V(e.items,function(t){return c_(n,t,o)})}}))).asSpec()]}],behaviours:rc([ig.config({mode:"acyclic",useTabstopAt:x(_k)}),uk(n),pk(n,{postprocess:function(t){return eI(t).fold(function(t){return console.error(t),{}},function(t){return t})}})])})]}var e,o,n,r,i,u,a,c,s,l,f},initialData:t})])}},_I=Qv.deviceType.isTouch(),TI=function(t,n){return{dom:{tag:"div",styles:{display:"none"},classes:["tox-dialog__header"]},components:[t,n]}},EI=function(t,n){return AM.parts.close(dp.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":n.translate("Close")}},action:t,buttonBehaviours:rc([Yy.config({})])}))},DI=function(){return AM.parts.title({dom:{tag:"div",classes:["tox-dialog__title"],innerHtml:"",styles:{display:"none"}}})},BI=function(t,n){return AM.parts.body({dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[{dom:pB("<p>"+n.translate(t)+"</p>")}]}]})},AI=function(t){return AM.parts.footer({dom:{tag:"div",classes:["tox-dialog__footer"]},components:t})},MI=function(t,n){return[Ny.sketch({dom:{tag:"div",classes:["tox-dialog__footer-start"]},components:t}),Ny.sketch({dom:{tag:"div",classes:["tox-dialog__footer-end"]},components:n})]},FI=function(n){var t,e="tox-dialog",o=e+"-wrap",r=o+"__backdrop",i=e+"__disable-scroll";return AM.sketch({lazySink:n.lazySink,onEscape:function(t){return n.onEscape(t),ft.some(!0)},useTabstopAt:function(t){return!_k(t)},dom:{tag:"div",classes:[e].concat(n.extraClasses),styles:lt({position:"relative"},n.extraStyles)},components:k([n.header,n.body],n.footer.toArray()),parts:{blocker:{dom:pB('<div class="'+o+'"></div>'),components:[{dom:{tag:"div",classes:_I?[r,r+"--opaque"]:[r]}}]}},dragBlockClass:o,modalBehaviours:rc(k([hg.config({}),fg("dialog-events",n.dialogEvents.concat([cr(lo(),function(t,n){ig.focusIn(t)})])),fg("scroll-lock",[sr(function(){Ri(Ui(),i)}),lr(function(){Pi(Ui(),i)})])],n.extraBehaviours)),eventOrder:lt(((t={})[_o()]=["dialog-events"],t[Po()]=["scroll-lock","dialog-events","alloy.base.behaviour"],t[Ho()]=["alloy.base.behaviour","dialog-events","scroll-lock"],t),n.eventOrder)})},II=function(t){return dp.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":t.translate("Close"),title:t.translate("Close")}},components:[{dom:{tag:"div",classes:["tox-icon"],innerHtml:pp("close",t.icons)}}],action:function(t){Yo(t,nx)}})},RI=function(t,n,e){var o=function(t){return[lu(e.translate(t.title))]};return{dom:{tag:"div",classes:["tox-dialog__title"],attributes:lt({},n.map(function(t){return{id:t}}).getOr({}))},components:o(t),behaviours:rc([rE.config({channel:wI,renderComponents:o})])}},VI=function(){return{dom:pB('<div class="tox-dialog__draghandle"></div>')}},PI=function(t,n){return e={title:n.shared.providers.translate(t),draggable:n.dialog.isDraggableModal()},o=n.shared.providers,r=AM.parts.title(RI(e,ft.none(),o)),i=AM.parts.draghandle(VI()),u=AM.parts.close(II(o)),a=[r].concat(e.draggable?[i]:[]).concat([u]),Ny.sketch({dom:pB('<div class="tox-dialog__header"></div>'),components:a});var e,o,r,i,u,a},HI=function(t,n,e){return{dom:{tag:"div",classes:["tox-dialog__busy-spinner"],attributes:{"aria-label":e.translate(t)},styles:{left:"0px",right:"0px",bottom:"0px",top:"0px",position:"absolute"}},behaviours:n,components:[{dom:pB('<div class="tox-spinner"><div></div><div></div><div></div></div>')}]}},zI=function(t,o,n){return{onClose:function(){return n.closeWindow()},onBlock:function(e){AM.setBusy(t(),function(t,n){return HI(e.message,n,o)})},onUnblock:function(){AM.setIdle(t())}}},NI=function(t,n,e,o){var r;return mu(FI(lt(lt({},t),{lazySink:o.shared.getSink,extraBehaviours:k([rE.config({channel:xI,updateState:function(t,n){return ft.some(n)},initialData:n}),bk({})],t.extraBehaviours),onEscape:function(t){Yo(t,nx)},dialogEvents:e,eventOrder:((r={})[Oo()]=[rE.name(),lc.name()],r[Po()]=["scroll-lock",rE.name(),"messages","dialog-events","alloy.base.behaviour"],r[Ho()]=["alloy.base.behaviour","dialog-events","messages",rE.name(),"scroll-lock"],r)})))},LI=function(t){return V(t,function(t){return"menu"===t.type?(e=V((n=t).items,function(t){var n=fe(!1);return lt(lt({},t),{storage:n})}),lt(lt({},n),{items:e})):t;var n,e})},jI=function(t){return N(t,function(t,n){return"menu"!==n.type?t:N(n.items,function(t,n){return t[n.name]=n.storage,t},t)},{})},UI=function(t,e){return[ur(lo(),Ok),t(tx,function(t,n){e.onClose(),n.onClose()}),t(nx,function(t,n,e,o){n.onCancel(t),Yo(o,tx)}),er(ix,function(t,n){return e.onUnblock()}),er(rx,function(t,n){return e.onBlock(n.event)})]},WI=function(i,t){var n=function(t,r){return er(t,function(e,o){u(e,function(t,n){r(i(),t,o.event,e)})})},u=function(n,e){rE.getState(n).get().each(function(t){e(t,n)})};return k(UI(n,t),[n(ex,function(t,n,e){n.onAction(t,{name:e.name})})])},GI=function(i,t,c){var n=function(t,r){return er(t,function(e,o){u(e,function(t,n){r(i(),t,o.event,e)})})},u=function(n,e){rE.getState(n).get().each(function(t){e(t.internalDialog,n)})};return k(UI(n,t),[n(ox,function(t,n){return n.onSubmit(t)}),n(Zy,function(t,n,e){n.onChange(t,{name:e.name})}),n(ex,function(t,n,e,o){var r=function(){return ig.focusIn(o)},i=function(t){return Jr(t,"disabled")||Kr(t,"aria-disabled").exists(function(t){return"true"===t})},u=Ar(o.element),a=mc(u);n.onAction(t,{name:e.name,value:e.value}),mc(u).fold(r,function(n){i(n)||a.exists(function(t){return Ye(n,t)&&i(t)})?r():c().toOptional().filter(function(t){return!Ye(t.element,n)}).each(r)})}),n(ux,function(t,n,e){n.onTabChange(t,{newTabName:e.name,oldTabName:e.oldName})}),lr(function(t){var n=i();Ll.setValue(t,n.getData())})])},XI=function(t,n){var e=n.map(function(t){return t.footerButtons}).getOr([]),o=P(e,function(t){return"start"===t.align}),r=function(t,n){return Ny.sketch({dom:{tag:"div",classes:["tox-dialog__footer-"+t]},components:V(n,function(t){return t.memento.asSpec()})})};return[r("start",o.pass),r("end",o.fail)]},YI=function(t,i){return{dom:pB('<div class="tox-dialog__footer"></div>'),components:[],behaviours:rc([rE.config({channel:kI,initialData:t,updateState:function(t,n){var r=V(n.buttons,function(t){var n,e,o=mp((e=i,JC(n=t,n.type,e)));return{name:t.name,align:t.align,memento:o}});return ft.some({lookupByName:function(t,n){return e=t,o=n,L(r,function(t){return t.name===o}).bind(function(t){return t.memento.getOpt(e)});var e,o},footerButtons:r})},renderComponents:XI})])}},qI=YI,KI=function(t,n){return AM.parts.footer(YI(t,n))},JI=function(n,e){if(n.getRoot().getSystem().isConnected()){var o=Zf.getCurrent(n.getFormWrapper()).getOr(n.getFormWrapper());return $S.getField(o,e).fold(function(){var t=n.getFooter();return rE.getState(t).get().bind(function(t){return t.lookupByName(o,e)})},function(t){return ft.some(t)})}return ft.none()},$I=function(c,o,s){var t=function(t){var n=c.getRoot();n.getSystem().isConnected()&&t(n)},l={getData:function(){var t=c.getRoot(),n=t.getSystem().isConnected()?c.getFormWrapper():t,e=Ll.getValue(n),o=Tt(s,function(t){return t.get()});return lt(lt({},e),o)},setData:function(a){t(function(t){var n,e,o=l.getData(),r=lt(lt({},o),a),i=(n=r,e=c.getRoot(),rE.getState(e).get().map(function(t){return Tn(_n("data",t.dataValidator,n))}).getOr(n)),u=c.getFormWrapper();Ll.setValue(u,i),_t(s,function(t,n){It(r,n)&&t.set(r[n])})})},disable:function(t){JI(c,t).each(mv.disable)},enable:function(t){JI(c,t).each(mv.enable)},focus:function(t){JI(c,t).each(hg.focus)},block:function(n){if(!C(n))throw new Error("The dialogInstanceAPI.block function should be passed a blocking message of type string as an argument");t(function(t){qo(t,rx,{message:n})})},unblock:function(){t(function(t){Yo(t,ix)})},showTab:function(e){t(function(t){var n=c.getBody();rE.getState(n).get().exists(function(t){return t.isTabPanel()})&&Zf.getCurrent(n).each(function(t){mI.showTab(t,e)})})},redial:function(e){t(function(t){var n=o(e);t.getSystem().broadcastOn([xI],n),t.getSystem().broadcastOn([wI],n.internalDialog),t.getSystem().broadcastOn([SI],n.internalDialog),t.getSystem().broadcastOn([kI],n.internalDialog),l.setData(n.initialData)})},close:function(){t(function(t){Yo(t,tx)})}};return l},QI=function(t,n,e){var o,r,i,u=PI(t.internalDialog.title,e),a=(o={body:t.internalDialog.body},r=e,i=OI(o,ft.none(),r,!1),AM.parts.body(i)),c=LI(t.internalDialog.buttons),s=jI(c),l=KI({buttons:c},e),f=GI(function(){return p},zI(function(){return g},e.shared.providers,n),e.shared.getSink),d=function(t){switch(t){case"large":return["tox-dialog--width-lg"];case"medium":return["tox-dialog--width-md"];default:return[]}}(t.internalDialog.size),m={header:u,body:a,footer:ft.some(l),extraClasses:d,extraBehaviours:[],extraStyles:{}},g=NI(m,t,f,e),p=$I({getRoot:function(){return g},getBody:function(){return AM.getBody(g)},getFooter:function(){return AM.getFooter(g)},getFormWrapper:function(){var t=AM.getBody(g);return Zf.getCurrent(t).getOr(t)}},n.redial,s);return{dialog:g,instanceApi:p}},ZI=function(t,n,o,e){var r,i,u,a,c,s,l,f,d,m=oi("dialog-label"),g=oi("dialog-content"),p=mp((u={title:t.internalDialog.title,draggable:!0},a=m,c=o.shared.providers,Ny.sketch({dom:pB('<div class="tox-dialog__header"></div>'),components:[RI(u,ft.some(a),c),VI(),II(c)],containerBehaviours:rc([mM.config({mode:"mouse",blockerClass:"blocker",getTarget:function(t){return Ku(t,'[role="dialog"]').getOrDie()},snaps:{getSnapPoints:function(){return[]},leftAttr:"data-drag-left",topAttr:"data-drag-top"}})])}))),h=mp((s={body:t.internalDialog.body},l=g,f=o,d=e,OI(s,ft.some(l),f,d))),v=LI(t.internalDialog.buttons),b=jI(v),y=mp(qI({buttons:v},o)),x=GI(function(){return S},{onBlock:function(e){BM.block(w,function(t,n){return HI(e.message,n,o.shared.providers)})},onUnblock:function(){BM.unblock(w)},onClose:function(){return n.closeWindow()}},o.shared.getSink),w=mu({dom:{tag:"div",classes:["tox-dialog","tox-dialog-inline"],attributes:((r={role:"dialog"})["aria-labelledby"]=m,r["aria-describedby"]=""+g,r)},eventOrder:((i={})[Oo()]=[rE.name(),lc.name()],i[_o()]=["execute-on-form"],i[Po()]=["reflecting","execute-on-form"],i),behaviours:rc([ig.config({mode:"cyclic",onEscape:function(t){return Yo(t,tx),ft.some(!0)},useTabstopAt:function(t){return!_k(t)&&("button"!==mr(t)||"disabled"!==qr(t,"disabled"))}}),rE.config({channel:xI,updateState:function(t,n){return ft.some(n)},initialData:t}),hg.config({}),fg("execute-on-form",x.concat([cr(lo(),function(t,n){ig.focusIn(t)})])),BM.config({getRoot:function(){return ft.some(w)}}),lg.config({}),bk({})]),components:[p.asSpec(),h.asSpec(),y.asSpec()]}),S=$I({getRoot:function(){return w},getFooter:function(){return y.get(w)},getBody:function(){return h.get(w)},getFormWrapper:function(){var t=h.get(w);return Zf.getCurrent(t).getOr(t)}},n.redial,b);return{dialog:w,instanceApi:S}},tR=tinymce.util.Tools.resolve("tinymce.util.URI"),nR=["insertContent","setContent","execCommand","close","block","unblock"],eR=function(t){return O(t)&&-1!==nR.indexOf(t.mceAction)},oR=function(o,t,r,n){var e,i,u,a,c=PI(o.title,n),s=(i={dom:{tag:"div",classes:["tox-dialog__content-js"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-iframe"]},components:[kk({dom:{tag:"iframe",attributes:{src:o.url}},behaviours:rc([Yy.config({}),hg.config({})])})]}],behaviours:rc([ig.config({mode:"acyclic",useTabstopAt:x(_k)})])},AM.parts.body(i)),l=o.buttons.bind(function(t){return 0===t.length?ft.none():ft.some(KI({buttons:t},n))}),f=WI(function(){return y},zI(function(){return b},n.shared.providers,t)),d=lt(lt({},o.height.fold(function(){return{}},function(t){return{height:t+"px","max-height":t+"px"}})),o.width.fold(function(){return{}},function(t){return{width:t+"px","max-width":t+"px"}})),m=o.width.isNone()&&o.height.isNone()?["tox-dialog--width-lg"]:[],g=new tR(o.url,{base_uri:new tR(window.location.href)}),p=g.protocol+"://"+g.host+(g.port?":"+g.port:""),h=fe(ft.none()),v=[fg("messages",[sr(function(){var t=Sy(me.fromDom(window),"message",function(t){var n,e;g.isSameOrigin(new tR(t.raw.origin))&&(n=t.raw.data,eR(n)?function(t,n,e){switch(e.mceAction){case"insertContent":t.insertContent(e.content);break;case"setContent":t.setContent(e.content);break;case"execCommand":var o=!!_(e.ui)&&e.ui;t.execCommand(e.cmd,o,e.value);break;case"close":n.close();break;case"block":n.block(e.message);break;case"unblock":n.unblock()}}(r,y,n):!eR(e=n)&&O(e)&&It(e,"mceAction")&&o.onMessage(y,n))});h.set(ft.some(t))}),lr(function(){h.get().each(function(t){return t.unbind()})})]),lc.config({channels:((e={})[CI]={onReceive:function(t,n){qu(t.element,"iframe").each(function(t){t.dom.contentWindow.postMessage(n,p)})}},e)})],b=NI({header:c,body:s,footer:l,extraClasses:m,extraBehaviours:v,extraStyles:d},o,f,n),y=(a=function(t){u.getSystem().isConnected()&&t(u)},{block:function(n){if(!C(n))throw new Error("The urlDialogInstanceAPI.block function should be passed a blocking message of type string as an argument");a(function(t){qo(t,rx,{message:n})})},unblock:function(){a(function(t){Yo(t,ix)})},close:function(){a(function(t){Yo(t,tx)})},sendMessage:function(n){a(function(t){t.getSystem().broadcastOn([CI],n)})}});return{dialog:u=b,instanceApi:y}},rR=function(t){var c,s,l,f,p=t.backstage,h=t.editor,v=Rv(h),e=(s=(c=t).backstage.shared,{open:function(t,n){var e=function(){AM.hide(u),n()},o=mp(JC({name:"close-alert",text:"OK",primary:!0,align:"end",disabled:!1,icon:ft.none()},"cancel",c.backstage)),r=DI(),i=EI(e,s.providers),u=mu(FI({lazySink:function(){return s.getSink()},header:TI(r,i),body:BI(t,s.providers),footer:ft.some(AI(MI([],[o.asSpec()]))),onEscape:e,extraClasses:["tox-alert-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[er(nx,e)],eventOrder:{}}));AM.show(u);var a=o.get(u);hg.focus(a)}}),o=(f=(l=t).backstage.shared,{open:function(t,n){var e=function(t){AM.hide(a),n(t)},o=mp(JC({name:"yes",text:"Yes",primary:!0,align:"end",disabled:!1,icon:ft.none()},"submit",l.backstage)),r=JC({name:"no",text:"No",primary:!1,align:"end",disabled:!1,icon:ft.none()},"cancel",l.backstage),i=DI(),u=EI(function(){return e(!1)},f.providers),a=mu(FI({lazySink:function(){return f.getSink()},header:TI(i,u),body:BI(t,f.providers),footer:ft.some(AI(MI([],[r,o.asSpec()]))),onEscape:function(){return e(!1)},extraClasses:["tox-confirm-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[er(nx,function(){return e(!1)}),er(ox,function(){return e(!0)})],eventOrder:{}}));AM.show(a);var c=o.get(a);hg.focus(c)}}),r=function(t,e){return nI.openUrl(function(t){var n=oR(t,{closeWindow:function(){AM.hide(n.dialog),e(n.instanceApi)}},h,p);return AM.show(n.dialog),n.instanceApi},t)},i=function(t,i){return nI.open(function(t,n,e){var o=n,r=QI({dataValidator:e,initialData:o,internalDialog:t},{redial:nI.redial,closeWindow:function(){AM.hide(r.dialog),i(r.instanceApi)}},p);return AM.show(r.dialog),r.instanceApi.setData(o),r.instanceApi},t)},u=function(t,d,m,g){return nI.open(function(t,n,e){var o,r,i,u=Tn(_n("data",e,n)),a=(o=fe(ft.none()),{clear:function(){return o.set(ft.none())},set:function(t){return o.set(ft.some(t))},isSet:function(){return o.get().isSome()},on:function(t){return o.get().each(t)}}),c=p.shared.header.isPositionedAtTop(),s=function(){return a.on(function(t){Zg.reposition(t),XD.refresh(t)})},l=ZI({dataValidator:e,initialData:u,internalDialog:t},{redial:nI.redial,closeWindow:function(){a.on(Zg.hide),h.off("ResizeEditor",s),a.clear(),m(l.instanceApi)}},p,g),f=mu(Zg.sketch(lt(lt({lazySink:p.shared.getSink,dom:{tag:"div",classes:[]},fireDismissalEventInstead:{}},c?{}:{fireRepositionEventInstead:{}}),{inlineBehaviours:rc(k([fg("window-manager-inline-events",[er(zo(),function(t,n){Yo(l.dialog,nx)})])],(r=h,i=c,v&&i?[]:[XD.config({contextual:{lazyContext:function(){return ft.some(Hu(me.fromDom(r.getContentAreaContainer())))},fadeInClass:"tox-dialog-dock-fadein",fadeOutClass:"tox-dialog-dock-fadeout",transitionClass:"tox-dialog-dock-transition"},modes:["top"]})]))),isExtraPart:function(t,n){return Oy(e=n,".tox-alert-dialog")||Oy(e,".tox-confirm-dialog");var e}})));return a.set(f),Zg.showWithin(f,d,gu(l.dialog),ft.some(Ui())),v&&c||(XD.refresh(f),h.on("ResizeEditor",s)),l.instanceApi.setData(u),ig.focusIn(l.dialog),l.instanceApi},t)};return{open:function(t,n,e){return n!==undefined&&"toolbar"===n.inline?u(t,p.shared.anchors.inlineDialog(),e,n.ariaAttrs):n!==undefined&&"cursor"===n.inline?u(t,p.shared.anchors.cursor(),e,n.ariaAttrs):i(t,e)},openUrl:function(t,n){return r(t,n)},alert:function(t,n){e.open(t,function(){n()})},close:function(t){t.close()},confirm:function(t,n){o.open(t,function(t){n(t)})}}};t.add("silver",function(t){var n=CM(t),e=n.uiMothership,o=n.backstage,r=n.renderUI,i=n.getUi;xy(t,o.shared);var u=rR({editor:t,backstage:o});return{renderUI:r,getWindowManagerImpl:ct(u),getNotificationManagerImpl:function(){return bp(0,{backstage:o},e)},ui:i()}})}();
\ No newline at end of file
+!function(){"use strict";function t(o){return function(t){return e=typeof(n=t),(null===n?"null":"object"==e&&(Array.prototype.isPrototypeOf(n)||n.constructor&&"Array"===n.constructor.name)?"array":"object"==e&&(String.prototype.isPrototypeOf(n)||n.constructor&&"String"===n.constructor.name)?"string":e)===o;var n,e}}function n(n){return function(t){return typeof t===n}}function e(n){return function(t){return n===t}}function g(t){return null==t}function f(t,n){if(c(t)){for(var e=0,o=t.length;e<o;++e)if(!n(t[e]))return;return 1}}function st(){}function r(e,o){return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e(o.apply(null,t))}}function rt(t){return function(){return t}}function h(t){return t}function v(t,n){return t===n}var y=t("string"),x=t("object"),c=t("array"),b=e(null),w=n("boolean"),E=e(void 0),d=function(t){return!g(t)},m=n("function"),u=n("number");function S(o){for(var r=[],t=1;t<arguments.length;t++)r[t-1]=arguments[t];return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];var e=r.concat(t);return o.apply(null,e)}}function C(n){return function(t){return!n(t)}}function k(t){return function(){throw new Error(t)}}var O=rt(!1),_=rt(!0),o=tinymce.util.Tools.resolve("tinymce.ThemeManager"),lt=function(){return(lt=Object.assign||function(t){for(var n,e=1,o=arguments.length;e<o;e++)for(var r in n=arguments[e])Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r]);return t}).apply(this,arguments)};function s(t,n){var e={};for(r in t)Object.prototype.hasOwnProperty.call(t,r)&&n.indexOf(r)<0&&(e[r]=t[r]);if(null!=t&&"function"==typeof Object.getOwnPropertySymbols)for(var o=0,r=Object.getOwnPropertySymbols(t);o<r.length;o++)n.indexOf(r[o])<0&&Object.prototype.propertyIsEnumerable.call(t,r[o])&&(e[r[o]]=t[r[o]]);return e}function H(t,n,e){if(e||2===arguments.length)for(var o,r=0,i=n.length;r<i;r++)!o&&r in n||((o=o||Array.prototype.slice.call(n,0,r))[r]=n[r]);return t.concat(o||Array.prototype.slice.call(n))}function i(){return a}var a={fold:function(t,n){return t()},isSome:O,isNone:_,getOr:h,getOrThunk:l,getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:rt(null),getOrUndefined:rt(void 0),or:h,orThunk:l,map:i,each:st,bind:i,exists:O,forall:_,filter:function(){return a},toArray:function(){return[]},toString:rt("none()")};function l(t){return t()}function p(t,n){return yt.call(t,n)}function T(t,n){for(var e=0,o=t.length;e<o;e++)if(n(t[e],e))return!0;return!1}function D(t,n){for(var e=[],o=0;o<t;o++)e.push(n(o));return e}function B(t,n){for(var e=[],o=0;o<t.length;o+=n){var r=bt.call(t,o,o+n);e.push(r)}return e}function M(t,n){for(var e=t.length,o=new Array(e),r=0;r<e;r++){var i=t[r];o[r]=n(i,r)}return o}function A(t,n){for(var e=[],o=[],r=0,i=t.length;r<i;r++){var u=t[r];(n(u,r)?e:o).push(u)}return{pass:e,fail:o}}function F(t,n){for(var e=[],o=0,r=t.length;o<r;o++){var i=t[o];n(i,o)&&e.push(i)}return e}function I(t,o,r){return function(t){for(var n,e=t.length-1;0<=e;e--)n=t[e],r=o(r,n,e)}(t),r}function R(t,e,o){return St(t,function(t,n){o=e(o,t,n)}),o}function V(t,n){return function(t,n,e){for(var o=0,r=t.length;o<r;o++){var i=t[o];if(n(i,o))return vt.some(i);if(e(i,o))break}return vt.none()}(t,n,O)}function P(t,n){for(var e=0,o=t.length;e<o;e++)if(n(t[e],e))return vt.some(e);return vt.none()}function ft(t){for(var n=[],e=0,o=t.length;e<o;++e){if(!c(t[e]))throw new Error("Arr.flatten item "+e+" was not an array, input: "+t);xt.apply(n,t[e])}return n}function z(t,n){return ft(M(t,n))}function N(t,n){for(var e=0,o=t.length;e<o;++e)if(!0!==n(t[e],e))return!1;return!0}function L(t){var n=bt.call(t,0);return n.reverse(),n}function W(t,n){return F(t,function(t){return!wt(n,t)})}function U(t,n){for(var e={},o=0,r=t.length;o<r;o++){var i=t[o];e[String(i)]=n(i,o)}return e}function j(t){return[t]}function G(t,n){var e=bt.call(t,0);return e.sort(n),e}function X(t,n){return 0<=n&&n<t.length?vt.some(t[n]):vt.none()}function Y(t){return X(t,0)}function q(t){return X(t,t.length-1)}function K(t,n){for(var e=0;e<t.length;e++){var o=n(t[e],e);if(o.isSome())return o}return vt.none()}function J(t,n){for(var e=kt(t),o=0,r=e.length;o<r;o++){var i=e[o];n(t[i],i)}}function dt(t,e){return _t(t,function(t,n){return{k:n,v:e(t,n)}})}function $(t,e){var o=[];return J(t,function(t,n){o.push(e(t,n))}),o}function Q(t,n){for(var e=kt(t),o=0,r=e.length;o<r;o++){var i=e[o],u=t[i];if(n(u,i,t))return vt.some(u)}return vt.none()}function Z(t){return $(t,h)}function tt(t,n){return Tt(t,n)?vt.from(t[n]):vt.none()}function nt(t,n){return Tt(t,n)&&void 0!==t[n]&&null!==t[n]}function mt(t,n,e){return void 0===e&&(e=v),t.exists(function(t){return e(t,n)})}function et(t){for(var n=[],e=function(t){n.push(t)},o=0;o<t.length;o++)t[o].each(e);return n}function ot(t,n){return t?vt.some(n):vt.none()}function it(t,n,e){return""===n||t.length>=n.length&&t.substr(e,e+n.length)===n}function ut(t,n){return-1!==t.indexOf(n)}function at(t){return 0<t.length}function ct(t){return void 0!==t.style&&m(t.style.getPropertyValue)}function gt(t){if(null==t)throw new Error("Node cannot be null or undefined");return{dom:t}}var pt,ht=function(e){function t(){return r}function n(t){return t(e)}var o=rt(e),r={fold:function(t,n){return n(e)},isSome:_,isNone:O,getOr:o,getOrThunk:o,getOrDie:o,getOrNull:o,getOrUndefined:o,or:t,orThunk:t,map:function(t){return ht(t(e))},each:function(t){t(e)},bind:n,exists:n,forall:n,filter:function(t){return t(e)?r:a},toArray:function(){return[e]},toString:function(){return"some("+e+")"}};return r},vt={some:ht,none:i,from:function(t){return null==t?a:ht(t)}},bt=Array.prototype.slice,yt=Array.prototype.indexOf,xt=Array.prototype.push,wt=function(t,n){return-1<p(t,n)},St=function(t,n){for(var e=0,o=t.length;e<o;e++)n(t[e],e)},Ct=m(Array.from)?Array.from:function(t){return bt.call(t)},kt=Object.keys,Ot=Object.hasOwnProperty,_t=function(t,o){var r={};return J(t,function(t,n){var e=o(t,n);r[e.k]=e.v}),r},Tt=function(t,n){return Ot.call(t,n)},Et=function(t,n,e){return t.isSome()&&n.isSome()?vt.some(e(t.getOrDie(),n.getOrDie())):vt.none()},Dt=function(t,n){return it(t,n,0)},Bt=function(t,n){return it(t,n,t.length-n.length)},Mt=(pt=/^\s+|\s+$/g,function(t){return t.replace(pt,"")}),At={fromHtml:function(t,n){var e=(n||document).createElement("div");if(e.innerHTML=t,!e.hasChildNodes()||1<e.childNodes.length)throw console.error("HTML does not have a single root node",t),new Error("HTML must have a single root node");return gt(e.childNodes[0])},fromTag:function(t,n){var e=(n||document).createElement(t);return gt(e)},fromText:function(t,n){var e=(n||document).createTextNode(t);return gt(e)},fromDom:gt,fromPoint:function(t,n,e){return vt.from(t.dom.elementFromPoint(n,e)).map(gt)}};function Ft(t){return t.dom.nodeName.toLowerCase()}function It(n){return function(t){return t.dom.nodeType===n}}function Rt(e){var o,r=!1;return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return r||(r=!0,o=e.apply(null,t)),o}}function Vt(t,n){var e=String(n).toLowerCase();return V(t,function(t){return t.search(e)})}function Pt(n){return function(t){return ut(t,n)}}function Ht(t){return window.matchMedia(t).matches}function zt(t,n){var e=t.dom;if(1!==e.nodeType)return!1;var o=e;if(void 0!==o.matches)return o.matches(n);if(void 0!==o.msMatchesSelector)return o.msMatchesSelector(n);if(void 0!==o.webkitMatchesSelector)return o.webkitMatchesSelector(n);if(void 0!==o.mozMatchesSelector)return o.mozMatchesSelector(n);throw new Error("Browser lacks native selectors")}function Nt(t){return 1!==t.nodeType&&9!==t.nodeType&&11!==t.nodeType||0===t.childElementCount}function Lt(t,n){return t.dom===n.dom}function Wt(t,n){return se().browser.isIE()?(e=t.dom,o=n.dom,r=Node.DOCUMENT_POSITION_CONTAINED_BY,0!=(e.compareDocumentPosition(o)&r)):(i=t.dom)!==(u=n.dom)&&i.contains(u);var e,o,r,i,u}function Ut(t){return At.fromDom(t.dom.ownerDocument)}function jt(t){return Yn(t)?t:Ut(t)}function Gt(t){return At.fromDom(jt(t).dom.documentElement)}function Xt(t){return At.fromDom(jt(t).dom.defaultView)}function Yt(t){return vt.from(t.dom.parentNode).map(At.fromDom)}function qt(t){return vt.from(t.dom.offsetParent).map(At.fromDom)}function Kt(t){return M(t.dom.childNodes,At.fromDom)}function Jt(t,n){var e=t.dom.childNodes;return vt.from(e[n]).map(At.fromDom)}function $t(t,n){return{element:t,offset:n}}function Qt(t,n){var e=Kt(t);return 0<e.length&&n<e.length?$t(e[n],0):$t(t,n)}function Zt(t){return qn(t)&&d(t.dom.host)}function tn(t){return Zt(t)?t:At.fromDom(jt(t).dom.body)}function nn(t){return At.fromDom(t.dom.host)}function en(t,n,e){if(!(y(e)||w(e)||u(e)))throw console.error("Invalid call to Attribute.set. Key ",n,":: Value ",e,":: Element ",t),new Error("Attribute value was not simple");t.setAttribute(n,e+"")}function on(t,n,e){en(t.dom,n,e)}function rn(t,n){var e=t.dom.getAttribute(n);return null===e?void 0:e}function un(t,n){return vt.from(rn(t,n))}function an(t,n){var e=t.dom;return!(!e||!e.hasAttribute)&&e.hasAttribute(n)}function cn(t,n){t.dom.removeAttribute(n)}function sn(t,n,e){if(!y(e))throw console.error("Invalid call to CSS.set. Property ",n,":: Value ",e,":: Element ",t),new Error("CSS value must be a string: "+e);ct(t)&&t.style.setProperty(n,e)}function ln(t,n){ct(t)&&t.style.removeProperty(n)}function fn(t,n,e){sn(t.dom,n,e)}function dn(t,n){var e=t.dom;J(n,function(t,n){sn(e,n,t)})}function mn(t,n){var e=t.dom;J(n,function(t,n){t.fold(function(){ln(e,n)},function(t){sn(e,n,t)})})}function gn(t,n){var e=t.dom,o=window.getComputedStyle(e).getPropertyValue(n);return""!==o||he(t)?o:ye(e,n)}function pn(t,n){var e=t.dom,o=ye(e,n);return vt.from(o).filter(function(t){return 0<t.length})}function hn(t,n,e){var o=At.fromTag(t);return fn(o,n,e),pn(o,n).isSome()}function vn(t,n){ln(t.dom,n),mt(un(t,"style").map(Mt),"")&&cn(t,"style")}function bn(t){return t.dom.offsetWidth}function yn(o,r){function t(t){var n=r(t);if(n<=0||null===n){var e=gn(t,o);return parseFloat(e)||0}return n}function i(r,t){return R(t,function(t,n){var e=gn(r,n),o=void 0===e?0:parseInt(e,10);return isNaN(o)?t:t+o},0)}return{set:function(t,n){if(!u(n)&&!n.match(/^[0-9]+$/))throw new Error(o+".set accepts only positive integer values. Value was "+n);var e=t.dom;ct(e)&&(e.style[o]=n+"px")},get:t,getOuter:t,aggregate:i,max:function(t,n,e){var o=i(t,e);return o<n?n-o:0}}}function xn(t){return xe.get(t)}function wn(t){return xe.getOuter(t)}function Sn(t,n){return void 0!==t?t:void 0!==n?n:0}function Cn(t){var n=t.dom.ownerDocument,e=n.body,o=n.defaultView,r=n.documentElement;if(e===t.dom)return Se(e.offsetLeft,e.offsetTop);var i=Sn(null==o?void 0:o.pageYOffset,r.scrollTop),u=Sn(null==o?void 0:o.pageXOffset,r.scrollLeft),a=Sn(r.clientTop,e.clientTop),c=Sn(r.clientLeft,e.clientLeft);return Ce(t).translate(u-c,i-a)}function kn(t){return ke.get(t)}function On(t){return ke.getOuter(t)}function _n(t){function n(){return t.stopPropagation()}function e(){return t.preventDefault()}var o=r(e,n);return{target:At.fromDom(function(t){if(de()&&d(t.target)){var n=At.fromDom(t.target);if(Gn(n)&&pe(n)&&t.composed&&t.composedPath){var e=t.composedPath();if(e)return Y(e)}}return vt.from(t.target)}(t).getOr(t.target)),x:t.clientX,y:t.clientY,stop:n,prevent:e,kill:o,raw:t}}function Tn(t,n,e,o,r){var i,u,a=(i=e,u=o,function(t){i(t)&&u(_n(t))});return t.dom.addEventListener(n,a,r),{unbind:S(Oe,t,n,a,r)}}function En(n,e){Yt(n).each(function(t){t.dom.insertBefore(e.dom,n.dom)})}function Dn(t,n){vt.from(t.dom.nextSibling).map(At.fromDom).fold(function(){Yt(t).each(function(t){_e(t,n)})},function(t){En(t,n)})}function Bn(n,e){Jt(n,0).fold(function(){_e(n,e)},function(t){n.dom.insertBefore(e.dom,t.dom)})}function Mn(n,t){St(t,function(t){_e(n,t)})}function An(t){t.dom.textContent="",St(Kt(t),function(t){Te(t)})}function Fn(t){var n,e=Kt(t);0<e.length&&(n=t,St(e,function(t){En(n,t)})),Te(t)}function In(t){var n=void 0!==t?t.dom:document,e=n.body.scrollLeft||n.documentElement.scrollLeft,o=n.body.scrollTop||n.documentElement.scrollTop;return Se(e,o)}function Rn(t,n,e){var o=(void 0!==e?e.dom:document).defaultView;o&&o.scrollTo(t,n)}function Vn(t,n,e,o){return{x:t,y:n,width:e,height:o,right:t+e,bottom:n+o}}function Pn(t){var o=void 0===t?window:t,n=o.document,r=In(At.fromDom(n)),e=void 0===o?window:o;return(se().browser.isFirefox()?vt.none():vt.from(e.visualViewport)).fold(function(){var t=o.document.documentElement,n=t.clientWidth,e=t.clientHeight;return Vn(r.left,r.top,n,e)},function(t){return Vn(Math.max(t.pageLeft,r.left),Math.max(t.pageTop,r.top),t.width,t.height)})}function Hn(o){var t,r=In(At.fromDom(document)),n=(t=De).owner(o),e=Ee(t,n);return vt.some(e).fold(S(Cn,o),function(t){var n=Ce(o),e=I(t,function(t,n){var e=Ce(n);return{left:t.left+e.left,top:t.top+e.top}},{left:0,top:0});return Se(e.left+n.left+r.left,e.top+n.top+r.top)})}function zn(t){var n=Hn(t),e=On(t),o=wn(t);return Be(n.left,n.top,e,o)}"undefined"!=typeof window||Function("return this;")();function Nn(){return Kn(0,0)}function Ln(t){function n(t){return function(){return e===t}}var e=t.current,o=t.version;return{current:e,version:o,isEdge:n("Edge"),isChrome:n("Chrome"),isIE:n("IE"),isOpera:n("Opera"),isFirefox:n(Zn),isSafari:n("Safari")}}function Wn(t){function n(t){return function(){return e===t}}var e=t.current,o=t.version;return{current:e,version:o,isWindows:n(ee),isiOS:n("iOS"),isAndroid:n(oe),isOSX:n("OSX"),isLinux:n("Linux"),isSolaris:n(re),isFreeBSD:n(ie),isChromeOS:n(ue)}}var Un,jn,Gn=It(1),Xn=It(3),Yn=It(9),qn=It(11),Kn=function(t,n){return{major:t,minor:n}},Jn={nu:Kn,detect:function(t,n){var e,o,r=String(n).toLowerCase();return 0===t.length?Nn():(o=function(t,n){for(var e=0;e<t.length;e++){var o=t[e];if(o.test(n))return o}}(t,e=r))?Kn(i(1),i(2)):{major:0,minor:0};function i(t){return Number(e.replace(o,"$"+t))}},unknown:Nn},$n=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Qn={browsers:rt([{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(t){return ut(t,"edge/")&&ut(t,"chrome")&&ut(t,"safari")&&ut(t,"applewebkit")}},{name:"Chrome",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,$n],search:function(t){return ut(t,"chrome")&&!ut(t,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(t){return ut(t,"msie")||ut(t,"trident")}},{name:"Opera",versionRegexes:[$n,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Pt("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Pt("firefox")},{name:"Safari",versionRegexes:[$n,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(t){return(ut(t,"safari")||ut(t,"mobile/"))&&ut(t,"applewebkit")}}]),oses:rt([{name:"Windows",search:Pt("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(t){return ut(t,"iphone")||ut(t,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Pt("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:Pt("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Pt("linux"),versionRegexes:[]},{name:"Solaris",search:Pt("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Pt("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:Pt("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}])},Zn="Firefox",te=function(){return Ln({current:void 0,version:Jn.unknown()})},ne=Ln,ee=(rt("Edge"),rt("Chrome"),rt("IE"),rt("Opera"),rt(Zn),rt("Safari"),"Windows"),oe="Android",re="Solaris",ie="FreeBSD",ue="ChromeOS",ae=function(){return Wn({current:void 0,version:Jn.unknown()})},ce=Wn,se=(rt(ee),rt("iOS"),rt(oe),rt("Linux"),rt("OSX"),rt(re),rt(ie),rt(ue),Rt(function(){return t=navigator.userAgent,n=vt.from(navigator.userAgentData),e=Ht,p=Qn.browsers(),h=Qn.oses(),v=n.bind(function(t){return o=p,K(t.brands,function(n){var e=n.brand.toLowerCase();return V(o,function(t){var n;return e===(null===(n=t.brand)||void 0===n?void 0:n.toLowerCase())}).map(function(t){return{current:t.name,version:Jn.nu(parseInt(n.version,10),0)}})});var o}).orThunk(function(){return Vt(p,e=t).map(function(t){var n=Jn.detect(t.versionRegexes,e);return{current:t.name,version:n}});var e}).fold(te,ne),b=Vt(h,o=t).map(function(t){var n=Jn.detect(t.versionRegexes,o);return{current:t.name,version:n}}).fold(ae,ce),{browser:v,os:b,deviceType:(i=v,u=t,a=e,c=(r=b).isiOS()&&!0===/ipad/i.test(u),s=r.isiOS()&&!c,f=(l=r.isiOS()||r.isAndroid())||a("(pointer:coarse)"),d=c||!s&&l&&a("(min-device-width:768px)"),m=s||l&&!d,g=i.isSafari()&&r.isiOS()&&!1===/safari/i.test(u),{isiPad:rt(c),isiPhone:rt(s),isTablet:rt(d),isPhone:rt(m),isTouch:rt(f),isAndroid:r.isAndroid,isiOS:r.isiOS,isWebView:rt(g),isDesktop:rt(!m&&!d&&!g)})};var t,n,e,o,r,i,u,a,c,s,l,f,d,m,g,p,h,v,b})),le=Yt,fe=m(Element.prototype.attachShadow)&&m(Node.prototype.getRootNode),de=rt(fe),me=fe?function(t){return At.fromDom(t.dom.getRootNode())}:jt,ge=function(t){var n=me(t);return Zt(n)?vt.some(n):vt.none()},pe=function(t){return d(t.dom.shadowRoot)},he=function(t){var n=Xn(t)?t.dom.parentNode:t.dom;if(null==n||null===n.ownerDocument)return!1;var e,o,r=n.ownerDocument;return ge(At.fromDom(n)).fold(function(){return r.body.contains(n)},(e=he,o=nn,function(t){return e(o(t))}))},ve=function(){return be(At.fromDom(document))},be=function(t){var n=t.dom.body;if(null==n)throw new Error("Body is not available yet");return At.fromDom(n)},ye=function(t,n){return ct(t)?t.style.getPropertyValue(n):""},xe=yn("height",function(t){var n=t.dom;return he(t)?n.getBoundingClientRect().height:n.offsetHeight}),we=function(e,o){return{left:e,top:o,translate:function(t,n){return we(e+t,o+n)}}},Se=we,Ce=function(t){var n,e=t.dom,o=e.ownerDocument.body;return o===e?Se(o.offsetLeft,o.offsetTop):he(t)?(n=e.getBoundingClientRect(),Se(n.left,n.top)):Se(0,0)},ke=yn("width",function(t){return t.dom.offsetWidth}),Oe=function(t,n,e,o){t.dom.removeEventListener(n,e,o)},_e=function(t,n){t.dom.appendChild(n.dom)},Te=function(t){var n=t.dom;null!==n.parentNode&&n.parentNode.removeChild(n)},Ee=function(o,t){return o.view(t).fold(rt([]),function(t){var n=o.owner(t),e=Ee(o,n);return[t].concat(e)})},De=Object.freeze({__proto__:null,view:function(t){var n;return(t.dom===document?vt.none():vt.from(null===(n=t.dom.defaultView)||void 0===n?void 0:n.frameElement)).map(At.fromDom)},owner:Ut}),Be=function(t,n,e,o){return{x:t,y:n,width:e,height:o,right:t+e,bottom:n+o}},Me=function(t){var n=Cn(t),e=On(t),o=wn(t);return Be(n.left,n.top,e,o)},Ae=function(){return Pn(window)},Fe=function(e){return{isValue:_,isError:O,getOr:rt(e),getOrThunk:rt(e),getOrDie:rt(e),or:function(t){return Fe(e)},orThunk:function(t){return Fe(e)},fold:function(t,n){return n(e)},map:function(t){return Fe(t(e))},mapError:function(t){return Fe(e)},each:function(t){t(e)},bind:function(t){return t(e)},exists:function(t){return t(e)},forall:function(t){return t(e)},toOptional:function(){return vt.some(e)}}},Ie=function(e){return{isValue:O,isError:_,getOr:h,getOrThunk:function(t){return t()},getOrDie:function(){return k(String(e))()},or:h,orThunk:function(t){return t()},fold:function(t,n){return t(e)},map:function(t){return Ie(e)},mapError:function(t){return Ie(t(e))},each:st,bind:function(t){return Ie(e)},exists:O,forall:_,toOptional:vt.none}},Re={value:Fe,error:Ie,fromOption:function(t,n){return t.fold(function(){return Ie(n)},Fe)}};function Ve(t,n,e){return t.stype===Un.Error?n(t.serror):e(t.svalue)}function Pe(t){return{stype:Un.Value,svalue:t}}function He(t){return{stype:Un.Error,serror:t}}function ze(t,n,e,o){return{tag:"field",key:t,newKey:n,presence:e,prop:o}}function Ne(t,n,e){switch(t.tag){case"field":return n(t.key,t.newKey,t.presence,t.prop);case"custom":return e(t.newKey,t.instantiator)}}function Le(u){return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];if(0===t.length)throw new Error("Can't merge zero objects");for(var e={},o=0;o<t.length;o++){var r,i=t[o];for(r in i)Tt(i,r)&&(e[r]=u(e[r],i[r]))}return e}}function We(){return{tag:"required",process:{}}}function Ue(t){return{tag:"defaultedThunk",process:t}}function je(t){return Ue(rt(t))}function Ge(){return{tag:"option",process:{}}}function Xe(t){return{tag:"mergeWithThunk",process:t}}function Ye(t){return x(t)&&100<kt(t).length?" removed due to size":JSON.stringify(t,null,2)}function qe(t,n){return No([{path:t,getErrorInfo:n}])}function Ke(e){return{extract:function(n,t){return Wo(e(t),function(t){return qe(n,rt(t))})},toString:rt("val")}}function Je(t,n,e,o){return o(tt(t,n).getOrThunk(function(){return e(t)}))}function $e(n,e,o,r,i){function u(t){return i.extract(e.concat([r]),t)}function t(t){return t.fold(function(){return zo(vt.none())},function(t){var n=i.extract(e.concat([r]),t);return Uo(n,vt.some)})}var a,c,s,l,f,d;switch(n.tag){case"required":return s=e,d=u,tt(l=o,f=r).fold(function(){return t=f,n=l,qe(s,function(){return'Could not find valid *required* value for "'+t+'" in '+Ye(n)});var t,n},d);case"defaultedThunk":return Je(o,r,n.process,u);case"option":return t(tt(o,r));case"defaultedOptionThunk":return c=n.process,t(tt(a=o,r).map(function(t){return!0===t?c(a):t}));case"mergeWithThunk":return Je(o,r,rt({}),function(t){return u(Xo(n.process(o),t))})}}function Qe(e){return{extract:function(t,n){return e().extract(t,n)},toString:function(){return e().toString()}}}function Ze(t){var s=Jo(t),l=I(t,function(e,t){return Ne(t,function(t){var n;return Xo(e,((n={})[t]=!0,n))},rt(e))},{});return{extract:function(t,n){var e,o,r,i,u,a,c=F(w(n)?[]:kt((r=d,i=o={},u=function(t,n){i[n]=t},a=st,J(n,function(t,n){(r(t,n)?u:a)(t,n)}),o)),function(t){return!nt(l,t)});return 0===c.length?s.extract(t,n):(e=c,qe(t,function(){return"There are unsupported fields: ["+e.join(", ")+"] specified"}))},toString:s.toString}}function to(o){return{extract:function(e,t){var n=M(t,function(t,n){return o.extract(e.concat(["["+n+"]"]),t)});return qo(n)},toString:function(){return"array("+o.toString()+")"}}}function no(u){return{extract:function(t,n){for(var e=[],o=0,r=u;o<r.length;o++){var i=r[o].extract(t,n);if(i.stype===Un.Value)return i;e.push(i)}return qo(e)},toString:function(){return"oneOf("+M(u,function(t){return t.toString()}).join(", ")+")"}}}function eo(e,o){return Ke(function(t){var n=typeof t;return e(t)?zo(t):No("Expected type: "+o+" but got: "+n)})}function oo(n,a){return{extract:function(i,u){return tt(u,n).fold(function(){return t=n,qe(i,function(){return'Choice schema did not contain choice key: "'+t+'"'});var t},function(t){return e=i,n=u,tt(o=a,r=t).fold(function(){return t=o,n=r,qe(e,function(){return'The chosen schema: "'+n+'" did not exist in branches: '+Ye(t)});var t,n},function(t){return t.extract(e.concat(["branch: "+r]),n)});var e,n,o,r})},toString:function(){return"chooseOn("+n+"). Possible values: "+kt(a)}}}function ro(n){return Ke(function(t){return n(t).fold(No,zo)})}function io(n,t){return r=function(t){return n(t).fold(He,Pe)},i=t,{extract:function(e,o){var t=kt(o),n=to(Ke(r)).extract(e,t);return Lo(n,function(t){var n=M(t,function(t){return ze(t,t,We(),i)});return Jo(n).extract(e,o)})},toString:function(){return"setOf("+i.toString()+")"}};var r,i}function uo(t,n,e){return Ho((r=n.extract([t],o=e),jo(r,function(t){return{input:o,errors:t}})));var o,r}function ao(t){return t.fold(function(t){throw new Error(ir(t))},h)}function co(t,n,e){return ao(uo(t,n,e))}function so(t,n){return oo(t,dt(n,Jo))}function lo(n){return ro(function(t){return wt(n,t)?Re.value(t):Re.error('Unsupported value: "'+t+'", choose one of "'+n.join(", ")+'".')})}function fo(t){return ur(t,t,We(),Qo())}function mo(t,n){return ur(t,t,We(),n)}function go(t){return mo(t,tr)}function po(t,n){return ur(t,t,We(),lo(n))}function ho(t){return mo(t,er)}function vo(t,n){return ur(t,t,We(),Jo(n))}function bo(t,n){return ur(t,t,We(),$o(n))}function yo(t,n){return ur(t,t,We(),to(n))}function xo(t){return ur(t,t,Ge(),Qo())}function wo(t,n){return ur(t,t,Ge(),n)}function So(t){return wo(t,Zo)}function Co(t){return wo(t,tr)}function ko(t){return wo(t,er)}function Oo(t,n){return wo(t,to(n))}function _o(t,n){return wo(t,Jo(n))}function To(t,n){return ur(t,t,je(n),Qo())}function Eo(t,n,e){return ur(t,t,je(n),e)}function Do(t,n){return Eo(t,n,Zo)}function Bo(t,n){return Eo(t,n,tr)}function Mo(t,n,e){return Eo(t,n,lo(e))}function Ao(t,n){return Eo(t,n,nr)}function Fo(t,n){return Eo(t,n,er)}function Io(t,n,e){return Eo(t,n,to(e))}function Ro(t,n,e){return Eo(t,n,Jo(e))}function Vo(t){var n=t;return{get:function(){return n},set:function(t){n=t}}}(jn=Un={})[jn.Error=0]="Error",jn[jn.Value=1]="Value";function Po(u){if(!c(u))throw new Error("cases must be an array");if(0===u.length)throw new Error("there must be at least one case");var a=[],e={};return St(u,function(t,o){var n=kt(t);if(1!==n.length)throw new Error("one and only one name per case");var r=n[0],i=t[r];if(void 0!==e[r])throw new Error("duplicate key detected:"+r);if("cata"===r)throw new Error("cannot have a case named cata (sorry)");if(!c(i))throw new Error("case arguments must be an array");a.push(r),e[r]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=e.length;if(n!==i.length)throw new Error("Wrong number of arguments to case "+r+". Expected "+i.length+" ("+i+"), got "+n);return{fold:function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];if(t.length!==u.length)throw new Error("Wrong number of arguments to fold. Expected "+u.length+", got "+t.length);return t[o].apply(null,e)},match:function(t){var n=kt(t);if(a.length!==n.length)throw new Error("Wrong number of arguments to match. Expected: "+a.join(",")+"\nActual: "+n.join(","));if(!N(a,function(t){return wt(n,t)}))throw new Error("Not all branches were specified when using match. Specified: "+n.join(", ")+"\nRequired: "+a.join(", "));return t[r].apply(null,e)},log:function(t){console.log(t,{constructors:a,constructor:r,params:e})}}}}),e}var Ho=function(t){return Ve(t,Re.error,Re.value)},zo=Pe,No=He,Lo=function(t,n){return t.stype===Un.Value?n(t.svalue):t},Wo=function(t,n){return t.stype===Un.Error?n(t.serror):t},Uo=function(t,n){return t.stype===Un.Value?{stype:Un.Value,svalue:n(t.svalue)}:t},jo=function(t,n){return t.stype===Un.Error?{stype:Un.Error,serror:n(t.serror)}:t},Go=Ve,Xo=Le(function(t,n){return x(t)&&x(n)?Xo(t,n):n}),Yo=Le(function(t,n){return n}),qo=function(t){var n,e,o=(n=[],e=[],St(t,function(t){Ve(t,function(t){return e.push(t)},function(t){return n.push(t)})}),{values:n,errors:e});return 0<o.errors.length?r(No,ft)(o.errors):zo(o.values)},Ko=Ke(zo),Jo=function(e){return{extract:function(i,u){for(var a={},c=[],t=0,n=e;t<n.length;t++)Ne(n[t],function(t,n,e,o){var r=$e(e,i,u,t,o);Go(r,function(t){c.push.apply(c,t)},function(t){a[n]=t})},function(t,n){a[t]=n(u)});return 0<c.length?No(c):zo(a)},toString:function(){return"obj{\n"+M(e,function(t){return Ne(t,function(t,n,e,o){return t+" -> "+o.toString()},function(t,n){return"state("+t+")"})}).join("\n")+"}"}}},$o=r(to,Jo),Qo=rt(Ko),Zo=eo(u,"number"),tr=eo(y,"string"),nr=eo(w,"boolean"),er=eo(m,"function"),or=function(n){if(Object(n)!==n)return!0;switch({}.toString.call(n).slice(8,-1)){case"Boolean":case"Number":case"String":case"Date":case"RegExp":case"Blob":case"FileList":case"ImageData":case"ImageBitmap":case"ArrayBuffer":return!0;case"Array":case"Object":return Object.keys(n).every(function(t){return or(n[t])});default:return!1}},rr=Ke(function(t){return or(t)?zo(t):No("Expected value to be acceptable for sending via postMessage")}),ir=function(t){return"Errors: \n"+M(10<(n=t.errors).length?n.slice(0,10).concat([{path:[],getErrorInfo:rt("... (only showing first ten failures)")}]):n,function(t){return"Failed path: ("+t.path.join(" > ")+")\n"+t.getErrorInfo()}).join("\n")+"\n\nInput object: "+Ye(t.input);var n},ur=ze,ar=function(t,n){return{tag:"custom",newKey:t,instantiator:n}};function cr(t,n){return(e={})[t]=n,e;var e}function sr(t){return n={},St(t,function(t){n[t.key]=t.value}),n;var n}function lr(t){return m(t)?t:O}function fr(t,n,e){for(var o=t.dom,r=lr(e);o.parentNode;){var o=o.parentNode,i=At.fromDom(o),u=n(i);if(u.isSome())return u;if(r(i))break}return vt.none()}function dr(t,n,e){var o=n(t),r=lr(e);return o.orThunk(function(){return r(t)?vt.none():fr(t,n,r)})}function mr(t,n){return Lt(t.element,n.event.target)}function gr(t){if(!nt(t,"can")&&!nt(t,"abort")&&!nt(t,"run"))throw new Error("EventHandler defined by: "+JSON.stringify(t,null,2)+" does not have can, abort, or run!");return lt(lt({},ui),t)}function pr(t){return rt("alloy."+t)}function hr(t,n){tu(t,t.element,n,{})}function vr(t,n,e){tu(t,t.element,n,e)}function br(t){hr(t,Fi())}function yr(t,n,e){tu(t,n,e,{})}function xr(t,n,e,o){t.getSystem().triggerEvent(e,n,o.event)}function wr(t,n){return{key:t,value:gr({abort:n})}}function Sr(t){return{key:t,value:gr({run:function(t,n){n.event.prevent()}})}}function Cr(t,n){return{key:t,value:gr({run:n})}}function kr(t,e,o){return{key:t,value:gr({run:function(t,n){e.apply(void 0,[t,n].concat(o))}})}}function Or(t){return function(e){return{key:t,value:gr({run:function(t,n){mr(t,n)&&e(t,n)}})}}}function _r(t,n,e){var o,r=n.partUids[e];return Cr(o=t,function(t,n){t.getSystem().getByUid(r).each(function(t){xr(t,t.element,o,n)})})}function Tr(t,r){return Cr(t,function(n,t){var e=t.event,o=n.getSystem().getByDom(e.target).getOrThunk(function(){return dr(e.target,function(t){return n.getSystem().getByDom(t).toOptional()},O).getOr(n)});r(n,o,t)})}function Er(t){return Cr(t,function(t,n){n.cut()})}function Dr(t,n){return Or(t)(n)}function Br(t){return t.dom.innerHTML}function Mr(t,n){var e,o,r=Ut(t).dom,i=At.fromDom(r.createDocumentFragment());Mn(i,(e=n,(o=(r||document).createElement("div")).innerHTML=e,Kt(At.fromDom(o)))),An(t),_e(t,i)}function Ar(t){if(Zt(t))return"#shadow-root";var n=At.fromDom(t.dom.cloneNode(!1)),e=At.fromTag("div"),o=At.fromDom(n.dom.cloneNode(!0));return _e(e,o),Br(e)}function Fr(t){var n=(new Date).getTime();return t+"_"+Math.floor(1e9*Math.random())+ ++cu+String(n)}function Ir(t){var n=Gn(t)?t.dom[du]:null;return vt.from(n)}function Rr(n){function e(t){return"The component must be in a context to execute: "+t+(n?"\n"+Ar(n().element)+" is not in context.":"")}function t(t){return function(){throw new Error(e(t))}}function o(t){return function(){console.warn(e(t))}}return{debugInfo:rt("fake"),triggerEvent:o("triggerEvent"),triggerFocus:o("triggerFocus"),triggerEscape:o("triggerEscape"),broadcast:o("broadcast"),broadcastOn:o("broadcastOn"),broadcastEvent:o("broadcastEvent"),build:t("build"),addToWorld:t("addToWorld"),removeFromWorld:t("removeFromWorld"),addToGui:t("addToGui"),removeFromGui:t("removeFromGui"),getByUid:t("getByUid"),getByDom:t("getByDom"),isConnected:O}}function Vr(t,n){var e=t.toString(),o=e.indexOf(")")+1,r=e.indexOf("("),i=e.substring(r+1,o-1).split(/,\s*/);return t.toFunctionAnnotation=function(){return{name:n,parameters:vu(i)}},t}function Pr(t){return cr(bu,t)}function Hr(o){return t=function(t){for(var n=[],e=1;e<arguments.length;e++)n[e-1]=arguments[e];return o.apply(void 0,H([t.getApis(),t],n,!1))},e=(n=o.toString()).indexOf(")")+1,r=n.indexOf("("),i=n.substring(r+1,e-1).split(/,\s*/),t.toFunctionAnnotation=function(){return{name:"OVERRIDE",parameters:vu(i.slice(1))}},t;var t,n,e,r,i}function zr(t,r){var i={};return J(t,function(t,o){J(t,function(t,n){var e=tt(i,n).getOr([]);i[n]=e.concat([r(o,t)])})}),i}function Nr(t){return{classes:E(t.classes)?[]:t.classes,attributes:E(t.attributes)?{}:t.attributes,styles:E(t.styles)?{}:t.styles}}function Lr(t){return t.cHandler}function Wr(t,n){return{name:t,handler:n}}function Ur(t,n,e){var o=n[e];return o?function(u,t,a){try{var n=G(t,function(t,n){var e=t.name,o=n.name,r=a.indexOf(e),i=a.indexOf(o);if(-1===r)throw new Error("The ordering for "+u+" does not have an entry for "+e+".\nOrder specified: "+JSON.stringify(a,null,2));if(-1===i)throw new Error("The ordering for "+u+" does not have an entry for "+o+".\nOrder specified: "+JSON.stringify(a,null,2));return r<i?-1:i<r?1:0});return Re.value(n)}catch(t){return Re.error([t])}}("Event: "+e,t,o).map(function(t){var e,n,o,r,i=M(t,function(t){return t.handler});return{can:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return R(n,function(t,n){return t&&n.can.apply(void 0,e)},!0)},abort:(o=n=e=i,r=function(t){return t.abort},function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return R(o,function(t,n){return t||r(n).apply(void 0,e)},!1)}),run:function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];St(e,function(t){t.run.apply(void 0,n)})}}}):Re.error(["The event ("+e+') has more than one behaviour that listens to it.\nWhen this occurs, you must specify an event ordering for the behaviours in your spec (e.g. [ "listing", "toggling" ]).\nThe behaviours that can trigger it are: '+JSON.stringify(M(t,function(t){return t.name}),null,2)])}function jr(t,n){var e=rn(t,n);return void 0===e||""===e?[]:e.split(" ")}function Gr(t){return void 0!==t.dom.classList}function Xr(t,n){var e,o,r;Gr(t)?t.dom.classList.add(n):(o=n,r=jr(e=t,"class").concat([o]),on(e,"class",r.join(" ")))}function Yr(t,n){var e,o,r,i;Gr(t)?t.dom.classList.remove(n):(r=n,0<(i=F(jr(o=t,"class"),function(t){return t!==r})).length?on(o,"class",i.join(" ")):cn(o,"class")),0===(Gr(e=t)?e.dom.classList:jr(e,"class")).length&&cn(e,"class")}function qr(t,n){return Gr(t)&&t.dom.classList.contains(n)}function Kr(n,t){St(t,function(t){Xr(n,t)})}function Jr(n,t){St(t,function(t){Yr(n,t)})}function $r(t){return t.dom.value}function Qr(t,n){if(void 0===n)throw new Error("Value.set was undefined");t.dom.value=n}function Zr(t){var e,n,o,r,i=(e=tt(t,"behaviours").getOr({}),z(kt(e),function(t){var n=e[t];return d(n)?[n.me]:[]}));return n=t,r=M(o=i,function(t){return _o(t.name(),[fo("config"),To("state",yu)])}),{list:o,data:dt(uo("component.behaviours",Jo(r),n.behaviours).fold(function(t){throw new Error(ir(t)+"\nComplete spec:\n"+JSON.stringify(n,null,2))},h),function(t){return rt(t.map(function(t){return{config:t.config,state:t.state.init(t.config)}}))})}}function ti(t,n,e){var o,r,i=lt(lt({},(o=t).dom),{uid:o.uid,domChildren:M(o.components,function(t){return t.element})}),u=t.domModification.fold(function(){return Nr({})},Nr),a=0<n.length?function(n,t,e,o){var r=lt({},t);function i(t){return I(t,function(t,n){return lt(lt({},n.modification),t)},{})}St(e,function(t){r[t.name()]=t.exhibit(n,o)});var u=zr(r,function(t,n){return{name:t,modification:n}});return Nr({classes:I(u.classes,function(t,n){return n.modification.concat(t)},[]),attributes:i(u.attributes),styles:i(u.styles)})}(e,{"alloy.base.modification":u},n,i):u;return lt(lt({},r=i),{attributes:lt(lt({},r.attributes),a.attributes),styles:lt(lt({},r.styles),a.styles),classes:r.classes.concat(a.classes)})}function ni(t,n,e){var o,r,i,u,a,c={"alloy.base.behaviour":t.events},s=t.eventOrder;return r=e,i=n,o=zr(lt(lt({},c),(u=r,a={},St(i,function(t){a[t.name()]=t.handlers(u)}),a)),Wr),wu(o,s).getOrDie()}function ei(e){function t(){return l}var n=Vo(hu),o=ao(uo("custom.definition",Cu,e)),r=Zr(e),i=r.list,u=r.data,a=function(t){var n=At.fromTag(t.tag),e=t.attributes,o=n.dom;J(e,function(t,n){en(o,n,t)}),Kr(n,t.classes),dn(n,t.styles),t.innerHtml.each(function(t){return Mr(n,t)});var r=t.domChildren;return Mn(n,r),t.value.each(function(t){Qr(n,t)}),t.uid,mu(n,t.uid),n}(ti(o,i,u)),c=ni(o,i,u),s=Vo(o.components),l={uid:e.uid,getSystem:n.get,config:function(t){var n=u;return(m(n[t.name()])?n[t.name()]:function(){throw new Error("Could not find "+t.name()+" in "+JSON.stringify(e,null,2))})()},hasConfigured:function(t){return m(u[t.name()])},spec:e,readState:function(t){return u[t]().map(function(t){return t.state.readState()}).getOr("not enabled")},getApis:function(){return o.apis},connect:function(t){n.set(t)},disconnect:function(){n.set(Rr(t))},element:a,syncComponents:function(){var t=z(Kt(a),function(t){return n.get().getByDom(t).fold(function(){return[]},j)});s.set(t)},components:s.get,events:c};return l}function oi(t){var n=At.fromText(t);return ku({element:n})}Po([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]);var ri,ii,ui={can:_,abort:O,run:st},ai=rt,ci=ai("touchstart"),si=ai("touchmove"),li=ai("touchend"),fi=ai("touchcancel"),di=ai("mousedown"),mi=ai("mousemove"),gi=ai("mouseout"),pi=ai("mouseup"),hi=ai("mouseover"),vi=ai("focusin"),bi=ai("focusout"),yi=ai("keydown"),xi=ai("keyup"),wi=ai("input"),Si=ai("change"),Ci=ai("click"),ki=ai("transitioncancel"),Oi=ai("transitionend"),_i=ai("transitionstart"),Ti=ai("selectstart"),Ei={tap:pr("tap")},Di=pr("focus"),Bi=pr("blur.post"),Mi=pr("paste.post"),Ai=pr("receive"),Fi=pr("execute"),Ii=pr("focus.item"),Ri=Ei.tap,Vi=pr("longpress"),Pi=pr("sandbox.close"),Hi=pr("typeahead.cancel"),zi=pr("system.init"),Ni=pr("system.touchmove"),Li=pr("system.touchend"),Wi=pr("system.scroll"),Ui=pr("system.resize"),ji=pr("system.attached"),Gi=pr("system.detached"),Xi=pr("system.dismissRequested"),Yi=pr("system.repositionRequested"),qi=pr("focusmanager.shifted"),Ki=pr("slotcontainer.visibility"),Ji=pr("change.tab"),$i=pr("dismiss.tab"),Qi=pr("highlight"),Zi=pr("dehighlight"),tu=function(t,n,e,o){var r=lt({target:n},o);t.getSystem().triggerEvent(e,n,r)},nu=sr,eu=Or(ji()),ou=Or(Gi()),ru=Or(zi()),iu=(ri=Fi(),function(t){return Cr(ri,t)}),uu=nu([{key:Di(),value:gr({can:function(t,n){var e,o=n.event,r=o.originator,i=o.target;return!(Lt(e=r,t.element)&&!Lt(e,i)&&(console.warn(Di()+" did not get interpreted by the desired target. \nOriginator: "+Ar(r)+"\nTarget: "+Ar(i)+"\nCheck the "+Di()+" event handlers"),1))}})}]),au=Object.freeze({__proto__:null,events:uu}),cu=0,su=rt("alloy-id-"),lu=rt("data-alloy-id"),fu=su(),du=lu(),mu=function(t,n){Object.defineProperty(t.dom,du,{value:n,writable:!0})},gu=Fr,pu=h,hu=Rr(),vu=function(t){return M(t,function(t){return Bt(t,"/*")?t.substring(0,t.length-"/*".length):t})},bu=Fr("alloy-premade"),yu={init:function(){return xu({readState:rt("No State required")})}},xu=function(t){return t},wu=function(t,a){var n,e,o,r,i,u,c=$(t,function(r,u){return(1===r.length?Re.value(r[0].handler):Ur(r,a,u)).map(function(t){var n,i,e=(i=m(n=t)?{can:_,abort:O,run:n}:n,function(t,n){for(var e=[],o=2;o<arguments.length;o++)e[o-2]=arguments[o];var r=[t,n].concat(e);i.abort.apply(void 0,r)?n.stop():i.can.apply(void 0,r)&&i.run.apply(void 0,r)}),o=1<r.length?F(a[u],function(n){return T(r,function(t){return t.name===n})}).join(" > "):r[0].name;return cr(u,{handler:e,purpose:o})})});return n={},e=[],o=[],St(c,function(t){t.fold(function(t){e.push(t)},function(t){o.push(t)})}),0<(u={errors:e,values:o}).errors.length?Re.error(ft(u.errors)):(i=n,0===(r=u.values).length?Re.value(i):Re.value(Xo(i,Yo.apply(void 0,r))))},Su="alloy.base.behaviour",Cu=Jo([ur("dom","dom",We(),Jo([fo("tag"),To("styles",{}),To("classes",[]),To("attributes",{}),xo("value"),xo("innerHtml")])),fo("components"),fo("uid"),To("events",{}),To("apis",{}),ur("eventOrder","eventOrder",((ii={})[Fi()]=["disabling",Su,"toggling","typeaheadevents"],ii[Di()]=[Su,"focusing","keying"],ii[zi()]=[Su,"disabling","toggling","representing"],ii[wi()]=[Su,"representing","streaming","invalidating"],ii[Gi()]=[Su,"representing","item-events","tooltipping"],ii[di()]=["focusing",Su,"item-type-events"],ii[ci()]=["focusing",Su,"item-type-events"],ii[hi()]=["item-type-events","tooltipping"],ii[Ai()]=["receiving","reflecting","tooltipping"],Xe(rt(ii))),Qo()),xo("domModification")]),ku=function(t){var n=co("external.component",Ze([fo("element"),xo("uid")]),t),e=Vo(Rr()),o=n.uid.getOrThunk(function(){return gu("external")});mu(n.element,o);var r={uid:o,getSystem:e.get,config:vt.none,hasConfigured:O,connect:function(t){e.set(t)},disconnect:function(){e.set(Rr(function(){return r}))},getApis:function(){return{}},element:n.element,spec:t,readState:rt("No state"),syncComponents:st,components:rt([]),events:{}};return Pr(r)},Ou=gu,_u=function(u){return tt(u,bu).getOrThunk(function(){var t,n,e,o,r,i=Tt(u,"uid")?u:lt({uid:Ou("")},u);return t=pu(i),n=t.events,e=s(t,["events"]),o=M(tt(e,"components").getOr([]),_u),r=lt(lt({},e),{events:lt(lt({},au),n),components:o}),Re.value(ei(r)).getOrDie()})},Tu=Pr;function Eu(t,n,e,o,r){return t(e,o)?vt.some(e):m(r)&&r(e)?vt.none():n(e,o,r)}function Du(t,n,e){for(var o=t.dom,r=m(e)?e:O;o.parentNode;){var o=o.parentNode,i=At.fromDom(o);if(n(i))return vt.some(i);if(r(i))break}return vt.none()}function Bu(t,n,e){return Eu(function(t,n){return n(t)},Du,t,n,e)}function Mu(t,n,e){return Bu(t,n,e).isSome()}function Au(t,n,e){return Du(t,function(t){return zt(t,n)},e)}function Fu(t,n){return e=n,Nt(o=void 0===t?document:t.dom)?vt.none():vt.from(o.querySelector(e)).map(At.fromDom);var e,o}function Iu(t,n,e){return Eu(zt,Au,t,n,e)}function Ru(){var n=Fr("aria-owns");return{id:n,link:function(t){on(t,"aria-owns",n)},unlink:function(t){cn(t,"aria-owns")}}}var Vu,Pu,Hu=function(n,t){return Mu(t,function(t){return Lt(t,n.element)},O)||(e=n,Bu(t,function(t){if(!Gn(t))return!1;var n=rn(t,"id");return void 0!==n&&-1<n.indexOf("aria-owns")}).bind(function(t){var n=rn(t,"id");return Fu(me(t),'[aria-owns="'+n+'"]')}).exists(function(t){return Hu(e,t)}));var e},zu="unknown";function Nu(n,t,e){var o,r,i,u;switch(tt(Lu.get(),n).orThunk(function(){return K(kt(Lu.get()),function(t){return-1<n.indexOf(t)?vt.some(Lu.get()[t]):vt.none()})}).getOr(Vu.NORMAL)){case Vu.NORMAL:return e(Uu());case Vu.LOGGING:var a=(o=n,r=t,i=[],u=(new Date).getTime(),{logEventCut:function(t,n,e){i.push({outcome:"cut",target:n,purpose:e})},logEventStopped:function(t,n,e){i.push({outcome:"stopped",target:n,purpose:e})},logNoParent:function(t,n,e){i.push({outcome:"no-parent",target:n,purpose:e})},logEventNoHandlers:function(t,n){i.push({outcome:"no-handlers-left",target:n})},logEventResponse:function(t,n,e){i.push({outcome:"response",purpose:e,target:n})},write:function(){var t=(new Date).getTime();wt(["mousemove","mouseover","mouseout",zi()],o)||console.log(o,{event:o,time:t-u,target:r.dom,sequence:M(i,function(t){return wt(["cut","stopped","response"],t.outcome)?"{"+t.purpose+"} "+t.outcome+" at ("+Ar(t.target)+")":t.outcome})})}}),c=e(a);return a.write(),c;case Vu.STOP:return!0}}(Pu=Vu=Vu||{})[Pu.STOP=0]="STOP",Pu[Pu.NORMAL=1]="NORMAL",Pu[Pu.LOGGING=2]="LOGGING";var Lu=Vo({}),Wu=["alloy/data/Fields","alloy/debugging/Debugging"],Uu=rt({logEventCut:st,logEventStopped:st,logNoParent:st,logEventNoHandlers:st,logEventResponse:st,write:st}),ju=rt([fo("menu"),fo("selectedMenu")]),Gu=rt([fo("item"),fo("selectedItem")]);function Xu(){return vo("markers",[fo("backgroundMenu")].concat(ju()).concat(Gu()))}function Yu(t){return vo("markers",M(t,fo))}function qu(t,n,e){return void 0!==(o=new Error).stack&&V(o.stack.split("\n"),function(n){return 0<n.indexOf("alloy")&&!T(Wu,function(t){return-1<n.indexOf(t)})}).getOr(zu),ur(n,n,e,ro(function(e){return Re.value(function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e.apply(void 0,t)})}));var o}function Ku(t){return qu(0,t,je(st))}function Ju(t){return qu(0,t,je(vt.none))}function $u(t){return qu(0,t,We())}function Qu(t){return qu(0,t,We())}function Zu(t,n){return ar(t,rt(n))}function ta(t){return ar(t,h)}function na(t,n,e,o,r,i,u,a){return{x:t,y:n,bubble:e,direction:o,placement:r,restriction:i,label:u+"-"+r,alwaysFit:a=void 0!==a&&a}}function ea(t,n,e,o){var r=t+n;return o<r?e:r<e?o:r}function oa(e,n){return U(["left","right","top","bottom"],function(t){return tt(n,t).map(function(n){return function(t){switch(n){case 1:return t.x;case 0:return t.x+t.width;case 2:return t.y;case 3:return t.y+t.height}}(e)})})}function ra(t,n){return t.x+t.width/2-n.width/2}function ia(t,n){return t.x+t.width-n.width}function ua(t,n){return t.y-n.height}function aa(t){return t.y+t.height}function ca(t,n){return t.y+t.height/2-n.height/2}function sa(t,n,e){return na(t.x+t.width,ca(t,n),e.east(),La(),"east",oa(t,{left:0}),ja)}function la(t,n,e){return na(t.x-n.width,ca(t,n),e.west(),Wa(),"west",oa(t,{right:1}),ja)}function fa(){return[Ga,Xa,Ya,qa,Ja,Ka,sa,la]}function da(){return[Xa,Ga,qa,Ya,Ja,Ka,sa,la]}function ma(){return[Ya,qa,Ga,Xa,Ka,Ja]}function ga(){return[qa,Ya,Xa,Ga,Ka,Ja]}function pa(){return[Ga,Xa,Ya,qa,Ja,Ka]}function ha(){return[Xa,Ga,qa,Ya,Ja,Ka]}function va(e,o,r){return ru(function(t,n){r(t,e,o)})}function ba(t){return{key:t,value:void 0}}function ya(t){var n,e,o,r,i,u,a,c,s=co("Creating behaviour: "+t.name,nc,t);return n=s.fields,e=s.name,o=s.active,r=s.apis,i=s.extra,u=s.state,a=Ze(n),c=_o(e,[wo("config",Ze(n))]),Za(a,c,e,o,r,i,u)}function xa(t){var n,e=co("Creating behaviour: "+t.name,ec,t),o=so(e.branchKey,e.branches),r=e.name,i=e.active,u=e.apis,a=e.extra,c=e.state,s=_o(r,[wo("config",n=o)]);return Za(n,s,r,i,u,a,c)}function wa(){return At.fromDom(document)}function Sa(t){return t.dom.focus()}function Ca(t){var n=me(t).dom;return t.dom===n.activeElement}function ka(t){return void 0===t&&(t=wa()),vt.from(t.dom.activeElement).map(At.fromDom)}function Oa(n){return ka(me(n)).filter(function(t){return n.dom.contains(t.dom)})}function _a(t,e){var o=me(e),n=ka(o).bind(function(n){function t(t){return Lt(n,t)}var r,i;return t(e)?vt.some(e):(r=t,(i=function(t){for(var n=0;n<t.childNodes.length;n++){var e=At.fromDom(t.childNodes[n]);if(r(e))return vt.some(e);var o=i(t.childNodes[n]);if(o.isSome())return o}return vt.none()})(e.dom))}),r=t(e);return n.each(function(n){ka(o).filter(function(t){return Lt(t,n)}).fold(function(){Sa(n)},st)}),r}function Ta(t,n,e,o,r){function i(t){return t+"px"}return{position:t,left:n.map(i),top:e.map(i),right:o.map(i),bottom:r.map(i)}}function Ea(t,n){var e;mn(t,lt(lt({},e=n),{position:vt.some(e.position)}))}function Da(t,n,e,o,r,i){var u=n.rect,a=u.x-e,c=u.y-o,s=r-(a+u.width),l=i-(c+u.height),f=vt.some(a),d=vt.some(c),m=vt.some(s),g=vt.some(l),p=vt.none();return n.direction.fold(function(){return Ta(t,f,d,p,p)},function(){return Ta(t,p,d,m,p)},function(){return Ta(t,f,p,p,g)},function(){return Ta(t,p,p,m,g)},function(){return Ta(t,f,d,p,p)},function(){return Ta(t,f,p,p,g)},function(){return Ta(t,f,d,p,p)},function(){return Ta(t,p,d,m,p)})}function Ba(t,r){return t.fold(function(){var t=r.rect;return Ta("absolute",vt.some(t.x),vt.some(t.y),vt.none(),vt.none())},function(t,n,e,o){return Da("absolute",r,t,n,e,o)},function(t,n,e,o){return Da("fixed",r,t,n,e,o)})}function Ma(t,n){var e=S(Hn,n),o=t.fold(e,e,function(){var t=In();return Hn(n).translate(-t.left,-t.top)}),r=On(n),i=wn(n);return Be(o.left,o.top,r,i)}rt(Jo(Gu().concat(ju())));var Aa=rt(Jo(Gu())),Fa=rt(vo("initSize",[fo("numColumns"),fo("numRows")])),Ia=Po([{southeast:[]},{southwest:[]},{northeast:[]},{northwest:[]},{south:[]},{north:[]},{east:[]},{west:[]}]),Ra=Ia.southeast,Va=Ia.southwest,Pa=Ia.northeast,Ha=Ia.northwest,za=Ia.south,Na=Ia.north,La=Ia.east,Wa=Ia.west,Ua=function(t,n,e){return Math.min(Math.max(t,n),e)},ja="layout",Ga=function(t,n,e){return na(t.x,aa(t),e.southeast(),Ra(),"southeast",oa(t,{left:1,top:3}),ja)},Xa=function(t,n,e){return na(ia(t,n),aa(t),e.southwest(),Va(),"southwest",oa(t,{right:0,top:3}),ja)},Ya=function(t,n,e){return na(t.x,ua(t,n),e.northeast(),Pa(),"northeast",oa(t,{left:1,bottom:2}),ja)},qa=function(t,n,e){return na(ia(t,n),ua(t,n),e.northwest(),Ha(),"northwest",oa(t,{right:0,bottom:2}),ja)},Ka=function(t,n,e){return na(ra(t,n),ua(t,n),e.north(),Na(),"north",oa(t,{bottom:2}),ja)},Ja=function(t,n,e){return na(ra(t,n),aa(t),e.south(),za(),"south",oa(t,{top:3}),ja)},$a=Object.freeze({__proto__:null,events:function(a){return nu([Cr(Ai(),function(r,t){var n,i=a.channels,e=kt(i),u=t,o=(n=u).universal?e:F(e,function(t){return wt(n.channels,t)});St(o,function(t){var n=i[t],e=n.schema,o=co("channel["+t+"] data\nReceiver: "+Ar(r.element),e,u.data);n.onReceive(r,o)})})])}}),Qa=[mo("channels",io(Re.value,Ze([$u("onReceive"),To("schema",Qo())])))],Za=function(e,t,f,n,o,r,i){function u(t){return nt(t,f)?t[f]():vt.none()}var a=dt(o,function(t,n){return r=f,e=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var o=[e].concat(t);return e.config({name:rt(r)}).fold(function(){throw new Error("We could not find any behaviour configuration for: "+r+". Using API: "+u)},function(t){var n=Array.prototype.slice.call(o,1);return i.apply(void 0,[e,t.config,t.state].concat(n))})},o=u=n,a=(i=t).toString(),c=a.indexOf(")")+1,s=a.indexOf("("),l=a.substring(s+1,c-1).split(/,\s*/),e.toFunctionAnnotation=function(){return{name:o,parameters:vu(l.slice(0,1).concat(l.slice(3)))}},e;var r,i,u,e,o,a,c,s,l}),c=dt(r,Vr),s=lt(lt(lt({},c),a),{revoke:S(ba,f),config:function(t){var n=co(f+"-config",e,t);return{key:f,value:{config:n,me:s,configAsRaw:Rt(function(){return co(f+"-config",e,t)}),initialConfig:t,state:i}}},schema:rt(t),exhibit:function(t,e){return Et(u(t),tt(n,"exhibit"),function(t,n){return n(e,t.config,t.state)}).getOrThunk(function(){return Nr({})})},name:rt(f),handlers:function(t){return u(t).map(function(t){return tt(n,"events").getOr(function(){return{}})(t.config,t.state)}).getOr({})}});return s},tc=sr,nc=Ze([fo("fields"),fo("name"),To("active",{}),To("apis",{}),To("state",yu),To("extra",{})]),ec=Ze([fo("branchKey"),fo("branches"),fo("name"),To("active",{}),To("apis",{}),To("state",yu),To("extra",{})]),oc=rt(void 0),rc=ya({fields:Qa,name:"receiving",active:$a}),ic=Object.freeze({__proto__:null,exhibit:function(t,n){return Nr({classes:[],styles:n.useFixed()?{}:{position:"relative"}})}}),uc=Po([{none:[]},{relative:["x","y","width","height"]},{fixed:["x","y","width","height"]}]),ac=function(t,n,e){var o=Se(n,e);return t.fold(rt(o),rt(o),function(){var t=In();return o.translate(-t.left,-t.top)})};function cc(t){return un(t,Tc)}function sc(t,n,e,o){var r,i,u,a,c,s,l,f,d,m,g,p,h,v,b,y,x,w,S,C,k,O,_,T,E,D,B,M,A,F,I,R,V,P,H,z,N,L,W,U=t.bubble,j=U.offset,G=(V=o,P=t.restriction,H=j,z=ot("left",V.x),N=ot("top",V.y),L=ot("right",V.right),W=ot("bottom",V.bottom),Be(z,N,L-z,W-N)),X=t.x+j.left,Y=t.y+j.top,q=Be(X,Y,n,e),K=(r=G.x,i=G.y,u=G.right,a=G.bottom,c=q.x,s=q.y,l=q.right,f=q.bottom,d=q.width,m=q.height,{originInBounds:r<=c&&c<=u&&i<=s&&s<=a,sizeInBounds:l<=u&&r<=l&&f<=a&&i<=f,visibleW:Math.min(d,r<=c?u-c:l-r),visibleH:Math.min(m,i<=s?a-s:f-i)}),J=K.visibleW,$=K.visibleH,Q=K.originInBounds&&K.sizeInBounds,Z=Q?q:(g=G.x,p=G.y,h=G.right,v=G.bottom,b=q.x,y=q.y,x=q.width,w=q.height,S=Math.max(g,h-x),C=Math.max(p,v-w),k=Ua(b,g,S),O=Ua(y,p,C),_=Math.min(k+x,h)-k,T=Math.min(O+w,v)-O,Be(k,O,_,T)),tt=0<Z.width&&0<Z.height,nt=(E=t.direction,M=rt((D=Z).bottom-(B=o).y),A=rt(B.bottom-D.y),F=E.fold(A,A,M,M,A,M,A,A),I=rt(D.right-B.x),R=rt(B.right-D.x),{maxWidth:E.fold(R,I,R,I,R,R,R,I),maxHeight:F}),et={rect:Z,maxHeight:nt.maxHeight,maxWidth:nt.maxWidth,direction:t.direction,placement:t.placement,classes:{on:U.classesOn,off:U.classesOff},layout:t.label,testY:Y};function ot(r,i){return P[r].map(function(t){var n="top"===r||"bottom"===r,e=n?H.top:H.left,o=("left"===r||"top"===r?Math.max:Math.min)(t,i)+e;return n?Ua(o,V.y,V.bottom):Ua(o,V.x,V.right)}).getOr(i)}return Q||t.alwaysFit?Ec.fit(et):Ec.nofit(et,J,$,tt)}function lc(t){function n(){return e.get().each(t)}var e=Vo(vt.none());return{clear:function(){n(),e.set(vt.none())},isSet:function(){return e.get().isSome()},get:function(){return e.get()},set:function(t){n(),e.set(vt.some(t))}}}function fc(){return lc(function(t){return t.unbind()})}function dc(){var n=lc(st);return lt(lt({},n),{on:function(t){return n.get().each(t)}})}function mc(t,n,e){return Tn(t,n,Dc,e,!1)}function gc(t,n,e){return Tn(t,n,Dc,e,!0)}function pc(o,e){function r(t){var n,e=null!==(n=t.raw.pseudoElement)&&void 0!==n?n:"";return Lt(t.target,o)&&!at(e)&&wt(Mc,t.raw.propertyName)}function t(t){var n;(g(t)||r(t))&&(a.clear(),c.clear(),!g(n=null==t?void 0:t.raw.type)&&n!==Oi()||(clearTimeout(i),cn(o,Ac),Jr(o,e.classes)))}function n(){a.set(mc(o,Oi(),t)),c.set(mc(o,ki(),t))}var i,u,a=fc(),c=fc();"ontransitionstart"in o.dom?u=mc(o,_i(),function(t){r(t)&&(u.unbind(),n())}):n();var s,l,f=(s=o,l=d("transition-delay"),R(d("transition-duration"),function(t,n,e){var o=m(l[e])+m(n);return Math.max(t,o)},0));function d(t){var n=gn(s,t);return F(y(n)?n.split(/\s*,\s*/):[],at)}function m(t){if(y(t)&&/^[\d.]+/.test(t)){var n=parseFloat(t);return Bt(t,"ms")?n:1e3*n}return 0}requestAnimationFrame(function(){i=setTimeout(t,f+17),on(o,Ac,i)})}function hc(t,n,e,o,r,i){var u,a,c,s,l,f,d,m,g,p=(u=o,a=r,i.exists(function(t){var n=u.mode;return"all"===n||t[n]!==a[n]}));function h(t){return parseFloat(t).toFixed(3)}p||(g=t,N(o.classes,function(t){return qr(g,t)}))?(fn(t,"position",e.position),c=Ma(n,t),s=Ba(n,lt(lt({},r),{rect:c})),l=U(Mc,function(t){return s[t]}),m=e,Q(l,function(t,n){var e,o,r,i=m[n].map(h),u=t.map(h);return!Et(e=i,o=u,r=void 0===r?v:r).getOr(e.isNone()&&o.isNone())}).isSome()&&(mn(t,l),p&&(Kr(f=t,(d=o).classes),un(f,Ac).each(function(t){clearTimeout(parseInt(t,10)),cn(f,Ac)}),pc(f,d)),bn(t))):Jr(t,o.classes)}function vc(t,n,e,o){vn(n,"max-height"),vn(n,"max-width");var r,s,i,l,f,d,m,g,p,u={width:On(r=n),height:wn(r)};return s=n,i=o.preference,l=t,f=u,d=e,m=o.bounds,g=f.width,p=f.height,R(i,function(t,n){var e=S(a,n);return t.fold(rt(t),e)},Ec.nofit({rect:l,maxHeight:f.height,maxWidth:f.width,direction:Ra(),placement:"southeast",classes:{on:[],off:[]},layout:"none",testY:l.y},-1,-1,!1)).fold(h,h);function a(t,r,i,u,a){var c=sc(t(l,f,d,s,m),g,p,m);return c.fold(rt(c),function(t,n,e,o){return(a===o?u<e||i<n:!a&&o)?c:Ec.nofit(r,i,u,a)})}}function bc(t,n){var e=t,o=Math.floor(n);fn(e,"max-height",xe.max(e,o,["margin-top","border-top-width","padding-top","padding-bottom","border-bottom-width","margin-bottom"])+"px")}function yc(t,n,e){return void 0===t[n]?e:t[n]}function xc(t,n,e,o){function r(t){return tt(e,t).getOr([])}function i(t,n,e){var o=W(Vc,e);return{offset:Se(t,n),classesOn:z(e,r),classesOff:z(o,r)}}var u=t*(o=void 0===o?1:o),a=n*o;return{southeast:function(){return i(-t,n,["top","alignLeft"])},southwest:function(){return i(t,n,["top","alignRight"])},south:function(){return i(-t/2,n,["top","alignCentre"])},northeast:function(){return i(-t,-n,["bottom","alignLeft"])},northwest:function(){return i(t,-n,["bottom","alignRight"])},north:function(){return i(-t/2,-n,["bottom","alignCentre"])},east:function(){return i(t,-n/2,["valignCentre","left"])},west:function(){return i(-t,-n/2,["valignCentre","right"])},insetNortheast:function(){return i(u,a,["top","alignLeft","inset"])},insetNorthwest:function(){return i(-u,a,["top","alignRight","inset"])},insetNorth:function(){return i(-u/2,a,["top","alignCentre","inset"])},insetSoutheast:function(){return i(u,-a,["bottom","alignLeft","inset"])},insetSouthwest:function(){return i(-u,-a,["bottom","alignRight","inset"])},insetSouth:function(){return i(-u/2,-a,["bottom","alignCentre","inset"])},insetEast:function(){return i(-u,-a/2,["valignCentre","right","inset"])},insetWest:function(){return i(u,-a/2,["valignCentre","left","inset"])}}}function wc(){return xc(0,0,{})}function Sc(n,e){return function(t){return"rtl"===Hc(t)?e:n}}uc.none;var Cc,kc,Oc=uc.relative,_c=uc.fixed,Tc="data-alloy-placement",Ec=Po([{fit:["reposition"]},{nofit:["reposition","visibleW","visibleH","isVisible"]}]),Dc=_,Bc=_n,Mc=["top","bottom","right","left"],Ac="data-alloy-transition-timer",Fc=rt(function(t,n){bc(t,n),dn(t,{"overflow-x":"hidden","overflow-y":"auto"})}),Ic=rt(function(t,n){bc(t,n)}),Rc=function(t,n,e,o){var r,i,u,a,c=vc(t,n,e,o),s=n,l=c,f=Ba((r=o).origin,l);return r.transition.each(function(t){hc(s,r.origin,f,t,l,r.lastPlacement)}),Ea(s,f),a=c.placement,on(n,Tc,a),Jr(i=n,(u=c.classes).off),Kr(i,u.on),(0,o.maxHeightFunction)(n,c.maxHeight),(0,o.maxWidthFunction)(n,c.maxWidth),{layout:c.layout,placement:c.placement}},Vc=["valignCentre","alignLeft","alignRight","alignCentre","top","bottom","left","right","inset"],Pc=h,Hc=function(t){return"rtl"===gn(t,"direction")?"rtl":"ltr"};function zc(t){return Mu(t,function(t){return Gn(t)&&rn(t,"data-alloy-vertical-dir")===Cc.BottomToTop})}function Nc(){return _o("layouts",[fo("onLtr"),fo("onRtl"),xo("onBottomLtr"),xo("onBottomRtl")])}function Lc(n,t,e,o,r,i,u){var a=u.map(zc).getOr(!1),c=t.layouts.map(function(t){return t.onLtr(n)}),s=t.layouts.map(function(t){return t.onRtl(n)});return Sc(a?t.layouts.bind(function(t){return t.onBottomLtr.map(function(t){return t(n)})}).or(c).getOr(r):c.getOr(e),a?t.layouts.bind(function(t){return t.onBottomRtl.map(function(t){return t(n)})}).or(s).getOr(i):s.getOr(o))(n)}function Wc(t){return t.fold(h,function(t,n,e){return t.translate(-n,-e)})}function Uc(t){return t.fold(h,h)}function jc(t){return R(t,function(t,n){return t.translate(n.left,n.top)},Se(0,0))}function Gc(t){return jc(M(t,Uc))}function Xc(t,n,e){var o,r,i=In(Ut(t.element)),u=(o=t,r=Xt(e.root).dom,vt.from(r.frameElement).map(At.fromDom).filter(function(t){return Lt(Ut(t),Ut(o.element))}).map(Cn).getOr(i));return is(u,i.left,i.top)}function Yc(t,n,e,o){var r=rs(Se(t,n));return vt.some({point:r,width:e,height:o})}function qc(t,a,c,s,l){return t.map(function(t){var n=[a,t.point],e=s.fold(function(){return Gc(n)},function(){return Gc(n)},function(){return jc(M(n,Wc))}),o={x:e.left,y:e.top,width:t.width,height:t.height},r=(c.showAbove?ma:pa)(),i=(c.showAbove?ga:ha)(),u=Lc(l,c,r,i,r,i,vt.none());return Pc({anchorBox:o,bubble:c.bubble.getOr(wc()),overrides:c.overrides,layouts:u,placer:vt.none()})})}function Kc(t,n,e){var o,r=t.document.createRange(),i=r;return n.fold(function(t){i.setStartBefore(t.dom)},function(t,n){i.setStart(t.dom,n)},function(t){i.setStartAfter(t.dom)}),o=r,e.fold(function(t){o.setEndBefore(t.dom)},function(t,n){o.setEnd(t.dom,n)},function(t){o.setEndAfter(t.dom)}),r}function Jc(t,n,e,o,r){var i=t.document.createRange();return i.setStart(n.dom,e),i.setEnd(o.dom,r),i}function $c(t){return{left:t.left,top:t.top,right:t.right,bottom:t.bottom,width:t.width,height:t.height}}function Qc(t,n,e){return n(At.fromDom(e.startContainer),e.startOffset,At.fromDom(e.endContainer),e.endOffset)}function Zc(i,t){return r=i,o=t.match({domRange:function(t){return{ltr:rt(t),rtl:vt.none}},relative:function(t,n){return{ltr:Rt(function(){return Kc(r,t,n)}),rtl:Rt(function(){return vt.some(Kc(r,n,t))})}},exact:function(t,n,e,o){return{ltr:Rt(function(){return Jc(r,t,n,e,o)}),rtl:Rt(function(){return vt.some(Jc(r,e,o,t,n))})}}}),((e=(n=o).ltr()).collapsed?n.rtl().filter(function(t){return!1===t.collapsed}).map(function(t){return ds.rtl(At.fromDom(t.endContainer),t.endOffset,At.fromDom(t.startContainer),t.startOffset)}).getOrThunk(function(){return Qc(0,ds.ltr,e)}):Qc(0,ds.ltr,e)).match({ltr:function(t,n,e,o){var r=i.document.createRange();return r.setStart(t.dom,n),r.setEnd(e.dom,o),r},rtl:function(t,n,e,o){var r=i.document.createRange();return r.setStart(e.dom,o),r.setEnd(t.dom,n),r}});var r,n,e,o}(Cc=Cc||{}).TopToBottom="toptobottom",Cc.BottomToTop="bottomtotop";var ts="data-alloy-vertical-dir",ns=[fo("hotspot"),xo("bubble"),To("overrides",{}),Nc(),Zu("placement",function(t,n,e){var o=Ma(e,n.hotspot.element),r=Lc(t.element,n,pa(),ha(),ma(),ga(),vt.some(n.hotspot.element));return vt.some(Pc({anchorBox:o,bubble:n.bubble.getOr(wc()),overrides:n.overrides,layouts:r,placer:vt.none()}))})],es=[fo("x"),fo("y"),To("height",0),To("width",0),To("bubble",wc()),To("overrides",{}),Nc(),Zu("placement",function(t,n,e){var o=ac(e,n.x,n.y),r=Be(o.left,o.top,n.width,n.height),i=Lc(t.element,n,fa(),da(),fa(),da(),vt.none());return vt.some(Pc({anchorBox:r,bubble:n.bubble,overrides:n.overrides,layouts:i,placer:vt.none()}))})],os=Po([{screen:["point"]},{absolute:["point","scrollLeft","scrollTop"]}]),rs=os.screen,is=os.absolute,us=[fo("node"),fo("root"),xo("bubble"),Nc(),To("overrides",{}),To("showAbove",!1),Zu("placement",function(r,i,u){var a=Xc(r,0,i);return i.node.filter(he).bind(function(t){var n=t.dom.getBoundingClientRect(),e=Yc(n.left,n.top,n.width,n.height),o=i.node.getOr(r.element);return qc(e,a,i,u,o)})})],as=function(t,n,e,o){return{start:t,soffset:n,finish:e,foffset:o}},cs=Po([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),ss=(cs.before,cs.on,cs.after,function(t){return t.fold(h,h,h)}),ls=Po([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),fs={domRange:ls.domRange,relative:ls.relative,exact:ls.exact,exactFromRange:function(t){return ls.exact(t.start,t.soffset,t.finish,t.foffset)},getWin:function(t){return Xt(t.match({domRange:function(t){return At.fromDom(t.startContainer)},relative:function(t,n){return ss(t)},exact:function(t,n,e,o){return t}}))},range:as},ds=Po([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]);function ms(t){return Zl.getOption(t)}function gs(t){return ms(t).filter(function(t){return 0!==t.trim().length||-1<t.indexOf("\xa0")}).isSome()||wt(tf,Ft(t))}function ps(t,n){return Nt(e=void 0===t?document:t.dom)?[]:M(e.querySelectorAll(n),At.fromDom);var e}function hs(t){if(0<t.rangeCount){var n=t.getRangeAt(0),e=t.getRangeAt(t.rangeCount-1);return vt.some(as(At.fromDom(n.startContainer),n.startOffset,At.fromDom(e.endContainer),e.endOffset))}return vt.none()}function vs(t){if(null===t.anchorNode||null===t.focusNode)return hs(t);var n,e,o,r,i,u,a,c,s,l,f,d=At.fromDom(t.anchorNode),m=At.fromDom(t.focusNode);return n=d,e=t.anchorOffset,o=m,r=t.focusOffset,u=e,a=o,c=r,(s=Ut(i=n).dom.createRange()).setStart(i.dom,u),s.setEnd(a.dom,c),l=s,f=Lt(n,o)&&e===r,l.collapsed&&!f?vt.some(as(d,t.anchorOffset,m,t.focusOffset)):hs(t)}function bs(t,n){var e,o,r=(e=Zc(t,n)).getClientRects();return 0<(o=0<r.length?r[0]:e.getBoundingClientRect()).width||0<o.height?vt.some(o).map($c):vt.none()}function ys(t,n){return{element:t,offset:n}}function xs(t,n){return(Xn(t)?ys:function(t,n){var e=Kt(t);if(0===e.length)return ys(t,n);if(n<e.length)return ys(e[n],0);var o=e[e.length-1];return ys(o,(Xn(o)?Zl.get(o):Kt(o)).length)})(t,n)}function ws(t,n){return n.getSelection.getOrThunk(function(){return function(){return vt.from(t.getSelection()).filter(function(t){return 0<t.rangeCount}).bind(vs)}})().map(function(t){var n=xs(t.start,t.soffset),e=xs(t.finish,t.foffset);return fs.range(n.element,n.offset,e.element,e.offset)})}function Ss(t){return t.x+t.width}function Cs(t,n){return t.x-n.width}function ks(t,n){return t.y-n.height+t.height}function Os(t,n,e){return na(Ss(t),t.y,e.southeast(),Ra(),"southeast",oa(t,{left:0,top:2}),ef)}function _s(t,n,e){return na(Cs(t,n),t.y,e.southwest(),Va(),"southwest",oa(t,{right:1,top:2}),ef)}function Ts(t,n,e){return na(Ss(t),ks(t,n),e.northeast(),Pa(),"northeast",oa(t,{left:0,bottom:3}),ef)}function Es(t,n,e){return na(Cs(t,n),ks(t,n),e.northwest(),Ha(),"northwest",oa(t,{right:1,bottom:3}),ef)}function Ds(){return[Os,_s,Ts,Es]}function Bs(){return[_s,Os,Es,Ts]}function Ms(t,n,e,o,r,i,u){var a,c,s,l,f,d,m,g,p,h,v,b,y,x,w={anchorBox:e.anchorBox,origin:n};return a=w,c=r.element,s=e.bubble,l=e.layouts,f=i,d=o,m=e.overrides,g=u,h=yc(m,"maxHeightFunction",Fc()),v=yc(m,"maxWidthFunction",st),b=a.anchorBox,y=a.origin,x={bounds:(p=y,d.fold(function(){return p.fold(Ae,Ae,Be)},function(e){return p.fold(e,e,function(){var t=e(),n=ac(p,t.x,t.y);return Be(n.left,n.top,t.width,t.height)})})),origin:y,preference:l,maxHeightFunction:h,maxWidthFunction:v,lastPlacement:f,transition:g},Rc(b,c,s,x)}function As(t,n){_e(t.element,n.element)}function Fs(n,t){var e,o=n.components();St((e=n).components(),function(t){return Te(t.element)}),An(e.element),e.syncComponents();var r=W(o,t);St(r,function(t){lf(t),n.getSystem().removeFromWorld(t)}),St(t,function(t){t.getSystem().isConnected()?As(n,t):(n.getSystem().addToWorld(t),As(n,t),he(n.element)&&ff(t)),n.syncComponents()})}function Is(t,n){df(t,n,_e)}function Rs(t){lf(t),Te(t.element),t.getSystem().removeFromWorld(t)}function Vs(n){var t=Yt(n.element).bind(function(t){return n.getSystem().getByDom(t).toOptional()});Rs(n),t.each(function(t){t.syncComponents()})}function Ps(t){var n=t.components();St(n,Rs),An(t.element),t.syncComponents()}function Hs(t,n){mf(t,n,_e)}function zs(n){var t=Kt(n.element);St(t,function(t){n.getByDom(t).each(lf)}),Te(n.element)}function Ns(n,t,e,o){e.get().each(function(t){Ps(n)}),Is(t.getAttachPoint(n),n);var r=n.getSystem().build(o);return Is(n,r),e.set(r),r}function Ls(t,n,e,o){var r=Ns(t,n,e,o);return n.onOpen(t,r),r}function Ws(n,e,o){o.get().each(function(t){Ps(n),Vs(n),e.onClose(n,t),o.clear()})}function Us(t,n,e){return e.isOpen()}function js(t){var e=co("Dismissal",xf,t),n={};return n[vf()]={schema:Ze([fo("target")]),onReceive:function(n,t){hf.isOpen(n)&&(hf.isPartOf(n,t.target)||e.isExtraPart(n,t.target)||e.fireEventInstead.fold(function(){return hf.close(n)},function(t){return hr(n,t.event)}))}},n}function Gs(t){var e=co("Reposition",wf,t),n={};return n[bf()]={onReceive:function(n){hf.isOpen(n)&&e.fireEventInstead.fold(function(){return e.doReposition(n)},function(t){return hr(n,t.event)})}},n}function Xs(t,n,e){n.store.manager.onLoad(t,n,e)}function Ys(t,n,e){n.store.manager.onUnload(t,n,e)}function qs(){var t=Vo(null);return xu({set:t.set,get:t.get,isNotSet:function(){return null===t.get()},clear:function(){t.set(null)},readState:function(){return{mode:"memory",value:t.get()}}})}function Ks(){var i=Vo({}),u=Vo({});return xu({readState:function(){return{mode:"dataset",dataByValue:i.get(),dataByText:u.get()}},lookup:function(t){return tt(i.get(),t).orThunk(function(){return tt(u.get(),t)})},update:function(t){var n=i.get(),e=u.get(),o={},r={};St(t,function(n){tt(o[n.value]=n,"meta").each(function(t){tt(t,"text").each(function(t){r[t]=n})})}),i.set(lt(lt({},n),o)),u.set(lt(lt({},e),r))},clear:function(){i.set({}),u.set({})}})}function Js(t,n,e,o){var r=n.store;e.update([o]),r.setValue(t,o),n.onSetValue(t,o)}function $s(o,t){return Ro(o,{},M(t,function(t){return n=t.name(),e="Cannot configure "+t.name()+" for "+o,ur(n,n,Ge(),Ke(function(t){return No("The field: "+n+" is forbidden. "+e)}));var n,e}).concat([ar("dump",h)]))}function Qs(t){return t.dump}function Zs(t,n){return lt(lt({},tc(n)),t.dump)}function tl(t){return Tt(t,"uiType")}function nl(t){return t.fold(vt.some,vt.none,vt.some,vt.some)}function el(t){function n(t){return t.name}return t.fold(n,n,n,n)}function ol(e,o){return function(t){var n=co("Converting part type",o,t);return e(n)}}function rl(t,n,e,o){return Xo(n.defaults(t,e,o),e,{uid:t.partUids[n.name]},n.overrides(t,e,o))}function il(r,t){var n={};return St(t,function(t){nl(t).each(function(e){var o=td(r,e.pname);n[e.name]=function(t){var n=co("Part: "+e.name+" in "+r,Jo(e.schema),t);return lt(lt({},o),{config:t,validated:n})}})}),n}function ul(t,n,e){return{uiType:Rf(),owner:t,name:n,config:e,validated:{}}}function al(t){return z(t,function(t){return t.fold(vt.none,vt.some,vt.none,vt.none).map(function(t){return vo(t.name,t.schema.concat([ta(Qf())]))}).toArray()})}function cl(t){return M(t,el)}function sl(t,n,e){return o=n,r={},i={},St(e,function(t){t.fold(function(o){r[o.pname]=Ff(!0,function(t,n,e){return o.factory.sketch(rl(t,o,n,e))})},function(t){var n=o.parts[t.name];i[t.name]=rt(t.factory.sketch(rl(o,t,n[Qf()]),n))},function(o){r[o.pname]=Ff(!1,function(t,n,e){return o.factory.sketch(rl(t,o,n,e))})},function(o){r[o.pname]=If(!0,function(n,t,e){return M(n[o.name],function(t){return o.factory.sketch(Xo(o.defaults(n,t,e),t,o.overrides(n,t)))})})})}),{internals:rt(r),externals:rt(i)};var o,r,i}function ll(t,n,e){return o=vt.some(t),i=(r=n).components,s=dt(e,function(t,n){return o=t,r=!1,{name:rt(e=n),required:function(){return o.fold(function(t,n){return t},function(t,n){return t})},used:function(){return r},replace:function(){if(r)throw new Error("Trying to use the same placeholder more than once: "+e);return r=!0,o}};var e,o,r}),u=o,a=r,c=s,l=z(i,function(t){return Af(u,a,t,c)}),J(s,function(t){if(!1===t.used()&&t.required())throw new Error("Placeholder: "+t.name()+" was not found in components list\nNamespace: "+o.getOr("none")+"\nComponents: "+JSON.stringify(r.components,null,2))}),l;var o,r,i,u,a,c,s,l}function fl(t,n,e){var o=n.partUids[e];return t.getSystem().getByUid(o).toOptional()}function dl(t,n,e){return fl(t,n,e).getOrDie("Could not find part: "+e)}function ml(t,n,e){var o={},r=n.partUids,i=t.getSystem();return St(e,function(t){o[t]=rt(i.getByUid(r[t]))}),o}function gl(t,n){var e=t.getSystem();return dt(n.partUids,function(t,n){return rt(e.getByUid(t))})}function pl(t){return kt(t.partUids)}function hl(t,n,e){var o={},r=n.partUids,i=t.getSystem();return St(e,function(t){o[t]=rt(i.getByUid(r[t]).getOrDie())}),o}function vl(n,t){return sr(M(cl(t),function(t){return{key:t,value:n+"-"+t}}))}function bl(n){return ur("partUids","partUids",Xe(function(t){return vl(t.uid,n)}),Qo())}function yl(t,n,e,o,r){var i;return co(t+" [SpecSchema]",Ze((i=r,(0<o.length?[vo("parts",o)]:[]).concat([fo("uid"),To("dom",{}),To("components",[]),ta("originalSpec"),To("debug.sketcher",{})]).concat(i)).concat(n)),e)}function xl(t,n,e,o,r){var i=ed(r),u=yl(t,n,i,al(e),[bl(e)]),a=sl(0,u,e);return o(u,ll(t,u,a.internals()),i,a.externals())}function wl(t){var r=co("Sketcher for "+t.name,od,t),n=dt(r.apis,Hr),e=dt(r.extraApis,Vr);return lt(lt({name:r.name,configFields:r.configFields,sketch:function(t){return n=r.name,e=r.configFields,(0,r.factory)(yl(n,e,o=ed(t),[],[]),o);var n,e,o}},n),e)}function Sl(t){var n=co("Sketcher for "+t.name,rd,t),e=il(n.name,n.partFields),o=dt(n.apis,Hr),r=dt(n.extraApis,Vr);return lt(lt({name:n.name,partFields:n.partFields,configFields:n.configFields,sketch:function(t){return xl(n.name,n.configFields,n.partFields,n.factory,t)},parts:e},o),r)}function Cl(t){return"input"===Ft(t)&&"radio"!==rn(t,"type")||"textarea"===Ft(t)}function kl(t,n,e){(n.disabled()?cd:sd)(t,n)}function Ol(t,n){return!0===n.useNative&&wt(ad,Ft(t.element))}function _l(t,n){return Ol(t,n)?an(t.element,"disabled"):"true"===rn(t.element,"aria-disabled")}function Tl(e,o,t,r){var n=ps(e.element,"."+o.highlightClass);St(n,function(n){T(r,function(t){return t.element===n})||(Yr(n,o.highlightClass),e.getSystem().getByDom(n).each(function(t){o.onDehighlight(e,t),hr(t,Zi())}))})}function El(t,n,e,o){Tl(t,n,0,[o]),Gl(0,n,0,o)||(Xr(o.element,n.highlightClass),n.onHighlight(t,o),hr(o,Qi()))}function Dl(e,n,t,o){var r=ps(e.element,"."+n.itemClass);return P(r,function(t){return qr(t,n.highlightClass)}).bind(function(t){var n=ea(t,o,0,r.length-1);return e.getSystem().getByDom(r[n]).toOptional()})}function Bl(t,n,e){var o=L(t.slice(0,n)),r=L(t.slice(n+1));return V(o.concat(r),e)}function Ml(t,n,e){return V(L(t.slice(0,n)),e)}function Al(t,n,e){var o=t.slice(0,n);return V(t.slice(n+1).concat(o),e)}function Fl(t,n,e){return V(t.slice(n+1),e)}function Il(e){return function(t){var n=t.raw;return wt(e,n.which)}}function Rl(t){return function(n){return N(t,function(t){return t(n)})}}function Vl(t){return!0===t.raw.shiftKey}function Pl(t){return!0===t.raw.ctrlKey}function Hl(t,n){return{matches:t,classification:n}}function zl(t,n,e){n.exists(function(n){return e.exists(function(t){return Lt(t,n)})})||vr(t,qi(),{prevFocus:n,newFocus:e})}function Nl(){function o(t){return Oa(t.element)}return{get:o,set:function(t,n){var e=o(t);t.getSystem().triggerFocus(n,t.element),zl(t,e,o(t))}}}function Ll(){function r(t){return gd.getHighlighted(t).map(function(t){return t.element})}return{get:r,set:function(n,t){var e=r(n);n.getSystem().getByDom(t).fold(st,function(t){gd.highlight(n,t)});var o=r(n);zl(n,e,o)}}}ds.ltr,ds.rtl;function Wl(t,n,e,o,r,i){var u=i.map(Me);return cf(t,n,e,o,r,u)}function Ul(t,n,e){var o,r,i,u=n.getAttachPoint(t);fn(t.element,"position",sf.getMode(u)),i=n.cloakVisibilityAttr,pn((o=t).element,r="visibility").fold(function(){cn(o.element,i)},function(t){on(o.element,i,t)}),fn(o.element,r,"hidden")}function jl(t,n,e){var o,r,i,u=t.element;T(["top","left","right","bottom"],function(t){return pn(u,t).isSome()})||vn(t.element,"position"),r="visibility",i=n.cloakVisibilityAttr,un((o=t).element,i).fold(function(){return vn(o.element,r)},function(t){return fn(o.element,r,t)})}function Gl(t,n,e,o){return qr(o.element,n.highlightClass)}function Xl(n,t,e){return Fu(n.element,"."+t.itemClass).bind(function(t){return n.getSystem().getByDom(t).toOptional()})}function Yl(n,t,e){var o=ps(n.element,"."+t.itemClass);return(0<o.length?vt.some(o[o.length-1]):vt.none()).bind(function(t){return n.getSystem().getByDom(t).toOptional()})}function ql(n,t,e){return et(M(ps(n.element,"."+t.itemClass),function(t){return n.getSystem().getByDom(t).toOptional()}))}var Kl,Jl,$l,Ql,Zl=(Kl=Xn,{get:function(t){if(!Kl(t))throw new Error("Can only get text value of a text node");return Jl(t).getOr("")},getOption:Jl=function(t){return Kl(t)?vt.from(t.dom.nodeValue):vt.none()},set:function(t,n){if(!Kl(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=n}}),tf=["img","br"],nf=[xo("getSelection"),fo("root"),xo("bubble"),Nc(),To("overrides",{}),To("showAbove",!1),Zu("placement",function(t,n,e){var r=Xt(n.root).dom,o=Xc(t,0,n);return qc(ws(r,n).bind(function(e){return t=r,n=fs.exactFromRange(e),(0<(o=Zc(t,n).getBoundingClientRect()).width||0<o.height?vt.some(o).map($c):vt.none()).orThunk(function(){var t=At.fromText("\ufeff");En(e.start,t);var n=bs(r,fs.exact(t,0,t,1));return Te(t),n}).bind(function(t){return Yc(t.left,t.top,t.width,t.height)});var t,n,o}),o,n,e,ws(r,n).bind(function(t){return Gn(t.start)?vt.some(t.start):le(t.start)}).getOr(t.element))})],ef="link-layout",of=so("type",{selection:nf,node:us,hotspot:ns,submenu:[fo("item"),Nc(),To("overrides",{}),Zu("placement",function(t,n,e){var o=Ma(e,n.item.element),r=Lc(t.element,n,Ds(),Bs(),Ds(),Bs(),vt.none());return vt.some(Pc({anchorBox:o,bubble:wc(),overrides:n.overrides,layouts:r,placer:vt.none()}))})],makeshift:es}),rf=[yo("classes",tr),Mo("mode","all",["all","layout","placement"])],uf=[To("useFixed",O),xo("getBounds")],af=[mo("anchor",of),_o("transition",rf)],cf=function(c,s,l,f,t,d){var m=co("placement.info",Jo(af),t),g=m.anchor,p=f.element,h=l.get(f.uid);_a(function(){fn(p,"position","fixed");var t=pn(p,"visibility");fn(p,"visibility","hidden");var n,e,o,r,i=s.useFixed()?(r=document.documentElement,_c(0,0,r.clientWidth,r.clientHeight)):(e=Cn((n=c).element),o=n.element.dom.getBoundingClientRect(),Oc(e.left,e.top,o.width,o.height)),u=g.placement,a=d.map(rt).or(s.getBounds);u(c,g,i).each(function(t){var n=t.placer.getOr(Ms)(c,i,t,a,f,h,m.transition);l.set(f.uid,n)}),t.fold(function(){vn(p,"visibility")},function(t){fn(p,"visibility",t)}),pn(p,"left").isNone()&&pn(p,"top").isNone()&&pn(p,"right").isNone()&&pn(p,"bottom").isNone()&&mt(pn(p,"position"),"fixed")&&vn(p,"position")},p)},sf=ya({fields:uf,name:"positioning",active:ic,apis:Object.freeze({__proto__:null,position:function(t,n,e,o,r){Wl(t,n,e,o,r,vt.none())},positionWithin:Wl,positionWithinBounds:cf,getMode:function(t,n,e){return n.useFixed()?"fixed":"absolute"},reset:function(t,n,e,o){var r=o.element;St(["position","left","right","top","bottom"],function(t){return vn(r,t)}),cn(r,Tc),e.clear(o.uid)}}),state:Object.freeze({__proto__:null,init:function(){var e={};return xu({readState:function(){return e},clear:function(t){d(t)?delete e[t]:e={}},set:function(t,n){e[t]=n},get:function(t){return tt(e,t)}})}})}),lf=function(t){hr(t,Gi());var n=t.components();St(n,lf)},ff=function(t){var n=t.components();St(n,ff),hr(t,ji())},df=function(t,n,e){t.getSystem().addToWorld(n),e(t.element,n.element),he(t.element)&&ff(n),t.syncComponents()},mf=function(t,n,e){e(t,n.element);var o=Kt(n.element);St(o,function(t){n.getByDom(t).each(ff)})},gf=Object.freeze({__proto__:null,cloak:Ul,decloak:jl,open:Ls,openWhileCloaked:function(t,n,e,o,r){Ul(t,n),Ls(t,n,e,o),r(),jl(t,n)},close:Ws,isOpen:Us,isPartOf:function(n,e,t,o){return Us(0,0,t)&&t.get().exists(function(t){return e.isPartOf(n,t,o)})},getState:function(t,n,e){return e.get()},setContent:function(t,n,e,o){return e.get().map(function(){return Ns(t,n,e,o)})}}),pf=Object.freeze({__proto__:null,events:function(e,o){return nu([Cr(Pi(),function(t,n){Ws(t,e,o)})])}}),hf=ya({fields:[Ku("onOpen"),Ku("onClose"),fo("isPartOf"),fo("getAttachPoint"),To("cloakVisibilityAttr","data-precloak-visibility")],name:"sandboxing",active:pf,apis:gf,state:Object.freeze({__proto__:null,init:function(){var t=dc(),n=rt("not-implemented");return xu({readState:n,isOpen:t.isSet,clear:t.clear,set:t.set,get:t.get})}})}),vf=rt("dismiss.popups"),bf=rt("reposition.popups"),yf=rt("mouse.released"),xf=Ze([To("isExtraPart",O),_o("fireEventInstead",[To("event",Xi())])]),wf=Ze([_o("fireEventInstead",[To("event",Yi())]),ho("doReposition")]),Sf=Object.freeze({__proto__:null,onLoad:Xs,onUnload:Ys,setValue:function(t,n,e,o){n.store.manager.setValue(t,n,e,o)},getValue:function(t,n,e){return n.store.manager.getValue(t,n,e)},getState:function(t,n,e){return e}}),Cf=Object.freeze({__proto__:null,events:function(e,o){var t=e.resetOnDom?[eu(function(t,n){Xs(t,e,o)}),ou(function(t,n){Ys(t,e,o)})]:[va(e,o,Xs)];return nu(t)}}),kf=Object.freeze({__proto__:null,memory:qs,dataset:Ks,manual:function(){return xu({readState:st})},init:function(t){return t.store.manager.state(t)}}),Of=[xo("initialValue"),fo("getFallbackEntry"),fo("getDataKey"),fo("setValue"),Zu("manager",{setValue:Js,getValue:function(t,n,e){var o=n.store,r=o.getDataKey(t);return e.lookup(r).getOrThunk(function(){return o.getFallbackEntry(r)})},onLoad:function(n,e,o){e.store.initialValue.each(function(t){Js(n,e,o,t)})},onUnload:function(t,n,e){e.clear()},state:Ks})],_f=[fo("getValue"),To("setValue",st),xo("initialValue"),Zu("manager",{setValue:function(t,n,e,o){n.store.setValue(t,o),n.onSetValue(t,o)},getValue:function(t,n,e){return n.store.getValue(t)},onLoad:function(n,e,t){e.store.initialValue.each(function(t){e.store.setValue(n,t)})},onUnload:st,state:yu.init})],Tf=ya({fields:[Eo("store",{mode:"memory"},so("mode",{memory:[xo("initialValue"),Zu("manager",{setValue:function(t,n,e,o){e.set(o),n.onSetValue(t,o)},getValue:function(t,n,e){return e.get()},onLoad:function(t,n,e){n.store.initialValue.each(function(t){e.isNotSet()&&e.set(t)})},onUnload:function(t,n,e){e.clear()},state:qs})],manual:_f,dataset:Of})),Ku("onSetValue"),To("resetOnDom",!1)],name:"representing",active:Cf,apis:Sf,extra:{setValueFrom:function(t,n){var e=Tf.getValue(n);Tf.setValue(t,e)}},state:kf}),Ef=$s,Df=Zs,Bf="placeholder",Mf=Po([{single:["required","valueThunk"]},{multiple:["required","valueThunks"]}]),Af=function(r,i,u,a){return t=r,e=a,(tl(n=u)&&n.uiType===Bf?(c=n,s=e,(o=t).exists(function(t){return t!==c.owner})?Mf.single(!0,rt(c)):tt(s,c.name).fold(function(){throw new Error("Unknown placeholder component: "+c.name+"\nKnown: ["+kt(s)+"]\nNamespace: "+o.getOr("none")+"\nSpec: "+JSON.stringify(c,null,2))},function(t){return t.replace()})):Mf.single(!1,rt(n))).fold(function(t,n){var e=tl(u)?n(i,u.config,u.validated):n(i),o=z(tt(e,"components").getOr([]),function(t){return Af(r,i,t,a)});return[lt(lt({},e),{components:o})]},function(t,n){if(tl(u)){var e=n(i,u.config,u.validated);return u.validated.preprocess.getOr(h)(e)}return n(i)});var t,n,e,o,c,s},Ff=Mf.single,If=Mf.multiple,Rf=rt(Bf),Vf=Po([{required:["data"]},{external:["data"]},{optional:["data"]},{group:["data"]}]),Pf=To("factory",{sketch:h}),Hf=To("schema",[]),zf=fo("name"),Nf=ur("pname","pname",Ue(function(t){return"<alloy."+Fr(t.name)+">"}),Qo()),Lf=ar("schema",function(){return[xo("preprocess")]}),Wf=To("defaults",rt({})),Uf=To("overrides",rt({})),jf=Jo([Pf,Hf,zf,Nf,Wf,Uf]),Gf=Jo([Pf,Hf,zf,Wf,Uf]),Xf=Jo([Pf,Hf,zf,Nf,Wf,Uf]),Yf=Jo([Pf,Lf,zf,fo("unit"),Nf,Wf,Uf]),qf=ol(Vf.required,jf),Kf=ol(Vf.external,Gf),Jf=ol(Vf.optional,Xf),$f=ol(Vf.group,Yf),Qf=rt("entirety"),Zf=Object.freeze({__proto__:null,required:qf,external:Kf,optional:Jf,group:$f,asNamedPart:nl,name:el,asCommon:function(t){return t.fold(h,h,h,h)},original:Qf}),td=function(t,n){return{uiType:Rf(),owner:t,name:n}},nd=Object.freeze({__proto__:null,generate:il,generateOne:ul,schemas:al,names:cl,substitutes:sl,components:ll,defaultUids:vl,defaultUidsSchema:bl,getAllParts:gl,getAllPartNames:pl,getPart:fl,getPartOrDie:dl,getParts:ml,getPartsOrDie:hl}),ed=function(t){return Tt(t,"uid")?t:lt(lt({},t),{uid:gu("uid")})},od=Ze([fo("name"),fo("factory"),fo("configFields"),To("apis",{}),To("extraApis",{})]),rd=Ze([fo("name"),fo("factory"),fo("configFields"),fo("partFields"),To("apis",{}),To("extraApis",{})]),id=Object.freeze({__proto__:null,getCurrent:function(t,n,e){return n.find(t)}}),ud=ya({fields:[fo("find")],name:"composing",apis:id}),ad=["input","button","textarea","select"],cd=function(n,t,e){t.disableClass.each(function(t){Xr(n.element,t)}),(Ol(n,t)?function(t){on(t.element,"disabled","disabled")}:function(t){on(t.element,"aria-disabled","true")})(n),t.onDisabled(n)},sd=function(n,t,e){t.disableClass.each(function(t){Yr(n.element,t)}),(Ol(n,t)?function(t){cn(t.element,"disabled")}:function(t){on(t.element,"aria-disabled","false")})(n),t.onEnabled(n)},ld=Object.freeze({__proto__:null,enable:sd,disable:cd,isDisabled:_l,onLoad:kl,set:function(t,n,e,o){(o?cd:sd)(t,n)}}),fd=Object.freeze({__proto__:null,exhibit:function(t,n){return Nr({classes:n.disabled()?n.disableClass.toArray():[]})},events:function(e,t){return nu([wr(Fi(),function(t,n){return _l(t,e)}),va(e,t,kl)])}}),dd=ya({fields:[Fo("disabled",O),To("useNative",!0),xo("disableClass"),Ku("onDisabled"),Ku("onEnabled")],name:"disabling",active:fd,apis:ld}),md=Object.freeze({__proto__:null,dehighlightAll:function(t,n,e){return Tl(t,n,0,[])},dehighlight:function(t,n,e,o){Gl(0,n,0,o)&&(Yr(o.element,n.highlightClass),n.onDehighlight(t,o),hr(o,Zi()))},highlight:El,highlightFirst:function(n,e,t){Xl(n,e).each(function(t){El(n,e,0,t)})},highlightLast:function(n,e,t){Yl(n,e).each(function(t){El(n,e,0,t)})},highlightAt:function(n,e,t,o){var r,i,u;i=o,u=ps((r=n).element,"."+e.itemClass),vt.from(u[i]).fold(function(){return Re.error(new Error("No element found with index "+i))},r.getSystem().getByDom).fold(function(t){throw t},function(t){El(n,e,0,t)})},highlightBy:function(n,e,t,o){V(ql(n,e),o).each(function(t){El(n,e,0,t)})},isHighlighted:Gl,getHighlighted:function(n,t,e){return Fu(n.element,"."+t.highlightClass).bind(function(t){return n.getSystem().getByDom(t).toOptional()})},getFirst:Xl,getLast:Yl,getPrevious:function(t,n,e){return Dl(t,n,0,-1)},getNext:function(t,n,e){return Dl(t,n,0,1)},getCandidates:ql}),gd=ya({fields:[fo("highlightClass"),fo("itemClass"),Ku("onHighlight"),Ku("onDehighlight")],name:"highlighting",apis:md}),pd=[8],hd=[9],vd=[13],bd=[27],yd=[32],xd=[37],wd=[38],Sd=[39],Cd=[40],kd=C(Vl);function Od(t,n,e,o,a){function c(n,e,t,o,r){var i=t(n,e,o,r),u=e.event;return V(i,function(t){return t.matches(u)}).map(function(t){return t.classification}).bind(function(t){return t(n,e,o,r)})}var r={schema:function(){return t.concat([To("focusManager",Nl()),Eo("focusInside","onFocus",ro(function(t){return wt(["onFocus","onEnterOrSpace","onApi"],t)?Re.value(t):Re.error("Invalid value for focusInside")})),Zu("handler",r),Zu("state",n),Zu("sendFocusIn",a)])},processKey:c,toEvents:function(i,u){var t=i.focusInside!==$l.OnFocusMode?vt.none():a(i).map(function(e){return Cr(Di(),function(t,n){e(t,i,u),n.stop()})}),n=[Cr(yi(),function(o,r){c(o,r,e,i,u).fold(function(){var n=o,e=r,t=Il(yd.concat(vd))(e.event);i.focusInside===$l.OnEnterOrSpaceMode&&t&&mr(n,e)&&a(i).each(function(t){t(n,i,u),e.stop()})},function(t){r.stop()})}),Cr(xi(),function(t,n){c(t,n,o,i,u).each(function(t){n.stop()})})];return nu(t.toArray().concat(n))}};return r}function _d(t){function a(t,n){return 0<xn(t.visibilitySelector.bind(function(t){return Iu(n,t)}).getOr(n))}function n(n,e,t){var o=e,r=F(ps(n.element,o.selector),function(t){return a(o,t)});vt.from(r[o.firstTabstop]).each(function(t){e.focusManager.set(n,t)})}function o(e,t,r,i){var n,u=ps(e.element,r.selector);return(n=r).focusManager.get(e).bind(function(t){return Iu(t,n.selector)}).bind(function(t){return P(u,S(Lt,t)).bind(function(t){return n=e,o=r,i(u,t,function(t){return a(n=o,e=t)&&n.useTabstopAt(e);var n,e}).fold(function(){return o.cyclic?vt.some(!0):vt.none()},function(t){return o.focusManager.set(n,t),vt.some(!0)});var n,o})})}var e=[xo("onEscape"),xo("onEnter"),To("selector",'[data-alloy-tabstop="true"]:not(:disabled)'),To("firstTabstop",0),To("useTabstopAt",_),xo("visibilitySelector")].concat([t]),r=rt([Hl(Rl([Vl,Il(hd)]),function(t,n,e){return o(t,0,e,e.cyclic?Bl:Ml)}),Hl(Il(hd),function(t,n,e){return o(t,0,e,e.cyclic?Al:Fl)}),Hl(Il(bd),function(n,e,t){return t.onEscape.bind(function(t){return t(n,e)})}),Hl(Rl([kd,Il(vd)]),function(n,e,t){return t.onEnter.bind(function(t){return t(n,e)})})]),i=rt([]);return Od(e,yu.init,r,i,function(){return vt.some(n)})}function Td(t,n,e){return Cl(e)&&Il(yd)(n.event)?vt.none():(yr(t,e,Fi()),vt.some(!0))}function Ed(t,n){return vt.some(!0)}function Dd(t,n,e){return e.execute(t,n,t.element)}function Bd(){var e=dc();return xu({readState:function(){return e.get().map(function(t){return{numRows:String(t.numRows),numColumns:String(t.numColumns)}}).getOr({numRows:"?",numColumns:"?"})},setGridSize:function(t,n){e.set({numRows:t,numColumns:n})},getNumRows:function(){return e.get().map(function(t){return t.numRows})},getNumColumns:function(){return e.get().map(function(t){return t.numColumns})}})}function Md(i){return function(t,n,e,o){var r=i(t.element);return Qm(r,t,n,e,o)}}function Ad(t,n){return Md(Sc(t,n))}function Fd(t,n){return Md(Sc(n,t))}function Id(r){return function(t,n,e,o){return Qm(r,t,n,e,o)}}function Rd(t){return!((n=t.dom).offsetWidth<=0&&n.offsetHeight<=0);var n}function Vd(t,n,e){var o,r=F(ps(t,e),Rd);return P(o=r,function(t){return Lt(t,n)}).map(function(t){return{index:t,candidates:o}})}function Pd(t,n){return P(t,function(t){return Lt(n,t)})}function Hd(e,t,o,n){return n(Math.floor(t/o),t%o).bind(function(t){var n=t.row*o+t.column;return 0<=n&&n<e.length?vt.some(e[n]):vt.none()})}function zd(r,t,i,u,a){return Hd(r,t,u,function(t,n){var e=t===i-1?r.length-t*u:u,o=ea(n,a,0,e-1);return vt.some({row:t,column:o})})}function Nd(i,t,u,a,c){return Hd(i,t,a,function(t,n){var e=ea(t,c,0,u-1),o=e===u-1?i.length-e*a:a,r=Ua(n,0,o-1);return vt.some({row:e,column:r})})}function Ld(n,e,t){Fu(n.element,e.selector).each(function(t){e.focusManager.set(n,t)})}function Wd(r){return function(t,n,e,o){return Vd(t,n,e.selector).bind(function(t){return r(t.candidates,t.index,o.getNumRows().getOr(e.initSize.numRows),o.getNumColumns().getOr(e.initSize.numColumns))})}}function Ud(t,n,e){return e.captureTab?vt.some(!0):vt.none()}function jd(t,n,e,i){var u=function(t,n,e){var o,r=ea(n,i,0,e.length-1);return r===t?vt.none():"button"===Ft(o=e[r])&&"disabled"===rn(o,"disabled")?u(t,r,e):vt.from(e[r])};return Vd(t,e,n).bind(function(t){var n=t.index,e=t.candidates;return u(n,n,e)})}function Gd(n,e,o){return(r=o).focusManager.get(n).bind(function(t){return Iu(t,r.selector)}).bind(function(t){return o.execute(n,e,t)});var r}function Xd(n,e,t){e.getInitial(n).orThunk(function(){return Fu(n.element,e.selector)}).each(function(t){e.focusManager.set(n,t)})}function Yd(t,n,e){return jd(t,e.selector,n,-1)}function qd(t,n,e){return jd(t,e.selector,n,1)}function Kd(r){return function(t,n,e,o){return r(t,n,e,o).bind(function(){return e.executeOnMove?Gd(t,n,e):vt.some(!0)})}}function Jd(t,n,e){return e.onEscape(t,n)}function $d(t,n,e){return vt.from(t[n]).bind(function(t){return vt.from(t[e]).map(function(t){return{rowIndex:n,columnIndex:e,cell:t}})})}function Qd(t,n,e,o){return $d(t,n,ea(e,o,0,t[n].length-1))}function Zd(t,n,e,o){var r=ea(e,o,0,t.length-1),i=t[r].length;return $d(t,r,Ua(n,0,i-1))}function tm(t,n,e,o){var r=t[n].length;return $d(t,n,Ua(e+o,0,r-1))}function nm(t,n,e,o){var r=Ua(e+o,0,t.length-1),i=t[r].length;return $d(t,r,Ua(n,0,i-1))}function em(n,e,t){e.previousSelector(n).orThunk(function(){var t=e.selectors;return Fu(n.element,t.cell)}).each(function(t){e.focusManager.set(n,t)})}function om(t,o){return function(n,e,i){var u=i.cycles?t:o;return Iu(e,i.selectors.row).bind(function(t){return Pd(ps(t,i.selectors.cell),e).bind(function(o){var r=ps(n,i.selectors.row);return Pd(r,t).bind(function(t){var n,e=(n=i,M(r,function(t){return ps(t,n.selectors.cell)}));return u(e,t,o).map(function(t){return t.cell})})})})}}function rm(n,e,o){return o.focusManager.get(n).bind(function(t){return o.execute(n,e,t)})}function im(n,e,t){Fu(n.element,e.selector).each(function(t){e.focusManager.set(n,t)})}function um(t,n,e){return jd(t,e.selector,n,-1)}function am(t,n,e){return jd(t,e.selector,n,1)}function cm(t,n,e,o){var r=t.getSystem().build(o);df(t,r,e)}function sm(t,n,e,o){V(Ag(t),function(t){return Lt(o.element,t.element)}).each(Vs)}function lm(n,t,e,r,o){var i=Ag(n);return vt.from(i[r]).map(function(t){return sm(n,0,0,t),o.each(function(t){cm(n,0,function(t,n){var e,o=n;Jt(e=t,r).fold(function(){_e(e,o)},function(t){En(t,o)})},t)}),t})}function fm(t,n){var e,o;return{key:t,value:{config:{},me:(e=t,o=nu(n),ya({fields:[fo("enabled")],name:e,active:{events:rt(o)}})),configAsRaw:rt({}),initialConfig:{},state:yu}}}function dm(t,n){n.ignore||(Sa(t.element),n.onFocus(t))}function mm(t,n,e){var o=n.aria;o.update(t,o,e.get())}function gm(n,t,e){t.toggleClass.each(function(t){(e.get()?Xr:Yr)(n.element,t)})}function pm(t,n,e){Gm(t,n,e,!e.get())}function hm(t,n,e){e.set(!0),gm(t,n,e),mm(t,n,e)}function vm(t,n,e){e.set(!1),gm(t,n,e),mm(t,n,e)}function bm(t,n,e){Gm(t,n,e,n.selected)}function ym(){function t(t,n){n.stop(),br(t)}return[Cr(Ci(),t),Cr(Ri(),t),Er(ci()),Er(di())]}function xm(t){return nu(ft([t.map(function(e){return iu(function(t,n){e(t),n.stop()})}).toArray(),ym()]))}function wm(t){(Oa(t.element).isNone()||Vg.isFocused(t))&&(Vg.isFocused(t)||Vg.focus(t),vr(t,Ng,{item:t}))}function Sm(t){vr(t,Lg,{item:t})}function Cm(t,n){return t.x+t.width/2-n.width/2}function km(t,n){return t.x+t.width-n.width}function Om(t,n){return t.y+t.height-n.height}function _m(t,n){return t.y+t.height/2-n.height/2}function Tm(t,n,e){return na(km(t,n),Om(t,n),e.insetSouthwest(),Ha(),"southwest",oa(t,{right:0,bottom:3}),ip)}function Em(t,n,e){return na(t.x,Om(t,n),e.insetSoutheast(),Pa(),"southeast",oa(t,{left:1,bottom:3}),ip)}function Dm(t,n,e){return na(km(t,n),t.y,e.insetNorthwest(),Va(),"northwest",oa(t,{right:0,top:2}),ip)}function Bm(t,n,e){return na(t.x,t.y,e.insetNortheast(),Ra(),"northeast",oa(t,{left:1,top:2}),ip)}function Mm(t,n,e){return na(km(t,n),_m(t,n),e.insetEast(),Wa(),"east",oa(t,{right:0}),ip)}function Am(t,n,e){return na(t.x,_m(t,n),e.insetWest(),La(),"west",oa(t,{left:1}),ip)}function Fm(t){switch(t){case"north":return up;case"northeast":return Bm;case"northwest":return Dm;case"south":return ap;case"southeast":return Em;case"southwest":return Tm;case"east":return Mm;case"west":return Am}}function Im(t,n,e,o,r){return cc(o).map(Fm).getOr(up)(t,n,e,o,r)}function Rm(t){switch(t){case"north":return ap;case"northeast":return Em;case"northwest":return Tm;case"south":return up;case"southeast":return Bm;case"southwest":return Dm;case"east":return Am;case"west":return Mm}}function Vm(t,n,e,o,r){return cc(o).map(Rm).getOr(up)(t,n,e,o,r)}function Pm(t){var n=void 0!==t.uid&&nt(t,"uid")?t.uid:gu("memento");return{get:function(t){return t.getSystem().getByUid(n).getOrDie()},getOpt:function(t){return t.getSystem().getByUid(n).toOptional()},asSpec:function(){return lt(lt({},t),{uid:n})}}}function Hm(t){return function(){return tt(t,dp).getOr("!not found!")}}function zm(t,n){var e,o=t.toLowerCase();if(lp.isRtl()){var r=Bt(e=o,"-rtl")?e:e+"-rtl";return Tt(n,r)?r:o}return o}function Nm(t,n){return tt(n,zm(t,n))}function Lm(t,n){var e=n();return Nm(t,e).getOrThunk(Hm(e))}function Wm(){return fm("add-focusable",[eu(function(t){var n,e,o;n=t.element,e="svg",o=function(t){return zt(t,e)},V(n.dom.childNodes,function(t){return o(At.fromDom(t))}).map(At.fromDom).each(function(t){return on(t,"focusable","false")})})])}function Um(t,n,e,o){var r,i,u,a=(u=n,lp.isRtl()&&Tt(fp,u)?["tox-icon--flip"]:[]),c=tt(e,zm(n,e)).or(o).getOrThunk(Hm(e));return{dom:{tag:t.tag,attributes:null!==(r=t.attributes)&&void 0!==r?r:{},classes:t.classes.concat(a),innerHtml:c},behaviours:tc(H(H([],null!==(i=t.behaviours)&&void 0!==i?i:[],!0),[Wm()],!1))}}function jm(t,n,e,o){return void 0===o&&(o=vt.none()),Um(n,t,e(),o)}(Ql=$l=$l||{}).OnFocusMode="onFocus",Ql.OnEnterOrSpaceMode="onEnterOrSpace",Ql.OnApiMode="onApi";function Gm(t,n,e,o){(o?hm:vm)(t,n,e)}function Xm(t,n,e){on(t.element,"aria-expanded",e)}function Ym(t){return"prepared"===t.type?vt.some(t.menu):vt.none()}var qm=_d(ar("cyclic",O)),Km=_d(ar("cyclic",_)),Jm=Od([To("execute",Td),To("useSpace",!1),To("useEnter",!0),To("useControlEnter",!1),To("useDown",!1)],yu.init,function(t,n,e,o){var r=e.useSpace&&!Cl(t.element)?yd:[],i=e.useEnter?vd:[],u=e.useDown?Cd:[];return[Hl(Il(r.concat(i).concat(u)),Dd)].concat(e.useControlEnter?[Hl(Rl([Pl,Il(vd)]),Dd)]:[])},function(t,n,e,o){return e.useSpace&&!Cl(t.element)?[Hl(Il(yd),Ed)]:[]},function(){return vt.none()}),$m=Object.freeze({__proto__:null,flatgrid:Bd,init:function(t){return t.state(t)}}),Qm=function(n,e,t,o,r){return o.focusManager.get(e).bind(function(t){return n(e.element,t,o,r)}).map(function(t){return o.focusManager.set(e,t),!0})},Zm=Id,tg=Id,ng=Id,eg=Wd(function(t,n,e,o){return zd(t,n,e,o,-1)}),og=Wd(function(t,n,e,o){return zd(t,n,e,o,1)}),rg=Wd(function(t,n,e,o){return Nd(t,n,e,o,-1)}),ig=Wd(function(t,n,e,o){return Nd(t,n,e,o,1)}),ug=Od([fo("selector"),To("execute",Td),Ju("onEscape"),To("captureTab",!1),Fa()],Bd,rt([Hl(Il(xd),Ad(eg,og)),Hl(Il(Sd),Fd(eg,og)),Hl(Il(wd),Zm(rg)),Hl(Il(Cd),tg(ig)),Hl(Rl([Vl,Il(hd)]),Ud),Hl(Rl([kd,Il(hd)]),Ud),Hl(Il(bd),function(t,n,e){return e.onEscape(t,n)}),Hl(Il(yd.concat(vd)),function(n,e,o,t){return(r=o).focusManager.get(n).bind(function(t){return Iu(t,r.selector)}).bind(function(t){return o.execute(n,e,t)});var r})]),rt([Hl(Il(yd),Ed)]),function(){return vt.some(Ld)}),ag=[fo("selector"),To("getInitial",vt.none),To("execute",Td),Ju("onEscape"),To("executeOnMove",!1),To("allowVertical",!0)],cg=rt([Hl(Il(yd),Ed)]),sg=Od(ag,yu.init,function(t,n,e,o){var r=xd.concat(e.allowVertical?wd:[]),i=Sd.concat(e.allowVertical?Cd:[]);return[Hl(Il(r),Kd(Ad(Yd,qd))),Hl(Il(i),Kd(Fd(Yd,qd))),Hl(Il(vd),Gd),Hl(Il(yd),Gd),Hl(Il(bd),Jd)]},cg,function(){return vt.some(Xd)}),lg=[vo("selectors",[fo("row"),fo("cell")]),To("cycles",!0),To("previousSelector",vt.none),To("execute",Td)],fg=om(function(t,n,e){return Qd(t,n,e,-1)},function(t,n,e){return tm(t,n,e,-1)}),dg=om(function(t,n,e){return Qd(t,n,e,1)},function(t,n,e){return tm(t,n,e,1)}),mg=om(function(t,n,e){return Zd(t,e,n,-1)},function(t,n,e){return nm(t,e,n,-1)}),gg=om(function(t,n,e){return Zd(t,e,n,1)},function(t,n,e){return nm(t,e,n,1)}),pg=rt([Hl(Il(xd),Ad(fg,dg)),Hl(Il(Sd),Fd(fg,dg)),Hl(Il(wd),Zm(mg)),Hl(Il(Cd),tg(gg)),Hl(Il(yd.concat(vd)),function(n,e,o){return Oa(n.element).bind(function(t){return o.execute(n,e,t)})})]),hg=rt([Hl(Il(yd),Ed)]),vg=Od(lg,yu.init,pg,hg,function(){return vt.some(em)}),bg=[fo("selector"),To("execute",Td),To("moveOnTab",!1)],yg=rt([Hl(Il(wd),ng(um)),Hl(Il(Cd),ng(am)),Hl(Rl([Vl,Il(hd)]),function(t,n,e,o){return e.moveOnTab?ng(um)(t,n,e,o):vt.none()}),Hl(Rl([kd,Il(hd)]),function(t,n,e,o){return e.moveOnTab?ng(am)(t,n,e,o):vt.none()}),Hl(Il(vd),rm),Hl(Il(yd),rm)]),xg=rt([Hl(Il(yd),Ed)]),wg=Od(bg,yu.init,yg,xg,function(){return vt.some(im)}),Sg=Od([Ju("onSpace"),Ju("onEnter"),Ju("onShiftEnter"),Ju("onLeft"),Ju("onRight"),Ju("onTab"),Ju("onShiftTab"),Ju("onUp"),Ju("onDown"),Ju("onEscape"),To("stopSpaceKeyup",!1),xo("focusIn")],yu.init,function(t,n,e){return[Hl(Il(yd),e.onSpace),Hl(Rl([kd,Il(vd)]),e.onEnter),Hl(Rl([Vl,Il(vd)]),e.onShiftEnter),Hl(Rl([Vl,Il(hd)]),e.onShiftTab),Hl(Rl([kd,Il(hd)]),e.onTab),Hl(Il(wd),e.onUp),Hl(Il(Cd),e.onDown),Hl(Il(xd),e.onLeft),Hl(Il(Sd),e.onRight),Hl(Il(yd),e.onSpace),Hl(Il(bd),e.onEscape)]},function(t,n,e){return e.stopSpaceKeyup?[Hl(Il(yd),Ed)]:[]},function(t){return t.focusIn}),Cg=qm.schema(),kg=Km.schema(),Og=sg.schema(),_g=ug.schema(),Tg=vg.schema(),Eg=Jm.schema(),Dg=wg.schema(),Bg=Sg.schema(),Mg=xa({branchKey:"mode",branches:Object.freeze({__proto__:null,acyclic:Cg,cyclic:kg,flow:Og,flatgrid:_g,matrix:Tg,execution:Eg,menu:Dg,special:Bg}),name:"keying",active:{events:function(t,n){return t.handler.toEvents(t,n)}},apis:{focusIn:function(n,e,o){e.sendFocusIn(e).fold(function(){n.getSystem().triggerFocus(n.element,n.element)},function(t){t(n,e,o)})},setGridSize:function(t,n,e,o,r){nt(e,"setGridSize")?e.setGridSize(o,r):console.error("Layout does not support setGridSize")}},state:$m}),Ag=function(t,n){return t.components()},Fg=ya({fields:[],name:"replacing",apis:Object.freeze({__proto__:null,append:function(t,n,e,o){cm(t,0,_e,o)},prepend:function(t,n,e,o){cm(t,0,Bn,o)},remove:sm,replaceAt:lm,replaceBy:function(n,t,e,o,r){return P(Ag(n),o).bind(function(t){return lm(n,0,0,t,r)})},set:function(n,t,e,o){_a(function(){var t=M(o,n.getSystem().build);Fs(n,t)},n.element)},contents:Ag})}),Ig=Object.freeze({__proto__:null,focus:dm,blur:function(t,n){n.ignore||t.element.dom.blur()},isFocused:function(t){return Ca(t.element)}}),Rg=Object.freeze({__proto__:null,exhibit:function(t,n){return Nr(n.ignore?{}:{attributes:{tabindex:"-1"}})},events:function(e){return nu([Cr(Di(),function(t,n){dm(t,e),n.stop()})].concat(e.stopMousedown?[Cr(di(),function(t,n){n.event.prevent()})]:[]))}}),Vg=ya({fields:[Ku("onFocus"),To("stopMousedown",!1),To("ignore",!1)],name:"focusing",active:Rg,apis:Ig}),Pg=Object.freeze({__proto__:null,onLoad:bm,toggle:pm,isOn:function(t,n,e){return e.get()},on:hm,off:vm,set:Gm}),Hg=Object.freeze({__proto__:null,exhibit:function(){return Nr({})},events:function(t,n){var e,o,r,i=(e=t,o=n,r=pm,iu(function(t){r(t,e,o)})),u=va(t,n,bm);return nu(ft([t.toggleOnExecute?[i]:[],[u]]))}}),zg=ya({fields:[To("selected",!1),xo("toggleClass"),To("toggleOnExecute",!0),Eo("aria",{mode:"none"},so("mode",{pressed:[To("syncWithExpanded",!1),Zu("update",function(t,n,e){on(t.element,"aria-pressed",e),n.syncWithExpanded&&Xm(t,0,e)})],checked:[Zu("update",function(t,n,e){on(t.element,"aria-checked",e)})],expanded:[Zu("update",Xm)],selected:[Zu("update",function(t,n,e){on(t.element,"aria-selected",e)})],none:[Zu("update",st)]}))],name:"toggling",active:Hg,apis:Pg,state:{init:function(){var n=Vo(!1);return{get:function(){return n.get()},set:function(t){return n.set(t)},clear:function(){return n.set(!1)},readState:function(){return n.get()}}}}}),Ng="alloy.item-hover",Lg="alloy.item-focus",Wg=rt(Ng),Ug=rt(Lg),jg=[fo("data"),fo("components"),fo("dom"),To("hasSubmenu",!1),xo("toggling"),Ef("itemBehaviours",[zg,Vg,Mg,Tf]),To("ignoreFocus",!1),To("domModification",{}),Zu("builder",function(t){return{dom:t.dom,domModification:lt(lt({},t.domModification),{attributes:lt(lt(lt({role:t.toggling.isSome()?"menuitemcheckbox":"menuitem"},t.domModification.attributes),{"aria-haspopup":t.hasSubmenu}),t.hasSubmenu?{"aria-expanded":!1}:{})}),behaviours:Df(t.itemBehaviours,[t.toggling.fold(zg.revoke,function(t){return zg.config(lt({aria:{mode:"checked"}},t))}),Vg.config({ignore:t.ignoreFocus,stopMousedown:t.ignoreFocus,onFocus:function(t){Sm(t)}}),Mg.config({mode:"execution"}),Tf.config({store:{mode:"memory",initialValue:t.data}}),fm("item-type-events",H(H([],ym(),!0),[Cr(hi(),wm),Cr(Ii(),Vg.focus)],!1))]),components:t.components,eventOrder:t.eventOrder}}),To("eventOrder",{})],Gg=[fo("dom"),fo("components"),Zu("builder",function(t){return{dom:t.dom,components:t.components,events:nu([Cr(Ii(),function(t,n){n.stop()})])}})],Xg=rt("item-widget"),Yg=rt([qf({name:"widget",overrides:function(n){return{behaviours:tc([Tf.config({store:{mode:"manual",getValue:function(t){return n.data},setValue:st}})])}}})]),qg=so("type",{widget:[fo("uid"),fo("data"),fo("components"),fo("dom"),To("autofocus",!1),To("ignoreFocus",!1),Ef("widgetBehaviours",[Tf,Vg,Mg]),To("domModification",{}),bl(Yg()),Zu("builder",function(e){function o(t){return fl(t,e,"widget").map(function(t){return Mg.focusIn(t),t})}function t(t,n){return Cl(n.event.target)||e.autofocus&&n.setSource(t.element),vt.none()}var n=sl(Xg(),e,Yg()),r=ll(Xg(),e,n.internals());return{dom:e.dom,components:r,domModification:e.domModification,events:nu([iu(function(t,n){o(t).each(function(t){n.stop()})}),Cr(hi(),wm),Cr(Ii(),function(t,n){e.autofocus?o(t):Vg.focus(t)})]),behaviours:Df(e.widgetBehaviours,[Tf.config({store:{mode:"memory",initialValue:e.data}}),Vg.config({ignore:e.ignoreFocus,onFocus:function(t){Sm(t)}}),Mg.config({mode:"special",focusIn:e.autofocus?function(t){o(t)}:oc(),onLeft:t,onRight:t,onEscape:function(t,n){return Vg.isFocused(t)||e.autofocus?(e.autofocus&&n.setSource(t.element),vt.none()):(Vg.focus(t),vt.some(!0))}})])}})],item:jg,separator:Gg}),Kg=rt([$f({factory:{sketch:function(t){var n=co("menu.spec item",qg,t);return n.builder(n)}},name:"items",unit:"item",defaults:function(t,n){return Tt(n,"uid")?n:lt(lt({},n),{uid:gu("item")})},overrides:function(t,n){return{type:n.type,ignoreFocus:t.fakeFocus,domModification:{classes:[t.markers.item]}}}})]),Jg=rt([fo("value"),fo("items"),fo("dom"),fo("components"),To("eventOrder",{}),$s("menuBehaviours",[gd,Tf,ud,Mg]),Eo("movement",{mode:"menu",moveOnTab:!0},so("mode",{grid:[Fa(),Zu("config",function(t,n){return{mode:"flatgrid",selector:"."+t.markers.item,initSize:{numColumns:n.initSize.numColumns,numRows:n.initSize.numRows},focusManager:t.focusManager}})],matrix:[Zu("config",function(t,n){return{mode:"matrix",selectors:{row:n.rowSelector,cell:"."+t.markers.item},focusManager:t.focusManager}}),fo("rowSelector")],menu:[To("moveOnTab",!0),Zu("config",function(t,n){return{mode:"menu",selector:"."+t.markers.item,moveOnTab:n.moveOnTab,focusManager:t.focusManager}})]})),mo("markers",Aa()),To("fakeFocus",!1),To("focusManager",Nl()),Ku("onHighlight")]),$g=rt("alloy.menu-focus"),Qg=Sl({name:"Menu",configFields:Jg(),partFields:Kg(),factory:function(t,n,e,o){return{uid:t.uid,dom:t.dom,markers:t.markers,behaviours:Zs(t.menuBehaviours,[gd.config({highlightClass:t.markers.selectedItem,itemClass:t.markers.item,onHighlight:t.onHighlight}),Tf.config({store:{mode:"memory",initialValue:t.value}}),ud.config({find:vt.some}),Mg.config(t.movement.config(t,t.movement))]),events:nu([Cr(Ug(),function(n,e){var t=e.event;n.getSystem().getByDom(t.target).each(function(t){gd.highlight(n,t),e.stop(),vr(n,$g(),{menu:n,item:t})})}),Cr(Wg(),function(t,n){var e=n.event.item;gd.highlight(t,e)})]),components:n,eventOrder:t.eventOrder,domModification:{attributes:{role:"menu"}}}}}),Zg=function(e,o,r,t){return tt(r,t).bind(function(t){return tt(e,t).bind(function(t){var n=Zg(e,o,r,t);return vt.some([t].concat(n))})}).getOr([])},tp=function(){function a(t){return n(t).bind(Ym)}function e(t){return tt(c.get(),t)}var c=Vo({}),i=Vo({}),s=Vo({}),l=dc(),u=Vo({}),n=function(t){return tt(i.get(),t)};return{setMenuBuilt:function(t,n){var e;i.set(lt(lt({},i.get()),((e={})[t]={type:"prepared",menu:n},e)))},setContents:function(t,n,e,o){l.set(t),c.set(e),i.set(n),u.set(o);var r=function(t,n){var e={};J(t,function(t,n){St(t,function(t){e[t]=n})});var o=n,r=_t(n,function(t,n){return{k:t,v:n}}),i=dt(r,function(t,n){return[n].concat(Zg(e,o,r,n))});return dt(e,function(t){return tt(i,t).getOr([t])})}(o,e);s.set(r)},expand:function(e){return tt(c.get(),e).map(function(t){var n=tt(s.get(),e).getOr([]);return[t].concat(n)})},refresh:function(t){return tt(s.get(),t)},collapse:function(t){return tt(s.get(),t).bind(function(t){return 1<t.length?vt.some(t.slice(1)):vt.none()})},lookupMenu:n,lookupItem:e,otherMenus:function(t){var n=u.get();return W(kt(n),t)},getPrimary:function(){return l.get().bind(a)},getMenus:function(){return i.get()},clear:function(){c.set({}),i.set({}),s.set({}),l.clear()},isClear:function(){return l.get().isNone()},getTriggeringPath:function(t,u){var n=F(e(t).toArray(),function(t){return a(t).isSome()});return tt(s.get(),t).bind(function(t){var e=L(n.concat(t));return function(t){for(var n=[],e=0;e<t.length;e++){var o=t[e];if(!o.isSome())return vt.none();n.push(o.getOrDie())}return vt.some(n)}(z(e,function(t,n){return o=t,r=u,i=e.slice(0,n+1),a(o).bind(function(n){return e=o,Q(c.get(),function(t,n){return t===e}).bind(function(t){return r(t).map(function(t){return{triggeredMenu:n,triggeringItem:t,triggeringPath:i}})});var e}).fold(function(){return mt(l.get(),t)?[]:[vt.none()]},function(t){return[vt.some(t)]});var o,r,i}))})}}},np=Ym,ep=rt("collapse-item"),op=wl({name:"TieredMenu",configFields:[Qu("onExecute"),Qu("onEscape"),$u("onOpenMenu"),$u("onOpenSubmenu"),Ku("onRepositionMenu"),Ku("onCollapseMenu"),To("highlightImmediately",!0),vo("data",[fo("primary"),fo("menus"),fo("expansions")]),To("fakeFocus",!1),Ku("onHighlight"),Ku("onHover"),Xu(),fo("dom"),To("navigateOnHover",!0),To("stayInDom",!1),$s("tmenuBehaviours",[Mg,gd,ud,Fg]),To("eventOrder",{})],apis:{collapseMenu:function(t,n){t.collapseMenu(n)},highlightPrimary:function(t,n){t.highlightPrimary(n)},repositionMenus:function(t,n){t.repositionMenus(n)}},factory:function(a,t){function e(t){var o,r,n=(o=t,r=a.data.primary,dt(a.data.menus,function(t,n){function e(){return Qg.sketch(lt(lt({},t),{value:n,markers:a.markers,fakeFocus:a.fakeFocus,onHighlight:a.onHighlight,focusManager:(a.fakeFocus?Ll:Nl)()}))}return n===r?{type:"prepared",menu:o.getSystem().build(e())}:{type:"notbuilt",nbMenu:e}})),e=dt(a.data.menus,function(t,n){return z(t.items,function(t){return"separator"===t.type?[]:[t.data.value]})});return g.setContents(a.data.primary,n,a.data.expansions,e),g.getPrimary()}function c(t){return Tf.getValue(t).value}function u(n,t){gd.highlight(n,t),gd.getHighlighted(t).orThunk(function(){return gd.getFirst(t)}).each(function(t){yr(n,t.element,Ii())})}function s(n,t){return et(M(t,function(t){return n.lookupMenu(t).bind(function(t){return"prepared"===t.type?vt.some(t.menu):vt.none()})}))}function l(n,t,e){var o=s(t,t.otherMenus(e));St(o,function(t){Jr(t.element,[a.markers.backgroundMenu]),a.stayInDom||Fg.remove(n,t)})}function f(t,o){var n;J((n=t,r.get().getOrThunk(function(){var e={},t=F(ps(n.element,"."+a.markers.item),function(t){return"true"===rn(t,"aria-haspopup")});return St(t,function(t){n.getSystem().getByDom(t).each(function(t){var n=c(t);e[n]=t})}),r.set(e),e})),function(t,n){var e=wt(o,n);on(t.element,"aria-expanded",e)})}function d(o,r,i){return vt.from(i[0]).bind(function(t){return r.lookupMenu(t).bind(function(t){if("notbuilt"===t.type)return vt.none();var n=t.menu,e=s(r,i.slice(1));return St(e,function(t){Xr(t.element,a.markers.backgroundMenu)}),he(n.element)||Fg.append(o,Tu(n)),Jr(n.element,[a.markers.backgroundMenu]),u(o,n),l(o,r,i),vt.some(n)})})}var m,n,r=dc(),g=tp();function i(r,i,u){if(void 0===u&&(u=m.HighlightSubmenu),i.hasConfigured(dd)&&dd.isDisabled(i))return vt.some(i);var t=c(i);return g.expand(t).bind(function(o){return f(r,o),vt.from(o[0]).bind(function(e){return g.lookupMenu(e).bind(function(t){var n=function(t,n,e){if("notbuilt"!==e.type)return e.menu;var o=t.getSystem().build(e.nbMenu());return g.setMenuBuilt(n,o),o}(r,e,t);return he(n.element)||Fg.append(r,Tu(n)),a.onOpenSubmenu(r,i,n,L(o)),u===m.HighlightSubmenu?(gd.highlightFirst(n),d(r,g,o)):(gd.dehighlightAll(n),vt.some(i))})})})}function o(n,e){var t=c(e);return g.collapse(t).bind(function(t){return f(n,t),d(n,g,t).map(function(t){return a.onCollapseMenu(n,e,t),t})})}function p(e){return function(n,t){return Iu(t.getSource(),"."+a.markers.item).bind(function(t){return n.getSystem().getByDom(t).toOptional().bind(function(t){return e(n,t).map(_)})})}}function h(t){return gd.getHighlighted(t).bind(gd.getHighlighted)}(n=m={})[n.HighlightSubmenu=0]="HighlightSubmenu",n[n.HighlightParent=1]="HighlightParent";var v=nu([Cr($g(),function(e,o){var t=o.event.item;g.lookupItem(c(t)).each(function(){var t=o.event.menu;gd.highlight(e,t);var n=c(o.event.item);g.refresh(n).each(function(t){return l(e,g,t)})})}),iu(function(n,t){var e=t.event.target;n.getSystem().getByDom(e).each(function(t){0===c(t).indexOf("collapse-item")&&o(n,t),i(n,t,m.HighlightSubmenu).fold(function(){a.onExecute(n,t)},st)})}),eu(function(n,t){e(n).each(function(t){Fg.append(n,Tu(t)),a.onOpenMenu(n,t),a.highlightImmediately&&u(n,t)})})].concat(a.navigateOnHover?[Cr(Wg(),function(t,n){var e=n.event.item,o=t,r=c(e);g.refresh(r).bind(function(t){return f(o,t),d(o,g,t)}),i(t,e,m.HighlightParent),a.onHover(t,e)})]:[])),b={collapseMenu:function(n){h(n).each(function(t){o(n,t)})},highlightPrimary:function(n){g.getPrimary().each(function(t){u(n,t)})},repositionMenus:function(o){g.getPrimary().bind(function(n){return h(o).bind(function(t){var n=c(t),e=et(M(Z(g.getMenus()),np));return g.getTriggeringPath(n,function(t){return n=t,K(e,function(t){return t.getSystem().isConnected()?V(gd.getCandidates(t),function(t){return c(t)===n}):vt.none()});var n})}).map(function(t){return{primary:n,triggeringPath:t}})}).fold(function(){vt.from(o.components()[0]).filter(function(t){return"menu"===rn(t.element,"role")}).each(function(t){a.onRepositionMenu(o,t,[])})},function(t){var n=t.primary,e=t.triggeringPath;a.onRepositionMenu(o,n,e)})}};return{uid:a.uid,dom:a.dom,markers:a.markers,behaviours:Zs(a.tmenuBehaviours,[Mg.config({mode:"special",onRight:p(function(t,n){return Cl(n.element)?vt.none():i(t,n,m.HighlightSubmenu)}),onLeft:p(function(t,n){return Cl(n.element)?vt.none():o(t,n)}),onEscape:p(function(t,n){return o(t,n).orThunk(function(){return a.onEscape(t,n).map(function(){return t})})}),focusIn:function(n,t){g.getPrimary().each(function(t){yr(n,t.element,Ii())})}}),gd.config({highlightClass:a.markers.selectedMenu,itemClass:a.markers.menu}),ud.config({find:function(t){return gd.getHighlighted(t)}}),Fg.config({})]),eventOrder:a.eventOrder,apis:b,events:v}},extraApis:{tieredData:function(t,n,e){return{primary:t,menus:n,expansions:e}},singleData:function(t,n){return{primary:t,menus:cr(t,n),expansions:{}}},collapseItem:function(t){return{value:Fr(ep()),meta:{text:t}}}}}),rp=wl({name:"InlineView",configFields:[fo("lazySink"),Ku("onShow"),Ku("onHide"),ko("onEscape"),$s("inlineBehaviours",[hf,Tf,rc]),_o("fireDismissalEventInstead",[To("event",Xi())]),_o("fireRepositionEventInstead",[To("event",Yi())]),To("getRelated",vt.none),To("isExtraPart",O),To("eventOrder",vt.none)],factory:function(d,t){function n(e){hf.isOpen(e)&&Tf.getValue(e).each(function(t){switch(t.mode){case"menu":hf.getState(e).each(op.repositionMenus);break;case"position":var n=d.lazySink(e).getOrDie();sf.positionWithinBounds(n,e,t.config,t.getBounds())}})}function o(t,n,e,o){i(t,n,e,function(){return o.map(function(t){return Me(t)})})}function r(t,n,e,o){var r,i,u,a,c,s=(r=d,i=t,u=n,a=o,c="horizontal"===e.type?{layouts:{onLtr:pa,onRtl:ha}}:{},op.sketch({dom:{tag:"div"},data:e.data,markers:e.menu.markers,highlightImmediately:e.menu.highlightImmediately,onEscape:function(){return hf.close(i),r.onEscape.map(function(t){return t(i)}),vt.some(!0)},onExecute:function(){return vt.some(!0)},onOpenMenu:function(t,n){sf.positionWithinBounds(l().getOrDie(),n,u,a())},onOpenSubmenu:function(t,n,e,o){var r=l().getOrDie();sf.position(r,e,{anchor:lt({type:"submenu",item:n},f(o))})},onRepositionMenu:function(t,n,e){var o=l().getOrDie();sf.positionWithinBounds(o,n,u,a()),St(e,function(t){var n=f(t.triggeringPath);sf.position(o,t.triggeredMenu,{anchor:lt({type:"submenu",item:t.triggeringItem},n)})})}}));function l(){return r.lazySink(i)}function f(t){return 2===t.length?c:{}}hf.open(t,s),Tf.setValue(t,vt.some({mode:"menu",menu:s}))}var i=function(t,n,e,o){var r=d.lazySink(t).getOrDie();hf.openWhileCloaked(t,n,function(){return sf.positionWithinBounds(r,t,e,o())}),Tf.setValue(t,vt.some({mode:"position",config:e,getBounds:o}))},e={setContent:function(t,n){hf.setContent(t,n)},showAt:function(t,n,e){o(t,n,e,vt.none())},showWithin:o,showWithinBounds:i,showMenuAt:function(t,n,e){r(t,n,e,vt.none)},showMenuWithinBounds:r,hide:function(t){hf.isOpen(t)&&(Tf.setValue(t,vt.none()),hf.close(t))},getContent:function(t){return hf.getState(t)},reposition:n,isOpen:hf.isOpen};return{uid:d.uid,dom:d.dom,behaviours:Zs(d.inlineBehaviours,[hf.config({isPartOf:function(t,n,e){return Hu(n,e)||(o=e,d.getRelated(t).exists(function(t){return Hu(t,o)}));var o},getAttachPoint:function(t){return d.lazySink(t).getOrDie()},onOpen:function(t){d.onShow(t)},onClose:function(t){d.onHide(t)}}),Tf.config({store:{mode:"memory",initialValue:vt.none()}}),rc.config({channels:lt(lt({},js(lt({isExtraPart:t.isExtraPart},d.fireDismissalEventInstead.map(function(t){return{fireEventInstead:{event:t.event}}}).getOr({})))),Gs(lt(lt({},d.fireRepositionEventInstead.map(function(t){return{fireEventInstead:{event:t.event}}}).getOr({})),{doReposition:n})))})]),eventOrder:d.eventOrder,apis:e}},apis:{showAt:function(t,n,e,o){t.showAt(n,e,o)},showWithin:function(t,n,e,o,r){t.showWithin(n,e,o,r)},showWithinBounds:function(t,n,e,o,r){t.showWithinBounds(n,e,o,r)},showMenuAt:function(t,n,e,o){t.showMenuAt(n,e,o)},showMenuWithinBounds:function(t,n,e,o,r){t.showMenuWithinBounds(n,e,o,r)},hide:function(t,n){t.hide(n)},isOpen:function(t,n){return t.isOpen(n)},getContent:function(t,n){return t.getContent(n)},setContent:function(t,n,e){t.setContent(n,e)},reposition:function(t,n){t.reposition(n)}}}),ip="layout-inset",up=function(t,n,e){return na(Cm(t,n),t.y,e.insetNorth(),za(),"north",oa(t,{top:2}),ip)},ap=function(t,n,e){return na(Cm(t,n),Om(t,n),e.insetSouth(),Na(),"south",oa(t,{bottom:3}),ip)},cp=tinymce.util.Tools.resolve("tinymce.util.Delay"),sp=wl({name:"Button",factory:function(t){function e(n){return tt(t.dom,"attributes").bind(function(t){return tt(t,n)})}var n=xm(t.action),o=t.dom.tag;return{uid:t.uid,dom:t.dom,components:t.components,events:n,behaviours:Df(t.buttonBehaviours,[Vg.config({}),Mg.config({mode:"execution",useSpace:!0,useEnter:!0})]),domModification:{attributes:function(){if("button"!==o)return{role:e("role").getOr("button")};var t=e("type").getOr("button"),n=e("role").map(function(t){return{role:t}}).getOr({});return lt({type:t},n)}()},eventOrder:t.eventOrder}},configFields:[To("uid",void 0),fo("dom"),To("components",[]),Ef("buttonBehaviours",[Vg,Mg]),xo("action"),xo("role"),To("eventOrder",{})]}),lp=tinymce.util.Tools.resolve("tinymce.util.I18n"),fp={indent:!0,outdent:!0,"table-insert-column-after":!0,"table-insert-column-before":!0,"paste-column-after":!0,"paste-column-before":!0,"unordered-list":!0,"list-bull-circle":!0,"list-bull-default":!0,"list-bull-square":!0},dp="temporary-placeholder",mp={success:"checkmark",error:"warning",err:"error",warning:"warning",warn:"warning",info:"info"},gp=wl({name:"Notification",factory:function(n){function e(t){return{dom:{tag:"div",classes:["tox-bar"],attributes:{style:"width: "+t+"%"}}}}function o(t){return{dom:{tag:"div",classes:["tox-text"],innerHtml:t+"%"}}}var t,r,i,u,a=Pm({dom:{tag:"p",innerHtml:n.translationProvider(n.text)},behaviours:tc([Fg.config({})])}),c=Pm({dom:{tag:"div",classes:n.progress?["tox-progress-bar","tox-progress-indicator"]:["tox-progress-bar"]},components:[{dom:{tag:"div",classes:["tox-bar-container"]},components:[e(0)]},o(0)],behaviours:tc([Fg.config({})])}),s={updateProgress:function(t,n){t.getSystem().isConnected()&&c.getOpt(t).each(function(t){Fg.set(t,[{dom:{tag:"div",classes:["tox-bar-container"]},components:[e(n)]},o(n)])})},updateText:function(t,n){var e;t.getSystem().isConnected()&&(e=a.get(t),Fg.set(e,[oi(n)]))}},l=ft([n.icon.toArray(),n.level.toArray(),n.level.bind(function(t){return vt.from(mp[t])}).toArray()]),f=Pm(sp.sketch({dom:{tag:"button",classes:["tox-notification__dismiss","tox-button","tox-button--naked","tox-button--icon"]},components:[jm("close",{tag:"div",classes:["tox-icon"],attributes:{"aria-label":n.translationProvider("Close")}},n.iconProvider)],action:function(t){n.onAction(t)}})),d=[(t=l,r={tag:"div",classes:["tox-notification__icon"]},i=n.iconProvider,u=i(),Um(r,V(t,function(t){return Tt(u,zm(t,u))}).getOr(dp),u,vt.none())),{dom:{tag:"div",classes:["tox-notification__body"]},components:[a.asSpec()],behaviours:tc([Fg.config({})])}];return{uid:n.uid,dom:{tag:"div",attributes:{role:"alert"},classes:n.level.map(function(t){return["tox-notification","tox-notification--in","tox-notification--"+t]}).getOr(["tox-notification","tox-notification--in"])},behaviours:tc([Vg.config({}),fm("notification-events",[Cr(vi(),function(t){f.getOpt(t).each(Vg.focus)})])]),components:d.concat(n.progress?[c.asSpec()]:[]).concat(n.closeButton?[f.asSpec()]:[]),apis:s}},configFields:[xo("level"),fo("progress"),fo("icon"),fo("onAction"),fo("text"),fo("iconProvider"),fo("translationProvider"),Ao("closeButton",!0)],apis:{updateProgress:function(t,n,e){t.updateProgress(n,e)},updateText:function(t,n,e){t.updateText(n,e)}}});function pp(e,o){function r(){b(i)||(clearTimeout(i),i=null)}var i=null;return{cancel:r,throttle:function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];r(),i=setTimeout(function(){i=null,e.apply(null,t)},o)}}}function hp(o,t,n,e,r){var i=Ep(o,function(t){return(n=o).isBlock(e=t)||wt(["BR","IMG","HR","INPUT"],e.nodeName)||"false"===n.getContentEditable(e);var n,e});return vt.from(i.backwards(t,n,e,r))}function vp(e,n){return Dp(At.fromDom(e.selection.getNode())).getOrThunk(function(){var i,u,t=At.fromHtml('<span data-mce-autocompleter="1" data-mce-bogus="1"></span>',e.getDoc());return _e(t,At.fromDom(n.extractContents())),n.insertNode(t.dom),Yt(t).each(function(t){return t.dom.normalize()}),i=gs,(u=function(t){for(var n=Kt(t),e=n.length-1;0<=e;e--){var o=n[e];if(i(o))return vt.some(o);var r=u(o);if(r.isSome())return r}return vt.none()})(t).map(function(t){var n;e.selection.setCursorLocation(t.dom,"img"===Ft(n=t)?1:ms(n).fold(function(){return Kt(n).length},function(t){return t.length}))}),t})}function bp(t){return t.toString().replace(/\u00A0/g," ").replace(/\uFEFF/g,"")}function yp(t){return""!==t&&-1!==" \xa0\f\n\r\t\v".indexOf(t)}function xp(t,n){return t.substring(n.length)}function wp(o,t,r,n){return void 0===n&&(n=0),Dp(At.fromDom(t.startContainer)).fold(function(){return function(t,o,i,r){if(void 0===r&&(r=0),!o.collapsed||3!==o.startContainer.nodeType)return vt.none();var n=t.getParent(o.startContainer,t.isBlock)||t.getRoot();return hp(t,o.startContainer,o.startOffset,function(t,r,n){return function(t,n){for(var e=r-1;0<=e;e--){var o=t.charAt(e);if(yp(o))return vt.none();if(o===n)break}return vt.some(e)}(n,i).getOr(r)},n).bind(function(t){var n=o.cloneRange();if(n.setStart(t.container,t.offset),n.setEnd(o.endContainer,o.endOffset),n.collapsed)return vt.none();var e=bp(n);return 0!==e.lastIndexOf(i)||xp(e,i).length<r?vt.none():vt.some({text:xp(e,i),range:n,triggerChar:i})})}(o,t,r,n)},function(t){var n=o.createRng();n.selectNode(t.dom);var e=bp(n);return vt.some({range:n,text:xp(e,r),triggerChar:r})})}function Sp(t,n){return{container:t,offset:n}}function Cp(t){return uo("toolbarbutton",Pp,t)}function kp(t){return uo("ToggleButton",zp,t)}function Op(n,t,e,o){void 0===o&&(o={});var r=t(),i=n.selection.getRng().startContainer.nodeValue,u=F(r.lookupByChar(e.triggerChar),function(t){return e.text.length>=t.minChars&&t.matches.getOrThunk(function(){return e=n.dom,function(t){var n=Ap(t.startContainer,t.startOffset);return!hp(e,n.container,n.offset,function(t,n){return 0===n?-1:n},e.getRoot()).filter(function(t){return!yp(t.container.data.charAt(t.offset-1))}).isSome()};var e})(e.range,i,e.text)});if(0===u.length)return vt.none();var a=Bp.all(M(u,function(n){return n.fetch(e.text,n.maxResults,o).then(function(t){return{matchText:e.text,items:t,columns:n.columns,onAction:n.onAction,highlightOn:n.highlightOn}})}));return vt.some({lookupData:a,context:e})}var _p,Tp,Ep=tinymce.util.Tools.resolve("tinymce.dom.TextSeeker"),Dp=function(t){return Iu(t,"[data-mce-autocompleter]")},Bp=tinymce.util.Tools.resolve("tinymce.util.Promise"),Mp=function(t){if(3===t.nodeType)return Sp(t,t.data.length);var n=t.childNodes;return 0<n.length?Mp(n[n.length-1]):Sp(t,n.length)},Ap=function(t,n){var e=t.childNodes;return 0<e.length&&n<e.length?Ap(e[n],0):0<e.length&&1===t.nodeType&&e.length===n?Mp(e[e.length-1]):Sp(t,n)},Fp=Jo([go("type"),Co("text")]),Ip=Jo([To("type","autocompleteitem"),To("active",!1),To("disabled",!1),To("meta",{}),go("value"),Co("text"),Co("icon")]),Rp=Jo([go("type"),go("ch"),Do("minChars",1),To("columns",1),Do("maxResults",10),ko("matches"),ho("fetch"),ho("onAction"),Io("highlightOn",[],tr)]),Vp=[Ao("disabled",!1),Co("tooltip"),Co("icon"),Co("text"),Fo("onSetup",function(){return st})],Pp=Jo([go("type"),ho("onAction")].concat(Vp)),Hp=[Ao("active",!1)].concat(Vp),zp=Jo(Hp.concat([go("type"),ho("onAction")])),Np=[Fo("predicate",O),Mo("scope","node",["node","editor"]),Mo("position","selection",["node","selection","line"])],Lp=Vp.concat([To("type","contextformbutton"),To("primary",!1),ho("onAction"),ar("original",h)]),Wp=Hp.concat([To("type","contextformbutton"),To("primary",!1),ho("onAction"),ar("original",h)]),Up=Vp.concat([To("type","contextformbutton")]),jp=Hp.concat([To("type","contextformtogglebutton")]),Gp=so("type",{contextformbutton:Lp,contextformtogglebutton:Wp}),Xp=Jo([To("type","contextform"),Fo("initValue",rt("")),Co("label"),yo("commands",Gp),wo("launch",so("type",{contextformbutton:Up,contextformtogglebutton:jp}))].concat(Np)),Yp=Jo([To("type","contexttoolbar"),go("items")].concat(Np));function qp(t){return tt(kh,t).getOr(wh)}function Kp(t){return{backgroundMenu:"tox-background-menu",selectedMenu:"tox-selected-menu",selectedItem:"tox-collection__item--active",hasIcons:"tox-menu--has-icons",menu:"color"===t?"tox-swatches":"tox-menu",tieredMenu:"tox-tiered-menu"}}function Jp(t){var n=Kp(t);return{backgroundMenu:n.backgroundMenu,selectedMenu:n.selectedMenu,menu:n.menu,selectedItem:n.selectedItem,item:qp(t)}}function $p(t,n,e){return{dom:{tag:"div",classes:ft([[Kp(e).tieredMenu]])},markers:Jp(e)}}function Qp(n,e){return function(t){return M(B(t,e),function(t){return{dom:n,components:t}})}}function Zp(t,e){var o=[],r=[];return St(t,function(t,n){e(t,n)?(0<r.length&&o.push(r),r=[],Tt(t.dom,"innerHtml")&&r.push(t)):r.push(t)}),0<r.length&&o.push(r),M(o,function(t){return{dom:{tag:"div",classes:["tox-collection__group"]},components:t}})}function th(n,e){return{dom:{tag:"div",classes:["tox-menu","tox-collection"].concat(1===n?["tox-collection--list"]:["tox-collection--grid"])},components:[Qg.parts.items({preprocess:function(t){return"auto"!==n&&1<n?Qp({tag:"div",classes:["tox-collection__group"]},n)(t):Zp(t,function(t,n){return"separator"===e[n].type})}})]}}function nh(t){return T(t,function(t){return"icon"in t&&void 0!==t.icon})}function eh(t){return console.error(ir(t)),console.log(t),vt.none()}function oh(t,n,e,o,r){var i,u=(i=e,{dom:{tag:"div",classes:["tox-collection","tox-collection--horizontal"]},components:[Qg.parts.items({preprocess:function(t){return Zp(t,function(t,n){return"separator"===i[n].type})}})]});return{value:t,dom:u.dom,components:u.components,items:e}}function rh(t,n,e,o,r){var i,u;return"color"===r?{value:t,dom:(i={dom:{tag:"div",classes:["tox-menu","tox-swatches-menu"]},components:[{dom:{tag:"div",classes:["tox-swatches"]},components:[Qg.parts.items({preprocess:"auto"!==o?Qp({tag:"div",classes:["tox-swatches__row"]},o):h})]}]}).dom,components:i.components,items:e}:"normal"===r&&"auto"===o?{value:t,dom:(i=th(o,e)).dom,components:i.components,items:e}:"normal"===r&&1===o?{value:t,dom:(i=th(1,e)).dom,components:i.components,items:e}:"normal"===r?{value:t,dom:(i=th(o,e)).dom,components:i.components,items:e}:"listpreview"!==r||"auto"===o?{value:t,dom:{tag:"div",classes:ft([[(u=Kp(r)).menu,"tox-menu-"+o+"-column"],n?[u.hasIcons]:[]])},components:Ah,items:e}:{value:t,dom:(i={dom:{tag:"div",classes:["tox-menu","tox-collection","tox-collection--toolbar","tox-collection--toolbar-lg"]},components:[Qg.parts.items({preprocess:Qp({tag:"div",classes:["tox-collection__group"]},o)})]}).dom,components:i.components,items:e}}function ih(t,o,n){var r=ps(t.element,"."+n);if(0<r.length){var e=P(r,function(t){var n=t.dom.getBoundingClientRect().top,e=r[0].dom.getBoundingClientRect().top;return Math.abs(n-e)>o}).getOr(r.length);return vt.some({numColumns:e,numRows:Math.ceil(r.length/e)})}return vt.none()}function uh(t,n,e){t.getSystem().broadcastOn([qh],{})}function ah(t){return t.getParam("height",Math.max(t.getElement().offsetHeight,200))}function ch(t){return t.getParam("width",tv.DOM.getStyle(t.getElement(),"width"))}function sh(t){return vt.from(t.getParam("min_width")).filter(u)}function lh(t){return vt.from(t.getParam("min_height")).filter(u)}function fh(t){return vt.from(t.getParam("max_width")).filter(u)}function dh(t){return vt.from(t.getParam("max_height")).filter(u)}function mh(t){return!1!==t.getParam("menubar",!0,"boolean")}function gh(t){var n=t.getParam("toolbar",!0),e=!0===n,o=y(n),r=c(n)&&0<n.length;return!ev(t)&&(r||o||e)}function ph(n){var t=F(D(9,function(t){return n.getParam("toolbar"+(t+1),!1,"string")}),function(t){return"string"==typeof t});return 0<t.length?vt.some(t):vt.none()}(Tp=_p={})[Tp.CLOSE_ON_EXECUTE=0]="CLOSE_ON_EXECUTE",Tp[Tp.BUBBLE_TO_SANDBOX=1]="BUBBLE_TO_SANDBOX";var hh,vh,bh,yh,xh=_p,wh="tox-menu-nav__js",Sh="tox-collection__item",Ch="tox-swatch",kh={normal:wh,color:Ch},Oh="tox-collection__item--enabled",_h="tox-collection__item-icon",Th="tox-collection__item-label",Eh="tox-collection__item-caret",Dh="tox-collection__item--active",Bh="tox-collection__item-container",Mh="tox-collection__item-container--row",Ah=[Qg.parts.items({})],Fh=[go("type"),go("src"),Co("alt"),Io("classes",[],tr)],Ih=Jo(Fh),Rh=[go("type"),go("text"),Co("name"),Io("classes",["tox-collection__item-label"],tr)],Vh=Jo(Rh),Ph=Qe(function(){return oo("type",{cardimage:Ih,cardtext:Vh,cardcontainer:Hh})}),Hh=Jo([go("type"),Bo("direction","horizontal"),Bo("align","left"),Bo("valign","middle"),yo("items",Ph)]),zh=[Ao("disabled",!1),Co("text"),Co("shortcut"),ur("value","value",Ue(function(){return Fr("menuitem-value")}),Qo()),To("meta",{})],Nh=Jo([go("type"),Co("label"),yo("items",Ph),Fo("onSetup",function(){return st}),Fo("onAction",st)].concat(zh)),Lh=Jo([go("type"),Ao("active",!1),Co("icon")].concat(zh)),Wh=[go("type"),go("fancytype"),Fo("onAction",st)],Uh=so("fancytype",{inserttable:[To("initData",{})].concat(Wh),colorswatch:[Ro("initData",{},[Ao("allowCustomColors",!0),Oo("colors",Qo())])].concat(Wh)}),jh=Jo([go("type"),Fo("onSetup",function(){return st}),Fo("onAction",st),Co("icon")].concat(zh)),Gh=Jo([go("type"),ho("getSubmenuItems"),Fo("onSetup",function(){return st}),Co("icon")].concat(zh)),Xh=Jo([go("type"),Co("icon"),Ao("active",!1),Fo("onSetup",function(){return st}),ho("onAction")].concat(zh)),Yh=function(t){return n=Fr("unnamed-events"),tc([fm(n,t)]);var n},qh=Fr("tooltip.exclusive"),Kh=Fr("tooltip.show"),Jh=Fr("tooltip.hide"),$h=Object.freeze({__proto__:null,hideAllExclusive:uh,setComponents:function(t,n,e,o){e.getTooltip().each(function(t){t.getSystem().isConnected()&&Fg.set(t,o)})}}),Qh=Object.freeze({__proto__:null,events:function(r,i){function e(n){i.getTooltip().each(function(t){Vs(t),r.onHide(n,t),i.clearTooltip()}),i.clearTimer()}return nu(ft([[Cr(Kh,function(o){i.resetTimer(function(){var t,n,e=o;i.isShowing()||(uh(e),t=r.lazySink(e).getOrDie(),n=e.getSystem().build({dom:r.tooltipDom,components:r.tooltipComponents,events:nu("normal"===r.mode?[Cr(hi(),function(t){hr(e,Kh)}),Cr(gi(),function(t){hr(e,Jh)})]:[]),behaviours:tc([Fg.config({})])}),i.setTooltip(n),Is(t,n),r.onShow(e,n),sf.position(t,n,{anchor:r.anchor(e)}))},r.delay)}),Cr(Jh,function(t){i.resetTimer(function(){e(t)},r.delay)}),Cr(Ai(),function(t,n){n.universal||wt(n.channels,qh)&&e(t)}),ou(function(t){e(t)})],"normal"===r.mode?[Cr(vi(),function(t){hr(t,Kh)}),Cr(Bi(),function(t){hr(t,Jh)}),Cr(hi(),function(t){hr(t,Kh)}),Cr(gi(),function(t){hr(t,Jh)})]:[Cr(Qi(),function(t,n){hr(t,Kh)}),Cr(Zi(),function(t){hr(t,Jh)})]]))}}),Zh=ya({fields:[fo("lazySink"),fo("tooltipDom"),To("exclusive",!0),To("tooltipComponents",[]),To("delay",300),Mo("mode","normal",["normal","follow-highlight"]),To("anchor",function(t){return{type:"hotspot",hotspot:t,layouts:{onLtr:rt([Ja,Ka,Ga,Ya,Xa,qa]),onRtl:rt([Ja,Ka,Ga,Ya,Xa,qa])}}}),Ku("onHide"),Ku("onShow")],name:"tooltipping",active:Qh,state:Object.freeze({__proto__:null,init:function(){function e(){o.on(clearTimeout)}var o=dc(),t=dc(),n=rt("not-implemented");return xu({getTooltip:t.get,isShowing:t.isSet,setTooltip:t.set,clearTooltip:t.clear,clearTimer:e,resetTimer:function(t,n){e(),o.set(setTimeout(t,n))},readState:n})}}),apis:$h}),tv=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),nv=tinymce.util.Tools.resolve("tinymce.EditorManager"),ev=function(t){return ph(t).fold(function(){return 0<t.getParam("toolbar",[],"string[]").length},_)};function ov(t){return t.getParam("toolbar_mode","","string")}function rv(t){return t.getParam("toolbar_location",bh.auto,"string")}function iv(t){return rv(t)===bh.bottom}function uv(t){if(!t.inline)return vt.none();var n=t.getParam("fixed_toolbar_container","","string");if(0<n.length)return Fu(ve(),n);var e=t.getParam("fixed_toolbar_container_target");return d(e)?vt.some(At.fromDom(e)):vt.none()}function av(t){return t.inline&&uv(t).isSome()}function cv(t){return uv(t).getOrThunk(function(){return tn(me(At.fromDom(t.getElement())))})}function sv(t){return t.inline&&!mh(t)&&!gh(t)&&!ev(t)}function lv(t){return(t.getParam("toolbar_sticky",!1,"boolean")||t.inline)&&!av(t)&&!sv(t)}function fv(t,n){var e=t.outerContainer.element;n&&(t.mothership.broadcastOn([vf()],{target:e}),t.uiMothership.broadcastOn([vf()],{target:e})),t.mothership.broadcastOn([Yv],{readonly:n}),t.uiMothership.broadcastOn([Yv],{readonly:n})}function dv(t,n){t.on("init",function(){t.mode.isReadOnly()&&fv(n,!0)}),t.on("SwitchMode",function(){return fv(n,t.mode.isReadOnly())}),t.getParam("readonly",!1,"boolean")&&t.setMode("readonly")}function mv(){var t;return rc.config({channels:((t={})[Yv]={schema:qv,onReceive:function(t,n){dd.set(t,n.readonly)}},t)})}function gv(t,n){var e=t.getApi(n);return function(t){t(e)}}function pv(e,o){return eu(function(t){gv(e,t)(function(t){var n=e.onSetup(t);m(n)&&o.set(n)})})}function hv(n,e){return ou(function(t){return gv(n,t)(e.get())})}function vv(t,n,e,o){var r,i,u=Vo(st);return{type:"item",dom:n.dom,components:Qv(n.optComponents),data:t.data,eventOrder:$v,hasSubmenu:t.triggersSubmenu,itemBehaviours:tc([fm("item-events",[(r=t,i=e,iu(function(t,n){gv(r,t)(r.onAction),r.triggersSubmenu||i!==xh.CLOSE_ON_EXECUTE||(hr(t,Pi()),n.stop())})),pv(t,u),hv(t,u)]),dd.config({disabled:function(){return t.disabled||o.isDisabled()},disableClass:"tox-collection__item--state-disabled"}),mv(),Fg.config({})].concat(t.itemBehaviours))}}function bv(t){return{value:t.value,meta:lt({text:t.text.getOr("")},t.meta)}}function yv(t,n,e){return jm(t,{tag:"div",classes:e=void 0===e?[_h]:e},n)}function xv(t){return{dom:{tag:"div",classes:[Th]},components:[oi(lp.translate(t))]}}function wv(t,n){return{dom:{tag:"div",classes:n,innerHtml:t}}}function Sv(t,n){return{dom:{tag:"div",classes:[Th]},components:[{dom:{tag:t.tag,styles:t.styles},components:[oi(lp.translate(n))]}]}}function Cv(t){return{dom:{tag:"div",classes:["tox-collection__item-accessory"],innerHtml:(e=Zv.mac?{alt:"&#x2325;",ctrl:"&#x2303;",shift:"&#x21E7;",meta:"&#x2318;",access:"&#x2303;&#x2325;"}:{meta:"Ctrl",access:"Shift+Alt"},n=M(t.split("+"),function(t){var n=t.toLowerCase().trim();return Tt(e,n)?e[n]:t}),Zv.mac?n.join(""):n.join("+"))}};var e,n}function kv(t){return yv("checkmark",t,["tox-collection__item-checkmark"])}function Ov(t){var n=t.map(function(t){return{attributes:{title:lp.translate(t)}}}).getOr({});return lt({tag:"div",classes:[wh,Sh]},n)}function _v(t,n,e,o){return void 0===o&&(o=vt.none()),"color"===t.presets?(r=n,i=o,c=t.ariaLabel,s=t.value,{dom:(u=t.iconContent.map(function(t){return n=r.icons,e=i,Nm(t,o=n()).or(e).getOrThunk(Hm(o));var n,e,o}).getOr(""),a={tag:"div",attributes:c.map(function(t){return{title:r.translate(t)}}).getOr({}),classes:["tox-swatch"]},lt(lt({},a),"custom"===s?{tag:"button",classes:H(H([],a.classes,!0),["tox-swatches__picker-btn"],!1),innerHtml:u}:"remove"===s?{classes:H(H([],a.classes,!0),["tox-swatch--remove"],!1),innerHtml:u}:{attributes:lt(lt({},a.attributes),{"data-mce-color":s}),styles:{"background-color":s}})),optComponents:[]}):(l=t,f=n,d=o,m={tag:"div",classes:[_h]},g=e?l.iconContent.map(function(t){return jm(t,m,f.icons,d)}).orThunk(function(){return vt.some({dom:m})}):vt.none(),p=l.checkMark,h=vt.from(l.meta).fold(function(){return xv},function(t){return Tt(t,"style")?S(Sv,t.style):xv}),v=l.htmlContent.fold(function(){return l.textContent.map(h)},function(t){return vt.some(wv(t,[Th]))}),{dom:Ov(l.ariaLabel),optComponents:[g,v,l.shortcutContent.map(Cv),p,l.caret]});var r,i,u,a,c,s,l,f,d,m,g,p,h,v}function Tv(t,n){return tt(t,"tooltipWorker").map(function(e){return[Zh.config({lazySink:n.getSink,tooltipDom:{tag:"div",classes:["tox-tooltip-worker-container"]},tooltipComponents:[],anchor:function(t){return{type:"submenu",item:t,overrides:{maxHeightFunction:Ic}}},mode:"follow-highlight",onShow:function(n,t){e(function(t){Zh.setComponents(n,[ku({element:At.fromDom(t)})])})}})]}).getOr([])}function Ev(t,n){var e=lp.translate(t),o=tv.DOM.encode(e);if(0<n.length){var r=new RegExp(n.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"),"gi");return o.replace(r,function(t){return'<span class="tox-autocompleter-highlight">'+t+"</span>"})}return o}function Dv(t){return{value:t}}function Bv(t){return eb.test(t)||ob.test(t)}function Mv(t){var n=t.toString(16);return(1===n.length?"0"+n:n).toUpperCase()}function Av(t){return Dv(Mv(t.red)+Mv(t.green)+Mv(t.blue))}function Fv(t,n,e,o){return{red:t,green:n,blue:e,alpha:o}}function Iv(t){var n=parseInt(t,10);return n.toString()===t&&0<=n&&n<=255}function Rv(t){var n,e,o,r=(t.hue||0)%360,i=t.saturation/100,u=t.value/100,i=ib(0,rb(i,1)),u=ib(0,rb(u,1));if(0===i)return Fv(n=e=o=ub(255*u),e,o,1);var a=r/60,c=u*i,s=c*(1-Math.abs(a%2-1)),l=u-c;switch(Math.floor(a)){case 0:n=c,e=s,o=0;break;case 1:n=s,e=c,o=0;break;case 2:n=0,e=c,o=s;break;case 3:n=0,e=s,o=c;break;case 4:n=s,e=0,o=c;break;case 5:n=c,e=0,o=s;break;default:n=e=o=0}return Fv(n=ub(255*(n+l)),e=ub(255*(e+l)),o=ub(255*(o+l)),1)}function Vv(t){var n,e,o=(n={value:t.value.replace(eb,function(t,n,e,o){return n+n+e+e+o+o})},null===(e=ob.exec(n.value))?["FFFFFF","FF","FF","FF"]:e);return Fv(parseInt(o[1],16),parseInt(o[2],16),parseInt(o[3],16),1)}function Pv(t,n,e,o){return Fv(parseInt(t,10),parseInt(n,10),parseInt(e,10),parseFloat(o))}function Hv(t){if("transparent"===t)return vt.some(Fv(0,0,0,0));var n=ab.exec(t);if(null!==n)return vt.some(Pv(n[1],n[2],n[3],"1"));var e=cb.exec(t);return null!==e?vt.some(Pv(e[1],e[2],e[3],e[4])):vt.none()}function zv(t){return"rgba("+t.red+","+t.green+","+t.blue+","+t.alpha+")"}function Nv(t,n){return t.fire("ResizeContent",n)}function Lv(t,n,e){return{hue:t,saturation:n,value:e}}function Wv(t){var n,e,o=0,r=t.red/255,i=t.green/255,u=t.blue/255,a=Math.min(r,Math.min(i,u)),c=Math.max(r,Math.max(i,u));return a===c?Lv(0,0,100*(o=a)):(e=60*((r===a?3:u===a?1:5)-(r===a?i-u:u===a?r-i:u-r)/(c-a)),n=(c-a)/c,o=c,Lv(Math.round(e),Math.round(100*n),Math.round(100*o)))}function Uv(t){return Av(Rv(t))}function jv(o){return(Bv(n=o)?vt.some({value:(Dt(t=n,"#")?t.substring("#".length):t).toUpperCase()}):vt.none()).orThunk(function(){return Hv(o).map(Av)}).getOrThunk(function(){var t=document.createElement("canvas");t.height=1,t.width=1;var n=t.getContext("2d");n.clearRect(0,0,t.width,t.height),n.fillStyle="#FFFFFF",n.fillStyle=o,n.fillRect(0,0,1,1);var e=n.getImageData(0,0,1,1).data;return Av(Fv(e[0],e[1],e[2],e[3]))});var t,n}(vh=hh=hh||{}).default="wrap",vh.floating="floating",vh.sliding="sliding",vh.scrolling="scrolling",(yh=bh=bh||{}).auto="auto",yh.top="top",yh.bottom="bottom";function Gv(t){return dd.config({disabled:t,disableClass:"tox-tbtn--disabled"})}var Xv,Yv="silver.readonly",qv=Jo([mo("readonly",nr)]),Kv=function(t){return dd.config({disabled:t})},Jv=function(t){return dd.config({disabled:t,disableClass:"tox-tbtn--disabled",useNative:!1})},$v=((Xv={})[Fi()]=["disabling","alloy.base.behaviour","toggling","item-events"],Xv),Qv=et,Zv=tinymce.util.Tools.resolve("tinymce.Env"),tb=function(t,a){return M(t,function(t){switch(t.type){case"cardcontainer":return r=tb((o=t).items,a),i="vertical"===o.direction?"tox-collection__item-container--column":Mh,u="left"===o.align?"tox-collection__item-container--align-left":"tox-collection__item-container--align-right",{dom:{tag:"div",classes:[Bh,i,u,function(){switch(o.valign){case"top":return"tox-collection__item-container--valign-top";case"middle":return"tox-collection__item-container--valign-middle";case"bottom":return"tox-collection__item-container--valign-bottom"}}()]},components:r};case"cardimage":return e=t.src,{dom:{tag:"img",classes:t.classes,attributes:{src:e,alt:t.alt.getOr("")}}};case"cardtext":var n=t.name.exists(function(t){return wt(a.cardText.highlightOn,t)})?vt.from(a.cardText.matchText).getOr(""):"";return wv(Ev(t.text,n),t.classes)}var e,o,r,i,u})},nb=il(Xg(),Yg()),eb=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,ob=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,rb=Math.min,ib=Math.max,ub=Math.round,ab=/^rgb\((\d+),\s*(\d+),\s*(\d+)\)/,cb=/^rgba\((\d+),\s*(\d+),\s*(\d+),\s*(\d?(?:\.\d+)?)\)/,sb=Fv(255,0,0,1),lb=tinymce.util.Tools.resolve("tinymce.util.LocalStorage"),fb="tinymce-custom-colors";function db(t){return!1!==t.getParam("custom_colors")}function mb(t){var n=t.getParam("color_map");return void 0!==n?function(t){for(var n=[],e=0;e<t.length;e+=2)n.push({text:t[e+1],value:"#"+jv(t[e]).value,type:"choiceitem"});return n}(n):Eb}function gb(t){Db.add(t)}function pb(t){var n,e=(n=mb(t).length,Math.max(5,Math.ceil(Math.sqrt(n))));return t.getParam("color_cols",e,"number")}function hb(t){var n="choiceitem",e={type:n,text:"Remove color",icon:"color-swatch-remove-color",value:"remove"};return t?[e,{type:n,text:"Custom color",icon:"color-picker",value:"custom"}]:[e]}function vb(n,e,t,o){"custom"===t?Bb(n)(function(t){t.each(function(t){gb(t),n.execCommand("mceApplyTextcolor",e,t),o(t)})},"#000000"):"remove"===t?(o(""),n.execCommand("mceRemoveTextcolor",e)):(o(t),n.execCommand("mceApplyTextcolor",e,t))}function bb(t,n){return t.concat(M(Db.state(),function(t){return{type:Tb,text:t,value:t}}).concat(hb(n)))}function yb(n,e){return function(t){t(bb(n,e))}}function xb(t,n,e){t.setIconFill("forecolor"===n?"tox-icon-text-color__color":"tox-icon-highlight-bg-color__color",e)}function wb(i,e,u,t,o){i.ui.registry.addSplitButton(e,{tooltip:t,presets:"color",icon:"forecolor"===e?"text-color":"highlight-bg-color",select:function(e){var o,r;return vt.from((o=u,i.dom.getParents(i.selection.getStart(),function(t){var n;(n=t.style["forecolor"===o?"color":"background-color"])&&(r=r||n)}),r)).bind(function(t){return Hv(t).map(function(t){var n=Av(t).value;return ut(e.toLowerCase(),n)})}).getOr(!1)},columns:pb(i),fetch:yb(mb(i),db(i)),onAction:function(t){null!==o.get()&&vb(i,u,o.get(),st)},onItemAction:function(t,n){vb(i,u,n,function(t){o.set(t),i.fire("TextColorChange",{name:e,color:t})})},onSetup:function(n){function t(t){t.name===e&&xb(n,t.name,t.color)}return null!==o.get()&&xb(n,e,o.get()),i.on("TextColorChange",t),function(){i.off("TextColorChange",t)}}})}function Sb(n,t,e,o){n.ui.registry.addNestedMenuItem(t,{text:o,icon:"forecolor"===t?"text-color":"highlight-bg-color",getSubmenuItems:function(){return[{type:"fancymenuitem",fancytype:"colorswatch",onAction:function(t){vb(n,e,t.value,st)}}]}})}function Cb(t,n,e,o,r,i,u,a){return rh(t,nh(n),Mb(n,e,o,"color"!==r?"normal":"color",i,u,a),o,r)}function kb(t,n){var e=Jp(n);return 1===t?{mode:"menu",moveOnTab:!0}:"auto"===t?{mode:"grid",selector:"."+e.item,initSize:{numColumns:1,numRows:1}}:{mode:"matrix",rowSelector:"."+("color"===n?"tox-swatches__row":"tox-collection__group")}}var Ob,_b,Tb="choiceitem",Eb=[{type:Tb,text:"Light Green",value:"#BFEDD2"},{type:Tb,text:"Light Yellow",value:"#FBEEB8"},{type:Tb,text:"Light Red",value:"#F8CAC6"},{type:Tb,text:"Light Purple",value:"#ECCAFA"},{type:Tb,text:"Light Blue",value:"#C2E0F4"},{type:Tb,text:"Green",value:"#2DC26B"},{type:Tb,text:"Yellow",value:"#F1C40F"},{type:Tb,text:"Red",value:"#E03E2D"},{type:Tb,text:"Purple",value:"#B96AD9"},{type:Tb,text:"Blue",value:"#3598DB"},{type:Tb,text:"Dark Turquoise",value:"#169179"},{type:Tb,text:"Orange",value:"#E67E23"},{type:Tb,text:"Dark Red",value:"#BA372A"},{type:Tb,text:"Dark Purple",value:"#843FA1"},{type:Tb,text:"Dark Blue",value:"#236FA1"},{type:Tb,text:"Light Gray",value:"#ECF0F1"},{type:Tb,text:"Medium Gray",value:"#CED4D9"},{type:Tb,text:"Gray",value:"#95A5A6"},{type:Tb,text:"Dark Gray",value:"#7E8C8D"},{type:Tb,text:"Navy Blue",value:"#34495E"},{type:Tb,text:"Black",value:"#000000"},{type:Tb,text:"White",value:"#ffffff"}],Db=function(e){void 0===e&&(e=10);function o(t){i.splice(t,1)}var t,n=lb.getItem(fb),r=y(n)?JSON.parse(n):[],i=e-(t=r).length<0?t.slice(0,e):t;return{add:function(t){var n;(-1===(n=p(i,t))?vt.none():vt.some(n)).each(o),i.unshift(t),i.length>e&&i.pop(),lb.setItem(fb,JSON.stringify(i))},state:function(){return i.slice(0)}}}(10),Bb=function(r){return function(e,t){var o=!1;r.windowManager.open({title:"Color Picker",size:"normal",body:{type:"panel",items:[{type:"colorpicker",name:"colorpicker",label:"Color"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:{colorpicker:t},onAction:function(t,n){"hex-valid"===n.name&&(o=n.value)},onSubmit:function(t){var n=t.getData().colorpicker;o?(e(vt.from(n)),t.close()):r.windowManager.alert(r.translate(["Invalid hex color code: {0}",n]))},onClose:st,onCancel:function(){e(vt.none())}})}},Mb=function(e,o,r,i,u,a,c){return et(M(e,function(n){return"choiceitem"===n.type?uo("choicemenuitem",Lh,n).fold(eh,function(t){return vt.some(function(n,t,e,o,r,i,u,a){void 0===a&&(a=!0);var c=_v({presets:e,textContent:t?n.text:vt.none(),htmlContent:vt.none(),ariaLabel:n.text,iconContent:n.icon,shortcutContent:t?n.shortcut:vt.none(),checkMark:t?vt.some(kv(u.icons)):vt.none(),caret:vt.none(),value:n.value},u,a);return Xo(vv({data:bv(n),disabled:n.disabled,getApi:function(n){return{setActive:function(t){zg.set(n,t)},isActive:function(){return zg.isOn(n)},isDisabled:function(){return dd.isDisabled(n)},setDisabled:function(t){return dd.set(n,t)}}},onAction:function(t){return o(n.value)},onSetup:function(t){return t.setActive(r),st},triggersSubmenu:!1,itemBehaviours:[]},c,i,u),{toggling:{toggleClass:Oh,toggleOnExecute:!1,selected:n.active}})}(t,1===r,i,o,a(n.value),u,c,nh(e)))}):vt.none()}))},Ab=Fr("cell-over"),Fb=Fr("cell-execute"),Ib={inserttable:function(o){var t=Fr("size-label"),i=function(t){for(var n=[],e=0;e<10;e++){for(var o=[],r=0;r<10;r++)o.push(function(n,e,t){function o(t){return vr(t,Fb,{row:n,col:e})}function r(t,n){n.stop(),o(t)}var i;return _u({dom:{tag:"div",attributes:((i={role:"button"})["aria-labelledby"]=t,i)},behaviours:tc([fm("insert-table-picker-cell",[Cr(hi(),Vg.focus),Cr(Fi(),o),Cr(Ci(),r),Cr(Ri(),r)]),zg.config({toggleClass:"tox-insert-table-picker__selected",toggleOnExecute:!1}),Vg.config({onFocus:function(t){return vr(t,Ab,{row:n,col:e})}})])})}(e,r,t));n.push(o)}return n}(t),u=Pm({dom:{tag:"span",classes:["tox-insert-table-picker__label"],attributes:{id:t}},components:[oi("0x0")],behaviours:tc([Fg.config({})])});return{type:"widget",data:{value:Fr("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[nb.widget({dom:{tag:"div",classes:["tox-insert-table-picker"]},components:z(i,function(t){return M(t,Tu)}).concat(u.asSpec()),behaviours:tc([fm("insert-table-picker",[Tr(Ab,function(t,n,e){var o=e.event.row,r=e.event.col;!function(t,n,e){for(var o=0;o<10;o++)for(var r=0;r<10;r++)zg.set(t[o][r],o<=n&&r<=e)}(i,o,r),Fg.set(u.get(t),[oi(r+1+"x"+(o+1))])}),Tr(Fb,function(t,n,e){o.onAction({numRows:e.event.row+1,numColumns:e.event.col+1}),hr(t,Pi())})]),Mg.config({initSize:{numRows:10,numColumns:10},mode:"flatgrid",selector:'[role="button"]'})])})]}},colorswatch:function(n,t){var e,o,r,i=(o=t,r=(e=n).initData.allowCustomColors&&o.colorinput.hasCustomColors(),e.initData.colors.fold(function(){return bb(o.colorinput.getColors(),r)},function(t){return t.concat(hb(r))})),u=t.colorinput.getColorCols(),a=Cb(Fr("menu-value"),i,function(t){n.onAction({value:t})},u,"color",xh.CLOSE_ON_EXECUTE,O,t.shared.providers),c=lt(lt({},a),{markers:Jp("color"),movement:kb(u,"color")});return{type:"widget",data:{value:Fr("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[nb.widget(Qg.sketch(c))]}}},Rb=function(t){var n=t.text.fold(function(){return{}},function(t){return{innerHtml:t}});return{type:"separator",dom:lt({tag:"div",classes:[Sh,"tox-collection__group-heading"]},n),components:[]}},Vb=function(t,n,e,o){void 0===o&&(o=!0);var r=_v({presets:"normal",iconContent:t.icon,textContent:t.text,htmlContent:vt.none(),ariaLabel:t.text,caret:vt.none(),checkMark:vt.none(),shortcutContent:t.shortcut},e,o);return vv({data:bv(t),getApi:function(n){return{isDisabled:function(){return dd.isDisabled(n)},setDisabled:function(t){return dd.set(n,t)}}},disabled:t.disabled,onAction:t.onAction,onSetup:t.onSetup,triggersSubmenu:!1,itemBehaviours:[]},r,n,e)},Pb=function(t,n,e,o,r){void 0===o&&(o=!0);var i=(r=void 0!==r&&r)?yv("chevron-down",e.icons,[Eh]):yv("chevron-right",e.icons,[Eh]),u=_v({presets:"normal",iconContent:t.icon,textContent:t.text,htmlContent:vt.none(),ariaLabel:t.text,caret:vt.some(i),checkMark:vt.none(),shortcutContent:t.shortcut},e,o);return vv({data:bv(t),getApi:function(n){return{isDisabled:function(){return dd.isDisabled(n)},setDisabled:function(t){return dd.set(n,t)}}},disabled:t.disabled,onAction:st,onSetup:t.onSetup,triggersSubmenu:!0,itemBehaviours:[]},u,n,e)},Hb=function(t,n,e,o){void 0===o&&(o=!0);var r=_v({iconContent:t.icon,textContent:t.text,htmlContent:vt.none(),ariaLabel:t.text,checkMark:vt.some(kv(e.icons)),caret:vt.none(),shortcutContent:t.shortcut,presets:"normal",meta:t.meta},e,o);return Xo(vv({data:bv(t),disabled:t.disabled,getApi:function(n){return{setActive:function(t){zg.set(n,t)},isActive:function(){return zg.isOn(n)},isDisabled:function(){return dd.isDisabled(n)},setDisabled:function(t){return dd.set(n,t)}}},onAction:t.onAction,onSetup:t.onSetup,triggersSubmenu:!1,itemBehaviours:[]},r,n,e),{toggling:{toggleClass:Oh,toggleOnExecute:!1,selected:t.active}})},zb=function(n,e){return tt(Ib,n.fancytype).map(function(t){return t(n,e)})};function Nb(t,u,a,n,c,s,l){var e=1===n,o=!e||nh(t);return et(M(t,function(t){switch(t.type){case"separator":return uo("Autocompleter.Separator",Fp,t).fold(eh,function(t){return vt.some(Rb(t))});case"cardmenuitem":return uo("cardmenuitem",Nh,t).fold(eh,function(n){return vt.some((t=lt(lt({},n),{onAction:function(t){n.onAction(t),a(n.value,n.meta)}}),e=c,o=s,r={itemBehaviours:Tv(n.meta,s),cardText:{matchText:u,highlightOn:l}},i={dom:Ov(t.label),optComponents:[vt.some({dom:{tag:"div",classes:[Bh,Mh]},components:tb(t.items,r)})]},vv({data:bv(lt({text:vt.none()},t)),disabled:t.disabled,getApi:function(e){return{isDisabled:function(){return dd.isDisabled(e)},setDisabled:function(n){dd.set(e,n),St(ps(e.element,"*"),function(t){e.getSystem().getByDom(t).each(function(t){t.hasConfigured(dd)&&dd.set(t,n)})})}}},onAction:t.onAction,onSetup:t.onSetup,triggersSubmenu:!1,itemBehaviours:vt.from(r.itemBehaviours).getOr([])},i,e,o.providers)));var t,e,o,r,i});default:return uo("Autocompleter.Item",Ip,t).fold(eh,function(t){return vt.some(function(n,e,t,o,r,i,u,a){void 0===a&&(a=!0);var c=_v({presets:o,textContent:vt.none(),htmlContent:t?n.text.map(function(t){return Ev(t,e)}):vt.none(),ariaLabel:n.text,iconContent:n.icon,shortcutContent:vt.none(),checkMark:vt.none(),caret:vt.none(),value:n.value},u.providers,a,n.icon);return vv({data:bv(n),disabled:n.disabled,getApi:rt({}),onAction:function(t){return r(n.value,n.meta)},onSetup:rt(st),triggersSubmenu:!1,itemBehaviours:Tv(n.meta,u)},c,i,u.providers)}(t,u,e,"normal",a,c,s,o))})}}))}function Lb(t,n,e,o,r){var i=nh(n),u=et(M(n,function(t){function n(t){return function(t,n,e,o,r){function i(t){return r?lt(lt({},t),{shortcut:vt.none(),icon:t.text.isSome()?vt.none():t.icon}):t}var u=e.shared.providers;switch(t.type){case"menuitem":return uo("menuitem",jh,t).fold(eh,function(t){return vt.some(Vb(i(t),n,u,o))});case"nestedmenuitem":return uo("nestedmenuitem",Gh,t).fold(eh,function(t){return vt.some(Pb(i(t),n,u,o,r))});case"togglemenuitem":return uo("togglemenuitem",Xh,t).fold(eh,function(t){return vt.some(Hb(i(t),n,u,o))});case"separator":return uo("separatormenuitem",Fp,t).fold(eh,function(t){return vt.some(Rb(t))});case"fancymenuitem":return uo("fancymenuitem",Uh,t).fold(eh,function(t){return zb(i(t),e)});default:return console.error("Unknown item in general menu",t),vt.none()}}(t,e,o,r?!Tt(t,"text"):i,r)}return"nestedmenuitem"===t.type&&t.getSubmenuItems().length<=0?n(lt(lt({},t),{disabled:!0})):n(t)}));return(r?oh:rh)(t,i,u,1,"normal")}function Wb(t){return op.singleData(t.value,t)}function Ub(t,n,e){return Iu(t,n,e).isSome()}function jb(e,o){var r=null;return{cancel:function(){null!==r&&(clearTimeout(r),r=null)},schedule:function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];r=setTimeout(function(){e.apply(null,t),r=null},o)}}}function Gb(t){var n=t.raw;return void 0===n.touches||1!==n.touches.length?vt.none():vt.some(n.touches[0])}function Xb(){return se().browser.isFirefox()}function Yb(n,t){var e,o,r,i,u,a,c,s,l,f=lt({stopBackspace:!0},t),d=(u=f,a=dc(),c=Vo(!1),s=jb(function(t){u.triggerEvent(Vi(),t),c.set(!0)},400),l=sr([{key:ci(),value:function(e){return Gb(e).each(function(t){s.cancel();var n={x:t.clientX,y:t.clientY,target:e.target};s.schedule(e),c.set(!1),a.set(n)}),vt.none()}},{key:si(),value:function(t){return s.cancel(),Gb(t).each(function(i){a.on(function(t){var n=i,e=t,o=Math.abs(n.clientX-e.x),r=Math.abs(n.clientY-e.y);(5<o||5<r)&&a.clear()})}),vt.none()}},{key:li(),value:function(n){return s.cancel(),a.get().filter(function(t){return Lt(t.target,n.target)}).map(function(t){return c.get()?(n.prevent(),!1):u.triggerEvent(Ri(),n)})}}]),{fireIfReady:function(n,t){return tt(l,t).bind(function(t){return t(n)})}}),m=M(["touchstart","touchmove","touchend","touchcancel","gesturestart","mousedown","mouseup","mouseover","mousemove","mouseout","click"].concat(["selectstart","input","contextmenu","change","transitionend","transitioncancel","drag","dragstart","dragend","dragenter","dragleave","dragover","drop","keyup"]),function(t){return mc(n,t,function(n){d.fireIfReady(n,t).each(function(t){t&&n.kill()}),f.triggerEvent(t,n)&&n.kill()})}),g=dc(),p=mc(n,"paste",function(n){d.fireIfReady(n,"paste").each(function(t){t&&n.kill()}),f.triggerEvent("paste",n)&&n.kill(),g.set(setTimeout(function(){f.triggerEvent(Mi(),n)},0))}),h=mc(n,"keydown",function(t){var n;f.triggerEvent("keydown",t)?t.kill():!f.stopBackspace||(n=t).raw.which!==pd[0]||wt(["input","textarea"],Ft(n.target))||Ub(n.target,'[contenteditable="true"]')||t.prevent()}),v=(e=n,o=function(t){f.triggerEvent("focusin",t)&&t.kill()},Xb()?gc(e,"focus",o):mc(e,"focusin",o)),b=dc(),y=(r=n,i=function(t){f.triggerEvent("focusout",t)&&t.kill(),b.set(setTimeout(function(){f.triggerEvent(Bi(),t)},0))},Xb()?gc(r,"blur",i):mc(r,"focusout",i));return{unbind:function(){St(m,function(t){t.unbind()}),h.unbind(),v.unbind(),y.unbind(),p.unbind(),g.on(clearTimeout),b.on(clearTimeout)}}}function qb(t,n){return Vo(tt(t,"target").getOr(n))}function Kb(t,o,n,e,r,i){var u,a,c=t(o,e),s=(u=Vo(!1),a=Vo(!1),{stop:function(){u.set(!0)},cut:function(){a.set(!0)},isStopped:u.get,isCut:a.get,event:n,setSource:r.set,getSource:r.get});return c.fold(function(){return i.logEventNoHandlers(o,e),oy.complete()},function(n){var e=n.descHandler;return Lr(e)(s),s.isStopped()?(i.logEventStopped(o,n.element,e.purpose),oy.stopped()):s.isCut()?(i.logEventCut(o,n.element,e.purpose),oy.complete()):Yt(n.element).fold(function(){return i.logNoParent(o,n.element,e.purpose),oy.complete()},function(t){return i.logEventResponse(o,n.element,e.purpose),oy.resume(t)})})}function Jb(){function r(t){Ir(t.element).each(function(t){delete a[t],i.unregisterId(t)})}var u,i=(u={},{registerId:function(r,i,t){J(t,function(t,n){var e,o=void 0!==u[n]?u[n]:{};o[i]={cHandler:S.apply(void 0,[(e=t).handler].concat(r)),purpose:e.purpose},u[n]=o})},unregisterId:function(e){J(u,function(t,n){Tt(t,e)&&delete t[e]})},filterByType:function(t){return tt(u,t).map(function(t){return $(t,function(t,n){return{id:n,descHandler:t}})}).getOr([])},find:function(t,n,e){return tt(u,n).bind(function(o){return dr(e,function(t){return n=o,Ir(e=t).bind(function(t){return tt(n,t)}).map(function(t){return{element:e,descHandler:t}});var n,e},t)})}}),a={};return{find:function(t,n,e){return i.find(t,n,e)},filter:function(t){return i.filterByType(t)},register:function(t){var e,o=Ir((e=t).element).getOrThunk(function(){return t=e.element,n=Fr(fu+"uid-"),mu(t,n),n;var t,n});nt(a,o)&&function(t){var n=a[o];if(n!==t)throw new Error('The tagId "'+o+'" is already used by: '+Ar(n.element)+"\nCannot use it for: "+Ar(t.element)+"\nThe conflicting element is"+(he(n.element)?" ":" not ")+"already in the DOM");r(t)}(t),i.registerId([t],o,t.events),a[o]=t},unregister:r,getById:function(t){return tt(a,t)}}}function $b(e){function o(n){return Yt(e.element).fold(_,function(t){return Lt(n,t)})}function s(t,n){return i.find(o,t,n)}function r(n){var t=i.filter(Ai());St(t,function(t){Lr(t.descHandler)(n)})}var i=Jb(),t=Yb(e.element,{triggerEvent:function(n,e){return Nu(n,e.target,function(t){return iy(s,n,e,e.target,t)})}}),u={debugInfo:rt("real"),triggerEvent:function(n,e,o){Nu(n,e,function(t){return iy(s,n,o,e,t)})},triggerFocus:function(a,c){Ir(a).fold(function(){Sa(a)},function(t){Nu(Di(),a,function(t){var n,e,o=s,r=Di(),i=t,u=qb(n={originator:c,kill:st,prevent:st,target:a},e=a);return Kb(o,r,n,e,u,i),!1})})},triggerEscape:function(t,n){u.triggerEvent("keydown",t.element,n.event)},getByUid:function(t){return g(t)},getByDom:function(t){return p(t)},build:_u,addToGui:function(t){c(t)},removeFromGui:function(t){l(t)},addToWorld:function(t){n(t)},removeFromWorld:function(t){a(t)},broadcast:function(t){f(t)},broadcastOn:function(t,n){d(t,n)},broadcastEvent:function(t,n){m(t,n)},isConnected:_},n=function(t){t.connect(u),Xn(t.element)||(i.register(t),St(t.components(),n),u.triggerEvent(zi(),t.element,{target:t.element}))},a=function(t){Xn(t.element)||(St(t.components(),a),i.unregister(t)),t.disconnect()},c=function(t){Is(e,t)},l=function(t){Vs(t)},f=function(t){r({universal:!0,data:t})},d=function(t,n){r({universal:!1,channels:t,data:n})},m=function(t,n){var e,o,r=i.filter(t);return o={stop:function(){e.set(!0)},cut:st,isStopped:(e=Vo(!1)).get,isCut:O,event:n,setSource:k("Cannot set source of a broadcasted event"),getSource:k("Cannot get source of a broadcasted event")},St(r,function(t){Lr(t.descHandler)(o)}),o.isStopped()},g=function(t){return i.getById(t).fold(function(){return Re.error(new Error('Could not find component with uid: "'+t+'" in system.'))},Re.value)},p=function(t){var n=Ir(t).getOr("not found");return g(n)};return n(e),{root:e,element:e.element,destroy:function(){t.unbind(),Te(e.element)},add:c,remove:l,getByUid:g,getByDom:p,addToWorld:n,removeFromWorld:a,broadcast:f,broadcastOn:d,broadcastEvent:m}}function Qb(t,n,e,o){var r=my(t,n,e,o);return sy.sketch(r)}function Zb(t,n){return sy.parts.label({dom:{tag:"label",classes:["tox-label"],innerHtml:n.translate(t)}})}function ty(t){return tc([Vg.config({onFocus:t.selectOnFocus?function(t){var n=t.element,e=$r(n);n.dom.setSelectionRange(0,e.length)}:st})])}function ny(t){return{tag:t.tag,attributes:lt({type:"text"},t.inputAttributes),styles:t.inputStyles,classes:t.inputClasses}}(_b=Ob={})[_b.ContentFocus=0]="ContentFocus",_b[_b.UiFocus=1]="UiFocus";function ey(f,c){function e(){return r.get().isSome()}function s(){e()&&rp.hide(d)}var o,t,r=dc(),l=Vo(!1),d=_u(rp.sketch({dom:{tag:"div",classes:["tox-autocompleter"]},components:[],fireDismissalEventInstead:{},inlineBehaviours:tc([fm("dismissAutocompleter",[Cr(Xi(),function(){return m()})])]),lazySink:c.getSink})),m=function(){var t;e()&&(t=r.get().map(function(t){return t.element}),Dp(t.getOr(At.fromDom(f.selection.getNode()))).each(Fn),s(),r.clear(),l.set(!1))},u=Rt(function(){return e=dt(f.ui.registry.getAll().popups,function(t){return uo("Autocompleter",Rp,t).fold(function(t){throw new Error(ir(t))},h)}),t=$(e,function(t){return t.ch}),n={},St(t,function(t){n[t]={}}),o=kt(n),r=Z(e),{dataset:e,triggerChars:o,lookupByChar:function(n){return F(r,function(t){return t.ch===n})}};var t,n,e,o,r}),g=function(t){var n=t;r.get().map(function(t){return wp(f.dom,f.selection.getRng(),t.triggerChar).bind(function(t){return Op(f,u,t,n)})}).getOrThunk(function(){return n=f,t=(e=u)(),o=n.selection.getRng(),r=n.dom,i=o,K(t.triggerChars,function(t){return wp(r,i,t)}).bind(function(t){return Op(n,e,t)});var n,e,t,o,r,i}).fold(m,function(a){var t,n=a.context;e()||(t=vp(f,n.range),r.set({triggerChar:n.triggerChar,element:t,matchLength:n.text.length}),l.set(!1)),a.lookupData.then(function(u){r.get().map(function(t){var n,e,o,r,i=a.context;t.triggerChar===i.triggerChar&&(e=i.triggerChar,r=K(o=u,function(t){return vt.from(t.columns)}).getOr(1),0<(n=z(o,function(i){return Nb(i.items,i.matchText,function(o,r){var t=f.selection.getRng();wp(f.dom,t,e).fold(function(){return console.error("Lost context. Cursor probably moved")},function(t){var n=t.range,e={hide:function(){m()},reload:function(t){s(),g(t)}};l.set(!0),i.onAction(e,n,o,r),l.set(!1)})},r,xh.BUBBLE_TO_SANDBOX,c,i.highlightOn)})).length?function(t,n,e,o){t.matchLength=n.text.length;var r,i,u,a,c,s,l=K(e,function(t){return vt.from(t.columns)}).getOr(1);rp.showAt(d,Qg.sketch((r=rh("autocompleter-value",!0,o,l,"normal"),i=l,a=((u=Ob.ContentFocus)===Ob.ContentFocus?Ll:Nl)(),c=kb(i,"normal"),s=Jp("normal"),{dom:r.dom,components:r.components,items:r.items,value:r.value,markers:{selectedItem:s.selectedItem,item:s.item},movement:c,fakeFocus:u===Ob.ContentFocus,focusManager:a,menuBehaviours:Yh("auto"!==i?[]:[eu(function(o,t){ih(o,4,s.item).each(function(t){var n=t.numColumns,e=t.numRows;Mg.setGridSize(o,e,n)})})])})),{anchor:{type:"node",root:At.fromDom(f.getBody()),node:vt.from(t.element)}}),rp.getContent(d).each(gd.highlightFirst)}(t,i,u,n):(10<=i.text.length-t.matchLength?m:s)())})})})},n={onKeypress:pp(function(t){27!==t.which&&g()},50),cancelIfNecessary:m,isMenuOpen:function(){return rp.isOpen(d)},isActive:e,isProcessingAction:l.get,getView:function(){return rp.getContent(d)}};function i(t,n){vr(t,yi(),{raw:n})}!1===f.hasPlugin("rtc")&&(o=n,(t=f).on("keypress compositionend",o.onKeypress.throttle),t.on("remove",o.onKeypress.cancel),t.on("keydown",function(n){function t(){return o.getView().bind(gd.getHighlighted)}8===n.which&&o.onKeypress.throttle(n),o.isActive()&&(27===n.which&&o.cancelIfNecessary(),o.isMenuOpen()?13===n.which?(t().each(br),n.preventDefault()):40===n.which?(t().fold(function(){o.getView().each(gd.highlightFirst)},function(t){i(t,n)}),n.preventDefault(),n.stopImmediatePropagation()):37!==n.which&&38!==n.which&&39!==n.which||t().each(function(t){i(t,n),n.preventDefault(),n.stopImmediatePropagation()}):13!==n.which&&38!==n.which&&40!==n.which||o.cancelIfNecessary())}),t.on("NodeChange",function(t){o.isActive()&&!o.isProcessingAction()&&Dp(At.fromDom(t.element)).isNone()&&o.cancelIfNecessary()}))}var oy=Po([{stopped:[]},{resume:["element"]},{complete:[]}]),ry=function(n,e,o,t,r,i){return Kb(n,e,o,t,r,i).fold(_,function(t){return ry(n,e,o,t,r,i)},O)},iy=function(t,n,e,o,r){var i=qb(e,o);return ry(t,n,e,o,i,r)},uy=wl({name:"Container",factory:function(t){var n=t.dom,e=n.attributes,o=s(n,["attributes"]);return{uid:t.uid,dom:lt({tag:"div",attributes:lt({role:"presentation"},e)},o),components:t.components,behaviours:Qs(t.containerBehaviours),events:t.events,domModification:t.domModification,eventOrder:t.eventOrder}},configFields:[To("components",[]),$s("containerBehaviours",[]),To("events",{}),To("domModification",{}),To("eventOrder",{})]}),ay=rt([To("prefix","form-field"),$s("fieldBehaviours",[ud,Tf])]),cy=rt([Jf({schema:[fo("dom")],name:"label"}),Jf({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:t.text}}}},schema:[fo("text")],name:"aria-descriptor"}),qf({factory:{sketch:function(t){var e,o,n=(e=["factory"],o={},J(t,function(t,n){wt(e,n)||(o[n]=t)}),o);return t.factory.sketch(n)}},schema:[fo("factory")],name:"field"})]),sy=Sl({name:"FormField",configFields:ay(),partFields:cy(),factory:function(r,t,n,e){var o=Zs(r.fieldBehaviours,[ud.config({find:function(t){return fl(t,r,"field")}}),Tf.config({store:{mode:"manual",getValue:function(t){return ud.getCurrent(t).bind(Tf.getValue)},setValue:function(t,n){ud.getCurrent(t).each(function(t){Tf.setValue(t,n)})}}})]),i=nu([eu(function(t,n){var o=ml(t,r,["label","field","aria-descriptor"]);o.field().each(function(e){var n=Fr(r.prefix);o.label().each(function(t){on(t.element,"for",n),on(e.element,"id",n)}),o["aria-descriptor"]().each(function(t){var n=Fr(r.prefix);on(t.element,"id",n),on(e.element,"aria-describedby",n)})})})]);return{uid:r.uid,dom:r.dom,components:t,behaviours:o,events:i,apis:{getField:function(t){return fl(t,r,"field")},getLabel:function(t){return fl(t,r,"label")}}}},apis:{getField:function(t,n){return t.getField(n)},getLabel:function(t,n){return t.getLabel(n)}}}),ly=Object.freeze({__proto__:null,exhibit:function(t,n){return Nr({attributes:sr([{key:n.tabAttr,value:"true"}])})}}),fy=ya({fields:[To("tabAttr","data-alloy-tabstop")],name:"tabstopping",active:ly}),dy=tinymce.util.Tools.resolve("tinymce.html.Entities"),my=function(t,n,e,o){return{dom:gy(e),components:t.toArray().concat([n]),fieldBehaviours:tc(o)}},gy=function(t){return{tag:"div",classes:["tox-form__group"].concat(t)}},py=Fr("form-component-change"),hy=Fr("form-close"),vy=Fr("form-cancel"),by=Fr("form-action"),yy=Fr("form-submit"),xy=Fr("form-block"),wy=Fr("form-unblock"),Sy=Fr("form-tabchange"),Cy=Fr("form-resize"),ky=rt([xo("data"),To("inputAttributes",{}),To("inputStyles",{}),To("tag","input"),To("inputClasses",[]),Ku("onSetValue"),To("styles",{}),To("eventOrder",{}),$s("inputBehaviours",[Tf,Vg]),To("selectOnFocus",!0)]),Oy=wl({name:"Input",configFields:ky(),factory:function(t,n){return{uid:t.uid,dom:ny(t),components:[],behaviours:lt(lt({},ty(e=t)),Zs(e.inputBehaviours,[Tf.config({store:lt(lt({mode:"manual"},e.data.map(function(t){return{initialValue:t}}).getOr({})),{getValue:function(t){return $r(t.element)},setValue:function(t,n){$r(t.element)!==n&&Qr(t.element,n)}}),onSetValue:e.onSetValue})])),eventOrder:t.eventOrder};var e}}),_y={},Ty={exports:_y};function Ey(t){setTimeout(function(){throw t},0)}function Dy(t){var n=Ft(t);return wt(Wy,n)}function By(t,n){Yr(n.getRoot(t).getOr(t.element),n.invalidClass),n.notify.each(function(n){Dy(t.element)&&on(t.element,"aria-invalid",!1),n.getContainer(t).each(function(t){Mr(t,n.validHtml)}),n.onValid(t)})}function My(n,t,e,o){Xr(t.getRoot(n).getOr(n.element),t.invalidClass),t.notify.each(function(t){Dy(n.element)&&on(n.element,"aria-invalid",!0),t.getContainer(n).each(function(t){Mr(t,o)}),t.onInvalid(n,o)})}function Ay(n,t,e){return t.validator.fold(function(){return Ly(Re.value(!0))},function(t){return t.validate(n)})}function Fy(n,e,t){return e.notify.each(function(t){t.onValidate(n)}),Ay(n,e).map(function(t){return n.getSystem().isConnected()?t.fold(function(t){return My(n,e,0,t),Re.error(t)},function(t){return By(n,e),Re.value(t)}):Re.error("No longer in system")})}!function(){var t=this,n=function(){var t,n,e,o={exports:{}};function r(){}function i(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],f(t,this)}function u(e,o){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,i._immediateFn(function(){var t,n=1===e._state?o.onFulfilled:o.onRejected;if(null!==n){try{t=n(e._value)}catch(t){return void c(o.promise,t)}a(o.promise,t)}else(1===e._state?a:c)(o.promise,e._value)})):e._deferreds.push(o)}function a(n,t){try{if(t===n)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var e=t.then;if(t instanceof i)return n._state=3,n._value=t,void s(n);if("function"==typeof e)return void f((o=e,r=t,function(){o.apply(r,arguments)}),n)}n._state=1,n._value=t,s(n)}catch(t){c(n,t)}var o,r}function c(t,n){t._state=2,t._value=n,s(t)}function s(t){2===t._state&&0===t._deferreds.length&&i._immediateFn(function(){t._handled||i._unhandledRejectionFn(t._value)});for(var n=0,e=t._deferreds.length;n<e;n++)u(t,t._deferreds[n]);t._deferreds=null}function l(t,n,e){this.onFulfilled="function"==typeof t?t:null,this.onRejected="function"==typeof n?n:null,this.promise=e}function f(t,n){var e=!1;try{t(function(t){e||(e=!0,a(n,t))},function(t){e||(e=!0,c(n,t))})}catch(t){if(e)return;e=!0,c(n,t)}}t=o,n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},e=setTimeout,i.prototype.catch=function(t){return this.then(null,t)},i.prototype.then=function(t,n){var e=new this.constructor(r);return u(this,new l(t,n,e)),e},i.all=function(t){var a=Array.prototype.slice.call(t);return new i(function(r,i){if(0===a.length)return r([]);for(var u=a.length,t=0;t<a.length;t++)!function n(e,t){try{if(t&&("object"==typeof t||"function"==typeof t)){var o=t.then;if("function"==typeof o)return o.call(t,function(t){n(e,t)},i),0}a[e]=t,0==--u&&r(a)}catch(t){i(t)}}(t,a[t])})},i.resolve=function(n){return n&&"object"==typeof n&&n.constructor===i?n:new i(function(t){t(n)})},i.reject=function(e){return new i(function(t,n){n(e)})},i.race=function(r){return new i(function(t,n){for(var e=0,o=r.length;e<o;e++)r[e].then(t,n)})},i._immediateFn="function"==typeof setImmediate?function(t){setImmediate(t)}:function(t){e(t,0)},i._unhandledRejectionFn=function(t){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",t)},i._setImmediateFn=function(t){i._immediateFn=t},i._setUnhandledRejectionFn=function(t){i._unhandledRejectionFn=t},t.exports?t.exports=i:n.Promise||(n.Promise=i);var d=o.exports;return{boltExport:("undefined"!=typeof window?window:Function("return this;")()).Promise||d}};"object"==typeof _y&&void 0!==Ty?Ty.exports=n():(t="undefined"!=typeof globalThis?globalThis:t||self).EphoxContactWrapper=n()}();var Iy,Ry,Vy=Ty.exports.boltExport,Py=function(t){function o(t){r()?i(t):n.push(t)}var e=vt.none(),n=[],r=function(){return e.isSome()},i=function(n){e.each(function(t){setTimeout(function(){n(t)},0)})};return t(function(t){r()||(e=vt.some(t),St(n,i),n=[])}),{get:o,map:function(e){return Py(function(n){o(function(t){n(e(t))})})},isReady:r}},Hy={nu:Py,pure:function(n){return Py(function(t){t(n)})}},zy=function(e){function t(t){e().then(t,Ey)}return{map:function(t){return zy(function(){return e().then(t)})},bind:function(n){return zy(function(){return e().then(function(t){return n(t).toPromise()})})},anonBind:function(t){return zy(function(){return e().then(function(){return t.toPromise()})})},toLazy:function(){return Hy.nu(t)},toCached:function(){var t=null;return zy(function(){return t=null===t?e():t})},toPromise:e,get:t}},Ny=function(t){return zy(function(){return new Vy(t)})},Ly=function(t){return zy(function(){return Vy.resolve(t)})},Wy=["input","textarea"],Uy=Object.freeze({__proto__:null,markValid:By,markInvalid:My,query:Ay,run:Fy,isInvalid:function(t,n){return qr(n.getRoot(t).getOr(t.element),n.invalidClass)}}),jy=Object.freeze({__proto__:null,events:function(n,t){return n.validator.map(function(t){return nu([Cr(t.onEvent,function(t){Fy(t,n).get(h)})].concat(t.validateOnLoad?[eu(function(t){Fy(t,n).get(st)})]:[]))}).getOr({})}}),Gy=ya({fields:[fo("invalidClass"),To("getRoot",vt.none),_o("notify",[To("aria","alert"),To("getContainer",vt.none),To("validHtml",""),Ku("onValid"),Ku("onInvalid"),Ku("onValidate")]),_o("validator",[fo("validate"),To("onEvent","input"),To("validateOnLoad",!0)])],name:"invalidating",active:jy,apis:Uy,extra:{validation:function(e){return function(t){var n=Tf.getValue(t);return Ly(e(n))}}}}),Xy=Object.freeze({__proto__:null,getCoupled:function(t,n,e,o){return e.getOrCreate(t,n,o)}}),Yy=ya({fields:[mo("others",io(Re.value,Qo()))],name:"coupling",apis:Xy,state:Object.freeze({__proto__:null,init:function(){var i={},t=rt({});return xu({readState:t,getOrCreate:function(e,o,r){var t=kt(o.others);if(t)return tt(i,r).getOrThunk(function(){var t=tt(o.others,r).getOrDie("No information found for coupled component: "+r)(e),n=e.getSystem().build(t);return i[r]=n});throw new Error("Cannot find coupled component: "+r+". Known coupled components: "+JSON.stringify(t,null,2))}})}})}),qy=rt("sink"),Ky=rt(Jf({name:qy(),overrides:rt({dom:{tag:"div"},behaviours:tc([sf.config({useFixed:_})]),events:nu([Er(yi()),Er(di()),Er(Ci())])})}));function Jy(t,n){var e=t.getHotspot(n).getOr(n),o=t.getAnchorOverrides();return t.layouts.fold(function(){return{type:"hotspot",hotspot:e,overrides:o}},function(t){return{type:"hotspot",hotspot:e,overrides:o,layouts:t}})}function $y(t,n,e,o,r,i,u){var a,c=Jy(t,e),s=e,l=o,f=r,d=u,m=n,g=(0,(a=t).fetch)(s).map(m),p=sw(s,a);return g.map(function(t){return t.bind(function(t){return vt.from(op.sketch(lt(lt({},f.menu()),{uid:gu(""),data:t,highlightImmediately:d===Iy.HighlightFirst,onOpenMenu:function(t,n){var e=p().getOrDie();sf.position(e,n,{anchor:c}),hf.decloak(l)},onOpenSubmenu:function(t,n,e){var o=p().getOrDie();sf.position(o,e,{anchor:{type:"submenu",item:n}}),hf.decloak(l)},onRepositionMenu:function(t,n,e){var o=p().getOrDie();sf.position(o,n,{anchor:c}),St(e,function(t){sf.position(o,t.triggeredMenu,{anchor:{type:"submenu",item:t.triggeringItem}})})},onEscape:function(){return Vg.focus(s),hf.close(l),vt.some(!0)}})))})}).map(function(t){return t.fold(function(){hf.isOpen(o)&&hf.close(o)},function(t){hf.cloak(o),hf.open(o,t),i(o)}),o})}function Qy(t,n,e,o,r,i){var u=Yy.getCoupled(e,"sandbox");return(hf.isOpen(u)?function(t,n,e,o,r,i,u){return hf.close(o),Ly(o)}:$y)(t,n,e,u,o,r,i)}function Zy(t){hf.getState(t).each(function(t){op.repositionMenus(t)})}function tx(s,l,f){var d=Ru(),t=sw(l,s);return{dom:{tag:"div",classes:s.sandboxClasses,attributes:{id:d.id,role:"listbox"}},behaviours:Df(s.sandboxBehaviours,[Tf.config({store:{mode:"memory",initialValue:l}}),hf.config({onOpen:function(t,n){var e,o,r,i,u,a,c=Jy(s,l);d.link(l.element),s.matchWidth&&(e=c.hotspot,o=n,r=s.useMinWidth,u=ud.getCurrent(o).getOr(o),a=kn(e.element),r?fn(u.element,"min-width",a+"px"):(i=u.element,ke.set(i,a))),s.onOpen(c,t,n),void 0!==f&&void 0!==f.onOpen&&f.onOpen(t,n)},onClose:function(t,n){d.unlink(l.element),void 0!==f&&void 0!==f.onClose&&f.onClose(t,n)},isPartOf:function(t,n,e){return Hu(n,e)||Hu(l,e)},getAttachPoint:function(){return t().getOrDie()}}),ud.config({find:function(t){return hf.getState(t).bind(function(t){return ud.getCurrent(t)})}}),rc.config({channels:lt(lt({},js({isExtraPart:O})),Gs({doReposition:Zy}))})])}}function nx(t){Zy(Yy.getCoupled(t,"sandbox"))}function ex(){return[To("sandboxClasses",[]),Ef("sandboxBehaviours",[ud,rc,hf,Tf])]}function ox(n){return Jf({name:n+"-edge",overrides:function(t){return t.model.manager.edgeActions[n].fold(function(){return{}},function(o){return{events:nu([kr(ci(),function(t,n,e){return o(t,e)},[t]),kr(di(),function(t,n,e){return o(t,e)},[t]),kr(mi(),function(t,n,e){e.mouseIsDown.get()&&o(t,e)},[t])])}})}})}function rx(t){var n=t.event.raw;return-1===n.type.indexOf("touch")?void 0!==n.clientX?vt.some(n).map(function(t){return Se(t.clientX,t.clientY)}):vt.none():void 0!==n.touches&&1===n.touches.length?vt.some(n.touches[0]).map(function(t){return Se(t.clientX,t.clientY)}):vt.none()}function ix(t){return t.model.minX}function ux(t){return t.model.minY}function ax(t){return t.model.minX-1}function cx(t){return t.model.minY-1}function sx(t){return t.model.maxX}function lx(t){return t.model.maxY}function fx(t){return t.model.maxX+1}function dx(t){return t.model.maxY+1}function mx(t,n,e){return n(t)-e(t)}function gx(t){return mx(t,sx,ix)}function px(t){return mx(t,lx,ux)}function hx(t){return gx(t)/2}function vx(t){return px(t)/2}function bx(t){return t.stepSize}function yx(t){return t.snapToGrid}function xx(t){return t.snapStart}function wx(t){return t.rounded}function Sx(t,n){return void 0!==t[n+"-edge"]}function Cx(t){return Sx(t,"left")}function kx(t){return Sx(t,"right")}function Ox(t){return Sx(t,"top")}function _x(t){return Sx(t,"bottom")}function Tx(t){return t.model.value.get()}function Ex(t,n){return{x:t,y:n}}function Dx(t,n){vr(t,_w(),{value:n})}function Bx(t,n,e,o){return t<n?t:e<t?e:t===n?n-1:Math.max(n,t-o)}function Mx(t,n,e,o){return e<t?t:t<n?n:t===e?e+1:Math.min(e,t+o)}function Ax(t,n,e){return Math.max(n,Math.min(e,t))}function Fx(t){var n=t.min,e=t.max,o=t.range,r=t.value,i=t.step,u=t.snap,a=t.snapStart,c=t.rounded,s=t.hasMinEdge,l=t.hasMaxEdge,f=t.minBound,d=t.maxBound,m=t.screenRange,g=s?n-1:n,p=l?e+1:e;if(r<f)return g;if(d<r)return p;var h,v,b,y,x,w=Ax((x=f,Math.min(d,Math.max(r,x))-x)/m*o+n,g,p);return u&&n<=w&&w<=e?(h=w,v=n,b=e,y=i,a.fold(function(){var t=Math.round((h-v)/y)*y;return Ax(v+t,v-1,b+1)},function(t){var n=Math.round((h-t)%y/y),e=Math.floor((h-t)/y),o=Math.floor((b-t)/y),r=Math.min(o,e+n);return Math.max(t,t+r*y)})):c?Math.round(w):w}function Ix(t){var n=t.min,e=t.max,o=t.range,r=t.value,i=t.hasMinEdge,u=t.hasMaxEdge,a=t.maxBound,c=t.maxOffset,s=t.centerMinEdge,l=t.centerMaxEdge;return r<n?i?0:s:e<r?u?a:l:(r-n)/o*c}function Rx(t){return t.element.dom.getBoundingClientRect()}function Vx(t){return Rx(t)[Tw]}function Px(t){return Rx(t).right}function Hx(t){return Rx(t).top}function zx(t){return Rx(t).bottom}function Nx(t){return Rx(t).width}function Lx(t){return Rx(t).height}function Wx(t,n){var e=Rx(t),o=Rx(n);return(e[Tw]+e.right)/2-o[Tw]}function Ux(t,n){var e=Rx(t),o=Rx(n);return(e.top+e.bottom)/2-o.top}function jx(t,n){vr(t,_w(),{value:n})}function Gx(t,n,e){return Fx({min:ix(n),max:sx(n),range:gx(n),value:e,step:bx(n),snap:yx(n),snapStart:xx(n),rounded:wx(n),hasMinEdge:Cx(n),hasMaxEdge:kx(n),minBound:Vx(t),maxBound:Px(t),screenRange:Nx(t)})}function Xx(r){return function(t,n){return jx(t,{x:o=(0<r?Mx:Bx)(Tx(e=n).x,ix(e),sx(e),bx(e))}),vt.some(o).map(_);var e,o}}function Yx(t,n,e,o,r,i){var u,a,c,s,l,f,d,m,g=(a=i,c=e,s=o,l=r,f=Nx(u=n),d=s.bind(function(t){return vt.some(Wx(t,u))}).getOr(0),m=l.bind(function(t){return vt.some(Wx(t,u))}).getOr(f),Ix({min:ix(a),max:sx(a),range:gx(a),value:c,hasMinEdge:Cx(a),hasMaxEdge:kx(a),minBound:Vx(u),minOffset:0,maxBound:Px(u),maxOffset:f,centerMinEdge:d,centerMaxEdge:m}));return Vx(n)-Vx(t)+g}function qx(t,n){vr(t,_w(),{value:n})}function Kx(t,n,e){return Fx({min:ux(n),max:lx(n),range:px(n),value:e,step:bx(n),snap:yx(n),snapStart:xx(n),rounded:wx(n),hasMinEdge:Ox(n),hasMaxEdge:_x(n),minBound:Hx(t),maxBound:zx(t),screenRange:Lx(t)})}function Jx(r){return function(t,n){return qx(t,{y:o=(0<r?Mx:Bx)(Tx(e=n).y,ux(e),lx(e),bx(e))}),vt.some(o).map(_);var e,o}}function $x(t,n,e,o,r,i){var u,a,c,s,l,f,d,m,g=(a=i,c=e,s=o,l=r,f=Lx(u=n),d=s.bind(function(t){return vt.some(Ux(t,u))}).getOr(0),m=l.bind(function(t){return vt.some(Ux(t,u))}).getOr(f),Ix({min:ux(a),max:lx(a),range:px(a),value:c,hasMinEdge:Ox(a),hasMaxEdge:_x(a),minBound:Hx(u),minOffset:0,maxBound:zx(u),maxOffset:f,centerMinEdge:d,centerMaxEdge:m}));return Hx(n)-Hx(t)+g}function Qx(t,n){vr(t,_w(),{value:n})}function Zx(t,n){return{x:t,y:n}}function t0(u,a){return function(t,n){return o=n,r=0<u?Mx:Bx,Qx(t,Zx(i=(e=a)?Tx(o).x:r(Tx(o).x,ix(o),sx(o),bx(o)),e?r(Tx(o).y,ux(o),lx(o),bx(o)):Tx(o).y)),vt.some(i).map(_);var e,o,r,i}}function n0(t){return"<alloy.field."+t+">"}function e0(f,d,m,g){function p(t,n,e,o,r){var i,u,a=f(eS+"range"),c=[sy.parts.label({dom:{tag:"label",innerHtml:e,attributes:{"aria-label":o}}}),sy.parts.field({data:r,factory:Oy,inputAttributes:lt({type:"text"},"hex"===n?{"aria-live":"polite"}:{}),inputClasses:[d("textfield")],inputBehaviours:tc([(i=n,u=t,Gy.config({invalidClass:d("invalid"),notify:{onValidate:function(t){vr(t,nS,{type:i})},onValid:function(t){vr(t,Zw,{type:i,value:Tf.getValue(t)})},onInvalid:function(t){vr(t,tS,{type:i,value:Tf.getValue(t)})}},validator:{validate:function(t){var n=Tf.getValue(t),e=u(n)?Re.value(!0):Re.error(f("aria.input.invalid"));return Ly(e)},validateOnLoad:!1}})),fy.config({})]),onSetValue:function(t){Gy.isInvalid(t)&&Gy.run(t).get(st)}})],s="hex"!==n?[sy.parts["aria-descriptor"]({text:a})]:[];return{dom:{tag:"div",attributes:{role:"presentation"}},components:c.concat(s)}}function h(t,n){var e=n.red,o=n.green,r=n.blue;Tf.setValue(t,{red:e,green:o,blue:r})}function v(t,n){b.getOpt(t).each(function(t){fn(t.element,"background-color","#"+n.value)})}var b=Pm({dom:{tag:"div",classes:[d("rgba-preview")],styles:{"background-color":"white"},attributes:{role:"presentation"}}});return wl({factory:function(){function a(t){return o[t].get()}function c(t,n){o[t].set(n)}function n(t,n){var e=n.event;"hex"!==e.type?c(e.type,vt.none()):g(t)}function e(t,n){var r,e,o,i,u=n.event;"hex"===u.type?function(t,n){m(t);var e=Dv(n);c("hex",vt.some(n));var o=Vv(e);h(t,o),s(o),vr(t,qw,{hex:e}),v(t,e)}(t,u.value):(r=t,e=u.type,o=u.value,i=parseInt(o,10),c(e,vt.some(i)),a("red").bind(function(e){return a("green").bind(function(n){return a("blue").map(function(t){return Fv(e,n,t,1)})})}).each(function(t){var n,e,o=(n=r,e=Av(t),Qw.getField(n,"hex").each(function(t){Vg.isFocused(t)||Tf.setValue(n,{hex:e.value})}),e);vr(r,qw,{hex:o}),v(r,o)}))}function t(t){return{label:f(eS+t+".label"),description:f(eS+t+".description")}}function s(t){var n=t.red,e=t.green,o=t.blue;c("red",vt.some(n)),c("green",vt.some(e)),c("blue",vt.some(o))}var o={red:Vo(vt.some(255)),green:Vo(vt.some(255)),blue:Vo(vt.some(255)),hex:Vo(vt.some("ffffff"))},r=t("red"),i=t("green"),u=t("blue"),l=t("hex");return Xo(Qw.sketch(function(t){return{dom:{tag:"form",classes:[d("rgb-form")],attributes:{"aria-label":f("aria.color.picker")}},components:[t.field("red",sy.sketch(p(Iv,"red",r.label,r.description,255))),t.field("green",sy.sketch(p(Iv,"green",i.label,i.description,255))),t.field("blue",sy.sketch(p(Iv,"blue",u.label,u.description,255))),t.field("hex",sy.sketch(p(Bv,"hex",l.label,l.description,"ffffff"))),b.asSpec()],formBehaviours:tc([Gy.config({invalidClass:d("form-invalid")}),fm("rgb-form-events",[Cr(Zw,e),Cr(tS,n),Cr(nS,n)])])}}),{apis:{updateHex:function(t,n){var e;Tf.setValue(t,{hex:n.value}),h(t,e=Vv(n)),s(e),v(t,n)}}})},name:"RgbForm",configFields:[],apis:{updateHex:function(t,n,e){t.updateHex(n,e)}},extraApis:{}})}function o0(x,w){return wl({name:"ColourPicker",configFields:[fo("dom"),To("onValidHex",st),To("onInvalidHex",st)],factory:function(t){function n(t,n,e){v.getOpt(t).each(function(t){g.setHue(t,e)})}function e(t,n){b.getOpt(t).each(function(t){m.updateHex(t,n)})}function r(n,e,o,t){var r=o,i=Vv(e);p.paletteRgba.set(i),p.paletteHue.set(r),St(t,function(t){t(n,e,o)})}var o,i,u,a,c,s,l,f,d,m=e0(x,w,t.onValidHex,t.onInvalidHex),g=(l=w,f=Yw.parts.spectrum({dom:{tag:"canvas",attributes:{role:"presentation"},classes:[l("sv-palette-spectrum")]}}),d=Yw.parts.thumb({dom:{tag:"div",attributes:{role:"presentation"},classes:[l("sv-palette-thumb")],innerHtml:"<div class="+l("sv-palette-inner-thumb")+' role="presentation"></div>'}}),wl({factory:function(t){var n=rt({x:0,y:0}),e=tc([ud.config({find:vt.some}),Vg.config({})]);return Yw.sketch({dom:{tag:"div",attributes:{role:"presentation"},classes:[l("sv-palette")]},model:{mode:"xy",getInitialValue:n},rounded:!1,components:[f,d],onChange:function(t,n,e){vr(t,Jw,{value:e})},onInit:function(t,n,e,o){y(e.element.dom,zv(sb))},sliderBehaviours:e})},name:"SaturationBrightnessPalette",configFields:[],apis:{setHue:function(t,n,e){var o=e;y(n.components()[0].element.dom,zv(Rv(Lv(o,100,100))))},setThumb:function(t,n,e){var o=n,r=Wv(Vv(e));Yw.setValue(o,{x:r.saturation,y:100-r.value})}},extraApis:{}})),p={paletteRgba:Vo(sb),paletteHue:Vo(0)},h=Pm((i=Yw.parts.spectrum({dom:{tag:"div",classes:[(o=w)("hue-slider-spectrum")],attributes:{role:"presentation"}}}),u=Yw.parts.thumb({dom:{tag:"div",classes:[o("hue-slider-thumb")],attributes:{role:"presentation"}}}),Yw.sketch({dom:{tag:"div",classes:[o("hue-slider")],attributes:{role:"presentation"}},rounded:!1,model:{mode:"y",getInitialValue:rt({y:0})},components:[i,u],sliderBehaviours:tc([Vg.config({})]),onChange:function(t,n,e){vr(t,Kw,{value:e})}}))),v=Pm(g.sketch({})),b=Pm(m.sketch({}));function y(t,n){var e,o,r=t.width,i=t.height,u=t.getContext("2d");null!==u&&(u.fillStyle=n,u.fillRect(0,0,r,i),(e=u.createLinearGradient(0,0,r,0)).addColorStop(0,"rgba(255,255,255,1)"),e.addColorStop(1,"rgba(255,255,255,0)"),u.fillStyle=e,u.fillRect(0,0,r,i),(o=u.createLinearGradient(0,0,0,i)).addColorStop(0,"rgba(0,0,0,0)"),o.addColorStop(1,"rgba(0,0,0,1)"),u.fillStyle=o,u.fillRect(0,0,r,i))}return{uid:t.uid,dom:t.dom,components:[v.asSpec(),h.asSpec(),b.asSpec()],behaviours:tc([fm("colour-picker-events",[Cr(qw,(s=[n,function(t,n,e){h.getOpt(t).each(function(t){Yw.setValue(t,{y:100-e/360*100})})},function(t,n){v.getOpt(t).each(function(t){g.setThumb(t,n)})}],function(t,n){var e=n.event.hex;r(t,e,Wv(Vv(e)).hue,s)})),Cr(Jw,(c=[e],function(t,n){var e=n.event.value,o=p.paletteHue.get();r(t,Uv(Lv(o,e.x,100-e.y)),o,c)})),Cr(Kw,(a=[n,e],function(t,n){var e=(100-n.event.value.y)/100*360,o=Wv(p.paletteRgba.get());r(t,Uv(Lv(e,o.saturation,o.value)),e,a)}))]),ud.config({find:function(t){return b.getOpt(t)}}),Mg.config({mode:"acyclic"})])}}})}function r0(t){return iS[t]}function i0(t,n,e){return Tf.config(Xo({store:{mode:"manual",getValue:n,setValue:e}},t.map(function(t){return{store:{initialValue:t}}}).getOr({})))}function u0(r,i){function n(t,n){n.stop()}function e(t){return function(n,e){St(t,function(t){t(n,e)})}}function o(t,n){var e;dd.isDisabled(t)||(e=n.event.raw,a(t,e.dataTransfer.files))}function u(t,n){var e=n.event.raw.target;a(t,e.files)}function a(t,n){var e,o;Tf.setValue(t,(e=n,o=aS.explode(i.getSetting("images_file_types","jpeg,jpg,jpe,jfi,jif,jfif,png,gif,bmp,webp","string")),F(Ct(e),function(n){return T(o,function(t){return Bt(n.name.toLowerCase(),"."+t.toLowerCase())})}))),vr(t,py,{name:r.name})}var c=Pm({dom:{tag:"input",attributes:{type:"file",accept:"image/*"},styles:{display:"none"}},behaviours:tc([fm("input-file-events",[Er(Ci()),Er(Ri())])])});return Qb(r.label.map(function(t){return Zb(t,i)}),sy.parts.field({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"div",classes:["tox-dropzone-container"]},behaviours:tc([fS([]),ow(),dd.config({}),zg.config({toggleClass:"dragenter",toggleOnExecute:!1}),fm("dropzone-events",[Cr("dragenter",e([n,zg.toggle])),Cr("dragleave",e([n,zg.toggle])),Cr("dragover",n),Cr("drop",e([n,o])),Cr(Si(),u)])]),components:[{dom:{tag:"div",classes:["tox-dropzone"],styles:{}},components:[{dom:{tag:"p",innerHtml:i.translate("Drop an image here")}},sp.sketch({dom:{tag:"button",innerHtml:i.translate("Browse for an image"),styles:{position:"relative"},classes:["tox-button","tox-button--secondary"]},components:[c.asSpec()],action:function(t){c.get(t).element.dom.click()},buttonBehaviours:tc([fy.config({}),Kv(i.isDisabled),mv()])})]}]}}}}),["tox-form__group--stretched"],[])}function a0(t){return{dom:{tag:"div",styles:{width:"1px",height:"1px",outline:"none"},attributes:{tabindex:"0"},classes:t},behaviours:tc([Vg.config({ignore:!0}),fy.config({})])}}function c0(t){return{dom:{tag:"div",classes:["tox-navobj"]},components:[a0([dS]),t,a0([mS])],behaviours:tc([rS(1)])}}function s0(t,n){vr(t,yi(),{raw:{which:9,shiftKey:n}})}function l0(t,n){var e=n.element;qr(e,dS)?s0(t,!0):qr(e,mS)&&s0(t,!1)}function f0(t){return Ub(t,["."+dS,"."+mS].join(","),O)}function d0(t,n){return hS(document.createElement("canvas"),t,n)}function m0(t){var n=d0(t.width,t.height);return pS(n).drawImage(t,0,0),n}function g0(t){return t.naturalWidth||t.width}function p0(t){return t.naturalHeight||t.height}function h0(t,o,r){return o=o||"image/png",m(HTMLCanvasElement.prototype.toBlob)?new Vy(function(n,e){t.toBlob(function(t){t?n(t):e()},o,r)}):(g=t.toDataURL(o,r),new Vy(function(t,n){!function(){var t=g.split(","),n=/data:([^;]+)/.exec(t[0]);if(!n)return vt.none();for(var e=n[1],o=t[1],r=atob(o),i=r.length,u=Math.ceil(i/1024),a=new Array(u),c=0;c<u;++c){for(var s=1024*c,l=Math.min(1024+s,i),f=new Array(l-s),d=s,m=0;d<l;++m,++d)f[m]=r[d].charCodeAt(0);a[c]=new Uint8Array(f)}return vt.some(new Blob(a,{type:e}))}().fold(function(){n("uri is not base64: "+g)},t)}));var g}function v0(t,n,e){function o(n,e){return t.then(function(t){return t.toDataURL(n||"image/png",e)})}return{getType:rt(n.type),toBlob:function(){return Vy.resolve(n)},toDataURL:rt(e),toBase64:function(){return e.split(",")[1]},toAdjustedBlob:function(n,e){return t.then(function(t){return h0(t,n,e)})},toAdjustedDataURL:o,toAdjustedBase64:function(t,n){return o(t,n).then(function(t){return t.split(",")[1]})},toCanvas:function(){return t.then(m0)}}}function b0(n,t){return h0(n,t).then(function(t){return v0(Vy.resolve(n),t,n.toDataURL())})}function y0(n){return e=n,new Vy(function(t){var n=new FileReader;n.onloadend=function(){t(n.result)},n.readAsDataURL(e)}).then(function(t){return v0((a=n,new Vy(function(t,n){function e(){r.removeEventListener("load",i),r.removeEventListener("error",u)}var o=URL.createObjectURL(a),r=new Image,i=function(){e(),t(r)},u=function(){e(),n("Unable to load data of type "+a.type+": "+o)};r.addEventListener("load",i),r.addEventListener("error",u),r.src=o,r.complete&&setTimeout(i,0)}).then(function(t){vS(t);var n=d0(g0(t),p0(t));return pS(n).drawImage(t,0,0),n})),n,t);var a});var e}function x0(t,n,e){var o="string"==typeof t?parseFloat(t):t;return e<o?o=e:o<n&&(o=n),o}function w0(){return[1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1]}function S0(t,n){for(var e=[],o=new Array(25),r=0;r<5;r++){for(var i=0;i<5;i++)e[i]=n[i+5*r];for(i=0;i<5;i++){for(var u=0,a=0;a<5;a++)u+=t[i+5*a]*e[a];o[i+5*r]=u}}return o}function C0(n,e){return n.toCanvas().then(function(t){return yS(t,n.getType(),e)})}function k0(e){return function(t,n){return C0(t,e(w0(),n))}}function O0(t,n){void 0===n&&(n=2);var e=Math.pow(10,n),o=Math.round(t*e);return Math.ceil(o/e)}function _0(t){return xS(t)}function T0(t){return CS(t)}function E0(t,n){return kS(t,n)}function D0(t,n){return wS(t,n)}function B0(t,n){return SS(t,n)}function M0(t,n){return o=n,(e=t).toCanvas().then(function(t){return ES(t,e.getType(),o)});var e,o}function A0(t,n){return o=n,(e=t).toCanvas().then(function(t){return TS(t,e.getType(),o)});var e,o}function F0(t,n,e){return jm(t,{tag:"span",classes:["tox-icon","tox-tbtn__icon-wrap"],behaviours:e},n)}function I0(t,n){return F0(t,n,[])}function R0(t,n){return F0(t,n,[Fg.config({})])}function V0(t,n,e){return{dom:{tag:"span",innerHtml:e.translate(t),classes:[n+"__select-label"]},behaviours:tc([Fg.config({})])}}function P0(n,e,o){function t(t,n){var e=Tf.getValue(t);return Vg.focus(e),vr(e,"keydown",{raw:n.event.raw}),dw.close(e),vt.some(!0)}var r=Vo(st),i=n.text.map(function(t){return Pm(V0(t,e,o.providers))}),u=n.icon.map(function(t){return Pm(R0(t,o.providers.icons))}),a=n.role.fold(function(){return{}},function(t){return{role:t}}),c=n.tooltip.fold(function(){return{}},function(t){var n=o.providers.translate(t);return{title:n,"aria-label":n}}),s=jm("chevron-down",{tag:"div",classes:[e+"__select-chevron"]},o.providers.icons);return Pm(dw.sketch(lt(lt(lt({},n.uid?{uid:n.uid}:{}),a),{dom:{tag:"button",classes:[e,e+"--select"].concat(M(n.classes,function(t){return e+"--"+t})),attributes:lt({},c)},components:Qv([u.map(function(t){return t.asSpec()}),i.map(function(t){return t.asSpec()}),vt.some(s)]),matchWidth:!0,useMinWidth:!0,dropdownBehaviours:tc(H(H([],n.dropdownBehaviours,!0),[Kv(function(){return n.disabled||o.providers.isDisabled()}),mv(),mw.config({}),Fg.config({}),fm("dropdown-events",[pv(n,r),hv(n,r)]),fm("menubutton-update-display-text",[Cr(AS,function(n,e){i.bind(function(t){return t.getOpt(n)}).each(function(t){Fg.set(t,[oi(o.providers.translate(e.event.text))])})}),Cr(FS,function(n,e){u.bind(function(t){return t.getOpt(n)}).each(function(t){Fg.set(t,[R0(e.event.icon,o.providers.icons)])})})])],!1)),eventOrder:Xo(MS,{mousedown:["focusing","alloy.base.behaviour","item-type-events","normal-dropdown-events"]}),sandboxBehaviours:tc([Mg.config({mode:"special",onLeft:t,onRight:t})]),lazySink:o.getSink,toggleClass:e+"--active",parts:{menu:$p(0,n.columns,n.presets)},fetch:function(t){return Ny(S(n.fetch,t))}}))).asSpec()}function H0(t){return"separator"===t.type}function z0(t,e,o,n){var r=Fr("primary-menu"),i=RS(t,o.shared.providers.menuItems());if(0===i.items.length)return vt.none();var u=Lb(r,i.items,e,o,n),a=dt(i.menus,function(t,n){return Lb(n,t,e,o,!1)}),c=Xo(a,cr(r,u));return vt.from(op.tieredData(r,c,i.expansions))}function N0(e){return{isDisabled:function(){return dd.isDisabled(e)},setDisabled:function(t){return dd.set(e,t)},setActive:function(t){var n=e.element;t?(Xr(n,"tox-tbtn--enabled"),on(n,"aria-pressed",!0)):(Yr(n,"tox-tbtn--enabled"),cn(n,"aria-pressed"))},isActive:function(){return qr(e.element,"tox-tbtn--enabled")}}}function L0(e,t,o,n){return P0({text:e.text,icon:e.icon,tooltip:e.tooltip,role:n,fetch:function(t,n){e.fetch(function(t){n(z0(t,xh.CLOSE_ON_EXECUTE,o,!1))})},onSetup:e.onSetup,getApi:N0,columns:1,presets:"normal",classes:[],dropdownBehaviours:[fy.config({})]},t,o.shared)}function W0(t,n,e,o,r,i){void 0===e&&(e=[]);var u=n.fold(function(){return{}},function(t){return{action:t}}),a=lt({buttonBehaviours:tc([Kv(function(){return t.disabled||i.isDisabled()}),mv(),fy.config({}),fm("button press",[Sr("click"),Sr("mousedown")])].concat(e)),eventOrder:{click:["button press","alloy.base.behaviour"],mousedown:["button press","alloy.base.behaviour"]}},u),c=Xo(a,{dom:o});return Xo(c,{components:r})}function U0(t,n,e,o){void 0===o&&(o=[]);var r={tag:"button",classes:["tox-tbtn"],attributes:t.tooltip.map(function(t){return{"aria-label":e.translate(t),title:e.translate(t)}}).getOr({})},i=t.icon.map(function(t){return I0(t,e.icons)});return W0(t,n,o,r,Qv([i]),e)}function j0(t,n,e,o){void 0===o&&(o=[]);var r=U0(t,vt.some(n),e,o);return sp.sketch(r)}function G0(t,n,e,o,r){void 0===o&&(o=[]),void 0===r&&(r=[]);var i=e.translate(t.text),u=t.icon?t.icon.map(function(t){return I0(t,e.icons)}):vt.none(),a=u.isSome()?Qv([u]):[],c=u.isSome()?{}:{innerHtml:i},s=H(H(H(H([],t.primary||t.borderless?["tox-button"]:["tox-button","tox-button--secondary"],!0),u.isSome()?["tox-button--icon"]:[],!0),t.borderless?["tox-button--naked"]:[],!0),r,!0);return W0(t,n,o,lt(lt({tag:"button",classes:s},c),{attributes:{title:i}}),a,e)}function X0(t,n,e,o,r){void 0===o&&(o=[]),void 0===r&&(r=[]);var i=G0(t,vt.some(n),e,o,r);return sp.sketch(i)}function Y0(n,e){return function(t){"custom"===e?vr(t,by,{name:n,value:{}}):"submit"===e?hr(t,yy):"cancel"===e?hr(t,vy):console.error("Unknown button type: ",e)}}function q0(n,t,e){if("menu"===t){var o=n,r=Pm(L0(lt(lt({},n),{onSetup:function(t){return t.setDisabled(n.disabled),st},fetch:(i=o.items,u=function(){return r},a=e,function(t){t(M(i,function(t){var n,e,o=t.text.fold(function(){return{}},function(t){return{text:t}});return lt(lt({type:t.type,active:!1},o),{onAction:function(t){var n=!t.isActive();t.setActive(n),e.storage.set(n),a.shared.getSink().each(function(t){u().getOpt(t).each(function(t){Sa(t.element),vr(t,by,{name:e.name,value:e.storage.get()})})})},onSetup:(n=e=t,function(t){t.setActive(n.storage.get())})})}))})}),"tox-tbtn",e,vt.none()));return r.asSpec()}var i,u,a;if("custom"===t||"cancel"===t||"submit"===t){var c=Y0(n.name,t);return X0(lt(lt({},n),{borderless:!1}),c,e.shared.providers,[])}console.error("Unknown footer button type: ",t)}function K0(t,n){return qf({factory:sy,name:t,overrides:function(o){return{fieldBehaviours:tc([fm("coupled-input-behaviour",[Cr(wi(),function(e){fl(e,o,n).bind(ud.getCurrent).each(function(n){fl(e,o,"lock").each(function(t){zg.isOn(t)&&o.onLockedChange(e,n,t)})})})])])}}})}function J0(t){var n=/^\s*(\d+(?:\.\d+)?)\s*(|cm|mm|in|px|pt|pc|em|ex|ch|rem|vw|vh|vmin|vmax|%)\s*$/.exec(t);if(null===n)return Re.error(t);var e=parseFloat(n[1]),o=n[2];return Re.value({value:e,unit:o})}function $0(t,n){function e(t){return Tt(o,t)}var o={"":96,px:96,pt:72,cm:2.54,pc:12,mm:25.4,in:1};return t.unit===n?vt.some(t.value):e(t.unit)&&e(n)?o[t.unit]===o[n]?vt.some(t.value):vt.some(t.value/o[t.unit]*o[n]):vt.none()}function Q0(t){return vt.none()}function Z0(o,n){function t(t){return jm(t,{tag:"span",classes:["tox-icon","tox-lock-icon__"+t]},n.icons)}function e(t){return{dom:{tag:"div",classes:["tox-form__group"]},components:t}}function r(e){return sy.parts.field({factory:Oy,inputClasses:["tox-textfield"],inputBehaviours:tc([dd.config({disabled:function(){return o.disabled||n.isDisabled()}}),mv(),fy.config({}),fm("size-input-events",[Cr(vi(),function(t,n){vr(t,u,{isField1:e})}),Cr(Si(),function(t,n){vr(t,py,{name:o.name})})])]),selectOnFocus:!1})}function i(t){return{dom:{tag:"label",classes:["tox-label"],innerHtml:n.translate(t)}}}var l=Q0,u=Fr("ratio-event"),a=HS.parts.lock({dom:{tag:"button",classes:["tox-lock","tox-button","tox-button--naked","tox-button--icon"],attributes:{title:n.translate(o.label.getOr("Constrain proportions"))}},components:[t("lock"),t("unlock")],buttonBehaviours:tc([dd.config({disabled:function(){return o.disabled||n.isDisabled()}}),mv(),fy.config({})])}),c=HS.parts.field1(e([sy.parts.label(i("Width")),r(!0)])),s=HS.parts.field2(e([sy.parts.label(i("Height")),r(!1)]));return HS.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:[{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:[c,s,e([i("&nbsp;"),a])]}],field1Name:"width",field2Name:"height",locked:!0,markers:{lockClass:"tox-locked"},onLockedChange:function(t,i,n){J0(Tf.getValue(t)).each(function(t){l(t).each(function(t){var n,e,o,r;Tf.setValue(i,(r=-1!==(r=(n=t).value.toFixed((e=n.unit)in(o={"":0,px:0,pt:1,mm:1,pc:2,ex:2,em:2,ch:2,rem:2,cm:3,in:4,"%":4})?o[e]:1)).indexOf(".")?r.replace(/\.?0*$/,""):r)+n.unit)})})},coupledFieldBehaviours:tc([dd.config({disabled:function(){return o.disabled||n.isDisabled()},onDisabled:function(t){HS.getField1(t).bind(sy.getField).each(dd.disable),HS.getField2(t).bind(sy.getField).each(dd.disable),HS.getLock(t).each(dd.disable)},onEnabled:function(t){HS.getField1(t).bind(sy.getField).each(dd.enable),HS.getField2(t).bind(sy.getField).each(dd.enable),HS.getLock(t).each(dd.enable)}}),mv(),fm("size-input-events2",[Cr(u,function(t,n){var e,o,r,i=n.event.isField1,u=i?HS.getField1(t):HS.getField2(t),a=i?HS.getField2(t):HS.getField1(t),c=u.map(Tf.getValue).getOr(""),s=a.map(Tf.getValue).getOr("");e=s,o=J0(c).toOptional(),r=J0(e).toOptional(),l=Et(o,r,function(t,o){return $0(t,o.unit).map(function(t){return o.value/t}).map(function(t){return n=t,e=o.unit,function(t){return $0(t,e).map(function(t){return{value:t*n,unit:e}})};var n,e}).getOr(Q0)}).getOr(Q0)})])])})}function tw(f,c){function t(t,n,e,o){return Pm(X0({name:t,text:t,disabled:e,primary:o,icon:vt.none(),borderless:!1},n,c))}function n(t,n,e,o){return Pm(j0({name:t,icon:vt.some(t),tooltip:vt.some(n),disabled:o,primary:!1,borderless:!1},e,c))}function d(t,e){t.map(function(t){var n=t.get(e);n.hasConfigured(dd)&&dd.disable(n)})}function m(t,e){t.map(function(t){var n=t.get(e);n.hasConfigured(dd)&&dd.enable(n)})}function r(t,n,e){vr(t,n,e)}function i(t){return hr(t,US.disable()),0}function u(t){return hr(t,US.enable()),0}function g(t,n){i(t),r(t,zS.transform(),{transform:n}),u(t)}function e(t){return function(){q.getOpt(t).each(function(t){Fg.set(t,[Y])})}}function s(t,n){i(t),r(t,zS.transformApply(),{transform:n,swap:e(t)}),u(t)}function p(){return t("Back",function(t){return r(t,zS.back(),{swap:e(t)})},!1,!1)}function o(){return Pm({dom:{tag:"div",classes:["tox-spacer"]},behaviours:tc([dd.config({})])})}function h(){return t("Apply",function(t){return r(t,zS.apply(),{swap:e(t)})},!0,!0)}function v(n,e){return function(t){return n(t,e)}}function a(t,n){var e,o=n;i(e=t),r(e,zS.tempTransform(),{transform:o}),u(e)}function b(t,n,e,o,r){var i=Yw.parts.label({dom:{tag:"label",classes:["tox-label"],innerHtml:c.translate(t)}}),u=Yw.parts.spectrum({dom:{tag:"div",classes:["tox-slider__rail"],attributes:{role:"presentation"}}}),a=Yw.parts.thumb({dom:{tag:"div",classes:["tox-slider__handle"],attributes:{role:"presentation"}}});return Pm(Yw.sketch({dom:{tag:"div",classes:["tox-slider"],attributes:{role:"presentation"}},model:{mode:"x",minX:e,maxX:r,getInitialValue:rt({x:o})},components:[i,u,a],sliderBehaviours:tc([Vg.config({})]),onChoose:n}))}function l(t,n,e,o,r){var i,u,a,c,s,l,f=(i=t,u=n,a=e,c=o,s=r,[p(),(l=u,b(i,function(t,n,e){g(t,v(l,e.x/100))},a,c,s)),h()]);return uy.sketch({dom:w,components:f.map(function(t){return t.asSpec()}),containerBehaviours:tc([fm("image-tools-filter-panel-buttons-events",[Cr(US.disable(),function(t,n){d(f,t)}),Cr(US.enable(),function(t,n){m(f,t)})])])})}function y(t){return b(t,function(l,t,n){var e=z.getOpt(l),o=L.getOpt(l),r=N.getOpt(l);e.each(function(s){o.each(function(c){r.each(function(t){var o,r,i,n=Tf.getValue(s).x/100,e=Tf.getValue(t).x/100,u=Tf.getValue(c).x/100,a=(o=n,r=e,i=u,function(t){return C0(t,(n=r,e=i,S0(w0(),[x0(o,0,2),0,0,0,0,0,x0(n,0,2),0,0,0,0,0,x0(e,0,2),0,0,0,0,0,1,0,0,0,0,0,1])));var n,e});g(l,a)})})})},0,100,200)}function x(n,e,o){return function(t){r(t,zS.swap(),{transform:e,swap:function(){q.getOpt(t).each(function(t){Fg.set(t,[n]),o(t)})}})}}var w={tag:"div",classes:["tox-image-tools__toolbar","tox-image-tools-edit-panel"]},S=st,C=[p(),o(),t("Apply",function(t){s(t,function(t){var n,e,o,r,i,u,a,c,s,l=f.getRect();return n=l.x,e=l.y,o=l.w,r=l.h,u=n,a=e,c=o,s=r,(i=t).toCanvas().then(function(t){return DS(t,i.getType(),u,a,c,s)})}),f.hideCrop()},!1,!0)],k=uy.sketch({dom:w,components:C.map(function(t){return t.asSpec()}),containerBehaviours:tc([fm("image-tools-crop-buttons-events",[Cr(US.disable(),function(t,n){d(C,t)}),Cr(US.enable(),function(t,n){m(C,t)})])])}),O=Pm(Z0({name:"size",label:vt.none(),constrain:!0,disabled:!1},c)),_=[p(),o(),O,o(),t("Apply",function(a){O.getOpt(a).each(function(t){var r,i,n=Tf.getValue(t),e=parseInt(n.width,10),o=parseInt(n.height,10),u=(r=e,i=o,function(t){return e=r,o=i,(n=t).toCanvas().then(function(t){return OS(t,e,o).then(function(t){return b0(t,n.getType())})});var n,e,o});s(a,u)})},!1,!0)],T=uy.sketch({dom:w,components:_.map(function(t){return t.asSpec()}),containerBehaviours:tc([fm("image-tools-resize-buttons-events",[Cr(US.disable(),function(t,n){d(_,t)}),Cr(US.enable(),function(t,n){m(_,t)})])])}),E=v(M0,"h"),D=v(M0,"v"),B=v(A0,-90),M=v(A0,90),A=[p(),o(),n("flip-horizontally","Flip horizontally",function(t){a(t,E)},!1),n("flip-vertically","Flip vertically",function(t){a(t,D)},!1),n("rotate-left","Rotate counterclockwise",function(t){a(t,B)},!1),n("rotate-right","Rotate clockwise",function(t){a(t,M)},!1),o(),h()],F=uy.sketch({dom:w,components:A.map(function(t){return t.asSpec()}),containerBehaviours:tc([fm("image-tools-fliprotate-buttons-events",[Cr(US.disable(),function(t,n){d(A,t)}),Cr(US.enable(),function(t,n){m(A,t)})])])}),I=[p(),o(),h()],R=uy.sketch({dom:w,components:I.map(function(t){return t.asSpec()})}),V=l("Brightness",D0,-100,0,100),P=l("Contrast",B0,-100,0,100),H=l("Gamma",E0,-100,0,100),z=y("R"),N=y("G"),L=y("B"),W=[p(),z,N,L,h()],U=uy.sketch({dom:w,components:W.map(function(t){return t.asSpec()})}),j=vt.some(T0),G=vt.some(_0),X=[n("crop","Crop",x(k,vt.none(),function(t){f.showCrop()}),!1),n("resize","Resize",x(T,vt.none(),function(t){O.getOpt(t).each(function(t){var n=f.getMeasurements(),e=n.width,o=n.height;Tf.setValue(t,{width:e,height:o})})}),!1),n("orientation","Orientation",x(F,vt.none(),S),!1),n("brightness","Brightness",x(V,vt.none(),S),!1),n("sharpen","Sharpen",x(R,j,S),!1),n("contrast","Contrast",x(P,vt.none(),S),!1),n("color-levels","Color levels",x(U,vt.none(),S),!1),n("gamma","Gamma",x(H,vt.none(),S),!1),n("invert","Invert",x(R,G,S),!1)],Y=uy.sketch({dom:w,components:X.map(function(t){return t.asSpec()})}),q=Pm(uy.sketch({dom:{tag:"div"},components:[Y],containerBehaviours:tc([Fg.config({})])}));return{memContainer:q,getApplyButton:function(t){return q.getOpt(t).map(function(t){var n=t.components()[0];return n.components()[n.components().length-1]})}}}function nw(t){var n,e;if(t.changedTouches)for(n="screenX screenY pageX pageY clientX clientY".split(" "),e=0;e<n.length;e++)t[n[e]]=t.changedTouches[0][n[e]]}(Ry=Iy=Iy||{})[Ry.HighlightFirst=0]="HighlightFirst",Ry[Ry.HighlightNone=1]="HighlightNone";function ew(o,t){return{uid:o.uid,dom:o.dom,components:t,behaviours:Zs(o.formBehaviours,[Tf.config({store:{mode:"manual",getValue:function(t){return dt(gl(t,o),function(t,o){return t().bind(function(t){var n=ud.getCurrent(t),e=new Error("Cannot find a current component to extract the value from for form part '"+o+"': "+Ar(t.element));return n.fold(function(){return Re.error(e)},Re.value)}).map(Tf.getValue)})},setValue:function(e,t){J(t,function(n,t){fl(e,o,t).each(function(t){ud.getCurrent(t).each(function(t){Tf.setValue(t,n)})})})}}})]),apis:{getField:function(t,n){return fl(t,o,n).bind(ud.getCurrent)}}}}function ow(){return ud.config({find:vt.some})}function rw(t){return n=Br,e=Mr,i0(t,function(t){return n(t.element)},function(t,n){return e(t.element,n)});var n,e}var iw,uw,aw,cw,sw=function(n,t){return n.getSystem().getByUid(t.uid+"-"+qy()).map(function(t){return function(){return Re.value(t)}}).getOrThunk(function(){return t.lazySink.fold(function(){return function(){return Re.error(new Error("No internal sink is specified, nor could an external sink be found"))}},function(t){return function(){return t(n)}})})},lw=rt([fo("dom"),fo("fetch"),Ku("onOpen"),Ju("onExecute"),To("getHotspot",vt.some),To("getAnchorOverrides",rt({})),Nc(),$s("dropdownBehaviours",[zg,Yy,Mg,Vg]),fo("toggleClass"),To("eventOrder",{}),xo("lazySink"),To("matchWidth",!1),To("useMinWidth",!1),xo("role")].concat(ex())),fw=rt([Kf({schema:[Xu()],name:"menu",defaults:function(t){return{onExecute:t.onExecute}}}),Ky()]),dw=Sl({name:"Dropdown",configFields:lw(),partFields:fw(),factory:function(n,t,e,o){function r(t){hf.getState(t).each(function(t){op.highlightPrimary(t)})}function i(t,n){return br(t),vt.some(!0)}var u,a={expand:function(t){zg.isOn(t)||Qy(n,h,t,o,st,Iy.HighlightNone).get(st)},open:function(t){zg.isOn(t)||Qy(n,h,t,o,st,Iy.HighlightFirst).get(st)},isOpen:zg.isOn,close:function(t){zg.isOn(t)&&Qy(n,h,t,o,st,Iy.HighlightFirst).get(st)},repositionMenus:function(t){zg.isOn(t)&&nx(t)}};return{uid:n.uid,dom:n.dom,components:t,behaviours:Zs(n.dropdownBehaviours,[zg.config({toggleClass:n.toggleClass,aria:{mode:"expanded"}}),Yy.config({others:{sandbox:function(t){return tx(n,t,{onOpen:function(){return zg.on(t)},onClose:function(){return zg.off(t)}})}}}),Mg.config({mode:"special",onSpace:i,onEnter:i,onDown:function(t,n){return dw.isOpen(t)?r(Yy.getCoupled(t,"sandbox")):dw.open(t),vt.some(!0)},onEscape:function(t,n){return dw.isOpen(t)?(dw.close(t),vt.some(!0)):vt.none()}}),Vg.config({})]),events:xm(vt.some(function(t){Qy(n,h,t,o,r,Iy.HighlightFirst).get(st)})),eventOrder:lt(lt({},n.eventOrder),((u={})[Fi()]=["disabling","toggling","alloy.base.behaviour"],u)),apis:a,domModification:{attributes:lt(lt({"aria-haspopup":"true"},n.role.fold(function(){return{}},function(t){return{role:t}})),"button"===n.dom.tag?{type:tt(n.dom,"attributes").bind(function(t){return tt(t,"type")}).getOr("button")}:{})}}},apis:{open:function(t,n){return t.open(n)},expand:function(t,n){return t.expand(n)},close:function(t,n){return t.close(n)},isOpen:function(t,n){return t.isOpen(n)},repositionMenus:function(t,n){return t.repositionMenus(n)}}}),mw=ya({fields:[],name:"unselecting",active:Object.freeze({__proto__:null,events:function(){return nu([wr(Ti(),_)])},exhibit:function(){return Nr({styles:{"-webkit-user-select":"none","user-select":"none","-ms-user-select":"none","-moz-user-select":"-moz-none"},attributes:{unselectable:"on"}})}})}),gw=Fr("color-input-change"),pw=Fr("color-swatch-change"),hw=Fr("color-picker-cancel"),vw=Jf({schema:[fo("dom")],name:"label"}),bw=ox("top-left"),yw=ox("top"),xw=ox("top-right"),ww=ox("right"),Sw=ox("bottom-right"),Cw=ox("bottom"),kw=ox("bottom-left"),Ow=[vw,ox("left"),ww,yw,Cw,bw,xw,kw,Sw,qf({name:"thumb",defaults:rt({dom:{styles:{position:"absolute"}}}),overrides:function(t){return{events:nu([_r(ci(),t,"spectrum"),_r(si(),t,"spectrum"),_r(li(),t,"spectrum"),_r(di(),t,"spectrum"),_r(mi(),t,"spectrum"),_r(pi(),t,"spectrum")])}}}),qf({schema:[ar("mouseIsDown",function(){return Vo(!1)})],name:"spectrum",overrides:function(e){function o(n,t){return r.getValueFromEvent(t).map(function(t){return r.setValueFrom(n,e,t)})}var r=e.model.manager;return{behaviours:tc([Mg.config({mode:"special",onLeft:function(t){return r.onLeft(t,e)},onRight:function(t){return r.onRight(t,e)},onUp:function(t){return r.onUp(t,e)},onDown:function(t){return r.onDown(t,e)}}),Vg.config({})]),events:nu([Cr(ci(),o),Cr(si(),o),Cr(di(),o),Cr(mi(),function(t,n){e.mouseIsDown.get()&&o(t,n)})])}}})],_w=rt("slider.change.value"),Tw="left",Ew=Xx(-1),Dw=Xx(1),Bw=vt.none,Mw=vt.none,Aw={"top-left":vt.none(),top:vt.none(),"top-right":vt.none(),right:vt.some(function(t,n){Dx(t,{x:fx(n)})}),"bottom-right":vt.none(),bottom:vt.none(),"bottom-left":vt.none(),left:vt.some(function(t,n){Dx(t,{x:ax(n)})})},Fw=Object.freeze({__proto__:null,setValueFrom:function(t,n,e){var o=Gx(t,n,e);return jx(t,{x:o}),o},setToMin:function(t,n){jx(t,{x:ix(n)})},setToMax:function(t,n){jx(t,{x:sx(n)})},findValueOfOffset:Gx,getValueFromEvent:function(t){return rx(t).map(function(t){return t.left})},findPositionOfValue:Yx,setPositionFromValue:function(t,n,e,o){var r=Tx(e),i=Yx(t,o.getSpectrum(t),r.x,o.getLeftEdge(t),o.getRightEdge(t),e),u=kn(n.element)/2;fn(n.element,"left",i-u+"px")},onLeft:Ew,onRight:Dw,onUp:Bw,onDown:Mw,edgeActions:Aw}),Iw=vt.none,Rw=vt.none,Vw=Jx(-1),Pw=Jx(1),Hw={"top-left":vt.none(),top:vt.some(function(t,n){Dx(t,{y:cx(n)})}),"top-right":vt.none(),right:vt.none(),"bottom-right":vt.none(),bottom:vt.some(function(t,n){Dx(t,{y:dx(n)})}),"bottom-left":vt.none(),left:vt.none()},zw=Object.freeze({__proto__:null,setValueFrom:function(t,n,e){var o=Kx(t,n,e);return qx(t,{y:o}),o},setToMin:function(t,n){qx(t,{y:ux(n)})},setToMax:function(t,n){qx(t,{y:lx(n)})},findValueOfOffset:Kx,getValueFromEvent:function(t){return rx(t).map(function(t){return t.top})},findPositionOfValue:$x,setPositionFromValue:function(t,n,e,o){var r=Tx(e),i=$x(t,o.getSpectrum(t),r.y,o.getTopEdge(t),o.getBottomEdge(t),e),u=xn(n.element)/2;fn(n.element,"top",i-u+"px")},onLeft:Iw,onRight:Rw,onUp:Vw,onDown:Pw,edgeActions:Hw}),Nw=rx,Lw=t0(-1,!1),Ww=t0(1,!1),Uw=t0(-1,!0),jw=t0(1,!0),Gw={"top-left":vt.some(function(t,n){Dx(t,Ex(ax(n),cx(n)))}),top:vt.some(function(t,n){Dx(t,Ex(hx(n),cx(n)))}),"top-right":vt.some(function(t,n){Dx(t,Ex(fx(n),cx(n)))}),right:vt.some(function(t,n){Dx(t,Ex(fx(n),vx(n)))}),"bottom-right":vt.some(function(t,n){Dx(t,Ex(fx(n),dx(n)))}),bottom:vt.some(function(t,n){Dx(t,Ex(hx(n),dx(n)))}),"bottom-left":vt.some(function(t,n){Dx(t,Ex(ax(n),dx(n)))}),left:vt.some(function(t,n){Dx(t,Ex(ax(n),vx(n)))})},Xw=Object.freeze({__proto__:null,setValueFrom:function(t,n,e){var o=Zx(Gx(t,n,e.left),Kx(t,n,e.top));return Qx(t,o),o},setToMin:function(t,n){Qx(t,Zx(ix(n),ux(n)))},setToMax:function(t,n){Qx(t,Zx(sx(n),lx(n)))},getValueFromEvent:Nw,setPositionFromValue:function(t,n,e,o){var r=Tx(e),i=Yx(t,o.getSpectrum(t),r.x,o.getLeftEdge(t),o.getRightEdge(t),e),u=$x(t,o.getSpectrum(t),r.y,o.getTopEdge(t),o.getBottomEdge(t),e),a=kn(n.element)/2,c=xn(n.element)/2;fn(n.element,"left",i-a+"px"),fn(n.element,"top",u-c+"px")},onLeft:Lw,onRight:Ww,onUp:Uw,onDown:jw,edgeActions:Gw}),Yw=Sl({name:"Slider",configFields:[To("stepSize",1),To("onChange",st),To("onChoose",st),To("onInit",st),To("onDragStart",st),To("onDragEnd",st),To("snapToGrid",!1),To("rounded",!0),xo("snapStart"),mo("model",so("mode",{x:[To("minX",0),To("maxX",100),ar("value",function(t){return Vo(t.mode.minX)}),fo("getInitialValue"),Zu("manager",Fw)],y:[To("minY",0),To("maxY",100),ar("value",function(t){return Vo(t.mode.minY)}),fo("getInitialValue"),Zu("manager",zw)],xy:[To("minX",0),To("maxX",100),To("minY",0),To("maxY",100),ar("value",function(t){return Vo({x:t.mode.minX,y:t.mode.minY})}),fo("getInitialValue"),Zu("manager",Xw)]})),$s("sliderBehaviours",[Mg,Tf]),ar("mouseIsDown",function(){return Vo(!1)})],partFields:Ow,factory:function(i,t,n,e){function u(t){return dl(t,i,"thumb")}function a(t){return dl(t,i,"spectrum")}function o(t){return fl(t,i,"left-edge")}function r(t){return fl(t,i,"right-edge")}function c(t){return fl(t,i,"top-edge")}function s(t){return fl(t,i,"bottom-edge")}function l(t,n){v.setPositionFromValue(t,n,i,{getLeftEdge:o,getRightEdge:r,getTopEdge:c,getBottomEdge:s,getSpectrum:a})}function f(t,n){h.value.set(n),l(t,u(t))}function d(e){var t=i.mouseIsDown.get();i.mouseIsDown.set(!1),t&&fl(e,i,"thumb").each(function(t){var n=h.value.get();i.onChoose(e,t,n)})}function m(t,n){n.stop(),i.mouseIsDown.set(!0),i.onDragStart(t,u(t))}function g(t,n){n.stop(),i.onDragEnd(t,u(t)),d(t)}var p,h=i.model,v=h.manager;return{uid:i.uid,dom:i.dom,components:t,behaviours:Zs(i.sliderBehaviours,[Mg.config({mode:"special",focusIn:function(t){return fl(t,i,"spectrum").map(Mg.focusIn).map(_)}}),Tf.config({store:{mode:"manual",getValue:function(t){return h.value.get()}}}),rc.config({channels:((p={})[yf()]={onReceive:d},p)})]),events:nu([Cr(_w(),function(t,n){!function(t,n){f(t,n);var e=u(t);i.onChange(t,e,n),vt.some(!0)}(t,n.event.value)}),eu(function(t,n){var e=h.getInitialValue();h.value.set(e);var o=u(t);l(t,o);var r=a(t);i.onInit(t,o,r,h.value.get())}),Cr(ci(),m),Cr(li(),g),Cr(di(),m),Cr(pi(),g)]),apis:{resetToMin:function(t){v.setToMin(t,i)},resetToMax:function(t){v.setToMax(t,i)},setValue:f,refresh:l},domModification:{styles:{position:"relative"}}}},apis:{setValue:function(t,n,e){t.setValue(n,e)},resetToMin:function(t,n){t.resetToMin(n)},resetToMax:function(t,n){t.resetToMax(n)},refresh:function(t,n){t.refresh(n)}}}),qw=Fr("rgb-hex-update"),Kw=Fr("slider-update"),Jw=Fr("palette-update"),$w=[$s("formBehaviours",[Tf])],Qw={getField:Hr(function(t,n,e){return t.getField(n,e)}),sketch:function(t){var e,n={field:function(t,n){return e.push(t),ul("form",n0(t),n)},record:rt(e=[])},o=t(n),r=M(n.record(),function(t){return qf({name:t,pname:n0(t)})});return xl("form",$w,r,ew,o)}},Zw=Fr("valid-input"),tS=Fr("invalid-input"),nS=Fr("validating-input"),eS="colorcustom.rgb.",oS=function(t){return ud.config({find:t.getOpt})},rS=function(t){return ud.config({find:function(n){return Jt(n.element,t).bind(function(t){return n.getSystem().getByDom(t).toOptional()})}})},iS={"colorcustom.rgb.red.label":"R","colorcustom.rgb.red.description":"Red component","colorcustom.rgb.green.label":"G","colorcustom.rgb.green.description":"Green component","colorcustom.rgb.blue.label":"B","colorcustom.rgb.blue.description":"Blue component","colorcustom.rgb.hex.label":"#","colorcustom.rgb.hex.description":"Hex color code","colorcustom.rgb.range":"Range 0 to 255","colorcustom.sb.saturation":"Saturation","colorcustom.sb.brightness":"Brightness","colorcustom.sb.picker":"Saturation and Brightness Picker","colorcustom.sb.palette":"Saturation and Brightness Palette","colorcustom.sb.instructions":"Use arrow keys to select saturation and brightness, on x and y axes","colorcustom.hue.hue":"Hue","colorcustom.hue.slider":"Hue Slider","colorcustom.hue.palette":"Hue Palette","colorcustom.hue.instructions":"Use arrow keys to select a hue","aria.color.picker":"Color Picker","aria.input.invalid":"Invalid input"},uS=tinymce.util.Tools.resolve("tinymce.Resource"),aS=tinymce.util.Tools.resolve("tinymce.util.Tools"),cS=Jo([To("preprocess",h),To("postprocess",h)]),sS=function(r,t){var i=co("RepresentingConfigs.memento processors",cS,t);return Tf.config({store:{mode:"manual",getValue:function(t){var n=r.get(t),e=Tf.getValue(n);return i.postprocess(e)},setValue:function(t,n){var e=i.preprocess(n),o=r.get(t);Tf.setValue(o,e)}}})},lS=i0,fS=function(t){return Tf.config({store:{mode:"memory",initialValue:t}})},dS=Fr("alloy-fake-before-tabstop"),mS=Fr("alloy-fake-after-tabstop"),gS=!(se().browser.isIE()||se().browser.isEdge()),pS=function(t){return t.getContext("2d")},hS=function(t,n,e){return t.width=n,t.height=e,t},vS=function(t){URL.revokeObjectURL(t.src)},bS=[0,.01,.02,.04,.05,.06,.07,.08,.1,.11,.12,.14,.15,.16,.17,.18,.2,.21,.22,.24,.25,.27,.28,.3,.32,.34,.36,.38,.4,.42,.44,.46,.48,.5,.53,.56,.59,.62,.65,.68,.71,.74,.77,.8,.83,.86,.89,.92,.95,.98,1,1.06,1.12,1.18,1.24,1.3,1.36,1.42,1.48,1.54,1.6,1.66,1.72,1.78,1.84,1.9,1.96,2,2.12,2.25,2.37,2.5,2.62,2.75,2.87,3,3.2,3.4,3.6,3.8,4,4.3,4.7,4.9,5,5.5,6,6.5,6.8,7,7.3,7.5,7.8,8,8.4,8.7,9,9.4,9.6,9.8,10],yS=function(t,n,T){var e=pS(t),o=function(t){for(var n,e,o,r,i=t.data,u=T[0],a=T[1],c=T[2],s=T[3],l=T[4],f=T[5],d=T[6],m=T[7],g=T[8],p=T[9],h=T[10],v=T[11],b=T[12],y=T[13],x=T[14],w=T[15],S=T[16],C=T[17],k=T[18],O=T[19],_=0;_<i.length;_+=4)n=i[_],e=i[_+1],o=i[_+2],r=i[_+3],i[_]=n*u+e*a+o*c+r*s+l,i[_+1]=n*f+e*d+o*m+r*g+p,i[_+2]=n*h+e*v+o*b+r*y+x,i[_+3]=n*w+e*S+o*C+r*k+O;return t}(e.getImageData(0,0,t.width,t.height));return e.putImageData(o,0,0),b0(t,n)},xS=(iw=[-1,0,0,0,255,0,-1,0,0,255,0,0,-1,0,255,0,0,0,1,0,0,0,0,0,1],function(t){return C0(t,iw)}),wS=k0(function(t,n){return S0(t,[1,0,0,0,n=x0(255*n,-255,255),0,1,0,0,n,0,0,1,0,n,0,0,0,1,0,0,0,0,0,1])}),SS=k0(function(t,n){var e;return n=x0(n,-1,1),S0(t,[(e=(n*=100)<0?127+n/100*127:127*(0==(e=n%1)?bS[n]:bS[Math.floor(n)]*(1-e)+bS[Math.floor(n)+1]*e)+127)/127,0,0,0,.5*(127-e),0,e/127,0,0,.5*(127-e),0,0,e/127,0,.5*(127-e),0,0,0,1,0,0,0,0,0,1])}),CS=(uw=[0,-1,0,-1,5,-1,0,-1,0],function(t){return a=uw,(u=t).toCanvas().then(function(t){return n=t,e=u.getType(),o=a,r=pS(n),i=function(t,n,e){for(var o=function(t,n,e){return e<t?t=e:t<n&&(t=n),t},r=Math.round(Math.sqrt(e.length)),i=Math.floor(r/2),u=t.data,a=n.data,c=t.width,s=t.height,l=0;l<s;l++)for(var f=0;f<c;f++){for(var d=0,m=0,g=0,p=0;p<r;p++)for(var h=0;h<r;h++){var v=o(f+h-i,0,c-1),b=4*(o(l+p-i,0,s-1)*c+v),y=e[p*r+h];d+=u[b]*y,m+=u[1+b]*y,g+=u[2+b]*y}var x=4*(l*c+f);a[x]=o(d,0,255),a[1+x]=o(m,0,255),a[2+x]=o(g,0,255)}return n}(r.getImageData(0,0,n.width,n.height),r.getImageData(0,0,n.width,n.height),o),r.putImageData(i,0,0),b0(n,e);var n,e,o,r,i});var u,a}),kS=(aw=function(t,n){return 255*Math.pow(t/255,1-n)},function(n,e){return n.toCanvas().then(function(t){return function(t,n,e){for(var o=pS(t),r=new Array(256),i=0;i<r.length;i++)r[i]=aw(i,e);var u=function(t,n){for(var e=t.data,o=0;o<e.length;o+=4)e[o]=n[e[o]],e[o+1]=n[e[o+1]],e[o+2]=n[e[o+2]];return t}(o.getImageData(0,0,t.width,t.height),r);return o.putImageData(u,0,0),b0(t,n)}(t,n.getType(),e)})}),OS=function(t,n,e){var o=g0(t),r=p0(t),i=n/o,u=e/r,a=!1;(i<.5||2<i)&&(i=i<.5?.5:2,a=!0),(u<.5||2<u)&&(u=u<.5?.5:2,a=!0);var c=_S(t,i,u);return a?c.then(function(t){return OS(t,n,e)}):c},_S=function(u,a,c){return new Vy(function(t){var n=g0(u),e=p0(u),o=Math.floor(n*a),r=Math.floor(e*c),i=d0(o,r);pS(i).drawImage(u,0,0,n,e,0,0,o,r),t(i)})},TS=function(t,n,e){var o=(e<0?360+e:e)*Math.PI/180,r=t.width,i=t.height,u=Math.sin(o),a=Math.cos(o),c=O0(Math.abs(r*a)+Math.abs(i*u)),s=O0(Math.abs(r*u)+Math.abs(i*a)),l=d0(c,s),f=pS(l);return f.translate(c/2,s/2),f.rotate(o),f.drawImage(t,-r/2,-i/2),b0(l,n)},ES=function(t,n,e){var o=d0(t.width,t.height),r=pS(o);return"v"===e?(r.scale(1,-1),r.drawImage(t,0,-o.height)):(r.scale(-1,1),r.drawImage(t,-o.width,0)),b0(o,n)},DS=function(t,n,e,o,r,i){var u=d0(r,i);return pS(u).drawImage(t,-e,-o),b0(u,n)},BS=Fr("toolbar.button.execute"),MS=((cw={})[Fi()]=["disabling","alloy.base.behaviour","toggling","toolbar-button-events"],cw),AS=Fr("update-menu-text"),FS=Fr("update-menu-icon"),IS={type:"separator"},RS=function(t,l){var n,e,o;return I((n=y(t)?t.split(" "):t,e=l,0<(o=R(n,function(t,n){return y(n)?""===n?t:"|"===n?0<t.length&&!H0(t[t.length-1])?t.concat([IS]):t:Tt(e,n.toLowerCase())?t.concat([e[n.toLowerCase()]]):t:t.concat([n])},[])).length&&H0(o[o.length-1])&&o.pop(),o),function(t,n){var e,o,r,i,u,a,c=function(t){if(H0(t))return t;var n=tt(t,"value").getOrThunk(function(){return Fr("generated-menu-item")});return Xo({value:n},t)}(n),s=(o=l,Tt(e=c,"getSubmenuItems")?(i=o,u=(r=e).getSubmenuItems(),a=RS(u,i),{item:r,menus:Xo(a.menus,cr(r.value,a.items)),expansions:Xo(a.expansions,cr(r.value,r.value))}):{item:e,menus:{},expansions:{}});return{menus:Xo(t.menus,s.menus),items:[s.item].concat(t.items),expansions:Xo(t.expansions,s.expansions)}},{menus:{},expansions:{},items:[]})},VS=rt([To("field1Name","field1"),To("field2Name","field2"),$u("onLockedChange"),Yu(["lockClass"]),To("locked",!1),Ef("coupledFieldBehaviours",[ud,Tf])]),PS=rt([K0("field1","field2"),K0("field2","field1"),qf({factory:sp,schema:[fo("dom")],name:"lock",overrides:function(t){return{buttonBehaviours:tc([zg.config({selected:t.locked,toggleClass:t.markers.lockClass,aria:{mode:"pressed"}})])}}})]),HS=Sl({name:"FormCoupledInputs",configFields:VS(),partFields:PS(),factory:function(o,t,n,e){return{uid:o.uid,dom:o.dom,components:t,behaviours:Df(o.coupledFieldBehaviours,[ud.config({find:vt.some}),Tf.config({store:{mode:"manual",getValue:function(t){var n=hl(t,o,["field1","field2"]),e={};return e[o.field1Name]=Tf.getValue(n.field1()),e[o.field2Name]=Tf.getValue(n.field2()),e},setValue:function(t,n){var e=hl(t,o,["field1","field2"]);nt(n,o.field1Name)&&Tf.setValue(e.field1(),n[o.field1Name]),nt(n,o.field2Name)&&Tf.setValue(e.field2(),n[o.field2Name])}}})]),apis:{getField1:function(t){return fl(t,o,"field1")},getField2:function(t){return fl(t,o,"field2")},getLock:function(t){return fl(t,o,"lock")}}}},apis:{getField1:function(t,n){return t.getField1(n)},getField2:function(t,n){return t.getField2(n)},getLock:function(t,n){return t.getLock(n)}}}),zS={undo:rt(Fr("undo")),redo:rt(Fr("redo")),zoom:rt(Fr("zoom")),back:rt(Fr("back")),apply:rt(Fr("apply")),swap:rt(Fr("swap")),transform:rt(Fr("transform")),tempTransform:rt(Fr("temp-transform")),transformApply:rt(Fr("transform-apply"))},NS=rt("save-state"),LS=rt("disable"),WS=rt("enable"),US={formActionEvent:by,saveState:NS,disable:LS,enable:WS},jS=tinymce.util.Tools.resolve("tinymce.geom.Rect"),GS=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),XS=tinymce.util.Tools.resolve("tinymce.util.Observable"),YS=tinymce.util.Tools.resolve("tinymce.util.VK");function qS(t,d){function m(t){if(nw(t),t.button!==p)return x(t);t.deltaX=t.screenX-h,t.deltaY=t.screenY-v,t.preventDefault(),d.drag(t)}var g,p,h,v,b=d.document||document,y=b.getElementById(d.handle||t),x=function(t){nw(t),GS(b).off("mousemove touchmove",m).off("mouseup touchend",x),g.remove(),d.stop&&d.stop(t)};return GS(y).on("mousedown touchstart",function(t){var n,e,o,r,i,u,a,c,s,l=(n=Math.max,e=b.documentElement,o=b.body,r=n(e.scrollWidth,o.scrollWidth),i=n(e.clientWidth,o.clientWidth),u=n(e.offsetWidth,o.offsetWidth),a=n(e.scrollHeight,o.scrollHeight),c=n(e.clientHeight,o.clientHeight),{width:r<u?i:r,height:a<n(e.offsetHeight,o.offsetHeight)?c:a});nw(t),t.preventDefault(),p=t.button;var f=y;h=t.screenX,v=t.screenY,s=window.getComputedStyle?window.getComputedStyle(f,null).getPropertyValue("cursor"):f.runtimeStyle.cursor,g=GS("<div></div>").css({position:"absolute",top:0,left:0,width:l.width,height:l.height,zIndex:2147483647,opacity:1e-4,cursor:s}).appendTo(b.body),GS(b).on("mousemove touchmove",m).on("mouseup touchend",x),d.start(t)}),{destroy:function(){GS(y).off()}}}function KS(t,n,e,o,r){return j0({name:t,icon:vt.some(n),disabled:e,tooltip:vt.some(t),primary:!1,borderless:!1},o,r)}function JS(t,n){n?dd.enable(t):dd.disable(t)}var $S=0,QS=function(s,e,l,o,r){function f(t,n){return{x:n.x-t.x,y:n.y-t.y,w:n.w,h:n.h}}function u(t,n,e,o){var r,i=n.x,u=n.y,a=n.w,c=n.h;i+=e*t.deltaX,u+=o*t.deltaY,a+=e*t.deltaW,c+=o*t.deltaH,s=jS.clamp({x:i,y:u,w:a=a<20?20:a,h:c=c<20?20:c},l,"move"===t.name),r=f(l,s),p.fire("updateRect",{rect:r}),g(r)}function i(t){n(s=t)}function n(n){function t(t,n){n.h<0&&(n.h=0),n.w<0&&(n.w=0),GS("#"+c+"-"+t,o).css({left:n.x,top:n.y,width:n.w,height:n.h})}aS.each(d,function(t){GS("#"+c+"-"+t.name,o).css({left:n.w*t.xMul+n.x,top:n.h*t.yMul+n.y})}),t("top",{x:e.x,y:e.y,w:e.w,h:n.y-e.y}),t("right",{x:n.x+n.w,y:n.y,w:e.w-n.x-n.w+e.x,h:n.h}),t("bottom",{x:e.x,y:n.y+n.h,w:e.w,h:e.h-n.y-n.h+e.y}),t("left",{x:e.x,y:n.y,w:n.x-e.x,h:n.h}),t("move",n)}var t,a="tox-",c="tox-crid-"+$S++,d=[{name:"move",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:0,deltaH:0,label:"Crop Mask"},{name:"nw",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:-1,deltaH:-1,label:"Top Left Crop Handle"},{name:"ne",xMul:1,yMul:0,deltaX:0,deltaY:1,deltaW:1,deltaH:-1,label:"Top Right Crop Handle"},{name:"sw",xMul:0,yMul:1,deltaX:1,deltaY:0,deltaW:-1,deltaH:1,label:"Bottom Left Crop Handle"},{name:"se",xMul:1,yMul:1,deltaX:0,deltaY:0,deltaW:1,deltaH:1,label:"Bottom Right Crop Handle"}],m=["top","right","bottom","left"],g=function(t){var n;i((n=l,{x:t.x+n.x,y:t.y+n.y,w:t.w,h:t.h}))};GS('<div id="'+c+'" class="'+a+'croprect-container" role="grid" aria-dropeffect="execute">').appendTo(o),aS.each(m,function(t){GS("#"+c,o).append('<div id="'+c+"-"+t+'"class="'+a+'croprect-block" style="display: none" data-mce-bogus="all">')}),aS.each(d,function(t){GS("#"+c,o).append('<div id="'+c+"-"+t.name+'" class="'+a+"croprect-handle "+a+"croprect-handle-"+t.name+'"style="display: none" data-mce-bogus="all" role="gridcell" tabindex="-1" aria-label="'+t.label+'" aria-grabbed="false" title="'+t.label+'">')}),t=aS.map(d,function(n){var e;return qS(c,{document:o.ownerDocument,handle:c+"-"+n.name,start:function(){e=s},drag:function(t){u(n,e,t.deltaX,t.deltaY)}})}),n(s),GS(o).on("focusin focusout",function(t){GS(t.target).attr("aria-grabbed","focus"===t.type?"true":"false")}),GS(o).on("keydown",function(n){var i;function t(t,n,e,o,r){t.stopPropagation(),t.preventDefault(),u(i,e,o,r)}switch(aS.each(d,function(t){if(n.target.id===c+"-"+t.name)return i=t,!1}),n.keyCode){case YS.LEFT:t(n,0,s,-10,0);break;case YS.RIGHT:t(n,0,s,10,0);break;case YS.UP:t(n,0,s,0,-10);break;case YS.DOWN:t(n,0,s,0,10);break;case YS.ENTER:case YS.SPACEBAR:n.preventDefault(),r()}});var p=aS.extend({toggleVisibility:function(t){var n=aS.map(d,function(t){return"#"+c+"-"+t.name}).concat(aS.map(m,function(t){return"#"+c+"-"+t})).join(",");t?GS(n,o).show():GS(n,o).hide()},setClampRect:function(t){l=t,n(s)},setRect:i,getInnerRect:function(){return f(l,s)},setInnerRect:g,setViewPortRect:function(t){e=t,n(s)},destroy:function(){aS.each(t,function(t){t.destroy()}),t=[]}},XS);return p};function ZS(t){var e,o,n,r,i=Vo(t),u=dc(),a=(o=-1,{data:e=[],add:function(t){var n=e.splice(++o);return e.push(t),{state:t,removed:n}},undo:function(){if(n())return e[--o]},redo:function(){if(r())return e[++o]},canUndo:n=function(){return 0<o},canRedo:r=function(){return-1!==o&&o<e.length-1}});function c(t){i.set(t)}function s(t){URL.revokeObjectURL(t.url)}function l(t){var n=f(t);c(n);var e=a.add(n).removed;return aS.each(e,s),n.url}a.add(t);function f(t){return{blob:t,url:URL.createObjectURL(t)}}function d(){u.on(s),u.clear()}return{getBlobState:function(){return i.get()},setBlobState:c,addBlobState:l,getTempState:function(){return u.get().getOrThunk(i.get)},updateTempState:function(t){var n=f(t);return d(),u.set(n),n.url},addTempState:function(t){var n=f(t);return u.set(n),n.url},applyTempState:function(n){return u.get().fold(st,function(t){l(t.blob),n()})},destroyTempState:d,undo:function(){var t=a.undo();return c(t),t.url},redo:function(){var t=a.redo();return c(t),t.url},getHistoryStates:function(){return{undoEnabled:a.canUndo(),redoEnabled:a.canRedo()}}}}function tC(t,n){function i(t){var n=b.getHistoryStates();S.updateButtonUndoStates(t,n.undoEnabled,n.redoEnabled),vr(t,US.formActionEvent,{name:US.saveState(),value:n.undoEnabled})}function u(t){return t.toBlob()}function a(t){vr(t,US.formActionEvent,{name:US.disable(),value:{}})}function c(n,t,e,o,r){a(n),y0(t).then(e).then(u).then(o).then(function(t){return x(n,t)}).then(function(){i(n),r(),y(n)}).catch(function(t){console.log(t),n.getSystem().isConnected()&&y(n)})}function r(t,n,e){c(t,b.getBlobState().blob,n,function(t){return b.updateTempState(t)},e)}function s(t){var n=b.getBlobState().url;return b.destroyTempState(),i(t),n}var e,o,l,f,d,m,g,p,h,v,b=ZS(t.currentState),y=function(t){C.getApplyButton(t).each(function(t){dd.enable(t)}),vr(t,US.formActionEvent,{name:US.enable(),value:{}})},x=function(t,n){return a(t),w.updateSrc(t,n)},w=(f=t.currentState.url,d=Pm({dom:{tag:"div",classes:["tox-image-tools__image-bg"],attributes:{role:"presentation"}}}),m=Vo(1),g=dc(),p=Vo({x:0,y:0,w:1,h:1}),h=Vo({x:0,y:0,w:1,h:1}),{memContainer:v=Pm(uy.sketch({dom:{tag:"div",classes:["tox-image-tools__image"]},components:[d.asSpec(),{dom:{tag:"img",attributes:{src:f}}},{dom:{tag:"div"},behaviours:tc([fm("image-panel-crop-events",[eu(function(t){v.getOpt(t).each(function(t){var n=t.element.dom,e=QS({x:10,y:10,w:100,h:100},{x:0,y:0,w:200,h:200},{x:0,y:0,w:200,h:200},n,st);e.toggleVisibility(!1),e.on("updateRect",function(t){var n=t.rect,e=m.get(),o={x:Math.round(n.x/e),y:Math.round(n.y/e),w:Math.round(n.w/e),h:Math.round(n.h/e)};p.set(o)}),g.set(e)})})])])}],containerBehaviours:tc([Fg.config({}),fm("image-panel-events",[eu(function(t){O(t,f)})])])})),updateSrc:O,zoom:function(t,n){var e=m.get(),o=0<n?Math.min(2,e+.1):Math.max(.1,e-.1);m.set(o),v.getOpt(t).each(function(t){var n=t.components()[1].element;k(t,n)})},showCrop:function(){g.on(function(t){t.toggleVisibility(!0)})},hideCrop:function(){g.on(function(t){t.toggleVisibility(!1)})},getRect:function(){return p.get()},getMeasurements:function(){var t=h.get();return{width:t.w,height:t.h}}}),S=(o=Pm(KS("Undo","undo",!0,function(t){vr(t,zS.undo(),{direction:1})},e=n)),l=Pm(KS("Redo","redo",!0,function(t){vr(t,zS.redo(),{direction:1})},e)),{container:uy.sketch({dom:{tag:"div",classes:["tox-image-tools__toolbar","tox-image-tools__sidebar"]},components:[o.asSpec(),l.asSpec(),KS("Zoom in","zoom-in",!1,function(t){vr(t,zS.zoom(),{direction:1})},e),KS("Zoom out","zoom-out",!1,function(t){vr(t,zS.zoom(),{direction:-1})},e)]}),updateButtonUndoStates:function(t,n,e){o.getOpt(t).each(function(t){JS(t,n)}),l.getOpt(t).each(function(t){JS(t,e)})}}),C=tw(w,n);function k(t,s){v.getOpt(t).each(function(t){var e=m.get(),o=kn(t.element),r=xn(t.element),i=s.dom.naturalWidth*e,u=s.dom.naturalHeight*e,a=Math.max(0,o/2-i/2),c=Math.max(0,r/2-u/2),n={left:a.toString()+"px",top:c.toString()+"px",width:i.toString()+"px",height:u.toString()+"px",position:"absolute"};dn(s,n),d.getOpt(t).each(function(t){dn(t.element,n)}),g.on(function(t){var n=p.get();t.setRect({x:n.x*e+a,y:n.y*e+c,w:n.w*e,h:n.h*e}),t.setClampRect({x:a,y:c,w:i,h:u}),t.setViewPortRect({x:0,y:0,w:o,h:r})})})}function O(t,n){var e,i=At.fromTag("img");return on(i,"src",n),e=i.dom,new Bp(function(t){var n=function(){e.removeEventListener("load",n),t(e)};e.complete?t(e):e.addEventListener("load",n)}).then(function(){t.getSystem().isConnected()&&v.getOpt(t).map(function(t){var n=ku({element:i});Fg.replaceAt(t,1,vt.some(n));var e=h.get(),o={x:0,y:0,w:i.dom.naturalWidth,h:i.dom.naturalHeight};h.set(o);var u,r=jS.inflate(o,-20,-20);p.set(r),e.w===o.w&&e.h===o.h||(u=i,v.getOpt(t).each(function(t){var n=kn(t.element),e=xn(t.element),o=u.dom.naturalWidth,r=u.dom.naturalHeight,i=Math.min(n/o,e/r);1<=i?m.set(1):m.set(i)})),k(t,i)})})}return{dom:{tag:"div",attributes:{role:"presentation"}},components:[C.memContainer.asSpec(),w.memContainer.asSpec(),S.container],behaviours:tc([Tf.config({store:{mode:"manual",getValue:function(){return b.getBlobState()}}}),fm("image-tools-events",[Cr(zS.undo(),function(n,t){var e=b.undo();x(n,e).then(function(t){y(n),i(n)})}),Cr(zS.redo(),function(n,t){var e=b.redo();x(n,e).then(function(t){y(n),i(n)})}),Cr(zS.zoom(),function(t,n){var e=n.event.direction;w.zoom(t,e)}),Cr(zS.back(),function(t,n){var e,o=s(e=t);x(e,o).then(function(t){y(e)}),(0,n.event.swap)(),w.hideCrop()}),Cr(zS.apply(),function(t,n){b.applyTempState(function(){s(t),(0,n.event.swap)()})}),Cr(zS.transform(),function(t,n){return r(t,n.event.transform,st)}),Cr(zS.tempTransform(),function(t,n){var e=n.event.transform;c(t,b.getTempState().blob,e,function(t){return b.addTempState(t)},st)}),Cr(zS.transformApply(),function(t,n){var e=t,o=n.event.transform,r=n.event.swap,i=b.getBlobState().blob;c(e,i,o,function(t){var n=b.addBlobState(t);return s(e),n},r)}),Cr(zS.swap(),function(n,t){S.updateButtonUndoStates(n,!1,!1);var e=t.event.transform,o=t.event.swap;e.fold(function(){o()},function(t){r(n,t,o)})})]),ow()])}}function nC(t){return!Tt(t,"items")}function eC(t,n){function e(t){return{dom:{tag:"td",innerHtml:n.translate(t)}}}return{dom:{tag:"table",classes:["tox-dialog__table"]},components:[{dom:{tag:"thead"},components:[{dom:{tag:"tr"},components:M(t.header,function(t){return{dom:{tag:"th",innerHtml:n.translate(t)}}})}]},{dom:{tag:"tbody"},components:M(t.cells,function(t){return{dom:{tag:"tr"},components:M(t,e)}})}],behaviours:tc([fy.config({}),Vg.config({})])}}function oC(e,n){var t=e.label.map(function(t){return Zb(t,n)}),o=[dd.config({disabled:function(){return e.disabled||n.isDisabled()}}),mv(),Mg.config({mode:"execution",useEnter:!0!==e.multiline,useControlEnter:!0===e.multiline,execute:function(t){return hr(t,yy),vt.some(!0)}}),fm("textfield-change",[Cr(wi(),function(t,n){vr(t,py,{name:e.name})}),Cr(Mi(),function(t,n){vr(t,py,{name:e.name})})]),fy.config({})],r=e.validation.map(function(o){return Gy.config({getRoot:function(t){return Yt(t.element)},invalidClass:"tox-invalid",validator:{validate:function(t){var n=Tf.getValue(t),e=o.validator(n);return Ly(!0===e?Re.value(n):Re.error(e))},validateOnLoad:o.validateOnLoad}})}).toArray(),i=e.placeholder.fold(rt({}),function(t){return{placeholder:n.translate(t)}}),u=e.inputMode.fold(rt({}),function(t){return{inputmode:t}}),a=lt(lt({},i),u);return Qb(t,sy.parts.field({tag:!0===e.multiline?"textarea":"input",inputAttributes:a,inputClasses:[e.classname],inputBehaviours:tc(ft([o,r])),selectOnFocus:!1,factory:Oy}),(e.flex?["tox-form__group--stretched"]:[]).concat(e.maximized?["tox-form-group--maximize"]:[]),[dd.config({disabled:function(){return e.disabled||n.isDisabled()},onDisabled:function(t){sy.getField(t).each(dd.disable)},onEnabled:function(t){sy.getField(t).each(dd.enable)}}),mv()])}function rC(t){var n=Vo(null);return xu({readState:function(){return{timer:null!==n.get()?"set":"unset"}},setTimer:function(t){n.set(t)},cancel:function(){var t=n.get();null!==t&&t.cancel()}})}function iC(t,n,e){var o=Tf.getValue(e);Tf.setValue(n,o),u1(n)}function uC(t,n){var e=t.element,o=$r(e),r=e.dom;"number"!==rn(e,"type")&&n(r,o)}function aC(t){return{type:"menuitem",value:t.url,text:t.title,meta:{attach:t.attach},onAction:st}}function cC(t,n){return{type:"menuitem",value:n,text:t,meta:{attach:void 0},onAction:st}}function sC(t,n){return e=t,M(F(n,function(t){return t.type===e}),aC);var e}function lC(t,n){var e=t.toLowerCase();return F(n,function(t){return ut((void 0!==t.meta&&void 0!==t.meta.text?t.meta:t).text.toLowerCase(),e)||ut(t.value.toLowerCase(),e)})}function fC(u,a,c){function r(t){var n=Tf.getValue(t);c.addToHistory(n.value,u.filetype)}var t,n,e,o,i=a.shared.providers,s=sy.parts.field({factory:l1,dismissOnBlur:!0,inputClasses:["tox-textfield"],sandboxClasses:["tox-dialog__popups"],inputAttributes:{"aria-errormessage":g1,type:"url"},minChars:0,responseTime:0,fetch:function(t){var e,o,n,r,i=z0((e=u.filetype,o=c,n=Tf.getValue(t),r=void 0!==n.meta.text?n.meta.text:n.value,o.getLinkInformation().fold(function(){return[]},function(t){var n=lC(r,M(o.getHistory(e),function(t){return cC(t,t)}));return"file"===e?R([n,lC(r,sC("header",t.targets)),lC(r,ft([vt.from(t.anchorTop).map(function(t){return cC("<top>",t)}).toArray(),sC("anchor",t.targets),vt.from(t.anchorBottom).map(function(t){return cC("<bottom>",t)}).toArray()]))],function(t,n){return 0===t.length||0===n.length?t.concat(n):t.concat(m1,n)},[]):n})),xh.BUBBLE_TO_SANDBOX,a,!1);return Ly(i)},getHotspot:function(t){return p.getOpt(t)},onSetValue:function(t,n){t.hasConfigured(Gy)&&Gy.run(t).get(st)},typeaheadBehaviours:tc(ft([c.getValidationHandler().map(function(e){return Gy.config({getRoot:function(t){return Yt(t.element)},invalidClass:"tox-control-wrap--status-invalid",notify:{onInvalid:function(t,n){f.getOpt(t).each(function(t){on(t.element,"title",i.translate(n))})}},validator:{validate:function(t){var n=Tf.getValue(t);return d1(function(o){e({type:u.filetype,url:n.value},function(t){var n,e;"invalid"===t.status?(n=Re.error(t.message),o(n)):(e=Re.value(t.message),o(e))})})},validateOnLoad:!1}})}).toArray(),[dd.config({disabled:function(){return u.disabled||i.isDisabled()}}),fy.config({}),fm("urlinput-events",ft(["file"===u.filetype?[Cr(wi(),function(t){vr(t,py,{name:u.name})})]:[],[Cr(Si(),function(t){vr(t,py,{name:u.name}),r(t)}),Cr(Mi(),function(t){vr(t,py,{name:u.name}),r(t)})]]))]])),eventOrder:((t={})[wi()]=["streaming","urlinput-events","invalidating"],t),model:{getDisplayText:function(t){return t.value},selectsOver:!1,populateFromBrowse:!1},markers:{openClass:"tox-textfield--popup-open"},lazySink:a.shared.getSink,parts:{menu:$p(0,0,"normal")},onExecute:function(t,n,e){vr(n,yy,{})},onItemExecute:function(t,n,e,o){r(t),vr(t,py,{name:u.name})}}),l=u.label.map(function(t){return Zb(t,i)}),f=Pm((n="invalid",e=vt.some(g1),jm("warning",{tag:"div",classes:["tox-icon","tox-control-wrap__status-icon-"+n],attributes:lt({title:i.translate(o=void 0===o?n:o),"aria-live":"polite"},e.fold(function(){return{}},function(t){return{id:t}}))},i.icons))),d=Pm({dom:{tag:"div",classes:["tox-control-wrap__status-icon-wrap"]},components:[f.asSpec()]}),m=c.getUrlPicker(u.filetype),g=Fr("browser.url.event"),p=Pm({dom:{tag:"div",classes:["tox-control-wrap"]},components:[s,d.asSpec()],behaviours:tc([dd.config({disabled:function(){return u.disabled||i.isDisabled()}})])}),h=Pm(X0({name:u.name,icon:vt.some("browse"),text:u.label.getOr(""),disabled:u.disabled,primary:!1,borderless:!0},function(t){return hr(t,g)},i,[],["tox-browse-url"]));return sy.sketch({dom:gy([]),components:l.toArray().concat([{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:ft([[p.asSpec()],m.map(function(){return h.asSpec()}).toArray()])}]),fieldBehaviours:tc([dd.config({disabled:function(){return u.disabled||i.isDisabled()},onDisabled:function(t){sy.getField(t).each(dd.disable),h.getOpt(t).each(dd.disable)},onEnabled:function(t){sy.getField(t).each(dd.enable),h.getOpt(t).each(dd.enable)}}),mv(),fm("url-input-events",[Cr(g,function(o){ud.getCurrent(o).each(function(n){var t=Tf.getValue(n),e=lt({fieldname:u.name},t);m.each(function(t){t(e).get(function(t){Tf.setValue(n,t),vr(o,py,{name:u.name})})})})})])])})}function dC(r){return function(n,e,o){return tt(e,"name").fold(function(){return r(e,o)},function(t){return n.field(t,r(e,o))})}}function mC(n,t,e){var o=Xo(e,{shared:{interpreter:function(t){return v1(n,t,o)}}});return v1(n,t,o)}function gC(t,n,e){function o(){return At.fromDom(t.getContentAreaContainer())}function r(){return p||!e()}var i,u,a,c,s,l,f,d,m,g,p=av(t);return{inlineDialog:(f=o,d=n,m=r,g={maxHeightFunction:Ic()},function(){return m()?{type:"node",root:tn(f()),node:vt.from(f()),bubble:xc(12,12,b1),layouts:{onRtl:function(){return[Bm]},onLtr:function(){return[Dm]}},overrides:g}:{type:"hotspot",hotspot:d(),bubble:xc(-12,12,b1),layouts:{onRtl:function(){return[Ga]},onLtr:function(){return[Xa]}},overrides:g}}),banner:(c=o,s=n,l=r,function(){return l()?{type:"node",root:tn(c()),node:vt.from(c()),layouts:{onRtl:function(){return[up]},onLtr:function(){return[up]}}}:{type:"hotspot",hotspot:s(),layouts:{onRtl:function(){return[Ja]},onLtr:function(){return[Ja]}}}}),cursor:(u=t,function(){return{type:"selection",root:a(),getSelection:function(){var t=u.selection.getRng();return vt.some(fs.range(At.fromDom(t.startContainer),t.startOffset,At.fromDom(t.endContainer),t.endOffset))}}}),node:(i=a=function(){return At.fromDom(t.getBody())},function(t){return{type:"node",root:i(),node:t}})}}function pC(i){return vt.from(i.getParam("style_formats")).filter(c).map(function(t){var n,e,o=(n=i,e=x1(t),n.formatter?r(e.customFormats):n.on("init",function(){r(e.customFormats)}),e.formats);function r(t){St(t,function(t){n.formatter.has(t.name)||n.formatter.register(t.name,t.format)})}return i.getParam("style_formats_merge",!1,"boolean")?y1.concat(o):o}).getOr(y1)}function hC(t,n,e){var o={type:"formatter",isSelected:n(t.format),getStylePreview:e(t.format)};return Xo(t,o)}function vC(c,t,s,l){var f=function(t){return M(t,function(t){var n,e,o,r,i,u=kt(t);if(nt(t,"items")){var a=f(t.items);return Xo(Xo(t,{type:"submenu"}),{getStyleItems:rt(a)})}return nt(t,"format")?hC(t,s,l):1===u.length&&wt(u,"title")?Xo(t,{type:"separator"}):(r={type:"formatter",format:o="custom-"+(e=y((n=t).name)?n.name:Fr(n.title)),isSelected:s(o),getStylePreview:l(o)},i=Xo(n,r),c.formatter.register(e,i),i)})};return f(t)}function bC(e){return function(t){if(d(n=t)&&1===n.nodeType){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}var n;return!1}}function yC(t,n,e,o,r){return{type:t,title:n,url:e,level:o,attach:r}}function xC(t){return t.innerText||t.textContent}function wC(t){return t&&"A"===t.nodeName&&void 0!==(t.id||t.name)&&Yk(t)}function SC(t){return t&&/^(H[1-6])$/.test(t.nodeName)}function CC(t){return SC(t)&&Yk(t)}function kC(t){var n,e=t.id||Fr("h");return yC("header",xC(t),"#"+e,SC(n=t)?parseInt(n.nodeName.substr(1),10):0,function(){t.id=e})}function OC(t){var n=t.id||t.name;return yC("anchor",xC(t)||"#"+n,"#"+n,0,st)}function _C(t){return 0<w1(t.title).length}function TC(t){return y(t)&&/^https?/.test(t)}function EC(t){return x(t)&&Q(t,function(t){return!(c(n=t)&&n.length<=5&&N(n,TC));var n}).isNone()}function DC(){var t,n=lb.getItem(O1);if(null===n)return{};try{t=JSON.parse(n)}catch(t){if(t instanceof SyntaxError)return console.log("Local storage "+O1+" was not valid JSON",t),{};throw t}return EC(t)?t:(console.log("Local storage "+O1+" was not valid format",t),{})}function BC(t){return tt(DC(),t).getOr([])}function MC(n,t){var e,o;TC(n)&&(o=F(tt(e=DC(),t).getOr([]),function(t){return t!==n}),e[t]=[n].concat(o).slice(0,5),function(t){if(!EC(t))throw new Error("Bad format for history:\n"+JSON.stringify(t));lb.setItem(O1,JSON.stringify(t))}(e))}function AC(t){return!!t}function FC(t){return dt(aS.makeMap(t,/[, ]/),AC)}function IC(t){return vt.from(t.getParam("file_picker_callback")).filter(m)}function RC(t){return vt.from(t).filter(y).getOrUndefined()}function VC(l){return{getHistory:BC,addToHistory:MC,getLinkInformation:function(){return!1===(t=l).getParam("typeahead_urls")?vt.none():vt.some({targets:k1(t.getBody()),anchorTop:RC(t.getParam("anchor_top","#top")),anchorBottom:RC(t.getParam("anchor_bottom","#bottom"))});var t},getValidationHandler:function(){return vt.from(void 0===(n=(t=l).getParam("file_picker_validator_handler",void 0,"function"))?t.getParam("filepicker_validator_handler",void 0,"function"):n);var t,n},getUrlPicker:function(t){return n=c=l,e=s=t,r=vt.some((o=n).getParam("file_picker_types")).filter(AC),i=vt.some(o.getParam("file_browser_callback_types")).filter(AC),u=r.or(i).map(FC),a=IC(o).fold(O,function(t){return u.fold(_,function(t){return 0<kt(t).length&&t})}),(w(a)?a?IC(n):vt.none():a[e]?IC(n):vt.none()).map(function(o){return function(n){return Ny(function(e){var t=lt({filetype:s,fieldname:n.fieldname},vt.from(n.meta).getOr({}));o.call(c,function(t,n){if(!y(t))throw new Error("Expected value to be string");if(void 0!==n&&!x(n))throw new Error("Expected meta to be a object");e({value:t,meta:n})},n.value,t)})}});var n,e,o,r,i,u,a,c,s}}}function PC(t,n,e){var o,r,i,u,a,c,s,l,f,d,m,g,p,h=Vo(!1),v={isPositionedAtTop:function(){return"top"===o.get()},getDockingMode:(o=Vo(iv(n)?"bottom":"top")).get,setDockingMode:o.set},b={shared:{providers:{icons:function(){return n.ui.registry.getAll().icons},menuItems:function(){return n.ui.registry.getAll().menuItems},translate:lp.translate,isDisabled:function(){return n.mode.isReadOnly()||n.ui.isDisabled()},getSetting:n.getParam.bind(n)},interpreter:function(t){return v1(h1,t,b)},anchors:gC(n,e,v.isPositionedAtTop),header:v,getSink:function(){return Re.value(t)}},urlinput:VC(n),styleselect:(f=Vo([]),d=Vo([]),m=Vo([]),g=Vo([]),p=Vo(!(l=function(t){var n=t.items;return void 0!==n&&0<n.length?z(n,l):[t.format]})),(s=n).on("PreInit",function(t){var n=pC(s),e=vC(s,n,y,x);f.set(e),d.set(z(e,l))}),s.on("addStyleModifications",function(t){var n=vC(s,t.items,y,x);m.set(n),p.set(t.replace),g.set(z(n,l))}),{getData:function(){var t=p.get()?[]:f.get(),n=m.get();return t.concat(n)},getFlattenedKeys:function(){var t=p.get()?[]:d.get(),n=g.get();return t.concat(n)}}),colorinput:{colorPicker:function(t,n){Bb(c)(t,n)},hasCustomColors:function(){return db(a)},getColors:function(){return mb(u)},getColorCols:(i=u=a=c=n,function(){return pb(i)})},dialog:{isDraggableModal:(r=n,function(){return r.getParam("draggable_modal",!1,"boolean")})},isContextMenuOpen:function(){return h.get()},setContextMenuState:function(t){return h.set(t)}};function y(t){return function(){return s.formatter.match(t)}}function x(n){return function(){var t=s.formatter.get(n);return void 0!==t?vt.some({tag:0<t.length&&(t[0].inline||t[0].block)||"div",styles:s.dom.parseStyle(s.formatter.getCssText(n))}):vt.none()}}return b}function HC(t){return(mt(pn(t,"position"),"fixed")?vt.none():qt(t)).orThunk(function(){var e=At.fromTag("span");return Yt(t).bind(function(t){_e(t,e);var n=qt(e);return Te(e),n})})}function zC(t){return HC(t).map(Cn).getOrThunk(function(){return Se(0,0)})}function NC(t,n){var e=t.element;Xr(e,n.transitionClass),Yr(e,n.fadeOutClass),Xr(e,n.fadeInClass),n.onShow(t)}function LC(t,n){var e=t.element;Xr(e,n.transitionClass),Yr(e,n.fadeInClass),Xr(e,n.fadeOutClass),n.onHide(t)}function WC(t,n,e){return N(t,function(t){switch(t){case"bottom":return n.bottom<=e.bottom;case"top":return n.y>=e.y}})}function UC(n,t){return t.getInitialPos().map(function(t){return Be(t.bounds.x,t.bounds.y,kn(n),xn(n))})}function jC(e,o,r){return r.getInitialPos().bind(function(t){switch(r.clearInitialPos(),t.position){case"static":return vt.some(V1.static());case"absolute":var n=HC(e).map(Me).getOrThunk(function(){return Me(ve())});return vt.some(V1.absolute(Ta("absolute",tt(t.style,"left").map(function(t){return o.x-n.x}),tt(t.style,"top").map(function(t){return o.y-n.y}),tt(t.style,"right").map(function(t){return n.right-o.right}),tt(t.style,"bottom").map(function(t){return n.bottom-o.bottom}))));default:return vt.none()}})}function GC(t,n,e){var o,r,i,u=t.element;return mt(pn(u,"position"),"fixed")?(r=n,UC(o=u,i=e).filter(function(t){return WC(i.getModes(),t,r)}).bind(function(t){return jC(o,t,i)})):function(t,n,e){var r,o,i=Me(t);if(WC(e.getModes(),i,n))return vt.none();r=t,o=i,e.setInitialPos({style:function(){var t={},n=r.dom;if(ct(n))for(var e=0;e<n.style.length;e++){var o=n.style.item(e);t[o]=n.style[o]}return t}(),position:gn(r,"position")||"static",bounds:o});var u=Ae(),a=i.x-u.x,c=n.y-u.y,s=u.bottom-n.bottom,l=i.y<=n.y;return vt.some(V1.fixed(Ta("fixed",vt.some(a),l?vt.some(c):vt.none(),vt.none(),l?vt.none():vt.some(s))))}(u,n,e)}function XC(n,t,e){e.setDocked(!1),St(["left","right","top","bottom","position"],function(t){return vn(n.element,t)}),t.onUndocked(n)}function YC(t,n,e,o){var r="fixed"===o.position;e.setDocked(r),Ea(t.element,o),(r?n.onDocked:n.onUndocked)(t)}function qC(o,t,r,i,u){void 0===u&&(u=!1),t.contextual.each(function(e){e.lazyContext(o).each(function(t){var n=t.y<i.bottom&&t.bottom>i.y;n!==r.isVisible()&&(r.setVisible(n),u&&!n?(Kr(o.element,[e.fadeOutClass]),e.onHide(o)):(n?NC:LC)(o,e))})})}function KC(t,n,e){var o,r,i,u,a,c;e.isDocked()&&(r=n,i=e,c=(o=t).element,i.setDocked(!1),UC(a=o.element,u=i).bind(function(t){return jC(a,t,u)}).each(function(t){t.fold(function(){return XC(o,r,i)},function(t){return YC(o,r,i,t)},st)}),i.setVisible(!0),r.contextual.each(function(t){Jr(c,[t.fadeInClass,t.fadeOutClass,t.transitionClass]),t.onShow(o)}),P1(o,r,i))}function JC(t,n){return wt(N1.getModes(t),n)}function $C(r){var i=r.element;Yt(i).each(function(t){var n,e,o="padding-"+N1.getModes(r)[0];N1.isDocked(r)?(n=kn(t),fn(i,"width",n+"px"),fn(t,o,wn(e=i)+(parseInt(gn(e,"margin-top"),10)||0)+(parseInt(gn(e,"margin-bottom"),10)||0)+"px")):(vn(i,"width"),vn(t,o))})}function QC(t,n){n?(Yr(t,W1.fadeOutClass),Kr(t,[W1.transitionClass,W1.fadeInClass])):(Yr(t,W1.fadeInClass),Kr(t,[W1.fadeOutClass,W1.transitionClass]))}function ZC(t,n){var e=At.fromDom(t.getContainer());n?(Xr(e,U1),Yr(e,j1)):(Xr(e,j1),Yr(e,U1))}function tk(u,t){function o(n){r().each(function(t){return n(t.element)})}function n(t){u.inline||$C(t),ZC(u,N1.isDocked(t)),t.getSystem().broadcastOn([bf()],{}),r().each(function(t){return t.getSystem().broadcastOn([bf()],{})})}var e,i=dc(),r=t.getSink,a=u.inline?[]:[rc.config({channels:((e={})[L1()]={onReceive:$C},e)})];return H([Vg.config({}),N1.config({contextual:lt({lazyContext:function(t){var n=wn(t.element),e=u.inline?u.getContentAreaContainer():u.getContainer(),o=Me(At.fromDom(e)),r=o.height-n,i=o.y+(JC(t,"top")?0:n);return vt.some(Be(o.x,i,o.width,r))},onShow:function(){o(function(t){return QC(t,!0)})},onShown:function(r){o(function(t){return Jr(t,[W1.transitionClass,W1.fadeInClass])}),i.get().each(function(t){var n,e=r.element,o=Ut(n=t);ka(o).filter(function(t){return!Lt(n,t)}).filter(function(t){return Lt(t,At.fromDom(o.dom.body))||Wt(e,t)}).each(function(){return Sa(n)}),i.clear()})},onHide:function(t){var n=t.element,e=r;Oa(n).orThunk(function(){return e().toOptional().bind(function(t){return Oa(t.element)})}).fold(i.clear,i.set),o(function(t){return QC(t,!1)})},onHidden:function(){o(function(t){return Jr(t,[W1.transitionClass])})}},W1),lazyViewport:function(t){var n=Ae(),e=u.getParam("toolbar_sticky_offset",0,"number"),o=n.y+(JC(t,"top")?e:0),r=n.height-(JC(t,"bottom")?e:0);return Be(n.x,o,n.width,r)},modes:[t.header.getDockingMode()],onDocked:n,onUndocked:n})],a,!0)}function nk(t){return uo("menubutton",q1,t)}function ek(n,t){return t.getAnimationRoot.fold(function(){return n.element},function(t){return t(n)})}function ok(t){return t.dimension.property}function rk(t,n){return t.dimension.getDimension(n)}function ik(t,n){Jr(ek(t,n),[n.shrinkingClass,n.growingClass])}function uk(t,n){Yr(t.element,n.openClass),Xr(t.element,n.closedClass),fn(t.element,ok(n),"0px"),bn(t.element)}function ak(t,n){Yr(t.element,n.closedClass),Xr(t.element,n.openClass),vn(t.element,ok(n))}function ck(t,n,e,o){e.setCollapsed(),fn(t.element,ok(n),rk(n,t.element)),bn(t.element),ik(t,n),uk(t,n),n.onStartShrink(t),n.onShrunk(t)}function sk(t,n,e){var o=rk(n,t.element);("0px"===o?ck:function(t,n,e,o){var r=o.getOrThunk(function(){return rk(n,t.element)});e.setCollapsed(),fn(t.element,ok(n),r),bn(t.element);var i=ek(t,n);Yr(i,n.growingClass),Xr(i,n.shrinkingClass),uk(t,n),n.onStartShrink(t)})(t,n,e,vt.some(o))}function lk(t,n,e){var o=ek(t,n),r=qr(o,n.shrinkingClass),i=rk(n,t.element);ak(t,n);var u=rk(n,t.element);(r?function(){fn(t.element,ok(n),i),bn(t.element)}:function(){uk(t,n)})(),Yr(o,n.shrinkingClass),Xr(o,n.growingClass),ak(t,n),fn(t.element,ok(n),u),e.setExpanded(),n.onStartGrow(t)}function fk(t,n,e){return!0===qr(ek(t,n),n.growingClass)}function dk(t,n,e){return!0===qr(ek(t,n),n.shrinkingClass)}function mk(t){return"<alloy.field."+t+">"}function gk(t){return{element:function(){return t.element.dom}}}function pk(t,e){ud.getCurrent(t).each(function(t){return Fg.set(t,[(n=e,oO.sketch(function(t){return{dom:{tag:"div",classes:["tox-sidebar__pane-container"]},components:(e=t,r=M(kt(o=n),function(t){var n=o[t],e=ao(uo("sidebar",rO,n));return{name:t,getApi:gk,onSetup:e.onSetup,onShow:e.onShow,onHide:e.onHide}}),M(r,function(t){var n=Vo(st);return e.slot(t.name,{dom:{tag:"div",classes:["tox-sidebar__pane"]},behaviours:Yh([pv(t,n),hv(t,n),Cr(Ki(),function(n,t){var e=t.event;V(r,function(t){return t.name===e.name}).each(function(t){(e.visible?t.onShow:t.onHide)(t.getApi(n))})})])})})),slotBehaviours:Yh([eu(function(t){return oO.hideAllSlots(t)})])};var e,o,r}))]);var n})}function hk(t){return ud.getCurrent(t).bind(function(t){return Z1.isGrowing(t)||Z1.hasGrown(t)?ud.getCurrent(t).bind(function(n){return V(oO.getSlotNames(n),function(t){return oO.isShowing(n,t)})}):vt.none()})}function vk(t){var n=At.fromHtml(t),e=Kt(n),o=R(void 0!==n.dom.attributes?n.dom.attributes:[],function(t,n){var e;return"class"===n.name?t:lt(lt({},t),((e={})[n.name]=n.value,e))},{}),r=Array.prototype.slice.call(n.dom.classList,0),i=0===e.length?{}:{innerHtml:Br(n)};return lt({tag:Ft(n),classes:r,attributes:o},i)}function bk(t){return ud.getCurrent(t).each(function(t){return Sa(t.element)})}function yk(f,d,m){function n(t){var n;!g.get()||"focusin"===(n=t).type&&(n.composed?Y(n.composedPath()):vt.from(n.target)).map(At.fromDom).filter(Gn).exists(function(t){return qr(t,"mce-pastebin")})||(t.preventDefault(),bk(d()),f.editorManager.setActive(f))}var g=Vo(!1),e=dc();function o(t){var n,e,o,r,i,u,a,c,s,l;t!==g.get()&&(g.set(t),n=f,e=d(),o=t,r=m.providers,c=e.element,s=o,l="data-mce-"+(i="tabindex"),vt.from(n.iframeElement).map(At.fromDom).each(function(n){s?(un(n,i).each(function(t){return on(n,l,t)}),on(n,i,-1)):(cn(n,i),un(n,l).each(function(t){on(n,i,t),cn(n,l)}))}),o?(cO.block(e,(a=r,function(t,n){return{dom:{tag:"div",attributes:{"aria-label":a.translate("Loading..."),tabindex:"0"},classes:["tox-throbber__busy-spinner"]},components:[{dom:vk('<div class="tox-spinner"><div></div><div></div><div></div></div>')}]}})),vn(c,"display"),cn(c,"aria-hidden"),n.hasFocus()&&bk(e)):(u=ud.getCurrent(e).exists(function(t){return Ca(t.element)}),cO.unblock(e),fn(c,"display","none"),on(c,"aria-hidden","true"),u&&n.focus()),f.fire("AfterProgressState",{state:t}))}f.inline||f.on("PreInit",function(){f.dom.bind(f.getWin(),"focusin",n),f.on("BeforeExecCommand",function(t){"mcefocus"===t.command.toLowerCase()&&!0!==t.value&&n(t)})}),f.on("ProgressState",function(t){var n;e.on(cp.clearTimeout),u(t.time)?(n=cp.setEditorTimeout(f,function(){return o(t.state)},t.time),e.set(n)):(o(t.state),e.clear())})}function xk(t,n,e){return{within:t,extra:n,withinWidth:e}}function wk(t,n,o){var e,r=(e=function(t,n){var e=o(t);return vt.some({element:t,start:n,finish:n+e,width:e})},R(t,function(n,t){return e(t,n.len).fold(rt(n),function(t){return{len:t.finish,list:n.list.concat([t])}})},{len:0,list:[]}).list),i=F(r,function(t){return t.finish<=n}),u=I(i,function(t,n){return t+n.width},0);return{within:i,extra:r.slice(i.length),withinWidth:u}}function Sk(t){return M(t,function(t){return t.element})}function Ck(t,n){var e=M(n,function(t){return Tu(t)});F1.setGroups(t,e)}function kk(t,n,e){var o,r,i,u,a,c,s,l,f,d,m,g,p,h,v,b,y,x,w,S,C=n.builtGroups.get();0!==C.length&&(o=dl(t,n,"primary"),r=Yy.getCoupled(t,"overflowGroup"),fn(o.element,"visibility","hidden"),u=K(i=C.concat([r]),function(n){return Oa(n.element).bind(function(t){return n.getSystem().getByDom(t).toOptional()})}),e([]),Ck(o,i),a=kn(o.element),0===(s=a,l=n.builtGroups.get(),d=r,y=(0===(m=wk(l,s,f=function(t){return kn(t.element)})).extra.length?vt.some(m):vt.none()).getOrThunk(function(){return wk(l,s-f(d),f)}),x=y.within,w=y.extra,S=y.withinWidth,(c=1===w.length&&w[0].width<=f(d)?(b=S,xk(Sk(x.concat(w)),[],b)):1<=w.length?(p=w,h=d,v=S,xk(Sk(x).concat([h]),Sk(p),v)):(g=S,xk(Sk(x),[],g))).extra.length)?(Fg.remove(o,r),e([])):(Ck(o,c.within),e(c.extra)),vn(o.element,"visibility"),bn(o.element),u.each(Vg.focus))}function Ok(t,n){var e=Yy.getCoupled(t,"toolbarSandbox");hf.isOpen(e)?hf.close(e):hf.open(e,n.toolbar())}function _k(t,n,e,o){var r=e.getBounds.map(function(t){return t()}),i=e.lazySink(t).getOrDie();sf.positionWithinBounds(i,n,{anchor:{type:"hotspot",hotspot:t,layouts:o,overrides:{maxWidthFunction:dO()}}},r)}function Tk(t,n,e,o,r){F1.setGroups(n,r),_k(t,n,e,o),zg.on(t)}function Ek(t){return M(t,function(t){return Tu(t)})}function Dk(t,e,o){kk(t,o,function(n){o.overflowGroups.set(n),e.getOpt(t).each(function(t){pO.setGroups(t,Ek(n))})})}function Bk(n,e){fl(n,e,"overflow-button").bind(function(){return fl(n,e,"overflow")}).each(function(t){Kk(n,e),Z1.toggleGrow(t)})}function Mk(t){var n=t.title.fold(function(){return{}},function(t){return{attributes:{title:t}}});return{dom:lt({tag:"div",classes:["tox-toolbar__group"]},n),components:[bO.parts.items({})],items:t.items,markers:{itemSelector:"*:not(.tox-split-button) > .tox-tbtn:not([disabled]), .tox-split-button:not([disabled]), .tox-toolbar-nav-js:not([disabled])"},tgroupBehaviours:tc([fy.config({}),Vg.config({})])}}function Ak(t){return bO.sketch(Mk(t))}function Fk(e,t){var n=eu(function(t){var n=M(e.initGroups,Ak);F1.setGroups(t,n)});return tc([Jv(e.providers.isDisabled),mv(),Mg.config({mode:t,onEscape:e.onEscape,selector:".tox-toolbar__group"}),fm("toolbar-events",[n])])}function Ik(t){var n=t.cyclicKeying?"cyclic":"acyclic";return{uid:t.uid,dom:{tag:"div",classes:["tox-toolbar-overlord"]},parts:{"overflow-group":Mk({title:vt.none(),items:[]}),"overflow-button":U0({name:"more",icon:vt.some("more-drawer"),disabled:!1,tooltip:vt.some("More..."),primary:!1,borderless:!1},vt.none(),t.providers)},splitToolbarBehaviours:Fk(t,n)}}function Rk(t){var n=t.cyclicKeying?"cyclic":"acyclic";return F1.sketch({uid:t.uid,dom:{tag:"div",classes:["tox-toolbar"].concat(t.type===hh.scrolling?["tox-toolbar--scrolling"]:[])},components:[F1.parts.groups({})],toolbarBehaviours:Fk(t,n)})}function Vk(t){return"string"==typeof t?t.split(" "):t}function Pk(i,u){var a=lt(lt({},MO),u.menus),e=0<kt(u.menus).length,t=F(void 0===u.menubar||!0===u.menubar?Vk("file edit view insert format tools table help"):Vk(!1===u.menubar?"":u.menubar),function(t){var n=Tt(MO,t);return e?n||tt(u.menus,t).exists(function(t){return Tt(t,"items")}):n});return F(M(t,function(t){var n=a[t],e={title:n.title,items:Vk(n.items)},o=u,r=i.getParam("removed_menuitems","").split(/[ ,]/);return{text:e.title,getItems:function(){return z(e.items,function(t){var n=t.toLowerCase();return 0===n.trim().length||T(r,function(t){return t===n})?[]:"separator"===n||"|"===n?[{type:"separator"}]:o.menuItems[n]?[o.menuItems[n]]:[]})}}}),function(t){return 0<t.getItems().length&&T(t.getItems(),function(t){return"separator"!==t.type})})}function Hk(t){function n(){t._skinLoaded=!0,t.fire("SkinLoaded")}return function(){t.initialized?n():t.on("init",n)}}function zk(e,o,r){return new Bp(function(t,n){r.load(o,t,n),e.on("remove",function(){return r.unload(o)})})}function Nk(t,n){var e,o,r,i,u,a,c,s,l,f=(r=(e=n).getParam("skin"),i=e.getParam("skin_url"),!1!==r&&(o=r||"oxide",i=i?e.documentBaseURI.toAbsolute(i):nv.baseURL+"/skins/ui/"+o),i);f&&n.contentCSS.push(f+(t?"/content.inline":"/content")+".min.css"),!1===n.getParam("skin")==0&&y(f)?Bp.all([zk(n,f+"/skin.min.css",n.ui.styleSheetLoader),(c=n,s=f,l=At.fromDom(c.getElement()),ge(l).isSome()?zk(c,s+"/skin.shadowdom.min.css",tv.DOM.styleSheetLoader):Bp.resolve())]).then(Hk(n),(u=n,a="Skin could not be loaded",function(){return u.fire("SkinLoadError",{message:a})})):Hk(n)()}function Lk(o,r){return function(n){function t(){n.setActive(o.formatter.match(r));var t=o.formatter.formatChanged(r,n.setActive);e.set(t)}var e=fc();return o.initialized?t():o.once("init",t),function(){o.off("init",t),e.clear()}}}function Wk(o,r,i){return function(t){function n(){return i(t)}function e(){i(t),o.on(r,n)}return o.initialized?e():o.once("init",e),function(){o.off("init",e),o.off(r,n)}}}function Uk(n){return function(t){return function(){n.undoManager.transact(function(){n.focus(),n.execCommand("mceToggleFormat",!1,t.format)})}}}function jk(t,n){return function(){return t.execCommand(n)}}function Gk(t,n,e){var u,a,c,o=e.dataset,r="basic"===o.type?function(){return M(o.data,function(t){return hC(t,e.isSelectedFor,e.getPreviewFor)})}:o.getData;return{items:(u=n,a=e,c=function(t,n,e){var o="formatter"===t.type&&a.isInvalid(t);return 0===n?o?[]:i(t,n,!1,e).toArray():i(t,n,o,e).toArray()},{validateItems:s,getFetch:function(e,o){return function(t,n){n(z0(s(o()),xh.CLOSE_ON_EXECUTE,e,!1))}}}),getStyleItems:r};function i(t,n,e,o){var r=u.shared.providers.translate(t.title);if("separator"===t.type)return vt.some({type:"separator",text:r});if("submenu"!==t.type)return vt.some(lt({type:"togglemenuitem",text:r,icon:t.icon,active:t.isSelected(o),disabled:e,onAction:a.onAction(t)},t.getStylePreview().fold(function(){return{}},function(t){return{meta:{style:t}}})));var i=z(t.getStyleItems(),function(t){return c(t,n,o)});return 0===n&&i.length<=0?vt.none():vt.some({type:"nestedmenuitem",text:r,disabled:i.length<=0,getSubmenuItems:function(){return z(t.getStyleItems(),function(t){return c(t,n,o)})}})}function s(t){var n=a.getCurrentValue(),e=a.shouldHide?0:1;return z(t,function(t){return c(t,e,n)})}}function Xk(t,n,e){var o=Gk(0,n,e),r=o.items,i=o.getStyleItems,u=Wk(t,"NodeChange",function(t){var n=t.getComponent();e.updateText(n)});return P0({text:e.icon.isSome()?vt.none():e.text,icon:e.icon,tooltip:vt.from(e.tooltip),role:vt.none(),fetch:r.getFetch(n,i),onSetup:u,getApi:function(t){return{getComponent:rt(t)}},columns:1,presets:"normal",classes:e.icon.isSome()?[]:["bespoke"],dropdownBehaviours:[]},"tox-tbtn",n.shared)}function Yk(t){return function(t){for(;t=t.parentNode;){var n=t.contentEditable;if(n&&"inherit"!==n)return S1(t)}return!1}(t)&&!C1(t)}function qk(r,t){function n(t){return pl(r)}function e(e,o){return function(t,n){return fl(t,r,n).map(function(t){return e(t,n)}).getOr(o)}}function o(t,n){return"true"!==rn(t.element,"aria-hidden")}var i,u=e(o,!1),a=e(function(t,n){var e;o(t)&&(fn(e=t.element,"display","none"),on(e,"aria-hidden","true"),vr(t,Ki(),{name:n,visible:!1}))}),c=(i=a,function(n,t){St(t,function(t){return i(n,t)})}),s=e(function(t,n){var e;o(t)||(vn(e=t.element,"display"),cn(e,"aria-hidden"),vr(t,Ki(),{name:n,visible:!0}))});return{uid:r.uid,dom:r.dom,components:t,behaviours:Qs(r.slotBehaviours),apis:{getSlotNames:n,getSlot:function(t,n){return fl(t,r,n)},isShowing:u,hideSlot:a,hideAllSlots:function(t){return c(t,n())},showSlot:s}}}function Kk(t,n){fl(t,n,"overflow").each(function(e){kk(t,n,function(t){var n=M(t,function(t){return Tu(t)});F1.setGroups(e,n)}),fl(t,n,"overflow-button").each(function(t){Z1.hasGrown(e)&&zg.on(t)}),Z1.refresh(e)})}var Jk,$k,Qk,Zk="data-value",t1=function(n,e,t,o){return M(t,function(t){return nC(t)?{type:"togglemenuitem",text:t.text,value:t.value,active:t.value===o,onAction:function(){Tf.setValue(n,t.value),vr(n,py,{name:e}),Vg.focus(n)}}:{type:"nestedmenuitem",text:t.text,getSubmenuItems:function(){return t1(n,e,t.items,o)}}})},n1=function(t,n){return K(t,function(t){return nC(t)?ot(t.value===n,t):n1(t.items,n)})},e1=wl({name:"HtmlSelect",configFields:[fo("options"),$s("selectBehaviours",[Vg,Tf]),To("selectClasses",[]),To("selectAttributes",{}),xo("data")],factory:function(e,t){var n=M(e.options,function(t){return{dom:{tag:"option",value:t.value,innerHtml:t.text}}}),o=e.data.map(function(t){return cr("initialValue",t)}).getOr({});return{uid:e.uid,dom:{tag:"select",classes:e.selectClasses,attributes:e.selectAttributes},components:n,behaviours:Zs(e.selectBehaviours,[Vg.config({}),Tf.config({store:lt({mode:"manual",getValue:function(t){return $r(t.element)},setValue:function(t,n){V(e.options,function(t){return t.value===n}).isSome()&&Qr(t.element,n)}},o)})])}}}),o1=Object.freeze({__proto__:null,events:function(t,n){var e=t.stream.streams.setup(t,n);return nu([Cr(t.event,e),ou(function(){return n.cancel()})].concat(t.cancelEvent.map(function(t){return[Cr(t,function(){return n.cancel()})]}).getOr([])))}}),r1=Object.freeze({__proto__:null,throttle:rC,init:function(t){return t.stream.streams.state(t)}}),i1=ya({fields:[mo("stream",so("mode",{throttle:[fo("delay"),To("stopEvent",!0),Zu("streams",{setup:function(t,n){var e=t.stream,o=pp(t.onStream,e.delay);return n.setTimer(o),function(t,n){o.throttle(t,n),e.stopEvent&&n.stop()}},state:rC})]})),To("event","input"),xo("cancelEvent"),$u("onStream")],name:"streaming",active:o1,state:r1}),u1=function(t){uC(t,function(t,n){return t.setSelectionRange(n.length,n.length)})},a1=rt("alloy.typeahead.itemexecute"),c1=rt([xo("lazySink"),fo("fetch"),To("minChars",5),To("responseTime",1e3),Ku("onOpen"),To("getHotspot",vt.some),To("getAnchorOverrides",rt({})),To("layouts",vt.none()),To("eventOrder",{}),Ro("model",{},[To("getDisplayText",function(t){return void 0!==t.meta&&void 0!==t.meta.text?t.meta.text:t.value}),To("selectsOver",!0),To("populateFromBrowse",!0)]),Ku("onSetValue"),Ju("onExecute"),Ku("onItemExecute"),To("inputClasses",[]),To("inputAttributes",{}),To("inputStyles",{}),To("matchWidth",!0),To("useMinWidth",!1),To("dismissOnBlur",!0),Yu(["openClass"]),xo("initialData"),$s("typeaheadBehaviours",[Vg,Tf,i1,Mg,zg,Yy]),ar("previewing",function(){return Vo(!0)})].concat(ky()).concat(ex())),s1=rt([Kf({schema:[Xu()],name:"menu",overrides:function(o){return{fakeFocus:!0,onHighlight:function(n,e){o.previewing.get()?n.getSystem().getByUid(o.uid).each(function(t){!function(t,n,o){if(t.selectsOver){var e=Tf.getValue(n),r=t.getDisplayText(e),i=Tf.getValue(o);return 0===t.getDisplayText(i).indexOf(r)?vt.some(function(){var e;iC(0,n,o),e=r.length,uC(n,function(t,n){return t.setSelectionRange(e,n.length)})}):vt.none()}return vt.none()}(o.model,t,e).fold(function(){return gd.dehighlight(n,e)},function(t){return t()})}):n.getSystem().getByUid(o.uid).each(function(t){o.model.populateFromBrowse&&iC(o.model,t,e)}),o.previewing.set(!1)},onExecute:function(t,n){return t.getSystem().getByUid(o.uid).toOptional().map(function(t){return vr(t,a1(),{item:n}),!0})},onHover:function(t,n){o.previewing.set(!1),t.getSystem().getByUid(o.uid).each(function(t){o.model.populateFromBrowse&&iC(o.model,t,n)})}}}})]),l1=Sl({name:"Typeahead",configFields:c1(),partFields:s1(),factory:function(r,t,n,i){function e(t,n,e){r.previewing.set(!1);var o=Yy.getCoupled(t,"sandbox");hf.isOpen(o)?ud.getCurrent(o).each(function(t){gd.getHighlighted(t).fold(function(){e(t)},function(){xr(o,t.element,"keydown",n)})}):$y(r,u(t),t,o,i,function(t){ud.getCurrent(t).each(e)},Iy.HighlightFirst).get(st)}function u(e){return function(t){return t.map(function(t){var n=z(Z(t.menus),function(t){return F(t.items,function(t){return"item"===t.type})});return Tf.getState(e).update(M(n,function(t){return t.data})),t})}}var o=ty(r),a=[Vg.config({}),Tf.config({onSetValue:r.onSetValue,store:lt({mode:"dataset",getDataKey:function(t){return $r(t.element)},getFallbackEntry:function(t){return{value:t,meta:{}}},setValue:function(t,n){Qr(t.element,r.model.getDisplayText(n))}},r.initialData.map(function(t){return cr("initialValue",t)}).getOr({}))}),i1.config({stream:{mode:"throttle",delay:r.responseTime,stopEvent:!1},onStream:function(t,n){var e,o=Yy.getCoupled(t,"sandbox");Vg.isFocused(t)&&$r(t.element).length>=r.minChars&&(e=ud.getCurrent(o).bind(function(t){return gd.getHighlighted(t).map(Tf.getValue)}),r.previewing.set(!0),$y(r,u(t),t,o,i,function(t){ud.getCurrent(o).each(function(t){e.fold(function(){r.model.selectsOver&&gd.highlightFirst(t)},function(n){gd.highlightBy(t,function(t){return Tf.getValue(t).value===n.value}),gd.getHighlighted(t).orThunk(function(){return gd.highlightFirst(t),vt.none()})})})},Iy.HighlightFirst).get(st))},cancelEvent:Hi()}),Mg.config({mode:"special",onDown:function(t,n){return e(t,n,gd.highlightFirst),vt.some(!0)},onEscape:function(t){var n=Yy.getCoupled(t,"sandbox");return hf.isOpen(n)?(hf.close(n),vt.some(!0)):vt.none()},onUp:function(t,n){return e(t,n,gd.highlightLast),vt.some(!0)},onEnter:function(n){var t=Yy.getCoupled(n,"sandbox"),e=hf.isOpen(t);if(e&&!r.previewing.get())return ud.getCurrent(t).bind(function(t){return gd.getHighlighted(t)}).map(function(t){return vr(n,a1(),{item:t}),!0});var o=Tf.getValue(n);return hr(n,Hi()),r.onExecute(t,n,o),e&&hf.close(t),vt.some(!0)}}),zg.config({toggleClass:r.markers.openClass,aria:{mode:"expanded"}}),Yy.config({others:{sandbox:function(t){return tx(r,t,{onOpen:function(){return zg.on(t)},onClose:function(){return zg.off(t)}})}}}),fm("typeaheadevents",[iu(function(t){Qy(r,u(t),t,i,st,Iy.HighlightFirst).get(st)}),Cr(a1(),function(t,n){var e=Yy.getCoupled(t,"sandbox");iC(r.model,t,n.event.item),hr(t,Hi()),r.onItemExecute(t,e,n.event.item,Tf.getValue(t)),hf.close(e),u1(t)})].concat(r.dismissOnBlur?[Cr(Bi(),function(t){var n=Yy.getCoupled(t,"sandbox");Oa(n.element).isNone()&&hf.close(n)})]:[]))];return{uid:r.uid,dom:ny(Xo(r,{inputAttributes:{role:"combobox","aria-autocomplete":"list","aria-haspopup":"true"}})),behaviours:lt(lt({},o),Zs(r.typeaheadBehaviours,a)),eventOrder:r.eventOrder}}}),f1=function(i){return lt(lt({},i),{toCached:function(){return f1(i.toCached())},bindFuture:function(n){return f1(i.bind(function(t){return t.fold(function(t){return Ly(Re.error(t))},function(t){return n(t)})}))},bindResult:function(n){return f1(i.map(function(t){return t.bind(n)}))},mapResult:function(n){return f1(i.map(function(t){return t.map(n)}))},mapError:function(n){return f1(i.map(function(t){return t.mapError(n)}))},foldResult:function(n,e){return i.map(function(t){return t.fold(n,e)})},withTimeout:function(t,r){return f1(Ny(function(n){var e=!1,o=setTimeout(function(){e=!0,n(Re.error(r()))},t);i.get(function(t){e||(clearTimeout(o),n(t))})}))}})},d1=function(t){return f1(Ny(t))},m1={type:"separator"},g1=Fr("aria-invalid"),p1={bar:dC(function(t,n){return e=n.shared,{dom:{tag:"div",classes:["tox-bar","tox-form__controls-h-stack"]},components:M(t.items,e.interpreter)};var e}),collection:dC(function(t,n){return u=t,a=n.shared.providers,c=u.label.map(function(t){return Zb(t,a)}),s=e(function(t,n,e,o){n.stop(),a.isDisabled()||vr(t,by,{name:u.name,value:o})}),l=[Cr(hi(),e(function(t,n,e){Sa(e)})),Cr(Ci(),s),Cr(Ri(),s),Cr(vi(),e(function(t,n,e){Fu(t.element,"."+Dh).each(function(t){Yr(t,Dh)}),Xr(e,Dh)})),Cr(bi(),e(function(t){Fu(t.element,"."+Dh).each(function(t){Yr(t,Dh)})})),iu(e(function(t,n,e,o){vr(t,by,{name:u.name,value:o})}))],Qb(c,sy.parts.field({dom:{tag:"div",classes:["tox-collection"].concat(1!==u.columns?["tox-collection--grid"]:["tox-collection--list"])},components:[],factory:{sketch:h},behaviours:tc([dd.config({disabled:a.isDisabled,onDisabled:function(t){o(t,function(t){Xr(t,"tox-collection__item--state-disabled"),on(t,"aria-disabled",!0)})},onEnabled:function(t){o(t,function(t){Yr(t,"tox-collection__item--state-disabled"),cn(t,"aria-disabled")})}}),mv(),Fg.config({}),Tf.config({store:{mode:"memory",initialValue:[]},onSetValue:function(o,t){var n=o,e=M(t,function(t){var n=lp.translate(t.text),e=1===u.columns?'<div class="tox-collection__item-label">'+n+"</div>":"",o='<div class="tox-collection__item-icon">'+t.icon+"</div>",r={_:" "," - ":" ","-":" "},i=n.replace(/\_| \- |\-/g,function(t){return r[t]});return'<div class="tox-collection__item'+(a.isDisabled()?" tox-collection__item--state-disabled":"")+'" tabindex="-1" data-collection-item-value="'+dy.encodeAllRaw(t.value)+'" title="'+i+'" aria-label="'+i+'">'+o+e+"</div>"}),r=M("auto"!==u.columns&&1<u.columns?B(e,u.columns):[e],function(t){return'<div class="tox-collection__group">'+t.join("")+"</div>"});Mr(n.element,r.join("")),"auto"===u.columns&&ih(o,5,"tox-collection__item").each(function(t){var n=t.numRows,e=t.numColumns;Mg.setGridSize(o,n,e)}),hr(o,Cy)}}),fy.config({}),Mg.config(1===(i=u.columns)?{mode:"menu",moveOnTab:!1,selector:".tox-collection__item"}:"auto"===i?{mode:"flatgrid",selector:".tox-collection__item",initSize:{numColumns:1,numRows:1}}:{mode:"matrix",selectors:{row:".tox-collection__group",cell:"."+Sh}}),fm("collection-events",l)]),eventOrder:((r={})[Fi()]=["disabling","alloy.base.behaviour","collection-events"],r)}),["tox-form__group--collection"],[]);function e(o){return function(n,e){Iu(e.event.target,"[data-collection-item-value]").each(function(t){o(n,e,t,rn(t,"data-collection-item-value"))})}}function o(t,n){return M(ps(t.element,".tox-collection__item"),n)}var u,a,r,i,c,s,l}),alertbanner:dC(function(t,n){return o=n.shared.providers,uy.sketch({dom:{tag:"div",attributes:{role:"alert"},classes:["tox-notification","tox-notification--in","tox-notification--"+(e=t).level]},components:[{dom:{tag:"div",classes:["tox-notification__icon"]},components:[sp.sketch({dom:{tag:"button",classes:["tox-button","tox-button--naked","tox-button--icon"],innerHtml:Lm(e.icon,o.icons),attributes:{title:o.translate(e.iconTooltip)}},action:function(t){vr(t,by,{name:"alert-banner",value:e.url})},buttonBehaviours:tc([Wm()])})]},{dom:{tag:"div",classes:["tox-notification__body"],innerHtml:o.translate(e.text)}}]});var e,o}),input:dC(function(t,n){return o=n.shared.providers,oC({name:(e=t).name,multiline:!1,label:e.label,inputMode:e.inputMode,placeholder:e.placeholder,flex:!1,disabled:e.disabled,classname:"tox-textfield",validation:vt.none(),maximized:e.maximized},o);var e,o}),textarea:dC(function(t,n){return o=n.shared.providers,oC({name:(e=t).name,multiline:!0,label:e.label,inputMode:vt.none(),placeholder:e.placeholder,flex:!0,disabled:e.disabled,classname:"tox-textarea",validation:vt.none(),maximized:e.maximized},o);var e,o}),label:dC(function(t,n){return r={dom:{tag:"label",innerHtml:(o=n.shared).providers.translate((e=t).label),classes:["tox-label"]}},i=M(e.items,o.interpreter),{dom:{tag:"div",classes:["tox-form__group"]},components:[r].concat(i),behaviours:tc([ow(),Fg.config({}),rw(vt.none()),Mg.config({mode:"acyclic"})])};var e,o,r,i}),iframe:(Jk=function(t,n){return e=t,o=n.shared.providers,u=gS&&e.sandboxed,a=lt(lt({},e.label.map(function(t){return{title:t}}).getOr({})),u?{sandbox:"allow-scripts allow-same-origin"}:{}),r=u,i=Vo(""),c={getValue:function(t){return i.get()},setValue:function(t,n){var e;r?on(t.element,"srcdoc",n):(on(t.element,"src","javascript:''"),(e=t.element.dom.contentWindow.document).open(),e.write(n),e.close()),i.set(n)}},Qb(e.label.map(function(t){return Zb(t,o)}),sy.parts.field({factory:{sketch:function(t){return c0({uid:t.uid,dom:{tag:"iframe",attributes:a},behaviours:tc([fy.config({}),Vg.config({}),lS(vt.none(),c.getValue,c.setValue)])})}}}),["tox-form__group--stretched"],[]);var e,o,r,i,u,a,c},function(t,n,e){var o=Xo(n,{source:"dynamic"});return dC(Jk)(t,o,e)}),button:dC(function(t,n){return e=t,o=n.shared.providers,r=Y0(e.name,"custom"),Qb(vt.none(),sy.parts.field(lt({factory:sp},G0(e,vt.some(r),o,[fS(""),ow()]))),[],[]);var e,o,r}),checkbox:dC(function(t,n){return r=t,i=n.shared.providers,u=Tf.config({store:{mode:"manual",getValue:function(t){return t.element.dom.checked},setValue:function(t,n){t.element.dom.checked=n}}}),a=sy.parts.field({factory:{sketch:h},dom:{tag:"input",classes:["tox-checkbox__input"],attributes:{type:"checkbox"}},behaviours:tc([ow(),dd.config({disabled:function(){return r.disabled||i.isDisabled()}}),fy.config({}),Vg.config({}),u,Mg.config({mode:"special",onEnter:e,onSpace:e,stopSpaceKeyup:!0}),fm("checkbox-events",[Cr(Si(),function(t,n){vr(t,py,{name:r.name})})])])}),c=sy.parts.label({dom:{tag:"span",classes:["tox-checkbox__label"],innerHtml:i.translate(r.label)},behaviours:tc([mw.config({})])}),s=Pm({dom:{tag:"div",classes:["tox-checkbox__icons"]},components:[o("checked"),o("unchecked")]}),sy.sketch({dom:{tag:"label",classes:["tox-checkbox"]},components:[a,s.asSpec(),c],fieldBehaviours:tc([dd.config({disabled:function(){return r.disabled||i.isDisabled()},disableClass:"tox-checkbox--disabled",onDisabled:function(t){sy.getField(t).each(dd.disable)},onEnabled:function(t){sy.getField(t).each(dd.enable)}}),mv()])});function e(t){return t.element.dom.click(),vt.some(!0)}function o(t){return jm("checked"===t?"selected":"unselected",{tag:"span",classes:["tox-icon","tox-checkbox-icon__"+t]},i.icons)}var r,i,u,a,c,s}),colorinput:dC(function(t,n){return e=t,r=n.shared,i=n.colorinput,c=sy.parts.field({factory:Oy,inputClasses:["tox-textfield"],onSetValue:function(t){return Gy.run(t).get(st)},inputBehaviours:tc([dd.config({disabled:r.providers.isDisabled}),mv(),fy.config({}),Gy.config({invalidClass:"tox-textbox-field-invalid",getRoot:function(t){return Yt(t.element)},notify:{onValid:function(t){var n=Tf.getValue(t);vr(t,gw,{color:n})}},validator:{validateOnLoad:!1,validate:function(t){var n=Tf.getValue(t);if(0===n.length)return Ly(Re.value(!0));var e=At.fromTag("span");fn(e,"background-color",n);var o=pn(e,"background-color").fold(function(){return Re.error("blah")},function(t){return Re.value(n)});return Ly(o)}}})]),selectOnFocus:!1}),s=e.label.map(function(t){return Zb(t,r.providers)}),l=Pm((u={dom:{tag:"span",attributes:{"aria-label":r.providers.translate("Color swatch")}},layouts:{onRtl:function(){return[Xa,Ga,Ja]},onLtr:function(){return[Ga,Xa,Ja]}},components:[],fetch:yb(i.getColors(),i.hasCustomColors()),columns:i.getColorCols(),presets:"color",onItemAction:function(t,e){l.getOpt(t).each(function(n){"custom"===e?i.colorPicker(function(t){t.fold(function(){return hr(n,hw)},function(t){o(n,t),gb(t)})},"#ffffff"):o(n,"remove"===e?"":e)})}},dw.sketch({dom:u.dom,components:u.components,toggleClass:"mce-active",dropdownBehaviours:tc([Kv((a=r).providers.isDisabled),mv(),mw.config({}),fy.config({})]),layouts:u.layouts,sandboxClasses:["tox-dialog__popups"],lazySink:a.getSink,fetch:function(n){return Ny(function(t){return u.fetch(t)}).map(function(t){return vt.from(Wb(Xo(Cb(Fr("menu-value"),t,function(t){u.onItemAction(n,t)},u.columns,u.presets,xh.CLOSE_ON_EXECUTE,O,a.providers),{movement:kb(u.columns,u.presets)})))})},parts:{menu:$p(0,0,u.presets)}}))),sy.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:s.toArray().concat([{dom:{tag:"div",classes:["tox-color-input"]},components:[c,l.asSpec()]}]),fieldBehaviours:tc([fm("form-field-events",[Cr(gw,function(t,n){l.getOpt(t).each(function(t){fn(t.element,"background-color",n.event.color)}),vr(t,py,{name:e.name})}),Cr(pw,function(n,e){sy.getField(n).each(function(t){Tf.setValue(t,e.event.value),ud.getCurrent(n).each(Vg.focus)})}),Cr(hw,function(n,t){sy.getField(n).each(function(t){ud.getCurrent(n).each(Vg.focus)})})])])});function o(t,n){vr(t,pw,{value:n})}var e,r,i,u,a,c,s,l}),colorpicker:dC(function(t){var r=Pm(o0(r0,function(t){return"tox-"+t}).sketch({dom:{tag:"div",classes:["tox-color-picker-container"],attributes:{role:"presentation"}},onValidHex:function(t){vr(t,by,{name:"hex-valid",value:!0})},onInvalidHex:function(t){vr(t,by,{name:"hex-valid",value:!1})}}));return{dom:{tag:"div"},components:[r.asSpec()],behaviours:tc([Tf.config({store:{mode:"manual",getValue:function(t){var n=r.get(t);return ud.getCurrent(n).bind(function(t){return Tf.getValue(t).hex}).map(function(t){return"#"+t}).getOr("")},setValue:function(t,n){var e=/^#([a-fA-F0-9]{3}(?:[a-fA-F0-9]{3})?)/.exec(n),o=r.get(t);ud.getCurrent(o).fold(function(){console.log("Can not find form")},function(t){Tf.setValue(t,{hex:vt.from(e[1]).getOr("")}),Qw.getField(t,"hex").each(function(t){hr(t,wi())})})}}}),ow()])}}),dropzone:dC(function(t,n){return u0(t,n.shared.providers)}),grid:dC(function(t,n){return e=n.shared,{dom:{tag:"div",classes:["tox-form__grid","tox-form__grid--"+t.columns+"col"]},components:M(t.items,e.interpreter)};var e}),listbox:dC(function(t,n){return e=t,r=(o=n).shared.providers,i=Y(e.items).filter(nC),u=e.label.map(function(t){return Zb(t,r)}),a={dom:{tag:"div",classes:["tox-listboxfield"]},components:[sy.parts.field({dom:{},factory:{sketch:function(t){return P0({uid:t.uid,text:i.map(function(t){return t.text}),icon:vt.none(),tooltip:e.label,role:vt.none(),fetch:function(t,n){n(z0(t1(t,e.name,e.items,Tf.getValue(t)),xh.CLOSE_ON_EXECUTE,o,!1))},onSetup:rt(st),getApi:rt({}),columns:1,presets:"normal",classes:[],dropdownBehaviours:[fy.config({}),Tf.config({store:{mode:"manual",initialValue:i.map(function(t){return t.value}).getOr(""),getValue:function(t){return rn(t.element,Zk)},setValue:function(n,t){n1(e.items,t).each(function(t){on(n.element,Zk,t.value),vr(n,AS,{text:t.text})})}}})]},"tox-listbox",o.shared)}}})]},sy.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:ft([u.toArray(),[a]]),fieldBehaviours:tc([dd.config({disabled:rt(e.disabled),onDisabled:function(t){sy.getField(t).each(dd.disable)},onEnabled:function(t){sy.getField(t).each(dd.enable)}})])});var e,o,r,i,u,a}),selectbox:dC(function(t,n){return e=t,o=n.shared.providers,r=M(e.items,function(t){return{text:o.translate(t.text),value:t.value}}),i=e.label.map(function(t){return Zb(t,o)}),u={dom:{tag:"div",classes:["tox-selectfield"]},components:ft([[sy.parts.field({dom:{},selectAttributes:{size:e.size},options:r,factory:e1,selectBehaviours:tc([dd.config({disabled:function(){return e.disabled||o.isDisabled()}}),fy.config({}),fm("selectbox-change",[Cr(Si(),function(t,n){vr(t,py,{name:e.name})})])])})],(1<e.size?vt.none():vt.some(jm("chevron-down",{tag:"div",classes:["tox-selectfield__icon-js"]},o.icons))).toArray()])},sy.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:ft([i.toArray(),[u]]),fieldBehaviours:tc([dd.config({disabled:function(){return e.disabled||o.isDisabled()},onDisabled:function(t){sy.getField(t).each(dd.disable)},onEnabled:function(t){sy.getField(t).each(dd.enable)}}),mv()])});var e,o,r,i,u}),sizeinput:dC(function(t,n){return Z0(t,n.shared.providers)}),urlinput:dC(function(t,n){return fC(t,n,n.urlinput)}),customeditor:dC(function(e){var o=dc(),n=Pm({dom:{tag:e.tag}}),r=dc();return{dom:{tag:"div",classes:["tox-custom-editor"]},behaviours:tc([fm("custom-editor-events",[eu(function(t){n.getOpt(t).each(function(n){(Tt(e,"init")?e.init(n.element.dom):uS.load(e.scriptId,e.scriptUrl).then(function(t){return t(n.element.dom,e.settings)})).then(function(n){r.on(function(t){n.setValue(t)}),r.clear(),o.set(n)})})})]),Tf.config({store:{mode:"manual",getValue:function(){return o.get().fold(function(){return r.get().getOr("")},function(t){return t.getValue()})},setValue:function(t,n){o.get().fold(function(){r.set(n)},function(t){return t.setValue(n)})}}}),ow()]),components:[n.asSpec()]}}),htmlpanel:dC(function(t){return"presentation"===t.presets?uy.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:t.html}}):uy.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:t.html,attributes:{role:"document"}},containerBehaviours:tc([fy.config({}),Vg.config({})])})}),imagetools:dC(function(t,n){return tC(t,n.shared.providers)}),table:dC(function(t,n){return eC(t,n.shared.providers)}),panel:dC(function(t,n){return{dom:{tag:"div",classes:t.classes},components:M(t.items,n.shared.interpreter)}})},h1={field:function(t,n){return n}},v1=function(n,e,o){return tt(p1,e.type).fold(function(){return console.error('Unknown factory type "'+e.type+'", defaulting to container: ',e),e},function(t){return t(n,e,o)})},b1={valignCentre:[],alignCentre:[],alignLeft:[],alignRight:[],right:[],left:[],bottom:[],top:[]},y1=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",format:"bold"},{title:"Italic",format:"italic"},{title:"Underline",format:"underline"},{title:"Strikethrough",format:"strikethrough"},{title:"Superscript",format:"superscript"},{title:"Subscript",format:"subscript"},{title:"Code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Align",items:[{title:"Left",format:"alignleft"},{title:"Center",format:"aligncenter"},{title:"Right",format:"alignright"},{title:"Justify",format:"alignjustify"}]}],x1=function(t){return R(t,function(t,n){if(Tt(n,"items")){var e=x1(n.items);return{customFormats:t.customFormats.concat(e.customFormats),formats:t.formats.concat([{title:n.title,items:e.formats}])}}if(Tt(n,"inline")||Tt(n,"block")||Tt(n,"selector")){var o="custom-"+(y(n.name)?n.name:n.title.toLowerCase());return{customFormats:t.customFormats.concat([{name:o,format:n}]),formats:t.formats.concat([{title:n.title,format:o,icon:n.icon}])}}return lt(lt({},t),{formats:t.formats.concat(n)})},{customFormats:[],formats:[]})},w1=aS.trim,S1=bC("true"),C1=bC("false"),k1=function(t){var n=M(ps(At.fromDom(t),"h1,h2,h3,h4,h5,h6,a:not([href])"),function(t){return t.dom});return F(M(F(n,CC),kC).concat(M(F(n,wC),OC)),_C)},O1="tinymce-url-history",_1=nd,T1=Zf,E1=rt([To("shell",!1),fo("makeItem"),To("setupItem",st),Ef("listBehaviours",[Fg])]),D1=rt([Jf({name:"items",overrides:function(){return{behaviours:tc([Fg.config({})])}}})]),B1=Sl({name:rt("CustomList")(),configFields:E1(),partFields:D1(),factory:function(s,t,n,e){var o=s.shell?{behaviours:[Fg.config({})],components:[]}:{behaviours:[],components:t};return{uid:s.uid,dom:s.dom,components:o.components,behaviours:Zs(s.listBehaviours,o.behaviours),apis:{setItems:function(a,c){var t;t=a,(s.shell?vt.some(t):fl(t,s,"items")).fold(function(){throw console.error("Custom List was defined to not be a shell, but no item container was specified in components"),new Error("Custom List was defined to not be a shell, but no item container was specified in components")},function(n){var t=Fg.contents(n),e=c.length,o=e-t.length,r=0<o?D(o,function(){return s.makeItem()}):[],i=t.slice(e);St(i,function(t){return Fg.remove(n,t)}),St(r,function(t){return Fg.append(n,t)});var u=Fg.contents(n);St(u,function(t,n){s.setupItem(a,t,c[n],n)})})}}}},apis:{setItems:function(t,n,e){t.setItems(n,e)}}}),M1=rt([fo("dom"),To("shell",!0),$s("toolbarBehaviours",[Fg])]),A1=rt([Jf({name:"groups",overrides:function(){return{behaviours:tc([Fg.config({})])}}})]),F1=Sl({name:"Toolbar",configFields:M1(),partFields:A1(),factory:function(o,t,n,e){var r=o.shell?{behaviours:[Fg.config({})],components:[]}:{behaviours:[],components:t};return{uid:o.uid,dom:o.dom,components:r.components,behaviours:Zs(o.toolbarBehaviours,r.behaviours),apis:{setGroups:function(t,n){var e;e=t,(o.shell?vt.some(e):fl(e,o,"groups")).fold(function(){throw console.error("Toolbar was defined to not be a shell, but no groups container was specified in components"),new Error("Toolbar was defined to not be a shell, but no groups container was specified in components")},function(t){Fg.set(t,n)})}},domModification:{attributes:{role:"group"}}}},apis:{setGroups:function(t,n,e){t.setGroups(n,e)}}}),I1=rt([]),R1=Object.freeze({__proto__:null,setup:st,isDocked:O,getBehaviours:I1}),V1=Po([{static:[]},{absolute:["positionCss"]},{fixed:["positionCss"]}]),P1=function(t,n,e){var o,r,i,u;t.getSystem().isConnected()&&(i=e,u=(r=n).lazyViewport(o=t),i.isDocked()&&qC(o,r,i,u),GC(o,u,i).each(function(t){t.fold(function(){return XC(o,r,i)},function(t){return YC(o,r,i,t)},function(t){qC(o,r,i,u,!0),YC(o,r,i,t)})}))},H1=Object.freeze({__proto__:null,refresh:P1,reset:KC,isDocked:function(t,n,e){return e.isDocked()},getModes:function(t,n,e){return e.getModes()},setModes:function(t,n,e,o){return e.setModes(o)}}),z1=Object.freeze({__proto__:null,events:function(o,r){return nu([Dr(Oi(),function(n,e){o.contextual.each(function(t){qr(n.element,t.transitionClass)&&(Jr(n.element,[t.transitionClass,t.fadeInClass]),(r.isVisible()?t.onShown:t.onHidden)(n)),e.stop()})}),Cr(Wi(),function(t,n){P1(t,o,r)}),Cr(Ui(),function(t,n){KC(t,o,r)})])}}),N1=ya({fields:[_o("contextual",[go("fadeInClass"),go("fadeOutClass"),go("transitionClass"),ho("lazyContext"),Ku("onShow"),Ku("onShown"),Ku("onHide"),Ku("onHidden")]),Fo("lazyViewport",Ae),Io("modes",["top","bottom"],tr),Ku("onDocked"),Ku("onUndocked")],name:"docking",active:z1,apis:H1,state:Object.freeze({__proto__:null,init:function(t){var n=Vo(!1),e=Vo(!0),o=dc(),r=Vo(t.modes);return xu({isDocked:n.get,setDocked:n.set,getInitialPos:o.get,setInitialPos:o.set,clearInitialPos:o.clear,isVisible:e.get,setVisible:e.set,getModes:r.get,setModes:r.set,readState:function(){return"docked:  "+n.get()+", visible: "+e.get()+", modes: "+r.get().join(",")}})}})}),L1=rt(Fr("toolbar-height-change")),W1={fadeInClass:"tox-editor-dock-fadein",fadeOutClass:"tox-editor-dock-fadeout",transitionClass:"tox-editor-dock-transition"},U1="tox-tinymce--toolbar-sticky-on",j1="tox-tinymce--toolbar-sticky-off",G1=Object.freeze({__proto__:null,setup:function(t,n,e){t.inline||(n.header.isPositionedAtTop()||t.on("ResizeEditor",function(){e().each(N1.reset)}),t.on("ResizeWindow ResizeEditor",function(){e().each($C)}),t.on("SkinLoaded",function(){e().each(function(t){N1.isDocked(t)?N1.reset(t):N1.refresh(t)})}),t.on("FullscreenStateChanged",function(){e().each(N1.reset)})),t.on("AfterScrollIntoView",function(b){e().each(function(t){N1.refresh(t);var n,e,o,r,i,u,a,c,s,l,f,d,m,g,p,h,v=t.element;Rd(v)&&(n=b,r=(o=Ut(e=v)).dom.defaultView.innerHeight,i=In(o),a=zn(u=At.fromDom(n.elm)),c=xn(u),l=(s=a.y)+c,f=Cn(e),d=xn(e),g=(m=f.top)+d,p=Math.abs(m-i.top)<2,h=Math.abs(g-(i.top+r))<2,p&&s<g?Rn(i.left,s-d,o):h&&m<l&&Rn(i.left,s-r+c+d,o))})}),t.on("PostRender",function(){ZC(t,!1)})},isDocked:function(t){return t().map(N1.isDocked).getOr(!1)},getBehaviours:tk}),X1=Jo([go("type"),mo("items",no([$o([go("name"),yo("items",tr)]),tr]))].concat(Vp)),Y1=[Co("text"),Co("tooltip"),Co("icon"),ho("fetch"),Fo("onSetup",function(){return st})],q1=Jo(H([go("type")],Y1,!0)),K1=Jo([go("type"),Co("tooltip"),Co("icon"),Co("text"),ko("select"),ho("fetch"),Fo("onSetup",function(){return st}),Mo("presets","normal",["normal","color","listpreview"]),To("columns",1),ho("onAction"),ho("onItemAction")]),J1=wl({factory:function(n,o){var t={focus:Mg.focusIn,setMenus:function(t,n){var e=M(n,function(n){return L0(nk({type:"menubutton",text:n.text,fetch:function(t){t(n.getItems())}}).mapError(function(t){return ir(t)}).getOrDie(),"tox-mbtn",o.backstage,vt.some("menuitem"))});Fg.set(t,e)}};return{uid:n.uid,dom:n.dom,components:[],behaviours:tc([Fg.config({}),fm("menubar-events",[eu(function(t){n.onSetup(t)}),Cr(hi(),function(e,t){Fu(e.element,".tox-mbtn--active").each(function(n){Iu(t.event.target,".tox-mbtn").each(function(t){Lt(n,t)||e.getSystem().getByDom(n).each(function(n){e.getSystem().getByDom(t).each(function(t){dw.expand(t),dw.close(n),Vg.focus(t)})})})})}),Cr(qi(),function(e,t){t.event.prevFocus.bind(function(t){return e.getSystem().getByDom(t).toOptional()}).each(function(n){t.event.newFocus.bind(function(t){return e.getSystem().getByDom(t).toOptional()}).each(function(t){dw.isOpen(n)&&(dw.expand(t),dw.close(n))})})})]),Mg.config({mode:"flow",selector:".tox-mbtn",onEscape:function(t){return n.onEscape(t),vt.some(!0)}}),fy.config({})]),apis:t,domModification:{attributes:{role:"menubar"}}}},name:"silver.Menubar",configFields:[fo("dom"),fo("uid"),fo("onEscape"),fo("backstage"),To("onSetup",st)],apis:{focus:function(t,n){t.focus(n)},setMenus:function(t,n,e){t.setMenus(n,e)}}}),$1=Object.freeze({__proto__:null,refresh:function(t,n,e){var o;e.isExpanded()&&(vn(t.element,ok(n)),o=rk(n,t.element),fn(t.element,ok(n),o))},grow:function(t,n,e){e.isExpanded()||lk(t,n,e)},shrink:function(t,n,e){e.isExpanded()&&sk(t,n,e)},immediateShrink:function(t,n,e){e.isExpanded()&&ck(t,n,e)},hasGrown:function(t,n,e){return e.isExpanded()},hasShrunk:function(t,n,e){return e.isCollapsed()},isGrowing:fk,isShrinking:dk,isTransitioning:function(t,n,e){return fk(t,n)||dk(t,n)},toggleGrow:function(t,n,e){(e.isExpanded()?sk:lk)(t,n,e)},disableTransitions:ik}),Q1=Object.freeze({__proto__:null,exhibit:function(t,n,e){return Nr(n.expanded?{classes:[n.openClass],styles:{}}:{classes:[n.closedClass],styles:cr(n.dimension.property,"0px")})},events:function(e,o){return nu([Dr(Oi(),function(t,n){n.event.raw.propertyName===e.dimension.property&&(ik(t,e),o.isExpanded()&&vn(t.element,e.dimension.property),(o.isExpanded()?e.onGrown:e.onShrunk)(t))})])}}),Z1=ya({fields:[fo("closedClass"),fo("openClass"),fo("shrinkingClass"),fo("growingClass"),xo("getAnimationRoot"),Ku("onShrunk"),Ku("onStartShrink"),Ku("onGrown"),Ku("onStartGrow"),To("expanded",!1),mo("dimension",so("property",{width:[Zu("property","width"),Zu("getDimension",function(t){return kn(t)+"px"})],height:[Zu("property","height"),Zu("getDimension",function(t){return xn(t)+"px"})]}))],name:"sliding",active:Q1,apis:$1,state:Object.freeze({__proto__:null,init:function(t){var n=Vo(t.expanded);return xu({isExpanded:function(){return!0===n.get()},isCollapsed:function(){return!1===n.get()},setCollapsed:S(n.set,!1),setExpanded:S(n.set,!0),readState:function(){return"expanded: "+n.get()}})}})}),tO="container",nO=[$s("slotBehaviours",[])],eO=dt({getSlotNames:function(t,n){return t.getSlotNames(n)},getSlot:function(t,n,e){return t.getSlot(n,e)},isShowing:function(t,n,e){return t.isShowing(n,e)},hideSlot:function(t,n,e){return t.hideSlot(n,e)},hideAllSlots:function(t,n){return t.hideAllSlots(n)},showSlot:function(t,n,e){return t.showSlot(n,e)}},Hr),oO=lt(lt({},eO),{sketch:function(t){var e,n={slot:function(t,n){return e.push(t),ul(tO,mk(t),n)},record:rt(e=[])},o=t(n),r=M(n.record(),function(t){return qf({name:t,pname:mk(t)})});return xl(tO,nO,r,qk,o)}}),rO=Jo([Co("icon"),Co("tooltip"),Fo("onShow",st),Fo("onHide",st),Fo("onSetup",function(){return st})]),iO=Fr("FixSizeEvent"),uO=Fr("AutoSizeEvent"),aO=Object.freeze({__proto__:null,block:function(t,n,e,o){on(t.element,"aria-busy",!0);var r=n.getRoot(t).getOr(t),i=tc([Mg.config({mode:"special",onTab:function(){return vt.some(!0)},onShiftTab:function(){return vt.some(!0)}}),Vg.config({})]),u=o(r,i),a=r.getSystem().build(u);Fg.append(r,Tu(a)),a.hasConfigured(Mg)&&n.focus&&Mg.focusIn(a),e.isBlocked()||n.onBlock(t),e.blockWith(function(){return Fg.remove(r,a)})},unblock:function(t,n,e){cn(t.element,"aria-busy"),e.isBlocked()&&n.onUnblock(t),e.clear()}}),cO=ya({fields:[Fo("getRoot",vt.none),Ao("focus",!0),Ku("onBlock"),Ku("onUnblock")],name:"blocking",apis:aO,state:Object.freeze({__proto__:null,init:function(){var n=lc(function(t){return t.destroy()});return xu({readState:n.isSet,blockWith:function(t){n.set({destroy:t})},clear:n.clear,isBlocked:n.isSet})}})}),sO=rt([$s("splitToolbarBehaviours",[Yy]),ar("builtGroups",function(){return Vo([])})]),lO=rt([Yu(["overflowToggledClass"]),ko("getOverflowBounds"),fo("lazySink"),ar("overflowGroups",function(){return Vo([])})].concat(sO())),fO=rt([qf({factory:F1,schema:M1(),name:"primary"}),Kf({schema:M1(),name:"overflow"}),Kf({name:"overflow-button"}),Kf({name:"overflow-group"})]),dO=rt(function(t,n){var e=t,o=Math.floor(n);fn(e,"max-width",ke.max(e,o,["margin-left","border-left-width","padding-left","padding-right","border-right-width","margin-right"])+"px")}),mO=rt([Yu(["toggledClass"]),fo("lazySink"),ho("fetch"),ko("getBounds"),_o("fireDismissalEventInstead",[To("event",Xi())]),Nc()]),gO=rt([Kf({name:"button",overrides:function(t){return{dom:{attributes:{"aria-haspopup":"true"}},buttonBehaviours:tc([zg.config({toggleClass:t.markers.toggledClass,aria:{mode:"expanded"},toggleOnExecute:!1})])}}}),Kf({factory:F1,schema:M1(),name:"toolbar",overrides:function(n){return{toolbarBehaviours:tc([Mg.config({mode:"cyclic",onEscape:function(t){return fl(t,n,"button").each(Vg.focus),vt.none()}})])}}})]),pO=Sl({name:"FloatingToolbarButton",factory:function(u,t,a,n){return lt(lt({},sp.sketch(lt(lt({},n.button()),{action:function(t){Ok(t,n)},buttonBehaviours:Df({dump:n.button().buttonBehaviours},[Yy.config({others:{toolbarSandbox:function(t){return o=t,e=a,r=u,{dom:{tag:"div",attributes:{id:(i=Ru()).id}},behaviours:tc([Mg.config({mode:"special",onEscape:function(t){return hf.close(t),vt.some(!0)}}),hf.config({onOpen:function(t,n){r.fetch().get(function(t){Tk(o,n,r,e.layouts,t),i.link(o.element),Mg.focusIn(n)})},onClose:function(){zg.off(o),Vg.focus(o),i.unlink(o.element)},isPartOf:function(t,n,e){return Hu(n,e)||Hu(o,e)},getAttachPoint:function(){return r.lazySink(o).getOrDie()}}),rc.config({channels:lt(lt({},js(lt({isExtraPart:O},r.fireDismissalEventInstead.map(function(t){return{fireEventInstead:{event:t.event}}}).getOr({})))),Gs({doReposition:function(){hf.getState(Yy.getCoupled(o,"toolbarSandbox")).each(function(t){_k(o,t,r,e.layouts)})}}))})])};var o,e,r,i}}})])}))),{apis:{setGroups:function(n,e){hf.getState(Yy.getCoupled(n,"toolbarSandbox")).each(function(t){Tk(n,t,u,a.layouts,e)})},reposition:function(n){hf.getState(Yy.getCoupled(n,"toolbarSandbox")).each(function(t){_k(n,t,u,a.layouts)})},toggle:function(t){Ok(t,n)},getToolbar:function(t){return hf.getState(Yy.getCoupled(t,"toolbarSandbox"))},isOpen:function(t){return hf.isOpen(Yy.getCoupled(t,"toolbarSandbox"))}}})},configFields:mO(),partFields:gO(),apis:{setGroups:function(t,n,e){t.setGroups(n,e)},reposition:function(t,n){t.reposition(n)},toggle:function(t,n){t.toggle(n)},getToolbar:function(t,n){return t.getToolbar(n)},isOpen:function(t,n){return t.isOpen(n)}}}),hO=rt([fo("items"),Yu(["itemSelector"]),$s("tgroupBehaviours",[Mg])]),vO=rt([$f({name:"items",unit:"item"})]),bO=Sl({name:"ToolbarGroup",configFields:hO(),partFields:vO(),factory:function(t,n,e,o){return{uid:t.uid,dom:t.dom,components:n,behaviours:Zs(t.tgroupBehaviours,[Mg.config({mode:"flow",selector:t.markers.itemSelector})]),domModification:{attributes:{role:"toolbar"}}}}}),yO=Sl({name:"SplitFloatingToolbar",configFields:lO(),partFields:fO(),factory:function(e,t,n,o){var r=Pm(pO.sketch({fetch:function(){return Ny(function(t){t(Ek(e.overflowGroups.get()))})},layouts:{onLtr:function(){return[Xa,Ga]},onRtl:function(){return[Ga,Xa]},onBottomLtr:function(){return[qa,Ya]},onBottomRtl:function(){return[Ya,qa]}},getBounds:n.getOverflowBounds,lazySink:e.lazySink,fireDismissalEventInstead:{},markers:{toggledClass:e.markers.overflowToggledClass},parts:{button:o["overflow-button"](),toolbar:o.overflow()}}));return{uid:e.uid,dom:e.dom,components:t,behaviours:Zs(e.splitToolbarBehaviours,[Yy.config({others:{overflowGroup:function(){return bO.sketch(lt(lt({},o["overflow-group"]()),{items:[r.asSpec()]}))}}})]),apis:{setGroups:function(t,n){e.builtGroups.set(M(n,t.getSystem().build)),Dk(t,r,e)},refresh:function(t){return Dk(t,r,e)},toggle:function(t){r.getOpt(t).each(function(t){pO.toggle(t)})},isOpen:function(t){return r.getOpt(t).map(pO.isOpen).getOr(!1)},reposition:function(t){r.getOpt(t).each(function(t){pO.reposition(t)})},getOverflow:function(t){return r.getOpt(t).bind(pO.getToolbar)}},domModification:{attributes:{role:"group"}}}},apis:{setGroups:function(t,n,e){t.setGroups(n,e)},refresh:function(t,n){t.refresh(n)},reposition:function(t,n){t.reposition(n)},toggle:function(t,n){t.toggle(n)},isOpen:function(t,n){return t.isOpen(n)},getOverflow:function(t,n){return t.getOverflow(n)}}}),xO=rt([Yu(["closedClass","openClass","shrinkingClass","growingClass","overflowToggledClass"]),Ku("onOpened"),Ku("onClosed")].concat(sO())),wO=rt([qf({factory:F1,schema:M1(),name:"primary"}),qf({factory:F1,schema:M1(),name:"overflow",overrides:function(n){return{toolbarBehaviours:tc([Z1.config({dimension:{property:"height"},closedClass:n.markers.closedClass,openClass:n.markers.openClass,shrinkingClass:n.markers.shrinkingClass,growingClass:n.markers.growingClass,onShrunk:function(t){fl(t,n,"overflow-button").each(function(t){zg.off(t),Vg.focus(t)}),n.onClosed(t)},onGrown:function(t){Mg.focusIn(t),n.onOpened(t)},onStartGrow:function(t){fl(t,n,"overflow-button").each(zg.on)}}),Mg.config({mode:"acyclic",onEscape:function(t){return fl(t,n,"overflow-button").each(Vg.focus),vt.some(!0)}})])}}}),Kf({name:"overflow-button",overrides:function(t){return{buttonBehaviours:tc([zg.config({toggleClass:t.markers.overflowToggledClass,aria:{mode:"pressed"},toggleOnExecute:!1})])}}}),Kf({name:"overflow-group"})]),SO=Sl({name:"SplitSlidingToolbar",configFields:xO(),partFields:wO(),factory:function(o,t,n,e){var r="alloy.toolbar.toggle";return{uid:o.uid,dom:o.dom,components:t,behaviours:Zs(o.splitToolbarBehaviours,[Yy.config({others:{overflowGroup:function(n){return bO.sketch(lt(lt({},e["overflow-group"]()),{items:[sp.sketch(lt(lt({},e["overflow-button"]()),{action:function(t){hr(n,r)}}))]}))}}}),fm("toolbar-toggle-events",[Cr(r,function(t){Bk(t,o)})])]),apis:{setGroups:function(t,n){var e=M(n,t.getSystem().build);o.builtGroups.set(e),Kk(t,o)},refresh:function(t){return Kk(t,o)},toggle:function(t){return Bk(t,o)},isOpen:function(t){return fl(t,o,"overflow").map(Z1.hasGrown).getOr(!1)}},domModification:{attributes:{role:"group"}}}},apis:{setGroups:function(t,n,e){t.setGroups(n,e)},refresh:function(t,n){t.refresh(n)},toggle:function(t,n){t.toggle(n)},isOpen:function(t,n){return t.isOpen(n)}}}),CO=T1.optional({factory:J1,name:"menubar",schema:[fo("backstage")]}),kO=T1.optional({factory:{sketch:function(t){return B1.sketch({uid:t.uid,dom:t.dom,listBehaviours:tc([Mg.config({mode:"acyclic",selector:".tox-toolbar"})]),makeItem:function(){return Rk({type:t.type,uid:Fr("multiple-toolbar-item"),cyclicKeying:!1,initGroups:[],providers:t.providers,onEscape:function(){return t.onEscape(),vt.some(!0)}})},setupItem:function(t,n,e,o){F1.setGroups(n,e)},shell:!0})}},name:"multiple-toolbar",schema:[fo("dom"),fo("onEscape")]}),OO=T1.optional({factory:{sketch:function(t){return(t.type===hh.sliding?function(t){var n=SO.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}}),e=SO.parts.overflow({dom:{tag:"div",classes:["tox-toolbar__overflow"]}}),o=Ik(t);return SO.sketch(lt(lt({},o),{components:[n,e],markers:{openClass:"tox-toolbar__overflow--open",closedClass:"tox-toolbar__overflow--closed",growingClass:"tox-toolbar__overflow--growing",shrinkingClass:"tox-toolbar__overflow--shrinking",overflowToggledClass:"tox-tbtn--enabled"},onOpened:function(t){t.getSystem().broadcastOn([L1()],{type:"opened"})},onClosed:function(t){t.getSystem().broadcastOn([L1()],{type:"closed"})}}))}:t.type===hh.floating?function(i){var t=Ik(i),n=yO.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}});return yO.sketch(lt(lt({},t),{lazySink:i.getSink,getOverflowBounds:function(){var t=i.moreDrawerData.lazyHeader().element,n=zn(t),e=Gt(t),o=zn(e),r=Math.max(e.dom.scrollHeight,o.height);return Be(n.x+4,o.y,n.width-8,r)},parts:lt(lt({},t.parts),{overflow:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:i.attributes}}}),components:[n],markers:{overflowToggledClass:"tox-tbtn--enabled"}}))}:Rk)({type:t.type,uid:t.uid,onEscape:function(){return t.onEscape(),vt.some(!0)},cyclicKeying:!1,initGroups:[],getSink:t.getSink,providers:t.providers,moreDrawerData:{lazyToolbar:t.lazyToolbar,lazyMoreButton:t.lazyMoreButton,lazyHeader:t.lazyHeader},attributes:t.attributes})}},name:"toolbar",schema:[fo("dom"),fo("onEscape"),fo("getSink")]}),_O=T1.optional({factory:{sketch:function(t){var n=t.editor,e=t.sticky?tk:I1;return{uid:t.uid,dom:t.dom,components:t.components,behaviours:tc(e(n,t.sharedBackstage))}}},name:"header",schema:[fo("dom")]}),TO=T1.optional({name:"socket",schema:[fo("dom")]}),EO=T1.optional({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"div",classes:["tox-sidebar"],attributes:{role:"complementary"}},components:[{dom:{tag:"div",classes:["tox-sidebar__slider"]},components:[],behaviours:tc([fy.config({}),Vg.config({}),Z1.config({dimension:{property:"width"},closedClass:"tox-sidebar--sliding-closed",openClass:"tox-sidebar--sliding-open",shrinkingClass:"tox-sidebar--sliding-shrinking",growingClass:"tox-sidebar--sliding-growing",onShrunk:function(t){ud.getCurrent(t).each(oO.hideAllSlots),hr(t,uO)},onGrown:function(t){hr(t,uO)},onStartGrow:function(t){vr(t,iO,{width:pn(t.element,"width").getOr("")})},onStartShrink:function(t){vr(t,iO,{width:kn(t.element)+"px"})}}),Fg.config({}),ud.config({find:function(t){return Y(Fg.contents(t))}})])}],behaviours:tc([rS(0),fm("sidebar-sliding-events",[Cr(iO,function(t,n){fn(t.element,"width",n.event.width)}),Cr(uO,function(t,n){vn(t.element,"width")})])])}}},name:"sidebar",schema:[fo("dom")]}),DO=T1.optional({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"div",attributes:{"aria-hidden":"true"},classes:["tox-throbber"],styles:{display:"none"}},behaviours:tc([Fg.config({}),cO.config({focus:!1}),ud.config({find:function(t){return Y(t.components())}})]),components:[]}}},name:"throbber",schema:[fo("dom")]}),BO=Sl({name:"OuterContainer",factory:function(e,t,n){return{uid:e.uid,dom:e.dom,components:t,apis:{getSocket:function(t){return _1.getPart(t,e,"socket")},setSidebar:function(t,n){_1.getPart(t,e,"sidebar").each(function(t){return pk(t,n)})},toggleSidebar:function(t,n){_1.getPart(t,e,"sidebar").each(function(t){var e=n;ud.getCurrent(t).each(function(n){ud.getCurrent(n).each(function(t){Z1.hasGrown(n)?oO.isShowing(t,e)?Z1.shrink(n):(oO.hideAllSlots(t),oO.showSlot(t,e)):(oO.hideAllSlots(t),oO.showSlot(t,e),Z1.grow(n))})})})},whichSidebar:function(t){return _1.getPart(t,e,"sidebar").bind(hk).getOrNull()},getHeader:function(t){return _1.getPart(t,e,"header")},getToolbar:function(t){return _1.getPart(t,e,"toolbar")},setToolbar:function(t,n){_1.getPart(t,e,"toolbar").each(function(t){t.getApis().setGroups(t,n)})},setToolbars:function(t,n){_1.getPart(t,e,"multiple-toolbar").each(function(t){B1.setItems(t,n)})},refreshToolbar:function(t){_1.getPart(t,e,"toolbar").each(function(t){return t.getApis().refresh(t)})},toggleToolbarDrawer:function(t){_1.getPart(t,e,"toolbar").each(function(n){var t=n.getApis().toggle;null!=t?vt.some(function(t){return t(n)}(t)):vt.none()})},isToolbarDrawerToggled:function(t){return _1.getPart(t,e,"toolbar").bind(function(n){return vt.from(n.getApis().isOpen).map(function(t){return t(n)})}).getOr(!1)},getThrobber:function(t){return _1.getPart(t,e,"throbber")},focusToolbar:function(t){_1.getPart(t,e,"toolbar").orThunk(function(){return _1.getPart(t,e,"multiple-toolbar")}).each(function(t){Mg.focusIn(t)})},setMenubar:function(t,n){_1.getPart(t,e,"menubar").each(function(t){J1.setMenus(t,n)})},focusMenubar:function(t){_1.getPart(t,e,"menubar").each(function(t){J1.focus(t)})}},behaviours:e.behaviours}},configFields:[fo("dom"),fo("behaviours")],partFields:[_O,CO,OO,kO,TO,EO,DO],apis:{getSocket:function(t,n){return t.getSocket(n)},setSidebar:function(t,n,e){t.setSidebar(n,e)},toggleSidebar:function(t,n,e){t.toggleSidebar(n,e)},whichSidebar:function(t,n){return t.whichSidebar(n)},getHeader:function(t,n){return t.getHeader(n)},getToolbar:function(t,n){return t.getToolbar(n)},setToolbar:function(t,n,e){var o=M(e,Ak);t.setToolbar(n,o)},setToolbars:function(t,n,e){var o=M(e,function(t){return M(t,Ak)});t.setToolbars(n,o)},refreshToolbar:function(t,n){return t.refreshToolbar(n)},toggleToolbarDrawer:function(t,n){t.toggleToolbarDrawer(n)},isToolbarDrawerToggled:function(t,n){return t.isToolbarDrawerToggled(n)},getThrobber:function(t,n){return t.getThrobber(n)},setMenubar:function(t,n,e){t.setMenubar(n,e)},focusMenubar:function(t,n){t.focusMenubar(n)},focusToolbar:function(t,n){t.focusToolbar(n)}}}),MO={file:{title:"File",items:"newdocument restoredraft | preview | export print | deleteallconversations"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall | searchreplace"},view:{title:"View",items:"code | visualaid visualchars visualblocks | spellchecker | preview fullscreen | showcomments"},insert:{title:"Insert",items:"image link media addcomment pageembed template codesample inserttable | charmap emoticons hr | pagebreak nonbreaking anchor toc | insertdatetime"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript codeformat | formats blockformats fontformats fontsizes align lineheight | forecolor backcolor | language | removeformat"},tools:{title:"Tools",items:"spellchecker spellcheckerlanguage | a11ycheck code wordcount"},table:{title:"Table",items:"inserttable | cell row column | advtablesort | tableprops deletetable"},help:{title:"Help",items:"help"}},AO=S(Nk,!1),FO=S(Nk,!0);function IO(t,n,e,o){var r;return{type:"basic",data:(r=t.getParam(n,e,"string"),M(o===$k.SemiColon?r.replace(/;$/,"").split(";"):r.split(" "),function(t){var n=t,e=t,o=t.split("=");return 1<o.length&&(n=o[0],e=o[1]),{title:n,format:e}}))}}function RO(e){var t={type:"basic",data:g_};return{tooltip:"Align",text:vt.none(),icon:vt.some("align-left"),isSelectedFor:function(t){return function(){return e.formatter.match(t)}},getCurrentValue:vt.none,getPreviewFor:function(t){return vt.none},onAction:function(n){return function(){return V(g_,function(t){return t.format===n.format}).each(function(t){return e.execCommand(t.command)})}},updateText:function(t){var n=V(g_,function(t){return e.formatter.match(t.format)}).fold(rt("left"),function(t){return t.title.toLowerCase()});vr(t,FS,{icon:"align-"+n})},dataset:t,shouldHide:!1,isInvalid:function(t){return!e.formatter.canApply(t.format)}}}function VO(t){return M(t.split(/\s*,\s*/),function(t){return t.replace(/^['"]+|['"]+$/g,"")})}function PO(r){function i(){function e(t){return t?VO(t)[0]:""}var t=r.queryCommandValue("FontName"),n=a.data,o=t?t.toLowerCase():"";return{matchOpt:V(n,function(t){var n=t.format;return n.toLowerCase()===o||e(n).toLowerCase()===e(o).toLowerCase()}).orThunk(function(){return ot(0===(t=o).indexOf("-apple-system")&&(n=VO(t.toLowerCase()),N(p_,function(t){return-1<n.indexOf(t.toLowerCase())})),{title:u,format:o});var t,n}),font:t}}var u="System Font",a=IO(r,"font_formats","Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats",$k.SemiColon);return{tooltip:"Fonts",text:vt.some(u),icon:vt.none(),isSelectedFor:function(n){return function(t){return t.exists(function(t){return t.format===n})}},getCurrentValue:function(){return i().matchOpt},getPreviewFor:function(t){return function(){return vt.some({tag:"div",styles:-1===t.indexOf("dings")?{"font-family":t}:{}})}},onAction:function(t){return function(){r.undoManager.transact(function(){r.focus(),r.execCommand("FontName",!1,t.format)})}},updateText:function(t){var n=i(),e=n.matchOpt,o=n.font,r=e.fold(rt(o),function(t){return t.title});vr(t,AS,{text:r})},dataset:a,shouldHide:!1,isInvalid:O}}function HO(e){function i(){var a=vt.none(),c=o.data,s=e.queryCommandValue("FontSize");if(s)for(var t=function(t){var n,e,o,r,i=(e=t,/[0-9.]+px$/.test(n=s)?(o=72*parseInt(n,10)/96,r=Math.pow(10,e||0),Math.round(o*r)/r+"pt"):tt(v_,n).getOr(n)),u=tt(h_,i).getOr("");a=V(c,function(t){return t.format===s||t.format===i||t.format===u})},n=3;a.isNone()&&0<=n;n--)t(n);return{matchOpt:a,size:s}}var t=rt(vt.none),o=IO(e,"fontsize_formats","8pt 10pt 12pt 14pt 18pt 24pt 36pt",$k.Space);return{tooltip:"Font sizes",text:vt.some("12pt"),icon:vt.none(),isSelectedFor:function(n){return function(t){return t.exists(function(t){return t.format===n})}},getPreviewFor:t,getCurrentValue:function(){return i().matchOpt},onAction:function(t){return function(){e.undoManager.transact(function(){e.focus(),e.execCommand("FontSize",!1,t.format)})}},updateText:function(t){var n=i(),e=n.matchOpt,o=n.size,r=e.fold(rt(o),function(t){return t.title});vr(t,AS,{text:r})},dataset:o,shouldHide:!1,isInvalid:O}}function zO(t,n){var e=n(),o=M(e,function(t){return t.format});return vt.from(t.formatter.closest(o)).bind(function(n){return V(e,function(t){return t.format===n})}).orThunk(function(){return ot(t.formatter.match("p"),{title:"Paragraph",format:"p"})})}function NO(e){var o=IO(e,"block_formats","Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre",$k.SemiColon);return{tooltip:"Blocks",text:vt.some("Paragraph"),icon:vt.none(),isSelectedFor:function(t){return function(){return e.formatter.match(t)}},getCurrentValue:vt.none,getPreviewFor:function(n){return function(){var t=e.formatter.get(n);return vt.some({tag:0<t.length&&(t[0].inline||t[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(n))})}},onAction:Uk(e),updateText:function(t){var n=zO(e,function(){return o.data}).fold(rt("Paragraph"),function(t){return t.title});vr(t,AS,{text:n})},dataset:o,shouldHide:!1,isInvalid:function(t){return!e.formatter.canApply(t.format)}}}function LO(r,t){return{tooltip:"Formats",text:vt.some("Paragraph"),icon:vt.none(),isSelectedFor:function(t){return function(){return r.formatter.match(t)}},getCurrentValue:vt.none,getPreviewFor:function(n){return function(){var t=r.formatter.get(n);return void 0!==t?vt.some({tag:0<t.length&&(t[0].inline||t[0].block)||"div",styles:r.dom.parseStyle(r.formatter.getCssText(n))}):vt.none()}},onAction:Uk(r),updateText:function(t){var e=function(t){var n=t.items;return void 0!==n&&0<n.length?z(n,e):[{title:t.title,format:t.format}]},n=z(pC(r),e),o=zO(r,rt(n)).fold(rt("Paragraph"),function(t){return t.title});vr(t,AS,{text:o})},shouldHide:r.getParam("style_formats_autohide",!1,"boolean"),isInvalid:function(t){return!r.formatter.canApply(t.format)},dataset:t}}function WO(n){return{isDisabled:function(){return dd.isDisabled(n)},setDisabled:function(t){return dd.set(n,t)}}}function UO(n){return{setActive:function(t){zg.set(n,t)},isActive:function(){return zg.isOn(n)},isDisabled:function(){return dd.isDisabled(n)},setDisabled:function(t){return dd.set(n,t)}}}function jO(t,n){return t.map(function(t){return{"aria-label":n.translate(t),title:n.translate(t)}}).getOr({})}function GO(n,e,t,o,r,i){var u;return{dom:{tag:"button",classes:["tox-tbtn"].concat(e.isSome()?["tox-tbtn--select"]:[]),attributes:jO(t,i)},components:Qv([n.map(function(t){return I0(t,i.icons)}),e.map(function(t){return V0(t,"tox-tbtn",i)})]),eventOrder:((u={})[di()]=["focusing","alloy.base.behaviour","common-button-display-events"],u),buttonBehaviours:tc([Jv(i.isDisabled),mv(),fm("common-button-display-events",[Cr(di(),function(t,n){n.event.prevent(),hr(t,k_)})])].concat(o.map(function(t){return x_.config({channel:t,initialData:{icon:n,text:e},renderComponents:function(t,n){return Qv([t.icon.map(function(t){return I0(t,i.icons)}),t.text.map(function(t){return V0(t,"tox-tbtn",i)})])}})}).toArray()).concat(r.getOr([])))}}function XO(t,n,e){var o,r=Vo(st),i=GO(t.icon,t.text,t.tooltip,vt.none(),vt.none(),e);return sp.sketch({dom:i.dom,components:i.components,eventOrder:MS,buttonBehaviours:tc([fm("toolbar-button-events",[(o={onAction:t.onAction,getApi:n.getApi},iu(function(n,t){gv(o,n)(function(t){vr(n,BS,{buttonApi:t}),o.onAction(t)})})),pv(n,r),hv(n,r)]),Jv(function(){return t.disabled||e.isDisabled()}),mv()].concat(n.toolbarButtonBehaviours))})}function YO(r,i){return function(t,n,e){var o=r(t).mapError(function(t){return ir(t)}).getOrDie();return i(o,n,e)}}function qO(e,t,o,r){var n,i=t.outerContainer,u=o.toolbar,a=o.buttons;f(u,y)?(n=u.map(function(t){var n={toolbar:t,buttons:a,allowToolbarGroups:o.allowToolbarGroups};return B_(e,n,{backstage:r},vt.none())}),BO.setToolbars(i,n)):BO.setToolbar(i,B_(e,o,{backstage:r},vt.none()))}function KO(t){return/^[0-9\.]+(|px)$/i.test(""+t)?vt.some(parseInt(""+t,10)):vt.none()}function JO(t){return u(t)?t+"px":t}function $O(n,t,e){var o=t.filter(function(t){return n<t}),r=e.filter(function(t){return t<n});return o.or(r).getOr(n)}function QO(t){var n=ch(t),e=sh(t),o=fh(t);return KO(n).map(function(t){return $O(t,e,o)})}function ZO(u,a,t,n,c){function s(){return x.get()&&!u.removed}function l(t){return y?t.fold(rt(0),function(t){return 1<t.components().length?xn(t.components()[1].element):0}):0}function f(){r.broadcastOn([bf()],{})}function o(t){var n,e,o,r,i;void 0===t&&(t=!1),s()&&(m||(n=p.getOrThunk(function(){var t=KO(gn(ve(),"margin-left")).getOr(0);return kn(ve())-Cn(a).left+t}),fn(c.get().element,"max-width",n+"px")),y&&BO.refreshToolbar(d),m||(e=l(BO.getToolbar(d)),o=Me(a),r=v()?Math.max(o.y-xn(c.get().element)+e,0):o.bottom,dn(d.element,{position:"absolute",top:Math.round(r)+"px",left:Math.round(o.x)+"px"})),g&&(i=c.get(),t?N1.reset(i):N1.refresh(i)),f())}function e(t){var n,e;void 0===t&&(t=!0),!m&&g&&s()&&(n=h.getDockingMode(),(e=function(t){switch(rv(u)){case bh.auto:var n=l(BO.getToolbar(d)),e=xn(t.element)-n,o=Me(a);if(o.y>e)return"top";var r=Gt(a),i=Math.max(r.dom.scrollHeight,xn(r));return o.bottom<i-e||Ae().bottom<o.bottom-e?"bottom":"top";case bh.bottom:return"bottom";default:return bh.top,"top"}}(c.get()))!==n&&(function(t){var n=c.get();N1.setModes(n,[t]),h.setDockingMode(t);var e=v()?Cc.TopToBottom:Cc.BottomToTop;on(n.element,ts,e)}(e),t&&o(!0)))}var r=t.uiMothership,d=t.outerContainer,i=tv.DOM,m=av(u),g=lv(u),p=fh(u).or(QO(u)),h=n.shared.header,v=h.isPositionedAtTop,b=ov(u),y=b===hh.sliding||b===hh.floating,x=Vo(!1);return{isVisible:s,isPositionedAtTop:v,show:function(){x.set(!0),fn(d.element,"display","flex"),i.addClass(u.getBody(),"mce-edit-focus"),vn(r.element,"display"),e(!1),o()},hide:function(){x.set(!1),t.outerContainer&&(fn(d.element,"display","none"),i.removeClass(u.getBody(),"mce-edit-focus")),fn(r.element,"display","none")},update:o,updateMode:e,repositionPopups:f}}function t_(t,n){var e=Me(t);return{pos:n?e.y:e.bottom,bounds:e}}function n_(i,u){return Cr(BS,function(t,n){var e,o=i.get(t),r=(e=o,{hide:function(){return hr(e,Pi())},getValue:function(){return Tf.getValue(e)}});u.onAction(r,n.event.buttonApi)})}function e_(t,n,e){return n.bottom-t.y>=(e=void 0===e?.01:e)&&t.bottom-n.y>=e}function o_(t){var n=function(t){var n=t.getBoundingClientRect();if(n.height<=0&&n.width<=0){var e=Qt(At.fromDom(t.startContainer),t.startOffset).element;return(Xn(e)?Yt(e):vt.some(e)).filter(Gn).map(function(t){return t.dom.getBoundingClientRect()}).getOr(n)}return n}(t.selection.getRng());if(t.inline){var e=In();return Be(e.left+n.left,e.top+n.top,n.width,n.height)}var o=zn(At.fromDom(t.getBody()));return Be(o.x+n.left,o.y+n.top,n.width,n.height)}function r_(t,n,e,o){void 0===o&&(o=0);var r,i,u,a,c=Pn(window),s=Me(At.fromDom(t.getContentAreaContainer())),l=mh(t)||gh(t)||ev(t),f=(r=s,i=c,u=o,{x:a=Math.max(r.x+u,i.x),width:Math.min(r.right-u,i.right)-a}),d=f.x,m=f.width;if(t.inline&&!l)return Be(d,c.y,m,c.height);var g=function(t,n,e,o,r,i){var u=At.fromDom(t.getContainer()),a=Fu(u,".tox-editor-header").getOr(u),c=Me(a),s=c.y>=n.bottom,l=o&&!s;if(t.inline&&l)return{y:Math.max(c.bottom+i,e.y),bottom:e.bottom};if(t.inline&&!l)return{y:e.y,bottom:Math.min(c.y-i,e.bottom)};var f="line"===r?Me(u):n;return l?{y:Math.max(c.bottom+i,e.y),bottom:Math.min(f.bottom-i,e.bottom)}:{y:Math.max(f.y+i,e.y),bottom:Math.min(c.y-i,e.bottom)}}(t,s,c,n.header.isPositionedAtTop(),e,o),p=g.y,h=g.bottom;return Be(d,p,m,h-p)}function i_(t){return"node"===t}function u_(t,r,n,i,e){var u=o_(t),o=i.lastElement().exists(function(t){return Lt(n,t)}),a=n,c=t.selection.getRng(),s=Qt(At.fromDom(c.startContainer),c.startOffset);return c.startContainer===c.endContainer&&c.startOffset===c.endOffset-1&&Lt(s.element,a)?o?Im:up:o?function(n,t){var e=pn(n,"position");fn(n,"position",t);var o=e_(u,Me(r))&&!i.isReposition()?Vm:Im;return e.each(function(t){return fn(n,"position",t)}),o}(r,i.getMode()):("fixed"===i.getMode()?e.y+In().top:e.y)+(xn(r)+12)<=u.y?up:ap}function a_(n,t){var e=A(F(t,function(t){return t.predicate(n.dom)}),function(t){return"contexttoolbar"===t.type});return{contextToolbars:e.pass,contextForms:e.fail}}function c_(e,t){function o(t){return Lt(t,r)}var n,r=At.fromDom(t.getBody()),i=At.fromDom(t.selection.getNode());return o(n=i)||Wt(r,n)?function(t,n,e){var o=a_(t,n);if(0<o.contextForms.length)return vt.some({elem:t,toolbars:[o.contextForms[0]]});var r=a_(t,e);if(0<r.contextForms.length)return vt.some({elem:t,toolbars:[r.contextForms[0]]});if(0<o.contextToolbars.length||0<r.contextToolbars.length){var i=function(t){if(t.length<=1)return t;function n(n){return T(t,function(t){return t.position===n})}function e(n){return F(t,function(t){return t.position===n})}var o=n("selection"),r=n("node");if(o||r){if(r&&o){var i=e("node"),u=M(e("selection"),function(t){return lt(lt({},t),{position:"node"})});return i.concat(u)}return e(o?"selection":"node")}return e("line")}(o.contextToolbars.concat(r.contextToolbars));return vt.some({elem:t,toolbars:i})}return vt.none()}(i,e.inNodeScope,e.inEditorScope).orThunk(function(){return a=e,(t=o)(n=i)?vt.none():fr(n,function(t){if(Gn(t)){var n=a_(t,a.inNodeScope),e=n.contextToolbars,o=n.contextForms,r=0<o.length?o:(u=e).length<=1?u:i("selection").orThunk(function(){return i("node")}).orThunk(function(){return i("line")}).map(function(t){return t.position}).fold(function(){return[]},function(n){return F(u,function(t){return t.position===n})});return 0<r.length?vt.some({elem:t,toolbars:r}):vt.none()}function i(n){return V(u,function(t){return t.position===n})}var u;return vt.none()},t);var t,n,a}):vt.none()}function s_(a,c){var s={},l=[],f=[],d={},m={},t=kt(a);return St(t,function(t){var n,e,o,r,i,u=a[t];"contextform"===u.type?(o=t,i=ao(uo("ContextForm",Xp,r=u)),(s[o]=i).launch.map(function(t){d["form:"+o]=lt(lt({},r.launch),{type:"contextformtogglebutton"===t.type?"togglebutton":"button",onAction:function(){c(i)}})}),("editor"===i.scope?f:l).push(i),m[o]=i):"contexttoolbar"===u.type&&(n=t,uo("ContextToolbar",Yp,e=u).each(function(t){("editor"===e.scope?f:l).push(t),m[n]=t}))}),{forms:s,inNodeScope:l,inEditorScope:f,lookupTable:m,formNavigators:d}}function l_(d,t,m,u){function a(){var t=y.get().getOr("node"),n=i_(t)?1:0;return r_(d,p,t,n)}function c(){return!(d.removed||h()&&g.isContextMenuOpen())}function s(){if(c()){var t=a(),n=mt(y.get(),"node")?(e=d,v.get().filter(he).map(zn).getOrThunk(function(){return o_(e)})):o_(d);return t.height<=0||!e_(n,t)}return 1;var e}function n(){v.clear(),b.clear(),y.clear(),rp.hide(x)}function e(){var t;rp.isOpen(x)&&(vn(t=x.element,"display"),s()?fn(t,"display","none"):(b.set(0),rp.reposition(x)))}function l(t){return{dom:{tag:"div",classes:["tox-pop__dialog"]},components:[t],behaviours:tc([Mg.config({mode:"acyclic"}),fm("pop-dialog-wrap-events",[eu(function(t){d.shortcuts.add("ctrl+F9","focus statusbar",function(){return Mg.focusIn(t)})}),ou(function(t){d.shortcuts.remove("ctrl+F9")})])])}}function f(t,n){var e,o,r,i,c,s,u,a="node"===t?p.anchors.node(n):p.anchors.cursor(),l=(e=d,o=t,r=h(),i={lastElement:v.get,isReposition:function(){return mt(b.get(),0)},getMode:function(){return sf.getMode(m)}},"line"===o?{bubble:xc(12,0,P_),layouts:{onLtr:function(){return[sa]},onRtl:function(){return[la]}},overrides:H_}:{bubble:xc(0,12,P_,1/12),layouts:(c=e,s=i,u=o,r?{onLtr:function(t){return[Ja,Ga,Xa,Ya,qa,Ka].concat(f(t))},onRtl:function(t){return[Ja,Xa,Ga,qa,Ya,Ka].concat(f(t))}}:{onLtr:function(t){return[Ka,Ja,Ya,Ga,qa,Xa].concat(f(t))},onRtl:function(t){return[Ka,Ja,qa,Xa,Ya,Ga].concat(f(t))}}),overrides:H_});function f(t){return i_(u)?[(a=t,function(t,n,e,o,r){var i=u_(c,o,a,s,r),u=lt(lt({},t),{y:r.y,height:r.height});return lt(lt({},i(u,n,e,o,r)),{alwaysFit:!0})})]:[];var a}return Xo(a,l)}function o(t,n){var e,o,r,i;C.cancel(),c()&&(e=S(t),r=f(o=t[0].position,n),y.set(o),b.set(1),vn(i=x.element,"display"),mt(Et(n,v.get(),Lt),!0)||(Yr(i,U_),sf.reset(m,x)),rp.showWithinBounds(x,l(e),{anchor:r,transition:{classes:[U_],mode:"placement"}},function(){return vt.some(a())}),n.fold(v.clear,v.set),s()&&fn(i,"display","none"))}var r,i,g=u.backstage,p=g.shared,h=se().deviceType.isTouch,v=dc(),b=dc(),y=dc(),x=_u((r={sink:m,onEscape:function(){return d.focus(),vt.some(!0)}},i=Vo([]),rp.sketch({dom:{tag:"div",classes:["tox-pop"]},fireDismissalEventInstead:{event:"doNotDismissYet"},onShow:function(t){i.set([]),rp.getContent(t).each(function(t){vn(t.element,"visibility")}),Yr(t.element,W_),vn(t.element,"width")},inlineBehaviours:tc([fm("context-toolbar-events",[Dr(Oi(),function(t,n){"width"===n.event.raw.propertyName&&(Yr(t.element,W_),vn(t.element,"width"))}),Cr(L_,function(t,n){var e=t.element;vn(e,"width");var o=kn(e);rp.setContent(t,n.event.contents),Xr(e,W_);var r=kn(e);fn(e,"width",o+"px"),rp.getContent(t).each(function(t){n.event.focus.bind(function(t){return Sa(t),Oa(e)}).orThunk(function(){return Mg.focusIn(t),ka(me(e))})}),cp.setTimeout(function(){fn(t.element,"width",r+"px")},0)}),Cr(z_,function(n,t){rp.getContent(n).each(function(t){i.set(i.get().concat([{bar:t,focus:ka(me(n.element))}]))}),vr(n,L_,{contents:t.event.forwardContents,focus:vt.none()})}),Cr(N_,function(n,t){q(i.get()).each(function(t){i.set(i.get().slice(0,i.get().length-1)),vr(n,L_,{contents:Tu(t.bar),focus:t.focus})})})]),Mg.config({mode:"special",onEscape:function(n){return q(i.get()).fold(function(){return r.onEscape()},function(t){return hr(n,N_),vt.some(!0)})}})]),lazySink:function(){return Re.value(r.sink)}}))),w=Rt(function(){return s_(t,function(t){var n=S([t]);vr(x,z_,{forwardContents:l(n)})})}),S=function(t){var n=d.ui.registry.getAll().buttons,e=w(),o=lt(lt({},n),e.formNavigators),r=ov(d)===hh.scrolling?hh.scrolling:hh.default,i=ft(M(t,function(t){return"contexttoolbar"===t.type?B_(d,{buttons:o,toolbar:t.items,allowToolbarGroups:!1},u,vt.some(["form:"])):(n=p.providers,V_(t,n));var n}));return Rk({type:r,uid:Fr("context-toolbar"),initGroups:i,onEscape:vt.none,cyclicKeying:!0,providers:p.providers})},C=pp(function(){d.hasFocus()&&!d.removed&&(qr(x.element,U_)?C.throttle():c_(w(),d).fold(n,function(t){o(t.toolbars,vt.some(t.elem))}))},17);d.on("init",function(){d.on("remove",n),d.on("ScrollContent ScrollWindow ObjectResized ResizeEditor longpress",e),d.on("click keyup focus SetContent",C.throttle),d.on(R_,n),d.on("contexttoolbar-show",function(n){tt(w().lookupTable,n.toolbarKey).each(function(t){o([t],ot(n.target!==d,n.target)),rp.getContent(x).each(Mg.focusIn)})}),d.on("focusout",function(t){cp.setEditorTimeout(d,function(){Oa(m.element).isNone()&&Oa(x.element).isNone()&&n()},0)}),d.on("SwitchMode",function(){d.mode.isReadOnly()&&n()}),d.on("AfterProgressState",function(t){t.state?n():d.hasFocus()&&C.throttle()}),d.on("NodeChange",function(t){Oa(x.element).fold(C.throttle,st)})})}(Qk=$k=$k||{})[Qk.SemiColon=0]="SemiColon",Qk[Qk.Space=1]="Space";var f_,d_,m_,g_=[{title:"Left",icon:"align-left",format:"alignleft",command:"JustifyLeft"},{title:"Center",icon:"align-center",format:"aligncenter",command:"JustifyCenter"},{title:"Right",icon:"align-right",format:"alignright",command:"JustifyRight"},{title:"Justify",icon:"align-justify",format:"alignjustify",command:"JustifyFull"}],p_=["-apple-system","Segoe UI","Roboto","Helvetica Neue","sans-serif"],h_={"8pt":"1","10pt":"2","12pt":"3","14pt":"4","18pt":"5","24pt":"6","36pt":"7"},v_={"xx-small":"7pt","x-small":"8pt",small:"10pt",medium:"12pt",large:"14pt","x-large":"18pt","xx-large":"24pt"},b_=Object.freeze({__proto__:null,events:function(r,i){function u(e,o){r.updateState.each(function(t){var n=t(e,o);i.set(n)}),r.renderComponents.each(function(t){var n=M(t(o,i.get()),e.getSystem().build);Fs(e,n)})}return nu([Cr(Ai(),function(t,n){var e,o=n;o.universal||(e=r.channel,wt(o.channels,e)&&u(t,o.data))}),eu(function(n,t){r.initialData.each(function(t){u(n,t)})})])}}),y_=Object.freeze({__proto__:null,getState:function(t,n,e){return e}}),x_=ya({fields:[fo("channel"),xo("renderComponents"),xo("updateState"),xo("initialData")],name:"reflecting",active:b_,apis:y_,state:Object.freeze({__proto__:null,init:function(){var t=Vo(vt.none());return{readState:function(){return t.get().getOr("none")},get:t.get,set:t.set,clear:function(){return t.set(vt.none())}}}})}),w_=rt([fo("toggleClass"),fo("fetch"),$u("onExecute"),To("getHotspot",vt.some),To("getAnchorOverrides",rt({})),Nc(),$u("onItemExecute"),xo("lazySink"),fo("dom"),Ku("onOpen"),$s("splitDropdownBehaviours",[Yy,Mg,Vg]),To("matchWidth",!1),To("useMinWidth",!1),To("eventOrder",{}),xo("role")].concat(ex())),S_=rt([qf({factory:sp,schema:[fo("dom")],name:"arrow",defaults:function(){return{buttonBehaviours:tc([Vg.revoke()])}},overrides:function(n){return{dom:{tag:"span",attributes:{role:"presentation"}},action:function(t){t.getSystem().getByUid(n.uid).each(br)},buttonBehaviours:tc([zg.config({toggleOnExecute:!1,toggleClass:n.toggleClass})])}}}),qf({factory:sp,schema:[fo("dom")],name:"button",defaults:function(){return{buttonBehaviours:tc([Vg.revoke()])}},overrides:function(e){return{dom:{tag:"span",attributes:{role:"presentation"}},action:function(n){n.getSystem().getByUid(e.uid).each(function(t){e.onExecute(t,n)})}}}}),Jf({factory:{sketch:function(t){return{uid:t.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:t.text}}}},schema:[fo("text")],name:"aria-descriptor"}),Kf({schema:[Xu()],name:"menu",defaults:function(o){return{onExecute:function(n,e){n.getSystem().getByUid(o.uid).each(function(t){o.onItemExecute(t,n,e)})}}}}),Ky()]),C_=Sl({name:"SplitDropdown",configFields:w_(),partFields:S_(),factory:function(o,t,n,e){function r(t){ud.getCurrent(t).each(function(t){gd.highlightFirst(t),Mg.focusIn(t)})}function i(t){Qy(o,h,t,e,r,Iy.HighlightFirst).get(st)}function u(t){return br(dl(t,o,"button")),vt.some(!0)}var a,c=lt(lt({},nu([eu(function(e,t){fl(e,o,"aria-descriptor").each(function(t){var n=Fr("aria");on(t.element,"id",n),on(e.element,"aria-describedby",n)})})])),xm(vt.some(i))),s={repositionMenus:function(t){zg.isOn(t)&&nx(t)}};return{uid:o.uid,dom:o.dom,components:t,apis:s,eventOrder:lt(lt({},o.eventOrder),((a={})[Fi()]=["disabling","toggling","alloy.base.behaviour"],a)),events:c,behaviours:Zs(o.splitDropdownBehaviours,[Yy.config({others:{sandbox:function(t){var n=dl(t,o,"arrow");return tx(o,t,{onOpen:function(){zg.on(n),zg.on(t)},onClose:function(){zg.off(n),zg.off(t)}})}}}),Mg.config({mode:"special",onSpace:u,onEnter:u,onDown:function(t){return i(t),vt.some(!0)}}),Vg.config({}),zg.config({toggleOnExecute:!1,aria:{mode:"expanded"}})]),domModification:{attributes:{role:o.role.getOr("button"),"aria-haspopup":!0}}}},apis:{repositionMenus:function(t,n){return t.repositionMenus(n)}}}),k_=Fr("focus-button"),O_=function(t,n,e){return XO(t,{toolbarButtonBehaviours:[].concat(0<e.length?[fm("toolbarButtonWith",e)]:[]),getApi:WO,onSetup:t.onSetup},n)},__=function(t,n,e){return Xo(XO(t,{toolbarButtonBehaviours:[Fg.config({}),zg.config({toggleClass:"tox-tbtn--enabled",aria:{mode:"pressed"},toggleOnExecute:!1})].concat(0<e.length?[fm("toolbarToggleButtonWith",e)]:[]),getApi:UO,onSetup:t.onSetup},n))},T_=[{name:"history",items:["undo","redo"]},{name:"styles",items:["styleselect"]},{name:"formatting",items:["bold","italic"]},{name:"alignment",items:["alignleft","aligncenter","alignright","alignjustify"]},{name:"indentation",items:["outdent","indent"]},{name:"permanent pen",items:["permanentpen"]},{name:"comments",items:["addcomment"]}],E_={button:YO(Cp,function(t,n){return e=n.backstage.shared.providers,O_(t,e,[]);var e}),togglebutton:YO(kp,function(t,n){return e=n.backstage.shared.providers,__(t,e,[]);var e}),menubutton:YO(nk,function(t,n){return L0(t,"tox-tbtn",n.backstage,vt.none())}),splitbutton:YO(function(t){return uo("SplitButton",K1,t)},function(t,n){return o=t,r=n.backstage.shared,s=Fr("channel-update-split-dropdown-display"),l=Vo(st),f={getApi:e,onSetup:o.onSetup},C_.sketch({dom:{tag:"div",classes:["tox-split-button"],attributes:lt({"aria-pressed":!1},jO(o.tooltip,r.providers))},onExecute:function(t){o.onAction(e(t))},onItemExecute:function(t,n,e){},splitDropdownBehaviours:tc([Gv(r.providers.isDisabled),mv(),fm("split-dropdown-events",[Cr(k_,Vg.focus),pv(f,l),hv(f,l)]),mw.config({})]),eventOrder:((i={})[ji()]=["alloy.base.behaviour","split-dropdown-events"],i),toggleClass:"tox-tbtn--enabled",lazySink:r.getSink,fetch:(u=e,a=o,c=r.providers,function(n){return Ny(function(t){return a.fetch(t)}).map(function(t){return vt.from(Wb(Xo(Cb(Fr("menu-value"),t,function(t){a.onItemAction(u(n),t)},a.columns,a.presets,xh.CLOSE_ON_EXECUTE,a.select.getOr(O),c),{movement:kb(a.columns,a.presets),menuBehaviours:Yh("auto"!==a.columns?[]:[eu(function(o,t){ih(o,4,qp(a.presets)).each(function(t){var n=t.numRows,e=t.numColumns;Mg.setGridSize(o,n,e)})})])})))})}),parts:{menu:$p(0,o.columns,o.presets)},components:[C_.parts.button(GO(o.icon,o.text,vt.none(),vt.some(s),vt.some([zg.config({toggleClass:"tox-tbtn--enabled",toggleOnExecute:!1})]),r.providers)),C_.parts.arrow({dom:{tag:"button",classes:["tox-tbtn","tox-split-button__chevron"],innerHtml:Lm("chevron-down",r.providers.icons)},buttonBehaviours:tc([Gv(r.providers.isDisabled),mv(),Wm()])}),C_.parts["aria-descriptor"]({text:r.providers.translate("To open the popup, press Shift+Enter")})]});function e(e){return{isDisabled:function(){return dd.isDisabled(e)},setDisabled:function(t){return dd.set(e,t)},setIconFill:function(t,n){Fu(e.element,'svg path[id="'+t+'"], rect[id="'+t+'"]').each(function(t){on(t,"fill",n)})},setIconStroke:function(t,n){Fu(e.element,'svg path[id="'+t+'"], rect[id="'+t+'"]').each(function(t){on(t,"stroke",n)})},setActive:function(n){on(e.element,"aria-pressed",n),Fu(e.element,"span").each(function(t){e.getSystem().getByDom(t).each(function(t){return zg.set(t,n)})})},isActive:function(){return Fu(e.element,"span").exists(function(t){return e.getSystem().getByDom(t).exists(zg.isOn)})}}}var o,r,i,u,a,c,s,l,f}),grouptoolbarbutton:YO(function(t){return uo("GroupToolbarButton",X1,t)},function(t,n,e){var o,r,i,u,a,c,s=e.ui.registry.getAll().buttons,l=((o={})[ts]=n.backstage.shared.header.isPositionedAtTop()?Cc.TopToBottom:Cc.BottomToTop,o);if(ov(e)!==hh.floating)throw new Error("Toolbar groups are only supported when using floating toolbar mode");return i=n.backstage,u=function(t){return B_(e,{buttons:s,toolbar:t,allowToolbarGroups:!1},n,vt.none())},a=l,c=i.shared,pO.sketch({lazySink:c.getSink,fetch:function(){return Ny(function(t){t(M(u(r.items),Ak))})},markers:{toggledClass:"tox-tbtn--enabled"},parts:{button:GO((r=t).icon,r.text,r.tooltip,vt.none(),vt.none(),c.providers),toolbar:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:a}}}})}),styleSelectButton:function(t,n){return Xk(t,e=n.backstage,LO(t,lt({type:"advanced"},e.styleselect)));var e},fontsizeSelectButton:function(t,n){return Xk(t,n.backstage,HO(t))},fontSelectButton:function(t,n){return Xk(t,n.backstage,PO(t))},formatButton:function(t,n){return Xk(t,n.backstage,NO(t))},alignMenuButton:function(t,n){return Xk(t,n.backstage,RO(t))}},D_={styleselect:E_.styleSelectButton,fontsizeselect:E_.fontsizeSelectButton,fontselect:E_.fontSelectButton,formatselect:E_.formatButton,align:E_.alignMenuButton},B_=function(o,c,s,l){var e,t,n,r,i=(n=c.toolbar,r=c.buttons,!1===n?[]:void 0===n||!0===n?(e=r,t=M(T_,function(t){var n=F(t.items,function(t){return Tt(e,t)||Tt(D_,t)});return{name:t.name,items:n}}),F(t,function(t){return 0<t.items.length})):y(n)?M(n.split("|"),function(t){return{items:t.trim().split(" ")}}):f(n,function(t){return Tt(t,"name")&&Tt(t,"items")})?n:(console.error("Toolbar type should be string, string[], boolean or ToolbarGroup[]"),[]));return F(M(i,function(t){var n=z(t.items,function(t){return 0===t.trim().length?[]:(r=o,n=c.buttons,i=t,u=c.allowToolbarGroups,a=s,e=l,tt(n,i.toLowerCase()).orThunk(function(){return e.bind(function(t){return K(t,function(t){return tt(n,t+i.toLowerCase())})})}).fold(function(){return tt(D_,i.toLowerCase()).map(function(t){return t(r,a)}).orThunk(function(){return vt.none()})},function(t){return"grouptoolbarbutton"!==t.type||u?(e=a,o=r,tt(E_,(n=t).type).fold(function(){return console.error("skipping button defined by",n),vt.none()},function(t){return vt.some(t(n,e,o))})):(console.warn("Ignoring the '"+i+"' toolbar button. Group toolbar buttons are only supported when using floating toolbar mode and cannot be nested."),vt.none());var n,e,o}).toArray());var r,n,i,u,a,e});return{title:vt.from(o.translate(t.name)),items:n}}),function(t){return 0<t.items.length})},M_=se(),A_=M_.os.isiOS()&&M_.os.version.major<=12,F_=Object.freeze({__proto__:null,render:function(e,n,t,o,r){var i=Vo(0),u=n.outerContainer;AO(e);var a=At.fromDom(r.targetNode),c=tn(me(a)),s=n.mothership;mf(a,s,Dn),Hs(c,n.uiMothership),e.on("PostRender",function(){qO(e,n,t,o),i.set(e.getWin().innerWidth),BO.setMenubar(u,Pk(e,t)),BO.setSidebar(u,t.sidebar),function(e,t){function n(){var t=c.get();t.left===u.innerWidth&&t.top===u.innerHeight||(c.set(Se(u.innerWidth,u.innerHeight)),Nv(e))}function o(){var t=e.getDoc().documentElement,n=s.get();n.left===t.offsetWidth&&n.top===t.offsetHeight||(s.set(Se(t.offsetWidth,t.offsetHeight)),Nv(e))}function r(t){return e.fire("ScrollContent",t)}var i=e.dom,u=e.getWin(),a=e.getDoc().documentElement,c=Vo(Se(u.innerWidth,u.innerHeight)),s=Vo(Se(a.offsetWidth,a.offsetHeight));i.bind(u,"resize",n),i.bind(u,"scroll",r);var l=gc(At.fromDom(e.getBody()),"load",o),f=t.uiMothership.element;e.on("hide",function(){fn(f,"display","none")}),e.on("show",function(){vn(f,"display")}),e.on("NodeChange",o),e.on("remove",function(){l.unbind(),i.unbind(u,"resize",n),i.unbind(u,"scroll",r),u=null})}(e,n)});var l,f,d,m,g=BO.getSocket(u).getOrDie("Could not find expected socket element");A_&&(dn(g.element,{overflow:"scroll","-webkit-overflow-scrolling":"touch"}),f=function(){e.fire("ScrollContent")},d=null,m=function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];b(d)&&(d=setTimeout(function(){d=null,f.apply(null,t)},20))},l=mc(g.element,"scroll",m),e.on("remove",l.unbind)),dv(e,n),e.addCommand("ToggleSidebar",function(t,n){BO.toggleSidebar(u,n),e.fire("ToggleSidebar")}),e.addQueryValueHandler("ToggleSidebar",function(){return BO.whichSidebar(u)});var p=ov(e);p!==hh.sliding&&p!==hh.floating||e.on("ResizeWindow ResizeEditor ResizeContent",function(){var t=e.getWin().innerWidth;t!==i.get()&&(BO.refreshToolbar(n.outerContainer),i.set(t))});var h={enable:function(){fv(n,!1)},disable:function(){fv(n,!0)},isDisabled:function(){return dd.isDisabled(u)}};return{iframeContainer:g.element.dom,editorContainer:u.element.dom,api:h}}}),I_=Object.freeze({__proto__:null,render:function(n,e,o,r,t){var i=e.mothership,u=e.uiMothership,a=e.outerContainer,c=Vo(null),s=At.fromDom(t.targetNode),l=ZO(n,s,e,r,c),f=n.getParam("toolbar_persist",!1,"boolean");function d(){var t;c.get()?l.show():(c.set(BO.getHeader(a).getOrDie()),Hs(t=cv(n),i),Hs(t,u),qO(n,e,o,r),BO.setMenubar(a,Pk(n,o)),l.show(),function(c,s,l,t){function n(t){var n=t_(s,l.isPositionedAtTop()),e=n.pos,o=n.bounds,r=f.get(),i=r.pos,u=r.bounds,a=o.height!==u.height||o.width!==u.width;f.set({pos:e,bounds:o}),a&&Nv(c,t),l.isVisible()&&(i!==e?l.update(!0):a&&(l.updateMode(),l.repositionPopups()))}var f=Vo(t_(s,l.isPositionedAtTop()));t||(c.on("activate",l.show),c.on("deactivate",l.hide)),c.on("SkinLoaded ResizeWindow",function(){return l.update(!0)}),c.on("NodeChange keydown",function(t){cp.requestAnimationFrame(function(){return n(t)})}),c.on("ScrollWindow",function(){return l.updateMode()});var e=fc();e.set(gc(At.fromDom(c.getBody()),"load",n)),c.on("remove",function(){e.clear()})}(n,s,l,f),n.nodeChanged())}function m(){return cp.setEditorTimeout(n,d,0)}FO(n),n.on("show",d),n.on("hide",l.hide),f||(n.on("focus",m),n.on("blur",l.hide)),n.on("init",function(){(n.hasFocus()||f)&&m()}),dv(n,e);var g={show:function(){l.show()},hide:function(){l.hide()},enable:function(){fv(e,!1)},disable:function(){fv(e,!0)},isDisabled:function(){return dd.isDisabled(a)}};return{editorContainer:a.element.dom,api:g}}}),R_="contexttoolbar-hide",V_=function(t,n){var e,o,r,i,u=t.label.fold(function(){return{}},function(t){return{"aria-label":t}}),a=Pm(Oy.sketch({inputClasses:["tox-toolbar-textfield","tox-toolbar-nav-js"],data:t.initValue(),inputAttributes:u,selectOnFocus:!0,inputBehaviours:tc([Mg.config({mode:"special",onEnter:function(t){return c.findPrimary(t).map(function(t){return br(t),!0})},onLeft:function(t,n){return n.cut(),vt.none()},onRight:function(t,n){return n.cut(),vt.none()}})])})),c=(e=a,o=t.commands,r=n,i=M(o,function(t){return Pm(("contextformtogglebutton"===t.type?function(t,n,e){var o=n.original;o.primary;var r=s(o,["primary"]),i=ao(kp(lt(lt({},r),{type:"togglebutton",onAction:st})));return __(i,e.backstage.shared.providers,[n_(t,n)])}:function(t,n,e){var o=n.original;o.primary;var r=s(o,["primary"]),i=ao(Cp(lt(lt({},r),{type:"button",onAction:st})));return O_(i,e.backstage.shared.providers,[n_(t,n)])})(e,t,{backstage:{shared:{providers:r}}}))}),{asSpecs:function(){return M(i,function(t){return t.asSpec()})},findPrimary:function(e){return K(o,function(t,n){return t.primary?vt.from(i[n]).bind(function(t){return t.getOpt(e)}).filter(C(dd.isDisabled)):vt.none()})}});return[{title:vt.none(),items:[a.asSpec()]},{title:vt.none(),items:c.asSpecs()}]},P_={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"],inset:["tox-pop--inset"]},H_={maxHeightFunction:Ic(),maxWidthFunction:dO()},z_=Fr("forward-slide"),N_=Fr("backward-slide"),L_=Fr("change-slide-event"),W_="tox-pop--resizing",U_="tox-pop--transition",j_={unsupportedLength:["em","ex","cap","ch","ic","rem","lh","rlh","vw","vh","vi","vb","vmin","vmax","cm","mm","Q","in","pc","pt","px"],fixed:["px","pt"],relative:["%"],empty:[""]},G_=(m_=["Infinity",(f_="[0-9]+")+"\\."+X_(f_)+X_(d_="[eE][+-]?[0-9]+"),"\\."+f_+X_(d_),f_+X_(d_)].join("|"),new RegExp("^([+-]?(?:"+m_+"))(.*)$"));function X_(t){return"(?:"+t+")?"}function Y_(u,a){function n(){var t=a.getOptions(u),r=a.getCurrent(u).map(a.hash),i=dc();return M(t,function(o){return{type:"togglemenuitem",text:a.display(o),onSetup:function(n){function t(t){t&&(i.on(function(t){return t.setActive(!1)}),i.set(n)),n.setActive(t)}t(mt(r,a.hash(o)));var e=a.watcher(u,o,t);return function(){i.clear(),e()}},onAction:function(){return a.setCurrent(u,o)}}})}u.ui.registry.addMenuButton(a.name,{tooltip:a.text,icon:a.icon,fetch:function(t){return t(n())},onSetup:a.onToolbarSetup}),u.ui.registry.addNestedMenuItem(a.name,{type:"nestedmenuitem",text:a.text,getSubmenuItems:n,onSetup:a.onMenuSetup})}function q_(t,n){return function(){t.execCommand("mceToggleFormat",!1,n)}}function K_(t){var n,e;!function(e){aS.each([{name:"bold",text:"Bold",icon:"bold"},{name:"italic",text:"Italic",icon:"italic"},{name:"underline",text:"Underline",icon:"underline"},{name:"strikethrough",text:"Strikethrough",icon:"strike-through"},{name:"subscript",text:"Subscript",icon:"subscript"},{name:"superscript",text:"Superscript",icon:"superscript"}],function(t,n){e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onSetup:Lk(e,t.name),onAction:q_(e,t.name)})});for(var t=1;t<=6;t++){var n="h"+t;e.ui.registry.addToggleButton(n,{text:n.toUpperCase(),tooltip:"Heading "+t,onSetup:Lk(e,n),onAction:q_(e,n)})}}(t),n=t,aS.each([{name:"cut",text:"Cut",action:"Cut",icon:"cut"},{name:"copy",text:"Copy",action:"Copy",icon:"copy"},{name:"paste",text:"Paste",action:"Paste",icon:"paste"},{name:"help",text:"Help",action:"mceHelp",icon:"help"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all"},{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document"},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting"},{name:"remove",text:"Remove",action:"Delete",icon:"remove"}],function(t){n.ui.registry.addButton(t.name,{tooltip:t.text,icon:t.icon,onAction:jk(n,t.action)})}),e=t,aS.each([{name:"blockquote",text:"Blockquote",action:"mceBlockQuote",icon:"quote"}],function(t){e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onAction:jk(e,t.action),onSetup:Lk(e,t.name)})})}function J_(n,e){return Wk(n,"Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",function(t){t.setDisabled(n.mode.isReadOnly()||!n.undoManager[e]())})}function $_(t){var n;t.ui.registry.addButton("visualaid",{tooltip:"Visual aids",text:"Visual aids",onAction:jk(t,"mceToggleVisualAid")}),t.ui.registry.addToggleMenuItem("visualaid",{text:"Visual aids",onSetup:Wk(n=t,"VisualAid",function(t){t.setActive(n.hasVisual)}),onAction:jk(t,"mceToggleVisualAid")})}function Q_(t,n){var e,o,r,i,u,a,c,s,l,f,d,m,g,p,h,v,b,y,x,w,S,C,k,O,_,T=t;St([{name:"alignleft",text:"Align left",cmd:"JustifyLeft",icon:"align-left"},{name:"aligncenter",text:"Align center",cmd:"JustifyCenter",icon:"align-center"},{name:"alignright",text:"Align right",cmd:"JustifyRight",icon:"align-right"},{name:"alignjustify",text:"Justify",cmd:"JustifyFull",icon:"align-justify"}],function(t){T.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onAction:jk(T,t.cmd),onSetup:Lk(T,t.name)})}),T.ui.registry.addButton("alignnone",{tooltip:"No alignment",icon:"align-none",onAction:jk(T,"JustifyNone")}),K_(O=t),_=O,aS.each([{name:"bold",text:"Bold",action:"Bold",icon:"bold",shortcut:"Meta+B"},{name:"italic",text:"Italic",action:"Italic",icon:"italic",shortcut:"Meta+I"},{name:"underline",text:"Underline",action:"Underline",icon:"underline",shortcut:"Meta+U"},{name:"strikethrough",text:"Strikethrough",action:"Strikethrough",icon:"strike-through",shortcut:""},{name:"subscript",text:"Subscript",action:"Subscript",icon:"subscript",shortcut:""},{name:"superscript",text:"Superscript",action:"Superscript",icon:"superscript",shortcut:""},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting",shortcut:""},{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document",shortcut:""},{name:"cut",text:"Cut",action:"Cut",icon:"cut",shortcut:"Meta+X"},{name:"copy",text:"Copy",action:"Copy",icon:"copy",shortcut:"Meta+C"},{name:"paste",text:"Paste",action:"Paste",icon:"paste",shortcut:"Meta+V"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all",shortcut:"Meta+A"}],function(t){_.ui.registry.addMenuItem(t.name,{text:t.text,icon:t.icon,shortcut:t.shortcut,onAction:jk(_,t.action)})}),_.ui.registry.addMenuItem("codeformat",{text:"Code",icon:"sourcecode",onAction:q_(_,"code")}),k=Gk(0,d=l=n,RO(f=s=t)),f.ui.registry.addNestedMenuItem("align",{text:d.shared.providers.translate("Align"),getSubmenuItems:function(){return k.items.validateItems(k.getStyleItems())}}),p=Gk(0,g=l,PO(m=s)),m.ui.registry.addNestedMenuItem("fontformats",{text:g.shared.providers.translate("Fonts"),getSubmenuItems:function(){return p.items.validateItems(p.getStyleItems())}}),h=s,b=lt({type:"advanced"},(v=l).styleselect),y=Gk(0,v,LO(h,b)),h.ui.registry.addNestedMenuItem("formats",{text:"Formats",getSubmenuItems:function(){return y.items.validateItems(y.getStyleItems())}}),w=Gk(0,l,NO(x=s)),x.ui.registry.addNestedMenuItem("blockformats",{text:"Blocks",getSubmenuItems:function(){return w.items.validateItems(w.getStyleItems())}}),C=Gk(0,l,HO(S=s)),S.ui.registry.addNestedMenuItem("fontsizes",{text:"Font sizes",getSubmenuItems:function(){return C.items.validateItems(C.getStyleItems())}}),(a=u=t).ui.registry.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onSetup:J_(a,"hasUndo"),onAction:jk(a,"undo")}),a.ui.registry.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onSetup:J_(a,"hasRedo"),onAction:jk(a,"redo")}),(c=u).ui.registry.addButton("undo",{tooltip:"Undo",icon:"undo",disabled:!0,onSetup:J_(c,"hasUndo"),onAction:jk(c,"undo")}),c.ui.registry.addButton("redo",{tooltip:"Redo",icon:"redo",disabled:!0,onSetup:J_(c,"hasRedo"),onAction:jk(c,"redo")}),function(t){var i;(i=t).addCommand("mceApplyTextcolor",function(t,n){var e,o=t,r=n;(e=i).undoManager.transact(function(){e.focus(),e.formatter.apply(o,{value:r}),e.nodeChanged()})}),i.addCommand("mceRemoveTextcolor",function(t){var n,e=t;(n=i).undoManager.transact(function(){n.focus(),n.formatter.remove(e,{value:null},null,!0),n.nodeChanged()})});var n=Vo(null),e=Vo(null);wb(t,"forecolor","forecolor","Text color",n),wb(t,"backcolor","hilitecolor","Background color",e),Sb(t,"forecolor","forecolor","Text color"),Sb(t,"backcolor","hilitecolor","Background color")}(t),$_(t),(r=t).ui.registry.addButton("outdent",{tooltip:"Decrease indent",icon:"outdent",onSetup:Wk(i=r,"NodeChange",function(t){t.setDisabled(!i.queryCommandState("outdent"))}),onAction:jk(r,"outdent")}),r.ui.registry.addButton("indent",{tooltip:"Increase indent",icon:"indent",onAction:jk(r,"indent")}),Y_(e=t,PT),o=e,vt.from(o.getParam("content_langs",void 0,"array")).map(function(t){return{name:"language",text:"Language",icon:"language",getOptions:rt(t),hash:function(t){return E(t.customCode)?t.code:t.code+"/"+t.customCode},display:function(t){return t.title},watcher:function(t,n,e){return t.formatter.formatChanged("lang",e,!1,{value:n.code,customValue:n.customCode}).unbind},getCurrent:function(t){return dr(At.fromDom(t.selection.getNode()),function(t){return vt.some(t).filter(Gn).bind(function(n){return un(n,"lang").map(function(t){return{code:t,customCode:un(n,"data-mce-lang").getOrUndefined(),title:""}})})})},setCurrent:function(t,n){return t.execCommand("Lang",!1,n)},onToolbarSetup:function(t){var n=fc();return t.setActive(o.formatter.match("lang",{},void 0,!0)),n.set(o.formatter.formatChanged("lang",t.setActive,!0)),n.clear}}}).each(function(t){return Y_(e,t)})}function Z_(t,n){return{type:"makeshift",x:t,y:n}}function tT(t){return"longpress"===t.type||0===t.type.indexOf("touch")}function nT(t,n){return"contextmenu"===n.type||"longpress"===n.type?t.inline?function(t){if(tT(t)){var n=t.touches[0];return Z_(n.pageX,n.pageY)}return Z_(t.pageX,t.pageY)}(n):(e=t.getContentAreaContainer(),o=function(t){if(tT(t)){var n=t.touches[0];return Z_(n.clientX,n.clientY)}return Z_(t.clientX,t.clientY)}(n),r=tv.DOM.getPos(e),i=r.x,u=r.y,Z_(o.x+i,o.y+u)):HT(t);var e,o,r,i,u}function eT(t,n,e){switch(e){case"node":return{type:"node",node:vt.some(At.fromDom((o=t).selection.getNode())),root:At.fromDom(o.getBody())};case"point":return nT(t,n);case"selection":return HT(t)}var o}function oT(f,d,m,g,p,h){function t(){var n,e,t,o,r,i,u,a,c,s,l=m();t=l,o=g,r=p,u=!(y||v||b&&x),c=eT(n=f,e=d,a=i=h),s=lt({bubble:xc(0,"point"===a?12:0,NT),layouts:zT,overrides:{maxWidthFunction:dO(),maxHeightFunction:Ic()}},c),z0(t,xh.CLOSE_ON_EXECUTE,o,!0).map(function(t){e.preventDefault(),rp.showMenuWithinBounds(r,{anchor:s},{menu:{markers:Jp("normal"),highlightImmediately:u},data:t,type:"horizontal"},function(){return vt.some(r_(n,o.shared,"node"===i?"node":"selection"))}),n.fire(R_)})}var n,e=se(),v=e.os.isiOS(),b=e.os.isOSX(),y=e.os.isAndroid(),x=e.deviceType.isTouch();(b||v)&&"node"!==h?(n=function(){(function(t){function n(){cp.setEditorTimeout(t,function(){t.selection.setRng(e)},10),i()}var e=t.selection.getRng();function o(t){t.preventDefault(),t.stopImmediatePropagation()}function r(){return i()}t.once("touchend",n),t.on("mousedown",o,!0),t.once("longpresscancel",r);var i=function(){t.off("touchend",n),t.off("longpresscancel",r),t.off("mousedown",o)}})(f),t()},function(t,n){var e=t.selection;if(!(e.isCollapsed()||n.touches.length<1)){var o=n.touches[0],r=e.getRng();return bs(t.getWin(),fs.domRange(r)).exists(function(t){return t.left<=o.clientX&&t.right>=o.clientX&&t.top<=o.clientY&&t.bottom>=o.clientY})}}(f,d)?n():(f.once("selectionchange",n),f.once("touchend",function(){return f.off("selectionchange",n)}))):t()}function rT(t){return"string"==typeof t?t.split(/[ ,]/):t}function iT(t){return t.getParam("contextmenu_never_use_native",!1,"boolean")}function uT(t){return y(t)?"|"===t:"separator"===t.type}function aT(t,n){if(0===n.length)return t;var e=q(t).filter(function(t){return!uT(t)}).fold(function(){return[]},function(t){return[LT]});return t.concat(e).concat(n).concat([LT])}function cT(t,n){return"longpress"!==n.type&&(2!==n.button||n.target===t.getBody()&&""===n.pointerType)}function sT(t,n){return cT(t,n)?t.selection.getStart(!0):n.target}function lT(s,t,n){function e(t){return rp.hide(i)}function o(c){var t;iT(s)&&c.preventDefault(),c.ctrlKey&&!iT(s)||!1===s.getParam("contextmenu")||(t=function(t,n){var e=t.getParam("contextmenu_avoid_overlap","","string"),o=cT(t,n)?"selection":"point";if(at(e)){var r=sT(t,n);return Ub(At.fromDom(r),e)?"node":o}return o}(s,c),(r()?oT:function(t,n,e,o,r,i){var u=e(),a=eT(t,n,i);z0(u,xh.CLOSE_ON_EXECUTE,o,!1).map(function(t){n.preventDefault(),rp.showMenuAt(r,{anchor:a},{menu:{markers:Jp("normal")},data:t})})})(s,c,function(){var t,n,e,o=sT(s,c),r=s.ui.registry.getAll(),i=(e=(n=s).ui.registry.getAll().contextMenus,vt.from(n.getParam("contextmenu")).map(rT).getOrThunk(function(){return F(rT("link linkchecker image imagetools table spellchecker configurepermanentpen"),function(t){return Tt(e,t)})})),u=r.contextMenus,a=o;return 0<(t=R(i,function(o,t){return tt(u,t.toLowerCase()).map(function(t){var n=t.update(a);if(y(n))return aT(o,n.split(" "));if(0<n.length){var e=M(n,WT);return aT(o,e)}return o}).getOrThunk(function(){return o.concat([t])})},[])).length&&uT(t[t.length-1])&&t.pop(),t},n,i,t))}var r=se().deviceType.isTouch,i=_u(rp.sketch({dom:{tag:"div"},lazySink:t,onEscape:function(){return s.focus()},onShow:function(){return n.setContextMenuState(!0)},onHide:function(){return n.setContextMenuState(!1)},fireDismissalEventInstead:{},inlineBehaviours:tc([fm("dismissContextMenu",[Cr(Xi(),function(t,n){hf.close(t),s.focus()})])])}));s.on("init",function(){var t="ResizeEditor ScrollContent ScrollWindow longpresscancel"+(r()?"":" ResizeWindow");s.on(t,e),s.on("longpress contextmenu",o)})}function fT(n){return function(t){return t.translate(-n.left,-n.top)}}function dT(n){return function(t){return t.translate(n.left,n.top)}}function mT(e){return function(t,n){return R(e,function(t,n){return n(t)},Se(t,n))}}function gT(t,n,e){return t.fold(mT([dT(e),fT(n)]),mT([fT(n)]),mT([]))}function pT(t,n,e){return t.fold(mT([dT(e)]),mT([]),mT([dT(n)]))}function hT(t,n,e){return t.fold(mT([]),mT([fT(e)]),mT([dT(n),fT(e)]))}function vT(t,n,e){var o=t.fold(function(t,n){return{position:vt.some("absolute"),left:vt.some(t+"px"),top:vt.some(n+"px")}},function(t,n){return{position:vt.some("absolute"),left:vt.some(t-e.left+"px"),top:vt.some(n-e.top+"px")}},function(t,n){return{position:vt.some("fixed"),left:vt.some(t+"px"),top:vt.some(n+"px")}});return lt({right:vt.none(),bottom:vt.none()},o)}function bT(t,i,u,a){function n(o,r){return function(t,n){var e=o(i,u,a);return r(t.getOr(e.left),n.getOr(e.top))}}return t.fold(n(hT,jT),n(pT,GT),n(gT,XT))}function yT(t,n){var e=rn(t,n);return E(e)?NaN:parseInt(e,10)}function xT(t,n,e,o,r,i){var u,a,c,s,l,f,d=(u=e,a=o,l=yT(s=t.element,(c=n).leftAttr),f=yT(s,c.topAttr),(isNaN(l)||isNaN(f)?vt.none():vt.some(Se(l,f))).fold(function(){return u},function(t){return XT(t.left+a.left,t.top+a.top)})),m=(n.mustSnap?YT:qT)(t,n,d,r,i),g=gT(d,r,i),p=n,h=g,v=t.element;return on(v,p.leftAttr,h.left+"px"),on(v,p.topAttr,h.top+"px"),m.fold(function(){return{coord:XT(g.left,g.top),extra:vt.none()}},function(t){return{coord:t.output,extra:t.extra}})}function wT(t,c,s,l){return K(t,function(t){var n,e,o=t.sensor,r=t.range.left,i=t.range.top,u=pT(c,n=s,e=l),a=pT(o,n,e);return Math.abs(u.left-a.left)<=r&&Math.abs(u.top-a.top)<=i?vt.some({output:bT(t.output,c,s,l),extra:t.extra}):vt.none()})}function ST(t,n){var e;t.getSystem().addToGui(n),Yt((e=n).element).filter(Gn).each(function(n){pn(n,"z-index").each(function(t){on(n,JT,t)}),fn(n,"z-index",gn(e.element,"z-index"))})}function CT(t){Yt(t.element).filter(Gn).each(function(n){un(n,JT).fold(function(){return vn(n,"z-index")},function(t){return fn(n,"z-index",t)}),cn(n,JT)}),t.getSystem().removeFromGui(t)}function kT(t,n,e){return t.getSystem().build(uy.sketch({dom:{styles:{left:"0px",top:"0px",width:"100%",height:"100%",position:"fixed","z-index":"1000000000000000"},classes:[n]},events:e}))}function OT(t,n){return{bounds:t.getBounds(),height:wn(n.element),width:On(n.element)}}function _T(B,M,t,n,e){var o=t.update(n,e),A=t.getStartData().getOrThunk(function(){return OT(M,B)});o.each(function(t){var n,e,o,r,i,u,a,c,s,l,f,d,m,g,p,h,v,b,y,x,w,S,C,k,O,_=B,T=A,E=t,D=(n=M).getTarget(_.element);n.repositionTarget&&(e=In(Ut(_.element)),o=zC(D),S=pn(w=D,"left"),C=pn(w,"top"),k=pn(w,"position"),O=function(t,n,e){return("fixed"===e?XT:jT)(parseInt(t,10),parseInt(n,10))},r=(S.isSome()&&C.isSome()&&k.isSome()?vt.some(O(S.getOrDie(),C.getOrDie(),k.getOrDie())):vt.none()).getOrThunk(function(){var t=Cn(w);return GT(t.left,t.top)}),i=_,u=n.snaps,a=r,c=e,s=o,l=E,f=T,m=u.fold(function(){var e,o,t=gT((e=l.left,o=l.top,a.fold(function(t,n){return jT(t+e,n+o)},function(t,n){return GT(t+e,n+o)},function(t,n){return XT(t+e,n+o)})),c,s);return XT(t.left,t.top)},function(n){var t=xT(i,n,a,l,c,s);return t.extra.each(function(t){n.onSensor(i,t)}),t.coord}),g=c,p=s,h=(d=f).bounds,v=pT(m,g,p),b=Ua(v.left,h.x,h.x+h.width-d.width),y=Ua(v.top,h.y,h.y+h.height-d.height),x=GT(b,y),mn(D,vT(m.fold(function(){var t=hT(x,g,p);return jT(t.left,t.top)},rt(x),function(){var t=gT(x,g,p);return XT(t.left,t.top)}),0,o))),n.onDrag(_,D,E)})}function TT(o,t,n,e){t.each(CT),n.snaps.each(function(t){var n,e;n=t,cn(e=o.element,n.leftAttr),cn(e,n.topAttr)});var r=n.getTarget(o.element);e.reset(),n.onDrop(o,r)}function ET(t){return function(n,e){function o(t){e.setStartData(OT(n,t))}return nu(H([Cr(Wi(),function(t){e.getStartData().each(function(){return o(t)})})],t(n,e,o),!0))}}function DT(a,c,s){return[Cr(di(),function(n,t){var e,o,r,i,u;0===t.event.raw.button&&(t.stop(),r={drop:e=function(){return TT(n,vt.some(i),a,c)},delayDrop:(o=jb(e,200)).schedule,forceDrop:e,move:function(t){o.cancel(),_T(n,a,c,ZT,t)}},i=kT(n,a.blockerClass,(u=r,nu([Cr(di(),u.forceDrop),Cr(pi(),u.drop),Cr(mi(),function(t,n){u.move(n.event)}),Cr(gi(),u.delayDrop)]))),s(n),ST(n,i))})]}function BT(a,c,s){function l(t){TT(t,f.get(),a,c),f.clear()}var f=dc();return[Cr(ci(),function(n,t){function e(){return l(n)}t.stop();var o,r,i,u=kT(n,a.blockerClass,(r=o=e,i=function(t){_T(n,a,c,nE,t)},nu([Cr(ci(),r),Cr(li(),o),Cr(fi(),o),Cr(si(),function(t,n){i(n.event)})])));f.set(u),s(n),ST(n,u)}),Cr(si(),function(t,n){n.stop(),_T(t,a,c,nE,n.event)}),Cr(li(),function(t,n){n.stop(),l(t)}),Cr(fi(),l)]}function MT(t,r,i,u,n,e){return t.fold(function(){return rE.snap({sensor:GT(i-20,u-20),range:Se(n,e),output:GT(vt.some(i),vt.some(u)),extra:{td:r}})},function(t){var n=i-20,e=u-20,o=t.element.dom.getBoundingClientRect();return rE.snap({sensor:GT(n,e),range:Se(40,40),output:GT(vt.some(i-o.width/2),vt.some(u-o.height/2)),extra:{td:r}})})}function AT(t,i,u){return{getSnapPoints:t,leftAttr:"data-drag-left",topAttr:"data-drag-top",onSensor:function(t,n){var e=n.td,o=i.get(),r=e;o.exists(function(t){return Lt(t,r)})||(i.set(e),u(e))},mustSnap:!0}}function FT(t){return Pm(sp.sketch({dom:{tag:"div",classes:["tox-selector"]},buttonBehaviours:tc([rE.config({mode:"mouseOrTouch",blockerClass:"blocker",snaps:t}),mw.config({})]),eventOrder:{mousedown:["dragging","alloy.base.behaviour"],touchstart:["dragging","alloy.base.behaviour"]}}))}function IT(a,e){function n(t){var n=zn(t);return MT(g.getOpt(e),t,n.x,n.y,n.width,n.height)}function o(t){var n=zn(t);return MT(p.getOpt(e),t,n.right,n.bottom,n.width,n.height)}function r(t,i,n,u){var e=n(i);rE.snapTo(t,e),function(t){var n=i.dom.getBoundingClientRect();vn(t.element,"display");var e=Xt(At.fromDom(a.getBody())).dom.innerHeight,o=n[u]<0,r=n[u]>e;(o||r)&&fn(t.element,"display","none")}(t)}function i(t){return r(h,t,n,"top")}function u(t){return r(v,t,o,"bottom")}var c=Vo([]),s=Vo([]),t=Vo(!1),l=dc(),f=dc(),d=AT(function(){return M(c.get(),n)},l,function(n){f.get().each(function(t){a.fire("TableSelectorChange",{start:n,finish:t})})}),m=AT(function(){return M(s.get(),o)},f,function(n){l.get().each(function(t){a.fire("TableSelectorChange",{start:t,finish:n})})}),g=FT(d),p=FT(m),h=_u(g.asSpec()),v=_u(p.asSpec());se().deviceType.isTouch()&&(a.on("TableSelectionChange",function(n){t.get()||(Is(e,h),Is(e,v),t.set(!0)),l.set(n.start),f.set(n.finish),n.otherCells.each(function(t){c.set(t.upOrLeftCells),s.set(t.downOrRightCells),i(n.start),u(n.finish)})}),a.on("ResizeEditor ResizeWindow ScrollContent",function(){l.get().each(i),f.get().each(u)}),a.on("TableSelectionClear",function(){t.get()&&(Vs(h),Vs(v),t.set(!1)),l.clear(),f.clear()}))}var RT,VT,PT={name:"lineheight",text:"Line height",icon:"line-height",getOptions:function(t){return t.getParam("lineheight_formats","1 1.1 1.2 1.3 1.4 1.5 2","string").split(" ")},hash:function(t){return r=["fixed","relative","empty"],vt.from(G_.exec(t)).bind(function(t){var n=Number(t[1]),e=t[2],o=e;return T(r,function(t){return T(j_[t],function(t){return o===t})})?vt.some({value:n,unit:e}):vt.none()}).map(function(t){return t.value+t.unit}).getOr(t);var r},display:h,watcher:function(t,n,e){return t.formatter.formatChanged("lineheight",e,!1,{value:n}).unbind},getCurrent:function(t){return vt.from(t.queryCommandValue("LineHeight"))},setCurrent:function(t,n){return t.execCommand("LineHeight",!1,n)}},HT=function(t){return{type:"selection",root:At.fromDom(t.selection.getNode())}},zT={onLtr:function(){return[Ja,Ga,Xa,Ya,qa,Ka,up,ap,Bm,Em,Dm,Tm]},onRtl:function(){return[Ja,Xa,Ga,qa,Ya,Ka,up,ap,Dm,Tm,Bm,Em]}},NT={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"]},LT={type:"separator"},WT=function(n){function t(t){return{text:t.text,icon:t.icon,disabled:t.disabled,shortcut:t.shortcut}}var e;if(y(n))return n;switch(n.type){case"separator":return LT;case"submenu":return lt(lt({type:"nestedmenuitem"},t(n)),{getSubmenuItems:function(){var t=n.getSubmenuItems();return y(t)?t:M(t,WT)}});default:return lt(lt({type:"menuitem"},t(n)),{onAction:(e=n.onAction,function(){return e()})})}},UT=Po([{offset:["x","y"]},{absolute:["x","y"]},{fixed:["x","y"]}]),jT=UT.offset,GT=UT.absolute,XT=UT.fixed,YT=function(t,n,l,f,d){var e=n.getSnapPoints(t);return wT(e,l,f,d).orThunk(function(){return R(e,function(n,e){var t,o,r,i,u,a,c,s=(t=e.sensor,e.range.left,e.range.top,i=pT(l,o=f,r=d),u=pT(t,o,r),a=Math.abs(i.left-u.left),c=Math.abs(i.top-u.top),Se(a,c));return n.deltas.fold(function(){return{deltas:vt.some(s),snap:vt.some(e)}},function(t){return(s.left+s.top)/2<=(t.left+t.top)/2?{deltas:vt.some(s),snap:vt.some(e)}:n})},{deltas:vt.none(),snap:vt.none()}).snap.map(function(t){return{output:bT(t.output,l,f,d),extra:t.extra}})})},qT=function(t,n,e,o,r){return wT(n.getSnapPoints(t),e,o,r)},KT=Object.freeze({__proto__:null,snapTo:function(t,n,e,o){var r,i,u,a=n.getTarget(t.element);n.repositionTarget&&(r=In(Ut(t.element)),i=zC(a),mn(a,vT({coord:bT((u=o).output,u.output,r,i),extra:u.extra}.coord,0,i)))}}),JT="data-initial-z-index",$T=_o("snaps",[fo("getSnapPoints"),Ku("onSensor"),fo("leftAttr"),fo("topAttr"),To("lazyViewport",Ae),To("mustSnap",!1)]),QT=[To("useFixed",O),fo("blockerClass"),To("getTarget",h),To("onDrag",st),To("repositionTarget",!0),To("onDrop",st),Fo("getBounds",Ae),$T],ZT=Object.freeze({__proto__:null,getData:function(t){return vt.from(Se(t.x,t.y))},getDelta:function(t,n){return Se(n.left-t.left,n.top-t.top)}}),tE=H(H([],QT,!0),[Zu("dragger",{handlers:ET(DT)})],!1),nE=Object.freeze({__proto__:null,getData:function(t){var n,e=t.raw.touches;return 1===e.length?(n=e[0],vt.some(Se(n.clientX,n.clientY))):vt.none()},getDelta:function(t,n){return Se(n.left-t.left,n.top-t.top)}}),eE=H(H([],QT,!0),[Zu("dragger",{handlers:ET(BT)})],!1),oE=H(H([],QT,!0),[Zu("dragger",{handlers:ET(function(t,n,e){return H(H([],DT(t,n,e),!0),BT(t,n,e),!0)})})],!1),rE=xa({branchKey:"mode",branches:Object.freeze({__proto__:null,mouse:tE,touch:eE,mouseOrTouch:oE}),name:"dragging",active:{events:function(t,n){return t.dragger.handlers(t,n)}},extra:{snap:function(t){return{sensor:t.sensor,range:t.range,output:t.output,extra:vt.from(t.extra)}}},state:Object.freeze({__proto__:null,init:function(){var i=vt.none(),n=vt.none(),t=rt({});return xu({readState:t,reset:function(){i=vt.none(),n=vt.none()},update:function(r,t){return r.getData(t).bind(function(t){return n=r,e=t,o=i.map(function(t){return n.getDelta(t,e)}),i=vt.some(e),o;var n,e,o})},getStartData:function(){return n},setStartData:function(t){n=vt.some(t)}})}}),apis:KT});function iE(t,n,e){var o,r,i,u,a,c,s=At.fromDom(t.getContainer());J((o=t,r=n,i=e,u=xn(s),a=kn(s),(c={}).height=$O(u+r.top,lh(o),dh(o)),i===RT.Both&&(c.width=$O(a+r.left,sh(o),fh(o))),c),function(t,n){return fn(s,n,JO(t)),0}),t.fire("ResizeEditor")}function uE(t,n,e,o){return iE(t,Se(20*e,20*o),n),vt.some(!0)}function aE(t,n){var e,o,r,i,u,a,c,s,l,f,d,m,g,p,h,v;return{dom:{tag:"div",classes:["tox-statusbar"]},components:(v=[],t.getParam("elementpath",!0,"boolean")&&v.push((g=t,h=n,(p={}).delimiter||(p.delimiter="\xbb"),{dom:{tag:"div",classes:["tox-statusbar__path"],attributes:{role:"navigation"}},behaviours:tc([Mg.config({mode:"flow",selector:"div[role=button]"}),dd.config({disabled:h.isDisabled}),mv(),fy.config({}),Fg.config({}),fm("elementPathEvents",[eu(function(r,t){g.shortcuts.add("alt+F11","focus statusbar elementpath",function(){return Mg.focusIn(r)}),g.on("NodeChange",function(t){var n,o,e=function(t){for(var n=[],e=t.length;0<e--;){var o=t[e];if(1===o.nodeType&&!function(t){if(1===t.nodeType){if("BR"===t.nodeName||t.getAttribute("data-mce-bogus"))return 1;if("bookmark"===t.getAttribute("data-mce-type"))return 1}}(o)){var r=g.fire("ResolveName",{name:o.nodeName.toLowerCase(),target:o});if(r.isDefaultPrevented()||n.push({name:r.name,element:o}),r.isPropagationStopped())break}}return n}(t.parents);0<e.length?Fg.set(r,(n=M(e||[],function(n,t){return sp.sketch({dom:{tag:"div",classes:["tox-statusbar__path-item"],attributes:{role:"button","data-index":t,"tab-index":-1,"aria-level":t+1},innerHtml:n.name},action:function(t){g.focus(),g.selection.select(n.element),g.nodeChanged()},buttonBehaviours:tc([Kv(h.isDisabled),mv()])})}),o={dom:{tag:"div",classes:["tox-statusbar__path-divider"],attributes:{"aria-hidden":!0},innerHtml:" "+p.delimiter+" "}},R(n.slice(1),function(t,n){var e=t;return e.push(o),e.push(n),e},[n[0]]))):Fg.set(r,[])})})])]),components:[]})),t.hasPlugin("wordcount")&&v.push((f=t,d=n,sp.sketch({dom:{tag:"button",classes:["tox-statusbar__wordcount"]},components:[],buttonBehaviours:tc([Kv(d.isDisabled),mv(),fy.config({}),Fg.config({}),Tf.config({store:{mode:"memory",initialValue:{mode:"words",count:{words:0,characters:0}}}}),fm("wordcount-events",[iu(function(t){var n=Tf.getValue(t),e="words"===n.mode?"characters":"words";Tf.setValue(t,{mode:e,count:n.count}),b(t,n.count,e)}),eu(function(e){f.on("wordCountUpdate",function(t){var n=Tf.getValue(e).mode;Tf.setValue(e,{mode:n,count:t.wordCount}),b(e,t.wordCount,n)})})])]),eventOrder:((m={})[Fi()]=["disabling","alloy.base.behaviour","wordcount-events"],m)}))),t.getParam("branding",!0,"boolean")&&v.push({dom:{tag:"span",classes:["tox-statusbar__branding"],innerHtml:'<a href="https://www.tiny.cloud/?utm_campaign=editor_referral&amp;utm_medium=poweredby&amp;utm_source=tinymce&amp;utm_content=v5" rel="noopener" target="_blank" tabindex="-1" aria-label="'+(l=lp.translate(["Powered by {0}","Tiny"]))+'">'+l+"</a>"}}),e=0<v.length?[{dom:{tag:"div",classes:["tox-statusbar__text-container"]},components:v}]:[],i=n,a=!(u=r=t).hasPlugin("autoresize"),o=(s=!1===(c=u.getParam("resize",a))?RT.None:"both"===c?RT.Both:RT.Vertical)===RT.None?vt.none():vt.some(jm("resize-handle",{tag:"div",classes:["tox-statusbar__resize-handle"],attributes:{title:i.translate("Resize")},behaviours:[rE.config({mode:"mouse",repositionTarget:!1,onDrag:function(t,n,e){return iE(r,e,s)},blockerClass:"tox-blocker"}),Mg.config({mode:"special",onLeft:function(){return uE(r,s,-1,0)},onRight:function(){return uE(r,s,1,0)},onUp:function(){return uE(r,s,0,-1)},onDown:function(){return uE(r,s,0,1)}}),fy.config({}),Vg.config({})]},i.icons)),e.concat(o.toArray()))};function b(t,n,e){return Fg.set(t,[oi(d.translate(["{0} "+e,n[e]]))])}}function cE(d){function m(){return i.bind(BO.getHeader)}function g(){return Re.value(y)}function p(){return i.bind(function(t){return BO.getThrobber(t)}).getOrDie("Could not find throbber element")}var t,n,e,o,r=d.inline,h=r?I_:F_,v=lv(d)?G1:R1,i=vt.none(),u=se(),a=u.browser.isIE()?["tox-platform-ie"]:[],c=u.deviceType.isTouch()?["tox-platform-touch"]:[],s=iv(d),l=cv(d),f=lp.isRtl()?{attributes:{dir:"rtl"}}:{},b={attributes:((t={})[ts]=s?Cc.BottomToTop:Cc.TopToBottom,t)},y=_u((n=Lt(ve(),l)&&"grid"===gn(l,"display"),e={dom:lt({tag:"div",classes:["tox","tox-silver-sink","tox-tinymce-aux"].concat(a).concat(c)},f),behaviours:tc([sf.config({useFixed:function(){return v.isDocked(m)}})])},o={dom:{styles:{width:document.body.clientWidth+"px"}},events:nu([Cr(Ui(),function(){fn(J.element,"width",document.body.clientWidth+"px")})])},Xo(e,n?o:{}))),x=Pm({dom:{tag:"div",classes:["tox-anchorbar"]}}),w=PC(y,d,function(){return i.bind(function(t){return x.getOpt(t)}).getOrDie("Could not find a anchor bar element")}),S=BO.parts.menubar({dom:{tag:"div",classes:["tox-menubar"]},backstage:w,onEscape:function(){d.focus()}}),C=ov(d),k=BO.parts.toolbar(lt({dom:{tag:"div",classes:["tox-toolbar"]},getSink:g,providers:w.shared.providers,onEscape:function(){d.focus()},type:C,lazyToolbar:function(){return i.bind(function(t){return BO.getToolbar(t)}).getOrDie("Could not find more toolbar element")},lazyHeader:function(){return m().getOrDie("Could not find header element")}},b)),O=BO.parts["multiple-toolbar"]({dom:{tag:"div",classes:["tox-toolbar-overlord"]},providers:w.shared.providers,onEscape:function(){d.focus()},type:C}),_=BO.parts.socket({dom:{tag:"div",classes:["tox-edit-area"]}}),T=BO.parts.sidebar({dom:{tag:"div",classes:["tox-sidebar"]}}),E=BO.parts.throbber({dom:{tag:"div",classes:["tox-throbber"]},backstage:w}),D=d.getParam("statusbar",!0,"boolean")&&!r?vt.some(aE(d,w.shared.providers)):vt.none(),B={dom:{tag:"div",classes:["tox-sidebar-wrap"]},components:[_,T]},M=ev(d),A=gh(d),F=mh(d),I=BO.parts.header({dom:lt({tag:"div",classes:["tox-editor-header"]},b),components:ft([F?[S]:[],M?[O]:A?[k]:[],av(d)?[]:[x.asSpec()]]),sticky:lv(d),editor:d,sharedBackstage:w.shared}),R=ft([s?[]:[I],r?[]:[B],s?[I]:[]]),V=ft([[{dom:{tag:"div",classes:["tox-editor-container"]},components:R}],r?[]:D.toArray(),[E]]),P=sv(d),H=lt(lt({role:"application"},lp.isRtl()?{dir:"rtl"}:{}),P?{"aria-hidden":"true"}:{}),z=_u(BO.sketch({dom:{tag:"div",classes:["tox","tox-tinymce"].concat(r?["tox-tinymce-inline"]:[]).concat(s?["tox-tinymce--toolbar-bottom"]:[]).concat(c).concat(a),styles:lt({visibility:"hidden"},P?{opacity:"0",border:"0"}:{}),attributes:H},components:V,behaviours:tc([mv(),dd.config({disableClass:"tox-tinymce--disabled"}),Mg.config({mode:"cyclic",selector:".tox-menubar, .tox-toolbar, .tox-toolbar__primary, .tox-toolbar__overflow--open, .tox-sidebar__overflow--open, .tox-statusbar__path, .tox-statusbar__wordcount, .tox-statusbar__branding a, .tox-statusbar__resize-handle"})])})),i=vt.some(z);d.shortcuts.add("alt+F9","focus menubar",function(){BO.focusMenubar(z)}),d.shortcuts.add("alt+F10","focus toolbar",function(){BO.focusToolbar(z)}),d.addCommand("ToggleToolbarDrawer",function(){BO.toggleToolbarDrawer(z)}),d.addQueryStateHandler("ToggleToolbarDrawer",function(){return BO.isToolbarDrawerToggled(z)});var N,L,W,U,j,G,X,Y,q,K=$b(z),J=$b(y);function $(){var t,n,e,o,r,i,u=JO((o=ah(e=n=d),r=lh(e),i=dh(e),KO(o).map(function(t){return $O(t,r,i)}).getOr(ah(n)))),a=JO(QO(t=d).getOr(ch(t)));return d.inline||(hn("div","width",a)&&fn(z.element,"width",a),hn("div","height",u)?fn(z.element,"height",u):fn(z.element,"height","200px")),u}return N=d,L=K,W=J,U=wa(),j=mc(U,"touchstart",tt),G=mc(U,"touchmove",function(t){return Q(Ni(),t)}),X=mc(U,"touchend",function(t){return Q(Li(),t)}),Y=mc(U,"mousedown",tt),q=mc(U,"mouseup",function(t){0===t.raw.button&&Z(yf(),{target:t.target})}),N.on("PostRender",function(){N.on("click",nt),N.on("tap",nt),N.on("mouseup",et),N.on("mousedown",ot),N.on("ScrollWindow",rt),N.on("ResizeWindow",it),N.on("ResizeEditor",ut),N.on("AfterProgressState",at),N.on("DismissPopups",ct)}),N.on("remove",function(){N.off("click",nt),N.off("tap",nt),N.off("mouseup",et),N.off("mousedown",ot),N.off("ScrollWindow",rt),N.off("ResizeWindow",it),N.off("ResizeEditor",ut),N.off("AfterProgressState",at),N.off("DismissPopups",ct),Y.unbind(),j.unbind(),G.unbind(),X.unbind(),q.unbind()}),N.on("detach",function(){zs(L),zs(W),L.destroy(),W.destroy()}),{mothership:K,uiMothership:J,backstage:w,renderUI:function(){var o,r;v.setup(d,w.shared,m),Q_(d,w),lT(d,g,w),r=(o=d).ui.registry.getAll().sidebars,St(kt(r),function(n){function e(){return mt(vt.from(o.queryCommandValue("ToggleSidebar")),n)}var t=r[n];o.ui.registry.addToggleButton(n,{icon:t.icon,tooltip:t.tooltip,onAction:function(t){o.execCommand("ToggleSidebar",!1,n),t.setActive(e())},onSetup:function(t){function n(){return t.setActive(e())}return o.on("ToggleSidebar",n),function(){o.off("ToggleSidebar",n)}}})}),yk(d,p,w.shared),dt(d.getParam("toolbar_groups",{},"object"),function(t,n){d.ui.registry.addGroupToolbarButton(n,t)});var t,n=d.ui.registry.getAll(),e=n.buttons,i=n.menuItems,u=n.contextToolbars,a=n.sidebars,c=ph(d),s={menuItems:i,menus:(t=d.getParam("menu"))?dt(t,function(t){return lt(lt({},t),{items:t.items})}):{},menubar:d.getParam("menubar"),toolbar:c.getOrThunk(function(){return d.getParam("toolbar",!0)}),allowToolbarGroups:C===hh.floating,buttons:e,sidebar:a};l_(d,u,y,{backstage:w}),IT(d,y);var l=d.getElement(),f=$();return h.render(d,{mothership:K,uiMothership:J,outerContainer:z},s,w,{targetNode:l,height:f})},getUi:function(){return{channels:{broadcastAll:J.broadcast,broadcastOn:J.broadcastOn,register:st}}}};function Q(n,e){St([L,W],function(t){t.broadcastEvent(n,e)})}function Z(n,e){St([L,W],function(t){t.broadcastOn([n],e)})}function tt(t){return Z(vf(),{target:t.target})}function nt(t){return Z(vf(),{target:At.fromDom(t.target)})}function et(t){0===t.button&&Z(yf(),{target:At.fromDom(t.target)})}function ot(){St(N.editorManager.get(),function(t){N!==t&&t.fire("DismissPopups",{relatedTarget:N})})}function rt(t){return Q(Wi(),Bc(t))}function it(t){Z(bf(),{}),Q(Ui(),Bc(t))}function ut(){return Z(bf(),{})}function at(t){t.state&&Z(vf(),{target:At.fromDom(N.getContainer())})}function ct(t){Z(vf(),{target:At.fromDom(t.relatedTarget.getContainer())})}}function sE(n){return ur("items","items",We(),to(ro(function(t){return uo("Checking item of "+n,QD,t).fold(function(t){return Re.error(ir(t))},function(t){return Re.value(t)})})))}function lE(t){return y(t.type)&&y(t.name)}function fE(t){return{internalDialog:ao(uo("dialog",uB,t)),dataValidator:(n=z(F(sB(t),lE),function(n){return vt.from(lB[n.type]).fold(function(){return[]},function(t){return[mo(n.name,t)]})}),Jo(n)),initialData:t.initialData};var n}function dE(t){var e=[],o={};return J(t,function(t,n){t.fold(function(){e.push(n)},function(t){o[n]=t})}),0<e.length?Re.error(e):Re.value(o)}function mE(t,n){fn(t,"height",n+"px"),se().browser.isIE()?vn(t,"flex-basis"):fn(t,"flex-basis",n+"px")}function gE(t,d,n){Au(t,'[role="dialog"]').each(function(f){Fu(f,'[role="tablist"]').each(function(l){n.get().map(function(t){return fn(d,"height","0"),fn(d,"flex-basis","0"),Math.min(t,(e=d,o=l,r=Gt(n=f).dom,i="fixed"===gn(Au(n,".tox-dialog-wrap").getOr(n),"position")?Math.max(r.clientHeight,window.innerHeight):Math.max(r.offsetHeight,r.scrollHeight),u=xn(e),a=e.dom.offsetLeft>=o.dom.offsetLeft+kn(o)?Math.max(xn(o),u):u,c=parseInt(gn(n,"margin-top"),10)||0,s=parseInt(gn(n,"margin-bottom"),10)||0,i-(xn(n)+c+s-a)));var n,e,o,r,i,u,a,c,s}).each(function(t){mE(d,t)})})})}function pE(t){return Fu(t,'[role="tabpanel"]')}function hE(t,e){function o(t){var n=dE(Tf.getValue(t)).getOr({}),e=i.get(),o=Xo(e,n);i.set(o)}function r(t){var n=i.get();Tf.setValue(t,n)}var u,a,i=Vo({}),c=Vo(null),n=M(t.tabs,function(t){return{value:t.name,dom:{tag:"div",classes:["tox-dialog__body-nav-item"],innerHtml:e.shared.providers.translate(t.title)},view:function(){return[Qw.sketch(function(n){return{dom:{tag:"div",classes:["tox-form"]},components:M(t.items,function(t){return mC(n,t,e)}),formBehaviours:tc([Mg.config({mode:"acyclic",useTabstopAt:C(f0)}),fm("TabView.form.events",[eu(r),ou(o)]),rc.config({channels:sr([{key:xB,value:{onReceive:o}},{key:wB,value:{onReceive:r}}])})])}})]}}}),s=(u=n,a=dc(),{extraEvents:[eu(function(t){var o=t.element;pE(o).each(function(n){var e;fn(n,"visibility","hidden"),t.getSystem().getByDom(n).toOptional().each(function(t){var o,r,i;Y(G((r=n,i=t,M(o=u,function(t,n){Fg.set(i,o[n].view());var e=r.dom.getBoundingClientRect();return Fg.set(i,[]),e.height})),function(t,n){return n<t?-1:t<n?1:0})).fold(a.clear,a.set)}),gE(o,n,a),vn(n,"visibility"),e=t,Y(u).each(function(t){return yB.showTab(e,t.value)}),cp.requestAnimationFrame(function(){gE(o,n,a)})})}),Cr(Ui(),function(t){var n=t.element;pE(n).each(function(t){gE(n,t,a)})}),Cr(Cy,function(t,n){var r=t.element;pE(r).each(function(n){var t=ka(me(n));fn(n,"visibility","hidden");var e=pn(n,"height").map(function(t){return parseInt(t,10)});vn(n,"height"),vn(n,"flex-basis");var o=n.dom.getBoundingClientRect().height;e.forall(function(t){return t<o})?(a.set(o),gE(r,n,a)):e.each(function(t){mE(n,t)}),vn(n,"visibility"),t.each(Sa)})})],selectFirst:!1});return yB.sketch({dom:{tag:"div",classes:["tox-dialog__body"]},onChangeTab:function(t,n,e){var o=Tf.getValue(n);vr(t,Sy,{name:o,oldName:c.get()}),c.set(o)},tabs:n,components:[yB.parts.tabbar({dom:{tag:"div",classes:["tox-dialog__body-nav"]},components:[pB.parts.tabs({})],markers:{tabClass:"tox-tab",selectedClass:"tox-dialog__body-nav-item--active"},tabbarBehaviours:tc([fy.config({})])}),yB.parts.tabview({dom:{tag:"div",classes:["tox-dialog__body-content"]}})],selectFirst:s.selectFirst,tabSectionBehaviours:tc([fm("tabpanel",s.extraEvents),Mg.config({mode:"acyclic"}),ud.config({find:function(t){return Y(yB.getViewItems(t))}}),Tf.config({store:{mode:"manual",getValue:function(t){return t.getSystem().broadcastOn([xB],{}),i.get()},setValue:function(t,n){i.set(n),t.getSystem().broadcastOn([wB],{})}}})])})}function vE(t,n,r,e){return{dom:{tag:"div",classes:["tox-dialog__content-js"],attributes:lt(lt({},n.map(function(t){return{id:t}}).getOr({})),e?{"aria-live":"polite"}:{})},components:[],behaviours:tc([rS(0),x_.config({channel:kB,updateState:function(t,n){return vt.some({isTabPanel:function(){return"tabpanel"===n.body.type}})},renderComponents:function(t){return"tabpanel"!==t.body.type?[(e=t.body,o=r,{dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[(n=Pm(Qw.sketch(function(n){return{dom:{tag:"div",classes:["tox-form"].concat(e.classes)},components:M(e.items,function(t){return mC(n,t,o)})}}))).asSpec()]}],behaviours:tc([Mg.config({mode:"acyclic",useTabstopAt:C(f0)}),oS(n),sS(n,{postprocess:function(t){return dE(t).fold(function(t){return console.error(t),{}},h)}})])})]:[hE(t.body,r)];var e,o,n},initialData:t})])}}function bE(t,n){return{dom:{tag:"div",styles:{display:"none"},classes:["tox-dialog__header"]},components:[t,n]}}function yE(t,n){return YE.parts.close(sp.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":n.translate("Close")}},action:t,buttonBehaviours:tc([fy.config({})])}))}function xE(){return YE.parts.title({dom:{tag:"div",classes:["tox-dialog__title"],innerHtml:"",styles:{display:"none"}}})}function wE(t,n){return YE.parts.body({dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[{dom:vk("<p>"+n.translate(t)+"</p>")}]}]})}function SE(t){return YE.parts.footer({dom:{tag:"div",classes:["tox-dialog__footer"]},components:t})}function CE(t,n){return[uy.sketch({dom:{tag:"div",classes:["tox-dialog__footer-start"]},components:t}),uy.sketch({dom:{tag:"div",classes:["tox-dialog__footer-end"]},components:n})]}function kE(n){var t,e="tox-dialog",o=e+"-wrap",r=o+"__backdrop",i=e+"__disable-scroll";return YE.sketch({lazySink:n.lazySink,onEscape:function(t){return n.onEscape(t),vt.some(!0)},useTabstopAt:function(t){return!f0(t)},dom:{tag:"div",classes:[e].concat(n.extraClasses),styles:lt({position:"relative"},n.extraStyles)},components:H([n.header,n.body],n.footer.toArray(),!0),parts:{blocker:{dom:vk('<div class="'+o+'"></div>'),components:[{dom:{tag:"div",classes:TB?[r,r+"--opaque"]:[r]}}]}},dragBlockClass:o,modalBehaviours:tc(H([Vg.config({}),fm("dialog-events",n.dialogEvents.concat([Dr(vi(),function(t,n){Mg.focusIn(t)})])),fm("scroll-lock",[eu(function(){Xr(ve(),i)}),ou(function(){Yr(ve(),i)})])],n.extraBehaviours,!0)),eventOrder:lt(((t={})[Fi()]=["dialog-events"],t[ji()]=["scroll-lock","dialog-events","alloy.base.behaviour"],t[Gi()]=["alloy.base.behaviour","dialog-events","scroll-lock"],t),n.eventOrder)})}function OE(t){return sp.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":t.translate("Close"),title:t.translate("Close")}},components:[jm("close",{tag:"div",classes:["tox-icon"]},t.icons)],action:function(t){hr(t,vy)}})}function _E(t,n,e){function o(t){return[oi(e.translate(t.title))]}return{dom:{tag:"div",classes:["tox-dialog__title"],attributes:lt({},n.map(function(t){return{id:t}}).getOr({}))},components:o(t),behaviours:tc([x_.config({channel:CB,renderComponents:o})])}}function TE(){return{dom:vk('<div class="tox-dialog__draghandle"></div>')}}function EE(t,n){return e={title:n.shared.providers.translate(t),draggable:n.dialog.isDraggableModal()},o=n.shared.providers,r=YE.parts.title(_E(e,vt.none(),o)),i=YE.parts.draghandle(TE()),u=YE.parts.close(OE(o)),a=[r].concat(e.draggable?[i]:[]).concat([u]),uy.sketch({dom:vk('<div class="tox-dialog__header"></div>'),components:a});var e,o,r,i,u,a}function DE(t,n,e){return{dom:{tag:"div",classes:["tox-dialog__busy-spinner"],attributes:{"aria-label":e.translate(t)},styles:{left:"0px",right:"0px",bottom:"0px",top:"0px",position:"absolute"}},behaviours:n,components:[{dom:vk('<div class="tox-spinner"><div></div><div></div><div></div></div>')}]}}function BE(t,o,n){return{onClose:function(){return n.closeWindow()},onBlock:function(e){YE.setBusy(t(),function(t,n){return DE(e.message,n,o)})},onUnblock:function(){YE.setIdle(t())}}}function ME(t,n,e,o){var r;return _u(kE(lt(lt({},t),{lazySink:o.shared.getSink,extraBehaviours:H([x_.config({channel:SB,updateState:function(t,n){return vt.some(n)},initialData:n}),fS({})],t.extraBehaviours,!0),onEscape:function(t){hr(t,vy)},dialogEvents:e,eventOrder:((r={})[Ai()]=[x_.name(),rc.name()],r[ji()]=["scroll-lock",x_.name(),"messages","dialog-events","alloy.base.behaviour"],r[Gi()]=["alloy.base.behaviour","dialog-events","messages",x_.name(),"scroll-lock"],r)})))}function AE(t){return M(t,function(t){return"menu"===t.type?(e=M((n=t).items,function(t){var n=Vo(!1);return lt(lt({},t),{storage:n})}),lt(lt({},n),{items:e})):t;var n,e})}function FE(t){return R(t,function(t,n){return"menu"!==n.type?t:R(n.items,function(t,n){return t[n.name]=n.storage,t},t)},{})}function IE(t,e){return[Tr(vi(),l0),t(hy,function(t,n){e.onClose(),n.onClose()}),t(vy,function(t,n,e,o){n.onCancel(t),hr(o,hy)}),Cr(wy,function(t,n){return e.onUnblock()}),Cr(xy,function(t,n){return e.onBlock(n.event)})]}function RE(t,n){function e(t,n){return uy.sketch({dom:{tag:"div",classes:["tox-dialog__footer-"+t]},components:M(n,function(t){return t.memento.asSpec()})})}var o=A(n.map(function(t){return t.footerButtons}).getOr([]),function(t){return"start"===t.align});return[e("start",o.pass),e("end",o.fail)]}function VE(t,e){return{dom:vk('<div class="tox-dialog__footer"></div>'),components:[],behaviours:tc([x_.config({channel:OB,initialData:t,updateState:function(t,n){var r=M(n.buttons,function(t){var n=Pm(q0(t,t.type,e));return{name:t.name,align:t.align,memento:n}});return vt.some({lookupByName:function(t,n){return e=t,o=n,V(r,function(t){return t.name===o}).bind(function(t){return t.memento.getOpt(e)});var e,o},footerButtons:r})},renderComponents:RE})])}}function PE(t,n){return YE.parts.footer(VE(t,n))}function HE(n,e){if(n.getRoot().getSystem().isConnected()){var o=ud.getCurrent(n.getFormWrapper()).getOr(n.getFormWrapper());return Qw.getField(o,e).fold(function(){var t=n.getFooter();return x_.getState(t).get().bind(function(t){return t.lookupByName(o,e)})},function(t){return vt.some(t)})}return vt.none()}function zE(c,o,s){function t(t){var n=c.getRoot();n.getSystem().isConnected()&&t(n)}var l={getData:function(){var t=c.getRoot(),n=t.getSystem().isConnected()?c.getFormWrapper():t,e=Tf.getValue(n),o=dt(s,function(t){return t.get()});return lt(lt({},e),o)},setData:function(a){t(function(t){var n,e,o=l.getData(),r=lt(lt({},o),a),i=(n=r,e=c.getRoot(),x_.getState(e).get().map(function(t){return ao(uo("data",t.dataValidator,n))}).getOr(n)),u=c.getFormWrapper();Tf.setValue(u,i),J(s,function(t,n){Tt(r,n)&&t.set(r[n])})})},disable:function(t){HE(c,t).each(dd.disable)},enable:function(t){HE(c,t).each(dd.enable)},focus:function(t){HE(c,t).each(Vg.focus)},block:function(n){if(!y(n))throw new Error("The dialogInstanceAPI.block function should be passed a blocking message of type string as an argument");t(function(t){vr(t,xy,{message:n})})},unblock:function(){t(function(t){hr(t,wy)})},showTab:function(e){t(function(t){var n=c.getBody();x_.getState(n).get().exists(function(t){return t.isTabPanel()})&&ud.getCurrent(n).each(function(t){yB.showTab(t,e)})})},redial:function(e){t(function(t){var n=o(e);t.getSystem().broadcastOn([SB],n),t.getSystem().broadcastOn([CB],n.internalDialog),t.getSystem().broadcastOn([kB],n.internalDialog),t.getSystem().broadcastOn([OB],n.internalDialog),l.setData(n.initialData)})},close:function(){t(function(t){hr(t,hy)})}};return l}function NE(t){return x(t)&&-1!==AB.indexOf(t.mceAction)}function LE(o,t,r,n){var e,i,u,a=EE(o.title,n),c=(i={dom:{tag:"div",classes:["tox-dialog__content-js"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-iframe"]},components:[c0({dom:{tag:"iframe",attributes:{src:o.url}},behaviours:tc([fy.config({}),Vg.config({})])})]}],behaviours:tc([Mg.config({mode:"acyclic",useTabstopAt:C(f0)})])},YE.parts.body(i)),s=o.buttons.bind(function(t){return 0===t.length?vt.none():vt.some(PE({buttons:t},n))}),l=EB(function(){return v},BE(function(){return h},n.shared.providers,t)),f=lt(lt({},o.height.fold(function(){return{}},function(t){return{height:t+"px","max-height":t+"px"}})),o.width.fold(function(){return{}},function(t){return{width:t+"px","max-width":t+"px"}})),d=o.width.isNone()&&o.height.isNone()?["tox-dialog--width-lg"]:[],m=new MB(o.url,{base_uri:new MB(window.location.href)}),g=m.protocol+"://"+m.host+(m.port?":"+m.port:""),p=fc(),h=ME({header:a,body:c,footer:s,extraClasses:d,extraBehaviours:[fm("messages",[eu(function(){var t=mc(At.fromDom(window),"message",function(t){var n,e;m.isSameOrigin(new MB(t.raw.origin))&&(NE(n=t.raw.data)?function(t,n,e){switch(e.mceAction){case"insertContent":t.insertContent(e.content);break;case"setContent":t.setContent(e.content);break;case"execCommand":var o=!!w(e.ui)&&e.ui;t.execCommand(e.cmd,o,e.value);break;case"close":n.close();break;case"block":n.block(e.message);break;case"unblock":n.unblock()}}(r,v,n):!NE(e=n)&&x(e)&&Tt(e,"mceAction")&&o.onMessage(v,n))});p.set(t)}),ou(p.clear)]),rc.config({channels:((e={})[_B]={onReceive:function(t,n){Fu(t.element,"iframe").each(function(t){t.dom.contentWindow.postMessage(n,g)})}},e)})],extraStyles:f},o,l,n),v={block:function(n){if(!y(n))throw new Error("The urlDialogInstanceAPI.block function should be passed a blocking message of type string as an argument");b(function(t){vr(t,xy,{message:n})})},unblock:function(){b(function(t){hr(t,wy)})},close:function(){b(function(t){hr(t,hy)})},sendMessage:function(n){b(function(t){t.getSystem().broadcastOn([_B],n)})}};function b(t){u.getSystem().isConnected()&&t(u)}return{dialog:u=h,instanceApi:v}}function WE(t){function o(t,y){return fB.open(function(t,n,e){var o,r,i,u,a,c,s,l,f,d,m,g,p,h,v=n,b=(r={redial:fB.redial,closeWindow:function(){YE.hide(b.dialog),y(b.instanceApi)}},i=R,c=EE((o={dataValidator:e,initialData:v,internalDialog:t}).internalDialog.title,i),u=i,a=vE({body:o.internalDialog.body},vt.none(),u,!1),s=YE.parts.body(a),l=AE(o.internalDialog.buttons),f=FE(l),d=PE({buttons:l},i),m=DB(function(){return h},BE(function(){return p},i.shared.providers,r),i.shared.getSink),g=function(){switch(o.internalDialog.size){case"large":return["tox-dialog--width-lg"];case"medium":return["tox-dialog--width-md"];default:return[]}}(),p=ME({header:c,body:s,footer:vt.some(d),extraClasses:g,extraBehaviours:[],extraStyles:{}},o,m,i),h=zE({getRoot:rt(p),getBody:function(){return YE.getBody(p)},getFooter:function(){return YE.getFooter(p)},getFormWrapper:function(){var t=YE.getBody(p);return ud.getCurrent(t).getOr(t)}},r.redial,f),{dialog:p,instanceApi:h});return YE.show(b.dialog),b.instanceApi.setData(v),b.instanceApi},t)}function r(t,A,F,I){return fB.open(function(t,n,e){function o(){return E.on(function(t){rp.reposition(t),N1.refresh(t)})}var r,i,u,a,c,s,l,f,d,m,g,p,h,v,b,y,x,w,S,C,k,O,_,T=ao(uo("data",e,n)),E=dc(),D=R.shared.header.isPositionedAtTop(),B=(i={dataValidator:e,initialData:T,internalDialog:t},u={redial:fB.redial,closeWindow:function(){E.on(rp.hide),V.off("ResizeEditor",o),E.clear(),F(B.instanceApi)}},a=R,c=I,v=Fr("dialog-label"),b=Fr("dialog-content"),y=Pm((f={title:i.internalDialog.title,draggable:!0},d=v,m=a.shared.providers,uy.sketch({dom:vk('<div class="tox-dialog__header"></div>'),components:[_E(f,vt.some(d),m),TE(),OE(m)],containerBehaviours:tc([rE.config({mode:"mouse",blockerClass:"blocker",getTarget:function(t){return Iu(t,'[role="dialog"]').getOrDie()},snaps:{getSnapPoints:function(){return[]},leftAttr:"data-drag-left",topAttr:"data-drag-top"}})])}))),x=Pm((g={body:i.internalDialog.body},p=a,h=c,vE(g,vt.some(b),p,h))),w=AE(i.internalDialog.buttons),S=FE(w),C=Pm(BB({buttons:w},a)),k=DB(function(){return _},{onBlock:function(e){cO.block(O,function(t,n){return DE(e.message,n,a.shared.providers)})},onUnblock:function(){cO.unblock(O)},onClose:function(){return u.closeWindow()}},a.shared.getSink),O=_u({dom:{tag:"div",classes:["tox-dialog","tox-dialog-inline"],attributes:((s={role:"dialog"})["aria-labelledby"]=v,s["aria-describedby"]=b,s)},eventOrder:((l={})[Ai()]=[x_.name(),rc.name()],l[Fi()]=["execute-on-form"],l[ji()]=["reflecting","execute-on-form"],l),behaviours:tc([Mg.config({mode:"cyclic",onEscape:function(t){return hr(t,hy),vt.some(!0)},useTabstopAt:function(t){return!f0(t)&&("button"!==Ft(t)||"disabled"!==rn(t,"disabled"))}}),x_.config({channel:SB,updateState:function(t,n){return vt.some(n)},initialData:i}),Vg.config({}),fm("execute-on-form",k.concat([Dr(vi(),function(t,n){Mg.focusIn(t)})])),cO.config({getRoot:function(){return vt.some(O)}}),Fg.config({}),fS({})]),components:[y.asSpec(),x.asSpec(),C.asSpec()]}),_=zE({getRoot:rt(O),getFooter:function(){return C.get(O)},getBody:function(){return x.get(O)},getFormWrapper:function(){var t=x.get(O);return ud.getCurrent(t).getOr(t)}},u.redial,S),{dialog:O,instanceApi:_}),M=_u(rp.sketch(lt(lt({lazySink:R.shared.getSink,dom:{tag:"div",classes:[]},fireDismissalEventInstead:{}},D?{}:{fireRepositionEventInstead:{}}),{inlineBehaviours:tc(H([fm("window-manager-inline-events",[Cr(Xi(),function(t,n){hr(B.dialog,vy)})])],(r=V,P&&D?[]:[N1.config({contextual:{lazyContext:function(){return vt.some(Me(At.fromDom(r.getContentAreaContainer())))},fadeInClass:"tox-dialog-dock-fadein",fadeOutClass:"tox-dialog-dock-fadeout",transitionClass:"tox-dialog-dock-transition"},modes:["top"]})]),!0)),isExtraPart:function(t,n){return Ub(e=n,".tox-alert-dialog")||Ub(e,".tox-confirm-dialog");var e}})));return E.set(M),rp.showWithin(M,Tu(B.dialog),{anchor:A},vt.some(ve())),P&&D||(N1.refresh(M),V.on("ResizeEditor",o)),B.instanceApi.setData(T),Mg.focusIn(B.dialog),B.instanceApi},t)}var c,s,l,f,R=t.backstage,V=t.editor,P=lv(V),e=(s=(c=t).backstage.shared,{open:function(t,n){function e(){YE.hide(u),n()}var o=Pm(q0({name:"close-alert",text:"OK",primary:!0,align:"end",disabled:!1,icon:vt.none()},"cancel",c.backstage)),r=xE(),i=yE(e,s.providers),u=_u(kE({lazySink:function(){return s.getSink()},header:bE(r,i),body:wE(t,s.providers),footer:vt.some(SE(CE([],[o.asSpec()]))),onEscape:e,extraClasses:["tox-alert-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[Cr(vy,e)],eventOrder:{}}));YE.show(u);var a=o.get(u);Vg.focus(a)}}),i=(f=(l=t).backstage.shared,{open:function(t,n){function e(t){YE.hide(a),n(t)}var o=Pm(q0({name:"yes",text:"Yes",primary:!0,align:"end",disabled:!1,icon:vt.none()},"submit",l.backstage)),r=q0({name:"no",text:"No",primary:!1,align:"end",disabled:!1,icon:vt.none()},"cancel",l.backstage),i=xE(),u=yE(function(){return e(!1)},f.providers),a=_u(kE({lazySink:function(){return f.getSink()},header:bE(i,u),body:wE(t,f.providers),footer:vt.some(SE(CE([],[r,o.asSpec()]))),onEscape:function(){return e(!1)},extraClasses:["tox-confirm-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[Cr(vy,function(){return e(!1)}),Cr(yy,function(){return e(!0)})],eventOrder:{}}));YE.show(a);var c=o.get(a);Vg.focus(c)}});return{open:function(t,n,e){return void 0!==n&&"toolbar"===n.inline?r(t,R.shared.anchors.inlineDialog(),e,n.ariaAttrs):void 0!==n&&"cursor"===n.inline?r(t,R.shared.anchors.cursor(),e,n.ariaAttrs):o(t,e)},openUrl:function(t,n){return e=n,fB.openUrl(function(t){var n=LE(t,{closeWindow:function(){YE.hide(n.dialog),e(n.instanceApi)}},V,R);return YE.show(n.dialog),n.instanceApi},t);var e},alert:function(t,n){e.open(t,function(){n()})},close:function(t){t.close()},confirm:function(t,n){i.open(t,function(t){n(t)})}}}(VT=RT=RT||{})[VT.None=0]="None",VT[VT.Both=1]="Both",VT[VT.Vertical=2]="Vertical";var UE,jE=rt([fo("lazySink"),xo("dragBlockClass"),Fo("getBounds",Ae),To("useTabstopAt",_),To("eventOrder",{}),$s("modalBehaviours",[Mg]),Ju("onExecute"),Qu("onEscape")]),GE={sketch:h},XE=rt([Jf({name:"draghandle",overrides:function(t,n){return{behaviours:tc([rE.config({mode:"mouse",getTarget:function(t){return Au(t,'[role="dialog"]').getOr(t)},blockerClass:t.dragBlockClass.getOrDie(new Error("The drag blocker class was not specified for a dialog with a drag handle: \n"+JSON.stringify(n,null,2)).message),getBounds:t.getDragBounds})])}}}),qf({schema:[fo("dom")],name:"title"}),qf({factory:GE,schema:[fo("dom")],name:"close"}),qf({factory:GE,schema:[fo("dom")],name:"body"}),Jf({factory:GE,schema:[fo("dom")],name:"footer"}),Kf({factory:{sketch:function(t,n){return lt(lt({},t),{dom:n.dom,components:n.components})}},schema:[To("dom",{tag:"div",styles:{position:"fixed",left:"0px",top:"0px",right:"0px",bottom:"0px"}}),To("components",[])],name:"blocker"})]),YE=Sl({name:"ModalDialog",configFields:jE(),partFields:XE(),factory:function(a,t,n,r){var e,i=dc(),o=Fr("modal-events"),u=lt(lt({},a.eventOrder),((e={})[ji()]=[o].concat(a.eventOrder["alloy.system.attached"]||[]),e));return{uid:a.uid,dom:a.dom,components:t,apis:{show:function(t){i.set(t);var n=a.lazySink(t).getOrDie(),e=r.blocker(),o=n.getSystem().build(lt(lt({},e),{components:e.components.concat([Tu(t)]),behaviours:tc([Vg.config({}),fm("dialog-blocker-events",[Dr(vi(),function(){Mg.focusIn(t)})])])}));Is(n,o),Mg.focusIn(t)},hide:function(n){i.clear(),Yt(n.element).each(function(t){n.getSystem().getByDom(t).each(function(t){Vs(t)})})},getBody:function(t){return dl(t,a,"body")},getFooter:function(t){return dl(t,a,"footer")},setIdle:function(t){cO.unblock(t)},setBusy:function(t,n){cO.block(t,n)}},eventOrder:u,domModification:{attributes:{role:"dialog","aria-modal":"true"}},behaviours:Zs(a.modalBehaviours,[Fg.config({}),Mg.config({mode:"cyclic",onEnter:a.onExecute,onEscape:a.onEscape,useTabstopAt:a.useTabstopAt}),cO.config({getRoot:i.get}),fm(o,[eu(function(t){var n,e,o,r=t.element,i=dl(t,a,"title").element,u=un(r,"id").fold(function(){var t=Fr("dialog-label");return on(i,"id",t),t},h);on(r,"aria-labelledby",u),n=t.element,e=dl(t,a,"body").element,o=vt.from(rn(n,"id")).fold(function(){var t=Fr("dialog-describe");return on(e,"id",t),t},h),on(n,"aria-describedby",o)})])])}},apis:{show:function(t,n){t.show(n)},hide:function(t,n){t.hide(n)},getBody:function(t,n){return t.getBody(n)},getFooter:function(t,n){return t.getFooter(n)},setBusy:function(t,n,e){t.setBusy(n,e)},setIdle:function(t,n){t.setIdle(n)}}}),qE=Jo([go("type"),go("name")].concat(zh)),KE=nr,JE=[ur("name","name",Ue(function(){return Fr("button-name")}),tr),Co("icon"),Mo("align","end",["start","end"]),Ao("primary",!1),Ao("disabled",!1)],$E=H(H([],JE,!0),[go("text")],!1),QE=H([po("type",["submit","cancel","custom"])],$E,!0),ZE=so("type",{submit:QE,cancel:QE,custom:QE,menu:H([po("type",["menu"]),Co("text"),Co("tooltip"),Co("icon"),yo("items",qE)],JE,!0)}),tD=[go("type"),go("text"),po("level",["info","warn","error","success"]),go("icon"),To("url","")],nD=Jo(tD),eD=[go("type"),go("text"),Ao("disabled",!1),Ao("primary",!1),ur("name","name",Ue(function(){return Fr("button-name")}),tr),Co("icon"),Ao("borderless",!1)],oD=Jo(eD),rD=[go("type"),go("name"),go("label"),Ao("disabled",!1)],iD=Jo(rD),uD=nr,aD=[go("type"),go("name")],cD=aD.concat([Co("label")]),sD=cD.concat([To("columns","auto")]),lD=Jo(sD),fD=$o([go("value"),go("text"),go("icon")]),dD=Jo(cD),mD=tr,gD=Jo(cD),pD=tr,hD=aD.concat([Bo("tag","textarea"),go("scriptId"),go("scriptUrl"),Eo("settings",void 0,rr)]),vD=aD.concat([Bo("tag","textarea"),ho("init")]),bD=ro(function(t){return uo("customeditor.old",Ze(vD),t).orThunk(function(){return uo("customeditor.new",Ze(hD),t)})}),yD=tr,xD=Jo(cD),wD=to(Ko),SD=[go("type"),go("html"),Mo("presets","presentation",["presentation","document"])],CD=Jo(SD),kD=cD.concat([Ao("sandboxed",!0)]),OD=Jo(kD),_D=tr,TD=cD.concat([mo("currentState",Jo([fo("blob"),go("url")]))]),ED=Jo(TD),DD=cD.concat([Co("inputMode"),Co("placeholder"),Ao("maximized",!1),Ao("disabled",!1)]),BD=Jo(DD),MD=tr,AD=[go("text"),go("value")],FD=[go("text"),yo("items",(UE=Rt(function(){return ID}),{extract:function(t,n){return UE().extract(t,n)},toString:function(){return UE().toString()}}))],ID=no([Jo(AD),Jo(FD)]),RD=cD.concat([yo("items",ID),Ao("disabled",!1)]),VD=Jo(RD),PD=tr,HD=cD.concat([bo("items",[go("text"),go("value")]),Do("size",1),Ao("disabled",!1)]),zD=Jo(HD),ND=tr,LD=cD.concat([Ao("constrain",!0),Ao("disabled",!1)]),WD=Jo(LD),UD=Jo([go("width"),go("height")]),jD=[go("type"),yo("header",tr),yo("cells",to(tr))],GD=Jo(jD),XD=cD.concat([Co("placeholder"),Ao("maximized",!1),Ao("disabled",!1)]),YD=Jo(XD),qD=tr,KD=cD.concat([Mo("filetype","file",["image","media","file"]),To("disabled",!1)]),JD=Jo(KD),$D=Jo([go("value"),To("meta",{})]),QD=Qe(function(){return oo("type",{alertbanner:nD,bar:Jo((e=sE("bar"),[go("type"),e])),button:oD,checkbox:iD,colorinput:dD,colorpicker:gD,dropzone:xD,grid:Jo((t=sE("grid"),[go("type"),mo("columns",Zo),t])),iframe:OD,input:BD,listbox:VD,selectbox:zD,sizeinput:WD,textarea:YD,urlinput:JD,customeditor:bD,htmlpanel:CD,imagetools:ED,collection:lD,label:Jo((n=sE("label"),[go("type"),go("label"),n])),table:GD,panel:tB});var t,n,e}),ZD=[go("type"),To("classes",[]),yo("items",QD)],tB=Jo(ZD),nB=[ur("name","name",Ue(function(){return Fr("tab-name")}),tr),go("title"),yo("items",QD)],eB=[go("type"),bo("tabs",nB)],oB=Jo(eB),rB=$E,iB=ZE,uB=Jo([go("title"),mo("body",oo("type",{panel:tB,tabpanel:oB})),Bo("size","normal"),yo("buttons",iB),To("initialData",{}),Fo("onAction",st),Fo("onChange",st),Fo("onSubmit",st),Fo("onClose",st),Fo("onCancel",st),To("onTabChange",st)]),aB=Jo(H([po("type",["cancel","custom"])],rB,!0)),cB=Jo([go("title"),go("url"),So("height"),So("width"),Oo("buttons",aB),Fo("onAction",st),Fo("onCancel",st),Fo("onClose",st),Fo("onMessage",st)]),sB=function(t){return x(t)?[t].concat(z(Z(t),sB)):c(t)?z(t,sB):[]},lB={checkbox:uD,colorinput:mD,colorpicker:pD,dropzone:wD,input:MD,iframe:_D,sizeinput:UD,selectbox:ND,listbox:PD,size:UD,textarea:qD,urlinput:$D,customeditor:yD,collection:fD,togglemenuitem:KE},fB={open:function(t,n){var e=fE(n);return t(e.internalDialog,e.initialData,e.dataValidator)},openUrl:function(t,n){return t(ao(uo("dialog",cB,n)))},redial:fE},dB=wl({name:"TabButton",configFields:[To("uid",void 0),fo("value"),ur("dom","dom",Xe(function(){return{attributes:{role:"tab",id:Fr("aria"),"aria-selected":"false"}}}),Qo()),xo("action"),To("domModification",{}),$s("tabButtonBehaviours",[Vg,Mg,Tf]),fo("view")],factory:function(t,n){return{uid:t.uid,dom:t.dom,components:t.components,events:xm(t.action),behaviours:Zs(t.tabButtonBehaviours,[Vg.config({}),Mg.config({mode:"execution",useSpace:!0,useEnter:!0}),Tf.config({store:{mode:"memory",initialValue:t.value}})]),domModification:t.domModification}}}),mB=rt([fo("tabs"),fo("dom"),To("clickToDismiss",!1),$s("tabbarBehaviours",[gd,Mg]),Yu(["tabClass","selectedClass"])]),gB=rt([$f({factory:dB,name:"tabs",unit:"tab",overrides:function(o){return{action:function(t){var n=t.getSystem().getByUid(o.uid).getOrDie(),e=gd.isHighlighted(n,t);(e&&o.clickToDismiss?function(t,n){gd.dehighlight(t,n),vr(t,$i(),{tabbar:t,button:n})}:e?st:function(t,n){gd.highlight(t,n),vr(t,Ji(),{tabbar:t,button:n})})(n,t)},domModification:{classes:[o.markers.tabClass]}}}})]),pB=Sl({name:"Tabbar",configFields:mB(),partFields:gB(),factory:function(t,n,e,o){return{uid:t.uid,dom:t.dom,components:n,"debug.sketcher":"Tabbar",domModification:{attributes:{role:"tablist"}},behaviours:Zs(t.tabbarBehaviours,[gd.config({highlightClass:t.markers.selectedClass,itemClass:t.markers.tabClass,onHighlight:function(t,n){on(n.element,"aria-selected","true")},onDehighlight:function(t,n){on(n.element,"aria-selected","false")}}),Mg.config({mode:"flow",getInitial:function(t){return gd.getHighlighted(t).map(function(t){return t.element})},selector:"."+t.markers.tabClass,executeOnMove:!0})])}}}),hB=wl({name:"Tabview",configFields:[$s("tabviewBehaviours",[Fg])],factory:function(t,n){return{uid:t.uid,dom:t.dom,behaviours:Zs(t.tabviewBehaviours,[Fg.config({})]),domModification:{attributes:{role:"tabpanel"}}}}}),vB=rt([To("selectFirst",!0),Ku("onChangeTab"),Ku("onDismissTab"),To("tabs",[]),$s("tabSectionBehaviours",[])]),bB=rt([qf({factory:pB,schema:[fo("dom"),vo("markers",[fo("tabClass"),fo("selectedClass")])],name:"tabbar",defaults:function(t){return{tabs:t.tabs}}}),qf({factory:hB,name:"tabview"})]),yB=Sl({name:"TabSection",configFields:vB(),partFields:bB(),factory:function(i,t,n,e){function o(t,n){fl(t,i,"tabbar").each(function(t){n(t).each(br)})}return{uid:i.uid,dom:i.dom,components:t,behaviours:Qs(i.tabSectionBehaviours),events:nu(ft([i.selectFirst?[eu(function(t,n){o(t,gd.getFirst)})]:[],[Cr(Ji(),function(t,n){var o=n.event.button,r=Tf.getValue(o);fl(o,i,"tabview").each(function(e){V(i.tabs,function(t){return t.value===r}).each(function(t){var n=t.view();un(o.element,"id").each(function(t){on(e.element,"aria-labelledby",t)}),Fg.set(e,n),i.onChangeTab(e,o,n)})})}),Cr($i(),function(t,n){var e=n.event.button;i.onDismissTab(t,e)})]])),apis:{getViewItems:function(t){return fl(t,i,"tabview").map(function(t){return Fg.contents(t)}).getOr([])},showTab:function(t,e){o(t,function(n){return V(gd.getCandidates(n),function(t){return Tf.getValue(t)===e}).filter(function(t){return!gd.isHighlighted(n,t)})})}}}},apis:{getViewItems:function(t,n){return t.getViewItems(n)},showTab:function(t,n,e){t.showTab(n,e)}}}),xB="send-data-to-section",wB="send-data-to-view",SB=Fr("update-dialog"),CB=Fr("update-title"),kB=Fr("update-body"),OB=Fr("update-footer"),_B=Fr("body-send-message"),TB=Zv.deviceType.isTouch(),EB=function(u,t){function n(t,i){return Cr(t,function(e,o){var n,r;n=e,r=function(t,n){i(u(),t,o.event,e)},x_.getState(n).get().each(function(t){r(t,n)})})}return H(H([],IE(n,t),!0),[n(by,function(t,n,e){n.onAction(t,{name:e.name})})],!1)},DB=function(u,t,c){function n(t,i){return Cr(t,function(e,o){var n,r;n=e,r=function(t,n){i(u(),t,o.event,e)},x_.getState(n).get().each(function(t){r(t.internalDialog,n)})})}return H(H([],IE(n,t),!0),[n(yy,function(t,n){return n.onSubmit(t)}),n(py,function(t,n,e){n.onChange(t,{name:e.name})}),n(by,function(t,n,e,o){function r(){return Mg.focusIn(o)}function i(t){return an(t,"disabled")||un(t,"aria-disabled").exists(function(t){return"true"===t})}var u=me(o.element),a=ka(u);n.onAction(t,{name:e.name,value:e.value}),ka(u).fold(r,function(n){i(n)||a.exists(function(t){return Wt(n,t)&&i(t)})?r():c().toOptional().filter(function(t){return!Wt(t.element,n)}).each(r)})}),n(Sy,function(t,n,e){n.onTabChange(t,{newTabName:e.name,oldTabName:e.oldName})}),ou(function(t){var n=u();Tf.setValue(t,n.getData())})],!1)},BB=VE,MB=tinymce.util.Tools.resolve("tinymce.util.URI"),AB=["insertContent","setContent","execCommand","close","block","unblock"];o.add("silver",function(t){var n=cE(t),e=n.uiMothership,o=n.backstage,r=n.renderUI,i=n.getUi;return ey(t,o.shared),{renderUI:r,getWindowManagerImpl:rt(WE({editor:t,backstage:o})),getNotificationManagerImpl:function(){return u=t,r=e,l={backstage:o}.backstage.shared,{open:function(t,n){function e(){n(),rp.hide(c)}var o=!t.closeButton&&t.timeout&&(0<t.timeout||t.timeout<0),a=_u(gp.sketch({text:t.text,level:wt(["success","error","warning","warn","info"],t.type)?t.type:void 0,progress:!0===t.progressBar,icon:vt.from(t.icon),closeButton:!o,onAction:e,iconProvider:l.providers.icons,translationProvider:l.providers.translate})),c=_u(rp.sketch(lt({dom:{tag:"div",classes:["tox-notifications-container"]},lazySink:l.getSink,fireDismissalEventInstead:{}},l.header.isPositionedAtTop()?{}:{fireRepositionEventInstead:{}})));function s(){var t=Me(At.fromDom(u.getContentAreaContainer())),n=Ae(),e=Ua(n.x,t.x,t.right),o=Ua(n.y,t.y,t.bottom),r=Math.max(t.right,n.right),i=Math.max(t.bottom,n.bottom);return vt.some(Be(e,o,r-e,i-o))}return r.add(c),0<t.timeout&&cp.setTimeout(function(){e()},t.timeout),{close:e,moveTo:function(t,n){rp.showAt(c,Tu(a),{anchor:{type:"makeshift",x:t,y:n}})},moveRel:function(t,n){var e,o,r,i=Tu(a),u={maxHeightFunction:Ic()};"banner"!==n&&d(t)?(e=function(){switch(n){case"bc-bc":return ap;case"tc-tc":return up;case"tc-bc":return Ka;default:return Ja}}(),o={type:"node",root:ve(),node:vt.some(At.fromDom(t)),overrides:u,layouts:{onRtl:function(){return[e]},onLtr:function(){return[e]}}},rp.showWithinBounds(c,i,{anchor:o},s)):(r=lt(lt({},l.anchors.banner()),{overrides:u}),rp.showWithinBounds(c,i,{anchor:r},s))},text:function(t){gp.updateText(a,t)},settings:t,getEl:function(){return a.element.dom},progressBar:{value:function(t){gp.updateProgress(a,t)}}}},close:function(t){t.close()},reposition:function(e){0<e.length&&St(e,function(t,n){0===n?t.moveRel(null,"banner"):t.moveRel(e[n-1].getEl(),"bc-tc")})},getArgs:function(t){return t.settings}};var u,r,l},ui:i()}})}();
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/tinymce.min.js b/cps/static/js/libs/tinymce/tinymce.min.js
index 71351c4ee..74c72a73c 100644
--- a/cps/static/js/libs/tinymce/tinymce.min.js
+++ b/cps/static/js/libs/tinymce/tinymce.min.js
@@ -4,6 +4,6 @@
  * For LGPL see License.txt in the project root for license information.
  * For commercial licenses see https://www.tiny.cloud/
  *
- * Version: 5.7.1 (2021-03-17)
+ * Version: 5.10.0 (2021-10-11)
  */
-!function(){"use strict";var r=function(e){if(null===e)return"null";if(e===undefined)return"undefined";var t=typeof e;return"object"==t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"==t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t},t=function(e){return{eq:e}},s=t(function(e,t){return e===t}),i=function(o){return t(function(e,t){if(e.length!==t.length)return!1;for(var n=e.length,r=0;r<n;r++)if(!o.eq(e[r],t[r]))return!1;return!0})},c=function(e,r){return n=i(e),o=function(e){return t=e,n=r,Array.prototype.slice.call(t).sort(n);var t,n},t(function(e,t){return n.eq(o(e),o(t))});var n,o},u=function(u){return t(function(e,t){var n=Object.keys(e),r=Object.keys(t);if(!c(s).eq(n,r))return!1;for(var o=n.length,i=0;i<o;i++){var a=n[i];if(!u.eq(e[a],t[a]))return!1}return!0})},l=t(function(e,t){if(e===t)return!0;var n=r(e);return n===r(t)&&(-1!==["undefined","boolean","number","string","function","xml","null"].indexOf(n)?e===t:"array"===n?i(l).eq(e,t):"object"===n&&u(l).eq(e,t))}),te=function(){},a=function(n,r){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return n(r.apply(null,e))}},S=function(e){return function(){return e}},o=function(e){return e};function N(r){for(var o=[],e=1;e<arguments.length;e++)o[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=o.concat(e);return r.apply(null,n)}}var e,n,f,d=function(t){return function(e){return!t(e)}},m=function(e){return function(){throw new Error(e)}},p=function(e){return e()},y=function(e){e()},b=S(!1),w=S(!0),g=function(){return h},h=(e=function(e){return e.isNone()},{fold:function(e,t){return e()},is:b,isSome:b,isNone:w,getOr:f=function(e){return e},getOrThunk:n=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:S(null),getOrUndefined:S(undefined),or:f,orThunk:n,map:g,each:te,bind:g,exists:b,forall:w,filter:g,equals:e,equals_:e,toArray:function(){return[]},toString:S("none()")}),v=function(n){var e=S(n),t=function(){return o},r=function(e){return e(n)},o={fold:function(e,t){return t(n)},is:function(e){return n===e},isSome:w,isNone:b,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return v(e(n))},each:function(e){e(n)},bind:r,exists:r,forall:r,filter:function(e){return e(n)?o:h},toArray:function(){return[n]},toString:function(){return"some("+n+")"},equals:function(e){return e.is(n)},equals_:function(e,t){return e.fold(b,function(e){return t(n,e)})}};return o},U={some:v,none:g,from:function(e){return null===e||e===undefined?h:v(e)}},C=function(r){return function(e){return n=typeof(t=e),(null===t?"null":"object"==n&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"==n&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":n)===r;var t,n}},x=function(t){return function(e){return typeof e===t}},E=function(t){return function(e){return t===e}},K=C("string"),k=C("object"),_=C("array"),A=E(null),R=x("boolean"),T=E(undefined),X=function(e){return null===e||e===undefined},V=function(e){return!X(e)},D=x("function"),O=x("number"),B=Array.prototype.slice,P=Array.prototype.indexOf,L=Array.prototype.push,I=function(e,t){return P.call(e,t)},M=function(e,t){return-1<I(e,t)},F=function(e,t){for(var n=0,r=e.length;n<r;n++){if(t(e[n],n))return!0}return!1},z=function(e,t){for(var n=e.length,r=new Array(n),o=0;o<n;o++){var i=e[o];r[o]=t(i,o)}return r},Y=function(e,t){for(var n=0,r=e.length;n<r;n++){t(e[n],n)}},j=function(e,t){for(var n=e.length-1;0<=n;n--){t(e[n],n)}},H=function(e,t){for(var n=[],r=0,o=e.length;r<o;r++){var i=e[r];t(i,r)&&n.push(i)}return n},q=function(e,t,n){return j(e,function(e){n=t(n,e)}),n},$=function(e,t,n){return Y(e,function(e){n=t(n,e)}),n},W=function(e,t){return function(e,t,n){for(var r=0,o=e.length;r<o;r++){var i=e[r];if(t(i,r))return U.some(i);if(n(i,r))break}return U.none()}(e,t,b)},G=function(e,t){for(var n=0,r=e.length;n<r;n++){if(t(e[n],n))return U.some(n)}return U.none()},J=function(e,t){return function(e){for(var t=[],n=0,r=e.length;n<r;++n){if(!_(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);L.apply(t,e[n])}return t}(z(e,t))},Q=function(e,t){for(var n=0,r=e.length;n<r;++n){if(!0!==t(e[n],n))return!1}return!0},Z=function(e){var t=B.call(e,0);return t.reverse(),t},ee=function(e,t){return H(e,function(e){return!M(t,e)})},ne=function(e,t){return 0<=t&&t<e.length?U.some(e[t]):U.none()},re=function(e){return ne(e,0)},oe=function(e){return ne(e,e.length-1)},ie=D(Array.from)?Array.from:function(e){return B.call(e)},ae=Object.keys,ue=Object.hasOwnProperty,se=function(e,t){for(var n=ae(e),r=0,o=n.length;r<o;r++){var i=n[r];t(e[i],i)}},ce=function(e,n){return le(e,function(e,t){return{k:t,v:n(e,t)}})},le=function(e,r){var o={};return se(e,function(e,t){var n=r(e,t);o[n.k]=n.v}),o},fe=function(n){return function(e,t){n[t]=e}},de=function(e,n,r,o){return se(e,function(e,t){(n(e,t)?r:o)(e,t)}),{}},me=function(e,t){var n={},r={};return de(e,t,fe(n),fe(r)),{t:n,f:r}},pe=function(e,t){var n={};return de(e,t,fe(n),te),n},ge=function(e){return n=function(e){return e},r=[],se(e,function(e,t){r.push(n(e,t))}),r;var n,r},he=function(e,t){return ve(e,t)?U.from(e[t]):U.none()},ve=function(e,t){return ue.call(e,t)},ye=function(e,t){return ve(e,t)&&e[t]!==undefined&&null!==e[t]},be=Array.isArray,Ce=function(e,t,n){var r,o;if(!e)return!1;if(n=n||e,e.length!==undefined){for(r=0,o=e.length;r<o;r++)if(!1===t.call(n,e[r],r,e))return!1}else for(r in e)if(e.hasOwnProperty(r)&&!1===t.call(n,e[r],r,e))return!1;return!0},we=function(n,r){var o=[];return Ce(n,function(e,t){o.push(r(e,t,n))}),o},xe=function(n,r){var o=[];return Ce(n,function(e,t){r&&!r(e,t,n)||o.push(e)}),o},Se=function(e,t){if(e)for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},Ne=function(e,t,n,r){for(var o=T(n)?e[0]:n,i=0;i<e.length;i++)o=t.call(r,o,e[i],i);return o},Ee=function(e,t,n){for(var r=0,o=e.length;r<o;r++)if(t.call(n,e[r],r,e))return r;return-1},ke=function(e){return e[e.length-1]},_e=function(){return(_e=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};function Ae(){for(var e=0,t=0,n=arguments.length;t<n;t++)e+=arguments[t].length;for(var r=Array(e),o=0,t=0;t<n;t++)for(var i=arguments[t],a=0,u=i.length;a<u;a++,o++)r[o]=i[a];return r}var Re,Te,De,Oe,Be,Pe,Le,Ie=function(e,t){var n=function(e,t){for(var n=0;n<e.length;n++){var r=e[n];if(r.test(t))return r}return undefined}(e,t);if(!n)return{major:0,minor:0};var r=function(e){return Number(t.replace(n,"$"+e))};return Fe(r(1),r(2))},Me=function(){return Fe(0,0)},Fe=function(e,t){return{major:e,minor:t}},Ue={nu:Fe,detect:function(e,t){var n=String(t).toLowerCase();return 0===e.length?Me():Ie(e,n)},unknown:Me},ze=function(e,t){var n=String(t).toLowerCase();return W(e,function(e){return e.search(n)})},je=function(e,n){return ze(e,n).map(function(e){var t=Ue.detect(e.versionRegexes,n);return{current:e.name,version:t}})},He=function(e,n){return ze(e,n).map(function(e){var t=Ue.detect(e.versionRegexes,n);return{current:e.name,version:t}})},Ve=function(e,t){return-1!==e.indexOf(t)},qe=function(e,t){return n=e,o=0,""===(r=t)||n.length>=r.length&&n.substr(o,o+r.length)===r;var n,r,o},$e=function(t){return function(e){return e.replace(t,"")}},We=$e(/^\s+|\s+$/g),Ke=$e(/^\s+/g),Xe=$e(/\s+$/g),Ye=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Ge=function(t){return function(e){return Ve(e,t)}},Je=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return Ve(e,"edge/")&&Ve(e,"chrome")&&Ve(e,"safari")&&Ve(e,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Ye],search:function(e){return Ve(e,"chrome")&&!Ve(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return Ve(e,"msie")||Ve(e,"trident")}},{name:"Opera",versionRegexes:[Ye,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Ge("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Ge("firefox")},{name:"Safari",versionRegexes:[Ye,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return(Ve(e,"safari")||Ve(e,"mobile/"))&&Ve(e,"applewebkit")}}],Qe=[{name:"Windows",search:Ge("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return Ve(e,"iphone")||Ve(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Ge("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:Ge("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Ge("linux"),versionRegexes:[]},{name:"Solaris",search:Ge("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Ge("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:Ge("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],Ze={browsers:S(Je),oses:S(Qe)},et="Firefox",tt=function(e){var t=e.current,n=e.version,r=function(e){return function(){return t===e}};return{current:t,version:n,isEdge:r("Edge"),isChrome:r("Chrome"),isIE:r("IE"),isOpera:r("Opera"),isFirefox:r(et),isSafari:r("Safari")}},nt={unknown:function(){return tt({current:undefined,version:Ue.unknown()})},nu:tt,edge:S("Edge"),chrome:S("Chrome"),ie:S("IE"),opera:S("Opera"),firefox:S(et),safari:S("Safari")},rt="Windows",ot="Android",it="Solaris",at="FreeBSD",ut="ChromeOS",st=function(e){var t=e.current,n=e.version,r=function(e){return function(){return t===e}};return{current:t,version:n,isWindows:r(rt),isiOS:r("iOS"),isAndroid:r(ot),isOSX:r("OSX"),isLinux:r("Linux"),isSolaris:r(it),isFreeBSD:r(at),isChromeOS:r(ut)}},ct={unknown:function(){return st({current:undefined,version:Ue.unknown()})},nu:st,windows:S(rt),ios:S("iOS"),android:S(ot),linux:S("Linux"),osx:S("OSX"),solaris:S(it),freebsd:S(at),chromeos:S(ut)},lt=function(e,t){var n,r,o,i,a,u,s,c,l,f,d,m,p=Ze.browsers(),g=Ze.oses(),h=je(p,e).fold(nt.unknown,nt.nu),v=He(g,e).fold(ct.unknown,ct.nu);return{browser:h,os:v,deviceType:(r=h,o=e,i=t,a=(n=v).isiOS()&&!0===/ipad/i.test(o),u=n.isiOS()&&!a,s=n.isiOS()||n.isAndroid(),c=s||i("(pointer:coarse)"),l=a||!u&&s&&i("(min-device-width:768px)"),f=u||s&&!l,d=r.isSafari()&&n.isiOS()&&!1===/safari/i.test(o),m=!f&&!l&&!d,{isiPad:S(a),isiPhone:S(u),isTablet:S(l),isPhone:S(f),isTouch:S(c),isAndroid:n.isAndroid,isiOS:n.isiOS,isWebView:S(d),isDesktop:S(m)})}},ft=function(e){return window.matchMedia(e).matches},dt=(De=!(Re=function(){return lt(navigator.userAgent,ft)}),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return De||(De=!0,Te=Re.apply(null,e)),Te}),mt=function(){return dt()},pt=navigator.userAgent,gt=mt(),ht=gt.browser,vt=gt.os,yt=gt.deviceType,bt=/WebKit/.test(pt)&&!ht.isEdge(),Ct="FormData"in window&&"FileReader"in window&&"URL"in window&&!!URL.createObjectURL,wt=-1!==pt.indexOf("Windows Phone"),xt={opera:ht.isOpera(),webkit:bt,ie:!(!ht.isIE()&&!ht.isEdge())&&ht.version.major,gecko:ht.isFirefox(),mac:vt.isOSX()||vt.isiOS(),iOS:yt.isiPad()||yt.isiPhone(),android:vt.isAndroid(),contentEditable:!0,transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:!0,range:window.getSelection&&"Range"in window,documentMode:ht.isIE()?document.documentMode||7:10,fileApi:Ct,ceFalse:!0,cacheSuffix:null,container:null,experimentalShadowDom:!1,canHaveCSP:!ht.isIE(),desktop:yt.isDesktop(),windowsPhone:wt,browser:{current:ht.current,version:ht.version,isChrome:ht.isChrome,isEdge:ht.isEdge,isFirefox:ht.isFirefox,isIE:ht.isIE,isOpera:ht.isOpera,isSafari:ht.isSafari},os:{current:vt.current,version:vt.version,isAndroid:vt.isAndroid,isChromeOS:vt.isChromeOS,isFreeBSD:vt.isFreeBSD,isiOS:vt.isiOS,isLinux:vt.isLinux,isOSX:vt.isOSX,isSolaris:vt.isSolaris,isWindows:vt.isWindows},deviceType:{isDesktop:yt.isDesktop,isiPad:yt.isiPad,isiPhone:yt.isiPhone,isPhone:yt.isPhone,isTablet:yt.isTablet,isTouch:yt.isTouch,isWebView:yt.isWebView}},St=/^\s*|\s*$/g,Nt=function(e){return null===e||e===undefined?"":(""+e).replace(St,"")},Et=function(e,t){return t?!("array"!==t||!be(e))||typeof e===t:e!==undefined},kt=function(e,n,r,o){o=o||this,e&&(r&&(e=e[r]),Ce(e,function(e,t){return!1!==n.call(o,e,t,r)&&void kt(e,n,r,o)}))},_t={trim:Nt,isArray:be,is:Et,toArray:function(e){if(be(e))return e;for(var t=[],n=0,r=e.length;n<r;n++)t[n]=e[n];return t},makeMap:function(e,t,n){var r;for(t=t||",","string"==typeof(e=e||[])&&(e=e.split(t)),n=n||{},r=e.length;r--;)n[e[r]]={};return n},each:Ce,map:we,grep:xe,inArray:Se,hasOwn:function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},extend:function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];for(var r=0;r<t.length;r++){var o,i=t[r];for(var a in i){!i.hasOwnProperty(a)||(o=i[a])!==undefined&&(e[a]=o)}}return e},create:function(e,t,n){var r,o,i,a=this,u=0,s=(e=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(e))[3].match(/(^|\.)(\w+)$/i)[2],c=a.createNS(e[3].replace(/\.\w+$/,""),n);if(!c[s]){if("static"===e[2])return c[s]=t,void(this.onCreate&&this.onCreate(e[2],e[3],c[s]));t[s]||(t[s]=te,u=1),c[s]=t[s],a.extend(c[s].prototype,t),e[5]&&(r=a.resolve(e[5]).prototype,o=e[5].match(/\.(\w+)$/i)[1],i=c[s],c[s]=u?function(){return r[o].apply(this,arguments)}:function(){return this.parent=r[o],i.apply(this,arguments)},c[s].prototype[s]=c[s],a.each(r,function(e,t){c[s].prototype[t]=r[t]}),a.each(t,function(e,t){r[t]?c[s].prototype[t]=function(){return this.parent=r[t],e.apply(this,arguments)}:t!==s&&(c[s].prototype[t]=e)})),a.each(t["static"],function(e,t){c[s][t]=e})}},walk:kt,createNS:function(e,t){var n,r;for(t=t||window,e=e.split("."),n=0;n<e.length;n++)t[r=e[n]]||(t[r]={}),t=t[r];return t},resolve:function(e,t){var n,r;for(t=t||window,n=0,r=(e=e.split(".")).length;n<r&&(t=t[e[n]]);n++);return t},explode:function(e,t){return!e||Et(e,"array")?e:we(e.split(t||","),Nt)},_addCacheSuffix:function(e){var t=xt.cacheSuffix;return t&&(e+=(-1===e.indexOf("?")?"?":"&")+t),e}},At=function(e){if(null===e||e===undefined)throw new Error("Node cannot be null or undefined");return{dom:e}},Rt={fromHtml:function(e,t){var n=(t||document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||1<n.childNodes.length)throw console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return At(n.childNodes[0])},fromTag:function(e,t){var n=(t||document).createElement(e);return At(n)},fromText:function(e,t){var n=(t||document).createTextNode(e);return At(n)},fromDom:At,fromPoint:function(e,t,n){return U.from(e.dom.elementFromPoint(t,n)).map(At)}},Tt=function(e,t){for(var n=[],r=function(e){return n.push(e),t(e)},o=t(e);(o=o.bind(r)).isSome(););return n},Dt=function(e,t){var n=e.dom;if(1!==n.nodeType)return!1;var r=n;if(r.matches!==undefined)return r.matches(t);if(r.msMatchesSelector!==undefined)return r.msMatchesSelector(t);if(r.webkitMatchesSelector!==undefined)return r.webkitMatchesSelector(t);if(r.mozMatchesSelector!==undefined)return r.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")},Ot=function(e){return 1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount},Bt=function(e,t){return e.dom===t.dom},Pt=function(e,t){return n=e.dom,r=t.dom,o=n,i=r,a=Node.DOCUMENT_POSITION_CONTAINED_BY,0!=(o.compareDocumentPosition(i)&a);var n,r,o,i,a},Lt=function(e,t){return mt().browser.isIE()?Pt(e,t):(n=t,r=e.dom,o=n.dom,r!==o&&r.contains(o));var n,r,o},It=("undefined"!=typeof window||Function("return this;")(),function(e){return e.dom.nodeName.toLowerCase()}),Mt=function(e){return e.dom.nodeType},Ft=function(t){return function(e){return Mt(e)===t}},Ut=Ft(1),zt=Ft(3),jt=Ft(9),Ht=Ft(11),Vt=function(e){return Rt.fromDom(e.dom.ownerDocument)},qt=function(e){return jt(e)?e:Vt(e)},$t=function(e){return Rt.fromDom(qt(e).dom.defaultView)},Wt=function(e){return U.from(e.dom.parentNode).map(Rt.fromDom)},Kt=function(e){return U.from(e.dom.previousSibling).map(Rt.fromDom)},Xt=function(e){return U.from(e.dom.nextSibling).map(Rt.fromDom)},Yt=function(e){return Z(Tt(e,Kt))},Gt=function(e){return Tt(e,Xt)},Jt=function(e){return z(e.dom.childNodes,Rt.fromDom)},Qt=function(e,t){var n=e.dom.childNodes;return U.from(n[t]).map(Rt.fromDom)},Zt=function(e){return Qt(e,0)},en=function(e){return Qt(e,e.dom.childNodes.length-1)},tn=function(e){return Ht(e)&&V(e.dom.host)},nn=D(Element.prototype.attachShadow)&&D(Node.prototype.getRootNode),rn=S(nn),on=nn?function(e){return Rt.fromDom(e.dom.getRootNode())}:qt,an=function(e){return tn(e)?e:function(e){var t=e.dom.head;if(null===t||t===undefined)throw new Error("Head is not available yet");return Rt.fromDom(t)}(qt(e))},un=function(e){return Rt.fromDom(e.dom.host)},sn=function(e){return V(e.dom.shadowRoot)},cn=function(t,n){Wt(t).each(function(e){e.dom.insertBefore(n.dom,t.dom)})},ln=function(e,t){Xt(e).fold(function(){Wt(e).each(function(e){dn(e,t)})},function(e){cn(e,t)})},fn=function(t,n){Zt(t).fold(function(){dn(t,n)},function(e){t.dom.insertBefore(n.dom,e.dom)})},dn=function(e,t){e.dom.appendChild(t.dom)},mn=function(t,e){Y(e,function(e){dn(t,e)})},pn=function(e){e.dom.textContent="",Y(Jt(e),function(e){gn(e)})},gn=function(e){var t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},hn=function(e){var t,n=Jt(e);0<n.length&&(t=e,Y(n,function(e){cn(t,e)})),gn(e)},vn=function(e){var t=zt(e)?e.dom.parentNode:e.dom;if(t===undefined||null===t||null===t.ownerDocument)return!1;var n,r,o,i,a=t.ownerDocument;return o=Rt.fromDom(t),i=on(o),(tn(i)?U.some(i):U.none()).fold(function(){return a.body.contains(t)},(n=vn,r=un,function(e){return n(r(e))}))},yn=function(n,r){return{left:n,top:r,translate:function(e,t){return yn(n+e,r+t)}}},bn=yn,Cn=function(e,t){return e!==undefined?e:t!==undefined?t:0},wn=function(e){var t,n=e.dom,r=n.ownerDocument.body;return r===n?bn(r.offsetLeft,r.offsetTop):vn(e)?(t=n.getBoundingClientRect(),bn(t.left,t.top)):bn(0,0)},xn=function(e){var t=e!==undefined?e.dom:document,n=t.body.scrollLeft||t.documentElement.scrollLeft,r=t.body.scrollTop||t.documentElement.scrollTop;return bn(n,r)},Sn=function(e,t,n){var r=(n!==undefined?n.dom:document).defaultView;r&&r.scrollTo(e,t)},Nn=function(e,t){mt().browser.isSafari()&&D(e.dom.scrollIntoViewIfNeeded)?e.dom.scrollIntoViewIfNeeded(!1):e.dom.scrollIntoView(t)},En=function(e,t,n,r){return{x:e,y:t,width:n,height:r,right:e+n,bottom:t+r}},kn=function(e){var t,n,r=e===undefined?window:e,o=r.document,i=xn(Rt.fromDom(o));return n=(t=r)===undefined?window:t,U.from(n.visualViewport).fold(function(){var e=r.document.documentElement,t=e.clientWidth,n=e.clientHeight;return En(i.left,i.top,t,n)},function(e){return En(Math.max(e.pageLeft,i.left),Math.max(e.pageTop,i.top),e.width,e.height)})},_n=function(t){return function(e){return!!e&&e.nodeType===t}},An=function(e){return!!e&&!Object.getPrototypeOf(e)},Rn=_n(1),Tn=function(e){var n=e.map(function(e){return e.toLowerCase()});return function(e){if(e&&e.nodeName){var t=e.nodeName.toLowerCase();return M(n,t)}return!1}},Dn=function(r,e){var o=e.toLowerCase().split(" ");return function(e){var t;if(Rn(e))for(t=0;t<o.length;t++){var n=e.ownerDocument.defaultView.getComputedStyle(e,null);if((n?n.getPropertyValue(r):null)===o[t])return!0}return!1}},On=function(t){return function(e){return Rn(e)&&e.hasAttribute(t)}},Bn=function(e){return Rn(e)&&e.hasAttribute("data-mce-bogus")},Pn=function(e){return Rn(e)&&"TABLE"===e.tagName},Ln=function(t){return function(e){if(Rn(e)){if(e.contentEditable===t)return!0;if(e.getAttribute("data-mce-contenteditable")===t)return!0}return!1}},In=Tn(["textarea","input"]),Mn=_n(3),Fn=_n(8),Un=_n(9),zn=_n(11),jn=Tn(["br"]),Hn=Tn(["img"]),Vn=Ln("true"),qn=Ln("false"),$n=Tn(["td","th"]),Wn=Tn(["video","audio","object","embed"]),Kn=function(e){return e.style!==undefined&&D(e.style.getPropertyValue)},Xn=function(e,t,n){if(!(K(n)||R(n)||O(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")},Yn=function(e,t,n){Xn(e.dom,t,n)},Gn=function(e,t){var n=e.dom;se(t,function(e,t){Xn(n,t,e)})},Jn=function(e,t){var n=e.dom.getAttribute(t);return null===n?undefined:n},Qn=function(e,t){return U.from(Jn(e,t))},Zn=function(e,t){e.dom.removeAttribute(t)},er=function(e,t){var n=e.dom;se(t,function(e,t){!function(e,t,n){if(!K(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);Kn(e)&&e.style.setProperty(t,n)}(n,t,e)})},tr=function(e,t){var n=e.dom,r=window.getComputedStyle(n).getPropertyValue(t);return""!==r||vn(e)?r:nr(n,t)},nr=function(e,t){return Kn(e)?e.style.getPropertyValue(t):""},rr=function(e,t){var n=e.dom,r=nr(n,t);return U.from(r).filter(function(e){return 0<e.length})},or=function(e){var t={},n=e.dom;if(Kn(n))for(var r=0;r<n.style.length;r++){var o=n.style.item(r);t[o]=n.style[o]}return t},ir=mt().browser,ar=function(e){return W(e,Ut)},ur=function(e,t){return e.children&&M(e.children,t)},sr=function(e,t,n){var r,o,i,a=0,u=0,s=e.ownerDocument;if(n=n||e,t){if(n===e&&t.getBoundingClientRect&&"static"===tr(Rt.fromDom(e),"position"))return{x:a=(o=t.getBoundingClientRect()).left+(s.documentElement.scrollLeft||e.scrollLeft)-s.documentElement.clientLeft,y:u=o.top+(s.documentElement.scrollTop||e.scrollTop)-s.documentElement.clientTop};for(r=t;r&&r!==n&&r.nodeType&&!ur(r,n);)a+=r.offsetLeft||0,u+=r.offsetTop||0,r=r.offsetParent;for(r=t.parentNode;r&&r!==n&&r.nodeType&&!ur(r,n);)a-=r.scrollLeft||0,u-=r.scrollTop||0,r=r.parentNode;u+=(i=Rt.fromDom(t),ir.isFirefox()&&"table"===It(i)?ar(Jt(i)).filter(function(e){return"caption"===It(e)}).bind(function(o){return ar(Gt(o)).map(function(e){var t=e.dom.offsetTop,n=o.dom.offsetTop,r=o.dom.offsetHeight;return t<=n?-r:0})}).getOr(0):0)}return{x:a,y:u}},cr={},lr={exports:cr};Oe=undefined,Be=cr,Pe=lr,Le=undefined,function(e){"object"==typeof Be&&void 0!==Pe?Pe.exports=e():"function"==typeof Oe&&Oe.amd?Oe([],e):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).EphoxContactWrapper=e()}(function(){return function l(i,a,u){function s(t,e){if(!a[t]){if(!i[t]){var n="function"==typeof Le&&Le;if(!e&&n)return n(t,!0);if(c)return c(t,!0);var r=new Error("Cannot find module '"+t+"'");throw r.code="MODULE_NOT_FOUND",r}var o=a[t]={exports:{}};i[t][0].call(o.exports,function(e){return s(i[t][1][e]||e)},o,o.exports,l,i,a,u)}return a[t].exports}for(var c="function"==typeof Le&&Le,e=0;e<u.length;e++)s(u[e]);return s}({1:[function(e,t,n){var r,o,i=t.exports={};function a(){throw new Error("setTimeout has not been defined")}function u(){throw new Error("clearTimeout has not been defined")}function s(e){if(r===setTimeout)return setTimeout(e,0);if((r===a||!r)&&setTimeout)return r=setTimeout,setTimeout(e,0);try{return r(e,0)}catch(t){try{return r.call(null,e,0)}catch(t){return r.call(this,e,0)}}}!function(){try{r="function"==typeof setTimeout?setTimeout:a}catch(e){r=a}try{o="function"==typeof clearTimeout?clearTimeout:u}catch(e){o=u}}();var c,l=[],f=!1,d=-1;function m(){f&&c&&(f=!1,c.length?l=c.concat(l):d=-1,l.length&&p())}function p(){if(!f){var e=s(m);f=!0;for(var t=l.length;t;){for(c=l,l=[];++d<t;)c&&c[d].run();d=-1,t=l.length}c=null,f=!1,function(e){if(o===clearTimeout)return clearTimeout(e);if((o===u||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(e);try{o(e)}catch(t){try{return o.call(null,e)}catch(t){return o.call(this,e)}}}(e)}}function g(e,t){this.fun=e,this.array=t}function h(){}i.nextTick=function(e){var t=new Array(arguments.length-1);if(1<arguments.length)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];l.push(new g(e,t)),1!==l.length||f||s(p)},g.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=h,i.addListener=h,i.once=h,i.off=h,i.removeListener=h,i.removeAllListeners=h,i.emit=h,i.prependListener=h,i.prependOnceListener=h,i.listeners=function(e){return[]},i.binding=function(e){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(e){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},{}],2:[function(e,f,t){(function(t){function r(){}function a(e){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=undefined,this._deferreds=[],l(e,this)}function o(r,o){for(;3===r._state;)r=r._value;0!==r._state?(r._handled=!0,a._immediateFn(function(){var e,t=1===r._state?o.onFulfilled:o.onRejected;if(null!==t){try{e=t(r._value)}catch(n){return void u(o.promise,n)}i(o.promise,e)}else(1===r._state?i:u)(o.promise,r._value)})):r._deferreds.push(o)}function i(e,t){try{if(t===e)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if(t instanceof a)return e._state=3,e._value=t,void s(e);if("function"==typeof n)return void l((r=n,o=t,function(){r.apply(o,arguments)}),e)}e._state=1,e._value=t,s(e)}catch(i){u(e,i)}var r,o}function u(e,t){e._state=2,e._value=t,s(e)}function s(e){2===e._state&&0===e._deferreds.length&&a._immediateFn(function(){e._handled||a._unhandledRejectionFn(e._value)});for(var t=0,n=e._deferreds.length;t<n;t++)o(e,e._deferreds[t]);e._deferreds=null}function c(e,t,n){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.promise=n}function l(e,t){var n=!1;try{e(function(e){n||(n=!0,i(t,e))},function(e){n||(n=!0,u(t,e))})}catch(r){if(n)return;n=!0,u(t,r)}}var e,n;e=this,n=setTimeout,a.prototype["catch"]=function(e){return this.then(null,e)},a.prototype.then=function(e,t){var n=new this.constructor(r);return o(this,new c(e,t,n)),n},a.all=function(e){var s=Array.prototype.slice.call(e);return new a(function(o,i){if(0===s.length)return o([]);var a=s.length;for(var e=0;e<s.length;e++)!function u(t,e){try{if(e&&("object"==typeof e||"function"==typeof e)){var n=e.then;if("function"==typeof n)return void n.call(e,function(e){u(t,e)},i)}s[t]=e,0==--a&&o(s)}catch(r){i(r)}}(e,s[e])})},a.resolve=function(t){return t&&"object"==typeof t&&t.constructor===a?t:new a(function(e){e(t)})},a.reject=function(n){return new a(function(e,t){t(n)})},a.race=function(o){return new a(function(e,t){for(var n=0,r=o.length;n<r;n++)o[n].then(e,t)})},a._immediateFn="function"==typeof t?function(e){t(e)}:function(e){n(e,0)},a._unhandledRejectionFn=function(e){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)},a._setImmediateFn=function(e){a._immediateFn=e},a._setUnhandledRejectionFn=function(e){a._unhandledRejectionFn=e},void 0!==f&&f.exports?f.exports=a:e.Promise||(e.Promise=a)}).call(this,e("timers").setImmediate)},{timers:3}],3:[function(s,e,c){(function(e,t){var r=s("process/browser.js").nextTick,n=Function.prototype.apply,o=Array.prototype.slice,i={},a=0;function u(e,t){this._id=e,this._clearFn=t}c.setTimeout=function(){return new u(n.call(setTimeout,window,arguments),clearTimeout)},c.setInterval=function(){return new u(n.call(setInterval,window,arguments),clearInterval)},c.clearTimeout=c.clearInterval=function(e){e.close()},u.prototype.unref=u.prototype.ref=function(){},u.prototype.close=function(){this._clearFn.call(window,this._id)},c.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},c.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},c._unrefActive=c.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;0<=t&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},c.setImmediate="function"==typeof e?e:function(e){var t=a++,n=!(arguments.length<2)&&o.call(arguments,1);return i[t]=!0,r(function(){i[t]&&(n?e.apply(null,n):e.call(null),c.clearImmediate(t))}),t},c.clearImmediate="function"==typeof t?t:function(e){delete i[e]}}).call(this,s("timers").setImmediate,s("timers").clearImmediate)},{"process/browser.js":1,timers:3}],4:[function(e,t,n){var r=e("promise-polyfill"),o="undefined"!=typeof window?window:Function("return this;")();t.exports={boltExport:o.Promise||r}},{"promise-polyfill":2}]},{},[4])(4)});var fr=lr.exports.boltExport,dr=function(e){var n=U.none(),t=[],r=function(e){o()?a(e):t.push(e)},o=function(){return n.isSome()},i=function(e){Y(e,a)},a=function(t){n.each(function(e){setTimeout(function(){t(e)},0)})};return e(function(e){o()||(n=U.some(e),i(t),t=[])}),{get:r,map:function(n){return dr(function(t){r(function(e){t(n(e))})})},isReady:o}},mr={nu:dr,pure:function(t){return dr(function(e){e(t)})}},pr=function(e){setTimeout(function(){throw e},0)},gr=function(n){var e=function(e){n().then(e,pr)};return{map:function(e){return gr(function(){return n().then(e)})},bind:function(t){return gr(function(){return n().then(function(e){return t(e).toPromise()})})},anonBind:function(e){return gr(function(){return n().then(function(){return e.toPromise()})})},toLazy:function(){return mr.nu(e)},toCached:function(){var e=null;return gr(function(){return null===e&&(e=n()),e})},toPromise:n,get:e}},hr=function(e){return gr(function(){return new fr(e)})},vr=function(a,e){return e(function(r){var o=[],i=0;0===a.length?r([]):Y(a,function(e,t){var n;e.get((n=t,function(e){o[n]=e,++i>=a.length&&r(o)}))})})},yr=function(n){return{is:function(e){return n===e},isValue:w,isError:b,getOr:S(n),getOrThunk:S(n),getOrDie:S(n),or:function(e){return yr(n)},orThunk:function(e){return yr(n)},fold:function(e,t){return t(n)},map:function(e){return yr(e(n))},mapError:function(e){return yr(n)},each:function(e){e(n)},bind:function(e){return e(n)},exists:function(e){return e(n)},forall:function(e){return e(n)},toOptional:function(){return U.some(n)}}},br=function(n){return{is:b,isValue:b,isError:w,getOr:o,getOrThunk:function(e){return e()},getOrDie:function(){return m(String(n))()},or:function(e){return e},orThunk:function(e){return e()},fold:function(e,t){return e(n)},map:function(e){return br(n)},mapError:function(e){return br(e(n))},each:te,bind:function(e){return br(n)},exists:b,forall:w,toOptional:U.none}},Cr={value:yr,error:br,fromOption:function(e,t){return e.fold(function(){return br(t)},yr)}},wr=function(a){if(!_(a))throw new Error("cases must be an array");if(0===a.length)throw new Error("there must be at least one case");var u=[],n={};return Y(a,function(e,r){var t=ae(e);if(1!==t.length)throw new Error("one and only one name per case");var o=t[0],i=e[o];if(n[o]!==undefined)throw new Error("duplicate key detected:"+o);if("cata"===o)throw new Error("cannot have a case named cata (sorry)");if(!_(i))throw new Error("case arguments must be an array");u.push(o),n[o]=function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var t=n.length;if(t!==i.length)throw new Error("Wrong number of arguments to case "+o+". Expected "+i.length+" ("+i+"), got "+t);return{fold:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];if(e.length!==a.length)throw new Error("Wrong number of arguments to fold. Expected "+a.length+", got "+e.length);return e[r].apply(null,n)},match:function(e){var t=ae(e);if(u.length!==t.length)throw new Error("Wrong number of arguments to match. Expected: "+u.join(",")+"\nActual: "+t.join(","));if(!Q(u,function(e){return M(t,e)}))throw new Error("Not all branches were specified when using match. Specified: "+t.join(", ")+"\nRequired: "+u.join(", "));return e[o].apply(null,n)},log:function(e){console.log(e,{constructors:u,constructor:o,params:n})}}}}),n},xr=(wr([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]),function(e){return e.fold(o,o)});function Sr(e,t,n,r,o){return e(n,r)?U.some(n):D(o)&&o(n)?U.none():t(n,r,o)}var Nr,Er,kr,_r,Ar,Rr,Tr=function(e,t,n){for(var r=e.dom,o=D(n)?n:b;r.parentNode;){r=r.parentNode;var i=Rt.fromDom(r);if(t(i))return U.some(i);if(o(i))break}return U.none()},Dr=function(e,t,n){return Sr(function(e,t){return t(e)},Tr,e,t,n)},Or=function(e,t){return W(e.dom.childNodes,function(e){return t(Rt.fromDom(e))}).map(Rt.fromDom)},Br=function(e,t,n){return Tr(e,function(e){return Dt(e,t)},n)},Pr=function(e,t){return n=t,o=(r=e)===undefined?document:r.dom,Ot(o)?U.none():U.from(o.querySelector(n)).map(Rt.fromDom);var n,r,o},Lr=function(e,t,n){return Sr(Dt,Br,e,t,n)},Ir=window.Promise?window.Promise:(Nr=function(n,r){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.apply(r,e)}},Er=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},_r=(kr=function(e){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],Ar(e,Nr(Fr,this),Nr(Ur,this))}).immediateFn||"function"==typeof setImmediate&&setImmediate||function(e){return setTimeout(e,1)},Ar=function(e,t,n){var r=!1;try{e(function(e){r||(r=!0,t(e))},function(e){r||(r=!0,n(e))})}catch(o){if(r)return;r=!0,n(o)}},kr.prototype["catch"]=function(e){return this.then(null,e)},kr.prototype.then=function(n,r){var o=this;return new kr(function(e,t){Mr.call(o,new jr(n,r,e,t))})},kr.all=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var s=Array.prototype.slice.call(1===e.length&&Er(e[0])?e[0]:e);return new kr(function(o,i){if(0===s.length)return o([]);for(var a=s.length,u=function(t,e){try{if(e&&("object"==typeof e||"function"==typeof e)){var n=e.then;if("function"==typeof n)return void n.call(e,function(e){u(t,e)},i)}s[t]=e,0==--a&&o(s)}catch(r){i(r)}},e=0;e<s.length;e++)u(e,s[e])})},kr.resolve=function(t){return t&&"object"==typeof t&&t.constructor===kr?t:new kr(function(e){e(t)})},kr.reject=function(n){return new kr(function(e,t){t(n)})},kr.race=function(o){return new kr(function(e,t){for(var n=0,r=o.length;n<r;n++)o[n].then(e,t)})},kr);function Mr(r){var o=this;null!==this._state?_r(function(){var e,t=o._state?r.onFulfilled:r.onRejected;if(null!==t){try{e=t(o._value)}catch(n){return void r.reject(n)}r.resolve(e)}else(o._state?r.resolve:r.reject)(o._value)}):this._deferreds.push(r)}function Fr(e){try{if(e===this)throw new TypeError("A promise cannot be resolved with itself.");if(e&&("object"==typeof e||"function"==typeof e)){var t=e.then;if("function"==typeof t)return void Ar(Nr(t,e),Nr(Fr,this),Nr(Ur,this))}this._state=!0,this._value=e,zr.call(this)}catch(n){Ur.call(this,n)}}function Ur(e){this._state=!1,this._value=e,zr.call(this)}function zr(){for(var e=0,t=this._deferreds.length;e<t;e++)Mr.call(this,this._deferreds[e]);this._deferreds=null}function jr(e,t,n,r){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.resolve=n,this.reject=r}var Hr,Vr=function(e,t){return"number"!=typeof t&&(t=0),setTimeout(e,t)},qr=function(e,t){return"number"!=typeof t&&(t=1),setInterval(e,t)},$r=function(n,r){var o,e=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];clearTimeout(o),o=Vr(function(){n.apply(this,e)},r)};return e.stop=function(){clearTimeout(o)},e},Wr={requestAnimationFrame:function(e,t){Rr?Rr.then(e):Rr=new Ir(function(e){!function(e,t){for(var n=window.requestAnimationFrame,r=["ms","moz","webkit"],o=0;o<r.length&&!n;o++)n=window[r[o]+"RequestAnimationFrame"];(n=n||function(e){window.setTimeout(e,0)})(e,t)}(e,t=t||document.body)}).then(e)},setTimeout:Vr,setInterval:qr,setEditorTimeout:function(e,t,n){return Vr(function(){e.removed||t()},n)},setEditorInterval:function(e,t,n){var r=qr(function(){e.removed?clearInterval(r):t()},n);return r},debounce:$r,throttle:$r,clearInterval:function(e){return clearInterval(e)},clearTimeout:function(e){return clearTimeout(e)}},Kr=function(m,p){void 0===p&&(p={});var g=0,h={},v=Rt.fromDom(m),y=qt(v),b=p.maxLoadTime||5e3,n=function(e,t,n){var r,o=_t._addCacheSuffix(e),i=he(h,o).getOrThunk(function(){return{id:"mce-u"+g++,passed:[],failed:[],count:0}});(h[o]=i).count++;var a,u,s,c=function(e,t){for(var n=e.length;n--;)e[n]();i.status=t,i.passed=[],i.failed=[],r&&(r.onload=null,r.onerror=null,r=null)},l=function(){return c(i.passed,2)},f=function(){return c(i.failed,3)},d=function(){var e;e=d,function(){for(var e=m.styleSheets,t=e.length;t--;){var n=e[t].ownerNode;if(n&&n.id===r.id)return l(),1}}()||(Date.now()-u<b?Wr.setTimeout(e):f())};t&&i.passed.push(t),n&&i.failed.push(n),1!==i.status&&(2!==i.status?3!==i.status?(i.status=1,a=Rt.fromTag("link",y.dom),Gn(a,{rel:"stylesheet",type:"text/css",id:i.id}),u=Date.now(),p.contentCssCors&&Yn(a,"crossOrigin","anonymous"),p.referrerPolicy&&Yn(a,"referrerpolicy",p.referrerPolicy),(r=a.dom).onload=d,r.onerror=f,s=a,dn(an(v),s),Yn(a,"href",o)):f():l())},o=function(t){return hr(function(e){n(t,a(e,S(Cr.value(t))),a(e,S(Cr.error(t))))})},t=function(e){var r=_t._addCacheSuffix(e);he(h,r).each(function(e){var t,n;0==--e.count&&(delete h[r],t=e.id,n=an(v),Pr(n,"#"+t).each(gn))})};return{load:n,loadAll:function(e,n,r){var t;t=z(e,o),vr(t,hr).get(function(e){var t=function(e,t){for(var n=[],r=[],o=0,i=e.length;o<i;o++){var a=e[o];(t(a,o)?n:r).push(a)}return{pass:n,fail:r}}(e,function(e){return e.isValue()});0<t.fail.length?r(t.fail.map(xr)):n(t.pass.map(xr))})},unload:t,unloadAll:function(e){Y(e,function(e){t(e)})},_setReferrerPolicy:function(e){p.referrerPolicy=e}}},Xr=(Hr=new WeakMap,{forElement:function(e,t){var n=on(e).dom;return U.from(Hr.get(n)).getOrThunk(function(){var e=Kr(n,t);return Hr.set(n,e),e})}}),Yr=(Gr.prototype.current=function(){return this.node},Gr.prototype.next=function(e){return this.node=this.findSibling(this.node,"firstChild","nextSibling",e),this.node},Gr.prototype.prev=function(e){return this.node=this.findSibling(this.node,"lastChild","previousSibling",e),this.node},Gr.prototype.prev2=function(e){return this.node=this.findPreviousNode(this.node,"lastChild","previousSibling",e),this.node},Gr.prototype.findSibling=function(e,t,n,r){var o,i;if(e){if(!r&&e[t])return e[t];if(e!==this.rootNode){if(o=e[n])return o;for(i=e.parentNode;i&&i!==this.rootNode;i=i.parentNode)if(o=i[n])return o}}},Gr.prototype.findPreviousNode=function(e,t,n,r){var o,i,a;if(e){if(o=e[n],this.rootNode&&o===this.rootNode)return;if(o){if(!r)for(a=o[t];a;a=a[t])if(!a[t])return a;return o}if((i=e.parentNode)&&i!==this.rootNode)return i}},Gr);function Gr(e,t){this.node=e,this.rootNode=t,this.current=this.current.bind(this),this.next=this.next.bind(this),this.prev=this.prev.bind(this),this.prev2=this.prev2.bind(this)}var Jr,Qr,Zr=function(t){var n;return function(e){return(n=n||function(e,t){for(var n={},r=0,o=e.length;r<o;r++){var i=e[r];n[String(i)]=t(i,r)}return n}(t,w)).hasOwnProperty(It(e))}},eo=Zr(["h1","h2","h3","h4","h5","h6"]),to=Zr(["article","aside","details","div","dt","figcaption","footer","form","fieldset","header","hgroup","html","main","nav","section","summary","body","p","dl","multicol","dd","figure","address","center","blockquote","h1","h2","h3","h4","h5","h6","listing","xmp","pre","plaintext","menu","dir","ul","ol","li","hr","table","tbody","thead","tfoot","th","tr","td","caption"]),no=function(e){return Ut(e)&&!to(e)},ro=function(e){return Ut(e)&&"br"===It(e)},oo=Zr(["h1","h2","h3","h4","h5","h6","p","div","address","pre","form","blockquote","center","dir","fieldset","header","footer","article","section","hgroup","aside","nav","figure"]),io=Zr(["ul","ol","dl"]),ao=Zr(["li","dd","dt"]),uo=Zr(["thead","tbody","tfoot"]),so=Zr(["td","th"]),co=Zr(["pre","script","textarea","style"]),lo="\ufeff",fo="\xa0",mo=lo,po=function(e){return e===lo},go=function(e){return e.replace(/\uFEFF/g,"")},ho=Rn,vo=Mn,yo=function(e){return vo(e)&&(e=e.parentNode),ho(e)&&e.hasAttribute("data-mce-caret")},bo=function(e){return vo(e)&&po(e.data)},Co=function(e){return yo(e)||bo(e)},wo=function(e){return e.firstChild!==e.lastChild||!jn(e.firstChild)},xo=function(e){var t=e.container();return!!Mn(t)&&(t.data.charAt(e.offset())===mo||e.isAtStart()&&bo(t.previousSibling))},So=function(e){var t=e.container();return!!Mn(t)&&(t.data.charAt(e.offset()-1)===mo||e.isAtEnd()&&bo(t.nextSibling))},No=function(e,t,n){var r,o=t.ownerDocument.createElement(e);o.setAttribute("data-mce-caret",n?"before":"after"),o.setAttribute("data-mce-bogus","all"),o.appendChild(((r=document.createElement("br")).setAttribute("data-mce-bogus","1"),r));var i=t.parentNode;return n?i.insertBefore(o,t):t.nextSibling?i.insertBefore(o,t.nextSibling):i.appendChild(o),o},Eo=function(e){return vo(e)&&e.data[0]===mo},ko=function(e){return vo(e)&&e.data[e.data.length-1]===mo},_o=function(e){return e&&e.hasAttribute("data-mce-caret")?(t=e.getElementsByTagName("br"),n=t[t.length-1],Bn(n)&&n.parentNode.removeChild(n),e.removeAttribute("data-mce-caret"),e.removeAttribute("data-mce-bogus"),e.removeAttribute("style"),e.removeAttribute("_moz_abspos"),e):null;var t,n},Ao=Vn,Ro=qn,To=jn,Do=Mn,Oo=Tn(["script","style","textarea"]),Bo=Tn(["img","input","textarea","hr","iframe","video","audio","object","embed"]),Po=Tn(["table"]),Lo=Co,Io=function(e){return!Lo(e)&&(Do(e)?!Oo(e.parentNode):Bo(e)||To(e)||Po(e)||Mo(e))},Mo=function(e){return!1===(Rn(t=e)&&"true"===t.getAttribute("unselectable"))&&Ro(e);var t},Fo=function(e,t){return Io(e)&&function(e,t){for(e=e.parentNode;e&&e!==t;e=e.parentNode){if(Mo(e))return!1;if(Ao(e))return!0}return!0}(e,t)},Uo=/^[ \t\r\n]*$/,zo=function(e){return Uo.test(e)},jo=function(e,t){var n,r,o,i=Rt.fromDom(t),a=Rt.fromDom(e);return n=a,r="pre,code",o=N(Bt,i),Br(n,r,o).isSome()},Ho=function(e,t){return Io(e)&&!1===(o=t,Mn(r=e)&&zo(r.data)&&!1===jo(r,o))||Rn(n=e)&&"A"===n.nodeName&&!n.hasAttribute("href")&&(n.hasAttribute("name")||n.hasAttribute("id"))||Vo(e);var n,r,o},Vo=On("data-mce-bookmark"),qo=On("data-mce-bogus"),$o=(Jr="data-mce-bogus",Qr="all",function(e){return Rn(e)&&e.getAttribute(Jr)===Qr}),Wo=function(e,t){return void 0===t&&(t=!0),function(e,t){var n,r=0;if(Ho(e,e))return!1;if(!(n=e.firstChild))return!0;var o=new Yr(n,e);do{if(t){if($o(n)){n=o.next(!0);continue}if(qo(n)){n=o.next();continue}}if(jn(n))r++,n=o.next();else{if(Ho(n,e))return!1;n=o.next()}}while(n);return r<=1}(e.dom,t)},Ko=function(e,t){return V(e)&&(Ho(e,t)||no(Rt.fromDom(e)))},Xo=function(e){return"span"===e.nodeName.toLowerCase()&&"bookmark"===e.getAttribute("data-mce-type")},Yo=function(e,t){return Mn(e)&&0<e.data.length&&(o=new Yr(n=e,r=t).prev(!1),i=new Yr(n,r).next(!1),a=T(o)||Ko(o,r),u=T(i)||Ko(i,r),a&&u);var n,r,o,i,a,u},Go=function(e,t,n){var r=n||t;if(Rn(t)&&Xo(t))return t;for(var o,i,a,u=t.childNodes,s=u.length-1;0<=s;s--)Go(e,u[s],r);return!Rn(t)||1===(o=t.childNodes).length&&Xo(o[0])&&t.parentNode.insertBefore(o[0],t),zn(a=t)||Un(a)||Ho(t,r)||Rn(i=t)&&0<i.childNodes.length||Yo(t,r)||e.remove(t),t},Jo=_t.makeMap,Qo=/[&<>\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,Zo=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,ei=/[<>&\"\']/g,ti=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,ni={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"},ri={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;","`":"&#96;"},oi={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},ii=function(e,t){var n,r,o,i={};if(e){for(e=e.split(","),t=t||10,n=0;n<e.length;n+=2)r=String.fromCharCode(parseInt(e[n],t)),ri[r]||(o="&"+e[n+1]+";",i[r]=o,i[o]=r);return i}},ai=ii("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32),ui=function(e,t){return e.replace(t?Qo:Zo,function(e){return ri[e]||e})},si=function(e,t){return e.replace(t?Qo:Zo,function(e){return 1<e.length?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":ri[e]||"&#"+e.charCodeAt(0)+";"})},ci=function(e,t,n){return n=n||ai,e.replace(t?Qo:Zo,function(e){return ri[e]||n[e]||e})},li={encodeRaw:ui,encodeAllRaw:function(e){return(""+e).replace(ei,function(e){return ri[e]||e})},encodeNumeric:si,encodeNamed:ci,getEncodeFunc:function(e,t){var n=ii(t)||ai,r=Jo(e.replace(/\+/g,","));return r.named&&r.numeric?function(e,t){return e.replace(t?Qo:Zo,function(e){return ri[e]!==undefined?ri[e]:n[e]!==undefined?n[e]:1<e.length?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":"&#"+e.charCodeAt(0)+";"})}:r.named?t?function(e,t){return ci(e,t,n)}:ci:r.numeric?si:ui},decode:function(e){return e.replace(ti,function(e,t){return t?65535<(t="x"===t.charAt(0).toLowerCase()?parseInt(t.substr(1),16):parseInt(t,10))?(t-=65536,String.fromCharCode(55296+(t>>10),56320+(1023&t))):ni[t]||String.fromCharCode(t):oi[e]||ai[e]||(n=e,(r=Rt.fromTag("div").dom).innerHTML=n,r.textContent||r.innerText||n);var n,r})}},fi={},di={},mi=_t.makeMap,pi=_t.each,gi=_t.extend,hi=_t.explode,vi=_t.inArray,yi=function(e,t){return(e=_t.trim(e))?e.split(t||" "):[]},bi=function(e,n){var r;return e&&(r={},"string"==typeof e&&(e={"*":e}),pi(e,function(e,t){r[t]=r[t.toUpperCase()]=("map"===n?mi:hi)(e,/[, ]/)})),r},Ci=function(i){var e,s,t,n,r,o,a,c,u,l,S={},f={},N=[],d={},m={},p=function(e,t,n){var r=i[e];return r?r=mi(r,/[, ]/,mi(r.toUpperCase(),/[, ]/)):(r=fi[e])||(r=mi(t," ",mi(t.toUpperCase()," ")),r=gi(r,n),fi[e]=r),r},g=(e=(i=i||{}).schema,c={},u=function(e,t,n){var r,o,i=function(e,t){for(var n={},r=0,o=e.length;r<o;r++)n[e[r]]=t||{};return n};t=t||"","string"==typeof(n=n||[])&&(n=yi(n));for(var a=yi(e),u=a.length;u--;)o={attributes:i(r=yi([s,t].join(" "))),attributesOrder:r,children:i(n,di)},c[a[u]]=o},l=function(e,t){for(var n,r,o,i=yi(e),a=i.length,u=yi(t);a--;)for(n=c[i[a]],r=0,o=u.length;r<o;r++)n.attributes[u[r]]={},n.attributesOrder.push(u[r])},fi[e]?fi[e]:(s="id accesskey class dir lang style tabindex title role",t="address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul",n="a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment","html4"!==e&&(s+=" contenteditable contextmenu draggable dropzone hidden spellcheck translate",t+=" article aside details dialog figure main header footer hgroup section nav",n+=" audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen"),"html5-strict"!==e&&(s+=" xml:lang",n=[n,a="acronym applet basefont big font strike tt"].join(" "),pi(yi(a),function(e){u(e,"",n)}),t=[t,o="center dir isindex noframes"].join(" "),r=[t,n].join(" "),pi(yi(o),function(e){u(e,"",r)})),r=r||[t,n].join(" "),u("html","manifest","head body"),u("head","","base command link meta noscript script style title"),u("title hr noscript br"),u("base","href target"),u("link","href rel media hreflang type sizes hreflang"),u("meta","name http-equiv content charset"),u("style","media type scoped"),u("script","src async defer type charset"),u("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",r),u("address dt dd div caption","",r),u("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",n),u("blockquote","cite",r),u("ol","reversed start type","li"),u("ul","","li"),u("li","value",r),u("dl","","dt dd"),u("a","href target rel media hreflang type",n),u("q","cite",n),u("ins del","cite datetime",r),u("img","src sizes srcset alt usemap ismap width height"),u("iframe","src name width height",r),u("embed","src type width height"),u("object","data type typemustmatch name usemap form width height",[r,"param"].join(" ")),u("param","name value"),u("map","name",[r,"area"].join(" ")),u("area","alt coords shape href target rel media hreflang type"),u("table","border","caption colgroup thead tfoot tbody tr"+("html4"===e?" col":"")),u("colgroup","span","col"),u("col","span"),u("tbody thead tfoot","","tr"),u("tr","","td th"),u("td","colspan rowspan headers",r),u("th","colspan rowspan headers scope abbr",r),u("form","accept-charset action autocomplete enctype method name novalidate target",r),u("fieldset","disabled form name",[r,"legend"].join(" ")),u("label","form for",n),u("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),u("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"===e?r:n),u("select","disabled form multiple name required size","option optgroup"),u("optgroup","disabled label","option"),u("option","disabled label selected value"),u("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),u("menu","type label",[r,"li"].join(" ")),u("noscript","",r),"html4"!==e&&(u("wbr"),u("ruby","",[n,"rt rp"].join(" ")),u("figcaption","",r),u("mark rt rp summary bdi","",n),u("canvas","width height",r),u("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",[r,"track source"].join(" ")),u("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",[r,"track source"].join(" ")),u("picture","","img source"),u("source","src srcset type media sizes"),u("track","kind src srclang label default"),u("datalist","",[n,"option"].join(" ")),u("article section nav aside main header footer","",r),u("hgroup","","h1 h2 h3 h4 h5 h6"),u("figure","",[r,"figcaption"].join(" ")),u("time","datetime",n),u("dialog","open",r),u("command","type label icon disabled checked radiogroup command"),u("output","for form name",n),u("progress","value max",n),u("meter","value min max low high optimum",n),u("details","open",[r,"summary"].join(" ")),u("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!==e&&(l("script","language xml:space"),l("style","xml:space"),l("object","declare classid code codebase codetype archive standby align border hspace vspace"),l("embed","align name hspace vspace"),l("param","valuetype type"),l("a","charset name rev shape coords"),l("br","clear"),l("applet","codebase archive code object alt name width height align hspace vspace"),l("img","name longdesc align border hspace vspace"),l("iframe","longdesc frameborder marginwidth marginheight scrolling align"),l("font basefont","size color face"),l("input","usemap align"),l("select"),l("textarea"),l("h1 h2 h3 h4 h5 h6 div p legend caption","align"),l("ul","type compact"),l("li","type"),l("ol dl menu dir","compact"),l("pre","width xml:space"),l("hr","align noshade size width"),l("isindex","prompt"),l("table","summary width frame rules cellspacing cellpadding align bgcolor"),l("col","width align char charoff valign"),l("colgroup","width align char charoff valign"),l("thead","align char charoff valign"),l("tr","align char charoff valign bgcolor"),l("th","axis align char charoff valign nowrap bgcolor width height"),l("form","accept"),l("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),l("tfoot","align char charoff valign"),l("tbody","align char charoff valign"),l("area","nohref"),l("body","background bgcolor text link vlink alink")),"html4"!==e&&(l("input button select textarea","autofocus"),l("input textarea","placeholder"),l("a","download"),l("link script img","crossorigin"),l("img","loading"),l("iframe","sandbox seamless allowfullscreen loading")),pi(yi("a form meter progress dfn"),function(e){c[e]&&delete c[e].children[e]}),delete c.caption.children.table,delete c.script,fi[e]=c));!1===i.verify_html&&(i.valid_elements="*[*]");var h=bi(i.valid_styles),v=bi(i.invalid_styles,"map"),y=bi(i.valid_classes,"map"),b=p("whitespace_elements","pre script noscript style textarea video audio iframe object code"),C=p("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),w=p("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),x=p("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),E="td th iframe video audio object script code",k=p("non_empty_elements",E+" pre",w),_=p("move_caret_before_on_enter_elements",E+" table",w),A=p("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside main nav figure"),R=p("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption details summary",A),T=p("text_inline_elements","span strong b em i font strike u var cite dfn code mark q sup sub samp");pi((i.special||"script noscript iframe noframes noembed title style textarea xmp").split(" "),function(e){m[e]=new RegExp("</"+e+"[^>]*>","gi")});var D=function(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")},O=function(e){var t,n,r,o,i,a,u,s,c,l,f,d,m,p,g,h,v,y,b=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)])?$/,C=/^([!\-])?(\w+[\\:]:\w+|[^=:<]+)?(?:([=:<])(.*))?$/,w=/[*?+]/;if(e){var x=yi(e,",");for(S["@"]&&(h=S["@"].attributes,v=S["@"].attributesOrder),t=0,n=x.length;t<n;t++)if(i=b.exec(x[t])){if(p=i[1],c=i[2],g=i[3],s=i[5],a={attributes:d={},attributesOrder:m=[]},"#"===p&&(a.paddEmpty=!0),"-"===p&&(a.removeEmpty=!0),"!"===i[4]&&(a.removeEmptyAttrs=!0),h&&(se(h,function(e,t){d[t]=e}),m.push.apply(m,v)),s)for(r=0,o=(s=yi(s,"|")).length;r<o;r++)if(i=C.exec(s[r])){if(u={},f=i[1],l=i[2].replace(/[\\:]:/g,":"),p=i[3],y=i[4],"!"===f&&(a.attributesRequired=a.attributesRequired||[],a.attributesRequired.push(l),u.required=!0),"-"===f){delete d[l],m.splice(vi(m,l),1);continue}p&&("="===p&&(a.attributesDefault=a.attributesDefault||[],a.attributesDefault.push({name:l,value:y}),u.defaultValue=y),":"===p&&(a.attributesForced=a.attributesForced||[],a.attributesForced.push({name:l,value:y}),u.forcedValue=y),"<"===p&&(u.validValues=mi(y,"?"))),w.test(l)?(a.attributePatterns=a.attributePatterns||[],u.pattern=D(l),a.attributePatterns.push(u)):(d[l]||m.push(l),d[l]=u)}h||"@"!==c||(h=d,v=m),g&&(a.outputName=c,S[g]=a),w.test(c)?(a.pattern=D(c),N.push(a)):S[c]=a}}},B=function(e){S={},N=[],O(e),pi(g,function(e,t){f[t]=e.children})},P=function(e){var a=/^(~)?(.+)$/;e&&(fi.text_block_elements=fi.block_elements=null,pi(yi(e,","),function(e){var t,n=a.exec(e),r="~"===n[1],o=r?"span":"div",i=n[2];f[i]=f[o],d[i]=o,r||(R[i.toUpperCase()]={},R[i]={}),S[i]||(t=S[o],delete(t=gi({},t)).removeEmptyAttrs,delete t.removeEmpty,S[i]=t),pi(f,function(e,t){e[o]&&(f[t]=e=gi({},f[t]),e[i]=e[o])})}))},L=function(e){var o=/^([+\-]?)([A-Za-z0-9_\-.\u00b7\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u037d\u037f-\u1fff\u200c-\u200d\u203f-\u2040\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]+)\[([^\]]+)]$/;fi[i.schema]=null,e&&pi(yi(e,","),function(e){var t,n,r=o.exec(e);r&&(n=r[1],t=n?f[r[2]]:f[r[2]]={"#comment":{}},t=f[r[2]],pi(yi(r[3],"|"),function(e){"-"===n?delete t[e]:t[e]={}}))})},I=function(e){var t,n=S[e];if(n)return n;for(t=N.length;t--;)if((n=N[t]).pattern.test(e))return n};i.valid_elements?B(i.valid_elements):(pi(g,function(e,t){S[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},f[t]=e.children}),"html5"!==i.schema&&pi(yi("strong/b em/i"),function(e){var t=yi(e,"/");S[t[1]].outputName=t[0]}),pi(yi("ol ul sub sup blockquote span font a table tbody strong em b i"),function(e){S[e]&&(S[e].removeEmpty=!0)}),pi(yi("p h1 h2 h3 h4 h5 h6 th td pre div address caption li"),function(e){S[e].paddEmpty=!0}),pi(yi("span"),function(e){S[e].removeEmptyAttrs=!0})),P(i.custom_elements),L(i.valid_children),O(i.extended_valid_elements),L("+ol[ul|ol],+ul[ul|ol]"),pi({dd:"dl",dt:"dl",li:"ul ol",td:"tr",th:"tr",tr:"tbody thead tfoot",tbody:"table",thead:"table",tfoot:"table",legend:"fieldset",area:"map",param:"video audio object"},function(e,t){S[t]&&(S[t].parentsRequired=yi(e))}),i.invalid_elements&&pi(hi(i.invalid_elements),function(e){S[e]&&delete S[e]}),I("span")||O("span[!data-mce-type|*]");return{children:f,elements:S,getValidStyles:function(){return h},getValidClasses:function(){return y},getBlockElements:function(){return R},getInvalidStyles:function(){return v},getShortEndedElements:function(){return w},getTextBlockElements:function(){return A},getTextInlineElements:function(){return T},getBoolAttrs:function(){return x},getElementRule:I,getSelfClosingElements:function(){return C},getNonEmptyElements:function(){return k},getMoveCaretBeforeOnEnterElements:function(){return _},getWhiteSpaceElements:function(){return b},getSpecialElements:function(){return m},isValidChild:function(e,t){var n=f[e.toLowerCase()];return!(!n||!n[t.toLowerCase()])},isValid:function(e,t){var n,r,o=I(e);if(o){if(!t)return!0;if(o.attributes[t])return!0;if(n=o.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},getCustomElements:function(){return d},addValidElements:O,setValidElements:B,addCustomElements:P,addValidChildren:L}},wi=function(e,t,n,r){var o=function(e){return 1<(e=parseInt(e,10).toString(16)).length?e:"0"+e};return"#"+o(t)+o(n)+o(r)},xi=function(b,e){var s,c,C=this,w=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,x=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,S=/\s*([^:]+):\s*([^;]+);?/g,N=/\s+$/,E={},k=lo;b=b||{},e&&(s=e.getValidStyles(),c=e.getInvalidStyles());for(var t=("\\\" \\' \\; \\: ; : "+k).split(" "),_=0;_<t.length;_++)E[t[_]]=k+_,E[k+_]=t[_];return{toHex:function(e){return e.replace(w,wi)},parse:function(e){var t,n,r,o,i,a,u,s,c={},l=b.url_converter,f=b.url_converter_scope||C,d=function(e,t,n){var r=c[e+"-top"+t];if(r){var o=c[e+"-right"+t];if(o){var i=c[e+"-bottom"+t];if(i){var a=c[e+"-left"+t];if(a){var u=[r,o,i,a];for(_=u.length-1;_--&&u[_]===u[_+1];);-1<_&&n||(c[e+t]=-1===_?u[0]:u.join(" "),delete c[e+"-top"+t],delete c[e+"-right"+t],delete c[e+"-bottom"+t],delete c[e+"-left"+t])}}}}},m=function(e){var t,n=c[e];if(n){for(t=(n=n.split(" ")).length;t--;)if(n[t]!==n[0])return!1;return c[e]=n[0],!0}},p=function(e){return o=!0,E[e]},g=function(e,t){return o&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return E[e]})),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e},h=function(e){return String.fromCharCode(parseInt(e.slice(1),16))},v=function(e){return e.replace(/\\[0-9a-f]+/gi,h)},y=function(e,t,n,r,o,i){if(o=o||i)return"'"+(o=g(o)).replace(/\'/g,"\\'")+"'";if(t=g(t||n||r),!b.allow_script_urls){var a=t.replace(/[\s\r\n]+/g,"");if(/(java|vb)script:/i.test(a))return"";if(!b.allow_svg_data_urls&&/^data:image\/svg/i.test(a))return""}return l&&(t=l.call(f,t,"style")),"url('"+t.replace(/\'/g,"\\'")+"')"};if(e){for(e=(e=e.replace(/[\u0000-\u001F]/g,"")).replace(/\\[\"\';:\uFEFF]/g,p).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,p)});t=S.exec(e);)if(S.lastIndex=t.index+t[0].length,n=t[1].replace(N,"").toLowerCase(),r=t[2].replace(N,""),n&&r){if(n=v(n),r=v(r),-1!==n.indexOf(k)||-1!==n.indexOf('"'))continue;if(!b.allow_script_urls&&("behavior"===n||/expression\s*\(|\/\*|\*\//.test(r)))continue;"font-weight"===n&&"700"===r?r="bold":"color"!==n&&"background-color"!==n||(r=r.toLowerCase()),r=(r=r.replace(w,wi)).replace(x,y),c[n]=o?g(r,!0):r}d("border","",!0),d("border","-width"),d("border","-color"),d("border","-style"),d("padding",""),d("margin",""),i="border",u="border-style",s="border-color",m(a="border-width")&&m(u)&&m(s)&&(c[i]=c[a]+" "+c[u]+" "+c[s],delete c[a],delete c[u],delete c[s]),"medium none"===c.border&&delete c.border,"none"===c["border-image"]&&delete c["border-image"]}return c},serialize:function(i,a){var u="",e=function(e){var t,n=s[e];if(n)for(var r=0,o=n.length;r<o;r++)e=n[r],(t=i[e])&&(u+=(0<u.length?" ":"")+e+": "+t+";")};return a&&s?(e("*"),e(a)):se(i,function(e,t){var n,r,o;!e||c&&(n=t,r=a,(o=c["*"])&&o[n]||(o=c[r])&&o[n])||(u+=(0<u.length?" ":"")+t+": "+e+";")}),u}}},Si=/^(?:mouse|contextmenu)|click/,Ni={keyLocation:1,layerX:1,layerY:1,returnValue:1,webkitMovementX:1,webkitMovementY:1,keyIdentifier:1,mozPressure:1},Ei=b,ki=w,_i=function(e,t,n,r){e.addEventListener?e.addEventListener(t,n,r||!1):e.attachEvent&&e.attachEvent("on"+t,n)},Ai=function(e,t,n,r){e.removeEventListener?e.removeEventListener(t,n,r||!1):e.detachEvent&&e.detachEvent("on"+t,n)},Ri=function(e,t){var n,r,o,i,a,u,s=t||{};for(n in e)Ni[n]||(s[n]=e[n]);return s.target||(s.target=s.srcElement||document),s.composedPath&&(s.composedPath=function(){return e.composedPath()}),e&&(a=e,Si.test(a.type))&&e.pageX===undefined&&e.clientX!==undefined&&(o=(r=s.target.ownerDocument||document).documentElement,i=r.body,s.pageX=e.clientX+(o&&o.scrollLeft||i&&i.scrollLeft||0)-(o&&o.clientLeft||i&&i.clientLeft||0),s.pageY=e.clientY+(o&&o.scrollTop||i&&i.scrollTop||0)-(o&&o.clientTop||i&&i.clientTop||0)),s.preventDefault=function(){s.defaultPrevented=!0,s.isDefaultPrevented=ki,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},s.stopPropagation=function(){s.cancelBubble=!0,s.isPropagationStopped=ki,e&&(e.stopPropagation?e.stopPropagation():e.cancelBubble=!0)},!(s.stopImmediatePropagation=function(){s.isImmediatePropagationStopped=ki,s.stopPropagation()})==((u=s).isDefaultPrevented===ki||u.isDefaultPrevented===Ei)&&(s.isDefaultPrevented=!0===s.defaultPrevented?ki:Ei,s.isPropagationStopped=!0===s.cancelBubble?ki:Ei,s.isImmediatePropagationStopped=Ei),"undefined"==typeof s.metaKey&&(s.metaKey=!1),s},Ti=(Di.prototype.bind=function(e,t,n,r){var o,i,a,u,s,c,l=this,f=window,d=function(e){l.executeHandlers(Ri(e||f.event),o)};if(e&&3!==e.nodeType&&8!==e.nodeType){e[l.expando]?o=e[l.expando]:(o=l.count++,e[l.expando]=o,l.events[o]={}),r=r||e;for(var m=t.split(" "),p=m.length;p--;)s=d,u=c=!1,"DOMContentLoaded"===(a=m[p])&&(a="ready"),l.domLoaded&&"ready"===a&&"complete"===e.readyState?n.call(r,Ri({type:a})):(l.hasMouseEnterLeave||(u=l.mouseEnterLeave[a])&&(s=function(e){var t=e.currentTarget,n=e.relatedTarget;if(n&&t.contains)n=t.contains(n);else for(;n&&n!==t;)n=n.parentNode;n||((e=Ri(e||f.event)).type="mouseout"===e.type?"mouseleave":"mouseenter",e.target=t,l.executeHandlers(e,o))}),l.hasFocusIn||"focusin"!==a&&"focusout"!==a||(c=!0,u="focusin"===a?"focus":"blur",s=function(e){(e=Ri(e||f.event)).type="focus"===e.type?"focusin":"focusout",l.executeHandlers(e,o)}),(i=l.events[o][a])?"ready"===a&&l.domLoaded?n(Ri({type:a})):i.push({func:n,scope:r}):(l.events[o][a]=i=[{func:n,scope:r}],i.fakeName=u,i.capture=c,i.nativeHandler=s,"ready"===a?function(e,t,n){var r,o=e.document,i={type:"ready"};n.domLoaded?t(i):(r=function(){Ai(e,"DOMContentLoaded",r),Ai(e,"load",r),n.domLoaded||(n.domLoaded=!0,t(i)),e=null},"complete"===o.readyState||"interactive"===o.readyState&&o.body?r():_i(e,"DOMContentLoaded",r),n.domLoaded||_i(e,"load",r))}(e,s,l):_i(e,u||a,s,c)));return e=i=null,n}},Di.prototype.unbind=function(n,e,t){var r,o,i;if(!n||3===n.nodeType||8===n.nodeType)return this;var a=n[this.expando];if(a){if(i=this.events[a],e){for(var u,s,c,l,f=e.split(" "),d=f.length;d--;)if(l=i[o=f[d]]){if(t)for(r=l.length;r--;)l[r].func===t&&(u=l.nativeHandler,s=l.fakeName,c=l.capture,(l=l.slice(0,r).concat(l.slice(r+1))).nativeHandler=u,l.fakeName=s,l.capture=c,i[o]=l);t&&0!==l.length||(delete i[o],Ai(n,l.fakeName||o,l.nativeHandler,l.capture))}}else se(i,function(e,t){Ai(n,e.fakeName||t,e.nativeHandler,e.capture)}),i={};for(o in i)if(ve(i,o))return this;delete this.events[a];try{delete n[this.expando]}catch(m){n[this.expando]=null}}return this},Di.prototype.fire=function(e,t,n){var r;if(!e||3===e.nodeType||8===e.nodeType)return this;var o=Ri(null,n);for(o.type=t,o.target=e;(r=e[this.expando])&&this.executeHandlers(o,r),(e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow)&&!o.isPropagationStopped(););return this},Di.prototype.clean=function(e){var t,n;if(!e||3===e.nodeType||8===e.nodeType)return this;if(e[this.expando]&&this.unbind(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName)for(this.unbind(e),t=(n=e.getElementsByTagName("*")).length;t--;)(e=n[t])[this.expando]&&this.unbind(e);return this},Di.prototype.destroy=function(){this.events={}},Di.prototype.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1},Di.prototype.executeHandlers=function(e,t){var n=this.events[t],r=n&&n[e.type];if(r)for(var o=0,i=r.length;o<i;o++){var a=r[o];if(a&&!1===a.func.call(a.scope,e)&&e.preventDefault(),e.isImmediatePropagationStopped())return}},Di.Event=new Di,Di);function Di(){this.domLoaded=!1,this.events={},this.count=1,this.expando="mce-data-"+(+new Date).toString(32),this.hasMouseEnterLeave="onmouseenter"in document.documentElement,this.hasFocusIn="onfocusin"in document.documentElement,this.count=1}var Oi,Bi,Pi,Li,Ii,Mi,Fi,Ui,zi,ji,Hi,Vi,qi,$i,Wi,Ki,Xi,Yi="sizzle"+-new Date,Gi=window.document,Ji=0,Qi=0,Zi=Da(),ea=Da(),ta=Da(),na=function(e,t){return e===t&&(ji=!0),0},ra=typeof undefined,oa={}.hasOwnProperty,ia=[],aa=ia.pop,ua=ia.push,sa=ia.push,ca=ia.slice,la=ia.indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(this[t]===e)return t;return-1},fa="[\\x20\\t\\r\\n\\f]",da="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ma="\\["+fa+"*("+da+")(?:"+fa+"*([*^$|!~]?=)"+fa+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+da+"))|)"+fa+"*\\]",pa=":("+da+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ma+")*)|.*)\\)|)",ga=new RegExp("^"+fa+"+|((?:^|[^\\\\])(?:\\\\.)*)"+fa+"+$","g"),ha=new RegExp("^"+fa+"*,"+fa+"*"),va=new RegExp("^"+fa+"*([>+~]|"+fa+")"+fa+"*"),ya=new RegExp("="+fa+"*([^\\]'\"]*?)"+fa+"*\\]","g"),ba=new RegExp(pa),Ca=new RegExp("^"+da+"$"),wa={ID:new RegExp("^#("+da+")"),CLASS:new RegExp("^\\.("+da+")"),TAG:new RegExp("^("+da+"|[*])"),ATTR:new RegExp("^"+ma),PSEUDO:new RegExp("^"+pa),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+fa+"*(even|odd|(([+-]|)(\\d*)n|)"+fa+"*(?:([+-]|)"+fa+"*(\\d+)|))"+fa+"*\\)|)","i"),bool:new RegExp("^(?:checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped)$","i"),needsContext:new RegExp("^"+fa+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+fa+"*((?:-\\d)?\\d*)"+fa+"*\\)|)(?=[^-]|$)","i")},xa=/^(?:input|select|textarea|button)$/i,Sa=/^h\d$/i,Na=/^[^{]+\{\s*\[native \w/,Ea=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ka=/[+~]/,_a=/'|\\/g,Aa=new RegExp("\\\\([\\da-f]{1,6}"+fa+"?|("+fa+")|.)","ig"),Ra=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(65536+r):String.fromCharCode(r>>10|55296,1023&r|56320)};try{sa.apply(ia=ca.call(Gi.childNodes),Gi.childNodes),ia[Gi.childNodes.length].nodeType}catch(_k){sa={apply:ia.length?function(e,t){ua.apply(e,ca.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}var Ta=function(e,t,n,r){var o,i,a,u,s,c,l,f,d,m;if((t?t.ownerDocument||t:Gi)!==Vi&&Hi(t),n=n||[],!e||"string"!=typeof e)return n;if(1!==(u=(t=t||Vi).nodeType)&&9!==u)return[];if($i&&!r){if(o=Ea.exec(e))if(a=o[1]){if(9===u){if(!(i=t.getElementById(a))||!i.parentNode)return n;if(i.id===a)return n.push(i),n}else if(t.ownerDocument&&(i=t.ownerDocument.getElementById(a))&&Xi(t,i)&&i.id===a)return n.push(i),n}else{if(o[2])return sa.apply(n,t.getElementsByTagName(e)),n;if((a=o[3])&&Oi.getElementsByClassName)return sa.apply(n,t.getElementsByClassName(a)),n}if(Oi.qsa&&(!Wi||!Wi.test(e))){if(f=l=Yi,d=t,m=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){for(c=Ii(e),(l=t.getAttribute("id"))?f=l.replace(_a,"\\$&"):t.setAttribute("id",f),f="[id='"+f+"'] ",s=c.length;s--;)c[s]=f+Ma(c[s]);d=ka.test(e)&&La(t.parentNode)||t,m=c.join(",")}if(m)try{return sa.apply(n,d.querySelectorAll(m)),n}catch(p){}finally{l||t.removeAttribute("id")}}}return Fi(e.replace(ga,"$1"),t,n,r)};function Da(){var n=[];function r(e,t){return n.push(e+" ")>Bi.cacheLength&&delete r[n.shift()],r[e+" "]=t}return r}function Oa(e){return e[Yi]=!0,e}function Ba(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||1<<31)-(~e.sourceIndex||1<<31);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function Pa(a){return Oa(function(i){return i=+i,Oa(function(e,t){for(var n,r=a([],e.length,i),o=r.length;o--;)e[n=r[o]]&&(e[n]=!(t[n]=e[n]))})})}function La(e){return e&&typeof e.getElementsByTagName!=ra&&e}function Ia(){}function Ma(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function Fa(a,e,t){var u=e.dir,s=t&&"parentNode"===u,c=Qi++;return e.first?function(e,t,n){for(;e=e[u];)if(1===e.nodeType||s)return a(e,t,n)}:function(e,t,n){var r,o,i=[Ji,c];if(n){for(;e=e[u];)if((1===e.nodeType||s)&&a(e,t,n))return!0}else for(;e=e[u];)if(1===e.nodeType||s){if((r=(o=e[Yi]||(e[Yi]={}))[u])&&r[0]===Ji&&r[1]===c)return i[2]=r[2];if((o[u]=i)[2]=a(e,t,n))return!0}}}function Ua(o){return 1<o.length?function(e,t,n){for(var r=o.length;r--;)if(!o[r](e,t,n))return!1;return!0}:o[0]}function za(e,t,n,r,o){for(var i,a=[],u=0,s=e.length,c=null!=t;u<s;u++)(i=e[u])&&(n&&!n(i,r,o)||(a.push(i),c&&t.push(u)));return a}function ja(m,p,g,h,v,e){return h&&!h[Yi]&&(h=ja(h)),v&&!v[Yi]&&(v=ja(v,e)),Oa(function(e,t,n,r){var o,i,a,u=[],s=[],c=t.length,l=e||function(e,t,n){for(var r=0,o=t.length;r<o;r++)Ta(e,t[r],n);return n}(p||"*",n.nodeType?[n]:n,[]),f=!m||!e&&p?l:za(l,u,m,n,r),d=g?v||(e?m:c||h)?[]:t:f;if(g&&g(f,d,n,r),h)for(o=za(d,s),h(o,[],n,r),i=o.length;i--;)(a=o[i])&&(d[s[i]]=!(f[s[i]]=a));if(e){if(v||m){if(v){for(o=[],i=d.length;i--;)(a=d[i])&&o.push(f[i]=a);v(null,d=[],o,r)}for(i=d.length;i--;)(a=d[i])&&-1<(o=v?la.call(e,a):u[i])&&(e[o]=!(t[o]=a))}}else d=za(d===t?d.splice(c,d.length):d),v?v(null,t,d,r):sa.apply(t,d)})}Oi=Ta.support={},Li=Ta.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},Hi=Ta.setDocument=function(e){var t,s=e?e.ownerDocument||e:Gi,n=s.defaultView;return s!==Vi&&9===s.nodeType&&s.documentElement?(qi=(Vi=s).documentElement,$i=!Li(s),n&&n!==function(e){try{return e.top}catch(t){}return null}(n)&&(n.addEventListener?n.addEventListener("unload",function(){Hi()},!1):n.attachEvent&&n.attachEvent("onunload",function(){Hi()})),Oi.attributes=!0,Oi.getElementsByTagName=!0,Oi.getElementsByClassName=Na.test(s.getElementsByClassName),Oi.getById=!0,Bi.find.ID=function(e,t){if(typeof t.getElementById!=ra&&$i){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},Bi.filter.ID=function(e){var t=e.replace(Aa,Ra);return function(e){return e.getAttribute("id")===t}},Bi.find.TAG=Oi.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!=ra)return t.getElementsByTagName(e)}:function(e,t){var n,r=[],o=0,i=t.getElementsByTagName(e);if("*"!==e)return i;for(;n=i[o++];)1===n.nodeType&&r.push(n);return r},Bi.find.CLASS=Oi.getElementsByClassName&&function(e,t){if($i)return t.getElementsByClassName(e)},Ki=[],Wi=[],Oi.disconnectedMatch=!0,Wi=Wi.length&&new RegExp(Wi.join("|")),Ki=Ki.length&&new RegExp(Ki.join("|")),t=Na.test(qi.compareDocumentPosition),Xi=t||Na.test(qi.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},na=t?function(e,t){if(e===t)return ji=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!Oi.sortDetached&&t.compareDocumentPosition(e)===n?e===s||e.ownerDocument===Gi&&Xi(Gi,e)?-1:t===s||t.ownerDocument===Gi&&Xi(Gi,t)?1:zi?la.call(zi,e)-la.call(zi,t):0:4&n?-1:1)}:function(e,t){if(e===t)return ji=!0,0;var n,r=0,o=e.parentNode,i=t.parentNode,a=[e],u=[t];if(!o||!i)return e===s?-1:t===s?1:o?-1:i?1:zi?la.call(zi,e)-la.call(zi,t):0;if(o===i)return Ba(e,t);for(n=e;n=n.parentNode;)a.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;a[r]===u[r];)r++;return r?Ba(a[r],u[r]):a[r]===Gi?-1:u[r]===Gi?1:0},s):Vi},Ta.matches=function(e,t){return Ta(e,null,null,t)},Ta.matchesSelector=function(e,t){if((e.ownerDocument||e)!==Vi&&Hi(e),t=t.replace(ya,"='$1']"),Oi.matchesSelector&&$i&&(!Ki||!Ki.test(t))&&(!Wi||!Wi.test(t)))try{var n=(void 0).call(e,t);if(n||Oi.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(_k){}return 0<Ta(t,Vi,null,[e]).length},Ta.contains=function(e,t){return(e.ownerDocument||e)!==Vi&&Hi(e),Xi(e,t)},Ta.attr=function(e,t){(e.ownerDocument||e)!==Vi&&Hi(e);var n=Bi.attrHandle[t.toLowerCase()],r=n&&oa.call(Bi.attrHandle,t.toLowerCase())?n(e,t,!$i):undefined;return r!==undefined?r:Oi.attributes||!$i?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},Ta.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},Ta.uniqueSort=function(e){var t,n=[],r=0,o=0;if(ji=!Oi.detectDuplicates,zi=!Oi.sortStable&&e.slice(0),e.sort(na),ji){for(;t=e[o++];)t===e[o]&&(r=n.push(o));for(;r--;)e.splice(n[r],1)}return zi=null,e},Pi=Ta.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=Pi(e)}else if(3===o||4===o)return e.nodeValue}else for(;t=e[r++];)n+=Pi(t);return n},(Bi=Ta.selectors={cacheLength:50,createPseudo:Oa,match:wa,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Aa,Ra),e[3]=(e[3]||e[4]||e[5]||"").replace(Aa,Ra),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||Ta.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&Ta.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return wa.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&ba.test(n)&&(t=Ii(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Aa,Ra).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=Zi[e+" "];return t||(t=new RegExp("(^|"+fa+")"+e+"("+fa+"|$)"))&&Zi(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!=ra&&e.getAttribute("class")||"")})},ATTR:function(n,r,o){return function(e){var t=Ta.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===o:"!="===r?t!==o:"^="===r?o&&0===t.indexOf(o):"*="===r?o&&-1<t.indexOf(o):"$="===r?o&&t.slice(-o.length)===o:"~="===r?-1<(" "+t+" ").indexOf(o):"|="===r&&(t===o||t.slice(0,o.length+1)===o+"-"))}},CHILD:function(m,e,t,p,g){var h="nth"!==m.slice(0,3),v="last"!==m.slice(-4),y="of-type"===e;return 1===p&&0===g?function(e){return!!e.parentNode}:function(e,t,n){var r,o,i,a,u,s,c=h!=v?"nextSibling":"previousSibling",l=e.parentNode,f=y&&e.nodeName.toLowerCase(),d=!n&&!y;if(l){if(h){for(;c;){for(i=e;i=i[c];)if(y?i.nodeName.toLowerCase()===f:1===i.nodeType)return!1;s=c="only"===m&&!s&&"nextSibling"}return!0}if(s=[v?l.firstChild:l.lastChild],v&&d){for(u=(r=(o=l[Yi]||(l[Yi]={}))[m]||[])[0]===Ji&&r[1],a=r[0]===Ji&&r[2],i=u&&l.childNodes[u];i=++u&&i&&i[c]||(a=u=0)||s.pop();)if(1===i.nodeType&&++a&&i===e){o[m]=[Ji,u,a];break}}else if(d&&(r=(e[Yi]||(e[Yi]={}))[m])&&r[0]===Ji)a=r[1];else for(;(i=++u&&i&&i[c]||(a=u=0)||s.pop())&&((y?i.nodeName.toLowerCase()!==f:1!==i.nodeType)||!++a||(d&&((i[Yi]||(i[Yi]={}))[m]=[Ji,a]),i!==e)););return(a-=g)===p||a%p==0&&0<=a/p}}},PSEUDO:function(e,i){var t,a=Bi.pseudos[e]||Bi.setFilters[e.toLowerCase()]||Ta.error("unsupported pseudo: "+e);return a[Yi]?a(i):1<a.length?(t=[e,e,"",i],Bi.setFilters.hasOwnProperty(e.toLowerCase())?Oa(function(e,t){for(var n,r=a(e,i),o=r.length;o--;)e[n=la.call(e,r[o])]=!(t[n]=r[o])}):function(e){return a(e,0,t)}):a}},pseudos:{not:Oa(function(e){var r=[],o=[],u=Mi(e.replace(ga,"$1"));return u[Yi]?Oa(function(e,t,n,r){for(var o,i=u(e,null,r,[]),a=e.length;a--;)(o=i[a])&&(e[a]=!(t[a]=o))}):function(e,t,n){return r[0]=e,u(r,null,n,o),r[0]=null,!o.pop()}}),has:Oa(function(t){return function(e){return 0<Ta(t,e).length}}),contains:Oa(function(t){return t=t.replace(Aa,Ra),function(e){return-1<(e.textContent||e.innerText||Pi(e)).indexOf(t)}}),lang:Oa(function(n){return Ca.test(n||"")||Ta.error("unsupported lang: "+n),n=n.replace(Aa,Ra).toLowerCase(),function(e){var t;do{if(t=$i?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=window.location&&window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===qi},focus:function(e){return e===Vi.activeElement&&(!Vi.hasFocus||Vi.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return!1===e.disabled},disabled:function(e){return!0===e.disabled},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!Bi.pseudos.empty(e)},header:function(e){return Sa.test(e.nodeName)},input:function(e){return xa.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:Pa(function(){return[0]}),last:Pa(function(e,t){return[t-1]}),eq:Pa(function(e,t,n){return[n<0?n+t:n]}),even:Pa(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:Pa(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:Pa(function(e,t,n){for(var r=n<0?n+t:n;0<=--r;)e.push(r);return e}),gt:Pa(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=Bi.pseudos.eq,Y(["radio","checkbox","file","password","image"],function(e){var t;Bi.pseudos[e]=(t=e,function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t})}),Y(["submit","reset"],function(e){var n;Bi.pseudos[e]=(n=e,function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n})}),Ia.prototype=Bi.filters=Bi.pseudos,Bi.setFilters=new Ia,Ii=Ta.tokenize=function(e,t){var n,r,o,i,a,u,s,c=ea[e+" "];if(c)return t?0:c.slice(0);for(a=e,u=[],s=Bi.preFilter;a;){for(i in n&&!(r=ha.exec(a))||(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=va.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(ga," ")}),a=a.slice(n.length)),Bi.filter)Bi.filter.hasOwnProperty(i)&&(!(r=wa[i].exec(a))||s[i]&&!(r=s[i](r))||(n=r.shift(),o.push({value:n,type:i,matches:r}),a=a.slice(n.length)));if(!n)break}return t?a.length:a?Ta.error(e):ea(e,u).slice(0)},Mi=Ta.compile=function(e,t){var n,h,v,y,b,r,o=[],i=[],a=ta[e+" "];if(!a){for(n=(t=t||Ii(e)).length;n--;)(a=function f(e){for(var o,t,n,r=e.length,i=Bi.relative[e[0].type],a=i||Bi.relative[" "],u=i?1:0,s=Fa(function(e){return e===o},a,!0),c=Fa(function(e){return-1<la.call(o,e)},a,!0),l=[function(e,t,n){var r=!i&&(n||t!==Ui)||((o=t).nodeType?s:c)(e,t,n);return o=null,r}];u<r;u++)if(t=Bi.relative[e[u].type])l=[Fa(Ua(l),t)];else{if((t=Bi.filter[e[u].type].apply(null,e[u].matches))[Yi]){for(n=++u;n<r&&!Bi.relative[e[n].type];n++);return ja(1<u&&Ua(l),1<u&&Ma(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(ga,"$1"),t,u<n&&f(e.slice(u,n)),n<r&&f(e=e.slice(n)),n<r&&Ma(e))}l.push(t)}return Ua(l)}(t[n]))[Yi]?o.push(a):i.push(a);(a=ta(e,(h=i,y=0<(v=o).length,b=0<h.length,r=function(e,t,n,r,o){var i,a,u,s=0,c="0",l=e&&[],f=[],d=Ui,m=e||b&&Bi.find.TAG("*",o),p=Ji+=null==d?1:Math.random()||.1,g=m.length;for(o&&(Ui=t!==Vi&&t);c!==g&&null!=(i=m[c]);c++){if(b&&i){for(a=0;u=h[a++];)if(u(i,t,n)){r.push(i);break}o&&(Ji=p)}y&&((i=!u&&i)&&s--,e&&l.push(i))}if(s+=c,y&&c!==s){for(a=0;u=v[a++];)u(l,f,t,n);if(e){if(0<s)for(;c--;)l[c]||f[c]||(f[c]=aa.call(r));f=za(f)}sa.apply(r,f),o&&!e&&0<f.length&&1<s+v.length&&Ta.uniqueSort(r)}return o&&(Ji=p,Ui=d),l},y?Oa(r):r))).selector=e}return a},Fi=Ta.select=function(e,t,n,r){var o,i,a,u,s,c="function"==typeof e&&e,l=!r&&Ii(e=c.selector||e);if(n=n||[],1===l.length){if(2<(i=l[0]=l[0].slice(0)).length&&"ID"===(a=i[0]).type&&Oi.getById&&9===t.nodeType&&$i&&Bi.relative[i[1].type]){if(!(t=(Bi.find.ID(a.matches[0].replace(Aa,Ra),t)||[])[0]))return n;c&&(t=t.parentNode),e=e.slice(i.shift().value.length)}for(o=wa.needsContext.test(e)?0:i.length;o--&&(a=i[o],!Bi.relative[u=a.type]);)if((s=Bi.find[u])&&(r=s(a.matches[0].replace(Aa,Ra),ka.test(i[0].type)&&La(t.parentNode)||t))){if(i.splice(o,1),!(e=r.length&&Ma(i)))return sa.apply(n,r),n;break}}return(c||Mi(e,l))(r,t,!$i,n,ka.test(e)&&La(t.parentNode)||t),n},Oi.sortStable=Yi.split("").sort(na).join("")===Yi,Oi.detectDuplicates=!!ji,Hi(),Oi.sortDetached=!0;var Ha=document,Va=Array.prototype.push,qa=Array.prototype.slice,$a=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,Wa=Ti.Event,Ka=_t.makeMap("children,contents,next,prev"),Xa=function(e){return void 0!==e},Ya=function(e){return"string"==typeof e},Ga=function(e,t){var n,r=(t=t||Ha).createElement("div"),o=t.createDocumentFragment();for(r.innerHTML=e;n=r.firstChild;)o.appendChild(n);return o},Ja=function(e,t,n,r){var o;if(Ya(t))t=Ga(t,fu(e[0]));else if(t.length&&!t.nodeType){if(t=gu.makeArray(t),r)for(o=t.length-1;0<=o;o--)Ja(e,t[o],n,r);else for(o=0;o<t.length;o++)Ja(e,t[o],n,r);return e}if(t.nodeType)for(o=e.length;o--;)n.call(e[o],t);return e},Qa=function(e,t){return e&&t&&-1!==(" "+e.className+" ").indexOf(" "+t+" ")},Za=function(e,t,n){var r,o;return t=gu(t)[0],e.each(function(){n&&r===this.parentNode||(r=this.parentNode,o=t.cloneNode(!1),this.parentNode.insertBefore(o,this)),o.appendChild(this)}),e},eu=_t.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," "),tu=_t.makeMap("checked compact declare defer disabled ismap multiple nohref noshade nowrap readonly selected"," "),nu={"for":"htmlFor","class":"className",readonly:"readOnly"},ru={"float":"cssFloat"},ou={},iu={},au=function(e,t){return new gu.fn.init(e,t)},uu=/^\s*|\s*$/g,su=function(e){return null===e||e===undefined?"":(""+e).replace(uu,"")},cu=function(e,t){var n,r,o,i;if(e)if((n=e.length)===undefined){for(r in e)if(e.hasOwnProperty(r)&&(i=e[r],!1===t.call(i,r,i)))break}else for(o=0;o<n&&(i=e[o],!1!==t.call(i,o,i));o++);return e},lu=function(e,n){var r=[];return cu(e,function(e,t){n(t,e)&&r.push(t)}),r},fu=function(e){return e?9===e.nodeType?e:e.ownerDocument:Ha};au.fn=au.prototype={constructor:au,selector:"",context:null,length:0,init:function(e,t){var n,r,o=this;if(!e)return o;if(e.nodeType)return o.context=o[0]=e,o.length=1,o;if(t&&t.nodeType)o.context=t;else{if(t)return gu(e).attr(t);o.context=t=document}if(Ya(e)){if(!(n="<"===(o.selector=e).charAt(0)&&">"===e.charAt(e.length-1)&&3<=e.length?[null,e,null]:$a.exec(e)))return gu(t).find(e);if(n[1])for(r=Ga(e,fu(t)).firstChild;r;)Va.call(o,r),r=r.nextSibling;else{if(!(r=fu(t).getElementById(n[2])))return o;if(r.id!==n[2])return o.find(e);o.length=1,o[0]=r}}else this.add(e,!1);return o},toArray:function(){return _t.toArray(this)},add:function(e,t){var n,r;if(Ya(e))return this.add(gu(e));if(!1!==t)for(n=gu.unique(this.toArray().concat(gu.makeArray(e))),this.length=n.length,r=0;r<n.length;r++)this[r]=n[r];else Va.apply(this,gu.makeArray(e));return this},attr:function(t,n){var e,r=this;if("object"==typeof t)cu(t,function(e,t){r.attr(e,t)});else{if(!Xa(n)){if(r[0]&&1===r[0].nodeType){if((e=ou[t])&&e.get)return e.get(r[0],t);if(tu[t])return r.prop(t)?t:undefined;null===(n=r[0].getAttribute(t,2))&&(n=undefined)}return n}this.each(function(){var e;if(1===this.nodeType){if((e=ou[t])&&e.set)return void e.set(this,n);null===n?this.removeAttribute(t,2):this.setAttribute(t,n,2)}})}return r},removeAttr:function(e){return this.attr(e,null)},prop:function(e,t){var n=this;if("object"==typeof(e=nu[e]||e))cu(e,function(e,t){n.prop(e,t)});else{if(!Xa(t))return n[0]&&n[0].nodeType&&e in n[0]?n[0][e]:t;this.each(function(){1===this.nodeType&&(this[e]=t)})}return n},css:function(n,r){var e,o,i=this,t=function(e){return e.replace(/-(\D)/g,function(e,t){return t.toUpperCase()})},a=function(e){return e.replace(/[A-Z]/g,function(e){return"-"+e})};if("object"==typeof n)cu(n,function(e,t){i.css(e,t)});else if(Xa(r))n=t(n),"number"!=typeof r||eu[n]||(r=r.toString()+"px"),i.each(function(){var e=this.style;if((o=iu[n])&&o.set)o.set(this,r);else{try{this.style[ru[n]||n]=r}catch(t){}null!==r&&""!==r||(e.removeProperty?e.removeProperty(a(n)):e.removeAttribute(n))}});else{if(e=i[0],(o=iu[n])&&o.get)return o.get(e);if(!e.ownerDocument.defaultView)return e.currentStyle?e.currentStyle[t(n)]:"";try{return e.ownerDocument.defaultView.getComputedStyle(e,null).getPropertyValue(a(n))}catch(u){return undefined}}return i},remove:function(){for(var e,t=this.length;t--;)e=this[t],Wa.clean(e),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var e,t=this.length;t--;)for(e=this[t];e.firstChild;)e.removeChild(e.firstChild);return this},html:function(e){var t;if(Xa(e)){t=this.length;try{for(;t--;)this[t].innerHTML=e}catch(n){gu(this[t]).empty().append(e)}return this}return this[0]?this[0].innerHTML:""},text:function(e){var t;if(Xa(e)){for(t=this.length;t--;)"innerText"in this[t]?this[t].innerText=e:this[0].textContent=e;return this}return this[0]?this[0].innerText||this[0].textContent:""},append:function(){return Ja(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.appendChild(e)})},prepend:function(){return Ja(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.insertBefore(e,this.firstChild)},!0)},before:function(){return this[0]&&this[0].parentNode?Ja(this,arguments,function(e){this.parentNode.insertBefore(e,this)}):this},after:function(){return this[0]&&this[0].parentNode?Ja(this,arguments,function(e){this.parentNode.insertBefore(e,this.nextSibling)},!0):this},appendTo:function(e){return gu(e).append(this),this},prependTo:function(e){return gu(e).prepend(this),this},replaceWith:function(e){return this.before(e).remove()},wrap:function(e){return Za(this,e)},wrapAll:function(e){return Za(this,e,!0)},wrapInner:function(e){return this.each(function(){gu(this).contents().wrapAll(e)}),this},unwrap:function(){return this.parent().each(function(){gu(this).replaceWith(this.childNodes)})},clone:function(){var e=[];return this.each(function(){e.push(this.cloneNode(!0))}),gu(e)},addClass:function(e){return this.toggleClass(e,!0)},removeClass:function(e){return this.toggleClass(e,!1)},toggleClass:function(o,i){var e=this;return"string"!=typeof o||(-1!==o.indexOf(" ")?cu(o.split(" "),function(){e.toggleClass(this,i)}):e.each(function(e,t){var n,r=Qa(t,o);r!==i&&(n=t.className,r?t.className=su((" "+n+" ").replace(" "+o+" "," ")):t.className+=n?" "+o:o)})),e},hasClass:function(e){return Qa(this[0],e)},each:function(e){return cu(this,e)},on:function(e,t){return this.each(function(){Wa.bind(this,e,t)})},off:function(e,t){return this.each(function(){Wa.unbind(this,e,t)})},trigger:function(e){return this.each(function(){"object"==typeof e?Wa.fire(this,e.type,e):Wa.fire(this,e)})},show:function(){return this.css("display","")},hide:function(){return this.css("display","none")},slice:function(){return gu(qa.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},find:function(e){for(var t=[],n=0,r=this.length;n<r;n++)gu.find(e,this[n],t);return gu(t)},filter:function(n){return gu("function"==typeof n?lu(this.toArray(),function(e,t){return n(t,e)}):gu.filter(n,this.toArray()))},closest:function(n){var r=[];return n instanceof gu&&(n=n[0]),this.each(function(e,t){for(;t;){if("string"==typeof n&&gu(t).is(n)){r.push(t);break}if(t===n){r.push(t);break}t=t.parentNode}}),gu(r)},offset:function(e){var t,n,r,o,i=0,a=0;return e?this.css(e):((t=this[0])&&(r=(n=t.ownerDocument).documentElement,t.getBoundingClientRect&&(i=(o=t.getBoundingClientRect()).left+(r.scrollLeft||n.body.scrollLeft)-r.clientLeft,a=o.top+(r.scrollTop||n.body.scrollTop)-r.clientTop)),{left:i,top:a})},push:Va,sort:Array.prototype.sort,splice:Array.prototype.splice},_t.extend(au,{extend:_t.extend,makeArray:function(e){return(t=e)&&t===t.window||e.nodeType?[e]:_t.toArray(e);var t},inArray:function(e,t){var n;if(t.indexOf)return t.indexOf(e);for(n=t.length;n--;)if(t[n]===e)return n;return-1},isArray:_t.isArray,each:cu,trim:su,grep:lu,find:Ta,expr:Ta.selectors,unique:Ta.uniqueSort,text:Ta.getText,contains:Ta.contains,filter:function(e,t,n){var r=t.length;for(n&&(e=":not("+e+")");r--;)1!==t[r].nodeType&&t.splice(r,1);return t=1===t.length?gu.find.matchesSelector(t[0],e)?[t[0]]:[]:gu.find.matches(e,t)}});var du=function(e,t,n){var r=[],o=e[t];for("string"!=typeof n&&n instanceof gu&&(n=n[0]);o&&9!==o.nodeType;){if(n!==undefined){if(o===n)break;if("string"==typeof n&&gu(o).is(n))break}1===o.nodeType&&r.push(o),o=o[t]}return r},mu=function(e,t,n,r){var o=[];for(r instanceof gu&&(r=r[0]);e;e=e[t])if(!n||e.nodeType===n){if(r!==undefined){if(e===r)break;if("string"==typeof r&&gu(e).is(r))break}o.push(e)}return o},pu=function(e,t,n){for(e=e[t];e;e=e[t])if(e.nodeType===n)return e;return null};cu({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return du(e,"parentNode")},next:function(e){return pu(e,"nextSibling",1)},prev:function(e){return pu(e,"previousSibling",1)},children:function(e){return mu(e.firstChild,"nextSibling",1)},contents:function(e){return _t.toArray(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(r,o){au.fn[r]=function(t){var n=[];this.each(function(){var e=o.call(n,this,t,n);e&&(gu.isArray(e)?n.push.apply(n,e):n.push(e))}),1<this.length&&(Ka[r]||(n=gu.unique(n)),0===r.indexOf("parents")&&(n=n.reverse()));var e=gu(n);return t?e.filter(t):e}}),cu({parentsUntil:function(e,t){return du(e,"parentNode",t)},nextUntil:function(e,t){return mu(e,"nextSibling",1,t).slice(1)},prevUntil:function(e,t){return mu(e,"previousSibling",1,t).slice(1)}},function(o,i){au.fn[o]=function(t,e){var n=[];this.each(function(){var e=i.call(n,this,t,n);e&&(gu.isArray(e)?n.push.apply(n,e):n.push(e))}),1<this.length&&(n=gu.unique(n),0!==o.indexOf("parents")&&"prevUntil"!==o||(n=n.reverse()));var r=gu(n);return e?r.filter(e):r}}),au.fn.is=function(e){return!!e&&0<this.filter(e).length},au.fn.init.prototype=au.fn,au.overrideDefaults=function(n){var r,o=function(e,t){return r=r||n(),0===arguments.length&&(e=r.element),t=t||r.context,new o.fn.init(e,t)};return gu.extend(o,this),o},au.attrHooks=ou,au.cssHooks=iu;var gu=au,hu=_t.each,vu=_t.grep,yu=xt.ie,bu=/^([a-z0-9],?)+$/i,Cu=function(e,t){var n=t.attr("style"),r=(r=e.serialize(e.parse(n),t[0].nodeName))||null;t.attr("data-mce-style",r)},wu=function(e,t){var n,r,o=0;if(e)for(n=e.nodeType,e=e.previousSibling;e;e=e.previousSibling)r=e.nodeType,(!t||3!==r||r!==n&&e.nodeValue.length)&&(o++,n=r);return o},xu=function(a,u){void 0===u&&(u={});var n,r,o,i,e,t,s={},c=window,l={},f=0,d=Xr.forElement(Rt.fromDom(a),{contentCssCors:u.contentCssCors,referrerPolicy:u.referrerPolicy}),m=[],p=u.schema?u.schema:Ci({}),g=xi({url_converter:u.url_converter,url_converter_scope:u.url_converter_scope},u.schema),h=u.ownEvents?new Ti:Ti.Event,v=p.getBlockElements(),y=gu.overrideDefaults(function(){return{context:a,element:$.getRoot()}}),b=function(e){return e&&a&&K(e)?a.getElementById(e):e},C=function(e){return y("string"==typeof e?b(e):e)},w=function(e,t,n){var r,o,i=C(e);return i.length&&(o=(r=W[t])&&r.get?r.get(i,t):i.attr(t)),void 0===o&&(o=n||""),o},x=function(e){var t=b(e);return t?t.attributes:[]},S=function(e,t,n){""===n&&(n=null);var r,o=C(e),i=o.attr(t);o.length&&((r=W[t])&&r.set?r.set(o,n,t):o.attr(t,n),i!==n&&u.onSetAttrib&&u.onSetAttrib({attrElm:o,attrName:t,attrValue:n}))},N=function(){return u.root_element||a.body},E=function(e,t){return sr(a.body,b(e),t)},k=function(e,t,n){var r=C(e);return n?r.css(t):("float"===(t=t.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}))&&(t=xt.browser.isIE()?"styleFloat":"cssFloat"),r[0]&&r[0].style?r[0].style[t]:undefined)},_=function(e){var t,n;return e=b(e),t=k(e,"width"),n=k(e,"height"),-1===t.indexOf("px")&&(t=0),-1===n.indexOf("px")&&(n=0),{w:parseInt(t,10)||e.offsetWidth||e.clientWidth,h:parseInt(n,10)||e.offsetHeight||e.clientHeight}},A=function(e,t){if(!e)return!1;if(!Array.isArray(e)){if("*"===t)return 1===e.nodeType;if(bu.test(t)){for(var n=t.toLowerCase().split(/,/),r=e.nodeName.toLowerCase(),o=n.length-1;0<=o;o--)if(n[o]===r)return!0;return!1}if(e.nodeType&&1!==e.nodeType)return!1}var i=Array.isArray(e)?e:[e];return 0<Ta(t,i[0].ownerDocument||i[0],null,i).length},R=function(e,t,n,r){var o,i=[],a=b(e);for(r=r===undefined,n=n||("BODY"!==N().nodeName?N().parentNode:null),_t.is(t,"string")&&(t="*"===(o=t)?function(e){return 1===e.nodeType}:function(e){return A(e,o)});a&&!(a===n||X(a.nodeType)||Un(a)||zn(a));){if(!t||"function"==typeof t&&t(a)){if(!r)return[a];i.push(a)}a=a.parentNode}return r?i:null},T=function(e,t,n){var r=t;if(e)for("string"==typeof t&&(r=function(e){return A(e,t)}),e=e[n];e;e=e[n])if("function"==typeof r&&r(e))return e;return null},D=function(e,n,r){var o,t="string"==typeof e?b(e):e;if(!t)return!1;if(_t.isArray(t)&&(t.length||0===t.length))return o=[],hu(t,function(e,t){e&&o.push(n.call(r,"string"==typeof e?b(e):e,t))}),o;var i=r||this;return n.call(i,t)},O=function(e,t){C(e).each(function(e,n){hu(t,function(e,t){S(n,t,e)})})},B=function(e,r){var t=C(e);yu?t.each(function(e,t){if(!1!==t.canHaveHTML){for(;t.firstChild;)t.removeChild(t.firstChild);try{t.innerHTML="<br>"+r,t.removeChild(t.firstChild)}catch(n){gu("<div></div>").html("<br>"+r).contents().slice(1).appendTo(t)}return r}}):t.html(r)},P=function(e,n,r,o,i){return D(e,function(e){var t="string"==typeof n?a.createElement(n):n;return O(t,r),o&&("string"!=typeof o&&o.nodeType?t.appendChild(o):"string"==typeof o&&B(t,o)),i?t:e.appendChild(t)})},L=function(e,t,n){return P(a.createElement(e),e,t,n,!0)},I=li.encodeAllRaw,M=function(e,t){var n=C(e);return t?n.each(function(){for(var e;e=this.firstChild;)3===e.nodeType&&0===e.data.length?this.removeChild(e):this.parentNode.insertBefore(e,this)}).remove():n.remove(),1<n.length?n.toArray():n[0]},F=function(e,t,n){C(e).toggleClass(t,n).each(function(){""===this.className&&gu(this).attr("class",null)})},U=function(t,e,n){return D(e,function(e){return _t.is(e,"array")&&(t=t.cloneNode(!0)),n&&hu(vu(e.childNodes),function(e){t.appendChild(e)}),e.parentNode.replaceChild(t,e)})},z=function(e){if(Rn(e)){var t="a"===e.nodeName.toLowerCase()&&!w(e,"href")&&w(e,"id");if(w(e,"name")||w(e,"data-mce-bookmark")||t)return!0}return!1},j=function(){return a.createRange()},H=function(e,t,n,r){if(_t.isArray(e)){for(var o=e.length,i=[];o--;)i[o]=H(e[o],t,n,r);return i}return!u.collect||e!==a&&e!==c||m.push([e,t,n,r]),h.bind(e,t,n,r||$)},V=function(e,t,n){if(_t.isArray(e)){for(var r=e.length,o=[];r--;)o[r]=V(e[r],t,n);return o}if(0<m.length&&(e===a||e===c))for(r=m.length;r--;){var i=m[r];e!==i[0]||t&&t!==i[1]||n&&n!==i[2]||h.unbind(i[0],i[1],i[2])}return h.unbind(e,t,n)},q=function(e){if(e&&Rn(e)){var t=e.getAttribute("data-mce-contenteditable");return t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null}return null},$={doc:a,settings:u,win:c,files:l,stdMode:!0,boxModel:!0,styleSheetLoader:d,boundEvents:m,styles:g,schema:p,events:h,isBlock:function(e){if("string"==typeof e)return!!v[e];if(e){var t=e.nodeType;if(t)return!(1!==t||!v[e.nodeName])}return!1},$:y,$$:C,root:null,clone:function(t,e){if(!yu||1!==t.nodeType||e)return t.cloneNode(e);var n=a.createElement(t.nodeName);return hu(x(t),function(e){S(n,e.nodeName,w(t,e.nodeName))}),n},getRoot:N,getViewPort:function(e){var t=kn(e);return{x:t.x,y:t.y,w:t.width,h:t.height}},getRect:function(e){e=b(e);var t=E(e),n=_(e);return{x:t.x,y:t.y,w:n.w,h:n.h}},getSize:_,getParent:function(e,t,n){var r=R(e,t,n,!1);return r&&0<r.length?r[0]:null},getParents:R,get:b,getNext:function(e,t){return T(e,t,"nextSibling")},getPrev:function(e,t){return T(e,t,"previousSibling")},select:function(e,t){return Ta(e,b(t)||u.root_element||a,[])},is:A,add:P,create:L,createHTML:function(e,t,n){var r,o="";for(r in o+="<"+e,t)t.hasOwnProperty(r)&&null!==t[r]&&"undefined"!=typeof t[r]&&(o+=" "+r+'="'+I(t[r])+'"');return void 0!==n?o+">"+n+"</"+e+">":o+" />"},createFragment:function(e){var t,n=a.createElement("div"),r=a.createDocumentFragment();for(r.appendChild(n),e&&(n.innerHTML=e);t=n.firstChild;)r.appendChild(t);return r.removeChild(n),r},remove:M,setStyle:function(e,t,n){var r=K(t)?C(e).css(t,n):C(e).css(t);u.update_styles&&Cu(g,r)},getStyle:k,setStyles:function(e,t){var n=C(e).css(t);u.update_styles&&Cu(g,n)},removeAllAttribs:function(e){return D(e,function(e){for(var t=e.attributes,n=t.length-1;0<=n;n--)e.removeAttributeNode(t.item(n))})},setAttrib:S,setAttribs:O,getAttrib:w,getPos:E,parseStyle:function(e){return g.parse(e)},serializeStyle:function(e,t){return g.serialize(e,t)},addStyle:function(e){var t,n;if($!==xu.DOM&&a===document){if(s[e])return;s[e]=!0}(n=a.getElementById("mceDefaultStyles"))||((n=a.createElement("style")).id="mceDefaultStyles",n.type="text/css",(t=a.getElementsByTagName("head")[0]).firstChild?t.insertBefore(n,t.firstChild):t.appendChild(n)),n.styleSheet?n.styleSheet.cssText+=e:n.appendChild(a.createTextNode(e))},loadCSS:function(e){Y((e=e||"").split(","),function(e){l[e]=!0,d.load(e,te)})},addClass:function(e,t){C(e).addClass(t)},removeClass:function(e,t){F(e,t,!1)},hasClass:function(e,t){return C(e).hasClass(t)},toggleClass:F,show:function(e){C(e).show()},hide:function(e){C(e).hide()},isHidden:function(e){return"none"===C(e).css("display")},uniqueId:function(e){return(e||"mce_")+f++},setHTML:B,getOuterHTML:function(e){var t="string"==typeof e?b(e):e;return Rn(t)?t.outerHTML:gu("<div></div>").append(gu(t).clone()).html()},setOuterHTML:function(e,t){C(e).each(function(){try{if("outerHTML"in this)return void(this.outerHTML=t)}catch(e){}M(gu(this).html(t),!0)})},decode:li.decode,encode:I,insertAfter:function(e,t){var r=b(t);return D(e,function(e){var t=r.parentNode,n=r.nextSibling;return n?t.insertBefore(e,n):t.appendChild(e),e})},replace:U,rename:function(t,e){var n;return t.nodeName!==e.toUpperCase()&&(n=L(e),hu(x(t),function(e){S(n,e.nodeName,w(t,e.nodeName))}),U(n,t,!0)),n||t},findCommonAncestor:function(e,t){for(var n,r=e;r;){for(n=t;n&&r!==n;)n=n.parentNode;if(r===n)break;r=r.parentNode}return!r&&e.ownerDocument?e.ownerDocument.documentElement:r},toHex:function(e){return g.toHex(_t.trim(e))},run:D,getAttribs:x,isEmpty:function(e,t){var n,r,o=0;if(z(e))return!1;if(e=e.firstChild){var i=new Yr(e,e.parentNode),a=p?p.getWhiteSpaceElements():{};t=t||(p?p.getNonEmptyElements():null);do{if(n=e.nodeType,Rn(e)){var u=e.getAttribute("data-mce-bogus");if(u){e=i.next("all"===u);continue}if(r=e.nodeName.toLowerCase(),t&&t[r]){if("br"!==r)return!1;o++,e=i.next();continue}if(z(e))return!1}if(8===n)return!1;if(3===n&&!zo(e.nodeValue))return!1;if(3===n&&e.parentNode&&a[e.parentNode.nodeName]&&zo(e.nodeValue))return!1;e=i.next()}while(e)}return o<=1},createRng:j,nodeIndex:wu,split:function(e,t,n){var r,o,i,a=j();if(e&&t)return a.setStart(e.parentNode,wu(e)),a.setEnd(t.parentNode,wu(t)),r=a.extractContents(),(a=j()).setStart(t.parentNode,wu(t)+1),a.setEnd(e.parentNode,wu(e)+1),o=a.extractContents(),(i=e.parentNode).insertBefore(Go($,r),e),n?i.insertBefore(n,e):i.insertBefore(t,e),i.insertBefore(Go($,o),e),M(e),n||t},bind:H,unbind:V,fire:function(e,t,n){return h.fire(e,t,n)},getContentEditable:q,getContentEditableParent:function(e){for(var t=N(),n=null;e&&e!==t&&null===(n=q(e));e=e.parentNode);return n},destroy:function(){if(0<m.length)for(var e=m.length;e--;){var t=m[e];h.unbind(t[0],t[1],t[2])}se(l,function(e,t){d.unload(t),delete l[t]}),Ta.setDocument&&Ta.setDocument()},isChildOf:function(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset}},W=(n=g,o=function(){return $},i=(r=u).keep_values,e={set:function(e,t,n){r.url_converter&&(t=r.url_converter.call(r.url_converter_scope||o(),t,n,e[0])),e.attr("data-mce-"+n,t).attr(n,t)},get:function(e,t){return e.attr("data-mce-"+t)||e.attr(t)}},t={style:{set:function(e,t){null===t||"object"!=typeof t?(i&&e.attr("data-mce-style",t),null!==t&&"string"==typeof t?(e.removeAttr("style"),e.css(n.parse(t))):e.attr("style",t)):e.css(t)},get:function(e){var t=e.attr("data-mce-style")||e.attr("style");return t=n.serialize(n.parse(t),e[0].nodeName)}}},i&&(t.href=t.src=e),t);return $};xu.DOM=xu(document),xu.nodeIndex=wu;var Su=xu.DOM,Nu=_t.each,Eu=_t.grep,ku=(_u.prototype._setReferrerPolicy=function(e){this.settings.referrerPolicy=e},_u.prototype.loadScript=function(e,t,n){var r=Su,o=function(){r.remove(i),a&&(a.onerror=a.onload=a=null)},i=r.uniqueId(),a=document.createElement("script");a.id=i,a.type="text/javascript",a.src=_t._addCacheSuffix(e),this.settings.referrerPolicy&&r.setAttrib(a,"referrerpolicy",this.settings.referrerPolicy),a.onload=function(){o(),t()},a.onerror=function(){o(),D(n)?n():"undefined"!=typeof console&&console.log&&console.log("Failed to load script: "+e)},(document.getElementsByTagName("head")[0]||document.body).appendChild(a)},_u.prototype.isDone=function(e){return 2===this.states[e]},_u.prototype.markDone=function(e){this.states[e]=2},_u.prototype.add=function(e,t,n,r){var o=this.states[e];this.queue.push(e),o===undefined&&(this.states[e]=0),t&&(this.scriptLoadedCallbacks[e]||(this.scriptLoadedCallbacks[e]=[]),this.scriptLoadedCallbacks[e].push({success:t,failure:r,scope:n||this}))},_u.prototype.load=function(e,t,n,r){return this.add(e,t,n,r)},_u.prototype.remove=function(e){delete this.states[e],delete this.scriptLoadedCallbacks[e]},_u.prototype.loadQueue=function(e,t,n){this.loadScripts(this.queue,e,t,n)},_u.prototype.loadScripts=function(n,e,t,r){var o=this,i=[],a=function(t,e){Nu(o.scriptLoadedCallbacks[e],function(e){D(e[t])&&e[t].call(e.scope)}),o.scriptLoadedCallbacks[e]=undefined};o.queueLoadedCallbacks.push({success:e,failure:r,scope:t||this});var u=function(){var e,t=Eu(n);n.length=0,Nu(t,function(e){2!==o.states[e]?3!==o.states[e]?1!==o.states[e]&&(o.states[e]=1,o.loading++,o.loadScript(e,function(){o.states[e]=2,o.loading--,a("success",e),u()},function(){o.states[e]=3,o.loading--,i.push(e),a("failure",e),u()})):a("failure",e):a("success",e)}),o.loading||(e=o.queueLoadedCallbacks.slice(0),o.queueLoadedCallbacks.length=0,Nu(e,function(e){0===i.length?D(e.success)&&e.success.call(e.scope):D(e.failure)&&e.failure.call(e.scope,i)}))};u()},_u.ScriptLoader=new _u,_u);function _u(e){void 0===e&&(e={}),this.states={},this.queue=[],this.scriptLoadedCallbacks={},this.queueLoadedCallbacks=[],this.loading=0,this.settings=e}var Au=function(e){var t=e;return{get:function(){return t},set:function(e){t=e}}},Ru={},Tu=Au("en"),Du=function(){return he(Ru,Tu.get())},Ou={getData:function(){return ce(Ru,function(e){return _e({},e)})},setCode:function(e){e&&Tu.set(e)},getCode:function(){return Tu.get()},add:function(e,t){var n=Ru[e];n||(Ru[e]=n={}),se(t,function(e,t){n[t.toLowerCase()]=e})},translate:function(e){var t,n,r=Du().getOr({}),o=function(e){return D(e)?Object.prototype.toString.call(e):i(e)?"":""+e},i=function(e){return""===e||null===e||e===undefined},a=function(e){var t=o(e);return he(r,t.toLowerCase()).map(o).getOr(t)},u=function(e){return e.replace(/{context:\w+}$/,"")};if(i(e))return"";if(k(t=e)&&ve(t,"raw"))return o(e.raw);if(_(n=e)&&1<n.length){var s=e.slice(1);return u(a(e[0]).replace(/\{([0-9]+)\}/g,function(e,t){return ve(s,t)?o(s[t]):e}))}return u(a(e))},isRtl:function(){return Du().bind(function(e){return he(e,"_dir")}).exists(function(e){return"rtl"===e})},hasCode:function(e){return ve(Ru,e)}},Bu=function(){var o=[],r={},s={},i=[],c=function(t,n){var e=H(i,function(e){return e.name===t&&e.state===n});Y(e,function(e){return e.callback()})},l=function(e){var t;return s[e]&&(t=s[e].dependencies),t||[]},f=function(e,t){return"object"==typeof t?t:"string"==typeof e?{prefix:"",resource:t,suffix:""}:{prefix:e.prefix,resource:t,suffix:e.suffix}},d=function(o,i,a,u,e){var t,n;r[o]||(0!==(t="string"==typeof i?i:i.prefix+i.resource+i.suffix).indexOf("/")&&-1===t.indexOf("://")&&(t=Bu.baseURL+"/"+t),r[o]=t.substring(0,t.lastIndexOf("/")),n=function(){var n,e,t,r;c(o,"loaded"),n=i,e=a,t=u,r=l(o),Y(r,function(e){var t=f(n,e);d(t.resource,t,undefined,undefined)}),e&&(t?e.call(t):e.call(ku))},s[o]?n():ku.ScriptLoader.add(t,n,u,e))},e=function(e,t,n){void 0===n&&(n="added"),ve(s,e)&&"added"===n||ve(r,e)&&"loaded"===n?t():i.push({name:e,state:n,callback:t})};return{items:o,urls:r,lookup:s,_listeners:i,get:function(e){return s[e]?s[e].instance:undefined},dependencies:l,requireLangPack:function(t,n){!1!==Bu.languageLoad&&e(t,function(){var e=Ou.getCode();!e||n&&-1===(","+(n||"")+",").indexOf(","+e+",")||ku.ScriptLoader.add(r[t]+"/langs/"+e+".js")},"loaded")},add:function(e,t,n){var r=t;return o.push(r),s[e]={instance:r,dependencies:n},c(e,"added"),r},remove:function(e){delete r[e],delete s[e]},createUrl:f,addComponents:function(e,t){var n=r[e];Y(t,function(e){ku.ScriptLoader.add(n+"/"+e)})},load:d,waitFor:e}};Bu.languageLoad=!0,Bu.baseURL="",Bu.PluginManager=Bu(),Bu.ThemeManager=Bu();var Pu=function(n,r){var o=null;return{cancel:function(){null!==o&&(clearTimeout(o),o=null)},throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];null===o&&(o=setTimeout(function(){n.apply(null,e),o=null},r))}}},Lu=function(n,r){var o=null;return{cancel:function(){null!==o&&(clearTimeout(o),o=null)},throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];null!==o&&clearTimeout(o),o=setTimeout(function(){n.apply(null,e),o=null},r)}}},Iu=function(e,t){var n=Jn(e,t);return n===undefined||""===n?[]:n.split(" ")},Mu=function(e){return e.dom.classList!==undefined},Fu=function(e,t){return o=t,i=Iu(n=e,r="class").concat([o]),Yn(n,r,i.join(" ")),!0;var n,r,o,i},Uu=function(e,t){return o=t,0<(i=H(Iu(n=e,r="class"),function(e){return e!==o})).length?Yn(n,r,i.join(" ")):Zn(n,r),!1;var n,r,o,i},zu=function(e,t){Mu(e)?e.dom.classList.add(t):Fu(e,t)},ju=function(e){0===(Mu(e)?e.dom.classList:Iu(e,"class")).length&&Zn(e,"class")},Hu=function(e,t){return Mu(e)&&e.dom.classList.contains(t)},Vu=function(e,t){var n=[];return Y(Jt(e),function(e){t(e)&&(n=n.concat([e])),n=n.concat(Vu(e,t))}),n},qu=function(e,t){return n=t,o=(r=e)===undefined?document:r.dom,Ot(o)?[]:z(o.querySelectorAll(n),Rt.fromDom);var n,r,o},$u=S("mce-annotation"),Wu=S("data-mce-annotation"),Ku=S("data-mce-annotation-uid"),Xu=function(r,e){var t=r.selection.getRng(),n=Rt.fromDom(t.startContainer),o=Rt.fromDom(r.getBody()),i=e.fold(function(){return"."+$u()},function(e){return"["+Wu()+'="'+e+'"]'}),a=Qt(n,t.startOffset).getOr(n),u=Lr(a,i,function(e){return Bt(e,o)}),s=function(e,t){return n=t,(r=e.dom)&&r.hasAttribute&&r.hasAttribute(n)?U.some(Jn(e,t)):U.none();var n,r};return u.bind(function(e){return s(e,""+Ku()).bind(function(n){return s(e,""+Wu()).map(function(e){var t=Yu(r,n);return{uid:n,name:e,elements:t}})})})},Yu=function(e,t){var n=Rt.fromDom(e.getBody());return qu(n,"["+Ku()+'="'+t+'"]')},Gu=function(i,e){var a=Au({}),c=function(e,t){u(e,function(e){return t(e),e})},u=function(e,t){var n=a.get(),r=t(n.hasOwnProperty(e)?n[e]:{listeners:[],previous:Au(U.none())});n[e]=r,a.set(n)},t=Lu(function(){var e,t,n,r=a.get(),o=(e=ae(r),(n=B.call(e,0)).sort(t),n);Y(o,function(e){u(e,function(u){var s=u.previous.get();return Xu(i,U.some(e)).fold(function(){var t;s.isSome()&&(c(t=e,function(e){Y(e.listeners,function(e){return e(!1,t)})}),u.previous.set(U.none()))},function(e){var t,n,r,o=e.uid,i=e.name,a=e.elements;s.is(o)||(n=o,r=a,c(t=i,function(e){Y(e.listeners,function(e){return e(!0,t,{uid:n,nodes:z(r,function(e){return e.dom})})})}),u.previous.set(U.some(o)))}),{previous:u.previous,listeners:u.listeners}})})},30);i.on("remove",function(){t.cancel()}),i.on("NodeChange",function(){t.throttle()});return{addListener:function(e,t){u(e,function(e){return{previous:e.previous,listeners:e.listeners.concat([t])}})}}},Ju=function(e,n){e.on("init",function(){e.serializer.addNodeFilter("span",function(e){Y(e,function(t){var e;e=t,U.from(e.attr(Wu())).bind(n.lookup).each(function(e){!1===e.persistent&&t.unwrap()})})})})},Qu=0,Zu=function(e){var t=(new Date).getTime();return e+"_"+Math.floor(1e9*Math.random())+ ++Qu+String(t)},es=function(e,t){var n,r,o=Vt(e).dom,i=Rt.fromDom(o.createDocumentFragment()),a=(n=t,(r=(o||document).createElement("div")).innerHTML=n,Jt(Rt.fromDom(r)));mn(i,a),pn(e),dn(e,i)},ts=function(e,t){return Rt.fromDom(e.dom.cloneNode(t))},ns=function(e){return ts(e,!1)},rs=function(e){return ts(e,!0)},os=function(e,t,n){void 0===n&&(n=b);var r=new Yr(e,t),o=function(e){for(var t;(t=r[e]())&&!Mn(t)&&!n(t););return U.from(t).filter(Mn)};return{current:function(){return U.from(r.current()).filter(Mn)},next:function(){return o("next")},prev:function(){return o("prev")},prev2:function(){return o("prev2")}}},is=function(t,e){var i=e||function(e){return t.isBlock(e)||jn(e)||qn(e)},a=function(e,t,n,r){if(Mn(e)){var o=r(e,t,e.data);if(-1!==o)return U.some({container:e,offset:o})}return n().bind(function(e){return a(e.container,e.offset,n,r)})};return{backwards:function(e,t,n,r){var o=os(e,r,i);return a(e,t,function(){return o.prev().map(function(e){return{container:e,offset:e.length}})},n).getOrNull()},forwards:function(e,t,n,r){var o=os(e,r,i);return a(e,t,function(){return o.next().map(function(e){return{container:e,offset:0}})},n).getOrNull()}}},as=function(e,t,n){return e.isSome()&&t.isSome()?U.some(n(e.getOrDie(),t.getOrDie())):U.none()},us=Math.round,ss=function(e){return e?{left:us(e.left),top:us(e.top),bottom:us(e.bottom),right:us(e.right),width:us(e.width),height:us(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0}},cs=function(e,t){return e=ss(e),t||(e.left=e.left+e.width),e.right=e.left,e.width=0,e},ls=function(e,t,n){return 0<=e&&e<=Math.min(t.height,n.height)/2},fs=function(e,t){var n=Math.min(t.height/2,e.height/2);return e.bottom-n<t.top||!(e.top>t.bottom)&&ls(t.top-e.bottom,e,t)},ds=function(e,t){return e.top>t.bottom||!(e.bottom<t.top)&&ls(t.bottom-e.top,e,t)},ms=function(e,t,n){return t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom},ps=function(e){var t=e.startContainer,n=e.startOffset;return t.hasChildNodes()&&e.endOffset===n+1?t.childNodes[n]:null},gs=function(e,t){return 1===e.nodeType&&e.hasChildNodes()&&(t>=e.childNodes.length&&(t=e.childNodes.length-1),e=e.childNodes[t]),e},hs=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]"),vs=function(e){return"string"==typeof e&&768<=e.charCodeAt(0)&&hs.test(e)},ys=Rn,bs=Io,Cs=Dn("display","block table"),ws=Dn("float","left right"),xs=function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return function(e){for(var t=0;t<n.length;t++)if(!n[t](e))return!1;return!0}}(ys,bs,d(ws)),Ss=d(Dn("white-space","pre pre-line pre-wrap")),Ns=Mn,Es=jn,ks=xu.nodeIndex,_s=gs,As=function(e){return"createRange"in e?e.createRange():xu.DOM.createRng()},Rs=function(e){return e&&/[\r\n\t ]/.test(e)},Ts=function(e){return!!e.setStart&&!!e.setEnd},Ds=function(e){var t,n=e.startContainer,r=e.startOffset;return!!(Rs(e.toString())&&Ss(n.parentNode)&&Mn(n)&&(t=n.data,Rs(t[r-1])||Rs(t[r+1])))},Os=function(e){return 0===e.left&&0===e.right&&0===e.top&&0===e.bottom},Bs=function(e){var t=e.getClientRects(),n=0<t.length?ss(t[0]):ss(e.getBoundingClientRect());return!Ts(e)&&Es(e)&&Os(n)?function(e){var t=e.ownerDocument,n=As(t),r=t.createTextNode(fo),o=e.parentNode;o.insertBefore(r,e),n.setStart(r,0),n.setEnd(r,1);var i=ss(n.getBoundingClientRect());return o.removeChild(r),i}(e):Os(n)&&Ts(e)?function(e){var t=e.startContainer,n=e.endContainer,r=e.startOffset,o=e.endOffset;if(t===n&&Mn(n)&&0===r&&1===o){var i=e.cloneRange();return i.setEndAfter(n),Bs(i)}return null}(e):n},Ps=function(e,t){var n=cs(e,t);return n.width=1,n.right=n.left+1,n},Ls=function(e){var t,n,r=[],o=function(e){var t,n;0!==e.height&&(0<r.length&&(t=e,n=r[r.length-1],t.left===n.left&&t.top===n.top&&t.bottom===n.bottom&&t.right===n.right)||r.push(e))},i=function(e,t){var n=As(e.ownerDocument);if(t<e.data.length){if(vs(e.data[t]))return r;if(vs(e.data[t-1])&&(n.setStart(e,t),n.setEnd(e,t+1),!Ds(n)))return o(Ps(Bs(n),!1)),r}0<t&&(n.setStart(e,t-1),n.setEnd(e,t),Ds(n)||o(Ps(Bs(n),!1))),t<e.data.length&&(n.setStart(e,t),n.setEnd(e,t+1),Ds(n)||o(Ps(Bs(n),!0)))};if(Ns(e.container()))return i(e.container(),e.offset()),r;if(ys(e.container()))if(e.isAtEnd())n=_s(e.container(),e.offset()),Ns(n)&&i(n,n.data.length),xs(n)&&!Es(n)&&o(Ps(Bs(n),!1));else{if(n=_s(e.container(),e.offset()),Ns(n)&&i(n,0),xs(n)&&e.isAtEnd())return o(Ps(Bs(n),!1)),r;t=_s(e.container(),e.offset()-1),xs(t)&&!Es(t)&&(!Cs(t)&&!Cs(n)&&xs(n)||o(Ps(Bs(t),!1))),xs(n)&&o(Ps(Bs(n),!0))}return r},Is=function(t,n,e){var r=function(){return e=e||Ls(Is(t,n))};return{container:S(t),offset:S(n),toRange:function(){var e=As(t.ownerDocument);return e.setStart(t,n),e.setEnd(t,n),e},getClientRects:r,isVisible:function(){return 0<r().length},isAtStart:function(){return Ns(t),0===n},isAtEnd:function(){return Ns(t)?n>=t.data.length:n>=t.childNodes.length},isEqual:function(e){return e&&t===e.container()&&n===e.offset()},getNode:function(e){return _s(t,e?n-1:n)}}};Is.fromRangeStart=function(e){return Is(e.startContainer,e.startOffset)},Is.fromRangeEnd=function(e){return Is(e.endContainer,e.endOffset)},Is.after=function(e){return Is(e.parentNode,ks(e)+1)},Is.before=function(e){return Is(e.parentNode,ks(e))},Is.isAbove=function(e,t){return as(re(t.getClientRects()),oe(e.getClientRects()),fs).getOr(!1)},Is.isBelow=function(e,t){return as(oe(t.getClientRects()),re(e.getClientRects()),ds).getOr(!1)},Is.isAtStart=function(e){return!!e&&e.isAtStart()},Is.isAtEnd=function(e){return!!e&&e.isAtEnd()},Is.isTextPosition=function(e){return!!e&&Mn(e.container())},Is.isElementPosition=function(e){return!1===Is.isTextPosition(e)};var Ms,Fs,Us=function(e,t){Mn(t)&&0===t.data.length&&e.remove(t)},zs=function(e,t,n){var r,o,i,a,u,s,c;zn(n)?(i=e,a=t,u=n,s=U.from(u.firstChild),c=U.from(u.lastChild),a.insertNode(u),s.each(function(e){return Us(i,e.previousSibling)}),c.each(function(e){return Us(i,e.nextSibling)})):(r=e,o=n,t.insertNode(o),Us(r,o.previousSibling),Us(r,o.nextSibling))},js=Mn,Hs=Bn,Vs=xu.nodeIndex,qs=function(e){var t=e.parentNode;return Hs(t)?qs(t):t},$s=function(e){return e?Ne(e.childNodes,function(e,t){return Hs(t)&&"BR"!==t.nodeName?e=e.concat($s(t)):e.push(t),e},[]):[]},Ws=function(t){return function(e){return t===e}},Ks=function(e){var t=js(e)?"text()":e.nodeName.toLowerCase();return t+"["+function(e){var r=$s(qs(e)),t=Ee(r,Ws(e),e);r=r.slice(0,t+1);var n=Ne(r,function(e,t,n){return js(t)&&js(r[n-1])&&e++,e},0);return r=xe(r,Tn([e.nodeName])),(t=Ee(r,Ws(e),e))-n}(e)+"]"},Xs=function(e,t){var n,r,o,i=[],a=t.container(),u=t.offset();return js(a)?n=function(e,t){for(;(e=e.previousSibling)&&js(e);)t+=e.data.length;return t}(a,u):(u>=(r=a.childNodes).length?(n="after",u=r.length-1):n="before",a=r[u]),i.push(Ks(a)),o=function(e,t,n){var r=[];for(t=t.parentNode;t!==e&&(!n||!n(t));t=t.parentNode)r.push(t);return r}(e,a),o=xe(o,d(Bn)),(i=i.concat(we(o,Ks))).reverse().join("/")+","+n},Ys=function(e,t){if(!t)return null;var n=t.split(","),r=n[0].split("/"),o=1<n.length?n[1]:"before",i=Ne(r,function(e,t){var n,r,o,i,a=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t);return a?("text()"===a[1]&&(a[1]="#text"),n=e,r=a[1],o=parseInt(a[2],10),i=$s(n),i=xe(i,function(e,t){return!js(e)||!js(i[t-1])}),(i=xe(i,Tn([r])))[o]):null},e);return i?js(i)?function(e,t){for(var n,r=e,o=0;js(r);){if(n=r.data.length,o<=t&&t<=o+n){e=r,t-=o;break}if(!js(r.nextSibling)){e=r,t=n;break}o+=n,r=r.nextSibling}return js(e)&&t>e.data.length&&(t=e.data.length),Is(e,t)}(i,parseInt(o,10)):(o="after"===o?Vs(i)+1:Vs(i),Is(i.parentNode,o)):null},Gs=qn,Js=function(e,t,n,r,o){var i,a=r[o?"startContainer":"endContainer"],u=r[o?"startOffset":"endOffset"],s=[],c=0,l=e.getRoot();for(Mn(a)?s.push(n?function(e,t,n){for(var r=e(t.data.slice(0,n)).length,o=t.previousSibling;o&&Mn(o);o=o.previousSibling)r+=e(o.data).length;return r}(t,a,u):u):(u>=(i=a.childNodes).length&&i.length&&(c=1,u=Math.max(0,i.length-1)),s.push(e.nodeIndex(i[u],n)+c));a&&a!==l;a=a.parentNode)s.push(e.nodeIndex(a,n));return s},Qs=function(e,t,n){var r=0;return _t.each(e.select(t),function(e){if("all"!==e.getAttribute("data-mce-bogus"))return e!==n&&void r++}),r},Zs=function(e,t){var n,r=t?"start":"end",o=e[r+"Container"],i=e[r+"Offset"];Rn(o)&&"TR"===o.nodeName&&(o=(n=o.childNodes)[Math.min(t?i:i-1,n.length-1)])&&(i=t?0:o.childNodes.length,e["set"+(t?"Start":"End")](o,i))},ec=function(e){return Zs(e,!0),Zs(e,!1),e},tc=function(e,t){var n;if(Rn(e)&&(e=gs(e,t),Gs(e)))return e;if(Co(e)){if(Mn(e)&&yo(e)&&(e=e.parentNode),n=e.previousSibling,Gs(n))return n;if(n=e.nextSibling,Gs(n))return n}},nc=function(e,t,n){var r=n.getNode(),o=r?r.nodeName:null,i=n.getRng();if(Gs(r)||"IMG"===o)return{name:o,index:Qs(n.dom,o,r)};var a,u,s,c,l,f,d,m=tc((a=i).startContainer,a.startOffset)||tc(a.endContainer,a.endOffset);return m?{name:o=m.tagName,index:Qs(n.dom,o,m)}:(u=e,c=t,l=i,f=(s=n).dom,(d={}).start=Js(f,u,c,l,!0),s.isCollapsed()||(d.end=Js(f,u,c,l,!1)),d)},rc=function(e,t,n){var r={"data-mce-type":"bookmark",id:t,style:"overflow:hidden;line-height:0px"};return n?e.create("span",r,"&#xFEFF;"):e.create("span",r)},oc=function(e,t){var n=e.dom,r=e.getRng(),o=n.uniqueId(),i=e.isCollapsed(),a=e.getNode(),u=a.nodeName;if("IMG"===u)return{name:u,index:Qs(n,u,a)};var s,c=ec(r.cloneRange());i||(c.collapse(!1),s=rc(n,o+"_end",t),zs(n,c,s)),(r=ec(r)).collapse(!0);var l=rc(n,o+"_start",t);return zs(n,r,l),e.moveToBookmark({id:o,keep:!0}),{id:o}},ic=function(e,t,n){return 2===t?nc(go,n,e):3===t?(o=(r=e).getRng(),{start:Xs(r.dom.getRoot(),Is.fromRangeStart(o)),end:Xs(r.dom.getRoot(),Is.fromRangeEnd(o))}):t?{rng:e.getRng()}:oc(e,!1);var r,o},ac=N(nc,o,!0),uc=xu.DOM,sc=function(e,t,n){var r=e.getParam(t,n);if(-1===r.indexOf("="))return r;var o=e.getParam(t,"","hash");return o.hasOwnProperty(e.id)?o[e.id]:n},cc=function(e){return e.getParam("content_security_policy","")},lc=function(e){if(e.getParam("force_p_newlines",!1))return"p";var t=e.getParam("forced_root_block","p");return!1===t?"":!0===t?"p":t},fc=function(e){return e.getParam("forced_root_block_attrs",{})},dc=function(e){return e.getParam("automatic_uploads",!0,"boolean")},mc=function(e){return e.getParam("icons","","string")},pc=function(e){return e.getParam("referrer_policy","","string")},gc=function(e){return e.getParam("language","en","string")},hc=function(e){return e.getParam("indent_use_margin",!1)},vc=function(e){var t=e.getParam("font_css",[]);return _(t)?t:z(t.split(","),We)},yc=function(e){var t=e.getParam("object_resizing");return!1!==t&&!xt.iOS&&(K(t)?t:"table,img,figure.image,div,video,iframe")},bc=function(e){return e.getParam("event_root")},Cc=function(e){return e.getParam("theme")},wc=function(e){return!1!==e.getParam("inline_boundaries")},xc=function(e){return e.getParam("plugins","","string")},Sc=Rn,Nc=Mn,Ec=function(e){var t=e.parentNode;t&&t.removeChild(e)},kc=function(e){var t=go(e);return{count:e.length-t.length,text:t}},_c=function(e){for(var t;-1!==(t=e.data.lastIndexOf(mo));)e.deleteData(t,1)},Ac=function(e,t){return Oc(e),t},Rc=function(e,t){var n,r,o=t.container(),i=(n=ie(o.childNodes),(-1===(r=I(n,e))?U.none():U.some(r)).map(function(e){return e<t.offset()?Is(o,t.offset()-1):t}).getOr(t));return Oc(e),i},Tc=function(e,t){return Nc(e)&&t.container()===e?(r=t,o=kc((n=e).data.substr(0,r.offset())),i=kc(n.data.substr(r.offset())),0<(o.text+i.text).length?(_c(n),Is(n,r.offset()-o.count)):r):Ac(e,t);var n,r,o,i},Dc=function(e,t){return Is.isTextPosition(t)?Tc(e,t):(n=e,((r=t).container()===n.parentNode?Rc:Ac)(n,r));var n,r},Oc=function(e){Sc(e)&&Co(e)&&(wo(e)?e.removeAttribute("data-mce-caret"):Ec(e)),Nc(e)&&(_c(e),0===e.data.length&&Ec(e))},Bc=mt().browser,Pc=qn,Lc=Wn,Ic=$n,Mc=function(e,t,n){var r,o,i,a,u=cs(t.getBoundingClientRect(),n),s="BODY"===e.tagName?(r=e.ownerDocument.documentElement,o=e.scrollLeft||r.scrollLeft,e.scrollTop||r.scrollTop):(a=e.getBoundingClientRect(),o=e.scrollLeft-a.left,e.scrollTop-a.top);return u.left+=o,u.right+=o,u.top+=s,u.bottom+=s,u.width=1,0<(i=t.offsetWidth-t.clientWidth)&&(n&&(i*=-1),u.left+=i,u.right+=i),u},Fc=function(e,i,a,t){var n,u,s=Au(U.none()),r=lc(e),c=0<r.length?r:"p",l=function(){!function(e){for(var t=qu(Rt.fromDom(e),"*[contentEditable=false],video,audio,embed,object"),n=0;n<t.length;n++){var r,o=t[n].dom,i=o.previousSibling;ko(i)&&(1===(r=i.data).length?i.parentNode.removeChild(i):i.deleteData(r.length-1,1)),i=o.nextSibling,Eo(i)&&(1===(r=i.data).length?i.parentNode.removeChild(i):i.deleteData(0,1))}}(i),u&&(Oc(u),u=null),s.get().each(function(e){gu(e.caret).remove(),s.set(U.none())}),n&&(Wr.clearInterval(n),n=null)},f=function(){n=Wr.setInterval(function(){t()?gu("div.mce-visual-caret",i).toggleClass("mce-visual-caret-hidden"):gu("div.mce-visual-caret",i).addClass("mce-visual-caret-hidden")},500)};return{show:function(t,e){var n,r;if(l(),Ic(e))return null;if(!a(e))return u=function(e,t){var n,r=e.ownerDocument.createTextNode(mo),o=e.parentNode;if(t){if(n=e.previousSibling,vo(n)){if(Co(n))return n;if(ko(n))return n.splitText(n.data.length-1)}o.insertBefore(r,e)}else{if(n=e.nextSibling,vo(n)){if(Co(n))return n;if(Eo(n))return n.splitText(1),n}e.nextSibling?o.insertBefore(r,e.nextSibling):o.appendChild(r)}return r}(e,t),r=e.ownerDocument.createRange(),zc(u.nextSibling)?(r.setStart(u,0),r.setEnd(u,0)):(r.setStart(u,1),r.setEnd(u,1)),r;u=No(c,e,t),n=Mc(i,e,t),gu(u).css("top",n.top);var o=gu('<div class="mce-visual-caret" data-mce-bogus="all"></div>').css(n).appendTo(i)[0];return s.set(U.some({caret:o,element:e,before:t})),s.get().each(function(e){t&&gu(e.caret).addClass("mce-visual-caret-before")}),f(),(r=e.ownerDocument.createRange()).setStart(u,0),r.setEnd(u,0),r},hide:l,getCss:function(){return".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}"},reposition:function(){s.get().each(function(e){var t=Mc(i,e.element,e.before);gu(e.caret).css(_e({},t))})},destroy:function(){return Wr.clearInterval(n)}}},Uc=function(){return Bc.isIE()||Bc.isEdge()||Bc.isFirefox()},zc=function(e){return Pc(e)||Lc(e)},jc=function(e){return zc(e)||Pn(e)&&Uc()},Hc=qn,Vc=Wn,qc=Dn("display","block table table-cell table-caption list-item"),$c=Co,Wc=yo,Kc=Rn,Xc=Io,Yc=function(e,t){for(var n;n=e(t);)if(!Wc(n))return n;return null},Gc=function(e,t,n,r,o){var i=new Yr(e,r),a=Hc(e)||Wc(e);if(t<0){if(a&&n(e=Yc(i.prev.bind(i),!0)))return e;for(;e=Yc(i.prev.bind(i),o);)if(n(e))return e}if(0<t){if(a&&n(e=Yc(i.next.bind(i),!0)))return e;for(;e=Yc(i.next.bind(i),o);)if(n(e))return e}return null},Jc=function(e,t){for(;e&&e!==t;){if(qc(e))return e;e=e.parentNode}return null},Qc=function(e,t,n){return Jc(e.container(),n)===Jc(t.container(),n)},Zc=function(e,t){if(!t)return null;var n=t.container(),r=t.offset();return Kc(n)?n.childNodes[r+e]:null},el=function(e,t){var n=t.ownerDocument.createRange();return e?(n.setStartBefore(t),n.setEndBefore(t)):(n.setStartAfter(t),n.setEndAfter(t)),n},tl=function(e,t,n){for(var r,o,i,a=e?"previousSibling":"nextSibling";n&&n!==t;){if(r=n[a],$c(r)&&(r=r[a]),Hc(r)||Vc(r)){if(i=n,Jc(r,o=t)===Jc(i,o))return r;break}if(Xc(r))break;n=n.parentNode}return null},nl=N(el,!0),rl=N(el,!1),ol=function(e,t,n){var r,o,i=N(tl,!0,t),a=N(tl,!1,t),u=n.startContainer,s=n.startOffset;if(yo(u)){if(Kc(u)||(u=u.parentNode),"before"===(o=u.getAttribute("data-mce-caret"))&&(r=u.nextSibling,jc(r)))return nl(r);if("after"===o&&(r=u.previousSibling,jc(r)))return rl(r)}if(!n.collapsed)return n;if(Mn(u)){if($c(u)){if(1===e){if(r=a(u))return nl(r);if(r=i(u))return rl(r)}if(-1===e){if(r=i(u))return rl(r);if(r=a(u))return nl(r)}return n}if(ko(u)&&s>=u.data.length-1)return 1===e&&(r=a(u))?nl(r):n;if(Eo(u)&&s<=1)return-1===e&&(r=i(u))?rl(r):n;if(s===u.data.length)return(r=a(u))?nl(r):n;if(0===s)return(r=i(u))?rl(r):n}return n},il=function(e,t){return U.from(Zc(e?0:-1,t)).filter(Hc)},al=function(e,t,n){var r=ol(e,t,n);return-1===e?Is.fromRangeStart(r):Is.fromRangeEnd(r)},ul=function(e){return U.from(e.getNode()).map(Rt.fromDom)},sl=function(e,t){for(;t=e(t);)if(t.isVisible())return t;return t},cl=function(e,t){var n=Qc(e,t);return!(n||!jn(e.getNode()))||n};(Fs=Ms=Ms||{})[Fs.Backwards=-1]="Backwards",Fs[Fs.Forwards=1]="Forwards";var ll,fl,dl,ml,pl=qn,gl=Mn,hl=Rn,vl=jn,yl=Io,bl=function(e){return Bo(e)||!!Mo(t=e)&&!0!==$(ie(t.getElementsByTagName("*")),function(e,t){return e||Ao(t)},!1);var t},Cl=Fo,wl=function(e,t){return e.hasChildNodes()&&t<e.childNodes.length?e.childNodes[t]:null},xl=function(e,t){if(0<e){if(yl(t.previousSibling)&&!gl(t.previousSibling))return Is.before(t);if(gl(t))return Is(t,0)}if(e<0){if(yl(t.nextSibling)&&!gl(t.nextSibling))return Is.after(t);if(gl(t))return Is(t,t.data.length)}return!(e<0)||vl(t)?Is.before(t):Is.after(t)},Sl=function(e,t,n){var r,o,i,a;if(!hl(n)||!t)return null;if(t.isEqual(Is.after(n))&&n.lastChild){if(a=Is.after(n.lastChild),e<0&&yl(n.lastChild)&&hl(n.lastChild))return vl(n.lastChild)?Is.before(n.lastChild):a}else a=t;var u,s,c,l=a.container(),f=a.offset();if(gl(l)){if(e<0&&0<f)return Is(l,--f);if(0<e&&f<l.length)return Is(l,++f);r=l}else{if(e<0&&0<f&&(o=wl(l,f-1),yl(o)))return!bl(o)&&(i=Gc(o,e,Cl,o))?gl(i)?Is(i,i.data.length):Is.after(i):gl(o)?Is(o,o.data.length):Is.before(o);if(0<e&&f<l.childNodes.length&&(o=wl(l,f),yl(o)))return vl(o)?(u=n,(c=(s=o).nextSibling)&&yl(c)?gl(c)?Is(c,0):Is.before(c):Sl(Ms.Forwards,Is.after(s),u)):!bl(o)&&(i=Gc(o,e,Cl,o))?gl(i)?Is(i,0):Is.before(i):gl(o)?Is(o,0):Is.after(o);r=o||a.getNode()}if((0<e&&a.isAtEnd()||e<0&&a.isAtStart())&&(r=Gc(r,e,w,n,!0),Cl(r,n)))return xl(e,r);o=Gc(r,e,Cl,n);var d=ke(H(function(e,t){for(var n=[];e&&e!==t;)n.push(e),e=e.parentNode;return n}(l,n),pl));return!d||o&&d.contains(o)?o?xl(e,o):null:a=0<e?Is.after(d):Is.before(d)},Nl=function(t){return{next:function(e){return Sl(Ms.Forwards,e,t)},prev:function(e){return Sl(Ms.Backwards,e,t)}}},El=function(e){return Is.isTextPosition(e)?0===e.offset():Io(e.getNode())},kl=function(e){if(Is.isTextPosition(e)){var t=e.container();return e.offset()===t.data.length}return Io(e.getNode(!0))},_l=function(e,t){return!Is.isTextPosition(e)&&!Is.isTextPosition(t)&&e.getNode()===t.getNode(!0)},Al=function(e,t,n){return e?!_l(t,n)&&(r=t,!(!Is.isTextPosition(r)&&jn(r.getNode())))&&kl(t)&&El(n):!_l(n,t)&&El(t)&&kl(n);var r},Rl=function(e,t,n){var r=Nl(t);return U.from(e?r.next(n):r.prev(n))},Tl=function(t,n,r){return Rl(t,n,r).bind(function(e){return Qc(r,e,n)&&Al(t,r,e)?Rl(t,n,e):U.some(e)})},Dl=function(t,n,e,r){return Tl(t,n,e).bind(function(e){return r(e)?Dl(t,n,e,r):U.some(e)})},Ol=function(e,t){var n,r,o,i,a,u=e?t.firstChild:t.lastChild;return Mn(u)?U.some(Is(u,e?0:u.data.length)):u?Io(u)?U.some(e?Is.before(u):jn(a=u)?Is.before(a):Is.after(a)):(r=t,o=u,i=(n=e)?Is.before(o):Is.after(o),Rl(n,r,i)):U.none()},Bl=N(Rl,!0),Pl=N(Rl,!1),Ll=N(Ol,!0),Il=N(Ol,!1),Ml="_mce_caret",Fl=function(e){return Rn(e)&&e.id===Ml},Ul=function(e,t){for(;t&&t!==e;){if(t.id===Ml)return t;t=t.parentNode}return null},zl=function(e,t){return Rn(t)&&e.isBlock(t)&&!t.innerHTML&&!xt.ie&&(t.innerHTML='<br data-mce-bogus="1" />'),t},jl=function(e,t,n){return!(!1!==t.hasChildNodes()||!Ul(e,t))&&(o=n,i=(r=t).ownerDocument.createTextNode(mo),r.appendChild(i),o.setStart(i,0),o.setEnd(i,0),!0);var r,o,i},Hl=function(e,t,n,r){var o,i,a,u,s=n[t?"start":"end"],c=e.getRoot();if(s){for(a=s[0],i=c,o=s.length-1;1<=o;o--){if(u=i.childNodes,jl(c,i,r))return!0;if(s[o]>u.length-1)return!!jl(c,i,r)||function(e,t){return Il(e).fold(b,function(e){return t.setStart(e.container(),e.offset()),t.setEnd(e.container(),e.offset()),!0})}(i,r);i=u[s[o]]}3===i.nodeType&&(a=Math.min(s[0],i.nodeValue.length)),1===i.nodeType&&(a=Math.min(s[0],i.childNodes.length)),t?r.setStart(i,a):r.setEnd(i,a)}return!0},Vl=function(e){return Mn(e)&&0<e.data.length},ql=function(e,t,n){var r,o,i,a,u,s,c=e.get(n.id+"_"+t),l=n.keep;if(c){if(r=c.parentNode,s=(u=(o="start"===t?l?c.hasChildNodes()?(r=c.firstChild,1):Vl(c.nextSibling)?(r=c.nextSibling,0):Vl(c.previousSibling)?(r=c.previousSibling,c.previousSibling.data.length):(r=c.parentNode,e.nodeIndex(c)+1):e.nodeIndex(c):l?c.hasChildNodes()?(r=c.firstChild,1):Vl(c.previousSibling)?(r=c.previousSibling,c.previousSibling.data.length):(r=c.parentNode,e.nodeIndex(c)):e.nodeIndex(c),r),o),!l){for(a=c.previousSibling,i=c.nextSibling,_t.each(_t.grep(c.childNodes),function(e){Mn(e)&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});c=e.get(n.id+"_"+t);)e.remove(c,!0);a&&i&&a.nodeType===i.nodeType&&Mn(a)&&!xt.opera&&(o=a.nodeValue.length,a.appendData(i.nodeValue),e.remove(i),u=a,s=o)}return U.some(Is(u,s))}return U.none()},$l=function(e,t){var n,r,o,i,a,u,s,c,l,f,d,m,p,g,h=e.dom;if(t){if(g=t,_t.isArray(g.start))return m=t,p=(d=h).createRng(),Hl(d,!0,m,p)&&Hl(d,!1,m,p)?U.some(p):U.none();if(K(t.start))return U.some((c=t,l=(s=h).createRng(),f=Ys(s.getRoot(),c.start),l.setStart(f.container(),f.offset()),f=Ys(s.getRoot(),c.end),l.setEnd(f.container(),f.offset()),l));if(t.hasOwnProperty("id"))return a=ql(o=h,"start",i=t),u=ql(o,"end",i),as(a,u.or(a),function(e,t){var n=o.createRng();return n.setStart(zl(o,e.container()),e.offset()),n.setEnd(zl(o,t.container()),t.offset()),n});if(t.hasOwnProperty("name"))return n=h,r=t,U.from(n.select(r.name)[r.index]).map(function(e){var t=n.createRng();return t.selectNode(e),t});if(t.hasOwnProperty("rng"))return U.some(t.rng)}return U.none()},Wl=ic,Kl=function(t,e){$l(t,e).each(function(e){t.setRng(e)})},Xl=function(e){return Rn(e)&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type")},Yl=(ll=fo,function(e){return ll===e}),Gl=function(e){return""!==e&&-1!==" \f\n\r\t\x0B".indexOf(e)},Jl=function(e){return!Gl(e)&&!Yl(e)},Ql=function(e){return!!e.nodeType},Zl=function(e,t,n){var r,o,i,a,u=n.startOffset,s=n.startContainer;if((n.startContainer!==n.endContainer||!(a=n.startContainer.childNodes[n.startOffset])||!/^(IMG)$/.test(a.nodeName))&&1===s.nodeType)for(u<(i=s.childNodes).length?(s=i[u],r=new Yr(s,e.getParent(s,e.isBlock))):(s=i[i.length-1],(r=new Yr(s,e.getParent(s,e.isBlock))).next(!0)),o=r.current();o;o=r.next())if(3===o.nodeType&&!rf(o))return n.setStart(o,0),void t.setRng(n)},ef=function(e,t,n){if(e){var r=t?"nextSibling":"previousSibling";for(e=n?e:e[r];e;e=e[r])if(1===e.nodeType||!rf(e))return e}},tf=function(e,t){return Ql(t)&&(t=t.nodeName),!!e.schema.getTextBlockElements()[t.toLowerCase()]},nf=function(e,t,n){return e.schema.isValidChild(t,n)},rf=function(e,t){if(void 0===t&&(t=!1),V(e)&&Mn(e)){var n=t?e.data.replace(/ /g,"\xa0"):e.data;return zo(n)}return!1},of=function(e,n){return"string"!=typeof e?e=e(n):n&&(e=e.replace(/%(\w+)/g,function(e,t){return n[t]||e})),e},af=function(e,t){return e=""+((e=e||"").nodeName||e),t=""+((t=t||"").nodeName||t),e.toLowerCase()===t.toLowerCase()},uf=function(e,t,n){return"color"!==n&&"backgroundColor"!==n||(t=e.toHex(t)),"fontWeight"===n&&700===t&&(t="bold"),"fontFamily"===n&&(t=t.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),""+t},sf=function(e,t,n){return uf(e,e.getStyle(t,n),n)},cf=function(t,e){var n;return t.getParent(e,function(e){return(n=t.getStyle(e,"text-decoration"))&&"none"!==n}),n},lf=function(e,t,n){return e.getParents(t,n,e.getRoot())},ff=function(t,e,n){var r=["inline","block","selector","attributes","styles","classes"],a=function(e){return pe(e,function(e,t){return F(r,function(e){return e===t})})};return F(t.formatter.get(e),function(e){var i=a(e);return F(t.formatter.get(n),function(e){var t,n,r,o=a(e);return t=i,n=o,void 0===r&&(r=l),u(r).eq(t,n)})})},df=function(e){return ye(e,"block")},mf=function(e){return ye(e,"selector")},pf=function(e){return ye(e,"inline")},gf=Xl,hf=lf,vf=rf,yf=tf,bf=function(e,t){for(var n=t;n;){if(Rn(n)&&e.getContentEditable(n))return"false"===e.getContentEditable(n)?n:t;n=n.parentNode}return t},Cf=function(e,t,n,r){for(var o=t.data,i=n;e?0<=i:i<o.length;e?i--:i++)if(r(o.charAt(i)))return e?i+1:i;return-1},wf=function(e,t,n){return Cf(e,t,n,function(e){return Yl(e)||Gl(e)})},xf=function(e,t,n){return Cf(e,t,n,Jl)},Sf=function(i,e,t,n,a,r){var u,s=i.getParent(t,i.isBlock)||e,o=function(e,t,n){var r=is(i),o=a?r.backwards:r.forwards;return U.from(o(e,t,function(e,t){return gf(e.parentNode)?-1:n(a,u=e,t)},s))};return o(t,n,wf).bind(function(e){return r?o(e.container,e.offset+(a?-1:0),xf):U.some(e)}).orThunk(function(){return u?U.some({container:u,offset:a?0:u.length}):U.none()})},Nf=function(e,t,n,r,o){Mn(r)&&0===r.nodeValue.length&&r[o]&&(r=r[o]);for(var i=hf(e,r),a=0;a<i.length;a++)for(var u=0;u<t.length;u++){var s=t[u];if(!("collapsed"in s&&s.collapsed!==n.collapsed)&&e.is(i[a],s.selector))return i[a]}return r},Ef=function(t,e,n,r){var o,i,a=t.dom,u=a.getRoot();if(e[0].wrapper||(i=a.getParent(n,e[0].block,u)),i||(o=a.getParent(n,"LI,TD,TH"),i=a.getParent(Mn(n)?n.parentNode:n,function(e){return e!==u&&yf(t,e)},o)),i&&e[0].wrapper&&(i=hf(a,i,"ul,ol").reverse()[0]||i),!i)for(i=n;i[r]&&!a.isBlock(i[r])&&(i=i[r],!af(i,"br")););return i||n},kf=function(e,t,n,r){var o=n.parentNode;return!V(n[r])&&(!(o!==t&&!X(o)&&!e.isBlock(o))||kf(e,t,o,r))},_f=function(e,t,n,r,o){var i,a,u=n,s=o?"previousSibling":"nextSibling",c=e.getRoot();if(Mn(n)&&!vf(n)&&(o?0<r:r<n.data.length))return n;for(;;){if(!t[0].block_expand&&e.isBlock(u))return u;for(i=u[s];i;i=i[s]){var l=Mn(i)&&!kf(e,c,i,s);if(!gf(i)&&(!jn(a=i)||!a.getAttribute("data-mce-bogus")||a.nextSibling)&&!vf(i,l))return u}if(u===c||u.parentNode===c){n=u;break}u=u.parentNode}return n},Af=function(e){return gf(e.parentNode)||gf(e)},Rf=function(e,t,n,r){void 0===r&&(r=!1);var o=t.startContainer,i=t.startOffset,a=t.endContainer,u=t.endOffset,s=e.dom;return Rn(o)&&o.hasChildNodes()&&(o=gs(o,i),Mn(o)&&(i=0)),Rn(a)&&a.hasChildNodes()&&(a=gs(a,t.collapsed?u:u-1),Mn(a)&&(u=a.nodeValue.length)),o=bf(s,o),a=bf(s,a),Af(o)&&(o=gf(o)?o:o.parentNode,o=t.collapsed?o.previousSibling||o:o.nextSibling||o,Mn(o)&&(i=t.collapsed?o.length:0)),Af(a)&&(a=gf(a)?a:a.parentNode,a=t.collapsed?a.nextSibling||a:a.previousSibling||a,Mn(a)&&(u=t.collapsed?0:a.length)),t.collapsed&&(Sf(s,e.getBody(),o,i,!0,r).each(function(e){var t=e.container,n=e.offset;o=t,i=n}),Sf(s,e.getBody(),a,u,!1,r).each(function(e){var t=e.container,n=e.offset;a=t,u=n})),(n[0].inline||n[0].block_expand)&&(n[0].inline&&Mn(o)&&0!==i||(o=_f(s,n,o,i,!0)),n[0].inline&&Mn(a)&&u!==a.nodeValue.length||(a=_f(s,n,a,u,!1))),n[0].selector&&!1!==n[0].expand&&!n[0].inline&&(o=Nf(s,n,t,o,"previousSibling"),a=Nf(s,n,t,a,"nextSibling")),(n[0].block||n[0].selector)&&(o=Ef(e,n,o,"previousSibling"),a=Ef(e,n,a,"nextSibling"),n[0].block&&(s.isBlock(o)||(o=_f(s,n,o,i,!0)),s.isBlock(a)||(a=_f(s,n,a,u,!1)))),Rn(o)&&(i=s.nodeIndex(o),o=o.parentNode),Rn(a)&&(u=s.nodeIndex(a)+1,a=a.parentNode),{startContainer:o,startOffset:i,endContainer:a,endOffset:u}},Tf=function(e,t){var n=e.childNodes;return t>=n.length?t=n.length-1:t<0&&(t=0),n[t]||e},Df=function(e,t,u){var n=t.startContainer,r=t.startOffset,o=t.endContainer,i=t.endOffset,s=function(e){var t=e[0];return 3===t.nodeType&&t===n&&r>=t.nodeValue.length&&e.splice(0,1),t=e[e.length-1],0===i&&0<e.length&&t===o&&3===t.nodeType&&e.splice(e.length-1,1),e},c=function(e,t,n){for(var r=[];e&&e!==n;e=e[t])r.push(e);return r},a=function(e,t){do{if(e.parentNode===t)return e;e=e.parentNode}while(e)},l=function(e,t,n){for(var r=n?"nextSibling":"previousSibling",o=e,i=o.parentNode;o&&o!==t;o=i){i=o.parentNode;var a=c(o===e?o:o[r],r);a.length&&(n||a.reverse(),u(s(a)))}};if(1===n.nodeType&&n.hasChildNodes()&&(n=Tf(n,r)),1===o.nodeType&&o.hasChildNodes()&&(o=Tf(o,i-1)),n===o)return u(s([n]));for(var f=e.findCommonAncestor(n,o),d=n;d;d=d.parentNode){if(d===o)return l(n,f,!0);if(d===f)break}for(d=o;d;d=d.parentNode){if(d===n)return l(o,f);if(d===f)break}var m=a(n,f)||n,p=a(o,f)||o;l(n,m,!0);var g=c(m===n?m:m.nextSibling,"nextSibling",p===o?p.nextSibling:p);g.length&&u(s(g)),l(o,p)},Of=function(e){var t=[];if(e)for(var n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t},Bf=function(e){return H(J(e,function(e){var t=ps(e);return t?[Rt.fromDom(t)]:[]}),so)},Pf=function(e,t){var n=qu(t,"td[data-mce-selected],th[data-mce-selected]");return 0<n.length?n:Bf(e)},Lf=function(e){return Pf(Of(e.selection.getSel()),Rt.fromDom(e.getBody()))},If=function(t){return Zt(t).fold(S([t]),function(e){return[t].concat(If(e))})},Mf=function(t){return en(t).fold(S([t]),function(e){return"br"===It(e)?Kt(e).map(function(e){return[t].concat(Mf(e))}).getOr([]):[t].concat(Mf(e))})},Ff=function(o,e){return as((a=(i=e).startContainer,u=i.startOffset,Mn(a)?0===u?U.some(Rt.fromDom(a)):U.none():U.from(a.childNodes[u]).map(Rt.fromDom)),(n=(t=e).endContainer,r=t.endOffset,Mn(n)?r===n.data.length?U.some(Rt.fromDom(n)):U.none():U.from(n.childNodes[r-1]).map(Rt.fromDom)),function(e,t){var n=W(If(o),N(Bt,e)),r=W(Mf(o),N(Bt,t));return n.isSome()&&r.isSome()}).getOr(!1);var t,n,r,i,a,u},Uf=function(e,t,n,r){var o=n,i=new Yr(n,o),a=pe(e.schema.getMoveCaretBeforeOnEnterElements(),function(e,t){return!M(["td","th","table"],t.toLowerCase())});do{if(Mn(n)&&0!==_t.trim(n.nodeValue).length)return void(r?t.setStart(n,0):t.setEnd(n,n.nodeValue.length));if(a[n.nodeName])return void(r?t.setStartBefore(n):"BR"===n.nodeName?t.setEndBefore(n):t.setEndAfter(n))}while(n=r?i.next():i.prev());"BODY"===o.nodeName&&(r?t.setStart(o,0):t.setEnd(o,o.childNodes.length))},zf=function(e){var t=e.selection.getSel();return t&&0<t.rangeCount},jf=function(r,o){var e=Lf(r);0<e.length?Y(e,function(e){var t=e.dom,n=r.dom.createRng();n.setStartBefore(t),n.setEndAfter(t),o(n,!0)}):o(r.selection.getRng(),!1)},Hf=function(e,t,n){var r=oc(e,t);n(r),e.moveToBookmark(r)},Vf=(fl=zt,dl="text",{get:function(e){if(!fl(e))throw new Error("Can only get "+dl+" value of a "+dl+" node");return ml(e).getOr("")},getOption:ml=function(e){return fl(e)?U.from(e.dom.nodeValue):U.none()},set:function(e,t){if(!fl(e))throw new Error("Can only set raw "+dl+" value of a "+dl+" node");e.dom.nodeValue=t}}),qf=function(e){return Vf.get(e)},$f=function(r,o,i,a){return Wt(o).fold(function(){return"skipping"},function(e){return"br"===a||zt(n=o)&&qf(n)===mo?"valid":Ut(t=o)&&Hu(t,$u())?"existing":Fl(o.dom)?"caret":nf(r,i,a)&&nf(r,It(e),i)?"valid":"invalid-child";var t,n})},Wf=function(e,t,n,r){var o=t.uid,i=void 0===o?Zu("mce-annotation"):o,a=function(e,t){var n={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&t.indexOf(r)<0&&(n[r]=e[r]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols)for(var o=0,r=Object.getOwnPropertySymbols(e);o<r.length;o++)t.indexOf(r[o])<0&&Object.prototype.propertyIsEnumerable.call(e,r[o])&&(n[r[o]]=e[r[o]]);return n}(t,["uid"]),u=Rt.fromTag("span",e);zu(u,$u()),Yn(u,""+Ku(),i),Yn(u,""+Wu(),n);var s,c=r(i,a),l=c.attributes,f=void 0===l?{}:l,d=c.classes,m=void 0===d?[]:d;return Gn(u,f),s=u,Y(m,function(e){zu(s,e)}),u},Kf=function(i,e,t,n,r){var a=[],u=Wf(i.getDoc(),r,t,n),s=Au(U.none()),c=function(){s.set(U.none())},l=function(e){Y(e,o)},o=function(e){var t,n;switch($f(i,e,"span",It(e))){case"invalid-child":c();var r=Jt(e);l(r),c();break;case"valid":var o=s.get().getOrThunk(function(){var e=ns(u);return a.push(e),s.set(U.some(e)),e});cn(t=e,n=o),dn(n,t)}};return Df(i.dom,e,function(e){var t;c(),t=z(e,Rt.fromDom),l(t)}),a},Xf=function(u,s,c,l){u.undoManager.transact(function(){var e,t,n,r,o=u.selection,i=o.getRng(),a=0<Lf(u).length;i.collapsed&&!a&&(n=Rf(e=u,t=i,[{inline:!0}]),t.setStart(n.startContainer,n.startOffset),t.setEnd(n.endContainer,n.endOffset),e.selection.setRng(t)),o.getRng().collapsed&&!a?(r=Wf(u.getDoc(),l,s,c.decorate),es(r,fo),o.getRng().insertNode(r.dom),o.select(r.dom)):Hf(o,!1,function(){jf(u,function(e){Kf(u,e,s,c.decorate,l)})})})},Yf=function(u){var n,r=(n={},{register:function(e,t){n[e]={name:e,settings:t}},lookup:function(e){return n.hasOwnProperty(e)?U.from(n[e]).map(function(e){return e.settings}):U.none()}});Ju(u,r);var o=Gu(u);return{register:function(e,t){r.register(e,t)},annotate:function(t,n){r.lookup(t).each(function(e){Xf(u,t,e,n)})},annotationChanged:function(e,t){o.addListener(e,t)},remove:function(e){Xu(u,U.some(e)).each(function(e){var t=e.elements;Y(t,hn)})},getAll:function(e){var t,n,r,o,i,a=(t=u,n=e,r=Rt.fromDom(t.getBody()),o=qu(r,"["+Wu()+'="'+n+'"]'),i={},Y(o,function(e){var t=Jn(e,Ku()),n=i.hasOwnProperty(t)?i[t]:[];i[t]=n.concat([e])}),i);return ce(a,function(e){return z(e,function(e){return e.dom})})}}},Gf=function(e){return{getBookmark:N(Wl,e),moveToBookmark:N(Kl,e)}};Gf.isBookmarkNode=Xl;var Jf=function(e,t){for(;t&&t!==e;){if(Vn(t)||qn(t))return t;t=t.parentNode}return null},Qf=function(t,n,e){if(e.collapsed)return!1;if(xt.browser.isIE()&&e.startOffset===e.endOffset-1&&e.startContainer===e.endContainer){var r=e.startContainer.childNodes[e.startOffset];if(Rn(r))return F(r.getClientRects(),function(e){return ms(e,t,n)})}return F(e.getClientRects(),function(e){return ms(e,t,n)})},Zf=function(e,t,n){return e.fire(t,n)},ed={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,END:35,HOME:36,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey||ed.metaKeyPressed(e)},metaKeyPressed:function(e){return xt.mac?e.metaKey:e.ctrlKey&&!e.altKey}},td=qn,nd=function(r,l){var f,d,m,p,c,g,h,v,y,b,C,w,x,S,N,E="data-mce-selected",k=l.dom,_=_t.each,A=l.getDoc(),R=document,T=Math.abs,D=Math.round,O=l.getBody(),B={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]},P=function(e){return e&&("IMG"===e.nodeName||l.dom.is(e,"figure.image"))},L=function(e){return Wn(e)||k.hasClass(e,"mce-preview-object")},n=function(e){var t=e.target;!function(e,t){if("longpress"!==e.type&&0!==e.type.indexOf("touch"))return P(e.target)&&!Qf(e.clientX,e.clientY,t);var n=e.touches[0];return P(e.target)&&!Qf(n.clientX,n.clientY,t)}(e,l.selection.getRng())||e.isDefaultPrevented()||l.selection.select(t)},I=function(e){return k.is(e,"figure.image")?[e.querySelector("img")]:k.hasClass(e,"mce-preview-object")&&V(e.firstElementChild)?[e,e.firstElementChild]:[e]},M=function(e){var t=yc(l);return!!t&&("false"!==e.getAttribute("data-mce-resize")&&(e!==l.getBody()&&(k.hasClass(e,"mce-preview-object")?Dt(Rt.fromDom(e.firstElementChild),t):Dt(Rt.fromDom(e),t))))},a=function(e,t,n){var r;V(n)&&(r=I(e),Y(r,function(e){e.style[t]||!l.schema.isValid(e.nodeName.toLowerCase(),t)?k.setStyle(e,t,n):k.setAttrib(e,t,""+n)}))},F=function(e,t,n){a(e,"width",t),a(e,"height",n)},U=function(e){var t,n,r,o,i,a,u,s=e.screenX-g,c=e.screenY-h;w=s*p[2]+v,x=c*p[3]+y,w=w<5?5:w,x=x<5?5:x,((P(f)||L(f))&&!1!==l.getParam("resize_img_proportional",!0,"boolean")?!ed.modifierPressed(e):ed.modifierPressed(e))&&(T(s)>T(c)?(x=D(w*b),w=D(x/b)):(w=D(x/b),x=D(w*b))),F(d,w,x),t=0<(t=p.startPos.x+s)?t:0,n=0<(n=p.startPos.y+c)?n:0,k.setStyles(m,{left:t,top:n,display:"block"}),m.innerHTML=w+" &times; "+x,p[2]<0&&d.clientWidth<=w&&k.setStyle(d,"left",void 0+(v-w)),p[3]<0&&d.clientHeight<=x&&k.setStyle(d,"top",void 0+(y-x)),(s=O.scrollWidth-S)+(c=O.scrollHeight-N)!==0&&k.setStyles(m,{left:t-s,top:n-c}),C||(r=l,o=f,i=v,a=y,u="corner-"+p.name,r.fire("ObjectResizeStart",{target:o,width:i,height:a,origin:u}),C=!0)},z=function(){var e,t,n,r,o,i=C;C=!1,i&&(a(f,"width",w),a(f,"height",x)),k.unbind(A,"mousemove",U),k.unbind(A,"mouseup",z),R!==A&&(k.unbind(R,"mousemove",U),k.unbind(R,"mouseup",z)),k.remove(d),k.remove(m),k.remove(c),u(f),i&&(e=l,t=f,n=w,r=x,o="corner-"+p.name,e.fire("ObjectResized",{target:t,width:n,height:r,origin:o}),k.setAttrib(f,"style",k.getAttrib(f,"style"))),l.nodeChanged()},u=function(e){H();var t=k.getPos(e,O),i=t.x,a=t.y,n=e.getBoundingClientRect(),u=n.width||n.right-n.left,s=n.height||n.bottom-n.top;f!==e&&(j(),f=e,w=x=0);var r=l.fire("ObjectSelected",{target:e}),o=k.getAttrib(f,E,"1");M(e)&&!r.isDefaultPrevented()?_(B,function(r,o){var t=function(e){var t,n=I(f)[0];g=e.screenX,h=e.screenY,v=n.clientWidth,y=n.clientHeight,b=y/v,(p=r).name=o,p.startPos={x:u*r[0]+i,y:s*r[1]+a},S=O.scrollWidth,N=O.scrollHeight,c=k.add(O,"div",{"class":"mce-resize-backdrop"}),k.setStyles(c,{position:"fixed",left:"0",top:"0",width:"100%",height:"100%"}),d=L(t=f)?k.create("img",{src:xt.transparentSrc}):t.cloneNode(!0),k.addClass(d,"mce-clonedresizable"),k.setAttrib(d,"data-mce-bogus","all"),d.contentEditable="false",k.setStyles(d,{left:i,top:a,margin:0}),F(d,u,s),d.removeAttribute(E),O.appendChild(d),k.bind(A,"mousemove",U),k.bind(A,"mouseup",z),R!==A&&(k.bind(R,"mousemove",U),k.bind(R,"mouseup",z)),m=k.add(O,"div",{"class":"mce-resize-helper","data-mce-bogus":"all"},v+" &times; "+y)},e=k.get("mceResizeHandle"+o);e&&k.remove(e),e=k.add(O,"div",{id:"mceResizeHandle"+o,"data-mce-bogus":"all","class":"mce-resizehandle",unselectable:!0,style:"cursor:"+o+"-resize; margin:0; padding:0"}),11===xt.ie&&(e.contentEditable=!1),k.bind(e,"mousedown",function(e){e.stopImmediatePropagation(),e.preventDefault(),t(e)}),r.elm=e,k.setStyles(e,{left:u*r[0]+i-e.offsetWidth/2,top:s*r[1]+a-e.offsetHeight/2})}):j(),k.getAttrib(f,E)||f.setAttribute(E,o)},j=function(){H(),f&&f.removeAttribute(E),se(B,function(e,t){var n=k.get("mceResizeHandle"+t);n&&(k.unbind(n),k.remove(n))})},o=function(e){var t,n=function(e,t){if(e)do{if(e===t)return!0}while(e=e.parentNode)};C||l.removed||(_(k.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute(E)}),t="mousedown"===e.type?e.target:r.getNode(),n(t=k.$(t).closest("table,img,figure.image,hr,video,span.mce-preview-object")[0],O)&&(s(),n(r.getStart(!0),t)&&n(r.getEnd(!0),t))?u(t):j())},i=function(e){return td(Jf(l.getBody(),e))},H=function(){se(B,function(e){e.elm&&(k.unbind(e.elm),delete e.elm)})},s=function(){try{l.getDoc().execCommand("enableObjectResizing",!1,"false")}catch(e){}};l.on("init",function(){var e;s(),(xt.browser.isIE()||xt.browser.isEdge())&&(l.on("mousedown click",function(e){var t=e.target,n=t.nodeName;C||!/^(TABLE|IMG|HR)$/.test(n)||i(t)||(2!==e.button&&l.selection.select(t,"TABLE"===n),"mousedown"===e.type&&l.nodeChanged())}),e=function(e){var t=function(e){Wr.setEditorTimeout(l,function(){return l.selection.select(e)})};if(i(e.target)||Wn(e.target))return e.preventDefault(),void t(e.target);/^(TABLE|IMG|HR)$/.test(e.target.nodeName)&&(e.preventDefault(),"IMG"===e.target.tagName&&t(e.target))},k.bind(O,"mscontrolselect",e),l.on("remove",function(){return k.unbind(O,"mscontrolselect",e)}));var t=Wr.throttle(function(e){l.composing||o(e)});l.on("nodechange ResizeEditor ResizeWindow ResizeContent drop FullscreenStateChanged",t),l.on("keyup compositionend",function(e){f&&"TABLE"===f.nodeName&&t(e)}),l.on("hide blur",j),l.on("contextmenu longpress",n,!0)}),l.on("remove",H);return{isResizable:M,showResizeRect:u,hideResizeRect:j,updateResizeRect:o,destroy:function(){f=d=c=null}}},rd=function(e){return Vn(e)||qn(e)},od=function(e,t,n){var r,o,i,a,u,s=n;if(s.caretPositionFromPoint)(o=s.caretPositionFromPoint(e,t))&&((r=n.createRange()).setStart(o.offsetNode,o.offset),r.collapse(!0));else if(n.caretRangeFromPoint)r=n.caretRangeFromPoint(e,t);else if(s.body.createTextRange){r=s.body.createTextRange();try{r.moveToPoint(e,t),r.collapse(!0)}catch(c){r=function(e,n,t){var r,o=t.elementFromPoint(e,n),i=t.body.createTextRange();if(o&&"HTML"!==o.tagName||(o=t.body),i.moveToElementText(o),0<(r=(r=_t.toArray(i.getClientRects())).sort(function(e,t){return(e=Math.abs(Math.max(e.top-n,e.bottom-n)))-(t=Math.abs(Math.max(t.top-n,t.bottom-n)))})).length){n=(r[0].bottom+r[0].top)/2;try{return i.moveToPoint(e,n),i.collapse(!0),i}catch(a){}}return null}(e,t,n)}return i=r,a=n.body,u=i&&i.parentElement?i.parentElement():null,qn(function(e,t,n){for(;e&&e!==t;){if(n(e))return e;e=e.parentNode}return null}(u,a,rd))?null:i}return r},id=function(e,t){return e&&t&&e.startContainer===t.startContainer&&e.startOffset===t.startOffset&&e.endContainer===t.endContainer&&e.endOffset===t.endOffset},ad=function(e,t,n){return null!==function(e,t,n){for(;e&&e!==t;){if(n(e))return e;e=e.parentNode}return null}(e,t,n)},ud=function(e){return e&&"TABLE"===e.nodeName},sd=function(e,t,n){for(var r=new Yr(t,e.getParent(t.parentNode,e.isBlock)||e.getRoot());t=r[n?"prev":"next"]();)if(jn(t))return!0},cd=function(e,t,n,r,o){var i,a,u=e.getRoot(),s=e.schema.getNonEmptyElements(),c=e.getParent(o.parentNode,e.isBlock)||u;if(r&&jn(o)&&t&&e.isEmpty(c))return U.some(Is(o.parentNode,e.nodeIndex(o)));for(var l,f,d=new Yr(o,c);a=d[r?"prev":"next"]();){if("false"===e.getContentEditableParent(a)||(f=u,Co(l=a)&&!1===ad(l,f,Fl)))return U.none();if(Mn(a)&&0<a.nodeValue.length)return!1===function(e,t,n){return ad(e,t,function(e){return e.nodeName===n})}(a,u,"A")?U.some(Is(a,r?a.nodeValue.length:0)):U.none();if(e.isBlock(a)||s[a.nodeName.toLowerCase()])return U.none();i=a}return n&&i?U.some(Is(i,0)):U.none()},ld=function(e,t,n,r){var o,i,a,u,s=e.getRoot(),c=!1,l=r[(n?"start":"end")+"Container"],f=r[(n?"start":"end")+"Offset"],d=Rn(l)&&f===l.childNodes.length,m=e.schema.getNonEmptyElements(),p=n;if(Co(l))return U.none();if(Rn(l)&&f>l.childNodes.length-1&&(p=!1),Un(l)&&(l=s,f=0),l===s){if(p&&(o=l.childNodes[0<f?f-1:0])){if(Co(o))return U.none();if(m[o.nodeName]||ud(o))return U.none()}if(l.hasChildNodes()){if(f=Math.min(!p&&0<f?f-1:f,l.childNodes.length-1),l=l.childNodes[f],f=Mn(l)&&d?l.data.length:0,!t&&l===s.lastChild&&ud(l))return U.none();if(function(e,t){for(;t&&t!==e;){if(qn(t))return!0;t=t.parentNode}return!1}(s,l)||Co(l))return U.none();if(l.hasChildNodes()&&!1===ud(l)){var g=new Yr(o=l,s);do{if(qn(o)||Co(o)){c=!1;break}if(Mn(o)&&0<o.nodeValue.length){f=p?0:o.nodeValue.length,l=o,c=!0;break}if(m[o.nodeName.toLowerCase()]&&(!(i=o)||!/^(TD|TH|CAPTION)$/.test(i.nodeName))){f=e.nodeIndex(o),l=o.parentNode,p||f++,c=!0;break}}while(o=p?g.next():g.prev())}}}return t&&(Mn(l)&&0===f&&cd(e,d,t,!0,l).each(function(e){l=e.container(),f=e.offset(),c=!0}),Rn(l)&&(!(o=(o=l.childNodes[f])||l.childNodes[f-1])||!jn(o)||(u="A",(a=o).previousSibling&&a.previousSibling.nodeName===u)||sd(e,o,!1)||sd(e,o,!0)||cd(e,d,t,!0,o).each(function(e){l=e.container(),f=e.offset(),c=!0}))),p&&!t&&Mn(l)&&f===l.nodeValue.length&&cd(e,d,t,!1,l).each(function(e){l=e.container(),f=e.offset(),c=!0}),c?U.some(Is(l,f)):U.none()},fd=function(e,t){var n=t.collapsed,r=t.cloneRange(),o=Is.fromRangeStart(t);return ld(e,n,!0,r).each(function(e){n&&Is.isAbove(o,e)||r.setStart(e.container(),e.offset())}),n||ld(e,n,!1,r).each(function(e){r.setEnd(e.container(),e.offset())}),n&&r.collapse(!0),id(t,r)?U.none():U.some(r)},dd=function(e,t){return e.splitText(t)},md=function(e){var t=e.startContainer,n=e.startOffset,r=e.endContainer,o=e.endOffset;return t===r&&Mn(t)?0<n&&n<t.nodeValue.length&&(t=(r=dd(t,n)).previousSibling,n<o?(t=r=dd(r,o-=n).previousSibling,o=r.nodeValue.length,n=0):o=0):(Mn(t)&&0<n&&n<t.nodeValue.length&&(t=dd(t,n),n=0),Mn(r)&&0<o&&o<r.nodeValue.length&&(o=(r=dd(r,o).previousSibling).nodeValue.length)),{startContainer:t,startOffset:n,endContainer:r,endOffset:o}},pd=function(n){return{walk:function(e,t){return Df(n,e,t)},split:md,normalize:function(t){return fd(n,t).fold(b,function(e){return t.setStart(e.startContainer,e.startOffset),t.setEnd(e.endContainer,e.endOffset),!0})}}};pd.compareRanges=id,pd.getCaretRangeFromPoint=od,pd.getSelectedNode=ps,pd.getNode=gs;var gd,hd,vd,yd,bd,Cd=(gd="height",hd=function(e){var t=e.dom;return vn(e)?t.getBoundingClientRect().height:t.offsetHeight},{set:function(e,t){if(!O(t)&&!t.match(/^[0-9]+$/))throw new Error(gd+".set accepts only positive integer values. Value was "+t);var n=e.dom;Kn(n)&&(n.style[gd]=t+"px")},get:vd=function(e){var t=hd(e);if(t<=0||null===t){var n=tr(e,gd);return parseFloat(n)||0}return t},getOuter:vd,aggregate:yd=function(o,e){return $(e,function(e,t){var n=tr(o,t),r=n===undefined?0:parseInt(n,10);return isNaN(r)?e:e+r},0)},max:function(e,t,n){var r=yd(e,n);return r<t?t-r:0}}),wd=function(r,e){return r.view(e).fold(S([]),function(e){var t=r.owner(e),n=wd(r,t);return[e].concat(n)})},xd=/* */Object.freeze({__proto__:null,view:function(e){var t;return(e.dom===document?U.none():U.from(null===(t=e.dom.defaultView)||void 0===t?void 0:t.frameElement)).map(Rt.fromDom)},owner:qt}),Sd=function(e){var t,n,r,o=Rt.fromDom(document),i=xn(o),a=(t=e,r=(n=xd).owner(t),wd(n,r)),u=wn(e),s=q(a,function(e,t){var n=wn(t);return{left:e.left+n.left,top:e.top+n.top}},{left:0,top:0});return bn(s.left+u.left+i.left,s.top+u.top+i.top)},Nd=function(e){return"textarea"===It(e)},Ed=function(e,t){var n,r=function(e){var t=e.dom.ownerDocument,n=t.body,r=t.defaultView,o=t.documentElement;if(n===e.dom)return bn(n.offsetLeft,n.offsetTop);var i=Cn(null==r?void 0:r.pageYOffset,o.scrollTop),a=Cn(null==r?void 0:r.pageXOffset,o.scrollLeft),u=Cn(o.clientTop,n.clientTop),s=Cn(o.clientLeft,n.clientLeft);return wn(e).translate(a-s,i-u)}(e),o=(n=e,Cd.get(n));return{element:e,bottom:r.top+o,height:o,pos:r,cleanup:t}},kd=function(e,t){var n=function(e,t){var n=Jt(e);if(0===n.length||Nd(e))return{element:e,offset:t};if(t<n.length&&!Nd(n[t]))return{element:n[t],offset:0};var r=n[n.length-1];return Nd(r)?{element:e,offset:t}:"img"===It(r)?{element:r,offset:1}:zt(r)?{element:r,offset:qf(r).length}:{element:r,offset:Jt(r).length}}(e,t),r=Rt.fromHtml('<span data-mce-bogus="all">\ufeff</span>');return cn(n.element,r),Ed(r,function(){return gn(r)})},_d=function(n,r,o,i){Dd(n,function(e,t){return Rd(n,r,o,i)},o)},Ad=function(e,t,n,r,o){var i,a,u={elm:r.element.dom,alignToTop:o};i=u,e.fire("ScrollIntoView",i).isDefaultPrevented()||(n(t,xn(t).top,r,o),a=u,e.fire("AfterScrollIntoView",a))},Rd=function(e,t,n,r){var o=Rt.fromDom(e.getBody()),i=Rt.fromDom(e.getDoc());o.dom.offsetWidth;var a=kd(Rt.fromDom(n.startContainer),n.startOffset);Ad(e,i,t,a,r),a.cleanup()},Td=function(e,t,n,r){var o,i=Rt.fromDom(e.getDoc());Ad(e,i,n,(o=t,Ed(Rt.fromDom(o),te)),r)},Dd=function(e,t,n){var r=n.startContainer,o=n.startOffset,i=n.endContainer,a=n.endOffset;t(Rt.fromDom(r),Rt.fromDom(i));var u=e.dom.createRng();u.setStart(r,o),u.setEnd(i,a),e.selection.setRng(n)},Od=function(e,t,n,r){var o,i=e.pos;n?Sn(i.left,i.top,r):(o=i.top-t+e.height,Sn(i.left,o,r))},Bd=function(e,t,n,r,o){var i=n+t,a=r.pos.top,u=r.bottom,s=n<=u-a;a<t?Od(r,n,!1!==o,e):i<a?Od(r,n,s?!1!==o:!0===o,e):i<u&&!s&&Od(r,n,!0===o,e)},Pd=function(e,t,n,r){var o=e.dom.defaultView.innerHeight;Bd(e,t,o,n,r)},Ld=function(e,t,n,r){var o=e.dom.defaultView.innerHeight;Bd(e,t,o,n,r);var i=Sd(n.element),a=kn(window);i.top<a.y?Nn(n.element,!1!==r):i.top>a.bottom&&Nn(n.element,!0===r)},Id=function(e,t,n){return _d(e,Pd,t,n)},Md=function(e,t,n){return Td(e,t,Pd,n)},Fd=function(e,t,n){return _d(e,Ld,t,n)},Ud=function(e,t,n){return Td(e,t,Ld,n)},zd=function(e,t,n){(e.inline?Id:Fd)(e,t,n)},jd=function(e){var t=on(e).dom;return e.dom===t.activeElement},Hd=function(e){return void 0===e&&(e=Rt.fromDom(document)),U.from(e.dom.activeElement).map(Rt.fromDom)},Vd=function(e,t,n,r){return{start:e,soffset:t,finish:n,foffset:r}},qd=wr([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),$d=(qd.before,qd.on,qd.after,function(e){return e.fold(o,o,o)}),Wd=wr([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),Kd={domRange:Wd.domRange,relative:Wd.relative,exact:Wd.exact,exactFromRange:function(e){return Wd.exact(e.start,e.soffset,e.finish,e.foffset)},getWin:function(e){var t=e.match({domRange:function(e){return Rt.fromDom(e.startContainer)},relative:function(e,t){return $d(e)},exact:function(e,t,n,r){return e}});return $t(t)},range:Vd},Xd=mt().browser,Yd=function(e,t){var n=zt(t)?qf(t).length:Jt(t).length+1;return n<e?n:e<0?0:e},Gd=function(e){return Kd.range(e.start,Yd(e.soffset,e.start),e.finish,Yd(e.foffset,e.finish))},Jd=function(e,t){return!An(t.dom)&&(Lt(e,t)||Bt(e,t))},Qd=function(t){return function(e){return Jd(t,e.start)&&Jd(t,e.finish)}},Zd=function(e){return!0===e.inline||Xd.isIE()},em=function(e){return Kd.range(Rt.fromDom(e.startContainer),e.startOffset,Rt.fromDom(e.endContainer),e.endOffset)},tm=function(e){var t,n,r=$t(e);return t=r.dom,((n=t.getSelection())&&0!==n.rangeCount?U.from(n.getRangeAt(0)):U.none()).map(em).filter(Qd(e))},nm=function(e){var t=document.createRange();try{return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),U.some(t)}catch(n){return U.none()}},rm=function(e){var t=Zd(e)?tm(Rt.fromDom(e.getBody())):U.none();e.bookmark=t.isSome()?t:e.bookmark},om=function(r){return(r.bookmark?r.bookmark:U.none()).bind(function(e){return t=Rt.fromDom(r.getBody()),n=e,U.from(n).filter(Qd(t)).map(Gd);var t,n}).bind(nm)},im={isEditorUIElement:function(e){var t=e.className.toString();return-1!==t.indexOf("tox-")||-1!==t.indexOf("mce-")}},am=function(n,e){var t,r;mt().browser.isIE()?(r=n).on("focusout",function(){rm(r)}):(t=e,n.on("mouseup touchend",function(e){t.throttle()})),n.on("keyup NodeChange",function(e){var t;"nodechange"===(t=e).type&&t.selectionChange||rm(n)})},um=function(r){var o=Pu(function(){rm(r)},0);r.on("init",function(){var e,t,n;r.inline&&(e=r,t=o,n=function(){t.throttle()},xu.DOM.bind(document,"mouseup",n),e.on("remove",function(){xu.DOM.unbind(document,"mouseup",n)})),am(r,o)}),r.on("remove",function(){o.cancel()})},sm=xu.DOM,cm=function(t,e){var n=t.getParam("custom_ui_selector","","string");return null!==sm.getParent(e,function(e){return im.isEditorUIElement(e)||!!n&&t.dom.is(e,n)})},lm=function(n,e){var t=e.editor;um(t),t.on("focusin",function(){var e=n.focusedEditor;e!==t&&(e&&e.fire("blur",{focusedEditor:t}),n.setActive(t),(n.focusedEditor=t).fire("focus",{blurredEditor:e}),t.focus(!0))}),t.on("focusout",function(){Wr.setEditorTimeout(t,function(){var e=n.focusedEditor;cm(t,function(e){try{var t=on(Rt.fromDom(e.getElement()));return Hd(t).fold(function(){return document.body},function(e){return e.dom})}catch(n){return document.body}}(t))||e!==t||(t.fire("blur",{focusedEditor:null}),n.focusedEditor=null)})}),bd||(bd=function(e){var t=n.activeEditor;t&&function(e){if(rn()&&V(e.target)){var t=Rt.fromDom(e.target);if(Ut(t)&&sn(t)&&e.composed&&e.composedPath){var n=e.composedPath();if(n)return re(n)}}return U.from(e.target)}(e).each(function(e){e.ownerDocument===document&&(e===document.body||cm(t,e)||n.focusedEditor!==t||(t.fire("blur",{focusedEditor:null}),n.focusedEditor=null))})},sm.bind(document,"focusin",bd))},fm=function(e,t){e.focusedEditor===t.editor&&(e.focusedEditor=null),e.activeEditor||(sm.unbind(document,"focusin",bd),bd=null)},dm=function(t,e){return((n=e).collapsed?U.from(gs(n.startContainer,n.startOffset)).map(Rt.fromDom):U.none()).bind(function(e){return uo(e)?U.some(e):!1===Lt(t,e)?U.some(t):U.none()});var n},mm=function(t,e){dm(Rt.fromDom(t.getBody()),e).bind(function(e){return Ll(e.dom)}).fold(function(){t.selection.normalize()},function(e){return t.selection.setRng(e.toRange())})},pm=function(e){if(e.setActive)try{e.setActive()}catch(t){e.focus()}else e.focus()},gm=function(e){return jd(e)||Hd(on(t=e)).filter(function(e){return t.dom.contains(e.dom)}).isSome();var t},hm=function(r){var e=on(Rt.fromDom(r.getElement()));return Hd(e).filter(function(e){return t=e.dom,!((n=t.classList)!==undefined&&(n.contains("tox-edit-area")||n.contains("tox-edit-area__iframe")||n.contains("mce-content-body")))&&cm(r,e.dom);var t,n}).isSome()},vm=function(e){return e.inline?(n=e.getBody())&&gm(Rt.fromDom(n)):(t=e).iframeElement&&jd(Rt.fromDom(t.iframeElement));var t,n},ym=function(t){var e=t.selection,n=t.getBody(),r=e.getRng();t.quirks.refreshContentEditable(),t.bookmark!==undefined&&!1===vm(t)&&om(t).each(function(e){t.selection.setRng(e),r=e});var o,i,a=(o=t,i=e.getNode(),o.dom.getParent(i,function(e){return"true"===o.dom.getContentEditable(e)}));if(t.$.contains(n,a))return pm(a),mm(t,r),void bm(t);t.inline||(xt.opera||pm(n),t.getWin().focus()),(xt.gecko||t.inline)&&(pm(n),mm(t,r)),bm(t)},bm=function(e){return e.editorManager.setActive(e)},Cm=function(e,t,n,r,o){var i=n?t.startContainer:t.endContainer,a=n?t.startOffset:t.endOffset;return U.from(i).map(Rt.fromDom).map(function(e){return r&&t.collapsed?e:Qt(e,o(e,a)).getOr(e)}).bind(function(e){return Ut(e)?U.some(e):Wt(e).filter(Ut)}).map(function(e){return e.dom}).getOr(e)},wm=function(e,t,n){return Cm(e,t,!0,n,function(e,t){return Math.min(e.dom.childNodes.length,t)})},xm=function(e,t,n){return Cm(e,t,!1,n,function(e,t){return 0<t?t-1:t})},Sm=function(e,t){for(var n=e;e&&Mn(e)&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n},Nm=function(n,e){return z(e,function(e){var t=n.fire("GetSelectionRange",{range:e});return t.range!==e?t.range:e})},Em={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11},km=function(e,t,n){var r=n?"lastChild":"firstChild",o=n?"prev":"next";if(e[r])return e[r];if(e!==t){var i=e[o];if(i)return i;for(var a=e.parent;a&&a!==t;a=a.parent)if(i=a[o])return i}},_m=function(e){var t="a"===e.name&&!e.attr("href")&&e.attr("id");return e.attr("name")||e.attr("id")&&!e.firstChild||e.attr("data-mce-bookmark")||t},Am=(Rm.create=function(e,t){var n=new Rm(e,Em[e]||1);return t&&se(t,function(e,t){n.attr(t,e)}),n},Rm.prototype.replace=function(e){return e.parent&&e.remove(),this.insert(e,this),this.remove(),this},Rm.prototype.attr=function(e,t){var n,r=this;if("string"!=typeof e)return e!==undefined&&null!==e&&se(e,function(e,t){r.attr(t,e)}),r;if(n=r.attributes){if(t===undefined)return n.map[e];if(null===t){if(e in n.map){delete n.map[e];for(var o=n.length;o--;)if(n[o].name===e)return n.splice(o,1),r}return r}if(e in n.map){for(o=n.length;o--;)if(n[o].name===e){n[o].value=t;break}}else n.push({name:e,value:t});return n.map[e]=t,r}},Rm.prototype.clone=function(){var e,t=new Rm(this.name,this.type);if(e=this.attributes){var n=[];n.map={};for(var r=0,o=e.length;r<o;r++){var i=e[r];"id"!==i.name&&(n[n.length]={name:i.name,value:i.value},n.map[i.name]=i.value)}t.attributes=n}return t.value=this.value,t.shortEnded=this.shortEnded,t},Rm.prototype.wrap=function(e){return this.parent.insert(e,this),e.append(this),this},Rm.prototype.unwrap=function(){for(var e=this.firstChild;e;){var t=e.next;this.insert(e,this,!0),e=t}this.remove()},Rm.prototype.remove=function(){var e=this.parent,t=this.next,n=this.prev;return e&&(e.firstChild===this?(e.firstChild=t)&&(t.prev=null):n.next=t,e.lastChild===this?(e.lastChild=n)&&(n.next=null):t.prev=n,this.parent=this.next=this.prev=null),this},Rm.prototype.append=function(e){e.parent&&e.remove();var t=this.lastChild;return t?((t.next=e).prev=t,this.lastChild=e):this.lastChild=this.firstChild=e,e.parent=this,e},Rm.prototype.insert=function(e,t,n){e.parent&&e.remove();var r=t.parent||this;return n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,(e.next=t).prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,(e.prev=t).next=e),e.parent=r,e},Rm.prototype.getAll=function(e){for(var t=[],n=this.firstChild;n;n=km(n,this))n.name===e&&t.push(n);return t},Rm.prototype.empty=function(){if(this.firstChild){for(var e=[],t=this.firstChild;t;t=km(t,this))e.push(t);for(var n=e.length;n--;)(t=e[n]).parent=t.firstChild=t.lastChild=t.next=t.prev=null}return this.firstChild=this.lastChild=null,this},Rm.prototype.isEmpty=function(e,t,n){void 0===t&&(t={});var r=this.firstChild;if(_m(this))return!1;if(r)do{if(1===r.type){if(r.attr("data-mce-bogus"))continue;if(e[r.name])return!1;if(_m(r))return!1}if(8===r.type)return!1;if(3===r.type&&!function(e){if(zo(e.value)){var t=e.parent;return!t||"span"===t.name&&!t.attr("style")||!/^[ ]+$/.test(e.value)}}(r))return!1;if(3===r.type&&r.parent&&t[r.parent.name]&&zo(r.value))return!1;if(n&&n(r))return!1}while(r=km(r,this));return!0},Rm.prototype.walk=function(e){return km(this,null,e)},Rm);function Rm(e,t){this.name=e,1===(this.type=t)&&(this.attributes=[],this.attributes.map={})}var Tm=function(e,t){return e.replace(t.re,function(e){return he(t.uris,e).getOr(e)})},Dm=["img","video"],Om=function(e,t,n){return!e.allow_html_data_urls&&(/^data:image\//i.test(t)?(r=e.allow_svg_data_urls,o=n,!(X(r)?M(Dm,o):r)&&/^data:image\/svg\+xml/i.test(t)):/^data:/i.test(t));var r,o},Bm=function(e,t,n){var r,o,i=1,a=e.getShortEndedElements(),u=/<([!?\/])?([A-Za-z0-9\-_:.]+)(\s(?:[^'">]+(?:"[^"]*"|'[^']*'))*[^"'>]*(?:"[^">]*|'[^'>]*)?|\s*|\/)>/g;for(u.lastIndex=r=n;o=u.exec(t);){if(r=u.lastIndex,"/"===o[1])i--;else if(!o[1]){if(o[2]in a)continue;i++}if(0===i)break}return r},Pm=function(W,K){void 0===K&&(K=Ci()),!1!==(W=W||{}).fix_self_closing&&(W.fix_self_closing=!0);var X=W.comment?W.comment:te,Y=W.cdata?W.cdata:te,G=W.text?W.text:te,J=W.start?W.start:te,Q=W.end?W.end:te,Z=W.pi?W.pi:te,ee=W.doctype?W.doctype:te,n=function(f,e){void 0===e&&(e="html");for(var t,i,n,d,r,o,a,m,u,s,c,l,p,g,h,v,y,b,C,w=f.html,x=0,S=[],N=0,E=li.decode,k=_t.makeMap("src,href,data,background,action,formaction,poster,xlink:href"),_=/((java|vb)script|mhtml):/i,A="html"===e?0:1,R=function(e){for(var t,n=S.length;n--&&S[n].name!==e;);if(0<=n){for(t=S.length-1;n<=t;t--)(e=S[t]).valid&&Q(e.name);S.length=n}},T=function(e,t){return G(Tm(e,f),t)},D=function(e){""!==e&&(">"===e.charAt(0)&&(e=" "+e),W.allow_conditional_comments||"[if"!==e.substr(0,3).toLowerCase()||(e=" "+e),X(Tm(e,f)))},O=function(e,t){var n=e||"",r=!qe(n,"--"),o=function(e,t,n){void 0===n&&(n=0);var r=e.toLowerCase();if(-1!==r.indexOf("[if ",n)&&(u=n,/^\s*\[if [\w\W]+\]>.*<!\[endif\](--!?)?>/.test(r.substr(u)))){var o=r.indexOf("[endif]",n);return r.indexOf(">",o)}if(t){var i=r.indexOf(">",n);return-1!==i?i:r.length}var a=/--!?>/g;a.lastIndex=n;var u,s=a.exec(e);return s?s.index+s[0].length:r.length}(w,r,t);return e=w.substr(t,o-t),D(r?n+e:e),o+1},B=function(e,t,n,r,o){var i,a,u,s;if(t=t.toLowerCase(),u=t in F?t:E(n||r||o||""),n=Tm(u,f),U&&!m&&!1==(0===(s=t).indexOf("data-")||0===s.indexOf("aria-"))){if(!(i=g[t])&&h){for(a=h.length;a--&&!(i=h[a]).pattern.test(t););-1===a&&(i=null)}if(!i)return;if(i.validValues&&!(n in i.validValues))return}if(k[t]&&!W.allow_script_urls){var c=n.replace(/[\s\u0000-\u001F]+/g,"");try{c=decodeURIComponent(c)}catch(l){c=unescape(c)}if(_.test(c))return;if(Om(W,c,e))return}m&&(t in k||0===t.indexOf("on"))||(d.map[t]=n,d.push({name:t,value:n}))},P=new RegExp("<(?:(?:!--([\\w\\W]*?)--!?>)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:![Dd][Oo][Cc][Tt][Yy][Pp][Ee]([\\w\\W]*?)>)|(?:!(--)?)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([A-Za-z][A-Za-z0-9\\-_\\:\\.]*)>)|(?:([A-Za-z][A-Za-z0-9\\-_:.]*)(\\s(?:[^'\">]+(?:\"[^\"]*\"|'[^']*'))*[^\"'>]*(?:\"[^\">]*|'[^'>]*)?|\\s*|\\/)>))","g"),L=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,I=K.getShortEndedElements(),M=W.self_closing_elements||K.getSelfClosingElements(),F=K.getBoolAttrs(),U=W.validate,z=W.remove_internals,j=W.fix_self_closing,H=K.getSpecialElements(),V=w+">";t=P.exec(V);){var q=t[0];if(x<t.index&&T(E(w.substr(x,t.index-x))),i=t[7])":"===(i=i.toLowerCase()).charAt(0)&&(i=i.substr(1)),R(i);else if(i=t[8]){if(t.index+q.length>w.length){T(E(w.substr(t.index))),x=t.index+q.length;continue}":"===(i=i.toLowerCase()).charAt(0)&&(i=i.substr(1)),u=i in I,j&&M[i]&&0<S.length&&S[S.length-1].name===i&&R(i);var $=function(e,t){var n=e.exec(t);if(n){var r=n[1],o=n[2];return"string"==typeof r&&"data-mce-bogus"===r.toLowerCase()?o:null}return null}(L,t[9]);if(null!==$){if("all"===$){x=Bm(K,w,P.lastIndex),P.lastIndex=x;continue}c=!1}if(!U||(s=K.getElementRule(i))){if(c=!0,U&&(g=s.attributes,h=s.attributePatterns),(p=t[9])?((m=-1!==p.indexOf("data-mce-type"))&&z&&(c=!1),(d=[]).map={},p.replace(L,function(e,t,n,r,o){return B(i,t,n,r,o),""})):(d=[]).map={},U&&!m){if(v=s.attributesRequired,y=s.attributesDefault,b=s.attributesForced,s.removeEmptyAttrs&&!d.length&&(c=!1),b)for(r=b.length;r--;)a=(l=b[r]).name,"{$uid}"===(C=l.value)&&(C="mce_"+N++),d.map[a]=C,d.push({name:a,value:C});if(y)for(r=y.length;r--;)(a=(l=y[r]).name)in d.map||("{$uid}"===(C=l.value)&&(C="mce_"+N++),d.map[a]=C,d.push({name:a,value:C}));if(v){for(r=v.length;r--&&!(v[r]in d.map););-1===r&&(c=!1)}if(l=d.map["data-mce-bogus"]){if("all"===l){x=Bm(K,w,P.lastIndex),P.lastIndex=x;continue}c=!1}}c&&J(i,d,u)}else c=!1;if(n=H[i]){n.lastIndex=x=t.index+q.length,x=(t=n.exec(w))?(c&&(o=w.substr(x,t.index-x)),t.index+t[0].length):(o=w.substr(x),w.length),c&&(0<o.length&&T(o,!0),Q(i)),P.lastIndex=x;continue}u||(p&&p.indexOf("/")===p.length-1?c&&Q(i):S.push({name:i,valid:c}))}else if(i=t[1])D(i);else if(i=t[2]){if(!(1==A||W.preserve_cdata||0<S.length&&K.isValidChild(S[S.length-1].name,"#cdata"))){x=O("",t.index+2),P.lastIndex=x;continue}Y(i)}else if(i=t[3])ee(i);else{if((i=t[4])||"<!"===q){x=O(i,t.index+q.length),P.lastIndex=x;continue}if(i=t[5]){if(1!=A){x=O("?",t.index+2),P.lastIndex=x;continue}Z(i,t[6])}}x=t.index+q.length}for(x<w.length&&T(E(w.substr(x))),r=S.length-1;0<=r;r--)(i=S[r]).valid&&Q(i.name)};return{parse:function(e,t){void 0===t&&(t="html"),n(function(e){for(var t,n=/data:[^;]+;base64,([a-z0-9\+\/=]+)/gi,r=[],o={},i=Zu("img"),a=0,u=0;t=n.exec(e);){var s=t[0],c=i+"_"+u++;o[c]=s,a<t.index&&r.push(e.substr(a,t.index-a)),r.push(c),a=t.index+s.length}var l=new RegExp(i+"_[0-9]+","g");return 0===a?{prefix:i,uris:o,html:e,re:l}:(a<e.length&&r.push(e.substr(a)),{prefix:i,uris:o,html:r.join(""),re:l})}(e),t)}}};Pm.findEndTag=Bm;var Lm,Im,Mm=function(e,t){var n,r,o,i,a,u,s,c=t,l=/<(\w+) [^>]*data-mce-bogus="all"[^>]*>/g,f=e.schema;a=e.getTempAttrs(),u=c,s=new RegExp(["\\s?("+a.join("|")+')="[^"]+"'].join("|"),"gi"),c=u.replace(s,"");for(var d=f.getShortEndedElements();i=l.exec(c);)r=l.lastIndex,o=i[0].length,n=d[i[1]]?r:Pm.findEndTag(f,c,r),c=c.substring(0,r-o)+c.substring(n),l.lastIndex=r-o;return go(c)},Fm=Mm,Um=function(e,t,n,r){var o,i,a,u,s;return t.format=n,t.get=!0,t.getInner=!0,t.no_events||e.fire("BeforeGetContent",t),o="raw"===t.format?_t.trim(Fm(e.serializer,r.innerHTML)):"text"===t.format?e.dom.isEmpty(r)?"":go(r.innerText||r.textContent):"tree"===t.format?e.serializer.serialize(r,t):(a=(i=e).serializer.serialize(r,t),u=lc(i),s=new RegExp("^(<"+u+"[^>]*>(&nbsp;|&#160;|\\s|\xa0|<br \\/>|)<\\/"+u+">[\r\n]*|<br \\/>[\r\n]*)$"),a.replace(s,"")),M(["text","tree"],t.format)||co(Rt.fromDom(r))?t.content=o:t.content=_t.trim(o),t.no_events||e.fire("GetContent",t),t.content},zm=_t.each,jm=function(o){return{compare:function(e,t){if(e.nodeName!==t.nodeName)return!1;var n=function(n){var r={};return zm(o.getAttribs(n),function(e){var t=e.nodeName.toLowerCase();0!==t.indexOf("_")&&"style"!==t&&0!==t.indexOf("data-")&&(r[t]=o.getAttrib(n,t))}),r},r=function(e,t){var n,r;for(r in e)if(e.hasOwnProperty(r)){if(void 0===(n=t[r]))return!1;if(e[r]!==n)return!1;delete t[r]}for(r in t)if(t.hasOwnProperty(r))return!1;return!0};return!!r(n(e),n(t))&&(!!r(o.parseStyle(o.getAttrib(e,"style")),o.parseStyle(o.getAttrib(t,"style")))&&(!Xl(e)&&!Xl(t)))}}},Hm=_t.makeMap,Vm=function(e){var u=[],s=(e=e||{}).indent,c=Hm(e.indent_before||""),l=Hm(e.indent_after||""),f=li.getEncodeFunc(e.entity_encoding||"raw",e.entities),d="html"===e.element_format;return{start:function(e,t,n){var r,o,i,a;if(s&&c[e]&&0<u.length&&0<(a=u[u.length-1]).length&&"\n"!==a&&u.push("\n"),u.push("<",e),t)for(r=0,o=t.length;r<o;r++)i=t[r],u.push(" ",i.name,'="',f(i.value,!0),'"');u[u.length]=!n||d?">":" />",n&&s&&l[e]&&0<u.length&&0<(a=u[u.length-1]).length&&"\n"!==a&&u.push("\n")},end:function(e){var t;u.push("</",e,">"),s&&l[e]&&0<u.length&&0<(t=u[u.length-1]).length&&"\n"!==t&&u.push("\n")},text:function(e,t){0<e.length&&(u[u.length]=t?e:f(e))},cdata:function(e){u.push("<![CDATA[",e,"]]>")},comment:function(e){u.push("\x3c!--",e,"--\x3e")},pi:function(e,t){t?u.push("<?",e," ",f(t),"?>"):u.push("<?",e,"?>"),s&&u.push("\n")},doctype:function(e){u.push("<!DOCTYPE",e,">",s?"\n":"")},reset:function(){u.length=0},getContent:function(){return u.join("").replace(/\n$/,"")}}},qm=function(t,p){void 0===p&&(p=Ci());var g=Vm(t);(t=t||{}).validate=!("validate"in t)||t.validate;return{serialize:function(e){var f=t.validate,d={3:function(e){g.text(e.value,e.raw)},8:function(e){g.comment(e.value)},7:function(e){g.pi(e.name,e.value)},10:function(e){g.doctype(e.value)},4:function(e){g.cdata(e.value)},11:function(e){if(e=e.firstChild)for(;m(e),e=e.next;);}};g.reset();var m=function(e){var t,n,r,o,i,a,u,s,c,l=d[e.type];if(l)l(e);else{if(t=e.name,n=e.shortEnded,r=e.attributes,f&&r&&1<r.length&&((a=[]).map={},c=p.getElementRule(e.name))){for(u=0,s=c.attributesOrder.length;u<s;u++)(o=c.attributesOrder[u])in r.map&&(i=r.map[o],a.map[o]=i,a.push({name:o,value:i}));for(u=0,s=r.length;u<s;u++)(o=r[u].name)in a.map||(i=r.map[o],a.map[o]=i,a.push({name:o,value:i}));r=a}if(g.start(e.name,r,n),!n){if(e=e.firstChild)for(;m(e),e=e.next;);g.end(t)}}};return 1!==e.type||t.inner?d[11](e):m(e),g.getContent()}}},$m=function(n,r,o){return U.from(o.container()).filter(Mn).exists(function(e){var t=n?0:-1;return r(e.data.charAt(o.offset()+t))})},Wm=N($m,!0,Gl),Km=N($m,!1,Gl),Xm=function(e){var t=e.container();return Mn(t)&&(0===t.data.length||po(t.data)&&Gf.isBookmarkNode(t.parentNode))},Ym=function(t,n){return function(e){return U.from(Zc(t?0:-1,e)).filter(n).isSome()}},Gm=function(e){return Hn(e)&&"block"===tr(Rt.fromDom(e),"display")},Jm=function(e){return qn(e)&&!(Rn(t=e)&&"all"===t.getAttribute("data-mce-bogus"));var t},Qm=Ym(!0,Gm),Zm=Ym(!1,Gm),ep=Ym(!0,Wn),tp=Ym(!1,Wn),np=Ym(!0,Pn),rp=Ym(!1,Pn),op=Ym(!0,Jm),ip=Ym(!1,Jm),ap=function(e){var t=qu(e,"br"),n=H(function(e){for(var t=[],n=e.dom;n;)t.push(Rt.fromDom(n)),n=n.lastChild;return t}(e).slice(-1),ro);t.length===n.length&&Y(n,gn)},up=function(e){pn(e),dn(e,Rt.fromHtml('<br data-mce-bogus="1">'))},sp=function(n){en(n).each(function(t){Kt(t).each(function(e){to(n)&&ro(t)&&to(e)&&gn(t)})})},cp=function(e,t,n){return Lt(t,e)?function(e,t){for(var n=D(t)?t:b,r=e.dom,o=[];null!==r.parentNode&&r.parentNode!==undefined;){var i=r.parentNode,a=Rt.fromDom(i);if(o.push(a),!0===n(a))break;r=i}return o}(e,function(e){return n(e)||Bt(e,t)}).slice(0,-1):[]},lp=function(e,t){return cp(e,t,b)},fp=function(e,t){return[e].concat(lp(e,t))},dp=function(e,t,n){return Dl(e,t,n,Xm)},mp=function(e,t){return W(fp(Rt.fromDom(t.container()),e),to)},pp=function(e,n,r){return dp(e,n.dom,r).forall(function(t){return mp(n,r).fold(function(){return!1===Qc(t,r,n.dom)},function(e){return!1===Qc(t,r,n.dom)&&Lt(e,Rt.fromDom(t.container()))})})},gp=function(t,n,r){return mp(n,r).fold(function(){return dp(t,n.dom,r).forall(function(e){return!1===Qc(e,r,n.dom)})},function(e){return dp(t,e.dom,r).isNone()})},hp=N(gp,!1),vp=N(gp,!0),yp=N(pp,!1),bp=N(pp,!0),Cp=function(e){return ul(e).exists(ro)},wp=function(e,t,n){var r=H(fp(Rt.fromDom(n.container()),t),to),o=re(r).getOr(t);return Rl(e,o.dom,n).filter(Cp)},xp=function(e,t){return ul(t).exists(ro)||wp(!0,e,t).isSome()},Sp=function(e,t){return n=t,U.from(n.getNode(!0)).map(Rt.fromDom).exists(ro)||wp(!1,e,t).isSome();var n},Np=N(wp,!1),Ep=N(wp,!0),kp=function(e){return Is.isTextPosition(e)&&!e.isAtStart()&&!e.isAtEnd()},_p=function(e,t){var n=H(fp(Rt.fromDom(t.container()),e),to);return re(n).getOr(e)},Ap=function(e,t){return kp(t)?Km(t):Km(t)||Pl(_p(e,t).dom,t).exists(Km)},Rp=function(e,t){return kp(t)?Wm(t):Wm(t)||Bl(_p(e,t).dom,t).exists(Wm)},Tp=function(e){return ul(e).bind(function(e){return Dr(e,Ut)}).exists(function(e){return t=tr(e,"white-space"),M(["pre","pre-wrap"],t);var t})},Dp=function(e,t){return r=t,Pl(e.dom,r).isNone()||(n=t,Bl(e.dom,n).isNone())||hp(e,t)||vp(e,t)||Sp(e,t)||xp(e,t);var n,r},Op=function(e,t){return!Tp(t)&&(hp(e,t)||yp(e,t)||Sp(e,t)||Ap(e,t))},Bp=function(e,t){return!Tp(t)&&(vp(e,t)||bp(e,t)||xp(e,t)||Rp(e,t))},Pp=function(e,t){return Op(e,t)||Bp(e,(r=(n=t).container(),o=n.offset(),Mn(r)&&o<r.data.length?Is(r,o+1):n));var n,r,o},Lp=function(e,t){return Yl(e.charAt(t))},Ip=function(e){var t=e.container();return Mn(t)&&Ve(t.data,fo)},Mp=function(e){var n,t=e.data,r=(n=t.split(""),z(n,function(e,t){return Yl(e)&&0<t&&t<n.length-1&&Jl(n[t-1])&&Jl(n[t+1])?" ":e}).join(""));return r!==t&&(e.data=r,!0)},Fp=function(l,e){return U.some(e).filter(Ip).bind(function(e){var t,n,r,o,i,a,u,s,c=e.container();return(i=l,u=(a=c).data,s=Is(a,0),!(!Lp(u,0)||Pp(i,s)||(a.data=" "+u.slice(1),0))||Mp(c)||(t=l,r=(n=c).data,o=Is(n,r.length-1),!(!Lp(r,r.length-1)||Pp(t,o)||(n.data=r.slice(0,-1)+" ",0))))?U.some(e):U.none()})},Up=function(t){var e=Rt.fromDom(t.getBody());t.selection.isCollapsed()&&Fp(e,Is.fromRangeStart(t.selection.getRng())).each(function(e){t.selection.setRng(e.toRange())})},zp=function(e,t,n){var r,o,i,a,u,s,c,l;0!==n&&(r=Rt.fromDom(e),o=Tr(r,to).getOr(r),i=e.data.slice(t,t+n),a=t+n>=e.data.length&&Bp(o,Is(e,e.data.length)),u=0===t&&Op(o,Is(e,0)),e.replaceData(t,n,(c=u,l=a,$(s=i,function(e,t){return Gl(t)||Yl(t)?e.previousCharIsSpace||""===e.str&&c||e.str.length===s.length-1&&l?{previousCharIsSpace:!1,str:e.str+fo}:{previousCharIsSpace:!0,str:e.str+" "}:{previousCharIsSpace:!1,str:e.str+t}},{previousCharIsSpace:!1,str:""}).str)))},jp=function(e,t){var n=e.data.slice(t),r=n.length-Ke(n).length;return zp(e,t,r)},Hp=function(e,t){var n=e.data.slice(0,t),r=n.length-Xe(n).length;return zp(e,t-r,r)},Vp=function(e,t,n,r){void 0===r&&(r=!0);var o=Xe(e.data).length,i=r?e:t,a=r?t:e;return r?i.appendData(a.data):i.insertData(0,a.data),gn(Rt.fromDom(a)),n&&jp(i,o),i},qp=function(e,t){return r=e,o=(n=t).container(),i=n.offset(),!1===Is.isTextPosition(n)&&o===r.parentNode&&i>Is.before(r).offset()?Is(t.container(),t.offset()-1):t;var n,r,o,i},$p=function(e){return Io(e.previousSibling)?U.some((t=e.previousSibling,Mn(t)?Is(t,t.data.length):Is.after(t))):e.previousSibling?Il(e.previousSibling):U.none();var t},Wp=function(e){return Io(e.nextSibling)?U.some((t=e.nextSibling,Mn(t)?Is(t,0):Is.before(t))):e.nextSibling?Ll(e.nextSibling):U.none();var t},Kp=function(r,o){return $p(o).orThunk(function(){return Wp(o)}).orThunk(function(){return e=r,t=o,n=Is.before(t.previousSibling?t.previousSibling:t.parentNode),Pl(e,n).fold(function(){return Bl(e,Is.after(t))},U.some);var e,t,n})},Xp=function(n,r){return Wp(r).orThunk(function(){return $p(r)}).orThunk(function(){return t=r,Bl(e=n,Is.after(t)).fold(function(){return Pl(e,Is.before(t))},U.some);var e,t})},Yp=function(e,t,n){return(e?Xp:Kp)(t,n).map(N(qp,n))},Gp=function(t,n,e){e.fold(function(){t.focus()},function(e){t.selection.setRng(e.toRange(),n)})},Jp=function(e,t){return t&&ve(e.schema.getBlockElements(),It(t))},Qp=function(e){if(Wo(e)){var t=Rt.fromHtml('<br data-mce-bogus="1">');return pn(e),dn(e,t),U.some(Is.before(t.dom))}return U.none()},Zp=function(e,t,a){var n,r,o,i,u=Kt(e).filter(zt),s=Xt(e).filter(zt);return gn(e),r=s,o=t,i=function(e,t,n){var r=e.dom,o=t.dom,i=r.data.length;return Vp(r,o,a),n.container()===o?Is(r,i):n},((n=u).isSome()&&r.isSome()&&o.isSome()?U.some(i(n.getOrDie(),r.getOrDie(),o.getOrDie())):U.none()).orThunk(function(){return a&&(u.each(function(e){return Hp(e.dom,e.dom.length)}),s.each(function(e){return jp(e.dom,0)})),t})},eg=function(t,n,e,r){void 0===r&&(r=!0);var o,i,a=Yp(n,t.getBody(),e.dom),u=Tr(e,N(Jp,t),(o=t.getBody(),function(e){return e.dom===o})),s=Zp(e,a,(i=e,ve(t.schema.getTextInlineElements(),It(i))));t.dom.isEmpty(t.getBody())?(t.setContent(""),t.selection.setCursorLocation()):u.bind(Qp).fold(function(){r&&Gp(t,n,s)},function(e){r&&Gp(t,n,U.some(e))})},tg=function(e,t){return{start:e,end:t}},ng=wr([{removeTable:["element"]},{emptyCells:["cells"]},{deleteCellSelection:["rng","cell"]}]),rg=function(e,t){return Lr(Rt.fromDom(e),"td,th",t)},og=function(e,t){return Br(e,"table",t)},ig=function(e){return!Bt(e.start,e.end)},ag=function(e,t){return og(e.start,t).bind(function(r){return og(e.end,t).bind(function(e){return t=Bt(r,e),n=r,t?U.some(n):U.none();var t,n})})},ug=function(e){return qu(e,"td,th")},sg=function(r,e){var t=rg(e.startContainer,r),n=rg(e.endContainer,r);return e.collapsed?U.none():as(t,n,tg).fold(function(){return t.fold(function(){return n.bind(function(t){return og(t,r).bind(function(e){return re(ug(e)).map(function(e){return tg(e,t)})})})},function(t){return og(t,r).bind(function(e){return oe(ug(e)).map(function(e){return tg(t,e)})})})},function(e){return cg(r,e)?U.none():(n=r,og((t=e).start,n).bind(function(e){return oe(ug(e)).map(function(e){return tg(t.start,e)})}));var t,n})},cg=function(e,t){return ag(t,e).isSome()},lg=function(e,t,n){return e.filter(function(e){return ig(e)&&cg(n,e)}).orThunk(function(){return sg(n,t)}).bind(function(e){return ag(t=e,n).map(function(e){return{rng:t,table:e,cells:ug(e)}});var t})},fg=function(e,t){return G(e,function(e){return Bt(e,t)})},dg=function(e,r,o){return e.filter(function(e){return n=o,!ig(t=e)&&ag(t,n).exists(function(e){var t=e.dom.rows;return 1===t.length&&1===t[0].cells.length})&&Ff(e.start,r);var t,n}).map(function(e){return e.start})},mg=function(n){return as(fg((r=n).cells,r.rng.start),fg(r.cells,r.rng.end),function(e,t){return r.cells.slice(e,t+1)}).map(function(e){var t=n.cells;return e.length===t.length?ng.removeTable(n.table):ng.emptyCells(e)});var r},pg=function(e,t){var n,r,o,i,a,u=(n=e,function(e){return Bt(n,e)}),s=(o=u,i=rg((r=t).startContainer,o),a=rg(r.endContainer,o),as(i,a,tg));return dg(s,t,u).map(function(e){return ng.deleteCellSelection(t,e)}).orThunk(function(){return lg(s,t,u).bind(mg)})},gg=function(e){var t;return(8===Mt(t=e)||"#comment"===It(t)?Kt:en)(e).bind(gg).orThunk(function(){return U.some(e)})},hg=function(e,t){return Y(t,up),e.selection.setCursorLocation(t[0].dom,0),!0},vg=function(e,t,n){t.deleteContents();var r,o,i=gg(n).getOr(n),a=Rt.fromDom(e.dom.getParent(i.dom,e.dom.isBlock));return Wo(a)&&(up(a),e.selection.setCursorLocation(a.dom,0)),Bt(n,a)||(r=Wt(a).is(n)?[]:Wt(o=a).map(Jt).map(function(e){return H(e,function(e){return!Bt(o,e)})}).getOr([]),Y(r.concat(Jt(n)),function(e){Bt(e,a)||Lt(e,a)||gn(e)})),!0},yg=function(e,t){return eg(e,!1,t),!0},bg=function(n,e,r,t){return wg(e,t).fold(function(){return t=n,pg(e,r).map(function(e){return e.fold(N(yg,t),N(hg,t),N(vg,t))});var t},function(e){return xg(n,e)}).getOr(!1)},Cg=function(e,t){return W(fp(t,e),so)},wg=function(e,t){return W(fp(t,e),function(e){return"caption"===It(e)})},xg=function(e,t){return up(t),e.selection.setCursorLocation(t.dom,0),U.some(!0)},Sg=function(u,s,c,l,f){return Tl(c,u.getBody(),f).bind(function(e){return o=c,i=f,a=e,Ll((r=l).dom).bind(function(t){return Il(r.dom).map(function(e){return o?i.isEqual(t)&&a.isEqual(e):i.isEqual(e)&&a.isEqual(t)})}).getOr(!0)?xg(u,l):(t=l,n=e,wg(s,Rt.fromDom(n.getNode())).map(function(e){return!1===Bt(e,t)}));var t,n,r,o,i,a}).or(U.some(!0))},Ng=function(o,i,a,e){var u=Is.fromRangeStart(o.selection.getRng());return Cg(a,e).bind(function(e){return Wo(e)?xg(o,e):(t=a,n=e,r=u,Tl(i,o.getBody(),r).bind(function(e){return Cg(t,Rt.fromDom(e.getNode())).map(function(e){return!1===Bt(e,n)})}));var t,n,r}).getOr(!1)},Eg=function(e,t){return(e?np:rp)(t)},kg=function(a,u,r){var s=Rt.fromDom(a.getBody());return wg(s,r).fold(function(){return Ng(a,u,s,r)||(e=a,t=u,n=Is.fromRangeStart(e.selection.getRng()),Eg(t,n)||Rl(t,e.getBody(),n).exists(function(e){return Eg(t,e)}));var e,t,n},function(e){return t=a,n=u,r=s,o=e,i=Is.fromRangeStart(t.selection.getRng()),(Wo(o)?xg(t,o):Sg(t,r,n,o,i)).getOr(!1);var t,n,r,o,i})},_g=function(e,t){var n,r,o,i,a,u=Rt.fromDom(e.selection.getStart(!0)),s=Lf(e);return e.selection.isCollapsed()&&0===s.length?kg(e,t,u):(n=e,r=u,o=Rt.fromDom(n.getBody()),i=n.selection.getRng(),0!==(a=Lf(n)).length?hg(n,a):bg(n,o,i,r))},Ag=function(a){var u=Is.fromRangeStart(a),s=Is.fromRangeEnd(a),c=a.commonAncestorContainer;return Rl(!1,c,s).map(function(e){return!Qc(u,s,c)&&Qc(u,e,c)?(t=u.container(),n=u.offset(),r=e.container(),o=e.offset(),(i=document.createRange()).setStart(t,n),i.setEnd(r,o),i):a;var t,n,r,o,i}).getOr(a)},Rg=function(e){return e.collapsed?e:Ag(e)},Tg=function(e,t){var n,r;return e.getBlockElements()[t.name]&&((r=t).firstChild&&r.firstChild===r.lastChild)&&("br"===(n=t.firstChild).name||n.value===fo)},Dg=function(e,t){var n,r,o,i=t.firstChild,a=t.lastChild;return i&&"meta"===i.name&&(i=i.next),a&&"mce_marker"===a.attr("id")&&(a=a.prev),r=a,o=(n=e).getNonEmptyElements(),r&&(r.isEmpty(o)||Tg(n,r))&&(a=a.prev),!(!i||i!==a)&&("ul"===i.name||"ol"===i.name)},Og=function(e){return e&&e.firstChild&&e.firstChild===e.lastChild&&((t=e.firstChild).data===fo||jn(t));var t},Bg=function(e){return 0<e.length&&(!(t=e[e.length-1]).firstChild||Og(t))?e.slice(0,-1):e;var t},Pg=function(e,t){var n=e.getParent(t,e.isBlock);return n&&"LI"===n.nodeName?n:null},Lg=function(e,t){var n=Is.after(e),r=Nl(t).prev(n);return r?r.toRange():null},Ig=function(t,e,n){var r,o,i,a,u=t.parentNode;return _t.each(e,function(e){u.insertBefore(e,t)}),r=t,o=n,i=Is.before(r),(a=Nl(o).next(i))?a.toRange():null},Mg=function(e,o,i,t){var n,r,a,u,s,c,l,f,d,m,p,g,h,v,y,b,C,w,x,S,N=(n=o,r=t,c=e.serialize(r),l=n.createFragment(c),u=(a=l).firstChild,s=a.lastChild,u&&"META"===u.nodeName&&u.parentNode.removeChild(u),s&&"mce_marker"===s.id&&s.parentNode.removeChild(s),a),E=Pg(o,i.startContainer),k=Bg((f=N.firstChild,_t.grep(f.childNodes,function(e){return"LI"===e.nodeName}))),_=o.getRoot(),A=function(e){var t=Is.fromRangeStart(i),n=Nl(o.getRoot()),r=1===e?n.prev(t):n.next(t);return!r||Pg(o,r.getNode())!==E};return A(1)?Ig(E,k,_):A(2)?(d=E,m=k,p=_,o.insertAfter(m.reverse(),d),Lg(m[0],p)):(h=k,v=_,y=g=E,C=(b=i).cloneRange(),w=b.cloneRange(),C.setStartBefore(y),w.setEndAfter(y),x=[C.cloneContents(),w.cloneContents()],(S=g.parentNode).insertBefore(x[0],g),_t.each(h,function(e){S.insertBefore(e,g)}),S.insertBefore(x[1],g),S.removeChild(g),Lg(h[h.length-1],v))},Fg=$n,Ug=function(e){var t=e.dom,n=Rg(e.selection.getRng());e.selection.setRng(n);var r,o,i,a=t.getParent(n.startContainer,Fg);r=t,o=n,null!==(i=a)&&i===r.getParent(o.endContainer,Fg)&&Ff(Rt.fromDom(i),o)?vg(e,n,Rt.fromDom(a)):e.getDoc().execCommand("Delete",!1,null)},zg=function(e,t,n){var r,o,i,a,u,s,c,l,f,d=e.selection,m=e.dom;/^ | $/.test(t)&&(s=m,c=d.getRng(),l=t,f=Rt.fromDom(s.getRoot()),l=Op(f,Is.fromRangeStart(c))?l.replace(/^ /,"&nbsp;"):l.replace(/^&nbsp;/," "),t=l=Bp(f,Is.fromRangeEnd(c))?l.replace(/(&nbsp;| )(<br( \/)>)?$/,"&nbsp;"):l.replace(/&nbsp;(<br( \/)?>)?$/," "));var p=e.parser,g=n.merge,h=qm({validate:e.getParam("validate")},e.schema),v='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;</span>',y={content:t,format:"html",selection:!0,paste:n.paste};if((y=e.fire("BeforeSetContent",y)).isDefaultPrevented())e.fire("SetContent",{content:y.content,format:"html",selection:!0,paste:n.paste});else{-1===(t=y.content).indexOf("{$caret}")&&(t+="{$caret}"),t=t.replace(/\{\$caret\}/,v);var b,C,w=(a=d.getRng()).startContainer||(a.parentElement?a.parentElement():null),x=e.getBody();w===x&&d.isCollapsed()&&m.isBlock(x.firstChild)&&(b=e,(C=x.firstChild)&&!b.schema.getShortEndedElements()[C.nodeName])&&m.isEmpty(x.firstChild)&&((a=m.createRng()).setStart(x.firstChild,0),a.setEnd(x.firstChild,0),d.setRng(a)),d.isCollapsed()||Ug(e);var S,N,E,k,_,A,R,T,D,O,B,P,L,I,M={context:(r=d.getNode()).nodeName.toLowerCase(),data:n.data,insert:!0},F=p.parse(t,M);if(!0===n.paste&&Dg(e.schema,F)&&Pg(m,r))return a=Mg(h,m,d.getRng(),F),d.setRng(a),void e.fire("SetContent",y);if(!function(e){for(var t=e;t=t.walk();)1===t.type&&t.attr("data-mce-fragment","1")}(F),"mce_marker"===(u=F.lastChild).attr("id"))for(u=(i=u).prev;u;u=u.walk(!0))if(3===u.type||!m.isBlock(u.name)){e.schema.isValidChild(u.parent.name,"span")&&u.parent.insert(i,u,"br"===u.name);break}if(e._selectionOverrides.showBlockCaretContainer(r),M.invalid){for(e.selection.setContent(v),r=d.getNode(),o=e.getBody(),9===r.nodeType?r=u=o:u=r;u!==o;)u=(r=u).parentNode;t=r===o?o.innerHTML:m.getOuterHTML(r),t=h.serialize(p.parse(t.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return h.serialize(F)}))),r===o?m.setHTML(o,t):m.setOuterHTML(r,t)}else t=h.serialize(F),S=e,N=t,"all"===(E=r).getAttribute("data-mce-bogus")?E.parentNode.insertBefore(S.dom.createFragment(N),E):(k=E.firstChild,_=E.lastChild,!k||k===_&&"BR"===k.nodeName?S.dom.setHTML(E,N):S.selection.setContent(N));R=g,O=(A=e).schema.getTextInlineElements(),B=A.dom,R&&(T=A.getBody(),D=jm(B),_t.each(B.select("*[data-mce-fragment]"),function(e){for(var t=e.parentNode;t&&t!==T;t=t.parentNode)O[e.nodeName.toLowerCase()]&&D.compare(t,e)&&B.remove(e,!0)})),function(n,e){var t,r,o=n.dom,i=n.selection;if(e){i.scrollIntoView(e);var a=function(e){for(var t=n.getBody();e&&e!==t;e=e.parentNode)if("false"===o.getContentEditable(e))return e;return null}(e);if(a)return o.remove(e),i.select(a);var u=o.createRng(),s=e.previousSibling;s&&3===s.nodeType?(u.setStart(s,s.nodeValue.length),xt.ie||(r=e.nextSibling)&&3===r.nodeType&&(s.appendData(r.data),r.parentNode.removeChild(r))):(u.setStartBefore(e),u.setEndBefore(e));var c=o.getParent(e,o.isBlock);o.remove(e),c&&o.isEmpty(c)&&(n.$(c).empty(),u.setStart(c,0),u.setEnd(c,0),Fg(c)||c.getAttribute("data-mce-fragment")||!(t=function(e){var t=Is.fromRangeStart(e);if(t=Nl(n.getBody()).next(t))return t.toRange()}(u))?o.add(c,o.create("br",{"data-mce-bogus":"1"})):(u=t,o.remove(c))),i.setRng(u)}}(e,m.get("mce_marker")),P=e.getBody(),_t.each(P.getElementsByTagName("*"),function(e){e.removeAttribute("data-mce-fragment")}),L=m,I=d.getStart(),U.from(L.getParent(I,"td,th")).map(Rt.fromDom).each(sp),e.fire("SetContent",y),e.addVisual()}},jg=function(e,t){t(e),e.firstChild&&jg(e.firstChild,t),e.next&&jg(e.next,t)},Hg=function(e,t,n){var r=function(e,n,t){var r={},o={},i=[];for(var a in t.firstChild&&jg(t.firstChild,function(t){Y(e,function(e){e.name===t.name&&(r[e.name]?r[e.name].nodes.push(t):r[e.name]={filter:e,nodes:[t]})}),Y(n,function(e){"string"==typeof t.attr(e.name)&&(o[e.name]?o[e.name].nodes.push(t):o[e.name]={filter:e,nodes:[t]})})}),r)r.hasOwnProperty(a)&&i.push(r[a]);for(var u in o)o.hasOwnProperty(u)&&i.push(o[u]);return i}(e,t,n);Y(r,function(t){Y(t.filter.callbacks,function(e){e(t.nodes,t.filter.name,{})})})},Vg=function(e){return e instanceof Am},qg=function(e,t){var r;e.dom.setHTML(e.getBody(),t),vm(r=e)&&Ll(r.getBody()).each(function(e){var t=e.getNode(),n=Pn(t)?Ll(t).getOr(e):e;r.selection.setRng(n.toRange())})},$g=function(u,s,c){return c.format=c.format?c.format:"html",c.set=!0,c.content=Vg(s)?"":s,c.no_events||u.fire("BeforeSetContent",c),Vg(s)||(s=c.content),U.from(u.getBody()).fold(S(s),function(e){return Vg(s)?function(e,t,n,r){Hg(e.parser.getNodeFilters(),e.parser.getAttributeFilters(),n);var o=qm({validate:e.validate},e.schema).serialize(n);return r.content=co(Rt.fromDom(t))?o:_t.trim(o),qg(e,r.content),r.no_events||e.fire("SetContent",r),n}(u,e,s,c):(t=u,n=e,o=c,0===(r=s).length||/^\s+$/.test(r)?(a='<br data-mce-bogus="1">',"TABLE"===n.nodeName?r="<tr><td>"+a+"</td></tr>":/^(UL|OL)$/.test(n.nodeName)&&(r="<li>"+a+"</li>"),r=(i=lc(t))&&t.schema.isValidChild(n.nodeName.toLowerCase(),i.toLowerCase())?(r=a,t.dom.createHTML(i,fc(t),r)):r||'<br data-mce-bogus="1">',qg(t,r),t.fire("SetContent",o)):("raw"!==o.format&&(r=qm({validate:t.validate},t.schema).serialize(t.parser.parse(r,{isRootContent:!0,insert:!0}))),o.content=co(Rt.fromDom(n))?r:_t.trim(r),qg(t,o.content),o.no_events||t.fire("SetContent",o)),o.content);var t,n,r,o,i,a})},Wg=function(e,t){return r=t,((o=(n=e).dom).parentNode?Or(Rt.fromDom(o.parentNode),function(e){return!Bt(n,e)&&r(e)}):U.none()).isSome();var n,r,o},Kg=function(e){return D(e)?e:b},Xg=function(e,t,n){var r=t(e),o=Kg(n);return r.orThunk(function(){return o(e)?U.none():function(e,t,n){for(var r=e.dom,o=Kg(n);r.parentNode;){r=r.parentNode;var i=Rt.fromDom(r),a=t(i);if(a.isSome())return a;if(o(i))break}return U.none()}(e,t,o)})},Yg=af,Gg=function(e,t,n){var r=e.formatter.get(n);if(r)for(var o=0;o<r.length;o++)if(!1===r[o].inherit&&e.dom.is(t,r[o].selector))return!0;return!1},Jg=function(t,e,n,r){var o=t.dom.getRoot();return e!==o&&(e=t.dom.getParent(e,function(e){return!!Gg(t,e,n)||(e.parentNode===o||!!eh(t,e,n,r,!0))}),eh(t,e,n,r))},Qg=function(e,t,n){return!!Yg(t,n.inline)||(!!Yg(t,n.block)||(n.selector?1===t.nodeType&&e.is(t,n.selector):void 0))},Zg=function(e,t,n,r,o,i){var a,u,s,c=n[r];if(n.onmatch)return n.onmatch(t,n,r);if(c)if("undefined"==typeof c.length){for(a in c)if(c.hasOwnProperty(a)){if(u="attributes"===r?e.getAttrib(t,a):sf(e,t,a),o&&!u&&!n.exact)return;if((!o||n.exact)&&!Yg(u,uf(e,of(c[a],i),a)))return}}else for(s=0;s<c.length;s++)if("attributes"===r?e.getAttrib(t,c[s]):sf(e,t,c[s]))return n;return n},eh=function(e,t,n,r,o){var i,a,u,s,c=e.formatter.get(n),l=e.dom;if(c&&t)for(a=0;a<c.length;a++)if(i=c[a],Qg(e.dom,t,i)&&Zg(l,t,i,"attributes",o,r)&&Zg(l,t,i,"styles",o,r)){if(s=i.classes)for(u=0;u<s.length;u++)if(!e.dom.hasClass(t,s[u]))return;return i}},th=function(e,t,n,r){if(r)return Jg(e,r,t,n);if(r=e.selection.getNode(),Jg(e,r,t,n))return!0;var o=e.selection.getStart();return!(o===r||!Jg(e,o,t,n))},nh=function(r,t){var n=function(e){return Bt(e,Rt.fromDom(r.getBody()))};return U.from(r.selection.getStart(!0)).bind(function(e){return Xg(Rt.fromDom(e),function(n){return function(e,t){for(var n=0;n<e.length;n++){var r=t(e[n],n);if(r.isSome())return r}return U.none()}(t,function(e){return t=e,eh(r,n.dom,t)?U.some(t):U.none();var t})},n)}).getOrNull()},rh=function(o,i,e){return $(e,function(e,t){var n,r=(n=t,F(o.formatter.get(n),function(t){var n=function(e){return 1<e.length&&"%"===e.charAt(0)};return F(["styles","attributes"],function(e){return he(t,e).exists(function(e){var t=_(e)?e:ge(e);return F(t,n)})})}));return o.formatter.matchNode(i,t,{},r)?e.concat([t]):e},[])},oh=mo,ih="_mce_caret",ah=function(e){return 0<function(e){for(var t=[];e;){if(3===e.nodeType&&e.nodeValue!==oh||1<e.childNodes.length)return[];1===e.nodeType&&t.push(e),e=e.firstChild}return t}(e).length},uh=function(e){if(e){var t=new Yr(e,e);for(e=t.current();e;e=t.next())if(Mn(e))return e}return null},sh=function(e){var t=Rt.fromTag("span");return Gn(t,{id:ih,"data-mce-bogus":"1","data-mce-type":"format-caret"}),e&&dn(t,Rt.fromText(oh)),t},ch=function(e,t,n){void 0===n&&(n=!0);var r,o,i,a,u,s,c,l,f=e.dom,d=e.selection;ah(t)?eg(e,!1,Rt.fromDom(t),n):(r=d.getRng(),o=f.getParent(t,f.isBlock),i=r.startContainer,a=r.startOffset,u=r.endContainer,s=r.endOffset,(l=uh(t))&&l.nodeValue.charAt(0)===oh&&l.deleteData(0,1),c=l,f.remove(t,!0),i===c&&0<a&&r.setStart(c,a-1),u===c&&0<s&&r.setEnd(c,s-1),o&&f.isEmpty(o)&&up(Rt.fromDom(o)),d.setRng(r))},lh=function(e,t,n){void 0===n&&(n=!0);var r=e.dom,o=e.selection;if(t)ch(e,t,n);else if(!(t=Ul(e.getBody(),o.getStart())))for(;t=r.get(ih);)ch(e,t,!1)},fh=function(e,t){return e.appendChild(t),t},dh=function(e,t){var n=q(e,function(e,t){return fh(e,t.cloneNode(!1))},t);return fh(n,n.ownerDocument.createTextNode(oh))},mh=function(e,t,n,r){var o,i,a,u,s,c,l,f,d,m,p,g,h,v=e.dom,y=e.selection,b=[],C=y.getRng(),w=C.startContainer,x=C.startOffset,S=w;for(3===w.nodeType&&(x!==w.nodeValue.length&&(o=!0),S=S.parentNode);S;){if(eh(e,S,t,n,r)){i=S;break}S.nextSibling&&(o=!0),b.push(S),S=S.parentNode}i&&(o?(a=y.getBookmark(),C.collapse(!0),u=Rf(e,C,e.formatter.get(t),!0),u=md(u),e.formatter.remove(t,n,u,r),y.moveToBookmark(a)):(s=Ul(e.getBody(),i),c=sh(!1).dom,m=c,p=null!==s?s:i,g=(d=e).dom,(h=g.getParent(p,N(tf,d)))&&g.isEmpty(h)?p.parentNode.replaceChild(m,p):(ap(Rt.fromDom(p)),g.isEmpty(p)?p.parentNode.replaceChild(m,p):g.insertAfter(m,p)),l=function(t,e,n,r,o,i){var a=t.formatter,u=t.dom,s=H(ae(a.get()),function(e){return e!==r&&!Ve(e,"removeformat")}),c=rh(t,n,s);if(0<H(c,function(e){return!ff(t,e,r)}).length){var l=n.cloneNode(!1);return u.add(e,l),a.remove(r,o,l,i),u.remove(l),U.some(l)}return U.none()}(e,c,i,t,n,r),f=dh(b.concat(l.toArray()),c),ch(e,s,!1),y.setCursorLocation(f,1),v.isEmpty(i)&&v.remove(i)))},ph=function(i){i.on("mouseup keydown",function(e){var t,n,r,o;t=i,n=e.keyCode,r=t.selection,o=t.getBody(),lh(t,null,!1),8!==n&&46!==n||!r.isCollapsed()||r.getStart().innerHTML!==oh||lh(t,Ul(o,r.getStart())),37!==n&&39!==n||lh(t,Ul(o,r.getStart()))})},gh=function(e,t){return e.schema.getTextInlineElements().hasOwnProperty(It(t))&&!Fl(t.dom)&&!Bn(t.dom)},hh={},vh=xe,yh=Ce;Im=function(e){var t,n=e.selection.getRng(),r=Tn(["pre"]);n.collapsed||(t=e.selection.getSelectedBlocks(),yh(vh(vh(t,r),function(e){return r(e.previousSibling)&&-1!==Se(t,e.previousSibling)}),function(e){var t,n;t=e.previousSibling,gu(n=e).remove(),gu(t).append("<br><br>").append(n.childNodes)}))},hh[Lm="pre"]||(hh[Lm]=[]),hh[Lm].push(Im);var bh=_t.each,Ch=function(e){return Rn(e)&&!Xl(e)&&!Fl(e)&&!Bn(e)},wh=function(e,t){for(var n=e;n;n=n[t]){if(Mn(n)&&0!==n.nodeValue.length)return e;if(Rn(n)&&!Xl(n))return n}return e},xh=function(e,t,n){var r,o,i=jm(e);if(t&&n&&(t=wh(t,"previousSibling"),n=wh(n,"nextSibling"),i.compare(t,n))){for(r=t.nextSibling;r&&r!==n;)r=(o=r).nextSibling,t.appendChild(o);return e.remove(n),_t.each(_t.grep(n.childNodes),function(e){t.appendChild(e)}),t}return n},Sh=function(e,t,n,r){var o;r&&!1!==t.merge_siblings&&(o=xh(e,ef(r),r),xh(e,o,ef(o,!0)))},Nh=function(e,t,n){bh(e.childNodes,function(e){Ch(e)&&(t(e)&&n(e),e.hasChildNodes()&&Nh(e,t,n))})},Eh=function(t,n){return function(e){return!(!e||!sf(t,e,n))}},kh=function(r,o,i){return function(e){var t,n;r.setStyle(e,o,i),""===e.getAttribute("style")&&e.removeAttribute("style"),t=r,"SPAN"===(n=e).nodeName&&0===t.getAttribs(n).length&&t.remove(n,!0)}},_h=wr([{keep:[]},{rename:["name"]},{removed:[]}]),Ah=/^(src|href|style)$/,Rh=_t.each,Th=af,Dh=function(e,t,n){return e.isChildOf(t,n)&&t!==n&&!e.isBlock(n)},Oh=function(e,t,n){var r,o=t[n?"startContainer":"endContainer"],i=t[n?"startOffset":"endOffset"];return Rn(o)&&(r=o.childNodes.length-1,!n&&i&&i--,o=o.childNodes[r<i?r:i]),Mn(o)&&n&&i>=o.nodeValue.length&&(o=new Yr(o,e.getBody()).next()||o),Mn(o)&&!n&&0===i&&(o=new Yr(o,e.getBody()).prev()||o),o},Bh=function(e,t){var n=t?"firstChild":"lastChild";if(/^(TR|TH|TD)$/.test(e.nodeName)&&e[n]){var r=e[n];return"TR"===e.nodeName&&r[n]||r}return e},Ph=function(e,t,n,r){var o=e.create(n,r);return t.parentNode.insertBefore(o,t),o.appendChild(t),o},Lh=function(e,t,n,r,o){var i=Rt.fromDom(t),a=Rt.fromDom(e.create(r,o)),u=(n?Gt:Yt)(i);return mn(a,u),n?(cn(i,a),fn(a,i)):(ln(i,a),dn(a,i)),a.dom},Ih=function(e,t,n,r){return!(t=ef(t,n,r))||"BR"===t.nodeName||e.isBlock(t)},Mh=function(e,r,o,t,i){var n,a,u,s,c,l=e.dom;if(u=l,!(Th(s=t,(c=r).inline)||Th(s,c.block)||c.selector&&(Rn(s)&&u.is(s,c.selector))||(a=t,r.links&&"A"===a.nodeName)))return _h.keep();var f,d,m,p,g,h,v,y=t;if(r.inline&&"all"===r.remove&&_(r.preserve_attributes)){var b=H(l.getAttribs(y),function(e){return M(r.preserve_attributes,e.name.toLowerCase())});if(l.removeAllAttribs(y),Y(b,function(e){return l.setAttrib(y,e.name,e.value)}),0<b.length)return _h.rename("span")}if("all"!==r.remove){Rh(r.styles,function(e,t){e=uf(l,of(e,o),t+""),O(t)&&(t=e,i=null),!r.remove_similar&&i&&!Th(sf(l,i,t),e)||l.setStyle(y,t,""),n=!0}),n&&""===l.getAttrib(y,"style")&&(y.removeAttribute("style"),y.removeAttribute("data-mce-style")),Rh(r.attributes,function(e,t){var n;if(e=of(e,o),O(t)&&(t=e,i=null),r.remove_similar||!i||Th(l.getAttrib(i,t),e)){if("class"===t&&(e=l.getAttrib(y,t))&&(n="",Y(e.split(/\s+/),function(e){/mce\-\w+/.test(e)&&(n+=(n?" ":"")+e)}),n))return void l.setAttrib(y,t,n);"class"===t&&y.removeAttribute("className"),Ah.test(t)&&y.removeAttribute("data-mce-"+t),y.removeAttribute(t)}}),Rh(r.classes,function(e){e=of(e,o),i&&!l.hasClass(i,e)||l.removeClass(y,e)});for(var C=l.getAttribs(y),w=0;w<C.length;w++){var x=C[w].nodeName;if(0!==x.indexOf("_")&&0!==x.indexOf("data-"))return _h.keep()}}return"none"!==r.remove?(f=e,m=r,g=(d=y).parentNode,h=f.dom,v=lc(f),m.block&&(v?g===h.getRoot()&&(m.list_block&&Th(d,m.list_block)||Y(ie(d.childNodes),function(e){nf(f,v,e.nodeName.toLowerCase())?p?p.appendChild(e):(p=Ph(h,e,v),h.setAttribs(p,f.settings.forced_root_block_attrs)):p=0})):h.isBlock(d)&&!h.isBlock(g)&&(Ih(h,d,!1)||Ih(h,d.firstChild,!0,!0)||d.insertBefore(h.create("br"),d.firstChild),Ih(h,d,!0)||Ih(h,d.lastChild,!1,!0)||d.appendChild(h.create("br")))),m.selector&&m.inline&&!Th(m.inline,d)||h.remove(d,!0),_h.removed()):_h.keep()},Fh=function(t,e,n,r,o){return Mh(t,e,n,r,o).fold(b,function(e){return t.dom.rename(r,e),!0},w)},Uh=function(e,t,n,r,o,i,a,u){var s,c,l,f=e.dom;if(n){for(var d=n.parentNode,m=r.parentNode;m&&m!==d;m=m.parentNode){s=f.clone(m,!1);for(var p=0;p<t.length&&null!==(s=function(t,e,n,r){return Mh(t,e,n,r,r).fold(S(r),function(e){return t.dom.createFragment().appendChild(r),t.dom.rename(r,e)},S(null))}(e,t[p],u,s));p++);s&&(c&&s.appendChild(c),l=l||s,c=s)}!i||a.mixed&&f.isBlock(n)||(r=f.split(n,r)),c&&(o.parentNode.insertBefore(c,o),l.appendChild(o),a.inline&&Sh(f,a,0,c))}return r},zh=function(s,c,l,e,f){var t,d=s.formatter.get(c),m=d[0],i=!0,a=s.dom,n=s.selection,u=function(e){var n,t,r,o,i,a,u=(t=e,r=c,o=l,i=f,Y(lf((n=s).dom,t.parentNode).reverse(),function(e){var t;a||"_start"===e.id||"_end"===e.id||(t=eh(n,e,r,o,i))&&!1!==t.split&&(a=e)}),a);return Uh(s,d,u,e,e,!0,m,l)},p=function(e){var t,n;Rn(e)&&a.getContentEditable(e)&&(t=i,i="true"===a.getContentEditable(e),n=!0);var r=ie(e.childNodes);if(i&&!n)for(var o=0;o<d.length&&!Fh(s,d[o],l,e,e);o++);if(m.deep&&r.length){for(o=0;o<r.length;o++)p(r[o]);n&&(i=t)}},g=function(e){var t,n=a.get(e?"_start":"_end"),r=n[e?"firstChild":"lastChild"];return Xl(t=r)&&Rn(t)&&("_start"===t.id||"_end"===t.id)&&(r=r[e?"firstChild":"lastChild"]),Mn(r)&&0===r.data.length&&(r=e?n.previousSibling||n.nextSibling:n.nextSibling||n.previousSibling),a.remove(n,!0),r},r=function(e){var t,n,r=Rf(s,e,d,e.collapsed);if(m.split){if(r=md(r),(t=Oh(s,r,!0))!==(n=Oh(s,r))){if(t=Bh(t,!0),n=Bh(n,!1),Dh(a,t,n)){var o=U.from(t.firstChild).getOr(t);return u(Lh(a,o,!0,"span",{id:"_start","data-mce-type":"bookmark"})),void g(!0)}if(Dh(a,n,t)){o=U.from(n.lastChild).getOr(n);return u(Lh(a,o,!1,"span",{id:"_end","data-mce-type":"bookmark"})),void g(!1)}t=Ph(a,t,"span",{id:"_start","data-mce-type":"bookmark"}),n=Ph(a,n,"span",{id:"_end","data-mce-type":"bookmark"});var i=a.createRng();i.setStartAfter(t),i.setEndBefore(n),Df(a,i,function(e){Y(e,function(e){Xl(e)||Xl(e.parentNode)||u(e)})}),u(t),u(n),t=g(!0),n=g()}else t=n=u(t);r.startContainer=t.parentNode?t.parentNode:t,r.startOffset=a.nodeIndex(t),r.endContainer=n.parentNode?n.parentNode:n,r.endOffset=a.nodeIndex(n)+1}Df(a,r,function(e){Y(e,function(t){p(t);Y(["underline","line-through","overline"],function(e){Rn(t)&&s.dom.getStyle(t,"text-decoration")===e&&t.parentNode&&cf(a,t.parentNode)===e&&Fh(s,{deep:!1,exact:!0,inline:"span",styles:{textDecoration:e}},null,t)})})})};if(e)Ql(e)?((t=a.createRng()).setStartBefore(e),t.setEndAfter(e),r(t)):r(e);else if("false"!==a.getContentEditable(n.getNode()))n.isCollapsed()&&m.inline&&!Lf(s).length?mh(s,c,l,f):(Hf(n,!0,function(){jf(s,r)}),m.inline&&th(s,c,l,n.getStart())&&Zl(a,n,n.getRng()),s.nodeChanged());else{e=n.getNode();for(var o=0;o<d.length&&(!d[o].ceFalseOverride||!Fh(s,d[o],l,e,e));o++);}},jh=_t.each,Hh=function(i,e,a,u){jh(e,function(t){var r,e,n,o;jh(i.dom.select(t.inline,u),function(e){Ch(e)&&Fh(i,t,a,e,t.exact?e:null)}),r=i.dom,n=u,(e=t).clear_child_styles&&(o=e.links?"*:not(a)":"*",bh(r.select(o,n),function(n){Ch(n)&&bh(e.styles,function(e,t){r.setStyle(n,t,"")})}))})},Vh=_t.each,qh=ye,$h=function(E,k,_,r){var e,t,n,o,A=E.formatter.get(k),R=A[0],i=!r&&E.selection.isCollapsed(),a=E.dom,u=E.selection,T=function(n,e){var t;e=e||R,n&&(e.onformat&&e.onformat(n,e,_,r),Vh(e.styles,function(e,t){a.setStyle(n,t,of(e,_))}),!e.styles||(t=a.getAttrib(n,"style"))&&a.setAttrib(n,"data-mce-style",t),Vh(e.attributes,function(e,t){a.setAttrib(n,t,of(e,_))}),Vh(e.classes,function(e){e=of(e,_),a.hasClass(n,e)||a.addClass(n,e)}))},m=function(e,t){var n=!1;return!!mf(R)&&(Vh(e,function(e){if(!("collapsed"in e&&e.collapsed!==i))return a.is(t,e.selector)&&!Fl(t)?(T(t,e),!(n=!0)):void 0}),n)},s=function(S,e,t,c){var N=[],l=!0,f=R.inline||R.block,d=S.create(f);T(d),Df(S,e,function(e){var u,s=function(e){var t=!1,n=l,r=e.nodeName.toLowerCase(),o=e.parentNode.nodeName.toLowerCase();if(Rn(e)&&S.getContentEditable(e)&&(n=l,l="true"===S.getContentEditable(e),t=!0),jn(e)&&!function(e,t,n,r){if(e.getParam("format_empty_lines",!1,"boolean")&&pf(t)){var o=_e(_e({},e.schema.getTextBlockElements()),{td:{},th:{},li:{},dt:{},dd:{},figcaption:{},caption:{},details:{},summary:{}}),i=Wg(Rt.fromDom(n),function(e){return Fl(e.dom)});return ye(o,r)&&Wo(Rt.fromDom(n.parentNode),!1)&&!i}return!1}(E,R,e,o))return u=null,void(df(R)&&S.remove(e));if(R.wrapper&&eh(E,e,k,_))u=null;else{if(l&&!t&&df(R)&&!R.wrapper&&tf(E,r)&&nf(E,o,f)){var i=S.rename(e,f);return T(i),N.push(i),void(u=null)}if(mf(R)){var a=m(A,e);if(!qh(R,"inline")||a)return void(u=null)}!l||t||!nf(E,f,r)||!nf(E,o,f)||!c&&3===e.nodeType&&1===e.nodeValue.length&&65279===e.nodeValue.charCodeAt(0)||Fl(e)||qh(R,"inline")&&S.isBlock(e)?(u=null,Vh(_t.grep(e.childNodes),s),t&&(l=n),u=null):(u||(u=S.clone(d,!1),e.parentNode.insertBefore(u,e),N.push(u)),u.appendChild(e))}};Vh(e,s)}),!0===R.links&&Vh(N,function(e){var t=function(e){"A"===e.nodeName&&T(e,R),Vh(_t.grep(e.childNodes),t)};t(e)}),Vh(N,function(e){var n,t,r,o,i,a,u,s,c,l,f,d,m,p,g,h,v,y,b,C,w=function(e){var n=!1;return Vh(e.childNodes,function(e){if((t=e)&&1===t.nodeType&&!Xl(t)&&!Fl(t)&&!Bn(t))return n=e,!1;var t}),n},x=(n=0,Vh(e.childNodes,function(e){var t;V(t=e)&&Mn(t)&&0===t.length||Xl(e)||n++}),n);!(1<N.length)&&S.isBlock(e)||0!==x?(pf(R)||R.wrapper)&&(R.exact||1!==x||((C=w(y=e))&&!Xl(C)&&Qg(S,C,R)&&(b=S.clone(C,!1),T(b),S.replace(b,y,!0),S.remove(C,!0)),e=b||y),Hh(E,A,_,e),p=R,g=k,h=_,eh(m=E,(v=e).parentNode,g,h)&&Fh(m,p,h,v)||p.merge_with_parents&&m.dom.getParent(v.parentNode,function(e){if(eh(m,e,g,h))return Fh(m,p,h,v),!0}),c=S,f=_,d=e,(l=R).styles&&l.styles.backgroundColor&&Nh(d,Eh(c,"fontSize"),kh(c,"backgroundColor",of(l.styles.backgroundColor,f))),i=S,u=e,s=function(e){var t;1===e.nodeType&&e.parentNode&&1===e.parentNode.nodeType&&(t=cf(i,e.parentNode),i.getStyle(e,"color")&&t?i.setStyle(e,"text-decoration",t):i.getStyle(e,"text-decoration")===t&&i.setStyle(e,"text-decoration",null))},(a=R).styles&&(a.styles.color||a.styles.textDecoration)&&(_t.walk(u,s,"childNodes"),s(u)),t=S,o=e,"sub"!==(r=R).inline&&"sup"!==r.inline||(Nh(o,Eh(t,"fontSize"),kh(t,"fontSize","")),t.remove(t.select("sup"===r.inline?"sub":"sup",o),!0)),Sh(S,R,0,e)):S.remove(e,!0)})};if("false"!==a.getContentEditable(u.getNode())){R&&(r?Ql(r)?m(A,r)||((e=a.createRng()).setStartBefore(r),e.setEndAfter(r),s(a,Rf(E,e,A),0,!0)):s(a,r,0,!0):i&&pf(R)&&!Lf(E).length?function(e,t,n){var r,o=e.selection,i=o.getRng(),a=i.startOffset,u=i.startContainer.nodeValue,s=Ul(e.getBody(),o.getStart());s&&(r=uh(s));var c,l,f,d,m=/[^\s\u00a0\u00ad\u200b\ufeff]/;u&&0<a&&a<u.length&&m.test(u.charAt(a))&&m.test(u.charAt(a-1))?(c=o.getBookmark(),i.collapse(!0),l=Rf(e,i,e.formatter.get(t)),l=md(l),e.formatter.apply(t,n,l),o.moveToBookmark(c)):(s&&r.nodeValue===oh||(f=e.getDoc(),d=sh(!0).dom,r=(s=f.importNode(d,!0)).firstChild,i.insertNode(s),a=1),e.formatter.apply(t,n,s),o.setCursorLocation(r,a))}(E,k,_):(t=u.getNode(),n=A[0],E.settings.forced_root_block||!n.defaultBlock||a.getParent(t,a.isBlock)||$h(E,n.defaultBlock),u.setRng(Rg(u.getRng())),Hf(u,!0,function(e){jf(E,function(e,t){var n=t?e:Rf(E,e,A);s(a,n)})}),Zl(a,u,u.getRng()),E.nodeChanged()),o=E,yh(hh[k],function(e){e(o)}))}else{r=u.getNode();for(var c=0,l=A.length;c<l;c++){var f=A[c];if(f.ceFalseOverride&&mf(f)&&a.is(r,f.selector))return void T(r,f)}}},Wh=function(r,e,t,n){var o=ae(t.get()),i={},a={},u=H(lf(r.dom,e),function(e){return 1===e.nodeType&&!e.getAttribute("data-mce-bogus")});se(n,function(e,n){_t.each(u,function(t){return r.formatter.matchNode(t,n,{},e.similar)?(-1===o.indexOf(n)&&(Y(e.callbacks,function(e){e(!0,{node:t,format:n,parents:u})}),i[n]=e.callbacks),a[n]=e.callbacks,!1):!Gg(r,t,n)&&void 0})});var s=Kh(t.get(),a,e,u);t.set(_e(_e({},i),s))},Kh=function(e,n,r,o){return me(e,function(e,t){return!!ve(n,t)||(Y(e,function(e){e(!1,{node:r,format:t,parents:o})}),!1)}).t},Xh=function(e,o,i,a,t){var n,r,u,s,c,l,f,d;return null===o.get()&&(r=e,u=Au({}),(n=o).set({}),r.on("NodeChange",function(e){Wh(r,e.element,u,n.get())})),c=i,l=a,f=t,d=(s=o).get(),Y(c.split(","),function(e){d[e]||(d[e]={similar:f,callbacks:[]}),d[e].callbacks.push(l)}),s.set(d),{unbind:function(){return t=i,n=a,r=(e=o).get(),Y(t.split(","),function(e){r[e].callbacks=H(r[e].callbacks,function(e){return e!==n}),0===r[e].callbacks.length&&delete r[e]}),void e.set(r);var e,t,n,r}}},Yh=function(e,t){var n=(t||document).createDocumentFragment();return Y(e,function(e){n.appendChild(e.dom)}),Rt.fromDom(n)},Gh=function(e,t,n){return{element:e,width:t,rows:n}},Jh=function(e,t){return{element:e,cells:t}},Qh=function(e,t){var n=parseInt(Jn(e,t),10);return isNaN(n)?1:n},Zh=function(e){return $(e,function(e,t){return t.cells.length>e?t.cells.length:e},0)},ev=function(e,t){for(var n=e.rows,r=0;r<n.length;r++)for(var o=n[r].cells,i=0;i<o.length;i++)if(Bt(o[i],t))return U.some({x:i,y:r});return U.none()},tv=function(e,t,n,r,o){for(var i=[],a=e.rows,u=n;u<=o;u++){var s=a[u].cells,c=t<r?s.slice(t,r+1):s.slice(r,t+1);i.push(Jh(a[u].element,c))}return i},nv=function(e){var o=Gh(ns(e),0,[]);return Y(qu(e,"tr"),function(n,r){Y(qu(n,"td,th"),function(e,t){!function(e,t,n,r,o){for(var i=Qh(o,"rowspan"),a=Qh(o,"colspan"),u=e.rows,s=n;s<n+i;s++){u[s]||(u[s]=Jh(rs(r),[]));for(var c=t;c<t+a;c++){u[s].cells[c]=s===n&&c===t?o:ns(o)}}}(o,function(e,t,n){for(;r=t,o=n,((i=e.rows)[o]?i[o].cells:[])[r];)t++;var r,o,i;return t}(o,t,r),r,n,e)})}),Gh(o.element,Zh(o.rows),o.rows)},rv=function(e){return n=z((t=e).rows,function(e){var t=z(e.cells,function(e){var t=rs(e);return Zn(t,"colspan"),Zn(t,"rowspan"),t}),n=ns(e.element);return mn(n,t),n}),r=ns(t.element),o=Rt.fromTag("tbody"),mn(o,n),dn(r,o),r;var t,n,r,o},ov=function(l,e,t){return ev(l,e).bind(function(c){return ev(l,t).map(function(e){return t=l,r=e,o=(n=c).x,i=n.y,a=r.x,u=r.y,s=i<u?tv(t,o,i,a,u):tv(t,o,u,a,i),Gh(t.element,Zh(s),s);var t,n,r,o,i,a,u,s})})},iv=function(t,n){return W(t,function(e){return"li"===It(e)&&Ff(e,n)}).fold(S([]),function(e){return W(t,function(e){return"ul"===It(e)||"ol"===It(e)}).map(function(e){var t=Rt.fromTag(It(e)),n=pe(or(e),function(e,t){return qe(t,"list-style")});return er(t,n),[Rt.fromTag("li"),t]}).getOr([])})},av=function(e,t){var n,r=Rt.fromDom(t.commonAncestorContainer),o=fp(r,e),i=H(o,function(e){return no(e)||eo(e)}),a=iv(o,t),u=i.concat(a.length?a:ao(n=r)?Wt(n).filter(io).fold(S([]),function(e){return[n,e]}):io(n)?[n]:[]);return z(u,ns)},uv=function(){return Yh([])},sv=function(e,t){return n=Rt.fromDom(t.cloneContents()),r=av(e,t),o=$(r,function(e,t){return dn(t,e),t},n),0<r.length?Yh([o]):o;var n,r,o},cv=function(e,o){return t=e,n=o[0],Br(n,"table",N(Bt,t)).bind(function(e){var t=o[0],n=o[o.length-1],r=nv(e);return ov(r,t,n).map(function(e){return Yh([rv(e)])})}).getOrThunk(uv);var t,n},lv=function(e,t){var n,r,o=Pf(t,e);return 0<o.length?cv(e,o):(n=e,0<(r=t).length&&r[0].collapsed?uv():sv(n,r[0]))},fv=function(e,t){return 0<=t&&t<e.length&&Gl(e.charAt(t))},dv=function(e,t){var n=go(e.innerText);return t?n.replace(/^[ \f\n\r\t\v]+/,""):n},mv=function(f){return U.from(f.selection.getRng()).map(function(e){var t=U.from(f.dom.getParent(e.commonAncestorContainer,f.dom.isBlock)),n=f.getBody(),r=t.map(function(e){return e.nodeName}).getOr("div").toLowerCase(),o=xt.browser.isIE()&&"pre"!==r,i=f.dom.add(n,r,{"data-mce-bogus":"all",style:"overflow: hidden; opacity: 0;"},e.cloneContents()),a=dv(i,o),u=go(i.textContent);if(f.dom.remove(i),fv(u,0)||fv(u,u.length-1)){var s=t.getOr(n),c=dv(s,o),l=c.indexOf(a);return-1===l?a:(fv(c,l-1)?" ":"")+a+(fv(c,l+a.length)?" ":"")}return a}).getOr("")},pv=function(e,t,n){if(void 0===n&&(n={}),n.get=!0,n.format=t,n.selection=!0,(n=e.fire("BeforeGetContent",n)).isDefaultPrevented())return e.fire("GetContent",n),n.content;if("text"===n.format)return mv(e);n.getInner=!0;var r,o,i,a,u,s,c,l=(o=n,i=(r=e).selection.getRng(),a=r.dom.create("body"),u=r.selection.getSel(),s=Nm(r,Of(u)),(c=o.contextual?lv(Rt.fromDom(r.getBody()),s).dom:i.cloneContents())&&a.appendChild(c),r.selection.serializer.serialize(a,o));return"tree"===n.format?l:(n.content=e.selection.isCollapsed()?"":l,e.fire("GetContent",n),n.content)},gv=function(e){return Rn(e)?e.outerHTML:Mn(e)?li.encodeRaw(e.data,!1):Fn(e)?"\x3c!--"+e.data+"--\x3e":""},hv=function(e,t,n){var r,o=function(e){var t,n=document.createElement("div"),r=document.createDocumentFragment();for(e&&(n.innerHTML=e);t=n.firstChild;)r.appendChild(t);return r}(t);e.hasChildNodes()&&n<e.childNodes.length?(r=e.childNodes[n]).parentNode.insertBefore(o,r):e.appendChild(o)},vv=function(e,o){var i=0;Y(e,function(e){var t,n,r;0===e[0]?i++:1===e[0]?(hv(o,e[1],i),i++):2===e[0]&&(n=i,(t=o).hasChildNodes()&&n<t.childNodes.length&&(r=t.childNodes[n]).parentNode.removeChild(r))})},yv=function(e,t){var p,g,n,h,v,c,y,l,r,o=z(ie(t.childNodes),gv);return vv((g=e,n=(p=o).length+g.length+2,h=new Array(n),v=new Array(n),c=function(e,t,n,r,o){var i=l(e,t,n,r);if(null===i||i.start===t&&i.diag===t-r||i.end===e&&i.diag===e-n)for(var a=e,u=n;a<t||u<r;)a<t&&u<r&&p[a]===g[u]?(o.push([0,p[a]]),++a,++u):r-n<t-e?(o.push([2,p[a]]),++a):(o.push([1,g[u]]),++u);else{c(e,i.start,n,i.start-i.diag,o);for(var s=i.start;s<i.end;++s)o.push([0,p[s]]);c(i.end,t,i.end-i.diag,r,o)}},y=function(e,t,n,r){for(var o=e;o-t<r&&o<n&&p[o]===g[o-t];)++o;return{start:e,end:o,diag:t}},l=function(e,t,n,r){var o=t-e,i=r-n;if(0==o||0==i)return null;var a,u,s,c,l,f=o-i,d=i+o,m=(d%2==0?d:1+d)/2;for(h[1+m]=e,v[1+m]=t+1,a=0;a<=m;++a){for(u=-a;u<=a;u+=2){for(s=u+m,u===-a||u!==a&&h[s-1]<h[s+1]?h[s]=h[s+1]:h[s]=h[s-1]+1,l=(c=h[s])-e+n-u;c<t&&l<r&&p[c]===g[l];)h[s]=++c,++l;if(f%2!=0&&f-a<=u&&u<=f+a&&v[s-f]<=h[s])return y(v[s-f],u+e-n,t,r)}for(u=f-a;u<=f+a;u+=2){for(s=u+m-f,u===f-a||u!==f+a&&v[s+1]<=v[s-1]?v[s]=v[s+1]-1:v[s]=v[s-1],l=(c=v[s]-1)-e+n-u;e<=c&&n<=l&&p[c]===g[l];)v[s]=c--,l--;if(f%2==0&&-a<=u&&u<=a&&v[s]<=h[s+f])return y(v[s],u+e-n,t,r)}}},r=[],c(0,p.length,0,g.length,r),r),t),t},bv=Au(U.none()),Cv=function(n){var e,t=(e=n.getBody(),H(z(ie(e.childNodes),gv),function(e){return 0<e.length})),r=J(t,function(e){var t=Mm(n.serializer,e);return 0<t.length?[t]:[]}),o=r.join("");return-1!==o.indexOf("</iframe>")?{type:"fragmented",fragments:r,content:"",bookmark:null,beforeBookmark:null}:{type:"complete",fragments:null,content:o,bookmark:null,beforeBookmark:null}},wv=function(e,t,n){"fragmented"===t.type?yv(t.fragments,e.getBody()):e.setContent(t.content,{format:"raw"}),e.selection.moveToBookmark(n?t.beforeBookmark:t.bookmark)},xv=function(e){return"fragmented"===e.type?e.fragments.join(""):e.content},Sv=function(e){var t=Rt.fromTag("body",bv.get().getOrThunk(function(){var e=document.implementation.createHTMLDocument("undo");return bv.set(U.some(e)),e}));return es(t,xv(e)),Y(qu(t,"*[data-mce-bogus]"),hn),t.dom.innerHTML},Nv=function(e,t){return!(!e||!t)&&(r=t,xv(e)===xv(r)||(n=t,Sv(e)===Sv(n)));var n,r},Ev=function(e){return 0===e.get()},kv=function(e,t,n){Ev(n)&&(e.typing=t)},_v=function(e,t){e.typing&&(kv(e,!1,t),e.add())},Av=function(f){return{undoManager:{beforeChange:function(e,t){return n=f,r=t,void(Ev(e)&&r.set(U.some(ac(n.selection))));var n,r},addUndoLevel:function(e,t,n,r,o,i){return function(e,t,n,r,o,i,a){var u=Cv(e);if(i=i||{},i=_t.extend(i,u),!1===Ev(r)||e.removed)return null;var s=t.data[n.get()];if(e.fire("BeforeAddUndo",{level:i,lastLevel:s,originalEvent:a}).isDefaultPrevented())return null;if(s&&Nv(s,i))return null;t.data[n.get()]&&o.get().each(function(e){t.data[n.get()].beforeBookmark=e});var c=e.getParam("custom_undo_redo_levels",0,"number");if(c&&t.data.length>c){for(var l=0;l<t.data.length-1;l++)t.data[l]=t.data[l+1];t.data.length--,n.set(t.data.length)}i.bookmark=ac(e.selection),n.get()<t.data.length-1&&(t.data.length=n.get()+1),t.data.push(i),n.set(t.data.length-1);var f={level:i,lastLevel:s,originalEvent:a};return 0<n.get()?(e.setDirty(!0),e.fire("AddUndo",f),e.fire("change",f)):e.fire("AddUndo",f),i}(f,e,t,n,r,o,i)},undo:function(e,t,n){return r=f,i=t,a=n,(o=e).typing&&(o.add(),o.typing=!1,kv(o,!1,i)),0<a.get()&&(a.set(a.get()-1),u=o.data[a.get()],wv(r,u,!0),r.setDirty(!0),r.fire("Undo",{level:u})),u;var r,o,i,a,u},redo:function(e,t){return n=f,o=t,(r=e).get()<o.length-1&&(r.set(r.get()+1),i=o[r.get()],wv(n,i,!1),n.setDirty(!0),n.fire("Redo",{level:i})),i;var n,r,o,i},clear:function(e,t){return n=f,o=t,(r=e).data=[],o.set(0),r.typing=!1,void n.fire("ClearUndos");var n,r,o},reset:function(e){return(t=e).clear(),void t.add();var t},hasUndo:function(e,t){return n=f,r=e,0<t.get()||r.typing&&r.data[0]&&!Nv(Cv(n),r.data[0]);var n,r},hasRedo:function(e,t){return n=e,t.get()<n.data.length-1&&!n.typing;var n},transact:function(e,t,n){return o=n,_v(r=e,t),r.beforeChange(),r.ignore(o),r.add();var r,o},ignore:function(e,t){try{e.set(e.get()+1),t()}finally{e.set(e.get()-1)}},extra:function(e,t,n,r){return o=f,a=t,u=n,s=r,void((i=e).transact(u)&&(c=i.data[a.get()].bookmark,l=i.data[a.get()-1],wv(o,l,!0),i.transact(s)&&(i.data[a.get()-1].beforeBookmark=c)));var o,i,a,u,s,c,l}},formatter:{match:function(e,t,n){return th(f,e,t,n)},matchAll:function(e,t){return o=e,i=t,a=[],u={},n=(r=f).selection.getStart(),r.dom.getParent(n,function(e){for(var t=0;t<o.length;t++){var n=o[t];!u[n]&&eh(r,e,n,i)&&(u[n]=!0,a.push(n))}},r.dom.getRoot()),a;var r,o,i,a,u,n},matchNode:function(e,t,n,r){return eh(f,e,t,n,r)},canApply:function(e){return function(e,t){var n,r,o,i,a,u=e.formatter.get(t),s=e.dom;if(u)for(n=e.selection.getStart(),r=lf(s,n),i=u.length-1;0<=i;i--){if(!(a=u[i].selector)||u[i].defaultBlock)return!0;for(o=r.length-1;0<=o;o--)if(s.is(r[o],a))return!0}return!1}(f,e)},closest:function(e){return nh(f,e)},apply:function(e,t,n){return $h(f,e,t,n)},remove:function(e,t,n,r){return zh(f,e,t,n,r)},toggle:function(e,t,n){return o=e,i=t,a=n,u=(r=f).formatter.get(o),void(!th(r,o,i,a)||"toggle"in u[0]&&!u[0].toggle?$h:zh)(r,o,i,a);var r,o,i,a,u},formatChanged:function(e,t,n,r){return Xh(f,e,t,n,r)}},editor:{getContent:function(e,t){return n=f,r=e,o=t,U.from(n.getBody()).fold(S("tree"===r.format?new Am("body",11):""),function(e){return Um(n,r,o,e)});var n,r,o},setContent:function(e,t){return $g(f,e,t)},insertContent:function(e,t){return zg(f,e,t)},addVisual:function(e){return t=e,a=(i=f).dom,n=V(t)?t:i.getBody(),T(i.hasVisual)&&(i.hasVisual=i.getParam("visual",!0,"boolean")),Y(a.select("table,a",n),function(e){switch(e.nodeName){case"TABLE":var t=i.getParam("visual_table_class","mce-item-table","string"),n=a.getAttrib(e,"border");n&&"0"!==n||!i.hasVisual?a.removeClass(e,t):a.addClass(e,t);break;case"A":var r,o;a.getAttrib(e,"href")||(r=a.getAttrib(e,"name")||e.id,o=i.getParam("visual_anchor_class","mce-item-anchor","string"),r&&i.hasVisual?a.addClass(e,o):a.removeClass(e,o))}}),void i.fire("VisualAid",{element:t,hasVisual:i.hasVisual});var i,t,a,n}},selection:{getContent:function(e,t){return pv(f,e,t)}},raw:{getModel:function(){return U.none()}}}},Rv=function(e){return ve(e.plugins,"rtc")},Tv=function(e){var c=e;return he(e.plugins,"rtc").fold(function(){return c.rtcInstance=Av(e),U.none()},function(e){return U.some(e.setup().then(function(e){var t,o,n,i,a,r,u,s;return c.rtcInstance=(o=function(e){return k(e)?e:{}},n=m("Unimplemented feature for rtc"),i=(t=e).undoManager,a=t.formatter,r=t.editor,u=t.selection,s=t.raw,{undoManager:{beforeChange:te,addUndoLevel:n,undo:function(){return i.undo()},redo:function(){return i.redo()},clear:function(){return i.clear()},reset:function(){return i.reset()},hasUndo:function(){return i.hasUndo()},hasRedo:function(){return i.hasRedo()},transact:function(e,t,n){return i.transact(n)},ignore:function(e,t){return i.ignore(t)},extra:function(e,t,n,r){return i.extra(n,r)}},formatter:{match:function(e,t,n){return a.match(e,o(t))},matchAll:n,matchNode:n,canApply:function(e){return a.canApply(e)},closest:function(e){return a.closest(e)},apply:function(e,t,n){return a.apply(e,o(t))},remove:function(e,t,n,r){return a.remove(e,o(t))},toggle:function(e,t,n){return a.toggle(e,o(t))},formatChanged:function(e,t,n,r){return a.formatChanged(t,n,r)}},editor:{getContent:function(e,t){return r.getContent(e)},setContent:function(e,t){return r.setContent(e,t)},insertContent:function(e,t){return r.insertContent(e)},addVisual:te},selection:{getContent:function(e,t){return u.getContent(t)}},raw:{getModel:function(){return U.some(s.getRawModel())}}}),e.rtc.isRemote},function(e){var t,n;return c.rtcInstance=(t=S(null),n=S(""),{undoManager:{beforeChange:te,addUndoLevel:t,undo:t,redo:t,clear:te,reset:te,hasUndo:b,hasRedo:b,transact:t,ignore:te,extra:te},formatter:{match:b,matchAll:S([]),matchNode:b,canApply:b,closest:n,apply:te,remove:te,toggle:te,formatChanged:S({unbind:te})},editor:{getContent:n,setContent:n,insertContent:te,addVisual:te},selection:{getContent:n},raw:{getModel:S(U.none())}}),Ir.reject(e)}))})},Dv=function(e){return e.rtcInstance?e.rtcInstance:Av(e)},Ov=function(e){var t=e.rtcInstance;if(t)return t;throw new Error("Failed to get RTC instance not yet initialized.")},Bv=function(e,t){void 0===t&&(t={});var n,r,o=t.format?t.format:"html";return n=o,r=t,Ov(e).selection.getContent(n,r)},Pv=function(e){return 0===e.dom.length?(gn(e),U.none()):U.some(e)},Lv=function(e,t,s,c){e.bind(function(u){return(c?Hp:jp)(u.dom,c?u.dom.length:0),t.filter(zt).map(function(e){return t=e,n=s,r=c,o=u.dom,i=t.dom,a=r?o.length:i.length,void(r?(Vp(o,i,!1,!r),n.setStart(i,a)):(Vp(i,o,!1,!r),n.setEnd(i,a)));var t,n,r,o,i,a})}).orThunk(function(){var e;return(e=c,t.filter(function(e){return Gf.isBookmarkNode(e.dom)}).bind(e?Xt:Kt).or(t).filter(zt)).map(function(e){return r=c,void Wt(n=e).each(function(e){var t=n.dom;r&&Op(e,Is(t,0))?jp(t,0):!r&&Bp(e,Is(t,t.length))&&Hp(t,t.length)});var n,r})})},Iv=function(e,t,n){void 0===n&&(n={});var r,o,i=(r=t,_e(_e({format:"html"},n),{set:!0,selection:!0,content:r}));i.no_events||!(i=e.fire("BeforeSetContent",i)).isDefaultPrevented()?(n.content=function(e,t){if("raw"===t.format)return t.content;var n=e.selection.getRng(),r=e.dom.getParent(n.commonAncestorContainer,e.dom.isBlock),o=r?{context:r.nodeName.toLowerCase()}:{},i=e.parser.parse(t.content,_e(_e({isRootContent:!0,forced_root_block:!1},o),t));return qm({validate:e.validate},e.schema).serialize(i)}(e,i),function(e,t){var n=U.from(t.firstChild).map(Rt.fromDom),r=U.from(t.lastChild).map(Rt.fromDom);e.deleteContents(),e.insertNode(t);var o=n.bind(Kt).filter(zt).bind(Pv),i=r.bind(Xt).filter(zt).bind(Pv);Lv(o,n,e,!0),Lv(i,r,e,!1),e.collapse(!1)}(o=e.selection.getRng(),o.createContextualFragment(n.content)),e.selection.setRng(o),zd(e,o),i.no_events||e.fire("SetContent",i)):e.fire("SetContent",i)},Mv=function(e,t,n){var r;e&&e.hasOwnProperty(t)&&(0===(r=H(e[t],function(e){return e!==n})).length?delete e[t]:e[t]=r)};var Fv,Uv,zv=function(e){return!!e.select},jv=function(e){return!(!e||!e.ownerDocument)&&Lt(Rt.fromDom(e.ownerDocument),Rt.fromDom(e))},Hv=function(u,s,e,c){var l,f,i,n,a,d,r=function(e,t){return a||(a={},d={},n.on("NodeChange",function(e){var n=e.element,r=i.getParents(n,null,i.getRoot()),o={};_t.each(a,function(e,n){_t.each(r,function(t){if(i.is(t,n))return d[n]||(_t.each(e,function(e){e(!0,{node:t,selector:n,parents:r})}),d[n]=e),o[n]=e,!1})}),_t.each(d,function(e,t){o[t]||(delete d[t],_t.each(e,function(e){e(!1,{node:n,selector:t,parents:r})}))})})),a[e]||(a[e]=[]),a[e].push(t),{unbind:function(){Mv(a,e,t),Mv(d,e,t)}}},t=function(e,t){return Iv(c,e,t)},o=function(e){var t=p();t.collapse(!!e),g(t)},m=function(){return s.getSelection?s.getSelection():s.document.selection},p=function(){var e,t,n,r=function(e,t,n){try{return t.compareBoundaryPoints(e,n)}catch(r){return-1}},o=s.document;if(c.bookmark!==undefined&&!1===vm(c)){var i=om(c);if(i.isSome())return i.map(function(e){return Nm(c,[e])[0]}).getOr(o.createRange())}try{(e=m())&&!An(e.anchorNode)&&(t=0<e.rangeCount?e.getRangeAt(0):e.createRange?e.createRange():o.createRange(),t=Nm(c,[t])[0])}catch(a){}return(t=t||(o.createRange?o.createRange():o.body.createTextRange())).setStart&&9===t.startContainer.nodeType&&t.collapsed&&(n=u.getRoot(),t.setStart(n,0),t.setEnd(n,0)),l&&f&&(0===r(t.START_TO_START,t,l)&&0===r(t.END_TO_END,t,l)?t=f:f=l=null),t},g=function(e,t){var n;if((r=e)&&(zv(r)||jv(r.startContainer)&&jv(r.endContainer))){var r,o=zv(e)?e:null;if(o){f=null;try{o.select()}catch(a){}}else{var i=m();if(e=c.fire("SetSelectionRange",{range:e,forward:t}).range,i){f=e;try{i.removeAllRanges(),i.addRange(e)}catch(a){}!1===t&&i.extend&&(i.collapse(e.endContainer,e.endOffset),i.extend(e.startContainer,e.startOffset)),l=0<i.rangeCount?i.getRangeAt(0):null}e.collapsed||e.startContainer!==e.endContainer||!i.setBaseAndExtent||xt.ie||e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()&&(n=e.startContainer.childNodes[e.startOffset])&&"IMG"===n.tagName&&(i.setBaseAndExtent(e.startContainer,e.startOffset,e.endContainer,e.endOffset),i.anchorNode===e.startContainer&&i.focusNode===e.endContainer||i.setBaseAndExtent(n,0,n,1)),c.fire("AfterSetSelectionRange",{range:e,forward:t})}}},h=function(){var e=m(),t=null==e?void 0:e.anchorNode,n=null==e?void 0:e.focusNode;if(!e||!t||!n||An(t)||An(n))return!0;var r=u.createRng();r.setStart(t,e.anchorOffset),r.collapse(!0);var o=u.createRng();return o.setStart(n,e.focusOffset),o.collapse(!0),r.compareBoundaryPoints(r.START_TO_START,o)<=0},v={bookmarkManager:null,controlSelection:null,dom:i=u,win:s,serializer:e,editor:n=c,collapse:o,setCursorLocation:function(e,t){var n=u.createRng();V(e)&&V(t)?(n.setStart(e,t),n.setEnd(e,t),g(n),o(!1)):(Uf(u,n,c.getBody(),!0),g(n))},getContent:function(e){return Bv(c,e)},setContent:t,getBookmark:function(e,t){return y.getBookmark(e,t)},moveToBookmark:function(e){return y.moveToBookmark(e)},select:function(e,t){var r,n,o;return r=u,n=e,o=t,U.from(n).map(function(e){var t=r.nodeIndex(e),n=r.createRng();return n.setStart(e.parentNode,t),n.setEnd(e.parentNode,t+1),o&&(Uf(r,n,e,!0),Uf(r,n,e,!1)),n}).each(g),e},isCollapsed:function(){var e=p(),t=m();return!(!e||e.item)&&(e.compareEndPoints?0===e.compareEndPoints("StartToEnd",e):!t||e.collapsed)},isForward:h,setNode:function(e){return t(u.getOuterHTML(e)),e},getNode:function(){return function(e,t){var n,r;if(!t)return e;n=t.startContainer,r=t.endContainer;var o=t.startOffset,i=t.endOffset,a=t.commonAncestorContainer;return!t.collapsed&&(n===r&&i-o<2&&n.hasChildNodes()&&(a=n.childNodes[o]),3===n.nodeType&&3===r.nodeType&&(n=n.length===o?Sm(n.nextSibling,!0):n.parentNode,r=0===i?Sm(r.previousSibling,!1):r.parentNode,n&&n===r))?n:a&&3===a.nodeType?a.parentNode:a}(c.getBody(),p())},getSel:m,setRng:g,getRng:p,getStart:function(e){return wm(c.getBody(),p(),e)},getEnd:function(e){return xm(c.getBody(),p(),e)},getSelectedBlocks:function(e,t){return function(e,t,n,r){var o,i=[],a=e.getRoot();if(n=e.getParent(n||wm(a,t,t.collapsed),e.isBlock),r=e.getParent(r||xm(a,t,t.collapsed),e.isBlock),n&&n!==a&&i.push(n),n&&r&&n!==r)for(var u=new Yr(o=n,a);(o=u.next())&&o!==r;)e.isBlock(o)&&i.push(o);return r&&n!==r&&r!==a&&i.push(r),i}(u,p(),e,t)},normalize:function(){var e=p(),t=m();if(1<Of(t).length||!zf(c))return e;var n=fd(u,e);return n.each(function(e){g(e,h())}),n.getOr(e)},selectorChanged:function(e,t){return r(e,t),v},selectorChangedWithUnbind:r,getScrollContainer:function(){for(var e,t=u.getRoot();t&&"BODY"!==t.nodeName;){if(t.scrollHeight>t.clientHeight){e=t;break}t=t.parentNode}return e},scrollIntoView:function(e,t){return r=e,o=t,void((n=c).inline?Md:Ud)(n,r,o);var n,r,o},placeCaretAt:function(e,t){return g(od(e,t,c.getDoc()))},getBoundingClientRect:function(){var e=p();return e.collapsed?Is.fromRangeStart(e).getClientRects()[0]:e.getBoundingClientRect()},destroy:function(){s=l=f=null,b.destroy()}},y=Gf(v),b=nd(v,c);return v.bookmarkManager=y,v.controlSelection=b,v},Vv=function(e,a,u){e.addNodeFilter("font",function(e){Y(e,function(e){var t,n=a.parse(e.attr("style")),r=e.attr("color"),o=e.attr("face"),i=e.attr("size");r&&(n.color=r),o&&(n["font-family"]=o),i&&(n["font-size"]=u[parseInt(e.attr("size"),10)-1]),e.name="span",e.attr("style",a.serialize(n)),t=e,Y(["color","face","size"],function(e){t.attr(e,null)})})})},qv=function(e,t){var n,r=xi();t.convert_fonts_to_spans&&Vv(e,r,_t.explode(t.font_size_legacy_values)),n=r,e.addNodeFilter("strike",function(e){Y(e,function(e){var t=n.parse(e.attr("style"));t["text-decoration"]="line-through",e.name="span",e.attr("style",n.serialize(t))})})},$v=function(e){var t,n=decodeURIComponent(e).split(","),r=/data:([^;]+)/.exec(n[0]);return r&&(t=r[1]),{type:t,data:n[1]}},Wv=function(e,t){var n;try{n=atob(t)}catch(_k){return U.none()}for(var r=new Uint8Array(n.length),o=0;o<r.length;o++)r[o]=n.charCodeAt(o);return U.some(new Blob([r],{type:e}))},Kv=function(e){return 0===e.indexOf("blob:")?(i=e,new Ir(function(e,t){var n=function(){t("Cannot convert "+i+" to Blob. Resource might not exist or is inaccessible.")};try{var r=new XMLHttpRequest;r.open("GET",i,!0),r.responseType="blob",r.onload=function(){200===r.status?e(r.response):n()},r.onerror=n,r.send()}catch(o){n()}})):0===e.indexOf("data:")?(o=e,new Ir(function(e){var t=$v(o),n=t.type,r=t.data;Wv(n,r).fold(function(){return e(new Blob([]))},e)})):null;var i,o},Xv=0,Yv=function(e){return(e||"blobid")+Xv++},Gv=function(r,o,i,t){var e,n,a,u,s;0!==o.src.indexOf("blob:")?(n=(e=$v(o.src)).data,a=e.type,u=n,(s=r.getByData(u,a))?i({image:o,blobInfo:s}):Kv(o.src).then(function(e){s=r.create(Yv(),e,u),r.add(s),i({image:o,blobInfo:s})},function(e){t(e)})):(s=r.getByUri(o.src))?i({image:o,blobInfo:s}):Kv(o.src).then(function(t){var n;n=t,new Ir(function(e){var t=new FileReader;t.onloadend=function(){e(t.result)},t.readAsDataURL(n)}).then(function(e){u=$v(e).data,s=r.create(Yv(),t,u),r.add(s),i({image:o,blobInfo:s})})},function(e){t(e)})},Jv=function(i,a){var u={};return{findAll:function(e,n){n=n||w;var t,r=H((t=e)?ie(t.getElementsByTagName("img")):[],function(e){var t=e.src;return xt.fileApi&&!e.hasAttribute("data-mce-bogus")&&!e.hasAttribute("data-mce-placeholder")&&t&&t!==xt.transparentSrc&&(0===t.indexOf("blob:")?!i.isUploaded(t)&&n(e):0===t.indexOf("data:")&&n(e))}),o=z(r,function(n){if(u[n.src]!==undefined)return new Ir(function(t){u[n.src].then(function(e){return"string"==typeof e?e:void t({image:n,blobInfo:e.blobInfo})})});var e=new Ir(function(e,t){Gv(a,n,e,t)}).then(function(e){return delete u[e.image.src],e})["catch"](function(e){return delete u[n.src],e});return u[n.src]=e});return Ir.all(o)}}},Qv=function(e,t,n,r){(e.padd_empty_with_br||t.insert)&&n[r.name]?r.empty().append(new Am("br",1)).shortEnded=!0:r.empty().append(new Am("#text",3)).value=fo},Zv=function(e,t){return e&&e.firstChild&&e.firstChild===e.lastChild&&e.firstChild.name===t},ey=function(r,e,t,n){return n.isEmpty(e,t,function(e){return t=e,(n=r.getElementRule(t.name))&&n.paddEmpty;var t,n})},ty=function(e,o){var i=o.blob_cache,t=function(t){var e,n,r=t.attr("src");(e=t).attr("src")===xt.transparentSrc||e.attr("data-mce-placeholder")||t.attr("data-mce-bogus")||((n=/data:([^;]+);base64,([a-z0-9\+\/=]+)/i.exec(r))?U.some({type:n[1],data:decodeURIComponent(n[2])}):U.none()).filter(function(){return function(e,t){if(t.images_dataimg_filter){var n=new Image;return n.src=e.attr("src"),se(e.attributes.map,function(e,t){n.setAttribute(t,e)}),t.images_dataimg_filter(n)}return!0}(t,o)}).bind(function(e){var t=e.type,n=e.data;return U.from(i.getByData(n,t)).orThunk(function(){return Wv(t,n).map(function(e){var t=i.create(Yv(),e,n);return i.add(t),t})})}).each(function(e){t.attr("src",e.blobUri())})};i&&e.addAttributeFilter("src",function(e){return Y(e,t)})},ny=function(e,g){var h=e.schema;g.remove_trailing_brs&&e.addNodeFilter("br",function(e,t,n){var r,o,i,a,u,s,c,l,f=e.length,d=_t.extend({},h.getBlockElements()),m=h.getNonEmptyElements(),p=h.getWhiteSpaceElements();for(d.body=1,r=0;r<f;r++)if(i=(o=e[r]).parent,d[o.parent.name]&&o===i.lastChild){for(u=o.prev;u;){if("span"!==(s=u.name)||"bookmark"!==u.attr("data-mce-type")){"br"===s&&(o=null);break}u=u.prev}o&&(o.remove(),ey(h,m,p,i)&&(c=h.getElementRule(i.name))&&(c.removeEmpty?i.remove():c.paddEmpty&&Qv(g,n,d,i)))}else{for(a=o;i&&i.firstChild===a&&i.lastChild===a&&!d[(a=i).name];)i=i.parent;a===i&&!0!==g.padd_empty_with_br&&((l=new Am("#text",3)).value=fo,o.replace(l))}}),e.addAttributeFilter("href",function(e){var t,n,r=e.length;if(!g.allow_unsafe_link_target)for(;r--;){var o=e[r];"a"===o.name&&"_blank"===o.attr("target")&&o.attr("rel",(t=o.attr("rel"),n=t?_t.trim(t):"",/\b(noopener)\b/g.test(n)?n:n.split(" ").filter(function(e){return 0<e.length}).concat(["noopener"]).sort().join(" ")))}}),g.allow_html_in_named_anchor||e.addAttributeFilter("id,name",function(e){for(var t,n,r,o,i=e.length;i--;)if("a"===(o=e[i]).name&&o.firstChild&&!o.attr("href"))for(r=o.parent,t=o.lastChild;n=t.prev,r.insert(t,o),t=n;);}),g.fix_list_elements&&e.addNodeFilter("ul,ol",function(e){for(var t,n,r,o=e.length;o--;){"ul"!==(r=(n=e[o]).parent).name&&"ol"!==r.name||(n.prev&&"li"===n.prev.name?n.prev.append(n):((t=new Am("li",1)).attr("style","list-style-type: none"),n.wrap(t)))}}),g.validate&&h.getValidClasses()&&e.addAttributeFilter("class",function(e){for(var t,n,r,o,i,a,u,s=e.length,c=h.getValidClasses();s--;){for(n=(t=e[s]).attr("class").split(" "),i="",r=0;r<n.length;r++)o=n[r],u=!1,(a=c["*"])&&a[o]&&(u=!0),a=c[t.name],!u&&a&&a[o]&&(u=!0),u&&(i&&(i+=" "),i+=o);i.length||(i=null),t.attr("class",i)}}),ty(e,g)},ry=_t.makeMap,oy=_t.each,iy=_t.explode,ay=_t.extend,uy=function(A,R){void 0===R&&(R=Ci());var T={},D=[],O={},B={};(A=A||{}).validate=!("validate"in A)||A.validate,A.root_name=A.root_name||"body";var e,t,P=function(e){var t,n,r=e.name;r in T&&((n=O[r])?n.push(e):O[r]=[e]),t=D.length;for(;t--;)(r=D[t].name)in e.attributes.map&&((n=B[r])?n.push(e):B[r]=[e]);return e},n={schema:R,addAttributeFilter:function(e,n){oy(iy(e),function(e){for(var t=0;t<D.length;t++)if(D[t].name===e)return void D[t].callbacks.push(n);D.push({name:e,callbacks:[n]})})},getAttributeFilters:function(){return[].concat(D)},addNodeFilter:function(e,n){oy(iy(e),function(e){var t=T[e];t||(T[e]=t=[]),t.push(n)})},getNodeFilters:function(){var e=[];for(var t in T)T.hasOwnProperty(t)&&e.push({name:t,callbacks:T[t]});return e},filterNode:P,parse:function(e,u){var t,n,r,o,i,s,a,c,l=[];u=u||{},O={},B={};var f,d=ay(ry("script,style,head,html,body,title,meta,param"),R.getBlockElements()),m=R.getNonEmptyElements(),p=R.children,g=A.validate,h="forced_root_block"in u?u.forced_root_block:A.forced_root_block,v=!1===(f=h)?"":!0===f?"p":f,y=R.getWhiteSpaceElements(),b=/^[ \t\r\n]+/,C=/[ \t\r\n]+$/,w=/[ \t\r\n]+/g,x=/^[ \t\r\n]+$/,S=y.hasOwnProperty(u.context)||y.hasOwnProperty(A.root_name),N=function(e,t){var n,r=new Am(e,t);return e in T&&((n=O[e])?n.push(r):O[e]=[r]),r},E=function(e){for(var t,n,r,o=R.getBlockElements(),i=e.prev;i&&3===i.type;){if(0<(n=i.value.replace(C,"")).length)return void(i.value=n);if(t=i.next){if(3===t.type&&t.value.length){i=i.prev;continue}if(!o[t.name]&&"script"!==t.name&&"style"!==t.name){i=i.prev;continue}}r=i.prev,i.remove(),i=r}},k=Pm({validate:g,allow_html_data_urls:A.allow_html_data_urls,allow_svg_data_urls:A.allow_svg_data_urls,allow_script_urls:A.allow_script_urls,allow_conditional_comments:A.allow_conditional_comments,preserve_cdata:A.preserve_cdata,self_closing_elements:function(e){var t,n={};for(t in e)"li"!==t&&"p"!==t&&(n[t]=e[t]);return n}(R.getSelfClosingElements()),cdata:function(e){c.append(N("#cdata",4)).value=e},text:function(e,t){var n,r,o;S||(e=e.replace(w," "),r=c.lastChild,o=d,r&&(o[r.name]||"br"===r.name)&&(e=e.replace(b,""))),0!==e.length&&((n=N("#text",3)).raw=!!t,c.append(n).value=e)},comment:function(e){c.append(N("#comment",8)).value=e},pi:function(e,t){c.append(N(e,7)).value=t,E(c)},doctype:function(e){c.append(N("#doctype",10)).value=e,E(c)},start:function(e,t,n){var r,o,i,a,u=g?R.getElementRule(e):{};if(u){for((r=N(u.outputName||e,1)).attributes=t,r.shortEnded=n,c.append(r),(a=p[c.name])&&p[r.name]&&!a[r.name]&&l.push(r),o=D.length;o--;)(i=D[o].name)in t.map&&((s=B[i])?s.push(r):B[i]=[r]);d[e]&&E(r),n||(c=r),!S&&y[e]&&(S=!0)}},end:function(e){var t,n,r,o,i,a=g?R.getElementRule(e):{};if(a){if(d[e]&&!S){if((t=c.firstChild)&&3===t.type)if(0<(n=t.value.replace(b,"")).length)t.value=n,t=t.next;else for(r=t.next,t.remove(),t=r;t&&3===t.type;)n=t.value,r=t.next,0!==n.length&&!x.test(n)||(t.remove(),t=r),t=r;if((t=c.lastChild)&&3===t.type)if(0<(n=t.value.replace(C,"")).length)t.value=n,t=t.prev;else for(r=t.prev,t.remove(),t=r;t&&3===t.type;)n=t.value,r=t.prev,0!==n.length&&!x.test(n)||(t.remove(),t=r),t=r}if(S&&y[e]&&(S=!1),a.removeEmpty&&ey(R,m,y,c))return o=c.parent,d[c.name]?c.empty().remove():c.unwrap(),void(c=o);a.paddEmpty&&(Zv(i=c,"#text")&&i.firstChild.value===fo||ey(R,m,y,c))&&Qv(A,u,d,c),c=c.parent}}},R),_=c=new Am(u.context||A.root_name,11);if(k.parse(e,u.format),g&&l.length&&(u.context?u.invalid=!0:function(e){for(var t,n,r,o,i,a,u,s,c,l,f=ry("tr,td,th,tbody,thead,tfoot,table"),d=R.getNonEmptyElements(),m=R.getWhiteSpaceElements(),p=R.getTextBlockElements(),g=R.getSpecialElements(),h=0;h<e.length;h++)if((t=e[h]).parent&&!t.fixed)if(p[t.name]&&"li"===t.parent.name){for(c=t.next;c&&p[c.name];)c.name="li",c.fixed=!0,t.parent.insert(c,t.parent),c=c.next;t.unwrap(t)}else{for(r=[t],n=t.parent;n&&!R.isValidChild(n.name,t.name)&&!f[n.name];n=n.parent)r.push(n);if(n&&1<r.length){for(r.reverse(),o=i=P(r[0].clone()),s=0;s<r.length-1;s++){for(R.isValidChild(i.name,r[s].name)?(a=P(r[s].clone()),i.append(a)):a=i,u=r[s].firstChild;u&&u!==r[s+1];)l=u.next,a.append(u),u=l;i=a}ey(R,d,m,o)?n.insert(t,r[0],!0):(n.insert(o,r[0],!0),n.insert(t,o)),n=r[0],(ey(R,d,m,n)||Zv(n,"br"))&&n.empty().remove()}else if(t.parent){if("li"===t.name){if((c=t.prev)&&("ul"===c.name||"ol"===c.name)){c.append(t);continue}if((c=t.next)&&("ul"===c.name||"ol"===c.name)){c.insert(t,c.firstChild,!0);continue}t.wrap(P(new Am("ul",1)));continue}R.isValidChild(t.parent.name,"div")&&R.isValidChild("div",t.name)?t.wrap(P(new Am("div",1))):g[t.name]?t.empty().remove():t.unwrap()}}}(l)),v&&("body"===_.name||u.isRootContent)&&function(){var e,t,n=_.firstChild,r=function(e){e&&((n=e.firstChild)&&3===n.type&&(n.value=n.value.replace(b,"")),(n=e.lastChild)&&3===n.type&&(n.value=n.value.replace(C,"")))};if(R.isValidChild(_.name,v.toLowerCase())){for(;n;)e=n.next,3===n.type||1===n.type&&"p"!==n.name&&!d[n.name]&&!n.attr("data-mce-type")?(t||((t=N(v,1)).attr(A.forced_root_block_attrs),_.insert(t,n)),t.append(n)):(r(t),t=null),n=e;r(t)}}(),!u.invalid){for(a in O)if(O.hasOwnProperty(a)){for(s=T[a],o=(t=O[a]).length;o--;)t[o].parent||t.splice(o,1);for(n=0,r=s.length;n<r;n++)s[n](t,a,u)}for(n=0,r=D.length;n<r;n++)if((s=D[n]).name in B){for(o=(t=B[s.name]).length;o--;)t[o].parent||t.splice(o,1);for(o=0,i=s.callbacks.length;o<i;o++)s.callbacks[o](t,s.name,u)}}return _}};return ny(n,A),e=n,(t=A).inline_styles&&qv(e,t),n},sy=function(e,t,n){return o=n,(r=e)&&r.hasEventListeners("PreProcess")&&!o.no_events?function(e,t,n){var r,o,i=e.dom;t=t.cloneNode(!0);var a,u,s=document.implementation;return s.createHTMLDocument&&(r=s.createHTMLDocument(""),_t.each("BODY"===t.nodeName?t.childNodes:[t],function(e){r.body.appendChild(r.importNode(e,!0))}),t="BODY"!==t.nodeName?r.body.firstChild:r.body,o=i.doc,i.doc=r),a=e,u=_e(_e({},n),{node:t}),a.fire("PreProcess",u),o&&(i.doc=o),t}(e,t,n):t;var r,o},cy=function(e,t,n){-1===_t.inArray(t,n)&&(e.addAttributeFilter(n,function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),t.push(n))},ly=function(e,t,n,r,o){var i,a,u,s,c,l,f=(i=r,qm(t,n).serialize(i));return a=e,s=f,(u=o).no_events||!a?s:(c=a,l=_e(_e({},u),{content:s}),c.fire("PostProcess",l).content)},fy=function(y,b){var e=["data-mce-selected"],C=b&&b.dom?b.dom:xu.DOM,w=b&&b.schema?b.schema:Ci(y);y.entity_encoding=y.entity_encoding||"named",y.remove_trailing_brs=!("remove_trailing_brs"in y)||y.remove_trailing_brs;var t,s,c,x=uy(y,w);s=y,c=C,(t=x).addAttributeFilter("data-mce-tabindex",function(e,t){for(var n,r=e.length;r--;)(n=e[r]).attr("tabindex",n.attr("data-mce-tabindex")),n.attr(t,null)}),t.addAttributeFilter("src,href,style",function(e,t){for(var n,r,o=e.length,i="data-mce-"+t,a=s.url_converter,u=s.url_converter_scope;o--;)(r=(n=e[o]).attr(i))!==undefined?(n.attr(t,0<r.length?r:null),n.attr(i,null)):(r=n.attr(t),"style"===t?r=c.serializeStyle(c.parseStyle(r),n.name):a&&(r=a.call(u,r,t,n.name)),n.attr(t,0<r.length?r:null))}),t.addAttributeFilter("class",function(e){for(var t,n,r=e.length;r--;)(n=(t=e[r]).attr("class"))&&(n=t.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),t.attr("class",0<n.length?n:null))}),t.addAttributeFilter("data-mce-type",function(e,t,n){for(var r,o=e.length;o--;){"bookmark"!==(r=e[o]).attr("data-mce-type")||n.cleanup||(U.from(r.firstChild).exists(function(e){return!po(e.value)})?r.unwrap():r.remove())}}),t.addNodeFilter("noscript",function(e){for(var t,n=e.length;n--;)(t=e[n].firstChild)&&(t.value=li.decode(t.value))}),t.addNodeFilter("script,style",function(e,t){for(var n,r,o,i=e.length,a=function(e){return e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")};i--;)r=(n=e[i]).firstChild?n.firstChild.value:"","script"===t?((o=n.attr("type"))&&n.attr("type","mce-no/type"===o?null:o.replace(/^mce\-/,"")),"xhtml"===s.element_format&&0<r.length&&(n.firstChild.value="// <![CDATA[\n"+a(r)+"\n// ]]>")):"xhtml"===s.element_format&&0<r.length&&(n.firstChild.value="\x3c!--\n"+a(r)+"\n--\x3e")}),t.addNodeFilter("#comment",function(e){for(var t,n=e.length;n--;)t=e[n],s.preserve_cdata&&0===t.value.indexOf("[CDATA[")?(t.name="#cdata",t.type=4,t.value=c.decode(t.value.replace(/^\[CDATA\[|\]\]$/g,""))):0===t.value.indexOf("mce:protected ")&&(t.name="#text",t.type=3,t.raw=!0,t.value=unescape(t.value).substr(14))}),t.addNodeFilter("xml:namespace,input",function(e,t){for(var n,r=e.length;r--;)7===(n=e[r]).type?n.remove():1===n.type&&("input"!==t||n.attr("type")||n.attr("type","text"))}),t.addAttributeFilter("data-mce-type",function(e){Y(e,function(e){"format-caret"===e.attr("data-mce-type")&&(e.isEmpty(t.schema.getNonEmptyElements())?e.remove():e.unwrap())})}),t.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-type,data-mce-resize,data-mce-placeholder",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)});return{schema:w,addNodeFilter:x.addNodeFilter,addAttributeFilter:x.addAttributeFilter,serialize:function(e,t){void 0===t&&(t={});var n,r,o,i,a,u,s,c,l,f,d,m,p=_e({format:"html"},t),g=sy(b,e,p),h=(n=C,r=g,i=go((o=p).getInner?r.innerHTML:n.getOuterHTML(r)),o.selection||co(Rt.fromDom(r))?i:_t.trim(i)),v=(a=x,u=h,d=(s=p).selection?_e({forced_root_block:!1},s):s,m=a.parse(u,d),l=function(e){return e&&"br"===e.name},f=m.lastChild,!l(f)||l(c=f.prev)&&(f.remove(),c.remove()),m);return"tree"===p.format?v:ly(b,y,w,v,p)},addRules:function(e){w.addValidElements(e)},setRules:function(e){w.setValidElements(e)},addTempAttr:N(cy,x,e),getTempAttrs:S(e),getNodeFilters:x.getNodeFilters,getAttributeFilters:x.getAttributeFilters}},dy=function(e,t){var n=fy(e,t);return{schema:n.schema,addNodeFilter:n.addNodeFilter,addAttributeFilter:n.addAttributeFilter,serialize:n.serialize,addRules:n.addRules,setRules:n.setRules,addTempAttr:n.addTempAttr,getTempAttrs:n.getTempAttrs,getNodeFilters:n.getNodeFilters,getAttributeFilters:n.getAttributeFilters}},my=function(e,t){void 0===t&&(t={});var n,r,o=t.format?t.format:"html";return n=t,r=o,Dv(e).editor.getContent(n,r)},py=function(e,t,n){return void 0===n&&(n={}),r=t,o=n,Dv(e).editor.setContent(r,o);var r,o},gy=xu.DOM,hy=function(e){return U.from(e).each(function(e){return e.destroy()})},vy=function(e){var t,n,r,o,i;e.removed||(t=e._selectionOverrides,n=e.editorUpload,r=e.getBody(),o=e.getElement(),r&&e.save({is_removing:!0}),e.removed=!0,e.unbindAllNativeEvents(),e.hasHiddenInput&&o&&gy.remove(o.nextSibling),e.fire("remove"),e.editorManager.remove(e),!e.inline&&r&&(i=e,gy.setStyle(i.id,"display",i.orgDisplay)),e.fire("detach"),gy.remove(e.getContainer()),hy(t),hy(n),e.destroy())},yy=function(e,t){var n,r,o,i=e.selection,a=e.dom;e.destroyed||(t||e.removed?(t||(e.editorManager.off("beforeunload",e._beforeUnload),e.theme&&e.theme.destroy&&e.theme.destroy(),hy(i),hy(a)),(r=(n=e).formElement)&&(r._mceOldSubmit&&(r.submit=r._mceOldSubmit,r._mceOldSubmit=null),gy.unbind(r,"submit reset",n.formEventDelegate)),(o=e).contentAreaContainer=o.formElement=o.container=o.editorContainer=null,o.bodyElement=o.contentDocument=o.contentWindow=null,o.iframeElement=o.targetElm=null,o.selection&&(o.selection=o.selection.win=o.selection.dom=o.selection.dom.doc=null),e.destroyed=!0):e.remove())},by=Object.prototype.hasOwnProperty,Cy=(Fv=function(e,t){return k(e)&&k(t)?Cy(e,t):t},function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];if(0===e.length)throw new Error("Can't merge zero objects");for(var n={},r=0;r<e.length;r++){var o=e[r];for(var i in o)by.call(o,i)&&(n[i]=Fv(n[i],o[i]))}return n}),wy=mt().deviceType,xy=wy.isTouch(),Sy=wy.isPhone(),Ny=wy.isTablet(),Ey=["lists","autolink","autosave"],ky={table_grid:!1,object_resizing:!1,resize:!1},_y=function(e){var t=_(e)?e.join(" "):e,n=z(K(t)?t.split(" "):[],We);return H(n,function(e){return 0<e.length})},Ay=function(n,e){var t,r,o=me(e,function(e,t){return M(n,t)});return t=o.t,r=o.f,{sections:S(t),settings:S(r)}},Ry=function(e,t){return e.sections().hasOwnProperty(t)},Ty=function(e,t){return he(e,"toolbar_mode").orThunk(function(){return he(e,"toolbar_drawer").map(function(e){return!1===e?"wrap":e})}).getOr(t)},Dy=function(e,t,n,r){return e&&(a=i="mobile",u=(o=t).sections(),Ry(o,i)&&u[i].theme===a)?H(r,N(M,Ey)):e&&Ry(t,"mobile")?r:n;var o,i,a,u},Oy=function(e,t,n,r){var o,i,a,u=_y(n.forced_plugins),s=_y(r.plugins),c=Ry(o=t,i="mobile")?o.sections()[i]:{},l=c.plugins?_y(c.plugins):s,f=Dy(e,t,s,l),d=(a=f,[].concat(_y(u)).concat(_y(a)));if(xt.browser.isIE()&&M(d,"rtc"))throw new Error("RTC plugin is not supported on IE 11.");return _t.extend(r,{plugins:d.join(" ")})},By=function(e,t,n,r,o){var i,a,u,s,c,l,f,d=e?{mobile:(i=o.mobile||{},a=t,u={resize:!1,toolbar_mode:Ty(i,"scrolling"),toolbar_sticky:!1},_e(_e(_e({},ky),u),a?{menubar:!1}:{}))}:{},m=Ay(["mobile"],Cy(d,o)),p=_t.extend(n,r,m.settings(),(f=m,e&&Ry(f,"mobile")?function(e,t,n){void 0===n&&(n={});var r=e.sections(),o=r.hasOwnProperty(t)?r[t]:{};return _t.extend({},n,o)}(m,"mobile"):{}),{validate:!0,external_plugins:(s=r,c=m.settings(),l=c.external_plugins?c.external_plugins:{},s&&s.external_plugins?_t.extend({},s.external_plugins,l):l)});return Oy(e,m,r,p)},Py=function(e,t,n,r,o){var i,a,u,s,c=(i=n,a=xy,u=e,s={id:t,theme:"silver",toolbar_mode:Ty(o,"floating"),plugins:"",document_base_url:i,add_form_submit_trigger:!0,submit_patch:!0,add_unload_trigger:!0,convert_urls:!0,relative_urls:!0,remove_script_host:!0,object_resizing:!0,doctype:"<!DOCTYPE html>",visual:!0,font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,inline_styles:!0,convert_fonts_to_spans:!0,indent:!0,indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",entity_encoding:"named",url_converter:u.convertURL,url_converter_scope:u},_e(_e({},s),a?ky:{}));return By(Sy||Ny,Sy,c,r,o)},Ly=function(e,t,n){return U.from(t.settings[n]).filter(e)},Iy=function(e,t,n,r){var o,i,a,u=t in e.settings?e.settings[t]:n;return"hash"===r?(a={},"string"==typeof(i=u)?Y(0<i.indexOf("=")?i.split(/[;,](?![^=;,]*(?:[;,]|$))/):i.split(","),function(e){var t=e.split("=");1<t.length?a[_t.trim(t[0])]=_t.trim(t[1]):a[_t.trim(t[0])]=_t.trim(t[0])}):a=i,a):"string"===r?Ly(K,e,t).getOr(n):"number"===r?Ly(O,e,t).getOr(n):"boolean"===r?Ly(R,e,t).getOr(n):"object"===r?Ly(k,e,t).getOr(n):"array"===r?Ly(_,e,t).getOr(n):"string[]"===r?Ly((o=K,function(e){return _(e)&&Q(e,o)}),e,t).getOr(n):"function"===r?Ly(D,e,t).getOr(n):u},My=(Uv={},{add:function(e,t){Uv[e]=t},get:function(e){return Uv[e]?Uv[e]:{icons:{}}},has:function(e){return ve(Uv,e)}}),Fy=function(e,t){return t.dom[e]},Uy=function(e,t){return parseInt(tr(t,e),10)},zy=N(Fy,"clientWidth"),jy=N(Fy,"clientHeight"),Hy=N(Uy,"margin-top"),Vy=N(Uy,"margin-left"),qy=function(e,t,n){var r,o,i,a,u,s,c,l,f,d,m,p=Rt.fromDom(e.getBody()),g=e.inline?p:(r=p,Rt.fromDom(qt(r).dom.documentElement)),h=(o=e.inline,a=t,u=n,s=(i=g).dom.getBoundingClientRect(),{x:a-(o?s.left+i.dom.clientLeft+Vy(i):0),y:u-(o?s.top+i.dom.clientTop+Hy(i):0)});return l=h.x,f=h.y,d=zy(c=g),m=jy(c),0<=l&&0<=f&&l<=d&&f<=m},$y=function(e){var t,n=e.inline?e.getBody():e.getContentAreaContainer();return t=n,U.from(t).map(Rt.fromDom).map(vn).getOr(!1)},Wy=function(n){var t,o=[],i=function(){var e,t=n.theme;return t&&t.getNotificationManagerImpl?t.getNotificationManagerImpl():{open:e=function(){throw new Error("Theme did not provide a NotificationManager implementation.")},close:e,reposition:e,getArgs:e}},a=function(){return U.from(o[0])},u=function(){0<o.length&&i().reposition(o)},s=function(t){G(o,function(e){return e===t}).each(function(e){o.splice(e,1)})},r=function(r,e){if(void 0===e&&(e=!0),!n.removed&&$y(n))return e&&n.fire("BeforeOpenNotification",{notification:r}),W(o,function(e){return t=i().getArgs(e),n=r,!(t.type!==n.type||t.text!==n.text||t.progressBar||t.timeout||n.progressBar||n.timeout);var t,n}).getOrThunk(function(){n.editorManager.setActive(n);var e,t=i().open(r,function(){s(t),u(),a().fold(function(){return n.focus()},function(e){return Rt.fromDom(e.getEl()).dom.focus()})});return e=t,o.push(e),u(),n.fire("OpenNotification",_e({},t)),t})};return(t=n).on("SkinLoaded",function(){var e=t.getParam("service_message");e&&r({text:e,type:"warning",timeout:0},!1)}),t.on("ResizeEditor ResizeWindow NodeChange",function(){Wr.requestAnimationFrame(u)}),t.on("remove",function(){Y(o.slice(),function(e){i().close(e)})}),{open:r,close:function(){a().each(function(e){i().close(e),s(e),u()})},getNotifications:function(){return o}}},Ky=Bu.PluginManager,Xy=Bu.ThemeManager;var Yy,Gy,Jy=function(n){var r=[],o=function(){var e,t=n.theme;return t&&t.getWindowManagerImpl?t.getWindowManagerImpl():{open:e=function(){throw new Error("Theme did not provide a WindowManager implementation.")},openUrl:e,alert:e,confirm:e,close:e,getParams:e,setParams:e}},i=function(n,r){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return r?r.apply(n,e):undefined}},a=function(e){var t;r.push(e),t=e,n.fire("OpenWindow",{dialog:t})},u=function(t){var e;e=t,n.fire("CloseWindow",{dialog:e}),0===(r=H(r,function(e){return e!==t})).length&&n.focus()},s=function(e){n.editorManager.setActive(n),rm(n);var t=e();return a(t),t};return n.on("remove",function(){Y(r,function(e){o().close(e)})}),{open:function(e,t){return s(function(){return o().open(e,t,u)})},openUrl:function(e){return s(function(){return o().openUrl(e,u)})},alert:function(e,t,n){var r=o();r.alert(e,i(n||r,t))},confirm:function(e,t,n){var r=o();r.confirm(e,i(n||r,t))},close:function(){U.from(r[r.length-1]).each(function(e){o().close(e),u(e)})}}},Qy=function(e,t){e.notificationManager.open({type:"error",text:t})},Zy=function(e,t){e._skinLoaded?Qy(e,t):e.on("SkinLoaded",function(){Qy(e,t)})},eb=function(e,t,n){Zf(e,t,{message:n}),console.error(n)},tb=function(e,t,n){return n?"Failed to load "+e+": "+n+" from url "+t:"Failed to load "+e+" url: "+t},nb=function(e,t,n){eb(e,"PluginLoadError",tb("plugin",t,n))},rb=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r=window.console;r&&(r.error?r.error.apply(r,Ae([e],t)):r.log.apply(r,Ae([e],t)))},ob=function(e){return ib(e,(n=(t=e).getParam("content_css"),K(n)?z(n.split(","),We):_(n)?n:!1===n||t.inline?[]:["default"]));var t,n},ib=function(t,e){var n=t.editorManager.baseURL+"/skins/content",r="content"+t.editorManager.suffix+".css",o=!0===t.inline;return z(e,function(e){return/^[a-z0-9\-]+$/i.test(e)&&!o?n+"/"+e+"/"+r:t.documentBaseURI.toAbsolute(e)})},ab=function(e){var t;e.contentCSS=e.contentCSS.concat(ob(e),ib(t=e,vc(t)))},ub=function(){var n={},r=function(e,t){return{status:e,resultUri:t}},t=function(e){return e in n};return{hasBlobUri:t,getResultUri:function(e){var t=n[e];return t?t.resultUri:null},isPending:function(e){return!!t(e)&&1===n[e].status},isUploaded:function(e){return!!t(e)&&2===n[e].status},markPending:function(e){n[e]=r(1,null)},markUploaded:function(e,t){n[e]=r(2,t)},removeFailed:function(e){delete n[e]},destroy:function(){n={}}}},sb=0,cb=function(e){return e+sb+++(t=function(){return Math.round(4294967295*Math.random()).toString(36)},"s"+(new Date).getTime().toString(36)+t()+t()+t());var t},lb=function(u,s){var o={},n=function(e,r,o,t){var i=new XMLHttpRequest;i.open("POST",s.url),i.withCredentials=s.credentials,i.upload.onprogress=function(e){t(e.loaded/e.total*100)},i.onerror=function(){o("Image upload failed due to a XHR Transport error. Code: "+i.status)},i.onload=function(){var e,t,n;i.status<200||300<=i.status?o("HTTP Error: "+i.status):(e=JSON.parse(i.responseText))&&"string"==typeof e.location?r((t=s.basePath,n=e.location,t?t.replace(/\/$/,"")+"/"+n.replace(/^\//,""):n)):o("Invalid JSON: "+i.responseText)};var n=new FormData;n.append("file",e.blob(),e.filename()),i.send(n)},c=function(e,t){return{url:t,blobInfo:e,status:!0}},l=function(e,t,n){return{url:"",blobInfo:e,status:!1,error:{message:t,options:n}}},f=function(e,t){_t.each(o[e],function(e){e(t)}),delete o[e]},r=function(e,r){return e=_t.grep(e,function(e){return!u.isUploaded(e.blobUri())}),Ir.all(_t.map(e,function(e){return u.isPending(e.blobUri())?(n=e.blobUri(),new Ir(function(e){o[n]=o[n]||[],o[n].push(e)})):(i=e,t=s.handler,a=r,u.markPending(i.blobUri()),new Ir(function(r){var n;try{var o=function(){n&&n.close()};t(i,function(e){o(),u.markUploaded(i.blobUri(),e),f(i.blobUri(),c(i,e)),r(c(i,e))},function(e,t){var n=t||{};o(),u.removeFailed(i.blobUri()),f(i.blobUri(),l(i,e,n)),r(l(i,e,n))},function(t){t<0||100<t||U.from(n).orThunk(function(){return U.from(a).map(p)}).each(function(e){(n=e).progressBar.value(t)})})}catch(e){r(l(i,e.message,{}))}}));var i,t,a,n}))};return!1===D(s.handler)&&(s.handler=n),{upload:function(e,t){return s.url||s.handler!==n?r(e,t):new Ir(function(e){e([])})}}},fb=function(e){return function(){return e.notificationManager.open({text:e.translate("Image uploading..."),type:"info",timeout:-1,progressBar:!0})}},db=function(e,t){return lb(t,{url:e.getParam("images_upload_url","","string"),basePath:e.getParam("images_upload_base_path","","string"),credentials:e.getParam("images_upload_credentials",!1,"boolean"),handler:e.getParam("images_upload_handler",null,"function")})},mb=function(s){var n,i,e,t,r,o,c=(n=[],i=function(e){if(!e.blob||!e.base64)throw new Error("blob and base64 representations of the image are required for BlobInfo to be created");var t=e.id||cb("blobid"),n=e.name||t,r=e.blob;return{id:S(t),name:S(n),filename:S(e.filename||n+"."+({"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png","image/apng":"apng","image/avif":"avif","image/svg+xml":"svg","image/webp":"webp","image/bmp":"bmp","image/tiff":"tiff"}[r.type.toLowerCase()]||"dat")),blob:S(r),base64:S(e.base64),blobUri:S(e.blobUri||URL.createObjectURL(r)),uri:S(e.uri)}},{create:function(e,t,n,r,o){if(K(e))return i({id:e,name:r,filename:o,blob:t,base64:n});if(k(e))return i(e);throw new Error("Unknown input type")},add:function(e){t(e.id())||n.push(e)},get:t=function(t){return e(function(e){return e.id()===t})},getByUri:function(t){return e(function(e){return e.blobUri()===t})},getByData:function(t,n){return e(function(e){return e.base64()===t&&e.blob().type===n})},findFirst:e=function(e){return W(n,e).getOrUndefined()},removeByUri:function(t){n=H(n,function(e){return e.blobUri()!==t||void URL.revokeObjectURL(e.blobUri())})},destroy:function(){Y(n,function(e){URL.revokeObjectURL(e.blobUri())}),n=[]}}),a=ub(),u=[],l=function(n){var r=Au(null);n.on("change AddUndo",function(e){r.set(_e({},e.level))});return{fireIfChanged:function(){var t=n.undoManager.data;oe(t).filter(function(e){return!Nv(r.get(),e)}).each(function(e){n.setDirty(!0),n.fire("change",{level:e,lastLevel:ne(t,t.length-2).getOrNull()})})}}}(s),f=function(t){return function(e){return s.selection?t(e):[]}},d=function(e,t,n){for(var r=0;-1!==(r=e.indexOf(t,r))&&(e=e.substring(0,r)+n+e.substr(r+t.length),r+=n.length-t.length+1),-1!==r;);return e},m=function(e,t,n){var r='src="'+n+'"'+(n===xt.transparentSrc?' data-mce-placeholder="1"':"");return e=d(e,'src="'+t+'"',r),e=d(e,'data-mce-src="'+t+'"','data-mce-src="'+n+'"')},p=function(t,n){Y(s.undoManager.data,function(e){"fragmented"===e.type?e.fragments=z(e.fragments,function(e){return m(e,t,n)}):e.content=m(e.content,t,n)})},g=function(e,t){var n,r=s.convertURL(t,"src");p(e.src,t),s.$(e).attr({src:s.getParam("images_reuse_filename",!1,"boolean")?(n=t)+(-1===n.indexOf("?")?"?":"&")+(new Date).getTime():t,"data-mce-src":r})},h=function(n){return r=r||db(s,a),b().then(f(function(u){var e=z(u,function(e){return e.blobInfo});return r.upload(e,fb(s)).then(f(function(e){var a=[],t=z(e,function(e,t){var n,r,o=u[t].blobInfo,i=u[t].image;return e.status&&s.getParam("images_replace_blob_uris",!0,"boolean")?(c.removeByUri(i.src),g(i,e.url)):e.error&&(e.error.options.remove&&(p(i.getAttribute("src"),xt.transparentSrc),a.push(i)),n=s,r=e.error.message,Zy(n,Ou.translate(["Failed to upload image: {0}",r]))),{element:i,status:e.status,uploadUri:e.url,blobInfo:o}});return 0<t.length&&l.fireIfChanged(),0<a.length&&(Rv(s)?console.error("Removing images on failed uploads is currently unsupported for RTC"):s.undoManager.transact(function(){Y(a,function(e){s.dom.remove(e),c.removeByUri(e.src)})})),n&&n(t),t}))}))},v=function(e){if(dc(s))return h(e)},y=function(t){return!1!==Q(u,function(e){return e(t)})&&(0!==t.getAttribute("src").indexOf("data:")||s.getParam("images_dataimg_filter",w,"function")(t))},b=function(){return(o=o||Jv(a,c)).findAll(s.getBody(),y).then(f(function(e){return e=H(e,function(e){return"string"!=typeof e||void Zy(s,e)}),Y(e,function(e){p(e.image.src,e.blobInfo.blobUri()),e.image.src=e.blobInfo.blobUri(),e.image.removeAttribute("data-mce-src")}),e}))},C=function(e){return e.replace(/src="(blob:[^"]+)"/g,function(e,n){var t=a.getResultUri(n);if(t)return'src="'+t+'"';var r=c.getByUri(n);return(r=r||$(s.editorManager.get(),function(e,t){return e||t.editorUpload&&t.editorUpload.blobCache.getByUri(n)},null))?'src="data:'+r.blob().type+";base64,"+r.base64()+'"':e})};return s.on("SetContent",function(){(dc(s)?v:b)()}),s.on("RawSaveContent",function(e){e.content=C(e.content)}),s.on("GetContent",function(e){e.source_view||"raw"===e.format||"tree"===e.format||(e.content=C(e.content))}),s.on("PostRender",function(){s.parser.addNodeFilter("img",function(e){Y(e,function(e){var t,n=e.attr("src");c.getByUri(n)||(t=a.getResultUri(n))&&e.attr("src",t)})})}),{blobCache:c,addFilter:function(e){u.push(e)},uploadImages:h,uploadImagesAuto:v,scanForImages:b,destroy:function(){c.destroy(),a.destroy(),o=r=null}}},pb=function(e){var r,t,n={},o=function(e,t){e&&("string"!=typeof e?_t.each(e,function(e,t){o(t,e)}):(_(t)||(t=[t]),_t.each(t,function(e){"undefined"==typeof e.deep&&(e.deep=!e.selector),"undefined"==typeof e.split&&(e.split=!e.selector||e.inline),"undefined"==typeof e.remove&&e.selector&&!e.inline&&(e.remove="none"),e.selector&&e.inline&&(e.mixed=!0,e.block_expand=!0),"string"==typeof e.classes&&(e.classes=e.classes.split(/\s+/))}),n[e]=t))};return o((r=e.dom,t={valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"left"},inherit:!1,preview:!1,defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"left"},preview:"font-family font-size"}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"center"},inherit:!1,preview:"font-family font-size",defaultBlock:"div"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"img",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"},preview:"font-family font-size"}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"right"},inherit:!1,preview:"font-family font-size",defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"right"},preview:"font-family font-size"}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"justify"},inherit:!1,defaultBlock:"div",preview:"font-family font-size"}],bold:[{inline:"strong",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all",preserve_attributes:["class","style"]}],italic:[{inline:"em",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all",preserve_attributes:["class","style"]}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all",preserve_attributes:["class","style"]}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:!0},{inline:"strike",remove:"all",preserve_attributes:["class","style"]},{inline:"s",remove:"all",preserve_attributes:["class","style"]}],forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},fontname:{inline:"span",toggle:!1,styles:{fontFamily:"%value"},clear_child_styles:!0},fontsize:{inline:"span",toggle:!1,styles:{fontSize:"%value"},clear_child_styles:!0},lineheight:{selector:"h1,h2,h3,h4,h5,h6,p,li,td,th,div",defaultBlock:"p",styles:{lineHeight:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:!0,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:function(e,t,n){return Rn(e)&&e.hasAttribute("href")},onformat:function(n,e,t){_t.each(t,function(e,t){r.setAttrib(n,t,e)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike,s,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]},_t.each("p h1 h2 h3 h4 h5 h6 div address pre div dt dd samp".split(/\s/),function(e){t[e]={block:e,remove:"all"}}),t)),o(e.getParam("formats")),{get:function(e){return e?n[e]:n},has:function(e){return ve(n,e)},register:o,unregister:function(e){return e&&n[e]&&delete n[e],n}}},gb=_t.each,hb=xu.DOM,vb=function(e,t){var n,o,r,m=t&&t.schema||Ci({}),p=function(e){o="string"==typeof e?{name:e,classes:[],attrs:{}}:e;var t,n,r=hb.create(o.name);return t=r,(n=o).classes.length&&hb.addClass(t,n.classes.join(" ")),hb.setAttribs(t,n.attrs),r},g=function(n,e,t){var r,o,i,a,u,s,c,l=0<e.length&&e[0],f=l&&l.name,d=(a=f,u="string"!=typeof(i=n)?i.nodeName.toLowerCase():i,s=m.getElementRule(u),!(!(c=s&&s.parentsRequired)||!c.length)&&(a&&-1!==_t.inArray(c,a)?a:c[0]));if(d)f===d?(o=e[0],e=e.slice(1)):o=d;else if(l)o=e[0],e=e.slice(1);else if(!t)return n;return o&&(r=p(o)).appendChild(n),t&&(r||(r=hb.create("div")).appendChild(n),_t.each(t,function(e){var t=p(e);r.insertBefore(t,n)})),g(r,e,o&&o.siblings)};return e&&e.length?(o=e[0],n=p(o),(r=hb.create("div")).appendChild(g(n,e.slice(1),o.siblings)),r):""},yb=function(e){var t,a={classes:[],attrs:{}};return"*"!==(e=a.selector=_t.trim(e))&&(t=e.replace(/(?:([#\.]|::?)([\w\-]+)|(\[)([^\]]+)\]?)/g,function(e,t,n,r,o){switch(t){case"#":a.attrs.id=n;break;case".":a.classes.push(n);break;case":":-1!==_t.inArray("checked disabled enabled read-only required".split(" "),n)&&(a.attrs[n]=n)}var i;return"["!==r||(i=o.match(/([\w\-]+)(?:\=\"([^\"]+))?/))&&(a.attrs[i[1]]=i[2]),""})),a.name=t||"div",a},bb=function(n,e){var t,r,o,i="",a=(o=n.getParam("preview_styles","font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow"),K(o)?o:"");if(""===a)return"";var u=function(e){return e.replace(/%(\w+)/g,"")};if("string"==typeof e){if(!(e=n.formatter.get(e)))return;e=e[0]}if("preview"in e){var s=he(e,"preview");if(s.is(!1))return"";a=s.getOr(a)}t=e.block||e.inline||"span";var c,l=(c=e.selector)&&"string"==typeof c?(c=(c=c.split(/\s*,\s*/)[0]).replace(/\s*(~\+|~|\+|>)\s*/g,"$1"),_t.map(c.split(/(?:>|\s+(?![^\[\]]+\]))/),function(e){var t=_t.map(e.split(/(?:~\+|~|\+)/),yb),n=t.pop();return t.length&&(n.siblings=t),n}).reverse()):[],f=l.length?(l[0].name||(l[0].name=t),t=e.selector,vb(l,n)):vb([t],n),d=hb.select(t,f)[0]||f.firstChild;return gb(e.styles,function(e,t){var n=u(e);n&&hb.setStyle(d,t,n)}),gb(e.attributes,function(e,t){var n=u(e);n&&hb.setAttrib(d,t,n)}),gb(e.classes,function(e){var t=u(e);hb.hasClass(d,t)||hb.addClass(d,t)}),n.fire("PreviewFormats"),hb.setStyles(f,{position:"absolute",left:-65535}),n.getBody().appendChild(f),r=hb.getStyle(n.getBody(),"fontSize",!0),r=/px$/.test(r)?parseInt(r,10):0,gb(a.split(" "),function(e){var t=hb.getStyle(d,e,!0);if(!("background-color"===e&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)&&(t=hb.getStyle(n.getBody(),e,!0),"#ffffff"===hb.toHex(t).toLowerCase())||"color"===e&&"#000000"===hb.toHex(t).toLowerCase())){if("font-size"===e&&/em|%$/.test(t)){if(0===r)return;t=parseFloat(t)/(/%$/.test(t)?100:1)*r+"px"}"border"===e&&t&&(i+="padding:0 2px;"),i+=e+":"+t+";"}}),n.fire("AfterPreviewFormats"),hb.remove(f),i},Cb=function(s){var e=pb(s),u=Au(null);return function(e){e.addShortcut("meta+b","","Bold"),e.addShortcut("meta+i","","Italic"),e.addShortcut("meta+u","","Underline");for(var t=1;t<=6;t++)e.addShortcut("access+"+t,"",["FormatBlock",!1,"h"+t]);e.addShortcut("access+7","",["FormatBlock",!1,"p"]),e.addShortcut("access+8","",["FormatBlock",!1,"div"]),e.addShortcut("access+9","",["FormatBlock",!1,"address"])}(s),ph(s),{get:e.get,has:e.has,register:e.register,unregister:e.unregister,apply:function(e,t,n){var r,o,i;r=e,o=t,i=n,Ov(s).formatter.apply(r,o,i)},remove:function(e,t,n,r){var o,i,a,u;o=e,i=t,a=n,u=r,Ov(s).formatter.remove(o,i,a,u)},toggle:function(e,t,n){var r,o,i;r=e,o=t,i=n,Ov(s).formatter.toggle(r,o,i)},match:function(e,t,n){return r=e,o=t,i=n,Ov(s).formatter.match(r,o,i);var r,o,i},closest:function(e){return t=e,Ov(s).formatter.closest(t);var t},matchAll:function(e,t){return n=e,r=t,Ov(s).formatter.matchAll(n,r);var n,r},matchNode:function(e,t,n,r){return o=e,i=t,a=n,u=r,Ov(s).formatter.matchNode(o,i,a,u);var o,i,a,u},canApply:function(e){return t=e,Ov(s).formatter.canApply(t);var t},formatChanged:function(e,t,n){return r=u,o=e,i=t,void 0===(a=n)&&(a=!1),Ov(s).formatter.formatChanged(r,o,i,a);var r,o,i,a},getCssText:N(bb,s)}},wb=function(n,r,o){var i=Au(!1),a=function(e){kv(r,!1,o),r.add({},e)};n.on("init",function(){r.add()}),n.on("BeforeExecCommand",function(e){var t=e.command.toLowerCase();"undo"!==t&&"redo"!==t&&"mcerepaint"!==t&&(_v(r,o),r.beforeChange())}),n.on("ExecCommand",function(e){var t=e.command.toLowerCase();"undo"!==t&&"redo"!==t&&"mcerepaint"!==t&&a(e)}),n.on("ObjectResizeStart cut",function(){r.beforeChange()}),n.on("SaveContent ObjectResized blur",a),n.on("dragend",a),n.on("keyup",function(e){var t=e.keyCode;e.isDefaultPrevented()||((33<=t&&t<=36||37<=t&&t<=40||45===t||e.ctrlKey)&&(a(),n.nodeChanged()),46!==t&&8!==t||n.nodeChanged(),i.get()&&r.typing&&!1===Nv(Cv(n),r.data[0])&&(!1===n.isDirty()&&(n.setDirty(!0),n.fire("change",{level:r.data[0],lastLevel:null})),n.fire("TypingUndo"),i.set(!1),n.nodeChanged()))}),n.on("keydown",function(e){var t,n=e.keyCode;e.isDefaultPrevented()||(33<=n&&n<=36||37<=n&&n<=40||45===n?r.typing&&a(e):(t=e.ctrlKey&&!e.altKey||e.metaKey,!(n<16||20<n)||224===n||91===n||r.typing||t||(r.beforeChange(),kv(r,!0,o),r.add({},e),i.set(!0))))}),n.on("mousedown",function(e){r.typing&&a(e)});n.on("input",function(e){var t,n;e.inputType&&("insertReplacementText"===e.inputType||"insertText"===(n=e).inputType&&null===n.data||("insertFromPaste"===(t=e).inputType||"insertFromDrop"===t.inputType))&&a(e)}),n.on("AddUndo Undo Redo ClearUndos",function(e){e.isDefaultPrevented()||n.nodeChanged()})},xb=function(s){var e,c=Au(U.none()),l=Au(0),f=Au(0),d={data:[],typing:!1,beforeChange:function(){var e,t;e=l,t=c,Ov(s).undoManager.beforeChange(e,t)},add:function(e,t){return n=d,r=f,o=l,i=c,a=e,u=t,Ov(s).undoManager.addUndoLevel(n,r,o,i,a,u);var n,r,o,i,a,u},undo:function(){return e=d,t=l,n=f,Ov(s).undoManager.undo(e,t,n);var e,t,n},redo:function(){return e=s,t=f,n=d.data,Ov(e).undoManager.redo(t,n);var e,t,n},clear:function(){var e,t;e=d,t=f,Ov(s).undoManager.clear(e,t)},reset:function(){var e;e=d,Ov(s).undoManager.reset(e)},hasUndo:function(){return e=d,t=f,Ov(s).undoManager.hasUndo(e,t);var e,t},hasRedo:function(){return e=d,t=f,Ov(s).undoManager.hasRedo(e,t);var e,t},transact:function(e){return t=d,n=l,r=e,Ov(s).undoManager.transact(t,n,r);var t,n,r},ignore:function(e){var t,n;t=l,n=e,Ov(s).undoManager.ignore(t,n)},extra:function(e,t){var n,r,o,i;n=d,r=f,o=e,i=t,Ov(s).undoManager.extra(n,r,o,i)}};return Rv(s)||wb(s,d,l),(e=s).addShortcut("meta+z","","Undo"),e.addShortcut("meta+y,meta+shift+z","","Redo"),d},Sb=[9,27,ed.HOME,ed.END,19,20,44,144,145,33,34,45,16,17,18,91,92,93,ed.DOWN,ed.UP,ed.LEFT,ed.RIGHT].concat(xt.browser.isFirefox()?[224]:[]),Nb="data-mce-placeholder",Eb=function(e){return"keydown"===e.type||"keyup"===e.type},kb=function(e){var t=e.keyCode;return t===ed.BACKSPACE||t===ed.DELETE},_b=function(a){var e,u=a.dom,s=lc(a),c=(e=a).getParam("placeholder",uc.getAttrib(e.getElement(),"placeholder"),"string"),l=function(e,t){var n,r,o,i;!function(e){if(Eb(e)){var t=e.keyCode;return!kb(e)&&(ed.metaKeyPressed(e)||e.altKey||112<=t&&t<=123||M(Sb,t))}return!1}(e)&&(n=a.getBody(),r=!(Eb(o=e)&&!(kb(o)||"keyup"===o.type&&229===o.keyCode))&&function(e,t,n){if(Wo(Rt.fromDom(t),!1)){var r=""===n,o=t.firstElementChild;return!o||!e.getStyle(t.firstElementChild,"padding-left")&&!e.getStyle(t.firstElementChild,"padding-right")&&(r?!e.isBlock(o):n===o.nodeName.toLowerCase())}return!1}(u,n,s),""!==u.getAttrib(n,Nb)===r&&!t||(u.setAttrib(n,Nb,r?c:null),u.setAttrib(n,"aria-placeholder",r?c:null),i=r,a.fire("PlaceholderToggle",{state:i}),a.on(r?"keydown":"keyup",l),a.off(r?"keyup":"keydown",l)))};c&&a.on("init",function(e){l(e,!0),a.on("change SetContent ExecCommand",l),a.on("paste",function(e){return Wr.setEditorTimeout(a,function(){return l(e)})})})},Ab=/[\u0591-\u07FF\uFB1D-\uFDFF\uFE70-\uFEFC]/,Rb=function(e,t){return Dt(Rt.fromDom(t),e.getParam("inline_boundaries_selector","a[href],code,.mce-annotation","string"))},Tb=function(e){return"rtl"===xu.DOM.getStyle(e,"direction",!0)||(t=e.textContent,Ab.test(t));var t},Db=function(e,t,n){var r,o,i,a=(r=e,o=t,i=n,H(xu.DOM.getParents(i.container(),"*",o),r));return U.from(a[a.length-1])},Ob=function(e,t){if(!t)return t;var n=t.container(),r=t.offset();return e?bo(n)?Mn(n.nextSibling)?Is(n.nextSibling,0):Is.after(n):xo(t)?Is(n,r+1):t:bo(n)?Mn(n.previousSibling)?Is(n.previousSibling,n.previousSibling.data.length):Is.before(n):So(t)?Is(n,r-1):t},Bb=N(Ob,!0),Pb=N(Ob,!1),Lb=function(e,t){return Lt(e,t)?Dr(t,function(e){return oo(e)||ao(e)},(n=e,function(e){return Bt(n,Rt.fromDom(e.dom.parentNode))})):U.none();var n},Ib=function(e){var t,n,r;e.dom.isEmpty(e.getBody())&&(e.setContent(""),n=(t=e).getBody(),r=n.firstChild&&t.dom.isBlock(n.firstChild)?n.firstChild:n,t.selection.setCursorLocation(r,0))},Mb=function(e,t){return{from:e,to:t}},Fb=function(e,t){var n=Rt.fromDom(e),r=Rt.fromDom(t.container());return Lb(n,r).map(function(e){return{block:e,position:t}})},Ub=function(o,i,e){var t=Fb(o,Is.fromRangeStart(e)),n=t.bind(function(e){return Rl(i,o,e.position).bind(function(e){return Fb(o,e).map(function(e){return t=o,n=i,jn((r=e).position.getNode())&&!1===Wo(r.block)?Ol(!1,r.block.dom).bind(function(e){return e.isEqual(r.position)?Rl(n,t,e).bind(function(e){return Fb(t,e)}):U.some(r)}).getOr(r):r;var t,n,r})})});return as(t,n,Mb).filter(function(e){return!1===Bt((r=e).from.block,r.to.block)&&Wt((n=e).from.block).bind(function(t){return Wt(n.to.block).filter(function(e){return Bt(t,e)})}).isSome()&&(!1===qn((t=e).from.block.dom)&&!1===qn(t.to.block.dom));var t,n,r})},zb=function(e){var t,n=(t=Jt(e),G(t,to).fold(function(){return t},function(e){return t.slice(0,e)}));return Y(n,gn),n},jb=function(e,t){var n=fp(t,e);return W(n.reverse(),function(e){return Wo(e)}).each(gn)},Hb=function(e,t,n,r){if(Wo(n))return up(n),Ll(n.dom);0===H(Yt(r),function(e){return!Wo(e)}).length&&Wo(t)&&cn(r,Rt.fromTag("br"));var o=Pl(n.dom,Is.before(r.dom));return Y(zb(t),function(e){cn(r,e)}),jb(e,t),o},Vb=function(e,t,n){if(Wo(n))return gn(n),Wo(t)&&up(t),Ll(t.dom);var r=Il(n.dom);return Y(zb(t),function(e){dn(n,e)}),jb(e,t),r},qb=function(e,t){return Lt(t,e)?(n=fp(e,t),U.from(n[n.length-1])):U.none();var n},$b=function(e,t){Ol(e,t.dom).map(function(e){return e.getNode()}).map(Rt.fromDom).filter(ro).each(gn)},Wb=function(e,t,n){return $b(!0,t),$b(!1,n),qb(t,n).fold(N(Vb,e,t,n),N(Hb,e,t,n))},Kb=function(e,t,n,r){return t?Wb(e,r,n):Wb(e,n,r)},Xb=function(t,n){var e,r,o,i=Rt.fromDom(t.getBody()),a=(e=i.dom,r=n,((o=t.selection.getRng()).collapsed?Ub(e,r,o):U.none()).bind(function(e){return Kb(i,n,e.from.block,e.to.block)}));return a.each(function(e){t.selection.setRng(e.toRange())}),a.isSome()},Yb=function(e,t){var n=Rt.fromDom(t),r=N(Bt,e);return Tr(n,so,r).isSome()},Gb=function(e,t){var n,r,o=Pl(e.dom,Is.fromRangeStart(t)).isNone(),i=Bl(e.dom,Is.fromRangeEnd(t)).isNone();return!(Yb(n=e,(r=t).startContainer)||Yb(n,r.endContainer))&&o&&i},Jb=function(e){var n,r,o,t,i=Rt.fromDom(e.getBody()),a=e.selection.getRng();return Gb(i,a)?((t=e).setContent(""),t.selection.setCursorLocation(),!0):(n=i,r=e.selection,o=r.getRng(),as(Lb(n,Rt.fromDom(o.startContainer)),Lb(n,Rt.fromDom(o.endContainer)),function(e,t){return!1===Bt(e,t)&&(o.deleteContents(),Kb(n,!0,e,t).each(function(e){r.setRng(e.toRange())}),!0)}).getOr(!1))},Qb=function(e,t){return!e.selection.isCollapsed()&&Jb(e)},Zb=Vn,eC=qn,tC=function(e,t,n,r,o){return U.from(t._selectionOverrides.showCaret(e,n,r,o))},nC=function(e,t){var n,r;return e.fire("BeforeObjectSelected",{target:t}).isDefaultPrevented()?U.none():U.some(((r=(n=t).ownerDocument.createRange()).selectNode(n),r))},rC=function(e,t,n){var r=ol(1,e.getBody(),t),o=Is.fromRangeStart(r),i=o.getNode();if(zc(i))return tC(1,e,i,!o.isAtEnd(),!1);var a=o.getNode(!0);if(zc(a))return tC(1,e,a,!1,!1);var u=e.dom.getParent(o.getNode(),function(e){return eC(e)||Zb(e)});return zc(u)?tC(1,e,u,!1,n):U.none()},oC=function(e,t,n){return t.collapsed?rC(e,t,n).getOr(t):t},iC=function(e){return op(e)||ep(e)},aC=function(e){return ip(e)||tp(e)},uC=function(n,r,e,t,o,i){var a,u;return tC(t,n,i.getNode(!o),o,!0).each(function(e){var t;r.collapsed?(t=r.cloneRange(),o?t.setEnd(e.startContainer,e.startOffset):t.setStart(e.endContainer,e.endOffset),t.deleteContents()):r.deleteContents(),n.selection.setRng(e)}),a=n.dom,Mn(u=e)&&0===u.data.length&&a.remove(u),!0},sC=function(e,t){var n=e.selection.getRng();if(!Mn(n.commonAncestorContainer))return!1;var r=t?Ms.Forwards:Ms.Backwards,o=Nl(e.getBody()),i=N(sl,t?o.next:o.prev),a=t?iC:aC,u=al(r,e.getBody(),n),s=Ob(t,i(u));if(!s||!cl(u,s))return!1;if(a(s))return uC(e,n,u.getNode(),r,t,s);var c=i(s);return!!(c&&a(c)&&cl(s,c))&&uC(e,n,u.getNode(),r,t,c)},cC=wr([{remove:["element"]},{moveToElement:["element"]},{moveToPosition:["position"]}]),lC=function(e,t,n,r){var o=r.getNode(!1===t);return Lb(Rt.fromDom(e),Rt.fromDom(n.getNode())).map(function(e){return Wo(e)?cC.remove(e.dom):cC.moveToElement(o)}).orThunk(function(){return U.some(cC.moveToElement(o))})},fC=function(u,s,c){return Rl(s,u,c).bind(function(e){return a=e.getNode(),so(Rt.fromDom(a))||ao(Rt.fromDom(a))?U.none():(t=u,o=e,i=function(e){return no(Rt.fromDom(e))&&!Qc(r,o,t)},il(!(n=s),r=c).fold(function(){return il(n,o).fold(b,i)},i)?U.none():s&&qn(e.getNode())||!1===s&&qn(e.getNode(!0))?lC(u,s,c,e):s&&ip(c)||!1===s&&op(c)?U.some(cC.moveToPosition(e)):U.none());var t,n,r,o,i,a})},dC=function(r,e,o){return i=e,a=o.getNode(!1===i),u=i?"after":"before",Rn(a)&&a.getAttribute("data-mce-caret")===u?(t=e,n=o.getNode(!1===e),(t&&qn(n.nextSibling)?U.some(cC.moveToElement(n.nextSibling)):!1===t&&qn(n.previousSibling)?U.some(cC.moveToElement(n.previousSibling)):U.none()).fold(function(){return fC(r,e,o)},U.some)):fC(r,e,o).bind(function(e){return t=r,n=o,e.fold(function(e){return U.some(cC.remove(e))},function(e){return U.some(cC.moveToElement(e))},function(e){return Qc(n,e,t)?U.none():U.some(cC.moveToPosition(e))});var t,n});var t,n,i,a,u},mC=function(e,t){return U.from(Jf(e.getBody(),t))},pC=function(a,u){var e=a.selection.getNode();return mC(a,e).filter(qn).fold(function(){return e=a.getBody(),t=u,n=a.selection.getRng(),r=ol(t?1:-1,e,n),o=Is.fromRangeStart(r),i=Rt.fromDom(e),(!1===t&&ip(o)?U.some(cC.remove(o.getNode(!0))):t&&op(o)?U.some(cC.remove(o.getNode())):!1===t&&op(o)&&Sp(i,o)?Np(i,o).map(function(e){return cC.remove(e.getNode())}):t&&ip(o)&&xp(i,o)?Ep(i,o).map(function(e){return cC.remove(e.getNode())}):dC(e,t,o)).exists(function(e){return e.fold(function(e){return o._selectionOverrides.hideFakeCaret(),eg(o,i,Rt.fromDom(e)),!0},(r=i=u,function(e){var t=r?Is.before(e):Is.after(e);return n.selection.setRng(t.toRange()),!0}),(t=n=o=a,function(e){return t.selection.setRng(e.toRange()),!0}));var t,n,r,o,i});var e,t,n,r,o,i},w)},gC=function(t,n){var e=t.selection.getNode();return!!qn(e)&&mC(t,e.parentNode).filter(qn).fold(function(){var e;return e=Rt.fromDom(t.getBody()),Y(qu(e,".mce-offscreen-selection"),gn),eg(t,n,Rt.fromDom(t.selection.getNode())),Ib(t),!0},w)},hC=function(e){var t,n=e.dom,r=e.selection,o=Jf(e.getBody(),r.getNode());return Vn(o)&&n.isBlock(o)&&n.isEmpty(o)&&(t=n.create("br",{"data-mce-bogus":"1"}),n.setHTML(o,""),o.appendChild(t),r.setRng(Is.before(t).toRange())),!0},vC=function(e,t){return(e.selection.isCollapsed()?pC:gC)(e,t)},yC=function(e,t){return!!e.selection.isCollapsed()&&(n=e,r=t,o=Is.fromRangeStart(n.selection.getRng()),Rl(r,n.getBody(),o).filter(function(e){return(r?Qm:Zm)(e)}).bind(function(e){return U.from(Zc(r?0:-1,e))}).exists(function(e){return n.selection.select(e),!0}));var n,r,o},bC=Mn,CC=function(e){return bC(e)&&e.data[0]===mo},wC=function(e){return bC(e)&&e.data[e.data.length-1]===mo},xC=function(e){return e.ownerDocument.createTextNode(mo)},SC=function(e,t){return(e?function(e){if(bC(e.previousSibling))return wC(e.previousSibling)||e.previousSibling.appendData(mo),e.previousSibling;if(bC(e))return CC(e)||e.insertData(0,mo),e;var t=xC(e);return e.parentNode.insertBefore(t,e),t}:function(e){if(bC(e.nextSibling))return CC(e.nextSibling)||e.nextSibling.insertData(0,mo),e.nextSibling;if(bC(e))return wC(e)||e.appendData(mo),e;var t=xC(e);return e.nextSibling?e.parentNode.insertBefore(t,e.nextSibling):e.parentNode.appendChild(t),t})(t)},NC=N(SC,!0),EC=N(SC,!1),kC=function(e,t){return Mn(e.container())?SC(t,e.container()):SC(t,e.getNode())},_C=function(e,t){var n=t.get();return n&&e.container()===n&&bo(n)},AC=function(n,e){return e.fold(function(e){Oc(n.get());var t=NC(e);return n.set(t),U.some(Is(t,t.length-1))},function(e){return Ll(e).map(function(e){if(_C(e,n))return Is(n.get(),1);Oc(n.get());var t=kC(e,!0);return n.set(t),Is(t,1)})},function(e){return Il(e).map(function(e){if(_C(e,n))return Is(n.get(),n.get().length-1);Oc(n.get());var t=kC(e,!1);return n.set(t),Is(t,t.length-1)})},function(e){Oc(n.get());var t=EC(e);return n.set(t),U.some(Is(t,1))})},RC=function(e,t){for(var n=0;n<e.length;n++){var r=e[n].apply(null,t);if(r.isSome())return r}return U.none()},TC=wr([{before:["element"]},{start:["element"]},{end:["element"]},{after:["element"]}]),DC=function(e,t){var n=Jc(t,e);return n||e},OC=function(e,t,n){var r=Bb(n),o=DC(t,r.container());return Db(e,o,r).fold(function(){return Bl(o,r).bind(N(Db,e,o)).map(function(e){return TC.before(e)})},U.none)},BC=function(e,t){return null===Ul(e,t)},PC=function(e,t,n){return Db(e,t,n).filter(N(BC,t))},LC=function(e,t,n){var r=Pb(n);return PC(e,t,r).bind(function(e){return Pl(e,r).isNone()?U.some(TC.start(e)):U.none()})},IC=function(e,t,n){var r=Bb(n);return PC(e,t,r).bind(function(e){return Bl(e,r).isNone()?U.some(TC.end(e)):U.none()})},MC=function(e,t,n){var r=Pb(n),o=DC(t,r.container());return Db(e,o,r).fold(function(){return Pl(o,r).bind(N(Db,e,o)).map(function(e){return TC.after(e)})},U.none)},FC=function(e){return!1===Tb(zC(e))},UC=function(e,t,n){return RC([OC,LC,IC,MC],[e,t,n]).filter(FC)},zC=function(e){return e.fold(o,o,o,o)},jC=function(e){return e.fold(S("before"),S("start"),S("end"),S("after"))},HC=function(e){return e.fold(TC.before,TC.before,TC.after,TC.after)},VC=function(e){return e.fold(TC.start,TC.start,TC.end,TC.end)},qC=function(a,e,u,t,n,s){return as(Db(e,u,t),Db(e,u,n),function(e,t){return e!==t&&(r=t,o=Jc(e,n=u),i=Jc(r,n),o&&o===i)?TC.after(a?e:t):s;var n,r,o,i}).getOr(s)},$C=function(e,r){return e.fold(w,function(e){return n=r,!(jC(t=e)===jC(n)&&zC(t)===zC(n));var t,n})},WC=function(e,t){return e?t.fold(a(U.some,TC.start),U.none,a(U.some,TC.after),U.none):t.fold(U.none,a(U.some,TC.before),U.none,a(U.some,TC.end))},KC=function(e,a,u,s){var t=Ob(e,s),c=UC(a,u,t);return UC(a,u,t).bind(N(WC,e)).orThunk(function(){return n=a,r=u,o=c,i=Ob(t=e,s),Rl(t,r,i).map(N(Ob,t)).fold(function(){return o.map(HC)},function(e){return UC(n,r,e).map(N(qC,t,n,r,i,e)).filter(N($C,o))}).filter(FC);var t,n,r,o,i})},XC=(N(KC,!1),N(KC,!0),function(e,t,n){var r=e?1:-1;return t.setRng(Is(n.container(),n.offset()+r).toRange()),t.getSel().modify("move",e?"forward":"backward","word"),!0}),YC=function(e,t){var n=t.selection.getRng(),r=e?Is.fromRangeEnd(n):Is.fromRangeStart(n);return!!D(t.selection.getSel().modify)&&(e&&xo(r)?XC(!0,t.selection,r):!(e||!So(r))&&XC(!1,t.selection,r))},GC=function(e,t){var n=e.dom.createRng();n.setStart(t.container(),t.offset()),n.setEnd(t.container(),t.offset()),e.selection.setRng(n)},JC=function(e,t){e?t.setAttribute("data-mce-selected","inline-boundary"):t.removeAttribute("data-mce-selected")},QC=function(t,e,n){return AC(e,n).map(function(e){return GC(t,e),n})},ZC=function(e,t){var n,r;e.selection.isCollapsed()&&!0!==e.composing&&t.get()&&(n=Is.fromRangeStart(e.selection.getRng()),Is.isTextPosition(n)&&!1===(xo(r=n)||So(r))&&(GC(e,Dc(t.get(),n)),t.set(null)))},ew=function(e,t,n){return!!wc(e)&&(o=t,i=n,a=(r=e).getBody(),u=Is.fromRangeStart(r.selection.getRng()),s=N(Rb,r),KC(i,s,a,u).bind(function(e){return QC(r,o,e)}).isSome());var r,o,i,a,u,s},tw=function(e,t,n){return!!wc(t)&&YC(e,t)},nw=function(d){var m=Au(null),p=N(Rb,d);return d.on("NodeChange",function(e){var n,r,o,t,i,a,u,s,c,l,f;!wc(d)||xt.browser.isIE()&&e.initial||(a=p,u=d.dom,s=e.parents,c=z(qu(Rt.fromDom(u.getRoot()),'*[data-mce-selected="inline-boundary"]'),function(e){return e.dom}),l=H(c,a),f=H(s,a),Y(ee(l,f),N(JC,!1)),Y(ee(f,l),N(JC,!0)),ZC(d,m),n=p,r=d,o=m,t=e.parents,r.selection.isCollapsed()&&(i=H(t,n),Y(i,function(e){var t=Is.fromRangeStart(r.selection.getRng());UC(n,r.getBody(),t).bind(function(e){return QC(r,o,e)})})))}),m},rw=N(tw,!0),ow=N(tw,!1),iw=function(t,n){return function(e){return AC(n,e).exists(function(e){return GC(t,e),!0})}},aw=function(r,o,i,a){var u=r.getBody(),s=N(Rb,r);r.undoManager.ignore(function(){var e,t,n;r.selection.setRng((e=i,t=a,(n=document.createRange()).setStart(e.container(),e.offset()),n.setEnd(t.container(),t.offset()),n)),r.execCommand("Delete"),UC(s,u,Is.fromRangeStart(r.selection.getRng())).map(VC).map(iw(r,o))}),r.nodeChanged()},uw=function(n,r,i,o){var e,t,a=(e=n.getBody(),t=o.container(),Jc(t,e)||e),u=N(Rb,n),s=UC(u,a,o);return s.bind(function(e){return i?e.fold(S(U.some(VC(e))),U.none,S(U.some(HC(e))),U.none):e.fold(U.none,S(U.some(HC(e))),U.none,S(U.some(VC(e))))}).map(iw(n,r)).getOrThunk(function(){var t=Tl(i,a,o),e=t.bind(function(e){return UC(u,a,e)});return as(s,e,function(){return Db(u,a,o).exists(function(e){return!!as(Ll(o=e),Il(o),function(e,t){var n=Ob(!0,e),r=Ob(!1,t);return Bl(o,n).forall(function(e){return e.isEqual(r)})}).getOr(!0)&&(eg(n,i,Rt.fromDom(e)),!0);var o})}).orThunk(function(){return e.bind(function(e){return t.map(function(e){return i?aw(n,r,o,e):aw(n,r,e,o),!0})})}).getOr(!1)})},sw=function(e,t,n){if(e.selection.isCollapsed()&&wc(e)){var r=Is.fromRangeStart(e.selection.getRng());return uw(e,t,n,r)}return!1},cw=function(e){return 1===Jt(e).length},lw=function(e,t,n,r){var o,i,a,u,s,c=N(gh,t),l=z(H(r,c),function(e){return e.dom});0===l.length?eg(t,e,n):(i=n.dom,a=l,u=sh(!1),s=dh(a,u.dom),cn(Rt.fromDom(i),u),gn(Rt.fromDom(i)),o=Is(s,0),t.selection.setRng(o.toRange()))},fw=function(r,o){var t,e=Rt.fromDom(r.getBody()),n=Rt.fromDom(r.selection.getStart()),s=H((t=fp(n,e),G(t,to).fold(S(t),function(e){return t.slice(0,e)})),cw);return oe(s).exists(function(e){var t,i,a,u,n=Is.fromRangeStart(r.selection.getRng());return i=o,a=n,u=e.dom,!(!as(Ll(u),Il(u),function(e,t){var n=Ob(!0,e),r=Ob(!1,t),o=Ob(!1,a);return i?Bl(u,o).exists(function(e){return e.isEqual(r)&&a.isEqual(n)}):Pl(u,o).exists(function(e){return e.isEqual(n)&&a.isEqual(r)})}).getOr(!0)||Fl((t=e).dom)&&ah(t.dom))&&(lw(o,r,e,s),!0)})},dw=function(e,t){return!!e.selection.isCollapsed()&&fw(e,t)},mw=function(e,t,n){return e._selectionOverrides.hideFakeCaret(),eg(e,t,Rt.fromDom(n)),!0},pw=function(e,t){return e.selection.isCollapsed()?(i=e,u=(a=t)?ep:tp,s=a?Ms.Forwards:Ms.Backwards,c=al(s,i.getBody(),i.selection.getRng()),u(c)?mw(i,a,c.getNode(!a)):U.from(Ob(a,c)).filter(function(e){return u(e)&&cl(c,e)}).exists(function(e){return mw(i,a,e.getNode(!a))})):(r=t,o=(n=e).selection.getNode(),!!Wn(o)&&mw(n,r,o));var n,r,o,i,a,u,s,c},gw=function(e){var t=parseInt(e,10);return isNaN(t)?0:t},hw=function(e,t){return(e||"table"===It(t)?"margin":"padding")+("rtl"===tr(t,"direction")?"-right":"-left")},vw=function(e){var r,t=bw(e);return!e.mode.isReadOnly()&&(1<t.length||(r=e,Q(t,function(e){var t=hw(hc(r),e),n=rr(e,t).map(gw).getOr(0);return"false"!==r.dom.getContentEditable(e.dom)&&0<n})))},yw=function(e){return io(e)||ao(e)},bw=function(e){return H(z(e.selection.getSelectedBlocks(),Rt.fromDom),function(e){return!yw(e)&&!Wt(e).map(yw).getOr(!1)&&Dr(e,function(e){return Vn(e.dom)||qn(e.dom)}).exists(function(e){return Vn(e.dom)})})},Cw=function(e,c){var l=e.dom,t=e.selection,n=e.formatter,r=e.getParam("indentation","40px","string"),f=/[a-z%]+$/i.exec(r)[0],d=parseInt(r,10),m=hc(e),o=lc(e);e.queryCommandState("InsertUnorderedList")||e.queryCommandState("InsertOrderedList")||""!==o||l.getParent(t.getNode(),l.isBlock)||n.apply("div"),Y(bw(e),function(e){var t,n,r,o,i,a,u,s;t=l,n=c,r=m,o=d,i=f,a=e.dom,s=hw(r,Rt.fromDom(a)),"outdent"===n?(u=Math.max(0,gw(a.style[s])-o),t.setStyle(a,s,u?u+i:"")):(u=gw(a.style[s])+o+i,t.setStyle(a,s,u))})},ww=function(e,t){if(e.selection.isCollapsed()&&vw(e)){var n=e.dom,r=e.selection.getRng(),o=Is.fromRangeStart(r),i=n.getParent(r.startContainer,n.isBlock);if(null!==i&&hp(Rt.fromDom(i),o))return Cw(e,"outdent"),!0}return!1},xw=function(e,t){e.getDoc().execCommand(t,!1,null)},Sw=function(n,r){n.addCommand("delete",function(){var e,t;t=r,ww(e=n)||vC(e,!1)||sC(e,!1)||sw(e,t,!1)||Xb(e,!1)||_g(e)||yC(e,!1)||pw(e,!1)||Qb(e)||dw(e,!1)||(xw(e,"Delete"),Ib(e))}),n.addCommand("forwardDelete",function(){var e,t;t=r,vC(e=n,!0)||sC(e,!0)||sw(e,t,!0)||Xb(e,!0)||_g(e)||yC(e,!0)||pw(e,!0)||Qb(e)||dw(e,!0)||xw(e,"ForwardDelete")})},Nw=function(e){return e.touches===undefined||1!==e.touches.length?U.none():U.some(e.touches[0])},Ew=function(a){var u=Au(U.none()),s=Au(!1),r=Lu(function(e){a.fire("longpress",_e(_e({},e),{type:"longpress"})),s.set(!0)},400);a.on("touchstart",function(n){Nw(n).each(function(e){r.cancel();var t={x:e.clientX,y:e.clientY,target:n.target};r.throttle(n),s.set(!1),u.set(U.some(t))})},!0),a.on("touchmove",function(e){r.cancel(),Nw(e).each(function(i){u.get().each(function(e){var t,n,r,o;t=i,n=e,r=Math.abs(t.clientX-n.x),o=Math.abs(t.clientY-n.y),(5<r||5<o)&&(u.set(U.none()),s.set(!1),a.fire("longpresscancel"))})})},!0),a.on("touchend touchcancel",function(t){r.cancel(),"touchcancel"!==t.type&&u.get().filter(function(e){return e.target.isEqualNode(t.target)}).each(function(){s.get()?t.preventDefault():a.fire("tap",_e(_e({},t),{type:"tap"}))})},!0)},kw=function(e,t){return e.hasOwnProperty(t.nodeName)},_w=function(e){var t,n,r,o=e.dom,i=e.selection,a=e.schema,u=a.getBlockElements(),s=i.getStart(),c=e.getBody(),l=lc(e);if(s&&Rn(s)&&l){var f=c.nodeName.toLowerCase();if(a.isValidChild(f,l.toLowerCase())&&(d=u,m=c,p=s,!F(lp(Rt.fromDom(p),Rt.fromDom(m)),function(e){return kw(d,e.dom)}))){for(var d,m,p,g,h,v=i.getRng(),y=v.startContainer,b=v.startOffset,C=v.endContainer,w=v.endOffset,x=vm(e),s=c.firstChild;s;)if(g=u,Mn(h=s)||Rn(h)&&!kw(g,h)&&!Xl(h)){if(function(e,t){if(Mn(t)){if(0===t.nodeValue.length)return!0;if(/^\s+$/.test(t.nodeValue)&&(!t.nextSibling||kw(e,t.nextSibling)))return!0}return!1}(u,s)){s=(n=s).nextSibling,o.remove(n);continue}t||(t=o.create(l,fc(e)),s.parentNode.insertBefore(t,s),r=!0),s=(n=s).nextSibling,t.appendChild(n)}else t=null,s=s.nextSibling;r&&x&&(v.setStart(y,b),v.setEnd(C,w),i.setRng(v),e.nodeChanged())}}},Aw=function(e,t){var n;t.hasAttribute("data-mce-caret")&&(_o(t),(n=e).selection.setRng(n.selection.getRng()),e.selection.scrollIntoView(t))},Rw=function(e,t){var n,r=(n=e,Pr(Rt.fromDom(n.getBody()),"*[data-mce-caret]").fold(S(null),function(e){return e.dom}));if(r)return"compositionstart"===t.type?(t.preventDefault(),t.stopPropagation(),void Aw(e,r)):void(wo(r)&&(Aw(e,r),e.undoManager.add()))};(Gy=Yy=Yy||{})[Gy.Br=0]="Br",Gy[Gy.Block=1]="Block",Gy[Gy.Wrap=2]="Wrap",Gy[Gy.Eol=3]="Eol";var Tw,Dw,Ow=function(e,t){return e===Ms.Backwards?Z(t):t},Bw=function(e,t,n,r){for(var o,i,a,u,s,c,l=Nl(n),f=r,d=[];f&&(s=l,c=f,o=t===Ms.Forwards?s.next(c):s.prev(c));){if(jn(o.getNode(!1)))return t===Ms.Forwards?{positions:Ow(t,d).concat([o]),breakType:Yy.Br,breakAt:U.some(o)}:{positions:Ow(t,d),breakType:Yy.Br,breakAt:U.some(o)};if(o.isVisible()){if(e(f,o)){var m=(i=t,a=f,jn((u=o).getNode(i===Ms.Forwards))?Yy.Br:!1===Qc(a,u)?Yy.Block:Yy.Wrap);return{positions:Ow(t,d),breakType:m,breakAt:U.some(o)}}d.push(o),f=o}else f=o}return{positions:Ow(t,d),breakType:Yy.Eol,breakAt:U.none()}},Pw=function(n,r,o,e){return r(o,e).breakAt.map(function(e){var t=r(o,e).positions;return n===Ms.Backwards?t.concat(e):[e].concat(t)}).getOr([])},Lw=function(e,i){return $(e,function(e,o){return e.fold(function(){return U.some(o)},function(r){return as(re(r.getClientRects()),re(o.getClientRects()),function(e,t){var n=Math.abs(i-e.left);return Math.abs(i-t.left)<=n?o:r}).or(e)})},U.none())},Iw=function(t,e){return re(e.getClientRects()).bind(function(e){return Lw(t,e.left)})},Mw=N(Bw,Is.isAbove,-1),Fw=N(Bw,Is.isBelow,1),Uw=N(Pw,-1,Mw),zw=N(Pw,1,Fw),jw=function(t){var e=function(e){return z(e,function(e){return(e=ss(e)).node=t,e})};if(Rn(t))return e(t.getClientRects());if(Mn(t)){var n=t.ownerDocument.createRange();return n.setStart(t,0),n.setEnd(t,t.data.length),e(n.getClientRects())}},Hw=function(e){return J(e,jw)};(Dw=Tw=Tw||{})[Dw.Up=-1]="Up",Dw[Dw.Down=1]="Down";var Vw=function(o,i,a,e,u,t){var s=0,c=[],n=function(e){var t,n,r=Hw([e]);for(-1===o&&(r=r.reverse()),t=0;t<r.length;t++)if(n=r[t],!a(n,l)){if(0<c.length&&i(n,ke(c))&&s++,n.line=s,u(n))return!0;c.push(n)}},l=ke(t.getClientRects());if(!l)return c;var r=t.getNode();return n(r),function(e,t,n,r){for(;r=Gc(r,e,Fo,t);)if(n(r))return}(o,e,n,r),c},qw=N(Vw,Tw.Up,fs,ds),$w=N(Vw,Tw.Down,ds,fs),Ww=function(n){return function(e){return t=n,e.line>t;var t}},Kw=function(n){return function(e){return t=n,e.line===t;var t}},Xw=qn,Yw=Gc,Gw=function(e,t){return Math.abs(e.left-t)},Jw=function(e,t){return Math.abs(e.right-t)},Qw=function(e,t){return e>=t.left&&e<=t.right},Zw=function(e,t){return e>=t.top&&e<=t.bottom},ex=function(e,o){return Ne(e,function(e,t){var n=Math.min(Gw(e,o),Jw(e,o)),r=Math.min(Gw(t,o),Jw(t,o));return Qw(o,t)||!Qw(o,e)&&(r===n&&Xw(t.node)||r<n)?t:e})},tx=function(e,t,n,r,o){var i=Yw(r,e,Fo,t,!o);do{if(!i||n(i))return}while(i=Yw(i,e,Fo,t))},nx=function(e,t,n){var r,o,i=Hw(H(ie(e.getElementsByTagName("*")),jc)),a=H(i,N(Zw,n));if(u=ex(a,t)){var u,s=!Pn(u.node)&&!Wn(u.node);if((u=ex(function(e,r,t){void 0===t&&(t=!0);var o=[],n=function(t,e){var n=H(Hw([e]),function(e){return!t(e,r)});return o=o.concat(n),0===n.length};return o.push(r),tx(Tw.Up,e,N(n,fs),r.node,t),tx(Tw.Down,e,N(n,ds),r.node,t),o}(e,u,s),t))&&jc(u.node))return o=t,{node:(r=u).node,before:Gw(r,o)<Jw(r,o)}}return null},rx=function(e,t){e.selection.setRng(t),zd(e,e.selection.getRng())},ox=function(e,t,n){return U.some(oC(e,t,n))},ix=function(e,t,n,r,o,i){var a=t===Ms.Forwards,u=Nl(e.getBody()),s=N(sl,a?u.next:u.prev),c=a?r:o;if(!n.collapsed){var l=ps(n);if(i(l))return tC(t,e,l,t===Ms.Backwards,!1)}var f=al(t,e.getBody(),n);if(c(f))return nC(e,f.getNode(!a));var d=Ob(a,s(f)),m=yo(n.startContainer);if(!d)return m?U.some(n):U.none();if(c(d))return tC(t,e,d.getNode(!a),a,!1);var p=s(d);return p&&c(p)&&cl(d,p)?tC(t,e,p.getNode(!a),a,!1):m?ox(e,d.toRange(),!1):U.none()},ax=function(t,e,n,r,o,i){var a=al(e,t.getBody(),n),u=ke(a.getClientRects()),s=e===Tw.Down;if(!u)return U.none();var c,l=(s?$w:qw)(t.getBody(),Ww(1),a),f=H(l,Kw(1)),d=u.left,m=ex(f,d);if(m&&i(m.node)){var p=Math.abs(d-m.left),g=Math.abs(d-m.right);return tC(e,t,m.node,p<g,!1)}if(c=r(a)?a.getNode():o(a)?a.getNode(!0):ps(n)){var h=function(e,t,n,r){var o,i,a,u,s=Nl(t),c=[],l=0,f=function(e){return ke(e.getClientRects())},d=1===e?(o=s.next,i=ds,a=fs,Is.after(r)):(o=s.prev,i=fs,a=ds,Is.before(r)),m=f(d);do{if(d.isVisible()&&!a(u=f(d),m)){if(0<c.length&&i(u,ke(c))&&l++,(u=ss(u)).position=d,u.line=l,n(u))return c;c.push(u)}}while(d=o(d));return c}(e,t.getBody(),Ww(1),c),v=ex(H(h,Kw(1)),d);if(v)return ox(t,v.position.toRange(),!1);if(v=ke(H(h,Kw(0))))return ox(t,v.position.toRange(),!1)}return 0===f.length?ux(t,s).filter(s?o:r).map(function(e){return oC(t,e.toRange(),!1)}):U.none()},ux=function(e,t){var n=e.selection.getRng(),r=e.getBody();if(t){var o=Is.fromRangeEnd(n),i=Fw(r,o);return oe(i.positions)}o=Is.fromRangeStart(n),i=Mw(r,o);return re(i.positions)},sx=function(t,e,n){return ux(t,e).filter(n).exists(function(e){return t.selection.setRng(e.toRange()),!0})},cx=qn,lx=function(e,t,n){var r,o,i=Nl(e.getBody()),a=N(sl,1===t?i.next:i.prev);if(n.collapsed&&""!==lc(e)){var u,s=e.dom.getParent(n.startContainer,"PRE");if(!s)return;a(Is.fromRangeStart(n))||(o=(r=e).dom.create(lc(r)),(!xt.ie||11<=xt.ie)&&(o.innerHTML='<br data-mce-bogus="1">'),u=o,1===t?e.$(s).after(u):e.$(s).before(u),e.selection.select(u,!0),e.selection.collapse())}},fx=function(e,t){var n=t?Ms.Forwards:Ms.Backwards,r=e.selection.getRng();return ix(e,n,r,op,ip,cx).orThunk(function(){return lx(e,n,r),U.none()})},dx=function(e,t){var n=t?1:-1,r=e.selection.getRng();return ax(e,n,r,function(e){return op(e)||np(e)},function(e){return ip(e)||rp(e)},cx).orThunk(function(){return lx(e,n,r),U.none()})},mx=function(t,e){return fx(t,e).exists(function(e){return rx(t,e),!0})},px=function(t,e){return dx(t,e).exists(function(e){return rx(t,e),!0})},gx=function(e,t){return sx(e,t,t?ip:op)},hx=function(e){return M(["figcaption"],It(e))},vx=function(e){var t=document.createRange();return t.setStartBefore(e.dom),t.setEndBefore(e.dom),t},yx=function(e,t,n){(n?dn:fn)(e,t)},bx=function(e,t,n,r){return""===t?(l=e,f=r,d=Rt.fromTag("br"),yx(l,d,f),vx(d)):(o=e,i=r,a=t,u=n,s=Rt.fromTag(a),c=Rt.fromTag("br"),Gn(s,u),dn(s,c),yx(o,s,i),vx(c));var o,i,a,u,s,c,l,f,d},Cx=function(e,t,n){return t?(o=e.dom,Fw(o,n).breakAt.isNone()):(r=e.dom,Mw(r,n).breakAt.isNone());var r,o},wx=function(t,n){var e,r,o=Rt.fromDom(t.getBody()),i=Is.fromRangeStart(t.selection.getRng()),a=lc(t),u=fc(t);return e=i,r=N(Bt,o),Dr(Rt.fromDom(e.container()),to,r).filter(hx).exists(function(){if(Cx(o,n,i)){var e=bx(o,a,u,n);return t.selection.setRng(e),!0}return!1})},xx=function(e,t){return!!e.selection.isCollapsed()&&wx(e,t)},Sx=function(e,r){return J(z(e,function(e){return _e({shiftKey:!1,altKey:!1,ctrlKey:!1,metaKey:!1,keyCode:0,action:te},e)}),function(e){return t=e,(n=r).keyCode===t.keyCode&&n.shiftKey===t.shiftKey&&n.altKey===t.altKey&&n.ctrlKey===t.ctrlKey&&n.metaKey===t.metaKey?[e]:[];var t,n})},Nx=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];return function(){return e.apply(null,t)}},Ex=function(e,t){return W(Sx(e,t),function(e){return e.action()})},kx=function(t,e){var n=e?Ms.Forwards:Ms.Backwards,r=t.selection.getRng();return ix(t,n,r,ep,tp,Wn).exists(function(e){return rx(t,e),!0})},_x=function(t,e){var n=e?1:-1,r=t.selection.getRng();return ax(t,n,r,ep,tp,Wn).exists(function(e){return rx(t,e),!0})},Ax=function(e,t){return sx(e,t,t?tp:ep)},Rx=function(o,e){return J(e,function(e){var t,n,r=(t=ss(e.getBoundingClientRect()),n=-1,{left:t.left-n,top:t.top-n,right:t.right+2*n,bottom:t.bottom+2*n,width:t.width+n,height:t.height+n});return[{x:r.left,y:o(r),cell:e},{x:r.right,y:o(r),cell:e}]})},Tx=function(e,t,n,r,o){var i,a,u=qu(Rt.fromDom(n),"td,th,caption").map(function(e){return e.dom}),s=H(Rx(e,u),function(e){return t(e,o)});return i=r,a=o,$(s,function(e,r){return e.fold(function(){return U.some(r)},function(e){var t=Math.sqrt(Math.abs(e.x-i)+Math.abs(e.y-a)),n=Math.sqrt(Math.abs(r.x-i)+Math.abs(r.y-a));return U.some(n<t?r:e)})},U.none()).map(function(e){return e.cell})},Dx=N(Tx,function(e){return e.bottom},function(e,t){return e.y<t}),Ox=N(Tx,function(e){return e.top},function(e,t){return e.y>t}),Bx=function(t,n){return re(n.getClientRects()).bind(function(e){return Dx(t,e.left,e.top)}).bind(function(e){return Iw(Il(t=e).map(function(e){return Mw(t,e).positions.concat(e)}).getOr([]),n);var t})},Px=function(t,n){return oe(n.getClientRects()).bind(function(e){return Ox(t,e.left,e.top)}).bind(function(e){return Iw(Ll(t=e).map(function(e){return[e].concat(Fw(t,e).positions)}).getOr([]),n);var t})},Lx=function(e,t,n){var r,o,i,a,u=e(t,n);return(a=u).breakType===Yy.Wrap&&0===a.positions.length||!jn(n.getNode())&&((i=u).breakType===Yy.Br&&1===i.positions.length)?(r=e,o=t,!u.breakAt.exists(function(e){return r(o,e).breakAt.isSome()})):u.breakAt.isNone()},Ix=N(Lx,Mw),Mx=N(Lx,Fw),Fx=function(t,e,n,r){var o,i,a,u,s=t.selection.getRng(),c=e?1:-1;return!(!Uc()||(o=e,i=s,a=n,u=Is.fromRangeStart(i),!Ol(!o,a).exists(function(e){return e.isEqual(u)})))&&(tC(c,t,n,!e,!1).each(function(e){rx(t,e)}),!0)},Ux=function(e,t){var n=t.getNode(e);return Rn(n)&&"TABLE"===n.nodeName?U.some(n):U.none()},zx=function(u,s,c){var e=Ux(!!s,c),t=!1===s;e.fold(function(){return rx(u,c.toRange())},function(a){return Ol(t,u.getBody()).filter(function(e){return e.isEqual(c)}).fold(function(){return rx(u,c.toRange())},function(e){return n=s,o=a,t=c,void((i=lc(r=u))?r.undoManager.transact(function(){var e=Rt.fromTag(i);Gn(e,fc(r)),dn(e,Rt.fromTag("br")),(n?ln:cn)(Rt.fromDom(o),e);var t=r.dom.createRng();t.setStart(e.dom,0),t.setEnd(e.dom,0),rx(r,t)}):rx(r,t.toRange()));var n,r,o,t,i})})},jx=function(e,t,n,r){var o,i,a,u,s,c,l=e.selection.getRng(),f=Is.fromRangeStart(l),d=e.getBody();if(!t&&Ix(r,f)){var m=(u=d,Bx(s=n,c=f).orThunk(function(){return re(c.getClientRects()).bind(function(e){return Lw(Uw(u,Is.before(s)),e.left)})}).getOr(Is.before(s)));return zx(e,t,m),!0}if(t&&Mx(r,f)){m=(o=d,Px(i=n,a=f).orThunk(function(){return re(a.getClientRects()).bind(function(e){return Lw(zw(o,Is.after(i)),e.left)})}).getOr(Is.after(i)));return zx(e,t,m),!0}return!1},Hx=function(n,r,o){return U.from(n.dom.getParent(n.selection.getNode(),"td,th")).bind(function(t){return U.from(n.dom.getParent(t,"table")).map(function(e){return o(n,r,e,t)})}).getOr(!1)},Vx=function(e,t){return Hx(e,t,Fx)},qx=function(e,t){return Hx(e,t,jx)},$x=function(i,a){i.on("keydown",function(e){var t,n,r,o;!1===e.isDefaultPrevented()&&(t=i,n=a,r=e,o=mt().os,Ex([{keyCode:ed.RIGHT,action:Nx(mx,t,!0)},{keyCode:ed.LEFT,action:Nx(mx,t,!1)},{keyCode:ed.UP,action:Nx(px,t,!1)},{keyCode:ed.DOWN,action:Nx(px,t,!0)},{keyCode:ed.RIGHT,action:Nx(Vx,t,!0)},{keyCode:ed.LEFT,action:Nx(Vx,t,!1)},{keyCode:ed.UP,action:Nx(qx,t,!1)},{keyCode:ed.DOWN,action:Nx(qx,t,!0)},{keyCode:ed.RIGHT,action:Nx(kx,t,!0)},{keyCode:ed.LEFT,action:Nx(kx,t,!1)},{keyCode:ed.UP,action:Nx(_x,t,!1)},{keyCode:ed.DOWN,action:Nx(_x,t,!0)},{keyCode:ed.RIGHT,action:Nx(ew,t,n,!0)},{keyCode:ed.LEFT,action:Nx(ew,t,n,!1)},{keyCode:ed.RIGHT,ctrlKey:!o.isOSX(),altKey:o.isOSX(),action:Nx(rw,t,n)},{keyCode:ed.LEFT,ctrlKey:!o.isOSX(),altKey:o.isOSX(),action:Nx(ow,t,n)},{keyCode:ed.UP,action:Nx(xx,t,!1)},{keyCode:ed.DOWN,action:Nx(xx,t,!0)}],r).each(function(e){r.preventDefault()}))})},Wx=function(o,i){o.on("keydown",function(e){var t,n,r;!1===e.isDefaultPrevented()&&(t=o,n=i,r=e,Ex([{keyCode:ed.BACKSPACE,action:Nx(ww,t,!1)},{keyCode:ed.BACKSPACE,action:Nx(vC,t,!1)},{keyCode:ed.DELETE,action:Nx(vC,t,!0)},{keyCode:ed.BACKSPACE,action:Nx(sC,t,!1)},{keyCode:ed.DELETE,action:Nx(sC,t,!0)},{keyCode:ed.BACKSPACE,action:Nx(sw,t,n,!1)},{keyCode:ed.DELETE,action:Nx(sw,t,n,!0)},{keyCode:ed.BACKSPACE,action:Nx(_g,t,!1)},{keyCode:ed.DELETE,action:Nx(_g,t,!0)},{keyCode:ed.BACKSPACE,action:Nx(yC,t,!1)},{keyCode:ed.DELETE,action:Nx(yC,t,!0)},{keyCode:ed.BACKSPACE,action:Nx(pw,t,!1)},{keyCode:ed.DELETE,action:Nx(pw,t,!0)},{keyCode:ed.BACKSPACE,action:Nx(Qb,t,!1)},{keyCode:ed.DELETE,action:Nx(Qb,t,!0)},{keyCode:ed.BACKSPACE,action:Nx(Xb,t,!1)},{keyCode:ed.DELETE,action:Nx(Xb,t,!0)},{keyCode:ed.BACKSPACE,action:Nx(dw,t,!1)},{keyCode:ed.DELETE,action:Nx(dw,t,!0)}],r).each(function(e){r.preventDefault()}))}),o.on("keyup",function(e){var t,n;!1===e.isDefaultPrevented()&&(t=o,n=e,Ex([{keyCode:ed.BACKSPACE,action:Nx(hC,t)},{keyCode:ed.DELETE,action:Nx(hC,t)}],n))})},Kx=function(e,t){var n,r,o=t,i=e.dom,a=e.schema.getMoveCaretBeforeOnEnterElements();if(t){!/^(LI|DT|DD)$/.test(t.nodeName)||(r=function(e){for(;e;){if(1===e.nodeType||3===e.nodeType&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}}(t.firstChild))&&/^(UL|OL|DL)$/.test(r.nodeName)&&t.insertBefore(i.doc.createTextNode(fo),t.firstChild);var u=i.createRng();if(t.normalize(),t.hasChildNodes()){for(var s=new Yr(t,t);n=s.current();){if(Mn(n)){u.setStart(n,0),u.setEnd(n,0);break}if(a[n.nodeName.toLowerCase()]){u.setStartBefore(n),u.setEndBefore(n);break}o=n,n=s.next()}n||(u.setStart(o,0),u.setEnd(o,0))}else jn(t)?t.nextSibling&&i.isBlock(t.nextSibling)?(u.setStartBefore(t),u.setEndBefore(t)):(u.setStartAfter(t),u.setEndAfter(t)):(u.setStart(t,0),u.setEnd(t,0));e.selection.setRng(u),zd(e,u)}},Xx=function(e){return U.from(e.dom.getParent(e.selection.getStart(!0),e.dom.isBlock))},Yx=function(e,t){return e&&e.parentNode&&e.parentNode.nodeName===t},Gx=function(e){return e&&/^(OL|UL|LI)$/.test(e.nodeName)},Jx=function(e){var t=e.parentNode;return/^(LI|DT|DD)$/.test(t.nodeName)?t:e},Qx=function(e,t,n){for(var r=e[n?"firstChild":"lastChild"];r&&!Rn(r);)r=r[n?"nextSibling":"previousSibling"];return r===t},Zx=function(e,t,n,r,o){var i,a,u,s,c,l,f,d,m,p=e.dom,g=e.selection.getRng();n!==e.getBody()&&(Gx(i=n)&&Gx(i.parentNode)&&(o="LI"),a=o?t(o):p.create("BR"),Qx(n,r,!0)&&Qx(n,r,!1)?Yx(n,"LI")?(u=Jx(n),p.insertAfter(a,u),(null===(m=(d=n).parentNode)||void 0===m?void 0:m.firstChild)===d?p.remove(u):p.remove(n)):p.replace(a,n):(Qx(n,r,!0)?Yx(n,"LI")?(p.insertAfter(a,Jx(n)),a.appendChild(p.doc.createTextNode(" ")),a.appendChild(n)):n.parentNode.insertBefore(a,n):Qx(n,r,!1)?p.insertAfter(a,Jx(n)):(n=Jx(n),(s=g.cloneRange()).setStartAfter(r),s.setEndAfter(n),c=s.extractContents(),"LI"===o&&(f="LI",(l=c).firstChild&&l.firstChild.nodeName===f)?(a=c.firstChild,p.insertAfter(c,n)):(p.insertAfter(c,n),p.insertAfter(a,n))),p.remove(r)),Kx(e,a))},eS=function(e){e.innerHTML='<br data-mce-bogus="1">'},tS=function(e,t){return e.nodeName===t||e.previousSibling&&e.previousSibling.nodeName===t},nS=function(e,t){return t&&e.isBlock(t)&&!/^(TD|TH|CAPTION|FORM)$/.test(t.nodeName)&&!/^(fixed|absolute)/i.test(t.style.position)&&"true"!==e.getContentEditable(t)},rS=function(e,t,n){return!1===Mn(t)?n:e?1===n&&t.data.charAt(n-1)===mo?0:n:n===t.data.length-1&&t.data.charAt(n)===mo?t.data.length:n},oS=function(e,t){for(var n,r=e.getRoot(),o=t;o!==r&&"false"!==e.getContentEditable(o);)"true"===e.getContentEditable(o)&&(n=o),o=o.parentNode;return o!==r?n:r},iS=function(e,t){var n=lc(e);n&&n.toLowerCase()===t.tagName.toLowerCase()&&function(e,o,t){var i=e.dom;U.from(t.style).map(i.parseStyle).each(function(e){var t=or(Rt.fromDom(o)),n=_e(_e({},t),e);i.setStyles(o,n)});var n=U.from(t["class"]).map(function(e){return e.split(/\s+/)}),r=U.from(o.className).map(function(e){return H(e.split(/\s+/),function(e){return""!==e})});as(n,r,function(t,e){var n=H(e,function(e){return!M(t,e)}),r=Ae(t,n);i.setAttrib(o,"class",r.join(" "))});var a=["style","class"],u=pe(t,function(e,t){return!M(a,t)});i.setAttribs(o,u)}(e,t,fc(e))},aS=function(a,e){var t,u,i,s,n,r,o,c,l,f=a.dom,d=a.schema,m=d.getNonEmptyElements(),p=a.selection.getRng(),g=function(e){var t,n=u,r=d.getTextInlineElements(),o=e||"TABLE"===c||"HR"===c?f.create(e||N):s.cloneNode(!1),i=o;if(!1===a.getParam("keep_styles",!0))f.setAttrib(o,"style",null),f.setAttrib(o,"class",null);else do{if(r[n.nodeName]){if(Fl(n)||Xl(n))continue;t=n.cloneNode(!1),f.setAttrib(t,"id",""),o.hasChildNodes()?t.appendChild(o.firstChild):i=t,o.appendChild(t)}}while((n=n.parentNode)&&n!==E);return iS(a,o),eS(i),o},h=function(e){var t,n,r=rS(e,u,i);if(Mn(u)&&(e?0<r:r<u.nodeValue.length))return!1;if(u.parentNode===s&&l&&!e)return!0;if(e&&Rn(u)&&u===s.firstChild)return!0;if(tS(u,"TABLE")||tS(u,"HR"))return l&&!e||!l&&e;var o=new Yr(u,s);for(Mn(u)&&(e&&0===r?o.prev():e||r!==u.nodeValue.length||o.next());t=o.current();){if(Rn(t)){if(!t.getAttribute("data-mce-bogus")&&(n=t.nodeName.toLowerCase(),m[n]&&"br"!==n))return!1}else if(Mn(t)&&!zo(t.nodeValue))return!1;e?o.prev():o.next()}return!0},v=function(){n=/^(H[1-6]|PRE|FIGURE)$/.test(c)&&"HGROUP"!==C?g(N):g(),a.getParam("end_container_on_empty_block",!1)&&nS(f,o)&&f.isEmpty(s)?n=f.split(o,s):f.insertAfter(n,s),Kx(a,n)};fd(f,p).each(function(e){p.setStart(e.startContainer,e.startOffset),p.setEnd(e.endContainer,e.endOffset)}),u=p.startContainer,i=p.startOffset,N=lc(a);var y=!(!e||!e.shiftKey),b=!(!e||!e.ctrlKey);Rn(u)&&u.hasChildNodes()&&(l=i>u.childNodes.length-1,u=u.childNodes[Math.min(i,u.childNodes.length-1)]||u,i=l&&Mn(u)?u.nodeValue.length:0);var C,w,x,S,N,E=oS(f,u);E&&((N&&!y||!N&&y)&&(u=function(e,t,n,r,o){var i,a,u,s,c,l,f=t||"P",d=e.dom,m=oS(d,r),p=d.getParent(r,d.isBlock);if(!p||!nS(d,p)){if(c=(p=p||m)===e.getBody()||(l=p)&&/^(TD|TH|CAPTION)$/.test(l.nodeName)?p.nodeName.toLowerCase():p.parentNode.nodeName.toLowerCase(),!p.hasChildNodes())return i=d.create(f),iS(e,i),p.appendChild(i),n.setStart(i,0),n.setEnd(i,0),i;for(u=r;u.parentNode!==p;)u=u.parentNode;for(;u&&!d.isBlock(u);)u=(a=u).previousSibling;if(a&&e.schema.isValidChild(c,f.toLowerCase())){for(i=d.create(f),iS(e,i),a.parentNode.insertBefore(i,a),u=a;u&&!d.isBlock(u);)s=u.nextSibling,i.appendChild(u),u=s;n.setStart(r,o),n.setEnd(r,o)}}return r}(a,N,p,u,i)),s=f.getParent(u,f.isBlock),o=s?f.getParent(s.parentNode,f.isBlock):null,c=s?s.nodeName.toUpperCase():"","LI"!==(C=o?o.nodeName.toUpperCase():"")||b||(o=(s=o).parentNode,c=C),/^(LI|DT|DD)$/.test(c)&&f.isEmpty(s)?Zx(a,g,o,s,N):N&&s===a.getBody()||(N=N||"P",yo(s)?(n=_o(s),f.isEmpty(s)&&eS(s),iS(a,n),Kx(a,n)):h()?v():h(!0)?(n=s.parentNode.insertBefore(g(),s),Kx(a,tS(s,"HR")?n:s)):((S=(x=p).cloneRange()).setStart(x.startContainer,rS(!0,x.startContainer,x.startOffset)),S.setEnd(x.endContainer,rS(!1,x.endContainer,x.endOffset)),(t=S.cloneRange()).setEndAfter(s),r=t.extractContents(),w=r,Y(Vu(Rt.fromDom(w),zt),function(e){var t=e.dom;t.nodeValue=go(t.nodeValue)}),function(e){for(;Mn(e)&&(e.nodeValue=e.nodeValue.replace(/^[\r\n]+/,"")),e=e.firstChild;);}(r),n=r.firstChild,f.insertAfter(r,s),function(e,t,n){var r,o,i,a=n,u=[];if(a){for(;a=a.firstChild;){if(e.isBlock(a))return;Rn(a)&&!t[a.nodeName.toLowerCase()]&&u.push(a)}for(r=u.length;r--;)!(a=u[r]).hasChildNodes()||a.firstChild===a.lastChild&&""===a.firstChild.nodeValue?e.remove(a):(o=e,(i=a)&&"A"===i.nodeName&&o.isEmpty(i)&&e.remove(a))}}(f,m,n),function(e,t){t.normalize();var n=t.lastChild;n&&!/^(left|right)$/gi.test(e.getStyle(n,"float",!0))||e.add(t,"br")}(f,s),f.isEmpty(s)&&eS(s),n.normalize(),f.isEmpty(n)?(f.remove(n),v()):(iS(a,n),Kx(a,n))),f.setAttrib(n,"id",""),a.fire("NewBlock",{newBlock:n})))},uS=function(e,t,n){var r=e.dom.createRng();n?(r.setStartBefore(t),r.setEndBefore(t)):(r.setStartAfter(t),r.setEndAfter(t)),e.selection.setRng(r),zd(e,r)},sS=function(e,t){var n,r,o=e.selection,i=e.dom,a=o.getRng();fd(i,a).each(function(e){a.setStart(e.startContainer,e.startOffset),a.setEnd(e.endContainer,e.endOffset)});var u,s=a.startOffset,c=a.startContainer;1===c.nodeType&&c.hasChildNodes()&&(u=s>c.childNodes.length-1,c=c.childNodes[Math.min(s,c.childNodes.length-1)]||c,s=u&&3===c.nodeType?c.nodeValue.length:0);var l=i.getParent(c,i.isBlock),f=l?i.getParent(l.parentNode,i.isBlock):null,d=f?f.nodeName.toUpperCase():"",m=!(!t||!t.ctrlKey);"LI"!==d||m||(l=f),c&&3===c.nodeType&&s>=c.nodeValue.length&&!function(e,t,n){for(var r,o=new Yr(t,n),i=e.getNonEmptyElements();r=o.next();)if(i[r.nodeName.toLowerCase()]||0<r.length)return!0}(e.schema,c,l)&&(n=i.create("br"),a.insertNode(n),a.setStartAfter(n),a.setEndAfter(n),r=!0),n=i.create("br"),zs(i,a,n),uS(e,n,r),e.undoManager.add()},cS=function(e,t){var n=Rt.fromTag("br");cn(Rt.fromDom(t),n),e.undoManager.add()},lS=function(e,t){fS(e.getBody(),t)||ln(Rt.fromDom(t),Rt.fromTag("br"));var n=Rt.fromTag("br");ln(Rt.fromDom(t),n),uS(e,n.dom,!1),e.undoManager.add()},fS=function(e,t){return n=Is.after(t),!!jn(n.getNode())||Bl(e,Is.after(t)).map(function(e){return jn(e.getNode())}).getOr(!1);var n},dS=function(e){return e&&"A"===e.nodeName&&"href"in e},mS=function(e){return e.fold(b,dS,dS,b)},pS=function(e,t){t.fold(te,N(cS,e),N(lS,e),te)},gS=function(e,t){var n,r,o,i=(r=N(Rb,n=e),o=Is.fromRangeStart(n.selection.getRng()),UC(r,n.getBody(),o).filter(mS));i.isSome()?i.each(N(pS,e)):sS(e,t)},hS=function(e,t){return Xx(e).filter(function(e){return 0<t.length&&Dt(Rt.fromDom(e),t)}).isSome()},vS=wr([{br:[]},{block:[]},{none:[]}]),yS=function(e,t){return hS(n=e,n.getParam("no_newline_selector",""));var n},bS=function(n){return function(e,t){return""===lc(e)===n}},CS=function(n){return function(e,t){return Xx(e).filter(function(e){return ao(Rt.fromDom(e))}).isSome()===n}},wS=function(n,r){return function(e,t){return Xx(e).fold(S(""),function(e){return e.nodeName.toUpperCase()})===n.toUpperCase()===r}},xS=function(e){return wS("pre",e)},SS=function(n){return function(e,t){return e.getParam("br_in_pre",!0)===n}},NS=function(e,t){return hS(n=e,n.getParam("br_newline_selector",".mce-toc h2,figcaption,caption"));var n},ES=function(e,t){return t},kS=function(e){var t=lc(e),n=function(e,t){for(var n,r=e.getRoot(),o=t;o!==r&&"false"!==e.getContentEditable(o);)"true"===e.getContentEditable(o)&&(n=o),o=o.parentNode;return o!==r?n:r}(e.dom,e.selection.getStart());return n&&e.schema.isValidChild(n.nodeName,t||"P")},_S=function(e,t){return function(n,r){return $(e,function(e,t){return e&&t(n,r)},!0)?U.some(t):U.none()}},AS=function(e,t){return RC([_S([yS],vS.none()),_S([wS("summary",!0)],vS.br()),_S([xS(!0),SS(!1),ES],vS.br()),_S([xS(!0),SS(!1)],vS.block()),_S([xS(!0),SS(!0),ES],vS.block()),_S([xS(!0),SS(!0)],vS.br()),_S([CS(!0),ES],vS.br()),_S([CS(!0)],vS.block()),_S([bS(!0),ES,kS],vS.block()),_S([bS(!0)],vS.br()),_S([NS],vS.br()),_S([bS(!1),ES],vS.br()),_S([kS],vS.block())],[e,!(!t||!t.shiftKey)]).getOr(vS.none())},RS=function(e,t){AS(e,t).fold(function(){gS(e,t)},function(){aS(e,t)},te)},TS=function(o){o.on("keydown",function(e){var t,n,r;e.keyCode===ed.ENTER&&(t=o,(n=e).isDefaultPrevented()||(n.preventDefault(),(r=t.undoManager).typing&&(r.typing=!1,r.add()),t.undoManager.transact(function(){!1===t.selection.isCollapsed()&&t.execCommand("Delete"),RS(t,n)})))})},DS=function(r){r.on("keydown",function(e){var t,n;!1===e.isDefaultPrevented()&&(t=r,n=e,Ex([{keyCode:ed.END,action:Nx(gx,t,!0)},{keyCode:ed.HOME,action:Nx(gx,t,!1)},{keyCode:ed.END,action:Nx(Ax,t,!0)},{keyCode:ed.HOME,action:Nx(Ax,t,!1)}],n).each(function(e){n.preventDefault()}))})},OS=mt().browser,BS=function(t){var e,n;e=t,n=Pu(function(){e.composing||Up(e)},0),OS.isIE()&&(e.on("keypress",function(e){n.throttle()}),e.on("remove",function(e){n.cancel()})),t.on("input",function(e){!1===e.isComposing&&Up(t)})},PS=function(n,r){var e=r.container(),t=r.offset();return Mn(e)?(e.insertData(t,n),U.some(Is(e,t+n.length))):ul(r).map(function(e){var t=Rt.fromText(n);return(r.isAtEnd()?ln:cn)(e,t),Is(t.dom,n.length)})},LS=N(PS,fo),IS=N(PS," "),MS=function(r,o){return function(e){return t=r,(!Tp(n=e)&&(Dp(t,n)||Ap(t,n)||Rp(t,n))?LS:IS)(o);var t,n}},FS=function(e){var t,n,r=Is.fromRangeStart(e.selection.getRng()),o=Rt.fromDom(e.getBody());if(e.selection.isCollapsed()){var i=N(Rb,e),a=Is.fromRangeStart(e.selection.getRng());return UC(i,e.getBody(),a).bind((n=o,function(e){return e.fold(function(e){return Pl(n.dom,Is.before(e))},function(e){return Ll(e)},function(e){return Il(e)},function(e){return Bl(n.dom,Is.after(e))})})).bind(MS(o,r)).exists((t=e,function(e){return t.selection.setRng(e.toRange()),t.nodeChanged(),!0}))}return!1},US=function(r){r.on("keydown",function(e){var t,n;!1===e.isDefaultPrevented()&&(t=r,n=e,Ex([{keyCode:ed.SPACEBAR,action:Nx(FS,t)}],n).each(function(e){n.preventDefault()}))})},zS=function(e){var t,n=nw(e);return(t=e).on("keyup compositionstart",N(Rw,t)),$x(e,n),Wx(e,n),TS(e),US(e),BS(e),DS(e),n},jS=(HS.prototype.nodeChanged=function(e){var t,n,r,o=this.editor.selection;this.editor.initialized&&o&&!this.editor.getParam("disable_nodechange")&&!this.editor.mode.isReadOnly()&&(r=this.editor.getBody(),(t=o.getStart(!0)||r).ownerDocument===this.editor.getDoc()&&this.editor.dom.isChildOf(t,r)||(t=r),n=[],this.editor.dom.getParent(t,function(e){return e===r||void n.push(e)}),(e=e||{}).element=t,e.parents=n,this.editor.fire("NodeChange",e))},HS.prototype.isSameElementPath=function(e){var t,n=this.editor.$(e).parentsUntil(this.editor.getBody()).add(e);if(n.length===this.lastPath.length){for(t=n.length;0<=t&&n[t]===this.lastPath[t];t--);if(-1===t)return this.lastPath=n,!0}return this.lastPath=n,!1},HS);function HS(r){var o;this.lastPath=[],this.editor=r;var t=this;"onselectionchange"in r.getDoc()||r.on("NodeChange click mouseup keyup focus",function(e){var t=r.selection.getRng(),n={startContainer:t.startContainer,startOffset:t.startOffset,endContainer:t.endContainer,endOffset:t.endOffset};"nodechange"!==e.type&&id(n,o)||r.fire("SelectionChange"),o=n}),r.on("contextmenu",function(){r.fire("SelectionChange")}),r.on("SelectionChange",function(){var e=r.selection.getStart(!0);!e||!xt.range&&r.selection.isCollapsed()||zf(r)&&!t.isSameElementPath(e)&&r.dom.isChildOf(e,r.getBody())&&r.nodeChanged({selectionChange:!0})}),r.on("mouseup",function(e){!e.isDefaultPrevented()&&zf(r)&&("IMG"===r.selection.getNode().nodeName?Wr.setEditorTimeout(r,function(){r.nodeChanged()}):r.nodeChanged())})}var VS=function(e){var t,n;(t=e).on("click",function(e){t.dom.getParent(e.target,"details")&&e.preventDefault()}),(n=e).parser.addNodeFilter("details",function(e){Y(e,function(e){e.attr("data-mce-open",e.attr("open")),e.attr("open","open")})}),n.serializer.addNodeFilter("details",function(e){Y(e,function(e){var t=e.attr("data-mce-open");e.attr("open",K(t)?t:null),e.attr("data-mce-open",null)})})},qS=function(e){return Rn(e)&&oo(Rt.fromDom(e))},$S=function(a){a.on("click",function(e){var t,n,r,o,i;3<=e.detail&&(r=(t=a).selection.getRng(),o=Is.fromRangeStart(r),i=Is.fromRangeEnd(r),Is.isElementPosition(o)&&(n=o.container(),qS(n)&&Ll(n).each(function(e){return r.setStart(e.container(),e.offset())})),Is.isElementPosition(i)&&(n=o.container(),qS(n)&&Il(n).each(function(e){return r.setEnd(e.container(),e.offset())})),t.selection.setRng(Rg(r)))})},WS=function(e){var t=e.getBoundingClientRect(),n=e.ownerDocument,r=n.documentElement,o=n.defaultView;return{top:t.top+o.pageYOffset-r.clientTop,left:t.left+o.pageXOffset-r.clientLeft}},KS=function(e,t){return n=(u=e).inline?WS(u.getBody()):{left:0,top:0},a=(i=e).getBody(),r=i.inline?{left:a.scrollLeft,top:a.scrollTop}:{left:0,top:0},{pageX:(o=function(e,t){if(t.target.ownerDocument===e.getDoc())return{left:t.pageX,top:t.pageY};var n,r,o,i,a,u=WS(e.getContentAreaContainer()),s=(r=(n=e).getBody(),o=n.getDoc().documentElement,i={left:r.scrollLeft,top:r.scrollTop},a={left:r.scrollLeft||o.scrollLeft,top:r.scrollTop||o.scrollTop},n.inline?i:a);return{left:t.pageX-u.left+s.left,top:t.pageY-u.top+s.top}}(e,t)).left-n.left+r.left,pageY:o.top-n.top+r.top};var n,r,o,i,a,u},XS=qn,YS=Vn,GS=function(e){e&&e.parentNode&&e.parentNode.removeChild(e)},JS=function(u,s){return function(e){var t,n,r,o,i,a;0===e.button&&(t=W(s.dom.getParents(e.target),function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return function(e){for(var t=0;t<n.length;t++)if(n[t](e))return!0;return!1}}(XS,YS)).getOr(null),i=s.getBody(),XS(a=t)&&a!==i&&(n=s.dom.getPos(t),r=s.getBody(),o=s.getDoc().documentElement,u.set({element:t,dragging:!1,screenX:e.screenX,screenY:e.screenY,maxX:(s.inline?r.scrollWidth:o.offsetWidth)-2,maxY:(s.inline?r.scrollHeight:o.offsetHeight)-2,relX:e.pageX-n.x,relY:e.pageY-n.y,width:t.offsetWidth,height:t.offsetHeight,ghost:function(e,t,n,r){var o=e.dom,i=t.cloneNode(!0);o.setStyles(i,{width:n,height:r}),o.setAttrib(i,"data-mce-selected",null);var a=o.create("div",{"class":"mce-drag-container","data-mce-bogus":"all",unselectable:"on",contenteditable:"false"});return o.setStyles(a,{position:"absolute",opacity:.5,overflow:"hidden",border:0,padding:0,margin:0,width:n,height:r}),o.setStyles(i,{margin:0,boxSizing:"border-box"}),a.appendChild(i),a}(s,t,t.offsetWidth,t.offsetHeight)})))}},QS=function(e,h){var v=Wr.throttle(function(e,t){h._selectionOverrides.hideFakeCaret(),h.selection.placeCaretAt(e,t)},0);return h.on("remove",v.stop),function(g){return e.on(function(e){var t,n,r,o,i,a,u,s,c,l,f,d,m,p=Math.max(Math.abs(g.screenX-e.screenX),Math.abs(g.screenY-e.screenY));if(!e.dragging&&10<p){if(h.fire("dragstart",{target:e.element}).isDefaultPrevented())return;e.dragging=!0,h.focus()}e.dragging&&(d=e,t={pageX:(m=KS(h,g)).pageX-d.relX,pageY:m.pageY+5},l=e.ghost,f=h.getBody(),l.parentNode!==f&&f.appendChild(l),n=e.ghost,r=t,o=e.width,i=e.height,a=e.maxX,u=e.maxY,c=s=0,n.style.left=r.pageX+"px",n.style.top=r.pageY+"px",r.pageX+o>a&&(s=r.pageX+o-a),r.pageY+i>u&&(c=r.pageY+i-u),n.style.width=o-s+"px",n.style.height=i-c+"px",v(g.clientX,g.clientY))})}},ZS=function(e,l){return function(c){e.on(function(e){var t,n,r,o,i,a,u,s;e.dragging&&(u=(o=l).selection,s=u.getSel().getRangeAt(0).startContainer,i=3===s.nodeType?s.parentNode:s,a=e.element,i===a||o.dom.isChildOf(i,a)||XS(i)||(n=e.element,(r=n.cloneNode(!0)).removeAttribute("data-mce-selected"),t=r,l.fire("drop",{clientX:c.clientX,clientY:c.clientY}).isDefaultPrevented()||l.undoManager.transact(function(){GS(e.element),l.insertContent(l.dom.getOuterHTML(t)),l._selectionOverrides.hideFakeCaret()})))}),eN(e)}},eN=function(e){e.on(function(e){GS(e.ghost)}),e.clear()},tN=function(e){var t,n,r,o=(t=Au(U.none()),{clear:function(){return t.set(U.none())},set:function(e){return t.set(U.some(e))},isSet:function(){return t.get().isSome()},on:function(e){return t.get().each(e)}}),i=xu.DOM,a=document,u=JS(o,e),s=QS(o,e),c=ZS(o,e),l=(n=o,function(){n.on(function(e){e.dragging&&r.fire("dragend")}),eN(n)});(r=e).on("mousedown",u),e.on("mousemove",s),e.on("mouseup",c),i.bind(a,"mousemove",s),i.bind(a,"mouseup",l),e.on("remove",function(){i.unbind(a,"mousemove",s),i.unbind(a,"mouseup",l)})},nN=function(e){var n,i,a,u,t;tN(e),(n=e).on("drop",function(e){var t="undefined"!=typeof e.clientX?n.getDoc().elementFromPoint(e.clientX,e.clientY):null;!XS(t)&&"false"!==n.dom.getContentEditableParent(t)||e.preventDefault()}),e.getParam("block_unsupported_drop",!0,"boolean")&&(a=function(e){var t;e.isDefaultPrevented()||(t=e.dataTransfer)&&(M(t.types,"Files")||0<t.files.length)&&(e.preventDefault(),"drop"===e.type&&Zy(i,"Dropped file type is not supported"))},u=function(e){cm(i,e.target)&&a(e)},t=function(){var t=xu.DOM,n=i.dom,r=document,o=i.inline?i.getBody():i.getDoc(),e=["drop","dragover"];Y(e,function(e){t.bind(r,e,u),n.bind(o,e,a)}),i.on("remove",function(){Y(e,function(e){t.unbind(r,e,u),n.unbind(o,e,a)})})},(i=e).on("init",function(){Wr.setEditorTimeout(i,t,0)}))},rN=Vn,oN=qn,iN=function(e,t){return Jf(e.getBody(),t)},aN=function(u){var s,c=u.selection,l=u.dom,f=l.isBlock,d=u.getBody(),m=Fc(u,d,f,function(){return vm(u)}),p="sel-"+l.uniqueId(),i="data-mce-selected",g=function(e){return e!==d&&(oN(e)||Wn(e))&&l.isChildOf(e,d)},h=function(e){e&&c.setRng(e)},r=c.getRng,v=function(e,t,n,r){return void 0===r&&(r=!0),u.fire("ShowCaret",{target:t,direction:e,before:n}).isDefaultPrevented()?null:(r&&c.scrollIntoView(t,-1===e),m.show(n,t))},t=function(e){return Co(e)||Eo(e)||ko(e)},y=function(e){return t(e.startContainer)||t(e.endContainer)},b=function(e){var t=u.schema.getShortEndedElements(),n=l.createRng(),r=e.startContainer,o=e.startOffset,i=e.endContainer,a=e.endOffset;return ve(t,r.nodeName.toLowerCase())?0===o?n.setStartBefore(r):n.setStartAfter(r):n.setStart(r,o),ve(t,i.nodeName.toLowerCase())?0===a?n.setEndBefore(i):n.setEndAfter(i):n.setEnd(i,a),n},C=function(e){var t=e.cloneNode(!0),n=u.fire("ObjectSelected",{target:e,targetClone:t});if(n.isDefaultPrevented())return null;var r=function(e,t,n){var r=u.$,o=Pr(Rt.fromDom(u.getBody()),"#"+p).fold(function(){return r([])},function(e){return r([e.dom])});0===o.length&&(o=r('<div data-mce-bogus="all" class="mce-offscreen-selection"></div>').attr("id",p)).appendTo(u.getBody());var i=l.createRng();t===n&&xt.ie?(o.empty().append('<p style="font-size: 0" data-mce-bogus="all">\xa0</p>').append(t),i.setStartAfter(o[0].firstChild.firstChild),i.setEndAfter(t)):(o.empty().append(fo).append(t).append(fo),i.setStart(o[0].firstChild,1),i.setEnd(o[0].lastChild,0)),o.css({top:l.getPos(e,u.getBody()).y}),o[0].focus();var a=c.getSel();return a.removeAllRanges(),a.addRange(i),i}(e,n.targetClone,t),o=Rt.fromDom(e);return Y(qu(Rt.fromDom(u.getBody()),"*[data-mce-selected]"),function(e){Bt(o,e)||Zn(e,i)}),l.getAttrib(e,i)||e.setAttribute(i,"1"),s=e,S(),r},w=function(e,t){if(!e)return null;if(e.collapsed){if(!y(e)){var n=t?1:-1,r=al(n,d,e),o=r.getNode(!t);if(jc(o))return v(n,o,!!t&&!r.isAtEnd(),!1);var i=r.getNode(t);if(jc(i))return v(n,i,!t&&!r.isAtEnd(),!1)}return null}var a=e.startContainer,u=e.startOffset,s=e.endOffset;if(3===a.nodeType&&0===u&&oN(a.parentNode)&&(a=a.parentNode,u=l.nodeIndex(a),a=a.parentNode),1!==a.nodeType)return null;if(s===u+1&&a===e.endContainer){var c=a.childNodes[u];if(g(c))return C(c)}return null},x=function(){s&&s.removeAttribute(i),Pr(Rt.fromDom(u.getBody()),"#"+p).each(gn),s=null},S=function(){m.hide()};return xt.ceFalse&&function(){u.on("mouseup",function(e){var t=r();t.collapsed&&qy(u,e.clientX,e.clientY)&&rC(u,t,!1).each(h)}),u.on("click",function(e){var t=iN(u,e.target);t&&(oN(t)&&(e.preventDefault(),u.focus()),rN(t)&&l.isChildOf(t,c.getNode())&&x())}),u.on("blur NewBlock",x),u.on("ResizeWindow FullscreenStateChanged",m.reposition);var a=function(e){var t=Nl(e);if(!e.firstChild)return!1;var n,r=Is.before(e.firstChild),o=t.next(r);return o&&!(op(n=o)||ip(n)||ep(n)||tp(n))},i=function(e,t){var n,r,o=l.getParent(e,f),i=l.getParent(t,f);return!(!o||e===i||!l.isChildOf(o,i)||!1!==oN(iN(u,o)))||o&&(n=o,r=i,!(l.getParent(n,f)===l.getParent(r,f)))&&a(o)};u.on("tap",function(e){var t=e.target,n=iN(u,t);oN(n)?(e.preventDefault(),nC(u,n).each(w)):g(t)&&nC(u,t).each(w)},!0),u.on("mousedown",function(e){var t,n,r,o=e.target;o!==d&&"HTML"!==o.nodeName&&!l.isChildOf(o,d)||!1===qy(u,e.clientX,e.clientY)||((t=iN(u,o))?oN(t)?(e.preventDefault(),nC(u,t).each(w)):(x(),rN(t)&&e.shiftKey||Qf(e.clientX,e.clientY,c.getRng())||(S(),c.placeCaretAt(e.clientX,e.clientY))):g(o)?nC(u,o).each(w):!1===jc(o)&&(x(),S(),(n=nx(d,e.clientX,e.clientY))&&(i(o,n.node)||(e.preventDefault(),r=v(1,n.node,n.before,!1),u.getBody().focus(),h(r)))))}),u.on("keypress",function(e){ed.modifierPressed(e)||oN(c.getNode())&&e.preventDefault()}),u.on("GetSelectionRange",function(e){var t=e.range;if(s){if(!s.parentNode)return void(s=null);(t=t.cloneRange()).selectNode(s),e.range=t}}),u.on("SetSelectionRange",function(e){e.range=b(e.range);var t=w(e.range,e.forward);t&&(e.range=t)});var n,e,o;u.on("AfterSetSelectionRange",function(e){var t,n=e.range,r=n.startContainer.parentNode;y(n)||"mcepastebin"===r.id||S(),t=r,l.hasClass(t,"mce-offscreen-selection")||x()}),u.on("copy",function(e){var t,n,r=e.clipboardData;e.isDefaultPrevented()||!e.clipboardData||xt.ie||(t=(n=l.get(p))?n.getElementsByTagName("*")[0]:n)&&(e.preventDefault(),r.clearData(),r.setData("text/html",t.outerHTML),r.setData("text/plain",t.outerText||t.innerText))}),nN(u),e=Pu(function(){var e,t;n.removed||!n.getBody().contains(document.activeElement)||(e=n.selection.getRng()).collapsed&&(t=oC(n,e,!1),n.selection.setRng(t))},0),(n=u).on("focus",function(){e.throttle()}),n.on("blur",function(){e.cancel()}),(o=u).on("init",function(){o.on("focusin",function(e){var t,n,r=e.target;Wn(r)&&(t=Jf(o.getBody(),r),n=qn(t)?t:r,o.selection.getNode()!==n&&nC(o,n).each(function(e){return o.selection.setRng(e)}))})})}(),{showCaret:v,showBlockCaretContainer:function(e){e.hasAttribute("data-mce-caret")&&(_o(e),h(r()),c.scrollIntoView(e))},hideFakeCaret:S,destroy:function(){m.destroy(),s=null}}},uN=function(u){var s,n,r,o=_t.each,c=ed.BACKSPACE,l=ed.DELETE,f=u.dom,d=u.selection,e=u.parser,t=xt.gecko,i=xt.ie,a=xt.webkit,m="data:text/mce-internal,",p=i?"Text":"URL",g=function(e,t){try{u.getDoc().execCommand(e,!1,t)}catch(n){}},h=function(e){return e.isDefaultPrevented()},v=function(){u.shortcuts.add("meta+a",null,"SelectAll")},y=function(){u.on("keydown",function(e){if(!h(e)&&e.keyCode===c&&d.isCollapsed()&&0===d.getRng().startOffset){var t=d.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})},b=function(){u.inline||(u.contentStyles.push("body {min-height: 150px}"),u.on("click",function(e){var t;if("HTML"===e.target.nodeName){if(11<xt.ie)return void u.getBody().focus();t=u.selection.getRng(),u.getBody().focus(),u.selection.setRng(t),u.selection.normalize(),u.nodeChanged()}}))},C=te;return u.on("keydown",function(e){var t;if(!h(e)&&e.keyCode===ed.BACKSPACE){var n=(t=d.getRng()).startContainer,r=t.startOffset,o=f.getRoot(),i=n;if(t.collapsed&&0===r){for(;i&&i.parentNode&&i.parentNode.firstChild===i&&i.parentNode!==o;)i=i.parentNode;"BLOCKQUOTE"===i.tagName&&(u.formatter.toggle("blockquote",null,i),(t=f.createRng()).setStart(n,0),t.setEnd(n,0),d.setRng(t))}}}),s=function(e){var t=f.create("body"),n=e.cloneContents();return t.appendChild(n),d.serializer.serialize(t,{format:"html"})},u.on("keydown",function(e){var t,n,r,o,i,a=e.keyCode;if(!h(e)&&(a===l||a===c)){if(t=u.selection.isCollapsed(),n=u.getBody(),t&&!f.isEmpty(n))return;if(!t&&(r=u.selection.getRng(),o=s(r),(i=f.createRng()).selectNode(u.getBody()),o!==s(i)))return;e.preventDefault(),u.setContent(""),n.firstChild&&f.isBlock(n.firstChild)?u.selection.setCursorLocation(n.firstChild,0):u.selection.setCursorLocation(n,0),u.nodeChanged()}}),xt.windowsPhone||u.on("keyup focusin mouseup",function(e){ed.modifierPressed(e)||d.normalize()},!0),a&&(u.inline||f.bind(u.getDoc(),"mousedown mouseup",function(e){var t;if(e.target===u.getDoc().documentElement)if(t=d.getRng(),u.getBody().focus(),"mousedown"===e.type){if(Co(t.startContainer))return;d.placeCaretAt(e.clientX,e.clientY)}else d.setRng(t)}),u.on("click",function(e){var t=e.target;/^(IMG|HR)$/.test(t.nodeName)&&"false"!==f.getContentEditableParent(t)&&(e.preventDefault(),u.selection.select(t),u.nodeChanged()),"A"===t.nodeName&&f.hasClass(t,"mce-item-anchor")&&(e.preventDefault(),d.select(t))}),lc(u)&&u.on("init",function(){g("DefaultParagraphSeparator",lc(u))}),u.on("init",function(){u.dom.bind(u.getBody(),"submit",function(e){e.preventDefault()})}),y(),e.addNodeFilter("br",function(e){for(var t=e.length;t--;)"Apple-interchange-newline"===e[t].attr("class")&&e[t].remove()}),xt.iOS?(u.inline||u.on("keydown",function(){document.activeElement===document.body&&u.getWin().focus()}),b(),u.on("click",function(e){var t=e.target;do{if("A"===t.tagName)return void e.preventDefault()}while(t=t.parentNode)}),u.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")):v()),11<=xt.ie&&(b(),y()),xt.ie&&(v(),g("AutoUrlDetect",!1),u.on("dragstart",function(e){var t,n,r;(t=e).dataTransfer&&(u.selection.isCollapsed()&&"IMG"===t.target.tagName&&d.select(t.target),0<(n=u.selection.getContent()).length&&(r=m+escape(u.id)+","+escape(n),t.dataTransfer.setData(p,r)))}),u.on("drop",function(e){var t,n,r,o,i,a;h(e)||(t=(i=e).dataTransfer&&(a=i.dataTransfer.getData(p))&&0<=a.indexOf(m)?(a=a.substr(m.length).split(","),{id:unescape(a[0]),html:unescape(a[1])}):null)&&t.id!==u.id&&(e.preventDefault(),n=od(e.x,e.y,u.getDoc()),d.setRng(n),r=t.html,o=!0,u.queryCommandSupported("mceInsertClipboardContent")?u.execCommand("mceInsertClipboardContent",!1,{content:r,internal:o}):u.execCommand("mceInsertContent",!1,r))})),t&&(u.on("keydown",function(e){if(!h(e)&&e.keyCode===c){if(!u.getBody().getElementsByTagName("hr").length)return;if(d.isCollapsed()&&0===d.getRng().startOffset){var t=d.getNode(),n=t.previousSibling;if("HR"===t.nodeName)return f.remove(t),void e.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(f.remove(n),e.preventDefault())}}}),Range.prototype.getClientRects||u.on("mousedown",function(e){var t;h(e)||"HTML"!==e.target.nodeName||((t=u.getBody()).blur(),Wr.setEditorTimeout(u,function(){t.focus()}))}),n=function(){var e=f.getAttribs(d.getStart().cloneNode(!1));return function(){var t=d.getStart();t!==u.getBody()&&(f.setAttrib(t,"style",null),o(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}},r=function(){return!d.isCollapsed()&&f.getParent(d.getStart(),f.isBlock)!==f.getParent(d.getEnd(),f.isBlock)},u.on("keypress",function(e){var t;if(!h(e)&&(8===e.keyCode||46===e.keyCode)&&r())return t=n(),u.getDoc().execCommand("delete",!1,null),t(),e.preventDefault(),!1}),f.bind(u.getDoc(),"cut",function(e){var t;!h(e)&&r()&&(t=n(),Wr.setEditorTimeout(u,function(){t()}))}),u.getParam("readonly")||u.on("BeforeExecCommand mousedown",function(){g("StyleWithCSS",!1),g("enableInlineTableEditing",!1),yc(u)||g("enableObjectResizing",!1)}),u.on("SetContent ExecCommand",function(e){"setcontent"!==e.type&&"mceInsertLink"!==e.command||o(f.select("a"),function(e){var t=e.parentNode,n=f.getRoot();if(t.lastChild===e){for(;t&&!f.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}f.add(t,"br",{"data-mce-bogus":1})}})}),u.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"),xt.mac&&u.on("keydown",function(e){!ed.metaKeyPressed(e)||e.shiftKey||37!==e.keyCode&&39!==e.keyCode||(e.preventDefault(),u.selection.getSel().modify("move",37===e.keyCode?"backward":"forward","lineboundary"))}),y()),{refreshContentEditable:C,isHidden:function(){if(!t||u.removed)return!1;var e=u.selection.getSel();return!e||!e.rangeCount||0===e.rangeCount}}},sN=xu.DOM,cN=function(e){return pe(e,function(e){return!1===T(e)})},lN=function(e){var t,n=e.settings,r=e.editorUpload.blobCache;return cN({allow_conditional_comments:n.allow_conditional_comments,allow_html_data_urls:n.allow_html_data_urls,allow_svg_data_urls:n.allow_svg_data_urls,allow_html_in_named_anchor:n.allow_html_in_named_anchor,allow_script_urls:n.allow_script_urls,allow_unsafe_link_target:n.allow_unsafe_link_target,convert_fonts_to_spans:n.convert_fonts_to_spans,fix_list_elements:n.fix_list_elements,font_size_legacy_values:n.font_size_legacy_values,forced_root_block:n.forced_root_block,forced_root_block_attrs:n.forced_root_block_attrs,padd_empty_with_br:n.padd_empty_with_br,preserve_cdata:n.preserve_cdata,remove_trailing_brs:n.remove_trailing_brs,inline_styles:n.inline_styles,root_name:(t=e).inline?t.getElement().nodeName.toLowerCase():undefined,validate:!0,blob_cache:r,images_dataimg_filter:n.images_dataimg_filter})},fN=function(u){var e=u.dom.getRoot();u.inline||zf(u)&&u.selection.getStart(!0)!==e||Ll(e).each(function(e){var t,n,r,o,i=e.getNode(),a=Pn(i)?Ll(i).getOr(e):e;xt.browser.isIE()?(t=u,n=a.toRange(),r=Rt.fromDom(t.getBody()),o=(Zd(t)?U.from(n):U.none()).map(em).filter(Qd(r)),t.bookmark=o.isSome()?o:t.bookmark):u.selection.setRng(a.toRange())})},dN=function(e){var t;e.bindPendingEventDelegates(),e.initialized=!0,e.fire("Init"),e.focus(!0),fN(e),e.nodeChanged({initial:!0}),e.execCallback("init_instance_callback",e),(t=e).settings.auto_focus&&Wr.setEditorTimeout(t,function(){var e=!0===t.settings.auto_focus?t:t.editorManager.get(t.settings.auto_focus);e.destroyed||e.focus()},100)},mN=function(e){return e.inline?e.ui.styleSheetLoader:e.dom.styleSheetLoader},pN=function(e,t){var n,r,o,i,a=mN(e),u=vc(e),s=function(){a.unloadAll(t),e.inline||e.ui.styleSheetLoader.unloadAll(u)},c=function(){e.removed?s():(e.on("remove",s),dN(e))};Ir.all((n=e,r=t,o=u,i=[new Ir(function(e,t){return mN(n).loadAll(r,e,t)})],n.inline?i:i.concat([new Ir(function(e,t){return n.ui.styleSheetLoader.loadAll(o,e,t)})]))).then(c)["catch"](c)},gN=function(t,e){var n=t.settings,r=t.getDoc(),o=t.getBody();n.browser_spellcheck||n.gecko_spellcheck||(r.body.spellcheck=!1,sN.setAttrib(o,"spellcheck","false")),t.quirks=uN(t),t.fire("PostRender");var i,a,u,s,c,l,f=t.getParam("directionality",Ou.isRtl()?"rtl":undefined);f!==undefined&&(o.dir=f),n.protect&&t.on("BeforeSetContent",function(t){_t.each(n.protect,function(e){t.content=t.content.replace(e,function(e){return"\x3c!--mce:protected "+escape(e)+"--\x3e"})})}),t.on("SetContent",function(){t.addVisual(t.getBody())}),!1===e&&t.load({initial:!0,format:"html"}),t.startContent=t.getContent({format:"raw"}),t.on("compositionstart compositionend",function(e){t.composing="compositionstart"===e.type}),0<t.contentStyles.length&&(i="",_t.each(t.contentStyles,function(e){i+=e+"\r\n"}),t.dom.addStyle(i)),pN(t,t.contentCSS),n.content_style&&(a=t,u=n.content_style,s=Rt.fromDom(a.getBody()),c=an(on(s)),l=Rt.fromTag("style"),Yn(l,"type","text/css"),dn(l,Rt.fromText(u)),dn(c,l),a.on("remove",function(){gn(l)}))},hN=function(t,e){var n=t.settings,r=t.getElement(),o=t.getDoc();n.inline||(t.getElement().style.visibility=t.orgVisibility),e||t.inline||(o.open(),o.write(t.iframeHTML),o.close()),t.inline&&(sN.addClass(r,"mce-content-body"),t.contentDocument=o=document,t.contentWindow=window,t.bodyElement=r,t.contentAreaContainer=r);var u,i,a,s,c=t.getBody();c.disabled=!0,t.readonly=!!n.readonly,t.readonly||(t.inline&&"static"===sN.getStyle(c,"position",!0)&&(c.style.position="relative"),c.contentEditable=t.getParam("content_editable_state",!0)),c.disabled=!1,t.editorUpload=mb(t),t.schema=Ci(n),t.dom=xu(o,{keep_values:!0,url_converter:t.convertURL,url_converter_scope:t,hex_colors:n.force_hex_style_colors,update_styles:!0,root_element:t.inline?t.getBody():null,collect:function(){return t.inline},schema:t.schema,contentCssCors:t.getParam("content_css_cors",!1,"boolean"),referrerPolicy:pc(t),onSetAttrib:function(e){t.fire("SetAttrib",e)}}),t.parser=((i=uy(lN(u=t),u.schema)).addAttributeFilter("src,href,style,tabindex",function(e,t){for(var n,r,o=e.length,i=u.dom,a="data-mce-"+t;o--;)if((r=(n=e[o]).attr(t))&&!n.attr(a)){if(0===r.indexOf("data:")||0===r.indexOf("blob:"))continue;"style"===t?((r=i.serializeStyle(i.parseStyle(r),n.name)).length||(r=null),n.attr(a,r),n.attr(t,r)):"tabindex"===t?(n.attr(a,r),n.attr(t,null)):n.attr(a,u.convertURL(r,t,n.name))}}),i.addNodeFilter("script",function(e){for(var t=e.length;t--;){var n=e[t],r=n.attr("type")||"no/type";0!==r.indexOf("mce-")&&n.attr("type","mce-"+r)}}),u.settings.preserve_cdata&&i.addNodeFilter("#cdata",function(e){for(var t=e.length;t--;){var n=e[t];n.type=8,n.name="#comment",n.value="[CDATA["+u.dom.encode(n.value)+"]]"}}),i.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var t=e.length,n=u.schema.getNonEmptyElements();t--;){var r=e[t];r.isEmpty(n)&&0===r.getAll("br").length&&(r.append(new Am("br",1)).shortEnded=!0)}}),i),t.serializer=dy((s=(a=t).settings,_e(_e({},lN(a)),cN({url_converter:s.url_converter,url_converter_scope:s.url_converter_scope,element_format:s.element_format,entities:s.entities,entity_encoding:s.entity_encoding,indent:s.indent,indent_after:s.indent_after,indent_before:s.indent_before,block_elements:s.block_elements,boolean_attributes:s.boolean_attributes,custom_elements:s.custom_elements,extended_valid_elements:s.extended_valid_elements,invalid_elements:s.invalid_elements,invalid_styles:s.invalid_styles,move_caret_before_on_enter_elements:s.move_caret_before_on_enter_elements,non_empty_elements:s.non_empty_elements,schema:s.schema,self_closing_elements:s.self_closing_elements,short_ended_elements:s.short_ended_elements,special:s.special,text_block_elements:s.text_block_elements,text_inline_elements:s.text_inline_elements,valid_children:s.valid_children,valid_classes:s.valid_classes,valid_elements:s.valid_elements,valid_styles:s.valid_styles,verify_html:s.verify_html,whitespace_elements:s.whitespace_elements}))),t),t.selection=Hv(t.dom,t.getWin(),t.serializer,t),t.annotator=Yf(t),t.formatter=Cb(t),t.undoManager=xb(t),t._nodeChangeDispatcher=new jS(t),t._selectionOverrides=aN(t),Ew(t),VS(t),Rv(t)||$S(t);var l,f,d=Rv(l=t)?Au(null):zS(l);Sw(t,d),lc(f=t)&&f.on("NodeChange",N(_w,f)),_b(t),t.fire("PreInit"),Tv(t).fold(function(){gN(t,!1)},function(e){t.setProgressState(!0),e.then(function(e){t.setProgressState(!1),gN(t,e)},function(e){t.notificationManager.open({type:"error",text:String(e)}),gN(t,!0)})})},vN=xu.DOM,yN=function(e){var t=e.getParam("doctype","<!DOCTYPE html>")+"<html><head>";e.getParam("document_base_url","")!==e.documentBaseUrl&&(t+='<base href="'+e.documentBaseURI.getURI()+'" />'),t+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';var n=sc(e,"body_id","tinymce"),r=sc(e,"body_class","");return cc(e)&&(t+='<meta http-equiv="Content-Security-Policy" content="'+cc(e)+'" />'),t+='</head><body id="'+n+'" class="mce-content-body '+r+'" data-id="'+e.id+'"><br></body></html>'},bN=function(e,t){var n,r,o,i,a=e.editorManager.translate("Rich Text Area. Press ALT-0 for help."),u=(n=e.id,r=a,t.height,o=e.getParam("iframe_attrs",{}),i=Rt.fromTag("iframe"),Gn(i,o),Gn(i,{id:n+"_ifr",frameBorder:"0",allowTransparency:"true",title:r}),zu(i,"tox-edit-area__iframe"),i.dom);u.onload=function(){u.onload=null,e.fire("load")};var s=function(e,t){if(document.domain!==window.location.hostname&&xt.browser.isIE()){var n=cb("mce");e[n]=function(){hN(e)};var r='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinymce.get("'+e.id+'");document.write(ed.iframeHTML);document.close();ed.'+n+"(true);})()";return vN.setAttrib(t,"src",r),!0}return!1}(e,u);return e.contentAreaContainer=t.iframeContainer,e.iframeElement=u,e.iframeHTML=yN(e),vN.add(t.iframeContainer,u),s},CN=xu.DOM,wN=function(t,n,e){var r=Ky.get(e),o=Ky.urls[e]||t.documentBaseUrl.replace(/\/$/,"");if(e=_t.trim(e),r&&-1===_t.inArray(n,e)){if(_t.each(Ky.dependencies(e),function(e){wN(t,n,e)}),t.plugins[e])return;try{var i=new r(t,o,t.$);(t.plugins[e]=i).init&&(i.init(t,o),n.push(e))}catch(_k){!function(e,t,n){var r=Ou.translate(["Failed to initialize plugin: {0}",t]);Zf(e,"PluginLoadError",{message:r}),rb(r,n),Zy(e,r)}(t,e,_k)}}},xN=function(e){return e.replace(/^\-/,"")},SN=function(e){return{editorContainer:e,iframeContainer:e,api:{}}},NN=function(e){var t,n,r=e.getElement();return e.inline?SN(null):(t=r,n=CN.create("div"),CN.insertAfter(n,t),SN(n))},EN=function(e){var t,n,r,o=e.getElement();return e.orgDisplay=o.style.display,K(Cc(e))?e.theme.renderUI():D(Cc(e))?(n=(t=e).getElement(),(r=Cc(t)(t,n)).editorContainer.nodeType&&(r.editorContainer.id=r.editorContainer.id||t.id+"_parent"),r.iframeContainer&&r.iframeContainer.nodeType&&(r.iframeContainer.id=r.iframeContainer.id||t.id+"_iframecontainer"),r.height=r.iframeHeight?r.iframeHeight:n.offsetHeight,r):NN(e)},kN=function(e){var n,t,r,o,i,a,u,s,c;e.fire("ScriptsLoaded"),n=e,t=_t.trim(mc(n)),r=n.ui.registry.getAll().icons,o=_e(_e({},My.get("default").icons),My.get(t).icons),se(o,function(e,t){ve(r,t)||n.ui.registry.addIcon(t,e)}),u=Cc(i=e),K(u)?(i.settings.theme=xN(u),a=Xy.get(u),i.theme=new a(i,Xy.urls[u]),i.theme.init&&i.theme.init(i,Xy.urls[u]||i.documentBaseUrl.replace(/\/$/,""),i.$)):i.theme={},s=e,c=[],_t.each(xc(s).split(/[ ,]/),function(e){wN(s,c,xN(e))});var l,f,d,m=EN(e);l=e,f=U.from(m.api).getOr({}),d={show:U.from(f.show).getOr(te),hide:U.from(f.hide).getOr(te),disable:U.from(f.disable).getOr(te),isDisabled:U.from(f.isDisabled).getOr(b),enable:function(){l.mode.isReadOnly()||U.from(f.enable).map(y)}},l.ui=_e(_e({},l.ui),d);var p,g,h,v={editorContainer:m.editorContainer,iframeContainer:m.iframeContainer};return e.editorContainer=v.editorContainer?v.editorContainer:null,ab(e),e.inline?hN(e):(h=bN(p=e,g=v),g.editorContainer&&(vN.get(g.editorContainer).style.display=p.orgDisplay,p.hidden=vN.isHidden(g.editorContainer)),p.getElement().style.display="none",vN.setAttrib(p.id,"aria-hidden","true"),void(h||hN(p)))},_N=xu.DOM,AN=function(e){return"-"===e.charAt(0)},RN=function(e,t){var n,r=gc(t),o=t.getParam("language_url","","string");!1===Ou.hasCode(r)&&"en"!==r&&(n=""!==o?o:t.editorManager.baseURL+"/langs/"+r+".js",e.add(n,te,undefined,function(){eb(t,"LanguageLoadError",tb("language",n,r))}))},TN=function(t,e,n){return U.from(e).filter(function(e){return 0<e.length&&!My.has(e)}).map(function(e){return{url:t.editorManager.baseURL+"/icons/"+e+"/icons"+n+".js",name:U.some(e)}})},DN=function(e,o,t){var n,r=TN(o,"default",t),i=(n=o,U.from(n.getParam("icons_url","","string")).filter(function(e){return 0<e.length}).map(function(e){return{url:e,name:U.none()}}).orThunk(function(){return TN(o,mc(o),"")}));Y(function(e){for(var t=[],n=function(e){t.push(e)},r=0;r<e.length;r++)e[r].each(n);return t}([r,i]),function(r){e.add(r.url,te,undefined,function(){var e,t,n;e=o,t=r.url,n=r.name.getOrUndefined(),eb(e,"IconsLoadError",tb("icons",t,n))})})},ON=function(e,t){var n,r,o,i,a,u,s=ku.ScriptLoader;n=s,o=t,i=function(){var r,o;RN(s,e),DN(s,e,t),r=e,o=t,_t.each(r.getParam("external_plugins"),function(e,t){Ky.load(t,e,te,undefined,function(){nb(r,e,t)}),r.settings.plugins+=" "+t}),_t.each(xc(r).split(/[ ,]/),function(e){var t,n;(e=_t.trim(e))&&!Ky.urls[e]&&(AN(e)?(e=e.substr(1,e.length),t=Ky.dependencies(e),_t.each(t,function(e){var t={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"},n=Ky.createUrl(t,e);Ky.load(n.resource,n,te,undefined,function(){nb(r,n.prefix+n.resource+n.suffix,n.resource)})})):(n={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"},Ky.load(e,n,te,undefined,function(){nb(r,n.prefix+n.resource+n.suffix,e)})))}),s.loadQueue(function(){e.removed||kN(e)},e,function(){e.removed||kN(e)})},u=Cc(r=e),K(u)?(AN(u)||Xy.urls.hasOwnProperty(u)||((a=r.getParam("theme_url"))?Xy.load(u,r.documentBaseURI.toAbsolute(a)):Xy.load(u,"themes/"+u+"/theme"+o+".js")),n.loadQueue(function(){Xy.waitFor(u,i)})):i()},BN=function(t){var e=t.id;Ou.setCode(gc(t));var n,r,o,i,a,u=function(){_N.unbind(window,"ready",u),t.render()};Ti.Event.domLoaded?t.getElement()&&xt.contentEditable&&(n=Rt.fromDom(t.getElement()),r=$(n.dom.attributes,function(e,t){return e[t.name]=t.value,e},{}),t.on("remove",function(){j(n.dom.attributes,function(e){return Zn(n,e.name),0}),Gn(n,r)}),t.ui.styleSheetLoader=(o=n,i=t,Xr.forElement(o,{contentCssCors:i.getParam("content_css_cors"),referrerPolicy:pc(i)})),t.getParam("inline")?t.inline=!0:(t.orgVisibility=t.getElement().style.visibility,t.getElement().style.visibility="hidden"),(a=t.getElement().form||_N.getParent(e,"form"))&&(t.formElement=a,t.getParam("hidden_input")&&!In(t.getElement())&&(_N.insertAfter(_N.create("input",{type:"hidden",name:e}),e),t.hasHiddenInput=!0),t.formEventDelegate=function(e){t.fire(e.type,e)},_N.bind(a,"submit reset",t.formEventDelegate),t.on("reset",function(){t.resetContent()}),!t.getParam("submit_patch")||a.submit.nodeType||a.submit.length||a._mceOldSubmit||(a._mceOldSubmit=a.submit,a.submit=function(){return t.editorManager.triggerSave(),t.setDirty(!1),a._mceOldSubmit(a)})),t.windowManager=Jy(t),t.notificationManager=Wy(t),"xml"===t.getParam("encoding")&&t.on("GetContent",function(e){e.save&&(e.content=_N.encode(e.content))}),t.getParam("add_form_submit_trigger")&&t.on("submit",function(){t.initialized&&t.save()}),t.getParam("add_unload_trigger")&&(t._beforeUnload=function(){!t.initialized||t.destroyed||t.isHidden()||t.save({format:"raw",no_events:!0,set_dirty:!1})},t.editorManager.on("BeforeUnload",t._beforeUnload)),t.editorManager.add(t),ON(t,t.suffix)):_N.bind(window,"ready",u)},PN=function(e,t){return n=t,Ov(e).editor.addVisual(n);var n},LN={"font-size":"size","font-family":"face"},IN=function(n,t,e){return Xg(Rt.fromDom(e),function(e){return rr(t=e,n).orThunk(function(){return"font"===It(t)?he(LN,n).bind(function(e){return Qn(t,e)}):U.none()});var t},function(e){return Bt(Rt.fromDom(t),e)})},MN=function(o){return function(r,e){return U.from(e).map(Rt.fromDom).filter(Ut).bind(function(e){return IN(o,r,e.dom).or((t=o,n=e.dom,U.from(xu.DOM.getStyle(n,t,!0))));var t,n}).getOr("")}},FN=MN("font-size"),UN=a(function(e){return e.replace(/[\'\"\\]/g,"").replace(/,\s+/g,",")},MN("font-family")),zN=function(e){return Ll(e.getBody()).map(function(e){var t=e.container();return Mn(t)?t.parentNode:t})},jN=function(e,t){return n=e,U.from(n.selection.getRng()).bind(function(e){var t=n.getBody();return e.startContainer===t&&0===e.startOffset?U.none():U.from(n.selection.getStart(!0))}).orThunk(N(zN,e)).map(Rt.fromDom).filter(Ut).map(t);var n},HN=function(e,t){if(/^[0-9.]+$/.test(t)){var n=parseInt(t,10);if(1<=n&&n<=7){var r=(a=e,_t.explode(a.getParam("font_size_style_values","xx-small,x-small,small,medium,large,x-large,xx-large"))),o=(i=e,_t.explode(i.getParam("font_size_classes","")));return o?o[n-1]||t:r[n-1]||t}return t}return t;var i,a},VN=function(e,t){var n,r=HN(e,t);e.formatter.toggle("fontname",{value:(n=r.split(/\s*,\s*/),z(n,function(e){return-1===e.indexOf(" ")||qe(e,'"')||qe(e,"'")?e:"'"+e+"'"}).join(","))}),e.nodeChanged()},qN=function(e,t){var n,r,o,i,a="string"!=typeof(n=t)?(r=_t.extend({paste:n.paste,data:{paste:n.paste}},n),{content:n.content,details:r}):{content:n,details:{}};o=a.content,i=a.details,Dv(e).editor.insertContent(o,i)},$N=_t.each,WN=_t.map,KN=_t.inArray,XN=(YN.prototype.execCommand=function(t,n,r,e){var o,i,a=!1,u=this;if(!u.editor.removed){if(/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(t)||e&&e.skip_focus?(i=u.editor,om(i).each(function(e){return i.selection.setRng(e)})):u.editor.focus(),(e=u.editor.fire("BeforeExecCommand",{command:t,ui:n,value:r})).isDefaultPrevented())return!1;var s=t.toLowerCase();if(o=u.commands.exec[s])return o(s,n,r),u.editor.fire("ExecCommand",{command:t,ui:n,value:r}),!0;if($N(this.editor.plugins,function(e){if(e.execCommand&&e.execCommand(t,n,r))return u.editor.fire("ExecCommand",{command:t,ui:n,value:r}),!(a=!0)}),a)return a;if(u.editor.theme&&u.editor.theme.execCommand&&u.editor.theme.execCommand(t,n,r))return u.editor.fire("ExecCommand",{command:t,ui:n,value:r}),!0;try{a=u.editor.getDoc().execCommand(t,n,r)}catch(c){}return!!a&&(u.editor.fire("ExecCommand",{command:t,ui:n,value:r}),!0)}},YN.prototype.queryCommandState=function(e){var t;if(!this.editor.quirks.isHidden()&&!this.editor.removed){if(e=e.toLowerCase(),t=this.commands.state[e])return t(e);try{return this.editor.getDoc().queryCommandState(e)}catch(n){}return!1}},YN.prototype.queryCommandValue=function(e){var t;if(!this.editor.quirks.isHidden()&&!this.editor.removed){if(e=e.toLowerCase(),t=this.commands.value[e])return t(e);try{return this.editor.getDoc().queryCommandValue(e)}catch(n){}}},YN.prototype.addCommands=function(e,n){void 0===n&&(n="exec");var r=this;$N(e,function(t,e){$N(e.toLowerCase().split(","),function(e){r.commands[n][e]=t})})},YN.prototype.addCommand=function(e,o,i){var a=this;e=e.toLowerCase(),this.commands.exec[e]=function(e,t,n,r){return o.call(i||a.editor,t,n,r)}},YN.prototype.queryCommandSupported=function(e){if(e=e.toLowerCase(),this.commands.exec[e])return!0;try{return this.editor.getDoc().queryCommandSupported(e)}catch(t){}return!1},YN.prototype.addQueryStateHandler=function(e,t,n){var r=this;e=e.toLowerCase(),this.commands.state[e]=function(){return t.call(n||r.editor)}},YN.prototype.addQueryValueHandler=function(e,t,n){var r=this;e=e.toLowerCase(),this.commands.value[e]=function(){return t.call(n||r.editor)}},YN.prototype.hasCustomCommand=function(e){return e=e.toLowerCase(),!!this.commands.exec[e]},YN.prototype.execNativeCommand=function(e,t,n){return t===undefined&&(t=!1),n===undefined&&(n=null),this.editor.getDoc().execCommand(e,t,n)},YN.prototype.isFormatMatch=function(e){return this.editor.formatter.match(e)},YN.prototype.toggleFormat=function(e,t){this.editor.formatter.toggle(e,t?{value:t}:undefined),this.editor.nodeChanged()},YN.prototype.storeSelection=function(e){this.selectionBookmark=this.editor.selection.getBookmark(e)},YN.prototype.restoreSelection=function(){this.editor.selection.moveToBookmark(this.selectionBookmark)},YN.prototype.setupCommands=function(i){var a=this;this.addCommands({"mceResetDesignMode,mceBeginUndoLevel":te,"mceEndUndoLevel,mceAddUndoLevel":function(){i.undoManager.add()},"Cut,Copy,Paste":function(e){var t,n,r=i.getDoc();try{a.execNativeCommand(e)}catch(o){t=!0}"paste"!==e||r.queryCommandEnabled(e)||(t=!0),!t&&r.queryCommandSupported(e)||(n=i.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead."),xt.mac&&(n=n.replace(/Ctrl\+/g,"\u2318+")),i.notificationManager.open({text:n,type:"error"}))},unlink:function(){var e;i.selection.isCollapsed()?(e=i.dom.getParent(i.selection.getStart(),"a"))&&i.dom.remove(e,!0):i.formatter.remove("link")},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull,JustifyNone":function(e){var t=e.substring(7);"full"===t&&(t="justify"),$N("left,center,right,justify".split(","),function(e){t!==e&&i.formatter.remove("align"+e)}),"none"!==t&&a.toggleFormat("align"+t)},"InsertUnorderedList,InsertOrderedList":function(e){var t;a.execNativeCommand(e);var n=i.dom.getParent(i.selection.getNode(),"ol,ul");n&&(t=n.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(t.nodeName)&&(a.storeSelection(),i.dom.split(t,n),a.restoreSelection()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){a.toggleFormat(e)},"ForeColor,HiliteColor":function(e,t,n){a.toggleFormat(e,n)},FontName:function(e,t,n){VN(i,n)},FontSize:function(e,t,n){var r,o;o=n,(r=i).formatter.toggle("fontsize",{value:HN(r,o)}),r.nodeChanged()},LineHeight:function(e,t,n){var r,o;o=n,(r=i).undoManager.transact(function(){r.formatter.toggle("lineheight",{value:String(o)}),r.nodeChanged()})},RemoveFormat:function(e){i.formatter.remove(e)},mceBlockQuote:function(){a.toggleFormat("blockquote")},FormatBlock:function(e,t,n){return a.toggleFormat(n||"p")},mceCleanup:function(){var e=i.selection.getBookmark();i.setContent(i.getContent()),i.selection.moveToBookmark(e)},mceRemoveNode:function(e,t,n){var r=n||i.selection.getNode();r!==i.getBody()&&(a.storeSelection(),i.dom.remove(r,!0),a.restoreSelection())},mceSelectNodeDepth:function(e,t,n){var r=0;i.dom.getParent(i.selection.getNode(),function(e){if(1===e.nodeType&&r++===n)return i.selection.select(e),!1},i.getBody())},mceSelectNode:function(e,t,n){i.selection.select(n)},mceInsertContent:function(e,t,n){qN(i,n)},mceInsertRawHTML:function(e,t,n){i.selection.setContent("tiny_mce_marker");var r=i.getContent();i.setContent(r.replace(/tiny_mce_marker/g,function(){return n}))},mceInsertNewLine:function(e,t,n){RS(i,n)},mceToggleFormat:function(e,t,n){a.toggleFormat(n)},mceSetContent:function(e,t,n){i.setContent(n)},"Indent,Outdent":function(e){Cw(i,e)},mceRepaint:te,InsertHorizontalRule:function(){i.execCommand("mceInsertContent",!1,"<hr />")},mceToggleVisualAid:function(){i.hasVisual=!i.hasVisual,i.addVisual()},mceReplaceContent:function(e,t,n){i.execCommand("mceInsertContent",!1,n.replace(/\{\$selection\}/g,i.selection.getContent({format:"text"})))},mceInsertLink:function(e,t,n){"string"==typeof n&&(n={href:n});var r=i.dom.getParent(i.selection.getNode(),"a");n.href=n.href.replace(/ /g,"%20"),r&&n.href||i.formatter.remove("link"),n.href&&i.formatter.apply("link",n,r)},selectAll:function(){var e,t=i.dom.getParent(i.selection.getStart(),Vn);t&&((e=i.dom.createRng()).selectNodeContents(t),i.selection.setRng(e))},mceNewDocument:function(){i.setContent("")},InsertLineBreak:function(e,t,n){return gS(i,n),!0}});var e=function(r){return function(){var e=i.selection,t=e.isCollapsed()?[i.dom.getParent(e.getNode(),i.dom.isBlock)]:e.getSelectedBlocks(),n=WN(t,function(e){return!!i.formatter.matchNode(e,r)});return-1!==KN(n,!0)}};a.addCommands({JustifyLeft:e("alignleft"),JustifyCenter:e("aligncenter"),JustifyRight:e("alignright"),JustifyFull:e("alignjustify"),"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return a.isFormatMatch(e)},mceBlockQuote:function(){return a.isFormatMatch("blockquote")},Outdent:function(){return vw(i)},"InsertUnorderedList,InsertOrderedList":function(e){var t=i.dom.getParent(i.selection.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),a.addCommands({Undo:function(){i.undoManager.undo()},Redo:function(){i.undoManager.redo()}}),a.addQueryValueHandler("FontName",function(){return jN(t=i,function(e){return UN(t.getBody(),e.dom)}).getOr("");var t},this),a.addQueryValueHandler("FontSize",function(){return jN(t=i,function(e){return FN(t.getBody(),e.dom)}).getOr("");var t},this),a.addQueryValueHandler("LineHeight",function(){return jN(t=i,function(n){var e=Rt.fromDom(t.getBody());return Xg(n,function(e){return rr(e,"line-height")},N(Bt,e)).getOrThunk(function(){var e=parseFloat(tr(n,"line-height")),t=parseFloat(tr(n,"font-size"));return String(e/t)})}).getOr("");var t},this)},YN);function YN(e){this.commands={state:{},exec:{},value:{}},this.editor=e,this.setupCommands(e)}var GN="data-mce-contenteditable",JN=function(e,t,n){var r,o;Hu(e,t)&&!1===n?(o=t,Mu(r=e)?r.dom.classList.remove(o):Uu(r,o),ju(r)):n&&zu(e,t)},QN=function(e,t,n){try{e.getDoc().execCommand(t,!1,String(n))}catch(r){}},ZN=function(e,t){e.dom.contentEditable=t?"true":"false"},eE=function(e,t){var n,r,o,i=Rt.fromDom(e.getBody());JN(i,"mce-content-readonly",t),t?(e.selection.controlSelection.hideResizeRect(),e._selectionOverrides.hideFakeCaret(),o=e,U.from(o.selection.getNode()).each(function(e){e.removeAttribute("data-mce-selected")}),e.readonly=!0,ZN(i,!1),Y(qu(i,'*[contenteditable="true"]'),function(e){Yn(e,GN,"true"),ZN(e,!1)})):(e.readonly=!1,ZN(i,!0),Y(qu(i,"*["+GN+'="true"]'),function(e){Zn(e,GN),ZN(e,!0)}),QN(e,"StyleWithCSS",!1),QN(e,"enableInlineTableEditing",!1),QN(e,"enableObjectResizing",!1),(vm(r=e)||hm(r))&&e.focus(),(n=e).selection.setRng(n.selection.getRng()),e.nodeChanged())},tE=function(e){return e.readonly},nE=function(t){t.parser.addAttributeFilter("contenteditable",function(e){tE(t)&&Y(e,function(e){e.attr(GN,e.attr("contenteditable")),e.attr("contenteditable","false")})}),t.serializer.addAttributeFilter(GN,function(e){tE(t)&&Y(e,function(e){e.attr("contenteditable",e.attr(GN))})}),t.serializer.addTempAttr(GN)},rE=function(a,u){var e,t;"click"!==u.type||ed.metaKeyPressed(u)||(e=Rt.fromDom(u.target),t=a,Lr(e,"a",function(e){return Bt(e,Rt.fromDom(t.getBody()))}).bind(function(e){return Qn(e,"href")}).each(function(e){var t,n,r,o,i;u.preventDefault(),/^#/.test(e)?(t=a.dom.select(e+',[name="'+(qe(n=e,r="#")?(o=n,i=r.length,o.substring(i)):n)+'"]')).length&&a.selection.scrollIntoView(t[0],!0):window.open(e,"_blank","rel=noopener noreferrer,menubar=yes,toolbar=yes,location=yes,status=yes,resizable=yes,scrollbars=yes")}))},oE=_t.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input beforeinput contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchmove touchend touchcancel"," "),iE=(aE.isNative=function(e){return!!oE[e.toLowerCase()]},aE.prototype.fire=function(e,t){var n=e.toLowerCase(),r=t||{};r.type=n,r.target||(r.target=this.scope),r.preventDefault||(r.preventDefault=function(){r.isDefaultPrevented=w},r.stopPropagation=function(){r.isPropagationStopped=w},r.stopImmediatePropagation=function(){r.isImmediatePropagationStopped=w},r.isDefaultPrevented=b,r.isPropagationStopped=b,r.isImmediatePropagationStopped=b),this.settings.beforeFire&&this.settings.beforeFire(r);var o=this.bindings[n];if(o)for(var i=0,a=o.length;i<a;i++){var u=o[i];if(u.once&&this.off(n,u.func),r.isImmediatePropagationStopped())return r.stopPropagation(),r;if(!1===u.func.call(this.scope,r))return r.preventDefault(),r}return r},aE.prototype.on=function(e,t,n,r){if(!1===t&&(t=b),t){var o={func:t};r&&_t.extend(o,r);for(var i=e.toLowerCase().split(" "),a=i.length;a--;){var u=i[a],s=this.bindings[u];s||(s=this.bindings[u]=[],this.toggleEvent(u,!0)),n?s.unshift(o):s.push(o)}}return this},aE.prototype.off=function(e,t){var n=this;if(e)for(var r=e.toLowerCase().split(" "),o=r.length;o--;){var i=r[o],a=this.bindings[i];if(!i)return se(this.bindings,function(e,t){n.toggleEvent(t,!1),delete n.bindings[t]}),this;if(a){if(t)for(var u=a.length;u--;)a[u].func===t&&(a=a.slice(0,u).concat(a.slice(u+1)),this.bindings[i]=a);else a.length=0;a.length||(this.toggleEvent(e,!1),delete this.bindings[i])}}else se(this.bindings,function(e,t){n.toggleEvent(t,!1)}),this.bindings={};return this},aE.prototype.once=function(e,t,n){return this.on(e,t,n,{once:!0})},aE.prototype.has=function(e){return e=e.toLowerCase(),!(!this.bindings[e]||0===this.bindings[e].length)},aE);function aE(e){this.bindings={},this.settings=e||{},this.scope=this.settings.scope||this,this.toggleEvent=this.settings.toggleEvent||b}var uE,sE=function(n){return n._eventDispatcher||(n._eventDispatcher=new iE({scope:n,toggleEvent:function(e,t){iE.isNative(e)&&n.toggleNativeEvent&&n.toggleNativeEvent(e,t)}})),n._eventDispatcher},cE={fire:function(e,t,n){if(this.removed&&"remove"!==e&&"detach"!==e)return t;var r=sE(this).fire(e,t);if(!1!==n&&this.parent)for(var o=this.parent();o&&!r.isPropagationStopped();)o.fire(e,r,!1),o=o.parent();return r},on:function(e,t,n){return sE(this).on(e,t,n)},off:function(e,t){return sE(this).off(e,t)},once:function(e,t){return sE(this).once(e,t)},hasEventListeners:function(e){return sE(this).has(e)}},lE=xu.DOM,fE=function(e,t){if("selectionchange"===t)return e.getDoc();if(!e.inline&&/^mouse|touch|click|contextmenu|drop|dragover|dragend/.test(t))return e.getDoc().documentElement;var n=bc(e);return n?(e.eventRoot||(e.eventRoot=lE.select(n)[0]),e.eventRoot):e.getBody()},dE=function(e,t,n){var r;(r=e).hidden||tE(r)?tE(e)&&rE(e,n):e.fire(t,n)},mE=function(i,a){var e;if(i.delegates||(i.delegates={}),!i.delegates[a]&&!i.removed){var t=fE(i,a);if(bc(i)){if(uE||(uE={},i.editorManager.on("removeEditor",function(){i.editorManager.activeEditor||uE&&(se(uE,function(e,t){i.dom.unbind(fE(i,t))}),uE=null)})),uE[a])return;e=function(e){for(var t=e.target,n=i.editorManager.get(),r=n.length;r--;){var o=n[r].getBody();o!==t&&!lE.isChildOf(t,o)||dE(n[r],a,e)}},uE[a]=e,lE.bind(t,a,e)}else e=function(e){dE(i,a,e)},lE.bind(t,a,e),i.delegates[a]=e}},pE=_e(_e({},cE),{bindPendingEventDelegates:function(){var t=this;_t.each(t._pendingNativeEvents,function(e){mE(t,e)})},toggleNativeEvent:function(e,t){var n=this;"focus"!==e&&"blur"!==e&&(t?n.initialized?mE(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&(n.dom.unbind(fE(n,e),e,n.delegates[e]),delete n.delegates[e]))},unbindAllNativeEvents:function(){var n=this,e=n.getBody(),t=n.dom;n.delegates&&(se(n.delegates,function(e,t){n.dom.unbind(fE(n,t),t,e)}),delete n.delegates),!n.inline&&e&&t&&(e.onload=null,t.unbind(n.getWin()),t.unbind(n.getDoc())),t&&(t.unbind(e),t.unbind(n.getContainer()))}}),gE=["design","readonly"],hE=function(e,t,n,r){var o,i=n[t.get()],a=n[r];try{a.activate()}catch(_k){return void console.error("problem while activating editor mode "+r+":",_k)}i.deactivate(),i.editorReadOnly!==a.editorReadOnly&&eE(e,a.editorReadOnly),t.set(r),o=r,e.fire("SwitchMode",{mode:o})},vE=function(t){var e,n,r=Au("design"),o=Au({design:{activate:te,deactivate:te,editorReadOnly:!1},readonly:{activate:te,deactivate:te,editorReadOnly:!0}});return(e=t).serializer?nE(e):e.on("PreInit",function(){nE(e)}),(n=t).on("ShowCaret",function(e){tE(n)&&e.preventDefault()}),n.on("ObjectSelected",function(e){tE(n)&&e.preventDefault()}),{isReadOnly:function(){return tE(t)},set:function(e){return function(e,t,n,r){if(r!==n.get()){if(!ve(t,r))throw new Error("Editor mode '"+r+"' is invalid");e.initialized?hE(e,n,t,r):e.on("init",function(){return hE(e,n,t,r)})}}(t,o.get(),r,e)},get:function(){return r.get()},register:function(e,t){o.set(function(e,t,n){var r;if(M(gE,t))throw new Error("Cannot override default mode "+t);return _e(_e({},e),((r={})[t]=_e(_e({},n),{deactivate:function(){try{n.deactivate()}catch(_k){console.error("problem while deactivating editor mode "+t+":",_k)}}}),r))}(o.get(),e,t))}}},yE=_t.each,bE=_t.explode,CE={f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},wE=_t.makeMap("alt,ctrl,shift,meta,access"),xE=function(e){var t,n={};yE(bE(e.toLowerCase(),"+"),function(e){e in wE?n[e]=!0:/^[0-9]{2,}$/.test(e)?n.keyCode=parseInt(e,10):(n.charCode=e.charCodeAt(0),n.keyCode=CE[e]||e.toUpperCase().charCodeAt(0))});var r=[n.keyCode];for(t in wE)n[t]?r.push(t):n[t]=!1;return n.id=r.join(","),n.access&&(n.alt=!0,xt.mac?n.ctrl=!0:n.shift=!0),n.meta&&(xt.mac?n.meta=!0:(n.ctrl=!0,n.meta=!1)),n},SE=(NE.prototype.add=function(e,n,t,r){var o=this,i=o.normalizeCommandFunc(t);return yE(bE(_t.trim(e)),function(e){var t=o.createShortcut(e,n,i,r);o.shortcuts[t.id]=t}),!0},NE.prototype.remove=function(e){var t=this.createShortcut(e);return!!this.shortcuts[t.id]&&(delete this.shortcuts[t.id],!0)},NE.prototype.normalizeCommandFunc=function(e){var t=this,n=e;return"string"==typeof n?function(){t.editor.execCommand(n,!1,null)}:_t.isArray(n)?function(){t.editor.execCommand(n[0],n[1],n[2])}:n},NE.prototype.createShortcut=function(e,t,n,r){var o=_t.map(bE(e,">"),xE);return o[o.length-1]=_t.extend(o[o.length-1],{func:n,scope:r||this.editor}),_t.extend(o[0],{desc:this.editor.translate(t),subpatterns:o.slice(1)})},NE.prototype.hasModifier=function(e){return e.altKey||e.ctrlKey||e.metaKey},NE.prototype.isFunctionKey=function(e){return"keydown"===e.type&&112<=e.keyCode&&e.keyCode<=123},NE.prototype.matchShortcut=function(e,t){return!!t&&t.ctrl===e.ctrlKey&&t.meta===e.metaKey&&t.alt===e.altKey&&t.shift===e.shiftKey&&!!(e.keyCode===t.keyCode||e.charCode&&e.charCode===t.charCode)&&(e.preventDefault(),!0)},NE.prototype.executeShortcutAction=function(e){return e.func?e.func.call(e.scope):null},NE);function NE(e){this.shortcuts={},this.pendingPatterns=[],this.editor=e;var n=this;e.on("keyup keypress keydown",function(t){!n.hasModifier(t)&&!n.isFunctionKey(t)||t.isDefaultPrevented()||(yE(n.shortcuts,function(e){if(n.matchShortcut(t,e))return n.pendingPatterns=e.subpatterns.slice(0),"keydown"===t.type&&n.executeShortcutAction(e),!0}),n.matchShortcut(t,n.pendingPatterns[0])&&(1===n.pendingPatterns.length&&"keydown"===t.type&&n.executeShortcutAction(n.pendingPatterns[0]),n.pendingPatterns.shift()))})}var EE=function(){var e,t,n,r,o,i,a,u,s=(t={},n={},r={},o={},i={},a={},{addButton:(u=function(n,r){return function(e,t){return n[e.toLowerCase()]=_e(_e({},t),{type:r})}})(e={},"button"),addGroupToolbarButton:u(e,"grouptoolbarbutton"),addToggleButton:u(e,"togglebutton"),addMenuButton:u(e,"menubutton"),addSplitButton:u(e,"splitbutton"),addMenuItem:u(t,"menuitem"),addNestedMenuItem:u(t,"nestedmenuitem"),addToggleMenuItem:u(t,"togglemenuitem"),addAutocompleter:u(n,"autocompleter"),addContextMenu:u(o,"contextmenu"),addContextToolbar:u(i,"contexttoolbar"),addContextForm:u(i,"contextform"),addSidebar:u(a,"sidebar"),addIcon:function(e,t){return r[e.toLowerCase()]=t},getAll:function(){return{buttons:e,menuItems:t,icons:r,popups:n,contextMenus:o,contextToolbars:i,sidebars:a}}});return{addAutocompleter:s.addAutocompleter,addButton:s.addButton,addContextForm:s.addContextForm,addContextMenu:s.addContextMenu,addContextToolbar:s.addContextToolbar,addIcon:s.addIcon,addMenuButton:s.addMenuButton,addMenuItem:s.addMenuItem,addNestedMenuItem:s.addNestedMenuItem,addSidebar:s.addSidebar,addSplitButton:s.addSplitButton,addToggleButton:s.addToggleButton,addGroupToolbarButton:s.addGroupToolbarButton,addToggleMenuItem:s.addToggleMenuItem,getAll:s.getAll}},kE=_t.each,_E=_t.trim,AE="source protocol authority userInfo user password host port relative path directory file query anchor".split(" "),RE={ftp:21,http:80,https:443,mailto:25},TE=(DE.parseDataUri=function(e){var t,n=decodeURIComponent(e).split(","),r=/data:([^;]+)/.exec(n[0]);return r&&(t=r[1]),{type:t,data:n[1]}},DE.getDocumentBaseUrl=function(e){var t=0!==e.protocol.indexOf("http")&&"file:"!==e.protocol?e.href:e.protocol+"//"+e.host+e.pathname;return/^[^:]+:\/\/\/?[^\/]+\//.test(t)&&(t=t.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(t)||(t+="/")),t},DE.prototype.setPath=function(e){var t=/^(.*?)\/?(\w+)?$/.exec(e);this.path=t[0],this.directory=t[1],this.file=t[2],this.source="",this.getURI()},DE.prototype.toRelative=function(e){var t;if("./"===e)return e;var n=new DE(e,{base_uri:this});if("mce_host"!==n.host&&this.host!==n.host&&n.host||this.port!==n.port||this.protocol!==n.protocol&&""!==n.protocol)return n.getURI();var r=this.getURI(),o=n.getURI();return r===o||"/"===r.charAt(r.length-1)&&r.substr(0,r.length-1)===o?r:(t=this.toRelPath(this.path,n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),t)},DE.prototype.toAbsolute=function(e,t){var n=new DE(e,{base_uri:this});return n.getURI(t&&this.isSameOrigin(n))},DE.prototype.isSameOrigin=function(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;var t=RE[this.protocol];if(t&&(this.port||t)==(e.port||t))return!0}return!1},DE.prototype.toRelPath=function(e,t){var n,r,o=0,i="",a=e.substring(0,e.lastIndexOf("/")).split("/"),u=t.split("/");if(a.length>=u.length)for(n=0,r=a.length;n<r;n++)if(n>=u.length||a[n]!==u[n]){o=n+1;break}if(a.length<u.length)for(n=0,r=u.length;n<r;n++)if(n>=a.length||a[n]!==u[n]){o=n+1;break}if(1===o)return t;for(n=0,r=a.length-(o-1);n<r;n++)i+="../";for(n=o-1,r=u.length;n<r;n++)i+=n!==o-1?"/"+u[n]:u[n];return i},DE.prototype.toAbsPath=function(e,t){var n,r,o=0,i=[],a=/\/$/.test(t)?"/":"",u=e.split("/"),s=t.split("/");for(kE(u,function(e){e&&i.push(e)}),u=i,n=s.length-1,i=[];0<=n;n--)0!==s[n].length&&"."!==s[n]&&(".."!==s[n]?0<o?o--:i.push(s[n]):o++);return 0!==(r=(n=u.length-o)<=0?Z(i).join("/"):u.slice(0,n).join("/")+"/"+Z(i).join("/")).indexOf("/")&&(r="/"+r),a&&r.lastIndexOf("/")!==r.length-1&&(r+=a),r},DE.prototype.getURI=function(e){var t;return void 0===e&&(e=!1),this.source&&!e||(t="",e||(this.protocol?t+=this.protocol+"://":t+="//",this.userInfo&&(t+=this.userInfo+"@"),this.host&&(t+=this.host),this.port&&(t+=":"+this.port)),this.path&&(t+=this.path),this.query&&(t+="?"+this.query),this.anchor&&(t+="#"+this.anchor),this.source=t),this.source},DE);function DE(e,t){e=_E(e),this.settings=t||{};var n,r,o,i,a=this.settings.base_uri,u=this;/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)?u.source=e:(n=0===e.indexOf("//"),0!==e.indexOf("/")||n||(e=(a&&a.protocol||"http")+"://mce_host"+e),/^[\w\-]*:?\/\//.test(e)||(r=this.settings.base_uri?this.settings.base_uri.path:new DE(document.location.href).directory,e=this.settings.base_uri&&""==this.settings.base_uri.protocol?"//mce_host"+u.toAbsPath(r,e):(o=/([^#?]*)([#?]?.*)/.exec(e),(a&&a.protocol||"http")+"://mce_host"+u.toAbsPath(r,o[1])+o[2])),e=e.replace(/@@/g,"(mce_at)"),i=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?(\[[a-zA-Z0-9:.%]+\]|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e),kE(AE,function(e,t){var n=(n=i[t])&&n.replace(/\(mce_at\)/g,"@@");u[e]=n}),a&&(u.protocol||(u.protocol=a.protocol),u.userInfo||(u.userInfo=a.userInfo),u.port||"mce_host"!==u.host||(u.port=a.port),u.host&&"mce_host"!==u.host||(u.host=a.host),u.source=""),n&&(u.protocol=""))}var OE=xu.DOM,BE=_t.extend,PE=_t.each,LE=_t.resolve,IE=xt.ie,ME=(FE.prototype.render=function(){BN(this)},FE.prototype.focus=function(e){var t,n;n=e,(t=this).removed||(n?bm:ym)(t)},FE.prototype.hasFocus=function(){return vm(this)},FE.prototype.execCallback=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r,o=this.settings[e];if(o)return this.callbackLookup&&(r=this.callbackLookup[e])&&(o=r.func,r=r.scope),"string"==typeof o&&(r=(r=o.replace(/\.\w+$/,""))?LE(r):0,o=LE(o),this.callbackLookup=this.callbackLookup||{},this.callbackLookup[e]={func:o,scope:r}),o.apply(r||this,t)},FE.prototype.translate=function(e){return Ou.translate(e)},FE.prototype.getParam=function(e,t,n){return Iy(this,e,t,n)},FE.prototype.hasPlugin=function(e,t){return!(!M(xc(this).split(/[ ,]/),e)||t&&Ky.get(e)===undefined)},FE.prototype.nodeChanged=function(e){this._nodeChangeDispatcher.nodeChanged(e)},FE.prototype.addCommand=function(e,t,n){this.editorCommands.addCommand(e,t,n)},FE.prototype.addQueryStateHandler=function(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)},FE.prototype.addQueryValueHandler=function(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)},FE.prototype.addShortcut=function(e,t,n,r){this.shortcuts.add(e,t,n,r)},FE.prototype.execCommand=function(e,t,n,r){return this.editorCommands.execCommand(e,t,n,r)},FE.prototype.queryCommandState=function(e){return this.editorCommands.queryCommandState(e)},FE.prototype.queryCommandValue=function(e){return this.editorCommands.queryCommandValue(e)},FE.prototype.queryCommandSupported=function(e){return this.editorCommands.queryCommandSupported(e)},FE.prototype.show=function(){this.hidden&&(this.hidden=!1,this.inline?this.getBody().contentEditable="true":(OE.show(this.getContainer()),OE.hide(this.id)),this.load(),this.fire("show"))},FE.prototype.hide=function(){var e=this,t=e.getDoc();e.hidden||(IE&&t&&!e.inline&&t.execCommand("SelectAll"),e.save(),e.inline?(e.getBody().contentEditable="false",e===e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(OE.hide(e.getContainer()),OE.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.fire("hide"))},FE.prototype.isHidden=function(){return!!this.hidden},FE.prototype.setProgressState=function(e,t){this.fire("ProgressState",{state:e,time:t})},FE.prototype.load=function(e){var t=this.getElement();if(this.removed)return"";if(t){(e=e||{}).load=!0;var n=In(t)?t.value:t.innerHTML,r=this.setContent(n,e);return e.element=t,e.no_events||this.fire("LoadContent",e),e.element=t=null,r}},FE.prototype.save=function(e){var t,n,r=this,o=r.getElement();if(o&&r.initialized&&!r.removed)return(e=e||{}).save=!0,e.element=o,e.content=r.getContent(e),e.no_events||r.fire("SaveContent",e),"raw"===e.format&&r.fire("RawSaveContent",e),t=e.content,In(o)?o.value=t:(!e.is_removing&&r.inline||(o.innerHTML=t),(n=OE.getParent(r.id,"form"))&&PE(n.elements,function(e){if(e.name===r.id)return e.value=t,!1})),e.element=o=null,!1!==e.set_dirty&&r.setDirty(!1),t},FE.prototype.setContent=function(e,t){return py(this,e,t)},FE.prototype.getContent=function(e){return my(this,e)},FE.prototype.insertContent=function(e,t){t&&(e=BE({content:e},t)),this.execCommand("mceInsertContent",!1,e)},FE.prototype.resetContent=function(e){e===undefined?py(this,this.startContent,{format:"raw"}):py(this,e),this.undoManager.reset(),this.setDirty(!1),this.nodeChanged()},FE.prototype.isDirty=function(){return!this.isNotDirty},FE.prototype.setDirty=function(e){var t=!this.isNotDirty;this.isNotDirty=!e,e&&e!==t&&this.fire("dirty")},FE.prototype.getContainer=function(){return this.container||(this.container=OE.get(this.editorContainer||this.id+"_parent")),this.container},FE.prototype.getContentAreaContainer=function(){return this.contentAreaContainer},FE.prototype.getElement=function(){return this.targetElm||(this.targetElm=OE.get(this.id)),this.targetElm},FE.prototype.getWin=function(){var e;return this.contentWindow||(e=this.iframeElement)&&(this.contentWindow=e.contentWindow),this.contentWindow},FE.prototype.getDoc=function(){var e;return this.contentDocument||(e=this.getWin())&&(this.contentDocument=e.document),this.contentDocument},FE.prototype.getBody=function(){var e=this.getDoc();return this.bodyElement||(e?e.body:null)},FE.prototype.convertURL=function(e,t,n){var r=this.settings;return r.urlconverter_callback?this.execCallback("urlconverter_callback",e,n,!0,t):!r.convert_urls||n&&"LINK"===n.nodeName||0===e.indexOf("file:")||0===e.length?e:r.relative_urls?this.documentBaseURI.toRelative(e):e=this.documentBaseURI.toAbsolute(e,r.remove_script_host)},FE.prototype.addVisual=function(e){PN(this,e)},FE.prototype.remove=function(){vy(this)},FE.prototype.destroy=function(e){yy(this,e)},FE.prototype.uploadImages=function(e){return this.editorUpload.uploadImages(e)},FE.prototype._scanForImages=function(){return this.editorUpload.scanForImages()},FE.prototype.addButton=function(){throw new Error("editor.addButton has been removed in tinymce 5x, use editor.ui.registry.addButton or editor.ui.registry.addToggleButton or editor.ui.registry.addSplitButton instead")},FE.prototype.addSidebar=function(){throw new Error("editor.addSidebar has been removed in tinymce 5x, use editor.ui.registry.addSidebar instead")},FE.prototype.addMenuItem=function(){throw new Error("editor.addMenuItem has been removed in tinymce 5x, use editor.ui.registry.addMenuItem instead")},FE.prototype.addContextToolbar=function(){throw new Error("editor.addContextToolbar has been removed in tinymce 5x, use editor.ui.registry.addContextToolbar instead")},FE);function FE(e,t,n){var r=this;this.plugins={},this.contentCSS=[],this.contentStyles=[],this.loadedCSS={},this.isNotDirty=!1,this.editorManager=n,this.documentBaseUrl=n.documentBaseURL,BE(this,pE),this.settings=Py(this,e,this.documentBaseUrl,n.defaultSettings,t),this.settings.suffix&&(n.suffix=this.settings.suffix),this.suffix=n.suffix,this.settings.base_url&&n._setBaseUrl(this.settings.base_url),this.baseUri=n.baseURI,this.settings.referrer_policy&&(ku.ScriptLoader._setReferrerPolicy(this.settings.referrer_policy),xu.DOM.styleSheetLoader._setReferrerPolicy(this.settings.referrer_policy)),Bu.languageLoad=this.settings.language_load,Bu.baseURL=n.baseURL,this.id=e,this.setDirty(!1),this.documentBaseURI=new TE(this.settings.document_base_url,{base_uri:this.baseUri}),this.baseURI=this.baseUri,this.inline=!!this.settings.inline,this.shortcuts=new SE(this),this.editorCommands=new XN(this),this.settings.cache_suffix&&(xt.cacheSuffix=this.settings.cache_suffix.replace(/^[\?\&]+/,"")),this.ui={registry:EE(),styleSheetLoader:undefined,show:te,hide:te,enable:te,disable:te,isDisabled:b};var o=vE(this);this.mode=o,this.setMode=o.set,n.fire("SetupEditor",{editor:this}),this.execCallback("setup",this),this.$=gu.overrideDefaults(function(){return{context:r.inline?r.getBody():r.getDoc(),element:r.getBody()}})}var UE,zE=xu.DOM,jE=_t.explode,HE=_t.each,VE=_t.extend,qE=0,$E=!1,WE=[],KE=[],XE=function(t){var n=t.type;HE(QE.get(),function(e){switch(n){case"scroll":e.fire("ScrollWindow",t);break;case"resize":e.fire("ResizeWindow",t)}})},YE=function(e){e!==$E&&(e?gu(window).on("resize scroll",XE):gu(window).off("resize scroll",XE),$E=e)},GE=function(t){var e=KE;delete WE[t.id];for(var n=0;n<WE.length;n++)if(WE[n]===t){WE.splice(n,1);break}return KE=H(KE,function(e){return t!==e}),QE.activeEditor===t&&(QE.activeEditor=0<KE.length?KE[0]:null),QE.focusedEditor===t&&(QE.focusedEditor=null),e.length!==KE.length},JE="CSS1Compat"!==document.compatMode,QE=_e(_e({},cE),{baseURI:null,baseURL:null,defaultSettings:{},documentBaseURL:null,suffix:null,$:gu,majorVersion:"5",minorVersion:"7.1",releaseDate:"2021-03-17",editors:WE,i18n:Ou,activeEditor:null,focusedEditor:null,settings:{},setup:function(){var e,t="",n=TE.getDocumentBaseUrl(document.location);/^[^:]+:\/\/\/?[^\/]+\//.test(n)&&(n=n.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/"));var r,o=window.tinymce||window.tinyMCEPreInit;if(o)e=o.base||o.baseURL,t=o.suffix;else{for(var i,a=document.getElementsByTagName("script"),u=0;u<a.length;u++){if(""!==(i=a[u].src||"")){var s=i.substring(i.lastIndexOf("/"));if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(i)){-1!==s.indexOf(".min")&&(t=".min"),e=i.substring(0,i.lastIndexOf("/"));break}}}!e&&document.currentScript&&(-1!==(i=document.currentScript.src).indexOf(".min")&&(t=".min"),e=i.substring(0,i.lastIndexOf("/")))}this.baseURL=new TE(n).toAbsolute(e),this.documentBaseURL=n,this.baseURI=new TE(this.baseURL),this.suffix=t,(r=this).on("AddEditor",N(lm,r)),r.on("RemoveEditor",N(fm,r))},overrideDefaults:function(e){var t=e.base_url;t&&this._setBaseUrl(t);var n=e.suffix;e.suffix&&(this.suffix=n);var r=(this.defaultSettings=e).plugin_base_urls;r!==undefined&&se(r,function(e,t){Bu.PluginManager.urls[t]=e})},init:function(r){var n,u=this,s=_t.makeMap("area base basefont br col frame hr img input isindex link meta param embed source wbr track colgroup option table tbody tfoot thead tr th td script noscript style textarea video audio iframe object menu"," "),c=function(e){var t=e.id;return t||(t=he(e,"name").filter(function(e){return!zE.get(e)}).getOrThunk(zE.uniqueId),e.setAttribute("id",t)),t},l=function(e,t){return t.constructor===RegExp?t.test(e.className):zE.hasClass(e,t)},f=function(e){n=e},e=function(){var o,i=0,a=[],n=function(e,t,n){var r=new ME(e,t,u);a.push(r),r.on("init",function(){++i===o.length&&f(a)}),r.targetElm=r.targetElm||n,r.render()};zE.unbind(window,"ready",e),function(e){var t=r[e];if(t)t.apply(u,[])}("onpageload"),o=gu.unique(function(t){var n=[];if(xt.browser.isIE()&&xt.browser.version.major<11)return rb("TinyMCE does not support the browser you are using. For a list of supported browsers please see: https://www.tinymce.com/docs/get-started/system-requirements/"),[];if(JE)return rb("Failed to initialize the editor as the document is not in standards mode. TinyMCE requires standards mode."),[];if(t.types)return HE(t.types,function(e){n=n.concat(zE.select(e.selector))}),n;if(t.selector)return zE.select(t.selector);if(t.target)return[t.target];switch(t.mode){case"exact":var e=t.elements||"";0<e.length&&HE(jE(e),function(t){var e=zE.get(t);e?n.push(e):HE(document.forms,function(e){HE(e.elements,function(e){e.name===t&&(t="mce_editor_"+qE++,zE.setAttrib(e,"id",t),n.push(e))})})});break;case"textareas":case"specific_textareas":HE(zE.select("textarea"),function(e){t.editor_deselector&&l(e,t.editor_deselector)||t.editor_selector&&!l(e,t.editor_selector)||n.push(e)})}return n}(r)),r.types?HE(r.types,function(t){_t.each(o,function(e){return!zE.is(e,t.selector)||(n(c(e),VE({},r,t),e),!1)})}):(_t.each(o,function(e){var t;(t=u.get(e.id))&&t.initialized&&!(t.getContainer()||t.getBody()).parentNode&&(GE(t),t.unbindAllNativeEvents(),t.destroy(!0),t.removed=!0,t=null)}),0===(o=_t.grep(o,function(e){return!u.get(e.id)})).length?f([]):HE(o,function(e){var t;t=e,r.inline&&t.tagName.toLowerCase()in s?rb("Could not initialize inline editor on invalid inline target element",e):n(c(e),r,e)}))};return u.settings=r,zE.bind(window,"ready",e),new Ir(function(t){n?t(n):f=function(e){t(e)}})},get:function(t){return 0===arguments.length?KE.slice(0):K(t)?W(KE,function(e){return e.id===t}).getOr(null):O(t)&&KE[t]?KE[t]:null},add:function(e){var n=this;return WE[e.id]===e||(null===n.get(e.id)&&("length"!==e.id&&(WE[e.id]=e),WE.push(e),KE.push(e)),YE(!0),n.activeEditor=e,n.fire("AddEditor",{editor:e}),UE||(UE=function(e){var t=n.fire("BeforeUnload");if(t.returnValue)return e.preventDefault(),e.returnValue=t.returnValue,t.returnValue},window.addEventListener("beforeunload",UE))),e},createEditor:function(e,t){return this.add(new ME(e,t,this))},remove:function(e){var t,n,r=this;if(e){if(!K(e))return n=e,A(r.get(n.id))?null:(GE(n)&&r.fire("RemoveEditor",{editor:n}),0===KE.length&&window.removeEventListener("beforeunload",UE),n.remove(),YE(0<KE.length),n);HE(zE.select(e),function(e){(n=r.get(e.id))&&r.remove(n)})}else for(t=KE.length-1;0<=t;t--)r.remove(KE[t])},execCommand:function(e,t,n){var r=this.get(n);switch(e){case"mceAddEditor":return this.get(n)||new ME(n,this.settings,this).render(),!0;case"mceRemoveEditor":return r&&r.remove(),!0;case"mceToggleEditor":return r?(r.isHidden()?r.show():r.hide(),!0):(this.execCommand("mceAddEditor",!1,n),!0)}return!!this.activeEditor&&this.activeEditor.execCommand(e,t,n)},triggerSave:function(){HE(KE,function(e){e.save()})},addI18n:function(e,t){Ou.add(e,t)},translate:function(e){return Ou.translate(e)},setActive:function(e){var t=this.activeEditor;this.activeEditor!==e&&(t&&t.fire("deactivate",{relatedTarget:e}),e.fire("activate",{relatedTarget:t})),this.activeEditor=e},_setBaseUrl:function(e){this.baseURL=new TE(this.documentBaseURL).toAbsolute(e.replace(/\/+$/,"")),this.baseURI=new TE(this.baseURL)}});QE.setup();var ZE,ek,tk,nk,rk=Math.min,ok=Math.max,ik=Math.round,ak=function(e,t,n){var r=t.x,o=t.y,i=e.w,a=e.h,u=t.w,s=t.h,c=(n||"").split("");return"b"===c[0]&&(o+=s),"r"===c[1]&&(r+=u),"c"===c[0]&&(o+=ik(s/2)),"c"===c[1]&&(r+=ik(u/2)),"b"===c[3]&&(o-=a),"r"===c[4]&&(r-=i),"c"===c[3]&&(o-=ik(a/2)),"c"===c[4]&&(r-=ik(i/2)),uk(r,o,i,a)},uk=function(e,t,n,r){return{x:e,y:t,w:n,h:r}},sk={inflate:function(e,t,n){return uk(e.x-t,e.y-n,e.w+2*t,e.h+2*n)},relativePosition:ak,findBestRelativePosition:function(e,t,n,r){for(var o,i=0;i<r.length;i++)if((o=ak(e,t,r[i])).x>=n.x&&o.x+o.w<=n.w+n.x&&o.y>=n.y&&o.y+o.h<=n.h+n.y)return r[i];return null},intersect:function(e,t){var n=ok(e.x,t.x),r=ok(e.y,t.y),o=rk(e.x+e.w,t.x+t.w),i=rk(e.y+e.h,t.y+t.h);return o-n<0||i-r<0?null:uk(n,r,o-n,i-r)},clamp:function(e,t,n){var r=e.x,o=e.y,i=e.x+e.w,a=e.y+e.h,u=t.x+t.w,s=t.y+t.h,c=ok(0,t.x-r),l=ok(0,t.y-o),f=ok(0,i-u),d=ok(0,a-s);return r+=c,o+=l,n&&(i+=c,a+=l,r-=f,o-=d),uk(r,o,(i-=f)-r,(a-=d)-o)},create:uk,fromClientRect:function(e){return uk(e.left,e.top,e.width,e.height)}},ck=(ZE={},ek={},{load:function(r,o){var i='Script at URL "'+o+'" failed to load',a='Script at URL "'+o+"\" did not call `tinymce.Resource.add('"+r+"', data)` within 1 second";if(ZE[r]!==undefined)return ZE[r];var e=new Ir(function(e,t){var n=function(e,t,n){void 0===n&&(n=1e3);var r=!1,o=null,i=function(n){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];r||(r=!0,null!==o&&(clearTimeout(o),o=null),n.apply(null,e))}},a=i(e),u=i(t);return{start:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];r||null!==o||(o=setTimeout(function(){return u.apply(null,e)},n))},resolve:a,reject:u}}(e,t);ek[r]=n.resolve,ku.ScriptLoader.loadScript(o,function(){return n.start(a)},function(){return n.reject(i)})});return ZE[r]=e},add:function(e,t){ek[e]!==undefined&&(ek[e](t),delete ek[e]),ZE[e]=Ir.resolve(t)}}),lk=_t.each,fk=_t.extend,dk=function(){};dk.extend=tk=function(n){var o=this.prototype,r=function(){var e,t,n;if(!nk&&(this.init&&this.init.apply(this,arguments),t=this.Mixins))for(e=t.length;e--;)(n=t[e]).init&&n.init.apply(this,arguments)},t=function(){return this};nk=!0;var i=new this;return nk=!1,n.Mixins&&(lk(n.Mixins,function(e){for(var t in e)"init"!==t&&(n[t]=e[t])}),o.Mixins&&(n.Mixins=o.Mixins.concat(n.Mixins))),n.Methods&&lk(n.Methods.split(","),function(e){n[e]=t}),n.Properties&&lk(n.Properties.split(","),function(e){var t="_"+e;n[e]=function(e){return e!==undefined?(this[t]=e,this):this[t]}}),n.Statics&&lk(n.Statics,function(e,t){r[t]=e}),n.Defaults&&o.Defaults&&(n.Defaults=fk({},o.Defaults,n.Defaults)),se(n,function(e,t){var n,r;"function"==typeof e&&o[t]?i[t]=(n=t,r=e,function(){var e=this._super;this._super=o[n];var t=r.apply(this,arguments);return this._super=e,t}):i[t]=e}),r.prototype=i,(r.constructor=r).extend=tk,r};var mk=Math.min,pk=Math.max,gk=Math.round,hk={serialize:function(e){var t=JSON.stringify(e);return K(t)?t.replace(/[\u0080-\uFFFF]/g,function(e){var t=e.charCodeAt(0).toString(16);return"\\u"+"0000".substring(t.length)+t}):t},parse:function(e){try{return JSON.parse(e)}catch(t){}}},vk={callbacks:{},count:0,send:function(t){var n=this,r=xu.DOM,o=t.count!==undefined?t.count:n.count,i="tinymce_jsonp_"+o;n.callbacks[o]=function(e){r.remove(i),delete n.callbacks[o],t.callback(e)},r.add(r.doc.body,"script",{id:i,src:t.url,type:"text/javascript"}),n.count++}},yk=_e(_e({},cE),{send:function(e){var t,n=0,r=function(){!e.async||4===t.readyState||1e4<n++?(e.success&&n<1e4&&200===t.status?e.success.call(e.success_scope,""+t.responseText,t,e):e.error&&e.error.call(e.error_scope,1e4<n?"TIMED_OUT":"GENERAL",t,e),t=null):Wr.setTimeout(r,10)};if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=!1!==e.async,e.data=e.data||"",yk.fire("beforeInitialize",{settings:e}),(t=new XMLHttpRequest).overrideMimeType&&t.overrideMimeType(e.content_type),t.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.crossDomain&&(t.withCredentials=!0),e.content_type&&t.setRequestHeader("Content-Type",e.content_type),e.requestheaders&&_t.each(e.requestheaders,function(e){t.setRequestHeader(e.key,e.value)}),t.setRequestHeader("X-Requested-With","XMLHttpRequest"),(t=yk.fire("beforeSend",{xhr:t,settings:e}).xhr).send(e.data),!e.async)return r();Wr.setTimeout(r,10)}}),bk=_t.extend,Ck=(wk.sendRPC=function(e){return(new wk).send(e)},wk.prototype.send=function(e){var n=e.error,r=e.success,o=bk(this.settings,e);o.success=function(e,t){void 0===(e=hk.parse(e))&&(e={error:"JSON Parse error."}),e.error?n.call(o.error_scope||o.scope,e.error,t):r.call(o.success_scope||o.scope,e.result)},o.error=function(e,t){n&&n.call(o.error_scope||o.scope,e,t)},o.data=hk.serialize({id:e.id||"c"+this.count++,method:e.method,params:e.params}),o.content_type="application/json",yk.send(o)},wk);function wk(e){this.settings=bk({},e),this.count=0}try{var xk,Sk="__storage_test__";(xk=window.localStorage).setItem(Sk,Sk),xk.removeItem(Sk)}catch(_k){xk=function(){return n={},r=[],e={getItem:function(e){var t=n[e];return t||null},setItem:function(e,t){r.push(e),n[e]=String(t)},key:function(e){return r[e]},removeItem:function(t){r=r.filter(function(e){return e===t}),delete n[t]},clear:function(){r=[],n={}},length:0},Object.defineProperty(e,"length",{get:function(){return r.length},configurable:!1,enumerable:!1}),e;var n,r,e}()}var Nk,Ek={geom:{Rect:sk},util:{Promise:Ir,Delay:Wr,Tools:_t,VK:ed,URI:TE,Class:dk,EventDispatcher:iE,Observable:cE,I18n:Ou,XHR:yk,JSON:hk,JSONRequest:Ck,JSONP:vk,LocalStorage:xk,Color:function(e){var n={},u=0,s=0,c=0,t=function(e){var t;return"object"==typeof e?"r"in e?(u=e.r,s=e.g,c=e.b):"v"in e&&function(e,t,n){if(e=(parseInt(e,10)||0)%360,t=parseInt(t,10)/100,n=parseInt(n,10)/100,t=pk(0,mk(t,1)),n=pk(0,mk(n,1)),0!==t){var r=e/60,o=n*t,i=o*(1-Math.abs(r%2-1)),a=n-o;switch(Math.floor(r)){case 0:u=o,s=i,c=0;break;case 1:u=i,s=o,c=0;break;case 2:u=0,s=o,c=i;break;case 3:u=0,s=i,c=o;break;case 4:u=i,s=0,c=o;break;case 5:u=o,s=0,c=i;break;default:u=s=c=0}u=gk(255*(u+a)),s=gk(255*(s+a)),c=gk(255*(c+a))}else u=s=c=gk(255*n)}(e.h,e.s,e.v):(t=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)[^\)]*\)/gi.exec(e))?(u=parseInt(t[1],10),s=parseInt(t[2],10),c=parseInt(t[3],10)):(t=/#([0-F]{2})([0-F]{2})([0-F]{2})/gi.exec(e))?(u=parseInt(t[1],16),s=parseInt(t[2],16),c=parseInt(t[3],16)):(t=/#([0-F])([0-F])([0-F])/gi.exec(e))&&(u=parseInt(t[1]+t[1],16),s=parseInt(t[2]+t[2],16),c=parseInt(t[3]+t[3],16)),u=u<0?0:255<u?255:u,s=s<0?0:255<s?255:s,c=c<0?0:255<c?255:c,n};return e&&t(e),n.toRgb=function(){return{r:u,g:s,b:c}},n.toHsv=function(){return e=u,t=s,n=c,o=0,i=mk(e/=255,mk(t/=255,n/=255)),a=pk(e,pk(t,n)),i===a?{h:0,s:0,v:100*(o=i)}:(r=(a-i)/a,{h:gk(60*((e===i?3:n===i?1:5)-(e===i?t-n:n===i?e-t:n-e)/((o=a)-i))),s:gk(100*r),v:gk(100*o)});var e,t,n,r,o,i,a},n.toHex=function(){var e=function(e){return 1<(e=parseInt(e,10).toString(16)).length?e:"0"+e};return"#"+e(u)+e(s)+e(c)},n.parse=t,n},ImageUploader:function(n){var e=ub(),r=db(n,e);return{upload:function(e,t){return void 0===t&&(t=!0),r.upload(e,t?fb(n):undefined)}}}},dom:{EventUtils:Ti,Sizzle:Ta,DomQuery:gu,TreeWalker:Yr,TextSeeker:is,DOMUtils:xu,ScriptLoader:ku,RangeUtils:pd,Serializer:dy,StyleSheetLoader:Kr,ControlSelection:nd,BookmarkManager:Gf,Selection:Hv,Event:Ti.Event},html:{Styles:xi,Entities:li,Node:Am,Schema:Ci,SaxParser:Pm,DomParser:uy,Writer:Vm,Serializer:qm},Env:xt,AddOnManager:Bu,Annotator:Yf,Formatter:Cb,UndoManager:xb,EditorCommands:XN,WindowManager:Jy,NotificationManager:Wy,EditorObservable:pE,Shortcuts:SE,Editor:ME,FocusManager:im,EditorManager:QE,DOM:xu.DOM,ScriptLoader:ku.ScriptLoader,PluginManager:Ky,ThemeManager:Xy,IconManager:My,Resource:ck,trim:_t.trim,isArray:_t.isArray,is:_t.is,toArray:_t.toArray,makeMap:_t.makeMap,each:_t.each,map:_t.map,grep:_t.grep,inArray:_t.inArray,extend:_t.extend,create:_t.create,walk:_t.walk,createNS:_t.createNS,resolve:_t.resolve,explode:_t.explode,_addCacheSuffix:_t._addCacheSuffix,isOpera:xt.opera,isWebKit:xt.webkit,isIE:xt.ie,isGecko:xt.gecko,isMac:xt.mac},kk=_t.extend(QE,Ek);Nk=kk,window.tinymce=Nk,window.tinyMCE=Nk,function(e){if("object"==typeof module)try{module.exports=e}catch(t){}}(kk)}();
\ No newline at end of file
+!function(){"use strict";function r(e){if(null===e)return"null";if(void 0===e)return"undefined";var t=typeof e;return"object"==t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"==t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t}function f(o){return m(function(e,t){if(e.length!==t.length)return!1;for(var n=e.length,r=0;r<n;r++)if(!o.eq(e[r],t[r]))return!1;return!0})}function d(l){return m(function(e,t){var n,r,o,i=Object.keys(e),a=Object.keys(t);if(r=f(g),o=function(e){return t=n,Array.prototype.slice.call(e).sort(t);var t},!m(function(e,t){return r.eq(o(e),o(t))}).eq(i,a))return!1;for(var u=i.length,s=0;s<u;s++){var c=i[s];if(!l.eq(e[c],t[c]))return!1}return!0})}function e(r){return function(e){return n=typeof(t=e),(null===t?"null":"object"==n&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"==n&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":n)===r;var t,n}}function t(t){return function(e){return typeof e===t}}function n(t){return function(e){return t===e}}function K(e){return null==e}function V(e){return!K(e)}function te(){}function i(n,r){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return n(r.apply(null,e))}}function a(t,n){return function(e){return t(n(e))}}function J(e){return function(){return e}}function u(e){return e}function o(e,t){return e===t}var m=function(e){return{eq:e}},g=m(function(e,t){return e===t}),p=m(function(e,t){if(e===t)return!0;var n=r(e);return n===r(t)&&(-1!==["undefined","boolean","number","string","function","xml","null"].indexOf(n)?e===t:"array"===n?f(p).eq(e,t):"object"===n&&d(p).eq(e,t))}),X=e("string"),h=e("object"),S=e("array"),l=n(null),v=t("boolean"),b=n(void 0),y=t("function"),E=t("number");function A(r){for(var o=[],e=1;e<arguments.length;e++)o[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=o.concat(e);return r.apply(null,n)}}function s(t){return function(e){return!t(e)}}function C(e){return e()}function x(e){e()}function c(){return N}var R=J(!1),w=J(!0),N={fold:function(e,t){return e()},isSome:R,isNone:w,getOr:u,getOrThunk:k,getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:J(null),getOrUndefined:J(void 0),or:u,orThunk:k,map:c,each:te,bind:c,exists:R,forall:w,filter:function(){return N},toArray:function(){return[]},toString:J("none()")};function k(e){return e()}function _(e,t){return ye.call(e,t)}function D(e,t){return-1<_(e,t)}function F(e,t){for(var n=0,r=e.length;n<r;n++)if(t(e[n],n))return!0;return!1}function T(e,t){for(var n=e.length,r=new Array(n),o=0;o<n;o++){var i=e[o];r[o]=t(i,o)}return r}function Y(e,t){for(var n=0,r=e.length;n<r;n++)t(e[n],n)}function O(e,t){for(var n=e.length-1;0<=n;n--)t(e[n],n)}function B(e,t){for(var n=[],r=[],o=0,i=e.length;o<i;o++){var a=e[o];(t(a,o)?n:r).push(a)}return{pass:n,fail:r}}function U(e,t){for(var n=[],r=0,o=e.length;r<o;r++){var i=e[r];t(i,r)&&n.push(i)}return n}function P(e,n,r){return O(e,function(e,t){r=n(r,e,t)}),r}function L(e,n,r){return Y(e,function(e,t){r=n(r,e,t)}),r}function I(e,t,n){for(var r=0,o=e.length;r<o;r++){var i=e[r];if(t(i,r))return ve.some(i);if(n(i,r))break}return ve.none()}function M(e,t){return I(e,t,R)}function z(e,t){for(var n=0,r=e.length;n<r;n++)if(t(e[n],n))return ve.some(n);return ve.none()}function H(e,t){return function(e){for(var t=[],n=0,r=e.length;n<r;++n){if(!S(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);Ce.apply(t,e[n])}return t}(T(e,t))}function j(e,t){for(var n=0,r=e.length;n<r;++n)if(!0!==t(e[n],n))return!1;return!0}function q(e){var t=be.call(e,0);return t.reverse(),t}function $(e,t){return U(e,function(e){return!D(t,e)})}function W(e,t){var n=be.call(e,0);return n.sort(t),n}function G(e,t){return 0<=t&&t<e.length?ve.some(e[t]):ve.none()}function Q(e){return G(e,0)}function Z(e){return G(e,e.length-1)}function ee(e,t){for(var n=0;n<e.length;n++){var r=t(e[n],n);if(r.isSome())return r}return ve.none()}function ne(e,t){for(var n=we(e),r=0,o=n.length;r<o;r++){var i=n[r];t(e[i],i)}}function re(e,n){return Ee(e,function(e,t){return{k:t,v:n(e,t)}})}function oe(n){return function(e,t){n[t]=e}}function ie(e,n,r,o){return ne(e,function(e,t){(n(e,t)?r:o)(e,t)}),1}function ae(e,t){var n={};return ie(e,t,oe(n),te),n}function ue(e,t){return Ne(e,t)?ve.from(e[t]):ve.none()}function se(e,t){return Ne(e,t)&&void 0!==e[t]&&null!==e[t]}function ce(e,t,n){var r,o;if(!e)return!1;if(n=n||e,void 0!==e.length){for(r=0,o=e.length;r<o;r++)if(!1===t.call(n,e[r],r,e))return!1}else for(r in e)if(Ne(e,r)&&!1===t.call(n,e[r],r,e))return!1;return!0}function le(n,r){var o=[];return ce(n,function(e,t){o.push(r(e,t,n))}),o}function fe(n,r){var o=[];return ce(n,function(e,t){r&&!r(e,t,n)||o.push(e)}),o}function de(e,t){if(e)for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1}function me(e,t,n,r){for(var o=b(n)?e[0]:n,i=0;i<e.length;i++)o=t.call(r,o,e[i],i);return o}function ge(e,t,n){for(var r=0,o=e.length;r<o;r++)if(t.call(n,e[r],r,e))return r;return-1}function pe(e){return e[e.length-1]}var he=function(n){function e(){return o}function t(e){return e(n)}var r=J(n),o={fold:function(e,t){return t(n)},isSome:w,isNone:R,getOr:r,getOrThunk:r,getOrDie:r,getOrNull:r,getOrUndefined:r,or:e,orThunk:e,map:function(e){return he(e(n))},each:function(e){e(n)},bind:t,exists:t,forall:t,filter:function(e){return e(n)?o:N},toArray:function(){return[n]},toString:function(){return"some("+n+")"}};return o},ve={some:he,none:c,from:function(e){return null==e?N:he(e)}},be=Array.prototype.slice,ye=Array.prototype.indexOf,Ce=Array.prototype.push,xe=y(Array.from)?Array.from:function(e){return be.call(e)},we=Object.keys,Se=Object.hasOwnProperty,Ee=function(e,r){var o={};return ne(e,function(e,t){var n=r(e,t);o[n.k]=n.v}),o},Ne=function(e,t){return Se.call(e,t)},ke=Array.isArray,_e=function(){return(_e=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};function Ae(e,t,n){if(n||2===arguments.length)for(var r,o=0,i=t.length;o<i;o++)!r&&o in t||((r=r||Array.prototype.slice.call(t,0,o))[o]=t[o]);return e.concat(r||Array.prototype.slice.call(t))}function Re(n){var r,o=!1;return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return o||(o=!0,r=n.apply(null,e)),r}}function De(e,t){var n=String(t).toLowerCase();return M(e,function(e){return e.search(n)})}function Te(e,t){return-1!==e.indexOf(t)}function Oe(t){return function(e){return e.replace(t,"")}}function Be(e){return 0<e.length}function Pe(e){return!Be(e)}function Le(t){return function(e){return Te(e,t)}}function Ie(e){return window.matchMedia(e).matches}function Me(e){return null==e?"":(""+e).replace(wt,"")}function Fe(e,t){return t?!("array"!==t||!ke(e))||typeof e===t:void 0!==e}function Ue(e,t){for(var n=[],r=function(e){return n.push(e),t(e)},o=t(e);(o=o.bind(r)).isSome(););return n}function ze(e,t){var n=e.dom;if(1!==n.nodeType)return!1;var r=n;if(void 0!==r.matches)return r.matches(t);if(void 0!==r.msMatchesSelector)return r.msMatchesSelector(t);if(void 0!==r.webkitMatchesSelector)return r.webkitMatchesSelector(t);if(void 0!==r.mozMatchesSelector)return r.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}function He(e){return 1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount}function je(e,t){return e.dom===t.dom}function Ve(e,t){return dt().browser.isIE()?(n=e.dom,r=t.dom,o=Node.DOCUMENT_POSITION_CONTAINED_BY,0!=(n.compareDocumentPosition(r)&o)):(i=e.dom)!==(a=t.dom)&&i.contains(a);var n,r,o,i,a}function qe(){return Xe(0,0)}function $e(e){function t(e){return function(){return n===e}}var n=e.current,r=e.version;return{current:n,version:r,isEdge:t("Edge"),isChrome:t("Chrome"),isIE:t("IE"),isOpera:t("Opera"),isFirefox:t(nt),isSafari:t("Safari")}}function We(e){function t(e){return function(){return n===e}}var n=e.current,r=e.version;return{current:n,version:r,isWindows:t(it),isiOS:t("iOS"),isAndroid:t(at),isOSX:t("OSX"),isLinux:t("Linux"),isSolaris:t(ut),isFreeBSD:t(st),isChromeOS:t(ct)}}function Ke(e){if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}}var Xe=function(e,t){return{major:e,minor:t}},Ye={nu:Xe,detect:function(e,t){var n,r,o=String(t).toLowerCase();return 0===e.length?qe():(r=function(e,t){for(var n=0;n<e.length;n++){var r=e[n];if(r.test(t))return r}}(e,n=o))?Xe(i(1),i(2)):{major:0,minor:0};function i(e){return Number(n.replace(r,"$"+e))}},unknown:qe},Ge=function(e,t){return""===(n=t)||e.length>=n.length&&e.substr(0,0+n.length)===n;var n},Je=Oe(/^\s+|\s+$/g),Qe=Oe(/^\s+/g),Ze=Oe(/\s+$/g),et=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,tt={browsers:J([{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return Te(e,"edge/")&&Te(e,"chrome")&&Te(e,"safari")&&Te(e,"applewebkit")}},{name:"Chrome",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,et],search:function(e){return Te(e,"chrome")&&!Te(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return Te(e,"msie")||Te(e,"trident")}},{name:"Opera",versionRegexes:[et,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Le("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Le("firefox")},{name:"Safari",versionRegexes:[et,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return(Te(e,"safari")||Te(e,"mobile/"))&&Te(e,"applewebkit")}}]),oses:J([{name:"Windows",search:Le("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return Te(e,"iphone")||Te(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Le("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:Le("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Le("linux"),versionRegexes:[]},{name:"Solaris",search:Le("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Le("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:Le("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}])},nt="Firefox",rt=function(){return $e({current:void 0,version:Ye.unknown()})},ot=$e,it=(J("Edge"),J("Chrome"),J("IE"),J("Opera"),J(nt),J("Safari"),"Windows"),at="Android",ut="Solaris",st="FreeBSD",ct="ChromeOS",lt=function(){return We({current:void 0,version:Ye.unknown()})},ft=We,dt=(J(it),J("iOS"),J(at),J("Linux"),J("OSX"),J(ut),J(st),J(ct),Re(function(){return e=navigator.userAgent,t=ve.from(navigator.userAgentData),n=Ie,p=tt.browsers(),h=tt.oses(),v=t.bind(function(e){return r=p,ee(e.brands,function(t){var n=t.brand.toLowerCase();return M(r,function(e){var t;return n===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())}).map(function(e){return{current:e.name,version:Ye.nu(parseInt(t.version,10),0)}})});var r}).orThunk(function(){return De(p,n=e).map(function(e){var t=Ye.detect(e.versionRegexes,n);return{current:e.name,version:t}});var n}).fold(rt,ot),b=De(h,r=e).map(function(e){var t=Ye.detect(e.versionRegexes,r);return{current:e.name,version:t}}).fold(lt,ft),{browser:v,os:b,deviceType:(i=v,a=e,u=n,s=(o=b).isiOS()&&!0===/ipad/i.test(a),c=o.isiOS()&&!s,f=(l=o.isiOS()||o.isAndroid())||u("(pointer:coarse)"),d=s||!c&&l&&u("(min-device-width:768px)"),m=c||l&&!d,g=i.isSafari()&&o.isiOS()&&!1===/safari/i.test(a),{isiPad:J(s),isiPhone:J(c),isTablet:J(d),isPhone:J(m),isTouch:J(f),isAndroid:o.isAndroid,isiOS:o.isiOS,isWebView:J(g),isDesktop:J(!m&&!d&&!g)})};var e,t,n,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,b})),mt=navigator.userAgent,gt=dt(),pt=gt.browser,ht=gt.os,vt=gt.deviceType,bt=/WebKit/.test(mt)&&!pt.isEdge(),yt="FormData"in window&&"FileReader"in window&&"URL"in window&&!!URL.createObjectURL,Ct=-1!==mt.indexOf("Windows Phone"),xt={opera:pt.isOpera(),webkit:bt,ie:!(!pt.isIE()&&!pt.isEdge())&&pt.version.major,gecko:pt.isFirefox(),mac:ht.isOSX()||ht.isiOS(),iOS:vt.isiPad()||vt.isiPhone(),android:ht.isAndroid(),contentEditable:!0,transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:!0,range:window.getSelection&&"Range"in window,documentMode:pt.isIE()?document.documentMode||7:10,fileApi:yt,ceFalse:!0,cacheSuffix:null,container:null,experimentalShadowDom:!1,canHaveCSP:!pt.isIE(),desktop:vt.isDesktop(),windowsPhone:Ct,browser:{current:pt.current,version:pt.version,isChrome:pt.isChrome,isEdge:pt.isEdge,isFirefox:pt.isFirefox,isIE:pt.isIE,isOpera:pt.isOpera,isSafari:pt.isSafari},os:{current:ht.current,version:ht.version,isAndroid:ht.isAndroid,isChromeOS:ht.isChromeOS,isFreeBSD:ht.isFreeBSD,isiOS:ht.isiOS,isLinux:ht.isLinux,isOSX:ht.isOSX,isSolaris:ht.isSolaris,isWindows:ht.isWindows},deviceType:{isDesktop:vt.isDesktop,isiPad:vt.isiPad,isiPhone:vt.isiPhone,isPhone:vt.isPhone,isTablet:vt.isTablet,isTouch:vt.isTouch,isWebView:vt.isWebView}},wt=/^\s*|\s*$/g,St=function(e,n,r,o){o=o||this,e&&ce(e=r?e[r]:e,function(e,t){return!1!==n.call(o,e,t,r)&&void St(e,n,r,o)})},Et={trim:Me,isArray:ke,is:Fe,toArray:function(e){if(ke(e))return e;for(var t=[],n=0,r=e.length;n<r;n++)t[n]=e[n];return t},makeMap:function(e,t,n){var r;for(t=t||",",n=n||{},r=(e="string"==typeof(e=e||[])?e.split(t):e).length;r--;)n[e[r]]={};return n},each:ce,map:le,grep:fe,inArray:de,hasOwn:Ne,extend:function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];for(var r=0;r<t.length;r++){var o,i,a=t[r];for(o in a)!Ne(a,o)||void 0!==(i=a[o])&&(e[o]=i)}return e},create:function(e,t,n){var r,o,i,a=this,u=0,s=(e=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(e))[3].match(/(^|\.)(\w+)$/i)[2],c=a.createNS(e[3].replace(/\.\w+$/,""),n);if(!c[s]){if("static"===e[2])return c[s]=t,void(this.onCreate&&this.onCreate(e[2],e[3],c[s]));t[s]||(t[s]=function(){},u=1),c[s]=t[s],a.extend(c[s].prototype,t),e[5]&&(r=a.resolve(e[5]).prototype,o=e[5].match(/\.(\w+)$/i)[1],i=c[s],c[s]=u?function(){return r[o].apply(this,arguments)}:function(){return this.parent=r[o],i.apply(this,arguments)},c[s].prototype[s]=c[s],a.each(r,function(e,t){c[s].prototype[t]=r[t]}),a.each(t,function(e,t){r[t]?c[s].prototype[t]=function(){return this.parent=r[t],e.apply(this,arguments)}:t!==s&&(c[s].prototype[t]=e)})),a.each(t.static,function(e,t){c[s][t]=e})}},walk:St,createNS:function(e,t){var n,r;for(t=t||window,e=e.split("."),n=0;n<e.length;n++)t[r=e[n]]||(t[r]={}),t=t[r];return t},resolve:function(e,t){var n,r;for(t=t||window,n=0,r=(e=e.split(".")).length;n<r&&(t=t[e[n]]);n++);return t},explode:function(e,t){return!e||Fe(e,"array")?e:le(e.split(t||","),Me)},_addCacheSuffix:function(e){var t=xt.cacheSuffix;return t&&(e+=(-1===e.indexOf("?")?"?":"&")+t),e}},Nt={fromHtml:function(e,t){var n=(t||document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||1<n.childNodes.length)throw console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return Ke(n.childNodes[0])},fromTag:function(e,t){var n=(t||document).createElement(e);return Ke(n)},fromText:function(e,t){var n=(t||document).createTextNode(e);return Ke(n)},fromDom:Ke,fromPoint:function(e,t,n){return ve.from(e.dom.elementFromPoint(t,n)).map(Ke)}};function kt(e){return e.dom.nodeName.toLowerCase()}function _t(e){return e.dom.nodeType}function At(t){return function(e){return _t(e)===t}}function Rt(e){return Nt.fromDom(e.dom.ownerDocument)}function Dt(e){return An(e)?e:Rt(e)}function Tt(e){return Nt.fromDom(Dt(e).dom.defaultView)}function Ot(e){return ve.from(e.dom.parentNode).map(Nt.fromDom)}function Bt(e){return ve.from(e.dom.previousSibling).map(Nt.fromDom)}function Pt(e){return ve.from(e.dom.nextSibling).map(Nt.fromDom)}function Lt(e){return q(Ue(e,Bt))}function It(e){return Ue(e,Pt)}function Mt(e,t){var n=e.dom.childNodes;return ve.from(n[t]).map(Nt.fromDom)}function Ft(e){return Mt(e,0)}function Ut(e){return Mt(e,e.dom.childNodes.length-1)}function zt(e){return e.dom.childNodes.length}function Ht(e){return Rn(e)&&V(e.dom.host)}function jt(t){return Ht(t)?t:function(){var e=Dt(t).dom.head;if(null==e)throw new Error("Head is not available yet");return Nt.fromDom(e)}()}function Vt(e){return Nt.fromDom(e.dom.host)}function qt(t,n){Ot(t).each(function(e){e.dom.insertBefore(n.dom,t.dom)})}function $t(e,t){Pt(e).fold(function(){Ot(e).each(function(e){Pn(e,t)})},function(e){qt(e,t)})}function Wt(t,n){Ft(t).fold(function(){Pn(t,n)},function(e){t.dom.insertBefore(n.dom,e.dom)})}function Kt(t,e){Y(e,function(e){Pn(t,e)})}function Xt(e){e.dom.textContent="",Y(Dn(e),function(e){Ln(e)})}function Yt(e){var t,n=Dn(e);0<n.length&&(t=e,Y(n,function(e){qt(t,e)})),Ln(e)}function Gt(e,t){return void 0!==e?e:void 0!==t?t:0}function Jt(e){var t=void 0!==e?e.dom:document,n=t.body.scrollLeft||t.documentElement.scrollLeft,r=t.body.scrollTop||t.documentElement.scrollTop;return Fn(n,r)}function Qt(e,t,n){var r=(void 0!==n?n.dom:document).defaultView;r&&r.scrollTo(e,t)}function Zt(e,t){dt().browser.isSafari()&&y(e.dom.scrollIntoViewIfNeeded)?e.dom.scrollIntoViewIfNeeded(!1):e.dom.scrollIntoView(t)}function en(e,t,n,r){return{x:e,y:t,width:n,height:r,right:e+n,bottom:t+r}}function tn(e){var r=void 0===e?window:e,t=r.document,o=Jt(Nt.fromDom(t)),n=void 0===r?window:r;return(dt().browser.isFirefox()?ve.none():ve.from(n.visualViewport)).fold(function(){var e=r.document.documentElement,t=e.clientWidth,n=e.clientHeight;return en(o.left,o.top,t,n)},function(e){return en(Math.max(e.pageLeft,o.left),Math.max(e.pageTop,o.top),e.width,e.height)})}function nn(t){return function(e){return!!e&&e.nodeType===t}}function rn(e){return e&&!Object.getPrototypeOf(e)}function on(e){var n=e.map(function(e){return e.toLowerCase()});return function(e){if(e&&e.nodeName){var t=e.nodeName.toLowerCase();return D(n,t)}return!1}}function an(r,e){var o=e.toLowerCase().split(" ");return function(e){if(zn(e))for(var t=0;t<o.length;t++){var n=e.ownerDocument.defaultView.getComputedStyle(e,null);if((n?n.getPropertyValue(r):null)===o[t])return!0}return!1}}function un(t){return function(e){return zn(e)&&e.hasAttribute(t)}}function sn(e){return zn(e)&&e.hasAttribute("data-mce-bogus")}function cn(e){return zn(e)&&"TABLE"===e.tagName}function ln(t){return function(e){if(zn(e)){if(e.contentEditable===t)return!0;if(e.getAttribute("data-mce-contenteditable")===t)return!0}return!1}}function fn(e,t,n){return void 0===n&&(n=o),e.exists(function(e){return n(e,t)})}function dn(e,t,n){return e.isSome()&&t.isSome()?ve.some(n(e.getOrDie(),t.getOrDie())):ve.none()}function mn(e){return void 0!==e.style&&y(e.style.getPropertyValue)}function gn(e,t,n){if(!(X(n)||v(n)||E(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")}function pn(e,t,n){gn(e.dom,t,n)}function hn(e,t){var n=e.dom;ne(t,function(e,t){gn(n,t,e)})}function vn(e,t){var n=e.dom.getAttribute(t);return null===n?void 0:n}function bn(e,t){return ve.from(vn(e,t))}function yn(e,t){e.dom.removeAttribute(t)}function Cn(e,t){var n=e.dom;ne(t,function(e,t){!function(e,t,n){if(!X(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);mn(e)&&e.style.setProperty(t,n)}(n,t,e)})}function xn(e,t){var n=e.dom,r=window.getComputedStyle(n).getPropertyValue(t);return""!==r||In(e)?r:Qn(n,t)}function wn(e,t){var n=e.dom,r=Qn(n,t);return ve.from(r).filter(function(e){return 0<e.length})}function Sn(e){var t={},n=e.dom;if(mn(n))for(var r=0;r<n.style.length;r++){var o=n.style.item(r);t[o]=n.style[o]}return t}function En(e){return M(e,kn)}function Nn(e,t){return e.children&&D(e.children,t)}"undefined"!=typeof window||Function("return this;")();var kn=At(1),_n=At(3),An=At(9),Rn=At(11),Dn=function(e){return T(e.dom.childNodes,Nt.fromDom)},Tn=y(Element.prototype.attachShadow)&&y(Node.prototype.getRootNode),On=J(Tn),Bn=Tn?function(e){return Nt.fromDom(e.dom.getRootNode())}:Dt,Pn=function(e,t){e.dom.appendChild(t.dom)},Ln=function(e){var t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},In=function(e){var t=_n(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;var n=t.ownerDocument,r=Nt.fromDom(t),o=Bn(r);return(Ht(o)?ve.some(o):ve.none()).fold(function(){return n.body.contains(t)},a(In,Vt))},Mn=function(n,r){return{left:n,top:r,translate:function(e,t){return Mn(n+e,r+t)}}},Fn=Mn,Un=function(e){var t,n=e.dom,r=n.ownerDocument.body;return r===n?Fn(r.offsetLeft,r.offsetTop):In(e)?(t=n.getBoundingClientRect(),Fn(t.left,t.top)):Fn(0,0)},zn=nn(1),Hn=on(["textarea","input"]),jn=nn(3),Vn=nn(8),qn=nn(9),$n=nn(11),Wn=on(["br"]),Kn=on(["img"]),Xn=ln("true"),Yn=ln("false"),Gn=on(["td","th"]),Jn=on(["video","audio","object","embed"]),Qn=function(e,t){return mn(e)?e.style.getPropertyValue(t):""},Zn=dt().browser,er={},tr={exports:er};function nr(e){setTimeout(function(){throw e},0)}!function(){var e=this,t=function(){var e,t,n,r={exports:{}};function o(){}function i(e){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],f(e,this)}function a(n,r){for(;3===n._state;)n=n._value;0!==n._state?(n._handled=!0,i._immediateFn(function(){var e,t=1===n._state?r.onFulfilled:r.onRejected;if(null!==t){try{e=t(n._value)}catch(e){return void s(r.promise,e)}u(r.promise,e)}else(1===n._state?u:s)(r.promise,n._value)})):n._deferreds.push(r)}function u(t,e){try{if(e===t)throw new TypeError("A promise cannot be resolved with itself.");if(e&&("object"==typeof e||"function"==typeof e)){var n=e.then;if(e instanceof i)return t._state=3,t._value=e,void c(t);if("function"==typeof n)return void f((r=n,o=e,function(){r.apply(o,arguments)}),t)}t._state=1,t._value=e,c(t)}catch(e){s(t,e)}var r,o}function s(e,t){e._state=2,e._value=t,c(e)}function c(e){2===e._state&&0===e._deferreds.length&&i._immediateFn(function(){e._handled||i._unhandledRejectionFn(e._value)});for(var t=0,n=e._deferreds.length;t<n;t++)a(e,e._deferreds[t]);e._deferreds=null}function l(e,t,n){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.promise=n}function f(e,t){var n=!1;try{e(function(e){n||(n=!0,u(t,e))},function(e){n||(n=!0,s(t,e))})}catch(e){if(n)return;n=!0,s(t,e)}}e=r,t="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=setTimeout,i.prototype.catch=function(e){return this.then(null,e)},i.prototype.then=function(e,t){var n=new this.constructor(o);return a(this,new l(e,t,n)),n},i.all=function(e){var u=Array.prototype.slice.call(e);return new i(function(o,i){if(0===u.length)return o([]);for(var a=u.length,e=0;e<u.length;e++)!function t(n,e){try{if(e&&("object"==typeof e||"function"==typeof e)){var r=e.then;if("function"==typeof r)return r.call(e,function(e){t(n,e)},i),0}u[n]=e,0==--a&&o(u)}catch(e){i(e)}}(e,u[e])})},i.resolve=function(t){return t&&"object"==typeof t&&t.constructor===i?t:new i(function(e){e(t)})},i.reject=function(n){return new i(function(e,t){t(n)})},i.race=function(o){return new i(function(e,t){for(var n=0,r=o.length;n<r;n++)o[n].then(e,t)})},i._immediateFn="function"==typeof setImmediate?function(e){setImmediate(e)}:function(e){n(e,0)},i._unhandledRejectionFn=function(e){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)},i._setImmediateFn=function(e){i._immediateFn=e},i._setUnhandledRejectionFn=function(e){i._unhandledRejectionFn=e},e.exports?e.exports=i:t.Promise||(t.Promise=i);var d=r.exports;return{boltExport:("undefined"!=typeof window?window:Function("return this;")()).Promise||d}};"object"==typeof er&&void 0!==tr?tr.exports=t():(e="undefined"!=typeof globalThis?globalThis:e||self).EphoxContactWrapper=t()}();function rr(e){return sr(function(){return new ir(e)})}function or(a){if(!S(a))throw new Error("cases must be an array");if(0===a.length)throw new Error("there must be at least one case");var u=[],n={};return Y(a,function(e,r){var t=we(e);if(1!==t.length)throw new Error("one and only one name per case");var o=t[0],i=e[o];if(void 0!==n[o])throw new Error("duplicate key detected:"+o);if("cata"===o)throw new Error("cannot have a case named cata (sorry)");if(!S(i))throw new Error("case arguments must be an array");u.push(o),n[o]=function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var t=n.length;if(t!==i.length)throw new Error("Wrong number of arguments to case "+o+". Expected "+i.length+" ("+i+"), got "+t);return{fold:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];if(e.length!==a.length)throw new Error("Wrong number of arguments to fold. Expected "+a.length+", got "+e.length);return e[r].apply(null,n)},match:function(e){var t=we(e);if(u.length!==t.length)throw new Error("Wrong number of arguments to match. Expected: "+u.join(",")+"\nActual: "+t.join(","));if(!j(u,function(e){return D(t,e)}))throw new Error("Not all branches were specified when using match. Specified: "+t.join(", ")+"\nRequired: "+u.join(", "));return e[o].apply(null,n)},log:function(e){console.log(e,{constructors:u,constructor:o,params:n})}}}}),n}var ir=tr.exports.boltExport,ar=function(e){function r(e){o()?i(e):t.push(e)}var n=ve.none(),t=[],o=function(){return n.isSome()},i=function(t){n.each(function(e){setTimeout(function(){t(e)},0)})};return e(function(e){o()||(n=ve.some(e),Y(t,i),t=[])}),{get:r,map:function(n){return ar(function(t){r(function(e){t(n(e))})})},isReady:o}},ur={nu:ar,pure:function(t){return ar(function(e){e(t)})}},sr=function(n){function e(e){n().then(e,nr)}return{map:function(e){return sr(function(){return n().then(e)})},bind:function(t){return sr(function(){return n().then(function(e){return t(e).toPromise()})})},anonBind:function(e){return sr(function(){return n().then(function(){return e.toPromise()})})},toLazy:function(){return ur.nu(e)},toCached:function(){var e=null;return sr(function(){return e=null===e?n():e})},toPromise:n,get:e}},cr=function(n){return{isValue:w,isError:R,getOr:J(n),getOrThunk:J(n),getOrDie:J(n),or:function(e){return cr(n)},orThunk:function(e){return cr(n)},fold:function(e,t){return t(n)},map:function(e){return cr(e(n))},mapError:function(e){return cr(n)},each:function(e){e(n)},bind:function(e){return e(n)},exists:function(e){return e(n)},forall:function(e){return e(n)},toOptional:function(){return ve.some(n)}}},lr=function(n){return{isValue:R,isError:w,getOr:u,getOrThunk:function(e){return e()},getOrDie:function(){return e=String(n),function(){throw new Error(e)}();var e},or:u,orThunk:function(e){return e()},fold:function(e,t){return e(n)},map:function(e){return lr(n)},mapError:function(e){return lr(e(n))},each:te,bind:function(e){return lr(n)},exists:R,forall:w,toOptional:ve.none}},fr={value:cr,error:lr,fromOption:function(e,t){return e.fold(function(){return lr(t)},cr)}};function dr(e){return e.fold(u,u)}function mr(e,t,n,r,o){return e(n,r)?ve.some(n):y(o)&&o(n)?ve.none():t(n,r,o)}function gr(e,t,n){for(var r=e.dom,o=y(n)?n:R;r.parentNode;){var r=r.parentNode,i=Nt.fromDom(r);if(t(i))return ve.some(i);if(o(i))break}return ve.none()}function pr(e,t,n){return mr(function(e,t){return t(e)},gr,e,t,n)}function hr(e,t,n){return gr(e,function(e){return ze(e,t)},n)}function vr(e,t){return n=t,He(r=void 0===e?document:e.dom)?ve.none():ve.from(r.querySelector(n)).map(Nt.fromDom);var n,r}function br(e,t,n){return mr(ze,hr,e,t,n)}function yr(e,t){return"number"!=typeof t&&(t=0),setTimeout(e,t)}function Cr(e,t){return"number"!=typeof t&&(t=1),setInterval(e,t)}function xr(n,r){function e(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];clearTimeout(o),o=yr(function(){n.apply(this,e)},r)}var o;return e.stop=function(){clearTimeout(o)},e}function wr(m,g){function n(e,t,n){var r,o=Et._addCacheSuffix(e),i=ue(h,o).getOrThunk(function(){return{id:"mce-u"+p++,passed:[],failed:[],count:0}});function a(e,t){for(var n=e.length;n--;)e[n]();i.status=t,i.passed=[],i.failed=[],r&&(r.onload=null,r.onerror=null,r=null)}function u(){return a(i.passed,2),0}function s(){return a(i.failed,3)}(h[o]=i).count++;var c,l,f,d=function(){var e=d;!function(){for(var e=m.styleSheets,t=e.length;t--;){var n=e[t].ownerNode;if(n&&n.id===r.id)return u(),1}}()&&(Date.now()-l<y?_r.setTimeout(e):s())};t&&i.passed.push(t),n&&i.failed.push(n),1!==i.status&&(2!==i.status?3!==i.status?(i.status=1,hn(c=Nt.fromTag("link",b.dom),{rel:"stylesheet",type:"text/css",id:i.id}),l=Date.now(),g.contentCssCors&&pn(c,"crossOrigin","anonymous"),g.referrerPolicy&&pn(c,"referrerpolicy",g.referrerPolicy),(r=c.dom).onload=d,r.onerror=s,f=c,Pn(jt(v),f),pn(c,"href",o)):s():u())}function o(t){return rr(function(e){n(t,i(e,J(fr.value(t))),i(e,J(fr.error(t))))})}function t(e){var n=Et._addCacheSuffix(e);ue(h,n).each(function(e){var t;0==--e.count&&(delete h[n],t=e.id,vr(jt(v),"#"+t).each(Ln))})}void 0===g&&(g={});var p=0,h={},v=Nt.fromDom(m),b=Dt(v),y=g.maxLoadTime||5e3;return{load:n,loadAll:function(e,n,r){var a,t=T(e,o);a=t,rr(function(r){var o=[],i=0;0===a.length?r([]):Y(a,function(e,t){var n;e.get((n=t,function(e){o[n]=e,++i>=a.length&&r(o)}))})}).get(function(e){var t=B(e,function(e){return e.isValue()});0<t.fail.length?r(t.fail.map(dr)):n(t.pass.map(dr))})},unload:t,unloadAll:function(e){Y(e,function(e){t(e)})},_setReferrerPolicy:function(e){g.referrerPolicy=e}}}or([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]);var Sr,Er,Nr=function(e,t){return M(e.dom.childNodes,function(e){return t(Nt.fromDom(e))}).map(Nt.fromDom)},kr=window.Promise||ir,_r={requestAnimationFrame:function(e,t){Sr?Sr.then(e):Sr=new kr(function(e){(function(e,t){for(var n=window.requestAnimationFrame,r=["ms","moz","webkit"],o=0;o<r.length&&!n;o++)n=window[r[o]+"RequestAnimationFrame"];(n=n||function(e){window.setTimeout(e,0)})(e,t)})(e,t=t||document.body)}).then(e)},setTimeout:yr,setInterval:Cr,setEditorTimeout:function(e,t,n){return yr(function(){e.removed||t()},n)},setEditorInterval:function(e,t,n){var r=Cr(function(){e.removed?clearInterval(r):t()},n);return r},debounce:xr,throttle:xr,clearInterval:function(e){return clearInterval(e)},clearTimeout:function(e){return clearTimeout(e)}},Ar=(Er=new WeakMap,{forElement:function(e,t){var n=Bn(e).dom;return ve.from(Er.get(n)).getOrThunk(function(){var e=wr(n,t);return Er.set(n,e),e})}}),Rr=(Dr.prototype.current=function(){return this.node},Dr.prototype.next=function(e){return this.node=this.findSibling(this.node,"firstChild","nextSibling",e),this.node},Dr.prototype.prev=function(e){return this.node=this.findSibling(this.node,"lastChild","previousSibling",e),this.node},Dr.prototype.prev2=function(e){return this.node=this.findPreviousNode(this.node,"lastChild","previousSibling",e),this.node},Dr.prototype.findSibling=function(e,t,n,r){var o,i;if(e){if(!r&&e[t])return e[t];if(e!==this.rootNode){if(o=e[n])return o;for(i=e.parentNode;i&&i!==this.rootNode;i=i.parentNode)if(o=i[n])return o}}},Dr.prototype.findPreviousNode=function(e,t,n,r){var o,i,a;if(e&&(o=e[n],!this.rootNode||o!==this.rootNode)){if(o){if(!r)for(a=o[t];a;a=a[t])if(!a[t])return a;return o}return(i=e.parentNode)&&i!==this.rootNode?i:void 0}},Dr);function Dr(e,t){this.node=e,this.rootNode=t,this.current=this.current.bind(this),this.next=this.next.bind(this),this.prev=this.prev.bind(this),this.prev2=this.prev2.bind(this)}function Tr(t){var n;return function(e){return n=n||function(e,t){for(var n={},r=0,o=e.length;r<o;r++){var i=e[r];n[String(i)]=t(i,r)}return n}(t,w),Ne(n,kt(e))}}function Or(e){return kn(e)&&!lo(e)}function Br(e){return kn(e)&&"br"===kt(e)}function Pr(e){return Eo(e)&&(e=e.parentNode),So(e)&&e.hasAttribute("data-mce-caret")}function Lr(e){return Eo(e)&&xo(e.data)}function Ir(e){return Pr(e)||Lr(e)}function Mr(e){return e.firstChild!==e.lastChild||!Wn(e.firstChild)}function Fr(e){var t=e.container();return!!jn(t)&&(t.data.charAt(e.offset())===Co||e.isAtStart()&&Lr(t.previousSibling))}function Ur(e){var t=e.container();return!!jn(t)&&(t.data.charAt(e.offset()-1)===Co||e.isAtEnd()&&Lr(t.nextSibling))}function zr(e){return e&&e.hasAttribute("data-mce-caret")?(sn(n=(t=e.getElementsByTagName("br"))[t.length-1])&&n.parentNode.removeChild(n),e.removeAttribute("data-mce-caret"),e.removeAttribute("data-mce-bogus"),e.removeAttribute("style"),e.removeAttribute("_moz_abspos"),e):null;var t,n}function Hr(e){return Pr(e.startContainer)}function jr(e){return!Po(e)&&(Do(e)?!To(e.parentNode):Oo(e)||Ro(e)||Bo(e)||Lo(e))}function Vr(e,t){return jr(e)&&function(e,t){for(e=e.parentNode;e&&e!==t;e=e.parentNode){if(Lo(e))return!1;if(_o(e))return!0}return!0}(e,t)}function qr(e){return Io.test(e)}function $r(e,t){return jr(e)&&!1===(a=t,jn(i=e)&&qr(i.data)&&!1===(n=i,r=Nt.fromDom(a),hr(Nt.fromDom(n),"pre,code",A(je,r)).isSome()))||zn(o=e)&&"A"===o.nodeName&&!o.hasAttribute("href")&&(o.hasAttribute("name")||o.hasAttribute("id"))||Mo(e);var n,r,o,i,a}function Wr(e,t){return function(e,t){var n=0;if($r(e,e))return!1;var r=e.firstChild;if(!r)return!0;var o=new Rr(r,e);do{if(t){if(Uo(r)){r=o.next(!0);continue}if(Fo(r)){r=o.next();continue}}if(Wn(r))n++,r=o.next();else{if($r(r,e))return!1;r=o.next()}}while(r);return n<=1}(e.dom,t=void 0===t||t)}function Kr(e,t){return V(e)&&($r(e,t)||Or(Nt.fromDom(e)))}function Xr(e){return"span"===e.nodeName.toLowerCase()&&"bookmark"===e.getAttribute("data-mce-type")}function Yr(e,t){var n,r,o,i={};if(e){for(e=e.split(","),t=t||10,n=0;n<e.length;n+=2)r=String.fromCharCode(parseInt(e[n],t)),Ko[r]||(o="&"+e[n+1]+";",i[r]=o,i[o]=r);return i}}function Gr(e,t){return e.replace(t?jo:Vo,function(e){return Ko[e]||e})}function Jr(e,t){return e.replace(t?jo:Vo,function(e){return 1<e.length?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":Ko[e]||"&#"+e.charCodeAt(0)+";"})}function Qr(e,t,n){return n=n||Yo,e.replace(t?jo:Vo,function(e){return Ko[e]||n[e]||e})}function Zr(e,t){return(e=Et.trim(e))?e.split(t||" "):[]}function eo(e,n){var r;return e&&(r={},ei(e="string"==typeof e?{"*":e}:e,function(e,t){r[t]=r[t.toUpperCase()]=("map"===n?Zo:ni)(e,/[, ]/)})),r}function to(i){function e(e,t,n){var r=i[e];return r?r=Zo(r,/[, ]/,Zo(r.toUpperCase(),/[, ]/)):(r=Jo[e])||(r=Zo(t," ",Zo(t.toUpperCase()," ")),r=ti(r,n),Jo[e]=r),r}var t,s,n,r,o,a,u,c,S={},l={},E=[],f={},d={},m=(t=(i=i||{}).schema,c={},Jo[t]||(s="id accesskey class dir lang style tabindex title role",n="address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul",r="a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment","html4"!==t&&(s+=" contenteditable contextmenu draggable dropzone hidden spellcheck translate",n+=" article aside details dialog figure main header footer hgroup section nav",r+=" audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen"),"html5-strict"!==t&&(s+=" xml:lang",r=[r,u="acronym applet basefont big font strike tt"].join(" "),ei(Zr(u),function(e){g(e,"",r)}),n=[n,a="center dir isindex noframes"].join(" "),o=[n,r].join(" "),ei(Zr(a),function(e){g(e,"",o)})),o=o||[n,r].join(" "),g("html","manifest","head body"),g("head","","base command link meta noscript script style title"),g("title hr noscript br"),g("base","href target"),g("link","href rel media hreflang type sizes hreflang"),g("meta","name http-equiv content charset"),g("style","media type scoped"),g("script","src async defer type charset"),g("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",o),g("address dt dd div caption","",o),g("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",r),g("blockquote","cite",o),g("ol","reversed start type","li"),g("ul","","li"),g("li","value",o),g("dl","","dt dd"),g("a","href target rel media hreflang type",r),g("q","cite",r),g("ins del","cite datetime",o),g("img","src sizes srcset alt usemap ismap width height"),g("iframe","src name width height",o),g("embed","src type width height"),g("object","data type typemustmatch name usemap form width height",[o,"param"].join(" ")),g("param","name value"),g("map","name",[o,"area"].join(" ")),g("area","alt coords shape href target rel media hreflang type"),g("table","border","caption colgroup thead tfoot tbody tr"+("html4"===t?" col":"")),g("colgroup","span","col"),g("col","span"),g("tbody thead tfoot","","tr"),g("tr","","td th"),g("td","colspan rowspan headers",o),g("th","colspan rowspan headers scope abbr",o),g("form","accept-charset action autocomplete enctype method name novalidate target",o),g("fieldset","disabled form name",[o,"legend"].join(" ")),g("label","form for",r),g("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),g("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"===t?o:r),g("select","disabled form multiple name required size","option optgroup"),g("optgroup","disabled label","option"),g("option","disabled label selected value"),g("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),g("menu","type label",[o,"li"].join(" ")),g("noscript","",o),"html4"!==t&&(g("wbr"),g("ruby","",[r,"rt rp"].join(" ")),g("figcaption","",o),g("mark rt rp summary bdi","",r),g("canvas","width height",o),g("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",[o,"track source"].join(" ")),g("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",[o,"track source"].join(" ")),g("picture","","img source"),g("source","src srcset type media sizes"),g("track","kind src srclang label default"),g("datalist","",[r,"option"].join(" ")),g("article section nav aside main header footer","",o),g("hgroup","","h1 h2 h3 h4 h5 h6"),g("figure","",[o,"figcaption"].join(" ")),g("time","datetime",r),g("dialog","open",o),g("command","type label icon disabled checked radiogroup command"),g("output","for form name",r),g("progress","value max",r),g("meter","value min max low high optimum",r),g("details","open",[o,"summary"].join(" ")),g("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!==t&&(p("script","language xml:space"),p("style","xml:space"),p("object","declare classid code codebase codetype archive standby align border hspace vspace"),p("embed","align name hspace vspace"),p("param","valuetype type"),p("a","charset name rev shape coords"),p("br","clear"),p("applet","codebase archive code object alt name width height align hspace vspace"),p("img","name longdesc align border hspace vspace"),p("iframe","longdesc frameborder marginwidth marginheight scrolling align"),p("font basefont","size color face"),p("input","usemap align"),p("select"),p("textarea"),p("h1 h2 h3 h4 h5 h6 div p legend caption","align"),p("ul","type compact"),p("li","type"),p("ol dl menu dir","compact"),p("pre","width xml:space"),p("hr","align noshade size width"),p("isindex","prompt"),p("table","summary width frame rules cellspacing cellpadding align bgcolor"),p("col","width align char charoff valign"),p("colgroup","width align char charoff valign"),p("thead","align char charoff valign"),p("tr","align char charoff valign bgcolor"),p("th","axis align char charoff valign nowrap bgcolor width height"),p("form","accept"),p("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),p("tfoot","align char charoff valign"),p("tbody","align char charoff valign"),p("area","nohref"),p("body","background bgcolor text link vlink alink")),"html4"!==t&&(p("input button select textarea","autofocus"),p("input textarea","placeholder"),p("a","download"),p("link script img","crossorigin"),p("img","loading"),p("iframe","sandbox seamless allowfullscreen loading")),ei(Zr("a form meter progress dfn"),function(e){c[e]&&delete c[e].children[e]}),delete c.caption.children.table,delete c.script,Jo[t]=c));function g(e,t,n){function r(e,t){for(var n={},r=0,o=e.length;r<o;r++)n[e[r]]=t||{};return n}var o,i;t=t||"","string"==typeof(n=n||[])&&(n=Zr(n));for(var a=Zr(e),u=a.length;u--;)i={attributes:r(o=Zr([s,t].join(" "))),attributesOrder:o,children:r(n,Qo)},c[a[u]]=i}function p(e,t){for(var n,r,o,i=Zr(e),a=i.length,u=Zr(t);a--;)for(n=c[i[a]],r=0,o=u.length;r<o;r++)n.attributes[u[r]]={},n.attributesOrder.push(u[r])}!1===i.verify_html&&(i.valid_elements="*[*]");var h=eo(i.valid_styles),v=eo(i.invalid_styles,"map"),b=eo(i.valid_classes,"map"),y=e("whitespace_elements","pre script noscript style textarea video audio iframe object code"),C=e("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),x=e("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),w=e("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),N="td th iframe video audio object script code",k=e("non_empty_elements",N+" pre",x),_=e("move_caret_before_on_enter_elements",N+" table",x),A=e("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside main nav figure"),R=e("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption details summary",A),D=e("text_inline_elements","span strong b em i font strike u var cite dfn code mark q sup sub samp");function T(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")}function O(e){var t,n,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,b,y=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)])?$/,C=/^([!\-])?(\w+[\\:]:\w+|[^=:<]+)?(?:([=:<])(.*))?$/,x=/[*?+]/;if(e){var w=Zr(e,",");for(S["@"]&&(h=S["@"].attributes,v=S["@"].attributesOrder),t=0,n=w.length;t<n;t++)if(i=y.exec(w[t])){if(g=i[1],c=i[2],p=i[3],s=i[5],a={attributes:d={},attributesOrder:m=[]},"#"===g&&(a.paddEmpty=!0),"-"===g&&(a.removeEmpty=!0),"!"===i[4]&&(a.removeEmptyAttrs=!0),h&&(ne(h,function(e,t){d[t]=e}),m.push.apply(m,v)),s)for(r=0,o=(s=Zr(s,"|")).length;r<o;r++)(i=C.exec(s[r]))&&(u={},f=i[1],l=i[2].replace(/[\\:]:/g,":"),g=i[3],b=i[4],"!"===f&&(a.attributesRequired=a.attributesRequired||[],a.attributesRequired.push(l),u.required=!0),"-"!==f?(g&&("="===g&&(a.attributesDefault=a.attributesDefault||[],a.attributesDefault.push({name:l,value:b}),u.defaultValue=b),":"===g&&(a.attributesForced=a.attributesForced||[],a.attributesForced.push({name:l,value:b}),u.forcedValue=b),"<"===g&&(u.validValues=Zo(b,"?"))),x.test(l)?(a.attributePatterns=a.attributePatterns||[],u.pattern=T(l),a.attributePatterns.push(u)):(d[l]||m.push(l),d[l]=u)):(delete d[l],m.splice(ri(m,l),1)));h||"@"!==c||(h=d,v=m),p&&(a.outputName=c,S[p]=a),x.test(c)?(a.pattern=T(c),E.push(a)):S[c]=a}}}function B(e){S={},E=[],O(e),ei(m,function(e,t){l[t]=e.children})}function P(e){var a=/^(~)?(.+)$/;e&&(Jo.text_block_elements=Jo.block_elements=null,ei(Zr(e,","),function(e){var t,n=a.exec(e),r="~"===n[1],o=r?"span":"div",i=n[2];l[i]=l[o],f[i]=o,r||(R[i.toUpperCase()]={},R[i]={}),S[i]||(t=S[o],delete(t=ti({},t)).removeEmptyAttrs,delete t.removeEmpty,S[i]=t),ei(l,function(e,t){e[o]&&(l[t]=e=ti({},l[t]),e[i]=e[o])})}))}function L(e){var o=/^([+\-]?)([A-Za-z0-9_\-.\u00b7\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u037d\u037f-\u1fff\u200c-\u200d\u203f-\u2040\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]+)\[([^\]]+)]$/;Jo[i.schema]=null,e&&ei(Zr(e,","),function(e){var t,n,r=o.exec(e);r&&(n=r[1],t=n?l[r[2]]:l[r[2]]={"#comment":{}},t=l[r[2]],ei(Zr(r[3],"|"),function(e){"-"===n?delete t[e]:t[e]={}}))})}function I(e){var t,n=S[e];if(n)return n;for(t=E.length;t--;)if((n=E[t]).pattern.test(e))return n}ei((i.special||"script noscript iframe noframes noembed title style textarea xmp").split(" "),function(e){d[e]=new RegExp("</"+e+"[^>]*>","gi")}),i.valid_elements?B(i.valid_elements):(ei(m,function(e,t){S[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},l[t]=e.children}),"html5"!==i.schema&&ei(Zr("strong/b em/i"),function(e){var t=Zr(e,"/");S[t[1]].outputName=t[0]}),ei(Zr("ol ul sub sup blockquote span font a table tbody strong em b i"),function(e){S[e]&&(S[e].removeEmpty=!0)}),ei(Zr("p h1 h2 h3 h4 h5 h6 th td pre div address caption li"),function(e){S[e].paddEmpty=!0}),ei(Zr("span"),function(e){S[e].removeEmptyAttrs=!0})),P(i.custom_elements),L(i.valid_children),O(i.extended_valid_elements),L("+ol[ul|ol],+ul[ul|ol]"),ei({dd:"dl",dt:"dl",li:"ul ol",td:"tr",th:"tr",tr:"tbody thead tfoot",tbody:"table",thead:"table",tfoot:"table",legend:"fieldset",area:"map",param:"video audio object"},function(e,t){S[t]&&(S[t].parentsRequired=Zr(e))}),i.invalid_elements&&ei(ni(i.invalid_elements),function(e){S[e]&&delete S[e]}),I("span")||O("span[!data-mce-type|*]");var M=J(h),F=J(v),U=J(b),z=J(w),H=J(R),j=J(A),V=J(D),q=J(x),$=J(C),W=J(k),K=J(_),X=J(y),Y=J(d),G=J(f);return{children:l,elements:S,getValidStyles:M,getValidClasses:U,getBlockElements:H,getInvalidStyles:F,getShortEndedElements:q,getTextBlockElements:j,getTextInlineElements:V,getBoolAttrs:z,getElementRule:I,getSelfClosingElements:$,getNonEmptyElements:W,getMoveCaretBeforeOnEnterElements:K,getWhiteSpaceElements:X,getSpecialElements:Y,isValidChild:function(e,t){var n=l[e.toLowerCase()];return!(!n||!n[t.toLowerCase()])},isValid:function(e,t){var n,r,o=I(e);if(o){if(!t)return!0;if(o.attributes[t])return!0;if(n=o.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},getCustomElements:G,addValidElements:O,setValidElements:B,addCustomElements:P,addValidChildren:L}}function no(e,t,n,r){function o(e){return 1<(e=parseInt(e,10).toString(16)).length?e:"0"+e}return"#"+o(t)+o(n)+o(r)}function ro(b,e){var u,o,y=this,C=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,x=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,w=/\s*([^:]+):\s*([^;]+);?/g,S=/\s+$/,E={},N=bo;b=b||{},e&&(u=e.getValidStyles(),o=e.getInvalidStyles());for(var t=("\\\" \\' \\; \\: ; : "+N).split(" "),k=0;k<t.length;k++)E[t[k]]=N+k,E[N+k]=t[k];return{toHex:function(e){return e.replace(C,no)},parse:function(e){function t(e,t,n){var r=p[e+"-top"+t];if(r){var o=p[e+"-right"+t];if(o){var i=p[e+"-bottom"+t];if(i){var a=p[e+"-left"+t];if(a){var u=[r,o,i,a];for(k=u.length-1;k--&&u[k]===u[k+1];);-1<k&&n||(p[e+t]=-1===k?u[0]:u.join(" "),delete p[e+"-top"+t],delete p[e+"-right"+t],delete p[e+"-bottom"+t],delete p[e+"-left"+t])}}}}}function n(e){var t,n=p[e];if(n){for(t=(n=n.split(" ")).length;t--;)if(n[t]!==n[0])return;return p[e]=n[0],1}}function r(e){return f=!0,E[e]}function u(e,t){return f&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return E[e]})),t?e:e.replace(/\\([\'\";:])/g,"$1")}function o(e){return String.fromCharCode(parseInt(e.slice(1),16))}function i(e){return e.replace(/\\[0-9a-f]+/gi,o)}function a(e,t,n,r,o,i){if(o=o||i)return"'"+(o=u(o)).replace(/\'/g,"\\'")+"'";if(t=u(t||n||r),!b.allow_script_urls){var a=t.replace(/[\s\r\n]+/g,"");if(/(java|vb)script:/i.test(a))return"";if(!b.allow_svg_data_urls&&/^data:image\/svg/i.test(a))return""}return"url('"+(t=h?h.call(v,t,"style"):t).replace(/\'/g,"\\'")+"')"}var s,c,l,f,d,m,g,p={},h=b.url_converter,v=b.url_converter_scope||y;if(e){for(e=(e=e.replace(/[\u0000-\u001F]/g,"")).replace(/\\[\"\';:\uFEFF]/g,r).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,r)});s=w.exec(e);)w.lastIndex=s.index+s[0].length,c=s[1].replace(S,"").toLowerCase(),l=s[2].replace(S,""),c&&l&&(c=i(c),l=i(l),-1===c.indexOf(N)&&-1===c.indexOf('"')&&(b.allow_script_urls||"behavior"!==c&&!/expression\s*\(|\/\*|\*\//.test(l))&&("font-weight"===c&&"700"===l?l="bold":"color"!==c&&"background-color"!==c||(l=l.toLowerCase()),l=(l=l.replace(C,no)).replace(x,a),p[c]=f?u(l,!0):l));t("border","",!0),t("border","-width"),t("border","-color"),t("border","-style"),t("padding",""),t("margin",""),m="border-style",g="border-color",n(d="border-width")&&n(m)&&n(g)&&(p.border=p[d]+" "+p[m]+" "+p[g],delete p[d],delete p[m],delete p[g]),"medium none"===p.border&&delete p.border,"none"===p["border-image"]&&delete p["border-image"]}return p},serialize:function(i,r){function e(e){var t,n=u[e];if(n)for(var r=0,o=n.length;r<o;r++)e=n[r],(t=i[e])&&(a+=(0<a.length?" ":"")+e+": "+t+";")}var a="";return r&&u?(e("*"),e(r)):ne(i,function(e,t){var n;!e||o&&((n=o["*"])&&n[t]||(n=o[r])&&n[t])||(a+=(0<a.length?" ":"")+t+": "+e+";")}),a}}}function oo(e){return e instanceof Event||y(e.initEvent)}function io(e,t,n,r){var o,i,a=function(e){var t,n=null!=r?r:{};for(t in e)Ne(oi,t)||(n[t]=e[t]);return V(n.composedPath)&&(n.composedPath=function(){return e.composedPath()}),n}(t);return a.type=e,K(a.target)&&(a.target=null!==(o=a.srcElement)&&void 0!==o?o:n),(K((i=t).preventDefault)||oo(i))&&(a.preventDefault=function(){a.defaultPrevented=!0,a.isDefaultPrevented=w,y(t.preventDefault)?t.preventDefault():oo(t)&&(t.returnValue=!1)},a.stopPropagation=function(){a.cancelBubble=!0,a.isPropagationStopped=w,y(t.stopPropagation)?t.stopPropagation():oo(t)&&(t.cancelBubble=!0)},a.stopImmediatePropagation=function(){a.isImmediatePropagationStopped=w,a.stopPropagation()},a.isDefaultPrevented!==w&&a.isDefaultPrevented!==R&&(a.isDefaultPrevented=!0===a.defaultPrevented?w:R,a.isPropagationStopped=!0===a.cancelBubble?w:R,a.isImmediatePropagationStopped=R)),a}function ao(e,t,n,r){e.addEventListener?e.addEventListener(t,n,r||!1):e.attachEvent&&e.attachEvent("on"+t,n)}function uo(e,t,n,r){e.removeEventListener?e.removeEventListener(t,n,r||!1):e.detachEvent&&e.detachEvent("on"+t,n)}function so(e,t){var n,r,o,i,a=io(e.type,e,document,t);return V(i=e)&&ii.test(i.type)&&b(e.pageX)&&!b(e.clientX)&&(r=(n=a.target.ownerDocument||document).documentElement,o=n.body,a.pageX=e.clientX+(r&&r.scrollLeft||o&&o.scrollLeft||0)-(r&&r.clientLeft||o&&o.clientLeft||0),a.pageY=e.clientY+(r&&r.scrollTop||o&&o.scrollTop||0)-(r&&r.clientTop||o&&o.clientTop||0)),b(a.metaKey)&&(a.metaKey=!1),a}var co=Tr(["h1","h2","h3","h4","h5","h6"]),lo=Tr(["article","aside","details","div","dt","figcaption","footer","form","fieldset","header","hgroup","html","main","nav","section","summary","body","p","dl","multicol","dd","figure","address","center","blockquote","h1","h2","h3","h4","h5","h6","listing","xmp","pre","plaintext","menu","dir","ul","ol","li","hr","table","tbody","thead","tfoot","th","tr","td","caption"]),fo=Tr(["h1","h2","h3","h4","h5","h6","p","div","address","pre","form","blockquote","center","dir","fieldset","header","footer","article","section","hgroup","aside","nav","figure"]),mo=Tr(["ul","ol","dl"]),go=Tr(["li","dd","dt"]),po=Tr(["thead","tbody","tfoot"]),ho=Tr(["td","th"]),vo=Tr(["pre","script","textarea","style"]),bo="\ufeff",yo="\xa0",Co=bo,xo=function(e){return e===bo},wo=function(e){return e.replace(/\uFEFF/g,"")},So=zn,Eo=jn,No=function(e){return Eo(e)&&e.data[0]===Co},ko=function(e){return Eo(e)&&e.data[e.data.length-1]===Co},_o=Xn,Ao=Yn,Ro=Wn,Do=jn,To=on(["script","style","textarea"]),Oo=on(["img","input","textarea","hr","iframe","video","audio","object","embed"]),Bo=on(["table"]),Po=Ir,Lo=function(e){return!1===(zn(t=e)&&"true"===t.getAttribute("unselectable"))&&Ao(e);var t},Io=/^[ \t\r\n]*$/,Mo=un("data-mce-bookmark"),Fo=un("data-mce-bogus"),Uo=function(e){return zn(e)&&"all"===e.getAttribute("data-mce-bogus")},zo=function(e,t,n){var r=n||t;if(zn(t)&&Xr(t))return t;for(var o,i,a,u,s,c,l,f,d,m,g,p=t.childNodes,h=p.length-1;0<=h;h--)zo(e,p[h],r);return!zn(t)||1===(o=t.childNodes).length&&Xr(o[0])&&t.parentNode.insertBefore(o[0],t),$n(a=t)||qn(a)||$r(t,r)||zn(i=t)&&0<i.childNodes.length||(s=r,jn(u=t)&&0<u.data.length&&(f=new Rr(c=u,l=s).prev(!1),d=new Rr(c,l).next(!1),m=b(f)||Kr(f,l),g=b(d)||Kr(d,l),m&&g))||e.remove(t),t},Ho=Et.makeMap,jo=/[&<>\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,Vo=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,qo=/[<>&\"\']/g,$o=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,Wo={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"},Ko={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;","`":"&#96;"},Xo={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},Yo=Yr("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32),Go={encodeRaw:Gr,encodeAllRaw:function(e){return(""+e).replace(qo,function(e){return Ko[e]||e})},encodeNumeric:Jr,encodeNamed:Qr,getEncodeFunc:function(e,t){var n=Yr(t)||Yo,r=Ho(e.replace(/\+/g,","));return r.named&&r.numeric?function(e,t){return e.replace(t?jo:Vo,function(e){return void 0!==Ko[e]?Ko[e]:void 0!==n[e]?n[e]:1<e.length?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":"&#"+e.charCodeAt(0)+";"})}:r.named?t?function(e,t){return Qr(e,t,n)}:Qr:r.numeric?Jr:Gr},decode:function(e){return e.replace($o,function(e,t){return t?65535<(t="x"===t.charAt(0).toLowerCase()?parseInt(t.substr(1),16):parseInt(t,10))?(t-=65536,String.fromCharCode(55296+(t>>10),56320+(1023&t))):Wo[t]||String.fromCharCode(t):Xo[e]||Yo[e]||(n=e,(r=Nt.fromTag("div").dom).innerHTML=n,r.textContent||r.innerText||n);var n,r})}},Jo={},Qo={},Zo=Et.makeMap,ei=Et.each,ti=Et.extend,ni=Et.explode,ri=Et.inArray,oi={keyLocation:!0,layerX:!0,layerY:!0,returnValue:!0,webkitMovementX:!0,webkitMovementY:!0,keyIdentifier:!0,mozPressure:!0},ii=/^(?:mouse|contextmenu)|click/,ai=(ui.prototype.bind=function(e,t,n,r){function o(e){f.executeHandlers(so(e||d.event),i)}var i,a,u,s,c,l,f=this,d=window;if(e&&3!==e.nodeType&&8!==e.nodeType){e[f.expando]?i=e[f.expando]:(i=f.count++,e[f.expando]=i,f.events[i]={}),r=r||e;for(var m=t.split(" "),g=m.length;g--;)c=o,s=l=!1,"DOMContentLoaded"===(u=m[g])&&(u="ready"),f.domLoaded&&"ready"===u&&"complete"===e.readyState?n.call(r,so({type:u})):(f.hasMouseEnterLeave||(s=f.mouseEnterLeave[u])&&(c=function(e){var t=e.currentTarget,n=e.relatedTarget;if(n&&t.contains)n=t.contains(n);else for(;n&&n!==t;)n=n.parentNode;n||((e=so(e||d.event)).type="mouseout"===e.type?"mouseleave":"mouseenter",e.target=t,f.executeHandlers(e,i))}),f.hasFocusIn||"focusin"!==u&&"focusout"!==u||(l=!0,s="focusin"===u?"focus":"blur",c=function(e){(e=so(e||d.event)).type="focus"===e.type?"focusin":"focusout",f.executeHandlers(e,i)}),(a=f.events[i][u])?"ready"===u&&f.domLoaded?n(so({type:u})):a.push({func:n,scope:r}):(f.events[i][u]=a=[{func:n,scope:r}],a.fakeName=s,a.capture=l,a.nativeHandler=c,"ready"===u?function(e,t,n){var r,o=e.document,i={type:"ready"};n.domLoaded?t(i):(r=function(){uo(e,"DOMContentLoaded",r),uo(e,"load",r),n.domLoaded||(n.domLoaded=!0,t(i)),e=null},"complete"===o.readyState||"interactive"===o.readyState&&o.body?r():ao(e,"DOMContentLoaded",r),n.domLoaded||ao(e,"load",r))}(e,c,f):ao(e,s||u,c,l)));return e=a=null,n}},ui.prototype.unbind=function(n,e,t){var r,o,i;if(!n||3===n.nodeType||8===n.nodeType)return this;var a=n[this.expando];if(a){if(i=this.events[a],e){for(var u,s,c,l,f=e.split(" "),d=f.length;d--;)if(l=i[o=f[d]]){if(t)for(r=l.length;r--;)l[r].func===t&&(u=l.nativeHandler,s=l.fakeName,c=l.capture,(l=l.slice(0,r).concat(l.slice(r+1))).nativeHandler=u,l.fakeName=s,l.capture=c,i[o]=l);t&&0!==l.length||(delete i[o],uo(n,l.fakeName||o,l.nativeHandler,l.capture))}}else ne(i,function(e,t){uo(n,e.fakeName||t,e.nativeHandler,e.capture)}),i={};for(o in i)if(Ne(i,o))return this;delete this.events[a];try{delete n[this.expando]}catch(e){n[this.expando]=null}}return this},ui.prototype.fire=function(e,t,n){var r;if(!e||3===e.nodeType||8===e.nodeType)return this;for(var o=so({type:t,target:e},n);(r=e[this.expando])&&this.executeHandlers(o,r),(e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow)&&!o.isPropagationStopped(););return this},ui.prototype.clean=function(e){var t,n;if(!e||3===e.nodeType||8===e.nodeType)return this;if(e[this.expando]&&this.unbind(e),(e=e.getElementsByTagName?e:e.document)&&e.getElementsByTagName)for(this.unbind(e),t=(n=e.getElementsByTagName("*")).length;t--;)(e=n[t])[this.expando]&&this.unbind(e);return this},ui.prototype.destroy=function(){this.events={}},ui.prototype.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1},ui.prototype.executeHandlers=function(e,t){var n=this.events[t],r=n&&n[e.type];if(r)for(var o=0,i=r.length;o<i;o++){var a=r[o];if(a&&!1===a.func.call(a.scope,e)&&e.preventDefault(),e.isImmediatePropagationStopped())return}},ui.Event=new ui,ui);function ui(){this.domLoaded=!1,this.events={},this.count=1,this.expando="mce-data-"+(+new Date).toString(32),this.hasMouseEnterLeave="onmouseenter"in document.documentElement,this.hasFocusIn="onfocusin"in document.documentElement,this.count=1}function si(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(65536+r):String.fromCharCode(r>>10|55296,1023&r|56320)}var ci,li,fi,di,mi,gi,pi,hi,vi,bi,yi,Ci,xi,wi,Si,Ei,Ni,ki="sizzle"+-new Date,_i=window.document,Ai=0,Ri=0,Di=ua(),Ti=ua(),Oi=ua(),Bi=function(e,t){return e===t&&(bi=!0),0},Pi="undefined",Li={}.hasOwnProperty,Ii=[],Mi=Ii.pop,Fi=Ii.push,Ui=Ii.push,zi=Ii.slice,Hi=Ii.indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(this[t]===e)return t;return-1},ji="[\\x20\\t\\r\\n\\f]",Vi="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",qi="\\["+ji+"*("+Vi+")(?:"+ji+"*([*^$|!~]?=)"+ji+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+Vi+"))|)"+ji+"*\\]",$i=":("+Vi+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+qi+")*)|.*)\\)|)",Wi=new RegExp("^"+ji+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ji+"+$","g"),Ki=new RegExp("^"+ji+"*,"+ji+"*"),Xi=new RegExp("^"+ji+"*([>+~]|"+ji+")"+ji+"*"),Yi=new RegExp("="+ji+"*([^\\]'\"]*?)"+ji+"*\\]","g"),Gi=new RegExp($i),Ji=new RegExp("^"+Vi+"$"),Qi={ID:new RegExp("^#("+Vi+")"),CLASS:new RegExp("^\\.("+Vi+")"),TAG:new RegExp("^("+Vi+"|[*])"),ATTR:new RegExp("^"+qi),PSEUDO:new RegExp("^"+$i),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ji+"*(even|odd|(([+-]|)(\\d*)n|)"+ji+"*(?:([+-]|)"+ji+"*(\\d+)|))"+ji+"*\\)|)","i"),bool:new RegExp("^(?:checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped)$","i"),needsContext:new RegExp("^"+ji+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ji+"*((?:-\\d)?\\d*)"+ji+"*\\)|)(?=[^-]|$)","i")},Zi=/^(?:input|select|textarea|button)$/i,ea=/^h\d$/i,ta=/^[^{]+\{\s*\[native \w/,na=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ra=/[+~]/,oa=/'|\\/g,ia=new RegExp("\\\\([\\da-f]{1,6}"+ji+"?|("+ji+")|.)","ig");try{Ui.apply(Ii=zi.call(_i.childNodes),_i.childNodes),Ii[_i.childNodes.length].nodeType}catch(e){Ui={apply:Ii.length?function(e,t){Fi.apply(e,zi.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}var aa=function(e,t,n,r){var o,i,a,u,s,c,l,f,d,m;if((t?t.ownerDocument||t:_i)!==Ci&&yi(t),n=n||[],!e||"string"!=typeof e)return n;if(1!==(u=(t=t||Ci).nodeType)&&9!==u)return[];if(wi&&!r){if(o=na.exec(e))if(a=o[1]){if(9===u){if(!(i=t.getElementById(a))||!i.parentNode)return n;if(i.id===a)return n.push(i),n}else if(t.ownerDocument&&(i=t.ownerDocument.getElementById(a))&&Ni(t,i)&&i.id===a)return n.push(i),n}else{if(o[2])return Ui.apply(n,t.getElementsByTagName(e)),n;if((a=o[3])&&ci.getElementsByClassName)return Ui.apply(n,t.getElementsByClassName(a)),n}if(ci.qsa&&(!Si||!Si.test(e))){if(f=l=ki,d=t,m=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){for(c=mi(e),(l=t.getAttribute("id"))?f=l.replace(oa,"\\$&"):t.setAttribute("id",f),f="[id='"+f+"'] ",s=c.length;s--;)c[s]=f+ma(c[s]);d=ra.test(e)&&fa(t.parentNode)||t,m=c.join(",")}if(m)try{return Ui.apply(n,d.querySelectorAll(m)),n}catch(e){}finally{l||t.removeAttribute("id")}}}return pi(e.replace(Wi,"$1"),t,n,r)};function ua(){var n=[];function r(e,t){return n.push(e+" ")>li.cacheLength&&delete r[n.shift()],r[e+" "]=t}return r}function sa(e){return e[ki]=!0,e}function ca(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||1<<31)-(~e.sourceIndex||1<<31);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function la(a){return sa(function(i){return i=+i,sa(function(e,t){for(var n,r=a([],e.length,i),o=r.length;o--;)e[n=r[o]]&&(e[n]=!(t[n]=e[n]))})})}function fa(e){return e&&typeof e.getElementsByTagName!=Pi&&e}function da(){}function ma(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function ga(a,e,t){var u=e.dir,s=t&&"parentNode"===u,c=Ri++;return e.first?function(e,t,n){for(;e=e[u];)if(1===e.nodeType||s)return a(e,t,n)}:function(e,t,n){var r,o,i=[Ai,c];if(n){for(;e=e[u];)if((1===e.nodeType||s)&&a(e,t,n))return!0}else for(;e=e[u];)if(1===e.nodeType||s){if((r=(o=e[ki]||(e[ki]={}))[u])&&r[0]===Ai&&r[1]===c)return i[2]=r[2];if((o[u]=i)[2]=a(e,t,n))return!0}}}function pa(o){return 1<o.length?function(e,t,n){for(var r=o.length;r--;)if(!o[r](e,t,n))return!1;return!0}:o[0]}function ha(e,t,n,r,o){for(var i,a=[],u=0,s=e.length,c=null!=t;u<s;u++)(i=e[u])&&(n&&!n(i,r,o)||(a.push(i),c&&t.push(u)));return a}function va(e){return void 0!==e}function ba(e){return"string"==typeof e}function ya(e,t){var n,r=(t=t||ka).createElement("div"),o=t.createDocumentFragment();for(r.innerHTML=e;n=r.firstChild;)o.appendChild(n);return o}function Ca(e,t){return e&&t&&-1!==(" "+e.className+" ").indexOf(" "+t+" ")}function xa(e,t,n){var r,o;return t=Wa(t)[0],e.each(function(){n&&r===this.parentNode||(r=this.parentNode,o=t.cloneNode(!1),this.parentNode.insertBefore(o,this)),o.appendChild(this)}),e}function wa(e,t){return new Wa.fn.init(e,t)}function Sa(e){return null==e?"":(""+e).replace(Ua,"")}function Ea(e,t){var n,r,o,i;if(e)if(void 0===(n=e.length)){for(r in e)if(e.hasOwnProperty(r)&&(i=e[r],!1===t.call(i,r,i)))break}else for(o=0;o<n&&(i=e[o],!1!==t.call(i,o,i));o++);return e}function Na(e,n){var r=[];return Ea(e,function(e,t){n(t,e)&&r.push(t)}),r}ci=aa.support={},di=aa.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},yi=aa.setDocument=function(e){var t,s=e?e.ownerDocument||e:_i,n=s.defaultView;return s!==Ci&&9===s.nodeType&&s.documentElement?(xi=(Ci=s).documentElement,wi=!di(s),n&&n!==function(e){try{return e.top}catch(e){}return null}(n)&&(n.addEventListener?n.addEventListener("unload",function(){yi()},!1):n.attachEvent&&n.attachEvent("onunload",function(){yi()})),ci.attributes=!0,ci.getElementsByTagName=!0,ci.getElementsByClassName=ta.test(s.getElementsByClassName),ci.getById=!0,li.find.ID=function(e,t){if(typeof t.getElementById!=Pi&&wi){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},li.filter.ID=function(e){var t=e.replace(ia,si);return function(e){return e.getAttribute("id")===t}},li.find.TAG=ci.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!=Pi)return t.getElementsByTagName(e)}:function(e,t){var n,r=[],o=0,i=t.getElementsByTagName(e);if("*"!==e)return i;for(;n=i[o++];)1===n.nodeType&&r.push(n);return r},li.find.CLASS=ci.getElementsByClassName&&function(e,t){if(wi)return t.getElementsByClassName(e)},Ei=[],Si=[],ci.disconnectedMatch=!0,Si=Si.length&&new RegExp(Si.join("|")),Ei=Ei.length&&new RegExp(Ei.join("|")),t=ta.test(xi.compareDocumentPosition),Ni=t||ta.test(xi.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},Bi=t?function(e,t){return e===t?(bi=!0,0):(n=!e.compareDocumentPosition-!t.compareDocumentPosition)||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!ci.sortDetached&&t.compareDocumentPosition(e)===n?e===s||e.ownerDocument===_i&&Ni(_i,e)?-1:t===s||t.ownerDocument===_i&&Ni(_i,t)?1:vi?Hi.call(vi,e)-Hi.call(vi,t):0:4&n?-1:1);var n}:function(e,t){if(e===t)return bi=!0,0;var n,r=0,o=e.parentNode,i=t.parentNode,a=[e],u=[t];if(!o||!i)return e===s?-1:t===s?1:o?-1:i?1:vi?Hi.call(vi,e)-Hi.call(vi,t):0;if(o===i)return ca(e,t);for(n=e;n=n.parentNode;)a.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;a[r]===u[r];)r++;return r?ca(a[r],u[r]):a[r]===_i?-1:u[r]===_i?1:0},s):Ci},aa.matches=function(e,t){return aa(e,null,null,t)},aa.matchesSelector=function(e,t){if((e.ownerDocument||e)!==Ci&&yi(e),t=t.replace(Yi,"='$1']"),ci.matchesSelector&&wi&&(!Ei||!Ei.test(t))&&(!Si||!Si.test(t)))try{var n=(void 0).call(e,t);if(n||ci.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){}return 0<aa(t,Ci,null,[e]).length},aa.contains=function(e,t){return(e.ownerDocument||e)!==Ci&&yi(e),Ni(e,t)},aa.attr=function(e,t){(e.ownerDocument||e)!==Ci&&yi(e);var n=li.attrHandle[t.toLowerCase()],r=n&&Li.call(li.attrHandle,t.toLowerCase())?n(e,t,!wi):void 0;return void 0!==r?r:ci.attributes||!wi?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},aa.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},aa.uniqueSort=function(e){var t,n=[],r=0,o=0;if(bi=!ci.detectDuplicates,vi=!ci.sortStable&&e.slice(0),e.sort(Bi),bi){for(;t=e[o++];)t===e[o]&&(r=n.push(o));for(;r--;)e.splice(n[r],1)}return vi=null,e},fi=aa.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=fi(e)}else if(3===o||4===o)return e.nodeValue}else for(;t=e[r++];)n+=fi(t);return n},(li=aa.selectors={cacheLength:50,createPseudo:sa,match:Qi,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(ia,si),e[3]=(e[3]||e[4]||e[5]||"").replace(ia,si),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||aa.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&aa.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return Qi.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&Gi.test(n)&&(t=mi(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(ia,si).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=Di[e+" "];return t||(t=new RegExp("(^|"+ji+")"+e+"("+ji+"|$)"))&&Di(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!=Pi&&e.getAttribute("class")||"")})},ATTR:function(n,r,o){return function(e){var t=aa.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===o:"!="===r?t!==o:"^="===r?o&&0===t.indexOf(o):"*="===r?o&&-1<t.indexOf(o):"$="===r?o&&t.slice(-o.length)===o:"~="===r?-1<(" "+t+" ").indexOf(o):"|="===r&&(t===o||t.slice(0,o.length+1)===o+"-"))}},CHILD:function(m,e,t,g,p){var h="nth"!==m.slice(0,3),v="last"!==m.slice(-4),b="of-type"===e;return 1===g&&0===p?function(e){return!!e.parentNode}:function(e,t,n){var r,o,i,a,u,s,c=h!=v?"nextSibling":"previousSibling",l=e.parentNode,f=b&&e.nodeName.toLowerCase(),d=!n&&!b;if(l){if(h){for(;c;){for(i=e;i=i[c];)if(b?i.nodeName.toLowerCase()===f:1===i.nodeType)return!1;s=c="only"===m&&!s&&"nextSibling"}return!0}if(s=[v?l.firstChild:l.lastChild],v&&d){for(u=(r=(o=l[ki]||(l[ki]={}))[m]||[])[0]===Ai&&r[1],a=r[0]===Ai&&r[2],i=u&&l.childNodes[u];i=++u&&i&&i[c]||(a=u=0)||s.pop();)if(1===i.nodeType&&++a&&i===e){o[m]=[Ai,u,a];break}}else if(d&&(r=(e[ki]||(e[ki]={}))[m])&&r[0]===Ai)a=r[1];else for(;(i=++u&&i&&i[c]||(a=u=0)||s.pop())&&((b?i.nodeName.toLowerCase()!==f:1!==i.nodeType)||!++a||(d&&((i[ki]||(i[ki]={}))[m]=[Ai,a]),i!==e)););return(a-=p)===g||a%g==0&&0<=a/g}}},PSEUDO:function(e,i){var t,a=li.pseudos[e]||li.setFilters[e.toLowerCase()]||aa.error("unsupported pseudo: "+e);return a[ki]?a(i):1<a.length?(t=[e,e,"",i],li.setFilters.hasOwnProperty(e.toLowerCase())?sa(function(e,t){for(var n,r=a(e,i),o=r.length;o--;)e[n=Hi.call(e,r[o])]=!(t[n]=r[o])}):function(e){return a(e,0,t)}):a}},pseudos:{not:sa(function(e){var r=[],o=[],u=gi(e.replace(Wi,"$1"));return u[ki]?sa(function(e,t,n,r){for(var o,i=u(e,null,r,[]),a=e.length;a--;)(o=i[a])&&(e[a]=!(t[a]=o))}):function(e,t,n){return r[0]=e,u(r,null,n,o),r[0]=null,!o.pop()}}),has:sa(function(t){return function(e){return 0<aa(t,e).length}}),contains:sa(function(t){return t=t.replace(ia,si),function(e){return-1<(e.textContent||e.innerText||fi(e)).indexOf(t)}}),lang:sa(function(n){return Ji.test(n||"")||aa.error("unsupported lang: "+n),n=n.replace(ia,si).toLowerCase(),function(e){var t;do{if(t=wi?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=window.location&&window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===xi},focus:function(e){return e===Ci.activeElement&&(!Ci.hasFocus||Ci.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return!1===e.disabled},disabled:function(e){return!0===e.disabled},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!li.pseudos.empty(e)},header:function(e){return ea.test(e.nodeName)},input:function(e){return Zi.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:la(function(){return[0]}),last:la(function(e,t){return[t-1]}),eq:la(function(e,t,n){return[n<0?n+t:n]}),even:la(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:la(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:la(function(e,t,n){for(var r=n<0?n+t:n;0<=--r;)e.push(r);return e}),gt:la(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=li.pseudos.eq,Y(["radio","checkbox","file","password","image"],function(e){var t;li.pseudos[e]=(t=e,function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t})}),Y(["submit","reset"],function(e){var n;li.pseudos[e]=(n=e,function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n})}),da.prototype=li.filters=li.pseudos,li.setFilters=new da,mi=aa.tokenize=function(e,t){var n,r,o,i,a,u,s,c=Ti[e+" "];if(c)return t?0:c.slice(0);for(a=e,u=[],s=li.preFilter;a;){for(i in n&&!(r=Ki.exec(a))||(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=Xi.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(Wi," ")}),a=a.slice(n.length)),li.filter)li.filter.hasOwnProperty(i)&&(!(r=Qi[i].exec(a))||s[i]&&!(r=s[i](r))||(n=r.shift(),o.push({value:n,type:i,matches:r}),a=a.slice(n.length)));if(!n)break}return t?a.length:a?aa.error(e):Ti(e,u).slice(0)},gi=aa.compile=function(e,t){var n,h,v,b,y,r=[],o=[],i=Oi[e+" "];if(!i){for(n=(t=t||mi(e)).length;n--;)((i=function e(t){for(var o,n,r,i=t.length,a=li.relative[t[0].type],u=a||li.relative[" "],s=a?1:0,c=ga(function(e){return e===o},u,!0),l=ga(function(e){return-1<Hi.call(o,e)},u,!0),f=[function(e,t,n){var r=!a&&(n||t!==hi)||((o=t).nodeType?c:l)(e,t,n);return o=null,r}];s<i;s++)if(n=li.relative[t[s].type])f=[ga(pa(f),n)];else{if((n=li.filter[t[s].type].apply(null,t[s].matches))[ki]){for(r=++s;r<i&&!li.relative[t[r].type];r++);return function e(m,g,p,h,v,t){return h&&!h[ki]&&(h=e(h)),v&&!v[ki]&&(v=e(v,t)),sa(function(e,t,n,r){var o,i,a,u=[],s=[],c=t.length,l=e||function(e,t,n){for(var r=0,o=t.length;r<o;r++)aa(e,t[r],n);return n}(g||"*",n.nodeType?[n]:n,[]),f=!m||!e&&g?l:ha(l,u,m,n,r),d=p?v||(e?m:c||h)?[]:t:f;if(p&&p(f,d,n,r),h)for(o=ha(d,s),h(o,[],n,r),i=o.length;i--;)(a=o[i])&&(d[s[i]]=!(f[s[i]]=a));if(e){if(v||m){if(v){for(o=[],i=d.length;i--;)(a=d[i])&&o.push(f[i]=a);v(null,d=[],o,r)}for(i=d.length;i--;)(a=d[i])&&-1<(o=v?Hi.call(e,a):u[i])&&(e[o]=!(t[o]=a))}}else d=ha(d===t?d.splice(c,d.length):d),v?v(null,t,d,r):Ui.apply(t,d)})}(1<s&&pa(f),1<s&&ma(t.slice(0,s-1).concat({value:" "===t[s-2].type?"*":""})).replace(Wi,"$1"),n,s<r&&e(t.slice(s,r)),r<i&&e(t=t.slice(r)),r<i&&ma(t))}f.push(n)}return pa(f)}(t[n]))[ki]?r:o).push(i);(i=Oi(e,(h=o,b=0<(v=r).length,y=0<h.length,b?sa(a):a))).selector=e}function a(e,t,n,r,o){var i,a,u,s=0,c="0",l=e&&[],f=[],d=hi,m=e||y&&li.find.TAG("*",o),g=Ai+=null==d?1:Math.random()||.1,p=m.length;for(o&&(hi=t!==Ci&&t);c!==p&&null!=(i=m[c]);c++){if(y&&i){for(a=0;u=h[a++];)if(u(i,t,n)){r.push(i);break}o&&(Ai=g)}b&&((i=!u&&i)&&s--,e&&l.push(i))}if(s+=c,b&&c!==s){for(a=0;u=v[a++];)u(l,f,t,n);if(e){if(0<s)for(;c--;)l[c]||f[c]||(f[c]=Mi.call(r));f=ha(f)}Ui.apply(r,f),o&&!e&&0<f.length&&1<s+v.length&&aa.uniqueSort(r)}return o&&(Ai=g,hi=d),l}return i},pi=aa.select=function(e,t,n,r){var o,i,a,u,s,c="function"==typeof e&&e,l=!r&&mi(e=c.selector||e);if(n=n||[],1===l.length){if(2<(i=l[0]=l[0].slice(0)).length&&"ID"===(a=i[0]).type&&ci.getById&&9===t.nodeType&&wi&&li.relative[i[1].type]){if(!(t=(li.find.ID(a.matches[0].replace(ia,si),t)||[])[0]))return n;c&&(t=t.parentNode),e=e.slice(i.shift().value.length)}for(o=Qi.needsContext.test(e)?0:i.length;o--&&(a=i[o],!li.relative[u=a.type]);)if((s=li.find[u])&&(r=s(a.matches[0].replace(ia,si),ra.test(i[0].type)&&fa(t.parentNode)||t))){if(i.splice(o,1),!(e=r.length&&ma(i)))return Ui.apply(n,r),n;break}}return(c||gi(e,l))(r,t,!wi,n,ra.test(e)&&fa(t.parentNode)||t),n},ci.sortStable=ki.split("").sort(Bi).join("")===ki,ci.detectDuplicates=!!bi,yi(),ci.sortDetached=!0;var ka=document,_a=Array.prototype.push,Aa=Array.prototype.slice,Ra=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,Da=ai.Event,Ta=Et.makeMap("children,contents,next,prev"),Oa=function(e,t,n,r){var o;if(ba(t))t=ya(t,za(e[0]));else if(t.length&&!t.nodeType){if(t=Wa.makeArray(t),r)for(o=t.length-1;0<=o;o--)Oa(e,t[o],n,r);else for(o=0;o<t.length;o++)Oa(e,t[o],n,r);return e}if(t.nodeType)for(o=e.length;o--;)n.call(e[o],t);return e},Ba=Et.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," "),Pa=Et.makeMap("checked compact declare defer disabled ismap multiple nohref noshade nowrap readonly selected"," "),La={for:"htmlFor",class:"className",readonly:"readOnly"},Ia={float:"cssFloat"},Ma={},Fa={},Ua=/^\s*|\s*$/g,za=function(e){return e?9===e.nodeType?e:e.ownerDocument:ka};function Ha(e,t,n){var r=[],o=e[t];for("string"!=typeof n&&n instanceof Wa&&(n=n[0]);o&&9!==o.nodeType;){if(void 0!==n){if(o===n)break;if("string"==typeof n&&Wa(o).is(n))break}1===o.nodeType&&r.push(o),o=o[t]}return r}function ja(e,t,n,r){var o=[];for(r instanceof Wa&&(r=r[0]);e;e=e[t])if(!n||e.nodeType===n){if(void 0!==r){if(e===r)break;if("string"==typeof r&&Wa(e).is(r))break}o.push(e)}return o}function Va(e,t,n){for(e=e[t];e;e=e[t])if(e.nodeType===n)return e;return null}function qa(e,t){var n=t.attr("style"),r=e.serialize(e.parse(n),t[0].nodeName)||null;t.attr("data-mce-style",r)}function $a(e,t){var n,r,o=0;if(e)for(n=e.nodeType,e=e.previousSibling;e;e=e.previousSibling)r=e.nodeType,(!t||3!==r||r!==n&&e.nodeValue.length)&&(o++,n=r);return o}wa.fn=wa.prototype={constructor:wa,selector:"",context:null,length:0,init:function(e,t){var n,r,o=this;if(!e)return o;if(e.nodeType)return o.context=o[0]=e,o.length=1,o;if(t&&t.nodeType)o.context=t;else{if(t)return Wa(e).attr(t);o.context=t=document}if(ba(e)){if(!(n="<"===(o.selector=e).charAt(0)&&">"===e.charAt(e.length-1)&&3<=e.length?[null,e,null]:Ra.exec(e)))return Wa(t).find(e);if(n[1])for(r=ya(e,za(t)).firstChild;r;)_a.call(o,r),r=r.nextSibling;else{if(!(r=za(t).getElementById(n[2])))return o;if(r.id!==n[2])return o.find(e);o.length=1,o[0]=r}}else this.add(e,!1);return o},toArray:function(){return Et.toArray(this)},add:function(e,t){var n,r;if(ba(e))return this.add(Wa(e));if(!1!==t)for(n=Wa.unique(this.toArray().concat(Wa.makeArray(e))),this.length=n.length,r=0;r<n.length;r++)this[r]=n[r];else _a.apply(this,Wa.makeArray(e));return this},attr:function(t,n){var e,r=this;if("object"==typeof t)Ea(t,function(e,t){r.attr(e,t)});else{if(!va(n)){if(r[0]&&1===r[0].nodeType){if((e=Ma[t])&&e.get)return e.get(r[0],t);if(Pa[t])return r.prop(t)?t:void 0;null===(n=r[0].getAttribute(t,2))&&(n=void 0)}return n}this.each(function(){var e;1===this.nodeType&&((e=Ma[t])&&e.set?e.set(this,n):null===n?this.removeAttribute(t,2):this.setAttribute(t,n,2))})}return r},removeAttr:function(e){return this.attr(e,null)},prop:function(e,t){var n=this;if("object"==typeof(e=La[e]||e))Ea(e,function(e,t){n.prop(e,t)});else{if(!va(t))return n[0]&&n[0].nodeType&&e in n[0]?n[0][e]:t;this.each(function(){1===this.nodeType&&(this[e]=t)})}return n},css:function(t,n){function e(e){return e.replace(/-(\D)/g,function(e,t){return t.toUpperCase()})}function r(e){return e.replace(/[A-Z]/g,function(e){return"-"+e})}var o,i,a=this;if("object"==typeof t)Ea(t,function(e,t){a.css(e,t)});else if(va(n))t=e(t),"number"!=typeof n||Ba[t]||(n=n.toString()+"px"),a.each(function(){var e=this.style;if((i=Fa[t])&&i.set)i.set(this,n);else{try{this.style[Ia[t]||t]=n}catch(e){}null!==n&&""!==n||(e.removeProperty?e.removeProperty(r(t)):e.removeAttribute(t))}});else{if(o=a[0],(i=Fa[t])&&i.get)return i.get(o);if(!o.ownerDocument.defaultView)return o.currentStyle?o.currentStyle[e(t)]:"";try{return o.ownerDocument.defaultView.getComputedStyle(o,null).getPropertyValue(r(t))}catch(e){return}}return a},remove:function(){for(var e,t=this.length;t--;)e=this[t],Da.clean(e),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var e,t=this.length;t--;)for(e=this[t];e.firstChild;)e.removeChild(e.firstChild);return this},html:function(t){var n;if(va(t)){n=this.length;try{for(;n--;)this[n].innerHTML=t}catch(e){Wa(this[n]).empty().append(t)}return this}return this[0]?this[0].innerHTML:""},text:function(e){var t;if(va(e)){for(t=this.length;t--;)"innerText"in this[t]?this[t].innerText=e:this[0].textContent=e;return this}return this[0]?this[0].innerText||this[0].textContent:""},append:function(){return Oa(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.appendChild(e)})},prepend:function(){return Oa(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.insertBefore(e,this.firstChild)},!0)},before:function(){return this[0]&&this[0].parentNode?Oa(this,arguments,function(e){this.parentNode.insertBefore(e,this)}):this},after:function(){return this[0]&&this[0].parentNode?Oa(this,arguments,function(e){this.parentNode.insertBefore(e,this.nextSibling)},!0):this},appendTo:function(e){return Wa(e).append(this),this},prependTo:function(e){return Wa(e).prepend(this),this},replaceWith:function(e){return this.before(e).remove()},wrap:function(e){return xa(this,e)},wrapAll:function(e){return xa(this,e,!0)},wrapInner:function(e){return this.each(function(){Wa(this).contents().wrapAll(e)}),this},unwrap:function(){return this.parent().each(function(){Wa(this).replaceWith(this.childNodes)})},clone:function(){var e=[];return this.each(function(){e.push(this.cloneNode(!0))}),Wa(e)},addClass:function(e){return this.toggleClass(e,!0)},removeClass:function(e){return this.toggleClass(e,!1)},toggleClass:function(o,i){var e=this;return"string"!=typeof o||(-1!==o.indexOf(" ")?Ea(o.split(" "),function(){e.toggleClass(this,i)}):e.each(function(e,t){var n,r=Ca(t,o);r!==i&&(n=t.className,r?t.className=Sa((" "+n+" ").replace(" "+o+" "," ")):t.className+=n?" "+o:o)})),e},hasClass:function(e){return Ca(this[0],e)},each:function(e){return Ea(this,e)},on:function(e,t){return this.each(function(){Da.bind(this,e,t)})},off:function(e,t){return this.each(function(){Da.unbind(this,e,t)})},trigger:function(e){return this.each(function(){"object"==typeof e?Da.fire(this,e.type,e):Da.fire(this,e)})},show:function(){return this.css("display","")},hide:function(){return this.css("display","none")},slice:function(){return Wa(Aa.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},find:function(e){for(var t=[],n=0,r=this.length;n<r;n++)Wa.find(e,this[n],t);return Wa(t)},filter:function(n){return Wa("function"==typeof n?Na(this.toArray(),function(e,t){return n(t,e)}):Wa.filter(n,this.toArray()))},closest:function(n){var r=[];return n instanceof Wa&&(n=n[0]),this.each(function(e,t){for(;t;){if("string"==typeof n&&Wa(t).is(n)){r.push(t);break}if(t===n){r.push(t);break}t=t.parentNode}}),Wa(r)},offset:function(e){var t,n,r,o,i=0,a=0;return e?this.css(e):((t=this[0])&&(r=(n=t.ownerDocument).documentElement,t.getBoundingClientRect&&(i=(o=t.getBoundingClientRect()).left+(r.scrollLeft||n.body.scrollLeft)-r.clientLeft,a=o.top+(r.scrollTop||n.body.scrollTop)-r.clientTop)),{left:i,top:a})},push:_a,sort:Array.prototype.sort,splice:Array.prototype.splice},Et.extend(wa,{extend:Et.extend,makeArray:function(e){return e&&e===e.window||e.nodeType?[e]:Et.toArray(e)},inArray:function(e,t){var n;if(t.indexOf)return t.indexOf(e);for(n=t.length;n--;)if(t[n]===e)return n;return-1},isArray:Et.isArray,each:Ea,trim:Sa,grep:Na,find:aa,expr:aa.selectors,unique:aa.uniqueSort,text:aa.getText,contains:aa.contains,filter:function(e,t,n){var r=t.length;for(n&&(e=":not("+e+")");r--;)1!==t[r].nodeType&&t.splice(r,1);return 1===t.length?Wa.find.matchesSelector(t[0],e)?[t[0]]:[]:Wa.find.matches(e,t)}}),Ea({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return Ha(e,"parentNode")},next:function(e){return Va(e,"nextSibling",1)},prev:function(e){return Va(e,"previousSibling",1)},children:function(e){return ja(e.firstChild,"nextSibling",1)},contents:function(e){return Et.toArray(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(r,o){wa.fn[r]=function(t){var n=[];this.each(function(){var e=o.call(n,this,t,n);e&&(Wa.isArray(e)?n.push.apply(n,e):n.push(e))}),1<this.length&&(Ta[r]||(n=Wa.unique(n)),0===r.indexOf("parents")&&(n=n.reverse()));var e=Wa(n);return t?e.filter(t):e}}),Ea({parentsUntil:function(e,t){return Ha(e,"parentNode",t)},nextUntil:function(e,t){return ja(e,"nextSibling",1,t).slice(1)},prevUntil:function(e,t){return ja(e,"previousSibling",1,t).slice(1)}},function(o,i){wa.fn[o]=function(t,e){var n=[];this.each(function(){var e=i.call(n,this,t,n);e&&(Wa.isArray(e)?n.push.apply(n,e):n.push(e))}),1<this.length&&(n=Wa.unique(n),0!==o.indexOf("parents")&&"prevUntil"!==o||(n=n.reverse()));var r=Wa(n);return e?r.filter(e):r}}),wa.fn.is=function(e){return!!e&&0<this.filter(e).length},wa.fn.init.prototype=wa.fn,wa.overrideDefaults=function(n){var r,o=function(e,t){return r=r||n(),0===arguments.length&&(e=r.element),t=t||r.context,new o.fn.init(e,t)};return Wa.extend(o,this),o},wa.attrHooks=Ma,wa.cssHooks=Fa;var Wa=wa,Ka=Et.each,Xa=Et.grep,Ya=xt.ie,Ga=/^([a-z0-9],?)+$/i,Ja=function(a,u){function s(e){return e&&a&&X(e)?a.getElementById(e):e}function c(e){return H("string"==typeof e?s(e):e)}function r(e,t,n){var r,o,i=c(e);return void 0===(o=i.length?(r=W[t])&&r.get?r.get(i,t):i.attr(t):o)?n||"":o}function o(e){var t=s(e);return t?t.attributes:[]}function i(e,t,n){""===n&&(n=null);var r,o=c(e),i=o.attr(t);o.length&&((r=W[t])&&r.set?r.set(o,n,t):o.attr(t,n),i!==n&&u.onSetAttrib&&u.onSetAttrib({attrElm:o,attrName:t,attrValue:n}))}function l(){return u.root_element||a.body}function f(e,t){return function(e,t,n){var r,o=0,i=0,a=e.ownerDocument;if(n=n||e,t){if(n===e&&t.getBoundingClientRect&&"static"===xn(Nt.fromDom(e),"position")){var u=t.getBoundingClientRect();return{x:o=u.left+(a.documentElement.scrollLeft||e.scrollLeft)-a.documentElement.clientLeft,y:i=u.top+(a.documentElement.scrollTop||e.scrollTop)-a.documentElement.clientTop}}for(var s=t;s&&s!==n&&s.nodeType&&!Nn(s,n);){var c=s;o+=c.offsetLeft||0,i+=c.offsetTop||0,s=c.offsetParent}for(s=t.parentNode;s&&s!==n&&s.nodeType&&!Nn(s,n);)o-=s.scrollLeft||0,i-=s.scrollTop||0,s=s.parentNode;i+=(r=Nt.fromDom(t),Zn.isFirefox()&&"table"===kt(r)?En(Dn(r)).filter(function(e){return"caption"===kt(e)}).bind(function(o){return En(It(o)).map(function(e){var t=e.dom.offsetTop,n=o.dom.offsetTop,r=o.dom.offsetHeight;return t<=n?-r:0})}).getOr(0):0)}return{x:o,y:i}}(a.body,s(e),t)}function d(e,t,n){var r=c(e);return n?r.css(t):("float"===(t=t.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}))&&(t=xt.browser.isIE()?"styleFloat":"cssFloat"),r[0]&&r[0].style?r[0].style[t]:void 0)}function m(e){var t=d(e=s(e),"width"),n=d(e,"height");return-1===t.indexOf("px")&&(t=0),-1===n.indexOf("px")&&(n=0),{w:parseInt(t,10)||e.offsetWidth||e.clientWidth,h:parseInt(n,10)||e.offsetHeight||e.clientHeight}}function g(e,t){if(!e)return!1;if(!Array.isArray(e)){if("*"===t)return 1===e.nodeType;if(Ga.test(t)){for(var n=t.toLowerCase().split(/,/),r=e.nodeName.toLowerCase(),o=n.length-1;0<=o;o--)if(n[o]===r)return!0;return!1}if(e.nodeType&&1!==e.nodeType)return!1}var i=Array.isArray(e)?e:[e];return 0<aa(t,i[0].ownerDocument||i[0],null,i).length}function p(e,t,n,r){var o,i=[],a=s(e);for(r=void 0===r,n=n||("BODY"!==l().nodeName?l().parentNode:null),Et.is(t,"string")&&(t="*"===(o=t)?function(e){return 1===e.nodeType}:function(e){return g(e,o)});a&&!(a===n||K(a.nodeType)||qn(a)||$n(a));){if(!t||"function"==typeof t&&t(a)){if(!r)return[a];i.push(a)}a=a.parentNode}return r?i:null}function n(e,t,n){var r=t;if(e)for("string"==typeof t&&(r=function(e){return g(e,t)}),e=e[n];e;e=e[n])if("function"==typeof r&&r(e))return e;return null}function h(e,n,r){var o,t="string"==typeof e?s(e):e;return!!t&&(Et.isArray(t)&&(t.length||0===t.length)?(o=[],Ka(t,function(e,t){e&&o.push(n.call(r,"string"==typeof e?s(e):e,t))}),o):n.call(r||this,t))}function v(e,t){c(e).each(function(e,n){Ka(t,function(e,t){i(n,t,e)})})}function b(e,n){var t=c(e);Ya?t.each(function(e,t){if(!1!==t.canHaveHTML){for(;t.firstChild;)t.removeChild(t.firstChild);try{t.innerHTML="<br>"+n,t.removeChild(t.firstChild)}catch(e){Wa("<div></div>").html("<br>"+n).contents().slice(1).appendTo(t)}return n}}):t.html(n)}function y(e,n,r,o,i){return h(e,function(e){var t="string"==typeof n?a.createElement(n):n;return v(t,r),o&&("string"!=typeof o&&o.nodeType?t.appendChild(o):"string"==typeof o&&b(t,o)),i?t:e.appendChild(t)})}function C(e,t,n){return y(a.createElement(e),e,t,n,!0)}function x(e,t){var n=c(e);return(t?n.each(function(){for(var e;e=this.firstChild;)3===e.nodeType&&0===e.data.length?this.removeChild(e):this.parentNode.insertBefore(e,this)}):n).remove(),1<n.length?n.toArray():n[0]}function w(e,t,n){c(e).toggleClass(t,n).each(function(){""===this.className&&Wa(this).attr("class",null)})}function S(t,e,n){return h(e,function(e){return Et.is(e,"array")&&(t=t.cloneNode(!0)),n&&Ka(Xa(e.childNodes),function(e){t.appendChild(e)}),e.parentNode.replaceChild(t,e)})}function E(e){if(zn(e)){var t="a"===e.nodeName.toLowerCase()&&!r(e,"href")&&r(e,"id");return r(e,"name")||r(e,"data-mce-bookmark")||t?1:void 0}}function N(){return a.createRange()}function k(e){if(e&&zn(e)){var t=e.getAttribute("data-mce-contenteditable");return t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null}return null}void 0===u&&(u={});var _,A,R,D,e,t,T={},O=window,B={},P=0,L=Ar.forElement(Nt.fromDom(a),{contentCssCors:u.contentCssCors,referrerPolicy:u.referrerPolicy}),I=[],M=u.schema||to({}),F=ro({url_converter:u.url_converter,url_converter_scope:u.url_converter_scope},u.schema),U=u.ownEvents?new ai:ai.Event,z=M.getBlockElements(),H=Wa.overrideDefaults(function(){return{context:a,element:$.getRoot()}}),j=Go.encodeAllRaw,V=function(e,t,n,r){if(Et.isArray(e)){for(var o=e.length,i=[];o--;)i[o]=V(e[o],t,n,r);return i}return!u.collect||e!==a&&e!==O||I.push([e,t,n,r]),U.bind(e,t,n,r||$)},q=function(e,t,n){if(Et.isArray(e)){for(var r=e.length,o=[];r--;)o[r]=q(e[r],t,n);return o}if(0<I.length&&(e===a||e===O))for(r=I.length;r--;){var i=I[r];e!==i[0]||t&&t!==i[1]||n&&n!==i[2]||U.unbind(i[0],i[1],i[2])}return U.unbind(e,t,n)},$={doc:a,settings:u,win:O,files:B,stdMode:!0,boxModel:!0,styleSheetLoader:L,boundEvents:I,styles:F,schema:M,events:U,isBlock:function(e){if("string"==typeof e)return!!z[e];if(e){var t=e.nodeType;if(t)return!(1!==t||!z[e.nodeName])}return!1},$:H,$$:c,root:null,clone:function(t,e){if(!Ya||1!==t.nodeType||e)return t.cloneNode(e);var n=a.createElement(t.nodeName);return Ka(o(t),function(e){i(n,e.nodeName,r(t,e.nodeName))}),n},getRoot:l,getViewPort:function(e){var t=tn(e);return{x:t.x,y:t.y,w:t.width,h:t.height}},getRect:function(e){var t=f(e=s(e)),n=m(e);return{x:t.x,y:t.y,w:n.w,h:n.h}},getSize:m,getParent:function(e,t,n){var r=p(e,t,n,!1);return r&&0<r.length?r[0]:null},getParents:p,get:s,getNext:function(e,t){return n(e,t,"nextSibling")},getPrev:function(e,t){return n(e,t,"previousSibling")},select:function(e,t){return aa(e,s(t)||u.root_element||a,[])},is:g,add:y,create:C,createHTML:function(e,t,n){var r,o="";for(r in o+="<"+e,t)se(t,r)&&(o+=" "+r+'="'+j(t[r])+'"');return void 0!==n?o+">"+n+"</"+e+">":o+" />"},createFragment:function(e){var t,n=a.createElement("div"),r=a.createDocumentFragment();for(r.appendChild(n),e&&(n.innerHTML=e);t=n.firstChild;)r.appendChild(t);return r.removeChild(n),r},remove:x,setStyle:function(e,t,n){var r=X(t)?c(e).css(t,n):c(e).css(t);u.update_styles&&qa(F,r)},getStyle:d,setStyles:function(e,t){var n=c(e).css(t);u.update_styles&&qa(F,n)},removeAllAttribs:function(e){return h(e,function(e){for(var t=e.attributes,n=t.length-1;0<=n;n--)e.removeAttributeNode(t.item(n))})},setAttrib:i,setAttribs:v,getAttrib:r,getPos:f,parseStyle:function(e){return F.parse(e)},serializeStyle:function(e,t){return F.serialize(e,t)},addStyle:function(e){var t,n;if($!==Ja.DOM&&a===document){if(T[e])return;T[e]=!0}(n=a.getElementById("mceDefaultStyles"))||((n=a.createElement("style")).id="mceDefaultStyles",n.type="text/css",(t=a.getElementsByTagName("head")[0]).firstChild?t.insertBefore(n,t.firstChild):t.appendChild(n)),n.styleSheet?n.styleSheet.cssText+=e:n.appendChild(a.createTextNode(e))},loadCSS:function(e){Y((e=e||"").split(","),function(e){B[e]=!0,L.load(e,te)})},addClass:function(e,t){c(e).addClass(t)},removeClass:function(e,t){w(e,t,!1)},hasClass:function(e,t){return c(e).hasClass(t)},toggleClass:w,show:function(e){c(e).show()},hide:function(e){c(e).hide()},isHidden:function(e){return"none"===c(e).css("display")},uniqueId:function(e){return(e||"mce_")+P++},setHTML:b,getOuterHTML:function(e){var t="string"==typeof e?s(e):e;return zn(t)?t.outerHTML:Wa("<div></div>").append(Wa(t).clone()).html()},setOuterHTML:function(e,t){c(e).each(function(){try{if("outerHTML"in this)return void(this.outerHTML=t)}catch(e){}x(Wa(this).html(t),!0)})},decode:Go.decode,encode:j,insertAfter:function(e,t){var r=s(t);return h(e,function(e){var t=r.parentNode,n=r.nextSibling;return n?t.insertBefore(e,n):t.appendChild(e),e})},replace:S,rename:function(t,e){var n;return t.nodeName!==e.toUpperCase()&&(n=C(e),Ka(o(t),function(e){i(n,e.nodeName,r(t,e.nodeName))}),S(n,t,!0)),n||t},findCommonAncestor:function(e,t){for(var n,r=e;r;){for(n=t;n&&r!==n;)n=n.parentNode;if(r===n)break;r=r.parentNode}return!r&&e.ownerDocument?e.ownerDocument.documentElement:r},toHex:function(e){return F.toHex(Et.trim(e))},run:h,getAttribs:o,isEmpty:function(e,t){var n,r,o=0;if(E(e))return!1;if(e=e.firstChild){var i=new Rr(e,e.parentNode),a=M?M.getWhiteSpaceElements():{};t=t||(M?M.getNonEmptyElements():null);do{if(n=e.nodeType,zn(e)){var u=e.getAttribute("data-mce-bogus");if(u){e=i.next("all"===u);continue}if(r=e.nodeName.toLowerCase(),t&&t[r]){if("br"!==r)return!1;o++,e=i.next();continue}if(E(e))return!1}if(8===n)return!1;if(3===n&&!qr(e.nodeValue))return!1;if(3===n&&e.parentNode&&a[e.parentNode.nodeName]&&qr(e.nodeValue))return!1;e=i.next()}while(e)}return o<=1},createRng:N,nodeIndex:$a,split:function(e,t,n){var r,o,i,a=N();if(e&&t)return a.setStart(e.parentNode,$a(e)),a.setEnd(t.parentNode,$a(t)),r=a.extractContents(),(a=N()).setStart(t.parentNode,$a(t)+1),a.setEnd(e.parentNode,$a(e)+1),o=a.extractContents(),(i=e.parentNode).insertBefore(zo($,r),e),n?i.insertBefore(n,e):i.insertBefore(t,e),i.insertBefore(zo($,o),e),x(e),n||t},bind:V,unbind:q,fire:function(e,t,n){return U.fire(e,t,n)},getContentEditable:k,getContentEditableParent:function(e){for(var t=l(),n=null;e&&e!==t&&null===(n=k(e));e=e.parentNode);return n},destroy:function(){if(0<I.length)for(var e=I.length;e--;){var t=I[e];U.unbind(t[0],t[1],t[2])}ne(B,function(e,t){L.unload(t),delete B[t]}),aa.setDocument&&aa.setDocument()},isChildOf:function(e,t){if(Ya){for(;e;){if(t===e)return!0;e=e.parentNode}return!1}return e===t||t.contains(e)},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset}},W=(_=F,R=J($),e={set:function(e,t,n){A.url_converter&&null!==t&&(t=A.url_converter.call(A.url_converter_scope||R(),t,n,e[0])),e.attr("data-mce-"+n,t).attr(n,t)},get:function(e,t){return e.attr("data-mce-"+t)||e.attr(t)}},t={style:{set:function(e,t){null===t||"object"!=typeof t?(D&&e.attr("data-mce-style",t),null!==t&&"string"==typeof t?(e.removeAttr("style"),e.css(_.parse(t))):e.attr("style",t)):e.css(t)},get:function(e){var t=e.attr("data-mce-style")||e.attr("style");return _.serialize(_.parse(t),e[0].nodeName)}}},(D=(A=u).keep_values)&&(t.href=t.src=e),t);return $};Ja.DOM=Ja(document),Ja.nodeIndex=$a;var Qa=Ja.DOM,Za=Et.each,eu=Et.grep,tu=(nu.prototype._setReferrerPolicy=function(e){this.settings.referrerPolicy=e},nu.prototype.loadScript=function(e,t,n){function r(){o.remove(i),a&&(a.onerror=a.onload=a=null)}var o=Qa,i=o.uniqueId(),a=document.createElement("script");a.id=i,a.type="text/javascript",a.src=Et._addCacheSuffix(e),this.settings.referrerPolicy&&o.setAttrib(a,"referrerpolicy",this.settings.referrerPolicy),a.onload=function(){r(),t()},a.onerror=function(){r(),y(n)?n():"undefined"!=typeof console&&console.log&&console.log("Failed to load script: "+e)},(document.getElementsByTagName("head")[0]||document.body).appendChild(a)},nu.prototype.isDone=function(e){return 2===this.states[e]},nu.prototype.markDone=function(e){this.states[e]=2},nu.prototype.add=function(e,t,n,r){var o=this.states[e];this.queue.push(e),void 0===o&&(this.states[e]=0),t&&(this.scriptLoadedCallbacks[e]||(this.scriptLoadedCallbacks[e]=[]),this.scriptLoadedCallbacks[e].push({success:t,failure:r,scope:n||this}))},nu.prototype.load=function(e,t,n,r){return this.add(e,t,n,r)},nu.prototype.remove=function(e){delete this.states[e],delete this.scriptLoadedCallbacks[e]},nu.prototype.loadQueue=function(e,t,n){this.loadScripts(this.queue,e,t,n)},nu.prototype.loadScripts=function(n,e,t,r){function o(t,e){Za(i.scriptLoadedCallbacks[e],function(e){y(e[t])&&e[t].call(e.scope)}),i.scriptLoadedCallbacks[e]=void 0}var i=this,a=[];i.queueLoadedCallbacks.push({success:e,failure:r,scope:t||this});var u=function(){var e,t=eu(n);n.length=0,Za(t,function(e){2!==i.states[e]?3!==i.states[e]?1!==i.states[e]&&(i.states[e]=1,i.loading++,i.loadScript(e,function(){i.states[e]=2,i.loading--,o("success",e),u()},function(){i.states[e]=3,i.loading--,a.push(e),o("failure",e),u()})):o("failure",e):o("success",e)}),i.loading||(e=i.queueLoadedCallbacks.slice(0),i.queueLoadedCallbacks.length=0,Za(e,function(e){0===a.length?y(e.success)&&e.success.call(e.scope):y(e.failure)&&e.failure.call(e.scope,a)}))};u()},nu.ScriptLoader=new nu,nu);function nu(e){void 0===e&&(e={}),this.states={},this.queue=[],this.scriptLoadedCallbacks={},this.queueLoadedCallbacks=[],this.loading=0,this.settings=e}function ru(e){var t=e;return{get:function(){return t},set:function(e){t=e}}}function ou(){return ue(iu,au.get())}var iu={},au=ru("en"),uu={getData:function(){return re(iu,function(e){return _e({},e)})},setCode:function(e){e&&au.set(e)},getCode:function(){return au.get()},add:function(e,t){var n=iu[e];n||(iu[e]=n={}),ne(t,function(e,t){n[t.toLowerCase()]=e})},translate:function(e){function n(e){return y(e)?Object.prototype.toString.call(e):u(e)?"":""+e}function t(e){var t=n(e);return ue(a,t.toLowerCase()).map(n).getOr(t)}function r(e){return e.replace(/{context:\w+}$/,"")}var o,i,a=ou().getOr({}),u=function(e){return""===e||null==e};if(u(e))return"";if(h(o=e)&&Ne(o,"raw"))return n(e.raw);if(S(i=e)&&1<i.length){var s=e.slice(1);return r(t(e[0]).replace(/\{([0-9]+)\}/g,function(e,t){return Ne(s,t)?n(s[t]):e}))}return r(t(e))},isRtl:function(){return ou().bind(function(e){return ue(e,"_dir")}).exists(function(e){return"rtl"===e})},hasCode:function(e){return Ne(iu,e)}},su=function(){function u(t,n){Y(U(r,function(e){return e.name===t&&e.state===n}),function(e){return e.callback()})}function s(e){var t;return(f[e]?f[e].dependencies:t)||[]}function c(e,t){return"object"==typeof t?t:"string"==typeof e?{prefix:"",resource:t,suffix:""}:{prefix:e.prefix,resource:t,suffix:e.suffix}}function e(e,t,n){void 0===n&&(n="added"),Ne(f,e)&&"added"===n||Ne(l,e)&&"loaded"===n?t():r.push({name:e,state:n,callback:t})}var o=[],l={},f={},r=[],d=function(r,o,i,a,e){var t,n;l[r]||(0!==(t="string"==typeof o?o:o.prefix+o.resource+o.suffix).indexOf("/")&&-1===t.indexOf("://")&&(t=su.baseURL+"/"+t),l[r]=t.substring(0,t.lastIndexOf("/")),n=function(){var n,e,t;u(r,"loaded"),n=o,e=i,t=a,Y(s(r),function(e){var t=c(n,e);d(t.resource,t,void 0,void 0)}),e&&(t?e.call(t):e.call(tu))},f[r]?n():tu.ScriptLoader.add(t,n,a,e))};return{items:o,urls:l,lookup:f,_listeners:r,get:function(e){if(f[e])return f[e].instance},dependencies:s,requireLangPack:function(t,n){!1!==su.languageLoad&&e(t,function(){var e=uu.getCode();!e||n&&-1===(","+(n||"")+",").indexOf(","+e+",")||tu.ScriptLoader.add(l[t]+"/langs/"+e+".js")},"loaded")},add:function(e,t,n){var r=t;return o.push(r),f[e]={instance:r,dependencies:n},u(e,"added"),r},remove:function(e){delete l[e],delete f[e]},createUrl:c,addComponents:function(e,t){var n=l[e];Y(t,function(e){tu.ScriptLoader.add(n+"/"+e)})},load:d,waitFor:e}};function cu(){var e,t,n=(e=te,t=ru(ve.none()),{clear:function(){r(),t.set(ve.none())},isSet:function(){return t.get().isSome()},get:function(){return t.get()},set:function(e){r(),t.set(ve.some(e))}});function r(){return t.get().each(e)}return _e(_e({},n),{on:function(e){return n.get().each(e)}})}function lu(n,r){var o=null;return{cancel:function(){l(o)||(clearTimeout(o),o=null)},throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];l(o)&&(o=setTimeout(function(){o=null,n.apply(null,e)},r))}}}function fu(n,r){function o(){l(i)||(clearTimeout(i),i=null)}var i=null;return{cancel:o,throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];o(),i=setTimeout(function(){i=null,n.apply(null,e)},r)}}}function du(e,t){var n=vn(e,t);return void 0===n||""===n?[]:n.split(" ")}function mu(e){return void 0!==e.dom.classList}function gu(e,t){var n,r,o;mu(e)?e.dom.classList.add(t):(r=t,o=du(n=e,"class").concat([r]),pn(n,"class",o.join(" ")))}function pu(e,t){return mu(e)&&e.dom.classList.contains(t)}function hu(e,t){return He(n=void 0===e?document:e.dom)?[]:T(n.querySelectorAll(t),Nt.fromDom);var n}function vu(r,e){function t(e,t){return(n=e.dom)&&n.hasAttribute&&n.hasAttribute(t)?ve.some(vn(e,t)):ve.none();var n}var n=r.selection.getRng(),o=Nt.fromDom(n.startContainer),i=Nt.fromDom(r.getBody()),a=e.fold(function(){return"."+ju()},function(e){return"["+Vu()+'="'+e+'"]'});return br(Mt(o,n.startOffset).getOr(o),a,function(e){return je(e,i)}).bind(function(e){return t(e,""+qu()).bind(function(n){return t(e,""+Vu()).map(function(e){var t=$u(r,n);return{uid:n,name:e,elements:t}})})})}function bu(t){function o(){return{listeners:[],previous:cu()}}function c(e,t){n(e,function(e){return t(e),e})}function n(e,t){var n=i.get(),r=t(ue(n,e).getOrThunk(o));n[e]=r,i.set(n)}var i=ru({}),e=fu(function(){var e=i.get();Y(W(we(e)),function(e){n(e,function(u){var s=u.previous.get();return vu(t,ve.some(e)).fold(function(){var t;s.isSome()&&(c(t=e,function(e){Y(e.listeners,function(e){return e(!1,t)})}),u.previous.clear())},function(e){var t,n,r,o=e.uid,i=e.name,a=e.elements;fn(s,o)||(n=o,r=a,c(t=i,function(e){Y(e.listeners,function(e){return e(!0,t,{uid:n,nodes:T(r,function(e){return e.dom})})})}),u.previous.set(o))}),{previous:u.previous,listeners:u.listeners}})})},30);return t.on("remove",function(){e.cancel()}),t.on("NodeChange",function(){e.throttle()}),{addListener:function(e,t){n(e,function(e){return{previous:e.previous,listeners:e.listeners.concat([t])}})}}}function yu(e){var t=(new Date).getTime();return e+"_"+Math.floor(1e9*Math.random())+ ++Wu+String(t)}function Cu(e,t){var n,r,o=Rt(e).dom,i=Nt.fromDom(o.createDocumentFragment());Kt(i,(n=t,(r=(o||document).createElement("div")).innerHTML=n,Dn(Nt.fromDom(r)))),Xt(e),Pn(e,i)}function xu(e,t){return Nt.fromDom(e.dom.cloneNode(t))}function wu(e){return xu(e,!1)}function Su(e){return xu(e,!0)}function Eu(e,t,n){function r(e){for(var t;(t=o[e]())&&!jn(t)&&!n(t););return ve.from(t).filter(jn)}void 0===n&&(n=R);var o=new Rr(e,t);return{current:function(){return ve.from(o.current()).filter(jn)},next:function(){return r("next")},prev:function(){return r("prev")},prev2:function(){return r("prev2")}}}function Nu(t,e){var i=e||function(e){return t.isBlock(e)||Wn(e)||Yn(e)},a=function(e,t,n,r){if(jn(e)){var o=r(e,t,e.data);if(-1!==o)return ve.some({container:e,offset:o})}return n().bind(function(e){return a(e.container,e.offset,n,r)})};return{backwards:function(e,t,n,r){var o=Eu(e,r,i);return a(e,t,function(){return o.prev().map(function(e){return{container:e,offset:e.length}})},n).getOrNull()},forwards:function(e,t,n,r){var o=Eu(e,r,i);return a(e,t,function(){return o.next().map(function(e){return{container:e,offset:0}})},n).getOrNull()}}}function ku(e){return e?{left:Ku(e.left),top:Ku(e.top),bottom:Ku(e.bottom),right:Ku(e.right),width:Ku(e.width),height:Ku(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0}}function _u(e,t){return e=ku(e),t||(e.left=e.left+e.width),e.right=e.left,e.width=0,e}function Au(e,t,n){return 0<=e&&e<=Math.min(t.height,n.height)/2}function Ru(e,t){var n=Math.min(t.height/2,e.height/2);return e.bottom-n<t.top||!(e.top>t.bottom)&&Au(t.top-e.bottom,e,t)}function Du(e,t){return e.top>t.bottom||!(e.bottom<t.top)&&Au(t.bottom-e.top,e,t)}function Tu(e,t,n){return t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom}function Ou(e){var t=e.startContainer,n=e.startOffset;return t.hasChildNodes()&&e.endOffset===n+1?t.childNodes[n]:null}function Bu(e,t){if(zn(e)&&e.hasChildNodes()){var n=e.childNodes;return n[r=n.length-1,Math.min(Math.max(t,0),r)]}return e;var r}function Pu(e){return"string"==typeof e&&768<=e.charCodeAt(0)&&Xu.test(e)}function Lu(e){return"createRange"in e?e.createRange():Ja.DOM.createRng()}function Iu(e){return e&&/[\r\n\t ]/.test(e)}function Mu(e){return e.setStart&&e.setEnd}function Fu(e){var t=e.startContainer,n=e.startOffset;if(Iu(e.toString())&&es(t.parentNode)&&jn(t)){var r=t.data;return Iu(r[n-1])||Iu(r[n+1])?1:void 0}}function Uu(e){return 0===e.left&&0===e.right&&0===e.top&&0===e.bottom}function zu(e,t){var n=_u(e,t);return n.width=1,n.right=n.left+1,n}su.languageLoad=!0,su.baseURL="",su.PluginManager=su(),su.ThemeManager=su();var Hu=function(e,t){var n=[];return Y(Dn(e),function(e){n=(n=t(e)?n.concat([e]):n).concat(Hu(e,t))}),n},ju=J("mce-annotation"),Vu=J("data-mce-annotation"),qu=J("data-mce-annotation-uid"),$u=function(e,t){return hu(Nt.fromDom(e.getBody()),"["+qu()+'="'+t+'"]')},Wu=0,Ku=Math.round,Xu=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]"),Yu=zn,Gu=jr,Ju=an("display","block table"),Qu=an("float","left right"),Zu=function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return function(e){for(var t=0;t<n.length;t++)if(!n[t](e))return!1;return!0}}(Yu,Gu,s(Qu)),es=s(an("white-space","pre pre-line pre-wrap")),ts=jn,ns=Wn,rs=Ja.nodeIndex,os=function(e,t){if(!(t<0&&zn(e)&&e.hasChildNodes()))return Bu(e,t)},is=function(e){var t=e.getClientRects(),n=0<t.length?ku(t[0]):ku(e.getBoundingClientRect());return!Mu(e)&&ns(e)&&Uu(n)?function(e){var t=e.ownerDocument,n=Lu(t),r=t.createTextNode(yo),o=e.parentNode;o.insertBefore(r,e),n.setStart(r,0),n.setEnd(r,1);var i=ku(n.getBoundingClientRect());return o.removeChild(r),i}(e):Uu(n)&&Mu(e)?function(e){var t=e.startContainer,n=e.endContainer,r=e.startOffset,o=e.endOffset;if(t===n&&jn(n)&&0===r&&1===o){var i=e.cloneRange();return i.setEndAfter(n),is(i)}return null}(e):n},as=function(t,n,e){function r(){return e=e||function(e){function r(e){var t;0!==e.height&&(0<o.length&&(t=o[o.length-1],e.left===t.left&&e.top===t.top&&e.bottom===t.bottom&&e.right===t.right)||o.push(e))}function t(e,t){var n=Lu(e.ownerDocument);if(t<e.data.length){if(Pu(e.data[t]))return o;if(Pu(e.data[t-1])&&(n.setStart(e,t),n.setEnd(e,t+1),!Fu(n)))return r(zu(is(n),!1)),o}0<t&&(n.setStart(e,t-1),n.setEnd(e,t),Fu(n)||r(zu(is(n),!1))),t<e.data.length&&(n.setStart(e,t),n.setEnd(e,t+1),Fu(n)||r(zu(is(n),!0)))}var o=[],n=e.container(),i=e.offset();if(ts(n))return t(n,i),o;if(Yu(n))if(e.isAtEnd()){var a=os(n,i);ts(a)&&t(a,a.data.length),Zu(a)&&!ns(a)&&r(zu(is(a),!1))}else{if(a=os(n,i),ts(a)&&t(a,0),Zu(a)&&e.isAtEnd())return r(zu(is(a),!1)),o;var u=os(e.container(),e.offset()-1);Zu(u)&&!ns(u)&&(!Ju(u)&&!Ju(a)&&Zu(a)||r(zu(is(u),!1))),Zu(a)&&r(zu(is(a),!0))}return o}(as(t,n))}return{container:J(t),offset:J(n),toRange:function(){var e=Lu(t.ownerDocument);return e.setStart(t,n),e.setEnd(t,n),e},getClientRects:r,isVisible:function(){return 0<r().length},isAtStart:function(){return ts(t),0===n},isAtEnd:function(){return ts(t)?n>=t.data.length:n>=t.childNodes.length},isEqual:function(e){return e&&t===e.container()&&n===e.offset()},getNode:function(e){return os(t,e?n-1:n)}}};function us(e,t){jn(t)&&0===t.data.length&&e.remove(t)}function ss(e,t,n){var r,o,i,a,u,s,c;$n(n)?(i=e,a=t,s=ve.from((u=n).firstChild),c=ve.from(u.lastChild),a.insertNode(u),s.each(function(e){return us(i,e.previousSibling)}),c.each(function(e){return us(i,e.nextSibling)})):(r=e,t.insertNode(o=n),us(r,o.previousSibling),us(r,o.nextSibling))}function cs(t){return function(e){return t===e}}function ls(e){var t,r,n,o;return(uc(e)?"text()":e.nodeName.toLowerCase())+"["+(r=fc(lc(t=e)),n=ge(r,cs(t),t),o=me(r=r.slice(0,n+1),function(e,t,n){return uc(t)&&uc(r[n-1])&&e++,e},0),ge(r=fe(r,on([t.nodeName])),cs(t),t)-o)+"]"}function fs(e,t){var n,r,o,i=[],a=t.container(),u=t.offset();return uc(a)?n=function(e,t){for(;(e=e.previousSibling)&&uc(e);)t+=e.data.length;return t}(a,u):(u>=(r=a.childNodes).length?(n="after",u=r.length-1):n="before",a=r[u]),i.push(ls(a)),o=fe(function(e,t){var n=[];for(t=t.parentNode;t!==e;t=t.parentNode)n.push(t);return n}(e,a),s(sn)),(i=i.concat(le(o,ls))).reverse().join("/")+","+n}function ds(e,t){if(!t)return null;var n=t.split(","),r=n[0].split("/"),o=1<n.length?n[1]:"before",i=me(r,function(e,t){var n,r,o,i,a=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t);return a?("text()"===a[1]&&(a[1]="#text"),n=e,r=a[1],o=parseInt(a[2],10),i=fe(i=fc(n),function(e,t){return!uc(e)||!uc(i[t-1])}),(i=fe(i,on([r])))[o]):null},e);return i?uc(i)?function(e,t){for(var n,r=e,o=0;uc(r);){if(n=r.data.length,o<=t&&t<=o+n){e=r,t-=o;break}if(!uc(r.nextSibling)){e=r,t=n;break}o+=n,r=r.nextSibling}return uc(e)&&t>e.data.length&&(t=e.data.length),as(e,t)}(i,parseInt(o,10)):(o="after"===o?cc(i)+1:cc(i),as(i.parentNode,o)):null}function ms(e,t,n,r,o){var i,a=r[o?"startContainer":"endContainer"],u=r[o?"startOffset":"endOffset"],s=[],c=0,l=e.getRoot();for(jn(a)?s.push(n?function(e,t,n){for(var r=e(t.data.slice(0,n)).length,o=t.previousSibling;o&&jn(o);o=o.previousSibling)r+=e(o.data).length;return r}(t,a,u):u):(u>=(i=a.childNodes).length&&i.length&&(c=1,u=Math.max(0,i.length-1)),s.push(e.nodeIndex(i[u],n)+c));a&&a!==l;a=a.parentNode)s.push(e.nodeIndex(a,n));return s}function gs(e,t,n){var r=0;return Et.each(e.select(t),function(e){if("all"!==e.getAttribute("data-mce-bogus"))return e!==n&&void r++}),r}function ps(e,t){var n,r=t?"start":"end",o=e[r+"Container"],i=e[r+"Offset"];zn(o)&&"TR"===o.nodeName&&(o=(n=o.childNodes)[Math.min(t?i:i-1,n.length-1)])&&(i=t?0:o.childNodes.length,e["set"+(t?"Start":"End")](o,i))}function hs(e){return ps(e,!0),ps(e,!1),e}function vs(e,t){var n;return zn(e)&&(e=Bu(e,t),dc(e))?e:Ir(e)?(n=(e=jn(e)&&Pr(e)?e.parentNode:e).previousSibling,dc(n)?n:(n=e.nextSibling,dc(n)?n:void 0)):void 0}function bs(e,t,n){var r=n.getNode(),o=r?r.nodeName:null,i=n.getRng();if(dc(r)||"IMG"===o)return{name:o,index:gs(n.dom,o,r)};var a,u,s,c,l,f,d,m=vs((a=i).startContainer,a.startOffset)||vs(a.endContainer,a.endOffset);return m?{name:o=m.tagName,index:gs(n.dom,o,m)}:(f=(s=n).dom,(d={}).start=ms(f,u=e,c=t,l=i,!0),s.isCollapsed()||(d.end=ms(f,u,c,l,!1)),Hr(l)&&(d.isFakeCaret=!0),d)}function ys(e,t,n){var r={"data-mce-type":"bookmark",id:t,style:"overflow:hidden;line-height:0px"};return n?e.create("span",r,"&#xFEFF;"):e.create("span",r)}function Cs(e,t){var n=e.dom,r=e.getRng(),o=n.uniqueId(),i=e.isCollapsed(),a=e.getNode(),u=a.nodeName;if("IMG"===u)return{name:u,index:gs(n,u,a)};var s=hs(r.cloneRange());return i||(s.collapse(!1),ss(n,s,ys(n,o+"_end",t))),(r=hs(r)).collapse(!0),ss(n,r,ys(n,o+"_start",t)),e.moveToBookmark({id:o,keep:!0}),{id:o}}function xs(e,t,n){var r=e.getParam(t,n);return-1===r.indexOf("=")?r:ue(e.getParam(t,"","hash"),e.id).getOr(n)}function ws(e){return e.getParam("content_security_policy","")}function Ss(e){if(e.getParam("force_p_newlines",!1))return"p";var t=e.getParam("forced_root_block","p");return!1===t?"":!0===t?"p":t}function Es(e){return e.getParam("forced_root_block_attrs",{})}function Ns(e){return e.getParam("automatic_uploads",!0,"boolean")}function ks(e){return e.getParam("icons","","string")}function _s(e){return e.getParam("referrer_policy","","string")}function As(e){return e.getParam("language","en","string")}function Rs(e){return e.getParam("indent_use_margin",!1)}function Ds(e){var t=e.getParam("font_css",[]);return S(t)?t:T(t.split(","),Je)}function Ts(e){var t=e.getParam("object_resizing");return!1!==t&&!xt.iOS&&(X(t)?t:"table,img,figure.image,div,video,iframe")}function Os(e){return e.getParam("event_root")}function Bs(e){return e.getParam("theme")}function Ps(e){return!1!==e.getParam("inline_boundaries")}function Ls(e){return e.getParam("plugins","","string")}function Is(e){var t=e.parentNode;t&&t.removeChild(e)}function Ms(e){var t=wo(e);return{count:e.length-t.length,text:t}}function Fs(e){for(var t;-1!==(t=e.data.lastIndexOf(Co));)e.deleteData(t,1)}function Us(e,t){return vc(e),t}function zs(e,t){var n,r=t.container(),o=(-1===(n=_(xe(r.childNodes),e))?ve.none():ve.some(n)).map(function(e){return e<t.offset()?as(r,t.offset()-1):t}).getOr(t);return vc(e),o}function Hs(e,t){return as.isTextPosition(t)?(r=t,hc(n=e)&&r.container()===n?(a=Ms((o=n).data.substr(0,(i=r).offset())),u=Ms(o.data.substr(i.offset())),0<(a.text+u.text).length?(Fs(o),as(o,i.offset()-a.count)):i):Us(n,r)):(s=e,((c=t).container()===s.parentNode?zs:Us)(s,c));var n,r,o,i,a,u,s,c}function js(e,t,n){var r,o,i,a=_u(t.getBoundingClientRect(),n),u="BODY"===e.tagName?(r=e.ownerDocument.documentElement,o=e.scrollLeft||r.scrollLeft,e.scrollTop||r.scrollTop):(i=e.getBoundingClientRect(),o=e.scrollLeft-i.left,e.scrollTop-i.top);a.left+=o,a.right+=o,a.top+=u,a.bottom+=u,a.width=1;var s=t.offsetWidth-t.clientWidth;return 0<s&&(n&&(s*=-1),a.left+=s,a.right+=s),a}function Vs(e,i,a,u){function s(){!function(){for(var e=hu(Nt.fromDom(i),"*[contentEditable=false],video,audio,embed,object"),t=0;t<e.length;t++){var n,r=e[t].dom,o=r.previousSibling;ko(o)&&(1===(n=o.data).length?o.parentNode.removeChild(o):o.deleteData(n.length-1,1)),o=r.nextSibling,No(o)&&(1===(n=o.data).length?o.parentNode.removeChild(o):o.deleteData(0,1))}}(),l&&(vc(l),l=null),f.on(function(e){Wa(e.caret).remove(),f.clear()}),c&&(_r.clearInterval(c),c=void 0)}var c,l,f=cu(),t=Ss(e),d=0<t.length?t:"p";return{show:function(e,t){var n;if(s(),xc(t))return null;if(!a(t))return l=function(e,t){var n=e.ownerDocument.createTextNode(Co),r=e.parentNode;if(t){if(o=e.previousSibling,Eo(o)){if(Ir(o))return o;if(ko(o))return o.splitText(o.data.length-1)}r.insertBefore(n,e)}else{var o=e.nextSibling;if(Eo(o)){if(Ir(o))return o;if(No(o))return o.splitText(1),o}e.nextSibling?r.insertBefore(n,e.nextSibling):r.appendChild(n)}return n}(t,e),n=t.ownerDocument.createRange(),wc(l.nextSibling)?(n.setStart(l,0),n.setEnd(l,0)):(n.setStart(l,1),n.setEnd(l,1)),n;l=function(e,t,n){var r,o=t.ownerDocument.createElement(e);o.setAttribute("data-mce-caret",n?"before":"after"),o.setAttribute("data-mce-bogus","all"),o.appendChild(((r=document.createElement("br")).setAttribute("data-mce-bogus","1"),r));var i=t.parentNode;return n?i.insertBefore(o,t):t.nextSibling?i.insertBefore(o,t.nextSibling):i.appendChild(o),o}(d,t,e);var r=js(i,t,e);Wa(l).css("top",r.top);var o=Wa('<div class="mce-visual-caret" data-mce-bogus="all"></div>').css(_e({},r)).appendTo(i)[0];return f.set({caret:o,element:t,before:e}),e&&Wa(o).addClass("mce-visual-caret-before"),c=_r.setInterval(function(){u()?Wa("div.mce-visual-caret",i).toggleClass("mce-visual-caret-hidden"):Wa("div.mce-visual-caret",i).addClass("mce-visual-caret-hidden")},500),(n=t.ownerDocument.createRange()).setStart(l,0),n.setEnd(l,0),n},hide:s,getCss:function(){return".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}"},reposition:function(){f.on(function(e){var t=js(i,e.element,e.before);Wa(e.caret).css(_e({},t))})},destroy:function(){return _r.clearInterval(c)}}}function qs(){return bc.isIE()||bc.isEdge()||bc.isFirefox()}function $s(e){return wc(e)||cn(e)&&qs()}function Ws(e,t){for(var n;n=e(t);)if(!_c(n))return n;return null}function Ks(e,t,n,r,o){var i=new Rr(e,r),a=Sc(e)||_c(e);if(t<0){if(a&&n(e=Ws(i.prev.bind(i),!0)))return e;for(;e=Ws(i.prev.bind(i),o);)if(n(e))return e}if(0<t){if(a&&n(e=Ws(i.next.bind(i),!0)))return e;for(;e=Ws(i.next.bind(i),o);)if(n(e))return e}return null}function Xs(e,t){for(;e&&e!==t;){if(Nc(e))return e;e=e.parentNode}return null}function Ys(e,t,n){return Xs(e.container(),n)===Xs(t.container(),n)}function Gs(e,t){if(!t)return null;var n=t.container(),r=t.offset();return Ac(n)?n.childNodes[r+e]:null}function Js(e,t){var n=t.ownerDocument.createRange();return e?(n.setStartBefore(t),n.setEndBefore(t)):(n.setStartAfter(t),n.setEndAfter(t)),n}function Qs(e,t,n){for(var r,o,i=e?"previousSibling":"nextSibling";n&&n!==t;){var a=n[i];if(kc(a)&&(a=a[i]),Sc(a)||Ec(a)){if(o=n,Xs(a,r=t)===Xs(o,r))return a;break}if(Rc(a))break;n=n.parentNode}return null}function Zs(e,t,n){var r,o=A(Qs,!0,t),i=A(Qs,!1,t),a=n.startContainer,u=n.startOffset;if(Pr(a)){var s=(a=Ac(a)?a:a.parentNode).getAttribute("data-mce-caret");if("before"===s&&$s(r=a.nextSibling))return Dc(r);if("after"===s&&$s(r=a.previousSibling))return Tc(r)}if(!n.collapsed)return n;if(jn(a)){if(kc(a)){if(1===e){if(r=i(a))return Dc(r);if(r=o(a))return Tc(r)}if(-1===e){if(r=o(a))return Tc(r);if(r=i(a))return Dc(r)}return n}if(ko(a)&&u>=a.data.length-1)return 1===e&&(r=i(a))?Dc(r):n;if(No(a)&&u<=1)return-1===e&&(r=o(a))?Tc(r):n;if(u===a.data.length)return(r=i(a))?Dc(r):n;if(0===u)return(r=o(a))?Tc(r):n}return n}function ec(e,t){return ve.from(Gs(e?0:-1,t)).filter(Sc)}function tc(e,t,n){var r=Zs(e,t,n);return-1===e?as.fromRangeStart(r):as.fromRangeEnd(r)}function nc(e){return ve.from(e.getNode()).map(Nt.fromDom)}function rc(e,t){for(;t=e(t);)if(t.isVisible())return t;return t}function oc(e,t){var n=Ys(e,t);return!(n||!Wn(e.getNode()))||n}as.fromRangeStart=function(e){return as(e.startContainer,e.startOffset)},as.fromRangeEnd=function(e){return as(e.endContainer,e.endOffset)},as.after=function(e){return as(e.parentNode,rs(e)+1)},as.before=function(e){return as(e.parentNode,rs(e))},as.isAbove=function(e,t){return dn(Q(t.getClientRects()),Z(e.getClientRects()),Ru).getOr(!1)},as.isBelow=function(e,t){return dn(Z(t.getClientRects()),Q(e.getClientRects()),Du).getOr(!1)},as.isAtStart=function(e){return!!e&&e.isAtStart()},as.isAtEnd=function(e){return!!e&&e.isAtEnd()},as.isTextPosition=function(e){return!!e&&jn(e.container())},as.isElementPosition=function(e){return!1===as.isTextPosition(e)};var ic,ac,uc=jn,sc=sn,cc=Ja.nodeIndex,lc=function(e){var t=e.parentNode;return sc(t)?lc(t):t},fc=function(e){return e?me(e.childNodes,function(e,t){return sc(t)&&"BR"!==t.nodeName?e=e.concat(fc(t)):e.push(t),e},[]):[]},dc=Yn,mc=A(bs,u,!0),gc=Ja.DOM,pc=zn,hc=jn,vc=function(e){pc(e)&&Ir(e)&&(Mr(e)?e.removeAttribute("data-mce-caret"):Is(e)),hc(e)&&(Fs(e),0===e.data.length&&Is(e))},bc=dt().browser,yc=Yn,Cc=Jn,xc=Gn,wc=function(e){return yc(e)||Cc(e)},Sc=Yn,Ec=Jn,Nc=an("display","block table table-cell table-caption list-item"),kc=Ir,_c=Pr,Ac=zn,Rc=jr,Dc=A(Js,!0),Tc=A(Js,!1);function Oc(e,t){return e.hasChildNodes()&&t<e.childNodes.length?e.childNodes[t]:null}function Bc(e,t){if(0<e){if(Kl(t.previousSibling)&&!ql(t.previousSibling))return as.before(t);if(ql(t))return as(t,0)}if(e<0){if(Kl(t.nextSibling)&&!ql(t.nextSibling))return as.after(t);if(ql(t))return as(t,t.data.length)}return e<0&&!Wl(t)?as.after(t):as.before(t)}function Pc(t){return{next:function(e){return Yl(ic.Forwards,e,t)},prev:function(e){return Yl(ic.Backwards,e,t)}}}function Lc(e){return as.isTextPosition(e)?0===e.offset():jr(e.getNode())}function Ic(e){if(as.isTextPosition(e)){var t=e.container();return e.offset()===t.data.length}return jr(e.getNode(!0))}function Mc(e,t){return!as.isTextPosition(e)&&!as.isTextPosition(t)&&e.getNode()===t.getNode(!0)}function Fc(o,i,a){return Gl(o,i,a).bind(function(e){return Ys(a,e,i)&&(t=a,n=e,o?!Mc(t,n)&&(as.isTextPosition(r=t)||!Wn(r.getNode()))&&Ic(t)&&Lc(n):!Mc(n,t)&&Lc(t)&&Ic(n))?Gl(o,i,e):ve.some(e);var t,n,r})}function Uc(e,t){var n,r,o,i,a,u=e?t.firstChild:t.lastChild;return jn(u)?ve.some(as(u,e?0:u.data.length)):u?jr(u)?ve.some(e?as.before(u):Wn(a=u)?as.before(a):as.after(a)):(r=t,o=u,i=(n=e)?as.before(o):as.after(o),Gl(n,r,i)):ve.none()}function zc(e){return zn(e)&&e.id===nf}function Hc(e,t){for(;t&&t!==e;){if(t.id===nf)return t;t=t.parentNode}return null}function jc(e){return Et.isArray(e.start)}function Vc(e,t){return zn(t)&&e.isBlock(t)&&!t.innerHTML&&!xt.ie&&(t.innerHTML='<br data-mce-bogus="1" />'),t}function qc(e,t,n){return!1===t.hasChildNodes()&&Hc(e,t)&&(o=n,i=(r=t).ownerDocument.createTextNode(Co),r.appendChild(i),o.setStart(i,0),o.setEnd(i,0),1);var r,o,i}function $c(e,t,n,r){var o,i,a,u,s=n[t?"start":"end"],c=e.getRoot();if(s){for(a=s[0],i=c,o=s.length-1;1<=o;o--){if(u=i.childNodes,qc(c,i,r))return 1;if(s[o]>u.length-1)return qc(c,i,r)||function(t){return tf(i).fold(R,function(e){return t.setStart(e.container(),e.offset()),t.setEnd(e.container(),e.offset()),!0})}(r);i=u[s[o]]}3===i.nodeType&&(a=Math.min(s[0],i.nodeValue.length)),1===i.nodeType&&(a=Math.min(s[0],i.childNodes.length)),t?r.setStart(i,a):r.setEnd(i,a)}return 1}function Wc(e){return jn(e)&&0<e.data.length}function Kc(e,t,n){var r,o,i,a,u,s,c=e.get(n.id+"_"+t),l=n.keep;if(c){if(r=c.parentNode,o="start"===t?l?c.hasChildNodes()?(r=c.firstChild,1):Wc(c.nextSibling)?(r=c.nextSibling,0):Wc(c.previousSibling)?(r=c.previousSibling,c.previousSibling.data.length):(r=c.parentNode,e.nodeIndex(c)+1):e.nodeIndex(c):l?c.hasChildNodes()?(r=c.firstChild,1):Wc(c.previousSibling)?(r=c.previousSibling,c.previousSibling.data.length):(r=c.parentNode,e.nodeIndex(c)):e.nodeIndex(c),u=r,s=o,!l){for(a=c.previousSibling,i=c.nextSibling,Et.each(Et.grep(c.childNodes),function(e){jn(e)&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});c=e.get(n.id+"_"+t);)e.remove(c,!0);a&&i&&a.nodeType===i.nodeType&&jn(a)&&!xt.opera&&(o=a.nodeValue.length,a.appendData(i.nodeValue),e.remove(i),u=a,s=o)}return ve.some(as(u,s))}return ve.none()}function Xc(t,e){!function(e,t){var n,r,o,i,a,u,s,c,l,f,d,m,g=e.dom;if(t){if(jc(t))return d=t,m=(f=g).createRng(),$c(f,!0,d,m)&&$c(f,!1,d,m)?ve.some(m):ve.none();if(X(t.start))return ve.some((s=t,c=(u=g).createRng(),l=ds(u.getRoot(),s.start),c.setStart(l.container(),l.offset()),l=ds(u.getRoot(),s.end),c.setEnd(l.container(),l.offset()),c));if(Ne(t,"id"))return dn(a=Kc(o=g,"start",i=t),Kc(o,"end",i).or(a),function(e,t){var n=o.createRng();return n.setStart(Vc(o,e.container()),e.offset()),n.setEnd(Vc(o,t.container()),t.offset()),n});if(Ne(t,"name"))return n=g,ve.from(n.select((r=t).name)[r.index]).map(function(e){var t=n.createRng();return t.selectNode(e),t});if(Ne(t,"rng"))return ve.some(t.rng)}return ve.none()}(t,e).each(function(e){t.setRng(e)})}function Yc(e){return zn(e)&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type")}function Gc(e){return""!==e&&-1!==" \f\n\r\t\v".indexOf(e)}function Jc(e){return!Gc(e)&&!of(e)}function Qc(e){return e.nodeType}function Zc(e,t,n){var r,o=n.startOffset,i=n.startContainer;if((i!==n.endContainer||!(r=i.childNodes[o])||!/^(IMG)$/.test(r.nodeName))&&zn(i)){var a=i.childNodes,u=void 0;o<a.length?(i=a[o],u=new Rr(i,e.getParent(i,e.isBlock))):(i=a[a.length-1],(u=new Rr(i,e.getParent(i,e.isBlock))).next(!0));for(var s=u.current();s;s=u.next())if(jn(s)&&!af(s))return n.setStart(s,0),t.setRng(n),0}}function el(e,t,n){if(e){var r=t?"nextSibling":"previousSibling";for(e=n?e:e[r];e;e=e[r])if(zn(e)||!af(e))return e}}function tl(e,t){return Qc(t)&&(t=t.nodeName),!!e.schema.getTextBlockElements()[t.toLowerCase()]}function nl(e,t,n){return e.schema.isValidChild(t,n)}function rl(e,n){return y(e)?e=e(n):V(n)&&(e=e.replace(/%(\w+)/g,function(e,t){return n[t]||e})),e}function ol(e,t){return e=""+((e=e||"").nodeName||e),t=""+((t=t||"").nodeName||t),e.toLowerCase()===t.toLowerCase()}function il(e,t,n){return"color"!==n&&"backgroundColor"!==n||(t=e.toHex(t)),"fontWeight"===n&&700===t&&(t="bold"),""+("fontFamily"===n?t.replace(/[\'\"]/g,"").replace(/,\s+/g,","):t)}function al(e,t,n){return il(e,e.getStyle(t,n),n)}function ul(t,e){var n;return t.getParent(e,function(e){return(n=t.getStyle(e,"text-decoration"))&&"none"!==n}),n}function sl(e,t,n){return e.getParents(t,n,e.getRoot())}function cl(e,t){return F(e.formatter.get(t),function(t){function o(e){return 1<e.length&&"%"===e.charAt(0)}return F(["styles","attributes"],function(e){return ue(t,e).exists(function(e){var n,r;return F(S(e)?e:(n=u,r=[],ne(e,function(e,t){r.push(n(e,t))}),r),o)})})})}function ll(e){return se(e,"block")}function fl(e){return se(e,"selector")}function dl(e){return se(e,"inline")}function ml(e){return fl(e)&&!1!==e.expand&&!dl(e)}function gl(e,t){for(var n=t;n;){if(zn(n)&&e.getContentEditable(n))return"false"===e.getContentEditable(n)?n:t;n=n.parentNode}return t}function pl(e,t,n,r){for(var o=t.data,i=n;e?0<=i:i<o.length;e?i--:i++)if(r(o.charAt(i)))return e?i+1:i;return-1}function hl(e,t,n){return pl(e,t,n,function(e){return of(e)||Gc(e)})}function vl(e,t,n){return pl(e,t,n,Jc)}function bl(i,e,t,n,a,r){function o(e,t,n){var r=Nu(i),o=a?r.backwards:r.forwards;return ve.from(o(e,t,function(e,t){return uf(e.parentNode)?-1:n(a,u=e,t)},s))}var u,s=i.getParent(t,i.isBlock)||e;return o(t,n,hl).bind(function(e){return r?o(e.container,e.offset+(a?-1:0),vl):ve.some(e)}).orThunk(function(){return u?ve.some({container:u,offset:a?0:u.length}):ve.none()})}function yl(e,t,n,r,o){jn(r)&&Pe(r.data)&&r[o]&&(r=r[o]);for(var i=sf(e,r),a=0;a<i.length;a++)for(var u=0;u<t.length;u++){var s=t[u];if((!V(s.collapsed)||s.collapsed===n.collapsed)&&fl(s)&&e.is(i[a],s.selector))return i[a]}return r}function Cl(t,e,n,r){var o,i=n,a=t.dom,u=a.getRoot(),s=e[0];if((i=ll(s)?s.wrapper?null:a.getParent(n,s.block,u):i)||(o=a.getParent(n,"LI,TD,TH"),i=a.getParent(jn(n)?n.parentNode:n,function(e){return e!==u&&lf(t,e)},o)),!(i=i&&ll(s)&&s.wrapper&&sf(a,i,"ul,ol").reverse()[0]||i))for(i=n;i[r]&&!a.isBlock(i[r])&&!ol(i=i[r],"br"););return i||n}function xl(e,t,n,r,o){var i,a=n,u=o?"previousSibling":"nextSibling",s=e.getRoot();if(jn(n)&&!cf(n)&&(o?0<r:r<n.data.length))return n;for(;;){if(!t[0].block_expand&&e.isBlock(a))return a;for(var c=a[u];c;c=c[u]){var l=jn(c)&&!ff(e,s,c,u);if(!uf(c)&&(!Wn(i=c)||!i.getAttribute("data-mce-bogus")||i.nextSibling)&&!cf(c,l))return a}if(a===s||a.parentNode===s){n=a;break}a=a.parentNode}return n}function wl(e){return uf(e.parentNode)||uf(e)}function Sl(e,t,n,r){void 0===r&&(r=!1);var o=t.startContainer,i=t.startOffset,a=t.endContainer,u=t.endOffset,s=e.dom,c=n[0];return zn(o)&&o.hasChildNodes()&&(o=Bu(o,i),jn(o)&&(i=0)),zn(a)&&a.hasChildNodes()&&(a=Bu(a,t.collapsed?u:u-1),jn(a)&&(u=a.nodeValue.length)),o=gl(s,o),a=gl(s,a),wl(o)&&(o=uf(o)?o:o.parentNode,o=t.collapsed?o.previousSibling||o:o.nextSibling||o,jn(o)&&(i=t.collapsed?o.length:0)),wl(a)&&(a=uf(a)?a:a.parentNode,a=t.collapsed?a.nextSibling||a:a.previousSibling||a,jn(a)&&(u=t.collapsed?0:a.length)),t.collapsed&&(bl(s,e.getBody(),o,i,!0,r).each(function(e){var t=e.container,n=e.offset;o=t,i=n}),bl(s,e.getBody(),a,u,!1,r).each(function(e){var t=e.container,n=e.offset;a=t,u=n})),(dl(c)||c.block_expand)&&(dl(c)&&jn(o)&&0!==i||(o=xl(s,n,o,i,!0)),dl(c)&&jn(a)&&u!==a.nodeValue.length||(a=xl(s,n,a,u,!1))),ml(c)&&(o=yl(s,n,t,o,"previousSibling"),a=yl(s,n,t,a,"nextSibling")),(ll(c)||fl(c))&&(o=Cl(e,n,o,"previousSibling"),a=Cl(e,n,a,"nextSibling"),ll(c)&&(s.isBlock(o)||(o=xl(s,n,o,i,!0)),s.isBlock(a)||(a=xl(s,n,a,u,!1)))),zn(o)&&(i=s.nodeIndex(o),o=o.parentNode),zn(a)&&(u=s.nodeIndex(a)+1,a=a.parentNode),{startContainer:o,startOffset:i,endContainer:a,endOffset:u}}function El(n,e,u){function s(e){var t=e[0];jn(t)&&t===i&&o>=t.data.length&&e.splice(0,1);var n=e[e.length-1];return 0===a&&0<e.length&&n===l&&jn(n)&&e.splice(e.length-1,1),e}function c(e,t,n){for(var r=[];e&&e!==n;e=e[t])r.push(e);return r}function t(e,t){return n.getParent(e,function(e){return e.parentNode===t},t)}function r(e,t,n){var r=n?"nextSibling":"previousSibling",o=e;for(o.parentNode;o&&o!==t;o=i){var i=o.parentNode,a=c(o===e?o:o[r],r);a.length&&(n||a.reverse(),u(s(a)))}}var o=e.startOffset,i=Bu(e.startContainer,o),a=e.endOffset,l=Bu(e.endContainer,a-1);if(i===l)return u(s([i]));var f=n.findCommonAncestor(i,l);if(n.isChildOf(i,l))return r(i,f,!0);if(n.isChildOf(l,i))return r(l,f);var d=t(i,f)||i,m=t(l,f)||l;r(i,d,!0);var g=c(d===i?d:d.nextSibling,"nextSibling",m===l?m.nextSibling:m);g.length&&u(s(g)),r(l,m)}function Nl(e){var t=[];if(e)for(var n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t}function kl(e,t){var n=hu(t,"td[data-mce-selected],th[data-mce-selected]");return 0<n.length?n:U(H(e,function(e){var t=Ou(e);return t?[Nt.fromDom(t)]:[]}),ho)}function _l(e){return kl(Nl(e.selection.getSel()),Nt.fromDom(e.getBody()))}function Al(e,t){return hr(e,"table",t)}function Rl(o,e){return dn((r=e.startContainer,i=e.startOffset,jn(r)?0===i?ve.some(Nt.fromDom(r)):ve.none():ve.from(r.childNodes[i]).map(Nt.fromDom)),(t=e.endContainer,n=e.endOffset,jn(t)?n===t.data.length?ve.some(Nt.fromDom(t)):ve.none():ve.from(t.childNodes[n-1]).map(Nt.fromDom)),function(e,t){var n=M(df(o),A(je,e)),r=M(mf(o),A(je,t));return n.isSome()&&r.isSome()}).getOr(!1);var t,n,r,i}function Dl(e,t,n,r){var o=n,i=new Rr(n,o),a=ae(e.schema.getMoveCaretBeforeOnEnterElements(),function(e,t){return!D(["td","th","table"],t.toLowerCase())});do{if(jn(n)&&0!==Et.trim(n.nodeValue).length)return r?t.setStart(n,0):t.setEnd(n,n.nodeValue.length),0;if(a[n.nodeName])return r?t.setStartBefore(n):"BR"===n.nodeName?t.setEndBefore(n):t.setEndAfter(n),0}while(n=r?i.next():i.prev());"BODY"===o.nodeName&&(r?t.setStart(o,0):t.setEnd(o,o.childNodes.length))}function Tl(e){var t=e.selection.getSel();return t&&0<t.rangeCount}function Ol(r,o){var e=_l(r);0<e.length?Y(e,function(e){var t=e.dom,n=r.dom.createRng();n.setStartBefore(t),n.setEndAfter(t),o(n,!0)}):o(r.selection.getRng(),!1)}function Bl(e,t,n){var r=Cs(e,t);n(r),e.moveToBookmark(r)}function Pl(e){return gf.get(e)}function Ll(e,t,n,r){var o=t.uid,i=void 0===o?yu("mce-annotation"):o,a=function(e,t){var n={};for(o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.indexOf(o)<0&&(n[o]=e[o]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols)for(var r=0,o=Object.getOwnPropertySymbols(e);r<o.length;r++)t.indexOf(o[r])<0&&Object.prototype.propertyIsEnumerable.call(e,o[r])&&(n[o[r]]=e[o[r]]);return n}(t,["uid"]),u=Nt.fromTag("span",e);gu(u,ju()),pn(u,""+qu(),i),pn(u,""+Vu(),n);var s,c=r(i,a),l=c.attributes,f=c.classes,d=void 0===f?[]:f;return hn(u,void 0===l?{}:l),s=u,Y(d,function(e){gu(s,e)}),u}function Il(u,e,t,n,r){function s(){d.clear()}function c(e){Y(e,o)}var l=[],f=Ll(u.getDoc(),r,t,n),d=cu(),o=function(e){var t,n,r,o,i,a;switch(r=u,i="span",a=kt(o=e),Ot(o).fold(function(){return"skipping"},function(e){return"br"===a||_n(n=o)&&Pl(n)===Co?"valid":kn(t=o)&&pu(t,ju())?"existing":zc(o.dom)?"caret":nl(r,i,a)&&nl(r,kt(e),i)?"valid":"invalid-child";var t,n})){case"invalid-child":s(),c(Dn(e)),s();break;case"valid":qt(t=e,n=d.get().getOrThunk(function(){var e=wu(f);return l.push(e),d.set(e),e})),Pn(n,t)}};return El(u.dom,e,function(e){s(),c(T(e,Nt.fromDom))}),l}function Ml(o){var n,e,r,i=(n={},{register:function(e,t){n[e]={name:e,settings:t}},lookup:function(e){return ue(n,e).map(function(e){return e.settings})}});r=i,(e=o).on("init",function(){e.serializer.addNodeFilter("span",function(e){Y(e,function(t){ve.from(t.attr(Vu())).bind(r.lookup).each(function(e){!1===e.persistent&&t.unwrap()})})})});var a=bu(o);return{register:function(e,t){i.register(e,t)},annotate:function(t,n){i.lookup(t).each(function(e){var u,s,c,l;s=t,c=e,l=n,(u=o).undoManager.transact(function(){var e,t,n,r,o=u.selection,i=o.getRng(),a=0<_l(u).length;i.collapsed&&!a&&(n=Sl(e=u,t=i,[{inline:"span"}]),t.setStart(n.startContainer,n.startOffset),t.setEnd(n.endContainer,n.endOffset),e.selection.setRng(t)),o.getRng().collapsed&&!a?(Cu(r=Ll(u.getDoc(),l,s,c.decorate),yo),o.getRng().insertNode(r.dom),o.select(r.dom)):Bl(o,!1,function(){Ol(u,function(e){Il(u,e,s,c.decorate,l)})})})})},annotationChanged:function(e,t){a.addListener(e,t)},remove:function(e){vu(o,ve.some(e)).each(function(e){Y(e.elements,Yt)})},getAll:function(e){var t,n,r;return re((t=e,n=hu(Nt.fromDom(o.getBody()),"["+Vu()+'="'+t+'"]'),r={},Y(n,function(e){var t=vn(e,qu()),n=ue(r,t).getOr([]);r[t]=n.concat([e])}),r),function(e){return T(e,function(e){return e.dom})})}}}function Fl(e){return{getBookmark:A(rf,e),moveToBookmark:A(Xc,e)}}(ac=ic=ic||{})[ac.Backwards=-1]="Backwards",ac[ac.Forwards=1]="Forwards";function Ul(e){return Oo(e)||!!Lo(t=e)&&!0!==L(xe(t.getElementsByTagName("*")),function(e,t){return e||_o(t)},!1);var t}var zl,Hl,jl,Vl=Yn,ql=jn,$l=zn,Wl=Wn,Kl=jr,Xl=Vr,Yl=function(e,t,n){var r,o,i;if(!$l(n)||!t)return null;if(t.isEqual(as.after(n))&&n.lastChild){if(i=as.after(n.lastChild),e<0&&Kl(n.lastChild)&&$l(n.lastChild))return Wl(n.lastChild)?as.before(n.lastChild):i}else i=t;var a,u,s,c=i.container(),l=i.offset();if(ql(c)){if(e<0&&0<l)return as(c,--l);if(0<e&&l<c.length)return as(c,++l);r=c}else{if(e<0&&0<l&&(f=Oc(c,l-1),Kl(f)))return!Ul(f)&&(o=Ks(f,e,Xl,f))?ql(o)?as(o,o.data.length):as.after(o):ql(f)?as(f,f.data.length):as.before(f);if(0<e&&l<c.childNodes.length&&(f=Oc(c,l),Kl(f)))return Wl(f)?(a=n,(s=(u=f).nextSibling)&&Kl(s)?ql(s)?as(s,0):as.before(s):Yl(ic.Forwards,as.after(u),a)):!Ul(f)&&(o=Ks(f,e,Xl,f))?ql(o)?as(o,0):as.before(o):ql(f)?as(f,0):as.after(f);r=f||i.getNode()}if((0<e&&i.isAtEnd()||e<0&&i.isAtStart())&&(r=Ks(r,e,w,n,!0),Xl(r,n)))return Bc(e,r);var f=Ks(r,e,Xl,n),d=pe(U(function(e,t){for(var n=[];e&&e!==t;)n.push(e),e=e.parentNode;return n}(c,n),Vl));return!d||f&&d.contains(f)?f?Bc(e,f):null:0<e?as.after(d):as.before(d)},Gl=function(e,t,n){var r=Pc(t);return ve.from(e?r.next(n):r.prev(n))},Jl=function(t,n,e,r){return Fc(t,n,e).bind(function(e){return r(e)?Jl(t,n,e,r):ve.some(e)})},Ql=A(Gl,!0),Zl=A(Gl,!1),ef=A(Uc,!0),tf=A(Uc,!1),nf="_mce_caret",rf=function(e,t,n){return 2===t?bs(wo,n,e):3===t?(o=(r=e).getRng(),{start:fs(r.dom.getRoot(),as.fromRangeStart(o)),end:fs(r.dom.getRoot(),as.fromRangeEnd(o))}):t?{rng:e.getRng()}:Cs(e,!1);var r,o},of=(zl=yo,function(e){return zl===e}),af=function(e,t){return void 0===t&&(t=!1),!(!V(e)||!jn(e))&&qr(t?e.data.replace(/ /g,"\xa0"):e.data)},uf=Yc,sf=sl,cf=af,lf=tl,ff=function(e,t,n,r){var o=n.parentNode;return!V(n[r])&&(!(o!==t&&!K(o)&&!e.isBlock(o))||ff(e,t,o,r))},df=function(t){return Ft(t).fold(J([t]),function(e){return[t].concat(df(e))})},mf=function(t){return Ut(t).fold(J([t]),function(e){return"br"===kt(e)?Bt(e).map(function(e){return[t].concat(mf(e))}).getOr([]):[t].concat(mf(e))})},gf=(Hl=_n,{get:function(e){if(!Hl(e))throw new Error("Can only get text value of a text node");return jl(e).getOr("")},getOption:jl=function(e){return Hl(e)?ve.from(e.dom.nodeValue):ve.none()},set:function(e,t){if(!Hl(e))throw new Error("Can only set raw text value of a text node");e.dom.nodeValue=t}});function pf(e,t){for(;t&&t!==e;){if(Xn(t)||Yn(t))return t;t=t.parentNode}return null}function hf(t,n,e){if(!e.collapsed){if(xt.browser.isIE()&&e.startOffset===e.endOffset-1&&e.startContainer===e.endContainer){var r=e.startContainer.childNodes[e.startOffset];if(zn(r))return F(r.getClientRects(),function(e){return Tu(e,t,n)})}return F(e.getClientRects(),function(e){return Tu(e,t,n)})}}function vf(e,t,n){return e.fire(t,n)}function bf(e,t,n,r){return e.fire("FormatApply",{format:t,node:n,vars:r})}function yf(e,t,n,r){return e.fire("FormatRemove",{format:t,node:n,vars:r})}function Cf(r,l){function c(e){return e&&("IMG"===e.nodeName||l.dom.is(e,"figure.image"))}function f(e){return Jn(e)||T.hasClass(e,"mce-preview-object")}function n(e){var t=e.target;!function(e,t){if("longpress"!==e.type&&0!==e.type.indexOf("touch"))return c(e.target)&&!hf(e.clientX,e.clientY,t);var n=e.touches[0];return c(e.target)&&!hf(n.clientX,n.clientY,t)}(e,l.selection.getRng())||e.isDefaultPrevented()||l.selection.select(t)}function d(e){return T.is(e,"figure.image")?[e.querySelector("img")]:T.hasClass(e,"mce-preview-object")&&V(e.firstElementChild)?[e,e.firstElementChild]:[e]}function i(e){var t=Ts(l);return!!t&&"false"!==e.getAttribute("data-mce-resize")&&e!==l.getBody()&&(T.hasClass(e,"mce-preview-object")?ze(Nt.fromDom(e.firstElementChild),t):ze(Nt.fromDom(e),t))}function a(e,t,n){V(n)&&Y(d(e),function(e){e.style[t]||!l.schema.isValid(e.nodeName.toLowerCase(),t)?T.setStyle(e,t,n):T.setAttrib(e,t,""+n)})}function m(e,t,n){a(e,"width",t),a(e,"height",n)}function g(e){var t,n,r,o,i,a,u=e.screenX-C,s=e.screenY-x;k=u*b[2]+w,_=s*b[3]+S,k=k<5?5:k,_=_<5?5:_,((c(p)||f(p))&&!1!==l.getParam("resize_img_proportional",!0,"boolean")?!Bf.modifierPressed(e):Bf.modifierPressed(e))&&(L(u)>L(s)?(_=I(k*E),k=I(_/E)):(k=I(_/E),_=I(k*E))),m(h,k,_),t=b.startPos.x+u,n=b.startPos.y+s,T.setStyles(v,{left:t=0<t?t:0,top:n=0<n?n:0,display:"block"}),v.innerHTML=k+" &times; "+_,b[2]<0&&h.clientWidth<=k&&T.setStyle(h,"left",void 0+(w-k)),b[3]<0&&h.clientHeight<=_&&T.setStyle(h,"top",void 0+(S-_)),(u=M.scrollWidth-A)+(s=M.scrollHeight-R)!=0&&T.setStyles(v,{left:t-u,top:n-s}),N||(r=p,o=w,i=S,a="corner-"+b.name,l.fire("ObjectResizeStart",{target:r,width:o,height:i,origin:a}),N=!0)}function o(e){function t(e,t){if(e)do{if(e===t)return 1}while(e=e.parentNode)}var n;N||l.removed||(O(T.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute(D)}),n="mousedown"===e.type?e.target:r.getNode(),t(n=T.$(n).closest("table,img,figure.image,hr,video,span.mce-preview-object")[0],M)&&(s(),t(r.getStart(!0),n)&&t(r.getEnd(!0),n))?z(n):H())}function u(e){return Pf(pf(l.getBody(),e))}function s(){try{l.getDoc().execCommand("enableObjectResizing",!1,"false")}catch(e){}}var p,h,v,b,y,C,x,w,S,E,N,k,_,A,R,D="data-mce-selected",T=l.dom,O=Et.each,B=l.getDoc(),P=document,L=Math.abs,I=Math.round,M=l.getBody(),F={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]},U=function(){var e,t,n,r,o=N;N=!1,o&&(a(p,"width",k),a(p,"height",_)),T.unbind(B,"mousemove",g),T.unbind(B,"mouseup",U),P!==B&&(T.unbind(P,"mousemove",g),T.unbind(P,"mouseup",U)),T.remove(h),T.remove(v),T.remove(y),z(p),o&&(e=p,t=k,n=_,r="corner-"+b.name,l.fire("ObjectResized",{target:e,width:t,height:n,origin:r}),T.setAttrib(p,"style",T.getAttrib(p,"style"))),l.nodeChanged()},z=function(e){j();var t=T.getPos(e,M),a=t.x,u=t.y,n=e.getBoundingClientRect(),s=n.width||n.right-n.left,c=n.height||n.bottom-n.top;p!==e&&(H(),p=e,k=_=0);var r=l.fire("ObjectSelected",{target:e}),o=T.getAttrib(p,D,"1");i(e)&&!r.isDefaultPrevented()?O(F,function(o,i){var e=T.get("mceResizeHandle"+i);e&&T.remove(e),e=T.add(M,"div",{id:"mceResizeHandle"+i,"data-mce-bogus":"all",class:"mce-resizehandle",unselectable:!0,style:"cursor:"+i+"-resize; margin:0; padding:0"}),11===xt.ie&&(e.contentEditable=!1),T.bind(e,"mousedown",function(e){var t,n,r;e.stopImmediatePropagation(),e.preventDefault(),t=e,r=d(p)[0],C=t.screenX,x=t.screenY,w=r.clientWidth,S=r.clientHeight,E=S/w,(b=o).name=i,b.startPos={x:s*o[0]+a,y:c*o[1]+u},A=M.scrollWidth,R=M.scrollHeight,y=T.add(M,"div",{class:"mce-resize-backdrop","data-mce-bogus":"all"}),T.setStyles(y,{position:"fixed",left:"0",top:"0",width:"100%",height:"100%"}),h=f(n=p)?T.create("img",{src:xt.transparentSrc}):n.cloneNode(!0),T.addClass(h,"mce-clonedresizable"),T.setAttrib(h,"data-mce-bogus","all"),h.contentEditable="false",T.setStyles(h,{left:a,top:u,margin:0}),m(h,s,c),h.removeAttribute(D),M.appendChild(h),T.bind(B,"mousemove",g),T.bind(B,"mouseup",U),P!==B&&(T.bind(P,"mousemove",g),T.bind(P,"mouseup",U)),v=T.add(M,"div",{class:"mce-resize-helper","data-mce-bogus":"all"},w+" &times; "+S)}),o.elm=e,T.setStyles(e,{left:s*o[0]+a-e.offsetWidth/2,top:c*o[1]+u-e.offsetHeight/2})}):H(),T.getAttrib(p,D)||p.setAttribute(D,o)},H=function(){j(),p&&p.removeAttribute(D),ne(F,function(e,t){var n=T.get("mceResizeHandle"+t);n&&(T.unbind(n),T.remove(n))})},j=function(){ne(F,function(e){e.elm&&(T.unbind(e.elm),delete e.elm)})};return l.on("init",function(){var e;s(),(xt.browser.isIE()||xt.browser.isEdge())&&(l.on("mousedown click",function(e){var t=e.target,n=t.nodeName;N||!/^(TABLE|IMG|HR)$/.test(n)||u(t)||(2!==e.button&&l.selection.select(t,"TABLE"===n),"mousedown"===e.type&&l.nodeChanged())}),T.bind(M,"mscontrolselect",e=function(e){function t(e){_r.setEditorTimeout(l,function(){return l.selection.select(e)})}if(u(e.target)||Jn(e.target))return e.preventDefault(),void t(e.target);/^(TABLE|IMG|HR)$/.test(e.target.nodeName)&&(e.preventDefault(),"IMG"===e.target.tagName&&t(e.target))}),l.on("remove",function(){return T.unbind(M,"mscontrolselect",e)}));var t=_r.throttle(function(e){l.composing||o(e)});l.on("nodechange ResizeEditor ResizeWindow ResizeContent drop FullscreenStateChanged",t),l.on("keyup compositionend",function(e){p&&"TABLE"===p.nodeName&&t(e)}),l.on("hide blur",H),l.on("contextmenu longpress",n,!0)}),l.on("remove",j),{isResizable:i,showResizeRect:z,hideResizeRect:H,updateResizeRect:o,destroy:function(){p=h=y=null}}}function xf(e){return Xn(e)||Yn(e)}function wf(t,n,r){var o,e,i,a,u,s=r;if(s.caretPositionFromPoint)(e=s.caretPositionFromPoint(t,n))&&((o=r.createRange()).setStart(e.offsetNode,e.offset),o.collapse(!0));else if(s.caretRangeFromPoint)o=s.caretRangeFromPoint(t,n);else if(s.body.createTextRange){o=s.body.createTextRange();try{o.moveToPoint(t,n),o.collapse(!0)}catch(e){o=function(e,n,t){var r,o=t.elementFromPoint(e,n),i=t.body.createTextRange();if(o&&"HTML"!==o.tagName||(o=t.body),i.moveToElementText(o),0<(r=(r=Et.toArray(i.getClientRects())).sort(function(e,t){return(e=Math.abs(Math.max(e.top-n,e.bottom-n)))-Math.abs(Math.max(t.top-n,t.bottom-n))})).length){n=(r[0].bottom+r[0].top)/2;try{return i.moveToPoint(e,n),i.collapse(!0),i}catch(e){}}return null}(t,n,r)}return i=o,a=r.body,u=i&&i.parentElement?i.parentElement():null,Yn(function(e,t,n){for(;e&&e!==t;){if(n(e))return e;e=e.parentNode}return null}(u,a,xf))?null:i}return o}function Sf(e,t){return e&&t&&e.startContainer===t.startContainer&&e.startOffset===t.startOffset&&e.endContainer===t.endContainer&&e.endOffset===t.endOffset}function Ef(e,t,n){return null!==function(e,t,n){for(;e&&e!==t;){if(n(e))return e;e=e.parentNode}return null}(e,t,n)}function Nf(e){return e&&"TABLE"===e.nodeName}function kf(e,t,n){for(var r=new Rr(t,e.getParent(t.parentNode,e.isBlock)||e.getRoot());t=r[n?"prev":"next"]();)if(Wn(t))return 1}function _f(e,t,n,r,o){var i,a,u=e.getRoot(),s=e.schema.getNonEmptyElements(),c=e.getParent(o.parentNode,e.isBlock)||u;if(r&&Wn(o)&&t&&e.isEmpty(c))return ve.some(as(o.parentNode,e.nodeIndex(o)));for(var l,f,d=new Rr(o,c);a=d[r?"prev":"next"]();){if("false"===e.getContentEditableParent(a)||(f=u,Ir(l=a)&&!1===Ef(l,f,zc)))return ve.none();if(jn(a)&&0<a.nodeValue.length)return!1===Ef(a,u,function(e){return"A"===e.nodeName})?ve.some(as(a,r?a.nodeValue.length:0)):ve.none();if(e.isBlock(a)||s[a.nodeName.toLowerCase()])return ve.none();i=a}return n&&i?ve.some(as(i,0)):ve.none()}function Af(e,t,n,r){var o,i=e.getRoot(),a=!1,u=r[(n?"start":"end")+"Container"],s=r[(n?"start":"end")+"Offset"],c=zn(u)&&s===u.childNodes.length,l=e.schema.getNonEmptyElements(),f=n;if(Ir(u))return ve.none();if(zn(u)&&s>u.childNodes.length-1&&(f=!1),qn(u)&&(u=i,s=0),u===i){if(f&&(d=u.childNodes[0<s?s-1:0])){if(Ir(d))return ve.none();if(l[d.nodeName]||Nf(d))return ve.none()}if(u.hasChildNodes()){if(s=Math.min(!f&&0<s?s-1:s,u.childNodes.length-1),u=u.childNodes[s],s=jn(u)&&c?u.data.length:0,!t&&u===i.lastChild&&Nf(u))return ve.none();if(function(e,t){for(;t&&t!==e;){if(Yn(t))return 1;t=t.parentNode}}(i,u)||Ir(u))return ve.none();if(u.hasChildNodes()&&!1===Nf(u)){var d=u,m=new Rr(u,i);do{if(Yn(d)||Ir(d)){a=!1;break}if(jn(d)&&0<d.nodeValue.length){s=f?0:d.nodeValue.length,u=d,a=!0;break}if(l[d.nodeName.toLowerCase()]&&(!(o=d)||!/^(TD|TH|CAPTION)$/.test(o.nodeName))){s=e.nodeIndex(d),u=d.parentNode,f||s++,a=!0;break}}while(d=f?m.next():m.prev())}}}return t&&(jn(u)&&0===s&&_f(e,c,t,!0,u).each(function(e){u=e.container(),s=e.offset(),a=!0}),zn(u)&&(!(d=(d=u.childNodes[s])||u.childNodes[s-1])||!Wn(d)||d.previousSibling&&"A"===d.previousSibling.nodeName||kf(e,d,!1)||kf(e,d,!0)||_f(e,c,t,!0,d).each(function(e){u=e.container(),s=e.offset(),a=!0}))),f&&!t&&jn(u)&&s===u.nodeValue.length&&_f(e,c,t,!1,u).each(function(e){u=e.container(),s=e.offset(),a=!0}),a?ve.some(as(u,s)):ve.none()}function Rf(e,t){var n=t.collapsed,r=t.cloneRange(),o=as.fromRangeStart(t);return Af(e,n,!0,r).each(function(e){n&&as.isAbove(o,e)||r.setStart(e.container(),e.offset())}),n||Af(e,n,!1,r).each(function(e){r.setEnd(e.container(),e.offset())}),n&&r.collapse(!0),Sf(t,r)?ve.none():ve.some(r)}function Df(e,t){return e.splitText(t)}function Tf(e){var t=e.startContainer,n=e.startOffset,r=e.endContainer,o=e.endOffset;return t===r&&jn(t)?0<n&&n<t.nodeValue.length&&(t=(r=Df(t,n)).previousSibling,n<o?(t=r=Df(r,o-=n).previousSibling,o=r.nodeValue.length,n=0):o=0):(jn(t)&&0<n&&n<t.nodeValue.length&&(t=Df(t,n),n=0),jn(r)&&0<o&&o<r.nodeValue.length&&(o=(r=Df(r,o).previousSibling).nodeValue.length)),{startContainer:t,startOffset:n,endContainer:r,endOffset:o}}function Of(n){return{walk:function(e,t){return El(n,e,t)},split:Tf,normalize:function(t){return Rf(n,t).fold(R,function(e){return t.setStart(e.startContainer,e.startOffset),t.setEnd(e.endContainer,e.endOffset),!0})}}}Fl.isBookmarkNode=Yc;var Bf={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,ESC:27,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey||Bf.metaKeyPressed(e)},metaKeyPressed:function(e){return xt.mac?e.metaKey:e.ctrlKey&&!e.altKey}},Pf=Yn;Of.compareRanges=Sf,Of.getCaretRangeFromPoint=wf,Of.getSelectedNode=Ou,Of.getNode=Bu;var Lf,If,Mf=(Lf="height",If=function(e){var t=e.dom;return In(e)?t.getBoundingClientRect().height:t.offsetHeight},{set:function(e,t){if(!E(t)&&!t.match(/^[0-9]+$/))throw new Error(Lf+".set accepts only positive integer values. Value was "+t);var n=e.dom;mn(n)&&(n.style[Lf]=t+"px")},get:Ff,getOuter:Ff,aggregate:Uf,max:function(e,t,n){var r=Uf(e,n);return r<t?t-r:0}});function Ff(e){var t=If(e);if(t<=0||null===t){var n=xn(e,Lf);return parseFloat(n)||0}return t}function Uf(o,e){return L(e,function(e,t){var n=xn(o,t),r=void 0===n?0:parseInt(n,10);return isNaN(r)?e:e+r},0)}function zf(e){return"textarea"===kt(e)}function Hf(e,t){var n=function(e){var t=e.dom.ownerDocument,n=t.body,r=t.defaultView,o=t.documentElement;if(n===e.dom)return Fn(n.offsetLeft,n.offsetTop);var i=Gt(null==r?void 0:r.pageYOffset,o.scrollTop),a=Gt(null==r?void 0:r.pageXOffset,o.scrollLeft),u=Gt(o.clientTop,n.clientTop),s=Gt(o.clientLeft,n.clientLeft);return Un(e).translate(a-s,i-u)}(e),r=Mf.get(e);return{element:e,bottom:n.top+r,height:r,pos:n,cleanup:t}}function jf(n,r,o,i){Rd(n,function(e,t){return Ad(n,r,o,i)},o)}function Vf(e,t,n,r,o){var i={elm:r.element.dom,alignToTop:o};e.fire("ScrollIntoView",i).isDefaultPrevented()||(n(t,Jt(t).top,r,o),e.fire("AfterScrollIntoView",i))}function qf(e,t,n,r){var o=Nt.fromDom(e.getDoc());Vf(e,o,n,Hf(Nt.fromDom(t),te),r)}function $f(e,t,n,r){var o,i=e.pos;n?Qt(i.left,i.top,r):(o=i.top-t+e.height,Qt(i.left,o,r))}function Wf(e,t,n,r,o){var i=n+t,a=r.pos.top,u=r.bottom,s=n<=u-a;a<t?$f(r,n,!1!==o,e):i<a?$f(r,n,s?!1!==o:!0===o,e):i<u&&!s&&$f(r,n,!0===o,e)}function Kf(e,t,n,r){Wf(e,t,e.dom.defaultView.innerHeight,n,r)}function Xf(e,t,n,r){Wf(e,t,e.dom.defaultView.innerHeight,n,r);var o,i,a,u,s,c,l,f=(o=n.element,u=Jt(Nt.fromDom(document)),a=(i=_d).owner(o),s=kd(i,a),c=Un(o),l=P(s,function(e,t){var n=Un(t);return{left:e.left+n.left,top:e.top+n.top}},{left:0,top:0}),Fn(l.left+c.left+u.left,l.top+c.top+u.top)),d=tn(window);f.top<d.y?Zt(n.element,!1!==r):f.top>d.bottom&&Zt(n.element,!0===r)}function Yf(e,t,n){return jf(e,Kf,t,n)}function Gf(e,t,n){return qf(e,t,Kf,n)}function Jf(e,t,n){return jf(e,Xf,t,n)}function Qf(e,t,n){return qf(e,t,Xf,n)}function Zf(e,t,n){(e.inline?Yf:Jf)(e,t,n)}function ed(e){var t=Bn(e).dom;return e.dom===t.activeElement}function td(e){return void 0===e&&(e=Nt.fromDom(document)),ve.from(e.dom.activeElement).map(Nt.fromDom)}function nd(e,t){var n=_n(t)?Pl(t).length:Dn(t).length+1;return n<e?n:e<0?0:e}function rd(e){return Bd.range(e.start,nd(e.soffset,e.start),e.finish,nd(e.foffset,e.finish))}function od(e,t){return!rn(t.dom)&&(Ve(e,t)||je(e,t))}function id(t){return function(e){return od(t,e.start)&&od(t,e.finish)}}function ad(e){return!0===e.inline||Pd.isIE()}function ud(e){return Bd.range(Nt.fromDom(e.startContainer),e.startOffset,Nt.fromDom(e.endContainer),e.endOffset)}function sd(e){var t=document.createRange();try{return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),ve.some(t)}catch(e){return ve.none()}}function cd(e){var t,n,r=ad(e)?(t=Nt.fromDom(e.getBody()),((n=Tt(t).dom.getSelection())&&0!==n.rangeCount?ve.from(n.getRangeAt(0)):ve.none()).map(ud).filter(id(t))):ve.none();e.bookmark=r.isSome()?r:e.bookmark}function ld(n){return(n.bookmark||ve.none()).bind(function(e){return t=Nt.fromDom(n.getBody()),ve.from(e).filter(id(t)).map(rd);var t}).bind(sd)}function fd(u){var s=lu(function(){cd(u)},0);u.on("init",function(){function e(){n.throttle()}var t,n,r,o,i,a;u.inline&&(t=u,n=s,Ja.DOM.bind(document,"mouseup",e),t.on("remove",function(){Ja.DOM.unbind(document,"mouseup",e)})),r=u,o=s,dt().browser.isIE()?(a=r).on("focusout",function(){cd(a)}):(i=o,r.on("mouseup touchend",function(e){i.throttle()})),r.on("keyup NodeChange",function(e){"nodechange"===e.type&&e.selectionChange||cd(r)})}),u.on("remove",function(){s.cancel()})}function dd(t,e){var n=t.getParam("custom_ui_selector","","string");return null!==Id.getParent(e,function(e){return Ld.isEditorUIElement(e)||!!n&&t.dom.is(e,n)})}function md(n,e){var t=e.editor;fd(t),t.on("focusin",function(){var e=n.focusedEditor;e!==t&&(e&&e.fire("blur",{focusedEditor:t}),n.setActive(t),(n.focusedEditor=t).fire("focus",{blurredEditor:e}),t.focus(!0))}),t.on("focusout",function(){_r.setEditorTimeout(t,function(){var e=n.focusedEditor;dd(t,function(e){try{return td(Bn(Nt.fromDom(e.getElement()))).fold(function(){return document.body},function(e){return e.dom})}catch(e){return document.body}}(t))||e!==t||(t.fire("blur",{focusedEditor:null}),n.focusedEditor=null)})}),Nd||(Nd=function(e){var t=n.activeEditor;t&&!function(e){if(On()&&V(e.target)){var t=Nt.fromDom(e.target);if(kn(t)&&V(t.dom.shadowRoot)&&e.composed&&e.composedPath){var n=e.composedPath();if(n)return Q(n)}}return ve.from(e.target)}(e).each(function(e){e.ownerDocument===document&&(e===document.body||dd(t,e)||n.focusedEditor!==t||(t.fire("blur",{focusedEditor:null}),n.focusedEditor=null))})},Id.bind(document,"focusin",Nd))}function gd(e,t){e.focusedEditor===t.editor&&(e.focusedEditor=null),e.activeEditor||(Id.unbind(document,"focusin",Nd),Nd=null)}function pd(t,e){var n,r;n=Nt.fromDom(t.getBody()),((r=e).collapsed?ve.from(Bu(r.startContainer,r.startOffset)).map(Nt.fromDom):ve.none()).bind(function(e){return po(e)?ve.some(e):!1===Ve(n,e)?ve.some(n):ve.none()}).bind(function(e){return ef(e.dom)}).fold(function(){t.selection.normalize()},function(e){return t.selection.setRng(e.toRange())})}function hd(t){if(t.setActive)try{t.setActive()}catch(e){t.focus()}else t.focus()}function vd(e){return e.inline?(r=e.getBody())&&(ed(t=Nt.fromDom(r))||td(Bn(n=t)).filter(function(e){return n.dom.contains(e.dom)}).isSome()):e.iframeElement&&ed(Nt.fromDom(e.iframeElement));var t,n,r}function bd(e,t,n,r,o){var i=n?t.startContainer:t.endContainer,a=n?t.startOffset:t.endOffset;return ve.from(i).map(Nt.fromDom).map(function(e){return r&&t.collapsed?e:Mt(e,o(e,a)).getOr(e)}).bind(function(e){return kn(e)?ve.some(e):Ot(e).filter(kn)}).map(function(e){return e.dom}).getOr(e)}function yd(e,t,n){return bd(e,t,!0,n,function(e,t){return Math.min(zt(e),t)})}function Cd(e,t,n){return bd(e,t,!1,n,function(e,t){return 0<t?t-1:t})}function xd(e,t){for(var n=e;e&&jn(e)&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n}function wd(n,e){return T(e,function(e){var t=n.fire("GetSelectionRange",{range:e});return t.range!==e?t.range:e})}function Sd(e,t,n){var r=n?"lastChild":"firstChild",o=n?"prev":"next";if(e[r])return e[r];if(e!==t){var i=e[o];if(i)return i;for(var a=e.parent;a&&a!==t;a=a.parent)if(i=a[o])return i}}function Ed(e){var t="a"===e.name&&!e.attr("href")&&e.attr("id");return e.attr("name")||e.attr("id")&&!e.firstChild||e.attr("data-mce-bookmark")||t}var Nd,kd=function(r,e){return r.view(e).fold(J([]),function(e){var t=r.owner(e),n=kd(r,t);return[e].concat(n)})},_d=Object.freeze({__proto__:null,view:function(e){var t;return(e.dom===document?ve.none():ve.from(null===(t=e.dom.defaultView)||void 0===t?void 0:t.frameElement)).map(Nt.fromDom)},owner:Dt}),Ad=function(e,t,n,r){var o=Nt.fromDom(e.getBody()),i=Nt.fromDom(e.getDoc());o.dom.offsetWidth;var a,u,s,c,l=(a=Nt.fromDom(n.startContainer),u=n.startOffset,s=function(e,t){var n=Dn(e);if(0===n.length||zf(e))return{element:e,offset:t};if(t<n.length&&!zf(n[t]))return{element:n[t],offset:0};var r=n[n.length-1];return zf(r)?{element:e,offset:t}:"img"===kt(r)?{element:r,offset:1}:_n(r)?{element:r,offset:Pl(r).length}:{element:r,offset:Dn(r).length}}(a,u),c=Nt.fromHtml('<span data-mce-bogus="all" style="display: inline-block;">\ufeff</span>'),qt(s.element,c),Hf(c,function(){return Ln(c)}));Vf(e,i,t,l,r),l.cleanup()},Rd=function(e,t,n){var r=n.startContainer,o=n.startOffset,i=n.endContainer,a=n.endOffset;t(Nt.fromDom(r),Nt.fromDom(i));var u=e.dom.createRng();u.setStart(r,o),u.setEnd(i,a),e.selection.setRng(n)},Dd=or([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Td=(Dd.before,Dd.on,Dd.after,function(e){return e.fold(u,u,u)}),Od=or([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),Bd={domRange:Od.domRange,relative:Od.relative,exact:Od.exact,exactFromRange:function(e){return Od.exact(e.start,e.soffset,e.finish,e.foffset)},getWin:function(e){return Tt(e.match({domRange:function(e){return Nt.fromDom(e.startContainer)},relative:function(e,t){return Td(e)},exact:function(e,t,n,r){return e}}))},range:function(e,t,n,r){return{start:e,soffset:t,finish:n,foffset:r}}},Pd=dt().browser,Ld={isEditorUIElement:function(e){var t=e.className.toString();return-1!==t.indexOf("tox-")||-1!==t.indexOf("mce-")}},Id=Ja.DOM,Md=function(e){return e.editorManager.setActive(e)},Fd={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11},Ud=(zd.create=function(e,t){var n=new zd(e,Fd[e]||1);return t&&ne(t,function(e,t){n.attr(t,e)}),n},zd.prototype.replace=function(e){return e.parent&&e.remove(),this.insert(e,this),this.remove(),this},zd.prototype.attr=function(e,t){var n,r=this;if("string"!=typeof e)return null!=e&&ne(e,function(e,t){r.attr(t,e)}),r;if(n=r.attributes){if(void 0===t)return n.map[e];if(null===t){if(e in n.map){delete n.map[e];for(var o=n.length;o--;)if(n[o].name===e)return n.splice(o,1),r}return r}if(e in n.map){for(o=n.length;o--;)if(n[o].name===e){n[o].value=t;break}}else n.push({name:e,value:t});return n.map[e]=t,r}},zd.prototype.clone=function(){var e,t=new zd(this.name,this.type);if(e=this.attributes){var n=[];n.map={};for(var r=0,o=e.length;r<o;r++){var i=e[r];"id"!==i.name&&(n[n.length]={name:i.name,value:i.value},n.map[i.name]=i.value)}t.attributes=n}return t.value=this.value,t.shortEnded=this.shortEnded,t},zd.prototype.wrap=function(e){return this.parent.insert(e,this),e.append(this),this},zd.prototype.unwrap=function(){for(var e=this.firstChild;e;){var t=e.next;this.insert(e,this,!0),e=t}this.remove()},zd.prototype.remove=function(){var e=this.parent,t=this.next,n=this.prev;return e&&(e.firstChild===this?(e.firstChild=t)&&(t.prev=null):n.next=t,e.lastChild===this?(e.lastChild=n)&&(n.next=null):t.prev=n,this.parent=this.next=this.prev=null),this},zd.prototype.append=function(e){e.parent&&e.remove();var t=this.lastChild;return t?((t.next=e).prev=t,this.lastChild=e):this.lastChild=this.firstChild=e,e.parent=this,e},zd.prototype.insert=function(e,t,n){e.parent&&e.remove();var r=t.parent||this;return n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,(e.next=t).prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,(e.prev=t).next=e),e.parent=r,e},zd.prototype.getAll=function(e){for(var t=[],n=this.firstChild;n;n=Sd(n,this))n.name===e&&t.push(n);return t},zd.prototype.children=function(){for(var e=[],t=this.firstChild;t;t=t.next)e.push(t);return e},zd.prototype.empty=function(){if(this.firstChild){for(var e=[],t=this.firstChild;t;t=Sd(t,this))e.push(t);for(var n=e.length;n--;)(t=e[n]).parent=t.firstChild=t.lastChild=t.next=t.prev=null}return this.firstChild=this.lastChild=null,this},zd.prototype.isEmpty=function(e,t,n){void 0===t&&(t={});var r=this.firstChild;if(Ed(this))return!1;if(r)do{if(1===r.type){if(r.attr("data-mce-bogus"))continue;if(e[r.name])return!1;if(Ed(r))return!1}if(8===r.type)return!1;if(3===r.type&&!function(e){if(qr(e.value)){var t=e.parent;return!t||"span"===t.name&&!t.attr("style")||!/^[ ]+$/.test(e.value)}}(r))return!1;if(3===r.type&&r.parent&&t[r.parent.name]&&qr(r.value))return!1;if(n&&n(r))return!1}while(r=Sd(r,this));return!0},zd.prototype.walk=function(e){return Sd(this,null,e)},zd);function zd(e,t){this.name=e,1===(this.type=t)&&(this.attributes=[],this.attributes.map={})}function Hd(e,t){return e.replace(t.re,function(e){return ue(t.uris,e).getOr(e)})}var jd=Et.each,Vd=Et.trim,qd="source protocol authority userInfo user password host port relative path directory file query anchor".split(" "),$d={ftp:21,http:80,https:443,mailto:25},Wd=["img","video"],Kd=(Xd.parseDataUri=function(e){var t,n=decodeURIComponent(e).split(","),r=/data:([^;]+)/.exec(n[0]);return{type:t=r?r[1]:t,data:n[1]}},Xd.isDomSafe=function(e,t,n){if((n=void 0===n?{}:n).allow_script_urls)return!0;var r,o,i,a,u=Go.decode(e).replace(/[\s\u0000-\u001F]+/g,"");try{u=decodeURIComponent(u)}catch(e){u=unescape(u)}return!(/((java|vb)script|mhtml):/i.test(u)||(o=u,i=t,!(r=n).allow_html_data_urls&&(/^data:image\//i.test(o)?(V(a=r.allow_svg_data_urls)?!a:!V(i)||!D(Wd,i))&&/^data:image\/svg\+xml/i.test(o):/^data:/i.test(o))))},Xd.getDocumentBaseUrl=function(e){var t=0!==e.protocol.indexOf("http")&&"file:"!==e.protocol?e.href:e.protocol+"//"+e.host+e.pathname;return/^[^:]+:\/\/\/?[^\/]+\//.test(t)&&(t=t.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(t)||(t+="/")),t},Xd.prototype.setPath=function(e){var t=/^(.*?)\/?(\w+)?$/.exec(e);this.path=t[0],this.directory=t[1],this.file=t[2],this.source="",this.getURI()},Xd.prototype.toRelative=function(e){var t;if("./"===e)return e;var n=new Xd(e,{base_uri:this});if("mce_host"!==n.host&&this.host!==n.host&&n.host||this.port!==n.port||this.protocol!==n.protocol&&""!==n.protocol)return n.getURI();var r=this.getURI(),o=n.getURI();return r===o||"/"===r.charAt(r.length-1)&&r.substr(0,r.length-1)===o?r:(t=this.toRelPath(this.path,n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),t)},Xd.prototype.toAbsolute=function(e,t){var n=new Xd(e,{base_uri:this});return n.getURI(t&&this.isSameOrigin(n))},Xd.prototype.isSameOrigin=function(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;var t=$d[this.protocol];if(t&&(this.port||t)==(e.port||t))return!0}return!1},Xd.prototype.toRelPath=function(e,t){var n,r,o=0,i="",a=e.substring(0,e.lastIndexOf("/")).split("/"),u=t.split("/");if(a.length>=u.length)for(n=0,r=a.length;n<r;n++)if(n>=u.length||a[n]!==u[n]){o=n+1;break}if(a.length<u.length)for(n=0,r=u.length;n<r;n++)if(n>=a.length||a[n]!==u[n]){o=n+1;break}if(1===o)return t;for(n=0,r=a.length-(o-1);n<r;n++)i+="../";for(n=o-1,r=u.length;n<r;n++)i+=n!==o-1?"/"+u[n]:u[n];return i},Xd.prototype.toAbsPath=function(e,t){var n,r,o=0,i=[],a=/\/$/.test(t)?"/":"",u=e.split("/"),s=t.split("/");for(jd(u,function(e){e&&i.push(e)}),u=i,n=s.length-1,i=[];0<=n;n--)0!==s[n].length&&"."!==s[n]&&(".."!==s[n]?0<o?o--:i.push(s[n]):o++);return 0!==(r=(n=u.length-o)<=0?q(i).join("/"):u.slice(0,n).join("/")+"/"+q(i).join("/")).indexOf("/")&&(r="/"+r),a&&r.lastIndexOf("/")!==r.length-1&&(r+=a),r},Xd.prototype.getURI=function(e){var t;return void 0===e&&(e=!1),this.source&&!e||(t="",e||(this.protocol?t+=this.protocol+"://":t+="//",this.userInfo&&(t+=this.userInfo+"@"),this.host&&(t+=this.host),this.port&&(t+=":"+this.port)),this.path&&(t+=this.path),this.query&&(t+="?"+this.query),this.anchor&&(t+="#"+this.anchor),this.source=t),this.source},Xd);function Xd(e,t){e=Vd(e),this.settings=t||{};var n,r,o,i,a=this.settings.base_uri,u=this;/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)?u.source=e:(n=0===e.indexOf("//"),0!==e.indexOf("/")||n||(e=(a&&a.protocol||"http")+"://mce_host"+e),/^[\w\-]*:?\/\//.test(e)||(r=this.settings.base_uri?this.settings.base_uri.path:new Xd(document.location.href).directory,e=this.settings.base_uri&&""==this.settings.base_uri.protocol?"//mce_host"+u.toAbsPath(r,e):(o=/([^#?]*)([#?]?.*)/.exec(e),(a&&a.protocol||"http")+"://mce_host"+u.toAbsPath(r,o[1])+o[2])),e=e.replace(/@@/g,"(mce_at)"),i=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?(\[[a-zA-Z0-9:.%]+\]|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e),jd(qd,function(e,t){var n=(n=i[t])&&n.replace(/\(mce_at\)/g,"@@");u[e]=n}),a&&(u.protocol||(u.protocol=a.protocol),u.userInfo||(u.userInfo=a.userInfo),u.port||"mce_host"!==u.host||(u.port=a.port),u.host&&"mce_host"!==u.host||(u.host=a.host),u.source=""),n&&(u.protocol=""))}function Yd(e,t,n){for(var r=/<([!?\/])?([A-Za-z0-9\-_:.]+)/g,o=/(?:\s(?:[^'">]+(?:"[^"]*"|'[^']*'))*[^"'>]*(?:"[^">]*|'[^'>]*)?|\s*|\/)>/g,i=e.getShortEndedElements(),a=1,u=n;0!==a;)for(r.lastIndex=u;;){var s=r.exec(t);if(null===s)return u;if("!"===s[1]){u=Ge(s[2],"--")?Qd(t,!1,s.index+"!--".length):Qd(t,!0,s.index+1);break}o.lastIndex=r.lastIndex;var c=o.exec(t);if(!l(c)&&c.index===r.lastIndex){"/"===s[1]?--a:Ne(i,s[2])||(a+=1),u=r.lastIndex+c[0].length;break}}return u}function Gd(q,$){var e;void 0===$&&($=to());var W=null!==(e=(q=q||{}).document)&&void 0!==e?e:document,K=W.createElement("form");function n(s,e){void 0===e&&(e="html");for(var t,i,n,c,r,o,a,l,u,f,d,m,g,p,h,v,b,y,C,x=s.html,w=0,S=[],E=0,N=Go.decode,k=Et.makeMap("src,href,data,background,action,formaction,poster,xlink:href"),_="html"===e?0:1,A=function(e){for(var t,n=S.length;n--&&S[n].name!==e;);if(0<=n){for(t=S.length-1;n<=t;t--)(e=S[t]).valid&&Q(e.name);S.length=n}},R=function(e,t){return G(Hd(e,s),t)},D=function(e){""!==e&&(">"===e.charAt(0)&&(e=" "+e),q.allow_conditional_comments||"[if"!==e.substr(0,3).toLowerCase()||(e=" "+e),X(Hd(e,s)))},T=function(e,t){var n=e||"",r=!Ge(n,"--"),o=Qd(x,r,t);return e=x.substr(t,o-t),D(r?n+e:e),o+1},O=new RegExp("<(?:(?:!--([\\w\\W]*?)--!?>)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:![Dd][Oo][Cc][Tt][Yy][Pp][Ee]([\\w\\W]*?)>)|(?:!(--)?)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([A-Za-z][A-Za-z0-9\\-_\\:\\.]*)>)|(?:([A-Za-z][A-Za-z0-9\\-_:.]*)(\\s(?:[^'\">]+(?:\"[^\"]*\"|'[^']*'))*[^\"'>]*(?:\"[^\">]*|'[^'>]*)?|\\s*|\\/)>))","g"),B=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,P=$.getShortEndedElements(),L=q.self_closing_elements||$.getSelfClosingElements(),I=$.getBoolAttrs(),M=q.validate,F=q.remove_internals,U=q.fix_self_closing,z=$.getSpecialElements(),H=x+">";t=O.exec(H);){var j=t[0];if(w<t.index&&R(N(x.substr(w,t.index-w))),i=t[7])A(i=":"===(i=i.toLowerCase()).charAt(0)?i.substr(1):i);else if(i=t[8]){if(t.index+j.length>x.length){R(N(x.substr(t.index))),w=t.index+j.length;continue}u=(i=":"===(i=i.toLowerCase()).charAt(0)?i.substr(1):i)in P,U&&L[i]&&0<S.length&&S[S.length-1].name===i&&A(i);var V=function(e,t){var n=e.exec(t);if(n){var r=n[1],o=n[2];return"string"==typeof r&&"data-mce-bogus"===r.toLowerCase()?o:null}return null}(B,t[9]);if(null!==V){if("all"===V){w=Yd($,x,O.lastIndex),O.lastIndex=w;continue}d=!1}if(!M||(f=$.getElementRule(i))){if(d=!0,M&&(p=f.attributes,h=f.attributePatterns),(g=t[9])?((l=-1!==g.indexOf("data-mce-type"))&&F&&(d=!1),(c=[]).map={},g.replace(B,function(e,t,n,r,o){return function(e,t,n,r,o){var i;if(n=Hd((t=t.toLowerCase())in I?t:N(n||r||o||""),s),M&&!l&&0==(0===(i=t).indexOf("data-")||0===i.indexOf("aria-"))){var a=p[t];if(!a&&h){for(var u=h.length;u--&&!(a=h[u]).pattern.test(t););-1===u&&(a=null)}if(!a)return;if(a.validValues&&!(n in a.validValues))return}("name"===t||"id"===t)&&e in Jd&&(n in W||n in K)||k[t]&&!Kd.isDomSafe(n,e,q)||l&&(t in k||0===t.indexOf("on"))||(c.map[t]=n,c.push({name:t,value:n}))}(i,t,n,r,o),""})):(c=[]).map={},M&&!l){if(v=f.attributesRequired,b=f.attributesDefault,y=f.attributesForced,f.removeEmptyAttrs&&!c.length&&(d=!1),y)for(r=y.length;r--;)a=(m=y[r]).name,"{$uid}"===(C=m.value)&&(C="mce_"+E++),c.map[a]=C,c.push({name:a,value:C});if(b)for(r=b.length;r--;)(a=(m=b[r]).name)in c.map||("{$uid}"===(C=m.value)&&(C="mce_"+E++),c.map[a]=C,c.push({name:a,value:C}));if(v){for(r=v.length;r--&&!(v[r]in c.map););-1===r&&(d=!1)}if(m=c.map["data-mce-bogus"]){if("all"===m){w=Yd($,x,O.lastIndex),O.lastIndex=w;continue}d=!1}}d&&J(i,c,u)}else d=!1;if(n=z[i]){n.lastIndex=w=t.index+j.length,w=(t=n.exec(x))?(d&&(o=x.substr(w,t.index-w)),t.index+t[0].length):(o=x.substr(w),x.length),d&&(0<o.length&&R(o,!0),Q(i)),O.lastIndex=w;continue}u||(g&&g.indexOf("/")===g.length-1?d&&Q(i):S.push({name:i,valid:d}))}else if(i=t[1])D(i);else if(i=t[2]){if(!(1==_||q.preserve_cdata||0<S.length&&$.isValidChild(S[S.length-1].name,"#cdata"))){w=T("",t.index+2),O.lastIndex=w;continue}Y(i)}else if(i=t[3])ee(i);else{if((i=t[4])||"<!"===j){w=T(i,t.index+j.length),O.lastIndex=w;continue}if(i=t[5]){if(1!=_){w=T("?",t.index+2),O.lastIndex=w;continue}Z(i,t[6])}}w=t.index+j.length}for(w<x.length&&R(N(x.substr(w))),r=S.length-1;0<=r;r--)(i=S[r]).valid&&Q(i.name)}!1!==q.fix_self_closing&&(q.fix_self_closing=!0);var X=q.comment||te,Y=q.cdata||te,G=q.text||te,J=q.start||te,Q=q.end||te,Z=q.pi||te,ee=q.doctype||te;return{parse:function(e,t){void 0===t&&(t="html"),n(function(e){for(var t,n=/data:[^;]+;base64,([a-z0-9\+\/=\s]+)/gi,r=[],o={},i=yu("img"),a=0,u=0;t=n.exec(e);){var s=t[0],c=i+"_"+u++;o[c]=s,a<t.index&&r.push(e.substr(a,t.index-a)),r.push(c),a=t.index+s.length}var l=new RegExp(i+"_[0-9]+","g");return 0===a?{prefix:i,uris:o,html:e,re:l}:(a<e.length&&r.push(e.substr(a)),{prefix:i,uris:o,html:r.join(""),re:l})}(e),t)}}}var Jd=Et.makeMap("button,fieldset,form,iframe,img,image,input,object,output,select,textarea"),Qd=function(e,t,n){void 0===n&&(n=0);var r=e.toLowerCase();if(-1!==r.indexOf("[if ",n)&&(u=n,/^\s*\[if [\w\W]+\]>.*<!\[endif\](--!?)?>/.test(r.substr(u)))){var o=r.indexOf("[endif]",n);return r.indexOf(">",o)}if(t){var i=r.indexOf(">",n);return-1!==i?i:r.length}var a=/--!?>/g;a.lastIndex=n;var u,s=a.exec(e);return s?s.index+s[0].length:r.length};function Zd(e,t){for(var n,r,o,i,a=/<(\w+) [^>]*data-mce-bogus="all"[^>]*>/g,u=e.schema,s=(n=e.getTempAttrs(),r=t,o=new RegExp(["\\s?("+n.join("|")+')="[^"]+"'].join("|"),"gi"),r.replace(o,"")),c=u.getShortEndedElements();i=a.exec(s);){var l=a.lastIndex,f=i[0].length,d=c[i[1]]?l:Gd.findEndTag(u,s,l),s=s.substring(0,l-f)+s.substring(d);a.lastIndex=l-f}return wo(s)}function em(o){return{compare:function(e,t){return e.nodeName===t.nodeName&&!(!r(n(e),n(t))||!r(o.parseStyle(o.getAttrib(e,"style")),o.parseStyle(o.getAttrib(t,"style")))||Yc(e)||Yc(t));function n(n){var r={};return om(o.getAttribs(n),function(e){var t=e.nodeName.toLowerCase();0!==t.indexOf("_")&&"style"!==t&&0!==t.indexOf("data-")&&(r[t]=o.getAttrib(n,t))}),r}function r(e,t){var n,r;for(r in e)if(Ne(e,r)){if(void 0===(n=t[r]))return;if(e[r]!==n)return;delete t[r]}for(r in t)if(Ne(t,r))return;return 1}}}}function tm(e){var u=[],s=(e=e||{}).indent,c=im(e.indent_before||""),l=im(e.indent_after||""),f=Go.getEncodeFunc(e.entity_encoding||"raw",e.entities),d="html"===e.element_format;return{start:function(e,t,n){var r,o,i,a;if(s&&c[e]&&0<u.length&&0<(a=u[u.length-1]).length&&"\n"!==a&&u.push("\n"),u.push("<",e),t)for(r=0,o=t.length;r<o;r++)i=t[r],u.push(" ",i.name,'="',f(i.value,!0),'"');u[u.length]=!n||d?">":" />",n&&s&&l[e]&&0<u.length&&0<(a=u[u.length-1]).length&&"\n"!==a&&u.push("\n")},end:function(e){var t;u.push("</",e,">"),s&&l[e]&&0<u.length&&0<(t=u[u.length-1]).length&&"\n"!==t&&u.push("\n")},text:function(e,t){0<e.length&&(u[u.length]=t?e:f(e))},cdata:function(e){u.push("<![CDATA[",e,"]]>")},comment:function(e){u.push("\x3c!--",e,"--\x3e")},pi:function(e,t){t?u.push("<?",e," ",f(t),"?>"):u.push("<?",e,"?>"),s&&u.push("\n")},doctype:function(e){u.push("<!DOCTYPE",e,">",s?"\n":"")},reset:function(){u.length=0},getContent:function(){return u.join("").replace(/\n$/,"")}}}function nm(t,g){void 0===g&&(g=to());var p=tm(t);return(t=t||{}).validate=!("validate"in t)||t.validate,{serialize:function(e){var f=t.validate,d={3:function(e){p.text(e.value,e.raw)},8:function(e){p.comment(e.value)},7:function(e){p.pi(e.name,e.value)},10:function(e){p.doctype(e.value)},4:function(e){p.cdata(e.value)},11:function(e){if(e=e.firstChild)for(;m(e),e=e.next;);}};p.reset();var m=function(e){var t=d[e.type];if(t)t(e);else{var n=e.name,r=e.shortEnded,o=e.attributes;if(f&&o&&1<o.length){var i=[];i.map={};var a=g.getElementRule(e.name);if(a){for(var u=0,s=a.attributesOrder.length;u<s;u++)(c=a.attributesOrder[u])in o.map&&(l=o.map[c],i.map[c]=l,i.push({name:c,value:l}));for(var c,l,u=0,s=o.length;u<s;u++)(c=o[u].name)in i.map||(l=o.map[c],i.map[c]=l,i.push({name:c,value:l}));o=i}}if(p.start(e.name,o,r),!r){if(e=e.firstChild)for(;m(e),e=e.next;);p.end(n)}}};return 1!==e.type||t.inner?d[11](e):m(e),p.getContent()}}}Gd.findEndTag=Yd;var rm=Zd,om=Et.each,im=Et.makeMap,am=new Set;function um(e,t){return we(e.parseStyle(e.getAttrib(t,"style")))}function sm(n,r,o){return ve.from(o.container()).filter(jn).exists(function(e){var t=n?0:-1;return r(e.data.charAt(o.offset()+t))})}function cm(e){var t=e.container();return jn(t)&&(0===t.data.length||xo(t.data)&&Fl.isBookmarkNode(t.parentNode))}function lm(t,n){return function(e){return ve.from(Gs(t?0:-1,e)).filter(n).isSome()}}function fm(e){return Kn(e)&&"block"===xn(Nt.fromDom(e),"display")}function dm(e){return Yn(e)&&!(zn(t=e)&&"all"===t.getAttribute("data-mce-bogus"));var t}function mm(e){Xt(e),Pn(e,Nt.fromHtml('<br data-mce-bogus="1">'))}function gm(n){Ut(n).each(function(t){Bt(t).each(function(e){lo(n)&&Br(t)&&lo(e)&&Ln(t)})})}function pm(e,t){return o=R,Ve(r=t,n=e)?function(e,t){for(var n=y(t)?t:R,r=e.dom,o=[];null!==r.parentNode&&void 0!==r.parentNode;){var i=r.parentNode,a=Nt.fromDom(i);if(o.push(a),!0===n(a))break;r=i}return o}(n,function(e){return o(e)||je(e,r)}).slice(0,-1):[];var n,r,o}function hm(e,t){return[e].concat(pm(e,t))}function vm(e,t,n){return Jl(e,t,n,cm)}function bm(e,t){return M(hm(Nt.fromDom(t.container()),e),lo)}function ym(e,n,r){return vm(e,n.dom,r).forall(function(t){return bm(n,r).fold(function(){return!1===Ys(t,r,n.dom)},function(e){return!1===Ys(t,r,n.dom)&&Ve(e,Nt.fromDom(t.container()))})})}function Cm(t,n,r){return bm(n,r).fold(function(){return vm(t,n.dom,r).forall(function(e){return!1===Ys(e,r,n.dom)})},function(e){return vm(t,e.dom,r).isNone()})}function xm(e){return nc(e).exists(Br)}function wm(e,t,n){var r=Q(U(hm(Nt.fromDom(n.container()),t),lo)).getOr(t);return Gl(e,r.dom,n).filter(xm)}function Sm(e,t){return nc(t).exists(Br)||wm(!0,e,t).isSome()}function Em(e,t){return ve.from(t.getNode(!0)).map(Nt.fromDom).exists(Br)||wm(!1,e,t).isSome()}function Nm(e){return as.isTextPosition(e)&&!e.isAtStart()&&!e.isAtEnd()}function km(e,t){return Q(U(hm(Nt.fromDom(t.container()),e),lo)).getOr(e)}function _m(e,t){return Nm(t)?Kg(t):Kg(t)||Zl(km(e,t).dom,t).exists(Kg)}function Am(e,t){return Nm(t)?Wg(t):Wg(t)||Ql(km(e,t).dom,t).exists(Wg)}function Rm(e){return nc(e).bind(function(e){return pr(e,kn)}).exists(function(e){return D(["pre","pre-wrap"],xn(e,"white-space"))})}function Dm(e,t){return!Rm(t)&&(np(e,t)||op(e,t)||Em(e,t)||_m(e,t))}function Tm(e,t){return!Rm(t)&&(rp(e,t)||ip(e,t)||Sm(e,t)||Am(e,t))}function Om(e,t){return Dm(e,t)||Tm(e,(r=(n=t).container(),o=n.offset(),jn(r)&&o<r.data.length?as(r,o+1):n));var n,r,o}function Bm(e,t){return of(e.charAt(t))}function Pm(e){var t=e.container();return jn(t)&&Te(t.data,yo)}function Lm(g,e){return ve.some(e).filter(Pm).bind(function(e){var t,n,r,o,i,a,u,s,c,l=e.container(),f=g,d=(i=l).data,m=as(i,0);return(!Bm(d,0)||Om(f,m)?(s=(a=l).data,(c=T(u=s.split(""),function(e,t){return of(e)&&0<t&&t<u.length-1&&Jc(u[t-1])&&Jc(u[t+1])?" ":e}).join(""))!==s&&(a.data=c,1)):(i.data=" "+d.slice(1),1))||(t=g,r=(n=l).data,o=as(n,r.length-1),Bm(r,r.length-1)&&!Om(t,o)&&(n.data=r.slice(0,-1)+" ",1))?ve.some(e):ve.none()})}function Im(t){var e=Nt.fromDom(t.getBody());t.selection.isCollapsed()&&Lm(e,as.fromRangeStart(t.selection.getRng())).each(function(e){t.selection.setRng(e.toRange())})}function Mm(e,t,n){var r,o,i,a,u,s,c,l;0!==n&&(o=gr(r=Nt.fromDom(e),lo).getOr(r),i=e.data.slice(t,t+n),a=t+n>=e.data.length&&Tm(o,as(e,e.data.length)),u=0===t&&Dm(o,as(e,0)),e.replaceData(t,n,(c=u,l=a,L(s=i,function(e,t){return Gc(t)||of(t)?e.previousCharIsSpace||""===e.str&&c||e.str.length===s.length-1&&l?{previousCharIsSpace:!1,str:e.str+yo}:{previousCharIsSpace:!0,str:e.str+" "}:{previousCharIsSpace:!1,str:e.str+t}},{previousCharIsSpace:!1,str:""}).str)))}function Fm(e,t){var n=e.data.slice(t);Mm(e,t,n.length-Qe(n).length)}function Um(e,t){var n=e.data.slice(0,t),r=n.length-Ze(n).length;Mm(e,t-r,r)}function zm(e,t,n,r){void 0===r&&(r=!0);var o=Ze(e.data).length,i=r?e:t,a=r?t:e;return r?i.appendData(a.data):i.insertData(0,a.data),Ln(Nt.fromDom(a)),n&&Fm(i,o),i}function Hm(e,t){return r=e,o=(n=t).container(),i=n.offset(),!1===as.isTextPosition(n)&&o===r.parentNode&&i>as.before(r).offset()?as(t.container(),t.offset()-1):t;var n,r,o,i}function jm(e){return jr(e.previousSibling)?ve.some((t=e.previousSibling,jn(t)?as(t,t.data.length):as.after(t))):e.previousSibling?tf(e.previousSibling):ve.none();var t}function Vm(e){return jr(e.nextSibling)?ve.some((t=e.nextSibling,jn(t)?as(t,0):as.before(t))):e.nextSibling?ef(e.nextSibling):ve.none();var t}function qm(r,o){return jm(o).orThunk(function(){return Vm(o)}).orThunk(function(){return e=r,n=as.before((t=o).previousSibling||t.parentNode),Zl(e,n).fold(function(){return Ql(e,as.after(t))},ve.some);var e,t,n})}function $m(n,r){return Vm(r).orThunk(function(){return jm(r)}).orThunk(function(){return Ql(e=n,as.after(t=r)).fold(function(){return Zl(e,as.before(t))},ve.some);var e,t})}function Wm(t,n,e){e.fold(function(){t.focus()},function(e){t.selection.setRng(e.toRange(),n)})}function Km(e,t){return t&&Ne(e.schema.getBlockElements(),kt(t))}function Xm(e){if(Wr(e)){var t=Nt.fromHtml('<br data-mce-bogus="1">');return Xt(e),Pn(e,t),ve.some(as.before(t.dom))}return ve.none()}function Ym(t,n,e,r){void 0===r&&(r=!0);var o,i,a,u,s,c,l,f,d,m,g,p,h,v,b=(p=n,h=t.getBody(),v=e.dom,(p?$m:qm)(h,v).map(A(Hm,v))),y=gr(e,A(Km,t),(o=t.getBody(),function(e){return e.dom===o})),C=(u=b,i=a=e,s=Ne(t.schema.getTextInlineElements(),kt(i)),m=Bt(a).filter(_n),g=Pt(a).filter(_n),Ln(a),l=g,f=u,d=function(e,t,n){var r=e.dom,o=t.dom,i=r.data.length;return zm(r,o,s),n.container()===o?as(r,i):n},((c=m).isSome()&&l.isSome()&&f.isSome()?ve.some(d(c.getOrDie(),l.getOrDie(),f.getOrDie())):ve.none()).orThunk(function(){return s&&(m.each(function(e){return Um(e.dom,e.dom.length)}),g.each(function(e){return Fm(e.dom,0)})),u}));t.dom.isEmpty(t.getBody())?(t.setContent(""),t.selection.setCursorLocation()):y.bind(Xm).fold(function(){r&&Wm(t,n,C)},function(e){r&&Wm(t,n,ve.some(e))})}function Gm(e){return hu(e,"td,th")}function Jm(e,t){return{start:e,end:t}}function Qm(e,t){return br(Nt.fromDom(e),"td,th",t)}function Zm(e){return!je(e.start,e.end)}function eg(e,n){return Al(e.start,n).bind(function(t){return Al(e.end,n).bind(function(e){return je(t,e)?ve.some(t):ve.none()})})}function tg(e){return function(t){return eg(t,e).map(function(e){return{rng:t,table:e,cells:Gm(e)}})}}function ng(e,t,n,r){if(n.collapsed||!e.forall(Zm))return ve.none();if(t.isSameTable){var o=e.bind(tg(r));return ve.some({start:o,end:o})}var i,a,u=Qm(n.startContainer,r),s=Qm(n.endContainer,r),c=u.bind((a=r,function(t){return Al(t,a).bind(function(e){return Z(Gm(e)).map(function(e){return Jm(t,e)})})})).bind(tg(r)),l=s.bind((i=r,function(t){return Al(t,i).bind(function(e){return Q(Gm(e)).map(function(e){return Jm(e,t)})})})).bind(tg(r));return ve.some({start:c,end:l})}function rg(e,t){return z(e,function(e){return je(e,t)})}function og(n){return dn(rg(n.cells,n.rng.start),rg(n.cells,n.rng.end),function(e,t){return n.cells.slice(e,t+1)})}function ig(e,t){var n=t.startTable,r=t.endTable,o=e.cloneRange();return n.each(function(e){return o.setStartAfter(e.dom)}),r.each(function(e){return o.setEndBefore(e.dom)}),o}function ag(e,t){var n,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,b=(n=e,function(e){return je(n,e)}),y=dn(Qm((r=t).startContainer,o=b),Qm(r.endContainer,o),Jm),C=(l=b,f=x((c=t).startContainer),d=x(c.endContainer),m=f.isSome(),g=d.isSome(),p=dn(f,d,je).getOr(!1),{startTable:f,endTable:d,isStartInTable:m,isEndInTable:g,isSameTable:p,isMultiTable:!p&&m&&g});function x(e){return Al(Nt.fromDom(e),l)}return h=t,v=b,y.exists(function(e){return!Zm(t=e)&&eg(t,v).exists(function(e){var t=e.dom.rows;return 1===t.length&&1===t[0].cells.length})&&Rl(e.start,h);var t})?y.map(function(e){return sp.singleCellTable(t,e.start)}):C.isMultiTable?ng(y,u=C,s=t,b).bind(function(e){var t=e.start,n=e.end,r=t.bind(og).getOr([]),o=n.bind(og).getOr([]);if(0<r.length&&0<o.length){var i=ig(s,u);return ve.some(sp.multiTable(r,o,i))}return ve.none()}):ng(y,i=C,a=t,b).bind(function(e){var t=e.start,n=e.end;return t.or(n)}).bind(function(e){var t=i.isSameTable,n=og(e).getOr([]);if(t&&e.cells.length===n.length)return ve.some(sp.fullTable(e.table));if(0<n.length){if(t)return ve.some(sp.partialTable(n,ve.none()));var r=ig(a,i);return ve.some(sp.partialTable(n,ve.some(_e(_e({},i),{rng:r}))))}return ve.none()})}function ug(e){return Y(e,function(e){yn(e,"contenteditable"),mm(e)}),0}function sg(e,t,n,r){var o=n.cloneRange();r?(o.setStart(n.startContainer,n.startOffset),o.setEndAfter(t.dom.lastChild)):(o.setStartBefore(t.dom.firstChild),o.setEnd(n.endContainer,n.endOffset)),lp(e,o,t,!1)}function cg(e){var t=_l(e),n=Nt.fromDom(e.selection.getNode());Gn(n.dom)&&Wr(n)?e.selection.setCursorLocation(n.dom,0):e.selection.collapse(!0),1<t.length&&F(t,function(e){return je(e,n)})&&pn(n,"data-mce-selected","1")}function lg(s,c,e){var l=s.selection.getRng();return ug(e.bind(function(e){var t,n,r,o=e.rng,i=e.isStartInTable,a=(t=i?o.endContainer:o.startContainer,ve.from(s.dom.getParent(t,s.dom.isBlock)).map(Nt.fromDom));o.deleteContents(),n=s,r=i,a.filter(Wr).each(function(e){r?Ln(e):(mm(e),n.selection.setCursorLocation(e.dom,0))});var u=i?c[0]:c[c.length-1];return sg(s,u,l,i),Wr(u)?ve.none():ve.some(i?c.slice(1):c.slice(0,-1))}).getOr(c)),cg(s),!0}function fg(e,t,n,r){var o=e.selection.getRng(),i=t[0],a=n[n.length-1];sg(e,i,o,!0),sg(e,a,o,!1);var u=Wr(i)?t:t.slice(1),s=Wr(a)?n:n.slice(0,-1);return ug(u.concat(s)),r.deleteContents(),cg(e),!0}function dg(e,t){return Ym(e,!1,t),!0}function mg(e,t){return M(hm(t,e),ho)}function gg(e,t){return(e?Qg:Zg)(t)}function pg(f,d,s){var m=Nt.fromDom(f.getBody());return fp(m,s).fold(function(){return o=f,i=d,a=m,e=s,u=as.fromRangeStart(o.selection.getRng()),mg(a,e).bind(function(e){return Wr(e)?dp(o,e):(t=a,n=e,r=u,Fc(i,o.getBody(),r).bind(function(e){return mg(t,Nt.fromDom(e.getNode())).map(function(e){return!1===je(e,n)})}));var t,n,r}).getOr(!1)||(n=d,r=as.fromRangeStart((t=f).selection.getRng()),gg(n,r)||Gl(n,t.getBody(),r).exists(function(e){return gg(n,e)}));var o,i,a,e,u,t,n,r},function(e){return n=d,r=m,o=e,i=as.fromRangeStart((t=f).selection.getRng()),(Wr(o)?dp(t,o):(u=r,c=o,l=i,Fc(s=n,(a=t).getBody(),l).bind(function(e){return r=s,o=l,i=e,ef((n=c).dom).bind(function(t){return tf(n.dom).map(function(e){return r?o.isEqual(t)&&i.isEqual(e):o.isEqual(e)&&i.isEqual(t)})}).getOr(!0)?dp(a,c):(t=c,fp(u,Nt.fromDom(e.getNode())).map(function(e){return!1===je(e,t)}));var t,n,r,o,i}).or(ve.some(!0)))).getOr(!1);var a,u,s,c,l,t,n,r,o,i})}function hg(e,t){var n,r,o,i,a,u,s,c,l=Nt.fromDom(e.selection.getStart(!0)),f=_l(e);return e.selection.isCollapsed()&&0===f.length?pg(e,t,l):(r=l,o=f,i=Nt.fromDom((n=e).getBody()),a=n.selection.getRng(),0!==o.length?lg(n,o,ve.none()):(u=n,c=a,fp(s=i,r).fold(function(){return t=u,ag(s,c).map(function(e){return e.fold(A(lp,t),A(dg,t),A(lg,t),A(fg,t))});var t},function(e){return dp(u,e)}).getOr(!1)))}function vg(e){return e.collapsed?e:(a=e,u=as.fromRangeStart(a),s=as.fromRangeEnd(a),c=a.commonAncestorContainer,Gl(!1,c,s).map(function(e){return!Ys(u,s,c)&&Ys(u,e,c)?(t=u.container(),n=u.offset(),r=e.container(),o=e.offset(),(i=document.createRange()).setStart(t,n),i.setEnd(r,o),i):a;var t,n,r,o,i}).getOr(a));var a,u,s,c}function bg(e,t){var n,r,o,i,a,u=t.firstChild,s=t.lastChild;return u&&"meta"===u.name&&(u=u.next),r=s=s&&"mce_marker"===s.attr("id")?s.prev:s,o=(n=e).getNonEmptyElements(),r&&(r.isEmpty(o)||(i=r,n.getBlockElements()[i.name]&&i.firstChild&&i.firstChild===i.lastChild&&("br"===(a=i.firstChild).name||a.value===yo)))&&(s=s.prev),u&&u===s&&("ul"===u.name||"ol"===u.name)}function yg(e){return 0<e.length&&(!(r=e[e.length-1]).firstChild||(t=r)&&t.firstChild&&t.firstChild===t.lastChild&&((n=t.firstChild).data===yo||Wn(n)))?e.slice(0,-1):e;var t,n,r}function Cg(e,t){var n=e.getParent(t,e.isBlock);return n&&"LI"===n.nodeName?n:null}function xg(e,t){var n=as.after(e),r=Pc(t).prev(n);return r?r.toRange():null}function wg(e,o,i,t){function n(e){var t=as.fromRangeStart(i),n=Pc(o.getRoot()),r=1===e?n.prev(t):n.next(t);return!r||Cg(o,r.getNode())!==R}var r,a,u,s,c,l,f,d,m,g,p,h,v,b,y,C,x,w,S,E,N,k,_,A=(r=o,c=e.serialize(t),u=(a=r.createFragment(c)).firstChild,s=a.lastChild,u&&"META"===u.nodeName&&u.parentNode.removeChild(u),s&&"mce_marker"===s.id&&s.parentNode.removeChild(s),a),R=Cg(o,i.startContainer),D=yg(U(A.firstChild.childNodes,function(e){return"LI"===e.nodeName})),T=o.getRoot();return n(1)?(S=T,_=(w=R).parentNode,Et.each(D,function(e){_.insertBefore(e,w)}),E=S,N=as.before(w),(k=Pc(E).next(N))?k.toRange():null):n(2)?(l=R,d=T,o.insertAfter((f=D).reverse(),l),xg(f[0],d)):(g=D,p=T,h=m=R,b=(v=i).cloneRange(),y=v.cloneRange(),b.setStartBefore(h),y.setEndAfter(h),C=[b.cloneContents(),y.cloneContents()],(x=m.parentNode).insertBefore(C[0],m),Et.each(g,function(e){x.insertBefore(e,m)}),x.insertBefore(C[1],m),x.removeChild(m),xg(g[g.length-1],p))}function Sg(e,t,n){var r,o,i,a,u=e.selection,s=e.dom;/^ | $/.test(t)&&(r=s,o=u.getRng(),i=t,i=Dm(a=Nt.fromDom(r.getRoot()),as.fromRangeStart(o))?i.replace(/^ /,"&nbsp;"):i.replace(/^&nbsp;/," "),t=i=Tm(a,as.fromRangeEnd(o))?i.replace(/(&nbsp;| )(<br( \/)>)?$/,"&nbsp;"):i.replace(/&nbsp;(<br( \/)?>)?$/," "));var c=e.parser,l=n.merge,f=nm({validate:e.getParam("validate")},e.schema),d='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;</span>',m=e.fire("BeforeSetContent",{content:t,format:"html",selection:!0,paste:n.paste});if(m.isDefaultPrevented())e.fire("SetContent",{content:m.content,format:"html",selection:!0,paste:n.paste});else{-1===(t=m.content).indexOf("{$caret}")&&(t+="{$caret}"),t=t.replace(/\{\$caret\}/,d);var g,p,h=(g=u.getRng()).startContainer||(g.parentElement?g.parentElement():null),v=e.getBody();h===v&&u.isCollapsed()&&s.isBlock(v.firstChild)&&((p=v.firstChild)&&!e.schema.getShortEndedElements()[p.nodeName])&&s.isEmpty(v.firstChild)&&((g=s.createRng()).setStart(v.firstChild,0),g.setEnd(v.firstChild,0),u.setRng(g)),u.isCollapsed()||function(e){var t=e.dom,n=vg(e.selection.getRng());e.selection.setRng(n);var r,o=t.getParent(n.startContainer,mp),i=n;null!==(r=o)&&r===t.getParent(i.endContainer,mp)&&Rl(Nt.fromDom(r),i)?lp(e,n,Nt.fromDom(o)):e.getDoc().execCommand("Delete",!1,null)}(e);var b,y,C,x,w,S,E,N,k,_,A,R,D,T,O={context:(I=u.getNode()).nodeName.toLowerCase(),data:n.data,insert:!0},B=c.parse(t,O);if(!0===n.paste&&bg(e.schema,B)&&Cg(s,I))return g=wg(f,s,u.getRng(),B),u.setRng(g),void e.fire("SetContent",m);if(function(){for(var e=B;e=e.walk();)1===e.type&&e.attr("data-mce-fragment","1")}(),"mce_marker"===(L=B.lastChild).attr("id"))for(var P=L,L=L.prev;L;L=L.walk(!0))if(3===L.type||!s.isBlock(L.name)){e.schema.isValidChild(L.parent.name,"span")&&L.parent.insert(P,L,"br"===L.name);break}if(e._selectionOverrides.showBlockCaretContainer(I),O.invalid){e.selection.setContent(d);var I=u.getNode(),M=e.getBody();for(9===I.nodeType?I=L=M:L=I;L!==M;)L=(I=L).parentNode;t=I===M?M.innerHTML:s.getOuterHTML(I),t=f.serialize(c.parse(t.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return f.serialize(B)}))),I===M?s.setHTML(M,t):s.setOuterHTML(I,t)}else b=e,y=t=f.serialize(B),"all"===(C=I).getAttribute("data-mce-bogus")?C.parentNode.insertBefore(b.dom.createFragment(y),C):(x=C.firstChild,w=C.lastChild,!x||x===w&&"BR"===x.nodeName?b.dom.setHTML(C,y):b.selection.setContent(y));E=l,_=(S=e).schema.getTextInlineElements(),A=S.dom,E&&(N=S.getBody(),k=em(A),Et.each(A.select("*[data-mce-fragment]"),function(e){if(V(_[e.nodeName.toLowerCase()])&&j(um(A,e),function(e){return!am.has(e)}))for(var t=e.parentNode;V(t)&&t!==N&&!function(r,o,i){function a(e){var t=r.getStyle(o,e),n=r.getStyle(i,e);return Be(t)&&Be(n)&&t!==n}var e=um(r,o),u=um(r,i);return F(e,function(t){function e(e){return F(e,function(e){return e===t})}if(e(u)||!e($g))return a(t);var n=U(u,function(t){return F($g,function(e){return Ge(t,e)})});return F(n,a)})}(A,e,t);t=t.parentNode)if(k.compare(t,e)){A.remove(e,!0);break}})),function(n,e){var t,r=n.dom,o=n.selection;if(e){o.scrollIntoView(e);var i=pf(n.getBody(),e);if("false"===r.getContentEditable(i))return r.remove(e),o.select(i);var a,u=r.createRng(),s=e.previousSibling;jn(s)?(u.setStart(s,s.nodeValue.length),xt.ie||(a=e.nextSibling,jn(a)&&(s.appendData(a.data),a.parentNode.removeChild(a)))):(u.setStartBefore(e),u.setEndBefore(e));var c=r.getParent(e,r.isBlock);r.remove(e),c&&r.isEmpty(c)&&(n.$(c).empty(),u.setStart(c,0),u.setEnd(c,0),mp(c)||c.getAttribute("data-mce-fragment")||!(t=function(e){var t=as.fromRangeStart(e);if(t=Pc(n.getBody()).next(t))return t.toRange()}(u))?r.add(c,r.create("br",{"data-mce-bogus":"1"})):(u=t,r.remove(c))),o.setRng(u)}}(e,s.get("mce_marker")),R=e.getBody(),Et.each(R.getElementsByTagName("*"),function(e){e.removeAttribute("data-mce-fragment")}),D=s,T=u.getStart(),ve.from(D.getParent(T,"td,th")).map(Nt.fromDom).each(gm),e.fire("SetContent",m),e.addVisual()}}function Eg(e){return e instanceof Ud}function Ng(e,t,n){var r;e.dom.setHTML(e.getBody(),t),!0!==n&&vd(r=e)&&ef(r.getBody()).each(function(e){var t=e.getNode(),n=cn(t)?ef(t).getOr(e):e;r.selection.setRng(n.toRange())})}function kg(u,s,e){var t,n=(t=s,_e(_e({format:"html"},e),{set:!0,content:Eg(t)?"":t})),c=e.no_events?n:u.fire("BeforeSetContent",n);return Eg(s)||(s=c.content),ve.from(u.getBody()).fold(J(s),function(e){return Eg(s)?function(e,t,n,r){var o,i,u,a;o=e.parser.getNodeFilters(),i=e.parser.getAttributeFilters(),u=n,a=function(e,n){var t,r,o={},i={},a=[];for(t in u.firstChild&&gp(u.firstChild,function(t){Y(e,function(e){e.name===t.name&&(o[e.name]?o[e.name].nodes.push(t):o[e.name]={filter:e,nodes:[t]})}),Y(n,function(e){"string"==typeof t.attr(e.name)&&(i[e.name]?i[e.name].nodes.push(t):i[e.name]={filter:e,nodes:[t]})})}),o)Ne(o,t)&&a.push(o[t]);for(r in i)Ne(i,r)&&a.push(i[r]);return a}(o,i),Y(a,function(t){Y(t.filter.callbacks,function(e){e(t.nodes,t.filter.name,{})})});var s=nm({validate:e.validate},e.schema).serialize(n);return r.content=vo(Nt.fromDom(t))?s:Et.trim(s),Ng(e,r.content,r.no_selection),r.no_events||e.fire("SetContent",r),n}(u,e,s,c):(t=u,n=e,o=c,0===(r=s).length||/^\s+$/.test(r)?(i='<br data-mce-bogus="1">',"TABLE"===n.nodeName?r="<tr><td>"+i+"</td></tr>":/^(UL|OL)$/.test(n.nodeName)&&(r="<li>"+i+"</li>"),r=(a=Ss(t))&&t.schema.isValidChild(n.nodeName.toLowerCase(),a.toLowerCase())?(r=i,t.dom.createHTML(a,Es(t),r)):r||'<br data-mce-bogus="1">',Ng(t,r,o.no_selection),t.fire("SetContent",o)):("raw"!==o.format&&(r=nm({validate:t.validate},t.schema).serialize(t.parser.parse(r,{isRootContent:!0,insert:!0}))),o.content=vo(Nt.fromDom(n))?r:Et.trim(r),Ng(t,o.content,o.no_selection),o.no_events||t.fire("SetContent",o)),o.content);var t,n,r,o,i,a})}function _g(e){return y(e)?e:R}function Ag(i,e,t){var n=e(i),a=_g(t);return n.orThunk(function(){return a(i)?ve.none():function(e){for(var t=i.dom,n=_g(a);t.parentNode;){var t=t.parentNode,r=Nt.fromDom(t),o=e(r);if(o.isSome())return o;if(n(r))break}return ve.none()}(e)})}function Rg(e,t,n){var r=e.formatter.get(n);if(r)for(var o=0;o<r.length;o++){var i=r[o];if(fl(i)&&!1===i.inherit&&e.dom.is(t,i.selector))return 1}}function Dg(t,e,n,r,o){var i=t.dom.getRoot();return e!==i&&(e=t.dom.getParent(e,function(e){return!!Rg(t,e,n)||e.parentNode===i||!!hp(t,e,n,r,!0)}),!!hp(t,e,n,r,o))}function Tg(e,t,n){return!!pp(t,n.inline)||!!pp(t,n.block)||(n.selector?1===t.nodeType&&e.is(t,n.selector):void 0)}function Og(e,t,n,r,o,i){var a=n[r];if(y(n.onmatch))return n.onmatch(t,n,r);if(a)if(b(a.length)){for(var u in a)if(Ne(a,u)){var s="attributes"===r?e.getAttrib(t,u):al(e,t,u),c=rl(a[u],i),l=K(s)||Pe(s);if(!l||!K(c)){if(o&&l&&!n.exact)return;if((!o||n.exact)&&!pp(s,il(e,c,u)))return}}}else for(var f=0;f<a.length;f++)if("attributes"===r?e.getAttrib(t,a[f]):al(e,t,a[f]))return 1;return 1}function Bg(e,t,n,r,o){if(r)return Dg(e,r,t,n,o);if(r=e.selection.getNode(),Dg(e,r,t,n,o))return!0;var i=e.selection.getStart();return!(i===r||!Dg(e,i,t,n,o))}function Pg(e){return 0<function(e){for(var t=[];e;){if(3===e.nodeType&&e.nodeValue!==vp||1<e.childNodes.length)return[];1===e.nodeType&&t.push(e),e=e.firstChild}return t}(e).length}function Lg(e){if(e){var t=new Rr(e,e);for(e=t.current();e;e=t.next())if(jn(e))return e}return null}function Ig(e){var t=Nt.fromTag("span");return hn(t,{id:bp,"data-mce-bogus":"1","data-mce-type":"format-caret"}),e&&Pn(t,Nt.fromText(vp)),t}function Mg(e,t,n){void 0===n&&(n=!0);var r,o,i,a,u,s,c,l,f=e.dom,d=e.selection;Pg(t)?Ym(e,!1,Nt.fromDom(t),n):(r=d.getRng(),o=f.getParent(t,f.isBlock),i=r.startContainer,a=r.startOffset,u=r.endContainer,s=r.endOffset,(l=Lg(t))&&l.nodeValue.charAt(0)===vp&&l.deleteData(0,1),c=l,f.remove(t,!0),i===c&&0<a&&r.setStart(c,a-1),u===c&&0<s&&r.setEnd(c,s-1),o&&f.isEmpty(o)&&mm(Nt.fromDom(o)),d.setRng(r))}function Fg(e,t,n){void 0===n&&(n=!0);var r=e.dom,o=e.selection;if(t)Mg(e,t,n);else if(!(t=Hc(e.getBody(),o.getStart())))for(;t=r.get(bp);)Mg(e,t,!1)}function Ug(e,t){return e.appendChild(t),t}function zg(e,t){var n=P(e,function(e,t){return Ug(e,t.cloneNode(!1))},t);return Ug(n,n.ownerDocument.createTextNode(vp))}function Hg(o,e,t,i,n,r){var a,u,s=o.formatter,c=o.dom,l=U(we(s.get()),function(e){return e!==i&&!Te(e,"removeformat")});if(0<U((a=o,u=t,L(l,function(e,t){var n=cl(a,t);return a.formatter.matchNode(u,t,{},n)?e.concat([t]):e},[])),function(e){return n=i,r=["inline","block","selector","attributes","styles","classes"],!F((t=o).formatter.get(e),function(e){var i=a(e);return F(t.formatter.get(n),function(e){var t,n=a(e),r=i,o=n;return d(t=void 0===t?p:t).eq(r,o)})});function a(e){return ae(e,function(e,t){return F(r,function(e){return e===t})})}var t,n,r}).length){var f=t.cloneNode(!1);return c.add(e,f),s.remove(i,n,f,r),c.remove(f),ve.some(f)}return ve.none()}function jg(e,t,n,r){var o,i,a,u,s,c,l,f,d,m,g,p,h,v,b,y=e.dom,C=e.selection,x=[],w=C.getRng(),S=w.startContainer,E=w.startOffset,N=S;for(3===S.nodeType&&(E!==S.nodeValue.length&&(o=!0),N=N.parentNode);N;){if(hp(e,N,t,n,r)){i=N;break}N.nextSibling&&(o=!0),x.push(N),N=N.parentNode}i&&(o?(a=C.getBookmark(),w.collapse(!0),u=Tf(Sl(e,w,e.formatter.get(t),!0)),e.formatter.remove(t,n,u,r),C.moveToBookmark(a)):(s=Hc(e.getBody(),i),d=c=Ig(!1).dom,(p=(g=e.dom).getParent(m=null!==s?s:i,A(tl,e)))&&g.isEmpty(p)?m.parentNode.replaceChild(d,m):(h=Nt.fromDom(m),v=hu(h,"br"),b=U(function(){for(var e=[],t=h.dom;t;)e.push(Nt.fromDom(t)),t=t.lastChild;return e}().slice(-1),Br),v.length===b.length&&Y(b,Ln),g.isEmpty(m)?m.parentNode.replaceChild(d,m):g.insertAfter(d,m)),l=Hg(e,c,i,t,n,r),f=zg(x.concat(l.toArray()),c),Mg(e,s,!1),C.setCursorLocation(f,1),y.isEmpty(i)&&y.remove(i)))}function Vg(e,t){var n=e.schema.getTextInlineElements();return Ne(n,kt(t))&&!zc(t.dom)&&!sn(t.dom)}Y(["margin","margin-left","margin-right","margin-top","margin-bottom","padding","padding-left","padding-right","padding-top","padding-bottom","border","border-width","border-style","border-color","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","float","position","left","right","top","bottom","z-index","display","transform","width","max-width","min-width","height","max-height","min-height","overflow","overflow-x","overflow-y","text-overflow","vertical-align","transition","transition-delay","transition-duration","transition-property","transition-timing-function"],function(e){am.add(e)});var qg,$g=["font","text-decoration","text-emphasis"],Wg=A(sm,!0,Gc),Kg=A(sm,!1,Gc),Xg=lm(!0,fm),Yg=lm(!1,fm),Gg=lm(!0,Jn),Jg=lm(!1,Jn),Qg=lm(!0,cn),Zg=lm(!1,cn),ep=lm(!0,dm),tp=lm(!1,dm),np=A(Cm,!1),rp=A(Cm,!0),op=A(ym,!1),ip=A(ym,!0),ap=A(wm,!1),up=A(wm,!0),sp=or([{singleCellTable:["rng","cell"]},{fullTable:["table"]},{partialTable:["cells","outsideDetails"]},{multiTable:["startTableCells","endTableCells","betweenRng"]}]),cp=function(e){var t;return(8===_t(t=e)||"#comment"===kt(t)?Bt:Ut)(e).bind(cp).orThunk(function(){return ve.some(e)})},lp=function(e,t,n,r){void 0===r&&(r=!0),t.deleteContents();var o,i=cp(n).getOr(n),a=Nt.fromDom(e.dom.getParent(i.dom,e.dom.isBlock));return Wr(a)&&(mm(a),r&&e.selection.setCursorLocation(a.dom,0)),je(n,a)||Y((fn(Ot(a),n)?[]:Ot(o=a).map(Dn).map(function(e){return U(e,function(e){return!je(o,e)})}).getOr([])).concat(Dn(n)),function(e){je(e,a)||Ve(e,a)||!Wr(e)||Ln(e)}),!0},fp=function(e,t){return M(hm(t,e),function(e){return kn(e)&&"caption"===kt(e)})},dp=function(e,t){return mm(t),e.selection.setCursorLocation(t.dom,0),ve.some(!0)},mp=Gn,gp=function(e,t){t(e),e.firstChild&&gp(e.firstChild,t),e.next&&gp(e.next,t)},pp=ol,hp=function(e,t,n,r,o){var i=e.formatter.get(n),a=e.dom;if(i&&t)for(var u=0;u<i.length;u++){var s=i[u];if(Tg(e.dom,t,s)&&Og(a,t,s,"attributes",o,r)&&Og(a,t,s,"styles",o,r)){var c=s.classes;if(c)for(var l=0;l<c.length;l++)if(!e.dom.hasClass(t,rl(c[l],r)))return;return s}}},vp=Co,bp="_mce_caret",yp={},Cp=fe,xp=ce;function wp(e){return zn(e)&&!Yc(e)&&!zc(e)&&!sn(e)}function Sp(e,t){for(var n=e;n;n=n[t]){if(jn(n)&&Be(n.data))return e;if(zn(n)&&!Yc(n))return n}return e}function Ep(e,t,n){var r=em(e);if(t&&n&&(t=Sp(t,"previousSibling"),n=Sp(n,"nextSibling"),r.compare(t,n))){for(var o=t.nextSibling;o&&o!==n;){var i=o,o=o.nextSibling;t.appendChild(i)}return e.remove(n),Et.each(Et.grep(n.childNodes),function(e){t.appendChild(e)}),t}return n}function Np(e,t,n,r){var o;r&&!1!==t.merge_siblings&&(o=Ep(e,el(r),r),Ep(e,o,el(o,!0)))}function kp(t,n){return function(e){return!(!e||!al(t,e,n))}}function _p(r,o,i){return function(e){var t,n;r.setStyle(e,o,i),""===e.getAttribute("style")&&e.removeAttribute("style"),t=r,"SPAN"===(n=e).nodeName&&0===t.getAttribs(n).length&&t.remove(n,!0)}}function Ap(e,t,n){return e.isChildOf(t,n)&&t!==n&&!e.isBlock(n)}function Rp(e,t,n){var r,o=t[n?"startContainer":"endContainer"],i=t[n?"startOffset":"endOffset"];return zn(o)&&(r=o.childNodes.length-1,!n&&i&&i--,o=o.childNodes[r<i?r:i]),jn(o)&&n&&i>=o.nodeValue.length&&(o=new Rr(o,e.getBody()).next()||o),jn(o)&&!n&&0===i&&new Rr(o,e.getBody()).prev()||o}function Dp(e,t){var n=t?"firstChild":"lastChild";if(/^(TR|TH|TD)$/.test(e.nodeName)&&e[n]){var r=e[n];return"TR"===e.nodeName&&r[n]||r}return e}function Tp(e,t,n,r){var o=e.create(n,r);return t.parentNode.insertBefore(o,t),o.appendChild(t),o}function Op(e,t,n,r,o){var i=Nt.fromDom(t),a=Nt.fromDom(e.create(r,o));return Kt(a,(n?It:Lt)(i)),n?(qt(i,a),Wt(a,i)):($t(i,a),Pn(a,i)),a.dom}function Bp(e,t,n,r){var o=el(t,n,r);return K(o)||"BR"===o.nodeName||e.isBlock(o)}function Pp(e,r,o,t,i){var n,a,u=e.dom,s=u,c=t;if(!(dl(a=r)&&kh(c,a.inline)||ll(a)&&kh(c,a.block)||fl(a)&&(zn(c)&&s.is(c,a.selector))||r.links&&"A"===t.nodeName))return Sh.keep();var l,f,d,m,g,p,h,v,b=t;if(dl(r)&&"all"===r.remove&&S(r.preserve_attributes)){var y=U(u.getAttribs(b),function(e){return D(r.preserve_attributes,e.name.toLowerCase())});if(u.removeAllAttribs(b),Y(y,function(e){return u.setAttrib(b,e.name,e.value)}),0<y.length)return Sh.rename("span")}if("all"!==r.remove){Nh(r.styles,function(e,t){e=il(u,rl(e,o),t+""),E(t)&&(t=e,i=null),!r.remove_similar&&i&&!kh(al(u,i,t),e)||u.setStyle(b,t,""),n=!0}),n&&""===u.getAttrib(b,"style")&&(b.removeAttribute("style"),b.removeAttribute("data-mce-style")),Nh(r.attributes,function(e,t){var n;if(e=rl(e,o),E(t)&&(t=e,i=null),r.remove_similar||!i||kh(u.getAttrib(i,t),e))if("class"===t&&(e=u.getAttrib(b,t))&&(n="",Y(e.split(/\s+/),function(e){/mce\-\w+/.test(e)&&(n+=(n?" ":"")+e)}),n))u.setAttrib(b,t,n);else{if(Eh.test(t)&&b.removeAttribute("data-mce-"+t),"style"===t&&on(["li"])(b)&&"none"===u.getStyle(b,"list-style-type"))return b.removeAttribute(t),void u.setStyle(b,"list-style-type","none");"class"===t&&b.removeAttribute("className"),b.removeAttribute(t)}}),Nh(r.classes,function(e){e=rl(e,o),i&&!u.hasClass(i,e)||u.removeClass(b,e)});for(var C=u.getAttribs(b),x=0;x<C.length;x++){var w=C[x].nodeName;if(0!==w.indexOf("_")&&0!==w.indexOf("data-"))return Sh.keep()}}return"none"!==r.remove?(l=e,d=r,p=(f=b).parentNode,h=l.dom,v=Ss(l),ll(d)&&(v?p===h.getRoot()&&(d.list_block&&kh(f,d.list_block)||Y(xe(f.childNodes),function(e){nl(l,v,e.nodeName.toLowerCase())?m?m.appendChild(e):(m=Tp(h,e,v),h.setAttribs(m,l.settings.forced_root_block_attrs)):m=null})):h.isBlock(f)&&!h.isBlock(p)&&(Bp(h,f,!1)||Bp(h,f.firstChild,!0,!0)||f.insertBefore(h.create("br"),f.firstChild),Bp(h,f,!0)||Bp(h,f.lastChild,!1,!0)||f.appendChild(h.create("br")))),fl(g=d)&&dl(g)&&fn(ue(g,"mixed"),!0)&&!kh(d.inline,f)||h.remove(f,!0),Sh.removed()):Sh.keep()}function Lp(t,e,n,r,o){return Pp(t,e,n,r,o).fold(R,function(e){return t.dom.rename(r,e),!0},w)}function Ip(u,s,c,e,l){function a(e){var n,r,o,i,a,t=(r=s,o=c,i=l,Y(sl((n=u).dom,e.parentNode).reverse(),function(e){var t;a||"_start"===e.id||"_end"===e.id||(t=hp(n,e,r,o,i))&&!1!==t.split&&(a=e)}),a);return function(e,t,n,r,o,i,a,u){var s,c,l=e.dom;if(n){for(var f=n.parentNode,d=r.parentNode;d&&d!==f;d=d.parentNode){for(var m=l.clone(d,!1),g=0;g<t.length&&null!==(m=function(t,e,n){return Pp(t,e,u,n,n).fold(J(n),function(e){return t.dom.createFragment().appendChild(n),t.dom.rename(n,e)},J(null))}(e,t[g],m));g++);m&&(s&&m.appendChild(s),c=c||m,s=m)}!i||a.mixed&&l.isBlock(n)||(r=l.split(n,r)),s&&(o.parentNode.insertBefore(s,o),c.appendChild(o),dl(a)&&Np(l,a,0,s))}return r}(u,m,t,e,e,!0,g,c)}function f(t){return F(m,function(e){return Lp(u,e,c,t,t)})}function d(e){var t,n=h.get(e?"_start":"_end"),r=n[e?"firstChild":"lastChild"];return Yc(t=r)&&zn(t)&&("_start"===t.id||"_end"===t.id)&&(r=r[e?"firstChild":"lastChild"]),jn(r)&&0===r.data.length&&(r=e?n.previousSibling||n.nextSibling:n.nextSibling||n.previousSibling),h.remove(n,!0),r}function t(e){var t=Sl(u,e,m,e.collapsed);if(g.split){if(t=Tf(t),(r=Rp(u,t,!0))!==(o=Rp(u,t))){if(r=Dp(r,!0),o=Dp(o,!1),Ap(h,r,o)){var n=ve.from(r.firstChild).getOr(r);return a(Op(h,n,!0,"span",{id:"_start","data-mce-type":"bookmark"})),void d(!0)}if(Ap(h,o,r))return n=ve.from(o.lastChild).getOr(o),a(Op(h,n,!1,"span",{id:"_end","data-mce-type":"bookmark"})),void d(!1);var r=Tp(h,r,"span",{id:"_start","data-mce-type":"bookmark"}),o=Tp(h,o,"span",{id:"_end","data-mce-type":"bookmark"}),i=h.createRng();i.setStartAfter(r),i.setEndBefore(o),El(h,i,function(e){Y(e,function(e){Yc(e)||Yc(e.parentNode)||a(e)})}),a(r),a(o),r=d(!0),o=d()}else r=o=a(r);t.startContainer=r.parentNode||r,t.startOffset=h.nodeIndex(r),t.endContainer=o.parentNode||o,t.endOffset=h.nodeIndex(o)+1}El(h,t,function(e){Y(e,v)})}var n,m=u.formatter.get(s),g=m[0],p=!0,h=u.dom,r=u.selection,v=function(t){var e=!0,n=!1;zn(t)&&h.getContentEditable(t)&&(e=p,p="true"===h.getContentEditable(t),n=!0);var r,o,i=xe(t.childNodes);if(p&&!n&&(r=f(t),o=t.parentNode,!r&&V(o)&&ml(g)&&f(o)),g.deep&&i.length){for(var a=0;a<i.length;a++)v(i[a]);n&&(p=e)}Y(["underline","line-through","overline"],function(e){zn(t)&&u.dom.getStyle(t,"text-decoration")===e&&t.parentNode&&ul(h,t.parentNode)===e&&Lp(u,{deep:!1,exact:!0,inline:"span",styles:{textDecoration:e}},null,t)})};if(e)return Qc(e)?((n=h.createRng()).setStartBefore(e),n.setEndAfter(e),t(n)):t(e),void yf(u,s,e,c);if("false"!==h.getContentEditable(r.getNode()))r.isCollapsed()&&dl(g)&&!_l(u).length?jg(u,s,c,l):(Bl(r,!0,function(){Ol(u,t)}),dl(g)&&Bg(u,s,c,r.getStart())&&Zc(h,r,r.getRng()),u.nodeChanged()),yf(u,s,e,c);else{e=r.getNode();for(var o=0;o<m.length&&(!m[o].ceFalseOverride||!Lp(u,m[o],c,e,e));o++);yf(u,s,e,c)}}function Mp(e){return zn(e)&&!Yc(e)&&!zc(e)&&!sn(e)}function Fp(e){return Ne(e,"vars")}function Up(n,e,r,o,i){return I(e,function(e){var t=n.formatter.matchNode(e,r,null!=i?i:{},o);return!b(t)},function(e){return Rg(n,e,r)||!o&&V(n.formatter.matchNode(e,r,i,!0))})}function zp(e,t){var n=null!=t?t:Dh(e);return U(sl(e.dom,n),function(e){return zn(e)&&!sn(e)})}function Hp(e,o,i,a,t,n){var r,u,s,c,l,f,d,m,g;return null===o.get()&&(u=e,(r=o).set({}),u.on("NodeChange",function(e){Th(u,e.element,r.get())}),u.on("FormatApply FormatRemove",function(e){var t=ve.from(e.node).map(function(e){return Qc(e)?e:e.startContainer}).bind(function(e){return zn(e)?ve.some(e):ve.from(e.parentElement)}).getOrThunk(function(){return Dh(u)});Th(u,t,r.get())})),s=e,l=i,f=a,d=t,m=n,g=(c=o).get(),Y(l.split(","),function(t){function e(){var e=zp(s);return Up(s,e,t,d,m).isSome()}var n,r=ue(g,t).getOrThunk(function(){var e={withSimilar:{state:ru(!1),similar:!0,callbacks:[]},withoutSimilar:{state:ru(!1),similar:!1,callbacks:[]},withVars:[]};return g[t]=e});b(m)?((n=d?r.withSimilar:r.withoutSimilar).callbacks.push(f),1===n.callbacks.length&&n.state.set(e())):r.withVars.push({state:ru(e()),similar:d,vars:m,callback:f})}),c.set(g),{unbind:function(){var e,t=i,n=a,r=(e=o).get();Y(t.split(","),function(t){return ue(r,t).each(function(e){r[t]={withSimilar:_e(_e({},e.withSimilar),{callbacks:U(e.withSimilar.callbacks,function(e){return e!==n})}),withoutSimilar:_e(_e({},e.withoutSimilar),{callbacks:U(e.withoutSimilar.callbacks,function(e){return e!==n})}),withVars:U(e.withVars,function(e){return e.callback!==n})}})}),e.set(r)}}}function jp(e,t){var n=(t||document).createDocumentFragment();return Y(e,function(e){n.appendChild(e.dom)}),Nt.fromDom(n)}function Vp(e,t,n){return{element:e,width:t,rows:n}}function qp(e,t){return{element:e,cells:t}}function $p(e,t){var n=parseInt(vn(e,t),10);return isNaN(n)?1:n}function Wp(e){return L(e,function(e,t){return t.cells.length>e?t.cells.length:e},0)}function Kp(e,t){for(var n=e.rows,r=0;r<n.length;r++)for(var o=n[r].cells,i=0;i<o.length;i++)if(je(o[i],t))return ve.some({x:i,y:r});return ve.none()}function Xp(e,t,n,r,o){for(var i=[],a=e.rows,u=n;u<=o;u++){var s=a[u].cells,c=t<r?s.slice(t,r+1):s.slice(r,t+1);i.push(qp(a[u].element,c))}return i}function Yp(e){var o=Vp(wu(e),0,[]);return Y(hu(e,"tr"),function(n,r){Y(hu(n,"td,th"),function(e,t){!function(e,t,n,r,o){for(var i=$p(o,"rowspan"),a=$p(o,"colspan"),u=e.rows,s=n;s<n+i;s++){u[s]||(u[s]=qp(Su(r),[]));for(var c=t;c<t+a;c++)u[s].cells[c]=s===n&&c===t?o:wu(o)}}(o,function(e,t,n){for(;r=t,((o=e.rows)[n]?o[n].cells:[])[r];)t++;var r,o;return t}(o,t,r),r,n,e)})}),Vp(o.element,Wp(o.rows),o.rows)}function Gp(e,t){var n,r,o,i=Nt.fromDom(t.commonAncestorContainer),a=hm(i,e),u=U(a,function(e){return Or(e)||co(e)}),s=(o=t,M(r=a,function(e){return"li"===kt(e)&&Rl(e,o)}).fold(J([]),function(e){return M(r,function(e){return"ul"===kt(e)||"ol"===kt(e)}).map(function(e){var t=Nt.fromTag(kt(e));return Cn(t,ae(Sn(e),function(e,t){return Ge(t,"list-style")})),[Nt.fromTag("li"),t]}).getOr([])}));return T(u.concat(s.length?s:go(n=i)?Ot(n).filter(mo).fold(J([]),function(e){return[n,e]}):mo(n)?[n]:[]),wu)}function Jp(){return jp([])}function Qp(e,i){return hr(i[0],"table",A(je,e)).bind(function(e){var s,t,n=i[0],r=i[i.length-1],o=Yp(e);return t=r,Kp(s=o,n).bind(function(u){return Kp(s,t).map(function(e){return t=s,n=u.x,r=u.y,o=e.x,a=r<(i=e.y)?Xp(t,n,r,o,i):Xp(t,n,i,o,r),Vp(t.element,Wp(a),a);var t,n,r,o,i,a})}).map(function(e){return jp([(n=T((t=e).rows,function(e){var t=T(e.cells,function(e){var t=Su(e);return yn(t,"colspan"),yn(t,"rowspan"),t}),n=wu(e.element);return Kt(n,t),n}),r=wu(t.element),Kt(o=Nt.fromTag("tbody"),n),Pn(r,o),r)]);var t,n,r,o})}).getOrThunk(Jp)}function Zp(e,t){var n,r,o,i,a,u,s,c=kl(t,e);return 0<c.length?Qp(e,c):(n=e,0<(r=t).length&&r[0].collapsed?Jp():(o=n,i=r[0],a=Nt.fromDom(i.cloneContents()),s=L(u=Gp(o,i),function(e,t){return Pn(t,e),t},a),0<u.length?jp([s]):s))}function eh(e,t){return 0<=t&&t<e.length&&Gc(e.charAt(t))}function th(e,t){var n=wo(e.innerText);return t?n.replace(/^[ \f\n\r\t\v]+/,""):n}function nh(e){return zn(e)?e.outerHTML:jn(e)?Go.encodeRaw(e.data,!1):Vn(e)?"\x3c!--"+e.data+"--\x3e":""}function rh(e,c){var l=0;Y(e,function(e){var t,n,r,o,i,a,u,s;0===e[0]?l++:1===e[0]?(o=c,i=e[1],a=l,s=function(e){var t,n=document.createElement("div"),r=document.createDocumentFragment();for(e&&(n.innerHTML=e);t=n.firstChild;)r.appendChild(t);return r}(i),o.hasChildNodes()&&a<o.childNodes.length?(u=o.childNodes[a]).parentNode.insertBefore(s,u):o.appendChild(s),l++):2===e[0]&&(n=l,(t=c).hasChildNodes()&&n<t.childNodes.length&&(r=t.childNodes[n]).parentNode.removeChild(r))})}function oh(n){var e,t=H((e=n.getBody(),U(T(xe(e.childNodes),nh),function(e){return 0<e.length})),function(e){var t=Zd(n.serializer,e);return 0<t.length?[t]:[]}),r=t.join("");return-1!==r.indexOf("</iframe>")?{type:"fragmented",fragments:t,content:"",bookmark:null,beforeBookmark:null}:{type:"complete",fragments:null,content:r,bookmark:null,beforeBookmark:null}}function ih(e,t,n){var r,o,i,g,p,a,h,v,c,l,u,s=n?t.beforeBookmark:t.bookmark;function b(e,t,n,r){for(var o=e;o-t<r&&o<n&&g[o]===p[o-t];)++o;return{start:e,end:o,diag:t}}"fragmented"===t.type?(r=t.fragments,o=e.getBody(),i=T(xe(o.childNodes),nh),rh((p=r,a=(g=i).length+p.length+2,h=new Array(a),v=new Array(a),c=function(e,t,n,r,o){var i=l(e,t,n,r);if(null===i||i.start===t&&i.diag===t-r||i.end===e&&i.diag===e-n)for(var a=e,u=n;a<t||u<r;)a<t&&u<r&&g[a]===p[u]?(o.push([0,g[a]]),++a,++u):r-n<t-e?(o.push([2,g[a]]),++a):(o.push([1,p[u]]),++u);else{c(e,i.start,n,i.start-i.diag,o);for(var s=i.start;s<i.end;++s)o.push([0,g[s]]);c(i.end,t,i.end-i.diag,r,o)}},l=function(e,t,n,r){var o=t-e,i=r-n;if(0==o||0==i)return null;var a,u,s,c,l,f=o-i,d=i+o,m=(d%2==0?d:1+d)/2;for(h[1+m]=e,v[1+m]=t+1,a=0;a<=m;++a){for(u=-a;u<=a;u+=2){for(s=u+m,u===-a||u!==a&&h[s-1]<h[s+1]?h[s]=h[s+1]:h[s]=h[s-1]+1,l=(c=h[s])-e+n-u;c<t&&l<r&&g[c]===p[l];)h[s]=++c,++l;if(f%2!=0&&f-a<=u&&u<=f+a&&v[s-f]<=h[s])return b(v[s-f],u+e-n,t,r)}for(u=f-a;u<=f+a;u+=2){for(s=u+m-f,u===f-a||u!==f+a&&v[s+1]<=v[s-1]?v[s]=v[s+1]-1:v[s]=v[s-1],l=(c=v[s]-1)-e+n-u;e<=c&&n<=l&&g[c]===p[l];)v[s]=c--,l--;if(f%2==0&&-a<=u&&u<=a&&v[s]<=h[s+f])return b(v[s],u+e-n,t,r)}}},u=[],c(0,g.length,0,p.length,u),u),o)):e.setContent(t.content,{format:"raw",no_selection:!V(s)||!jc(s)||!s.isFakeCaret}),e.selection.moveToBookmark(s)}function ah(e){return"fragmented"===e.type?e.fragments.join(""):e.content}function uh(e){var t=Nt.fromTag("body",Oh());return Cu(t,ah(e)),Y(hu(t,"*[data-mce-bogus]"),Yt),t.dom.innerHTML}function sh(e,t){return!(!e||!t)&&(r=t,ah(e)===ah(r)||(n=t,uh(e)===uh(n)));var n,r}function ch(e){return 0===e.get()}function lh(e,t,n){ch(n)&&(e.typing=t)}function fh(e,t){e.typing&&(lh(e,!1,t),e.add())}function dh(c){return{undoManager:{beforeChange:function(e,t){var n=c,r=t;ch(e)&&r.set(mc(n.selection))},add:function(e,t,n,r,o,i){return function(e,t,n,r,o,i,a){var u=oh(e);if(i=Et.extend(i=i||{},u),!1===ch(r)||e.removed)return null;var s=t.data[n.get()];if(e.fire("BeforeAddUndo",{level:i,lastLevel:s,originalEvent:a}).isDefaultPrevented())return null;if(s&&sh(s,i))return null;t.data[n.get()]&&o.get().each(function(e){t.data[n.get()].beforeBookmark=e});var c=e.getParam("custom_undo_redo_levels",0,"number");if(c&&t.data.length>c){for(var l=0;l<t.data.length-1;l++)t.data[l]=t.data[l+1];t.data.length--,n.set(t.data.length)}i.bookmark=mc(e.selection),n.get()<t.data.length-1&&(t.data.length=n.get()+1),t.data.push(i),n.set(t.data.length-1);var f={level:i,lastLevel:s,originalEvent:a};return 0<n.get()?(e.setDirty(!0),e.fire("AddUndo",f),e.fire("change",f)):e.fire("AddUndo",f),i}(c,e,t,n,r,o,i)},undo:function(e,t,n){return r=c,i=t,a=n,(o=e).typing&&(o.add(),o.typing=!1,lh(o,!1,i)),0<a.get()&&(a.set(a.get()-1),ih(r,u=o.data[a.get()],!0),r.setDirty(!0),r.fire("Undo",{level:u})),u;var r,o,i,a,u},redo:function(e,t){return n=c,o=t,(r=e).get()<o.length-1&&(r.set(r.get()+1),ih(n,i=o[r.get()],!1),n.setDirty(!0),n.fire("Redo",{level:i})),i;var n,r,o,i},clear:function(e,t){var n,r=c,o=t;(n=e).data=[],o.set(0),n.typing=!1,r.fire("ClearUndos")},reset:function(e){var t;(t=e).clear(),t.add()},hasUndo:function(e,t){return n=c,r=e,0<t.get()||r.typing&&r.data[0]&&!sh(oh(n),r.data[0]);var n,r},hasRedo:function(e,t){return n=e,t.get()<n.data.length-1&&!n.typing;var n},transact:function(e,t,n){return o=n,fh(r=e,t),r.beforeChange(),r.ignore(o),r.add();var r,o},ignore:function(e,t){try{e.set(e.get()+1),t()}finally{e.set(e.get()-1)}},extra:function(e,t,n,r){var o,i,a=c,u=t,s=r;(o=e).transact(n)&&(i=o.data[u.get()].bookmark,ih(a,o.data[u.get()-1],!0),o.transact(s)&&(o.data[u.get()-1].beforeBookmark=i))}},formatter:{match:function(e,t,n,r){return Bg(c,e,t,n,r)},matchAll:function(e,t){return o=e,i=t,a=[],u={},n=(r=c).selection.getStart(),r.dom.getParent(n,function(e){for(var t=0;t<o.length;t++){var n=o[t];!u[n]&&hp(r,e,n,i)&&(u[n]=!0,a.push(n))}},r.dom.getRoot()),a;var r,o,i,a,u,n},matchNode:function(e,t,n,r){return hp(c,e,t,n,r)},canApply:function(u){return function(e){var t=e.formatter.get(u),n=e.dom;if(t)for(var r=sl(n,e.selection.getStart()),o=t.length-1;0<=o;o--){var i=t[o];if(!fl(i)||V(i.defaultBlock))return!0;for(var a=r.length-1;0<=a;a--)if(n.is(r[a],i.selector))return!0}return!1}(c)},closest:function(e){return r=c,o=e,ve.from(r.selection.getStart(!0)).bind(function(e){return Ag(Nt.fromDom(e),function(n){return ee(o,function(e){return hp(r,n.dom,t=e)?ve.some(t):ve.none();var t})},t)}).getOrNull();function t(e){return je(e,Nt.fromDom(r.getBody()))}var r,o},apply:function(e,t,n){return Rh(c,e,t,n)},remove:function(e,t,n,r){return Ip(c,e,t,n,r)},toggle:function(e,t,n){var r,o=e,i=t,a=n,u=(r=c).formatter.get(o);(!Bg(r,o,i,a)||"toggle"in u[0]&&!u[0].toggle?Rh:Ip)(r,o,i,a)},formatChanged:function(e,t,n,r,o){return Hp(c,e,t,n,r,o)}},editor:{getContent:function(e,t){return d=c,m=e,g=t,ve.from(d.getBody()).fold(J("tree"===m.format?new Ud("body",11):""),function(e){return t=d,r=e,o=g,c=_e(_e({},n=m),{format:o,get:!0,getInner:!0}),l=n.no_events?c:t.fire("BeforeGetContent",c),f="raw"===l.format?Et.trim(rm(t.serializer,r.innerHTML)):"text"===l.format?t.dom.isEmpty(r)?"":wo(r.innerText||r.textContent):"tree"===l.format?t.serializer.serialize(r,l):(a=(i=t).serializer.serialize(r,l),u=Ss(i),s=new RegExp("^(<"+u+"[^>]*>(&nbsp;|&#160;|\\s|\xa0|<br \\/>|)<\\/"+u+">[\r\n]*|<br \\/>[\r\n]*)$"),a.replace(s,"")),D(["text","tree"],l.format)||vo(Nt.fromDom(r))?l.content=f:l.content=Et.trim(f),(l.no_events?l:t.fire("GetContent",l)).content;var t,n,r,o,i,a,u,s,c,l,f});var d,m,g},setContent:function(e,t){return kg(c,e,t)},insertContent:function(e,t){return Sg(c,e,t)},addVisual:function(e){var i,t=e,a=(i=c).dom,n=V(t)?t:i.getBody();b(i.hasVisual)&&(i.hasVisual=i.getParam("visual",!0,"boolean")),Y(a.select("table,a",n),function(e){switch(e.nodeName){case"TABLE":var t=i.getParam("visual_table_class","mce-item-table","string"),n=a.getAttrib(e,"border");n&&"0"!==n||!i.hasVisual?a.removeClass(e,t):a.addClass(e,t);break;case"A":var r,o;a.getAttrib(e,"href")||(r=a.getAttrib(e,"name")||e.id,o=i.getParam("visual_anchor_class","mce-item-anchor","string"),r&&i.hasVisual?a.addClass(e,o):a.removeClass(e,o))}}),i.fire("VisualAid",{element:t,hasVisual:i.hasVisual})}},selection:{getContent:function(e,t){return function(e,t,n){var r,o=(r=t,_e(_e({},n=void 0===n?{}:n),{format:r,get:!0,selection:!0})),i=e.fire("BeforeGetContent",o);if(i.isDefaultPrevented())return e.fire("GetContent",i),i.content;if("text"===i.format)return m=e,ve.from(m.selection.getRng()).map(function(e){var t=ve.from(m.dom.getParent(e.commonAncestorContainer,m.dom.isBlock)),n=m.getBody(),r=t.map(function(e){return e.nodeName}).getOr("div").toLowerCase(),o=xt.browser.isIE()&&"pre"!==r,i=m.dom.add(n,r,{"data-mce-bogus":"all",style:"overflow: hidden; opacity: 0;"},e.cloneContents()),a=th(i,o),u=wo(i.textContent);if(m.dom.remove(i),eh(u,0)||eh(u,u.length-1)){var s=th(t.getOr(n),o),c=s.indexOf(a);return-1===c?a:(eh(s,c-1)?" ":"")+a+(eh(s,c+a.length)?" ":"")}return a}).getOr("");i.getInner=!0;var a,u,s,c,l,f,d,m,g=(u=i,s=(a=e).selection.getRng(),c=a.dom.create("body"),l=a.selection.getSel(),f=wd(a,Nl(l)),(d=u.contextual?Zp(Nt.fromDom(a.getBody()),f).dom:s.cloneContents())&&c.appendChild(d),a.selection.serializer.serialize(c,u));return"tree"===i.format?g:(i.content=e.selection.isCollapsed()?"":g,e.fire("GetContent",i),i.content)}(c,e,t)}},raw:{getModel:function(){return ve.none()}}}}function mh(e){return Ne(e.plugins,"rtc")}function gh(e){var u=e;return ue(e.plugins,"rtc").bind(function(e){return ve.from(e.setup)}).fold(function(){return u.rtcInstance=dh(e),ve.none()},function(e){var t,n;return u.rtcInstance=(t=J(null),n=J(""),{undoManager:{beforeChange:te,add:t,undo:t,redo:t,clear:te,reset:te,hasUndo:R,hasRedo:R,transact:t,ignore:te,extra:te},formatter:{match:R,matchAll:J([]),matchNode:J(void 0),canApply:R,closest:n,apply:te,remove:te,toggle:te,formatChanged:J({unbind:te})},editor:{getContent:n,setContent:n,insertContent:te,addVisual:te},selection:{getContent:n},raw:{getModel:J(ve.none())}}),ve.some(function(){return e().then(function(e){return u.rtcInstance=(i=e.undoManager,a=e.formatter,n=e.editor,r=e.selection,t=e.raw,{undoManager:{beforeChange:i.beforeChange,add:i.add,undo:i.undo,redo:i.redo,clear:i.clear,reset:i.reset,hasUndo:i.hasUndo,hasRedo:i.hasRedo,transact:function(e,t,n){return i.transact(n)},ignore:function(e,t){return i.ignore(t)},extra:function(e,t,n,r){return i.extra(n,r)}},formatter:{match:function(e,t,n,r){return a.match(e,o(t),r)},matchAll:a.matchAll,matchNode:a.matchNode,canApply:function(e){return a.canApply(e)},closest:function(e){return a.closest(e)},apply:function(e,t,n){return a.apply(e,o(t))},remove:function(e,t,n,r){return a.remove(e,o(t))},toggle:function(e,t,n){return a.toggle(e,o(t))},formatChanged:function(e,t,n,r,o){return a.formatChanged(t,n,r,o)}},editor:{getContent:function(e,t){return n.getContent(e)},setContent:function(e,t){return n.setContent(e,t)},insertContent:function(e,t){return n.insertContent(e)},addVisual:n.addVisual},selection:{getContent:function(e,t){return r.getContent(t)}},raw:{getModel:function(){return ve.some(t.getRawModel())}}}),e.rtc.isRemote;function o(e){return h(e)?e:{}}var i,a,n,r,t})})})}function ph(e){return e.rtcInstance||dh(e)}function hh(e){var t=e.rtcInstance;if(t)return t;throw new Error("Failed to get RTC instance not yet initialized.")}function vh(e){return 0===e.dom.length?(Ln(e),ve.none()):ve.some(e)}function bh(e,t,u,s){e.bind(function(a){return(s?Um:Fm)(a.dom,s?a.dom.length:0),t.filter(_n).map(function(e){var t=u,n=s,r=a.dom,o=e.dom,i=(n?r:o).length;n?(zm(r,o,!1,!n),t.setStart(o,i)):(zm(o,r,!1,!n),t.setEnd(o,i))})}).orThunk(function(){var e=s;return t.filter(function(e){return Fl.isBookmarkNode(e.dom)}).bind(e?Pt:Bt).or(t).filter(_n).map(function(e){var n,r=s;Ot(n=e).each(function(e){var t=n.dom;r&&Dm(e,as(t,0))?Fm(t,0):!r&&Tm(e,as(t,t.length))&&Um(t,t.length)})})})}function yh(e,t,n){var r,o=(r=t,_e(_e({format:"html"},n=void 0===n?{}:n),{set:!0,selection:!0,content:r})),i=o;if(!o.no_events){var a=e.fire("BeforeSetContent",o);if(a.isDefaultPrevented())return void e.fire("SetContent",a);i=a}i.content=function(e,t){if("raw"===t.format)return t.content;var n=e.selection.getRng(),r=e.dom.getParent(n.commonAncestorContainer,e.dom.isBlock),o=r?{context:r.nodeName.toLowerCase()}:{},i=e.parser.parse(t.content,_e(_e({isRootContent:!0,forced_root_block:!1},o),t));return nm({validate:e.validate},e.schema).serialize(i)}(e,i);var u=e.selection.getRng();!function(e,t){var n=ve.from(t.firstChild).map(Nt.fromDom),r=ve.from(t.lastChild).map(Nt.fromDom);e.deleteContents(),e.insertNode(t);var o=n.bind(Bt).filter(_n).bind(vh),i=r.bind(Pt).filter(_n).bind(vh);bh(o,n,e,!0),bh(i,r,e,!1),e.collapse(!1)}(u,u.createContextualFragment(i.content)),e.selection.setRng(u),Zf(e,u),i.no_events||e.fire("SetContent",i)}function Ch(e,t,n){var r;e&&Ne(e,t)&&(0===(r=U(e[t],function(e){return e!==n})).length?delete e[t]:e[t]=r)}qg=function(e){var t,n=e.selection.getRng(),r=on(["pre"]);n.collapsed||(t=e.selection.getSelectedBlocks(),xp(Cp(Cp(t,r),function(e){return r(e.previousSibling)&&-1!==de(t,e.previousSibling)}),function(e){var t,n=e.previousSibling;Wa(t=e).remove(),Wa(n).append("<br><br>").append(t.childNodes)}))},yp["pre"]||(yp.pre=[]),yp.pre.push(qg);var xh=Et.each,wh=function(e,t,n){xh(e.childNodes,function(e){wp(e)&&(t(e)&&n(e),e.hasChildNodes()&&wh(e,t,n))})},Sh=or([{keep:[]},{rename:["name"]},{removed:[]}]),Eh=/^(src|href|style)$/,Nh=Et.each,kh=ol,_h=Et.each,Ah=Et.each,Rh=function(S,E,N,r){function k(n,e){var t;y((e=void 0===e?A:e).onformat)&&e.onformat(n,e,N,r),Ah(e.styles,function(e,t){u.setStyle(n,t,rl(e,N))}),!e.styles||(t=u.getAttrib(n,"style"))&&u.setAttrib(n,"data-mce-style",t),Ah(e.attributes,function(e,t){u.setAttrib(n,t,rl(e,N))}),Ah(e.classes,function(e){e=rl(e,N),u.hasClass(n,e)||u.addClass(n,e)})}function g(e,t){var n=!1;return Ah(e,function(e){return!!fl(e)&&(V(e.collapsed)&&e.collapsed!==a||!u.is(t,e.selector)||zc(t)?void 0:(k(t,e),!(n=!0)))}),n}function o(x,e,l){var w=[],f=!0,d=A.inline||A.block,m=function(e){if(X(e)){var t=u.create(e);return k(t),t}return null}(d);El(x,e,function(e){var s,c=function(e){var t=!1,n=f,r=e.nodeName.toLowerCase(),o=e.parentNode,i=o.nodeName.toLowerCase();if(zn(e)&&x.getContentEditable(e)&&(n=f,f="true"===x.getContentEditable(e),t=!0),Wn(e)&&!function(e,t,n,r){if(e.getParam("format_empty_lines",!1,"boolean")&&dl(t)){var o=_e(_e({},e.schema.getTextBlockElements()),{td:{},th:{},li:{},dt:{},dd:{},figcaption:{},caption:{},details:{},summary:{}}),i=(a=Nt.fromDom(n),s=function(e){return zc(e.dom)},((c=(u=a).dom).parentNode?Nr(Nt.fromDom(c.parentNode),function(e){return!je(u,e)&&s(e)}):ve.none()).isSome());return se(o,r)&&Wr(Nt.fromDom(n.parentNode),!1)&&!i}var a,u,s,c}(S,A,e,i))return s=null,void(ll(A)&&x.remove(e));if(ll(A)&&A.wrapper&&hp(S,e,E,N))s=null;else{if(f&&!t&&ll(A)&&!A.wrapper&&tl(S,r)&&nl(S,i,d)){var a=x.rename(e,d);return k(a),w.push(a),void(s=null)}if(fl(A)){var u=g(_,e);if(!u&&V(o)&&ml(A)&&(u=g(_,o)),!dl(A)||u)return void(s=null)}!f||t||!nl(S,d,r)||!nl(S,i,d)||!l&&jn(e)&&xo(e.data)||zc(e)||dl(A)&&x.isBlock(e)?(s=null,Y(xe(e.childNodes),c),t&&(f=n),s=null):(s||(s=x.clone(m,!1),e.parentNode.insertBefore(s,e),w.push(s)),s.appendChild(e))}};Y(e,c)}),!0===A.links&&Y(w,function(e){var t=function(e){"A"===e.nodeName&&k(e,A),Y(xe(e.childNodes),t)};t(e)}),Y(w,function(e){var n,t,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,b,y=(n=0,Y(e.childNodes,function(e){var t;V(t=e)&&jn(t)&&0===t.length||Yc(e)||n++}),n);function C(e){var t;1===e.nodeType&&e.parentNode&&1===e.parentNode.nodeType&&(t=ul(m,e.parentNode),m.getStyle(e,"color")&&t?m.setStyle(e,"text-decoration",t):m.getStyle(e,"text-decoration")===t&&m.setStyle(e,"text-decoration",null))}!(1<w.length)&&x.isBlock(e)||0!==y?(dl(A)||ll(A)&&A.wrapper)&&(A.exact||1!==y||(e=M((d=e).childNodes,Mp).filter(function(e){return Tg(x,e,A)}).map(function(e){var t=x.clone(e,!1);return k(t),x.replace(t,d,!0),x.remove(e,!0),t}).getOr(d)),h=S,v=N,b=e,_h(_,function(t){var r,e,n;dl(t)&&_h(h.dom.select(t.inline,b),function(e){wp(e)&&Lp(h,t,v,e,t.exact?e:null)}),r=h.dom,(e=t).clear_child_styles&&(n=e.links?"*:not(a)":"*",xh(r.select(n,b),function(n){wp(n)&&xh(e.styles,function(e,t){r.setStyle(n,t,"")})}))}),s=A,hp(u=S,(f=e).parentNode,c=E,l=N)&&Lp(u,s,l,f)||s.merge_with_parents&&u.dom.getParent(f.parentNode,function(e){if(hp(u,e,c,l))return Lp(u,s,l,f),!0}),a=e,(i=A).styles&&i.styles.backgroundColor&&wh(a,kp(x,"fontSize"),_p(x,"backgroundColor",rl(i.styles.backgroundColor,N))),m=x,p=e,(g=A).styles&&(g.styles.color||g.styles.textDecoration)&&(Et.walk(p,C,"childNodes"),C(p)),t=x,o=e,!dl(r=A)||"sub"!==r.inline&&"sup"!==r.inline||(wh(o,kp(t,"fontSize"),_p(t,"fontSize","")),t.remove(t.select("sup"===r.inline?"sub":"sup",o),!0)),Np(x,A,0,e)):x.remove(e,!0)})}var e,t,n,i,_=S.formatter.get(E),A=_[0],a=!r&&S.selection.isCollapsed(),u=S.dom,s=S.selection;if("false"!==u.getContentEditable(s.getNode()))A&&(r?Qc(r)?g(_,r)||((e=u.createRng()).setStartBefore(r),e.setEndAfter(r),o(u,Sl(S,e,_),!0)):o(u,r,!0):a&&dl(A)&&!_l(S).length?function(e,t,n){var r,o=e.selection,i=o.getRng(),a=i.startOffset,u=i.startContainer.nodeValue,s=Hc(e.getBody(),o.getStart());s&&(r=Lg(s));var c,l,f,d,m=/[^\s\u00a0\u00ad\u200b\ufeff]/;u&&0<a&&a<u.length&&m.test(u.charAt(a))&&m.test(u.charAt(a-1))?(c=o.getBookmark(),i.collapse(!0),l=Tf(Sl(e,i,e.formatter.get(t))),e.formatter.apply(t,n,l),o.moveToBookmark(c)):(s&&r.nodeValue===vp||(f=e.getDoc(),d=Ig(!0).dom,r=(s=f.importNode(d,!0)).firstChild,i.insertNode(s),a=1),e.formatter.apply(t,n,s),o.setCursorLocation(r,a))}(S,E,N):(t=s.getNode(),n=_[0],S.settings.forced_root_block||!n.defaultBlock||u.getParent(t,u.isBlock)||Rh(S,n.defaultBlock),s.setRng(vg(s.getRng())),Bl(s,!0,function(){Ol(S,function(e,t){var n=t?e:Sl(S,e,_);o(u,n,!1)})}),Zc(u,s,s.getRng()),S.nodeChanged()),i=S,xp(yp[E],function(e){e(i)})),bf(S,E,r,N);else{r=s.getNode();for(var c=0,l=_.length;c<l;c++){var f=_[c];if(f.ceFalseOverride&&fl(f)&&u.is(r,f.selector)){k(r,f);break}}bf(S,E,r,N)}},Dh=function(e){return e.selection.getStart()},Th=function(i,a,e){var u=zp(i,a);ne(e,function(e,o){function t(e){var t,n=Up(i,u,o,e.similar,Fp(e)?e.vars:void 0),r=n.isSome();e.state.get()!==r&&(e.state.set(r),t=n.getOr(a),Fp(e)?e.callback(r,{node:t,format:o,parents:u}):Y(e.callbacks,function(e){return e(r,{node:t,format:o,parents:u})}))}Y([e.withSimilar,e.withoutSimilar],t),Y(e.withVars,t)})},Oh=Re(function(){return document.implementation.createHTMLDocument("undo")});function Bh(e){return e.select}function Ph(e){return e&&e.ownerDocument&&Ve(Nt.fromDom(e.ownerDocument),Nt.fromDom(e))}function Lh(a,u,e,s){function t(e,t){return yh(s,e,t)}function n(){var e=c(),t=null==e?void 0:e.anchorNode,n=null==e?void 0:e.focusNode;if(!e||!t||!n||rn(t)||rn(n))return!0;var r=a.createRng();r.setStart(t,e.anchorOffset),r.collapse(!0);var o=a.createRng();return o.setStart(n,e.focusOffset),o.collapse(!0),r.compareBoundaryPoints(r.START_TO_START,o)<=0}function r(e){var t=p();t.collapse(!!e),h(t)}function c(){return u.getSelection?u.getSelection():u.document.selection}var l,f,o,i,d,m,g=function(e,t){return d||(d={},m={},i.on("NodeChange",function(e){var n=e.element,r=x(n),o={};Et.each(d,function(e,n){C(n,r).each(function(t){m[n]||(Y(e,function(e){e(!0,{node:t,selector:n,parents:r})}),m[n]=e),o[n]=e})}),Et.each(m,function(e,t){o[t]||(delete m[t],Et.each(e,function(e){e(!1,{node:n,selector:t,parents:r})}))})})),d[e]||(d[e]=[]),d[e].push(t),C(e,x(i.selection.getStart())).each(function(){m[e]=d[e]}),{unbind:function(){Ch(d,e,t),Ch(m,e,t)}}},p=function(){function e(e,t,n){try{return t.compareBoundaryPoints(e,n)}catch(e){return-1}}var t,n,r,o=u.document;if(void 0!==s.bookmark&&!1===vd(s)){var i=ld(s);if(i.isSome())return i.map(function(e){return wd(s,[e])[0]}).getOr(o.createRange())}try{(t=c())&&!rn(t.anchorNode)&&(n=0<t.rangeCount?t.getRangeAt(0):(t.createRange?t:o).createRange(),n=wd(s,[n])[0])}catch(e){}return(n=n||(o.createRange?o.createRange():o.body.createTextRange())).setStart&&9===n.startContainer.nodeType&&n.collapsed&&(r=a.getRoot(),n.setStart(r,0),n.setEnd(r,0)),l&&f&&(0===e(n.START_TO_START,n,l)&&0===e(n.END_TO_END,n,l)?n=f:f=l=null),n},h=function(e,t){var n;if((r=e)&&(Bh(r)||Ph(r.startContainer)&&Ph(r.endContainer))){var r,o=Bh(e)?e:null;if(o){f=null;try{o.select()}catch(e){}}else{var i=c();if(e=s.fire("SetSelectionRange",{range:e,forward:t}).range,i){f=e;try{i.removeAllRanges(),i.addRange(e)}catch(e){}!1===t&&i.extend&&(i.collapse(e.endContainer,e.endOffset),i.extend(e.startContainer,e.startOffset)),l=0<i.rangeCount?i.getRangeAt(0):null}e.collapsed||e.startContainer!==e.endContainer||!i.setBaseAndExtent||xt.ie||e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()&&(n=e.startContainer.childNodes[e.startOffset])&&"IMG"===n.tagName&&(i.setBaseAndExtent(e.startContainer,e.startOffset,e.endContainer,e.endOffset),i.anchorNode===e.startContainer&&i.focusNode===e.endContainer||i.setBaseAndExtent(n,0,n,1)),s.fire("AfterSetSelectionRange",{range:e,forward:t})}}},v={bookmarkManager:null,controlSelection:null,dom:o=a,win:u,serializer:e,editor:i=s,collapse:r,setCursorLocation:function(e,t){var n=a.createRng();V(e)&&V(t)?(n.setStart(e,t),n.setEnd(e,t),h(n),r(!1)):(Dl(a,n,s.getBody(),!0),h(n))},getContent:function(e){return n=(t=void 0===(t=e)?{}:t).format||"html",r=t,hh(s).selection.getContent(n,r);var t,n,r},setContent:t,getBookmark:function(e,t){return b.getBookmark(e,t)},moveToBookmark:function(e){return b.moveToBookmark(e)},select:function(e,t){var r=a,o=t;return ve.from(e).map(function(e){var t=r.nodeIndex(e),n=r.createRng();return n.setStart(e.parentNode,t),n.setEnd(e.parentNode,t+1),o&&(Dl(r,n,e,!0),Dl(r,n,e,!1)),n}).each(h),e},isCollapsed:function(){var e=p(),t=c();return!(!e||e.item)&&(e.compareEndPoints?0===e.compareEndPoints("StartToEnd",e):!t||e.collapsed)},isForward:n,setNode:function(e){return t(a.getOuterHTML(e)),e},getNode:function(){return function(e,t){if(!t)return e;var n=t.startContainer,r=t.endContainer,o=t.startOffset,i=t.endOffset,a=t.commonAncestorContainer;return!t.collapsed&&(n===r&&i-o<2&&n.hasChildNodes()&&(a=n.childNodes[o]),3===n.nodeType&&3===r.nodeType&&(n=n.length===o?xd(n.nextSibling,!0):n.parentNode,r=0===i?xd(r.previousSibling,!1):r.parentNode,n&&n===r))?n:a&&3===a.nodeType?a.parentNode:a}(s.getBody(),p())},getSel:c,setRng:h,getRng:p,getStart:function(e){return yd(s.getBody(),p(),e)},getEnd:function(e){return Cd(s.getBody(),p(),e)},getSelectedBlocks:function(e,t){return function(e,t,n,r){var o=[],i=e.getRoot();if(n=e.getParent(n||yd(i,t,t.collapsed),e.isBlock),r=e.getParent(r||Cd(i,t,t.collapsed),e.isBlock),n&&n!==i&&o.push(n),n&&r&&n!==r)for(var a,u=new Rr(n,i);(a=u.next())&&a!==r;)e.isBlock(a)&&o.push(a);return r&&n!==r&&r!==i&&o.push(r),o}(a,p(),e,t)},normalize:function(){var e=p();if(1<Nl(c()).length||!Tl(s))return e;var t=Rf(a,e);return t.each(function(e){h(e,n())}),t.getOr(e)},selectorChanged:function(e,t){return g(e,t),v},selectorChangedWithUnbind:g,getScrollContainer:function(){for(var e,t=a.getRoot();t&&"BODY"!==t.nodeName;){if(t.scrollHeight>t.clientHeight){e=t;break}t=t.parentNode}return e},scrollIntoView:function(e,t){V(e)?(s.inline?Gf:Qf)(s,e,t):Zf(s,p(),t)},placeCaretAt:function(e,t){return h(wf(e,t,s.getDoc()))},getBoundingClientRect:function(){var e=p();return e.collapsed?as.fromRangeStart(e).getClientRects()[0]:e.getBoundingClientRect()},destroy:function(){u=l=f=null,y.destroy()}},b=Fl(v),y=Cf(v,s);function C(t,e){return M(e,function(e){return o.is(e,t)})}function x(e){return o.getParents(e,null,o.getRoot())}return v.bookmarkManager=b,v.controlSelection=y,v}function Ih(e,t){var n,r,a,u,o=ro();t.convert_fonts_to_spans&&(r=e,a=o,u=Et.explode(t.font_size_legacy_values),r.addNodeFilter("font",function(e){Y(e,function(e){var t,n=a.parse(e.attr("style")),r=e.attr("color"),o=e.attr("face"),i=e.attr("size");r&&(n.color=r),o&&(n["font-family"]=o),i&&(n["font-size"]=u[parseInt(e.attr("size"),10)-1]),e.name="span",e.attr("style",a.serialize(n)),t=e,Y(["color","face","size"],function(e){t.attr(e,null)})})})),n=o,e.addNodeFilter("strike",function(e){Y(e,function(e){var t=n.parse(e.attr("style"));t["text-decoration"]="line-through",e.name="span",e.attr("style",n.serialize(t))})})}function Mh(e){var t,n=decodeURIComponent(e).split(","),r=/data:([^;]+)/.exec(n[0]);return{type:t=r?r[1]:t,data:n[1]}}function Fh(e,t){var n;try{n=atob(t)}catch(e){return ve.none()}for(var r=new Uint8Array(n.length),o=0;o<r.length;o++)r[o]=n.charCodeAt(o);return ve.some(new Blob([r],{type:e}))}function Uh(e){return 0===e.indexOf("blob:")?(o=e,new kr(function(e,t){function n(){t("Cannot convert "+o+" to Blob. Resource might not exist or is inaccessible.")}try{var r=new XMLHttpRequest;r.open("GET",o,!0),r.responseType="blob",r.onload=function(){200===r.status?e(r.response):n()},r.onerror=n,r.send()}catch(e){n()}})):0===e.indexOf("data:")?(n=e,new kr(function(e){var t=Mh(n);Fh(t.type,t.data).fold(function(){return e(new Blob([]))},e)})):null;var o,n}function zh(e){return(e||"blobid")+lv++}function Hh(r,d){var o={};return{findAll:function(e,n){n=n||w;var t=T(U(e?xe(e.getElementsByTagName("img")):[],function(e){var t=e.src;return xt.fileApi&&!e.hasAttribute("data-mce-bogus")&&!e.hasAttribute("data-mce-placeholder")&&t&&t!==xt.transparentSrc&&(0===t.indexOf("blob:")?!r.isUploaded(t)&&n(e):0===t.indexOf("data:")&&n(e))}),function(f){if(void 0!==o[f.src])return new kr(function(t){o[f.src].then(function(e){return"string"==typeof e?e:void t({image:f,blobInfo:e.blobInfo})})});var e=new kr(function(e,t){var r,o,i,n,a,u,s,c,l;r=d,i=e,n=t,0!==(o=f).src.indexOf("blob:")?(u=(a=Mh(o.src)).data,s=a.type,c=u,(l=r.getByData(c,s))?i({image:o,blobInfo:l}):Uh(o.src).then(function(e){l=r.create(zh(),e,c),r.add(l),i({image:o,blobInfo:l})},function(e){n(e)})):(l=r.getByUri(o.src))?i({image:o,blobInfo:l}):Uh(o.src).then(function(t){var n=t;new kr(function(e){var t=new FileReader;t.onloadend=function(){e(t.result)},t.readAsDataURL(n)}).then(function(e){c=Mh(e).data,l=r.create(zh(),t,c),r.add(l),i({image:o,blobInfo:l})})},function(e){n(e)})}).then(function(e){return delete o[e.image.src],e}).catch(function(e){return delete o[f.src],e});return o[f.src]=e});return kr.all(t)}}}function jh(e,t,n,r){(e.padd_empty_with_br||t.insert)&&n[r.name]?r.empty().append(new Ud("br",1)).shortEnded=!0:r.empty().append(new Ud("#text",3)).value=yo}function Vh(n,e,t,r){return r.isEmpty(e,t,function(e){return(t=n.getElementRule(e.name))&&t.paddEmpty;var t})}function qh(e,p){var t,o,i,h=e.schema;function n(t){var e,n,r=t.attr("src");(e=t).attr("src")===xt.transparentSrc||V(e.attr("data-mce-placeholder"))||V(t.attr("data-mce-bogus"))||((n=/data:([^;]+);base64,([a-z0-9\+\/=\s]+)/i.exec(r))?ve.some({type:n[1],data:decodeURIComponent(n[2])}):ve.none()).filter(function(){return function(e,t){if(t.images_dataimg_filter){var n=new Image;return n.src=e.attr("src"),ne(e.attributes.map,function(e,t){n.setAttribute(t,e)}),t.images_dataimg_filter(n)}return!0}(t,o)}).bind(function(e){var t=e.type,n=e.data;return ve.from(i.getByData(n,t)).orThunk(function(){return Fh(t,n).map(function(e){var t=i.create(zh(),e,n);return i.add(t),t})})}).each(function(e){t.attr("src",e.blobUri())})}p.remove_trailing_brs&&e.addNodeFilter("br",function(e,t,n){var r,o,i,a,u,s,c,l,f=e.length,d=Et.extend({},h.getBlockElements()),m=h.getNonEmptyElements(),g=h.getWhiteSpaceElements();for(d.body=1,r=0;r<f;r++)if(i=(o=e[r]).parent,d[o.parent.name]&&o===i.lastChild){for(u=o.prev;u;){if("span"!==(s=u.name)||"bookmark"!==u.attr("data-mce-type")){"br"===s&&(o=null);break}u=u.prev}o&&(o.remove(),Vh(h,m,g,i)&&(c=h.getElementRule(i.name))&&(c.removeEmpty?i.remove():c.paddEmpty&&jh(p,n,d,i)))}else{for(a=o;i&&i.firstChild===a&&i.lastChild===a&&!d[(a=i).name];)i=i.parent;a===i&&!0!==p.padd_empty_with_br&&((l=new Ud("#text",3)).value=yo,o.replace(l))}}),e.addAttributeFilter("href",function(e){var t,n,r=e.length;if(!p.allow_unsafe_link_target)for(;r--;){var o=e[r];"a"===o.name&&"_blank"===o.attr("target")&&o.attr("rel",(n=void 0,n=(t=o.attr("rel"))?Et.trim(t):"",/\b(noopener)\b/g.test(n)?n:n.split(" ").filter(function(e){return 0<e.length}).concat(["noopener"]).sort().join(" ")))}}),p.allow_html_in_named_anchor||e.addAttributeFilter("id,name",function(e){for(var t,n,r,o,i=e.length;i--;)if("a"===(o=e[i]).name&&o.firstChild&&!o.attr("href"))for(r=o.parent,t=o.lastChild;n=t.prev,r.insert(t,o),t=n;);}),p.fix_list_elements&&e.addNodeFilter("ul,ol",function(e){for(var t,n,r,o=e.length;o--;)"ul"!==(r=(n=e[o]).parent).name&&"ol"!==r.name||(n.prev&&"li"===n.prev.name?n.prev.append(n):((t=new Ud("li",1)).attr("style","list-style-type: none"),n.wrap(t)))}),p.validate&&h.getValidClasses()&&e.addAttributeFilter("class",function(e){for(var t=h.getValidClasses(),n=e.length;n--;){for(var r=e[n],o=r.attr("class").split(" "),i="",a=0;a<o.length;a++){var u=o[a],s=!1,c=t["*"];c&&c[u]&&(s=!0),c=t[r.name],(s=!(s||!c||!c[u])||s)&&(i&&(i+=" "),i+=u)}i.length||(i=null),r.attr("class",i)}}),t=e,(i=(o=p).blob_cache)&&t.addAttributeFilter("src",function(e){return Y(e,n)})}function $h(_,A){void 0===A&&(A=to());var R={},D=[],T={},O={};(_=_||{}).validate=!("validate"in _)||_.validate,_.root_name=_.root_name||"body";function B(e){var t=e.name;t in R&&((r=T[t])?r.push(e):T[t]=[e]);for(var n=D.length;n--;){var r,o=D[n].name;o in e.attributes.map&&((r=O[o])?r.push(e):O[o]=[e])}return e}var e={schema:A,addAttributeFilter:function(e,n){mv(gv(e),function(e){for(var t=0;t<D.length;t++)if(D[t].name===e)return void D[t].callbacks.push(n);D.push({name:e,callbacks:[n]})})},getAttributeFilters:function(){return[].concat(D)},addNodeFilter:function(e,n){mv(gv(e),function(e){var t=R[e];t||(R[e]=t=[]),t.push(n)})},getNodeFilters:function(){var e,t=[];for(e in R)Ne(R,e)&&t.push({name:e,callbacks:R[e]});return t},filterNode:B,parse:function(e,u){var t,n,r,o,i,s,a,c,l=[];function f(e){for(var t=A.getBlockElements(),n=e.prev;n&&3===n.type;){var r=n.value.replace(x,"");if(0<r.length)return n.value=r,0;var o=n.next;if(o){if(3===o.type&&o.value.length){n=n.prev;continue}if(!t[o.name]&&"script"!==o.name&&"style"!==o.name){n=n.prev;continue}}var i=n.prev;n.remove(),n=i}}u=u||{},T={},O={};function d(e,t){var n,r=new Ud(e,t);return e in R&&((n=T[e])?n.push(r):T[e]=[r]),r}var m=pv(dv("script,style,head,html,body,title,meta,param"),A.getBlockElements()),g=A.getNonEmptyElements(),p=A.children,h=_.validate,v=("forced_root_block"in u?u:_).forced_root_block,b=!1===v?"":!0===v?"p":v,y=A.getWhiteSpaceElements(),C=/^[ \t\r\n]+/,x=/[ \t\r\n]+$/,w=/[ \t\r\n]+/g,S=/^[ \t\r\n]+$/,E=Ne(y,u.context)||Ne(y,_.root_name),N=Gd({validate:h,document:_.document,allow_html_data_urls:_.allow_html_data_urls,allow_svg_data_urls:_.allow_svg_data_urls,allow_script_urls:_.allow_script_urls,allow_conditional_comments:_.allow_conditional_comments,preserve_cdata:_.preserve_cdata,self_closing_elements:function(e){var t,n={};for(t in e)"li"!==t&&"p"!==t&&(n[t]=e[t]);return n}(A.getSelfClosingElements()),cdata:function(e){c.append(d("#cdata",4)).value=e},text:function(e,t){var n,r;E||(e=e.replace(w," "),(r=c.lastChild)&&(Ne(m,r.name)||"br"===r.name)&&(e=e.replace(C,""))),0!==e.length&&((n=d("#text",3)).raw=!!t,c.append(n).value=e)},comment:function(e){c.append(d("#comment",8)).value=e},pi:function(e,t){c.append(d(e,7)).value=t,f(c)},doctype:function(e){c.append(d("#doctype",10)).value=e,f(c)},start:function(e,t,n){var r=h?A.getElementRule(e):{};if(r){var o=d(r.outputName||e,1);o.attributes=t,o.shortEnded=n,c.append(o);var i=p[c.name];i&&p[o.name]&&!i[o.name]&&l.push(o);for(var a=D.length;a--;){var u=D[a].name;u in t.map&&((s=O[u])?s.push(o):O[u]=[o])}m[e]&&f(o),n||(c=o),!E&&y[e]&&(E=!0)}},end:function(e){var t,n,r,o,i,a=h?A.getElementRule(e):{};if(a){if(m[e]&&!E){if((t=c.firstChild)&&3===t.type)if(0<(n=t.value.replace(C,"")).length)t.value=n,t=t.next;else for(r=t.next,t.remove(),t=r;t&&3===t.type;)n=t.value,r=t.next,0!==n.length&&!S.test(n)||(t.remove(),t=r),t=r;if((t=c.lastChild)&&3===t.type)if(0<(n=t.value.replace(x,"")).length)t.value=n,t=t.prev;else for(r=t.prev,t.remove(),t=r;t&&3===t.type;)n=t.value,r=t.prev,0!==n.length&&!S.test(n)||(t.remove(),t=r),t=r}if(E&&y[e]&&(E=!1),a.removeEmpty&&Vh(A,g,y,c))return o=c.parent,m[c.name]?c.empty().remove():c.unwrap(),void(c=o);a.paddEmpty&&(fv(i=c,"#text")&&i.firstChild.value===yo||Vh(A,g,y,c))&&jh(_,u,m,c),c=c.parent}}},A),k=c=new Ud(u.context||_.root_name,11);if(N.parse(e,u.format),h&&l.length&&(u.context?u.invalid=!0:function(e){for(var t=dv("tr,td,th,tbody,thead,tfoot,table"),n=A.getNonEmptyElements(),r=A.getWhiteSpaceElements(),o=A.getTextBlockElements(),i=A.getSpecialElements(),a=function(e,t){if(void 0===t&&(t=e.parent),i[e.name])e.empty().remove();else{for(var n=0,r=e.children();n<r.length;n++){var o=r[n];A.isValidChild(t.name,o.name)||a(o,t)}e.unwrap()}},u=0;u<e.length;u++){var s,c=e[u],l=void 0,f=void 0;if(c.parent&&!c.fixed)if(o[c.name]&&"li"===c.parent.name){for(var d=c.next;d&&o[d.name];)d.name="li",d.fixed=!0,c.parent.insert(d,c.parent),d=d.next;c.unwrap()}else{for(var m=[c],l=c.parent;l&&!A.isValidChild(l.name,c.name)&&!t[l.name];l=l.parent)m.push(l);if(l&&1<m.length)if(A.isValidChild(l.name,c.name)){m.reverse();for(var g=s=B(m[0].clone()),p=0;p<m.length-1;p++){A.isValidChild(g.name,m[p].name)?(f=B(m[p].clone()),g.append(f)):f=g;for(var h=m[p].firstChild;h&&h!==m[p+1];){var v=h.next;f.append(h),h=v}g=f}Vh(A,n,r,s)?l.insert(c,m[0],!0):(l.insert(s,m[0],!0),l.insert(c,s)),l=m[0],(Vh(A,n,r,l)||fv(l,"br"))&&l.empty().remove()}else a(c);else c.parent&&("li"!==c.name?A.isValidChild(c.parent.name,"div")&&A.isValidChild("div",c.name)?c.wrap(B(new Ud("div",1))):a(c):!(d=c.prev)||"ul"!==d.name&&"ol"!==d.name?!(d=c.next)||"ul"!==d.name&&"ol"!==d.name?c.wrap(B(new Ud("ul",1))):d.insert(c,d.firstChild,!0):d.append(c))}}}(l)),b&&("body"===k.name||u.isRootContent)&&function(){function e(e){e&&((t=e.firstChild)&&3===t.type&&(t.value=t.value.replace(C,"")),(t=e.lastChild)&&3===t.type&&(t.value=t.value.replace(x,"")))}var t=k.firstChild,n=null;if(A.isValidChild(k.name,b.toLowerCase())){for(;t;){var r=t.next;3===t.type||1===t.type&&"p"!==t.name&&!m[t.name]&&!t.attr("data-mce-type")?(n||((n=d(b,1)).attr(_.forced_root_block_attrs),k.insert(n,t)),n.append(t)):(e(n),n=null),t=r}e(n)}}(),!u.invalid){for(a in T)if(Ne(T,a)){for(s=R[a],o=(t=T[a]).length;o--;)t[o].parent||t.splice(o,1);for(n=0,r=s.length;n<r;n++)s[n](t,a,u)}for(n=0,r=D.length;n<r;n++)if((s=D[n]).name in O){for(o=(t=O[s.name]).length;o--;)t[o].parent||t.splice(o,1);for(o=0,i=s.callbacks.length;o<i;o++)s.callbacks[o](t,s.name,u)}}return k}};return qh(e,_),_.inline_styles&&Ih(e,_),e}function Wh(e,t,n){-1===Et.inArray(t,n)&&(e.addAttributeFilter(n,function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),t.push(n))}function Kh(L,I){var e=["data-mce-selected"],M=I&&I.dom?I.dom:Ja.DOM,F=I&&I.schema?I.schema:to(L);L.entity_encoding=L.entity_encoding||"named",L.remove_trailing_brs=!("remove_trailing_brs"in L)||L.remove_trailing_brs;var t,U=$h(L,F),s=L,c=M;return(t=U).addAttributeFilter("data-mce-tabindex",function(e,t){for(var n=e.length;n--;){var r=e[n];r.attr("tabindex",r.attr("data-mce-tabindex")),r.attr(t,null)}}),t.addAttributeFilter("src,href,style",function(e,t){for(var n="data-mce-"+t,r=s.url_converter,o=s.url_converter_scope,i=e.length;i--;){var a=e[i],u=a.attr(n);void 0!==u?(a.attr(t,0<u.length?u:null),a.attr(n,null)):(u=a.attr(t),"style"===t?u=c.serializeStyle(c.parseStyle(u),a.name):r&&(u=r.call(o,u,t,a.name)),a.attr(t,0<u.length?u:null))}}),t.addAttributeFilter("class",function(e){for(var t=e.length;t--;){var n,r=e[t];r.attr("class")&&(n=r.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),r.attr("class",0<n.length?n:null))}}),t.addAttributeFilter("data-mce-type",function(e,t,n){for(var r=e.length;r--;){var o=e[r];"bookmark"!==o.attr("data-mce-type")||n.cleanup||(ve.from(o.firstChild).exists(function(e){return!xo(e.value)})?o.unwrap():o.remove())}}),t.addNodeFilter("noscript",function(e){for(var t=e.length;t--;){var n=e[t].firstChild;n&&(n.value=Go.decode(n.value))}}),t.addNodeFilter("script,style",function(e,t){for(var n=function(e){return e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")},r=e.length;r--;){var o,i=e[r],a=i.firstChild?i.firstChild.value:"";"script"===t?((o=i.attr("type"))&&i.attr("type","mce-no/type"===o?null:o.replace(/^mce\-/,"")),"xhtml"===s.element_format&&0<a.length&&(i.firstChild.value="// <![CDATA[\n"+n(a)+"\n// ]]>")):"xhtml"===s.element_format&&0<a.length&&(i.firstChild.value="\x3c!--\n"+n(a)+"\n--\x3e")}}),t.addNodeFilter("#comment",function(e){for(var t=e.length;t--;){var n=e[t];s.preserve_cdata&&0===n.value.indexOf("[CDATA[")?(n.name="#cdata",n.type=4,n.value=c.decode(n.value.replace(/^\[CDATA\[|\]\]$/g,""))):0===n.value.indexOf("mce:protected ")&&(n.name="#text",n.type=3,n.raw=!0,n.value=unescape(n.value).substr(14))}}),t.addNodeFilter("xml:namespace,input",function(e,t){for(var n=e.length;n--;){var r=e[n];7===r.type?r.remove():1===r.type&&("input"!==t||r.attr("type")||r.attr("type","text"))}}),t.addAttributeFilter("data-mce-type",function(e){Y(e,function(e){"format-caret"===e.attr("data-mce-type")&&(e.isEmpty(t.schema.getNonEmptyElements())?e.remove():e.unwrap())})}),t.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-type,data-mce-resize,data-mce-placeholder",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),{schema:F,addNodeFilter:U.addNodeFilter,addAttributeFilter:U.addAttributeFilter,serialize:function(e,t){var n,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,b,y,C,x,w,S,E,N,k,_,A,R,D,T=_e({format:"html"},t=void 0===t?{}:t),O=(n=(m=e,E=g=T,(d=I)&&d.hasEventListeners("PreProcess")&&!E.no_events?(h=g,x=(p=d).dom,w=m.cloneNode(!0),(S=document.implementation).createHTMLDocument&&(b=S.createHTMLDocument(""),Et.each("BODY"===w.nodeName?w.childNodes:[w],function(e){b.body.appendChild(b.importNode(e,!0))}),w="BODY"!==w.nodeName?b.body.firstChild:b.body,v=x.doc,x.doc=b),y=p,C=_e(_e({},h),{node:w}),y.fire("PreProcess",C),v&&(x.doc=v),w):m),o=wo((r=T).getInner?n.innerHTML:M.getOuterHTML(n)),r.selection||vo(Nt.fromDom(n))?o:Et.trim(o)),B=(i=U,a=O,s=(u=T).selection?_e({forced_root_block:!1},u):u,c=i.parse(a,s),!P(f=c.lastChild)||P(l=f.prev)&&(f.remove(),l.remove()),c);function P(e){return e&&"br"===e.name}return"tree"===T.format?B:(N=I,k=T,_=B,D=nm(L,F).serialize(_),k.no_events||!N?D:(A=N,R=_e(_e({},k),{content:D}),A.fire("PostProcess",R).content))},addRules:F.addValidElements,setRules:F.setValidElements,addTempAttr:A(Wh,U,e),getTempAttrs:J(e),getNodeFilters:U.getNodeFilters,getAttributeFilters:U.getAttributeFilters}}function Xh(e,t){var n=Kh(e,t);return{schema:n.schema,addNodeFilter:n.addNodeFilter,addAttributeFilter:n.addAttributeFilter,serialize:n.serialize,addRules:n.addRules,setRules:n.setRules,addTempAttr:n.addTempAttr,getTempAttrs:n.getTempAttrs,getNodeFilters:n.getNodeFilters,getAttributeFilters:n.getAttributeFilters}}function Yh(e,t,n){return r=n=void 0===n?{}:n,ph(e).editor.setContent(t,r);var r}function Gh(e){return ve.from(e).each(function(e){return e.destroy()})}function Jh(e,t){var n,r,o,i,a,u,s,c=(n=e,r=U(bv,function(e){return Ne(n,e)}),!1!==(o=n.forced_root_block)&&""!==o||r.push("forced_root_block (false only)"),W(r)),l=(s=Et.makeMap(t.plugins," "),W(Ae(Ae([],U(yv,g),!0),H(Cv,function(e){return g(e)?[e+" (moving to premium)"]:[]}),!0))),f=0<l.length,d=0<c.length,m="mobile"===t.theme;function g(e){return Ne(s,e)}(f||d||m)&&(i=m?"\n\nThemes:\n- mobile":"",a=f?"\n\nPlugins:\n- "+l.join("\n- "):"",u=d?"\n\nSettings:\n- "+c.join("\n- "):"",console.warn("The following deprecated features are currently enabled, these will be removed in TinyMCE 6.0. See https://www.tiny.cloud/docs/release-notes/6.0-upcoming-changes/ for more information."+i+a+u))}function Qh(e){var t=S(e)?e.join(" "):e;return U(T(X(t)?t.split(" "):[],Je),function(e){return 0<e.length})}function Zh(e,t){return Ne(e.sections(),t)}function ev(e,t){return ue(e,"toolbar_mode").orThunk(function(){return ue(e,"toolbar_drawer").map(function(e){return!1===e?"wrap":e})}).getOr(t)}function tv(e,t,n,r){var o,i,a,u,s,c,l,f,d=Qh(n.forced_plugins),m=Qh(r.plugins),g=Zh(o=t,"mobile")?o.sections().mobile:{},p=g.plugins?Qh(g.plugins):m,h=(i=(u=t,s=m,c=p,(a=e)&&(0,f=(l=u).sections(),Zh(l,"mobile")&&"mobile"===f.mobile.theme)?U(c,A(D,Nv)):a&&Zh(u,"mobile")?c:s),[].concat(Qh(d)).concat(Qh(i)));if(xt.browser.isIE()&&D(h,"rtc"))throw new Error("RTC plugin is not supported on IE 11.");return Et.extend(r,{plugins:h.join(" ")})}function nv(e,t,n,r,o){var i,a,u,s,c,l,f,d,m=e?{mobile:(i=t,a={resize:!1,toolbar_mode:ev(o.mobile||{},"scrolling"),toolbar_sticky:!1},_e(_e(_e({},kv),a),i?{menubar:!1}:{}))}:{},g=(c=["mobile"],ie(vv(m,o),function(e,t){return D(c,t)},oe(l={}),oe(f={})),{sections:J((d={t:l,f:f}).t),settings:J(d.f)}),p=Et.extend(n,r,g.settings(),e&&Zh(g,"mobile")?function(e){void 0===e&&(e={});var t=ue(g.sections(),"mobile").getOr({});return Et.extend({},e,t)}():{},{validate:!0,external_plugins:(u=r,s=g.settings().external_plugins||{},u&&u.external_plugins?Et.extend({},u.external_plugins,s):s)});return tv(e,g,r,p)}function rv(e,t,n){return ve.from(t.settings[n]).filter(e)}function ov(e,t){return t.dom[e]}function iv(e,t){return parseInt(xn(t,e),10)}function av(e,t,n){var r,o,i,a,u,s,c=Nt.fromDom(e.getBody()),l=e.inline?c:Nt.fromDom(Dt(c).dom.documentElement),f=(r=e.inline,i=t,a=n,u=(o=l).dom.getBoundingClientRect(),{x:i-(r?u.left+o.dom.clientLeft+Tv(o):0),y:a-(r?u.top+o.dom.clientTop+Dv(o):0)}),d=f.x,m=f.y,g=Av(s=l),p=Rv(s);return 0<=d&&0<=m&&d<=g&&m<=p}function uv(o){function i(){var e=o.theme;return e&&e.getNotificationManagerImpl?e.getNotificationManagerImpl():{open:t,close:t,reposition:t,getArgs:t};function t(){throw new Error("Theme did not provide a NotificationManager implementation.")}}function a(){return ve.from(c[0])}function u(){0<c.length&&i().reposition(c)}function s(t){z(c,function(e){return e===t}).each(function(e){c.splice(e,1)})}function t(n,e){if(void 0===e&&(e=!0),!o.removed&&(r=(t=o).inline?t.getBody():t.getContentAreaContainer(),ve.from(r).map(Nt.fromDom).map(In).getOr(!1)))return e&&o.fire("BeforeOpenNotification",{notification:n}),M(c,function(e){return!((t=i().getArgs(e)).type!==n.type||t.text!==n.text||t.progressBar||t.timeout||n.progressBar||n.timeout);var t}).getOrThunk(function(){o.editorManager.setActive(o);var e=i().open(n,function(){s(e),u(),a().fold(function(){return o.focus()},function(e){return Nt.fromDom(e.getEl()).dom.focus()})});return c.push(e),u(),o.fire("OpenNotification",{notification:_e({},e)}),e});var t,r}var n,c=[],e=J(c);return(n=o).on("SkinLoaded",function(){var e=n.getParam("service_message");e&&t({text:e,type:"warning",timeout:0},!1),u()}),n.on("show ResizeEditor ResizeWindow NodeChange",function(){_r.requestAnimationFrame(u)}),n.on("remove",function(){Y(c.slice(),function(e){i().close(e)})}),{open:t,close:function(){a().each(function(e){i().close(e),s(e),u()})},getNotifications:e}}var sv,cv,lv=0,fv=function(e,t){return e&&e.firstChild&&e.firstChild===e.lastChild&&e.firstChild.name===t},dv=Et.makeMap,mv=Et.each,gv=Et.explode,pv=Et.extend,hv=Ja.DOM,vv=(sv=function(e,t){return h(e)&&h(t)?vv(e,t):t},function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];if(0===e.length)throw new Error("Can't merge zero objects");for(var n={},r=0;r<e.length;r++){var o,i=e[r];for(o in i)Ne(i,o)&&(n[o]=sv(n[o],i[o]))}return n}),bv="autoresize_on_init,content_editable_state,convert_fonts_to_spans,inline_styles,padd_empty_with_br,block_elements,boolean_attributes,editor_deselector,editor_selector,elements,file_browser_callback_types,filepicker_validator_handler,force_hex_style_colors,force_p_newlines,gecko_spellcheck,images_dataimg_filter,media_scripts,mode,move_caret_before_on_enter_elements,non_empty_elements,self_closing_elements,short_ended_elements,special,spellchecker_select_languages,spellchecker_whitelist,tab_focus,table_responsive_width,text_block_elements,text_inline_elements,toolbar_drawer,types,validate,whitespace_elements,paste_word_valid_elements,paste_retain_style_properties,paste_convert_word_fake_lists".split(","),yv="bbcode,colorpicker,contextmenu,fullpage,legacyoutput,spellchecker,textcolor".split(","),Cv="imagetools,toc".split(","),xv=dt().deviceType,wv=xv.isTouch(),Sv=xv.isPhone(),Ev=xv.isTablet(),Nv=["lists","autolink","autosave"],kv={table_grid:!1,object_resizing:!1,resize:!1},_v=(cv={},{add:function(e,t){cv[e]=t},get:function(e){return cv[e]||{icons:{}}},has:function(e){return Ne(cv,e)}}),Av=A(ov,"clientWidth"),Rv=A(ov,"clientHeight"),Dv=A(iv,"margin-top"),Tv=A(iv,"margin-left"),Ov=su.PluginManager,Bv=su.ThemeManager;function Pv(r){function o(){var e=r.theme;return e&&e.getWindowManagerImpl?e.getWindowManagerImpl():{open:t,openUrl:t,alert:t,confirm:t,close:t,getParams:t,setParams:t};function t(){throw new Error("Theme did not provide a WindowManager implementation.")}}function i(n,r){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return r?r.apply(n,e):void 0}}function n(t){r.fire("CloseWindow",{dialog:t}),0===(u=U(u,function(e){return e!==t})).length&&r.focus()}function a(e){r.editorManager.setActive(r),cd(r);var t,n=e();return t=n,u.push(t),r.fire("OpenWindow",{dialog:t}),n}var u=[];return r.on("remove",function(){Y(u,function(e){o().close(e)})}),{open:function(e,t){return a(function(){return o().open(e,t,n)})},openUrl:function(e){return a(function(){return o().openUrl(e,n)})},alert:function(e,t,n){var r=o();r.alert(e,i(n||r,t))},confirm:function(e,t,n){var r=o();r.confirm(e,i(n||r,t))},close:function(){ve.from(u[u.length-1]).each(function(e){o().close(e),n(e)})}}}function Lv(e,t){e.notificationManager.open({type:"error",text:t})}function Iv(e,t){e._skinLoaded?Lv(e,t):e.on("SkinLoaded",function(){Lv(e,t)})}function Mv(e,t,n){vf(e,t,{message:n}),console.error(n)}function Fv(e,t,n){return n?"Failed to load "+e+": "+n+" from url "+t:"Failed to load "+e+" url: "+t}function Uv(e,t,n){Mv(e,"PluginLoadError",Fv("plugin",t,n))}function zv(e){var t,n;e.contentCSS=e.contentCSS.concat(cy(e,(n=(t=e).getParam("content_css"),X(n)?T(n.split(","),Je):S(n)?n:!1===n||t.inline?[]:["default"])),cy(e,Ds(e)))}function Hv(){function n(e,t){return{status:e,resultUri:t}}function t(e){return e in r}var r={};return{hasBlobUri:t,getResultUri:function(e){var t=r[e];return t?t.resultUri:null},isPending:function(e){return!!t(e)&&1===r[e].status},isUploaded:function(e){return!!t(e)&&2===r[e].status},markPending:function(e){r[e]=n(1,null)},markUploaded:function(e,t){r[e]=n(2,t)},removeFailed:function(e){delete r[e]},destroy:function(){r={}}}}function jv(e){return e+ly+++("s"+(new Date).getTime().toString(36)+t()+t()+t());function t(){return Math.round(4294967295*Math.random()).toString(36)}}function Vv(){function e(e){return M(n,e).getOrUndefined()}function i(e){if(!e.blob||!e.base64)throw new Error("blob and base64 representations of the image are required for BlobInfo to be created");var t=e.id||jv("blobid"),n=e.name||t,r=e.blob;return{id:J(t),name:J(n),filename:J(e.filename||n+"."+({"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png","image/apng":"apng","image/avif":"avif","image/svg+xml":"svg","image/webp":"webp","image/bmp":"bmp","image/tiff":"tiff"}[r.type.toLowerCase()]||"dat")),blob:J(r),base64:J(e.base64),blobUri:J(e.blobUri||URL.createObjectURL(r)),uri:J(e.uri)}}function t(t){return e(function(e){return e.id()===t})}var n=[];return{create:function(e,t,n,r,o){if(X(e))return i({id:e,name:r,filename:o,blob:t,base64:n});if(h(e))return i(e);throw new Error("Unknown input type")},add:function(e){t(e.id())||n.push(e)},get:t,getByUri:function(t){return e(function(e){return e.blobUri()===t})},getByData:function(t,n){return e(function(e){return e.base64()===t&&e.blob().type===n})},findFirst:e,removeByUri:function(t){n=U(n,function(e){return e.blobUri()!==t||void URL.revokeObjectURL(e.blobUri())})},destroy:function(){Y(n,function(e){URL.revokeObjectURL(e.blobUri())}),n=[]}}}function qv(u,s){function o(e,r,o,t){var i=new XMLHttpRequest;i.open("POST",s.url),i.withCredentials=s.credentials,i.upload.onprogress=function(e){t(e.loaded/e.total*100)},i.onerror=function(){o("Image upload failed due to a XHR Transport error. Code: "+i.status)},i.onload=function(){var e,t,n;i.status<200||300<=i.status?o("HTTP Error: "+i.status):(e=JSON.parse(i.responseText))&&"string"==typeof e.location?r((t=s.basePath,n=e.location,t?t.replace(/\/$/,"")+"/"+n.replace(/^\//,""):n)):o("Invalid JSON: "+i.responseText)};var n=new FormData;n.append("file",e.blob(),e.filename()),i.send(n)}function c(e,t){return{url:t,blobInfo:e,status:!0}}function l(e,t,n){return{url:"",blobInfo:e,status:!1,error:{message:t,options:n}}}function f(e,t){Et.each(d[e],function(e){e(t)}),delete d[e]}var d={};return!1===y(s.handler)&&(s.handler=o),{upload:function(e,t){return s.url||s.handler!==o?(n=e,r=t,n=Et.grep(e,function(e){return!u.isUploaded(e.blobUri())}),kr.all(Et.map(n,function(e){return u.isPending(e.blobUri())?(n=e.blobUri(),new kr(function(e){d[n]=d[n]||[],d[n].push(e)})):(i=e,t=s.handler,a=r,u.markPending(i.blobUri()),new kr(function(r){var n;try{var o=function(){n&&n.close()};t(i,function(e){o(),u.markUploaded(i.blobUri(),e),f(i.blobUri(),c(i,e)),r(c(i,e))},function(e,t){var n=t||{};o(),u.removeFailed(i.blobUri()),f(i.blobUri(),l(i,e,n)),r(l(i,e,n))},function(t){t<0||100<t||ve.from(n).orThunk(function(){return ve.from(a).map(C)}).each(function(e){(n=e).progressBar.value(t)})})}catch(e){r(l(i,e.message,{}))}}));var i,t,a,n}))):new kr(function(e){e([])});var n,r}}}function $v(e){return function(){return e.notificationManager.open({text:e.translate("Image uploading..."),type:"info",timeout:-1,progressBar:!0})}}function Wv(e,t){return qv(t,{url:e.getParam("images_upload_url","","string"),basePath:e.getParam("images_upload_base_path","","string"),credentials:e.getParam("images_upload_credentials",!1,"boolean"),handler:e.getParam("images_upload_handler",null,"function")})}function Kv(l){function t(t){return function(e){return l.selection?t(e):[]}}function r(e,t,n){for(var r=0;-1!==(r=e.indexOf(t,r))&&(e=e.substring(0,r)+n+e.substr(r+t.length),r+=n.length-t.length+1),-1!==r;);return e}function o(e,t,n){return e=r(e,'src="'+t+'"','src="'+n+'"'+(n===xt.transparentSrc?' data-mce-placeholder="1"':"")),r(e,'data-mce-src="'+t+'"','data-mce-src="'+n+'"')}function f(t,n){Y(l.undoManager.data,function(e){"fragmented"===e.type?e.fragments=T(e.fragments,function(e){return o(e,t,n)}):e.content=o(e.content,t,n)})}function n(n){return u=u||Wv(l,g),v().then(t(function(c){var e=T(c,function(e){return e.blobInfo});return u.upload(e,$v(l)).then(t(function(e){var s=[],t=T(e,function(e,t){var n,r,o,i,a=c[t].blobInfo,u=c[t].image;return e.status&&l.getParam("images_replace_blob_uris",!0,"boolean")?(m.removeByUri(u.src),mh(l)||(r=u,o=e.url,i=l.convertURL(o,"src"),f(r.src,o),l.$(r).attr({src:l.getParam("images_reuse_filename",!1,"boolean")?o+(-1===o.indexOf("?")?"?":"&")+(new Date).getTime():o,"data-mce-src":i}))):e.error&&(e.error.options.remove&&(f(u.getAttribute("src"),xt.transparentSrc),s.push(u)),n=e.error.message,Iv(l,uu.translate(["Failed to upload image: {0}",n]))),{element:u,status:e.status,uploadUri:e.url,blobInfo:a}});return 0<t.length&&h.fireIfChanged(),0<s.length&&(mh(l)?console.error("Removing images on failed uploads is currently unsupported for RTC"):l.undoManager.transact(function(){Y(s,function(e){l.dom.remove(e),m.removeByUri(e.src)})})),n&&n(t),t}))}))}function e(e){if(Ns(l))return n(e)}function i(t){return!1!==j(p,function(e){return e(t)})&&(0!==t.getAttribute("src").indexOf("data:")||l.getParam("images_dataimg_filter",w,"function")(t))}function a(e){return e.replace(/src="(blob:[^"]+)"/g,function(e,n){var t=g.getResultUri(n);if(t)return'src="'+t+'"';var r=(r=m.getByUri(n))||L(l.editorManager.get(),function(e,t){return e||t.editorUpload&&t.editorUpload.blobCache.getByUri(n)},null);return r?'src="data:'+r.blob().type+";base64,"+r.base64()+'"':e})}var u,s,c,d,m=Vv(),g=Hv(),p=[],h=(d=ru(null),(c=l).on("change AddUndo",function(e){d.set(_e({},e.level))}),{fireIfChanged:function(){var t=c.undoManager.data;Z(t).filter(function(e){return!sh(d.get(),e)}).each(function(e){c.setDirty(!0),c.fire("change",{level:e,lastLevel:G(t,t.length-2).getOrNull()})})}}),v=function(){return(s=s||Hh(g,m)).findAll(l.getBody(),i).then(t(function(e){return e=U(e,function(e){return"string"!=typeof e||void Iv(l,e)}),mh(l)||Y(e,function(e){f(e.image.src,e.blobInfo.blobUri()),e.image.src=e.blobInfo.blobUri(),e.image.removeAttribute("data-mce-src")}),e}))};return l.on("SetContent",function(){(Ns(l)?e:v)()}),l.on("RawSaveContent",function(e){e.content=a(e.content)}),l.on("GetContent",function(e){e.source_view||"raw"===e.format||"tree"===e.format||(e.content=a(e.content))}),l.on("PostRender",function(){l.parser.addNodeFilter("img",function(e){Y(e,function(e){var t,n=e.attr("src");m.getByUri(n)||(t=g.getResultUri(n))&&e.attr("src",t)})})}),{blobCache:m,addFilter:function(e){p.push(e)},uploadImages:n,uploadImagesAuto:e,scanForImages:v,destroy:function(){m.destroy(),g.destroy(),s=u=null}}}function Xv(e,t){function m(e){o="string"==typeof e?{name:e,classes:[],attrs:{}}:e;var t,n=dy.create(o.name),r=n;return(t=o).classes.length&&dy.addClass(r,t.classes.join(" ")),dy.setAttribs(r,t.attrs),n}var n,o,r,g=t&&t.schema||to({}),p=function(n,e,t){var r,o,i,a,u,s,c,l=0<e.length&&e[0],f=l&&l.name,d=(a=f,u="string"!=typeof(i=n)?i.nodeName.toLowerCase():i,!(!(c=(s=g.getElementRule(u))&&s.parentsRequired)||!c.length)&&(a&&-1!==Et.inArray(c,a)?a:c[0]));if(d)f===d?(o=e[0],e=e.slice(1)):o=d;else if(l)o=e[0],e=e.slice(1);else if(!t)return n;return o&&(r=m(o)).appendChild(n),t&&(r||(r=dy.create("div")).appendChild(n),Et.each(t,function(e){var t=m(e);r.insertBefore(t,n)})),p(r,e,o&&o.siblings)};return e&&e.length?(n=m(o=e[0]),(r=dy.create("div")).appendChild(p(n,e.slice(1),o.siblings)),r):""}function Yv(e){var t,a={classes:[],attrs:{}};return"*"!==(e=a.selector=Et.trim(e))&&(t=e.replace(/(?:([#\.]|::?)([\w\-]+)|(\[)([^\]]+)\]?)/g,function(e,t,n,r,o){switch(t){case"#":a.attrs.id=n;break;case".":a.classes.push(n);break;case":":-1!==Et.inArray("checked disabled enabled read-only required".split(" "),n)&&(a.attrs[n]=n)}var i;return"["!==r||(i=o.match(/([\w\-]+)(?:\=\"([^\"]+))?/))&&(a.attrs[i[1]]=i[2]),""})),a.name=t||"div",a}function Gv(n,e){var r,t,o="",i=(t=n.getParam("preview_styles","font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow"),X(t)?t:"");if(""===i)return"";function a(e){return e.replace(/%(\w+)/g,"")}if("string"==typeof e){if(!(e=n.formatter.get(e)))return;e=e[0]}if("preview"in e){var u=ue(e,"preview");if(fn(u,!1))return"";i=u.getOr(i)}var s,c=e.block||e.inline||"span",l=(s=e.selector)&&"string"==typeof s?(s=(s=s.split(/\s*,\s*/)[0]).replace(/\s*(~\+|~|\+|>)\s*/g,"$1"),Et.map(s.split(/(?:>|\s+(?![^\[\]]+\]))/),function(e){var t=Et.map(e.split(/(?:~\+|~|\+)/),Yv),n=t.pop();return t.length&&(n.siblings=t),n}).reverse()):[],f=l.length?(l[0].name||(l[0].name=c),c=e.selector,Xv(l,n)):Xv([c],n),d=dy.select(c,f)[0]||f.firstChild;return fy(e.styles,function(e,t){var n=a(e);n&&dy.setStyle(d,t,n)}),fy(e.attributes,function(e,t){var n=a(e);n&&dy.setAttrib(d,t,n)}),fy(e.classes,function(e){var t=a(e);dy.hasClass(d,t)||dy.addClass(d,t)}),n.fire("PreviewFormats"),dy.setStyles(f,{position:"absolute",left:-65535}),n.getBody().appendChild(f),r=dy.getStyle(n.getBody(),"fontSize",!0),r=/px$/.test(r)?parseInt(r,10):0,fy(i.split(" "),function(e){var t=dy.getStyle(d,e,!0);if(!("background-color"===e&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)&&(t=dy.getStyle(n.getBody(),e,!0),"#ffffff"===dy.toHex(t).toLowerCase())||"color"===e&&"#000000"===dy.toHex(t).toLowerCase())){if("font-size"===e&&/em|%$/.test(t)){if(0===r)return;t=parseFloat(t)/(/%$/.test(t)?100:1)*r+"px"}"border"===e&&t&&(o+="padding:0 2px;"),o+=e+":"+t+";"}}),n.fire("AfterPreviewFormats"),dy.remove(f),o}function Jv(c){var e,r,t,n,o,i,a=(n={},(o=function(e,t){e&&(X(e)?(Y(t=!S(t)?[t]:t,function(e){b(e.deep)&&(e.deep=!fl(e)),b(e.split)&&(e.split=!fl(e)||dl(e)),b(e.remove)&&fl(e)&&!dl(e)&&(e.remove="none"),fl(e)&&dl(e)&&(e.mixed=!0,e.block_expand=!0),X(e.classes)&&(e.classes=e.classes.split(/\s+/))}),n[e]=t):ne(e,function(e,t){o(t,e)}))})((r=(e=c).dom,t={valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"left"},inherit:!1,preview:!1,defaultBlock:"div"},{selector:"img,table,audio,video",collapsed:!1,styles:{float:"left"},preview:"font-family font-size"}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"center"},inherit:!1,preview:"font-family font-size",defaultBlock:"div"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"img,audio,video",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"},preview:"font-family font-size"}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"right"},inherit:!1,preview:"font-family font-size",defaultBlock:"div"},{selector:"img,table,audio,video",collapsed:!1,styles:{float:"right"},preview:"font-family font-size"}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"justify"},inherit:!1,defaultBlock:"div",preview:"font-family font-size"}],bold:[{inline:"strong",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all",preserve_attributes:["class","style"]}],italic:[{inline:"em",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all",preserve_attributes:["class","style"]}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all",preserve_attributes:["class","style"]}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:!0},{inline:"strike",remove:"all",preserve_attributes:["class","style"]},{inline:"s",remove:"all",preserve_attributes:["class","style"]}],forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},fontname:{inline:"span",toggle:!1,styles:{fontFamily:"%value"},clear_child_styles:!0},fontsize:{inline:"span",toggle:!1,styles:{fontSize:"%value"},clear_child_styles:!0},lineheight:{selector:"h1,h2,h3,h4,h5,h6,p,li,td,th,div",defaultBlock:"p",styles:{lineHeight:"%value"}},fontsize_class:{inline:"span",attributes:{class:"%value"}},blockquote:{block:"blockquote",wrapper:!0,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:function(e,t,n){return zn(e)&&e.hasAttribute("href")},onformat:function(n,e,t){Et.each(t,function(e,t){r.setAttrib(n,t,e)})}},lang:{inline:"span",clear_child_styles:!0,remove_similar:!0,attributes:{lang:"%value","data-mce-lang":function(e){var t;return null!==(t=null==e?void 0:e.customValue)&&void 0!==t?t:null}}},removeformat:[{selector:"b,strong,em,i,font,u,strike,s,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins,small",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]},Et.each("p h1 h2 h3 h4 h5 h6 div address pre dt dd samp".split(/\s/),function(e){t[e]={block:e,remove:"all"}}),t)),o(e.getParam("formats")),{get:function(e){return V(e)?n[e]:n},has:function(e){return Ne(n,e)},register:o,unregister:function(e){return e&&n[e]&&delete n[e],n}}),l=ru(null);return function(e){e.addShortcut("meta+b","","Bold"),e.addShortcut("meta+i","","Italic"),e.addShortcut("meta+u","","Underline");for(var t=1;t<=6;t++)e.addShortcut("access+"+t,"",["FormatBlock",!1,"h"+t]);e.addShortcut("access+7","",["FormatBlock",!1,"p"]),e.addShortcut("access+8","",["FormatBlock",!1,"div"]),e.addShortcut("access+9","",["FormatBlock",!1,"address"])}(c),(i=c).on("mouseup keydown",function(e){var t=i,n=e.keyCode,r=t.selection,o=t.getBody();Fg(t,null,!1),8!==n&&46!==n||!r.isCollapsed()||r.getStart().innerHTML!==vp||Fg(t,Hc(o,r.getStart())),37!==n&&39!==n||Fg(t,Hc(o,r.getStart()))}),{get:a.get,has:a.has,register:a.register,unregister:a.unregister,apply:function(e,t,n){var r=e,o=t,i=n;hh(c).formatter.apply(r,o,i)},remove:function(e,t,n,r){var o=e,i=t,a=n,u=r;hh(c).formatter.remove(o,i,a,u)},toggle:function(e,t,n){var r=e,o=t,i=n;hh(c).formatter.toggle(r,o,i)},match:function(e,t,n,r){return o=e,i=t,a=n,u=r,hh(c).formatter.match(o,i,a,u);var o,i,a,u},closest:function(e){return t=e,hh(c).formatter.closest(t);var t},matchAll:function(e,t){return n=e,r=t,hh(c).formatter.matchAll(n,r);var n,r},matchNode:function(e,t,n,r){return o=e,i=t,a=n,u=r,hh(c).formatter.matchNode(o,i,a,u);var o,i,a,u},canApply:function(e){return t=e,hh(c).formatter.canApply(t);var t},formatChanged:function(e,t,n,r){return o=l,i=e,a=t,u=n,s=r,hh(c).formatter.formatChanged(o,i,a,u,s);var o,i,a,u,s},getCssText:A(Gv,c)}}function Qv(e){switch(e.toLowerCase()){case"undo":case"redo":case"mcerepaint":case"mcefocus":return 1;default:return}}function Zv(s){var e,n,r,o,i,c=cu(),l=ru(0),f=ru(0),d={data:[],typing:!1,beforeChange:function(){var e=l,t=c;hh(s).undoManager.beforeChange(e,t)},add:function(e,t){return n=d,r=f,o=l,i=c,a=e,u=t,hh(s).undoManager.add(n,r,o,i,a,u);var n,r,o,i,a,u},undo:function(){return e=d,t=l,n=f,hh(s).undoManager.undo(e,t,n);var e,t,n},redo:function(){return e=f,t=d.data,hh(s).undoManager.redo(e,t);var e,t},clear:function(){var e=d,t=f;hh(s).undoManager.clear(e,t)},reset:function(){var e=d;hh(s).undoManager.reset(e)},hasUndo:function(){return e=d,t=f,hh(s).undoManager.hasUndo(e,t);var e,t},hasRedo:function(){return e=d,t=f,hh(s).undoManager.hasRedo(e,t);var e,t},transact:function(e){return t=d,n=l,r=e,hh(s).undoManager.transact(t,n,r);var t,n,r},ignore:function(e){var t=l,n=e;hh(s).undoManager.ignore(t,n)},extra:function(e,t){var n=d,r=f,o=e,i=t;hh(s).undoManager.extra(n,r,o,i)}};return mh(s)||(r=d,o=l,i=ru(!1),(n=s).on("init",function(){r.add()}),n.on("BeforeExecCommand",function(e){Qv(e.command)||(fh(r,o),r.beforeChange())}),n.on("ExecCommand",function(e){Qv(e.command)||a(e)}),n.on("ObjectResizeStart cut",function(){r.beforeChange()}),n.on("SaveContent ObjectResized blur",a),n.on("dragend",a),n.on("keyup",function(e){var t=e.keyCode;e.isDefaultPrevented()||((33<=t&&t<=36||37<=t&&t<=40||45===t||e.ctrlKey)&&(a(),n.nodeChanged()),46!==t&&8!==t||n.nodeChanged(),i.get()&&r.typing&&!1===sh(oh(n),r.data[0])&&(!1===n.isDirty()&&(n.setDirty(!0),n.fire("change",{level:r.data[0],lastLevel:null})),n.fire("TypingUndo"),i.set(!1),n.nodeChanged()))}),n.on("keydown",function(e){var t,n=e.keyCode;e.isDefaultPrevented()||(33<=n&&n<=36||37<=n&&n<=40||45===n?r.typing&&a(e):(t=e.ctrlKey&&!e.altKey||e.metaKey,!(n<16||20<n)||224===n||91===n||r.typing||t||(r.beforeChange(),lh(r,!0,o),r.add({},e),i.set(!0))))}),n.on("mousedown",function(e){r.typing&&a(e)}),n.on("input",function(e){e.inputType&&("insertReplacementText"===e.inputType||"insertText"===e.inputType&&null===e.data||"insertFromPaste"===e.inputType||"insertFromDrop"===e.inputType)&&a(e)}),n.on("AddUndo Undo Redo ClearUndos",function(e){e.isDefaultPrevented()||n.nodeChanged()})),(e=s).addShortcut("meta+z","","Undo"),e.addShortcut("meta+y,meta+shift+z","","Redo"),d;function a(e){lh(r,!1,o),r.add({},e)}}function eb(e){return"keydown"===e.type||"keyup"===e.type}function tb(e){var t=e.keyCode;return t===Bf.BACKSPACE||t===Bf.DELETE}function nb(e,t){return ze(Nt.fromDom(t),e.getParam("inline_boundaries_selector","a[href],code,.mce-annotation","string"))}function rb(e,t,n){var r,o,i=(r=e,o=t,U(Ja.DOM.getParents(n.container(),"*",o),r));return ve.from(i[i.length-1])}function ob(e,t){if(!t)return t;var n=t.container(),r=t.offset();return e?Lr(n)?jn(n.nextSibling)?as(n.nextSibling,0):as.after(n):Fr(t)?as(n,r+1):t:Lr(n)?jn(n.previousSibling)?as(n.previousSibling,n.previousSibling.data.length):as.before(n):Ur(t)?as(n,r-1):t}function ib(e){return fo(e)||go(e)}function ab(e,t){return Ve(e,t)?pr(t,ib,(n=e,function(e){return je(n,Nt.fromDom(e.dom.parentNode))})):ve.none();var n}function ub(e){var t,n,r;e.dom.isEmpty(e.getBody())&&(e.setContent(""),r=(n=(t=e).getBody()).firstChild&&t.dom.isBlock(n.firstChild)?n.firstChild:n,t.selection.setCursorLocation(r,0))}function sb(e,t){return{from:e,to:t}}function cb(e,t){return ab(Nt.fromDom(e),Nt.fromDom(t.container())).map(function(e){return{block:e,position:t}})}function lb(e){var t,n=z(t=Dn(e),lo).fold(J(t),function(e){return t.slice(0,e)});return Y(n,Ln),n}function fb(e,t){return M(hm(t,e).reverse(),function(e){return Wr(e)}).each(Ln)}function db(e,t,n,r){if(Wr(n))return mm(n),ef(n.dom);0===U(Lt(r),function(e){return!Wr(e)}).length&&Wr(t)&&qt(r,Nt.fromTag("br"));var o=Zl(n.dom,as.before(r.dom));return Y(lb(t),function(e){qt(r,e)}),fb(e,t),o}function mb(e,t,n){if(Wr(n))return Ln(n),Wr(t)&&mm(t),ef(t.dom);var r=tf(n.dom);return Y(lb(t),function(e){Pn(n,e)}),fb(e,t),r}function gb(e,t){Uc(e,t.dom).map(function(e){return e.getNode()}).map(Nt.fromDom).filter(Br).each(Ln)}function pb(e,t,n){return gb(!0,t),gb(!1,n),(Ve(o=n,r=t)?(i=hm(r,o),ve.from(i[i.length-1])):ve.none()).fold(A(mb,e,t,n),A(db,e,t,n));var r,o,i}function hb(e,t,n,r){return t?pb(e,r,n):pb(e,n,r)}function vb(t,n){var e,r,o,i,a,u,s,c=Nt.fromDom(t.getBody()),l=(e=c.dom,r=n,((o=t.selection.getRng()).collapsed?(a=r,u=cb(i=e,as.fromRangeStart(o)),s=u.bind(function(e){return Gl(a,i,e.position).bind(function(e){return cb(i,e).map(function(e){return t=i,n=a,Wn((r=e).position.getNode())&&!1===Wr(r.block)?Uc(!1,r.block.dom).bind(function(e){return e.isEqual(r.position)?Gl(n,t,e).bind(function(e){return cb(t,e)}):ve.some(r)}).getOr(r):r;var t,n,r})})}),dn(u,s,sb).filter(function(e){return!1===je(e.from.block,e.to.block)&&Ot((n=e).from.block).bind(function(t){return Ot(n.to.block).filter(function(e){return je(t,e)})}).isSome()&&!1===Yn((t=e).from.block.dom)&&!1===Yn(t.to.block.dom);var t,n})):ve.none()).bind(function(e){return hb(c,n,e.from.block,e.to.block)}));return l.each(function(e){t.selection.setRng(e.toRange())}),l.isSome()}function bb(e,t){var n=Nt.fromDom(t),r=A(je,e);return gr(n,ho,r).isSome()}function yb(e){var n,r,o,t,i,a,u,s,c,l,f=Nt.fromDom(e.getBody()),d=e.selection.getRng();return a=d,c=Zl((i=f).dom,as.fromRangeStart(a)).isNone(),l=Ql(i.dom,as.fromRangeEnd(a)).isNone(),!bb(u=i,(s=a).startContainer)&&!bb(u,s.endContainer)&&c&&l?((t=e).setContent(""),t.selection.setCursorLocation(),!0):(n=f,r=e.selection,o=r.getRng(),dn(ab(n,Nt.fromDom(o.startContainer)),ab(n,Nt.fromDom(o.endContainer)),function(e,t){return!1===je(e,t)&&(o.deleteContents(),hb(n,!0,e,t).each(function(e){r.setRng(e.toRange())}),!0)}).getOr(!1))}function Cb(e,t){return!e.selection.isCollapsed()&&yb(e)}function xb(e,t,n,r,o){return ve.from(t._selectionOverrides.showCaret(e,n,r,o))}function wb(e,t){var n,r;return e.fire("BeforeObjectSelected",{target:t}).isDefaultPrevented()?ve.none():ve.some(((r=(n=t).ownerDocument.createRange()).selectNode(n),r))}function Sb(e,t,n){var r=Zs(1,e.getBody(),t),o=as.fromRangeStart(r),i=o.getNode();if(wc(i))return xb(1,e,i,!o.isAtEnd(),!1);var a=o.getNode(!0);if(wc(a))return xb(1,e,a,!1,!1);var u=e.dom.getParent(o.getNode(),function(e){return yy(e)||by(e)});return wc(u)?xb(1,e,u,!1,n):ve.none()}function Eb(e,t,n){return t.collapsed?Sb(e,t,n).getOr(t):t}function Nb(e){return ep(e)||Gg(e)}function kb(e){return tp(e)||Jg(e)}function _b(n,r,e,t,o,i){var a,u;return xb(t,n,i.getNode(!o),o,!0).each(function(e){var t;r.collapsed?(t=r.cloneRange(),o?t.setEnd(e.startContainer,e.startOffset):t.setStart(e.endContainer,e.endOffset),t.deleteContents()):r.deleteContents(),n.selection.setRng(e)}),a=n.dom,jn(u=e)&&0===u.data.length&&a.remove(u),!0}function Ab(e,t){var n=e.selection.getRng();if(!jn(n.commonAncestorContainer))return!1;var r=t?ic.Forwards:ic.Backwards,o=Pc(e.getBody()),i=A(rc,t?o.next:o.prev),a=t?Nb:kb,u=tc(r,e.getBody(),n),s=ob(t,i(u));if(!s||!oc(u,s))return!1;if(a(s))return _b(e,n,u.getNode(),r,t,s);var c=i(s);return!!(c&&a(c)&&oc(s,c))&&_b(e,n,u.getNode(),r,t,c)}function Rb(l,f,d){return Gl(f,l,d).bind(function(e){return s=e.getNode(),ho(Nt.fromDom(s))||go(Nt.fromDom(s))||(o=l,u=e,ec(!(i=f),a=d).fold(function(){return ec(i,u).fold(R,c)},c))?ve.none():f&&Yn(e.getNode())||!1===f&&Yn(e.getNode(!0))?(t=l,n=d,r=e.getNode(!1===f),ab(Nt.fromDom(t),Nt.fromDom(n.getNode())).map(function(e){return Wr(e)?Cy.remove(e.dom):Cy.moveToElement(r)}).orThunk(function(){return ve.some(Cy.moveToElement(r))})):f&&tp(d)||!1===f&&ep(d)?ve.some(Cy.moveToPosition(e)):ve.none();var t,n,r,o,i,a,u,s;function c(e){return Or(Nt.fromDom(e))&&!Ys(a,u,o)}})}function Db(e,t){return ve.from(pf(e.getBody(),t))}function Tb(m,g){var e=m.selection.getNode();return Db(m,e).filter(Yn).fold(function(){return s=m.getBody(),l=Zs((c=g)?1:-1,s,m.selection.getRng()),f=as.fromRangeStart(l),d=Nt.fromDom(s),(!1===c&&tp(f)?ve.some(Cy.remove(f.getNode(!0))):c&&ep(f)?ve.some(Cy.remove(f.getNode())):!1===c&&ep(f)&&Em(d,f)?ap(d,f).map(function(e){return Cy.remove(e.getNode())}):c&&tp(f)&&Sm(d,f)?up(d,f).map(function(e){return Cy.remove(e.getNode())}):(r=s,e=c,a=(o=f).getNode(!1===(i=e)),u=i?"after":"before",zn(a)&&a.getAttribute("data-mce-caret")===u?(n=o.getNode(!1===(t=e)),(t&&Yn(n.nextSibling)?ve.some(Cy.moveToElement(n.nextSibling)):!1===t&&Yn(n.previousSibling)?ve.some(Cy.moveToElement(n.previousSibling)):ve.none()).fold(function(){return Rb(r,e,o)},ve.some)):Rb(r,e,o).bind(function(e){return t=r,n=o,e.fold(function(e){return ve.some(Cy.remove(e))},function(e){return ve.some(Cy.moveToElement(e))},function(e){return Ys(n,e,t)?ve.none():ve.some(Cy.moveToPosition(e))});var t,n}))).exists(function(e){return e.fold(function(e){return o._selectionOverrides.hideFakeCaret(),Ym(o,i,Nt.fromDom(e)),!0},(r=i=g,function(e){var t=r?as.before(e):as.after(e);return n.selection.setRng(t.toRange()),!0}),(t=n=o=m,function(e){return t.selection.setRng(e.toRange()),!0}));var t,n,r,o,i});var r,e,o,t,n,i,a,u,s,c,l,f,d},w)}function Ob(e,t){var n=e.selection.getNode();return!(!Yn(n)||Gn(n))&&Db(e,n.parentNode).filter(Yn).fold(function(){return Y(hu(Nt.fromDom(e.getBody()),".mce-offscreen-selection"),Ln),Ym(e,t,Nt.fromDom(e.selection.getNode())),ub(e),!0},w)}function Bb(e){var t,n=e.dom,r=e.selection,o=pf(e.getBody(),r.getNode());return Xn(o)&&n.isBlock(o)&&n.isEmpty(o)&&(t=n.create("br",{"data-mce-bogus":"1"}),n.setHTML(o,""),o.appendChild(t),r.setRng(as.before(t).toRange())),!0}function Pb(e,t){return(e.selection.isCollapsed()?Tb:Ob)(e,t)}function Lb(e,t){return!!e.selection.isCollapsed()&&(n=e,r=t,o=as.fromRangeStart(n.selection.getRng()),Gl(r,n.getBody(),o).filter(function(e){return(r?Xg:Yg)(e)}).bind(function(e){return ve.from(Gs(r?0:-1,e))}).exists(function(e){return n.selection.select(e),!0}));var n,r,o}function Ib(e){return xy(e)&&e.data[0]===Co}function Mb(e){return xy(e)&&e.data[e.data.length-1]===Co}function Fb(e){return e.ownerDocument.createTextNode(Co)}function Ub(e,t){return(e?function(e){if(xy(e.previousSibling))return Mb(e.previousSibling)||e.previousSibling.appendData(Co),e.previousSibling;if(xy(e))return Ib(e)||e.insertData(0,Co),e;var t=Fb(e);return e.parentNode.insertBefore(t,e),t}:function(e){if(xy(e.nextSibling))return Ib(e.nextSibling)||e.nextSibling.insertData(0,Co),e.nextSibling;if(xy(e))return Mb(e)||e.appendData(Co),e;var t=Fb(e);return e.nextSibling?e.parentNode.insertBefore(t,e.nextSibling):e.parentNode.appendChild(t),t})(t)}function zb(e,t){return jn(e.container())?Ub(t,e.container()):Ub(t,e.getNode())}function Hb(e,t){var n=t.get();return n&&e.container()===n&&Lr(n)}function jb(n,e){return e.fold(function(e){vc(n.get());var t=wy(e);return n.set(t),ve.some(as(t,t.length-1))},function(e){return ef(e).map(function(e){if(Hb(e,n))return as(n.get(),1);vc(n.get());var t=zb(e,!0);return n.set(t),as(t,1)})},function(e){return tf(e).map(function(e){if(Hb(e,n))return as(n.get(),n.get().length-1);vc(n.get());var t=zb(e,!1);return n.set(t),as(t,t.length-1)})},function(e){vc(n.get());var t=Sy(e);return n.set(t),ve.some(as(t,1))})}function Vb(e,t){for(var n=0;n<e.length;n++){var r=e[n].apply(null,t);if(r.isSome())return r}return ve.none()}function qb(e,t){return Xs(t,e)||e}function $b(e,t,n){var r=hy(n),o=qb(t,r.container());return rb(e,o,r).fold(function(){return Ql(o,r).bind(A(rb,e,o)).map(function(e){return Ey.before(e)})},ve.none)}function Wb(e,t){return null===Hc(e,t)}function Kb(e,t,n){return rb(e,t,n).filter(A(Wb,t))}function Xb(e,t,n){var r=vy(n);return Kb(e,t,r).bind(function(e){return Zl(e,r).isNone()?ve.some(Ey.start(e)):ve.none()})}function Yb(e,t,n){var r=hy(n);return Kb(e,t,r).bind(function(e){return Ql(e,r).isNone()?ve.some(Ey.end(e)):ve.none()})}function Gb(e,t,n){var r=vy(n),o=qb(t,r.container());return rb(e,o,r).fold(function(){return Zl(o,r).bind(A(rb,e,o)).map(function(e){return Ey.after(e)})},ve.none)}function Jb(e){return!1===(t=Ny(e),"rtl"===Ja.DOM.getStyle(t,"direction",!0)||(n=t.textContent,py.test(n)));var t,n}function Qb(e,t,n){return Vb([$b,Xb,Yb,Gb],[e,t,n]).filter(Jb)}function Zb(e){return e.fold(J("before"),J("start"),J("end"),J("after"))}function ey(e){return e.fold(Ey.before,Ey.before,Ey.after,Ey.after)}function ty(e){return e.fold(Ey.start,Ey.start,Ey.end,Ey.end)}function ny(a,e,u,t,n,s){return dn(rb(e,u,t),rb(e,u,n),function(e,t){return e!==t&&(r=t,o=Xs(e,n=u),i=Xs(r,n),o&&o===i)?Ey.after(a?e:t):s;var n,r,o,i}).getOr(s)}function ry(e,r){return e.fold(w,function(e){return n=r,!(Zb(t=e)===Zb(n)&&Ny(t)===Ny(n));var t,n})}function oy(e,t){return e?t.fold(i(ve.some,Ey.start),ve.none,i(ve.some,Ey.after),ve.none):t.fold(ve.none,i(ve.some,Ey.before),ve.none,i(ve.some,Ey.end))}function iy(e,a,u,s){var t=ob(e,s),c=Qb(a,u,t);return Qb(a,u,t).bind(A(oy,e)).orThunk(function(){return n=a,r=u,o=c,i=ob(t=e,s),Gl(t,r,i).map(A(ob,t)).fold(function(){return o.map(ey)},function(e){return Qb(n,r,e).map(A(ny,t,n,r,i,e)).filter(A(ry,o))}).filter(Jb);var t,n,r,o,i})}function ay(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r=window.console;r&&(r.error||r.log).apply(r,Ae([e],t,!1))}var uy,sy,cy=function(t,e){var n=t.editorManager.baseURL+"/skins/content",r="content"+t.editorManager.suffix+".css",o=!0===t.inline;return T(e,function(e){return/^[a-z0-9\-]+$/i.test(e)&&!o?n+"/"+e+"/"+r:t.documentBaseURI.toAbsolute(e)})},ly=0,fy=Et.each,dy=Ja.DOM,my=[9,27,Bf.HOME,Bf.END,19,20,44,144,145,33,34,45,16,17,18,91,92,93,Bf.DOWN,Bf.UP,Bf.LEFT,Bf.RIGHT].concat(xt.browser.isFirefox()?[224]:[]),gy="data-mce-placeholder",py=/[\u0591-\u07FF\uFB1D-\uFDFF\uFE70-\uFEFC]/,hy=A(ob,!0),vy=A(ob,!1),by=Xn,yy=Yn,Cy=or([{remove:["element"]},{moveToElement:["element"]},{moveToPosition:["position"]}]),xy=jn,wy=A(Ub,!0),Sy=A(Ub,!1),Ey=or([{before:["element"]},{start:["element"]},{end:["element"]},{after:["element"]}]),Ny=function(e){return e.fold(u,u,u,u)};function ky(e,t,n){var r=e?1:-1;return t.setRng(as(n.container(),n.offset()+r).toRange()),t.getSel().modify("move",e?"forward":"backward","word"),!0}function _y(e,t){return e===ic.Backwards?q(t):t}function Ay(e,t,n,r){for(var o,i,a,u,s=Pc(n),c=r,l=[];c;){var f=(a=s,u=c,t===ic.Forwards?a.next(u):a.prev(u));if(!f)break;if(Wn(f.getNode(!1)))return t===ic.Forwards?{positions:_y(t,l).concat([f]),breakType:uy.Br,breakAt:ve.some(f)}:{positions:_y(t,l),breakType:uy.Br,breakAt:ve.some(f)};if(f.isVisible()){if(e(c,f)){var d=(o=c,Wn((i=f).getNode(t===ic.Forwards))?uy.Br:!1===Ys(o,i)?uy.Block:uy.Wrap);return{positions:_y(t,l),breakType:d,breakAt:ve.some(f)}}l.push(f),c=f}else c=f}return{positions:_y(t,l),breakType:uy.Eol,breakAt:ve.none()}}function Ry(n,r,o,e){return r(o,e).breakAt.map(function(e){var t=r(o,e).positions;return n===ic.Backwards?t.concat(e):[e].concat(t)}).getOr([])}function Dy(e,i){return L(e,function(e,o){return e.fold(function(){return ve.some(o)},function(r){return dn(Q(r.getClientRects()),Q(o.getClientRects()),function(e,t){var n=Math.abs(i-e.left);return Math.abs(i-t.left)<=n?o:r}).or(e)})},ve.none())}function Ty(t,e){return Q(e.getClientRects()).bind(function(e){return Dy(t,e.left)})}function Oy(n){function e(e){return T(e,function(e){var t=ku(e);return t.node=n,t})}if(zn(n))return e(n.getClientRects());if(jn(n)){var t=n.ownerDocument.createRange();return t.setStart(n,0),t.setEnd(n,n.data.length),e(t.getClientRects())}}function By(e){return H(e,Oy)}A(iy,!1),A(iy,!0),(sy=uy={})[sy.Br=0]="Br",sy[sy.Block=1]="Block",sy[sy.Wrap=2]="Wrap",sy[sy.Eol=3]="Eol";var Py,Ly,Iy=A(Ay,as.isAbove,-1),My=A(Ay,as.isBelow,1),Fy=A(Ry,-1,Iy),Uy=A(Ry,1,My);function zy(o,i,a,e,u,t){function n(e){var t=By([e]);-1===o&&(t=t.reverse());for(var n=0;n<t.length;n++){var r=t[n];if(!a(r,l)){if(0<c.length&&i(r,pe(c))&&s++,r.line=s,u(r))return!0;c.push(r)}}}var s=0,c=[],l=pe(t.getClientRects());if(!l)return c;var r=t.getNode();return n(r),function(e,t,n,r){for(;r=Ks(r,e,Vr,t);)if(n(r))return}(o,e,n,r),c}function Hy(t){return function(e){return e.line>t}}function jy(t){return function(e){return e.line===t}}function Vy(e,t){return Math.abs(e.left-t)}function qy(e,t){return Math.abs(e.right-t)}function $y(e,t){return e>=t.left&&e<=t.right}function Wy(e,t){return e>=t.top&&e<=t.bottom}function Ky(e,o,i){return void 0===i&&(i=w),me(e,function(e,t){if($y(o,t))return i(t)?t:e;if($y(o,e))return i(e)?e:t;var n=Math.min(Vy(e,o),qy(e,o)),r=Math.min(Vy(t,o),qy(t,o));return r===n&&se(t,"node")&&MC(t.node)||r<n?t:e})}function Xy(e,t,n,r,o){var i=FC(r,e,Vr,t,!o);do{if(!i||n(i))return}while(i=FC(i,e,Vr,t))}function Yy(e,t,n){function r(e){return!cn(e.node)&&!Jn(e.node)}var o,i,a,u=By(U(xe(e.getElementsByTagName("*")),$s)),s=U(u,A(Wy,n));if((a=Ky(s,t,r))&&((a=Ky(function(e,r,t){function n(t,e){var n=U(By([e]),function(e){return!t(e,r)});return o=o.concat(n),0===n.length}void 0===t&&(t=!0);var o=[];return o.push(r),Xy(Py.Up,e,A(n,Ru),r.node,t),Xy(Py.Down,e,A(n,Du),r.node,t),o}(e,a,r(a)),t,r))&&$s(a.node)))return{node:(o=a).node,before:Vy(o,i=t)<qy(o,i)};return null}function Gy(e,t){e.selection.setRng(t),Zf(e,e.selection.getRng())}function Jy(e,t,n){return ve.some(Eb(e,t,n))}function Qy(e,t,n,r,o,i){var a=t===ic.Forwards,u=Pc(e.getBody()),s=A(rc,a?u.next:u.prev),c=a?r:o;if(!n.collapsed){var l=Ou(n);if(i(l))return xb(t,e,l,t===ic.Backwards,!1)}var f=tc(t,e.getBody(),n);if(c(f))return wb(e,f.getNode(!a));var d=ob(a,s(f)),m=Hr(n);if(!d)return m?ve.some(n):ve.none();if(c(d))return xb(t,e,d.getNode(!a),a,!1);var g=s(d);return g&&c(g)&&oc(d,g)?xb(t,e,g.getNode(!a),a,!1):m?Jy(e,d.toRange(),!1):ve.none()}function Zy(t,e,n,r,o,i){var a=tc(e,t.getBody(),n),u=pe(a.getClientRects()),s=e===Py.Down;if(!u)return ve.none();var c,l=U((s?IC:LC)(t.getBody(),Hy(1),a),jy(1)),f=u.left,d=Ky(l,f);if(d&&i(d.node)){var m=Math.abs(f-d.left),g=Math.abs(f-d.right);return xb(e,t,d.node,m<g,!1)}if(c=r(a)?a.getNode():o(a)?a.getNode(!0):Ou(n)){var p=function(e,t,n,r){function o(e){return pe(e.getClientRects())}var i,a,u,s=Pc(t),c=[],l=0,f=1===e?(i=s.next,a=Du,u=Ru,as.after(r)):(i=s.prev,a=Ru,u=Du,as.before(r)),d=o(f);do{if(f.isVisible()){var m=o(f);if(!u(m,d)){0<c.length&&a(m,pe(c))&&l++;var g=ku(m);if(g.position=f,g.line=l,n(g))return c;c.push(g)}}}while(f=i(f));return c}(e,t.getBody(),Hy(1),c),h=Ky(U(p,jy(1)),f);if(h)return Jy(t,h.position.toRange(),!1);if(h=pe(U(p,jy(0))))return Jy(t,h.position.toRange(),!1)}return 0===l.length?UC(t,s).filter(s?o:r).map(function(e){return Eb(t,e.toRange(),!1)}):ve.none()}function e0(t,e,n){return UC(t,e).filter(n).exists(function(e){return t.selection.setRng(e.toRange()),!0})}function t0(e,t){var n=e.dom.createRng();n.setStart(t.container(),t.offset()),n.setEnd(t.container(),t.offset()),e.selection.setRng(n)}function n0(e,t){e?t.setAttribute("data-mce-selected","inline-boundary"):t.removeAttribute("data-mce-selected")}function r0(t,e,n){return jb(e,n).map(function(e){return t0(t,e),n})}function o0(e,t,n){return!!Ps(e)&&(o=t,i=n,a=(r=e).getBody(),u=as.fromRangeStart(r.selection.getRng()),iy(i,A(nb,r),a,u).bind(function(e){return r0(r,o,e)}).isSome());var r,o,i,a,u}function i0(e,t,n){return!!Ps(t)&&(r=e,i=(o=t).selection.getRng(),a=r?as.fromRangeEnd(i):as.fromRangeStart(i),!!y(o.selection.getSel().modify)&&(r&&Fr(a)?ky(!0,o.selection,a):!(r||!Ur(a))&&ky(!1,o.selection,a)));var r,o,i,a}function a0(g){var p=ru(null),h=A(nb,g);return g.on("NodeChange",function(e){var n,r,o,t,i,a,u,s,c,l,f,d,m;!Ps(g)||xt.browser.isIE()&&e.initial||(i=h,a=g.dom,u=e.parents,Y($(s=U(T(hu(Nt.fromDom(a.getRoot()),'*[data-mce-selected="inline-boundary"]'),function(e){return e.dom}),i),c=U(u,i)),A(n0,!1)),Y($(c,s),A(n0,!0)),f=p,(l=g).selection.isCollapsed()&&!0!==l.composing&&f.get()&&(d=as.fromRangeStart(l.selection.getRng()),as.isTextPosition(d)&&!1===(Fr(m=d)||Ur(m))&&(t0(l,Hs(f.get(),d)),f.set(null))),n=h,r=g,o=p,t=e.parents,r.selection.isCollapsed()&&Y(U(t,n),function(e){var t=as.fromRangeStart(r.selection.getRng());Qb(n,r.getBody(),t).bind(function(e){return r0(r,o,e)})}))}),p}function u0(n,t,r){if(Ps(n)){var e=UC(n,t).getOrThunk(function(){var e=n.selection.getRng();return t?as.fromRangeEnd(e):as.fromRangeStart(e)});return Qb(A(nb,n),n.getBody(),e).exists(function(e){var t=ey(e);return jb(r,t).exists(function(e){return t0(n,e),!0})})}return!1}function s0(t,n){return function(e){return jb(n,e).exists(function(e){return t0(t,e),!0})}}function c0(r,o,i,a){var u=r.getBody(),s=A(nb,r);r.undoManager.ignore(function(){var e,t,n;r.selection.setRng((e=i,t=a,(n=document.createRange()).setStart(e.container(),e.offset()),n.setEnd(t.container(),t.offset()),n)),r.execCommand("Delete"),Qb(s,u,as.fromRangeStart(r.selection.getRng())).map(ty).map(s0(r,o))}),r.nodeChanged()}function l0(e,t,n){if(e.selection.isCollapsed()&&Ps(e)){var r=as.fromRangeStart(e.selection.getRng());return o=t,a=n,u=r,s=(i=e).getBody(),c=Xs(u.container(),s)||s,l=A(nb,i),(f=Qb(l,c,u)).bind(function(e){return a?e.fold(J(ve.some(ty(e))),ve.none,J(ve.some(ey(e))),ve.none):e.fold(ve.none,J(ve.some(ey(e))),ve.none,J(ve.some(ty(e))))}).map(s0(i,o)).getOrThunk(function(){var t=Fc(a,c,u),e=t.bind(function(e){return Qb(l,c,e)});return dn(f,e,function(){return rb(l,c,u).exists(function(e){return!!dn(ef(o=e),tf(o),function(e,t){var n=ob(!0,e),r=ob(!1,t);return Ql(o,n).forall(function(e){return e.isEqual(r)})}).getOr(!0)&&(Ym(i,a,Nt.fromDom(e)),!0);var o})}).orThunk(function(){return e.bind(function(e){return t.map(function(e){return a?c0(i,o,u,e):c0(i,o,e,u),!0})})}).getOr(!1)})}var i,o,a,u,s,c,l,f;return!1}function f0(e){return 1===zt(e)}function d0(g,p){var t,e=Nt.fromDom(g.getBody()),n=Nt.fromDom(g.selection.getStart()),h=U(z(t=hm(n,e),lo).fold(J(t),function(e){return t.slice(0,e)}),f0);return Z(h).exists(function(e){var t,n,r,o,i,a,u,s,c,l=as.fromRangeStart(g.selection.getRng()),f=p,d=l,m=e.dom;return!(!dn(ef(m),tf(m),function(e,t){var n=ob(!0,e),r=ob(!1,t),o=ob(!1,d);return f?Ql(m,o).exists(function(e){return e.isEqual(r)&&d.isEqual(n)}):Zl(m,o).exists(function(e){return e.isEqual(n)&&d.isEqual(r)})}).getOr(!0)||zc((t=e).dom)&&Pg(t.dom)||(n=p,o=e,0===(c=T(U(h,A(Vg,r=g)),function(e){return e.dom})).length?Ym(r,n,o):(a=o.dom,s=zg(c,(u=Ig(!1)).dom),qt(Nt.fromDom(a),u),Ln(Nt.fromDom(a)),i=as(s,0),r.selection.setRng(i.toRange())),0))})}function m0(e,t){return!!e.selection.isCollapsed()&&d0(e,t)}function g0(e,t,n){return e._selectionOverrides.hideFakeCaret(),Ym(e,t,Nt.fromDom(n)),!0}function p0(e,t){return e.selection.isCollapsed()?(i=e,u=(a=t)?Gg:Jg,s=a?ic.Forwards:ic.Backwards,c=tc(s,i.getBody(),i.selection.getRng()),u(c)?g0(i,a,c.getNode(!a)):ve.from(ob(a,c)).filter(function(e){return u(e)&&oc(c,e)}).exists(function(e){return g0(i,a,e.getNode(!a))})):(r=t,o=(n=e).selection.getNode(),!!Jn(o)&&g0(n,r,o));var n,r,o,i,a,u,s,c}function h0(e){var t=parseInt(e,10);return isNaN(t)?0:t}function v0(e,t){return(e||"table"===kt(t)?"margin":"padding")+("rtl"===xn(t,"direction")?"-right":"-left")}function b0(e){var n,t=jC(e);return!e.mode.isReadOnly()&&(1<t.length||(n=e,j(t,function(e){var t=wn(e,v0(Rs(n),e)).map(h0).getOr(0);return"false"!==n.dom.getContentEditable(e.dom)&&0<t})))}function y0(e){return mo(e)||go(e)}function C0(e,s){var c=e.dom,t=e.selection,n=e.formatter,r=e.getParam("indentation","40px","string"),l=/[a-z%]+$/i.exec(r)[0],f=parseInt(r,10),d=Rs(e),o=Ss(e);e.queryCommandState("InsertUnorderedList")||e.queryCommandState("InsertOrderedList")||""!==o||c.getParent(t.getNode(),c.isBlock)||n.apply("div"),Y(jC(e),function(e){var t,n=c,r=s,o=f,i=l,a=e.dom,u=v0(d,Nt.fromDom(a));"outdent"===r?(t=Math.max(0,h0(a.style[u])-o),n.setStyle(a,u,t?t+i:"")):(t=h0(a.style[u])+o+i,n.setStyle(a,u,t))})}function x0(e,t){if(e.selection.isCollapsed()&&b0(e)){var n=e.dom,r=e.selection.getRng(),o=as.fromRangeStart(r),i=n.getParent(r.startContainer,n.isBlock);if(null!==i&&np(Nt.fromDom(i),o))return C0(e,"outdent"),!0}return!1}function w0(e,t){e.getDoc().execCommand(t,!1,null)}function S0(e){return void 0===e.touches||1!==e.touches.length?ve.none():ve.some(e.touches[0])}function E0(e,t){return Ne(e,t.nodeName)}function N0(e){var t,n,r,o=e.dom,i=e.selection,a=e.schema,u=a.getBlockElements(),s=i.getStart(),c=e.getBody(),l=Ss(e);if(s&&zn(s)&&l){var f=c.nodeName.toLowerCase();if(a.isValidChild(f,l.toLowerCase())&&(d=u,m=c,g=s,!F(pm(Nt.fromDom(g),Nt.fromDom(m)),function(e){return E0(d,e.dom)}))){for(var d,m,g,p,h,v=i.getRng(),b=v.startContainer,y=v.startOffset,C=v.endContainer,x=v.endOffset,w=vd(e),s=c.firstChild;s;)p=u,jn(h=s)||zn(h)&&!E0(p,h)&&!Yc(h)?function(e,t){if(jn(t)){if(0===t.nodeValue.length)return 1;if(/^\s+$/.test(t.nodeValue)&&(!t.nextSibling||E0(e,t.nextSibling)))return 1}}(u,s)?(s=(n=s).nextSibling,o.remove(n)):(t||(t=o.create(l,Es(e)),s.parentNode.insertBefore(t,s),r=!0),s=(n=s).nextSibling,t.appendChild(n)):(t=null,s=s.nextSibling);r&&w&&(v.setStart(b,y),v.setEnd(C,x),i.setRng(v),e.nodeChanged())}}}function k0(e,t){t.hasAttribute("data-mce-caret")&&(zr(t),e.selection.setRng(e.selection.getRng()),e.selection.scrollIntoView(t))}function _0(e,t){var n=vr(Nt.fromDom(e.getBody()),"*[data-mce-caret]").map(function(e){return e.dom}).getOrNull();if(n)return"compositionstart"===t.type?(t.preventDefault(),t.stopPropagation(),void k0(e,n)):void(Mr(n)&&(k0(e,n),e.undoManager.add()))}function A0(e,t,n){var r,o,i,a=Pc(e.getBody()),u=A(rc,1===t?a.next:a.prev);!n.collapsed||""===Ss(e)||(r=e.dom.getParent(n.startContainer,"PRE"))&&(u(as.fromRangeStart(n))||(i=e.dom.create(Ss(e)),(!xt.ie||11<=xt.ie)&&(i.innerHTML='<br data-mce-bogus="1">'),o=i,1===t?e.$(r).after(o):e.$(r).before(o),e.selection.select(o,!0),e.selection.collapse()))}function R0(t,e){return n=t,r=e?ic.Forwards:ic.Backwards,o=n.selection.getRng(),Qy(n,r,o,ep,tp,VC).orThunk(function(){return A0(n,r,o),ve.none()}).exists(function(e){return Gy(t,e),!0});var n,r,o}function D0(t,e){return r=e?1:-1,o=(n=t).selection.getRng(),Zy(n,r,o,function(e){return ep(e)||Qg(e)},function(e){return tp(e)||Zg(e)},VC).orThunk(function(){return A0(n,r,o),ve.none()}).exists(function(e){return Gy(t,e),!0});var n,r,o}function T0(e,t){return e0(e,t,t?tp:ep)}function O0(e){return D(["figcaption"],kt(e))}function B0(e){var t=document.createRange();return t.setStartBefore(e.dom),t.setEndBefore(e.dom),t}function P0(e,t,n){(n?Pn:Wt)(e,t)}function L0(h,v){var b=Nt.fromDom(h.getBody()),y=as.fromRangeStart(h.selection.getRng()),C=Ss(h),x=Es(h),e=y,t=A(je,b);return pr(Nt.fromDom(e.container()),lo,t).filter(O0).exists(function(){if(d=b,m=y,v?(p=d.dom,My(p,m).breakAt.isNone()):(g=d.dom,Iy(g,m).breakAt.isNone())){var e=(t=b,r=x,o=v,""===(n=C)?(l=o,P0(t,f=Nt.fromTag("br"),l),B0(f)):(i=t,a=o,u=r,s=Nt.fromTag(n),c=Nt.fromTag("br"),hn(s,u),Pn(s,c),P0(i,s,a),B0(c)));return h.selection.setRng(e),!0}var t,n,r,o,i,a,u,s,c,l,f,d,m,g,p;return!1})}function I0(e,t){return!!e.selection.isCollapsed()&&L0(e,t)}function M0(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];return function(){return e.apply(null,t)}}function F0(e,t){return M((n=t,H(T(e,function(e){return _e({shiftKey:!1,altKey:!1,ctrlKey:!1,metaKey:!1,keyCode:0,action:te},e)}),function(e){return n.keyCode===e.keyCode&&n.shiftKey===e.shiftKey&&n.altKey===e.altKey&&n.ctrlKey===e.ctrlKey&&n.metaKey===e.metaKey?[e]:[]})),function(e){return e.action()});var n}function U0(t,e){var n=e?ic.Forwards:ic.Backwards,r=t.selection.getRng();return Qy(t,n,r,Gg,Jg,Jn).exists(function(e){return Gy(t,e),!0})}function z0(t,e){var n=e?1:-1,r=t.selection.getRng();return Zy(t,n,r,Gg,Jg,Jn).exists(function(e){return Gy(t,e),!0})}function H0(e,t){return e0(e,t,t?Jg:Gg)}function j0(e,t,n,r,o){var i,a=hu(Nt.fromDom(n),"td,th,caption").map(function(e){return e.dom}),u=U((i=e,H(a,function(e){var t,n={left:(t=ku(e.getBoundingClientRect())).left- -1,top:t.top- -1,right:t.right+-2,bottom:t.bottom+-2,width:t.width+-1,height:t.height+-1};return[{x:n.left,y:i(n),cell:e},{x:n.right,y:i(n),cell:e}]})),function(e){return t(e,o)}),s=r,c=o;return L(u,function(e,r){return e.fold(function(){return ve.some(r)},function(e){var t=Math.sqrt(Math.abs(e.x-s)+Math.abs(e.y-c)),n=Math.sqrt(Math.abs(r.x-s)+Math.abs(r.y-c));return ve.some(n<t?r:e)})},ve.none()).map(function(e){return e.cell})}function V0(e,t,n){var r,o,i=e(t,n);return i.breakType===uy.Wrap&&0===i.positions.length||!Wn(n.getNode())&&i.breakType===uy.Br&&1===i.positions.length?(r=e,o=t,!i.breakAt.exists(function(e){return r(o,e).breakAt.isSome()})):i.breakAt.isNone()}function q0(t,e,n,r){var o,i,a,u=t.selection.getRng(),s=e?1:-1;return!(!qs()||(o=e,i=n,a=as.fromRangeStart(u),!Uc(!o,i).exists(function(e){return e.isEqual(a)}))||(xb(s,t,n,!e,!1).each(function(e){Gy(t,e)}),0))}function $0(u,s,c){var e,t,n=(e=!!s,t=c.getNode(e),zn(t)&&"TABLE"===t.nodeName?ve.some(t):ve.none()),r=!1===s;n.fold(function(){return Gy(u,c.toRange())},function(a){return Uc(r,u.getBody()).filter(function(e){return e.isEqual(c)}).fold(function(){return Gy(u,c.toRange())},function(e){var n,r,o=s,i=a,t=c;(r=Ss(n=u))?n.undoManager.transact(function(){var e=Nt.fromTag(r);hn(e,Es(n)),Pn(e,Nt.fromTag("br")),(o?$t:qt)(Nt.fromDom(i),e);var t=n.dom.createRng();t.setStart(e.dom,0),t.setEnd(e.dom,0),Gy(n,t)}):Gy(n,t.toRange())})})}function W0(e,t,n,r){var o,i,a,u,s,c,l,f,d,m,g=e.selection.getRng(),p=as.fromRangeStart(g),h=e.getBody();if(t||!WC(r,p))return!(!t||!KC(r,p))&&(o=h,d=i=n,$0(e,t,v=Z((m=a=p).getClientRects()).bind(function(e){return $C(d,e.left,e.top)}).bind(function(e){return Ty(ef(t=e).map(function(e){return[e].concat(My(t,e).positions)}).getOr([]),m);var t}).orThunk(function(){return Q(a.getClientRects()).bind(function(e){return Dy(Uy(o,as.after(i)),e.left)})}).getOr(as.after(i))),!0);var v=(u=h,l=s=n,Q((f=c=p).getClientRects()).bind(function(e){return qC(l,e.left,e.top)}).bind(function(e){return Ty(tf(t=e).map(function(e){return Iy(t,e).positions.concat(e)}).getOr([]),f);var t}).orThunk(function(){return Q(c.getClientRects()).bind(function(e){return Dy(Fy(u,as.before(s)),e.left)})}).getOr(as.before(s)));return $0(e,t,v),!0}function K0(n,r,o){return ve.from(n.dom.getParent(n.selection.getNode(),"td,th")).bind(function(t){return ve.from(n.dom.getParent(t,"table")).map(function(e){return o(n,r,e,t)})}).getOr(!1)}function X0(e,t){return K0(e,t,q0)}function Y0(e,t){return K0(e,t,W0)}function G0(e,t){var n,r,o=t,i=e.dom,a=e.schema.getMoveCaretBeforeOnEnterElements();if(t){!/^(LI|DT|DD)$/.test(t.nodeName)||(r=function(e){for(;e;){if(1===e.nodeType||3===e.nodeType&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}}(t.firstChild))&&/^(UL|OL|DL)$/.test(r.nodeName)&&t.insertBefore(i.doc.createTextNode(yo),t.firstChild);var u=i.createRng();if(t.normalize(),t.hasChildNodes()){for(var s=new Rr(t,t);n=s.current();){if(jn(n)){u.setStart(n,0),u.setEnd(n,0);break}if(a[n.nodeName.toLowerCase()]){u.setStartBefore(n),u.setEndBefore(n);break}o=n,n=s.next()}n||(u.setStart(o,0),u.setEnd(o,0))}else Wn(t)?t.nextSibling&&i.isBlock(t.nextSibling)?(u.setStartBefore(t),u.setEndBefore(t)):(u.setStartAfter(t),u.setEndAfter(t)):(u.setStart(t,0),u.setEnd(t,0));e.selection.setRng(u),Zf(e,u)}}function J0(e){return ve.from(e.dom.getParent(e.selection.getStart(!0),e.dom.isBlock))}function Q0(e,t){return e&&e.parentNode&&e.parentNode.nodeName===t}function Z0(e){return e&&/^(OL|UL|LI)$/.test(e.nodeName)}function eC(e){var t=e.parentNode;return/^(LI|DT|DD)$/.test(t.nodeName)?t:e}function tC(e,t,n){for(var r=e[n?"firstChild":"lastChild"];r&&!zn(r);)r=r[n?"nextSibling":"previousSibling"];return r===t}function nC(e){e.innerHTML='<br data-mce-bogus="1">'}function rC(e,t){return e.nodeName===t||e.previousSibling&&e.previousSibling.nodeName===t}function oC(e,t){return t&&e.isBlock(t)&&!/^(TD|TH|CAPTION|FORM)$/.test(t.nodeName)&&!/^(fixed|absolute)/i.test(t.style.position)&&"true"!==e.getContentEditable(t)}function iC(e,t,n){return!1===jn(t)?n:e?1===n&&t.data.charAt(n-1)===Co?0:n:n===t.data.length-1&&t.data.charAt(n)===Co?t.data.length:n}function aC(e,t){for(var n,r=e.getRoot(),o=t;o!==r&&"false"!==e.getContentEditable(o);)"true"===e.getContentEditable(o)&&(n=o),o=o.parentNode;return o!==r?n:r}function uC(e,t){var n=Ss(e);n&&n.toLowerCase()===t.tagName.toLowerCase()&&function(e,o,t){var i=e.dom;ve.from(t.style).map(i.parseStyle).each(function(e){var t=Sn(Nt.fromDom(o)),n=_e(_e({},t),e);i.setStyles(o,n)}),dn(ve.from(t.class).map(function(e){return e.split(/\s+/)}),ve.from(o.className).map(function(e){return U(e.split(/\s+/),function(e){return""!==e})}),function(t,e){var n=U(e,function(e){return!D(t,e)}),r=Ae(Ae([],t,!0),n,!0);i.setAttrib(o,"class",r.join(" "))});var n=["style","class"],r=ae(t,function(e,t){return!D(n,t)});i.setAttribs(o,r)}(e,t,Es(e))}function sC(a,e){function t(e){var t,n=m,r=l.getTextInlineElements(),o=e||"TABLE"===C||"HR"===C?c.create(e||p):b.cloneNode(!1),i=o;if(!1===a.getParam("keep_styles",!0))c.setAttrib(o,"style",null),c.setAttrib(o,"class",null);else for(;r[n.nodeName]&&(zc(n)||Yc(n)||(t=n.cloneNode(!1),c.setAttrib(t,"id",""),o.hasChildNodes()?t.appendChild(o.firstChild):i=t,o.appendChild(t))),(n=n.parentNode)&&n!==F;);return uC(a,o),nC(i),o}function n(e){var t,n,r=iC(e,m,g);if(!jn(m)||!(e?0<r:r<m.nodeValue.length)){if(m.parentNode===b&&s&&!e)return 1;if(e&&zn(m)&&m===b.firstChild)return 1;if(rC(m,"TABLE")||rC(m,"HR"))return s&&!e||!s&&e;var o=new Rr(m,b);for(jn(m)&&(e&&0===r?o.prev():e||r!==m.nodeValue.length||o.next());t=o.current();){if(zn(t)){if(!t.getAttribute("data-mce-bogus")&&(n=t.nodeName.toLowerCase(),f[n]&&"br"!==n))return}else if(jn(t)&&!qr(t.nodeValue))return;e?o.prev():o.next()}return 1}}function r(){u=/^(H[1-6]|PRE|FIGURE)$/.test(C)&&"HGROUP"!==x?t(p):t(),a.getParam("end_container_on_empty_block",!1)&&oC(c,y)&&c.isEmpty(b)?u=c.split(y,b):c.insertAfter(u,b),G0(a,u)}var o,u,i,s,c=a.dom,l=a.schema,f=l.getNonEmptyElements(),d=a.selection.getRng();Rf(c,d).each(function(e){d.setStart(e.startContainer,e.startOffset),d.setEnd(e.endContainer,e.endOffset)});var m=d.startContainer,g=d.startOffset,p=Ss(a),h=!(!e||!e.shiftKey),v=!(!e||!e.ctrlKey);zn(m)&&m.hasChildNodes()&&(s=g>m.childNodes.length-1,m=m.childNodes[Math.min(g,m.childNodes.length-1)]||m,g=s&&jn(m)?m.nodeValue.length:0);var b,y,C,x,w,S,p,E,N,k,_,A,R,D,T,O,B,P,L,I,M,F=aC(c,m);F&&((p&&!h||!p&&h)&&(m=function(e,t,n,r){var o,i,a,u,s,c,l=p||"P",f=e.dom,d=aC(f,n),m=f.getParent(n,f.isBlock);if(!m||!oC(f,m)){if(s=((m=m||d)===e.getBody()||(c=m)&&/^(TD|TH|CAPTION)$/.test(c.nodeName)?m:m.parentNode).nodeName.toLowerCase(),!m.hasChildNodes())return uC(e,o=f.create(l)),m.appendChild(o),t.setStart(o,0),t.setEnd(o,0),o;for(a=n;a.parentNode!==m;)a=a.parentNode;for(;a&&!f.isBlock(a);)a=(i=a).previousSibling;if(i&&e.schema.isValidChild(s,l.toLowerCase())){for(uC(e,o=f.create(l)),i.parentNode.insertBefore(o,i),a=i;a&&!f.isBlock(a);)u=a.nextSibling,o.appendChild(a),a=u;t.setStart(n,r),t.setEnd(n,r)}}return n}(a,d,m,g)),y=(b=c.getParent(m,c.isBlock))?c.getParent(b.parentNode,c.isBlock):null,C=b?b.nodeName.toUpperCase():"","LI"!==(x=y?y.nodeName.toUpperCase():"")||v||(y=(b=y).parentNode,C=x),/^(LI|DT|DD)$/.test(C)&&c.isEmpty(b)?(N=t,k=y,_=b,A=p,I=(E=a).dom,M=E.selection.getRng(),k!==E.getBody()&&(D=(A=Z0(R=k)&&Z0(R.parentNode)?"LI":A)?N(A):I.create("BR"),tC(k,_,!0)&&tC(k,_,!1)?Q0(k,"LI")?(T=eC(k),I.insertAfter(D,T),(null===(L=(P=k).parentNode)||void 0===L?void 0:L.firstChild)===P?I.remove(T):I.remove(k)):I.replace(D,k):(tC(k,_,!0)?Q0(k,"LI")?(I.insertAfter(D,eC(k)),D.appendChild(I.doc.createTextNode(" ")),D.appendChild(k)):k.parentNode.insertBefore(D,k):tC(k,_,!1)?I.insertAfter(D,eC(k)):(k=eC(k),(O=M.cloneRange()).setStartAfter(_),O.setEndAfter(k),B=O.extractContents(),"LI"===A&&(B.firstChild&&"LI"===B.firstChild.nodeName)?(D=B.firstChild,I.insertAfter(B,k)):(I.insertAfter(B,k),I.insertAfter(D,k))),I.remove(_)),G0(E,D))):p&&b===a.getBody()||(p=p||"P",Pr(b)?(u=zr(b),c.isEmpty(b)&&nC(b),uC(a,u),G0(a,u)):n()?r():n(!0)?(u=b.parentNode.insertBefore(t(),b),G0(a,rC(b,"HR")?u:b)):((S=(w=d).cloneRange()).setStart(w.startContainer,iC(!0,w.startContainer,w.startOffset)),S.setEnd(w.endContainer,iC(!1,w.endContainer,w.endOffset)),(o=S.cloneRange()).setEndAfter(b),i=o.extractContents(),Y(Hu(Nt.fromDom(i),_n),function(e){var t=e.dom;t.nodeValue=wo(t.nodeValue)}),function(e){for(;jn(e)&&(e.nodeValue=e.nodeValue.replace(/^[\r\n]+/,"")),e=e.firstChild;);}(i),u=i.firstChild,c.insertAfter(i,b),function(e,t){var n,r,o=u,i=[];if(o){for(;o=o.firstChild;){if(e.isBlock(o))return;zn(o)&&!t[o.nodeName.toLowerCase()]&&i.push(o)}for(n=i.length;n--;)!(o=i[n]).hasChildNodes()||o.firstChild===o.lastChild&&""===o.firstChild.nodeValue?e.remove(o):(r=o)&&"A"===r.nodeName&&e.isEmpty(r)&&e.remove(o)}}(c,f),function(e,t){t.normalize();var n=t.lastChild;n&&!/^(left|right)$/gi.test(e.getStyle(n,"float",!0))||e.add(t,"br")}(c,b),c.isEmpty(b)&&nC(b),u.normalize(),c.isEmpty(u)?(c.remove(u),r()):(uC(a,u),G0(a,u))),c.setAttrib(u,"id",""),a.fire("NewBlock",{newBlock:u})))}function cC(e,t,n){var r=e.dom.createRng();n?(r.setStartBefore(t),r.setEndBefore(t)):(r.setStartAfter(t),r.setEndAfter(t)),e.selection.setRng(r),Zf(e,r)}function lC(e,t){var n=Nt.fromTag("br");qt(Nt.fromDom(t),n),e.undoManager.add()}function fC(e,t){XC(e.getBody(),t)||$t(Nt.fromDom(t),Nt.fromTag("br"));var n=Nt.fromTag("br");$t(Nt.fromDom(t),n),cC(e,n.dom,!1),e.undoManager.add()}function dC(e){return e&&"A"===e.nodeName&&"href"in e}function mC(e){return e.fold(R,dC,dC,R)}function gC(e,t){t.fold(te,A(lC,e),A(fC,e),te)}function pC(e,t){var n,r,o,i=(r=A(nb,n=e),o=as.fromRangeStart(n.selection.getRng()),Qb(r,n.getBody(),o).filter(mC));i.isSome()?i.each(A(gC,e)):function(e,t){var n,r,o=e.selection,i=e.dom,a=o.getRng();Rf(i,a).each(function(e){a.setStart(e.startContainer,e.startOffset),a.setEnd(e.endContainer,e.endOffset)});var u,s=a.startOffset,c=a.startContainer;1===c.nodeType&&c.hasChildNodes()&&(u=s>c.childNodes.length-1,c=c.childNodes[Math.min(s,c.childNodes.length-1)]||c,s=u&&3===c.nodeType?c.nodeValue.length:0);var l=i.getParent(c,i.isBlock),f=l?i.getParent(l.parentNode,i.isBlock):null,d=f?f.nodeName.toUpperCase():"",m=!(!t||!t.ctrlKey);"LI"!==d||m||(l=f),c&&3===c.nodeType&&s>=c.nodeValue.length&&!function(e){for(var t,n=new Rr(c,l),r=e.getNonEmptyElements();t=n.next();)if(r[t.nodeName.toLowerCase()]||0<t.length)return 1}(e.schema)&&(n=i.create("br"),a.insertNode(n),a.setStartAfter(n),a.setEndAfter(n),r=!0),n=i.create("br"),ss(i,a,n),cC(e,n,r),e.undoManager.add()}(e,t)}function hC(e,t){return J0(e).filter(function(e){return 0<t.length&&ze(Nt.fromDom(e),t)}).isSome()}function vC(e,t){return hC(e,e.getParam("no_newline_selector",""))}function bC(n){return function(e,t){return""===Ss(e)===n}}function yC(n){return function(e,t){return J0(e).filter(function(e){return go(Nt.fromDom(e))}).isSome()===n}}function CC(n,r){return function(e,t){return J0(e).fold(J(""),function(e){return e.nodeName.toUpperCase()})===n.toUpperCase()===r}}function xC(e){return CC("pre",e)}function wC(n){return function(e,t){return e.getParam("br_in_pre",!0)===n}}function SC(e,t){return hC(e,e.getParam("br_newline_selector",".mce-toc h2,figcaption,caption"))}function EC(e,t){return t}function NC(e){var t=Ss(e),n=function(e,t){for(var n,r=e.getRoot(),o=t;o!==r&&"false"!==e.getContentEditable(o);)"true"===e.getContentEditable(o)&&(n=o),o=o.parentNode;return o!==r?n:r}(e.dom,e.selection.getStart());return n&&e.schema.isValidChild(n.nodeName,t||"P")}function kC(e,t){return function(n,r){return L(e,function(e,t){return e&&t(n,r)},!0)?ve.some(t):ve.none()}}function _C(e,t){var n,r;n=e,r=t,Vb([kC([vC],YC.none()),kC([CC("summary",!0)],YC.br()),kC([xC(!0),wC(!1),EC],YC.br()),kC([xC(!0),wC(!1)],YC.block()),kC([xC(!0),wC(!0),EC],YC.block()),kC([xC(!0),wC(!0)],YC.br()),kC([yC(!0),EC],YC.br()),kC([yC(!0)],YC.block()),kC([bC(!0),EC,NC],YC.block()),kC([bC(!0)],YC.br()),kC([SC],YC.br()),kC([bC(!1),EC],YC.br()),kC([NC],YC.block())],[n,!(!r||!r.shiftKey)]).getOr(YC.none()).fold(function(){pC(e,t)},function(){sC(e,t)},te)}function AC(e){return e.stopImmediatePropagation()}function RC(e){return e.keyCode===Bf.PAGE_UP||e.keyCode===Bf.PAGE_DOWN}function DC(e,t,n){n&&!e.get()?t.on("NodeChange",AC,!0):!n&&e.get()&&t.off("NodeChange",AC),e.set(n)}function TC(n,r){var e=r.container(),t=r.offset();return jn(e)?(e.insertData(t,n),ve.some(as(e,t+n.length))):nc(r).map(function(e){var t=Nt.fromText(n);return(r.isAtEnd()?$t:qt)(e,t),as(t.dom,n.length)})}function OC(i,a){return function(e){return r=i,(!Rm(o=e)&&(n=o,Zl((t=r).dom,n).isNone()||Ql(t.dom,n).isNone()||np(t,n)||rp(t,n)||Em(t,n)||Sm(t,n)||_m(r,o)||Am(r,o))?QC:ZC)(a);var t,n,r,o}}function BC(e){var t,n,r=as.fromRangeStart(e.selection.getRng()),o=Nt.fromDom(e.getBody());if(e.selection.isCollapsed()){var i=A(nb,e),a=as.fromRangeStart(e.selection.getRng());return Qb(i,e.getBody(),a).bind((n=o,function(e){return e.fold(function(e){return Zl(n.dom,as.before(e))},function(e){return ef(e)},function(e){return tf(e)},function(e){return Ql(n.dom,as.after(e))})})).bind(OC(o,r)).exists((t=e,function(e){return t.selection.setRng(e.toRange()),t.nodeChanged(),!0}))}return!1}function PC(e){var o,i,a,u,s,t,n,r,c,l,f,d,m,g,p=a0(e);return e.on("keyup compositionstart",A(_0,e)),g=p,(m=e).on("keydown",function(e){var t,n,r,o;!1===e.isDefaultPrevented()&&(t=m,n=g,r=e,o=dt().os,F0([{keyCode:Bf.RIGHT,action:M0(R0,t,!0)},{keyCode:Bf.LEFT,action:M0(R0,t,!1)},{keyCode:Bf.UP,action:M0(D0,t,!1)},{keyCode:Bf.DOWN,action:M0(D0,t,!0)},{keyCode:Bf.RIGHT,action:M0(X0,t,!0)},{keyCode:Bf.LEFT,action:M0(X0,t,!1)},{keyCode:Bf.UP,action:M0(Y0,t,!1)},{keyCode:Bf.DOWN,action:M0(Y0,t,!0)},{keyCode:Bf.RIGHT,action:M0(U0,t,!0)},{keyCode:Bf.LEFT,action:M0(U0,t,!1)},{keyCode:Bf.UP,action:M0(z0,t,!1)},{keyCode:Bf.DOWN,action:M0(z0,t,!0)},{keyCode:Bf.RIGHT,action:M0(o0,t,n,!0)},{keyCode:Bf.LEFT,action:M0(o0,t,n,!1)},{keyCode:Bf.RIGHT,ctrlKey:!o.isOSX(),altKey:o.isOSX(),action:M0(zC,t,n)},{keyCode:Bf.LEFT,ctrlKey:!o.isOSX(),altKey:o.isOSX(),action:M0(HC,t,n)},{keyCode:Bf.UP,action:M0(I0,t,!1)},{keyCode:Bf.DOWN,action:M0(I0,t,!0)}],r).each(function(e){r.preventDefault()}))}),d=p,(f=e).on("keydown",function(e){var t,n,r;!1===e.isDefaultPrevented()&&(n=d,r=e,F0([{keyCode:Bf.BACKSPACE,action:M0(x0,t=f,!1)},{keyCode:Bf.BACKSPACE,action:M0(Pb,t,!1)},{keyCode:Bf.DELETE,action:M0(Pb,t,!0)},{keyCode:Bf.BACKSPACE,action:M0(Ab,t,!1)},{keyCode:Bf.DELETE,action:M0(Ab,t,!0)},{keyCode:Bf.BACKSPACE,action:M0(l0,t,n,!1)},{keyCode:Bf.DELETE,action:M0(l0,t,n,!0)},{keyCode:Bf.BACKSPACE,action:M0(hg,t,!1)},{keyCode:Bf.DELETE,action:M0(hg,t,!0)},{keyCode:Bf.BACKSPACE,action:M0(Lb,t,!1)},{keyCode:Bf.DELETE,action:M0(Lb,t,!0)},{keyCode:Bf.BACKSPACE,action:M0(p0,t,!1)},{keyCode:Bf.DELETE,action:M0(p0,t,!0)},{keyCode:Bf.BACKSPACE,action:M0(Cb,t,!1)},{keyCode:Bf.DELETE,action:M0(Cb,t,!0)},{keyCode:Bf.BACKSPACE,action:M0(vb,t,!1)},{keyCode:Bf.DELETE,action:M0(vb,t,!0)},{keyCode:Bf.BACKSPACE,action:M0(m0,t,!1)},{keyCode:Bf.DELETE,action:M0(m0,t,!0)}],r).each(function(e){r.preventDefault()}))}),f.on("keyup",function(e){var t,n;!1===e.isDefaultPrevented()&&(n=e,F0([{keyCode:Bf.BACKSPACE,action:M0(Bb,t=f)},{keyCode:Bf.DELETE,action:M0(Bb,t)}],n))}),(l=e).on("keydown",function(e){var t,n,r;e.keyCode===Bf.ENTER&&(t=l,(n=e).isDefaultPrevented()||(n.preventDefault(),(r=t.undoManager).typing&&(r.typing=!1,r.add()),t.undoManager.transact(function(){!1===t.selection.isCollapsed()&&t.execCommand("Delete"),_C(t,n)})))}),(c=e).on("keydown",function(e){var t;!1===e.isDefaultPrevented()&&(t=e,F0([{keyCode:Bf.SPACEBAR,action:M0(BC,c)}],t).each(function(e){t.preventDefault()}))}),n=t=e,r=lu(function(){n.composing||Im(n)},0),GC.isIE()&&(n.on("keypress",function(e){r.throttle()}),n.on("remove",function(e){r.cancel()})),t.on("input",function(e){!1===e.isComposing&&Im(t)}),s=p,(u=e).on("keydown",function(e){var t,n,r;!1===e.isDefaultPrevented()&&(n=s,r=e,F0([{keyCode:Bf.END,action:M0(T0,t=u,!0)},{keyCode:Bf.HOME,action:M0(T0,t,!1)},{keyCode:Bf.END,action:M0(H0,t,!0)},{keyCode:Bf.HOME,action:M0(H0,t,!1)},{keyCode:Bf.END,action:M0(u0,t,!0,n)},{keyCode:Bf.HOME,action:M0(u0,t,!1,n)}],r).each(function(e){r.preventDefault()}))}),o=e,i=p,JC.os.isOSX()||(a=ru(!1),o.on("keydown",function(e){RC(e)&&DC(a,o,!0)}),o.on("keyup",function(e){var t,n,r;!1===e.isDefaultPrevented()&&(r=e,F0([{keyCode:Bf.PAGE_UP,action:M0(u0,t=o,!1,n=i)},{keyCode:Bf.PAGE_DOWN,action:M0(u0,t,!0,n)}],r)),RC(e)&&a.get()&&(DC(a,o,!1),o.nodeChanged())})),p}(Ly=Py=Py||{})[Ly.Up=-1]="Up",Ly[Ly.Down=1]="Down";var LC=A(zy,Py.Up,Ru,Du),IC=A(zy,Py.Down,Du,Ru),MC=Yn,FC=Ks,UC=function(e,t){var n=e.selection.getRng(),r=e.getBody();if(t){var o=as.fromRangeEnd(n),i=My(r,o);return Z(i.positions)}return o=as.fromRangeStart(n),Q((i=Iy(r,o)).positions)},zC=A(i0,!0),HC=A(i0,!1),jC=function(e){return U(T(e.selection.getSelectedBlocks(),Nt.fromDom),function(e){return!y0(e)&&!Ot(e).exists(y0)&&pr(e,function(e){return Xn(e.dom)||Yn(e.dom)}).exists(function(e){return Xn(e.dom)})})},VC=Yn,qC=A(j0,function(e){return e.bottom},function(e,t){return e.y<t}),$C=A(j0,function(e){return e.top},function(e,t){return e.y>t}),WC=A(V0,Iy),KC=A(V0,My),XC=function(e,t){return n=as.after(t),!!Wn(n.getNode())||Ql(e,as.after(t)).map(function(e){return Wn(e.getNode())}).getOr(!1);var n},YC=or([{br:[]},{block:[]},{none:[]}]),GC=dt().browser,JC=dt(),QC=A(TC,yo),ZC=A(TC," "),e1=(t1.prototype.nodeChanged=function(e){var t,n,r,o=this.editor.selection;this.editor.initialized&&o&&!this.editor.getParam("disable_nodechange")&&!this.editor.mode.isReadOnly()&&(r=this.editor.getBody(),(t=o.getStart(!0)||r).ownerDocument===this.editor.getDoc()&&this.editor.dom.isChildOf(t,r)||(t=r),n=[],this.editor.dom.getParent(t,function(e){return e===r||void n.push(e)}),(e=e||{}).element=t,e.parents=n,this.editor.fire("NodeChange",e))},t1.prototype.isSameElementPath=function(e){var t,n=this.editor.$(e).parentsUntil(this.editor.getBody()).add(e);if(n.length===this.lastPath.length){for(t=n.length;0<=t&&n[t]===this.lastPath[t];t--);if(-1===t)return this.lastPath=n,!0}return this.lastPath=n,!1},t1);function t1(r){var o;this.lastPath=[],this.editor=r;var t=this;"onselectionchange"in r.getDoc()||r.on("NodeChange click mouseup keyup focus",function(e){var t=r.selection.getRng(),n={startContainer:t.startContainer,startOffset:t.startOffset,endContainer:t.endContainer,endOffset:t.endOffset};"nodechange"!==e.type&&Sf(n,o)||r.fire("SelectionChange"),o=n}),r.on("contextmenu",function(){r.fire("SelectionChange")}),r.on("SelectionChange",function(){var e=r.selection.getStart(!0);!e||!xt.range&&r.selection.isCollapsed()||Tl(r)&&!t.isSameElementPath(e)&&r.dom.isChildOf(e,r.getBody())&&r.nodeChanged({selectionChange:!0})}),r.on("mouseup",function(e){!e.isDefaultPrevented()&&Tl(r)&&("IMG"===r.selection.getNode().nodeName?_r.setEditorTimeout(r,function(){r.nodeChanged()}):r.nodeChanged())})}function n1(e){return zn(e)&&fo(Nt.fromDom(e))}function r1(e){var t=e.getBoundingClientRect(),n=e.ownerDocument,r=n.documentElement,o=n.defaultView;return{top:t.top+o.pageYOffset-r.clientTop,left:t.left+o.pageXOffset-r.clientLeft}}function o1(e){e&&e.parentNode&&e.parentNode.removeChild(e)}function i1(e,S){var E=_r.throttle(function(e,t){S._selectionOverrides.hideFakeCaret(),S.selection.placeCaretAt(e,t)},0);return S.on("remove",E.stop),function(w){return e.on(function(e){var t,n,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,b,y,C,x=Math.max(Math.abs(w.screenX-e.screenX),Math.abs(w.screenY-e.screenY));if(!e.dragging&&10<x){if(S.fire("dragstart",{target:e.element}).isDefaultPrevented())return;e.dragging=!0,S.focus()}e.dragging&&(d=e,t={pageX:(p=w,h=(g=S).inline?r1(g.getBody()):{left:0,top:0},C=(y=g).getBody(),v=y.inline?{left:C.scrollLeft,top:C.scrollTop}:{left:0,top:0},(m={pageX:(b=function(e,t){if(t.target.ownerDocument===e.getDoc())return{left:t.pageX,top:t.pageY};var n,r,o,i,a,u=r1(e.getContentAreaContainer()),s=(r=(n=e).getBody(),o=n.getDoc().documentElement,i={left:r.scrollLeft,top:r.scrollTop},a={left:r.scrollLeft||o.scrollLeft,top:r.scrollTop||o.scrollTop},n.inline?i:a);return{left:t.pageX-u.left+s.left,top:t.pageY-u.top+s.top}}(g,p)).left-h.left+v.left,pageY:b.top-h.top+v.top}).pageX-d.relX),pageY:m.pageY+5},l=e.ghost,f=S.getBody(),l.parentNode!==f&&f.appendChild(l),n=e.ghost,o=e.width,i=e.height,a=e.maxX,u=e.maxY,c=s=0,n.style.left=(r=t).pageX+"px",n.style.top=r.pageY+"px",u<r.pageY+i&&(c=r.pageY+i-u),n.style.width=o-(s=a<r.pageX+o?r.pageX+o-a:s)+"px",n.style.height=i-c+"px",E(w.clientX,w.clientY))})}}function a1(e){function t(e){var t,n,r,o,i,a;0===e.button&&(t=M(c.dom.getParents(e.target),function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return function(e){for(var t=0;t<n.length;t++)if(n[t](e))return!0;return!1}}(D1,T1)).getOr(null),i=c.getBody(),D1(a=t)&&a!==i&&(n=c.dom.getPos(t),r=c.getBody(),o=c.getDoc().documentElement,u.set({element:t,dragging:!1,screenX:e.screenX,screenY:e.screenY,maxX:(c.inline?r.scrollWidth:o.offsetWidth)-2,maxY:(c.inline?r.scrollHeight:o.offsetHeight)-2,relX:e.pageX-n.x,relY:e.pageY-n.y,width:t.offsetWidth,height:t.offsetHeight,ghost:function(e,t,n){var r=c.dom,o=e.cloneNode(!0);r.setStyles(o,{width:t,height:n}),r.setAttrib(o,"data-mce-selected",null);var i=r.create("div",{class:"mce-drag-container","data-mce-bogus":"all",unselectable:"on",contenteditable:"false"});return r.setStyles(i,{position:"absolute",opacity:.5,overflow:"hidden",border:0,padding:0,margin:0,width:t,height:n}),r.setStyles(o,{margin:0,boxSizing:"border-box"}),i.appendChild(o),i}(t,t.offsetWidth,t.offsetHeight)})))}function n(u){i.on(function(e){var t,n,r,o,i,a;e.dragging&&((o=3===(a=(r=s).selection.getSel().getRangeAt(0).startContainer).nodeType?a.parentNode:a)===(i=e.element)||r.dom.isChildOf(o,i)||D1(o)||((n=e.element.cloneNode(!0)).removeAttribute("data-mce-selected"),t=n,s.fire("drop",{clientX:u.clientX,clientY:u.clientY}).isDefaultPrevented()||s.undoManager.transact(function(){o1(e.element),s.insertContent(s.dom.getOuterHTML(t)),s._selectionOverrides.hideFakeCaret()})),s.fire("dragend"))}),O1(i)}var r,o,i,s,u,c,a=cu(),l=Ja.DOM,f=document,d=i1(u=a,c=e),m=(r=i=a,function(){r.on(function(e){e.dragging&&o.fire("dragend")}),O1(r)});(o=s=e).on("mousedown",t),e.on("mousemove",d),e.on("mouseup",n),l.bind(f,"mousemove",d),l.bind(f,"mouseup",m),e.on("remove",function(){l.unbind(f,"mousemove",d),l.unbind(f,"mouseup",m)}),e.on("keydown",function(e){e.keyCode===Bf.ESC&&m()})}function u1(e){var n,i;function a(e){var t;e.isDefaultPrevented()||(t=e.dataTransfer)&&(D(t.types,"Files")||0<t.files.length)&&(e.preventDefault(),"drop"===e.type&&Iv(i,"Dropped file type is not supported"))}function u(e){dd(i,e.target)&&a(e)}function t(){var t=Ja.DOM,n=i.dom,r=document,o=i.inline?i.getBody():i.getDoc(),e=["drop","dragover"];Y(e,function(e){t.bind(r,e,u),n.bind(o,e,a)}),i.on("remove",function(){Y(e,function(e){t.unbind(r,e,u),n.unbind(o,e,a)})})}a1(e),(n=e).on("drop",function(e){var t=void 0!==e.clientX?n.getDoc().elementFromPoint(e.clientX,e.clientY):null;!D1(t)&&"false"!==n.dom.getContentEditableParent(t)||e.preventDefault()}),e.getParam("block_unsupported_drop",!0,"boolean")&&(i=e).on("init",function(){_r.setEditorTimeout(i,t,0)})}function s1(e,t){return pf(e.getBody(),t)}function c1(l){function f(e){return e!==x&&(P1(e)||Jn(e))&&y.isChildOf(e,x)}function c(e){return ep(e)||tp(e)||Gg(e)||Jg(e)}function d(e){e&&b.setRng(e)}function m(e,t,n,r){return void 0===r&&(r=!0),l.fire("ShowCaret",{target:t,direction:e,before:n}).isDefaultPrevented()?null:(r&&b.scrollIntoView(t,-1===e),i.show(n,t))}function t(e){return Ir(e)||No(e)||ko(e)}function g(e){return t(e.startContainer)||t(e.endContainer)}function p(e,t){if(!e)return null;if(e.collapsed){if(!g(e)){var n=t?1:-1,r=tc(n,x,e),o=r.getNode(!t);if($s(o))return m(n,o,!!t&&!r.isAtEnd(),!1);var i=r.getNode(t);if($s(i))return m(n,i,!t&&!r.isAtEnd(),!1)}return null}var a=e.startContainer,u=e.startOffset,s=e.endOffset;if(3===a.nodeType&&0===u&&P1(a.parentNode)&&(a=a.parentNode,u=y.nodeIndex(a),a=a.parentNode),1!==a.nodeType)return null;if(s===u+1&&a===e.endContainer){var c=a.childNodes[u];if(f(c))return function(e){var t=e.cloneNode(!0),n=l.fire("ObjectSelected",{target:e,targetClone:t});if(n.isDefaultPrevented())return null;var r=function(e,t,n){var r=l.$,o=vr(Nt.fromDom(l.getBody()),"#"+w).fold(function(){return r([])},function(e){return r([e.dom])});0===o.length&&(o=r('<div data-mce-bogus="all" class="mce-offscreen-selection"></div>').attr("id",w)).appendTo(l.getBody());var i=y.createRng();t===n&&xt.ie?(o.empty().append('<p style="font-size: 0" data-mce-bogus="all">\xa0</p>').append(t),i.setStartAfter(o[0].firstChild.firstChild),i.setEndAfter(t)):(o.empty().append(yo).append(t).append(yo),i.setStart(o[0].firstChild,1),i.setEnd(o[0].lastChild,0)),o.css({top:y.getPos(e,l.getBody()).y}),o[0].focus();var a=b.getSel();return a.removeAllRanges(),a.addRange(i),i}(e,n.targetClone,t),o=Nt.fromDom(e);return Y(hu(Nt.fromDom(l.getBody()),"*[data-mce-selected]"),function(e){je(o,e)||yn(e,S)}),y.getAttrib(e,S)||e.setAttribute(S,"1"),v=e,E(),r}(c)}return null}function h(){v&&v.removeAttribute(S),vr(Nt.fromDom(l.getBody()),"#"+w).each(Ln),v=null}var v,n,e,o,b=l.selection,y=l.dom,C=y.isBlock,x=l.getBody(),i=Vs(l,x,C,function(){return vd(l)}),w="sel-"+y.uniqueId(),S="data-mce-selected",r=b.getRng,E=function(){i.hide()};return xt.ceFalse&&!mh(l)&&(l.on("mouseup",function(e){var t=r();t.collapsed&&av(l,e.clientX,e.clientY)&&Sb(l,t,!1).each(d)}),l.on("click",function(e){var t=s1(l,e.target);t&&(P1(t)&&(e.preventDefault(),l.focus()),B1(t)&&y.isChildOf(t,b.getNode())&&h())}),l.on("blur NewBlock",h),l.on("ResizeWindow FullscreenStateChanged",i.reposition),l.on("tap",function(e){var t=e.target,n=s1(l,t);P1(n)?(e.preventDefault(),wb(l,n).each(p)):f(t)&&wb(l,t).each(p)},!0),l.on("mousedown",function(e){var t,n,r,o,i,a,u,s=e.target;s!==x&&"HTML"!==s.nodeName&&!y.isChildOf(s,x)||!1===av(l,e.clientX,e.clientY)||((t=s1(l,s))?P1(t)?(e.preventDefault(),wb(l,t).each(p)):(h(),B1(t)&&e.shiftKey||hf(e.clientX,e.clientY,b.getRng())||(E(),b.placeCaretAt(e.clientX,e.clientY))):f(s)?wb(l,s).each(p):!1===$s(s)&&(h(),E(),(n=Yy(x,e.clientX,e.clientY))&&(r=s,o=n.node,a=y.getParent(r,C),u=y.getParent(o,C),!K(a)&&(r!==u&&y.isChildOf(a,u)&&!1===P1(s1(l,a))||!y.isChildOf(u,a)&&(i=u,y.getParent(a,C)!==y.getParent(i,C))&&function(e){var t=e.firstChild;if(!K(t)){var n=as.before(t);if(Wn(n.getNode())&&1===e.childNodes.length)return!c(n);var r=Pc(e).next(n);return r&&!c(r)}}(a))||(e.preventDefault(),d(m(1,n.node,n.before,!1)),l.getBody().focus()))))}),l.on("keypress",function(e){Bf.modifierPressed(e)||P1(b.getNode())&&e.preventDefault()}),l.on("GetSelectionRange",function(e){var t=e.range;v&&(v.parentNode?((t=t.cloneRange()).selectNode(v),e.range=t):v=null)}),l.on("SetSelectionRange",function(e){var t,n,r,o,i,a,u;e.range=(t=e.range,n=l.schema.getShortEndedElements(),r=y.createRng(),o=t.startContainer,i=t.startOffset,a=t.endContainer,u=t.endOffset,Ne(n,o.nodeName.toLowerCase())?0===i?r.setStartBefore(o):r.setStartAfter(o):r.setStart(o,i),Ne(n,a.nodeName.toLowerCase())?0===u?r.setEndBefore(a):r.setEndAfter(a):r.setEnd(a,u),r);var s=p(e.range,e.forward);s&&(e.range=s)}),l.on("AfterSetSelectionRange",function(e){var t=e.range,n=t.startContainer.parentNode;g(t)||"mcepastebin"===n.id||E(),y.hasClass(n,"mce-offscreen-selection")||h()}),l.on("copy",function(e){var t,n,r=e.clipboardData;e.isDefaultPrevented()||!e.clipboardData||xt.ie||(t=(n=y.get(w))&&n.getElementsByTagName("*")[0])&&(e.preventDefault(),r.clearData(),r.setData("text/html",t.outerHTML),r.setData("text/plain",t.outerText||t.innerText))}),u1(l),e=lu(function(){var e,t;n.removed||!n.getBody().contains(document.activeElement)||(e=n.selection.getRng()).collapsed&&(t=Eb(n,e,!1),n.selection.setRng(t))},0),(n=l).on("focus",function(){e.throttle()}),n.on("blur",function(){e.cancel()}),(o=l).on("init",function(){o.on("focusin",function(e){var t,n,r=e.target;Jn(r)&&(t=pf(o.getBody(),r),n=Yn(t)?t:r,o.selection.getNode()!==n&&wb(o,n).each(function(e){return o.selection.setRng(e)}))})})),{showCaret:m,showBlockCaretContainer:function(e){e.hasAttribute("data-mce-caret")&&(zr(e),d(r()),b.scrollIntoView(e))},hideFakeCaret:E,destroy:function(){i.destroy(),v=null}}}function l1(a){function e(e,t){try{a.getDoc().execCommand(e,!1,t)}catch(e){}}function u(e){return e.isDefaultPrevented()}function t(){a.shortcuts.add("meta+a",null,"SelectAll")}function n(){a.inline||b.bind(a.getDoc(),"mousedown mouseup",function(e){var t;e.target===a.getDoc().documentElement&&(t=y.getRng(),a.getBody().focus(),"mousedown"===e.type?Ir(t.startContainer)||y.placeCaretAt(e.clientX,e.clientY):y.setRng(t))})}function r(){Range.prototype.getClientRects||a.on("mousedown",function(e){var t;u(e)||"HTML"!==e.target.nodeName||((t=a.getBody()).blur(),_r.setEditorTimeout(a,function(){t.focus()}))})}function o(){a.on("click",function(e){var t=e.target;/^(IMG|HR)$/.test(t.nodeName)&&"false"!==b.getContentEditableParent(t)&&(e.preventDefault(),a.selection.select(t),a.nodeChanged()),"A"===t.nodeName&&b.hasClass(t,"mce-item-anchor")&&(e.preventDefault(),y.select(t))})}function i(){a.on("keydown",function(e){if(!u(e)&&e.keyCode===h&&y.isCollapsed()&&0===y.getRng().startOffset){var t=y.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})}function s(){a.getParam("readonly")||a.on("BeforeExecCommand mousedown",function(){e("StyleWithCSS",!1),e("enableInlineTableEditing",!1),Ts(a)||e("enableObjectResizing",!1)})}function c(){a.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")}function l(){a.inline||a.on("keydown",function(){document.activeElement===document.body&&a.getWin().focus()})}function f(){a.inline||(a.contentStyles.push("body {min-height: 150px}"),a.on("click",function(e){var t;"HTML"===e.target.nodeName&&(11<xt.ie?a.getBody().focus():(t=a.selection.getRng(),a.getBody().focus(),a.selection.setRng(t),a.selection.normalize(),a.nodeChanged()))}))}function d(){xt.mac&&a.on("keydown",function(e){!Bf.metaKeyPressed(e)||e.shiftKey||37!==e.keyCode&&39!==e.keyCode||(e.preventDefault(),a.selection.getSel().modify("move",37===e.keyCode?"backward":"forward","lineboundary"))})}function m(){a.on("click",function(e){var t=e.target;do{if("A"===t.tagName)return void e.preventDefault()}while(t=t.parentNode)}),a.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")}function g(){a.on("init",function(){a.dom.bind(a.getBody(),"submit",function(e){e.preventDefault()})})}var p=Et.each,h=Bf.BACKSPACE,v=Bf.DELETE,b=a.dom,y=a.selection,C=a.parser,x=xt.gecko,w=xt.ie,S=xt.webkit,E="data:text/mce-internal,",N=w?"Text":"URL",k=te;return mh(a)?(S&&(n(),o(),g(),t(),xt.iOS&&(l(),f(),m())),x&&(r(),s(),c(),d())):(a.on("keydown",function(e){if(!u(e)&&e.keyCode===Bf.BACKSPACE){var t,n=(t=y.getRng()).startContainer,r=t.startOffset,o=b.getRoot(),i=n;if(t.collapsed&&0===r){for(;i&&i.parentNode&&i.parentNode.firstChild===i&&i.parentNode!==o;)i=i.parentNode;"BLOCKQUOTE"===i.tagName&&(a.formatter.toggle("blockquote",null,i),(t=b.createRng()).setStart(n,0),t.setEnd(n,0),y.setRng(t))}}}),a.on("keydown",function(e){var t,n,r,o,i=e.keyCode;u(e)||i!==v&&i!==h||(t=a.selection.isCollapsed(),n=a.getBody(),t&&!b.isEmpty(n)||!t&&(r=R(a.selection.getRng()),(o=b.createRng()).selectNode(a.getBody()),r!==R(o))||(e.preventDefault(),a.setContent(""),n.firstChild&&b.isBlock(n.firstChild)?a.selection.setCursorLocation(n.firstChild,0):a.selection.setCursorLocation(n,0),a.nodeChanged()))}),xt.windowsPhone||a.on("keyup focusin mouseup",function(e){Bf.modifierPressed(e)||y.normalize()},!0),S&&(n(),o(),Ss(a)&&a.on("init",function(){e("DefaultParagraphSeparator",Ss(a))}),g(),i(),C.addNodeFilter("br",function(e){for(var t=e.length;t--;)"Apple-interchange-newline"===e[t].attr("class")&&e[t].remove()}),xt.iOS?(l(),f(),m()):t()),11<=xt.ie&&(f(),i()),xt.ie&&(t(),e("AutoUrlDetect",!1),a.on("dragstart",function(e){var t,n,r;(t=e).dataTransfer&&(a.selection.isCollapsed()&&"IMG"===t.target.tagName&&y.select(t.target),0<(n=a.selection.getContent()).length&&(r=E+escape(a.id)+","+escape(n),t.dataTransfer.setData(N,r)))}),a.on("drop",function(e){var t,n,r,o;u(e)||(t=e.dataTransfer&&(o=e.dataTransfer.getData(N))&&0<=o.indexOf(E)?(o=o.substr(E.length).split(","),{id:unescape(o[0]),html:unescape(o[1])}):null)&&t.id!==a.id&&(e.preventDefault(),n=wf(e.x,e.y,a.getDoc()),y.setRng(n),r=t.html,a.queryCommandSupported("mceInsertClipboardContent")?a.execCommand("mceInsertClipboardContent",!1,{content:r,internal:!0}):a.execCommand("mceInsertContent",!1,r))})),x&&(a.on("keydown",function(e){if(!u(e)&&e.keyCode===h&&a.getBody().getElementsByTagName("hr").length&&y.isCollapsed()&&0===y.getRng().startOffset){var t=y.getNode(),n=t.previousSibling;if("HR"===t.nodeName)return b.remove(t),void e.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(b.remove(n),e.preventDefault())}}),r(),a.on("keypress",function(e){var t;if(!u(e)&&(8===e.keyCode||46===e.keyCode)&&A())return t=_(),a.getDoc().execCommand("delete",!1,null),t(),e.preventDefault(),!1}),b.bind(a.getDoc(),"cut",function(e){var t;!u(e)&&A()&&(t=_(),_r.setEditorTimeout(a,function(){t()}))}),s(),a.on("SetContent ExecCommand",function(e){"setcontent"!==e.type&&"mceInsertLink"!==e.command||p(b.select("a"),function(e){var t=e.parentNode,n=b.getRoot();if(t.lastChild===e){for(;t&&!b.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}b.add(t,"br",{"data-mce-bogus":1})}})}),c(),d(),i())),{refreshContentEditable:k,isHidden:function(){if(!x||a.removed)return!1;var e=a.selection.getSel();return!e||!e.rangeCount||0===e.rangeCount}};function _(){var e=b.getAttribs(y.getStart().cloneNode(!1));return function(){var t=y.getStart();t!==a.getBody()&&(b.setAttrib(t,"style",null),p(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}}function A(){return!y.isCollapsed()&&b.getParent(y.getStart(),b.isBlock)!==b.getParent(y.getEnd(),b.isBlock)}function R(e){var t=b.create("body"),n=e.cloneContents();return t.appendChild(n),y.serializer.serialize(t,{format:"html"})}}function f1(e){return ae(e,function(e){return!1===b(e)})}function d1(e){var t=e.settings,n=e.editorUpload.blobCache;return f1({allow_conditional_comments:t.allow_conditional_comments,allow_html_data_urls:t.allow_html_data_urls,allow_svg_data_urls:t.allow_svg_data_urls,allow_html_in_named_anchor:t.allow_html_in_named_anchor,allow_script_urls:t.allow_script_urls,allow_unsafe_link_target:t.allow_unsafe_link_target,convert_fonts_to_spans:t.convert_fonts_to_spans,fix_list_elements:t.fix_list_elements,font_size_legacy_values:t.font_size_legacy_values,forced_root_block:t.forced_root_block,forced_root_block_attrs:t.forced_root_block_attrs,padd_empty_with_br:t.padd_empty_with_br,preserve_cdata:t.preserve_cdata,remove_trailing_brs:t.remove_trailing_brs,inline_styles:t.inline_styles,root_name:e.inline?e.getElement().nodeName.toLowerCase():void 0,validate:!0,blob_cache:n,document:e.getDoc(),images_dataimg_filter:t.images_dataimg_filter})}function m1(e){var t,u,n;e.bindPendingEventDelegates(),e.initialized=!0,e.fire("Init"),e.focus(!0),n=(u=e).dom.getRoot(),u.inline||Tl(u)&&u.selection.getStart(!0)!==n||ef(n).each(function(e){var t,n,r,o,i=e.getNode(),a=cn(i)?ef(i).getOr(e):e;xt.browser.isIE()?(t=u,n=a.toRange(),r=Nt.fromDom(t.getBody()),o=(ad(t)?ve.from(n):ve.none()).map(ud).filter(id(r)),t.bookmark=o.isSome()?o:t.bookmark):u.selection.setRng(a.toRange())}),e.nodeChanged({initial:!0}),e.execCallback("init_instance_callback",e),(t=e).settings.auto_focus&&_r.setEditorTimeout(t,function(){var e=!0===t.settings.auto_focus?t:t.editorManager.get(t.settings.auto_focus);e.destroyed||e.focus()},100)}function g1(e){return(e.inline?e.ui:e.dom).styleSheetLoader}function p1(e){function t(){o.unloadAll(a),e.inline||e.ui.styleSheetLoader.unloadAll(i)}function n(){e.removed?t():e.on("remove",t)}var r,o=g1(e),i=Ds(e),a=e.contentCSS;0<e.contentStyles.length&&(r="",Et.each(e.contentStyles,function(e){r+=e+"\r\n"}),e.dom.addStyle(r));var u,s,c,l,f,d,m,g,p,h=kr.all((u=e,s=a,c=i,l=[new kr(function(e,t){return g1(u).loadAll(s,e,t)})],u.inline?l:l.concat([new kr(function(e,t){return u.ui.styleSheetLoader.loadAll(c,e,t)})]))).then(n).catch(n);return e.settings.content_style&&(d=(f=e).settings.content_style,m=Nt.fromDom(f.getBody()),g=jt(Bn(m)),pn(p=Nt.fromTag("style"),"type","text/css"),Pn(p,Nt.fromText(d)),Pn(g,p),f.on("remove",function(){Ln(p)})),h}function h1(e){var t;!0!==e.removed&&(mh(t=e)||t.load({initial:!0,format:"html"}),t.startContent=t.getContent({format:"raw"}),m1(e))}function v1(t,e){var n=t.settings,r=t.getElement(),o=t.getDoc();n.inline||(t.getElement().style.visibility=t.orgVisibility),e||t.inline||(o.open(),o.write(t.iframeHTML),o.close()),t.inline&&(L1.addClass(r,"mce-content-body"),t.contentDocument=o=document,t.contentWindow=window,t.bodyElement=r,t.contentAreaContainer=r);var u,i,a,s,c,l,f,d,m,g,p,h=t.getBody();h.disabled=!0,t.readonly=!!n.readonly,t.readonly||(t.inline&&"static"===L1.getStyle(h,"position",!0)&&(h.style.position="relative"),h.contentEditable=t.getParam("content_editable_state",!0)),h.disabled=!1,t.editorUpload=Kv(t),t.schema=to(n),t.dom=Ja(o,{keep_values:!0,url_converter:t.convertURL,url_converter_scope:t,hex_colors:n.force_hex_style_colors,update_styles:!0,root_element:t.inline?t.getBody():null,collect:function(){return t.inline},schema:t.schema,contentCssCors:t.getParam("content_css_cors",!1,"boolean"),referrerPolicy:_s(t),onSetAttrib:function(e){t.fire("SetAttrib",e)}}),t.parser=((i=$h(d1(u=t),u.schema)).addAttributeFilter("src,href,style,tabindex",function(e,t){for(var n,r,o=e.length,i=u.dom,a="data-mce-"+t;o--;)(r=(n=e[o]).attr(t))&&!n.attr(a)&&0!==r.indexOf("data:")&&0!==r.indexOf("blob:")&&("style"===t?((r=i.serializeStyle(i.parseStyle(r),n.name)).length||(r=null),n.attr(a,r),n.attr(t,r)):"tabindex"===t?(n.attr(a,r),n.attr(t,null)):n.attr(a,u.convertURL(r,t,n.name)))}),i.addNodeFilter("script",function(e){for(var t=e.length;t--;){var n=e[t],r=n.attr("type")||"no/type";0!==r.indexOf("mce-")&&n.attr("type","mce-"+r)}}),u.settings.preserve_cdata&&i.addNodeFilter("#cdata",function(e){for(var t=e.length;t--;){var n=e[t];n.type=8,n.name="#comment",n.value="[CDATA["+u.dom.encode(n.value)+"]]"}}),i.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var t=e.length,n=u.schema.getNonEmptyElements();t--;){var r=e[t];r.isEmpty(n)&&0===r.getAll("br").length&&(r.append(new Ud("br",1)).shortEnded=!0)}}),i),t.serializer=Xh((a=t.settings,_e(_e({},d1(t)),f1({url_converter:a.url_converter,url_converter_scope:a.url_converter_scope,element_format:a.element_format,entities:a.entities,entity_encoding:a.entity_encoding,indent:a.indent,indent_after:a.indent_after,indent_before:a.indent_before,block_elements:a.block_elements,boolean_attributes:a.boolean_attributes,custom_elements:a.custom_elements,extended_valid_elements:a.extended_valid_elements,invalid_elements:a.invalid_elements,invalid_styles:a.invalid_styles,move_caret_before_on_enter_elements:a.move_caret_before_on_enter_elements,non_empty_elements:a.non_empty_elements,schema:a.schema,self_closing_elements:a.self_closing_elements,short_ended_elements:a.short_ended_elements,special:a.special,text_block_elements:a.text_block_elements,text_inline_elements:a.text_inline_elements,valid_children:a.valid_children,valid_classes:a.valid_classes,valid_elements:a.valid_elements,valid_styles:a.valid_styles,verify_html:a.verify_html,whitespace_elements:a.whitespace_elements}))),t),t.selection=Lh(t.dom,t.getWin(),t.serializer,t),t.annotator=Ml(t),t.formatter=Jv(t),t.undoManager=Zv(t),t._nodeChangeDispatcher=new e1(t),t._selectionOverrides=c1(t),d=t,m=cu(),g=ru(!1),p=fu(function(e){d.fire("longpress",_e(_e({},e),{type:"longpress"})),g.set(!0)},400),d.on("touchstart",function(n){S0(n).each(function(e){p.cancel();var t={x:e.clientX,y:e.clientY,target:n.target};p.throttle(n),g.set(!1),m.set(t)})},!0),d.on("touchmove",function(e){p.cancel(),S0(e).each(function(i){m.on(function(e){var t=i,n=e,r=Math.abs(t.clientX-n.x),o=Math.abs(t.clientY-n.y);(5<r||5<o)&&(m.clear(),g.set(!1),d.fire("longpresscancel"))})})},!0),d.on("touchend touchcancel",function(t){p.cancel(),"touchcancel"!==t.type&&m.get().filter(function(e){return e.target.isEqualNode(t.target)}).each(function(){g.get()?t.preventDefault():d.fire("tap",_e(_e({},t),{type:"tap"}))})},!0),(l=c=t).on("click",function(e){l.dom.getParent(e.target,"details")&&e.preventDefault()}),(f=c).parser.addNodeFilter("details",function(e){Y(e,function(e){e.attr("data-mce-open",e.attr("open")),e.attr("open","open")})}),f.serializer.addNodeFilter("details",function(e){Y(e,function(e){var t=e.attr("data-mce-open");e.attr("open",X(t)?t:null),e.attr("data-mce-open",null)})}),mh(t)||(s=t).on("click",function(e){var t,n,r,o,i;3<=e.detail&&(r=(t=s).selection.getRng(),o=as.fromRangeStart(r),i=as.fromRangeEnd(r),!as.isElementPosition(o)||n1(n=o.container())&&ef(n).each(function(e){return r.setStart(e.container(),e.offset())}),!as.isElementPosition(i)||n1(n=o.container())&&tf(n).each(function(e){return r.setEnd(e.container(),e.offset())}),t.selection.setRng(vg(r)))});var v,b,y,C,x,w,S,E,N,k=mh(v=t)?ru(null):PC(v);N=k,(E=t).addCommand("delete",function(){var e,t=N;x0(e=E)||Pb(e,!1)||Ab(e,!1)||l0(e,t,!1)||vb(e,!1)||hg(e)||Lb(e,!1)||p0(e,!1)||Cb(e)||m0(e,!1)||(w0(e,"Delete"),ub(e))}),E.addCommand("forwardDelete",function(){var e,t=N;Pb(e=E,!0)||Ab(e,!0)||l0(e,t,!0)||vb(e,!0)||hg(e)||Lb(e,!0)||p0(e,!0)||Cb(e)||m0(e,!0)||w0(e,"ForwardDelete")}),Ss(b=t)&&b.on("NodeChange",A(N0,b)),C=(y=t).dom,x=Ss(y),w=y.getParam("placeholder",gc.getAttrib(y.getElement(),"placeholder"),"string"),S=function(e,t){var n,r,o;!function(e){if(eb(e)){var t=e.keyCode;return!tb(e)&&(Bf.metaKeyPressed(e)||e.altKey||112<=t&&t<=123||D(my,t))}}(e)&&(n=y.getBody(),r=!(eb(o=e)&&!(tb(o)||"keyup"===o.type&&229===o.keyCode))&&function(e,t,n){if(Wr(Nt.fromDom(t),!1)){var r=""===n,o=t.firstElementChild;return!o||!e.getStyle(t.firstElementChild,"padding-left")&&!e.getStyle(t.firstElementChild,"padding-right")&&(r?!e.isBlock(o):n===o.nodeName.toLowerCase())}return!1}(C,n,x),""!==C.getAttrib(n,gy)===r&&!t||(C.setAttrib(n,gy,r?w:null),C.setAttrib(n,"aria-placeholder",r?w:null),y.fire("PlaceholderToggle",{state:r}),y.on(r?"keydown":"keyup",S),y.off(r?"keyup":"keydown",S)))},w&&y.on("init",function(e){S(e,!0),y.on("change SetContent ExecCommand",S),y.on("paste",function(e){return _r.setEditorTimeout(y,function(){return S(e)})})});var _=gh(t);(function(t){var e=t.settings,n=t.getDoc(),r=t.getBody();t.fire("PreInit"),e.browser_spellcheck||e.gecko_spellcheck||(n.body.spellcheck=!1,L1.setAttrib(r,"spellcheck","false")),t.quirks=l1(t),t.fire("PostRender");var o=t.getParam("directionality",uu.isRtl()?"rtl":void 0);void 0!==o&&(r.dir=o),e.protect&&t.on("BeforeSetContent",function(t){Et.each(e.protect,function(e){t.content=t.content.replace(e,function(e){return"\x3c!--mce:protected "+escape(e)+"--\x3e"})})}),t.on("SetContent",function(){t.addVisual(t.getBody())}),t.on("compositionstart compositionend",function(e){t.composing="compositionstart"===e.type})})(t),_.fold(function(){p1(t).then(function(){return h1(t)})},function(e){t.setProgressState(!0),p1(t).then(function(){e().then(function(e){t.setProgressState(!1),h1(t)},function(e){t.notificationManager.open({type:"error",text:String(e)}),h1(t)})})})}function b1(e,t){var n,r,o,i,a=e.translate(e.getParam("iframe_aria_text","Rich Text Area. Press ALT-0 for help.","string")),u=(n=e.id,r=a,t.height,o=e.getParam("iframe_attrs",{}),hn(i=Nt.fromTag("iframe"),o),hn(i,{id:n+"_ifr",frameBorder:"0",allowTransparency:"true",title:r}),gu(i,"tox-edit-area__iframe"),i.dom);u.onload=function(){u.onload=null,e.fire("load")};var s=function(e,t){if(document.domain!==window.location.hostname&&xt.browser.isIE()){var n=jv("mce");e[n]=function(){v1(e)};var r='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinymce.get("'+e.id+'");document.write(ed.iframeHTML);document.close();ed.'+n+"(true);})()";return I1.setAttrib(t,"src",r),!0}return!1}(e,u);return e.contentAreaContainer=t.iframeContainer,e.iframeElement=u,e.iframeHTML=function(e){var t=e.getParam("doctype","<!DOCTYPE html>")+"<html><head>";e.getParam("document_base_url","")!==e.documentBaseUrl&&(t+='<base href="'+e.documentBaseURI.getURI()+'" />'),t+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';var n=xs(e,"body_id","tinymce"),r=xs(e,"body_class","");return ws(e)&&(t+='<meta http-equiv="Content-Security-Policy" content="'+ws(e)+'" />'),t+('</head><body id="'+n+'" class="mce-content-body '+r+'" data-id="'+e.id)+'"><br></body></html>'}(e),I1.add(t.iframeContainer,u),s}function y1(e){return e.replace(/^\-/,"")}function C1(e){return{editorContainer:e,iframeContainer:e,api:{}}}function x1(e){var t,n,r,o,i,a,u,s=e.getElement();return e.orgDisplay=s.style.display,X(Bs(e))?e.theme.renderUI():y(Bs(e))?(n=(t=e).getElement(),(r=Bs(t)(t,n)).editorContainer.nodeType&&(r.editorContainer.id=r.editorContainer.id||t.id+"_parent"),r.iframeContainer&&r.iframeContainer.nodeType&&(r.iframeContainer.id=r.iframeContainer.id||t.id+"_iframecontainer"),r.height=r.iframeHeight||n.offsetHeight,r):(u=(o=e).getElement(),o.inline?C1(null):(i=u,a=M1.create("div"),M1.insertAfter(a,i),C1(a)))}function w1(e){var n,t,r,o,i,a,u,s;e.fire("ScriptsLoaded"),n=e,t=Et.trim(ks(n)),r=n.ui.registry.getAll().icons,ne(_e(_e({},_v.get("default").icons),_v.get(t).icons),function(e,t){Ne(r,t)||n.ui.registry.addIcon(t,e)}),a=Bs(o=e),X(a)?(o.settings.theme=y1(a),i=Bv.get(a),o.theme=new i(o,Bv.urls[a]),o.theme.init&&o.theme.init(o,Bv.urls[a]||o.documentBaseUrl.replace(/\/$/,""),o.$)):o.theme={},s=[],Et.each(Ls(u=e).split(/[ ,]/),function(e){F1(u,s,y1(e))});var c=x1(e),l=e,f=ve.from(c.api).getOr({}),d={show:ve.from(f.show).getOr(te),hide:ve.from(f.hide).getOr(te),disable:ve.from(f.disable).getOr(te),isDisabled:ve.from(f.isDisabled).getOr(R),enable:function(){l.mode.isReadOnly()||ve.from(f.enable).map(x)}};l.ui=_e(_e({},l.ui),d);var m,g,p,h={editorContainer:c.editorContainer,iframeContainer:c.iframeContainer};return e.editorContainer=h.editorContainer||null,zv(e),e.inline?v1(e):(p=b1(m=e,g=h),g.editorContainer&&(I1.get(g.editorContainer).style.display=m.orgDisplay,m.hidden=I1.isHidden(g.editorContainer)),m.getElement().style.display="none",I1.setAttrib(m.id,"aria-hidden","true"),void(p||v1(m)))}function S1(e){return"-"===e.charAt(0)}function E1(t,e,n){return ve.from(e).filter(function(e){return 0<e.length&&!_v.has(e)}).map(function(e){return{url:t.editorManager.baseURL+"/icons/"+e+"/icons"+n+".js",name:ve.some(e)}})}function N1(c,l){var e,t,f=tu.ScriptLoader,n=f,r=l,o=function(){var r,o,t,n,e,i,a,u,s;e=f,u=As(i=c),s=i.getParam("language_url","","string"),!1===uu.hasCode(u)&&"en"!==u&&(a=""!==s?s:i.editorManager.baseURL+"/langs/"+u+".js",e.add(a,te,void 0,function(){Mv(i,"LanguageLoadError",Fv("language",a,u))})),t=f,Y(function(e){for(var t=[],n=function(e){t.push(e)},r=0;r<e.length;r++)e[r].each(n);return t}([E1(n=c,"default",l),ve.from(n.getParam("icons_url","","string")).filter(function(e){return 0<e.length}).map(function(e){return{url:e,name:ve.none()}}).orThunk(function(){return E1(n,ks(n),"")})]),function(e){t.add(e.url,te,void 0,function(){Mv(n,"IconsLoadError",Fv("icons",e.url,e.name.getOrUndefined()))})}),r=c,o=l,Et.each(r.getParam("external_plugins"),function(e,t){Ov.load(t,e,te,void 0,function(){Uv(r,e,t)}),r.settings.plugins+=" "+t}),Et.each(Ls(r).split(/[ ,]/),function(e){var t,n;(e=Et.trim(e))&&!Ov.urls[e]&&(S1(e)?(e=e.substr(1,e.length),t=Ov.dependencies(e),Et.each(t,function(e){var t=Ov.createUrl({prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"},e);Ov.load(t.resource,t,te,void 0,function(){Uv(r,t.prefix+t.resource+t.suffix,t.resource)})})):(n={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"},Ov.load(e,n,te,void 0,function(){Uv(r,n.prefix+n.resource+n.suffix,e)})))}),f.loadQueue(function(){c.removed||w1(c)},c,function(){c.removed||w1(c)})},i=Bs(e=c);X(i)?(S1(i)||Ne(Bv.urls,i)||((t=e.getParam("theme_url"))?Bv.load(i,e.documentBaseURI.toAbsolute(t)):Bv.load(i,"themes/"+i+"/theme"+r+".js")),n.loadQueue(function(){Bv.waitFor(i,o)})):o()}function k1(a){return function(i,e){return ve.from(e).map(Nt.fromDom).filter(kn).bind(function(e){return n=a,t=i,r=e.dom,Ag(Nt.fromDom(r),function(e){return wn(t=e,n).orThunk(function(){return"font"===kt(t)?ue(z1,n).bind(function(e){return bn(t,e)}):ve.none()});var t},function(e){return je(Nt.fromDom(t),e)}).or((o=e.dom,ve.from(Ja.DOM.getStyle(o,a,!0))));var n,t,r,o}).getOr("")}}function _1(e){return ef(e.getBody()).map(function(e){var t=e.container();return jn(t)?t.parentNode:t})}function A1(e,t){return n=e,r=a(ve.some,t),o=n,ve.from(o.selection.getRng()).bind(function(e){var t=o.getBody();return e.startContainer===t&&0===e.startOffset?ve.none():ve.from(o.selection.getStart(!0))}).orThunk(A(_1,n)).map(Nt.fromDom).filter(kn).bind(r);var n,r,o}function R1(e,t){if(/^[0-9.]+$/.test(t)){var n=parseInt(t,10);if(1<=n&&n<=7){var r=Et.explode(e.getParam("font_size_style_values","xx-small,x-small,small,medium,large,x-large,xx-large")),o=Et.explode(e.getParam("font_size_classes",""));return o?o[n-1]||t:r[n-1]||t}return t}return t}var D1=Yn,T1=Xn,O1=function(e){e.on(function(e){o1(e.ghost)}),e.clear()},B1=Xn,P1=Yn,L1=Ja.DOM,I1=Ja.DOM,M1=Ja.DOM,F1=function(t,n,r){var o,i,a,u,e=Ov.get(r),s=Ov.urls[r]||t.documentBaseUrl.replace(/\/$/,"");if(r=Et.trim(r),e&&-1===Et.inArray(n,r)&&(Et.each(Ov.dependencies(r),function(e){F1(t,n,e)}),!t.plugins[r]))try{var c=new e(t,s,t.$);(t.plugins[r]=c).init&&(c.init(t,s),n.push(r))}catch(e){i=r,a=e,vf(o=t,"PluginLoadError",{message:u=uu.translate(["Failed to initialize plugin: {0}",i])}),ay(u,a),Iv(o,u)}},U1=Ja.DOM,z1={"font-size":"size","font-family":"face"},H1=k1("font-size"),j1=i(function(e){return e.replace(/[\'\"\\]/g,"").replace(/,\s+/g,",")},k1("font-family")),V1=Et.each,q1=Et.map,$1=Et.inArray,W1=(K1.prototype.execCommand=function(t,n,r,e){var o,i,a=!1,u=this;if(!u.editor.removed){if("mcefocus"!==t.toLowerCase()&&(/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(t)||e&&e.skip_focus?ld(i=u.editor).each(function(e){return i.selection.setRng(e)}):u.editor.focus()),(e=u.editor.fire("BeforeExecCommand",{command:t,ui:n,value:r})).isDefaultPrevented())return!1;var s=t.toLowerCase();if(o=u.commands.exec[s])return o(s,n,r),u.editor.fire("ExecCommand",{command:t,ui:n,value:r}),!0;if(V1(this.editor.plugins,function(e){if(e.execCommand&&e.execCommand(t,n,r))return u.editor.fire("ExecCommand",{command:t,ui:n,value:r}),!(a=!0)}),a)return a;if(u.editor.theme&&u.editor.theme.execCommand&&u.editor.theme.execCommand(t,n,r))return u.editor.fire("ExecCommand",{command:t,ui:n,value:r}),!0;try{a=u.editor.getDoc().execCommand(t,n,r)}catch(e){}return!!a&&(u.editor.fire("ExecCommand",{command:t,ui:n,value:r}),!0)}},K1.prototype.queryCommandState=function(e){var t;if(!this.editor.quirks.isHidden()&&!this.editor.removed){if(e=e.toLowerCase(),t=this.commands.state[e])return t(e);try{return this.editor.getDoc().queryCommandState(e)}catch(e){}return!1}},K1.prototype.queryCommandValue=function(e){var t;if(!this.editor.quirks.isHidden()&&!this.editor.removed){if(e=e.toLowerCase(),t=this.commands.value[e])return t(e);try{return this.editor.getDoc().queryCommandValue(e)}catch(e){}}},K1.prototype.addCommands=function(e,n){void 0===n&&(n="exec");var r=this;V1(e,function(t,e){V1(e.toLowerCase().split(","),function(e){r.commands[n][e]=t})})},K1.prototype.addCommand=function(e,o,i){var a=this;e=e.toLowerCase(),this.commands.exec[e]=function(e,t,n,r){return o.call(i||a.editor,t,n,r)}},K1.prototype.queryCommandSupported=function(e){if(e=e.toLowerCase(),this.commands.exec[e])return!0;try{return this.editor.getDoc().queryCommandSupported(e)}catch(e){}return!1},K1.prototype.addQueryStateHandler=function(e,t,n){var r=this;e=e.toLowerCase(),this.commands.state[e]=function(){return t.call(n||r.editor)}},K1.prototype.addQueryValueHandler=function(e,t,n){var r=this;e=e.toLowerCase(),this.commands.value[e]=function(){return t.call(n||r.editor)}},K1.prototype.hasCustomCommand=function(e){return e=e.toLowerCase(),!!this.commands.exec[e]},K1.prototype.execNativeCommand=function(e,t,n){return void 0===t&&(t=!1),void 0===n&&(n=null),this.editor.getDoc().execCommand(e,t,n)},K1.prototype.isFormatMatch=function(e){return this.editor.formatter.match(e)},K1.prototype.toggleFormat=function(e,t){this.editor.formatter.toggle(e,t),this.editor.nodeChanged()},K1.prototype.storeSelection=function(e){this.selectionBookmark=this.editor.selection.getBookmark(e)},K1.prototype.restoreSelection=function(){this.editor.selection.moveToBookmark(this.selectionBookmark)},K1.prototype.setupCommands=function(u){var o=this;function e(r){return function(){var e=u.selection,t=e.isCollapsed()?[u.dom.getParent(e.getNode(),u.dom.isBlock)]:e.getSelectedBlocks(),n=q1(t,function(e){return!!u.formatter.matchNode(e,r)});return-1!==$1(n,!0)}}this.addCommands({"mceResetDesignMode,mceBeginUndoLevel":te,"mceEndUndoLevel,mceAddUndoLevel":function(){u.undoManager.add()},mceFocus:function(e,t,n){var r,o;o=n,(r=u).removed||(o?Md:function(t){var e=t.selection,n=t.getBody(),r=e.getRng();t.quirks.refreshContentEditable(),void 0!==t.bookmark&&!1===vd(t)&&ld(t).each(function(e){t.selection.setRng(e),r=e});var o,i,a=(o=t,i=e.getNode(),o.dom.getParent(i,function(e){return"true"===o.dom.getContentEditable(e)}));if(t.$.contains(n,a))return hd(a),pd(t,r),Md(t);t.inline||(xt.opera||hd(n),t.getWin().focus()),(xt.gecko||t.inline)&&(hd(n),pd(t,r)),Md(t)})(r)},"Cut,Copy,Paste":function(e){var t,n,r=u.getDoc();try{o.execNativeCommand(e)}catch(e){t=!0}!(t="paste"===e&&!r.queryCommandEnabled(e)||t)&&r.queryCommandSupported(e)||(n=u.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead."),xt.mac&&(n=n.replace(/Ctrl\+/g,"\u2318+")),u.notificationManager.open({text:n,type:"error"}))},unlink:function(){var e;u.selection.isCollapsed()?(e=u.dom.getParent(u.selection.getStart(),"a"))&&u.dom.remove(e,!0):u.formatter.remove("link")},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull,JustifyNone":function(e){var t=e.substring(7);"full"===t&&(t="justify"),V1("left,center,right,justify".split(","),function(e){t!==e&&u.formatter.remove("align"+e)}),"none"!==t&&o.toggleFormat("align"+t)},"InsertUnorderedList,InsertOrderedList":function(e){var t;o.execNativeCommand(e);var n=u.dom.getParent(u.selection.getNode(),"ol,ul");n&&(t=n.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(t.nodeName)&&(o.storeSelection(),u.dom.split(t,n),o.restoreSelection()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){o.toggleFormat(e)},"ForeColor,HiliteColor":function(e,t,n){o.toggleFormat(e,{value:n})},FontName:function(e,t,n){var r,o;o=R1(r=u,n),r.formatter.toggle("fontname",{value:T(o.split(/\s*,\s*/),function(e){return-1===e.indexOf(" ")||Ge(e,'"')||Ge(e,"'")?e:"'"+e+"'"}).join(",")}),r.nodeChanged()},FontSize:function(e,t,n){var r;(r=u).formatter.toggle("fontsize",{value:R1(r,n)}),r.nodeChanged()},LineHeight:function(e,t,n){var r;(r=u).formatter.toggle("lineheight",{value:String(n)}),r.nodeChanged()},Lang:function(e,t,n){o.toggleFormat(e,{value:n.code,customValue:n.customCode})},RemoveFormat:function(e){u.formatter.remove(e)},mceBlockQuote:function(){o.toggleFormat("blockquote")},FormatBlock:function(e,t,n){return o.toggleFormat(n||"p")},mceCleanup:function(){var e=u.selection.getBookmark();u.setContent(u.getContent()),u.selection.moveToBookmark(e)},mceRemoveNode:function(e,t,n){var r=n||u.selection.getNode();r!==u.getBody()&&(o.storeSelection(),u.dom.remove(r,!0),o.restoreSelection())},mceSelectNodeDepth:function(e,t,n){var r=0;u.dom.getParent(u.selection.getNode(),function(e){if(1===e.nodeType&&r++===n)return u.selection.select(e),!1},u.getBody())},mceSelectNode:function(e,t,n){u.selection.select(n)},mceInsertContent:function(e,t,n){var r,o,i,a;r=u,o=function(e){if("string"==typeof e)return{content:e,details:{}};var t=Et.extend({paste:e.paste,data:{paste:e.paste}},e);return{content:e.content,details:t}}(n),i=o.content,a=o.details,ph(r).editor.insertContent(i,a)},mceInsertRawHTML:function(e,t,n){u.selection.setContent("tiny_mce_marker");var r=u.getContent();u.setContent(r.replace(/tiny_mce_marker/g,function(){return n}))},mceInsertNewLine:function(e,t,n){_C(u,n)},mceToggleFormat:function(e,t,n){o.toggleFormat(n)},mceSetContent:function(e,t,n){u.setContent(n)},"Indent,Outdent":function(e){C0(u,e)},mceRepaint:te,InsertHorizontalRule:function(){u.execCommand("mceInsertContent",!1,"<hr />")},mceToggleVisualAid:function(){u.hasVisual=!u.hasVisual,u.addVisual()},mceReplaceContent:function(e,t,n){u.execCommand("mceInsertContent",!1,n.replace(/\{\$selection\}/g,u.selection.getContent({format:"text"})))},mceInsertLink:function(e,t,n){"string"==typeof n&&(n={href:n});var r=u.dom.getParent(u.selection.getNode(),"a");n.href=n.href.replace(/ /g,"%20"),r&&n.href||u.formatter.remove("link"),n.href&&u.formatter.apply("link",n,r)},selectAll:function(){var e,t=u.dom.getParent(u.selection.getStart(),Xn);t&&((e=u.dom.createRng()).selectNodeContents(t),u.selection.setRng(e))},mceNewDocument:function(){u.setContent("")},InsertLineBreak:function(e,t,n){return pC(u,n),!0}}),o.addCommands({JustifyLeft:e("alignleft"),JustifyCenter:e("aligncenter"),JustifyRight:e("alignright"),JustifyFull:e("alignjustify"),"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return o.isFormatMatch(e)},mceBlockQuote:function(){return o.isFormatMatch("blockquote")},Outdent:function(){return b0(u)},"InsertUnorderedList,InsertOrderedList":function(e){var t=u.dom.getParent(u.selection.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),o.addCommands({Undo:function(){u.undoManager.undo()},Redo:function(){u.undoManager.redo()}}),o.addQueryValueHandler("FontName",function(){return A1(t=u,function(e){return j1(t.getBody(),e.dom)}).getOr("");var t},this),o.addQueryValueHandler("FontSize",function(){return A1(t=u,function(e){return H1(t.getBody(),e.dom)}).getOr("");var t},this),o.addQueryValueHandler("LineHeight",function(){return A1(t=u,function(n){var e=Nt.fromDom(t.getBody());return Ag(n,function(e){return wn(e,"line-height")},A(je,e)).getOrThunk(function(){var e=parseFloat(xn(n,"line-height")),t=parseFloat(xn(n,"font-size"));return String(e/t)})}).getOr("");var t},this)},K1);function K1(e){this.commands={state:{},exec:{},value:{}},this.editor=e,this.setupCommands(e)}function X1(e,t,n){var r,o,i,a,u,s;pu(e,t)&&!1===n?(o=t,mu(r=e)?r.dom.classList.remove(o):(u=o,0<(s=U(du(a=r,"class"),function(e){return e!==u})).length?pn(a,"class",s.join(" ")):yn(a,"class")),0===(mu(i=r)?i.dom.classList:du(i,"class")).length&&yn(i,"class")):n&&gu(e,t)}function Y1(e,t,n){try{e.getDoc().execCommand(t,!1,String(n))}catch(e){}}function G1(e,t){e.dom.contentEditable=t?"true":"false"}function J1(e,t){var n,r,o=Nt.fromDom(e.getBody());X1(o,"mce-content-readonly",t),t?(e.selection.controlSelection.hideResizeRect(),e._selectionOverrides.hideFakeCaret(),ve.from(e.selection.getNode()).each(function(e){e.removeAttribute("data-mce-selected")}),G1(o,!(e.readonly=!0)),Y(hu(o,'*[contenteditable="true"]'),function(e){pn(e,ex,"true"),G1(e,!1)})):(G1(o,!(e.readonly=!1)),Y(hu(o,"*["+ex+'="true"]'),function(e){yn(e,ex),G1(e,!0)}),Y1(e,"StyleWithCSS",!1),Y1(e,"enableInlineTableEditing",!1),Y1(e,"enableObjectResizing",!1),(vd(n=e)||(r=n,td(Bn(Nt.fromDom(r.getElement()))).filter(function(e){return!(void 0!==(t=e.dom.classList)&&(t.contains("tox-edit-area")||t.contains("tox-edit-area__iframe")||t.contains("mce-content-body")))&&dd(r,e.dom);var t}).isSome()))&&e.focus(),e.selection.setRng(e.selection.getRng()),e.nodeChanged())}function Q1(e){return e.readonly}function Z1(t){t.parser.addAttributeFilter("contenteditable",function(e){Q1(t)&&Y(e,function(e){e.attr(ex,e.attr("contenteditable")),e.attr("contenteditable","false")})}),t.serializer.addAttributeFilter(ex,function(e){Q1(t)&&Y(e,function(e){e.attr("contenteditable",e.attr(ex))})}),t.serializer.addTempAttr(ex)}var ex="data-mce-contenteditable",tx=Et.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input beforeinput contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchmove touchend touchcancel"," "),nx=(rx.isNative=function(e){return!!tx[e.toLowerCase()]},rx.prototype.fire=function(e,t){var n=e.toLowerCase(),r=io(n,t||{},this.scope);this.settings.beforeFire&&this.settings.beforeFire(r);var o=this.bindings[n];if(o)for(var i=0,a=o.length;i<a;i++){var u=o[i];if(!u.removed){if(u.once&&this.off(n,u.func),r.isImmediatePropagationStopped())return r;if(!1===u.func.call(this.scope,r))return r.preventDefault(),r}}return r},rx.prototype.on=function(e,t,n,r){if(t=!1===t?R:t){var o={func:t,removed:!1};r&&Et.extend(o,r);for(var i=e.toLowerCase().split(" "),a=i.length;a--;){var u=i[a],s=this.bindings[u];s||(s=[],this.toggleEvent(u,!0)),s=n?Ae([o],s,!0):Ae(Ae([],s,!0),[o],!1),this.bindings[u]=s}}return this},rx.prototype.off=function(e,t){var n=this;if(e)for(var r=e.toLowerCase().split(" "),o=r.length;o--;){var i,a=r[o],u=this.bindings[a];if(!a)return ne(this.bindings,function(e,t){n.toggleEvent(t,!1),delete n.bindings[t]}),this;u&&(t?(u=(i=B(u,function(e){return e.func===t})).fail,this.bindings[a]=u,Y(i.pass,function(e){e.removed=!0})):u.length=0,u.length||(this.toggleEvent(e,!1),delete this.bindings[a]))}else ne(this.bindings,function(e,t){n.toggleEvent(t,!1)}),this.bindings={};return this},rx.prototype.once=function(e,t,n){return this.on(e,t,n,{once:!0})},rx.prototype.has=function(e){return e=e.toLowerCase(),!(!this.bindings[e]||0===this.bindings[e].length)},rx);function rx(e){this.bindings={},this.settings=e||{},this.scope=this.settings.scope||this,this.toggleEvent=this.settings.toggleEvent||R}function ox(n){return n._eventDispatcher||(n._eventDispatcher=new nx({scope:n,toggleEvent:function(e,t){nx.isNative(e)&&n.toggleNativeEvent&&n.toggleNativeEvent(e,t)}})),n._eventDispatcher}function ix(e,t){if("selectionchange"===t)return e.getDoc();if(!e.inline&&/^mouse|touch|click|contextmenu|drop|dragover|dragend/.test(t))return e.getDoc().documentElement;var n=Os(e);return n?(e.eventRoot||(e.eventRoot=dx.select(n)[0]),e.eventRoot):e.getBody()}function ax(e,t,n){var r,o,i,a;e.hidden||Q1(e)?Q1(e)&&(r=e,"click"!==(o=n).type||Bf.metaKeyPressed(o)||(i=Nt.fromDom(o.target),a=r,br(i,"a",function(e){return je(e,Nt.fromDom(a.getBody()))}).bind(function(e){return bn(e,"href")}).each(function(e){var t,n;o.preventDefault(),/^#/.test(e)?(t=r.dom.select(e+',[name="'+(Ge(n=e,"#")?n.substring("#".length):n)+'"]')).length&&r.selection.scrollIntoView(t[0],!0):window.open(e,"_blank","rel=noopener noreferrer,menubar=yes,toolbar=yes,location=yes,status=yes,resizable=yes,scrollbars=yes")}))):e.fire(t,n)}function ux(i,a){var e,t;i.delegates||(i.delegates={}),i.delegates[a]||i.removed||(t=ix(i,a),Os(i)?(lx||(lx={},i.editorManager.on("removeEditor",function(){i.editorManager.activeEditor||lx&&(ne(lx,function(e,t){i.dom.unbind(ix(i,t))}),lx=null)})),lx[a]||(lx[a]=e=function(e){for(var t=e.target,n=i.editorManager.get(),r=n.length;r--;){var o=n[r].getBody();o!==t&&!dx.isChildOf(t,o)||ax(n[r],a,e)}},dx.bind(t,a,e))):(dx.bind(t,a,e=function(e){ax(i,a,e)}),i.delegates[a]=e))}function sx(e,t,n,r){var o=n[t.get()],i=n[r];try{i.activate()}catch(e){return void console.error("problem while activating editor mode "+r+":",e)}o.deactivate(),o.editorReadOnly!==i.editorReadOnly&&J1(e,i.editorReadOnly),t.set(r),e.fire("SwitchMode",{mode:r})}function cx(e){var t,n={};px(hx(e.toLowerCase(),"+"),function(e){e in bx?n[e]=!0:/^[0-9]{2,}$/.test(e)?n.keyCode=parseInt(e,10):(n.charCode=e.charCodeAt(0),n.keyCode=vx[e]||e.toUpperCase().charCodeAt(0))});var r=[n.keyCode];for(t in bx)n[t]?r.push(t):n[t]=!1;return n.id=r.join(","),n.access&&(n.alt=!0,xt.mac?n.ctrl=!0:n.shift=!0),n.meta&&(xt.mac?n.meta=!0:(n.ctrl=!0,n.meta=!1)),n}var lx,fx={fire:function(e,t,n){if(this.removed&&"remove"!==e&&"detach"!==e)return t;var r=ox(this).fire(e,t);if(!1!==n&&this.parent)for(var o=this.parent();o&&!r.isPropagationStopped();)o.fire(e,r,!1),o=o.parent();return r},on:function(e,t,n){return ox(this).on(e,t,n)},off:function(e,t){return ox(this).off(e,t)},once:function(e,t){return ox(this).once(e,t)},hasEventListeners:function(e){return ox(this).has(e)}},dx=Ja.DOM,mx=_e(_e({},fx),{bindPendingEventDelegates:function(){var t=this;Et.each(t._pendingNativeEvents,function(e){ux(t,e)})},toggleNativeEvent:function(e,t){var n=this;"focus"!==e&&"blur"!==e&&(n.removed||(t?n.initialized?ux(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&(n.dom.unbind(ix(n,e),e,n.delegates[e]),delete n.delegates[e])))},unbindAllNativeEvents:function(){var n=this,e=n.getBody(),t=n.dom;n.delegates&&(ne(n.delegates,function(e,t){n.dom.unbind(ix(n,t),t,e)}),delete n.delegates),!n.inline&&e&&t&&(e.onload=null,t.unbind(n.getWin()),t.unbind(n.getDoc())),t&&(t.unbind(e),t.unbind(n.getContainer()))}}),gx=["design","readonly"],px=Et.each,hx=Et.explode,vx={f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},bx=Et.makeMap("alt,ctrl,shift,meta,access"),yx=(Cx.prototype.add=function(e,n,t,r){var o=this,i=o.normalizeCommandFunc(t);return px(hx(Et.trim(e)),function(e){var t=o.createShortcut(e,n,i,r);o.shortcuts[t.id]=t}),!0},Cx.prototype.remove=function(e){var t=this.createShortcut(e);return!!this.shortcuts[t.id]&&(delete this.shortcuts[t.id],!0)},Cx.prototype.normalizeCommandFunc=function(e){var t=this,n=e;return"string"==typeof n?function(){t.editor.execCommand(n,!1,null)}:Et.isArray(n)?function(){t.editor.execCommand(n[0],n[1],n[2])}:n},Cx.prototype.createShortcut=function(e,t,n,r){var o=Et.map(hx(e,">"),cx);return o[o.length-1]=Et.extend(o[o.length-1],{func:n,scope:r||this.editor}),Et.extend(o[0],{desc:this.editor.translate(t),subpatterns:o.slice(1)})},Cx.prototype.hasModifier=function(e){return e.altKey||e.ctrlKey||e.metaKey},Cx.prototype.isFunctionKey=function(e){return"keydown"===e.type&&112<=e.keyCode&&e.keyCode<=123},Cx.prototype.matchShortcut=function(e,t){return!!t&&t.ctrl===e.ctrlKey&&t.meta===e.metaKey&&t.alt===e.altKey&&t.shift===e.shiftKey&&!!(e.keyCode===t.keyCode||e.charCode&&e.charCode===t.charCode)&&(e.preventDefault(),!0)},Cx.prototype.executeShortcutAction=function(e){return e.func?e.func.call(e.scope):null},Cx);function Cx(e){this.shortcuts={},this.pendingPatterns=[],this.editor=e;var n=this;e.on("keyup keypress keydown",function(t){!n.hasModifier(t)&&!n.isFunctionKey(t)||t.isDefaultPrevented()||(px(n.shortcuts,function(e){if(n.matchShortcut(t,e))return n.pendingPatterns=e.subpatterns.slice(0),"keydown"===t.type&&n.executeShortcutAction(e),!0}),n.matchShortcut(t,n.pendingPatterns[0])&&(1===n.pendingPatterns.length&&"keydown"===t.type&&n.executeShortcutAction(n.pendingPatterns[0]),n.pendingPatterns.shift()))})}var xx=Ja.DOM,wx=Et.extend,Sx=Et.each,Ex=Et.resolve,Nx=xt.ie,kx=(_x.prototype.render=function(){!function(t){var e=t.id;uu.setCode(As(t));var n,r,o,i,a=function(){U1.unbind(window,"ready",a),t.render()};ai.Event.domLoaded?t.getElement()&&xt.contentEditable&&(n=Nt.fromDom(t.getElement()),r=L(n.dom.attributes,function(e,t){return e[t.name]=t.value,e},{}),t.on("remove",function(){O(n.dom.attributes,function(e){return yn(n,e.name),0}),hn(n,r)}),t.ui.styleSheetLoader=Ar.forElement(n,{contentCssCors:(o=t).getParam("content_css_cors"),referrerPolicy:_s(o)}),t.getParam("inline")?t.inline=!0:(t.orgVisibility=t.getElement().style.visibility,t.getElement().style.visibility="hidden"),(i=t.getElement().form||U1.getParent(e,"form"))&&(t.formElement=i,t.getParam("hidden_input")&&!Hn(t.getElement())&&(U1.insertAfter(U1.create("input",{type:"hidden",name:e}),e),t.hasHiddenInput=!0),t.formEventDelegate=function(e){t.fire(e.type,e)},U1.bind(i,"submit reset",t.formEventDelegate),t.on("reset",function(){t.resetContent()}),!t.getParam("submit_patch")||i.submit.nodeType||i.submit.length||i._mceOldSubmit||(i._mceOldSubmit=i.submit,i.submit=function(){return t.editorManager.triggerSave(),t.setDirty(!1),i._mceOldSubmit(i)})),t.windowManager=Pv(t),t.notificationManager=uv(t),"xml"===t.getParam("encoding")&&t.on("GetContent",function(e){e.save&&(e.content=U1.encode(e.content))}),t.getParam("add_form_submit_trigger")&&t.on("submit",function(){t.initialized&&t.save()}),t.getParam("add_unload_trigger")&&(t._beforeUnload=function(){!t.initialized||t.destroyed||t.isHidden()||t.save({format:"raw",no_events:!0,set_dirty:!1})},t.editorManager.on("BeforeUnload",t._beforeUnload)),t.editorManager.add(t),N1(t,t.suffix)):U1.bind(window,"ready",a)}(this)},_x.prototype.focus=function(e){this.execCommand("mceFocus",!1,e)},_x.prototype.hasFocus=function(){return vd(this)},_x.prototype.execCallback=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r,o=this.settings[e];if(o)return this.callbackLookup&&(r=this.callbackLookup[e])&&(o=r.func,r=r.scope),"string"==typeof o&&(r=(r=o.replace(/\.\w+$/,""))?Ex(r):0,o=Ex(o),this.callbackLookup=this.callbackLookup||{},this.callbackLookup[e]={func:o,scope:r}),o.apply(r||this,t)},_x.prototype.translate=function(e){return uu.translate(e)},_x.prototype.getParam=function(e,t,n){return i=t,a=n,l=(o=e)in(r=this).settings?r.settings[o]:i,"hash"===a?(c={},"string"==typeof(s=l)?Y(0<s.indexOf("=")?s.split(/[;,](?![^=;,]*(?:[;,]|$))/):s.split(","),function(e){var t=e.split("=");1<t.length?c[Et.trim(t[0])]=Et.trim(t[1]):c[Et.trim(t[0])]=Et.trim(t[0])}):c=s,c):"string"===a?rv(X,r,o).getOr(i):"number"===a?rv(E,r,o).getOr(i):"boolean"===a?rv(v,r,o).getOr(i):"object"===a?rv(h,r,o).getOr(i):"array"===a?rv(S,r,o).getOr(i):"string[]"===a?rv((u=X,function(e){return S(e)&&j(e,u)}),r,o).getOr(i):"function"===a?rv(y,r,o).getOr(i):l;var r,o,i,a,u,s,c,l},_x.prototype.hasPlugin=function(e,t){return!(!D(Ls(this).split(/[ ,]/),e)||t&&void 0===Ov.get(e))},_x.prototype.nodeChanged=function(e){this._nodeChangeDispatcher.nodeChanged(e)},_x.prototype.addCommand=function(e,t,n){this.editorCommands.addCommand(e,t,n)},_x.prototype.addQueryStateHandler=function(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)},_x.prototype.addQueryValueHandler=function(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)},_x.prototype.addShortcut=function(e,t,n,r){this.shortcuts.add(e,t,n,r)},_x.prototype.execCommand=function(e,t,n,r){return this.editorCommands.execCommand(e,t,n,r)},_x.prototype.queryCommandState=function(e){return this.editorCommands.queryCommandState(e)},_x.prototype.queryCommandValue=function(e){return this.editorCommands.queryCommandValue(e)},_x.prototype.queryCommandSupported=function(e){return this.editorCommands.queryCommandSupported(e)},_x.prototype.show=function(){this.hidden&&(this.hidden=!1,this.inline?this.getBody().contentEditable="true":(xx.show(this.getContainer()),xx.hide(this.id)),this.load(),this.fire("show"))},_x.prototype.hide=function(){var e=this,t=e.getDoc();e.hidden||(Nx&&t&&!e.inline&&t.execCommand("SelectAll"),e.save(),e.inline?(e.getBody().contentEditable="false",e===e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(xx.hide(e.getContainer()),xx.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.fire("hide"))},_x.prototype.isHidden=function(){return!!this.hidden},_x.prototype.setProgressState=function(e,t){this.fire("ProgressState",{state:e,time:t})},_x.prototype.load=function(e){var t=this.getElement();if(this.removed)return"";if(t){(e=e||{}).load=!0;var n=Hn(t)?t.value:t.innerHTML,r=this.setContent(n,e);return e.element=t,e.no_events||this.fire("LoadContent",e),e.element=t=null,r}},_x.prototype.save=function(e){var t,n,r=this,o=r.getElement();if(o&&r.initialized&&!r.removed)return(e=e||{}).save=!0,e.element=o,e.content=r.getContent(e),e.no_events||r.fire("SaveContent",e),"raw"===e.format&&r.fire("RawSaveContent",e),t=e.content,Hn(o)?o.value=t:(!e.is_removing&&r.inline||(o.innerHTML=t),(n=xx.getParent(r.id,"form"))&&Sx(n.elements,function(e){if(e.name===r.id)return e.value=t,!1})),e.element=o=null,!1!==e.set_dirty&&r.setDirty(!1),t},_x.prototype.setContent=function(e,t){return Yh(this,e,t)},_x.prototype.getContent=function(e){return t=this,r=(n=void 0===(n=e)?{}:n).format||"html",o=n,ph(t).editor.getContent(o,r);var t,n,r,o},_x.prototype.insertContent=function(e,t){t&&(e=wx({content:e},t)),this.execCommand("mceInsertContent",!1,e)},_x.prototype.resetContent=function(e){void 0===e?Yh(this,this.startContent,{format:"raw"}):Yh(this,e),this.undoManager.reset(),this.setDirty(!1),this.nodeChanged()},_x.prototype.isDirty=function(){return!this.isNotDirty},_x.prototype.setDirty=function(e){var t=!this.isNotDirty;this.isNotDirty=!e,e&&e!==t&&this.fire("dirty")},_x.prototype.getContainer=function(){return this.container||(this.container=xx.get(this.editorContainer||this.id+"_parent")),this.container},_x.prototype.getContentAreaContainer=function(){return this.contentAreaContainer},_x.prototype.getElement=function(){return this.targetElm||(this.targetElm=xx.get(this.id)),this.targetElm},_x.prototype.getWin=function(){var e;return this.contentWindow||(e=this.iframeElement)&&(this.contentWindow=e.contentWindow),this.contentWindow},_x.prototype.getDoc=function(){var e;return this.contentDocument||(e=this.getWin())&&(this.contentDocument=e.document),this.contentDocument},_x.prototype.getBody=function(){var e=this.getDoc();return this.bodyElement||(e?e.body:null)},_x.prototype.convertURL=function(e,t,n){var r=this.settings;return r.urlconverter_callback?this.execCallback("urlconverter_callback",e,n,!0,t):!r.convert_urls||n&&"LINK"===n.nodeName||0===e.indexOf("file:")||0===e.length?e:r.relative_urls?this.documentBaseURI.toRelative(e):this.documentBaseURI.toAbsolute(e,r.remove_script_host)},_x.prototype.addVisual=function(e){var t;t=e,hh(this).editor.addVisual(t)},_x.prototype.remove=function(){var e,t,n,r,o;(e=this).removed||(t=e._selectionOverrides,n=e.editorUpload,r=e.getBody(),o=e.getElement(),r&&e.save({is_removing:!0}),e.removed=!0,e.unbindAllNativeEvents(),e.hasHiddenInput&&o&&hv.remove(o.nextSibling),e.fire("remove"),e.editorManager.remove(e),!e.inline&&r&&hv.setStyle(e.id,"display",e.orgDisplay),e.fire("detach"),hv.remove(e.getContainer()),Gh(t),Gh(n),e.destroy())},_x.prototype.destroy=function(e){var t,n,r,o,i,a,u;n=e,a=(t=this).selection,u=t.dom,t.destroyed||(n||t.removed?(n||(t.editorManager.off("beforeunload",t._beforeUnload),t.theme&&t.theme.destroy&&t.theme.destroy(),Gh(a),Gh(u)),(o=(r=t).formElement)&&(o._mceOldSubmit&&(o.submit=o._mceOldSubmit,o._mceOldSubmit=null),hv.unbind(o,"submit reset",r.formEventDelegate)),(i=t).contentAreaContainer=i.formElement=i.container=i.editorContainer=null,i.bodyElement=i.contentDocument=i.contentWindow=null,i.iframeElement=i.targetElm=null,i.selection&&(i.selection=i.selection.win=i.selection.dom=i.selection.dom.doc=null),t.destroyed=!0):t.remove())},_x.prototype.uploadImages=function(e){return this.editorUpload.uploadImages(e)},_x.prototype._scanForImages=function(){return this.editorUpload.scanForImages()},_x.prototype.addButton=function(){throw new Error("editor.addButton has been removed in tinymce 5x, use editor.ui.registry.addButton or editor.ui.registry.addToggleButton or editor.ui.registry.addSplitButton instead")},_x.prototype.addSidebar=function(){throw new Error("editor.addSidebar has been removed in tinymce 5x, use editor.ui.registry.addSidebar instead")},_x.prototype.addMenuItem=function(){throw new Error("editor.addMenuItem has been removed in tinymce 5x, use editor.ui.registry.addMenuItem instead")},_x.prototype.addContextToolbar=function(){throw new Error("editor.addContextToolbar has been removed in tinymce 5x, use editor.ui.registry.addContextToolbar instead")},_x);function _x(e,t,n){var r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,b,y,C,x=this;function w(n,r){return function(e,t){return n[e.toLowerCase()]=_e(_e({},t),{type:r})}}this.plugins={},this.contentCSS=[],this.contentStyles=[],this.loadedCSS={},this.isNotDirty=!1,this.editorManager=n,this.documentBaseUrl=n.documentBaseURL,wx(this,mx),this.settings=(d=(f=this).documentBaseUrl,m=n.defaultSettings,p=d,h=wv,v=f,b={id:e,theme:"silver",toolbar_mode:ev(g=t,"floating"),plugins:"",document_base_url:p,add_form_submit_trigger:!0,submit_patch:!0,add_unload_trigger:!0,convert_urls:!0,relative_urls:!0,remove_script_host:!0,object_resizing:!0,doctype:"<!DOCTYPE html>",visual:!0,font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,inline_styles:!0,convert_fonts_to_spans:!0,indent:!0,indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",entity_encoding:"named",url_converter:v.convertURL,url_converter_scope:v},y=_e(_e({},b),h?kv:{}),!1!==(C=nv(Sv||Ev,Sv,y,m,g)).deprecation_warnings&&Jh(g,C),C),this.settings.suffix&&(n.suffix=this.settings.suffix),this.suffix=n.suffix,this.settings.base_url&&n._setBaseUrl(this.settings.base_url),this.baseUri=n.baseURI,this.settings.referrer_policy&&(tu.ScriptLoader._setReferrerPolicy(this.settings.referrer_policy),Ja.DOM.styleSheetLoader._setReferrerPolicy(this.settings.referrer_policy)),su.languageLoad=this.settings.language_load,su.baseURL=n.baseURL,this.id=e,this.setDirty(!1),this.documentBaseURI=new Kd(this.settings.document_base_url,{base_uri:this.baseUri}),this.baseURI=this.baseUri,this.inline=!!this.settings.inline,this.shortcuts=new yx(this),this.editorCommands=new W1(this),this.settings.cache_suffix&&(xt.cacheSuffix=this.settings.cache_suffix.replace(/^[\?\&]+/,"")),this.ui={registry:{addAutocompleter:(u={},(r={addButton:w(o={},"button"),addGroupToolbarButton:w(o,"grouptoolbarbutton"),addToggleButton:w(o,"togglebutton"),addMenuButton:w(o,"menubutton"),addSplitButton:w(o,"splitbutton"),addMenuItem:w(i={},"menuitem"),addNestedMenuItem:w(i,"nestedmenuitem"),addToggleMenuItem:w(i,"togglemenuitem"),addAutocompleter:w(a={},"autocompleter"),addContextMenu:w(s={},"contextmenu"),addContextToolbar:w(c={},"contexttoolbar"),addContextForm:w(c,"contextform"),addSidebar:w(l={},"sidebar"),addIcon:function(e,t){return u[e.toLowerCase()]=t},getAll:function(){return{buttons:o,menuItems:i,icons:u,popups:a,contextMenus:s,contextToolbars:c,sidebars:l}}}).addAutocompleter),addButton:r.addButton,addContextForm:r.addContextForm,addContextMenu:r.addContextMenu,addContextToolbar:r.addContextToolbar,addIcon:r.addIcon,addMenuButton:r.addMenuButton,addMenuItem:r.addMenuItem,addNestedMenuItem:r.addNestedMenuItem,addSidebar:r.addSidebar,addSplitButton:r.addSplitButton,addToggleButton:r.addToggleButton,addGroupToolbarButton:r.addGroupToolbarButton,addToggleMenuItem:r.addToggleMenuItem,getAll:r.getAll},styleSheetLoader:void 0,show:te,hide:te,enable:te,disable:te,isDisabled:R};var S,E,N,k,_,A=(k=ru("design"),_=ru({design:{activate:te,deactivate:te,editorReadOnly:!1},readonly:{activate:te,deactivate:te,editorReadOnly:!0}}),(E=S=this).serializer?Z1(E):E.on("PreInit",function(){Z1(E)}),(N=S).on("ShowCaret",function(e){Q1(N)&&e.preventDefault()}),N.on("ObjectSelected",function(e){Q1(N)&&e.preventDefault()}),{isReadOnly:function(){return Q1(S)},set:function(e){return function(e,t,n,r){if(r!==n.get()){if(!Ne(t,r))throw new Error("Editor mode '"+r+"' is invalid");e.initialized?sx(e,n,t,r):e.on("init",function(){return sx(e,n,t,r)})}}(S,_.get(),k,e)},get:function(){return k.get()},register:function(e,t){_.set(function(e,t,n){var r;if(D(gx,t))throw new Error("Cannot override default mode "+t);return _e(_e({},e),((r={})[t]=_e(_e({},n),{deactivate:function(){try{n.deactivate()}catch(e){console.error("problem while deactivating editor mode "+t+":",e)}}}),r))}(_.get(),e,t))}});this.mode=A,this.setMode=A.set,n.fire("SetupEditor",{editor:this}),this.execCallback("setup",this),this.$=Wa.overrideDefaults(function(){return{context:x.inline?x.getBody():x.getDoc(),element:x.getBody()}})}function Ax(t){var n=t.type;Px(Hx.get(),function(e){switch(n){case"scroll":e.fire("ScrollWindow",t);break;case"resize":e.fire("ResizeWindow",t)}})}function Rx(e){e!==Mx&&(e?Wa(window).on("resize scroll",Ax):Wa(window).off("resize scroll",Ax),Mx=e)}function Dx(t){var e=Ux;delete Fx[t.id];for(var n=0;n<Fx.length;n++)if(Fx[n]===t){Fx.splice(n,1);break}return Ux=U(Ux,function(e){return t!==e}),Hx.activeEditor===t&&(Hx.activeEditor=0<Ux.length?Ux[0]:null),Hx.focusedEditor===t&&(Hx.focusedEditor=null),e.length!==Ux.length}var Tx,Ox=Ja.DOM,Bx=Et.explode,Px=Et.each,Lx=Et.extend,Ix=0,Mx=!1,Fx=[],Ux=[],zx="CSS1Compat"!==document.compatMode,Hx=_e(_e({},fx),{baseURI:null,baseURL:null,defaultSettings:{},documentBaseURL:null,suffix:null,$:Wa,majorVersion:"5",minorVersion:"10.0",releaseDate:"2021-10-11",editors:Fx,i18n:uu,activeEditor:null,focusedEditor:null,settings:{},setup:function(){var e,t="",n=Kd.getDocumentBaseUrl(document.location);/^[^:]+:\/\/\/?[^\/]+\//.test(n)&&(n=n.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/"));var r=window.tinymce||window.tinyMCEPreInit;if(r)e=r.base||r.baseURL,t=r.suffix;else{for(var o,i=document.getElementsByTagName("script"),a=0;a<i.length;a++)if(""!==(o=i[a].src||"")){var u=o.substring(o.lastIndexOf("/"));if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(o)){-1!==u.indexOf(".min")&&(t=".min"),e=o.substring(0,o.lastIndexOf("/"));break}}!e&&document.currentScript&&(-1!==(o=document.currentScript.src).indexOf(".min")&&(t=".min"),e=o.substring(0,o.lastIndexOf("/")))}this.baseURL=new Kd(n).toAbsolute(e),this.documentBaseURL=n,this.baseURI=new Kd(this.baseURL),this.suffix=t,this.on("AddEditor",A(md,this)),this.on("RemoveEditor",A(gd,this))},overrideDefaults:function(e){var t=e.base_url;t&&this._setBaseUrl(t);var n=e.suffix;e.suffix&&(this.suffix=n);var r=(this.defaultSettings=e).plugin_base_urls;void 0!==r&&ne(r,function(e,t){su.PluginManager.urls[t]=e})},init:function(r){function u(e){var t=e.id;return t||(t=ue(e,"name").filter(function(e){return!Ox.get(e)}).getOrThunk(Ox.uniqueId),e.setAttribute("id",t)),t}function s(e,t){return t.constructor===RegExp?t.test(e.className):Ox.hasClass(e,t)}var n,c=this,l=Et.makeMap("area base basefont br col frame hr img input isindex link meta param embed source wbr track colgroup option table tbody tfoot thead tr th td script noscript style textarea video audio iframe object menu"," "),f=function(e){n=e},t=function(){function n(e,t,n){var r=new kx(e,t,c);a.push(r),r.on("init",function(){++i===o.length&&f(a)}),r.targetElm=r.targetElm||n,r.render()}var o,e,i=0,a=[];Ox.unbind(window,"ready",t),(e=r.onpageload)&&e.apply(c,[]),o=Wa.unique(function(t){var n=[];if(xt.browser.isIE()&&xt.browser.version.major<11)return ay("TinyMCE does not support the browser you are using. For a list of supported browsers please see: https://www.tinymce.com/docs/get-started/system-requirements/"),[];if(zx)return ay("Failed to initialize the editor as the document is not in standards mode. TinyMCE requires standards mode."),[];if(t.types)return Px(t.types,function(e){n=n.concat(Ox.select(e.selector))}),n;if(t.selector)return Ox.select(t.selector);if(t.target)return[t.target];switch(t.mode){case"exact":var e=t.elements||"";0<e.length&&Px(Bx(e),function(t){var e=Ox.get(t);e?n.push(e):Px(document.forms,function(e){Px(e.elements,function(e){e.name===t&&(t="mce_editor_"+Ix++,Ox.setAttrib(e,"id",t),n.push(e))})})});break;case"textareas":case"specific_textareas":Px(Ox.select("textarea"),function(e){t.editor_deselector&&s(e,t.editor_deselector)||t.editor_selector&&!s(e,t.editor_selector)||n.push(e)})}return n}(r)),r.types?Px(r.types,function(t){Et.each(o,function(e){return!Ox.is(e,t.selector)||(n(u(e),Lx({},r,t),e),!1)})}):(Et.each(o,function(e){var t;(t=c.get(e.id))&&t.initialized&&!(t.getContainer()||t.getBody()).parentNode&&(Dx(t),t.unbindAllNativeEvents(),t.destroy(!0),t.removed=!0)}),0===(o=Et.grep(o,function(e){return!c.get(e.id)})).length?f([]):Px(o,function(e){var t=e;r.inline&&t.tagName.toLowerCase()in l?ay("Could not initialize inline editor on invalid inline target element",e):n(u(e),r,e)}))};return c.settings=r,Ox.bind(window,"ready",t),new kr(function(t){n?t(n):f=function(e){t(e)}})},get:function(t){return 0===arguments.length?Ux.slice(0):X(t)?M(Ux,function(e){return e.id===t}).getOr(null):E(t)&&Ux[t]||null},add:function(e){var n=this;return Fx[e.id]===e||(null===n.get(e.id)&&("length"!==e.id&&(Fx[e.id]=e),Fx.push(e),Ux.push(e)),Rx(!0),n.activeEditor=e,n.fire("AddEditor",{editor:e}),Tx||(Tx=function(e){var t=n.fire("BeforeUnload");if(t.returnValue)return e.preventDefault(),e.returnValue=t.returnValue,t.returnValue},window.addEventListener("beforeunload",Tx))),e},createEditor:function(e,t){return this.add(new kx(e,t,this))},remove:function(e){var t,n,r=this;if(e){if(!X(e))return n=e,l(r.get(n.id))?null:(Dx(n)&&r.fire("RemoveEditor",{editor:n}),0===Ux.length&&window.removeEventListener("beforeunload",Tx),n.remove(),Rx(0<Ux.length),n);Px(Ox.select(e),function(e){(n=r.get(e.id))&&r.remove(n)})}else for(t=Ux.length-1;0<=t;t--)r.remove(Ux[t])},execCommand:function(e,t,n){var r=this.get(n);switch(e){case"mceAddEditor":return this.get(n)||new kx(n,this.settings,this).render(),!0;case"mceRemoveEditor":return r&&r.remove(),!0;case"mceToggleEditor":return r?r.isHidden()?r.show():r.hide():this.execCommand("mceAddEditor",!1,n),!0}return!!this.activeEditor&&this.activeEditor.execCommand(e,t,n)},triggerSave:function(){Px(Ux,function(e){e.save()})},addI18n:function(e,t){uu.add(e,t)},translate:function(e){return uu.translate(e)},setActive:function(e){var t=this.activeEditor;this.activeEditor!==e&&(t&&t.fire("deactivate",{relatedTarget:e}),e.fire("activate",{relatedTarget:t})),this.activeEditor=e},_setBaseUrl:function(e){this.baseURL=new Kd(this.documentBaseURL).toAbsolute(e.replace(/\/+$/,"")),this.baseURI=new Kd(this.baseURL)}});function jx(e,t,n){var r=t.x,o=t.y,i=e.w,a=e.h,u=t.w,s=t.h,c=(n||"").split("");return"b"===c[0]&&(o+=s),"r"===c[1]&&(r+=u),"c"===c[0]&&(o+=Jx(s/2)),"c"===c[1]&&(r+=Jx(u/2)),"b"===c[3]&&(o-=a),"r"===c[4]&&(r-=i),"c"===c[3]&&(o-=Jx(a/2)),"c"===c[4]&&(r-=Jx(i/2)),qx(r,o,i,a)}function Vx(){}Hx.setup();function qx(e,t,n,r){return{x:e,y:t,w:n,h:r}}var $x,Wx,Kx,Xx,Yx=Math.min,Gx=Math.max,Jx=Math.round,Qx={inflate:function(e,t,n){return qx(e.x-t,e.y-n,e.w+2*t,e.h+2*n)},relativePosition:jx,findBestRelativePosition:function(e,t,n,r){for(var o,i=0;i<r.length;i++)if((o=jx(e,t,r[i])).x>=n.x&&o.x+o.w<=n.w+n.x&&o.y>=n.y&&o.y+o.h<=n.h+n.y)return r[i];return null},intersect:function(e,t){var n=Gx(e.x,t.x),r=Gx(e.y,t.y),o=Yx(e.x+e.w,t.x+t.w),i=Yx(e.y+e.h,t.y+t.h);return o-n<0||i-r<0?null:qx(n,r,o-n,i-r)},clamp:function(e,t,n){var r=e.x,o=e.y,i=e.x+e.w,a=e.y+e.h,u=t.x+t.w,s=t.y+t.h,c=Gx(0,t.x-r),l=Gx(0,t.y-o),f=Gx(0,i-u),d=Gx(0,a-s);return r+=c,o+=l,n&&(i+=c,a+=l,r-=f,o-=d),qx(r,o,(i-=f)-r,(a-=d)-o)},create:qx,fromClientRect:function(e){return qx(e.left,e.top,e.width,e.height)}},Zx=($x={},Wx={},{load:function(r,o){var i='Script at URL "'+o+'" failed to load',a='Script at URL "'+o+"\" did not call `tinymce.Resource.add('"+r+"', data)` within 1 second";if(void 0!==$x[r])return $x[r];var e=new kr(function(e,t){var n=function(e,t,n){function r(n){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];o||(o=!0,null!==i&&(clearTimeout(i),i=null),n.apply(null,e))}}void 0===n&&(n=1e3);var o=!1,i=null,a=r(e),u=r(t);return{start:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];o||null!==i||(i=setTimeout(function(){return u.apply(null,e)},n))},resolve:a,reject:u}}(e,t);Wx[r]=n.resolve,tu.ScriptLoader.loadScript(o,function(){return n.start(a)},function(){return n.reject(i)})});return $x[r]=e},add:function(e,t){void 0!==Wx[e]&&(Wx[e](t),delete Wx[e]),$x[e]=kr.resolve(t)}}),ew=Et.each,tw=Et.extend;Vx.extend=Kx=function(n){function r(){var e,t,n;if(!Xx&&(this.init&&this.init.apply(this,arguments),t=this.Mixins))for(e=t.length;e--;)(n=t[e]).init&&n.init.apply(this,arguments)}function t(){return this}var o=this.prototype;Xx=!0;var i=new this;return Xx=!1,n.Mixins&&(ew(n.Mixins,function(e){for(var t in e)"init"!==t&&(n[t]=e[t])}),o.Mixins&&(n.Mixins=o.Mixins.concat(n.Mixins))),n.Methods&&ew(n.Methods.split(","),function(e){n[e]=t}),n.Properties&&ew(n.Properties.split(","),function(e){var t="_"+e;n[e]=function(e){return void 0!==e?(this[t]=e,this):this[t]}}),n.Statics&&ew(n.Statics,function(e,t){r[t]=e}),n.Defaults&&o.Defaults&&(n.Defaults=tw({},o.Defaults,n.Defaults)),ne(n,function(e,t){var n,r;"function"==typeof e&&o[t]?i[t]=(n=t,r=e,function(){var e=this._super;this._super=o[n];var t=r.apply(this,arguments);return this._super=e,t}):i[t]=e}),r.prototype=i,(r.constructor=r).extend=Kx,r};var nw,rw,ow,iw=Math.min,aw=Math.max,uw=Math.round,sw={serialize:function(e){var t=JSON.stringify(e);return X(t)?t.replace(/[\u0080-\uFFFF]/g,function(e){var t=e.charCodeAt(0).toString(16);return"\\u"+"0000".substring(t.length)+t}):t},parse:function(e){try{return JSON.parse(e)}catch(e){}}},cw={callbacks:{},count:0,send:function(t){var n=this,r=Ja.DOM,o=(void 0!==t.count?t:n).count,i="tinymce_jsonp_"+o;n.callbacks[o]=function(e){r.remove(i),delete n.callbacks[o],t.callback(e)},r.add(r.doc.body,"script",{id:i,src:t.url,type:"text/javascript"}),n.count++}},lw=_e(_e({},fx),{send:function(e){var t,n=0,r=function(){!e.async||4===t.readyState||1e4<n++?(e.success&&n<1e4&&200===t.status?e.success.call(e.success_scope,""+t.responseText,t,e):e.error&&e.error.call(e.error_scope,1e4<n?"TIMED_OUT":"GENERAL",t,e),t=null):_r.setTimeout(r,10)};if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=!1!==e.async,e.data=e.data||"",lw.fire("beforeInitialize",{settings:e}),(t=new XMLHttpRequest).overrideMimeType&&t.overrideMimeType(e.content_type),t.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.crossDomain&&(t.withCredentials=!0),e.content_type&&t.setRequestHeader("Content-Type",e.content_type),e.requestheaders&&Et.each(e.requestheaders,function(e){t.setRequestHeader(e.key,e.value)}),t.setRequestHeader("X-Requested-With","XMLHttpRequest"),(t=lw.fire("beforeSend",{xhr:t,settings:e}).xhr).send(e.data),!e.async)return r();_r.setTimeout(r,10)}}),fw=Et.extend,dw=(mw.sendRPC=function(e){return(new mw).send(e)},mw.prototype.send=function(e){var n=e.error,r=e.success,o=fw(this.settings,e);o.success=function(e,t){(e=void 0===(e=sw.parse(e))?{error:"JSON Parse error."}:e).error?n.call(o.error_scope||o.scope,e.error,t):r.call(o.success_scope||o.scope,e.result)},o.error=function(e,t){n&&n.call(o.error_scope||o.scope,e,t)},o.data=sw.serialize({id:e.id||"c"+this.count++,method:e.method,params:e.params}),o.content_type="application/json",lw.send(o)},mw);function mw(e){this.settings=fw({},e),this.count=0}try{var gw,pw="__storage_test__";(gw=window.localStorage).setItem(pw,pw),gw.removeItem(pw)}catch(e){nw={},rw=[],ow={getItem:function(e){return nw[e]||null},setItem:function(e,t){rw.push(e),nw[e]=String(t)},key:function(e){return rw[e]},removeItem:function(t){rw=rw.filter(function(e){return e===t}),delete nw[t]},clear:function(){rw=[],nw={}},length:0},Object.defineProperty(ow,"length",{get:function(){return rw.length},configurable:!1,enumerable:!1}),gw=ow}var hw={geom:{Rect:Qx},util:{Promise:kr,Delay:_r,Tools:Et,VK:Bf,URI:Kd,Class:Vx,EventDispatcher:nx,Observable:fx,I18n:uu,XHR:lw,JSON:sw,JSONRequest:dw,JSONP:cw,LocalStorage:gw,Color:function(e){function t(e){var t;return"object"==typeof e?"r"in e?(u=e.r,s=e.g,c=e.b):"v"in e&&function(e,t,n){if(e=(parseInt(e,10)||0)%360,t=parseInt(t,10)/100,n=parseInt(n,10)/100,t=aw(0,iw(t,1)),n=aw(0,iw(n,1)),0!==t){var r=e/60,o=n*t,i=o*(1-Math.abs(r%2-1)),a=n-o;switch(Math.floor(r)){case 0:u=o,s=i,c=0;break;case 1:u=i,s=o,c=0;break;case 2:u=0,s=o,c=i;break;case 3:u=0,s=i,c=o;break;case 4:u=i,s=0,c=o;break;case 5:u=o,s=0,c=i;break;default:u=s=c=0}u=uw(255*(u+a)),s=uw(255*(s+a)),c=uw(255*(c+a))}else u=s=c=uw(255*n)}(e.h,e.s,e.v):(t=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)[^\)]*\)/gi.exec(e))?(u=parseInt(t[1],10),s=parseInt(t[2],10),c=parseInt(t[3],10)):(t=/#([0-F]{2})([0-F]{2})([0-F]{2})/gi.exec(e))?(u=parseInt(t[1],16),s=parseInt(t[2],16),c=parseInt(t[3],16)):(t=/#([0-F])([0-F])([0-F])/gi.exec(e))&&(u=parseInt(t[1]+t[1],16),s=parseInt(t[2]+t[2],16),c=parseInt(t[3]+t[3],16)),u=u<0?0:255<u?255:u,s=s<0?0:255<s?255:s,c=c<0?0:255<c?255:c,n}var n={},u=0,s=0,c=0;return e&&t(e),n.toRgb=function(){return{r:u,g:s,b:c}},n.toHsv=function(){return e=u,t=s,n=c,o=0,(i=iw(e/=255,iw(t/=255,n/=255)))===(a=aw(e,aw(t,n)))?{h:0,s:0,v:100*(o=i)}:(r=(a-i)/a,{h:uw(60*((e===i?3:n===i?1:5)-(e===i?t-n:n===i?e-t:n-e)/((o=a)-i))),s:uw(100*r),v:uw(100*o)});var e,t,n,r,o,i,a},n.toHex=function(){function e(e){return 1<(e=parseInt(e,10).toString(16)).length?e:"0"+e}return"#"+e(u)+e(s)+e(c)},n.parse=t,n},ImageUploader:function(n){var e=Hv(),r=Wv(n,e);return{upload:function(e,t){return r.upload(e,(t=void 0===t||t)?$v(n):void 0)}}}},dom:{EventUtils:ai,Sizzle:aa,DomQuery:Wa,TreeWalker:Rr,TextSeeker:Nu,DOMUtils:Ja,ScriptLoader:tu,RangeUtils:Of,Serializer:Xh,StyleSheetLoader:wr,ControlSelection:Cf,BookmarkManager:Fl,Selection:Lh,Event:ai.Event},html:{Styles:ro,Entities:Go,Node:Ud,Schema:to,SaxParser:Gd,DomParser:$h,Writer:tm,Serializer:nm},Env:xt,AddOnManager:su,Annotator:Ml,Formatter:Jv,UndoManager:Zv,EditorCommands:W1,WindowManager:Pv,NotificationManager:uv,EditorObservable:mx,Shortcuts:yx,Editor:kx,FocusManager:Ld,EditorManager:Hx,DOM:Ja.DOM,ScriptLoader:tu.ScriptLoader,PluginManager:Ov,ThemeManager:Bv,IconManager:_v,Resource:Zx,trim:Et.trim,isArray:Et.isArray,is:Et.is,toArray:Et.toArray,makeMap:Et.makeMap,each:Et.each,map:Et.map,grep:Et.grep,inArray:Et.inArray,extend:Et.extend,create:Et.create,walk:Et.walk,createNS:Et.createNS,resolve:Et.resolve,explode:Et.explode,_addCacheSuffix:Et._addCacheSuffix,isOpera:xt.opera,isWebKit:xt.webkit,isIE:xt.ie,isGecko:xt.gecko,isMac:xt.mac},vw=Et.extend(Hx,hw),bw=vw;window.tinymce=bw,window.tinyMCE=bw,function(e){if("object"==typeof module)try{module.exports=e}catch(e){}}(vw)}();
\ No newline at end of file

From f6a2b8a9ef51e4cb0a707ee39b3b9a86df124d3f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Oct 2021 21:22:08 +0200
Subject: [PATCH 025/412] Read and archive bit visible in book table

---
 cps/db.py                     | 63 +++++++++++++++++++++++------------
 cps/editbooks.py              | 11 +++++-
 cps/shelf.py                  |  1 +
 cps/static/js/table.js        | 26 +++++++++++++--
 cps/templates/book_table.html | 11 +++---
 cps/templates/detail.html     |  2 +-
 cps/web.py                    | 54 +++++++++++++++++++++++-------
 7 files changed, 124 insertions(+), 44 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 64abbe1b3..cf4ab50cc 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -605,13 +605,6 @@ class CalibreDB():
             filter(self.common_filters(allow_show_archived)).first()
 
     def get_book_read_archived(self, book_id, read_column, allow_show_archived=False):
-        # Add missing relationships for inter database joins
-        #setattr(Books, "is_archived",
-        #        relationship(ub.ArchivedBook,
-        #                     uselist=False,
-        #                     foreign_keys=ub.ArchivedBook.book_id,
-        #                     primaryjoin=and_(Books.id == ub.ArchivedBook.book_id,
-        #                                      int(current_user.id) == ub.ArchivedBook.user_id)))
         if not read_column:
             bd = (self.session.query(Books, ub.ReadBook.read_status, ub.ArchivedBook.is_archived).select_from(Books)
                   .join(ub.ReadBook, and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == book_id),
@@ -704,11 +697,13 @@ class CalibreDB():
         return outcome[offset:offset + limit]
 
     # Fill indexpage with all requested data from database
-    def fill_indexpage(self, page, pagesize, database, db_filter, order, *join):
-        return self.fill_indexpage_with_archived_books(page, pagesize, db_filter, order, False, database, join)
+    def fill_indexpage(self, page, pagesize, database, db_filter, order,
+                       join_archive_read=False, config_read_column=0, *join):
+        return self.fill_indexpage_with_archived_books(page, database, pagesize, db_filter, order, False,
+                                                       join_archive_read, config_read_column, *join)
 
-    def fill_indexpage_with_archived_books(self, page, pagesize, db_filter, order, allow_show_archived,
-                                           *args):
+    def fill_indexpage_with_archived_books(self, page, database, pagesize, db_filter, order, allow_show_archived,
+                                           join_archive_read, config_read_column, *join):
         pagesize = pagesize or self.config.config_books_per_page
         if current_user.show_detail_random():
             randm = self.session.query(Books) \
@@ -717,15 +712,26 @@ class CalibreDB():
                 .limit(self.config.config_random_books).all()
         else:
             randm = false()
-        if len(args) > 1:
-            if isinstance(args[0], DeclarativeMeta):
-                query = self.session.query(args[0])
+        if join_archive_read:
+            if not config_read_column:
+                query = (self.session.query(database, ub.ReadBook.read_status, ub.ArchivedBook.is_archived)
+                         .select_from(Books)
+                         .outerjoin(ub.ReadBook,
+                               and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id)))
             else:
-                query = self.session.query(*args[0])
-            join = args[1]
+                try:
+                    read_column = cc_classes[config_read_column]
+                    query = (self.session.query(database, read_column.value, ub.ArchivedBook.is_archived)
+                             .select_from(Books)
+                             .outerjoin(read_column, read_column.book == Books.id))
+                except (KeyError, AttributeError):
+                    log.error("Custom Column No.%d is not existing in calibre database", read_column)
+                    # Skip linking read column and return None instead of read status
+                    query =self.session.query(database, None, ub.ArchivedBook.is_archived)
+            query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
+                                                          int(current_user.id) == ub.ArchivedBook.user_id))
         else:
-            join = tuple()
-            query = self.session.query(args)
+            query = self.session.query(database)
         off = int(int(pagesize) * (page - 1))
 
         indx = len(join)
@@ -793,16 +799,29 @@ class CalibreDB():
         return self.session.query(Books) \
             .filter(and_(Books.authors.any(and_(*q)), func.lower(Books.title).ilike("%" + title + "%"))).first()
 
-    def search_query(self, term, *join):
+    def search_query(self, term, config_read_column, *join):
         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 + "%")))
-        query = (self.session.query(Books, ub.ArchivedBook.is_archived)
-                 .outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
-                                             int(current_user.id) == ub.ArchivedBook.user_id)))
+        if not config_read_column:
+            query = (self.session.query(Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(Books)
+                     .outerjoin(ub.ReadBook, and_(Books.id == ub.ReadBook.book_id,
+                                                  int(current_user.id) == ub.ReadBook.user_id)))
+        else:
+            try:
+                read_column = cc_classes[config_read_column]
+                query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value).select_from(Books)
+                         .outerjoin(read_column, read_column.book == Books.id))
+            except (KeyError, AttributeError):
+                log.error("Custom Column No.%d is not existing in calibre database", config_read_column)
+                # Skip linking read column
+                query = self.session.query(Books, ub.ArchivedBook.is_archived, None)
+        query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
+                                                      int(current_user.id) == ub.ArchivedBook.user_id))
+
         if len(join) == 6:
             query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5])
         if len(join) == 3:
diff --git a/cps/editbooks.py b/cps/editbooks.py
index e466e22c9..383422b17 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1161,13 +1161,22 @@ def edit_list_book(param):
         ret = Response(json.dumps({'success': True,
                                    'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
                        mimetype='application/json')
+    elif param =='is_archive':
+        # ToDo save
+        ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
+                       mimetype='application/json')
+    elif param =='read_status':
+        # ToDo save
+        ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
+                       mimetype='application/json')
     elif param.startswith("custom_column_"):
         new_val = dict()
         new_val[param] = vals['value']
         edit_single_cc_data(book.id, book, param[14:], new_val)
         ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
                        mimetype='application/json')
-
+    else:
+        return _("Parameter not found"), 400
     book.last_modified = datetime.utcnow()
     try:
         calibre_db.session.commit()
diff --git a/cps/shelf.py b/cps/shelf.py
index 09fe8dd4e..2f9269a41 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -425,6 +425,7 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
                                                            db.Books,
                                                            ub.BookShelf.shelf == shelf_id,
                                                            [ub.BookShelf.order.asc()],
+                                                           False, 0,
                                                            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) \
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index d1a328622..ba664d64f 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -631,14 +631,21 @@ function singleUserFormatter(value, row) {
 }
 
 function checkboxFormatter(value, row){
-    if(value & this.column)
+    if (value & this.column)
         return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" checked onchange="checkboxChange(this, ' + row.id + ', \'' + this.name + '\', ' + this.column + ')">';
     else
         return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" onchange="checkboxChange(this, ' + row.id + ', \'' + this.name + '\', ' + this.column + ')">';
 }
+function bookCheckboxFormatter(value, row){
+    if (value)
+        return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" checked onchange="BookCheckboxChange(this, ' + row.id + ', \'' + this.name + '\')">';
+    else
+        return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" onchange="BookCheckboxChange(this, ' + row.id + ', \'' + this.name + '\')">';
+}
+
 
 function singlecheckboxFormatter(value, row){
-    if(value)
+    if (value)
         return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" checked onchange="checkboxChange(this, ' + row.id + ', \'' + this.name + '\', 0)">';
     else
         return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" onchange="checkboxChange(this, ' + row.id + ', \'' + this.name + '\', 0)">';
@@ -790,7 +797,7 @@ function handleListServerResponse (data) {
 function checkboxChange(checkbox, userId, field, field_index) {
     $.ajax({
         method: "post",
-        url: window.location.pathname + "/../../ajax/editlistusers/" + field,
+        url: getPath() + "/ajax/editlistusers/" + field,
         data: {"pk": userId, "field_index": field_index, "value": checkbox.checked},
         error: function(data) {
             handleListServerResponse([{type:"danger", message:data.responseText}])
@@ -799,6 +806,19 @@ function checkboxChange(checkbox, userId, field, field_index) {
     });
 }
 
+function BookCheckboxChange(checkbox, userId, field) {
+    $.ajax({
+        method: "post",
+        url: getPath() + "/ajax/editbooks/" + field,
+        data: {"pk": userId, "value": checkbox.checked},
+        error: function(data) {
+            handleListServerResponse([{type:"danger", message:data.responseText}])
+        },
+        success: handleListServerResponse
+    });
+}
+
+
 function selectHeader(element, field) {
     if (element.value !== "None") {
         confirmDialog(element.id, "GeneralChangeModal", 0, function () {
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index 6f8e87471..bbdbe50de 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -14,13 +14,13 @@
 >{{ show_text }}</th>
 {%- endmacro %}
 
-{% macro book_checkbox_row(parameter, array_field, show_text, element, value, sort) -%}
-<!--th data-name="{{parameter}}" data-field="{{parameter}}"
+{% macro book_checkbox_row(parameter, show_text, sort) -%}
+<th data-name="{{parameter}}" data-field="{{parameter}}"
     {% if sort %}data-sortable="true" {% endif %}
     data-visible="{{visiblility.get(parameter)}}"
-    data-formatter="checkboxFormatter">
+    data-formatter="bookCheckboxFormatter">
     {{show_text}}
-</th-->
+</th>
 {%- endmacro %}
 
 
@@ -71,7 +71,8 @@
             <!--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, true) }}
             <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('editbook.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
-                <!-- data-editable-formatter="comment_display" -->
+            {{ book_checkbox_row('is_archived', _('Enter Archiv Status'), false)}}
+            {{ book_checkbox_row('read_status', _('Enter Read Status'), false)}}
             {% for c in cc %}
               {% if c.datatype == "int" %}
                 <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 00c6ca962..919afaffd 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -228,7 +228,7 @@
             <form id="archived_form" action="{{ url_for('web.toggle_archived', book_id=entry.id)}}" method="POST">
               <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
               <label class="block-label">
-                <input id="archived_cb" data-checked="{{_('Restore from archive')}}" data-unchecked="{{_('Add to archive')}}" type="checkbox" {% if entry.is_archived.is_archived %}checked{% endif %} >
+                <input id="archived_cb" data-checked="{{_('Restore from archive')}}" data-unchecked="{{_('Add to archive')}}" type="checkbox" {% if entry.is_archived %}checked{% endif %} >
                 <span>{{_('Archived')}}</span>
               </label>
             </form>
diff --git a/cps/web.py b/cps/web.py
index 0fcb43f45..6892ec9e3 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -406,6 +406,7 @@ def render_books_list(data, sort, book_id, page):
     else:
         website = data or "newest"
         entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order,
+                                                                False, 0,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -419,6 +420,7 @@ def render_rated_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.ratings.any(db.Ratings.rating > 9),
                                                                 order,
+                                                                False, 0,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -482,6 +484,7 @@ def render_downloaded_books(page, order, user_id):
                                                             db.Books,
                                                             ub.Downloads.user_id == user_id,
                                                             order,
+                                                            False, 0,
                                                             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()) \
@@ -504,6 +507,7 @@ def render_author_books(page, author_id, order):
                                                         db.Books,
                                                         db.Books.authors.any(db.Authors.id == author_id),
                                                         [order[0], db.Series.name, db.Books.series_index],
+                                                        False, 0,
                                                         db.books_series_link,
                                                         db.Books.id == db.books_series_link.c.book,
                                                         db.Series)
@@ -535,6 +539,7 @@ def render_publisher_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.publishers.any(db.Publishers.id == book_id),
                                                                 [db.Series.name, order[0], db.Books.series_index],
+                                                                False, 0,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -590,6 +595,7 @@ def render_category_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.tags.any(db.Tags.id == book_id),
                                                                 [order[0], db.Series.name, db.Books.series_index],
+                                                                False, 0,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -625,6 +631,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                                                                 db.Books,
                                                                 db_filter,
                                                                 order,
+                                                                False, 0,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series,
@@ -639,6 +646,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                                                                     db.Books,
                                                                     db_filter,
                                                                     order,
+                                                                    False, 0,
                                                                     db.books_series_link,
                                                                     db.Books.id == db.books_series_link.c.book,
                                                                     db.Series,
@@ -676,11 +684,12 @@ def render_archived_books(page, order):
 
     archived_filter = db.Books.id.in_(archived_book_ids)
 
-    entries, random, pagination = calibre_db.fill_indexpage_with_archived_books(page, 0,
+    entries, random, pagination = calibre_db.fill_indexpage_with_archived_books(page, db.Books,
+                                                                                0,
                                                                                 archived_filter,
                                                                                 order,
                                                                                 True,
-                                                                                db.Books)
+                                                                                False, 0)
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
@@ -770,7 +779,7 @@ def list_books():
     sort = request.args.get("sort", "id")
     order = request.args.get("order", "").lower()
     state = None
-    join = list()
+    join = tuple()
 
     if sort == "state":
         state = json.loads(request.args.get("state", "[]"))
@@ -802,27 +811,48 @@ def list_books():
             books = calibre_db.search_query(search).all()
             filtered_count = len(books)
         else:
-            books = (calibre_db.session.query(db.Books,ub.ArchivedBook.is_archived)
-                     .outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                      int(current_user.id) == ub.ArchivedBook.user_id))
+            if not config.config_read_column:
+                books = (calibre_db.session.query(db.Books, ub.ReadBook.read_status, ub.ArchivedBook.is_archived)
+                         .select_from(db.Books)
+                         .outerjoin(ub.ReadBook,
+                                    and_(ub.ReadBook.user_id == int(current_user.id),
+                                         ub.ReadBook.book_id == db.Books.id)))
+            else:
+                try:
+                    read_column = db.cc_classes[config.config_read_column]
+                    books = (calibre_db.session.query(db.Books, read_column.value, ub.ArchivedBook.is_archived)
+                             .select_from(db.Books)
+                             .outerjoin(read_column, read_column.book == db.Books.id))
+                except (KeyError, AttributeError):
+                    log.error("Custom Column No.%d is not existing in calibre database", read_column)
+                    # Skip linking read column and return None instead of read status
+                    books =calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
+            books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                          int(current_user.id) == ub.ArchivedBook.user_id))
                      .filter(calibre_db.common_filters()).all())
         entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True)
     elif search:
-        entries, filtered_count, __ = calibre_db.get_search_results(search, off, order, limit, *tuple(join))
+        entries, filtered_count, __ = calibre_db.get_search_results(search,
+                                                                    off,
+                                                                    order,
+                                                                    limit,
+                                                                    config.config_read_column,
+                                                                    *join)
     else:
-        join.append(ub.ArchivedBook)
-        join.append(and_(db.Books.id == ub.ArchivedBook.book_id,int(current_user.id) == ub.ArchivedBook.user_id))
         entries, __, __ = calibre_db.fill_indexpage((int(off) / (int(limit)) + 1),
                                                     limit,
-                                                    (db.Books, ub.ArchivedBook),
+                                                    db.Books,
                                                     True,
                                                     order,
-                                                    *tuple(join))
+                                                    True,
+                                                    config.config_read_column,
+                                                    *join)
 
     result = list()
     for entry in entries:
         val = entry[0]
-        val.is_archived = entry[1] == True
+        val.read_status = entry[1] == ub.ReadBook.STATUS_FINISHED
+        val.is_archived = entry[2] is True
         for index in range(0, len(val.languages)):
             val.languages[index].language_name = isoLanguages.get_language_name(get_locale(), val.languages[
                 index].lang_code)

From 3a1a32f053d2ab94d0768ab2aca6b7aeaea2bb3b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 25 Oct 2021 19:16:52 +0200
Subject: [PATCH 026/412] Update infinite scrolling javascript

---
 cps/static/js/libs/context.min.js   | 11 +++++------
 cps/static/js/libs/intention.min.js | 19 +++++++++----------
 cps/static/js/libs/plugins.js       | 14 +++++++++-----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/cps/static/js/libs/context.min.js b/cps/static/js/libs/context.min.js
index 21bbcc5f3..6d0ed1994 100644
--- a/cps/static/js/libs/context.min.js
+++ b/cps/static/js/libs/context.min.js
@@ -1,10 +1,9 @@
-/*! intention.js v0.9.7.3
+/*! intention.js v0.9.9
 * http://intentionjs.com/
 *
 * context.js
 *
-* Copyright 2011, 2013 Dowjones and other contributors
-* Released under the MIT license
-*
-*/
-!function(){"use strict";var a=function(a,b){function c(a,b){var c=new Date,d=null;return function(e){var f=new Date;if(b>f-c){d&&window.clearTimeout(d);var g=function(b){return function(){a(b)}};return d=window.setTimeout(g(e),b),!1}a(e),c=f}}var d,e,f=new b;return f.responsive([{name:"base"}]).respond("base"),d=f.responsive({ID:"width",contexts:[{name:"standard",min:840},{name:"tablet",min:510},{name:"mobile",min:0}],matcher:function(a,b){return"string"==typeof a?a===b.name:a>=b.min},measure:function(b){return"string"==typeof b?b:a(window).width()}}),e=f.responsive({ID:"orientation",contexts:[{name:"portrait",rotation:0},{name:"landscape",rotation:90}],matcher:function(a,b){return a===b.rotation},measure:function(){var a=Math.abs(window.orientation);return a>0&&(a=180-a),a}}),f.responsive({ID:"touch",contexts:[{name:"touch"}],matcher:function(){return"ontouchstart"in window}}).respond(),f.responsive({ID:"highres",contexts:[{name:"highres"}],matcher:function(){return window.devicePixelRatio>1}}).respond(),a(window).on("resize",c(d.respond,100)).on("orientationchange",d.respond).on("orientationchange",e.respond),d.respond(),e.respond(),a(function(){f.elements(document)}),f};!function(a,b){"function"==typeof define&&define.amd?define("context",["jquery","intention"],b):a.intent=b(a.jQuery,a.Intention)}(this,function(b,c){return a(b,c)})}.call(this);
\ No newline at end of file
+* Copyright 2008, 2013
+* Dowjones and other contributors.
+* Released under the MIT license.
+**/ !function(){"use strict";var a=function(a,b){function c(a,b){var c=new Date,d=null;return function(e){var f=new Date;if(b>f-c){d&&window.clearTimeout(d);var g=function(b){return function(){a(b)}};return d=window.setTimeout(g(e),b),!1}a(e),c=f}}var d,e,f=new b;return f.responsive([{name:"base"}]).respond("base"),d=f.responsive({ID:"width",contexts:[{name:"standard",min:840},{name:"tablet",min:510},{name:"mobile",min:0}],matcher:function(a,b){return"string"==typeof a?a===b.name:a>=b.min},measure:function(b){return"string"==typeof b?b:a(window).width()}}),e=f.responsive({ID:"orientation",contexts:[{name:"portrait",rotation:0},{name:"landscape",rotation:90}],matcher:function(a,b){return a===b.rotation},measure:function(){var a=Math.abs(window.orientation);return a>0&&(a=180-a),a}}),f.responsive({ID:"touch",contexts:[{name:"touch"}],matcher:function(){return"ontouchstart"in window}}).respond(),f.responsive({ID:"highres",contexts:[{name:"highres"}],matcher:function(){return window.devicePixelRatio>1}}).respond(),a(window).on("resize",c(d.respond,100)).on("orientationchange",d.respond).on("orientationchange",e.respond),d.respond(),e.respond(),a(function(){f.elements(document)}),f};!function(a,b){"function"==typeof define&&define.amd?define("context",["jquery","intention"],b):a.intent=b(a.jQuery,a.Intention)}(this,function(b,c){return a(b,c)})}.call(this);
diff --git a/cps/static/js/libs/intention.min.js b/cps/static/js/libs/intention.min.js
index ad3f1d53d..1efea0cfc 100644
--- a/cps/static/js/libs/intention.min.js
+++ b/cps/static/js/libs/intention.min.js
@@ -1,10 +1,9 @@
-/*! intention.js v0.9.7.3
-* http://intentionjs.com/
-*
-* intention.js
-*
-* Copyright 2011, 2013 Dowjones and other contributors
-* Released under the MIT license
-*
-*/
-!function(a,b){"use strict";"function"==typeof define&&define.amd?define("intention",["jquery","underscore"],b):a.Intention=b(a.jQuery,a._)}(this,function(a,b){"use strict";var c=function(c){var d=b.extend(this,c,{_listeners:{},contexts:[],elms:a(),axes:{},priority:[]});return d};return c.prototype={responsive:function d(a,c){var e,f="abcdefghijklmnopqrstuvwxyz0123456789",g="";for(e=0;5>e;e++)g+=f[Math.floor(Math.random()*f.length)];var h={matcher:function(a,b){return a===b.name},measure:b.identity,ID:g};if(b.isObject(c)===!1&&(c={}),b.isArray(a)&&b.isArray(a[0].contexts))return b.each(a,function(a){d.apply(this,a)},this),void 0;b.isArray(a)===!1&&b.isObject(a)?c=a:c.contexts=a,c=b.extend({},h,c),this.on("_"+c.ID+":",b.bind(function(a){this.axes=this._contextualize(c.ID,a.context,this.axes),this._respond(this.axes,this.elms)},this));var i={ID:c.ID,current:null,contexts:c.contexts,respond:b.bind(this._responder(c.ID,c.contexts,c.matcher,c.measure),this)};return this.axes[c.ID]=i,this.axes.__keys__=this.priority,this.priority.unshift(c.ID),i},elements:function(c){return c||(c=document),a("[data-intent],[intent],[data-in],[in]",c).each(b.bind(function(b,c){this.add(a(c))},this)),this},add:function(c,d){var e;return d||(d={}),c.each(b.bind(function(c,f){var g=!1;this.elms.each(function(a,b){return f===b?(g=!0,!1):!0}),g===!1&&(e=this._fillSpec(b.extend(d,this._attrsToSpec(f.attributes,this.axes))),this._makeChanges(a(f),e,this.axes),this.elms.push({elm:f,spec:e}))},this)),this},remove:function(a){var b=this.elms;return a.each(function(a,c){b.each(function(a,d){return c===d.elm?(b.splice(a,1),!1):!0})}),this},is:function(a){var c=this.axes;return b.some(c.__keys__,function(b){return a===c[b].current})},current:function(a){return this.axes.hasOwnProperty(a)?this.axes[a].current:!1},on:function(a,b){var c=a.split(" "),d=0;for(d;d<c.length;d++)void 0===this._listeners[c[d]]&&(this._listeners[c[d]]=[]),this._listeners[c[d]].push(b);return this},off:function(a,c){if(b.isArray(this._listeners[a])){var d,e=this._listeners[a];for(d=0;e.length;d++)if(e[d]===c){e.splice(d,1);break}}return this},_responder:function(a,c,d,e){var f;return function(){var g=e.apply(this,arguments);return b.every(c,function(c){return d(g,c)?void 0===f||c.name!==f.name?(f=c,this._emitter({_type:"_"+a+":",context:f.name},f,this)._emitter({_type:a+":",context:f.name},f,this)._emitter(b.extend({},{_type:a+":"+f.name},f),f,this)._emitter(b.extend({},{_type:f.name},f),f,this),!1):!1:!0},this),this}},_emitter:function(a){if("string"==typeof a&&(a={_type:a}),a.target||(a.target=this),!a._type)throw new Error(a._type+" is not a supported event.");if(b.isArray(this._listeners[a._type])){var c,d=this._listeners[a._type];for(c=0;c<d.length;c++)d[c].apply(this,arguments)}return this},_fillSpec:function(a){var c=function(c){b.each(a,function(a,d){b.each(a,function(a,b){c(a,b,d)})})},d={};return c(function(a){b.isObject(a)&&b.each(a,function(a,b){d[b]=""})}),c(function(c,e,f){b.isObject(c)&&(a[f][e]=b.extend({},d,c))}),a},_assocAxis:function(a,c){var d=!1;return b.every(c.__keys__,function(e){return d===!1?(b.every(c[e].contexts,function(b){return b.name===a?(d=e,!1):!0}),!0):!1}),d},_makeSpec:function(a,b,c,d,e){var f;return void 0!==e[a]?(f=e[a],void 0===f[b]&&(f[b]={})):(f={},f[b]={},e[a]=f),f[b][c]=d,e},_attrsToSpec:function(a,c){var d={},e=new RegExp("^(data-)?(in|intent)-(([a-zA-Z0-9][a-zA-Z0-9]*:)?([a-zA-Z0-9]*))-([A-Za-z:-]+)"),f=new RegExp("^(data-)?(in|intent)-([a-zA-Z0-9][_a-zA-Z0-9]*):$");return b.each(a,function(a){var g,h=a.name.match(e);if(null!==h){if(h=h.slice(-3),g=h[0],void 0===h[0]){if(h[0]=this._assocAxis(h[1],c),h[0]===!1)return}else h[0]=h[0].replace(/:$/,"");h.push(a.value),h.push(d),d=this._makeSpec.apply(this,h)}else f.test(a.name)&&(g=a.name.match(f)[3],b.each(c[g].contexts,function(b){this._makeSpec(g,b.name,"class",b.name+" "+a.value,d)},this))},this),d},_contextSpec:function(a,b){return b.hasOwnProperty(a.axis)&&b[a.axis].hasOwnProperty(a.ctx)?b[a.axis][a.ctx]:{}},_resolveSpecs:function(c,d){var e={},f=["append","prepend","before","after"];return b.each(c,function(c){b.each(this._contextSpec(c,d),function(c,d){"class"===d?(e[d]||(e[d]=[]),e[d]=b.union(e[d],c.split(" "))):void 0!==e.move&&""!==e.move.value||-1===a.inArray(d,f)?(void 0===e[d]||""===e[d])&&(e[d]=c):e.move={value:c,placement:d}},this)},this),e},_currentContexts:function(a){var c=[];return b.each(a.__keys__,function(b){return null!==a[b].current?(c.push({ctx:a[b].current,axis:b}),void 0):void 0}),c},_removeClasses:function(a,c){var d=[];return b.each(c.__keys__,function(e){var f=c[e];b.each(f.contexts,function(c){if(c.name!==f.current){var e,g=this._contextSpec({axis:f.ID,ctx:c.name},a);void 0!==g&&void 0!==g["class"]&&(e=g["class"].split(" "),void 0!==e&&(d=b.union(d,e)))}},this)},this),d},_contextConfig:function(a,b){return this._resolveSpecs(this._currentContexts(b),a,b)},_makeChanges:function(c,d,e){if(b.isEmpty(e)===!1){var f=this._contextConfig(d,e);b.each(f,function(f,g){if("move"===g)(d.__placement__!==f.placement||d.__move__!==f.value)&&(a(f.value)[f.placement](c),d.__placement__=f.placement,d.__move__=f.value);else if("class"===g){var h=c.attr("class")||"";h=b.union(f,b.difference(h.split(" "),this._removeClasses(d,e))),c.attr("class",h.join(" "))}else c.attr(g,f)},this)}return c},_respond:function(c,d){d.each(b.bind(function(b,d){var e=a(d.elm);this._makeChanges(e,d.spec,c),e.trigger("intent",this)},this))},_contextualize:function(a,b,c){return c[a].current=b,c},_axis_test_pattern:new RegExp("^_[a-zA-Z0-9]"),_axis_match_pattern:new RegExp("^_([a-zA-Z0-9][_a-zA-Z0-9]*)"),_trim_pattern:new RegExp("^s+|s+$","g")},c});
\ No newline at end of file
+/*! intention.js v0.9.9 
+* http://intentionjs.com/ 
+* 
+* intention.js 
+* 
+* Copyright 2008, 2013
+* Dowjones and other contributors. 
+* Released under the MIT license. 
+**/ !function(a,b){"use strict";"function"==typeof define&&define.amd?define("intention",["jquery","underscore"],b):a.Intention=b(a.jQuery,a._)}(this,function(a,b){"use strict";var c=function(c){var d=b.extend(this,c,{_listeners:{},contexts:[],elms:a(),axes:{},priority:[]});return d};return c.prototype={responsive:function d(a,c){var e,f="abcdefghijklmnopqrstuvwxyz0123456789",g=f.length,h="";for(e=0;5>e;e++)h+=f[Math.floor(Math.random()*g)];var i={matcher:function(a,b){return a===b.name},measure:b.identity,ID:h};if(b.isObject(c)===!1&&(c={}),b.isArray(a)&&b.isArray(a[0].contexts))return b.each(a,function(a){d.apply(this,a)},this),void 0;b.isArray(a)===!1&&b.isObject(a)?c=a:c.contexts=a,c=b.extend({},i,c),this.on("_"+c.ID+":",b.bind(function(a){this.axes=this._contextualize(c.ID,a.context,this.axes),this._respond(this.axes,this.elms)},this));var j={ID:c.ID,current:null,contexts:c.contexts,respond:b.bind(this._responder(c.ID,c.contexts,c.matcher,c.measure),this)};return this.axes[c.ID]=j,this.axes.__keys__=this.priority,this.priority.unshift(c.ID),j},elements:function(c){return c||(c=document),a("[data-intent],[intent],[data-in],[in]",c).each(b.bind(function(b,c){this.add(a(c))},this)),this},add:function(c,d){var e;return d||(d={}),c.each(b.bind(function(c,f){var g=!1;this.elms.each(function(a,b){return f===b.elm?(g=!0,!1):!0}),g===!1&&(e=this._fillSpec(b.extend(d,this._attrsToSpec(f.attributes,this.axes))),this._makeChanges(a(f),e,this.axes),this.elms.push({elm:f,spec:e}))},this)),this},remove:function(a){var b=this.elms;return a.each(function(a,c){b.each(function(a,d){return c===d.elm?(b.splice(a,1),!1):!0})}),this},is:function(a){var c=this.axes;return b.some(c.__keys__,function(b){return a===c[b].current})},current:function(a){return this.axes.hasOwnProperty(a)?this.axes[a].current:!1},on:function(a,b){var c=a.split(" "),d=0;for(d;d<c.length;d++)void 0===this._listeners[c[d]]&&(this._listeners[c[d]]=[]),this._listeners[c[d]].push(b);return this},off:function(a,c){if(b.isArray(this._listeners[a])){var d=this._listeners[a],e=0;for(e;e<d.length;e++)if(d[e]===c){d.splice(e,1);break}}return this},_responder:function(a,c,d,e){var f;return function(){var g=e.apply(this,arguments);return b.every(c,function(c){return d(g,c)?void 0===f||c.name!==f.name?(f=c,this._emitter({_type:"_"+a+":",context:f.name},f,this)._emitter({_type:a+":",context:f.name},f,this)._emitter(b.extend({},{_type:a+":"+f.name},f),f,this)._emitter(b.extend({},{_type:f.name},f),f,this),!1):!1:!0},this),this}},_emitter:function(a){if("string"==typeof a&&(a={_type:a}),a.target||(a.target=this),!a._type)throw new Error(a._type+" is not a supported event.");if(b.isArray(this._listeners[a._type])){var c,d=this._listeners[a._type];for(c=0;c<d.length;c++)d[c].apply(this,arguments)}return this},_fillSpec:function(a){var c=function(c){b.each(a,function(a,d){b.each(a,function(a,b){c(a,b,d)})})},d={};return c(function(a){b.isObject(a)&&b.each(a,function(a,b){d[b]=""})}),c(function(c,e,f){b.isObject(c)&&(a[f][e]=b.extend({},d,c))}),a},_assocAxis:function(a,c){var d=!1;return b.every(c.__keys__,function(e){return d===!1?(b.every(c[e].contexts,function(b){return b.name===a?(d=e,!1):!0}),!0):!1}),d},_makeSpec:function(a,b,c,d,e){var f;return void 0!==e[a]?(f=e[a],void 0===f[b]&&(f[b]={})):(f={},f[b]={},e[a]=f),f[b][c]=d,e},_attrsToSpec:function(a,c){var d={},e=new RegExp("^(data-)?(in|intent)-(([a-zA-Z0-9][a-zA-Z0-9]*:)?([a-zA-Z0-9]*))-([A-Za-z:-]+)"),f=new RegExp("^(data-)?(in|intent)-([a-zA-Z0-9][_a-zA-Z0-9]*):$");return b.each(a,function(a){var g,h=a.name.match(e);if(null!==h){if(h=h.slice(-3),g=h[0],void 0===h[0]||""===h[0]){if(h[0]=this._assocAxis(h[1],c),h[0]===!1)return}else h[0]=h[0].replace(/:$/,"");h.push(a.value),h.push(d),d=this._makeSpec.apply(this,h)}else f.test(a.name)&&(g=a.name.match(f)[3],b.each(c[g].contexts,function(b){this._makeSpec(g,b.name,"class",b.name+" "+a.value,d)},this))},this),d},_contextSpec:function(a,b){return b.hasOwnProperty(a.axis)&&b[a.axis].hasOwnProperty(a.ctx)?b[a.axis][a.ctx]:{}},_resolveSpecs:function(c,d){var e={},f=["append","prepend","before","after"];return b.each(c,function(c){b.each(this._contextSpec(c,d),function(c,d){"class"===d?(e[d]||(e[d]=[]),e[d]=b.union(e[d],c.split(" "))):void 0!==e.move&&""!==e.move.value||-1===a.inArray(d,f)?(void 0===e[d]||""===e[d])&&(e[d]=c):e.move={value:c,placement:d}},this)},this),e},_currentContexts:function(a){var c=[];return b.each(a.__keys__,function(b){return null!==a[b].current?(c.push({ctx:a[b].current,axis:b}),void 0):void 0}),c},_removeClasses:function(a,c){var d=[];return b.each(c.__keys__,function(e){var f=c[e];b.each(f.contexts,function(c){if(c.name!==f.current){var e,g=this._contextSpec({axis:f.ID,ctx:c.name},a);void 0!==g&&void 0!==g["class"]&&(e=g["class"].split(" "),void 0!==e&&(d=b.union(d,e)))}},this)},this),d},_contextConfig:function(a,b){return this._resolveSpecs(this._currentContexts(b),a,b)},_makeChanges:function(c,d,e){if(b.isEmpty(e)===!1){var f=this._contextConfig(d,e);b.each(f,function(f,g){if("move"===g)(d.__placement__!==f.placement||d.__move__!==f.value)&&(a(f.value)[f.placement](c),d.__placement__=f.placement,d.__move__=f.value);else if("class"===g){var h=c.attr("class")||"";h=b.union(f,b.difference(h.split(" "),this._removeClasses(d,e))),c.attr("class",h.join(" "))}else c.attr(g,f)},this)}return c},_respond:function(c,d){d.each(b.bind(function(b,d){var e=a(d.elm);this._makeChanges(e,d.spec,c),e.trigger("intent",this)},this))},_contextualize:function(a,b,c){return c[a].current=b,c},_axis_test_pattern:new RegExp("^_[a-zA-Z0-9]"),_axis_match_pattern:new RegExp("^_([a-zA-Z0-9][_a-zA-Z0-9]*)"),_trim_pattern:new RegExp("^s+|s+$","g")},c});
diff --git a/cps/static/js/libs/plugins.js b/cps/static/js/libs/plugins.js
index 024f0b8ce..ee7ded315 100644
--- a/cps/static/js/libs/plugins.js
+++ b/cps/static/js/libs/plugins.js
@@ -27,18 +27,22 @@
 }:"function"==typeof t?function(e){return t(e.element)}:function(e){return o(e.element,t)}},l.updateSortData=function(t){var e;t?(t=n.makeArray(t),e=this.getItems(t)):e=this.items,this._getSorters(),this._updateItemsSortData(e)},l._getSorters=function(){var t=this.options.getSortData;for(var e in t){var i=t[e];this._sorters[e]=f(i)}},l._updateItemsSortData=function(t){for(var e=t&&t.length,i=0;e&&i<e;i++){var o=t[i];o.updateSortData()}};var f=function(){function t(t){if("string"!=typeof t)return t;var i=h(t).split(" "),o=i[0],n=o.match(/^\[(.+)\]$/),s=n&&n[1],r=e(s,o),a=d.sortDataParsers[i[1]];return t=a?function(t){return t&&a(r(t))}:function(t){return t&&r(t)}}function e(t,e){return t?function(e){return e.getAttribute(t)}:function(t){var i=t.querySelector(e);return i&&i.textContent}}return t}();d.sortDataParsers={parseInt:function(t){return parseInt(t,10)},parseFloat:function(t){return parseFloat(t)}},l._sort=function(){if(this.options.sortBy){var t=n.makeArray(this.options.sortBy);this._getIsSameSortBy(t)||(this.sortHistory=t.concat(this.sortHistory));var e=a(this.sortHistory,this.options.sortAscending);this.filteredItems.sort(e)}},l._getIsSameSortBy=function(t){for(var e=0;e<t.length;e++)if(t[e]!=this.sortHistory[e])return!1;return!0},l._mode=function(){var t=this.options.layoutMode,e=this.modes[t];if(!e)throw new Error("No layout mode: "+t);return e.options=this.options[t],e},l._resetLayout=function(){e.prototype._resetLayout.call(this),this._mode()._resetLayout()},l._getItemLayoutPosition=function(t){return this._mode()._getItemLayoutPosition(t)},l._manageStamp=function(t){this._mode()._manageStamp(t)},l._getContainerSize=function(){return this._mode()._getContainerSize()},l.needsResizeLayout=function(){return this._mode().needsResizeLayout()},l.appended=function(t){var e=this.addItems(t);if(e.length){var i=this._filterRevealAdded(e);this.filteredItems=this.filteredItems.concat(i)}},l.prepended=function(t){var e=this._itemize(t);if(e.length){this._resetLayout(),this._manageStamps();var i=this._filterRevealAdded(e);this.layoutItems(this.filteredItems),this.filteredItems=i.concat(this.filteredItems),this.items=e.concat(this.items)}},l._filterRevealAdded=function(t){var e=this._filter(t);return this.hide(e.needHide),this.reveal(e.matches),this.layoutItems(e.matches,!0),e.matches},l.insert=function(t){var e=this.addItems(t);if(e.length){var i,o,n=e.length;for(i=0;i<n;i++)o=e[i],this.element.appendChild(o.element);var s=this._filter(e).matches;for(i=0;i<n;i++)e[i].isLayoutInstant=!0;for(this.arrange(),i=0;i<n;i++)delete e[i].isLayoutInstant;this.reveal(s)}};var c=l.remove;return l.remove=function(t){t=n.makeArray(t);var e=this.getItems(t);c.call(this,t);for(var i=e&&e.length,o=0;i&&o<i;o++){var s=e[o];n.removeFrom(this.filteredItems,s)}},l.shuffle=function(){for(var t=0;t<this.items.length;t++){var e=this.items[t];e.sortData.random=Math.random()}this.options.sortBy="random",this._sort(),this._layout()},l._noTransition=function(t,e){var i=this.options.transitionDuration;this.options.transitionDuration=0;var o=t.apply(this,e);return this.options.transitionDuration=i,o},l.getFilteredItemElements=function(){return this.filteredItems.map(function(t){return t.element})},d});
 
 /*!
- * Infinite Scroll PACKAGED v3.0.5
+ * Infinite Scroll PACKAGED v4.0.1
  * Automatically add next page
  *
  * Licensed GPLv3 for open source use
  * or Infinite Scroll Commercial License for commercial use
  *
  * https://infinite-scroll.com
- * Copyright 2018 Metafizzy
+ * Copyright 2018-2020 Metafizzy
  */
-
-!function(t,e){"function"==typeof define&&define.amd?define("jquery-bridget/jquery-bridget",["jquery"],function(i){return e(t,i)}):"object"==typeof module&&module.exports?module.exports=e(t,require("jquery")):t.jQueryBridget=e(t,t.jQuery)}(window,function(t,e){"use strict";function i(i,r,l){function a(t,e,n){var o,r="$()."+i+'("'+e+'")';return t.each(function(t,a){var h=l.data(a,i);if(!h)return void s(i+" not initialized. Cannot call methods, i.e. "+r);var c=h[e];if(!c||"_"==e.charAt(0))return void s(r+" is not a valid method");var u=c.apply(h,n);o=void 0===o?u:o}),void 0!==o?o:t}function h(t,e){t.each(function(t,n){var o=l.data(n,i);o?(o.option(e),o._init()):(o=new r(n,e),l.data(n,i,o))})}l=l||e||t.jQuery,l&&(r.prototype.option||(r.prototype.option=function(t){l.isPlainObject(t)&&(this.options=l.extend(!0,this.options,t))}),l.fn[i]=function(t){if("string"==typeof t){var e=o.call(arguments,1);return a(this,t,e)}return h(this,t),this},n(l))}function n(t){!t||t&&t.bridget||(t.bridget=i)}var o=Array.prototype.slice,r=t.console,s="undefined"==typeof r?function(){}:function(t){r.error(t)};return n(e||t.jQuery),i}),function(t,e){"function"==typeof define&&define.amd?define("ev-emitter/ev-emitter",e):"object"==typeof module&&module.exports?module.exports=e():t.EvEmitter=e()}("undefined"!=typeof window?window:this,function(){function t(){}var e=t.prototype;return e.on=function(t,e){if(t&&e){var i=this._events=this._events||{},n=i[t]=i[t]||[];return n.indexOf(e)==-1&&n.push(e),this}},e.once=function(t,e){if(t&&e){this.on(t,e);var i=this._onceEvents=this._onceEvents||{},n=i[t]=i[t]||{};return n[e]=!0,this}},e.off=function(t,e){var i=this._events&&this._events[t];if(i&&i.length){var n=i.indexOf(e);return n!=-1&&i.splice(n,1),this}},e.emitEvent=function(t,e){var i=this._events&&this._events[t];if(i&&i.length){i=i.slice(0),e=e||[];for(var n=this._onceEvents&&this._onceEvents[t],o=0;o<i.length;o++){var r=i[o],s=n&&n[r];s&&(this.off(t,r),delete n[r]),r.apply(this,e)}return this}},e.allOff=function(){delete this._events,delete this._onceEvents},t}),function(t,e){"use strict";"function"==typeof define&&define.amd?define("desandro-matches-selector/matches-selector",e):"object"==typeof module&&module.exports?module.exports=e():t.matchesSelector=e()}(window,function(){"use strict";var t=function(){var t=window.Element.prototype;if(t.matches)return"matches";if(t.matchesSelector)return"matchesSelector";for(var e=["webkit","moz","ms","o"],i=0;i<e.length;i++){var n=e[i],o=n+"MatchesSelector";if(t[o])return o}}();return function(e,i){return e[t](i)}}),function(t,e){"function"==typeof define&&define.amd?define("fizzy-ui-utils/utils",["desandro-matches-selector/matches-selector"],function(i){return e(t,i)}):"object"==typeof module&&module.exports?module.exports=e(t,require("desandro-matches-selector")):t.fizzyUIUtils=e(t,t.matchesSelector)}(window,function(t,e){var i={};i.extend=function(t,e){for(var i in e)t[i]=e[i];return t},i.modulo=function(t,e){return(t%e+e)%e};var n=Array.prototype.slice;i.makeArray=function(t){if(Array.isArray(t))return t;if(null===t||void 0===t)return[];var e="object"==typeof t&&"number"==typeof t.length;return e?n.call(t):[t]},i.removeFrom=function(t,e){var i=t.indexOf(e);i!=-1&&t.splice(i,1)},i.getParent=function(t,i){for(;t.parentNode&&t!=document.body;)if(t=t.parentNode,e(t,i))return t},i.getQueryElement=function(t){return"string"==typeof t?document.querySelector(t):t},i.handleEvent=function(t){var e="on"+t.type;this[e]&&this[e](t)},i.filterFindElements=function(t,n){t=i.makeArray(t);var o=[];return t.forEach(function(t){if(t instanceof HTMLElement){if(!n)return void o.push(t);e(t,n)&&o.push(t);for(var i=t.querySelectorAll(n),r=0;r<i.length;r++)o.push(i[r])}}),o},i.debounceMethod=function(t,e,i){i=i||100;var n=t.prototype[e],o=e+"Timeout";t.prototype[e]=function(){var t=this[o];clearTimeout(t);var e=arguments,r=this;this[o]=setTimeout(function(){n.apply(r,e),delete r[o]},i)}},i.docReady=function(t){var e=document.readyState;"complete"==e||"interactive"==e?setTimeout(t):document.addEventListener("DOMContentLoaded",t)},i.toDashed=function(t){return t.replace(/(.)([A-Z])/g,function(t,e,i){return e+"-"+i}).toLowerCase()};var o=t.console;return i.htmlInit=function(e,n){i.docReady(function(){var r=i.toDashed(n),s="data-"+r,l=document.querySelectorAll("["+s+"]"),a=document.querySelectorAll(".js-"+r),h=i.makeArray(l).concat(i.makeArray(a)),c=s+"-options",u=t.jQuery;h.forEach(function(t){var i,r=t.getAttribute(s)||t.getAttribute(c);try{i=r&&JSON.parse(r)}catch(l){return void(o&&o.error("Error parsing "+s+" on "+t.className+": "+l))}var a=new e(t,i);u&&u.data(t,n,a)})})},i}),function(t,e){"function"==typeof define&&define.amd?define("infinite-scroll/js/core",["ev-emitter/ev-emitter","fizzy-ui-utils/utils"],function(i,n){return e(t,i,n)}):"object"==typeof module&&module.exports?module.exports=e(t,require("ev-emitter"),require("fizzy-ui-utils")):t.InfiniteScroll=e(t,t.EvEmitter,t.fizzyUIUtils)}(window,function(t,e,i){function n(t,e){var s=i.getQueryElement(t);if(!s)return void console.error("Bad element for InfiniteScroll: "+(s||t));if(t=s,t.infiniteScrollGUID){var l=r[t.infiniteScrollGUID];return l.option(e),l}this.element=t,this.options=i.extend({},n.defaults),this.option(e),o&&(this.$element=o(this.element)),this.create()}var o=t.jQuery,r={};n.defaults={},n.create={},n.destroy={};var s=n.prototype;i.extend(s,e.prototype);var l=0;s.create=function(){var t=this.guid=++l;this.element.infiniteScrollGUID=t,r[t]=this,this.pageIndex=1,this.loadCount=0,this.updateGetPath();var e=this.getPath&&this.getPath();if(!e)return void console.error("Disabling InfiniteScroll");this.updateGetAbsolutePath(),this.log("initialized",[this.element.className]),this.callOnInit();for(var i in n.create)n.create[i].call(this)},s.option=function(t){i.extend(this.options,t)},s.callOnInit=function(){var t=this.options.onInit;t&&t.call(this,this)},s.dispatchEvent=function(t,e,i){this.log(t,i);var n=e?[e].concat(i):i;if(this.emitEvent(t,n),o&&this.$element){t+=".infiniteScroll";var r=t;if(e){var s=o.Event(e);s.type=t,r=s}this.$element.trigger(r,i)}};var a={initialized:function(t){return"on "+t},request:function(t){return"URL: "+t},load:function(t,e){return(t.title||"")+". URL: "+e},error:function(t,e){return t+". URL: "+e},append:function(t,e,i){return i.length+" items. URL: "+e},last:function(t,e){return"URL: "+e},history:function(t,e){return"URL: "+e},pageIndex:function(t,e){return"current page determined to be: "+t+" from "+e}};s.log=function(t,e){if(this.options.debug){var i="[InfiniteScroll] "+t,n=a[t];n&&(i+=". "+n.apply(this,e)),console.log(i)}},s.updateMeasurements=function(){this.windowHeight=t.innerHeight;var e=this.element.getBoundingClientRect();this.top=e.top+t.pageYOffset},s.updateScroller=function(){var e=this.options.elementScroll;if(!e)return void(this.scroller=t);if(this.scroller=e===!0?this.element:i.getQueryElement(e),!this.scroller)throw"Unable to find elementScroll: "+e},s.updateGetPath=function(){var t=this.options.path;if(!t)return void console.error("InfiniteScroll path option required. Set as: "+t);var e=typeof t;if("function"==e)return void(this.getPath=t);var i="string"==e&&t.match("{{#}}");return i?void this.updateGetPathTemplate(t):void this.updateGetPathSelector(t)},s.updateGetPathTemplate=function(t){this.getPath=function(){var e=this.pageIndex+1;return t.replace("{{#}}",e)}.bind(this);var e=t.replace("{{#}}","(\\d\\d?\\d?)"),i=new RegExp(e),n=location.href.match(i);n&&(this.pageIndex=parseInt(n[1],10),this.log("pageIndex",[this.pageIndex,"template string"]))};var h=[/^(.*?\/?page\/?)(\d\d?\d?)(.*?$)/,/^(.*?\/?\?page=)(\d\d?\d?)(.*?$)/,/(.*?)(\d\d?\d?)(?!.*\d)(.*?$)/];return s.updateGetPathSelector=function(t){var e=document.querySelector(t);if(!e)return void console.error("Bad InfiniteScroll path option. Next link not found: "+t);for(var i,n,o=e.getAttribute("href"),r=0;o&&r<h.length;r++){n=h[r];var s=o.match(n);if(s){i=s.slice(1);break}}return i?(this.isPathSelector=!0,this.getPath=function(){var t=this.pageIndex+1;return i[0]+t+i[2]}.bind(this),this.pageIndex=parseInt(i[1],10)-1,void this.log("pageIndex",[this.pageIndex,"next link"])):void console.error("InfiniteScroll unable to parse next link href: "+o)},s.updateGetAbsolutePath=function(){var t=this.getPath(),e=t.match(/^http/)||t.match(/^\//);if(e)return void(this.getAbsolutePath=this.getPath);var i=location.pathname,n=i.substring(0,i.lastIndexOf("/"));this.getAbsolutePath=function(){return n+"/"+this.getPath()}},n.create.hideNav=function(){var t=i.getQueryElement(this.options.hideNav);t&&(t.style.display="none",this.nav=t)},n.destroy.hideNav=function(){this.nav&&(this.nav.style.display="")},s.destroy=function(){this.allOff();for(var t in n.destroy)n.destroy[t].call(this);delete this.element.infiniteScrollGUID,delete r[this.guid],o&&this.$element&&o.removeData(this.element,"infiniteScroll")},n.throttle=function(t,e){e=e||200;var i,n;return function(){var o=+new Date,r=arguments,s=function(){i=o,t.apply(this,r)}.bind(this);i&&o<i+e?(clearTimeout(n),n=setTimeout(s,e)):s()}},n.data=function(t){t=i.getQueryElement(t);var e=t&&t.infiniteScrollGUID;return e&&r[e]},n.setJQuery=function(t){o=t},i.htmlInit(n,"infinite-scroll"),s._init=function(){},o&&o.bridget&&o.bridget("infiniteScroll",n),n}),function(t,e){"function"==typeof define&&define.amd?define("infinite-scroll/js/page-load",["./core"],function(i){return e(t,i)}):"object"==typeof module&&module.exports?module.exports=e(t,require("./core")):e(t,t.InfiniteScroll)}(window,function(t,e){function i(t){for(var e=document.createDocumentFragment(),i=0;t&&i<t.length;i++)e.appendChild(t[i]);return e}function n(t){for(var e=t.querySelectorAll("script"),i=0;i<e.length;i++){var n=e[i],r=document.createElement("script");o(n,r),r.innerHTML=n.innerHTML,n.parentNode.replaceChild(r,n)}}function o(t,e){for(var i=t.attributes,n=0;n<i.length;n++){var o=i[n];e.setAttribute(o.name,o.value)}}function r(t,e,i,n){var o=new XMLHttpRequest;o.open("GET",t,!0),o.responseType=e||"",o.setRequestHeader("X-Requested-With","XMLHttpRequest"),o.onload=function(){if(200==o.status)i(o.response);else{var t=new Error(o.statusText);n(t)}},o.onerror=function(){var e=new Error("Network error requesting "+t);n(e)},o.send()}var s=e.prototype;return e.defaults.loadOnScroll=!0,e.defaults.checkLastPage=!0,e.defaults.responseType="document",e.create.pageLoad=function(){this.canLoad=!0,this.on("scrollThreshold",this.onScrollThresholdLoad),this.on("load",this.checkLastPage),this.options.outlayer&&this.on("append",this.onAppendOutlayer)},s.onScrollThresholdLoad=function(){this.options.loadOnScroll&&this.loadNextPage()},s.loadNextPage=function(){if(!this.isLoading&&this.canLoad){var t=this.getAbsolutePath();this.isLoading=!0;var e=function(e){this.onPageLoad(e,t)}.bind(this),i=function(e){this.onPageError(e,t)}.bind(this);r(t,this.options.responseType,e,i),this.dispatchEvent("request",null,[t])}},s.onPageLoad=function(t,e){return this.options.append||(this.isLoading=!1),this.pageIndex++,this.loadCount++,this.dispatchEvent("load",null,[t,e]),this.appendNextPage(t,e),t},s.appendNextPage=function(t,e){var n=this.options.append,o="document"==this.options.responseType;if(o&&n){var r=t.querySelectorAll(n),s=i(r),l=function(){this.appendItems(r,s),this.isLoading=!1,this.dispatchEvent("append",null,[t,e,r])}.bind(this);this.options.outlayer?this.appendOutlayerItems(s,l):l()}},s.appendItems=function(t,e){t&&t.length&&(e=e||i(t),n(e),this.element.appendChild(e))},s.appendOutlayerItems=function(i,n){var o=e.imagesLoaded||t.imagesLoaded;return o?void o(i,n):(console.error("[InfiniteScroll] imagesLoaded required for outlayer option"),void(this.isLoading=!1))},s.onAppendOutlayer=function(t,e,i){this.options.outlayer.appended(i)},s.checkLastPage=function(t,e){var i=this.options.checkLastPage;if(i){var n=this.options.path;if("function"==typeof n){var o=this.getPath();if(!o)return void this.lastPageReached(t,e)}var r;if("string"==typeof i?r=i:this.isPathSelector&&(r=n),r&&t.querySelector){var s=t.querySelector(r);s||this.lastPageReached(t,e)}}},s.lastPageReached=function(t,e){this.canLoad=!1,this.dispatchEvent("last",null,[t,e])},s.onPageError=function(t,e){return this.isLoading=!1,this.canLoad=!1,this.dispatchEvent("error",null,[t,e]),t},e.create.prefill=function(){if(this.options.prefill){var t=this.options.append;if(!t)return void console.error("append option required for prefill. Set as :"+t);this.updateMeasurements(),this.updateScroller(),this.isPrefilling=!0,this.on("append",this.prefill),this.once("error",this.stopPrefill),this.once("last",this.stopPrefill),this.prefill()}},s.prefill=function(){var t=this.getPrefillDistance();this.isPrefilling=t>=0,this.isPrefilling?(this.log("prefill"),this.loadNextPage()):this.stopPrefill()},s.getPrefillDistance=function(){return this.options.elementScroll?this.scroller.clientHeight-this.scroller.scrollHeight:this.windowHeight-this.element.clientHeight},s.stopPrefill=function(){this.log("stopPrefill"),this.off("append",this.prefill)},e}),function(t,e){"function"==typeof define&&define.amd?define("infinite-scroll/js/scroll-watch",["./core","fizzy-ui-utils/utils"],function(i,n){return e(t,i,n)}):"object"==typeof module&&module.exports?module.exports=e(t,require("./core"),require("fizzy-ui-utils")):e(t,t.InfiniteScroll,t.fizzyUIUtils)}(window,function(t,e,i){var n=e.prototype;return e.defaults.scrollThreshold=400,e.create.scrollWatch=function(){this.pageScrollHandler=this.onPageScroll.bind(this),this.resizeHandler=this.onResize.bind(this);var t=this.options.scrollThreshold,e=t||0===t;e&&this.enableScrollWatch()},e.destroy.scrollWatch=function(){this.disableScrollWatch()},n.enableScrollWatch=function(){this.isScrollWatching||(this.isScrollWatching=!0,this.updateMeasurements(),this.updateScroller(),this.on("last",this.disableScrollWatch),this.bindScrollWatchEvents(!0))},n.disableScrollWatch=function(){this.isScrollWatching&&(this.bindScrollWatchEvents(!1),delete this.isScrollWatching)},n.bindScrollWatchEvents=function(e){var i=e?"addEventListener":"removeEventListener";this.scroller[i]("scroll",this.pageScrollHandler),t[i]("resize",this.resizeHandler)},n.onPageScroll=e.throttle(function(){var t=this.getBottomDistance();t<=this.options.scrollThreshold&&this.dispatchEvent("scrollThreshold")}),n.getBottomDistance=function(){return this.options.elementScroll?this.getElementBottomDistance():this.getWindowBottomDistance()},n.getWindowBottomDistance=function(){var e=this.top+this.element.clientHeight,i=t.pageYOffset+this.windowHeight;return e-i},n.getElementBottomDistance=function(){var t=this.scroller.scrollHeight,e=this.scroller.scrollTop+this.scroller.clientHeight;return t-e},n.onResize=function(){this.updateMeasurements()},i.debounceMethod(e,"onResize",150),e}),function(t,e){"function"==typeof define&&define.amd?define("infinite-scroll/js/history",["./core","fizzy-ui-utils/utils"],function(i,n){return e(t,i,n)}):"object"==typeof module&&module.exports?module.exports=e(t,require("./core"),require("fizzy-ui-utils")):e(t,t.InfiniteScroll,t.fizzyUIUtils)}(window,function(t,e,i){var n=e.prototype;e.defaults.history="replace";var o=document.createElement("a");return e.create.history=function(){if(this.options.history){o.href=this.getAbsolutePath();var t=o.origin||o.protocol+"//"+o.host,e=t==location.origin;return e?void(this.options.append?this.createHistoryAppend():this.createHistoryPageLoad()):void console.error("[InfiniteScroll] cannot set history with different origin: "+o.origin+" on "+location.origin+" . History behavior disabled.")}},n.createHistoryAppend=function(){this.updateMeasurements(),this.updateScroller(),this.scrollPages=[{top:0,path:location.href,title:document.title}],this.scrollPageIndex=0,this.scrollHistoryHandler=this.onScrollHistory.bind(this),this.unloadHandler=this.onUnload.bind(this),this.scroller.addEventListener("scroll",this.scrollHistoryHandler),this.on("append",this.onAppendHistory),this.bindHistoryAppendEvents(!0)},n.bindHistoryAppendEvents=function(e){var i=e?"addEventListener":"removeEventListener";this.scroller[i]("scroll",this.scrollHistoryHandler),t[i]("unload",this.unloadHandler)},n.createHistoryPageLoad=function(){this.on("load",this.onPageLoadHistory)},e.destroy.history=n.destroyHistory=function(){var t=this.options.history&&this.options.append;t&&this.bindHistoryAppendEvents(!1)},n.onAppendHistory=function(t,e,i){if(i&&i.length){var n=i[0],r=this.getElementScrollY(n);o.href=e,this.scrollPages.push({top:r,path:o.href,title:t.title})}},n.getElementScrollY=function(t){return this.options.elementScroll?this.getElementElementScrollY(t):this.getElementWindowScrollY(t)},n.getElementWindowScrollY=function(e){var i=e.getBoundingClientRect();return i.top+t.pageYOffset},n.getElementElementScrollY=function(t){return t.offsetTop-this.top},n.onScrollHistory=function(){for(var t,e,i=this.getScrollViewY(),n=0;n<this.scrollPages.length;n++){var o=this.scrollPages[n];if(o.top>=i)break;t=n,e=o}t!=this.scrollPageIndex&&(this.scrollPageIndex=t,this.setHistory(e.title,e.path))},i.debounceMethod(e,"onScrollHistory",150),n.getScrollViewY=function(){return this.options.elementScroll?this.scroller.scrollTop+this.scroller.clientHeight/2:t.pageYOffset+this.windowHeight/2},n.setHistory=function(t,e){var i=this.options.history,n=i&&history[i+"State"];n&&(history[i+"State"](null,t,e),this.options.historyTitle&&(document.title=t),this.dispatchEvent("history",null,[t,e]))},n.onUnload=function(){var e=this.scrollPageIndex;if(0!==e){var i=this.scrollPages[e],n=t.pageYOffset-i.top+this.top;this.destroyHistory(),scrollTo(0,n)}},n.onPageLoadHistory=function(t,e){this.setHistory(t.title,e)},e}),function(t,e){"function"==typeof define&&define.amd?define("infinite-scroll/js/button",["./core","fizzy-ui-utils/utils"],function(i,n){return e(t,i,n)}):"object"==typeof module&&module.exports?module.exports=e(t,require("./core"),require("fizzy-ui-utils")):e(t,t.InfiniteScroll,t.fizzyUIUtils)}(window,function(t,e,i){function n(t,e){this.element=t,this.infScroll=e,this.clickHandler=this.onClick.bind(this),this.element.addEventListener("click",this.clickHandler),e.on("request",this.disable.bind(this)),e.on("load",this.enable.bind(this)),e.on("error",this.hide.bind(this)),e.on("last",this.hide.bind(this))}return e.create.button=function(){var t=i.getQueryElement(this.options.button);if(t)return void(this.button=new n(t,this))},e.destroy.button=function(){this.button&&this.button.destroy()},n.prototype.onClick=function(t){t.preventDefault(),this.infScroll.loadNextPage()},n.prototype.enable=function(){this.element.removeAttribute("disabled")},n.prototype.disable=function(){this.element.disabled="disabled"},n.prototype.hide=function(){this.element.style.display="none"},n.prototype.destroy=function(){this.element.removeEventListener("click",this.clickHandler)},e.Button=n,e}),function(t,e){"function"==typeof define&&define.amd?define("infinite-scroll/js/status",["./core","fizzy-ui-utils/utils"],function(i,n){return e(t,i,n)}):"object"==typeof module&&module.exports?module.exports=e(t,require("./core"),require("fizzy-ui-utils")):e(t,t.InfiniteScroll,t.fizzyUIUtils)}(window,function(t,e,i){function n(t){r(t,"none")}function o(t){r(t,"block")}function r(t,e){t&&(t.style.display=e)}var s=e.prototype;return e.create.status=function(){var t=i.getQueryElement(this.options.status);t&&(this.statusElement=t,this.statusEventElements={request:t.querySelector(".infinite-scroll-request"),error:t.querySelector(".infinite-scroll-error"),last:t.querySelector(".infinite-scroll-last")},this.on("request",this.showRequestStatus),this.on("error",this.showErrorStatus),this.on("last",this.showLastStatus),this.bindHideStatus("on"))},s.bindHideStatus=function(t){var e=this.options.append?"append":"load";this[t](e,this.hideAllStatus)},s.showRequestStatus=function(){this.showStatus("request")},s.showErrorStatus=function(){this.showStatus("error")},s.showLastStatus=function(){this.showStatus("last"),this.bindHideStatus("off")},s.showStatus=function(t){o(this.statusElement),this.hideStatusEventElements();var e=this.statusEventElements[t];o(e)},s.hideAllStatus=function(){n(this.statusElement),this.hideStatusEventElements()},s.hideStatusEventElements=function(){for(var t in this.statusEventElements){var e=this.statusEventElements[t];n(e)}},e}),function(t,e){"function"==typeof define&&define.amd?define(["infinite-scroll/js/core","infinite-scroll/js/page-load","infinite-scroll/js/scroll-watch","infinite-scroll/js/history","infinite-scroll/js/button","infinite-scroll/js/status"],e):"object"==typeof module&&module.exports&&(module.exports=e(require("./core"),require("./page-load"),require("./scroll-watch"),require("./history"),require("./button"),require("./status")))}(window,function(t){return t}),function(t,e){"use strict";"function"==typeof define&&define.amd?define("imagesloaded/imagesloaded",["ev-emitter/ev-emitter"],function(i){return e(t,i)}):"object"==typeof module&&module.exports?module.exports=e(t,require("ev-emitter")):t.imagesLoaded=e(t,t.EvEmitter)}("undefined"!=typeof window?window:this,function(t,e){function i(t,e){for(var i in e)t[i]=e[i];return t}function n(t){if(Array.isArray(t))return t;var e="object"==typeof t&&"number"==typeof t.length;return e?h.call(t):[t]}function o(t,e,r){if(!(this instanceof o))return new o(t,e,r);var s=t;return"string"==typeof t&&(s=document.querySelectorAll(t)),s?(this.elements=n(s),this.options=i({},this.options),"function"==typeof e?r=e:i(this.options,e),r&&this.on("always",r),this.getImages(),l&&(this.jqDeferred=new l.Deferred),void setTimeout(this.check.bind(this))):void a.error("Bad element for imagesLoaded "+(s||t))}function r(t){this.img=t}function s(t,e){this.url=t,this.element=e,this.img=new Image}var l=t.jQuery,a=t.console,h=Array.prototype.slice;o.prototype=Object.create(e.prototype),o.prototype.options={},o.prototype.getImages=function(){this.images=[],this.elements.forEach(this.addElementImages,this)},o.prototype.addElementImages=function(t){"IMG"==t.nodeName&&this.addImage(t),this.options.background===!0&&this.addElementBackgroundImages(t);var e=t.nodeType;if(e&&c[e]){for(var i=t.querySelectorAll("img"),n=0;n<i.length;n++){var o=i[n];this.addImage(o)}if("string"==typeof this.options.background){var r=t.querySelectorAll(this.options.background);for(n=0;n<r.length;n++){var s=r[n];this.addElementBackgroundImages(s)}}}};var c={1:!0,9:!0,11:!0};return o.prototype.addElementBackgroundImages=function(t){var e=getComputedStyle(t);if(e)for(var i=/url\((['"])?(.*?)\1\)/gi,n=i.exec(e.backgroundImage);null!==n;){var o=n&&n[2];o&&this.addBackground(o,t),n=i.exec(e.backgroundImage)}},o.prototype.addImage=function(t){var e=new r(t);this.images.push(e)},o.prototype.addBackground=function(t,e){var i=new s(t,e);this.images.push(i)},o.prototype.check=function(){function t(t,i,n){setTimeout(function(){e.progress(t,i,n)})}var e=this;return this.progressedCount=0,this.hasAnyBroken=!1,this.images.length?void this.images.forEach(function(e){e.once("progress",t),e.check()}):void this.complete()},o.prototype.progress=function(t,e,i){this.progressedCount++,this.hasAnyBroken=this.hasAnyBroken||!t.isLoaded,this.emitEvent("progress",[this,t,e]),this.jqDeferred&&this.jqDeferred.notify&&this.jqDeferred.notify(this,t),this.progressedCount==this.images.length&&this.complete(),this.options.debug&&a&&a.log("progress: "+i,t,e)},o.prototype.complete=function(){var t=this.hasAnyBroken?"fail":"done";if(this.isComplete=!0,this.emitEvent(t,[this]),this.emitEvent("always",[this]),this.jqDeferred){var e=this.hasAnyBroken?"reject":"resolve";this.jqDeferred[e](this)}},r.prototype=Object.create(e.prototype),r.prototype.check=function(){var t=this.getIsImageComplete();return t?void this.confirm(0!==this.img.naturalWidth,"naturalWidth"):(this.proxyImage=new Image,this.proxyImage.addEventListener("load",this),this.proxyImage.addEventListener("error",this),this.img.addEventListener("load",this),this.img.addEventListener("error",this),void(this.proxyImage.src=this.img.src))},r.prototype.getIsImageComplete=function(){return this.img.complete&&this.img.naturalWidth},r.prototype.confirm=function(t,e){this.isLoaded=t,this.emitEvent("progress",[this,this.img,e])},r.prototype.handleEvent=function(t){var e="on"+t.type;this[e]&&this[e](t)},r.prototype.onload=function(){this.confirm(!0,"onload"),this.unbindEvents()},r.prototype.onerror=function(){this.confirm(!1,"onerror"),this.unbindEvents()},r.prototype.unbindEvents=function(){this.proxyImage.removeEventListener("load",this),this.proxyImage.removeEventListener("error",this),this.img.removeEventListener("load",this),this.img.removeEventListener("error",this)},s.prototype=Object.create(r.prototype),s.prototype.check=function(){this.img.addEventListener("load",this),this.img.addEventListener("error",this),this.img.src=this.url;var t=this.getIsImageComplete();t&&(this.confirm(0!==this.img.naturalWidth,"naturalWidth"),this.unbindEvents())},s.prototype.unbindEvents=function(){this.img.removeEventListener("load",this),this.img.removeEventListener("error",this)},s.prototype.confirm=function(t,e){this.isLoaded=t,this.emitEvent("progress",[this,this.element,e])},o.makeJQueryPlugin=function(e){e=e||t.jQuery,e&&(l=e,l.fn.imagesLoaded=function(t,e){var i=new o(this,t,e);return i.jqDeferred.promise(l(this))})},o.makeJQueryPlugin(),o});
-
+!function(t,e){"object"==typeof module&&module.exports?module.exports=e(t,require("jquery")):t.jQueryBridget=e(t,t.jQuery)}(window,(function(t,e){let i=t.console,n=void 0===i?function(){}:function(t){i.error(t)};return function(i,o,s){(s=s||e||t.jQuery)&&(o.prototype.option||(o.prototype.option=function(t){t&&(this.options=Object.assign(this.options||{},t))}),s.fn[i]=function(t,...e){return"string"==typeof t?function(t,e,o){let r,l=`$().${i}("${e}")`;return t.each((function(t,h){let a=s.data(h,i);if(!a)return void n(`${i} not initialized. Cannot call method ${l}`);let c=a[e];if(!c||"_"==e.charAt(0))return void n(`${l} is not a valid method`);let u=c.apply(a,o);r=void 0===r?u:r})),void 0!==r?r:t}(this,t,e):(r=t,this.each((function(t,e){let n=s.data(e,i);n?(n.option(r),n._init()):(n=new o(e,r),s.data(e,i,n))})),this);var r})}})),function(t,e){"object"==typeof module&&module.exports?module.exports=e():t.EvEmitter=e()}("undefined"!=typeof window?window:this,(function(){function t(){}let e=t.prototype;return e.on=function(t,e){if(!t||!e)return this;let i=this._events=this._events||{},n=i[t]=i[t]||[];return n.includes(e)||n.push(e),this},e.once=function(t,e){if(!t||!e)return this;this.on(t,e);let i=this._onceEvents=this._onceEvents||{};return(i[t]=i[t]||{})[e]=!0,this},e.off=function(t,e){let i=this._events&&this._events[t];if(!i||!i.length)return this;let n=i.indexOf(e);return-1!=n&&i.splice(n,1),this},e.emitEvent=function(t,e){let i=this._events&&this._events[t];if(!i||!i.length)return this;i=i.slice(0),e=e||[];let n=this._onceEvents&&this._onceEvents[t];for(let o of i){n&&n[o]&&(this.off(t,o),delete n[o]),o.apply(this,e)}return this},e.allOff=function(){return delete this._events,delete this._onceEvents,this},t})),function(t,e){"object"==typeof module&&module.exports?module.exports=e(t):t.fizzyUIUtils=e(t)}(this,(function(t){let e={extend:function(t,e){return Object.assign(t,e)},modulo:function(t,e){return(t%e+e)%e},makeArray:function(t){if(Array.isArray(t))return t;if(null==t)return[];return"object"==typeof t&&"number"==typeof t.length?[...t]:[t]},removeFrom:function(t,e){let i=t.indexOf(e);-1!=i&&t.splice(i,1)},getParent:function(t,e){for(;t.parentNode&&t!=document.body;)if((t=t.parentNode).matches(e))return t},getQueryElement:function(t){return"string"==typeof t?document.querySelector(t):t},handleEvent:function(t){let e="on"+t.type;this[e]&&this[e](t)},filterFindElements:function(t,i){return(t=e.makeArray(t)).filter((t=>t instanceof HTMLElement)).reduce(((t,e)=>{if(!i)return t.push(e),t;e.matches(i)&&t.push(e);let n=e.querySelectorAll(i);return t=t.concat(...n)}),[])},debounceMethod:function(t,e,i){i=i||100;let n=t.prototype[e],o=e+"Timeout";t.prototype[e]=function(){clearTimeout(this[o]);let t=arguments;this[o]=setTimeout((()=>{n.apply(this,t),delete this[o]}),i)}},docReady:function(t){let e=document.readyState;"complete"==e||"interactive"==e?setTimeout(t):document.addEventListener("DOMContentLoaded",t)},toDashed:function(t){return t.replace(/(.)([A-Z])/g,(function(t,e,i){return e+"-"+i})).toLowerCase()}},i=t.console;return e.htmlInit=function(n,o){e.docReady((function(){let s="data-"+e.toDashed(o),r=document.querySelectorAll(`[${s}]`),l=t.jQuery;[...r].forEach((t=>{let e,r=t.getAttribute(s);try{e=r&&JSON.parse(r)}catch(e){return void(i&&i.error(`Error parsing ${s} on ${t.className}: ${e}`))}let h=new n(t,e);l&&l.data(t,o,h)}))}))},e})),function(t,e){"object"==typeof module&&module.exports?module.exports=e(t,require("ev-emitter"),require("fizzy-ui-utils")):t.InfiniteScroll=e(t,t.EvEmitter,t.fizzyUIUtils)}(window,(function(t,e,i){let n=t.jQuery,o={};function s(t,e){let r=i.getQueryElement(t);if(r){if((t=r).infiniteScrollGUID){let i=o[t.infiniteScrollGUID];return i.option(e),i}this.element=t,this.options={...s.defaults},this.option(e),n&&(this.$element=n(this.element)),this.create()}else console.error("Bad element for InfiniteScroll: "+(r||t))}s.defaults={},s.create={},s.destroy={};let r=s.prototype;Object.assign(r,e.prototype);let l=0;r.create=function(){let t=this.guid=++l;if(this.element.infiniteScrollGUID=t,o[t]=this,this.pageIndex=1,this.loadCount=0,this.updateGetPath(),this.getPath&&this.getPath()){this.updateGetAbsolutePath(),this.log("initialized",[this.element.className]),this.callOnInit();for(let t in s.create)s.create[t].call(this)}else console.error("Disabling InfiniteScroll")},r.option=function(t){Object.assign(this.options,t)},r.callOnInit=function(){let t=this.options.onInit;t&&t.call(this,this)},r.dispatchEvent=function(t,e,i){this.log(t,i);let o=e?[e].concat(i):i;if(this.emitEvent(t,o),!n||!this.$element)return;let s=t+=".infiniteScroll";if(e){let i=n.Event(e);i.type=t,s=i}this.$element.trigger(s,i)};let h={initialized:t=>`on ${t}`,request:t=>`URL: ${t}`,load:(t,e)=>`${t.title||""}. URL: ${e}`,error:(t,e)=>`${t}. URL: ${e}`,append:(t,e,i)=>`${i.length} items. URL: ${e}`,last:(t,e)=>`URL: ${e}`,history:(t,e)=>`URL: ${e}`,pageIndex:function(t,e){return`current page determined to be: ${t} from ${e}`}};r.log=function(t,e){if(!this.options.debug)return;let i=`[InfiniteScroll] ${t}`,n=h[t];n&&(i+=". "+n.apply(this,e)),console.log(i)},r.updateMeasurements=function(){this.windowHeight=t.innerHeight;let e=this.element.getBoundingClientRect();this.top=e.top+t.scrollY},r.updateScroller=function(){let e=this.options.elementScroll;if(e){if(this.scroller=!0===e?this.element:i.getQueryElement(e),!this.scroller)throw new Error(`Unable to find elementScroll: ${e}`)}else this.scroller=t},r.updateGetPath=function(){let t=this.options.path;if(!t)return void console.error(`InfiniteScroll path option required. Set as: ${t}`);let e=typeof t;"function"!=e?"string"==e&&t.match("{{#}}")?this.updateGetPathTemplate(t):this.updateGetPathSelector(t):this.getPath=t},r.updateGetPathTemplate=function(t){this.getPath=()=>{let e=this.pageIndex+1;return t.replace("{{#}}",e)};let e=t.replace(/(\\\?|\?)/,"\\?").replace("{{#}}","(\\d\\d?\\d?)"),i=new RegExp(e),n=location.href.match(i);n&&(this.pageIndex=parseInt(n[1],10),this.log("pageIndex",[this.pageIndex,"template string"]))};let a=[/^(.*?\/?page\/?)(\d\d?\d?)(.*?$)/,/^(.*?\/?\?page=)(\d\d?\d?)(.*?$)/,/(.*?)(\d\d?\d?)(?!.*\d)(.*?$)/],c=s.getPathParts=function(t){if(t)for(let e of a){let i=t.match(e);if(i){let[,t,e,n]=i;return{begin:t,index:e,end:n}}}};r.updateGetPathSelector=function(t){let e=document.querySelector(t);if(!e)return void console.error(`Bad InfiniteScroll path option. Next link not found: ${t}`);let i=e.getAttribute("href"),n=c(i);if(!n)return void console.error(`InfiniteScroll unable to parse next link href: ${i}`);let{begin:o,index:s,end:r}=n;this.isPathSelector=!0,this.getPath=()=>o+(this.pageIndex+1)+r,this.pageIndex=parseInt(s,10)-1,this.log("pageIndex",[this.pageIndex,"next link"])},r.updateGetAbsolutePath=function(){let t=this.getPath();if(t.match(/^http/)||t.match(/^\//))return void(this.getAbsolutePath=this.getPath);let{pathname:e}=location,i=t.match(/^\?/),n=e.substring(0,e.lastIndexOf("/")),o=i?e:n+"/";this.getAbsolutePath=()=>o+this.getPath()},s.create.hideNav=function(){let t=i.getQueryElement(this.options.hideNav);t&&(t.style.display="none",this.nav=t)},s.destroy.hideNav=function(){this.nav&&(this.nav.style.display="")},r.destroy=function(){this.allOff();for(let t in s.destroy)s.destroy[t].call(this);delete this.element.infiniteScrollGUID,delete o[this.guid],n&&this.$element&&n.removeData(this.element,"infiniteScroll")},s.throttle=function(t,e){let i,n;return e=e||200,function(){let o=+new Date,s=arguments,r=()=>{i=o,t.apply(this,s)};i&&o<i+e?(clearTimeout(n),n=setTimeout(r,e)):r()}},s.data=function(t){let e=(t=i.getQueryElement(t))&&t.infiniteScrollGUID;return e&&o[e]},s.setJQuery=function(t){n=t},i.htmlInit(s,"infinite-scroll"),r._init=function(){};let{jQueryBridget:u}=t;return n&&u&&u("infiniteScroll",s,n),s})),function(t,e){"object"==typeof module&&module.exports?module.exports=e(t,require("./core")):e(t,t.InfiniteScroll)}(window,(function(t,e){let i=e.prototype;Object.assign(e.defaults,{loadOnScroll:!0,checkLastPage:!0,responseBody:"text",domParseResponse:!0}),e.create.pageLoad=function(){this.canLoad=!0,this.on("scrollThreshold",this.onScrollThresholdLoad),this.on("load",this.checkLastPage),this.options.outlayer&&this.on("append",this.onAppendOutlayer)},i.onScrollThresholdLoad=function(){this.options.loadOnScroll&&this.loadNextPage()};let n=new DOMParser;function o(t){let e=document.createDocumentFragment();return t&&e.append(...t),e}return i.loadNextPage=function(){if(this.isLoading||!this.canLoad)return;let{responseBody:t,domParseResponse:e,fetchOptions:i}=this.options,o=this.getAbsolutePath();this.isLoading=!0,"function"==typeof i&&(i=i());let s=fetch(o,i).then((i=>{if(!i.ok){let t=new Error(i.statusText);return this.onPageError(t,o,i),{response:i}}return i[t]().then((s=>("text"==t&&e&&(s=n.parseFromString(s,"text/html")),204==i.status?(this.lastPageReached(s,o),{body:s,response:i}):this.onPageLoad(s,o,i))))})).catch((t=>{this.onPageError(t,o)}));return this.dispatchEvent("request",null,[o,s]),s},i.onPageLoad=function(t,e,i){return this.options.append||(this.isLoading=!1),this.pageIndex++,this.loadCount++,this.dispatchEvent("load",null,[t,e,i]),this.appendNextPage(t,e,i)},i.appendNextPage=function(t,e,i){let{append:n,responseBody:s,domParseResponse:r}=this.options;if(!("text"==s&&r)||!n)return{body:t,response:i};let l=t.querySelectorAll(n),h={body:t,response:i,items:l};if(!l||!l.length)return this.lastPageReached(t,e),h;let a=o(l),c=()=>(this.appendItems(l,a),this.isLoading=!1,this.dispatchEvent("append",null,[t,e,l,i]),h);return this.options.outlayer?this.appendOutlayerItems(a,c):c()},i.appendItems=function(t,e){t&&t.length&&(function(t){let e=t.querySelectorAll("script");for(let t of e){let e=document.createElement("script"),i=t.attributes;for(let t of i)e.setAttribute(t.name,t.value);e.innerHTML=t.innerHTML,t.parentNode.replaceChild(e,t)}}(e=e||o(t)),this.element.appendChild(e))},i.appendOutlayerItems=function(i,n){let o=e.imagesLoaded||t.imagesLoaded;return o?new Promise((function(t){o(i,(function(){let e=n();t(e)}))})):(console.error("[InfiniteScroll] imagesLoaded required for outlayer option"),void(this.isLoading=!1))},i.onAppendOutlayer=function(t,e,i){this.options.outlayer.appended(i)},i.checkLastPage=function(t,e){let i,{checkLastPage:n,path:o}=this.options;if(n){if("function"==typeof o){if(!this.getPath())return void this.lastPageReached(t,e)}"string"==typeof n?i=n:this.isPathSelector&&(i=o),i&&t.querySelector&&(t.querySelector(i)||this.lastPageReached(t,e))}},i.lastPageReached=function(t,e){this.canLoad=!1,this.dispatchEvent("last",null,[t,e])},i.onPageError=function(t,e,i){return this.isLoading=!1,this.canLoad=!1,this.dispatchEvent("error",null,[t,e,i]),t},e.create.prefill=function(){if(!this.options.prefill)return;let t=this.options.append;t?(this.updateMeasurements(),this.updateScroller(),this.isPrefilling=!0,this.on("append",this.prefill),this.once("error",this.stopPrefill),this.once("last",this.stopPrefill),this.prefill()):console.error(`append option required for prefill. Set as :${t}`)},i.prefill=function(){let t=this.getPrefillDistance();this.isPrefilling=t>=0,this.isPrefilling?(this.log("prefill"),this.loadNextPage()):this.stopPrefill()},i.getPrefillDistance=function(){return this.options.elementScroll?this.scroller.clientHeight-this.scroller.scrollHeight:this.windowHeight-this.element.clientHeight},i.stopPrefill=function(){this.log("stopPrefill"),this.off("append",this.prefill)},e})),function(t,e){"object"==typeof module&&module.exports?module.exports=e(t,require("./core"),require("fizzy-ui-utils")):e(t,t.InfiniteScroll,t.fizzyUIUtils)}(window,(function(t,e,i){let n=e.prototype;return Object.assign(e.defaults,{scrollThreshold:400}),e.create.scrollWatch=function(){this.pageScrollHandler=this.onPageScroll.bind(this),this.resizeHandler=this.onResize.bind(this);let t=this.options.scrollThreshold;(t||0===t)&&this.enableScrollWatch()},e.destroy.scrollWatch=function(){this.disableScrollWatch()},n.enableScrollWatch=function(){this.isScrollWatching||(this.isScrollWatching=!0,this.updateMeasurements(),this.updateScroller(),this.on("last",this.disableScrollWatch),this.bindScrollWatchEvents(!0))},n.disableScrollWatch=function(){this.isScrollWatching&&(this.bindScrollWatchEvents(!1),delete this.isScrollWatching)},n.bindScrollWatchEvents=function(e){let i=e?"addEventListener":"removeEventListener";this.scroller[i]("scroll",this.pageScrollHandler),t[i]("resize",this.resizeHandler)},n.onPageScroll=e.throttle((function(){this.getBottomDistance()<=this.options.scrollThreshold&&this.dispatchEvent("scrollThreshold")})),n.getBottomDistance=function(){let e,i;return this.options.elementScroll?(e=this.scroller.scrollHeight,i=this.scroller.scrollTop+this.scroller.clientHeight):(e=this.top+this.element.clientHeight,i=t.scrollY+this.windowHeight),e-i},n.onResize=function(){this.updateMeasurements()},i.debounceMethod(e,"onResize",150),e})),function(t,e){"object"==typeof module&&module.exports?module.exports=e(t,require("./core"),require("fizzy-ui-utils")):e(t,t.InfiniteScroll,t.fizzyUIUtils)}(window,(function(t,e,i){let n=e.prototype;Object.assign(e.defaults,{history:"replace"});let o=document.createElement("a");return e.create.history=function(){if(!this.options.history)return;o.href=this.getAbsolutePath(),(o.origin||o.protocol+"//"+o.host)==location.origin?this.options.append?this.createHistoryAppend():this.createHistoryPageLoad():console.error(`[InfiniteScroll] cannot set history with different origin: ${o.origin} on ${location.origin} . History behavior disabled.`)},n.createHistoryAppend=function(){this.updateMeasurements(),this.updateScroller(),this.scrollPages=[{top:0,path:location.href,title:document.title}],this.scrollPage=this.scrollPages[0],this.scrollHistoryHandler=this.onScrollHistory.bind(this),this.unloadHandler=this.onUnload.bind(this),this.scroller.addEventListener("scroll",this.scrollHistoryHandler),this.on("append",this.onAppendHistory),this.bindHistoryAppendEvents(!0)},n.bindHistoryAppendEvents=function(e){let i=e?"addEventListener":"removeEventListener";this.scroller[i]("scroll",this.scrollHistoryHandler),t[i]("unload",this.unloadHandler)},n.createHistoryPageLoad=function(){this.on("load",this.onPageLoadHistory)},e.destroy.history=n.destroyHistory=function(){this.options.history&&this.options.append&&this.bindHistoryAppendEvents(!1)},n.onAppendHistory=function(t,e,i){if(!i||!i.length)return;let n=i[0],s=this.getElementScrollY(n);o.href=e,this.scrollPages.push({top:s,path:o.href,title:t.title})},n.getElementScrollY=function(e){if(this.options.elementScroll)return e.offsetTop-this.top;return e.getBoundingClientRect().top+t.scrollY},n.onScrollHistory=function(){let t=this.getClosestScrollPage();t!=this.scrollPage&&(this.scrollPage=t,this.setHistory(t.title,t.path))},i.debounceMethod(e,"onScrollHistory",150),n.getClosestScrollPage=function(){let e,i;e=this.options.elementScroll?this.scroller.scrollTop+this.scroller.clientHeight/2:t.scrollY+this.windowHeight/2;for(let t of this.scrollPages){if(t.top>=e)break;i=t}return i},n.setHistory=function(t,e){let i=this.options.history;i&&history[i+"State"]&&(history[i+"State"](null,t,e),this.options.historyTitle&&(document.title=t),this.dispatchEvent("history",null,[t,e]))},n.onUnload=function(){if(0===this.scrollPage.top)return;let e=t.scrollY-this.scrollPage.top+this.top;this.destroyHistory(),scrollTo(0,e)},n.onPageLoadHistory=function(t,e){this.setHistory(t.title,e)},e})),function(t,e){"object"==typeof module&&module.exports?module.exports=e(t,require("./core"),require("fizzy-ui-utils")):e(t,t.InfiniteScroll,t.fizzyUIUtils)}(window,(function(t,e,i){class n{constructor(t,e){this.element=t,this.infScroll=e,this.clickHandler=this.onClick.bind(this),this.element.addEventListener("click",this.clickHandler),e.on("request",this.disable.bind(this)),e.on("load",this.enable.bind(this)),e.on("error",this.hide.bind(this)),e.on("last",this.hide.bind(this))}onClick(t){t.preventDefault(),this.infScroll.loadNextPage()}enable(){this.element.removeAttribute("disabled")}disable(){this.element.disabled="disabled"}hide(){this.element.style.display="none"}destroy(){this.element.removeEventListener("click",this.clickHandler)}}return e.create.button=function(){let t=i.getQueryElement(this.options.button);t&&(this.button=new n(t,this))},e.destroy.button=function(){this.button&&this.button.destroy()},e.Button=n,e})),function(t,e){"object"==typeof module&&module.exports?module.exports=e(t,require("./core"),require("fizzy-ui-utils")):e(t,t.InfiniteScroll,t.fizzyUIUtils)}(window,(function(t,e,i){let n=e.prototype;function o(t){r(t,"none")}function s(t){r(t,"block")}function r(t,e){t&&(t.style.display=e)}return e.create.status=function(){let t=i.getQueryElement(this.options.status);t&&(this.statusElement=t,this.statusEventElements={request:t.querySelector(".infinite-scroll-request"),error:t.querySelector(".infinite-scroll-error"),last:t.querySelector(".infinite-scroll-last")},this.on("request",this.showRequestStatus),this.on("error",this.showErrorStatus),this.on("last",this.showLastStatus),this.bindHideStatus("on"))},n.bindHideStatus=function(t){let e=this.options.append?"append":"load";this[t](e,this.hideAllStatus)},n.showRequestStatus=function(){this.showStatus("request")},n.showErrorStatus=function(){this.showStatus("error")},n.showLastStatus=function(){this.showStatus("last"),this.bindHideStatus("off")},n.showStatus=function(t){s(this.statusElement),this.hideStatusEventElements(),s(this.statusEventElements[t])},n.hideAllStatus=function(){o(this.statusElement),this.hideStatusEventElements()},n.hideStatusEventElements=function(){for(let t in this.statusEventElements){o(this.statusEventElements[t])}},e})),
+/*!
+ * imagesLoaded v4.1.4
+ * JavaScript is all like "You images are done yet or what?"
+ * MIT License
+ */
+function(t,e){"use strict";"function"==typeof define&&define.amd?define(["ev-emitter/ev-emitter"],(function(i){return e(t,i)})):"object"==typeof module&&module.exports?module.exports=e(t,require("ev-emitter")):t.imagesLoaded=e(t,t.EvEmitter)}("undefined"!=typeof window?window:this,(function(t,e){"use strict";var i=t.jQuery,n=t.console;function o(t,e){for(var i in e)t[i]=e[i];return t}var s=Array.prototype.slice;function r(t,e,l){if(!(this instanceof r))return new r(t,e,l);var h,a=t;("string"==typeof t&&(a=document.querySelectorAll(t)),a)?(this.elements=(h=a,Array.isArray(h)?h:"object"==typeof h&&"number"==typeof h.length?s.call(h):[h]),this.options=o({},this.options),"function"==typeof e?l=e:o(this.options,e),l&&this.on("always",l),this.getImages(),i&&(this.jqDeferred=new i.Deferred),setTimeout(this.check.bind(this))):n.error("Bad element for imagesLoaded "+(a||t))}r.prototype=Object.create(e.prototype),r.prototype.options={},r.prototype.getImages=function(){this.images=[],this.elements.forEach(this.addElementImages,this)},r.prototype.addElementImages=function(t){"IMG"==t.nodeName&&this.addImage(t),!0===this.options.background&&this.addElementBackgroundImages(t);var e=t.nodeType;if(e&&l[e]){for(var i=t.querySelectorAll("img"),n=0;n<i.length;n++){var o=i[n];this.addImage(o)}if("string"==typeof this.options.background){var s=t.querySelectorAll(this.options.background);for(n=0;n<s.length;n++){var r=s[n];this.addElementBackgroundImages(r)}}}};var l={1:!0,9:!0,11:!0};function h(t){this.img=t}function a(t,e){this.url=t,this.element=e,this.img=new Image}return r.prototype.addElementBackgroundImages=function(t){var e=getComputedStyle(t);if(e)for(var i=/url\((['"])?(.*?)\1\)/gi,n=i.exec(e.backgroundImage);null!==n;){var o=n&&n[2];o&&this.addBackground(o,t),n=i.exec(e.backgroundImage)}},r.prototype.addImage=function(t){var e=new h(t);this.images.push(e)},r.prototype.addBackground=function(t,e){var i=new a(t,e);this.images.push(i)},r.prototype.check=function(){var t=this;function e(e,i,n){setTimeout((function(){t.progress(e,i,n)}))}this.progressedCount=0,this.hasAnyBroken=!1,this.images.length?this.images.forEach((function(t){t.once("progress",e),t.check()})):this.complete()},r.prototype.progress=function(t,e,i){this.progressedCount++,this.hasAnyBroken=this.hasAnyBroken||!t.isLoaded,this.emitEvent("progress",[this,t,e]),this.jqDeferred&&this.jqDeferred.notify&&this.jqDeferred.notify(this,t),this.progressedCount==this.images.length&&this.complete(),this.options.debug&&n&&n.log("progress: "+i,t,e)},r.prototype.complete=function(){var t=this.hasAnyBroken?"fail":"done";if(this.isComplete=!0,this.emitEvent(t,[this]),this.emitEvent("always",[this]),this.jqDeferred){var e=this.hasAnyBroken?"reject":"resolve";this.jqDeferred[e](this)}},h.prototype=Object.create(e.prototype),h.prototype.check=function(){this.getIsImageComplete()?this.confirm(0!==this.img.naturalWidth,"naturalWidth"):(this.proxyImage=new Image,this.proxyImage.addEventListener("load",this),this.proxyImage.addEventListener("error",this),this.img.addEventListener("load",this),this.img.addEventListener("error",this),this.proxyImage.src=this.img.src)},h.prototype.getIsImageComplete=function(){return this.img.complete&&this.img.naturalWidth},h.prototype.confirm=function(t,e){this.isLoaded=t,this.emitEvent("progress",[this,this.img,e])},h.prototype.handleEvent=function(t){var e="on"+t.type;this[e]&&this[e](t)},h.prototype.onload=function(){this.confirm(!0,"onload"),this.unbindEvents()},h.prototype.onerror=function(){this.confirm(!1,"onerror"),this.unbindEvents()},h.prototype.unbindEvents=function(){this.proxyImage.removeEventListener("load",this),this.proxyImage.removeEventListener("error",this),this.img.removeEventListener("load",this),this.img.removeEventListener("error",this)},a.prototype=Object.create(h.prototype),a.prototype.check=function(){this.img.addEventListener("load",this),this.img.addEventListener("error",this),this.img.src=this.url,this.getIsImageComplete()&&(this.confirm(0!==this.img.naturalWidth,"naturalWidth"),this.unbindEvents())},a.prototype.unbindEvents=function(){this.img.removeEventListener("load",this),this.img.removeEventListener("error",this)},a.prototype.confirm=function(t,e){this.isLoaded=t,this.emitEvent("progress",[this,this.element,e])},r.makeJQueryPlugin=function(e){(e=e||t.jQuery)&&((i=e).fn.imagesLoaded=function(t,e){return new r(this,t,e).jqDeferred.promise(i(this))})},r.makeJQueryPlugin(),r}));
 /*!
  * fitColumns layout mode for Isotope
  * v1.1.4

From 3cfffa14877528070873ecd432ac86884e99b0fa Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 25 Oct 2021 20:06:22 +0200
Subject: [PATCH 027/412] Fix for iOS covers are not displayed during infinite
 scroll on standard theme

---
 cps/static/css/style.css | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 2bbdf3702..32c6f2257 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -155,11 +155,6 @@ table .bg-dark-danger a { color: #fff; }
   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 {
@@ -175,11 +170,11 @@ table .bg-dark-danger a { color: #fff; }
 }
 
 .container-fluid .book .cover span img {
-  position: relative;
-  top: 0;
-  left: 0;
-  height: 100%;
   border: 1px solid #fff;
+  bottom: 0;
+  position: relative;
+  height: 100%;
+
   box-sizing: border-box;
   -webkit-box-shadow: 0 5px 8px -6px #777;
   -moz-box-shadow: 0 5px 8px -6px #777;

From baba205bcedcf87c5317db04d263b4570ed10f27 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 11 Nov 2021 18:46:32 +0400
Subject: [PATCH 028/412] Rename everything on rename authors

---
 cps/editbooks.py | 35 ++++++++++++++++++-------
 cps/helper.py    | 68 ++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 80 insertions(+), 23 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 3403f46f7..caec3dce3 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -114,7 +114,7 @@ def search_objects_add(db_book_object, db_type, input_elements):
                 type_elements = c_elements.value
             else:
                 type_elements = c_elements.name
-            if inp_element.lower() == type_elements.lower():    # Lowercase check
+            if inp_element == type_elements:
                 found = True
                 break
         if not found:
@@ -709,6 +709,7 @@ def handle_title_on_edit(book, book_title):
 
 def handle_author_on_edit(book, author_name, update_stored=True):
     # handle author(s)
+    # renamed = False
     input_authors = author_name.split('&')
     input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
     # Remove duplicates in authors list
@@ -717,6 +718,20 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     if input_authors == ['']:
         input_authors = [_(u'Unknown')]  # prevent empty Author
 
+    # ToDo: Falsch es kann auch sein das der 2. Author in der Liste umbenannt wurde,
+    #  man müsste für alle Authoren schauen
+    renamed = list()
+    for in_aut in input_authors:
+        renamed_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == in_aut).first()
+        if renamed_author and in_aut != renamed_author.name:
+            renamed.append(renamed_author.name)
+            all_books = calibre_db.session.query(db.Books) \
+                .filter(db.Books.authors.any(db.Authors.name == renamed_author.name)).all()
+            sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
+            sorted_old_author = helper.get_sorted_author(in_aut)
+            for one_book in all_books:
+                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
+
     change = modify_database_object(input_authors, book.authors, db.Authors, calibre_db.session, 'author')
 
     # Search for each author if author is in database, if not, author name and sorted author name is generated new
@@ -733,7 +748,7 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     if book.author_sort != sort_authors and update_stored:
         book.author_sort = sort_authors
         change = True
-    return input_authors, change
+    return input_authors, change, renamed
 
 
 @editbook.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
@@ -773,7 +788,7 @@ def edit_book(book_id):
         # handle book title
         title_change = handle_title_on_edit(book, to_save["book_title"])
 
-        input_authors, authorchange = handle_author_on_edit(book, to_save["author_name"])
+        input_authors, authorchange, renamed = handle_author_on_edit(book, to_save["author_name"])
         if authorchange or title_change:
             edited_books_id = book.id
             modif_date = True
@@ -783,7 +798,8 @@ def edit_book(book_id):
 
         error = False
         if edited_books_id:
-            error = helper.update_dir_stucture(edited_books_id, config.config_calibre_dir, input_authors[0])
+            error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
+                                               renamed_author=renamed)
 
         if not error:
             if "cover_url" in to_save:
@@ -1145,7 +1161,7 @@ def edit_list_book(param):
     elif param == 'title':
         sort = book.sort
         handle_title_on_edit(book, vals.get('value', ""))
-        helper.update_dir_stucture(book.id, config.config_calibre_dir)
+        helper.update_dir_structure(book.id, config.config_calibre_dir)
         ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
                        mimetype='application/json')
     elif param =='sort':
@@ -1157,8 +1173,8 @@ def edit_list_book(param):
         ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
                        mimetype='application/json')
     elif param =='authors':
-        input_authors, __ = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
-        helper.update_dir_stucture(book.id, config.config_calibre_dir, input_authors[0])
+        input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
+        helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
         ret = Response(json.dumps({'success': True,
                                    'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
                        mimetype='application/json')
@@ -1267,7 +1283,7 @@ def table_xchange_author_title():
                 author_names.append(authr.name.replace('|', ','))
 
             title_change = handle_title_on_edit(book, " ".join(author_names))
-            input_authors, authorchange = handle_author_on_edit(book, authors)
+            input_authors, authorchange, renamed = handle_author_on_edit(book, authors)
             if authorchange or title_change:
                 edited_books_id = book.id
                 modif_date = True
@@ -1276,7 +1292,8 @@ def table_xchange_author_title():
                 gdriveutils.updateGdriveCalibreFromLocal()
 
             if edited_books_id:
-                helper.update_dir_stucture(edited_books_id, config.config_calibre_dir, input_authors[0])
+                helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
+                                           renamed_author=renamed)
             if modif_date:
                 book.last_modified = datetime.utcnow()
             try:
diff --git a/cps/helper.py b/cps/helper.py
index df7019e64..2cc7591b1 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -334,9 +334,22 @@ def delete_book_file(book, calibrepath, book_format=None):
                    id=book.id,
                    path=book.path)
 
+# was muss gemacht werden:
+# Die Autorennamen müssen separiert werden und von dupletten bereinigt werden.
+# Es muss geprüft werden:
+# - ob es die alten Autoren mit dem letzten Buch verknüpft waren, dann müssen sie gelöscht werden
+# - ob es neue Autoren sind, dann müssen sie angelegt werden -> macht modify_database_object
+# - ob es bestehende Autoren sind welche umbenannt wurden -> Groß Kleinschreibung, dann muss:
+# für jedes Buch und jeder Autor welcher umbenannt wurde:
+#   - Autorensortierung angepasst werden
+#   - Pfad im Buch angepasst werden
+#   - Dateiname in Datatabelle angepasst werden, sowie die Dateien umbenannt werden
+#   - Dateipfade Autor umbenannt werden
+# die letzten Punkte treffen auch zu wenn es sich um einen normalen Autoränderungsvorgang handelt kann man also generell
+# behandeln
 
 # 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):
+def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
     localbook = calibre_db.get_book(book_id)
     if orignal_filepath:
@@ -352,21 +365,32 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
     # Create new titledir from database and add id
     if first_author:
         new_authordir = get_valid_filename(first_author)
+        for r in renamed_author:
+            if first_author.lower() == r.lower():
+                try:
+                    new_author_path = os.path.join(calibrepath, new_authordir)
+                    old_author_path = os.path.join(calibrepath, r)
+                    shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
+                except (OSError) as ex:
+                    log.error("Rename author from: %s to %s: %s", r, new_authordir, ex)
+                    log.debug(ex, exc_info=True)
+                    return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
+                             src=old_author_path, dest=new_author_path, error=str(ex))
     else:
         new_authordir = get_valid_filename(localbook.authors[0].name)
     new_titledir = get_valid_filename(localbook.title) + " (" + str(book_id) + ")"
 
     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)
+        new_name = get_valid_filename(localbook.title) + ' - ' + new_authordir
         try:
             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:
+                # Check new path is not valid path
                 if not os.path.exists(new_path):
                     # move original path to new path
                     log.debug("Moving title: %s to %s", path, new_path)
@@ -379,8 +403,6 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                             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_path, ex)
             log.debug(ex, exc_info=True)
@@ -389,15 +411,23 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
 
         # Rename all files from old names to new names
         try:
-            for file_format in localbook.data:
-                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:
+            all_books = calibre_db.session.query(db.Books)\
+                .filter(db.Books.authors.any(db.Authors.name == renamed_author)).all()
+            for book in all_books:
+                all_titledir = book.path.split('/')[1]
+                all_new_path = os.path.join(calibrepath, new_authordir, all_titledir)
+                all_new_name = get_valid_filename(book.title) + ' - ' + new_authordir
+                # change location in database to new author/title path
+                book.path = os.path.join(new_authordir, all_titledir).replace('\\', '/')
+                for file_format in book.data:
+                    shutil.move(os.path.normcase(
+                        os.path.join(all_new_path, file_format.name + '.' + file_format.format.lower())),
+                        os.path.normcase(os.path.join(all_new_path, all_new_name + '.' + file_format.format.lower())))
+                    file_format.name = all_new_name
+            if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
                 shutil.rmtree(os.path.dirname(path))
         except (OSError) as ex:
-            log.error("Rename file in path %s to %s: %s", new_path, new_name, ex)
+            log.error("Rename file in path %s to %s: %s", all_new_path, all_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=new_path, dest=new_name, error=str(ex))
@@ -528,11 +558,21 @@ def valid_email(email):
 # ################################# External interface #################################
 
 
-def update_dir_stucture(book_id, calibrepath, first_author=None, orignal_filepath=None, db_filename=None):
+def update_dir_structure(book_id,
+                        calibrepath,
+                        first_author=None,
+                        orignal_filepath=None,
+                        db_filename=None,
+                        renamed_author=False):
     if config.config_use_google_drive:
+        # ToDo: rename author on gdrive
         return update_dir_structure_gdrive(book_id, first_author)
     else:
-        return update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepath, db_filename)
+        return update_dir_structure_file(book_id,
+                                         calibrepath,
+                                         first_author,
+                                         orignal_filepath,
+                                         db_filename, renamed_author)
 
 
 def delete_book(book, calibrepath, book_format):

From 8e5bb02a284adcdc3d7bab791c8526566e847b9c Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 13 Nov 2021 17:57:01 +0400
Subject: [PATCH 029/412] Merge author rename

---
 cps/db.py        | 48 +++++++++++++++++++++++----------------
 cps/editbooks.py |  8 +++----
 cps/helper.py    | 59 ++++++++++++++++++++++++++++++++----------------
 cps/opds.py      | 14 ++++++------
 cps/ub.py        |  2 ++
 cps/web.py       | 15 ++++++++----
 6 files changed, 90 insertions(+), 56 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index f2acb7a1f..06019e178 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -39,7 +39,6 @@ except ImportError:
 from sqlalchemy.pool import StaticPool
 from sqlalchemy.sql.expression import and_, true, false, text, func, or_
 from sqlalchemy.ext.associationproxy import association_proxy
-from sqlalchemy.orm import joinedload
 from flask_login import current_user
 from flask_babel import gettext as _
 from flask import flash
@@ -759,26 +758,32 @@ class CalibreDB():
             entries = query.order_by(*order).offset(off).limit(pagesize).all()
         except Exception as ex:
             log.debug_or_exception(ex)
+        # display authors in right order
+        entries = self.order_authors(entries, True)
         return entries, randm, pagination
 
     # Orders all Authors in the list according to authors sort
-    def order_authors(self, entry):
-        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
-            if not len(results):
-                error = True
-                break
-            for r in results:
-                if r.id in ids:
-                    authors_ordered.append(r)
-        if not error:
-            entry.authors = authors_ordered
-        return authors_ordered
+    def order_authors(self, entries, list_return=False):
+        for entry in entries:
+            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
+                if not len(results):
+                    error = True
+                    break
+                for r in results:
+                    if r.id in ids:
+                        authors_ordered.append(r)
+            if not error:
+                entry.authors = authors_ordered
+        if list_return:
+            return entries
+        else:
+            return authors_ordered
 
     def get_typeahead(self, database, query, replace=('', ''), tag_filter=true()):
         query = query or ''
@@ -839,10 +844,10 @@ class CalibreDB():
                 ))
 
     # read search results from calibre-database and return it (function is used for feed and simple search
-    def get_search_results(self, term, offset=None, order=None, limit=None, *join):
+    def get_search_results(self, term, offset=None, order=None, limit=None, config_read_column=False, *join):
         order = order[0] if order else [Books.sort]
         pagination = None
-        result = self.search_query(term, *join).order_by(*order).all()
+        result = self.search_query(term, config_read_column, *join).order_by(*order).all()
         result_count = len(result)
         if offset != None and limit != None:
             offset = int(offset)
@@ -853,6 +858,9 @@ class CalibreDB():
             limit_all = result_count
 
         ub.store_combo_ids(result)
+        # ToDo: doesn't work as more than one table returned
+        # entries = self.order_authors(result[offset:limit_all], True)
+
         return result[offset:limit_all], result_count, pagination
 
     # Creates for all stored languages a translated speaking name in the array for the UI
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 9e5dd70d1..bf971b158 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -171,7 +171,7 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
 def create_objects_for_addition(db_element, add_element, db_type):
     if db_type == 'custom':
         if db_element.value != add_element:
-            db_element.value = add_element  # ToDo: Before new_element, but this is not plausible
+            db_element.value = add_element
     elif db_type == 'languages':
         if db_element.lang_code != add_element:
             db_element.lang_code = add_element
@@ -182,7 +182,7 @@ def create_objects_for_addition(db_element, add_element, db_type):
     elif db_type == 'author':
         if db_element.name != add_element:
             db_element.name = add_element
-            db_element.sort = add_element.replace('|', ',')
+            db_element.sort = helper.get_sorted_author(add_element.replace('|', ','))
     elif db_type == 'publisher':
         if db_element.name != add_element:
             db_element.name = add_element
@@ -376,7 +376,7 @@ def render_edit_book(book_id):
     for lang in book.languages:
         lang.language_name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
 
-    book.authors = calibre_db.order_authors(book)
+    book.authors = calibre_db.order_authors([book])
 
     author_names = []
     for authr in book.authors:
@@ -1286,7 +1286,7 @@ def table_xchange_author_title():
             modif_date = False
             book = calibre_db.get_book(val)
             authors = book.title
-            book.authors = calibre_db.order_authors(book)
+            book.authors = calibre_db.order_authors([book])
             author_names = []
             for authr in book.authors:
                 author_names.append(authr.name.replace('|', ','))
diff --git a/cps/helper.py b/cps/helper.py
index 2cc7591b1..9f7061c27 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -334,6 +334,32 @@ def delete_book_file(book, calibrepath, book_format=None):
                    id=book.id,
                    path=book.path)
 
+
+def clean_author_database(renamed_author, calibrepath, local_book=None):
+    valid_filename_authors = [get_valid_filename(r) for r in renamed_author]
+    for r in renamed_author:
+        if local_book:
+            all_books = [local_book]
+        else:
+            all_books = calibre_db.session.query(db.Books) \
+                .filter(db.Books.authors.any(db.Authors.name == r)).all()
+        for book in all_books:
+            book_author_path = book.path.split('/')[0]
+            if book_author_path in valid_filename_authors or local_book:
+                new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
+                all_new_authordir = get_valid_filename(new_author.name)
+                all_titledir = book.path.split('/')[1]
+                all_new_path = os.path.join(calibrepath, all_new_authordir, all_titledir)
+                all_new_name = get_valid_filename(book.title) + ' - ' + all_new_authordir
+                # change location in database to new author/title path
+                book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
+                for file_format in book.data:
+                    shutil.move(os.path.normcase(
+                        os.path.join(all_new_path, file_format.name + '.' + file_format.format.lower())),
+                        os.path.normcase(os.path.join(all_new_path, all_new_name + '.' + file_format.format.lower())))
+                    file_format.name = all_new_name
+
+
 # was muss gemacht werden:
 # Die Autorennamen müssen separiert werden und von dupletten bereinigt werden.
 # Es muss geprüft werden:
@@ -366,13 +392,16 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
     if first_author:
         new_authordir = get_valid_filename(first_author)
         for r in renamed_author:
-            if first_author.lower() == r.lower():
+            new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
+            old_author_dir = get_valid_filename(r)
+            new_author_rename_dir = get_valid_filename(new_author.name)
+            if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
                 try:
-                    new_author_path = os.path.join(calibrepath, new_authordir)
-                    old_author_path = os.path.join(calibrepath, r)
+                    old_author_path = os.path.join(calibrepath, old_author_dir)
+                    new_author_path = os.path.join(calibrepath, new_author_rename_dir)
                     shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
                 except (OSError) as ex:
-                    log.error("Rename author from: %s to %s: %s", r, new_authordir, ex)
+                    log.error("Rename author from: %s to %s: %s", old_author_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=old_author_path, dest=new_author_path, error=str(ex))
@@ -411,26 +440,16 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
 
         # Rename all files from old names to new names
         try:
-            all_books = calibre_db.session.query(db.Books)\
-                .filter(db.Books.authors.any(db.Authors.name == renamed_author)).all()
-            for book in all_books:
-                all_titledir = book.path.split('/')[1]
-                all_new_path = os.path.join(calibrepath, new_authordir, all_titledir)
-                all_new_name = get_valid_filename(book.title) + ' - ' + new_authordir
-                # change location in database to new author/title path
-                book.path = os.path.join(new_authordir, all_titledir).replace('\\', '/')
-                for file_format in book.data:
-                    shutil.move(os.path.normcase(
-                        os.path.join(all_new_path, file_format.name + '.' + file_format.format.lower())),
-                        os.path.normcase(os.path.join(all_new_path, all_new_name + '.' + file_format.format.lower())))
-                    file_format.name = all_new_name
+            clean_author_database(renamed_author, calibrepath)
+
+            if first_author not in renamed_author:
+                clean_author_database([first_author], calibrepath, localbook)
             if not renamed_author and 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", all_new_path, all_new_name, ex)
+            log.error("Error in rename file in path %s", ex)
             log.debug(ex, exc_info=True)
-            return _("Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s",
-                     src=new_path, dest=new_name, error=str(ex))
+            return _("Error in rename file in path: %(error)s", error=str(ex))
     return False
 
 def update_dir_structure_gdrive(book_id, first_author):
diff --git a/cps/opds.py b/cps/opds.py
index 92c51d1ba..f249218c6 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -20,23 +20,21 @@
 #  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 sys
 import datetime
+from urllib.parse import unquote_plus
 from functools import wraps
 
 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_, true
 from werkzeug.security import check_password_hash
-
+from tornado.httputil import HTTPServerRequest
 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
 from .usermanagement import load_user_from_request
 from flask_babel import gettext as _
-from babel import Locale as LC
-from babel.core import UnknownLocaleError
 
 opds = Blueprint('opds', __name__)
 
@@ -84,10 +82,12 @@ def feed_osd():
 
 
 @opds.route("/opds/search", defaults={'query': ""})
-@opds.route("/opds/search/<query>")
+@opds.route("/opds/search/<path:query>")
 @requires_basic_auth_if_no_ano
 def feed_cc_search(query):
-    return feed_search(query.strip())
+    # Handle strange query from Libera Reader with + instead of spaces
+    plus_query = unquote_plus(request.base_url.split('/opds/search/')[1]).strip()
+    return feed_search(plus_query)
 
 
 @opds.route("/opds/search", methods=["GET"])
@@ -527,7 +527,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, config_read_column=config.config_read_column)
         entriescount = len(entries) if len(entries) > 0 else 1
         pagination = Pagination(1, entriescount, entriescount)
         return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
diff --git a/cps/ub.py b/cps/ub.py
index e9ad264fa..6530a5957 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -83,6 +83,8 @@ def signal_store_user_session(object, user):
     store_user_session()
 
 def store_user_session():
+    if flask_session.get('user_id', ""):
+        flask_session['_user_id'] = flask_session.get('user_id', "")
     if flask_session.get('_user_id', ""):
         try:
             if not check_user_session(flask_session.get('_user_id', ""), flask_session.get('_id', "")):
diff --git a/cps/web.py b/cps/web.py
index 9809c4e0f..6d1b9866e 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -543,7 +543,6 @@ def render_author_books(page, author_id, order):
     if services.goodreads_support and config.config_use_goodreads:
         author_info = services.goodreads_support.get_author_info(author_name)
         other_books = services.goodreads_support.get_other_books(author_info, entries)
-
     return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
                                  title=_(u"Author: %(name)s", name=author_name), author=author_info,
                                  other_books=other_books, page="author", order=order[1])
@@ -753,7 +752,12 @@ def render_prepare_search_form(cc):
 
 def render_search_results(term, offset=None, order=None, limit=None):
     join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
-    entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit, *join)
+    entries, result_count, pagination = calibre_db.get_search_results(term,
+                                                                      offset,
+                                                                      order,
+                                                                      limit,
+                                                                      config.config_read_column,
+                                                                      *join)
     return render_title_template('search.html',
                                  searchterm=term,
                                  pagination=pagination,
@@ -832,7 +836,7 @@ def list_books():
     total_count = filtered_count = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(False)).count()
     if state is not None:
         if search:
-            books = calibre_db.search_query(search).all()
+            books = calibre_db.search_query(search, config.config_read_column).all()
             filtered_count = len(books)
         else:
             if not config.config_read_column:
@@ -1424,10 +1428,11 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     else:
         offset = 0
         limit_all = result_count
+    entries = calibre_db.order_authors(q[offset:limit_all], True)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
-                                 entries=q[offset:limit_all],
+                                 entries=entries,
                                  result_count=result_count,
                                  title=_(u"Advanced Search"), page="advsearch",
                                  order=order[1])
@@ -1830,7 +1835,7 @@ def show_book(book_id):
 
         entry.tags = sort(entry.tags, key=lambda tag: tag.name)
 
-        entry.authors = calibre_db.order_authors(entry)
+        entry.authors = calibre_db.order_authors([entry])
 
         entry.kindle_list = check_send_to_kindle(entry)
         entry.reader_list = check_read_formats(entry)

From 927384306223e1be94b1fc205bee2b69a67b32cf Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 21 Nov 2021 09:13:26 +0100
Subject: [PATCH 030/412] Removed double declared functions

---
 cps/ub.py | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/cps/ub.py b/cps/ub.py
index 69ea55f6c..405b0865a 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -62,27 +62,13 @@ searched_ids = {}
 
 logged_in = dict()
 
-def store_user_session():
-    if flask_session.get('_user_id', ""):
-        if logged_in.get(flask_session.get('_user_id', "")):
-            logged_in[flask_session.get('_user_id', "")].append(flask_session.get('_id', ""))
-        else:
-            logged_in[flask_session.get('_user_id', "")] = [flask_session.get('_id', "")]
-        log.info(flask_session.get('_id', ""))
-
-def delete_user_session(user_id, session_key):
-    try:
-        logged_in.get(str(user_id), []).remove(session_key)
-    except ValueError:
-        pass
-
-def check_user_session(user_id, session_key):
-    return session_key in logged_in.get(str(user_id), [])
 
 def signal_store_user_session(object, user):
     store_user_session()
 
 def store_user_session():
+    if flask_session.get('user_id', ""):
+        flask_session['_user_id'] = flask_session.get('user_id', "")
     if flask_session.get('_user_id', ""):
         try:
             if not check_user_session(flask_session.get('_user_id', ""), flask_session.get('_id', "")):

From 642af2f973a3fb5800f8760d02d84a7847d8f3d3 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 21 Nov 2021 09:28:03 +0100
Subject: [PATCH 031/412] Added support for missing locale Enu

---
 cps/iso_language_names.py                     |  20 +
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 39918 -> 39635 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 54015 -> 53698 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 58278 -> 57858 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 51719 -> 51420 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 27816 -> 27521 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 54095 -> 53763 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 25588 -> 25272 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 56691 -> 56390 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 20280 -> 19949 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 24788 -> 24546 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 452 ++++++++---------
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 50897 -> 50584 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 52799 -> 52511 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 454 +++++++++---------
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 47339 -> 47022 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 454 +++++++++---------
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 48412 -> 48070 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 49146 -> 48854 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 23171 -> 22880 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 454 +++++++++---------
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 18235 -> 18028 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 452 ++++++++---------
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 48933 -> 48654 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 454 +++++++++---------
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 49256 -> 48977 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 454 +++++++++---------
 messages.pot                                  | 450 ++++++++---------
 40 files changed, 4696 insertions(+), 4396 deletions(-)

diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 07848b9cd..11e5e67bf 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -112,6 +112,7 @@ LANGUAGE_NAMES = {
         "elx": "elamština",
         "eng": "Angličtina",
         "enm": "Angličtina; středověká (1100-1500)",
+        "enu": "Enu",
         "epo": "esperanto",
         "est": "estonština",
         "eus": "baskičtina",
@@ -533,6 +534,7 @@ LANGUAGE_NAMES = {
         "elx": "Elamisch",
         "eng": "Englisch",
         "enm": "Mittelenglisch",
+        "enu": "Enu",
         "epo": "Esperanto",
         "est": "Estnisch",
         "eus": "Baskisch",
@@ -945,6 +947,7 @@ LANGUAGE_NAMES = {
         "eka": "Ekajuk",
         "elx": "Elamite",
         "eng": "Αγγλικά",
+        "enu": "Enu",
         "myv": "Erzya",
         "epo": "Εσπεράντο",
         "est": "Εσθονικά",
@@ -1330,6 +1333,7 @@ LANGUAGE_NAMES = {
         "elx": "Elamita",
         "eng": "Inglés",
         "enm": "Inglés medio (1100-1500)",
+        "enu": "Enu",
         "epo": "Esperanto",
         "est": "Estonio",
         "eus": "Vasco",
@@ -1751,6 +1755,7 @@ LANGUAGE_NAMES = {
         "elx": "elami",
         "eng": "englanti",
         "enm": "keskienglanti",
+        "enu": "Enu",
         "epo": "esperanto",
         "est": "viro",
         "eus": "baski",
@@ -2172,6 +2177,7 @@ LANGUAGE_NAMES = {
         "elx": "élamite",
         "eng": "anglais",
         "enm": "anglais moyen (1100-1500)",
+        "enu": "enu",
         "epo": "espéranto",
         "est": "estonien",
         "eus": "basque",
@@ -2593,6 +2599,7 @@ LANGUAGE_NAMES = {
         "elx": "elamita",
         "eng": "angol",
         "enm": "angol; középkori (1100-1500)",
+        "enu": "Enu",
         "epo": "eszperantó",
         "est": "észt",
         "eus": "Baszk",
@@ -3014,6 +3021,7 @@ LANGUAGE_NAMES = {
         "elx": "Elamitico",
         "eng": "Inglese",
         "enm": "Inglese medio (1100-1500)",
+        "enu": "Enu",
         "epo": "Esperanto",
         "est": "Estone",
         "eus": "Basco",
@@ -3435,6 +3443,7 @@ LANGUAGE_NAMES = {
         "elx": "エラム語",
         "eng": "英語",
         "enm": "英語; 中世 (1100-1500)",
+        "enu": "Enu",
         "epo": "エスペラント",
         "est": "エストニア語",
         "eus": "バスク語",
@@ -3856,6 +3865,7 @@ LANGUAGE_NAMES = {
         "elx": "Elamite",
         "eng": "English",
         "enm": "English; Middle (1100-1500)",
+        "enu": "Enu",
         "epo": "Esperanto",
         "est": "Estonian",
         "eus": "Basque",
@@ -4277,6 +4287,7 @@ LANGUAGE_NAMES = {
         "elx": "Elamitisch",
         "eng": "Engels",
         "enm": "Engels; middel (1100-1500)",
+        "enu": "Enu",
         "epo": "Esperanto",
         "est": "Estlands",
         "eus": "Baskisch",
@@ -4698,6 +4709,7 @@ LANGUAGE_NAMES = {
         "elx": "elamicki",
         "eng": "Angielski",
         "enm": "angielski średniowieczny (1100-1500)",
+        "enu": "Enu",
         "epo": "esperanto",
         "est": "estoński",
         "eus": "baskijski",
@@ -5110,6 +5122,7 @@ LANGUAGE_NAMES = {
         "eka": "Ekajuk",
         "elx": "Elamite",
         "eng": "Inglês",
+        "enu": "Enu",
         "myv": "Erzya",
         "epo": "Esperanto",
         "est": "Estónio",
@@ -5493,6 +5506,7 @@ LANGUAGE_NAMES = {
         "elx": "Эламский",
         "eng": "Английский",
         "enm": "Среднеанглийский (1100-1500)",
+        "enu": "Enu",
         "epo": "Эсперанто",
         "est": "Эстонский",
         "eus": "Баскский",
@@ -5914,6 +5928,7 @@ LANGUAGE_NAMES = {
         "elx": "Elamitiska",
         "eng": "Engelska",
         "enm": "Medelengelska (1100-1500)",
+        "enu": "Enu",
         "epo": "Esperanto",
         "est": "Estniska",
         "eus": "Baskiska",
@@ -6326,6 +6341,7 @@ LANGUAGE_NAMES = {
         "eka": "Ekajuk (Afrika)",
         "elx": "Elamca",
         "eng": "İngilizce",
+        "enu": "Enu",
         "myv": "Erzya dili",
         "epo": "Esperanto",
         "est": "Estonca",
@@ -6709,6 +6725,7 @@ LANGUAGE_NAMES = {
         "elx": "еламська",
         "eng": "англійська",
         "enm": "середньоанглійська (1100-1500)",
+        "enu": "ену",
         "epo": "есперанто",
         "est": "естонська",
         "eus": "баскська",
@@ -7130,6 +7147,7 @@ LANGUAGE_NAMES = {
         "elx": "埃兰语",
         "eng": "英语",
         "enm": "英语（中古，1100-1500）",
+        "enu": "Enu",
         "epo": "世界语",
         "est": "爱沙尼亚语",
         "eus": "巴斯克语",
@@ -7542,6 +7560,7 @@ LANGUAGE_NAMES = {
         "eka": "Ekajuk",
         "elx": "Elamite",
         "eng": "英文",
+        "enu": "Enu",
         "myv": "Erzya",
         "epo": "世界語",
         "est": "愛沙尼亞文",
@@ -7925,6 +7944,7 @@ LANGUAGE_NAMES = {
         "elx": "Elamite",
         "eng": "English",
         "enm": "English; Middle (1100-1500)",
+        "enu": "Enu",
         "epo": "Esperanto",
         "est": "Estonian",
         "eus": "Basque",
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 2168e8beed52c7e3b86d6f0a8383b40e93d27496..d03dc08c93d654e22a38d2bcb5f0de3efa426db5 100644
GIT binary patch
delta 9015
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
IO|x4352GAli~s-t

delta 9256
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

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 3c8875ed8..6a6705473 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+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,17 +15,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "není nainstalováno"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "nainstalováno"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Statistika"
 
@@ -64,17 +64,17 @@ msgstr "Základní konfigurace"
 msgid "UI Configuration"
 msgstr "Konfigurace uživatelského rozhraní"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Uživatel admin"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Vše"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
@@ -82,7 +82,7 @@ msgstr "Uživatel nenalezen"
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Zobrazit vše"
@@ -91,7 +91,7 @@ msgstr "Zobrazit vše"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
@@ -271,9 +271,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
@@ -311,167 +311,167 @@ msgstr "Vyplňte všechna pole!"
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 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:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Chyba: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -483,7 +483,7 @@ msgstr "není nakonfigurováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
@@ -496,8 +496,8 @@ msgstr "Formát knihy úspěšně smazán"
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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ý"
 
@@ -534,7 +534,7 @@ msgstr "Nepodařilo se vytvořit cestu %(path)s (oprávnění odepřeno)."
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
@@ -692,7 +692,7 @@ msgstr "Soubor %(file)s nenalezen na Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
@@ -726,34 +726,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Pouze jpg/jpeg jsou podporované soubory pro obal"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "Unrar binární soubor nenalezen"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Chyba provádění UnRar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Čekám"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Spuštěno"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
@@ -770,7 +774,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -836,7 +840,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -852,7 +856,7 @@ msgstr "Token vypršel"
 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:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Knihy"
 
@@ -877,7 +881,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Nejlépe hodnocené knihy"
 
@@ -886,7 +890,7 @@ msgid "Show Top Rated Books"
 msgstr "Zobrazit nejlépe hodnocené knihy"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
@@ -895,7 +899,7 @@ msgid "Show read and unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
@@ -913,7 +917,7 @@ msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -923,7 +927,7 @@ msgstr "Zobrazit výběr kategorie"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Série"
 
@@ -941,7 +945,7 @@ msgid "Show author selection"
 msgstr "Zobrazit výběr autora"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Vydavatelé"
 
@@ -951,7 +955,7 @@ msgstr "Zobrazit výběr vydavatele"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -975,7 +979,7 @@ msgstr "Formáty souborů"
 msgid "Show file formats selection"
 msgstr "Zobrazit výběr formátů"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Archivované knihy"
 
@@ -983,7 +987,7 @@ msgstr "Archivované knihy"
 msgid "Show archived books"
 msgstr "Zobrazit archivované knihy"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr ""
 
@@ -1011,9 +1015,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "Kniha byla přidána do police: %(sname)s"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1036,58 +1039,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Kniha byla odebrána z police: %(sname)s"
 
 #: cps/shelf.py:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Vytvořit polici"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Lituji, nejste oprávněni odebrat knihu z této police: %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Upravit polici"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Police %(title)s vytvořena"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Police %(title)s změněna"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Došlo k chybě"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, 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:307
+#: cps/shelf.py:312
 #, 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:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Změnit  pořadí Police: '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Police: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
 
@@ -1120,177 +1126,177 @@ msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizu
 msgid "No release information available"
 msgstr "Nejsou k dispozici žádné informace o verzi"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Žhavé knihy (Nejstahovanější)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Hledat"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Stáhnutí"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Seznam hodnocení"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, 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:1447
+#: cps/web.py:1473
 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:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, 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:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
@@ -1303,31 +1309,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre převaděč %(tool)s nenalezen"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-převaděč selhal: %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, 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:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Převaděč eknih selhal: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1361,212 +1367,212 @@ msgstr "Správce"
 msgid "Password"
 msgstr "Heslo"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Nahrávat"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Stahovat"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Prohlížení knih"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Upravovat"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Smazat"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Veřejná police"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Přidat nového uživatele"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "Importovat LDAP uživatele"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Nastavení e-mailového serveru SMTP"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP hostitel"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP port"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP přihlášení"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Z e-mailu"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Konfigurace"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Calibre DB adresář"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Úroveň logu"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Knihy na stránku"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Nahrávání"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Anonymní prohlížení"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Veřejná registrace"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Magic Link vzdálené přihlášení"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Reverzní proxy přihlášení"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Název záhlaví reverzního proxy"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Upravit základní konfiguraci"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Upravit základní konfiguraci"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Upravit konfiguraci uživatelského rozhraní"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Správa"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Zobrazit log"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Znovupřipojení ke Calibre databázi"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Restartovat"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Vypnout"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Verze"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Detaily"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Současná verze"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Zkontrolovat aktualizace"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Provést aktualizaci"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Opravdu chcete restartovat?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Opravdu chcete vypnout?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Probíhá aktualizace, prosím nenačítejte stránku znovu"
 
@@ -1578,39 +1584,39 @@ msgstr "přes"
 msgid "In Library"
 msgstr "V knihovně"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "redukovat"
@@ -1740,9 +1746,9 @@ msgid "Fetch Metadata"
 msgstr "Získat metadata"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Uložit"
 
@@ -1765,7 +1771,7 @@ msgstr "Načítání..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Zavřít"
 
@@ -2246,50 +2252,50 @@ msgstr "Povolit stahování"
 msgid "Allow eBook Viewer"
 msgstr "Povolit prohlížeč knih"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Povolit nahrávání"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Povolit úpravy"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Povolit mazání knih"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Povolit změnu hesla"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Povolit úpravy veřejných polic"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Vynechat jazyky"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Zobrazit knihy s jazykem"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Výchozí zobrazení pro nové uživatele"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Zobrazit náhodné knihy v podrobném zobrazení"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Přidat povolené/zakázané štítky"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Přidat povolené/zakázané hodnoty vlastních sloupců"
 
@@ -2443,21 +2449,29 @@ msgstr "Zpět domů"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3066,15 +3080,15 @@ 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:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Odstranit tohoto uživatele"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Vygenerovat URL pro Kobo Auth"
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 4ad26e6b201e9adae0fa7e01569f612b5d1bb952..88ec0827506a04563a01db93551d73241ad1cf99 100644
GIT binary patch
delta 11707
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

delta 11885
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

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 823c2aa7c..a1b69d0cd 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2021-08-01 17:24+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -16,17 +16,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "Nicht installiert"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "Installiert"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Statistiken"
 
@@ -65,16 +65,16 @@ msgstr "Basiskonfiguration"
 msgid "UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 msgid "Edit Users"
 msgstr "Benutzer bearbeiten"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Alle"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
@@ -82,7 +82,7 @@ msgstr "Benutzer nicht gefunden"
 msgid "{} users deleted successfully"
 msgstr "{} Benutzer erfolgreich gelöscht"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Zeige alle"
@@ -91,7 +91,7 @@ msgstr "Zeige alle"
 msgid "Malformed request"
 msgstr "Ungültige Anfrage"
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr "Guest Name kann nicht geändert werden"
 
@@ -99,7 +99,7 @@ msgstr "Guest Name kann nicht geändert werden"
 msgid "Guest can't have this role"
 msgstr "Guest Benutzer kann diese Rolle nicht haben"
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
@@ -266,9 +266,9 @@ msgstr "LDAP Member User Filter hat eine ungleiche Anzahl von geöffneten und ge
 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:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
@@ -297,7 +297,7 @@ msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
@@ -305,166 +305,166 @@ msgstr "Bitte alle Felder ausfüllen!"
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr "Guest Benutzer kann nicht gelöscht werden"
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 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:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account Verifikation erfolgreich"
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail an %(email)s wurde zum Senden in die Warteschlange eingereiht, für das Ergebnis bitte Aufgaben überprüfen"
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fehler: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} Benutzer erfolgreich importiert"
 
@@ -476,7 +476,7 @@ msgstr "Nicht konfiguriert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, 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"
@@ -489,8 +489,8 @@ msgstr "Buch Format erfolgreich gelöscht"
 msgid "Book Successfully Deleted"
 msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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"
 
@@ -527,7 +527,7 @@ msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
@@ -685,7 +685,7 @@ msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 msgid "Found an existing account for this e-mail address"
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
 
@@ -718,34 +718,38 @@ 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:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Es werden nur jpg/jpeg Dateien als Cover untertützt"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "UnRar Programm nicht gefunden"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Fehler beim ausführen von UnRar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Gestartet"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
@@ -762,7 +766,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -828,7 +832,7 @@ msgid "{} Stars"
 msgstr "{} Sterne"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Login"
 
@@ -844,7 +848,7 @@ msgstr "Token ist abgelaufen"
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Bücher"
 
@@ -869,7 +873,7 @@ msgstr "Heruntergeladene Bücher"
 msgid "Show Downloaded Books"
 msgstr "Zeige heruntergeladene Bücher"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Best bewertete Bücher"
 
@@ -878,7 +882,7 @@ msgid "Show Top Rated Books"
 msgstr "Bestbewertete Bücher anzeigen"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
@@ -887,7 +891,7 @@ msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
@@ -905,7 +909,7 @@ msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -915,7 +919,7 @@ msgstr "Zeige Kategorienauswahl"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Serien"
 
@@ -933,7 +937,7 @@ msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Verleger"
 
@@ -943,7 +947,7 @@ msgstr "Zeige Verlegerauswahl"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -967,7 +971,7 @@ msgstr "Dateiformate"
 msgid "Show file formats selection"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
@@ -975,7 +979,7 @@ msgstr "Archivierte Bücher"
 msgid "Show archived books"
 msgstr "Zeige archivierte Bücher"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "Bücherliste"
 
@@ -1002,9 +1006,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "Das Buch wurde dem Bücherregal %(sname)s hinzugefügt"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1027,57 +1030,60 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 
 #: cps/shelf.py:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Dir ist es nicht erlaubt, dieses Bücherregal zu editieren"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, 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:307
+#: cps/shelf.py:312
 #, 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:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 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"
 
@@ -1110,177 +1116,177 @@ msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Ver
 msgid "No release information available"
 msgstr "Keine Releaseinformationen verfügbar"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Entdecke (Zufällige Bücher)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Von %(user)s heruntergeladene Bücher"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Suche"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Bewertungsliste"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, 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:1447
+#: cps/web.py:1473
 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:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 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:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, 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:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
@@ -1293,31 +1299,31 @@ msgstr "Keine gültige gmail.json Datei mit Oauth informationen gefunden"
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre E-Book Konverter %(tool)s nicht gefunden"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s Format nicht gefunden"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "EBook Converter mit unbekanntem Fehler fehlgeschlagen"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify Konverter Aufruf fehlgeschlagen: %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, 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:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Fehler des EBook-Converters: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre fehlgeschlagen mit Fehler: %(error)s"
@@ -1351,211 +1357,211 @@ msgstr "Admin"
 msgid "Password"
 msgstr "Passwort"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Download"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Bücher ansehen"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Editieren"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Löschen"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Öffentliches Bücherregal"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "LDAP Benutzer importieren"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Einstellungen des SMTP-Servers"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP-Hostname"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP Port"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP-Login"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Absenderadresse"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr "E-Mail Service"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr "Gmail via Oauth2"
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Ordner der Calibre-DB"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Loglevel"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "Externer Port"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Bücher pro Seite"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Hochladen"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Anonymes Durchsuchen"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Öffentliche Registrierung"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Remotelogin ('Magischer Link')"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Reverse Proxy Login"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Reverse Proxy Header Name"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 msgid "Edit Calibre Database Configuration"
 msgstr "Calibre Datenbank Konfiguration editieren"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "Debug Daten herunterladen"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Logdateien ansehen"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Calibre-DB neu verbinden"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Neustart"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Calibre-Web beenden"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Update"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Details"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Aktuelle Version"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Nach Update suchen"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Update durchführen"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Calibre-Web wirklich neustarten?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Calibre-Web wirklich anhalten?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Updatevorgang, Seite bitte nicht neu laden"
 
@@ -1567,39 +1573,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "In Bibliothek"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "Sortiere nach Buchdatum, Neuestes zuerst"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 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/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr "Sortiere Titel in alphabetischer Reihenfolge"
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 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/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 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/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "Reduzieren"
@@ -1729,9 +1735,9 @@ msgid "Fetch Metadata"
 msgstr "Metadaten laden"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Speichern"
 
@@ -1754,7 +1760,7 @@ msgstr "Lade..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Schließen"
 
@@ -2234,50 +2240,50 @@ msgstr "Downloads erlauben"
 msgid "Allow eBook Viewer"
 msgstr "Anzeige von Büchern erlauben"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Hochladen erlauben"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Bearbeiten erlauben"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Löschen von Büchern erlauben"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Ändern des Passworts erlauben"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Editieren öffentlicher Bücherregale erlauben"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Sprachen ausschließen"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Zeige nur Bücher mit dieser Sprache"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Standard-Sichtbarkeiten für neue Benutzer"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Zeige zufällige Bücher in der Detailansicht"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Erlaubte/Verbotene Tags hinzufügen"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Erlaubte/Verbotene Calibre Spalten hinzufügen"
 
@@ -2430,21 +2436,29 @@ msgstr "Zurück zur Hauptseite"
 msgid "Logout User"
 msgstr "Benutzer ausloggem"
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr "Sortiere Autoren in alphabetischer Reihenfolge"
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Sortiere Autoren in umgekehrt alphabetischer Reihenfolge"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "Sortiere Serienindex aufsteigend"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "Sortiere Serienindex absteigend"
 
@@ -3046,15 +3060,15 @@ msgstr "Erzeugen/Ansehen"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Erlaubte/Verbotene Calibre Spalten hinzufügen"
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Nur Bücher aus ausgewählten Bücherregalen mit Kobo synchronisieren"
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Kobo Auth URL erzeugen"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index fe3cf95661e79caf882ba50d2a788ecf8a852cb1..47ef49892936030cc3503c49ae16fb00590c85fb 100644
GIT binary patch
delta 9570
zcmYM&33yJ|zQ^%RNFpMVNMt67%p!uwWC%jc)ELApw1}}<V{B7fO;NKJRa4CrIcPOi
zl$uIQ8#TpHE^Tqz;<Qy)&;9<a{XEx`C!e*}-g^!I^<VpaW77$jS;t)L>%JA1S^Voz
z-m*e*ny+gA|L<CqW!0lvhPAM2v}Gk?1JwNkkxNz~>e2O1`#ub(egWO_G4{a!#h%zT
z#<DUj%eJ;sNT=a8R>aU)%gVw?bi={uf+H{hM<YMhoBZ;?UFe0Mq9>k2KP*LltY4gV
z-#Bw$P1Jo!SdsCqMikUhbH@&-4s)?84ns}gb<_l>pe8Z{wc__s_iab@^BF2KUtuKP
z#wzF<Z|?WQ5bCiQ%=lI|h5FbZE8!wk$E(mCccCV90JXBOur^-B2y{y@1I44ZrUUxp
zWDLT0(G|C1W!#P4Sc0}2g|ig2qEf7Y53w3Pa_X*(rjS*}a12CsoPi$L4HfGC$dC0V
zzmjn;YC^X$6TPXVVtZ61XC)GUbugEPI=BQ`lywBPg8P_@<+!K`_Qqfw=hWw+CbAL3
z@Q`!;nsfb6r(QM5L@)u#KPv+jkpW4>UmXskL7|+9Y?rkGmDOLP5B~04cd2Uzj7Ci;
z3kP8?s>4rFr{pkdVRumd|BBjD55hv$TVbg2a%~FU6egnvD#GTt8d<z`9Tlp|oWUyS
zgDF@Oy|Fv;V-4k(C$2!{$VSxtpJHV^f!X*SYO4ZBI3=f@MM2p*7&Sv18{=YBhu@$V
zUPB+ekLvI_R>evU%yA7ueyra7s)qAXxwH;z;wDrizQP)K3z-1%XE_R8EmX$|j;W{t
zTA&8*irSidY>V?z9sYnC=n?AqKT#8RX=vUb-dKrxAnG(lqPDI!D*vo(=fYT2NGGEr
zQiK{{Gpd85s0Y7Bh4Kz6GI6AIbxcF8v=eHDqfyB`AGOy9P!qk3fp{H57~lGng7&If
zn#uYI^rfDLT1h)p1aeW?J{&dC*{Fe*q9$65n$S5^@|B^U`w7+m->B!@dEF|qL1?QX
zo`MF-M6I+nDwJJN*ZVn+MkS+-0r&<IZR-Q9ju)^g{)~PYN2-%1Ruj~M#-b)P8#U2o
z8N^=$Z=^xzcModj-=JoE1z)THl_P(nvbS8Od0)gMd1U3HLjMlN;C9CgsD7V11~f7e
zYlxj`@7{>``%~CRLq|M_nwdLC;KeaPtt<=cU{7p?b5Jjm)2K-NhFXYw6Ek6dOrRc%
zO1iG7z0X4}a3HF`kv0W|_<dB!x1m<PA2skX48^Oc3H^nNNH}p;i0fkrw#IHa1a;p5
z)Ic{-k^2SJ|L>@YJa?|!<+IG5S3z|YfJ%-AsEK8x9_)@hV+}-2;6rSSdr$*CbJ|^-
znTQ6WB9nwsn1jlJkw|)2)6q@m{{RJb@C9n%)2NADar^_TQTOGws7S=1?#sqN?B>)9
zocc6W(k(-NtdsoGE7_xkSx^${xhxFO`R_%c9t~r$8Lmg|*=^KHAE0Lb59)OIaQL-F
zA*l9v)TwBU3T+FF$JVHYj6?M^AGOdAkzKU5q4LlAiGo%Z)zZwYIclIjs2s>gCFxXD
z=oX=p^fYSV%UBn0pa!T)hHB4)F#;n{Tak@Q(md4jub^F#!bA#6ra}zD#TbS=kUg?a
zqdL5Rwed1mz=}C$q8_OG{IEQRq9#-ml|!8|0S96-zJuXdl0*E7s#Qh<N7M>$ZO&&N
zYJe%IncJutuRsm338Qc;*1~hBejZ^GHf+O@!+g~H;Q+S9``A<0skr03w!}Z2!ZI4<
zepJYQKn?g5l}zsKOfoe>t)LKfes^IFyyn!Oq4qq!JsFR!Pz#%fX?Oy)u>YbaP{HnC
zlBo(Rt3w=Xqi$$~T4_tvDHx8PScsLd2sP2AsOuY0$#wu0`cqE*3hMp`sQdmv541fx
znt}b%lZI$?#rmk6$Z+iBTp!{%7IlmY(G8b7?Q2jg+>RPxH)>&@q53<6!FbcuZR;5Y
z?V)!kv*HxgjZIKDcEuPRg|WC46_FCGjJHq|eu!H66J(n$*UlV4?2MYg3RH4$Mn&KV
zy6OCvQqX{9s0chlFZ?g+0k4<L197N<8e<jAcIsVF6X}I|J|DGp<52faK}BM&Q(uDG
zigoCs^S_+}A8gjgsATyW71F3KrlUkuNE@Oil!+CwJ8FPFSQTG!oP=7yT-1bDIQ2EC
z3GPHacM$Ca3MVNj%O9gc9>dv*#OA00^HCj6N4*#3qdMM>TFG8i$0ev2)+zMCo2bY>
z!UpKp%|xmZY71L;BmN3i0S$TszJ}FsG3wlJay*2}k&CE~|3*c~v%9JLq56qIMWQZh
zB3Y<6XHV1u3Q*5a#c-V8o%s7v*hND%{1WxR52y(|M4jh~Jxo0UmGv2@j=JKDS2X%j
zpX#(PM1Sh*QMvI6YJ$g5kvr@7y-lG34Og9ps=S^w)9R=_jz%R<ZPbcWoqAJLM{Q9n
zehKyB8i>(23teyvDtC4`?m_jtA2l(%gn~DPlc>-4%gzmfx#rWY1}4*94>i%jSRI$6
zl6EK7$9t$;3hrgzh^??5^?cNXmZJtPK`rPg5<%NKYYNs4)JlGLEZ5si%m>vTiJC}#
zR3wI=A~n*vJ_Qw#B2*GD!WSQ6s4YB=O47R+h>y`#=ijrBNrq~u4pXouW;^vEs1=UK
zIQ$4T&^c7nmZFZ+BaB5WkE023r~wO66D~qUZZYcqt>~lke}F;&o<bd`TNr}(QG4gs
z*If5>jB;#@ns9eiat%R+xBxZac&B{|Dp_ZvLca`saV^>!u$V$TevW$Z9;%~XF&O`Y
zN+$1qCIWsKL%j*AqkPngCZbNk8<>GBo%Zih<NS!4@B^p)SwG^hP*&=1_SzdYPy{N}
z(fDpT{-nZT)UOZV6A@btG=HSdMBR4?v+y1&lCgu#mStfQ_3@}AUx&wWFYd!hgNZ-+
zW+e?VUku(t&G0%F<3rS*t;;tZe1cu5pTap9GSm#X7VA*|1QnUPn2uGL^(@RmwV%Q$
z{0+m=-+tL-V=Bhd&>3stMAVE|p|)lRy5dFDgvu}zpI}q0`-(Z9qp>0N_1FzBVLMD5
zZjR$b)N@-=6SVJ8=tLoG1cPD$YT!E<f&al!3>ax9l7cDJ`y)ZHmLS_{{e?ZTX90cS
zPJSu$!K2K#>b9udD8g9$5NqiCpKvbR#l~EChVGa?+DxE1YC=O$4^BXR*ISKgcms7>
z0>+rn{RY^P`ZOeOt<$J2iydnwHW|lLzl)wa|GmeVPq|^(feSOR6`n<{v>JDpVH?cB
zm{-jNMqwN3yHV{=u`@QCU{<`)@jTX}-S;)K=PgkS9g4n;Z>^`Gz1WAT_;1X`=+{kq
zAtqAakJ`K2s3fYve#K)p{*9y13tyRJzWq)_KkBDZ1Kz+;44rIQZ(|19I;US!h{NaD
z5M!qBH4FQq_VRbs7WAKLIvj)Koizu;@Bwx~k7;Jh`eI$`(=ix#VIZEu&G;j7u&km&
z;?GI2{#|HR+GDyoCJS&m?fX!tp#x!x!Le8$SD=#fG`^Ss&Zq7%gSQ;MhjlP?rkQv<
z)CBV|6?bA+yfc#rRY>EIYK28u6IY=+{tU@d>oRIZf1z?Cj!{<QXw1UOybSbwd-TP=
zj$=?OpM~0rRZjbEOrrj!O`#iwN6v+uH_VEAV*}a?F$MQvb-as8rsud0>%M7{_dKe@
z`<RZwZ<%E7hDyq{sIC4D)lb4)lM{Ax3ax0Ej_UXrCgUHdq>Cj}WOvlDnu$&E8&oL0
zibyzYg_*bu6{(+5dmr?U87Kv#sgHA9fkfK2J~suc3>EU{7=a=4OuY#z0(t0z3(*tT
zqjKS6T!TNN2AD}AP_#B<2&ODxP<#n>{U~aSf5I@GfA@FIfH9cFg*K?YnuzLP9_qm@
z=!NI7H<qD}Y1%^mEW>xP4L-#|*kX}!BdTB5#b!$zVl(Q)@gU<{+bGn=p-cF3fs3#n
zrY+^~J{*qmxC{H^B_v&}v}NXc32K7nmYWI3qE1UT>i!Yvji*oxxPprG&u9;$;I_gf
z-Ds>reK7{%T8zYl7>8xp4_)6gdz+7;)NRz3t;XYc2zB3__sy35i0;&%;EOFrO(<j~
z@%N>WxYBf#g*~bF#aJvxt?ViWW4TrQk2Z#46kf#r_zXjEFK1HEokK<R4@|?z4@?sF
zL7l1<sGK?T0rB^zFoIeT&cFm*>3AIVz;Dj=s1HrODQaTlQ3Jk*io{{mfMsZ-|60Bc
z;WF%sA)Hx7bTq2pMK%RJa2)l(bJPQc>rIxsY%nYH#_F^uqV_Nw6@jj(l}>cpH#qLa
zA+#UCx){CD{HIe7^r5~4365odL}3Ai79W`x$9Yt;d2BN8ffP)oJ`~e&H8MA=6ti*C
zW;3A@)B?_+wxazObBbQZUeu>yXDr1yjNbYpNo}hW1wR^I!%Qqf-FO^ZqyILOH2u(%
z`c%xtxu{6oL=E^WDwis6H{X<M;G5K=F&TH@+gOHL`O7=>{eUS~*vU(UhCz;xuqE}`
zyUc(mu`%^h3`F0L&3{7G#%9!$umg_4F<63qFmX5E2k|YOfX()p`ab-I`slqZKp|^d
zY`#!*L=ChM73#C7_kioaSS_aGQapm=u;)JWB07nha3n|JEqocZHNWBtY;b^2PCSE?
zuraf8$9-s5r*McuEi6Ut%~OoWNY0u<+yON}9_swA#Q;2n-gpu9{5?#-$_LFGFBOBR
z4|TLr{k@NYxaA=6SHlq+)WNsTjZe^zy4PpsxYTmY!6@2?J1)Q&>cyxIub}#QjCwwx
z#7rm=n^4ciMz{={;`tKdua$a#ZuTe>HKC6&2@hd7KE#ITb;u-VOU$9Z6gBWwR3x5Y
z1XlclcL~Pg1l)oeC+x6E#@49*C)pI#!Dg(DhcO%<U?NsIVsauAJ5!&C8t4Qn5|>ab
zeU8!Sd(?corK2Lz3l*VhSPeHg9zeb7?K2cyC|t$`ScdOl!I$Q5!M{++VjVLBRl*ij
zYoH=E2({;9F&tN66qY#NLLE!j<0b+@Sc7^tM(UL@n8FMi-oW{~@hh{^rP!DH9aQL=
zpD+)O#7yc%sQ1Bftce#KA7Ki0-;*XuTce&IfUn})7>3Vrg3f=)DKo=`n8Sq)7=yo{
zR^oHoe9=fnZNYF<C_hCHJc}*y66#choiPz<h)t*u#8g~^b+8n*wJu+Cd>P+LrqBk9
zurYpz_0jvRSxGi3YbT+S=3khIw;jFDnE{$$bJ{0hGVVv+cMp{de!O**JL%|-ZP8Yt
zD}^4IhhDe`wUWc=iI>nH{|D8<GgQ)ferqBZff^_U+u|VXh1*fNRpGpO&K=c%kW-I4
zPyDqP88j%=xwr<Wp(Yk`!6a1_=2LHllW-f>!CK#OBCrb<;3;f|so$F<orrnV58^1S
zUTPLJ2P3F2Dkc7!d9l-Q6BVlR7tP0V3@Q@+Q4@U~C*xA|Mz0^t{WUR!dNwLD1F$tt
zz*bm-X;}V}d8KD!GW7zRf-i*+up{n9P2e9?2a%V}xgLRwsV~IWu+|kbf%j3zaT{ty
z5Ajv3dX+rE+317m*UZG)VG{KLPTgKWA&`a*sH`tRt?V||$0w*gi!C#6z*N*q3a}Aw
zL~Y$o48V%l&HZ7h+(~rIKs}d(VK^P5b^cdVP$-UKdwh%<Fzbftpc6Kwo`<fu5_SJN
z%*6}Hi^NK}Y3zuK;8+}vOR*mQgTa`5%e*hzV}zDGl7ePBAGMN|sO0+sGw>uXNs10D
z4vH>IE^gejjoXq7{c9HA>^HBRTfOk)jLiC}#jg&iRIXflapAzpV~UHu?d)Bgb8BGv
F{{wZ7Nw@$2

delta 9897
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

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index fad7c698c..3e5b003de 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -15,17 +15,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "δεν εγκαταστάθηκε"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "εγκαταστάθηκε"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Στατιστικά"
 
@@ -64,17 +64,17 @@ msgstr "Βασική Διαμόρφωση"
 msgid "UI Configuration"
 msgstr "UI Διαμόρφωση"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Χρήστης Διαχειριστής"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Όλα"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "Δεν βρέθηκε χρήστης"
 
@@ -82,7 +82,7 @@ msgstr "Δεν βρέθηκε χρήστης"
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Προβολή Όλων"
@@ -91,7 +91,7 @@ msgstr "Προβολή Όλων"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
 
@@ -271,9 +271,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
 
@@ -303,7 +303,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
@@ -311,167 +311,167 @@ msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 msgid "E-mail is not from valid domain"
 msgstr "Το E-mail δεν είναι από έγκυρο domain"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Προσθήκη νέου χρήστη"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Επεξεργασία χρήστη %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
 
-#: cps/admin.py:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Προβολέας αρχείου φύλλου καταγραφής"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Αίτημα πακέτου ενημέρωσης"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Κατεβάζει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Ανοίγει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Αντικατάσταση αρχείων"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Σταματάει το διακομιστή"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Η ενημέρωση απέτυχε:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Σφάλμα"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Σφάλμα σύνδεσης"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Γενικό σφάλμα"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Σφάλμα: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -483,7 +483,7 @@ msgstr "δεν διαμορφώθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
@@ -496,8 +496,8 @@ msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
 msgid "Book Successfully Deleted"
 msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -534,7 +534,7 @@ msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η ά
 msgid "Failed to store file %(file)s."
 msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
@@ -692,7 +692,7 @@ msgstr "Το αρχείο %(file)s δεν βρέθηκε στο Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
@@ -726,34 +726,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Μόνο jpg/jpeg αρχεία υποστηρίζονται ως αρχεία φόντου"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "Δεν βρέθηκε δυαδικό αρχείο Unrar"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Σφάλμα εκτέλεσης UnRar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Αναμονή"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Ξεκίνησε"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Τελείωσε"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "ʼΑγνωστη κατάσταση"
 
@@ -770,7 +774,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -836,7 +840,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -852,7 +856,7 @@ msgstr "Η μάρκα έχει λήξει"
 msgid "Success! Please return to your device"
 msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Βιβλία"
 
@@ -877,7 +881,7 @@ msgstr "Κατεβασμένα Βιβλία"
 msgid "Show Downloaded Books"
 msgstr "Προβολή Κατεβασμένων Βιβλίων"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Βιβλία με Κορυφαία Αξιολόγηση"
 
@@ -886,7 +890,7 @@ msgid "Show Top Rated Books"
 msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Βιβλία που Διαβάστηκαν"
 
@@ -895,7 +899,7 @@ msgid "Show read and unread"
 msgstr "Προβολή διαβασμένων και αδιάβαστων"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Βιβλία που δεν Διαβάστηκαν"
 
@@ -913,7 +917,7 @@ msgid "Show Random Books"
 msgstr "Προβολή Τυχαίων Βιβλίων"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -923,7 +927,7 @@ msgstr "Προβολή επιλογών κατηγορίας"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Σειρές"
 
@@ -941,7 +945,7 @@ msgid "Show author selection"
 msgstr "Προβολή επιλογών συγγραφέα"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Εκδότες"
 
@@ -951,7 +955,7 @@ msgstr "Προβολή επιλογών εκδότη"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Γλώσσες"
 
@@ -975,7 +979,7 @@ msgstr "Μορφές αρχείου"
 msgid "Show file formats selection"
 msgstr "Προβολή επιλογών μορφής αρχείου"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Αρχειοθετημένα Βιβλία"
 
@@ -983,7 +987,7 @@ msgstr "Αρχειοθετημένα Βιβλία"
 msgid "Show archived books"
 msgstr "Προβολή αρχειοθετημένων βιβλίων"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "Λίστα Βιβλίων"
 
@@ -1011,9 +1015,8 @@ 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1036,58 +1039,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sname)s"
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Συγγνώμη αλλά δεν σου επιτρέπεται η αφαίρεση ενός βιβλίου από αυτό το ράφι: %(sname)s"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Δημιούργησε ένα Ράφι"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Συγγνώμη αλλά δεν σου επιτρέπεται η αφαίρεση ενός βιβλίου από αυτό το ράφι: %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Επεξεργασία ενός ραφιού"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Το ράφι %(title)s δημιουργήθηκε"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Το ράφι %(title)s άλλαξε"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Υπήρξε ένα σφάλμα"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Ράφι: '%(name)s"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -1120,177 +1126,177 @@ msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε
 msgid "No release information available"
 msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες αποδέσμευσης"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Κατεβασμένα βιβλία από %(user)s"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Συγγραφέας: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Εκδότης: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Σειρές: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Αξιολόγηση: %(rating)s stars"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Μορφή αρχείου: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Κατηγορία: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Κατεβασμένα"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Λίστα αξιολογήσεων"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
@@ -1303,31 +1309,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Το εργαλείο μετατροπής Calibre ebook %(tool)s δεν βρέθηκε"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s μορφή δεν βρέθηκε σε δίσκο"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "Ο μετατροπέας Ebook απέτυχε με άγνωστο σφάλμα"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Kepubify απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Το τροποποιημένο αρχείο δεν βρέθηκε ή υπάρχουν περισσότερα από ένα αρχεία στο φάκελο %(folder)s"
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Ebook απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Το Calibre απέτυχε με σφάλμα: %(error)s"
@@ -1361,212 +1367,212 @@ msgstr "Διαχειριστής"
 msgid "Password"
 msgstr "Κωδικός"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Ανέβασμα"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Κατέβασμα"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Προβολή Βιβλίων"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Δημόσιο Ράφι"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Προσθήκη Νέου Χρήστη"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "Εισαγωγή Χρηστών LDAP"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Ρυθμίσεις E-mail Διακομιστή"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "Όνομα Εξυπηρετητή SMTP"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP Θύρα"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "Σύνδεση SMTP"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Από E-mail"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Διαμόρφωση"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Ευρετήριο Βάσης Δεδομένων Calibre"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Επίπεδο Φύλλου Καταγραφής"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Θύρα"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "Εξωτερική Θύρα"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Βιβλία ανά Σελίδα"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Ανεβάσμένα"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Ανώνυμη Περιήγηση"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Δημόσια Εγγραφή"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Μαγικός Σύνδεσμος Απομακρυσμένης Σύνδεσης"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Αναστροφή Σύνδεσης Διακομιστή Μεσολάβησης"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Αναστροφή Proxy Όνομα Επικεφαλίδας"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Επεξεργασία Βασικής Διαμόρφωσης"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Επεξεργασία Βασικής Διαμόρφωσης"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Επεξεργασία Διαμόρφωσης UI"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Διοίκηση"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Προβολή Φύλλων Καταγραφής"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Επανασύνδεση Βάσης Δεδομένων Calibre"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Επανεκκίνηση"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Κλείσιμο"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Έκδοση"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Τρέχουσα έκδοση"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Έλεγχος για Ενημέρωση"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Πραγματοποίηση Ενημέρωσης"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις επανεκκίνηση"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις κλείσιμο;"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Γίνεται ενημέρωση, παρακαλούμε μη φορτώσεις ξανά αυτή τη σελίδα"
 
@@ -1578,39 +1584,39 @@ msgstr "μέσω"
 msgid "In Library"
 msgstr "Στη Βιβλιοθήκη"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "μείωση"
@@ -1740,9 +1746,9 @@ msgid "Fetch Metadata"
 msgstr "Συγκέντρωση Μεταδεδομένων"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -1765,7 +1771,7 @@ msgstr "Φόρτωση..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -2246,50 +2252,50 @@ msgstr "Να Επιτρέπεται το Κατέβασμα"
 msgid "Allow eBook Viewer"
 msgstr "Να Επιτρέπεται η Προβολή eBook Viewer"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Να Επιτρέπεται το Ανέβασμα"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Να Επιτρέπεται η Επεξεργασία"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Να Επιτρέπεται η Διαγραφή Βιβλίων"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Να Επιτρέπεται η Αλλαγή Κωδικού"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Να Επιτρέπεται η Επεξεργασία Δημόσιων Ραφιών"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Εξαίρεση Γλωσσών"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Γλώσσα Βιβλίων"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Προκαθορισμένες Ορατότηες για Νέους Χρήστες"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Προβολή Τυχαίων Βιβλίων σε Προβολή Λεπτομερειών"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Προσθήκη ετικετών Επιτρέπεται/Απορρίπτεται"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Προσθήκη τιμών ειδικά κατασκευασμένων στηλών Επιτρέπεται/Απορρίπτεται"
 
@@ -2443,21 +2449,29 @@ msgstr "Επιστροφή στην Κεντρική"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3066,15 +3080,15 @@ msgstr "Δημιουγία/Προβολή"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Προσθήκη Τιμών Ειδικά Προσαρμοσμένης Στήλης επιτρέπεται/Απορρίπτεται"
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Διαγραφή Χρήστη"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 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 99318bb3349c4f051e35a547b01ecdb816c3043a..82ed25531ba509e2edfc2e09850d3af6c598f121 100644
GIT binary patch
delta 11106
zcmYM&3w+OI|Htt!JKE94X0ze9nK8`RFw<n4!yJYojh6Fq%AAY4_^wh8CCM>|oL4#I
zFvpTZ#T263?T$Mo>Q70c_!n;cU+-Pl<MHpIp4WB#zQ61GT%XT%eXY%0=yhSfm-~IV
z_acXXHdS_<Sez80-v9q|qM_q7qk9tT;v;N~bsL%I^D%+`7!1d^?f3@t(Ek)u@JIB=
zYJ9m5#^RHX<2n;)WH9grwnDFD$ML~TY>PSQhcBZS&cPb^Cf3JN48X521kYm-{*2Y}
z4(hppCT2Vp^<3MEzUw&MX=uSh)I@`=&teGu=P?vtLj|xH_53naAgfV3--~+gIBK46
zQ5n60@#sYwf-w>Gd~=LpeJ7WOA|8r0ah!eNbxfuIE>^*>?fAE-RNlZ4{0p^H-=>b!
z6=QG!j>J4Xie%rZMjhj@Eh?bF=tk0*L4)i&%TeV&hSB&v`r_Xhh>x%;1`?G@5{t?}
z0&2&Z=#9Bp4fAY&5Nd<N(Ss9E^DjuH{`%q;22`WHs7QZ6f_8$^Oki!WHT}`p5;veq
zZ~^uG%Sf4>-!KVdnwyPuzykV(s6fk589r|NSDKT5Me>k=S{T*BJkS#Lg`T!wgi7@c
zjKKw154WN+bQU%71yqXv!Uh;kw7MNR7=|NJpHD@tyWFLrg?8a!JZbwW>1N_w)V1r5
z+UW$;LenrDmtqEPLQVWXs1o^cm8xSD>bYc809lxgy-+207t&BF52H?JIg$+LENY?v
zW~b~<4626RP!m6edVVbGY)r#;I2%>Ulc+;>2XzagsGkC9ftlC|na_1zrJ>Zmjf!v$
zYQi!M#e=B#z$w&%p^rHZWp-*|HSCExbi=U@j>eie2W#U7R3M+DN_7=A|BVW%|2-O7
z$d|AbKqRVm4X`uzL`}FH^~K$&1wXa@a#Uu{pl-zvsO$PODpP-;uB%@gQ|hXy)HlE+
z)_3~QP|94?gYThswhg23bBx6AP$jvIvFP)-2`nD9U>mG~xu}c|M3to2_IIG>IgHBG
zIdp5&_?w2VO^vqZ5M`rwI20AYD2&0EP$gK25xB{E7**SEP?@-f%H&@dja9PDhU%g=
zkd9inQx^4CYDY4lh+jsX^7*I<R-hLA5cS3Vs8XG@{qIl<-auvGKB`1M9C1A#W{pQ3
z@-$S2GEj%SXSQon@)`pq!C7g&fT~?gj(G()MeSrLYNyjs0ltL_d@U-F?N|#Bpf+*=
zwSlXs=kK5np&xZo$wOQk$uwG`PW3RXgG(_H_gXKaCiZP_OhBbD2YcXPR7tjDH!Md5
z7SX{hlz^&z9%{Xz$REd@&wuOD_y(1l2dJGybTkpiV?+AQQHOINdgCb64#%J-oPtVu
zDf04j_Ml4f8~Wf~48}*OK!S5C4zcSb&`>I}Q6Chc0xH2oEJaOx5|zU5QKh+wI+Q-0
z9H%$NVSSv8nr9{I^PQ+OcG~(Ya^oG}&e{O=&!OSVKsQvxPoQ=<$T}Rg)6rN3C!;2I
zQHOCkD!@&s@9#&QrDLdo{koX<NHl7mp{Vg<j9`7IgobLh7<KPApbpzURL#$zN^%QT
zqKCF0+132zQWte7J0Wjvrx5*cAqL<IRG{yn0^egjgRU0*od$m#uRQbDWe+5H=RMSm
z<`!y#5Kflf2encCblcCxRQiLEi{mUnj*)W~6>v;<^Il2AX7u}D7S8NW{_D~>#(+|I
z9ksv%)E6Urm@hQJEc%1cAJ?E#xDmDU{a6K0VKAPz<5y9K?;fh8PQH23`Jgh9l286M
zQC9|(s{Y8^)ft64B&DbfTt)@<2(?gDPjkrPQP(a5mHHkSg0oNyFToUCiJJc;>a3l^
zK)mSEh@<f<YRAF7OhEN8h<-Y1!uF^Md!tT&Khzm1MxBvasG66e7Wfbw;V#t9FQEdz
zf_m;IRz~-48jA2fR>el#CG9v9wX=TM5XWLuT!tPzj=apA>)0Aoo-i+@(WnJyqc-#=
zY6GRH1$SWr?nO%PI^WUIM3wqDP7`d8O8rD6CTA<AVdW>yp=^o#aZ314HT(t@_^+t5
z@n7_yPk}KJmEl}eAVrvpQ!rcie-jNI!rxFk4C`y&XgR1?>^R$>hdMN$U`ITU+PSA6
zWx_(#&KIBpS&BN0YcLeIS`XUKPho=Y|2Z1k$pci)!=5s=s*Q@c0qXN~48yLd9rw5W
zVpMHQP|wXl9kzE-3x9x`cOU9(9L4H*5?wVe+Xw!#dKa409)>zB4N()MqITF8wLp8+
zDei$$ScqD15^CNVSQFo|{hg>xe}T%-Z-wMv5B{%xFz{*f&QHYpjCVsFmdU7vmZ36G
zirUFu+dqh%=zop5ShK$gWC%vnpMcuH8>kGugWA}Z{^VZ)?6MDhiAwo5s4reYeL?>}
zr3I^_`Z1{5rr7Z|r~uoe7RpEMus`a#5vYt!vV9j-vbkz_(O7~RxEx#KSyY5o2bzhZ
zP^phY1(t|<A7r5x=!i=F6V_p<jZ8u<^a^SNbM5#-RG{uU8k%66ec%A<z8^tdlbfg-
z)*WPijD8$7;b2rC&!8516>H%_)IvK@&+S7k^chCtX;cZXBAIucyEM`m2pMcrn1iZ$
zcT@@|Vl2LB$KOGf-~iUZe_F4h4p-$NW`RUh23w&rmu1I0pyn;WP~HDQG!)r5jKG<w
z9j!z~x*0uq0CiR_q5`;$dftDi38Xg0&~It`y->GeG-{q#Q0pv0&9hnKtnVDAp^46*
z4$&{D2=Aa$`4E%PXP7YsQ|R}z&c+7x_hCF<MwQTKxOu)QdgwoedhP|(yz9|b>NnYe
zi>RGnK_9$>I<@yvsq`IT`XQ(ZqEUy=gK^jt>tQcU#wqB*Qd9=Y(F@O`&fIq+$iFv@
zUm1`$v0`CVChlVw^c!j3c)jp(`a@CAt;KMBANA_~7`376s8oAKnOl{PI?UrynOTpu
z@zf~t-;Bl$1{Arc$V}W3wevhw#097w6k5licJ5l|p<c<WY=0XnphM_~w@{hAYd`lN
zZ88|;($Mv)gStMgQHQ86>e@^~9io@e7nh+2*Ptf+6zkyEwtow?Q|B2|>onB&o<`lG
zp{UfCV10Dor11oe-KYfvpEVIjVMPj2Ur0w~pabgK6<`${iwbzEbrGtR+fmQ$wti*3
zf(ra0`s@A&k1;8aL}efrm9o~z15OTV!mg+Q@-YC1plUw`6-Wst;T%-pJ5lo-N1c^3
zs7#+nmGm|?(Eb0LMj``o#rDT&45nX*x~D~`SMzi`z8AINQB+{3F$B+|zV{O<<$s{g
z#9h>L0b`A!r~s;C1Ks~98ro?#Dg#}tqp-9Rzj(y9j3<vbH64RGT#M0z<(Pm!qcRda
z!EDHb4d~}$GaQG?+**7Nx1h_vPQpa<6U-89MgJ6PhyIhy|6GQnb~FT)(jrvG#-py=
zQVhits2AA<>mR5M`A;@K(j}q}^AJ>tUYJb&!)d(DfNHb>BXAR{R)<j&UqC%~9hJ&Q
zsEm2D4W0gA)P%{X=h~ybSAcpWjzk4K2Xza!qXPNrIr6X6U1gv;20d?H5OG+Iejawk
zL8t{cqn_J^%Fve>hW|nZd<FG<r74^r?1ugD18j(1Q_YK~3F_8#b7|;{MVO5<ur40O
zXuO8XjQ2mxjsj3StcfZ`GS<WvsKb|!3UmNQ;z-o@r=z|%1MA@utcmU?G_-?rn2gt~
zQ7@PmNk`0Ne5!S~9sd(`CK6vXfhD63WgFC)C`N5yEsnwcs0ABNGdu5q9^L=Jrs2Gd
z^?6{Oec-tDDyoKF)6EVNF^+x)>U0;PGBE>n|KC8RdN(%4OQ_n1P-+F#0`*)EjMx32
z%D;6OSb^LiXFuvpG$}Eu?2Vf6X$-`fSQ{5$1n$62cnp==u$Rn2>FA-~6IF@{7>l#9
z8<wJe|K!}Jp;Wef*}O>FU>^NERL$PORNRa@)fX`ae@DGw0$(w&?pW+aKM7TW7qK;N
zLk0XR#$&(?Q>tXF`1yYT4NWu=b?RrJPWMvOf@`re?m(UX|6)Fdy=o>Lg4)2Vs59^e
z*27OwCHfIlFz7Y&TqXw5Z}%Gc522CIfC3nZ3Sb=SjWq-N;cnCps?Ic@r=V)y4mD9%
z)ambwI{hOs0LP+I{twiKmY@#d8f=XFXOjQ=G=5<~k%rAO54OfS^xI<s4nuu$HmW4+
z?dN+?JN*W=zynl@{brlz8lp<l2DP!buo13DmGrbrBa?>L9P?|lER3W79Qxu?^x!J2
zg@;g?`W}^$-%%5Vyl(!w%|>14eyE*4gZkbq)aft9x_AgxD)%QE+F8UKX5yw8KtCJx
zg*?<LA7T41+WunHsosn_6Q9}fbEp7rpaOK}nn3EH58X`Ecn*%Lxc@XX(U+KymoOVs
z-!v0X!j|-Bqjq!%70`F6!}%wMpw~RJa5!qm2^feusL#9G&-<ev{jpeI_y2hs84RpK
zrSd#Bz@WFx--<1;IsGxHv#{1$j;j529EjobP3<ROA^k<DOx(gI==HYwJQcgq?}MFK
z-&sc^1+SwHUF-sLSTa!)<YQwTf-22C)DD)RcD5F~;&xQY9-tPevCw2_IC{~ajKMe+
zqi`lx{QiG64W;}bDz%jsnGDoG-Ht4*ila~gO~vZ?Iw~Wp@fkdVS=el`nP&nf(VvC7
z6+2KFJBteV{$ld49px@Df3Nq#Ao>NU9S%d?f@e|BO+*DU9TnI-jKDn@i6=1>e?kRx
z+l~)fO7`eKkNW&S7>?JLl7GEQAJ~EDcg*2wj5?)VP$elsrEWIr`Yb^O@-Zp{C$OT{
z*onT^GV^>MDzK-}gX1v{-$rd<r%R(6jSKiB-o)vcyWIR(eiU`;V^)}mTcHB#iYmb~
zwqJs+>90lw@Ga(J!b<aAn2bvOTvVycunW3(Xf&mf^{zP-<53IDK}EU|HSr15#D1$x
zN%Aq8egP^I<54Ah8MWg%SR2=%?)@S3$D^2vr;v4Br}ApEa2f{kK_2S*^u+?)iHR7r
z#srpzN_B74j)tQ?e;pOz4vfP4sOPG$HNVnLL<Kwyb!(<q=#ml|x_&EA6P~~t_y=l&
zfORI-v8Ww1!&=xHHDO<j!wIMiEJPjJ71$BiVHLcFn(sDh9^du+vV!%UP#T>v9P8lI
z*bHAp1@a+wz@wOpK^x2q<q6a^dIeSMQ>aXMN=+cSSd)Ga)ZrbCm2nC-!WXdO|Nq~k
z(Vc;BF%28OXYTO;>_>kUHpjcz6PvuxoyHPWs;hip&Okh>glVXG+G0FT#Jac`wV{vj
zG5qHT)L#pSY&3_kKenX*ru7JFg8yPJ*4bosI1)SSIc$gLtg)L->IYdzqH0}?y6@9a
z0lbAO!TX!Ze-j$p8BlG0KwYapunPKZF)x@fjG<rO+75Nf2coX;bLfk6Y=1s#feok^
z)Q6}*KDVAh&3D<gjfbdI*8I@k22{%OP+uH}irhslw8W0Ti-GjFpsw3K)CSJk{%@!=
z5VX~d*GFY66BVFaLPMu`HY%cZn1Khe0p7L7Z!@ppuBcQ#i3+3$m4R`nvoZsF<M*gQ
zQn#C1m5X|A4C;`-gk;!t*3i(xo3JXDThE~~@C)j?1@ADYx)Cb%Y1S_2Lw_(TgCp&D
z2`Ydk7>t`S06#*la|8of-}yHUF9t4S9$vvdm{w*MoQ+D=eA{1!&FHVS{eNL7{R<d|
z*KPkHhSLw(X-XG|%2)<!16h*wodOz)ycku>nV5+SFdI)}Lk!<#u2mb<j>cmwx~Ltk
zK-GE+YN2DO`A%Uq{1#Q}-%){9+0A#A`WPD8Q9A0uB22?+=!e^}Iqt($yn%WyZjV{8
z1!@ENsOO4MpTCPixC1rMLDYKXcKpXZ<i7?3HyKDk|Gj3yWYmP6FcJr23Qj?t^7m0Y
zDMy`+OQ=`yBTT}$eP+BX>iHtnJhM>itU_h(^L^w$ipC{7a1WK58XuVyCRv+eE5_3?
z1IOXxxDngpFQ}a-eQXvOfQ{+Df-P_xY6DkL-;dmH=FfL&JjOr)Dn$!01ee?XM%3Zj
zfqEf*imLqyRE__GO7$hwb-ja4u=XeBFQ0DMl>S1D#v`c1ei4-s_eUC<_#WySc^@zn
z2VgDwVK@#`P=T$+zPJ^=(f^>iX2Gbl5s&S$4{E_>n29?v9dFrw(xHl1x$BIe(TES`
zVjJ9t%EVu&QanNh7IxSyRKwaBwexJ$PWqrS@GL6OMc5A4qi(^^sOxwe^*z5&?fs9T
zp`F%84|YIJGy)aCJk+6DgL;7+M_tE%qYiJS&rGeOQ9JI4%D^C0%{QP*b{6CDN89)P
zoZq;(3{<Bv5_3?IZbW5ZH`c=gs2%-;)$vc%q4hsv0*XUzpfT3LE~xL1##o$S$LFB}
z+=>zS1-jbdMH+g;-NJf!&-Oh>&3F>}FrJDvu@x#4y-_J0fC^|l>I}?5J@*OfY@I`W
z|1v7TpV15b%enumeNegiA+r@Kr4vzawAWFQuD~qZVaNYOP3(Ql9M%w2h9XceoCNg4
zW~lixY`-UZ)9;50V8Ag7qFN4NKwq4Tif|dm;YYY2bV5W~rAGBL%8G~Gt5UY1_)#Ul
tW}c=Qty5c;Z5rpPRH;?jiSZ$w7o6E2wxIaqYGs{1-X2tze(ZFm{{!9>`Bwk{

delta 11371
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

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index a44d25736..d57c31cc4 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,18 +18,18 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "no instalado"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "instalado"
 
 # "Last-Translator: victorhck <victorhck@mailbox.org>\n"
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Estadísticas"
 
@@ -68,17 +68,17 @@ msgstr "Configuración básica"
 msgid "UI Configuration"
 msgstr "Configuración de la interfaz de usuario"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Editar usuarios"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Todo"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
@@ -86,7 +86,7 @@ msgstr "Usuario no encontrado"
 msgid "{} users deleted successfully"
 msgstr "{} usuarios eliminados con éxito"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mostrar todo"
@@ -95,7 +95,7 @@ msgstr "Mostrar todo"
 msgid "Malformed request"
 msgstr "Petición mal formulada"
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr "El nombre de invitado no se puede cambiar"
 
@@ -103,7 +103,7 @@ msgstr "El nombre de invitado no se puede cambiar"
 msgid "Guest can't have this role"
 msgstr "El invitado no puede tener ese rol"
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "No queda ningún usuario administrador, no se puede eliminar al usuario"
 
@@ -275,9 +275,9 @@ msgstr "El filtro de LDAP \"Member User\" tiene paréntesis no coincidentes"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la clave no válidos. Por favor introduce la ruta correcta"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "La base de datos de configuración no es modificable"
 
@@ -307,7 +307,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
@@ -315,167 +315,167 @@ msgstr "¡Por favor, rellena todos los campos!"
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Añadir un nuevo usuario"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' eliminado"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr "No puedes borrar al Usuario Invitado"
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede borrar al usuario"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 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:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros de correo"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr "Verificación de cuenta de Gmail exitosa"
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Puesto en cola un correo electrónico de prueba enviado a %(email)s, por favor, comprueba el resultado en Tareas"
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 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:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "La actualización del archivo no pudo guardarse en el directorio temporal (Temp Dir)"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Error: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 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:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} Usuario importado con éxito"
 
@@ -487,7 +487,7 @@ msgstr "no configurado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
@@ -500,8 +500,8 @@ msgstr "Formato de libro eliminado con éxito"
 msgid "Book Successfully Deleted"
 msgstr "Libro eliminado con éxito"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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"
 
@@ -538,7 +538,7 @@ msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
@@ -696,7 +696,7 @@ msgstr "Fichero %(file)s no encontrado en Google Drive"
 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:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
@@ -730,34 +730,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Sólo se admiten como portada los archivos jpg/jpeg/png/webp/bmp"
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Sólo se admiten como portada los archivos jpg/jpeg"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "No se encuentra el archivo binario UnRar"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Error ejecutando UnRar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Esperando"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Fallido"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Comenzado"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Finalizado"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
@@ -774,7 +778,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -840,7 +844,7 @@ msgid "{} Stars"
 msgstr "{} Estrellas"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -856,7 +860,7 @@ msgstr "El token ha expirado"
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Libros"
 
@@ -881,7 +885,7 @@ msgstr "Libros Descargados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Libros Descargados"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Libros mejor valorados"
 
@@ -890,7 +894,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Libros leídos"
 
@@ -899,7 +903,7 @@ msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
@@ -917,7 +921,7 @@ msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Categorías"
 
@@ -927,7 +931,7 @@ msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Series"
 
@@ -945,7 +949,7 @@ msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Editores"
 
@@ -955,7 +959,7 @@ msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -979,7 +983,7 @@ msgstr "Formatos de archivo"
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Libros archivados"
 
@@ -987,7 +991,7 @@ msgstr "Libros archivados"
 msgid "Show archived books"
 msgstr "Mostrar libros archivados"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "Lista de Libros"
 
@@ -1015,9 +1019,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1040,58 +1043,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue eliminado del estante: %(sname)s"
 
 #: cps/shelf.py:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Lo siento, no tiene permiso para eliminar un libro del estante: %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Editar un estante"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, 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:307
+#: cps/shelf.py:312
 #, 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:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 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"
 
@@ -1124,177 +1130,177 @@ msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo
 msgid "No release information available"
 msgstr "No hay información del lanzamiento disponible"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Libros descargados por %(user)s"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Descargas"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = $(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, 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:1447
+#: cps/web.py:1473
 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:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 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:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, 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:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 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:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
@@ -1307,31 +1313,31 @@ msgstr "No se ha encontrado ningún archivo gmail.json válido con información
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre ebook-convert %(tool)s no encontrado"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s format no encontrado en disco"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "El conversor de Ebook falló con un error desconocido"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converter falló: %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Archivo convertido no encontrado, o más de un archivo en el directorio %(folder)s"
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Falló Ebook-converter: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre falló con el error: %(error)s"
@@ -1365,212 +1371,212 @@ msgstr "Admin"
 msgid "Password"
 msgstr "Contraseña"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Subir archivo"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Descargar"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Ver libros"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Editar"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Borrar"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Estantería pública"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Añadir nuevo usuario"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "Importar usuarios LDAP"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Ajustes del servidor de correo electrónico"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "Servidor SMTP"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "Puerto SMTP"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "Encriptado"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "Login SMTP"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Desde el correo"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr "Servicio de Correo"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr "Gmail por Oauth2"
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Configuración"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Directorio de la base de datos de Calibre"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Nivel de registro"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Puerto"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "Puerto externo"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Libros por página"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Subidas"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Navegación anónima"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Registro público"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Acceso remoto mediante enlace mágico"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Acceso mediante Proxy inverso"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Nombre de cabecera de Proxy inverso"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Editar la configuración de la base de datos de Calibre"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Editar la configuración básica"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Editar la configuración de la interfaz de usuario"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Administración"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "Descargar paquete de debug"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Ver archivos de registro"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Reconectar a la BD Calibre"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Actualizar"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Versión"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Detalles"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Versión actual"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Comprobar actualizaciones"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Realizar actualización"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "¿Realmente quieres reiniciar?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "¿Realmente quiere detener?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Actualizando. Por favor, no recargue la página"
 
@@ -1582,39 +1588,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "En la Librería"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "Ordenar en base a fecha del libro, más reciente primero"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr "Ordenar en base a fecha del libro, menos reciente primero"
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr "Ordenar en base al título en orden alfabético"
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr "Ordenar en base al título en orden alfabético invertido"
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr "Ordenar en base a fecha de publicación, más reciente primero"
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 msgid "Sort according to publishing date, oldest first"
 msgstr "Ordenar en base a fecha de publicación, menos reciente primero"
 
 #: 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "reducir"
@@ -1744,9 +1750,9 @@ msgid "Fetch Metadata"
 msgstr "Obtener metadatos"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Guardar"
 
@@ -1769,7 +1775,7 @@ msgstr "Cargando..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Cerrar"
 
@@ -2250,50 +2256,50 @@ msgstr "Permitir descargas"
 msgid "Allow eBook Viewer"
 msgstr "Permitir visor de libros"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Permitir subidas de archivos"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Permitir editar"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Permitir borrar libros"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Permitir cambiar la contraseña"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Permitir editar estantes públicos"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Excluir idiomas"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Mostrar libros con idioma"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Visibilidad predeterminada para nuevos usuarios"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Mostrar libros aleatorios en la vista detallada"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Añadir etiquetas Permitidas/Denegados"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Añadir valores personalizados Permitidos/Denegados"
 
@@ -2447,21 +2453,29 @@ msgstr "Volver al inicio"
 msgid "Logout User"
 msgstr "Cerrar sesión"
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr "Ordenar autores en orden alfabético"
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordenar autores en orden alfabético inverso"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "Ordenar ascendientemente en base al índice de serie"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "Ordenar descendientemente en base al índice de serie"
 
@@ -3070,15 +3084,15 @@ 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:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Sincronizar con Kobo solo los libros de las estanterías seleccionadas"
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Borrar usuario"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Generar Auth URL de Kobo"
 
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index 1754e51a94d44f57457a6b1a14bd34fcd815478b..cf1a75d3ad6928ed40cd57e099dbfbfa9a8f302b 100644
GIT binary patch
delta 6781
zcmYM%3zW`f9>DSc#EdbnxePG|Gj4-n#${?;GA5T0xs6*YlSnRU*-a<gzEn=pc0sgV
zPE?b$MQT{3616%-*hLqWSf!}VC6`q;_WSjJ&e_g;=JP!N%k%u6-|u<eS1b1>&HXGX
z@pY|=OCtVTmJ~%9Sf`r3|NmFDK@{cFt%hx}2m0JpY=-l(7OoE0H)9j}Ut<Ygz!6x|
zFp84#6|97>V}&S6L>p+NabY7?#gBrYqAz?C?jH%B!s=YVfHkl>(J)YyiS;lGz1{^K
zw?FcUO8Dd2W}pGj!G_EqEvC_d3$KP72eA(Q)7S>n8bwi4EWj)rg_q%MOu;2s6Q4#`
zwh9eo9ahBcSQ~eR{&(m?f5bHAkIvF)i4`*A3EN;E{gG(OAHXiS4h!%&nwgf3qbL`1
zF$b^1x;PIF;3+iFa-<5;_Hg|$nnCN7a0NAJ_&_?k(tPyAVdy~9uoUNEHhzz$wh9kl
zd=E`&KJtlr@yCoz#7l7&_Qd(<g0`UxINOx`Ta)u#=!8|tuP^pQH{DP)RrjGKS%^Nr
z0;}L!G;^DfPjr|+K3|0>U15DRfR^Z<C`3!r4@p8aC_BN%p>Z1*9N-}|BWutJ)(785
z2iS=YxIbJ!fll}vTKhDPL}jdnshELguzBcrM>Ez3eXcYS9+-kgd@rWsA~eF6&;UO|
zk`x`rikQ~i-AhntM%thyC`1Fg1`TvHTFNQtIP=f|%Fy`|@6xcAJJ8hc#bo>eEy;1b
z5}UV(2fP`5@eXvNdExpZOrc+f9r0!46YUSCP$%|zlp7p?1eAzwrQxo900-hT=mh^p
zKG8Y;n33#OQPdl|ATdRA(A2I#1KEhKcpJ9HeVB@=91SyeDZ0>fw6smJn&&^421h;W
zicUBR9cT`^=@y}>ei4V^`{;A^n8g8mU<&p}CmIs2kHE_GOVRhIgzNXC<1fN`%paA}
zuy$`_CESU=@LBLA8ek2+jo4>VTeMVzu|AffnYasG@gj7Br_ga%p@D2d_sZ6A{c}tt
zbKyrCMt%ZWTyzE<ph??!g&nXv{qEQmXQKhFM+4Y{PVf_2s{f!Rt)3f~vKcy0M@+*)
zG-JJT$-j{g;6ha#kJkQnbk`=(P4fhrnf2(4@1g;JfKI$E-2VhGp}!B?;{hajQO$Po
zk5X4Grau<D;Iek%{C~j(2mA%A<9T$TYK+nhYoe*|j1DjwhvL)dZa;>mK07a-s4Y6q
zK<t2Hkx%ppe=O}L?1Nt=Xc$R$eiU7fH=uzmMF)Het6>?|z}JKCh5NhEAD1uD36F*T
zdAyW<EoQHY&Cq^lG-G|y_Yy;BSd$5832sMId^fuL?+ZQ=?ynBMh1UK<v^4(;*N>nJ
zID?LR4h=koH2KAoj%G3+Szsb6q2WX~ga>9~3;GYE$7~&1f_+#8FX3D1YOIcZaU?py
zGIY<pinZ}0G_ZZ>!VaMs`WandQs;2~Q)zf19i5;N`a%v`f&#PzJ<t^m4E<4PDkowg
z-j0^?ujs^w(D#2r13QDBf|~q>J6<~0@ccKkft}C@d!YdhLmwQ24lpU)zXv@P3(@CZ
z#dQ1|TI20l2lt~3I)!G?4Q4>i(G0c2L_HeCG;|DFn;GapOVJlrqJg~@u5ZF7^mm~X
zoy5ABdPO`=Cc4WDLVqaMr#~4T_g+lLC09^?2Y4mi*o+Re8;$%38o+6ErRR}t5G9ju
z`-Ny=MQCcTMN3qImS9}yPePxciDvpPY>o>G$-ldG4HtABI?x6*fKBM}`565b+!yX=
zQ0Q9pvyc-Ubw&f5h-~=iNo<YVF(1#O6Sn5-)A0wRnHZ4>jY)Vhvfu)A;wRAwUPf2+
z6}sYY(G{IUH|wuhA1if>uQx%TYZ)v+1M7{g@J{so#IrOqXskpx+ZJqzyU~Hqp%bU_
z1K|CdXyln#5A)Dda5Xl>p=c&=3-@OR9}GT^mh>$o6N%{WG@M{-xUmbJ;7hcYKcT5U
zi%wL9I{18DG?k680cK+byb@huF}A=d==+P%1-yXnx$=vB>i;1P2mUlXZ~#rsQM3f7
z(E(F>MA7mjeprxg5dEVl{*g)R8E3EyTH}%Egm+^jd=x!?t8p~$#_KSbACgMUAI+y>
z$`*P7m!h?M2CeBTbZ>ls7Xw8DJAkg}M7VwdeXsIW@dE0jD{YL9(+M4CAZFq9m~fyu
zH2gwXh(`JXa-^fJ=nI$hitpD#cXbQ&{t(Q?`RHC)kCtpFI`J3iDLRIY@f=#RhP~rJ
zoA##uUdZEuD=7#!dSNsA!>}dZ8T!l7W40yu3-+g<+b3S}o#=ZBY>s8<-q?x;cnJOC
z`7QM8^d<k+s%_smq8^w`e-OHY;n);!MR)guXiZ<lNw@`bu-(=1%12=){qbl<@4*(h
z6#Zg*2MuI5@`-*-@V7mUPW|GEZ$@i88Tqn{evhVb6`Jxl(PMc6Gw?iG!iJ>5QnkfA
z?1oM}4LwbdVP#x_W_k_!d}1RFSG)tQ(H?YjoI+DsZ$O;dZs^2U;bk}&P32^CrE@U_
zmtZA)8r_U#;d*(vz5xyVJ!IZQw4a8lJ%kl7>6&<xC8HDOp|$LeW@<d<;9_ir@1PTY
zhnDOpy5b50<5JW`SK0}krxzOdIBdcE(JUI)^cghbx6wehp?hN|nxTWp35yP65w;l=
z4?H#aM>G?E4lc*4^w(lOZbnOUGT7`|7RLNh2@O*{8(ZUY^t^7voA6t7puU6S3=BsD
zz7H8IdJfy*3A8kghQu|#9L-2??0{p?J@8QQaZFU_!m~6yCTp-7ZbNtRUd+R@=*n`2
z#=EyWTEh~Yjx*5b4q_VC9u}7*6D!hhfmN^#I{xKoDS8hh|K2F&LQR~82J)xi6KKS1
z(apIL-PK>CHBTNMZ`Nw)@ybKr?}II|6fNC+G^3AT4P1$C);ETe|JpR(<$@9I4mXZr
zD*ZE9fEUo`3QFRY^v5FlBaokm=yCM@Pto)JGx~noh`3a>(d+q`j{Wdb9G9R`hsF#v
zHTQ=bOM)+=FTRPc;GdX<KcEv-8yUZsj`o{{elEJgu6PL+qkE(`7US>GJ(O5WqkzUP
zEW*m8;s^VqrMUx5**)k$i!ck9pzpnb1MnF3#;*Ltwa2+=K(C?4bpu+;Z^Qkgv56>i
zOuYLCVP_tgiTs-*dI`JYcj!v8u8RlAK{stjG;_sR3rC^>PsVz92O9XpXz89opL-om
z{T8h0`TvZDyY?_T;7N3#)Uol4b<oILp#yga_D2W234QMm=&4zNj`tF}sn?<l*n*b$
zV{`#uV20=a2#s7!xjvq_6V|0)gnloKzz#SYJ!Y%X6z@mB7i!$VZ#iZl$%^hm1NsCT
z;18IA$v4KQC<_g&7!wXKjE2W#9Ga?$=!)+`2f7bk=@aO&dj&6kv!R*VjIL~Z=zod)
zBPaSEi!f(g{N7}APt3s9IC~uVcfb`~aDvsr&6rMq4_d1q(XZs+(9|ZC#w)6d-p|2{
zyFFNpj@J)e=~(o+X~6_`qrb2;5wCOy7n*Y6bF7cQq9v$(Q~X7egAOnRt=)L^{tRr0
z4`3@S!z|p6m*H`AytMIgz}aX<i_rTe2^tPC9ewaY%)~OZX78gf96(oe8ZA-k&GCve
z&{SrlB^-p7WO%qg4m}08pe3D!mS8Sc#KZy`PVflkU>Ta?9q0>tL;o8zfTQU1NfY8P
zl5}+9(P(CF#5Q;v7UGlWSMeU~fd54o*nZ;0|A$OOgJ`%1rlTpIg{F2snvrGbE`9^e
z$ZmA^A4daia!b6zHo>lFh6bRSy%Al=>~Mb`dW@G~vFCpkjpkf9j;1DkQoI)$qXYFs
zBQHTy`vAJzA44a24&AI9(Lg^5*N+FQ-WtEx3Y&1h6S_xAurc#Tchabge?fQabC`nV
z=!6^4&G`XZ%fo1f&Y}}npB!hfIr?5Mw!}`MKNj24ACFz|QS`lSc%>;nNW%e7q5ZTe
zaX=a9Id2jA9nn3|9sMF2Jf*yKgEN`s6AQ0NUR>Uzae4I~J(4QrH_0pP(xISycu|9-
fq$|p&_Z*yEUU@>_lnT?QPFVb>sSTfBIVI_Tj4kuB

delta 7052
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

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 58d169241..0a4f2fb99 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,17 +16,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "ei asennettu"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "asennettu"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Tilastot"
 
@@ -65,17 +65,17 @@ msgstr "Perusasetukset"
 msgid "UI Configuration"
 msgstr "Käyttöliittymän asetukset"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Pääkäyttäjä"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Kaikki"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Näytä kaikki"
@@ -92,7 +92,7 @@ msgstr "Näytä kaikki"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -271,9 +271,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
@@ -311,165 +311,165 @@ msgstr "Ole hyvä ja täytä kaikki kentät!"
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 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:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 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:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -494,8 +494,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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:"
 
@@ -532,7 +532,7 @@ msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -690,7 +690,7 @@ msgstr "Tiedostoa %(file)s ei löytynyt Google Drivesta"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
@@ -724,34 +724,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Aloitettu"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Valmistui"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
@@ -768,7 +772,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -834,7 +838,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -850,7 +854,7 @@ msgstr "Valtuutus vanhentunut"
 msgid "Success! Please return to your device"
 msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Kirjat"
 
@@ -875,7 +879,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Parhaiten arvioidut kirjat"
 
@@ -884,7 +888,7 @@ msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
@@ -893,7 +897,7 @@ msgid "Show read and unread"
 msgstr "Näytä luetut ja lukemattomat"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
@@ -911,7 +915,7 @@ msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Kategoriat"
 
@@ -921,7 +925,7 @@ msgstr "Näytä kategoriavalinta"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Sarjat"
 
@@ -939,7 +943,7 @@ msgid "Show author selection"
 msgstr "Näytä kirjailijavalinta"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Julkaisijat"
 
@@ -949,7 +953,7 @@ msgstr "Näytä julkaisijavalinta"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Kielet"
 
@@ -973,7 +977,7 @@ msgstr "Tiedotomuodot"
 msgid "Show file formats selection"
 msgstr "Näytä tiedostomuotovalinta"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr ""
 
@@ -981,7 +985,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr ""
 
@@ -1009,9 +1013,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "Kirja on lisätty hyllyyn: %(sname)s"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1034,58 +1037,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Kirja on poistettu hyllystä: %(sname)s"
 
 #: cps/shelf.py:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "luo hylly"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Valitettavsti sinulla ei ole oikeutta poistaa kirjaa hyllystä: %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Muokkaa hyllyä"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hylly %(title)s luotu"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hylly %(title)s muutettu"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Tapahtui virhe"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Muuta hyllyn: '%(name)s' järjestystä"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylly: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
 
@@ -1118,177 +1124,177 @@ msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi ve
 msgid "No release information available"
 msgstr "Ei päivitystietoa saatavilla"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Hae"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Arvostelulistaus"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, 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:1447
+#: cps/web.py:1473
 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:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
@@ -1301,31 +1307,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-kirjan muunnos epäonnistui: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1359,212 +1365,212 @@ msgstr "Ylläpito"
 msgid "Password"
 msgstr "Salasana"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Lähetä"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Lataa"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Näytä ekirjat"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Poista"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "SMTP sähköpostipalvelimen asetukset"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP palvein"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP portti"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP tunnus"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Lähettäjän sähköposti"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Calibre DB hakemisto"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Lokitaso"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Portti"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Kirjaa sivulla"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Lähetetään"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Nimetön selaus"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Julkinen rekisteröinti"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Etäkirjautuminen"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Calibre DB hakemisto"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Ylläpito"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Katsele lokitiedostoja"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Uudelleenyhdistä Calibre DB"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Uudellenkäynnistä Calibre-Web"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Sammuta Calibre-Web"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Päivitä"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Versio"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Nykyinen versio"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Tarkista päivitykset"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Päivitä"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Haluatko varmasti uudelleenkäynnistää Calibre-Webin?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Haluatko varmasti pysäyttää Calibre-Webin?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Päivitetään, älä päivitä sivua"
 
@@ -1576,39 +1582,39 @@ msgstr ""
 msgid "In Library"
 msgstr "Kirjastossa"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "vähennä"
@@ -1738,9 +1744,9 @@ msgid "Fetch Metadata"
 msgstr "Hae metadata"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
@@ -1763,7 +1769,7 @@ msgstr "Ladataan..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Sulje"
 
@@ -2243,50 +2249,50 @@ msgstr "Salli kirjojen lataukset"
 msgid "Allow eBook Viewer"
 msgstr "Salli kirjojen luku"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Salli lisäykset"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Salli muutokset"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Salli sananan vaihto"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Salli julkisten hyllyjen editointi"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Poissulje kieli"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Näytä kirjat kielellä"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Oletusnäkymä uusille käyttäjille"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Näytä satunnaisia kirjoja näkymässä"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
@@ -2439,21 +2445,29 @@ msgstr "Palaa kotiin"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3062,15 +3076,15 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Poista tämä käyttäjä"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index df93858a2e854a108a571de62748f19403193512..02501df2de235322a46bda7d407673c4b99f4c99 100644
GIT binary patch
delta 11090
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

delta 11373
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
Nn;KO5_sL4-{|(tbi0A+S

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index ad302c5ff..5ffff5d74 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -31,17 +31,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "non installé"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "installé"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Statistiques"
 
@@ -80,17 +80,17 @@ msgstr "Configuration principale"
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Utilisateur admin"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Tout"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
@@ -98,7 +98,7 @@ msgstr "L'utilisateur n'a pas été trouvé"
 msgid "{} users deleted successfully"
 msgstr "{} utilisateurs supprimés avec succès"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Montrer tout"
@@ -107,7 +107,7 @@ msgstr "Montrer tout"
 msgid "Malformed request"
 msgstr "Demande malformée"
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr "Le nom de l’invité ne peut pas être modifié"
 
@@ -115,7 +115,7 @@ msgstr "Le nom de l’invité ne peut pas être modifié"
 msgid "Guest can't have this role"
 msgstr "L’invité ne peut pas avoir ce rôle"
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer le rôle admin"
 
@@ -287,9 +287,9 @@ msgstr "Le filtre utilisateur de membre LDAP a des parenthèses non appariées"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuillez entrer le chemin correct"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "Les paramètres de la base de données ne sont pas accessibles en écriture"
 
@@ -319,7 +319,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
@@ -327,167 +327,167 @@ msgstr "Veuillez compléter tous les champs !"
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr "Impossible de supprimer l’utilisateur Invité"
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr "La vérification du compte Gmail réussie"
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Teste les courriels en file d’attente pour l’envoi à %(email)s, veuillez vérifier le résultat des tâches"
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, 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:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 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:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erreur : %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 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:1816
+#: cps/admin.py:1821
 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:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} utilisateur importé avec succès"
 
@@ -499,7 +499,7 @@ msgstr "non configuré"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, 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"
@@ -512,8 +512,8 @@ msgstr "Le format du livre a été supprimé avec succès"
 msgid "Book Successfully Deleted"
 msgstr "Le livre a été supprimé avec succès"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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"
 
@@ -550,7 +550,7 @@ msgstr "Impossible de créer le chemin %(path)s (Permission refusée)."
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
@@ -708,7 +708,7 @@ msgstr "Le fichier %(file)s n'a pas été trouvé dans Google Drive"
 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:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
@@ -742,34 +742,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Seuls les fichiers jpg/jpeg/png/webp/bmp sont supportés comme fichier de couverture"
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 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:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "Fichier binaire Unrar non trouvé"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Une erreur est survenue lors de l'exécution d'UnRar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "En attente"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Echoué"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Débuté"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Terminé"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
@@ -786,7 +790,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -852,7 +856,7 @@ msgid "{} Stars"
 msgstr "{} Étoiles"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Connexion"
 
@@ -868,7 +872,7 @@ msgstr "Jeton expiré"
 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:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Livres"
 
@@ -893,7 +897,7 @@ msgstr "Livres téléchargés"
 msgid "Show Downloaded Books"
 msgstr "Montrer les livres téléchargés"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Livres les mieux notés"
 
@@ -902,7 +906,7 @@ msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Livres lus"
 
@@ -911,7 +915,7 @@ msgid "Show read and unread"
 msgstr "Montrer lus et non-lus"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
@@ -929,7 +933,7 @@ msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Catégories"
 
@@ -939,7 +943,7 @@ msgstr "Montrer la sélection par catégories"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Séries"
 
@@ -957,7 +961,7 @@ msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Éditeurs"
 
@@ -967,7 +971,7 @@ msgstr "Montrer la sélection par éditeur"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Langues"
 
@@ -991,7 +995,7 @@ msgstr "Formats de fichier"
 msgid "Show file formats selection"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Livres archivés"
 
@@ -999,7 +1003,7 @@ msgstr "Livres archivés"
 msgid "Show archived books"
 msgstr "Afficher les livres archivés"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "Liste des livres"
 
@@ -1027,9 +1031,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "Le livre a bien été ajouté à l'étagère : %(sname)s"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1052,58 +1055,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 
 #: cps/shelf.py:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Désolé, vous n’êtes pas autorisé à enlever un livre de cette étagère : %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Modifier une étagère"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "L’étagère %(title)s a été modifiée"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, 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:307
+#: cps/shelf.py:312
 #, 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:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 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"
 
@@ -1136,177 +1142,177 @@ msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-desso
 msgid "No release information available"
 msgstr "Aucune information concernant cette version n’est disponible"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Découvrir (Livres au hasard)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livres téléchargés par %(user)s"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur : %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Éditeur : '%(name)s'"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Liste des évaluations"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de lecture = %(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, 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:1447
+#: cps/web.py:1473
 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:1464
+#: cps/web.py:1490
 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/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, 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:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 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:1561
+#: cps/web.py:1587
 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:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
@@ -1319,31 +1325,31 @@ msgstr "Aucun fichier gmail.json avec information OAuth valide trouvé"
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "ebook-convert calibre %(tool)s non trouvé"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Format %(format)s non trouvé sur le disque"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "Le convertisseur Ebook a échoué avec une erreur inconnue"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "La commande Kepubify-converter a échouée : %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, 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:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "La commande ebook-convert a échouée : %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre a échoué avec l’erreur : %(error)s"
@@ -1377,212 +1383,212 @@ msgstr "Administration"
 msgid "Password"
 msgstr "Mot de passe"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Téléverser"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Télécharger"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Afficher les livres"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Éditer"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Supprimer"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Étagère publique"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "Importer des utilisateurs LDAP"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Paramètres du serveur de courriels"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "Nom d'hôte du serveur SMTP"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "Port du serveur SMTP"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "Compte utilisateur SMTP"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Expéditeur des courriels"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr "Service courriel"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr "Gmail via Oauth2"
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Configuration"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Répertoire de la base de données Calibre"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Niveau de journalisation"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "Port exeterne"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Livres par page"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Téléversements"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Navigation anonyme"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Inscription publique"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Connexion à distance Magic Link"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Compte du Reverse Proxy"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Nom de l'en-tête du Reverse Proxy"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Éditer la configuration principale"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Éditer la configuration principale"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "Télécharger le package de débogage"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Afficher les fichiers journaux"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Reconnecter la base de données Calibre"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Redémarrer Calibre-Web"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Arrêter Calibre-Web"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Mise à jour de Calibre-Web"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Détails"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Version actuelle"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Rechercher les mises à jour"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Effectuer la mise à jour"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Annuler"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Voulez-vous vraiment arrêter Calibre-Web?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Mise à jour en cours, ne pas rafraîchir la page"
 
@@ -1594,39 +1600,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "Dans la librairie"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "Trier en fonction de la date du livre, le plus récent en premier"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr "Trier en fonction de la date du livre, le plus ancien en premier"
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr "Trier les titres dans l’ordre alphabétique"
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr "Trier le titre dans l’ordre alphabétique inverse"
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr "Trier en fonction de la date de publication, le plus récent en premier"
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 msgid "Sort according to publishing date, oldest first"
 msgstr "Trier en fonction de la date de publication, le plus ancien en premier"
 
 #: 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "réduire"
@@ -1756,9 +1762,9 @@ msgid "Fetch Metadata"
 msgstr "Obtenir les métadonnées"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -1781,7 +1787,7 @@ msgstr "Chargement..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Fermer"
 
@@ -2262,50 +2268,50 @@ msgstr "Permettre les téléchargements"
 msgid "Allow eBook Viewer"
 msgstr "Autoriser le visionneur de livres"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Permettre le téléversement de fichiers"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Permettre l'édition"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Permettre la suppression de livres"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Permettre le changement de mot de passe"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Autoriser la modification d’étagères publiques"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Exclure les langues"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Montrer les livres dans la langue"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Mode de visualisation par défaut pour les nouveaux utilisateurs"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Montrer aléatoirement des livres dans la vue détaillée"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Ajouter les étiquettes autorisées/refusées"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Ajouter les valeurs de colonnes autorisées/refusées"
 
@@ -2459,21 +2465,29 @@ msgstr "Retour à l’accueil"
 msgid "Logout User"
 msgstr "Déconnecter l’utilisateur"
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr "Trier les auteurs dans l’ordre alphabétique"
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Trier les auteurs dans l’ordre alphabétique inverse"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "Trier par ordre croissant en fonction de l’index de série"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "Trier par ordre décroissant en fonction de l’index de série"
 
@@ -3082,15 +3096,15 @@ 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:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Synchroniser uniquement les livres dans les étagères sélectionnées avec Kobo"
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Supprimer l'utilisateur"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Générer l'URL d'authentification Kobo"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index cd2790bb24ea546765b285bd6d8675ad8ffb6b4a..bd42e50e5d6c9bffb314495577357be7bf9c5ab5 100644
GIT binary patch
delta 5881
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
Mmu58nxZuS906#)_W&i*H

delta 6158
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
J>tFSK|8Ivg>rnsz

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index a91824ee0..06d891e2a 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,17 +16,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "nincs telepítve"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Statisztika"
 
@@ -65,17 +65,17 @@ msgstr "Alapvető beállítások"
 msgid "UI Configuration"
 msgstr "Felhasználói felület beállításai"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Rendszergazda felhasználó"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mindent mutass"
@@ -92,7 +92,7 @@ msgstr "Mindent mutass"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -271,9 +271,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
@@ -311,165 +311,165 @@ msgstr "Az összes mezőt ki kell tölteni!"
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 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:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, 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:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 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:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 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:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -494,8 +494,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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:"
 
@@ -532,7 +532,7 @@ msgstr "Nem sikerült létrehozni az elérési utat (engedély megtagadva): %(pa
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -690,7 +690,7 @@ msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
 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:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
@@ -724,34 +724,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Várakozás"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Nem sikerült"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Elindítva"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Végrehajtva"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
@@ -768,7 +772,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -834,7 +838,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Belépés"
 
@@ -850,7 +854,7 @@ msgstr "A token érvényessége lejárt."
 msgid "Success! Please return to your device"
 msgstr "Sikerült! Újra használható az eszköz."
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr ""
 
@@ -875,7 +879,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Legjobb könyvek"
 
@@ -884,7 +888,7 @@ msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
@@ -893,7 +897,7 @@ msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
@@ -911,7 +915,7 @@ msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Címkék"
 
@@ -921,7 +925,7 @@ msgstr "Címke választó mutatása"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Sorozatok"
 
@@ -939,7 +943,7 @@ msgid "Show author selection"
 msgstr "Szerző választó mutatása"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Kiadók"
 
@@ -949,7 +953,7 @@ msgstr "Kiadó választó mutatása"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -973,7 +977,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr ""
 
@@ -981,7 +985,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr ""
 
@@ -1009,9 +1013,8 @@ 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: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."
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1034,58 +1037,61 @@ 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:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Polc készítése"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Sajnálom, nincs jogosultságot eltávolítani könyvet erről a polcról: %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Polc szerkesztése"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "A következő polc létre lett hozva: %(title)s"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "A következő polc megváltoztatva: %(title)s"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Hiba történt"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "A következő polc átrendezése: %(name)s"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Polc: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 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ő."
 
@@ -1118,177 +1124,177 @@ msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez
 msgid "No release information available"
 msgstr "Nincs információ a kiadásról."
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Keresés"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Letöltések"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, 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:1447
+#: cps/web.py:1473
 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:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 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:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
@@ -1301,31 +1307,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, 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:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1359,212 +1365,212 @@ msgstr "Rendszergazda"
 msgid "Password"
 msgstr "Jelszó"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Letöltés"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr ""
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Törlés"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "SMTP e-mail kiszolgáló beállítások"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP szervernév"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP port"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP felhasználó"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Küldő e-mail cím"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Konfiguráció"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Calibre adatbázis mappája:"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Naplózás szintje:"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Port:"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Könyvek oldalanként:"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Feltöltés:"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Böngészés bejelentkezés nélkül:"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Nyílvános regisztráció:"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Távoli belépés:"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Calibre adatbázis mappája:"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Adminisztráció"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Újracsatlakozás a Calibre adatbázishoz"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "A Calibre adatbázis újraindítása"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "A Calibre adatbázis leállítása"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Frissítés"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Verzió"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Részletek"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Jelenlegi verzió"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Frissítés keresése"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Frissítés elkezdése"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Valóban újra akarod indítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Frissítés folyamatban, ne töltsd újra az oldalt"
 
@@ -1576,39 +1582,39 @@ msgstr "keresztül"
 msgid "In Library"
 msgstr "Könyvtárban"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "csökkentsd"
@@ -1738,9 +1744,9 @@ msgid "Fetch Metadata"
 msgstr "Metaadatok beszerzése"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
@@ -1763,7 +1769,7 @@ msgstr "Betöltés..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Bezárás"
 
@@ -2243,50 +2249,50 @@ msgstr "Letöltés engedélyezése"
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Feltöltés engedélyezése"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Szerkesztés engedélyezése"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Jelszó változtatásának engedélyezése"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Nyilvános polcok szerkesztésének engedélyezése"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Nyelvek kizárása"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Mutasd a könyveket a következő nyelvvel"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Új felhasználók alapértelmezett látható elemei"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Mutasson könyveket találomra a részletes nézetben"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
@@ -2439,21 +2445,29 @@ msgstr "Vissza a kezdőlapra"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3058,15 +3072,15 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "A felhasználó törlése"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 0fc468d181d7d04a0d2b165f980b4f850c308fc4..af9006f72a00eba1417a44252c9335b7badb8c5a 100644
GIT binary patch
delta 11854
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
J+6yO3{SQmopx^)i

delta 12030
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
bjhsAr2y+a{D*E-+$fAmKyo$$PKJW2AJO9`t

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 879a4cba1..6e1dda304 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,17 +15,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "non installato"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "installato"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Statistiche"
 
@@ -64,16 +64,16 @@ msgstr "Configurazione di base"
 msgid "UI Configuration"
 msgstr "Configurazione dell'interfaccia utente"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 msgid "Edit Users"
 msgstr "Modifica gli utenti"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Tutti"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "Utente non trovato"
 
@@ -81,7 +81,7 @@ msgstr "Utente non trovato"
 msgid "{} users deleted successfully"
 msgstr "{} utente eliminato con successo"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "tutte le lingue presenti"
@@ -90,7 +90,7 @@ msgstr "tutte le lingue presenti"
 msgid "Malformed request"
 msgstr "Richiesta non formulata correttamente"
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 
@@ -98,7 +98,7 @@ msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 msgid "Guest can't have this role"
 msgstr "L'utente Guest (ospite) non può avere questo ruolo"
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso rimuovere il ruolo di amministratore"
 
@@ -266,9 +266,9 @@ msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
 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:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "I parametri del DB non sono scrivibili"
 
@@ -296,7 +296,7 @@ msgstr "Configurazione del Database aggiornata"
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
@@ -304,164 +304,164 @@ msgstr "Per favore compila tutti i campi!"
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "L'utente '%(user)s' è stato creato"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "L'utente '%(nick)s' è stato eliminato"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr "Non posso eliminare l'utente Guest (ospite)"
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Modifica le impostazioni del server e-mail"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr "L'account Gmail è stato verificato con successo"
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "L'e-mail di test è stato accodato con successo per essere spedito a  %(email)s, per favore verifica tramite il pulsante 'Compito' il risultato"
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 msgid "Update file could not be saved in temp dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr "Durante l'aggiornamento non è stato possibile sostituire alcuni file"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr "Fallita l'estrazione di almeno un utente LDAP"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Fallita la creazione di almeno un utente LDAP"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Errore: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Almeno un utente LDAP non è stato trovato nel database"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} utente importato con successo"
 
@@ -473,7 +473,7 @@ msgstr "non configurato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, 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"
@@ -486,8 +486,8 @@ msgstr "Il formato del libro è stato eliminato con successo"
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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"
 
@@ -524,7 +524,7 @@ msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
@@ -682,7 +682,7 @@ msgstr "File %(file)s non trovato su Google Drive"
 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:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 msgid "Found an existing account for this e-mail address"
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
@@ -715,34 +715,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Solamente i file nei formati jpg/jpeg/png/webp/bmp sono supportati per le copertine"
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 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:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "Non ho trovato il file binario di UnRar"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Attendi"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Avviato"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Terminato"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
@@ -759,7 +763,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -825,7 +829,7 @@ msgid "{} Stars"
 msgstr "{} Stelle"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Accesso"
 
@@ -841,7 +845,7 @@ msgstr "Il token è scaduto"
 msgid "Success! Please return to your device"
 msgstr "Riuscito! Torna al tuo dispositivo"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Libri"
 
@@ -866,7 +870,7 @@ msgstr "Libri scaricati"
 msgid "Show Downloaded Books"
 msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Libri meglio valutati"
 
@@ -875,7 +879,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Libri letti"
 
@@ -884,7 +888,7 @@ msgid "Show read and unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Libri non letti"
 
@@ -902,7 +906,7 @@ msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Categorie"
 
@@ -912,7 +916,7 @@ msgstr "Mostra l'opzione per la selezione delle categorie"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Serie"
 
@@ -930,7 +934,7 @@ msgid "Show author selection"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Editori"
 
@@ -940,7 +944,7 @@ msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Lingue"
 
@@ -964,7 +968,7 @@ msgstr "Formati file"
 msgid "Show file formats selection"
 msgstr "Mostra l'opzione per la selezione del formato dei file"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
@@ -972,7 +976,7 @@ msgstr "Libri archiviati"
 msgid "Show archived books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "Elenco libri"
 
@@ -1000,9 +1004,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "Il libro è stato aggiunto allo scaffale: %(sname)s"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1025,57 +1028,60 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Spiacente, non sei autorizzato a togliere libri dallo scaffale: %(sname)s"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Spiacente, non sei autorizzato a modificare questo scaffale"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Modifica uno scaffale"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Lo scaffale %(title)s è stato creato"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Lo scaffale %(title)s è stato modificato"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "C'era un errore"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Esiste già uno scaffale pubblico denominato '%(title)s'."
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Esiste già uno scaffale privato denominato '%(title)s'."
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Scaffale: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 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"
 
@@ -1108,177 +1114,177 @@ msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per agg
 msgid "No release information available"
 msgstr "Non sono disponibili informazioni sulla versione"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "I libri scaricati da %(user)s"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Cerca"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Elenco delle valutazioni"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Stato di lettura = %(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 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:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
@@ -1291,31 +1297,31 @@ msgstr "Ho trovato un gmail.json file senza informazione OAuth"
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Non ho trovato il convertitore %(tool)s di libri di Calibre"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Non ho trovato il formato %(format)s nel disco"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "La conversione del libro è terminata con un errore sconosciuto"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Si è verificato un errore con il convertitore Kepubify: %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Non ho trovato il file convertito o ci sono più di un file nella cartella %(folder)s"
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Errore nel convertitore: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Si è verificato un errore con Calibre: %(error)s"
@@ -1349,211 +1355,211 @@ msgstr "Amministrazione"
 msgid "Password"
 msgstr "Password"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Download"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Vedi libri"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Modifica"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Elimina"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Scaffale pubblico"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "Importa gli utenti LDAP"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Configurazione server e-mail"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "Indirizzo server SMTP"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "Porta SMTP"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "Crittografia"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "Login SMTP"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "E-mail da"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr "Servizio e-mail"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr "Gmail via Oauth2"
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Cartella del database di Calibre"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Livello di log"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Porta"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "Porta esterna"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Libri per pagina"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Uploads"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Navigazione anonima"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Registrazione pubblica"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Magic Link Login remoto"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Login reverse proxy"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Nome dell'intestazione Reverse Proxy"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 msgid "Edit Calibre Database Configuration"
 msgstr "Modifica la configurazione del Database di Calibre"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Modifica la configurazione di base"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Modifica la configurazione dell'interfaccia utente"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "Scarica Debug Package"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Visualizza Logfile"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Ricollega il database di Calibre"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Riavvia Calibre-Web"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Arresta Calibre-Web"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Aggiornamento"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Versione"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Dettagli"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Versione attuale"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Ricerca aggiornamenti"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Esegui l'aggiornamento"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Vuoi veramente riavviare Calibre-Web?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Annulla"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Vuoi veramente arrestare Calibre-Web?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Aggiornamento, non ricaricare la pagina."
 
@@ -1565,39 +1571,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "Nella libreria"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "Ordina secondo la data dei libri, prima i più recenti"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 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/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 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/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 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/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 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/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "riduci"
@@ -1727,9 +1733,9 @@ msgid "Fetch Metadata"
 msgstr "Ottieni metadati"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Salva"
 
@@ -1751,7 +1757,7 @@ msgstr "Caricamento in corso..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Chiudi"
 
@@ -2230,48 +2236,48 @@ msgstr "Permetti il download"
 msgid "Allow eBook Viewer"
 msgstr "Permetti l'utilizzo del visualizzatore di libri"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Permetti l'upload"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Permetti la modifica"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Permetti l'eliminazione di libri"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Permetti la modifica della password"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Permetti la modifica degli scaffali pubblici"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 msgid "Default Language"
 msgstr "Lingua predefinita"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 msgid "Default Visible Language of Books"
 msgstr "Lingua predefinita di presentazione dei libri"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Visibilità predefinita per i nuovi utenti"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Mostra libri scelti aleatoriamente nella vista dettagliata"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Aggiungi categorie permesse/negate"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Aggiungi valori personali permetti/nega nelle colonne"
 
@@ -2424,21 +2430,29 @@ msgstr "Ritorna alla pagina principale"
 msgid "Logout User"
 msgstr "Disconnetti l'utente"
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 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/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordina gli autori in ordine alfabetico inverso"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "Ordina in ordine ascendente secondo l'indice della serie"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "Ordina in ordine discendente secondo l'indice della serie"
 
@@ -3040,15 +3054,15 @@ msgstr "Crea/Visualizza"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Aggiungi valori personali permessi/negati nelle colonne"
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Sincronizza con Kobo unicamene i libri negli scaffali selezionati"
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Elimina utente"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Genera un URL di autenticazione per Kobo"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 35e759cf8829599e4ba14d3d1f5c6d311bf42d9b..3fad6032cea57a12fc26b55b45e0d9bcbdfdd301 100644
GIT binary patch
delta 4609
zcmYM$3s9F;8prYTS3p!iA&i?B(7$rc5DXEFAQ0I!c2t74NX69EFiTmw=-``7scY#r
zrZeoAO=+%9Bcq8TqfKje(RFZQGcC*1T8A7n?Xr!HWcB^|J~KHCpL5Q8F3)++d0*^!
zCGhR0fOj?~WTWF>LcqDfcp+T1KmP5Ec5V#SR?Nb4sD2SK&IK_Y`Eix}x)1BH8uw!;
zM&06EAB@G`I2ik3GDbM(xlF&{@=*gOT8GIPMZFpa;9QKuMyszyO|%&m&<>2m_b~@g
zU@V65D*=-*4DUb%Gy&sS-<44ap`jKT<La#5h(zd?q83_(skk09@c?FHH!3r6gPbeC
zGR#8{Z^L#>#|y}hi@Md{NDvcP-%X&9h}HIBF)Gr(V+y`#?R&6}`Y}{MS)@bb#v$2u
z(@_2ABB$h5p#u9SDzhJ;GSrD<@iX)WQWy~LpK&s3$J3BaxtXW|f5ZORjLN_|9FFa%
zBRY*bqKl|Z{*1%$25KWi$iK!1QT?(}0Tw5ae?6E+gBG5FI-7dziw&sz*n|Y@R$BcP
z)Xuk~7CMYW@hemY0z6b8BQOcmP#G#ity6=_;G9JAuM9j!gHrSiDm5#y2oItny^h*x
z1hZ*^BvgAEYKH}wizTQ)8c}Dx0hO^ga3X$$BQc&En}J0h1?_MFD&i%m$eu){z8U#(
zFY-$ZwxW*a-^g6<W1NoPp~jUB@dNrZYQAbz`-7;A&a?XCsQJ8Q6qMSvs1$8O9YF^w
zutV1VAJhbAP=R%$GWLJe0@tw+L)kvZ?n+SoA3$Yd4yylBRK}h`GU>Th6qMQx$Q*8~
zb$AE0gQKX4j-vwm1bg8*ydA&7WQ^e=+>N=YaZjL*WEpBByD%9$@aCn(9KHV+Dd;^;
z;;B+P1<P?h7T_)%hnG+j59fwy!c<fyvQf9X$l5DWcd7=J;`yizEJb}^o<(J>1tVDB
zZKa@;>_(mKezOy`;FqWY-Kd4X$5D74D=>w3aS}d)3S<xRBDlk-1<#-^?RThkZlD4W
z8A1Nl5JN$)VFIe-NF0wjs0=JbrG7i!OeN|pJ5Uq7jas<VJcCN{Wz_sVsD8bIeqaMp
z&ohGLUmeENz(>s$qf%Cb%ESUxV9Svow}xLg13+Ec4zmk2?xJ}eb?G8_*VJ#gS%A8n
z(@_2EN0NUn)MO3oQ3GE`1$F>+iQcjLPpHU$!BFf!%Fj$R>WC6h<ASJ+WFlQ%A%<X`
zIS)0y-lL!$E=FCNCM?2r*5NqnwLF2kq}`~1;!^z&$Yj(4PoO4z8MU)5r~vk&=6w$}
z{v`Inurz-oUK9nL`4CiUGB6BFt;0Q-L;Ww-{sJ<GdkHn}AZo#*s2zTWO8GhSnmHid
z-WpT@*?!$~`4qIn5_?dE+DR?))pfJ6H#Q-gcPmi+cc6~$AnI~;nP*WOxQyEQkErn>
z8GNoW9A69Y2M^2j{-4O?PcRP>v;0)n;8^NS$hXDq!L|5b+=w%8^S={6p;8<@+FvjQ
zb$8OtBGmIL?2B_yfiFS@xB_p!|Enozp^c~y&|cKQF61J+^VS}EyK_^ir=Z@J22}qw
zs0sgNwj!Sfx7X^YFoOCQR=;HR@6l64zfw?Yqq!k$(&gh_I2Vg?8&1M*EXUDf{Psp9
zyRIFzf%B+^e!~G6k>l3~qw49XK*uB5cg6btYG6GLD{u{Jf(Wj-E?EL<rzNPs?zi^m
za2EAeRBEF*FHIbe6*vsF;C$54K82chAKrq8u^*lq%lWJDB@Mb9myu1nL3j9PS&n)u
zYEcU{q9XTD3%-Gx_)XNrZ{r~R2=)9T>b76C`ZZMlU(Nnro<Ctc#_*sNwexD6jLT60
z9W#4S6KC-kNekwp#!bRO_y8)<$5DYVwfajqkNRe;!H|4ELtZTf4P0mq&8P|2qZZnR
zMYt1n8NWg8U?6`Wig5@o#u--c!n>(Q^M^y@tIP*c>&!+S%~KeszyGW4!K<iS+m5`E
z?o(WYA^fjG@Ap4Yfo(?Za5pND1LhHX{xRx^zD5Nc!v&DzPz%?h0$Yd!_5L?l!?UOf
zpGPgwf?9A3vMIL@6Y(l)qJDS!uU{f+Tpp^u)SPZUj0&K^>Mf`b(hk*G-|eKJh~7di
z{4UPI<EVk7$^Sx}j_P*^xj*g*YQY=Gx5!2E&Z=IBRX7>B&+b)JMoyxRM(3vIrRYth
z&_Y22&!Qr`V)Y+Tm$6rgzi<ZLN_~u3feLsg>M|~{dJ`%mt55-Nz*yX5?naG!zl8j&
z<A>Jq45m~6A2whl;XaBhFdnaB5{8%hfdx^o*A&z|Rc0M(;YFw;Y&2J6CG}0H@5H52
z&z~T-%>V0Dh>ENXwNNE$f=4ijO;+E6T3{b4b8q2L?6mqfsDOG<84M@Q+;*3Z>R*9c
z=YHjXDuvmo3HRbKJZOH73ZMrSP*l198fBpB#a6FHWoU`DKaWA`+c5<@t^EpW;eM0+
z?~4~pA&iDusL1|m^(W2c=5zM^1yn#Uqb}Vpd;SG#;tS>#RKK55ndncx8!;Z$Zyk~`
z&$UqCV!HjPFWxoeLc7vG`Tx^tMorL;+VQ)not?vQ47ta-hcFVgk$Q6pYTVPPaVt>)
zZNUWGhtu``e`pUzu(|@s<Cjv|j2XBI`{D;y?=pMLQB(YdrlK-9!|IF7WvKD1Q30&S
zT-=6X_fj}bfs5_Vqt0psje~I_Dv;Tjipx+FZADGgirVoZ9EnHnZ95hn6Wca?)Y0B;
nsTpa3K4X%z#~0+}wN+;(1p@hPOR@@++F~kBg|=l@Mh1Qd0ch9(

delta 4888
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

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index ca0705889..f8ce8069c 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -16,17 +16,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "インストールされていません"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "統計"
 
@@ -65,16 +65,16 @@ msgstr "基本設定"
 msgid "UI Configuration"
 msgstr "UI設定"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 msgid "Edit Users"
 msgstr ""
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -266,9 +266,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -298,7 +298,7 @@ msgstr "メールサーバの設定を更新しました"
 msgid "Database Configuration"
 msgstr "機能設定"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
@@ -306,165 +306,165 @@ msgstr "全ての項目を入力してください"
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP設定を変更"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -476,7 +476,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -489,8 +489,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -527,7 +527,7 @@ msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -685,7 +685,7 @@ msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "このメールアドレスで登録されたアカウントがあります"
@@ -719,34 +719,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "待機中"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "開始"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "終了"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "不明"
 
@@ -763,7 +767,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -829,7 +833,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "ログイン"
 
@@ -845,7 +849,7 @@ msgstr "トークンが無効です"
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr ""
 
@@ -870,7 +874,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr ""
 
@@ -879,7 +883,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "読んだ本"
 
@@ -888,7 +892,7 @@ msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "未読の本"
 
@@ -906,7 +910,7 @@ msgid "Show Random Books"
 msgstr "ランダムで本を表示"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -916,7 +920,7 @@ msgstr "カテゴリ選択を表示"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "シリーズ"
 
@@ -934,7 +938,7 @@ msgid "Show author selection"
 msgstr "著者選択を表示"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "出版社"
 
@@ -944,7 +948,7 @@ msgstr "出版社選択を表示"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "言語"
 
@@ -968,7 +972,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr ""
 
@@ -976,7 +980,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr ""
 
@@ -1004,9 +1008,8 @@ 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 に本を追加することが許可されていません"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1029,58 +1032,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "本が %(sname)s から削除されました"
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "申し訳ありませんが、%(sname)s から本を削除することが許可されていません"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "本棚を作成する"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "申し訳ありませんが、%(sname)s から本を削除することが許可されていません"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "本棚を編集する"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s を作成しました"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s を変更しました"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "エラーが発生しました"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' 内の本の順番を変更する"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "本棚: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
@@ -1113,177 +1119,177 @@ msgstr "アップデートが利用可能です。下のボタンをクリック
 msgid "No release information available"
 msgstr "リリース情報がありません"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムで表示)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "詳細検索"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "検索"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
@@ -1296,31 +1302,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter が失敗しました: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1354,212 +1360,212 @@ msgstr "管理者"
 msgid "Password"
 msgstr "パスワード"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "アップロード"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "ダウンロード"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr ""
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "編集"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "削除"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr ""
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr ""
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "暗号化"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr ""
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "設定"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "ログレベル"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "ポート番号"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr ""
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Calibre-Web の設定を更新しました"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr ""
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "アップデート"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "バージョン"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "詳細"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "現在のバージョン"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "更新を実行"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1571,39 +1577,39 @@ msgstr "経由"
 msgid "In Library"
 msgstr "ライブラリ内"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "減らす"
@@ -1733,9 +1739,9 @@ msgid "Fetch Metadata"
 msgstr ""
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
@@ -1758,7 +1764,7 @@ msgstr "読み込み中..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "閉じる"
 
@@ -2238,49 +2244,49 @@ msgstr "ダウンロードを許可"
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "アップロードを許可"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "編集を許可"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "パスワード変更を許可"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "みんなの本棚の編集を許可"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "言語を除外"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 msgid "Default Visible Language of Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
@@ -2433,21 +2439,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3052,15 +3066,15 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 91e2659d302c2e52bf6d614fe149101f8d82dfdb..f2839dab3bcea9add0c05d64c436d5e871268fef 100644
GIT binary patch
delta 4105
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

delta 4336
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
R)EAt_3;&nfu)?#0{{wL-J0}1D

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 1a1cc0941..983a9b034 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,17 +17,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "មិនបានតម្លើង"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
@@ -66,17 +66,17 @@ msgstr "ការកំណត់សាមញ្ញ"
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "បង្ហាញទាំងអស់"
@@ -93,7 +93,7 @@ msgstr "បង្ហាញទាំងអស់"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -272,9 +272,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
@@ -312,164 +312,164 @@ msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -494,8 +494,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -532,7 +532,7 @@ msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុ
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -690,7 +690,7 @@ msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -723,34 +723,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "កំពុងរង់ចាំ"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "បានបរាជ័យ"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "បានចាប់ផ្តើម"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "បានបញ្ចប់"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr ""
 
@@ -767,7 +771,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -833,7 +837,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -849,7 +853,7 @@ msgstr "វត្ថុតាងហួសពេលកំណត់"
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr ""
 
@@ -874,7 +878,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
@@ -883,7 +887,7 @@ msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
@@ -892,7 +896,7 @@ msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
@@ -910,7 +914,7 @@ msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
@@ -920,7 +924,7 @@ msgstr "បង្ហាញជម្រើសប្រភេទ"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "ស៊េរី"
 
@@ -938,7 +942,7 @@ msgid "Show author selection"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr ""
 
@@ -948,7 +952,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "ភាសានានា"
 
@@ -972,7 +976,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr ""
 
@@ -980,7 +984,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr ""
 
@@ -1008,8 +1012,7 @@ 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"
+msgid "You are not allowed to add a book to the shelf"
 msgstr ""
 
 #: cps/shelf.py:144
@@ -1033,58 +1036,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ៖ %(sname)s"
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "កែប្រែធ្នើ"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "មានបញ្ហា"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
@@ -1117,177 +1123,177 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "ឯកសារ DLS"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
@@ -1300,31 +1306,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1358,212 +1364,212 @@ msgstr "រដ្ឋបាល"
 msgid "Password"
 msgstr "លេខសម្ងាត់"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "អាប់ឡូដ"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "ទាញយក"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr ""
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "កែប្រែ"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "លុប"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "ឈ្មោះម៉ាស៊ីន SMTP"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "លេខ port SMTP"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "អ្នកចូលប្រើ SMTP"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "ពីអ៊ីមែល"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "ការកំណត់"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "ទីតាំង database Calibre"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "លេខ port"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "ចំនួនសៀវភៅក្នុងមួយទំព័រ"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "កំពុងអាប់ឡូដ"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "ការចុះឈ្មាះសាធារណៈ"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "ការចូលប្រើប្រាស់ពីចម្ងាយ"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "ទីតាំង database Calibre"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "កិច្ចការរដ្ឋបាល"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "ភ្ជាប់ទៅ database Calibre ម្តងទៀត"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "រកមើលបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "ធ្វើបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "កំពុងធ្វើបច្ចុប្បន្នភាព សូមកុំបើកទំព័រជាថ្មី"
 
@@ -1575,39 +1581,39 @@ msgstr "តាមរយៈ"
 msgid "In Library"
 msgstr "នៅក្នុងបណ្ណាល័យ"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr ""
@@ -1737,9 +1743,9 @@ msgid "Fetch Metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
@@ -1762,7 +1768,7 @@ msgstr "កំពុងដំណើរការ..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "បិទ"
 
@@ -2241,50 +2247,50 @@ msgstr "អនុញ្ញាតឲទាញយក"
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "អនុញ្ញាតឲអាប់ឡូត"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "អនុញ្ញាតឲកែប្រែ"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "អនុញ្ញាតឲលុបសៀវភៅ"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "អនុញ្ញាតឲប្តូរលេខសម្ងាត់"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "អនុញ្ញាតឲកែប្រែធ្នើសាធារណៈ"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "លើកលែងភាសា"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "បង្ហាញសៀវភៅដែលមានភាសា"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "ភាពមើលឃើញដែលមកស្រាប់សម្រាប់អ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "បង្ហាញសៀវភៅចៃដន្យក្នុងការបង្ហាញជាពិស្តារ"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
@@ -2437,21 +2443,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3056,15 +3070,15 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "លុបអ្នកប្រើប្រាស់នេះ"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index fb07d0353c1ad74ae2308d875a1e52d672a6cdd7..5f2aa6a7ca5260ca8eb7c72812a3dea3e863c486 100644
GIT binary patch
delta 11332
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

delta 11583
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
YcqOZ3)zs?c(o1R{u2c4(gQeyE3pa^v4*&oF

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 844839968..8bbad4085 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -17,17 +17,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "niet geïnstalleerd"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "geïnstalleerd"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Statistieken"
 
@@ -66,17 +66,17 @@ msgstr "Basisconfiguratie"
 msgid "UI Configuration"
 msgstr "Uiterlijk aanpassen"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Systeembeheerder"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Alles"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
@@ -84,7 +84,7 @@ msgstr "Gebruiker niet gevonden"
 msgid "{} users deleted successfully"
 msgstr "{} gebruikers succesvol verwijderd"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Alle talen"
@@ -93,7 +93,7 @@ msgstr "Alle talen"
 msgid "Malformed request"
 msgstr "Misvormd verzoek"
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr "Gast naam kan niet worden veranderd"
 
@@ -101,7 +101,7 @@ msgstr "Gast naam kan niet worden veranderd"
 msgid "Guest can't have this role"
 msgstr "Gast kan deze rol niet hebben"
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
@@ -272,9 +272,9 @@ msgstr "LDAP Lid Gebruiker Filter heeft een niet-gebalanceerd haakje"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsjeblieft een geldig pad in."
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "DB-instellingen niet opgeslagen"
 
@@ -304,7 +304,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
@@ -312,167 +312,167 @@ msgstr "Vul alle velden in!"
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr "Kan Gast gebruiker niet verwijderen"
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account succesvol geverifieerd"
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail wordt verzonden naar %(email)s, controleer de taken voor het resultaat"
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mislukt om minstens een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Het is niet gelukt tenminste een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fout: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fout: No user returned in response of LDAP server"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minstens een LDAP Gebruiker is niet gevonden in de Database"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} Gebruiker succesvol geïmporteerd"
 
@@ -484,7 +484,7 @@ msgstr "niet geconfigureerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
@@ -497,8 +497,8 @@ msgstr "Het boekformaat is verwijderd"
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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"
 
@@ -535,7 +535,7 @@ msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
@@ -693,7 +693,7 @@ msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
@@ -727,34 +727,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Alleen jpg/jpeg/png/webp/bmp bestanden worden ondersteund als omslag"
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Alleen jpg/jpeg bestanden zijn toegestaan als omslag"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "Unrar executable niet gevonden"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Fout bij het uitvoeren van Unrar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Wachten"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Gestart"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Voltooid"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Onbekende status"
 
@@ -771,7 +775,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -837,7 +841,7 @@ msgid "{} Stars"
 msgstr "{} sterren"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Inloggen"
 
@@ -853,7 +857,7 @@ msgstr "Toegangssleutel is verlopen"
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Boeken"
 
@@ -878,7 +882,7 @@ msgstr "Gedownloade boeken"
 msgid "Show Downloaded Books"
 msgstr "Gedownloade boeken tonen"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
@@ -887,7 +891,7 @@ msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
@@ -896,7 +900,7 @@ msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
@@ -914,7 +918,7 @@ msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -924,7 +928,7 @@ msgstr "Categoriekeuze tonen"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Boekenreeksen"
 
@@ -942,7 +946,7 @@ msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Uitgevers"
 
@@ -952,7 +956,7 @@ msgstr "Uitgeverskeuze tonen"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Talen"
 
@@ -976,7 +980,7 @@ msgstr "Bestandsformaten"
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
@@ -984,7 +988,7 @@ msgstr "Gearchiveerde boeken"
 msgid "Show archived books"
 msgstr "Gearchiveerde boeken tonen"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "Boekenlijst"
 
@@ -1012,9 +1016,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "Het boek is toegevoegd aan boekenplank: %(sname)s"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1037,58 +1040,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Het boek is verwijderd van boekenplank: %(sname)s"
 
 #: cps/shelf.py:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Boekenplank maken"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Je bent niet gemachtigd deze boekenplank aan te passen"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Pas een boekenplank aan"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank '%(title)s' aangemaakt"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank '%(title)s' is aangepast"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Er is een fout opgetreden"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, 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:307
+#: cps/shelf.py:312
 #, 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:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde van boekenplank veranderen: '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
 
@@ -1121,177 +1127,177 @@ msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten na
 msgid "No release information available"
 msgstr "Geen update-informatie beschikbaar"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Gedownloade boeken door %(user)s"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lees Status = %(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, 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:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 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:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
@@ -1304,31 +1310,31 @@ msgstr "Geen geldig gmail.json bestand gevonden met OAuth informatie"
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre ebook-convert %(tool)s niet gevonden"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s formaat is niet gevonden op de schijf"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "E-Book converter mislukt met een onbekende foutmelding"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converteerder mislukt: %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Omgezette bestand is niet gevonden of meer dan een bestand in map %(folder)s"
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-boek-conversie mislukt: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre mislukt met foutmelding: %(error)s"
@@ -1362,212 +1368,212 @@ msgstr "Beheer"
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Uploaden"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Downloaden"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Boeken lezen"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Bewerken"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Openbare boekenplank"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Gebruiker toevoegen"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "LDAP gebruikers importeren"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "SMTP-serverinstellingen"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP-hostnaam (gebruik mail.example.org om wachtwoordherstel uit te schakelen)"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP-poort"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "Encryptie"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP-gebruikersnaam"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Van e-mail"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr "E-Mail Service"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr "Gmail via OAuth2"
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Instellingen"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Calibre-database locatie"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Logniveau"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Poort"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "Externe poort"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Aantal boeken per pagina"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Uploaden toestaan"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Anoniem verkennen"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Openbare registratie"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Inloggen op afstand"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Reverse Proxy Login"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Reverse proxy header naam"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Bewerk Calibre databaseconfiguratie"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Bewerk basisconfiguratie"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Bewerk gebruikersinterface configuratie"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Systeembeheer"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "Download foutopsporingspakket"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Logboeken bekijken"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Opnieuw verbinden met Calibre database"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Calibre-Web herstarten"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Calibre-Web stoppen"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Bijwerken"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Versie"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Details"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Huidige versie"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Controleren op updates"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Update uitvoeren"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Weet je zeker dat je Calibre-Web wilt herstarten?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "Oké"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Weet je zeker dat je Calibre-Web wilt stoppen?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Bezig met bijwerken, vernieuw de pagina niet"
 
@@ -1579,39 +1585,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "In bibliotheek"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "Sorteren op datum, nieuwste boeken eerst"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 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/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr "Sorteren op alfabetische volgorde"
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 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/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 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/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "beperken"
@@ -1741,9 +1747,9 @@ msgid "Fetch Metadata"
 msgstr "Metagegevens ophalen"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Opslaan"
 
@@ -1766,7 +1772,7 @@ msgstr "Bezig met laden..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Sluiten"
 
@@ -2247,50 +2253,50 @@ msgstr "Downloads toestaan"
 msgid "Allow eBook Viewer"
 msgstr "Boeken lezen toestaan"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Uploads toestaan"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Bewerken toestaan"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Verwijderen van boeken toestaan"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Wachtwoord wijzigen toestaan"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Bewerken van openbare boekenplanken toestaan"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Talen uitsluiten"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Taal van boeken"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Standaard zichtbaar voor nieuwe gebruikers"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Willekeurige boeken tonen in gedetailleerde weergave"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Voeg toegestane/geweigerde tags toe"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Voeg toegestane/geweigerde aangepaste kolomwaarden toe"
 
@@ -2444,21 +2450,29 @@ msgstr "Terug naar startpagina"
 msgid "Logout User"
 msgstr "Gebruiker uitloggen"
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr "Auteurs sorteren op alfabetische volgorde"
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Auteurs sorteren op omgekeerde alfabetische volgorde"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "Sorteer oplopend volgens de serie index"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "Sorteer aflopend volgens de serie index"
 
@@ -3067,15 +3081,15 @@ msgstr "Aanmaken/Bekijken"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Voeg toegestane/geweigerde aangepaste kolomwaarden toe"
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Synchroniseer alleen boeken op geselecteerde boekenplanken met Kobo"
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Gebruiker verwijderen"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Genereer Kobo Auth URL"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index d9f9d7a3c4bd2ef2284da1474c1db443f09e9dc0..e796b117b354abef952f2b2adba88c5807a01c94 100644
GIT binary patch
delta 11328
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
Qu5{GyLxH6)9y?L)e>zz)l>h($

delta 11602
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
Kb^Z9$QvU(S8H^tQ

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index e50d7f9b5..1ecbe85fd 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -17,17 +17,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "nie zainstalowane"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "zainstalowane"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Statystyki"
 
@@ -67,17 +67,17 @@ msgstr "Konfiguracja podstawowa"
 msgid "UI Configuration"
 msgstr "Konfiguracja Interfejsu"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 msgid "Edit Users"
 msgstr "Edytuj użytkowników"
 
 # ???
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Wszystko"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
@@ -85,7 +85,7 @@ msgstr "Nie znaleziono użytkownika"
 msgid "{} users deleted successfully"
 msgstr "{} użytkowników usuniętych pomyślnie"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Pokaż wszystkie"
@@ -94,7 +94,7 @@ msgstr "Pokaż wszystkie"
 msgid "Malformed request"
 msgstr "Nieprawidłowo sformułowane żądanie"
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr "Nazwa gościa nie może być zmieniona"
 
@@ -102,7 +102,7 @@ msgstr "Nazwa gościa nie może być zmieniona"
 msgid "Guest can't have this role"
 msgstr "Gość nie może pełnić tej roli"
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 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"
 
@@ -272,9 +272,9 @@ msgstr "Filtr użytkownika członka LDAP ma niedopasowane nawiasy"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie jest prawidłowa, Proszę wprowadzić poprawną ścieżkę"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "Ustawienia Bazy Danych nie są zapisywalne"
 
@@ -303,7 +303,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
@@ -311,169 +311,169 @@ msgstr "Proszę wypełnić wszystkie pola!"
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 #, fuzzy
 msgid "Can't delete Guest User"
 msgstr "Nie można usunąć użytkownika gościa"
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 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:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, fuzzy, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testowy e-mail czeka w kolejce do wysłania do %(email)s, sprawdź zadania, aby uzyskać wynik"
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
 # ???
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Błąd: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 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:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} Użytkownik pomyślnie zaimportowany"
 
@@ -485,7 +485,7 @@ msgstr "nie skonfigurowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, 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"
@@ -498,8 +498,8 @@ msgstr "Plik książki w wybranym formacie został usunięty"
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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"
 
@@ -536,7 +536,7 @@ msgstr "Nie udało się utworzyć łącza %(path)s (Odmowa dostępu)."
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
@@ -696,7 +696,7 @@ msgstr "Nie znaleziono pliku %(file)s na Google Drive"
 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:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 msgid "Found an existing account for this e-mail address"
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
@@ -729,34 +729,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Jako plik okładki obsługiwane są tylko pliki jpg/jpeg/png/webp/bmp"
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "Plik wykonywalny programu unrar nie znaleziony"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Błąd przy wykonywaniu unrar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Oczekiwanie"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Nieudane"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Rozpoczynanie"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Zakończone"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Ststus nieznany"
 
@@ -774,7 +778,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -840,7 +844,7 @@ msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -856,7 +860,7 @@ msgstr "Token wygasł"
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Książki"
 
@@ -881,7 +885,7 @@ msgstr "Pobrane książki"
 msgid "Show Downloaded Books"
 msgstr "Pokaż pobrane książki"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Najwyżej ocenione"
 
@@ -890,7 +894,7 @@ msgid "Show Top Rated Books"
 msgstr "Pokaż menu najwyżej ocenionych książek"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Przeczytane"
 
@@ -899,7 +903,7 @@ msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Nieprzeczytane"
 
@@ -917,7 +921,7 @@ msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -927,7 +931,7 @@ msgstr "Pokaż menu wyboru kategorii"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Cykle"
 
@@ -945,7 +949,7 @@ msgid "Show author selection"
 msgstr "Pokaż menu wyboru autora"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Wydawcy"
 
@@ -955,7 +959,7 @@ msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Języki"
 
@@ -979,7 +983,7 @@ msgstr "Formaty plików"
 msgid "Show file formats selection"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
@@ -987,7 +991,7 @@ msgstr "Zarchiwizowane książki"
 msgid "Show archived books"
 msgstr "Pokaż zarchiwizowane książki"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "Lista książek"
 
@@ -1015,9 +1019,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "Książka została dodana do półki: %(sname)s"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1040,58 +1043,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Książka została usunięta z półki: %(sname)s"
 
 #: cps/shelf.py:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Niestety nie możesz usunąć książki z tej półki %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Edytuj półkę"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, 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:307
+#: cps/shelf.py:312
 #, 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:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: „%(name)s”"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 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"
 
@@ -1124,178 +1130,178 @@ msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktual
 msgid "No release information available"
 msgstr "Brak dostępnych informacji o wersji"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Książki pobrane przez %(user)s"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Szukaj"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Zadania"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status przeczytania = %(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 #, fuzzy
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, 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:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 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:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, 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:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 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:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
@@ -1308,31 +1314,31 @@ msgstr "Nie znaleziono poprawnego pliku gmail.json z informacjami OAuth"
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Nie znaleziono narzędzia calibre %(tool)s do konwertowania"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Nie znaleziono na dysku formatu %(format)s"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "Konwertowanie ebooka zakończyło się niepowodzeniem z nieznanego powodu"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converter spowodowało błąd: %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, 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:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Konwertowanie nie powiodło się: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, fuzzy, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre nie powiodło się z błędem: %(error)s"
@@ -1367,213 +1373,213 @@ msgstr "Panel administratora"
 msgid "Password"
 msgstr "Hasło"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Wysyłanie"
 
 # ???
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Pobieranie"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Przeglądanie"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Edycja"
 
 # ???
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Usuń"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Półka publiczna"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "Importuj użytkowników LDAP"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Ustawienia serwera e-mail SMTP"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "Adres serwera SMTP"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "Port serwera SMTP"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "Nazwa użytkownika SMTP"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Wyślij z adresu e-mail"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr "Usługa e-mail"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr "Gmail przez Oauth2"
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Folder bazy danych Calibre"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Poziom dziennika"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "Port zewnętrzny"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Liczba książek na stronie"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Wysyłanie"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Anonimowe przeglądanie"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Publiczna rejestracja"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Zdalne logowanie (Magic Link)"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Logowanie reverse proxy"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Nazwa nagłowka reverse proxy"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 msgid "Edit Calibre Database Configuration"
 msgstr "Edytuj konfigurację bazy danych Calibre"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Edytuj podstawową konfigurację"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Edytuj konfigurację interfejsu"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Zarządzanie"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "Pobierz pakiet Debug"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Podgląd dziennika"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Połącz ponownie z bazą danych Calibre"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Uruchom ponownie Calibre Web"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Zatrzymaj Calibre Web"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Update (aktualizacja)"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Wersja"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Szczegóły"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Bieżąca wersja"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Sprawdź aktualizacje"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Wykonaj aktualizację"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Na pewno chcesz zatrzymać Calibre Web?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Aktualizowanie, proszę nie odświeżać strony"
 
@@ -1585,39 +1591,39 @@ msgstr "przez"
 msgid "In Library"
 msgstr "W Bibliotece"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "Sortuj książki według daty, najnowsze jako pierwsze"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr "Sortuj książki według daty, najstarsze jako pierwsze"
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr "Sortuj tytuły w porządku alfabetycznym"
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortuj tytuły w odwrotnym porządku alfabetycznym"
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortuj według daty publikacji, najnowsze jako pierwsze"
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortuj według daty publikacji, najstarsze jako pierwsze"
 
 #: 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "zwiń"
@@ -1748,9 +1754,9 @@ msgid "Fetch Metadata"
 msgstr "Uzyskaj metadane"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Zapisz"
 
@@ -1773,7 +1779,7 @@ msgstr "Ładowanie..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Zamknij"
 
@@ -2259,50 +2265,50 @@ msgstr "Zezwalaj na pobieranie"
 msgid "Allow eBook Viewer"
 msgstr "Zezwalaj na przeglądanie e-booków"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Zezwalaj na wysyłanie"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Zezwalaj na edycję"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Zezwalaj na usuwanie książek"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Zezwalaj na zmianę hasła"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Zezwalaj na edycję półek publicznych"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Wyklucz języki"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Pokaż książki w języku"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Domyślne ustawienia widoku dla nowych użytkowników"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Pokaz losowe książki w widoku szczegółowym"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Dodaj dozwolone/zabronione etykiety"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Dodaj dozwolone/zabronione wartości własnych kolumn"
 
@@ -2458,21 +2464,29 @@ msgstr "Powrót do głównego menu"
 msgid "Logout User"
 msgstr "Wyloguj użytkownika"
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr "Sortuj autorów w porządku alfabetycznym"
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Posortuj autorów w odwrotnym porządku alfabetycznym"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "Sortuj rosnąco według indeksu serii"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "Sortuj malejąco według indeksu serii"
 
@@ -3083,15 +3097,15 @@ 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:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Synchronizuj z Kobo tylko książki z wybranych półek"
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Usuń tego użytkownika"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Generuj Kobo Auth URL"
 
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 47fddac2753e77a66f8c6edf11b3745a65bb19f4..d1f3e9543f8b24643f5b6c6b618c471a21b8f442 100644
GIT binary patch
delta 10231
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
Mw*yQ1m#(hxU#rkq>Hq)$

delta 10477
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
BsL}uc

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 6a9a773bc..d2bcdb067 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -13,17 +13,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "não instalado"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "instalado"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Estatística"
 
@@ -62,17 +62,17 @@ msgstr "Configuração Básica"
 msgid "UI Configuration"
 msgstr "Configuração de UI"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Usuário Admin"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Todos"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "Usuário não encontrado"
 
@@ -81,7 +81,7 @@ msgstr "Usuário não encontrado"
 msgid "{} users deleted successfully"
 msgstr "{} Usuário Importado com Sucesso"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mostrar tudo"
@@ -90,7 +90,7 @@ msgstr "Mostrar tudo"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nenhum usuário administrador restante, não pode remover a função de administrador"
 
@@ -270,9 +270,9 @@ msgstr "Filtro de usuário de membro LDAP tem parênteses incomparáveis"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificate, Certificados ou chave de localização não é válida, Insira o caminho correto"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "O banco de dados de configurações não é gravável"
 
@@ -302,7 +302,7 @@ msgstr "Atualização das configurações do servidor de e-mail"
 msgid "Database Configuration"
 msgstr "Configuração das Características"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
@@ -310,167 +310,167 @@ msgstr "Por favor, preencha todos os campos!"
 msgid "E-mail is not from valid domain"
 msgstr "O e-mail não é de um domínio válido"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Adicionar novo usuário"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuário '%(user)s' criado"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrei uma conta existente para este endereço de e-mail ou apelido."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuário '%(nick)s' excluído"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "Nenhum usuário administrador restante, não é possível excluir o usuário"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar usuário %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuário '%(nick)s' atualizado"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Editar configurações do servidor de e-mail"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocorreu um erro ao enviar o e-mail de teste: %(res)s"
 
-#: cps/admin.py:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure seu endereço de e-mail primeiro..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Atualização das configurações do servidor de e-mail"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Senha para redefinição do usuário %(user)s"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "visualizador de arquivo de registro"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Solicitação de pacote de atualização"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Download do pacote de atualização"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Descompactação de pacote de atualização"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Substituição de arquivos"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "As ligações à base de dados estão fechadas"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Parar servidor"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "Atualização concluída, pressione okay e recarregue a página"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Atualização falhou:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Erro HTTP"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Erro de conexão"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tempo limite durante o estabelecimento da conexão"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Erro geral"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Arquivo de atualização não pôde ser salvo no diretório temporário"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erro: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erro: Nenhum usuário retornado em resposta do servidor LDAP"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "No mínimo um usuário LDAP não encontrado no banco de dados"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} Usuário Importado com Sucesso"
 
@@ -482,7 +482,7 @@ msgstr "não configurado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "A coluna personalizada No.%(column)d não existe no banco de dados do calibre"
@@ -495,8 +495,8 @@ msgstr "Formato do Livro Eliminado com Sucesso"
 msgid "Book Successfully Deleted"
 msgstr "Livro Eliminado com Sucesso"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oops! O título do livro seleccionado não está disponível. O arquivo não existe ou não é acessível"
 
@@ -533,7 +533,7 @@ msgstr "Falha ao criar o caminho %(path)s (Permission denied)."
 msgid "Failed to store file %(file)s."
 msgstr "Falha ao armazenar o arquivo %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
@@ -691,7 +691,7 @@ msgstr "Arquivo %(file)s não encontrado no Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrado uma conta existente para este endereço de e-mail."
@@ -725,34 +725,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Apenas ficheiros jpg/jpeg/png/webp/bmp são suportados como arquivos de capa"
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Apenas arquivos jpg/jpeg são suportados como arquivos de capa"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "Unrar arquivo binário não encontrado"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Erro excecutando UnRar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Aguardando"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Falha"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Iniciado em"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Concluído"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Status Desconhecido"
 
@@ -769,7 +773,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -835,7 +839,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Login"
 
@@ -851,7 +855,7 @@ msgstr "O Token expirou"
 msgid "Success! Please return to your device"
 msgstr "Sucesso! Por favor, volte ao seu aparelho"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Livros"
 
@@ -876,7 +880,7 @@ msgstr "Livros descarregados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Livros Descarregados"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Livros Mais Bem Avaliados"
 
@@ -885,7 +889,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar os melhores livros avaliados"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Livros Lidos"
 
@@ -894,7 +898,7 @@ msgid "Show read and unread"
 msgstr "Mostrar lido e não lido"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Livros Não Lidos"
 
@@ -912,7 +916,7 @@ msgid "Show Random Books"
 msgstr "Mostrar Livros Aleatórios"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Categorias"
 
@@ -922,7 +926,7 @@ msgstr "Mostrar seleção de categoria"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Série"
 
@@ -940,7 +944,7 @@ msgid "Show author selection"
 msgstr "Mostrar selecção de autor"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Editores"
 
@@ -950,7 +954,7 @@ msgstr "Mostrar selecção de editores"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -974,7 +978,7 @@ msgstr "Formatos de arquivo"
 msgid "Show file formats selection"
 msgstr "Mostrar seleção de formatos de arquivo"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Livros Arquivados"
 
@@ -982,7 +986,7 @@ msgstr "Livros Arquivados"
 msgid "Show archived books"
 msgstr "Mostrar livros arquivados"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "Lista de Livros"
 
@@ -1010,9 +1014,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "O livro foi adicionado à estante: %(sname)s"
 
 #: cps/shelf.py:126
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "Você não tem permissão para adicionar um livro à estante: %(name)s"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1035,58 +1038,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "O livro foi removido da estante: %(sname)s"
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Desculpe, você não tem permissão para remover um livro desta estante: %(sname)s"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Crie uma estante"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Desculpe, você não tem permissão para remover um livro desta estante: %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Editar uma estante"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s criada"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s alterada"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Houve um erro"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Já existe uma estante pública com o nome '%(title)s' ."
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Já existe uma estante privada com o nome'%(title)s' ."
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Alterar ordem da Estante: '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erro ao abrir estante. A estante não existe ou não está acessível"
 
@@ -1119,177 +1125,177 @@ msgstr "Uma nova atualização está disponível. Clique no botão abaixo para a
 msgid "No release information available"
 msgstr "Não há informações de lançamento disponíveis"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Descobrir (Livros Aleatórios)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Hot Books (Os Mais Descarregados)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livros baixados por %(user)s"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Avaliação: %(rating)s estrelas"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato do arquivo: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Pesquisa"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Lista de classificações"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Lista de formatos de arquivo"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Publicado depois de "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Avaliação <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Avaliação >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de leitura  = %(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ups! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail válido para Kindle."
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Nome de usuário ou senha incorretos"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "Nova senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Você agora está logado como: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s's"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Perfil atualizado"
 
@@ -1302,31 +1308,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre ebook-convert %(tool)s não encontrado"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Formato %(format)s não encontrado no disco"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "O conversor de Ebook falhou com erro desconhecido"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "O conversor de Kepubify falhou: %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Arquivo convertido não encontrado ou mais de um arquivo na pasta %(folder)s"
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Conversor de ebook falhou: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre falhou com erro: %(error)s"
@@ -1360,212 +1366,212 @@ msgstr "Admin"
 msgid "Password"
 msgstr "Senha"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Baixar"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Ver Livros"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Editar"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Eliminar"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Estante Pública"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Adicionar Novo Usuário"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "Importar usuários LDAP"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Configurações do servidor de e-mail"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP Nome do anfitrião"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "Porto SMTP"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "Login SMTP"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Do E-mail"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Configuração"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Diretório do Banco de Dados de Calibres"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Nível de registo"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Porto"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "Porto externo"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Livros por página"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Uploads"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Navegação Anónima"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Inscrição Pública"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Login remoto Magic Link"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Login de Proxy Reversa"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Nome do cabeçalho do Proxy Reverso"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Editar Configuração Básica"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Editar Configuração Básica"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Editar configuração da IU"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Administração"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "Download do Pacote de Depuração"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Ver Logs"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Reconectar base de dados de calibração"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Reinicie"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Encerramento"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Atualização"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Versão"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Detalhes"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Versão atual"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Verificar Atualizações"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Realizar Atualizações"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Tem a certeza que quer recomeçar?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Tens a certeza que queres fechar?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Atualizando, por favor, não recarregue esta página"
 
@@ -1577,39 +1583,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "Na Biblioteca"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "Classificar de acordo com a data do livro, o mais recente primeiro"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr "Classificar de acordo com a data do livro, o mais antigo primeiro"
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr "Classificar título em ordem alfabética"
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr "Classificar título em ordem alfabética inversa"
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr "Classificar de acordo com a data de publicação, o mais novo primeiro"
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 msgid "Sort according to publishing date, oldest first"
 msgstr "Classificar de acordo com a data de publicação, primeiro mais antigo"
 
 #: 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "reduzir"
@@ -1739,9 +1745,9 @@ msgid "Fetch Metadata"
 msgstr "Buscar Metadados"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Salvar"
 
@@ -1764,7 +1770,7 @@ msgstr "A carregar..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Fechar"
 
@@ -2245,50 +2251,50 @@ msgstr "Permitir Downloads"
 msgid "Allow eBook Viewer"
 msgstr "Permitir que o eBook Viewer"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Permitir Uploads"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Permitir Editar"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Permitir Livros Excluídos"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Permitir mudança de senha"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Permitir a Edição de Prateleiras Públicas"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Excluir idiomas"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Língua dos Livros"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Visibilidades por defeito para novos utilizadores"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Mostrar Livros Aleatórios em Vista de Detalhe"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Adicionar Etiquetas permitidas/negadas"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Adicionar valores permitidos/negados da coluna personalizada"
 
@@ -2442,21 +2448,29 @@ msgstr "Voltar para casa"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr "Ordenar os autores em ordem alfabética"
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordenar os autores em ordem alfabética inversa"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "Ordenar ascendente de acordo com o índice de série"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "Ordenação decrescente de acordo com o índice de série"
 
@@ -3065,15 +3079,15 @@ msgstr "Criar/Ver"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Adicionar valores permitidos/definidos da coluna personalizada"
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Eliminar Utilizador"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Gerar o Kobo Auth URL"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index f712f2a541cffea1d7704e20898ba082b316f46a..486bb167640bee2302692f973c18bafc68dabe86 100644
GIT binary patch
delta 8403
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

delta 8715
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
S{`b%|6&l*v`d5eV)cQBq2lEL4

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 705c61ff6..0f75ad175 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,17 +17,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "не установлено"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "установлено"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -66,17 +66,17 @@ msgstr "Настройки сервера"
 msgid "UI Configuration"
 msgstr "Настройка интерфейса"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Управление сервером"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Все"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Показать все"
@@ -93,7 +93,7 @@ msgstr "Показать все"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -273,9 +273,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
@@ -313,167 +313,167 @@ msgstr "Пожалуйста, заполните все поля!"
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Ошибка: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -485,7 +485,7 @@ msgstr "не настроено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -498,8 +498,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
@@ -536,7 +536,7 @@ msgstr "Ошибка при создании пути %(path)s (Доступ з
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -694,7 +694,7 @@ msgstr "Файл %(file)s не найден на Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Этот адрес электронной почты уже зарегистрирован."
@@ -728,34 +728,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Только файлы в формате jpg / jpeg поддерживаются как файл обложки"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Начало"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Завершено"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Неизвестный статус"
 
@@ -772,7 +776,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -838,7 +842,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Логин"
 
@@ -854,7 +858,7 @@ msgstr "Ключ просрочен"
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Книги"
 
@@ -879,7 +883,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
@@ -888,7 +892,7 @@ msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
@@ -897,7 +901,7 @@ msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
@@ -915,7 +919,7 @@ msgid "Show Random Books"
 msgstr "Показывать Случайные Книги"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Категории"
 
@@ -925,7 +929,7 @@ msgstr "Показывать выбор категории"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Серии"
 
@@ -943,7 +947,7 @@ msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Издатели"
 
@@ -953,7 +957,7 @@ msgstr "Показать выбор издателя"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Языки"
 
@@ -977,7 +981,7 @@ msgstr "Форматы файлов"
 msgid "Show file formats selection"
 msgstr "Показать выбор форматов файлов"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr ""
 
@@ -985,7 +989,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr ""
 
@@ -1013,9 +1017,8 @@ 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1038,58 +1041,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Книга удалена с полки: %(sname)s"
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Извините, вы не можете удалить книгу с полки: %(sname)s"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Создать полку"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Извините, вы не можете удалить книгу с полки: %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Изменить полку"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана полка %(title)s"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Колка %(title)s изменена"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Публичная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Приватная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение полки '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Полка: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
@@ -1122,177 +1128,177 @@ msgstr "Новое обновление доступно. Нажмите на к
 msgid "No release information available"
 msgstr "Информация о выпуске недоступна"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Поиск"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Скачать"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Список рейтингов"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
@@ -1305,31 +1311,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ошибка Ebook-конвертора: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1363,212 +1369,212 @@ msgstr "Управление"
 msgid "Password"
 msgstr "Пароль"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Загрузить"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Скачать"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Посмотреть электронные книги"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Редактировать"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Удалить"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Добавить нового пользователя"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "Импорт пользователей LDAP"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Настройки SMTP-сервера"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP-сервер"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP-порт"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP-логин"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Отправитель"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Настройки сервера"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Расположение базы данных Calibre"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Уровень логирования"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Количество книг на странице"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Загрузка на сервер"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Анонимный просмотр"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Публичная регистрация"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Удалённый логин"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Логин обратного прокси"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Имя заголовка обратного прокси"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Изменить основные настройки"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Изменить основные настройки"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Изменить настройки интерфейса"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Управление"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Просмотреть лог файл"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Пере подключиться к базе жанных Calibre"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Перезагрузить Calibre-Web"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Остановить Calibre-Web"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Обновление"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Версия"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Подробности"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Текущая версия"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Проверка обновлений"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Установить обновления"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Отмена"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Установка обновлений, пожалуйста, не обновляйте страницу"
 
@@ -1580,39 +1586,39 @@ msgstr "с помощью"
 msgid "In Library"
 msgstr "В библиотеке"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "уменьшить"
@@ -1742,9 +1748,9 @@ msgid "Fetch Metadata"
 msgstr "Получить метаданные"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Сохранить"
 
@@ -1767,7 +1773,7 @@ msgstr "Загрузка..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Закрыть"
 
@@ -2248,50 +2254,50 @@ msgstr "Разрешить скачивание с сервера"
 msgid "Allow eBook Viewer"
 msgstr "Разрешить чтение книг"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Разрешить загрузку на сервер"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Разрешить редактирование книг"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Разрешить удаление книг"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Разрешить смену пароля"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Разрешить редактирование публичных книжных полок"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Исключить языки"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Показать книги на языках"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Видимость для новых пользователей(по умолчанию)"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Показывать случайные книги при просмотре деталей"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Добавить разрешенные / запрещенные теги"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Добавить разрешенные / запрещенные значения индивидуальных столбцов"
 
@@ -2445,21 +2451,29 @@ msgstr "Вернуться на главную"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3068,15 +3082,15 @@ msgstr "Создать/Просмотреть"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Добавить разрешенные / запрещенные значения индивидуальных столбцов"
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Удалить этого пользователя"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Создать Kobo Auth URL"
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 209d5f4ae401ae71509b2bc7d2fc59642e3d674e..8ff534943f8db1930a76678cc9d64a3ba819f6be 100644
GIT binary patch
delta 11122
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
RyCq=7l7mfa#~oPY@qZUV-7o+E

delta 11399
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
Llyp6`u+0Aeoli|u

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index a2e8c72fb..713896761 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,17 +16,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "inte installerad"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "installerad"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Statistik"
 
@@ -65,16 +65,16 @@ msgstr "Grundläggande konfiguration"
 msgid "UI Configuration"
 msgstr "Användargränssnitt konfiguration"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 msgid "Edit Users"
 msgstr "Redigera användare"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Alla"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "Användaren hittades inte"
 
@@ -82,7 +82,7 @@ msgstr "Användaren hittades inte"
 msgid "{} users deleted successfully"
 msgstr "{} användare har tagits bort"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Visa alla"
@@ -91,7 +91,7 @@ msgstr "Visa alla"
 msgid "Malformed request"
 msgstr "Felaktig begäran"
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr "Gästnamn kan inte ändras"
 
@@ -99,7 +99,7 @@ msgstr "Gästnamn kan inte ändras"
 msgid "Guest can't have this role"
 msgstr "Gäst kan inte ha den här rollen"
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Ingen administratörsanvändare kvar, kan inte ta bort administratörsrollen"
 
@@ -270,9 +270,9 @@ msgstr "Användarfilter för LDAP-medlemmar har omatchad parentes"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "Inställningar för DB är inte skrivbara"
 
@@ -302,7 +302,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
@@ -310,167 +310,167 @@ msgstr "Fyll i alla fält!"
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Hittade ett befintligt konto för den här e-postadressen eller namnet."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr "Det går inte att ta bort gästanvändaren"
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 #, fuzzy
 msgid "Gmail Account Verification Successful"
 msgstr "Verifiering av G-mail-kontot lyckades"
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testa e-post i kö för att skicka till %(email)s, vänligen kontrollera Uppgifter för resultat"
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Uppdateringsfilen kunde inte sparas i Temp Dir"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fel: %(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fel: Ingen användare återges som svar på LDAP-servern"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minst en LDAP-användare hittades inte i databasen"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} användare har importerats"
 
@@ -482,7 +482,7 @@ msgstr "inte konfigurerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
@@ -495,8 +495,8 @@ msgstr "Bokformat har tagits bort"
 msgid "Book Successfully Deleted"
 msgstr "Boken har tagits bort"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 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"
 
@@ -533,7 +533,7 @@ msgstr "Det gick inte att skapa sökväg %(path)s (behörighet nekad)."
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Databasfel: %(error)s."
@@ -691,7 +691,7 @@ msgstr "Filen %(file)s hittades inte på Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 msgid "Found an existing account for this e-mail address"
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
@@ -724,34 +724,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Endast jpg/jpeg/png/webp/bmp-filer stöds som omslagsfil"
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Endast jpg/jpeg-filer stöds som omslagsfil"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "Unrar binär fil hittades inte"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "Fel vid körning av UnRar"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Väntar"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Startad"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Klar"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Okänd status"
 
@@ -768,7 +772,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -834,7 +838,7 @@ msgid "{} Stars"
 msgstr "{} stjärnor"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Logga in"
 
@@ -850,7 +854,7 @@ msgstr "Token har löpt ut"
 msgid "Success! Please return to your device"
 msgstr "Lyckades! Vänligen återvänd till din enhet"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "Böcker"
 
@@ -875,7 +879,7 @@ msgstr "Hämtade böcker"
 msgid "Show Downloaded Books"
 msgstr "Visa hämtade böcker"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Bäst rankade böcker"
 
@@ -884,7 +888,7 @@ msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Lästa böcker"
 
@@ -893,7 +897,7 @@ msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
@@ -911,7 +915,7 @@ msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -921,7 +925,7 @@ msgstr "Visa kategorival"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Serier"
 
@@ -939,7 +943,7 @@ msgid "Show author selection"
 msgstr "Visa författarval"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Förlag"
 
@@ -949,7 +953,7 @@ msgstr "Visa urval av förlag"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Språk"
 
@@ -973,7 +977,7 @@ msgstr "Filformat"
 msgid "Show file formats selection"
 msgstr "Visa val av filformat"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "Arkiverade böcker"
 
@@ -981,7 +985,7 @@ msgstr "Arkiverade böcker"
 msgid "Show archived books"
 msgstr "Visa arkiverade böcker"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "Boklista"
 
@@ -1009,9 +1013,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "Boken har lagts till i hyllan: %(sname)s"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1034,58 +1037,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Boken har tagits bort från hyllan: %(sname)s"
 
 #: cps/shelf.py:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Skapa en hylla"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Tyvärr har du inte rätt att ta bort en bok från den här hyllan: %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Redigera en hylla"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hyllan %(title)s skapad"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hyllan %(title)s ändrad"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Det fanns ett fel"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "En offentlig hylla med namnet \"%(title)s\" finns redan."
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "En privat hylla med namnet \"%(title)s\" finns redan."
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Ändra ordning på hyllan: '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylla: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 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"
 
@@ -1118,177 +1124,177 @@ msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att up
 msgid "No release information available"
 msgstr "Ingen versionsinformation tillgänglig"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Hämtade böcker av %(user)s"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Sök"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "Hämtningar"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Betygslista"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lässtatus = %(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, 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:1447
+#: cps/web.py:1473
 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:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
@@ -1301,31 +1307,31 @@ msgstr "Hittade ingen giltig gmail.json-fil med OAuth-information"
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "calibre e-bokkonverterings %(tool)s hittades inte"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s-format hittades inte på disken"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "E-bokkonverteraren misslyckades med okänt fel"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-konverteraren misslyckades: %(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Konverterad fil hittades inte eller mer än en fil i mappen %(folder)s"
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-bokkonverteraren misslyckades: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "calibre misslyckades med fel: %(error)s"
@@ -1359,212 +1365,212 @@ msgstr "Administratör"
 msgid "Password"
 msgstr "Lösenord"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Hämta"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "Visa e-böcker"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Redigera"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Ta bort"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "Publik hylla"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "Lägg till ny användare"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "Importera LDAP-användare"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "Inställningar för SMTP-e-postserver"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP-värdnamn"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP-port"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP-inloggning"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Från meddelande"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr "E-posttjänst"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr "Gmail via Oauth2"
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Calibre DB dir"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "Extern port"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Böcker per sida"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Laddar upp"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Anonym surfning"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Publik registrering"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "Fjärrinloggning"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "Omvänd proxy inloggning"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Omvänt proxy rubriknamn"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Redigera grundläggande konfiguration"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "Redigera grundläggande konfiguration"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "Redigera UI-konfiguration"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "Hämta felsökningspaketet"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "Visa loggfiler"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Anslut till Calibre DB igen"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "Starta om Calibre-Web"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "Stoppa Calibre-Web"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Uppdatera"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Detaljer"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Aktuell version"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Sök efter uppdatering"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Utför uppdatering"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 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:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Uppdaterar, vänligen uppdatera inte sidan"
 
@@ -1576,39 +1582,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "Sortera efter bokdatum, nyast först"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr "Sortera efter bokdatum, äldsta först"
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr "Sortera titel i alfabetisk ordning"
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortera titel i omvänd alfabetisk ordning"
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortera efter publiceringsdatum, nyast först"
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortera efter publiceringsdatum, äldsta först"
 
 #: 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "minska"
@@ -1738,9 +1744,9 @@ msgid "Fetch Metadata"
 msgstr "Hämta metadata"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Spara"
 
@@ -1763,7 +1769,7 @@ msgstr "Läser in..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Stäng"
 
@@ -2244,50 +2250,50 @@ msgstr "Tillåt Hämtningar"
 msgid "Allow eBook Viewer"
 msgstr "Tillåt bokvisare"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Tillåt Uppladdningar"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Tillåt Redigera"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "Tillåt borttagning av böcker"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Tillåt Ändra lösenord"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Tillåt Redigering av offentliga hyllor"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Uteslut språk"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Visa böcker med språk"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Standardvisibiliteter för nya användare"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Visa slumpmässiga böcker i detaljvyn"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "Lägg till tillåtna/avvisade taggar"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "Lägg till tillåtna/avvisade anpassade kolumnvärden"
 
@@ -2442,21 +2448,29 @@ msgstr "Tillbaka till hemmet"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr "Sortera författare i alfabetisk ordning"
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Sortera författare i omvänd alfabetisk ordning"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "Sortera stigande enligt serieindex"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "Sortera fallande enligt serieindex"
 
@@ -3063,15 +3077,15 @@ 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:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Ta bort den här användaren"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "Skapa Kobo Auth URL"
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 410fa7199435ba50882cf72a8e19a0f76440869b..4b905164648eeecf104d145134af46c3b7e3e36f 100644
GIT binary patch
delta 5554
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
H7Jl<TfXYM)

delta 5828
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%0D&sjg0Vi8`p+3bi
z!`+25(4k*|_5c4rlZF=bqjvl%D)MEh0M=kQZm{FqQHO6Iay-mIEW`-%s`tmDN;MTD
zaR%zF%tf7**Q^^ykbgyXkO58jH;lqhF%7@O7;I7GPMm=W^s_M<hoF8w2^F9Z```jp
zAiu{HJb*eYpP@cb5hL9VCyylmiY$)-MOK8mZa&n5KS!PFb*Se)KnKrS|82(;M!6Gq
zK?PWVe2dI9R0h|h4&f$LW-g;L^Lc=VQvEfm#tlci8Hhn$o3_{lQ&6?-j;ehz>iJht
z3oN(&m8j?6MrCLh_QelThdOMGo3TjbuMj4XNJAflao7=;VKVMResh}3sED1h?&(iQ
zE%20eICi1$!N#}@Rg%@H68sib(p~7_VN|KEBc%_RyEHgICSshs&}7V|@5Sl33N?Wl
z?@k<zadaKj_aPUR!BMD*r=dR4KJ0)s*6pakE}#Oti6OfGcWLMlK0xgtc7mJQHmC_w
zQK=h-%G4-K!o}DXx1us~6`SFG+mD>+F4PtkU@B@OIjGX+W7BvVg*0^fr=TYGOspFm
ze<>lqva;H#E}!doD!tC^@+!yU^Oeu{PIs!xol0+6`8==Vah@$NpXHQPmX|qIGfVxB
zf2P-0(!)tf^UwB_dDH!Msh!sZXZ_Esp6S!Sdyk2#W_s)Y{r<)J_v&_Mj|mFx;$&s@
z$j+&2meV9CD6cLpx3*3Hp&pOV>-Uy8&(3vbl~#G?_zrEGRppuOc!#Lx_)C3d-r1!K
zy-w-E(%H^DZzThz)#a7{9n_wYTS9vE`(c7ZYdqh*@15oI{{IQwO__q_y(c6se{KAk
F{{Skxr_BHW

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index d108c2c36..6abf48bb5 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,17 +16,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "yüklü değil"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "yüklü"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "İstatistikler"
 
@@ -65,16 +65,16 @@ msgstr "Temel Ayarlar"
 msgid "UI Configuration"
 msgstr "Arayüz Ayarları"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 msgid "Edit Users"
 msgstr ""
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "Tümü"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -267,9 +267,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
@@ -307,166 +307,166 @@ msgstr "Lütfen tüm alanları doldurun!"
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "'%(user)s' kullanıcısı oluşturuldu"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Kullanıcı '%(nick)s' silindi"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, 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:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 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:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Bağlantı kurulmaya çalışırken zaman aşımına uğradı"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -478,7 +478,7 @@ msgstr "ayarlanmadı"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -491,8 +491,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -529,7 +529,7 @@ msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -687,7 +687,7 @@ msgstr "%(file)s dosyası Google Drive'da bulunamadı"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bu e-posta adresi için bir hesap mevcut."
@@ -721,34 +721,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "Bekleniyor"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "Başarısız"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "Başladı"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "Bitti"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "Bilinmeyen Durum"
 
@@ -765,7 +769,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -831,7 +835,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Giriş"
 
@@ -847,7 +851,7 @@ msgstr "Token süresi doldu"
 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:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "eKitaplar"
 
@@ -872,7 +876,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr ""
 
@@ -881,7 +885,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Okunanlar"
 
@@ -890,7 +894,7 @@ msgid "Show read and unread"
 msgstr "Okunan ve okunmayanları göster"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Okunmamışlar"
 
@@ -908,7 +912,7 @@ msgid "Show Random Books"
 msgstr "Rastgele Kitap Göster"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -918,7 +922,7 @@ msgstr "Kategori seçimini göster"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Seriler"
 
@@ -936,7 +940,7 @@ msgid "Show author selection"
 msgstr "Yazar seçimini göster"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "Yayıncılar"
 
@@ -946,7 +950,7 @@ msgstr "Yayıncı seçimini göster"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Diller"
 
@@ -970,7 +974,7 @@ msgstr "Biçimler"
 msgid "Show file formats selection"
 msgstr "Dosya biçimi seçimini göster"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr ""
 
@@ -978,7 +982,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr ""
 
@@ -1006,9 +1010,8 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr "eKitap kitaplığa eklendi: %(sname)s"
 
 #: 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"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1031,58 +1034,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "eKitap kitaplıktan silindi: %(sname)s"
 
 #: cps/shelf.py:218
-#, 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"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Kitaplık oluştur"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Maalesef bu kitaplıktan eKitap silmenize izin verilmiyor: %(sname)s"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Kitaplığı düzenle"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s kitaplığı oluşturuldu."
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s kitaplığı değiştirildi"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Bir hata oluştu"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Kitaplık: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 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"
 
@@ -1115,177 +1121,177 @@ msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdak
 msgid "No release information available"
 msgstr "Sürüm bilgisi mevcut değil"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Keşfet (Rastgele)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Yazar: %(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Yayınevi: %(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Ara"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "Değerlendirme listesi"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "Biçim listesi"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "Görevler"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, 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:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 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/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 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:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
@@ -1298,31 +1304,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "eKitap-Dönüştürücü hatası: %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1356,212 +1362,212 @@ msgstr "Yönetim"
 msgid "Password"
 msgstr "Şifre"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Yükleme"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "İndirme"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr ""
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Düzenleme"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Sil"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr ""
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr ""
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "Şifreleme"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr ""
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Ayarlar"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "Log Seviyesi"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr ""
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Ters Proxy Header Adı"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Yönetim"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr ""
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "Güncelleme"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "Sürüm"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "Detaylar"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "Geçerli sürüm"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Güncelle"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1573,39 +1579,39 @@ msgstr "ile"
 msgid "In Library"
 msgstr "Kitaplıkta"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "azalt"
@@ -1735,9 +1741,9 @@ msgid "Fetch Metadata"
 msgstr ""
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
@@ -1760,7 +1766,7 @@ msgstr "Yükleniyor..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Kapak"
 
@@ -2240,49 +2246,49 @@ msgstr "İndirmeye İzin Ver"
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Yüklemeye izin ver"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Düzenlemeye İzin ver"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Şifre değiştirmeye izin ver"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Genel Kitaplıkları düzenlemeye izin ver"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Dilleri Hariç Tut"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 msgid "Default Visible Language of Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
@@ -2436,21 +2442,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3059,15 +3073,15 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 1e4731af8aaa839d8ee730f1c15b02d98111642a..15e812be21cbf44387e0065234e619427ec50254 100644
GIT binary patch
delta 3582
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

delta 3794
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
QxOMIxw;>cvf2bhxKO5uUT>t<8

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 131da18fe..40684c5c0 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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+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,17 +15,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "не встановлено"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -64,17 +64,17 @@ msgstr "Настройки сервера"
 msgid "UI Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
 msgstr "Керування сервером"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Показати всі"
@@ -91,7 +91,7 @@ msgstr "Показати всі"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -270,9 +270,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr "З'єднання з базою даних закрите"
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
@@ -310,164 +310,164 @@ msgstr "Будь-ласка, заповніть всі поля!"
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -479,7 +479,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -492,8 +492,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
@@ -530,7 +530,7 @@ msgstr ""
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -688,7 +688,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -721,34 +721,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr ""
 
@@ -765,7 +769,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -831,7 +835,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -847,7 +851,7 @@ msgstr "Час дії токено вичерпано"
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr ""
 
@@ -872,7 +876,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "Книги з найкращим рейтингом"
 
@@ -881,7 +885,7 @@ msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "Прочитані книги"
 
@@ -890,7 +894,7 @@ msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
@@ -908,7 +912,7 @@ msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "Категорії"
 
@@ -918,7 +922,7 @@ msgstr "Показувати вибір категорії"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "Серії"
 
@@ -936,7 +940,7 @@ msgid "Show author selection"
 msgstr "Показувати вибір автора"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr ""
 
@@ -946,7 +950,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "Мови"
 
@@ -970,7 +974,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr ""
 
@@ -978,7 +982,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr ""
 
@@ -1006,8 +1010,7 @@ 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"
+msgid "You are not allowed to add a book to the shelf"
 msgstr ""
 
 #: cps/shelf.py:144
@@ -1031,58 +1034,61 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Книга видалена з книжкової полиці: %(sname)s"
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "створити книжкову полицю"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "Змінити книжкову полицю"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Створена книжкова полиця %(title)s"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжкова полиця %(title)s змінена"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Сталась помилка"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Змінити розташування книжкової полиці '%(name)s'"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжкова полиця: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
@@ -1115,177 +1121,177 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "Пошук"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
@@ -1298,31 +1304,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1356,212 +1362,212 @@ msgstr "Адмін"
 msgid "Password"
 msgstr "Пароль"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Додати нову книгу"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Завантажити"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr ""
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "Редагувати"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "Видалити"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP-сервер"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP-порт"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP логін"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "Відправник"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "Налаштування сервера"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "Кількість книг на сторінці"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "Загрузка на сервер"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "Анонімний перегляд"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "Публічна реєстрація"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "Адміністрування"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "Повторне підключення до БД Calibre"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "Перевірка оновлень"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "Встановити оновлення"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
 
@@ -1573,39 +1579,39 @@ msgstr "через"
 msgid "In Library"
 msgstr "У бібліотеці"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr ""
@@ -1735,9 +1741,9 @@ msgid "Fetch Metadata"
 msgstr "Отримати метадані"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
@@ -1760,7 +1766,7 @@ msgstr "Завантаження..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Закрити"
 
@@ -2239,50 +2245,50 @@ msgstr "Дозволити завантажувати з сервера"
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "Дозволити завантаження на сервер"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "Дозволити редагування книг"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "Дозволити зміну пароля"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "Дозволити редагування публічних книжкових полиць"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "Виключити мови"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "Показувати книги на мовах"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "Можливості за замовчуванням для нових користувачів"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Показувати випадкові книги при перегляді деталей"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
@@ -2435,21 +2441,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3054,15 +3068,15 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Видалити цього користувача"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index b529a3588cb1595e29d364d348fac7c51f03b325..bdf51f02dd11171eff9799ba12c81b94facdd645 100644
GIT binary patch
delta 11757
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

delta 11921
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
P)89Q(K5O~miMjp<RMnR9

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index bf46df41e..f8643957a 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,17 +16,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "未安装"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "已安装"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "统计"
 
@@ -65,16 +65,16 @@ msgstr "基本配置"
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 msgid "Edit Users"
 msgstr "管理用户"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "找不到用户"
 
@@ -82,7 +82,7 @@ msgstr "找不到用户"
 msgid "{} users deleted successfully"
 msgstr "成功删除 {} 个用户"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "显示全部"
@@ -91,7 +91,7 @@ msgstr "显示全部"
 msgid "Malformed request"
 msgstr "格式错误的请求"
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr "访客名称无法更改"
 
@@ -99,7 +99,7 @@ msgstr "访客名称无法更改"
 msgid "Guest can't have this role"
 msgstr "游客无法拥有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
@@ -266,9 +266,9 @@ msgstr "LDAP成员用户过滤器中有不匹配的括号"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写入"
 
@@ -297,7 +297,7 @@ msgstr "邮件服务器设置已更新"
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
@@ -305,165 +305,165 @@ msgstr "请填写所有字段！"
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户“%(user)s”已创建"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此邮箱或用户名的账号已经存在。"
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户“%(nick)s”已删除"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr "无法删除游客用户"
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail账号校验成功"
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件无法保存在临时目录中"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一个LDAP用户"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能创建至少一个LDAP用户"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "错误：%(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "错误：在LDAP服务器的响应中没有返回用户"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "数据库中没有找到至少一个LDAP用户"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} 用户被成功导入"
 
@@ -475,7 +475,7 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
@@ -488,8 +488,8 @@ msgstr "书籍格式已成功删除"
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
@@ -526,7 +526,7 @@ msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
@@ -684,7 +684,7 @@ msgstr "Google Drive上找不到文件 %(file)s"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
@@ -717,34 +717,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件"
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "执行UnRar时出错"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "失败"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "已开始"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "未知状态"
 
@@ -761,7 +765,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -827,7 +831,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "登录"
 
@@ -843,7 +847,7 @@ msgstr "Token已过期"
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "书籍"
 
@@ -868,7 +872,7 @@ msgstr "下载历史"
 msgid "Show Downloaded Books"
 msgstr "显示下载过的书籍"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
@@ -877,7 +881,7 @@ msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "已读书籍"
 
@@ -886,7 +890,7 @@ msgid "Show read and unread"
 msgstr "显示阅读状态"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "未读书籍"
 
@@ -904,7 +908,7 @@ msgid "Show Random Books"
 msgstr "显示随机书籍"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "分类"
 
@@ -914,7 +918,7 @@ msgstr "显示分类选择"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "丛书"
 
@@ -932,7 +936,7 @@ msgid "Show author selection"
 msgstr "显示作者选择"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "出版社"
 
@@ -942,7 +946,7 @@ msgstr "显示出版社选择"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "语言"
 
@@ -966,7 +970,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "归档书籍"
 
@@ -974,7 +978,7 @@ msgstr "归档书籍"
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "书籍列表"
 
@@ -1001,9 +1005,8 @@ 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 的权限"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1026,57 +1029,60 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此书已从书架 %(sname)s 中删除"
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "对不起，您没有从书架 %(sname)s 中删除书籍的权限"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "创建书架"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "对不起，您没有编辑这个书架的权限"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已创建"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已修改"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架：%(name)s"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
@@ -1109,177 +1115,177 @@ msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "无可用发布信息"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下载过的书籍"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "高级搜索"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "搜索"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "下载次数"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1292,31 +1298,31 @@ msgstr "找不到包含 OAuth 信息的有效 gmail.json 文件"
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre 电子书转换器%(tool)s没有发现"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "硬盘上找不到 %(format)s 格式"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "发生未知错误，书籍转换失败"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 转换失败：%(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "电子书转换器失败： %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 运行失败，错误信息：%(error)s"
@@ -1350,211 +1356,211 @@ msgstr "管理权限"
 msgid "Password"
 msgstr "密码"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "上传书籍"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "下载书籍"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "查看书籍"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "编辑书籍"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "删除数据"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "公共书架"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "添加新用户"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "导入LDAP用户"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "SMTP邮件服务器设置"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP主机名"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP端口"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "加密"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP用户名"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "发件人邮箱"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr "电子邮件服务"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr "通过Oauth2的Gmail"
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "配置"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Calibre 数据库路径"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "日志级别"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "扩展端口"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "每页书籍数"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "上传"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "匿名浏览"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "开放注册"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "魔法链接远程登录"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "反向代理登录"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "反向代理头部名称"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 msgid "Edit Calibre Database Configuration"
 msgstr "编辑Calibre数据库配置"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "编辑基本配置"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "编辑界面配置"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "下载Debug包"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "查看日志文件"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "重新连接到Calibre数据库"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "重启"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "停止"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "更新"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "版本"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "详情"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "当前版本"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "确定"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "您确定要关闭吗？"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -1566,39 +1572,39 @@ msgstr "通过"
 msgid "In Library"
 msgstr "在书库"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "按图书日期排序，最新优先"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr "按图书日期排序，最旧优先"
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr "按标题按字母顺序排序"
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr "按标题逆字母顺序排序"
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新优先"
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "减少"
@@ -1728,9 +1734,9 @@ msgid "Fetch Metadata"
 msgstr "获取元数据"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "保存"
 
@@ -1753,7 +1759,7 @@ msgstr "加载中..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "关闭"
 
@@ -2233,50 +2239,50 @@ msgstr "允许下载书籍"
 msgid "Allow eBook Viewer"
 msgstr "允许在线阅读"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "允许上传书籍"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "允许编辑书籍"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "允许删除书籍"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "允许修改密码"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "允许编辑公共书架"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "排除语言"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "按语言显示书籍"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "新用户默认显示权限"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "在主页显示随机书籍"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "添加显示或隐藏书籍的标签值"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "添加显示或隐藏书籍的自定义栏目值"
 
@@ -2429,21 +2435,29 @@ msgstr "回到首页"
 msgid "Logout User"
 msgstr "登出账号"
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母顺序排序"
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母顺序排序"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "按丛书编号排序"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "按丛书编号逆排序"
 
@@ -3045,15 +3059,15 @@ msgstr "新建或查看"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "添加显示或隐藏书籍的自定义栏目值"
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "仅同步所选书架中的书籍到 Kobo"
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "删除此用户"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "生成Kobo Auth 地址"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index c3dea789fbd5233a95d206d957702bea67c6fd84..037dec2313027c16e82f0fc031cb4f246d1e1719 100644
GIT binary patch
delta 11774
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
DfaX;H

delta 11922
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
X={L5{`S*K^GH)F&n|<lf*ns~5qi~6}

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 85ba820d6..32d7baa25 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -16,17 +16,17 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr "未安裝"
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr "已安裝"
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr "統計"
 
@@ -65,16 +65,16 @@ msgstr "基本配置"
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 msgid "Edit Users"
 msgstr "管理用戶"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr "找不到用戶"
 
@@ -82,7 +82,7 @@ msgstr "找不到用戶"
 msgid "{} users deleted successfully"
 msgstr "成功刪除 {} 個用戶"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "顯示全部"
@@ -91,7 +91,7 @@ msgstr "顯示全部"
 msgid "Malformed request"
 msgstr "格式錯誤的請求"
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr "訪客名稱無法更改"
 
@@ -99,7 +99,7 @@ msgstr "訪客名稱無法更改"
 msgid "Guest can't have this role"
 msgstr "遊客無法擁有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr "管理員賬戶不存在，無法刪除管理員角色"
 
@@ -266,9 +266,9 @@ msgstr "LDAP成員用戶過濾器中有不匹配的括號"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr "設置數據庫不可寫入"
 
@@ -297,7 +297,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
@@ -305,165 +305,165 @@ msgstr "請填寫所有欄位！"
 msgid "E-mail is not from valid domain"
 msgstr "郵箱不在有效網域中"
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr "添加新用戶"
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用戶“%(user)s”已創建"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此郵箱或用戶名的賬號已經存在。"
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用戶“%(nick)s”已刪除"
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr "無法刪除訪客用戶"
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr "管理員賬戶不存在，無法刪除用戶"
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "編輯用戶 %(nick)s"
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用戶“%(nick)s”已更新"
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "編輯郵件服務器設置"
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail賬號驗證成功"
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "發送給%(email)s的測試郵件已進入隊列。請檢查任務結果"
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "發送測試郵件時出錯：%(res)s"
 
-#: cps/admin.py:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr "請先配置您的郵箱地址..."
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr "日誌文件查看器"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr "正在請求更新包"
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr "正在下載更新包"
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr "正在解壓更新包"
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr "正在替換文件"
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr "數據庫連接已關閉"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr "正在停止服務器"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，請點擊確定並刷新頁面"
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr "更新失敗："
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP錯誤"
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "連接錯誤"
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "建立連接超時"
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "一般錯誤"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件無法保存在臨時目錄中"
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr "更新時檔案無法替換變更"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一個LDAP用戶"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能創建至少一個LDAP用戶"
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "錯誤：%(ldaperror)s"
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr "錯誤：在LDAP服務器的響應中沒有返回用戶"
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "數據庫中沒有找到至少一個LDAP用戶"
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr "{} 用戶被成功導入"
 
@@ -475,7 +475,7 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
@@ -488,8 +488,8 @@ msgstr "書籍格式已成功刪除"
 msgid "Book Successfully Deleted"
 msgstr "書籍已成功刪除"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
@@ -526,7 +526,7 @@ msgstr "創建路徑 %(path)s 失敗(權限拒絕)。"
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失敗。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
@@ -684,7 +684,7 @@ msgstr "Google Drive上找不到文件 %(file)s"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此郵箱的賬號已經存在。"
 
@@ -717,34 +717,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp格式文件"
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "僅將jpg、jpeg文件作為封面文件"
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar執行文件"
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr "執行UnRar時出錯"
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr "已開始"
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr "未知狀態"
 
@@ -761,7 +765,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -827,7 +831,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr "登入"
 
@@ -843,7 +847,7 @@ msgstr "Token已過期"
 msgid "Success! Please return to your device"
 msgstr "成功！請返回您的設備"
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr "書籍"
 
@@ -868,7 +872,7 @@ msgstr "已下載書籍"
 msgid "Show Downloaded Books"
 msgstr "顯示下載過的書籍"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr "最高評分書籍"
 
@@ -877,7 +881,7 @@ msgid "Show Top Rated Books"
 msgstr "顯示最高評分書籍"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr "已讀書籍"
 
@@ -886,7 +890,7 @@ msgid "Show read and unread"
 msgstr "顯示閱讀狀態"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr "未讀書籍"
 
@@ -904,7 +908,7 @@ msgid "Show Random Books"
 msgstr "隨機顯示書籍"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr "分類"
 
@@ -914,7 +918,7 @@ msgstr "顯示分類選擇"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr "叢書"
 
@@ -932,7 +936,7 @@ msgid "Show author selection"
 msgstr "顯示作者選擇"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr "出版社"
 
@@ -942,7 +946,7 @@ msgstr "顯示出版社選擇"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr "語言"
 
@@ -966,7 +970,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "顯示文件格式選擇"
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr "歸檔書籍"
 
@@ -974,7 +978,7 @@ msgstr "歸檔書籍"
 msgid "Show archived books"
 msgstr "顯示歸檔書籍"
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr "書籍列表"
 
@@ -1001,9 +1005,8 @@ 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 的權限"
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
 
 #: cps/shelf.py:144
 #, python-format
@@ -1026,57 +1029,60 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此書已從書架 %(sname)s 中刪除"
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "對不起，您沒有從書架 %(sname)s 中刪除書籍的權限"
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "創建書架"
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "對不起，您沒有編輯這個書架的權限"
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr "編輯書架"
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "書架 %(title)s 已創建"
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "書架 %(title)s 已修改"
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "發生錯誤"
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共書架：%(title)s已經存在已經存在。"
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有書架：%(title)s已經存在。"
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改書架 %(name)s 順序"
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "書架：%(name)s"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打開書架出錯。書架不存在或不可訪問"
 
@@ -1109,177 +1115,177 @@ msgstr "有新的更新。單擊下面的按鈕以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "無可用發佈信息"
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr "發現(隨機書籍)"
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr "熱門書籍（最多下載）"
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下載過的書籍"
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "叢書：%(serie)s"
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "評分：%(rating)s 星"
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分類：%(name)s"
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr "語言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr "搜尋"
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr "下載次數"
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr "評分列表"
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr "任務列表"
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr "出版時間晚於 "
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr "出版時間早於 "
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評分 <= %(rating)s"
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評分 >= %(rating)s"
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "閱讀狀態 = %(status)s"
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”登入"
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr "資料已更新"
 
@@ -1292,31 +1298,31 @@ msgstr "找不到包含 OAuth 信息的有效 gmail.json 文件"
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "沒有發現Calibre 電子書轉換器%(tool)s"
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "硬碟上找不到 %(format)s 格式"
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr "發生未知錯誤，書籍轉換失敗"
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 轉換失敗：%(error)s"
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到轉換後的文件或文件夾%(folder)s中有多個文件"
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "電子書轉換器失敗： %(error)s"
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 運行失敗，錯誤信息：%(error)s"
@@ -1350,211 +1356,211 @@ msgstr "管理權限"
 msgid "Password"
 msgstr "密碼"
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "上傳書籍"
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "下載書籍"
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr "查看書籍"
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr "編輯書籍"
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr "刪除數據"
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr "公共書架"
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr "添加新用戶"
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr "導入LDAP用戶"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr "SMTP郵件服務器設置"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP主機名"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP端口"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "加密"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP用戶名"
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "發信人郵箱"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr "電子郵件服務"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr "通過Oauth2的Gmail"
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr "配置"
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr "Calibre 數據庫路徑"
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "日誌級別"
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr "擴展端口"
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "每頁書籍數"
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr "上傳"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr "匿名瀏覽"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr "開放註冊"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr "魔法連接遠程登錄"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr "反向代理登入"
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "反向代理標頭名稱"
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 msgid "Edit Calibre Database Configuration"
 msgstr "編輯Calibre數據庫配置"
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr "編輯基本配置"
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr "編輯界面配置"
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr "下載除錯包"
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr "查看日誌文件"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr "重新連接到Calibre數據庫"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr "重啟"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr "停止"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr "更新"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr "版本"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr "詳情"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr "當前版本"
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr "檢查更新"
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr "執行更新"
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr "您確定要重啟嗎？"
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr "確定"
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr "您確定要關閉嗎？"
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，請不要刷新頁面"
 
@@ -1566,39 +1572,39 @@ msgstr "通過"
 msgid "In Library"
 msgstr "在書庫"
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr "按圖書日期排序，最新優先"
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr "按圖書日期排序，最舊優先"
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr "按標題按字母順序排序"
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr "按標題逆字母順序排序"
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新優先"
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr "減少"
@@ -1728,9 +1734,9 @@ msgid "Fetch Metadata"
 msgstr "獲取元數據"
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "儲存"
 
@@ -1753,7 +1759,7 @@ msgstr "加載中..."
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "關閉"
 
@@ -2233,50 +2239,50 @@ msgstr "允許下載書籍"
 msgid "Allow eBook Viewer"
 msgstr "允許在線閱讀"
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr "允許上傳書籍"
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr "允許編輯書籍"
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr "允許刪除書籍"
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr "允許修改密碼"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr "允許編輯公共書架"
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 #, fuzzy
 msgid "Default Language"
 msgstr "預設語言"
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 #, fuzzy
 msgid "Default Visible Language of Books"
 msgstr "按預設語言顯示書籍"
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr "新用戶默認顯示權限"
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "在主頁顯示隨機書籍"
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr "添加顯示或隱藏書籍的標籤值"
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr "添加顯示或隱藏書籍的自定義欄位值"
 
@@ -2429,21 +2435,29 @@ msgstr "回到首頁"
 msgid "Logout User"
 msgstr "登出賬號"
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母順序排序"
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母順序排序"
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr "按叢書編號排序"
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr "按叢書編號逆排序"
 
@@ -3045,15 +3059,15 @@ msgstr "新建或查看"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "添加顯示或隱藏書籍的自定義欄位值"
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "僅同步所選書架中的書籍到 Kobo"
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "刪除此用戶"
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr "生成Kobo Auth 地址"
 
diff --git a/messages.pot b/messages.pot
index b180986a2..ad2d6482b 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,24 +8,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-20 11:24+0100\n"
+"POT-Creation-Date: 2021-11-21 09:26+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.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:34 cps/about.py:48 cps/about.py:64 cps/converter.py:31
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
 msgstr ""
 
-#: cps/about.py:46 cps/about.py:62
+#: cps/about.py:47 cps/about.py:63
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:117
+#: cps/about.py:138
 msgid "Statistics"
 msgstr ""
 
@@ -64,16 +64,16 @@ msgstr ""
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:277 cps/templates/admin.html:46
+#: cps/admin.py:277 cps/templates/admin.html:50
 msgid "Edit Users"
 msgstr ""
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:14 cps/templates/list.html:14
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1572
+#: cps/admin.py:343 cps/admin.py:1576
 msgid "User not found"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:129
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
@@ -90,7 +90,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1452
+#: cps/admin.py:418 cps/admin.py:1454
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1410
+#: cps/admin.py:442 cps/admin.py:1412
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -265,9 +265,9 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1373 cps/admin.py:1479
-#: cps/admin.py:1547 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:270 cps/shelf.py:331 cps/shelf.py:366 cps/shelf.py:441
+#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
+#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -295,7 +295,7 @@ msgstr ""
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1340 cps/web.py:1471
+#: cps/admin.py:1340 cps/web.py:1497
 msgid "Please fill out all fields!"
 msgstr ""
 
@@ -303,164 +303,164 @@ msgstr ""
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1352 cps/admin.py:1500
+#: cps/admin.py:1354 cps/admin.py:1504
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:1363
+#: cps/admin.py:1365
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:1369
+#: cps/admin.py:1371
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1389
+#: cps/admin.py:1391
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:1391 cps/admin.py:1392
+#: cps/admin.py:1393 cps/admin.py:1394
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1395
+#: cps/admin.py:1397
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1467 cps/admin.py:1590
+#: cps/admin.py:1470 cps/admin.py:1595
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:1471
+#: cps/admin.py:1474
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1475 cps/admin.py:1605 cps/web.py:1496 cps/web.py:1559
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1509 cps/templates/admin.html:94
+#: cps/admin.py:1513 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1528
+#: cps/admin.py:1532
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1554
+#: cps/admin.py:1558
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1557
+#: cps/admin.py:1561
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1559
+#: cps/admin.py:1563
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1565
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1602
+#: cps/admin.py:1607
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1608 cps/web.py:1436
+#: cps/admin.py:1613 cps/web.py:1462
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1619
+#: cps/admin.py:1624
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1690
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1686
+#: cps/admin.py:1691
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1687
+#: cps/admin.py:1692
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1688
+#: cps/admin.py:1693
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1689
+#: cps/admin.py:1694
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1690
+#: cps/admin.py:1695
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1691
+#: cps/admin.py:1696
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1692 cps/admin.py:1693 cps/admin.py:1694 cps/admin.py:1695
-#: cps/admin.py:1696 cps/admin.py:1697
+#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
+#: cps/admin.py:1701 cps/admin.py:1702
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1692 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1693 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1694 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1695 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1696
+#: cps/admin.py:1701
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1697
+#: cps/admin.py:1702
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1771
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1779
+#: cps/admin.py:1784
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1783
+#: cps/admin.py:1788
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1816
+#: cps/admin.py:1821
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1818
+#: cps/admin.py:1823
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:649 cps/web.py:1148
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -485,8 +485,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:511 cps/web.py:1698
-#: cps/web.py:1739 cps/web.py:1806
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
+#: cps/web.py:1765 cps/web.py:1832
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -523,7 +523,7 @@ msgstr ""
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1659
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -681,7 +681,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1654
+#: cps/helper.py:507 cps/web.py:1680
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -714,34 +714,38 @@ msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
 #: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:703
+#: cps/helper.py:707
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:714
+#: cps/helper.py:718
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:762
+#: cps/helper.py:766
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:764
+#: cps/helper.py:768
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:770
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:768
+#: cps/helper.py:772
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:774
 msgid "Unknown Status"
 msgstr ""
 
@@ -758,7 +762,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1530
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -824,7 +828,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1579
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
 msgid "Login"
 msgstr ""
 
@@ -840,7 +844,7 @@ msgstr ""
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/render_template.py:39 cps/web.py:413
+#: cps/render_template.py:39 cps/web.py:421
 msgid "Books"
 msgstr ""
 
@@ -865,7 +869,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:427
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
 msgid "Top Rated Books"
 msgstr ""
 
@@ -874,7 +878,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:658
+#: cps/templates/index.xml:58 cps/web.py:681
 msgid "Read Books"
 msgstr ""
 
@@ -883,7 +887,7 @@ msgid "Show read and unread"
 msgstr ""
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:661
+#: cps/templates/index.xml:65 cps/web.py:684
 msgid "Unread Books"
 msgstr ""
 
@@ -901,7 +905,7 @@ msgid "Show Random Books"
 msgstr ""
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1035
+#: cps/templates/index.xml:83 cps/web.py:1060
 msgid "Categories"
 msgstr ""
 
@@ -911,7 +915,7 @@ msgstr ""
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:930 cps/web.py:940
+#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
 msgid "Series"
 msgstr ""
 
@@ -929,7 +933,7 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:907
+#: cps/templates/index.xml:76 cps/web.py:931
 msgid "Publishers"
 msgstr ""
 
@@ -939,7 +943,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1012
+#: cps/web.py:1037
 msgid "Languages"
 msgstr ""
 
@@ -963,7 +967,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:685
+#: cps/render_template.py:93 cps/web.py:708
 msgid "Archived Books"
 msgstr ""
 
@@ -971,7 +975,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:761
+#: cps/render_template.py:97 cps/web.py:785
 msgid "Books List"
 msgstr ""
 
@@ -998,8 +1002,7 @@ msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
 #: cps/shelf.py:126
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgid "You are not allowed to add a book to the shelf"
 msgstr ""
 
 #: cps/shelf.py:144
@@ -1023,57 +1026,60 @@ msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
 #: cps/shelf.py:218
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:232 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr ""
 
-#: cps/shelf.py:236
+#: cps/shelf.py:241
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr ""
 
-#: cps/shelf.py:238
+#: cps/shelf.py:243
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/shelf.py:257
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/shelf.py:260
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/shelf.py:274
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:296
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:307
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:376
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:446
+#: cps/shelf.py:451
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:450
+#: cps/shelf.py:455
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
@@ -1106,177 +1112,177 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:437
+#: cps/templates/index.html:5 cps/web.py:445
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:463
+#: cps/web.py:476
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:496
+#: cps/web.py:512
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:527
+#: cps/web.py:544
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:542
+#: cps/web.py:559
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:555
+#: cps/web.py:574
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:568
+#: cps/web.py:587
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:581
+#: cps/web.py:602
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:620
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:613
+#: cps/web.py:636
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:719 cps/web.py:1364
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
 msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:732 cps/web.py:1070
+#: cps/web.py:755 cps/web.py:1095
 msgid "Search"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:885
+#: cps/templates/admin.html:16 cps/web.py:909
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:961
+#: cps/web.py:986
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:982
+#: cps/web.py:1007
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1049
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1208
+#: cps/web.py:1233
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1215
+#: cps/web.py:1240
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1237
+#: cps/web.py:1262
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1239
+#: cps/web.py:1264
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1241
+#: cps/web.py:1266
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1346
+#: cps/web.py:1371
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1441
+#: cps/web.py:1467
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1445
+#: cps/web.py:1471
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1447
+#: cps/web.py:1473
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1464
+#: cps/web.py:1490
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1465
-#: cps/web.py:1472 cps/web.py:1478 cps/web.py:1497 cps/web.py:1501
-#: cps/web.py:1507
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
+#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
+#: cps/web.py:1533
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1499
+#: cps/web.py:1525
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1502
+#: cps/web.py:1528
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1519
+#: cps/web.py:1545
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1538
+#: cps/web.py:1564
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1544
+#: cps/web.py:1570
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1548 cps/web.py:1573
+#: cps/web.py:1574 cps/web.py:1599
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1555
+#: cps/web.py:1581
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1561
+#: cps/web.py:1587
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1568
+#: cps/web.py:1594
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1634 cps/web.py:1683
+#: cps/web.py:1660 cps/web.py:1709
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1650
+#: cps/web.py:1676
 msgid "Profile updated"
 msgstr ""
 
@@ -1289,31 +1295,31 @@ msgstr ""
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:162
+#: cps/tasks/convert.py:163
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:166
+#: cps/tasks/convert.py:167
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:176
+#: cps/tasks/convert.py:177
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:198
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:221
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:240
+#: cps/tasks/convert.py:241
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1347,211 +1353,211 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: cps/templates/admin.html:19 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:67
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr ""
 
-#: cps/templates/admin.html:20 cps/templates/detail.html:18
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr ""
 
-#: cps/templates/admin.html:21
+#: cps/templates/admin.html:23
 msgid "View Books"
 msgstr ""
 
-#: cps/templates/admin.html:22 cps/templates/user_table.html:131
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
 msgid "Edit"
 msgstr ""
 
-#: cps/templates/admin.html:23 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
 #: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
 msgstr ""
 
-#: cps/templates/admin.html:24
+#: cps/templates/admin.html:26
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:47
+#: cps/templates/admin.html:51
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:49
+#: cps/templates/admin.html:53
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:60
 msgid "E-mail Server Settings"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr ""
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr ""
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr ""
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr ""
 
-#: cps/templates/admin.html:77 cps/templates/admin.html:88
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:88
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:89
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:100
+#: cps/templates/admin.html:104
 msgid "Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:103
+#: cps/templates/admin.html:107
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:107 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:111
+#: cps/templates/admin.html:115
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:120
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:123 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr ""
 
-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:131
 msgid "Uploads"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:135
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:139
 msgid "Public Registration"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:143
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:147
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:148 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/admin.html:153
+#: cps/templates/admin.html:157
 msgid "Edit Calibre Database Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:154
+#: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:155
+#: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:160
+#: cps/templates/admin.html:164
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:161
+#: cps/templates/admin.html:165
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:162
+#: cps/templates/admin.html:166
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:169
 msgid "Reconnect Calibre Database"
 msgstr ""
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:170
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:171
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:176
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:180
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:181
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:187
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:191
+#: cps/templates/admin.html:195
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:192
+#: cps/templates/admin.html:196
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:205
+#: cps/templates/admin.html:209
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:210 cps/templates/admin.html:224
-#: cps/templates/admin.html:244 cps/templates/config_db.html:70
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
 #: cps/templates/shelf.html:96
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:211 cps/templates/admin.html:225
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
 #: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:169 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:137
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:223
+#: cps/templates/admin.html:227
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:235
+#: cps/templates/admin.html:239
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1563,39 +1569,39 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/author.html:26 cps/templates/index.html:72
 #: cps/templates/search.html:29 cps/templates/shelf.html:17
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/author.html:27 cps/templates/index.html:73
 #: cps/templates/search.html:30 cps/templates/shelf.html:18
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/author.html:28 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:19
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/author.html:29 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:20
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/author.html:30 cps/templates/index.html:78
 #: cps/templates/search.html:35 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/author.html:31 cps/templates/index.html:79
 #: cps/templates/search.html:36 cps/templates/shelf.html:24
 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/index.html:111 cps/templates/search.html:65
 #: cps/templates/shelf.html:52
 msgid "reduce"
 msgstr ""
@@ -1725,9 +1731,9 @@ msgid "Fetch Metadata"
 msgstr ""
 
 #: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:168
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:135
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
@@ -1749,7 +1755,7 @@ msgstr ""
 
 #: cps/templates/book_edit.html:254 cps/templates/layout.html:64
 #: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr ""
 
@@ -2227,48 +2233,48 @@ msgstr ""
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:106
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
 msgid "Allow Uploads"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:110
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
 msgid "Allow Edit"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:114
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
 msgid "Allow Changing Password"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
 msgid "Allow Editing Public Shelves"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:119
+#: cps/templates/config_view_edit.html:123
 msgid "Default Language"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:127
+#: cps/templates/config_view_edit.html:131
 msgid "Default Visible Language of Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:143
+#: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:161 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:162
+#: cps/templates/config_view_edit.html:166
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
@@ -2421,21 +2427,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:22
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77
+#: cps/templates/index.html:81
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:78
+#: cps/templates/index.html:82
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -3037,15 +3051,15 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:130
+#: cps/templates/user_edit.html:134
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:140 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:152
+#: cps/templates/user_edit.html:156
 msgid "Generate Kobo Auth URL"
 msgstr ""
 

From 6cb713d62c2662b51765a6b52b98e7b193e02d92 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 21 Nov 2021 10:21:45 +0100
Subject: [PATCH 032/412] Added filtering of languages Bugfix show all allowed
 languages in user settings in case restrictions currently apply

---
 cps/admin.py                 |  2 +-
 cps/db.py                    | 15 ++++++++-------
 cps/templates/languages.html | 26 +++++++++++++++++++++-----
 cps/web.py                   | 31 +++++++++++++------------------
 4 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 068ac3560..f104aa29b 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1575,7 +1575,7 @@ def edit_user(user_id):
     if not content or (not config.config_anonbrowse and content.name == "Guest"):
         flash(_(u"User not found"), category="error")
         return redirect(url_for('admin.admin'))
-    languages = calibre_db.speaking_language()
+    languages = calibre_db.speaking_language(return_all_languages=True)
     translations = babel.list_translations() + [LC('en')]
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     if request.method == "POST":
diff --git a/cps/db.py b/cps/db.py
index 800fb3dd1..4e76072d6 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -612,7 +612,7 @@ class CalibreDB():
         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):
+    def common_filters(self, allow_show_archived=False, return_all_languages=False):
         if not allow_show_archived:
             archived_books = (
                 ub.session.query(ub.ArchivedBook)
@@ -625,10 +625,10 @@ class CalibreDB():
         else:
             archived_filter = true()
 
-        if current_user.filter_language() != "all":
-            lang_filter = Books.languages.any(Languages.lang_code == current_user.filter_language())
-        else:
+        if current_user.filter_language() == "all" or return_all_languages:
             lang_filter = true()
+        else:
+            lang_filter = Books.languages.any(Languages.lang_code == current_user.filter_language())
         negtags_list = current_user.list_denied_tags()
         postags_list = current_user.list_allowed_tags()
         neg_content_tags_filter = false() if negtags_list == [''] else Books.tags.any(Tags.name.in_(negtags_list))
@@ -796,18 +796,19 @@ class CalibreDB():
         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):
+    def speaking_language(self, languages=None, return_all_languages=False, reverse_order=False):
         from . import get_locale
 
         if not languages:
             languages = self.session.query(Languages) \
                 .join(books_languages_link) \
                 .join(Books) \
-                .filter(self.common_filters()) \
+                .filter(self.common_filters(return_all_languages=return_all_languages)) \
                 .group_by(text('books_languages_link.lang_code')).all()
         for lang in languages:
             lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
-        return languages
+        return sorted(languages, key=lambda x: x.name, reverse=reverse_order)
+
 
     def update_title_sort(self, config, conn=None):
         # user defined sort function for calibre databases (Series, etc.)
diff --git a/cps/templates/languages.html b/cps/templates/languages.html
index 2b482e197..771d77cf2 100644
--- a/cps/templates/languages.html
+++ b/cps/templates/languages.html
@@ -1,19 +1,35 @@
 {% extends "layout.html" %}
 {% block body %}
   <h1>{{title}}</h1>
+  <div class="filterheader hidden-xs">
+    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+    <div id="asc" data-order="{{ order }}" data-id="{{ data }}" class="btn btn-primary {% if order == 1 %} active{% endif%}"><span class="glyphicon glyphicon-sort-by-alphabet"></span></div>
+    <div id="desc" data-id="{{ data }}" class="btn btn-primary{% if order == 0 %} active{% endif%}"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></div>
+    {% if charlist|length %}
+    <div id="all" class="active btn btn-primary {% if charlist|length > 9 %}hidden-sm{% endif %}">{{_('All')}}</div>
+    {% endif %}
+    <div class="btn-group character {% if charlist|length > 9 %}hidden-sm{% endif %}" role="group">
+      {% for char in charlist%}
+      <div class="btn btn-primary char">{{char}}</div>
+      {% endfor %}
+    </div>
+  </div>
   <div class="container">
-       <div class="col-xs-12 col-sm-6">
+      <div div id="list" class="col-xs-12 col-sm-6">
   {% for lang in languages %}
       {% if loop.index0 == (loop.length/2)|int and loop.length > 20 %}
-       </div>
-       <div class="col-xs-12 col-sm-6">
+      </div>
+      <div id="second" class="col-xs-12 col-sm-6">
     {% endif %}
-    <div class="row">
+    <div class="row" data-id="{% if lang.name %}{{lang.name}}{% else %}{{lang[0].name}}{% endif %}">
         <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_param='new')}}">{{lang.name}}</a></div>
     </div>
   {% endfor %}
-  </div>
+      </div>
   </div>
 {% endblock %}
+{% block js %}
+<script src="{{ url_for('static', filename='js/filter_list.js') }}"></script>
+{% endblock %}
 
diff --git a/cps/web.py b/cps/web.py
index ea6faf197..cff0036ea 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1012,30 +1012,25 @@ def formats_list():
 @web.route("/language")
 @login_required_if_no_ano
 def language_overview():
-    if current_user.check_visibility(constants.SIDEBAR_LANGUAGE):
-        charlist = list()
-        if current_user.filter_language() == u"all":
-            languages = calibre_db.speaking_language()
-            # ToDo: generate first character list for languages
+    if current_user.check_visibility(constants.SIDEBAR_LANGUAGE) and current_user.filter_language() == u"all":
+        if current_user.get_view_property('language', 'dir') == 'desc':
+            order = db.Languages.lang_code.desc()
+            order_no = 0
         else:
-            #try:
-            #    cur_l = LC.parse(current_user.filter_language())
-            #except UnknownLocaleError:
-            #    cur_l = None
-
-            languages = calibre_db.session.query(db.Languages).filter(
-                db.Languages.lang_code == current_user.filter_language()).all()
-            languages[0].name = isoLanguages.get_language_name(get_locale(), languages[0].name.lang_code)
-            #if cur_l:
-            #    languages[0].name = cur_l.get_language_name(get_locale())
-            #else:
-            #    languages[0].name = _(isoLanguages.get(part3=languages[0].lang_code).name)
+            order = db.Languages.lang_code.asc()
+            order_no = 1
+        charlist = list()
+        languages = calibre_db.speaking_language(reverse_order=not order_no)
+        for lang in languages:
+            upper_lang = lang.name[0].upper()
+            if upper_lang not in charlist:
+                charlist.append(upper_lang)
         lang_counter = calibre_db.session.query(db.books_languages_link,
                                         func.count('books_languages_link.book').label('bookcount')).group_by(
             text('books_languages_link.lang_code')).all()
         return render_title_template('languages.html', languages=languages, lang_counter=lang_counter,
                                      charlist=charlist, title=_(u"Languages"), page="langlist",
-                                     data="language")
+                                     data="language", order=order_no)
     else:
         abort(404)
 

From 1b8bd27b3cd57ef0d1b4207169b4744b0570dfe0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 20 Nov 2021 13:53:49 +0100
Subject: [PATCH 033/412] Added cve number for csrf bug

---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index afaf9b0b2..a71137858 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -23,7 +23,7 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.13|JavaScript could get executed in the description series, categories or publishers title||
 | V 0.6.13|JavaScript could get executed  in the shelf title||
 | V 0.6.13|Login with the old session cookie after logout. Thanks to @ibarrionuevo||
-| V 0.6.14|CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)  ||
+| V 0.6.14|CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)  |CVE-2021-25965|
 | V 0.6.14|Cross-Site Scripting vulnerability on typeahead inputs. Thanks to @notdodo||
 
 

From cbb9edac1950e5d4c50c9b719a74a2914f440f80 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 21 Nov 2021 13:23:27 +0100
Subject: [PATCH 034/412] Bugfix search in books list Fix renaming upper to
 lowercase letters Update test results

---
 cps/editbooks.py                        |    2 +-
 cps/web.py                              |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 2721 ++++++++++++++++++++---
 3 files changed, 2425 insertions(+), 300 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 3403f46f7..929aa1a76 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -114,7 +114,7 @@ def search_objects_add(db_book_object, db_type, input_elements):
                 type_elements = c_elements.value
             else:
                 type_elements = c_elements.name
-            if inp_element.lower() == type_elements.lower():    # Lowercase check
+            if inp_element == type_elements:
                 found = True
                 break
         if not found:
diff --git a/cps/web.py b/cps/web.py
index cff0036ea..c061af30c 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -831,7 +831,7 @@ def list_books():
             books = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).all()
         entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order)
     elif search:
-        entries, filtered_count, __ = calibre_db.get_search_results(search, off, order, limit, *join)
+        entries, filtered_count, __ = calibre_db.get_search_results(search, off, [order,''], limit, *join)
     else:
         entries, __, __ = calibre_db.fill_indexpage((int(off) / (int(limit)) + 1), limit, db.Books, True, order, *join)
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 1733a51a3..95505cc4d 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2021-10-30 19:49:15</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-11-21 07:25:47</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-10-30 23:31:02</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-11-21 10:30:41</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>3h 2 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>2h 25 min</p>
         </div>
       </div>
       </div>
@@ -102,12 +102,12 @@
     </tr>
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">12</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('c1', 13)">Detail</a>
@@ -215,11 +215,33 @@
     
     
     
-        <tr id='pt1.12' class='hiddenRow bg-success'>
+        <tr id="et1.12" class="none bg-info">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.12')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 315, in test_guest_restricted_settings_visibility
+    rights = self.get_user_settings(&#39;Guest&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 800, in get_user_settings
+    user_settings[&#39;upload_role&#39;] = int(self.check_element_on_page((By.ID, &#34;upload_role&#34;)).is_selected())
+AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -872,11 +894,11 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
-        <td class="text-center">34</td>
-        <td class="text-center">0</td>
+        <td class="text-center">30</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -904,11 +926,35 @@
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id="ft11.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 338, in test_edit_category
+    self.assertEqual(u&#39;gênot&#39;, values[&#39;tag&#39;][0])
+AssertionError: &#39;gênot&#39; != &#39;Gênot&#39;
+- gênot
+? ^
++ Gênot
+? ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1012,11 +1058,35 @@
     
     
     
-        <tr id='pt11.15' class='hiddenRow bg-success'>
+        <tr id="ft11.15" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.15')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 380, in test_edit_publisher
+    self.assertEqual(u&#39;Gênot&#39;, values[&#39;publisher&#39;][0])
+AssertionError: &#39;Gênot&#39; != &#39;gênot&#39;
+- Gênot
+? ^
++ gênot
+? ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1039,11 +1109,35 @@
     
     
     
-        <tr id='pt11.18' class='hiddenRow bg-success'>
+        <tr id="ft11.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 274, in test_edit_series
+    self.assertEqual(u&#39;Loko&#39;, values[&#39;series&#39;])
+AssertionError: &#39;Loko&#39; != &#39;loko&#39;
+- Loko
+? ^
++ loko
+? ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1209,25 +1303,45 @@
     
     
     
-        <tr id='pt11.35' class='hiddenRow bg-success'>
+        <tr id="ft11.35" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.35')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.35" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.35').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 781, in test_upload_cover_hdd
+    self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
+AssertionError: 0.0 not greater than 0.02</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksList</td>
-        <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">10</td>
+        <td class="text-center">8</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 18)">Detail</a>
+            <a onclick="showClassDetail('c12', 10)">Detail</a>
         </td>
     </tr>
 
@@ -1253,7 +1367,7 @@
     
         <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1262,7 +1376,7 @@
     
         <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1271,7 +1385,7 @@
     
         <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1280,7 +1394,7 @@
     
         <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1289,7 +1403,7 @@
     
         <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1297,78 +1411,6 @@
     
     
         <tr id='pt12.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1377,30 +1419,84 @@
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id="et12.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 333, in test_restricted_rights
+    self.edit_user(&#39;admin&#39;, {&#39;delete_role&#39;: 1, &#39;edit_role&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 701, in edit_user
+    return cls.change_user(element, abort)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1008, in change_user
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;delete_role&#34; name=&#34;delete_role&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id="ft12.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft12.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft12.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 51, in test_search_books_list
+    bl = self.check_search(bl, &#34;genot&#34;, 4, &#34;Categories&#34;, &#34;Gênot&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 43, in check_search
+    self.assertEqual(count, len(bl[&#39;table&#39;]))
+AssertionError: 4 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">15</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1428,11 +1524,35 @@
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id="ft13.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 508, in test_edit_category
+    self.assertEqual(u&#39;gênot&#39;, values[&#39;tag&#39;][0])
+AssertionError: &#39;gênot&#39; != &#39;Gênot&#39;
+- gênot
+? ^
++ Gênot
+? ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1518,11 +1638,35 @@
     
     
     
-        <tr id='pt13.13' class='hiddenRow bg-success'>
+        <tr id="ft13.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 567, in test_edit_publisher
+    self.assertEqual(u&#39;Gênot&#39;, values[&#39;publisher&#39;][0])
+AssertionError: &#39;Gênot&#39; != &#39;gênot&#39;
+- Gênot
+? ^
++ gênot
+? ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1536,11 +1680,35 @@
     
     
     
-        <tr id='pt13.15' class='hiddenRow bg-success'>
+        <tr id="ft13.15" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.15')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 448, in test_edit_series
+    self.assertEqual(u&#39;Loko&#39;, values[&#39;series&#39;])
+AssertionError: &#39;Loko&#39; != &#39;loko&#39;
+- Loko
+? ^
++ loko
+? ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1572,20 +1740,60 @@
     
     
     
-        <tr id='pt13.19' class='hiddenRow bg-success'>
+        <tr id="ft13.19" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.19')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.19" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 774, in test_upload_cover_hdd
+    self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
+AssertionError: 0.0 not greater than 0.02</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.20' class='hiddenRow bg-success'>
+        <tr id="ft13.20" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.20')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.20').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 928, in test_watch_metadata
+    self.assertNotIn(&#39;series&#39;, book)
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=fe811995-f72a-4fbc-b4f7-f4b9d32fb6c8&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1759,15 +1967,15 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="skipClass">
         <td>TestFilePicker</td>
+        <td class="text-center">3</td>
+        <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 3)">Detail</a>
         </td>
     </tr>
 
@@ -1781,6 +1989,41 @@
         </tr>
     
     
+    
+        <tr id="st18.2" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st18.2')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st18.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_st18.2').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.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_two_filepickers</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="passClass">
@@ -1849,12 +2092,12 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestKoboSync</td>
         <td class="text-center">10</td>
-        <td class="text-center">10</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c21', 10)">Detail</a>
@@ -1881,29 +2124,91 @@
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id="et21.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et21.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et21.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 621, in test_kobo_sync_selected_shelfs
+    user_settings = self.get_user_settings(&#39;kobosync&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 800, in get_user_settings
+    user_settings[&#39;upload_role&#39;] = int(self.check_element_on_page((By.ID, &#34;upload_role&#34;)).is_selected())
+AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt21.4' class='hiddenRow bg-success'>
+        <tr id="ft21.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 480, in test_shelves_add_remove_books
+    self.assertEqual(1, len(books))
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt21.5' class='hiddenRow bg-success'>
+        <tr id="ft21.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.5').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 285, in test_sync_changed_book
+    self.assertEqual(1, len(data))
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1926,11 +2231,31 @@
     
     
     
-        <tr id='pt21.8' class='hiddenRow bg-success'>
+        <tr id="ft21.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 303, in test_sync_shelf
+    self.assertEqual(1, len(data))
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1944,22 +2269,42 @@
     
     
     
-        <tr id='pt21.10' class='hiddenRow bg-success'>
+        <tr id="ft21.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 269, in test_sync_upload
+    self.assertEqual(1, len(data))
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">4</td>
-        <td class="text-center">4</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c22', 4)">Detail</a>
@@ -1968,20 +2313,62 @@
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id="et22.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et22.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et22.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 281, in test_kobo_sync_selected_shelfs
+    user_settings = self.get_user_settings(&#39;kobosync&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 800, in get_user_settings
+    user_settings[&#39;upload_role&#39;] = int(self.check_element_on_page((By.ID, &#34;upload_role&#34;)).is_selected())
+AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id="et22.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et22.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et22.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 185, in test_sync_changed_book
+    self.assertTrue(&#39;ChangedEntitlement&#39; in data[0][0])
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1995,22 +2382,42 @@
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id="ft22.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 200, in test_sync_shelf
+    self.assertEqual(1, len(data[0]))
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">11</td>
         <td class="text-center">0</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c23', 13)">Detail</a>
@@ -2055,20 +2462,72 @@
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id="et23.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et23.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et23.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 341, in test_LDAP_import
+    self.fill_view_config({&#39;show_16384&#39;: 0,&#39;show_2&#39;: 0,&#39;show_16&#39;: 0, &#39;show_8192&#39;: 0, &#39;show_256&#39;: 0,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 393, in fill_view_config
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;delete_role&#34; name=&#34;delete_role&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt23.6' class='hiddenRow bg-success'>
+        <tr id="et23.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et23.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et23.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 316, in test_LDAP_import_memberfield
+    User1rights = self.get_user_settings(&#39;user12&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 800, in get_user_settings
+    user_settings[&#39;upload_role&#39;] = int(self.check_element_on_page((By.ID, &#34;upload_role&#34;)).is_selected())
+AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2400,12 +2859,12 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestMergeBooksList</td>
         <td class="text-center">2</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c26', 2)">Detail</a>
@@ -2414,11 +2873,31 @@
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id="et26.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 54, in test_delete_book
+    bl[&#39;table&#39;][0][&#39;Delete&#39;][&#39;element&#39;].click()
+KeyError: &#39;Delete&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3196,13 +3675,13 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">18</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('c36', 18)">Detail</a>
         </td>
@@ -3210,164 +3689,1810 @@
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id="et36.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e82197f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 814, in test_edit_user_email
+    self.edit_user(&#34;no_one&#34;, {&#39;email&#39;: &#34; low@de.de &#34;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 700, in edit_user
+    if cls.navigate_to_user(name):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 707, in navigate_to_user
+    user = cls.driver.find_elements_by_xpath(&#34;//table[@id=&#39;table_user&#39;]/tbody/tr/td/a&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e82197f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id="et36.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e8472ca0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 159, in test_list_visibility
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8472ca0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id="et36.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e84725e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 426, in test_user_list_admin_role
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e84725e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id="et36.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e8219760&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 608, in test_user_list_check_sort
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8219760&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id="et36.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e841d5b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 358, in test_user_list_denied_tags
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1344, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 333, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e841d5b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id="et36.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e9a3d550&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 454, in test_user_list_download_role
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e9a3d550&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.7' class='hiddenRow bg-success'>
+        <tr id="et36.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e87534c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 148, in test_user_list_edit_button
+    ul = self.get_user_table(2)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1820, in get_user_table
+    if not self.goto_list_page(page):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1734, in goto_list_page
+    pages = self.driver.find_elements_by_class_name(&#34;page-item&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 580, in find_elements_by_class_name
+    return self.find_elements(by=By.CLASS_NAME, value=name)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e87534c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id="et36.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00eabc3520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 234, in test_user_list_edit_email
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00eabc3520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.9' class='hiddenRow bg-success'>
+        <tr id="et36.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e9a602b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 260, in test_user_list_edit_kindle
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e9a602b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.10' class='hiddenRow bg-success'>
+        <tr id="et36.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e9a15ee0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 322, in test_user_list_edit_language
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e9a15ee0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.11' class='hiddenRow bg-success'>
+        <tr id="et36.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e9a6bee0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 277, in test_user_list_edit_locale
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e9a6bee0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.12' class='hiddenRow bg-success'>
+        <tr id="et36.12" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.12')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00eabd4fa0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 211, in test_user_list_edit_name
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00eabd4fa0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.13' class='hiddenRow bg-success'>
+        <tr id="et36.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e8721d00&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 494, in test_user_list_edit_visiblility
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8721d00&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.14' class='hiddenRow bg-success'>
+        <tr id="et36.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e99f7fd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 584, in test_user_list_guest_edit
+    self.fill_basic_config({&#39;config_anonbrowse&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 344, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 254, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 71, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in __call__
+    return _find_element(driver, self.locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 411, in _find_element
+    return driver.find_element(*by)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e99f7fd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.15' class='hiddenRow bg-success'>
+        <tr id="et36.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e85f2760&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 442, in test_user_list_remove_admin
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e85f2760&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.16' class='hiddenRow bg-success'>
+        <tr id="et36.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e8402520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/adapters.py&#34;, line 439, in send
+    resp = conn.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=8083): Max retries exceeded with url: /login (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8402520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 631, in test_user_list_requests
+    login_page = r.get(&#39;http://127.0.0.1:8083/login&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/sessions.py&#34;, line 543, in get
+    return self.request(&#39;GET&#39;, url, **kwargs)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/sessions.py&#34;, line 530, in request
+    resp = self.send(prep, **send_kwargs)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/sessions.py&#34;, line 643, in send
+    r = adapter.send(request, **kwargs)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/adapters.py&#34;, line 516, in send
+    raise ConnectionError(e, request=request)
+requests.exceptions.ConnectionError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=8083): Max retries exceeded with url: /login (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8402520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.17' class='hiddenRow bg-success'>
+        <tr id="et36.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e97fa460&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 537, in test_user_list_search
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e97fa460&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.18' class='hiddenRow bg-success'>
+        <tr id="et36.18" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e85415b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 545, in test_user_list_sort
+    ul = self.get_user_table(1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
+    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
+    return self.find_elements(by=By.XPATH, value=xpath)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
+    return self.execute(Command.FIND_ELEMENTS, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e85415b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</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('c37', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et37.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_user_list)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e99f8610&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 63, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 432, in stop_calibre_web
+    cls.driver.find_element_by_id(&#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e99f8610&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e98644c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 65, in tearDownClass
+    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 333, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e98644c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3381,13 +5506,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3405,13 +5530,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 21)">Detail</a>
+            <a onclick="showClassDetail('c39', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3420,7 +5545,7 @@
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3429,7 +5554,7 @@
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3438,7 +5563,7 @@
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3447,7 +5572,7 @@
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3456,7 +5581,7 @@
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3465,7 +5590,7 @@
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3474,7 +5599,7 @@
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3483,7 +5608,7 @@
     
     
     
-        <tr id='pt38.9' class='hiddenRow bg-success'>
+        <tr id='pt39.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3492,7 +5617,7 @@
     
     
     
-        <tr id='pt38.10' class='hiddenRow bg-success'>
+        <tr id='pt39.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3501,7 +5626,7 @@
     
     
     
-        <tr id='pt38.11' class='hiddenRow bg-success'>
+        <tr id='pt39.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3510,7 +5635,7 @@
     
     
     
-        <tr id='pt38.12' class='hiddenRow bg-success'>
+        <tr id='pt39.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3519,7 +5644,7 @@
     
     
     
-        <tr id='pt38.13' class='hiddenRow bg-success'>
+        <tr id='pt39.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3528,7 +5653,7 @@
     
     
     
-        <tr id='pt38.14' class='hiddenRow bg-success'>
+        <tr id='pt39.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3537,7 +5662,7 @@
     
     
     
-        <tr id='pt38.15' class='hiddenRow bg-success'>
+        <tr id='pt39.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3546,7 +5671,7 @@
     
     
     
-        <tr id='pt38.16' class='hiddenRow bg-success'>
+        <tr id='pt39.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3555,7 +5680,7 @@
     
     
     
-        <tr id='pt38.17' class='hiddenRow bg-success'>
+        <tr id='pt39.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3564,7 +5689,7 @@
     
     
     
-        <tr id='pt38.18' class='hiddenRow bg-success'>
+        <tr id='pt39.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -3573,7 +5698,7 @@
     
     
     
-        <tr id='pt38.19' class='hiddenRow bg-success'>
+        <tr id='pt39.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -3582,7 +5707,7 @@
     
     
     
-        <tr id='pt38.20' class='hiddenRow bg-success'>
+        <tr id='pt39.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -3591,7 +5716,7 @@
     
     
     
-        <tr id='pt38.21' class='hiddenRow bg-success'>
+        <tr id='pt39.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -3609,13 +5734,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 34)">Detail</a>
+            <a onclick="showClassDetail('c40', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -3624,7 +5749,7 @@
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -3633,7 +5758,7 @@
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -3642,7 +5767,7 @@
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -3651,7 +5776,7 @@
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -3660,7 +5785,7 @@
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -3669,7 +5794,7 @@
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -3678,7 +5803,7 @@
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -3687,7 +5812,7 @@
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -3696,7 +5821,7 @@
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -3705,7 +5830,7 @@
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -3714,7 +5839,7 @@
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -3723,7 +5848,7 @@
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -3732,7 +5857,7 @@
     
     
     
-        <tr id='pt39.14' class='hiddenRow bg-success'>
+        <tr id='pt40.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -3741,7 +5866,7 @@
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -3750,7 +5875,7 @@
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -3759,7 +5884,7 @@
     
     
     
-        <tr id='pt39.17' class='hiddenRow bg-success'>
+        <tr id='pt40.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -3768,7 +5893,7 @@
     
     
     
-        <tr id='pt39.18' class='hiddenRow bg-success'>
+        <tr id='pt40.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -3777,7 +5902,7 @@
     
     
     
-        <tr id='pt39.19' class='hiddenRow bg-success'>
+        <tr id='pt40.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -3786,7 +5911,7 @@
     
     
     
-        <tr id='pt39.20' class='hiddenRow bg-success'>
+        <tr id='pt40.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -3795,7 +5920,7 @@
     
     
     
-        <tr id='pt39.21' class='hiddenRow bg-success'>
+        <tr id='pt40.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -3804,7 +5929,7 @@
     
     
     
-        <tr id='pt39.22' class='hiddenRow bg-success'>
+        <tr id='pt40.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -3813,7 +5938,7 @@
     
     
     
-        <tr id='pt39.23' class='hiddenRow bg-success'>
+        <tr id='pt40.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -3822,7 +5947,7 @@
     
     
     
-        <tr id='pt39.24' class='hiddenRow bg-success'>
+        <tr id='pt40.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -3831,7 +5956,7 @@
     
     
     
-        <tr id='pt39.25' class='hiddenRow bg-success'>
+        <tr id='pt40.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -3840,7 +5965,7 @@
     
     
     
-        <tr id='pt39.26' class='hiddenRow bg-success'>
+        <tr id='pt40.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -3849,7 +5974,7 @@
     
     
     
-        <tr id='pt39.27' class='hiddenRow bg-success'>
+        <tr id='pt40.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -3858,7 +5983,7 @@
     
     
     
-        <tr id='pt39.28' class='hiddenRow bg-success'>
+        <tr id='pt40.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -3867,7 +5992,7 @@
     
     
     
-        <tr id='pt39.29' class='hiddenRow bg-success'>
+        <tr id='pt40.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -3876,7 +6001,7 @@
     
     
     
-        <tr id='pt39.30' class='hiddenRow bg-success'>
+        <tr id='pt40.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -3885,7 +6010,7 @@
     
     
     
-        <tr id='pt39.31' class='hiddenRow bg-success'>
+        <tr id='pt40.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -3894,7 +6019,7 @@
     
     
     
-        <tr id='pt39.32' class='hiddenRow bg-success'>
+        <tr id='pt40.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -3903,7 +6028,7 @@
     
     
     
-        <tr id='pt39.33' class='hiddenRow bg-success'>
+        <tr id='pt40.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -3912,7 +6037,7 @@
     
     
     
-        <tr id='pt39.34' class='hiddenRow bg-success'>
+        <tr id='pt40.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -3930,13 +6055,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -3945,7 +6070,7 @@
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -3954,7 +6079,7 @@
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -3963,7 +6088,7 @@
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -3972,7 +6097,7 @@
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -3981,7 +6106,7 @@
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -3990,7 +6115,7 @@
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -3999,7 +6124,7 @@
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4008,7 +6133,7 @@
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4017,7 +6142,7 @@
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4026,7 +6151,7 @@
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4035,7 +6160,7 @@
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4044,7 +6169,7 @@
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4053,7 +6178,7 @@
     
     
     
-        <tr id='pt40.14' class='hiddenRow bg-success'>
+        <tr id='pt41.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4062,7 +6187,7 @@
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4071,7 +6196,7 @@
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4082,11 +6207,11 @@
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>366</td>
-        <td>360</td>
-        <td>0</td>
-        <td>0</td>
-        <td>6</td>
+        <td>361</td>
+        <td>312</td>
+        <td>15</td>
+        <td>27</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4114,7 +6239,7 @@
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.11.0-38-generic #42~20.04.1-Ubuntu SMP Tue Sep 28 20:41:07 UTC 2021 x86_64 x86_64</td>
+              <td>Linux 5.13.0-21-generic #21~20.04.1-Ubuntu SMP Tue Oct 26 15:49:20 UTC 2021 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4240,7 +6365,7 @@
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.26</td>
+              <td>1.4.27</td>
               <td>Basic</td>
             </tr>
           
@@ -4270,13 +6395,13 @@
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.28.0</td>
+              <td>2.31.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.1</td>
+              <td>0.20.2</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4300,13 +6425,13 @@
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.28.0</td>
+              <td>2.31.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.1</td>
+              <td>0.20.2</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4330,13 +6455,13 @@
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.28.0</td>
+              <td>2.31.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.1</td>
+              <td>0.20.2</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4372,13 +6497,13 @@
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.28.0</td>
+              <td>2.31.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.1</td>
+              <td>0.20.2</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4402,13 +6527,13 @@
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.28.0</td>
+              <td>2.31.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.1</td>
+              <td>0.20.2</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4444,13 +6569,13 @@
           
             <tr>
               <th>jsonschema</th>
-              <td>4.1.2</td>
+              <td>4.2.1</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.1.2</td>
+              <td>4.2.1</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -4462,7 +6587,7 @@
           
             <tr>
               <th>jsonschema</th>
-              <td>4.1.2</td>
+              <td>4.2.1</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -4474,7 +6599,7 @@
           
             <tr>
               <th>Flask-Dance</th>
-              <td>5.0.0</td>
+              <td>5.1.0</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -4492,7 +6617,7 @@
 </div>
 
 <script>
-    drawCircle(360, 0, 0, 6);
+    drawCircle(312, 15, 27, 7);
     showCase(5);
 </script>
 

From e880238cb9765f03ae0627c4478b5637d17dbd18 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 21 Nov 2021 16:19:32 +0100
Subject: [PATCH 035/412] Add missing filter for current user in
 KoboSyncedBooks queries

---
 cps/kobo.py             |  3 --
 cps/kobo_sync_status.py | 65 +++++++++++++++++++++++------------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 8a395821a..ee2317ba9 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -142,9 +142,6 @@ def HandleSyncRequest():
     if not current_app.wsgi_app.is_proxied:
         log.debug('Kobo: Received unproxied request, changed request port to external server port')
 
-    # TODO: Limit the number of books return per sync call, and rely on the sync-continuatation header
-    # instead so that the device triggers another sync.
-
     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
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index f4a666048..b88cb6ace 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -22,25 +22,31 @@ from . import ub
 import datetime
 from sqlalchemy.sql.expression import or_
 
-
+# Add the current book id to kobo_synced_books table for current user, if entry is already present,
+# do nothing (safety precaution)
 def add_synced_books(book_id):
-    synced_book = ub.KoboSyncedBooks()
-    synced_book.user_id = current_user.id
-    synced_book.book_id = book_id
-    ub.session.add(synced_book)
-    ub.session_commit()
+    is_present = ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id)\
+        .filter(ub.KoboSyncedBooks.user_id == current_user.id).count()
+    if not is_present:
+        synced_book = ub.KoboSyncedBooks()
+        synced_book.user_id = current_user.id
+        synced_book.book_id = book_id
+        ub.session.add(synced_book)
+        ub.session_commit()
 
 
+# Select all entries of current book in kobo_synced_books table, which are from current user and delete them
 def remove_synced_book(book_id):
-    ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).delete()
+    ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id) \
+        .filter(ub.KoboSyncedBooks.user_id == current_user.id).delete()
     ub.session_commit()
 
+
 def add_archived_books(book_id):
-    archived_book = (
-        ub.session.query(ub.ArchivedBook)
-        .filter(ub.ArchivedBook.book_id == book_id)
-        .first()
-    )
+    archived_book = (ub.session.query(ub.ArchivedBook)
+                     .filter(ub.ArchivedBook.book_id == book_id)
+                     .filter(ub.ArchivedBook.user_id == current_user.id)
+                     .first())
     if not archived_book:
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
     archived_book.is_archived = True
@@ -50,22 +56,23 @@ def add_archived_books(book_id):
     ub.session_commit()
 
 
-
 # select all books which are synced by the current user and do not belong to a synced shelf and them to archive
-# select all shelfs from current user which are synced and do not belong to the "only sync" shelfs
-def update_on_sync_shelfs(content_id):
-        books_to_archive = (ub.session.query(ub.KoboSyncedBooks)
-                            .join(ub.BookShelf, ub.KoboSyncedBooks.book_id == ub.BookShelf.book_id, isouter=True)
-                            .join(ub.Shelf, ub.Shelf.user_id == content_id, isouter=True)
-                            .filter(or_(ub.Shelf.kobo_sync == 0, ub.Shelf.kobo_sync == None))
-                            .filter(ub.KoboSyncedBooks.user_id == content_id).all())
-        for b in books_to_archive:
-            add_archived_books(b.book_id)
-            ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == b.book_id).filter(ub.KoboSyncedBooks.user_id == content_id).delete()
-            ub.session_commit()
+# select all shelves from current user which are synced and do not belong to the "only sync" shelves
+def update_on_sync_shelfs(user_id):
+    books_to_archive = (ub.session.query(ub.KoboSyncedBooks)
+                        .join(ub.BookShelf, ub.KoboSyncedBooks.book_id == ub.BookShelf.book_id, isouter=True)
+                        .join(ub.Shelf, ub.Shelf.user_id == user_id, isouter=True)
+                        .filter(or_(ub.Shelf.kobo_sync == 0, ub.Shelf.kobo_sync == None))
+                        .filter(ub.KoboSyncedBooks.user_id == user_id).all())
+    for b in books_to_archive:
+        add_archived_books(b.book_id)
+        ub.session.query(ub.KoboSyncedBooks) \
+            .filter(ub.KoboSyncedBooks.book_id == b.book_id) \
+            .filter(ub.KoboSyncedBooks.user_id == user_id).delete()
+        ub.session_commit()
 
-        shelfs_to_archive = ub.session.query(ub.Shelf).filter(ub.Shelf.user_id == content_id).filter(
-            ub.Shelf.kobo_sync == 0).all()
-        for a in shelfs_to_archive:
-            ub.session.add(ub.ShelfArchive(uuid=a.uuid, user_id=content_id))
-            ub.session_commit()
+    shelves_to_archive = ub.session.query(ub.Shelf).filter(ub.Shelf.user_id == user_id).filter(
+        ub.Shelf.kobo_sync == 0).all()
+    for a in shelves_to_archive:
+        ub.session.add(ub.ShelfArchive(uuid=a.uuid, user_id=user_id))
+        ub.session_commit()

From d084a06e635b7228279e308aeb5ba5dddafa4502 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 21 Nov 2021 16:21:27 +0100
Subject: [PATCH 036/412] Bugfix create shelf for users not allowed to create
 public shelfs

---
 cps/shelf.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/cps/shelf.py b/cps/shelf.py
index 97147a716..5f6a66bf2 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -224,12 +224,8 @@ def remove_from_shelf(shelf_id, book_id):
 @shelf.route("/shelf/create", methods=["GET", "POST"])
 @login_required
 def create_shelf():
-    if not current_user.role_edit_shelfs() and request.method == 'POST':
-        flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
-        return redirect(url_for('web.index'))
-    else:
-        shelf = ub.Shelf()
-        return create_edit_shelf(shelf, page_title=_(u"Create a Shelf"), page="shelfcreate")
+    shelf = ub.Shelf()
+    return create_edit_shelf(shelf, page_title=_(u"Create a Shelf"), page="shelfcreate")
 
 
 
@@ -249,6 +245,9 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
     # calibre_db.session.query(ub.Shelf).filter(ub.Shelf.user_id == current_user.id).filter(ub.Shelf.kobo_sync).count()
     if request.method == "POST":
         to_save = request.form.to_dict()
+        if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
+            flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
+            return redirect(url_for('web.index'))
         shelf.is_public = 1 if to_save.get("is_public") else 0
         if config.config_kobo_sync:
             shelf.kobo_sync = True if to_save.get("kobo_sync") else False

From 2e0d0a24290e024b1dc6332f138872b706478207 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 21 Nov 2021 18:31:35 +0100
Subject: [PATCH 037/412] Update requirements

---
 optional-requirements.txt | 14 +++++++-------
 requirements.txt          |  6 +++---
 setup.cfg                 |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index c9a05fc00..03f58bb56 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,18 +1,18 @@
 # GDrive Integration
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
-httplib2>=0.9.2,<0.20.0
+httplib2>=0.9.2,<0.21.0
 oauth2client>=4.0.0,<4.1.4
-uritemplate>=3.0.0,<3.1.0
+uritemplate>=3.0.0,<4.2.0
 pyasn1-modules>=0.0.8,<0.3.0
 pyasn1>=0.1.9,<0.5.0
-PyDrive2>=1.3.1,<1.9.0
+PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
 rsa>=3.4.2,<4.8.0
 six>=1.10.0,<1.17.0
 
 # Gdrive and Gmail integration
-google-api-python-client>=1.7.11,<2.1.0
+google-api-python-client>=1.7.11,<2.32.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
@@ -26,16 +26,16 @@ python-ldap>=3.0.0,<3.4.0
 Flask-SimpleLDAP>=1.4.0,<1.5.0
 
 #oauth
-Flask-Dance>=2.0.0,<5.1.0
+Flask-Dance>=2.0.0,<5.2.0
 SQLAlchemy-Utils>=0.33.5,<0.38.0
 
 # extracting metadata
 rarfile>=2.7
-scholarly>=1.2.0, <1.3
+scholarly>=1.2.0, <1.5
 
 # other
 natsort>=2.2.0,<8.1.0
 comicapi>=2.2.0,<2.3.0
 
 #Kobo integration
-jsonschema>=3.2.0,<3.3.0
+jsonschema>=3.2.0,<4.3.0
diff --git a/requirements.txt b/requirements.txt
index dc1b0d95f..1db961fef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
-Babel>=1.3, <3.0
+Babel>=1.3,<3.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
 backports_abc>=0.4
 Flask>=1.0.2,<2.1.0
 iso-639>=0.4.5,<0.5.0
-PyPDF3>=1.0.0,<1.0.4
+PyPDF3>=1.0.0,<1.0.6
 pytz>=2016.10
 requests>=2.11.1,<2.25.0
 SQLAlchemy>=1.3.0,<1.5.0
@@ -13,4 +13,4 @@ tornado>=4.1,<6.2
 Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.3.0
 lxml>=3.8.0,<4.7.0
-flask-wtf>=0.14.2,<0.16.0
+flask-wtf>=0.14.2,<1.1.0
diff --git a/setup.cfg b/setup.cfg
index 76f7e4052..3f1b1f8dd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,7 @@ keywords =
   calibre
   calibre-web
   library
-python_requires = >=3.0
+python_requires = >=3.5
 
 [options.entry_points]
 console_scripts =
@@ -82,7 +82,7 @@ oauth =
     SQLAlchemy-Utils>=0.33.5,<0.38.0
 metadata =
     rarfile>=2.7
-    scholarly>=1.2.0, <1.3
+    scholarly>=1.2.0,<1.3
 comics =
     natsort>=2.2.0,<7.2.0
     comicapi>= 2.2.0,<2.3.0

From a1d372630d6be75f9df5eac90ea2bda53a42dd0a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 23 Nov 2021 19:32:11 +0100
Subject: [PATCH 038/412] Added missing language bit (fixes #2187) Added
 handling of wrong .jpg cover file content Guest sorting options are now
 stored in the session Updated teststatus

---
 cps/helper.py                                 |    2 +-
 cps/iso_language_names.py                     |   20 +
 cps/translations/cs/LC_MESSAGES/messages.mo   |  Bin 39635 -> 39635 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/de/LC_MESSAGES/messages.mo   |  Bin 53698 -> 53698 bytes
 cps/translations/de/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/el/LC_MESSAGES/messages.mo   |  Bin 57858 -> 57858 bytes
 cps/translations/el/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/es/LC_MESSAGES/messages.mo   |  Bin 51420 -> 51420 bytes
 cps/translations/es/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/fi/LC_MESSAGES/messages.mo   |  Bin 27521 -> 27521 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/fr/LC_MESSAGES/messages.mo   |  Bin 53763 -> 53763 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/hu/LC_MESSAGES/messages.mo   |  Bin 25272 -> 25272 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/it/LC_MESSAGES/messages.mo   |  Bin 56390 -> 56390 bytes
 cps/translations/it/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/ja/LC_MESSAGES/messages.mo   |  Bin 19949 -> 19949 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/km/LC_MESSAGES/messages.mo   |  Bin 24546 -> 24546 bytes
 cps/translations/km/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/nl/LC_MESSAGES/messages.mo   |  Bin 50584 -> 50584 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/pl/LC_MESSAGES/messages.mo   |  Bin 52511 -> 52511 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   |  117 +-
 .../pt_BR/LC_MESSAGES/messages.mo             |  Bin 47022 -> 47022 bytes
 .../pt_BR/LC_MESSAGES/messages.po             |  117 +-
 cps/translations/ru/LC_MESSAGES/messages.mo   |  Bin 48070 -> 48070 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/sv/LC_MESSAGES/messages.mo   |  Bin 48854 -> 48854 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/tr/LC_MESSAGES/messages.mo   |  Bin 22880 -> 22880 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   |  117 +-
 cps/translations/uk/LC_MESSAGES/messages.mo   |  Bin 18028 -> 18028 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   |  117 +-
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        |  Bin 48654 -> 48654 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        |  117 +-
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        |  Bin 48977 -> 48977 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        |  117 +-
 cps/ub.py                                     |   10 +-
 messages.pot                                  |  117 +-
 test/Calibre-Web TestSummary_Linux.html       | 2816 +++--------------
 43 files changed, 1644 insertions(+), 3544 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 08970d0ff..d966b331a 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -646,7 +646,7 @@ def save_cover(img, book_path):
                 imgc.format = 'jpeg'
                 imgc.transform_colorspace("rgb")
                 img = imgc
-            except BlobError:
+            except (BlobError, MissingDelegateError):
                 log.error("Invalid cover file content")
                 return False, _("Invalid cover file content")
     else:
diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 11e5e67bf..8bd9a0d3a 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -51,6 +51,7 @@ LANGUAGE_NAMES = {
         "bel": "běloruština",
         "bem": "bemba (Zambie)",
         "ben": "bengálština",
+        "berinomo": "bit",
         "bho": "bhódžpurština",
         "bik": "bikolština",
         "bin": "bini",
@@ -473,6 +474,7 @@ LANGUAGE_NAMES = {
         "bel": "Weißrussisch",
         "bem": "Bemba (Sambia)",
         "ben": "Bengalisch",
+        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "bin": "Bini",
@@ -899,6 +901,7 @@ LANGUAGE_NAMES = {
         "byn": "Bilin",
         "bin": "Bini",
         "bis": "Bislama",
+        "berinomo": "Bit",
         "zbl": "Blissymbols",
         "bos": "Βοσνιακά",
         "bra": "Braj",
@@ -1272,6 +1275,7 @@ LANGUAGE_NAMES = {
         "bel": "Bielorruso",
         "bem": "Bemba (Zambia)",
         "ben": "Bengalí",
+        "berinomo": "Bit",
         "bho": "Bopurí",
         "bik": "Bicolano",
         "bin": "Bini",
@@ -1694,6 +1698,7 @@ LANGUAGE_NAMES = {
         "bel": "valkovenäjä",
         "bem": "Bemba (Zambia)",
         "ben": "bengali",
+        "berinomo": "Bit",
         "bho": "bhojpuri",
         "bik": "bikol",
         "bin": "bini",
@@ -2116,6 +2121,7 @@ LANGUAGE_NAMES = {
         "bel": "biélorusse",
         "bem": "bemba (Zambie)",
         "ben": "bengali",
+        "berinomo": "bit",
         "bho": "bhojpuri",
         "bik": "bikol",
         "bin": "bini",
@@ -2538,6 +2544,7 @@ LANGUAGE_NAMES = {
         "bel": "belarusz",
         "bem": "Bemba (Zambia)",
         "ben": "bengáli",
+        "berinomo": "Bit",
         "bho": "bhodzspuri",
         "bik": "bikol",
         "bin": "bini",
@@ -2960,6 +2967,7 @@ LANGUAGE_NAMES = {
         "bel": "Bielorusso",
         "bem": "Bemba (Zambia)",
         "ben": "Bengalese",
+        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "bicol",
         "bin": "Bini",
@@ -3382,6 +3390,7 @@ LANGUAGE_NAMES = {
         "bel": "白ロシア語",
         "bem": "Bemba (Zambia)",
         "ben": "ベンガル語",
+        "berinomo": "Bit",
         "bho": "ボージプリー語",
         "bik": "ビコル語",
         "bin": "ビニ語",
@@ -3804,6 +3813,7 @@ LANGUAGE_NAMES = {
         "bel": "Belarusian",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
+        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "bin": "Bini",
@@ -4226,6 +4236,7 @@ LANGUAGE_NAMES = {
         "bel": "Wit-Russisch; Belarussisch",
         "bem": "Bemba (Zambia)",
         "ben": "Bengaals",
+        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "bin": "Bini; Edo",
@@ -4648,6 +4659,7 @@ LANGUAGE_NAMES = {
         "bel": "białoruski",
         "bem": "bemba (Zambia)",
         "ben": "bengalski",
+        "berinomo": "Bit",
         "bho": "bhodźpuri",
         "bik": "bikol",
         "bin": "edo",
@@ -5074,6 +5086,7 @@ LANGUAGE_NAMES = {
         "byn": "Bilin",
         "bin": "Bini",
         "bis": "Bislama",
+        "berinomo": "Bit",
         "zbl": "Blissymbols",
         "bos": "Bosnian",
         "bra": "Braj",
@@ -5445,6 +5458,7 @@ LANGUAGE_NAMES = {
         "bel": "Белорусский",
         "bem": "Бемба (Замбия)",
         "ben": "Бенгальский",
+        "berinomo": "Bit",
         "bho": "Бходжпури",
         "bik": "Бикольский",
         "bin": "Бини",
@@ -5867,6 +5881,7 @@ LANGUAGE_NAMES = {
         "bel": "Vitryska",
         "bem": "Bemba (Zambia)",
         "ben": "Bengaliska",
+        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "bin": "Edo (bini)",
@@ -6293,6 +6308,7 @@ LANGUAGE_NAMES = {
         "byn": "Bilin",
         "bin": "Bini (Afrika)",
         "bis": "Bislama (Vanuatu; Kuzey Pasifik)",
+        "berinomo": "Bit",
         "zbl": "Blis Sembolleri",
         "bos": "Boşnakça",
         "bra": "Braj (Hindistan)",
@@ -6664,6 +6680,7 @@ LANGUAGE_NAMES = {
         "bel": "білоруська",
         "bem": "бемба (Замбія)",
         "ben": "бенгальська",
+        "berinomo": "біт",
         "bho": "бходжпурі",
         "bik": "бікольська",
         "bin": "біні",
@@ -7086,6 +7103,7 @@ LANGUAGE_NAMES = {
         "bel": "白俄罗斯语",
         "bem": "本巴语（赞比亚）",
         "ben": "孟加拉语",
+        "berinomo": "布兴话",
         "bho": "博杰普尔语",
         "bik": "比科尔语",
         "bin": "比尼语",
@@ -7512,6 +7530,7 @@ LANGUAGE_NAMES = {
         "byn": "Bilin",
         "bin": "Bini",
         "bis": "Bislama",
+        "berinomo": "Bit",
         "zbl": "布利斯符號",
         "bos": "Bosnian",
         "bra": "Braj",
@@ -7887,6 +7906,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index d03dc08c93d654e22a38d2bcb5f0de3efa426db5..efd55ce457763285f1b3aa18002502afc948b7fa 100644
GIT binary patch
delta 29
lcmcb-mFe<UrVTQY?8XX)mR3fVo0TJN7#S@$CqxxH005g-326WT

delta 29
lcmcb-mFe<UrVTQY?1l;kmR3e)o0TJN7#S@#CqxxH005fu31R>M

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 6a6705473..931da8327 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+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,7 +15,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -70,7 +70,8 @@ msgid "Edit Users"
 msgstr "Uživatel admin"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Vše"
 
@@ -273,7 +274,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -303,7 +304,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
@@ -348,7 +349,7 @@ msgstr "Upravit uživatele %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
@@ -383,7 +384,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
@@ -483,7 +484,7 @@ msgstr "není nakonfigurováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
@@ -496,8 +497,8 @@ msgstr "Formát knihy úspěšně smazán"
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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ý"
 
@@ -534,7 +535,7 @@ msgstr "Nepodařilo se vytvořit cestu %(path)s (oprávnění odepřeno)."
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
@@ -692,7 +693,7 @@ msgstr "Soubor %(file)s nenalezen na Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
@@ -774,7 +775,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -840,7 +841,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -917,7 +918,7 @@ msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -955,7 +956,7 @@ msgstr "Zobrazit výběr vydavatele"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -1042,58 +1043,58 @@ msgstr "Kniha byla odebrána z police: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Vytvořit polici"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Lituji, nejste oprávněni odebrat knihu z této police: %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Upravit polici"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Police %(title)s vytvořena"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Police %(title)s změněna"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Došlo k chybě"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, 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:312
+#: cps/shelf.py:311
 #, 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:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Změnit  pořadí Police: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Police: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
 
@@ -1174,14 +1175,14 @@ msgstr "Kategorie: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Hledat"
 
@@ -1197,106 +1198,106 @@ msgstr "Seznam hodnocení"
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, 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:1473
+#: cps/web.py:1468
 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:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, 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:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 88ec0827506a04563a01db93551d73241ad1cf99..b7c0207f3363ee0af804c72aa387d8e1e571a59b 100644
GIT binary patch
delta 29
lcmX@KnEB9R<_+J<*o_qoEv<|!H~%eTW@NP7%vf<S5&*GR3jhEB

delta 29
lcmX@KnEB9R<_+J<*bNm7EUk>pHvcVSW@NP3%vf<S5&*FC3i$v4

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index a1b69d0cd..808fcb04c 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2021-08-01 17:24+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -70,7 +70,8 @@ msgid "Edit Users"
 msgstr "Benutzer bearbeiten"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Alle"
 
@@ -268,7 +269,7 @@ msgstr "LDAP CA-Zertifikat, Zertifikat oder Key Datei ist kein gültiger Pfad"
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
@@ -297,7 +298,7 @@ msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
@@ -341,7 +342,7 @@ msgstr "Benutzer %(nick)s bearbeiten"
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
@@ -376,7 +377,7 @@ msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
@@ -476,7 +477,7 @@ msgstr "Nicht konfiguriert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, 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"
@@ -489,8 +490,8 @@ msgstr "Buch Format erfolgreich gelöscht"
 msgid "Book Successfully Deleted"
 msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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"
 
@@ -527,7 +528,7 @@ msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
@@ -685,7 +686,7 @@ msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 msgid "Found an existing account for this e-mail address"
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
 
@@ -766,7 +767,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -832,7 +833,7 @@ msgid "{} Stars"
 msgstr "{} Sterne"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Login"
 
@@ -909,7 +910,7 @@ msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -947,7 +948,7 @@ msgstr "Zeige Verlegerauswahl"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -1033,57 +1034,57 @@ msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Dir ist es nicht erlaubt, dieses Bücherregal zu editieren"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, 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:312
+#: cps/shelf.py:311
 #, 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:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 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"
 
@@ -1164,14 +1165,14 @@ msgstr "Kategorie: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Suche"
 
@@ -1187,106 +1188,106 @@ msgstr "Bewertungsliste"
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, 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:1473
+#: cps/web.py:1468
 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:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 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:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, 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:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 47ef49892936030cc3503c49ae16fb00590c85fb..066c68c548c15550a7e5eced6924b6fc5bcac03a 100644
GIT binary patch
delta 29
lcmZoV!rXL(dBe##c4GxYODiMG%@^W085u1%--_300sy1^3XT8(

delta 29
lcmZoV!rXL(dBe##c0&aNODiL@%@^W085u1$--_300sy0#3Wopy

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 3e5b003de..36a350578 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -15,7 +15,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -70,7 +70,8 @@ msgid "Edit Users"
 msgstr "Χρήστης Διαχειριστής"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Όλα"
 
@@ -273,7 +274,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
 
@@ -303,7 +304,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
@@ -348,7 +349,7 @@ msgstr "Επεξεργασία χρήστη %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
@@ -383,7 +384,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
@@ -483,7 +484,7 @@ msgstr "δεν διαμορφώθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
@@ -496,8 +497,8 @@ msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
 msgid "Book Successfully Deleted"
 msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -534,7 +535,7 @@ msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η ά
 msgid "Failed to store file %(file)s."
 msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
@@ -692,7 +693,7 @@ msgstr "Το αρχείο %(file)s δεν βρέθηκε στο Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
@@ -774,7 +775,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -840,7 +841,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -917,7 +918,7 @@ msgid "Show Random Books"
 msgstr "Προβολή Τυχαίων Βιβλίων"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -955,7 +956,7 @@ msgstr "Προβολή επιλογών εκδότη"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Γλώσσες"
 
@@ -1042,58 +1043,58 @@ msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sn
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Δημιούργησε ένα Ράφι"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Συγγνώμη αλλά δεν σου επιτρέπεται η αφαίρεση ενός βιβλίου από αυτό το ράφι: %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Επεξεργασία ενός ραφιού"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Το ράφι %(title)s δημιουργήθηκε"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Το ράφι %(title)s άλλαξε"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Υπήρξε ένα σφάλμα"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Ράφι: '%(name)s"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -1174,14 +1175,14 @@ msgstr "Κατηγορία: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Αναζήτηση"
 
@@ -1197,106 +1198,106 @@ msgstr "Λίστα αξιολογήσεων"
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 82ed25531ba509e2edfc2e09850d3af6c598f121..4c9a8b5354c5ce76cca614e7bd490ec715e5f635 100644
GIT binary patch
delta 29
lcmcaJk@?O<<_(Mm?8XX)mR3fVn>h*;7#S@$YZh(}2LO~-2}l3{

delta 29
lcmcaJk@?O<<_(Mm?1l;kmR3e)n>h*;7#S@#YZh(}2LO}u2|)k=

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index d57c31cc4..fee74d1f8 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,7 +18,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -74,7 +74,8 @@ msgid "Edit Users"
 msgstr "Editar usuarios"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Todo"
 
@@ -277,7 +278,7 @@ msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la c
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "La base de datos de configuración no es modificable"
 
@@ -307,7 +308,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
@@ -352,7 +353,7 @@ msgstr "Editar Usuario %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
@@ -387,7 +388,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
@@ -487,7 +488,7 @@ msgstr "no configurado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
@@ -500,8 +501,8 @@ msgstr "Formato de libro eliminado con éxito"
 msgid "Book Successfully Deleted"
 msgstr "Libro eliminado con éxito"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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"
 
@@ -538,7 +539,7 @@ msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
@@ -696,7 +697,7 @@ msgstr "Fichero %(file)s no encontrado en Google Drive"
 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:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
@@ -778,7 +779,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -844,7 +845,7 @@ msgid "{} Stars"
 msgstr "{} Estrellas"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -921,7 +922,7 @@ msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Categorías"
 
@@ -959,7 +960,7 @@ msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -1046,58 +1047,58 @@ msgstr "El libro fue eliminado del estante: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Lo siento, no tiene permiso para eliminar un libro del estante: %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Editar un estante"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, 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:312
+#: cps/shelf.py:311
 #, 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:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 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"
 
@@ -1178,14 +1179,14 @@ msgstr "Categoría : %(name)s"
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Buscar"
 
@@ -1201,106 +1202,106 @@ msgstr "Lista de calificaciones"
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = $(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, 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:1473
+#: cps/web.py:1468
 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:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 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:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, 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:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 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:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index cf1a75d3ad6928ed40cd57e099dbfbfa9a8f302b..bf9771a25e71dfc2d8b6ea6e419f24f8739418ab 100644
GIT binary patch
delta 29
lcmZp?&e(XJal<Nmc4GxYODiMG%^U5d7#S@$pK;i#1puH`3QGV0

delta 29
lcmZp?&e(XJal<Nmc0&aNODiL@%^U5d7#S@#pK;i#1puG%3Pb<^

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 0a4f2fb99..cdf9498c7 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -71,7 +71,8 @@ msgid "Edit Users"
 msgstr "Pääkäyttäjä"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Kaikki"
 
@@ -273,7 +274,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -303,7 +304,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
@@ -348,7 +349,7 @@ msgstr "Muokkaa käyttäjää %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
@@ -383,7 +384,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
@@ -481,7 +482,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -494,8 +495,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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:"
 
@@ -532,7 +533,7 @@ msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -690,7 +691,7 @@ msgstr "Tiedostoa %(file)s ei löytynyt Google Drivesta"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
@@ -772,7 +773,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -838,7 +839,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -915,7 +916,7 @@ msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Kategoriat"
 
@@ -953,7 +954,7 @@ msgstr "Näytä julkaisijavalinta"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Kielet"
 
@@ -1040,58 +1041,58 @@ msgstr "Kirja on poistettu hyllystä: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "luo hylly"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Valitettavsti sinulla ei ole oikeutta poistaa kirjaa hyllystä: %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Muokkaa hyllyä"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hylly %(title)s luotu"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hylly %(title)s muutettu"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Tapahtui virhe"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Muuta hyllyn: '%(name)s' järjestystä"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylly: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
 
@@ -1172,14 +1173,14 @@ msgstr "Kategoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Hae"
 
@@ -1195,106 +1196,106 @@ msgstr "Arvostelulistaus"
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, 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:1473
+#: cps/web.py:1468
 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:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 02501df2de235322a46bda7d407673c4b99f4c99..942ea659c8ff73c4776903bec3bbda6de74f740e 100644
GIT binary patch
delta 29
lcmZo(!rZ)sdBfIxc4GxYODiMG&3p1W85u1%A1km;1OS}-3OfJ*

delta 29
lcmZo(!rZ)sdBfIxc0&aNODiL@&3p1W85u1$A1km;1OS|u3N!!!

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 5ffff5d74..53716e5e2 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -31,7 +31,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -86,7 +86,8 @@ msgid "Edit Users"
 msgstr "Utilisateur admin"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Tout"
 
@@ -289,7 +290,7 @@ msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuille
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Les paramètres de la base de données ne sont pas accessibles en écriture"
 
@@ -319,7 +320,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
@@ -364,7 +365,7 @@ msgstr "Éditer l'utilisateur %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
@@ -399,7 +400,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
@@ -499,7 +500,7 @@ msgstr "non configuré"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, 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"
@@ -512,8 +513,8 @@ msgstr "Le format du livre a été supprimé avec succès"
 msgid "Book Successfully Deleted"
 msgstr "Le livre a été supprimé avec succès"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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"
 
@@ -550,7 +551,7 @@ msgstr "Impossible de créer le chemin %(path)s (Permission refusée)."
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
@@ -708,7 +709,7 @@ msgstr "Le fichier %(file)s n'a pas été trouvé dans Google Drive"
 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:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
@@ -790,7 +791,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -856,7 +857,7 @@ msgid "{} Stars"
 msgstr "{} Étoiles"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Connexion"
 
@@ -933,7 +934,7 @@ msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Catégories"
 
@@ -971,7 +972,7 @@ msgstr "Montrer la sélection par éditeur"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Langues"
 
@@ -1058,58 +1059,58 @@ msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Désolé, vous n’êtes pas autorisé à enlever un livre de cette étagère : %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Modifier une étagère"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "L’étagère %(title)s a été modifiée"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, 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:312
+#: cps/shelf.py:311
 #, 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:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 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"
 
@@ -1190,14 +1191,14 @@ msgstr "Catégorie : %(name)s"
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Chercher"
 
@@ -1213,106 +1214,106 @@ msgstr "Liste des évaluations"
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de lecture = %(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, 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:1473
+#: cps/web.py:1468
 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:1490
+#: cps/web.py:1485
 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/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, 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:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 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:1587
+#: cps/web.py:1582
 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:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index bd42e50e5d6c9bffb314495577357be7bf9c5ab5..66c1dc52f8bc75270bfa0b1e1916f0e9c8d6dba3 100644
GIT binary patch
delta 28
kcmdmSlyS#V#tqNR*o_qoEv<|!C%-lO&S<&$srh9s0Ic*2<p2Nx

delta 28
kcmdmSlyS#V#tqNR*bNm7EUk>pCcicN&S<gusrh9s0IZe^-T(jq

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 06d891e2a..cbc61c951 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -71,7 +71,8 @@ msgid "Edit Users"
 msgstr "Rendszergazda felhasználó"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
@@ -273,7 +274,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -303,7 +304,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
@@ -348,7 +349,7 @@ msgstr " A felhasználó szerkesztése: %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
@@ -383,7 +384,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
@@ -481,7 +482,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -494,8 +495,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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:"
 
@@ -532,7 +533,7 @@ msgstr "Nem sikerült létrehozni az elérési utat (engedély megtagadva): %(pa
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -690,7 +691,7 @@ msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
 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:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
@@ -772,7 +773,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -838,7 +839,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Belépés"
 
@@ -915,7 +916,7 @@ msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Címkék"
 
@@ -953,7 +954,7 @@ msgstr "Kiadó választó mutatása"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -1040,58 +1041,58 @@ msgstr "A könyv el lett távolítva a polcról: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Polc készítése"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Sajnálom, nincs jogosultságot eltávolítani könyvet erről a polcról: %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Polc szerkesztése"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "A következő polc létre lett hozva: %(title)s"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "A következő polc megváltoztatva: %(title)s"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Hiba történt"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "A következő polc átrendezése: %(name)s"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Polc: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 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ő."
 
@@ -1172,14 +1173,14 @@ msgstr "Címke: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Keresés"
 
@@ -1195,106 +1196,106 @@ msgstr ""
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, 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:1473
+#: cps/web.py:1468
 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:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 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:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index af9006f72a00eba1417a44252c9335b7badb8c5a..edf183ba61484d57446c7abdc739e5c5751136b0 100644
GIT binary patch
delta 29
lcmX@MgZbDF<_%31?8XX)mR3fVn>#Cn85u1%&#hdU1OTeC3hV#?

delta 29
lcmX@MgZbDF<_%31?1l;kmR3e)n>#Cn85u1$&#hdU1OTc|3grL*

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 6e1dda304..2fb8119bd 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,7 +15,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -69,7 +69,8 @@ msgid "Edit Users"
 msgstr "Modifica gli utenti"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Tutti"
 
@@ -268,7 +269,7 @@ msgstr "LDAP CACertificate, il certificato o la posizione della chiave non sono
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "I parametri del DB non sono scrivibili"
 
@@ -296,7 +297,7 @@ msgstr "Configurazione del Database aggiornata"
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
@@ -340,7 +341,7 @@ msgstr "Modifica l'utente %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
@@ -375,7 +376,7 @@ msgstr "Configurazione del server e-mail aggiornata"
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
@@ -473,7 +474,7 @@ msgstr "non configurato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, 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"
@@ -486,8 +487,8 @@ msgstr "Il formato del libro è stato eliminato con successo"
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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"
 
@@ -524,7 +525,7 @@ msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
@@ -682,7 +683,7 @@ msgstr "File %(file)s non trovato su Google Drive"
 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:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 msgid "Found an existing account for this e-mail address"
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
@@ -763,7 +764,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -829,7 +830,7 @@ msgid "{} Stars"
 msgstr "{} Stelle"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Accesso"
 
@@ -906,7 +907,7 @@ msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Categorie"
 
@@ -944,7 +945,7 @@ msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Lingue"
 
@@ -1031,57 +1032,57 @@ msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Spiacente, non sei autorizzato a modificare questo scaffale"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Modifica uno scaffale"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Lo scaffale %(title)s è stato creato"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Lo scaffale %(title)s è stato modificato"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "C'era un errore"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Esiste già uno scaffale pubblico denominato '%(title)s'."
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Esiste già uno scaffale privato denominato '%(title)s'."
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Scaffale: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 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"
 
@@ -1162,14 +1163,14 @@ msgstr "Categoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Cerca"
 
@@ -1185,106 +1186,106 @@ msgstr "Elenco delle valutazioni"
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Stato di lettura = %(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 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:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 3fad6032cea57a12fc26b55b45e0d9bcbdfdd301..f0f34b232cfbe9fd10dfc3e74de09fc9b895c3f9 100644
GIT binary patch
delta 29
lcmaDmoAK>z#tmz<*o_qoEv<|!H*eOGW@NP7d|q2l2>_>b3Dp1q

delta 29
lcmaDmoAK>z#tmz<*bNm7EUk>pHgDFFW@NP3d|q2l2>_=M3C;ij

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index f8ce8069c..4b560850c 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -70,7 +70,8 @@ msgid "Edit Users"
 msgstr ""
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
@@ -268,7 +269,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -298,7 +299,7 @@ msgstr "メールサーバの設定を更新しました"
 msgid "Database Configuration"
 msgstr "機能設定"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
@@ -343,7 +344,7 @@ msgstr "%(nick)s を編集"
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
@@ -378,7 +379,7 @@ msgstr "メールサーバの設定を更新しました"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
@@ -476,7 +477,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -489,8 +490,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -685,7 +686,7 @@ msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "このメールアドレスで登録されたアカウントがあります"
@@ -767,7 +768,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -833,7 +834,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "ログイン"
 
@@ -910,7 +911,7 @@ msgid "Show Random Books"
 msgstr "ランダムで本を表示"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -948,7 +949,7 @@ msgstr "出版社選択を表示"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "言語"
 
@@ -1035,58 +1036,58 @@ msgstr "本が %(sname)s から削除されました"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "本棚を作成する"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "申し訳ありませんが、%(sname)s から本を削除することが許可されていません"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "本棚を編集する"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s を作成しました"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s を変更しました"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "エラーが発生しました"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' 内の本の順番を変更する"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "本棚: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
@@ -1167,14 +1168,14 @@ msgstr "カテゴリ: %(name)s"
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "詳細検索"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "検索"
 
@@ -1190,106 +1191,106 @@ msgstr ""
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index f2839dab3bcea9add0c05d64c436d5e871268fef..b85040b6dd652428607cfbe3964ac6f50e3e2449 100644
GIT binary patch
delta 28
kcmaE~pYhRt#tny5*o_qoEv<|!C!bXL%xJlJud1pQ0ISRj<p2Nx

delta 28
kcmaE~pYhRt#tny5*bNm7EUk>pCZAOK%xJNBud1pQ0IO~a-T(jq

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 983a9b034..8f7f70e98 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,7 +17,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -72,7 +72,8 @@ msgid "Edit Users"
 msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
@@ -274,7 +275,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -304,7 +305,7 @@ msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
@@ -348,7 +349,7 @@ msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -383,7 +384,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
@@ -481,7 +482,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -494,8 +495,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -532,7 +533,7 @@ msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុ
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -690,7 +691,7 @@ msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -771,7 +772,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -837,7 +838,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -914,7 +915,7 @@ msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
@@ -952,7 +953,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "ភាសានានា"
 
@@ -1039,58 +1040,58 @@ msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "កែប្រែធ្នើ"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "មានបញ្ហា"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
@@ -1171,14 +1172,14 @@ msgstr "ប្រភេទ៖ %(name)s"
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "ស្វែងរក"
 
@@ -1194,106 +1195,106 @@ msgstr ""
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 5f2aa6a7ca5260ca8eb7c72812a3dea3e863c486..8dc8d59d65c55e294a17bb834ad709984216b83a 100644
GIT binary patch
delta 29
kcmbQy%{-%<d4qHjyRm|yrInH8W~CxSMn=ocA;m610Em1Dwg3PC

delta 29
kcmbQy%{-%<d4qHjyP<-CrInG{W~CxSMn;RxA;m610Eid}uK)l5

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 8bbad4085..37e23246f 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -17,7 +17,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -72,7 +72,8 @@ msgid "Edit Users"
 msgstr "Systeembeheerder"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Alles"
 
@@ -274,7 +275,7 @@ msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsj
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "DB-instellingen niet opgeslagen"
 
@@ -304,7 +305,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
@@ -349,7 +350,7 @@ msgstr "Gebruiker '%(nick)s' bewerken"
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
@@ -384,7 +385,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
@@ -484,7 +485,7 @@ msgstr "niet geconfigureerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
@@ -497,8 +498,8 @@ msgstr "Het boekformaat is verwijderd"
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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"
 
@@ -535,7 +536,7 @@ msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
@@ -693,7 +694,7 @@ msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
@@ -775,7 +776,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -841,7 +842,7 @@ msgid "{} Stars"
 msgstr "{} sterren"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Inloggen"
 
@@ -918,7 +919,7 @@ msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -956,7 +957,7 @@ msgstr "Uitgeverskeuze tonen"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Talen"
 
@@ -1043,58 +1044,58 @@ msgstr "Het boek is verwijderd van boekenplank: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Boekenplank maken"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Je bent niet gemachtigd deze boekenplank aan te passen"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Pas een boekenplank aan"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank '%(title)s' aangemaakt"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank '%(title)s' is aangepast"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Er is een fout opgetreden"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, 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:312
+#: cps/shelf.py:311
 #, 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:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde van boekenplank veranderen: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
 
@@ -1175,14 +1176,14 @@ msgstr "Categorie: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1198,106 +1199,106 @@ msgstr "Beoordelingen"
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lees Status = %(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, 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:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 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:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index e796b117b354abef952f2b2adba88c5807a01c94..b6d4e65ef195d33fa66b94d8fde6e66bf4f3b496 100644
GIT binary patch
delta 29
lcmbO~i+TPm<_(vM*o_qoEv<|!H{UEuV`Q}4>`-z)0syCb3ljhU

delta 29
lcmbO~i+TPm<_(vM*bNm7EUk>pHs35tV`Q}0>`-z)0syBM3k(1N

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 1ecbe85fd..51c59e156 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -17,7 +17,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -73,7 +73,8 @@ msgstr "Edytuj użytkowników"
 
 # ???
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Wszystko"
 
@@ -274,7 +275,7 @@ msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Ustawienia Bazy Danych nie są zapisywalne"
 
@@ -303,7 +304,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
@@ -348,7 +349,7 @@ msgstr "Edytuj użytkownika %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
@@ -384,7 +385,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
@@ -485,7 +486,7 @@ msgstr "nie skonfigurowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, 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"
@@ -498,8 +499,8 @@ msgstr "Plik książki w wybranym formacie został usunięty"
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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"
 
@@ -536,7 +537,7 @@ msgstr "Nie udało się utworzyć łącza %(path)s (Odmowa dostępu)."
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
@@ -696,7 +697,7 @@ msgstr "Nie znaleziono pliku %(file)s na Google Drive"
 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:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 msgid "Found an existing account for this e-mail address"
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
@@ -778,7 +779,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -844,7 +845,7 @@ msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -921,7 +922,7 @@ msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -959,7 +960,7 @@ msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Języki"
 
@@ -1046,58 +1047,58 @@ msgstr "Książka została usunięta z półki: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Niestety nie możesz usunąć książki z tej półki %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Edytuj półkę"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, 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:312
+#: cps/shelf.py:311
 #, 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:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: „%(name)s”"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 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"
 
@@ -1178,14 +1179,14 @@ msgstr "Kategoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Szukaj"
 
@@ -1201,107 +1202,107 @@ msgstr "Lista z ocenami"
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Zadania"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status przeczytania = %(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 #, fuzzy
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, 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:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 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:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, 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:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 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:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index d1f3e9543f8b24643f5b6c6b618c471a21b8f442..f08ccf569a4417124062409bc30ed22345ace903 100644
GIT binary patch
delta 29
lcmZ4Yo@w2CrVX3Y*o_qoEv<|!H}6cdVPdr0{4HaL9{{&-3()`o

delta 29
lcmZ4Yo@w2CrVX3Y*bNm7EUk>pHt$TcVPdq{{4HaL9{{%u3(5ch

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index d2bcdb067..64bed06f7 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -13,7 +13,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -68,7 +68,8 @@ msgid "Edit Users"
 msgstr "Usuário Admin"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Todos"
 
@@ -272,7 +273,7 @@ msgstr "LDAP CACertificate, Certificados ou chave de localização não é váli
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "O banco de dados de configurações não é gravável"
 
@@ -302,7 +303,7 @@ msgstr "Atualização das configurações do servidor de e-mail"
 msgid "Database Configuration"
 msgstr "Configuração das Características"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
@@ -347,7 +348,7 @@ msgstr "Editar usuário %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Usuário '%(nick)s' atualizado"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
@@ -382,7 +383,7 @@ msgstr "Atualização das configurações do servidor de e-mail"
 msgid "Password for user %(user)s reset"
 msgstr "Senha para redefinição do usuário %(user)s"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
@@ -482,7 +483,7 @@ msgstr "não configurado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "A coluna personalizada No.%(column)d não existe no banco de dados do calibre"
@@ -495,8 +496,8 @@ msgstr "Formato do Livro Eliminado com Sucesso"
 msgid "Book Successfully Deleted"
 msgstr "Livro Eliminado com Sucesso"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oops! O título do livro seleccionado não está disponível. O arquivo não existe ou não é acessível"
 
@@ -533,7 +534,7 @@ msgstr "Falha ao criar o caminho %(path)s (Permission denied)."
 msgid "Failed to store file %(file)s."
 msgstr "Falha ao armazenar o arquivo %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
@@ -691,7 +692,7 @@ msgstr "Arquivo %(file)s não encontrado no Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrado uma conta existente para este endereço de e-mail."
@@ -773,7 +774,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -839,7 +840,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Login"
 
@@ -916,7 +917,7 @@ msgid "Show Random Books"
 msgstr "Mostrar Livros Aleatórios"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Categorias"
 
@@ -954,7 +955,7 @@ msgstr "Mostrar selecção de editores"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -1041,58 +1042,58 @@ msgstr "O livro foi removido da estante: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Crie uma estante"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Desculpe, você não tem permissão para remover um livro desta estante: %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Editar uma estante"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s criada"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s alterada"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Houve um erro"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Já existe uma estante pública com o nome '%(title)s' ."
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Já existe uma estante privada com o nome'%(title)s' ."
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Alterar ordem da Estante: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erro ao abrir estante. A estante não existe ou não está acessível"
 
@@ -1173,14 +1174,14 @@ msgstr "Categoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Pesquisa"
 
@@ -1196,106 +1197,106 @@ msgstr "Lista de classificações"
 msgid "File formats list"
 msgstr "Lista de formatos de arquivo"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Publicado depois de "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Avaliação <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Avaliação >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de leitura  = %(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ups! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail válido para Kindle."
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Nome de usuário ou senha incorretos"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "Nova senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Você agora está logado como: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s's"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Perfil atualizado"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 486bb167640bee2302692f973c18bafc68dabe86..c9e01aa727415d38b3f381d25a5ba2ac02b5982b 100644
GIT binary patch
delta 29
lcmX^1o$1(jrVW8X?8XX)mR3fVn<Ii;85u1%&kNSb006A_3QPb1

delta 29
lcmX^1o$1(jrVW8X?1l;kmR3e)n<Ii;85u1$&kNSb0069$3Pk__

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 0f75ad175..8801f2ac1 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,7 +17,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -72,7 +72,8 @@ msgid "Edit Users"
 msgstr "Управление сервером"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Все"
 
@@ -275,7 +276,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -305,7 +306,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
@@ -350,7 +351,7 @@ msgstr "Изменить пользователя %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
@@ -385,7 +386,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
@@ -485,7 +486,7 @@ msgstr "не настроено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -498,8 +499,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
@@ -536,7 +537,7 @@ msgstr "Ошибка при создании пути %(path)s (Доступ з
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -694,7 +695,7 @@ msgstr "Файл %(file)s не найден на Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Этот адрес электронной почты уже зарегистрирован."
@@ -776,7 +777,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -842,7 +843,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Логин"
 
@@ -919,7 +920,7 @@ msgid "Show Random Books"
 msgstr "Показывать Случайные Книги"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Категории"
 
@@ -957,7 +958,7 @@ msgstr "Показать выбор издателя"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Языки"
 
@@ -1044,58 +1045,58 @@ msgstr "Книга удалена с полки: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Создать полку"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Извините, вы не можете удалить книгу с полки: %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Изменить полку"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана полка %(title)s"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Колка %(title)s изменена"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Публичная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Приватная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение полки '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Полка: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
@@ -1176,14 +1177,14 @@ msgstr "Категория: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Поиск"
 
@@ -1199,106 +1200,106 @@ msgstr "Список рейтингов"
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 8ff534943f8db1930a76678cc9d64a3ba819f6be..bcc70e3b1748b341296777a03c40c681dd90da56 100644
GIT binary patch
delta 29
lcmccim+9JHrVXM6?8XX)mR3fVn`H`A85u1%I~7jx1purP3NHWv

delta 29
lcmccim+9JHrVXM6?1l;kmR3e)n`H`A85u1$I~7jx1puqA3Mc>o

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 713896761..9f5a6a412 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -70,7 +70,8 @@ msgid "Edit Users"
 msgstr "Redigera användare"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Alla"
 
@@ -272,7 +273,7 @@ msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänlige
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Inställningar för DB är inte skrivbara"
 
@@ -302,7 +303,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
@@ -346,7 +347,7 @@ msgstr "Redigera användaren %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
@@ -382,7 +383,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
@@ -482,7 +483,7 @@ msgstr "inte konfigurerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
@@ -495,8 +496,8 @@ msgstr "Bokformat har tagits bort"
 msgid "Book Successfully Deleted"
 msgstr "Boken har tagits bort"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 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"
 
@@ -533,7 +534,7 @@ msgstr "Det gick inte att skapa sökväg %(path)s (behörighet nekad)."
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Databasfel: %(error)s."
@@ -691,7 +692,7 @@ msgstr "Filen %(file)s hittades inte på Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 msgid "Found an existing account for this e-mail address"
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
@@ -772,7 +773,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -838,7 +839,7 @@ msgid "{} Stars"
 msgstr "{} stjärnor"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Logga in"
 
@@ -915,7 +916,7 @@ msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -953,7 +954,7 @@ msgstr "Visa urval av förlag"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Språk"
 
@@ -1040,58 +1041,58 @@ msgstr "Boken har tagits bort från hyllan: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Skapa en hylla"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Tyvärr har du inte rätt att ta bort en bok från den här hyllan: %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Redigera en hylla"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hyllan %(title)s skapad"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hyllan %(title)s ändrad"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Det fanns ett fel"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "En offentlig hylla med namnet \"%(title)s\" finns redan."
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "En privat hylla med namnet \"%(title)s\" finns redan."
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Ändra ordning på hyllan: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylla: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 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"
 
@@ -1172,14 +1173,14 @@ msgstr "Kategori: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Sök"
 
@@ -1195,106 +1196,106 @@ msgstr "Betygslista"
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lässtatus = %(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, 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:1473
+#: cps/web.py:1468
 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:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 4b905164648eeecf104d145134af46c3b7e3e36f..5c8bf24905e2de521ca9a7a8a5b74016a6790148 100644
GIT binary patch
delta 29
lcmaE`iSfZE#tr-??8XX)mR3fVo5f5785u1%YnWQ7005K22si)$

delta 29
lcmaE`iSfZE#tr-??1l;kmR3e)o5f5785u1$YnWQ7005I;2r&Qv

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 6abf48bb5..71dd6a59a 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -70,7 +70,8 @@ msgid "Edit Users"
 msgstr ""
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "Tümü"
 
@@ -269,7 +270,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
@@ -344,7 +345,7 @@ msgstr "%(nick)s kullanıcısını düzenle"
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
@@ -379,7 +380,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
@@ -478,7 +479,7 @@ msgstr "ayarlanmadı"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -491,8 +492,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -529,7 +530,7 @@ msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -687,7 +688,7 @@ msgstr "%(file)s dosyası Google Drive'da bulunamadı"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bu e-posta adresi için bir hesap mevcut."
@@ -769,7 +770,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -835,7 +836,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Giriş"
 
@@ -912,7 +913,7 @@ msgid "Show Random Books"
 msgstr "Rastgele Kitap Göster"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -950,7 +951,7 @@ msgstr "Yayıncı seçimini göster"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Diller"
 
@@ -1037,58 +1038,58 @@ msgstr "eKitap kitaplıktan silindi: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "Kitaplık oluştur"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Maalesef bu kitaplıktan eKitap silmenize izin verilmiyor: %(sname)s"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Kitaplığı düzenle"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s kitaplığı oluşturuldu."
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s kitaplığı değiştirildi"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Bir hata oluştu"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Kitaplık: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 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"
 
@@ -1169,14 +1170,14 @@ msgstr "Kategori: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Ara"
 
@@ -1192,106 +1193,106 @@ msgstr "Değerlendirme listesi"
 msgid "File formats list"
 msgstr "Biçim listesi"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "Görevler"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, 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:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 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/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 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:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 15e812be21cbf44387e0065234e619427ec50254..548354ee56f661f107269a1cdadd51637ed35d36 100644
GIT binary patch
delta 29
lcmaFU!}z9$al=A+c4GxYODiMG%`4<n85u1%^C`xu0sx_12}=L~

delta 29
lcmaFU!}z9$al=A+c0&aNODiL@%`4<n85u1$^C`xu0sx@-2}A$@

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 40684c5c0..81f32fc81 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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+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,7 +15,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -70,7 +70,8 @@ msgid "Edit Users"
 msgstr "Керування сервером"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
@@ -272,7 +273,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -302,7 +303,7 @@ msgstr "З'єднання з базою даних закрите"
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
@@ -346,7 +347,7 @@ msgstr "Змінити користувача %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -381,7 +382,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
@@ -479,7 +480,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -492,8 +493,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
@@ -530,7 +531,7 @@ msgstr ""
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -688,7 +689,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -769,7 +770,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -835,7 +836,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -912,7 +913,7 @@ msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "Категорії"
 
@@ -950,7 +951,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "Мови"
 
@@ -1037,58 +1038,58 @@ msgstr "Книга видалена з книжкової полиці: %(sname)
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "створити книжкову полицю"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 #, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "Змінити книжкову полицю"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Створена книжкова полиця %(title)s"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжкова полиця %(title)s змінена"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "Сталась помилка"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Змінити розташування книжкової полиці '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжкова полиця: '%(name)s'"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
@@ -1169,14 +1170,14 @@ msgstr "Категорія: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "Пошук"
 
@@ -1192,106 +1193,106 @@ msgstr ""
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index bdf51f02dd11171eff9799ba12c81b94facdd645..68c4f8e70b30fc4186edd49a73bf732f79810a61 100644
GIT binary patch
delta 29
lcmeDC!_@bOX~U#)c4GxYODiMG%`?l@85u1%AFS|o1puz-3f=$!

delta 29
lcmeDC!_@bOX~U#)c0&aNODiL@%`?l@85u1$AFS|o1puyu3fBMt

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index f8643957a..da32d2cb8 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -70,7 +70,8 @@ msgid "Edit Users"
 msgstr "管理用户"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
@@ -268,7 +269,7 @@ msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写入"
 
@@ -297,7 +298,7 @@ msgstr "邮件服务器设置已更新"
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
@@ -341,7 +342,7 @@ msgstr "编辑用户 %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
@@ -376,7 +377,7 @@ msgstr "邮件服务器设置已更新"
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
@@ -475,7 +476,7 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
@@ -488,8 +489,8 @@ msgstr "书籍格式已成功删除"
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
@@ -526,7 +527,7 @@ msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
@@ -684,7 +685,7 @@ msgstr "Google Drive上找不到文件 %(file)s"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
@@ -765,7 +766,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -831,7 +832,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "登录"
 
@@ -908,7 +909,7 @@ msgid "Show Random Books"
 msgstr "显示随机书籍"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "分类"
 
@@ -946,7 +947,7 @@ msgstr "显示出版社选择"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "语言"
 
@@ -1032,57 +1033,57 @@ msgstr "此书已从书架 %(sname)s 中删除"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "创建书架"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "对不起，您没有编辑这个书架的权限"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已创建"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已修改"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架：%(name)s"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
@@ -1163,14 +1164,14 @@ msgstr "分类：%(name)s"
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "高级搜索"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "搜索"
 
@@ -1186,106 +1187,106 @@ msgstr "评分列表"
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "资料已更新"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 037dec2313027c16e82f0fc031cb4f246d1e1719..324e990bdac690c75208d4558db1c608c8c531cd 100644
GIT binary patch
delta 29
lcmcckkLlt+rVT0;?8XX)mR3fVo3$&{85u1%2Uq@c1pu#A3eo@o

delta 29
lcmcckkLlt+rVT0;?1l;kmR3e)o3$&{85u1$2Uq@c1puz`3d;Zh

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 32d7baa25..fd59f532e 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -70,7 +70,8 @@ msgid "Edit Users"
 msgstr "管理用戶"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
@@ -268,7 +269,7 @@ msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "設置數據庫不可寫入"
 
@@ -297,7 +298,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
@@ -341,7 +342,7 @@ msgstr "編輯用戶 %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "用戶“%(nick)s”已更新"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
@@ -376,7 +377,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
@@ -475,7 +476,7 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
@@ -488,8 +489,8 @@ msgstr "書籍格式已成功刪除"
 msgid "Book Successfully Deleted"
 msgstr "書籍已成功刪除"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
@@ -526,7 +527,7 @@ msgstr "創建路徑 %(path)s 失敗(權限拒絕)。"
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失敗。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
@@ -684,7 +685,7 @@ msgstr "Google Drive上找不到文件 %(file)s"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此郵箱的賬號已經存在。"
 
@@ -765,7 +766,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -831,7 +832,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "登入"
 
@@ -908,7 +909,7 @@ msgid "Show Random Books"
 msgstr "隨機顯示書籍"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr "分類"
 
@@ -946,7 +947,7 @@ msgstr "顯示出版社選擇"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr "語言"
 
@@ -1032,57 +1033,57 @@ msgstr "此書已從書架 %(sname)s 中刪除"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr "創建書架"
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "對不起，您沒有編輯這個書架的權限"
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr "編輯書架"
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "書架 %(title)s 已創建"
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "書架 %(title)s 已修改"
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr "發生錯誤"
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共書架：%(title)s已經存在已經存在。"
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有書架：%(title)s已經存在。"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改書架 %(name)s 順序"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "書架：%(name)s"
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打開書架出錯。書架不存在或不可訪問"
 
@@ -1163,14 +1164,14 @@ msgstr "分類：%(name)s"
 msgid "Language: %(name)s"
 msgstr "語言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr "搜尋"
 
@@ -1186,106 +1187,106 @@ msgstr "評分列表"
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "任務列表"
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr "出版時間晚於 "
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr "出版時間早於 "
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評分 <= %(rating)s"
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評分 >= %(rating)s"
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "閱讀狀態 = %(status)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”登入"
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr "資料已更新"
 
diff --git a/cps/ub.py b/cps/ub.py
index 405b0865a..6b3c27ca5 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -300,11 +300,11 @@ class Anonymous(AnonymousUserMixin, UserBase):
         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
+        if not 'view' in flask_session:
+            flask_session['view'] = dict()
+        if not flask_session['view'].get(page):
+            flask_session['view'][page] = dict()
+        flask_session['view'][page][prop] = value
 
 class User_Sessions(Base):
     __tablename__ = 'user_session'
diff --git a/messages.pot b/messages.pot
index ad2d6482b..489258860 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-21 09:26+0100\n"
+"POT-Creation-Date: 2021-11-23 19:29+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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -69,7 +69,8 @@ msgid "Edit Users"
 msgstr ""
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/list.html:13
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
@@ -267,7 +268,7 @@ msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
 #: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:336 cps/shelf.py:371 cps/shelf.py:446
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1340 cps/web.py:1497
+#: cps/admin.py:1340 cps/web.py:1492
 msgid "Please fill out all fields!"
 msgstr ""
 
@@ -339,7 +340,7 @@ msgstr ""
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1522 cps/web.py:1585
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -374,7 +375,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1462
+#: cps/admin.py:1613 cps/web.py:1457
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
@@ -472,7 +473,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1173
+#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -485,8 +486,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1724
-#: cps/web.py:1765 cps/web.py:1832
+#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -523,7 +524,7 @@ msgstr ""
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1685
+#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -681,7 +682,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1680
+#: cps/helper.py:507 cps/web.py:1675
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -762,7 +763,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1556
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -828,7 +829,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1605
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr ""
 
@@ -905,7 +906,7 @@ msgid "Show Random Books"
 msgstr ""
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1060
+#: cps/templates/index.xml:83 cps/web.py:1055
 msgid "Categories"
 msgstr ""
 
@@ -943,7 +944,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1037
+#: cps/web.py:1032
 msgid "Languages"
 msgstr ""
 
@@ -1029,57 +1030,57 @@ msgstr ""
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:232 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:142
 msgid "Create a Shelf"
 msgstr ""
 
-#: cps/shelf.py:241
+#: cps/shelf.py:237
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr ""
 
-#: cps/shelf.py:243
+#: cps/shelf.py:239
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/shelf.py:262
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:261
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/shelf.py:265
+#: cps/shelf.py:264
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/shelf.py:279
+#: cps/shelf.py:278
 msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:301
+#: cps/shelf.py:300
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:312
+#: cps/shelf.py:311
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:381
+#: cps/shelf.py:380
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:451
+#: cps/shelf.py:450
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:455
+#: cps/shelf.py:454
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
@@ -1160,14 +1161,14 @@ msgstr ""
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1389
+#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
 msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1095
+#: cps/web.py:755 cps/web.py:1090
 msgid "Search"
 msgstr ""
 
@@ -1183,106 +1184,106 @@ msgstr ""
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1074
+#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1233
+#: cps/web.py:1228
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1240
+#: cps/web.py:1235
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1262
+#: cps/web.py:1257
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1264
+#: cps/web.py:1259
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1266
+#: cps/web.py:1261
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1366
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1467
+#: cps/web.py:1462
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1466
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1473
+#: cps/web.py:1468
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1490
+#: cps/web.py:1485
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1491
-#: cps/web.py:1498 cps/web.py:1504 cps/web.py:1523 cps/web.py:1527
-#: cps/web.py:1533
+#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
+#: cps/web.py:1528
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1525
+#: cps/web.py:1520
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1528
+#: cps/web.py:1523
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1545
+#: cps/web.py:1540
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1564
+#: cps/web.py:1559
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1570
+#: cps/web.py:1565
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1574 cps/web.py:1599
+#: cps/web.py:1569 cps/web.py:1594
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1581
+#: cps/web.py:1576
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1587
+#: cps/web.py:1582
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1594
+#: cps/web.py:1589
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1660 cps/web.py:1709
+#: cps/web.py:1655 cps/web.py:1704
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1676
+#: cps/web.py:1671
 msgid "Profile updated"
 msgstr ""
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 95505cc4d..55c6bf1ea 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2021-11-21 07:25:47</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-11-22 21:51: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>Stop Time: </strong>2021-11-21 10:30:41</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-11-23 01:35:04</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 25 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 2 min</p>
         </div>
       </div>
       </div>
@@ -215,28 +215,35 @@
     
     
     
-        <tr id="et1.12" class="none bg-info">
+        <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="et1.13" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.12')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.13')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et1.12" class="popup_window test_output" style="display:block;">
+                <div id="div_et1.13" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.12').style.display='none'"><span
+                                onclick="document.getElementById('div_et1.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 315, in test_guest_restricted_settings_visibility
-    rights = self.get_user_settings(&#39;Guest&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 800, in get_user_settings
-    user_settings[&#39;upload_role&#39;] = int(self.check_element_on_page((By.ID, &#34;upload_role&#34;)).is_selected())
-AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 143, in test_guest_visibility_sidebar
+    self.assertFtest_edit_languagealse(self.check_element_on_page((By.ID, &#34;nav_rand&#34;)))
+AttributeError: &#39;TestAnonymous&#39; object has no attribute &#39;assertFtest_edit_languagealse&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -245,15 +252,6 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
         </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="passClass">
@@ -378,19 +376,28 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
 
     <tr id="su" class="passClass">
         <td>TestCoverEditBooks</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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('c4', 1)">Detail</a>
+            <a onclick="showClassDetail('c4', 2)">Detail</a>
         </td>
     </tr>
 
     
     
         <tr id='pt4.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCoverEditBooks - test_invalid_jpg_hdd</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt4.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
@@ -897,8 +904,8 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     <tr id="su" class="failClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
-        <td class="text-center">30</td>
-        <td class="text-center">4</td>
+        <td class="text-center">33</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -926,35 +933,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id="ft11.3" class="none bg-danger">
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 338, in test_edit_category
-    self.assertEqual(u&#39;gênot&#39;, values[&#39;tag&#39;][0])
-AssertionError: &#39;gênot&#39; != &#39;Gênot&#39;
-- gênot
-? ^
-+ Gênot
-? ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1058,35 +1041,11 @@ AssertionError: &#39;gênot&#39; != &#39;Gênot&#39;
     
     
     
-        <tr id="ft11.15" class="none bg-danger">
+        <tr id='pt11.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.15')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 380, in test_edit_publisher
-    self.assertEqual(u&#39;Gênot&#39;, values[&#39;publisher&#39;][0])
-AssertionError: &#39;Gênot&#39; != &#39;gênot&#39;
-- Gênot
-? ^
-+ gênot
-? ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1109,35 +1068,11 @@ AssertionError: &#39;Gênot&#39; != &#39;gênot&#39;
     
     
     
-        <tr id="ft11.18" class="none bg-danger">
+        <tr id='pt11.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 274, in test_edit_series
-    self.assertEqual(u&#39;Loko&#39;, values[&#39;series&#39;])
-AssertionError: &#39;Loko&#39; != &#39;loko&#39;
-- Loko
-? ^
-+ loko
-? ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1320,7 +1255,7 @@ AssertionError: &#39;Loko&#39; != &#39;loko&#39;
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 781, in test_upload_cover_hdd
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 783, in test_upload_cover_hdd
     self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
 AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
@@ -1333,15 +1268,15 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksList</td>
-        <td class="text-center">10</td>
-        <td class="text-center">8</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</td>
+        <td class="text-center">18</td>
+        <td class="text-center">18</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', 10)">Detail</a>
+            <a onclick="showClassDetail('c12', 18)">Detail</a>
         </td>
     </tr>
 
@@ -1367,7 +1302,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
         <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1376,7 +1311,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
         <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1385,7 +1320,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
         <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1394,7 +1329,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
         <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1403,7 +1338,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
         <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1411,6 +1346,78 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
     
         <tr id='pt12.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1419,74 +1426,20 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
     
     
-        <tr id="et12.9" class="none bg-info">
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 333, in test_restricted_rights
-    self.edit_user(&#39;admin&#39;, {&#39;delete_role&#39;: 1, &#39;edit_role&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 701, in edit_user
-    return cls.change_user(element, abort)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1008, in change_user
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;delete_role&#34; name=&#34;delete_role&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft12.10" class="none bg-danger">
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft12.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft12.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 51, in test_search_books_list
-    bl = self.check_search(bl, &#34;genot&#34;, 4, &#34;Categories&#34;, &#34;Gênot&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 43, in check_search
-    self.assertEqual(count, len(bl[&#39;table&#39;]))
-AssertionError: 4 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1495,8 +1448,8 @@ AssertionError: 4 != 1</pre>
     <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">15</td>
-        <td class="text-center">5</td>
+        <td class="text-center">18</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1524,35 +1477,11 @@ AssertionError: 4 != 1</pre>
     
     
     
-        <tr id="ft13.3" class="none bg-danger">
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 508, in test_edit_category
-    self.assertEqual(u&#39;gênot&#39;, values[&#39;tag&#39;][0])
-AssertionError: &#39;gênot&#39; != &#39;Gênot&#39;
-- gênot
-? ^
-+ Gênot
-? ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1638,35 +1567,11 @@ AssertionError: &#39;gênot&#39; != &#39;Gênot&#39;
     
     
     
-        <tr id="ft13.13" class="none bg-danger">
+        <tr id='pt13.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 567, in test_edit_publisher
-    self.assertEqual(u&#39;Gênot&#39;, values[&#39;publisher&#39;][0])
-AssertionError: &#39;Gênot&#39; != &#39;gênot&#39;
-- Gênot
-? ^
-+ gênot
-? ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1680,35 +1585,11 @@ AssertionError: &#39;Gênot&#39; != &#39;gênot&#39;
     
     
     
-        <tr id="ft13.15" class="none bg-danger">
+        <tr id='pt13.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.15')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 448, in test_edit_series
-    self.assertEqual(u&#39;Loko&#39;, values[&#39;series&#39;])
-AssertionError: &#39;Loko&#39; != &#39;loko&#39;
-- Loko
-? ^
-+ loko
-? ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1788,7 +1669,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 928, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=fe811995-f72a-4fbc-b4f7-f4b9d32fb6c8&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=a92e572d-f9d5-45d0-a088-9751aaed41ca&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1967,15 +1848,15 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="passClass">
         <td>TestFilePicker</td>
-        <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 3)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
@@ -1989,41 +1870,6 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         </tr>
     
     
-    
-        <tr id="st18.2" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st18.2')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st18.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_st18.2').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.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestFilePicker - test_two_filepickers</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
 
 
     <tr id="su" class="passClass">
@@ -2092,12 +1938,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">10</td>
-        <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">10</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', 10)">Detail</a>
@@ -2124,91 +1970,29 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="et21.3" class="none bg-info">
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et21.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et21.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 621, in test_kobo_sync_selected_shelfs
-    user_settings = self.get_user_settings(&#39;kobosync&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 800, in get_user_settings
-    user_settings[&#39;upload_role&#39;] = int(self.check_element_on_page((By.ID, &#34;upload_role&#34;)).is_selected())
-AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.4" class="none bg-danger">
+        <tr id='pt21.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 480, in test_shelves_add_remove_books
-    self.assertEqual(1, len(books))
-AssertionError: 1 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.5" class="none bg-danger">
+        <tr id='pt21.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.5').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 285, in test_sync_changed_book
-    self.assertEqual(1, len(data))
-AssertionError: 1 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2231,31 +2015,11 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id="ft21.8" class="none bg-danger">
+        <tr id='pt21.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 303, in test_sync_shelf
-    self.assertEqual(1, len(data))
-AssertionError: 1 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2269,42 +2033,22 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id="ft21.10" class="none bg-danger">
+        <tr id='pt21.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 269, in test_sync_upload
-    self.assertEqual(1, len(data))
-AssertionError: 1 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">4</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</td>
+        <td class="text-center">4</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', 4)">Detail</a>
@@ -2313,62 +2057,20 @@ AssertionError: 1 != 0</pre>
 
     
     
-        <tr id="et22.1" class="none bg-info">
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et22.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et22.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 281, in test_kobo_sync_selected_shelfs
-    user_settings = self.get_user_settings(&#39;kobosync&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 800, in get_user_settings
-    user_settings[&#39;upload_role&#39;] = int(self.check_element_on_page((By.ID, &#34;upload_role&#34;)).is_selected())
-AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et22.2" class="none bg-info">
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et22.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et22.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 185, in test_sync_changed_book
-    self.assertTrue(&#39;ChangedEntitlement&#39; in data[0][0])
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2382,42 +2084,22 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="ft22.4" class="none bg-danger">
+        <tr id='pt22.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 200, in test_sync_shelf
-    self.assertEqual(1, len(data[0]))
-AssertionError: 1 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">11</td>
+        <td class="text-center">13</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c23', 13)">Detail</a>
@@ -2462,72 +2144,20 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id="et23.5" class="none bg-info">
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et23.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et23.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 341, in test_LDAP_import
-    self.fill_view_config({&#39;show_16384&#39;: 0,&#39;show_2&#39;: 0,&#39;show_16&#39;: 0, &#39;show_8192&#39;: 0, &#39;show_256&#39;: 0,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 393, in fill_view_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;delete_role&#34; name=&#34;delete_role&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et23.6" class="none bg-info">
+        <tr id='pt23.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et23.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et23.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 316, in test_LDAP_import_memberfield
-    User1rights = self.get_user_settings(&#39;user12&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 800, in get_user_settings
-    user_settings[&#39;upload_role&#39;] = int(self.check_element_on_page((By.ID, &#34;upload_role&#34;)).is_selected())
-AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2596,15 +2226,15 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
 
 
-    <tr id="su" class="skipClass">
-        <td>TestLogging</td>
-        <td class="text-center">9</td>
+    <tr id="su" class="passClass">
+        <td>TestCalibreWebListOrders</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('c24', 9)">Detail</a>
+            <a onclick="showClassDetail('c24', 8)">Detail</a>
         </td>
     </tr>
 
@@ -2612,7 +2242,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
         <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLogging - test_access_log_recover</div>
+                <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2621,7 +2251,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
         <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLogging - test_debug_log</div>
+                <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2630,7 +2260,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
         <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLogging - test_debuginfo_download</div>
+                <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2638,6 +2268,93 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
         <tr id='pt24.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestLogging</td>
+        <td class="text-center">9</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">
+            <a onclick="showClassDetail('c25', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt25.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='pt25.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='pt25.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_debuginfo_download</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2646,19 +2363,19 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id="st24.5" class="none bg-warning">
+        <tr id="st25.5" 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_st24.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st25.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st24.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st25.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_st24.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st25.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2672,7 +2389,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2681,7 +2398,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2690,7 +2407,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2699,7 +2416,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt24.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2717,13 +2434,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 15)">Detail</a>
+            <a onclick="showClassDetail('c26', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2732,7 +2449,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2741,7 +2458,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2750,7 +2467,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2759,7 +2476,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2768,7 +2485,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2777,7 +2494,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2786,7 +2503,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2795,7 +2512,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2804,7 +2521,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2813,7 +2530,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2822,7 +2539,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.12' class='hiddenRow bg-success'>
+        <tr id='pt26.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2831,7 +2548,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.13' class='hiddenRow bg-success'>
+        <tr id='pt26.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2840,7 +2557,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.14' class='hiddenRow bg-success'>
+        <tr id='pt26.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2849,7 +2566,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
     
     
-        <tr id='pt25.15' class='hiddenRow bg-success'>
+        <tr id='pt26.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2859,50 +2576,30 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;is_selected&#39;</pr
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestMergeBooksList</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
+        <td class="text-center">2</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('c26', 2)">Detail</a>
+            <a onclick="showClassDetail('c27', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et26.1" class="none bg-info">
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 54, in test_delete_book
-    bl[&#39;table&#39;][0][&#39;Delete&#39;][&#39;element&#39;].click()
-KeyError: &#39;Delete&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_merge_book</div>
             </td>
@@ -2920,13 +2617,13 @@ KeyError: &#39;Delete&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 2)">Detail</a>
+            <a onclick="showClassDetail('c28', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2935,7 +2632,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2953,13 +2650,13 @@ KeyError: &#39;Delete&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 23)">Detail</a>
+            <a onclick="showClassDetail('c29', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2968,7 +2665,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2977,7 +2674,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2986,7 +2683,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2995,7 +2692,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3004,7 +2701,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3013,7 +2710,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3022,7 +2719,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3031,7 +2728,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3040,7 +2737,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3049,7 +2746,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt29.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3058,7 +2755,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt29.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3067,7 +2764,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt29.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3076,7 +2773,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.14' class='hiddenRow bg-success'>
+        <tr id='pt29.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3085,7 +2782,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.15' class='hiddenRow bg-success'>
+        <tr id='pt29.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3094,7 +2791,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.16' class='hiddenRow bg-success'>
+        <tr id='pt29.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3103,7 +2800,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.17' class='hiddenRow bg-success'>
+        <tr id='pt29.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3112,7 +2809,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.18' class='hiddenRow bg-success'>
+        <tr id='pt29.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3121,7 +2818,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.19' class='hiddenRow bg-success'>
+        <tr id='pt29.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3130,7 +2827,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.20' class='hiddenRow bg-success'>
+        <tr id='pt29.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3139,7 +2836,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.21' class='hiddenRow bg-success'>
+        <tr id='pt29.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3148,7 +2845,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.22' class='hiddenRow bg-success'>
+        <tr id='pt29.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3157,7 +2854,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt28.23' class='hiddenRow bg-success'>
+        <tr id='pt29.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3175,13 +2872,13 @@ KeyError: &#39;Delete&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 1)">Detail</a>
+            <a onclick="showClassDetail('c30', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3199,13 +2896,13 @@ KeyError: &#39;Delete&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 5)">Detail</a>
+            <a onclick="showClassDetail('c31', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3214,7 +2911,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3223,7 +2920,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3232,7 +2929,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3241,7 +2938,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3259,13 +2956,13 @@ KeyError: &#39;Delete&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 8)">Detail</a>
+            <a onclick="showClassDetail('c32', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3274,7 +2971,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3283,7 +2980,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3292,7 +2989,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt32.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3301,7 +2998,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3310,7 +3007,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt32.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3319,7 +3016,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt32.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3328,7 +3025,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt32.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3346,13 +3043,13 @@ KeyError: &#39;Delete&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 3)">Detail</a>
+            <a onclick="showClassDetail('c33', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3361,7 +3058,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3370,7 +3067,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3382,19 +3079,19 @@ KeyError: &#39;Delete&#39;</pre>
 
     <tr id="su" class="skipClass">
         <td>TestShelf</td>
+        <td class="text-center">14</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('c33', 13)">Detail</a>
+            <a onclick="showClassDetail('c34', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3403,7 +3100,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3412,7 +3109,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3421,7 +3118,16 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_create_public_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3430,7 +3136,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3439,7 +3145,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3448,7 +3154,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3457,7 +3163,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3466,7 +3172,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id='pt34.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3475,7 +3181,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.10' class='hiddenRow bg-success'>
+        <tr id='pt34.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3484,19 +3190,19 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id="st33.11" class="none bg-warning">
+        <tr id="st34.12" 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_st33.11')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st34.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st33.11" class="popup_window test_output" style="display:none;">
+                <div id="div_st34.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_st33.11').style.display='none'"><span
+                                onclick="document.getElementById('div_st34.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3510,7 +3216,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id='pt34.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3519,7 +3225,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id='pt34.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3537,13 +3243,13 @@ KeyError: &#39;Delete&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 9)">Detail</a>
+            <a onclick="showClassDetail('c35', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3552,7 +3258,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3561,7 +3267,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3570,7 +3276,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3579,7 +3285,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3588,7 +3294,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt35.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3597,19 +3303,19 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id="st34.7" class="none bg-warning">
+        <tr id="st35.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_st34.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st35.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st34.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st35.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_st34.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st35.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3623,7 +3329,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt35.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3632,7 +3338,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt35.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3650,13 +3356,13 @@ KeyError: &#39;Delete&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 2)">Detail</a>
+            <a onclick="showClassDetail('c36', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3665,7 +3371,7 @@ KeyError: &#39;Delete&#39;</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3675,1824 +3381,178 @@ KeyError: &#39;Delete&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">18</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('c36', 18)">Detail</a>
+            <a onclick="showClassDetail('c37', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et36.1" class="none bg-info">
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e82197f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 814, in test_edit_user_email
-    self.edit_user(&#34;no_one&#34;, {&#39;email&#39;: &#34; low@de.de &#34;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 700, in edit_user
-    if cls.navigate_to_user(name):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 707, in navigate_to_user
-    user = cls.driver.find_elements_by_xpath(&#34;//table[@id=&#39;table_user&#39;]/tbody/tr/td/a&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e82197f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.2" class="none bg-info">
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e8472ca0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 159, in test_list_visibility
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8472ca0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.3" class="none bg-info">
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e84725e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 426, in test_user_list_admin_role
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e84725e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.4" class="none bg-info">
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e8219760&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 608, in test_user_list_check_sort
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8219760&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.5" class="none bg-info">
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e841d5b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 358, in test_user_list_denied_tags
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1344, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 333, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e841d5b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.6" class="none bg-info">
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e9a3d550&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 454, in test_user_list_download_role
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e9a3d550&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.7" class="none bg-info">
+        <tr id='pt37.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e87534c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 148, in test_user_list_edit_button
-    ul = self.get_user_table(2)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1820, in get_user_table
-    if not self.goto_list_page(page):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1734, in goto_list_page
-    pages = self.driver.find_elements_by_class_name(&#34;page-item&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 580, in find_elements_by_class_name
-    return self.find_elements(by=By.CLASS_NAME, value=name)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e87534c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.8" class="none bg-info">
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00eabc3520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 234, in test_user_list_edit_email
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00eabc3520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.9" class="none bg-info">
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e9a602b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 260, in test_user_list_edit_kindle
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e9a602b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.10" class="none bg-info">
+        <tr id='pt37.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e9a15ee0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 322, in test_user_list_edit_language
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e9a15ee0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.11" class="none bg-info">
+        <tr id='pt37.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e9a6bee0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 277, in test_user_list_edit_locale
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e9a6bee0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.12" class="none bg-info">
+        <tr id='pt37.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00eabd4fa0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 211, in test_user_list_edit_name
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00eabd4fa0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.13" class="none bg-info">
+        <tr id='pt37.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e8721d00&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 494, in test_user_list_edit_visiblility
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8721d00&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.14" class="none bg-info">
+        <tr id='pt37.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e99f7fd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 584, in test_user_list_guest_edit
-    self.fill_basic_config({&#39;config_anonbrowse&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 344, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 254, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 71, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in __call__
-    return _find_element(driver, self.locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 411, in _find_element
-    return driver.find_element(*by)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e99f7fd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.15" class="none bg-info">
+        <tr id='pt37.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e85f2760&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 442, in test_user_list_remove_admin
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e85f2760&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.16" class="none bg-info">
+        <tr id='pt37.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e8402520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/adapters.py&#34;, line 439, in send
-    resp = conn.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=8083): Max retries exceeded with url: /login (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8402520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 631, in test_user_list_requests
-    login_page = r.get(&#39;http://127.0.0.1:8083/login&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/sessions.py&#34;, line 543, in get
-    return self.request(&#39;GET&#39;, url, **kwargs)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/sessions.py&#34;, line 530, in request
-    resp = self.send(prep, **send_kwargs)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/sessions.py&#34;, line 643, in send
-    r = adapter.send(request, **kwargs)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/requests/adapters.py&#34;, line 516, in send
-    raise ConnectionError(e, request=request)
-requests.exceptions.ConnectionError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=8083): Max retries exceeded with url: /login (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e8402520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.17" class="none bg-info">
+        <tr id='pt37.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e97fa460&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 537, in test_user_list_search
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e97fa460&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et36.18" class="none bg-info">
+        <tr id='pt37.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e85415b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 545, in test_user_list_sort
-    ul = self.get_user_table(1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_user_table
-    header = self.driver.find_elements_by_xpath(&#34;//table[@id=&#39;user-table&#39;]/thead/tr/th&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/elements (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e85415b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</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('c37', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et37.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_user_list)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e99f8610&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 63, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 432, in stop_calibre_web
-    cls.driver.find_element_by_id(&#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e99f8610&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 159, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 84, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 670, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1252, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1298, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1247, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1007, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 947, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 187, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f00e98644c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 65, in tearDownClass
-    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 333, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 79, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 754, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 726, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 446, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, port=57731): Max retries exceeded with url: /session/69ee205e-eb5a-45d8-b1b9-00e932e872cc/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f00e98644c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -6207,11 +4267,11 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, p
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>361</td>
-        <td>312</td>
-        <td>15</td>
-        <td>27</td>
-        <td>7</td>
+        <td>376</td>
+        <td>366</td>
+        <td>3</td>
+        <td>1</td>
+        <td>6</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -6287,7 +4347,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, p
           
             <tr>
               <th>Flask-WTF</th>
-              <td>0.15.1</td>
+              <td>1.0.0</td>
               <td>Basic</td>
             </tr>
           
@@ -6335,7 +4395,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, p
           
             <tr>
               <th>PyPDF3</th>
-              <td>1.0.3</td>
+              <td>1.0.5</td>
               <td>Basic</td>
             </tr>
           
@@ -6617,7 +4677,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;127.0.0.1&#39;, p
 </div>
 
 <script>
-    drawCircle(312, 15, 27, 7);
+    drawCircle(366, 3, 1, 6);
     showCase(5);
 </script>
 

From ec7c2db9712a0598474e854a13746088700522a7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Nov 2021 12:26:28 +0100
Subject: [PATCH 039/412] Added package variable for generating "exe" file with
 pyinstaller

---
 cps/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cps/__init__.py b/cps/__init__.py
index 118b46ffa..34ccf4383 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -19,6 +19,7 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
+__package__ = "cps"
 
 import sys
 import os

From 7f9da94a18daadb9e6b4c9cede41667a1402b5af Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 24 Nov 2021 17:35:09 +0100
Subject: [PATCH 040/412] Tie visibility of upload buttons to upload right only

---
 cps/editbooks.py                        |   2 +-
 cps/templates/book_edit.html            |   8 +-
 cps/templates/config_edit.html          |   2 +-
 cps/templates/layout.html               |   4 +-
 test/Calibre-Web TestSummary_Linux.html | 488 ++++++++++++++++--------
 5 files changed, 340 insertions(+), 164 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 929aa1a76..75f1c96ef 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -67,7 +67,7 @@ log = logger.create()
 def upload_required(f):
     @wraps(f)
     def inner(*args, **kwargs):
-        if current_user.role_upload() or current_user.role_admin():
+        if current_user.role_upload():
             return f(*args, **kwargs)
         abort(403)
 
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 21ae98e6a..cac3219c4 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -98,8 +98,7 @@
       <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 %}
+    {% if g.user.role_upload() and 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="">
@@ -109,7 +108,6 @@
         <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>
-      {% endif %}
     {% endif %}
     <label for="pubdate">{{_('Published Date')}}</label>
     <div class="form-group input-group">
@@ -197,14 +195,12 @@
           </div>
         {% endfor %}
       {% endif %}
-      {% if g.user.role_upload() or g.user.role_admin()%}
-        {% if g.allow_upload %}
+      {% if g.user.role_upload() and g.allow_upload %}
           <div role="group" aria-label="Upload new book format">
             <label class="btn btn-primary btn-file" for="btn-upload-format">{{ _('Upload Format') }}</label>
             <div class="upload-format-input-text" id="upload-format"></div>
             <input id="btn-upload-format" name="btn-upload-format" type="file">
           </div>
-        {% endif %}
       {% endif %}
 
     <div class="checkbox">
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index 4d6c68ce1..f61ca9a5a 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -105,7 +105,7 @@
     </div>
     <div class="form-group">
         <input type="checkbox" id="config_uploading" data-control="upload_settings" name="config_uploading" {% if config.config_uploading %}checked{% endif %}>
-        <label for="config_uploading">{{_('Enable Uploads')}}</label>
+        <label for="config_uploading">{{_('Enable Uploads')}} {{_('(Please ensure users having also upload rights)')}}</label>
     </div>
     <div data-related="upload_settings">
       <div class="form-group">
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 09b3f507f..8cb6b76e0 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -58,8 +58,7 @@
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">
             {% if g.user.is_authenticated or g.allow_anonymous %}
-              {% if g.user.role_upload() or g.user.role_admin()%}
-                {% if g.allow_upload %}
+              {% if g.user.role_upload() and g.allow_upload %}
                   <li>
                     <form id="form-upload" class="navbar-form" action="{{ url_for('editbook.upload') }}" data-title="{{_('Uploading...')}}" data-footer="{{_('Close')}}" data-failed="{{_('Error')}}" data-message="{{_('Upload done, processing, please wait...')}}" method="post" enctype="multipart/form-data">
                       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
@@ -69,7 +68,6 @@
                       </div>
                     </form>
                   </li>
-                {% endif %}
               {% endif %}
               {% if not g.user.is_anonymous %}
                 <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 55c6bf1ea..60fa45148 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2021-11-22 21:51:33</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-11-24 20:41:04</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-11-23 01:35:04</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-11-25 00:24: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>Duration: </strong>3h 2 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 3 min</p>
         </div>
       </div>
       </div>
@@ -102,12 +102,12 @@
     </tr>
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestAnonymous</td>
         <td class="text-center">13</td>
-        <td class="text-center">12</td>
+        <td class="text-center">13</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('c1', 13)">Detail</a>
@@ -224,31 +224,11 @@
     
     
     
-        <tr id="et1.13" class="none bg-info">
+        <tr id='pt1.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 143, in test_guest_visibility_sidebar
-    self.assertFtest_edit_languagealse(self.check_element_on_page((By.ID, &#34;nav_rand&#34;)))
-AttributeError: &#39;TestAnonymous&#39; object has no attribute &#39;assertFtest_edit_languagealse&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -901,12 +881,12 @@ AttributeError: &#39;TestAnonymous&#39; object has no attribute &#39;assertFtest
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
-        <td class="text-center">33</td>
-        <td class="text-center">1</td>
+        <td class="text-center">26</td>
         <td class="text-center">0</td>
+        <td class="text-center">8</td>
         <td class="text-center">1</td>
         <td class="text-center">
             <a onclick="showClassDetail('c11', 35)">Detail</a>
@@ -1166,98 +1146,26 @@ AttributeError: &#39;TestAnonymous&#39; object has no attribute &#39;assertFtest
     
     
     
-        <tr id='pt11.27' class='hiddenRow bg-success'>
+        <tr id="et11.27" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt11.28' 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='pt11.29' 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='pt11.30' 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='pt11.31' 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='pt11.32' 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='pt11.33' 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='pt11.34' 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="ft11.35" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
-            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.35')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.27')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft11.35" class="popup_window test_output" style="display:block;">
+                <div id="div_et11.27" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.35').style.display='none'"><span
+                                onclick="document.getElementById('div_et11.27').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 783, in test_upload_cover_hdd
-    self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
-AssertionError: 0.0 not greater than 0.02</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 1011, in test_upload_book_cbr
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1266,6 +1174,218 @@ AssertionError: 0.0 not greater than 0.02</pre>
         </tr>
     
     
+    
+        <tr id="et11.28" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.28')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.28" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.28').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 986, in test_upload_book_cbt
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et11.29" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.29')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.29" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.29').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 961, in test_upload_book_cbz
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et11.30" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.30')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.30" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.30').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 923, in test_upload_book_epub
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et11.31" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.31')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.31" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.31').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 848, in test_upload_book_fb2
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et11.32" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.32')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.32" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 873, in test_upload_book_lit
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et11.33" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.33')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.33" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.33').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 898, in test_upload_book_mobi
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et11.34" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.34')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.34" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.34').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 823, in test_upload_book_pdf
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.35' 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">
@@ -1445,13 +1565,13 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">18</td>
+        <td class="text-center">17</td>
+        <td class="text-center">1</td>
         <td class="text-center">2</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 20)">Detail</a>
         </td>
@@ -1603,44 +1723,26 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
     
     
-        <tr id='pt13.17' class='hiddenRow bg-success'>
+        <tr id="et13.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.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="ft13.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_ft13.19')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.17')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft13.19" class="popup_window test_output" style="display:block;">
+                <div id="div_et13.17" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.19').style.display='none'"><span
+                                onclick="document.getElementById('div_et13.17').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 774, in test_upload_cover_hdd
-    self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
-AssertionError: 0.0 not greater than 0.02</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 844, in test_upload_book_epub
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1650,6 +1752,44 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
     
     
+        <tr id="et13.18" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et13.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et13.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 820, in test_upload_book_lit
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.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="ft13.20" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
@@ -1667,9 +1807,9 @@ AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 928, in test_watch_metadata
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 929, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=a92e572d-f9d5-45d0-a088-9751aaed41ca&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=37b525ac-f7df-4630-8811-e9f937dd6c89&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1722,12 +1862,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
+        <td class="text-center">6</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('c15', 7)">Detail</a>
@@ -1781,11 +1921,31 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id="et15.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et15.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et15.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 144, in test_email_limit
+    upload.send_keys(random_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2888,12 +3048,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">4</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('c31', 5)">Detail</a>
@@ -2929,11 +3089,33 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id="et31.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et31.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et31.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et31.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 229, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 189, in sound_test
+    upload.send_keys(upload_file)
+AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4268,9 +4450,9 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>376</td>
-        <td>366</td>
-        <td>3</td>
+        <td>357</td>
         <td>1</td>
+        <td>12</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4677,7 +4859,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 </div>
 
 <script>
-    drawCircle(366, 3, 1, 6);
+    drawCircle(357, 1, 12, 6);
     showCase(5);
 </script>
 

From 87e526642cbbb2491ecdcf6c616479481ca817d0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Nov 2021 18:19:25 +0100
Subject: [PATCH 041/412] Bugfix edit series_index Bugfix invalid languages

---
 cps/editbooks.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 75f1c96ef..31e38d2aa 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -31,7 +31,6 @@ try:
 except ImportError:
     pass
 
-
 # Improve this to check if scholarly is available in a global way, like other pythonic libraries
 try:
     from scholarly import scholarly
@@ -454,7 +453,7 @@ def edit_book_series_index(series_index, book):
     if not series_index.replace('.', '', 1).isdigit():
         flash(_("%(seriesindex)s is not a valid number, skipping", seriesindex=series_index), category="warning")
         return False
-    if book.series_index != series_index:
+    if str(book.series_index) != series_index:
         book.series_index = series_index
         modif_date = True
     return modif_date
@@ -484,11 +483,11 @@ def edit_book_languages(languages, book, upload=False, invalid=None):
     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)
+        log.error("'%s' is not a valid language", l)
         if isinstance(invalid, list):
             invalid.append(l)
         else:
-            flash(_(u"%(langname)s is not a valid language", langname=l), category="warning")
+            raise ValueError(_(u"'%(langname)s' is not a valid language", langname=l))
     # ToDo: Not working correct
     if upload and len(input_l) == 1:
         # If the language of the file is excluded from the users view, it's not imported, to allow the user to view
@@ -848,6 +847,10 @@ def edit_book(book_id):
             calibre_db.session.rollback()
             flash(error, category="error")
             return render_edit_book(book_id)
+    except ValueError as e:
+        calibre_db.session.rollback()
+        flash(str(e), category="error")
+        return redirect(url_for('web.show_book', book_id=book.id))
     except Exception as ex:
         log.debug_or_exception(ex)
         calibre_db.session.rollback()
@@ -944,7 +947,11 @@ def create_book_on_upload(modif_date, meta):
     modif_date |= edit_book_series_index(meta.series_id, db_book)
 
     # add languages
-    modif_date |= edit_book_languages(meta.languages, db_book, upload=True)
+    invalid=[]
+    modif_date |= edit_book_languages(meta.languages, db_book, upload=True, invalid=invalid)
+    if invalid:
+        for l in invalid:
+            flash(_(u"'%(langname)s' is not a valid language", langname=l), category="warning")
 
     # handle tags
     modif_date |= edit_book_tags(meta.tags, db_book)

From 67e37215305e5546441c99b2f582b5cf5d1af030 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Wed, 1 Dec 2021 11:28:03 +0800
Subject: [PATCH 042/412] fix(tinymce Simplified Chinese locale):rename zh_CN
 to zh_Hans_CN

---
 cps/static/js/libs/tinymce/langs/zh_Hans_CN.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js b/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js
index 2a784f579..981c90909 100644
--- a/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js
+++ b/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js
@@ -1,4 +1,4 @@
-tinymce.addI18n('zh_CN',{
+tinymce.addI18n('zh_Hans_CN',{
 "Redo": "\u91cd\u505a",
 "Undo": "\u64a4\u9500",
 "Cut": "\u526a\u5207",

From 8438b2a07b309ab0d2ce22ea2a8cbe1ad0336a1b Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Wed, 1 Dec 2021 12:14:57 +0800
Subject: [PATCH 043/412] Update Simplified Chinese translation

---
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 197 ++++++++-------
 messages.pot                                  | 232 ++++++++++--------
 2 files changed, 233 insertions(+), 196 deletions(-)

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index da32d2cb8..6625279e1 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-01 11:37+0800\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.9.1\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -46,9 +46,9 @@ msgstr "重新连接成功"
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "未知"
@@ -290,7 +290,6 @@ msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
 #: cps/admin.py:1316
-#, fuzzy
 msgid "Database Settings updated"
 msgstr "邮件服务器设置已更新"
 
@@ -435,13 +434,12 @@ msgid "General error"
 msgstr "一般错误"
 
 #: cps/admin.py:1701
-#, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件无法保存在临时目录中"
 
 #: cps/admin.py:1702
 msgid "Files could not be replaced during update"
-msgstr ""
+msgstr "更新期间无法替换文件"
 
 #: cps/admin.py:1726
 msgid "Failed to extract at least One LDAP User"
@@ -481,103 +479,103 @@ msgstr "缺少执行权限"
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "书籍格式已成功删除"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:528 cps/web.py:1719
 #: cps/web.py:1760 cps/web.py:1827
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
 
-#: cps/editbooks.py:491
+#: cps/editbooks.py:490 cps/editbooks.py:954
 #, python-format
-msgid "%(langname)s is not a valid language"
-msgstr "%(langname)s 不是一种有效语言"
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s' 不是一种有效语言"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须具有扩展名"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -719,7 +717,7 @@ msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件"
 
 #: cps/helper.py:651
 msgid "Invalid cover file content"
-msgstr ""
+msgstr "封面文件内容无效"
 
 #: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
@@ -831,7 +829,7 @@ msgstr "Google Oauth 错误: {}"
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr "登录"
@@ -1007,7 +1005,7 @@ msgstr "此书籍已被添加到书架：%(sname)s"
 
 #: cps/shelf.py:126
 msgid "You are not allowed to add a book to the shelf"
-msgstr ""
+msgstr "你没有向书架添加书籍的权限"
 
 #: cps/shelf.py:144
 #, python-format
@@ -1031,9 +1029,9 @@ msgstr "此书已从书架 %(sname)s 中删除"
 
 #: cps/shelf.py:218
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
+msgstr "抱歉，你没有从这个书架删除书籍的权限"
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "创建书架"
 
@@ -1047,7 +1045,7 @@ msgstr "编辑书架"
 
 #: cps/shelf.py:249
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
+msgstr "抱歉，你没有创建公开书架的权限"
 
 #: cps/shelf.py:261
 #, python-format
@@ -1168,7 +1166,7 @@ msgstr "语言：%(name)s"
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
 #: cps/web.py:755 cps/web.py:1090
@@ -1187,7 +1185,7 @@ msgstr "评分列表"
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr "任务列表"
 
@@ -1236,7 +1234,7 @@ msgstr "请先配置您的kindle邮箱。"
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1486
 #: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
 #: cps/web.py:1528
 msgid "Register"
@@ -1347,7 +1345,7 @@ msgstr "邮箱地址"
 msgid "Send to Kindle E-mail Address"
 msgstr "接收书籍的Kindle邮箱地址"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理权限"
@@ -1357,7 +1355,7 @@ msgstr "管理权限"
 msgid "Password"
 msgstr "密码"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "上传书籍"
@@ -1548,7 +1546,7 @@ msgid "OK"
 msgstr "确定"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1646,13 +1644,13 @@ msgstr "转换书籍"
 msgid "Book Title"
 msgstr "书名"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "作者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "简介"
 
@@ -1660,15 +1658,15 @@ msgstr "简介"
 msgid "Identifiers"
 msgstr "书号"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "书号类型"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "书号编号"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "移除"
@@ -1689,90 +1687,89 @@ msgstr "丛书编号"
 msgid "Rating"
 msgstr "评分"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "从URL获取封面（JPEG - 图片将下载并存储在数据库中）"
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "从本地磁盘上传封面"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "出版日期"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "语言"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "确认"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "没有"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "上传格式"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "查看保存书籍"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "保存"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "关键字"
 
-#: cps/templates/book_edit.html:237
-#, fuzzy
+#: cps/templates/book_edit.html:233
 msgid "Search keyword"
 msgstr " 搜索关键字 "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "单击封面将元数据加载到表单"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "关闭"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "源"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "搜索错误！"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "无搜索结果！请尝试另一个关键字。"
 
@@ -1856,21 +1853,19 @@ msgid "Enter Publishers"
 msgstr "输入出版社"
 
 #: cps/templates/book_table.html:73
-#, fuzzy
 msgid "Enter comments"
-msgstr "输入域名"
+msgstr "输入简介"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
-msgstr ""
+msgstr "简介"
 
 #: cps/templates/book_table.html:77 cps/templates/book_table.html:79
 #: cps/templates/book_table.html:81 cps/templates/book_table.html:83
 #: cps/templates/book_table.html:87 cps/templates/book_table.html:89
 #: cps/templates/book_table.html:91 cps/templates/book_table.html:93
-#, fuzzy
 msgid "Enter "
-msgstr "书号"
+msgstr "输入"
 
 #: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
 msgid "Are you really sure?"
@@ -1946,7 +1941,7 @@ msgstr "夜间版"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr ""
+msgstr "可信主机（用逗号分隔）"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
@@ -1970,12 +1965,16 @@ msgstr "功能配置"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr ""
+msgstr "保存到磁盘事转换标题和作者中的非英文字符"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
 msgstr "启用上传"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr "（请确保用户也有上传权限）"
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "允许上传的文件格式"
@@ -2261,14 +2260,12 @@ msgid "Allow Editing Public Shelves"
 msgstr "允许编辑公共书架"
 
 #: cps/templates/config_view_edit.html:123
-#, fuzzy
 msgid "Default Language"
-msgstr "排除语言"
+msgstr "默认语言"
 
 #: cps/templates/config_view_edit.html:131
-#, fuzzy
 msgid "Default Visible Language of Books"
-msgstr "按语言显示书籍"
+msgstr "默认显示书籍语言"
 
 #: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
@@ -2337,7 +2334,7 @@ msgid "Add to shelf"
 msgstr "添加到书架"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(公共)"
@@ -2412,7 +2409,7 @@ msgstr "输入域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止注册的域名（黑名单）"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "下一个"
 
@@ -2438,11 +2435,11 @@ msgstr "登出账号"
 
 #: cps/templates/index.html:69
 msgid "Sort ascending according to download count"
-msgstr ""
+msgstr "按下载数排序"
 
 #: cps/templates/index.html:70
 msgid "Sort descending according to download count"
-msgstr ""
+msgstr "按下载数逆序排序"
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
@@ -2522,7 +2519,7 @@ msgstr "书籍按评分排序"
 msgid "Books ordered by file formats"
 msgstr "书籍按文件格式排序"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "书架列表"
@@ -2543,48 +2540,48 @@ msgstr "切换导航"
 msgid "Search Library"
 msgstr "搜索书库"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "正在上传..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "错误"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "设置"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "账号"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "注销"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "请不要刷新页面"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "按条件浏览"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "关于"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "上一个"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "书籍详情"
 
diff --git a/messages.pot b/messages.pot
index 489258860..a6267b2c4 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-01 11:37+0800\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.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr ""
@@ -168,23 +168,33 @@ msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr ""
 
 #: cps/admin.py:582
-msgid "Are you sure you want to change visible book languages for selected user(s)?"
+msgid ""
+"Are you sure you want to change visible book languages for selected "
+"user(s)?"
 msgstr ""
 
 #: cps/admin.py:584
-msgid "Are you sure you want to change the selected role for the selected user(s)?"
+msgid ""
+"Are you sure you want to change the selected role for the selected "
+"user(s)?"
 msgstr ""
 
 #: cps/admin.py:586
-msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
+msgid ""
+"Are you sure you want to change the selected restrictions for the "
+"selected user(s)?"
 msgstr ""
 
 #: cps/admin.py:588
-msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
+msgid ""
+"Are you sure you want to change the selected visibility restrictions for "
+"the selected user(s)?"
 msgstr ""
 
 #: cps/admin.py:590
-msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgid ""
+"Are you sure you want to change shelf sync behavior for the selected "
+"user(s)?"
 msgstr ""
 
 #: cps/admin.py:592
@@ -263,7 +273,9 @@ msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
 #: cps/admin.py:1134
-msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgid ""
+"LDAP CACertificate, Certificate or Key Location is not Valid, Please "
+"Enter Correct Path"
 msgstr ""
 
 #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
@@ -478,113 +490,121 @@ msgstr ""
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:528 cps/web.py:1719
 #: cps/web.py:1760 cps/web.py:1827
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid ""
+"Oops! Selected book title is unavailable. File does not exist or is not "
+"accessible"
 msgstr ""
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
+#: cps/editbooks.py:490 cps/editbooks.py:954
 #, python-format
-msgid "%(langname)s is not a valid language"
+msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1680
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/editbooks.py:892
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+#: cps/editbooks.py:895
+msgid ""
+"Uploaded book probably exists in the library, consider to change before "
+"upload new: "
 msgstr ""
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
 #: cps/gdrive.py:58
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgid ""
+"Google Drive setup not completed, try to deactivate and activate Google "
+"Drive again"
 msgstr ""
 
 #: cps/gdrive.py:95
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgid ""
+"Callback domain is not verified, please follow steps to verify domain in "
+"google developer console"
 msgstr ""
 
 #: cps/helper.py:80
@@ -659,7 +679,9 @@ msgstr ""
 
 #: cps/helper.py:333
 #, python-format
-msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
+msgid ""
+"Deleting book %(id)s from database only, book path in database not valid:"
+" %(path)s"
 msgstr ""
 
 #: cps/helper.py:388
@@ -751,7 +773,9 @@ msgid "Unknown Status"
 msgstr ""
 
 #: cps/kobo_auth.py:131
-msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgid ""
+"PLease access calibre-web from non localhost to get valid api_endpoint "
+"for kobo device"
 msgstr ""
 
 #: cps/kobo_auth.py:134 cps/kobo_auth.py:162
@@ -828,7 +852,7 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
 msgid "Login"
 msgstr ""
@@ -1030,7 +1054,7 @@ msgstr ""
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr ""
 
@@ -1093,7 +1117,9 @@ msgid "No update available. You already have the latest version installed"
 msgstr ""
 
 #: cps/updater.py:428
-msgid "A new update is available. Click on the button below to update to the latest version."
+msgid ""
+"A new update is available. Click on the button below to update to the "
+"latest version."
 msgstr ""
 
 #: cps/updater.py:446
@@ -1106,7 +1132,9 @@ msgstr ""
 
 #: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
 #, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgid ""
+"A new update is available. Click on the button below to update to "
+"version: %(version)s"
 msgstr ""
 
 #: cps/updater.py:507
@@ -1165,7 +1193,7 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
 #: cps/web.py:755 cps/web.py:1090
@@ -1184,7 +1212,7 @@ msgstr ""
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1069
 msgid "Tasks"
 msgstr ""
 
@@ -1233,7 +1261,7 @@ msgstr ""
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1486
 #: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
 #: cps/web.py:1528
 msgid "Register"
@@ -1253,7 +1281,9 @@ msgstr ""
 
 #: cps/web.py:1559
 #, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid ""
+"Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not"
+" known"
 msgstr ""
 
 #: cps/web.py:1565
@@ -1344,7 +1374,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr ""
@@ -1354,7 +1384,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr ""
@@ -1545,7 +1575,7 @@ msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1643,13 +1673,13 @@ msgstr ""
 msgid "Book Title"
 msgstr ""
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr ""
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr ""
 
@@ -1657,15 +1687,15 @@ msgstr ""
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
@@ -1686,89 +1716,91 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: cps/templates/book_edit.html:104
-msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+#: cps/templates/book_edit.html:103
+msgid ""
+"Fetch Cover from URL (JPEG - Image will be downloaded and stored in "
+"database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr ""
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr ""
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr ""
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr ""
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 msgid "Search keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr ""
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr ""
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr ""
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1970,6 +2002,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr ""
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr ""
@@ -2064,7 +2100,9 @@ msgid "SSL"
 msgstr ""
 
 #: cps/templates/config_edit.html:210
-msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgid ""
+"LDAP CACertificate Path (Only needed for Client Certificate "
+"Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:217
@@ -2329,7 +2367,7 @@ msgid "Add to shelf"
 msgstr ""
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
@@ -2404,7 +2442,7 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr ""
 
@@ -2514,7 +2552,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2535,48 +2573,48 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr ""
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr ""
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr ""
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr ""
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr ""
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr ""
 
@@ -2657,7 +2695,9 @@ 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."
+msgid ""
+"Books must first be archived and the device synced before a book can "
+"safely be deleted."
 msgstr ""
 
 #: cps/templates/modal_dialogs.html:76

From 3f913133037de44942aa08098425986d91ad979f Mon Sep 17 00:00:00 2001
From: Jonathan Fenske <929220+jfenske89@users.noreply.github.com>
Date: Tue, 30 Nov 2021 22:24:34 -0600
Subject: [PATCH 044/412] Update epub.js

send the CSRF token when adding bookmarks
---
 cps/static/js/reading/epub.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cps/static/js/reading/epub.js b/cps/static/js/reading/epub.js
index edafa82c0..7942bfbdd 100644
--- a/cps/static/js/reading/epub.js
+++ b/cps/static/js/reading/epub.js
@@ -61,11 +61,14 @@ var reader;
                 this.removeBookmark(bookmark);
             }.bind(this));
         }
+        
+        var csrftoken = $("input[name='csrf_token']").val();
 
         // Save to database
         $.ajax(calibre.bookmarkUrl, {
             method: "post",
-            data: { bookmark: location || "" }
+            data: { bookmark: location || "" },
+            headers: { "X-CSRFToken": csrftoken }
         }).fail(function (xhr, status, error) {
             alert(error);
         });

From 66874f8163ef3199bc33c9888f3857475a524587 Mon Sep 17 00:00:00 2001
From: Jonathan Fenske <929220+jfenske89@users.noreply.github.com>
Date: Tue, 30 Nov 2021 22:25:45 -0600
Subject: [PATCH 045/412] Update read.html

include the CSR token input
---
 cps/templates/read.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cps/templates/read.html b/cps/templates/read.html
index 3d2566e0d..1766eb1bc 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -17,6 +17,7 @@
     <body>
       <div id="sidebar">
         <div id="panels">
+          <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
           <!--input id="searchBox" placeholder="search" type="search"-->
 
           <!--a id="show-Search" class="show_view icon-search" data-view="Search">Search</a-->

From 7640ac1b3b8c86175fc0c608925be0f620e990d3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 1 Dec 2021 20:29:05 +0100
Subject: [PATCH 046/412] Books are removed from synced books upon archiving
 (from kobo or calibre-web side) unicode texts (title, author) are showing up
 right on kobo reader Added some missing kobo routes (prevents 404 response)
 Added a lot of debug output on kobo sync requests

---
 cps/kobo.py | 37 ++++++++++++++++++++++++-------------
 cps/web.py  |  3 +++
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index ee2317ba9..3d2af7f4d 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -22,6 +22,7 @@ import datetime
 import os
 import uuid
 from time import gmtime, strftime
+import json
 
 try:
     from urllib import unquote
@@ -102,6 +103,8 @@ def make_request_to_kobo_store(sync_token=None):
         allow_redirects=False,
         timeout=(2, 10)
     )
+    log.debug("Content: " + str(store_response.content))
+    log.debug("StatusCode: " + str(store_response.status_code))
     return store_response
 
 
@@ -110,7 +113,8 @@ def redirect_or_proxy_request():
         if request.method == "GET":
             return redirect(get_store_url_for_current_request(), 307)
         else:
-            # The Kobo device turns other request types into GET requests on redirects, so we instead proxy to the Kobo store ourselves.
+            # The Kobo device turns other request types into GET requests on redirects,
+            # so we instead proxy to the Kobo store ourselves.
             store_response = make_request_to_kobo_store()
 
             response_headers = store_response.headers
@@ -205,8 +209,8 @@ def HandleSyncRequest():
         books = calibre_db.session.execute(changed_entries.limit(SYNC_ITEM_LIMIT))
     else:
         books = changed_entries.limit(SYNC_ITEM_LIMIT)
+    log.debug("Books to Sync: {}".format(books.count()))
     for book in books:
-        kobo_sync_status.add_synced_books(book.Books.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.name)
@@ -245,6 +249,7 @@ def HandleSyncRequest():
             pass
 
         new_books_last_created = max(ts_created, new_books_last_created)
+        kobo_sync_status.add_synced_books(book.Books.id)
 
     if sqlalchemy_version2:
         max_change = calibre_db.session.execute(changed_entries
@@ -330,9 +335,10 @@ def generate_sync_response(sync_token, sync_results, set_cont=False):
         extra_headers["x-kobo-sync"] = "continue"
     sync_token.to_headers(extra_headers)
 
-    # log.debug("Kobo Sync Content: {}".format(sync_results))
-    response = make_response(jsonify(sync_results), extra_headers)
-
+    log.debug("Kobo Sync Content: {}".format(sync_results))
+    # jsonify decodes the unicode string different to what kobo expects
+    response = make_response(json.dumps(sync_results), extra_headers)
+    response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
 
@@ -377,7 +383,7 @@ def get_download_url_for_book(book, book_format):
 
 
 def create_book_entitlement(book, archived):
-    book_uuid = book.uuid
+    book_uuid = str(book.uuid)
     return {
         "Accessibility": "Full",
         "ActivePeriod": {"From": convert_to_kobo_timestamp_string(datetime.datetime.now())},
@@ -404,7 +410,6 @@ def get_description(book):
     return book.comments[0].text
 
 
-# TODO handle multiple authors
 def get_author(book):
     if not book.authors:
         return {"Contributors": None}
@@ -412,10 +417,11 @@ def get_author(book):
         author_list = []
         autor_roles = []
         for author in book.authors:
-            autor_roles.append({"Name":author.name, "Role":"Author"})
+            autor_roles.append({"Name":author.name})    #.encode('unicode-escape').decode('latin-1')
             author_list.append(author.name)
         return {"ContributorRoles": autor_roles, "Contributors":author_list}
-    return {"ContributorRoles": [{"Name":book.authors[0].name, "Role":"Author"}], "Contributors": book.authors[0].name}
+    return {"ContributorRoles": [{"Name":book.authors[0].name}],
+            "Contributors": book.authors[0].name}
 
 
 def get_publisher(book):
@@ -472,9 +478,7 @@ def get_metadata(book):
         "IsSocialEnabled": True,
         "Language": "en",
         "PhoneticPronunciations": {},
-        # TODO: Fix book.pubdate to return a datetime object so that we can easily
-        # convert it to the format Kobo devices expect.
-        "PublicationDate": book.pubdate,
+        "PublicationDate": convert_to_kobo_timestamp_string(book.pubdate),
         "Publisher": {"Imprint": "", "Name": get_publisher(book),},
         "RevisionId": book_uuid,
         "Title": book.title,
@@ -489,7 +493,7 @@ def get_metadata(book):
             "Number": get_seriesindex(book),        # ToDo Check int() ?
             "NumberFloat": float(get_seriesindex(book)),
             # Get a deterministic id based on the series name.
-            "Id": uuid.uuid3(uuid.NAMESPACE_DNS, name),
+            "Id": str(uuid.uuid3(uuid.NAMESPACE_DNS, name)),
         }
 
     return metadata
@@ -958,6 +962,8 @@ def HandleBookDeletionRequest(book_uuid):
 
     ub.session.merge(archived_book)
     ub.session_commit()
+    if archived_book.is_archived:
+        kobo_sync_status.remove_synced_book(book_id)
     return "", 204
 
 
@@ -986,11 +992,16 @@ 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/featured/<dummy>", methods=["GET", "POST"])
+@kobo.route("/v1/products/featured/", 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/books/<dummy>/", methods=["GET", "POST"])
 @kobo.route("/v1/products/dailydeal", methods=["GET", "POST"])
+@kobo.route("/v1/products/deals", methods=["GET", "POST"])
 @kobo.route("/v1/products", methods=["GET", "POST"])
+@kobo.route("/v1/affiliate", methods=["GET", "POST"])
 def HandleProductsRequest(dummy=None):
     log.debug("Unimplemented Products Request received: %s", request.base_url)
     return redirect_or_proxy_request()
diff --git a/cps/web.py b/cps/web.py
index c061af30c..82f864886 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -54,6 +54,7 @@ from .helper import check_valid_domain, render_task_status, check_email, check_u
 from .pagination import Pagination
 from .redirect import redirect_back
 from .usermanagement import login_required_if_no_ano
+from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
 
 feature_support = {
@@ -206,6 +207,8 @@ def toggle_archived(book_id):
         archived_book.is_archived = True
     ub.session.merge(archived_book)
     ub.session_commit("Book {} archivebit toggled".format(book_id))
+    if archived_book.is_archived:
+        remove_synced_book(book_id)
     return ""
 
 

From 5ed3b1cf5351f4cb06f225b6c535bcb8c652b96c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 1 Dec 2021 21:38:43 +0100
Subject: [PATCH 047/412] On master: Order of language count in /language
 (fixes #2200)

---
 cps/db.py                    | 27 ++++++++++++++++++---------
 cps/isoLanguages.py          |  1 +
 cps/templates/languages.html |  6 +++---
 cps/web.py                   | 16 ++++------------
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 4e76072d6..70da9108d 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -796,18 +796,27 @@ class CalibreDB():
         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, return_all_languages=False, reverse_order=False):
+    def speaking_language(self, languages=None, return_all_languages=False, with_count=False, reverse_order=False):
         from . import get_locale
 
         if not languages:
-            languages = self.session.query(Languages) \
-                .join(books_languages_link) \
-                .join(Books) \
-                .filter(self.common_filters(return_all_languages=return_all_languages)) \
-                .group_by(text('books_languages_link.lang_code')).all()
-        for lang in languages:
-            lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
-        return sorted(languages, key=lambda x: x.name, reverse=reverse_order)
+            if with_count:
+                languages = self.session.query(Languages, func.count('books_languages_link.book'))\
+                    .join(books_languages_link).join(Books)\
+                    .filter(self.common_filters(return_all_languages=return_all_languages)) \
+                    .group_by(text('books_languages_link.lang_code')).all()
+                for lang in languages:
+                    lang[0].name = isoLanguages.get_language_name(get_locale(), lang[0].lang_code)
+                return sorted(languages, key=lambda x: x[0].name, reverse=reverse_order)
+            else:
+                languages = self.session.query(Languages) \
+                    .join(books_languages_link) \
+                    .join(Books) \
+                    .filter(self.common_filters(return_all_languages=return_all_languages)) \
+                    .group_by(text('books_languages_link.lang_code')).all()
+                for lang in languages:
+                    lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
+            return sorted(languages, key=lambda x: x.name, reverse=reverse_order)
 
 
     def update_title_sort(self, config, conn=None):
diff --git a/cps/isoLanguages.py b/cps/isoLanguages.py
index e220f63e0..50447aca7 100644
--- a/cps/isoLanguages.py
+++ b/cps/isoLanguages.py
@@ -57,6 +57,7 @@ def get_language_name(locale, lang_code):
         return get_language_names(locale)[lang_code]
     except KeyError:
         log.error('Missing translation for language name: {}'.format(lang_code))
+        return "Unknown"
 
 
 def get_language_codes(locale, language_names, remainder=None):
diff --git a/cps/templates/languages.html b/cps/templates/languages.html
index 771d77cf2..8331cb947 100644
--- a/cps/templates/languages.html
+++ b/cps/templates/languages.html
@@ -21,9 +21,9 @@
       </div>
       <div id="second" class="col-xs-12 col-sm-6">
     {% endif %}
-    <div class="row" data-id="{% if lang.name %}{{lang.name}}{% else %}{{lang[0].name}}{% endif %}">
-        <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_param='new')}}">{{lang.name}}</a></div>
+    <div class="row" data-id="{{lang[0].name}}">
+        <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{lang[1]}}</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[0].lang_code, data=data, sort_param='new')}}">{{lang[0].name}}</a></div>
     </div>
   {% endfor %}
       </div>
diff --git a/cps/web.py b/cps/web.py
index 82f864886..2cb92a090 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1016,22 +1016,14 @@ def formats_list():
 @login_required_if_no_ano
 def language_overview():
     if current_user.check_visibility(constants.SIDEBAR_LANGUAGE) and current_user.filter_language() == u"all":
-        if current_user.get_view_property('language', 'dir') == 'desc':
-            order = db.Languages.lang_code.desc()
-            order_no = 0
-        else:
-            order = db.Languages.lang_code.asc()
-            order_no = 1
+        order_no = 0 if current_user.get_view_property('language', 'dir') == 'desc' else 1
         charlist = list()
-        languages = calibre_db.speaking_language(reverse_order=not order_no)
+        languages = calibre_db.speaking_language(reverse_order=not order_no, with_count=True)
         for lang in languages:
-            upper_lang = lang.name[0].upper()
+            upper_lang = lang[0].name[0].upper()
             if upper_lang not in charlist:
                 charlist.append(upper_lang)
-        lang_counter = calibre_db.session.query(db.books_languages_link,
-                                        func.count('books_languages_link.book').label('bookcount')).group_by(
-            text('books_languages_link.lang_code')).all()
-        return render_title_template('languages.html', languages=languages, lang_counter=lang_counter,
+        return render_title_template('languages.html', languages=languages,
                                      charlist=charlist, title=_(u"Languages"), page="langlist",
                                      data="language", order=order_no)
     else:

From f4096b136ecf2c7eeee741a02741cd903ac3a86e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 4 Dec 2021 10:57:53 +0100
Subject: [PATCH 048/412] Added chinese sign language (csl) to supported
 languages

---
 cps/iso_language_names.py                     |   1 +
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 39635 -> 39546 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 53698 -> 53605 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 57858 -> 57741 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 51420 -> 51330 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 27521 -> 27430 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 53763 -> 53669 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 25272 -> 25180 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 56390 -> 56299 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 19949 -> 19843 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 24546 -> 24546 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 270 +++---
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 50584 -> 50497 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 52511 -> 52413 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 272 +++---
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 47022 -> 46930 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 272 +++---
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 48070 -> 47969 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 48854 -> 48760 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 22880 -> 22790 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 272 +++---
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 18028 -> 18028 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 270 +++---
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 48654 -> 48563 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 272 +++---
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 48977 -> 48886 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 272 +++---
 messages.pot                                  | 270 +++---
 test/Calibre-Web TestSummary_Linux.html       | 891 +++++-------------
 41 files changed, 3006 insertions(+), 3320 deletions(-)

diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 8bd9a0d3a..697b7e22a 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -7941,6 +7941,7 @@ LANGUAGE_NAMES = {
         "cre": "Cree",
         "crh": "Turkish; Crimean",
         "csb": "Kashubian",
+        "csl": "Chinese Sign Language",
         "cym": "Welsh",
         "dak": "Dakota",
         "dan": "Danish",
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index efd55ce457763285f1b3aa18002502afc948b7fa..4c982ee78fe1f7cc8bf5020a8d8bc482f76c9715 100644
GIT binary patch
delta 8963
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

delta 9065
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

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 931da8327..3a0407c6f 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2020-06-09 21:11+0100\n"
 "Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
 "Language: cs_CZ\n"
@@ -45,9 +45,9 @@ msgstr "Úspěšně obnovené připojení"
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Neznámý"
@@ -304,7 +304,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
@@ -349,7 +349,7 @@ msgstr "Upravit uživatele %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
@@ -384,7 +384,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
@@ -484,108 +484,108 @@ msgstr "není nakonfigurováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Formát knihy úspěšně smazán"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "upravit metadata"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s není platným jazykem"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 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:647
+#: cps/editbooks.py:646
 #, 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:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, 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:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Metadata úspěšně aktualizována"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 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:892
+#: cps/editbooks.py:895
 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:986
+#: cps/editbooks.py:993
 #, 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:1005
+#: cps/editbooks.py:1012
 #, 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:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Soubor %(file)s nahrán"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Chybí zdrojový nebo cílový formát pro převod"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, 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"
@@ -693,7 +693,7 @@ msgstr "Soubor %(file)s nenalezen na Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
@@ -775,7 +775,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -840,8 +840,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -857,7 +857,7 @@ msgstr "Token vypršel"
 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:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Knihy"
 
@@ -882,7 +882,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Nejlépe hodnocené knihy"
 
@@ -891,7 +891,7 @@ msgid "Show Top Rated Books"
 msgstr "Zobrazit nejlépe hodnocené knihy"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
@@ -900,7 +900,7 @@ msgid "Show read and unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
@@ -918,7 +918,7 @@ msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -928,7 +928,7 @@ msgstr "Zobrazit výběr kategorie"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Série"
 
@@ -946,7 +946,7 @@ msgid "Show author selection"
 msgstr "Zobrazit výběr autora"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Vydavatelé"
 
@@ -956,7 +956,7 @@ msgstr "Zobrazit výběr vydavatele"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -980,7 +980,7 @@ msgstr "Formáty souborů"
 msgid "Show file formats selection"
 msgstr "Zobrazit výběr formátů"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Archivované knihy"
 
@@ -988,7 +988,7 @@ msgstr "Archivované knihy"
 msgid "Show archived books"
 msgstr "Zobrazit archivované knihy"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1043,7 +1043,7 @@ msgstr "Kniha byla odebrána z police: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Vytvořit polici"
 
@@ -1127,177 +1127,177 @@ msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizu
 msgid "No release information available"
 msgstr "Nejsou k dispozici žádné informace o verzi"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Žhavé knihy (Nejstahovanější)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Hledat"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Stáhnutí"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Seznam hodnocení"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, 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:1468
+#: cps/web.py:1463
 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:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, 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:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
@@ -1358,7 +1358,7 @@ msgstr "E-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Poslat do Kindle e-mailová adresa"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Správce"
@@ -1368,7 +1368,7 @@ msgstr "Správce"
 msgid "Password"
 msgstr "Heslo"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Nahrávat"
@@ -1560,7 +1560,7 @@ msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1658,13 +1658,13 @@ msgstr "Převést knihu"
 msgid "Book Title"
 msgstr "Název knihy"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Popis"
 
@@ -1672,15 +1672,15 @@ msgstr "Popis"
 msgid "Identifiers"
 msgstr "Identifikátory"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "Typy identifikátorů"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "Hodnota identifikátorů"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Odstranit"
@@ -1701,90 +1701,90 @@ msgstr "ID série"
 msgid "Rating"
 msgstr "Hodnocení"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 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:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Nahrát obal z místní jednotky"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Datum vydání"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Vydavatel"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Jazyk"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ano"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Ne"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Nahrát formát"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Zobrazit knihu po uložení"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Získat metadata"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Uložit"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Klíčové slovo"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr "Hledat klíčové slovo"
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 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:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Načítání..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Zavřít"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Zdroj"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Chyba vyhledávání!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nebyly nalezeny žádné výsledky! Zadejte jiné klíčové slovo."
 
@@ -1989,6 +1989,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Povolit nahrávání"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Povolené nahrávání formátů souborů"
@@ -2350,7 +2354,7 @@ msgid "Add to shelf"
 msgstr "Přidat do police"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Veřejné)"
@@ -2425,7 +2429,7 @@ msgstr "Zadejte jméno domény"
 msgid "Denied Domains (Blacklist)"
 msgstr "Zakázané domény pro registraci"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Další"
 
@@ -2536,7 +2540,7 @@ msgstr "Knihy řazené podle hodnocení"
 msgid "Books ordered by file formats"
 msgstr "Knihy seřazené podle souboru formátů"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Police"
@@ -2557,48 +2561,48 @@ msgstr "Přepnout navigaci"
 msgid "Search Library"
 msgstr "Hledat v knihovně"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Nahrávání..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Chyba"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Nastavení"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Účet"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Odhlásit se"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Prosím neobnovujte stránku"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Procházet"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "O knihovně"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Předchozí"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Podrobnosti o knize"
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index b7c0207f3363ee0af804c72aa387d8e1e571a59b..59794715b454b54109df8fd6662a8eca2cc5ee56 100644
GIT binary patch
delta 11663
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

delta 11761
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

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 808fcb04c..192f10f57 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2021-08-01 17:24+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -46,9 +46,9 @@ msgstr "Erfolgreich neu verbunden"
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -298,7 +298,7 @@ msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
@@ -342,7 +342,7 @@ msgstr "Benutzer %(nick)s bearbeiten"
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
@@ -377,7 +377,7 @@ msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
@@ -477,108 +477,108 @@ msgstr "Nicht konfiguriert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, 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/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Buch Format erfolgreich gelöscht"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s ist keine gültige Zahl, Eintrag wird ignoriert"
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s ist keine gültige Sprache"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "IDs unterscheiden nicht Groß-Kleinschreibung, alte ID wird überschrieben"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 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:986
+#: cps/editbooks.py:993
 #, 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:1005
+#: cps/editbooks.py:1012
 #, 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:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Datei %(file)s hochgeladen"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehler beim Konvertieren des Buches auf: %(res)s"
@@ -686,7 +686,7 @@ msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
 
@@ -767,7 +767,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -832,8 +832,8 @@ msgstr "Google Oauth Fehler: {}"
 msgid "{} Stars"
 msgstr "{} Sterne"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Login"
 
@@ -849,7 +849,7 @@ msgstr "Token ist abgelaufen"
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Bücher"
 
@@ -874,7 +874,7 @@ msgstr "Heruntergeladene Bücher"
 msgid "Show Downloaded Books"
 msgstr "Zeige heruntergeladene Bücher"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Best bewertete Bücher"
 
@@ -883,7 +883,7 @@ msgid "Show Top Rated Books"
 msgstr "Bestbewertete Bücher anzeigen"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
@@ -892,7 +892,7 @@ msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
@@ -910,7 +910,7 @@ msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -920,7 +920,7 @@ msgstr "Zeige Kategorienauswahl"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Serien"
 
@@ -938,7 +938,7 @@ msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Verleger"
 
@@ -948,7 +948,7 @@ msgstr "Zeige Verlegerauswahl"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -972,7 +972,7 @@ msgstr "Dateiformate"
 msgid "Show file formats selection"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
@@ -980,7 +980,7 @@ msgstr "Archivierte Bücher"
 msgid "Show archived books"
 msgstr "Zeige archivierte Bücher"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "Bücherliste"
 
@@ -1034,7 +1034,7 @@ msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
@@ -1117,177 +1117,177 @@ msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Ver
 msgid "No release information available"
 msgstr "Keine Releaseinformationen verfügbar"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Entdecke (Zufällige Bücher)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Von %(user)s heruntergeladene Bücher"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Suche"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Bewertungsliste"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, 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:1468
+#: cps/web.py:1463
 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:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 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:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, 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:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
@@ -1348,7 +1348,7 @@ msgstr "E-Mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1358,7 +1358,7 @@ msgstr "Admin"
 msgid "Password"
 msgstr "Passwort"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
@@ -1549,7 +1549,7 @@ msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1647,13 +1647,13 @@ msgstr "Konvertiere Buch"
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1661,15 +1661,15 @@ msgstr "Beschreibung"
 msgid "Identifiers"
 msgstr "IDs"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "ID Typ"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "ID Wert"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Entfernen"
@@ -1690,90 +1690,90 @@ msgstr "Serien ID"
 msgid "Rating"
 msgstr "Bewertung"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 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:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Coverdatei von Lokalem Laufwerk hochladen"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Herausgabedatum"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Herausgeber"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Sprache"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nein"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Format hochladen"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Speichern"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Suchbegriff "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 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:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Schließen"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Quelle"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Fehler bei der Suche!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Keine Ergebnisse gefunden! Bitte ein anderes Schlüsselwort benutzen."
 
@@ -1977,6 +1977,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Hochladen aktivieren"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Erlaubte Dateiformate zum Hochladen"
@@ -2338,7 +2342,7 @@ msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Öffentlich)"
@@ -2413,7 +2417,7 @@ msgstr "Domainnamen eingeben"
 msgid "Denied Domains (Blacklist)"
 msgstr "Verbotene Domains für eine Registrierung"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Nächste"
 
@@ -2523,7 +2527,7 @@ msgstr "Bücher nach Bewertungen sortiert"
 msgid "Books ordered by file formats"
 msgstr "Bücher nach Dateiformaten sortiert"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Bücherregale"
@@ -2544,48 +2548,48 @@ msgstr "Nagivation umschalten"
 msgid "Search Library"
 msgstr "Bibiliothek durchsuchen"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Lade hoch..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Fehler"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Bitte die Seite nicht neu laden"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Über"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Vorheriger Eintrag"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Buchdetails"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 066c68c548c15550a7e5eced6924b6fc5bcac03a..01b37b8c3434e6fec70aad199d7373908e7ec3f2 100644
GIT binary patch
delta 9535
zcmYM&30POvy2tSy8XzJfii&_BlOhTzA|hxwAmVI@VyS^z2S>8VA&0GK4kw2cG08OZ
zDh@fDQs$6j=9Ke1rKKmclQ|ykc)i~rYd_EJ@!_-H{oi{H?|RqfPX+tS&DvMazUEWD
z$l||_E|wL5`96yN|G%SQmeq*x7>43YY=EKR=KgM|M}|4^L<}ZgjPAG#Gw}!PiGdN8
zm5BM+%(852J&jkna0g$*KhO;u*0rp17>_kD5&36z=Z6Q5K`)$wo>++0a4GW7+Ui`t
zin{Nv6F)<Z=UPww*gRa;U=Y-eAy^q3p(fA@^*}0WA{|jH9)P-UBx*uaQ5l?zA-EnZ
z;Yrl}*U=vzU@i2Dw5-OAZ$;9mfPGLmzJu;K1~s7q)XL^!6qaBeJcSzQ5o$|n)VC~O
zY>R&Q2D)NCR>ZOBjnmK#7ox2dEu~Q&zrm`w(}_=_QhN@A@fND%^31{mYa`jTB9VVq
zcYeg;c+`Z}V{^QWO|d!`mC4Si=QA3R|AsXBae+lxGf^wphQ078YJy?hq?9G2;$EnU
z<Y6Gra6Vt@e7@I-FQGE{7{jrAw8=<)RDX@4$-h$Bi3@CtH5@5$>r<?PJ5Zk=M-6x%
zH35$p%gVtJREnpdPRGZnm2E%`upPCfXE71~h3YSaG-)f^+B7s!Cbq(VAd9wEqf&Ja
zE8!Jvf_KpygE*5qma+Ws#Qvxn$wS>g1uNn_Y=cWsTXhpvGaijivDyu3Xoejy8T+C-
z{0zNtC04<0s16TdWjupAuD@U$hVetSlZC3Kp%{cCP??yEwQ((K0!NU{+19^lsN=_u
zudqxFPzg0~AZlx3Fdef{9WFx+v=jCGUev^oqpJHdR=``R)AR>w>z<%8>=m!;?0*ss
zrL-;T{AQvCcn{UVEYyRaqEfj5m6?ZF9bG7Gt<(>-!bDUtXQB4G05#F&SQA&H-UEBF
z660IfX!zni^g)*dvl3ra20~E9*90}uE~tUtLQQl6YC^@R;#-A!ZVRdw4xpYpjmqpV
zPW%XMrR-H+#9FBjDwP4K2kJQ{qKdHt*1&E^7Oh;Yj*GD+evQ@eAyO8WJ0-6LC7~wN
z1vSxZ)VO(x<X`7^92Ye6&rma7fn_T|9j^nZ>OG1L@exukR!DP``koj;JkoJ7s^9&N
zH&Ge0k}Rt$1fepXmqh+M)A)!Bn%QYAJ0_@=d2l2&U>!`wuBaDD5h@ekp;mGlHQ^gr
zA0MEKF0h5!`v}wmqfq@dMP+!PO+zXF04w1n)WCBv083C4+J_q8cT|dBpg;PM_Y90i
z-B*AbXbmcJTT%V*Ko#L3=ksHzEw?YwP)9dW#qqzWnR&ft9t=V*Sy8A7490XEhZ^Xh
zbNwVLrMFO-d4^$FCB@W0Q=}}cbacZ4<ayirCk+i;gqp|-$30k;_$n$Bf1&R4;x$<l
zYop=>Cr(2ZT{iO1D&&V=$!AdudWL$=qqUh}C^jlP|1?tgU>Iu8)}vNhimKipQK`Cu
z+M?Ue^+%{v;l@irsjY;O=!05FGOC{}RHg<ayJmfWNw@_AY#M*k(9AsBnt{SmH4uYJ
zX**Qv`k;!m2sQ9>jKMXi0WP8T{8y}l_fT8mMdhkUBT&!Bp`LGzwu-4e4L|IQfjA1a
zM@6U(7h@DI$MSdrm65Zk`>vx4-a$?1E-K}<+L_Z3g|WmvF&L*I$+K3qBmW#t>vt~H
z#)vdCKq_kH9Z)mwj~ZYEhG9O2Vlk?tofwT)d&_zqVlWO1P{q0pd!hn&=!L<UolgGM
zn8XF8Y#D06{itF(jjhnNgIPg))cGBQn(#^|K8V`$N61<%?~dl1PcKX$o`=fZVblbE
zLe<g*n}(|Rw&N4$2G>qzrIk^qpb2UZ+hYaHL{0Q9)aS!d#a4hy{d^~0fx5pGb>ANJ
zz_X}v?He>aY1~Iwe1WQo@|}%-sL!JvlTgLl9^Ej<xjqQB!jY%}#-aw8it29x*21rx
z_#m={wso0?Qu5OIz`cvPF%ToT-VE#FTd2LCh81xwYQo>3R=ykAX6qzU4pyzMW&-_D
z#r+;C12a(*Uy9Xq{#Vh^3U{Ix9!5QI5%s`B)Ie_C%$|9n;sDe{LQ&7hpcayhl`s{R
zi3}(1huVsvSPn;GqR#(^G;|8SM$PO`R7X!yDYd$r3B8K15(c3L2*=78=hz0dfDF_G
z`#bR<)C5PPp8E*vV<FnA@?A8vH-BLWdUA%8ff!VW>8STY7OLZssFjRIbvzCA!kUj&
z@GI1w@5DGfh02s`hS@?N)B+PS$iLq0DO{+EeNpFrgyRg<IsX#X@c~qZ&O7mSR7ZcI
zGVvTW5sx0`%~=PvfCSX@?JyX#uo{l(LH?`Kn9T*fYL}rV@D1ubpK#)PsH!iYX*vqT
zvR5=#<9a*i`kUxWJPfts$*2j=L1k{C;};l5Tw*&HE}>@nGis0Tql)JVYQ?Yc`chm0
z)loIniv3Y9t|$!0&Zy#gA5}Y}9LJ&horId$H1tNhkcNK0FL!RZg+9c;VJ!X^HPeQ@
z%!+d`k$5yV#?7c=`W5v?^v*JWn8ctal!F?08fpQvP+PIkXj^M&XeB!wkD_LF#fkqw
zP2>eC6Vbg*rkbLjOGRZQ6IH~0u<Vx@Y72`{MY;)V;x5$v=P_94{~8UY{v`&X*Bd5|
zMy;>~*28yE4;G_}b}8yO?Zmox1Su2iA!@+(Z<+~bVs+xasQdF#87ROSI{))&=s2xK
zf82)JyHi*L&pZC<=+?(fFbGv#(Wn$Bpfc3Lxt@v|s0%9f*{H1@f*NlE+L1J-)6j#P
zQ5|i^TKGMxm@cC-a2+Giy|3vg2DPHrs8i4l6Y*{5`WL8y)}b<7>RdmF%H)~8<X?Mz
znF|`|9%`WbIOi2!LjCx^A;hcSGGCdzv&|o=oly79KxJq%YO4-oG`>Lf+aQN`2DZSh
zSgt>3AHPNF+VUAd{x!2f1Nc6MqfvX+V4&%s4R$B)fm5&qHDJ`+=6gUJR7OT%GhB!T
zc+$DvgV~1>kHuhIiYmfAsG7NC(+H*E@((j$1ZqnX&=qq~6UxQrXrqqncGR(ahVj@i
z*ZdtY06P$uVk2}JWS(n+nqVGw!Bsd4?WZ)9s=UGGMKTcsh?ij`?#3qg8?tz-_7Ex=
zC!<pMGY-XO{7~vwU<#f=)r9Xbv(oyg_rvR`>mx9k@vW&e+_|t1>)=t;g#L|n@g=s#
zy2Hr|4n}`mhV5||c1E{6&OT<Mwrn$MV&&iEcR!9mPy7Y_@GtD7^Ivg<`P(iFwbCVc
z6;ES3+{DwGz<*E!CcSU2Pr<IlM=%Bb^NoG55%FRS#-EUtTKCZh8-8H6A_bf3{Ewm0
z3pY9+xQ{gdhoTi~&xfOmXf<j}j^lIu4|?H4Hu80J8EsOVi5hS)2H;AZf%{R%v&$HB
zdZwct&xK7i=Hney%Eo<Yw%|9cM*JM9Gpq7g=hceciHlHMb_Zjy!Z`EZNW_}NJ#Zxs
zLk^bZJKh}UG1!dw#(44{LBnqXUl1_`bsEm2uK$gVF@!W}piB(JQ8){Wa59EYG{<oz
zdJ~^TP4G50#b%RChVmTuqVDr8po1V95e25>c37KuAZkUEF%`Gq=lBd?!v&104$h(W
z^p4|m)XFPOF`0`%eV&BT*ab6iymS4eO(T>GzhE4?e`Ja<8LJbIKo!$;{1UgLANHAQ
zIvj~g<qGVC*HA?nHO=hxSX4h-F&U3yDpr_o`n9{#h~>g0Y=D~`ucMBYCzaC@-$13Z
z7<2IiHpj$&noQ+mE#l><fp%j!{?{?&W0UFjj=9KI+SYU$b-1y_T(Ayd6XM%g1^s85
zbK4MA3(au}4nqy#Ng>d*8lyk%#u0cK^?B#nX5jZxwNr>1ZxcrA{GX<wDtDP<I;eqq
zFb=)2H}=L{)G^(QgRs^o=6x^)bBK>Q#>_QaGZ(d`-(w0s!tEG8&-^ugA6GEG6;NpQ
zVlTGUjTniEoXLJT04Wb^FY5EOA~V66s1<L<2t1Cu|1o-Fj|FA{Z=+V8kMH0-RLwm@
zyAqASPfbxpVF+<5*27%vi*r$X`zHpV$3m0Bx_E#%9d%#jVzXt#(4E*u4Llt+p%T<-
zC`I*ixS0I+q;ZD}b+P4VW@Yc72AqlC;z|s|oJD*)!l|g0xA@#V*BhgVCt(7v!({vw
zwFM!IP0jQ~U*gB;hZUEQ|N1n-sVLbE^}txv4I7;JM^sI`Kut9C3$ucbr~z}4uB@f_
z5e6?cFPsuoMxUYj4d4vx{%)xIr`t62fcr92<+D*MTZGlI6jg-BQ5m?3TB*zbnCsDw
zEpPzWJ7ElN#1?o1t6=Tr<^>ju)Vp;I_1>`itT4q^gt1)MjZN`B>V~={{Hn!lY=h-i
znt{_$E9i-u@Hx~edVpEzw#vMSvQf3P5mlrYQTJJ^%ibTh<x8V0aW_oEr5K3+LQiyE
zV~$-_R3?U?2K*3JObgHzSL0ONh+0U(SLU}~E>Z^81MGuy)>_slc&|*BFn*mmR$lAP
zfEk#~4cS-|7o!Vq!xa1$JK=N8!?X>&9kCR@L7$BrH9UffQ#SD(0H2{3{<ztEpSXa@
zN}>N2lj<yNL_8O#<38lbTb;f(Z?vDWH*v;RGvReOjraj-Yd+*?a6+wJ_%8M=<qIwT
zfbN*WY*bU}7>e0w*P}6oMkKC7&G0<7#oMT@h~f;^z;yJ+98?GIVSQYH(YOcw@V=wR
zcGF)N*5rDe6L&&A|K@f|NDtUtsD{NDg6kbmVi@rwN5Ah(5w%2h_%^De38?3np(a#{
zs{Wgpguy$^FR?zTg)YK;Jg|fOYsJlXniZsDF!5-N$71Y?KVdrz+GPfQ2bBpM>)<Ci
z5jUecj@xYpT7|L1r%)Lx_q}<(G3pq1v}pv>7=;aRA*%Qepayo?V+ML1m5BkUl}^WS
zT#P}u50!~qsAJ}~*Zhx-Xvfy5SA9<`hXZjo+PO47rtuWraPmG=EFYr=nvbn<H7Zm0
zP$~W!gE3;inOK_RP}H%Ui%Ru!tc}Mp1pmN^=zXB<E1Yf3rJ<Du9W>`N5B1<t)Pqm3
zIr{!!j%PR2iu*c_$0o#!QAK(R_559YAFCa5ehFbdaS3XI{y%C<ZT5vm1Q$NQF#H@F
z;~vz+9${5%d)WLLorP_Q2cQOAh4t}!Y=OU{-k_03%$L$^)Yi_%-uNB1N8h8)`R_+V
z11>_X<T$Eo%N;XC^BOiF9`3jZHNYWkg)dP>*6O&q?>!79{sL8``_LWFI9|m};@fC@
z(MbNutfV7)5)VLMd>7ThR8%c|ib~yD)P#0pI^M%9Y<j{J*BsPyg{c0QJMk6_B;Jq8
z^vx6Ge+dn@lV*k`7)-nY2jU4Fjq#^UD%ayE;wv~5dz?0}<UOb&bveUJ1ygYteu-L8
z<+J9P2B0S1(us$hW&f3`SzJiKO{hKn4K>qO&hh6N2B9|=qwZgW{&*afnY);VFEJI<
z&YS*bVI$%L7>iF)8LW4~e7jDvX{f^)s1DYl&h=xQhyE8SOk9teK-eX-(s-;xJQ`Ky
zpW)Z&b=myB--nvmS&YWJPV9HZynv!nMQ^9kP{+fuu`ZzYY%|8=9!$Wen1nG`&E5^c
z8pNNV?q7vUb*bZi)N>~>5G!0W3#*IDL}%>CaMlDG>fkV{gNxV_Z=)-QUpEglz+S|C
zQ7@9Mju%iF{2K>h&<&IF8CZ+>I}E~esEj>9jZ^byEu=aF(9rSdfQguag<j!-h0nsK
hZdo24lIYR6VQiD&MzPJ~<F=gW=jXB|GUwvN{{zH+Nd*7^

delta 9633
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
HZ_WHK^Qmfj

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 36a350578..cd9ee4b61 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -45,9 +45,9 @@ msgstr "Επιτυχής επανασύνδεση"
 msgid "Unknown command"
 msgstr "Άγνωστη εντολή"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "ʼΑγνωστο"
@@ -304,7 +304,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
@@ -349,7 +349,7 @@ msgstr "Επεξεργασία χρήστη %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
@@ -384,7 +384,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
@@ -484,108 +484,108 @@ msgstr "δεν διαμορφώθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "επεξεργασία μεταδεδομένων"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s δεν είναι μια έγκυρη γλώσσα"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Η επέκταση αρχείου '%(ext)s' δεν επιτρέπεται να ανέβει σε αυτό το διακομιστή"
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Το αρχείο προς ανέβασμα πρέπει να έχει μια επέκταση"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η άδεια απορρήφθηκε)."
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Μορφή αρχείου %(ext)s προστέθηκε σε %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Τα αναγνωριστικά δεν έχουν Διάκριση Πεζών-Κεφαλαίων Γραμμάτων, Αντικατάσταση Παλιού Αναγνωριστικού"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Τα μεταδεδομένα ενημερώθηκαν επιτυχώς"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "Σφάλμα επεξεργασίας βιβλίου, παρακαλούμε έλεγξε το φύλλο καταγραφής για λεπτομέρειες"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Το βιβλίο που ανέβηκε πιθανόν να υπάρχει στη βιβλιοθήκη, σκέψου να το αλλάξεις πριν ανεβάσεις νέο: "
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Το αρχείο %(filename)s δεν μπόρεσε να αποθηκευτεί σε temp dir"
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Αποτυχία Μετακίνησης Αρχείου Φόντου %(file)s: %(error)s"
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Το αρχείο %(file)s ανέβηκε"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Η δομή πηγής ή προορισμού για μετατροπή λείπει"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Το βιβλίο είναι σε σειρά επιτυχώς για μετατροπή σε %(book_format)s"
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Υπήρξε ένα σφάλμα στη μετατροπή αυτού του βιβλίου: %(res)s"
@@ -693,7 +693,7 @@ msgstr "Το αρχείο %(file)s δεν βρέθηκε στο Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
@@ -775,7 +775,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -840,8 +840,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -857,7 +857,7 @@ msgstr "Η μάρκα έχει λήξει"
 msgid "Success! Please return to your device"
 msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Βιβλία"
 
@@ -882,7 +882,7 @@ msgstr "Κατεβασμένα Βιβλία"
 msgid "Show Downloaded Books"
 msgstr "Προβολή Κατεβασμένων Βιβλίων"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Βιβλία με Κορυφαία Αξιολόγηση"
 
@@ -891,7 +891,7 @@ msgid "Show Top Rated Books"
 msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Βιβλία που Διαβάστηκαν"
 
@@ -900,7 +900,7 @@ msgid "Show read and unread"
 msgstr "Προβολή διαβασμένων και αδιάβαστων"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Βιβλία που δεν Διαβάστηκαν"
 
@@ -918,7 +918,7 @@ msgid "Show Random Books"
 msgstr "Προβολή Τυχαίων Βιβλίων"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -928,7 +928,7 @@ msgstr "Προβολή επιλογών κατηγορίας"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Σειρές"
 
@@ -946,7 +946,7 @@ msgid "Show author selection"
 msgstr "Προβολή επιλογών συγγραφέα"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Εκδότες"
 
@@ -956,7 +956,7 @@ msgstr "Προβολή επιλογών εκδότη"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Γλώσσες"
 
@@ -980,7 +980,7 @@ msgstr "Μορφές αρχείου"
 msgid "Show file formats selection"
 msgstr "Προβολή επιλογών μορφής αρχείου"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Αρχειοθετημένα Βιβλία"
 
@@ -988,7 +988,7 @@ msgstr "Αρχειοθετημένα Βιβλία"
 msgid "Show archived books"
 msgstr "Προβολή αρχειοθετημένων βιβλίων"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "Λίστα Βιβλίων"
 
@@ -1043,7 +1043,7 @@ msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sn
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Δημιούργησε ένα Ράφι"
 
@@ -1127,177 +1127,177 @@ msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε
 msgid "No release information available"
 msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες αποδέσμευσης"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Κατεβασμένα βιβλία από %(user)s"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Συγγραφέας: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Εκδότης: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Σειρές: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Αξιολόγηση: %(rating)s stars"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Μορφή αρχείου: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Κατηγορία: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Κατεβασμένα"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Λίστα αξιολογήσεων"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
@@ -1358,7 +1358,7 @@ msgstr "Διεύθυνση E-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Διεύθυνση E-mail Αποστολής στο Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Διαχειριστής"
@@ -1368,7 +1368,7 @@ msgstr "Διαχειριστής"
 msgid "Password"
 msgstr "Κωδικός"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Ανέβασμα"
@@ -1560,7 +1560,7 @@ msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1658,13 +1658,13 @@ msgstr "Μετατροπή βιβλίου"
 msgid "Book Title"
 msgstr "Τίτλος Βιβλίου"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Συγγραφέας"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -1672,15 +1672,15 @@ msgstr "Περιγραφή"
 msgid "Identifiers"
 msgstr "Αναγνωριστικά"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "Είδος Αναγνωριστικού"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "Τιμή Αναγνωριστικού"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Αφαίρεση"
@@ -1701,90 +1701,90 @@ msgstr "Ταυτότητα Σειράς"
 msgid "Rating"
 msgstr "Αξιολόγηση"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Συγκέντρωση Εξώφυλλου από URL (JPEG - Η εικόνα θα κατέβει και θα αποθηκευτεί σε βάση δεδομένων)"
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Ανέβασμα Εξώφυλλου από Τοπικό Δίσκο"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Ημερομηνία Έκδοσης"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Εκδότης"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ναι"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Όχι"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Μορφή Ανεβάσματος"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Προβολή Βιβλίου σε Αποθήκευση"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Συγκέντρωση Μεταδεδομένων"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Λέξη κλειδί"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr "Αναζήτηση λέξης κλειδιού"
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "Κάνε κλικ στο εξώφυλλο για φόρτωση μεταδεδομένων στη φόρμα"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Φόρτωση..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Πηγή"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Σφάλμα αναζήτησης!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Δεν βρέθηκε(αν) αποτέλεσμα(τα)! Παρακαλούμε δοκίμασε μια άλλη λέξη κλειδί."
 
@@ -1989,6 +1989,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Ενεργοποίηση Ανεβάσματος"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Επιτρεπόμενες Μορφές Αρχείων για Ανέβασμα"
@@ -2350,7 +2354,7 @@ msgid "Add to shelf"
 msgstr "Προσθήκη στο ράφι"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Δημόσιο)"
@@ -2425,7 +2429,7 @@ msgstr "Όνομα domain"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domains που Απορρίφθηκαν (Μαύρη λίστα)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2536,7 +2540,7 @@ msgstr "Τα βιβλία ταξινομήθηκαν ανά Αξιολόγηση
 msgid "Books ordered by file formats"
 msgstr "Τα βιβλία ταξινομήθηκαν ανά μορφές αρχείου"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Ράφια"
@@ -2557,48 +2561,48 @@ msgstr "Αλλαγή Θέσης Περιήγησης"
 msgid "Search Library"
 msgstr "Αναζήτηση Βιβλιοθήκης"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Φόρτωση..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Παρακαλούμε μην ανανεώσεις τη σελίδα"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Περιήγηση"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Σχετικά"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Λεπτομέρειες Βιβλίου"
 
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 4c9a8b5354c5ce76cca614e7bd490ec715e5f635..f3e46184cd697c34543cd4a51c8bab917c062f31 100644
GIT binary patch
delta 11067
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

delta 11155
zcmYk=3w+OI|Htt!vxA-3*o+Oo&CG@wo6|Je<}leXBqWD9&17>f?&7;p4kgJkhn!bA
zggKWSDy9(KZg<=%QGZGj#lIxnulKI&@%aCHsONQEzwht5KG)}SU0-X{7kFJ<;N^ZB
zT4}MvKbtE$P83cIQ}6%&IoZ&0n$bOl_3#lk#(Is+^SKyHzYs(5O*_63J@h}uB>W!z
zuo_?PjZyfN<G9Xv8mSC?hON;n(Q&*n4clQR`r>r-!ns%jU&jVmg8ujg2IB<`#2>Lb
z-bFp<-^7e3qn>M5-gh0R8x1YkA2m^)bu<Rke;%vgE2sdLpq^ij3S<px=lf94oj}d=
zH7cW5F$TRzLlDNHo^OtktnXyeP{c#A7LK(Kyo$;6-^R-Lr5*nomCBnKjDMhZ>eJM5
zvM~||Vm{{JF(ms=HR>3R?N9;bp&L$PCJnOhtU#6jIM&2((Fgy;0DOd1F@UI4k|<OL
zVo^Iz!%CQi)iB5Q2ctGP96dN5HUGk7>aQ<uWk5CBhl=z&Bxolv#RS$C+t43{Epa2N
z1Q$`?zk-z6`2`a&vbotvN9;qtKPu3js0^R5{j1H%zan|aKy8d@VIF9S`a%!eFF>Vw
zCPv~ytdHAJ89IlW_#!IBe_%Y;BwF2$Obo$%)aO%B>#lHVXrbMhho@{msg;>H3w7<f
zp>{eRwa`=y#bua^n^6=052{4IT&3z5fqE_x6+k*>U{6%Z-9<E%$|I=LS%xITIft6a
zpV=w96N#!}SJcE$qn;mwIvZ25J<dUu@)YWj-9_Dk2<oRmT3{M>M&@&!muV=qZ=xbx
zi<)pJR>4E4_rPh?f>j=K9Lns}#%kCDb?Am;T^xnAa4y!tji^9AMV0CrYW|z$Qvbhb
zXdxfMQUKwo+Qs7&*aJ1;3e*?(pceet_RCP2Ig7d#-=VJSkEl%jhPtl4ZB41GqEa7^
z39Rq*rlFL%s0ZIc?QA<n;HMal-=Ioz2cyvYaT8b!YQeTx1G7*W9fT@Lk?ohF<~f4O
z)OmF4(D;*vu1$@0<`89|b~qFjz(|b5mrx~Gg<-hadIVM5uTYt|j>_a8SQ9I!n+?@N
zZJ-ru-OlOMU#ZP!KoL(zo$>{!309&Od>{421E^A+vi)yR3*JO!;6AEE-W+i~A7YI`
z9r6@ZhEh?7yhny>Qt}D|B*9r_y@;w^WTtrqH%0AaC~BuuQ31Yz3Va<ZkR4bX527}5
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

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index fee74d1f8..549d4dc42 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -49,9 +49,9 @@ msgstr "Reconexión correcta"
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Desconocido"
@@ -308,7 +308,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
@@ -353,7 +353,7 @@ msgstr "Editar Usuario %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
@@ -388,7 +388,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
@@ -488,108 +488,108 @@ msgstr "no configurado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Formato de libro eliminado con éxito"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Libro eliminado con éxito"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "editar metadatos"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex) no es un número válido, saltando"
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s no es un idioma válido"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, 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:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Los identificadores no distinguen entre mayúsculas y minúsculas, sobrescribiendo el identificador antiguo"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Metadatos actualizados con éxito"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 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:892
+#: cps/editbooks.py:895
 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:986
+#: cps/editbooks.py:993
 #, 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:1005
+#: cps/editbooks.py:1012
 #, 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:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "El fichero %(file)s ha sido subido"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Falta la fuente o el formato de destino para la conversión"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocurrió un error al convertir este libro: %(res)s"
@@ -697,7 +697,7 @@ msgstr "Fichero %(file)s no encontrado en Google Drive"
 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:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
@@ -779,7 +779,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -844,8 +844,8 @@ msgstr "Error Google Oauth {}"
 msgid "{} Stars"
 msgstr "{} Estrellas"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -861,7 +861,7 @@ msgstr "El token ha expirado"
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Libros"
 
@@ -886,7 +886,7 @@ msgstr "Libros Descargados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Libros Descargados"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Libros mejor valorados"
 
@@ -895,7 +895,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Libros leídos"
 
@@ -904,7 +904,7 @@ msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
@@ -922,7 +922,7 @@ msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Categorías"
 
@@ -932,7 +932,7 @@ msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Series"
 
@@ -950,7 +950,7 @@ msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Editores"
 
@@ -960,7 +960,7 @@ msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -984,7 +984,7 @@ msgstr "Formatos de archivo"
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Libros archivados"
 
@@ -992,7 +992,7 @@ msgstr "Libros archivados"
 msgid "Show archived books"
 msgstr "Mostrar libros archivados"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "Lista de Libros"
 
@@ -1047,7 +1047,7 @@ msgstr "El libro fue eliminado del estante: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
@@ -1131,177 +1131,177 @@ msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo
 msgid "No release information available"
 msgstr "No hay información del lanzamiento disponible"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Libros descargados por %(user)s"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Descargas"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = $(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, 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:1468
+#: cps/web.py:1463
 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:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 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:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, 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:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 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:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
@@ -1362,7 +1362,7 @@ msgstr "Correo electrónico"
 msgid "Send to Kindle E-mail Address"
 msgstr "Enviar al correo de Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1372,7 +1372,7 @@ msgstr "Admin"
 msgid "Password"
 msgstr "Contraseña"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Subir archivo"
@@ -1564,7 +1564,7 @@ msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1662,13 +1662,13 @@ msgstr "Convertir libro"
 msgid "Book Title"
 msgstr "Título del libro"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Descripción"
 
@@ -1676,15 +1676,15 @@ msgstr "Descripción"
 msgid "Identifiers"
 msgstr "Identificadores"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "Tipo de identificador"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "Valor de identificador"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Borrar"
@@ -1705,90 +1705,90 @@ msgstr "ID de serie"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 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:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Subir portada desde un disco local"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Fecha de publicación"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editor"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Idioma"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Sí"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Subir formato"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Ver libro tras la edición"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Obtener metadatos"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Guardar"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Palabra clave"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Buscar por palabras clave "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 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:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Cerrar"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Origen"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "¡Error en la búsqueda!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "¡No se encontraron resultados! Por favor intenta con otra palabra clave."
 
@@ -1993,6 +1993,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Permitir subidas"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Formatos de archivo permitidos para subida"
@@ -2354,7 +2358,7 @@ msgid "Add to shelf"
 msgstr "Agregar al estante"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Público)"
@@ -2429,7 +2433,7 @@ msgstr "Introducir nombre de dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominios prohibidos (Blaclist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2540,7 +2544,7 @@ msgstr "Libros ordenados por puntuación"
 msgid "Books ordered by file formats"
 msgstr "Libros ordenados por formato de archivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Estanterías"
@@ -2561,48 +2565,48 @@ msgstr "Alternar navegación"
 msgid "Search Library"
 msgstr "Buscar en la librería"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Cargando..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Error"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ajustes"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Cuenta"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Por favor, no actualice la página"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Detalles del libro"
 
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index bf9771a25e71dfc2d8b6ea6e419f24f8739418ab..e0e7ec8b462a9ca5ba87eb80b45ac97d024c1d06 100644
GIT binary patch
delta 6739
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

delta 6826
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
TuPUqZR+N`jme<Ag3GDnoBXR}%

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index cdf9498c7..5d9188731 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -304,7 +304,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
@@ -349,7 +349,7 @@ msgstr "Muokkaa käyttäjää %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
@@ -384,7 +384,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
@@ -482,108 +482,108 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "muokkaa metadataa"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s ei ole kelvollinen kieli"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Ladattavalla tiedostolla on oltava tiedostopääte"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Tiedostoformaatti %(ext)s lisätty %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Metadata päivitetty onnistuneesti"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "Kirjan editoinnissa tapahtui virhe, tarkista virheilmoitus lokista"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Tiedosto %(file)s tallennettu"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Lähteen tai kohteen tiedostomuoto puuttuu"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kirja lisätty muutosjonoon muotoon %(book_format)s"
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Kirjan muunnoksessa tapahtui virhe: %(res)s"
@@ -691,7 +691,7 @@ msgstr "Tiedostoa %(file)s ei löytynyt Google Drivesta"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
@@ -773,7 +773,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -838,8 +838,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -855,7 +855,7 @@ msgstr "Valtuutus vanhentunut"
 msgid "Success! Please return to your device"
 msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Kirjat"
 
@@ -880,7 +880,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Parhaiten arvioidut kirjat"
 
@@ -889,7 +889,7 @@ msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
@@ -898,7 +898,7 @@ msgid "Show read and unread"
 msgstr "Näytä luetut ja lukemattomat"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
@@ -916,7 +916,7 @@ msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Kategoriat"
 
@@ -926,7 +926,7 @@ msgstr "Näytä kategoriavalinta"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Sarjat"
 
@@ -944,7 +944,7 @@ msgid "Show author selection"
 msgstr "Näytä kirjailijavalinta"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Julkaisijat"
 
@@ -954,7 +954,7 @@ msgstr "Näytä julkaisijavalinta"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Kielet"
 
@@ -978,7 +978,7 @@ msgstr "Tiedotomuodot"
 msgid "Show file formats selection"
 msgstr "Näytä tiedostomuotovalinta"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr ""
 
@@ -986,7 +986,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1041,7 +1041,7 @@ msgstr "Kirja on poistettu hyllystä: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "luo hylly"
 
@@ -1125,177 +1125,177 @@ msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi ve
 msgid "No release information available"
 msgstr "Ei päivitystietoa saatavilla"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Hae"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Arvostelulistaus"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, 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:1468
+#: cps/web.py:1463
 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:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
@@ -1356,7 +1356,7 @@ msgstr "Sähköposti"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Ylläpito"
@@ -1366,7 +1366,7 @@ msgstr "Ylläpito"
 msgid "Password"
 msgstr "Salasana"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Lähetä"
@@ -1558,7 +1558,7 @@ msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1656,13 +1656,13 @@ msgstr "Muunna kirja"
 msgid "Book Title"
 msgstr "Kirjan otsikko"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Kirjailija"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -1670,15 +1670,15 @@ msgstr "Kuvaus"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
@@ -1699,90 +1699,90 @@ msgstr ""
 msgid "Rating"
 msgstr "Arvostelu"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 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:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Lataa kuva paikalliselta levyltä"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Julkaisupäivä"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Julkaisija"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Kieli"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Kyllä"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Ei"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Lataa tiedostomuoto"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "katso kirjaa muokkauksen jälkeen"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Hae metadata"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Avainsana"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Hae avainsanaa "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "Klikkaa kantta ladataksesi metadata lomakkeelle"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Sulje"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Lähde"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Hakuvirhe!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Ei osumia! Kokeile jotain tosita hakusanaa."
 
@@ -1986,6 +1986,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Salli lähetys"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr ""
@@ -2347,7 +2351,7 @@ msgid "Add to shelf"
 msgstr "Lisää hyllyyn"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
@@ -2422,7 +2426,7 @@ msgstr "Syötä domainnimi"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Seuraava"
 
@@ -2532,7 +2536,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2553,48 +2557,48 @@ msgstr "Vaihda navigointi"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Ladataan..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Virhe"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Asetukset"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Tili"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Selaa"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Tietoja"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Edellinen"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Kirjan tiedot"
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 942ea659c8ff73c4776903bec3bbda6de74f740e..7992b4fece30cdaf74768aa8eb8a3e977959348b 100644
GIT binary patch
delta 11051
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
YJ9|2&W_Ibc>%f%bx9!?9t)S%p0AT+H5&!@I

delta 11143
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
YH9B{kt7ufdc`@J2lE0(Rn9P^|4=6n&00000

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 53716e5e2..36b452996 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -61,9 +61,9 @@ msgstr "Reconnecté avec succès"
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Inconnu"
@@ -320,7 +320,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
@@ -365,7 +365,7 @@ msgstr "Éditer l'utilisateur %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
@@ -400,7 +400,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
@@ -500,108 +500,108 @@ msgstr "non configuré"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, 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/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Le format du livre a été supprimé avec succès"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Le livre a été supprimé avec succès"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s n’est pas un nombre valide, ignoré"
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s n'est pas une langue valide"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être déposé le fichier doit avoir une extension"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, 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:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, 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:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Les identificateurs ne sont pas sensibles à la casse, écrasant l’ancien identificateur"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Les métadonnées ont bien été mises à jour"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 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:892
+#: cps/editbooks.py:895
 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:986
+#: cps/editbooks.py:993
 #, 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:1005
+#: cps/editbooks.py:1012
 #, 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:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Le fichier %(file)s a été téléchargé"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 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:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, 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"
@@ -709,7 +709,7 @@ msgstr "Le fichier %(file)s n'a pas été trouvé dans Google Drive"
 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:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
@@ -791,7 +791,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -856,8 +856,8 @@ msgstr "Erreur Oauth Google : {}"
 msgid "{} Stars"
 msgstr "{} Étoiles"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Connexion"
 
@@ -873,7 +873,7 @@ msgstr "Jeton expiré"
 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:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Livres"
 
@@ -898,7 +898,7 @@ msgstr "Livres téléchargés"
 msgid "Show Downloaded Books"
 msgstr "Montrer les livres téléchargés"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Livres les mieux notés"
 
@@ -907,7 +907,7 @@ msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Livres lus"
 
@@ -916,7 +916,7 @@ msgid "Show read and unread"
 msgstr "Montrer lus et non-lus"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
@@ -934,7 +934,7 @@ msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Catégories"
 
@@ -944,7 +944,7 @@ msgstr "Montrer la sélection par catégories"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Séries"
 
@@ -962,7 +962,7 @@ msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Éditeurs"
 
@@ -972,7 +972,7 @@ msgstr "Montrer la sélection par éditeur"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Langues"
 
@@ -996,7 +996,7 @@ msgstr "Formats de fichier"
 msgid "Show file formats selection"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Livres archivés"
 
@@ -1004,7 +1004,7 @@ msgstr "Livres archivés"
 msgid "Show archived books"
 msgstr "Afficher les livres archivés"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "Liste des livres"
 
@@ -1059,7 +1059,7 @@ msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
@@ -1143,177 +1143,177 @@ msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-desso
 msgid "No release information available"
 msgstr "Aucune information concernant cette version n’est disponible"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Découvrir (Livres au hasard)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livres téléchargés par %(user)s"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur : %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Éditeur : '%(name)s'"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Liste des évaluations"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de lecture = %(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, 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:1468
+#: cps/web.py:1463
 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:1485
+#: cps/web.py:1480
 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/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, 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:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 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:1582
+#: cps/web.py:1577
 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:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
@@ -1374,7 +1374,7 @@ msgstr "Adresse de courriel"
 msgid "Send to Kindle E-mail Address"
 msgstr "Envoyer vers une adresse de courriel Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administration"
@@ -1384,7 +1384,7 @@ msgstr "Administration"
 msgid "Password"
 msgstr "Mot de passe"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Téléverser"
@@ -1576,7 +1576,7 @@ msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1674,13 +1674,13 @@ msgstr "Convertir le livre"
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Description"
 
@@ -1688,15 +1688,15 @@ msgstr "Description"
 msgid "Identifiers"
 msgstr "Identifiants"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "Type d'identifiant"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "Valeur d'identifiant"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Supprimer"
@@ -1717,90 +1717,90 @@ msgstr "ID de séries"
 msgid "Rating"
 msgstr "Évaluation"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 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:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Téléverser la couverture depuis un fichier en local"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Date de publication"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Éditeur"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Langue"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Oui"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Non"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Format du fichier téléversé"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Voir le livre lors de la sauvegarde"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Obtenir les métadonnées"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Mot-clé"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Rechercher le mot-clé "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 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:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Fermer"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Source"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Erreur lors de la recherche!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Aucun résultat. Veuillez essayer avec un nouveau mot clé."
 
@@ -2005,6 +2005,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Autoriser le téléversement de fichier"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Formats de fichiers à télécharger autorisés"
@@ -2366,7 +2370,7 @@ msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Public)"
@@ -2441,7 +2445,7 @@ msgstr "Saisir le nom du domaine"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domaines refusés (Liste noire)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Suivant"
 
@@ -2552,7 +2556,7 @@ msgstr "Livres classés par évaluation"
 msgid "Books ordered by file formats"
 msgstr "Livres classés par formats de fichiers"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Etagères"
@@ -2573,48 +2577,48 @@ msgstr "Basculer la navigation"
 msgid "Search Library"
 msgstr "Chercher dans librairie"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Téléversement en cours..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Erreur"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Paramètres"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Compte"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Veuillez ne pas rafraîchir la page"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "À propos"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Précédent"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Détails du livre"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 66c1dc52f8bc75270bfa0b1e1916f0e9c8d6dba3..dbec4a92aacf60d8516b3eb2a286f5755078bae1 100644
GIT binary patch
delta 5851
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%0DE|yeCJ{%j>LK#fcIcO+=)H$Ep!6^
zK=;t6Xa>&Jk^f8znX{ueSRQ(z1iRyS^uf!}2d_Z`U5HchNp!|-XzD-1;dl<+Y~@!)
z8K^`zXC3y&@1jezHbKD$x1fP+M~~f0XaIjgm!=KdBgZ`I=i=-AuZ}t_M+2RP6<CL+
zxDoC5VKlSbaVWln-j_({b>xgMMjyBWjjRDp?J69FO*jY-$L;??@9S9~?TKM%y&6sZ
zA}q!`;`%Sp{(g@h&kvByB|_(Gq8CI@bf&Y=6xE}tU5?IRC3eEQ(A3_CW^NPq!ma2F
zX;0k#A^QAjG;?Rs45hG<?7utu{SyXL@H{U?Gq3_(!yn>k+=Xt&kI|IneKY!PI2--$
zxDET@?U;{`Vm9tZGkXk+@Fb4K%z4p7rehDr549F>F}izKp)=f!?%t;{7xyCHq~Sdr
zfrZyb_g#g9sV_ihwjK@q33Ng&=*<6#_Hzb(fAne~|Gv=*DLC*{EXO5iK#$@1_#B$b
zgJ?%@;Xr&3oq5XqD3JWvQgp^+&<tIR?xE|^jBG@gZ2No?>Hxo`!IZrd-*5`eKnD)H
v17xCWUxIc#>c>sJZ{Kn8`H$yy8eTSRWPbUuaid1;Xsg(qw4-@Uhm!vT`w(^b

delta 5941
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
S$})ypS+;ojq3OAPss9B4GmFgt

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index cbc61c951..6343df50d 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Ismeretlen"
@@ -304,7 +304,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
@@ -349,7 +349,7 @@ msgstr " A felhasználó szerkesztése: %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
@@ -384,7 +384,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
@@ -482,108 +482,108 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "Metaadatok szerkesztése"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "A(z) %(langname)s nem érvényes nyelv"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, 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:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, 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:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "A metaadatok sikeresen frissültek"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 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:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 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:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, 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"
@@ -691,7 +691,7 @@ msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
 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:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
@@ -773,7 +773,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -838,8 +838,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Belépés"
 
@@ -855,7 +855,7 @@ msgstr "A token érvényessége lejárt."
 msgid "Success! Please return to your device"
 msgstr "Sikerült! Újra használható az eszköz."
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr ""
 
@@ -880,7 +880,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Legjobb könyvek"
 
@@ -889,7 +889,7 @@ msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
@@ -898,7 +898,7 @@ msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
@@ -916,7 +916,7 @@ msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Címkék"
 
@@ -926,7 +926,7 @@ msgstr "Címke választó mutatása"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Sorozatok"
 
@@ -944,7 +944,7 @@ msgid "Show author selection"
 msgstr "Szerző választó mutatása"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Kiadók"
 
@@ -954,7 +954,7 @@ msgstr "Kiadó választó mutatása"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -978,7 +978,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr ""
 
@@ -986,7 +986,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1041,7 +1041,7 @@ msgstr "A könyv el lett távolítva a polcról: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Polc készítése"
 
@@ -1125,177 +1125,177 @@ msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez
 msgid "No release information available"
 msgstr "Nincs információ a kiadásról."
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Keresés"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Letöltések"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, 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:1468
+#: cps/web.py:1463
 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:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 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:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
@@ -1356,7 +1356,7 @@ msgstr "E-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Rendszergazda"
@@ -1366,7 +1366,7 @@ msgstr "Rendszergazda"
 msgid "Password"
 msgstr "Jelszó"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Feltöltés"
@@ -1558,7 +1558,7 @@ msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1656,13 +1656,13 @@ msgstr "Könyv konvertálása"
 msgid "Book Title"
 msgstr "Könyv címe"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Szerző"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Leírás"
 
@@ -1670,15 +1670,15 @@ msgstr "Leírás"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
@@ -1699,90 +1699,90 @@ msgstr ""
 msgid "Rating"
 msgstr "Értékelés"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 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:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Borító feltöltése helyi meghajtóról"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Kiadás éve"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Kiadó"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Nyelv"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Igen"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nem"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Feltöltés formátuma"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Könyv megnézése szerkesztés után"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Metaadatok beszerzése"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Kulcsszó"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Keresési kulcsszó "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 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:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Bezárás"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Forrás"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Keresési hiba!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nincs találat! Próbálj másik kulcsszót."
 
@@ -1986,6 +1986,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Feltöltés engedélyezése"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr ""
@@ -2347,7 +2351,7 @@ msgid "Add to shelf"
 msgstr "Hozzáadás polchoz"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
@@ -2422,7 +2426,7 @@ msgstr "Tartomány megadása"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Következő"
 
@@ -2532,7 +2536,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2553,48 +2557,48 @@ msgstr "Navigáció átkapcsolása"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Hiba"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Beállítások"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Felhasználói fiók"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Kilépés"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Böngészés"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Névjegy"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Előző"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Könyv részletei"
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index edf183ba61484d57446c7abdc739e5c5751136b0..83bc12dc196acdc03c2c516d990a97fce95dcb3f 100644
GIT binary patch
delta 11819
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
TvNO{+mrnk%%I4RnY<l8<Kr)Ue

delta 11908
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

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 2fb8119bd..15bd2a433 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -45,9 +45,9 @@ msgstr "Ricollegato con successo"
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -297,7 +297,7 @@ msgstr "Configurazione del Database aggiornata"
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
@@ -341,7 +341,7 @@ msgstr "Modifica l'utente %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
@@ -376,7 +376,7 @@ msgstr "Configurazione del server e-mail aggiornata"
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
@@ -474,108 +474,108 @@ msgstr "non configurato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, 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/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Il formato del libro è stato eliminato con successo"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "modifica i metadati"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s non è un numero valido, proseguo"
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s non è una lingua valida"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, 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:811
+#: cps/editbooks.py:810
 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:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "I metadati sono stati aggiornati con successo"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 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:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiare prima di sottoporlo nuovamente: "
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, 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:1005
+#: cps/editbooks.py:1012
 #, 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:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Il file %(file)s è stato caricato"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Mancano o il formato sorgente o quello di destinazione, entrambi necessari alla conversione"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
@@ -683,7 +683,7 @@ msgstr "File %(file)s non trovato su Google Drive"
 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:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
@@ -764,7 +764,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -829,8 +829,8 @@ msgstr "Google, errore Oauth: {}"
 msgid "{} Stars"
 msgstr "{} Stelle"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Accesso"
 
@@ -846,7 +846,7 @@ msgstr "Il token è scaduto"
 msgid "Success! Please return to your device"
 msgstr "Riuscito! Torna al tuo dispositivo"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Libri"
 
@@ -871,7 +871,7 @@ msgstr "Libri scaricati"
 msgid "Show Downloaded Books"
 msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Libri meglio valutati"
 
@@ -880,7 +880,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Libri letti"
 
@@ -889,7 +889,7 @@ msgid "Show read and unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Libri non letti"
 
@@ -907,7 +907,7 @@ msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Categorie"
 
@@ -917,7 +917,7 @@ msgstr "Mostra l'opzione per la selezione delle categorie"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Serie"
 
@@ -935,7 +935,7 @@ msgid "Show author selection"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Editori"
 
@@ -945,7 +945,7 @@ msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Lingue"
 
@@ -969,7 +969,7 @@ msgstr "Formati file"
 msgid "Show file formats selection"
 msgstr "Mostra l'opzione per la selezione del formato dei file"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
@@ -977,7 +977,7 @@ msgstr "Libri archiviati"
 msgid "Show archived books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "Elenco libri"
 
@@ -1032,7 +1032,7 @@ msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
@@ -1115,177 +1115,177 @@ msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per agg
 msgid "No release information available"
 msgstr "Non sono disponibili informazioni sulla versione"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "I libri scaricati da %(user)s"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Cerca"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Elenco delle valutazioni"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Stato di lettura = %(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 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:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
@@ -1346,7 +1346,7 @@ msgstr "Indirizzo e-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Invia all'indirizzo e-mail di Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Amministrazione"
@@ -1356,7 +1356,7 @@ msgstr "Amministrazione"
 msgid "Password"
 msgstr "Password"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
@@ -1547,7 +1547,7 @@ msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1645,13 +1645,13 @@ msgstr "Converti libro"
 msgid "Book Title"
 msgstr "Titolo del libro"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autore"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Descrizione"
 
@@ -1659,15 +1659,15 @@ msgstr "Descrizione"
 msgid "Identifiers"
 msgstr "Identificatori"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "Tipo di identificatore"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "Valore dell'identificatore"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Rimuovi"
@@ -1688,89 +1688,89 @@ msgstr "ID della serie"
 msgid "Rating"
 msgstr "Valutazione"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Carica la copertina da URL (jpeg - l'immagine della copertina viene scaricata e salvata nel database)"
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Carica la copertina dal disco locale"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Data di pubblicazione"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editore"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Lingua"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Sì"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Carica formato"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Visualizza il libro dopo la modifica"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Ottieni metadati"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Salva"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Parola chiave"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 msgid "Search keyword"
 msgstr "Cerca parola chiave"
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "Fai clic sulla copertina per caricare i metadati nel modulo"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Chiudi"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Fonte"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Errore nella ricerca!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nessun risultato! Prova con un altro criterio di ricerca."
 
@@ -1973,6 +1973,10 @@ msgstr "Converti caratteri non inglesi del titolo e dell'autore durante il salva
 msgid "Enable Uploads"
 msgstr "Abilita il caricamento"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Formati di file autorizzati ad essere caricati"
@@ -2332,7 +2336,7 @@ msgid "Add to shelf"
 msgstr "Aggiungi allo scaffale"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Pubblico)"
@@ -2407,7 +2411,7 @@ msgstr "Digita il nome di dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominii bloccati per la registrazione (Blacklist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Prossimo"
 
@@ -2517,7 +2521,7 @@ msgstr "Libri ordinati per valutazione"
 msgid "Books ordered by file formats"
 msgstr "Libri ordinati per formato"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Scaffali"
@@ -2538,48 +2542,48 @@ msgstr "Alterna navigazione"
 msgid "Search Library"
 msgstr "Ricerca nella libreria"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Uploading..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Errore"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Configurazione"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Per favore non ricaricare la pagina"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Naviga"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informazioni su"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Precedente"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Dettagli del libro"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index f0f34b232cfbe9fd10dfc3e74de09fc9b895c3f9..b06a320d21d524773715ee55fa6b37f71a91ff5e 100644
GIT binary patch
delta 4577
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
I^CqPK50%r(H2?qr

delta 4665
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

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 4b560850c..db9458ffd 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "不明"
@@ -299,7 +299,7 @@ msgstr "メールサーバの設定を更新しました"
 msgid "Database Configuration"
 msgstr "機能設定"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
@@ -344,7 +344,7 @@ msgstr "%(nick)s を編集"
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
@@ -379,7 +379,7 @@ msgstr "メールサーバの設定を更新しました"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
@@ -477,108 +477,108 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "メタデータを編集"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s は有効な言語ではありません"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "アップロードするファイルには拡張子が必要です"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "メタデータを更新しました"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "本の編集でエラーが発生しました。詳細はログファイルを確認してください"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "変換元の形式または変換後の形式が指定されていません"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "本の %(book_format)s への変換がキューに追加されました"
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "この本の変換中にエラーが発生しました: %(res)s"
@@ -686,7 +686,7 @@ msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "このメールアドレスで登録されたアカウントがあります"
@@ -768,7 +768,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -833,8 +833,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "ログイン"
 
@@ -850,7 +850,7 @@ msgstr "トークンが無効です"
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr ""
 
@@ -875,7 +875,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr ""
 
@@ -884,7 +884,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "読んだ本"
 
@@ -893,7 +893,7 @@ msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "未読の本"
 
@@ -911,7 +911,7 @@ msgid "Show Random Books"
 msgstr "ランダムで本を表示"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -921,7 +921,7 @@ msgstr "カテゴリ選択を表示"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "シリーズ"
 
@@ -939,7 +939,7 @@ msgid "Show author selection"
 msgstr "著者選択を表示"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "出版社"
 
@@ -949,7 +949,7 @@ msgstr "出版社選択を表示"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "言語"
 
@@ -973,7 +973,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr ""
 
@@ -981,7 +981,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1036,7 +1036,7 @@ msgstr "本が %(sname)s から削除されました"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "本棚を作成する"
 
@@ -1120,177 +1120,177 @@ msgstr "アップデートが利用可能です。下のボタンをクリック
 msgid "No release information available"
 msgstr "リリース情報がありません"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムで表示)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "詳細検索"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "検索"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
@@ -1351,7 +1351,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理者"
@@ -1361,7 +1361,7 @@ msgstr "管理者"
 msgid "Password"
 msgstr "パスワード"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "アップロード"
@@ -1553,7 +1553,7 @@ msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1651,13 +1651,13 @@ msgstr "本を変換"
 msgid "Book Title"
 msgstr "本のタイトル"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "著者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "詳細"
 
@@ -1665,15 +1665,15 @@ msgstr "詳細"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
@@ -1694,90 +1694,90 @@ msgstr ""
 msgid "Rating"
 msgstr "評価"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "言語"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "はい"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "いいえ"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "キーワード"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr "キーワードを検索"
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "カバー画像をクリックしてメタデータをフォームに読み込んでください"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "閉じる"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "ソース"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "検索エラー"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "検索結果が見つかりません。別のキーワードで検索してみてください。"
 
@@ -1981,6 +1981,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr ""
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr ""
@@ -2341,7 +2345,7 @@ msgid "Add to shelf"
 msgstr "本棚に追加"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
@@ -2416,7 +2420,7 @@ msgstr "ドメイン名を入力"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "次"
 
@@ -2526,7 +2530,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2547,48 +2551,48 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "アップロード中..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "エラー"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "設定"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "アカウント"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "ログアウト"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "閲覧"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "このサイトについて"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "前"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "本の詳細"
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index b85040b6dd652428607cfbe3964ac6f50e3e2449..b5af5537715f8d298363de2cee539899c4606272 100644
GIT binary patch
delta 25
hcmaE~pYhRt#tr*bxQuiSOcV?atW1qJpHz{w1^|Qx2)qCQ

delta 25
hcmaE~pYhRt#tr*bxD0iTj1>$mt&A);pHz{w1^|R*2*>~c

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 8f7f70e98..365a89f75 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -47,9 +47,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "មិនដឹង"
@@ -305,7 +305,7 @@ msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
@@ -349,7 +349,7 @@ msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
@@ -482,108 +482,108 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
+#: cps/editbooks.py:490 cps/editbooks.py:954
 #, python-format
-msgid "%(langname)s is not a valid language"
+msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -691,7 +691,7 @@ msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -772,7 +772,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -837,8 +837,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -854,7 +854,7 @@ msgstr "វត្ថុតាងហួសពេលកំណត់"
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr ""
 
@@ -879,7 +879,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
@@ -888,7 +888,7 @@ msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
@@ -897,7 +897,7 @@ msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
@@ -915,7 +915,7 @@ msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
@@ -925,7 +925,7 @@ msgstr "បង្ហាញជម្រើសប្រភេទ"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "ស៊េរី"
 
@@ -943,7 +943,7 @@ msgid "Show author selection"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr ""
 
@@ -953,7 +953,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "ភាសានានា"
 
@@ -977,7 +977,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr ""
 
@@ -985,7 +985,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
@@ -1124,177 +1124,177 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "ឯកសារ DLS"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr "ឧបករណ៍ Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "រដ្ឋបាល"
@@ -1365,7 +1365,7 @@ msgstr "រដ្ឋបាល"
 msgid "Password"
 msgstr "លេខសម្ងាត់"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "អាប់ឡូដ"
@@ -1557,7 +1557,7 @@ msgid "OK"
 msgstr "បាទ/ចាស"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1655,13 +1655,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "ចំណងជើងសៀវភៅ"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "អ្នកនិពន្ធ"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "ពិពណ៌នា"
 
@@ -1669,15 +1669,15 @@ msgstr "ពិពណ៌នា"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
@@ -1698,90 +1698,90 @@ msgstr "លេខសម្គាល់ស៊េរី"
 msgid "Rating"
 msgstr "ការវាយតម្លៃ"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL របស់ក្របមុខ (ឯកសារ JPG ក្របមុខត្រូវបានទាញយក និងរក្សាទុកក្នុង database ក្រោយមកចន្លោះនេះទទេម្តងទៀត)"
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "ថ្ងៃបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "អ្នកបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "ភាសា"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "ទេ"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "ទម្រង់អាប់ឡូដ"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "មើលសៀវភៅក្រោយពីកែប្រែ"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "ពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr "ស្វែងរកពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិន្នន័យមេតាទៅក្នុង form"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "កំពុងដំណើរការ..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "បិទ"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "ប្រភព"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "ការស្វែងរកមានកំហុស!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1984,6 +1984,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr ""
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr ""
@@ -2345,7 +2349,7 @@ msgid "Add to shelf"
 msgstr "បន្ថែមទៅធ្នើ"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
@@ -2420,7 +2424,7 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "បន្ទាប់"
 
@@ -2530,7 +2534,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2551,48 +2555,48 @@ msgstr "បិទ/បើកការរុករក"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "កំពុងអាប់ឡូត..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr ""
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "ការកំណត់"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "ចេញពីការប្រើប្រាស់"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "រុករក"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "អំពី"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "មុន"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "ព័ត៌មានលម្អិតរបស់សៀវភៅ"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 8dc8d59d65c55e294a17bb834ad709984216b83a..f28ef909238595059682a535b7aa3c3d88217c81 100644
GIT binary patch
delta 11304
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

delta 11376
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

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 37e23246f..7cc832e68 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -47,9 +47,9 @@ msgstr "Opnieuw verbinden gelukt"
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Onbekend"
@@ -305,7 +305,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
@@ -350,7 +350,7 @@ msgstr "Gebruiker '%(nick)s' bewerken"
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
@@ -385,7 +385,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
@@ -485,108 +485,108 @@ msgstr "niet geconfigureerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Het boekformaat is verwijderd"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "metagegevens bewerken"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s is geen geldig nummer, sla het over"
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s is geen geldige taal"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identificatoren zijn niet hoofdlettergevoelig, overschrijf huidige identificatoren"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "De metagegevens zijn bijgewerkt"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "Kan het boek niet bewerken, controleer het logbestand"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 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:986
+#: cps/editbooks.py:993
 #, 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:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Omslag %(file)s niet verplaatst: %(error)s"
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Bestand %(file)s geüpload"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Bron- of doelformaat ontbreekt voor conversie"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, 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"
@@ -694,7 +694,7 @@ msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
@@ -776,7 +776,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -841,8 +841,8 @@ msgstr "Google OAuth foutmelding: {}"
 msgid "{} Stars"
 msgstr "{} sterren"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Inloggen"
 
@@ -858,7 +858,7 @@ msgstr "Toegangssleutel is verlopen"
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Boeken"
 
@@ -883,7 +883,7 @@ msgstr "Gedownloade boeken"
 msgid "Show Downloaded Books"
 msgstr "Gedownloade boeken tonen"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
@@ -892,7 +892,7 @@ msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
@@ -901,7 +901,7 @@ msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
@@ -919,7 +919,7 @@ msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -929,7 +929,7 @@ msgstr "Categoriekeuze tonen"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Boekenreeksen"
 
@@ -947,7 +947,7 @@ msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Uitgevers"
 
@@ -957,7 +957,7 @@ msgstr "Uitgeverskeuze tonen"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Talen"
 
@@ -981,7 +981,7 @@ msgstr "Bestandsformaten"
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
@@ -989,7 +989,7 @@ msgstr "Gearchiveerde boeken"
 msgid "Show archived books"
 msgstr "Gearchiveerde boeken tonen"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "Boekenlijst"
 
@@ -1044,7 +1044,7 @@ msgstr "Het boek is verwijderd van boekenplank: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Boekenplank maken"
 
@@ -1128,177 +1128,177 @@ msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten na
 msgid "No release information available"
 msgstr "Geen update-informatie beschikbaar"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Gedownloade boeken door %(user)s"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lees Status = %(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, 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:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 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:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
@@ -1359,7 +1359,7 @@ msgstr "E-mailadres"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle-e-mailadres"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Beheer"
@@ -1369,7 +1369,7 @@ msgstr "Beheer"
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Uploaden"
@@ -1561,7 +1561,7 @@ msgid "OK"
 msgstr "Oké"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1659,13 +1659,13 @@ msgstr "Boek converteren"
 msgid "Book Title"
 msgstr "Boektitel"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -1673,15 +1673,15 @@ msgstr "Omschrijving"
 msgid "Identifiers"
 msgstr "Identificatoren"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "Identificatie type"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "Identificatie waarde"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Verwijderen"
@@ -1702,90 +1702,90 @@ msgstr "Boekenreeks volgnummer"
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 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:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Omslag uploaden vanaf de harde schijf"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Publicatiedatum"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Uitgever"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Taal"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nee"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Uploadformaat"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Boek inkijken na bewerking"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Metagegevens ophalen"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Opslaan"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Trefwoord"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Trefwoord zoeken "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 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:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Sluiten"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Bron"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Zoekfout!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Geen resultaten gevonden! Gebruik een ander trefwoord."
 
@@ -1990,6 +1990,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Uploaden inschakelen"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Toegelaten upload bestandsformaten"
@@ -2351,7 +2355,7 @@ msgid "Add to shelf"
 msgstr "Toevoegen aan boekenplank"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Openbaar)"
@@ -2426,7 +2430,7 @@ msgstr "Voer domeinnaam in"
 msgid "Denied Domains (Blacklist)"
 msgstr "Geweigerde domeinen voor registratie"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Volgende"
 
@@ -2537,7 +2541,7 @@ msgstr "Boeken gesorteerd op beoordeling"
 msgid "Books ordered by file formats"
 msgstr "Boeken gesorteerd op bestandsformaat"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Boekenplanken"
@@ -2558,48 +2562,48 @@ msgstr "Navigatie aanpassen"
 msgid "Search Library"
 msgstr "Zoek in bibliotheek"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Bezig met uploaden..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Fout"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Instellingen"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Afmelden"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Deze pagina niet vernieuwen"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Verkennen"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informatie"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Vorige"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Boekgegevens"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index b6d4e65ef195d33fa66b94d8fde6e66bf4f3b496..641be5ae3a745cc1b56cd400a9c7d64e1cd7d698 100644
GIT binary patch
delta 11304
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
EKd=ZT$^ZZW

delta 11389
zcmYk?33QLg{>SmBi7Z4`BxK>2L=xE$p~SvKQxcRm*4hQJ=8|&LTb|HTTWN3XTB@j0
zwN!g8C0hG_yV+VxmC{zVT1Bh=`hS1Sob&(p+|$?0JoC(a=Q}gckJGz*iT8@7-tNV)
z3JV<m+2Q3l(Rj6*YXA4ohE&JNp!y!h<0VW(Z~mqJ^|3Z~!Y~|X+oz$2`de5J_n|-D
z#(aE$-5tkux}`f#77gpL30^@TjIQfAtuPM#a1eUq2#mlnn1s`@5^lsG+<}$xFjmD=
zsD3}%_AsIeqFxItGrv=pf+lQ+8mNsm57n^;2IEjv025ICpGO5!idy+%490g+<9vk5
z&_RsDD;S8r^-ce(SdICeBnna30u^~LjKra+fu~>toR1apkZu1AmC~!IKyRW}`~a2F
zQ1-1k=3*zDfluRU%*7N2b^B46Kp_uLA=~T3WjanQc1A^BgyC3*Y@4$lbxh7+4ZMlI
z=-1G30x$?eFcP(Osi;h4qB4_<6|j3l@?V8QAKNe%m4RaP;1tvZZ=qh?h1$zQs6c-~
z7VAVcGJ)k`Q|cx7IDUZIsvD^He?^X$^8k}E<#F;~jlwhZ?tvpvk?uup!B@6^2Ng(Q
zW5<cXB-HcvsQv?N{hz3<C_`=OTd2&G+vf*Rnf(UqpqI;$&!Lctp*SAZVH#?}wHSe)
z;6OZw8n9WGxsGj7D;tUm=pPt{bCCZzEBIG1o<oiM18QpmNK;jGqbcZx3{(Kw*ao|!
z_IfcYg$Gcl_ZX6O=NxLFpl0U#Pz$wnT~Pz~L-ikzIulc{9lnCv!q1Si<vM>-&^3wX
zs49>w)TzzmUm9>GDy0ii0j@y}xDB<keW>rm7pMuVwBVp&Eb46KqYhgkhT|Blh0`!n
z_kRtAnlyZjI_;NGDfVh<CaP$yhMF)I6-WkZ58Gh}9EFkiA5?&!p(egy>))al^fT&K
z{Dl>n-|;4Vr7RG2pW{$_o{HLncBs=@gi75~RKLBb6&}OtcnP(_KTul}+}dQ;g9@w#
z>if|XHU1!UmD=YiXm4hs>L*YGoyS^u8*5?}4u%40fI3XiqE<K=HNlIh%q&L*v>D^^
z2-d)xsKET%n%hymE&11;HKai+X^Xm!-L0cg5l_WOry6zISD;e49yQ@M)C5OR<6J>a
zbPpA{KdV!KNvH+3MUB(7oofbomIehf2KC|#s4aN~qwp=%-k00wCs6@hLIwB}YR~W5
z=U&-nqAIBI;!w9J6P5Zb)Gg}jQc$X=Bj>?+12yq^Y=FO_R#v;c$v{igio2p#G8h%u
zI8;DWF$U+MR`?!jVcSvf9Yh`Ov#7J=UZRjr!S4xkZ5pBWybu#{rgbxF;4{`c_~=aJ
zI8GPZ8=$ssDt5xfr~t2F65c^AH0DV&UqfVS*BL}1fd}uPQgaful541lZ(|DjbTFsB
zK31Tfg<4@t)B-x7Qauqfa0WKToyh0jxr5rG)Q)B=8e<^yJ1r<EvRsVDL8ypb+rAbR
zU^yn@Rn$ZQxhBA9)Rxsnot1X@H1<c0vlTV|*Y^2usKXePhs^IJQ{W@$WMd^PMPHna
z0r+p!ikDkgq58dp6>%$S;@zmTa1IsV52*L=qt2Eu`=X4tN0Q<6Kvx5;v=26*_N*MW
z*C((t-au{5AGRLS+5DL=26ZjlBEL&cKKkKY48(<~@mHe)+k^^qkM--$<X`vo9t~v0
z3E(94z#gawH=(xVPYlNJr_6^X5mj$x>s?T{WjOMUah4&6%ejCGJie>>U^PRXjlS3#
z=XE9j@f1F#Aq0O%eYt$PnHOuKUU(c^<8buHbr_28V;Js7ZN(YX$}ijYU(koT7Y9OH
z=#R-5h{{A`mx2a*8kMR7<oCxZLY;|?s0{pw3e4{rGm!^%s8UeZt_^AndSDQ~ikf%@
z*26WZ@lT=7);Ac7?sW=EQN?@{NGxj4Gf@MzMh(;jt71OtY>Ytd^$gU2uVN}L!c5$U
zTJb$pW*(sW`*tTA7=#4oI-wMl`ZlPQcEf5o7E^E<*2m50!OO^J-SOg}=zh0HeTYg?
z6RyArT#Z`5F4Tm_ur{8w_1hS)`+t{$28`^<9mc+>)Xzb-&pC`*QB*H;D7zprI7_e!
z-a;*)LT__6s-cH^O=~Must2F~nu-nZHEg5%zn_8*p>H3v(iCeSOs9PgYK1#({TxP7
z_j}fHp1^o)iX*Twu0dtu0_w1Si#n7yP`Bn!YsJ3gUma>tP-@~(E6PEgfj+3c8;**6
zoP9n8b!Zo$R=(EOx1;(WMUC?%>d<|Un)o(qT<?D7%!KqK|2k9=G{`hmhc?#ESe<$w
z)Zr<%?JuBKI1@F&T-29t39A1Z)P&`zaZh3-Ua|FusEk+XPyUsG#{Esl)~Js8n21G~
zgo{ua+Jl<tDk=lFP^aH(fT>r+C#gqa4h}&DvH@%0F4O`~qcU{GrJ$AFLq+;GszcR*
zCgriH7we;5=!lxIpRE_5_O`^fzl;iSE^3^ms0FS?_1lcfSh=mcM<{5|&Y(A5#w`2}
zb*O3$G6D8R4KxUq`jM!>icsH&S*QtKMXh+bbtCHRl%wW3fm*;B)9yMKDJasLr~&TV
z4*rA9{SQW6m!_z#8I5r`12y2gs6akMP4r)k!HcMg9-#Vp4>9uuVmS3k4AuS5prF*Z
z!%XanO5q%=jf+t$-;L3D(6(PeZHa$@`QSub8)7`|d8ji|gxcb%SOI6*_Ic>f{LV@W
zO4)i;WIIt`z|T-Cx{ey?E_%>^s0lb36+lZ=|85w8!%^RdQd@r=bt^tVjdKDu&n0xV
z^1Bq2+JIrELn3OxCa6qwMrEKk`r=?r#u3)}SdV(S^=GU@z2<PURXLcV{;2mBpa=I1
zC;xRQd_#i<u2^WcAOuy<Mr9xueXuv`^bSBj9BJ$0QT->QGC2)naRDaaHcZD0=)r&y
zW}#^#$iFuYEoso+w6*4-Cd@-+pd0E-*AH9bSo?e<hEe|j^&@o%b%y>xr8sS*xlQd*
zhj<dE;AX6eU%M1CDBMRynl{Qz+zl&H?}-X<Flz6HSxZnWoo!u)3h-T9--Qb3I4V>B
zgUY1OX!BlGRL0!e6twrLsB7~C>hKJ~%2<jzJg=Z$cpEj)d)8g3l^sKE<wI1zq%r2U
z)WtyRxtN5#@EM$fjPE+9DJa4#sFdA6z2G(0tT+U9s^hRCHbn)PZ5@Exx))IWrdXF)
zw_p(MN6;V7qPF%j#_0ZEr=S3QicE(<)PUirlt-bqA|18YO;Ca4Vlw8V0(Vj4EJRJP
z9F^JCs4d)s%FsSc#Gf!s_rJ<N%!(6H*Rdh$6WqbJzlfUfHB?~BP%C=VKHr2&`ECrs
z{iuGYtY4u5xP%Je3Mvzo#}Tylycz|WiN8I@UoNpZ_3UDETBl$J^$n<NbrI9hdCu%{
zy0s&EXdZ@*a0UioITqki9E$ZPn7{olnn3>5@i+}ivDZXSJO-jtIMg}{<Ef8B^<RiO
zBgau+z^_oh0Y9S${r_qDC8OH=V<?uOGBg{j;_Lq;|GJM`Y{PlfssGjb5S6Nc5@S`=
zp2nc=Zxhts_do?Q26f7(qQ+fspPxc4;3w4kA<vsXYo@vsw3oe60~VqNoPkYn1!`~4
zVgz17^}mPJ(f42GP}ag0)Ei(P7GZzfjomQj1(Vq#RQnMef^PC8a~kJjeHuPQt>7AZ
zFle&*Q*S+tqF#bEZ~<zIHlb4bAqL|?)Gat|y@<-_HPk|GqZV=>In?f>D^QJwXttsu
zHo#~ch8p-KtcMFwhwuQZ-#u)JX{Ba`BQb}1IqJ6fPB8(6U|s4SYZuh>$v9W{e+Grx
zG(=1_zgEpLmU@3oz$vzUt*sxm&u^iJ=V33J%w%FB^)9GWKLI0gD#qX&*bG0y-gpng
zncwO5l1Y6bs^e1Bi`!Ax<_lEnvZk58VzoxCV3c(N>hP6fSDcT!9oH}!e@A7w=5#Y|
zLsb7R=xR>~Q|N>)X5k6c9{Rm(_AVH8sG?CX7NWLb66zYgj~eF?YOk-L0=R{J@F8mJ
zde1Q5jX4-cea8&)uTy-UhAwyqb-LTnG<*LH>fRQhCZ1^9XJZ@cucHFEh`D$hJ=kiN
z$=CqY_`^_#yA*5U7Sx&ebQby72jy=Xe6Z1MGjTK2Da}I#Gz7zNJZj?USb&GogLUWF
zl%gN?!B_!DqQ))40GxpSI2CosXS=rH9aIXpU>!VxDR>tZdF(6Z3)u~|;=ZT=$JzQU
zRHjy-2e)7?{2aaUH`F+HQ430%Yp%8XI0auCN>QnK8I$pC)V2E*JD@Yq9KMdI{u3}B
zC!r44O7!41)B?_8ZG7xibLbLLAGS6aj6IR9ah>55bn2&|B3^;o>piFxeSw<b7V1Uc
z*UU8wNA+)k+T*^c{u3}2%k1+#sI9w%k1~PE++7UP{SW%LnJ@;`F#{D)HiqILYcW=)
zJ{=WEnXRuvZQW+nd&f}=_z{(<hp0e(%FL%X0o89Bwr7546$P#E2ds~Oqav(7-|Y31
zs0sUGAdW^o{}+Z}87AOrRDefq`x(>%zDFIp``8@47nt9Q*66mNVKN0xybGJ*O>6Q(
z^T*}_)C6UyJ>P*{@B(Tj>5I(wAr}?UVob+%7>;L9^Zbk*F>SH=jhVRE-v1ReXocIY
zhf#;{Eb7{LEio$y!XWAqs6&~E)vyRNaXRWZVJEi2KQRKcmYTiqih4gE_1=)B<ljT#
zc^WjpGSmzI#kzPMV=;W0IU7x|3iVv9iv3ZyrWi+K8ETxzUN_@3!bIwwP+z=a)LB@B
zxwy@xpcQ(*VeWS@Dut1#4@W9$&ofXTmR6`e&A~?43$>DYSRL1(R#=Yx@dQR=`f~bW
zN7NZvjaq=ag+dJq2T^<b4QhoIR+yDlM|EtB8JK75lQEBa8EWgkK?QmX72reL9`dHS
z{~pvl%}@d7W1;T<NDBOtI;Sund#*GQZ$xF{7)IiGTfb-P{%@JTc*J84&%0xHT#g>R
zgJ~GP%KWIcLj^nub(oLhqrd;(qM+1ytu}iWg;~@yu``ZF-Q!)TK=z>myNKG7UoZ^s
zVGLGUW45ji>e|)CXR$Hr!!#c?-^Uo}QaDGU9bU)QnEJLkB%?5v`W)1R8&RLuJ*aE-
zJ?a|%jXJbl)|$N?hRvuKqu$$W+do0ws*|Wd|3Ej9LijsofEK6~=A%CrVNEPSMZOrd
z*Za{QzeJt(3)mAw*O@<<j6h9Xj5-t3&>PE8nO$VtKU>HCr_*qWhIkBIZwAW1{?un-
zZTt~CVDP&pQ@v1uzkwBSKStpZ)WqMR7v9AL{L|KJZ7^ph4%^V4zk&QWrLc&G_V_ur
z#p>^w6!yV9J;xHfirTw=8_h%$(U<xROu>0r3wNRize1h%zpxR8ZZc;f2ep9JE`@p&
zj$v#33pG&l&1RrssDNI^I6R7}coUmrjV)#Y-BFo%4J+b848=E50lbg8)`!s#&!Ylx
zui6d)@0%B5F_;IL)^-?1{b}n^4540v8gLeBz~vZ<Z`=BI)Holb`hSW(cp3HHb))P2
zWgCLGng{WyL)aMgLO0YvJuv`>TZ=J>dMSEv9_m(XMtx`wVI91T$yn(Flj(-2fQDeW
ze*d4NpzAOP({Vkf;aOYv`Ov(OiB)OOMg`W(w)aQf?;`ArC$Ji({>N-#8`OjYQJ>;*
z)_M5o|Nparf>yQ{wepjwfPO&TYrk#gc`el8OT{qEMjgH$s7&-jWoopoPeS#ZgAup_
zHP1HGR_#Mq_wp2l$MGEM!x6IG>}ekAo<D<{s4q6gA-4WHYNe}Cnc0CJJZam1K~3bd
z!@M7X;nZtlWo)#A{OiTGH0TiZKuypevvCn7;CXC-UOUaNWFu56TcalEi|RKPwKWS+
zfiFW%v>G+>7F31~qvk!kll|9+<)-b}_#^X$%En5xPextGnV5keU=6&6`Y<`Wj0xC;
zYDbK~7f}mZhRWP3jKuY*vv2^_@3c!nd;K$3$I83SX-z=YyI@@$jtXQE>I1VE709<3
zjSnyiYm}Rb8d;x0eZohgGB68uD^^<FqZE>8xQ&`HYLD5|hSrX#6%0U~kzuGUT5dg!
zT6xgNW(#sq*KIU5!bO;fCr}grj@rtYPab`!T<0kY8n`!VZ(c*~=}OcVY(?#9IR@f>
z+x|H!unVX|cojW(9~D5<UK410R0b!ZZo>xDq2Gi4y8rtqXs?c2zeHW9^QaeYV0(Os
z3M6}<39ut7@Mp0VmZ1Xq0-NIxsFfz}H=pQUs53JkYvK-U#{AA%3R+3k17_eT^roJU
z8ZZO3@*G>wM+G(#b%-Y0`a*0&eI4rb-#}&bcl*4;LG#-Xf%RyQMOUfmN<o&QR=x@2
zu^bh^w^#-LKpmpWhwOiNL=7|owN*<|@2x?Na|E;SEDpx7!)759Q2k#zO#Txn%%ee(
zeu%o42T-T^E8FodDs_(?F?*bd`jX{f9ef(~>3+f1*Q4J50+p#>P~&<XHNTz_=u5rb
zQS$Fcp`&f+hWhsRLZy5<YUT4$1HFSf{U4$3^KDchLC1`dm`FVlwS}Effpx_cbW!81
zx9(PhBKs7x@jFx|QjVJdnxYT&Cs8kUM%|8qwtYM*)g`Ef%s@^2s(n5mlc+Dn0NiWq
zCsCQJaF;^a$<&y#9jVjfMhzS@Y|OyX1<B(*h2uSA#uj@9dL|4URXD_>C(jKWR<N~s
zTE8bMWu!OA^kif;ZIHEf^|&Ojw1hhU@69oV1)dQF<BL5-;|5MF9CBdl*oh^hJtOun
RdA?+1VZrFFM~iRw_+QBHMr{B9

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 51c59e156..781fe840f 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -48,9 +48,9 @@ msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 # ???
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Nieznany"
@@ -304,7 +304,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
@@ -349,7 +349,7 @@ msgstr "Edytuj użytkownika %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
@@ -385,7 +385,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
@@ -486,108 +486,108 @@ msgstr "nie skonfigurowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, 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/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Plik książki w wybranym formacie został usunięty"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s nie jest poprawną liczbą, pomijanie"
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s nie jest prawidłowym językiem"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do wysłania musi mieć rozszerzenie"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, 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:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Format pliku %(ext)s dodany do %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "W identyfikatorach nie jest rozróżniana wielkość liter, nadpisywanie starego identyfikatora"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Metadane zostały pomyślnie zaktualizowane"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 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:892
+#: cps/editbooks.py:895
 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:986
+#: cps/editbooks.py:993
 #, 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:1005
+#: cps/editbooks.py:1012
 #, 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:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Wysłano plik %(file)s"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Brak formatu źródłowego lub docelowego do konwersji"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Podczas konwersji książki wystąpił błąd: %(res)s"
@@ -697,7 +697,7 @@ msgstr "Nie znaleziono pliku %(file)s na Google Drive"
 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:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
@@ -779,7 +779,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -844,8 +844,8 @@ msgstr "Błąd Google Oauth: {}"
 msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -861,7 +861,7 @@ msgstr "Token wygasł"
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Książki"
 
@@ -886,7 +886,7 @@ msgstr "Pobrane książki"
 msgid "Show Downloaded Books"
 msgstr "Pokaż pobrane książki"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Najwyżej ocenione"
 
@@ -895,7 +895,7 @@ msgid "Show Top Rated Books"
 msgstr "Pokaż menu najwyżej ocenionych książek"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Przeczytane"
 
@@ -904,7 +904,7 @@ msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Nieprzeczytane"
 
@@ -922,7 +922,7 @@ msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -932,7 +932,7 @@ msgstr "Pokaż menu wyboru kategorii"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Cykle"
 
@@ -950,7 +950,7 @@ msgid "Show author selection"
 msgstr "Pokaż menu wyboru autora"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Wydawcy"
 
@@ -960,7 +960,7 @@ msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Języki"
 
@@ -984,7 +984,7 @@ msgstr "Formaty plików"
 msgid "Show file formats selection"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
@@ -992,7 +992,7 @@ msgstr "Zarchiwizowane książki"
 msgid "Show archived books"
 msgstr "Pokaż zarchiwizowane książki"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "Lista książek"
 
@@ -1047,7 +1047,7 @@ msgstr "Książka została usunięta z półki: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
@@ -1131,178 +1131,178 @@ msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktual
 msgid "No release information available"
 msgstr "Brak dostępnych informacji o wersji"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Książki pobrane przez %(user)s"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Szukaj"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Zadania"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status przeczytania = %(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 #, fuzzy
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, 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:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 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:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, 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:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 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:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
@@ -1364,7 +1364,7 @@ msgid "Send to Kindle E-mail Address"
 msgstr "Adres e-mail dla wysyłania do Kindle"
 
 # ???
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Panel administratora"
@@ -1374,7 +1374,7 @@ msgstr "Panel administratora"
 msgid "Password"
 msgstr "Hasło"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Wysyłanie"
@@ -1567,7 +1567,7 @@ msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1666,13 +1666,13 @@ msgstr "Konwertuj książkę"
 msgid "Book Title"
 msgstr "Tytuł książki"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Opis"
 
@@ -1680,15 +1680,15 @@ msgstr "Opis"
 msgid "Identifiers"
 msgstr "Identyfikatory"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "Rodzaj identyfikatora"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "Wartość identyfikatora"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Usuń"
@@ -1709,90 +1709,90 @@ msgstr "ID cyklu"
 msgid "Rating"
 msgstr "Ocena"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 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:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Wyślij okładkę z dysku lokalnego"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Data publikacji"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Wydawca"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Język"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Tak"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nie"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Wyślij format"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Po zapisaniu wyświetl szczegóły książki"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Zapisz"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Słowo kluczowe"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Szukaj słowa kluczowego "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 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:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Zamknij"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Źródło"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Błąd wyszukiwania!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nie znaleziono! Spróbuj użyć innego słowa kluczowego."
 
@@ -2002,6 +2002,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Włącz wysyłanie"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Dozwolone formaty przesyłania"
@@ -2363,7 +2367,7 @@ msgid "Add to shelf"
 msgstr "Dodaj do półki"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(publiczna)"
@@ -2438,7 +2442,7 @@ msgstr "Podaj nazwę domeny"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domeny zabronione (czarna lista)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Następne"
 
@@ -2551,7 +2555,7 @@ msgstr "Książki sortowane według oceny"
 msgid "Books ordered by file formats"
 msgstr "Ksiązki sortowane według formatu"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Półki"
@@ -2572,50 +2576,50 @@ msgstr "Przełącz nawigację"
 msgid "Search Library"
 msgstr "Przeszukaj bibliotekę"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Wysyłanie…"
 
 # ???
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Błąd"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Konto"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Proszę nie odświeżać strony"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informacje"
 
 # ???
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Szczegóły książki"
 
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index f08ccf569a4417124062409bc30ed22345ace903..38214e1ff7eaddbfcb66c2ee7f9309b6163d07b7 100644
GIT binary patch
delta 10196
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

delta 10286
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
F`M(14Y=Qs)

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 64bed06f7..516ad4d60 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -43,9 +43,9 @@ msgstr "Reconexão bem-sucedida"
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -303,7 +303,7 @@ msgstr "Atualização das configurações do servidor de e-mail"
 msgid "Database Configuration"
 msgstr "Configuração das Características"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
@@ -348,7 +348,7 @@ msgstr "Editar usuário %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Usuário '%(nick)s' atualizado"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
@@ -383,7 +383,7 @@ msgstr "Atualização das configurações do servidor de e-mail"
 msgid "Password for user %(user)s reset"
 msgstr "Senha para redefinição do usuário %(user)s"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
@@ -483,108 +483,108 @@ msgstr "não configurado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "A coluna personalizada No.%(column)d não existe no banco de dados do calibre"
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Formato do Livro Eliminado com Sucesso"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Livro Eliminado com Sucesso"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oops! O título do livro seleccionado não está disponível. O arquivo não existe ou não é acessível"
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "editar metadados"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s não é um idioma válido"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "A extensão de arquivo '%(ext)s' não pode ser enviada para este servidor"
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "O arquivo a ser carregado deve ter uma extensão"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Falha ao criar o caminho %(path)s (Permission denied)."
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Falha ao armazenar o arquivo %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Formato de arquivo %(ext)s adicionado a %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Os identificadores não são sensíveis a maiúsculas ou minúsculas, mas sim a maiúsculas e minúsculas"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Metadados atualizados com sucesso"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "Livro de edição de erros, por favor verifique o ficheiro de registo para mais detalhes"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "O livro carregado provavelmente existe na biblioteca, considere mudar antes de carregar novo: "
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "O arquivo %(filename)s não pôde ser salvo no diretório temporário"
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Falha ao mover arquivo de capa  %(file)s: %(error)s"
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Arquivo %(file)s enviado"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Falta o formato de origem ou destino para a conversão"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Livro enfileirado com sucesso para conversão em %(book_format)s"
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocorreu um erro ao converter este livro: %(res)s"
@@ -692,7 +692,7 @@ msgstr "Arquivo %(file)s não encontrado no Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrado uma conta existente para este endereço de e-mail."
@@ -774,7 +774,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -839,8 +839,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Login"
 
@@ -856,7 +856,7 @@ msgstr "O Token expirou"
 msgid "Success! Please return to your device"
 msgstr "Sucesso! Por favor, volte ao seu aparelho"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Livros"
 
@@ -881,7 +881,7 @@ msgstr "Livros descarregados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Livros Descarregados"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Livros Mais Bem Avaliados"
 
@@ -890,7 +890,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar os melhores livros avaliados"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Livros Lidos"
 
@@ -899,7 +899,7 @@ msgid "Show read and unread"
 msgstr "Mostrar lido e não lido"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Livros Não Lidos"
 
@@ -917,7 +917,7 @@ msgid "Show Random Books"
 msgstr "Mostrar Livros Aleatórios"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Categorias"
 
@@ -927,7 +927,7 @@ msgstr "Mostrar seleção de categoria"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Série"
 
@@ -945,7 +945,7 @@ msgid "Show author selection"
 msgstr "Mostrar selecção de autor"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Editores"
 
@@ -955,7 +955,7 @@ msgstr "Mostrar selecção de editores"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -979,7 +979,7 @@ msgstr "Formatos de arquivo"
 msgid "Show file formats selection"
 msgstr "Mostrar seleção de formatos de arquivo"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Livros Arquivados"
 
@@ -987,7 +987,7 @@ msgstr "Livros Arquivados"
 msgid "Show archived books"
 msgstr "Mostrar livros arquivados"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "Lista de Livros"
 
@@ -1042,7 +1042,7 @@ msgstr "O livro foi removido da estante: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Crie uma estante"
 
@@ -1126,177 +1126,177 @@ msgstr "Uma nova atualização está disponível. Clique no botão abaixo para a
 msgid "No release information available"
 msgstr "Não há informações de lançamento disponíveis"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Descobrir (Livros Aleatórios)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Hot Books (Os Mais Descarregados)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livros baixados por %(user)s"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Avaliação: %(rating)s estrelas"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato do arquivo: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Pesquisa"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Lista de classificações"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Lista de formatos de arquivo"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Publicado depois de "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Avaliação <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Avaliação >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de leitura  = %(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ups! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail válido para Kindle."
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Nome de usuário ou senha incorretos"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "Nova senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Você agora está logado como: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s's"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Perfil atualizado"
 
@@ -1357,7 +1357,7 @@ msgstr "Endereço de e-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Enviar para o endereço de e-mail do Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1367,7 +1367,7 @@ msgstr "Admin"
 msgid "Password"
 msgstr "Senha"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
@@ -1559,7 +1559,7 @@ msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1657,13 +1657,13 @@ msgstr "Converter livro"
 msgid "Book Title"
 msgstr "Título do Livro"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Descrição"
 
@@ -1671,15 +1671,15 @@ msgstr "Descrição"
 msgid "Identifiers"
 msgstr "Identificadores"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "Tipo de identificador"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "Valor do Identificador"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Remover"
@@ -1700,90 +1700,90 @@ msgstr "Identificação da série"
 msgid "Rating"
 msgstr "Classificação"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Buscar capa na URL (JPEG - Imagem será baixada e armazenada na base de dados)"
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Upload de  capa do disco local"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Data de Publicação"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editora"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Idioma"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Sim"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Não"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Formato de upload"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Ver Livro ao salvar"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Buscar Metadados"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Salvar"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Palavra-chave"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Pesquisar palavra-chave "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "Clique na capa para carregar os metadados para o formulário"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "A carregar..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Fechar"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Fonte"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Erro de busca!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nenhum resultado(s) encontrado(s)! Por favor, tente outra palavra-chave."
 
@@ -1988,6 +1988,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Habilitar Uploads"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Upload de formatos de arquivo permitidos"
@@ -2349,7 +2353,7 @@ msgid "Add to shelf"
 msgstr "Adicionar à estante"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Público)"
@@ -2424,7 +2428,7 @@ msgstr "Digite o nome do domínio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domínios negados (Blacklist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Próximo"
 
@@ -2535,7 +2539,7 @@ msgstr "Livros encomendados por Rating"
 msgid "Books ordered by file formats"
 msgstr "Livros ordenados por formatos de arquivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Prateleiras"
@@ -2556,48 +2560,48 @@ msgstr "Alternar a navegação"
 msgid "Search Library"
 msgstr "Biblioteca de Pesquisa"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Enviando..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Erro"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Upload feito, processando, por favor aguarde ..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Configurações"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Conta"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Sair"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Por favor, não atualize a página"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Navegue em"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Sobre"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Anterior"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Detalhes do Livro"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index c9e01aa727415d38b3f381d25a5ba2ac02b5982b..dad3b9e5be322aac9a81eb4a0a8489b9696ec570 100644
GIT binary patch
delta 8366
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
O*!#Lq(X_rfWBv!?x>u9{

delta 8466
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

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 8801f2ac1..62b48c02a 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -47,9 +47,9 @@ msgstr "Успешно переподключено"
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -306,7 +306,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
@@ -351,7 +351,7 @@ msgstr "Изменить пользователя %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
@@ -386,7 +386,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
@@ -486,108 +486,108 @@ msgstr "не настроено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s не допустимый язык"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Формат файла %(ext)s добавлен в %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Метаданные обновлены"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "Ошибка редактирования книги. Пожалуйста, проверьте лог-файл для дополнительной информации"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Загруженная книга, вероятно, существует в библиотеке, перед тем как загрузить новую, рассмотрите возможность изменения: "
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Файл %(filename)s не удалось сохранить во временную папку"
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Файл %(file)s загружен"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Исходный или целевой формат для конвертирования отсутствует"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Книга успешно поставлена в очередь для конвертирования в %(book_format)s"
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Произошла ошибка при конвертирования этой книги: %(res)s"
@@ -695,7 +695,7 @@ msgstr "Файл %(file)s не найден на Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Этот адрес электронной почты уже зарегистрирован."
@@ -777,7 +777,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -842,8 +842,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Логин"
 
@@ -859,7 +859,7 @@ msgstr "Ключ просрочен"
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Книги"
 
@@ -884,7 +884,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
@@ -893,7 +893,7 @@ msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
@@ -902,7 +902,7 @@ msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
@@ -920,7 +920,7 @@ msgid "Show Random Books"
 msgstr "Показывать Случайные Книги"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Категории"
 
@@ -930,7 +930,7 @@ msgstr "Показывать выбор категории"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Серии"
 
@@ -948,7 +948,7 @@ msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Издатели"
 
@@ -958,7 +958,7 @@ msgstr "Показать выбор издателя"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Языки"
 
@@ -982,7 +982,7 @@ msgstr "Форматы файлов"
 msgid "Show file formats selection"
 msgstr "Показать выбор форматов файлов"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr ""
 
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1045,7 +1045,7 @@ msgstr "Книга удалена с полки: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Создать полку"
 
@@ -1129,177 +1129,177 @@ msgstr "Новое обновление доступно. Нажмите на к
 msgid "No release information available"
 msgstr "Информация о выпуске недоступна"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Поиск"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Скачать"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Список рейтингов"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
@@ -1360,7 +1360,7 @@ msgstr "Адрес электронной почты"
 msgid "Send to Kindle E-mail Address"
 msgstr "Отправить на Kindle Адрес электронной почты"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Управление"
@@ -1370,7 +1370,7 @@ msgstr "Управление"
 msgid "Password"
 msgstr "Пароль"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Загрузить"
@@ -1562,7 +1562,7 @@ msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1660,13 +1660,13 @@ msgstr "Конвертировать книгу"
 msgid "Book Title"
 msgstr "Название книги"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Автор"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Описание"
 
@@ -1674,15 +1674,15 @@ msgstr "Описание"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
@@ -1703,90 +1703,90 @@ msgstr "ID Серии"
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL обложки(jpg, обложка загружается и сохраняется в базе данных, после этого поле снова пустое)"
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Загрузить обложку с диска"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Опубликовано"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Издатель"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Язык"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Да"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Нет"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Загружаемый формат"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Просмотреть книгу после сохранения"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Получить метаданные"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Сохранить"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Ключевое слово"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Поиск по ключевому слову "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "Нажмите на обложку, чтобы получить метаданные"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Закрыть"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Источник"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Ошибка поиска!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Результат(ы) не найдены! Попробуйте другое ключевое слово."
 
@@ -1991,6 +1991,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Разрешить загрузку на сервер"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr ""
@@ -2352,7 +2356,7 @@ msgid "Add to shelf"
 msgstr "Добавить на книжную полку"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Публичная)"
@@ -2427,7 +2431,7 @@ msgstr "Введите доменное имя"
 msgid "Denied Domains (Blacklist)"
 msgstr "Запрещенные домены (черный список)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Далее"
 
@@ -2538,7 +2542,7 @@ msgstr "Книги, упорядоченные по рейтингу"
 msgid "Books ordered by file formats"
 msgstr "Книги отсортированы по формату файла"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Полки"
@@ -2559,48 +2563,48 @@ msgstr "Включить навигацию"
 msgid "Search Library"
 msgstr "Поиск в библиотеке"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Загружается..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Ошибка"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Настройки"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Учетная запись"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Выход"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Пожалуйста не обновляйте страницу"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Просмотр"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "О программе"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Подробнее о книге"
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index bcc70e3b1748b341296777a03c40c681dd90da56..fbf3c9e5da7da25db7a17c8be496be29c6f377e0 100644
GIT binary patch
delta 11083
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

delta 11173
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
Nyf%9Gv2nZd{tM)N@D2a~

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 9f5a6a412..7e960eea8 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -46,9 +46,9 @@ msgstr "Återanslutning lyckades"
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Okänd"
@@ -303,7 +303,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
@@ -347,7 +347,7 @@ msgstr "Redigera användaren %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
@@ -383,7 +383,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
@@ -483,108 +483,108 @@ msgstr "inte konfigurerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "Bokformat har tagits bort"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "Boken har tagits bort"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 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/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "redigera metadata"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s är inte ett giltigt språk"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Filen som ska laddas upp måste ha en ändelse"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, 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:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Databasfel: %(error)s."
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Filformatet %(ext)s lades till %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identifierare är inte skiftlägeskänsliga, skriver över gammal identifierare"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Metadata uppdaterades"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 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:892
+#: cps/editbooks.py:895
 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:986
+#: cps/editbooks.py:993
 #, 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:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Det gick inte att flytta omslagsfil %(file)s: %(error)s"
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Filen %(file)s uppladdad"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "Källa eller målformat för konvertering saknas"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Det gick inte att konvertera den här boken: %(res)s"
@@ -692,7 +692,7 @@ msgstr "Filen %(file)s hittades inte på Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
@@ -773,7 +773,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -838,8 +838,8 @@ msgstr "Google Oauth-fel: {}"
 msgid "{} Stars"
 msgstr "{} stjärnor"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Logga in"
 
@@ -855,7 +855,7 @@ msgstr "Token har löpt ut"
 msgid "Success! Please return to your device"
 msgstr "Lyckades! Vänligen återvänd till din enhet"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "Böcker"
 
@@ -880,7 +880,7 @@ msgstr "Hämtade böcker"
 msgid "Show Downloaded Books"
 msgstr "Visa hämtade böcker"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Bäst rankade böcker"
 
@@ -889,7 +889,7 @@ msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Lästa böcker"
 
@@ -898,7 +898,7 @@ msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
@@ -916,7 +916,7 @@ msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -926,7 +926,7 @@ msgstr "Visa kategorival"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Serier"
 
@@ -944,7 +944,7 @@ msgid "Show author selection"
 msgstr "Visa författarval"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Förlag"
 
@@ -954,7 +954,7 @@ msgstr "Visa urval av förlag"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Språk"
 
@@ -978,7 +978,7 @@ msgstr "Filformat"
 msgid "Show file formats selection"
 msgstr "Visa val av filformat"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "Arkiverade böcker"
 
@@ -986,7 +986,7 @@ msgstr "Arkiverade böcker"
 msgid "Show archived books"
 msgstr "Visa arkiverade böcker"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "Boklista"
 
@@ -1041,7 +1041,7 @@ msgstr "Boken har tagits bort från hyllan: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Skapa en hylla"
 
@@ -1125,177 +1125,177 @@ msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att up
 msgid "No release information available"
 msgstr "Ingen versionsinformation tillgänglig"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Hämtade böcker av %(user)s"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Sök"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "Hämtningar"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Betygslista"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lässtatus = %(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, 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:1468
+#: cps/web.py:1463
 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:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
@@ -1356,7 +1356,7 @@ msgstr "E-post"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administratör"
@@ -1366,7 +1366,7 @@ msgstr "Administratör"
 msgid "Password"
 msgstr "Lösenord"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Ladda upp"
@@ -1558,7 +1558,7 @@ msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1656,13 +1656,13 @@ msgstr "Konvertera boken"
 msgid "Book Title"
 msgstr "Boktitel"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Författare"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -1670,15 +1670,15 @@ msgstr "Beskrivning"
 msgid "Identifiers"
 msgstr "Identifierare"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "Identifierartyp"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "Identifierarvärde"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Ta bort"
@@ -1699,90 +1699,90 @@ msgstr "Serie-ID"
 msgid "Rating"
 msgstr "Betyg"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 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:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "Ladda upp omslag från lokal enhet"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Publiceringsdatum"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Förlag"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Språk"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nej"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Ladda upp format"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "Visa bok vid Spara"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Hämta metadata"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "Spara"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Sökord"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Sök sökord "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 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:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Stäng"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Källa"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Sökningsfel!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Inga resultat hittades! Försök med ett annat sökord."
 
@@ -1987,6 +1987,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Aktivera uppladdning"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "Tillåtna filformat för uppladdning"
@@ -2348,7 +2352,7 @@ msgid "Add to shelf"
 msgstr "Lägg till hyllan"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Publik)"
@@ -2424,7 +2428,7 @@ msgstr "Ange domännamn"
 msgid "Denied Domains (Blacklist)"
 msgstr "Avvisade domäner för registrering"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Nästa"
 
@@ -2535,7 +2539,7 @@ msgstr "Böcker sorterade efter Betyg"
 msgid "Books ordered by file formats"
 msgstr "Böcker ordnade av filformat"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Hyllor"
@@ -2556,48 +2560,48 @@ msgstr "Växla navigering"
 msgid "Search Library"
 msgstr "Sök i bibliotek"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Laddar upp..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Fel"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Inställningar"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Konto"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Logga ut"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "Vänligen uppdatera inte sidan"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Bläddra"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Om"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Föregående"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 5c8bf24905e2de521ca9a7a8a5b74016a6790148..1aa97504f98200f4ce98da6a430c463a655fadbd 100644
GIT binary patch
delta 5513
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

delta 5610
zcmYk;32;``8Gzvv!<G$_u*nvFAY=ms5+VT`AOa!?2nGdotPK(&5{ayqqP=PrtjZ`T
zR7Yub+!rVsb)w=p4$BB?%1E_#te`Vms0uDc9i!F0Z|<FG8HVSayPWf#?>p!IY<M>9
z!)Mc?Bl#V+2L9Bhh0q_L%e42uKQnuVFq-Zx9F7tC+|yWy2QVK`CfCz?g^;3OfEVIK
zya=~qNBkT+<JXwZaG{NcbN+<cn9)177y7~w^nNLJ#WC0oCnE!dTI6q-pImQ3pO4T$
zZ^gm*80O$XEXVh-2lI!l(?jUPg%oze@tBJ>Xrvb)&xVV!1FppGcums34GsKGbmHw;
zjF00mJcOh0M>K;Ym~1>=jAt@`*h<5dzKJ97Z7jvmHw3a8%FqBNA%DXH{^60Z3J2h(
z<oZ+SbNkVS9Kk{ONpih&zYyx^55ysO14c&t2o0VIyU<#`fxdVI^UyrjKt8&Hd1$~l
zpefymV{j{)xr6AQc^}P84pH{NzUcEKF$=2)kbhG(oeS1z1zO{~(HcL5ro0&kVhg&m
z_s{{3qR)MX2KqyCJ*Oa^xDQ&wBFw-uunSh9nW`xu|6W+g1v9V+C*yVKgs&lg!$<sM
zM!aZ1gV9VCqbnSb1~3iH=t49Ti_uK2K{K=-C*Ush{VyUKzIa+HUU?66z#-^BqtN?j
zp(~$-6*v!z@Rr0sBa093CZ0kA&nIg4&}cN%(~yG}n$W!#ZJ;rg#&b9n+tAdcsE2`6
zp#e<AGMtZQ>_#*bx1oXFiPrW$r0n4dbi)1U`zO&o;Lc-Pg`QaJ`5#Tg2X96P+JUaL
z1)bp4<oaH;hJQ)=e@6%Y7!CMaG^Je&<C+gb11Uvrg>%r7T#1~-upYa3{_m#Yi`&r&
zcA+bI39a4h*a2J701sm|9>KG)KWTHo1?c-L(3G!7H}hufh!3FeKZ-8!8O&z>&_crp
z_o3(duV^h#qPsVnLi<7w^n=n54QLuV;Y{?oi|{o3C6-|wrto$=8+V}ZeTmNZ4Mr>?
zbRhrMv=mcVjy_O}<+up_f^9`N&HltwXe|eq#9y=tIF|l8bfRal3%-D6^i}k@zLi}6
zpoIKelYer-T7HMFD5Es~#CAthR*Y`Oa_oc?(am&D;w5MauEx&zd-VCuXdr(?$9V{S
zZzsAZ_LP$UE;NpD!Snwml9iA}{?5g6oQCVs$oHTnI*k4XoIoc^qb^?WiUwGMu6Sh9
zuf{C;Q_$z<U^-qJ(HKXg4#(qt=nCFN13Q8p@fbSb2{e!&60?TKrRs-HT!ub38VzV-
za(`iRe<`+~e>CIK1{$X19?ZfW=$?2H+XFz4*RjN((HDD<h%H5T`&sC7bJ0D~ko0dx
zOS2t)?*%k~*O7Una5TAb3LU7^8F3)}u|1XO7jI<JzZ|>LzY@*NIy7SuX5vQly)9^_
z?nS<7;R)nGg*VVW@m0Ij|63Xk^aGlKw2|?LA_x6e7ohhqMZXi5qo-jl8rWmVHVE&d
zpWIH|bfTf?d*`7mpNrk_a?Hh5ILh;X6Af4JJa)xb&=tIi*?1UD;fKlf@6qS{jrDkT
zL!Unzi*Y*6!xiZJ`!NR(V;+8lmg?UaWzfiC6jRa@z0o(ZJaGoP7Z#y`E=&5WFrWUl
z$@M$X75@P}P2163-hw5#8;kH0%*X5s>hI<oNFI%F3>whc=n7{h*Dpa=*nqisH9GJO
z=)gDQb!nVytfD`>lB0(8Xi1(#H}wJZ{gdc#!_SrEKSiVenIT+;)wm3|qk&|MjaSqi
z%}^h7j}%}}EJFvJgl1?in&OL-eq(Zf4Z460Xh56Lg+Cq9@Ho7NZld?l6{WL`?l>H4
za1xrK8_|jHL{t4Jx~ZN<1K5q8`+aD@N745_MoafK8ekiGTB2;eKJM1uXl<%-3@%3Y
zS-2N3!GmZZMSP{q%u=L`VI>;yBiIL9(NrHte)2;OKat)ah0e1OOEE&8i^3B$Oie4A
zfp^efzwisn00qd&47<_Pe}?_>J9HEE;J4U7i_y$1!1Hi9vcbbkXr?~L_6(o_v|&E;
zhe8fHV}-Hk0IL&k#oqKEKvUR)!*D+i!mqJCfQj)QC`MCWh5ooyqnor2J%;sYsaB$;
zy%94b8rx{NvIo%`?m!260gd=&bfP`U{dci|{!u&^e?nI@ZBl&xSD=C3i`IA_8qgth
zfv3<6W>U}g|Nj@$a8s0{6HmeUI6d(}G!x&Wf#mVO30F{v4p@awG#kCY5M6O2x|i1B
z2;7<Y4;)B8b29n2Q8qa~hBL4){blG28?YZfhvj$(XJGo2xaPCb2_tk<Zb82r_oF3!
z3a$NdG_xnsQhtX9+;M6YrzUr5JmDC0rHjyG`5QFVn{fs1LIWFoPQ1c7=s=gE6D-A!
zxFYFagO>JswDz~7slOjR|1U-~jJOqD=?7>=zDG;aXIdQKFifX^KDvTh?1Xh_s+T7H
zHHp`v<NgjgiD3(Ju)<qt=`z?jz84Lk;Y!PJ0M?)bUxrR}1)AE`Xl8zkmS`Iq@H03F
z-$FC-1)702EW<E8-o(Su@hXyj4Khy@rqdY9jX7ulw;=m0Jc?cLIGVbzun^N`!~qte
zdtwA;;IGiqT#1!<5Bl9`#X0yNOyTVF;-B><9OwDpNuvWdj$>y$fkyfbnyU1f@dUlm
z{-DIl<ofiaUyIq?UxIGR)o2MeqBY-^*o;HyAHqE552t8Yf=;vIl?^~wRES<b150sg
za=i&H#X2m;&A1R>Ozb{8{uEz@PP`FQ_%LSTK6Kne7`ftOG_vsvwDvz@7N(ycU+;!)
zzWzvALkg)zXh7d@MoaZF=HOm5z_-!8@@Zm6>fmog3LS6!9P;0l#sn^u;4I9=wdlYb
z@pQZcyW!)Qi!Eq?2XGR;gFfGDZu}!tfbNwk=m)9+U2%j4whawz=UnpdaXXMa_%C!<
z|C~J7?}9jW6^ZlE0oI@cZbAcm7|q-(=;qstW~2?xNP2CY$vm{Q1?a*{A{ri-v6zR|
zSd8bRHNOUZ;X!nQr;`4&=<~bL%(SAX<_Nl(Q}g0X4Ml$H!<p!Jpb3ZLlQ<ZoztP~A
zFtni&S6vwI@)~r43lo>%DEjNrP4pz@;`3<g_oFLn#T0&kmgpz6=9w3<C@e(hS&fyR
z|LbTh=0Y<%!0Gejfs3&R{VMdkFbmzJ%g}*;jeeSM!XkVq@gN%5S7>0TEr>Imi3XC3
zE}#rEJpYw69AF}vx+`!HF2f4kgl6J3?1hJu{-@{!Kcazk;0(HeJhY@K?2bj)zT44p
zCtw&_az)e1tLj$YHMQs3!Hspxmn^Tls=jnps$o@XdDH4tU21JzW5eQ<ch=M`sc&xS
zIj|se^oa6`)aY^J%f~f;RPlV;|G&4Se$Qj|D;pb9iyBs@7B@7e7T53nQ$u6(U6reb
F{1;3pSG@oL

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 71dd6a59a..1595fd6d0 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Bilinmeyen"
@@ -300,7 +300,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
@@ -345,7 +345,7 @@ msgstr "%(nick)s kullanıcısını düzenle"
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
@@ -380,7 +380,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
@@ -479,108 +479,108 @@ msgstr "ayarlanmadı"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "metaveri düzenle"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s geçerli bir dil değil"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, 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:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, 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:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "Metaveri başarıyla güncellendi"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 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:892
+#: cps/editbooks.py:895
 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:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "%(file)s dosyası yüklendi"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 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:1085
+#: cps/editbooks.py:1092
 #, 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:1089
+#: cps/editbooks.py:1096
 #, 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"
@@ -688,7 +688,7 @@ msgstr "%(file)s dosyası Google Drive'da bulunamadı"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bu e-posta adresi için bir hesap mevcut."
@@ -770,7 +770,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -835,8 +835,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Giriş"
 
@@ -852,7 +852,7 @@ msgstr "Token süresi doldu"
 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:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "eKitaplar"
 
@@ -877,7 +877,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr ""
 
@@ -886,7 +886,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Okunanlar"
 
@@ -895,7 +895,7 @@ msgid "Show read and unread"
 msgstr "Okunan ve okunmayanları göster"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Okunmamışlar"
 
@@ -913,7 +913,7 @@ msgid "Show Random Books"
 msgstr "Rastgele Kitap Göster"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -923,7 +923,7 @@ msgstr "Kategori seçimini göster"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Seriler"
 
@@ -941,7 +941,7 @@ msgid "Show author selection"
 msgstr "Yazar seçimini göster"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "Yayıncılar"
 
@@ -951,7 +951,7 @@ msgstr "Yayıncı seçimini göster"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Diller"
 
@@ -975,7 +975,7 @@ msgstr "Biçimler"
 msgid "Show file formats selection"
 msgstr "Dosya biçimi seçimini göster"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr ""
 
@@ -983,7 +983,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1038,7 +1038,7 @@ msgstr "eKitap kitaplıktan silindi: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Kitaplık oluştur"
 
@@ -1122,177 +1122,177 @@ msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdak
 msgid "No release information available"
 msgstr "Sürüm bilgisi mevcut değil"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Keşfet (Rastgele)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Yazar: %(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Yayınevi: %(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Ara"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "Değerlendirme listesi"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "Biçim listesi"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "Görevler"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, 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:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 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/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 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:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
@@ -1353,7 +1353,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Yönetim"
@@ -1363,7 +1363,7 @@ msgstr "Yönetim"
 msgid "Password"
 msgstr "Şifre"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Yükleme"
@@ -1555,7 +1555,7 @@ msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1653,13 +1653,13 @@ msgstr "eKitabı dönüştür"
 msgid "Book Title"
 msgstr "Kitap Adı"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Yazar"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Açıklama"
 
@@ -1667,15 +1667,15 @@ msgstr "Açıklama"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
@@ -1696,90 +1696,90 @@ msgstr ""
 msgid "Rating"
 msgstr "Değerlendirme"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Yayınevi"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Dil"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Evet"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Hayır"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Anahtar Kelime"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr "Anahtar kelime ara"
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 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:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Kapak"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Kaynak"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Arama hatası!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1983,6 +1983,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr ""
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr ""
@@ -2343,7 +2347,7 @@ msgid "Add to shelf"
 msgstr "Kitaplığa ekle"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
@@ -2418,7 +2422,7 @@ msgstr "Servis adı girin"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2529,7 +2533,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr "Biçime göre sıralanmış eKitaplar"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2550,48 +2554,48 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Yükleniyor..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "Hata"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "Hesap"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Çıkış"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Gözat"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Hakkında"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Önceki"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "eKitap Detayları"
 
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 548354ee56f661f107269a1cdadd51637ed35d36..30a109690e5eb4bf367e74d318b34c5c6f66def1 100644
GIT binary patch
delta 25
hcmaFU!}z9$al<@$E+bt769q#9D^ugmE98%;0RVdJ2($nI

delta 25
hcmaFU!}z9$al<@$E<;@-V+BJ?D<jLzE98%;0RVeT2*3aU

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 81f32fc81..c9593fc30 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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Невідомий"
@@ -303,7 +303,7 @@ msgstr "З'єднання з базою даних закрите"
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
@@ -347,7 +347,7 @@ msgstr "Змінити користувача %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
@@ -480,108 +480,108 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "змінити метадані"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
+#: cps/editbooks.py:490 cps/editbooks.py:954
 #, python-format
-msgid "%(langname)s is not a valid language"
+msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "Завантажувальний файл повинен мати розширення"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "Сталась помилка при редагуванні книги. Будь-ласка, перевірте лог-файл для деталей"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -689,7 +689,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -770,7 +770,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -835,8 +835,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -852,7 +852,7 @@ msgstr "Час дії токено вичерпано"
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr ""
 
@@ -877,7 +877,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "Книги з найкращим рейтингом"
 
@@ -886,7 +886,7 @@ msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "Прочитані книги"
 
@@ -895,7 +895,7 @@ msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
@@ -913,7 +913,7 @@ msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "Категорії"
 
@@ -923,7 +923,7 @@ msgstr "Показувати вибір категорії"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "Серії"
 
@@ -941,7 +941,7 @@ msgid "Show author selection"
 msgstr "Показувати вибір автора"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr ""
 
@@ -951,7 +951,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "Мови"
 
@@ -975,7 +975,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr ""
 
@@ -983,7 +983,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1038,7 +1038,7 @@ msgstr "Книга видалена з книжкової полиці: %(sname)
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "створити книжкову полицю"
 
@@ -1122,177 +1122,177 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "Пошук"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
@@ -1353,7 +1353,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Адмін"
@@ -1363,7 +1363,7 @@ msgstr "Адмін"
 msgid "Password"
 msgstr "Пароль"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Додати нову книгу"
@@ -1555,7 +1555,7 @@ msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1653,13 +1653,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "Назва книги"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Автор"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Опис"
 
@@ -1667,15 +1667,15 @@ msgstr "Опис"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
@@ -1696,90 +1696,90 @@ msgstr ""
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "Опубліковано"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Видавець"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Мова"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Так"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Ні"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "Формат завантаження"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "переглянути книгу після редагування"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Отримати метадані"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Ключове слово"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " Пошук по ключовому слову"
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "Натисніть на обкладинку, щоб отримати метадані"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "Закрити"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "Джерело"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "Помилка пошуку!"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1982,6 +1982,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "Дозволити завантаження книг на сервер"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr ""
@@ -2343,7 +2347,7 @@ msgid "Add to shelf"
 msgstr "Додати на книжкову полицю"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
@@ -2418,7 +2422,7 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Далі"
 
@@ -2528,7 +2532,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2549,48 +2553,48 @@ msgstr "Включити навігацію"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "Завантаження..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr ""
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Налаштування"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "Вийти"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "Перегляд"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Про програму"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Попередній перегляд"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Деталі"
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 68c4f8e70b30fc4186edd49a73bf732f79810a61..2b44952ea1449f8fcd48480eb15caaf37741de8d 100644
GIT binary patch
delta 11678
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

delta 11798
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

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index da32d2cb8..c92be6155 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -46,9 +46,9 @@ msgstr "重新连接成功"
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "未知"
@@ -298,7 +298,7 @@ msgstr "邮件服务器设置已更新"
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
@@ -342,7 +342,7 @@ msgstr "编辑用户 %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
@@ -377,7 +377,7 @@ msgstr "邮件服务器设置已更新"
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
@@ -476,108 +476,108 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "书籍格式已成功删除"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s 不是一种有效语言"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须具有扩展名"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -685,7 +685,7 @@ msgstr "Google Drive上找不到文件 %(file)s"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
@@ -766,7 +766,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -831,8 +831,8 @@ msgstr "Google Oauth 错误: {}"
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "登录"
 
@@ -848,7 +848,7 @@ msgstr "Token已过期"
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "书籍"
 
@@ -873,7 +873,7 @@ msgstr "下载历史"
 msgid "Show Downloaded Books"
 msgstr "显示下载过的书籍"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
@@ -882,7 +882,7 @@ msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "已读书籍"
 
@@ -891,7 +891,7 @@ msgid "Show read and unread"
 msgstr "显示阅读状态"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "未读书籍"
 
@@ -909,7 +909,7 @@ msgid "Show Random Books"
 msgstr "显示随机书籍"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "分类"
 
@@ -919,7 +919,7 @@ msgstr "显示分类选择"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "丛书"
 
@@ -937,7 +937,7 @@ msgid "Show author selection"
 msgstr "显示作者选择"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "出版社"
 
@@ -947,7 +947,7 @@ msgstr "显示出版社选择"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "语言"
 
@@ -971,7 +971,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "归档书籍"
 
@@ -979,7 +979,7 @@ msgstr "归档书籍"
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "书籍列表"
 
@@ -1033,7 +1033,7 @@ msgstr "此书已从书架 %(sname)s 中删除"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "创建书架"
 
@@ -1116,177 +1116,177 @@ msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "无可用发布信息"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下载过的书籍"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "搜索"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "下载次数"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1347,7 +1347,7 @@ msgstr "邮箱地址"
 msgid "Send to Kindle E-mail Address"
 msgstr "接收书籍的Kindle邮箱地址"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理权限"
@@ -1357,7 +1357,7 @@ msgstr "管理权限"
 msgid "Password"
 msgstr "密码"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "上传书籍"
@@ -1548,7 +1548,7 @@ msgid "OK"
 msgstr "确定"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1646,13 +1646,13 @@ msgstr "转换书籍"
 msgid "Book Title"
 msgstr "书名"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "作者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "简介"
 
@@ -1660,15 +1660,15 @@ msgstr "简介"
 msgid "Identifiers"
 msgstr "书号"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "书号类型"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "书号编号"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "移除"
@@ -1689,90 +1689,90 @@ msgstr "丛书编号"
 msgid "Rating"
 msgstr "评分"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "从URL获取封面（JPEG - 图片将下载并存储在数据库中）"
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "从本地磁盘上传封面"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "出版日期"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "语言"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "确认"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "没有"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "上传格式"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "查看保存书籍"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "保存"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "关键字"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " 搜索关键字 "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "单击封面将元数据加载到表单"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "关闭"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "源"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "搜索错误！"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "无搜索结果！请尝试另一个关键字。"
 
@@ -1976,6 +1976,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr "启用上传"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "允许上传的文件格式"
@@ -2337,7 +2341,7 @@ msgid "Add to shelf"
 msgstr "添加到书架"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(公共)"
@@ -2412,7 +2416,7 @@ msgstr "输入域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止注册的域名（黑名单）"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "下一个"
 
@@ -2522,7 +2526,7 @@ msgstr "书籍按评分排序"
 msgid "Books ordered by file formats"
 msgstr "书籍按文件格式排序"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "书架列表"
@@ -2543,48 +2547,48 @@ msgstr "切换导航"
 msgid "Search Library"
 msgstr "搜索书库"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "正在上传..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "错误"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "设置"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "账号"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "注销"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "请不要刷新页面"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "按条件浏览"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "关于"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "上一个"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "书籍详情"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 324e990bdac690c75208d4558db1c608c8c531cd..ee2a2a2e7c107e240f96779096d5678d5b1d4fc8 100644
GIT binary patch
delta 11712
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
aO;XaDCNxgVY?i(y`MGPQwq#9;?C^ha&qu=m

delta 11803
zcmYk=37n5r`^WLy*crwQGh@tPcE%WE3}YKRgG9(4vSvvmdu6#Tk1P?9qKqYxjF3r*
zM4rFpvDA|&ZBq6pOOdT6p3isA^?&{Uy?XUN*SYWeoa<cY-1m>}{2lP+g8=_bNRee8
z|9l<bc~N*QOws@SGbP3I!U?Bh8ZN^)JcKpzSJZPAYk6Kg*256&gX(_<qj5f_VlI}z
z@3Fh*`QCXNJ?Ln})rR;AHo&7;6pPgMyk=Mmi{m3$7`vhp>w(oU8%yD9SQgh}Aa277
zxCeFL3G4q8%QC-LoMq|8Fw}%`sDYBqx~Ku0VGwpgCD0#r{~%N%!%-`rj=FCtYMgbb
zN^HScJc?!TI)*U6mro-UgX(x*BqpE|YJruo6Ncaj<X>+J|0#)EF$6zGmGl@Y(Nm}u
zpGQ^nK4xNiy61JoXYq0T6#Wh~Lh7;_?2nJ)9!$nk^*k>IGf<iLLLHCESQD3EDDK4w
zJcY&Z2A0M<SPla++}4#xRVoryne+_mUxY?eI?7`!RNNC)iN2^xJcrRZ8#U1e)ByWX
zdwLX=@GWFpy{h$Hf}ODu@l@oJw-dExH&D;tu220rzy&8R32JfjLa`V2#B2=5gQ%@I
zWAS}dBEi(RGA5(0w@2MS#NsKaEqNWapbeOS`%#s;?9<SLH&CT6MY`3oChB$Sj&1P;
z495Ma`%Yp6-a$=RuCeD0#OkPcK5BxuP_OH|s1+Z_N_ZMW(7#24xxHeX5S`lQs0liw
z_HHcdFwH_eupE_0F1ElusI%}8Roa?O+?Lfro$_YLaq>E%#+!+pcW)`OwZ3<Nh9)?H
zdf*aj#kWz1s7X`K1-3`+^+MEP+<{Se8kN{>BnPhq9}AtCHmK5fMI}5CHQqSXLVawe
z_kR%$P5cG&MtDD>4r6e0_do*bP^MuRW?)t9h$`hXSOw>z5_<<#`Xi_bzchbDO?(BF
z(0#1#(<n_HyJB5zk8@BJ`4Tn3MbtorTDnBapyCkJN~>UTOh$bd(oxShL46mxqRzw<
zsI3}@I_zuES4of1(2X}yEB^~CVi0xLimRjct{JN2ov~o$s0rtyCRl<h`6lFF?_-Pq
zMvW8L+Ep$NRk2pBslPHAL`MuRz#_N>H9;P#RG*^~I*W05A9eaGw{eNp$4KIKsI44=
zTF6+`>-?g*5|!|F)S3CD4fWS+@dX_!<#(tFFQF#5j~b|amYb*=D)R=Y1bd=ZJQg+1
z4Ak=rP>HNURc<qCOZK1=J%Kt4*L}O;0V;u@wl2dc)E+0I2B?FYsFlTCu_*CiROv@x
zU7Ud`^@qp{;T<;v+qncfU>*7gpcd#arJ+*1hst~(YN8XU41Y!?_B&R_2dI@swRbD5
zhI+0Z7Q?n!4Le~9PQ-M48}-(l#_D(v6ZQVbJW|l`+My;GZ7xKWIu{?qBdEQs)WQ9V
z)kY;c4K?9H)XI0DCO(Gjp7$pvVDm>^rJh19Xc`9V{eOu@4LWi#2@hilyop8dFD!-n
z?bN`fQCrdw)9?{&gj0|oJnthcjn`0HbRWy$LsWugI=Qzf9;@m7Z$U#BMxZjCj+DmR
zfSTwys>Ekdhv+xdAu38)9>*9|1ty@z$w6KJ0Ch<JZT^aliHmi13u=kJ_N*ffW!w$5
z;sNGR)XGO<Nt}Qh*vBAz6U$*P>iJJlhwd;c;o@D~2Q30M&R|r3Hfk%UccK1eX}m^<
zUbFS6Q~5FKEPRE5_&e&9Kd?BA&t*Ju9P044Lw=FHC$KoaiYoa^)Wn-m3GYBH;DGsa
zSL&~c|E7a;;ssOBp4bmLpxzGD7w;izfT(WnLsSzLx3Rc8)*;SDzSiDa)ZsgaN<68%
z`@prpG~&V79GCet^hNs`Rmwk6U%Jvg+=KC`2QslaW}^=0Rt(0S7=lMoTl6Dp<(I7g
zHtG<TU{%`MvZzB|9t*az2@MU@8&#^OQD<Tz@(b)uMID;ms7l;LC0L=Cn=l2#i0fl0
zcEScY1hus}s021+DsD&3^9wSM?_Hyz!}AB~H^A%dRvwE=tP$!AJc=5yH)_D)SOK#!
z0%xJlOb+S{>_#o*pO}nCFdgrpDp8}47Qp_e($E79F#ubjGHs38lJTgO&ql5AEv$h%
zu{NH=Xsqyr=kdeo)x$>k9O?s>hnnyNhT}J=h1|dZz5fqr=rkAV>k>#rorxsWfE}?G
zF2=^V7dfxqU#Jyz>gNvYOjK!)A=~bKgXOVSf47j9sI&7pMq^*})tE{{rC){0Y#-`0
ze}OG9;7ONIYt)K|n=3Gd_y|_PdlrWeaEGf6X3;+oRgsNYAJ3sG5;>6iE2HRv?$jos
zUaR_MTh#TQs0s~0t!OstOsqhi`VFYWx7qc*sI&7GY6~w|d<S)Zi9v3hkU_pHSt1>p
zI1M#$3)JE1ggRv1&5?H9Hy2<<uCG9yq3zbc3$?;SSg<9iL;elw{&T4L@->hq2psIb
z)iJ0z6Lki<peiuI`ln$f;-#2~Td*3QLRIK*)I_mETm@>O7Si0}w%CriH?~FpEgH(?
zKNx|3qAE~fs4GznYGw6Mi8Vo8?}{q<lc?viQCl+?HQ`E&*P%X0A6fqaRD#ElaeVJI
z4XyA3>c;D+lI2@m{3*9*p;(yys@M?YP=~4?D#7Kban@iFd>5727A%T~QR9D(TJR4A
zvj10UXeIfm!%=#eTR|wQKMJ+tWYho+?0OdJJJ1pJwmgU0np}*<gQ)SYpc1)-8n4W7
z_o0fyV$AO~qM;jGpeE{o`lR+ko#N4`($7G>@2{ascm(6|Yb=3(VH6e_;re4xTatzP
z@bodqVjS^&^fkd28pUxRs&t1@{l`%Q|AZ>pWmIDKP+!8Jk#0o^sQc?;G-ja^9)?O_
z3hMsFs6;kkBz`)Q{a43#bm+CXi5jT%({7^5sDbLDO4}ZFeF$p6iC7vJpb}k<#c(aw
z!;M%I&tMXk9_6fusl-o?qW)?uqN6(QMeW^XtbwJUaSvo*H1Pn`eKSxKZ9;9y`xak7
z?eSIAq5BI<VWDhS;XqVe0rh-UpN2}Ch%uOf3D^r$a2i&{%@~cxP!+g_dK(^M87w^7
zZC$V#hDsn3OJfW^f+?sk;&a#({dqJBUJukCBtA!d<9|l2EaX|Y6<Mg)t{>{OzmBTV
z5!AQ;Hl|^PF>V1_sBuT3Ry-D!@Kg-O8BX6@N+XDl_2v#NM|{BIudz1qMbse;AL~k7
z74=*#R4JRH&PW@qi~~@IY#IjQ8>ln(4(k4W7_Hy`Lo~|LaT!(WyB3F!b1O|m?Rjt1
zgELXD**sL~H()jV0K4H2s0q`?yM&vf-kL1b{rxZ)pT=<J_omV)iOWzKuQqq1UdL}x
zZ^;klA7<bLmv}tt^rxdro{6eJOH{=M*!AJ4@y4JMn25giW-g5oT#8C$1L}3zhRXaq
z)Ih(ZCb*9(^+VL2R+{K4R0R`>+oHzHMy+@TR=`E5GxWCgpP5Mgbvm!op^5LIG7OmH
zR#qG}Kp3j@@u;(rjJhuqwSX2DKZ;7I3u?={qbf5ERgpR7dR$tFKO0V>{^4Bc`Mmod
zgrhN@cmpQmQPhKXF#$tgaEGWd>eP2beJ{pgU3?8S;ZbafCov1dC%ZG!AJd6nL@j8S
zZyldm$89qob*KtYai>2Sb=v!)4%aA)pGSQ+=Aqt_T<ibAylUp7o(r7n#)&{x+)tvR
zOwv&|G_ts@*$K6m-Ob_VWb<XzYqb_tkzLmRt$7ud_(N0$gQmH8>R}}Fdo5{bg8rC-
zV^9gLMkTbt;yjCYq3%C~`T%{08CaC9Y>1ht5>GTYVJ7hzyB;~+RjfN!)cZfFpuw*b
zR`K|Q1J=UBsEO`kc`P-<B~}HMSOV%bs$>1FF_gH2T_0%u*%nW*cqT@0-#qm*zqgJC
zrSP_)1~`VQz%Qs3Ucp4HFw?E9F{)Cdu?6N}ef$aaT=*=PU=>u!ld&dtL2cDE?1ZnQ
zuL&>GkojiFKU`cLl~_~MgMF-j9BNPJnJeu2yQus3qY^oTdb=)QH2#gMY?ayWSGVJA
z>felxsdVTAu?H*R3DiK>Py>{Fk<TW^pc3&>6D-FtTy61(sD<o7ZOvDxvv2{mWf61S
zr#lf9x0*x!wa1<5(1U}`=TWcIBCLk{uozxO{Z`zt_yKB*iq3Td*2XmACKiuIot-Hb
zFUFR{IToMwX|$r_8dk%!d2WThQI!~rN^l|S6t6*L{-gOH)EDwDYD<dFch^I)F>x&F
z`TnQ{jX^E+E!1=VP8wR-LDT@pQ6>Hn^)}o=ZAIuy&NNg49nC(d=Z2vMoMiEA)Pj~_
zcie-mvHSvee=p>^?+vG+0T-hZ$uZx?;>5WY=b5`uEBeghlc=-vJyylvFb2ylbk@N@
z;%=zt2BOZ?cns3}zo4MO-&jy9-Ha;HVbp_XEdCWWK%tl2p{jto-VXIXcSk)x8dbTM
zP!-sO33vi^|2@?BMHew1^LvqMU@eTo7N{HgTmN{}z;iGN*I9p_dC>e8HNjQX^Y<+d
zTI~9xQ1c|2ndqzIF&gD?5GwO=sDYN4t5I9C8Fhc2^&d39vi`HEvvbS(17C3oN1(<_
zGBeCpuTXyt*x7CzY>q=sI19Cs`PdBCp!WJK>YINX^?uh};=Tg|P+!7HsOPp~5FS7!
zaLW9}ys?D(>q0&qAy{&$`&o=a^(UhG(@_a!VJvpU6nxfPg<APByM6)ViA%idOhIj7
zS2G){63_Q(JW68|YQnpig+-RR%sZeC(G#dcHVacR2ld@Jj+!X=HFrG&HBM(#;{8z1
zKZ|-RmSaiWg<6pRKQ#2fQPkd_MwRR?>cQf#yAr3ON;?>J{Y}&Wxv1y2V;JtmaQqro
zsp}R8FLxD6!eIJaVg<eb-K=AT>+mL{GF^<1;dazO0V~|V30RT1396($%(0kG{4$op
z{ip<wqY^x6@z3Vv0@?o?cEcT11q#369*8wlQ3GXSZES_*a6CSavr#4e7FC&Zs043W
z9QdZ&iYPM`m3T`m`2FusBb1J()qyim6?hpn@HW)Sc3FHKb>BTKjYU_wk_KaW;yBb+
z)VKalsOJY@7QTvU_&xf{v`mg0C=vBw9V~<GF#>yHGLFGEn1dO3&aPKl<xX>5)WF?P
zzj8047V<AtV!vV(K17WhwVM6cz!|IE1A|bdUXQBCX4GNXZ~Z4xEC1fSZ2h;*eAJ;W
zyvA)oGV1=;W*1aN`=hpU_!{5+kAf9+=+u6Jn(z|p!TYER6<h1}uqvvQbx;XDg-Un|
zrs6Erb9vUk&*DQ^h5nORa5hlS2l{Wh2V%`s)PR|&8(N_f>y3JFj9s5^zJf9IFGnS|
z3$?=Q<~`J*3|QyJ4MD9u0@d$7LPHbvL47cuMSa<3q4xNFyM7t<-~()osc*Z4p2ot&
z|3Hm17j-CCp%$_UtK$0>e~C4SPb1^`Ug7ob?`m~X6ZXRn_$oHSvld5gaFrT{edr&L
zTEQ2n75{|A@CwG_Zy1f`-*FYHi`tqVs53Gc8#2H55)EZ|0F&^7#X%e0gQ=*MbwO2T
z7-}n)+4U{vzfpU96O~BtyDqVcW-Kb<ny5rFCG&gjX()jnc44A9%Uo>cpa$4v?n1p*
zN6a%=lK3X_Y4!3g4&LM@j5MpG60C>5Zp@@1yVwm+nd4B0Z#wFM<<`I2;>{N4nfp-h
z^>K?Yp(^(WYJsJ4-5INas#KF)>aT(O(xH_N#!5I2<M3tFq1%o+-RDp%4BzZl6oY!c
z7V7ZU!w%REyWy+We+89DK5Cwj_uT!l?@|APQqZ9rGEozB#X#(f+UpUh31*`1Uxr%g
zO4NNHTK_*SK4N}jp2srW_q+KJOA(jxx41?{)WmV96{nc}Q4cP{vY3NPU^D8y&$IXx
zYGpr|SFvEl7Kdzg<Hw?&uZc?BPq#*M45FhW>V|%(*KvsXCdLz=Fz=!gj@ssa%@Q$)
zxFssFuBdUwqb8bc&P64*45_H^<<iiDpJD_2+~VTzy9vWl17%_)w!$QQ6164sP-kYP
z`4JW*iox{XMI}&jyBjAA!-y+mpgvu7mwr|~+1Jop>C$c=#SlDi-Ze|*x$Bit*E3LS
zX>ak9=2&w!>Xa<Ec)NK3mC|X{(k|rLdvKMGhIHJ*+L-czTT6d)mbuY9j!NJrY5^s7
zxECuPwUAa8_cbS@CVT^{;ab!t{%Z&Cfin8aZa9mIFWC)$SpNg-FZ!XII0Q9Ob<`W(
z0<}2<P@6IzbsE;A#yf<X@FZ%}&!7^z?%NHw&47>G13}o18=@>8ip_|}q8{9C{U4(y
zK8OkU8)}QfcDj#t5^BXgQTO>+5#Rmacs~t2a1}N1LsZ7aK6Y_=R9p$mVl^`Z^;{df
z-V3$Dp;!Y)V?oL7`dV{~xf`jR?;Umx?-HtX#df&~V=$Ds7HXi@SP?te^&u9IL6vkq
zrr;Z>_uw!p@oT6v@~6dNyWM?p*oyhRE;Ka2GSo!tQ4?*p{sS06d<x6q4b%(fec~z*
zf;s~Us0mwRW$a>(HW#Ai$wgIaHx~R39-t9P#|cyd*Uj6yfjA#k>XLh09Aze<`ZG`^
zZ*TE<)C6--<Gq4f&~l64N1chC=<Af8rJ;cWK6NDzMNOQHY1jaj`AF19`32Mjb5Rp4
zv3P~K&ida&jr)Pchfw2wZt?e@l7|NPg%0iA6}u3=*JWG<Rr>mSmyS%?6FX{P_OR@M
z&kRi(7d>KJboS`+(F3C=4jeUNNVKj@7&vTbUVN>??MtPl)Jcy{YuKnx!@N6_t`>^>
of6txYx$xrht><@6zqE17#g+3eE}MIK)2hoGr|13je0ZDx0@+q;ApigX

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index fd59f532e..d4d34ddee 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -46,9 +46,9 @@ msgstr "重新連接成功"
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "未知"
@@ -298,7 +298,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
@@ -342,7 +342,7 @@ msgstr "編輯用戶 %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "用戶“%(nick)s”已更新"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
@@ -377,7 +377,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
@@ -476,108 +476,108 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr "書籍格式已成功刪除"
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr "書籍已成功刪除"
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr "編輯元數據"
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s 不是一個有效的數值，忽略"
 
-#: cps/editbooks.py:491
-#, python-format
-msgid "%(langname)s is not a valid language"
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s 不是一種有效語言"
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上傳文件附檔名為“%(ext)s”的文件到此服務器"
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr "要上傳的文件必須具有附檔名"
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "創建路徑 %(path)s 失敗(權限拒絕)。"
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失敗。"
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "標識符不區分大小寫，覆蓋舊標識符"
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr "已成功更新元數據"
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr "編輯書籍出錯，請檢查日誌文件以獲取詳細信息"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上傳的書籍可能已經存在，建議修改後重新上傳： "
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 無法保存到臨時目錄"
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移動封面文件失敗 %(file)s：%(error)s"
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上傳"
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr "轉換的來源或目的格式不存在"
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "書籍已經被成功加入到 %(book_format)s 格式轉換隊列"
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "轉換此書籍時出現錯誤： %(res)s"
@@ -685,7 +685,7 @@ msgstr "Google Drive上找不到文件 %(file)s"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此郵箱的賬號已經存在。"
 
@@ -766,7 +766,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -831,8 +831,8 @@ msgstr "Google Oauth 錯誤: {}"
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr "登入"
 
@@ -848,7 +848,7 @@ msgstr "Token已過期"
 msgid "Success! Please return to your device"
 msgstr "成功！請返回您的設備"
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr "書籍"
 
@@ -873,7 +873,7 @@ msgstr "已下載書籍"
 msgid "Show Downloaded Books"
 msgstr "顯示下載過的書籍"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr "最高評分書籍"
 
@@ -882,7 +882,7 @@ msgid "Show Top Rated Books"
 msgstr "顯示最高評分書籍"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr "已讀書籍"
 
@@ -891,7 +891,7 @@ msgid "Show read and unread"
 msgstr "顯示閱讀狀態"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr "未讀書籍"
 
@@ -909,7 +909,7 @@ msgid "Show Random Books"
 msgstr "隨機顯示書籍"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr "分類"
 
@@ -919,7 +919,7 @@ msgstr "顯示分類選擇"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr "叢書"
 
@@ -937,7 +937,7 @@ msgid "Show author selection"
 msgstr "顯示作者選擇"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr "出版社"
 
@@ -947,7 +947,7 @@ msgstr "顯示出版社選擇"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr "語言"
 
@@ -971,7 +971,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "顯示文件格式選擇"
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr "歸檔書籍"
 
@@ -979,7 +979,7 @@ msgstr "歸檔書籍"
 msgid "Show archived books"
 msgstr "顯示歸檔書籍"
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr "書籍列表"
 
@@ -1033,7 +1033,7 @@ msgstr "此書已從書架 %(sname)s 中刪除"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "創建書架"
 
@@ -1116,177 +1116,177 @@ msgstr "有新的更新。單擊下面的按鈕以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "無可用發佈信息"
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr "發現(隨機書籍)"
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr "熱門書籍（最多下載）"
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下載過的書籍"
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "叢書：%(serie)s"
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "評分：%(rating)s 星"
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分類：%(name)s"
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr "語言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr "搜尋"
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr "下載次數"
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr "評分列表"
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr "任務列表"
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr "出版時間晚於 "
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr "出版時間早於 "
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評分 <= %(rating)s"
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評分 >= %(rating)s"
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "閱讀狀態 = %(status)s"
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”登入"
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr "資料已更新"
 
@@ -1347,7 +1347,7 @@ msgstr "郵箱地址"
 msgid "Send to Kindle E-mail Address"
 msgstr "接收書籍的Kindle郵箱地址"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理權限"
@@ -1357,7 +1357,7 @@ msgstr "管理權限"
 msgid "Password"
 msgstr "密碼"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "上傳書籍"
@@ -1548,7 +1548,7 @@ msgid "OK"
 msgstr "確定"
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1646,13 +1646,13 @@ msgstr "轉換書籍"
 msgid "Book Title"
 msgstr "書名"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "作者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "簡介"
 
@@ -1660,15 +1660,15 @@ msgstr "簡介"
 msgid "Identifiers"
 msgstr "書號"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr "書號類型"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr "書號編號"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "移除"
@@ -1689,90 +1689,90 @@ msgstr "叢書編號"
 msgid "Rating"
 msgstr "評分"
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "從URL獲取封面（JPEG - 圖片將下載並存儲在數據庫中）"
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr "從本地硬碟上傳封面"
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr "出版日期"
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "語言"
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "確認"
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "沒有"
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr "上傳格式"
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr "查看保存書籍"
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "獲取元數據"
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr "儲存"
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "關鍵字"
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 #, fuzzy
 msgid "Search keyword"
 msgstr " 搜索關鍵字 "
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "單擊封面將元數據加載到表單"
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr "加載中..."
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr "關閉"
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr "來源"
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr "搜索錯誤！"
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr "無搜索結果！請嘗試另一個關鍵字。"
 
@@ -1976,6 +1976,10 @@ msgstr "儲存到硬碟時同步轉換書名與作者中的非英語字元"
 msgid "Enable Uploads"
 msgstr "啟用上傳"
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr "允許上傳的文件格式"
@@ -2337,7 +2341,7 @@ msgid "Add to shelf"
 msgstr "添加到書架"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(公共)"
@@ -2412,7 +2416,7 @@ msgstr "輸入網域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止註冊的網域名（黑名單）"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "下一個"
 
@@ -2522,7 +2526,7 @@ msgstr "書籍按評分排序"
 msgid "Books ordered by file formats"
 msgstr "書籍按文件格式排序"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "書架列表"
@@ -2543,48 +2547,48 @@ msgstr "切換導航"
 msgid "Search Library"
 msgstr "搜索書庫"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr "正在上傳..."
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr "錯誤"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr "上傳完成，正在處理中，請稍候..."
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "設置"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr "賬號"
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr "登出"
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr "請不要刷新頁面"
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr "瀏覽"
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "關於"
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "上一個"
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "書籍詳情"
 
diff --git a/messages.pot b/messages.pot
index 489258860..71c3f1ad2 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-23 19:29+0100\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718
-#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888
-#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr ""
@@ -296,7 +296,7 @@ msgstr ""
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr ""
 
@@ -340,7 +340,7 @@ msgstr ""
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
@@ -473,108 +473,108 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:306 cps/editbooks.py:308
+#: cps/editbooks.py:305 cps/editbooks.py:307
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:315 cps/editbooks.py:317
+#: cps/editbooks.py:314 cps/editbooks.py:316
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:407
+#: cps/editbooks.py:406
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:455
+#: cps/editbooks.py:454
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:491
+#: cps/editbooks.py:490 cps/editbooks.py:954
 #, python-format
-msgid "%(langname)s is not a valid language"
+msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:631 cps/editbooks.py:974
+#: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:635 cps/editbooks.py:978
+#: cps/editbooks.py:634 cps/editbooks.py:985
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:647
+#: cps/editbooks.py:646
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:652
+#: cps/editbooks.py:651
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:674
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:811
+#: cps/editbooks.py:810
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:845
+#: cps/editbooks.py:844
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:854
+#: cps/editbooks.py:857
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:895
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:986
+#: cps/editbooks.py:993
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1005
+#: cps/editbooks.py:1012
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1052
+#: cps/editbooks.py:1059
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1077
+#: cps/editbooks.py:1084
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1085
+#: cps/editbooks.py:1092
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1089
+#: cps/editbooks.py:1096
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -682,7 +682,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -763,7 +763,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -828,8 +828,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:86
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr ""
 
@@ -845,7 +845,7 @@ msgstr ""
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr ""
 
@@ -870,7 +870,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr ""
 
@@ -879,7 +879,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgid "Show read and unread"
 msgstr ""
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr ""
 
@@ -906,7 +906,7 @@ msgid "Show Random Books"
 msgstr ""
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr ""
 
@@ -916,7 +916,7 @@ msgstr ""
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr ""
 
@@ -934,7 +934,7 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr ""
 
@@ -944,7 +944,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr ""
 
@@ -968,7 +968,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr ""
 
@@ -976,7 +976,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1030,7 +1030,7 @@ msgstr ""
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:228 cps/templates/layout.html:142
+#: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr ""
 
@@ -1113,177 +1113,177 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr ""
 
-#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr ""
 
@@ -1344,7 +1344,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:78
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr ""
@@ -1354,7 +1354,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:67
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
 #: cps/templates/user_table.html:145
 msgid "Upload"
 msgstr ""
@@ -1545,7 +1545,7 @@ msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
@@ -1643,13 +1643,13 @@ msgstr ""
 msgid "Book Title"
 msgstr ""
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274
-#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
 msgid "Author"
 msgstr ""
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279
-#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
 msgid "Description"
 msgstr ""
 
@@ -1657,15 +1657,15 @@ msgstr ""
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
@@ -1686,89 +1686,89 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: cps/templates/book_edit.html:104
+#: cps/templates/book_edit.html:103
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:108
+#: cps/templates/book_edit.html:107
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:114
+#: cps/templates/book_edit.html:112
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276
-#: cps/templates/book_edit.html:293 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr ""
 
-#: cps/templates/book_edit.html:127 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr ""
 
-#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr ""
 
-#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr ""
 
-#: cps/templates/book_edit.html:203
+#: cps/templates/book_edit.html:200
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:208
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:236
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:237
+#: cps/templates/book_edit.html:233
 msgid "Search keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:243
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:254 cps/templates/layout.html:64
-#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:160
 msgid "Close"
 msgstr ""
 
-#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
 msgid "Source"
 msgstr ""
 
-#: cps/templates/book_edit.html:290
+#: cps/templates/book_edit.html:286
 msgid "Search error!"
 msgstr ""
 
-#: cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:287
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1970,6 +1970,10 @@ msgstr ""
 msgid "Enable Uploads"
 msgstr ""
 
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
 msgstr ""
@@ -2329,7 +2333,7 @@ msgid "Add to shelf"
 msgstr ""
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:139
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
 #: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
@@ -2404,7 +2408,7 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:172
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr ""
 
@@ -2514,7 +2518,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:137
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2535,48 +2539,48 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:119
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
 msgid "Uploading..."
 msgstr ""
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Error"
 msgstr ""
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:63
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:78 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:71
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr ""
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:78
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:82
+#: cps/templates/layout.html:80
 msgid "Logout"
 msgstr ""
 
-#: cps/templates/layout.html:120
+#: cps/templates/layout.html:118
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:130
+#: cps/templates/layout.html:128
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:143 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr ""
 
-#: cps/templates/layout.html:157
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:184
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr ""
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 60fa45148..dea6d5e99 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2021-11-24 20:41:04</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-02 06:37:36</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-11-25 00:24:57</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-12-02 10:15:15</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>3h 3 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>2h 57 min</p>
         </div>
       </div>
       </div>
@@ -881,12 +881,12 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
-        <td class="text-center">26</td>
+        <td class="text-center">34</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">8</td>
         <td class="text-center">1</td>
         <td class="text-center">
             <a onclick="showClassDetail('c11', 35)">Detail</a>
@@ -1146,234 +1146,74 @@
     
     
     
-        <tr id="et11.27" class="none bg-info">
+        <tr id='pt11.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.27')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.27" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.27').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 1011, in test_upload_book_cbr
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et11.28" class="none bg-info">
+        <tr id='pt11.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.28')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.28" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.28').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 986, in test_upload_book_cbt
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et11.29" class="none bg-info">
+        <tr id='pt11.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.29')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.29" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.29').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 961, in test_upload_book_cbz
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et11.30" class="none bg-info">
+        <tr id='pt11.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.30')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.30" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.30').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 923, in test_upload_book_epub
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et11.31" class="none bg-info">
+        <tr id='pt11.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.31')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.31" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.31').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 848, in test_upload_book_fb2
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et11.32" class="none bg-info">
+        <tr id='pt11.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.32')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.32" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 873, in test_upload_book_lit
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et11.33" class="none bg-info">
+        <tr id='pt11.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.33')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.33" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.33').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 898, in test_upload_book_mobi
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et11.34" class="none bg-info">
+        <tr id='pt11.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.34')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.34" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.34').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 823, in test_upload_book_pdf
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1565,12 +1405,12 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">17</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</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('c13', 20)">Detail</a>
@@ -1723,60 +1563,20 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
     
     
-        <tr id="et13.17" class="none bg-info">
+        <tr id='pt13.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et13.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et13.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 844, in test_upload_book_epub
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et13.18" class="none bg-info">
+        <tr id='pt13.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et13.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et13.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 820, in test_upload_book_lit
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1790,31 +1590,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
     
     
-        <tr id="ft13.20" class="none bg-danger">
+        <tr id='pt13.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 929, in test_watch_metadata
-    self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=37b525ac-f7df-4630-8811-e9f937dd6c89&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1862,12 +1642,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">6</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">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c15', 7)">Detail</a>
@@ -1921,31 +1701,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="et15.6" class="none bg-info">
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et15.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et15.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 144, in test_email_limit
-    upload.send_keys(random_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2098,15 +1858,15 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestKoboSync</td>
-        <td class="text-center">10</td>
-        <td class="text-center">10</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">11</td>
+        <td class="text-center">6</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 10)">Detail</a>
+            <a onclick="showClassDetail('c21', 11)">Detail</a>
         </td>
     </tr>
 
@@ -2130,34 +1890,103 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id="et21.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et21.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et21.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 619, in test_kobo_sync_selected_shelfs
+    self.assertIn(&#34;NewTag&#34;, data3[2])
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
         <tr id='pt21.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
+                <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt21.5' class='hiddenRow bg-success'>
+        <tr id="ft21.5" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.5').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 481, in test_shelves_add_remove_books
+    self.assertEqual(1, len(books))
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft21.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 286, in test_sync_changed_book
+    self.assertEqual(1, len(data))
+AssertionError: 1 != 2</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt21.6' class='hiddenRow bg-success'>
+        <tr id='pt21.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2166,7 +1995,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
     
     
-        <tr id='pt21.7' class='hiddenRow bg-success'>
+        <tr id='pt21.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2175,16 +2004,36 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
     
     
-        <tr id='pt21.8' class='hiddenRow bg-success'>
+        <tr id="ft21.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 304, in test_sync_shelf
+    self.assertEqual(1, len(data))
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt21.9' class='hiddenRow bg-success'>
+        <tr id='pt21.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2193,11 +2042,31 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
     
     
-        <tr id='pt21.10' class='hiddenRow bg-success'>
+        <tr id="ft21.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 270, in test_sync_upload
+    self.assertEqual(1, len(data))
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2205,13 +2074,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
 
     <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
-        <td class="text-center">4</td>
-        <td class="text-center">4</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', 4)">Detail</a>
+            <a onclick="showClassDetail('c22', 5)">Detail</a>
         </td>
     </tr>
 
@@ -2219,7 +2088,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
         <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
+                <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2228,7 +2097,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
         <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
+                <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2237,7 +2106,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
         <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
+                <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2245,6 +2114,15 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
     
         <tr id='pt22.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt22.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -3048,12 +2926,12 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
+        <td class="text-center">5</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('c31', 5)">Detail</a>
@@ -3089,33 +2967,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
     
     
-        <tr id="et31.4" class="none bg-info">
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et31.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et31.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et31.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 229, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 189, in sound_test
-    upload.send_keys(upload_file)
-AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3530,11 +3386,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">2</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</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">
@@ -3553,11 +3409,31 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id="ft36.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft36.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft36.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft36.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 128, in test_upload_epub_lang
+    self.assertEqual(len(self.adv_search({u&#39;include_language&#39;: u&#39;Tedesco&#39;})), 1)
+AssertionError: 0 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3968,322 +3844,51 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestCalibreWebVisibilitys</td>
-        <td class="text-center">34</td>
-        <td class="text-center">34</td>
+    <tr id="su" class="errorClass">
+        <td>_FailedTest</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('c40', 34)">Detail</a>
+            <a onclick="showClassDetail('c40', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id="et40.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
+                <div class='testcase'>_FailedTest - test_visiblilitys</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt40.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et40.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et40.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et40.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_visiblilitys
+Traceback (most recent call last):
+  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 436, in _find_test_path
+    module = self._get_module_from_name(name)
+  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 377, in _get_module_from_name
+    __import__(name)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 764
+    books = self.get_shelf_books_displayed()test_upload_book_cbr
+                                            ^
+SyntaxError: invalid syntax</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.26' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt40.27' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt40.28' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt40.29' 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='pt40.30' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt40.31' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt40.32' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt40.33' 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='pt40.34' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4449,10 +4054,10 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>376</td>
-        <td>357</td>
-        <td>1</td>
-        <td>12</td>
+        <td>345</td>
+        <td>332</td>
+        <td>5</td>
+        <td>2</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4835,7 +4440,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
           
             <tr>
               <th>python-ldap</th>
-              <td>3.3.1</td>
+              <td>3.4.0</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -4859,7 +4464,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;send_keys&#39;</pre>
 </div>
 
 <script>
-    drawCircle(357, 1, 12, 6);
+    drawCircle(332, 5, 2, 6);
     showCase(5);
 </script>
 

From 91a21ababe755b4346bae0e55bebb0124b7a2e9a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 4 Dec 2021 11:16:33 +0100
Subject: [PATCH 049/412] Allow download of archived books

---
 cps/helper.py             |  2 +-
 cps/kobo.py               | 19 +++++++++----------
 cps/services/SyncToken.py |  5 ++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index d966b331a..2c2c3cad3 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -823,7 +823,7 @@ def get_cc_columns(filter_config_custom_read=False):
 
 def get_download_link(book_id, book_format, client):
     book_format = book_format.split(".")[0]
-    book = calibre_db.get_filtered_book(book_id)
+    book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
     if book:
         data1 = calibre_db.get_book_format(book.id, book_format.upper())
     else:
diff --git a/cps/kobo.py b/cps/kobo.py
index 3d2af7f4d..653321cb9 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -355,7 +355,9 @@ def HandleMetadataRequest(book_uuid):
         return redirect_or_proxy_request()
 
     metadata = get_metadata(book)
-    return jsonify([metadata])
+    response = make_response(json.dumps([metadata]))
+    response.headers["Content-Type"] = "application/json; charset=utf-8"
+    return response
 
 
 def get_download_url_for_book(book, book_format):
@@ -413,15 +415,12 @@ def get_description(book):
 def get_author(book):
     if not book.authors:
         return {"Contributors": None}
-    if len(book.authors) > 1:
-        author_list = []
-        autor_roles = []
-        for author in book.authors:
-            autor_roles.append({"Name":author.name})    #.encode('unicode-escape').decode('latin-1')
-            author_list.append(author.name)
-        return {"ContributorRoles": autor_roles, "Contributors":author_list}
-    return {"ContributorRoles": [{"Name":book.authors[0].name}],
-            "Contributors": book.authors[0].name}
+    author_list = []
+    autor_roles = []
+    for author in book.authors:
+        autor_roles.append({"Name":author.name})    #.encode('unicode-escape').decode('latin-1')
+        author_list.append(author.name)
+    return {"ContributorRoles": autor_roles, "Contributors":author_list}
 
 
 def get_publisher(book):
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index 692aaa240..85ed50325 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -182,10 +182,9 @@ class SyncToken:
         return b64encode_json(token)
 
     def __str__(self):
-        return "{},{},{},{},{},{}".format(self.raw_kobo_store_token,
-                                       self.books_last_created,
+        return "{},{},{},{},{},{}".format(self.books_last_created,
                                        self.books_last_modified,
                                        self.archive_last_modified,
                                        self.reading_state_last_modified,
-                                       self.tags_last_modified)
+                                       self.tags_last_modified, self.raw_kobo_store_token)
                                        #self.books_last_id)

From bd01e840cac13749d527c6f7f5e577f352d1451a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 4 Dec 2021 11:50:25 +0100
Subject: [PATCH 050/412] Delete books in shelfs, downloaded books, kobo sync
 status, etc on database change (fixes #620)

---
 cps/admin.py          | 11 ++++++++++-
 cps/db.py             |  3 ---
 cps/static/js/main.js |  6 +-----
 cps/web.py            |  3 ---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index f104aa29b..2c32431f0 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1186,11 +1186,20 @@ def _db_configuration_update_helper():
         if not calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path):
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
                                             gdrive_error)
+        # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
+        ub.session.query(ub.Downloads).delete()
+        ub.session.query(ub.ArchivedBook).delete()
+        ub.session.query(ub.ArchivedBook).delete()
+        ub.session.query(ub.ReadBook).delete()
+        ub.session.query(ub.BookShelf).delete()
+        ub.session.query(ub.Bookmark).delete()
+        ub.session.query(ub.KoboReadingState).delete()
+        ub.session.query(ub.KoboStatistics).delete()
+        ub.session.query(ub.KoboSyncedBooks).delete()
         _config_string(to_save, "config_calibre_dir")
         calibre_db.update_config(config)
         if not os.access(os.path.join(config.config_calibre_dir, "metadata.db"), os.W_OK):
             flash(_(u"DB is not Writeable"), category="warning")
-            # warning = {'type': "warning", 'message': _(u"DB is not Writeable")}
     config.save()
     return _db_configuration_result(None, gdrive_error)
 
diff --git a/cps/db.py b/cps/db.py
index 70da9108d..4b0a7ac78 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -550,11 +550,8 @@ class CalibreDB():
 
     @classmethod
     def setup_db(cls, config_calibre_dir, 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_calibre_dir:
             cls.config.invalidate()
             return False
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 7a59b172c..cf6fbe0df 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -284,11 +284,7 @@ $(function() {
     }
 
     function fillFileTable(path, type, folder, filt) {
-        if (window.location.pathname.endsWith("/basicconfig")) {
-            var request_path = "/../basicconfig/pathchooser/";
-        } else {
-            var request_path = "/../../ajax/pathchooser/";
-        }
+        var request_path = "/../../ajax/pathchooser/";
         $.ajax({
             dataType: "json",
             data: {
diff --git a/cps/web.py b/cps/web.py
index 2cb92a090..13c56f116 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1525,9 +1525,6 @@ def register():
 
 @web.route('/login', methods=['GET', 'POST'])
 def login():
-    #if not config.db_configured:
-    #    log.debug(u"Redirect to initial configuration")
-    #    return redirect(url_for('admin.basic_configuration'))
     if current_user is not None and current_user.is_authenticated:
         return redirect(url_for('web.index'))
     if config.config_login_type == constants.LOGIN_LDAP and not services.ldap:

From eb2e816bfdb86b4ff1c352b59463b7fa33203b5b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 4 Dec 2021 14:58:28 +0100
Subject: [PATCH 051/412] Switch encoding in kobo metadata to ensure utf-8
 characters to show up properly (finally)

---
 cps/kobo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 653321cb9..e8ea65a49 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -355,7 +355,7 @@ def HandleMetadataRequest(book_uuid):
         return redirect_or_proxy_request()
 
     metadata = get_metadata(book)
-    response = make_response(json.dumps([metadata]))
+    response = make_response(json.dumps([metadata], ensure_ascii=False))
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 

From 3bf173d95885897702bc130d594d42f0e7409300 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 4 Dec 2021 15:44:41 +0100
Subject: [PATCH 052/412] Added response for kobo-benefits route and
 kobo-gettest route

---
 cps/kobo.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/cps/kobo.py b/cps/kobo.py
index e8ea65a49..482eb13a6 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -986,6 +986,25 @@ def HandleUserRequest(dummy=None):
     return redirect_or_proxy_request()
 
 
+@csrf.exempt
+@kobo.route("/v1/user/loyalty/benefits", methods=["GET"])
+def handle_benefits():
+    if config.config_kobo_proxy:
+        return redirect_or_proxy_request()
+    else:
+        return make_response(jsonify({"Benefits": {}}))
+
+
+@csrf.exempt
+@kobo.route("/v1/analytics/gettests", methods=["GET", "POST"])
+def handle_getests():
+    if config.config_kobo_proxy:
+        return redirect_or_proxy_request()
+    else:
+        testkey = request.headers.get("X-Kobo-userkey","")
+        return make_response(jsonify({"Result": "Success", "TestKey":testkey, "Tests": {}}))
+
+
 @csrf.exempt
 @kobo.route("/v1/products/<dummy>/prices", methods=["GET", "POST"])
 @kobo.route("/v1/products/<dummy>/recommendations", methods=["GET", "POST"])
@@ -1001,6 +1020,7 @@ def HandleUserRequest(dummy=None):
 @kobo.route("/v1/products/deals", methods=["GET", "POST"])
 @kobo.route("/v1/products", methods=["GET", "POST"])
 @kobo.route("/v1/affiliate", methods=["GET", "POST"])
+@kobo.route("/v1/deals", methods=["GET", "POST"])
 def HandleProductsRequest(dummy=None):
     log.debug("Unimplemented Products Request received: %s", request.base_url)
     return redirect_or_proxy_request()

From d21767635007835dbfb5393b563eb9cb0e48ba84 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 5 Dec 2021 13:04:13 +0100
Subject: [PATCH 053/412] Upated testresult Bugfix book table

---
 cps/db.py                               |   21 +-
 cps/editbooks.py                        |   16 +-
 cps/helper.py                           |    8 +-
 cps/kobo.py                             |    7 +-
 cps/kobo_sync_status.py                 |   18 +-
 cps/opds.py                             |    4 +-
 cps/static/js/table.js                  |    3 +-
 cps/templates/book_table.html           |    6 +-
 cps/templates/search.html               |   30 +-
 cps/web.py                              |   37 +-
 test/Calibre-Web TestSummary_Linux.html | 3661 +++++++++++++++++++----
 11 files changed, 3226 insertions(+), 585 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index fc11770c9..fe940d128 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -756,16 +756,21 @@ class CalibreDB():
         except Exception as ex:
             log.debug_or_exception(ex)
         # display authors in right order
-        entries = self.order_authors(entries, True)
+        entries = self.order_authors(entries, True, join_archive_read)
         return entries, randm, pagination
 
     # Orders all Authors in the list according to authors sort
-    def order_authors(self, entries, list_return=False):
+    def order_authors(self, entries, list_return=False, combined=False):
         for entry in entries:
-            sort_authors = entry.author_sort.split('&')
+            if combined:
+                sort_authors = entry.Books.author_sort.split('&')
+                ids = [a.id for a in entry.Books.authors]
+
+            else:
+                sort_authors = entry.author_sort.split('&')
+                ids = [a.id for a in entry.authors]
             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
@@ -776,7 +781,10 @@ class CalibreDB():
                     if r.id in ids:
                         authors_ordered.append(r)
             if not error:
-                entry.authors = authors_ordered
+                if combined:
+                    entry.Books.authors = authors_ordered
+                else:
+                    entry.authors = authors_ordered
         if list_return:
             return entries
         else:
@@ -841,7 +849,8 @@ class CalibreDB():
                 ))
 
     # read search results from calibre-database and return it (function is used for feed and simple search
-    def get_search_results(self, term, offset=None, order=None, limit=None, config_read_column=False, *join):
+    def get_search_results(self, term, offset=None, order=None, limit=None, allow_show_archived=False,
+                           config_read_column=False, *join):
         order = order[0] if order else [Books.sort]
         pagination = None
         result = self.search_query(term, config_read_column, *join).order_by(*order).all()
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 7bfa35cf2..9c942b527 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -50,6 +50,7 @@ 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
+from .kobo_sync_status import change_archived_books
 
 try:
     from functools import wraps
@@ -1185,10 +1186,9 @@ def edit_list_book(param):
         ret = Response(json.dumps({'success': True,
                                    'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
                        mimetype='application/json')
-    elif param =='is_archive':
-        # ToDo save
-        ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
-                       mimetype='application/json')
+    elif param =='is_archived':
+        change_archived_books(book.id, vals['value']=="True")
+        ret = ""
     elif param =='read_status':
         # ToDo save
         ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
@@ -1197,8 +1197,12 @@ def edit_list_book(param):
         new_val = dict()
         new_val[param] = vals['value']
         edit_single_cc_data(book.id, book, param[14:], new_val)
-        ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
-                       mimetype='application/json')
+        # ToDo: Very hacky find better solution
+        if vals['value'] in ["True", "False"]:
+            ret = ""
+        else:
+            ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
+                           mimetype='application/json')
     else:
         return _("Parameter not found"), 400
     book.last_modified = datetime.utcnow()
diff --git a/cps/helper.py b/cps/helper.py
index c30479a2c..73731908e 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -52,7 +52,7 @@ except ImportError:
 
 from . import calibre_db
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub
+from . import logger, config, get_locale, db, ub, kobo_sync_status
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
@@ -431,7 +431,8 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                         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_path, ex)
             log.debug(ex, exc_info=True)
@@ -441,12 +442,11 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
         # Rename all files from old names to new names
         try:
             clean_author_database(renamed_author, calibrepath)
-
             if first_author not in renamed_author:
                 clean_author_database([first_author], calibrepath, localbook)
             if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
                 shutil.rmtree(os.path.dirname(path))
-        except (OSError) as ex:
+        except (OSError, FileNotFoundError) as ex:
             log.error("Error in rename file in path %s", ex)
             log.debug(ex, exc_info=True)
             return _("Error in rename file in path: %(error)s", error=str(ex))
diff --git a/cps/kobo.py b/cps/kobo.py
index 482eb13a6..b0917a47d 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -949,7 +949,8 @@ def HandleBookDeletionRequest(book_uuid):
         return redirect_or_proxy_request()
 
     book_id = book.id
-    archived_book = (
+    is_archived = kobo_sync_status.change_archived_books(book_id, True)
+    '''archived_book = (
         ub.session.query(ub.ArchivedBook)
         .filter(ub.ArchivedBook.book_id == book_id)
         .first()
@@ -960,8 +961,8 @@ def HandleBookDeletionRequest(book_uuid):
     archived_book.last_modified = datetime.datetime.utcnow()
 
     ub.session.merge(archived_book)
-    ub.session_commit()
-    if archived_book.is_archived:
+    ub.session_commit()'''
+    if is_archived:
         kobo_sync_status.remove_synced_book(book_id)
     return "", 204
 
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index b88cb6ace..eee47d896 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -20,7 +20,7 @@
 from flask_login import current_user
 from . import ub
 import datetime
-from sqlalchemy.sql.expression import or_
+from sqlalchemy.sql.expression import or_, and_
 
 # Add the current book id to kobo_synced_books table for current user, if entry is already present,
 # do nothing (safety precaution)
@@ -42,18 +42,18 @@ def remove_synced_book(book_id):
     ub.session_commit()
 
 
-def add_archived_books(book_id):
-    archived_book = (ub.session.query(ub.ArchivedBook)
-                     .filter(ub.ArchivedBook.book_id == book_id)
-                     .filter(ub.ArchivedBook.user_id == current_user.id)
-                     .first())
+def change_archived_books(book_id, state=None, message=None):
+    archived_book = ub.session.query(ub.ArchivedBook).filter(and_(ub.ArchivedBook.user_id == int(current_user.id),
+                                                                  ub.ArchivedBook.book_id == book_id)).first()
     if not archived_book:
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
-    archived_book.is_archived = True
+
+    archived_book.is_archived = state if state else not archived_book.is_archived
     archived_book.last_modified = datetime.datetime.utcnow()
 
     ub.session.merge(archived_book)
-    ub.session_commit()
+    ub.session_commit(message)
+    return archived_book.is_archived
 
 
 # select all books which are synced by the current user and do not belong to a synced shelf and them to archive
@@ -65,7 +65,7 @@ def update_on_sync_shelfs(user_id):
                         .filter(or_(ub.Shelf.kobo_sync == 0, ub.Shelf.kobo_sync == None))
                         .filter(ub.KoboSyncedBooks.user_id == user_id).all())
     for b in books_to_archive:
-        add_archived_books(b.book_id)
+        change_archived_books(b.book_id, True)
         ub.session.query(ub.KoboSyncedBooks) \
             .filter(ub.KoboSyncedBooks.book_id == b.book_id) \
             .filter(ub.KoboSyncedBooks.user_id == user_id).delete()
diff --git a/cps/opds.py b/cps/opds.py
index f249218c6..0b0a8923b 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -528,8 +528,8 @@ def get_metadata_calibre_companion(uuid, library):
 def feed_search(term):
     if term:
         entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column)
-        entriescount = len(entries) if len(entries) > 0 else 1
-        pagination = Pagination(1, entriescount, entriescount)
+        entries_count = len(entries) if len(entries) > 0 else 1
+        pagination = Pagination(1, entries_count, entries_count)
         return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
     else:
         return render_xml_template('feed.xml', searchterm="")
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index fbb4df3ed..48c7631ac 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -810,10 +810,11 @@ function checkboxChange(checkbox, userId, field, field_index) {
 }
 
 function BookCheckboxChange(checkbox, userId, field) {
+    var value = checkbox.checked ? "True" : "False";
     $.ajax({
         method: "post",
         url: getPath() + "/ajax/editbooks/" + field,
-        data: {"pk": userId, "value": checkbox.checked},
+        data: {"pk": userId, "value": value},
         error: function(data) {
             handleListServerResponse([{type:"danger", message:data.responseText}])
         },
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index 6d6a0e80d..92c8a2f5b 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -71,8 +71,8 @@
             <!--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, true) }}
             <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('editbook.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
-            {{ book_checkbox_row('is_archived', _('Enter Archiv Status'), false)}}
-            {{ book_checkbox_row('read_status', _('Enter Read Status'), false)}}
+            {{ book_checkbox_row('is_archived', _('Archiv Status'), false)}}
+            {{ book_checkbox_row('read_status', _('Read Status'), false)}}
             {% for c in cc %}
               {% if c.datatype == "int" %}
                 <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
@@ -89,7 +89,7 @@
               {% elif c.datatype == "comments" %}
                   <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "bool" %}
-                  {{ book_checkbox_row('custom_column_' + c.id|string,  _('Enter ') + c.name, c.name, visiblility, all_roles, false)}}
+                  {{ book_checkbox_row('custom_column_' + c.id|string, c.name, false)}}
               {% else %}
                 <!--{{ text_table_row('custom_column_' + c.id|string, _('Enter ') + c.name, c.name, false, false) }} -->
               {% endif %}
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 627beaf85..7640192fc 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -41,21 +41,21 @@
     {% 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">
-            <span class="img" title="{{entry.title}}" >
-                <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 %}
+        {% if entry.Books.has_cover is defined %}
+           <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+            <span class="img" title="{{entry.Books.title}}" >
+                <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}" />
+                {% if entry.Books.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
         {% endif %}
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-          <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <p title="{{entry.Books.title}}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.Books.authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -71,24 +71,24 @@
               <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 %}
+          {% for format in entry.Books.data %}
             {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
             <span class="glyphicon glyphicon-music"></span>
             {% endif %}
           {% endfor %}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.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 href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
-          ({{entry.series_index|formatseriesindex}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
 
-        {% if entry.ratings.__len__() > 0 %}
+        {% if entry.Books.ratings.__len__() > 0 %}
         <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+          {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}
             <span class="glyphicon glyphicon-star good"></span>
             {% if loop.last and loop.index < 5 %}
               {% for numer in range(5 - loop.index) %}
diff --git a/cps/web.py b/cps/web.py
index 67a121be3..af5401d88 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -56,6 +56,7 @@ from .redirect import redirect_back
 from .usermanagement import login_required_if_no_ano
 from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
+from .kobo_sync_status import change_archived_books
 
 feature_support = {
     'ldap': bool(services.ldap),
@@ -197,17 +198,8 @@ def toggle_read(book_id):
 @web.route("/ajax/togglearchived/<int:book_id>", methods=['POST'])
 @login_required
 def toggle_archived(book_id):
-    archived_book = ub.session.query(ub.ArchivedBook).filter(and_(ub.ArchivedBook.user_id == int(current_user.id),
-                                                                  ub.ArchivedBook.book_id == book_id)).first()
-    if archived_book:
-        archived_book.is_archived = not archived_book.is_archived
-        archived_book.last_modified = datetime.utcnow()
-    else:
-        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("Book {} archivebit toggled".format(book_id))
-    if archived_book.is_archived:
+    is_archived = change_archived_books(book_id, message="Book {} archivebit toggled".format(book_id))
+    if is_archived:
         remove_synced_book(book_id)
     return ""
 
@@ -759,6 +751,7 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                                                       offset,
                                                                       order,
                                                                       limit,
+                                                                      False,
                                                                       config.config_read_column,
                                                                       *join)
     return render_title_template('search.html',
@@ -836,7 +829,7 @@ def list_books():
     elif not state:
         order = [db.Books.timestamp.desc()]
 
-    total_count = filtered_count = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(False)).count()
+    total_count = filtered_count = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(allow_show_archived=True)).count()
     if state is not None:
         if search:
             books = calibre_db.search_query(search, config.config_read_column).all()
@@ -860,24 +853,26 @@ def list_books():
                     books =calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
             books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
                                                           int(current_user.id) == ub.ArchivedBook.user_id))
-                     .filter(calibre_db.common_filters()).all())
+                     .filter(calibre_db.common_filters(allow_show_archived=True)).all())
         entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True)
     elif search:
         entries, filtered_count, __ = calibre_db.get_search_results(search,
                                                                     off,
                                                                     [order,''],
                                                                     limit,
+                                                                    True,
                                                                     config.config_read_column,
                                                                     *join)
     else:
-        entries, __, __ = calibre_db.fill_indexpage((int(off) / (int(limit)) + 1),
-                                                    limit,
-                                                    db.Books,
-                                                    True,
-                                                    order,
-                                                    True,
-                                                    config.config_read_column,
-                                                    *join)
+        entries, __, __ = calibre_db.fill_indexpage_with_archived_books((int(off) / (int(limit)) + 1),
+                                                                        db.Books,
+                                                                        limit,
+                                                                        True,
+                                                                        order,
+                                                                        True,
+                                                                        True,
+                                                                        config.config_read_column,
+                                                                        *join)
 
     result = list()
     for entry in entries:
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index dea6d5e99..b5b6f04ce 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-02 06:37:36</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-04 22:17:44</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-12-02 10:15:15</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-12-05 01:46:42</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 57 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>2h 48 min</p>
         </div>
       </div>
       </div>
@@ -411,11 +411,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">14</td>
-        <td class="text-center">14</td>
-        <td class="text-center">0</td>
+        <td class="text-center">12</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -488,11 +488,31 @@
     
     
     
-        <tr id='pt6.8' class='hiddenRow bg-success'>
+        <tr id="ft6.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 506, in test_convert_xss
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -542,11 +562,31 @@
     
     
     
-        <tr id='pt6.14' class='hiddenRow bg-success'>
+        <tr id="ft6.14" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.14')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 538, in test_user_convert_xss
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -705,12 +745,12 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">16</td>
-        <td class="text-center">14</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">6</td>
+        <td class="text-center">2</td>
+        <td class="text-center">6</td>
         <td class="text-center">2</td>
         <td class="text-center">
             <a onclick="showClassDetail('c10', 16)">Detail</a>
@@ -719,11 +759,31 @@
 
     
     
-        <tr id='pt10.1' class='hiddenRow bg-success'>
+        <tr id="ft10.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 136, in test_change_upload_formats
+    self.assertTrue(self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -737,11 +797,31 @@
     
     
     
-        <tr id='pt10.3' class='hiddenRow bg-success'>
+        <tr id="ft10.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 642, in test_delete_role
+    self.assertTrue(self.delete_book_format(12, &#39;FB2&#39;))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -782,38 +862,138 @@
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id="et10.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 654, in test_title_sort
+    self.verify_order(&#34;search&#34;, order=order)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1324, in verify_order
+    self.check_element_on_page((By.ID, key)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.9' class='hiddenRow bg-success'>
+        <tr id="et10.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 510, in test_upload_edit_role
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id="et10.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 55, in test_upload_metadata_cbr
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id="et10.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 92, in test_upload_metadata_cbt
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -844,11 +1024,37 @@
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id="et10.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 240, in test_writeonly_path
+    self.fill_basic_config({&#39;config_rarfile_location&#39;: unrar_path()})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -871,31 +1077,105 @@
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id="et10.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 718, in test_xss_custom_comment_edit
+    self.assertEqual(0, len(values[&#39;cust_columns&#39;]))
+KeyError: &#39;cust_columns&#39;</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">35</td>
-        <td class="text-center">34</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 35)">Detail</a>
+            <a onclick="showClassDetail('c11', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id="et11.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_edit_additional_books)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.1').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 41, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 444, in stop_calibre_web
+    cls.driver.find_element_by_id(&#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestEditBooks</td>
+        <td class="text-center">35</td>
+        <td class="text-center">14</td>
+        <td class="text-center">1</td>
+        <td class="text-center">19</td>
+        <td class="text-center">1</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c12', 35)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -904,7 +1184,7 @@
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -913,7 +1193,7 @@
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -922,97 +1202,297 @@
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id="ft12.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft12.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft12.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 443, in test_edit_comments
+    self.assertEqual(len(self.adv_search({u&#39;comment&#39;: u&#39;mirä 人&#39;})), 1)
+AssertionError: 0 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id="et12.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 452, in test_edit_custom_bool
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id="et12.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 543, in test_edit_custom_categories
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id="et12.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 526, in test_edit_custom_comment
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_5&#39;: u&#39;人1 Ä&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id="et12.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 592, in test_edit_custom_date
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_2_start&#39;: u&#39;16/7/2015&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.9' class='hiddenRow bg-success'>
+        <tr id="et12.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 560, in test_edit_custom_float
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.10' class='hiddenRow bg-success'>
+        <tr id="et12.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 576, in test_edit_custom_int
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.11' class='hiddenRow bg-success'>
+        <tr id="et12.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 467, in test_edit_custom_rating
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.12' class='hiddenRow bg-success'>
+        <tr id="et12.12" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.12')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 493, in test_edit_custom_single_select
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.13' class='hiddenRow bg-success'>
+        <tr id="et12.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 509, in test_edit_custom_text
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.14' class='hiddenRow bg-success'>
+        <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1021,7 +1501,7 @@
     
     
     
-        <tr id='pt11.15' class='hiddenRow bg-success'>
+        <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1030,7 +1510,7 @@
     
     
     
-        <tr id='pt11.16' class='hiddenRow bg-success'>
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1039,7 +1519,7 @@
     
     
     
-        <tr id='pt11.17' class='hiddenRow bg-success'>
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1048,7 +1528,7 @@
     
     
     
-        <tr id='pt11.18' class='hiddenRow bg-success'>
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1057,28 +1537,48 @@
     
     
     
-        <tr id='pt11.19' class='hiddenRow bg-success'>
+        <tr id="et12.19" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.19')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.19" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 73, in test_edit_title
+    self.assertEqual(u&#39;O0ü 执&#39;, values[&#39;title&#39;])
+KeyError: &#39;title&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id="st11.20" class="none bg-warning">
+        <tr id="st12.20" 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_st11.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1092,7 +1592,7 @@
     
     
     
-        <tr id='pt11.21' class='hiddenRow bg-success'>
+        <tr id='pt12.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1101,7 +1601,7 @@
     
     
     
-        <tr id='pt11.22' class='hiddenRow bg-success'>
+        <tr id='pt12.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1110,7 +1610,7 @@
     
     
     
-        <tr id='pt11.23' class='hiddenRow bg-success'>
+        <tr id='pt12.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1119,7 +1619,7 @@
     
     
     
-        <tr id='pt11.24' class='hiddenRow bg-success'>
+        <tr id='pt12.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1128,7 +1628,7 @@
     
     
     
-        <tr id='pt11.25' class='hiddenRow bg-success'>
+        <tr id='pt12.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1137,7 +1637,7 @@
     
     
     
-        <tr id='pt11.26' class='hiddenRow bg-success'>
+        <tr id='pt12.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1146,103 +1646,331 @@
     
     
     
-        <tr id='pt11.27' class='hiddenRow bg-success'>
+        <tr id="et12.27" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.27')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.27" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.27').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 1022, in test_upload_book_cbr
+    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.28' class='hiddenRow bg-success'>
+        <tr id="et12.28" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.28')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.28" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.28').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 987, in test_upload_book_cbt
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.29' class='hiddenRow bg-success'>
+        <tr id="et12.29" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.29')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.29" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.29').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 961, in test_upload_book_cbz
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.30' class='hiddenRow bg-success'>
+        <tr id="et12.30" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.30')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.30" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.30').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 922, in test_upload_book_epub
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.31' class='hiddenRow bg-success'>
+        <tr id="et12.31" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.31')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.31" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.31').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 844, in test_upload_book_fb2
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.32' class='hiddenRow bg-success'>
+        <tr id="et12.32" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.32')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.32" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 870, in test_upload_book_lit
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.33' class='hiddenRow bg-success'>
+        <tr id="et12.33" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.33')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.33" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.33').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 896, in test_upload_book_mobi
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.34' class='hiddenRow bg-success'>
+        <tr id="et12.34" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.34')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.34" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.34').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 818, in test_upload_book_pdf
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt11.35' class='hiddenRow bg-success'>
+        <tr id="et12.35" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.35')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.35" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.35').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 769, in test_upload_cover_hdd
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">3</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 18)">Detail</a>
+            <a onclick="showClassDetail('c13', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1251,7 +1979,7 @@
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1260,7 +1988,7 @@
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1269,7 +1997,7 @@
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1278,7 +2006,7 @@
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1287,7 +2015,7 @@
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1296,7 +2024,7 @@
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt13.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1305,7 +2033,7 @@
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt13.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1314,7 +2042,7 @@
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt13.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1323,7 +2051,7 @@
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt13.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1332,7 +2060,7 @@
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt13.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1341,7 +2069,7 @@
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt13.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1350,7 +2078,7 @@
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt13.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1359,7 +2087,7 @@
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt13.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -1368,58 +2096,140 @@
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id="et13.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et13.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 73, in test_bookslist_edit_title
+    bl = self.get_books_list(-1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1827, in get_books_list
+    element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements_by_xpath(&#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id="ft13.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.16')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 287, in test_list_visibility
+    self.assertEqual(17, len(bl[&#39;column_elements&#39;]))
+AssertionError: 17 != 20</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id="ft13.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.17')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 326, in test_restricted_rights
+    self.assertFalse(&#39;Delete&#39; in bl[&#39;table&#39;][0])
+AssertionError: True is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id="ft13.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 63, in test_search_books_list
+    self.assertEqual(9, len(bl[&#39;table&#39;]))
+AssertionError: 9 != 10</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">9</td>
+        <td class="text-center">2</td>
+        <td class="text-center">9</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 20)">Detail</a>
+            <a onclick="showClassDetail('c14', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1428,7 +2238,7 @@
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1437,7 +2247,7 @@
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1446,7 +2256,7 @@
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1455,70 +2265,210 @@
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id="ft14.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft14.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 652, in test_edit_custom_bool
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 1)
+AssertionError: 0 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id="et14.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.6').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 714, in test_edit_custom_categories
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.7' class='hiddenRow bg-success'>
+        <tr id="et14.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.7').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 732, in test_edit_custom_float
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.8' class='hiddenRow bg-success'>
+        <tr id="et14.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.8').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 748, in test_edit_custom_int
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.9' class='hiddenRow bg-success'>
+        <tr id="et14.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 661, in test_edit_custom_rating
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.10' class='hiddenRow bg-success'>
+        <tr id="et14.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 681, in test_edit_custom_single_select
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.11' class='hiddenRow bg-success'>
+        <tr id="et14.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 697, in test_edit_custom_text
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1527,7 +2477,7 @@
     
     
     
-        <tr id='pt13.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1536,7 +2486,7 @@
     
     
     
-        <tr id='pt13.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1545,7 +2495,7 @@
     
     
     
-        <tr id='pt13.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1554,7 +2504,7 @@
     
     
     
-        <tr id='pt13.16' class='hiddenRow bg-success'>
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1563,38 +2513,130 @@
     
     
     
-        <tr id='pt13.17' class='hiddenRow bg-success'>
+        <tr id="et14.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 850, in test_upload_book_epub
+    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.18' class='hiddenRow bg-success'>
+        <tr id="et14.18" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 815, in test_upload_book_lit
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.19' class='hiddenRow bg-success'>
+        <tr id="et14.19" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.19')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.19" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 763, in test_upload_cover_hdd
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt13.20' class='hiddenRow bg-success'>
+        <tr id="ft14.20" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.20')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft14.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft14.20').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 901, in test_watch_metadata
+    self.assertTrue(button)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1608,13 +2650,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 3)">Detail</a>
+            <a onclick="showClassDetail('c15', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1623,7 +2665,7 @@
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1632,7 +2674,7 @@
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1642,21 +2684,21 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 7)">Detail</a>
+            <a onclick="showClassDetail('c16', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1665,7 +2707,7 @@
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1674,7 +2716,7 @@
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1683,7 +2725,7 @@
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1692,7 +2734,7 @@
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1701,20 +2743,60 @@
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id="et16.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 147, in test_email_limit
+    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id="et16.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 217, in test_filepicker_two_file
+    accordions[0].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1728,13 +2810,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1752,13 +2834,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1776,13 +2858,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -1800,13 +2882,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -1824,13 +2906,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 3)">Detail</a>
+            <a onclick="showClassDetail('c21', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -1839,7 +2921,7 @@
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -1848,7 +2930,7 @@
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -1858,30 +2940,54 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">6</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">2</td>
+        <td class="text-center">9</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 11)">Detail</a>
+            <a onclick="showClassDetail('c22', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id="ft22.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 584, in test_book_download
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -1890,26 +2996,30 @@
     
     
     
-        <tr id="et21.3" class="none bg-info">
+        <tr id="ft22.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et21.3')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.3')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et21.3" class="popup_window test_output" style="display:block;">
+                <div id="div_ft22.3" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et21.3').style.display='none'"><span
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 619, in test_kobo_sync_selected_shelfs
-    self.assertIn(&#34;NewTag&#34;, data3[2])
-IndexError: list index out of range</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 603, in test_kobo_sync_selected_shelfs
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1919,35 +3029,63 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt21.4' class='hiddenRow bg-success'>
+        <tr id="ft22.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 653, in test_kobo_upload_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id="ft21.5" class="none bg-danger">
+        <tr id="ft22.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.5')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.5')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft21.5" class="popup_window test_output" style="display:block;">
+                <div id="div_ft22.5" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.5').style.display='none'"><span
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 481, in test_shelves_add_remove_books
-    self.assertEqual(1, len(books))
-AssertionError: 1 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 448, in test_shelves_add_remove_books
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1957,26 +3095,30 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id="ft21.6" class="none bg-danger">
+        <tr id="ft22.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.6')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.6')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft21.6" class="popup_window test_output" style="display:block;">
+                <div id="div_ft22.6" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.6').style.display='none'"><span
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 286, in test_sync_changed_book
-    self.assertEqual(1, len(data))
-AssertionError: 1 != 2</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 278, in test_sync_changed_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1986,7 +3128,7 @@ AssertionError: 1 != 2</pre>
     
     
     
-        <tr id='pt21.7' class='hiddenRow bg-success'>
+        <tr id='pt22.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -1995,35 +3137,63 @@ AssertionError: 1 != 2</pre>
     
     
     
-        <tr id='pt21.8' class='hiddenRow bg-success'>
+        <tr id="ft22.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 515, in test_sync_reading_state
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id="ft21.9" class="none bg-danger">
+        <tr id="ft22.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.9')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.9')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft21.9" class="popup_window test_output" style="display:block;">
+                <div id="div_ft22.9" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.9').style.display='none'"><span
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 304, in test_sync_shelf
-    self.assertEqual(1, len(data))
-AssertionError: 1 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 297, in test_sync_shelf
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2033,35 +3203,63 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt21.10' class='hiddenRow bg-success'>
+        <tr id="ft22.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 243, in test_sync_unchanged
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id="ft21.11" class="none bg-danger">
+        <tr id="ft22.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.11')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.11')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft21.11" class="popup_window test_output" style="display:block;">
+                <div id="div_ft22.11" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.11').style.display='none'"><span
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 270, in test_sync_upload
-    self.assertEqual(1, len(data))
-AssertionError: 1 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 257, in test_sync_upload
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2072,21 +3270,21 @@ AssertionError: 1 != 0</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 5)">Detail</a>
+            <a onclick="showClassDetail('c23', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2095,38 +3293,134 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id="ft23.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft23.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 260, in test_kobo_sync_selected_shelfs
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id="ft23.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft23.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 164, in test_sync_changed_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id="ft23.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft23.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft23.4').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 237, in test_sync_reading_state
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt22.5' class='hiddenRow bg-success'>
+        <tr id="ft23.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft23.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft23.5').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 193, in test_sync_shelf
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2140,13 +3434,13 @@ AssertionError: 1 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 13)">Detail</a>
+            <a onclick="showClassDetail('c24', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2155,7 +3449,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2164,7 +3458,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2173,7 +3467,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2182,7 +3476,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2191,7 +3485,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.6' class='hiddenRow bg-success'>
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2200,7 +3494,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2209,7 +3503,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.8' class='hiddenRow bg-success'>
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2218,7 +3512,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.9' class='hiddenRow bg-success'>
+        <tr id='pt24.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2227,7 +3521,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.10' class='hiddenRow bg-success'>
+        <tr id='pt24.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2236,7 +3530,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.11' class='hiddenRow bg-success'>
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2245,7 +3539,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.12' class='hiddenRow bg-success'>
+        <tr id='pt24.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2254,7 +3548,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt23.13' class='hiddenRow bg-success'>
+        <tr id='pt24.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2272,13 +3566,13 @@ AssertionError: 1 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 8)">Detail</a>
+            <a onclick="showClassDetail('c25', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2287,7 +3581,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2296,7 +3590,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2305,7 +3599,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2314,7 +3608,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2323,7 +3617,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2332,7 +3626,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2341,7 +3635,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2359,13 +3653,13 @@ AssertionError: 1 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 9)">Detail</a>
+            <a onclick="showClassDetail('c26', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2374,7 +3668,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2383,7 +3677,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2392,7 +3686,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2401,19 +3695,19 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id="st25.5" class="none bg-warning">
+        <tr id="st26.5" 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_st25.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st25.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st26.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_st25.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st26.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2427,7 +3721,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2436,7 +3730,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2445,7 +3739,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2454,7 +3748,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2472,13 +3766,13 @@ AssertionError: 1 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 15)">Detail</a>
+            <a onclick="showClassDetail('c27', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2487,7 +3781,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2496,7 +3790,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2505,7 +3799,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2514,7 +3808,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2523,7 +3817,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2532,7 +3826,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2541,7 +3835,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2550,7 +3844,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2559,7 +3853,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2568,7 +3862,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2577,7 +3871,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2586,7 +3880,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2595,7 +3889,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.14' class='hiddenRow bg-success'>
+        <tr id='pt27.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2604,7 +3898,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt26.15' class='hiddenRow bg-success'>
+        <tr id='pt27.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2622,13 +3916,13 @@ AssertionError: 1 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 2)">Detail</a>
+            <a onclick="showClassDetail('c28', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2637,7 +3931,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_merge_book</div>
             </td>
@@ -2655,13 +3949,13 @@ AssertionError: 1 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 2)">Detail</a>
+            <a onclick="showClassDetail('c29', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2670,7 +3964,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2680,21 +3974,21 @@ AssertionError: 1 != 0</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestOPDSFeed</td>
         <td class="text-center">23</td>
-        <td class="text-center">23</td>
-        <td class="text-center">0</td>
+        <td class="text-center">22</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('c29', 23)">Detail</a>
+            <a onclick="showClassDetail('c30', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2703,7 +3997,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2712,7 +4006,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2721,7 +4015,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2730,7 +4024,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2739,7 +4033,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2748,7 +4042,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2757,7 +4051,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2766,7 +4060,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2775,7 +4069,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2784,7 +4078,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2793,7 +4087,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2802,7 +4096,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2811,7 +4105,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2820,7 +4114,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -2829,7 +4123,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.16' class='hiddenRow bg-success'>
+        <tr id='pt30.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -2838,16 +4132,36 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.17' class='hiddenRow bg-success'>
+        <tr id="ft30.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft30.17')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft30.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft30.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 574, in test_opds_search
+    self.assertEqual(200, r.status_code)
+AssertionError: 200 != 500</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt29.18' class='hiddenRow bg-success'>
+        <tr id='pt30.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -2856,7 +4170,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.19' class='hiddenRow bg-success'>
+        <tr id='pt30.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -2865,7 +4179,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.20' class='hiddenRow bg-success'>
+        <tr id='pt30.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -2874,7 +4188,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.21' class='hiddenRow bg-success'>
+        <tr id='pt30.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -2883,7 +4197,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.22' class='hiddenRow bg-success'>
+        <tr id='pt30.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -2892,7 +4206,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt29.23' class='hiddenRow bg-success'>
+        <tr id='pt30.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2902,45 +4216,67 @@ AssertionError: 1 != 0</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestUploadPDF</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">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 1)">Detail</a>
+            <a onclick="showClassDetail('c31', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id="et31.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et31.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et31.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et31.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 129, in test_upload_invalid_pdf
+    self.check_uploaded_pdf({&#39;author&#39;: &#34;Mani Mücks&#34;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 59, in check_uploaded_pdf
+    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">4</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('c31', 5)">Detail</a>
+            <a onclick="showClassDetail('c32', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -2949,7 +4285,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -2958,7 +4294,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -2967,16 +4303,38 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id="et32.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et32.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et32.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et32.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 191, in sound_test
+    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -2994,13 +4352,13 @@ AssertionError: 1 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 8)">Detail</a>
+            <a onclick="showClassDetail('c33', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3009,7 +4367,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3018,7 +4376,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3027,7 +4385,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt32.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3036,7 +4394,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3045,7 +4403,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt32.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3054,7 +4412,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt32.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3063,7 +4421,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt32.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3081,13 +4439,13 @@ AssertionError: 1 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 3)">Detail</a>
+            <a onclick="showClassDetail('c34', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3096,7 +4454,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3105,7 +4463,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3115,21 +4473,21 @@ AssertionError: 1 != 0</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestShelf</td>
+        <td class="text-center">26</td>
+        <td class="text-center">1</td>
+        <td class="text-center">10</td>
         <td class="text-center">14</td>
-        <td class="text-center">13</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('c34', 14)">Detail</a>
+            <a onclick="showClassDetail('c35', 26)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3138,109 +4496,657 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id="ft35.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 466, in test_adv_search_shelf
+    self.assertEqual(len(self.adv_search({u&#39;include_shelf&#39;: u&#39;Search&#39;, &#39;book_title&#39;: &#39;book&#39;})), 2)
+AssertionError: 0 != 2</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id="et35.3" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_adv_search_shelf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft35.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 252, in test_arrange_shelf
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id="et35.5" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_arrange_shelf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et35.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 146, in test_create_public_shelf
+    self.create_user(&#39;invalid&#39;, {&#39;edit_shelf_role&#39;: 0, &#39;password&#39;: &#39;1234&#39;, &#39;email&#39;: &#39;bac@b.com&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 976, in create_user
+    return cls.change_user(config)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
+    ele = cls.driver.find_element_by_id(checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_shelf_role&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id="et35.7" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_create_public_shelf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft35.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 237, in test_delete_book_of_shelf
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id="et35.9" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft35.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 57, in test_private_shelf
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id="et35.11" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_private_shelf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft35.12" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.12')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 295, in test_public_private_shelf
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id="et35.13" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_public_private_shelf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft35.14" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.14')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 95, in test_public_shelf
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id="et35.15" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_public_shelf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft35.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.16')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 168, in test_rename_shelf
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id="et35.17" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_rename_shelf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft35.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 334, in test_shelf_action_non_shelf_edit_role
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id="et35.19" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.19')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.19" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et35.20" class="none bg-info">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.20')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.20').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 391, in test_shelf_anonymous
+    self.fill_basic_config({&#39;config_anonbrowse&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id="st34.12" class="none bg-warning">
+        <tr id="et35.21" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_anonymous</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.21')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.21" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.21').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="st35.22" 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_st34.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st35.22')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st34.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st35.22" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st34.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st35.22').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3254,20 +5160,126 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id="ft35.23" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.23')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.23" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.23').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 328, in test_shelf_long_name
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id="et35.24" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_long_name</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.24')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.24" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.24').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft35.25" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.25')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.25" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.25').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 479, in test_xss_shelf
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et35.26" class="none bg-info">
+            <td>
+                <div class='testcase'>TestShelf - test_xss_shelf</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.26')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.26" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.26').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
+    self.login(&#39;admin&#39;,&#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3281,13 +5293,13 @@ AssertionError: 1 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 9)">Detail</a>
+            <a onclick="showClassDetail('c36', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3296,7 +5308,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3305,7 +5317,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3314,7 +5326,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3323,7 +5335,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3332,7 +5344,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt35.6' class='hiddenRow bg-success'>
+        <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3341,19 +5353,19 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id="st35.7" class="none bg-warning">
+        <tr id="st36.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_st35.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st35.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st36.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_st35.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st36.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3367,7 +5379,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt35.8' class='hiddenRow bg-success'>
+        <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3376,7 +5388,7 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt35.9' class='hiddenRow bg-success'>
+        <tr id='pt36.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3386,49 +5398,79 @@ AssertionError: 1 != 0</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">2</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">2</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 2)">Detail</a>
+            <a onclick="showClassDetail('c37', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id="et37.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 82, in test_upload_epub_duplicate
+    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id="ft36.2" class="none bg-danger">
+        <tr id="et37.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft36.2')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.2')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft36.2" class="popup_window test_output" style="display:block;">
+                <div id="div_et37.2" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft36.2').style.display='none'"><span
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 128, in test_upload_epub_lang
-    self.assertEqual(len(self.adv_search({u&#39;include_language&#39;: u&#39;Tedesco&#39;})), 1)
-AssertionError: 0 != 1</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 110, in test_upload_epub_lang
+    self.change_visibility_me({&#39;locale&#39;: &#34;Italiano&#34;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 887, in change_visibility_me
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;locale&#34;]</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3447,13 +5489,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 18)">Detail</a>
+            <a onclick="showClassDetail('c38', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3462,7 +5504,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3471,7 +5513,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3480,7 +5522,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3489,7 +5531,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3498,7 +5540,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3507,7 +5549,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3516,7 +5558,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3525,7 +5567,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id='pt38.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3534,7 +5576,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.10' class='hiddenRow bg-success'>
+        <tr id='pt38.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3543,7 +5585,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.11' class='hiddenRow bg-success'>
+        <tr id='pt38.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3552,7 +5594,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.12' class='hiddenRow bg-success'>
+        <tr id='pt38.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3561,7 +5603,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.13' class='hiddenRow bg-success'>
+        <tr id='pt38.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3570,7 +5612,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.14' class='hiddenRow bg-success'>
+        <tr id='pt38.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3579,7 +5621,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.15' class='hiddenRow bg-success'>
+        <tr id='pt38.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3588,7 +5630,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.16' class='hiddenRow bg-success'>
+        <tr id='pt38.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3597,7 +5639,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.17' class='hiddenRow bg-success'>
+        <tr id='pt38.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3606,7 +5648,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.18' class='hiddenRow bg-success'>
+        <tr id='pt38.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3624,13 +5666,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c39', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3648,13 +5690,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 21)">Detail</a>
+            <a onclick="showClassDetail('c40', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3663,7 +5705,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3672,7 +5714,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3681,7 +5723,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3690,7 +5732,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3699,7 +5741,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3708,7 +5750,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3717,7 +5759,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3726,7 +5768,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3735,7 +5777,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3744,7 +5786,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3753,7 +5795,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3762,7 +5804,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3771,7 +5813,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.14' class='hiddenRow bg-success'>
+        <tr id='pt40.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3780,7 +5822,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3789,7 +5831,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3798,7 +5840,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.17' class='hiddenRow bg-success'>
+        <tr id='pt40.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3807,7 +5849,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.18' class='hiddenRow bg-success'>
+        <tr id='pt40.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -3816,7 +5858,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.19' class='hiddenRow bg-success'>
+        <tr id='pt40.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -3825,7 +5867,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.20' class='hiddenRow bg-success'>
+        <tr id='pt40.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -3834,7 +5876,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.21' class='hiddenRow bg-success'>
+        <tr id='pt40.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -3845,45 +5887,634 @@ AssertionError: 0 != 1</pre>
 
 
     <tr id="su" class="errorClass">
-        <td>_FailedTest</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>TestCalibreWebVisibilitys</td>
+        <td class="text-center">34</td>
+        <td class="text-center">20</td>
+        <td class="text-center">4</td>
+        <td class="text-center">10</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 1)">Detail</a>
+            <a onclick="showClassDetail('c41', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et40.1" class="none bg-info">
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>_FailedTest - test_visiblilitys</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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='pt41.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="ft41.17" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et40.1')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.17')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et40.1" class="popup_window test_output" style="display:block;">
+                <div id="div_ft41.17" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et40.1').style.display='none'"><span
+                                onclick="document.getElementById('div_ft41.17').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_visiblilitys
-Traceback (most recent call last):
-  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 436, in _find_test_path
-    module = self._get_module_from_name(name)
-  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 377, in _get_module_from_name
-    __import__(name)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 764
-    books = self.get_shelf_books_displayed()test_upload_book_cbr
-                                            ^
-SyntaxError: invalid syntax</pre>
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 755, in test_allow_columns
+    self.assertEqual(len(self.adv_search({&#39;book_title&#39;: &#39;Buchtitel&#39;})), 1)
+AssertionError: 0 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft41.18" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 586, in test_allow_tags
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft41.19" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.19')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.19" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 943, in test_archive_books
+    self.assertIsNotNone(details[&#39;archived&#39;])
+AssertionError: unexpectedly None</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.20" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.20')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.20').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 911, in test_authors_max_settings
+    self.assertEqual(len(list_element[1][10][&#39;author&#39;]), 4)
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt41.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='pt41.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="et41.23" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.23')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.23" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.23').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 852, in test_hide_custom_column
+    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.24" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.24')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.24" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.24').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 786, in test_link_column_to_read_status
+    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.25" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.25')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.25" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.25').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 89, in test_random_books_available
+    list_element[0].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt41.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft41.27" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.27')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.27" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.27').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 669, in test_restrict_columns
+    self.assertEqual(len(restricts), 0)
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.28" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.28')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.28" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.28').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 514, in test_restrict_tags
+    self.assertEqual(len(elements[&#39;include_tags&#39;]), 1)
+TypeError: &#39;bool&#39; object is not subscriptable</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.29" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.29')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.29" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.29').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 991, in test_save_views_recent
+    self.check_element_on_page((By.ID, &#34;desc&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt41.30' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="et41.31" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.31')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.31" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.31').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 474, in test_search_order
+    self.search(&#39;book&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1991, in search
+    field.send_keys(term)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 477, in send_keys
+    self._execute(Command.SEND_KEYS_TO_ELEMENT,
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;query&#34; class=&#34;form-control&#34; name=&#34;query&#34; type=&#34;text&#34;&gt; is not reachable by keyboard</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.32" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.32')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.32" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 469, in test_search_string
+    self.search(&#39;Hallo&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1991, in search
+    field.send_keys(term)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 477, in send_keys
+    self._execute(Command.SEND_KEYS_TO_ELEMENT,
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;query&#34; class=&#34;form-control&#34; name=&#34;query&#34; type=&#34;text&#34;&gt; is not reachable by keyboard</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.33" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.33')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.33" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.33').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 101, in test_user_email_available
+    self.driver.find_element_by_id(&#34;top_user&#34;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;a id=&#34;top_user&#34; href=&#34;/me&#34;&gt; is not clickable at point (2414,25) because another element &lt;div id=&#34;restrictModal&#34; class=&#34;modal fade in&#34;&gt; obscures it</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.34" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.34')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.34" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.34').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 118, in test_user_visibility_sidebar
+    self.change_user({&#39;show_32&#39;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1032, in change_user
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;input id=&#34;show_32&#34; name=&#34;show_32&#34; type=&#34;checkbox&#34;&gt; is not clickable at point (486,766) because another element &lt;div id=&#34;restrictModal&#34; class=&#34;modal fade in&#34;&gt; obscures it</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3902,13 +6533,13 @@ SyntaxError: invalid syntax</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c42', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -3917,7 +6548,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -3926,7 +6557,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -3935,7 +6566,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -3944,7 +6575,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -3953,7 +6584,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -3962,7 +6593,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -3971,7 +6602,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -3980,7 +6611,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -3989,7 +6620,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -3998,7 +6629,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4007,7 +6638,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4016,7 +6647,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4025,7 +6656,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4034,7 +6665,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4043,7 +6674,7 @@ SyntaxError: invalid syntax</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4054,10 +6685,10 @@ SyntaxError: invalid syntax</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>345</td>
-        <td>332</td>
-        <td>5</td>
-        <td>2</td>
+        <td>391</td>
+        <td>281</td>
+        <td>38</td>
+        <td>66</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4086,7 +6717,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-21-generic #21~20.04.1-Ubuntu SMP Tue Oct 26 15:49:20 UTC 2021 x86_64 x86_64</td>
+              <td>Linux 5.13.0-22-generic #22~20.04.1-Ubuntu SMP Tue Nov 9 15:07:24 UTC 2021 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4242,7 +6873,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4272,7 +6903,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4302,7 +6933,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4344,7 +6975,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4374,7 +7005,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4464,7 +7095,7 @@ SyntaxError: invalid syntax</pre>
 </div>
 
 <script>
-    drawCircle(332, 5, 2, 6);
+    drawCircle(281, 38, 66, 6);
     showCase(5);
 </script>
 

From fd5ab0ef533891e3bfbf2fc4bd961d0259e95651 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 5 Dec 2021 18:01:56 +0100
Subject: [PATCH 054/412] Bugfix handle archive bit

---
 cps/kobo_sync_status.py | 18 +++++++++---------
 cps/static/js/table.js  |  6 +++---
 cps/web.py              | 17 ++++-------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index b88cb6ace..eee47d896 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -20,7 +20,7 @@
 from flask_login import current_user
 from . import ub
 import datetime
-from sqlalchemy.sql.expression import or_
+from sqlalchemy.sql.expression import or_, and_
 
 # Add the current book id to kobo_synced_books table for current user, if entry is already present,
 # do nothing (safety precaution)
@@ -42,18 +42,18 @@ def remove_synced_book(book_id):
     ub.session_commit()
 
 
-def add_archived_books(book_id):
-    archived_book = (ub.session.query(ub.ArchivedBook)
-                     .filter(ub.ArchivedBook.book_id == book_id)
-                     .filter(ub.ArchivedBook.user_id == current_user.id)
-                     .first())
+def change_archived_books(book_id, state=None, message=None):
+    archived_book = ub.session.query(ub.ArchivedBook).filter(and_(ub.ArchivedBook.user_id == int(current_user.id),
+                                                                  ub.ArchivedBook.book_id == book_id)).first()
     if not archived_book:
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
-    archived_book.is_archived = True
+
+    archived_book.is_archived = state if state else not archived_book.is_archived
     archived_book.last_modified = datetime.datetime.utcnow()
 
     ub.session.merge(archived_book)
-    ub.session_commit()
+    ub.session_commit(message)
+    return archived_book.is_archived
 
 
 # select all books which are synced by the current user and do not belong to a synced shelf and them to archive
@@ -65,7 +65,7 @@ def update_on_sync_shelfs(user_id):
                         .filter(or_(ub.Shelf.kobo_sync == 0, ub.Shelf.kobo_sync == None))
                         .filter(ub.KoboSyncedBooks.user_id == user_id).all())
     for b in books_to_archive:
-        add_archived_books(b.book_id)
+        change_archived_books(b.book_id, True)
         ub.session.query(ub.KoboSyncedBooks) \
             .filter(ub.KoboSyncedBooks.book_id == b.book_id) \
             .filter(ub.KoboSyncedBooks.user_id == user_id).delete()
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 0600f0b33..e98f6a8be 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -631,14 +631,14 @@ function singleUserFormatter(value, row) {
 }
 
 function checkboxFormatter(value, row){
-    if(value & this.column)
+    if (value & this.column)
         return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" checked onchange="checkboxChange(this, ' + row.id + ', \'' + this.name + '\', ' + this.column + ')">';
     else
         return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" onchange="checkboxChange(this, ' + row.id + ', \'' + this.name + '\', ' + this.column + ')">';
 }
 
 function singlecheckboxFormatter(value, row){
-    if(value)
+    if (value)
         return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" checked onchange="checkboxChange(this, ' + row.id + ', \'' + this.name + '\', 0)">';
     else
         return '<input type="checkbox" class="chk" data-pk="' + row.id + '" data-name="' + this.field + '" onchange="checkboxChange(this, ' + row.id + ', \'' + this.name + '\', 0)">';
@@ -793,7 +793,7 @@ function handleListServerResponse (data) {
 function checkboxChange(checkbox, userId, field, field_index) {
     $.ajax({
         method: "post",
-        url: window.location.pathname + "/../../ajax/editlistusers/" + field,
+        url: getPath() + "/ajax/editlistusers/" + field,
         data: {"pk": userId, "field_index": field_index, "value": checkbox.checked},
         error: function(data) {
             handleListServerResponse([{type:"danger", message:data.responseText}])
diff --git a/cps/web.py b/cps/web.py
index 13c56f116..f203783b6 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -56,6 +56,7 @@ from .redirect import redirect_back
 from .usermanagement import login_required_if_no_ano
 from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
+from .kobo_sync_status import change_archived_books
 
 feature_support = {
     'ldap': bool(services.ldap),
@@ -190,24 +191,15 @@ def toggle_read(book_id):
             return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column), 400
         except (OperationalError, InvalidRequestError) as e:
             calibre_db.session.rollback()
-            log.error(u"Read status could not set: %e", e)
+            log.error(u"Read status could not set: {}".format(e))
             return "Read status could not set: {}".format(e), 400
     return ""
 
 @web.route("/ajax/togglearchived/<int:book_id>", methods=['POST'])
 @login_required
 def toggle_archived(book_id):
-    archived_book = ub.session.query(ub.ArchivedBook).filter(and_(ub.ArchivedBook.user_id == int(current_user.id),
-                                                                  ub.ArchivedBook.book_id == book_id)).first()
-    if archived_book:
-        archived_book.is_archived = not archived_book.is_archived
-        archived_book.last_modified = datetime.utcnow()
-    else:
-        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("Book {} archivebit toggled".format(book_id))
-    if archived_book.is_archived:
+    is_archived = change_archived_books(book_id, message="Book {} archivebit toggled".format(book_id))
+    if is_archived:
         remove_synced_book(book_id)
     return ""
 
@@ -801,7 +793,6 @@ def list_books():
 
     if sort == "state":
         state = json.loads(request.args.get("state", "[]"))
-        # order = [db.Books.timestamp.asc()] if order == "asc" else [db.Books.timestamp.desc()]   # ToDo wrong: sort ticked
     elif sort == "tags":
         order = [db.Tags.name.asc()] if order == "asc" else [db.Tags.name.desc()]
         join = db.books_tags_link,db.Books.id == db.books_tags_link.c.book, db.Tags

From f78d2245aa2890e9c019b743c85594e1f0e079fb Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 5 Dec 2021 18:48:21 +0100
Subject: [PATCH 055/412] Fixes from testrun

---
 cps/editbooks.py              | 25 ++++++++++++++++++-------
 cps/templates/book_table.html |  4 +++-
 cps/web.py                    | 26 +++++++++++++++++++++-----
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 9c942b527..dbb14f795 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -718,8 +718,6 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     if input_authors == ['']:
         input_authors = [_(u'Unknown')]  # prevent empty Author
 
-    # ToDo: Falsch es kann auch sein das der 2. Author in der Liste umbenannt wurde,
-    #  man müsste für alle Authoren schauen
     renamed = list()
     for in_aut in input_authors:
         renamed_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == in_aut).first()
@@ -923,6 +921,18 @@ def prepare_authors_on_upload(title, authr):
     if input_authors == ['']:
         input_authors = [_(u'Unknown')]  # prevent empty Author
 
+    renamed = list()
+    for in_aut in input_authors:
+        renamed_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == in_aut).first()
+        if renamed_author and in_aut != renamed_author.name:
+            renamed.append(renamed_author.name)
+            all_books = calibre_db.session.query(db.Books) \
+                .filter(db.Books.authors.any(db.Authors.name == renamed_author.name)).all()
+            sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
+            sorted_old_author = helper.get_sorted_author(in_aut)
+            for one_book in all_books:
+                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
+
     sort_authors_list = list()
     db_author = None
     for inp in input_authors:
@@ -939,13 +949,13 @@ def prepare_authors_on_upload(title, authr):
             sort_author = stored_author.sort
         sort_authors_list.append(sort_author)
     sort_authors = ' & '.join(sort_authors_list)
-    return sort_authors, input_authors, db_author
+    return sort_authors, input_authors, db_author, renamed
 
 
 def create_book_on_upload(modif_date, meta):
     title = meta.title
     authr = meta.author
-    sort_authors, input_authors, db_author = prepare_authors_on_upload(title, authr)
+    sort_authors, input_authors, db_author, renamed_authors = prepare_authors_on_upload(title, authr)
 
     title_dir = helper.get_valid_filename(title)
     author_dir = helper.get_valid_filename(db_author.name)
@@ -987,7 +997,7 @@ def create_book_on_upload(modif_date, meta):
 
     # flush content, get db_book.id available
     calibre_db.session.flush()
-    return db_book, input_authors, title_dir
+    return db_book, input_authors, title_dir, renamed_authors
 
 def file_handling_on_upload(requested_file):
     # check if file extension is correct
@@ -1049,7 +1059,7 @@ def upload():
                 if error:
                     return error
 
-                db_book, input_authors, title_dir = create_book_on_upload(modif_date, meta)
+                db_book, input_authors, title_dir, renamed_authors = create_book_on_upload(modif_date, meta)
 
                 # Comments needs book id therefore only possible after flush
                 modif_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
@@ -1061,7 +1071,8 @@ def upload():
                                                    config.config_calibre_dir,
                                                    input_authors[0],
                                                    meta.file_path,
-                                                   title_dir + meta.extension.lower())
+                                                   title_dir + meta.extension.lower(),
+                                                   renamed_author=renamed_authors)
 
                 move_coverfile(meta, db_book)
 
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index 92c8a2f5b..c842811be 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -71,7 +71,9 @@
             <!--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, true) }}
             <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('editbook.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
-            {{ book_checkbox_row('is_archived', _('Archiv Status'), false)}}
+            {% if g.user.check_visibility(32768) %}
+                {{ book_checkbox_row('is_archived', _('Archiv Status'), false)}}
+            {%  endif %}
             {{ book_checkbox_row('read_status', _('Read Status'), false)}}
             {% for c in cc %}
               {% if c.datatype == "int" %}
diff --git a/cps/web.py b/cps/web.py
index af5401d88..2419c61b2 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1309,7 +1309,24 @@ def render_adv_search_results(term, offset=None, order=None, limit=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).outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book)\
+    if not config.config_read_column:
+        query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(db.Books)
+                 .outerjoin(ub.ReadBook, and_(db.Books.id == ub.ReadBook.book_id,
+                                              int(current_user.id) == ub.ReadBook.user_id)))
+    else:
+        try:
+            read_column = cc[config.config_read_column]
+            query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
+                     .select_from(db.Books)
+                     .outerjoin(read_column, read_column.book == db.Books.id))
+        except (KeyError, AttributeError):
+            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
+            # Skip linking read column
+            query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
+    query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                  int(current_user.id) == ub.ArchivedBook.user_id))
+
+    q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book)\
         .outerjoin(db.Series)\
         .filter(calibre_db.common_filters(True))
 
@@ -1373,7 +1390,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
                                                             rating_high,
                                                             rating_low,
                                                             read_status)
-        q = q.filter()
+        # q = q.filter()
         if author_name:
             q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
         if book_title:
@@ -1404,7 +1421,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
 
     q = q.order_by(*sort).all()
     flask_session['query'] = json.dumps(term)
-    ub.store_ids(q)
+    ub.store_combo_ids(q)
     result_count = len(q)
     if offset is not None and limit is not None:
         offset = int(offset)
@@ -1413,7 +1430,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     else:
         offset = 0
         limit_all = result_count
-    entries = calibre_db.order_authors(q[offset:limit_all], True)
+    entries = calibre_db.order_authors(q[offset:limit_all], list_return=True, combined=True)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
@@ -1423,7 +1440,6 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
                                  order=order[1])
 
 
-
 @web.route("/advsearch", methods=['GET'])
 @login_required_if_no_ano
 def advanced_search_form():

From 6e15280fac898418c6cbe1eb559dbcb93c4cfb28 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 5 Dec 2021 19:01:23 +0100
Subject: [PATCH 056/412] Start renaming author names on gdrive

---
 cps/db.py     |  5 ++---
 cps/helper.py | 34 ++++++++++++++++++++++++++++++----
 cps/web.py    |  2 --
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index fe940d128..0359d3d27 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -864,10 +864,9 @@ class CalibreDB():
             limit_all = result_count
 
         ub.store_combo_ids(result)
-        # ToDo: doesn't work as more than one table returned
-        # entries = self.order_authors(result[offset:limit_all], True)
+        entries = self.order_authors(result[offset:limit_all], list_return=True, combined=True)
 
-        return result[offset:limit_all], result_count, pagination
+        return entries, result_count, pagination
 
     # Creates for all stored languages a translated speaking name in the array for the UI
     def speaking_language(self, languages=None, return_all_languages=False, with_count=False, reverse_order=False):
diff --git a/cps/helper.py b/cps/helper.py
index 73731908e..d611b5e90 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -452,7 +452,7 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
             return _("Error in rename file in path: %(error)s", error=str(ex))
     return False
 
-def update_dir_structure_gdrive(book_id, first_author):
+def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     error = False
     book = calibre_db.get_book(book_id)
     path = book.path
@@ -460,8 +460,24 @@ def update_dir_structure_gdrive(book_id, first_author):
     authordir = book.path.split('/')[0]
     if first_author:
         new_authordir = get_valid_filename(first_author)
+        for r in renamed_author:
+            # Todo: Rename all authors on gdrive
+            new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
+            old_author_dir = get_valid_filename(r)
+            new_author_rename_dir = get_valid_filename(new_author.name)
+            '''if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
+                try:
+                    old_author_path = os.path.join(calibrepath, old_author_dir)
+                    new_author_path = os.path.join(calibrepath, new_author_rename_dir)
+                    shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
+                except (OSError) as ex:
+                    log.error("Rename author from: %s to %s: %s", old_author_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=old_author_path, dest=new_author_path, error=str(ex))'''
     else:
         new_authordir = get_valid_filename(book.authors[0].name)
+
     titledir = book.path.split('/')[1]
     new_titledir = get_valid_filename(book.title) + u" (" + str(book_id) + u")"
 
@@ -485,8 +501,19 @@ def update_dir_structure_gdrive(book_id, first_author):
             gd.updateDatabaseOnEdit(gFile['id'], book.path)
         else:
             error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
+    # Todo: Rename all authors on gdrive
     # Rename all files from old names to new names
-
+    '''
+    try:
+        clean_author_database(renamed_author, calibrepath)
+        if first_author not in renamed_author:
+            clean_author_database([first_author], calibrepath, localbook)
+        if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+            shutil.rmtree(os.path.dirname(path))
+    except (OSError, FileNotFoundError) as ex:
+        log.error("Error in rename file in path %s", ex)
+        log.debug(ex, exc_info=True)
+        return _("Error in rename file in path: %(error)s", error=str(ex))'''
     if authordir != new_authordir or titledir != new_titledir:
         new_name = get_valid_filename(book.title) + u' - ' + get_valid_filename(new_authordir)
         for file_format in book.data:
@@ -584,8 +611,7 @@ def update_dir_structure(book_id,
                         db_filename=None,
                         renamed_author=False):
     if config.config_use_google_drive:
-        # ToDo: rename author on gdrive
-        return update_dir_structure_gdrive(book_id, first_author)
+        return update_dir_structure_gdrive(book_id, first_author, renamed_author)
     else:
         return update_dir_structure_file(book_id,
                                          calibrepath,
diff --git a/cps/web.py b/cps/web.py
index 2419c61b2..ded72ad04 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -894,8 +894,6 @@ def list_books():
 @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:

From 7d67168a4afbc013c7dc71398dddd1fbad9477b0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 6 Dec 2021 20:27:25 +0100
Subject: [PATCH 057/412] Update test result

---
 cps/services/worker.py                  |   2 +-
 test/Calibre-Web TestSummary_Linux.html | 661 ++++++++++++++++++++----
 2 files changed, 573 insertions(+), 90 deletions(-)

diff --git a/cps/services/worker.py b/cps/services/worker.py
index 5952c7057..076c91048 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -85,7 +85,7 @@ class WorkerThread(threading.Thread):
     def add(cls, user, task):
         ins = cls.getInstance()
         ins.num += 1
-        log.debug("Add Task for user: {}: {}".format(user, task))
+        log.debug("Add Task for user: {} - {}".format(user, task))
         ins.queue.put(QueuedTask(
             num=ins.num,
             user=user,
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index dea6d5e99..3c54e88bf 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-02 06:37:36</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-05 19:18:28</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-12-02 10:15:15</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-12-05 22:58:48</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 57 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 0 min</p>
         </div>
       </div>
       </div>
@@ -1858,12 +1858,12 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">6</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">2</td>
+        <td class="text-center">9</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c21', 11)">Detail</a>
@@ -1872,11 +1872,35 @@
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id="ft21.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 583, in test_book_download
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1890,26 +1914,30 @@
     
     
     
-        <tr id="et21.3" class="none bg-info">
+        <tr id="ft21.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et21.3')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.3')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et21.3" class="popup_window test_output" style="display:block;">
+                <div id="div_ft21.3" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et21.3').style.display='none'"><span
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 619, in test_kobo_sync_selected_shelfs
-    self.assertIn(&#34;NewTag&#34;, data3[2])
-IndexError: list index out of range</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 602, in test_kobo_sync_selected_shelfs
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1919,11 +1947,35 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt21.4' class='hiddenRow bg-success'>
+        <tr id="ft21.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 652, in test_kobo_upload_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1945,9 +1997,13 @@ IndexError: list index out of range</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 481, in test_shelves_add_remove_books
-    self.assertEqual(1, len(books))
-AssertionError: 1 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 447, in test_shelves_add_remove_books
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1974,9 +2030,13 @@ AssertionError: 1 != 0</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 286, in test_sync_changed_book
-    self.assertEqual(1, len(data))
-AssertionError: 1 != 2</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 277, in test_sync_changed_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1995,11 +2055,35 @@ AssertionError: 1 != 2</pre>
     
     
     
-        <tr id='pt21.8' class='hiddenRow bg-success'>
+        <tr id="ft21.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 514, in test_sync_reading_state
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2021,9 +2105,13 @@ AssertionError: 1 != 2</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 304, in test_sync_shelf
-    self.assertEqual(1, len(data))
-AssertionError: 1 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 296, in test_sync_shelf
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2033,11 +2121,35 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt21.10' class='hiddenRow bg-success'>
+        <tr id="ft21.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 242, in test_sync_unchanged
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2059,9 +2171,13 @@ AssertionError: 1 != 0</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 270, in test_sync_upload
-    self.assertEqual(1, len(data))
-AssertionError: 1 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 256, in test_sync_upload
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2072,11 +2188,11 @@ AssertionError: 1 != 0</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2095,38 +2211,134 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id="ft22.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 260, in test_kobo_sync_selected_shelfs
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id="ft22.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 164, in test_sync_changed_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id="ft22.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 237, in test_sync_reading_state
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt22.5' class='hiddenRow bg-success'>
+        <tr id="ft22.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 193, in test_sync_shelf
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
+    self.assertEqual(r.json(), {})
+AssertionError: {&#39;Benefits&#39;: {}} != {}
+- {&#39;Benefits&#39;: {}}
++ {}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3844,51 +4056,322 @@ AssertionError: 0 != 1</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_FailedTest</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="passClass">
+        <td>TestCalibreWebVisibilitys</td>
+        <td class="text-center">34</td>
+        <td class="text-center">34</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('c40', 1)">Detail</a>
+            <a onclick="showClassDetail('c40', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et40.1" class="none bg-info">
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>_FailedTest - test_visiblilitys</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et40.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et40.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et40.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_visiblilitys
-Traceback (most recent call last):
-  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 436, in _find_test_path
-    module = self._get_module_from_name(name)
-  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 377, in _get_module_from_name
-    __import__(name)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 764
-    books = self.get_shelf_books_displayed()test_upload_book_cbr
-                                            ^
-SyntaxError: invalid syntax</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.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='pt40.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt40.27' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt40.28' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt40.29' 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='pt40.30' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt40.31' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt40.32' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt40.33' 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='pt40.34' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4054,10 +4537,10 @@ SyntaxError: invalid syntax</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>345</td>
-        <td>332</td>
-        <td>5</td>
-        <td>2</td>
+        <td>378</td>
+        <td>358</td>
+        <td>14</td>
+        <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4086,7 +4569,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-21-generic #21~20.04.1-Ubuntu SMP Tue Oct 26 15:49:20 UTC 2021 x86_64 x86_64</td>
+              <td>Linux 5.13.0-22-generic #22~20.04.1-Ubuntu SMP Tue Nov 9 15:07:24 UTC 2021 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4242,7 +4725,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4272,7 +4755,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4302,7 +4785,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4344,7 +4827,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4374,7 +4857,7 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.31.0</td>
+              <td>2.32.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4464,7 +4947,7 @@ SyntaxError: invalid syntax</pre>
 </div>
 
 <script>
-    drawCircle(332, 5, 2, 6);
+    drawCircle(358, 14, 0, 6);
     showCase(5);
 </script>
 

From 9d9acb058dbada25678cb2f27940557772a0a1db Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 6 Dec 2021 21:02:06 +0100
Subject: [PATCH 058/412] Add button to force full kobo sync

---
 cps/admin.py                 | 14 ++++++++++++--
 cps/editbooks.py             |  8 ++++----
 cps/kobo.py                  |  2 +-
 cps/static/js/main.js        | 29 +++++++++++++++++++++++++++++
 cps/templates/user_edit.html |  3 +++
 5 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 2c32431f0..04d9138f2 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -590,6 +590,8 @@ def load_dialogtexts(element_id):
         texts["main"] = _('Are you sure you want to change shelf sync behavior for the selected user(s)?')
     elif element_id == "db_submit":
         texts["main"] = _('Are you sure you want to change Calibre library location?')
+    elif element_id == "btnfullsync":
+        texts["main"] = _("Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?")
     return json.dumps(texts)
 
 
@@ -889,10 +891,18 @@ def list_restriction(res_type, user_id):
     else:
         json_dumps = ""
     js = json.dumps(json_dumps)
-    response = make_response(js) #.replace("'", '"')
+    response = make_response(js)
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+@admi.route("/ajax/fullsync")
+@login_required
+def ajax_fullsync():
+    count = ub.session.query(ub.KoboSyncedBooks).filter(current_user.id == ub.KoboSyncedBooks.user_id).delete()
+    message = _("{} sync entries deleted").format(count)
+    ub.session_commit(message)
+    return Response(json.dumps([{"type": "success", "message": message}]), mimetype='application/json')
+
 
 @admi.route("/ajax/pathchooser/")
 @login_required
@@ -1189,13 +1199,13 @@ def _db_configuration_update_helper():
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         ub.session.query(ub.Downloads).delete()
         ub.session.query(ub.ArchivedBook).delete()
-        ub.session.query(ub.ArchivedBook).delete()
         ub.session.query(ub.ReadBook).delete()
         ub.session.query(ub.BookShelf).delete()
         ub.session.query(ub.Bookmark).delete()
         ub.session.query(ub.KoboReadingState).delete()
         ub.session.query(ub.KoboStatistics).delete()
         ub.session.query(ub.KoboSyncedBooks).delete()
+        ub.session_commit()
         _config_string(to_save, "config_calibre_dir")
         calibre_db.update_config(config)
         if not os.access(os.path.join(config.config_calibre_dir, "metadata.db"), os.W_OK):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 31e38d2aa..21dc3ba0a 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -240,14 +240,14 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
 @editbook.route("/ajax/delete/<int:book_id>")
 @login_required
 def delete_book_from_details(book_id):
-    return Response(delete_book(book_id, "", True), mimetype='application/json')
+    return Response(delete_book_from_table(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)
+    return delete_book_from_table(book_id, book_format, False)
 
 
 def delete_whole_book(book_id, book):
@@ -317,7 +317,7 @@ def render_delete_book_result(book_format, jsonResponse, warning, book_id):
             return redirect(url_for('web.index'))
 
 
-def delete_book(book_id, book_format, jsonResponse):
+def delete_book_from_table(book_id, book_format, jsonResponse):
     warning = {}
     if current_user.role_delete_books():
         book = calibre_db.get_book(book_id)
@@ -1254,7 +1254,7 @@ def merge_list_book():
                                                         element.format,
                                                         element.uncompressed_size,
                                                         to_name))
-                    delete_book(from_book.id,"", True)
+                    delete_book_from_table(from_book.id,"", True)
                     return json.dumps({'success': True})
     return ""
 
diff --git a/cps/kobo.py b/cps/kobo.py
index 482eb13a6..c5af44fc0 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -209,7 +209,7 @@ def HandleSyncRequest():
         books = calibre_db.session.execute(changed_entries.limit(SYNC_ITEM_LIMIT))
     else:
         books = changed_entries.limit(SYNC_ITEM_LIMIT)
-    log.debug("Books to Sync: {}".format(books.count()))
+    log.debug("Books to Sync: {}".format(len(books.all())))
     for book in books:
         formats = [data.format for data in book.Books.data]
         if not 'KEPUB' in formats and config.config_kepubifypath and 'EPUB' in formats:
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index cf6fbe0df..585d2296a 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -517,6 +517,7 @@ $(function() {
         .on("hidden.bs.modal", function() {
             $(this).find(".modal-body").html("...");
             $("#config_delete_kobo_token").show();
+            $("#kobo_full_sync").show();
         });
 
     $("#config_delete_kobo_token").click(function() {
@@ -530,6 +531,7 @@ $(function() {
                     url: getPath() + "/kobo_auth/deleteauthtoken/" + value,
                 });
                 $("#config_delete_kobo_token").hide();
+                $("#kobo_full_sync").hide();
             }
         );
     });
@@ -563,6 +565,33 @@ $(function() {
             }
         );
     });
+
+    $("#kobo_full_sync").click(function() {
+        confirmDialog(
+           "btnfullsync",
+            "GeneralDeleteModal",
+            $(this).data('value'),
+            function(value){
+                path = getPath() + "/ajax/fullsync"
+                $.ajax({
+                    method:"get",
+                    url: path,
+                    timeout: 900,
+                    success:function(data) {
+                        data.forEach(function(item) {
+                            if (!jQuery.isEmptyObject(item)) {
+                                $( ".navbar" ).after( '<div class="row-fluid text-center" >' +
+                                    '<div id="flash_'+item.type+'" class="alert alert-'+item.type+'">'+item.message+'</div>' +
+                                    '</div>');
+                            }
+                        });
+                    }
+                });
+            }
+        );
+    });
+
+
     $("#user_submit").click(function() {
         this.closest("form").submit();
     });
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index edecbaf2e..e6fbdb74a 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -66,6 +66,9 @@
       <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-value="{{ content.id }}" data-remote="false" {% if not content.remote_auth_token.first() %} style="display: none;" {% endif %}>{{_('Delete')}}</div>
     </div>
+    <div class="form-group col">
+      <div class="btn btn-default" id="kobo_full_sync" data-value="{{ content.id }}" {% if not content.remote_auth_token.first() %} style="display: none;" {% endif %}>{{_('Force full kobo sync')}}</div>
+    </div>
     {% endif %}
     <div class="col-sm-6">
     {% for element in sidebar %}

From 920acaca99879055821744470a0e85f6ee51ec03 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Sat, 11 Dec 2021 01:06:04 +0100
Subject: [PATCH 059/412] everything working to refactor

---
 .gitignore                            |   1 +
 cps/metadata_provider/lubimyczytac.py | 373 ++++++++++++++++++++++++++
 cps/static/js/get_meta.js             |  46 +++-
 requirements.txt                      |   2 +
 4 files changed, 415 insertions(+), 7 deletions(-)
 create mode 100644 cps/metadata_provider/lubimyczytac.py

diff --git a/.gitignore b/.gitignore
index 614e99369..989c78119 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ __pycache__/
 .python-version
 env/
 venv/
+p38venv/
 eggs/
 dist/
 executable/
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
new file mode 100644
index 000000000..aab50bb6e
--- /dev/null
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -0,0 +1,373 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2021 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 json
+import re
+from typing import Dict, List
+from urllib.parse import quote
+
+import requests
+from cps.services.Metadata import Metadata
+from lxml.html import fromstring, tostring
+
+
+def get_int_or_float(v):
+    number_as_float = float(v)
+    number_as_int = int(number_as_float)
+    return number_as_int if number_as_float == number_as_int else number_as_float
+
+
+def strip_accents(s):
+    if s is None:
+        return s
+    else:
+        symbols = (
+            "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
+            "oOuUoOoOuUeEaAuUiIaAcCeElLnNoOsSzZzZ",
+        )
+        tr = dict([(ord(a), ord(b)) for (a, b) in zip(*symbols)])
+        return s.translate(tr)  # .lower()
+
+
+def sanitize_comments_html(html):
+    from markdown2 import Markdown
+
+    text = html2text(html)
+    md = Markdown()
+    html = md.convert(text)
+    return html
+
+
+def html2text(html):
+    from html2text import HTML2Text
+    import re
+
+    # replace <u> tags with <span> as <u> becomes emphasis in html2text
+    if isinstance(html, bytes):
+        html = html.decode("utf-8")
+    html = re.sub(
+        r"<\s*(?P<solidus>/?)\s*[uU]\b(?P<rest>[^>]*)>",
+        r"<\g<solidus>span\g<rest>>",
+        html,
+    )
+    h2t = HTML2Text()
+    h2t.body_width = 0
+    h2t.single_line_break = True
+    h2t.emphasis_mark = "*"
+    return h2t.handle(html)
+
+
+class LubimyCzytac(Metadata):
+    __name__ = "LubimyCzytac.pl"
+    __id__ = "lubimyczytac"
+
+    BASE_URL = "https://lubimyczytac.pl"
+
+    BOOK_SEARCH_RESULT_XPATH = (
+        "*//div[@class='listSearch']//div[@class='authorAllBooks__single']"
+    )
+    SINGLE_BOOK_RESULT_XPATH = ".//div[contains(@class,'authorAllBooks__singleText')]"
+    TITLE_PATH = "/div/a[contains(@class,'authorAllBooks__singleTextTitle')]"
+    TITLE_TEXT_PATH = f"{TITLE_PATH}//text()"
+    URL_PATH = f"{TITLE_PATH}/@href"
+    AUTHORS_PATH = "/div/a[contains(@href,'autor')]//text()"
+
+    SIBLINGS = "/following-sibling::dd"
+
+    CONTAINER = "//section[@class='container book']"
+    PUBLISHER = f"{CONTAINER}//dt[contains(text(),'Wydawnictwo:')]{SIBLINGS}/a/text()"
+    LANGUAGES = f"{CONTAINER}//dt[contains(text(),'Język:')]{SIBLINGS}/text()"
+    DESCRIPTION = f"{CONTAINER}//div[@class='collapse-content']"
+    SERIES = f"{CONTAINER}//span/a[contains(@href,'/cykl/')]"
+
+    DETAILS = "//div[@id='book-details']"
+    PUBLISH_DATE = "//dt[contains(@title,'Data pierwszego wydania"
+    FIRST_PUBLISH_DATE = f"{DETAILS}{PUBLISH_DATE} oryginalnego')]{SIBLINGS}[1]/text()"
+    FIRST_PUBLISH_DATE_PL = f"{DETAILS}{PUBLISH_DATE} polskiego')]{SIBLINGS}[1]/text()"
+    TAGS = "//nav[@aria-label='breadcrumb']//a[contains(@href,'/ksiazki/k/')]/text()"
+    RATING = "//meta[@property='books:rating:value']/@content"
+    COVER = "//meta[@property='og:image']/@content"
+
+    SUMMARY = "//script[@type='application/ld+json']//text()"
+
+    def search(self, query, __):
+        if self.active:
+            result = requests.get(self._prepare_query(title=query))
+            root = fromstring(result.text)
+            matches = self._parse_search_results(root=root)
+            if matches:
+                for ind, match in enumerate(matches):
+                    matches[ind] = self._parse_single_book(match=match)
+            return matches
+
+    def _prepare_query(self, title: str) -> str:
+        query = ""
+        characters_to_remove = "\?()\/"
+        pattern = "[" + characters_to_remove + "]"
+        title = re.sub(pattern, "", title)
+        title = title.replace("_", " ")
+        if '"' in title or ",," in title:
+            title = title.split('"')[0].split(",,")[0]
+
+        if "/" in title:
+            title_tokens = [
+                token for token in title.lower().split(" ") if len(token) > 1
+            ]
+        else:
+            title_tokens = list(
+                self.get_title_tokens(title, strip_joiners=False, strip_subtitle=True)
+            )
+        if title_tokens:
+            tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+            query = query + "%20".join(tokens)
+        if not query:
+            return ""
+        return f"{LubimyCzytac.BASE_URL}/szukaj/ksiazki?phrase={query}"
+
+    def _parse_search_results(self, root) -> List[Dict]:
+        matches = []
+        results = root.xpath(LubimyCzytac.BOOK_SEARCH_RESULT_XPATH)
+        for result in results:
+            title = result.xpath(
+                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.TITLE_TEXT_PATH}"
+            )
+            book_url = result.xpath(
+                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}" f"{LubimyCzytac.URL_PATH}"
+            )
+            authors = result.xpath(
+                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.AUTHORS_PATH}"
+            )
+
+            if not title or not book_url or not authors:
+                continue
+            title = title[0].strip()
+            book_url = LubimyCzytac.BASE_URL + book_url[0]
+            book_id = book_url.replace(f"{LubimyCzytac.BASE_URL}/ksiazka/", "").split(
+                "/"
+            )[0]
+            matches.append(
+                {"id": book_id, "title": title, "authors": authors, "url": book_url}
+            )
+        return matches
+
+    def _parse_single_book(self, match: Dict) -> Dict:
+        url = match.get("url")
+        result = requests.get(url)
+        root = fromstring(result.text)
+        match["series"], match["series_index"] = self._parse_series(root=root)
+        match["tags"] = self._parse_tags(root=root)
+        match["publisher"] = self._parse_publisher(root=root)
+        match["publishedDate"] = self._parse_from_summary(
+            root=root, attribute_name="datePublished"
+        )
+        match["rating"] = self._parse_rating(root=root)
+        match["description"] = self._parse_description(root=root)
+        match["cover"] = self._parse_cover(root=root)
+        match["source"] = {
+            "id": self.__id__,
+            "description": self.__name__,
+            "link": LubimyCzytac.BASE_URL,
+        }
+        match['languages'] = self._parse_languages(root=root)
+        match["identifiers"] = {
+            "isbn": self._parse_isbn(root=root),
+            "lubimyczytac": match["id"],
+        }
+        return match
+
+    def _parse_cover(self, root):
+        imgcol_node = root.xpath('//meta[@property="og:image"]/@content')
+        if imgcol_node:
+            img_url = imgcol_node[0]
+            return img_url
+
+    def _parse_publisher(self, root):
+        publisher = root.xpath(LubimyCzytac.PUBLISHER)
+        if publisher:
+            return publisher[0]
+        else:
+            return None
+
+    def _parse_languages(self, root):
+        lang = root.xpath(LubimyCzytac.LANGUAGES)
+        languages = list()
+        if lang:
+            lang = lang[0].strip()
+            if "polski" in lang:
+                languages.append("Polish")
+            if "angielski" in lang:
+                languages.append("English")
+        if not languages:
+            return ['Polish']
+        return languages
+
+    def _parse_series(self, root):
+        try:
+            series_node = root.xpath(LubimyCzytac.SERIES)
+            if series_node:
+                series_lst = root.xpath(f"{LubimyCzytac.SERIES}/text()")
+                if series_lst:
+                    series_txt = series_lst
+                else:
+                    series_txt = None
+            else:
+                return (None, None)
+
+            if series_txt:
+                ser_string = [series_txt[0].replace("\n", "").strip()]
+                ser_nazwa = ser_string
+                for ser in ser_string:
+                    if "tom " in ser:
+                        ser_info = ser.split(" (tom ", 1)
+                        ser_nazwa = ser.split(" (tom ")[0]
+                        break
+
+            if ser_info:
+                series_index_unicode = ser_info[1]
+                series_index_string = str(
+                    series_index_unicode.replace(" ", "").replace(")", "")
+                )
+                # Sprawdzamy, czy cykl nie jest kompletem/pakietem tomów, np. 1-3
+                if "-" in series_index_string:
+                    series_index_string_temp = series_index_string.split("-", 1)
+                    series_index_string = series_index_string_temp[0]
+                if series_index_string.replace(".", "").isdigit() is True:
+                    series_index = get_int_or_float(series_index_string)
+                else:
+                    series_index = 0
+            else:
+                series_index = 0
+            series = ser_nazwa
+            return (series, series_index)
+        except:
+            return (None, None)
+
+    def _parse_tags(self, root):
+        tags = None
+        try:
+            tags_from_genre = root.xpath(LubimyCzytac.TAGS)
+            if tags_from_genre:
+                tags = tags_from_genre
+                tags = [w.replace(", itd.", " itd.") for w in tags]
+                return tags
+            else:
+                return None
+        except:
+            return tags
+
+    def _parse_from_summary(self, root, attribute_name: str) -> str:
+        data = json.loads(root.xpath(LubimyCzytac.SUMMARY)[0])
+        value = data.get(attribute_name)
+        return value.strip() if value is not None else value
+
+    def _parse_rating(self, root):
+        rating_node = root.xpath(LubimyCzytac.RATING)
+        if rating_node:
+            rating_value = round(float((rating_node[0]).replace(",", ".")) / 2)
+            return rating_value
+        return None
+
+    def _parse_date(self, root, xpath="first_publish"):
+        options = {
+            "first_publish": LubimyCzytac.FIRST_PUBLISH_DATE,
+            "first_publish_pl": LubimyCzytac.FIRST_PUBLISH_DATE_PL,
+        }
+        path = options.get(xpath)
+        from dateutil import parser
+
+        data = root.xpath(path)
+        if data:
+            first_pub_date = data[0].strip()
+            return parser.parse(first_pub_date)
+        return None
+
+    def _parse_isbn(self, root):
+        isbn_node = root.xpath('//meta[@property="books:isbn"]/@content')[0]
+        return isbn_node
+
+    def _parse_description(self, root):
+        comments = ""
+        description_node = root.xpath(LubimyCzytac.DESCRIPTION)
+        if description_node:
+            for zrodla in root.xpath('//p[@class="source"]'):
+                zrodla.getparent().remove(zrodla)
+            comments = tostring(description_node[0], method="html")
+            comments = sanitize_comments_html(comments)
+
+        else:
+            # try <meta>
+            description_node = root.xpath('//meta[@property="og:description"]/@content')
+            if description_node:
+                comments = description_node[0]
+                comments = sanitize_comments_html(comments)
+
+        pages = self._parse_from_summary(root=root, attribute_name="numberOfPages")
+        if pages:
+            comments += f'<p id="strony">Książka ma {pages} stron(y).</p>'
+
+        first_publish_date = self._parse_date(root=root)
+        if first_publish_date:
+            comments += f'<p id="pierwsze_wydanie">Data pierwszego wydania: {first_publish_date.strftime("%d.%m.%Y")}</p>'
+
+        first_publish_date_pl = self._parse_date(root=root, xpath="first_publish_pl")
+        if first_publish_date_pl:
+            comments += f'<p id="pierwsze_wydanie_pl">Data pierwszego wydania w Polsce: {first_publish_date_pl.strftime("%d.%m.%Y")}</p>'
+
+        return comments
+
+    def get_title_tokens(self, title, strip_joiners=True, strip_subtitle=False):
+        """
+        Taken from https://github.com/kovidgoyal/calibre/blob/master/src/calibre/ebooks/metadata/sources/base.py.
+        """
+        # strip sub-titles
+        if strip_subtitle:
+            subtitle = re.compile(r"([\(\[\{].*?[\)\]\}]|[/:\\].*$)")
+            if len(subtitle.sub("", title)) > 1:
+                title = subtitle.sub("", title)
+
+        title_patterns = [
+            (re.compile(pat, re.IGNORECASE), repl)
+            for pat, repl in [
+                # Remove things like: (2010) (Omnibus) etc.
+                (
+                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|audiobook|audio\scd|paperback|turtleback|mass\s*market|edition|ed\.)[\])}]",
+                    "",
+                ),
+                # Remove any strings that contain the substring edition inside
+                # parentheses
+                (r"(?i)[({\[].*?(edition|ed.).*?[\]})]", ""),
+                # Remove commas used a separators in numbers
+                (r"(\d+),(\d+)", r"\1\2"),
+                # Remove hyphens only if they have whitespace before them
+                (r"(\s-)", " "),
+                # Replace other special chars with a space
+                (r"""[:,;!@$%^&*(){}.`~"\s\[\]/]《》「」“”""", " "),
+            ]
+        ]
+
+        for pat, repl in title_patterns:
+            title = pat.sub(repl, title)
+
+        tokens = title.split()
+        for token in tokens:
+            token = token.strip().strip('"').strip("'")
+            if token and (
+                not strip_joiners or token.lower() not in ("a", "and", "the", "&")
+            ):
+                yield token
diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index 51ab740d4..a86430655 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -26,19 +26,26 @@ $(function () {
        )
     };
 
+    function getUniqueValues(attribute_name, book){
+        var presentArray = $.map($("#"+attribute_name).val().split(","), $.trim);
+        if ( presentArray.length === 1 && presentArray[0] === "") {
+            presentArray = [];
+        }
+        $.each(book[attribute_name], function(i, el) {
+            if ($.inArray(el, presentArray) === -1) presentArray.push(el);
+        });
+        return presentArray
+    }
+
     function populateForm (book) {
         tinymce.get("description").setContent(book.description);
-        var uniqueTags = $.map($("#tags").val().split(","), $.trim);
-        if ( uniqueTags.length == 1 && uniqueTags[0] == "") {
-            uniqueTags = [];
-        }
-        $.each(book.tags, function(i, el) {
-            if ($.inArray(el, uniqueTags) === -1) uniqueTags.push(el);
-        });
+        var uniqueTags = getUniqueValues('tags', book)
+        var uniqueLanguages = getUniqueValues('languages', book)
         var ampSeparatedAuthors = (book.authors || []).join(" & ");
         $("#bookAuthor").val(ampSeparatedAuthors);
         $("#book_title").val(book.title);
         $("#tags").val(uniqueTags.join(", "));
+        $("#languages").val(uniqueLanguages.join(", "));
         $("#rating").data("rating").setValue(Math.round(book.rating));
         if(book.cover !== null){
             $(".cover img").attr("src", book.cover);
@@ -48,7 +55,32 @@ $(function () {
         $("#publisher").val(book.publisher);
         if (typeof book.series !== "undefined") {
             $("#series").val(book.series);
+            $("#series_index").val(book.series_index);
         }
+        if (typeof book.identifiers !== "undefined") {
+            populateIdentifiers(book.identifiers)
+        }
+    }
+
+    function populateIdentifiers(identifiers){
+       for (const property in identifiers) {
+          console.log(`${property}: ${identifiers[property]}`);
+          if ($('input[name="identifier-type-'+property+'"]').length) {
+              $('input[name="identifier-val-'+property+'"]').val(identifiers[property])
+          }
+          else {
+              addIdentifier(property, identifiers[property])
+          }
+        }
+    }
+
+    function addIdentifier(name, value){
+        var line = '<tr>';
+        line += '<td><input type="text" class="form-control" name="identifier-type-'+ name +'" required="required" placeholder="' + _("Identifier Type") +'" value="'+ name +'"></td>';
+        line += '<td><input type="text" class="form-control" name="identifier-val-'+ name +'" required="required" placeholder="' + _("Identifier Value") +'" value="'+ value +'"></td>';
+        line += '<td><a class="btn btn-default" onclick="removeIdentifierLine(this)">'+_("Remove")+'</a></td>';
+        line += '</tr>';
+        $("#identifier-table").append(line);
     }
 
     function doSearch (keyword) {
diff --git a/requirements.txt b/requirements.txt
index 1db961fef..d1f58a8d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,3 +14,5 @@ Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.3.0
 lxml>=3.8.0,<4.7.0
 flask-wtf>=0.14.2,<1.1.0
+markdown2==2.4.2
+html2text==2020.1.16

From 42bf40d7bb3ee488a6c742b29b72c706e974df19 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 11 Dec 2021 17:40:36 +0100
Subject: [PATCH 060/412] Change 2 timestamps to utctime

---
 cps/editbooks.py          |  2 ++
 cps/kobo.py               | 19 +++----------------
 cps/kobo_sync_status.py   |  2 +-
 cps/services/SyncToken.py |  9 ++-------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index dbb14f795..448a52bdc 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1100,6 +1100,7 @@ def upload():
                 flash(_(u"Database error: %(error)s.", error=e), category="error")
         return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
 
+
 @editbook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
@@ -1298,6 +1299,7 @@ def merge_list_book():
                     return json.dumps({'success': True})
     return ""
 
+
 @editbook.route("/ajax/xchange", methods=['POST'])
 @login_required
 @edit_required
diff --git a/cps/kobo.py b/cps/kobo.py
index b0917a47d..1bcf3f8d7 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -133,7 +133,7 @@ def convert_to_kobo_timestamp_string(timestamp):
         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")
+        return datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
 
 
 @kobo.route("/v1/library/sync")
@@ -310,7 +310,6 @@ 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, cont_sync)
 
@@ -388,7 +387,7 @@ def create_book_entitlement(book, archived):
     book_uuid = str(book.uuid)
     return {
         "Accessibility": "Full",
-        "ActivePeriod": {"From": convert_to_kobo_timestamp_string(datetime.datetime.now())},
+        "ActivePeriod": {"From": convert_to_kobo_timestamp_string(datetime.datetime.utcnow())},
         "Created": convert_to_kobo_timestamp_string(book.timestamp),
         "CrossRevisionId": book_uuid,
         "Id": book_uuid,
@@ -942,7 +941,7 @@ def TopLevelEndpoint():
 @kobo.route("/v1/library/<book_uuid>", methods=["DELETE"])
 @requires_kobo_auth
 def HandleBookDeletionRequest(book_uuid):
-    log.info("Kobo book deletion request received for book %s" % book_uuid)
+    log.info("Kobo book delete request received for book %s" % book_uuid)
     book = calibre_db.get_book_by_uuid(book_uuid)
     if not book:
         log.info(u"Book %s not found in database", book_uuid)
@@ -950,18 +949,6 @@ def HandleBookDeletionRequest(book_uuid):
 
     book_id = book.id
     is_archived = kobo_sync_status.change_archived_books(book_id, True)
-    '''archived_book = (
-        ub.session.query(ub.ArchivedBook)
-        .filter(ub.ArchivedBook.book_id == book_id)
-        .first()
-    )
-    if not archived_book:
-        archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
-    archived_book.is_archived = True
-    archived_book.last_modified = datetime.datetime.utcnow()
-
-    ub.session.merge(archived_book)
-    ub.session_commit()'''
     if is_archived:
         kobo_sync_status.remove_synced_book(book_id)
     return "", 204
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index eee47d896..580ac8ea8 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -49,7 +49,7 @@ def change_archived_books(book_id, state=None, message=None):
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
 
     archived_book.is_archived = state if state else not archived_book.is_archived
-    archived_book.last_modified = datetime.datetime.utcnow()
+    archived_book.last_modified = datetime.datetime.utcnow()        # toDo. Check utc timestamp
 
     ub.session.merge(archived_book)
     ub.session_commit(message)
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index 85ed50325..0072a20df 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -138,12 +138,9 @@ 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,
@@ -152,7 +149,6 @@ class SyncToken:
             archive_last_modified=archive_last_modified,
             reading_state_last_modified=reading_state_last_modified,
             tags_last_modified=tags_last_modified,
-            #books_last_id=books_last_id
         )
 
     def set_kobo_store_header(self, store_headers):
@@ -176,7 +172,6 @@ class SyncToken:
                 "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),
-                #"books_last_id":self.books_last_id
             },
         }
         return b64encode_json(token)
@@ -186,5 +181,5 @@ class SyncToken:
                                        self.books_last_modified,
                                        self.archive_last_modified,
                                        self.reading_state_last_modified,
-                                       self.tags_last_modified, self.raw_kobo_store_token)
-                                       #self.books_last_id)
+                                       self.tags_last_modified,
+                                       self.raw_kobo_store_token)

From 25422b341142729fdc6f6d32b45e27986a3d535e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 12 Dec 2021 20:31:45 +0100
Subject: [PATCH 061/412] Fix for #2195 Sync token only updated after complete
 library sync and sync token content is discarded on first sync to enable real
 forced full sync

---
 cps/kobo.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index c5af44fc0..e03958556 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -146,9 +146,16 @@ def HandleSyncRequest():
     if not current_app.wsgi_app.is_proxied:
         log.debug('Kobo: Received unproxied request, changed request port to external server port')
 
-    new_books_last_modified = sync_token.books_last_modified
-    new_books_last_created = sync_token.books_last_created
+    # if no books synced don't respect sync_token
+    if not ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.user_id == current_user.id).count():
+        sync_token.books_last_modified = datetime.datetime.min
+        sync_token.books_last_created = datetime.datetime.min
+        sync_token.reading_state_last_modified = datetime.datetime.min
+
+    new_books_last_modified = sync_token.books_last_modified # needed for sync selected shelfs only
+    new_books_last_created = sync_token.books_last_created # needed to distinguish between new and changed entitlement
     new_reading_state_last_modified = sync_token.reading_state_last_modified
+
     new_archived_last_modified = datetime.datetime.min
     sync_results = []
 
@@ -306,11 +313,12 @@ def HandleSyncRequest():
 
     sync_shelves(sync_token, sync_results, only_kobo_shelves)
 
-    sync_token.books_last_created = new_books_last_created
+    # update last created timestamp to distinguish between new and changed entitlements
+    if not cont_sync:
+        sync_token.books_last_created = new_books_last_created
     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, cont_sync)
 

From d55626d4452bf15849b3ead2266a2ca89f8d9c8d Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Mon, 13 Dec 2021 01:23:03 +0100
Subject: [PATCH 062/412] refactor and cleaning

---
 cps/metadata_provider/comicvine.py    |   4 +-
 cps/metadata_provider/google.py       |  12 +-
 cps/metadata_provider/lubimyczytac.py | 468 +++++++++++++-------------
 cps/services/Metadata.py              |  33 +-
 requirements.txt                      |   1 +
 5 files changed, 278 insertions(+), 240 deletions(-)

diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py
index 8f496608c..195e68f88 100644
--- a/cps/metadata_provider/comicvine.py
+++ b/cps/metadata_provider/comicvine.py
@@ -26,7 +26,7 @@ class ComicVine(Metadata):
     __name__ = "ComicVine"
     __id__ = "comicvine"
 
-    def search(self, query, __):
+    def search(self, query, generic_cover=""):
         val = list()
         apikey = "57558043c53943d5d1e96a9ad425b0eb85532ee6"
         if self.active:
@@ -52,7 +52,7 @@ class ComicVine(Metadata):
                 v['tags'] = ["Comics", seriesTitle]
                 v['rating'] = 0
                 v['series'] = seriesTitle
-                v['cover'] = r['image'].get('original_url')
+                v['cover'] = r['image'].get('original_url', generic_cover)
                 v['source'] = {
                     "id": self.__id__,
                     "description": "ComicVine Books",
diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index f3d02d8e8..8be8ad74c 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -17,19 +17,20 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # Google Books api document: https://developers.google.com/books/docs/v1/using
-
-
 import requests
+
 from cps.services.Metadata import Metadata
 
+
 class Google(Metadata):
     __name__ = "Google"
     __id__ = "google"
+    BASE_URL = "https://www.googleapis.com/books/v1/volumes?q="
 
-    def search(self, query, __):
+    def search(self, query, generic_cover=""):
         if self.active:
             val = list()
-            result = requests.get("https://www.googleapis.com/books/v1/volumes?q="+query.replace(" ","+"))
+            result = requests.get(Google.BASE_URL + query.replace(" ","+"))
             for r in result.json()['items']:
                 v = dict()
                 v['id'] = r['id']
@@ -43,7 +44,8 @@ class Google(Metadata):
                 if r['volumeInfo'].get('imageLinks'):
                     v['cover'] = r['volumeInfo']['imageLinks']['thumbnail'].replace("http://", "https://")
                 else:
-                    v['cover'] = "/../../../static/generic_cover.jpg"
+                    # v['cover'] = "/../../../static/generic_cover.jpg"
+                    v['cover'] = generic_cover
                 v['source'] = {
                     "id": self.__id__,
                     "description": "Google Books",
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index aab50bb6e..ee66d1b48 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -15,47 +15,47 @@
 #
 #  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 datetime
 import json
 import re
-from typing import Dict, List
+from typing import Dict, Generator, List, Optional, Tuple, Union
 from urllib.parse import quote
 
 import requests
-from cps.services.Metadata import Metadata
-from lxml.html import fromstring, tostring
+from dateutil import parser
+from html2text import HTML2Text
+from lxml.html import HtmlElement, fromstring, tostring
+from markdown2 import Markdown
+
+from cps.services.Metadata import MetaRecord, Metadata
+
+SYMBOLS_TO_TRANSLATE = (
+    "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
+    "oOuUoOoOuUeEaAuUiIaAcCeElLnNoOsSzZzZ",
+)
+SYMBOL_TRANSLATION_MAP = dict(
+    [(ord(a), ord(b)) for (a, b) in zip(*SYMBOLS_TO_TRANSLATE)]
+)
 
 
-def get_int_or_float(v):
-    number_as_float = float(v)
+def get_int_or_float(value: str) -> Union[int, float]:
+    number_as_float = float(value)
     number_as_int = int(number_as_float)
     return number_as_int if number_as_float == number_as_int else number_as_float
 
 
-def strip_accents(s):
-    if s is None:
-        return s
-    else:
-        symbols = (
-            "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
-            "oOuUoOoOuUeEaAuUiIaAcCeElLnNoOsSzZzZ",
-        )
-        tr = dict([(ord(a), ord(b)) for (a, b) in zip(*symbols)])
-        return s.translate(tr)  # .lower()
+def strip_accents(s: Optional[str]) -> Optional[str]:
+    return s.translate(SYMBOL_TRANSLATION_MAP) if s is not None else s
 
 
-def sanitize_comments_html(html):
-    from markdown2 import Markdown
-
+def sanitize_comments_html(html: str) -> str:
     text = html2text(html)
     md = Markdown()
     html = md.convert(text)
     return html
 
 
-def html2text(html):
-    from html2text import HTML2Text
-    import re
-
+def html2text(html: str) -> str:
     # replace <u> tags with <span> as <u> becomes emphasis in html2text
     if isinstance(html, bytes):
         html = html.decode("utf-8")
@@ -92,26 +92,36 @@ class LubimyCzytac(Metadata):
     PUBLISHER = f"{CONTAINER}//dt[contains(text(),'Wydawnictwo:')]{SIBLINGS}/a/text()"
     LANGUAGES = f"{CONTAINER}//dt[contains(text(),'Język:')]{SIBLINGS}/text()"
     DESCRIPTION = f"{CONTAINER}//div[@class='collapse-content']"
-    SERIES = f"{CONTAINER}//span/a[contains(@href,'/cykl/')]"
+    SERIES = f"{CONTAINER}//span/a[contains(@href,'/cykl/')]/text()"
 
     DETAILS = "//div[@id='book-details']"
     PUBLISH_DATE = "//dt[contains(@title,'Data pierwszego wydania"
     FIRST_PUBLISH_DATE = f"{DETAILS}{PUBLISH_DATE} oryginalnego')]{SIBLINGS}[1]/text()"
     FIRST_PUBLISH_DATE_PL = f"{DETAILS}{PUBLISH_DATE} polskiego')]{SIBLINGS}[1]/text()"
     TAGS = "//nav[@aria-label='breadcrumb']//a[contains(@href,'/ksiazki/k/')]/text()"
+
     RATING = "//meta[@property='books:rating:value']/@content"
     COVER = "//meta[@property='og:image']/@content"
+    ISBN = "//meta[@property='books:isbn']/@content"
+    META_TITLE = "//meta[@property='og:description']/@content"
 
     SUMMARY = "//script[@type='application/ld+json']//text()"
 
-    def search(self, query, __):
+    def search(self, query: str, generic_cover: str = "") -> Optional[List]:
         if self.active:
             result = requests.get(self._prepare_query(title=query))
             root = fromstring(result.text)
-            matches = self._parse_search_results(root=root)
+            lc_parser = LubimyCzytacParser(root=root, metadata=self)
+            matches = lc_parser.parse_search_results()
             if matches:
-                for ind, match in enumerate(matches):
-                    matches[ind] = self._parse_single_book(match=match)
+                final_matches = []
+                for match in matches:
+                    response = requests.get(match.get("url"))
+                    match = lc_parser.parse_single_book(
+                        match=match, response=response, generic_cover=generic_cover
+                    )
+                    final_matches.append(match)
+                return final_matches
             return matches
 
     def _prepare_query(self, title: str) -> str:
@@ -128,9 +138,7 @@ class LubimyCzytac(Metadata):
                 token for token in title.lower().split(" ") if len(token) > 1
             ]
         else:
-            title_tokens = list(
-                self.get_title_tokens(title, strip_joiners=False, strip_subtitle=True)
-            )
+            title_tokens = list(self.get_title_tokens(title, strip_joiners=False))
         if title_tokens:
             tokens = [quote(t.encode("utf-8")) for t in title_tokens]
             query = query + "%20".join(tokens)
@@ -138,215 +146,21 @@ class LubimyCzytac(Metadata):
             return ""
         return f"{LubimyCzytac.BASE_URL}/szukaj/ksiazki?phrase={query}"
 
-    def _parse_search_results(self, root) -> List[Dict]:
-        matches = []
-        results = root.xpath(LubimyCzytac.BOOK_SEARCH_RESULT_XPATH)
-        for result in results:
-            title = result.xpath(
-                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.TITLE_TEXT_PATH}"
-            )
-            book_url = result.xpath(
-                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}" f"{LubimyCzytac.URL_PATH}"
-            )
-            authors = result.xpath(
-                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.AUTHORS_PATH}"
-            )
-
-            if not title or not book_url or not authors:
-                continue
-            title = title[0].strip()
-            book_url = LubimyCzytac.BASE_URL + book_url[0]
-            book_id = book_url.replace(f"{LubimyCzytac.BASE_URL}/ksiazka/", "").split(
-                "/"
-            )[0]
-            matches.append(
-                {"id": book_id, "title": title, "authors": authors, "url": book_url}
-            )
-        return matches
-
-    def _parse_single_book(self, match: Dict) -> Dict:
-        url = match.get("url")
-        result = requests.get(url)
-        root = fromstring(result.text)
-        match["series"], match["series_index"] = self._parse_series(root=root)
-        match["tags"] = self._parse_tags(root=root)
-        match["publisher"] = self._parse_publisher(root=root)
-        match["publishedDate"] = self._parse_from_summary(
-            root=root, attribute_name="datePublished"
-        )
-        match["rating"] = self._parse_rating(root=root)
-        match["description"] = self._parse_description(root=root)
-        match["cover"] = self._parse_cover(root=root)
-        match["source"] = {
-            "id": self.__id__,
-            "description": self.__name__,
-            "link": LubimyCzytac.BASE_URL,
-        }
-        match['languages'] = self._parse_languages(root=root)
-        match["identifiers"] = {
-            "isbn": self._parse_isbn(root=root),
-            "lubimyczytac": match["id"],
-        }
-        return match
-
-    def _parse_cover(self, root):
-        imgcol_node = root.xpath('//meta[@property="og:image"]/@content')
-        if imgcol_node:
-            img_url = imgcol_node[0]
-            return img_url
-
-    def _parse_publisher(self, root):
-        publisher = root.xpath(LubimyCzytac.PUBLISHER)
-        if publisher:
-            return publisher[0]
-        else:
-            return None
-
-    def _parse_languages(self, root):
-        lang = root.xpath(LubimyCzytac.LANGUAGES)
-        languages = list()
-        if lang:
-            lang = lang[0].strip()
-            if "polski" in lang:
-                languages.append("Polish")
-            if "angielski" in lang:
-                languages.append("English")
-        if not languages:
-            return ['Polish']
-        return languages
-
-    def _parse_series(self, root):
-        try:
-            series_node = root.xpath(LubimyCzytac.SERIES)
-            if series_node:
-                series_lst = root.xpath(f"{LubimyCzytac.SERIES}/text()")
-                if series_lst:
-                    series_txt = series_lst
-                else:
-                    series_txt = None
-            else:
-                return (None, None)
-
-            if series_txt:
-                ser_string = [series_txt[0].replace("\n", "").strip()]
-                ser_nazwa = ser_string
-                for ser in ser_string:
-                    if "tom " in ser:
-                        ser_info = ser.split(" (tom ", 1)
-                        ser_nazwa = ser.split(" (tom ")[0]
-                        break
-
-            if ser_info:
-                series_index_unicode = ser_info[1]
-                series_index_string = str(
-                    series_index_unicode.replace(" ", "").replace(")", "")
-                )
-                # Sprawdzamy, czy cykl nie jest kompletem/pakietem tomów, np. 1-3
-                if "-" in series_index_string:
-                    series_index_string_temp = series_index_string.split("-", 1)
-                    series_index_string = series_index_string_temp[0]
-                if series_index_string.replace(".", "").isdigit() is True:
-                    series_index = get_int_or_float(series_index_string)
-                else:
-                    series_index = 0
-            else:
-                series_index = 0
-            series = ser_nazwa
-            return (series, series_index)
-        except:
-            return (None, None)
-
-    def _parse_tags(self, root):
-        tags = None
-        try:
-            tags_from_genre = root.xpath(LubimyCzytac.TAGS)
-            if tags_from_genre:
-                tags = tags_from_genre
-                tags = [w.replace(", itd.", " itd.") for w in tags]
-                return tags
-            else:
-                return None
-        except:
-            return tags
-
-    def _parse_from_summary(self, root, attribute_name: str) -> str:
-        data = json.loads(root.xpath(LubimyCzytac.SUMMARY)[0])
-        value = data.get(attribute_name)
-        return value.strip() if value is not None else value
-
-    def _parse_rating(self, root):
-        rating_node = root.xpath(LubimyCzytac.RATING)
-        if rating_node:
-            rating_value = round(float((rating_node[0]).replace(",", ".")) / 2)
-            return rating_value
-        return None
-
-    def _parse_date(self, root, xpath="first_publish"):
-        options = {
-            "first_publish": LubimyCzytac.FIRST_PUBLISH_DATE,
-            "first_publish_pl": LubimyCzytac.FIRST_PUBLISH_DATE_PL,
-        }
-        path = options.get(xpath)
-        from dateutil import parser
-
-        data = root.xpath(path)
-        if data:
-            first_pub_date = data[0].strip()
-            return parser.parse(first_pub_date)
-        return None
-
-    def _parse_isbn(self, root):
-        isbn_node = root.xpath('//meta[@property="books:isbn"]/@content')[0]
-        return isbn_node
-
-    def _parse_description(self, root):
-        comments = ""
-        description_node = root.xpath(LubimyCzytac.DESCRIPTION)
-        if description_node:
-            for zrodla in root.xpath('//p[@class="source"]'):
-                zrodla.getparent().remove(zrodla)
-            comments = tostring(description_node[0], method="html")
-            comments = sanitize_comments_html(comments)
-
-        else:
-            # try <meta>
-            description_node = root.xpath('//meta[@property="og:description"]/@content')
-            if description_node:
-                comments = description_node[0]
-                comments = sanitize_comments_html(comments)
-
-        pages = self._parse_from_summary(root=root, attribute_name="numberOfPages")
-        if pages:
-            comments += f'<p id="strony">Książka ma {pages} stron(y).</p>'
-
-        first_publish_date = self._parse_date(root=root)
-        if first_publish_date:
-            comments += f'<p id="pierwsze_wydanie">Data pierwszego wydania: {first_publish_date.strftime("%d.%m.%Y")}</p>'
-
-        first_publish_date_pl = self._parse_date(root=root, xpath="first_publish_pl")
-        if first_publish_date_pl:
-            comments += f'<p id="pierwsze_wydanie_pl">Data pierwszego wydania w Polsce: {first_publish_date_pl.strftime("%d.%m.%Y")}</p>'
-
-        return comments
-
-    def get_title_tokens(self, title, strip_joiners=True, strip_subtitle=False):
+    @staticmethod
+    def get_title_tokens(
+        title: str, strip_joiners: bool = True
+    ) -> Generator[str, None, None]:
         """
-        Taken from https://github.com/kovidgoyal/calibre/blob/master/src/calibre/ebooks/metadata/sources/base.py.
+        Taken from calibre source code
         """
-        # strip sub-titles
-        if strip_subtitle:
-            subtitle = re.compile(r"([\(\[\{].*?[\)\]\}]|[/:\\].*$)")
-            if len(subtitle.sub("", title)) > 1:
-                title = subtitle.sub("", title)
-
         title_patterns = [
             (re.compile(pat, re.IGNORECASE), repl)
             for pat, repl in [
                 # Remove things like: (2010) (Omnibus) etc.
                 (
-                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|audiobook|audio\scd|paperback|turtleback|mass\s*market|edition|ed\.)[\])}]",
+                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|"
+                    r"audiobook|audio\scd|paperback|turtleback|"
+                    r"mass\s*market|edition|ed\.)[\])}]",
                     "",
                 ),
                 # Remove any strings that contain the substring edition inside
@@ -371,3 +185,193 @@ class LubimyCzytac(Metadata):
                 not strip_joiners or token.lower() not in ("a", "and", "the", "&")
             ):
                 yield token
+
+
+class LubimyCzytacParser:
+    PAGES_TEMPLATE = "<p id='strony'>Książka ma {0} stron(y).</p>"
+    PUBLISH_DATE_TEMPLATE = "<p id='pierwsze_wydanie'>Data pierwszego wydania: {0}</p>"
+    PUBLISH_DATE_PL_TEMPLATE = (
+        "<p id='pierwsze_wydanie'>Data pierwszego wydania w Polsce: {0}</p>"
+    )
+
+    def __init__(self, root: HtmlElement, metadata: Metadata) -> None:
+        self.root = root
+        self.metadata = metadata
+
+    def parse_search_results(self) -> List[Dict]:
+        matches = []
+        results = self.root.xpath(LubimyCzytac.BOOK_SEARCH_RESULT_XPATH)
+        for result in results:
+            title = self._parse_xpath_node(
+                root=result,
+                xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.TITLE_TEXT_PATH}",
+            )
+
+            book_url = self._parse_xpath_node(
+                root=result,
+                xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.URL_PATH}",
+            )
+            authors = self._parse_xpath_node(
+                root=result,
+                xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.AUTHORS_PATH}",
+                take_first=False,
+            )
+            if not all([title, book_url, authors]):
+                continue
+            matches.append(
+                {
+                    "id": book_url.replace(f"/ksiazka/", "").split("/")[0],
+                    "title": title,
+                    "authors": [strip_accents(author) for author in authors],
+                    "url": LubimyCzytac.BASE_URL + book_url,
+                }
+            )
+        return matches
+
+    def parse_single_book(
+        self, match: Dict, response, generic_cover: str
+    ) -> MetaRecord:
+        self.root = fromstring(response.text)
+        match["series"], match["series_index"] = self._parse_series()
+        match["tags"] = self._parse_tags()
+        match["publisher"] = self._parse_publisher()
+        match["publishedDate"] = self._parse_from_summary(
+            attribute_name="datePublished"
+        )
+        match["rating"] = self._parse_rating()
+        match["description"] = self._parse_description()
+        match["cover"] = self._parse_cover(generic_cover=generic_cover)
+        match["source"] = {
+            "id": self.metadata.__id__,
+            "description": self.metadata.__name__,
+            "link": LubimyCzytac.BASE_URL,
+        }
+        match["languages"] = self._parse_languages()
+        match["identifiers"] = {
+            "isbn": self._parse_isbn(),
+            "lubimyczytac": match["id"],
+        }
+        return match
+
+    def _parse_xpath_node(
+        self,
+        xpath: str,
+        root: HtmlElement = None,
+        take_first: bool = True,
+        strip_element: bool = True,
+    ) -> Optional[Union[str, List[str]]]:
+        root = root if root is not None else self.root
+        node = root.xpath(xpath)
+        if not node:
+            return None
+        return (
+            (node[0].strip() if strip_element else node[0])
+            if take_first
+            else [x.strip() for x in node]
+        )
+
+    def _parse_cover(self, generic_cover) -> Optional[str]:
+        return (
+            self._parse_xpath_node(xpath=LubimyCzytac.COVER, take_first=True)
+            or generic_cover
+        )
+
+    def _parse_publisher(self) -> Optional[str]:
+        return self._parse_xpath_node(xpath=LubimyCzytac.PUBLISHER, take_first=True)
+
+    def _parse_languages(self) -> List[str]:
+        languages = list()
+        lang = self._parse_xpath_node(xpath=LubimyCzytac.LANGUAGES, take_first=True)
+        if lang:
+            if "polski" in lang:
+                languages.append("Polish")
+            if "angielski" in lang:
+                languages.append("English")
+        return languages
+
+    def _parse_series(self) -> Tuple[Optional[str], Optional[Union[float, int]]]:
+        series_index = 0
+        series = self._parse_xpath_node(xpath=LubimyCzytac.SERIES, take_first=True)
+        if series:
+            if "tom " in series:
+                series_name, series_info = series.split(" (tom ", 1)
+                series_info = series_info.replace(" ", "").replace(")", "")
+                # Check if book is not a bundle, i.e. chapter 1-3
+                if "-" in series_info:
+                    series_info = series_info.split("-", 1)[0]
+                if series_info.replace(".", "").isdigit() is True:
+                    series_index = get_int_or_float(series_info)
+                return series_name, series_index
+        return None, None
+
+    def _parse_tags(self) -> List[str]:
+        tags = self._parse_xpath_node(xpath=LubimyCzytac.TAGS, take_first=False)
+        return [
+            strip_accents(w.replace(", itd.", " itd."))
+            for w in tags
+            if isinstance(w, str)
+        ]
+
+    def _parse_from_summary(self, attribute_name: str) -> Optional[str]:
+        value = None
+        summary_text = self._parse_xpath_node(xpath=LubimyCzytac.SUMMARY)
+        if summary_text:
+            data = json.loads(summary_text)
+            value = data.get(attribute_name)
+        return value.strip() if value is not None else value
+
+    def _parse_rating(self) -> Optional[str]:
+        rating = self._parse_xpath_node(xpath=LubimyCzytac.RATING)
+        return round(float(rating.replace(",", ".")) / 2) if rating else rating
+
+    def _parse_date(self, xpath="first_publish") -> Optional[datetime.datetime]:
+        options = {
+            "first_publish": LubimyCzytac.FIRST_PUBLISH_DATE,
+            "first_publish_pl": LubimyCzytac.FIRST_PUBLISH_DATE_PL,
+        }
+        date = self._parse_xpath_node(xpath=options.get(xpath))
+        return parser.parse(date) if date else None
+
+    def _parse_isbn(self) -> Optional[str]:
+        return self._parse_xpath_node(xpath=LubimyCzytac.ISBN)
+
+    def _parse_description(self) -> str:
+        description = ""
+        description_node = self._parse_xpath_node(
+            xpath=LubimyCzytac.DESCRIPTION, strip_element=False
+        )
+        if description_node is not None:
+            for source in self.root.xpath('//p[@class="source"]'):
+                source.getparent().remove(source)
+            description = tostring(description_node, method="html")
+            description = sanitize_comments_html(description)
+
+        else:
+            description_node = self._parse_xpath_node(xpath=LubimyCzytac.META_TITLE)
+            if description_node is not None:
+                description = description_node
+                description = sanitize_comments_html(description)
+        description = self._add_extra_info_to_description(description=description)
+        return description
+
+    def _add_extra_info_to_description(self, description: str) -> str:
+        pages = self._parse_from_summary(attribute_name="numberOfPages")
+        if pages:
+            description += LubimyCzytacParser.PAGES_TEMPLATE.format(pages)
+
+        first_publish_date = self._parse_date()
+        if first_publish_date:
+            description += LubimyCzytacParser.PUBLISH_DATE_TEMPLATE.format(
+                first_publish_date.strftime("%d.%m.%Y")
+            )
+
+        first_publish_date_pl = self._parse_date(xpath="first_publish_pl")
+        if first_publish_date_pl:
+            description += LubimyCzytacParser.PUBLISH_DATE_PL_TEMPLATE.format(
+                first_publish_date_pl.strftime("%d.%m.%Y")
+            )
+
+        return description
diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index d6e4e7d53..17a9e38e2 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -15,13 +15,44 @@
 #
 #  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 abc
+from typing import Dict, List, Optional, TypedDict, Union
 
 
-class Metadata():
+class Metadata:
     __name__ = "Generic"
+    __id__ = "generic"
 
     def __init__(self):
         self.active = True
 
     def set_status(self, state):
         self.active = state
+
+    @abc.abstractmethod
+    def search(self, query: str, generic_cover: str):
+        pass
+
+
+class MetaSourceInfo(TypedDict):
+    id: str
+    description: str
+    link: str
+
+
+class MetaRecord(TypedDict):
+    id: Union[str, int]
+    title: str
+    authors: List[str]
+    url: str
+    cover: str
+    series: Optional[str]
+    series_index: Optional[Union[int, float]]
+    tags: Optional[List[str]]
+    publisher: Optional[str]
+    publishedDate: Optional[str]
+    rating: Optional[int]
+    description: Optional[str]
+    source: MetaSourceInfo
+    languages: Optional[List[str]]
+    identifiers: Dict[str, Union[str, int]]
diff --git a/requirements.txt b/requirements.txt
index d1f58a8d1..d09c21576 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,3 +16,4 @@ lxml>=3.8.0,<4.7.0
 flask-wtf>=0.14.2,<1.1.0
 markdown2==2.4.2
 html2text==2020.1.16
+python-dateutil==2.8.2

From 362fdc57166e778dd8f08f326adbaaa6b0bf3d5d Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Mon, 13 Dec 2021 02:14:53 +0100
Subject: [PATCH 063/412] run lubimyczytac detail pages in threadpool

---
 cps/metadata_provider/lubimyczytac.py | 60 ++++----------------
 cps/search_metadata.py                | 81 +++++++++++++++------------
 cps/services/Metadata.py              | 45 ++++++++++++++-
 3 files changed, 99 insertions(+), 87 deletions(-)

diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index ee66d1b48..1d4e18e11 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 #  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
 #    Copyright (C) 2021 OzzieIsaacs
 #
@@ -18,7 +17,8 @@
 import datetime
 import json
 import re
-from typing import Dict, Generator, List, Optional, Tuple, Union
+from multiprocessing.pool import ThreadPool
+from typing import Dict, List, Optional, Tuple, Union
 from urllib.parse import quote
 
 import requests
@@ -114,13 +114,14 @@ class LubimyCzytac(Metadata):
             lc_parser = LubimyCzytacParser(root=root, metadata=self)
             matches = lc_parser.parse_search_results()
             if matches:
-                final_matches = []
-                for match in matches:
-                    response = requests.get(match.get("url"))
-                    match = lc_parser.parse_single_book(
-                        match=match, response=response, generic_cover=generic_cover
+                with ThreadPool(processes=10) as pool:
+                    final_matches = pool.starmap(
+                        lc_parser.parse_single_book,
+                        [
+                            (match, generic_cover)
+                            for match in matches
+                        ],
                     )
-                    final_matches.append(match)
                 return final_matches
             return matches
 
@@ -146,46 +147,6 @@ class LubimyCzytac(Metadata):
             return ""
         return f"{LubimyCzytac.BASE_URL}/szukaj/ksiazki?phrase={query}"
 
-    @staticmethod
-    def get_title_tokens(
-        title: str, strip_joiners: bool = True
-    ) -> Generator[str, None, None]:
-        """
-        Taken from calibre source code
-        """
-        title_patterns = [
-            (re.compile(pat, re.IGNORECASE), repl)
-            for pat, repl in [
-                # Remove things like: (2010) (Omnibus) etc.
-                (
-                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|"
-                    r"audiobook|audio\scd|paperback|turtleback|"
-                    r"mass\s*market|edition|ed\.)[\])}]",
-                    "",
-                ),
-                # Remove any strings that contain the substring edition inside
-                # parentheses
-                (r"(?i)[({\[].*?(edition|ed.).*?[\]})]", ""),
-                # Remove commas used a separators in numbers
-                (r"(\d+),(\d+)", r"\1\2"),
-                # Remove hyphens only if they have whitespace before them
-                (r"(\s-)", " "),
-                # Replace other special chars with a space
-                (r"""[:,;!@$%^&*(){}.`~"\s\[\]/]《》「」“”""", " "),
-            ]
-        ]
-
-        for pat, repl in title_patterns:
-            title = pat.sub(repl, title)
-
-        tokens = title.split()
-        for token in tokens:
-            token = token.strip().strip('"').strip("'")
-            if token and (
-                not strip_joiners or token.lower() not in ("a", "and", "the", "&")
-            ):
-                yield token
-
 
 class LubimyCzytacParser:
     PAGES_TEMPLATE = "<p id='strony'>Książka ma {0} stron(y).</p>"
@@ -232,8 +193,9 @@ class LubimyCzytacParser:
         return matches
 
     def parse_single_book(
-        self, match: Dict, response, generic_cover: str
+        self, match: Dict, generic_cover: str
     ) -> MetaRecord:
+        response = requests.get(match.get("url"))
         self.root = fromstring(response.text)
         match["series"], match["series_index"] = self._parse_series()
         match["tags"] = self._parse_tags()
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index e837fe21a..7d9b6e058 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -16,25 +16,23 @@
 #  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 os
-import json
-import importlib
-import sys
-import inspect
-import datetime
 import concurrent.futures
+import importlib
+import inspect
+import json
+import os
+import sys
 
-from flask import Blueprint, request, Response, url_for
+from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
 from flask_login import login_required
+from sqlalchemy.exc import InvalidRequestError, OperationalError
 from sqlalchemy.orm.attributes import flag_modified
-from sqlalchemy.exc import OperationalError, InvalidRequestError
 
-from . import constants, logger, ub
 from cps.services.Metadata import Metadata
+from . import constants, logger, ub
 
-
-meta = Blueprint('metadata', __name__)
+meta = Blueprint("metadata", __name__)
 
 log = logger.create()
 
@@ -42,7 +40,7 @@ new_list = list()
 meta_dir = os.path.join(constants.BASE_DIR, "cps", "metadata_provider")
 modules = os.listdir(os.path.join(constants.BASE_DIR, "cps", "metadata_provider"))
 for f in modules:
-    if os.path.isfile(os.path.join(meta_dir, f)) and not f.endswith('__init__.py'):
+    if os.path.isfile(os.path.join(meta_dir, f)) and not f.endswith("__init__.py"):
         a = os.path.basename(f)[:-3]
         try:
             importlib.import_module("cps.metadata_provider." + a)
@@ -51,34 +49,46 @@ for f in modules:
             log.error("Import error for metadata source: {}".format(a))
             pass
 
+
 def list_classes(provider_list):
     classes = list()
     for element in provider_list:
-        for name, obj in inspect.getmembers(sys.modules["cps.metadata_provider." + element]):
-            if inspect.isclass(obj) and name != "Metadata" and issubclass(obj, Metadata):
+        for name, obj in inspect.getmembers(
+            sys.modules["cps.metadata_provider." + element]
+        ):
+            if (
+                inspect.isclass(obj)
+                and name != "Metadata"
+                and issubclass(obj, Metadata)
+            ):
                 classes.append(obj())
     return classes
 
+
 cl = list_classes(new_list)
 
+
 @meta.route("/metadata/provider")
 @login_required
 def metadata_provider():
-    active = current_user.view_settings.get('metadata', {})
+    active = current_user.view_settings.get("metadata", {})
     provider = list()
     for c in cl:
         ac = active.get(c.__id__, True)
-        provider.append({"name": c.__name__, "active": ac, "initial": ac, "id": c.__id__})
-    return Response(json.dumps(provider), mimetype='application/json')
+        provider.append(
+            {"name": c.__name__, "active": ac, "initial": ac, "id": c.__id__}
+        )
+    return Response(json.dumps(provider), mimetype="application/json")
 
-@meta.route("/metadata/provider", methods=['POST'])
-@meta.route("/metadata/provider/<prov_name>", methods=['POST'])
+
+@meta.route("/metadata/provider", methods=["POST"])
+@meta.route("/metadata/provider/<prov_name>", methods=["POST"])
 @login_required
 def metadata_change_active_provider(prov_name):
     new_state = request.get_json()
-    active = current_user.view_settings.get('metadata', {})
-    active[new_state['id']] = new_state['value']
-    current_user.view_settings['metadata'] = active
+    active = current_user.view_settings.get("metadata", {})
+    active[new_state["id"]] = new_state["value"]
+    current_user.view_settings["metadata"] = active
     try:
         try:
             flag_modified(current_user, "view_settings")
@@ -91,27 +101,26 @@ def metadata_change_active_provider(prov_name):
     if "initial" in new_state and prov_name:
         for c in cl:
             if c.__id__ == prov_name:
-                data = c.search(new_state.get('query', ""))
+                data = c.search(new_state.get("query", ""))
                 break
-        return Response(json.dumps(data), mimetype='application/json')
+        return Response(json.dumps(data), mimetype="application/json")
     return ""
 
-@meta.route("/metadata/search", methods=['POST'])
+
+@meta.route("/metadata/search", methods=["POST"])
 @login_required
 def metadata_search():
-    query = request.form.to_dict().get('query')
+    query = request.form.to_dict().get("query")
     data = list()
-    active = current_user.view_settings.get('metadata', {})
+    active = current_user.view_settings.get("metadata", {})
     if query:
-        static_cover = url_for('static', filename='generic_cover.jpg')
+        static_cover = url_for("static", filename="generic_cover.jpg")
         with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-            meta = {executor.submit(c.search, query, static_cover): c for c in cl if active.get(c.__id__, True)}
+            meta = {
+                executor.submit(c.search, query, static_cover): c
+                for c in cl
+                if active.get(c.__id__, True)
+            }
             for future in concurrent.futures.as_completed(meta):
                 data.extend(future.result())
-    return Response(json.dumps(data), mimetype='application/json')
-
-
-
-
-
-
+    return Response(json.dumps(data), mimetype="application/json")
diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index 17a9e38e2..1464411ac 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -16,7 +16,8 @@
 #  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 abc
-from typing import Dict, List, Optional, TypedDict, Union
+import re
+from typing import Dict, Generator, List, Optional, TypedDict, Union
 
 
 class Metadata:
@@ -30,9 +31,49 @@ class Metadata:
         self.active = state
 
     @abc.abstractmethod
-    def search(self, query: str, generic_cover: str):
+    def search(self, query: str, generic_cover: str = ""):
         pass
 
+    @staticmethod
+    def get_title_tokens(
+        title: str, strip_joiners: bool = True
+    ) -> Generator[str, None, None]:
+        """
+        Taken from calibre source code
+        """
+        title_patterns = [
+            (re.compile(pat, re.IGNORECASE), repl)
+            for pat, repl in [
+                # Remove things like: (2010) (Omnibus) etc.
+                (
+                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|"
+                    r"audiobook|audio\scd|paperback|turtleback|"
+                    r"mass\s*market|edition|ed\.)[\])}]",
+                    "",
+                ),
+                # Remove any strings that contain the substring edition inside
+                # parentheses
+                (r"(?i)[({\[].*?(edition|ed.).*?[\]})]", ""),
+                # Remove commas used a separators in numbers
+                (r"(\d+),(\d+)", r"\1\2"),
+                # Remove hyphens only if they have whitespace before them
+                (r"(\s-)", " "),
+                # Replace other special chars with a space
+                (r"""[:,;!@$%^&*(){}.`~"\s\[\]/]《》「」“”""", " "),
+            ]
+        ]
+
+        for pat, repl in title_patterns:
+            title = pat.sub(repl, title)
+
+        tokens = title.split()
+        for token in tokens:
+            token = token.strip().strip('"').strip("'")
+            if token and (
+                not strip_joiners or token.lower() not in ("a", "and", "the", "&")
+            ):
+                yield token
+
 
 class MetaSourceInfo(TypedDict):
     id: str

From d64589914fdf69ce78111c2a5d29a967f7a881e3 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Mon, 13 Dec 2021 15:14:19 +0100
Subject: [PATCH 064/412] add series, languages and isbn to google provider

---
 cps/metadata_provider/google.py       | 104 +++++++++++++++++++-------
 cps/metadata_provider/lubimyczytac.py |  24 +++---
 cps/search_metadata.py                |   5 +-
 cps/services/Metadata.py              |  52 ++++++-------
 4 files changed, 119 insertions(+), 66 deletions(-)

diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index 8be8ad74c..1074fe3d5 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -17,41 +17,93 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # Google Books api document: https://developers.google.com/books/docs/v1/using
+from typing import Dict, List, Optional
+from urllib.parse import quote
+
 import requests
 
-from cps.services.Metadata import Metadata
+from cps.isoLanguages import get_lang3, get_language_name
+from cps.services.Metadata import MetaRecord, Metadata
 
 
 class Google(Metadata):
     __name__ = "Google"
     __id__ = "google"
-    BASE_URL = "https://www.googleapis.com/books/v1/volumes?q="
+    DESCRIPTION = "Google Books"
+    META_URL = "https://books.google.com/"
+    BOOK_URL = "https://books.google.com/books?id="
+    SEARCH_URL = "https://www.googleapis.com/books/v1/volumes?q="
+    ISBN_TYPE = "ISBN_13"
 
-    def search(self, query, generic_cover=""):
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         if self.active:
             val = list()
-            result = requests.get(Google.BASE_URL + query.replace(" ","+"))
-            for r in result.json()['items']:
-                v = dict()
-                v['id'] = r['id']
-                v['title'] = r['volumeInfo']['title']
-                v['authors'] = r['volumeInfo'].get('authors', [])
-                v['description'] = r['volumeInfo'].get('description', "")
-                v['publisher'] = r['volumeInfo'].get('publisher', "")
-                v['publishedDate'] = r['volumeInfo'].get('publishedDate', "")
-                v['tags'] = r['volumeInfo'].get('categories', [])
-                v['rating'] = r['volumeInfo'].get('averageRating', 0)
-                if r['volumeInfo'].get('imageLinks'):
-                    v['cover'] = r['volumeInfo']['imageLinks']['thumbnail'].replace("http://", "https://")
-                else:
-                    # v['cover'] = "/../../../static/generic_cover.jpg"
-                    v['cover'] = generic_cover
-                v['source'] = {
-                    "id": self.__id__,
-                    "description": "Google Books",
-                    "link": "https://books.google.com/"}
-                v['url'] = "https://books.google.com/books?id=" + r['id']
-                val.append(v)
-            return val
+            title_tokens = list(self.get_title_tokens(query, strip_joiners=False))
+            if title_tokens:
+                tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+                query = "+".join(tokens)
+            results = requests.get(Google.SEARCH_URL + query)
+            for result in results.json()["items"]:
+                val.append(
+                    self._parse_search_result(
+                        result=result, generic_cover=generic_cover, locale=locale
+                    )
+                )
+                return val
 
+    def _parse_search_result(
+        self, result: Dict, generic_cover: str, locale: str
+    ) -> MetaRecord:
+        match = dict()
+        match["id"] = result["id"]
+        match["title"] = result["volumeInfo"]["title"]
+        match["authors"] = result["volumeInfo"].get("authors", [])
+        match["url"] = Google.BOOK_URL + result["id"]
+        match["cover"] = self._parse_cover(result=result, generic_cover=generic_cover)
+        match["description"] = result["volumeInfo"].get("description", "")
+        match["languages"] = self._parse_languages(result=result, locale=locale)
+        match["publisher"] = result["volumeInfo"].get("publisher", "")
+        match["publishedDate"] = result["volumeInfo"].get("publishedDate", "")
+        match["rating"] = result["volumeInfo"].get("averageRating", 0)
+        match["series"], match["series_index"] = "", 1
+        match["tags"] = result["volumeInfo"].get("categories", [])
 
+        match["source"] = {
+            "id": self.__id__,
+            "description": Google.DESCRIPTION,
+            "link": Google.META_URL,
+        }
+
+        match["identifiers"] = {
+            "google": match.get("id"),
+        }
+        match = self._parse_isbn(result=result, match=match)
+        return match
+
+    @staticmethod
+    def _parse_isbn(result: Dict, match: Dict) -> Dict:
+        identifiers = result["volumeInfo"].get("industryIdentifiers", [])
+        for identifier in identifiers:
+            if identifier.get("type") == Google.ISBN_TYPE:
+                match["identifiers"]["isbn"] = identifier.get("identifier")
+                break
+        return match
+
+    @staticmethod
+    def _parse_cover(result: Dict, generic_cover: str) -> str:
+        if result["volumeInfo"].get("imageLinks"):
+            cover_url = result["volumeInfo"]["imageLinks"]["thumbnail"]
+            return cover_url.replace("http://", "https://")
+        return generic_cover
+
+    @staticmethod
+    def _parse_languages(result: Dict, locale: str) -> List[str]:
+        language_iso2 = result.get("language", "")
+        languages = (
+            [get_language_name(locale, get_lang3(language_iso2))]
+            if language_iso2
+            else []
+        )
+        return languages
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 1d4e18e11..fd9ca4a79 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -107,7 +107,9 @@ class LubimyCzytac(Metadata):
 
     SUMMARY = "//script[@type='application/ld+json']//text()"
 
-    def search(self, query: str, generic_cover: str = "") -> Optional[List]:
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         if self.active:
             result = requests.get(self._prepare_query(title=query))
             root = fromstring(result.text)
@@ -117,10 +119,7 @@ class LubimyCzytac(Metadata):
                 with ThreadPool(processes=10) as pool:
                     final_matches = pool.starmap(
                         lc_parser.parse_single_book,
-                        [
-                            (match, generic_cover)
-                            for match in matches
-                        ],
+                        [(match, generic_cover) for match in matches],
                     )
                 return final_matches
             return matches
@@ -192,26 +191,25 @@ class LubimyCzytacParser:
             )
         return matches
 
-    def parse_single_book(
-        self, match: Dict, generic_cover: str
-    ) -> MetaRecord:
+    def parse_single_book(self, match: Dict, generic_cover: str) -> MetaRecord:
         response = requests.get(match.get("url"))
         self.root = fromstring(response.text)
-        match["series"], match["series_index"] = self._parse_series()
-        match["tags"] = self._parse_tags()
+        match["cover"] = self._parse_cover(generic_cover=generic_cover)
+        match["description"] = self._parse_description()
+        match["languages"] = self._parse_languages()
         match["publisher"] = self._parse_publisher()
         match["publishedDate"] = self._parse_from_summary(
             attribute_name="datePublished"
         )
         match["rating"] = self._parse_rating()
-        match["description"] = self._parse_description()
-        match["cover"] = self._parse_cover(generic_cover=generic_cover)
+        match["series"], match["series_index"] = self._parse_series()
+        match["tags"] = self._parse_tags()
+
         match["source"] = {
             "id": self.metadata.__id__,
             "description": self.metadata.__name__,
             "link": LubimyCzytac.BASE_URL,
         }
-        match["languages"] = self._parse_languages()
         match["identifiers"] = {
             "isbn": self._parse_isbn(),
             "lubimyczytac": match["id"],
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index 7d9b6e058..a128f9ac1 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -30,7 +30,7 @@ from sqlalchemy.exc import InvalidRequestError, OperationalError
 from sqlalchemy.orm.attributes import flag_modified
 
 from cps.services.Metadata import Metadata
-from . import constants, logger, ub
+from . import constants, get_locale, logger, ub
 
 meta = Blueprint("metadata", __name__)
 
@@ -113,11 +113,12 @@ def metadata_search():
     query = request.form.to_dict().get("query")
     data = list()
     active = current_user.view_settings.get("metadata", {})
+    locale = get_locale()
     if query:
         static_cover = url_for("static", filename="generic_cover.jpg")
         with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
             meta = {
-                executor.submit(c.search, query, static_cover): c
+                executor.submit(c.search, query, static_cover, locale): c
                 for c in cl
                 if active.get(c.__id__, True)
             }
diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index 1464411ac..09fc70ceb 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -20,6 +20,30 @@ import re
 from typing import Dict, Generator, List, Optional, TypedDict, Union
 
 
+class MetaSourceInfo(TypedDict):
+    id: str
+    description: str
+    link: str
+
+
+class MetaRecord(TypedDict):
+    id: Union[str, int]
+    title: str
+    authors: List[str]
+    url: str
+    cover: str
+    series: Optional[str]
+    series_index: Optional[Union[int, float]]
+    tags: Optional[List[str]]
+    publisher: Optional[str]
+    publishedDate: Optional[str]
+    rating: Optional[int]
+    description: Optional[str]
+    source: MetaSourceInfo
+    languages: Optional[List[str]]
+    identifiers: Dict[str, Union[str, int]]
+
+
 class Metadata:
     __name__ = "Generic"
     __id__ = "generic"
@@ -31,7 +55,9 @@ class Metadata:
         self.active = state
 
     @abc.abstractmethod
-    def search(self, query: str, generic_cover: str = ""):
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         pass
 
     @staticmethod
@@ -73,27 +99,3 @@ class Metadata:
                 not strip_joiners or token.lower() not in ("a", "and", "the", "&")
             ):
                 yield token
-
-
-class MetaSourceInfo(TypedDict):
-    id: str
-    description: str
-    link: str
-
-
-class MetaRecord(TypedDict):
-    id: Union[str, int]
-    title: str
-    authors: List[str]
-    url: str
-    cover: str
-    series: Optional[str]
-    series_index: Optional[Union[int, float]]
-    tags: Optional[List[str]]
-    publisher: Optional[str]
-    publishedDate: Optional[str]
-    rating: Optional[int]
-    description: Optional[str]
-    source: MetaSourceInfo
-    languages: Optional[List[str]]
-    identifiers: Dict[str, Union[str, int]]

From 51bf35c2e41a16032e1250a8cac252195116a147 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Mon, 13 Dec 2021 17:21:41 +0100
Subject: [PATCH 065/412] unify scholar

---
 cps/metadata_provider/comicvine.py    | 87 ++++++++++++++++-----------
 cps/metadata_provider/google.py       | 49 ++++++++-------
 cps/metadata_provider/lubimyczytac.py | 57 +++++++++---------
 cps/metadata_provider/scholar.py      | 66 +++++++++++---------
 cps/search_metadata.py                | 15 +++--
 cps/services/Metadata.py              | 32 ++++++----
 optional-requirements.txt             |  3 +
 requirements.txt                      |  3 -
 8 files changed, 172 insertions(+), 140 deletions(-)

diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py
index 195e68f88..56618d4b4 100644
--- a/cps/metadata_provider/comicvine.py
+++ b/cps/metadata_provider/comicvine.py
@@ -17,49 +17,68 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # ComicVine api document: https://comicvine.gamespot.com/api/documentation
+from typing import Dict, List, Optional
+from urllib.parse import quote
 
 import requests
-from cps.services.Metadata import Metadata
+from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 
 class ComicVine(Metadata):
     __name__ = "ComicVine"
     __id__ = "comicvine"
+    DESCRIPTION = "ComicVine Books"
+    META_URL = "https://comicvine.gamespot.com/"
+    API_KEY = "57558043c53943d5d1e96a9ad425b0eb85532ee6"
+    BASE_URL = (
+        f"https://comicvine.gamespot.com/api/search?api_key={API_KEY}"
+        f"&resources=issue&query="
+    )
+    QUERY_PARAMS = "&sort=name:desc&format=json"
+    HEADERS = {"User-Agent": "Not Evil Browser"}
 
-    def search(self, query, generic_cover=""):
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         val = list()
-        apikey = "57558043c53943d5d1e96a9ad425b0eb85532ee6"
         if self.active:
-            headers = {
-                'User-Agent': 'Not Evil Browser'
-            }
-
-            result = requests.get("https://comicvine.gamespot.com/api/search?api_key="
-                                  + apikey + "&resources=issue&query=" + query + "&sort=name:desc&format=json", headers=headers)
-            for r in result.json()['results']:
-                seriesTitle = r['volume'].get('name', "")
-                if r.get('store_date'):
-                    dateFomers = r.get('store_date')
-                else:
-                    dateFomers = r.get('date_added')
-                v = dict()
-                v['id'] = r['id']
-                v['title'] = seriesTitle + " #" + r.get('issue_number', "0") + " - " + ( r.get('name', "") or "")
-                v['authors'] = r.get('authors', [])
-                v['description'] = r.get('description', "")
-                v['publisher'] = ""
-                v['publishedDate'] = dateFomers
-                v['tags'] = ["Comics", seriesTitle]
-                v['rating'] = 0
-                v['series'] = seriesTitle
-                v['cover'] = r['image'].get('original_url', generic_cover)
-                v['source'] = {
-                    "id": self.__id__,
-                    "description": "ComicVine Books",
-                    "link": "https://comicvine.gamespot.com/"
-                }
-                v['url'] = r.get('site_detail_url', "")
-                val.append(v)
+            title_tokens = list(self.get_title_tokens(query, strip_joiners=False))
+            if title_tokens:
+                tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+                query = "%20".join(tokens)
+            result = requests.get(
+                f"{ComicVine.BASE_URL}{query}{ComicVine.QUERY_PARAMS}",
+                headers=ComicVine.HEADERS,
+            )
+            for result in result.json()["results"]:
+                match = self._parse_search_result(
+                    result=result, generic_cover=generic_cover, locale=locale
+                )
+                val.append(match)
         return val
 
-
+    def _parse_search_result(
+        self, result: Dict, generic_cover: str, locale: str
+    ) -> MetaRecord:
+        series = result["volume"].get("name", "")
+        series_index = result.get("issue_number", 0)
+        issue_name = result.get("name", "")
+        match = MetaRecord(
+            id=result["id"],
+            title=f"{series}#{series_index} - {issue_name}",
+            authors=result.get("authors", []),
+            url=result.get("site_detail_url", ""),
+            source=MetaSourceInfo(
+                id=self.__id__,
+                description=ComicVine.DESCRIPTION,
+                link=ComicVine.META_URL,
+            ),
+            series=series,
+        )
+        match.cover = result["image"].get("original_url", generic_cover)
+        match.description = result.get("description", "")
+        match.publishedDate = result.get("store_date", result.get("date_added"))
+        match.series_index = series_index
+        match.tags = ["Comics", series]
+        match.identifiers = {"comicvine": match.id}
+        return match
diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index 1074fe3d5..5ac3e7ee5 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -23,7 +23,7 @@ from urllib.parse import quote
 import requests
 
 from cps.isoLanguages import get_lang3, get_language_name
-from cps.services.Metadata import MetaRecord, Metadata
+from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 
 class Google(Metadata):
@@ -56,38 +56,37 @@ class Google(Metadata):
     def _parse_search_result(
         self, result: Dict, generic_cover: str, locale: str
     ) -> MetaRecord:
-        match = dict()
-        match["id"] = result["id"]
-        match["title"] = result["volumeInfo"]["title"]
-        match["authors"] = result["volumeInfo"].get("authors", [])
-        match["url"] = Google.BOOK_URL + result["id"]
-        match["cover"] = self._parse_cover(result=result, generic_cover=generic_cover)
-        match["description"] = result["volumeInfo"].get("description", "")
-        match["languages"] = self._parse_languages(result=result, locale=locale)
-        match["publisher"] = result["volumeInfo"].get("publisher", "")
-        match["publishedDate"] = result["volumeInfo"].get("publishedDate", "")
-        match["rating"] = result["volumeInfo"].get("averageRating", 0)
-        match["series"], match["series_index"] = "", 1
-        match["tags"] = result["volumeInfo"].get("categories", [])
+        match = MetaRecord(
+            id=result["id"],
+            title=result["volumeInfo"]["title"],
+            authors=result["volumeInfo"].get("authors", []),
+            url=Google.BOOK_URL + result["id"],
+            source=MetaSourceInfo(
+                id=self.__id__,
+                description=Google.DESCRIPTION,
+                link=Google.META_URL,
+            ),
+        )
 
-        match["source"] = {
-            "id": self.__id__,
-            "description": Google.DESCRIPTION,
-            "link": Google.META_URL,
-        }
+        match.cover = self._parse_cover(result=result, generic_cover=generic_cover)
+        match.description = result["volumeInfo"].get("description", "")
+        match.languages = self._parse_languages(result=result, locale=locale)
+        match.publisher = result["volumeInfo"].get("publisher", "")
+        match.publishedDate = result["volumeInfo"].get("publishedDate", "")
+        match.rating = result["volumeInfo"].get("averageRating", 0)
+        match.series, match.series_index = "", 1
+        match.tags = result["volumeInfo"].get("categories", [])
 
-        match["identifiers"] = {
-            "google": match.get("id"),
-        }
+        match.identifiers = {"google": match.id}
         match = self._parse_isbn(result=result, match=match)
         return match
 
     @staticmethod
-    def _parse_isbn(result: Dict, match: Dict) -> Dict:
+    def _parse_isbn(result: Dict, match: MetaRecord) -> MetaRecord:
         identifiers = result["volumeInfo"].get("industryIdentifiers", [])
         for identifier in identifiers:
             if identifier.get("type") == Google.ISBN_TYPE:
-                match["identifiers"]["isbn"] = identifier.get("identifier")
+                match.identifiers["isbn"] = identifier.get("identifier")
                 break
         return match
 
@@ -100,7 +99,7 @@ class Google(Metadata):
 
     @staticmethod
     def _parse_languages(result: Dict, locale: str) -> List[str]:
-        language_iso2 = result.get("language", "")
+        language_iso2 = result["volumeInfo"].get("language", "")
         languages = (
             [get_language_name(locale, get_lang3(language_iso2))]
             if language_iso2
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index fd9ca4a79..4f6aca1ee 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -27,7 +27,7 @@ from html2text import HTML2Text
 from lxml.html import HtmlElement, fromstring, tostring
 from markdown2 import Markdown
 
-from cps.services.Metadata import MetaRecord, Metadata
+from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 SYMBOLS_TO_TRANSLATE = (
     "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
@@ -158,61 +158,60 @@ class LubimyCzytacParser:
         self.root = root
         self.metadata = metadata
 
-    def parse_search_results(self) -> List[Dict]:
+    def parse_search_results(self) -> List[MetaRecord]:
         matches = []
         results = self.root.xpath(LubimyCzytac.BOOK_SEARCH_RESULT_XPATH)
         for result in results:
             title = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.TITLE_TEXT_PATH}",
+                      f"{LubimyCzytac.TITLE_TEXT_PATH}",
             )
 
             book_url = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.URL_PATH}",
+                      f"{LubimyCzytac.URL_PATH}",
             )
             authors = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.AUTHORS_PATH}",
+                      f"{LubimyCzytac.AUTHORS_PATH}",
                 take_first=False,
             )
             if not all([title, book_url, authors]):
                 continue
             matches.append(
-                {
-                    "id": book_url.replace(f"/ksiazka/", "").split("/")[0],
-                    "title": title,
-                    "authors": [strip_accents(author) for author in authors],
-                    "url": LubimyCzytac.BASE_URL + book_url,
-                }
+                MetaRecord(
+                    id=book_url.replace(f"/ksiazka/", "").split("/")[0],
+                    title=title,
+                    authors=[strip_accents(author) for author in authors],
+                    url=LubimyCzytac.BASE_URL + book_url,
+                    source=MetaSourceInfo(
+                        id=self.metadata.__id__,
+                        description=self.metadata.__name__,
+                        link=LubimyCzytac.BASE_URL,
+                    )
+                )
             )
         return matches
 
-    def parse_single_book(self, match: Dict, generic_cover: str) -> MetaRecord:
-        response = requests.get(match.get("url"))
+    def parse_single_book(self, match: MetaRecord, generic_cover: str) -> MetaRecord:
+        response = requests.get(match.url)
         self.root = fromstring(response.text)
-        match["cover"] = self._parse_cover(generic_cover=generic_cover)
-        match["description"] = self._parse_description()
-        match["languages"] = self._parse_languages()
-        match["publisher"] = self._parse_publisher()
-        match["publishedDate"] = self._parse_from_summary(
+        match.cover = self._parse_cover(generic_cover=generic_cover)
+        match.description = self._parse_description()
+        match.languages = self._parse_languages()
+        match.publisher = self._parse_publisher()
+        match.publishedDate = self._parse_from_summary(
             attribute_name="datePublished"
         )
-        match["rating"] = self._parse_rating()
-        match["series"], match["series_index"] = self._parse_series()
-        match["tags"] = self._parse_tags()
-
-        match["source"] = {
-            "id": self.metadata.__id__,
-            "description": self.metadata.__name__,
-            "link": LubimyCzytac.BASE_URL,
-        }
-        match["identifiers"] = {
+        match.rating = self._parse_rating()
+        match.series, match.series_index = self._parse_series()
+        match.tags = self._parse_tags()
+        match.identifiers = {
             "isbn": self._parse_isbn(),
-            "lubimyczytac": match["id"],
+            "lubimyczytac": match.id,
         }
         return match
 
diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 6e13c7689..0becaef05 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -15,47 +15,53 @@
 #
 #  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 itertools
+from typing import Dict, List, Optional
+from urllib.parse import quote
 
 from scholarly import scholarly
 
-from cps.services.Metadata import Metadata
+from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 
 class scholar(Metadata):
     __name__ = "Google Scholar"
     __id__ = "googlescholar"
+    META_URL = "https://scholar.google.com/"
 
-    def search(self, query, generic_cover=""):
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         val = list()
         if self.active:
-            scholar_gen = scholarly.search_pubs(' '.join(query.split('+')))
-            i = 0
-            for publication in scholar_gen:
-                v = dict()
-                v['id'] = "1234" # publication['bib'].get('title')
-                v['title'] = publication['bib'].get('title')
-                v['authors'] = publication['bib'].get('author', [])
-                v['description'] = publication['bib'].get('abstract', "")
-                v['publisher'] = publication['bib'].get('venue', "")
-                if publication['bib'].get('pub_year'):
-                    v['publishedDate'] = publication['bib'].get('pub_year')+"-01-01"
-                else:
-                    v['publishedDate'] = ""
-                v['tags'] = ""
-                v['ratings'] = 0
-                v['series'] = ""
-                v['cover'] = generic_cover
-                v['url'] = publication.get('pub_url') or publication.get('eprint_url') or "",
-                v['source'] = {
-                    "id": self.__id__,
-                    "description": "Google Scholar",
-                    "link": "https://scholar.google.com/"
-                }
-                val.append(v)
-                i += 1
-                if (i >= 10):
-                    break
+            title_tokens = list(self.get_title_tokens(query, strip_joiners=False))
+            if title_tokens:
+                tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+                query = " ".join(tokens)
+            scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
+            for result in scholar_gen:
+                match = self._parse_search_result(
+                    result=result, generic_cover=generic_cover, locale=locale
+                )
+                val.append(match)
         return val
 
+    def _parse_search_result(
+        self, result: Dict, generic_cover: str, locale: str
+    ) -> MetaRecord:
+        match = MetaRecord(
+            id=result.get("pub_url", result.get("eprint_url", "")),
+            title=result["bib"].get("title"),
+            authors=result["bib"].get("author", []),
+            url=result.get("pub_url", result.get("eprint_url", "")),
+            source=MetaSourceInfo(
+                id=self.__id__, description=self.__name__, link=scholar.META_URL
+            ),
+        )
 
-
+        match.cover = result.get("image", {}).get("original_url", generic_cover)
+        match.description = result["bib"].get("abstract", "")
+        match.publisher = result["bib"].get("venue", "")
+        match.publishedDate = result["bib"].get("pub_year") + "-01-01"
+        match.identifiers = {"scholar": match.id}
+        return match
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index a128f9ac1..53cbf5539 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -22,6 +22,7 @@ import inspect
 import json
 import os
 import sys
+from dataclasses import asdict
 
 from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
@@ -99,11 +100,13 @@ def metadata_change_active_provider(prov_name):
         log.error("Invalid request received: {}".format(request))
         return "Invalid request", 400
     if "initial" in new_state and prov_name:
-        for c in cl:
-            if c.__id__ == prov_name:
-                data = c.search(new_state.get("query", ""))
-                break
-        return Response(json.dumps(data), mimetype="application/json")
+        data = []
+        provider = next((c for c in cl if c.__id__ == prov_name), None)
+        if provider is not None:
+            data = provider.search(new_state.get("query", ""))
+        return Response(
+            json.dumps([asdict(x) for x in data]), mimetype="application/json"
+        )
     return ""
 
 
@@ -123,5 +126,5 @@ def metadata_search():
                 if active.get(c.__id__, True)
             }
             for future in concurrent.futures.as_completed(meta):
-                data.extend(future.result())
+                data.extend([asdict(x) for x in future.result()])
     return Response(json.dumps(data), mimetype="application/json")
diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index 09fc70ceb..f4a5662c6 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -16,32 +16,38 @@
 #  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 abc
+import dataclasses
+import os
 import re
-from typing import Dict, Generator, List, Optional, TypedDict, Union
+from typing import Dict, Generator, List, Optional, Union
+
+from cps import constants
 
 
-class MetaSourceInfo(TypedDict):
+@dataclasses.dataclass
+class MetaSourceInfo:
     id: str
     description: str
     link: str
 
 
-class MetaRecord(TypedDict):
+@dataclasses.dataclass
+class MetaRecord:
     id: Union[str, int]
     title: str
     authors: List[str]
     url: str
-    cover: str
-    series: Optional[str]
-    series_index: Optional[Union[int, float]]
-    tags: Optional[List[str]]
-    publisher: Optional[str]
-    publishedDate: Optional[str]
-    rating: Optional[int]
-    description: Optional[str]
     source: MetaSourceInfo
-    languages: Optional[List[str]]
-    identifiers: Dict[str, Union[str, int]]
+    cover: str = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
+    description: Optional[str] = ""
+    series: Optional[str] = None
+    series_index: Optional[Union[int, float]] = 0
+    identifiers: Dict[str, Union[str, int]] = dataclasses.field(default_factory=dict)
+    publisher: Optional[str] = None
+    publishedDate: Optional[str] = None
+    rating: Optional[int] = 0
+    languages: Optional[List[str]] = dataclasses.field(default_factory=list)
+    tags: Optional[List[str]] = dataclasses.field(default_factory=list)
 
 
 class Metadata:
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 03f58bb56..17c4b878a 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -32,6 +32,9 @@ SQLAlchemy-Utils>=0.33.5,<0.38.0
 # extracting metadata
 rarfile>=2.7
 scholarly>=1.2.0, <1.5
+markdown2==2.4.2
+html2text==2020.1.16
+python-dateutil==2.8.2
 
 # other
 natsort>=2.2.0,<8.1.0
diff --git a/requirements.txt b/requirements.txt
index d09c21576..1db961fef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,3 @@ Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.3.0
 lxml>=3.8.0,<4.7.0
 flask-wtf>=0.14.2,<1.1.0
-markdown2==2.4.2
-html2text==2020.1.16
-python-dateutil==2.8.2

From 45c433caabebacdde5a094c9f1c6b4211aa1aafe Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 13 Dec 2021 18:25:56 +0100
Subject: [PATCH 066/412] Added "hmj" to supported languages. Fix for "bit"
 language support (Fix #2217)

---
 cps/iso_language_names.py                     |  58 ++--
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 39546 -> 39546 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 53605 -> 53605 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 57741 -> 57741 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 51330 -> 51330 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 27430 -> 27430 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 53669 -> 53669 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 25180 -> 25180 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 56299 -> 56299 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 19843 -> 19843 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 24546 -> 24546 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 50497 -> 50497 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 52413 -> 52413 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 302 +++++++++---------
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 46930 -> 46930 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 302 +++++++++---------
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 47969 -> 47969 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 48760 -> 48760 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 22790 -> 22790 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 302 +++++++++---------
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 18028 -> 18028 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 302 +++++++++---------
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 48563 -> 48563 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 302 +++++++++---------
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 48886 -> 48886 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 302 +++++++++---------
 messages.pot                                  | 302 +++++++++---------
 40 files changed, 3179 insertions(+), 2919 deletions(-)

diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 697b7e22a..c6267ffd0 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -51,11 +51,11 @@ LANGUAGE_NAMES = {
         "bel": "běloruština",
         "bem": "bemba (Zambie)",
         "ben": "bengálština",
-        "berinomo": "bit",
         "bho": "bhódžpurština",
         "bik": "bikolština",
         "bin": "bini",
         "bis": "bislamština",
+        "bit": "berinomo",
         "bla": "siksika",
         "bod": "tibetština",
         "bos": "bosenština",
@@ -164,6 +164,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligayonština",
         "hin": "hindština",
         "hit": "chetitština",
+        "hmj": "Ge",
         "hmn": "hmongština",
         "hmo": "hiri motu",
         "hrv": "chorvatština",
@@ -474,11 +475,11 @@ LANGUAGE_NAMES = {
         "bel": "Weißrussisch",
         "bem": "Bemba (Sambia)",
         "ben": "Bengalisch",
-        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Blackfoot",
         "bod": "Tibetisch",
         "bos": "Bosnisch",
@@ -587,6 +588,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hethitisch",
+        "hmj": "Ge",
         "hmn": "Miao-Sprachen",
         "hmo": "Hiri-Motu",
         "hrv": "Kroatisch",
@@ -896,12 +898,12 @@ LANGUAGE_NAMES = {
         "bel": "Λευκωρωσικά",
         "bem": "Bemba (Zambia)",
         "ben": "Μπενγκάλι",
+        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
         "bin": "Bini",
         "bis": "Bislama",
-        "berinomo": "Bit",
         "zbl": "Blissymbols",
         "bos": "Βοσνιακά",
         "bra": "Braj",
@@ -971,6 +973,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Γεωργιανά",
         "deu": "Γερμανικά",
@@ -1275,11 +1278,11 @@ LANGUAGE_NAMES = {
         "bel": "Bielorruso",
         "bem": "Bemba (Zambia)",
         "ben": "Bengalí",
-        "berinomo": "Bit",
         "bho": "Bopurí",
         "bik": "Bicolano",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksiká",
         "bod": "Tibetano",
         "bos": "Bosnio",
@@ -1388,6 +1391,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainón",
         "hin": "Hindi",
         "hit": "Hitita",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croata",
@@ -1698,11 +1702,11 @@ LANGUAGE_NAMES = {
         "bel": "valkovenäjä",
         "bem": "Bemba (Zambia)",
         "ben": "bengali",
-        "berinomo": "Bit",
         "bho": "bhojpuri",
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
+        "bit": "Berinomo",
         "bla": "mustajalka (siksika)",
         "bod": "tiibetti",
         "bos": "bosnia",
@@ -1811,6 +1815,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "heetti",
+        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri-motu",
         "hrv": "kroatia",
@@ -2121,11 +2126,11 @@ LANGUAGE_NAMES = {
         "bel": "biélorusse",
         "bem": "bemba (Zambie)",
         "ben": "bengali",
-        "berinomo": "bit",
         "bho": "bhojpuri",
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
+        "bit": "berinomo",
         "bla": "pied-noir",
         "bod": "tibétain",
         "bos": "bosniaque",
@@ -2234,6 +2239,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "hittite",
+        "hmj": "ge",
         "hmn": "hmong",
         "hmo": "hiri Motu",
         "hrv": "croate",
@@ -2544,11 +2550,11 @@ LANGUAGE_NAMES = {
         "bel": "belarusz",
         "bem": "Bemba (Zambia)",
         "ben": "bengáli",
-        "berinomo": "Bit",
         "bho": "bhodzspuri",
         "bik": "bikol",
         "bin": "bini",
         "bis": "biszlama",
+        "bit": "Berinomo",
         "bla": "szikszika",
         "bod": "tibeti",
         "bos": "bosnyák",
@@ -2657,6 +2663,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hettita",
+        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "horvát",
@@ -2967,11 +2974,11 @@ LANGUAGE_NAMES = {
         "bel": "Bielorusso",
         "bem": "Bemba (Zambia)",
         "ben": "Bengalese",
-        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "bicol",
         "bin": "Bini",
         "bis": "bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetano",
         "bos": "Bosniaco",
@@ -3080,6 +3087,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligayna",
         "hin": "Hindi",
         "hit": "hittite",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croato",
@@ -3390,11 +3398,11 @@ LANGUAGE_NAMES = {
         "bel": "白ロシア語",
         "bem": "Bemba (Zambia)",
         "ben": "ベンガル語",
-        "berinomo": "Bit",
         "bho": "ボージプリー語",
         "bik": "ビコル語",
         "bin": "ビニ語",
         "bis": "ビスラマ語",
+        "bit": "Berinomo",
         "bla": "ブラックフット語",
         "bod": "チベット語",
         "bos": "ボスニア語",
@@ -3503,6 +3511,7 @@ LANGUAGE_NAMES = {
         "hil": "ヒリジャノン語",
         "hin": "ヒンディー語",
         "hit": "ヒッタイト語",
+        "hmj": "Ge",
         "hmn": "フモング語",
         "hmo": "ヒリモトゥ語",
         "hrv": "クロアチア語",
@@ -3813,11 +3822,11 @@ LANGUAGE_NAMES = {
         "bel": "Belarusian",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
-        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
@@ -3926,6 +3935,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
@@ -4236,11 +4246,11 @@ LANGUAGE_NAMES = {
         "bel": "Wit-Russisch; Belarussisch",
         "bem": "Bemba (Zambia)",
         "ben": "Bengaals",
-        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "bin": "Bini; Edo",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetaans",
         "bos": "Bosnisch",
@@ -4349,6 +4359,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainoons",
         "hin": "Hindi",
         "hit": "Hittitisch",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatisch",
@@ -4659,11 +4670,11 @@ LANGUAGE_NAMES = {
         "bel": "białoruski",
         "bem": "bemba (Zambia)",
         "ben": "bengalski",
-        "berinomo": "Bit",
         "bho": "bhodźpuri",
         "bik": "bikol",
         "bin": "edo",
         "bis": "bislama",
+        "bit": "Berinomo",
         "bla": "siksika",
         "bod": "tybetański",
         "bos": "bośniacki",
@@ -4772,6 +4783,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hetycki",
+        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "chorwacki",
@@ -5081,12 +5093,12 @@ LANGUAGE_NAMES = {
         "bel": "Belarusian",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
+        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
         "bin": "Bini",
         "bis": "Bislama",
-        "berinomo": "Bit",
         "zbl": "Blissymbols",
         "bos": "Bosnian",
         "bra": "Braj",
@@ -5156,6 +5168,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgiano",
         "deu": "Alemão",
@@ -5458,11 +5471,11 @@ LANGUAGE_NAMES = {
         "bel": "Белорусский",
         "bem": "Бемба (Замбия)",
         "ben": "Бенгальский",
-        "berinomo": "Bit",
         "bho": "Бходжпури",
         "bik": "Бикольский",
         "bin": "Бини",
         "bis": "Бислама",
+        "bit": "Berinomo",
         "bla": "Сиксика",
         "bod": "Тибетский",
         "bos": "Боснийский",
@@ -5571,6 +5584,7 @@ LANGUAGE_NAMES = {
         "hil": "Хилигайнон",
         "hin": "Хинди",
         "hit": "Хиттит",
+        "hmj": "Ge",
         "hmn": "Хмонг",
         "hmo": "Хири Моту",
         "hrv": "Хорватский",
@@ -5881,11 +5895,11 @@ LANGUAGE_NAMES = {
         "bel": "Vitryska",
         "bem": "Bemba (Zambia)",
         "ben": "Bengaliska",
-        "berinomo": "Bit",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "bin": "Edo (bini)",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika (svartfotindianernas språk)",
         "bod": "Tibetanska",
         "bos": "Bosniska",
@@ -5994,6 +6008,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hettitiska språk",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatiska",
@@ -6303,12 +6318,12 @@ LANGUAGE_NAMES = {
         "bel": "Beyaz Rusça",
         "bem": "Bemba (Zambia)",
         "ben": "Bengalce",
+        "bit": "Berinomo",
         "bho": "Bhojpuri (Hindistan)",
         "bik": "Bikol (Filipinler)",
         "byn": "Bilin",
         "bin": "Bini (Afrika)",
         "bis": "Bislama (Vanuatu; Kuzey Pasifik)",
-        "berinomo": "Bit",
         "zbl": "Blis Sembolleri",
         "bos": "Boşnakça",
         "bra": "Braj (Hindistan)",
@@ -6378,6 +6393,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda Dili",
         "gay": "Gayo (Sumatra)",
         "gba": "Gbaya (Orta Afrika Cumhuriyeti)",
+        "hmj": "Ge",
         "gez": "Geez (Etiyopya)",
         "kat": "Gürcüce",
         "deu": "Almanca",
@@ -6680,11 +6696,11 @@ LANGUAGE_NAMES = {
         "bel": "білоруська",
         "bem": "бемба (Замбія)",
         "ben": "бенгальська",
-        "berinomo": "біт",
         "bho": "бходжпурі",
         "bik": "бікольська",
         "bin": "біні",
         "bis": "біслама",
+        "bit": "беріномо",
         "bla": "сісіка",
         "bod": "тибетська",
         "bos": "боснійська",
@@ -6793,6 +6809,7 @@ LANGUAGE_NAMES = {
         "hil": "хілігайнон",
         "hin": "хінді",
         "hit": "хетська",
+        "hmj": "ге",
         "hmn": "хмонг",
         "hmo": "хірімоту",
         "hrv": "хорватська",
@@ -7103,11 +7120,11 @@ LANGUAGE_NAMES = {
         "bel": "白俄罗斯语",
         "bem": "本巴语（赞比亚）",
         "ben": "孟加拉语",
-        "berinomo": "布兴话",
         "bho": "博杰普尔语",
         "bik": "比科尔语",
         "bin": "比尼语",
         "bis": "比斯拉马语",
+        "bit": "Berinomo",
         "bla": "西克西卡语",
         "bod": "藏语",
         "bos": "波斯尼亚语",
@@ -7216,6 +7233,7 @@ LANGUAGE_NAMES = {
         "hil": "希利盖农语",
         "hin": "印地语",
         "hit": "赫梯语",
+        "hmj": "亻革家语、重安江苗语",
         "hmn": "苗语",
         "hmo": "希里莫图语",
         "hrv": "克罗地亚语",
@@ -7525,12 +7543,12 @@ LANGUAGE_NAMES = {
         "bel": "白俄羅斯文",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
+        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
         "bin": "Bini",
         "bis": "Bislama",
-        "berinomo": "Bit",
         "zbl": "布利斯符號",
         "bos": "Bosnian",
         "bra": "Braj",
@@ -7600,6 +7618,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgian",
         "deu": "德文",
@@ -8016,6 +8035,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 4c982ee78fe1f7cc8bf5020a8d8bc482f76c9715..cc622abca371fba6a599f6d68db60879d0aa835d 100644
GIT binary patch
delta 23
fcmeyhh3VH8rVY;`I1G&y3@xmTOg6uZ=y3!9e*g)p

delta 23
fcmeyhh3VH8rVY;`I1Ee_3=OPIjW@rG=y3!9e#Qx;

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 3a0407c6f..9feb6d363 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+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"
@@ -75,7 +75,7 @@ msgstr "Uživatel admin"
 msgid "All"
 msgstr "Vše"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
@@ -92,7 +92,7 @@ msgstr "Zobrazit vše"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
@@ -196,283 +196,291 @@ msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Opravdu chcete vypnout?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zakázat"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Povolit"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json není nakonfigurováno pro webové aplikace"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 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:1066
+#: cps/admin.py:1076
 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:1096
+#: cps/admin.py:1106
 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:1102
+#: cps/admin.py:1112
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, 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:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr objektů skupiny LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, 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:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr uživatelských objektů LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 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:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "Databáze není zapisovatelná"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 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:1209
+#: cps/admin.py:1228
 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:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 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:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Chyba: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -484,7 +492,7 @@ msgstr "není nakonfigurováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
@@ -497,8 +505,8 @@ msgstr "Formát knihy úspěšně smazán"
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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ý"
 
@@ -535,7 +543,7 @@ msgstr "Nepodařilo se vytvořit cestu %(path)s (oprávnění odepřeno)."
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
@@ -693,7 +701,7 @@ msgstr "Soubor %(file)s nenalezen na Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
@@ -775,7 +783,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -841,7 +849,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -857,7 +865,7 @@ msgstr "Token vypršel"
 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
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Knihy"
 
@@ -882,7 +890,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Nejlépe hodnocené knihy"
 
@@ -891,7 +899,7 @@ msgid "Show Top Rated Books"
 msgstr "Zobrazit nejlépe hodnocené knihy"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
@@ -900,7 +908,7 @@ msgid "Show read and unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
@@ -918,7 +926,7 @@ msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -928,7 +936,7 @@ msgstr "Zobrazit výběr kategorie"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Série"
 
@@ -946,7 +954,7 @@ msgid "Show author selection"
 msgstr "Zobrazit výběr autora"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Vydavatelé"
 
@@ -956,7 +964,7 @@ msgstr "Zobrazit výběr vydavatele"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -980,7 +988,7 @@ msgstr "Formáty souborů"
 msgid "Show file formats selection"
 msgstr "Zobrazit výběr formátů"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Archivované knihy"
 
@@ -988,7 +996,7 @@ msgstr "Archivované knihy"
 msgid "Show archived books"
 msgstr "Zobrazit archivované knihy"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr ""
 
@@ -1127,177 +1135,177 @@ msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizu
 msgid "No release information available"
 msgstr "Nejsou k dispozici žádné informace o verzi"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Žhavé knihy (Nejstahovanější)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Hledat"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Stáhnutí"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Seznam hodnocení"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, 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:1463
+#: cps/web.py:1454
 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:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, 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:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
@@ -1565,7 +1573,7 @@ msgstr "OK"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -1749,7 +1757,7 @@ msgstr "Získat metadata"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Uložit"
 
@@ -1772,7 +1780,7 @@ msgstr "Načítání..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Zavřít"
 
@@ -2245,35 +2253,35 @@ msgstr "Regulární výraz pro řazení názvů"
 msgid "Default Settings for New Users"
 msgstr "Výchozí nastavení pro nového uživatele"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Uživatel admin"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Povolit stahování"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Povolit prohlížeč knih"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Povolit nahrávání"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Povolit úpravy"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Povolit mazání knih"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Povolit změnu hesla"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Povolit úpravy veřejných polic"
 
@@ -2291,12 +2299,12 @@ msgstr "Zobrazit knihy s jazykem"
 msgid "Default Visibilities for New Users"
 msgstr "Výchozí zobrazení pro nové uživatele"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Zobrazit náhodné knihy v podrobném zobrazení"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Přidat povolené/zakázané štítky"
 
@@ -3081,19 +3089,23 @@ msgstr "Kobo Sync token"
 msgid "Create/View"
 msgstr "Vytvořit/Prohlížet"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Přidat povolené/zakázané hodnoty vlastních sloupců"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Odstranit tohoto uživatele"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Vygenerovat URL pro Kobo Auth"
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 59794715b454b54109df8fd6662a8eca2cc5ee56..f759b6b61fc783ff9c477f2d4a3f9da43a0de007 100644
GIT binary patch
delta 23
fcmaF5i23Ov<_!nRI1G&y3@xmTOg5h=n;QiHcpV9N

delta 23
fcmaF5i23Ov<_!nRI1Ee_3=OPIjW?etn;QiHcjF0i

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 192f10f57..1e5cc1171 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2021-08-01 17:24+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -75,7 +75,7 @@ msgstr "Benutzer bearbeiten"
 msgid "All"
 msgstr "Alle"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
@@ -92,7 +92,7 @@ msgstr "Zeige alle"
 msgid "Malformed request"
 msgstr "Ungültige Anfrage"
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr "Guest Name kann nicht geändert werden"
 
@@ -100,7 +100,7 @@ msgstr "Guest Name kann nicht geändert werden"
 msgid "Guest can't have this role"
 msgstr "Guest Benutzer kann diese Rolle nicht haben"
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
@@ -144,7 +144,7 @@ msgstr "Ungültige Lese Spalte"
 msgid "Invalid Restricted Column"
 msgstr "Ungültiger Spaltenname für Einschränkung"
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
@@ -192,280 +192,288 @@ msgstr "Möchten Sie wirklich die Synchronisation von Bücherregalen für die au
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Ort der Calibre Datenbank editieren?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr "Tag nicht gefunden"
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr "Ungültige Aktion"
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Verbieten"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Erlauben"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json ist nicht für Web Anwendungen konfiguriert"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 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:1066
+#: cps/admin.py:1076
 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:1096
+#: cps/admin.py:1106
 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:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Bitte einen LDAP Service Account und Password eingeben"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr "Bitte einen LDAP Service Account eingeben"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, 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:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gruppen Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, 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:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Benutzer Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, 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:1127
+#: cps/admin.py:1137
 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:1134
+#: cps/admin.py:1144
 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:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 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:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "Datenbank ist nicht schreibbar"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 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:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr "Guest Benutzer kann nicht gelöscht werden"
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 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:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account Verifikation erfolgreich"
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail an %(email)s wurde zum Senden in die Warteschlange eingereiht, für das Ergebnis bitte Aufgaben überprüfen"
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fehler: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} Benutzer erfolgreich importiert"
 
@@ -477,7 +485,7 @@ msgstr "Nicht konfiguriert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, 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"
@@ -490,8 +498,8 @@ msgstr "Buch Format erfolgreich gelöscht"
 msgid "Book Successfully Deleted"
 msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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"
 
@@ -528,7 +536,7 @@ msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
@@ -686,7 +694,7 @@ msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 msgid "Found an existing account for this e-mail address"
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
 
@@ -767,7 +775,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -833,7 +841,7 @@ msgid "{} Stars"
 msgstr "{} Sterne"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Login"
 
@@ -849,7 +857,7 @@ msgstr "Token ist abgelaufen"
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Bücher"
 
@@ -874,7 +882,7 @@ msgstr "Heruntergeladene Bücher"
 msgid "Show Downloaded Books"
 msgstr "Zeige heruntergeladene Bücher"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Best bewertete Bücher"
 
@@ -883,7 +891,7 @@ msgid "Show Top Rated Books"
 msgstr "Bestbewertete Bücher anzeigen"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
@@ -892,7 +900,7 @@ msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
@@ -910,7 +918,7 @@ msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -920,7 +928,7 @@ msgstr "Zeige Kategorienauswahl"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Serien"
 
@@ -938,7 +946,7 @@ msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Verleger"
 
@@ -948,7 +956,7 @@ msgstr "Zeige Verlegerauswahl"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -972,7 +980,7 @@ msgstr "Dateiformate"
 msgid "Show file formats selection"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
@@ -980,7 +988,7 @@ msgstr "Archivierte Bücher"
 msgid "Show archived books"
 msgstr "Zeige archivierte Bücher"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "Bücherliste"
 
@@ -1117,177 +1125,177 @@ msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Ver
 msgid "No release information available"
 msgstr "Keine Releaseinformationen verfügbar"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Entdecke (Zufällige Bücher)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Von %(user)s heruntergeladene Bücher"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Suche"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Bewertungsliste"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, 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:1463
+#: cps/web.py:1454
 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:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 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:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, 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:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
@@ -1554,7 +1562,7 @@ msgstr "OK"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Abbruch"
 
@@ -1738,7 +1746,7 @@ msgstr "Metadaten laden"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Speichern"
 
@@ -1761,7 +1769,7 @@ msgstr "Lade..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Schließen"
 
@@ -2233,35 +2241,35 @@ msgstr "Regulärer Ausdruck für Titelsortierung"
 msgid "Default Settings for New Users"
 msgstr "Standard-Einstellungen für neue Benutzer"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Administrator"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Downloads erlauben"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Anzeige von Büchern erlauben"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Hochladen erlauben"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Bearbeiten erlauben"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Löschen von Büchern erlauben"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Ändern des Passworts erlauben"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Editieren öffentlicher Bücherregale erlauben"
 
@@ -2279,12 +2287,12 @@ msgstr "Zeige nur Bücher mit dieser Sprache"
 msgid "Default Visibilities for New Users"
 msgstr "Standard-Sichtbarkeiten für neue Benutzer"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Zeige zufällige Bücher in der Detailansicht"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Erlaubte/Verbotene Tags hinzufügen"
 
@@ -3061,19 +3069,23 @@ msgstr "Kobo Sync Token"
 msgid "Create/View"
 msgstr "Erzeugen/Ansehen"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Erlaubte/Verbotene Calibre Spalten hinzufügen"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Nur Bücher aus ausgewählten Bücherregalen mit Kobo synchronisieren"
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Kobo Auth URL erzeugen"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 01b37b8c3434e6fec70aad199d7373908e7ec3f2..518edd1fae31ee35734827f48b9890cf14472a4a 100644
GIT binary patch
delta 23
fcmeA@%-nmJdBfy54nt!FLklY-lg+c^J~aUVYCH)2

delta 23
fcmeA@%-nmJdBfy54g(VfLjx;Q<IS_<J~aUVY61xN

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index cd9ee4b61..128053d06 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -75,7 +75,7 @@ msgstr "Χρήστης Διαχειριστής"
 msgid "All"
 msgstr "Όλα"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "Δεν βρέθηκε χρήστης"
 
@@ -92,7 +92,7 @@ msgstr "Προβολή Όλων"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Ενημερώθηκε η διαμόρφωση Calibre-Web"
 
@@ -196,283 +196,291 @@ msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψε
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις κλείσιμο;"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Απόρριψη"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Επιτρέπεται"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json Δεν Έχει Διαμορφωθεί Για Διαδικτυακή Εφαρμογή"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Φύλλο Καταγραφής Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Πρόσβαση Φύλλου Καταγραφης Τοποθεσίας δεν είναι έγκυρη, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Παρακαλούμε Συμπλήρωσε ένα Πάροχο LDAP, Θύρα, DN και Αντικείμενο Αναγνώρισης Χρήστη"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "Η DB δεν μπορεί να Γραφτεί"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "Το E-mail δεν είναι από έγκυρο domain"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Προσθήκη νέου χρήστη"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Επεξεργασία χρήστη %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
 
-#: cps/admin.py:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Προβολέας αρχείου φύλλου καταγραφής"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Αίτημα πακέτου ενημέρωσης"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Κατεβάζει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Ανοίγει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Αντικατάσταση αρχείων"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Σταματάει το διακομιστή"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Η ενημέρωση απέτυχε:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Σφάλμα"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Σφάλμα σύνδεσης"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Γενικό σφάλμα"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Σφάλμα: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -484,7 +492,7 @@ msgstr "δεν διαμορφώθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
@@ -497,8 +505,8 @@ msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
 msgid "Book Successfully Deleted"
 msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -535,7 +543,7 @@ msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η ά
 msgid "Failed to store file %(file)s."
 msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
@@ -693,7 +701,7 @@ msgstr "Το αρχείο %(file)s δεν βρέθηκε στο Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
@@ -775,7 +783,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -841,7 +849,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -857,7 +865,7 @@ msgstr "Η μάρκα έχει λήξει"
 msgid "Success! Please return to your device"
 msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Βιβλία"
 
@@ -882,7 +890,7 @@ msgstr "Κατεβασμένα Βιβλία"
 msgid "Show Downloaded Books"
 msgstr "Προβολή Κατεβασμένων Βιβλίων"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Βιβλία με Κορυφαία Αξιολόγηση"
 
@@ -891,7 +899,7 @@ msgid "Show Top Rated Books"
 msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Βιβλία που Διαβάστηκαν"
 
@@ -900,7 +908,7 @@ msgid "Show read and unread"
 msgstr "Προβολή διαβασμένων και αδιάβαστων"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Βιβλία που δεν Διαβάστηκαν"
 
@@ -918,7 +926,7 @@ msgid "Show Random Books"
 msgstr "Προβολή Τυχαίων Βιβλίων"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -928,7 +936,7 @@ msgstr "Προβολή επιλογών κατηγορίας"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Σειρές"
 
@@ -946,7 +954,7 @@ msgid "Show author selection"
 msgstr "Προβολή επιλογών συγγραφέα"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Εκδότες"
 
@@ -956,7 +964,7 @@ msgstr "Προβολή επιλογών εκδότη"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Γλώσσες"
 
@@ -980,7 +988,7 @@ msgstr "Μορφές αρχείου"
 msgid "Show file formats selection"
 msgstr "Προβολή επιλογών μορφής αρχείου"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Αρχειοθετημένα Βιβλία"
 
@@ -988,7 +996,7 @@ msgstr "Αρχειοθετημένα Βιβλία"
 msgid "Show archived books"
 msgstr "Προβολή αρχειοθετημένων βιβλίων"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "Λίστα Βιβλίων"
 
@@ -1127,177 +1135,177 @@ msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε
 msgid "No release information available"
 msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες αποδέσμευσης"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Κατεβασμένα βιβλία από %(user)s"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Συγγραφέας: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Εκδότης: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Σειρές: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Αξιολόγηση: %(rating)s stars"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Μορφή αρχείου: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Κατηγορία: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Κατεβασμένα"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Λίστα αξιολογήσεων"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
@@ -1565,7 +1573,7 @@ msgstr "OK"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -1749,7 +1757,7 @@ msgstr "Συγκέντρωση Μεταδεδομένων"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -1772,7 +1780,7 @@ msgstr "Φόρτωση..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -2245,35 +2253,35 @@ msgstr "Συνήθης Έκφραση για Ταξινόμηση Τίτλου"
 msgid "Default Settings for New Users"
 msgstr "Προκαθορισμένες Ρυθμίσεις για Νέους Χρήστες"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Χρήστης Διαχειριστής"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Να Επιτρέπεται το Κατέβασμα"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Να Επιτρέπεται η Προβολή eBook Viewer"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Να Επιτρέπεται το Ανέβασμα"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Να Επιτρέπεται η Επεξεργασία"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Να Επιτρέπεται η Διαγραφή Βιβλίων"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Να Επιτρέπεται η Αλλαγή Κωδικού"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Να Επιτρέπεται η Επεξεργασία Δημόσιων Ραφιών"
 
@@ -2291,12 +2299,12 @@ msgstr "Γλώσσα Βιβλίων"
 msgid "Default Visibilities for New Users"
 msgstr "Προκαθορισμένες Ορατότηες για Νέους Χρήστες"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Προβολή Τυχαίων Βιβλίων σε Προβολή Λεπτομερειών"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Προσθήκη ετικετών Επιτρέπεται/Απορρίπτεται"
 
@@ -3081,19 +3089,23 @@ msgstr "Kobo Μονάδα Συγχρονισμού"
 msgid "Create/View"
 msgstr "Δημιουγία/Προβολή"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Προσθήκη Τιμών Ειδικά Προσαρμοσμένης Στήλης επιτρέπεται/Απορρίπτεται"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Διαγραφή Χρήστη"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 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 f3e46184cd697c34543cd4a51c8bab917c062f31..96bf7b4181c5a36badb9ed45c26f2626cdb2dd40 100644
GIT binary patch
delta 23
fcmZpg$lNrMdBf>^4nt!FLklY-lg*d&*GB*VWkU$4

delta 23
fcmZpg$lNrMdBf>^4g(VfLjx;Q<IR`z*GB*VWeEtP

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 549d4dc42..38502ea99 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -79,7 +79,7 @@ msgstr "Editar usuarios"
 msgid "All"
 msgstr "Todo"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
@@ -96,7 +96,7 @@ msgstr "Mostrar todo"
 msgid "Malformed request"
 msgstr "Petición mal formulada"
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr "El nombre de invitado no se puede cambiar"
 
@@ -104,7 +104,7 @@ msgstr "El nombre de invitado no se puede cambiar"
 msgid "Guest can't have this role"
 msgstr "El invitado no puede tener ese rol"
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "No queda ningún usuario administrador, no se puede eliminar al usuario"
 
@@ -148,7 +148,7 @@ msgstr "Columna de lectura no válida"
 msgid "Invalid Restricted Column"
 msgstr "Columna restringida no válida"
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
@@ -200,283 +200,291 @@ msgstr "¿Realmente quieres cambiar el comportamiento de sincronización de esta
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "¿Realmente quieres cambiar la ubicación de la biblioteca Calibre?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr "Etiqueta no encontrada"
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr "Acción no válida"
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Denegar"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 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:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Access Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Por favor, Introduce un proveedor LDAP, puerto, DN y el User Object Identifier"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, introduce una cuenta de servicio LDAP y su contraseña"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr "Por favor, introduce una cuenta de servicio LDAP"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, 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:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, 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:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "El filtro de usuarios LDAP necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "El filtro de LDAP \"Member User\" tiene paréntesis no coincidentes"
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la clave no válidos. Por favor introduce la ruta correcta"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "La base de datos de configuración no es modificable"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de la base de datos no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "La base de datos no es modificable"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Keyfile no es válida, por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de Certfile no es válida, por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Añadir un nuevo usuario"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' eliminado"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr "No puedes borrar al Usuario Invitado"
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede borrar al usuario"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 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:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros de correo"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr "Verificación de cuenta de Gmail exitosa"
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Puesto en cola un correo electrónico de prueba enviado a %(email)s, por favor, comprueba el resultado en Tareas"
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 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:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "La actualización del archivo no pudo guardarse en el directorio temporal (Temp Dir)"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Error: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 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:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} Usuario importado con éxito"
 
@@ -488,7 +496,7 @@ msgstr "no configurado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
@@ -501,8 +509,8 @@ msgstr "Formato de libro eliminado con éxito"
 msgid "Book Successfully Deleted"
 msgstr "Libro eliminado con éxito"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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"
 
@@ -539,7 +547,7 @@ msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
@@ -697,7 +705,7 @@ msgstr "Fichero %(file)s no encontrado en Google Drive"
 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:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
@@ -779,7 +787,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -845,7 +853,7 @@ msgid "{} Stars"
 msgstr "{} Estrellas"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -861,7 +869,7 @@ msgstr "El token ha expirado"
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Libros"
 
@@ -886,7 +894,7 @@ msgstr "Libros Descargados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Libros Descargados"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Libros mejor valorados"
 
@@ -895,7 +903,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Libros leídos"
 
@@ -904,7 +912,7 @@ msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
@@ -922,7 +930,7 @@ msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Categorías"
 
@@ -932,7 +940,7 @@ msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Series"
 
@@ -950,7 +958,7 @@ msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Editores"
 
@@ -960,7 +968,7 @@ msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -984,7 +992,7 @@ msgstr "Formatos de archivo"
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Libros archivados"
 
@@ -992,7 +1000,7 @@ msgstr "Libros archivados"
 msgid "Show archived books"
 msgstr "Mostrar libros archivados"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "Lista de Libros"
 
@@ -1131,177 +1139,177 @@ msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo
 msgid "No release information available"
 msgstr "No hay información del lanzamiento disponible"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Libros descargados por %(user)s"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Descargas"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = $(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, 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:1463
+#: cps/web.py:1454
 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:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 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:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, 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:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 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:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
@@ -1569,7 +1577,7 @@ msgstr "Ok"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1753,7 +1761,7 @@ msgstr "Obtener metadatos"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Guardar"
 
@@ -1776,7 +1784,7 @@ msgstr "Cargando..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Cerrar"
 
@@ -2249,35 +2257,35 @@ msgstr "Expresión regular para ordenar títulos"
 msgid "Default Settings for New Users"
 msgstr "Ajustes por defecto para nuevos usuarios"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Usuario administrador"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Permitir descargas"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Permitir visor de libros"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Permitir subidas de archivos"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Permitir editar"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Permitir borrar libros"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Permitir cambiar la contraseña"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Permitir editar estantes públicos"
 
@@ -2295,12 +2303,12 @@ msgstr "Mostrar libros con idioma"
 msgid "Default Visibilities for New Users"
 msgstr "Visibilidad predeterminada para nuevos usuarios"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Mostrar libros aleatorios en la vista detallada"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Añadir etiquetas Permitidas/Denegados"
 
@@ -3085,19 +3093,23 @@ msgstr "Token de sincronización de Kobo"
 msgid "Create/View"
 msgstr "Crear/Ver"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Añadir columnas de valores propios de Permitidos/Denegados"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Sincronizar con Kobo solo los libros de las estanterías seleccionadas"
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Borrar usuario"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Generar Auth URL de Kobo"
 
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index e0e7ec8b462a9ca5ba87eb80b45ac97d024c1d06..125e29d0142b48e078f44ba6087a37eabb3a7b9a 100644
GIT binary patch
delta 23
fcmZ2>jd9sE#tkL*9EQdUh89*vCYx*QS7`$PYpV!0

delta 23
fcmZ2>jd9sE#tkL*90n!|h6Yxq#+z&GS7`$PYjFrL

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 5d9188731..3b8a62d88 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -76,7 +76,7 @@ msgstr "Pääkäyttäjä"
 msgid "All"
 msgstr "Kaikki"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr "Näytä kaikki"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
@@ -197,280 +197,288 @@ msgstr "Oletko varma, että haluat poistaa hyllyn?"
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Haluatko varmasti pysäyttää Calibre-Webin?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 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:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 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:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -482,7 +490,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -495,8 +503,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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:"
 
@@ -533,7 +541,7 @@ msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -691,7 +699,7 @@ msgstr "Tiedostoa %(file)s ei löytynyt Google Drivesta"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
@@ -773,7 +781,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -839,7 +847,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -855,7 +863,7 @@ msgstr "Valtuutus vanhentunut"
 msgid "Success! Please return to your device"
 msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Kirjat"
 
@@ -880,7 +888,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Parhaiten arvioidut kirjat"
 
@@ -889,7 +897,7 @@ msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
@@ -898,7 +906,7 @@ msgid "Show read and unread"
 msgstr "Näytä luetut ja lukemattomat"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
@@ -916,7 +924,7 @@ msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Kategoriat"
 
@@ -926,7 +934,7 @@ msgstr "Näytä kategoriavalinta"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Sarjat"
 
@@ -944,7 +952,7 @@ msgid "Show author selection"
 msgstr "Näytä kirjailijavalinta"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Julkaisijat"
 
@@ -954,7 +962,7 @@ msgstr "Näytä julkaisijavalinta"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Kielet"
 
@@ -978,7 +986,7 @@ msgstr "Tiedotomuodot"
 msgid "Show file formats selection"
 msgstr "Näytä tiedostomuotovalinta"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr ""
 
@@ -986,7 +994,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr ""
 
@@ -1125,177 +1133,177 @@ msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi ve
 msgid "No release information available"
 msgstr "Ei päivitystietoa saatavilla"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Hae"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Arvostelulistaus"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, 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:1463
+#: cps/web.py:1454
 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:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
@@ -1563,7 +1571,7 @@ msgstr "Ok"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
@@ -1747,7 +1755,7 @@ msgstr "Hae metadata"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
@@ -1770,7 +1778,7 @@ msgstr "Ladataan..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Sulje"
 
@@ -2242,35 +2250,35 @@ msgstr "Regular expression nimikkeiden järjestämiseen"
 msgid "Default Settings for New Users"
 msgstr "Uuden käyttäjän oletusasetukset"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Pääkäyttäjä"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Salli kirjojen lataukset"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Salli kirjojen luku"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Salli lisäykset"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Salli muutokset"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Salli sananan vaihto"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Salli julkisten hyllyjen editointi"
 
@@ -2288,12 +2296,12 @@ msgstr "Näytä kirjat kielellä"
 msgid "Default Visibilities for New Users"
 msgstr "Oletusnäkymä uusille käyttäjille"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Näytä satunnaisia kirjoja näkymässä"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
@@ -3077,19 +3085,23 @@ msgstr ""
 msgid "Create/View"
 msgstr ""
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Poista tämä käyttäjä"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 7992b4fece30cdaf74768aa8eb8a3e977959348b..0ced8f515a5e41936799b11324fbf4eac27b158b 100644
GIT binary patch
delta 23
ecmZ3wn0e`9<_-1v9EQdUh89*vCY#&y<&pqq{s;2_

delta 23
ecmZ3wn0e`9<_-1v90n!|h6Yxq#+%#o<&pqq#0TvF

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 36b452996..2bc19e29e 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -91,7 +91,7 @@ msgstr "Utilisateur admin"
 msgid "All"
 msgstr "Tout"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
@@ -108,7 +108,7 @@ msgstr "Montrer tout"
 msgid "Malformed request"
 msgstr "Demande malformée"
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr "Le nom de l’invité ne peut pas être modifié"
 
@@ -116,7 +116,7 @@ msgstr "Le nom de l’invité ne peut pas être modifié"
 msgid "Guest can't have this role"
 msgstr "L’invité ne peut pas avoir ce rôle"
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer le rôle admin"
 
@@ -160,7 +160,7 @@ msgstr "Colonne de lecture non valide"
 msgid "Invalid Restricted Column"
 msgstr "Colonne restreinte non valide"
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
@@ -212,283 +212,291 @@ msgstr "Voulez-vous vraiment supprimer l’étagère?"
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Voulez-vous vraiment arrêter Calibre-Web ?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr "Étiquette introuvable"
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr "Action invalide"
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Refuser"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Autoriser"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 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:1060
+#: cps/admin.py:1070
 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:1066
+#: cps/admin.py:1076
 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:1096
+#: cps/admin.py:1106
 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:1102
+#: cps/admin.py:1112
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr "Veuillez entrer un compte de service LDAP"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, 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:1112
+#: cps/admin.py:1122
 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:1116
+#: cps/admin.py:1126
 #, 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:1118
+#: cps/admin.py:1128
 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:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre utilisateur des membres LDAP doit avoir un identificateur de format \"%s\\ »"
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Le filtre utilisateur de membre LDAP a des parenthèses non appariées"
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuillez entrer le chemin correct"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Les paramètres de la base de données ne sont pas accessibles en écriture"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement de la base de données est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "La base de données n'est pas accessible en écriture"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 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:1209
+#: cps/admin.py:1228
 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:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr "Impossible de supprimer l’utilisateur Invité"
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr "La vérification du compte Gmail réussie"
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Teste les courriels en file d’attente pour l’envoi à %(email)s, veuillez vérifier le résultat des tâches"
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, 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:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 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:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erreur : %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 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:1821
+#: cps/admin.py:1840
 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:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} utilisateur importé avec succès"
 
@@ -500,7 +508,7 @@ msgstr "non configuré"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, 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"
@@ -513,8 +521,8 @@ msgstr "Le format du livre a été supprimé avec succès"
 msgid "Book Successfully Deleted"
 msgstr "Le livre a été supprimé avec succès"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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"
 
@@ -551,7 +559,7 @@ msgstr "Impossible de créer le chemin %(path)s (Permission refusée)."
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
@@ -709,7 +717,7 @@ msgstr "Le fichier %(file)s n'a pas été trouvé dans Google Drive"
 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:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
@@ -791,7 +799,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -857,7 +865,7 @@ msgid "{} Stars"
 msgstr "{} Étoiles"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Connexion"
 
@@ -873,7 +881,7 @@ msgstr "Jeton expiré"
 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
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Livres"
 
@@ -898,7 +906,7 @@ msgstr "Livres téléchargés"
 msgid "Show Downloaded Books"
 msgstr "Montrer les livres téléchargés"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Livres les mieux notés"
 
@@ -907,7 +915,7 @@ msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Livres lus"
 
@@ -916,7 +924,7 @@ msgid "Show read and unread"
 msgstr "Montrer lus et non-lus"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
@@ -934,7 +942,7 @@ msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Catégories"
 
@@ -944,7 +952,7 @@ msgstr "Montrer la sélection par catégories"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Séries"
 
@@ -962,7 +970,7 @@ msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Éditeurs"
 
@@ -972,7 +980,7 @@ msgstr "Montrer la sélection par éditeur"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Langues"
 
@@ -996,7 +1004,7 @@ msgstr "Formats de fichier"
 msgid "Show file formats selection"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Livres archivés"
 
@@ -1004,7 +1012,7 @@ msgstr "Livres archivés"
 msgid "Show archived books"
 msgstr "Afficher les livres archivés"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "Liste des livres"
 
@@ -1143,177 +1151,177 @@ msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-desso
 msgid "No release information available"
 msgstr "Aucune information concernant cette version n’est disponible"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Découvrir (Livres au hasard)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livres téléchargés par %(user)s"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur : %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Éditeur : '%(name)s'"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Liste des évaluations"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de lecture = %(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, 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:1463
+#: cps/web.py:1454
 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:1480
+#: cps/web.py:1471
 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/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, 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:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 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:1577
+#: cps/web.py:1565
 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:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
@@ -1581,7 +1589,7 @@ msgstr "OK"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1765,7 +1773,7 @@ msgstr "Obtenir les métadonnées"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -1788,7 +1796,7 @@ msgstr "Chargement..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Fermer"
 
@@ -2261,35 +2269,35 @@ msgstr "Expression régulière à utiliser pour trier les titres"
 msgid "Default Settings for New Users"
 msgstr "Réglages par défaut pour les nouveaux utilisateurs"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Utilisateur admin"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Permettre les téléchargements"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Autoriser le visionneur de livres"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Permettre le téléversement de fichiers"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Permettre l'édition"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Permettre la suppression de livres"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Permettre le changement de mot de passe"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Autoriser la modification d’étagères publiques"
 
@@ -2307,12 +2315,12 @@ msgstr "Montrer les livres dans la langue"
 msgid "Default Visibilities for New Users"
 msgstr "Mode de visualisation par défaut pour les nouveaux utilisateurs"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Montrer aléatoirement des livres dans la vue détaillée"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Ajouter les étiquettes autorisées/refusées"
 
@@ -3097,19 +3105,23 @@ msgstr "Jeton de synchro Kobo"
 msgid "Create/View"
 msgstr "Créer/visualiser"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Ajouter les valeurs de colonnes personnalisées autorisées/refusées"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Synchroniser uniquement les livres dans les étagères sélectionnées avec Kobo"
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Supprimer l'utilisateur"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Générer l'URL d'authentification Kobo"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index dbec4a92aacf60d8516b3eb2a286f5755078bae1..cdd39363153a4cc154e31131f185583c09310fd2 100644
GIT binary patch
delta 23
fcmca}gz?T1#tj?HI1G&y3@xmTOg8T@TcQmBb=?Tw

delta 23
fcmca}gz?T1#tj?HI1Ee_3=OPIjW_QwTcQmBb)yK_

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 6343df50d..f7ef53934 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -76,7 +76,7 @@ msgstr "Rendszergazda felhasználó"
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr "Mindent mutass"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
@@ -197,280 +197,288 @@ msgstr "Valóban törölni akarod a polcot?"
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 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:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, 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:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 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:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 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:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -482,7 +490,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -495,8 +503,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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:"
 
@@ -533,7 +541,7 @@ msgstr "Nem sikerült létrehozni az elérési utat (engedély megtagadva): %(pa
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -691,7 +699,7 @@ msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
 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:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
@@ -773,7 +781,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -839,7 +847,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Belépés"
 
@@ -855,7 +863,7 @@ msgstr "A token érvényessége lejárt."
 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
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr ""
 
@@ -880,7 +888,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Legjobb könyvek"
 
@@ -889,7 +897,7 @@ msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
@@ -898,7 +906,7 @@ msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
@@ -916,7 +924,7 @@ msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Címkék"
 
@@ -926,7 +934,7 @@ msgstr "Címke választó mutatása"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Sorozatok"
 
@@ -944,7 +952,7 @@ msgid "Show author selection"
 msgstr "Szerző választó mutatása"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Kiadók"
 
@@ -954,7 +962,7 @@ msgstr "Kiadó választó mutatása"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -978,7 +986,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr ""
 
@@ -986,7 +994,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr ""
 
@@ -1125,177 +1133,177 @@ msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez
 msgid "No release information available"
 msgstr "Nincs információ a kiadásról."
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Keresés"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Letöltések"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, 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:1463
+#: cps/web.py:1454
 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:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 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:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
@@ -1563,7 +1571,7 @@ msgstr "OK"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
@@ -1747,7 +1755,7 @@ msgstr "Metaadatok beszerzése"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
@@ -1770,7 +1778,7 @@ msgstr "Betöltés..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Bezárás"
 
@@ -2242,35 +2250,35 @@ msgstr "Reguláris kifejezés címek sorbarendezéséhez"
 msgid "Default Settings for New Users"
 msgstr "Új felhasználók alapértelmezett beállításai"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Rendszergazda felhasználó"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Letöltés engedélyezése"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Feltöltés engedélyezése"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Szerkesztés engedélyezése"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Jelszó változtatásának engedélyezése"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Nyilvános polcok szerkesztésének engedélyezése"
 
@@ -2288,12 +2296,12 @@ msgstr "Mutasd a könyveket a következő nyelvvel"
 msgid "Default Visibilities for New Users"
 msgstr "Új felhasználók alapértelmezett látható elemei"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Mutasson könyveket találomra a részletes nézetben"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
@@ -3073,19 +3081,23 @@ msgstr ""
 msgid "Create/View"
 msgstr ""
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "A felhasználó törlése"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 83bc12dc196acdc03c2c516d990a97fce95dcb3f..68ca1b3d7762613704e105265326caf1da2a5517 100644
GIT binary patch
delta 23
fcmaF8o%!{4<_$g-9EQdUh89*vCYwVlrY8dcbBzei

delta 23
fcmaF8o%!{4<_$g-90n!|h6Yxq#+ySbrY8dcb5jV%

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 15bd2a433..34a665bdd 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -74,7 +74,7 @@ msgstr "Modifica gli utenti"
 msgid "All"
 msgstr "Tutti"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "Utente non trovato"
 
@@ -91,7 +91,7 @@ msgstr "tutte le lingue presenti"
 msgid "Malformed request"
 msgstr "Richiesta non formulata correttamente"
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 
@@ -99,7 +99,7 @@ msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 msgid "Guest can't have this role"
 msgstr "L'utente Guest (ospite) non può avere questo ruolo"
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso rimuovere il ruolo di amministratore"
 
@@ -143,7 +143,7 @@ msgstr "Colonna di lettura non valida"
 msgid "Invalid Restricted Column"
 msgstr "Colonna con restrizioni non valida"
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
@@ -192,277 +192,285 @@ msgstr "Sei sicuro di voler modificare il comportamento di sincronizzazione dell
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Sei sicuro di voler modificare la posizione della libreria di Calibre?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr "Etichetta non trovata"
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr "Azione non valida"
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Nega"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permetti"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json non è configurato per Web Application"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 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:1066
+#: cps/admin.py:1076
 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:1096
+#: cps/admin.py:1106
 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:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Per favore digita nome di utente e password del servizio LDAP"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr "Per favore indica un account di servizio LDAP"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, 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:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, 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:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, 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:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 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:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "I parametri del DB non sono scrivibili"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 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:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "Il DB non è scrivibile"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 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:1209
+#: cps/admin.py:1228
 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:1316
+#: cps/admin.py:1335
 msgid "Database Settings updated"
 msgstr "Configurazione del Database aggiornata"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "L'utente '%(user)s' è stato creato"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "L'utente '%(nick)s' è stato eliminato"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr "Non posso eliminare l'utente Guest (ospite)"
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Modifica le impostazioni del server e-mail"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr "L'account Gmail è stato verificato con successo"
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "L'e-mail di test è stato accodato con successo per essere spedito a  %(email)s, per favore verifica tramite il pulsante 'Compito' il risultato"
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 msgid "Update file could not be saved in temp dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr "Durante l'aggiornamento non è stato possibile sostituire alcuni file"
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr "Fallita l'estrazione di almeno un utente LDAP"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Fallita la creazione di almeno un utente LDAP"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Errore: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Almeno un utente LDAP non è stato trovato nel database"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} utente importato con successo"
 
@@ -474,7 +482,7 @@ msgstr "non configurato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, 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"
@@ -487,8 +495,8 @@ msgstr "Il formato del libro è stato eliminato con successo"
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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"
 
@@ -525,7 +533,7 @@ msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
@@ -683,7 +691,7 @@ msgstr "File %(file)s non trovato su Google Drive"
 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:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 msgid "Found an existing account for this e-mail address"
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
@@ -764,7 +772,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -830,7 +838,7 @@ msgid "{} Stars"
 msgstr "{} Stelle"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Accesso"
 
@@ -846,7 +854,7 @@ msgstr "Il token è scaduto"
 msgid "Success! Please return to your device"
 msgstr "Riuscito! Torna al tuo dispositivo"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Libri"
 
@@ -871,7 +879,7 @@ msgstr "Libri scaricati"
 msgid "Show Downloaded Books"
 msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Libri meglio valutati"
 
@@ -880,7 +888,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Libri letti"
 
@@ -889,7 +897,7 @@ msgid "Show read and unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Libri non letti"
 
@@ -907,7 +915,7 @@ msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Categorie"
 
@@ -917,7 +925,7 @@ msgstr "Mostra l'opzione per la selezione delle categorie"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Serie"
 
@@ -935,7 +943,7 @@ msgid "Show author selection"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Editori"
 
@@ -945,7 +953,7 @@ msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Lingue"
 
@@ -969,7 +977,7 @@ msgstr "Formati file"
 msgid "Show file formats selection"
 msgstr "Mostra l'opzione per la selezione del formato dei file"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
@@ -977,7 +985,7 @@ msgstr "Libri archiviati"
 msgid "Show archived books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "Elenco libri"
 
@@ -1115,177 +1123,177 @@ msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per agg
 msgid "No release information available"
 msgstr "Non sono disponibili informazioni sulla versione"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "I libri scaricati da %(user)s"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Cerca"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Elenco delle valutazioni"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Stato di lettura = %(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 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:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
@@ -1552,7 +1560,7 @@ msgstr "Ok"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1736,7 +1744,7 @@ msgstr "Ottieni metadati"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Salva"
 
@@ -1758,7 +1766,7 @@ msgstr "Caricamento in corso..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Chiudi"
 
@@ -2229,35 +2237,35 @@ msgstr "Espressione regolare per ordinare la visualizzazione dei titoli"
 msgid "Default Settings for New Users"
 msgstr "Impostazioni predefinite per i nuovi utenti"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Utente amministratore"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Permetti il download"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Permetti l'utilizzo del visualizzatore di libri"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Permetti l'upload"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Permetti la modifica"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Permetti l'eliminazione di libri"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Permetti la modifica della password"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Permetti la modifica degli scaffali pubblici"
 
@@ -2273,12 +2281,12 @@ msgstr "Lingua predefinita di presentazione dei libri"
 msgid "Default Visibilities for New Users"
 msgstr "Visibilità predefinita per i nuovi utenti"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Mostra libri scelti aleatoriamente nella vista dettagliata"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Aggiungi categorie permesse/negate"
 
@@ -3055,19 +3063,23 @@ msgstr "Token Kobo Sync"
 msgid "Create/View"
 msgstr "Crea/Visualizza"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Aggiungi valori personali permessi/negati nelle colonne"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Sincronizza con Kobo unicamene i libri negli scaffali selezionati"
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Elimina utente"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Genera un URL di autenticazione per Kobo"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index b06a320d21d524773715ee55fa6b37f71a91ff5e..b7bf903c62469732d606d746b53f9a532c2548bd 100644
GIT binary patch
delta 23
ecmZpk&DcDfaYLCFhoP~8p@o%^$>usOR%HNLvj(RC

delta 23
ecmZpk&DcDfaYLCFhk=QLp@EgD@#Z=$R%HNLc?O{X

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index db9458ffd..a87d165ec 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
@@ -192,280 +192,288 @@ msgstr ""
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "機能設定"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP設定を変更"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -477,7 +485,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -490,8 +498,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -528,7 +536,7 @@ msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -686,7 +694,7 @@ msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "このメールアドレスで登録されたアカウントがあります"
@@ -768,7 +776,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -834,7 +842,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "ログイン"
 
@@ -850,7 +858,7 @@ msgstr "トークンが無効です"
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr ""
 
@@ -875,7 +883,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr ""
 
@@ -884,7 +892,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "読んだ本"
 
@@ -893,7 +901,7 @@ msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "未読の本"
 
@@ -911,7 +919,7 @@ msgid "Show Random Books"
 msgstr "ランダムで本を表示"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -921,7 +929,7 @@ msgstr "カテゴリ選択を表示"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "シリーズ"
 
@@ -939,7 +947,7 @@ msgid "Show author selection"
 msgstr "著者選択を表示"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "出版社"
 
@@ -949,7 +957,7 @@ msgstr "出版社選択を表示"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "言語"
 
@@ -973,7 +981,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr ""
 
@@ -981,7 +989,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr ""
 
@@ -1120,177 +1128,177 @@ msgstr "アップデートが利用可能です。下のボタンをクリック
 msgid "No release information available"
 msgstr "リリース情報がありません"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムで表示)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "詳細検索"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "検索"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
@@ -1558,7 +1566,7 @@ msgstr ""
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
@@ -1742,7 +1750,7 @@ msgstr ""
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
@@ -1765,7 +1773,7 @@ msgstr "読み込み中..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "閉じる"
 
@@ -2237,35 +2245,35 @@ msgstr ""
 msgid "Default Settings for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "ダウンロードを許可"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "アップロードを許可"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "編集を許可"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "パスワード変更を許可"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "みんなの本棚の編集を許可"
 
@@ -2282,12 +2290,12 @@ msgstr ""
 msgid "Default Visibilities for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
@@ -3067,19 +3075,23 @@ msgstr ""
 msgid "Create/View"
 msgstr ""
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index b5af5537715f8d298363de2cee539899c4606272..b522e0256ff8c1bade3c1a55b8cae94d9862a2f4 100644
GIT binary patch
delta 23
fcmaE~pYhRt#tjEmI1G&y3@xmTOg5iXk+cQ?bsPv|

delta 23
fcmaE~pYhRt#tjEmI1Ee_3=OPIjW?fEk+cQ?bm9nI

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 365a89f75..e8230fb72 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -77,7 +77,7 @@ msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgstr "បង្ហាញទាំងអស់"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -198,279 +198,287 @@ msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះ
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -482,7 +490,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -495,8 +503,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -533,7 +541,7 @@ msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុ
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -691,7 +699,7 @@ msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -772,7 +780,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -838,7 +846,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -854,7 +862,7 @@ msgstr "វត្ថុតាងហួសពេលកំណត់"
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr ""
 
@@ -879,7 +887,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
@@ -888,7 +896,7 @@ msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
@@ -897,7 +905,7 @@ msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
@@ -915,7 +923,7 @@ msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
@@ -925,7 +933,7 @@ msgstr "បង្ហាញជម្រើសប្រភេទ"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "ស៊េរី"
 
@@ -943,7 +951,7 @@ msgid "Show author selection"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "ភាសានានា"
 
@@ -977,7 +985,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr ""
 
@@ -985,7 +993,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr ""
 
@@ -1124,177 +1132,177 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "ឯកសារ DLS"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
@@ -1562,7 +1570,7 @@ msgstr "បាទ/ចាស"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
@@ -1746,7 +1754,7 @@ msgstr "មើលទិន្នន័យមេតា"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
@@ -1769,7 +1777,7 @@ msgstr "កំពុងដំណើរការ..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "បិទ"
 
@@ -2240,35 +2248,35 @@ msgstr "Regular expression ដើម្បីរៀបចំណងជើងត
 msgid "Default Settings for New Users"
 msgstr "ការកំណត់មកស្រាប់សម្រាប់អ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "អនុញ្ញាតឲទាញយក"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "អនុញ្ញាតឲអាប់ឡូត"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "អនុញ្ញាតឲកែប្រែ"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "អនុញ្ញាតឲលុបសៀវភៅ"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "អនុញ្ញាតឲប្តូរលេខសម្ងាត់"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "អនុញ្ញាតឲកែប្រែធ្នើសាធារណៈ"
 
@@ -2286,12 +2294,12 @@ msgstr "បង្ហាញសៀវភៅដែលមានភាសា"
 msgid "Default Visibilities for New Users"
 msgstr "ភាពមើលឃើញដែលមកស្រាប់សម្រាប់អ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "បង្ហាញសៀវភៅចៃដន្យក្នុងការបង្ហាញជាពិស្តារ"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
@@ -3071,19 +3079,23 @@ msgstr ""
 msgid "Create/View"
 msgstr ""
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "លុបអ្នកប្រើប្រាស់នេះ"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index f28ef909238595059682a535b7aa3c3d88217c81..baf53fa733c1c682f4ddbac5ca1269ec3e277f16 100644
GIT binary patch
delta 23
ecmX@u#eA@fdBf8}4nt!FLklY-lg)1nLxKTtDhTiZ

delta 23
ecmX@u#eA@fdBf8}4g(VfLjx;Q<IQgiLxKTs@CfPv

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 7cc832e68..87349f156 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -77,7 +77,7 @@ msgstr "Systeembeheerder"
 msgid "All"
 msgstr "Alles"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
@@ -94,7 +94,7 @@ msgstr "Alle talen"
 msgid "Malformed request"
 msgstr "Misvormd verzoek"
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr "Gast naam kan niet worden veranderd"
 
@@ -102,7 +102,7 @@ msgstr "Gast naam kan niet worden veranderd"
 msgid "Guest can't have this role"
 msgstr "Gast kan deze rol niet hebben"
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
@@ -146,7 +146,7 @@ msgstr "Ongeldige gelezen kolom"
 msgid "Invalid Restricted Column"
 msgstr "Ongeldige beperkte kolom"
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
@@ -198,282 +198,290 @@ msgstr "Weet je zeker dat je de synchronisatiegedrag van boekenplanken voor de g
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Weet je zeker dat je de locatie van de Calibre-bibliotheek wil veranderen?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr "Tag niet gevonden"
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr "Ongeldige actie"
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Weigeren"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Toestaan"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json is niet geconfigureerd voor webapplicatie"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 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:1066
+#: cps/admin.py:1076
 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:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Voer alsjeblieft een LDAP Provider, Port, DN en User Object Identifier in"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Voer een geldig LDAP Service Account en wachtwoord in"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr "Voer een LDAP Service Account in"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Groep Object Filter Moet Een \"%s\" Formaat Identificiatie hebben"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Groep Object Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Gebruiker Object Filter moet \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Lid Gebruiker Filter moet een \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Lid Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsjeblieft een geldig pad in."
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "DB-instellingen niet opgeslagen"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Database niet gevonden, voer de juiste locatie in"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "Kan niet schrijven naar database"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-sleutellocatie is niet geldig, voer een geldig pad in"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-certificaatlocatie is niet geldig, voer een geldig pad in"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr "Kan Gast gebruiker niet verwijderen"
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account succesvol geverifieerd"
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail wordt verzonden naar %(email)s, controleer de taken voor het resultaat"
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mislukt om minstens een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Het is niet gelukt tenminste een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fout: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fout: No user returned in response of LDAP server"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minstens een LDAP Gebruiker is niet gevonden in de Database"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} Gebruiker succesvol geïmporteerd"
 
@@ -485,7 +493,7 @@ msgstr "niet geconfigureerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
@@ -498,8 +506,8 @@ msgstr "Het boekformaat is verwijderd"
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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"
 
@@ -536,7 +544,7 @@ msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
@@ -694,7 +702,7 @@ msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
@@ -776,7 +784,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -842,7 +850,7 @@ msgid "{} Stars"
 msgstr "{} sterren"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Inloggen"
 
@@ -858,7 +866,7 @@ msgstr "Toegangssleutel is verlopen"
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Boeken"
 
@@ -883,7 +891,7 @@ msgstr "Gedownloade boeken"
 msgid "Show Downloaded Books"
 msgstr "Gedownloade boeken tonen"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
@@ -892,7 +900,7 @@ msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
@@ -901,7 +909,7 @@ msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
@@ -919,7 +927,7 @@ msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -929,7 +937,7 @@ msgstr "Categoriekeuze tonen"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Boekenreeksen"
 
@@ -947,7 +955,7 @@ msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Uitgevers"
 
@@ -957,7 +965,7 @@ msgstr "Uitgeverskeuze tonen"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Talen"
 
@@ -981,7 +989,7 @@ msgstr "Bestandsformaten"
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
@@ -989,7 +997,7 @@ msgstr "Gearchiveerde boeken"
 msgid "Show archived books"
 msgstr "Gearchiveerde boeken tonen"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "Boekenlijst"
 
@@ -1128,177 +1136,177 @@ msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten na
 msgid "No release information available"
 msgstr "Geen update-informatie beschikbaar"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Gedownloade boeken door %(user)s"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lees Status = %(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, 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:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 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:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
@@ -1566,7 +1574,7 @@ msgstr "Oké"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -1750,7 +1758,7 @@ msgstr "Metagegevens ophalen"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Opslaan"
 
@@ -1773,7 +1781,7 @@ msgstr "Bezig met laden..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Sluiten"
 
@@ -2246,35 +2254,35 @@ msgstr "Reguliere expressie voor het sorteren op titel"
 msgid "Default Settings for New Users"
 msgstr "Standaardinstellingen voor nieuwe gebruikers"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Systeembeheerder"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Downloads toestaan"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Boeken lezen toestaan"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Uploads toestaan"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Bewerken toestaan"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Verwijderen van boeken toestaan"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Wachtwoord wijzigen toestaan"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Bewerken van openbare boekenplanken toestaan"
 
@@ -2292,12 +2300,12 @@ msgstr "Taal van boeken"
 msgid "Default Visibilities for New Users"
 msgstr "Standaard zichtbaar voor nieuwe gebruikers"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Willekeurige boeken tonen in gedetailleerde weergave"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Voeg toegestane/geweigerde tags toe"
 
@@ -3082,19 +3090,23 @@ msgstr "Kobo Sync Token"
 msgid "Create/View"
 msgstr "Aanmaken/Bekijken"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Voeg toegestane/geweigerde aangepaste kolomwaarden toe"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Synchroniseer alleen boeken op geselecteerde boekenplanken met Kobo"
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Gebruiker verwijderen"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Genereer Kobo Auth URL"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 641be5ae3a745cc1b56cd400a9c7d64e1cd7d698..623ed0b3d0328cd63529b028a3c3e982deb3b33e 100644
GIT binary patch
delta 23
fcmdlxlX>q<<_&X-I1G&y3@xmTOg1kml8gcXYt#rr

delta 23
fcmdlxlX>q<<_&X-I1Ee_3=OPIjW;hTl8gcXYnli=

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 781fe840f..f7a0ed6b6 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -78,7 +78,7 @@ msgstr "Edytuj użytkowników"
 msgid "All"
 msgstr "Wszystko"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
@@ -95,7 +95,7 @@ msgstr "Pokaż wszystkie"
 msgid "Malformed request"
 msgstr "Nieprawidłowo sformułowane żądanie"
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr "Nazwa gościa nie może być zmieniona"
 
@@ -103,7 +103,7 @@ msgstr "Nazwa gościa nie może być zmieniona"
 msgid "Guest can't have this role"
 msgstr "Gość nie może pełnić tej roli"
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 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"
 
@@ -149,7 +149,7 @@ msgstr "Nieprawidłowa kolumna odczytu"
 msgid "Invalid Restricted Column"
 msgstr "Nieprawidłowa kolumna z ograniczeniami"
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
@@ -197,284 +197,292 @@ msgstr "Czy na pewno chcesz zmienić zachowanie synchronizacji półek dla wybra
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Czy na pewno chcesz zmienić lokalizację biblioteki Calibre?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 #, fuzzy
 msgid "Tag not found"
 msgstr "Nie znaleziono znacznika"
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr "Nieprawidłowe działanie"
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zabroń"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Zezwalaj"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json nie został skonfigurowany dla aplikacji webowej"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 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:1096
+#: cps/admin.py:1106
 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:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Proszę wprowadzić konto i hasło usługi LDAP"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr "Proszę wprowadzić konto usługi LDAP"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, 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:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów grupy LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, 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:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów użytkownika LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr użytkownika członka LDAP musi mieć jedno \"%s\" identyfikator formatu"
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtr użytkownika członka LDAP ma niedopasowane nawiasy"
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie jest prawidłowa, Proszę wprowadzić poprawną ścieżkę"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Ustawienia Bazy Danych nie są zapisywalne"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "Baza danych nie jest zapisywalna"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 #, fuzzy
 msgid "Can't delete Guest User"
 msgstr "Nie można usunąć użytkownika gościa"
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 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:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, fuzzy, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testowy e-mail czeka w kolejce do wysłania do %(email)s, sprawdź zadania, aby uzyskać wynik"
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
 # ???
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Błąd: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 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:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} Użytkownik pomyślnie zaimportowany"
 
@@ -486,7 +494,7 @@ msgstr "nie skonfigurowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, 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"
@@ -499,8 +507,8 @@ msgstr "Plik książki w wybranym formacie został usunięty"
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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"
 
@@ -537,7 +545,7 @@ msgstr "Nie udało się utworzyć łącza %(path)s (Odmowa dostępu)."
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
@@ -697,7 +705,7 @@ msgstr "Nie znaleziono pliku %(file)s na Google Drive"
 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:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 msgid "Found an existing account for this e-mail address"
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
@@ -779,7 +787,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -845,7 +853,7 @@ msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -861,7 +869,7 @@ msgstr "Token wygasł"
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Książki"
 
@@ -886,7 +894,7 @@ msgstr "Pobrane książki"
 msgid "Show Downloaded Books"
 msgstr "Pokaż pobrane książki"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Najwyżej ocenione"
 
@@ -895,7 +903,7 @@ msgid "Show Top Rated Books"
 msgstr "Pokaż menu najwyżej ocenionych książek"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Przeczytane"
 
@@ -904,7 +912,7 @@ msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Nieprzeczytane"
 
@@ -922,7 +930,7 @@ msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -932,7 +940,7 @@ msgstr "Pokaż menu wyboru kategorii"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Cykle"
 
@@ -950,7 +958,7 @@ msgid "Show author selection"
 msgstr "Pokaż menu wyboru autora"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Wydawcy"
 
@@ -960,7 +968,7 @@ msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Języki"
 
@@ -984,7 +992,7 @@ msgstr "Formaty plików"
 msgid "Show file formats selection"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
@@ -992,7 +1000,7 @@ msgstr "Zarchiwizowane książki"
 msgid "Show archived books"
 msgstr "Pokaż zarchiwizowane książki"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "Lista książek"
 
@@ -1131,178 +1139,178 @@ msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktual
 msgid "No release information available"
 msgstr "Brak dostępnych informacji o wersji"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Książki pobrane przez %(user)s"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Szukaj"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Zadania"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status przeczytania = %(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 #, fuzzy
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, 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:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 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:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, 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:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 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:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
@@ -1572,7 +1580,7 @@ msgstr "OK"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1757,7 +1765,7 @@ msgstr "Uzyskaj metadane"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Zapisz"
 
@@ -1780,7 +1788,7 @@ msgstr "Ładowanie..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Zamknij"
 
@@ -2258,35 +2266,35 @@ msgstr "Wyrażenie regularne dla tytułu sortującego"
 msgid "Default Settings for New Users"
 msgstr "Domyślne ustawienia dla nowych użytkowników"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Użytkownik z uprawnieniami administratora"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Zezwalaj na pobieranie"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Zezwalaj na przeglądanie e-booków"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Zezwalaj na wysyłanie"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Zezwalaj na edycję"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Zezwalaj na usuwanie książek"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Zezwalaj na zmianę hasła"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Zezwalaj na edycję półek publicznych"
 
@@ -2304,12 +2312,12 @@ msgstr "Pokaż książki w języku"
 msgid "Default Visibilities for New Users"
 msgstr "Domyślne ustawienia widoku dla nowych użytkowników"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Pokaz losowe książki w widoku szczegółowym"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Dodaj dozwolone/zabronione etykiety"
 
@@ -3098,19 +3106,23 @@ msgstr "Token Kobo Sync"
 msgid "Create/View"
 msgstr "Utwórz/Przeglądaj"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Dodaj dozwolone/zabronione wartości własnych kolumn"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "Synchronizuj z Kobo tylko książki z wybranych półek"
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Usuń tego użytkownika"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Generuj Kobo Auth URL"
 
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 38214e1ff7eaddbfcb66c2ee7f9309b6163d07b7..03f6e627052f30bc8ec628f658219b7df052f7bb 100644
GIT binary patch
delta 23
fcmccgj_J}nrVTY|9EQdUh89*vCYxK*&IJGfdf5qQ

delta 23
fcmccgj_J}nrVTY|90n!|h6Yxq#+zHx&IJGfdY=hl

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 516ad4d60..7227376ec 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -73,7 +73,7 @@ msgstr "Usuário Admin"
 msgid "All"
 msgstr "Todos"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "Usuário não encontrado"
 
@@ -91,7 +91,7 @@ msgstr "Mostrar tudo"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nenhum usuário administrador restante, não pode remover a função de administrador"
 
@@ -143,7 +143,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Configuração do Calibre-Web atualizada"
 
@@ -195,283 +195,291 @@ msgstr "Tem certeza que quer apagar essa estante?"
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Tens a certeza que queres fechar?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Negar"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permita"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json não está configurado para aplicativo da web"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log não é válida, digite o caminho correto"
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log de acesso não é válida, digite o caminho correto"
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Digite um provedor LDAP, porta, DN e identificador de objeto do usuário"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de grupo LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de grupo LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de usuário LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de usuário LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de usuário membro do LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtro de usuário de membro LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificate, Certificados ou chave de localização não é válida, Insira o caminho correto"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "O banco de dados de configurações não é gravável"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do banco de dados não é válida, digite o caminho correto"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "DB não é gravável"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo-chave não é válida, por favor insira o caminho correto"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de certificação não é válida, digite o caminho correto"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Atualização das configurações do servidor de e-mail"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuração das Características"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "O e-mail não é de um domínio válido"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Adicionar novo usuário"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuário '%(user)s' criado"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrei uma conta existente para este endereço de e-mail ou apelido."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuário '%(nick)s' excluído"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "Nenhum usuário administrador restante, não é possível excluir o usuário"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar usuário %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuário '%(nick)s' atualizado"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Editar configurações do servidor de e-mail"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocorreu um erro ao enviar o e-mail de teste: %(res)s"
 
-#: cps/admin.py:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure seu endereço de e-mail primeiro..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Atualização das configurações do servidor de e-mail"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Senha para redefinição do usuário %(user)s"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "visualizador de arquivo de registro"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Solicitação de pacote de atualização"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Download do pacote de atualização"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Descompactação de pacote de atualização"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Substituição de arquivos"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "As ligações à base de dados estão fechadas"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Parar servidor"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "Atualização concluída, pressione okay e recarregue a página"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Atualização falhou:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Erro HTTP"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Erro de conexão"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tempo limite durante o estabelecimento da conexão"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Erro geral"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Arquivo de atualização não pôde ser salvo no diretório temporário"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erro: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erro: Nenhum usuário retornado em resposta do servidor LDAP"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "No mínimo um usuário LDAP não encontrado no banco de dados"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} Usuário Importado com Sucesso"
 
@@ -483,7 +491,7 @@ msgstr "não configurado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "A coluna personalizada No.%(column)d não existe no banco de dados do calibre"
@@ -496,8 +504,8 @@ msgstr "Formato do Livro Eliminado com Sucesso"
 msgid "Book Successfully Deleted"
 msgstr "Livro Eliminado com Sucesso"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oops! O título do livro seleccionado não está disponível. O arquivo não existe ou não é acessível"
 
@@ -534,7 +542,7 @@ msgstr "Falha ao criar o caminho %(path)s (Permission denied)."
 msgid "Failed to store file %(file)s."
 msgstr "Falha ao armazenar o arquivo %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
@@ -692,7 +700,7 @@ msgstr "Arquivo %(file)s não encontrado no Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrado uma conta existente para este endereço de e-mail."
@@ -774,7 +782,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -840,7 +848,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Login"
 
@@ -856,7 +864,7 @@ msgstr "O Token expirou"
 msgid "Success! Please return to your device"
 msgstr "Sucesso! Por favor, volte ao seu aparelho"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Livros"
 
@@ -881,7 +889,7 @@ msgstr "Livros descarregados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Livros Descarregados"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Livros Mais Bem Avaliados"
 
@@ -890,7 +898,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar os melhores livros avaliados"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Livros Lidos"
 
@@ -899,7 +907,7 @@ msgid "Show read and unread"
 msgstr "Mostrar lido e não lido"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Livros Não Lidos"
 
@@ -917,7 +925,7 @@ msgid "Show Random Books"
 msgstr "Mostrar Livros Aleatórios"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Categorias"
 
@@ -927,7 +935,7 @@ msgstr "Mostrar seleção de categoria"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Série"
 
@@ -945,7 +953,7 @@ msgid "Show author selection"
 msgstr "Mostrar selecção de autor"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Editores"
 
@@ -955,7 +963,7 @@ msgstr "Mostrar selecção de editores"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -979,7 +987,7 @@ msgstr "Formatos de arquivo"
 msgid "Show file formats selection"
 msgstr "Mostrar seleção de formatos de arquivo"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Livros Arquivados"
 
@@ -987,7 +995,7 @@ msgstr "Livros Arquivados"
 msgid "Show archived books"
 msgstr "Mostrar livros arquivados"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "Lista de Livros"
 
@@ -1126,177 +1134,177 @@ msgstr "Uma nova atualização está disponível. Clique no botão abaixo para a
 msgid "No release information available"
 msgstr "Não há informações de lançamento disponíveis"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Descobrir (Livros Aleatórios)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Hot Books (Os Mais Descarregados)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livros baixados por %(user)s"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Avaliação: %(rating)s estrelas"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato do arquivo: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Pesquisa"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Lista de classificações"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Lista de formatos de arquivo"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Publicado depois de "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Avaliação <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Avaliação >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de leitura  = %(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ups! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail válido para Kindle."
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Nome de usuário ou senha incorretos"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "Nova senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Você agora está logado como: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s's"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Perfil atualizado"
 
@@ -1564,7 +1572,7 @@ msgstr "Ok"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1748,7 +1756,7 @@ msgstr "Buscar Metadados"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Salvar"
 
@@ -1771,7 +1779,7 @@ msgstr "A carregar..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Fechar"
 
@@ -2244,35 +2252,35 @@ msgstr "Expressão regular para classificação de títulos"
 msgid "Default Settings for New Users"
 msgstr "Configurações padrão para novos usuários"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Usuário Admin"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Permitir Downloads"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Permitir que o eBook Viewer"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Permitir Uploads"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Permitir Editar"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Permitir Livros Excluídos"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Permitir mudança de senha"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Permitir a Edição de Prateleiras Públicas"
 
@@ -2290,12 +2298,12 @@ msgstr "Língua dos Livros"
 msgid "Default Visibilities for New Users"
 msgstr "Visibilidades por defeito para novos utilizadores"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Mostrar Livros Aleatórios em Vista de Detalhe"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Adicionar Etiquetas permitidas/negadas"
 
@@ -3080,19 +3088,23 @@ msgstr "Kobo Sync Token"
 msgid "Create/View"
 msgstr "Criar/Ver"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Adicionar valores permitidos/definidos da coluna personalizada"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Eliminar Utilizador"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Gerar o Kobo Auth URL"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index dad3b9e5be322aac9a81eb4a0a8489b9696ec570..d7f362c3f7bdc1d3e5f3bc3a1c96527e604bb880 100644
GIT binary patch
delta 23
ecmaF(jp^YxrVY|T9EQdUh89*vCYzOm>@op#qX;wr

delta 23
ecmaF(jp^YxrVY|T90n!|h6Yxq#+#Lc>@op#X$UR=

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 62b48c02a..695682ff0 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -77,7 +77,7 @@ msgstr "Управление сервером"
 msgid "All"
 msgstr "Все"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgstr "Показать все"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
@@ -198,283 +198,291 @@ msgstr "Вы действительно хотите удалить эту кн
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Запретить"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Разрешить"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json не настроен для веб-приложения"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Неправильное расположение файла журнала, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Недопустимое расположение файла журнала доступа, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Пожалуйста, введите провайдера LDAP, порт, DN и идентификатор объекта пользователя"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов группы LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов группы LDAP имеет незавершённые круглые скобки"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов пользователя LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов пользователя LDAP имеет незавершенную круглую скобку"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Базы Данных неверно, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение ключевого файла неверно, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Ошибка: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -486,7 +494,7 @@ msgstr "не настроено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -499,8 +507,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
@@ -537,7 +545,7 @@ msgstr "Ошибка при создании пути %(path)s (Доступ з
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -695,7 +703,7 @@ msgstr "Файл %(file)s не найден на Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Этот адрес электронной почты уже зарегистрирован."
@@ -777,7 +785,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -843,7 +851,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Логин"
 
@@ -859,7 +867,7 @@ msgstr "Ключ просрочен"
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Книги"
 
@@ -884,7 +892,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
@@ -893,7 +901,7 @@ msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
@@ -902,7 +910,7 @@ msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
@@ -920,7 +928,7 @@ msgid "Show Random Books"
 msgstr "Показывать Случайные Книги"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Категории"
 
@@ -930,7 +938,7 @@ msgstr "Показывать выбор категории"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Серии"
 
@@ -948,7 +956,7 @@ msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Издатели"
 
@@ -958,7 +966,7 @@ msgstr "Показать выбор издателя"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Языки"
 
@@ -982,7 +990,7 @@ msgstr "Форматы файлов"
 msgid "Show file formats selection"
 msgstr "Показать выбор форматов файлов"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr ""
 
@@ -990,7 +998,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr ""
 
@@ -1129,177 +1137,177 @@ msgstr "Новое обновление доступно. Нажмите на к
 msgid "No release information available"
 msgstr "Информация о выпуске недоступна"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Поиск"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Скачать"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Список рейтингов"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
@@ -1567,7 +1575,7 @@ msgstr "Ok"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -1751,7 +1759,7 @@ msgstr "Получить метаданные"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Сохранить"
 
@@ -1774,7 +1782,7 @@ msgstr "Загрузка..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Закрыть"
 
@@ -2247,35 +2255,35 @@ msgstr "Регулярное выражение для сортировки за
 msgid "Default Settings for New Users"
 msgstr "Настройки по умолчанию для новых пользователей"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Управление сервером"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Разрешить скачивание с сервера"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Разрешить чтение книг"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Разрешить загрузку на сервер"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Разрешить редактирование книг"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Разрешить удаление книг"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Разрешить смену пароля"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Разрешить редактирование публичных книжных полок"
 
@@ -2293,12 +2301,12 @@ msgstr "Показать книги на языках"
 msgid "Default Visibilities for New Users"
 msgstr "Видимость для новых пользователей(по умолчанию)"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Показывать случайные книги при просмотре деталей"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Добавить разрешенные / запрещенные теги"
 
@@ -3083,19 +3091,23 @@ msgstr "Kobo Sync Token"
 msgid "Create/View"
 msgstr "Создать/Просмотреть"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Добавить разрешенные / запрещенные значения индивидуальных столбцов"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Удалить этого пользователя"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Создать Kobo Auth URL"
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index fbf3c9e5da7da25db7a17c8be496be29c6f377e0..3a4626b7e94f0b4a50196b318fa835b0fbecba99 100644
GIT binary patch
delta 23
fcmezIhv~;3rVaP=ISh>z3@xmTOg2BypXdhwi(3k4

delta 23
fcmezIhv~;3rVaP=ISfn`3=OPIjW<8fpXdhwiy;bP

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 7e960eea8..cd2732e3f 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -75,7 +75,7 @@ msgstr "Redigera användare"
 msgid "All"
 msgstr "Alla"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "Användaren hittades inte"
 
@@ -92,7 +92,7 @@ msgstr "Visa alla"
 msgid "Malformed request"
 msgstr "Felaktig begäran"
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr "Gästnamn kan inte ändras"
 
@@ -100,7 +100,7 @@ msgstr "Gästnamn kan inte ändras"
 msgid "Guest can't have this role"
 msgstr "Gäst kan inte ha den här rollen"
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Ingen administratörsanvändare kvar, kan inte ta bort administratörsrollen"
 
@@ -145,7 +145,7 @@ msgstr "Ogiltig roll"
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
@@ -195,283 +195,291 @@ msgstr "Är du säker på att du vill ändra den valda rollen för de valda anv
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr "Taggen hittades inte"
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr "Ogiltig åtgärd"
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Förneka"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Tillåt"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json är inte konfigurerad för webbapplikation"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Loggfilens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Åtkomstloggplatsens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Vänligen ange en LDAP-leverantör, port, DN och användarobjektidentifierare"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-gruppobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-gruppobjektfilter har omatchande parentes"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-användarobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-användarobjektfilter har omatchad parentes"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Användarfilter för LDAP-medlemmar måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Användarfilter för LDAP-medlemmar har omatchad parentes"
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Inställningar för DB är inte skrivbara"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "DB-plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "DB är inte skrivbar"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Keyfile-platsen är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Certfile-platsen är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Hittade ett befintligt konto för den här e-postadressen eller namnet."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr "Det går inte att ta bort gästanvändaren"
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 #, fuzzy
 msgid "Gmail Account Verification Successful"
 msgstr "Verifiering av G-mail-kontot lyckades"
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testa e-post i kö för att skicka till %(email)s, vänligen kontrollera Uppgifter för resultat"
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Uppdateringsfilen kunde inte sparas i Temp Dir"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fel: %(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fel: Ingen användare återges som svar på LDAP-servern"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minst en LDAP-användare hittades inte i databasen"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} användare har importerats"
 
@@ -483,7 +491,7 @@ msgstr "inte konfigurerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
@@ -496,8 +504,8 @@ msgstr "Bokformat har tagits bort"
 msgid "Book Successfully Deleted"
 msgstr "Boken har tagits bort"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 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"
 
@@ -534,7 +542,7 @@ msgstr "Det gick inte att skapa sökväg %(path)s (behörighet nekad)."
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Databasfel: %(error)s."
@@ -692,7 +700,7 @@ msgstr "Filen %(file)s hittades inte på Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 msgid "Found an existing account for this e-mail address"
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
@@ -773,7 +781,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -839,7 +847,7 @@ msgid "{} Stars"
 msgstr "{} stjärnor"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Logga in"
 
@@ -855,7 +863,7 @@ msgstr "Token har löpt ut"
 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
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "Böcker"
 
@@ -880,7 +888,7 @@ msgstr "Hämtade böcker"
 msgid "Show Downloaded Books"
 msgstr "Visa hämtade böcker"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Bäst rankade böcker"
 
@@ -889,7 +897,7 @@ msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Lästa böcker"
 
@@ -898,7 +906,7 @@ msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
@@ -916,7 +924,7 @@ msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -926,7 +934,7 @@ msgstr "Visa kategorival"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Serier"
 
@@ -944,7 +952,7 @@ msgid "Show author selection"
 msgstr "Visa författarval"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Förlag"
 
@@ -954,7 +962,7 @@ msgstr "Visa urval av förlag"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Språk"
 
@@ -978,7 +986,7 @@ msgstr "Filformat"
 msgid "Show file formats selection"
 msgstr "Visa val av filformat"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "Arkiverade böcker"
 
@@ -986,7 +994,7 @@ msgstr "Arkiverade böcker"
 msgid "Show archived books"
 msgstr "Visa arkiverade böcker"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "Boklista"
 
@@ -1125,177 +1133,177 @@ msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att up
 msgid "No release information available"
 msgstr "Ingen versionsinformation tillgänglig"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Hämtade böcker av %(user)s"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Sök"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "Hämtningar"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Betygslista"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lässtatus = %(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, 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:1463
+#: cps/web.py:1454
 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:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
@@ -1563,7 +1571,7 @@ msgstr "Ok"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1747,7 +1755,7 @@ msgstr "Hämta metadata"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Spara"
 
@@ -1770,7 +1778,7 @@ msgstr "Läser in..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Stäng"
 
@@ -2243,35 +2251,35 @@ msgstr "Reguljärt uttryck för titelsortering"
 msgid "Default Settings for New Users"
 msgstr "Standardinställningar för nya användare"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Adminstratör användare"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Tillåt Hämtningar"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "Tillåt bokvisare"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Tillåt Uppladdningar"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Tillåt Redigera"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "Tillåt borttagning av böcker"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Tillåt Ändra lösenord"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Tillåt Redigering av offentliga hyllor"
 
@@ -2289,12 +2297,12 @@ msgstr "Visa böcker med språk"
 msgid "Default Visibilities for New Users"
 msgstr "Standardvisibiliteter för nya användare"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Visa slumpmässiga böcker i detaljvyn"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "Lägg till tillåtna/avvisade taggar"
 
@@ -3078,19 +3086,23 @@ msgstr "Kobo Sync Token"
 msgid "Create/View"
 msgstr "Skapa/Visa"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Lägg till tillåtna/avvisade anpassade kolumnvärden"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Ta bort den här användaren"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "Skapa Kobo Auth URL"
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 1aa97504f98200f4ce98da6a430c463a655fadbd..99ab88076530aafa2e15ab94e8b3ec36bf794456 100644
GIT binary patch
delta 23
ecmZqM#Mripal=hx4nt!FLklY-lg$r}RaF6Ig9p_B

delta 23
ecmZqM#Mripal=hx4g(VfLjx;Q<IN9^RaF6INe9mW

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 1595fd6d0..0b2b2df45 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "All"
 msgstr "Tümü"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
@@ -192,282 +192,290 @@ msgstr ""
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "'%(user)s' kullanıcısı oluşturuldu"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Kullanıcı '%(nick)s' silindi"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, 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:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 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:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Bağlantı kurulmaya çalışırken zaman aşımına uğradı"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -479,7 +487,7 @@ msgstr "ayarlanmadı"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -492,8 +500,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -530,7 +538,7 @@ msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -688,7 +696,7 @@ msgstr "%(file)s dosyası Google Drive'da bulunamadı"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bu e-posta adresi için bir hesap mevcut."
@@ -770,7 +778,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -836,7 +844,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Giriş"
 
@@ -852,7 +860,7 @@ msgstr "Token süresi doldu"
 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
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "eKitaplar"
 
@@ -877,7 +885,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr ""
 
@@ -886,7 +894,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Okunanlar"
 
@@ -895,7 +903,7 @@ msgid "Show read and unread"
 msgstr "Okunan ve okunmayanları göster"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Okunmamışlar"
 
@@ -913,7 +921,7 @@ msgid "Show Random Books"
 msgstr "Rastgele Kitap Göster"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -923,7 +931,7 @@ msgstr "Kategori seçimini göster"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Seriler"
 
@@ -941,7 +949,7 @@ msgid "Show author selection"
 msgstr "Yazar seçimini göster"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "Yayıncılar"
 
@@ -951,7 +959,7 @@ msgstr "Yayıncı seçimini göster"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Diller"
 
@@ -975,7 +983,7 @@ msgstr "Biçimler"
 msgid "Show file formats selection"
 msgstr "Dosya biçimi seçimini göster"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr ""
 
@@ -983,7 +991,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr ""
 
@@ -1122,177 +1130,177 @@ msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdak
 msgid "No release information available"
 msgstr "Sürüm bilgisi mevcut değil"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Keşfet (Rastgele)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Yazar: %(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Yayınevi: %(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Ara"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "Değerlendirme listesi"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "Biçim listesi"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "Görevler"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, 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:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 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/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 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:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
@@ -1560,7 +1568,7 @@ msgstr ""
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
@@ -1744,7 +1752,7 @@ msgstr ""
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
@@ -1767,7 +1775,7 @@ msgstr "Yükleniyor..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Kapak"
 
@@ -2239,35 +2247,35 @@ msgstr ""
 msgid "Default Settings for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "İndirmeye İzin Ver"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Yüklemeye izin ver"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Düzenlemeye İzin ver"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Şifre değiştirmeye izin ver"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Genel Kitaplıkları düzenlemeye izin ver"
 
@@ -2284,12 +2292,12 @@ msgstr ""
 msgid "Default Visibilities for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
@@ -3074,19 +3082,23 @@ msgstr ""
 msgid "Create/View"
 msgstr ""
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 30a109690e5eb4bf367e74d318b34c5c6f66def1..7503ace46f4787219182b39ff0603428dc97f275 100644
GIT binary patch
delta 23
fcmaFU!}z9$al-<64nt!FLklY-lg%sSkEj6vZ1M<O

delta 23
fcmaFU!}z9$al-<64g(VfLjx;Q<IOANkEj6vY`6$j

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index c9593fc30..06194db72 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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+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"
@@ -75,7 +75,7 @@ msgstr "Керування сервером"
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgstr "Показати всі"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -196,279 +196,287 @@ msgstr "Ви справді хочете видалити книжкову по
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -480,7 +488,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -493,8 +501,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
@@ -531,7 +539,7 @@ msgstr ""
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -689,7 +697,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -770,7 +778,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -836,7 +844,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -852,7 +860,7 @@ msgstr "Час дії токено вичерпано"
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr ""
 
@@ -877,7 +885,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "Книги з найкращим рейтингом"
 
@@ -886,7 +894,7 @@ msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "Прочитані книги"
 
@@ -895,7 +903,7 @@ msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
@@ -913,7 +921,7 @@ msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "Категорії"
 
@@ -923,7 +931,7 @@ msgstr "Показувати вибір категорії"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "Серії"
 
@@ -941,7 +949,7 @@ msgid "Show author selection"
 msgstr "Показувати вибір автора"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr ""
 
@@ -951,7 +959,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "Мови"
 
@@ -975,7 +983,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr ""
 
@@ -983,7 +991,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr ""
 
@@ -1122,177 +1130,177 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "Пошук"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
@@ -1560,7 +1568,7 @@ msgstr "Ok"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
@@ -1744,7 +1752,7 @@ msgstr "Отримати метадані"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
@@ -1767,7 +1775,7 @@ msgstr "Завантаження..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Закрити"
 
@@ -2238,35 +2246,35 @@ msgstr "Regexp для сортування по назві"
 msgid "Default Settings for New Users"
 msgstr "Налаштування по замовчуванню для нових користувачів"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "Керування сервером"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "Дозволити завантажувати з сервера"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "Дозволити завантаження на сервер"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "Дозволити редагування книг"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "Дозволити зміну пароля"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "Дозволити редагування публічних книжкових полиць"
 
@@ -2284,12 +2292,12 @@ msgstr "Показувати книги на мовах"
 msgid "Default Visibilities for New Users"
 msgstr "Можливості за замовчуванням для нових користувачів"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "Показувати випадкові книги при перегляді деталей"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
@@ -3069,19 +3077,23 @@ msgstr ""
 msgid "Create/View"
 msgstr ""
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "Видалити цього користувача"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 2b44952ea1449f8fcd48480eb15caaf37741de8d..fdc3fb49364e57ad1a0ed40e704f3cece2a785dc 100644
GIT binary patch
delta 23
ecmdn|n`!fJrVTOW9EQdUh89*vCYw{r{oMd{V+fo8

delta 23
ecmdn|n`!fJrVTOW90n!|h6Yxq#+y^h{oMd{DF~JT

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index c92be6155..06cb6ce6f 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -75,7 +75,7 @@ msgstr "管理用户"
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "找不到用户"
 
@@ -92,7 +92,7 @@ msgstr "显示全部"
 msgid "Malformed request"
 msgstr "格式错误的请求"
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr "访客名称无法更改"
 
@@ -100,7 +100,7 @@ msgstr "访客名称无法更改"
 msgid "Guest can't have this role"
 msgstr "游客无法拥有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
@@ -144,7 +144,7 @@ msgstr "无效的阅读列"
 msgid "Invalid Restricted Column"
 msgstr "无效的限制列"
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
@@ -192,279 +192,287 @@ msgstr "您确定要更改所选用户的书架同步行为吗？"
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "您确定要更改 Calibre 库位置吗？"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr "标签未找到"
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr "无效的动作"
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒绝"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允许"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "请输入一个LDAP服务账号和密码 "
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr "请输入一个LDAP服务账号"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成员用户过滤器需要有一个“%s”格式标识符"
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成员用户过滤器中有不匹配的括号"
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写入"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "数据库路径无效，请输入正确的路径"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "数据库不可写入"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密钥文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户“%(user)s”已创建"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此邮箱或用户名的账号已经存在。"
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户“%(nick)s”已删除"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr "无法删除游客用户"
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail账号校验成功"
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件无法保存在临时目录中"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一个LDAP用户"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能创建至少一个LDAP用户"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "错误：%(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "错误：在LDAP服务器的响应中没有返回用户"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "数据库中没有找到至少一个LDAP用户"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} 用户被成功导入"
 
@@ -476,7 +484,7 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
@@ -489,8 +497,8 @@ msgstr "书籍格式已成功删除"
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
@@ -527,7 +535,7 @@ msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
@@ -685,7 +693,7 @@ msgstr "Google Drive上找不到文件 %(file)s"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
@@ -766,7 +774,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -832,7 +840,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "登录"
 
@@ -848,7 +856,7 @@ msgstr "Token已过期"
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "书籍"
 
@@ -873,7 +881,7 @@ msgstr "下载历史"
 msgid "Show Downloaded Books"
 msgstr "显示下载过的书籍"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
@@ -882,7 +890,7 @@ msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "已读书籍"
 
@@ -891,7 +899,7 @@ msgid "Show read and unread"
 msgstr "显示阅读状态"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "未读书籍"
 
@@ -909,7 +917,7 @@ msgid "Show Random Books"
 msgstr "显示随机书籍"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "分类"
 
@@ -919,7 +927,7 @@ msgstr "显示分类选择"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "丛书"
 
@@ -937,7 +945,7 @@ msgid "Show author selection"
 msgstr "显示作者选择"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "出版社"
 
@@ -947,7 +955,7 @@ msgstr "显示出版社选择"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "语言"
 
@@ -971,7 +979,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "归档书籍"
 
@@ -979,7 +987,7 @@ msgstr "归档书籍"
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "书籍列表"
 
@@ -1116,177 +1124,177 @@ msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "无可用发布信息"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下载过的书籍"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "高级搜索"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "搜索"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "下载次数"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1553,7 +1561,7 @@ msgstr "确定"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
@@ -1737,7 +1745,7 @@ msgstr "获取元数据"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "保存"
 
@@ -1760,7 +1768,7 @@ msgstr "加载中..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "关闭"
 
@@ -2232,35 +2240,35 @@ msgstr "按规则提取书名后排序（正则表达式）"
 msgid "Default Settings for New Users"
 msgstr "新用户默认权限设置"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "管理员用户"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "允许下载书籍"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "允许在线阅读"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "允许上传书籍"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "允许编辑书籍"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "允许删除书籍"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "允许修改密码"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "允许编辑公共书架"
 
@@ -2278,12 +2286,12 @@ msgstr "按语言显示书籍"
 msgid "Default Visibilities for New Users"
 msgstr "新用户默认显示权限"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "在主页显示随机书籍"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "添加显示或隐藏书籍的标签值"
 
@@ -3060,19 +3068,23 @@ msgstr "Kobo 同步 Token"
 msgid "Create/View"
 msgstr "新建或查看"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "添加显示或隐藏书籍的自定义栏目值"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "仅同步所选书架中的书籍到 Kobo"
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "删除此用户"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "生成Kobo Auth 地址"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index ee2a2a2e7c107e240f96779096d5678d5b1d4fc8..a82447195ff087674bccac5d2d5baf1dcffea7dc 100644
GIT binary patch
delta 22
ecmezNm+9MIrVa1PISh>z3@xmTOcsADcLxB0%n9rO

delta 22
ecmezNm+9MIrVa1PISfn`3=OPIjTe6_cLxB0m<i?p

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index d4d34ddee..1a684918e 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -75,7 +75,7 @@ msgstr "管理用戶"
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr "找不到用戶"
 
@@ -92,7 +92,7 @@ msgstr "顯示全部"
 msgid "Malformed request"
 msgstr "格式錯誤的請求"
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr "訪客名稱無法更改"
 
@@ -100,7 +100,7 @@ msgstr "訪客名稱無法更改"
 msgid "Guest can't have this role"
 msgstr "遊客無法擁有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr "管理員賬戶不存在，無法刪除管理員角色"
 
@@ -144,7 +144,7 @@ msgstr "無效的閱讀列"
 msgid "Invalid Restricted Column"
 msgstr "無效的限制列"
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
@@ -192,279 +192,287 @@ msgstr "您確定要更改所選用戶的書架同步行為嗎？"
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "您確定要更改 Calibre 庫位置嗎？"
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr "標籤未找到"
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr "無效的動作"
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒絕"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允許"
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未為 Web 應用程序配置"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日誌文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "訪問日誌路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "請輸入LDAP主機、端口、DN和用戶對象標識符"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "請輸入一個LDAP服務賬號和密碼 "
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr "請輸入一個LDAP服務賬號"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP群組對象過濾器需要一個具有“%s”格式標識符號"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP群組對象過濾器的括號不匹配"
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用戶對象過濾器需要一個具有“%s”格式標識符"
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用戶對象過濾器的括號不匹配"
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成員用戶過濾器需要有一個“%s”格式標識符號"
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成員用戶過濾器中有不匹配的括號"
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "設置數據庫不可寫入"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "數據庫路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr "數據庫不可寫入"
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密鑰文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "證書文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr "郵箱不在有效網域中"
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr "添加新用戶"
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用戶“%(user)s”已創建"
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此郵箱或用戶名的賬號已經存在。"
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用戶“%(nick)s”已刪除"
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr "無法刪除訪客用戶"
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr "管理員賬戶不存在，無法刪除用戶"
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "編輯用戶 %(nick)s"
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用戶“%(nick)s”已更新"
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "編輯郵件服務器設置"
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail賬號驗證成功"
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "發送給%(email)s的測試郵件已進入隊列。請檢查任務結果"
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "發送測試郵件時出錯：%(res)s"
 
-#: cps/admin.py:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr "請先配置您的郵箱地址..."
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr "日誌文件查看器"
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr "正在請求更新包"
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr "正在下載更新包"
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr "正在解壓更新包"
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr "正在替換文件"
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr "數據庫連接已關閉"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr "正在停止服務器"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，請點擊確定並刷新頁面"
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr "更新失敗："
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP錯誤"
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "連接錯誤"
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "建立連接超時"
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "一般錯誤"
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件無法保存在臨時目錄中"
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr "更新時檔案無法替換變更"
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一個LDAP用戶"
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能創建至少一個LDAP用戶"
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "錯誤：%(ldaperror)s"
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr "錯誤：在LDAP服務器的響應中沒有返回用戶"
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "數據庫中沒有找到至少一個LDAP用戶"
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr "{} 用戶被成功導入"
 
@@ -476,7 +484,7 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
@@ -489,8 +497,8 @@ msgstr "書籍格式已成功刪除"
 msgid "Book Successfully Deleted"
 msgstr "書籍已成功刪除"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
@@ -527,7 +535,7 @@ msgstr "創建路徑 %(path)s 失敗(權限拒絕)。"
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失敗。"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
@@ -685,7 +693,7 @@ msgstr "Google Drive上找不到文件 %(file)s"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此郵箱的賬號已經存在。"
 
@@ -766,7 +774,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -832,7 +840,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr "登入"
 
@@ -848,7 +856,7 @@ msgstr "Token已過期"
 msgid "Success! Please return to your device"
 msgstr "成功！請返回您的設備"
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr "書籍"
 
@@ -873,7 +881,7 @@ msgstr "已下載書籍"
 msgid "Show Downloaded Books"
 msgstr "顯示下載過的書籍"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr "最高評分書籍"
 
@@ -882,7 +890,7 @@ msgid "Show Top Rated Books"
 msgstr "顯示最高評分書籍"
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr "已讀書籍"
 
@@ -891,7 +899,7 @@ msgid "Show read and unread"
 msgstr "顯示閱讀狀態"
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr "未讀書籍"
 
@@ -909,7 +917,7 @@ msgid "Show Random Books"
 msgstr "隨機顯示書籍"
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr "分類"
 
@@ -919,7 +927,7 @@ msgstr "顯示分類選擇"
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr "叢書"
 
@@ -937,7 +945,7 @@ msgid "Show author selection"
 msgstr "顯示作者選擇"
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr "出版社"
 
@@ -947,7 +955,7 @@ msgstr "顯示出版社選擇"
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr "語言"
 
@@ -971,7 +979,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "顯示文件格式選擇"
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr "歸檔書籍"
 
@@ -979,7 +987,7 @@ msgstr "歸檔書籍"
 msgid "Show archived books"
 msgstr "顯示歸檔書籍"
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr "書籍列表"
 
@@ -1116,177 +1124,177 @@ msgstr "有新的更新。單擊下面的按鈕以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "無可用發佈信息"
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr "發現(隨機書籍)"
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "熱門書籍（最多下載）"
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下載過的書籍"
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "叢書：%(serie)s"
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "評分：%(rating)s 星"
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分類：%(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr "語言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr "搜尋"
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr "下載次數"
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr "評分列表"
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr "任務列表"
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr "出版時間晚於 "
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr "出版時間早於 "
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評分 <= %(rating)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評分 >= %(rating)s"
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "閱讀狀態 = %(status)s"
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”登入"
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr "資料已更新"
 
@@ -1553,7 +1561,7 @@ msgstr "確定"
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
@@ -1737,7 +1745,7 @@ msgstr "獲取元數據"
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "儲存"
 
@@ -1760,7 +1768,7 @@ msgstr "加載中..."
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "關閉"
 
@@ -2232,35 +2240,35 @@ msgstr "按規則提取書名後排序（正則表達式）"
 msgid "Default Settings for New Users"
 msgstr "新用戶默認權限設置"
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr "管理員用戶"
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr "允許下載書籍"
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr "允許在線閱讀"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr "允許上傳書籍"
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr "允許編輯書籍"
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr "允許刪除書籍"
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr "允許修改密碼"
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr "允許編輯公共書架"
 
@@ -2278,12 +2286,12 @@ msgstr "按預設語言顯示書籍"
 msgid "Default Visibilities for New Users"
 msgstr "新用戶默認顯示權限"
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr "在主頁顯示隨機書籍"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "添加顯示或隱藏書籍的標籤值"
 
@@ -3060,19 +3068,23 @@ msgstr "Kobo 同步 Token"
 msgid "Create/View"
 msgstr "新建或查看"
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "添加顯示或隱藏書籍的自定義欄位值"
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr "僅同步所選書架中的書籍到 Kobo"
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr "刪除此用戶"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr "生成Kobo Auth 地址"
 
diff --git a/messages.pot b/messages.pot
index 71c3f1ad2..cf0f195fa 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-04 10:53+0100\n"
+"POT-Creation-Date: 2021-12-13 18:24+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"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1576
+#: cps/admin.py:343 cps/admin.py:1595
 msgid "User not found"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1454
+#: cps/admin.py:418 cps/admin.py:1473
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1412
+#: cps/admin.py:442 cps/admin.py:1431
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -143,7 +143,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1293
+#: cps/admin.py:560 cps/admin.py:1312
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -191,277 +191,285 @@ msgstr ""
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:741
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr ""
+
+#: cps/admin.py:743
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:755
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:858 cps/admin.py:864 cps/admin.py:874 cps/admin.py:884
+#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:1015
+#: cps/admin.py:902
+msgid "{} sync entries deleted"
+msgstr ""
+
+#: cps/admin.py:1025
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1070
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1066
+#: cps/admin.py:1076
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1096
+#: cps/admin.py:1106
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1102
+#: cps/admin.py:1112
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1105
+#: cps/admin.py:1115
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1120
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1122
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1116
+#: cps/admin.py:1126
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1118
+#: cps/admin.py:1128
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1125
+#: cps/admin.py:1135
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1134
+#: cps/admin.py:1144
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482
-#: cps/admin.py:1551 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
+#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1197
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1192
+#: cps/admin.py:1212
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1205
+#: cps/admin.py:1224
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1228
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1316
+#: cps/admin.py:1335
 msgid "Database Settings updated"
 msgstr ""
 
-#: cps/admin.py:1324
+#: cps/admin.py:1343
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1340 cps/web.py:1487
+#: cps/admin.py:1359 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:1348
+#: cps/admin.py:1367
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1354 cps/admin.py:1504
+#: cps/admin.py:1373 cps/admin.py:1523
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:1365
+#: cps/admin.py:1384
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:1371
+#: cps/admin.py:1390
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1391
+#: cps/admin.py:1410
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:1393 cps/admin.py:1394
+#: cps/admin.py:1412 cps/admin.py:1413
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1397
+#: cps/admin.py:1416
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1470 cps/admin.py:1595
+#: cps/admin.py:1489 cps/admin.py:1614
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:1474
+#: cps/admin.py:1493
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
+#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1513 cps/templates/admin.html:98
+#: cps/admin.py:1532 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1532
+#: cps/admin.py:1551
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1558
+#: cps/admin.py:1577
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1561
+#: cps/admin.py:1580
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1563
+#: cps/admin.py:1582
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1565
+#: cps/admin.py:1584
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1607
+#: cps/admin.py:1626
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1452
+#: cps/admin.py:1632 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1624
+#: cps/admin.py:1643
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1690
+#: cps/admin.py:1709
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1691
+#: cps/admin.py:1710
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1692
+#: cps/admin.py:1711
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1693
+#: cps/admin.py:1712
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1694
+#: cps/admin.py:1713
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1695
+#: cps/admin.py:1714
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1696
+#: cps/admin.py:1715
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1697 cps/admin.py:1698 cps/admin.py:1699 cps/admin.py:1700
-#: cps/admin.py:1701 cps/admin.py:1702
+#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
+#: cps/admin.py:1720 cps/admin.py:1721
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1697 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1698 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1699 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1700 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1701
+#: cps/admin.py:1720
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1702
+#: cps/admin.py:1721
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1726
+#: cps/admin.py:1745
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1771
+#: cps/admin.py:1790
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1784
+#: cps/admin.py:1803
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1788
+#: cps/admin.py:1807
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1821
+#: cps/admin.py:1840
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1823
+#: cps/admin.py:1842
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -473,7 +481,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -486,8 +494,8 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
-#: cps/web.py:1755 cps/web.py:1822
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -524,7 +532,7 @@ msgstr ""
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -682,7 +690,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1670
+#: cps/helper.py:507 cps/web.py:1658
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -763,7 +771,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -829,7 +837,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
 msgid "Login"
 msgstr ""
 
@@ -845,7 +853,7 @@ msgstr ""
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/render_template.py:39 cps/web.py:424
+#: cps/render_template.py:39 cps/web.py:416
 msgid "Books"
 msgstr ""
 
@@ -870,7 +878,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
 msgid "Top Rated Books"
 msgstr ""
 
@@ -879,7 +887,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:684
+#: cps/templates/index.xml:58 cps/web.py:676
 msgid "Read Books"
 msgstr ""
 
@@ -888,7 +896,7 @@ msgid "Show read and unread"
 msgstr ""
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:687
+#: cps/templates/index.xml:65 cps/web.py:679
 msgid "Unread Books"
 msgstr ""
 
@@ -906,7 +914,7 @@ msgid "Show Random Books"
 msgstr ""
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1050
+#: cps/templates/index.xml:83 cps/web.py:1041
 msgid "Categories"
 msgstr ""
 
@@ -916,7 +924,7 @@ msgstr ""
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
 msgid "Series"
 msgstr ""
 
@@ -934,7 +942,7 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:934
+#: cps/templates/index.xml:76 cps/web.py:925
 msgid "Publishers"
 msgstr ""
 
@@ -944,7 +952,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1027
+#: cps/web.py:1018
 msgid "Languages"
 msgstr ""
 
@@ -968,7 +976,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:711
+#: cps/render_template.py:93 cps/web.py:703
 msgid "Archived Books"
 msgstr ""
 
@@ -976,7 +984,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:788
+#: cps/render_template.py:97 cps/web.py:780
 msgid "Books List"
 msgstr ""
 
@@ -1113,177 +1121,177 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:448
+#: cps/templates/index.html:5 cps/web.py:440
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:479
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:515
+#: cps/web.py:507
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:539
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:562
+#: cps/web.py:554
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:577
+#: cps/web.py:569
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:590
+#: cps/web.py:582
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:605
+#: cps/web.py:597
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:623
+#: cps/web.py:615
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:639
+#: cps/web.py:631
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
 msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:758 cps/web.py:1085
+#: cps/web.py:750 cps/web.py:1076
 msgid "Search"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:912
+#: cps/templates/admin.html:16 cps/web.py:903
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:989
+#: cps/web.py:980
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1010
+#: cps/web.py:1001
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1223
+#: cps/web.py:1214
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1230
+#: cps/web.py:1221
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1252
+#: cps/web.py:1243
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1245
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1256
+#: cps/web.py:1247
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1361
+#: cps/web.py:1352
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1457
+#: cps/web.py:1448
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1461
+#: cps/web.py:1452
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1463
+#: cps/web.py:1454
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1480
+#: cps/web.py:1471
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
-#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
-#: cps/web.py:1523
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1515
+#: cps/web.py:1506
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1518
+#: cps/web.py:1509
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1535
+#: cps/web.py:1523
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1554
+#: cps/web.py:1542
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1548
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1564 cps/web.py:1589
+#: cps/web.py:1552 cps/web.py:1577
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1571
+#: cps/web.py:1559
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1577
+#: cps/web.py:1565
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1584
+#: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1650 cps/web.py:1699
+#: cps/web.py:1638 cps/web.py:1687
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1666
+#: cps/web.py:1654
 msgid "Profile updated"
 msgstr ""
 
@@ -1550,7 +1558,7 @@ msgstr ""
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:141
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
@@ -1734,7 +1742,7 @@ msgstr ""
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
@@ -1756,7 +1764,7 @@ msgstr ""
 
 #: cps/templates/book_edit.html:250 cps/templates/layout.html:63
 #: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:160
+#: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr ""
 
@@ -2226,35 +2234,35 @@ msgstr ""
 msgid "Default Settings for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:93
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:98
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:127
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
 msgstr ""
 
@@ -2270,12 +2278,12 @@ msgstr ""
 msgid "Default Visibilities for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:81
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:84
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
@@ -3052,19 +3060,23 @@ msgstr ""
 msgid "Create/View"
 msgstr ""
 
-#: cps/templates/user_edit.html:85
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr ""
+
+#: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:134
+#: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
 msgstr ""
 
-#: cps/templates/user_edit.html:144 cps/templates/user_table.html:169
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
 msgstr ""
 

From 4db9691cfcae2ef025c1a23f262e0f87a29676de Mon Sep 17 00:00:00 2001
From: Laurin Neff <laurin@laurinneff.ch>
Date: Mon, 13 Dec 2021 19:36:21 +0100
Subject: [PATCH 067/412] Remove white border in full-screen cover preview

---
 cps/static/css/style.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index bf2257e65..6e6b0eae3 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -429,7 +429,7 @@ div.log {
 }
 
 #detailcover { cursor:zoom-in; }
-#detailcover:-webkit-full-screen { cursor:zoom-out; }
-#detailcover:-moz-full-screen { cursor:zoom-out; }
-#detailcover:-ms-fullscreen { cursor:zoom-out; }
-#detailcover:fullscreen { cursor:zoom-out; }
+#detailcover:-webkit-full-screen { cursor:zoom-out; border: 0; }
+#detailcover:-moz-full-screen { cursor:zoom-out; border: 0; }
+#detailcover:-ms-fullscreen { cursor:zoom-out; border: 0; }
+#detailcover:fullscreen { cursor:zoom-out; border: 0; }

From bea14d1784184f16040e99b0259664c9d78e98c3 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Wed, 15 Dec 2021 15:20:01 +0100
Subject: [PATCH 068/412] fix locale for lubimyczytac languages

---
 cps/metadata_provider/lubimyczytac.py | 31 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 4f6aca1ee..814a785e7 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -18,7 +18,7 @@ import datetime
 import json
 import re
 from multiprocessing.pool import ThreadPool
-from typing import Dict, List, Optional, Tuple, Union
+from typing import List, Optional, Tuple, Union
 from urllib.parse import quote
 
 import requests
@@ -27,6 +27,7 @@ from html2text import HTML2Text
 from lxml.html import HtmlElement, fromstring, tostring
 from markdown2 import Markdown
 
+from cps.isoLanguages import get_language_name
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 SYMBOLS_TO_TRANSLATE = (
@@ -119,7 +120,7 @@ class LubimyCzytac(Metadata):
                 with ThreadPool(processes=10) as pool:
                     final_matches = pool.starmap(
                         lc_parser.parse_single_book,
-                        [(match, generic_cover) for match in matches],
+                        [(match, generic_cover, locale) for match in matches],
                     )
                 return final_matches
             return matches
@@ -165,18 +166,18 @@ class LubimyCzytacParser:
             title = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                      f"{LubimyCzytac.TITLE_TEXT_PATH}",
+                f"{LubimyCzytac.TITLE_TEXT_PATH}",
             )
 
             book_url = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                      f"{LubimyCzytac.URL_PATH}",
+                f"{LubimyCzytac.URL_PATH}",
             )
             authors = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                      f"{LubimyCzytac.AUTHORS_PATH}",
+                f"{LubimyCzytac.AUTHORS_PATH}",
                 take_first=False,
             )
             if not all([title, book_url, authors]):
@@ -191,21 +192,21 @@ class LubimyCzytacParser:
                         id=self.metadata.__id__,
                         description=self.metadata.__name__,
                         link=LubimyCzytac.BASE_URL,
-                    )
+                    ),
                 )
             )
         return matches
 
-    def parse_single_book(self, match: MetaRecord, generic_cover: str) -> MetaRecord:
+    def parse_single_book(
+        self, match: MetaRecord, generic_cover: str, locale: str
+    ) -> MetaRecord:
         response = requests.get(match.url)
         self.root = fromstring(response.text)
         match.cover = self._parse_cover(generic_cover=generic_cover)
         match.description = self._parse_description()
-        match.languages = self._parse_languages()
+        match.languages = self._parse_languages(locale=locale)
         match.publisher = self._parse_publisher()
-        match.publishedDate = self._parse_from_summary(
-            attribute_name="datePublished"
-        )
+        match.publishedDate = self._parse_from_summary(attribute_name="datePublished")
         match.rating = self._parse_rating()
         match.series, match.series_index = self._parse_series()
         match.tags = self._parse_tags()
@@ -241,15 +242,15 @@ class LubimyCzytacParser:
     def _parse_publisher(self) -> Optional[str]:
         return self._parse_xpath_node(xpath=LubimyCzytac.PUBLISHER, take_first=True)
 
-    def _parse_languages(self) -> List[str]:
+    def _parse_languages(self, locale: str) -> List[str]:
         languages = list()
         lang = self._parse_xpath_node(xpath=LubimyCzytac.LANGUAGES, take_first=True)
         if lang:
             if "polski" in lang:
-                languages.append("Polish")
+                languages.append("pol")
             if "angielski" in lang:
-                languages.append("English")
-        return languages
+                languages.append("eng")
+        return [get_language_name(locale, language) for language in languages]
 
     def _parse_series(self) -> Tuple[Optional[str], Optional[Union[float, int]]]:
         series_index = 0

From 0693cb1ddb394faac5abacc4505e32d04e5f9873 Mon Sep 17 00:00:00 2001
From: Bharat KNV <bharatknv@gmail.com>
Date: Sun, 12 Dec 2021 18:40:44 +0530
Subject: [PATCH 069/412] Added basic theming to the epub reader

---
 cps/static/css/epub_themes.css | 14 ++++++++++++++
 cps/static/css/main.css        | 25 +++++++++++++++++++++++++
 cps/static/js/reading/epub.js  |  4 ++++
 cps/templates/read.html        | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 77 insertions(+)
 create mode 100644 cps/static/css/epub_themes.css

diff --git a/cps/static/css/epub_themes.css b/cps/static/css/epub_themes.css
new file mode 100644
index 000000000..4f6866818
--- /dev/null
+++ b/cps/static/css/epub_themes.css
@@ -0,0 +1,14 @@
+.lightTheme {
+	background: #fff;
+	color: #000;
+}
+
+.darkTheme {
+	background: #000;
+	color: #fff
+}
+
+.sepiaTheme {
+	background: #ece1ca;
+	color: #000;
+}
\ No newline at end of file
diff --git a/cps/static/css/main.css b/cps/static/css/main.css
index adbfbfdfb..84f032296 100644
--- a/cps/static/css/main.css
+++ b/cps/static/css/main.css
@@ -567,6 +567,31 @@ input:-moz-placeholder { color: #454545; }
   font-size: 0.8em;
 }
 
+.md-content .themes button {
+  display: inline-block;
+  border: none;
+  text-align: center;
+  text-decoration: none;
+  margin-top: 5%;
+  margin-right: 1%;
+  font-size: 16px;
+}
+
+.md-content .themes button.darkTheme {
+  background-color: black;
+  color: white;
+}
+
+.md-content .themes button.whiteTheme {
+  background-color: white;
+  color: black;
+}
+
+.md-content .themes button.sepiaTheme {
+  background-color: #ece1ca;
+  color: black;
+}
+
 /* Effect 1: Fade in and scale up */
 .md-effect-1 .md-content {
   -webkit-transform: scale(0.7);
diff --git a/cps/static/js/reading/epub.js b/cps/static/js/reading/epub.js
index edafa82c0..5e6748121 100644
--- a/cps/static/js/reading/epub.js
+++ b/cps/static/js/reading/epub.js
@@ -13,6 +13,10 @@ var reader;
         bookmarks: calibre.bookmark ? [calibre.bookmark] : []
     });
 
+    reader.rendition.themes.register("lightTheme", "/static/css/epub_themes.css");
+    reader.rendition.themes.register("darkTheme", "/static/css/epub_themes.css");
+    reader.rendition.themes.register("sepiaTheme", "/static/css/epub_themes.css");
+
     if (calibre.useBookmarks) {
         reader.on("reader:bookmarked", updateBookmark.bind(reader, "add"));
         reader.on("reader:unbookmarked", updateBookmark.bind(reader, "remove"));
diff --git a/cps/templates/read.html b/cps/templates/read.html
index 3d2566e0d..ed33e850d 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -69,6 +69,14 @@
       <div class="modal md-effect-1" id="settings-modal">
           <div class="md-content">
               <h3>{{_('Settings')}}</h3>
+              <div class="themes" id="themes">
+                  Choose a theme below: <br />
+
+                  <!-- Hardcoded a tick in the light theme button because it is the "default" theme. Need to find a way to do this dynamically on startup-->
+                  <button type="button" id="lightTheme" class="lightTheme" onclick="selectTheme(this.id)"><span id="lightSelected">✓</span>{{_('Light')}}</button> 
+                  <button type="button" id="darkTheme" class="darkTheme" onclick="selectTheme(this.id)"><span id="darkSelected"> </span>{{_('Dark')}}</button>
+                  <button type="button" id="sepiaTheme" class="sepiaTheme" onclick="selectTheme(this.id)"><span id="sepiaSelected"> </span>{{_('Sepia')}}</button>
+              </div>
               <div>
                   <p>
                     <input type="checkbox" id="sidebarReflow" name="sidebarReflow">{{_('Reflow text when sidebars are open.')}}
@@ -90,6 +98,32 @@
               bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
               useBookmarks: "{{ g.user.is_authenticated | tojson }}"
           };
+
+          function selectTheme(id) {
+            tickSpans = document.getElementById("themes").querySelectorAll("span");
+            
+            // Remove tick mark from all theme buttons
+            for(var i = 0; i < tickSpans.length; i++) {
+              document.getElementById(tickSpans[i].id).textContent = "";
+            }
+
+            // Add tick mark to the button corresponding to the currently selected theme
+            document.getElementById(id).querySelector("span").textContent = "✓";
+
+            // Apply theme to epubjs iframe
+            reader.rendition.themes.select(id);
+
+            // Apply theme to rest of the page. TODO - Do this smarter
+            if (id == "darkTheme") {
+              document.getElementById("main").style.backgroundColor = "black";
+            }
+            else if (id == "lightTheme") {
+              document.getElementById("main").style.backgroundColor = "white";
+            }
+            else if (id == "sepiaTheme") {
+              document.getElementById("main").style.backgroundColor = "#ece1ca";
+            }
+          }
       </script>
       <script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/libs/reader.min.js') }}"></script>

From 92f65882b2edc3db4b44cfe736532e8cd7ffbb1e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 16 Dec 2021 06:21:16 +0100
Subject: [PATCH 070/412] Added log4j statement

---
 SECURITY.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SECURITY.md b/SECURITY.md
index a71137858..bbaad7c4d 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -27,3 +27,6 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.14|Cross-Site Scripting vulnerability on typeahead inputs. Thanks to @notdodo||
 
 
+## Staement regarding Log4j (CVE-2021-44228 and related)
+
+Calibre-web is not affected by bugs related to Log4j. Calibre-Web is a python program, therefore not using Java, and not using the Java logging feature log4j. 

From 021298374e3febc19f87f7b3d6823f32f68b66bd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 18 Dec 2021 17:31:33 +0100
Subject: [PATCH 071/412] Improved debug output for task added Improved
 handling of calibre output on windows

---
 cps/tasks/convert.py | 10 ++++++++--
 cps/tasks/mail.py    |  2 +-
 cps/tasks/upload.py  |  3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index ada530055..004faec80 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -217,13 +217,16 @@ class TaskConvert(CalibreTask):
                     quotes.append(quotes_index)
                     quotes_index += 1
 
-            p = process_open(command, quotes)
+            p = process_open(command, quotes, newlines=False)
         except OSError as e:
             return 1, _(u"Ebook-converter failed: %(error)s", error=e)
 
         while p.poll() is None:
             nextline = p.stdout.readline()
-            log.debug(nextline.strip('\r\n'))
+            if isinstance(nextline, bytes):
+                nextline = nextline.decode('utf-8', errors="ignore").strip('\r\n')
+            if nextline:
+                log.debug(nextline)
             # parse progress string from calibre-converter
             progress = re.search(r"(\d+)%\s.*", nextline)
             if progress:
@@ -244,3 +247,6 @@ class TaskConvert(CalibreTask):
     @property
     def name(self):
         return "Convert"
+
+    def __str__(self):
+        return "Convert {} {}".format(self.bookid, self.kindle_mail)
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 2e95ee98d..05b2175f6 100644
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -267,4 +267,4 @@ class TaskEmail(CalibreTask):
         return "E-mail"
 
     def __str__(self):
-        return "{}, {}".format(self.name, self.subject)
+        return "E-mail {}, {}".format(self.name, self.subject)
diff --git a/cps/tasks/upload.py b/cps/tasks/upload.py
index 6a341cddb..2a667c287 100644
--- a/cps/tasks/upload.py
+++ b/cps/tasks/upload.py
@@ -32,3 +32,6 @@ class TaskUpload(CalibreTask):
     @property
     def name(self):
         return "Upload"
+
+    def __str__(self):
+        return "Upload {}".format(self.message)

From b7927a0df1f6fc96d753bb36c9834f85ed7bf908 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 18 Dec 2021 18:38:17 +0100
Subject: [PATCH 072/412] Bugfix handling of stacktrace from calibre

---
 cps/tasks/convert.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 004faec80..59ad6909e 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -239,9 +239,10 @@ class TaskConvert(CalibreTask):
         calibre_traceback = p.stderr.readlines()
         error_message = ""
         for ele in calibre_traceback:
-            log.debug(ele.strip('\n'))
+            ele = ele.decode('utf-8', errors="ignore").strip('\n')
+            log.debug(ele)
             if not ele.startswith('Traceback') and not ele.startswith('  File'):
-                error_message = _("Calibre failed with error: %(error)s", error=ele.strip('\n'))
+                error_message = _("Calibre failed with error: %(error)s", error=ele)
         return check, error_message
 
     @property

From 2e3a3ee4607e0317d1d885df0ddd72da7ba9d07b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 19 Dec 2021 07:28:46 +0100
Subject: [PATCH 073/412] Update dependencies in setup.cfg

---
 setup.cfg | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 3f1b1f8dd..fc74a1ed0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,14 +37,14 @@ console_scripts =
 [options]
 include_package_data = True
 install_requires =
-    Babel>=1.3, <3.0
+    Babel>=1.3,<3.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
     backports_abc>=0.4
     Flask>=1.0.2,<2.1.0
     iso-639>=0.4.5,<0.5.0
-    PyPDF3>=1.0.0,<1.0.4
+    PyPDF3>=1.0.0,<1.0.6
     pytz>=2016.10
     requests>=2.11.1,<2.25.0
     SQLAlchemy>=1.3.0,<1.5.0
@@ -52,25 +52,25 @@ install_requires =
     Wand>=0.4.4,<0.7.0
     unidecode>=0.04.19,<1.3.0
     lxml>=3.8.0,<4.7.0
-    flask-wtf>=0.14.2,<0.16.0
+    flask-wtf>=0.14.2,<1.1.0
 
 [options.extras_require]
 gdrive =
-    google-api-python-client>=1.7.11,<2.1.0
+    google-api-python-client>=1.7.11,<2.32.0
     gevent>20.6.0,<22.0.0
     greenlet>=0.4.17,<1.2.0
-    httplib2>=0.9.2,<0.20.0
+    httplib2>=0.9.2,<0.21.0
     oauth2client>=4.0.0,<4.1.4
-    uritemplate>=3.0.0,<3.1.0
+    uritemplate>=3.0.0,<4.2.0
     pyasn1-modules>=0.0.8,<0.3.0
     pyasn1>=0.1.9,<0.5.0
-    PyDrive2>=1.3.1,<1.9.0
+    PyDrive2>=1.3.1,<1.11.0
     PyYAML>=3.12
     rsa>=3.4.2,<4.8.0
     six>=1.10.0,<1.17.0
 gmail =
     google-auth-oauthlib>=0.4.3,<0.5.0
-    google-api-python-client>=1.7.11,<2.1.0
+    google-api-python-client>=1.7.11,<2.32.0
 goodreads =
     goodreads>=0.3.2,<0.4.0
     python-Levenshtein>=0.12.0,<0.13.0
@@ -78,16 +78,16 @@ ldap =
     python-ldap>=3.0.0,<3.4.0
     Flask-SimpleLDAP>=1.4.0,<1.5.0
 oauth =
-    Flask-Dance>=2.0.0,<5.1.0
+    Flask-Dance>=2.0.0,<5.2.0
     SQLAlchemy-Utils>=0.33.5,<0.38.0
 metadata =
     rarfile>=2.7
-    scholarly>=1.2.0,<1.3
+    scholarly>=1.2.0,<1.5
 comics =
-    natsort>=2.2.0,<7.2.0
+    natsort>=2.2.0,<8.1.0
     comicapi>= 2.2.0,<2.3.0
 kobo =
-    jsonschema>=3.2.0,<3.3.0
+    jsonschema>=3.2.0,<4.3.0
 
 
 

From 592288cb222a0507d7c6ce9fb667f1dfc4ac609a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 19 Dec 2021 08:04:13 +0100
Subject: [PATCH 074/412] Fix inverted "convert to English characters" setting

---
 cps/helper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/helper.py b/cps/helper.py
index 2c2c3cad3..e43055501 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -233,7 +233,7 @@ def get_valid_filename(value, replace_whitespace=True):
         value = value[:-1]+u'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
     if use_unidecode:
-        if not config.config_unicode_filename:
+        if config.config_unicode_filename:
             value = (unidecode.unidecode(value))
     else:
         value = value.replace(u'§', u'SS')

From b85627da5c285e07ecd7893216aef9ed7a0aca70 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 19 Dec 2021 11:29:54 +0100
Subject: [PATCH 075/412] Fix for adding/deleting visibility restrictions on
 custom columns/tags

---
 cps/admin.py              | 15 +++++++++++++--
 optional-requirements.txt |  2 +-
 setup.cfg                 |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 04d9138f2..1c228e49a 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -756,7 +756,12 @@ def prepare_tags(user, action, tags_name, id_list):
     return ",".join(saved_tags_list)
 
 
-@admi.route("/ajax/addrestriction/<int:res_type>", defaults={"user_id": 0}, methods=['POST'])
+@admi.route("/ajax/addrestriction/<int:res_type>", methods=['POST'])
+@login_required
+@admin_required
+def add_user_0_restriction(res_type):
+    return add_restriction(res_type, 0)
+
 @admi.route("/ajax/addrestriction/<int:res_type>/<int:user_id>", methods=['POST'])
 @login_required
 @admin_required
@@ -803,7 +808,13 @@ def add_restriction(res_type, user_id):
     return ""
 
 
-@admi.route("/ajax/deleterestriction/<int:res_type>", defaults={"user_id": 0}, methods=['POST'])
+@admi.route("/ajax/deleterestriction/<int:res_type>", methods=['POST'])
+@login_required
+@admin_required
+def delete_user_0_restriction(res_type):
+    return delete_restriction(res_type, 0)
+
+
 @admi.route("/ajax/deleterestriction/<int:res_type>/<int:user_id>", methods=['POST'])
 @login_required
 @admin_required
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 03f58bb56..3fac14cac 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -12,7 +12,7 @@ rsa>=3.4.2,<4.8.0
 six>=1.10.0,<1.17.0
 
 # Gdrive and Gmail integration
-google-api-python-client>=1.7.11,<2.32.0
+google-api-python-client>=1.7.11,<2.34.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
diff --git a/setup.cfg b/setup.cfg
index fc74a1ed0..87f6055f4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -56,7 +56,7 @@ install_requires =
 
 [options.extras_require]
 gdrive =
-    google-api-python-client>=1.7.11,<2.32.0
+    google-api-python-client>=1.7.11,<2.34.0
     gevent>20.6.0,<22.0.0
     greenlet>=0.4.17,<1.2.0
     httplib2>=0.9.2,<0.21.0
@@ -70,7 +70,7 @@ gdrive =
     six>=1.10.0,<1.17.0
 gmail =
     google-auth-oauthlib>=0.4.3,<0.5.0
-    google-api-python-client>=1.7.11,<2.32.0
+    google-api-python-client>=1.7.11,<2.34.0
 goodreads =
     goodreads>=0.3.2,<0.4.0
     python-Levenshtein>=0.12.0,<0.13.0

From 1a6579312f5ba988fe1d29befb666c0a8147181b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 20 Dec 2021 20:43:28 +0100
Subject: [PATCH 076/412] Add monkey.patch for gevent

---
 cps.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cps.py b/cps.py
index ab9896ce1..277da288f 100755
--- a/cps.py
+++ b/cps.py
@@ -16,6 +16,11 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
+try:
+    from gevent import monkey
+    monkey.patch_all()
+except ImportError:
+    pass
 
 import sys
 import os

From d45085215f231533ae62749f0e74c637b2168faa Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 22 Dec 2021 19:05:41 +0100
Subject: [PATCH 077/412] Update Translation

---
 cps/iso_language_names.py                     |  41 ----
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 39546 -> 39546 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 53605 -> 56158 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 212 +++++++++---------
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 57741 -> 57741 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 51330 -> 51330 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 27430 -> 27430 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 53669 -> 53669 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 25180 -> 25180 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 56299 -> 56299 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 19843 -> 19843 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 24546 -> 24546 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 50497 -> 50497 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 52413 -> 52413 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 148 ++++++------
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 46930 -> 46930 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 148 ++++++------
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 47969 -> 47969 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 48760 -> 48760 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 22790 -> 22790 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 18028 -> 18028 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 148 ++++++------
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 50104 -> 50104 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 148 ++++++------
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 48886 -> 48886 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 148 ++++++------
 messages.pot                                  | 148 ++++++------
 40 files changed, 1507 insertions(+), 1558 deletions(-)

diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index c6267ffd0..11e5e67bf 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -55,7 +55,6 @@ LANGUAGE_NAMES = {
         "bik": "bikolština",
         "bin": "bini",
         "bis": "bislamština",
-        "bit": "berinomo",
         "bla": "siksika",
         "bod": "tibetština",
         "bos": "bosenština",
@@ -164,7 +163,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligayonština",
         "hin": "hindština",
         "hit": "chetitština",
-        "hmj": "Ge",
         "hmn": "hmongština",
         "hmo": "hiri motu",
         "hrv": "chorvatština",
@@ -479,7 +477,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Blackfoot",
         "bod": "Tibetisch",
         "bos": "Bosnisch",
@@ -588,7 +585,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hethitisch",
-        "hmj": "Ge",
         "hmn": "Miao-Sprachen",
         "hmo": "Hiri-Motu",
         "hrv": "Kroatisch",
@@ -898,7 +894,6 @@ LANGUAGE_NAMES = {
         "bel": "Λευκωρωσικά",
         "bem": "Bemba (Zambia)",
         "ben": "Μπενγκάλι",
-        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -973,7 +968,6 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
-        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Γεωργιανά",
         "deu": "Γερμανικά",
@@ -1282,7 +1276,6 @@ LANGUAGE_NAMES = {
         "bik": "Bicolano",
         "bin": "Bini",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksiká",
         "bod": "Tibetano",
         "bos": "Bosnio",
@@ -1391,7 +1384,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainón",
         "hin": "Hindi",
         "hit": "Hitita",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croata",
@@ -1706,7 +1698,6 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
-        "bit": "Berinomo",
         "bla": "mustajalka (siksika)",
         "bod": "tiibetti",
         "bos": "bosnia",
@@ -1815,7 +1806,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "heetti",
-        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri-motu",
         "hrv": "kroatia",
@@ -2130,7 +2120,6 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
-        "bit": "berinomo",
         "bla": "pied-noir",
         "bod": "tibétain",
         "bos": "bosniaque",
@@ -2239,7 +2228,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "hittite",
-        "hmj": "ge",
         "hmn": "hmong",
         "hmo": "hiri Motu",
         "hrv": "croate",
@@ -2554,7 +2542,6 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "biszlama",
-        "bit": "Berinomo",
         "bla": "szikszika",
         "bod": "tibeti",
         "bos": "bosnyák",
@@ -2663,7 +2650,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hettita",
-        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "horvát",
@@ -2978,7 +2964,6 @@ LANGUAGE_NAMES = {
         "bik": "bicol",
         "bin": "Bini",
         "bis": "bislama",
-        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetano",
         "bos": "Bosniaco",
@@ -3087,7 +3072,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligayna",
         "hin": "Hindi",
         "hit": "hittite",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croato",
@@ -3402,7 +3386,6 @@ LANGUAGE_NAMES = {
         "bik": "ビコル語",
         "bin": "ビニ語",
         "bis": "ビスラマ語",
-        "bit": "Berinomo",
         "bla": "ブラックフット語",
         "bod": "チベット語",
         "bos": "ボスニア語",
@@ -3511,7 +3494,6 @@ LANGUAGE_NAMES = {
         "hil": "ヒリジャノン語",
         "hin": "ヒンディー語",
         "hit": "ヒッタイト語",
-        "hmj": "Ge",
         "hmn": "フモング語",
         "hmo": "ヒリモトゥ語",
         "hrv": "クロアチア語",
@@ -3826,7 +3808,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
@@ -3935,7 +3916,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
@@ -4250,7 +4230,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini; Edo",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetaans",
         "bos": "Bosnisch",
@@ -4359,7 +4338,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainoons",
         "hin": "Hindi",
         "hit": "Hittitisch",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatisch",
@@ -4674,7 +4652,6 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "edo",
         "bis": "bislama",
-        "bit": "Berinomo",
         "bla": "siksika",
         "bod": "tybetański",
         "bos": "bośniacki",
@@ -4783,7 +4760,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hetycki",
-        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "chorwacki",
@@ -5093,7 +5069,6 @@ LANGUAGE_NAMES = {
         "bel": "Belarusian",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
-        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -5168,7 +5143,6 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
-        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgiano",
         "deu": "Alemão",
@@ -5475,7 +5449,6 @@ LANGUAGE_NAMES = {
         "bik": "Бикольский",
         "bin": "Бини",
         "bis": "Бислама",
-        "bit": "Berinomo",
         "bla": "Сиксика",
         "bod": "Тибетский",
         "bos": "Боснийский",
@@ -5584,7 +5557,6 @@ LANGUAGE_NAMES = {
         "hil": "Хилигайнон",
         "hin": "Хинди",
         "hit": "Хиттит",
-        "hmj": "Ge",
         "hmn": "Хмонг",
         "hmo": "Хири Моту",
         "hrv": "Хорватский",
@@ -5899,7 +5871,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Edo (bini)",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksika (svartfotindianernas språk)",
         "bod": "Tibetanska",
         "bos": "Bosniska",
@@ -6008,7 +5979,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hettitiska språk",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatiska",
@@ -6318,7 +6288,6 @@ LANGUAGE_NAMES = {
         "bel": "Beyaz Rusça",
         "bem": "Bemba (Zambia)",
         "ben": "Bengalce",
-        "bit": "Berinomo",
         "bho": "Bhojpuri (Hindistan)",
         "bik": "Bikol (Filipinler)",
         "byn": "Bilin",
@@ -6393,7 +6362,6 @@ LANGUAGE_NAMES = {
         "lug": "Ganda Dili",
         "gay": "Gayo (Sumatra)",
         "gba": "Gbaya (Orta Afrika Cumhuriyeti)",
-        "hmj": "Ge",
         "gez": "Geez (Etiyopya)",
         "kat": "Gürcüce",
         "deu": "Almanca",
@@ -6700,7 +6668,6 @@ LANGUAGE_NAMES = {
         "bik": "бікольська",
         "bin": "біні",
         "bis": "біслама",
-        "bit": "беріномо",
         "bla": "сісіка",
         "bod": "тибетська",
         "bos": "боснійська",
@@ -6809,7 +6776,6 @@ LANGUAGE_NAMES = {
         "hil": "хілігайнон",
         "hin": "хінді",
         "hit": "хетська",
-        "hmj": "ге",
         "hmn": "хмонг",
         "hmo": "хірімоту",
         "hrv": "хорватська",
@@ -7124,7 +7090,6 @@ LANGUAGE_NAMES = {
         "bik": "比科尔语",
         "bin": "比尼语",
         "bis": "比斯拉马语",
-        "bit": "Berinomo",
         "bla": "西克西卡语",
         "bod": "藏语",
         "bos": "波斯尼亚语",
@@ -7233,7 +7198,6 @@ LANGUAGE_NAMES = {
         "hil": "希利盖农语",
         "hin": "印地语",
         "hit": "赫梯语",
-        "hmj": "亻革家语、重安江苗语",
         "hmn": "苗语",
         "hmo": "希里莫图语",
         "hrv": "克罗地亚语",
@@ -7543,7 +7507,6 @@ LANGUAGE_NAMES = {
         "bel": "白俄羅斯文",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
-        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -7618,7 +7581,6 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
-        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgian",
         "deu": "德文",
@@ -7925,7 +7887,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
@@ -7960,7 +7921,6 @@ LANGUAGE_NAMES = {
         "cre": "Cree",
         "crh": "Turkish; Crimean",
         "csb": "Kashubian",
-        "csl": "Chinese Sign Language",
         "cym": "Welsh",
         "dak": "Dakota",
         "dan": "Danish",
@@ -8035,7 +7995,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index c77a5c217131a2e988c551ff63cd7155744ce307..3733c6c4e23a2c3ed78a08e9ba5ea3edb538486a 100644
GIT binary patch
delta 30
mcmeyhh3VH8rVY;`IE;)G3@xn;%r?J^uwi7h*sLAp?*IVBQwtja

delta 30
mcmeyhh3VH8rVY;`I1Eh`49%@f4L84wuwi7h+^ikt?*IVBPzxIX

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index f835c699d..581af8290 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+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,7 +15,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Uživatel admin"
 msgid "All"
 msgstr "Vše"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
@@ -92,7 +92,7 @@ msgstr "Zobrazit vše"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
@@ -208,279 +208,279 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zakázat"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Povolit"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json není nakonfigurováno pro webové aplikace"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 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:1076
+#: cps/admin.py:1087
 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:1106
+#: cps/admin.py:1117
 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:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, 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:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr objektů skupiny LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, 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:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr uživatelských objektů LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 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:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Databáze není zapisovatelná"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 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:1228
+#: cps/admin.py:1239
 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:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 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:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Chyba: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1342,7 +1342,7 @@ msgstr "Převedený soubor nebyl nalezen nebo více než jeden soubor ve složce
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Převaděč eknih selhal: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2581,7 +2581,7 @@ msgstr "Chyba"
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Nastavení"
@@ -2732,7 +2732,7 @@ msgstr "Calibre-Web katalog eknih"
 msgid "epub Reader"
 msgstr "Čtečka PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Po otevření postranních panelů přeformátujte text."
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 6721cea96ee9ae1f50721065e05b4216ed1dbe0e..ae7fbfcfd0a44656a9805698eee5cd981eb806fa 100644
GIT binary patch
delta 13959
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
Cv5?RJ

delta 11962
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

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 272328a39..10cc56e3d 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
-"PO-Revision-Date: 2021-08-01 17:24+0200\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"PO-Revision-Date: 2021-12-22 19:05+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
 "Language-Team: \n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Benutzer bearbeiten"
 msgid "All"
 msgstr "Alle"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
@@ -92,7 +92,7 @@ msgstr "Zeige alle"
 msgid "Malformed request"
 msgstr "Ungültige Anfrage"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Guest Name kann nicht geändert werden"
 
@@ -100,7 +100,7 @@ msgstr "Guest Name kann nicht geändert werden"
 msgid "Guest can't have this role"
 msgstr "Guest Benutzer kann diese Rolle nicht haben"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
@@ -144,7 +144,7 @@ msgstr "Ungültige Lese Spalte"
 msgid "Invalid Restricted Column"
 msgstr "Ungültiger Spaltenname für Einschränkung"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
@@ -194,7 +194,7 @@ msgstr "Ort der Calibre Datenbank editieren?"
 
 #: cps/admin.py:594
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr ""
+msgstr "Möchten Sie wirklich die Synchronisationsdatenbank von Calibre-Web löschen, um eine komplette Synchronisation zu erzwingen?"
 
 #: cps/admin.py:743
 msgid "Tag not found"
@@ -204,276 +204,273 @@ msgstr "Tag nicht gefunden"
 msgid "Invalid Action"
 msgstr "Ungültige Aktion"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Verbieten"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Erlauben"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
-msgstr ""
+msgstr "{} Synchronisationseinträge gelöscht"
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json ist nicht für Web Anwendungen konfiguriert"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 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:1076
+#: cps/admin.py:1087
 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:1106
+#: cps/admin.py:1117
 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:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Bitte einen LDAP Service Account und Password eingeben"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Bitte einen LDAP Service Account eingeben"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, 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:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gruppen Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, 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:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Benutzer Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, 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:1137
+#: cps/admin.py:1148
 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:1144
+#: cps/admin.py:1155
 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:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 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:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Datenbank ist nicht schreibbar"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 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:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:1335
-#, fuzzy
+#: cps/admin.py:1346
 msgid "Database Settings updated"
-msgstr "Einstellungen des E-Mail-Servers aktualisiert"
+msgstr "Datenbankeinstellung aktualisiert"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Guest Benutzer kann nicht gelöscht werden"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 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:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account Verifikation erfolgreich"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail an %(email)s wurde zum Senden in die Warteschlange eingereiht, für das Ergebnis bitte Aufgaben überprüfen"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1720
-#, fuzzy
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
-msgstr ""
+msgstr "Dateien konnten während des Updates nicht ausgetauscht werden"
 
-#: cps/admin.py:1745
-#, fuzzy
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
-msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
+msgstr "Mindestens ein LDAP Benutzer konnte nicht extrahiert werden"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fehler: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Benutzer erfolgreich importiert"
 
@@ -513,9 +510,9 @@ msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s ist keine gültige Zahl, Eintrag wird ignoriert"
 
 #: cps/editbooks.py:490 cps/editbooks.py:954
-#, fuzzy, python-format
+#, python-format
 msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s ist keine gültige Sprache"
+msgstr "'%(langname)s' ist keine gültige Sprache"
 
 #: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
@@ -651,9 +648,9 @@ msgid "Send %(format)s to Kindle"
 msgstr "Sende %(format)s an Kindle"
 
 #: cps/helper.py:219 cps/tasks/convert.py:90
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to Kindle"
-msgstr "An Kindle senden"
+msgstr "%(book)s an Kindle senden"
 
 #: cps/helper.py:224
 msgid "The requested file could not be read. Maybe wrong permissions?"
@@ -728,7 +725,7 @@ msgstr "Nur jpg/jpeg/png/webp/bmp Dateien werden als Coverdatei unterstützt"
 
 #: cps/helper.py:651
 msgid "Invalid cover file content"
-msgstr ""
+msgstr "Ungültiger Cover Dateiinhalt"
 
 #: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
@@ -1016,7 +1013,7 @@ msgstr "Das Buch wurde dem Bücherregal %(sname)s hinzugefügt"
 
 #: cps/shelf.py:126
 msgid "You are not allowed to add a book to the shelf"
-msgstr ""
+msgstr "Keine Erlaubnis Bücher zu diesem Bücherregal hinzuzufügen"
 
 #: cps/shelf.py:144
 #, python-format
@@ -1040,7 +1037,7 @@ msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 
 #: cps/shelf.py:218
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
+msgstr "Sie haben keine Berechtigung um Bücher aus diesem Bücherregal zu löschen"
 
 #: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
@@ -1056,7 +1053,7 @@ msgstr "Bücherregal editieren"
 
 #: cps/shelf.py:249
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
+msgstr "Sie haben keine Berechtigung um öffentliche Bücherregal zu erzeugen"
 
 #: cps/shelf.py:261
 #, python-format
@@ -1332,7 +1329,7 @@ msgstr "Konvertierte Datei nicht gefunden, oder mehr als eine Datei im Pfad %(fo
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Fehler des EBook-Converters: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre fehlgeschlagen mit Fehler: %(error)s"
@@ -1755,9 +1752,8 @@ msgid "Keyword"
 msgstr "Suchbegriff"
 
 #: cps/templates/book_edit.html:233
-#, fuzzy
 msgid "Search keyword"
-msgstr " Suchbegriff "
+msgstr "Suche Schlüsselbegriff"
 
 #: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
@@ -1865,21 +1861,19 @@ msgid "Enter Publishers"
 msgstr "Herausgeber eingeben"
 
 #: cps/templates/book_table.html:73
-#, fuzzy
 msgid "Enter comments"
-msgstr "Domainnamen eingeben"
+msgstr "Kommentare eingeben"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
-msgstr ""
+msgstr "Kommentare"
 
 #: cps/templates/book_table.html:77 cps/templates/book_table.html:79
 #: cps/templates/book_table.html:81 cps/templates/book_table.html:83
 #: cps/templates/book_table.html:87 cps/templates/book_table.html:89
 #: cps/templates/book_table.html:91 cps/templates/book_table.html:93
-#, fuzzy
 msgid "Enter "
-msgstr "IDs"
+msgstr "Eingeben "
 
 #: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
 msgid "Are you really sure?"
@@ -1955,7 +1949,7 @@ msgstr "Nightly"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr ""
+msgstr "Trusted Hosts (Komma separiert)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
@@ -1979,7 +1973,7 @@ msgstr "Feature-Konfiguration"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr ""
+msgstr "Nicht-englische Zeichen in Titel und Autor beim Speichern auf Festplatte ersetzen"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
@@ -1987,7 +1981,7 @@ msgstr "Hochladen aktivieren"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr ""
+msgstr "(Bitte stellen Sie sicher das sie über die Upload Berechtigung verfügen)"
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
@@ -2274,14 +2268,12 @@ msgid "Allow Editing Public Shelves"
 msgstr "Editieren öffentlicher Bücherregale erlauben"
 
 #: cps/templates/config_view_edit.html:123
-#, fuzzy
 msgid "Default Language"
-msgstr "Sprachen ausschließen"
+msgstr "Default Sprache"
 
 #: cps/templates/config_view_edit.html:131
-#, fuzzy
 msgid "Default Visible Language of Books"
-msgstr "Zeige nur Bücher mit dieser Sprache"
+msgstr "Defaulteinstellung sichtbare Büchersprache"
 
 #: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
@@ -2451,11 +2443,11 @@ msgstr "Benutzer ausloggem"
 
 #: cps/templates/index.html:69
 msgid "Sort ascending according to download count"
-msgstr ""
+msgstr "Aufsteigend nach Downloadzahlen sortieren"
 
 #: cps/templates/index.html:70
 msgid "Sort descending according to download count"
-msgstr ""
+msgstr "Absteigend nach Downloadzahlen sortieren"
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
@@ -2568,7 +2560,7 @@ msgstr "Fehler"
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Einstellungen"
@@ -2717,7 +2709,7 @@ msgstr "Calibre-Web E-Book-Katalog"
 msgid "epub Reader"
 msgstr "epub-Leser"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Text umbrechen, wenn Seitenleiste geöffnet ist."
 
@@ -3071,7 +3063,7 @@ msgstr "Erzeugen/Ansehen"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr ""
+msgstr "Komplettsynchronisation Kobo erzwingen"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
@@ -3150,9 +3142,8 @@ msgid "Edit Denied Column Values"
 msgstr "Erlaubte/Verbotene Calibre Spalten bearbeiten"
 
 #: cps/templates/user_table.html:142
-#, fuzzy
 msgid "Denied Column Values"
-msgstr "Verbotene Calibre Spalten"
+msgstr "Verbotene Spaltennamen"
 
 #: cps/templates/user_table.html:144
 msgid "Change Password"
@@ -3167,7 +3158,6 @@ msgid "Edit Public Shelves"
 msgstr "Öffentliche Bücherregale bearbeiten"
 
 #: cps/templates/user_table.html:152
-#, fuzzy
 msgid "Sync selected Shelves with Kobo"
 msgstr "Ausgesuchte Bücherregale mit Kobo synchronisieren"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index bbafe7de47247c277900badefb9cde8cbc43c6d7..4068708c27897b675a4e7d1e2ee166871fbc2096 100644
GIT binary patch
delta 30
mcmeA@%-nmJdBfy54kIH4LrW_Iv(2;PI2jo&HZP5T(Fg#i)e7wZ

delta 30
mcmeA@%-nmJdBfy54nq?KLvt%r!_BkfI2jo&H!qEU(Fg#i(hBVW

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index c4389f7ad..2afe1a0a6 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -15,7 +15,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Χρήστης Διαχειριστής"
 msgid "All"
 msgstr "Όλα"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Δεν βρέθηκε χρήστης"
 
@@ -92,7 +92,7 @@ msgstr "Προβολή Όλων"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Ενημερώθηκε η διαμόρφωση Calibre-Web"
 
@@ -208,279 +208,279 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Απόρριψη"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Επιτρέπεται"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json Δεν Έχει Διαμορφωθεί Για Διαδικτυακή Εφαρμογή"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Φύλλο Καταγραφής Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Πρόσβαση Φύλλου Καταγραφης Τοποθεσίας δεν είναι έγκυρη, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Παρακαλούμε Συμπλήρωσε ένα Πάροχο LDAP, Θύρα, DN και Αντικείμενο Αναγνώρισης Χρήστη"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Η DB δεν μπορεί να Γραφτεί"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Το E-mail δεν είναι από έγκυρο domain"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Προσθήκη νέου χρήστη"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Επεξεργασία χρήστη %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Προβολέας αρχείου φύλλου καταγραφής"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Αίτημα πακέτου ενημέρωσης"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Κατεβάζει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Ανοίγει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Αντικατάσταση αρχείων"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Σταματάει το διακομιστή"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Η ενημέρωση απέτυχε:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Σφάλμα"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Σφάλμα σύνδεσης"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Γενικό σφάλμα"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Σφάλμα: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1342,7 +1342,7 @@ msgstr "Το τροποποιημένο αρχείο δεν βρέθηκε ή υ
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Ebook απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Το Calibre απέτυχε με σφάλμα: %(error)s"
@@ -2581,7 +2581,7 @@ msgstr "Σφάλμα"
 msgid "Upload done, processing, please wait..."
 msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ρυθμίσεις"
@@ -2732,7 +2732,7 @@ msgstr "Calibre-Web Κατάλογος eBook"
 msgid "epub Reader"
 msgstr "PDF πρόγραμμα ανάγνωσης"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Επανάληψη ροής κειμένου όταν οι μπάρες στο πλάι είναι ανοιχτές."
 
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index a476236c2e4db4569fabd707fd52271759f95fda..aaa84a38823366c0be19402b88b798683e733d90 100644
GIT binary patch
delta 30
mcmZpg$lNrMdBf>^4kIH4LrW_Iv(1<D6&M*UHh(GT3kLwDlnVF&

delta 30
mcmZpg$lNrMdBf>^4nq?KLvt%r!_AlT6&M*UH-9PU3kLwDkqY<#

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 4254df109..3047167f7 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,7 +18,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -79,7 +79,7 @@ msgstr "Editar usuarios"
 msgid "All"
 msgstr "Todo"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
@@ -96,7 +96,7 @@ msgstr "Mostrar todo"
 msgid "Malformed request"
 msgstr "Petición mal formulada"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "El nombre de invitado no se puede cambiar"
 
@@ -104,7 +104,7 @@ msgstr "El nombre de invitado no se puede cambiar"
 msgid "Guest can't have this role"
 msgstr "El invitado no puede tener ese rol"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "No queda ningún usuario administrador, no se puede eliminar al usuario"
 
@@ -148,7 +148,7 @@ msgstr "Columna de lectura no válida"
 msgid "Invalid Restricted Column"
 msgstr "Columna restringida no válida"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
@@ -212,279 +212,279 @@ msgstr "Etiqueta no encontrada"
 msgid "Invalid Action"
 msgstr "Acción no válida"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Denegar"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 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:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Access Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Por favor, Introduce un proveedor LDAP, puerto, DN y el User Object Identifier"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, introduce una cuenta de servicio LDAP y su contraseña"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Por favor, introduce una cuenta de servicio LDAP"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, 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:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, 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:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "El filtro de usuarios LDAP necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "El filtro de LDAP \"Member User\" tiene paréntesis no coincidentes"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la clave no válidos. Por favor introduce la ruta correcta"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "La base de datos de configuración no es modificable"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de la base de datos no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "La base de datos no es modificable"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Keyfile no es válida, por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de Certfile no es válida, por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Añadir un nuevo usuario"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' eliminado"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "No puedes borrar al Usuario Invitado"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede borrar al usuario"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 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:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros de correo"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "Verificación de cuenta de Gmail exitosa"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Puesto en cola un correo electrónico de prueba enviado a %(email)s, por favor, comprueba el resultado en Tareas"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 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:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "La actualización del archivo no pudo guardarse en el directorio temporal (Temp Dir)"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Error: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 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:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Usuario importado con éxito"
 
@@ -1346,7 +1346,7 @@ msgstr "Archivo convertido no encontrado, o más de un archivo en el directorio
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Falló Ebook-converter: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre falló con el error: %(error)s"
@@ -2585,7 +2585,7 @@ msgstr "Error"
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ajustes"
@@ -2736,7 +2736,7 @@ msgstr "Catálogo de ebooks de Calibre-Web"
 msgid "epub Reader"
 msgstr "Lector PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Redimensionar el texto cuando las barras laterales están abiertas."
 
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index a6a8eea22ae2015996cf9171da50daf962aad316..6493ba4325f76fbee08206f00e39284f80e0ea76 100644
GIT binary patch
delta 30
mcmZ2>jd9sE#tkL*97aY8hL%<aW}9p5r5G74Hcxlx*8%{j4hi`H

delta 30
mcmZ2>jd9sE#tkL*9EK(ehUQkLhMQ~br5G74H&1uy*8%{j3kmrE

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 5fe3845ed..ae6cbd12a 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -76,7 +76,7 @@ msgstr "Pääkäyttäjä"
 msgid "All"
 msgstr "Kaikki"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr "Näytä kaikki"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
@@ -209,276 +209,276 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 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:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 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:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1340,7 +1340,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-kirjan muunnos epäonnistui: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2577,7 +2577,7 @@ msgstr "Virhe"
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Asetukset"
@@ -2728,7 +2728,7 @@ msgstr "Calibre-Web e-kirjaluettelo"
 msgid "epub Reader"
 msgstr "PDF lukija"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Uudelleenjärjestä teksti kun sivut on auki."
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 1c4e6de1da68267433118f1c0b12870ff2029506..ed7751543b7f4b78e543f112eedb1f6a3dcadf29 100644
GIT binary patch
delta 30
mcmZ3wn0e`9<_-1v97aY8hL%<aW}DmdIT;x(Hcu=NNdy3+;0fRW

delta 30
mcmZ3wn0e`9<_-1v9EK(ehUQkLhMU{-IT;x(H%}}ONdy3+-3j0T

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 753263fbc..32ebdc2a8 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -31,7 +31,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -91,7 +91,7 @@ msgstr "Utilisateur admin"
 msgid "All"
 msgstr "Tout"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
@@ -108,7 +108,7 @@ msgstr "Montrer tout"
 msgid "Malformed request"
 msgstr "Demande malformée"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Le nom de l’invité ne peut pas être modifié"
 
@@ -116,7 +116,7 @@ msgstr "Le nom de l’invité ne peut pas être modifié"
 msgid "Guest can't have this role"
 msgstr "L’invité ne peut pas avoir ce rôle"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer le rôle admin"
 
@@ -160,7 +160,7 @@ msgstr "Colonne de lecture non valide"
 msgid "Invalid Restricted Column"
 msgstr "Colonne restreinte non valide"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
@@ -224,279 +224,279 @@ msgstr "Étiquette introuvable"
 msgid "Invalid Action"
 msgstr "Action invalide"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Refuser"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Autoriser"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 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:1070
+#: cps/admin.py:1081
 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:1076
+#: cps/admin.py:1087
 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:1106
+#: cps/admin.py:1117
 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:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Veuillez entrer un compte de service LDAP"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, 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:1122
+#: cps/admin.py:1133
 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:1126
+#: cps/admin.py:1137
 #, 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:1128
+#: cps/admin.py:1139
 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:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre utilisateur des membres LDAP doit avoir un identificateur de format \"%s\\ »"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Le filtre utilisateur de membre LDAP a des parenthèses non appariées"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuillez entrer le chemin correct"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Les paramètres de la base de données ne sont pas accessibles en écriture"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement de la base de données est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "La base de données n'est pas accessible en écriture"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 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:1228
+#: cps/admin.py:1239
 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:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Impossible de supprimer l’utilisateur Invité"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "La vérification du compte Gmail réussie"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Teste les courriels en file d’attente pour l’envoi à %(email)s, veuillez vérifier le résultat des tâches"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, 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:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 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:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erreur : %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 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:1840
+#: cps/admin.py:1851
 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:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} utilisateur importé avec succès"
 
@@ -1358,7 +1358,7 @@ msgstr "Fichier converti non trouvé ou plus d'un fichier dans le chemin %(folde
 msgid "Ebook-converter failed: %(error)s"
 msgstr "La commande ebook-convert a échouée : %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre a échoué avec l’erreur : %(error)s"
@@ -2597,7 +2597,7 @@ msgstr "Erreur"
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Paramètres"
@@ -2748,7 +2748,7 @@ msgstr "Catalogue de livres électroniques Calibre-Web"
 msgid "epub Reader"
 msgstr "Lecteur PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Mettre à jour la mise en page du texte quand les bandeaux latéraux sont ouverts."
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 58ac79655713c9103519382572063fdfce35a686..58121e6b00bb63d7a8f3f1d9dd7e93db98673cd5 100644
GIT binary patch
delta 29
lcmca}gz?T1#tj?HIE;)G3@xn;%qH(J`_5>wd4u^HEdaFV3y=T+

delta 29
lcmca}gz?T1#tj?HI1Eh`49%@f4JYp~`_5>&d4u^HEdaFT3y=T+

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 7e6b1ed7b..6012214db 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -76,7 +76,7 @@ msgstr "Rendszergazda felhasználó"
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr "Mindent mutass"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
@@ -209,276 +209,276 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 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:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, 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:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 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:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 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:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1340,7 +1340,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Az e-könyv átalakítás nem sikerült: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2577,7 +2577,7 @@ msgstr "Hiba"
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Beállítások"
@@ -2727,7 +2727,7 @@ msgstr "Calibre-Web e-könyv katalógus"
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Szöveg újratördelése amikor az oldalsávok nyitva vannak"
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index f7ef8e8940133c1e4fabd9a8f7639243a319058f..f53f178d6988a9708ba6127dbcc2aac6247f86a9 100644
GIT binary patch
delta 30
mcmaF8o%!{4<_$g-97aY8hL%<aW}8DQgc%tvHfK~eCjkJm%nF(S

delta 30
mcmaF8o%!{4<_$g-9EK(ehUQkLhMPkwgc%tvH)m8fCjkJm$qJeP

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index ae3ed927d..4549a9367 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,7 +15,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -74,7 +74,7 @@ msgstr "Modifica gli utenti"
 msgid "All"
 msgstr "Tutti"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Utente non trovato"
 
@@ -91,7 +91,7 @@ msgstr "tutte le lingue presenti"
 msgid "Malformed request"
 msgstr "Richiesta non formulata correttamente"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 
@@ -99,7 +99,7 @@ msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 msgid "Guest can't have this role"
 msgstr "L'utente Guest (ospite) non può avere questo ruolo"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso rimuovere il ruolo di amministratore"
 
@@ -143,7 +143,7 @@ msgstr "Colonna di lettura non valida"
 msgid "Invalid Restricted Column"
 msgstr "Colonna con restrizioni non valida"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
@@ -204,273 +204,273 @@ msgstr "Etichetta non trovata"
 msgid "Invalid Action"
 msgstr "Azione non valida"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Nega"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permetti"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json non è configurato per Web Application"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 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:1076
+#: cps/admin.py:1087
 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:1106
+#: cps/admin.py:1117
 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:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Per favore digita nome di utente e password del servizio LDAP"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Per favore indica un account di servizio LDAP"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, 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:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, 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:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, 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:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 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:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "I parametri del DB non sono scrivibili"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 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:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Il DB non è scrivibile"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 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:1228
+#: cps/admin.py:1239
 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:1335
+#: cps/admin.py:1346
 msgid "Database Settings updated"
 msgstr "Configurazione del Database aggiornata"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "L'utente '%(user)s' è stato creato"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "L'utente '%(nick)s' è stato eliminato"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Non posso eliminare l'utente Guest (ospite)"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Modifica le impostazioni del server e-mail"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "L'account Gmail è stato verificato con successo"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "L'e-mail di test è stato accodato con successo per essere spedito a  %(email)s, per favore verifica tramite il pulsante 'Compito' il risultato"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr "Durante l'aggiornamento non è stato possibile sostituire alcuni file"
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr "Fallita l'estrazione di almeno un utente LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Fallita la creazione di almeno un utente LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Errore: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Almeno un utente LDAP non è stato trovato nel database"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} utente importato con successo"
 
@@ -1330,7 +1330,7 @@ msgstr "Non ho trovato il file convertito o ci sono più di un file nella cartel
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Errore nel convertitore: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Si è verificato un errore con Calibre: %(error)s"
@@ -2562,7 +2562,7 @@ msgstr "Errore"
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Configurazione"
@@ -2711,7 +2711,7 @@ msgstr "Catalogo Calibre-Web"
 msgid "epub Reader"
 msgstr "Lettore epub"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Adatta il testo quando le barre laterali sono aperte."
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index afb7b8da638e2cdebe0aa2c13ad21330f93b5b73..e0ea3ef77ac4ddc2c8a45f3da5fe51e014946399 100644
GIT binary patch
delta 30
mcmZpk&DcDfaYLCFhmnzjp{139+2%SeX+}ni&9k&$DgpqJy9rkS

delta 30
mcmZpk&DcDfaYLCFhoOmrp}Cc*;pRFmX+}oN&9k&$DgpqJxCvJP

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index c8bfd79ee..805e925b5 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
@@ -204,276 +204,276 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "機能設定"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP設定を変更"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1335,7 +1335,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter が失敗しました: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2571,7 +2571,7 @@ msgstr "エラー"
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "設定"
@@ -2721,7 +2721,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index ffd09157b05df02247331d69602fb202cd19cf90..59d510d611b0a5f7af96521f3ae1abd8d591b1fb 100644
GIT binary patch
delta 29
lcmaE~pYhRt#tjEmIE;)G3@xn;%qE{y`OIjsd9SLf6#%ph3lIPR

delta 29
lcmaE~pYhRt#tjEmI1Eh`49%@f4JV&e`OIj!d9SLf6#%pf3lIPR

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index e867d38c6..196ea2a9a 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,7 +17,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -77,7 +77,7 @@ msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgstr "បង្ហាញទាំងអស់"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -210,275 +210,275 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1339,7 +1339,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2575,7 +2575,7 @@ msgstr ""
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "ការកំណត់"
@@ -2725,7 +2725,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "សេរេអត្ថបទនៅពេលបើកផ្ទាំងចំហៀង។"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 46b0374b19e4d7f4baf22424e3b5e1decea01fb2..d7e7c45ee39325b7c028cb75a234a08734bb2334 100644
GIT binary patch
delta 30
mcmX@u#eA@fdBf8}4kIH4LrW_Iv(0Y{4H+3NHp>?)1pxrEKMHOD

delta 30
mcmX@u#eA@fdBf8}4nq?KLvt%r!_99C4H+3NH_I0*1pxrEJPK|A

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 885940805..fc45d08ac 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -77,7 +77,7 @@ msgstr "Systeembeheerder"
 msgid "All"
 msgstr "Alles"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
@@ -94,7 +94,7 @@ msgstr "Alle talen"
 msgid "Malformed request"
 msgstr "Misvormd verzoek"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Gast naam kan niet worden veranderd"
 
@@ -102,7 +102,7 @@ msgstr "Gast naam kan niet worden veranderd"
 msgid "Guest can't have this role"
 msgstr "Gast kan deze rol niet hebben"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
@@ -146,7 +146,7 @@ msgstr "Ongeldige gelezen kolom"
 msgid "Invalid Restricted Column"
 msgstr "Ongeldige beperkte kolom"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
@@ -210,278 +210,278 @@ msgstr "Tag niet gevonden"
 msgid "Invalid Action"
 msgstr "Ongeldige actie"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Weigeren"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Toestaan"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json is niet geconfigureerd voor webapplicatie"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 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:1076
+#: cps/admin.py:1087
 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:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Voer alsjeblieft een LDAP Provider, Port, DN en User Object Identifier in"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Voer een geldig LDAP Service Account en wachtwoord in"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Voer een LDAP Service Account in"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Groep Object Filter Moet Een \"%s\" Formaat Identificiatie hebben"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Groep Object Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Gebruiker Object Filter moet \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Lid Gebruiker Filter moet een \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Lid Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsjeblieft een geldig pad in."
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "DB-instellingen niet opgeslagen"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Database niet gevonden, voer de juiste locatie in"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Kan niet schrijven naar database"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-sleutellocatie is niet geldig, voer een geldig pad in"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-certificaatlocatie is niet geldig, voer een geldig pad in"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Kan Gast gebruiker niet verwijderen"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account succesvol geverifieerd"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail wordt verzonden naar %(email)s, controleer de taken voor het resultaat"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mislukt om minstens een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Het is niet gelukt tenminste een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fout: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fout: No user returned in response of LDAP server"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minstens een LDAP Gebruiker is niet gevonden in de Database"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Gebruiker succesvol geïmporteerd"
 
@@ -1343,7 +1343,7 @@ msgstr "Omgezette bestand is niet gevonden of meer dan een bestand in map %(fold
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-boek-conversie mislukt: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre mislukt met foutmelding: %(error)s"
@@ -2582,7 +2582,7 @@ msgstr "Fout"
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Instellingen"
@@ -2733,7 +2733,7 @@ msgstr "Calibre-Web - e-boekcatalogus"
 msgid "epub Reader"
 msgstr "PDF lezer"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Tekstindeling automatisch aanpassen als het zijpaneel geopend is."
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 26286b36a7d211d76960cbb277672f98a950231f..3c1424b46a39204b6817d00519046c223aca62ed 100644
GIT binary patch
delta 30
mcmdlxlX>q<<_&X-IE;)G3@xn;%r-A6N@HZS*vwtBDFOhkxC*QQ

delta 30
mcmdlxlX>q<<_&X-I1Eh`49%@f4L2_-N@HZS+{|6FDFOhkwF;~N

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 85da79f1e..c7dfbcf77 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -78,7 +78,7 @@ msgstr "Edytuj użytkowników"
 msgid "All"
 msgstr "Wszystko"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
@@ -95,7 +95,7 @@ msgstr "Pokaż wszystkie"
 msgid "Malformed request"
 msgstr "Nieprawidłowo sformułowane żądanie"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Nazwa gościa nie może być zmieniona"
 
@@ -103,7 +103,7 @@ msgstr "Nazwa gościa nie może być zmieniona"
 msgid "Guest can't have this role"
 msgstr "Gość nie może pełnić tej roli"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 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"
 
@@ -149,7 +149,7 @@ msgstr "Nieprawidłowa kolumna odczytu"
 msgid "Invalid Restricted Column"
 msgstr "Nieprawidłowa kolumna z ograniczeniami"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
@@ -210,279 +210,279 @@ msgstr "Nie znaleziono znacznika"
 msgid "Invalid Action"
 msgstr "Nieprawidłowe działanie"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zabroń"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Zezwalaj"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json nie został skonfigurowany dla aplikacji webowej"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 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:1106
+#: cps/admin.py:1117
 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:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Proszę wprowadzić konto i hasło usługi LDAP"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Proszę wprowadzić konto usługi LDAP"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, 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:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów grupy LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, 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:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów użytkownika LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr użytkownika członka LDAP musi mieć jedno \"%s\" identyfikator formatu"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtr użytkownika członka LDAP ma niedopasowane nawiasy"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie jest prawidłowa, Proszę wprowadzić poprawną ścieżkę"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Ustawienia Bazy Danych nie są zapisywalne"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Baza danych nie jest zapisywalna"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 #, fuzzy
 msgid "Can't delete Guest User"
 msgstr "Nie można usunąć użytkownika gościa"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 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:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, fuzzy, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testowy e-mail czeka w kolejce do wysłania do %(email)s, sprawdź zadania, aby uzyskać wynik"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
 # ???
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Błąd: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 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:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Użytkownik pomyślnie zaimportowany"
 
@@ -1347,7 +1347,7 @@ msgstr "Konwertowany plik nie został znaleziony, lub więcej niż jeden plik w
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Konwertowanie nie powiodło się: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, fuzzy, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre nie powiodło się z błędem: %(error)s"
@@ -2597,7 +2597,7 @@ msgstr "Błąd"
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ustawienia"
@@ -2749,7 +2749,7 @@ msgstr "Katalog e-booków Calibre-Web"
 msgid "epub Reader"
 msgstr "Czytnik PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Przepływ tekstu, gdy paski boczne są otwarte."
 
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 23b5a33f2199bd120ac7e3f66b1b9acd46b499ad..c6efe3c2bd789c787432ed2b1b4d82a3f36684a4 100644
GIT binary patch
delta 30
mcmccgj_J}nrVTY|97aY8hL%<aW}92mY?v4=HXqEG=m!A5sSA7n

delta 30
mcmccgj_J}nrVTY|9EK(ehUQkLhMQZ`Y?v4=Hy_NH=m!A5rVD%k

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index a40a13e78..762d185fc 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -13,7 +13,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -73,7 +73,7 @@ msgstr "Usuário Admin"
 msgid "All"
 msgstr "Todos"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Usuário não encontrado"
 
@@ -91,7 +91,7 @@ msgstr "Mostrar tudo"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nenhum usuário administrador restante, não pode remover a função de administrador"
 
@@ -143,7 +143,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Configuração do Calibre-Web atualizada"
 
@@ -207,279 +207,279 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Negar"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permita"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json não está configurado para aplicativo da web"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log não é válida, digite o caminho correto"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log de acesso não é válida, digite o caminho correto"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Digite um provedor LDAP, porta, DN e identificador de objeto do usuário"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de grupo LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de grupo LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de usuário LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de usuário LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de usuário membro do LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtro de usuário de membro LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificate, Certificados ou chave de localização não é válida, Insira o caminho correto"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "O banco de dados de configurações não é gravável"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do banco de dados não é válida, digite o caminho correto"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "DB não é gravável"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo-chave não é válida, por favor insira o caminho correto"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de certificação não é válida, digite o caminho correto"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Atualização das configurações do servidor de e-mail"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuração das Características"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "O e-mail não é de um domínio válido"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Adicionar novo usuário"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuário '%(user)s' criado"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrei uma conta existente para este endereço de e-mail ou apelido."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuário '%(nick)s' excluído"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Nenhum usuário administrador restante, não é possível excluir o usuário"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar usuário %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuário '%(nick)s' atualizado"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Editar configurações do servidor de e-mail"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocorreu um erro ao enviar o e-mail de teste: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure seu endereço de e-mail primeiro..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Atualização das configurações do servidor de e-mail"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Senha para redefinição do usuário %(user)s"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "visualizador de arquivo de registro"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Solicitação de pacote de atualização"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Download do pacote de atualização"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Descompactação de pacote de atualização"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Substituição de arquivos"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "As ligações à base de dados estão fechadas"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Parar servidor"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Atualização concluída, pressione okay e recarregue a página"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Atualização falhou:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Erro HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Erro de conexão"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tempo limite durante o estabelecimento da conexão"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Erro geral"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Arquivo de atualização não pôde ser salvo no diretório temporário"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erro: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erro: Nenhum usuário retornado em resposta do servidor LDAP"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "No mínimo um usuário LDAP não encontrado no banco de dados"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Usuário Importado com Sucesso"
 
@@ -1341,7 +1341,7 @@ msgstr "Arquivo convertido não encontrado ou mais de um arquivo na pasta %(fold
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Conversor de ebook falhou: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre falhou com erro: %(error)s"
@@ -2580,7 +2580,7 @@ msgstr "Erro"
 msgid "Upload done, processing, please wait..."
 msgstr "Upload feito, processando, por favor aguarde ..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Configurações"
@@ -2731,7 +2731,7 @@ msgstr "Catálogo de e-books Calibre-Web"
 msgid "epub Reader"
 msgstr "leitor de PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Refluxo de texto quando as barras laterais estão abertas."
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 255a7fd7f9e20aaaf25b6b77c4df1b9b9b2b189f..69d9e91fa593d79d7386beda5873cec19f1012b2 100644
GIT binary patch
delta 30
mcmaF(jp^YxrVY|T97aY8hL%<aW}B6RTp1ZHHfIL^NCyD4=L*{Z

delta 30
mcmaF(jp^YxrVY|T9EK(ehUQkLhMSdxTp1ZHH)jU_NCyD4<O<sW

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 3d991d645..2eb525685 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,7 +17,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -77,7 +77,7 @@ msgstr "Управление сервером"
 msgid "All"
 msgstr "Все"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgstr "Показать все"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
@@ -210,279 +210,279 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Запретить"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Разрешить"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json не настроен для веб-приложения"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Неправильное расположение файла журнала, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Недопустимое расположение файла журнала доступа, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Пожалуйста, введите провайдера LDAP, порт, DN и идентификатор объекта пользователя"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов группы LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов группы LDAP имеет незавершённые круглые скобки"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов пользователя LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов пользователя LDAP имеет незавершенную круглую скобку"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Базы Данных неверно, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение ключевого файла неверно, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Ошибка: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1344,7 +1344,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ошибка Ebook-конвертора: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2583,7 +2583,7 @@ msgstr "Ошибка"
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Настройки"
@@ -2734,7 +2734,7 @@ msgstr "Каталог электронных книг Caliber-Web"
 msgid "epub Reader"
 msgstr "PDF reader"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Обновить размещение текста при открытии боковой панели."
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 8098504577ddae5887795655c87e4e0e497c7729..22c37233b6be8237799631f454937faed6473bc0 100644
GIT binary patch
delta 30
mcmezIhv~;3rVaP=IgE@H3@xn;%r-yIS7l_h*vwm)?F#_ajtkNN

delta 30
mcmezIhv~;3rVaP=ISfq{49%@f4L3i}S7l_h+{{~;?F#_aiwn{K

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index e9cfb11ec..0030825f7 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Redigera användare"
 msgid "All"
 msgstr "Alla"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Användaren hittades inte"
 
@@ -92,7 +92,7 @@ msgstr "Visa alla"
 msgid "Malformed request"
 msgstr "Felaktig begäran"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Gästnamn kan inte ändras"
 
@@ -100,7 +100,7 @@ msgstr "Gästnamn kan inte ändras"
 msgid "Guest can't have this role"
 msgstr "Gäst kan inte ha den här rollen"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Ingen administratörsanvändare kvar, kan inte ta bort administratörsrollen"
 
@@ -145,7 +145,7 @@ msgstr "Ogiltig roll"
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
@@ -207,279 +207,279 @@ msgstr "Taggen hittades inte"
 msgid "Invalid Action"
 msgstr "Ogiltig åtgärd"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Förneka"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Tillåt"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json är inte konfigurerad för webbapplikation"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Loggfilens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Åtkomstloggplatsens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Vänligen ange en LDAP-leverantör, port, DN och användarobjektidentifierare"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-gruppobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-gruppobjektfilter har omatchande parentes"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-användarobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-användarobjektfilter har omatchad parentes"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Användarfilter för LDAP-medlemmar måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Användarfilter för LDAP-medlemmar har omatchad parentes"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Inställningar för DB är inte skrivbara"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "DB-plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "DB är inte skrivbar"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Keyfile-platsen är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Certfile-platsen är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Hittade ett befintligt konto för den här e-postadressen eller namnet."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Det går inte att ta bort gästanvändaren"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 #, fuzzy
 msgid "Gmail Account Verification Successful"
 msgstr "Verifiering av G-mail-kontot lyckades"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testa e-post i kö för att skicka till %(email)s, vänligen kontrollera Uppgifter för resultat"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Uppdateringsfilen kunde inte sparas i Temp Dir"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fel: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fel: Ingen användare återges som svar på LDAP-servern"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minst en LDAP-användare hittades inte i databasen"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} användare har importerats"
 
@@ -1340,7 +1340,7 @@ msgstr "Konverterad fil hittades inte eller mer än en fil i mappen %(folder)s"
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-bokkonverteraren misslyckades: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "calibre misslyckades med fel: %(error)s"
@@ -2580,7 +2580,7 @@ msgstr "Fel"
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Inställningar"
@@ -2730,7 +2730,7 @@ msgstr "Calibre-Web e-bokkatalog"
 msgid "epub Reader"
 msgstr "PDF-läsare"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Fyll i texten igen när sidofält är öppna."
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index fbad469794a36a215097b28241ad531de6c4e936..4354ea9aa3eb72cd7758b46d267bb21923274341 100644
GIT binary patch
delta 30
mcmZqM#Mripal=hx4kIH4LrW_Iv&|2U1sNGFHh(q|RsjH|842hB

delta 30
mcmZqM#Mripal=hx4nq?KLvt%r!_5zk1sNGFH-9z}RsjH|776G8

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 8a049549a..9d6781daa 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "All"
 msgstr "Tümü"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
@@ -204,278 +204,278 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "'%(user)s' kullanıcısı oluşturuldu"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Kullanıcı '%(nick)s' silindi"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, 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:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 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:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Bağlantı kurulmaya çalışırken zaman aşımına uğradı"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1337,7 +1337,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "eKitap-Dönüştürücü hatası: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2574,7 +2574,7 @@ msgstr "Hata"
 msgid "Upload done, processing, please wait..."
 msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ayarlar"
@@ -2725,7 +2725,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr "PDF Okuyucu"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Kenar çubukları açıkken metni kaydır"
 
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index c62a20741224bb4b7ac0506a67af57add25127da..62855c0847be892c5299e2aba81e4e5efcd1c2ee 100644
GIT binary patch
delta 30
mcmaFU!}z9$al-<64kIH4LrW_Iv&}2yQyCd8HuEXQsR970Q3-Yc

delta 30
mcmaFU!}z9$al-<64nq?KLvt%r!_6z?QyCd8H}fgRsR970P6>7Z

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 4e8801dab..9a4907fd5 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+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,7 +15,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Керування сервером"
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgstr "Показати всі"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -208,275 +208,275 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1337,7 +1337,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2573,7 +2573,7 @@ msgstr ""
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Налаштування"
@@ -2723,7 +2723,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Переформатувати текст, коли відкриті бічні панелі."
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index f7b864c06419b6c1b50a7fa22e8effca884a8167..3bbd44758668b5cf44be2dc9deef7cb3aab922ba 100644
GIT binary patch
delta 30
lcmdnd&b*_Yd4pCphmnzjp{139*=D0^bw);u%~3UR?f{t`310vJ

delta 30
lcmdnd&b*_Yd4pCphoOmrp}Cc*;bx<1bw)<Z%~3UR?f{t@310vJ

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 3986e33a3..34fae6308 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "管理用户"
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "找不到用户"
 
@@ -92,7 +92,7 @@ msgstr "显示全部"
 msgid "Malformed request"
 msgstr "格式错误的请求"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "访客名称无法更改"
 
@@ -100,7 +100,7 @@ msgstr "访客名称无法更改"
 msgid "Guest can't have this role"
 msgstr "游客无法拥有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
@@ -144,7 +144,7 @@ msgstr "无效的阅读列"
 msgid "Invalid Restricted Column"
 msgstr "无效的限制列"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
@@ -204,273 +204,273 @@ msgstr "标签未找到"
 msgid "Invalid Action"
 msgstr "无效的动作"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒绝"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允许"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "请输入一个LDAP服务账号和密码 "
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "请输入一个LDAP服务账号"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成员用户过滤器需要有一个“%s”格式标识符"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成员用户过滤器中有不匹配的括号"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写入"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "数据库路径无效，请输入正确的路径"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "数据库不可写入"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密钥文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 msgid "Database Settings updated"
 msgstr "数据库设置已更新"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户“%(user)s”已创建"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此邮箱或用户名的账号已经存在。"
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户“%(nick)s”已删除"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "无法删除游客用户"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail账号校验成功"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件无法保存在临时目录中"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr "更新期间无法替换文件"
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一个LDAP用户"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能创建至少一个LDAP用户"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "错误：%(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "错误：在LDAP服务器的响应中没有返回用户"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "数据库中没有找到至少一个LDAP用户"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} 用户被成功导入"
 
@@ -1329,7 +1329,7 @@ msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 msgid "Ebook-converter failed: %(error)s"
 msgstr "电子书转换器失败： %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 运行失败，错误信息：%(error)s"
@@ -2560,7 +2560,7 @@ msgstr "错误"
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "设置"
@@ -2709,7 +2709,7 @@ msgstr "Caliebre-Web电子书路径"
 msgid "epub Reader"
 msgstr "epub阅读器"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "打开侧栏时重排文本。"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 4a8c7cdda6dae1399802544661279fbb51224ac3..9f2dd7d88e9ed3c4c7bdc7ea6e0295deccf4b713 100644
GIT binary patch
delta 30
mcmezNm+9MIrVa1PIgE@H3@xn;%r<{3S7&6j*eq9h!xaG8kqmwS

delta 30
mcmezNm+9MIrVa1PISfq{49%@f4L5%)S7&6j+$>jl!xaG8jtqVP

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index a7c87e249..d9cbf08bb 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "管理用戶"
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "找不到用戶"
 
@@ -92,7 +92,7 @@ msgstr "顯示全部"
 msgid "Malformed request"
 msgstr "格式錯誤的請求"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "訪客名稱無法更改"
 
@@ -100,7 +100,7 @@ msgstr "訪客名稱無法更改"
 msgid "Guest can't have this role"
 msgstr "遊客無法擁有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "管理員賬戶不存在，無法刪除管理員角色"
 
@@ -144,7 +144,7 @@ msgstr "無效的閱讀列"
 msgid "Invalid Restricted Column"
 msgstr "無效的限制列"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
@@ -204,275 +204,275 @@ msgstr "標籤未找到"
 msgid "Invalid Action"
 msgstr "無效的動作"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒絕"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允許"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未為 Web 應用程序配置"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日誌文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "訪問日誌路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "請輸入LDAP主機、端口、DN和用戶對象標識符"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "請輸入一個LDAP服務賬號和密碼 "
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "請輸入一個LDAP服務賬號"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP群組對象過濾器需要一個具有“%s”格式標識符號"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP群組對象過濾器的括號不匹配"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用戶對象過濾器需要一個具有“%s”格式標識符"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用戶對象過濾器的括號不匹配"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成員用戶過濾器需要有一個“%s”格式標識符號"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成員用戶過濾器中有不匹配的括號"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "設置數據庫不可寫入"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "數據庫路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "數據庫不可寫入"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密鑰文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "證書文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "郵箱不在有效網域中"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "添加新用戶"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用戶“%(user)s”已創建"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此郵箱或用戶名的賬號已經存在。"
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用戶“%(nick)s”已刪除"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "無法刪除訪客用戶"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "管理員賬戶不存在，無法刪除用戶"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "編輯用戶 %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用戶“%(nick)s”已更新"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "編輯郵件服務器設置"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail賬號驗證成功"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "發送給%(email)s的測試郵件已進入隊列。請檢查任務結果"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "發送測試郵件時出錯：%(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "請先配置您的郵箱地址..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "日誌文件查看器"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "正在請求更新包"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "正在下載更新包"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "正在解壓更新包"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "正在替換文件"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "數據庫連接已關閉"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "正在停止服務器"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，請點擊確定並刷新頁面"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "更新失敗："
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP錯誤"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "連接錯誤"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "建立連接超時"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "一般錯誤"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件無法保存在臨時目錄中"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr "更新時檔案無法替換變更"
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一個LDAP用戶"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能創建至少一個LDAP用戶"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "錯誤：%(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "錯誤：在LDAP服務器的響應中沒有返回用戶"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "數據庫中沒有找到至少一個LDAP用戶"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} 用戶被成功導入"
 
@@ -1331,7 +1331,7 @@ msgstr "找不到轉換後的文件或文件夾%(folder)s中有多個文件"
 msgid "Ebook-converter failed: %(error)s"
 msgstr "電子書轉換器失敗： %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 運行失敗，錯誤信息：%(error)s"
@@ -2567,7 +2567,7 @@ msgstr "錯誤"
 msgid "Upload done, processing, please wait..."
 msgstr "上傳完成，正在處理中，請稍候..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "設置"
@@ -2716,7 +2716,7 @@ msgstr "Caliebre-Web電子書路徑"
 msgid "epub Reader"
 msgstr "epub閱讀器"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "打開側欄時重排文本。"
 
diff --git a/messages.pot b/messages.pot
index 5588247f3..150274610 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+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.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -143,7 +143,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -203,273 +203,273 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 msgid "Database Settings updated"
 msgstr ""
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1328,7 +1328,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2559,7 +2559,7 @@ msgstr ""
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr ""
@@ -2708,7 +2708,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr ""
 

From bdedec90dd8df032cbc666a26618f17bcde3b6ea Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 23 Dec 2021 11:13:08 +0100
Subject: [PATCH 078/412] Catch more Gdrive errors (#2233)

---
 cps/gdrive.py      | 2 +-
 cps/gdriveutils.py | 7 +++++++
 cps/helper.py      | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cps/gdrive.py b/cps/gdrive.py
index 6ca73ca9f..e782cb9e5 100644
--- a/cps/gdrive.py
+++ b/cps/gdrive.py
@@ -109,7 +109,7 @@ def revoke_watch_gdrive():
         try:
             gdriveutils.stopChannel(gdriveutils.Gdrive.Instance().drive, last_watch_response['id'],
                                     last_watch_response['resourceId'])
-        except HttpError:
+        except (HttpError, AttributeError):
             pass
         config.config_google_drive_watch_changes_response = {}
         config.save()
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 878c1f9f7..c44459445 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -56,11 +56,13 @@ try:
     from pydrive2.auth import GoogleAuth
     from pydrive2.drive import GoogleDrive
     from pydrive2.auth import RefreshError
+    from pydrive2.files import ApiRequestError
 except ImportError as err:
     try:
         from pydrive.auth import GoogleAuth
         from pydrive.drive import GoogleDrive
         from pydrive.auth import RefreshError
+        from pydrive.files import ApiRequestError
     except ImportError as err:
         importError = err
         gdrive_support = False
@@ -322,6 +324,11 @@ def getFolderId(path, drive):
         log.error("gdrive.db DB is not Writeable")
         log.debug('Database error: %s', ex)
         session.rollback()
+    except ApiRequestError as ex:
+        log.error('{} {}'.format(ex.error['message'], path))
+        session.rollback()
+    except RefreshError as ex:
+        log.error(ex)
     return currentFolderId
 
 
diff --git a/cps/helper.py b/cps/helper.py
index e43055501..b8499a12e 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -673,9 +673,9 @@ def save_cover(img, book_path):
 
 def do_download_file(book, book_format, client, data, headers):
     if config.config_use_google_drive:
-        startTime = time.time()
+        #startTime = time.time()
         df = gd.getFileFromEbooksFolder(book.path, data.name + "." + book_format)
-        log.debug('%s', time.time() - startTime)
+        #log.debug('%s', time.time() - startTime)
         if df:
             return gd.do_gdrive_download(df, headers)
         else:

From ec73558b035e866442732074b717f00b729ae514 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 23 Dec 2021 19:14:21 +0100
Subject: [PATCH 079/412] Bugfix advanced search for language Update results
 from testrun

---
 cps/db.py                               |  17 +-
 test/Calibre-Web TestSummary_Linux.html | 740 ++++++++++--------------
 2 files changed, 313 insertions(+), 444 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 4b0a7ac78..9c5b56579 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -796,23 +796,24 @@ class CalibreDB():
     def speaking_language(self, languages=None, return_all_languages=False, with_count=False, reverse_order=False):
         from . import get_locale
 
-        if not languages:
-            if with_count:
+        if with_count:
+            if not languages:
                 languages = self.session.query(Languages, func.count('books_languages_link.book'))\
                     .join(books_languages_link).join(Books)\
                     .filter(self.common_filters(return_all_languages=return_all_languages)) \
                     .group_by(text('books_languages_link.lang_code')).all()
-                for lang in languages:
-                    lang[0].name = isoLanguages.get_language_name(get_locale(), lang[0].lang_code)
-                return sorted(languages, key=lambda x: x[0].name, reverse=reverse_order)
-            else:
+            for lang in languages:
+                lang[0].name = isoLanguages.get_language_name(get_locale(), lang[0].lang_code)
+            return sorted(languages, key=lambda x: x[0].name, reverse=reverse_order)
+        else:
+            if not languages:
                 languages = self.session.query(Languages) \
                     .join(books_languages_link) \
                     .join(Books) \
                     .filter(self.common_filters(return_all_languages=return_all_languages)) \
                     .group_by(text('books_languages_link.lang_code')).all()
-                for lang in languages:
-                    lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
+            for lang in languages:
+                lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
             return sorted(languages, key=lambda x: x.name, reverse=reverse_order)
 
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 3c54e88bf..d291d368e 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-05 19:18:28</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-22 20:24:40</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-12-05 22:58:48</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-12-23 00:00:41</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>3h 0 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>2h 57 min</p>
         </div>
       </div>
       </div>
@@ -705,11 +705,11 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">16</td>
-        <td class="text-center">14</td>
-        <td class="text-center">0</td>
+        <td class="text-center">13</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">
@@ -844,11 +844,31 @@
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id="ft10.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 300, in test_writeonly_path
+    self.assertTrue(os.path.isdir(book_path))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -881,11 +901,11 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
-        <td class="text-center">34</td>
-        <td class="text-center">0</td>
+        <td class="text-center">32</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -904,11 +924,31 @@
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id="ft11.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 177, in test_edit_author
+    self.assertTrue(os.path.isdir(os.path.join(TEST_DB, &#39;O0u Zhi&#39;, &#39;book8 (8)&#39;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1057,11 +1097,31 @@
     
     
     
-        <tr id='pt11.19' class='hiddenRow bg-success'>
+        <tr id="ft11.19" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.19')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.19" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 74, in test_edit_title
+    self.assertTrue(os.path.isdir(os.path.join(TEST_DB, values[&#39;author&#39;][0], &#39;O0u Zhi (4)&#39;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1405,11 +1465,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">18</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1428,11 +1488,31 @@
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id="ft13.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 297, in test_edit_author
+    self.assertTrue(gdrive_path)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1554,11 +1634,31 @@
     
     
     
-        <tr id='pt13.16' class='hiddenRow bg-success'>
+        <tr id="ft13.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.16')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 143, in test_edit_title
+    self.assertTrue(gdrive_path)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1858,11 +1958,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">2</td>
-        <td class="text-center">9</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">
@@ -1872,35 +1972,11 @@
 
     
     
-        <tr id="ft21.1" class="none bg-danger">
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <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_ft21.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 583, in test_book_download
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1914,134 +1990,38 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft21.3" class="none bg-danger">
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 602, in test_kobo_sync_selected_shelfs
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.4" class="none bg-danger">
+        <tr id='pt21.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 652, in test_kobo_upload_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.5" class="none bg-danger">
+        <tr id='pt21.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.5').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 447, in test_shelves_add_remove_books
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.6" class="none bg-danger">
+        <tr id='pt21.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 277, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2055,144 +2035,48 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft21.8" class="none bg-danger">
+        <tr id='pt21.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 514, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.9" class="none bg-danger">
+        <tr id='pt21.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 296, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.10" class="none bg-danger">
+        <tr id='pt21.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 242, in test_sync_unchanged
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.11" class="none bg-danger">
+        <tr id='pt21.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 256, in test_sync_upload
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">1</td>
-        <td class="text-center">4</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">
@@ -2211,134 +2095,38 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft22.2" class="none bg-danger">
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 260, in test_kobo_sync_selected_shelfs
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.3" class="none bg-danger">
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 164, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.4" class="none bg-danger">
+        <tr id='pt22.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 237, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.5" class="none bg-danger">
+        <tr id='pt22.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 193, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4377,11 +4165,11 @@ AssertionError: 0 != 1</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">11</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -4454,29 +4242,95 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id="ft41.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 44, in test_check_chinese_Characters
+    self.assertEqual(helper.get_valid_filename(u&#39;执一&#39;), u&#39;Zhi Yi&#39;)
+AssertionError: &#39;执一&#39; != &#39;Zhi Yi&#39;
+- 执一
++ Zhi Yi</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id="ft41.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 71, in test_check_deg_eur_replacement
+    self.assertEqual(helper.get_valid_filename(u&#39;°€&#39;), u&#39;degEUR&#39;)
+AssertionError: &#39;°€&#39; != &#39;degEUR&#39;
+- °€
++ degEUR</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id="ft41.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 36, in test_check_doubleS
+    self.assertEqual(helper.get_valid_filename(u&#39;§ß&#39;), u&#39;SSss&#39;)
+AssertionError: &#39;§ß&#39; != &#39;SSss&#39;
+- §ß
++ SSss</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4490,20 +4344,64 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id="ft41.12" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.12')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 32, in test_check_high23
+    self.assertEqual(helper.get_valid_filename(u&#39;²³&#39;), u&#39;23&#39;)
+AssertionError: &#39;²³&#39; != &#39;23&#39;
+- ²³
++ 23</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id="ft41.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 40, in test_check_umlauts
+    self.assertEqual(helper.get_valid_filename(u&#39;ÄÜÖäöü&#39;), u&#39;AUOaou&#39;)
+AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
+- ÄÜÖäöü
++ AUOaou</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4538,8 +4436,8 @@ AssertionError: 0 != 1</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>378</td>
-        <td>358</td>
-        <td>14</td>
+        <td>361</td>
+        <td>11</td>
         <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
@@ -4581,7 +4479,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Babel</th>
-              <td>2.9.0</td>
+              <td>2.9.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4593,13 +4491,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Flask</th>
-              <td>1.1.2</td>
+              <td>2.0.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Flask-Babel</th>
-              <td>1.0.0</td>
+              <td>2.0.0</td>
               <td>Basic</td>
             </tr>
           
@@ -4627,12 +4525,6 @@ AssertionError: 0 != 1</pre>
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>httplib2</th>
-              <td>0.14.0</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>iso-639</th>
               <td>0.4.5</td>
@@ -4641,25 +4533,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Jinja2</th>
-              <td>2.11.2</td>
+              <td>3.0.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>lxml</th>
-              <td>4.6.3</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>natsort</th>
-              <td>7.1.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>pyasn1</th>
-              <td>0.4.8</td>
+              <td>4.6.5</td>
               <td>Basic</td>
             </tr>
           
@@ -4671,31 +4551,19 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>pytz</th>
-              <td>2019.3</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>2021.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>requests</th>
-              <td>2.22.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>six</th>
-              <td>1.14.0</td>
+              <td>2.24.0</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.27</td>
+              <td>1.4.28</td>
               <td>Basic</td>
             </tr>
           
@@ -4707,7 +4575,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.1.1</td>
+              <td>1.2.0</td>
               <td>Basic</td>
             </tr>
           
@@ -4719,13 +4587,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Werkzeug</th>
-              <td>1.0.1</td>
+              <td>2.0.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4749,13 +4617,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4779,13 +4647,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4809,7 +4677,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4827,7 +4695,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4851,13 +4719,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4881,7 +4749,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4899,13 +4767,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.3.2</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.3.2</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -4917,7 +4785,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.3.2</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -4935,7 +4803,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>SQLAlchemy-Utils</th>
-              <td>0.37.9</td>
+              <td>0.38.1</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -4947,7 +4815,7 @@ AssertionError: 0 != 1</pre>
 </div>
 
 <script>
-    drawCircle(358, 14, 0, 6);
+    drawCircle(361, 11, 0, 6);
     showCase(5);
 </script>
 

From 222929e7413f97c4b81b093d1f21a8586d5c605d Mon Sep 17 00:00:00 2001
From: cbartondock <cbartondock@gmail.com>
Date: Thu, 23 Dec 2021 18:05:20 -0500
Subject: [PATCH 080/412] Fixed extra s in scholar metadata

---
 cps/metadata_provider/scholar.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 6e13c7689..9aa0ab876 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -19,20 +19,23 @@
 from scholarly import scholarly
 
 from cps.services.Metadata import Metadata
-
+import pprint
+pp = pprint.PrettyPrinter(indent=4)
 
 class scholar(Metadata):
     __name__ = "Google Scholar"
     __id__ = "googlescholar"
 
-    def search(self, query, generic_cover=""):
+    def search(self, query, generic_cover=None):
         val = list()
         if self.active:
             scholar_gen = scholarly.search_pubs(' '.join(query.split('+')))
             i = 0
             for publication in scholar_gen:
+                print(f"PUBLICATION {i + 1}")
+                pp.pprint(publication)
                 v = dict()
-                v['id'] = "1234" # publication['bib'].get('title')
+                v['id'] = publication['url_scholarbib'].split(':')[1]
                 v['title'] = publication['bib'].get('title')
                 v['authors'] = publication['bib'].get('author', [])
                 v['description'] = publication['bib'].get('abstract', "")
@@ -41,8 +44,8 @@ class scholar(Metadata):
                     v['publishedDate'] = publication['bib'].get('pub_year')+"-01-01"
                 else:
                     v['publishedDate'] = ""
-                v['tags'] = ""
-                v['ratings'] = 0
+                v['tags'] = []
+                v['rating'] = 0
                 v['series'] = ""
                 v['cover'] = generic_cover
                 v['url'] = publication.get('pub_url') or publication.get('eprint_url') or "",
@@ -55,6 +58,7 @@ class scholar(Metadata):
                 i += 1
                 if (i >= 10):
                     break
+        pp.pprint(val)
         return val
 
 

From 4edd1914b4d2b90a826b199167ca55e34258b7c4 Mon Sep 17 00:00:00 2001
From: cbartondock <cbartondock@gmail.com>
Date: Thu, 23 Dec 2021 23:16:41 -0500
Subject: [PATCH 081/412] Fixed google scholar issues

---
 cps/metadata_provider/scholar.py | 7 +------
 cps/search_metadata.py           | 4 ++--
 cps/static/js/get_meta.js        | 4 +---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 9aa0ab876..5ff078b9a 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -19,21 +19,17 @@
 from scholarly import scholarly
 
 from cps.services.Metadata import Metadata
-import pprint
-pp = pprint.PrettyPrinter(indent=4)
 
 class scholar(Metadata):
     __name__ = "Google Scholar"
     __id__ = "googlescholar"
 
-    def search(self, query, generic_cover=None):
+    def search(self, query, generic_cover=""):
         val = list()
         if self.active:
             scholar_gen = scholarly.search_pubs(' '.join(query.split('+')))
             i = 0
             for publication in scholar_gen:
-                print(f"PUBLICATION {i + 1}")
-                pp.pprint(publication)
                 v = dict()
                 v['id'] = publication['url_scholarbib'].split(':')[1]
                 v['title'] = publication['bib'].get('title')
@@ -58,7 +54,6 @@ class scholar(Metadata):
                 i += 1
                 if (i >= 10):
                     break
-        pp.pprint(val)
         return val
 
 
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index e837fe21a..b88f222f8 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -103,9 +103,9 @@ def metadata_search():
     data = list()
     active = current_user.view_settings.get('metadata', {})
     if query:
-        static_cover = url_for('static', filename='generic_cover.jpg')
+        generic_cover = ""
         with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-            meta = {executor.submit(c.search, query, static_cover): c for c in cl if active.get(c.__id__, True)}
+            meta = {executor.submit(c.search, query, generic_cover): c for c in cl if active.get(c.__id__, True)}
             for future in concurrent.futures.as_completed(meta):
                 data.extend(future.result())
     return Response(json.dumps(data), mimetype='application/json')
diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index 51ab740d4..2ad4d53b8 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -40,7 +40,7 @@ $(function () {
         $("#book_title").val(book.title);
         $("#tags").val(uniqueTags.join(", "));
         $("#rating").data("rating").setValue(Math.round(book.rating));
-        if(book.cover !== null){
+        if(book.cover){
             $(".cover img").attr("src", book.cover);
             $("#cover_url").val(book.cover);
         }
@@ -128,9 +128,7 @@ $(function () {
         e.preventDefault();
         keyword = $("#keyword").val();
         $('.pill').each(function(){
-            // console.log($(this).data('control'));
             $(this).data("initial", $(this).prop('checked'));
-            // console.log($(this).data('initial'));
         });
         doSearch(keyword);
     });

From 7eb875f388a8e7b708dff3373eb92fde5106b2c4 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 28 Dec 2021 17:13:18 +0100
Subject: [PATCH 082/412] Improvement for gdrive rename authors

---
 cps/helper.py | 54 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 13 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 21dab9a31..33a87cae0 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -360,6 +360,31 @@ def clean_author_database(renamed_author, calibrepath, local_book=None):
                     file_format.name = all_new_name
 
 
+def clean_author_database_gdrive(renamed_author, calibrepath, local_book=None):
+    valid_filename_authors = [get_valid_filename(r) for r in renamed_author]
+    for r in renamed_author:
+        if local_book:
+            all_books = [local_book]
+        else:
+            all_books = calibre_db.session.query(db.Books) \
+                .filter(db.Books.authors.any(db.Authors.name == r)).all()
+        for book in all_books:
+            book_author_path = book.path.split('/')[0]
+            if book_author_path in valid_filename_authors or local_book:
+                new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
+                all_new_authordir = get_valid_filename(new_author.name)
+                all_titledir = book.path.split('/')[1]
+                all_new_path = os.path.join(calibrepath, all_new_authordir, all_titledir)
+                all_new_name = get_valid_filename(book.title) + ' - ' + all_new_authordir
+                # change location in database to new author/title path
+                book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
+                for file_format in book.data:
+                    shutil.move(os.path.normcase(
+                        os.path.join(all_new_path, file_format.name + '.' + file_format.format.lower())),
+                        os.path.normcase(os.path.join(all_new_path, all_new_name + '.' + file_format.format.lower())))
+                    file_format.name = all_new_name
+
+
 # was muss gemacht werden:
 # Die Autorennamen müssen separiert werden und von dupletten bereinigt werden.
 # Es muss geprüft werden:
@@ -465,6 +490,9 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
             old_author_dir = get_valid_filename(r)
             new_author_rename_dir = get_valid_filename(new_author.name)
+            gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
+            if gFile:
+                gd.moveGdriveFileRemote(gFile, new_author_rename_dir)
             '''if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
                 try:
                     old_author_path = os.path.join(calibrepath, old_author_dir)
@@ -501,19 +529,6 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             gd.updateDatabaseOnEdit(gFile['id'], book.path)
         else:
             error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
-    # Todo: Rename all authors on gdrive
-    # Rename all files from old names to new names
-    '''
-    try:
-        clean_author_database(renamed_author, calibrepath)
-        if first_author not in renamed_author:
-            clean_author_database([first_author], calibrepath, localbook)
-        if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
-            shutil.rmtree(os.path.dirname(path))
-    except (OSError, FileNotFoundError) as ex:
-        log.error("Error in rename file in path %s", ex)
-        log.debug(ex, exc_info=True)
-        return _("Error in rename file in path: %(error)s", error=str(ex))'''
     if authordir != new_authordir or titledir != new_titledir:
         new_name = get_valid_filename(book.title) + u' - ' + get_valid_filename(new_authordir)
         for file_format in book.data:
@@ -523,6 +538,19 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
                 break
             gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
             file_format.name = new_name
+    # Todo: Rename all authors on gdrive
+    # Rename all files from old names to new names
+    try:
+        # calibrepath -> config.config_calibre_dir
+        clean_author_database_gdrive(renamed_author, calibrepath)
+        if first_author not in renamed_author:
+            clean_author_database_gdrive([first_author], calibrepath, localbook)
+        if not renamed_author and len(os.listdir(os.path.dirname(path))) == 0:
+            shutil.rmtree(os.path.dirname(path))
+    except (OSError, FileNotFoundError) as ex:
+        log.error("Error in rename file in path %s", ex)
+        log.debug(ex, exc_info=True)
+        return _("Error in rename file in path: %(error)s", error=str(ex))
     return error
 
 

From 785726deee13b4d56f6c3503dd57c1e3eb7d6f30 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Dec 2021 10:09:11 +0100
Subject: [PATCH 083/412] Migrated some routes to POST - delete shelf, import
 ldap users - delete_kobo token, kobo force full sync - shutdown, reconnect,
 shutdown

---
 cps/admin.py             | 10 +++++-----
 cps/editbooks.py         | 17 ++++++-----------
 cps/kobo_auth.py         |  8 ++------
 cps/shelf.py             |  9 +++++----
 cps/static/js/main.js    | 29 ++++++++++++++++++-----------
 cps/templates/shelf.html | 22 ++++------------------
 cps/web.py               |  5 +++--
 7 files changed, 43 insertions(+), 57 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 1c228e49a..29f5fb201 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -129,11 +129,11 @@ def admin_forbidden():
     abort(403)
 
 
-@admi.route("/shutdown")
+@admi.route("/shutdown", methods=["POST"])
 @login_required
 @admin_required
 def shutdown():
-    task = int(request.args.get("parameter").strip())
+    task = request.get_json().get('parameter', -1)
     showtext = {}
     if task in (0, 1):  # valid commandos received
         # close all database connections
@@ -906,7 +906,7 @@ def list_restriction(res_type, user_id):
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
-@admi.route("/ajax/fullsync")
+@admi.route("/ajax/fullsync", methods=["POST"])
 @login_required
 def ajax_fullsync():
     count = ub.session.query(ub.KoboSyncedBooks).filter(current_user.id == ub.KoboSyncedBooks.user_id).delete()
@@ -1626,7 +1626,7 @@ def edit_user(user_id):
                                  page="edituser")
 
 
-@admi.route("/admin/resetpassword/<int:user_id>")
+@admi.route("/admin/resetpassword/<int:user_id>", methods=["POST"])
 @login_required
 @admin_required
 def reset_user_password(user_id):
@@ -1802,7 +1802,7 @@ def ldap_import_create_user(user, user_data):
         return 0, message
 
 
-@admi.route('/import_ldap_users')
+@admi.route('/import_ldap_users', methods=["POST"])
 @login_required
 @admin_required
 def import_ldap_users():
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 21dc3ba0a..b6fdc164e 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -26,6 +26,8 @@ import json
 from shutil import copyfile
 from uuid import uuid4
 from markupsafe import escape
+from functools import wraps
+
 try:
     from lxml.html.clean import clean_html
 except ImportError:
@@ -51,13 +53,6 @@ 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()
@@ -237,14 +232,14 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
             changed = True
     return changed, error
 
-@editbook.route("/ajax/delete/<int:book_id>")
+@editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
 @login_required
 def delete_book_from_details(book_id):
     return Response(delete_book_from_table(book_id, "", True), mimetype='application/json')
 
 
-@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""})
-@editbook.route("/delete/<int:book_id>/<string:book_format>")
+@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
+@editbook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
 @login_required
 def delete_book_ajax(book_id, book_format):
     return delete_book_from_table(book_id, book_format, False)
@@ -1014,7 +1009,7 @@ def move_coverfile(meta, db_book):
               category="error")
 
 
-@editbook.route("/upload", methods=["GET", "POST"])
+@editbook.route("/upload", methods=["POST"])
 @login_required_if_no_ano
 @upload_required
 def upload():
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index a51095c8d..8d46b26ac 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -62,6 +62,7 @@ particular calls to non-Kobo specific endpoints such as the CalibreWeb book down
 from binascii import hexlify
 from datetime import datetime
 from os import urandom
+from functools import wraps
 
 from flask import g, Blueprint, url_for, abort, request
 from flask_login import login_user, current_user, login_required
@@ -70,11 +71,6 @@ from flask_babel import gettext as _
 from . import logger, config, calibre_db, db, helper, ub, lm
 from .render_template import render_title_template
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
-
 
 log = logger.create()
 
@@ -167,7 +163,7 @@ def generate_auth_token(user_id):
         )
 
 
-@kobo_auth.route("/deleteauthtoken/<int:user_id>")
+@kobo_auth.route("/deleteauthtoken/<int:user_id>", methods=["POST"])
 @login_required
 def delete_auth_token(user_id):
     # Invalidate any prevously generated Kobo Auth token for this user.
diff --git a/cps/shelf.py b/cps/shelf.py
index 5f6a66bf2..19c2d68ec 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -56,7 +56,7 @@ def check_shelf_view_permissions(cur_shelf):
     return True
 
 
-@shelf.route("/shelf/add/<int:shelf_id>/<int:book_id>")
+@shelf.route("/shelf/add/<int:shelf_id>/<int:book_id>", methods=["POST"])
 @login_required
 def add_to_shelf(shelf_id, book_id):
     xhr = request.headers.get('X-Requested-With') == 'XMLHttpRequest'
@@ -112,7 +112,7 @@ def add_to_shelf(shelf_id, book_id):
     return "", 204
 
 
-@shelf.route("/shelf/massadd/<int:shelf_id>")
+@shelf.route("/shelf/massadd/<int:shelf_id>", methods=["POST"])
 @login_required
 def search_to_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
@@ -164,7 +164,7 @@ def search_to_shelf(shelf_id):
     return redirect(url_for('web.index'))
 
 
-@shelf.route("/shelf/remove/<int:shelf_id>/<int:book_id>")
+@shelf.route("/shelf/remove/<int:shelf_id>/<int:book_id>", methods=["POST"])
 @login_required
 def remove_from_shelf(shelf_id, book_id):
     xhr = request.headers.get('X-Requested-With') == 'XMLHttpRequest'
@@ -323,12 +323,13 @@ def delete_shelf_helper(cur_shelf):
     ub.session_commit("successfully deleted Shelf {}".format(cur_shelf.name))
 
 
-@shelf.route("/shelf/delete/<int:shelf_id>")
+@shelf.route("/shelf/delete/<int:shelf_id>", methods=["POST"])
 @login_required
 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)
+        flash(_("Shelf successfully deleted"), category="success")
     except InvalidRequestError:
         ub.session.rollback()
         log.error("Settings DB is not Writeable")
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 585d2296a..6cef22f8e 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -179,7 +179,7 @@ $("#delete_confirm").click(function() {
         if (ajaxResponse) {
             path = getPath() + "/ajax/delete/" + deleteId;
             $.ajax({
-                method:"get",
+                method:"post",
                 url: path,
                 timeout: 900,
                 success:function(data) {
@@ -376,9 +376,11 @@ $(function() {
 
     $("#restart").click(function() {
         $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: window.location.pathname + "/../../shutdown",
-            data: {"parameter":0},
+            url: getPath() + "/shutdown",
+            data: JSON.stringify({"parameter":0}),
             success: function success() {
                 $("#spinner").show();
                 setTimeout(restartTimer, 3000);
@@ -387,9 +389,11 @@ $(function() {
     });
     $("#shutdown").click(function() {
         $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: window.location.pathname + "/../../shutdown",
-            data: {"parameter":1},
+            url: getPath() + "/shutdown",
+            data: JSON.stringify({"parameter":1}),
             success: function success(data) {
                 return alert(data.text);
             }
@@ -447,9 +451,11 @@ $(function() {
         $("#DialogContent").html("");
         $("#spinner2").show();
         $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
             dataType: "json",
             url: getPath() + "/shutdown",
-            data: {"parameter":2},
+            data: JSON.stringify({"parameter":2}),
             success: function success(data) {
                 $("#spinner2").hide();
                 $("#DialogContent").html(data.text);
@@ -527,7 +533,7 @@ $(function() {
             $(this).data('value'),
             function (value) {
                 $.ajax({
-                    method: "get",
+                    method: "post",
                     url: getPath() + "/kobo_auth/deleteauthtoken/" + value,
                 });
                 $("#config_delete_kobo_token").hide();
@@ -574,7 +580,7 @@ $(function() {
             function(value){
                 path = getPath() + "/ajax/fullsync"
                 $.ajax({
-                    method:"get",
+                    method:"post",
                     url: path,
                     timeout: 900,
                     success:function(data) {
@@ -638,7 +644,7 @@ $(function() {
                     else {
                         $("#InvalidDialog").modal('show');
                     }
-                } else {                	
+                } else {
                     changeDbSettings();
                 }
             }
@@ -685,7 +691,7 @@ $(function() {
             "GeneralDeleteModal",
             $(this).data('value'),
             function(value){
-                window.location.href = window.location.pathname + "/../../shelf/delete/" + value
+                $("#delete_shelf").closest("form").submit()
             }
         );
 
@@ -734,7 +740,8 @@ $(function() {
         $("#DialogContent").html("");
         $("#spinner2").show();
         $.ajax({
-            method:"get",
+            method:"post",
+            contentType: "application/json; charset=utf-8",
             dataType: "json",
             url: getPath() + "/import_ldap_users",
             success: function success(data) {
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 4f74a4da2..5bb9317ef 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -2,14 +2,16 @@
 {% block body %}
 <div class="discover">
   <h2>{{title}}</h2>
+      <form action="{{url_for('shelf.delete_shelf', shelf_id=shelf.id)}}" method="post">
   {% 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  %}
-      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-      <div class="btn btn-danger" id="delete_shelf" data-value="{{ shelf.id }}">{{ _('Delete this Shelf') }}</div>
+        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+        <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>
+      </form>
       {% 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>
@@ -84,22 +86,6 @@
     {% endfor %}
   </div>
 </div>
-<!--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">
-      <span>{{_('Are you sure you want to delete this shelf?')}}</span>
-      </div>
-      <div class="modal-body text-center">
-        <span>{{_('Shelf will be deleted for all users')}}</span>
-          <p></p>
-        <a id="confirm" href="{{ url_for('shelf.delete_shelf', shelf_id=shelf.id) }}" class="btn btn-danger">{{_('OK')}}</a>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
-      </div>
-    </div>
-  </div>
-</div-->
-
 {% endblock %}
 {% block modal %}
 {{ delete_confirm_modal() }}
diff --git a/cps/web.py b/cps/web.py
index f203783b6..81c377114 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1055,7 +1055,8 @@ def get_tasks_status():
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 
 
-@app.route("/reconnect")
+# method is available without login and not protected by CSRF to make it easy reachable
+@app.route("/reconnect", methods=['GET'])
 def reconnect():
     calibre_db.reconnect_db(config, ub.app_DB_path)
     return json.dumps({})
@@ -1435,7 +1436,7 @@ def download_link(book_id, book_format, anyname):
     return get_download_link(book_id, book_format, client)
 
 
-@web.route('/send/<int:book_id>/<book_format>/<int:convert>')
+@web.route('/send/<int:book_id>/<book_format>/<int:convert>', methods=["POST"])
 @login_required
 @download_required
 def send_to_kindle(book_id, book_format, convert):

From 573c9f9fb495f4408d31c8a272702a099fb463d4 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Dec 2021 10:35:08 +0100
Subject: [PATCH 084/412] Improved logging (right stacklevel on mail
 exceptions) Updated jsonschema requirements

---
 cps/logger.py             | 13 ++++---------
 cps/tasks/mail.py         | 12 ++++++------
 optional-requirements.txt |  2 +-
 setup.cfg                 |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/cps/logger.py b/cps/logger.py
index 5847188bb..053d0bd3c 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -42,20 +42,15 @@ logging.addLevelName(logging.CRITICAL, "CRIT")
 
 class _Logger(logging.Logger):
 
-    def debug_or_exception(self, message, *args, **kwargs):
+    def debug_or_exception(self, message, stacklevel=2, *args, **kwargs):
         if sys.version_info > (3, 7):
             if is_debug_enabled():
-                self.exception(message, stacklevel=2, *args, **kwargs)
+                self.exception(message, stacklevel=stacklevel, *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)
+                self.error(message, stacklevel=stacklevel, *args, **kwargs)
         else:
             if is_debug_enabled():
-                self.exception(message, *args, **kwargs)
+                self.exception(message, stack_info=True, *args, **kwargs)
             else:
                 self.error(message, *args, **kwargs)
 
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 05b2175f6..03526c8bd 100644
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -158,10 +158,10 @@ class TaskEmail(CalibreTask):
             else:
                 self.send_gmail_email(msg)
         except MemoryError as e:
-            log.debug_or_exception(e)
+            log.debug_or_exception(e, stacklevel=3)
             self._handleError(u'MemoryError sending e-mail: {}'.format(str(e)))
         except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
-            log.debug_or_exception(e)
+            log.debug_or_exception(e, stacklevel=3)
             if hasattr(e, "smtp_error"):
                 text = e.smtp_error.decode('utf-8').replace("\n", '. ')
             elif hasattr(e, "message"):
@@ -171,11 +171,11 @@ class TaskEmail(CalibreTask):
             else:
                 text = ''
             self._handleError(u'Smtplib Error sending e-mail: {}'.format(text))
-        except socket.error as e:
-            log.debug_or_exception(e)
+        except (socket.error) as e:
+            log.debug_or_exception(e, stacklevel=3)
             self._handleError(u'Socket Error sending e-mail: {}'.format(e.strerror))
         except Exception as ex:
-            log.debug_or_exception(ex)
+            log.debug_or_exception(ex, stacklevel=3)
             self._handleError(u'Error sending e-mail: {}'.format(ex))
 
     def send_standard_email(self, msg):
@@ -248,7 +248,7 @@ class TaskEmail(CalibreTask):
                 data = file_.read()
                 file_.close()
             except IOError as e:
-                log.debug_or_exception(e)
+                log.debug_or_exception(e, stacklevel=3)
                 log.error(u'The requested file could not be read. Maybe wrong permissions?')
                 return None
         # Set mimetype
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 3fac14cac..c0009c941 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -38,4 +38,4 @@ natsort>=2.2.0,<8.1.0
 comicapi>=2.2.0,<2.3.0
 
 #Kobo integration
-jsonschema>=3.2.0,<4.3.0
+jsonschema>=3.2.0,<4.4.0
diff --git a/setup.cfg b/setup.cfg
index 87f6055f4..95f3502df 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -87,7 +87,7 @@ comics =
     natsort>=2.2.0,<8.1.0
     comicapi>= 2.2.0,<2.3.0
 kobo =
-    jsonschema>=3.2.0,<4.3.0
+    jsonschema>=3.2.0,<4.4.0
 
 
 

From f39dc100b458e86d195a007619da7292af7033e1 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Dec 2021 21:39:58 +0100
Subject: [PATCH 085/412] Migrated some routes to POST - shelf massadd -
 resetpassword - delete shelf - send to kindle

---
 cps/static/js/details.js     |  2 +-
 cps/static/js/main.js        | 36 +++++++++++++++++++++++++++++++++---
 cps/templates/detail.html    |  6 +++---
 cps/templates/search.html    |  2 +-
 cps/templates/shelf.html     |  4 ++--
 cps/templates/user_edit.html |  2 +-
 6 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/cps/static/js/details.js b/cps/static/js/details.js
index 9caf9470e..3a7def32b 100644
--- a/cps/static/js/details.js
+++ b/cps/static/js/details.js
@@ -62,7 +62,7 @@ $("#archived_cb").on("change", function() {
     $("#shelf-actions").on("click", "[data-shelf-action]", function (e) {
         e.preventDefault();
 
-        $.get(this.href)
+        $.post(this.href)
             .done(function() {
                 var $this = $(this);
                 switch ($this.data("shelf-action")) {
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 6cef22f8e..e8da76ef8 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -20,6 +20,20 @@ function getPath() {
     return jsFileLocation.substr(0, jsFileLocation.search("/static/js/libs/jquery.min.js"));  // the js folder path
 }
 
+function postButton(event, action){
+    event.preventDefault();
+    var newForm = jQuery('<form>', {
+        "action": action,
+        'target': "_top",
+        'method': "post"
+    }).append(jQuery('<input>', {
+        'name': 'csrf_token',
+        'value': $("input[name=\'csrf_token\']").val(),
+        'type': 'hidden'
+    })).appendTo('body');
+    newForm.submit();
+}
+
 function elementSorter(a, b) {
     a = +a.slice(0, -2);
     b = +b.slice(0, -2);
@@ -71,6 +85,22 @@ $(document).on("change", "select[data-controlall]", function() {
     }
 });
 
+/*$(document).on("click", "#sendbtn", function (event) {
+    postButton(event, $(this).data('action'));
+});
+
+$(document).on("click", ".sendbutton", function (event) {
+    // $(".sendbutton").on("click", "body", function(event) {
+    postButton(event, $(this).data('action'));
+});*/
+
+$(document).on("click", ".postAction", function (event) {
+    // $(".sendbutton").on("click", "body", function(event) {
+    postButton(event, $(this).data('action'));
+});
+
+
+
 // Syntax has to be bind not on, otherwise problems with firefox
 $(".container-fluid").bind("dragenter dragover", function () {
     if($("#btn-upload").length && !$('body').hasClass('shelforder')) {
@@ -685,13 +715,14 @@ $(function() {
         });
     });
 
-    $("#delete_shelf").click(function() {
+    $("#delete_shelf").click(function(event) {
         confirmDialog(
             $(this).attr('id'),
             "GeneralDeleteModal",
             $(this).data('value'),
             function(value){
-                $("#delete_shelf").closest("form").submit()
+                postButton(event, $("#delete_shelf").data("action"));
+                // $("#delete_shelf").closest("form").submit()
             }
         );
 
@@ -775,4 +806,3 @@ $(function() {
         });
     });
 });
-
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 0ecaf9031..1fd5f09ae 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -38,16 +38,16 @@
           {% endif %}
             {% if g.user.kindle_mail and kindle_list %}
               {% if kindle_list.__len__() == 1 %}
-                <a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" id="sendbtn" data-text="{{_('Send to Kindle')}}" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</a>
+                <div id="sendbtn" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" data-text="{{_('Send to Kindle')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</div>
               {% else %}
                 <div class="btn-group" role="group">
-                  <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle postAction" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="glyphicon glyphicon-send"></span>{{_('Send to Kindle')}}
                     <span class="caret"></span>
                   </button>
                     <ul class="dropdown-menu" aria-labelledby="send-to-kindle">
                     {% for format in kindle_list %}
-                      <li><a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{format['text']}}</a></li>
+                      <li><a class="postAction" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{format['text']}}</a></li>
                     {%endfor%}
                     </ul>
                 </div>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 627beaf85..32339803c 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -17,7 +17,7 @@
               <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
                 {% for shelf in g.shelves_access %}
                   {% if not shelf.is_public or g.user.role_edit_shelfs() %}
-                    <li><a href="{{ url_for('shelf.search_to_shelf', shelf_id=shelf.id) }}"> {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}</a></li>
+                    <li><a class="postAction" role="button" data-action="{{ url_for('shelf.search_to_shelf', shelf_id=shelf.id) }}"> {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}</a></li>
                   {% endif %}
                 {%endfor%}
               </ul>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 5bb9317ef..adfead60b 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -2,14 +2,14 @@
 {% block body %}
 <div class="discover">
   <h2>{{title}}</h2>
-      <form action="{{url_for('shelf.delete_shelf', shelf_id=shelf.id)}}" method="post">
+      <!--form  method="post"--->
   {% 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  %}
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-        <div class="btn btn-danger" id="delete_shelf" data-value="{{ shelf.id }}">{{ _('Delete this Shelf') }}</div>
+        <div class="btn btn-danger" data-action="{{url_for('shelf.delete_shelf', shelf_id=shelf.id)}}" 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>
       </form>
       {% if entries.__len__() %}
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index e6fbdb74a..de7a4fb30 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -17,7 +17,7 @@
     </div>
     {% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
       {% if g.user and g.user.role_admin() and not new_user and not profile and ( mail_configured and content.email if content.email != None ) %}
-        <a class="btn btn-default" id="resend_password" href="{{url_for('admin.reset_user_password', user_id = content.id) }}">{{_('Reset user Password')}}</a>
+        <a class="btn btn-default postAction" id="resend_password" role="button" data-action="{{url_for('admin.reset_user_password', user_id = content.id) }}">{{_('Reset user Password')}}</a>
       {% endif %}
         <div class="form-group">
           <label for="password">{{_('Password')}}</label>

From 47f5e2ffb4253b57271e76444e465da425752239 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 26 Dec 2021 10:31:04 +0100
Subject: [PATCH 086/412] Remove python2 urllib imports Fix for "javascript:"
 script links in identifier

---
 cps/db.py                 | 3 +++
 cps/helper.py             | 5 +----
 cps/kobo.py               | 6 +-----
 cps/redirect.py           | 6 ++----
 cps/services/SyncToken.py | 7 ++-----
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 9c5b56579..470ecc1c0 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -23,6 +23,7 @@ import re
 import ast
 import json
 from datetime import datetime
+from urllib.parse import quote
 
 from sqlalchemy import create_engine
 from sqlalchemy import Table, Column, ForeignKey, CheckConstraint
@@ -166,6 +167,8 @@ class Identifiers(Base):
             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)
+        elif self.val.lower().startswith("javascript:"):
+            return quote(self.val)
         else:
             return u"{0}".format(self.val)
 
diff --git a/cps/helper.py b/cps/helper.py
index b8499a12e..e8a0b7384 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -38,11 +38,8 @@ from sqlalchemy.sql.expression import true, false, and_, text, func
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash
 from markupsafe import escape
+from urllib.parse import quote
 
-try:
-    from urllib.parse import quote
-except ImportError:
-    from urllib import quote
 
 try:
     import unidecode
diff --git a/cps/kobo.py b/cps/kobo.py
index e03958556..b5ff000e4 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -23,11 +23,7 @@ import os
 import uuid
 from time import gmtime, strftime
 import json
-
-try:
-    from urllib import unquote
-except ImportError:
-    from urllib.parse import unquote
+from urllib.parse import unquote
 
 from flask import (
     Blueprint,
diff --git a/cps/redirect.py b/cps/redirect.py
index d491b353f..8bd681093 100644
--- a/cps/redirect.py
+++ b/cps/redirect.py
@@ -27,10 +27,8 @@
 
 # http://flask.pocoo.org/snippets/62/
 
-try:
-    from urllib.parse import urlparse, urljoin
-except ImportError:
-    from urlparse import urlparse, urljoin
+from urllib.parse import urlparse, urljoin
+
 
 from flask import request, url_for, redirect
 
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index 85ed50325..2e23efe25 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -21,11 +21,8 @@ import sys
 from base64 import b64decode, b64encode
 from jsonschema import validate, exceptions, __version__
 from datetime import datetime
-try:
-    # pylint: disable=unused-import
-    from urllib import unquote
-except ImportError:
-    from urllib.parse import unquote
+
+from urllib.parse import unquote
 
 from flask import json
 from .. import logger

From 3e0d8763c377d2146462811e3e4ccf13f0d312ce Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 26 Dec 2021 10:46:43 +0100
Subject: [PATCH 087/412] Prevent 2 public shelfs with same names due to
 changing public property

---
 cps/shelf.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cps/shelf.py b/cps/shelf.py
index 19c2d68ec..b1fbdd046 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -248,12 +248,13 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
         if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
             flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
             return redirect(url_for('web.index'))
-        shelf.is_public = 1 if to_save.get("is_public") else 0
+        is_public = 1 if to_save.get("is_public") else 0
         if config.config_kobo_sync:
             shelf.kobo_sync = True if to_save.get("kobo_sync") else False
         shelf_title = to_save.get("title", "")
-        if check_shelf_is_unique(shelf, shelf_title, shelf_id):
+        if check_shelf_is_unique(shelf, shelf_title, is_public, shelf_id):
             shelf.name = shelf_title
+            shelf.is_public = is_public
             if not shelf_id:
                 shelf.user_id = int(current_user.id)
                 ub.session.add(shelf)
@@ -284,12 +285,12 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
                                  sync_only_selected_shelves=sync_only_selected_shelves)
 
 
-def check_shelf_is_unique(shelf, title, shelf_id=False):
+def check_shelf_is_unique(shelf, title, is_public, shelf_id=False):
     if shelf_id:
         ident = ub.Shelf.id != shelf_id
     else:
         ident = true()
-    if shelf.is_public == 1:
+    if is_public == 1:
         is_shelf_name_unique = ub.session.query(ub.Shelf) \
                                    .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 1)) \
                                    .filter(ident) \

From f22e4d996c0f647b506cd42c60407a9ee8c78818 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 27 Dec 2021 09:31:32 +0100
Subject: [PATCH 088/412] Proxy kobo library sync at the end of local sync

---
 cps/kobo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index b5ff000e4..c74a32300 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -321,7 +321,7 @@ def HandleSyncRequest():
 
 def generate_sync_response(sync_token, sync_results, set_cont=False):
     extra_headers = {}
-    if config.config_kobo_proxy:
+    if config.config_kobo_proxy and not set_cont:
         # Merge in sync results from the official Kobo store.
         try:
             store_response = make_request_to_kobo_store(sync_token)

From 0548fbb685569851ec5a37b3650c5b6c54ee4447 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 27 Dec 2021 09:37:52 +0100
Subject: [PATCH 089/412] Bugfix post commands without updater

---
 cps/templates/admin.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 9728cb6d4..6cd7815e0 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -188,9 +188,8 @@
           </tr>
         </tbody>
       </table>
-
-      {%  if feature_support['updater'] %}
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+      {%  if feature_support['updater'] %}
       <div class="hidden" id="update_error"> <span>{{update_error}}</span></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>

From ae1f515446e7ee1f31700df42b810a0ce1061cf5 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 27 Dec 2021 20:02:42 +0100
Subject: [PATCH 090/412] Bugfix uncheck all ekements in books list and user
 list Improved testability for books list

---
 cps/static/js/table.js        | 30 +++++++++++++++---------------
 cps/templates/book_table.html |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index e98f6a8be..112ca957d 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -47,15 +47,15 @@ $(function() {
             var rows = rowsAfter;
 
             if (e.type === "uncheck-all") {
-                rows = rowsBefore;
+                selections = [];
+            } else {
+                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);
             }
-
-            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);
@@ -540,14 +540,14 @@ $(function() {
         var rows = rowsAfter;
 
         if (e.type === "uncheck-all") {
-            rows = rowsBefore;
+            selections = [];
+        } else {
+	        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);
         }
-
-        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);
         handle_header_buttons();
     });
 });
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index fb0cfed81..eb5c1bff5 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -120,8 +120,8 @@
             <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>
+        <input id="merge_confirm"  type="button" class="btn btn-danger" value="{{_('Merge')}}" name="merge_confirm" id="merge_confirm" data-dismiss="modal">
+        <button id="merge_abort" type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>

From c095ee3c144765ed559861caef2d0b045f704329 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 28 Dec 2021 11:31:32 +0100
Subject: [PATCH 091/412] Fix #2243 (whitespaces are trimmed also for normal
 search)

---
 cps/web.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/web.py b/cps/web.py
index 81c377114..e139848e1 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1069,7 +1069,7 @@ def reconnect():
 def search():
     term = request.args.get("query")
     if term:
-        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term))
+        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term.strip()))
     else:
         return render_title_template('search.html',
                                      searchterm="",

From a90177afa0bd1846cf7cbb92b93b770aff065082 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 28 Dec 2021 20:17:51 +0100
Subject: [PATCH 092/412] Better version output in about page (exe file, pyPi,
 git commit string removed if empty)

---
 cps/about.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index ba5a99af9..7e8395200 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -74,13 +74,22 @@ opt = dep_check.load_dependencys(True)
 for i in (req + opt):
     ret[i[1]] = i[0]
 
+if constants.NIGHTLY_VERSION[0] == "$Format:%H$":
+    calibre_web_version = constants.STABLE_VERSION['version']
+else:
+    calibre_web_version = (constants.STABLE_VERSION['version'] + ' - '
+                    + constants.NIGHTLY_VERSION[0].replace('%','%%') + ' - '
+                    + constants.NIGHTLY_VERSION[1].replace('%','%%'))
+if getattr(sys, 'frozen', False):
+    calibre_web_version += " - Exe-Version"
+elif constants.HOME_CONFIG:
+    calibre_web_version += " - pyPi"
+
 if not ret:
     _VERSIONS = OrderedDict(
         Platform = '{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
         Python=sys.version,
-        Calibre_Web=constants.STABLE_VERSION['version'] + ' - '
-                    + constants.NIGHTLY_VERSION[0].replace('%','%%') + ' - '
-                    + constants.NIGHTLY_VERSION[1].replace('%','%%'),
+        Calibre_Web=calibre_web_version,
         WebServer=server.VERSION,
         Flask=flask.__version__,
         Flask_Login=flask_loginVersion,
@@ -110,9 +119,7 @@ else:
     _VERSIONS = OrderedDict(
         Platform = '{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
         Python = sys.version,
-        Calibre_Web = constants.STABLE_VERSION['version'] + ' - '
-                      + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
-                      + constants.NIGHTLY_VERSION[1].replace('%', '%%'),
+        Calibre_Web=calibre_web_version,
         Werkzeug = werkzeug.__version__,
         Jinja2=jinja2.__version__,
         pySqlite = sqlite3.version,

From c1030dfd1340ff65f9b4ea2d20a8c048b7db2e14 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 30 Dec 2021 14:44:35 +0100
Subject: [PATCH 093/412] Update dependency scholary

---
 optional-requirements.txt | 2 +-
 setup.cfg                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index c0009c941..b90951aa9 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -31,7 +31,7 @@ SQLAlchemy-Utils>=0.33.5,<0.38.0
 
 # extracting metadata
 rarfile>=2.7
-scholarly>=1.2.0, <1.5
+scholarly>=1.2.0, <1.6
 
 # other
 natsort>=2.2.0,<8.1.0
diff --git a/setup.cfg b/setup.cfg
index 95f3502df..a81102b8b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -82,7 +82,7 @@ oauth =
     SQLAlchemy-Utils>=0.33.5,<0.38.0
 metadata =
     rarfile>=2.7
-    scholarly>=1.2.0,<1.5
+    scholarly>=1.2.0,<1.6
 comics =
     natsort>=2.2.0,<8.1.0
     comicapi>= 2.2.0,<2.3.0

From bbadfa22511c2ae8fb4cdcaa326ccc1be66a07f4 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 4 Jan 2022 21:11:52 +0100
Subject: [PATCH 094/412] bugfixes load metadata

---
 cps/metadata_provider/scholar.py | 2 +-
 cps/templates/book_edit.html     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 5ff078b9a..df3878318 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -43,7 +43,7 @@ class scholar(Metadata):
                 v['tags'] = []
                 v['rating'] = 0
                 v['series'] = ""
-                v['cover'] = generic_cover
+                v['cover'] = ""
                 v['url'] = publication.get('pub_url') or publication.get('eprint_url') or "",
                 v['source'] = {
                     "id": self.__id__,
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index cac3219c4..9d2ac14eb 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -226,7 +226,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="metaModalLabel">{{_('Fetch Metadata')}}</h4>
+        <h4 class="modal-title text-center" id="metaModalLabel">{{_('Fetch Metadata')}}</h4>
         <form class="padded-bottom" id="meta-search">
           <div class="input-group">
             <label class="sr-only" for="keyword">{{_('Keyword')}}</label>
@@ -275,7 +275,7 @@
         <p>{{_('Description')}}: <%= description %></p>
       <% } %>
       <p>{{_('Source')}}:
-        <a href="<%= source.url %>" target="_blank" rel="noopener"><%= source.description %></a>
+        <a href="<%= source.link %>" target="_blank" rel="noopener"><%= source.description %></a>
       </p>
     </div>
   </li>

From 6d839d5cc71cbb8f839fb95365f838d8fd01f94c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 4 Jan 2022 21:12:59 +0100
Subject: [PATCH 095/412] Bugfixes from testrun

---
 cps/editbooks.py                        |   11 +-
 cps/static/js/main.js                   |    5 +-
 test/Calibre-Web TestSummary_Linux.html | 1035 ++++++++++-------------
 3 files changed, 461 insertions(+), 590 deletions(-)
 mode change 100644 => 100755 cps/editbooks.py
 mode change 100644 => 100755 cps/static/js/main.js

diff --git a/cps/editbooks.py b/cps/editbooks.py
old mode 100644
new mode 100755
index b6fdc164e..e20cfcfb2
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -357,7 +357,16 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
         else:
             # book not found
             log.error('Book with id "%s" could not be deleted: not found', book_id)
-    return render_delete_book_result(book_format, jsonResponse, warning, book_id)
+        return render_delete_book_result(book_format, jsonResponse, warning, book_id)
+    message = _("You are missing permissions to delete books")
+    if jsonResponse:
+        return json.dumps({"location": url_for("editbook.edit_book", book_id=book_id),
+                           "type": "danger",
+                           "format": "",
+                           "message": message})
+    else:
+        flash(message, category="error")
+        return redirect(url_for('editbook.edit_book', book_id=book_id))
 
 
 def render_edit_book(book_id):
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
old mode 100644
new mode 100755
index e8da76ef8..cf5a43274
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -198,7 +198,7 @@ function confirmDialog(id, dialogid, dataValue, yesFn, noFn) {
     $confirm.modal('show');
 }
 
-$("#delete_confirm").click(function() {
+$("#delete_confirm").click(function(event) {
     //get data-id attribute of the clicked element
     var deleteId = $(this).data("delete-id");
     var bookFormat = $(this).data("delete-format");
@@ -228,8 +228,7 @@ $("#delete_confirm").click(function() {
                 }
             });
         } else {
-            window.location.href = getPath() + "/delete/" + deleteId;
-
+            postButton(event, getPath() + "/delete/" + deleteId);
         }
     }
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index d291d368e..511300bef 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-22 20:24:40</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-02 17:11:15</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-12-23 00:00:41</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-02 21:33:59</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 57 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 43 min</p>
         </div>
       </div>
       </div>
@@ -411,21 +411,50 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
+        <td class="text-center">15</td>
         <td class="text-center">14</td>
-        <td class="text-center">14</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 14)">Detail</a>
+            <a onclick="showClassDetail('c6', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt6.1' class='hiddenRow bg-success'>
+        <tr id="ft6.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 643, in test_calibre_log
+    self.assertTrue(&#34; …&#34; in data)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
             </td>
@@ -434,7 +463,7 @@
     
     
     
-        <tr id='pt6.2' class='hiddenRow bg-success'>
+        <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
@@ -443,7 +472,7 @@
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
@@ -452,7 +481,7 @@
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
@@ -461,7 +490,7 @@
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
@@ -470,7 +499,7 @@
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id='pt6.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
@@ -479,7 +508,7 @@
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id='pt6.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
@@ -488,7 +517,7 @@
     
     
     
-        <tr id='pt6.8' class='hiddenRow bg-success'>
+        <tr id='pt6.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
@@ -497,7 +526,7 @@
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id='pt6.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
@@ -506,7 +535,7 @@
     
     
     
-        <tr id='pt6.10' class='hiddenRow bg-success'>
+        <tr id='pt6.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
@@ -515,7 +544,7 @@
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id='pt6.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
             </td>
@@ -524,7 +553,7 @@
     
     
     
-        <tr id='pt6.12' class='hiddenRow bg-success'>
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
@@ -533,7 +562,7 @@
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
@@ -542,7 +571,7 @@
     
     
     
-        <tr id='pt6.14' class='hiddenRow bg-success'>
+        <tr id='pt6.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
@@ -782,11 +811,31 @@
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id="ft10.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 657, in test_title_sort
+    self.assertEqual(7, len(self.search(&#39; book &#39;)))
+AssertionError: 7 != 6</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -844,31 +893,11 @@
     
     
     
-        <tr id="ft10.13" class="none bg-danger">
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <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_ft10.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 300, in test_writeonly_path
-    self.assertTrue(os.path.isdir(book_path))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -901,11 +930,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
-        <td class="text-center">32</td>
-        <td class="text-center">2</td>
+        <td class="text-center">34</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -924,31 +953,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft11.2" class="none bg-danger">
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 177, in test_edit_author
-    self.assertTrue(os.path.isdir(os.path.join(TEST_DB, &#39;O0u Zhi&#39;, &#39;book8 (8)&#39;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1097,31 +1106,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft11.19" class="none bg-danger">
+        <tr id='pt11.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.19')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.19" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 74, in test_edit_title
-    self.assertTrue(os.path.isdir(os.path.join(TEST_DB, values[&#39;author&#39;][0], &#39;O0u Zhi (4)&#39;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1466,20 +1455,64 @@ AssertionError: False is not true</pre>
 
 
     <tr id="su" class="failClass">
-        <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">20</td>
-        <td class="text-center">18</td>
-        <td class="text-center">2</td>
+        <td>TestEditMetadata</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 20)">Detail</a>
+            <a onclick="showClassDetail('c13', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id="ft13.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditMetadata - test_upload_book_lit</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 48, in test_upload_book_lit
+    self.assertEqual(&#34;&#34;, self.check_element_on_page((By.ID, &#34;Der Buchtitel&#34;)))
+AssertionError: &#39;&#39; != False</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </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('c14', 20)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1488,36 +1521,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft13.2" class="none bg-danger">
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 297, in test_edit_author
-    self.assertTrue(gdrive_path)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1526,7 +1539,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1535,7 +1548,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1544,7 +1557,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1553,7 +1566,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1562,7 +1575,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1571,7 +1584,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1580,7 +1593,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1589,7 +1602,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.11' class='hiddenRow bg-success'>
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1598,7 +1611,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1607,7 +1620,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1616,7 +1629,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1625,7 +1638,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1634,36 +1647,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft13.16" class="none bg-danger">
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.16')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 143, in test_edit_title
-    self.assertTrue(gdrive_path)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt13.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1672,7 +1665,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.18' class='hiddenRow bg-success'>
+        <tr id='pt14.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1681,7 +1674,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.19' class='hiddenRow bg-success'>
+        <tr id='pt14.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1690,7 +1683,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.20' class='hiddenRow bg-success'>
+        <tr id='pt14.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1708,13 +1701,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 3)">Detail</a>
+            <a onclick="showClassDetail('c15', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1723,7 +1716,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1732,7 +1725,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1750,13 +1743,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 7)">Detail</a>
+            <a onclick="showClassDetail('c16', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1765,7 +1758,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1774,7 +1767,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1783,7 +1776,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1792,7 +1785,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1801,7 +1794,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -1810,7 +1803,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -1828,13 +1821,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1852,13 +1845,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1876,13 +1869,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -1900,13 +1893,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -1924,13 +1917,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 3)">Detail</a>
+            <a onclick="showClassDetail('c21', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -1939,7 +1932,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -1948,7 +1941,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -1966,13 +1959,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 11)">Detail</a>
+            <a onclick="showClassDetail('c22', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -1981,7 +1974,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -1990,7 +1983,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -1999,7 +1992,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.4' class='hiddenRow bg-success'>
+        <tr id='pt22.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2008,7 +2001,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.5' class='hiddenRow bg-success'>
+        <tr id='pt22.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2017,7 +2010,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.6' class='hiddenRow bg-success'>
+        <tr id='pt22.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2026,7 +2019,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.7' class='hiddenRow bg-success'>
+        <tr id='pt22.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2035,7 +2028,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.8' class='hiddenRow bg-success'>
+        <tr id='pt22.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2044,7 +2037,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.9' class='hiddenRow bg-success'>
+        <tr id='pt22.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2053,7 +2046,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.10' class='hiddenRow bg-success'>
+        <tr id='pt22.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2062,7 +2055,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.11' class='hiddenRow bg-success'>
+        <tr id='pt22.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2080,13 +2073,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 5)">Detail</a>
+            <a onclick="showClassDetail('c23', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2095,7 +2088,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2104,7 +2097,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2113,7 +2106,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2122,7 +2115,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.5' class='hiddenRow bg-success'>
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2140,13 +2133,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 13)">Detail</a>
+            <a onclick="showClassDetail('c24', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2155,7 +2148,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2164,7 +2157,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2173,7 +2166,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2182,7 +2175,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2191,7 +2184,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.6' class='hiddenRow bg-success'>
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2200,7 +2193,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2209,7 +2202,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.8' class='hiddenRow bg-success'>
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2218,7 +2211,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.9' class='hiddenRow bg-success'>
+        <tr id='pt24.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2227,7 +2220,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.10' class='hiddenRow bg-success'>
+        <tr id='pt24.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2236,7 +2229,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.11' class='hiddenRow bg-success'>
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2245,7 +2238,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.12' class='hiddenRow bg-success'>
+        <tr id='pt24.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2254,7 +2247,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.13' class='hiddenRow bg-success'>
+        <tr id='pt24.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2272,13 +2265,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 8)">Detail</a>
+            <a onclick="showClassDetail('c25', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2287,7 +2280,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2296,7 +2289,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2305,7 +2298,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2314,7 +2307,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2323,7 +2316,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2332,7 +2325,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2341,7 +2334,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2359,13 +2352,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 9)">Detail</a>
+            <a onclick="showClassDetail('c26', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2374,7 +2367,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2383,7 +2376,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2392,7 +2385,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2401,19 +2394,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st25.5" class="none bg-warning">
+        <tr id="st26.5" 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_st25.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st25.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st26.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_st25.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st26.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2427,7 +2420,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2436,7 +2429,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2445,7 +2438,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2454,7 +2447,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2472,13 +2465,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 15)">Detail</a>
+            <a onclick="showClassDetail('c27', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2487,7 +2480,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2496,7 +2489,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2505,7 +2498,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2514,7 +2507,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2523,7 +2516,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2532,7 +2525,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2541,7 +2534,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2550,7 +2543,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2559,7 +2552,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2568,7 +2561,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2577,7 +2570,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2586,7 +2579,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2595,7 +2588,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.14' class='hiddenRow bg-success'>
+        <tr id='pt27.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2604,7 +2597,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.15' class='hiddenRow bg-success'>
+        <tr id='pt27.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2622,24 +2615,24 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 2)">Detail</a>
+            <a onclick="showClassDetail('c28', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
+                <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestMergeBooksList - test_merge_book</div>
+                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2655,13 +2648,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 2)">Detail</a>
+            <a onclick="showClassDetail('c29', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2670,7 +2663,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2688,13 +2681,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 23)">Detail</a>
+            <a onclick="showClassDetail('c30', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2703,7 +2696,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2712,7 +2705,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2721,7 +2714,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2730,7 +2723,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2739,7 +2732,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2748,7 +2741,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2757,7 +2750,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2766,7 +2759,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2775,7 +2768,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2784,7 +2777,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2793,7 +2786,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2802,7 +2795,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2811,7 +2804,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2820,7 +2813,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -2829,7 +2822,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.16' class='hiddenRow bg-success'>
+        <tr id='pt30.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -2838,7 +2831,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.17' class='hiddenRow bg-success'>
+        <tr id='pt30.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -2847,7 +2840,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.18' class='hiddenRow bg-success'>
+        <tr id='pt30.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -2856,7 +2849,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.19' class='hiddenRow bg-success'>
+        <tr id='pt30.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -2865,7 +2858,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.20' class='hiddenRow bg-success'>
+        <tr id='pt30.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -2874,7 +2867,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.21' class='hiddenRow bg-success'>
+        <tr id='pt30.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -2883,7 +2876,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.22' class='hiddenRow bg-success'>
+        <tr id='pt30.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -2892,7 +2885,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.23' class='hiddenRow bg-success'>
+        <tr id='pt30.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2910,13 +2903,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 1)">Detail</a>
+            <a onclick="showClassDetail('c31', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -2934,13 +2927,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 5)">Detail</a>
+            <a onclick="showClassDetail('c32', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -2949,7 +2942,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -2958,7 +2951,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -2967,7 +2960,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt32.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -2976,7 +2969,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -2994,13 +2987,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 8)">Detail</a>
+            <a onclick="showClassDetail('c33', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3009,7 +3002,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3018,7 +3011,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3027,7 +3020,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3036,7 +3029,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3045,7 +3038,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3054,7 +3047,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3063,7 +3056,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3081,13 +3074,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 3)">Detail</a>
+            <a onclick="showClassDetail('c34', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3096,7 +3089,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3105,7 +3098,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3123,13 +3116,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 14)">Detail</a>
+            <a onclick="showClassDetail('c35', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3138,7 +3131,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3147,7 +3140,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3156,7 +3149,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3165,7 +3158,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3174,7 +3167,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt35.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3183,7 +3176,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt35.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3192,7 +3185,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt35.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3201,7 +3194,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt35.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3210,7 +3203,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt35.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3219,7 +3212,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt35.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3228,19 +3221,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st34.12" class="none bg-warning">
+        <tr id="st35.12" 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_st34.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st35.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st34.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st35.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_st34.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st35.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3254,7 +3247,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt35.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3263,7 +3256,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt35.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3281,13 +3274,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 9)">Detail</a>
+            <a onclick="showClassDetail('c36', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3296,7 +3289,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3305,7 +3298,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3314,7 +3307,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3323,7 +3316,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3332,7 +3325,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.6' class='hiddenRow bg-success'>
+        <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3341,19 +3334,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st35.7" class="none bg-warning">
+        <tr id="st36.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_st35.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st35.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st36.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_st35.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st36.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3367,7 +3360,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.8' class='hiddenRow bg-success'>
+        <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3376,7 +3369,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.9' class='hiddenRow bg-success'>
+        <tr id='pt36.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3386,21 +3379,21 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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('c36', 2)">Detail</a>
+            <a onclick="showClassDetail('c37', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3409,31 +3402,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft36.2" class="none bg-danger">
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft36.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft36.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft36.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 128, in test_upload_epub_lang
-    self.assertEqual(len(self.adv_search({u&#39;include_language&#39;: u&#39;Tedesco&#39;})), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3447,13 +3420,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 18)">Detail</a>
+            <a onclick="showClassDetail('c38', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3462,7 +3435,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3471,7 +3444,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3480,7 +3453,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3489,7 +3462,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3498,7 +3471,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3507,7 +3480,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3516,7 +3489,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3525,7 +3498,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id='pt38.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3534,7 +3507,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.10' class='hiddenRow bg-success'>
+        <tr id='pt38.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3543,7 +3516,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.11' class='hiddenRow bg-success'>
+        <tr id='pt38.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3552,7 +3525,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.12' class='hiddenRow bg-success'>
+        <tr id='pt38.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3561,7 +3534,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.13' class='hiddenRow bg-success'>
+        <tr id='pt38.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3570,7 +3543,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.14' class='hiddenRow bg-success'>
+        <tr id='pt38.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3579,7 +3552,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.15' class='hiddenRow bg-success'>
+        <tr id='pt38.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3588,7 +3561,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.16' class='hiddenRow bg-success'>
+        <tr id='pt38.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3597,7 +3570,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.17' class='hiddenRow bg-success'>
+        <tr id='pt38.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3606,7 +3579,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.18' class='hiddenRow bg-success'>
+        <tr id='pt38.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3624,13 +3597,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c39', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3648,13 +3621,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 21)">Detail</a>
+            <a onclick="showClassDetail('c40', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3663,7 +3636,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3672,7 +3645,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3681,7 +3654,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3690,7 +3663,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3699,7 +3672,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3708,7 +3681,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3717,7 +3690,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3726,7 +3699,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3735,7 +3708,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3744,7 +3717,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3753,7 +3726,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3762,7 +3735,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3771,7 +3744,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.14' class='hiddenRow bg-success'>
+        <tr id='pt40.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3780,7 +3753,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3789,7 +3762,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3798,7 +3771,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.17' class='hiddenRow bg-success'>
+        <tr id='pt40.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3807,7 +3780,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.18' class='hiddenRow bg-success'>
+        <tr id='pt40.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -3816,7 +3789,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.19' class='hiddenRow bg-success'>
+        <tr id='pt40.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -3825,7 +3798,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.20' class='hiddenRow bg-success'>
+        <tr id='pt40.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -3834,7 +3807,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.21' class='hiddenRow bg-success'>
+        <tr id='pt40.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -3852,13 +3825,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 34)">Detail</a>
+            <a onclick="showClassDetail('c41', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -3867,7 +3840,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -3876,7 +3849,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -3885,7 +3858,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -3894,7 +3867,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -3903,7 +3876,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -3912,7 +3885,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -3921,7 +3894,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -3930,7 +3903,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -3939,7 +3912,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -3948,7 +3921,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -3957,7 +3930,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -3966,7 +3939,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -3975,7 +3948,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.14' class='hiddenRow bg-success'>
+        <tr id='pt41.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -3984,7 +3957,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -3993,7 +3966,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4002,7 +3975,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.17' class='hiddenRow bg-success'>
+        <tr id='pt41.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4011,7 +3984,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.18' class='hiddenRow bg-success'>
+        <tr id='pt41.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4020,7 +3993,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.19' class='hiddenRow bg-success'>
+        <tr id='pt41.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4029,7 +4002,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.20' class='hiddenRow bg-success'>
+        <tr id='pt41.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4038,7 +4011,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.21' class='hiddenRow bg-success'>
+        <tr id='pt41.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4047,7 +4020,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.22' class='hiddenRow bg-success'>
+        <tr id='pt41.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4056,7 +4029,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.23' class='hiddenRow bg-success'>
+        <tr id='pt41.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4065,7 +4038,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.24' class='hiddenRow bg-success'>
+        <tr id='pt41.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4074,7 +4047,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.25' class='hiddenRow bg-success'>
+        <tr id='pt41.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4083,7 +4056,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.26' class='hiddenRow bg-success'>
+        <tr id='pt41.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4092,7 +4065,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.27' class='hiddenRow bg-success'>
+        <tr id='pt41.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4101,7 +4074,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.28' class='hiddenRow bg-success'>
+        <tr id='pt41.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4110,7 +4083,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.29' class='hiddenRow bg-success'>
+        <tr id='pt41.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4119,7 +4092,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.30' class='hiddenRow bg-success'>
+        <tr id='pt41.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4128,7 +4101,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.31' class='hiddenRow bg-success'>
+        <tr id='pt41.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4137,7 +4110,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.32' class='hiddenRow bg-success'>
+        <tr id='pt41.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4146,7 +4119,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.33' class='hiddenRow bg-success'>
+        <tr id='pt41.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4155,7 +4128,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.34' class='hiddenRow bg-success'>
+        <tr id='pt41.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4165,21 +4138,21 @@ AssertionError: 0 != 1</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreHelper</td>
         <td class="text-center">16</td>
-        <td class="text-center">11</td>
-        <td class="text-center">5</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('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c42', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4188,7 +4161,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4197,7 +4170,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4206,7 +4179,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4215,7 +4188,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4224,7 +4197,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4233,7 +4206,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4242,100 +4215,34 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id="ft41.8" class="none bg-danger">
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 44, in test_check_chinese_Characters
-    self.assertEqual(helper.get_valid_filename(u&#39;执一&#39;), u&#39;Zhi Yi&#39;)
-AssertionError: &#39;执一&#39; != &#39;Zhi Yi&#39;
-- 执一
-+ Zhi Yi</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.9" class="none bg-danger">
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 71, in test_check_deg_eur_replacement
-    self.assertEqual(helper.get_valid_filename(u&#39;°€&#39;), u&#39;degEUR&#39;)
-AssertionError: &#39;°€&#39; != &#39;degEUR&#39;
-- °€
-+ degEUR</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.10" class="none bg-danger">
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 36, in test_check_doubleS
-    self.assertEqual(helper.get_valid_filename(u&#39;§ß&#39;), u&#39;SSss&#39;)
-AssertionError: &#39;§ß&#39; != &#39;SSss&#39;
-- §ß
-+ SSss</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4344,69 +4251,25 @@ AssertionError: &#39;§ß&#39; != &#39;SSss&#39;
     
     
     
-        <tr id="ft41.12" class="none bg-danger">
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.12')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 32, in test_check_high23
-    self.assertEqual(helper.get_valid_filename(u&#39;²³&#39;), u&#39;23&#39;)
-AssertionError: &#39;²³&#39; != &#39;23&#39;
-- ²³
-+ 23</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.13" class="none bg-danger">
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 40, in test_check_umlauts
-    self.assertEqual(helper.get_valid_filename(u&#39;ÄÜÖäöü&#39;), u&#39;AUOaou&#39;)
-AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
-- ÄÜÖäöü
-+ AUOaou</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4415,7 +4278,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4424,7 +4287,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4435,9 +4298,9 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>378</td>
-        <td>361</td>
-        <td>11</td>
+        <td>380</td>
+        <td>371</td>
+        <td>3</td>
         <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
@@ -4563,7 +4426,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.28</td>
+              <td>1.4.29</td>
               <td>Basic</td>
             </tr>
           
@@ -4767,13 +4630,13 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.2</td>
+              <td>4.3.3</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.2</td>
+              <td>4.3.3</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -4785,7 +4648,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.2</td>
+              <td>4.3.3</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -4803,7 +4666,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
           
             <tr>
               <th>SQLAlchemy-Utils</th>
-              <td>0.38.1</td>
+              <td>0.38.2</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -4815,7 +4678,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
 </div>
 
 <script>
-    drawCircle(361, 11, 0, 6);
+    drawCircle(371, 3, 0, 6);
     showCase(5);
 </script>
 

From 405f3c181f3a23cc2e35089eec2949405f07f637 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 6 Jan 2022 14:04:49 +0100
Subject: [PATCH 096/412] Added korean locale

---
 README.md                                     |    2 +-
 cps/iso_language_names.py                     |  418 +++
 .../locales/bootstrap-datepicker.ko.min.js    |    1 +
 cps/static/js/libs/tinymce/langs/ko.js        |  261 ++
 cps/translations/cs/LC_MESSAGES/messages.mo   |  Bin 39546 -> 39449 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/de/LC_MESSAGES/messages.mo   |  Bin 56158 -> 56049 bytes
 cps/translations/de/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/el/LC_MESSAGES/messages.mo   |  Bin 57741 -> 57609 bytes
 cps/translations/el/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/es/LC_MESSAGES/messages.mo   |  Bin 51330 -> 51225 bytes
 cps/translations/es/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/fi/LC_MESSAGES/messages.mo   |  Bin 27430 -> 27338 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/fr/LC_MESSAGES/messages.mo   |  Bin 53669 -> 53561 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/hu/LC_MESSAGES/messages.mo   |  Bin 25180 -> 25073 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/it/LC_MESSAGES/messages.mo   |  Bin 56299 -> 56197 bytes
 cps/translations/it/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/ja/LC_MESSAGES/messages.mo   |  Bin 19843 -> 19843 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/km/LC_MESSAGES/messages.mo   |  Bin 24546 -> 24354 bytes
 cps/translations/km/LC_MESSAGES/messages.po   |  283 +-
 cps/translations/ko/LC_MESSAGES/messages.mo   |  Bin 0 -> 56464 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   | 3174 +++++++++++++++++
 cps/translations/nl/LC_MESSAGES/messages.mo   |  Bin 50497 -> 50392 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/pl/LC_MESSAGES/messages.mo   |  Bin 52413 -> 52304 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   |  284 +-
 .../pt_BR/LC_MESSAGES/messages.mo             |  Bin 46930 -> 46828 bytes
 .../pt_BR/LC_MESSAGES/messages.po             |  284 +-
 cps/translations/ru/LC_MESSAGES/messages.mo   |  Bin 47969 -> 47824 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/sv/LC_MESSAGES/messages.mo   |  Bin 48760 -> 48661 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/tr/LC_MESSAGES/messages.mo   |  Bin 22790 -> 22790 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/uk/LC_MESSAGES/messages.mo   |  Bin 18028 -> 17885 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   |  283 +-
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        |  Bin 50104 -> 50015 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        |  284 +-
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        |  Bin 48886 -> 48797 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        |  284 +-
 messages.pot                                  |  287 +-
 45 files changed, 6734 insertions(+), 2803 deletions(-)
 create mode 100644 cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ko.min.js
 create mode 100644 cps/static/js/libs/tinymce/langs/ko.js
 create mode 100644 cps/translations/ko/LC_MESSAGES/messages.mo
 create mode 100644 cps/translations/ko/LC_MESSAGES/messages.po

diff --git a/README.md b/README.md
index 896d4535f..ea9d9ba03 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,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 brazilian, czech, dutch, english, finnish, french, german, greek, hungarian, italian, japanese, khmer, polish, russian, simplified and traditional chinese, spanish, swedish, turkish, ukrainian
+- User Interface in brazilian, czech, dutch, english, finnish, french, german, greek, hungarian, italian, japanese, khmer, korean, polish, russian, simplified and traditional chinese, spanish, swedish, turkish, ukrainian
 - OPDS feed for eBook reader apps 
 - Filter and search by titles, authors, tags, series and language
 - Create a custom book collection (shelves)
diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 11e5e67bf..0507b6f7b 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -55,6 +55,7 @@ LANGUAGE_NAMES = {
         "bik": "bikolština",
         "bin": "bini",
         "bis": "bislamština",
+        "bit": "berinomo",
         "bla": "siksika",
         "bod": "tibetština",
         "bos": "bosenština",
@@ -163,6 +164,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligayonština",
         "hin": "hindština",
         "hit": "chetitština",
+        "hmj": "Ge",
         "hmn": "hmongština",
         "hmo": "hiri motu",
         "hrv": "chorvatština",
@@ -477,6 +479,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Blackfoot",
         "bod": "Tibetisch",
         "bos": "Bosnisch",
@@ -585,6 +588,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hethitisch",
+        "hmj": "Ge",
         "hmn": "Miao-Sprachen",
         "hmo": "Hiri-Motu",
         "hrv": "Kroatisch",
@@ -894,6 +898,7 @@ LANGUAGE_NAMES = {
         "bel": "Λευκωρωσικά",
         "bem": "Bemba (Zambia)",
         "ben": "Μπενγκάλι",
+        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -968,6 +973,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Γεωργιανά",
         "deu": "Γερμανικά",
@@ -1276,6 +1282,7 @@ LANGUAGE_NAMES = {
         "bik": "Bicolano",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksiká",
         "bod": "Tibetano",
         "bos": "Bosnio",
@@ -1384,6 +1391,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainón",
         "hin": "Hindi",
         "hit": "Hitita",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croata",
@@ -1698,6 +1706,7 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
+        "bit": "Berinomo",
         "bla": "mustajalka (siksika)",
         "bod": "tiibetti",
         "bos": "bosnia",
@@ -1806,6 +1815,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "heetti",
+        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri-motu",
         "hrv": "kroatia",
@@ -2120,6 +2130,7 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
+        "bit": "berinomo",
         "bla": "pied-noir",
         "bod": "tibétain",
         "bos": "bosniaque",
@@ -2228,6 +2239,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "hittite",
+        "hmj": "ge",
         "hmn": "hmong",
         "hmo": "hiri Motu",
         "hrv": "croate",
@@ -2542,6 +2554,7 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "biszlama",
+        "bit": "Berinomo",
         "bla": "szikszika",
         "bod": "tibeti",
         "bos": "bosnyák",
@@ -2650,6 +2663,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hettita",
+        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "horvát",
@@ -2964,6 +2978,7 @@ LANGUAGE_NAMES = {
         "bik": "bicol",
         "bin": "Bini",
         "bis": "bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetano",
         "bos": "Bosniaco",
@@ -3072,6 +3087,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligayna",
         "hin": "Hindi",
         "hit": "hittite",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croato",
@@ -3386,6 +3402,7 @@ LANGUAGE_NAMES = {
         "bik": "ビコル語",
         "bin": "ビニ語",
         "bis": "ビスラマ語",
+        "bit": "Berinomo",
         "bla": "ブラックフット語",
         "bod": "チベット語",
         "bos": "ボスニア語",
@@ -3494,6 +3511,7 @@ LANGUAGE_NAMES = {
         "hil": "ヒリジャノン語",
         "hin": "ヒンディー語",
         "hit": "ヒッタイト語",
+        "hmj": "Ge",
         "hmn": "フモング語",
         "hmo": "ヒリモトゥ語",
         "hrv": "クロアチア語",
@@ -3808,6 +3826,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
@@ -3916,6 +3935,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
@@ -4187,6 +4207,383 @@ LANGUAGE_NAMES = {
         "zxx": "No linguistic content",
         "zza": "Zaza"
     },
+    "ko": {
+        "abk": "압하스어",
+        "ace": "아체어",
+        "ach": "아촐리어",
+        "ada": "Adangme",
+        "ady": "Adyghe",
+        "aar": "아파르어",
+        "afh": "Afrihili",
+        "afr": "아프리칸스어",
+        "ain": "Ainu (Japan)",
+        "aka": "Akan",
+        "akk": "Akkadian",
+        "sqi": "Albanian",
+        "ale": "Aleut",
+        "amh": "Amharic",
+        "anp": "Angika",
+        "ara": "아라비아어",
+        "arg": "Aragonese",
+        "arp": "Arapaho",
+        "arw": "Arawak",
+        "hye": "아르메니아어",
+        "asm": "Assamese",
+        "ast": "Asturian",
+        "ava": "Avaric",
+        "ave": "아베스타어",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Azerbaijani",
+        "ban": "발리 문자",
+        "bal": "Baluchi",
+        "bam": "Bambara",
+        "bas": "Basa (Cameroon)",
+        "bak": "Bashkir",
+        "eus": "바스크어",
+        "bej": "Beja",
+        "bel": "벨로루시어",
+        "bem": "Bemba (Zambia)",
+        "ben": "벵골 문자",
+        "bit": "Berinomo",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "byn": "Bilin",
+        "bin": "Bini",
+        "bis": "Bislama",
+        "zbl": "Blissymbols",
+        "bos": "Bosnian",
+        "bra": "Braj",
+        "bre": "Breton",
+        "bug": "부기 문자",
+        "bul": "불가리아어",
+        "bua": "Buriat",
+        "mya": "Burmese",
+        "cad": "Caddo",
+        "cat": "카탈로니아어",
+        "ceb": "Cebuano",
+        "chg": "Chagatai",
+        "cha": "Chamorro",
+        "che": "Chechen",
+        "chr": "체로키 문자",
+        "chy": "Cheyenne",
+        "chb": "Chibcha",
+        "zho": "중국어",
+        "chn": "Chinook jargon",
+        "chp": "Chipewyan",
+        "cho": "Choctaw",
+        "cht": "Cholón",
+        "chk": "Chuukese",
+        "chv": "Chuvash",
+        "cop": "콥트어",
+        "cor": "Cornish",
+        "cos": "Corsican",
+        "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": "Egyptian (Ancient)",
+        "eka": "Ekajuk",
+        "elx": "Elamite",
+        "eng": "영어",
+        "enu": "Enu",
+        "myv": "Erzya",
+        "epo": "에스페란토어",
+        "est": "에스토니아어",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang (Equatorial Guinea)",
+        "fat": "Fanti",
+        "fao": "페로스어",
+        "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)",
+        "hmj": "Ge",
+        "gez": "Geez",
+        "kat": "그루지야어",
+        "deu": "독일어",
+        "gil": "Gilbertese",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "고트어",
+        "grb": "Grebo",
+        "grn": "Guarani",
+        "guj": "구자라트 문자",
+        "gwi": "Gwichʼin",
+        "hai": "Haida",
+        "hau": "Hausa",
+        "haw": "Hawaiian",
+        "heb": "헤브루어",
+        "her": "Herero",
+        "hil": "Hiligaynon",
+        "hin": "Hindi",
+        "hmo": "Hiri Motu",
+        "hit": "Hittite",
+        "hmn": "Hmong",
+        "hun": "헝가리어",
+        "hup": "Hupa",
+        "iba": "Iban",
+        "isl": "아이슬란드어",
+        "ido": "Ido",
+        "ibo": "Igbo",
+        "ilo": "Iloko",
+        "ind": "인도네시아어",
+        "inh": "Ingush",
+        "ina": "Interlingua (International Auxiliary Language Association)",
+        "ile": "Interlingue",
+        "iku": "Inuktitut",
+        "ipk": "Inupiaq",
+        "gle": "아일랜드어",
+        "ita": "이탈리아어",
+        "jpn": "일본어",
+        "jav": "Javanese",
+        "jrb": "Judeo-Arabic",
+        "jpr": "Judeo-Persian",
+        "kbd": "Kabardian",
+        "kab": "Kabyle",
+        "kac": "Kachin",
+        "kal": "Kalaallisut",
+        "xal": "Kalmyk",
+        "kam": "Kamba (Kenya)",
+        "kan": " 칸나다 문자",
+        "kau": "Kanuri",
+        "kaa": "Kara-Kalpak",
+        "krc": "Karachay-Balkar",
+        "krl": "Karelian",
+        "kas": "Kashmiri",
+        "csb": "Kashubian",
+        "kaw": "Kawi",
+        "kaz": "Kazakh",
+        "kha": "Khasi",
+        "kho": "Khotanese",
+        "kik": "Kikuyu",
+        "kmb": "Kimbundu",
+        "kin": "Kinyarwanda",
+        "kir": "Kirghiz",
+        "tlh": "Klingon",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kok": "Konkani (macrolanguage)",
+        "kor": "한국어",
+        "kos": "Kosraean",
+        "kpe": "Kpelle",
+        "kua": "Kuanyama",
+        "kum": "Kumyk",
+        "kur": "Kurdish",
+        "kru": "Kurukh",
+        "kut": "Kutenai",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "라오 문자",
+        "lat": "Latin",
+        "lav": "라트비아어",
+        "lez": "Lezghian",
+        "lim": "Limburgan",
+        "lin": "Lingala",
+        "lit": "리투아니아어",
+        "jbo": "Lojban",
+        "loz": "Lozi",
+        "lub": "Luba-Katanga",
+        "lua": "Luba-Lulua",
+        "lui": "Luiseno",
+        "smj": "Lule Sami",
+        "lun": "Lunda",
+        "luo": "Luo (Kenya and Tanzania)",
+        "lus": "Lushai",
+        "ltz": "Luxembourgish",
+        "mkd": "마케도니아어",
+        "mad": "Madurese",
+        "mag": "Magahi",
+        "mai": "Maithili",
+        "mak": "Makasar",
+        "mlg": "Malagasy",
+        "msa": "Malay (macrolanguage)",
+        "mal": "말라얄람 문자",
+        "mlt": "Maltese",
+        "mnc": "Manchu",
+        "mdr": "Mandar",
+        "man": "Mandingo",
+        "mni": "Manipuri",
+        "glv": "Manx",
+        "mri": "Maori",
+        "arn": "Mapudungun",
+        "mar": "Marathi",
+        "chm": "Mari (Russia)",
+        "mah": "Marshallese",
+        "mwr": "Marwari",
+        "mas": "Masai",
+        "men": "Mende (Sierra Leone)",
+        "mic": "Mi'kmaq",
+        "min": "Minangkabau",
+        "mwl": "Mirandese",
+        "moh": "Mohawk",
+        "mdf": "Moksha",
+        "lol": "Mongo",
+        "mon": "몽골 문자",
+        "mos": "Mossi",
+        "mul": "Multiple languages",
+        "nqo": "응코 문자",
+        "nau": "나우루어",
+        "nav": "나바호어",
+        "ndo": "Ndonga",
+        "nap": "Neapolitan",
+        "nia": "Nias",
+        "niu": "Niuean",
+        "zxx": "No linguistic content",
+        "nog": "Nogai",
+        "nor": "노르웨이어",
+        "nob": "Norwegian Bokmål",
+        "nno": "Norwegian Nynorsk",
+        "nym": "Nyamwezi",
+        "nya": "Nyanja",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
+        "orm": "Oromo",
+        "osa": "Osage",
+        "oss": "Ossetian",
+        "pal": "Pahlavi",
+        "pau": "Palauan",
+        "pli": "Pali",
+        "pam": "Pampanga",
+        "pag": "Pangasinan",
+        "pan": "Panjabi",
+        "pap": "Papiamento",
+        "fas": "Persian",
+        "phn": " 페니키아 문자",
+        "pon": "Pohnpeian",
+        "pol": "폴란드어",
+        "por": "포르투갈어",
+        "pus": "Pashto",
+        "que": "Quechua",
+        "raj": "Rajasthani",
+        "rap": "Rapanui",
+        "ron": "루마니아어",
+        "roh": "Romansh",
+        "rom": "Romany",
+        "run": "Rundi",
+        "rus": "러시아어",
+        "smo": "Samoan",
+        "sad": "Sandawe",
+        "sag": "Sango",
+        "san": "Sanskrit",
+        "sat": "Santali",
+        "srd": "Sardinian",
+        "sas": "Sasak",
+        "sco": "Scots",
+        "sel": "Selkup",
+        "srp": "세르비아어",
+        "srr": "Serer",
+        "shn": "Shan",
+        "sna": "Shona",
+        "scn": "Sicilian",
+        "sid": "Sidamo",
+        "bla": "Siksika",
+        "snd": "Sindhi",
+        "sin": "싱할라 문자",
+        "den": "Slave (Athapascan)",
+        "slk": "슬로바키아어",
+        "slv": "슬로베니아어",
+        "sog": "Sogdian",
+        "som": "Somali",
+        "snk": "Soninke",
+        "spa": "스페인어",
+        "srn": "Sranan Tongo",
+        "suk": "Sukuma",
+        "sux": "Sumerian",
+        "sun": "Sundanese",
+        "sus": "Susu",
+        "swa": "Swahili (macrolanguage)",
+        "ssw": "Swati",
+        "swe": "스웨덴어",
+        "syr": "시리아 문자",
+        "tgl": "타갈로그 문자",
+        "tah": "Tahitian",
+        "tgk": "Tajik",
+        "tmh": "Tamashek",
+        "tam": "타밀 문자",
+        "tat": "Tatar",
+        "tel": "텔루구 문자",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tha": "태국어",
+        "bod": "티베트 문자",
+        "tig": "Tigre",
+        "tir": "Tigrinya",
+        "tem": "Timne",
+        "tiv": "Tiv",
+        "tli": "Tlingit",
+        "tpi": "Tok Pisin",
+        "tkl": "Tokelau",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Tonga Islands)",
+        "tsi": "Tsimshian",
+        "tso": "Tsonga",
+        "tsn": "Tswana",
+        "tum": "Tumbuka",
+        "tur": "터키어",
+        "tuk": "Turkmen",
+        "tvl": "Tuvalu",
+        "tyv": "Tuvinian",
+        "twi": "Twi",
+        "udm": "Udmurt",
+        "uga": "우가리트 문자",
+        "uig": "Uighur",
+        "ukr": "Ukrainian",
+        "umb": "Umbundu",
+        "mis": "Uncoded languages",
+        "und": "Undetermined",
+        "urd": "Urdu",
+        "uzb": "Uzbek",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "베트남어",
+        "vol": "Volapük",
+        "vot": "Votic",
+        "wln": "Walloon",
+        "war": "Waray (Philippines)",
+        "was": "Washo",
+        "cym": "Welsh",
+        "wal": "Wolaytta",
+        "wol": "Wolof",
+        "xho": "Xhosa",
+        "sah": "Yakut",
+        "yao": "Yao",
+        "yap": "Yapese",
+        "yid": "Yiddish",
+        "yor": "Yoruba",
+        "zap": "Zapotec",
+        "zza": "Zaza",
+        "zen": "Zenaga",
+        "zha": "Zhuang",
+        "zul": "Zulu",
+        "zun": "Zuni"
+    },
     "nl": {
         "aar": "Afar; Hamitisch",
         "abk": "Abchazisch",
@@ -4230,6 +4627,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini; Edo",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetaans",
         "bos": "Bosnisch",
@@ -4338,6 +4736,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainoons",
         "hin": "Hindi",
         "hit": "Hittitisch",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatisch",
@@ -4652,6 +5051,7 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "edo",
         "bis": "bislama",
+        "bit": "Berinomo",
         "bla": "siksika",
         "bod": "tybetański",
         "bos": "bośniacki",
@@ -4760,6 +5160,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hetycki",
+        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "chorwacki",
@@ -5069,6 +5470,7 @@ LANGUAGE_NAMES = {
         "bel": "Belarusian",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
+        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -5143,6 +5545,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgiano",
         "deu": "Alemão",
@@ -5449,6 +5852,7 @@ LANGUAGE_NAMES = {
         "bik": "Бикольский",
         "bin": "Бини",
         "bis": "Бислама",
+        "bit": "Berinomo",
         "bla": "Сиксика",
         "bod": "Тибетский",
         "bos": "Боснийский",
@@ -5557,6 +5961,7 @@ LANGUAGE_NAMES = {
         "hil": "Хилигайнон",
         "hin": "Хинди",
         "hit": "Хиттит",
+        "hmj": "Ge",
         "hmn": "Хмонг",
         "hmo": "Хири Моту",
         "hrv": "Хорватский",
@@ -5871,6 +6276,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Edo (bini)",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika (svartfotindianernas språk)",
         "bod": "Tibetanska",
         "bos": "Bosniska",
@@ -5979,6 +6385,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hettitiska språk",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatiska",
@@ -6288,6 +6695,7 @@ LANGUAGE_NAMES = {
         "bel": "Beyaz Rusça",
         "bem": "Bemba (Zambia)",
         "ben": "Bengalce",
+        "bit": "Berinomo",
         "bho": "Bhojpuri (Hindistan)",
         "bik": "Bikol (Filipinler)",
         "byn": "Bilin",
@@ -6362,6 +6770,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda Dili",
         "gay": "Gayo (Sumatra)",
         "gba": "Gbaya (Orta Afrika Cumhuriyeti)",
+        "hmj": "Ge",
         "gez": "Geez (Etiyopya)",
         "kat": "Gürcüce",
         "deu": "Almanca",
@@ -6668,6 +7077,7 @@ LANGUAGE_NAMES = {
         "bik": "бікольська",
         "bin": "біні",
         "bis": "біслама",
+        "bit": "беріномо",
         "bla": "сісіка",
         "bod": "тибетська",
         "bos": "боснійська",
@@ -6776,6 +7186,7 @@ LANGUAGE_NAMES = {
         "hil": "хілігайнон",
         "hin": "хінді",
         "hit": "хетська",
+        "hmj": "ге",
         "hmn": "хмонг",
         "hmo": "хірімоту",
         "hrv": "хорватська",
@@ -7090,6 +7501,7 @@ LANGUAGE_NAMES = {
         "bik": "比科尔语",
         "bin": "比尼语",
         "bis": "比斯拉马语",
+        "bit": "Berinomo",
         "bla": "西克西卡语",
         "bod": "藏语",
         "bos": "波斯尼亚语",
@@ -7198,6 +7610,7 @@ LANGUAGE_NAMES = {
         "hil": "希利盖农语",
         "hin": "印地语",
         "hit": "赫梯语",
+        "hmj": "亻革家语、重安江苗语",
         "hmn": "苗语",
         "hmo": "希里莫图语",
         "hrv": "克罗地亚语",
@@ -7507,6 +7920,7 @@ LANGUAGE_NAMES = {
         "bel": "白俄羅斯文",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
+        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -7581,6 +7995,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgian",
         "deu": "德文",
@@ -7887,6 +8302,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
@@ -7921,6 +8337,7 @@ LANGUAGE_NAMES = {
         "cre": "Cree",
         "crh": "Turkish; Crimean",
         "csb": "Kashubian",
+        "csl": "Chinese Sign Language",
         "cym": "Welsh",
         "dak": "Dakota",
         "dan": "Danish",
@@ -7995,6 +8412,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ko.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ko.min.js
new file mode 100644
index 000000000..9751ee5c2
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ko.min.js
@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.ko={days:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],daysShort:["일","월","화","수","목","금","토"],daysMin:["일","월","화","수","목","금","토"],months:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],monthsShort:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],today:"오늘",clear:"삭제",format:"yyyy-mm-dd",titleFormat:"yyyy년mm월",weekStart:0}}(jQuery);
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/ko.js b/cps/static/js/libs/tinymce/langs/ko.js
new file mode 100644
index 000000000..c6b3f2667
--- /dev/null
+++ b/cps/static/js/libs/tinymce/langs/ko.js
@@ -0,0 +1,261 @@
+tinymce.addI18n('ko_KR',{
+"Redo": "\ub2e4\uc2dc\uc2e4\ud589",
+"Undo": "\uc2e4\ud589\ucde8\uc18c",
+"Cut": "\uc798\ub77c\ub0b4\uae30",
+"Copy": "\ubcf5\uc0ac\ud558\uae30",
+"Paste": "\ubd99\uc5ec\ub123\uae30",
+"Select all": "\uc804\uccb4\uc120\ud0dd",
+"New document": "\uc0c8 \ubb38\uc11c",
+"Ok": "\ud655\uc778",
+"Cancel": "\ucde8\uc18c",
+"Visual aids": "\uc2dc\uac01\uad50\uc7ac",
+"Bold": "\uad75\uac8c",
+"Italic": "\uae30\uc6b8\uc784\uaf34",
+"Underline": "\ubc11\uc904",
+"Strikethrough": "\ucde8\uc18c\uc120",
+"Superscript": "\uc717\ucca8\uc790",
+"Subscript": "\uc544\ub798\ucca8\uc790",
+"Clear formatting": "\ud3ec\ub9f7\ucd08\uae30\ud654",
+"Align left": "\uc67c\ucabd\uc815\ub82c",
+"Align center": "\uac00\uc6b4\ub370\uc815\ub82c",
+"Align right": "\uc624\ub978\ucabd\uc815\ub82c",
+"Justify": "\uc591\ucabd\uc815\ub82c",
+"Bullet list": "\uc810\ub9ac\uc2a4\ud2b8",
+"Numbered list": "\uc22b\uc790\ub9ac\uc2a4\ud2b8",
+"Decrease indent": "\ub0b4\uc5b4\uc4f0\uae30",
+"Increase indent": "\ub4e4\uc5ec\uc4f0\uae30",
+"Close": "\ub2eb\uae30",
+"Formats": "\ud3ec\ub9f7",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\ube0c\ub77c\uc6b0\uc838\uac00 \ud074\ub9bd\ubcf4\ub4dc \uc811\uadfc\uc744 \ud5c8\uc6a9\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Ctrl+X\/C\/V \ud0a4\ub97c \uc774\uc6a9\ud574 \uc8fc\uc138\uc694.",
+"Headers": "\uc2a4\ud0c0\uc77c",
+"Header 1": "\uc81c\ubaa9 1",
+"Header 2": "\uc81c\ubaa9 2",
+"Header 3": "\uc81c\ubaa9 3",
+"Header 4": "\uc81c\ubaa9 4",
+"Header 5": "\uc81c\ubaa9 5",
+"Header 6": "\uc81c\ubaa9 6",
+"Headings": "\uc81c\ubaa9",
+"Heading 1": "\uc81c\ubaa9 1",
+"Heading 2": "\uc81c\ubaa9 2",
+"Heading 3": "\uc81c\ubaa9 3",
+"Heading 4": "\uc81c\ubaa9 4",
+"Heading 5": "\uc81c\ubaa9 5",
+"Heading 6": "\uc81c\ubaa9 6",
+"Preformatted": "Preformatted",
+"Div": "\uad6c\ubd84",
+"Pre": "Pre",
+"Code": "\ucf54\ub4dc",
+"Paragraph": "\ub2e8\ub77d",
+"Blockquote": "\uad6c\ud68d",
+"Inline": "\ub77c\uc778 \uc124\uc815",
+"Blocks": "\ube14\ub85d \uc124\uc815",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\uc2a4\ud0c0\uc77c\ubcf5\uc0ac \ub044\uae30. \uc774 \uc635\uc158\uc744 \ub044\uae30 \uc804\uc5d0\ub294 \ubcf5\uc0ac \uc2dc, \uc2a4\ud0c0\uc77c\uc774 \ubcf5\uc0ac\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.",
+"Font Family": "\uae00\uaf34",
+"Font Sizes": "\ud3f0\ud2b8 \uc0ac\uc774\uc988",
+"Class": "\ud074\ub798\uc2a4",
+"Browse for an image": "\uc774\ubbf8\uc9c0 \ucc3e\uae30",
+"OR": "\ud639\uc740",
+"Drop an image here": "\uc774\ubbf8\uc9c0 \ub4dc\ub86d",
+"Upload": "\uc5c5\ub85c\ub4dc",
+"Block": "\ube14\ub85d",
+"Align": "\uc815\ub82c",
+"Default": "\uae30\ubcf8",
+"Circle": "\uc6d0",
+"Disc": "\uc6d0\ubc18",
+"Square": "\uc0ac\uac01",
+"Lower Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
+"Lower Greek": "\uadf8\ub9ac\uc2a4\uc5b4 \uc18c\ubb38\uc790",
+"Lower Roman": "\ub85c\ub9c8\uc790 \uc18c\ubb38\uc790",
+"Upper Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
+"Upper Roman": "\ub85c\ub9c8\uc790 \ub300\ubb38\uc790",
+"Anchor": "\uc575\ucee4",
+"Name": "\uc774\ub984",
+"Id": "\uc544\uc774\ub514",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\uc544\uc774\ub514\ub294 \ubb38\uc790, \uc22b\uc790, \ub300\uc2dc, \uc810, \ucf5c\ub860 \ub610\ub294 \ubc11\uc904\ub85c \uc2dc\uc791\ud574\uc57c\ud569\ub2c8\ub2e4.",
+"You have unsaved changes are you sure you want to navigate away?": "\uc800\uc7a5\ud558\uc9c0 \uc54a\uc740 \uc815\ubcf4\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc774 \ud398\uc774\uc9c0\ub97c \ubc97\uc5b4\ub098\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+"Restore last draft": "\ub9c8\uc9c0\ub9c9 \ucd08\uc548 \ubcf5\uc6d0",
+"Special character": "\ud2b9\uc218\ubb38\uc790",
+"Source code": "\uc18c\uc2a4\ucf54\ub4dc",
+"Insert\/Edit code sample": "\ucf54\ub4dc\uc0d8\ud50c \uc0bd\uc785\/\ud3b8\uc9d1",
+"Language": "\uc5b8\uc5b4",
+"Code sample": "\ucf54\ub4dc\uc0d8\ud50c",
+"Color": "\uc0c9\uc0c1",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "\uc67c\ucabd\uc5d0\uc11c \uc624\ub978\ucabd",
+"Right to left": "\uc624\ub978\ucabd\uc5d0\uc11c \uc67c\ucabd",
+"Emoticons": "\uc774\ubaa8\ud2f0\ucf58",
+"Document properties": "\ubb38\uc11c \uc18d\uc131",
+"Title": "\uc81c\ubaa9",
+"Keywords": "\ud0a4\uc6cc\ub4dc",
+"Description": "\uc124\uba85",
+"Robots": "\ub85c\ubd07",
+"Author": "\uc800\uc790",
+"Encoding": "\uc778\ucf54\ub529",
+"Fullscreen": "\uc804\uccb4\ud654\uba74",
+"Action": "\ub3d9\uc791",
+"Shortcut": "\ub2e8\ucd95\ud0a4",
+"Help": "\ub3c4\uc6c0\ub9d0",
+"Address": "\uc8fc\uc18c",
+"Focus to menubar": "\uba54\ub274\uc5d0 \ud3ec\ucee4\uc2a4",
+"Focus to toolbar": "\ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
+"Focus to element path": "element path\uc5d0 \ud3ec\ucee4\uc2a4",
+"Focus to contextual toolbar": "\ucf04\ud14d\uc2a4\ud2b8 \ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
+"Insert link (if link plugin activated)": "\ub9c1\ud06c \uc0bd\uc785 (link \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
+"Save (if save plugin activated)": "\uc800\uc7a5 (save \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
+"Find (if searchreplace plugin activated)": "\ucc3e\uae30(searchreplace \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
+"Plugins installed ({0}):": "\uc124\uce58\ub41c \ud50c\ub7ec\uadf8\uc778 ({0}):",
+"Premium plugins:": "\uace0\uae09 \ud50c\ub7ec\uadf8\uc778",
+"Learn more...": "\uc880 \ub354 \uc0b4\ud3b4\ubcf4\uae30",
+"You are using {0}": "{0}\ub97c \uc0ac\uc6a9\uc911",
+"Plugins": "\ud50c\ub7ec\uadf8\uc778",
+"Handy Shortcuts": "\ub2e8\ucd95\ud0a4",
+"Horizontal line": "\uac00\ub85c",
+"Insert\/edit image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785\/\uc218\uc815",
+"Image description": "\uc774\ubbf8\uc9c0 \uc124\uba85",
+"Source": "\uc18c\uc2a4",
+"Dimensions": "\ud06c\uae30",
+"Constrain proportions": "\uc791\uc5c5 \uc81c\ud55c",
+"General": "\uc77c\ubc18",
+"Advanced": "\uace0\uae09",
+"Style": "\uc2a4\ud0c0\uc77c",
+"Vertical space": "\uc218\uc9c1 \uacf5\ubc31",
+"Horizontal space": "\uc218\ud3c9 \uacf5\ubc31",
+"Border": "\ud14c\ub450\ub9ac",
+"Insert image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785",
+"Image": "\uc774\ubbf8\uc9c0",
+"Image list": "\uc774\ubbf8\uc9c0 \ubaa9\ub85d",
+"Rotate counterclockwise": "\uc2dc\uacc4\ubc18\ub300\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
+"Rotate clockwise": "\uc2dc\uacc4\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
+"Flip vertically": "\uc218\uc9c1 \ub4a4\uc9d1\uae30",
+"Flip horizontally": "\uc218\ud3c9 \ub4a4\uc9d1\uae30",
+"Edit image": "\uc774\ubbf8\uc9c0 \ud3b8\uc9d1",
+"Image options": "\uc774\ubbf8\uc9c0 \uc635\uc158",
+"Zoom in": "\ud655\ub300",
+"Zoom out": "\ucd95\uc18c",
+"Crop": "\uc790\ub974\uae30",
+"Resize": "\ud06c\uae30 \uc870\uc808",
+"Orientation": "\ubc29\ud5a5",
+"Brightness": "\ubc1d\uae30",
+"Sharpen": "\uc120\uba85\ud558\uac8c",
+"Contrast": "\ub300\ube44",
+"Color levels": "\uc0c9\uc0c1\ub808\ubca8",
+"Gamma": "\uac10\ub9c8",
+"Invert": "\ubc18\uc804",
+"Apply": "\uc801\uc6a9",
+"Back": "\ub4a4\ub85c",
+"Insert date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04\uc0bd\uc785",
+"Date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04",
+"Insert link": "\ub9c1\ud06c \uc0bd\uc785 ",
+"Insert\/edit link": "\ub9c1\ud06c \uc0bd\uc785\/\uc218\uc815",
+"Text to display": "\ubcf8\ubb38",
+"Url": "\uc8fc\uc18c",
+"Target": "\ub300\uc0c1",
+"None": "\uc5c6\uc74c",
+"New window": "\uc0c8\ucc3d",
+"Remove link": "\ub9c1\ud06c\uc0ad\uc81c",
+"Anchors": "\ucc45\uac08\ud53c",
+"Link": "\ub9c1\ud06c",
+"Paste or type a link": "\ub9c1\ud06c\ub97c \ubd99\uc5ec\ub123\uac70\ub098 \uc785\ub825\ud558\uc138\uc694",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\ud604\uc7ac E-mail\uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. E-mail \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\ud604\uc7ac \uc6f9\uc0ac\uc774\ud2b8 \uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. \ud574\ub2f9 \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
+"Link list": "\ub9c1\ud06c \ub9ac\uc2a4\ud2b8",
+"Insert video": "\ube44\ub514\uc624 \uc0bd\uc785",
+"Insert\/edit video": "\ube44\ub514\uc624 \uc0bd\uc785\/\uc218\uc815",
+"Insert\/edit media": "\ubbf8\ub514\uc5b4 \uc0bd\uc785\/\uc218\uc815",
+"Alternative source": "\ub300\uccb4 \uc18c\uc2a4",
+"Poster": "\ud3ec\uc2a4\ud130",
+"Paste your embed code below:": "\uc544\ub798\uc5d0 \ucf54\ub4dc\ub97c \ubd99\uc5ec\ub123\uc73c\uc138\uc694:",
+"Embed": "\uc0bd\uc785",
+"Media": "\ubbf8\ub514\uc5b4",
+"Nonbreaking space": "\ub744\uc5b4\uc4f0\uae30",
+"Page break": "\ud398\uc774\uc9c0 \uad6c\ubd84\uc790",
+"Paste as text": "\ud14d\uc2a4\ud2b8\ub85c \ubd99\uc5ec\ub123\uae30",
+"Preview": "\ubbf8\ub9ac\ubcf4\uae30",
+"Print": "\ucd9c\ub825",
+"Save": "\uc800\uc7a5",
+"Find": "\ucc3e\uae30",
+"Replace with": "\uad50\uccb4",
+"Replace": "\uad50\uccb4",
+"Replace all": "\uc804\uccb4 \uad50\uccb4",
+"Prev": "\uc774\uc804",
+"Next": "\ub2e4\uc74c",
+"Find and replace": "\ucc3e\uc544\uc11c \uad50\uccb4",
+"Could not find the specified string.": "\ubb38\uc790\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
+"Match case": "\ub300\uc18c\ubb38\uc790 \uc77c\uce58",
+"Whole words": "\uc804\uccb4 \ub2e8\uc5b4",
+"Spellcheck": "\ubb38\ubc95\uccb4\ud06c",
+"Ignore": "\ubb34\uc2dc",
+"Ignore all": "\uc804\uccb4\ubb34\uc2dc",
+"Finish": "\uc644\ub8cc",
+"Add to Dictionary": "\uc0ac\uc804\uc5d0 \ucd94\uac00",
+"Insert table": "\ud14c\uc774\ube14 \uc0bd\uc785",
+"Table properties": "\ud14c\uc774\ube14 \uc18d\uc131",
+"Delete table": "\ud14c\uc774\ube14 \uc0ad\uc81c",
+"Cell": "\uc140",
+"Row": "\uc5f4",
+"Column": "\ud589",
+"Cell properties": "\uc140 \uc18d",
+"Merge cells": "\uc140 \ud569\uce58\uae30",
+"Split cell": "\uc140 \ub098\ub204\uae30",
+"Insert row before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
+"Insert row after": "\ub2e4\uc74c\uc5d0 \ud589 \uc0bd\uc785",
+"Delete row": "\ud589 \uc9c0\uc6b0\uae30",
+"Row properties": "\ud589 \uc18d\uc131",
+"Cut row": "\ud589 \uc798\ub77c\ub0b4\uae30",
+"Copy row": "\ud589 \ubcf5\uc0ac",
+"Paste row before": "\uc774\uc804\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
+"Paste row after": "\ub2e4\uc74c\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
+"Insert column before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
+"Insert column after": "\ub2e4\uc74c\uc5d0 \uc5f4 \uc0bd\uc785",
+"Delete column": "\uc5f4 \uc9c0\uc6b0\uae30",
+"Cols": "\uc5f4",
+"Rows": "\ud589",
+"Width": "\ub113\uc774",
+"Height": "\ub192\uc774",
+"Cell spacing": "\uc140 \uac04\uaca9",
+"Cell padding": "\uc140 \uc548\ucabd \uc5ec\ubc31",
+"Caption": "\ucea1\uc158",
+"Left": "\uc67c\ucabd",
+"Center": "\uac00\uc6b4\ub370",
+"Right": "\uc624\ub978\ucabd",
+"Cell type": "\uc140 \ud0c0\uc785",
+"Scope": "\ubc94\uc704",
+"Alignment": "\uc815\ub82c",
+"H Align": "\uac00\ub85c \uc815\ub82c",
+"V Align": "\uc138\ub85c \uc815\ub82c",
+"Top": "\uc0c1\ub2e8",
+"Middle": "\uc911\uac04",
+"Bottom": "\ud558\ub2e8",
+"Header cell": "\ud5e4\ub354 \uc140",
+"Row group": "\ud589 \uadf8\ub8f9",
+"Column group": "\uc5f4 \uadf8\ub8f9",
+"Row type": "\ud589 \ud0c0\uc785",
+"Header": "\ud5e4\ub354",
+"Body": "\ubc14\ub514",
+"Footer": "\ud478\ud130",
+"Border color": "\ud14c\ub450\ub9ac \uc0c9",
+"Insert template": "\ud15c\ud50c\ub9bf \uc0bd\uc785",
+"Templates": "\ud15c\ud50c\ub9bf",
+"Template": "\ud15c\ud50c\ub9bf",
+"Text color": "\ubb38\uc790 \uc0c9\uae54",
+"Background color": "\ubc30\uacbd\uc0c9",
+"Custom...": "\uc9c1\uc811 \uc0c9\uae54 \uc9c0\uc815\ud558\uae30",
+"Custom color": "\uc9c1\uc811 \uc9c0\uc815\ud55c \uc0c9\uae54",
+"No color": "\uc0c9\uc0c1 \uc5c6\uc74c",
+"Table of Contents": "\ubaa9\ucc28",
+"Show blocks": "\ube14\ub7ed \ubcf4\uc5ec\uc8fc\uae30",
+"Show invisible characters": "\uc548\ubcf4\uc774\ub294 \ubb38\uc790 \ubcf4\uc774\uae30",
+"Words: {0}": "\ub2e8\uc5b4: {0}",
+"{0} words": "{0} \ub2e8\uc5b4",
+"File": "\ud30c\uc77c",
+"Edit": "\uc218\uc815",
+"Insert": "\uc0bd\uc785",
+"View": "\ubcf4\uae30",
+"Format": "\ud3ec\ub9f7",
+"Table": "\ud14c\uc774\ube14",
+"Tools": "\ub3c4\uad6c",
+"Powered by {0}": "Powered by {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \ud3b8\uc9d1\uae30 \uc785\ub2c8\ub2e4. ALT-F9\ub97c \ub204\ub974\uba74 \uba54\ub274, ALT-F10\ub97c \ub204\ub974\uba74 \ud234\ubc14, ALT-0\uc744 \ub204\ub974\uba74 \ub3c4\uc6c0\ub9d0\uc744 \ubcfc \uc218 \uc788\uc2b5\ub2c8\ub2e4."
+});
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 3733c6c4e23a2c3ed78a08e9ba5ea3edb538486a..a411e0e77b9bbc20258458b3187b7e89aaaeb56a 100644
GIT binary patch
delta 8959
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
Hde85FAM0j&

delta 9045
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

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 581af8290..fd74006e6 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+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,7 +15,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr "není nainstalováno"
 msgid "installed"
 msgstr "nainstalováno"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistika"
 
@@ -45,9 +45,9 @@ msgstr "Úspěšně obnovené připojení"
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Neznámý"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
@@ -357,7 +357,7 @@ msgstr "Upravit uživatele %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
@@ -392,7 +392,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
@@ -492,108 +492,112 @@ msgstr "není nakonfigurováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Formát knihy úspěšně smazán"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "upravit metadata"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s není platným jazykem"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 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:646
+#: cps/editbooks.py:650
 #, 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:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, 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:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadata úspěšně aktualizována"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 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:895
+#: cps/editbooks.py:899
 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:993
+#: cps/editbooks.py:997
 #, 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:1012
+#: cps/editbooks.py:1016
 #, 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:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Soubor %(file)s nahrán"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Chybí zdrojový nebo cílový formát pro převod"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, 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"
@@ -606,175 +610,175 @@ msgstr "Google Drive nastavení nebylo dokončeno, zkuste  znovu deaktivovat a a
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Doména zpětného volání není ověřena, postupujte podle pokynů k ověření domény v konzole pro vývojáře google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s nenalezen na Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nenalezen: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Tento e-mail byl odeslán přes Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web zkušební e-mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Zkušební e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Začínáme s Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrační e-mail pro uživatele: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Poslat %(format)s do Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Poslat do Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 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:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Mazání knihy selhalo %(id)s failed: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Mazání knihy %(id)s, cesta ke knize není platná %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Zadané uživatelské jméno je již použito"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Chyba stahování obalu"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Chyba formátu obalu"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Vytvoření cesty obalu selhalo"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 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:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Pouze jpg/jpeg jsou podporované soubory pro obal"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Unrar binární soubor nenalezen"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Chyba provádění UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Čekám"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Spuštěno"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo nastavení"
 
@@ -783,7 +787,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -849,7 +853,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -1068,41 +1072,46 @@ msgstr "Upravit polici"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Police %(title)s vytvořena"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Police %(title)s změněna"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Došlo k chybě"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, 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:311
+#: cps/shelf.py:312
 #, 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:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Kniha úspěšně smazána"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Změnit  pořadí Police: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Police: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
 
@@ -1183,14 +1192,14 @@ msgstr "Kategorie: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Hledat"
 
@@ -1210,102 +1219,102 @@ msgstr "Seznam formátů"
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 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:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, 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:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
@@ -1382,7 +1391,7 @@ msgid "Upload"
 msgstr "Nahrávat"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Stahovat"
@@ -1549,39 +1558,38 @@ msgstr "Detaily"
 msgid "Current version"
 msgstr "Současná verze"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Zkontrolovat aktualizace"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Provést aktualizaci"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Opravdu chcete restartovat?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Opravdu chcete vypnout?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Probíhá aktualizace, prosím nenačítejte stránku znovu"
 
@@ -1594,39 +1602,39 @@ msgid "In Library"
 msgstr "V knihovně"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "redukovat"
 
@@ -2471,12 +2479,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2965,30 +2973,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Smazat tuto polici"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Police bude smazána pro všechny uživatele"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Sdílet se všemi"
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index ae7fbfcfd0a44656a9805698eee5cd981eb806fa..be96d682b114d04eca6696eb049d9678a1e0376d 100644
GIT binary patch
delta 12079
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

delta 12175
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

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 10cc56e3d..d312bfdfc 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2021-12-22 19:05+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "Nicht installiert"
 msgid "installed"
 msgstr "Installiert"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistiken"
 
@@ -46,9 +46,9 @@ msgstr "Erfolgreich neu verbunden"
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -160,7 +160,7 @@ msgstr "Möchten Sie wirklich diese Domain löschen?"
 msgid "Do you really want to delete this user?"
 msgstr "Möchten Sie wirklich diesen Benutzer löschen?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Möchten Sie wirklich dieses Bücherregal löschen?"
 
@@ -277,7 +277,7 @@ msgstr "LDAP CA-Zertifikat, Zertifikat oder Key Datei ist kein gültiger Pfad"
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
@@ -305,7 +305,7 @@ msgstr "Datenbankeinstellung aktualisiert"
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
@@ -349,7 +349,7 @@ msgstr "Benutzer %(nick)s bearbeiten"
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
@@ -384,7 +384,7 @@ msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
@@ -482,108 +482,112 @@ msgstr "Nicht konfiguriert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, 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/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Buch Format erfolgreich gelöscht"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s ist keine gültige Zahl, Eintrag wird ignoriert"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "'%(langname)s' ist keine gültige Sprache"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "IDs unterscheiden nicht Groß-Kleinschreibung, alte ID wird überschrieben"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 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:993
+#: cps/editbooks.py:997
 #, 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:1012
+#: cps/editbooks.py:1016
 #, 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:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Datei %(file)s hochgeladen"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehler beim Konvertieren des Buches auf: %(res)s"
@@ -596,174 +600,174 @@ msgstr "Google Drive Setup is nicht komplett, bitte versuche Google Drive zu dea
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback Domain ist nicht verifiziert, bitte Domain in der Google Developer Console verifizieren"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nicht gefunden: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web Test-E-Mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Test-E-Mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Loslegen mit Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrierungs-E-Mail für Benutzer %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Sende %(format)s an Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s an Kindle senden"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 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:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Löschen des Ordners für Buch %(id)s ist fehlgeschlagen, der Pfad hat Unterordner: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Löschen von Buch %(id)s fehlgeschlagen: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Lösche Buch %(id)s nur aus Datenbank, Pfad zum Buch in Datenbank ist nicht gültig: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Ungültiges E-Mail Adressformat"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Fehler beim Herunterladen des Covers"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Coverdatei fehlerhaft"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Fehler beim Erzeugen des Ordners für die Coverdatei"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 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:638
+#: cps/helper.py:635
 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:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr "Ungültiger Cover Dateiinhalt"
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Es werden nur jpg/jpeg Dateien als Cover untertützt"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "UnRar Programm nicht gefunden"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Fehler beim ausführen von UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Gestartet"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo Setup"
 
@@ -772,7 +776,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -838,7 +842,7 @@ msgid "{} Stars"
 msgstr "{} Sterne"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Login"
 
@@ -1055,41 +1059,46 @@ msgstr "Bücherregal editieren"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr "Sie haben keine Berechtigung um öffentliche Bücherregal zu erzeugen"
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, 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:311
+#: cps/shelf.py:312
 #, 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:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Buch erfolgreich gelöscht"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 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"
 
@@ -1170,14 +1179,14 @@ msgstr "Kategorie: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Suche"
 
@@ -1197,102 +1206,102 @@ msgstr "Liste der Dateiformate"
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 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:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 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:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, 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:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
@@ -1369,7 +1378,7 @@ msgid "Upload"
 msgstr "Upload"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Download"
@@ -1535,39 +1544,38 @@ msgstr "Details"
 msgid "Current version"
 msgstr "Aktuelle Version"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Nach Update suchen"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Update durchführen"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Calibre-Web wirklich neustarten?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Calibre-Web wirklich anhalten?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Updatevorgang, Seite bitte nicht neu laden"
 
@@ -1580,39 +1588,39 @@ msgid "In Library"
 msgstr "In Bibliothek"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Sortiere nach Buchdatum, Neuestes zuerst"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Sortiere nach Buchdatum, Aältestes zuerst"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Sortiere Titel in alphabetischer Reihenfolge"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortiere Titel in umgekehrt alphabetischer Reihenfolge"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortiere nach Herausgabedatum, Neueste zuerst"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "Reduzieren"
 
@@ -2450,12 +2458,12 @@ msgid "Sort descending according to download count"
 msgstr "Absteigend nach Downloadzahlen sortieren"
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Sortiere Autoren in alphabetischer Reihenfolge"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Sortiere Autoren in umgekehrt alphabetischer Reihenfolge"
 
@@ -2937,30 +2945,26 @@ msgstr "Von:"
 msgid "To:"
 msgstr "Bis:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Lösche dieses Bücherregal"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Bücherregal Eigenschaften bearbeiten"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Bücher manuell sortieren"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Manuelles Sortieren deaktivieren"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Manuelles Sortieren aktivieren"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Das Bücherregal wird für alle und für immer gelöscht"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Bücherregal mit anderen Benutzern teilen"
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 4068708c27897b675a4e7d1e2ee166871fbc2096..c4b1af88a4f7800b37b4be3af13947671b1011f8 100644
GIT binary patch
delta 9530
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

delta 9628
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
R%AY{Pj{KbM`;Rv-^MB=+cwztm

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 2afe1a0a6..366b1dc1d 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -15,7 +15,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr "δεν εγκαταστάθηκε"
 msgid "installed"
 msgstr "εγκαταστάθηκε"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Στατιστικά"
 
@@ -45,9 +45,9 @@ msgstr "Επιτυχής επανασύνδεση"
 msgid "Unknown command"
 msgstr "Άγνωστη εντολή"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "ʼΑγνωστο"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
 
@@ -312,7 +312,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
@@ -357,7 +357,7 @@ msgstr "Επεξεργασία χρήστη %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
@@ -392,7 +392,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
@@ -492,108 +492,112 @@ msgstr "δεν διαμορφώθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "επεξεργασία μεταδεδομένων"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s δεν είναι μια έγκυρη γλώσσα"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Η επέκταση αρχείου '%(ext)s' δεν επιτρέπεται να ανέβει σε αυτό το διακομιστή"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Το αρχείο προς ανέβασμα πρέπει να έχει μια επέκταση"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η άδεια απορρήφθηκε)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Μορφή αρχείου %(ext)s προστέθηκε σε %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Τα αναγνωριστικά δεν έχουν Διάκριση Πεζών-Κεφαλαίων Γραμμάτων, Αντικατάσταση Παλιού Αναγνωριστικού"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Τα μεταδεδομένα ενημερώθηκαν επιτυχώς"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Σφάλμα επεξεργασίας βιβλίου, παρακαλούμε έλεγξε το φύλλο καταγραφής για λεπτομέρειες"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Το βιβλίο που ανέβηκε πιθανόν να υπάρχει στη βιβλιοθήκη, σκέψου να το αλλάξεις πριν ανεβάσεις νέο: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Το αρχείο %(filename)s δεν μπόρεσε να αποθηκευτεί σε temp dir"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Αποτυχία Μετακίνησης Αρχείου Φόντου %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Το αρχείο %(file)s ανέβηκε"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Η δομή πηγής ή προορισμού για μετατροπή λείπει"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Το βιβλίο είναι σε σειρά επιτυχώς για μετατροπή σε %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Υπήρξε ένα σφάλμα στη μετατροπή αυτού του βιβλίου: %(res)s"
@@ -606,175 +610,175 @@ msgstr "Η ρύθμιση του Google Drive δεν ολοκληρώθηκε, 
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Η ανάκληση ονόματος δεν έχει επαληθευτεί, παρακαλούμε ακολούθησε τα βήματα για την επαλήθευση ονόματος στην κονσόλα προγραμματιστή google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s δεν βρέθηκε στο Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s δεν βρέθηκε: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Αποστολή στο Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Αυτό το e-mail έχει σταλεί μέσω Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web δοκιμαστικό e-mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Δοκιμαστικό e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Ξεκινήστε με το Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "e-mail εγγραφής για χρήστη: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Μετατροπή %(orig)s σε %(format)s και αποστολή στο Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Αποστολή %(format)s στο Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Αποστολή στο Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Το αρχείου που χητήθηκε δεν μπορεί να διαβαστεί. Μπορεί να υπάρχουν λαθασμένες άδειες;"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Η διαγραφή φακέλου βιβλίου για το βιβλίο %(id)s απέτυχε, η πορεία έχει υπό-φακέλους: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Η διαγραφή βιβλίου %(id)s απέτυχε: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Διαγραφή βιβλίου %(id)s, η πορεία βιβλίου δεν είναι έγκυρη: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Το αρχείο %(file)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Αυτό το όνομα χρήστη έχει ήδη παρθεί"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Σφάλμα Κατεβάσματος Φόντου"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Σφάλμα Μορφής Φόντου"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Αποτυχία δημιουργίας πορείας για φόντο"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Το αρχείο φόντου δεν είναι ένα έγκυρο αρχείο εικόνας, ή δεν μπόρεσε να αποθηκευτεί"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Μόνο jpg/jpeg αρχεία υποστηρίζονται ως αρχεία φόντου"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Δεν βρέθηκε δυαδικό αρχείο Unrar"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Σφάλμα εκτέλεσης UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Αναμονή"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Ξεκίνησε"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Τελείωσε"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "ʼΑγνωστη κατάσταση"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Καθορισμός Kobo"
 
@@ -783,7 +787,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -849,7 +853,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -1068,41 +1072,46 @@ msgstr "Επεξεργασία ενός ραφιού"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Το ράφι %(title)s δημιουργήθηκε"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Το ράφι %(title)s άλλαξε"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Υπήρξε ένα σφάλμα"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Ράφι: '%(name)s"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -1183,14 +1192,14 @@ msgstr "Κατηγορία: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Αναζήτηση"
 
@@ -1210,102 +1219,102 @@ msgstr "Λίστα μορφών αρχείου"
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
@@ -1382,7 +1391,7 @@ msgid "Upload"
 msgstr "Ανέβασμα"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Κατέβασμα"
@@ -1549,39 +1558,38 @@ msgstr "Λεπτομέρειες"
 msgid "Current version"
 msgstr "Τρέχουσα έκδοση"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Έλεγχος για Ενημέρωση"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Πραγματοποίηση Ενημέρωσης"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις επανεκκίνηση"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις κλείσιμο;"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Γίνεται ενημέρωση, παρακαλούμε μη φορτώσεις ξανά αυτή τη σελίδα"
 
@@ -1594,39 +1602,39 @@ msgid "In Library"
 msgstr "Στη Βιβλιοθήκη"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "μείωση"
 
@@ -2471,12 +2479,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2965,30 +2973,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Διαγραφή αυτού του Ραφιού"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Το ράφι θα διαγραφεί για όλους τουε χρήστες"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Κοινοποίηση με Όλους"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index aaa84a38823366c0be19402b88b798683e733d90..0ed8ab6e9bb94fbfd135e75d01e100b8132d942c 100644
GIT binary patch
delta 11062
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
HW>x<Wu>t%0

delta 11162
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

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 3047167f7..096e7f63c 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,7 +18,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -29,7 +29,7 @@ msgid "installed"
 msgstr "instalado"
 
 # "Last-Translator: victorhck <victorhck@mailbox.org>\n"
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Estadísticas"
 
@@ -49,9 +49,9 @@ msgstr "Reconexión correcta"
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Desconocido"
@@ -164,7 +164,7 @@ msgstr "¿Realmente deseas borrar este dominio?"
 msgid "Do you really want to delete this user?"
 msgstr "¿Realmente quieres borrar este usuario?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "¿Realmente quieres eliminar este estante?"
 
@@ -286,7 +286,7 @@ msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la c
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "La base de datos de configuración no es modificable"
 
@@ -316,7 +316,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
@@ -361,7 +361,7 @@ msgstr "Editar Usuario %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
@@ -396,7 +396,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
@@ -496,108 +496,112 @@ msgstr "no configurado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Formato de libro eliminado con éxito"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Libro eliminado con éxito"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "editar metadatos"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex) no es un número válido, saltando"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s no es un idioma válido"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, 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:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Los identificadores no distinguen entre mayúsculas y minúsculas, sobrescribiendo el identificador antiguo"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadatos actualizados con éxito"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 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:895
+#: cps/editbooks.py:899
 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:993
+#: cps/editbooks.py:997
 #, 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:1012
+#: cps/editbooks.py:1016
 #, 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:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "El fichero %(file)s ha sido subido"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Falta la fuente o el formato de destino para la conversión"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocurrió un error al convertir este libro: %(res)s"
@@ -610,175 +614,175 @@ msgstr "La configuración de Google Drive no se ha completado, intente desactiva
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "El dominio Callback no se ha verificado, siga los pasos para verificarlo en la consola de desarrollador de Google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s no encontrado: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Este correo electrónico ha sido enviado usando Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Correo de prueba de Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Comprobar correo electrónico"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Primeros pasos con Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Correo electrónico de registro para el usuario: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Enviado %(format)s al Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Enviar al Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 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:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Fallo al intentar borrar la carpeta del libro %(id)s, la ruta tiene subcarpetas: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "El eliminado del libro %(id)s falló: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Borrando el libro %(id)s, la ruta del libro es no válida: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Este nombre de usuario ya está en uso"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Dirección de correo no válida"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Error al descargar la cubierta"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Error en el formato de la cubierta"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Error al crear una ruta para la cubierta"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 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:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Sólo se admiten como portada los archivos jpg/jpeg/png/webp/bmp"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Sólo se admiten como portada los archivos jpg/jpeg"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "No se encuentra el archivo binario UnRar"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Error ejecutando UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Esperando"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Fallido"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Comenzado"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Finalizado"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Configuración de Kobo"
 
@@ -787,7 +791,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -853,7 +857,7 @@ msgid "{} Stars"
 msgstr "{} Estrellas"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -1072,41 +1076,46 @@ msgstr "Editar un estante"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, 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:311
+#: cps/shelf.py:312
 #, 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:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Libro eliminado con éxito"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 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"
 
@@ -1187,14 +1196,14 @@ msgstr "Categoría : %(name)s"
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Buscar"
 
@@ -1214,102 +1223,102 @@ msgstr "Lista de formatos"
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = $(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 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:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 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:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, 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:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 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:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
@@ -1386,7 +1395,7 @@ msgid "Upload"
 msgstr "Subir archivo"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Descargar"
@@ -1553,39 +1562,38 @@ msgstr "Detalles"
 msgid "Current version"
 msgstr "Versión actual"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Comprobar actualizaciones"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Realizar actualización"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "¿Realmente quieres reiniciar?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "¿Realmente quiere detener?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Actualizando. Por favor, no recargue la página"
 
@@ -1598,39 +1606,39 @@ msgid "In Library"
 msgstr "En la Librería"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Ordenar en base a fecha del libro, más reciente primero"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Ordenar en base a fecha del libro, menos reciente primero"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Ordenar en base al título en orden alfabético"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Ordenar en base al título en orden alfabético invertido"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Ordenar en base a fecha de publicación, más reciente primero"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Ordenar en base a fecha de publicación, menos reciente primero"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "reducir"
 
@@ -2475,12 +2483,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Ordenar autores en orden alfabético"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordenar autores en orden alfabético inverso"
 
@@ -2969,30 +2977,26 @@ msgstr "De:"
 msgid "To:"
 msgstr "Para:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Borrar este estante"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Editar propiedades del estante"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Ordenar libros manualmente"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Deshabilitar cambio de orden"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Habilitar cambio de orden"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "La estantería se eliminará para todos los usuarios"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Compartir con todos"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index 6493ba4325f76fbee08206f00e39284f80e0ea76..fe916f5a3cbb89785496278a3971f56b23cddfb0 100644
GIT binary patch
delta 6733
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

delta 6815
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
U*{oa2DoQKnmE~4GTvAy3f8@Ley#N3J

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index ae6cbd12a..938ae04f1 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "ei asennettu"
 msgid "installed"
 msgstr "asennettu"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Tilastot"
 
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
@@ -357,7 +357,7 @@ msgstr "Muokkaa käyttäjää %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
@@ -392,7 +392,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
@@ -490,108 +490,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "muokkaa metadataa"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s ei ole kelvollinen kieli"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Ladattavalla tiedostolla on oltava tiedostopääte"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Tiedostoformaatti %(ext)s lisätty %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadata päivitetty onnistuneesti"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Kirjan editoinnissa tapahtui virhe, tarkista virheilmoitus lokista"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Tiedosto %(file)s tallennettu"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Lähteen tai kohteen tiedostomuoto puuttuu"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kirja lisätty muutosjonoon muotoon %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Kirjan muunnoksessa tapahtui virhe: %(res)s"
@@ -604,175 +608,175 @@ msgstr "Google Drive asetukset ei ole valmiit. Koita poistaa Google Drive käyt
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Paluuosoitteen domain ei ole varmistettu, seuraa ohjeita vamistaaksesi sen googlen kehittäjäkonsolissa"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s ei löydy: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 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:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web testisähköposti"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Testi sähköposti"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Aloita Calibre-Web:in käyttö"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Rekiströintisähköposti käyttäjälle: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Lähetä %(format)s Kindleen"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Lähetä Kindleen"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 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:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Aloitettu"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Valmistui"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -781,7 +785,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -847,7 +851,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -1066,41 +1070,46 @@ msgstr "Muokkaa hyllyä"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hylly %(title)s luotu"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hylly %(title)s muutettu"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Tapahtui virhe"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Metadata päivitetty onnistuneesti"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Muuta hyllyn: '%(name)s' järjestystä"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylly: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
 
@@ -1181,14 +1190,14 @@ msgstr "Kategoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Hae"
 
@@ -1208,102 +1217,102 @@ msgstr "Tiedostomuotolistaus"
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 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:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
@@ -1380,7 +1389,7 @@ msgid "Upload"
 msgstr "Lähetä"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Lataa"
@@ -1547,39 +1556,38 @@ msgstr "Yksityiskohdat"
 msgid "Current version"
 msgstr "Nykyinen versio"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Tarkista päivitykset"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Päivitä"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Haluatko varmasti uudelleenkäynnistää Calibre-Webin?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Haluatko varmasti pysäyttää Calibre-Webin?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Päivitetään, älä päivitä sivua"
 
@@ -1592,39 +1600,39 @@ msgid "In Library"
 msgstr "Kirjastossa"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "vähennä"
 
@@ -2467,12 +2475,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2961,30 +2969,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Poista tämä hylly"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Hylly poistetaan kaikilta ja ikuisesti!"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "pitäisikö hyllyn olla julkinen?"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index ed7751543b7f4b78e543f112eedb1f6a3dcadf29..7b381167fc288133cbea7631952fd53ae4cbfb5e 100644
GIT binary patch
delta 11059
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

delta 11149
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
Ti^rGcPb(-d+xz`L1~vL0f`TlY

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 32ebdc2a8..782ae51a9 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -31,7 +31,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -41,7 +41,7 @@ msgstr "non installé"
 msgid "installed"
 msgstr "installé"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistiques"
 
@@ -61,9 +61,9 @@ msgstr "Reconnecté avec succès"
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Inconnu"
@@ -176,7 +176,7 @@ msgstr "Voulez-vous vraiment supprimer ce domaine ?"
 msgid "Do you really want to delete this user?"
 msgstr "Voulez-vous vraiment supprimer cet utilisateur ?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Voulez-vous vraiment supprimer l’étagère ?"
 
@@ -298,7 +298,7 @@ msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuille
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Les paramètres de la base de données ne sont pas accessibles en écriture"
 
@@ -328,7 +328,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
@@ -373,7 +373,7 @@ msgstr "Éditer l'utilisateur %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
@@ -408,7 +408,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
@@ -508,108 +508,112 @@ msgstr "non configuré"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, 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/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Le format du livre a été supprimé avec succès"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Le livre a été supprimé avec succès"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s n’est pas un nombre valide, ignoré"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s n'est pas une langue valide"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être déposé le fichier doit avoir une extension"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, 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:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, 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:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Les identificateurs ne sont pas sensibles à la casse, écrasant l’ancien identificateur"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Les métadonnées ont bien été mises à jour"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 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:895
+#: cps/editbooks.py:899
 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:993
+#: cps/editbooks.py:997
 #, 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:1012
+#: cps/editbooks.py:1016
 #, 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:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Le fichier %(file)s a été téléchargé"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 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:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, 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"
@@ -622,175 +626,175 @@ msgstr "La configuration de Google Drive n’est pas terminée, essayez de désa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Le domaine de retour d’appel (Callback domain) est non vérifié, veuillez suivre les étapes nécessaires pour vérifier le domaine dans la console de développement de Google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s introuvable : %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Ce courriel a été envoyé depuis Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Courriel de test de Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Courriel de test"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Bien démarrer avec Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Courriel d’inscription pour l’utilisateur : %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Envoyer %(format)s vers le Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Envoyer vers Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 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:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Échec de la suppression du dossier de livre pour le livre %(id)s, le chemin d’accès comporte des sous-dossiers : %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "La suppression du livre %(id)s a échoué: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Suppression du livre %(id)s, le chemin du livre est invalide : %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Cet utilisateur est déjà pris"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Format de l’adresse courriel invalide"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Erreur lors du téléchargement de la couverture"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Erreur de format de couverture"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Impossible de créer le chemin pour la couverture"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 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:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Seuls les fichiers jpg/jpeg/png/webp/bmp sont supportés comme fichier de couverture"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 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:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Fichier binaire Unrar non trouvé"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Une erreur est survenue lors de l'exécution d'UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "En attente"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Echoué"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Débuté"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Terminé"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Configuration Kobo"
 
@@ -799,7 +803,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -865,7 +869,7 @@ msgid "{} Stars"
 msgstr "{} Étoiles"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Connexion"
 
@@ -1084,41 +1088,46 @@ msgstr "Modifier une étagère"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "L’étagère %(title)s a été modifiée"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, 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:311
+#: cps/shelf.py:312
 #, 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:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Le livre a été supprimé avec succès"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 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"
 
@@ -1199,14 +1208,14 @@ msgstr "Catégorie : %(name)s"
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Chercher"
 
@@ -1226,102 +1235,102 @@ msgstr "Liste de formats de fichiers"
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de lecture = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 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:1471
+#: cps/web.py:1472
 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/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, 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:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 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:1565
+#: cps/web.py:1566
 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:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
@@ -1398,7 +1407,7 @@ msgid "Upload"
 msgstr "Téléverser"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Télécharger"
@@ -1565,39 +1574,38 @@ msgstr "Détails"
 msgid "Current version"
 msgstr "Version actuelle"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Rechercher les mises à jour"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Effectuer la mise à jour"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annuler"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Voulez-vous vraiment arrêter Calibre-Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Mise à jour en cours, ne pas rafraîchir la page"
 
@@ -1610,39 +1618,39 @@ msgid "In Library"
 msgstr "Dans la librairie"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Trier en fonction de la date du livre, le plus récent en premier"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Trier en fonction de la date du livre, le plus ancien en premier"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Trier les titres dans l’ordre alphabétique"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Trier le titre dans l’ordre alphabétique inverse"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Trier en fonction de la date de publication, le plus récent en premier"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Trier en fonction de la date de publication, le plus ancien en premier"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "réduire"
 
@@ -2487,12 +2495,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Trier les auteurs dans l’ordre alphabétique"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Trier les auteurs dans l’ordre alphabétique inverse"
 
@@ -2981,30 +2989,26 @@ msgstr "Depuis"
 msgid "To:"
 msgstr "Vers"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Supprimer cette étagère"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Éditer les propriétés de l’étagère"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Organiser les livres manuellement"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Désactiver l’ordre de modification"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Activer l’ordre de modification"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "L’étagère sera supprimée pour tous les utilisateus"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Partager avec tout le monde"
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 58121e6b00bb63d7a8f3f1d9dd7e93db98673cd5..84dd8c56cd89bf6222f7d80dede030949b9a7f11 100644
GIT binary patch
delta 5846
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

delta 5948
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

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 6012214db..9d27c92c5 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "nincs telepítve"
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statisztika"
 
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Ismeretlen"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Valóban törölni akarod a polcot?"
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
@@ -357,7 +357,7 @@ msgstr " A felhasználó szerkesztése: %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
@@ -392,7 +392,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
@@ -490,108 +490,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "Metaadatok szerkesztése"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "A(z) %(langname)s nem érvényes nyelv"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, 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:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, 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:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "A metaadatok sikeresen frissültek"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 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:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 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:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, 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"
@@ -604,175 +608,175 @@ msgstr "A Google Drive beállítása nem fejeződött be, próbáld kikapcsolni
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "A visszahívási tartomány nem ellenőrzött, kövesd az alábbi lépéseket a tartomány ellenőrzéséhez a Google Developer Console-ban:"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nem található: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 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:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web teszt e-mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Teszt e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Kezdő lépések a Calibre-Web-bel"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, 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:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s küldése Kindle-re"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Küldés Kindle-re"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 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:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Várakozás"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Nem sikerült"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Elindítva"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Végrehajtva"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -781,7 +785,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -847,7 +851,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Belépés"
 
@@ -1066,41 +1070,46 @@ msgstr "Polc szerkesztése"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "A következő polc létre lett hozva: %(title)s"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "A következő polc megváltoztatva: %(title)s"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Hiba történt"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "A metaadatok sikeresen frissültek"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "A következő polc átrendezése: %(name)s"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Polc: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 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ő."
 
@@ -1181,14 +1190,14 @@ msgstr "Címke: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Keresés"
 
@@ -1208,102 +1217,102 @@ msgstr ""
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 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:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 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:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
@@ -1380,7 +1389,7 @@ msgid "Upload"
 msgstr "Feltöltés"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Letöltés"
@@ -1547,39 +1556,38 @@ msgstr "Részletek"
 msgid "Current version"
 msgstr "Jelenlegi verzió"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Frissítés keresése"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Frissítés elkezdése"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Valóban újra akarod indítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Frissítés folyamatban, ne töltsd újra az oldalt"
 
@@ -1592,39 +1600,39 @@ msgid "In Library"
 msgstr "Könyvtárban"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "csökkentsd"
 
@@ -2467,12 +2475,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2957,30 +2965,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Polc törlése"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "A polc el fog tűnni mindenki számára és örökké!"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Nyilvános polc"
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index f53f178d6988a9708ba6127dbcc2aac6247f86a9..4a5f451894f746b0bc97959e24d5c5606024ab03 100644
GIT binary patch
delta 11829
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
CxS$09

delta 11909
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
LwPnPi=+OTGdK0ST

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 4549a9367..f21f594aa 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,7 +15,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr "non installato"
 msgid "installed"
 msgstr "installato"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistiche"
 
@@ -45,9 +45,9 @@ msgstr "Ricollegato con successo"
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -159,7 +159,7 @@ msgstr "Vuoi veramente eliminare questo dominio?"
 msgid "Do you really want to delete this user?"
 msgstr "Vuoi veramente eliminare questo utente?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Vuoi veramente eliminare questo scaffale?"
 
@@ -277,7 +277,7 @@ msgstr "LDAP CACertificate, il certificato o la posizione della chiave non sono
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "I parametri del DB non sono scrivibili"
 
@@ -305,7 +305,7 @@ msgstr "Configurazione del Database aggiornata"
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
@@ -349,7 +349,7 @@ msgstr "Modifica l'utente %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
@@ -384,7 +384,7 @@ msgstr "Configurazione del server e-mail aggiornata"
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
@@ -482,108 +482,112 @@ msgstr "non configurato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, 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/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Il formato del libro è stato eliminato con successo"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "modifica i metadati"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s non è un numero valido, proseguo"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s non è una lingua valida"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, 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:810
+#: cps/editbooks.py:814
 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:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "I metadati sono stati aggiornati con successo"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 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:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiare prima di sottoporlo nuovamente: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, 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:1012
+#: cps/editbooks.py:1016
 #, 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:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Il file %(file)s è stato caricato"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Mancano o il formato sorgente o quello di destinazione, entrambi necessari alla conversione"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
@@ -596,174 +600,174 @@ msgstr "La configurazione di Google Drive non è stata completata correttamente.
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain non è stato verificato. Per favore intraprendi il necessario per verificare il dominio nella developer console di Google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s non trovato: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "E-mail di test da Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "E-mail di test"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Inizia con Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "E-mail di registrazione dell'utente: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Invia %(format)s a Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s inviato a Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 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:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "L'eliminazione della cartella del libro %(id)s non è riuscita, il percorso ha sottocartelle: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "L'eliminazione del libro %(id)s non è riuscita: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Eliminazione del libro %(id)s unicamente dal database. Il percorso del libro nel database non è valido: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "L'e-mail non è scritto in un formato valido"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Errore nello scaricare la copertina"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Errore di formato della copertina"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Errore nel creare la cartella per la copertina"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 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:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Solamente i file nei formati jpg/jpeg/png/webp/bmp sono supportati per le copertine"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 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:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Non ho trovato il file binario di UnRar"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Attendi"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Avviato"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Terminato"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Per favore accedi a calibe-web non da localhost per ottenere un api-endpoint valido per il lettore kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Configurazione di Kobo"
 
@@ -772,7 +776,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -838,7 +842,7 @@ msgid "{} Stars"
 msgstr "{} Stelle"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Accesso"
 
@@ -1056,41 +1060,46 @@ msgstr "Modifica uno scaffale"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Lo scaffale %(title)s è stato creato"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Lo scaffale %(title)s è stato modificato"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "C'era un errore"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Esiste già uno scaffale pubblico denominato '%(title)s'."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Esiste già uno scaffale privato denominato '%(title)s'."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Il libro é stato eliminato con successo"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Scaffale: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 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"
 
@@ -1171,14 +1180,14 @@ msgstr "Categoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Cerca"
 
@@ -1198,102 +1207,102 @@ msgstr "Elenco dei formati"
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Stato di lettura = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 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:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
@@ -1370,7 +1379,7 @@ msgid "Upload"
 msgstr "Upload"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Download"
@@ -1536,39 +1545,38 @@ msgstr "Dettagli"
 msgid "Current version"
 msgstr "Versione attuale"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Ricerca aggiornamenti"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Esegui l'aggiornamento"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Vuoi veramente riavviare Calibre-Web?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annulla"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Vuoi veramente arrestare Calibre-Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Aggiornamento, non ricaricare la pagina."
 
@@ -1581,39 +1589,39 @@ msgid "In Library"
 msgstr "Nella libreria"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Ordina secondo la data dei libri, prima i più recenti"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 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:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Ordina i titoli in ordine alfabetico"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Ordina i titoli in ordine alfabetico inverso"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 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:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "riduci"
 
@@ -2452,12 +2460,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Ordina gli autori in ordine alfabetico"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordina gli autori in ordine alfabetico inverso"
 
@@ -2939,30 +2947,26 @@ msgstr "Da:"
 msgid "To:"
 msgstr "A:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Cancella questo scaffale"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Modifica le caratteristiche dello scaffale"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Disponi i libri manualmente"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Disabilita la modifica della disposizione"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Abilita la modifica della disposizione"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Lo scaffale verrà eliminato per tutti gli utenti"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Condividi con tutti"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index e0ea3ef77ac4ddc2c8a45f3da5fe51e014946399..02ec8a14d3f5c8e64430030fd7987d08a6804547 100644
GIT binary patch
delta 35
rcmZpk&DcDfaYLaNuaT~Sp{{|Mf}x3(f$`=#EonwZ%gwX2Un&9sxTp$0

delta 35
rcmZpk&DcDfaYLaNuc5A?k*<-Ef}y3Af!XFdEonwZi_NpNUn&9sxd{qI

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 805e925b5..ff4bf4eed 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "インストールされていません"
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "統計"
 
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "不明"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
@@ -277,7 +277,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr "メールサーバの設定を更新しました"
 msgid "Database Configuration"
 msgstr "機能設定"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
@@ -352,7 +352,7 @@ msgstr "%(nick)s を編集"
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
@@ -387,7 +387,7 @@ msgstr "メールサーバの設定を更新しました"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
@@ -485,108 +485,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "メタデータを編集"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s は有効な言語ではありません"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "アップロードするファイルには拡張子が必要です"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "メタデータを更新しました"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "本の編集でエラーが発生しました。詳細はログファイルを確認してください"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "変換元の形式または変換後の形式が指定されていません"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "本の %(book_format)s への変換がキューに追加されました"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "この本の変換中にエラーが発生しました: %(res)s"
@@ -599,175 +603,175 @@ msgstr "Googleドライブの設定が完了していません。Googleドライ
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "コールバックドメインが認証されていません。Google Developer Consoleでドメインを認証してください"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "ID: %(book)d の本に %(format)s フォーマットはありません"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Googleドライブ: %(fn)s に %(format)s はありません"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s がありません: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Kindleに送信"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "このメールはCalibre-Web経由で送信されました。"
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web テストメール"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "テストメール"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Webを始める"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "ユーザ: %(name)s 用の登録メール"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s を %(format)s に変換してからKindleに送信"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Kindleに %(format)s を送信"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Kindleに送信"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "要求されたファイルを読み込めませんでした。権限設定が正しいか確認してください。"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "待機中"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "開始"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "終了"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "不明"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -776,7 +780,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -842,7 +846,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "ログイン"
 
@@ -1061,41 +1065,46 @@ msgstr "本棚を編集する"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s を作成しました"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s を変更しました"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "エラーが発生しました"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "メタデータを更新しました"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' 内の本の順番を変更する"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "本棚: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
@@ -1176,14 +1185,14 @@ msgstr "カテゴリ: %(name)s"
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "詳細検索"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "検索"
 
@@ -1203,102 +1212,102 @@ msgstr ""
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
@@ -1375,7 +1384,7 @@ msgid "Upload"
 msgstr "アップロード"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "ダウンロード"
@@ -1542,39 +1551,38 @@ msgstr "詳細"
 msgid "Current version"
 msgstr "現在のバージョン"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "更新を実行"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1587,39 +1595,39 @@ msgid "In Library"
 msgstr "ライブラリ内"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "減らす"
 
@@ -2461,12 +2469,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2951,30 +2959,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "この本棚を削除"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr ""
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr ""
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 59d510d611b0a5f7af96521f3ae1abd8d591b1fb..5042a945899657064c294ce4540999e717b6be05 100644
GIT binary patch
delta 4088
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
UP0;VIxPqe{ayu2APiyY^A4L+%@Bjb+

delta 4237
zcmYM$4N#R;9>?)>74Ra+RRm$t=t3AP2nZ<(B`RiONn{ELM2x)nGHK2#RF?Lb<)CI*
z61|XnSsAmGHkvTYERC{knsRk3*2$fwYq@Ka4!yYBs=Mrde>`Vq8RT=$;huB;=YRgs
zgPlh_XODWEucJfS3}09HH;#W7hN<`euXlXLMALm2L-8a=VxRR}JN_dMXZ)X5&q!mU
z=tm+$W-P{GI%>Vy?zm&hXlUY6Q~<xj5!iz1xC?)SA7dDvMaB3%YQdi{1j9!eGa92%
z0Vbo?&B9d7N3B<j6R`zzjbqGV8nF!gj9So3c-qj9>gS_QawjT)C76KAaS1+(+UT4e
z{}K5%5k!-OiAaoQCbETDfC``vL)qUvNkb=o2DQ;1)CYU;TKo_b@f;>&NQ@guDn`)H
zwC1ByeG6)SnH^t_%19%6@e$O)wxOeeP8vE<7lz|U_5&wTCpeEv@o>^K7JaCI(@`hQ
zLv1i0mAML3z-v+K?nGtik2o3M!UDV)Oa2w<#4+y43s4Icqf%XoH{cS~f^EoLa{!C+
z6I90HIgai)73W|Hj>k4k!^5b9{tcC}e$>8K<H$dUGb7^NlO>}vP+<E-sL1P46IP>&
z?-A63TkZHxR3`SI=D%tCy*PpX7pQdx@J0+LO)B;|4h;@rYEdU!hkDF*pfb>g1Z#F7
z-{t^66u=48mGt2dJcG*6*LM6rc6<o=FJwFvmB}Jh;OkMDb2ih+q46|M!sDnr{ukzB
z44tW1g4(bdwZL{%v9(!WwBv6eb!v{FHu$sc2T>XP2kL1U#_{PpCZ2{;mWI0f$*7ah
zLS0Rfwc7rEjnzQ~v>lb&r%(ayLSi?s;B|N$74Q$J^)8`mCHxv=QuO?1(@;^A;asdm
zvS;?A0y>5Y=oD(9)2QkXqBicg{VS-0c)5o>j7DW}KI+PvQS*18)_)Ge^!&e0Lkk{4
zrR+Gemg&<6@Dgg_tEgHD<)xrhjzgU&6Lo;un1Us!jT%u`u>n;>Pg(b&GSiEW7CJ{m
z6MjVnVEpa|KIGdZ@k1LGqKdQ}wcsl2X4E>rM}4l__K%@H--kNL1=RY#po)A*68TpO
zy}V_VqS2`SSk#2;QO|J(>aG`B7o!%aMio;X7GR?t??F9|hfu}+sU80>D$r0~qcSep
zaf@aG11g?8)PnO+0ac=EpcZ*_&1%$wTkyAd7!~Mus4M&d_4&)F`C;T)8%3cG;74U{
zymh)`8>Of#ScN*-eW;1+Q736ZEw~$1-TQDT9z*^9V^jcVP*?E1?GIQZDU6|vC!hjP
z#C0C-e=d!i80aO>ihKZzFyeZ*m=@vSiwS2izQd0H2{Y(l!dy&Fb>~%}UNoJUhJC2d
zdD!)K%tF0q9>&Fb{<~>RX28pPk^(o=t#@H1{fBU{h)@e&z(S0pL+qv!S;#n8il?y#
zGt<c)w%~0TF_AyLSdMdW9~SEQ@3#XvgsB>M0Lhx!f>-esRA4V>x+ge}>W|5CGcpDB
zyf>jX=*Erc;h5pL2~|7WQS)9z)xa@)nElOPX*`5g*}Nq1FQ|z%RGKEPKwZ%$Bo=cN
zwa`UWW+KVAOh%1QLuIHOeb|oWxF1L35Ynyn#-KBe#zGp=xE)D`=|J7-r>Im7o#HM$
z50%R0s09z8?lh7QtGKGL8*6YQ`lh<`o<yEJ(~V>B6!K@loS#bmSI`I{id*nr<oe7T
z=%G5lL7n(4`7Oqgyic{k-B^cFH<ET-gM$lVJpB-kHwv%87|cS-%-oDcxC*QB;7#OT
z8^la^Ph5zKbR9<G3pfK`MlF2a>M3yF0}1#9<He}J&)_l)V-mM&?nPoU9q7k1$OB>i
zjU>sWI5XXds!)Fv_Mocz2*%>K7>1W|5t>=<otC2RvH?HGby$YQTzn$#L2d8>*5Vb^
z$*X7cA5q+kZ=>^f8XwT;yxDy>FXh5jd`-w4<DhEdeN+beQ44#yF9kXS)vrfA1ur0V
zX}(0w^UifYHwBaES6bI24~k;~Zo`~FrECBxRFg%x3ZxFzUxk!|*^Ok+e1&>HB+PRI
zYeEIwf}F{m!n-l{RyQM!xQ%`*R%0TSoTlf0Jq?}gCDg+2;RH1E`2z%LcpWZ4rMwB7
zaVu`YQB>wIY)3D4;!5m7U12<r2nBC4QCGawx)FWsZ`x^O;C^Ipa~j8CN{RbsoP}E8
zKGepqq5{sn!+mN>kiE<^$hY~9ACKb{-bSj0UQESrP#N>y>1MPJod+0rmWCo8xzJ7F
z2GpIthYIXhyaC5kfgIXYp!$2QU!jkFRH^%7Nkl!4Rj3-d-?|H<>Gz@z@I@*4XKizl
zfuT67%>BR|)WpT805;%J>_RPkPr185GwLq?fU!7$=@_%vEykHRiT;DAlXoFyW5O!j
zeM&0GzwW%20p^-c+>2Lm6Yge~7EY;hQ<!h9MFqGGmEvwp!xPB2xy+AxEWOKpY~Myz
zzmI71FdMb+Jry+ci!SSDsEPeJ8W&N*JaJ|@>T|DRKAyx}jHqz~DMY1q87{*IYkKzk
zB1b0r?_aTUrN6epU*E8@p|PRfzjXB){}P6p);6qJ+w<DBr$a_$XJqGO<mC9X^YSO<
zwzj4G;+fX7b^PY^*33JG&u$F{4g~{`1p`k90|$eF9l?&r2iuPgHkt<qJA;AE!N8lr
uKx?pL=iq1f*&gh8G#Ge3*zrW`YxCj~HVyu&U30a9+hy^CNv|(Rj`|-oB?)N&

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 196ea2a9a..007d51de1 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,7 +17,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -27,7 +27,7 @@ msgstr "មិនបានតម្លើង"
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
@@ -47,9 +47,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "មិនដឹង"
@@ -162,7 +162,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
@@ -283,7 +283,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -313,7 +313,7 @@ msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
@@ -357,7 +357,7 @@ msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
@@ -490,108 +490,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -604,174 +608,174 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "ផ្ញើទៅ Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "ផ្ញើទៅ Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "កំពុងរង់ចាំ"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "បានបរាជ័យ"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "បានចាប់ផ្តើម"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "បានបញ្ចប់"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -780,7 +784,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -846,7 +850,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -1065,41 +1069,45 @@ msgstr "កែប្រែធ្នើ"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "មានបញ្ហា"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
@@ -1180,14 +1188,14 @@ msgstr "ប្រភេទ៖ %(name)s"
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "ស្វែងរក"
 
@@ -1207,102 +1215,102 @@ msgstr ""
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
@@ -1379,7 +1387,7 @@ msgid "Upload"
 msgstr "អាប់ឡូដ"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "ទាញយក"
@@ -1546,39 +1554,38 @@ msgstr ""
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "រកមើលបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "ធ្វើបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "កំពុងធ្វើបច្ចុប្បន្នភាព សូមកុំបើកទំព័រជាថ្មី"
 
@@ -1591,39 +1598,39 @@ msgid "In Library"
 msgstr "នៅក្នុងបណ្ណាល័យ"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr ""
 
@@ -2465,12 +2472,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2955,30 +2962,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "លុបធ្នើនេះ"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "ធ្នើនេះនឹងបាត់បង់ជាអចិន្ត្រៃយ៍សម្រាប់គ្រប់គ្នា!"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "តើធ្នើនេះគួរជាសាធារណៈទេ?"
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..5ae70553ce8817c722fbf0a2466ed8885a18f353
GIT binary patch
literal 56464
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
ZG+)H9F-z<$IUA2dkG*Bz6KSye|1TF4$CUs8

literal 0
HcmV?d00001

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
new file mode 100644
index 000000000..f83fded46
--- /dev/null
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -0,0 +1,3174 @@
+# Korean translation for Calibre-web
+# Copyright (C) 2022 EPUBGUIDE.NET
+# This file is distributed under the same license as the Calibre-web project
+# First korean translation by 내맘대로의 EPUBGUIDE.NET
+msgid ""
+msgstr ""
+"Project-Id-Version:  Calibre-web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"PO-Revision-Date: 2022-01-05 09:45+0900\n"
+"Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
+"Language: ko\n"
+"Language-Team: 내맘대로의 epubguide.net <byword77@gmail.com>\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
+msgid "not installed"
+msgstr "설치되지 않음"
+
+#: cps/about.py:47 cps/about.py:63
+msgid "installed"
+msgstr "설치됨"
+
+#: cps/about.py:145
+msgid "Statistics"
+msgstr "통계"
+
+#: cps/admin.py:144
+msgid "Server restarted, please reload page"
+msgstr "서버를 다시 시작했습니다. 새로고침 해주세요."
+
+#: cps/admin.py:146
+msgid "Performing shutdown of server, please close window"
+msgstr "서버를 종료하는 중입니다. 창을 닫아주세요."
+
+#: cps/admin.py:154
+msgid "Reconnect successful"
+msgstr "재연결 성공"
+
+#: cps/admin.py:157
+msgid "Unknown command"
+msgstr "알 수 없는 명령"
+
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
+#: cps/uploader.py:103
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: cps/admin.py:188
+msgid "Admin page"
+msgstr "관리자 페이지"
+
+#: cps/admin.py:207
+msgid "Basic Configuration"
+msgstr "\"기본 설"
+
+#: cps/admin.py:244
+msgid "UI Configuration"
+msgstr "UI 설정"
+
+#: cps/admin.py:277 cps/templates/admin.html:50
+msgid "Edit Users"
+msgstr "사용자 관리"
+
+#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
+msgid "All"
+msgstr "모두"
+
+#: cps/admin.py:343 cps/admin.py:1606
+msgid "User not found"
+msgstr "사용자를 찾을 수 없습니다."
+
+#: cps/admin.py:357
+msgid "{} users deleted successfully"
+msgstr "{} 사용자를 성공적으로 삭제하였습니다."
+
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
+#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
+msgid "Show All"
+msgstr "모두 보기"
+
+#: cps/admin.py:400 cps/admin.py:406
+msgid "Malformed request"
+msgstr "잘못된 요청"
+
+#: cps/admin.py:418 cps/admin.py:1484
+msgid "Guest Name can't be changed"
+msgstr "Guest 이름은 수정할 수 없습니다."
+
+#: cps/admin.py:430
+msgid "Guest can't have this role"
+msgstr "Guest는 이 권한을 사용할 수 없습니다."
+
+#: cps/admin.py:442 cps/admin.py:1442
+msgid "No admin user remaining, can't remove admin role"
+msgstr "관리자 계정이 하나 뿐입니다. 이 관리자 권한을 삭제할 수 없습니다."
+
+#: cps/admin.py:446 cps/admin.py:460
+msgid "Value has to be true or false"
+msgstr "true 또는 false만 사용할 수 있습니다."
+
+#: cps/admin.py:448
+msgid "Invalid role"
+msgstr "잘못된 권한"
+
+#: cps/admin.py:452
+msgid "Guest can't have this view"
+msgstr "Guest는 이 view를 사용할 수 없습니다."
+
+#: cps/admin.py:462
+msgid "Invalid view"
+msgstr "잘못된 view"
+
+#: cps/admin.py:465
+msgid "Guest's Locale is determined automatically and can't be set"
+msgstr "Guest의 로케일은 자동으로 결정되며 설정할 수 없습니다. "
+
+#: cps/admin.py:469
+msgid "No Valid Locale Given"
+msgstr "유효한 로케일이 지정되지 않았습니다."
+
+#: cps/admin.py:480
+msgid "No Valid Book Language Given"
+msgstr "유효한 로케일이 지정되지 않았습니다."
+
+#: cps/admin.py:482
+msgid "Parameter not found"
+msgstr "매개변수를 찾을 수 없음 "
+
+#: cps/admin.py:533
+msgid "Invalid Read Column"
+msgstr "잘못된 읽기 열 "
+
+#: cps/admin.py:539
+msgid "Invalid Restricted Column"
+msgstr "잘못된 제한된 열 "
+
+#: cps/admin.py:560 cps/admin.py:1323
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web 설정이 업데이트 되었습니다."
+
+#: cps/admin.py:572
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Kobo Token을 삭제하시겠습니까?"
+
+#: cps/admin.py:574
+msgid "Do you really want to delete this domain?"
+msgstr "이 도메인을 삭제하시겠습니까?"
+
+#: cps/admin.py:576
+msgid "Do you really want to delete this user?"
+msgstr "이 사용자를 삭제하시겠습니까?"
+
+#: cps/admin.py:578
+msgid "Are you sure you want to delete this shelf?"
+msgstr "이 서재를 삭제하시겠습니까?"
+
+#: cps/admin.py:580
+msgid "Are you sure you want to change locales of selected user(s)?"
+msgstr "선택한 사용자의 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:582
+msgid "Are you sure you want to change visible book languages for selected user(s)?"
+msgstr "선택한 사용자에 대해 표시되는 책 언어를 변경하시겠습니까? "
+
+#: cps/admin.py:584
+msgid "Are you sure you want to change the selected role for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 권한을 변경하시겠습니까? "
+
+#: cps/admin.py:586
+msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 제한을 변경하시겠습니까? "
+
+#: cps/admin.py:588
+msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 가시성 제한을 변경하시겠습니까?"
+
+#: cps/admin.py:590
+msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgstr "선택한 사용자의 실행기 동기화 동작을 변경하시겠습니까? "
+
+#: cps/admin.py:592
+msgid "Are you sure you want to change Calibre library location?"
+msgstr "캘리버 서재의 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr "Kobo Reader와 전체 동기화를 강제 실행하기 위해 Calibre-Web의 동기화 데이터베이스를 삭제하시겠습니까?"
+
+#: cps/admin.py:743
+msgid "Tag not found"
+msgstr "태그를 찾을 수 없습니다."
+
+#: cps/admin.py:755
+msgid "Invalid Action"
+msgstr "잘못된 액션"
+
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
+#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
+#: cps/templates/user_table.html:58
+msgid "Deny"
+msgstr "거부됨"
+
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
+#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
+#: cps/templates/user_table.html:61
+msgid "Allow"
+msgstr "허용됨"
+
+#: cps/admin.py:913
+msgid "{} sync entries deleted"
+msgstr "{} 동기화 항목이 삭제되었습니다."
+
+#: cps/admin.py:1036
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr "client_secrets.json이 Web 응용프로그램에 대해 설정되지 않았습니다."
+
+#: cps/admin.py:1081
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "로그 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1087
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "액세스 로그 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1117
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr "LDAP 공급자, 포트, DN 및 사용자 개체 식별자를 입력하십시오."
+
+#: cps/admin.py:1123
+msgid "Please Enter a LDAP Service Account and Password"
+msgstr "LDAP 서비스 계정 및 비밀번호를 입력하십시오"
+
+#: cps/admin.py:1126
+msgid "Please Enter a LDAP Service Account"
+msgstr "LDAP 서비스 계정을 입력하십시오"
+
+#: cps/admin.py:1131
+#, python-format
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 그룹 개체 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
+
+#: cps/admin.py:1133
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP 그룹 개체 필터에 일치하지 않는 괄호가 있습니다."
+
+#: cps/admin.py:1137
+#, python-format
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 사용자 개체 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
+
+#: cps/admin.py:1139
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP 사용자 개체 필터에 일치하지 않는 괄호가 있습니다."
+
+#: cps/admin.py:1146
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 구성원 사용자 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
+
+#: cps/admin.py:1148
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr "LDAP 구성원 사용자 필터에 일치하지 않는 괄호가 있습니다."
+
+#: cps/admin.py:1155
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr "LDAP CACertificate, 인증서 또는 키 위치가 유효하지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
+msgid "Settings DB is not Writeable"
+msgstr "설정 DB에 쓰기 권한이 없습니다."
+
+#: cps/admin.py:1208
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "DB 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1223
+msgid "DB is not Writeable"
+msgstr "쓰기 권한이 없는 DB"
+
+#: cps/admin.py:1235
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "키 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1239
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "인증서 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1346
+msgid "Database Settings updated"
+msgstr "데이터베이스 설정이 업데이트 되었습니다"
+
+#: cps/admin.py:1354
+msgid "Database Configuration"
+msgstr "데이터베이스 구성"
+
+#: cps/admin.py:1370 cps/web.py:1479
+msgid "Please fill out all fields!"
+msgstr "모든 필드를 채워주십시오!"
+
+#: cps/admin.py:1378
+msgid "E-mail is not from valid domain"
+msgstr "이메일이 유효한 도메인에서 온 것이 아닙니다."
+
+#: cps/admin.py:1384 cps/admin.py:1534
+msgid "Add new user"
+msgstr "새 사용자 추가"
+
+#: cps/admin.py:1395
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "사용자 '%(user)s'이(가) 생성됨"
+
+#: cps/admin.py:1401
+msgid "Found an existing account for this e-mail address or name."
+msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
+
+#: cps/admin.py:1421
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "사용자 '%(nick)s'이(가) 삭제되었습니다."
+
+#: cps/admin.py:1423 cps/admin.py:1424
+msgid "Can't delete Guest User"
+msgstr "게스트 사용자는 삭제할 수 없습니다"
+
+#: cps/admin.py:1427
+msgid "No admin user remaining, can't delete user"
+msgstr "관리자 계정이 하나 뿐입니다. 이 관리자 권한을 삭제할 수 없습니다."
+
+#: cps/admin.py:1500 cps/admin.py:1625
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "사용자 %(nick)s 편집"
+
+#: cps/admin.py:1504
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "사용자 '%(nick)s'가 업데이트 되었습니다."
+
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
+msgid "An unknown error occurred. Please try again later."
+msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
+
+#: cps/admin.py:1543 cps/templates/admin.html:98
+msgid "Edit E-mail Server Settings"
+msgstr "이메일 서버 설정 편집"
+
+#: cps/admin.py:1562
+msgid "Gmail Account Verification Successful"
+msgstr "Gmail 계정 인증 성공"
+
+#: cps/admin.py:1588
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr "%(email)s에 보내기 위해 대기 중인 테스트 전자 메일입니다. 결과는 작업을 확인하십시오."
+
+#: cps/admin.py:1591
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "테스트 이메일을 보내는 동안 오류가 발생했습니다: %(res)s"
+
+#: cps/admin.py:1593
+msgid "Please configure your e-mail address first..."
+msgstr "먼저 이메일 주소를 구성하십시오..."
+
+#: cps/admin.py:1595
+msgid "E-mail server settings updated"
+msgstr "이메일 서버 설정 업데이트됨"
+
+#: cps/admin.py:1637
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "사용자 %(user)s의 비밀번호 재설정"
+
+#: cps/admin.py:1643 cps/web.py:1444
+msgid "Please configure the SMTP mail settings first..."
+msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
+
+#: cps/admin.py:1654
+msgid "Logfile viewer"
+msgstr "로그 파일 뷰어"
+
+#: cps/admin.py:1720
+msgid "Requesting update package"
+msgstr "업데이트 패키지 요청"
+
+#: cps/admin.py:1721
+msgid "Downloading update package"
+msgstr "업데이트 패키지 다운로드"
+
+#: cps/admin.py:1722
+msgid "Unzipping update package"
+msgstr "업데이트 패키지 압축 풀기"
+
+#: cps/admin.py:1723
+msgid "Replacing files"
+msgstr "파일 교체"
+
+#: cps/admin.py:1724
+msgid "Database connections are closed"
+msgstr "데이터베이스 연결이 닫힙니다."
+
+#: cps/admin.py:1725
+msgid "Stopping server"
+msgstr "서버 중지"
+
+#: cps/admin.py:1726
+msgid "Update finished, please press okay and reload page"
+msgstr "업데이트가 완료되었습니다. 확인을 누르고 페이지를 새로고침하세요."
+
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
+msgid "Update failed:"
+msgstr "업데이트 실패:"
+
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+msgid "HTTP Error"
+msgstr "HTTP 오류"
+
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
+msgid "Connection error"
+msgstr "연결 오류"
+
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
+msgid "Timeout while establishing connection"
+msgstr "연결 설정 중 시간 초과"
+
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
+msgid "General error"
+msgstr "일반 오류"
+
+#: cps/admin.py:1731
+msgid "Update file could not be saved in temp dir"
+msgstr "임시 디렉토리에 업데이트 파일을 저장할 수 없습니다."
+
+#: cps/admin.py:1732
+msgid "Files could not be replaced during update"
+msgstr "업데이트하는 동안 파일을 교체할 수 없습니다."
+
+#: cps/admin.py:1756
+msgid "Failed to extract at least One LDAP User"
+msgstr "하나 이상의 LDAP 사용자를 추출하지 못했습니다."
+
+#: cps/admin.py:1801
+msgid "Failed to Create at Least One LDAP User"
+msgstr "하나 이상의 LDAP 사용자를 생성하지 못했습니다."
+
+#: cps/admin.py:1814
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "오류: %(ldaperror)s"
+
+#: cps/admin.py:1818
+msgid "Error: No user returned in response of LDAP server"
+msgstr "오류: LDAP 서버의 응답으로 사용자가 반환되지 않았습니다."
+
+#: cps/admin.py:1851
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "데이터베이스에서 하나 이상의 LDAP 사용자를 찾을 수 없습니다."
+
+#: cps/admin.py:1853
+msgid "{} User Successfully Imported"
+msgstr "{} 사용자 가져오기 성공"
+
+#: cps/converter.py:30
+msgid "not configured"
+msgstr "구성되지 않음"
+
+#: cps/converter.py:32
+msgid "Execution permissions missing"
+msgstr "실행 권한 누락"
+
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다."
+
+#: cps/editbooks.py:300 cps/editbooks.py:302
+msgid "Book Format Successfully Deleted"
+msgstr "책 형식이 성공적으로 삭제되었습니다."
+
+#: cps/editbooks.py:309 cps/editbooks.py:311
+msgid "Book Successfully Deleted"
+msgstr "책이 성공적으로 삭제되었습니다."
+
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다."
+
+#: cps/editbooks.py:410
+msgid "edit metadata"
+msgstr "메타데이터 편집"
+
+#: cps/editbooks.py:458
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s은(는) 유효한 숫자가 아닙니다. 건너뜁니다."
+
+#: cps/editbooks.py:494 cps/editbooks.py:958
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s'은(는) 유효한 언어가 아닙니다."
+
+#: cps/editbooks.py:634 cps/editbooks.py:985
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "파일 확장자 '%(ext)s'은(는) 이 서버에 업로드할 수 없습니다."
+
+#: cps/editbooks.py:638 cps/editbooks.py:989
+msgid "File to be uploaded must have an extension"
+msgstr "업로드할 파일에는 확장자가 있어야 합니다."
+
+#: cps/editbooks.py:650
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "%(path)s 경로를 생성하지 못했습니다(권한이 없음)."
+
+#: cps/editbooks.py:655
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "%(file)s 파일을 저장하지 못했습니다."
+
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "데이터베이스 오류: %(error)s."
+
+#: cps/editbooks.py:678
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "파일 형식 %(ext)s이(가) %(book)s에 추가되었습니다."
+
+#: cps/editbooks.py:814
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "식별자는 대소문자를 구분하지 않으며 이전 식별자를 덮어씁니다."
+
+#: cps/editbooks.py:848
+msgid "Metadata successfully updated"
+msgstr "메타데이터가 성공적으로 업데이트되었습니다."
+
+#: cps/editbooks.py:861
+msgid "Error editing book, please check logfile for details"
+msgstr "책을 수정하는 동안 오류가 발생했습니다. 자세한 내용은 로그 파일을 확인하세요."
+
+#: cps/editbooks.py:899
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "업로드한 책이 라이브러리에 있을 수 있습니다. 새로 업로드하기 전에 변경하는 것이 좋습니다."
+
+#: cps/editbooks.py:997
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "파일 %(filename)s을(를) 임시 디렉토리에 저장할 수 없습니다."
+
+#: cps/editbooks.py:1016
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "표지 파일%(file)s를 이동하지 못했습니다.:%(error)s"
+
+#: cps/editbooks.py:1063
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "파일 %(file)s 업로드됨"
+
+#: cps/editbooks.py:1088
+msgid "Source or destination format for conversion missing"
+msgstr "변환을 위한 소스 또는 대상 형식이 누락되었습니다."
+
+#: cps/editbooks.py:1096
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr "책이 %(book_format)s(으)로 변환하기 위해 대기 중입니다."
+
+#: cps/editbooks.py:1100
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "이 책을 변환하는 동안 오류가 발생했습니다: %(res)s"
+
+#: cps/gdrive.py:58
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "Google 드라이브 설정이 완료되지 않았습니다. Google 드라이브를 비활성화했다가 다시 활성화해 보세요."
+
+#: cps/gdrive.py:95
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "콜백 도메인이 확인되지 않았습니다. 단계에 따라 Google 개발자 콘솔에서 도메인을 확인하세요."
+
+#: cps/helper.py:77
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "책 ID에 대한 %(format)s 형식을 찾을 수 없음: %(book)d"
+
+#: cps/helper.py:83 cps/tasks/convert.py:73
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s을(를) Google 드라이브에서 찾을 수 없음: %(fn)s"
+
+#: cps/helper.py:88
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s을(를) 찾을 수 없음: %(fn)s"
+
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "킨들로 보내기"
+
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "이 이메일은 Calibre Web을 통해 전송되었습니다."
+
+#: cps/helper.py:109
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web 테스트 이메일"
+
+#: cps/helper.py:110
+msgid "Test e-mail"
+msgstr "테스트 이메일"
+
+#: cps/helper.py:127
+msgid "Get Started with Calibre-Web"
+msgstr "Calibre-Web 시작하기"
+
+#: cps/helper.py:132
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "사용자 등록 이메일: %(name)s"
+
+#: cps/helper.py:143 cps/helper.py:149
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "%(orig)s를 %(format)s로 변환하고 킨들로 보내기"
+
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "킨들에 %(format)s 보내기"
+
+#: cps/helper.py:216 cps/tasks/convert.py:90
+#, python-format
+msgid "%(book)s send to Kindle"
+msgstr "%(book)s을 킨들로 보내기"
+
+#: cps/helper.py:221
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "요청한 파일을 읽을 수 없습니다. 권한이 잘못되었을 수 있습니다."
+
+#: cps/helper.py:313
+#, python-format
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "책 %(id)s에 대한 책 폴더를 삭제하지 못했습니다. 경로에 하위 폴더가 있습니다: %(path)s"
+
+#: cps/helper.py:319
+#, python-format
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "%(id)s 도서 삭제 실패: %(message)s"
+
+#: cps/helper.py:330
+#, python-format
+msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
+msgstr "데이터베이스에서만 책 %(id)s 을(를) 삭제 중, 데이터베이스의 책 경로가 유효하지 않음: %(path)s"
+
+#: cps/helper.py:385
+#, 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:400
+#, 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:425 cps/helper.py:435 cps/helper.py:443
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Google 드라이브에서 %(file)s 파일을 찾을 수 없습니다."
+
+#: cps/helper.py:464
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다."
+
+#: cps/helper.py:504 cps/web.py:1659
+msgid "Found an existing account for this e-mail address"
+msgstr "등록되어 있는 이메일 주소입니다."
+
+#: cps/helper.py:512
+msgid "This username is already taken"
+msgstr "등록되어 있는 username입니다."
+
+#: cps/helper.py:522
+msgid "Invalid e-mail address format"
+msgstr "이메일 주소 형식이 잘못되었습니다."
+
+#: cps/helper.py:595
+msgid "Error Downloading Cover"
+msgstr "표지 다운로드 중 오류 발생"
+
+#: cps/helper.py:598
+msgid "Cover Format Error"
+msgstr "표지 형식 오류"
+
+#: cps/helper.py:608
+msgid "Failed to create path for cover"
+msgstr "표지 경로 생성 실패"
+
+#: cps/helper.py:624
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr "표지 파일이 유효한 이미지 파일이 아니거나 저장할 수 없습니다."
+
+#: cps/helper.py:635
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr "jpg/jpeg/png/webp/bmp 파일만 표지 파일로 지원됩니다."
+
+#: cps/helper.py:648
+msgid "Invalid cover file content"
+msgstr "잘못된 표지 파일 콘텐츠"
+
+#: cps/helper.py:652
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr "jpg/jpeg 파일만 표지 파일로 지원됩니다."
+
+#: cps/helper.py:704
+msgid "Unrar binary file not found"
+msgstr "Unrar 바이너리 파일을 찾을 수 없습니다."
+
+#: cps/helper.py:715
+msgid "Error excecuting UnRar"
+msgstr "UnRar 실행 오류"
+
+#: cps/helper.py:763
+msgid "Waiting"
+msgstr "대기중"
+
+#: cps/helper.py:765
+msgid "Failed"
+msgstr "실패"
+
+#: cps/helper.py:767
+msgid "Started"
+msgstr "시작됨"
+
+#: cps/helper.py:769
+msgid "Finished"
+msgstr "종료"
+
+#: cps/helper.py:771
+msgid "Unknown Status"
+msgstr "알 수 없는 상태"
+
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr "kobo 장치에 대한 유효한 api_endpoint를 얻으려면 로컬 호스트가 아닌 곳에서 calibre-web에 액세스하십시오."
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
+msgid "Kobo Setup"
+msgstr "Kobo 설정"
+
+#: cps/oauth_bb.py:77
+#, python-format
+msgid "Register with %(provider)s"
+msgstr "%(provider)s에 등록"
+
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
+
+#: cps/oauth_bb.py:148
+#, python-format
+msgid "Link to %(oauth)s Succeeded"
+msgstr "%(oauth)s에 성공적으로 연결됨"
+
+#: cps/oauth_bb.py:155
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr "로그인 실패, OAuth 계정과 연결된 사용자 없음"
+
+#: cps/oauth_bb.py:197
+#, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr "%(oauth)s에 연결 해제 성공"
+
+#: cps/oauth_bb.py:202
+#, python-format
+msgid "Unlink to %(oauth)s Failed"
+msgstr "%(oauth)s에 연결 해제 실패"
+
+#: cps/oauth_bb.py:205
+#, python-format
+msgid "Not Linked to %(oauth)s"
+msgstr "%(oauth)s에 연결되지 않음"
+
+#: cps/oauth_bb.py:261
+msgid "Failed to log in with GitHub."
+msgstr "GitHub에 로그인하지 못했습니다."
+
+#: cps/oauth_bb.py:267
+msgid "Failed to fetch user info from GitHub."
+msgstr "GitHub에서 사용자 정보를 가져오지 못했습니다."
+
+#: cps/oauth_bb.py:279
+msgid "Failed to log in with Google."
+msgstr "구글 로그인에 실패했습니다."
+
+#: cps/oauth_bb.py:285
+msgid "Failed to fetch user info from Google."
+msgstr "Google에서 사용자 정보를 가져오지 못했습니다."
+
+#: cps/oauth_bb.py:332
+msgid "GitHub Oauth error, please retry later."
+msgstr "GitHub Oauth 오류입니다. 나중에 다시 시도하세요."
+
+#: cps/oauth_bb.py:335
+msgid "GitHub Oauth error: {}"
+msgstr "GitHub 인증 오류: {}"
+
+#: cps/oauth_bb.py:356
+msgid "Google Oauth error, please retry later."
+msgstr "Google 인증 오류입니다. 나중에 다시 시도하세요."
+
+#: cps/oauth_bb.py:359
+msgid "Google Oauth error: {}"
+msgstr "Google 인증 오류: {}"
+
+#: cps/opds.py:384
+msgid "{} Stars"
+msgstr "{} Stars"
+
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
+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:416
+msgid "Books"
+msgstr "책"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "최근 책 보기"
+
+#: cps/render_template.py:42 cps/templates/index.xml:25
+msgid "Hot Books"
+msgstr "인기있는 책"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "주목받는 책 보기"
+
+#: cps/render_template.py:46 cps/render_template.py:51
+msgid "Downloaded Books"
+msgstr "다운로드된 책"
+
+#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/templates/user_table.html:167
+msgid "Show Downloaded Books"
+msgstr "다운로드된 책 보기"
+
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
+msgid "Top Rated Books"
+msgstr "평점이 높은 책"
+
+#: cps/render_template.py:58 cps/templates/user_table.html:161
+msgid "Show Top Rated Books"
+msgstr "평점이 높은 책 보기"
+
+#: cps/render_template.py:59 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:676
+msgid "Read Books"
+msgstr "읽은 책"
+
+#: cps/render_template.py:61
+msgid "Show read and unread"
+msgstr "읽은 책과 읽지 않은 책 보기"
+
+#: cps/render_template.py:63 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:679
+msgid "Unread Books"
+msgstr "읽지 않은 책"
+
+#: cps/render_template.py:65
+msgid "Show unread"
+msgstr "읽지 않은 책 보기"
+
+#: cps/render_template.py:66
+msgid "Discover"
+msgstr "발견"
+
+#: cps/render_template.py:68 cps/templates/index.xml:50
+#: cps/templates/user_table.html:162
+msgid "Show Random Books"
+msgstr "무작위 추천"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1041
+msgid "Categories"
+msgstr "카테고리"
+
+#: cps/render_template.py:71 cps/templates/user_table.html:158
+msgid "Show category selection"
+msgstr "카테고리별 보기"
+
+#: cps/render_template.py:72 cps/templates/book_edit.html:90
+#: cps/templates/book_table.html:68 cps/templates/index.xml:90
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
+msgid "Series"
+msgstr "시리즈"
+
+#: cps/render_template.py:74 cps/templates/user_table.html:157
+msgid "Show series selection"
+msgstr "시리즈별 보기"
+
+#: cps/render_template.py:75 cps/templates/book_table.html:66
+#: cps/templates/index.xml:69
+msgid "Authors"
+msgstr "저자"
+
+#: cps/render_template.py:77 cps/templates/user_table.html:160
+msgid "Show author selection"
+msgstr "저자별 보기"
+
+#: cps/render_template.py:79 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:925
+msgid "Publishers"
+msgstr "출판사"
+
+#: cps/render_template.py:81 cps/templates/user_table.html:163
+msgid "Show publisher selection"
+msgstr "출판사별 보기"
+
+#: cps/render_template.py:82 cps/templates/book_table.html:70
+#: cps/templates/index.xml:97 cps/templates/search_form.html:107
+#: cps/web.py:1018
+msgid "Languages"
+msgstr "언어"
+
+#: cps/render_template.py:85 cps/templates/user_table.html:155
+msgid "Show language selection"
+msgstr "언어별 보기"
+
+#: cps/render_template.py:86 cps/templates/index.xml:104
+msgid "Ratings"
+msgstr "평점"
+
+#: cps/render_template.py:88 cps/templates/user_table.html:164
+msgid "Show ratings selection"
+msgstr "평점별 보기"
+
+#: cps/render_template.py:89 cps/templates/index.xml:112
+msgid "File formats"
+msgstr "파일 유형"
+
+#: cps/render_template.py:91 cps/templates/user_table.html:165
+msgid "Show file formats selection"
+msgstr "파일 유형별 보기"
+
+#: cps/render_template.py:93 cps/web.py:703
+msgid "Archived Books"
+msgstr "보관된 책"
+
+#: cps/render_template.py:95 cps/templates/user_table.html:166
+msgid "Show archived books"
+msgstr "보관된 책 보기"
+
+#: cps/render_template.py:97 cps/web.py:780
+msgid "Books List"
+msgstr "책 목록"
+
+#: cps/render_template.py:99 cps/templates/user_table.html:168
+msgid "Show Books List"
+msgstr "책 목록 보기"
+
+#: cps/shelf.py:67 cps/shelf.py:121
+msgid "Invalid shelf specified"
+msgstr "잘못된 책장 지정"
+
+#: cps/shelf.py:73
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "죄송합니다. 해당 책장에 책을 추가할 권한이 없습니다."
+
+#: cps/shelf.py:82
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "책이 이미 책장에 등록됨: %(shelfname)s"
+
+#: cps/shelf.py:107
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "책장에 책이 등록됨: %(sname)s"
+
+#: cps/shelf.py:126
+msgid "You are not allowed to add a book to the shelf"
+msgstr "책장에 책을 추가할 권한이 없습니다."
+
+#: 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:163
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "책장에 책을 추가할 수 없음: %(sname)s"
+
+#: cps/shelf.py:209
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "책이 책장에서 삭제됨: %(sname)s"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다."
+
+#: cps/shelf.py:228 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "책장 추가"
+
+#: cps/shelf.py:237
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "죄송합니다. 이 책장을 편집할 권한이 없습니다."
+
+#: cps/shelf.py:239
+msgid "Edit a shelf"
+msgstr "책장 편집"
+
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "죄송합니다. 이 공개 책장을 만들 권한이 없습니다."
+
+#: cps/shelf.py:262
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "%(title)s 책장이 추가됨"
+
+#: cps/shelf.py:265
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "%(title)s 책장이 변경됨"
+
+#: cps/shelf.py:279
+msgid "There was an error"
+msgstr "오류가 발생하였습니다."
+
+#: cps/shelf.py:301
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 공개 책장이 이미 있습니다."
+
+#: cps/shelf.py:312
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 개인 책장이 이미 있습니다."
+
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "책이 성공적으로 삭제되었습니다."
+
+#: cps/shelf.py:382
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "책장 순서 변경: '%(name)s'"
+
+#: cps/shelf.py:452
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "책장: '%(name)s'"
+
+#: cps/shelf.py:456
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
+
+#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
+msgid "Unexpected data while reading update information"
+msgstr "업데이트 정보를 읽는 동안 예기치 않은 데이터"
+
+#: cps/updater.py:410 cps/updater.py:521
+msgid "No update available. You already have the latest version installed"
+msgstr "업데이트가 없습니다. 이미 최신 버전이 설치되어 있습니다."
+
+#: cps/updater.py:428
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:446
+msgid "Could not fetch update information"
+msgstr "업데이트 정보를 가져올 수 없습니다"
+
+#: cps/updater.py:456
+msgid "Click on the button below to update to the latest stable version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
+#, 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:507
+msgid "No release information available"
+msgstr "출시 정보가 없습니다"
+
+#: cps/templates/index.html:5 cps/web.py:440
+msgid "Discover (Random Books)"
+msgstr "발견(무작위 도서)"
+
+#: cps/web.py:471
+msgid "Hot Books (Most Downloaded)"
+msgstr "인기있는 책(가장 많이 다운로드됨)"
+
+#: cps/web.py:507
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "%(user)s이(가) 다운로드한 책"
+
+#: cps/web.py:539
+#, python-format
+msgid "Author: %(name)s"
+msgstr "저자: %(name)s"
+
+#: cps/web.py:554
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "출판사: %(name)s"
+
+#: cps/web.py:569
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "시리즈: %(serie)s"
+
+#: cps/web.py:582
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "평가: %(rating)s 별"
+
+#: cps/web.py:597
+#, python-format
+msgid "File format: %(format)s"
+msgstr "파일 유형: %(format)s"
+
+#: cps/web.py:615
+#, python-format
+msgid "Category: %(name)s"
+msgstr "카테고리: %(name)s"
+
+#: cps/web.py:631
+#, python-format
+msgid "Language: %(name)s"
+msgstr "언어: %(name)s"
+
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
+msgid "Advanced Search"
+msgstr "상세 검색"
+
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
+#: cps/templates/index.xml:11 cps/templates/layout.html:45
+#: cps/templates/layout.html:48 cps/templates/search_form.html:226
+#: cps/web.py:750 cps/web.py:1077
+msgid "Search"
+msgstr "검색"
+
+#: cps/templates/admin.html:16 cps/web.py:903
+msgid "Downloads"
+msgstr "다운로드"
+
+#: cps/web.py:980
+msgid "Ratings list"
+msgstr "평점 목록"
+
+#: cps/web.py:1001
+msgid "File formats list"
+msgstr "파일 유형 목록"
+
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
+msgid "Tasks"
+msgstr "작업"
+
+#: cps/web.py:1215
+msgid "Published after "
+msgstr "Published after"
+
+#: cps/web.py:1222
+msgid "Published before "
+msgstr "Published before"
+
+#: cps/web.py:1244
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "평점 <= %(rating)s"
+
+#: cps/web.py:1246
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "평점 >= %(rating)s"
+
+#: cps/web.py:1248
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr "읽은 상태 = %(status)s"
+
+#: cps/web.py:1353
+msgid "Error on search for custom columns, please restart Calibre-Web"
+msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오."
+
+#: cps/web.py:1449
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다."
+
+#: cps/web.py:1453
+#, python-format
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr "책을 보내는 중에 오류 발생: %(res)s"
+
+#: cps/web.py:1455
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
+
+#: cps/web.py:1472
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
+
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
+msgid "Register"
+msgstr "등록"
+
+#: cps/web.py:1507
+msgid "Your e-mail is not allowed to register"
+msgstr "이메일을 등록할 수 없습니다."
+
+#: cps/web.py:1510
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "확인을 위한 이메일이 발송되었습니다."
+
+#: cps/web.py:1524
+msgid "Cannot activate LDAP authentication"
+msgstr "LDAP 인증을 활성화할 수 없습니다."
+
+#: cps/web.py:1543
+#, python-format
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
+
+#: cps/web.py:1549
+#, python-format
+msgid "Could not login: %(message)s"
+msgstr "로그인 실패: %(message)s"
+
+#: cps/web.py:1553 cps/web.py:1578
+msgid "Wrong Username or Password"
+msgstr "잘못된 사용자명 또는 비밀번호"
+
+#: cps/web.py:1560
+msgid "New Password was send to your email address"
+msgstr "새 비밀번호가 이메일로 전송되었습니다."
+
+#: cps/web.py:1566
+msgid "Please enter valid username to reset password"
+msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오."
+
+#: cps/web.py:1573
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "로그인을 할 수 없음: '%(nickname)s"
+
+#: cps/web.py:1639 cps/web.py:1688
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s 프로필"
+
+#: cps/web.py:1655
+msgid "Profile updated"
+msgstr "프로필이 업데이트 됨"
+
+#: cps/services/gmail.py:58
+msgid "Found no valid gmail.json file with OAuth information"
+msgstr "인증 정보가 포함된 유효한 gmail.json 파일을 찾을 수 없습니다."
+
+#: cps/tasks/convert.py:137
+#, python-format
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr "Calibre ebook-convert %(tool)s을(를) 찾을 수 없습니다."
+
+#: cps/tasks/convert.py:163
+#, python-format
+msgid "%(format)s format not found on disk"
+msgstr "%(format)s 형식을 찾을 수 없습니다."
+
+#: cps/tasks/convert.py:167
+msgid "Ebook converter failed with unknown error"
+msgstr "알 수 없는 오류로 인해 전자책 변환이 실패했습니다."
+
+#: cps/tasks/convert.py:177
+#, python-format
+msgid "Kepubify-converter failed: %(error)s"
+msgstr "Kepubify 변환 실패: %(error)s"
+
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr "변환된 파일을 찾을 수 없거나 %(folder)s 폴더에 하나 이상의 파일이 존재합니다."
+
+#: cps/tasks/convert.py:222
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "\"전자책 변환 실패: %(error)s"
+
+#: cps/tasks/convert.py:245
+#, 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:13 cps/templates/login.html:9
+#: cps/templates/login.html:10 cps/templates/register.html:9
+#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
+msgid "Username"
+msgstr "사용자명"
+
+#: cps/templates/admin.html:14 cps/templates/register.html:14
+#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
+msgid "E-mail Address"
+msgstr "이메일 주소"
+
+#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
+msgid "Send to Kindle E-mail Address"
+msgstr "킨들로 보내기 이메일 주소"
+
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/user_table.html:143
+msgid "Admin"
+msgstr "관리자"
+
+#: cps/templates/admin.html:18 cps/templates/login.html:13
+#: cps/templates/login.html:14 cps/templates/user_edit.html:23
+msgid "Password"
+msgstr "비밀번호"
+
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
+#: cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "업로드"
+
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/user_table.html:146
+msgid "Download"
+msgstr "다운로드"
+
+#: cps/templates/admin.html:23
+msgid "View Books"
+msgstr "책 보기"
+
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
+#: cps/templates/user_table.html:148
+msgid "Edit"
+msgstr "편집"
+
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
+#: cps/templates/user_table.html:149
+msgid "Delete"
+msgstr "삭제"
+
+#: cps/templates/admin.html:26
+msgid "Public Shelf"
+msgstr "공개 책장"
+
+#: cps/templates/admin.html:51
+msgid "Add New User"
+msgstr "사용자 추가"
+
+#: cps/templates/admin.html:53
+msgid "Import LDAP Users"
+msgstr "LDAP 사용자 가져오기"
+
+#: cps/templates/admin.html:60
+msgid "E-mail Server Settings"
+msgstr "이메일 서버 설정"
+
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
+msgid "SMTP Hostname"
+msgstr "SMTP Hostname"
+
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
+msgid "SMTP Port"
+msgstr "SMTP Port"
+
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
+msgid "Encryption"
+msgstr "암호화"
+
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
+msgid "SMTP Login"
+msgstr "SMTP Login"
+
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
+#: cps/templates/email_edit.html:55
+msgid "From E-mail"
+msgstr "From E-mail"
+
+#: cps/templates/admin.html:88
+msgid "E-Mail Service"
+msgstr "E-Mail Service"
+
+#: cps/templates/admin.html:89
+msgid "Gmail via Oauth2"
+msgstr "Gmail via Oauth2"
+
+#: cps/templates/admin.html:104
+msgid "Configuration"
+msgstr "환경 설정"
+
+#: cps/templates/admin.html:107
+msgid "Calibre Database Directory"
+msgstr "Calibre DB 폴더"
+
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
+msgid "Log Level"
+msgstr "Log Level"
+
+#: cps/templates/admin.html:115
+msgid "Port"
+msgstr "Port"
+
+#: cps/templates/admin.html:120
+msgid "External Port"
+msgstr "External Port"
+
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
+msgid "Books per Page"
+msgstr "페이지당 보여 줄 책 수"
+
+#: cps/templates/admin.html:131
+msgid "Uploads"
+msgstr "업로드"
+
+#: cps/templates/admin.html:135
+msgid "Anonymous Browsing"
+msgstr "익명 보기"
+
+#: cps/templates/admin.html:139
+msgid "Public Registration"
+msgstr "공개 등록"
+
+#: cps/templates/admin.html:143
+msgid "Magic Link Remote Login"
+msgstr "Magic Link Remote Login"
+
+#: cps/templates/admin.html:147
+msgid "Reverse Proxy Login"
+msgstr "Reverse Proxy Login"
+
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
+msgid "Reverse Proxy Header Name"
+msgstr "Reverse Proxy Header Name"
+
+#: cps/templates/admin.html:157
+msgid "Edit Calibre Database Configuration"
+msgstr "Calibre Database 환경 설정 편집"
+
+#: cps/templates/admin.html:158
+msgid "Edit Basic Configuration"
+msgstr "기본 환경 설정 편집"
+
+#: cps/templates/admin.html:159
+msgid "Edit UI Configuration"
+msgstr "UI 환경 설정 편집"
+
+#: cps/templates/admin.html:164
+msgid "Administration"
+msgstr "관리"
+
+#: cps/templates/admin.html:165
+msgid "Download Debug Package"
+msgstr "Debug Package 다운로드"
+
+#: cps/templates/admin.html:166
+msgid "View Logs"
+msgstr "로그 보기"
+
+#: cps/templates/admin.html:169
+msgid "Reconnect Calibre Database"
+msgstr "Calibre DB 다시 연결"
+
+#: cps/templates/admin.html:170
+msgid "Restart"
+msgstr "재시작"
+
+#: cps/templates/admin.html:171
+msgid "Shutdown"
+msgstr "종료"
+
+#: cps/templates/admin.html:176
+msgid "Update"
+msgstr "업데이트"
+
+#: cps/templates/admin.html:180
+msgid "Version"
+msgstr "버전"
+
+#: cps/templates/admin.html:181
+msgid "Details"
+msgstr "세부 정보"
+
+#: cps/templates/admin.html:187
+msgid "Current version"
+msgstr "현재 버전"
+
+#: cps/templates/admin.html:194
+msgid "Check for Update"
+msgstr "업데이트 확인"
+
+#: cps/templates/admin.html:195
+msgid "Perform Update"
+msgstr "업데이트 실행"
+
+#: cps/templates/admin.html:208
+msgid "Are you sure you want to restart?"
+msgstr "재시작을 하시겠습니까?"
+
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
+msgid "OK"
+msgstr "예"
+
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
+#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
+msgid "Cancel"
+msgstr "취소"
+
+#: cps/templates/admin.html:226
+msgid "Are you sure you want to shutdown?"
+msgstr "종료를 하시겠습니까?"
+
+#: cps/templates/admin.html:238
+msgid "Updating, please do not reload this page"
+msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "via"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "In Library"
+
+#: cps/templates/author.html:26 cps/templates/index.html:72
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
+msgid "Sort according to book date, newest first"
+msgstr "책 목록 정렬, 최신순"
+
+#: cps/templates/author.html:27 cps/templates/index.html:73
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
+msgid "Sort according to book date, oldest first"
+msgstr "책 목록 정렬, 오래된 순"
+
+#: cps/templates/author.html:28 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
+msgid "Sort title in alphabetical order"
+msgstr "가나다 순 정렬"
+
+#: cps/templates/author.html:29 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
+msgid "Sort title in reverse alphabetical order"
+msgstr "가나다 역순 정렬"
+
+#: cps/templates/author.html:30 cps/templates/index.html:78
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
+msgid "Sort according to publishing date, newest first"
+msgstr "발행일 순으로 정렬, 최신순"
+
+#: cps/templates/author.html:31 cps/templates/index.html:79
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
+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:111 cps/templates/search.html:65
+#: cps/templates/shelf.html:54
+msgid "reduce"
+msgstr "reduce"
+
+#: cps/templates/author.html:101
+msgid "More by"
+msgstr "More by"
+
+#: 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:29
+msgid "Convert from:"
+msgstr "변경전 유형:"
+
+#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+msgid "select an option"
+msgstr "옵션 선택"
+
+#: cps/templates/book_edit.html:36
+msgid "Convert to:"
+msgstr "변경후 유형:"
+
+#: cps/templates/book_edit.html:45
+msgid "Convert book"
+msgstr "책 변경"
+
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+msgid "Book Title"
+msgstr "책 제목"
+
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+msgid "Author"
+msgstr "저자"
+
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+msgid "Description"
+msgstr "책 소개"
+
+#: cps/templates/book_edit.html:72
+msgid "Identifiers"
+msgstr "식별자"
+
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+msgid "Identifier Type"
+msgstr "식별자 유형"
+
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+msgid "Identifier Value"
+msgstr "식별자 값"
+
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/user_table.html:24
+msgid "Remove"
+msgstr "삭제"
+
+#: cps/templates/book_edit.html:82
+msgid "Add Identifier"
+msgstr "식별자 추가"
+
+#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+msgid "Tags"
+msgstr "태그"
+
+#: cps/templates/book_edit.html:94
+msgid "Series ID"
+msgstr "시리즈 ID"
+
+#: cps/templates/book_edit.html:98
+msgid "Rating"
+msgstr "평점"
+
+#: cps/templates/book_edit.html:103
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "URL로 표지 추가(JPEG - 이미지를 다운로드 하여 DB에 저장합니다)"
+
+#: cps/templates/book_edit.html:107
+msgid "Upload Cover from Local Disk"
+msgstr "로컬 디스크에서 표지 업로드"
+
+#: cps/templates/book_edit.html:112
+msgid "Published Date"
+msgstr "출간일"
+
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/search_form.html:16
+msgid "Publisher"
+msgstr "출판사"
+
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/user_edit.html:33
+msgid "Language"
+msgstr "언어"
+
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/search_form.html:164
+msgid "Yes"
+msgstr "예"
+
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/search_form.html:165
+msgid "No"
+msgstr "아니오"
+
+#: cps/templates/book_edit.html:200
+msgid "Upload Format"
+msgstr "업로드 유형"
+
+#: cps/templates/book_edit.html:208
+msgid "View Book on Save"
+msgstr "저장 후 책 보기"
+
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+msgid "Fetch Metadata"
+msgstr "메타정보 가져오기"
+
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
+#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+msgid "Save"
+msgstr "저장"
+
+#: cps/templates/book_edit.html:232
+msgid "Keyword"
+msgstr "키워드"
+
+#: cps/templates/book_edit.html:233
+msgid "Search keyword"
+msgstr "키워드 검색"
+
+#: cps/templates/book_edit.html:239
+msgid "Click the cover to load metadata to the form"
+msgstr "표지를 클릭하여 양식에 메타데이터 로드"
+
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+msgid "Loading..."
+msgstr "불러오는 중..."
+
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:163
+msgid "Close"
+msgstr "닫기"
+
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+msgid "Source"
+msgstr "출처"
+
+#: cps/templates/book_edit.html:286
+msgid "Search error!"
+msgstr "오류 검색!"
+
+#: cps/templates/book_edit.html:287
+msgid "No Result(s) found! Please try another keyword."
+msgstr "검색 결과가 없습니다! 다른 키워드를 시도하십시오."
+
+#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
+#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
+#: cps/templates/user_table.html:100
+msgid "This Field is Required"
+msgstr "이 필드는 필수 항목입니다."
+
+#: cps/templates/book_table.html:37
+msgid "Merge selected books"
+msgstr "선택한 책 병합"
+
+#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
+msgid "Remove Selections"
+msgstr "선택 제거"
+
+#: cps/templates/book_table.html:41
+msgid "Exchange author and title"
+msgstr "저자 및 제목 교환"
+
+#: cps/templates/book_table.html:47
+msgid "Update Title Sort automatically"
+msgstr "자동으로 제목 정렬 업데이트"
+
+#: cps/templates/book_table.html:51
+msgid "Update Author Sort automatically"
+msgstr "자동으로 작성자 정렬 업데이트"
+
+#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
+msgid "Enter Title"
+msgstr "제목 입력"
+
+#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
+#: cps/templates/shelf_edit.html:8
+msgid "Title"
+msgstr "제목"
+
+#: cps/templates/book_table.html:64
+msgid "Enter Title Sort"
+msgstr "제목 정렬 입력"
+
+#: cps/templates/book_table.html:64
+msgid "Title Sort"
+msgstr "제목 정렬"
+
+#: cps/templates/book_table.html:65
+msgid "Enter Author Sort"
+msgstr "저자 정렬 입력"
+
+#: cps/templates/book_table.html:65
+msgid "Author Sort"
+msgstr "저자 정렬"
+
+#: cps/templates/book_table.html:66
+msgid "Enter Authors"
+msgstr "저자 입력"
+
+#: cps/templates/book_table.html:67
+msgid "Enter Categories"
+msgstr "카테고리 입력"
+
+#: cps/templates/book_table.html:68
+msgid "Enter Series"
+msgstr "시리즈 입력"
+
+#: cps/templates/book_table.html:69
+msgid "Series Index"
+msgstr "시리즈 색인"
+
+#: cps/templates/book_table.html:70
+msgid "Enter Languages"
+msgstr "언어 입력"
+
+#: cps/templates/book_table.html:71
+msgid "Publishing Date"
+msgstr "출간일"
+
+#: cps/templates/book_table.html:72
+msgid "Enter Publishers"
+msgstr "출판사 입력"
+
+#: cps/templates/book_table.html:73
+msgid "Enter comments"
+msgstr "코멘트 입력"
+
+#: cps/templates/book_table.html:73
+msgid "Comments"
+msgstr "코멘트"
+
+#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
+#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
+#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
+#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
+msgid "Enter "
+msgstr "입력"
+
+#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "정말 확신합니까?"
+
+#: cps/templates/book_table.html:114
+msgid "Books with Title will be merged from:"
+msgstr "제목이 있는 책은 다음에서 병합됩니다."
+
+#: cps/templates/book_table.html:118
+msgid "Into Book with Title:"
+msgstr "제목이 있는 책으로:"
+
+#: cps/templates/book_table.html:123
+msgid "Merge"
+msgstr "병합"
+
+#: cps/templates/config_db.html:12
+msgid "Location of Calibre Database"
+msgstr "Calibre Database 위치"
+
+#: cps/templates/config_db.html:22
+msgid "Use Google Drive?"
+msgstr "Google 드라이브를 사용하시겠습니까?"
+
+#: cps/templates/config_db.html:27
+msgid "Authenticate Google Drive"
+msgstr "구글 드라이브 인증"
+
+#: cps/templates/config_db.html:32
+msgid "Google Drive Calibre folder"
+msgstr "Google Drive Calibre 폴더"
+
+#: cps/templates/config_db.html:40
+msgid "Metadata Watch Channel ID"
+msgstr "Metadata Watch Channel ID"
+
+#: cps/templates/config_db.html:43
+msgid "Revoke"
+msgstr "취소"
+
+#: cps/templates/config_db.html:68
+msgid "New db location is invalid, please enter valid path"
+msgstr "새 db 위치가 잘못되었습니다. 올바른 경로를 입력하십시오."
+
+#: cps/templates/config_edit.html:18
+msgid "Server Configuration"
+msgstr "서버 구성"
+
+#: cps/templates/config_edit.html:25
+msgid "Server Port"
+msgstr "Server Port"
+
+#: cps/templates/config_edit.html:28
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL 인증서 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
+
+#: cps/templates/config_edit.html:35
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL 키 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
+
+#: cps/templates/config_edit.html:43
+msgid "Update Channel"
+msgstr "업데이트 취소"
+
+#: cps/templates/config_edit.html:45
+msgid "Stable"
+msgstr "안정버전"
+
+#: cps/templates/config_edit.html:46
+msgid "Nightly"
+msgstr "실험버전"
+
+#: cps/templates/config_edit.html:50
+msgid "Trusted Hosts (Comma Separated)"
+msgstr "신뢰할 수 있는 호스트(쉼표로 구분)"
+
+#: cps/templates/config_edit.html:61
+msgid "Logfile Configuration"
+msgstr "Logfile 설정"
+
+#: cps/templates/config_edit.html:77
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr "로그 파일의 위치 및 이름(항목이 없는 경우 calibre-web.log)"
+
+#: cps/templates/config_edit.html:82
+msgid "Enable Access Log"
+msgstr "액세스 로그 활성화"
+
+#: cps/templates/config_edit.html:85
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr "액세스 로그 파일의 위치 및 이름(항목이 없는 경우 access.log)"
+
+#: cps/templates/config_edit.html:96
+msgid "Feature Configuration"
+msgstr "기능 설정"
+
+#: cps/templates/config_edit.html:104
+msgid "Convert non-English characters in title and author while saving to disk"
+msgstr "제목과 저자가 영어가 아닌 경우 원어로 저장하기"
+
+#: cps/templates/config_edit.html:108
+msgid "Enable Uploads"
+msgstr "업로드 활성화"
+
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr "(사용자에게 업로드 권한도 있는지 확인하십시오)"
+
+#: cps/templates/config_edit.html:112
+msgid "Allowed Upload Fileformats"
+msgstr "허용된 업로드 파일 형식"
+
+#: cps/templates/config_edit.html:118
+msgid "Enable Anonymous Browsing"
+msgstr "익명 탐색 활성화"
+
+#: cps/templates/config_edit.html:122
+msgid "Enable Public Registration"
+msgstr "공개 등록 활성화"
+
+#: cps/templates/config_edit.html:127
+msgid "Use E-Mail as Username"
+msgstr "이메일을 사용자 이름으로 사용"
+
+#: cps/templates/config_edit.html:132
+msgid "Enable Magic Link Remote Login"
+msgstr "Enable Magic Link Remote Login"
+
+#: cps/templates/config_edit.html:137
+msgid "Enable Kobo sync"
+msgstr "Kobo sync 활성화"
+
+#: cps/templates/config_edit.html:142
+msgid "Proxy unknown requests to Kobo Store"
+msgstr "Kobo Store에 알 수 없는 요청 프록시"
+
+#: cps/templates/config_edit.html:145
+msgid "Server External Port (for port forwarded API calls)"
+msgstr "서버 외부 포트(포트 전달 API 호출용)"
+
+#: cps/templates/config_edit.html:153
+msgid "Use Goodreads"
+msgstr "Goodreads 사용"
+
+#: cps/templates/config_edit.html:154
+msgid "Create an API Key"
+msgstr "API 키 생성"
+
+#: cps/templates/config_edit.html:158
+msgid "Goodreads API Key"
+msgstr "Goodreads API Key"
+
+#: cps/templates/config_edit.html:162
+msgid "Goodreads API Secret"
+msgstr "Goodreads API Secret"
+
+#: cps/templates/config_edit.html:169
+msgid "Allow Reverse Proxy Authentication"
+msgstr "역방향 프록시 인증 허용"
+
+#: cps/templates/config_edit.html:180
+msgid "Login type"
+msgstr "로그인 유형"
+
+#: cps/templates/config_edit.html:182
+msgid "Use Standard Authentication"
+msgstr "표준 인증 사용"
+
+#: cps/templates/config_edit.html:184
+msgid "Use LDAP Authentication"
+msgstr "LDAP 인증 사용"
+
+#: cps/templates/config_edit.html:187
+msgid "Use OAuth"
+msgstr "OAuth 사용"
+
+#: cps/templates/config_edit.html:194
+msgid "LDAP Server Host Name or IP Address"
+msgstr "LDAP 서버 호스트 이름 또는 IP 주소"
+
+#: cps/templates/config_edit.html:198
+msgid "LDAP Server Port"
+msgstr "LDAP 서버 포트"
+
+#: cps/templates/config_edit.html:202
+msgid "LDAP Encryption"
+msgstr "LDAP 암호화"
+
+#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
+#: cps/templates/email_edit.html:41
+msgid "None"
+msgstr "None"
+
+#: cps/templates/config_edit.html:205
+msgid "TLS"
+msgstr "TLS"
+
+#: cps/templates/config_edit.html:206
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/config_edit.html:210
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP CACertificate 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:217
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP 인증서 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:224
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP 키 파일 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:233
+msgid "LDAP Authentication"
+msgstr "LDAP 인증"
+
+#: cps/templates/config_edit.html:235
+msgid "Anonymous"
+msgstr "익명"
+
+#: cps/templates/config_edit.html:236
+msgid "Unauthenticated"
+msgstr "인증되지 않음"
+
+#: cps/templates/config_edit.html:237
+msgid "Simple"
+msgstr "Simple"
+
+#: cps/templates/config_edit.html:242
+msgid "LDAP Administrator Username"
+msgstr "LDAP 관리자 사용자 이름"
+
+#: cps/templates/config_edit.html:248
+msgid "LDAP Administrator Password"
+msgstr "LDAP 관리자 비밀번호"
+
+#: cps/templates/config_edit.html:253
+msgid "LDAP Distinguished Name (DN)"
+msgstr "LDAP 고유 이름(DN)"
+
+#: cps/templates/config_edit.html:257
+msgid "LDAP User Object Filter"
+msgstr "LDAP 사용자 개체 필터"
+
+#: cps/templates/config_edit.html:262
+msgid "LDAP Server is OpenLDAP?"
+msgstr "LDAP 서버는 OpenLDAP입니까?"
+
+#: cps/templates/config_edit.html:264
+msgid "Following Settings are Needed For User Import"
+msgstr "사용자 가져오기에는 다음 설정이 필요합니다."
+
+#: cps/templates/config_edit.html:266
+msgid "LDAP Group Object Filter"
+msgstr "LDAP 그룹 개체 필터"
+
+#: cps/templates/config_edit.html:270
+msgid "LDAP Group Name"
+msgstr "DAP 그룹 이름"
+
+#: cps/templates/config_edit.html:274
+msgid "LDAP Group Members Field"
+msgstr "LDAP 그룹 구성원 필드"
+
+#: cps/templates/config_edit.html:278
+msgid "LDAP Member User Filter Detection"
+msgstr "LDAP 구성원 사용자 필터 감지"
+
+#: cps/templates/config_edit.html:280
+msgid "Autodetect"
+msgstr "자동 감지"
+
+#: cps/templates/config_edit.html:281
+msgid "Custom Filter"
+msgstr "맞춤 필터"
+
+#: cps/templates/config_edit.html:286
+msgid "LDAP Member User Filter"
+msgstr "LDAP 구성원 사용자 필터"
+
+#: cps/templates/config_edit.html:297
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr "%(provider)s OAuth 자격 증명 얻기"
+
+#: cps/templates/config_edit.html:300
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr "%(provider)s OAuth 클라이언트 ID"
+
+#: cps/templates/config_edit.html:304
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth 클라이언트 암호"
+
+#: cps/templates/config_edit.html:320
+msgid "External binaries"
+msgstr "외부 바이너리"
+
+#: cps/templates/config_edit.html:326
+msgid "Path to Calibre E-Book Converter"
+msgstr "Calibre E-Book 변환기 경로"
+
+#: cps/templates/config_edit.html:334
+msgid "Calibre E-Book Converter Settings"
+msgstr "Calibre E-Book 변환기 경로 설정"
+
+#: cps/templates/config_edit.html:337
+msgid "Path to Kepubify E-Book Converter"
+msgstr "Kepubify 전자책 변환기 경로"
+
+#: cps/templates/config_edit.html:345
+msgid "Location of Unrar binary"
+msgstr "Unrar 바이너리의 위치"
+
+#: cps/templates/config_view_edit.html:17
+msgid "View Configuration"
+msgstr "환경 설정 보기"
+
+#: cps/templates/config_view_edit.html:32
+msgid "No. of Random Books to Display"
+msgstr "랜덤 보기시 표시할 책 수"
+
+#: cps/templates/config_view_edit.html:36
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr "숨기기 전에 표시할 저자 수(0=숨기기 비활성화)"
+
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+msgid "Theme"
+msgstr "테마"
+
+#: cps/templates/config_view_edit.html:42
+msgid "Standard Theme"
+msgstr "기본 테마"
+
+#: cps/templates/config_view_edit.html:43
+msgid "caliBlur! Dark Theme"
+msgstr "caliBlur! 다크 모드"
+
+#: cps/templates/config_view_edit.html:47
+msgid "Regular Expression for Ignoring Columns"
+msgstr "열을 무시하는 정규식"
+
+#: cps/templates/config_view_edit.html:51
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr "읽음/읽지 않음 상태를 Calibre 열에 연결"
+
+#: cps/templates/config_view_edit.html:60
+msgid "View Restrictions based on Calibre column"
+msgstr "Calibre 열을 기반으로 한 보기 제한"
+
+#: cps/templates/config_view_edit.html:69
+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:96
+msgid "Admin User"
+msgstr "관리자"
+
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
+msgid "Allow Downloads"
+msgstr "다운로드 허용"
+
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
+msgid "Allow eBook Viewer"
+msgstr "책 보기 허용"
+
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
+msgid "Allow Uploads"
+msgstr "업로드 허용"
+
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
+msgid "Allow Edit"
+msgstr "편집 허용"
+
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
+msgid "Allow Delete Books"
+msgstr "책 삭제 허용"
+
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
+msgid "Allow Changing Password"
+msgstr "비밀번호 변경 허용"
+
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
+msgid "Allow Editing Public Shelves"
+msgstr "공개 서재 편집 허용"
+
+#: cps/templates/config_view_edit.html:123
+msgid "Default Language"
+msgstr "기본 언어"
+
+#: cps/templates/config_view_edit.html:131
+msgid "Default Visible Language of Books"
+msgstr "책의 기본 표시 언어"
+
+#: cps/templates/config_view_edit.html:147
+msgid "Default Visibilities for New Users"
+msgstr "신규 사용자를 위한 기본 기능"
+
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
+#: cps/templates/user_table.html:154
+msgid "Show Random Books in Detail View"
+msgstr "상세 보기에서 임의의 책 표시"
+
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
+msgid "Add Allowed/Denied Tags"
+msgstr "허용/거부 태그 추가"
+
+#: cps/templates/config_view_edit.html:166
+msgid "Add Allowed/Denied custom column values"
+msgstr "허용/거부 사용자 정의 열 값 추가"
+
+#: cps/templates/detail.html:60 cps/templates/detail.html:69
+msgid "Read in Browser"
+msgstr "부라우저에서 보기"
+
+#: cps/templates/detail.html:77 cps/templates/detail.html:94
+msgid "Listen in Browser"
+msgstr "브라우저에서 듣기"
+
+#: cps/templates/detail.html:124
+#, python-format
+msgid "Book %(index)s of %(range)s"
+msgstr "책 %(index)s의 %(range)s"
+
+#: cps/templates/detail.html:173
+msgid "Published"
+msgstr "출간일"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Unread"
+msgstr "읽지 않은 상태로 표시"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Read"
+msgstr "읽은 상태로 표시"
+
+#: cps/templates/detail.html:222
+msgid "Read"
+msgstr "읽기"
+
+#: cps/templates/detail.html:231
+msgid "Restore from archive"
+msgstr "아카이브에서 복원"
+
+#: cps/templates/detail.html:231
+msgid "Add to archive"
+msgstr "아카이브에 추가"
+
+#: cps/templates/detail.html:232
+msgid "Archived"
+msgstr "보관됨"
+
+#: cps/templates/detail.html:243
+msgid "Description:"
+msgstr "설명:"
+
+#: cps/templates/detail.html:256 cps/templates/search.html:14
+msgid "Add to shelf"
+msgstr "서재에 추가"
+
+#: cps/templates/detail.html:267 cps/templates/detail.html:284
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
+#: cps/templates/search.html:20
+msgid "(Public)"
+msgstr "(공개)"
+
+#: cps/templates/detail.html:298
+msgid "Edit Metadata"
+msgstr "메타저오 편집"
+
+#: cps/templates/email_edit.html:13
+msgid "Choose Server Type"
+msgstr "서버 유형 선택"
+
+#: cps/templates/email_edit.html:15
+msgid "Use Standard E-Mail Account"
+msgstr "표준 이메일 계정 사용"
+
+#: cps/templates/email_edit.html:16
+msgid "Gmail Account with OAuth2 Verification"
+msgstr "OAuth2 인증이 있는 Gmail 계정"
+
+#: cps/templates/email_edit.html:22
+msgid "Setup Gmail Account as E-Mail Server"
+msgstr "Gmail 계정을 이메일 서버로 설정"
+
+#: cps/templates/email_edit.html:24
+msgid "Revoke Gmail Access"
+msgstr "Gmail 액세스 취소"
+
+#: cps/templates/email_edit.html:42
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:43
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:51
+msgid "SMTP Password"
+msgstr "SMTP 비밀번호"
+
+#: cps/templates/email_edit.html:58
+msgid "Attachment Size Limit"
+msgstr "첨부 파일 크기 제한"
+
+#: cps/templates/email_edit.html:66
+msgid "Save and Send Test E-mail"
+msgstr "저장 후 테스트 이메일 보내기"
+
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
+msgid "Back"
+msgstr "뒤로"
+
+#: cps/templates/email_edit.html:74
+msgid "Allowed Domains (Whitelist)"
+msgstr "허용하는 도메인(화이트 리스트)"
+
+#: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
+msgid "Add Domain"
+msgstr "도메인 추가"
+
+#: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
+#: cps/templates/user_table.html:27
+msgid "Add"
+msgstr "추가"
+
+#: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
+msgid "Enter domainname"
+msgstr "도메인 입력"
+
+#: cps/templates/email_edit.html:92
+msgid "Denied Domains (Blacklist)"
+msgstr "거부 도메인(블랙리스트)"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+msgid "Next"
+msgstr "다음"
+
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr "텍스트 편집기에서 .kobo/Kobo eReader.conf 파일을 열고 다음을 추가(또는 편집)합니다."
+
+#: cps/templates/http_error.html:31
+msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
+msgstr "Calibre-Web Instance가 구성되지 않았습니다. 관리자에게 문의하십시오."
+
+#: cps/templates/http_error.html:41
+msgid "Create Issue"
+msgstr "이슈 생성"
+
+#: cps/templates/http_error.html:48
+msgid "Return to Home"
+msgstr "홈으로"
+
+#: cps/templates/http_error.html:50
+msgid "Logout User"
+msgstr "로그아웃"
+
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr "다운로드 횟수에 따라 오름차순 정렬"
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr "다운로드 횟수에 따라 내림차순 정렬"
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
+#: cps/templates/shelf.html:23
+msgid "Sort authors in alphabetical order"
+msgstr "저자를 가나다순(알파벳순)으로 정렬"
+
+#: cps/templates/index.html:77 cps/templates/search.html:34
+#: cps/templates/shelf.html:24
+msgid "Sort authors in reverse alphabetical order"
+msgstr "저자를 가나다(알파벳) 역순으로 정렬"
+
+#: cps/templates/index.html:81
+msgid "Sort ascending according to series index"
+msgstr "시리즈 인덱스에 따라 오름차순 정렬"
+
+#: cps/templates/index.html:82
+msgid "Sort descending according to series index"
+msgstr "시리즈 인덱스에 따라 내림차순 정렬"
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "시작"
+
+#: cps/templates/index.xml:18
+msgid "Alphabetical Books"
+msgstr "가나다(알파벳) 순"
+
+#: cps/templates/index.xml:22
+msgid "Books sorted alphabetically"
+msgstr "가나다(알파벳)순으로 정렬한 책"
+
+#: cps/templates/index.xml:29
+msgid "Popular publications from this catalog based on Downloads."
+msgstr "다운로드 기준 인기 도서."
+
+#: cps/templates/index.xml:36
+msgid "Popular publications from this catalog based on Rating."
+msgstr "별점 기준 인기 도서"
+
+#: cps/templates/index.xml:39
+msgid "Recently added Books"
+msgstr "최근 추가된 도서"
+
+#: cps/templates/index.xml:43
+msgid "The latest Books"
+msgstr "최신 도서"
+
+#: cps/templates/index.xml:46
+msgid "Random Books"
+msgstr "랜덤 정렬"
+
+#: cps/templates/index.xml:73
+msgid "Books ordered by Author"
+msgstr "저자별 정렬"
+
+#: cps/templates/index.xml:80
+msgid "Books ordered by publisher"
+msgstr "출판사별 정렬"
+
+#: cps/templates/index.xml:87
+msgid "Books ordered by category"
+msgstr "카테고리별 정렬"
+
+#: cps/templates/index.xml:94
+msgid "Books ordered by series"
+msgstr "시리즈별 정렬"
+
+#: cps/templates/index.xml:101
+msgid "Books ordered by Languages"
+msgstr "언어별 정렬"
+
+#: cps/templates/index.xml:108
+msgid "Books ordered by Rating"
+msgstr "평점별 정렬"
+
+#: cps/templates/index.xml:116
+msgid "Books ordered by file formats"
+msgstr "파일 종류별 정렬"
+
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/search_form.html:87
+msgid "Shelves"
+msgstr "서재"
+
+#: cps/templates/index.xml:123
+msgid "Books organized in shelves"
+msgstr "서재별 정렬"
+
+#: cps/templates/layout.html:29
+msgid "Home"
+msgstr "홈"
+
+#: cps/templates/layout.html:35
+msgid "Toggle Navigation"
+msgstr "탐색 활성화"
+
+#: cps/templates/layout.html:46
+msgid "Search Library"
+msgstr "검색"
+
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
+msgid "Uploading..."
+msgstr "업로드 중..."
+
+#: cps/templates/layout.html:63
+msgid "Error"
+msgstr "오류"
+
+#: cps/templates/layout.html:63
+msgid "Upload done, processing, please wait..."
+msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
+
+#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
+msgid "Settings"
+msgstr "설정"
+
+#: cps/templates/layout.html:78
+msgid "Account"
+msgstr "계정"
+
+#: cps/templates/layout.html:80
+msgid "Logout"
+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/login.html:18
+msgid "Remember Me"
+msgstr "로그인 유지"
+
+#: cps/templates/login.html:23
+msgid "Forgot Password?"
+msgstr "비밀번호를 잊으셨나요? "
+
+#: cps/templates/login.html:26
+msgid "Log in with Magic Link"
+msgstr "Magic Link로 로그인"
+
+#: 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 "Calibre-Web 로그 다운로드"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Access Log 다운로드"
+
+#: 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/modal_dialogs.html:134
+msgid "Ok"
+msgstr "Ok"
+
+#: cps/templates/osd.xml:5
+msgid "Calibre-Web eBook Catalog"
+msgstr "Calibre-Web 책 목록"
+
+#: cps/templates/read.html:6
+msgid "epub Reader"
+msgstr "EPUB 리더"
+
+#: cps/templates/read.html:75
+msgid "Reflow text when sidebars are open."
+msgstr "사이드바가 열려 있을 때 텍스트 다시 배열."
+
+#: cps/templates/readcbr.html:7
+msgid "Comic Reader"
+msgstr "코믹 리더"
+
+#: cps/templates/readcbr.html:89
+msgid "Keyboard Shortcuts"
+msgstr "키보드 단축키"
+
+#: cps/templates/readcbr.html:92
+msgid "Previous Page"
+msgstr "이전 페이지"
+
+#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+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/readcbr.html:165
+msgid "Reset to Top"
+msgstr "맨 위로 재설정"
+
+#: cps/templates/readcbr.html:166
+msgid "Remember Position"
+msgstr "위치 기억"
+
+#: cps/templates/readcbr.html:171
+msgid "Scrollbar"
+msgstr "스크롤바"
+
+#: cps/templates/readcbr.html:174
+msgid "Show"
+msgstr "보기"
+
+#: cps/templates/readcbr.html:175
+msgid "Hide"
+msgstr "숨기기"
+
+#: cps/templates/readdjvu.html:5
+msgid "DJVU Reader"
+msgstr "DJVU 리더"
+
+#: cps/templates/readpdf.html:29
+msgid "PDF Reader"
+msgstr "PDF 리더"
+
+#: cps/templates/readtxt.html:6
+msgid "txt Reader"
+msgstr "텍스트 리더"
+
+#: cps/templates/register.html:4
+msgid "Register New Account"
+msgstr "새 계정 등록"
+
+#: cps/templates/register.html:10
+msgid "Choose a username"
+msgstr "사용자 이름 선택"
+
+#: cps/templates/register.html:15
+msgid "Your email address"
+msgstr "이메일 주소"
+
+#: cps/templates/remote_login.html:5
+msgid "Magic Link - Authorise New Device"
+msgstr "Magic Link - 새 장치 승인"
+
+#: cps/templates/remote_login.html:7
+msgid "On another device, login and visit:"
+msgstr "다른 기기에서 로그인하고 방문하세요."
+
+#: cps/templates/remote_login.html:11
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr "승인이 되면 이 장치에 자동으로 로그인됩니다."
+
+#: cps/templates/remote_login.html:14
+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:21
+msgid "Published Date From"
+msgstr "출간일(부터)"
+
+#: cps/templates/search_form.html:31
+msgid "Published Date To"
+msgstr "출간일(까지)"
+
+#: cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "읽은 상태"
+
+#: cps/templates/search_form.html:59
+msgid "Exclude Tags"
+msgstr "태그 제외"
+
+#: cps/templates/search_form.html:77
+msgid "Exclude Series"
+msgstr "시리즈 제외"
+
+#: cps/templates/search_form.html:95
+msgid "Exclude Shelves"
+msgstr "서재 제외"
+
+#: cps/templates/search_form.html:115
+msgid "Exclude Languages"
+msgstr "언어 제외"
+
+#: cps/templates/search_form.html:126
+msgid "Extensions"
+msgstr "확장자"
+
+#: cps/templates/search_form.html:134
+msgid "Exclude Extensions"
+msgstr "확장자 제외"
+
+#: cps/templates/search_form.html:144
+msgid "Rating Above"
+msgstr "평점(이상)"
+
+#: cps/templates/search_form.html:148
+msgid "Rating Below"
+msgstr "평점(이하)"
+
+#: cps/templates/search_form.html:180
+msgid "From:"
+msgstr "부터:"
+
+#: cps/templates/search_form.html:190
+msgid "To:"
+msgstr "까지:"
+
+#: cps/templates/shelf.html:12
+msgid "Delete this Shelf"
+msgstr "이 서재 삭제"
+
+#: cps/templates/shelf.html:13
+msgid "Edit Shelf Properties"
+msgstr "서재 속성 편집"
+
+#: cps/templates/shelf.html:16
+msgid "Arrange books manually"
+msgstr "수동으로 책 정렬"
+
+#: cps/templates/shelf.html:17
+msgid "Disable Change order"
+msgstr "정렬 변경 비활성화"
+
+#: cps/templates/shelf.html:17
+msgid "Enable Change order"
+msgstr "정렬 변경 활성화"
+
+#: cps/templates/shelf_edit.html:14
+msgid "Share with Everyone"
+msgstr "모두와 공유"
+
+#: cps/templates/shelf_edit.html:21
+msgid "Sync this shelf with Kobo device"
+msgstr "이 서재를 Kobo 기기와 동기화"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag to Rearrange Order"
+msgstr "드래그하여 순서 변경"
+
+#: cps/templates/shelf_order.html:33
+msgid "Hidden Book"
+msgstr "숨겨진 책"
+
+#: cps/templates/stats.html:7
+msgid "Library Statistics"
+msgstr "Calibre 서재 통계"
+
+#: 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 "Progress"
+
+#: cps/templates/tasks.html:17
+msgid "Run Time"
+msgstr "실행 시간"
+
+#: cps/templates/tasks.html:18
+msgid "Start Time"
+msgstr "시작 시간"
+
+#: cps/templates/user_edit.html:20
+msgid "Reset user Password"
+msgstr "사용자 비밀번호 초기화"
+
+#: cps/templates/user_edit.html:43
+msgid "Language of Books"
+msgstr "책 언어"
+
+#: cps/templates/user_edit.html:54
+msgid "OAuth Settings"
+msgstr "OAuth 설정"
+
+#: cps/templates/user_edit.html:56
+msgid "Link"
+msgstr "링크"
+
+#: cps/templates/user_edit.html:58
+msgid "Unlink"
+msgstr "링크 해제"
+
+#: cps/templates/user_edit.html:64
+msgid "Kobo Sync Token"
+msgstr "코보 연동 토큰"
+
+#: cps/templates/user_edit.html:66
+msgid "Create/View"
+msgstr "생성/보기"
+
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr "강제로 코보 전체 동기화"
+
+#: cps/templates/user_edit.html:88
+msgid "Add allowed/Denied Custom Column Values"
+msgstr "허용/거부 사용자 정의 열 값 추가"
+
+#: cps/templates/user_edit.html:137
+msgid "Sync only books in selected shelves with Kobo"
+msgstr "선택한 서가에 있는 책만 Kobo와 동기화"
+
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
+msgid "Delete User"
+msgstr "사용자 삭제"
+
+#: cps/templates/user_edit.html:159
+msgid "Generate Kobo Auth URL"
+msgstr "Kobo Auth URL 생성"
+
+#: cps/templates/user_table.html:80 cps/templates/user_table.html:103
+msgid "Select..."
+msgstr "선택..."
+
+#: cps/templates/user_table.html:131
+msgid "Edit User"
+msgstr "사용자 편집"
+
+#: cps/templates/user_table.html:134
+msgid "Enter Username"
+msgstr "사용자 이름"
+
+#: cps/templates/user_table.html:135
+msgid "Enter E-mail Address"
+msgstr "이메일 주소 입력"
+
+#: cps/templates/user_table.html:136
+msgid "Enter Kindle E-mail Address"
+msgstr "킨들 이메일 주소 입력"
+
+#: cps/templates/user_table.html:136
+msgid "Kindle E-mail"
+msgstr "킨들 이메일"
+
+#: cps/templates/user_table.html:137
+msgid "Locale"
+msgstr "언어"
+
+#: cps/templates/user_table.html:138
+msgid "Visible Book Languages"
+msgstr "표시할 책 언어"
+
+#: cps/templates/user_table.html:139
+msgid "Edit Allowed Tags"
+msgstr "허용된 태그 편집"
+
+#: cps/templates/user_table.html:139
+msgid "Allowed Tags"
+msgstr "허용된 태그"
+
+#: cps/templates/user_table.html:140
+msgid "Edit Denied Tags"
+msgstr "거부된 태그 편집"
+
+#: cps/templates/user_table.html:140
+msgid "Denied Tags"
+msgstr "거부된 태그"
+
+#: cps/templates/user_table.html:141
+msgid "Edit Allowed Column Values"
+msgstr "허용된 열 값 편집"
+
+#: cps/templates/user_table.html:141
+msgid "Allowed Column Values"
+msgstr "허용되는 열 값"
+
+#: cps/templates/user_table.html:142
+msgid "Edit Denied Column Values"
+msgstr "거부된 열 값 편집"
+
+#: cps/templates/user_table.html:142
+msgid "Denied Column Values"
+msgstr "거부된 열 값"
+
+#: cps/templates/user_table.html:144
+msgid "Change Password"
+msgstr "비밀번호 변경"
+
+#: cps/templates/user_table.html:147
+msgid "View"
+msgstr "보기"
+
+#: cps/templates/user_table.html:150
+msgid "Edit Public Shelves"
+msgstr "공개 서재 편집"
+
+#: cps/templates/user_table.html:152
+msgid "Sync selected Shelves with Kobo"
+msgstr "선택한 서재를 코보와 동기화"
+
+#: cps/templates/user_table.html:156
+msgid "Show read/unread selection"
+msgstr "읽음/읽지 않음 선택 표시"
+
+#: cps/templates/user_table.html:159
+msgid "Show random books"
+msgstr "랜덤 보기 표시"
+
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index d7e7c45ee39325b7c028cb75a234a08734bb2334..51c56591730f98d589a25bf5d31a0f99fefc6dd7 100644
GIT binary patch
delta 11273
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
QcP34$-+t$m-N!@!2aHGqhX4Qo

delta 11383
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
F@LwWtG2Q?G

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index fc45d08ac..76731bc83 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -17,7 +17,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -27,7 +27,7 @@ msgstr "niet geïnstalleerd"
 msgid "installed"
 msgstr "geïnstalleerd"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistieken"
 
@@ -47,9 +47,9 @@ msgstr "Opnieuw verbinden gelukt"
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Onbekend"
@@ -162,7 +162,7 @@ msgstr "Wil je dit domein echt verwijderen?"
 msgid "Do you really want to delete this user?"
 msgstr "Wil je deze gebruiker echt verwijderen?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Weet je zeker dat je deze boekenplank wilt verwijderen?"
 
@@ -283,7 +283,7 @@ msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsj
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "DB-instellingen niet opgeslagen"
 
@@ -313,7 +313,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
@@ -358,7 +358,7 @@ msgstr "Gebruiker '%(nick)s' bewerken"
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
@@ -393,7 +393,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
@@ -493,108 +493,112 @@ msgstr "niet geconfigureerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Het boekformaat is verwijderd"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "metagegevens bewerken"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s is geen geldig nummer, sla het over"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s is geen geldige taal"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identificatoren zijn niet hoofdlettergevoelig, overschrijf huidige identificatoren"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "De metagegevens zijn bijgewerkt"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Kan het boek niet bewerken, controleer het logbestand"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 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:993
+#: cps/editbooks.py:997
 #, 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:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Omslag %(file)s niet verplaatst: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Bestand %(file)s geüpload"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Bron- of doelformaat ontbreekt voor conversie"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, 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"
@@ -607,175 +611,175 @@ msgstr "Het instellen van Google Drive is niet afgerond, heractiveer Google Driv
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Het callback-domein is niet geverifieerd. Volg de stappen in de Google-ontwikkelaarsconsole om het domein te verifiëren"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s niet gevonden %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Deze e-mail is verstuurd via Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web - test-e-mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Test-e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Aan de slag met Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registratie-e-mailadres van gebruiker: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s versturen naar Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s verzonden naar Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Het opgevraagde bestand kan niet worden gelezen. Ben je hiertoe gemachtigd?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Het verwijderen van de boekenmap voor boek %(id)s is mislukt, het pad heeft submappen: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Verwijderen van boek %(id)s mislukt: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Verwijder boek %(id)s alleen uit database, boek pad is ongeldig: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan de titel '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is al in gebruik"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Ongeldig E-Mail adres"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Fout bij downloaden omslag"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Onjuist omslagformaat"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Locatie aanmaken voor omslag mislukt"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 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:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Alleen jpg/jpeg/png/webp/bmp bestanden worden ondersteund als omslag"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Alleen jpg/jpeg bestanden zijn toegestaan als omslag"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Unrar executable niet gevonden"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Fout bij het uitvoeren van Unrar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Wachten"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Gestart"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Voltooid"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Onbekende status"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo Instellen"
 
@@ -784,7 +788,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -850,7 +854,7 @@ msgid "{} Stars"
 msgstr "{} sterren"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Inloggen"
 
@@ -1069,41 +1073,46 @@ msgstr "Pas een boekenplank aan"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank '%(title)s' aangemaakt"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank '%(title)s' is aangepast"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Er is een fout opgetreden"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, 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:311
+#: cps/shelf.py:312
 #, 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:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Het boek is verwijderd"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde van boekenplank veranderen: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
 
@@ -1184,14 +1193,14 @@ msgstr "Categorie: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1211,102 +1220,102 @@ msgstr "Alle bestandsformaten"
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lees Status = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 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:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
@@ -1383,7 +1392,7 @@ msgid "Upload"
 msgstr "Uploaden"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Downloaden"
@@ -1550,39 +1559,38 @@ msgstr "Details"
 msgid "Current version"
 msgstr "Huidige versie"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Controleren op updates"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Update uitvoeren"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Weet je zeker dat je Calibre-Web wilt herstarten?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Oké"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Weet je zeker dat je Calibre-Web wilt stoppen?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Bezig met bijwerken, vernieuw de pagina niet"
 
@@ -1595,39 +1603,39 @@ msgid "In Library"
 msgstr "In bibliotheek"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Sorteren op datum, nieuwste boeken eerst"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Sorteren op datum, oudste boeken eerst"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Sorteren op alfabetische volgorde"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sorteren op omgekeerde alfabetische volgorde"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Sorteren op publicatiedatum, nieuwste boeken eerst"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "beperken"
 
@@ -2472,12 +2480,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Auteurs sorteren op alfabetische volgorde"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Auteurs sorteren op omgekeerde alfabetische volgorde"
 
@@ -2966,30 +2974,26 @@ msgstr "Van:"
 msgid "To:"
 msgstr "Tot:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Deze boekenplank verwijderen"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Bewerk boekenplank eigenschappen"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Boeken handmatig rangschikken"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Schakel verandering van de volgorde uit"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Schakel verandering van de volgorde in"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Boekenplank wordt permanent verwijderd voor iedereen"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Delen met iedereen"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 3c1424b46a39204b6817d00519046c223aca62ed..b1bef7475c176b3a26b1cdc75310671578668145 100644
GIT binary patch
delta 11287
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
S9vQo;j{6~JSNtbS{QnO^E;G0Q

delta 11380
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

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index c7dfbcf77..b7a00e317 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -17,7 +17,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -27,7 +27,7 @@ msgstr "nie zainstalowane"
 msgid "installed"
 msgstr "zainstalowane"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statystyki"
 
@@ -48,9 +48,9 @@ msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 # ???
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Nieznany"
@@ -165,7 +165,7 @@ msgstr "Czy naprawdę chcesz usunąć tę domenę?"
 msgid "Do you really want to delete this user?"
 msgstr "Czy naprawdę chcesz usunąć tego użytkownika?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Czy na pewno chcesz usunąć półkę?"
 
@@ -283,7 +283,7 @@ msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Ustawienia Bazy Danych nie są zapisywalne"
 
@@ -312,7 +312,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
@@ -357,7 +357,7 @@ msgstr "Edytuj użytkownika %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
@@ -393,7 +393,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
@@ -494,108 +494,112 @@ msgstr "nie skonfigurowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, 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/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Plik książki w wybranym formacie został usunięty"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s nie jest poprawną liczbą, pomijanie"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s nie jest prawidłowym językiem"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do wysłania musi mieć rozszerzenie"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, 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:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Format pliku %(ext)s dodany do %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "W identyfikatorach nie jest rozróżniana wielkość liter, nadpisywanie starego identyfikatora"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadane zostały pomyślnie zaktualizowane"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 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:895
+#: cps/editbooks.py:899
 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:993
+#: cps/editbooks.py:997
 #, 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:1012
+#: cps/editbooks.py:1016
 #, 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:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Wysłano plik %(file)s"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Brak formatu źródłowego lub docelowego do konwersji"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Podczas konwersji książki wystąpił błąd: %(res)s"
@@ -608,176 +612,176 @@ msgstr "Konfiguracja Google Drive nie została zakończona, spróbuj dezaktywowa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Zwrotna domena nie jest zweryfikowana, proszę zweryfikowania domenę w konsoli deweloperskiej google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nie znaleziono: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 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:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Testowy e-mail Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Testowy e-mail"
 
 # ???
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Zacznij korzystać z Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Rejestracja e-mail dla użytkownika: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Wyślij %(format)s do Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Wyślij do Kindle"
 
 # ???
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Żądany plik nie mógł zostać odczytany. Może brakuje uprawnień?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Usuwanie folderu książki dla książki %(id)s nie powiodło się, ścieżka ma podfoldery: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, 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:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Usuwanie książki %(id)s, ścieżka książki jest niepoprawna: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Nieprawidłowy format adresu e-mail"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Błąd przy pobieraniu okładki"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Błędny format okładki"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Nie udało się utworzyć ścieżki dla okładki"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 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:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Jako plik okładki obsługiwane są tylko pliki jpg/jpeg/png/webp/bmp"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Plik wykonywalny programu unrar nie znaleziony"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Błąd przy wykonywaniu unrar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Oczekiwanie"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Nieudane"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Rozpoczynanie"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Zakończone"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Ststus nieznany"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Konfiguracja Kobo"
 
@@ -787,7 +791,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -853,7 +857,7 @@ msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -1072,41 +1076,46 @@ msgstr "Edytuj półkę"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, 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:311
+#: cps/shelf.py:312
 #, 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:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Książka została usunięta"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: „%(name)s”"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 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"
 
@@ -1187,14 +1196,14 @@ msgstr "Kategoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Szukaj"
 
@@ -1214,103 +1223,103 @@ msgstr "Lista formatów"
 msgid "Tasks"
 msgstr "Zadania"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status przeczytania = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 #, fuzzy
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 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:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, 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:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 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:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
@@ -1389,7 +1398,7 @@ msgstr "Wysyłanie"
 
 # ???
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Pobieranie"
@@ -1556,39 +1565,38 @@ msgstr "Szczegóły"
 msgid "Current version"
 msgstr "Bieżąca wersja"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Sprawdź aktualizacje"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Wykonaj aktualizację"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Na pewno chcesz zatrzymać Calibre Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Aktualizowanie, proszę nie odświeżać strony"
 
@@ -1601,39 +1609,39 @@ msgid "In Library"
 msgstr "W Bibliotece"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Sortuj książki według daty, najnowsze jako pierwsze"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Sortuj książki według daty, najstarsze jako pierwsze"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Sortuj tytuły w porządku alfabetycznym"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortuj tytuły w odwrotnym porządku alfabetycznym"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortuj według daty publikacji, najnowsze jako pierwsze"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortuj według daty publikacji, najstarsze jako pierwsze"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "zwiń"
 
@@ -2486,12 +2494,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Sortuj autorów w porządku alfabetycznym"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Posortuj autorów w odwrotnym porządku alfabetycznym"
 
@@ -2981,30 +2989,26 @@ msgstr "Od:"
 msgid "To:"
 msgstr "Do:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Usuń tą półkę"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Edytuj właściwości półki"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Ręczne porządkowanie książek"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Wyłączenie Zlecenie zmiany"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Włącz polecenie zmiany"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Półka zostanie usunięta dla wszystkich użytkowników"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Współdziel z wszystkimi"
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index c6efe3c2bd789c787432ed2b1b4d82a3f36684a4..b38822b8a375274dcdcbde5efcd9f3815da8e8cf 100644
GIT binary patch
delta 10191
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

delta 10293
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
bhkpz53o728HaRcfDZV!&wERF>VvYX-nJ;Pv

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 762d185fc..03816c54f 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -13,7 +13,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -23,7 +23,7 @@ msgstr "não instalado"
 msgid "installed"
 msgstr "instalado"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Estatística"
 
@@ -43,9 +43,9 @@ msgstr "Reconexão bem-sucedida"
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -159,7 +159,7 @@ msgstr "Você realmente quer excluir este domínio?"
 msgid "Do you really want to delete this user?"
 msgstr "Você realmente quer excluir este usuário?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Tem certeza que quer apagar essa estante?"
 
@@ -281,7 +281,7 @@ msgstr "LDAP CACertificate, Certificados ou chave de localização não é váli
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "O banco de dados de configurações não é gravável"
 
@@ -311,7 +311,7 @@ msgstr "Atualização das configurações do servidor de e-mail"
 msgid "Database Configuration"
 msgstr "Configuração das Características"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
@@ -356,7 +356,7 @@ msgstr "Editar usuário %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Usuário '%(nick)s' atualizado"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
@@ -391,7 +391,7 @@ msgstr "Atualização das configurações do servidor de e-mail"
 msgid "Password for user %(user)s reset"
 msgstr "Senha para redefinição do usuário %(user)s"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
@@ -491,108 +491,112 @@ msgstr "não configurado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "A coluna personalizada No.%(column)d não existe no banco de dados do calibre"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Formato do Livro Eliminado com Sucesso"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Livro Eliminado com Sucesso"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oops! O título do livro seleccionado não está disponível. O arquivo não existe ou não é acessível"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "editar metadados"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s não é um idioma válido"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "A extensão de arquivo '%(ext)s' não pode ser enviada para este servidor"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "O arquivo a ser carregado deve ter uma extensão"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Falha ao criar o caminho %(path)s (Permission denied)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Falha ao armazenar o arquivo %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Formato de arquivo %(ext)s adicionado a %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Os identificadores não são sensíveis a maiúsculas ou minúsculas, mas sim a maiúsculas e minúsculas"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadados atualizados com sucesso"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Livro de edição de erros, por favor verifique o ficheiro de registo para mais detalhes"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "O livro carregado provavelmente existe na biblioteca, considere mudar antes de carregar novo: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "O arquivo %(filename)s não pôde ser salvo no diretório temporário"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Falha ao mover arquivo de capa  %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Arquivo %(file)s enviado"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Falta o formato de origem ou destino para a conversão"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Livro enfileirado com sucesso para conversão em %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocorreu um erro ao converter este livro: %(res)s"
@@ -605,175 +609,175 @@ msgstr "Configuração do Google Drive não concluída, tente desativar e ativar
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "O domínio Callback não é verificado, por favor siga os passos para verificar o domínio no console do desenvolvedor do google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Formato %(format)s não encontrado para o id do livro: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s não encontrado no Google Drive:  %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s não encontrado: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Enviar para Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Este e-mail foi enviado via Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "E-mail de teste do Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "E-mail de teste"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Comece a usar o calibre-web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "E-mail de registro do usuário: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Converta %(orig)s em %(format)s e envie para o Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Envie  %(format)s para o Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Enviar para Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "O arquivo solicitado não pôde ser lido. Talvez permissões erradas?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "A exclusão da pasta de livros do livro %(id)s falhou, o caminho tem subpastas: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Falha ao excluir livro %(id)s: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Excluindo livro %(id)s, caminho do livro inválido: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Renomear título de: '%(src)s' para '%(dest)s' falhou com o erro: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Renomear arquivo no caminho '%(src)s' para '%(dest)s' falhou com o erro: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Arquivo %(file)s não encontrado no Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrado uma conta existente para este endereço de e-mail."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Este nome de usuário já está registrado"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Formato de endereço de e-mail inválido"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Erro ao Baixar a capa"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Erro de Formato da Capa"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Falha em criar caminho para a capa"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "O arquivo de capa não é um arquivo de imagem válido, ou não pôde ser armazenado"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Apenas ficheiros jpg/jpeg/png/webp/bmp são suportados como arquivos de capa"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Apenas arquivos jpg/jpeg são suportados como arquivos de capa"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Unrar arquivo binário não encontrado"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Erro excecutando UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Aguardando"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Falha"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Iniciado em"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Concluído"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Status Desconhecido"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Por favor, acesse o calibre-web de um host não local para obter um api_endpoint válido para o dispositivo kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Configuração Kobo"
 
@@ -782,7 +786,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -848,7 +852,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Login"
 
@@ -1067,41 +1071,46 @@ msgstr "Editar uma estante"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s criada"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s alterada"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Houve um erro"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Já existe uma estante pública com o nome '%(title)s' ."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Já existe uma estante privada com o nome'%(title)s' ."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Livro Eliminado com Sucesso"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Alterar ordem da Estante: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erro ao abrir estante. A estante não existe ou não está acessível"
 
@@ -1182,14 +1191,14 @@ msgstr "Categoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Pesquisa"
 
@@ -1209,102 +1218,102 @@ msgstr "Lista de formatos de arquivo"
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Publicado depois de "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Avaliação <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Avaliação >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de leitura  = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ups! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail válido para Kindle."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Nome de usuário ou senha incorretos"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Nova senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Você agora está logado como: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s's"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Perfil atualizado"
 
@@ -1381,7 +1390,7 @@ msgid "Upload"
 msgstr "Upload"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Baixar"
@@ -1548,39 +1557,38 @@ msgstr "Detalhes"
 msgid "Current version"
 msgstr "Versão atual"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Verificar Atualizações"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Realizar Atualizações"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Tem a certeza que quer recomeçar?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Tens a certeza que queres fechar?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Atualizando, por favor, não recarregue esta página"
 
@@ -1593,39 +1601,39 @@ msgid "In Library"
 msgstr "Na Biblioteca"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Classificar de acordo com a data do livro, o mais recente primeiro"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Classificar de acordo com a data do livro, o mais antigo primeiro"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Classificar título em ordem alfabética"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Classificar título em ordem alfabética inversa"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Classificar de acordo com a data de publicação, o mais novo primeiro"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Classificar de acordo com a data de publicação, primeiro mais antigo"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "reduzir"
 
@@ -2470,12 +2478,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Ordenar os autores em ordem alfabética"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordenar os autores em ordem alfabética inversa"
 
@@ -2964,30 +2972,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Excluir esta estante"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Editar as propriedades da estante"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Organizar os livros manualmente"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Desativar ordem de modificação"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Habilitar ordem de modificação"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "A estante será excluída para todos os usuários"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Partilhar com Todos"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 69d9e91fa593d79d7386beda5873cec19f1012b2..42feeb5a438f21f55d119e38b645bc7e3a260415 100644
GIT binary patch
delta 8367
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
Obx7HehTuIz!~X}PXF`|&

delta 8502
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

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 2eb525685..d3d9df30d 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,7 +17,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -27,7 +27,7 @@ msgstr "не установлено"
 msgid "installed"
 msgstr "установлено"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -47,9 +47,9 @@ msgstr "Успешно переподключено"
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -162,7 +162,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
@@ -284,7 +284,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -314,7 +314,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
@@ -359,7 +359,7 @@ msgstr "Изменить пользователя %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
@@ -394,7 +394,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
@@ -494,108 +494,112 @@ msgstr "не настроено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s не допустимый язык"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Формат файла %(ext)s добавлен в %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Метаданные обновлены"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Ошибка редактирования книги. Пожалуйста, проверьте лог-файл для дополнительной информации"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Загруженная книга, вероятно, существует в библиотеке, перед тем как загрузить новую, рассмотрите возможность изменения: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Файл %(filename)s не удалось сохранить во временную папку"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Файл %(file)s загружен"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Исходный или целевой формат для конвертирования отсутствует"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Книга успешно поставлена в очередь для конвертирования в %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Произошла ошибка при конвертирования этой книги: %(res)s"
@@ -608,175 +612,175 @@ msgstr "Настройка Google Drive не завершена, попробу
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Не удалось проверить домен обратного вызова, пожалуйста, выполните шаги для проверки домена в консоли разработчика Google."
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s форма не найден для книги с id: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s не найден на Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s не найден: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Отправить на Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Это электронное письмо было отправлено через Caliber-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Тестовый e-mail для Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Тестовый e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Начать работу с Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Регистрационный e-mail для пользователя: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Преобразовать %(orig)s в %(format)s и отправить в Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Отправить %(format)s в Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Отправить на Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Запрашиваемый файл не может быть прочитан. Возможно у вас нет разрешения?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Файл %(file)s не найден на Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Не удалось создать путь для обложки."
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Только файлы в формате jpg / jpeg поддерживаются как файл обложки"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Начало"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Завершено"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Неизвестный статус"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Настройка Kobo"
 
@@ -785,7 +789,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -851,7 +855,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Логин"
 
@@ -1070,41 +1074,46 @@ msgstr "Изменить полку"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана полка %(title)s"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Колка %(title)s изменена"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Публичная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Приватная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Метаданные обновлены"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение полки '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Полка: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
@@ -1185,14 +1194,14 @@ msgstr "Категория: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Поиск"
 
@@ -1212,102 +1221,102 @@ msgstr "Список форматов файлов"
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
@@ -1384,7 +1393,7 @@ msgid "Upload"
 msgstr "Загрузить"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Скачать"
@@ -1551,39 +1560,38 @@ msgstr "Подробности"
 msgid "Current version"
 msgstr "Текущая версия"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Проверка обновлений"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Установить обновления"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Отмена"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Установка обновлений, пожалуйста, не обновляйте страницу"
 
@@ -1596,39 +1604,39 @@ msgid "In Library"
 msgstr "В библиотеке"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "уменьшить"
 
@@ -2473,12 +2481,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2967,30 +2975,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Удалить эту книжную полку"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Книжная полка будет безвозвратно удалена для всех"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Сделать книжную полку доступной для всех ?"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 22c37233b6be8237799631f454937faed6473bc0..2843a58004d4c57a2a148dc3878408a253e5876e 100644
GIT binary patch
delta 11078
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

delta 11167
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
R=JJP2rj%B1+4V^9{{VhB`Huhq

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 0030825f7..61e462b6e 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "inte installerad"
 msgid "installed"
 msgstr "installerad"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistik"
 
@@ -46,9 +46,9 @@ msgstr "Återanslutning lyckades"
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Okänd"
@@ -161,7 +161,7 @@ msgstr "Vill du verkligen ta bort den här domänen?"
 msgid "Do you really want to delete this user?"
 msgstr "Vill du verkligen ta bort den här användaren?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Är du säker på att du vill ta bort hyllan?"
 
@@ -281,7 +281,7 @@ msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänlige
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Inställningar för DB är inte skrivbara"
 
@@ -311,7 +311,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
@@ -355,7 +355,7 @@ msgstr "Redigera användaren %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
@@ -391,7 +391,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
@@ -491,108 +491,112 @@ msgstr "inte konfigurerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Bokformat har tagits bort"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Boken har tagits bort"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "redigera metadata"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s är inte ett giltigt språk"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Filen som ska laddas upp måste ha en ändelse"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, 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:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Databasfel: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Filformatet %(ext)s lades till %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identifierare är inte skiftlägeskänsliga, skriver över gammal identifierare"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadata uppdaterades"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 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:895
+#: cps/editbooks.py:899
 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:993
+#: cps/editbooks.py:997
 #, 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:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Det gick inte att flytta omslagsfil %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Filen %(file)s uppladdad"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Källa eller målformat för konvertering saknas"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Det gick inte att konvertera den här boken: %(res)s"
@@ -605,174 +609,174 @@ msgstr "Installationen av Google Drive är inte klar, försök att inaktivera oc
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Återuppringningsdomänen är inte verifierad, följ stegen för att verifiera domänen i Google utvecklarkonsol"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s hittades inte: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web test e-post"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Test e-post"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Kom igång med Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrera e-post för användare: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Skicka %(format)s till Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Skicka till Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 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:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Borttagning av bokmapp för boken %(id)s misslyckades, sökvägen har undermappar: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Borttagning av boken %(id)s misslyckades: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Borttagning av boken %(id)s, boksökväg inte giltig: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, 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:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Ogiltigt e-postadressformat"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Fel vid hämtning av omslaget"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Fel på omslagsformat"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Det gick inte att skapa sökväg för omslag"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Omslagsfilen är inte en giltig bildfil eller kunde inte lagras"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Endast jpg/jpeg/png/webp/bmp-filer stöds som omslagsfil"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Endast jpg/jpeg-filer stöds som omslagsfil"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Unrar binär fil hittades inte"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Fel vid körning av UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Väntar"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Startad"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Klar"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo-installation"
 
@@ -781,7 +785,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -847,7 +851,7 @@ msgid "{} Stars"
 msgstr "{} stjärnor"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Logga in"
 
@@ -1066,41 +1070,46 @@ msgstr "Redigera en hylla"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hyllan %(title)s skapad"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hyllan %(title)s ändrad"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Det fanns ett fel"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "En offentlig hylla med namnet \"%(title)s\" finns redan."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "En privat hylla med namnet \"%(title)s\" finns redan."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Boken har tagits bort"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Ändra ordning på hyllan: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylla: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 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"
 
@@ -1181,14 +1190,14 @@ msgstr "Kategori: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Sök"
 
@@ -1208,102 +1217,102 @@ msgstr "Lista över filformat"
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lässtatus = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 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:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
@@ -1380,7 +1389,7 @@ msgid "Upload"
 msgstr "Ladda upp"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Hämta"
@@ -1547,39 +1556,38 @@ msgstr "Detaljer"
 msgid "Current version"
 msgstr "Aktuell version"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Sök efter uppdatering"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Utför uppdatering"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 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:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Uppdaterar, vänligen uppdatera inte sidan"
 
@@ -1592,39 +1600,39 @@ msgid "In Library"
 msgstr "I biblioteket"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Sortera efter bokdatum, nyast först"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Sortera efter bokdatum, äldsta först"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Sortera titel i alfabetisk ordning"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortera titel i omvänd alfabetisk ordning"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortera efter publiceringsdatum, nyast först"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortera efter publiceringsdatum, äldsta först"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "minska"
 
@@ -2470,12 +2478,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Sortera författare i alfabetisk ordning"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Sortera författare i omvänd alfabetisk ordning"
 
@@ -2962,30 +2970,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Ta bort den här hyllan"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Redigera hyllegenskaper"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Ordna böcker manuellt"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Inaktivera ändring av ordning"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Aktivera ändring av ordning"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Hylla kommer att tas bort för alla användare"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Dela med alla"
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 4354ea9aa3eb72cd7758b46d267bb21923274341..305099604e1ba07f06d6757121bd200dee48c3a9 100644
GIT binary patch
delta 35
rcmZqM#Mripal;j3UL#!tLtO(i1w#`n1LMsPjRhGQEjNEQ5mo^J&n61c

delta 35
rcmZqM#Mripal;j3UPE0&BV8jS1w%_K1GCK!jRhGQEjE8P5mo^J&xZ=u

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 9d6781daa..d1f9e3726 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "yüklü değil"
 msgid "installed"
 msgstr "yüklü"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "İstatistikler"
 
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Bilinmeyen"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
@@ -278,7 +278,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -308,7 +308,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
@@ -353,7 +353,7 @@ msgstr "%(nick)s kullanıcısını düzenle"
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
@@ -388,7 +388,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
@@ -487,108 +487,112 @@ msgstr "ayarlanmadı"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "metaveri düzenle"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s geçerli bir dil değil"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, 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:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metaveri başarıyla güncellendi"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 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:895
+#: cps/editbooks.py:899
 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:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "%(file)s dosyası yüklendi"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 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:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, 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"
@@ -601,175 +605,175 @@ msgstr "Google Drive kurulumu tamamlanmadı, Google Drive'ı devre dışı bıra
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Geri yönlendirme alanı (callback domain) doğrulanamadı, lütfen Google geliştirici konsolunda alan adını doğrulamak için gerekli adımları izleyin."
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, 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:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, 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:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s bulunamadı: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 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:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Bu e-Posta Calibre-Web ile gönderilmiştir."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web deneme e-Postası"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Deneme e-Postası"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Web'i Kullanmaya Başlayın"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Kullanıcı Kayıt e-Postası: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s biçimlerini Kindle'a gönder"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Kindle'a gönder"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "İstenilen dosya okunamadı. Yanlış izinlerden kaynaklanabilir?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, 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:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bu e-posta adresi için bir hesap mevcut."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Bu kullanıcı adı zaten alındı"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Bekleniyor"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Başarısız"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Başladı"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Bitti"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Bilinmeyen Durum"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -778,7 +782,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -844,7 +848,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Giriş"
 
@@ -1063,41 +1067,46 @@ msgstr "Kitaplığı düzenle"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s kitaplığı oluşturuldu."
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s kitaplığı değiştirildi"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Bir hata oluştu"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Metaveri başarıyla güncellendi"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Kitaplık: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 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"
 
@@ -1178,14 +1187,14 @@ msgstr "Kategori: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Ara"
 
@@ -1205,102 +1214,102 @@ msgstr "Biçim listesi"
 msgid "Tasks"
 msgstr "Görevler"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 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/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 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:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
@@ -1377,7 +1386,7 @@ msgid "Upload"
 msgstr "Yükleme"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "İndirme"
@@ -1544,39 +1553,38 @@ msgstr "Detaylar"
 msgid "Current version"
 msgstr "Geçerli sürüm"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Güncelle"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1589,39 +1597,39 @@ msgid "In Library"
 msgstr "Kitaplıkta"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "azalt"
 
@@ -2464,12 +2472,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2958,30 +2966,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Bu Kitaplığı sil"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr ""
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr ""
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 62855c0847be892c5299e2aba81e4e5efcd1c2ee..829add92e69edee8ce1f7ba9b1c7398607145f9d 100644
GIT binary patch
delta 3573
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

delta 3689
zcmYM$3v7;89LMofy596c^=8%fX{|0rwMA*wWxBE=)^=mf6e-#%HMB;zZh3WP;*wg@
zuuR4X#!ND_?$r>xU{P;fnoSrZhUpfUMU1h1e|t|ddHa0MInVQ)|2hA2&J&kcdbO?c
za{V0Yy~gnGB7a@^Yx7a<|9_1^#)MKmg3qBF1F_Y5-L~Jw0NNi~y@HM5X9Br|U^GTz
zZ(Gkso_Cp7DJbw1<XuyZ3b-75<7e0fPoTzj4Sn%8s>6Hejs8UGjKQb@CZGn?4|`xH
zs=sL%j<py`e6xju0yO^Dz|4?7%^#?MPw{#5?r2Og#-Tc{LA9?!4R{;I<00f{E^+CE
zzhfW#2bIA-G-{%07)*RKf`T4=g-aY3V=UHS0&YYN<T!S~Q`T1GXRg`$pQxE@G=30-
z%20%@C!+>D2>r1DU3#F1f>O8uqwyWo2-hG#vzd!J-iON6ant}WqdNQ>m9a?jugrAE
z0ho%zuoN}Wt*Gbrqx$=<Gx^tAoU=D>V-od8sF`*P^9-mTYQ$r0eF7@bd{oEpq4q>A
zYUXQg`{&5m%x={C-`ILH>iu8B$o~)uZ8T^T_GB~>n1dQv5f`ml1!@VZP#JKc0)C3h
z+$L;?U!XGcrENc9+fU<2+TB=yoe9z(OI;K+;&rIhY{oR)gDH3ewImU&QzoY2Ae@5=
zycPBS4rHI2dh2l{iRK)t-<!7n5S6ijD37kL6qK4|)S3)N%`^uUU>qt{`KSOzs5LLg
zZnz9JfUl4wng-NyJBcsgJ=9W0kTzv5fs5i~A#q$Lmx4B19xBijTQ5TmY!PN)4JreN
zQK^533j7TD8DB=Ffyblz>xr6qI>um*y+0jEs+onIbpC57XykRMk#0wgya5&9CsZo0
zA=xtzt--8|GSD5B(lMy#i%@|}Z2JOqsDFftvkln>rV%4`{?Dp_zo9y6$4=CPVW@g9
z)C)sUGt5T?C`4_}H&L0JgNay$TDlF$H^*#7J=cIb4Tn&B>@>P`L-|o4A8Qn9t&^;o
zsE)><Qa=f`hSQPdHS<s%F2|nOh#Ke()Kaveo_~yb-<Knzcp<UmUo(%VL1tL<QK>9L
z4X^_BLKSKTE09$%>#;o^u<ebgfM=|it#?q*{e>FfQ@rEF(#4T~1rFuIEt61dIuiR~
zDJr#VZTlwdOZ{7<5Ay)yFqH3f5~ksBoQ%rIdMrXW4#mE7uKs6p$-~ty3cV;?MFk3A
z=P6a;s6Yv*_B<q(nPl(3kJ=L}Fb6kcF8+!-ekqBb??fSLKp*2kbYm*|boVT&YcK_M
zl#4rYDk{Z+^r8pjkbPqEu>jvf&EOa+LpN|DhLcxq%5tR1RAVx3MwZ>2#SFZQ#hApb
zr|SH#qM*&yh8zI%6qULz<Wrx>ap;GO(I1y%0M;Qtvw@4w^GW1Ya~0cTKyOdVgHfkx
z9QMItBnhS#lXd<Z?2YS~&W(;drId}v!MF@Z;Zan_zO2g{?0_q96Kddnn675}GOAvR
z8qf!*rQ3<hR5NNoiKH)q_$HHrUYv|$u^P1*zelC|3hE2jKE;!X7^KN`M=jMv+g^rR
zvI^7ywx9wYMa?*pn>jcX9bAGg?cyyI0`NF0P&0PITd34OMsIA-x@4mtsy+_eVLmRz
z*Kij8fLWN%`UPSoYELZ2QrwP(7&3tTE5$Ph@ShIcglq~E%~n<5YShR-#5ml68t5t8
zegX9XdV&syv3{I1GZ2;0LhOhOF$tGpFz&%nJeE%W_279LI63A%YL`Y1VmUA$m7%Y3
z7&arZOc0}Hk|rB<e<5nA)}T(yK~#WNR3>j@2tKj(4g?9J9^<00jY4nSg6Gf|t1>+q
zSd3-Vm!oF>02SaFIv72~^Qp~3-OomCy73r}RjAb0VkGXvx!8<R=o-dC<xzMYnY`JK
z4ANY|H!y0br^8BA2kTKY-)p^vlc-0N9-Wd!$U!kpsORn=N8ZE^_tZz@c<S#W2f<}d
zQqbBwLaj}=5uPPUL(M1;bzCOl6r6|J8)vW!{%Gs>F^2jRWE+_-FM5_>JZfo*k&|kc
zqJ#C=U+4e4z2P^~^Flht^FS{0Nief<K7N8T(VrvWU<GP()?qXr#00#6%D^L31`=QL
zScsbFN{q#Qm^gvL1qwWCo}kY4a1QBcoQpoVAC>wh)NXFYIJ}7p>`UI2scy(>nB-CQ
zJA&p1#X5`1%FCT;CC-eJ@{$E5Gn~@76;3ftZ&#L7RMv+_7kCGy_DxOeo0jIJW@M(M
z*Dr`G@$wp6f6?jDb%f*I-Lk~p;NI)Fn_6mGK5*~iuc>93`-r>Aaqn>-;NC9xVfS7d
db~#iIx2&d}N7uG2HSTqFO<B?PUPCYW{R=PUqv8Mn

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 9a4907fd5..733687e18 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+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,7 +15,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr "не встановлено"
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Невідомий"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
@@ -281,7 +281,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -311,7 +311,7 @@ msgstr "З'єднання з базою даних закрите"
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
@@ -355,7 +355,7 @@ msgstr "Змінити користувача %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -390,7 +390,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
@@ -488,108 +488,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "змінити метадані"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Завантажувальний файл повинен мати розширення"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Сталась помилка при редагуванні книги. Будь-ласка, перевірте лог-файл для деталей"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -602,174 +606,174 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Домен зворотнього зв'язку не підтверджено. Виконайте дії для підтвердження домену, будь-ласка"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Відправити на Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Відправити на Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -778,7 +782,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -844,7 +848,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -1063,41 +1067,45 @@ msgstr "Змінити книжкову полицю"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Створена книжкова полиця %(title)s"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжкова полиця %(title)s змінена"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Сталась помилка"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Змінити розташування книжкової полиці '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжкова полиця: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
@@ -1178,14 +1186,14 @@ msgstr "Категорія: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Пошук"
 
@@ -1205,102 +1213,102 @@ msgstr ""
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
@@ -1377,7 +1385,7 @@ msgid "Upload"
 msgstr "Додати нову книгу"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Завантажити"
@@ -1544,39 +1552,38 @@ msgstr ""
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Перевірка оновлень"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Встановити оновлення"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
 
@@ -1589,39 +1596,39 @@ msgid "In Library"
 msgstr "У бібліотеці"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr ""
 
@@ -2463,12 +2470,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2953,30 +2960,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Видалити цю книжкову полицю"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Книжкова полиця буде остаточно видалена для всіх"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "зробити книжкову полицю доступною для всіх?"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 3bbd44758668b5cf44be2dc9deef7cb3aab922ba..dd3b6cdeaf3d2e8283f0a1ea9060e274b1483b94 100644
GIT binary patch
delta 12022
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
N*lSIT^0#G|{XcTHdVc@_

delta 12100
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

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 34fae6308..4ebaacc3e 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "未安装"
 msgid "installed"
 msgstr "已安装"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "统计"
 
@@ -46,9 +46,9 @@ msgstr "重新连接成功"
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "未知"
@@ -160,7 +160,7 @@ msgstr "您确定要删除此域吗？"
 msgid "Do you really want to delete this user?"
 msgstr "您确定要删除此用户吗？"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您确定要删除此书架吗？"
 
@@ -277,7 +277,7 @@ msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写入"
 
@@ -305,7 +305,7 @@ msgstr "数据库设置已更新"
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
@@ -349,7 +349,7 @@ msgstr "编辑用户 %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
@@ -384,7 +384,7 @@ msgstr "邮件服务器设置已更新"
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
@@ -482,108 +482,112 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "书籍格式已成功删除"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "'%(langname)s' 不是一种有效语言"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须具有扩展名"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -596,174 +600,174 @@ msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id为 %(book)d 的书籍的 %(format)s 格式"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "发送到Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "此邮件已经通过Calibre-Web发送。"
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web测试邮件"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "测试邮件"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "开启Calibre-Web之旅"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "转换 %(orig)s 到 %(format)s 并发送到Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "发送 %(format)s 到Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s发送到Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取请求的文件。可能有错误的权限设置？"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "删除书籍 %(id)s失败：%(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "仅从数据库中删除书籍 %(id)s，数据库中的书籍路径无效： %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "无效的邮件地址格式"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "下载封面时出错"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "封面格式出错"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "创建封面路径失败"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的图片文件，或者无法存储"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr "封面文件内容无效"
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "执行UnRar时出错"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "失败"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "已开始"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo 设置"
 
@@ -772,7 +776,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -838,7 +842,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "登录"
 
@@ -1055,41 +1059,46 @@ msgstr "编辑书架"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr "抱歉，你没有创建公开书架的权限"
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已创建"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已修改"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "书籍已成功删除"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架：%(name)s"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
@@ -1170,14 +1179,14 @@ msgstr "分类：%(name)s"
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "高级搜索"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "搜索"
 
@@ -1197,102 +1206,102 @@ msgstr "文件格式列表"
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1369,7 +1378,7 @@ msgid "Upload"
 msgstr "上传书籍"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "下载书籍"
@@ -1535,39 +1544,38 @@ msgstr "详情"
 msgid "Current version"
 msgstr "当前版本"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "确定"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "您确定要关闭吗？"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -1580,39 +1588,39 @@ msgid "In Library"
 msgstr "在书库"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "按图书日期排序，最新优先"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "按图书日期排序，最旧优先"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "按标题按字母顺序排序"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "按标题逆字母顺序排序"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新优先"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "减少"
 
@@ -2450,12 +2458,12 @@ msgid "Sort descending according to download count"
 msgstr "按下载数逆序排序"
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母顺序排序"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母顺序排序"
 
@@ -2937,30 +2945,26 @@ msgstr "从："
 msgid "To:"
 msgstr "到："
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "删除此书架"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "编辑书架属性"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "手动排列书籍排列顺序"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "禁止改变顺序"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "允许改变顺序"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "书架将会从所有用户中删除"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "书架将被公开"
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 9f2dd7d88e9ed3c4c7bdc7ea6e0295deccf4b713..79d132b691221f13e1f8cec1223fa0bdc8431252 100644
GIT binary patch
delta 11748
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
ZAt~qYi7^EVG|8zvd2n*hn(aM<{tKEoOsN0>

delta 11812
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
AwEzGB

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index d9cbf08bb..d64da8b8d 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -16,7 +16,7 @@ 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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "未安裝"
 msgid "installed"
 msgstr "已安裝"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "統計"
 
@@ -46,9 +46,9 @@ msgstr "重新連接成功"
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "未知"
@@ -160,7 +160,7 @@ msgstr "您確定要刪除此網域嗎？"
 msgid "Do you really want to delete this user?"
 msgstr "您確定要刪除此用戶嗎？"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您確定要刪除此書架嗎？"
 
@@ -277,7 +277,7 @@ msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "設置數據庫不可寫入"
 
@@ -306,7 +306,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
@@ -350,7 +350,7 @@ msgstr "編輯用戶 %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "用戶“%(nick)s”已更新"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
@@ -385,7 +385,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
@@ -484,108 +484,112 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "書籍格式已成功刪除"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "書籍已成功刪除"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "編輯元數據"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s 不是一個有效的數值，忽略"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s 不是一種有效語言"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上傳文件附檔名為“%(ext)s”的文件到此服務器"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "要上傳的文件必須具有附檔名"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "創建路徑 %(path)s 失敗(權限拒絕)。"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失敗。"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "標識符不區分大小寫，覆蓋舊標識符"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "已成功更新元數據"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "編輯書籍出錯，請檢查日誌文件以獲取詳細信息"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上傳的書籍可能已經存在，建議修改後重新上傳： "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 無法保存到臨時目錄"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移動封面文件失敗 %(file)s：%(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上傳"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "轉換的來源或目的格式不存在"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "書籍已經被成功加入到 %(book_format)s 格式轉換隊列"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "轉換此書籍時出現錯誤： %(res)s"
@@ -598,174 +602,174 @@ msgstr "Google Drive 設置未完成，請嘗試停用並再次激活Google雲
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回調網域名稱尚未被驗證，請在google開發者控制台按步驟驗證網域名稱"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id為 %(book)d 的書籍的 %(format)s 格式"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "發送到Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "此郵件已經通過Calibre-Web發送。"
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web測試郵件"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "測試郵件"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "開啟Calibre-Web之旅"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用戶註冊電子郵件：%(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "轉換 %(orig)s 到 %(format)s 並發送到Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "發送 %(format)s 到Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s發送到Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "無法讀取請求的文件。可能有錯誤的權限設置？"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "刪除書的文件夾%(id)s失敗，路徑有子文件夾：%(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "刪除書籍 %(id)s失敗：%(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "僅從數據庫中刪除書籍 %(id)s，數據庫中的書籍路徑無效： %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, 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:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此郵箱的賬號已經存在。"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "此用戶名已被使用"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "無效的郵件地址格式"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "下載封面時出錯"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "封面格式出錯"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "創建封面路徑失敗"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的圖片文件，或者無法儲存"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp格式文件"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "僅將jpg、jpeg文件作為封面文件"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar執行文件"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "執行UnRar時出錯"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "已開始"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "未知狀態"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 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:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo 設置"
 
@@ -774,7 +778,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -840,7 +844,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "登入"
 
@@ -1057,41 +1061,46 @@ msgstr "編輯書架"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "書架 %(title)s 已創建"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "書架 %(title)s 已修改"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "發生錯誤"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共書架：%(title)s已經存在已經存在。"
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有書架：%(title)s已經存在。"
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "書籍已成功刪除"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改書架 %(name)s 順序"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "書架：%(name)s"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打開書架出錯。書架不存在或不可訪問"
 
@@ -1172,14 +1181,14 @@ msgstr "分類：%(name)s"
 msgid "Language: %(name)s"
 msgstr "語言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "搜尋"
 
@@ -1199,102 +1208,102 @@ msgstr "文件格式列表"
 msgid "Tasks"
 msgstr "任務列表"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "出版時間晚於 "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "出版時間早於 "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評分 <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評分 >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "閱讀狀態 = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”登入"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "資料已更新"
 
@@ -1371,7 +1380,7 @@ msgid "Upload"
 msgstr "上傳書籍"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "下載書籍"
@@ -1537,39 +1546,38 @@ msgstr "詳情"
 msgid "Current version"
 msgstr "當前版本"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "檢查更新"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "執行更新"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "您確定要重啟嗎？"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "確定"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "您確定要關閉嗎？"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，請不要刷新頁面"
 
@@ -1582,39 +1590,39 @@ msgid "In Library"
 msgstr "在書庫"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "按圖書日期排序，最新優先"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "按圖書日期排序，最舊優先"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "按標題按字母順序排序"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "按標題逆字母順序排序"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新優先"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "減少"
 
@@ -2457,12 +2465,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母順序排序"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母順序排序"
 
@@ -2944,30 +2952,26 @@ msgstr "從："
 msgid "To:"
 msgstr "到："
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "刪除此書架"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "編輯書架屬性"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "手動排列書籍排列順序"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "禁止改變順序"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "允許改變順序"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "書架將會從所有用戶中刪除"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "書架將被公開"
diff --git a/messages.pot b/messages.pot
index 150274610..d60872dfd 100644
--- a/messages.pot
+++ b/messages.pot
@@ -1,21 +1,21 @@
 # Translations template for PROJECT.
-# Copyright (C) 2021 ORGANIZATION
+# Copyright (C) 2022 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr ""
 
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr ""
@@ -159,7 +159,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
@@ -276,7 +276,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr ""
 
@@ -348,7 +348,7 @@ msgstr ""
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
@@ -481,108 +481,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -595,174 +599,174 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr ""
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, 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:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -771,7 +775,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -837,7 +841,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr ""
 
@@ -1054,41 +1058,45 @@ msgstr ""
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
@@ -1169,14 +1177,14 @@ msgstr ""
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr ""
 
@@ -1196,102 +1204,102 @@ msgstr ""
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr ""
 
@@ -1368,7 +1376,7 @@ msgid "Upload"
 msgstr ""
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr ""
@@ -1534,39 +1542,38 @@ msgstr ""
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1579,39 +1586,39 @@ msgid "In Library"
 msgstr ""
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr ""
 
@@ -2449,12 +2456,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2936,30 +2943,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr ""
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr ""

From c830a5936e6ae6b00edc429f4bf2eab7e6cf16dc Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 6 Jan 2022 14:10:06 +0100
Subject: [PATCH 097/412] Added dse to supported languages

---
 cps/iso_language_names.py                     |  21 ++++++++++++++++++
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 39449 -> 39449 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 56049 -> 56049 bytes
 cps/translations/de/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 57609 -> 57609 bytes
 cps/translations/el/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 51225 -> 51225 bytes
 cps/translations/es/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 27338 -> 27338 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 53561 -> 53561 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 25073 -> 25073 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 56197 -> 56197 bytes
 cps/translations/it/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 19843 -> 19843 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 24354 -> 24354 bytes
 cps/translations/km/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/ko/LC_MESSAGES/messages.mo   | Bin 56464 -> 56464 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 50392 -> 50392 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 52304 -> 52304 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   |   2 +-
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 46828 -> 46828 bytes
 .../pt_BR/LC_MESSAGES/messages.po             |   2 +-
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 47824 -> 47824 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 48661 -> 48661 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 22790 -> 22790 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 17885 -> 17885 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   |   2 +-
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 50015 -> 50015 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        |   2 +-
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 48797 -> 48797 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        |   2 +-
 messages.pot                                  |   2 +-
 42 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 0507b6f7b..f86e5612e 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -102,6 +102,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "holandský znakový jazyk",
         "dua": "dualština",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "djula",
@@ -526,6 +527,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (Makrosprache)",
         "dsb": "Sorbisch; Nieder",
+        "dse": "Niederländische Zeichensprache",
         "dua": "Duala",
         "dum": "Niederländisch; Mittel (ca. 1050-1350)",
         "dyu": "Dyula",
@@ -945,6 +947,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib",
         "dua": "Duala",
         "nld": "Ολλανδικά",
+        "dse": "Ολλανδική νοηματική γλώσσα",
         "dyu": "Dyula",
         "dzo": "Dzongkha",
         "efi": "Efik",
@@ -1329,6 +1332,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolengua)",
         "dsb": "Bajo sorabo",
+        "dse": "Lengua de signos neerlandesa",
         "dua": "Duala",
         "dum": "Neerlandés medio (ca. 1050-1350)",
         "dyu": "Diula",
@@ -1753,6 +1757,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "alasorbi",
+        "dse": "Dutch Sign Language",
         "dua": "duala",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "dyula",
@@ -2177,6 +2182,7 @@ LANGUAGE_NAMES = {
         "div": "dhivehi",
         "doi": "dogri (macrolangue)",
         "dsb": "bas-sorbien",
+        "dse": "langue des signes néerlandaise",
         "dua": "duala",
         "dum": "néerlandais moyen (environ 1050-1350)",
         "dyu": "dioula",
@@ -2601,6 +2607,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "duala",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "djula",
@@ -3025,6 +3032,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolingua)",
         "dsb": "Lusaziano inferiore",
+        "dse": "Olandense (linguaggio dei segni)",
         "dua": "Duala",
         "dum": "Olandese medio (ca. 1050-1350)",
         "dyu": "Diula",
@@ -3449,6 +3457,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "ドゥアラ語",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "デュラ語",
@@ -3873,6 +3882,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "Duala",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "Dyula",
@@ -4292,6 +4302,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib",
         "dua": "Duala",
         "nld": "네덜란드어",
+        "dse": "Dutch Sign Language",
         "dyu": "Dyula",
         "dzo": "Dzongkha",
         "efi": "Efik",
@@ -4674,6 +4685,7 @@ LANGUAGE_NAMES = {
         "div": "Divehi",
         "doi": "Dogri",
         "dsb": "Sorbisch; lager",
+        "dse": "Nederlandse gebarentaal",
         "dua": "Duala",
         "dum": "Nederlands; middel (ca. 1050-1350)",
         "dyu": "Dyula",
@@ -5098,6 +5110,7 @@ LANGUAGE_NAMES = {
         "div": "malediwski; divehi",
         "doi": "dogri (makrojęzyk)",
         "dsb": "dolnołużycki",
+        "dse": "holenderski język migowy",
         "dua": "duala",
         "dum": "holenderski średniowieczny (ok. 1050-1350)",
         "dyu": "diula",
@@ -5517,6 +5530,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib",
         "dua": "Duala",
         "nld": "Holandês",
+        "dse": "Língua gestual holandesa",
         "dyu": "Dyula",
         "dzo": "Dzongkha",
         "efi": "Efik",
@@ -5899,6 +5913,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "Дуала",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "Диула (Дьюла)",
@@ -6323,6 +6338,7 @@ LANGUAGE_NAMES = {
         "div": "Divehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; nedre",
+        "dse": "Nederländskt teckenspråk",
         "dua": "Duala",
         "dum": "Hollänska; medeltida (ca. 1050-1350)",
         "dyu": "Dyula",
@@ -6742,6 +6758,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib (Kanada)",
         "dua": "Duala (Afrika)",
         "nld": "Flâmanca (Hollanda dili)",
+        "dse": "Hollandalı İşaret Dili",
         "dyu": "Dyula (Burkina Faso; Mali)",
         "dzo": "Dzongkha (Butan)",
         "efi": "Efik (Afrika)",
@@ -7124,6 +7141,7 @@ LANGUAGE_NAMES = {
         "div": "мальдивська",
         "doi": "догрі (макромова)",
         "dsb": "нижньолужицька",
+        "dse": "голландська мова жестів",
         "dua": "дуала",
         "dum": "середньовічна голландська (бл. 1050-1350)",
         "dyu": "діула",
@@ -7548,6 +7566,7 @@ LANGUAGE_NAMES = {
         "div": "迪维希语",
         "doi": "多格拉语",
         "dsb": "索布语（下）",
+        "dse": "荷兰手语",
         "dua": "杜亚拉语",
         "dum": "荷兰语（中古，约 1050-1350）",
         "dyu": "迪尤拉语",
@@ -7967,6 +7986,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib",
         "dua": "Duala",
         "nld": "荷蘭文",
+        "dse": "Dutch Sign Language",
         "dyu": "Dyula",
         "dzo": "Dzongkha",
         "efi": "Efik",
@@ -8350,6 +8370,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "Duala",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "Dyula",
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index a411e0e77b9bbc20258458b3187b7e89aaaeb56a..83d65d4ed3106413710d2fea6b5d63294a2e4b00 100644
GIT binary patch
delta 16
YcmbQag=yv%rVTqI7%evMiimdv06uvJ{r~^~

delta 16
YcmbQag=yv%rVTqI7>zgYiimdv06tp=`2YX_

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index fd74006e6..9e496565c 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+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"
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index be96d682b114d04eca6696eb049d9678a1e0376d..44998f7000572dcf6a3029ca7e8f84ecfb5658ee 100644
GIT binary patch
delta 16
YcmeykmHFdV<_$Ni87(&7suqt2083N|4gdfE

delta 16
YcmeykmHFdV<_$Ni8I3pJsuqt2082Iq2><{9

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index d312bfdfc..4353d1d08 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2021-12-22 19:05+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index c4b1af88a4f7800b37b4be3af13947671b1011f8..51f9b3a6ebef6e4ed0c61a62bc8baafd55d99c3d 100644
GIT binary patch
delta 16
XcmeA?#N2s^c|%$pqs8X*xJ69>I}Qfs

delta 16
XcmeA?#N2s^c|%$pqw(hSxJ69>I`9VJ

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 366b1dc1d..f19d6250a 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 0ed8ab6e9bb94fbfd135e75d01e100b8132d942c..60df9fd4a53865401f7361d4eddfd9498e00fd9f 100644
GIT binary patch
delta 16
YcmbO^fqCWx<_+`m87(%?&##IA06MV-;s5{u

delta 16
YcmbO^fqCWx<_+`m8I3p3&##IA06LQf-2eap

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 096e7f63c..346abb648 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index fe916f5a3cbb89785496278a3971f56b23cddfb0..a6e29b44cf6a2e977315e6e014e5557e668bd36d 100644
GIT binary patch
delta 16
XcmX?gmGRV7#trWFj24?c?3=U!K)VK)

delta 16
XcmX?gmGRV7#trWFjK-Ti?3=U!K%EAX

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 938ae04f1..db52dba8e 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 7b381167fc288133cbea7631952fd53ae4cbfb5e..d297f831e7abfb8273c50cd4abc715453385d943 100644
GIT binary patch
delta 16
YcmdnFh<WEC<_$slj24@N^PeRG06jbhBLDyZ

delta 16
YcmdnFh<WEC<_$sljK-UT^PeRG06iWD9smFU

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 782ae51a9..5bc1c54e5 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 84dd8c56cd89bf6222f7d80dede030949b9a7f11..366857ec676172ae6d580219d8e3fed873bbc571 100644
GIT binary patch
delta 16
Xcmex(nDOIb#tqG8j24?)%yP8>MZX6U

delta 16
Xcmex(nDOIb#tqG8jK-T=%yP8>MWF``

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 9d27c92c5..f63abf5c2 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 4a5f451894f746b0bc97959e24d5c5606024ab03..0c5151af302ff3ccadd62a798cd2e93b5993e929 100644
GIT binary patch
delta 16
XcmZqO&fL14d4qffqs3;0iqvEPHd_V~

delta 16
XcmZqO&fL14d4qffqw!{iiqvEPHa!Ln

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index f21f594aa..2ed3323a1 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 02ec8a14d3f5c8e64430030fd7987d08a6804547..3b92f0014be87c749df20d6ca9a95ee2ecce4c7c 100644
GIT binary patch
delta 16
XcmZpk&DcDfaYL;Zqs8VrEmma!GiL=-

delta 16
XcmZpk&DcDfaYL;Zqw(fCEmma!Gf4$a

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index ff4bf4eed..c87611219 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 5042a945899657064c294ce4540999e717b6be05..414c9da598c15b176b6981112b70fad75afa399d 100644
GIT binary patch
delta 16
YcmZ3qk8#mH#tl<c7%etWRq3??06eP(mjD0&

delta 16
YcmZ3qk8#mH#tl<c7>zeiRq3??06dKbk^lez

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 007d51de1..a60aa1819 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index 5ae70553ce8817c722fbf0a2466ed8885a18f353..6952a675ccf03a7be8daa0b8e060773ce4799dd5 100644
GIT binary patch
delta 16
YcmbQRlX=2U<_$Ni87(&7s@|3W073!>^Z)<=

delta 16
YcmbQRlX=2U<_$Ni8I3pJs@|3W072vj?*IS*

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index f83fded46..36bf33d95 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2022-01-05 09:45+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 51c56591730f98d589a25bf5d31a0f99fefc6dd7..1bea691785b264a330461227ad0e2af507767a31 100644
GIT binary patch
delta 16
Xcmcc7$$X=edBcuEMvKim3+00WLBt0t

delta 16
Xcmcc7$$X=edBcuEM&r#p3+00WL8b>K

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 76731bc83..c321e3d9e 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index b1bef7475c176b3a26b1cdc75310671578668145..3d792fa41beb7a58e9be0569da67a105a45a3ebb 100644
GIT binary patch
delta 16
YcmcaGgZaV?<_-Bpj24><iXKD)06<R%ZvX%Q

delta 16
YcmcaGgZaV?<_-BpjK-S_iXKD)06;MZY5)KL

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index b7a00e317..77f15d842 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index b38822b8a375274dcdcbde5efcd9f3815da8e8cf..a58be84a5d51109564415e24b2506a20d4983eed 100644
GIT binary patch
delta 16
YcmaF!mg&t~rVajSj24>%(&hvJ07;|=ssI20

delta 16
YcmaF!mg&t~rVajSjK-S-(&hvJ07-@ir2qf`

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 03816c54f..cb69d7da8 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 42feeb5a438f21f55d119e38b645bc7e3a260415..4ab5d9a66c9f38ecdf252f37b0c9155c25f39b00 100644
GIT binary patch
delta 16
YcmcccmFdD)rVZ}`87(%y4}6#b08btW^8f$<

delta 16
YcmcccmFdD)rVZ}`8I3o;4}6#b08ao2?f?J)

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index d3d9df30d..a662e9810 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 2843a58004d4c57a2a148dc3878408a253e5876e..289a250514ed096a76db8e382571b307361c894f 100644
GIT binary patch
delta 16
YcmbRGhiU2`rVX3&87($%&QJ0K07g;=wg3PC

delta 16
YcmbRGhiU2`rVX3&8I3n@&QJ0K07f(iu>b%7

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 61e462b6e..a6df7a66c 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 305099604e1ba07f06d6757121bd200dee48c3a9..4b8625aa7652e76b57d5254707b84dfd9f88e256 100644
GIT binary patch
delta 16
XcmZqM#Mripal->+MvKi4ja5|vJJ$w)

delta 16
XcmZqM#Mripal->+M&r#7ja5|vJGlmX

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index d1f9e3726..57b9beebe 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 829add92e69edee8ce1f7ba9b1c7398607145f9d..6ceb43260c3dc66dd4073cad9be394366d7a6334 100644
GIT binary patch
delta 16
XcmccH&3Lz)aYL~@qs8VD`AjtcJGllU

delta 16
XcmccH&3Lz)aYL~@qw(ev`AjtcJDUa`

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 733687e18..7982c29dc 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+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"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index dd3b6cdeaf3d2e8283f0a1ea9060e274b1483b94..24d53777e7ecf79a3b9d2828da322593aecda3db 100644
GIT binary patch
delta 16
XcmccL#(ckxdBfi-MvKk=suDc_Mw<u)

delta 16
XcmccL#(ckxdBfi-M&r%@suDc_MtukX

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 4ebaacc3e..836b1c2f8 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 79d132b691221f13e1f8cec1223fa0bdc8431252..15b7b64ef1d3e1d5871b30fb96e8a30d1de65489 100644
GIT binary patch
delta 16
YcmbRHmuc=_rVR(n87(#+D!=Up07+U1X8-^I

delta 16
YcmbRHmuc=_rVR(n8I3m|D!=Up07*OuVgLXD

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index d64da8b8d..0a3deeada 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
diff --git a/messages.pot b/messages.pot
index d60872dfd..8207eb4fc 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+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"

From 8dd0585919046ade5cd403c5f43e37e54d5d3098 Mon Sep 17 00:00:00 2001
From: byword77 <byword77@gmail.com>
Date: Fri, 7 Jan 2022 11:07:19 +0900
Subject: [PATCH 098/412] Add files via upload

---
 cps/translations/ko/LC_MESSAGES/messages.mo |  Bin 56464 -> 59876 bytes
 cps/translations/ko/LC_MESSAGES/messages.po | 6344 +++++++++----------
 2 files changed, 3170 insertions(+), 3174 deletions(-)

diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index 6952a675ccf03a7be8daa0b8e060773ce4799dd5..78088664d156cd9ef12df4f5c9e1087a08a06db7 100644
GIT binary patch
delta 17856
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
BR1W|E

delta 14305
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
L`ch}!j?4KUS6Ytz

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 36bf33d95..35aa7c512 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -1,3174 +1,3170 @@
-# Korean translation for Calibre-web
-# Copyright (C) 2022 EPUBGUIDE.NET
-# This file is distributed under the same license as the Calibre-web project
-# First korean translation by 내맘대로의 EPUBGUIDE.NET
-msgid ""
-msgstr ""
-"Project-Id-Version:  Calibre-web\n"
-"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2022-01-06 14:08+0100\n"
-"PO-Revision-Date: 2022-01-05 09:45+0900\n"
-"Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
-"Language: ko\n"
-"Language-Team: 내맘대로의 epubguide.net <byword77@gmail.com>\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\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:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
-msgid "not installed"
-msgstr "설치되지 않음"
-
-#: cps/about.py:47 cps/about.py:63
-msgid "installed"
-msgstr "설치됨"
-
-#: cps/about.py:145
-msgid "Statistics"
-msgstr "통계"
-
-#: cps/admin.py:144
-msgid "Server restarted, please reload page"
-msgstr "서버를 다시 시작했습니다. 새로고침 해주세요."
-
-#: cps/admin.py:146
-msgid "Performing shutdown of server, please close window"
-msgstr "서버를 종료하는 중입니다. 창을 닫아주세요."
-
-#: cps/admin.py:154
-msgid "Reconnect successful"
-msgstr "재연결 성공"
-
-#: cps/admin.py:157
-msgid "Unknown command"
-msgstr "알 수 없는 명령"
-
-#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
-#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
-#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
-#: cps/uploader.py:103
-msgid "Unknown"
-msgstr "알 수 없음"
-
-#: cps/admin.py:188
-msgid "Admin page"
-msgstr "관리자 페이지"
-
-#: cps/admin.py:207
-msgid "Basic Configuration"
-msgstr "\"기본 설"
-
-#: cps/admin.py:244
-msgid "UI Configuration"
-msgstr "UI 설정"
-
-#: cps/admin.py:277 cps/templates/admin.html:50
-msgid "Edit Users"
-msgstr "사용자 관리"
-
-#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
-#: cps/templates/list.html:13
-msgid "All"
-msgstr "모두"
-
-#: cps/admin.py:343 cps/admin.py:1606
-msgid "User not found"
-msgstr "사용자를 찾을 수 없습니다."
-
-#: cps/admin.py:357
-msgid "{} users deleted successfully"
-msgstr "{} 사용자를 성공적으로 삭제하였습니다."
-
-#: cps/admin.py:379 cps/templates/config_view_edit.html:133
-#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
-msgid "Show All"
-msgstr "모두 보기"
-
-#: cps/admin.py:400 cps/admin.py:406
-msgid "Malformed request"
-msgstr "잘못된 요청"
-
-#: cps/admin.py:418 cps/admin.py:1484
-msgid "Guest Name can't be changed"
-msgstr "Guest 이름은 수정할 수 없습니다."
-
-#: cps/admin.py:430
-msgid "Guest can't have this role"
-msgstr "Guest는 이 권한을 사용할 수 없습니다."
-
-#: cps/admin.py:442 cps/admin.py:1442
-msgid "No admin user remaining, can't remove admin role"
-msgstr "관리자 계정이 하나 뿐입니다. 이 관리자 권한을 삭제할 수 없습니다."
-
-#: cps/admin.py:446 cps/admin.py:460
-msgid "Value has to be true or false"
-msgstr "true 또는 false만 사용할 수 있습니다."
-
-#: cps/admin.py:448
-msgid "Invalid role"
-msgstr "잘못된 권한"
-
-#: cps/admin.py:452
-msgid "Guest can't have this view"
-msgstr "Guest는 이 view를 사용할 수 없습니다."
-
-#: cps/admin.py:462
-msgid "Invalid view"
-msgstr "잘못된 view"
-
-#: cps/admin.py:465
-msgid "Guest's Locale is determined automatically and can't be set"
-msgstr "Guest의 로케일은 자동으로 결정되며 설정할 수 없습니다. "
-
-#: cps/admin.py:469
-msgid "No Valid Locale Given"
-msgstr "유효한 로케일이 지정되지 않았습니다."
-
-#: cps/admin.py:480
-msgid "No Valid Book Language Given"
-msgstr "유효한 로케일이 지정되지 않았습니다."
-
-#: cps/admin.py:482
-msgid "Parameter not found"
-msgstr "매개변수를 찾을 수 없음 "
-
-#: cps/admin.py:533
-msgid "Invalid Read Column"
-msgstr "잘못된 읽기 열 "
-
-#: cps/admin.py:539
-msgid "Invalid Restricted Column"
-msgstr "잘못된 제한된 열 "
-
-#: cps/admin.py:560 cps/admin.py:1323
-msgid "Calibre-Web configuration updated"
-msgstr "Calibre-Web 설정이 업데이트 되었습니다."
-
-#: cps/admin.py:572
-msgid "Do you really want to delete the Kobo Token?"
-msgstr "Kobo Token을 삭제하시겠습니까?"
-
-#: cps/admin.py:574
-msgid "Do you really want to delete this domain?"
-msgstr "이 도메인을 삭제하시겠습니까?"
-
-#: cps/admin.py:576
-msgid "Do you really want to delete this user?"
-msgstr "이 사용자를 삭제하시겠습니까?"
-
-#: cps/admin.py:578
-msgid "Are you sure you want to delete this shelf?"
-msgstr "이 서재를 삭제하시겠습니까?"
-
-#: cps/admin.py:580
-msgid "Are you sure you want to change locales of selected user(s)?"
-msgstr "선택한 사용자의 언어를 변경하시겠습니까?"
-
-#: cps/admin.py:582
-msgid "Are you sure you want to change visible book languages for selected user(s)?"
-msgstr "선택한 사용자에 대해 표시되는 책 언어를 변경하시겠습니까? "
-
-#: cps/admin.py:584
-msgid "Are you sure you want to change the selected role for the selected user(s)?"
-msgstr "선택한 사용자에 대해 선택한 권한을 변경하시겠습니까? "
-
-#: cps/admin.py:586
-msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
-msgstr "선택한 사용자에 대해 선택한 제한을 변경하시겠습니까? "
-
-#: cps/admin.py:588
-msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
-msgstr "선택한 사용자에 대해 선택한 가시성 제한을 변경하시겠습니까?"
-
-#: cps/admin.py:590
-msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
-msgstr "선택한 사용자의 실행기 동기화 동작을 변경하시겠습니까? "
-
-#: cps/admin.py:592
-msgid "Are you sure you want to change Calibre library location?"
-msgstr "캘리버 서재의 언어를 변경하시겠습니까?"
-
-#: cps/admin.py:594
-msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr "Kobo Reader와 전체 동기화를 강제 실행하기 위해 Calibre-Web의 동기화 데이터베이스를 삭제하시겠습니까?"
-
-#: cps/admin.py:743
-msgid "Tag not found"
-msgstr "태그를 찾을 수 없습니다."
-
-#: cps/admin.py:755
-msgid "Invalid Action"
-msgstr "잘못된 액션"
-
-#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
-#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
-#: cps/templates/user_table.html:58
-msgid "Deny"
-msgstr "거부됨"
-
-#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
-#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
-#: cps/templates/user_table.html:61
-msgid "Allow"
-msgstr "허용됨"
-
-#: cps/admin.py:913
-msgid "{} sync entries deleted"
-msgstr "{} 동기화 항목이 삭제되었습니다."
-
-#: cps/admin.py:1036
-msgid "client_secrets.json Is Not Configured For Web Application"
-msgstr "client_secrets.json이 Web 응용프로그램에 대해 설정되지 않았습니다."
-
-#: cps/admin.py:1081
-msgid "Logfile Location is not Valid, Please Enter Correct Path"
-msgstr "로그 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1087
-msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
-msgstr "액세스 로그 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1117
-msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
-msgstr "LDAP 공급자, 포트, DN 및 사용자 개체 식별자를 입력하십시오."
-
-#: cps/admin.py:1123
-msgid "Please Enter a LDAP Service Account and Password"
-msgstr "LDAP 서비스 계정 및 비밀번호를 입력하십시오"
-
-#: cps/admin.py:1126
-msgid "Please Enter a LDAP Service Account"
-msgstr "LDAP 서비스 계정을 입력하십시오"
-
-#: cps/admin.py:1131
-#, python-format
-msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
-msgstr "LDAP 그룹 개체 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
-
-#: cps/admin.py:1133
-msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
-msgstr "LDAP 그룹 개체 필터에 일치하지 않는 괄호가 있습니다."
-
-#: cps/admin.py:1137
-#, python-format
-msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
-msgstr "LDAP 사용자 개체 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
-
-#: cps/admin.py:1139
-msgid "LDAP User Object Filter Has Unmatched Parenthesis"
-msgstr "LDAP 사용자 개체 필터에 일치하지 않는 괄호가 있습니다."
-
-#: cps/admin.py:1146
-#, python-format
-msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
-msgstr "LDAP 구성원 사용자 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
-
-#: cps/admin.py:1148
-msgid "LDAP Member User Filter Has Unmatched Parenthesis"
-msgstr "LDAP 구성원 사용자 필터에 일치하지 않는 괄호가 있습니다."
-
-#: cps/admin.py:1155
-msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
-msgstr "LDAP CACertificate, 인증서 또는 키 위치가 유효하지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
-#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
-msgid "Settings DB is not Writeable"
-msgstr "설정 DB에 쓰기 권한이 없습니다."
-
-#: cps/admin.py:1208
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "DB 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1223
-msgid "DB is not Writeable"
-msgstr "쓰기 권한이 없는 DB"
-
-#: cps/admin.py:1235
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "키 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1239
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "인증서 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1346
-msgid "Database Settings updated"
-msgstr "데이터베이스 설정이 업데이트 되었습니다"
-
-#: cps/admin.py:1354
-msgid "Database Configuration"
-msgstr "데이터베이스 구성"
-
-#: cps/admin.py:1370 cps/web.py:1479
-msgid "Please fill out all fields!"
-msgstr "모든 필드를 채워주십시오!"
-
-#: cps/admin.py:1378
-msgid "E-mail is not from valid domain"
-msgstr "이메일이 유효한 도메인에서 온 것이 아닙니다."
-
-#: cps/admin.py:1384 cps/admin.py:1534
-msgid "Add new user"
-msgstr "새 사용자 추가"
-
-#: cps/admin.py:1395
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "사용자 '%(user)s'이(가) 생성됨"
-
-#: cps/admin.py:1401
-msgid "Found an existing account for this e-mail address or name."
-msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
-
-#: cps/admin.py:1421
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "사용자 '%(nick)s'이(가) 삭제되었습니다."
-
-#: cps/admin.py:1423 cps/admin.py:1424
-msgid "Can't delete Guest User"
-msgstr "게스트 사용자는 삭제할 수 없습니다"
-
-#: cps/admin.py:1427
-msgid "No admin user remaining, can't delete user"
-msgstr "관리자 계정이 하나 뿐입니다. 이 관리자 권한을 삭제할 수 없습니다."
-
-#: cps/admin.py:1500 cps/admin.py:1625
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "사용자 %(nick)s 편집"
-
-#: cps/admin.py:1504
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "사용자 '%(nick)s'가 업데이트 되었습니다."
-
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
-msgid "An unknown error occurred. Please try again later."
-msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
-
-#: cps/admin.py:1543 cps/templates/admin.html:98
-msgid "Edit E-mail Server Settings"
-msgstr "이메일 서버 설정 편집"
-
-#: cps/admin.py:1562
-msgid "Gmail Account Verification Successful"
-msgstr "Gmail 계정 인증 성공"
-
-#: cps/admin.py:1588
-#, python-format
-msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr "%(email)s에 보내기 위해 대기 중인 테스트 전자 메일입니다. 결과는 작업을 확인하십시오."
-
-#: cps/admin.py:1591
-#, python-format
-msgid "There was an error sending the Test e-mail: %(res)s"
-msgstr "테스트 이메일을 보내는 동안 오류가 발생했습니다: %(res)s"
-
-#: cps/admin.py:1593
-msgid "Please configure your e-mail address first..."
-msgstr "먼저 이메일 주소를 구성하십시오..."
-
-#: cps/admin.py:1595
-msgid "E-mail server settings updated"
-msgstr "이메일 서버 설정 업데이트됨"
-
-#: cps/admin.py:1637
-#, python-format
-msgid "Password for user %(user)s reset"
-msgstr "사용자 %(user)s의 비밀번호 재설정"
-
-#: cps/admin.py:1643 cps/web.py:1444
-msgid "Please configure the SMTP mail settings first..."
-msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
-
-#: cps/admin.py:1654
-msgid "Logfile viewer"
-msgstr "로그 파일 뷰어"
-
-#: cps/admin.py:1720
-msgid "Requesting update package"
-msgstr "업데이트 패키지 요청"
-
-#: cps/admin.py:1721
-msgid "Downloading update package"
-msgstr "업데이트 패키지 다운로드"
-
-#: cps/admin.py:1722
-msgid "Unzipping update package"
-msgstr "업데이트 패키지 압축 풀기"
-
-#: cps/admin.py:1723
-msgid "Replacing files"
-msgstr "파일 교체"
-
-#: cps/admin.py:1724
-msgid "Database connections are closed"
-msgstr "데이터베이스 연결이 닫힙니다."
-
-#: cps/admin.py:1725
-msgid "Stopping server"
-msgstr "서버 중지"
-
-#: cps/admin.py:1726
-msgid "Update finished, please press okay and reload page"
-msgstr "업데이트가 완료되었습니다. 확인을 누르고 페이지를 새로고침하세요."
-
-#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
-#: cps/admin.py:1731 cps/admin.py:1732
-msgid "Update failed:"
-msgstr "업데이트 실패:"
-
-#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
-msgid "HTTP Error"
-msgstr "HTTP 오류"
-
-#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
-msgid "Connection error"
-msgstr "연결 오류"
-
-#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
-msgid "Timeout while establishing connection"
-msgstr "연결 설정 중 시간 초과"
-
-#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
-msgid "General error"
-msgstr "일반 오류"
-
-#: cps/admin.py:1731
-msgid "Update file could not be saved in temp dir"
-msgstr "임시 디렉토리에 업데이트 파일을 저장할 수 없습니다."
-
-#: cps/admin.py:1732
-msgid "Files could not be replaced during update"
-msgstr "업데이트하는 동안 파일을 교체할 수 없습니다."
-
-#: cps/admin.py:1756
-msgid "Failed to extract at least One LDAP User"
-msgstr "하나 이상의 LDAP 사용자를 추출하지 못했습니다."
-
-#: cps/admin.py:1801
-msgid "Failed to Create at Least One LDAP User"
-msgstr "하나 이상의 LDAP 사용자를 생성하지 못했습니다."
-
-#: cps/admin.py:1814
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "오류: %(ldaperror)s"
-
-#: cps/admin.py:1818
-msgid "Error: No user returned in response of LDAP server"
-msgstr "오류: LDAP 서버의 응답으로 사용자가 반환되지 않았습니다."
-
-#: cps/admin.py:1851
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "데이터베이스에서 하나 이상의 LDAP 사용자를 찾을 수 없습니다."
-
-#: cps/admin.py:1853
-msgid "{} User Successfully Imported"
-msgstr "{} 사용자 가져오기 성공"
-
-#: cps/converter.py:30
-msgid "not configured"
-msgstr "구성되지 않음"
-
-#: cps/converter.py:32
-msgid "Execution permissions missing"
-msgstr "실행 권한 누락"
-
-#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
-#, python-format
-msgid "Custom Column No.%(column)d is not existing in calibre database"
-msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다."
-
-#: cps/editbooks.py:300 cps/editbooks.py:302
-msgid "Book Format Successfully Deleted"
-msgstr "책 형식이 성공적으로 삭제되었습니다."
-
-#: cps/editbooks.py:309 cps/editbooks.py:311
-msgid "Book Successfully Deleted"
-msgstr "책이 성공적으로 삭제되었습니다."
-
-#: cps/editbooks.py:361
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
-#: cps/web.py:1744 cps/web.py:1811
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다."
-
-#: cps/editbooks.py:410
-msgid "edit metadata"
-msgstr "메타데이터 편집"
-
-#: cps/editbooks.py:458
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s은(는) 유효한 숫자가 아닙니다. 건너뜁니다."
-
-#: cps/editbooks.py:494 cps/editbooks.py:958
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "'%(langname)s'은(는) 유효한 언어가 아닙니다."
-
-#: cps/editbooks.py:634 cps/editbooks.py:985
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "파일 확장자 '%(ext)s'은(는) 이 서버에 업로드할 수 없습니다."
-
-#: cps/editbooks.py:638 cps/editbooks.py:989
-msgid "File to be uploaded must have an extension"
-msgstr "업로드할 파일에는 확장자가 있어야 합니다."
-
-#: cps/editbooks.py:650
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "%(path)s 경로를 생성하지 못했습니다(권한이 없음)."
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "%(file)s 파일을 저장하지 못했습니다."
-
-#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
-#, python-format
-msgid "Database error: %(error)s."
-msgstr "데이터베이스 오류: %(error)s."
-
-#: cps/editbooks.py:678
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "파일 형식 %(ext)s이(가) %(book)s에 추가되었습니다."
-
-#: cps/editbooks.py:814
-msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
-msgstr "식별자는 대소문자를 구분하지 않으며 이전 식별자를 덮어씁니다."
-
-#: cps/editbooks.py:848
-msgid "Metadata successfully updated"
-msgstr "메타데이터가 성공적으로 업데이트되었습니다."
-
-#: cps/editbooks.py:861
-msgid "Error editing book, please check logfile for details"
-msgstr "책을 수정하는 동안 오류가 발생했습니다. 자세한 내용은 로그 파일을 확인하세요."
-
-#: cps/editbooks.py:899
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "업로드한 책이 라이브러리에 있을 수 있습니다. 새로 업로드하기 전에 변경하는 것이 좋습니다."
-
-#: cps/editbooks.py:997
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr "파일 %(filename)s을(를) 임시 디렉토리에 저장할 수 없습니다."
-
-#: cps/editbooks.py:1016
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "표지 파일%(file)s를 이동하지 못했습니다.:%(error)s"
-
-#: cps/editbooks.py:1063
-#, python-format
-msgid "File %(file)s uploaded"
-msgstr "파일 %(file)s 업로드됨"
-
-#: cps/editbooks.py:1088
-msgid "Source or destination format for conversion missing"
-msgstr "변환을 위한 소스 또는 대상 형식이 누락되었습니다."
-
-#: cps/editbooks.py:1096
-#, python-format
-msgid "Book successfully queued for converting to %(book_format)s"
-msgstr "책이 %(book_format)s(으)로 변환하기 위해 대기 중입니다."
-
-#: cps/editbooks.py:1100
-#, python-format
-msgid "There was an error converting this book: %(res)s"
-msgstr "이 책을 변환하는 동안 오류가 발생했습니다: %(res)s"
-
-#: cps/gdrive.py:58
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr "Google 드라이브 설정이 완료되지 않았습니다. Google 드라이브를 비활성화했다가 다시 활성화해 보세요."
-
-#: cps/gdrive.py:95
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "콜백 도메인이 확인되지 않았습니다. 단계에 따라 Google 개발자 콘솔에서 도메인을 확인하세요."
-
-#: cps/helper.py:77
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "책 ID에 대한 %(format)s 형식을 찾을 수 없음: %(book)d"
-
-#: cps/helper.py:83 cps/tasks/convert.py:73
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "%(format)s을(를) Google 드라이브에서 찾을 수 없음: %(fn)s"
-
-#: cps/helper.py:88
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s을(를) 찾을 수 없음: %(fn)s"
-
-#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "킨들로 보내기"
-
-#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "이 이메일은 Calibre Web을 통해 전송되었습니다."
-
-#: cps/helper.py:109
-msgid "Calibre-Web test e-mail"
-msgstr "Calibre-Web 테스트 이메일"
-
-#: cps/helper.py:110
-msgid "Test e-mail"
-msgstr "테스트 이메일"
-
-#: cps/helper.py:127
-msgid "Get Started with Calibre-Web"
-msgstr "Calibre-Web 시작하기"
-
-#: cps/helper.py:132
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "사용자 등록 이메일: %(name)s"
-
-#: cps/helper.py:143 cps/helper.py:149
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr "%(orig)s를 %(format)s로 변환하고 킨들로 보내기"
-
-#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr "킨들에 %(format)s 보내기"
-
-#: cps/helper.py:216 cps/tasks/convert.py:90
-#, python-format
-msgid "%(book)s send to Kindle"
-msgstr "%(book)s을 킨들로 보내기"
-
-#: cps/helper.py:221
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "요청한 파일을 읽을 수 없습니다. 권한이 잘못되었을 수 있습니다."
-
-#: cps/helper.py:313
-#, python-format
-msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr "책 %(id)s에 대한 책 폴더를 삭제하지 못했습니다. 경로에 하위 폴더가 있습니다: %(path)s"
-
-#: cps/helper.py:319
-#, python-format
-msgid "Deleting book %(id)s failed: %(message)s"
-msgstr "%(id)s 도서 삭제 실패: %(message)s"
-
-#: cps/helper.py:330
-#, python-format
-msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
-msgstr "데이터베이스에서만 책 %(id)s 을(를) 삭제 중, 데이터베이스의 책 경로가 유효하지 않음: %(path)s"
-
-#: cps/helper.py:385
-#, 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:400
-#, 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:425 cps/helper.py:435 cps/helper.py:443
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "Google 드라이브에서 %(file)s 파일을 찾을 수 없습니다."
-
-#: cps/helper.py:464
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다."
-
-#: cps/helper.py:504 cps/web.py:1659
-msgid "Found an existing account for this e-mail address"
-msgstr "등록되어 있는 이메일 주소입니다."
-
-#: cps/helper.py:512
-msgid "This username is already taken"
-msgstr "등록되어 있는 username입니다."
-
-#: cps/helper.py:522
-msgid "Invalid e-mail address format"
-msgstr "이메일 주소 형식이 잘못되었습니다."
-
-#: cps/helper.py:595
-msgid "Error Downloading Cover"
-msgstr "표지 다운로드 중 오류 발생"
-
-#: cps/helper.py:598
-msgid "Cover Format Error"
-msgstr "표지 형식 오류"
-
-#: cps/helper.py:608
-msgid "Failed to create path for cover"
-msgstr "표지 경로 생성 실패"
-
-#: cps/helper.py:624
-msgid "Cover-file is not a valid image file, or could not be stored"
-msgstr "표지 파일이 유효한 이미지 파일이 아니거나 저장할 수 없습니다."
-
-#: cps/helper.py:635
-msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr "jpg/jpeg/png/webp/bmp 파일만 표지 파일로 지원됩니다."
-
-#: cps/helper.py:648
-msgid "Invalid cover file content"
-msgstr "잘못된 표지 파일 콘텐츠"
-
-#: cps/helper.py:652
-msgid "Only jpg/jpeg files are supported as coverfile"
-msgstr "jpg/jpeg 파일만 표지 파일로 지원됩니다."
-
-#: cps/helper.py:704
-msgid "Unrar binary file not found"
-msgstr "Unrar 바이너리 파일을 찾을 수 없습니다."
-
-#: cps/helper.py:715
-msgid "Error excecuting UnRar"
-msgstr "UnRar 실행 오류"
-
-#: cps/helper.py:763
-msgid "Waiting"
-msgstr "대기중"
-
-#: cps/helper.py:765
-msgid "Failed"
-msgstr "실패"
-
-#: cps/helper.py:767
-msgid "Started"
-msgstr "시작됨"
-
-#: cps/helper.py:769
-msgid "Finished"
-msgstr "종료"
-
-#: cps/helper.py:771
-msgid "Unknown Status"
-msgstr "알 수 없는 상태"
-
-#: cps/kobo_auth.py:127
-msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
-msgstr "kobo 장치에 대한 유효한 api_endpoint를 얻으려면 로컬 호스트가 아닌 곳에서 calibre-web에 액세스하십시오."
-
-#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
-msgid "Kobo Setup"
-msgstr "Kobo 설정"
-
-#: cps/oauth_bb.py:77
-#, python-format
-msgid "Register with %(provider)s"
-msgstr "%(provider)s에 등록"
-
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
-
-#: cps/oauth_bb.py:148
-#, python-format
-msgid "Link to %(oauth)s Succeeded"
-msgstr "%(oauth)s에 성공적으로 연결됨"
-
-#: cps/oauth_bb.py:155
-msgid "Login failed, No User Linked With OAuth Account"
-msgstr "로그인 실패, OAuth 계정과 연결된 사용자 없음"
-
-#: cps/oauth_bb.py:197
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr "%(oauth)s에 연결 해제 성공"
-
-#: cps/oauth_bb.py:202
-#, python-format
-msgid "Unlink to %(oauth)s Failed"
-msgstr "%(oauth)s에 연결 해제 실패"
-
-#: cps/oauth_bb.py:205
-#, python-format
-msgid "Not Linked to %(oauth)s"
-msgstr "%(oauth)s에 연결되지 않음"
-
-#: cps/oauth_bb.py:261
-msgid "Failed to log in with GitHub."
-msgstr "GitHub에 로그인하지 못했습니다."
-
-#: cps/oauth_bb.py:267
-msgid "Failed to fetch user info from GitHub."
-msgstr "GitHub에서 사용자 정보를 가져오지 못했습니다."
-
-#: cps/oauth_bb.py:279
-msgid "Failed to log in with Google."
-msgstr "구글 로그인에 실패했습니다."
-
-#: cps/oauth_bb.py:285
-msgid "Failed to fetch user info from Google."
-msgstr "Google에서 사용자 정보를 가져오지 못했습니다."
-
-#: cps/oauth_bb.py:332
-msgid "GitHub Oauth error, please retry later."
-msgstr "GitHub Oauth 오류입니다. 나중에 다시 시도하세요."
-
-#: cps/oauth_bb.py:335
-msgid "GitHub Oauth error: {}"
-msgstr "GitHub 인증 오류: {}"
-
-#: cps/oauth_bb.py:356
-msgid "Google Oauth error, please retry later."
-msgstr "Google 인증 오류입니다. 나중에 다시 시도하세요."
-
-#: cps/oauth_bb.py:359
-msgid "Google Oauth error: {}"
-msgstr "Google 인증 오류: {}"
-
-#: cps/opds.py:384
-msgid "{} Stars"
-msgstr "{} Stars"
-
-#: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
-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:416
-msgid "Books"
-msgstr "책"
-
-#: cps/render_template.py:41
-msgid "Show recent books"
-msgstr "최근 책 보기"
-
-#: cps/render_template.py:42 cps/templates/index.xml:25
-msgid "Hot Books"
-msgstr "인기있는 책"
-
-#: cps/render_template.py:44
-msgid "Show Hot Books"
-msgstr "주목받는 책 보기"
-
-#: cps/render_template.py:46 cps/render_template.py:51
-msgid "Downloaded Books"
-msgstr "다운로드된 책"
-
-#: cps/render_template.py:48 cps/render_template.py:53
-#: cps/templates/user_table.html:167
-msgid "Show Downloaded Books"
-msgstr "다운로드된 책 보기"
-
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
-msgid "Top Rated Books"
-msgstr "평점이 높은 책"
-
-#: cps/render_template.py:58 cps/templates/user_table.html:161
-msgid "Show Top Rated Books"
-msgstr "평점이 높은 책 보기"
-
-#: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:676
-msgid "Read Books"
-msgstr "읽은 책"
-
-#: cps/render_template.py:61
-msgid "Show read and unread"
-msgstr "읽은 책과 읽지 않은 책 보기"
-
-#: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:679
-msgid "Unread Books"
-msgstr "읽지 않은 책"
-
-#: cps/render_template.py:65
-msgid "Show unread"
-msgstr "읽지 않은 책 보기"
-
-#: cps/render_template.py:66
-msgid "Discover"
-msgstr "발견"
-
-#: cps/render_template.py:68 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
-msgid "Show Random Books"
-msgstr "무작위 추천"
-
-#: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1041
-msgid "Categories"
-msgstr "카테고리"
-
-#: cps/render_template.py:71 cps/templates/user_table.html:158
-msgid "Show category selection"
-msgstr "카테고리별 보기"
-
-#: cps/render_template.py:72 cps/templates/book_edit.html:90
-#: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
-msgid "Series"
-msgstr "시리즈"
-
-#: cps/render_template.py:74 cps/templates/user_table.html:157
-msgid "Show series selection"
-msgstr "시리즈별 보기"
-
-#: cps/render_template.py:75 cps/templates/book_table.html:66
-#: cps/templates/index.xml:69
-msgid "Authors"
-msgstr "저자"
-
-#: cps/render_template.py:77 cps/templates/user_table.html:160
-msgid "Show author selection"
-msgstr "저자별 보기"
-
-#: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:925
-msgid "Publishers"
-msgstr "출판사"
-
-#: cps/render_template.py:81 cps/templates/user_table.html:163
-msgid "Show publisher selection"
-msgstr "출판사별 보기"
-
-#: cps/render_template.py:82 cps/templates/book_table.html:70
-#: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1018
-msgid "Languages"
-msgstr "언어"
-
-#: cps/render_template.py:85 cps/templates/user_table.html:155
-msgid "Show language selection"
-msgstr "언어별 보기"
-
-#: cps/render_template.py:86 cps/templates/index.xml:104
-msgid "Ratings"
-msgstr "평점"
-
-#: cps/render_template.py:88 cps/templates/user_table.html:164
-msgid "Show ratings selection"
-msgstr "평점별 보기"
-
-#: cps/render_template.py:89 cps/templates/index.xml:112
-msgid "File formats"
-msgstr "파일 유형"
-
-#: cps/render_template.py:91 cps/templates/user_table.html:165
-msgid "Show file formats selection"
-msgstr "파일 유형별 보기"
-
-#: cps/render_template.py:93 cps/web.py:703
-msgid "Archived Books"
-msgstr "보관된 책"
-
-#: cps/render_template.py:95 cps/templates/user_table.html:166
-msgid "Show archived books"
-msgstr "보관된 책 보기"
-
-#: cps/render_template.py:97 cps/web.py:780
-msgid "Books List"
-msgstr "책 목록"
-
-#: cps/render_template.py:99 cps/templates/user_table.html:168
-msgid "Show Books List"
-msgstr "책 목록 보기"
-
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "잘못된 책장 지정"
-
-#: cps/shelf.py:73
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "죄송합니다. 해당 책장에 책을 추가할 권한이 없습니다."
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "책이 이미 책장에 등록됨: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "책장에 책이 등록됨: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr "책장에 책을 추가할 권한이 없습니다."
-
-#: 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:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "책장에 책을 추가할 수 없음: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "책이 책장에서 삭제됨: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다."
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "책장 추가"
-
-#: cps/shelf.py:237
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "죄송합니다. 이 책장을 편집할 권한이 없습니다."
-
-#: cps/shelf.py:239
-msgid "Edit a shelf"
-msgstr "책장 편집"
-
-#: cps/shelf.py:249
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr "죄송합니다. 이 공개 책장을 만들 권한이 없습니다."
-
-#: cps/shelf.py:262
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "%(title)s 책장이 추가됨"
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "%(title)s 책장이 변경됨"
-
-#: cps/shelf.py:279
-msgid "There was an error"
-msgstr "오류가 발생하였습니다."
-
-#: cps/shelf.py:301
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "이름이 '%(title)s'인 공개 책장이 이미 있습니다."
-
-#: cps/shelf.py:312
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "이름이 '%(title)s'인 개인 책장이 이미 있습니다."
-
-#: cps/shelf.py:333
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "책이 성공적으로 삭제되었습니다."
-
-#: cps/shelf.py:382
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "책장 순서 변경: '%(name)s'"
-
-#: cps/shelf.py:452
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "책장: '%(name)s'"
-
-#: cps/shelf.py:456
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
-
-#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
-msgid "Unexpected data while reading update information"
-msgstr "업데이트 정보를 읽는 동안 예기치 않은 데이터"
-
-#: cps/updater.py:410 cps/updater.py:521
-msgid "No update available. You already have the latest version installed"
-msgstr "업데이트가 없습니다. 이미 최신 버전이 설치되어 있습니다."
-
-#: cps/updater.py:428
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
-
-#: cps/updater.py:446
-msgid "Could not fetch update information"
-msgstr "업데이트 정보를 가져올 수 없습니다"
-
-#: cps/updater.py:456
-msgid "Click on the button below to update to the latest stable version."
-msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
-
-#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
-#, 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:507
-msgid "No release information available"
-msgstr "출시 정보가 없습니다"
-
-#: cps/templates/index.html:5 cps/web.py:440
-msgid "Discover (Random Books)"
-msgstr "발견(무작위 도서)"
-
-#: cps/web.py:471
-msgid "Hot Books (Most Downloaded)"
-msgstr "인기있는 책(가장 많이 다운로드됨)"
-
-#: cps/web.py:507
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "%(user)s이(가) 다운로드한 책"
-
-#: cps/web.py:539
-#, python-format
-msgid "Author: %(name)s"
-msgstr "저자: %(name)s"
-
-#: cps/web.py:554
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "출판사: %(name)s"
-
-#: cps/web.py:569
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "시리즈: %(serie)s"
-
-#: cps/web.py:582
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "평가: %(rating)s 별"
-
-#: cps/web.py:597
-#, python-format
-msgid "File format: %(format)s"
-msgstr "파일 유형: %(format)s"
-
-#: cps/web.py:615
-#, python-format
-msgid "Category: %(name)s"
-msgstr "카테고리: %(name)s"
-
-#: cps/web.py:631
-#, python-format
-msgid "Language: %(name)s"
-msgstr "언어: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
-msgid "Advanced Search"
-msgstr "상세 검색"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1077
-msgid "Search"
-msgstr "검색"
-
-#: cps/templates/admin.html:16 cps/web.py:903
-msgid "Downloads"
-msgstr "다운로드"
-
-#: cps/web.py:980
-msgid "Ratings list"
-msgstr "평점 목록"
-
-#: cps/web.py:1001
-msgid "File formats list"
-msgstr "파일 유형 목록"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
-msgid "Tasks"
-msgstr "작업"
-
-#: cps/web.py:1215
-msgid "Published after "
-msgstr "Published after"
-
-#: cps/web.py:1222
-msgid "Published before "
-msgstr "Published before"
-
-#: cps/web.py:1244
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "평점 <= %(rating)s"
-
-#: cps/web.py:1246
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "평점 >= %(rating)s"
-
-#: cps/web.py:1248
-#, python-format
-msgid "Read Status = %(status)s"
-msgstr "읽은 상태 = %(status)s"
-
-#: cps/web.py:1353
-msgid "Error on search for custom columns, please restart Calibre-Web"
-msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오."
-
-#: cps/web.py:1449
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다."
-
-#: cps/web.py:1453
-#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
-msgstr "책을 보내는 중에 오류 발생: %(res)s"
-
-#: cps/web.py:1455
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
-msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
-
-#: cps/web.py:1472
-msgid "E-Mail server is not configured, please contact your administrator!"
-msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
-
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
-#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
-#: cps/web.py:1515
-msgid "Register"
-msgstr "등록"
-
-#: cps/web.py:1507
-msgid "Your e-mail is not allowed to register"
-msgstr "이메일을 등록할 수 없습니다."
-
-#: cps/web.py:1510
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr "확인을 위한 이메일이 발송되었습니다."
-
-#: cps/web.py:1524
-msgid "Cannot activate LDAP authentication"
-msgstr "LDAP 인증을 활성화할 수 없습니다."
-
-#: cps/web.py:1543
-#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
-msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
-
-#: cps/web.py:1549
-#, python-format
-msgid "Could not login: %(message)s"
-msgstr "로그인 실패: %(message)s"
-
-#: cps/web.py:1553 cps/web.py:1578
-msgid "Wrong Username or Password"
-msgstr "잘못된 사용자명 또는 비밀번호"
-
-#: cps/web.py:1560
-msgid "New Password was send to your email address"
-msgstr "새 비밀번호가 이메일로 전송되었습니다."
-
-#: cps/web.py:1566
-msgid "Please enter valid username to reset password"
-msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오."
-
-#: cps/web.py:1573
-#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
-msgstr "로그인을 할 수 없음: '%(nickname)s"
-
-#: cps/web.py:1639 cps/web.py:1688
-#, python-format
-msgid "%(name)s's profile"
-msgstr "%(name)s 프로필"
-
-#: cps/web.py:1655
-msgid "Profile updated"
-msgstr "프로필이 업데이트 됨"
-
-#: cps/services/gmail.py:58
-msgid "Found no valid gmail.json file with OAuth information"
-msgstr "인증 정보가 포함된 유효한 gmail.json 파일을 찾을 수 없습니다."
-
-#: cps/tasks/convert.py:137
-#, python-format
-msgid "Calibre ebook-convert %(tool)s not found"
-msgstr "Calibre ebook-convert %(tool)s을(를) 찾을 수 없습니다."
-
-#: cps/tasks/convert.py:163
-#, python-format
-msgid "%(format)s format not found on disk"
-msgstr "%(format)s 형식을 찾을 수 없습니다."
-
-#: cps/tasks/convert.py:167
-msgid "Ebook converter failed with unknown error"
-msgstr "알 수 없는 오류로 인해 전자책 변환이 실패했습니다."
-
-#: cps/tasks/convert.py:177
-#, python-format
-msgid "Kepubify-converter failed: %(error)s"
-msgstr "Kepubify 변환 실패: %(error)s"
-
-#: cps/tasks/convert.py:199
-#, python-format
-msgid "Converted file not found or more than one file in folder %(folder)s"
-msgstr "변환된 파일을 찾을 수 없거나 %(folder)s 폴더에 하나 이상의 파일이 존재합니다."
-
-#: cps/tasks/convert.py:222
-#, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "\"전자책 변환 실패: %(error)s"
-
-#: cps/tasks/convert.py:245
-#, 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:13 cps/templates/login.html:9
-#: cps/templates/login.html:10 cps/templates/register.html:9
-#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
-msgid "Username"
-msgstr "사용자명"
-
-#: cps/templates/admin.html:14 cps/templates/register.html:14
-#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
-msgstr "이메일 주소"
-
-#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to Kindle E-mail Address"
-msgstr "킨들로 보내기 이메일 주소"
-
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
-#: cps/templates/user_table.html:143
-msgid "Admin"
-msgstr "관리자"
-
-#: cps/templates/admin.html:18 cps/templates/login.html:13
-#: cps/templates/login.html:14 cps/templates/user_edit.html:23
-msgid "Password"
-msgstr "비밀번호"
-
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "업로드"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
-#: cps/templates/user_table.html:146
-msgid "Download"
-msgstr "다운로드"
-
-#: cps/templates/admin.html:23
-msgid "View Books"
-msgstr "책 보기"
-
-#: cps/templates/admin.html:24 cps/templates/user_table.html:131
-#: cps/templates/user_table.html:148
-msgid "Edit"
-msgstr "편집"
-
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
-#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
-#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
-#: cps/templates/user_table.html:149
-msgid "Delete"
-msgstr "삭제"
-
-#: cps/templates/admin.html:26
-msgid "Public Shelf"
-msgstr "공개 책장"
-
-#: cps/templates/admin.html:51
-msgid "Add New User"
-msgstr "사용자 추가"
-
-#: cps/templates/admin.html:53
-msgid "Import LDAP Users"
-msgstr "LDAP 사용자 가져오기"
-
-#: cps/templates/admin.html:60
-msgid "E-mail Server Settings"
-msgstr "이메일 서버 설정"
-
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
-msgid "SMTP Hostname"
-msgstr "SMTP Hostname"
-
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
-msgid "SMTP Port"
-msgstr "SMTP Port"
-
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
-msgid "Encryption"
-msgstr "암호화"
-
-#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
-msgid "SMTP Login"
-msgstr "SMTP Login"
-
-#: cps/templates/admin.html:81 cps/templates/admin.html:92
-#: cps/templates/email_edit.html:55
-msgid "From E-mail"
-msgstr "From E-mail"
-
-#: cps/templates/admin.html:88
-msgid "E-Mail Service"
-msgstr "E-Mail Service"
-
-#: cps/templates/admin.html:89
-msgid "Gmail via Oauth2"
-msgstr "Gmail via Oauth2"
-
-#: cps/templates/admin.html:104
-msgid "Configuration"
-msgstr "환경 설정"
-
-#: cps/templates/admin.html:107
-msgid "Calibre Database Directory"
-msgstr "Calibre DB 폴더"
-
-#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
-msgid "Log Level"
-msgstr "Log Level"
-
-#: cps/templates/admin.html:115
-msgid "Port"
-msgstr "Port"
-
-#: cps/templates/admin.html:120
-msgid "External Port"
-msgstr "External Port"
-
-#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
-msgid "Books per Page"
-msgstr "페이지당 보여 줄 책 수"
-
-#: cps/templates/admin.html:131
-msgid "Uploads"
-msgstr "업로드"
-
-#: cps/templates/admin.html:135
-msgid "Anonymous Browsing"
-msgstr "익명 보기"
-
-#: cps/templates/admin.html:139
-msgid "Public Registration"
-msgstr "공개 등록"
-
-#: cps/templates/admin.html:143
-msgid "Magic Link Remote Login"
-msgstr "Magic Link Remote Login"
-
-#: cps/templates/admin.html:147
-msgid "Reverse Proxy Login"
-msgstr "Reverse Proxy Login"
-
-#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
-msgid "Reverse Proxy Header Name"
-msgstr "Reverse Proxy Header Name"
-
-#: cps/templates/admin.html:157
-msgid "Edit Calibre Database Configuration"
-msgstr "Calibre Database 환경 설정 편집"
-
-#: cps/templates/admin.html:158
-msgid "Edit Basic Configuration"
-msgstr "기본 환경 설정 편집"
-
-#: cps/templates/admin.html:159
-msgid "Edit UI Configuration"
-msgstr "UI 환경 설정 편집"
-
-#: cps/templates/admin.html:164
-msgid "Administration"
-msgstr "관리"
-
-#: cps/templates/admin.html:165
-msgid "Download Debug Package"
-msgstr "Debug Package 다운로드"
-
-#: cps/templates/admin.html:166
-msgid "View Logs"
-msgstr "로그 보기"
-
-#: cps/templates/admin.html:169
-msgid "Reconnect Calibre Database"
-msgstr "Calibre DB 다시 연결"
-
-#: cps/templates/admin.html:170
-msgid "Restart"
-msgstr "재시작"
-
-#: cps/templates/admin.html:171
-msgid "Shutdown"
-msgstr "종료"
-
-#: cps/templates/admin.html:176
-msgid "Update"
-msgstr "업데이트"
-
-#: cps/templates/admin.html:180
-msgid "Version"
-msgstr "버전"
-
-#: cps/templates/admin.html:181
-msgid "Details"
-msgstr "세부 정보"
-
-#: cps/templates/admin.html:187
-msgid "Current version"
-msgstr "현재 버전"
-
-#: cps/templates/admin.html:194
-msgid "Check for Update"
-msgstr "업데이트 확인"
-
-#: cps/templates/admin.html:195
-msgid "Perform Update"
-msgstr "업데이트 실행"
-
-#: cps/templates/admin.html:208
-msgid "Are you sure you want to restart?"
-msgstr "재시작을 하시겠습니까?"
-
-#: cps/templates/admin.html:213 cps/templates/admin.html:227
-#: cps/templates/admin.html:247 cps/templates/config_db.html:70
-msgid "OK"
-msgstr "예"
-
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
-#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
-#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
-#: cps/templates/user_edit.html:144
-msgid "Cancel"
-msgstr "취소"
-
-#: cps/templates/admin.html:226
-msgid "Are you sure you want to shutdown?"
-msgstr "종료를 하시겠습니까?"
-
-#: cps/templates/admin.html:238
-msgid "Updating, please do not reload this page"
-msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
-
-#: cps/templates/author.html:15
-msgid "via"
-msgstr "via"
-
-#: cps/templates/author.html:23
-msgid "In Library"
-msgstr "In Library"
-
-#: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:19
-msgid "Sort according to book date, newest first"
-msgstr "책 목록 정렬, 최신순"
-
-#: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:20
-msgid "Sort according to book date, oldest first"
-msgstr "책 목록 정렬, 오래된 순"
-
-#: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:21
-msgid "Sort title in alphabetical order"
-msgstr "가나다 순 정렬"
-
-#: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:22
-msgid "Sort title in reverse alphabetical order"
-msgstr "가나다 역순 정렬"
-
-#: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:25
-msgid "Sort according to publishing date, newest first"
-msgstr "발행일 순으로 정렬, 최신순"
-
-#: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:26
-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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:54
-msgid "reduce"
-msgstr "reduce"
-
-#: cps/templates/author.html:101
-msgid "More by"
-msgstr "More by"
-
-#: 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:29
-msgid "Convert from:"
-msgstr "변경전 유형:"
-
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
-msgid "select an option"
-msgstr "옵션 선택"
-
-#: cps/templates/book_edit.html:36
-msgid "Convert to:"
-msgstr "변경후 유형:"
-
-#: cps/templates/book_edit.html:45
-msgid "Convert book"
-msgstr "책 변경"
-
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
-msgid "Book Title"
-msgstr "책 제목"
-
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
-msgid "Author"
-msgstr "저자"
-
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
-msgid "Description"
-msgstr "책 소개"
-
-#: cps/templates/book_edit.html:72
-msgid "Identifiers"
-msgstr "식별자"
-
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
-msgid "Identifier Type"
-msgstr "식별자 유형"
-
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
-msgid "Identifier Value"
-msgstr "식별자 값"
-
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
-#: cps/templates/user_table.html:24
-msgid "Remove"
-msgstr "삭제"
-
-#: cps/templates/book_edit.html:82
-msgid "Add Identifier"
-msgstr "식별자 추가"
-
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
-msgid "Tags"
-msgstr "태그"
-
-#: cps/templates/book_edit.html:94
-msgid "Series ID"
-msgstr "시리즈 ID"
-
-#: cps/templates/book_edit.html:98
-msgid "Rating"
-msgstr "평점"
-
-#: cps/templates/book_edit.html:103
-msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
-msgstr "URL로 표지 추가(JPEG - 이미지를 다운로드 하여 DB에 저장합니다)"
-
-#: cps/templates/book_edit.html:107
-msgid "Upload Cover from Local Disk"
-msgstr "로컬 디스크에서 표지 업로드"
-
-#: cps/templates/book_edit.html:112
-msgid "Published Date"
-msgstr "출간일"
-
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
-#: cps/templates/search_form.html:16
-msgid "Publisher"
-msgstr "출판사"
-
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
-#: cps/templates/user_edit.html:33
-msgid "Language"
-msgstr "언어"
-
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
-#: cps/templates/search_form.html:164
-msgid "Yes"
-msgstr "예"
-
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
-#: cps/templates/search_form.html:165
-msgid "No"
-msgstr "아니오"
-
-#: cps/templates/book_edit.html:200
-msgid "Upload Format"
-msgstr "업로드 유형"
-
-#: cps/templates/book_edit.html:208
-msgid "View Book on Save"
-msgstr "저장 후 책 보기"
-
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
-msgid "Fetch Metadata"
-msgstr "메타정보 가져오기"
-
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
-msgid "Save"
-msgstr "저장"
-
-#: cps/templates/book_edit.html:232
-msgid "Keyword"
-msgstr "키워드"
-
-#: cps/templates/book_edit.html:233
-msgid "Search keyword"
-msgstr "키워드 검색"
-
-#: cps/templates/book_edit.html:239
-msgid "Click the cover to load metadata to the form"
-msgstr "표지를 클릭하여 양식에 메타데이터 로드"
-
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
-msgid "Loading..."
-msgstr "불러오는 중..."
-
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:163
-msgid "Close"
-msgstr "닫기"
-
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
-msgid "Source"
-msgstr "출처"
-
-#: cps/templates/book_edit.html:286
-msgid "Search error!"
-msgstr "오류 검색!"
-
-#: cps/templates/book_edit.html:287
-msgid "No Result(s) found! Please try another keyword."
-msgstr "검색 결과가 없습니다! 다른 키워드를 시도하십시오."
-
-#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
-#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
-#: cps/templates/user_table.html:100
-msgid "This Field is Required"
-msgstr "이 필드는 필수 항목입니다."
-
-#: cps/templates/book_table.html:37
-msgid "Merge selected books"
-msgstr "선택한 책 병합"
-
-#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
-msgid "Remove Selections"
-msgstr "선택 제거"
-
-#: cps/templates/book_table.html:41
-msgid "Exchange author and title"
-msgstr "저자 및 제목 교환"
-
-#: cps/templates/book_table.html:47
-msgid "Update Title Sort automatically"
-msgstr "자동으로 제목 정렬 업데이트"
-
-#: cps/templates/book_table.html:51
-msgid "Update Author Sort automatically"
-msgstr "자동으로 작성자 정렬 업데이트"
-
-#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
-msgid "Enter Title"
-msgstr "제목 입력"
-
-#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
-#: cps/templates/shelf_edit.html:8
-msgid "Title"
-msgstr "제목"
-
-#: cps/templates/book_table.html:64
-msgid "Enter Title Sort"
-msgstr "제목 정렬 입력"
-
-#: cps/templates/book_table.html:64
-msgid "Title Sort"
-msgstr "제목 정렬"
-
-#: cps/templates/book_table.html:65
-msgid "Enter Author Sort"
-msgstr "저자 정렬 입력"
-
-#: cps/templates/book_table.html:65
-msgid "Author Sort"
-msgstr "저자 정렬"
-
-#: cps/templates/book_table.html:66
-msgid "Enter Authors"
-msgstr "저자 입력"
-
-#: cps/templates/book_table.html:67
-msgid "Enter Categories"
-msgstr "카테고리 입력"
-
-#: cps/templates/book_table.html:68
-msgid "Enter Series"
-msgstr "시리즈 입력"
-
-#: cps/templates/book_table.html:69
-msgid "Series Index"
-msgstr "시리즈 색인"
-
-#: cps/templates/book_table.html:70
-msgid "Enter Languages"
-msgstr "언어 입력"
-
-#: cps/templates/book_table.html:71
-msgid "Publishing Date"
-msgstr "출간일"
-
-#: cps/templates/book_table.html:72
-msgid "Enter Publishers"
-msgstr "출판사 입력"
-
-#: cps/templates/book_table.html:73
-msgid "Enter comments"
-msgstr "코멘트 입력"
-
-#: cps/templates/book_table.html:73
-msgid "Comments"
-msgstr "코멘트"
-
-#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
-#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
-#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
-#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
-msgid "Enter "
-msgstr "입력"
-
-#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
-msgid "Are you really sure?"
-msgstr "정말 확신합니까?"
-
-#: cps/templates/book_table.html:114
-msgid "Books with Title will be merged from:"
-msgstr "제목이 있는 책은 다음에서 병합됩니다."
-
-#: cps/templates/book_table.html:118
-msgid "Into Book with Title:"
-msgstr "제목이 있는 책으로:"
-
-#: cps/templates/book_table.html:123
-msgid "Merge"
-msgstr "병합"
-
-#: cps/templates/config_db.html:12
-msgid "Location of Calibre Database"
-msgstr "Calibre Database 위치"
-
-#: cps/templates/config_db.html:22
-msgid "Use Google Drive?"
-msgstr "Google 드라이브를 사용하시겠습니까?"
-
-#: cps/templates/config_db.html:27
-msgid "Authenticate Google Drive"
-msgstr "구글 드라이브 인증"
-
-#: cps/templates/config_db.html:32
-msgid "Google Drive Calibre folder"
-msgstr "Google Drive Calibre 폴더"
-
-#: cps/templates/config_db.html:40
-msgid "Metadata Watch Channel ID"
-msgstr "Metadata Watch Channel ID"
-
-#: cps/templates/config_db.html:43
-msgid "Revoke"
-msgstr "취소"
-
-#: cps/templates/config_db.html:68
-msgid "New db location is invalid, please enter valid path"
-msgstr "새 db 위치가 잘못되었습니다. 올바른 경로를 입력하십시오."
-
-#: cps/templates/config_edit.html:18
-msgid "Server Configuration"
-msgstr "서버 구성"
-
-#: cps/templates/config_edit.html:25
-msgid "Server Port"
-msgstr "Server Port"
-
-#: cps/templates/config_edit.html:28
-msgid "SSL certfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL 인증서 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
-
-#: cps/templates/config_edit.html:35
-msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL 키 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
-
-#: cps/templates/config_edit.html:43
-msgid "Update Channel"
-msgstr "업데이트 취소"
-
-#: cps/templates/config_edit.html:45
-msgid "Stable"
-msgstr "안정버전"
-
-#: cps/templates/config_edit.html:46
-msgid "Nightly"
-msgstr "실험버전"
-
-#: cps/templates/config_edit.html:50
-msgid "Trusted Hosts (Comma Separated)"
-msgstr "신뢰할 수 있는 호스트(쉼표로 구분)"
-
-#: cps/templates/config_edit.html:61
-msgid "Logfile Configuration"
-msgstr "Logfile 설정"
-
-#: cps/templates/config_edit.html:77
-msgid "Location and name of logfile (calibre-web.log for no entry)"
-msgstr "로그 파일의 위치 및 이름(항목이 없는 경우 calibre-web.log)"
-
-#: cps/templates/config_edit.html:82
-msgid "Enable Access Log"
-msgstr "액세스 로그 활성화"
-
-#: cps/templates/config_edit.html:85
-msgid "Location and name of access logfile (access.log for no entry)"
-msgstr "액세스 로그 파일의 위치 및 이름(항목이 없는 경우 access.log)"
-
-#: cps/templates/config_edit.html:96
-msgid "Feature Configuration"
-msgstr "기능 설정"
-
-#: cps/templates/config_edit.html:104
-msgid "Convert non-English characters in title and author while saving to disk"
-msgstr "제목과 저자가 영어가 아닌 경우 원어로 저장하기"
-
-#: cps/templates/config_edit.html:108
-msgid "Enable Uploads"
-msgstr "업로드 활성화"
-
-#: cps/templates/config_edit.html:108
-msgid "(Please ensure users having also upload rights)"
-msgstr "(사용자에게 업로드 권한도 있는지 확인하십시오)"
-
-#: cps/templates/config_edit.html:112
-msgid "Allowed Upload Fileformats"
-msgstr "허용된 업로드 파일 형식"
-
-#: cps/templates/config_edit.html:118
-msgid "Enable Anonymous Browsing"
-msgstr "익명 탐색 활성화"
-
-#: cps/templates/config_edit.html:122
-msgid "Enable Public Registration"
-msgstr "공개 등록 활성화"
-
-#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
-msgstr "이메일을 사용자 이름으로 사용"
-
-#: cps/templates/config_edit.html:132
-msgid "Enable Magic Link Remote Login"
-msgstr "Enable Magic Link Remote Login"
-
-#: cps/templates/config_edit.html:137
-msgid "Enable Kobo sync"
-msgstr "Kobo sync 활성화"
-
-#: cps/templates/config_edit.html:142
-msgid "Proxy unknown requests to Kobo Store"
-msgstr "Kobo Store에 알 수 없는 요청 프록시"
-
-#: cps/templates/config_edit.html:145
-msgid "Server External Port (for port forwarded API calls)"
-msgstr "서버 외부 포트(포트 전달 API 호출용)"
-
-#: cps/templates/config_edit.html:153
-msgid "Use Goodreads"
-msgstr "Goodreads 사용"
-
-#: cps/templates/config_edit.html:154
-msgid "Create an API Key"
-msgstr "API 키 생성"
-
-#: cps/templates/config_edit.html:158
-msgid "Goodreads API Key"
-msgstr "Goodreads API Key"
-
-#: cps/templates/config_edit.html:162
-msgid "Goodreads API Secret"
-msgstr "Goodreads API Secret"
-
-#: cps/templates/config_edit.html:169
-msgid "Allow Reverse Proxy Authentication"
-msgstr "역방향 프록시 인증 허용"
-
-#: cps/templates/config_edit.html:180
-msgid "Login type"
-msgstr "로그인 유형"
-
-#: cps/templates/config_edit.html:182
-msgid "Use Standard Authentication"
-msgstr "표준 인증 사용"
-
-#: cps/templates/config_edit.html:184
-msgid "Use LDAP Authentication"
-msgstr "LDAP 인증 사용"
-
-#: cps/templates/config_edit.html:187
-msgid "Use OAuth"
-msgstr "OAuth 사용"
-
-#: cps/templates/config_edit.html:194
-msgid "LDAP Server Host Name or IP Address"
-msgstr "LDAP 서버 호스트 이름 또는 IP 주소"
-
-#: cps/templates/config_edit.html:198
-msgid "LDAP Server Port"
-msgstr "LDAP 서버 포트"
-
-#: cps/templates/config_edit.html:202
-msgid "LDAP Encryption"
-msgstr "LDAP 암호화"
-
-#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
-#: cps/templates/email_edit.html:41
-msgid "None"
-msgstr "None"
-
-#: cps/templates/config_edit.html:205
-msgid "TLS"
-msgstr "TLS"
-
-#: cps/templates/config_edit.html:206
-msgid "SSL"
-msgstr "SSL"
-
-#: cps/templates/config_edit.html:210
-msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP CACertificate 경로(클라이언트 인증서 인증에만 필요)"
-
-#: cps/templates/config_edit.html:217
-msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP 인증서 경로(클라이언트 인증서 인증에만 필요)"
-
-#: cps/templates/config_edit.html:224
-msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP 키 파일 경로(클라이언트 인증서 인증에만 필요)"
-
-#: cps/templates/config_edit.html:233
-msgid "LDAP Authentication"
-msgstr "LDAP 인증"
-
-#: cps/templates/config_edit.html:235
-msgid "Anonymous"
-msgstr "익명"
-
-#: cps/templates/config_edit.html:236
-msgid "Unauthenticated"
-msgstr "인증되지 않음"
-
-#: cps/templates/config_edit.html:237
-msgid "Simple"
-msgstr "Simple"
-
-#: cps/templates/config_edit.html:242
-msgid "LDAP Administrator Username"
-msgstr "LDAP 관리자 사용자 이름"
-
-#: cps/templates/config_edit.html:248
-msgid "LDAP Administrator Password"
-msgstr "LDAP 관리자 비밀번호"
-
-#: cps/templates/config_edit.html:253
-msgid "LDAP Distinguished Name (DN)"
-msgstr "LDAP 고유 이름(DN)"
-
-#: cps/templates/config_edit.html:257
-msgid "LDAP User Object Filter"
-msgstr "LDAP 사용자 개체 필터"
-
-#: cps/templates/config_edit.html:262
-msgid "LDAP Server is OpenLDAP?"
-msgstr "LDAP 서버는 OpenLDAP입니까?"
-
-#: cps/templates/config_edit.html:264
-msgid "Following Settings are Needed For User Import"
-msgstr "사용자 가져오기에는 다음 설정이 필요합니다."
-
-#: cps/templates/config_edit.html:266
-msgid "LDAP Group Object Filter"
-msgstr "LDAP 그룹 개체 필터"
-
-#: cps/templates/config_edit.html:270
-msgid "LDAP Group Name"
-msgstr "DAP 그룹 이름"
-
-#: cps/templates/config_edit.html:274
-msgid "LDAP Group Members Field"
-msgstr "LDAP 그룹 구성원 필드"
-
-#: cps/templates/config_edit.html:278
-msgid "LDAP Member User Filter Detection"
-msgstr "LDAP 구성원 사용자 필터 감지"
-
-#: cps/templates/config_edit.html:280
-msgid "Autodetect"
-msgstr "자동 감지"
-
-#: cps/templates/config_edit.html:281
-msgid "Custom Filter"
-msgstr "맞춤 필터"
-
-#: cps/templates/config_edit.html:286
-msgid "LDAP Member User Filter"
-msgstr "LDAP 구성원 사용자 필터"
-
-#: cps/templates/config_edit.html:297
-#, python-format
-msgid "Obtain %(provider)s OAuth Credential"
-msgstr "%(provider)s OAuth 자격 증명 얻기"
-
-#: cps/templates/config_edit.html:300
-#, python-format
-msgid "%(provider)s OAuth Client Id"
-msgstr "%(provider)s OAuth 클라이언트 ID"
-
-#: cps/templates/config_edit.html:304
-#, python-format
-msgid "%(provider)s OAuth Client Secret"
-msgstr "%(provider)s OAuth 클라이언트 암호"
-
-#: cps/templates/config_edit.html:320
-msgid "External binaries"
-msgstr "외부 바이너리"
-
-#: cps/templates/config_edit.html:326
-msgid "Path to Calibre E-Book Converter"
-msgstr "Calibre E-Book 변환기 경로"
-
-#: cps/templates/config_edit.html:334
-msgid "Calibre E-Book Converter Settings"
-msgstr "Calibre E-Book 변환기 경로 설정"
-
-#: cps/templates/config_edit.html:337
-msgid "Path to Kepubify E-Book Converter"
-msgstr "Kepubify 전자책 변환기 경로"
-
-#: cps/templates/config_edit.html:345
-msgid "Location of Unrar binary"
-msgstr "Unrar 바이너리의 위치"
-
-#: cps/templates/config_view_edit.html:17
-msgid "View Configuration"
-msgstr "환경 설정 보기"
-
-#: cps/templates/config_view_edit.html:32
-msgid "No. of Random Books to Display"
-msgstr "랜덤 보기시 표시할 책 수"
-
-#: cps/templates/config_view_edit.html:36
-msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
-msgstr "숨기기 전에 표시할 저자 수(0=숨기기 비활성화)"
-
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
-msgid "Theme"
-msgstr "테마"
-
-#: cps/templates/config_view_edit.html:42
-msgid "Standard Theme"
-msgstr "기본 테마"
-
-#: cps/templates/config_view_edit.html:43
-msgid "caliBlur! Dark Theme"
-msgstr "caliBlur! 다크 모드"
-
-#: cps/templates/config_view_edit.html:47
-msgid "Regular Expression for Ignoring Columns"
-msgstr "열을 무시하는 정규식"
-
-#: cps/templates/config_view_edit.html:51
-msgid "Link Read/Unread Status to Calibre Column"
-msgstr "읽음/읽지 않음 상태를 Calibre 열에 연결"
-
-#: cps/templates/config_view_edit.html:60
-msgid "View Restrictions based on Calibre column"
-msgstr "Calibre 열을 기반으로 한 보기 제한"
-
-#: cps/templates/config_view_edit.html:69
-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:96
-msgid "Admin User"
-msgstr "관리자"
-
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
-msgid "Allow Downloads"
-msgstr "다운로드 허용"
-
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
-msgid "Allow eBook Viewer"
-msgstr "책 보기 허용"
-
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
-msgid "Allow Uploads"
-msgstr "업로드 허용"
-
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
-msgid "Allow Edit"
-msgstr "편집 허용"
-
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
-msgid "Allow Delete Books"
-msgstr "책 삭제 허용"
-
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
-msgid "Allow Changing Password"
-msgstr "비밀번호 변경 허용"
-
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
-msgid "Allow Editing Public Shelves"
-msgstr "공개 서재 편집 허용"
-
-#: cps/templates/config_view_edit.html:123
-msgid "Default Language"
-msgstr "기본 언어"
-
-#: cps/templates/config_view_edit.html:131
-msgid "Default Visible Language of Books"
-msgstr "책의 기본 표시 언어"
-
-#: cps/templates/config_view_edit.html:147
-msgid "Default Visibilities for New Users"
-msgstr "신규 사용자를 위한 기본 기능"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
-#: cps/templates/user_table.html:154
-msgid "Show Random Books in Detail View"
-msgstr "상세 보기에서 임의의 책 표시"
-
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
-msgid "Add Allowed/Denied Tags"
-msgstr "허용/거부 태그 추가"
-
-#: cps/templates/config_view_edit.html:166
-msgid "Add Allowed/Denied custom column values"
-msgstr "허용/거부 사용자 정의 열 값 추가"
-
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
-msgid "Read in Browser"
-msgstr "부라우저에서 보기"
-
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
-msgid "Listen in Browser"
-msgstr "브라우저에서 듣기"
-
-#: cps/templates/detail.html:124
-#, python-format
-msgid "Book %(index)s of %(range)s"
-msgstr "책 %(index)s의 %(range)s"
-
-#: cps/templates/detail.html:173
-msgid "Published"
-msgstr "출간일"
-
-#: cps/templates/detail.html:221
-msgid "Mark As Unread"
-msgstr "읽지 않은 상태로 표시"
-
-#: cps/templates/detail.html:221
-msgid "Mark As Read"
-msgstr "읽은 상태로 표시"
-
-#: cps/templates/detail.html:222
-msgid "Read"
-msgstr "읽기"
-
-#: cps/templates/detail.html:231
-msgid "Restore from archive"
-msgstr "아카이브에서 복원"
-
-#: cps/templates/detail.html:231
-msgid "Add to archive"
-msgstr "아카이브에 추가"
-
-#: cps/templates/detail.html:232
-msgid "Archived"
-msgstr "보관됨"
-
-#: cps/templates/detail.html:243
-msgid "Description:"
-msgstr "설명:"
-
-#: cps/templates/detail.html:256 cps/templates/search.html:14
-msgid "Add to shelf"
-msgstr "서재에 추가"
-
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:20
-msgid "(Public)"
-msgstr "(공개)"
-
-#: cps/templates/detail.html:298
-msgid "Edit Metadata"
-msgstr "메타저오 편집"
-
-#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
-msgstr "서버 유형 선택"
-
-#: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
-msgstr "표준 이메일 계정 사용"
-
-#: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "OAuth2 인증이 있는 Gmail 계정"
-
-#: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Gmail 계정을 이메일 서버로 설정"
-
-#: cps/templates/email_edit.html:24
-msgid "Revoke Gmail Access"
-msgstr "Gmail 액세스 취소"
-
-#: cps/templates/email_edit.html:42
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: cps/templates/email_edit.html:43
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
-
-#: cps/templates/email_edit.html:51
-msgid "SMTP Password"
-msgstr "SMTP 비밀번호"
-
-#: cps/templates/email_edit.html:58
-msgid "Attachment Size Limit"
-msgstr "첨부 파일 크기 제한"
-
-#: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
-msgstr "저장 후 테스트 이메일 보내기"
-
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
-#: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
-msgid "Back"
-msgstr "뒤로"
-
-#: cps/templates/email_edit.html:74
-msgid "Allowed Domains (Whitelist)"
-msgstr "허용하는 도메인(화이트 리스트)"
-
-#: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
-msgid "Add Domain"
-msgstr "도메인 추가"
-
-#: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
-#: cps/templates/user_table.html:27
-msgid "Add"
-msgstr "추가"
-
-#: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
-msgid "Enter domainname"
-msgstr "도메인 입력"
-
-#: cps/templates/email_edit.html:92
-msgid "Denied Domains (Blacklist)"
-msgstr "거부 도메인(블랙리스트)"
-
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
-msgid "Next"
-msgstr "다음"
-
-#: cps/templates/generate_kobo_auth_url.html:5
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "텍스트 편집기에서 .kobo/Kobo eReader.conf 파일을 열고 다음을 추가(또는 편집)합니다."
-
-#: cps/templates/http_error.html:31
-msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
-msgstr "Calibre-Web Instance가 구성되지 않았습니다. 관리자에게 문의하십시오."
-
-#: cps/templates/http_error.html:41
-msgid "Create Issue"
-msgstr "이슈 생성"
-
-#: cps/templates/http_error.html:48
-msgid "Return to Home"
-msgstr "홈으로"
-
-#: cps/templates/http_error.html:50
-msgid "Logout User"
-msgstr "로그아웃"
-
-#: cps/templates/index.html:69
-msgid "Sort ascending according to download count"
-msgstr "다운로드 횟수에 따라 오름차순 정렬"
-
-#: cps/templates/index.html:70
-msgid "Sort descending according to download count"
-msgstr "다운로드 횟수에 따라 내림차순 정렬"
-
-#: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr "저자를 가나다순(알파벳순)으로 정렬"
-
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:24
-msgid "Sort authors in reverse alphabetical order"
-msgstr "저자를 가나다(알파벳) 역순으로 정렬"
-
-#: cps/templates/index.html:81
-msgid "Sort ascending according to series index"
-msgstr "시리즈 인덱스에 따라 오름차순 정렬"
-
-#: cps/templates/index.html:82
-msgid "Sort descending according to series index"
-msgstr "시리즈 인덱스에 따라 내림차순 정렬"
-
-#: cps/templates/index.xml:6
-msgid "Start"
-msgstr "시작"
-
-#: cps/templates/index.xml:18
-msgid "Alphabetical Books"
-msgstr "가나다(알파벳) 순"
-
-#: cps/templates/index.xml:22
-msgid "Books sorted alphabetically"
-msgstr "가나다(알파벳)순으로 정렬한 책"
-
-#: cps/templates/index.xml:29
-msgid "Popular publications from this catalog based on Downloads."
-msgstr "다운로드 기준 인기 도서."
-
-#: cps/templates/index.xml:36
-msgid "Popular publications from this catalog based on Rating."
-msgstr "별점 기준 인기 도서"
-
-#: cps/templates/index.xml:39
-msgid "Recently added Books"
-msgstr "최근 추가된 도서"
-
-#: cps/templates/index.xml:43
-msgid "The latest Books"
-msgstr "최신 도서"
-
-#: cps/templates/index.xml:46
-msgid "Random Books"
-msgstr "랜덤 정렬"
-
-#: cps/templates/index.xml:73
-msgid "Books ordered by Author"
-msgstr "저자별 정렬"
-
-#: cps/templates/index.xml:80
-msgid "Books ordered by publisher"
-msgstr "출판사별 정렬"
-
-#: cps/templates/index.xml:87
-msgid "Books ordered by category"
-msgstr "카테고리별 정렬"
-
-#: cps/templates/index.xml:94
-msgid "Books ordered by series"
-msgstr "시리즈별 정렬"
-
-#: cps/templates/index.xml:101
-msgid "Books ordered by Languages"
-msgstr "언어별 정렬"
-
-#: cps/templates/index.xml:108
-msgid "Books ordered by Rating"
-msgstr "평점별 정렬"
-
-#: cps/templates/index.xml:116
-msgid "Books ordered by file formats"
-msgstr "파일 종류별 정렬"
-
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
-#: cps/templates/search_form.html:87
-msgid "Shelves"
-msgstr "서재"
-
-#: cps/templates/index.xml:123
-msgid "Books organized in shelves"
-msgstr "서재별 정렬"
-
-#: cps/templates/layout.html:29
-msgid "Home"
-msgstr "홈"
-
-#: cps/templates/layout.html:35
-msgid "Toggle Navigation"
-msgstr "탐색 활성화"
-
-#: cps/templates/layout.html:46
-msgid "Search Library"
-msgstr "검색"
-
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
-msgid "Uploading..."
-msgstr "업로드 중..."
-
-#: cps/templates/layout.html:63
-msgid "Error"
-msgstr "오류"
-
-#: cps/templates/layout.html:63
-msgid "Upload done, processing, please wait..."
-msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
-
-#: cps/templates/layout.html:76 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "설정"
-
-#: cps/templates/layout.html:78
-msgid "Account"
-msgstr "계정"
-
-#: cps/templates/layout.html:80
-msgid "Logout"
-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/login.html:18
-msgid "Remember Me"
-msgstr "로그인 유지"
-
-#: cps/templates/login.html:23
-msgid "Forgot Password?"
-msgstr "비밀번호를 잊으셨나요? "
-
-#: cps/templates/login.html:26
-msgid "Log in with Magic Link"
-msgstr "Magic Link로 로그인"
-
-#: 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 "Calibre-Web 로그 다운로드"
-
-#: cps/templates/logviewer.html:21
-msgid "Download Access Log"
-msgstr "Access Log 다운로드"
-
-#: 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/modal_dialogs.html:134
-msgid "Ok"
-msgstr "Ok"
-
-#: cps/templates/osd.xml:5
-msgid "Calibre-Web eBook Catalog"
-msgstr "Calibre-Web 책 목록"
-
-#: cps/templates/read.html:6
-msgid "epub Reader"
-msgstr "EPUB 리더"
-
-#: cps/templates/read.html:75
-msgid "Reflow text when sidebars are open."
-msgstr "사이드바가 열려 있을 때 텍스트 다시 배열."
-
-#: cps/templates/readcbr.html:7
-msgid "Comic Reader"
-msgstr "코믹 리더"
-
-#: cps/templates/readcbr.html:89
-msgid "Keyboard Shortcuts"
-msgstr "키보드 단축키"
-
-#: cps/templates/readcbr.html:92
-msgid "Previous Page"
-msgstr "이전 페이지"
-
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
-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/readcbr.html:165
-msgid "Reset to Top"
-msgstr "맨 위로 재설정"
-
-#: cps/templates/readcbr.html:166
-msgid "Remember Position"
-msgstr "위치 기억"
-
-#: cps/templates/readcbr.html:171
-msgid "Scrollbar"
-msgstr "스크롤바"
-
-#: cps/templates/readcbr.html:174
-msgid "Show"
-msgstr "보기"
-
-#: cps/templates/readcbr.html:175
-msgid "Hide"
-msgstr "숨기기"
-
-#: cps/templates/readdjvu.html:5
-msgid "DJVU Reader"
-msgstr "DJVU 리더"
-
-#: cps/templates/readpdf.html:29
-msgid "PDF Reader"
-msgstr "PDF 리더"
-
-#: cps/templates/readtxt.html:6
-msgid "txt Reader"
-msgstr "텍스트 리더"
-
-#: cps/templates/register.html:4
-msgid "Register New Account"
-msgstr "새 계정 등록"
-
-#: cps/templates/register.html:10
-msgid "Choose a username"
-msgstr "사용자 이름 선택"
-
-#: cps/templates/register.html:15
-msgid "Your email address"
-msgstr "이메일 주소"
-
-#: cps/templates/remote_login.html:5
-msgid "Magic Link - Authorise New Device"
-msgstr "Magic Link - 새 장치 승인"
-
-#: cps/templates/remote_login.html:7
-msgid "On another device, login and visit:"
-msgstr "다른 기기에서 로그인하고 방문하세요."
-
-#: cps/templates/remote_login.html:11
-msgid "Once verified, you will automatically be logged in on this device."
-msgstr "승인이 되면 이 장치에 자동으로 로그인됩니다."
-
-#: cps/templates/remote_login.html:14
-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:21
-msgid "Published Date From"
-msgstr "출간일(부터)"
-
-#: cps/templates/search_form.html:31
-msgid "Published Date To"
-msgstr "출간일(까지)"
-
-#: cps/templates/search_form.html:42
-msgid "Read Status"
-msgstr "읽은 상태"
-
-#: cps/templates/search_form.html:59
-msgid "Exclude Tags"
-msgstr "태그 제외"
-
-#: cps/templates/search_form.html:77
-msgid "Exclude Series"
-msgstr "시리즈 제외"
-
-#: cps/templates/search_form.html:95
-msgid "Exclude Shelves"
-msgstr "서재 제외"
-
-#: cps/templates/search_form.html:115
-msgid "Exclude Languages"
-msgstr "언어 제외"
-
-#: cps/templates/search_form.html:126
-msgid "Extensions"
-msgstr "확장자"
-
-#: cps/templates/search_form.html:134
-msgid "Exclude Extensions"
-msgstr "확장자 제외"
-
-#: cps/templates/search_form.html:144
-msgid "Rating Above"
-msgstr "평점(이상)"
-
-#: cps/templates/search_form.html:148
-msgid "Rating Below"
-msgstr "평점(이하)"
-
-#: cps/templates/search_form.html:180
-msgid "From:"
-msgstr "부터:"
-
-#: cps/templates/search_form.html:190
-msgid "To:"
-msgstr "까지:"
-
-#: cps/templates/shelf.html:12
-msgid "Delete this Shelf"
-msgstr "이 서재 삭제"
-
-#: cps/templates/shelf.html:13
-msgid "Edit Shelf Properties"
-msgstr "서재 속성 편집"
-
-#: cps/templates/shelf.html:16
-msgid "Arrange books manually"
-msgstr "수동으로 책 정렬"
-
-#: cps/templates/shelf.html:17
-msgid "Disable Change order"
-msgstr "정렬 변경 비활성화"
-
-#: cps/templates/shelf.html:17
-msgid "Enable Change order"
-msgstr "정렬 변경 활성화"
-
-#: cps/templates/shelf_edit.html:14
-msgid "Share with Everyone"
-msgstr "모두와 공유"
-
-#: cps/templates/shelf_edit.html:21
-msgid "Sync this shelf with Kobo device"
-msgstr "이 서재를 Kobo 기기와 동기화"
-
-#: cps/templates/shelf_order.html:5
-msgid "Drag to Rearrange Order"
-msgstr "드래그하여 순서 변경"
-
-#: cps/templates/shelf_order.html:33
-msgid "Hidden Book"
-msgstr "숨겨진 책"
-
-#: cps/templates/stats.html:7
-msgid "Library Statistics"
-msgstr "Calibre 서재 통계"
-
-#: 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 "Progress"
-
-#: cps/templates/tasks.html:17
-msgid "Run Time"
-msgstr "실행 시간"
-
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "시작 시간"
-
-#: cps/templates/user_edit.html:20
-msgid "Reset user Password"
-msgstr "사용자 비밀번호 초기화"
-
-#: cps/templates/user_edit.html:43
-msgid "Language of Books"
-msgstr "책 언어"
-
-#: cps/templates/user_edit.html:54
-msgid "OAuth Settings"
-msgstr "OAuth 설정"
-
-#: cps/templates/user_edit.html:56
-msgid "Link"
-msgstr "링크"
-
-#: cps/templates/user_edit.html:58
-msgid "Unlink"
-msgstr "링크 해제"
-
-#: cps/templates/user_edit.html:64
-msgid "Kobo Sync Token"
-msgstr "코보 연동 토큰"
-
-#: cps/templates/user_edit.html:66
-msgid "Create/View"
-msgstr "생성/보기"
-
-#: cps/templates/user_edit.html:70
-msgid "Force full kobo sync"
-msgstr "강제로 코보 전체 동기화"
-
-#: cps/templates/user_edit.html:88
-msgid "Add allowed/Denied Custom Column Values"
-msgstr "허용/거부 사용자 정의 열 값 추가"
-
-#: cps/templates/user_edit.html:137
-msgid "Sync only books in selected shelves with Kobo"
-msgstr "선택한 서가에 있는 책만 Kobo와 동기화"
-
-#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
-msgid "Delete User"
-msgstr "사용자 삭제"
-
-#: cps/templates/user_edit.html:159
-msgid "Generate Kobo Auth URL"
-msgstr "Kobo Auth URL 생성"
-
-#: cps/templates/user_table.html:80 cps/templates/user_table.html:103
-msgid "Select..."
-msgstr "선택..."
-
-#: cps/templates/user_table.html:131
-msgid "Edit User"
-msgstr "사용자 편집"
-
-#: cps/templates/user_table.html:134
-msgid "Enter Username"
-msgstr "사용자 이름"
-
-#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
-msgstr "이메일 주소 입력"
-
-#: cps/templates/user_table.html:136
-msgid "Enter Kindle E-mail Address"
-msgstr "킨들 이메일 주소 입력"
-
-#: cps/templates/user_table.html:136
-msgid "Kindle E-mail"
-msgstr "킨들 이메일"
-
-#: cps/templates/user_table.html:137
-msgid "Locale"
-msgstr "언어"
-
-#: cps/templates/user_table.html:138
-msgid "Visible Book Languages"
-msgstr "표시할 책 언어"
-
-#: cps/templates/user_table.html:139
-msgid "Edit Allowed Tags"
-msgstr "허용된 태그 편집"
-
-#: cps/templates/user_table.html:139
-msgid "Allowed Tags"
-msgstr "허용된 태그"
-
-#: cps/templates/user_table.html:140
-msgid "Edit Denied Tags"
-msgstr "거부된 태그 편집"
-
-#: cps/templates/user_table.html:140
-msgid "Denied Tags"
-msgstr "거부된 태그"
-
-#: cps/templates/user_table.html:141
-msgid "Edit Allowed Column Values"
-msgstr "허용된 열 값 편집"
-
-#: cps/templates/user_table.html:141
-msgid "Allowed Column Values"
-msgstr "허용되는 열 값"
-
-#: cps/templates/user_table.html:142
-msgid "Edit Denied Column Values"
-msgstr "거부된 열 값 편집"
-
-#: cps/templates/user_table.html:142
-msgid "Denied Column Values"
-msgstr "거부된 열 값"
-
-#: cps/templates/user_table.html:144
-msgid "Change Password"
-msgstr "비밀번호 변경"
-
-#: cps/templates/user_table.html:147
-msgid "View"
-msgstr "보기"
-
-#: cps/templates/user_table.html:150
-msgid "Edit Public Shelves"
-msgstr "공개 서재 편집"
-
-#: cps/templates/user_table.html:152
-msgid "Sync selected Shelves with Kobo"
-msgstr "선택한 서재를 코보와 동기화"
-
-#: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
-msgstr "읽음/읽지 않음 선택 표시"
-
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "랜덤 보기 표시"
-
+# Korean translation for Calibre-web
+# Copyright (C) 2022 EPUBGUIDE.NET
+# This file is distributed under the same license as the Calibre-web project
+# First korean translation by 내맘대로의 EPUBGUIDE.NET
+msgid ""
+msgstr ""
+"Project-Id-Version: Calibre-web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
+"POT-Creation-Date: 2022-01-01 17:51+0100\n"
+"PO-Revision-Date: 2022-01-07 11:06+0900\n"
+"Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
+"Language-Team: 내맘대로의 epubguide.net <byword77@gmail.com>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Generated-By: Babel 2.8.0\n"
+"X-Generator: Poedit 3.0.1\n"
+
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
+msgid "not installed"
+msgstr "설치되지 않음"
+
+#: cps/about.py:47 cps/about.py:63
+msgid "installed"
+msgstr "설치됨"
+
+#: cps/about.py:138
+msgid "Statistics"
+msgstr "통계"
+
+#: cps/admin.py:144
+msgid "Server restarted, please reload page"
+msgstr "서버 다시 시작으로 새로고침 필요"
+
+#: cps/admin.py:146
+msgid "Performing shutdown of server, please close window"
+msgstr "서버를 종료하는 중, 창을 닫아야 함"
+
+#: cps/admin.py:154
+msgid "Reconnect successful"
+msgstr "재연결 성공"
+
+#: cps/admin.py:157
+msgid "Unknown command"
+msgstr "알 수 없는 명령"
+
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/uploader.py:103
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: cps/admin.py:188
+msgid "Admin page"
+msgstr "관리자 페이지"
+
+#: cps/admin.py:207
+msgid "Basic Configuration"
+msgstr "기본 설정"
+
+#: cps/admin.py:244
+msgid "UI Configuration"
+msgstr "UI 설정"
+
+#: cps/admin.py:277 cps/templates/admin.html:50
+msgid "Edit Users"
+msgstr "사용자 관리"
+
+#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
+msgid "All"
+msgstr "모두"
+
+#: cps/admin.py:343 cps/admin.py:1606
+msgid "User not found"
+msgstr "사용자를 찾을 수 없음"
+
+#: cps/admin.py:357
+msgid "{} users deleted successfully"
+msgstr "{} 사용자를 성공적으로 삭제함"
+
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
+#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
+msgid "Show All"
+msgstr "모두 보기"
+
+#: cps/admin.py:400 cps/admin.py:406
+msgid "Malformed request"
+msgstr "잘못된 요청"
+
+#: cps/admin.py:418 cps/admin.py:1484
+msgid "Guest Name can't be changed"
+msgstr "Guest 이름은 수정할 수 없음"
+
+#: cps/admin.py:430
+msgid "Guest can't have this role"
+msgstr "Guest는 이 권한을 사용할 수 없음"
+
+#: cps/admin.py:442 cps/admin.py:1442
+msgid "No admin user remaining, can't remove admin role"
+msgstr "관리자 계정이 하나 뿐일 때는 관리자를 삭제할 수 없음"
+
+#: cps/admin.py:446 cps/admin.py:460
+msgid "Value has to be true or false"
+msgstr "값으로 rue 또는 false만 설정 가능"
+
+#: cps/admin.py:448
+msgid "Invalid role"
+msgstr "잘못된 권한"
+
+#: cps/admin.py:452
+msgid "Guest can't have this view"
+msgstr "Guest는 이 view를 사용할 수 없음"
+
+#: cps/admin.py:462
+msgid "Invalid view"
+msgstr "잘못된 view"
+
+#: cps/admin.py:465
+msgid "Guest's Locale is determined automatically and can't be set"
+msgstr "Guest의 로케일은 자동으로 결정되며 설정할 수 없음"
+
+#: cps/admin.py:469
+msgid "No Valid Locale Given"
+msgstr "유효한 로케일이 아님"
+
+#: cps/admin.py:480
+msgid "No Valid Book Language Given"
+msgstr "제공된 책의 언어가 유효하지 않음"
+
+#: cps/admin.py:482
+msgid "Parameter not found"
+msgstr "매개변수를 찾을 수 없음"
+
+#: cps/admin.py:533
+msgid "Invalid Read Column"
+msgstr "잘못된 읽기 열"
+
+#: cps/admin.py:539
+msgid "Invalid Restricted Column"
+msgstr "잘못된 제한된 열"
+
+#: cps/admin.py:560 cps/admin.py:1323
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web 설정이 업데이트 됨"
+
+#: cps/admin.py:572
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Kobo Token을 삭제하시겠습니까?"
+
+#: cps/admin.py:574
+msgid "Do you really want to delete this domain?"
+msgstr "이 도메인을 삭제하시겠습니까?"
+
+#: cps/admin.py:576
+msgid "Do you really want to delete this user?"
+msgstr "이 사용자를 삭제하시겠습니까?"
+
+#: cps/admin.py:578 cps/templates/shelf.html:91
+msgid "Are you sure you want to delete this shelf?"
+msgstr "이 서재를 삭제하시겠습니까?"
+
+#: cps/admin.py:580
+msgid "Are you sure you want to change locales of selected user(s)?"
+msgstr "선택한 사용자의 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:582
+msgid "Are you sure you want to change visible book languages for selected user(s)?"
+msgstr "선택한 사용자에 대해 표시되는 책 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:584
+msgid "Are you sure you want to change the selected role for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 권한을 변경하시겠습니까?"
+
+#: cps/admin.py:586
+msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 제한을 변경하시겠습니까?"
+
+#: cps/admin.py:588
+msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 가시성 제한을 변경하시겠습니까?"
+
+#: cps/admin.py:590
+msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgstr "선택한 사용자의 실행기 동기화 동작을 변경하시겠습니까?"
+
+#: cps/admin.py:592
+msgid "Are you sure you want to change Calibre library location?"
+msgstr "캘리버 서재의 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr "Kobo Reader와 전체 동기화를 강제 실행하기 위해 Calibre-Web의 동기화 데이터베이스를 삭제하시겠습니까?"
+
+#: cps/admin.py:743
+msgid "Tag not found"
+msgstr "태그를 찾을 수 없음"
+
+#: cps/admin.py:755
+msgid "Invalid Action"
+msgstr "잘못된 액션"
+
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
+#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
+#: cps/templates/user_table.html:58
+msgid "Deny"
+msgstr "거부됨"
+
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
+#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
+#: cps/templates/user_table.html:61
+msgid "Allow"
+msgstr "허용됨"
+
+#: cps/admin.py:913
+msgid "{} sync entries deleted"
+msgstr "{} 동기화 항목이 삭제됨"
+
+#: cps/admin.py:1036
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr "client_secrets.json이 Web 응용프로그램에 대해 설정되지 않음"
+
+#: cps/admin.py:1081
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "로그 파일 위치가 오류. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1087
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "액세스 로그 파일 위치가 올바르지 않음. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1087
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr "LDAP 공급자, 포트, DN 및 사용자 개체 식별자를 입력"
+
+#: cps/admin.py:1087
+msgid "Please Enter a LDAP Service Account and Password"
+msgstr "LDAP 서비스 계정 및 비밀번호를 입력하십시오"
+
+#: cps/admin.py:1126
+msgid "Please Enter a LDAP Service Account"
+msgstr "LDAP 서비스 계정을 입력하십시오"
+
+#: cps/admin.py:1131
+#, python-format
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 그룹 개체 필터에는 하나의 \"%s\" 형식 식별자가 필요함"
+
+#: cps/admin.py:1133
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP 그룹 개체 필터에 일치하지 않는 괄호가 있음"
+
+#: cps/admin.py:1137
+#, python-format
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 사용자 개체 필터에는 하나의 \"%s\" 형식 식별자 필요"
+
+#: cps/admin.py:1139
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP 사용자 개체 필터에 일치하지 않는 괄호가 있음"
+
+#: cps/admin.py:1146
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 구성원 사용자 필터에는 하나의 \"%s\" 형식 식별자 필요"
+
+#: cps/admin.py:1148
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr "LDAP 구성원 사용자 필터에 일치하지 않는 괄호가 있음"
+
+#: cps/admin.py:1155
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr "유요하지 않은 LDAP CACertificate, 인증서 또는 키 위치. 올바른 경로를 입력 필요"
+
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+msgid "Settings DB is not Writeable"
+msgstr "설정 DB에 쓰기 권한이 없음"
+
+#: cps/admin.py:1208
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "올바르지 않은 DB 위치. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1223
+msgid "DB is not Writeable"
+msgstr "쓰기 권한이 없는 DB"
+
+#: cps/admin.py:1235
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "올바르지 않은 키 파일 위치. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1239
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "올바르지 않은 인증서 파일 위치. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1239
+msgid "Database Settings updated"
+msgstr "데이터베이스 설정이 업데이트 되었습니다"
+
+#: cps/admin.py:1354
+msgid "Database Configuration"
+msgstr "데이터베이스 구성"
+
+#: cps/admin.py:1370 cps/web.py:1478
+msgid "Please fill out all fields!"
+msgstr "모든 필드를 채워주십시오!"
+
+#: cps/admin.py:1378
+msgid "E-mail is not from valid domain"
+msgstr "유효한 도메인에서 온 이메일이 아니"
+
+#: cps/admin.py:1384 cps/admin.py:1534
+msgid "Add new user"
+msgstr "새 사용자 추가"
+
+#: cps/admin.py:1395
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "사용자 '%(user)s'이(가) 생성됨"
+
+#: cps/admin.py:1401
+msgid "Found an existing account for this e-mail address or name."
+msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
+
+#: cps/admin.py:1421
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "사용자 '%(nick)s'이(가) 삭제됨"
+
+#: cps/admin.py:1423 cps/admin.py:1424
+msgid "Can't delete Guest User"
+msgstr "게스트 사용자는 삭제할 수 없습니다"
+
+#: cps/admin.py:1427
+msgid "No admin user remaining, can't delete user"
+msgstr "관리자 계정이 하나 뿐일 때는 관리자 권한을 삭제할 수 없음"
+
+#: cps/admin.py:1500 cps/admin.py:1625
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "사용자 %(nick)s 편집"
+
+#: cps/admin.py:1504
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "사용자 '%(nick)s'가 업데이트 됨"
+
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+msgid "An unknown error occurred. Please try again later."
+msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
+
+#: cps/admin.py:1543 cps/templates/admin.html:98
+msgid "Edit E-mail Server Settings"
+msgstr "이메일 서버 설정 편집"
+
+#: cps/admin.py:1562
+msgid "Gmail Account Verification Successful"
+msgstr "Gmail 계정 인증 성공"
+
+#: cps/admin.py:1588
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr "%(email)s에 테스트를 위한 이메일을 보냄. 결과 확인 필요"
+
+#: cps/admin.py:1591
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "테스트 이메일을 보내는 동안 오류가 발생했습니다: %(res)s"
+
+#: cps/admin.py:1593
+msgid "Please configure your e-mail address first..."
+msgstr "먼저 이메일 주소를 구성하십시오..."
+
+#: cps/admin.py:1595
+msgid "E-mail server settings updated"
+msgstr "이메일 서버 설정 업데이트됨"
+
+#: cps/admin.py:1637
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "사용자 %(user)s의 비밀번호 재설정"
+
+#: cps/admin.py:1643 cps/web.py:1443
+msgid "Please configure the SMTP mail settings first..."
+msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
+
+#: cps/admin.py:1654
+msgid "Logfile viewer"
+msgstr "로그 파일 뷰어"
+
+#: cps/admin.py:1720
+msgid "Requesting update package"
+msgstr "업데이트 패키지 요청"
+
+#: cps/admin.py:1721
+msgid "Downloading update package"
+msgstr "업데이트 패키지 다운로드"
+
+#: cps/admin.py:1722
+msgid "Unzipping update package"
+msgstr "업데이트 패키지 압축 풀기"
+
+#: cps/admin.py:1723
+msgid "Replacing files"
+msgstr "파일 교체"
+
+#: cps/admin.py:1724
+msgid "Database connections are closed"
+msgstr "데이터베이스 연결이 닫힙니다"
+
+#: cps/admin.py:1725
+msgid "Stopping server"
+msgstr "서버 중지"
+
+#: cps/admin.py:1726
+msgid "Update finished, please press okay and reload page"
+msgstr "업데이트가 완료되었습니다. 확인을 누르고 페이지를 새로고침하세요"
+
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
+msgid "Update failed:"
+msgstr "업데이트 실패:"
+
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+msgid "HTTP Error"
+msgstr "HTTP 오류"
+
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
+msgid "Connection error"
+msgstr "연결 오류"
+
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
+msgid "Timeout while establishing connection"
+msgstr "연결 설정 중 시간 초과"
+
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
+msgid "General error"
+msgstr "일반 오류"
+
+#: cps/admin.py:1731
+msgid "Update file could not be saved in temp dir"
+msgstr "임시 디렉토리에 업데이트 파일을 저장할 수 없습니다"
+
+#: cps/admin.py:1732
+msgid "Files could not be replaced during update"
+msgstr "업데이트하는 동안 파일을 교체할 수 없습니다"
+
+#: cps/admin.py:1756
+msgid "Failed to extract at least One LDAP User"
+msgstr "하나 이상의 LDAP 사용자를 추출하지 못했습니다"
+
+#: cps/admin.py:1801
+msgid "Failed to Create at Least One LDAP User"
+msgstr "하나 이상의 LDAP 사용자를 생성하지 못했습니다"
+
+#: cps/admin.py:1814
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "오류: %(ldaperror)s"
+
+#: cps/admin.py:1818
+msgid "Error: No user returned in response of LDAP server"
+msgstr "오류: LDAP 서버의 응답으로 사용자가 반환되지 않았습니다"
+
+#: cps/admin.py:1851
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "데이터베이스에서 하나 이상의 LDAP 사용자를 찾을 수 없습니다"
+
+#: cps/admin.py:1853
+msgid "{} User Successfully Imported"
+msgstr "{} 사용자 가져오기 성공"
+
+#: cps/converter.py:30
+msgid "not configured"
+msgstr "구성되지 않음"
+
+#: cps/converter.py:32
+msgid "Execution permissions missing"
+msgstr "실행 권한 누락"
+
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다"
+
+#: cps/editbooks.py:305 cps/editbooks.py:307
+msgid "Book Format Successfully Deleted"
+msgstr "책 형식이 성공적으로 삭제되었습니다"
+
+#: cps/editbooks.py:314 cps/editbooks.py:316
+msgid "Book Successfully Deleted"
+msgstr "책이 성공적으로 삭제되었습니다"
+
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다"
+
+#: cps/editbooks.py:406
+msgid "edit metadata"
+msgstr "메타데이터 편집"
+
+#: cps/editbooks.py:454
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s은(는) 유효한 숫자가 아닙니다. 건너뜁니다"
+
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s'은(는) 유효한 언어가 아닙니다"
+
+#: cps/editbooks.py:630 cps/editbooks.py:981
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "파일 확장자 '%(ext)s'은(는) 이 서버에 업로드할 수 없습니다"
+
+#: cps/editbooks.py:634 cps/editbooks.py:985
+msgid "File to be uploaded must have an extension"
+msgstr "업로드할 파일에는 확장자가 있어야 합니다"
+
+#: cps/editbooks.py:646
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "%(path)s 경로를 생성하지 못했습니다(권한이 없음)."
+
+#: cps/editbooks.py:651
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "%(file)s 파일을 저장하지 못했습니다."
+
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "데이터베이스 오류: %(error)s."
+
+#: cps/editbooks.py:674
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "파일 형식 %(ext)s이(가) %(book)s에 추가되었습니다"
+
+#: cps/editbooks.py:810
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "식별자는 대소문자를 구분하지 않으며 이전 식별자를 덮어씁니다"
+
+#: cps/editbooks.py:844
+msgid "Metadata successfully updated"
+msgstr "메타데이터가 성공적으로 업데이트되었습니다"
+
+#: cps/editbooks.py:857
+msgid "Error editing book, please check logfile for details"
+msgstr "책을 수정하는 동안 오류가 발생했습니다. 자세한 내용은 로그 파일을 확인하세요"
+
+#: cps/editbooks.py:895
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "업로드한 책이 라이브러리에 있을 수 있음. 새로 업로드하기 전에 확인 필요: "
+
+#: cps/editbooks.py:993
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "파일 %(filename)s을(를) 임시 디렉토리에 저장할 수 없습니다"
+
+#: cps/editbooks.py:1012
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "표지 파일%(file)s를 이동하지 못했습니다.:%(error)s"
+
+#: cps/editbooks.py:1059
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "파일 %(file)s 업로드됨"
+
+#: cps/editbooks.py:1084
+msgid "Source or destination format for conversion missing"
+msgstr "변환을 위한 소스 또는 대상 형식이 누락되었습니다"
+
+#: cps/editbooks.py:1092
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr "책이 %(book_format)s(으)로 변환하기 위해 대기 중입니다"
+
+#: cps/editbooks.py:1096
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "이 책을 변환하는 동안 오류가 발생했습니다: %(res)s"
+
+#: cps/gdrive.py:58
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "Google 드라이브 설정이 완료되지 않았습니다. Google 드라이브를 비활성화했다가 다시 활성화해 보세요"
+
+#: cps/gdrive.py:95
+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 "책 ID에 대한 %(format)s 형식을 찾을 수 없음: %(book)d"
+
+#: cps/helper.py:86 cps/tasks/convert.py:73
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s을(를) Google 드라이브에서 찾을 수 없음: %(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:220 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "킨들로 보내기"
+
+#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "이 이메일은 Calibre Web을 통해 전송되었습니다."
+
+#: cps/helper.py:112
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web 테스트 이메일"
+
+#: cps/helper.py:113
+msgid "Test e-mail"
+msgstr "테스트 이메일"
+
+#: cps/helper.py:130
+msgid "Get Started with Calibre-Web"
+msgstr "Calibre-Web 시작하기"
+
+#: cps/helper.py:135
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "사용자 등록 이메일: %(name)s"
+
+#: cps/helper.py:146 cps/helper.py:152
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "%(orig)s를 %(format)s로 변환하고 킨들로 보내기"
+
+#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "킨들에 %(format)s 보내기"
+
+#: cps/helper.py:219 cps/tasks/convert.py:90
+#, python-format
+msgid "%(book)s send to Kindle"
+msgstr "%(book)s을 킨들로 보내기"
+
+#: cps/helper.py:224
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "요청한 파일을 읽을 수 없습니다. 올바른 권한인가요?"
+
+#: cps/helper.py:316
+#, python-format
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "책 %(id)s에 대한 책 폴더를 삭제하지 못했습니다. 경로에 하위 폴더가 있습니다: %(path)s"
+
+#: cps/helper.py:322
+#, python-format
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "%(id)s 도서 삭제 실패: %(message)s"
+
+#: cps/helper.py:333
+#, python-format
+msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
+msgstr "데이터베이스에서만 책 %(id)s 을(를) 삭제 중, 데이터베이스의 책 경로가 유효하지 않음: %(path)s"
+
+#: cps/helper.py:388
+#, 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:403
+#, 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
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Google 드라이브에서 %(file)s 파일을 찾을 수 없습니다"
+
+#: cps/helper.py:467
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다"
+
+#: cps/helper.py:507 cps/web.py:1658
+msgid "Found an existing account for this e-mail address"
+msgstr "등록되어 있는 이메일 주소입니다"
+
+#: cps/helper.py:515
+msgid "This username is already taken"
+msgstr "등록되어 있는 username입니다"
+
+#: cps/helper.py:525
+msgid "Invalid e-mail address format"
+msgstr "이메일 주소 형식이 잘못되었습니다"
+
+#: cps/helper.py:598
+msgid "Error Downloading Cover"
+msgstr "표지 다운로드 중 오류 발생"
+
+#: cps/helper.py:601
+msgid "Cover Format Error"
+msgstr "표지 형식 오류"
+
+#: cps/helper.py:611
+msgid "Failed to create path for cover"
+msgstr "표지 경로 생성 실패"
+
+#: cps/helper.py:627
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr "표지 파일이 유효한 이미지 파일이 아니거나 저장할 수 없습니다"
+
+#: cps/helper.py:638
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr "표지는 jpg/jpeg/png/webp/bmp 파일만 지원됩니다"
+
+#: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr "잘못된 표지 파일 콘텐츠"
+
+#: cps/helper.py:655
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr "표지 파일로 jpg/jpeg 파일만 지원됩니다"
+
+#: cps/helper.py:707
+msgid "Unrar binary file not found"
+msgstr "Unrar 바이너리 파일을 찾을 수 없습니다"
+
+#: cps/helper.py:718
+msgid "Error excecuting UnRar"
+msgstr "UnRar 실행 오류"
+
+#: cps/helper.py:766
+msgid "Waiting"
+msgstr "대기중"
+
+#: cps/helper.py:768
+msgid "Failed"
+msgstr "실패"
+
+#: cps/helper.py:770
+msgid "Started"
+msgstr "시작됨"
+
+#: cps/helper.py:772
+msgid "Finished"
+msgstr "종료"
+
+#: cps/helper.py:774
+msgid "Unknown Status"
+msgstr "알 수 없는 상태"
+
+#: cps/kobo_auth.py:131
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr "코보(kobo) 장치에 대한 유효한 api_endpoint를 얻으려면 로컬 호스트가 아닌 곳에서 calibre-web에 액세스하십시오"
+
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+msgid "Kobo Setup"
+msgstr "Kobo 설정"
+
+#: cps/oauth_bb.py:77
+#, python-format
+msgid "Register with %(provider)s"
+msgstr "%(provider)s에 등록"
+
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
+
+#: cps/oauth_bb.py:148
+#, python-format
+msgid "Link to %(oauth)s Succeeded"
+msgstr "%(oauth)s에 성공적으로 연결됨"
+
+#: cps/oauth_bb.py:155
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr "로그인 실패, OAuth 계정과 연결된 사용자 없음"
+
+#: cps/oauth_bb.py:197
+#, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr "%(oauth)s에 연결 해제 성공"
+
+#: cps/oauth_bb.py:202
+#, python-format
+msgid "Unlink to %(oauth)s Failed"
+msgstr "%(oauth)s에 연결 해제 실패"
+
+#: cps/oauth_bb.py:205
+#, python-format
+msgid "Not Linked to %(oauth)s"
+msgstr "%(oauth)s에 연결되지 않음"
+
+#: cps/oauth_bb.py:261
+msgid "Failed to log in with GitHub."
+msgstr "GitHub에 로그인하지 못했습니다."
+
+#: cps/oauth_bb.py:267
+msgid "Failed to fetch user info from GitHub."
+msgstr "GitHub에서 사용자 정보를 가져오지 못했습니다."
+
+#: cps/oauth_bb.py:279
+msgid "Failed to log in with Google."
+msgstr "구글 로그인에 실패했습니다."
+
+#: cps/oauth_bb.py:285
+msgid "Failed to fetch user info from Google."
+msgstr "Google에서 사용자 정보를 가져오지 못했습니다."
+
+#: cps/oauth_bb.py:332
+msgid "GitHub Oauth error, please retry later."
+msgstr "GitHub Oauth 오류입니다. 나중에 다시 시도하세요."
+
+#: cps/oauth_bb.py:335
+msgid "GitHub Oauth error: {}"
+msgstr "GitHub 인증 오류: {}"
+
+#: cps/oauth_bb.py:356
+msgid "Google Oauth error, please retry later."
+msgstr "Google 인증 오류입니다. 나중에 다시 시도하세요."
+
+#: cps/oauth_bb.py:359
+msgid "Google Oauth error: {}"
+msgstr "Google 인증 오류: {}"
+
+#: cps/opds.py:384
+msgid "{} Stars"
+msgstr "{} Stars"
+
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+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:416
+msgid "Books"
+msgstr "책"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "최근 책 보기"
+
+#: cps/render_template.py:42 cps/templates/index.xml:25
+msgid "Hot Books"
+msgstr "인기있는 책"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "주목받는 책 보기"
+
+#: cps/render_template.py:46 cps/render_template.py:51
+msgid "Downloaded Books"
+msgstr "다운로드된 책"
+
+#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/templates/user_table.html:167
+msgid "Show Downloaded Books"
+msgstr "다운로드된 책 보기"
+
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
+msgid "Top Rated Books"
+msgstr "평점이 높은 책"
+
+#: cps/render_template.py:58 cps/templates/user_table.html:161
+msgid "Show Top Rated Books"
+msgstr "평점이 높은 책 보기"
+
+#: cps/render_template.py:59 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:676
+msgid "Read Books"
+msgstr "읽은 책"
+
+#: cps/render_template.py:61
+msgid "Show read and unread"
+msgstr "읽은 책과 읽지 않은 책 보기"
+
+#: cps/render_template.py:63 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:679
+msgid "Unread Books"
+msgstr "읽지 않은 책"
+
+#: cps/render_template.py:65
+msgid "Show unread"
+msgstr "읽지 않은 책 보기"
+
+#: cps/render_template.py:66
+msgid "Discover"
+msgstr "발견"
+
+#: cps/render_template.py:68 cps/templates/index.xml:50
+#: cps/templates/user_table.html:162
+msgid "Show Random Books"
+msgstr "무작위 추천"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1041
+msgid "Categories"
+msgstr "카테고리"
+
+#: cps/render_template.py:71 cps/templates/user_table.html:158
+msgid "Show category selection"
+msgstr "카테고리별 보기"
+
+#: cps/render_template.py:72 cps/templates/book_edit.html:90
+#: cps/templates/book_table.html:68 cps/templates/index.xml:90
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
+msgid "Series"
+msgstr "시리즈"
+
+#: cps/render_template.py:74 cps/templates/user_table.html:157
+msgid "Show series selection"
+msgstr "시리즈별 보기"
+
+#: cps/render_template.py:75 cps/templates/book_table.html:66
+#: cps/templates/index.xml:69
+msgid "Authors"
+msgstr "저자"
+
+#: cps/render_template.py:77 cps/templates/user_table.html:160
+msgid "Show author selection"
+msgstr "저자별 보기"
+
+#: cps/render_template.py:79 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:925
+msgid "Publishers"
+msgstr "출판사"
+
+#: cps/render_template.py:81 cps/templates/user_table.html:163
+msgid "Show publisher selection"
+msgstr "출판사별 보기"
+
+#: cps/render_template.py:82 cps/templates/book_table.html:70
+#: cps/templates/index.xml:97 cps/templates/search_form.html:107
+#: cps/web.py:1018
+msgid "Languages"
+msgstr "언어"
+
+#: cps/render_template.py:85 cps/templates/user_table.html:155
+msgid "Show language selection"
+msgstr "언어별 보기"
+
+#: cps/render_template.py:86 cps/templates/index.xml:104
+msgid "Ratings"
+msgstr "평점"
+
+#: cps/render_template.py:88 cps/templates/user_table.html:164
+msgid "Show ratings selection"
+msgstr "평점별 보기"
+
+#: cps/render_template.py:89 cps/templates/index.xml:112
+msgid "File formats"
+msgstr "파일 유형"
+
+#: cps/render_template.py:91 cps/templates/user_table.html:165
+msgid "Show file formats selection"
+msgstr "파일 유형별 보기"
+
+#: cps/render_template.py:93 cps/web.py:703
+msgid "Archived Books"
+msgstr "보관된 책"
+
+#: cps/render_template.py:95 cps/templates/user_table.html:166
+msgid "Show archived books"
+msgstr "보관된 책 보기"
+
+#: cps/render_template.py:97 cps/web.py:780
+msgid "Books List"
+msgstr "책 목록"
+
+#: cps/render_template.py:99 cps/templates/user_table.html:168
+msgid "Show Books List"
+msgstr "책 목록 보기"
+
+#: cps/shelf.py:67 cps/shelf.py:121
+msgid "Invalid shelf specified"
+msgstr "잘못된 책장 지정"
+
+#: cps/shelf.py:73
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "죄송합니다. 해당 책장에 책을 추가할 권한이 없습니다"
+
+#: cps/shelf.py:82
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "책이 이미 책장에 등록됨: %(shelfname)s"
+
+#: cps/shelf.py:107
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "책장에 책이 등록됨: %(sname)s"
+
+#: cps/shelf.py:126
+msgid "You are not allowed to add a book to the shelf"
+msgstr "책장에 책을 추가할 권한이 없습니다"
+
+#: 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:163
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "책장에 책을 추가할 수 없음: %(sname)s"
+
+#: cps/shelf.py:209
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "책이 책장에서 삭제됨: %(sname)s"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다"
+
+#: cps/shelf.py:228 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "책장 추가"
+
+#: cps/shelf.py:237
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "죄송합니다. 이 책장을 편집할 권한이 없습니다"
+
+#: cps/shelf.py:239
+msgid "Edit a shelf"
+msgstr "책장 편집"
+
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "죄송합니다. 이 공개 책장을 만들 권한이 없습니다"
+
+#: cps/shelf.py:261
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "%(title)s 책장이 추가됨"
+
+#: cps/shelf.py:264
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "%(title)s 책장이 변경됨"
+
+#: cps/shelf.py:278
+msgid "There was an error"
+msgstr "오류가 발생하였습니다"
+
+#: cps/shelf.py:300
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 공개 책장이 이미 있습니다."
+
+#: cps/shelf.py:311
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 개인 책장이 이미 있습니다."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "책장 순서 변경: '%(name)s'"
+
+#: cps/shelf.py:450
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "책장: '%(name)s'"
+
+#: cps/shelf.py:454
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
+
+#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
+msgid "Unexpected data while reading update information"
+msgstr "업데이트 정보를 읽는 동안 예기치 않은 데이터"
+
+#: cps/updater.py:410 cps/updater.py:521
+msgid "No update available. You already have the latest version installed"
+msgstr "업데이트가 없습니다. 이미 최신 버전이 설치되어 있습니다"
+
+#: cps/updater.py:428
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:446
+msgid "Could not fetch update information"
+msgstr "업데이트 정보를 가져올 수 없습니다"
+
+#: cps/updater.py:456
+msgid "Click on the button below to update to the latest stable version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
+#, 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:507
+msgid "No release information available"
+msgstr "출시 정보가 없습니다"
+
+#: cps/templates/index.html:5 cps/web.py:440
+msgid "Discover (Random Books)"
+msgstr "발견(무작위 도서)"
+
+#: cps/web.py:471
+msgid "Hot Books (Most Downloaded)"
+msgstr "인기있는 책(가장 많이 다운로드됨)"
+
+#: cps/web.py:507
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "%(user)s이(가) 다운로드한 책"
+
+#: cps/web.py:539
+#, python-format
+msgid "Author: %(name)s"
+msgstr "저자: %(name)s"
+
+#: cps/web.py:554
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "출판사: %(name)s"
+
+#: cps/web.py:569
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "시리즈: %(serie)s"
+
+#: cps/web.py:582
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "평가: %(rating)s 별"
+
+#: cps/web.py:597
+#, python-format
+msgid "File format: %(format)s"
+msgstr "파일 유형: %(format)s"
+
+#: cps/web.py:615
+#, python-format
+msgid "Category: %(name)s"
+msgstr "카테고리: %(name)s"
+
+#: cps/web.py:631
+#, python-format
+msgid "Language: %(name)s"
+msgstr "언어: %(name)s"
+
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+msgid "Advanced Search"
+msgstr "상세 검색"
+
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
+#: cps/templates/index.xml:11 cps/templates/layout.html:45
+#: cps/templates/layout.html:48 cps/templates/search_form.html:226
+#: cps/web.py:750 cps/web.py:1076
+msgid "Search"
+msgstr "검색"
+
+#: cps/templates/admin.html:16 cps/web.py:903
+msgid "Downloads"
+msgstr "다운로드"
+
+#: cps/web.py:980
+msgid "Ratings list"
+msgstr "평점 목록"
+
+#: cps/web.py:1001
+msgid "File formats list"
+msgstr "파일 유형 목록"
+
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
+msgid "Tasks"
+msgstr "작업"
+
+#: cps/web.py:1214
+msgid "Published after "
+msgstr "Published after "
+
+#: cps/web.py:1221
+msgid "Published before "
+msgstr "Published before "
+
+#: cps/web.py:1243
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "평점 <= %(rating)s"
+
+#: cps/web.py:1245
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "평점 >= %(rating)s"
+
+#: cps/web.py:1247
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr "읽은 상태 = %(status)s"
+
+#: cps/web.py:1352
+msgid "Error on search for custom columns, please restart Calibre-Web"
+msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오"
+
+#: cps/web.py:1448
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다"
+
+#: cps/web.py:1452
+#, python-format
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr "책을 보내는 중에 오류 발생: %(res)s"
+
+#: cps/web.py:1454
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
+
+#: cps/web.py:1471
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
+
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
+msgid "Register"
+msgstr "등록"
+
+#: cps/web.py:1506
+msgid "Your e-mail is not allowed to register"
+msgstr "이메일을 등록할 수 없습니다"
+
+#: cps/web.py:1509
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "확인을 위한 이메일이 발송되었습니다."
+
+#: cps/web.py:1523
+msgid "Cannot activate LDAP authentication"
+msgstr "LDAP 인증을 활성화할 수 없습니다"
+
+#: cps/web.py:1542
+#, python-format
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
+
+#: cps/web.py:1548
+#, python-format
+msgid "Could not login: %(message)s"
+msgstr "로그인 실패: %(message)s"
+
+#: cps/web.py:1552 cps/web.py:1577
+msgid "Wrong Username or Password"
+msgstr "잘못된 사용자명 또는 비밀번호"
+
+#: cps/web.py:1559
+msgid "New Password was send to your email address"
+msgstr "새 비밀번호가 이메일로 전송되었습니다"
+
+#: cps/web.py:1565
+msgid "Please enter valid username to reset password"
+msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오"
+
+#: cps/web.py:1572
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "로그인을 할 수 없음: '%(nickname)s"
+
+#: cps/web.py:1638 cps/web.py:1687
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s 프로필"
+
+#: cps/web.py:1654
+msgid "Profile updated"
+msgstr "프로필이 업데이트 됨"
+
+#: cps/services/gmail.py:58
+msgid "Found no valid gmail.json file with OAuth information"
+msgstr "인증 정보가 포함된 유효한 gmail.json 파일을 찾을 수 없습니다"
+
+#: cps/tasks/convert.py:137
+#, python-format
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr "Calibre ebook-convert %(tool)s을(를) 찾을 수 없습니다"
+
+#: cps/tasks/convert.py:163
+#, python-format
+msgid "%(format)s format not found on disk"
+msgstr "%(format)s 형식을 찾을 수 없습니다"
+
+#: cps/tasks/convert.py:167
+msgid "Ebook converter failed with unknown error"
+msgstr "알 수 없는 오류로 인해 전자책 변환이 실패했습니다"
+
+#: cps/tasks/convert.py:177
+#, python-format
+msgid "Kepubify-converter failed: %(error)s"
+msgstr "Kepubify 변환 실패: %(error)s"
+
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr "변환된 파일을 찾을 수 없거나 %(folder)s 폴더에 하나 이상의 파일이 존재합니다"
+
+#: cps/tasks/convert.py:222
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "\"전자책 변환 실패: %(error)s"
+
+#: cps/tasks/convert.py:245
+#, 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:13 cps/templates/login.html:9
+#: cps/templates/login.html:10 cps/templates/register.html:9
+#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
+msgid "Username"
+msgstr "사용자명"
+
+#: cps/templates/admin.html:14 cps/templates/register.html:14
+#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
+msgid "E-mail Address"
+msgstr "이메일 주소"
+
+#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
+msgid "Send to Kindle E-mail Address"
+msgstr "킨들로 보내기 이메일 주소"
+
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/user_table.html:143
+msgid "Admin"
+msgstr "관리자"
+
+#: cps/templates/admin.html:18 cps/templates/login.html:13
+#: cps/templates/login.html:14 cps/templates/user_edit.html:23
+msgid "Password"
+msgstr "비밀번호"
+
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
+#: cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "업로드"
+
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/user_table.html:146
+msgid "Download"
+msgstr "다운로드"
+
+#: cps/templates/admin.html:23
+msgid "View Books"
+msgstr "책 보기"
+
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
+#: cps/templates/user_table.html:148
+msgid "Edit"
+msgstr "편집"
+
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
+#: cps/templates/user_table.html:149
+msgid "Delete"
+msgstr "삭제"
+
+#: cps/templates/admin.html:26
+msgid "Public Shelf"
+msgstr "공개 책장"
+
+#: cps/templates/admin.html:51
+msgid "Add New User"
+msgstr "사용자 추가"
+
+#: cps/templates/admin.html:53
+msgid "Import LDAP Users"
+msgstr "LDAP 사용자 가져오기"
+
+#: cps/templates/admin.html:60
+msgid "E-mail Server Settings"
+msgstr "이메일 서버 설정"
+
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
+msgid "SMTP Hostname"
+msgstr "SMTP Hostname"
+
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
+msgid "SMTP Port"
+msgstr "SMTP Port"
+
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
+msgid "Encryption"
+msgstr "암호화"
+
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
+msgid "SMTP Login"
+msgstr "SMTP Login"
+
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
+#: cps/templates/email_edit.html:55
+msgid "From E-mail"
+msgstr "From E-mail"
+
+#: cps/templates/admin.html:88
+msgid "E-Mail Service"
+msgstr "E-Mail Service"
+
+#: cps/templates/admin.html:89
+msgid "Gmail via Oauth2"
+msgstr "Gmail via Oauth2"
+
+#: cps/templates/admin.html:104
+msgid "Configuration"
+msgstr "환경 설정"
+
+#: cps/templates/admin.html:107
+msgid "Calibre Database Directory"
+msgstr "Calibre DB 폴더"
+
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
+msgid "Log Level"
+msgstr "Log Level"
+
+#: cps/templates/admin.html:115
+msgid "Port"
+msgstr "Port"
+
+#: cps/templates/admin.html:120
+msgid "External Port"
+msgstr "External Port"
+
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
+msgid "Books per Page"
+msgstr "페이지당 보여 줄 책 수"
+
+#: cps/templates/admin.html:131
+msgid "Uploads"
+msgstr "업로드"
+
+#: cps/templates/admin.html:135
+msgid "Anonymous Browsing"
+msgstr "익명 보기"
+
+#: cps/templates/admin.html:139
+msgid "Public Registration"
+msgstr "공개 등록"
+
+#: cps/templates/admin.html:143
+msgid "Magic Link Remote Login"
+msgstr "Magic Link Remote Login"
+
+#: cps/templates/admin.html:147
+msgid "Reverse Proxy Login"
+msgstr "Reverse Proxy Login"
+
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
+msgid "Reverse Proxy Header Name"
+msgstr "Reverse Proxy Header Name"
+
+#: cps/templates/admin.html:157
+msgid "Edit Calibre Database Configuration"
+msgstr "Calibre Database 환경 설정 편집"
+
+#: cps/templates/admin.html:158
+msgid "Edit Basic Configuration"
+msgstr "기본 환경 설정 편집"
+
+#: cps/templates/admin.html:159
+msgid "Edit UI Configuration"
+msgstr "UI 환경 설정 편집"
+
+#: cps/templates/admin.html:164
+msgid "Administration"
+msgstr "관리"
+
+#: cps/templates/admin.html:165
+msgid "Download Debug Package"
+msgstr "Debug Package 다운로드"
+
+#: cps/templates/admin.html:166
+msgid "View Logs"
+msgstr "로그 보기"
+
+#: cps/templates/admin.html:169
+msgid "Reconnect Calibre Database"
+msgstr "Calibre DB 다시 연결"
+
+#: cps/templates/admin.html:170
+msgid "Restart"
+msgstr "재시작"
+
+#: cps/templates/admin.html:171
+msgid "Shutdown"
+msgstr "종료"
+
+#: cps/templates/admin.html:176
+msgid "Update"
+msgstr "업데이트"
+
+#: cps/templates/admin.html:180
+msgid "Version"
+msgstr "버전"
+
+#: cps/templates/admin.html:181
+msgid "Details"
+msgstr "세부 정보"
+
+#: cps/templates/admin.html:187
+msgid "Current version"
+msgstr "현재 버전"
+
+#: cps/templates/admin.html:195
+msgid "Check for Update"
+msgstr "업데이트 확인"
+
+#: cps/templates/admin.html:196
+msgid "Perform Update"
+msgstr "업데이트 실행"
+
+#: cps/templates/admin.html:209
+msgid "Are you sure you want to restart?"
+msgstr "재시작을 하시겠습니까?"
+
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
+#: cps/templates/shelf.html:96
+msgid "OK"
+msgstr "예"
+
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
+#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+msgid "Cancel"
+msgstr "취소"
+
+#: cps/templates/admin.html:227
+msgid "Are you sure you want to shutdown?"
+msgstr "종료를 하시겠습니까?"
+
+#: cps/templates/admin.html:239
+msgid "Updating, please do not reload this page"
+msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "via"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "In Library"
+
+#: cps/templates/author.html:26 cps/templates/index.html:72
+#: cps/templates/search.html:29 cps/templates/shelf.html:17
+msgid "Sort according to book date, newest first"
+msgstr "책 목록 정렬, 최신순"
+
+#: cps/templates/author.html:27 cps/templates/index.html:73
+#: cps/templates/search.html:30 cps/templates/shelf.html:18
+msgid "Sort according to book date, oldest first"
+msgstr "책 목록 정렬, 오래된 순"
+
+#: cps/templates/author.html:28 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:19
+msgid "Sort title in alphabetical order"
+msgstr "가나다 순 정렬"
+
+#: cps/templates/author.html:29 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:20
+msgid "Sort title in reverse alphabetical order"
+msgstr "가나다 역순 정렬"
+
+#: cps/templates/author.html:30 cps/templates/index.html:78
+#: cps/templates/search.html:35 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, newest first"
+msgstr "발행일 순으로 정렬, 최신순"
+
+#: cps/templates/author.html:31 cps/templates/index.html:79
+#: cps/templates/search.html:36 cps/templates/shelf.html:24
+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:111 cps/templates/search.html:65
+#: cps/templates/shelf.html:52
+msgid "reduce"
+msgstr "reduce"
+
+#: cps/templates/author.html:101
+msgid "More by"
+msgstr "More by"
+
+#: 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:29
+msgid "Convert from:"
+msgstr "변경전 유형:"
+
+#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+msgid "select an option"
+msgstr "옵션 선택"
+
+#: cps/templates/book_edit.html:36
+msgid "Convert to:"
+msgstr "변경후 유형:"
+
+#: cps/templates/book_edit.html:45
+msgid "Convert book"
+msgstr "책 변경"
+
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+msgid "Book Title"
+msgstr "책 제목"
+
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+msgid "Author"
+msgstr "저자"
+
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+msgid "Description"
+msgstr "책 소개"
+
+#: cps/templates/book_edit.html:72
+msgid "Identifiers"
+msgstr "식별자"
+
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+msgid "Identifier Type"
+msgstr "식별자 유형"
+
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+msgid "Identifier Value"
+msgstr "식별자 값"
+
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/user_table.html:24
+msgid "Remove"
+msgstr "삭제"
+
+#: cps/templates/book_edit.html:82
+msgid "Add Identifier"
+msgstr "식별자 추가"
+
+#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+msgid "Tags"
+msgstr "태그"
+
+#: cps/templates/book_edit.html:94
+msgid "Series ID"
+msgstr "시리즈 ID"
+
+#: cps/templates/book_edit.html:98
+msgid "Rating"
+msgstr "평점"
+
+#: cps/templates/book_edit.html:103
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "URL로 표지 추가(JPEG - 이미지를 다운로드 하여 DB에 저장합니다)"
+
+#: cps/templates/book_edit.html:107
+msgid "Upload Cover from Local Disk"
+msgstr "로컬 디스크에서 표지 업로드"
+
+#: cps/templates/book_edit.html:112
+msgid "Published Date"
+msgstr "출간일"
+
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/search_form.html:16
+msgid "Publisher"
+msgstr "출판사"
+
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/user_edit.html:33
+msgid "Language"
+msgstr "언어"
+
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/search_form.html:164
+msgid "Yes"
+msgstr "예"
+
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/search_form.html:165
+msgid "No"
+msgstr "아니오"
+
+#: cps/templates/book_edit.html:200
+msgid "Upload Format"
+msgstr "업로드 유형"
+
+#: cps/templates/book_edit.html:208
+msgid "View Book on Save"
+msgstr "저장 후 책 보기"
+
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+msgid "Fetch Metadata"
+msgstr "메타정보 가져오기"
+
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
+#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+msgid "Save"
+msgstr "저장"
+
+#: cps/templates/book_edit.html:232
+msgid "Keyword"
+msgstr "키워드"
+
+#: cps/templates/book_edit.html:233
+msgid "Search keyword"
+msgstr "키워드 검색"
+
+#: cps/templates/book_edit.html:239
+msgid "Click the cover to load metadata to the form"
+msgstr "표지를 클릭하여 양식에 메타데이터 로드"
+
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+msgid "Loading..."
+msgstr "불러오는 중..."
+
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:163
+msgid "Close"
+msgstr "닫기"
+
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+msgid "Source"
+msgstr "출처"
+
+#: cps/templates/book_edit.html:286
+msgid "Search error!"
+msgstr "오류 검색!"
+
+#: cps/templates/book_edit.html:287
+msgid "No Result(s) found! Please try another keyword."
+msgstr "검색 결과가 없습니다! 다른 키워드를 시도하십시오."
+
+#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
+#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
+#: cps/templates/user_table.html:100
+msgid "This Field is Required"
+msgstr "이 필드는 필수 항목입니다"
+
+#: cps/templates/book_table.html:37
+msgid "Merge selected books"
+msgstr "선택한 책 병합"
+
+#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
+msgid "Remove Selections"
+msgstr "선택 제거"
+
+#: cps/templates/book_table.html:41
+msgid "Exchange author and title"
+msgstr "저자 및 제목 교환"
+
+#: cps/templates/book_table.html:47
+msgid "Update Title Sort automatically"
+msgstr "자동으로 제목 정렬 업데이트"
+
+#: cps/templates/book_table.html:51
+msgid "Update Author Sort automatically"
+msgstr "자동으로 작성자 정렬 업데이트"
+
+#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
+msgid "Enter Title"
+msgstr "제목 입력"
+
+#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
+#: cps/templates/shelf_edit.html:8
+msgid "Title"
+msgstr "제목"
+
+#: cps/templates/book_table.html:64
+msgid "Enter Title Sort"
+msgstr "제목 정렬 입력"
+
+#: cps/templates/book_table.html:64
+msgid "Title Sort"
+msgstr "제목 정렬"
+
+#: cps/templates/book_table.html:65
+msgid "Enter Author Sort"
+msgstr "저자 정렬 입력"
+
+#: cps/templates/book_table.html:65
+msgid "Author Sort"
+msgstr "저자 정렬"
+
+#: cps/templates/book_table.html:66
+msgid "Enter Authors"
+msgstr "저자 입력"
+
+#: cps/templates/book_table.html:67
+msgid "Enter Categories"
+msgstr "카테고리 입력"
+
+#: cps/templates/book_table.html:68
+msgid "Enter Series"
+msgstr "시리즈 입력"
+
+#: cps/templates/book_table.html:69
+msgid "Series Index"
+msgstr "시리즈 색인"
+
+#: cps/templates/book_table.html:70
+msgid "Enter Languages"
+msgstr "언어 입력"
+
+#: cps/templates/book_table.html:71
+msgid "Publishing Date"
+msgstr "출간일"
+
+#: cps/templates/book_table.html:72
+msgid "Enter Publishers"
+msgstr "출판사 입력"
+
+#: cps/templates/book_table.html:73
+msgid "Enter comments"
+msgstr "코멘트 입력"
+
+#: cps/templates/book_table.html:73
+msgid "Comments"
+msgstr "코멘트"
+
+#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
+#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
+#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
+#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
+msgid "Enter "
+msgstr "입력 "
+
+#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "정말 확신합니까?"
+
+#: cps/templates/book_table.html:114
+msgid "Books with Title will be merged from:"
+msgstr "제목이 있는 책은 다음에서 병합됨:"
+
+#: cps/templates/book_table.html:118
+msgid "Into Book with Title:"
+msgstr "제목이 있는 책으로:"
+
+#: cps/templates/book_table.html:123
+msgid "Merge"
+msgstr "병합"
+
+#: cps/templates/config_db.html:12
+msgid "Location of Calibre Database"
+msgstr "Calibre Database 위치"
+
+#: cps/templates/config_db.html:22
+msgid "Use Google Drive?"
+msgstr "Google 드라이브를 사용하시겠습니까?"
+
+#: cps/templates/config_db.html:27
+msgid "Authenticate Google Drive"
+msgstr "구글 드라이브 인증"
+
+#: cps/templates/config_db.html:32
+msgid "Google Drive Calibre folder"
+msgstr "Google Drive Calibre 폴더"
+
+#: cps/templates/config_db.html:40
+msgid "Metadata Watch Channel ID"
+msgstr "Metadata Watch Channel ID"
+
+#: cps/templates/config_db.html:43
+msgid "Revoke"
+msgstr "취소"
+
+#: cps/templates/config_db.html:68
+msgid "New db location is invalid, please enter valid path"
+msgstr "잘못된 새 DB 위치. 올바른 경로 입력 필요"
+
+#: cps/templates/config_edit.html:18
+msgid "Server Configuration"
+msgstr "서버 구성"
+
+#: cps/templates/config_edit.html:25
+msgid "Server Port"
+msgstr "Server Port"
+
+#: cps/templates/config_edit.html:28
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL 인증서 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
+
+#: cps/templates/config_edit.html:35
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL 키 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
+
+#: cps/templates/config_edit.html:43
+msgid "Update Channel"
+msgstr "업데이트 취소"
+
+#: cps/templates/config_edit.html:45
+msgid "Stable"
+msgstr "안정버전"
+
+#: cps/templates/config_edit.html:46
+msgid "Nightly"
+msgstr "실험버전"
+
+#: cps/templates/config_edit.html:50
+msgid "Trusted Hosts (Comma Separated)"
+msgstr "신뢰할 수 있는 호스트(쉼표로 구분)"
+
+#: cps/templates/config_edit.html:61
+msgid "Logfile Configuration"
+msgstr "Logfile 설정"
+
+#: cps/templates/config_edit.html:77
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr "로그 파일의 위치 및 이름(항목이 없는 경우 calibre-web.log)"
+
+#: cps/templates/config_edit.html:82
+msgid "Enable Access Log"
+msgstr "액세스 로그 활성화"
+
+#: cps/templates/config_edit.html:85
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr "액세스 로그 파일의 위치 및 이름(항목이 없는 경우 access.log)"
+
+#: cps/templates/config_edit.html:96
+msgid "Feature Configuration"
+msgstr "기능 설정"
+
+#: cps/templates/config_edit.html:104
+msgid "Convert non-English characters in title and author while saving to disk"
+msgstr "제목과 저자가 영어가 아닌 경우 원어로 저장하기"
+
+#: cps/templates/config_edit.html:108
+msgid "Enable Uploads"
+msgstr "업로드 활성화"
+
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr "(사용자에게 업로드 권한도 있는지 확인하십시오)"
+
+#: cps/templates/config_edit.html:112
+msgid "Allowed Upload Fileformats"
+msgstr "허용된 업로드 파일 형식"
+
+#: cps/templates/config_edit.html:118
+msgid "Enable Anonymous Browsing"
+msgstr "익명 탐색 활성화"
+
+#: cps/templates/config_edit.html:122
+msgid "Enable Public Registration"
+msgstr "공개 등록 활성화"
+
+#: cps/templates/config_edit.html:127
+msgid "Use E-Mail as Username"
+msgstr "이메일을 사용자 이름으로 사용"
+
+#: cps/templates/config_edit.html:132
+msgid "Enable Magic Link Remote Login"
+msgstr "Enable Magic Link Remote Login"
+
+#: cps/templates/config_edit.html:137
+msgid "Enable Kobo sync"
+msgstr "Kobo sync 활성화"
+
+#: cps/templates/config_edit.html:142
+msgid "Proxy unknown requests to Kobo Store"
+msgstr "Kobo Store에 알 수 없는 요청 프록시"
+
+#: cps/templates/config_edit.html:145
+msgid "Server External Port (for port forwarded API calls)"
+msgstr "서버 외부 포트(포트 전달 API 호출용)"
+
+#: cps/templates/config_edit.html:153
+msgid "Use Goodreads"
+msgstr "Goodreads 사용"
+
+#: cps/templates/config_edit.html:154
+msgid "Create an API Key"
+msgstr "API 키 생성"
+
+#: cps/templates/config_edit.html:158
+msgid "Goodreads API Key"
+msgstr "Goodreads API Key"
+
+#: cps/templates/config_edit.html:162
+msgid "Goodreads API Secret"
+msgstr "Goodreads API Secret"
+
+#: cps/templates/config_edit.html:169
+msgid "Allow Reverse Proxy Authentication"
+msgstr "역방향 프록시 인증 허용"
+
+#: cps/templates/config_edit.html:180
+msgid "Login type"
+msgstr "로그인 유형"
+
+#: cps/templates/config_edit.html:182
+msgid "Use Standard Authentication"
+msgstr "표준 인증 사용"
+
+#: cps/templates/config_edit.html:184
+msgid "Use LDAP Authentication"
+msgstr "LDAP 인증 사용"
+
+#: cps/templates/config_edit.html:187
+msgid "Use OAuth"
+msgstr "OAuth 사용"
+
+#: cps/templates/config_edit.html:194
+msgid "LDAP Server Host Name or IP Address"
+msgstr "LDAP 서버 호스트 이름 또는 IP 주소"
+
+#: cps/templates/config_edit.html:198
+msgid "LDAP Server Port"
+msgstr "LDAP 서버 포트"
+
+#: cps/templates/config_edit.html:202
+msgid "LDAP Encryption"
+msgstr "LDAP 암호화"
+
+#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
+#: cps/templates/email_edit.html:41
+msgid "None"
+msgstr "None"
+
+#: cps/templates/config_edit.html:205
+msgid "TLS"
+msgstr "TLS"
+
+#: cps/templates/config_edit.html:206
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/config_edit.html:210
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP CACertificate 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:217
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP 인증서 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:224
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP 키 파일 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:233
+msgid "LDAP Authentication"
+msgstr "LDAP 인증"
+
+#: cps/templates/config_edit.html:235
+msgid "Anonymous"
+msgstr "익명"
+
+#: cps/templates/config_edit.html:236
+msgid "Unauthenticated"
+msgstr "인증되지 않음"
+
+#: cps/templates/config_edit.html:237
+msgid "Simple"
+msgstr "Simple"
+
+#: cps/templates/config_edit.html:242
+msgid "LDAP Administrator Username"
+msgstr "LDAP 관리자 사용자 이름"
+
+#: cps/templates/config_edit.html:248
+msgid "LDAP Administrator Password"
+msgstr "LDAP 관리자 비밀번호"
+
+#: cps/templates/config_edit.html:253
+msgid "LDAP Distinguished Name (DN)"
+msgstr "LDAP 고유 이름(DN)"
+
+#: cps/templates/config_edit.html:257
+msgid "LDAP User Object Filter"
+msgstr "LDAP 사용자 개체 필터"
+
+#: cps/templates/config_edit.html:262
+msgid "LDAP Server is OpenLDAP?"
+msgstr "LDAP 서버는 OpenLDAP입니까?"
+
+#: cps/templates/config_edit.html:264
+msgid "Following Settings are Needed For User Import"
+msgstr "사용자 가져오기에는 다음 설정이 필요"
+
+#: cps/templates/config_edit.html:266
+msgid "LDAP Group Object Filter"
+msgstr "LDAP 그룹 개체 필터"
+
+#: cps/templates/config_edit.html:270
+msgid "LDAP Group Name"
+msgstr "DAP 그룹 이름"
+
+#: cps/templates/config_edit.html:274
+msgid "LDAP Group Members Field"
+msgstr "LDAP 그룹 구성원 필드"
+
+#: cps/templates/config_edit.html:278
+msgid "LDAP Member User Filter Detection"
+msgstr "LDAP 구성원 사용자 필터 감지"
+
+#: cps/templates/config_edit.html:280
+msgid "Autodetect"
+msgstr "자동 감지"
+
+#: cps/templates/config_edit.html:281
+msgid "Custom Filter"
+msgstr "맞춤 필터"
+
+#: cps/templates/config_edit.html:286
+msgid "LDAP Member User Filter"
+msgstr "LDAP 구성원 사용자 필터"
+
+#: cps/templates/config_edit.html:297
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr "%(provider)s OAuth 자격 증명 얻기"
+
+#: cps/templates/config_edit.html:300
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr "%(provider)s OAuth 클라이언트 ID"
+
+#: cps/templates/config_edit.html:304
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth 클라이언트 암호"
+
+#: cps/templates/config_edit.html:320
+msgid "External binaries"
+msgstr "외부 바이너리"
+
+#: cps/templates/config_edit.html:326
+msgid "Path to Calibre E-Book Converter"
+msgstr "Calibre E-Book 변환기 경로"
+
+#: cps/templates/config_edit.html:334
+msgid "Calibre E-Book Converter Settings"
+msgstr "Calibre E-Book 변환기 경로 설정"
+
+#: cps/templates/config_edit.html:337
+msgid "Path to Kepubify E-Book Converter"
+msgstr "Kepubify 전자책 변환기 경로"
+
+#: cps/templates/config_edit.html:345
+msgid "Location of Unrar binary"
+msgstr "Unrar 바이너리의 위치"
+
+#: cps/templates/config_view_edit.html:17
+msgid "View Configuration"
+msgstr "환경 설정 보기"
+
+#: cps/templates/config_view_edit.html:32
+msgid "No. of Random Books to Display"
+msgstr "랜덤 보기시 표시할 책 수"
+
+#: cps/templates/config_view_edit.html:36
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr "숨기기 전에 표시할 저자 수(0=숨기기 비활성화)"
+
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+msgid "Theme"
+msgstr "테마"
+
+#: cps/templates/config_view_edit.html:42
+msgid "Standard Theme"
+msgstr "기본 테마"
+
+#: cps/templates/config_view_edit.html:43
+msgid "caliBlur! Dark Theme"
+msgstr "caliBlur! 다크 모드"
+
+#: cps/templates/config_view_edit.html:47
+msgid "Regular Expression for Ignoring Columns"
+msgstr "열을 무시하는 정규식"
+
+#: cps/templates/config_view_edit.html:51
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr "읽음/읽지 않음 상태를 Calibre 열에 연결"
+
+#: cps/templates/config_view_edit.html:60
+msgid "View Restrictions based on Calibre column"
+msgstr "Calibre 열을 기반으로 한 보기 제한"
+
+#: cps/templates/config_view_edit.html:69
+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:96
+msgid "Admin User"
+msgstr "관리자"
+
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
+msgid "Allow Downloads"
+msgstr "다운로드 허용"
+
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
+msgid "Allow eBook Viewer"
+msgstr "책 보기 허용"
+
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
+msgid "Allow Uploads"
+msgstr "업로드 허용"
+
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
+msgid "Allow Edit"
+msgstr "편집 허용"
+
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
+msgid "Allow Delete Books"
+msgstr "책 삭제 허용"
+
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
+msgid "Allow Changing Password"
+msgstr "비밀번호 변경 허용"
+
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
+msgid "Allow Editing Public Shelves"
+msgstr "공개 서재 편집 허용"
+
+#: cps/templates/config_view_edit.html:123
+msgid "Default Language"
+msgstr "기본 언어"
+
+#: cps/templates/config_view_edit.html:131
+msgid "Default Visible Language of Books"
+msgstr "책의 기본 표시 언어"
+
+#: cps/templates/config_view_edit.html:147
+msgid "Default Visibilities for New Users"
+msgstr "신규 사용자를 위한 기본 기능"
+
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
+#: cps/templates/user_table.html:154
+msgid "Show Random Books in Detail View"
+msgstr "상세 보기에서 임의의 책 표시"
+
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
+msgid "Add Allowed/Denied Tags"
+msgstr "허용/거부 태그 추가"
+
+#: cps/templates/config_view_edit.html:166
+msgid "Add Allowed/Denied custom column values"
+msgstr "허용/거부 사용자 정의 열 값 추가"
+
+#: cps/templates/detail.html:60 cps/templates/detail.html:69
+msgid "Read in Browser"
+msgstr "부라우저에서 보기"
+
+#: cps/templates/detail.html:77 cps/templates/detail.html:94
+msgid "Listen in Browser"
+msgstr "브라우저에서 듣기"
+
+#: cps/templates/detail.html:124
+#, python-format
+msgid "Book %(index)s of %(range)s"
+msgstr "책 %(index)s의 %(range)s"
+
+#: cps/templates/detail.html:173
+msgid "Published"
+msgstr "출간일"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Unread"
+msgstr "읽지 않은 상태로 표시"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Read"
+msgstr "읽은 상태로 표시"
+
+#: cps/templates/detail.html:222
+msgid "Read"
+msgstr "읽기"
+
+#: cps/templates/detail.html:231
+msgid "Restore from archive"
+msgstr "아카이브에서 복원"
+
+#: cps/templates/detail.html:231
+msgid "Add to archive"
+msgstr "아카이브에 추가"
+
+#: cps/templates/detail.html:232
+msgid "Archived"
+msgstr "보관됨"
+
+#: cps/templates/detail.html:243
+msgid "Description:"
+msgstr "설명:"
+
+#: cps/templates/detail.html:256 cps/templates/search.html:14
+msgid "Add to shelf"
+msgstr "서재에 추가"
+
+#: cps/templates/detail.html:267 cps/templates/detail.html:284
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
+#: cps/templates/search.html:20
+msgid "(Public)"
+msgstr "(공개)"
+
+#: cps/templates/detail.html:298
+msgid "Edit Metadata"
+msgstr "메타저오 편집"
+
+#: cps/templates/email_edit.html:13
+msgid "Choose Server Type"
+msgstr "서버 유형 선택"
+
+#: cps/templates/email_edit.html:15
+msgid "Use Standard E-Mail Account"
+msgstr "표준 이메일 계정 사용"
+
+#: cps/templates/email_edit.html:16
+msgid "Gmail Account with OAuth2 Verification"
+msgstr "OAuth2 인증이 있는 Gmail 계정"
+
+#: cps/templates/email_edit.html:22
+msgid "Setup Gmail Account as E-Mail Server"
+msgstr "Gmail 계정을 이메일 서버로 설정"
+
+#: cps/templates/email_edit.html:24
+msgid "Revoke Gmail Access"
+msgstr "Gmail 액세스 취소"
+
+#: cps/templates/email_edit.html:42
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:43
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:51
+msgid "SMTP Password"
+msgstr "SMTP 비밀번호"
+
+#: cps/templates/email_edit.html:58
+msgid "Attachment Size Limit"
+msgstr "첨부 파일 크기 제한"
+
+#: cps/templates/email_edit.html:66
+msgid "Save and Send Test E-mail"
+msgstr "저장 후 테스트 이메일 보내기"
+
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
+msgid "Back"
+msgstr "뒤로"
+
+#: cps/templates/email_edit.html:74
+msgid "Allowed Domains (Whitelist)"
+msgstr "허용하는 도메인(화이트 리스트)"
+
+#: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
+msgid "Add Domain"
+msgstr "도메인 추가"
+
+#: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
+#: cps/templates/user_table.html:27
+msgid "Add"
+msgstr "추가"
+
+#: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
+msgid "Enter domainname"
+msgstr "도메인 입력"
+
+#: cps/templates/email_edit.html:92
+msgid "Denied Domains (Blacklist)"
+msgstr "거부 도메인(블랙리스트)"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+msgid "Next"
+msgstr "다음"
+
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr "텍스트 편집기에서 .kobo/Kobo eReader.conf 파일을 열고 다음을 추가(또는 편집):"
+
+#: cps/templates/http_error.html:31
+msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
+msgstr "Calibre-Web Instance가 구성되지 않았습니다. 관리자에게 문의"
+
+#: cps/templates/http_error.html:41
+msgid "Create Issue"
+msgstr "이슈 생성"
+
+#: cps/templates/http_error.html:48
+msgid "Return to Home"
+msgstr "홈으로"
+
+#: cps/templates/http_error.html:50
+msgid "Logout User"
+msgstr "로그아웃"
+
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr "다운로드 횟수에 따라 오름차순 정렬"
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr "다운로드 횟수에 따라 내림차순 정렬"
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
+#: cps/templates/shelf.html:21
+msgid "Sort authors in alphabetical order"
+msgstr "저자를 가나다순(알파벳순)으로 정렬"
+
+#: cps/templates/index.html:77 cps/templates/search.html:34
+#: cps/templates/shelf.html:22
+msgid "Sort authors in reverse alphabetical order"
+msgstr "저자를 가나다(알파벳) 역순으로 정렬"
+
+#: cps/templates/index.html:81
+msgid "Sort ascending according to series index"
+msgstr "시리즈 인덱스에 따라 오름차순 정렬"
+
+#: cps/templates/index.html:82
+msgid "Sort descending according to series index"
+msgstr "시리즈 인덱스에 따라 내림차순 정렬"
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "시작"
+
+#: cps/templates/index.xml:18
+msgid "Alphabetical Books"
+msgstr "가나다(알파벳) 순"
+
+#: cps/templates/index.xml:22
+msgid "Books sorted alphabetically"
+msgstr "가나다(알파벳)순으로 정렬한 책"
+
+#: cps/templates/index.xml:29
+msgid "Popular publications from this catalog based on Downloads."
+msgstr "다운로드 기준 인기 도서."
+
+#: cps/templates/index.xml:36
+msgid "Popular publications from this catalog based on Rating."
+msgstr "별점 기준 인기 도서."
+
+#: cps/templates/index.xml:39
+msgid "Recently added Books"
+msgstr "최근 추가된 도서"
+
+#: cps/templates/index.xml:43
+msgid "The latest Books"
+msgstr "최신 도서"
+
+#: cps/templates/index.xml:46
+msgid "Random Books"
+msgstr "랜덤 정렬"
+
+#: cps/templates/index.xml:73
+msgid "Books ordered by Author"
+msgstr "저자별 정렬"
+
+#: cps/templates/index.xml:80
+msgid "Books ordered by publisher"
+msgstr "출판사별 정렬"
+
+#: cps/templates/index.xml:87
+msgid "Books ordered by category"
+msgstr "카테고리별 정렬"
+
+#: cps/templates/index.xml:94
+msgid "Books ordered by series"
+msgstr "시리즈별 정렬"
+
+#: cps/templates/index.xml:101
+msgid "Books ordered by Languages"
+msgstr "언어별 정렬"
+
+#: cps/templates/index.xml:108
+msgid "Books ordered by Rating"
+msgstr "평점별 정렬"
+
+#: cps/templates/index.xml:116
+msgid "Books ordered by file formats"
+msgstr "파일 종류별 정렬"
+
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/search_form.html:87
+msgid "Shelves"
+msgstr "서재"
+
+#: cps/templates/index.xml:123
+msgid "Books organized in shelves"
+msgstr "서재별 정렬"
+
+#: cps/templates/layout.html:29
+msgid "Home"
+msgstr "홈"
+
+#: cps/templates/layout.html:35
+msgid "Toggle Navigation"
+msgstr "탐색 활성화"
+
+#: cps/templates/layout.html:46
+msgid "Search Library"
+msgstr "검색"
+
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
+msgid "Uploading..."
+msgstr "업로드 중..."
+
+#: cps/templates/layout.html:63
+msgid "Error"
+msgstr "오류"
+
+#: cps/templates/layout.html:63
+msgid "Upload done, processing, please wait..."
+msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
+
+#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
+msgid "Settings"
+msgstr "설정"
+
+#: cps/templates/layout.html:78
+msgid "Account"
+msgstr "계정"
+
+#: cps/templates/layout.html:80
+msgid "Logout"
+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/login.html:18
+msgid "Remember Me"
+msgstr "로그인 유지"
+
+#: cps/templates/login.html:23
+msgid "Forgot Password?"
+msgstr "비밀번호를 잊으셨나요?"
+
+#: cps/templates/login.html:26
+msgid "Log in with Magic Link"
+msgstr "Magic Link로 로그인"
+
+#: 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 "Calibre-Web 로그 다운로드"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Access Log 다운로드"
+
+#: 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/modal_dialogs.html:134
+msgid "Ok"
+msgstr "Ok"
+
+#: cps/templates/osd.xml:5
+msgid "Calibre-Web eBook Catalog"
+msgstr "Calibre-Web 책 목록"
+
+#: cps/templates/read.html:6
+msgid "epub Reader"
+msgstr "epub 리더"
+
+#: cps/templates/read.html:75
+msgid "Reflow text when sidebars are open."
+msgstr "사이드바가 열려 있을 때 텍스트 다시 배열."
+
+#: cps/templates/readcbr.html:7
+msgid "Comic Reader"
+msgstr "코믹 리더"
+
+#: cps/templates/readcbr.html:89
+msgid "Keyboard Shortcuts"
+msgstr "키보드 단축키"
+
+#: cps/templates/readcbr.html:92
+msgid "Previous Page"
+msgstr "이전 페이지"
+
+#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+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/readcbr.html:165
+msgid "Reset to Top"
+msgstr "맨 위로 재설정"
+
+#: cps/templates/readcbr.html:166
+msgid "Remember Position"
+msgstr "위치 기억"
+
+#: cps/templates/readcbr.html:171
+msgid "Scrollbar"
+msgstr "스크롤바"
+
+#: cps/templates/readcbr.html:174
+msgid "Show"
+msgstr "보기"
+
+#: cps/templates/readcbr.html:175
+msgid "Hide"
+msgstr "숨기기"
+
+#: cps/templates/readdjvu.html:5
+msgid "DJVU Reader"
+msgstr "DJVU 리더"
+
+#: cps/templates/readpdf.html:29
+msgid "PDF Reader"
+msgstr "PDF 리더"
+
+#: cps/templates/readtxt.html:6
+msgid "txt Reader"
+msgstr "텍스트 리더"
+
+#: cps/templates/register.html:4
+msgid "Register New Account"
+msgstr "새 계정 등록"
+
+#: cps/templates/register.html:10
+msgid "Choose a username"
+msgstr "사용자 이름 선택"
+
+#: cps/templates/register.html:15
+msgid "Your email address"
+msgstr "이메일 주소"
+
+#: cps/templates/remote_login.html:5
+msgid "Magic Link - Authorise New Device"
+msgstr "Magic Link - 새 장치 승인"
+
+#: cps/templates/remote_login.html:7
+msgid "On another device, login and visit:"
+msgstr "다른 기기에서는 로그인 하고 방문:"
+
+#: cps/templates/remote_login.html:11
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr "승인이 되면 이 장치에 자동으로 로그인됩니다."
+
+#: cps/templates/remote_login.html:14
+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:21
+msgid "Published Date From"
+msgstr "출간일(부터)"
+
+#: cps/templates/search_form.html:31
+msgid "Published Date To"
+msgstr "출간일(까지)"
+
+#: cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "읽은 상태"
+
+#: cps/templates/search_form.html:59
+msgid "Exclude Tags"
+msgstr "태그 제외"
+
+#: cps/templates/search_form.html:77
+msgid "Exclude Series"
+msgstr "시리즈 제외"
+
+#: cps/templates/search_form.html:95
+msgid "Exclude Shelves"
+msgstr "서재 제외"
+
+#: cps/templates/search_form.html:115
+msgid "Exclude Languages"
+msgstr "언어 제외"
+
+#: cps/templates/search_form.html:126
+msgid "Extensions"
+msgstr "확장자"
+
+#: cps/templates/search_form.html:134
+msgid "Exclude Extensions"
+msgstr "확장자 제외"
+
+#: cps/templates/search_form.html:144
+msgid "Rating Above"
+msgstr "평점(이상)"
+
+#: cps/templates/search_form.html:148
+msgid "Rating Below"
+msgstr "평점(이하)"
+
+#: cps/templates/search_form.html:180
+msgid "From:"
+msgstr "부터:"
+
+#: cps/templates/search_form.html:190
+msgid "To:"
+msgstr "까지:"
+
+#: cps/templates/shelf.html:11
+msgid "Delete this Shelf"
+msgstr "이 서재 삭제"
+
+#: cps/templates/shelf.html:12
+msgid "Edit Shelf Properties"
+msgstr "서재 속성 편집"
+
+#: cps/templates/shelf.html:14
+msgid "Arrange books manually"
+msgstr "수동으로 책 정렬"
+
+#: cps/templates/shelf.html:15
+msgid "Disable Change order"
+msgstr "정렬 변경 비활성화"
+
+#: cps/templates/shelf.html:15
+msgid "Enable Change order"
+msgstr "정렬 변경 활성화"
+
+#: cps/templates/shelf.html:94
+msgid "Shelf will be deleted for all users"
+msgstr "모든 사용자의 서가가 삭제됨"
+
+#: cps/templates/shelf_edit.html:14
+msgid "Share with Everyone"
+msgstr "모두와 공유"
+
+#: cps/templates/shelf_edit.html:21
+msgid "Sync this shelf with Kobo device"
+msgstr "이 서재를 Kobo 기기와 동기화"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag to Rearrange Order"
+msgstr "드래그하여 순서 변경"
+
+#: cps/templates/shelf_order.html:33
+msgid "Hidden Book"
+msgstr "숨겨진 책"
+
+#: cps/templates/stats.html:7
+msgid "Library Statistics"
+msgstr "Calibre 서재 통계"
+
+#: 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 "Progress"
+
+#: cps/templates/tasks.html:17
+msgid "Run Time"
+msgstr "실행 시간"
+
+#: cps/templates/tasks.html:18
+msgid "Start Time"
+msgstr "시작 시간"
+
+#: cps/templates/user_edit.html:20
+msgid "Reset user Password"
+msgstr "사용자 비밀번호 초기화"
+
+#: cps/templates/user_edit.html:43
+msgid "Language of Books"
+msgstr "책 언어"
+
+#: cps/templates/user_edit.html:54
+msgid "OAuth Settings"
+msgstr "OAuth 설정"
+
+#: cps/templates/user_edit.html:56
+msgid "Link"
+msgstr "링크"
+
+#: cps/templates/user_edit.html:58
+msgid "Unlink"
+msgstr "링크 해제"
+
+#: cps/templates/user_edit.html:64
+msgid "Kobo Sync Token"
+msgstr "코보 연동 토큰"
+
+#: cps/templates/user_edit.html:66
+msgid "Create/View"
+msgstr "생성/보기"
+
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr "강제로 코보 전체 동기화"
+
+#: cps/templates/user_edit.html:88
+msgid "Add allowed/Denied Custom Column Values"
+msgstr "허용/거부 사용자 정의 열 값 추가"
+
+#: cps/templates/user_edit.html:137
+msgid "Sync only books in selected shelves with Kobo"
+msgstr "선택한 서가에 있는 책만 Kobo와 동기화"
+
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
+msgid "Delete User"
+msgstr "사용자 삭제"
+
+#: cps/templates/user_edit.html:159
+msgid "Generate Kobo Auth URL"
+msgstr "Kobo Auth URL 생성"
+
+#: cps/templates/user_table.html:80 cps/templates/user_table.html:103
+msgid "Select..."
+msgstr "선택..."
+
+#: cps/templates/user_table.html:131
+msgid "Edit User"
+msgstr "사용자 편집"
+
+#: cps/templates/user_table.html:134
+msgid "Enter Username"
+msgstr "사용자 이름"
+
+#: cps/templates/user_table.html:135
+msgid "Enter E-mail Address"
+msgstr "이메일 주소 입력"
+
+#: cps/templates/user_table.html:136
+msgid "Enter Kindle E-mail Address"
+msgstr "킨들 이메일 주소 입력"
+
+#: cps/templates/user_table.html:136
+msgid "Kindle E-mail"
+msgstr "킨들 이메일"
+
+#: cps/templates/user_table.html:137
+msgid "Locale"
+msgstr "언어"
+
+#: cps/templates/user_table.html:138
+msgid "Visible Book Languages"
+msgstr "표시할 책 언어"
+
+#: cps/templates/user_table.html:139
+msgid "Edit Allowed Tags"
+msgstr "허용된 태그 편집"
+
+#: cps/templates/user_table.html:139
+msgid "Allowed Tags"
+msgstr "허용된 태그"
+
+#: cps/templates/user_table.html:140
+msgid "Edit Denied Tags"
+msgstr "거부된 태그 편집"
+
+#: cps/templates/user_table.html:140
+msgid "Denied Tags"
+msgstr "거부된 태그"
+
+#: cps/templates/user_table.html:141
+msgid "Edit Allowed Column Values"
+msgstr "허용된 열 값 편집"
+
+#: cps/templates/user_table.html:141
+msgid "Allowed Column Values"
+msgstr "허용되는 열 값"
+
+#: cps/templates/user_table.html:142
+msgid "Edit Denied Column Values"
+msgstr "거부된 열 값 편집"
+
+#: cps/templates/user_table.html:142
+msgid "Denied Column Values"
+msgstr "거부된 열 값"
+
+#: cps/templates/user_table.html:144
+msgid "Change Password"
+msgstr "비밀번호 변경"
+
+#: cps/templates/user_table.html:147
+msgid "View"
+msgstr "보기"
+
+#: cps/templates/user_table.html:150
+msgid "Edit Public Shelves"
+msgstr "공개 서재 편집"
+
+#: cps/templates/user_table.html:152
+msgid "Sync selected Shelves with Kobo"
+msgstr "선택한 서재를 코보와 동기화"
+
+#: cps/templates/user_table.html:156
+msgid "Show read/unread selection"
+msgstr "읽음/읽지 않음 선택 표시"
+
+#: cps/templates/user_table.html:159
+msgid "Show random books"
+msgstr "랜덤 보기 표시"

From e3dbf7a88dd34b7c2a07ca8b538d1874c6a3c05f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 7 Jan 2022 12:40:03 +0100
Subject: [PATCH 099/412] Bugfixes load metadata Improvements for testing load
 metadata

---
 cps/metadata_provider/comicvine.py |  2 +-
 cps/metadata_provider/google.py    |  2 +-
 cps/static/js/get_meta.js          |  2 +-
 cps/templates/book_edit.html       | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py
index 00c345991..45e5f3418 100644
--- a/cps/metadata_provider/comicvine.py
+++ b/cps/metadata_provider/comicvine.py
@@ -36,7 +36,7 @@ class ComicVine(Metadata):
 
             result = requests.get("https://comicvine.gamespot.com/api/search?api_key="
                                   + apikey + "&resources=issue&query=" + query + "&sort=name:desc&format=json", headers=headers)
-            for r in result.json()['results']:
+            for r in result.json().get('results'):
                 seriesTitle = r['volume'].get('name', "")
                 if r.get('store_date'):
                     dateFomers = r.get('store_date')
diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index cf166f2eb..1bc8185be 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -30,7 +30,7 @@ class Google(Metadata):
         if self.active:
             val = list()
             result = requests.get("https://www.googleapis.com/books/v1/volumes?q="+query.replace(" ","+"))
-            for r in result.json()['items']:
+            for r in result.json().get('items'):
                 v = dict()
                 v['id'] = r['id']
                 v['title'] = r['volumeInfo'].get('title',"")
diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index 2ad4d53b8..aab767a23 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -40,7 +40,7 @@ $(function () {
         $("#book_title").val(book.title);
         $("#tags").val(uniqueTags.join(", "));
         $("#rating").data("rating").setValue(Math.round(book.rating));
-        if(book.cover){
+        if(book.cover && $("#cover_url").length){
             $(".cover img").attr("src", book.cover);
             $("#cover_url").val(book.cover);
         }
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 9d2ac14eb..57470858c 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -247,7 +247,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
+        <button id="meta_close" type="button" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
       </div>
     </div>
   </div>
@@ -265,17 +265,17 @@
     >
     <div class="media-body">
       <h4 class="media-heading">
-        <a href="<%= url %>" target="_blank" rel="noopener"><%= title %></a>
+        <a class="meta_title" href="<%= url %>" target="_blank" rel="noopener"><%= title %></a>
       </h4>
-      <p>{{_('Author')}}：<%= authors.join(" & ") %></p>
+      <p class="meta_author">{{_('Author')}}：<%= authors.join(" & ") %></p>
       <% if (publisher) { %>
-        <p>{{_('Publisher')}}：<%= publisher %></p>
+        <p class="meta_publisher">{{_('Publisher')}}：<%= publisher %></p>
       <% } %>
       <% if (description) { %>
-        <p>{{_('Description')}}: <%= description %></p>
+        <p class="meta_description">{{_('Description')}}: <%= description %></p>
       <% } %>
       <p>{{_('Source')}}:
-        <a href="<%= source.link %>" target="_blank" rel="noopener"><%= source.description %></a>
+        <a class="meta_source" href="<%= source.link %>" target="_blank" rel="noopener"><%= source.description %></a>
       </p>
     </div>
   </li>

From df670795731e7568462869b815f4eb39da1bb41a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 8 Jan 2022 14:24:31 +0100
Subject: [PATCH 100/412] Fixes for kobosync with multiple users (#2230)

---
 cps/editbooks.py        |  2 +-
 cps/kobo.py             | 32 +++++++++++++++-----------------
 cps/kobo_sync_status.py | 10 +++++++---
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index e20cfcfb2..182484166 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -836,7 +836,7 @@ def edit_book(book_id):
 
             if modif_date:
                 book.last_modified = datetime.utcnow()
-                kobo_sync_status.remove_synced_book(edited_books_id)
+                kobo_sync_status.remove_synced_book(edited_books_id, all=True)
 
             calibre_db.session.merge(book)
             calibre_db.session.commit()
diff --git a/cps/kobo.py b/cps/kobo.py
index c74a32300..706056d33 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -173,10 +173,10 @@ def HandleSyncRequest():
                                                        ub.BookShelf.date_added,
                                                        ub.ArchivedBook.is_archived)
         changed_entries = (changed_entries
-                .join(db.Data).outerjoin(ub.ArchivedBook, db.Books.id == ub.ArchivedBook.book_id)
-                .join(ub.KoboSyncedBooks, ub.KoboSyncedBooks.book_id == db.Books.id, isouter=True)
-                .filter(or_(ub.KoboSyncedBooks.user_id != current_user.id,
-                            ub.KoboSyncedBooks.book_id == None))
+                           .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                                          ub.ArchivedBook.user_id == current_user.id))
+                           .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
+                                           .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
                 .filter(ub.BookShelf.date_added > sync_token.books_last_modified)
                 .filter(db.Data.format.in_(KOBO_FORMATS))
                 .filter(calibre_db.common_filters(allow_show_archived=True))
@@ -196,11 +196,11 @@ def HandleSyncRequest():
                                                        ub.ArchivedBook.last_modified,
                                                        ub.ArchivedBook.is_archived)
         changed_entries = (changed_entries
-                   .join(db.Data).outerjoin(ub.ArchivedBook, db.Books.id == ub.ArchivedBook.book_id)
-                   .join(ub.KoboSyncedBooks, ub.KoboSyncedBooks.book_id == db.Books.id, isouter=True)
-                   .filter(or_(ub.KoboSyncedBooks.user_id != current_user.id,
-                               ub.KoboSyncedBooks.book_id == None))
-                   .filter(calibre_db.common_filters())
+                   .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                                  ub.ArchivedBook.user_id == current_user.id))
+                   .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
+                                              .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
+                   .filter(calibre_db.common_filters(allow_show_archived=True))
                    .filter(db.Data.format.in_(KOBO_FORMATS))
                    .order_by(db.Books.last_modified)
                    .order_by(db.Books.id)
@@ -257,10 +257,12 @@ def HandleSyncRequest():
     if sqlalchemy_version2:
         max_change = calibre_db.session.execute(changed_entries
                                                 .filter(ub.ArchivedBook.is_archived)
+                                                .filter(ub.ArchivedBook.user_id == current_user.id)
                                                 .order_by(func.datetime(ub.ArchivedBook.last_modified).desc()))\
             .columns(db.Books).first()
     else:
-        max_change = changed_entries.from_self().filter(ub.ArchivedBook.is_archived) \
+        max_change = changed_entries.from_self().filter(ub.ArchivedBook.is_archived)\
+            .filter(ub.ArchivedBook.user_id==current_user.id) \
             .order_by(func.datetime(ub.ArchivedBook.last_modified).desc()).first()
 
     max_change = max_change.last_modified if max_change else new_archived_last_modified
@@ -339,7 +341,7 @@ def generate_sync_response(sync_token, sync_results, set_cont=False):
         extra_headers["x-kobo-sync"] = "continue"
     sync_token.to_headers(extra_headers)
 
-    log.debug("Kobo Sync Content: {}".format(sync_results))
+    # log.debug("Kobo Sync Content: {}".format(sync_results))
     # jsonify decodes the unicode string different to what kobo expects
     response = make_response(json.dumps(sync_results), extra_headers)
     response.headers["Content-Type"] = "application/json; charset=utf-8"
@@ -671,11 +673,8 @@ def HandleTagRemoveItem(tag_id):
 # Note: Public shelves that aren't owned by the user aren't supported.
 def sync_shelves(sync_token, sync_results, only_kobo_shelves=False):
     new_tags_last_modified = sync_token.tags_last_modified
-
-    for shelf in ub.session.query(ub.ShelfArchive).filter(
-        func.datetime(ub.ShelfArchive.last_modified) > sync_token.tags_last_modified,
-        ub.ShelfArchive.user_id == current_user.id
-    ):
+    # transmit all archived shelfs independent of last sync (why should this matter?)
+    for shelf in ub.session.query(ub.ShelfArchive).filter(ub.ShelfArchive.user_id == current_user.id):
         new_tags_last_modified = max(shelf.last_modified, new_tags_last_modified)
         sync_results.append({
             "DeletedTag": {
@@ -688,7 +687,6 @@ def sync_shelves(sync_token, sync_results, only_kobo_shelves=False):
         ub.session.delete(shelf)
         ub.session_commit()
 
-
     extra_filters = []
     if only_kobo_shelves:
         for shelf in ub.session.query(ub.Shelf).filter(
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index eee47d896..a22ec1651 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -20,7 +20,7 @@
 from flask_login import current_user
 from . import ub
 import datetime
-from sqlalchemy.sql.expression import or_, and_
+from sqlalchemy.sql.expression import or_, and_, true
 
 # Add the current book id to kobo_synced_books table for current user, if entry is already present,
 # do nothing (safety precaution)
@@ -36,9 +36,13 @@ def add_synced_books(book_id):
 
 
 # Select all entries of current book in kobo_synced_books table, which are from current user and delete them
-def remove_synced_book(book_id):
+def remove_synced_book(book_id, all=False):
+    if not all:
+        user = ub.KoboSyncedBooks.user_id == current_user.id
+    else:
+        user = true()
     ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id) \
-        .filter(ub.KoboSyncedBooks.user_id == current_user.id).delete()
+        .filter(user).delete()
     ub.session_commit()
 
 

From 96b1e8960ba9b2e50aeeed6690ed676a4194aa04 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 9 Jan 2022 12:55:38 +0100
Subject: [PATCH 101/412] Bugfix send to kindle with multiple formats

---
 cps/templates/detail.html               |    2 +-
 optional-requirements.txt               |    2 +-
 setup.cfg                               |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 1479 ++++++++++++++++-------
 4 files changed, 1058 insertions(+), 427 deletions(-)

diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 1fd5f09ae..c8d7d5276 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -41,7 +41,7 @@
                 <div id="sendbtn" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" data-text="{{_('Send to Kindle')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</div>
               {% else %}
                 <div class="btn-group" role="group">
-                  <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle postAction" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="glyphicon glyphicon-send"></span>{{_('Send to Kindle')}}
                     <span class="caret"></span>
                   </button>
diff --git a/optional-requirements.txt b/optional-requirements.txt
index b90951aa9..2368be10b 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -22,7 +22,7 @@ goodreads>=0.3.2,<0.4.0
 python-Levenshtein>=0.12.0,<0.13.0
 
 # ldap login
-python-ldap>=3.0.0,<3.4.0
+python-ldap>=3.0.0,<3.5.0
 Flask-SimpleLDAP>=1.4.0,<1.5.0
 
 #oauth
diff --git a/setup.cfg b/setup.cfg
index a81102b8b..52f1d8135 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -75,7 +75,7 @@ goodreads =
     goodreads>=0.3.2,<0.4.0
     python-Levenshtein>=0.12.0,<0.13.0
 ldap =
-    python-ldap>=3.0.0,<3.4.0
+    python-ldap>=3.0.0,<3.5.0
     Flask-SimpleLDAP>=1.4.0,<1.5.0
 oauth =
     Flask-Dance>=2.0.0,<5.2.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 511300bef..8b724a932 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-02 17:11:15</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-08 19:04:30</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>2022-01-02 21:33:59</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-08 22:45:06</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>3h 43 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 0 min</p>
         </div>
       </div>
       </div>
@@ -411,45 +411,25 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEbookConvertCalibre</td>
-        <td class="text-center">15</td>
-        <td class="text-center">14</td>
+        <td class="text-center">18</td>
+        <td class="text-center">12</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 15)">Detail</a>
+            <a onclick="showClassDetail('c6', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft6.1" class="none bg-danger">
+        <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 643, in test_calibre_log
-    self.assertTrue(&#34; …&#34; in data)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -553,29 +533,210 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id="ft6.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 482, in test_ssl_smtp_setup_error
+    self.assertTrue(conv)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.14' class='hiddenRow bg-success'>
+        <tr id="et6.14" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
+    self.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et6.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 458, in test_starttls_smtp_setup_error
+    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;STARTTLS&#39;, &#39;mail_password&#39;:&#39;10234&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.15' class='hiddenRow bg-success'>
+        <tr id="et6.16" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
+    self.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et6.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 525, in test_user_convert_xss
+    self.create_user(&#39;&lt;p&gt;calibre Quick Start Guide&lt;/p&gt;&lt;img src=x onerror=alert(&#34;jo&#34;)&gt;&#39;, {&#39;password&#39;: &#39;123&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
+    return cls.change_user(config)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
+    ele = cls.driver.find_element_by_id(checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_role&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et6.18" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
+    self.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -734,11 +895,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">16</td>
-        <td class="text-center">13</td>
-        <td class="text-center">1</td>
+        <td class="text-center">14</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">
@@ -811,31 +972,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft10.8" class="none bg-danger">
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 657, in test_title_sort
-    self.assertEqual(7, len(self.search(&#39; book &#39;)))
-AssertionError: 7 != 6</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1277,12 +1418,12 @@ AssertionError: 7 != 6</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">17</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('c12', 18)">Detail</a>
@@ -1408,11 +1549,33 @@ AssertionError: 7 != 6</pre>
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id="et12.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 269, in test_bookslist_edit_seriesindex
+    bl = self.get_books_list(-1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_books_list
+    element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements_by_xpath(&#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1454,11 +1617,11 @@ AssertionError: 7 != 6</pre>
     
 
 
-    <tr id="su" class="failClass">
-        <td>TestEditMetadata</td>
+    <tr id="su" class="passClass">
+        <td>TestLoadMetadata</td>
+        <td class="text-center">1</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1468,31 +1631,11 @@ AssertionError: 7 != 6</pre>
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditMetadata - test_upload_book_lit</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 48, in test_upload_book_lit
-    self.assertEqual(&#34;&#34;, self.check_element_on_page((By.ID, &#34;Der Buchtitel&#34;)))
-AssertionError: &#39;&#39; != False</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1694,14 +1837,14 @@ AssertionError: &#39;&#39; != False</pre>
 
 
     <tr id="su" class="passClass">
-        <td>TestSTARTTLS</td>
-        <td class="text-center">3</td>
-        <td class="text-center">3</td>
+        <td>TestLoadMetadataScholar</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('c15', 3)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
@@ -1709,25 +1852,7 @@ AssertionError: &#39;&#39; != False</pre>
     
         <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt15.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='pt15.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
+                <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1735,79 +1860,391 @@ AssertionError: &#39;&#39; != False</pre>
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestSSL</td>
-        <td class="text-center">7</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
+    <tr id="su" class="errorClass">
+        <td>TestSTARTTLS</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 7)">Detail</a>
+            <a onclick="showClassDetail('c16', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id="ft16.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft16.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft16.1').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 70, in test_STARTTLS
+    self.assertTrue(conv)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et16.2" class="none bg-info">
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 87, in test_STARTTLS_SSL_setup_error
+    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;SSL/TLS&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et16.3" class="none bg-info">
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 106, in test_STARTTLS_resend_password
+    self.create_user(&#39;paswd_resend&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;a@b.com&#39;, &#39;edit_role&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
+    return cls.change_user(config)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
+    ele = cls.driver.find_element_by_id(checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_role&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestSSL</td>
+        <td class="text-center">7</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c17', 7)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="ft17.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft17.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft17.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 111, in test_SSL_None_setup_error
+    self.assertTrue(conv)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id="et17.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 86, in test_SSL_STARTTLS_setup_error
+    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;STARTTLS&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id="et17.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 126, in test_SSL_logging_email
+    self.setup_server(True, {&#39;mail_use_ssl&#39;: &#39;SSL/TLS&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id="et17.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 177, in test_SSL_non_admin_user
+    self.create_user(&#39;ssl_email&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;answer@beta.com&#39;, &#39;kindle_mail&#39;: &#39;answer@beta.com&#39;, &#39;download_role&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
+    return cls.change_user(config)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
+    ele = cls.driver.find_element_by_id(checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;download_role&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id="et17.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 64, in test_SSL_only
+    self.setup_server(False, {&#39;mail_use_ssl&#39;: &#39;SSL/TLS&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id="et17.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 135, in test_email_limit
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 265, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id="et17.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 217, in test_filepicker_two_file
+    accordions[0].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1821,13 +2258,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1845,13 +2282,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1869,13 +2306,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -1893,13 +2330,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -1917,13 +2354,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -1932,7 +2369,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -1941,7 +2378,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -1959,13 +2396,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 11)">Detail</a>
+            <a onclick="showClassDetail('c23', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -1974,7 +2411,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -1983,7 +2420,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -1992,7 +2429,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2001,7 +2438,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.5' class='hiddenRow bg-success'>
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2010,7 +2447,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.6' class='hiddenRow bg-success'>
+        <tr id='pt23.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2019,7 +2456,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.7' class='hiddenRow bg-success'>
+        <tr id='pt23.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2028,7 +2465,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.8' class='hiddenRow bg-success'>
+        <tr id='pt23.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2037,7 +2474,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.9' class='hiddenRow bg-success'>
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2046,7 +2483,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.10' class='hiddenRow bg-success'>
+        <tr id='pt23.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2055,7 +2492,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.11' class='hiddenRow bg-success'>
+        <tr id='pt23.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2065,21 +2502,21 @@ AssertionError: &#39;&#39; != False</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
+        <td class="text-center">3</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 5)">Detail</a>
+            <a onclick="showClassDetail('c24', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2088,16 +2525,38 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id="ft24.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft24.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 266, in test_kobo_sync_selected_shelfs
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 144, in inital_sync
+    self.assertEqual(24, len(data[15]))  # 120 new and 4 original books
+AssertionError: 24 != 25</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2106,16 +2565,36 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id="ft24.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft24.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 251, in test_sync_reading_state
+    self.assertEqual(len(data[1]), 5)  # 120 new and 4 original books
+AssertionError: 4 != 5</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2125,21 +2604,21 @@ AssertionError: &#39;&#39; != False</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">6</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 13)">Detail</a>
+            <a onclick="showClassDetail('c25', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2148,25 +2627,71 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id="ft25.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 618, in test_LDAP_SSL_CERTIFICATE
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id="et25.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.3" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 647, in test_LDAP_STARTTLS
+    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 265, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2175,16 +2700,36 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id="ft25.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 408, in test_LDAP_import
+    self.assertEqual(len(userlist), 4)
+AssertionError: 5 != 4</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2193,16 +2738,36 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id="ft25.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 229, in test_LDAP_login
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2211,7 +2776,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2220,25 +2785,65 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.10' class='hiddenRow bg-success'>
+        <tr id="ft25.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 766, in test_ldap_authentication
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.11' class='hiddenRow bg-success'>
+        <tr id="ft25.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1037, in test_ldap_kobo_sync
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.12' class='hiddenRow bg-success'>
+        <tr id='pt25.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2247,11 +2852,31 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.13' class='hiddenRow bg-success'>
+        <tr id="ft25.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 849, in test_ldap_opds_download_book
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2265,13 +2890,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 8)">Detail</a>
+            <a onclick="showClassDetail('c26', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2280,7 +2905,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2289,7 +2914,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2298,7 +2923,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2307,7 +2932,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2316,7 +2941,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2325,7 +2950,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2334,7 +2959,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2352,13 +2977,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 9)">Detail</a>
+            <a onclick="showClassDetail('c27', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2367,7 +2992,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2376,7 +3001,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2385,7 +3010,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2394,19 +3019,19 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id="st26.5" class="none bg-warning">
+        <tr id="st27.5" 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_st26.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st27.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st26.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st27.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_st26.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st27.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2420,7 +3045,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2429,7 +3054,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2438,7 +3063,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2447,7 +3072,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2465,13 +3090,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 15)">Detail</a>
+            <a onclick="showClassDetail('c28', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2480,7 +3105,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2489,7 +3114,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2498,7 +3123,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2507,7 +3132,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2516,7 +3141,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2525,7 +3150,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2534,7 +3159,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2543,7 +3168,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2552,7 +3177,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2561,7 +3186,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2570,7 +3195,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2579,7 +3204,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2588,7 +3213,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.14' class='hiddenRow bg-success'>
+        <tr id='pt28.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2597,7 +3222,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.15' class='hiddenRow bg-success'>
+        <tr id='pt28.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2615,13 +3240,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 2)">Detail</a>
+            <a onclick="showClassDetail('c29', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2630,7 +3255,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2648,13 +3273,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2663,7 +3288,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2681,13 +3306,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 23)">Detail</a>
+            <a onclick="showClassDetail('c31', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2696,7 +3321,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2705,7 +3330,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2714,7 +3339,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2723,7 +3348,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2732,7 +3357,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2741,7 +3366,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2750,7 +3375,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2759,7 +3384,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2768,7 +3393,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2777,7 +3402,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2786,7 +3411,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2795,7 +3420,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2804,7 +3429,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2813,7 +3438,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -2822,7 +3447,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.16' class='hiddenRow bg-success'>
+        <tr id='pt31.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -2831,7 +3456,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.17' class='hiddenRow bg-success'>
+        <tr id='pt31.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -2840,7 +3465,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.18' class='hiddenRow bg-success'>
+        <tr id='pt31.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -2849,7 +3474,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.19' class='hiddenRow bg-success'>
+        <tr id='pt31.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -2858,7 +3483,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.20' class='hiddenRow bg-success'>
+        <tr id='pt31.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -2867,7 +3492,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.21' class='hiddenRow bg-success'>
+        <tr id='pt31.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -2876,7 +3501,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.22' class='hiddenRow bg-success'>
+        <tr id='pt31.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -2885,7 +3510,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.23' class='hiddenRow bg-success'>
+        <tr id='pt31.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2903,13 +3528,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 1)">Detail</a>
+            <a onclick="showClassDetail('c32', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -2927,13 +3552,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 5)">Detail</a>
+            <a onclick="showClassDetail('c33', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -2942,7 +3567,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -2951,7 +3576,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -2960,7 +3585,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt32.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -2969,7 +3594,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -2987,13 +3612,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 8)">Detail</a>
+            <a onclick="showClassDetail('c34', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3002,7 +3627,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3011,7 +3636,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3020,7 +3645,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3029,7 +3654,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3038,7 +3663,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3047,7 +3672,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3056,7 +3681,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3074,13 +3699,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 3)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3089,7 +3714,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3098,7 +3723,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3116,13 +3741,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 14)">Detail</a>
+            <a onclick="showClassDetail('c36', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3131,7 +3756,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3140,7 +3765,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3149,7 +3774,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3158,7 +3783,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3167,7 +3792,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.6' class='hiddenRow bg-success'>
+        <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3176,7 +3801,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.7' class='hiddenRow bg-success'>
+        <tr id='pt36.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3185,7 +3810,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.8' class='hiddenRow bg-success'>
+        <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3194,7 +3819,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.9' class='hiddenRow bg-success'>
+        <tr id='pt36.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3203,7 +3828,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.10' class='hiddenRow bg-success'>
+        <tr id='pt36.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3212,7 +3837,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.11' class='hiddenRow bg-success'>
+        <tr id='pt36.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3221,19 +3846,19 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id="st35.12" class="none bg-warning">
+        <tr id="st36.12" 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_st35.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st35.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st36.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_st35.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st36.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3247,7 +3872,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.13' class='hiddenRow bg-success'>
+        <tr id='pt36.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3256,7 +3881,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.14' class='hiddenRow bg-success'>
+        <tr id='pt36.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3274,13 +3899,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 9)">Detail</a>
+            <a onclick="showClassDetail('c37', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3289,7 +3914,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3298,7 +3923,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3307,7 +3932,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3316,7 +3941,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3325,7 +3950,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3334,19 +3959,19 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id="st36.7" class="none bg-warning">
+        <tr id="st37.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_st36.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st37.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_st36.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st37.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3360,7 +3985,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3369,7 +3994,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.9' class='hiddenRow bg-success'>
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3387,13 +4012,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 2)">Detail</a>
+            <a onclick="showClassDetail('c38', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3402,7 +4027,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3420,13 +4045,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 18)">Detail</a>
+            <a onclick="showClassDetail('c39', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3435,7 +4060,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3444,7 +4069,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3453,7 +4078,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3462,7 +4087,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3471,7 +4096,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3480,7 +4105,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3489,7 +4114,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3498,7 +4123,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.9' class='hiddenRow bg-success'>
+        <tr id='pt39.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3507,7 +4132,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.10' class='hiddenRow bg-success'>
+        <tr id='pt39.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3516,7 +4141,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.11' class='hiddenRow bg-success'>
+        <tr id='pt39.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3525,7 +4150,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.12' class='hiddenRow bg-success'>
+        <tr id='pt39.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3534,7 +4159,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.13' class='hiddenRow bg-success'>
+        <tr id='pt39.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3543,7 +4168,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.14' class='hiddenRow bg-success'>
+        <tr id='pt39.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3552,7 +4177,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.15' class='hiddenRow bg-success'>
+        <tr id='pt39.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3561,7 +4186,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.16' class='hiddenRow bg-success'>
+        <tr id='pt39.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3570,7 +4195,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.17' class='hiddenRow bg-success'>
+        <tr id='pt39.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3579,7 +4204,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.18' class='hiddenRow bg-success'>
+        <tr id='pt39.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3597,13 +4222,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 1)">Detail</a>
+            <a onclick="showClassDetail('c40', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3621,13 +4246,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 21)">Detail</a>
+            <a onclick="showClassDetail('c41', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3636,7 +4261,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3645,7 +4270,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3654,7 +4279,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3663,7 +4288,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3672,7 +4297,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3681,7 +4306,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3690,7 +4315,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3699,7 +4324,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3708,7 +4333,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3717,7 +4342,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3726,7 +4351,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3735,7 +4360,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3744,7 +4369,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.14' class='hiddenRow bg-success'>
+        <tr id='pt41.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3753,7 +4378,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3762,7 +4387,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3771,7 +4396,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.17' class='hiddenRow bg-success'>
+        <tr id='pt41.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3780,7 +4405,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.18' class='hiddenRow bg-success'>
+        <tr id='pt41.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -3789,7 +4414,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.19' class='hiddenRow bg-success'>
+        <tr id='pt41.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -3798,7 +4423,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.20' class='hiddenRow bg-success'>
+        <tr id='pt41.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -3807,7 +4432,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.21' class='hiddenRow bg-success'>
+        <tr id='pt41.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -3825,13 +4450,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 34)">Detail</a>
+            <a onclick="showClassDetail('c42', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -3840,7 +4465,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -3849,7 +4474,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -3858,7 +4483,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -3867,7 +4492,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -3876,7 +4501,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -3885,7 +4510,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -3894,7 +4519,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -3903,7 +4528,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -3912,7 +4537,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -3921,7 +4546,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -3930,7 +4555,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -3939,7 +4564,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -3948,7 +4573,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -3957,7 +4582,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -3966,7 +4591,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -3975,7 +4600,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -3984,7 +4609,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -3993,7 +4618,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.19' class='hiddenRow bg-success'>
+        <tr id='pt42.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4002,7 +4627,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.20' class='hiddenRow bg-success'>
+        <tr id='pt42.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4011,7 +4636,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.21' class='hiddenRow bg-success'>
+        <tr id='pt42.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4020,7 +4645,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.22' class='hiddenRow bg-success'>
+        <tr id='pt42.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4029,7 +4654,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.23' class='hiddenRow bg-success'>
+        <tr id='pt42.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4038,7 +4663,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.24' class='hiddenRow bg-success'>
+        <tr id='pt42.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4047,7 +4672,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.25' class='hiddenRow bg-success'>
+        <tr id='pt42.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4056,7 +4681,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.26' class='hiddenRow bg-success'>
+        <tr id='pt42.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4065,7 +4690,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.27' class='hiddenRow bg-success'>
+        <tr id='pt42.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4074,7 +4699,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.28' class='hiddenRow bg-success'>
+        <tr id='pt42.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4083,7 +4708,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.29' class='hiddenRow bg-success'>
+        <tr id='pt42.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4092,7 +4717,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.30' class='hiddenRow bg-success'>
+        <tr id='pt42.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4101,7 +4726,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.31' class='hiddenRow bg-success'>
+        <tr id='pt42.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4110,7 +4735,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.32' class='hiddenRow bg-success'>
+        <tr id='pt42.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4119,7 +4744,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.33' class='hiddenRow bg-success'>
+        <tr id='pt42.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4128,7 +4753,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.34' class='hiddenRow bg-success'>
+        <tr id='pt42.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4146,13 +4771,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 16)">Detail</a>
+            <a onclick="showClassDetail('c43', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4161,7 +4786,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4170,7 +4795,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4179,7 +4804,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4188,7 +4813,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4197,7 +4822,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4206,7 +4831,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4215,7 +4840,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4224,7 +4849,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4233,7 +4858,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4242,7 +4867,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4251,7 +4876,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4260,7 +4885,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4269,7 +4894,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4278,7 +4903,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4287,7 +4912,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4298,10 +4923,10 @@ AssertionError: &#39;&#39; != False</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>380</td>
-        <td>371</td>
-        <td>3</td>
-        <td>0</td>
+        <td>384</td>
+        <td>352</td>
+        <td>11</td>
+        <td>15</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4330,7 +4955,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-22-generic #22~20.04.1-Ubuntu SMP Tue Nov 9 15:07:24 UTC 2021 x86_64 x86_64</td>
+              <td>Linux 5.13.0-23-generic #23~20.04.2-Ubuntu SMP Fri Dec 10 12:06:47 UTC 2021 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4456,7 +5081,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4486,7 +5111,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4516,7 +5141,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4558,7 +5183,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4586,9 +5211,15 @@ AssertionError: &#39;&#39; != False</pre>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
+            <tr>
+              <th>scholarly</th>
+              <td>1.5.1</td>
+              <td>TestLoadMetadataScholar</td>
+            </tr>
+          
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4678,7 +5309,7 @@ AssertionError: &#39;&#39; != False</pre>
 </div>
 
 <script>
-    drawCircle(371, 3, 0, 6);
+    drawCircle(352, 11, 15, 6);
     showCase(5);
 </script>
 

From 0feb62c142bac7818ff4947218e6b3789098522f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 9 Jan 2022 13:54:35 +0100
Subject: [PATCH 102/412] Improvements delete user (delete also depending
 entries in tables) Fixes kobo sync with sync only selected shelfs

---
 cps/admin.py            | 9 +++++++++
 cps/kobo.py             | 5 +++--
 cps/kobo_sync_status.py | 3 ++-
 cps/shelf.py            | 4 ++++
 cps/ub.py               | 4 ++--
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 29f5fb201..706dce394 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1415,7 +1415,16 @@ def _delete_user(content):
             for us in ub.session.query(ub.Shelf).filter(content.id == ub.Shelf.user_id):
                 ub.session.query(ub.BookShelf).filter(us.id == ub.BookShelf.shelf).delete()
             ub.session.query(ub.Shelf).filter(content.id == ub.Shelf.user_id).delete()
+            ub.session.query(ub.Bookmark).filter(content.id == ub.Bookmark.user_id).delete()
             ub.session.query(ub.User).filter(ub.User.id == content.id).delete()
+            ub.session.query(ub.ArchivedBook).filter(ub.ArchivedBook.user_id == content.id).delete()
+            ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.user_id == content.id).delete()
+            ub.session.query(ub.User_Sessions).filter(ub.User_Sessions.user_id == content.id).delete()
+            ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.user_id == content.id).delete()
+            # delete KoboReadingState and all it's children
+            kobo_entries = ub.session.query(ub.KoboReadingState).filter(ub.KoboReadingState.user_id == content.id).all()
+            for kobo_entry in kobo_entries:
+                ub.session.delete(kobo_entry)
             ub.session_commit()
             log.info(u"User {} deleted".format(content.name))
             return(_(u"User '%(nick)s' deleted", nick=content.name))
diff --git a/cps/kobo.py b/cps/kobo.py
index 706056d33..67304c93e 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -297,7 +297,8 @@ def HandleSyncRequest():
 
     changed_reading_states = changed_reading_states.filter(
         and_(ub.KoboReadingState.user_id == current_user.id,
-             ub.KoboReadingState.book_id.notin_(reading_states_in_new_entitlements)))
+             ub.KoboReadingState.book_id.notin_(reading_states_in_new_entitlements)))\
+        .order_by(ub.KoboReadingState.last_modified)
     cont_sync |= bool(changed_reading_states.count() > SYNC_ITEM_LIMIT)
     for kobo_reading_state in changed_reading_states.limit(SYNC_ITEM_LIMIT).all():
         book = calibre_db.session.query(db.Books).filter(db.Books.id == kobo_reading_state.book_id).one_or_none()
@@ -849,7 +850,7 @@ def get_ub_read_status(kobo_read_status):
 
 def get_or_create_reading_state(book_id):
     book_read = ub.session.query(ub.ReadBook).filter(ub.ReadBook.book_id == book_id,
-                                                          ub.ReadBook.user_id == current_user.id).one_or_none()
+                                                          ub.ReadBook.user_id == int(current_user.id)).one_or_none()
     if not book_read:
         book_read = ub.ReadBook(user_id=current_user.id, book_id=book_id)
     if not book_read.kobo_reading_state:
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index a22ec1651..6df0a503c 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -60,7 +60,7 @@ def change_archived_books(book_id, state=None, message=None):
     return archived_book.is_archived
 
 
-# select all books which are synced by the current user and do not belong to a synced shelf and them to archive
+# select all books which are synced by the current user and do not belong to a synced shelf and set them to archive
 # select all shelves from current user which are synced and do not belong to the "only sync" shelves
 def update_on_sync_shelfs(user_id):
     books_to_archive = (ub.session.query(ub.KoboSyncedBooks)
@@ -75,6 +75,7 @@ def update_on_sync_shelfs(user_id):
             .filter(ub.KoboSyncedBooks.user_id == user_id).delete()
         ub.session_commit()
 
+    # Search all shelf which are currently not synced
     shelves_to_archive = ub.session.query(ub.Shelf).filter(ub.Shelf.user_id == user_id).filter(
         ub.Shelf.kobo_sync == 0).all()
     for a in shelves_to_archive:
diff --git a/cps/shelf.py b/cps/shelf.py
index b1fbdd046..29a4fe99d 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -251,6 +251,10 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
         is_public = 1 if to_save.get("is_public") else 0
         if config.config_kobo_sync:
             shelf.kobo_sync = True if to_save.get("kobo_sync") else False
+            if shelf.kobo_sync:
+                ub.session.query(ub.ShelfArchive).filter(ub.ShelfArchive.user_id == current_user.id).filter(
+                    ub.ShelfArchive.uuid == shelf.uuid).delete()
+                ub.session_commit()
         shelf_title = to_save.get("title", "")
         if check_shelf_is_unique(shelf, shelf_title, is_public, shelf_id):
             shelf.name = shelf_title
diff --git a/cps/ub.py b/cps/ub.py
index 6b3c27ca5..1d5db58a3 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -421,8 +421,8 @@ class KoboReadingState(Base):
     book_id = Column(Integer)
     last_modified = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow)
     priority_timestamp = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow)
-    current_bookmark = relationship("KoboBookmark", uselist=False, backref="kobo_reading_state", cascade="all")
-    statistics = relationship("KoboStatistics", uselist=False, backref="kobo_reading_state", cascade="all")
+    current_bookmark = relationship("KoboBookmark", uselist=False, backref="kobo_reading_state", cascade="all, delete")
+    statistics = relationship("KoboStatistics", uselist=False, backref="kobo_reading_state", cascade="all, delete")
 
 
 class KoboBookmark(Base):

From 8ae066c3871f91b3d4763ca387bffdbd0429902a Mon Sep 17 00:00:00 2001
From: byword77 <byword77@gmail.com>
Date: Mon, 10 Jan 2022 11:59:16 +0900
Subject: [PATCH 103/412] Add files via upload

---
 cps/translations/ko/LC_MESSAGES/messages.mo | Bin 59876 -> 59878 bytes
 cps/translations/ko/LC_MESSAGES/messages.po |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index 78088664d156cd9ef12df4f5c9e1087a08a06db7..9f2b1f71c6477009db72759916f1a445a00aa4fd 100644
GIT binary patch
delta 245
zcmaEInfcje<_%wT>vb3y81_GBU{D9rZ-BG_kQRBtz#s{vRe`iPkhTZX-atAWNQ(jK
z#Xy=HNbdsDoIv^*kY)qY7l5=dkiHJ3Uqi+J18H8MINM8zIuRfZvPb$QgBe((4p4v@
zC}0evErGN-kmdl=g+N*XNLNAW*+5zo$ltShrQZ7(4nqS4LqjWLgUt)N6=Gz%m%N$V
iqwuC_&6`;(-^`ovdf^-eAbz!d$D6r3Hs5;A#RLF01w&&1

delta 243
zcmXZVzY76j7{Kv2C;5>QMQ3`;AXnrDC(2)7w)r2dHjAWKg`ya3>IRp^Vz$U;lyf>+
ztjZTxZ+&{cJx}lTs9cW9`jzi!LWrF$L>BKD!}v`I6*HK^8rHFaNnBzCEezov19-p$
zo;)3|zcEVpJO8~ne*aM&Vf+p?f<n--f+Y-M3njKar<h~jnybRI87!8iu2+kOxfsZ1
ddO5pqEO*Z9%ExFS-Tp+n<DNSonrA!g`v8@cK>Yv!

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 35aa7c512..6640ff2f1 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
 "POT-Creation-Date: 2022-01-01 17:51+0100\n"
-"PO-Revision-Date: 2022-01-07 11:06+0900\n"
+"PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language-Team: 내맘대로의 epubguide.net <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -1285,7 +1285,7 @@ msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력
 #: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
-msgstr "로그인을 할 수 없음: '%(nickname)s"
+msgstr "다음 사용자로 로그인: '%(nickname)s"
 
 #: cps/web.py:1638 cps/web.py:1687
 #, python-format

From 3c1f5fd37f800dffdcff64d9fc6f63240bec043e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 10 Jan 2022 17:35:18 +0100
Subject: [PATCH 104/412] Update Test results

---
 test/Calibre-Web TestSummary_Linux.html | 1696 +++++++++--------------
 1 file changed, 644 insertions(+), 1052 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 8b724a932..f1ddb0e5a 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-08 19:04:30</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-09 18:09:05</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>2022-01-08 22:45:06</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-10 10:00:36</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>3h 0 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>15h 11 min</p>
         </div>
       </div>
       </div>
@@ -411,15 +411,15 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
-        <td class="text-center">18</td>
-        <td class="text-center">12</td>
-        <td class="text-center">1</td>
-        <td class="text-center">5</td>
+        <td class="text-center">15</td>
+        <td class="text-center">15</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', 18)">Detail</a>
+            <a onclick="showClassDetail('c6', 15)">Detail</a>
         </td>
     </tr>
 
@@ -533,210 +533,29 @@
     
     
     
-        <tr id="ft6.13" class="none bg-danger">
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 482, in test_ssl_smtp_setup_error
-    self.assertTrue(conv)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et6.14" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
-    self.login(&#39;admin&#39;, &#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et6.15" class="none bg-info">
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 458, in test_starttls_smtp_setup_error
-    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;STARTTLS&#39;, &#39;mail_password&#39;:&#39;10234&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et6.16" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
-    self.login(&#39;admin&#39;, &#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et6.17" class="none bg-info">
+        <tr id='pt6.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 525, in test_user_convert_xss
-    self.create_user(&#39;&lt;p&gt;calibre Quick Start Guide&lt;/p&gt;&lt;img src=x onerror=alert(&#34;jo&#34;)&gt;&#39;, {&#39;password&#39;: &#39;123&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_role&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et6.18" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
-    self.login(&#39;admin&#39;, &#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -895,12 +714,12 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">16</td>
-        <td class="text-center">14</td>
-        <td class="text-center">0</td>
+        <td class="text-center">9</td>
         <td class="text-center">0</td>
+        <td class="text-center">5</td>
         <td class="text-center">2</td>
         <td class="text-center">
             <a onclick="showClassDetail('c10', 16)">Detail</a>
@@ -972,38 +791,164 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id="et10.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 685, in test_title_sort
+    self.fill_view_config({&#39;config_title_regex&#39;: &#39;^(Beta)\s+&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 409, in fill_view_config
+    ele.clear()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 95, in clear
+    self._execute(Command.CLEAR_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_title_regex&#34; class=&#34;form-control&#34; name=&#34;config_title_regex&#34; type=&#34;text&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.9' class='hiddenRow bg-success'>
+        <tr id="et10.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 526, in test_upload_edit_role
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id="et10.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 55, in test_upload_metadata_cbr
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id="et10.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 92, in test_upload_metadata_cbt
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1034,11 +979,45 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id="et10.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 256, in test_writeonly_path
+    self.fill_view_config({&#39;config_read_column&#39;: &#34;Custom Bool 1 Ä&#34;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 414, in fill_view_config
+    select.select_by_visible_text(process_selects[key])
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 120, in select_by_visible_text
+    self._setSelected(opt)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 212, in _setSelected
+    option.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;option&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1071,6 +1050,60 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
 
 
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c11', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et11.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_edit_additional_books)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.1').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 41, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 445, in stop_calibre_web
+    element.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;shutdown&#34; class=&#34;btn btn-default&#34; type=&#34;button&#34;&gt; could not be scrolled into view</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">35</td>
@@ -1079,13 +1112,13 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 35)">Detail</a>
+            <a onclick="showClassDetail('c12', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1094,7 +1127,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1103,7 +1136,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1112,7 +1145,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1121,7 +1154,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1130,7 +1163,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1139,7 +1172,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1148,7 +1181,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1157,7 +1190,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.9' class='hiddenRow bg-success'>
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1166,7 +1199,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.10' class='hiddenRow bg-success'>
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1175,7 +1208,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.11' class='hiddenRow bg-success'>
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1184,7 +1217,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.12' class='hiddenRow bg-success'>
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1193,7 +1226,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.13' class='hiddenRow bg-success'>
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1202,7 +1235,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.14' class='hiddenRow bg-success'>
+        <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1211,7 +1244,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.15' class='hiddenRow bg-success'>
+        <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1220,7 +1253,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.16' class='hiddenRow bg-success'>
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1229,7 +1262,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.17' class='hiddenRow bg-success'>
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1238,7 +1271,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.18' class='hiddenRow bg-success'>
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1247,7 +1280,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.19' class='hiddenRow bg-success'>
+        <tr id='pt12.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1256,19 +1289,19 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="st11.20" class="none bg-warning">
+        <tr id="st12.20" 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_st11.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1282,7 +1315,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.21' class='hiddenRow bg-success'>
+        <tr id='pt12.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1291,7 +1324,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.22' class='hiddenRow bg-success'>
+        <tr id='pt12.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1300,7 +1333,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.23' class='hiddenRow bg-success'>
+        <tr id='pt12.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1309,7 +1342,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.24' class='hiddenRow bg-success'>
+        <tr id='pt12.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1318,7 +1351,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.25' class='hiddenRow bg-success'>
+        <tr id='pt12.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1327,7 +1360,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.26' class='hiddenRow bg-success'>
+        <tr id='pt12.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1336,7 +1369,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.27' class='hiddenRow bg-success'>
+        <tr id='pt12.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1345,7 +1378,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.28' class='hiddenRow bg-success'>
+        <tr id='pt12.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1354,7 +1387,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.29' class='hiddenRow bg-success'>
+        <tr id='pt12.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1363,7 +1396,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.30' class='hiddenRow bg-success'>
+        <tr id='pt12.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1372,7 +1405,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.31' class='hiddenRow bg-success'>
+        <tr id='pt12.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1381,7 +1414,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.32' class='hiddenRow bg-success'>
+        <tr id='pt12.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1390,7 +1423,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.33' class='hiddenRow bg-success'>
+        <tr id='pt12.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1399,7 +1432,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.34' class='hiddenRow bg-success'>
+        <tr id='pt12.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1408,7 +1441,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.35' class='hiddenRow bg-success'>
+        <tr id='pt12.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1426,13 +1459,13 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 18)">Detail</a>
+            <a onclick="showClassDetail('c13', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1441,7 +1474,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1450,7 +1483,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1459,7 +1492,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1468,7 +1501,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1477,7 +1510,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1486,7 +1519,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt13.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1495,7 +1528,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt13.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1504,7 +1537,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt13.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1513,7 +1546,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt13.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1522,7 +1555,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt13.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1531,7 +1564,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt13.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1540,7 +1573,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt13.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1549,24 +1582,24 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="et12.14" class="none bg-info">
+        <tr id="et13.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.14')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.14')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et12.14" class="popup_window test_output" style="display:block;">
+                <div id="div_et13.14" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.14').style.display='none'"><span
+                                onclick="document.getElementById('div_et13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 269, in test_bookslist_edit_seriesindex
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 270, in test_bookslist_edit_seriesindex
     bl = self.get_books_list(-1)
   File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_books_list
     element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements_by_xpath(&#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
@@ -1580,7 +1613,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt13.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1589,7 +1622,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt13.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1598,7 +1631,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt13.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1607,7 +1640,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt13.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1625,13 +1658,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 1)">Detail</a>
+            <a onclick="showClassDetail('c14', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
@@ -1649,13 +1682,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 20)">Detail</a>
+            <a onclick="showClassDetail('c15', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1664,7 +1697,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1673,7 +1706,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1682,7 +1715,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1691,7 +1724,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1700,7 +1733,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1709,7 +1742,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.7' class='hiddenRow bg-success'>
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1718,7 +1751,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1727,7 +1760,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.9' class='hiddenRow bg-success'>
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1736,7 +1769,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.10' class='hiddenRow bg-success'>
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1745,7 +1778,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.11' class='hiddenRow bg-success'>
+        <tr id='pt15.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1754,7 +1787,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id='pt15.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1763,7 +1796,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1772,7 +1805,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1781,7 +1814,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1790,7 +1823,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1799,7 +1832,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.17' class='hiddenRow bg-success'>
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1808,7 +1841,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.18' class='hiddenRow bg-success'>
+        <tr id='pt15.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1817,7 +1850,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.19' class='hiddenRow bg-success'>
+        <tr id='pt15.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1826,7 +1859,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.20' class='hiddenRow bg-success'>
+        <tr id='pt15.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1844,13 +1877,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 1)">Detail</a>
+            <a onclick="showClassDetail('c16', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
@@ -1860,391 +1893,121 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <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">1</td>
-        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 3)">Detail</a>
+            <a onclick="showClassDetail('c17', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft16.1" class="none bg-danger">
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 70, in test_STARTTLS
-    self.assertTrue(conv)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.2" class="none bg-info">
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 87, in test_STARTTLS_SSL_setup_error
-    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;SSL/TLS&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.3" class="none bg-info">
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 106, in test_STARTTLS_resend_password
-    self.create_user(&#39;paswd_resend&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;a@b.com&#39;, &#39;edit_role&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_role&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</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">1</td>
-        <td class="text-center">6</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 7)">Detail</a>
+            <a onclick="showClassDetail('c18', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft17.1" class="none bg-danger">
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft17.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft17.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 111, in test_SSL_None_setup_error
-    self.assertTrue(conv)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.2" class="none bg-info">
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 86, in test_SSL_STARTTLS_setup_error
-    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;STARTTLS&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.3" class="none bg-info">
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 126, in test_SSL_logging_email
-    self.setup_server(True, {&#39;mail_use_ssl&#39;: &#39;SSL/TLS&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.4" class="none bg-info">
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 177, in test_SSL_non_admin_user
-    self.create_user(&#39;ssl_email&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;answer@beta.com&#39;, &#39;kindle_mail&#39;: &#39;answer@beta.com&#39;, &#39;download_role&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;download_role&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.5" class="none bg-info">
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 64, in test_SSL_only
-    self.setup_server(False, {&#39;mail_use_ssl&#39;: &#39;SSL/TLS&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.6" class="none bg-info">
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 135, in test_email_limit
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 265, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.7" class="none bg-info">
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 217, in test_filepicker_two_file
-    accordions[0].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2258,13 +2021,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2282,13 +2045,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2306,13 +2069,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2330,13 +2093,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c22', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2354,13 +2117,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2369,7 +2132,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2378,7 +2141,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2396,13 +2159,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 11)">Detail</a>
+            <a onclick="showClassDetail('c24', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2411,7 +2174,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2420,7 +2183,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2429,7 +2192,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2438,7 +2201,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2447,7 +2210,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.6' class='hiddenRow bg-success'>
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2456,7 +2219,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2465,7 +2228,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.8' class='hiddenRow bg-success'>
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2474,7 +2237,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.9' class='hiddenRow bg-success'>
+        <tr id='pt24.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2483,7 +2246,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.10' class='hiddenRow bg-success'>
+        <tr id='pt24.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2492,7 +2255,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.11' class='hiddenRow bg-success'>
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2502,21 +2265,21 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">3</td>
-        <td class="text-center">2</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 5)">Detail</a>
+            <a onclick="showClassDetail('c25', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2525,38 +2288,16 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="ft24.2" class="none bg-danger">
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft24.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 266, in test_kobo_sync_selected_shelfs
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 144, in inital_sync
-    self.assertEqual(24, len(data[15]))  # 120 new and 4 original books
-AssertionError: 24 != 25</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2565,36 +2306,16 @@ AssertionError: 24 != 25</pre>
     
     
     
-        <tr id="ft24.4" class="none bg-danger">
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft24.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 251, in test_sync_reading_state
-    self.assertEqual(len(data[1]), 5)  # 120 new and 4 original books
-AssertionError: 4 != 5</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2604,21 +2325,21 @@ AssertionError: 4 != 5</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">6</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</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('c25', 13)">Detail</a>
+            <a onclick="showClassDetail('c26', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2627,26 +2348,23 @@ AssertionError: 4 != 5</pre>
     
     
     
-        <tr id="ft25.2" class="none bg-danger">
+        <tr id="st26.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.2')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft25.2" class="popup_window test_output" style="display:block;">
+                <div id="div_st26.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_ft25.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 618, in test_LDAP_SSL_CERTIFICATE
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
+                        <pre class="text-left">Unknown how to test certificate</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2656,42 +2374,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="et25.3" class="none bg-info">
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</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:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 647, in test_LDAP_STARTTLS
-    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 265, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2700,36 +2392,16 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="ft25.5" class="none bg-danger">
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 408, in test_LDAP_import
-    self.assertEqual(len(userlist), 4)
-AssertionError: 5 != 4</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2738,36 +2410,16 @@ AssertionError: 5 != 4</pre>
     
     
     
-        <tr id="ft25.7" class="none bg-danger">
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 229, in test_LDAP_login
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2776,7 +2428,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2785,65 +2437,25 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft25.10" class="none bg-danger">
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 766, in test_ldap_authentication
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft25.11" class="none bg-danger">
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1037, in test_ldap_kobo_sync
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt25.12' class='hiddenRow bg-success'>
+        <tr id='pt26.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2852,31 +2464,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft25.13" class="none bg-danger">
+        <tr id='pt26.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 849, in test_ldap_opds_download_book
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2890,13 +2482,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 8)">Detail</a>
+            <a onclick="showClassDetail('c27', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2905,7 +2497,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2914,7 +2506,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2923,7 +2515,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2932,7 +2524,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2941,7 +2533,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2950,7 +2542,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2959,7 +2551,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2977,13 +2569,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 9)">Detail</a>
+            <a onclick="showClassDetail('c28', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2992,7 +2584,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -3001,7 +2593,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -3010,7 +2602,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -3019,19 +2611,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st27.5" class="none bg-warning">
+        <tr id="st28.5" 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_st27.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st28.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st27.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st28.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_st27.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st28.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3045,7 +2637,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -3054,7 +2646,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -3063,7 +2655,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -3072,7 +2664,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -3090,13 +2682,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 15)">Detail</a>
+            <a onclick="showClassDetail('c29', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -3105,7 +2697,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -3114,7 +2706,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -3123,7 +2715,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -3132,7 +2724,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -3141,7 +2733,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -3150,7 +2742,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -3159,7 +2751,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -3168,7 +2760,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -3177,7 +2769,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -3186,7 +2778,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt29.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -3195,7 +2787,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt29.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3204,7 +2796,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt29.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3213,7 +2805,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.14' class='hiddenRow bg-success'>
+        <tr id='pt29.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3222,7 +2814,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.15' class='hiddenRow bg-success'>
+        <tr id='pt29.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3240,13 +2832,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -3255,7 +2847,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -3273,13 +2865,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3288,7 +2880,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3306,13 +2898,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 23)">Detail</a>
+            <a onclick="showClassDetail('c32', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3321,7 +2913,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3330,7 +2922,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3339,7 +2931,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt32.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3348,7 +2940,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3357,7 +2949,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt32.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3366,7 +2958,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt32.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3375,7 +2967,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt32.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3384,7 +2976,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt32.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3393,7 +2985,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt32.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3402,7 +2994,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt32.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3411,7 +3003,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt32.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3420,7 +3012,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt32.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3429,7 +3021,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt32.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3438,7 +3030,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt32.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3447,7 +3039,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.16' class='hiddenRow bg-success'>
+        <tr id='pt32.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3456,7 +3048,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.17' class='hiddenRow bg-success'>
+        <tr id='pt32.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3465,7 +3057,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.18' class='hiddenRow bg-success'>
+        <tr id='pt32.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3474,7 +3066,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.19' class='hiddenRow bg-success'>
+        <tr id='pt32.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3483,7 +3075,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.20' class='hiddenRow bg-success'>
+        <tr id='pt32.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3492,7 +3084,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.21' class='hiddenRow bg-success'>
+        <tr id='pt32.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3501,7 +3093,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.22' class='hiddenRow bg-success'>
+        <tr id='pt32.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3510,7 +3102,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.23' class='hiddenRow bg-success'>
+        <tr id='pt32.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3528,13 +3120,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 1)">Detail</a>
+            <a onclick="showClassDetail('c33', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3552,13 +3144,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 5)">Detail</a>
+            <a onclick="showClassDetail('c34', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3567,7 +3159,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3576,7 +3168,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3585,7 +3177,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3594,7 +3186,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3612,13 +3204,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 8)">Detail</a>
+            <a onclick="showClassDetail('c35', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3627,7 +3219,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3636,7 +3228,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3645,7 +3237,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3654,7 +3246,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3663,7 +3255,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt35.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3672,7 +3264,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt35.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3681,7 +3273,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt35.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3699,13 +3291,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 3)">Detail</a>
+            <a onclick="showClassDetail('c36', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3714,7 +3306,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3723,7 +3315,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3741,13 +3333,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 14)">Detail</a>
+            <a onclick="showClassDetail('c37', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3756,7 +3348,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3765,7 +3357,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3774,7 +3366,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3783,7 +3375,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3792,7 +3384,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3801,7 +3393,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.7' class='hiddenRow bg-success'>
+        <tr id='pt37.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3810,7 +3402,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3819,7 +3411,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.9' class='hiddenRow bg-success'>
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3828,7 +3420,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.10' class='hiddenRow bg-success'>
+        <tr id='pt37.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3837,7 +3429,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.11' class='hiddenRow bg-success'>
+        <tr id='pt37.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3846,19 +3438,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st36.12" class="none bg-warning">
+        <tr id="st37.12" 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_st36.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st37.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_st36.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st37.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3872,7 +3464,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.13' class='hiddenRow bg-success'>
+        <tr id='pt37.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3881,7 +3473,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.14' class='hiddenRow bg-success'>
+        <tr id='pt37.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3899,13 +3491,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 9)">Detail</a>
+            <a onclick="showClassDetail('c38', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3914,7 +3506,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3923,7 +3515,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3932,7 +3524,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3941,7 +3533,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3950,7 +3542,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3959,19 +3551,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st37.7" class="none bg-warning">
+        <tr id="st38.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_st37.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st38.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st37.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st38.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_st37.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st38.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3985,7 +3577,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3994,7 +3586,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id='pt38.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -4012,13 +3604,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 2)">Detail</a>
+            <a onclick="showClassDetail('c39', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4027,7 +3619,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4045,13 +3637,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 18)">Detail</a>
+            <a onclick="showClassDetail('c40', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4060,7 +3652,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4069,7 +3661,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4078,7 +3670,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4087,7 +3679,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4096,7 +3688,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4105,7 +3697,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4114,7 +3706,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4123,7 +3715,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4132,7 +3724,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4141,7 +3733,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4150,7 +3742,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4159,7 +3751,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4168,7 +3760,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.14' class='hiddenRow bg-success'>
+        <tr id='pt40.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4177,7 +3769,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4186,7 +3778,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4195,7 +3787,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.17' class='hiddenRow bg-success'>
+        <tr id='pt40.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4204,7 +3796,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.18' class='hiddenRow bg-success'>
+        <tr id='pt40.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4222,13 +3814,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 1)">Detail</a>
+            <a onclick="showClassDetail('c41', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4246,13 +3838,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 21)">Detail</a>
+            <a onclick="showClassDetail('c42', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4261,7 +3853,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4270,7 +3862,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4279,7 +3871,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4288,7 +3880,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4297,7 +3889,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4306,7 +3898,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4315,7 +3907,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4324,7 +3916,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4333,7 +3925,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4342,7 +3934,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4351,7 +3943,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4360,7 +3952,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4369,7 +3961,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4378,7 +3970,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4387,7 +3979,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4396,7 +3988,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4405,7 +3997,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4414,7 +4006,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.19' class='hiddenRow bg-success'>
+        <tr id='pt42.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4423,7 +4015,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.20' class='hiddenRow bg-success'>
+        <tr id='pt42.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4432,7 +4024,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.21' class='hiddenRow bg-success'>
+        <tr id='pt42.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4450,13 +4042,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 34)">Detail</a>
+            <a onclick="showClassDetail('c43', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4465,7 +4057,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4474,7 +4066,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4483,7 +4075,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4492,7 +4084,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4501,7 +4093,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4510,7 +4102,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4519,7 +4111,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4528,7 +4120,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4537,7 +4129,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4546,7 +4138,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4555,7 +4147,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4564,7 +4156,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4573,7 +4165,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4582,7 +4174,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4591,7 +4183,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4600,7 +4192,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4609,7 +4201,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4618,7 +4210,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.19' class='hiddenRow bg-success'>
+        <tr id='pt43.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4627,7 +4219,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.20' class='hiddenRow bg-success'>
+        <tr id='pt43.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4636,7 +4228,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.21' class='hiddenRow bg-success'>
+        <tr id='pt43.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4645,7 +4237,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.22' class='hiddenRow bg-success'>
+        <tr id='pt43.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4654,7 +4246,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.23' class='hiddenRow bg-success'>
+        <tr id='pt43.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4663,7 +4255,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.24' class='hiddenRow bg-success'>
+        <tr id='pt43.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4672,7 +4264,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.25' class='hiddenRow bg-success'>
+        <tr id='pt43.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4681,7 +4273,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.26' class='hiddenRow bg-success'>
+        <tr id='pt43.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4690,7 +4282,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.27' class='hiddenRow bg-success'>
+        <tr id='pt43.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4699,7 +4291,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.28' class='hiddenRow bg-success'>
+        <tr id='pt43.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4708,7 +4300,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.29' class='hiddenRow bg-success'>
+        <tr id='pt43.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4717,7 +4309,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.30' class='hiddenRow bg-success'>
+        <tr id='pt43.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4726,7 +4318,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.31' class='hiddenRow bg-success'>
+        <tr id='pt43.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4735,7 +4327,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.32' class='hiddenRow bg-success'>
+        <tr id='pt43.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4744,7 +4336,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.33' class='hiddenRow bg-success'>
+        <tr id='pt43.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4753,7 +4345,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.34' class='hiddenRow bg-success'>
+        <tr id='pt43.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4771,13 +4363,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 16)">Detail</a>
+            <a onclick="showClassDetail('c44', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4786,7 +4378,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4795,7 +4387,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4804,7 +4396,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4813,7 +4405,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4822,7 +4414,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4831,7 +4423,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4840,7 +4432,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4849,7 +4441,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4858,7 +4450,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4867,7 +4459,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4876,7 +4468,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4885,7 +4477,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4894,7 +4486,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4903,7 +4495,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4912,7 +4504,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4923,11 +4515,11 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>384</td>
-        <td>352</td>
-        <td>11</td>
-        <td>15</td>
-        <td>6</td>
+        <td>382</td>
+        <td>368</td>
+        <td>0</td>
+        <td>7</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -5309,7 +4901,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(352, 11, 15, 6);
+    drawCircle(368, 0, 7, 7);
     showCase(5);
 </script>
 

From 3fc326fa48191d080e03878de9b00bd8a53e5a70 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 13 Jan 2022 22:45:16 +0100
Subject: [PATCH 105/412] Update French translation

---
 cps/translations/fr/LC_MESSAGES/messages.po | 42 ++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 75e834a0f..e3d6bdaf5 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -83,7 +83,7 @@ msgstr "Configuration de l’interface utilisateur"
 #: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
-msgstr "Utilisateur admin"
+msgstr "Éditer les utilisateurs"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
 #: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
@@ -214,7 +214,7 @@ msgstr "Voulez-vous vraiment arrêter Calibre-Web ?"
 
 #: cps/admin.py:594
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr ""
+msgstr "Êtes-vous certain de vouloir supprimer la base de données de synchronisation de Calibre-Web pour forcer une synchronisation complète avec votre liseuse Kobo ?"
 
 #: cps/admin.py:743
 msgid "Tag not found"
@@ -238,7 +238,7 @@ msgstr "Autoriser"
 
 #: cps/admin.py:913
 msgid "{} sync entries deleted"
-msgstr ""
+msgstr "{} entrées de synchronisation supprimées"
 
 #: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
@@ -472,7 +472,7 @@ msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répert
 
 #: cps/admin.py:1741
 msgid "Files could not be replaced during update"
-msgstr ""
+msgstr "Les fichiers n’ont pas pu être remplacés pendant la mise à jour"
 
 #: cps/admin.py:1765
 #, fuzzy
@@ -523,7 +523,7 @@ msgstr "Le livre a été supprimé avec succès"
 
 #: cps/editbooks.py:361
 msgid "You are missing permissions to delete books"
-msgstr ""
+msgstr "Vous n’avez par les permissions pour supprimer les livres"
 
 #: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
 #: cps/web.py:1744 cps/web.py:1811
@@ -756,7 +756,7 @@ msgstr "Seuls les fichiers jpg/jpeg/png/webp/bmp sont supportés comme fichier d
 
 #: cps/helper.py:648
 msgid "Invalid cover file content"
-msgstr ""
+msgstr "Contenu du fichier de couverture invalide"
 
 #: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
@@ -1045,7 +1045,7 @@ msgstr "Le livre a bien été ajouté à l'étagère : %(sname)s"
 
 #: cps/shelf.py:126
 msgid "You are not allowed to add a book to the shelf"
-msgstr ""
+msgstr "Vous n’êtes pas autorisé à ajouter un livre à l’étagère"
 
 #: cps/shelf.py:144
 #, python-format
@@ -1069,7 +1069,7 @@ msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 
 #: cps/shelf.py:218
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
+msgstr "Désolé, vous n’êtes pas autorisé à supprimer un livre de cette étagère"
 
 #: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
@@ -1086,7 +1086,7 @@ msgstr "Modifier une étagère"
 
 #: cps/shelf.py:249
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
+msgstr "Désolé, vous n’êtes pas autorisé à créer une étagère publique"
 
 #: cps/shelf.py:266
 #, python-format
@@ -1524,7 +1524,7 @@ msgstr "Nom de l'en-tête du Reverse Proxy"
 #: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
-msgstr "Éditer la configuration principale"
+msgstr "Éditer la configuration de la base de données Calibre"
 
 #: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
@@ -1532,7 +1532,7 @@ msgstr "Éditer la configuration principale"
 
 #: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
-msgstr "Configuration de l’interface utilisateur"
+msgstr "Éditer la configuration de l’interface utilisateur"
 
 #: cps/templates/admin.html:164
 msgid "Administration"
@@ -1906,7 +1906,7 @@ msgstr "Saisir le nom du domaine"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
-msgstr ""
+msgstr "Commentaires"
 
 #: cps/templates/book_table.html:77 cps/templates/book_table.html:79
 #: cps/templates/book_table.html:81 cps/templates/book_table.html:83
@@ -1991,7 +1991,7 @@ msgstr "Nightly"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr ""
+msgstr "Hôtes de confiance (séparés par des virgules)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
@@ -2015,7 +2015,7 @@ msgstr "Configuration des options"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr ""
+msgstr "Convertir les caractères non-anglais des titre et auteur lors de l’enregistrement sur le disque"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
@@ -2023,7 +2023,7 @@ msgstr "Autoriser le téléversement de fichier"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr ""
+msgstr "(Svp, vérifiez que les utilisateurs ont aussi les droits de téléchargement vers le serveur)
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
@@ -2184,7 +2184,7 @@ msgstr "Champ des membres de groupe LDAP"
 
 #: cps/templates/config_edit.html:278
 msgid "LDAP Member User Filter Detection"
-msgstr ""
+msgstr "Filtre de détection des utilisateurs membres LDAP"
 
 #: cps/templates/config_edit.html:280
 msgid "Autodetect"
@@ -2347,7 +2347,7 @@ msgstr "Écouter dans le navigateur"
 #: cps/templates/detail.html:124
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
-msgstr ""
+msgstr "Livre %(index)s sur %(range)s"
 
 #: cps/templates/detail.html:173
 msgid "Published"
@@ -2488,11 +2488,11 @@ msgstr "Déconnecter l’utilisateur"
 
 #: cps/templates/index.html:69
 msgid "Sort ascending according to download count"
-msgstr ""
+msgstr "Trier de manière ascendante selon le nombre de téléchargements"
 
 #: cps/templates/index.html:70
 msgid "Sort descending according to download count"
-msgstr ""
+msgstr "Trier de manière descendante selon le nombre de téléchargements"
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:23
@@ -3111,7 +3111,7 @@ msgstr "Créer/visualiser"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr ""
+msgstr "Forcer une synchronisation complète Kobo"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
@@ -3136,7 +3136,7 @@ msgstr "Sélectionner..."
 #: cps/templates/user_table.html:131
 #, fuzzy
 msgid "Edit User"
-msgstr "Utilisateur admin"
+msgstr "Éditer l’utilisateur"
 
 #: cps/templates/user_table.html:134
 #, fuzzy

From 58cb54c76f5f38d5f152516b866e94a93d34b4f9 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 13 Jan 2022 22:47:47 +0100
Subject: [PATCH 106/412] small typo

---
 cps/translations/fr/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index e3d6bdaf5..b9141fc88 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -2023,7 +2023,7 @@ msgstr "Autoriser le téléversement de fichier"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr "(Svp, vérifiez que les utilisateurs ont aussi les droits de téléchargement vers le serveur)
+msgstr "(Svp, vérifiez que les utilisateurs ont aussi les droits de téléchargement vers le serveur)"
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"

From f6f20ebc7718156bbef59b68c7442e7992afb979 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 15 Jan 2022 09:18:51 +0100
Subject: [PATCH 107/412] Update teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 1132 ++++++++++-------------
 1 file changed, 479 insertions(+), 653 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index f1ddb0e5a..94bab0c2e 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-09 18:09:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-13 19:08:39</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>2022-01-10 10:00:36</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-13 23:00: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>Duration: </strong>15h 11 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 10 min</p>
         </div>
       </div>
       </div>
@@ -561,11 +561,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">5</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -593,11 +593,33 @@
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id="ft7.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 332, in test_convert_only
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -714,12 +736,12 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">16</td>
-        <td class="text-center">9</td>
+        <td class="text-center">14</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">5</td>
         <td class="text-center">2</td>
         <td class="text-center">
             <a onclick="showClassDetail('c10', 16)">Detail</a>
@@ -791,164 +813,38 @@
     
     
     
-        <tr id="et10.8" class="none bg-info">
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 685, in test_title_sort
-    self.fill_view_config({&#39;config_title_regex&#39;: &#39;^(Beta)\s+&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 409, in fill_view_config
-    ele.clear()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 95, in clear
-    self._execute(Command.CLEAR_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_title_regex&#34; class=&#34;form-control&#34; name=&#34;config_title_regex&#34; type=&#34;text&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.9" class="none bg-info">
+        <tr id='pt10.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 526, in test_upload_edit_role
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.10" class="none bg-info">
+        <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 55, in test_upload_metadata_cbr
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.11" class="none bg-info">
+        <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 92, in test_upload_metadata_cbt
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -979,45 +875,11 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id="et10.13" class="none bg-info">
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <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_et10.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 256, in test_writeonly_path
-    self.fill_view_config({&#39;config_read_column&#39;: &#34;Custom Bool 1 Ä&#34;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 414, in fill_view_config
-    select.select_by_visible_text(process_selects[key])
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 120, in select_by_visible_text
-    self._setSelected(opt)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 212, in _setSelected
-    option.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;option&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1050,60 +912,6 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c11', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et11.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_edit_additional_books)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 41, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 445, in stop_calibre_web
-    element.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;shutdown&#34; class=&#34;btn btn-default&#34; type=&#34;button&#34;&gt; could not be scrolled into view</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">35</td>
@@ -1112,13 +920,13 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 35)">Detail</a>
+            <a onclick="showClassDetail('c11', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1127,7 +935,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1136,7 +944,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1145,7 +953,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1154,7 +962,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1163,7 +971,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1172,7 +980,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1181,7 +989,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1190,7 +998,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1199,7 +1007,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt11.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1208,7 +1016,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt11.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1217,7 +1025,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt11.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1226,7 +1034,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt11.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1235,7 +1043,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt11.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1244,7 +1052,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt11.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1253,7 +1061,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt11.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1262,7 +1070,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt11.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1271,7 +1079,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt11.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1280,7 +1088,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.19' class='hiddenRow bg-success'>
+        <tr id='pt11.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1289,19 +1097,19 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id="st12.20" class="none bg-warning">
+        <tr id="st11.20" 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_st12.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1315,7 +1123,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.21' class='hiddenRow bg-success'>
+        <tr id='pt11.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1324,7 +1132,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.22' class='hiddenRow bg-success'>
+        <tr id='pt11.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1333,7 +1141,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.23' class='hiddenRow bg-success'>
+        <tr id='pt11.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1342,7 +1150,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.24' class='hiddenRow bg-success'>
+        <tr id='pt11.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1351,7 +1159,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.25' class='hiddenRow bg-success'>
+        <tr id='pt11.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1360,7 +1168,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.26' class='hiddenRow bg-success'>
+        <tr id='pt11.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1369,7 +1177,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.27' class='hiddenRow bg-success'>
+        <tr id='pt11.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1378,7 +1186,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.28' class='hiddenRow bg-success'>
+        <tr id='pt11.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1387,7 +1195,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.29' class='hiddenRow bg-success'>
+        <tr id='pt11.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1396,7 +1204,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.30' class='hiddenRow bg-success'>
+        <tr id='pt11.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1405,7 +1213,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.31' class='hiddenRow bg-success'>
+        <tr id='pt11.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1414,7 +1222,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.32' class='hiddenRow bg-success'>
+        <tr id='pt11.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1423,7 +1231,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.33' class='hiddenRow bg-success'>
+        <tr id='pt11.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1432,7 +1240,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.34' class='hiddenRow bg-success'>
+        <tr id='pt11.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1441,7 +1249,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.35' class='hiddenRow bg-success'>
+        <tr id='pt11.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1451,21 +1259,21 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">17</td>
+        <td class="text-center">18</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', 18)">Detail</a>
+            <a onclick="showClassDetail('c12', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1474,7 +1282,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1483,7 +1291,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1492,7 +1300,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1501,7 +1309,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1510,7 +1318,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1519,7 +1327,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.7' class='hiddenRow bg-success'>
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1528,7 +1336,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.8' class='hiddenRow bg-success'>
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1537,7 +1345,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.9' class='hiddenRow bg-success'>
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1546,7 +1354,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.10' class='hiddenRow bg-success'>
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1555,7 +1363,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.11' class='hiddenRow bg-success'>
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1564,7 +1372,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.12' class='hiddenRow bg-success'>
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1573,7 +1381,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.13' class='hiddenRow bg-success'>
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1582,38 +1390,16 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id="et13.14" class="none bg-info">
+        <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et13.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 270, in test_bookslist_edit_seriesindex
-    bl = self.get_books_list(-1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_books_list
-    element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements_by_xpath(&#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt13.15' class='hiddenRow bg-success'>
+        <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1622,7 +1408,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt13.16' class='hiddenRow bg-success'>
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1631,7 +1417,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt13.17' class='hiddenRow bg-success'>
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1640,7 +1426,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt13.18' class='hiddenRow bg-success'>
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1650,45 +1436,65 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestLoadMetadata</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('c13', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et13.1" class="none bg-info">
+            <td>
+                <div class='testcase'>TestLoadMetadata - test_load_metadata</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:block;">
+                    <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">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 133, in test_load_metadata
+    results[1][&#39;cover_element&#39;].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestEditBooksOnGdrive</td>
+        <td class="text-center">20</td>
+        <td class="text-center">19</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 1)">Detail</a>
+            <a onclick="showClassDetail('c14', 20)">Detail</a>
         </td>
     </tr>
 
     
     
         <tr id='pt14.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLoadMetadata - test_load_metadata</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('c15', 20)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1697,7 +1503,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1706,7 +1512,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1715,7 +1521,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1724,7 +1530,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1733,7 +1539,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1742,7 +1548,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1751,7 +1557,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1760,7 +1566,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1769,7 +1575,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1778,7 +1584,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.11' class='hiddenRow bg-success'>
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1787,7 +1593,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1796,7 +1602,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1805,7 +1611,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1814,7 +1620,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1823,16 +1629,36 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.16' class='hiddenRow bg-success'>
+        <tr id="et14.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
+    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt15.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1841,7 +1667,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.18' class='hiddenRow bg-success'>
+        <tr id='pt14.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1850,7 +1676,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.19' class='hiddenRow bg-success'>
+        <tr id='pt14.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1859,7 +1685,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.20' class='hiddenRow bg-success'>
+        <tr id='pt14.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1877,13 +1703,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
@@ -1901,13 +1727,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 3)">Detail</a>
+            <a onclick="showClassDetail('c16', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1916,7 +1742,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1925,7 +1751,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1943,13 +1769,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 7)">Detail</a>
+            <a onclick="showClassDetail('c17', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1958,7 +1784,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1967,7 +1793,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1976,7 +1802,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1985,7 +1811,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1994,7 +1820,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -2003,7 +1829,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.7' class='hiddenRow bg-success'>
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2021,13 +1847,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2045,13 +1871,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2069,13 +1895,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2093,13 +1919,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2117,13 +1943,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2132,7 +1958,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2141,7 +1967,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2159,13 +1985,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 11)">Detail</a>
+            <a onclick="showClassDetail('c23', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2174,7 +2000,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2183,7 +2009,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2192,7 +2018,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2201,7 +2027,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2210,7 +2036,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt23.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2219,7 +2045,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt23.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2228,7 +2054,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt23.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2237,7 +2063,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.9' class='hiddenRow bg-success'>
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2246,7 +2072,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.10' class='hiddenRow bg-success'>
+        <tr id='pt23.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2255,7 +2081,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.11' class='hiddenRow bg-success'>
+        <tr id='pt23.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2273,13 +2099,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 5)">Detail</a>
+            <a onclick="showClassDetail('c24', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2288,7 +2114,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2297,7 +2123,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2306,7 +2132,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2315,7 +2141,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2333,13 +2159,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 13)">Detail</a>
+            <a onclick="showClassDetail('c25', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2348,19 +2174,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st26.2" class="none bg-warning">
+        <tr id="st25.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st25.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st26.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st25.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_st26.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st25.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2374,7 +2200,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2383,7 +2209,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2392,7 +2218,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2401,7 +2227,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2410,7 +2236,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2419,7 +2245,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2428,7 +2254,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2437,7 +2263,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2446,7 +2272,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2455,7 +2281,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.12' class='hiddenRow bg-success'>
+        <tr id='pt25.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2464,7 +2290,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.13' class='hiddenRow bg-success'>
+        <tr id='pt25.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2482,13 +2308,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 8)">Detail</a>
+            <a onclick="showClassDetail('c26', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2497,7 +2323,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2506,7 +2332,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2515,7 +2341,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2524,7 +2350,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2533,7 +2359,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2542,7 +2368,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2551,7 +2377,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2569,13 +2395,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 9)">Detail</a>
+            <a onclick="showClassDetail('c27', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2584,7 +2410,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2593,7 +2419,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2602,7 +2428,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2611,19 +2437,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st28.5" class="none bg-warning">
+        <tr id="st27.5" 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_st28.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st27.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st28.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st27.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_st28.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st27.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2637,7 +2463,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2646,7 +2472,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2655,7 +2481,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2664,7 +2490,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2682,13 +2508,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 15)">Detail</a>
+            <a onclick="showClassDetail('c28', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2697,7 +2523,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2706,7 +2532,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2715,7 +2541,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2724,7 +2550,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2733,7 +2559,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2742,7 +2568,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2751,7 +2577,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2760,7 +2586,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2769,7 +2595,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2778,7 +2604,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2787,7 +2613,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2796,7 +2622,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2805,7 +2631,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.14' class='hiddenRow bg-success'>
+        <tr id='pt28.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2814,7 +2640,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.15' class='hiddenRow bg-success'>
+        <tr id='pt28.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2832,13 +2658,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 2)">Detail</a>
+            <a onclick="showClassDetail('c29', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2847,7 +2673,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2865,13 +2691,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2880,7 +2706,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2898,13 +2724,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 23)">Detail</a>
+            <a onclick="showClassDetail('c31', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2913,7 +2739,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2922,7 +2748,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2931,7 +2757,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2940,7 +2766,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2949,7 +2775,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2958,7 +2784,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2967,7 +2793,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2976,7 +2802,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2985,7 +2811,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2994,7 +2820,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3003,7 +2829,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3012,7 +2838,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3021,7 +2847,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3030,7 +2856,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3039,7 +2865,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.16' class='hiddenRow bg-success'>
+        <tr id='pt31.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3048,7 +2874,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.17' class='hiddenRow bg-success'>
+        <tr id='pt31.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3057,7 +2883,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.18' class='hiddenRow bg-success'>
+        <tr id='pt31.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3066,7 +2892,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.19' class='hiddenRow bg-success'>
+        <tr id='pt31.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3075,7 +2901,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.20' class='hiddenRow bg-success'>
+        <tr id='pt31.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3084,7 +2910,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.21' class='hiddenRow bg-success'>
+        <tr id='pt31.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3093,7 +2919,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.22' class='hiddenRow bg-success'>
+        <tr id='pt31.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3102,7 +2928,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.23' class='hiddenRow bg-success'>
+        <tr id='pt31.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3120,13 +2946,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 1)">Detail</a>
+            <a onclick="showClassDetail('c32', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3144,13 +2970,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 5)">Detail</a>
+            <a onclick="showClassDetail('c33', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3159,7 +2985,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3168,7 +2994,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3177,7 +3003,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3186,7 +3012,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3204,13 +3030,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 8)">Detail</a>
+            <a onclick="showClassDetail('c34', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3219,7 +3045,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3228,7 +3054,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3237,7 +3063,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3246,7 +3072,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3255,7 +3081,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3264,7 +3090,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3273,7 +3099,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3291,13 +3117,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 3)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3306,7 +3132,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3315,7 +3141,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3333,13 +3159,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 14)">Detail</a>
+            <a onclick="showClassDetail('c36', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3348,7 +3174,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3357,7 +3183,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3366,7 +3192,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3375,7 +3201,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3384,7 +3210,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3393,7 +3219,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.7' class='hiddenRow bg-success'>
+        <tr id='pt36.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3402,7 +3228,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3411,7 +3237,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id='pt36.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3420,7 +3246,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.10' class='hiddenRow bg-success'>
+        <tr id='pt36.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3429,7 +3255,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.11' class='hiddenRow bg-success'>
+        <tr id='pt36.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3438,19 +3264,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st37.12" class="none bg-warning">
+        <tr id="st36.12" 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_st37.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st37.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st36.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_st37.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st36.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3464,7 +3290,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.13' class='hiddenRow bg-success'>
+        <tr id='pt36.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3473,7 +3299,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.14' class='hiddenRow bg-success'>
+        <tr id='pt36.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3491,13 +3317,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 9)">Detail</a>
+            <a onclick="showClassDetail('c37', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3506,7 +3332,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3515,7 +3341,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3524,7 +3350,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3533,7 +3359,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3542,7 +3368,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3551,19 +3377,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st38.7" class="none bg-warning">
+        <tr id="st37.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_st38.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st38.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st37.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_st38.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st37.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3577,7 +3403,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3586,7 +3412,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.9' class='hiddenRow bg-success'>
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3604,13 +3430,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 2)">Detail</a>
+            <a onclick="showClassDetail('c38', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3619,7 +3445,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3637,13 +3463,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 18)">Detail</a>
+            <a onclick="showClassDetail('c39', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3652,7 +3478,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3661,7 +3487,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3670,7 +3496,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3679,7 +3505,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3688,7 +3514,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3697,7 +3523,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3706,7 +3532,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3715,7 +3541,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt39.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3724,7 +3550,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt39.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3733,7 +3559,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt39.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3742,7 +3568,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt39.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3751,7 +3577,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt39.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3760,7 +3586,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.14' class='hiddenRow bg-success'>
+        <tr id='pt39.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3769,7 +3595,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt39.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3778,7 +3604,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt39.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3787,7 +3613,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.17' class='hiddenRow bg-success'>
+        <tr id='pt39.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3796,7 +3622,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.18' class='hiddenRow bg-success'>
+        <tr id='pt39.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3814,13 +3640,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 1)">Detail</a>
+            <a onclick="showClassDetail('c40', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3838,13 +3664,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 21)">Detail</a>
+            <a onclick="showClassDetail('c41', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3853,7 +3679,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3862,7 +3688,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3871,7 +3697,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3880,7 +3706,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3889,7 +3715,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3898,7 +3724,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3907,7 +3733,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3916,7 +3742,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3925,7 +3751,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3934,7 +3760,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3943,7 +3769,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3952,7 +3778,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3961,7 +3787,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt41.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3970,7 +3796,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3979,7 +3805,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3988,7 +3814,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt41.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3997,7 +3823,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt41.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4006,7 +3832,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.19' class='hiddenRow bg-success'>
+        <tr id='pt41.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4015,7 +3841,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.20' class='hiddenRow bg-success'>
+        <tr id='pt41.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4024,7 +3850,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.21' class='hiddenRow bg-success'>
+        <tr id='pt41.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4042,13 +3868,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 34)">Detail</a>
+            <a onclick="showClassDetail('c42', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4057,7 +3883,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4066,7 +3892,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4075,7 +3901,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4084,7 +3910,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4093,7 +3919,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4102,7 +3928,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4111,7 +3937,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4120,7 +3946,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4129,7 +3955,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4138,7 +3964,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4147,7 +3973,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4156,7 +3982,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4165,7 +3991,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4174,7 +4000,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4183,7 +4009,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4192,7 +4018,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4201,7 +4027,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4210,7 +4036,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.19' class='hiddenRow bg-success'>
+        <tr id='pt42.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4219,7 +4045,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.20' class='hiddenRow bg-success'>
+        <tr id='pt42.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4228,7 +4054,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.21' class='hiddenRow bg-success'>
+        <tr id='pt42.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4237,7 +4063,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.22' class='hiddenRow bg-success'>
+        <tr id='pt42.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4246,7 +4072,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.23' class='hiddenRow bg-success'>
+        <tr id='pt42.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4255,7 +4081,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.24' class='hiddenRow bg-success'>
+        <tr id='pt42.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4264,7 +4090,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.25' class='hiddenRow bg-success'>
+        <tr id='pt42.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4273,7 +4099,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.26' class='hiddenRow bg-success'>
+        <tr id='pt42.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4282,7 +4108,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.27' class='hiddenRow bg-success'>
+        <tr id='pt42.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4291,7 +4117,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.28' class='hiddenRow bg-success'>
+        <tr id='pt42.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4300,7 +4126,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.29' class='hiddenRow bg-success'>
+        <tr id='pt42.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4309,7 +4135,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.30' class='hiddenRow bg-success'>
+        <tr id='pt42.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4318,7 +4144,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.31' class='hiddenRow bg-success'>
+        <tr id='pt42.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4327,7 +4153,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.32' class='hiddenRow bg-success'>
+        <tr id='pt42.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4336,7 +4162,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.33' class='hiddenRow bg-success'>
+        <tr id='pt42.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4345,7 +4171,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.34' class='hiddenRow bg-success'>
+        <tr id='pt42.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4363,13 +4189,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 16)">Detail</a>
+            <a onclick="showClassDetail('c43', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4378,7 +4204,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4387,7 +4213,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4396,7 +4222,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4405,7 +4231,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4414,7 +4240,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4423,7 +4249,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4432,7 +4258,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4441,7 +4267,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4450,7 +4276,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4459,7 +4285,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4468,7 +4294,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4477,7 +4303,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4486,7 +4312,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4495,7 +4321,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4504,7 +4330,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4515,10 +4341,10 @@ IndexError: list index out of range</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>382</td>
-        <td>368</td>
-        <td>0</td>
-        <td>7</td>
+        <td>381</td>
+        <td>371</td>
+        <td>1</td>
+        <td>2</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4547,7 +4373,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-23-generic #23~20.04.2-Ubuntu SMP Fri Dec 10 12:06:47 UTC 2021 x86_64 x86_64</td>
+              <td>Linux 5.13.0-25-generic #26~20.04.1-Ubuntu SMP Fri Jan 7 16:27:40 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4853,13 +4679,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.3</td>
+              <td>4.4.0</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.3</td>
+              <td>4.4.0</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -4871,7 +4697,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.3</td>
+              <td>4.4.0</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -4901,7 +4727,7 @@ IndexError: list index out of range</pre>
 </div>
 
 <script>
-    drawCircle(368, 0, 7, 7);
+    drawCircle(371, 1, 2, 7);
     showCase(5);
 </script>
 

From 5b59aab81ae413456afa9b688f9aaa7e77e94012 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 15 Jan 2022 18:01:47 +0100
Subject: [PATCH 108/412] Udpate requirements and config.cfg

---
 optional-requirements.txt |  21 +++---
 requirements.txt          |   6 +-
 setup.cfg                 | 150 +++++++++++++++++++-------------------
 3 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 2368be10b..92a014889 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,4 +1,5 @@
 # GDrive Integration
+google-api-python-client>=1.7.11,<2.36.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -8,14 +9,12 @@ pyasn1-modules>=0.0.8,<0.3.0
 pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
-rsa>=3.4.2,<4.8.0
+rsa>=3.4.2,<4.9.0
 six>=1.10.0,<1.17.0
 
-# Gdrive and Gmail integration
-google-api-python-client>=1.7.11,<2.34.0
-
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
+google-api-python-client>=1.7.11,<2.36.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
@@ -25,17 +24,17 @@ python-Levenshtein>=0.12.0,<0.13.0
 python-ldap>=3.0.0,<3.5.0
 Flask-SimpleLDAP>=1.4.0,<1.5.0
 
-#oauth
+# oauth
 Flask-Dance>=2.0.0,<5.2.0
-SQLAlchemy-Utils>=0.33.5,<0.38.0
+SQLAlchemy-Utils>=0.33.5,<0.39.0
 
-# extracting metadata
+# metadata extraction
 rarfile>=2.7
-scholarly>=1.2.0, <1.6
+scholarly>=1.2.0,<1.6
 
-# other
+# Comics
 natsort>=2.2.0,<8.1.0
 comicapi>=2.2.0,<2.3.0
 
-#Kobo integration
-jsonschema>=3.2.0,<4.4.0
+# Kobo integration
+jsonschema>=3.2.0,<4.5.0
diff --git a/requirements.txt b/requirements.txt
index 1db961fef..b8c5744e8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,10 +7,10 @@ Flask>=1.0.2,<2.1.0
 iso-639>=0.4.5,<0.5.0
 PyPDF3>=1.0.0,<1.0.6
 pytz>=2016.10
-requests>=2.11.1,<2.25.0
+requests>=2.11.1,<2.28.0
 SQLAlchemy>=1.3.0,<1.5.0
 tornado>=4.1,<6.2
 Wand>=0.4.4,<0.7.0
-unidecode>=0.04.19,<1.3.0
-lxml>=3.8.0,<4.7.0
+unidecode>=0.04.19,<1.4.0
+lxml>=3.8.0,<4.8.0
 flask-wtf>=0.14.2,<1.1.0
diff --git a/setup.cfg b/setup.cfg
index 52f1d8135..3a81dc2b0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,93 +1,93 @@
 [metadata]
 name = calibreweb
 url = https://github.com/janeczku/calibre-web
-project_urls =
-  Bug Tracker = https://github.com/janeczku/calibre-web/issues
-  Release Management = https://github.com/janeczku/calibre-web/releases
-  Documentation = https://github.com/janeczku/calibre-web/wiki
-  Source Code = https://github.com/janeczku/calibre-web
+project_urls = 
+	Bug Tracker = https://github.com/janeczku/calibre-web/issues
+	Release Management = https://github.com/janeczku/calibre-web/releases
+	Documentation = https://github.com/janeczku/calibre-web/wiki
+	Source Code = https://github.com/janeczku/calibre-web
 description = Web app for browsing, reading and downloading eBooks stored in a Calibre database.
 long_description = file: README.md
-long_description_content_type= text/markdown
+long_description_content_type = text/markdown
 author = @OzzieIsaacs
 author_email = Ozzie.Fernandez.Isaacs@googlemail.com
 maintainer = @OzzieIsaacs
 license = GPLv3+
 license_file = LICENSE
-classifiers =
-    Development Status :: 5 - Production/Stable
-    License :: OSI Approved :: GNU Affero General Public License v3
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Operating System :: OS Independent
-keywords =
-  calibre
-  calibre-web
-  library
+classifiers = 
+	Development Status :: 5 - Production/Stable
+	License :: OSI Approved :: GNU Affero General Public License v3
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.5
+	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
+	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
+	Operating System :: OS Independent
+keywords = 
+	calibre
+	calibre-web
+	library
 python_requires = >=3.5
 
 [options.entry_points]
-console_scripts =
-  cps = calibreweb:main
+console_scripts = 
+	cps = calibreweb:main
+
 [options]
 include_package_data = True
-install_requires =
-    Babel>=1.3,<3.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
-    backports_abc>=0.4
-    Flask>=1.0.2,<2.1.0
-    iso-639>=0.4.5,<0.5.0
-    PyPDF3>=1.0.0,<1.0.6
-    pytz>=2016.10
-    requests>=2.11.1,<2.25.0
-    SQLAlchemy>=1.3.0,<1.5.0
-    tornado>=4.1,<6.2
-    Wand>=0.4.4,<0.7.0
-    unidecode>=0.04.19,<1.3.0
-    lxml>=3.8.0,<4.7.0
-    flask-wtf>=0.14.2,<1.1.0
+install_requires = 
+	Babel>=1.3,<3.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
+	backports_abc>=0.4
+	Flask>=1.0.2,<2.1.0
+	iso-639>=0.4.5,<0.5.0
+	PyPDF3>=1.0.0,<1.0.6
+	pytz>=2016.10
+	requests>=2.11.1,<2.28.0
+	SQLAlchemy>=1.3.0,<1.5.0
+	tornado>=4.1,<6.2
+	Wand>=0.4.4,<0.7.0
+	unidecode>=0.04.19,<1.4.0
+	lxml>=3.8.0,<4.8.0
+	flask-wtf>=0.14.2,<1.1.0
+	
 
 [options.extras_require]
-gdrive =
-    google-api-python-client>=1.7.11,<2.34.0
-    gevent>20.6.0,<22.0.0
-    greenlet>=0.4.17,<1.2.0
-    httplib2>=0.9.2,<0.21.0
-    oauth2client>=4.0.0,<4.1.4
-    uritemplate>=3.0.0,<4.2.0
-    pyasn1-modules>=0.0.8,<0.3.0
-    pyasn1>=0.1.9,<0.5.0
-    PyDrive2>=1.3.1,<1.11.0
-    PyYAML>=3.12
-    rsa>=3.4.2,<4.8.0
-    six>=1.10.0,<1.17.0
-gmail =
-    google-auth-oauthlib>=0.4.3,<0.5.0
-    google-api-python-client>=1.7.11,<2.34.0
-goodreads =
-    goodreads>=0.3.2,<0.4.0
-    python-Levenshtein>=0.12.0,<0.13.0
-ldap =
-    python-ldap>=3.0.0,<3.5.0
-    Flask-SimpleLDAP>=1.4.0,<1.5.0
-oauth =
-    Flask-Dance>=2.0.0,<5.2.0
-    SQLAlchemy-Utils>=0.33.5,<0.38.0
-metadata =
-    rarfile>=2.7
-    scholarly>=1.2.0,<1.6
-comics =
-    natsort>=2.2.0,<8.1.0
-    comicapi>= 2.2.0,<2.3.0
-kobo =
-    jsonschema>=3.2.0,<4.4.0
-
-
+gdrive = 
+	google-api-python-client>=1.7.11,<2.36.0
+	gevent>20.6.0,<22.0.0
+	greenlet>=0.4.17,<1.2.0
+	httplib2>=0.9.2,<0.21.0
+	oauth2client>=4.0.0,<4.1.4
+	uritemplate>=3.0.0,<4.2.0
+	pyasn1-modules>=0.0.8,<0.3.0
+	pyasn1>=0.1.9,<0.5.0
+	PyDrive2>=1.3.1,<1.11.0
+	PyYAML>=3.12
+	rsa>=3.4.2,<4.9.0
+	six>=1.10.0,<1.17.0
+gmail = 
+	google-auth-oauthlib>=0.4.3,<0.5.0
+	google-api-python-client>=1.7.11,<2.36.0
+goodreads = 
+	goodreads>=0.3.2,<0.4.0
+	python-Levenshtein>=0.12.0,<0.13.0
+ldap = 
+	python-ldap>=3.0.0,<3.5.0
+	Flask-SimpleLDAP>=1.4.0,<1.5.0
+oauth = 
+	Flask-Dance>=2.0.0,<5.2.0
+	SQLAlchemy-Utils>=0.33.5,<0.39.0
+metadata = 
+	rarfile>=2.7
+	scholarly>=1.2.0,<1.6
+comics = 
+	natsort>=2.2.0,<8.1.0
+	comicapi>=2.2.0,<2.3.0
+kobo = 
+	jsonschema>=3.2.0,<4.5.0
 

From a118fffc993cb23dd37f911fc88fb5ac37937ae4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 15 Jan 2022 19:58:13 +0100
Subject: [PATCH 109/412] Added missing chardet (used by requests in older
 versions)

---
 requirements.txt                  |    1 +
 test/Calibre-Web TestSummary.html | 2947 -----------------------------
 2 files changed, 1 insertion(+), 2947 deletions(-)
 delete mode 100755 test/Calibre-Web TestSummary.html

diff --git a/requirements.txt b/requirements.txt
index b8c5744e8..0b95dfa37 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,3 +14,4 @@ Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.4.0
 lxml>=3.8.0,<4.8.0
 flask-wtf>=0.14.2,<1.1.0
+chardet>=3.0.0,<4.1.0
diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html
deleted file mode 100755
index 10e2e0eee..000000000
--- a/test/Calibre-Web TestSummary.html	
+++ /dev/null
@@ -1,2947 +0,0 @@
-<!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>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-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 7 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">7</td>
-        <td class="text-center">6</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c2', 7)">Detail</a>
-        </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="su" class="failClass">
-        <td>TestCoverEditBooks</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c3', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='ft3.1' class='none bg-danger'>
-            <td>
-                <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft3.1' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft3.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_cover_edit_books.py", line 91, in test_upload_jpg
-    self.assertTrue(self.check_element_on_page((By.ID, 'flash_alert')))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </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>TestEbookConvert</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'>TestEbookConvert - 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'>TestEbookConvert - 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'>TestEbookConvert - 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'>TestEbookConvert - 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'>TestEbookConvert - 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'>TestEbookConvert - 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'>TestEbookConvert - 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'>TestEbookConvert - 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'>TestEbookConvert - 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'>TestEbookConvert - 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'>TestEbookConvert - test_starttls_smtp_setup_error</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <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>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c6', 5)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt6.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.2' 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='pt6.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadate_cbr</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_database</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.5' 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="failClass">
-        <td>TestEditBooks</td>
-        <td class="text-center">33</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">
-            <a onclick="showClassDetail('c7', 33)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='st7.14' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.14')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st7.14' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st7.14').style.display='none'"><span
-                                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='pt7.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='pt7.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='pt7.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='st7.18' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.18')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st7.18' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st7.18').style.display='none'"><span
-                                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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='ft7.33' class='none bg-danger'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.33')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft7.33' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft7.33').style.display='none'"><span
-                                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 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>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <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">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c8', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt8.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksGdrive - test_config_gdrive</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('c9', 3)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt9.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt9.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='pt9.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">4</td>
-        <td class="text-center">4</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', 4)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt10.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='pt10.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='pt10.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='pt10.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="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('c11', 3)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt11.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='pt11.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='pt11.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>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('c12', 16)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.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='pt12.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestKoboSync</td>
-        <td class="text-center">8</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c13', 8)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt13.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSync - test_kobo_about</div>
-            </td>
-            <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 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>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c14', 10)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt14.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='pt14.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.3' 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='pt14.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_about</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.9' 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='pt14.10' 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('c15', 7)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt15.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='pt15.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='pt15.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='st15.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_st15.4')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st15.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_st15.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='pt15.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='pt15.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='pt15.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">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('c16', 11)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt16.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='pt16.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='pt16.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='pt16.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='pt16.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='pt16.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='pt16.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='pt16.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='pt16.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='pt16.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='pt16.11' 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('c17', 2)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt17.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='pt17.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">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('c18', 20)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt18.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.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='pt18.20' 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>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('c19', 7)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt19.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='pt19.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='pt19.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='pt19.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='pt19.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='pt19.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='pt19.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">10</td>
-        <td class="text-center">9</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', 10)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt20.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='pt20.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='pt20.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='pt20.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='pt20.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='pt20.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='pt20.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='pt20.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='st20.9' 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_st20.9')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st20.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_st20.9').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='pt20.10' 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('c21', 8)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt21.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='pt21.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='pt21.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='pt21.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='pt21.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='pt21.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='st21.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_st21.7')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st21.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_st21.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='pt21.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>TestUserTemplate</td>
-        <td class="text-center">19</td>
-        <td class="text-center">19</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', 19)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt22.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='pt22.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='pt22.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='pt22.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='pt22.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='pt22.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='pt22.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='pt22.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='pt22.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='pt22.10' 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='pt22.11' 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='pt22.12' 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='pt22.13' 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='pt22.14' 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='pt22.15' 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='pt22.16' 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='pt22.17' 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='pt22.18' 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='pt22.19' 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">30</td>
-        <td class="text-center">30</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', 30)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt23.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.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='pt23.21' 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='pt23.22' 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='pt23.23' 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='pt23.24' 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='pt23.25' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.26' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.27' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.28' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.29' 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='pt23.30' 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='total_row' class="text-center bg-grey">
-        <td>Total</td>
-        <td>230</td>
-        <td>222</td>
-        <td>2</td>
-        <td>0</td>
-        <td>6</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.4.0-42-generic #46-Ubuntu SMP Fri Jul 10 00:24:02 UTC 2020 x86_64 x86_64</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Python</th>
-              <td>3.8.2</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Babel</th>
-              <td>2.8.0</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>1.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.1</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>requests</th>
-              <td>2.23.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.19</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>tornado</th>
-              <td>6.0.4</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Unidecode</th>
-              <td>1.1.1</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Wand</th>
-              <td>0.5.9</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Werkzeug</th>
-              <td>1.0.1</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Pillow</th>
-              <td>7.2.0</td>
-              <td>TestCoverEditBooks</td>
-            </tr>
-          
-            <tr>
-              <th>comicapi</th>
-              <td>2.1.1</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
-            <tr>
-              <th>lxml</th>
-              <td>4.5.2</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
-            <tr>
-              <th>Pillow</th>
-              <td>7.2.0</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
-            <tr>
-              <th>rarfile</th>
-              <td>4.0</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
-            <tr>
-              <th>lxml</th>
-              <td>4.5.2</td>
-              <td>TestEditBooks</td>
-            </tr>
-          
-            <tr>
-              <th>Pillow</th>
-              <td>7.2.0</td>
-              <td>TestEditBooks</td>
-            </tr>
-          
-            <tr>
-              <th>google-api-python-client</th>
-              <td>1.11.0</td>
-              <td>TestEditBooksGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>httplib2</th>
-              <td>0.18.1</td>
-              <td>TestEditBooksGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>oauth2client</th>
-              <td>4.1.3</td>
-              <td>TestEditBooksGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
-              <td>TestEditBooksGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>PyYAML</th>
-              <td>5.3.1</td>
-              <td>TestEditBooksGdrive</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>python-ldap</th>
-              <td>3.3.1</td>
-              <td>TestLdapLogin</td>
-            </tr>
-          
-            <tr>
-              <th>Flask-Dance</th>
-              <td>3.0.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(222, 2, 0, 6);
-</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

From b564a97cdfc22c0e31e0ae18c6ed2b4320b40e50 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 16 Jan 2022 12:06:02 +0100
Subject: [PATCH 110/412] Update version Update testresult

---
 cps/constants.py                        |   2 +-
 test/Calibre-Web TestSummary_Linux.html | 357 ++++++++++++++++--------
 2 files changed, 248 insertions(+), 111 deletions(-)

diff --git a/cps/constants.py b/cps/constants.py
index e37ad900d..9364fd792 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -151,7 +151,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.15 Beta'}
+STABLE_VERSION = {'version': '0.6.15'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 94bab0c2e..cf85c7cc0 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-13 19:08:39</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-16 07:27:28</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>2022-01-13 23:00:09</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-16 11:19:00</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>3h 10 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 11 min</p>
         </div>
       </div>
       </div>
@@ -561,11 +561,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</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">
@@ -593,33 +593,11 @@
     
     
     
-        <tr id="ft7.3" class="none bg-danger">
+        <tr id='pt7.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 332, in test_convert_only
-    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1436,13 +1414,13 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</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">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 1)">Detail</a>
         </td>
@@ -1450,42 +1428,22 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     
     
-        <tr id="et13.1" class="none bg-info">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</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:block;">
-                    <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">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 133, in test_load_metadata
-    results[1][&#39;cover_element&#39;].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">19</td>
+        <td class="text-center">20</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('c14', 20)">Detail</a>
@@ -1629,31 +1587,11 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="et14.16" class="none bg-info">
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
-    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3309,12 +3247,12 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestUpdater</td>
         <td class="text-center">9</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">4</td>
+        <td class="text-center">3</td>
         <td class="text-center">1</td>
         <td class="text-center">
             <a onclick="showClassDetail('c37', 9)">Detail</a>
@@ -3323,56 +3261,214 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id="ft37.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft37.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft37.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 223, in test_check_update_nightly_errors
+    self.check_updater(&#39;Timeout&#39;, &#34;alert&#34;, 13)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id="ft37.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft37.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft37.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 251, in test_check_update_nightly_request_errors
+    self.check_updater(&#39;Timeout&#39;, &#34;alert&#34;, 13)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id="ft37.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft37.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft37.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 141, in test_check_update_stable_errors
+    self.check_updater(&#39;Timeout&#39;,  &#34;alert&#34;, 13)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id="ft37.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft37.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft37.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 169, in test_check_update_stable_versions
+    self.check_updater(&#39;{}.{}.{}&#39;.format(*version3), &#34;alert-warning&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id="et37.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 371, in test_perform_update
+    performUpdate.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id="et37.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 318, in test_perform_update_stable_errors
+    performUpdate.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3412,11 +3508,46 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id="et37.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 411, in test_update_write_protect
+    performUpdate.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4342,9 +4473,9 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>381</td>
-        <td>371</td>
-        <td>1</td>
-        <td>2</td>
+        <td>367</td>
+        <td>4</td>
+        <td>3</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4395,6 +4526,12 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>chardet</th>
+              <td>4.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Flask</th>
               <td>2.0.2</td>
@@ -4445,7 +4582,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>lxml</th>
-              <td>4.6.5</td>
+              <td>4.7.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4463,7 +4600,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>requests</th>
-              <td>2.24.0</td>
+              <td>2.27.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4481,7 +4618,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.2.0</td>
+              <td>1.3.2</td>
               <td>Basic</td>
             </tr>
           
@@ -4499,7 +4636,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4529,7 +4666,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4559,7 +4696,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4601,7 +4738,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4637,7 +4774,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4727,7 +4864,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
 </div>
 
 <script>
-    drawCircle(371, 1, 2, 7);
+    drawCircle(367, 4, 3, 7);
     showCase(5);
 </script>
 

From 01090169a795342626412955cd0aefea11ad4a2a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 16 Jan 2022 12:31:19 +0100
Subject: [PATCH 111/412] Version bump update dependencies in setup.cfg Update
 security bug list

---
 SECURITY.md      | 34 +++++++++++++++++++---------------
 cps/constants.py |  2 +-
 setup.cfg        |  1 +
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index bbaad7c4d..c6f866073 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -10,21 +10,25 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 
 ## History
 
-| Fixed in  | Description  |CVE number |
-| ---------- |---------|---------|
-| 3rd July 2018 | Guest access acts as a backdoor||
-| V 0.6.7 |Hardcoded secret key for sessions |CVE-2020-12627 |
-| V 0.6.13|Calibre-Web Metadata cross site scripting |CVE-2021-25964|
-| V 0.6.13|Name of Shelves are only visible to users who can access the corresponding shelf Thanks to @ibarrionuevo||
-| V 0.6.13|JavaScript could get executed in the description field. Thanks to @ranjit-git  and Hagai Wechsler (WhiteSource)||
-| V 0.6.13|JavaScript could get executed in a custom column of type "comment" field ||
-| V 0.6.13|JavaScript could get executed after converting a book to another format with a title containing javascript code||
-| V 0.6.13|JavaScript could get executed after converting a book to another format with a username containing javascript code||
-| V 0.6.13|JavaScript could get executed in the description series, categories or publishers title||
-| V 0.6.13|JavaScript could get executed  in the shelf title||
-| V 0.6.13|Login with the old session cookie after logout. Thanks to @ibarrionuevo||
-| V 0.6.14|CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)  |CVE-2021-25965|
-| V 0.6.14|Cross-Site Scripting vulnerability on typeahead inputs. Thanks to @notdodo||
+| Fixed in      | Description                                                                                                        |CVE number |
+|---------------|--------------------------------------------------------------------------------------------------------------------|---------|
+| 3rd July 2018 | Guest access acts as a backdoor                                                                                    ||
+| V 0.6.7       | Hardcoded secret key for sessions                                                                                  |CVE-2020-12627 |
+| V 0.6.13      | Calibre-Web Metadata cross site scripting                                                                          |CVE-2021-25964|
+| V 0.6.13      | Name of Shelves are only visible to users who can access the corresponding shelf Thanks to @ibarrionuevo           ||
+| V 0.6.13      | JavaScript could get executed in the description field. Thanks to @ranjit-git  and Hagai Wechsler (WhiteSource)    ||
+| V 0.6.13      | JavaScript could get executed in a custom column of type "comment" field                                           ||
+| V 0.6.13      | JavaScript could get executed after converting a book to another format with a title containing javascript code    ||
+| V 0.6.13      | JavaScript could get executed after converting a book to another format with a username containing javascript code ||
+| V 0.6.13      | JavaScript could get executed in the description series, categories or publishers title                            ||
+| V 0.6.13      | JavaScript could get executed  in the shelf title                                                                  ||
+| V 0.6.13      | Login with the old session cookie after logout. Thanks to @ibarrionuevo                                            ||
+| V 0.6.14      | CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)                                              |CVE-2021-25965|
+| V 0.6.14      | Migrated some routes to POST-requests (CSRF protection). Thanks to @scara31                                        ||
+| V 0.6.15      | Fix for "javascript:" script links in identifier. Thanks to @scara31                                               ||
+| V 0.6.15      | Cross-Site Scripting vulnerability on uploaded cover file names. Thanks to @ibarrionuevo                           ||
+| V 0.6.15      | Creating public shelfs is now denied if user is missing the edit public shelf right. Thanks to @ibarrionuevo       ||
+| V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                    ||
 
 
 ## Staement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/constants.py b/cps/constants.py
index 9364fd792..7fb973fc3 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -151,7 +151,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.15'}
+STABLE_VERSION = {'version': '0.6.16 Beta'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/setup.cfg b/setup.cfg
index 3a81dc2b0..d372be873 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -54,6 +54,7 @@ install_requires =
 	unidecode>=0.04.19,<1.4.0
 	lxml>=3.8.0,<4.8.0
 	flask-wtf>=0.14.2,<1.1.0
+	chardet>=3.0.0,<4.1.0
 	
 
 [options.extras_require]

From de1bc3f9af089d324037a6cfd47eaea2f3fab793 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 17 Jan 2022 17:46:57 +0100
Subject: [PATCH 112/412] Fix #2265 (add book to shelf on popup for book
 details) Updated testresults

---
 cps/helper.py                           |   1 -
 cps/opds.py                             |   3 -
 cps/static/js/details.js                |   7 +-
 test/Calibre-Web TestSummary_Linux.html | 382 +++++++++---------------
 4 files changed, 148 insertions(+), 245 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index e8a0b7384..5cfefe50d 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -40,7 +40,6 @@ from werkzeug.security import generate_password_hash
 from markupsafe import escape
 from urllib.parse import quote
 
-
 try:
     import unidecode
     use_unidecode = True
diff --git a/cps/opds.py b/cps/opds.py
index 92c51d1ba..8f4c59056 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -20,7 +20,6 @@
 #  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 sys
 import datetime
 from functools import wraps
 
@@ -35,8 +34,6 @@ from .pagination import Pagination
 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
 
 opds = Blueprint('opds', __name__)
 
diff --git a/cps/static/js/details.js b/cps/static/js/details.js
index 3a7def32b..f559234e2 100644
--- a/cps/static/js/details.js
+++ b/cps/static/js/details.js
@@ -61,8 +61,11 @@ $("#archived_cb").on("change", function() {
 
     $("#shelf-actions").on("click", "[data-shelf-action]", function (e) {
         e.preventDefault();
-
-        $.post(this.href)
+        $.ajax({
+                url: this.href,
+                method:"post",
+                data: {csrf_token:$("input[name='csrf_token']").val()},
+            })
             .done(function() {
                 var $this = $(this);
                 switch ($this.data("shelf-action")) {
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index cf85c7cc0..6c3d98b44 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-16 07:27:28</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-16 21:58:58</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>2022-01-16 11:19:00</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-17 01:49:28</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>3h 11 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 10 min</p>
         </div>
       </div>
       </div>
@@ -411,11 +411,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -479,11 +479,33 @@
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id="ft6.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1414,11 +1436,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1428,21 +1450,41 @@
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id="ft13.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">19</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1623,11 +1665,31 @@
     
     
     
-        <tr id='pt14.20' class='hiddenRow bg-success'>
+        <tr id="ft14.20" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.20')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft14.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft14.20').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 940, in test_watch_metadata
+    self.assertNotIn(&#39;series&#39;, book)
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=4e213e83-fe57-4648-9e75-8e2176fe7773&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1825,15 +1887,15 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="skipClass">
         <td>TestFilePicker</td>
+        <td class="text-center">3</td>
+        <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 3)">Detail</a>
         </td>
     </tr>
 
@@ -1847,6 +1909,41 @@
         </tr>
     
     
+    
+        <tr id="st20.2" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st20.2')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st20.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_st20.2').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.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_two_filepickers</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="passClass">
@@ -3247,12 +3344,12 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">1</td>
-        <td class="text-center">4</td>
-        <td class="text-center">3</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">
             <a onclick="showClassDetail('c37', 9)">Detail</a>
@@ -3261,214 +3358,56 @@
 
     
     
-        <tr id="ft37.1" class="none bg-danger">
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <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_ft37.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft37.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 223, in test_check_update_nightly_errors
-    self.check_updater(&#39;Timeout&#39;, &#34;alert&#34;, 13)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft37.2" class="none bg-danger">
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <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_ft37.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft37.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 251, in test_check_update_nightly_request_errors
-    self.check_updater(&#39;Timeout&#39;, &#34;alert&#34;, 13)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft37.3" class="none bg-danger">
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <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_ft37.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft37.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 141, in test_check_update_stable_errors
-    self.check_updater(&#39;Timeout&#39;,  &#34;alert&#34;, 13)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft37.4" class="none bg-danger">
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <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_ft37.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft37.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 169, in test_check_update_stable_versions
-    self.check_updater(&#39;{}.{}.{}&#39;.format(*version3), &#34;alert-warning&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et37.5" class="none bg-info">
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <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_et37.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 371, in test_perform_update
-    performUpdate.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et37.6" class="none bg-info">
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <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_et37.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 318, in test_perform_update_stable_errors
-    performUpdate.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3508,46 +3447,11 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id="et37.9" class="none bg-info">
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 411, in test_update_write_protect
-    performUpdate.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4472,11 +4376,11 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>381</td>
-        <td>367</td>
-        <td>4</td>
+        <td>383</td>
+        <td>372</td>
         <td>3</td>
-        <td>7</td>
+        <td>0</td>
+        <td>8</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4864,7 +4768,7 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
 </div>
 
 <script>
-    drawCircle(367, 4, 3, 7);
+    drawCircle(372, 3, 0, 8);
     showCase(5);
 </script>
 

From a02f621f0830675cec4de0592408118b881c2404 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 17 Jan 2022 18:38:37 +0100
Subject: [PATCH 113/412] Added id for testability

---
 cps/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 8cb6b76e0..ec69c91ba 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -183,7 +183,7 @@
           </div>
           <div class="modal-body">...</div>
           <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
+            <button type="button" id="details_close" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
           </div>
         </div>
       </div>

From 6bf07539788004513c3692c074ebc7ba4ce005e1 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 18 Jan 2022 17:39:54 +0100
Subject: [PATCH 114/412] Prevent wrong use of safe statement

---
 cps/templates/author.html               |   8 +-
 test/Calibre-Web TestSummary_Linux.html | 196 +++++++++++-------------
 2 files changed, 95 insertions(+), 109 deletions(-)

diff --git a/cps/templates/author.html b/cps/templates/author.html
index f2b71eab1..d832ad5c1 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -5,11 +5,11 @@
 {% if author is not none %}
 <section class="author-bio">
   {%if author.image_url is not none %}
-  <img title="{{author.name|safe}}" src="{{author.image_url}}" alt="{{author.name|safe}}" class="author-photo pull-left">
+  <img title="{{author.name}}" src="{{author.image_url}}" alt="{{author.name}}" class="author-photo pull-left">
   {% endif %}
 
   {%if author.about is not none %}
-  <p>{{author.about|safe}}</p>
+  <p>{{author.about}}</p>
   {% endif %}
 
   - {{_("via")}} <a href="{{author.link}}" class="author-link" target="_blank" rel="noopener">Goodreads</a>
@@ -36,7 +36,7 @@
     <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) }}">
-            <span class="img" title="{{entry.title|safe}}">
+            <span class="img" title="{{entry.title}}">
               <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>
@@ -98,7 +98,7 @@
 
 {% if other_books and author is not none %}
 <div class="discover">
-  <h3>{{_("More by")}} {{ author.name.replace('|',',')|safe }}</h3>
+  <h3>{{_("More by")}} {{ author.name.replace('|',',') }}</h3>
   <div class="row">
     {% for entry in other_books %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 6c3d98b44..978d371b8 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-16 21:58:58</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-17 18:51: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>Stop Time: </strong>2022-01-17 01:49:28</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-18 07:49:35</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>3h 10 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>12h 17 min</p>
         </div>
       </div>
       </div>
@@ -411,11 +411,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
+        <td class="text-center">15</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -479,33 +479,11 @@
     
     
     
-        <tr id="ft6.7" class="none bg-danger">
+        <tr id='pt6.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -738,13 +716,13 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">16</td>
-        <td class="text-center">14</td>
+        <td class="text-center">17</td>
+        <td class="text-center">15</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', 16)">Detail</a>
+            <a onclick="showClassDetail('c10', 17)">Detail</a>
         </td>
     </tr>
 
@@ -779,7 +757,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -788,7 +766,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -797,7 +775,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -806,7 +784,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -815,7 +793,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -824,7 +802,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -833,7 +811,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -841,6 +819,15 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
         <tr id='pt10.11' 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='pt10.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -849,19 +836,19 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="st10.12" class="none bg-warning">
+        <tr id="st10.13" 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_st10.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.13')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st10.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_st10.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st10.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -875,7 +862,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id='pt10.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
@@ -884,7 +871,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='st10.14' class='none bg-warning'>
+        <tr id='st10.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -893,7 +880,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.15' class='hiddenRow bg-success'>
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -902,7 +889,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -1436,13 +1423,13 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 1)">Detail</a>
         </td>
@@ -1450,42 +1437,22 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <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">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c14', 20)">Detail</a>
@@ -1629,11 +1596,41 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id="et14.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 250, in test_edit_title
+    self.fill_basic_config({&#34;config_unicode_filename&#34;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1665,31 +1662,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id="ft14.20" class="none bg-danger">
+        <tr id='pt14.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 940, in test_watch_metadata
-    self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=4e213e83-fe57-4648-9e75-8e2176fe7773&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1865,13 +1842,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     <tr id="su" class="passClass">
         <td>TestErrorReadColumn</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 2)">Detail</a>
         </td>
     </tr>
 
@@ -1885,6 +1862,15 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         </tr>
     
     
+    
+        <tr id='pt19.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="skipClass">
@@ -4376,10 +4362,10 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>383</td>
-        <td>372</td>
-        <td>3</td>
+        <td>385</td>
+        <td>376</td>
         <td>0</td>
+        <td>1</td>
         <td>8</td>
         <td>&nbsp;</td>
     </tr>
@@ -4768,7 +4754,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 </div>
 
 <script>
-    drawCircle(372, 3, 0, 8);
+    drawCircle(376, 0, 1, 8);
     showCase(5);
 </script>
 

From 0c0313f375bed7b035c8c0482bbb09599e16bfcf Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 18 Jan 2022 17:55:10 +0100
Subject: [PATCH 115/412] Prevent creating a public shelf without permission

---
 cps/shelf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/shelf.py b/cps/shelf.py
index 29a4fe99d..ad6a2665a 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -248,7 +248,7 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
         if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
             flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
             return redirect(url_for('web.index'))
-        is_public = 1 if to_save.get("is_public") else 0
+        is_public = 1 if to_save.get("is_public") == "on" else 0
         if config.config_kobo_sync:
             shelf.kobo_sync = True if to_save.get("kobo_sync") else False
             if shelf.kobo_sync:

From 35209ede67622eeea4079e55bd41f3f1c06da7e7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 10:31:18 +0100
Subject: [PATCH 116/412] Update cover extraction with comicapi for webp files
 (fixes #2280)

---
 cps/comic.py                            |  28 ++---
 test/Calibre-Web TestSummary_Linux.html | 161 +++++++++++++++++-------
 2 files changed, 127 insertions(+), 62 deletions(-)

diff --git a/cps/comic.py b/cps/comic.py
index b094c60fb..647114604 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -56,25 +56,25 @@ COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
 
 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:
+    if extension in NO_JPEG_EXTENSIONS:
+        if use_IM:
+            with Image(blob=img) as imgc:
                 imgc.format = 'jpeg'
                 imgc.transform_colorspace('rgb')
-                imgc.save(tmp_cover_name)
+                imgc.save(filename=tmp_cover_name)
                 return tmp_cover_name
-
-    if not img:
+        else:
+            return None
+    if img:
+        with open(tmp_cover_name, 'wb') as f:
+            f.write(img)
+        return tmp_cover_name
+    else:
         return None
 
-    with open(tmp_cover_name, 'wb') as f:
-        f.write(img)
-    return tmp_cover_name
-
 
 def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable):
-    cover_data = None
+    cover_data = extension = None
     if original_file_extension.upper() == '.CBZ':
         cf = zipfile.ZipFile(tmp_file_name)
         for name in cf.namelist():
@@ -106,7 +106,7 @@ def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecu
                         break
         except Exception as ex:
             log.debug('Rarfile failed with error: %s', ex)
-    return cover_data
+    return cover_data, extension
 
 
 def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
@@ -121,7 +121,7 @@ def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
                     cover_data = archive.getPage(index)
                     break
     else:
-        cover_data = _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable)
+        cover_data, extension = _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable)
     return _cover_processing(tmp_file_name, cover_data, extension)
 
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 978d371b8..84bdae18a 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-17 18:51:33</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-18 21:11:17</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>2022-01-18 07:49:35</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-19 01:03:52</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>12h 17 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 12 min</p>
         </div>
       </div>
       </div>
@@ -1423,11 +1423,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1437,11 +1437,31 @@
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id="ft13.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1613,19 +1633,9 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 250, in test_edit_title
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
+    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1998,11 +2008,11 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">11</td>
-        <td class="text-center">0</td>
+        <td class="text-center">10</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2084,11 +2094,31 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt23.9' class='hiddenRow bg-success'>
+        <tr id="ft23.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft23.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
+    self.assertEqual(1, len(data), data)
+AssertionError: 1 != 0 : []</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2983,11 +3013,11 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3024,11 +3054,37 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id="ft33.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 219, in sound_test
+    self.assertEqual(duration, duration_item.text)
+AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
+- 0:02
+?    ^
++ 0:01
+?    ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3174,13 +3230,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 
     <tr id="su" class="skipClass">
         <td>TestShelf</td>
+        <td class="text-center">15</td>
         <td class="text-center">14</td>
-        <td class="text-center">13</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('c36', 14)">Detail</a>
+            <a onclick="showClassDetail('c36', 15)">Detail</a>
         </td>
     </tr>
 
@@ -3224,7 +3280,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
+                <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3233,7 +3289,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_private_shelf</div>
+                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3242,7 +3298,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_public_private_shelf</div>
+                <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3251,7 +3307,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_public_shelf</div>
+                <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3260,7 +3316,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_rename_shelf</div>
+                <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3269,7 +3325,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
+                <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3277,6 +3333,15 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
         <tr id='pt36.11' 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='pt36.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3285,19 +3350,19 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="st36.12" class="none bg-warning">
+        <tr id="st36.13" 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_st36.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.13')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st36.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_st36.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st36.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3311,7 +3376,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.13' class='hiddenRow bg-success'>
+        <tr id='pt36.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3320,7 +3385,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.14' class='hiddenRow bg-success'>
+        <tr id='pt36.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -4362,9 +4427,9 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>385</td>
-        <td>376</td>
-        <td>0</td>
+        <td>386</td>
+        <td>374</td>
+        <td>3</td>
         <td>1</td>
         <td>8</td>
         <td>&nbsp;</td>
@@ -4754,7 +4819,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 </div>
 
 <script>
-    drawCircle(376, 0, 1, 8);
+    drawCircle(374, 3, 1, 8);
     showCase(5);
 </script>
 

From 81b85445d859b3eff4e4c2089f071a65c2a9e036 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 11:51:34 +0100
Subject: [PATCH 117/412] Added missing unique marker on comments table (#2278)

---
 cps/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/db.py b/cps/db.py
index 470ecc1c0..ca8768f19 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -177,8 +177,8 @@ class Comments(Base):
     __tablename__ = 'comments'
 
     id = Column(Integer, primary_key=True)
+    book = Column(Integer, ForeignKey('books.id'), nullable=False, unique=True)
     text = Column(String(collation='NOCASE'), nullable=False)
-    book = Column(Integer, ForeignKey('books.id'), nullable=False)
 
     def __init__(self, text, book):
         self.text = text

From bbef41290fbfab94f16325cfadac03a3e7624ad7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 14:01:32 +0100
Subject: [PATCH 118/412] Fix delete book format wasn't working

---
 cps/static/js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index cf5a43274..b10f0f980 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -204,7 +204,7 @@ $("#delete_confirm").click(function(event) {
     var bookFormat = $(this).data("delete-format");
     var ajaxResponse = $(this).data("ajax");
     if (bookFormat) {
-        window.location.href = getPath() + "/delete/" + deleteId + "/" + bookFormat;
+        postButton(event, getPath() + "/delete/" + deleteId + "/" + bookFormat);
     } else {
         if (ajaxResponse) {
             path = getPath() + "/ajax/delete/" + deleteId;

From d759df0df6248f1c79e31e580985138e4e10da60 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 18:23:08 +0100
Subject: [PATCH 119/412] Kobo sync token is now also created if accessed from
 localhost(fixes #1990) Create kobo sync token button is now "unclicked" after
 closing dialog Additional localhost route is catched If book format is
 deleted this also deletes the book synced to kobo status

---
 cps/admin.py                              | 12 ++---
 cps/editbooks.py                          |  1 +
 cps/kobo_auth.py                          | 62 ++++++++++-------------
 cps/static/js/main.js                     |  1 +
 cps/templates/generate_kobo_auth_url.html | 15 +++---
 5 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 706dce394..c1931ea47 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1426,14 +1426,14 @@ def _delete_user(content):
             for kobo_entry in kobo_entries:
                 ub.session.delete(kobo_entry)
             ub.session_commit()
-            log.info(u"User {} deleted".format(content.name))
-            return(_(u"User '%(nick)s' deleted", nick=content.name))
+            log.info("User {} deleted".format(content.name))
+            return(_("User '%(nick)s' deleted", nick=content.name))
         else:
-            log.warning(_(u"Can't delete Guest User"))
-            raise Exception(_(u"Can't delete Guest User"))
+            log.warning(_("Can't delete Guest User"))
+            raise Exception(_("Can't delete Guest User"))
     else:
-        log.warning(u"No admin user remaining, can't delete user")
-        raise Exception(_(u"No admin user remaining, can't delete user"))
+        log.warning("No admin user remaining, can't delete user")
+        raise Exception(_("No admin user remaining, can't delete user"))
 
 
 def _handle_edit_user(to_save, content, languages, translations, kobo_support):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 182484166..8ea004694 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -341,6 +341,7 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                 else:
                     calibre_db.session.query(db.Data).filter(db.Data.book == book.id).\
                         filter(db.Data.format == book_format).delete()
+                    kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
                 log.debug_or_exception(ex)
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index 8d46b26ac..5668e6dad 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -118,55 +118,49 @@ kobo_auth = Blueprint("kobo_auth", __name__, url_prefix="/kobo_auth")
 @kobo_auth.route("/generate_auth_token/<int:user_id>")
 @login_required
 def generate_auth_token(user_id):
+    warning = False
     host_list = request.host.rsplit(':')
     if len(host_list) == 1:
         host = ':'.join(host_list)
     else:
         host = ':'.join(host_list[0:-1])
-    if host.startswith('127.') or host.lower() == 'localhost' or host.startswith('[::ffff:7f'):
-        warning = _('PLease access calibre-web from non localhost to get valid api_endpoint for kobo device')
-        return render_title_template(
-            "generate_kobo_auth_url.html",
-            title=_(u"Kobo Setup"),
-            warning = warning
-        )
-    else:
-        # Invalidate any prevously generated Kobo Auth token for this user.
-        auth_token = ub.session.query(ub.RemoteAuthToken).filter(
-            ub.RemoteAuthToken.user_id == user_id
-        ).filter(ub.RemoteAuthToken.token_type==1).first()
+    if host.startswith('127.') or host.lower() == 'localhost' or host.startswith('[::ffff:7f') or host == "[::1]":
+        warning = _('Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device')
 
-        if not auth_token:
-            auth_token = ub.RemoteAuthToken()
-            auth_token.user_id = user_id
-            auth_token.expiration = datetime.max
-            auth_token.auth_token = (hexlify(urandom(16))).decode("utf-8")
-            auth_token.token_type = 1
+    # Generate auth token if none is existing for this user
+    auth_token = ub.session.query(ub.RemoteAuthToken).filter(
+        ub.RemoteAuthToken.user_id == user_id
+    ).filter(ub.RemoteAuthToken.token_type==1).first()
 
-            ub.session.add(auth_token)
-            ub.session_commit()
+    if not auth_token:
+        auth_token = ub.RemoteAuthToken()
+        auth_token.user_id = user_id
+        auth_token.expiration = datetime.max
+        auth_token.auth_token = (hexlify(urandom(16))).decode("utf-8")
+        auth_token.token_type = 1
 
-        books = calibre_db.session.query(db.Books).join(db.Data).all()
+        ub.session.add(auth_token)
+        ub.session_commit()
 
-        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.name)
+    books = calibre_db.session.query(db.Books).join(db.Data).all()
 
-        return render_title_template(
-            "generate_kobo_auth_url.html",
-            title=_(u"Kobo Setup"),
-            kobo_auth_url=url_for(
-                "kobo.TopLevelEndpoint", auth_token=auth_token.auth_token, _external=True
-            ),
-            warning = False
-        )
+    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.name)
+
+    return render_title_template(
+        "generate_kobo_auth_url.html",
+        title=_(u"Kobo Setup"),
+        auth_token=auth_token.auth_token,
+        warning = warning
+    )
 
 
 @kobo_auth.route("/deleteauthtoken/<int:user_id>", methods=["POST"])
 @login_required
 def delete_auth_token(user_id):
-    # Invalidate any prevously generated Kobo Auth token for this user.
+    # Invalidate any previously 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()
 
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index b10f0f980..75599d9ba 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -535,6 +535,7 @@ $(function() {
 
     $("#modal_kobo_token")
         .on("show.bs.modal", function(e) {
+            $(e.relatedTarget).one('focus', function(e){$(this).blur();});
             var $modalBody = $(this).find(".modal-body");
 
             // Prevent static assets from loading multiple times
diff --git a/cps/templates/generate_kobo_auth_url.html b/cps/templates/generate_kobo_auth_url.html
index fb62424c4..b8b74bda4 100644
--- a/cps/templates/generate_kobo_auth_url.html
+++ b/cps/templates/generate_kobo_auth_url.html
@@ -1,12 +1,15 @@
 {% extends "fragment.html" %}
 {% block body %}
 <div class="well">
-  <p>
-    {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}</a>
+<p>
+  {% if not warning %}
+      {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}
+    </p><p>
+      api_endpoint={{url_for("kobo.TopLevelEndpoint", auth_token=auth_token, _external=True)}}
+  {% else %}
+      {{warning}}
+    </p><p>{{_('Kobo Token:')}} {{ auth_token }}
+  {% endif %}
   </p>
-  <p>
-    {% if not warning %}api_endpoint={{kobo_auth_url}}{% else %}{{warning}}{% endif %}</a>
-  </p>
-  <p>
 </div>
 {% endblock %}

From bc7a305285543c633280d511abed9056f082965b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 13:11:02 +0100
Subject: [PATCH 120/412] Deleted book formats remove book from synced to kobo
 table updated teststatus

---
 cps/editbooks.py                        |   3 +-
 cps/helper.py                           |  14 +-
 cps/kobo_sync_status.py                 |  13 +-
 cps/tasks/convert.py                    |   8 +-
 cps/ub.py                               |  15 +-
 test/Calibre-Web TestSummary_Linux.html | 226 ++++++++++--------------
 6 files changed, 128 insertions(+), 151 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 8ea004694..f0b8fb413 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -341,7 +341,8 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                 else:
                     calibre_db.session.query(db.Data).filter(db.Data.book == book.id).\
                         filter(db.Data.format == book_format).delete()
-                    kobo_sync_status.remove_synced_book(book.id, True)
+                    if book_format.upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                        kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
                 log.debug_or_exception(ex)
diff --git a/cps/helper.py b/cps/helper.py
index 5cfefe50d..622af8175 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -17,18 +17,18 @@
 #  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 sys
 import os
 import io
 import mimetypes
 import re
 import shutil
-import time
+import socket
 import unicodedata
 from datetime import datetime, timedelta
 from tempfile import gettempdir
-
+from urllib.parse import urlparse
 import requests
+
 from babel.dates import format_datetime
 from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
@@ -584,10 +584,16 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
+        # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
+        ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
+        if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+            log.error("Localhost was accessed for cover upload")
+            return False, _("You are not allowed to access localhost for cover uploads")
         img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)
-    except (requests.exceptions.HTTPError,
+    except (socket.gaierror,
+            requests.exceptions.HTTPError,
             requests.exceptions.ConnectionError,
             requests.exceptions.Timeout) as ex:
         log.info(u'Cover Download Error %s', ex)
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index 6df0a503c..2e99394b0 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -21,6 +21,7 @@ from flask_login import current_user
 from . import ub
 import datetime
 from sqlalchemy.sql.expression import or_, and_, true
+from sqlalchemy import exc
 
 # Add the current book id to kobo_synced_books table for current user, if entry is already present,
 # do nothing (safety precaution)
@@ -36,14 +37,18 @@ def add_synced_books(book_id):
 
 
 # Select all entries of current book in kobo_synced_books table, which are from current user and delete them
-def remove_synced_book(book_id, all=False):
+def remove_synced_book(book_id, all=False, session=None):
     if not all:
         user = ub.KoboSyncedBooks.user_id == current_user.id
     else:
         user = true()
-    ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id) \
-        .filter(user).delete()
-    ub.session_commit()
+    if not session:
+        ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
+        ub.session_commit()
+    else:
+        session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
+        ub.session_commit(sess=session)
+
 
 
 def change_archived_books(book_id, state=None, message=None):
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 59ad6909e..596bf95c0 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -16,7 +16,6 @@
 #  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 sys
 import os
 import re
 
@@ -31,7 +30,8 @@ from cps import db
 from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
-from flask import url_for
+from cps.kobo_sync_status import remove_synced_book
+from cps.ub import ini
 
 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
@@ -147,6 +147,10 @@ class TaskConvert(CalibreTask):
                 try:
                     local_db.session.merge(new_format)
                     local_db.session.commit()
+                    if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                        ub_session = ini()
+                        remove_synced_book(book_id, True, ub_session)
+                        ub_session.close()
                 except SQLAlchemyError as e:
                     local_db.session.rollback()
                     log.error("Database error: %s", e)
diff --git a/cps/ub.py b/cps/ub.py
index 1d5db58a3..27e9ef8fb 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -773,6 +773,14 @@ def create_admin_user(session):
     except Exception:
         session.rollback()
 
+def ini():
+    global app_DB_path
+    engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
+
+    Session = scoped_session(sessionmaker())
+    Session.configure(bind=engine)
+    return Session()
+
 
 def init_db(app_db_path):
     # Open session for database connection
@@ -830,12 +838,13 @@ def dispose():
             except Exception:
                 pass
 
-def session_commit(success=None):
+def session_commit(success=None, sess=None):
+    s = sess if sess else session
     try:
-        session.commit()
+        s.commit()
         if success:
             log.info(success)
     except (exc.OperationalError, exc.InvalidRequestError) as e:
-        session.rollback()
+        s.rollback()
         log.debug_or_exception(e)
     return ""
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 84bdae18a..652248a29 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-18 21:11:17</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-23 05:50:54</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>2022-01-19 01:03:52</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-23 10:25:22</p>
             
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>3h 12 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 54 min</p>
         </div>
       </div>
       </div>
@@ -714,15 +714,15 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">17</td>
+        <td class="text-center">18</td>
         <td class="text-center">15</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 17)">Detail</a>
+            <a onclick="showClassDetail('c10', 18)">Detail</a>
         </td>
     </tr>
 
@@ -809,7 +809,36 @@
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id="et10.10" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 59, in test_upload_cbz_coverformats
+    original_cover = self.check_element_on_page((By.ID, &#34;detailcover&#34;)).screenshot_as_png
+AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -818,7 +847,7 @@
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -827,7 +856,7 @@
     
     
     
-        <tr id='pt10.12' class='hiddenRow bg-success'>
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -836,19 +865,19 @@
     
     
     
-        <tr id="st10.13" class="none bg-warning">
+        <tr id="st10.14" 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_st10.13')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.13" class="popup_window test_output" style="display:none;">
+                <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.13').style.display='none'"><span
+                                onclick="document.getElementById('div_st10.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -862,7 +891,7 @@
     
     
     
-        <tr id='pt10.14' class='hiddenRow bg-success'>
+        <tr id='pt10.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
@@ -871,7 +900,7 @@
     
     
     
-        <tr id='st10.15' class='none bg-warning'>
+        <tr id='st10.16' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -880,7 +909,7 @@
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -889,7 +918,7 @@
     
     
     
-        <tr id='pt10.17' class='hiddenRow bg-success'>
+        <tr id='pt10.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -901,13 +930,13 @@
 
     <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
+        <td class="text-center">36</td>
         <td class="text-center">35</td>
-        <td class="text-center">34</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('c11', 35)">Detail</a>
+            <a onclick="showClassDetail('c11', 36)">Detail</a>
         </td>
     </tr>
 
@@ -1237,6 +1266,15 @@
     
     
         <tr id='pt11.35' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1423,13 +1461,13 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 1)">Detail</a>
         </td>
@@ -1437,42 +1475,22 @@
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">19</td>
+        <td class="text-center">20</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('c14', 20)">Detail</a>
@@ -1616,31 +1634,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id="et14.16" class="none bg-info">
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
-    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2008,11 +2006,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">10</td>
-        <td class="text-center">1</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">
@@ -2094,31 +2092,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id="ft23.9" class="none bg-danger">
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
-    self.assertEqual(1, len(data), data)
-AssertionError: 1 != 0 : []</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3013,11 +2991,11 @@ AssertionError: 1 != 0 : []</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3054,37 +3032,11 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="ft33.4" class="none bg-danger">
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 219, in sound_test
-    self.assertEqual(duration, duration_item.text)
-AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
-- 0:02
-?    ^
-+ 0:01
-?    ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4427,9 +4379,9 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>386</td>
-        <td>374</td>
-        <td>3</td>
+        <td>388</td>
+        <td>379</td>
+        <td>0</td>
         <td>1</td>
         <td>8</td>
         <td>&nbsp;</td>
@@ -4459,7 +4411,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-25-generic #26~20.04.1-Ubuntu SMP Fri Jan 7 16:27:40 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-27-generic #29~20.04.1-Ubuntu SMP Fri Jan 14 00:32:30 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4561,7 +4513,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.29</td>
+              <td>1.4.31</td>
               <td>Basic</td>
             </tr>
           
@@ -4591,7 +4543,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4621,7 +4573,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4651,7 +4603,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4681,7 +4633,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>comicapi</th>
-              <td>2.2.0</td>
+              <td>2.2.1</td>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
@@ -4693,7 +4645,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4729,7 +4681,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4819,7 +4771,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
 </div>
 
 <script>
-    drawCircle(374, 3, 1, 8);
+    drawCircle(379, 0, 1, 8);
     showCase(5);
 </script>
 

From ede273a8f9669089449416d23ab81a6dd66306f4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 13:43:35 +0100
Subject: [PATCH 121/412] Added variable to allow loading cover from localhost

---
 cps/cli.py    |  3 +++
 cps/helper.py | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cps/cli.py b/cps/cli.py
index 3685e8e24..31ea84176 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -45,6 +45,7 @@ parser.add_argument('-v', '--version', action='version', help='Shows version num
 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='Flag is depreciated and will be removed in next version')
+parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
 args = parser.parse_args()
 
 settingspath = args.p or os.path.join(_CONFIG_DIR, "app.db")
@@ -77,6 +78,8 @@ if (args.k and not args.c) or (not args.k and args.c):
 if args.k == "":
     keyfilepath = ""
 
+# load covers from localhost
+allow_localhost = args.l or None
 # handle and check ip address argument
 ip_address = args.i or None
 if ip_address:
diff --git a/cps/helper.py b/cps/helper.py
index 622af8175..2cfb119bb 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -46,7 +46,7 @@ try:
 except ImportError:
     use_unidecode = False
 
-from . import calibre_db
+from . import calibre_db, cli
 from .tasks.convert import TaskConvert
 from . import logger, config, get_locale, db, ub
 from . import gdriveutils as gd
@@ -584,11 +584,12 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
-        # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
-        ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
-        if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
-            log.error("Localhost was accessed for cover upload")
-            return False, _("You are not allowed to access localhost for cover uploads")
+        if not cli.allow_localhost:
+            # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
+            ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
+            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+                log.error("Localhost was accessed for cover upload")
+                return False, _("You are not allowed to access localhost for cover uploads")
         img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)

From d8f5bdea6df3a0217f49062d4209cedc80caad0e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 19:31:56 +0100
Subject: [PATCH 122/412] Refactor rename author/title on gdrive

---
 cps/gdriveutils.py        | 48 +++++++++++++++++-----
 cps/helper.py             | 86 +++++++++++++++++++++++++++------------
 optional-requirements.txt |  4 +-
 setup.cfg                 |  4 +-
 4 files changed, 102 insertions(+), 40 deletions(-)

diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index c44459445..38cbd74ff 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -355,23 +355,51 @@ def downloadFile(path, filename, output):
     f = getFileFromEbooksFolder(path, filename)
     f.GetContentFile(output)
 
+'''def renameGdriveFolderRemote(origin_file, target_folder):
+    drive = getDrive(Gdrive.Instance().drive)
+    previous_parents = ",".join([parent["id"] for parent in origin_file.get('parents')])
+    children = drive.auth.service.children().list(folderId=previous_parents).execute()
+    gFileTargetDir = getFileFromEbooksFolder(None, target_folder)
+    if not gFileTargetDir or gFileTargetDir['title'] != target_folder:
+        # Folder is not existing, rename folder
+        drive.auth.service.files().patch(fileId=origin_file['id'],
+                                         body={'title': target_folder},
+                                         fields='title').execute()
+        # gFileTargetDir = drive.CreateFile(
+        #    {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
+        #     "mimeType": "application/vnd.google-apps.folder"})
+        # gFileTargetDir.Upload()
+    else:
+        # Move the file to the new folder
+        drive.auth.service.files().update(fileId=origin_file['id'],
+                                          addParents=gFileTargetDir['id'],
+                                          removeParents=previous_parents,
+                                          fields='id, parents').execute()
+    # if previous_parents has no children anymore, delete original fileparent
+    if len(children['items']) == 1:
+        deleteDatabaseEntry(previous_parents)
+        drive.auth.service.files().delete(fileId=previous_parents).execute()'''
 
 def moveGdriveFolderRemote(origin_file, target_folder):
     drive = getDrive(Gdrive.Instance().drive)
     previous_parents = ",".join([parent["id"] for parent in origin_file.get('parents')])
     children = drive.auth.service.children().list(folderId=previous_parents).execute()
     gFileTargetDir = getFileFromEbooksFolder(None, target_folder)
-    if not gFileTargetDir:
+    if not gFileTargetDir or gFileTargetDir['title'] != target_folder:
         # Folder is not existing, create, and move folder
-        gFileTargetDir = drive.CreateFile(
-            {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
-             "mimeType": "application/vnd.google-apps.folder"})
-        gFileTargetDir.Upload()
-    # Move the file to the new folder
-    drive.auth.service.files().update(fileId=origin_file['id'],
-                                      addParents=gFileTargetDir['id'],
-                                      removeParents=previous_parents,
-                                      fields='id, parents').execute()
+        drive.auth.service.files().patch(fileId=origin_file['id'],
+                                         body={'title': target_folder},
+                                         fields='title').execute()
+        #gFileTargetDir = drive.CreateFile(
+        #    {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
+        #     "mimeType": "application/vnd.google-apps.folder"})
+        #gFileTargetDir.Upload()
+    else:
+        # Move the file to the new folder
+        drive.auth.service.files().update(fileId=origin_file['id'],
+                                          addParents=gFileTargetDir['id'],
+                                          removeParents=previous_parents,
+                                          fields='id, parents').execute()
     # if previous_parents has no children anymore, delete original fileparent
     if len(children['items']) == 1:
         deleteDatabaseEntry(previous_parents)
diff --git a/cps/helper.py b/cps/helper.py
index 29c9e3bf8..4dea4e676 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -331,7 +331,7 @@ def delete_book_file(book, calibrepath, book_format=None):
                    path=book.path)
 
 
-def clean_author_database(renamed_author, calibrepath, local_book=None):
+def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=None):
     valid_filename_authors = [get_valid_filename(r) for r in renamed_author]
     for r in renamed_author:
         if local_book:
@@ -350,9 +350,19 @@ def clean_author_database(renamed_author, calibrepath, local_book=None):
                 # change location in database to new author/title path
                 book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
                 for file_format in book.data:
-                    shutil.move(os.path.normcase(
-                        os.path.join(all_new_path, file_format.name + '.' + file_format.format.lower())),
-                        os.path.normcase(os.path.join(all_new_path, all_new_name + '.' + file_format.format.lower())))
+                    if not gdrive:
+                        shutil.move(os.path.normcase(os.path.join(all_new_path,
+                                                                  file_format.name + '.' + file_format.format.lower())),
+                            os.path.normcase(os.path.join(all_new_path,
+                                                          all_new_name + '.' + file_format.format.lower())))
+                    else:
+                        gFile = gd.getFileFromEbooksFolder(all_new_path,
+                                                           file_format.name + '.' + file_format.format.lower())
+                        if gFile:
+                            gd.moveGdriveFileRemote(gFile, all_new_name + u'.' + file_format.format.lower())
+                        else:
+                            log.error("File {} not found on gdrive"
+                                      .format(all_new_path, file_format.name + '.' + file_format.format.lower()))
                     file_format.name = all_new_name
 
 
@@ -461,23 +471,18 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
             old_author_dir = get_valid_filename(r)
             new_author_rename_dir = get_valid_filename(new_author.name)
-            '''if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
-                try:
-                    old_author_path = os.path.join(calibrepath, old_author_dir)
-                    new_author_path = os.path.join(calibrepath, new_author_rename_dir)
-                    shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
-                except (OSError) as ex:
-                    log.error("Rename author from: %s to %s: %s", old_author_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=old_author_path, dest=new_author_path, error=str(ex))'''
+            gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
+            if gFile:
+                gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
+            else:
+                error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
     else:
         new_authordir = get_valid_filename(book.authors[0].name)
 
     titledir = book.path.split('/')[1]
     new_titledir = get_valid_filename(book.title) + u" (" + str(book_id) + u")"
 
-    if titledir != new_titledir:
+    '''if titledir != new_titledir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
         if gFile:
             gFile['title'] = new_titledir
@@ -496,10 +501,47 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             path = book.path
             gd.updateDatabaseOnEdit(gFile['id'], book.path)
         else:
-            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
+            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found'''
+
+    if authordir != new_authordir or titledir != new_titledir:
+        new_path = os.path.join(new_authordir, new_titledir)
+        new_name = get_valid_filename(book.title) + ' - ' + get_valid_filename(new_authordir)
+        gFile = gd.getFileFromEbooksFolder(new_authordir, new_titledir)
+        if not gFile:
+            # move original path to new path
+            log.debug("Moving title: %s to %s", path, new_path)
+            gFile = gd.getFileFromEbooksFolder(authordir, titledir)
+            # move author and title  -> currently only title??
+            gd.moveGdriveFileRemote(gFile, new_titledir)
+            # 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)
+            # gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
+            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)))
+    # change location in database to new author/title path
+    book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
+
+    #for file_format in book.data:
+    #        gFile = gd.getFileFromEbooksFolder(path, file_format.name + '.' + file_format.format.lower())
+    #        if not gFile:
+    #           error = _(u'File %(file)s not found on Google Drive', file=file_format.name)  # file not found
+    #            break
+    #        gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
+    #        file_format.name = new_name
+
     # Todo: Rename all authors on gdrive
     # Rename all files from old names to new names
-    '''
+    clean_author_database(renamed_author, "")
+    if first_author not in renamed_author:
+        clean_author_database([first_author], "", book)
+    #if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+    #        shutil.rmtree(os.path.dirname(path))
+
+    '''# Rename all files from old names to new names
     try:
         clean_author_database(renamed_author, calibrepath)
         if first_author not in renamed_author:
@@ -510,15 +552,7 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
         log.error("Error in rename file in path %s", ex)
         log.debug(ex, exc_info=True)
         return _("Error in rename file in path: %(error)s", error=str(ex))'''
-    if authordir != new_authordir or titledir != new_titledir:
-        new_name = get_valid_filename(book.title) + u' - ' + get_valid_filename(new_authordir)
-        for file_format in book.data:
-            gFile = gd.getFileFromEbooksFolder(path, file_format.name + u'.' + file_format.format.lower())
-            if not gFile:
-                error = _(u'File %(file)s not found on Google Drive', file=file_format.name)  # file not found
-                break
-            gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
-            file_format.name = new_name
+
     return error
 
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 92a014889..2ebcf1a78 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.36.0
+google-api-python-client>=1.7.11,<2.37.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -14,7 +14,7 @@ six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
-google-api-python-client>=1.7.11,<2.36.0
+google-api-python-client>=1.7.11,<2.37.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/setup.cfg b/setup.cfg
index d372be873..db2fd3e6c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -59,7 +59,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.36.0
+	google-api-python-client>=1.7.11,<2.37.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -73,7 +73,7 @@ gdrive =
 	six>=1.10.0,<1.17.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
-	google-api-python-client>=1.7.11,<2.36.0
+	google-api-python-client>=1.7.11,<2.37.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From e8e2f789e5f58275f230df92e0fce7cbeb798ed0 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 24 Jan 2022 12:37:15 +0100
Subject: [PATCH 123/412] Fix #2287 (books can't be added to shelf from search)

---
 cps/templates/search.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cps/templates/search.html b/cps/templates/search.html
index 32339803c..745925872 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -9,6 +9,7 @@
       {% if g.user.is_authenticated %}
         {% if g.user.shelf.all() or g.shelves_access %}
           <div id="shelf-actions" class="btn-toolbar" role="toolbar">
+            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
             <div class="btn-group" role="group" aria-label="Add to shelves">
               <button id="add-to-shelf" type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span class="glyphicon glyphicon-list"></span> {{_('Add to shelf')}}

From 3b216bfa07ec7992eff03e55d61732af6df9bb92 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 18:23:08 +0100
Subject: [PATCH 124/412] Kobo sync token is now also created if accessed from
 localhost(fixes #1990) Create kobo sync token button is now "unclicked" after
 closing dialog Additional localhost route is catched If book format is
 deleted this also deletes the book synced to kobo status

---
 cps/admin.py                              | 12 ++---
 cps/editbooks.py                          |  1 +
 cps/kobo_auth.py                          | 62 ++++++++++-------------
 cps/static/js/main.js                     |  1 +
 cps/templates/generate_kobo_auth_url.html | 15 +++---
 5 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 706dce394..c1931ea47 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1426,14 +1426,14 @@ def _delete_user(content):
             for kobo_entry in kobo_entries:
                 ub.session.delete(kobo_entry)
             ub.session_commit()
-            log.info(u"User {} deleted".format(content.name))
-            return(_(u"User '%(nick)s' deleted", nick=content.name))
+            log.info("User {} deleted".format(content.name))
+            return(_("User '%(nick)s' deleted", nick=content.name))
         else:
-            log.warning(_(u"Can't delete Guest User"))
-            raise Exception(_(u"Can't delete Guest User"))
+            log.warning(_("Can't delete Guest User"))
+            raise Exception(_("Can't delete Guest User"))
     else:
-        log.warning(u"No admin user remaining, can't delete user")
-        raise Exception(_(u"No admin user remaining, can't delete user"))
+        log.warning("No admin user remaining, can't delete user")
+        raise Exception(_("No admin user remaining, can't delete user"))
 
 
 def _handle_edit_user(to_save, content, languages, translations, kobo_support):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 182484166..8ea004694 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -341,6 +341,7 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                 else:
                     calibre_db.session.query(db.Data).filter(db.Data.book == book.id).\
                         filter(db.Data.format == book_format).delete()
+                    kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
                 log.debug_or_exception(ex)
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index 8d46b26ac..5668e6dad 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -118,55 +118,49 @@ kobo_auth = Blueprint("kobo_auth", __name__, url_prefix="/kobo_auth")
 @kobo_auth.route("/generate_auth_token/<int:user_id>")
 @login_required
 def generate_auth_token(user_id):
+    warning = False
     host_list = request.host.rsplit(':')
     if len(host_list) == 1:
         host = ':'.join(host_list)
     else:
         host = ':'.join(host_list[0:-1])
-    if host.startswith('127.') or host.lower() == 'localhost' or host.startswith('[::ffff:7f'):
-        warning = _('PLease access calibre-web from non localhost to get valid api_endpoint for kobo device')
-        return render_title_template(
-            "generate_kobo_auth_url.html",
-            title=_(u"Kobo Setup"),
-            warning = warning
-        )
-    else:
-        # Invalidate any prevously generated Kobo Auth token for this user.
-        auth_token = ub.session.query(ub.RemoteAuthToken).filter(
-            ub.RemoteAuthToken.user_id == user_id
-        ).filter(ub.RemoteAuthToken.token_type==1).first()
+    if host.startswith('127.') or host.lower() == 'localhost' or host.startswith('[::ffff:7f') or host == "[::1]":
+        warning = _('Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device')
 
-        if not auth_token:
-            auth_token = ub.RemoteAuthToken()
-            auth_token.user_id = user_id
-            auth_token.expiration = datetime.max
-            auth_token.auth_token = (hexlify(urandom(16))).decode("utf-8")
-            auth_token.token_type = 1
+    # Generate auth token if none is existing for this user
+    auth_token = ub.session.query(ub.RemoteAuthToken).filter(
+        ub.RemoteAuthToken.user_id == user_id
+    ).filter(ub.RemoteAuthToken.token_type==1).first()
 
-            ub.session.add(auth_token)
-            ub.session_commit()
+    if not auth_token:
+        auth_token = ub.RemoteAuthToken()
+        auth_token.user_id = user_id
+        auth_token.expiration = datetime.max
+        auth_token.auth_token = (hexlify(urandom(16))).decode("utf-8")
+        auth_token.token_type = 1
 
-        books = calibre_db.session.query(db.Books).join(db.Data).all()
+        ub.session.add(auth_token)
+        ub.session_commit()
 
-        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.name)
+    books = calibre_db.session.query(db.Books).join(db.Data).all()
 
-        return render_title_template(
-            "generate_kobo_auth_url.html",
-            title=_(u"Kobo Setup"),
-            kobo_auth_url=url_for(
-                "kobo.TopLevelEndpoint", auth_token=auth_token.auth_token, _external=True
-            ),
-            warning = False
-        )
+    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.name)
+
+    return render_title_template(
+        "generate_kobo_auth_url.html",
+        title=_(u"Kobo Setup"),
+        auth_token=auth_token.auth_token,
+        warning = warning
+    )
 
 
 @kobo_auth.route("/deleteauthtoken/<int:user_id>", methods=["POST"])
 @login_required
 def delete_auth_token(user_id):
-    # Invalidate any prevously generated Kobo Auth token for this user.
+    # Invalidate any previously 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()
 
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index b10f0f980..75599d9ba 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -535,6 +535,7 @@ $(function() {
 
     $("#modal_kobo_token")
         .on("show.bs.modal", function(e) {
+            $(e.relatedTarget).one('focus', function(e){$(this).blur();});
             var $modalBody = $(this).find(".modal-body");
 
             // Prevent static assets from loading multiple times
diff --git a/cps/templates/generate_kobo_auth_url.html b/cps/templates/generate_kobo_auth_url.html
index fb62424c4..b8b74bda4 100644
--- a/cps/templates/generate_kobo_auth_url.html
+++ b/cps/templates/generate_kobo_auth_url.html
@@ -1,12 +1,15 @@
 {% extends "fragment.html" %}
 {% block body %}
 <div class="well">
-  <p>
-    {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}</a>
+<p>
+  {% if not warning %}
+      {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}
+    </p><p>
+      api_endpoint={{url_for("kobo.TopLevelEndpoint", auth_token=auth_token, _external=True)}}
+  {% else %}
+      {{warning}}
+    </p><p>{{_('Kobo Token:')}} {{ auth_token }}
+  {% endif %}
   </p>
-  <p>
-    {% if not warning %}api_endpoint={{kobo_auth_url}}{% else %}{{warning}}{% endif %}</a>
-  </p>
-  <p>
 </div>
 {% endblock %}

From 35f6f4c727c887f8f3607fe3233dbc1980d15020 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 13:11:02 +0100
Subject: [PATCH 125/412] Deleted book formats remove book from synced to kobo
 table updated teststatus

---
 cps/editbooks.py                        |   3 +-
 cps/helper.py                           |  14 +-
 cps/kobo_sync_status.py                 |  13 +-
 cps/tasks/convert.py                    |   8 +-
 cps/ub.py                               |  15 +-
 test/Calibre-Web TestSummary_Linux.html | 226 ++++++++++--------------
 6 files changed, 128 insertions(+), 151 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 8ea004694..f0b8fb413 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -341,7 +341,8 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                 else:
                     calibre_db.session.query(db.Data).filter(db.Data.book == book.id).\
                         filter(db.Data.format == book_format).delete()
-                    kobo_sync_status.remove_synced_book(book.id, True)
+                    if book_format.upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                        kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
                 log.debug_or_exception(ex)
diff --git a/cps/helper.py b/cps/helper.py
index 5cfefe50d..622af8175 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -17,18 +17,18 @@
 #  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 sys
 import os
 import io
 import mimetypes
 import re
 import shutil
-import time
+import socket
 import unicodedata
 from datetime import datetime, timedelta
 from tempfile import gettempdir
-
+from urllib.parse import urlparse
 import requests
+
 from babel.dates import format_datetime
 from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
@@ -584,10 +584,16 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
+        # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
+        ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
+        if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+            log.error("Localhost was accessed for cover upload")
+            return False, _("You are not allowed to access localhost for cover uploads")
         img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)
-    except (requests.exceptions.HTTPError,
+    except (socket.gaierror,
+            requests.exceptions.HTTPError,
             requests.exceptions.ConnectionError,
             requests.exceptions.Timeout) as ex:
         log.info(u'Cover Download Error %s', ex)
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index 6df0a503c..2e99394b0 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -21,6 +21,7 @@ from flask_login import current_user
 from . import ub
 import datetime
 from sqlalchemy.sql.expression import or_, and_, true
+from sqlalchemy import exc
 
 # Add the current book id to kobo_synced_books table for current user, if entry is already present,
 # do nothing (safety precaution)
@@ -36,14 +37,18 @@ def add_synced_books(book_id):
 
 
 # Select all entries of current book in kobo_synced_books table, which are from current user and delete them
-def remove_synced_book(book_id, all=False):
+def remove_synced_book(book_id, all=False, session=None):
     if not all:
         user = ub.KoboSyncedBooks.user_id == current_user.id
     else:
         user = true()
-    ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id) \
-        .filter(user).delete()
-    ub.session_commit()
+    if not session:
+        ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
+        ub.session_commit()
+    else:
+        session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
+        ub.session_commit(sess=session)
+
 
 
 def change_archived_books(book_id, state=None, message=None):
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 59ad6909e..596bf95c0 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -16,7 +16,6 @@
 #  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 sys
 import os
 import re
 
@@ -31,7 +30,8 @@ from cps import db
 from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
-from flask import url_for
+from cps.kobo_sync_status import remove_synced_book
+from cps.ub import ini
 
 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
@@ -147,6 +147,10 @@ class TaskConvert(CalibreTask):
                 try:
                     local_db.session.merge(new_format)
                     local_db.session.commit()
+                    if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                        ub_session = ini()
+                        remove_synced_book(book_id, True, ub_session)
+                        ub_session.close()
                 except SQLAlchemyError as e:
                     local_db.session.rollback()
                     log.error("Database error: %s", e)
diff --git a/cps/ub.py b/cps/ub.py
index 1d5db58a3..27e9ef8fb 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -773,6 +773,14 @@ def create_admin_user(session):
     except Exception:
         session.rollback()
 
+def ini():
+    global app_DB_path
+    engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
+
+    Session = scoped_session(sessionmaker())
+    Session.configure(bind=engine)
+    return Session()
+
 
 def init_db(app_db_path):
     # Open session for database connection
@@ -830,12 +838,13 @@ def dispose():
             except Exception:
                 pass
 
-def session_commit(success=None):
+def session_commit(success=None, sess=None):
+    s = sess if sess else session
     try:
-        session.commit()
+        s.commit()
         if success:
             log.info(success)
     except (exc.OperationalError, exc.InvalidRequestError) as e:
-        session.rollback()
+        s.rollback()
         log.debug_or_exception(e)
     return ""
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 84bdae18a..652248a29 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-18 21:11:17</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-23 05:50:54</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>2022-01-19 01:03:52</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-23 10:25:22</p>
             
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>3h 12 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 54 min</p>
         </div>
       </div>
       </div>
@@ -714,15 +714,15 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">17</td>
+        <td class="text-center">18</td>
         <td class="text-center">15</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 17)">Detail</a>
+            <a onclick="showClassDetail('c10', 18)">Detail</a>
         </td>
     </tr>
 
@@ -809,7 +809,36 @@
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id="et10.10" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 59, in test_upload_cbz_coverformats
+    original_cover = self.check_element_on_page((By.ID, &#34;detailcover&#34;)).screenshot_as_png
+AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -818,7 +847,7 @@
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -827,7 +856,7 @@
     
     
     
-        <tr id='pt10.12' class='hiddenRow bg-success'>
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -836,19 +865,19 @@
     
     
     
-        <tr id="st10.13" class="none bg-warning">
+        <tr id="st10.14" 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_st10.13')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.13" class="popup_window test_output" style="display:none;">
+                <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.13').style.display='none'"><span
+                                onclick="document.getElementById('div_st10.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -862,7 +891,7 @@
     
     
     
-        <tr id='pt10.14' class='hiddenRow bg-success'>
+        <tr id='pt10.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
@@ -871,7 +900,7 @@
     
     
     
-        <tr id='st10.15' class='none bg-warning'>
+        <tr id='st10.16' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -880,7 +909,7 @@
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -889,7 +918,7 @@
     
     
     
-        <tr id='pt10.17' class='hiddenRow bg-success'>
+        <tr id='pt10.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -901,13 +930,13 @@
 
     <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
+        <td class="text-center">36</td>
         <td class="text-center">35</td>
-        <td class="text-center">34</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('c11', 35)">Detail</a>
+            <a onclick="showClassDetail('c11', 36)">Detail</a>
         </td>
     </tr>
 
@@ -1237,6 +1266,15 @@
     
     
         <tr id='pt11.35' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1423,13 +1461,13 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 1)">Detail</a>
         </td>
@@ -1437,42 +1475,22 @@
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">19</td>
+        <td class="text-center">20</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('c14', 20)">Detail</a>
@@ -1616,31 +1634,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id="et14.16" class="none bg-info">
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
-    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2008,11 +2006,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">10</td>
-        <td class="text-center">1</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">
@@ -2094,31 +2092,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id="ft23.9" class="none bg-danger">
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
-    self.assertEqual(1, len(data), data)
-AssertionError: 1 != 0 : []</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3013,11 +2991,11 @@ AssertionError: 1 != 0 : []</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3054,37 +3032,11 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="ft33.4" class="none bg-danger">
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 219, in sound_test
-    self.assertEqual(duration, duration_item.text)
-AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
-- 0:02
-?    ^
-+ 0:01
-?    ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4427,9 +4379,9 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>386</td>
-        <td>374</td>
-        <td>3</td>
+        <td>388</td>
+        <td>379</td>
+        <td>0</td>
         <td>1</td>
         <td>8</td>
         <td>&nbsp;</td>
@@ -4459,7 +4411,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-25-generic #26~20.04.1-Ubuntu SMP Fri Jan 7 16:27:40 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-27-generic #29~20.04.1-Ubuntu SMP Fri Jan 14 00:32:30 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4561,7 +4513,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.29</td>
+              <td>1.4.31</td>
               <td>Basic</td>
             </tr>
           
@@ -4591,7 +4543,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4621,7 +4573,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4651,7 +4603,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4681,7 +4633,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>comicapi</th>
-              <td>2.2.0</td>
+              <td>2.2.1</td>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
@@ -4693,7 +4645,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4729,7 +4681,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4819,7 +4771,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
 </div>
 
 <script>
-    drawCircle(374, 3, 1, 8);
+    drawCircle(379, 0, 1, 8);
     showCase(5);
 </script>
 

From d9c10b830a18629c1bb13524db67eaaff669af1b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 13:43:35 +0100
Subject: [PATCH 126/412] Added variable to allow loading cover from localhost

---
 cps/cli.py    |  3 +++
 cps/helper.py | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cps/cli.py b/cps/cli.py
index 3685e8e24..31ea84176 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -45,6 +45,7 @@ parser.add_argument('-v', '--version', action='version', help='Shows version num
 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='Flag is depreciated and will be removed in next version')
+parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
 args = parser.parse_args()
 
 settingspath = args.p or os.path.join(_CONFIG_DIR, "app.db")
@@ -77,6 +78,8 @@ if (args.k and not args.c) or (not args.k and args.c):
 if args.k == "":
     keyfilepath = ""
 
+# load covers from localhost
+allow_localhost = args.l or None
 # handle and check ip address argument
 ip_address = args.i or None
 if ip_address:
diff --git a/cps/helper.py b/cps/helper.py
index 622af8175..2cfb119bb 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -46,7 +46,7 @@ try:
 except ImportError:
     use_unidecode = False
 
-from . import calibre_db
+from . import calibre_db, cli
 from .tasks.convert import TaskConvert
 from . import logger, config, get_locale, db, ub
 from . import gdriveutils as gd
@@ -584,11 +584,12 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
-        # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
-        ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
-        if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
-            log.error("Localhost was accessed for cover upload")
-            return False, _("You are not allowed to access localhost for cover uploads")
+        if not cli.allow_localhost:
+            # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
+            ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
+            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+                log.error("Localhost was accessed for cover upload")
+                return False, _("You are not allowed to access localhost for cover uploads")
         img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)

From 01ab75a158eff7b5bd2400226be8b87b875c5a54 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 19:32:37 +0100
Subject: [PATCH 127/412] Updated requirements for gdrive and gmail Updated
 teststatus

---
 optional-requirements.txt               |   4 +-
 setup.cfg                               |   4 +-
 test/Calibre-Web TestSummary_Linux.html | 168 ++++++++++++------------
 3 files changed, 85 insertions(+), 91 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 92a014889..2ebcf1a78 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.36.0
+google-api-python-client>=1.7.11,<2.37.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -14,7 +14,7 @@ six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
-google-api-python-client>=1.7.11,<2.36.0
+google-api-python-client>=1.7.11,<2.37.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/setup.cfg b/setup.cfg
index d372be873..db2fd3e6c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -59,7 +59,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.36.0
+	google-api-python-client>=1.7.11,<2.37.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -73,7 +73,7 @@ gdrive =
 	six>=1.10.0,<1.17.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
-	google-api-python-client>=1.7.11,<2.36.0
+	google-api-python-client>=1.7.11,<2.37.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 652248a29..8d8966ad9 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-23 05:50:54</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-24 05:56:04</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>2022-01-23 10:25:22</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-24 09:54:16</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>3h 54 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 17 min</p>
         </div>
       </div>
       </div>
@@ -561,11 +561,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">5</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -593,11 +593,33 @@
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id="ft7.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 332, in test_convert_only
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -714,15 +736,15 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">18</td>
-        <td class="text-center">15</td>
+        <td class="text-center">19</td>
+        <td class="text-center">17</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 18)">Detail</a>
+            <a onclick="showClassDetail('c10', 19)">Detail</a>
         </td>
     </tr>
 
@@ -730,7 +752,7 @@
     
         <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_cbz_comicinfo</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -739,7 +761,7 @@
     
         <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -748,7 +770,7 @@
     
         <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -757,7 +779,7 @@
     
         <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -766,7 +788,7 @@
     
         <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -775,7 +797,7 @@
     
         <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -784,7 +806,7 @@
     
         <tr id='pt10.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -793,7 +815,7 @@
     
         <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -801,6 +823,15 @@
     
     
         <tr id='pt10.9' 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='pt10.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
@@ -809,38 +840,9 @@
     
     
     
-        <tr id="et10.10" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 59, in test_upload_cbz_coverformats
-    original_cover = self.check_element_on_page((By.ID, &#34;detailcover&#34;)).screenshot_as_png
-AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
         <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -849,7 +851,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
         <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -857,6 +859,15 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
         <tr id='pt10.13' 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='pt10.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -865,19 +876,19 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id="st10.14" class="none bg-warning">
+        <tr id="st10.15" 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_st10.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.15')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st10.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_st10.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st10.15').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -891,7 +902,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id='pt10.15' class='hiddenRow bg-success'>
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
@@ -900,7 +911,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id='st10.16' class='none bg-warning'>
+        <tr id='st10.17' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -909,7 +920,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id='pt10.17' class='hiddenRow bg-success'>
+        <tr id='pt10.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -918,7 +929,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id='pt10.18' class='hiddenRow bg-success'>
+        <tr id='pt10.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -2180,13 +2191,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="passClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">12</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">1</td>
         <td class="text-center">
             <a onclick="showClassDetail('c25', 13)">Detail</a>
         </td>
@@ -2203,28 +2214,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id="st25.2" class="none bg-warning">
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st25.2')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st25.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_st25.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Unknown how to test certificate</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4379,11 +4373,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>388</td>
-        <td>379</td>
-        <td>0</td>
+        <td>389</td>
+        <td>381</td>
         <td>1</td>
-        <td>8</td>
+        <td>0</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4771,7 +4765,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
 </div>
 
 <script>
-    drawCircle(379, 0, 1, 8);
+    drawCircle(381, 1, 0, 7);
     showCase(5);
 </script>
 

From e0e04220109920575179a8f924543449c6de0706 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 24 Jan 2022 19:18:40 +0100
Subject: [PATCH 128/412] Upates for new release

---
 SECURITY.md      | 3 +++
 cps/constants.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index c6f866073..3e5a965dd 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -29,6 +29,9 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.15      | Cross-Site Scripting vulnerability on uploaded cover file names. Thanks to @ibarrionuevo                           ||
 | V 0.6.15      | Creating public shelfs is now denied if user is missing the edit public shelf right. Thanks to @ibarrionuevo       ||
 | V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                    ||
+| V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
+| V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
+| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @ibarrionuevo         ||
 
 
 ## Staement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/constants.py b/cps/constants.py
index 7fb973fc3..281517cc4 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -151,7 +151,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.16 Beta'}
+STABLE_VERSION = {'version': '0.6.16'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'

From 6a37c7ca9dd978487f43467258b81da86d08e7e6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 24 Jan 2022 19:27:09 +0100
Subject: [PATCH 129/412] Version bump

---
 cps/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/constants.py b/cps/constants.py
index 281517cc4..0a964fb73 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -151,7 +151,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.16'}
+STABLE_VERSION = {'version': '0.6.17 Beta'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'

From 62e7aca0fb765545e4022172204ec377e6d80a4a Mon Sep 17 00:00:00 2001
From: Daniel <ge64tap@mytum.de>
Date: Tue, 25 Jan 2022 14:33:34 +0100
Subject: [PATCH 130/412] amazon metadata

---
 cps/metadata_provider/amazon.py | 98 +++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 cps/metadata_provider/amazon.py

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
new file mode 100644
index 000000000..f77383879
--- /dev/null
+++ b/cps/metadata_provider/amazon.py
@@ -0,0 +1,98 @@
+import concurrent.futures
+import requests
+from bs4 import BeautifulSoup as BS  # requirement
+import lxml     #requirement for better speed
+import cchardet #optional for better speed
+from cps.services.Metadata import Metadata
+#from time import time
+from operator import itemgetter
+class Amazon(Metadata):
+    __name__ = "Amazon"
+    __id__ = "amazon"
+    headers = {'upgrade-insecure-requests': '1',
+               'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36',
+               'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
+               'sec-gpc': '1',
+               'sec-fetch-site': 'none',
+               'sec-fetch-mode': 'navigate',
+               'sec-fetch-user': '?1',
+               'sec-fetch-dest': 'document',
+               'accept-encoding': 'gzip, deflate, br',
+               'accept-language': 'en-US,en;q=0.9'}
+    session = requests.Session()
+    session.headers=headers
+
+    def search(self, query: str, generic_cover=""):
+        #timer=time()
+        def inner(link,index)->[dict,int]:
+             with self.session as session:
+                r = session.get(f"https://www.amazon.com/{link}")
+                r.raise_for_status()
+                long_soup = BS(r.text, "lxml")  #~4sec :/
+                soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
+                if soup2 is None:
+                    return
+                try:
+                    v = dict()
+                    v['source'] = {
+                        "id": self.__id__,
+                        "description": "Amazon Books",
+                        "link": "https://amazon.com/"
+                    }
+                    v['url'] = f"https://www.amazon.com/{link}"
+
+                    #the more searches the slower, these are too hard to find in reasonable time or might not even exist
+                    v['publisher'] = ""  # very unreliable
+                    v['publishedDate'] = ""  # very unreliable
+                    v['id'] = None  # ?
+                    v['tags'] = []  # dont exist on amazon
+
+
+                    try:
+                        v['description'] = "\n".join(
+                            soup2.find("div", attrs={"data-feature-name": "bookDescription"}).stripped_strings).replace(
+                            "\xa0"," ")[:-9].strip().strip("\n")
+                    except (AttributeError, TypeError):
+                        return None  # if there is no description it is not a book and therefore should be ignored
+                    try:
+                        v['title'] = soup2.find("span", attrs={"id": "productTitle"}).text
+                    except (AttributeError, TypeError):
+                        v['title'] = ""
+                    try:
+                        v['authors'] = [next(
+                            filter(lambda i: i != " " and i != "\n" and not i.startswith("{"),
+                                   x.findAll(text=True))).strip()
+                                        for x in soup2.findAll("span", attrs={"class": "author"})]
+                    except (AttributeError, TypeError, StopIteration):
+                        v['authors'] = ""
+                    try:
+                        v['rating'] = int(
+                            soup2.find("span", class_="a-icon-alt").text.split(" ")[0].split(".")[
+                                0])  # first number in string
+                    except (AttributeError, ValueError):
+                        v['rating'] = 0
+                    try:
+                        v['cover'] = soup2.find("img", attrs={"class": "a-dynamic-image frontImage"})["src"]
+                    except (AttributeError, TypeError):
+                        v['cover'] = ""
+                    return v,index
+                except:
+                    return
+
+        val = list()
+        if self.active:
+            results = self.session.get(
+                f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}%2Cdigital-text&ref=nb_sb_noss",
+                headers=self.headers)
+            results.raise_for_status()
+            soup = BS(results.text, 'html.parser')
+            links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
+                          soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
+            with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+                fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
+                val=list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
+        #print(val)
+        #print(f"time was {time()-timer}")
+        result=list(filter(lambda x: x, val))
+        return [x[0] for x in sorted(result,key=itemgetter(1))] #sort by amazons listing order for best relevance
+

From 8362c82d5491ecdb0843ca8346c3f59f90dd7c30 Mon Sep 17 00:00:00 2001
From: Daniel <ge64tap@mytum.de>
Date: Tue, 25 Jan 2022 14:33:34 +0100
Subject: [PATCH 131/412] amazon metadata

---
 cps/metadata_provider/amazon.py | 98 +++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 cps/metadata_provider/amazon.py

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
new file mode 100644
index 000000000..f77383879
--- /dev/null
+++ b/cps/metadata_provider/amazon.py
@@ -0,0 +1,98 @@
+import concurrent.futures
+import requests
+from bs4 import BeautifulSoup as BS  # requirement
+import lxml     #requirement for better speed
+import cchardet #optional for better speed
+from cps.services.Metadata import Metadata
+#from time import time
+from operator import itemgetter
+class Amazon(Metadata):
+    __name__ = "Amazon"
+    __id__ = "amazon"
+    headers = {'upgrade-insecure-requests': '1',
+               'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36',
+               'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
+               'sec-gpc': '1',
+               'sec-fetch-site': 'none',
+               'sec-fetch-mode': 'navigate',
+               'sec-fetch-user': '?1',
+               'sec-fetch-dest': 'document',
+               'accept-encoding': 'gzip, deflate, br',
+               'accept-language': 'en-US,en;q=0.9'}
+    session = requests.Session()
+    session.headers=headers
+
+    def search(self, query: str, generic_cover=""):
+        #timer=time()
+        def inner(link,index)->[dict,int]:
+             with self.session as session:
+                r = session.get(f"https://www.amazon.com/{link}")
+                r.raise_for_status()
+                long_soup = BS(r.text, "lxml")  #~4sec :/
+                soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
+                if soup2 is None:
+                    return
+                try:
+                    v = dict()
+                    v['source'] = {
+                        "id": self.__id__,
+                        "description": "Amazon Books",
+                        "link": "https://amazon.com/"
+                    }
+                    v['url'] = f"https://www.amazon.com/{link}"
+
+                    #the more searches the slower, these are too hard to find in reasonable time or might not even exist
+                    v['publisher'] = ""  # very unreliable
+                    v['publishedDate'] = ""  # very unreliable
+                    v['id'] = None  # ?
+                    v['tags'] = []  # dont exist on amazon
+
+
+                    try:
+                        v['description'] = "\n".join(
+                            soup2.find("div", attrs={"data-feature-name": "bookDescription"}).stripped_strings).replace(
+                            "\xa0"," ")[:-9].strip().strip("\n")
+                    except (AttributeError, TypeError):
+                        return None  # if there is no description it is not a book and therefore should be ignored
+                    try:
+                        v['title'] = soup2.find("span", attrs={"id": "productTitle"}).text
+                    except (AttributeError, TypeError):
+                        v['title'] = ""
+                    try:
+                        v['authors'] = [next(
+                            filter(lambda i: i != " " and i != "\n" and not i.startswith("{"),
+                                   x.findAll(text=True))).strip()
+                                        for x in soup2.findAll("span", attrs={"class": "author"})]
+                    except (AttributeError, TypeError, StopIteration):
+                        v['authors'] = ""
+                    try:
+                        v['rating'] = int(
+                            soup2.find("span", class_="a-icon-alt").text.split(" ")[0].split(".")[
+                                0])  # first number in string
+                    except (AttributeError, ValueError):
+                        v['rating'] = 0
+                    try:
+                        v['cover'] = soup2.find("img", attrs={"class": "a-dynamic-image frontImage"})["src"]
+                    except (AttributeError, TypeError):
+                        v['cover'] = ""
+                    return v,index
+                except:
+                    return
+
+        val = list()
+        if self.active:
+            results = self.session.get(
+                f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}%2Cdigital-text&ref=nb_sb_noss",
+                headers=self.headers)
+            results.raise_for_status()
+            soup = BS(results.text, 'html.parser')
+            links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
+                          soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
+            with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+                fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
+                val=list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
+        #print(val)
+        #print(f"time was {time()-timer}")
+        result=list(filter(lambda x: x, val))
+        return [x[0] for x in sorted(result,key=itemgetter(1))] #sort by amazons listing order for best relevance
+

From 17b4643b7c55fedd9b3b6e81283980befa6360e5 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 25 Jan 2022 19:30:17 +0100
Subject: [PATCH 132/412] fix #2285 (Fix for shelf handling in caliblur theme)

---
 cps/static/js/caliBlur.js | 10 +++++-----
 cps/static/js/details.js  |  8 ++++----
 cps/templates/detail.html |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js
index 3203c255d..f99779bd3 100644
--- a/cps/static/js/caliBlur.js
+++ b/cps/static/js/caliBlur.js
@@ -270,7 +270,7 @@ if ($("body.book").length > 0) {
 
             if (position + $("#add-to-shelves").width() > $(window).width()) {
                 positionOff = position + $("#add-to-shelves").width() - $(window).width();
-                adsPosition = position - positionOff - 5
+                adsPosition = position - positionOff - 5;
                 $("#add-to-shelves").attr("style", "left: " + adsPosition + "px !important; right: auto;  top: " + topPos + "px");
             } else {
                 $("#add-to-shelves").attr("style", "left: " + position + "px !important; right: auto;  top: " + topPos + "px");
@@ -429,7 +429,7 @@ if($("body.advsearch").length > 0) {
 
           if (position + $("#add-to-shelves").width() > $(window).width()) {
               positionOff = position + $("#add-to-shelves").width() - $(window).width();
-              adsPosition = position - positionOff - 5
+              adsPosition = position - positionOff - 5;
               $("#add-to-shelves").attr("style", "left: " + adsPosition + "px !important; right: auto;  top: " + topPos + "px");
           } else {
               $("#add-to-shelves").attr("style", "left: " + position + "px !important; right: auto;  top: " + topPos + "px");
@@ -479,12 +479,12 @@ if ($.trim($("#add-to-shelves").html()).length === 0) {
     $("#add-to-shelf").addClass("empty-ul");
 }
 
-shelfLength = $("#add-to-shelves li").length
-emptyLength = 0
+shelfLength = $("#add-to-shelves li").length;
+emptyLength = 0;
 
 $("#add-to-shelves").on("click", "li a", function () {
     console.log("#remove-from-shelves change registered");
-    emptyLength++
+    emptyLength++;
 
     setTimeout(function () {
         if (emptyLength >= shelfLength) {
diff --git a/cps/static/js/details.js b/cps/static/js/details.js
index f559234e2..6f99595d6 100644
--- a/cps/static/js/details.js
+++ b/cps/static/js/details.js
@@ -59,10 +59,10 @@ $("#archived_cb").on("change", function() {
         )
     };
 
-    $("#shelf-actions").on("click", "[data-shelf-action]", function (e) {
+    $("#add-to-shelves, #remove-from-shelves").on("click", "[data-shelf-action]", function (e) {
         e.preventDefault();
         $.ajax({
-                url: this.href,
+                url: $(this).data('href'),
                 method:"post",
                 data: {csrf_token:$("input[name='csrf_token']").val()},
             })
@@ -72,7 +72,7 @@ $("#archived_cb").on("change", function() {
                     case "add":
                         $("#remove-from-shelves").append(
                             templates.remove({
-                                add: this.href,
+                                add: $this.data('href'),
                                 remove: $this.data("remove-href"),
                                 content: $("<div>").text(this.textContent).html()
                             })
@@ -82,7 +82,7 @@ $("#archived_cb").on("change", function() {
                         $("#add-to-shelves").append(
                             templates.add({
                                 add: $this.data("add-href"),
-                                remove: this.href,
+                                remove: $this.data('href'),
                                 content: $("<div>").text(this.textContent).html(),
                             })
                         );
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index c8d7d5276..eb32f8fe8 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -260,7 +260,7 @@
             {% for shelf in g.shelves_access %}
               {% if not shelf.id in books_shelfs and ( not shelf.is_public or g.user.role_edit_shelfs() ) %}
                 <li>
-                  <a href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                  <a data-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                      data-remove-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                      data-shelf-action="add"
                   >
@@ -275,7 +275,7 @@
           {% if books_shelfs %}
             {% for shelf in g.shelves_access %}
               {% if shelf.id in books_shelfs %}
-                <a href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                <a data-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                    data-add-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                    class="btn btn-sm btn-default" role="button" data-shelf-action="remove"
                 >
@@ -309,13 +309,13 @@
 {% block js %}
 <script type="text/template" id="template-shelf-add">
   <li>
-    <a href="<%= add %>" data-remove-href="<%= remove %>" data-shelf-action="add">
+    <a data-href="<%= add %>" data-remove-href="<%= remove %>" data-shelf-action="add">
       <%= content %>
     </a>
   </li>
 </script>
 <script type="text/template" id="template-shelf-remove">
-  <a href="<%= remove %>" data-add-href="<%= add %>" class="btn btn-sm btn-default" data-shelf-action="remove">
+  <a data-href="<%= remove %>" data-add-href="<%= add %>" class="btn btn-sm btn-default" data-shelf-action="remove">
     <span class="glyphicon glyphicon-remove"></span> <%= content %>
   </a>
 </script>

From 3c4cd22d9eed5b7444c1c209cdb6923427e58b70 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 25 Jan 2022 21:13:17 +0100
Subject: [PATCH 133/412] Renaming files on gdrive seem to work

---
 cps/gdriveutils.py | 17 ++++++---
 cps/helper.py      | 95 +++-------------------------------------------
 2 files changed, 18 insertions(+), 94 deletions(-)

diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 38cbd74ff..de3fbb64d 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -385,15 +385,22 @@ def moveGdriveFolderRemote(origin_file, target_folder):
     previous_parents = ",".join([parent["id"] for parent in origin_file.get('parents')])
     children = drive.auth.service.children().list(folderId=previous_parents).execute()
     gFileTargetDir = getFileFromEbooksFolder(None, target_folder)
-    if not gFileTargetDir or gFileTargetDir['title'] != target_folder:
+    if not gFileTargetDir:
+        gFileTargetDir = drive.CreateFile(
+            {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
+             "mimeType": "application/vnd.google-apps.folder"})
+        gFileTargetDir.Upload()
+        # Move the file to the new folder
+        drive.auth.service.files().update(fileId=origin_file['id'],
+                                          addParents=gFileTargetDir['id'],
+                                          removeParents=previous_parents,
+                                          fields='id, parents').execute()
+
+    elif gFileTargetDir['title'] != target_folder:
         # Folder is not existing, create, and move folder
         drive.auth.service.files().patch(fileId=origin_file['id'],
                                          body={'title': target_folder},
                                          fields='title').execute()
-        #gFileTargetDir = drive.CreateFile(
-        #    {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
-        #     "mimeType": "application/vnd.google-apps.folder"})
-        #gFileTargetDir.Upload()
     else:
         # Move the file to the new folder
         drive.auth.service.files().update(fileId=origin_file['id'],
diff --git a/cps/helper.py b/cps/helper.py
index 6cf7a4642..af90089bd 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -360,51 +360,13 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
                                                            file_format.name + '.' + file_format.format.lower())
                         if gFile:
                             gd.moveGdriveFileRemote(gFile, all_new_name + u'.' + file_format.format.lower())
+                            gd.updateDatabaseOnEdit(gFile['id'], all_new_name + u'.' + file_format.format.lower())
                         else:
                             log.error("File {} not found on gdrive"
                                       .format(all_new_path, file_format.name + '.' + file_format.format.lower()))
                     file_format.name = all_new_name
 
 
-def clean_author_database_gdrive(renamed_author, calibrepath, local_book=None):
-    valid_filename_authors = [get_valid_filename(r) for r in renamed_author]
-    for r in renamed_author:
-        if local_book:
-            all_books = [local_book]
-        else:
-            all_books = calibre_db.session.query(db.Books) \
-                .filter(db.Books.authors.any(db.Authors.name == r)).all()
-        for book in all_books:
-            book_author_path = book.path.split('/')[0]
-            if book_author_path in valid_filename_authors or local_book:
-                new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-                all_new_authordir = get_valid_filename(new_author.name)
-                all_titledir = book.path.split('/')[1]
-                all_new_path = os.path.join(calibrepath, all_new_authordir, all_titledir)
-                all_new_name = get_valid_filename(book.title) + ' - ' + all_new_authordir
-                # change location in database to new author/title path
-                book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
-                for file_format in book.data:
-                    shutil.move(os.path.normcase(
-                        os.path.join(all_new_path, file_format.name + '.' + file_format.format.lower())),
-                        os.path.normcase(os.path.join(all_new_path, all_new_name + '.' + file_format.format.lower())))
-                    file_format.name = all_new_name
-
-
-# was muss gemacht werden:
-# Die Autorennamen müssen separiert werden und von dupletten bereinigt werden.
-# Es muss geprüft werden:
-# - ob es die alten Autoren mit dem letzten Buch verknüpft waren, dann müssen sie gelöscht werden
-# - ob es neue Autoren sind, dann müssen sie angelegt werden -> macht modify_database_object
-# - ob es bestehende Autoren sind welche umbenannt wurden -> Groß Kleinschreibung, dann muss:
-# für jedes Buch und jeder Autor welcher umbenannt wurde:
-#   - Autorensortierung angepasst werden
-#   - Pfad im Buch angepasst werden
-#   - Dateiname in Datatabelle angepasst werden, sowie die Dateien umbenannt werden
-#   - Dateipfade Autor umbenannt werden
-# die letzten Punkte treffen auch zu wenn es sich um einen normalen Autoränderungsvorgang handelt kann man also generell
-# behandeln
-
 # 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, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
@@ -486,7 +448,6 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     error = False
     book = calibre_db.get_book(book_id)
-    path = book.path
 
     authordir = book.path.split('/')[0]
     if first_author:
@@ -507,76 +468,32 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     titledir = book.path.split('/')[1]
     new_titledir = get_valid_filename(book.title) + u" (" + str(book_id) + u")"
 
-    '''if titledir != new_titledir:
+    if titledir != new_titledir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
         if gFile:
             gFile['title'] = new_titledir
             gFile.Upload()
             book.path = book.path.split('/')[0] + u'/' + new_titledir
-            path = book.path
             gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
         else:
             error = _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
 
-    if authordir != new_authordir:
+    if authordir != new_authordir and authordir not in renamed_author:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
         if gFile:
             gd.moveGdriveFolderRemote(gFile, new_authordir)
             book.path = new_authordir + u'/' + book.path.split('/')[1]
-            path = book.path
             gd.updateDatabaseOnEdit(gFile['id'], book.path)
         else:
-            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found'''
+            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
 
-    if authordir != new_authordir or titledir != new_titledir:
-        new_path = os.path.join(new_authordir, new_titledir)
-        new_name = get_valid_filename(book.title) + ' - ' + get_valid_filename(new_authordir)
-        gFile = gd.getFileFromEbooksFolder(new_authordir, new_titledir)
-        if not gFile:
-            # move original path to new path
-            log.debug("Moving title: %s to %s", path, new_path)
-            gFile = gd.getFileFromEbooksFolder(authordir, titledir)
-            # move author and title  -> currently only title??
-            gd.moveGdriveFileRemote(gFile, new_titledir)
-            # 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)
-            # gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
-            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)))
     # change location in database to new author/title path
     book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
 
-    #for file_format in book.data:
-    #        gFile = gd.getFileFromEbooksFolder(path, file_format.name + '.' + file_format.format.lower())
-    #        if not gFile:
-    #           error = _(u'File %(file)s not found on Google Drive', file=file_format.name)  # file not found
-    #            break
-    #        gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
-    #        file_format.name = new_name
-
-    # Todo: Rename all authors on gdrive
     # Rename all files from old names to new names
-    clean_author_database(renamed_author, "")
+    clean_author_database(renamed_author, "", gdrive=True)
     if first_author not in renamed_author:
-        clean_author_database([first_author], "", book)
-    #if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
-    #        shutil.rmtree(os.path.dirname(path))
-
-    '''# Rename all files from old names to new names
-    try:
-        clean_author_database(renamed_author, calibrepath)
-        if first_author not in renamed_author:
-            clean_author_database([first_author], calibrepath, localbook)
-        if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
-            shutil.rmtree(os.path.dirname(path))
-    except (OSError, FileNotFoundError) as ex:
-        log.error("Error in rename file in path %s", ex)
-        log.debug(ex, exc_info=True)
-        return _("Error in rename file in path: %(error)s", error=str(ex))'''
+        clean_author_database([first_author], "", book, gdrive=True)
 
     return error
 

From baf32f9045c7dd23c166e270e35fdac8c92d5562 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 26 Jan 2022 07:31:01 +0100
Subject: [PATCH 134/412] Update Teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 4028 +++++++----------------
 1 file changed, 1124 insertions(+), 2904 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index b5b6f04ce..d35870888 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-04 22:17:44</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-25 21:16:05</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-12-05 01:46:42</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-26 01:13:49</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 48 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 17 min</p>
         </div>
       </div>
       </div>
@@ -411,15 +411,15 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEbookConvertCalibre</td>
-        <td class="text-center">14</td>
-        <td class="text-center">12</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
+        <td class="text-center">15</td>
+        <td class="text-center">7</td>
+        <td class="text-center">7</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 14)">Detail</a>
+            <a onclick="showClassDetail('c6', 15)">Detail</a>
         </td>
     </tr>
 
@@ -427,7 +427,7 @@
     
         <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
+                <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -436,23 +436,74 @@
     
         <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id="et6.3" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_email</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:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 201, in test_convert_email
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft6.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 245, in test_convert_failed_and_email
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Finished&#39; != &#39;Failed&#39;
+- Finished
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
@@ -461,7 +512,7 @@
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
@@ -470,27 +521,40 @@
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id="ft6.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id="ft6.8" class="none bg-danger">
             <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -505,7 +569,7 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 506, in test_convert_xss
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 110, in test_convert_wrong_excecutable
     self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
 AssertionError: False is not true</pre>
                     </div>
@@ -517,25 +581,98 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id="ft6.9" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 519, in test_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft6.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 441, in test_email_failed
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.10' class='hiddenRow bg-success'>
+        <tr id="ft6.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 412, in test_email_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id='pt6.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
             </td>
@@ -544,7 +681,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.12' class='hiddenRow bg-success'>
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
@@ -553,7 +690,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
@@ -562,26 +699,28 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft6.14" class="none bg-danger">
+        <tr id="ft6.15" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.14')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.15')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft6.14" class="popup_window test_output" style="display:block;">
+                <div id="div_ft6.15" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.14').style.display='none'"><span
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 538, in test_user_convert_xss
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 553, in test_user_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -592,11 +731,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">1</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -606,20 +745,62 @@ AssertionError: False is not true</pre>
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id="ft7.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 194, in test_convert_email
+    self.assertTrue(&#34;Convert&#34; in ret[-2][&#39;task&#39;])
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id="ft7.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 234, in test_convert_failed_and_email
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Finished&#39; != &#39;Failed&#39;
+- Finished
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -633,29 +814,93 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id="ft7.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 158, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id="ft7.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 421, in test_email_failed
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id="ft7.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 389, in test_email_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -747,48 +992,37 @@ AssertionError: False is not true</pre>
 
     <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">16</td>
-        <td class="text-center">6</td>
-        <td class="text-center">2</td>
-        <td class="text-center">6</td>
+        <td class="text-center">19</td>
+        <td class="text-center">13</td>
+        <td class="text-center">0</td>
+        <td class="text-center">4</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 16)">Detail</a>
+            <a onclick="showClassDetail('c10', 19)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft10.1" class="none bg-danger">
+        <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 136, in test_change_upload_formats
-    self.assertTrue(self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestEditAdditionalBooks - test_cbz_comicinfo</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id='pt10.2' 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='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
@@ -797,38 +1031,9 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft10.3" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 642, in test_delete_role
-    self.assertTrue(self.delete_book_format(12, &#39;FB2&#39;))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
         <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -837,7 +1042,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -846,7 +1051,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -854,6 +1059,24 @@ AssertionError: False is not true</pre>
     
     
         <tr id='pt10.7' 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='pt10.8' 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='pt10.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
@@ -862,159 +1085,52 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="et10.8" class="none bg-info">
+        <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 654, in test_title_sort
-    self.verify_order(&#34;search&#34;, order=order)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1324, in verify_order
-    self.check_element_on_page((By.ID, key)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.9" class="none bg-info">
+        <tr id='pt10.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="et10.12" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.9')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.12')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et10.9" class="popup_window test_output" style="display:block;">
+                <div id="div_et10.12" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.9').style.display='none'"><span
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 510, in test_upload_edit_role
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 664, in test_upload_edit_role
+    self.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 87, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
     raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et10.10" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 55, in test_upload_metadata_cbr
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et10.11" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 92, in test_upload_metadata_cbt
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="st10.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_st10.12')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st10.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_st10.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>
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1026,7 +1142,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
         <tr id="et10.13" class="none bg-info">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -1041,15 +1157,19 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 240, in test_writeonly_path
-    self.fill_basic_config({&#39;config_rarfile_location&#39;: unrar_path()})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 148, in test_upload_metadata_cbr
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
     cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
     WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
     raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1059,27 +1179,74 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='st10.14' class='none bg-warning'>
+        <tr id="et10.14" class="none bg-info">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 185, in test_upload_metadata_cbt
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>SKIP</td>
         </tr>
     
     
     
-        <tr id='pt10.15' class='hiddenRow bg-success'>
+        <tr id="st10.15" class="none bg-warning">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
+                <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_st10.15')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st10.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_st10.15').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>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id="et10.16" class="none bg-info">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -1094,9 +1261,19 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 718, in test_xss_custom_comment_edit
-    self.assertEqual(0, len(values[&#39;cust_columns&#39;]))
-KeyError: &#39;cust_columns&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 344, in test_writeonly_path
+    self.fill_basic_config({&#39;config_rarfile_location&#39;: unrar_path(), &#34;config_unicode_filename&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1105,6 +1282,33 @@ KeyError: &#39;cust_columns&#39;</pre>
         </tr>
     
     
+    
+        <tr id='st10.17' class='none bg-warning'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
+            </td>
+            <td colspan='6' align='center'>SKIP</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="errorClass">
@@ -1138,19 +1342,21 @@ KeyError: &#39;cust_columns&#39;</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 41, in tearDownClass
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 44, in tearDownClass
     cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 444, in stop_calibre_web
-    cls.driver.find_element_by_id(&#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
     return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
     self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
     raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]</pre>
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1161,15 +1367,15 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
+        <td class="text-center">36</td>
         <td class="text-center">35</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
-        <td class="text-center">19</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('c12', 35)">Detail</a>
+            <a onclick="showClassDetail('c12', 36)">Detail</a>
         </td>
     </tr>
 
@@ -1202,292 +1408,92 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id="ft12.4" class="none bg-danger">
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft12.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft12.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 443, in test_edit_comments
-    self.assertEqual(len(self.adv_search({u&#39;comment&#39;: u&#39;mirä 人&#39;})), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.5" class="none bg-info">
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 452, in test_edit_custom_bool
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.6" class="none bg-info">
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 543, in test_edit_custom_categories
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.7" class="none bg-info">
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 526, in test_edit_custom_comment
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_5&#39;: u&#39;人1 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.8" class="none bg-info">
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 592, in test_edit_custom_date
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_2_start&#39;: u&#39;16/7/2015&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.9" class="none bg-info">
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 560, in test_edit_custom_float
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.10" class="none bg-info">
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 576, in test_edit_custom_int
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.11" class="none bg-info">
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 467, in test_edit_custom_rating
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.12" class="none bg-info">
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 493, in test_edit_custom_single_select
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.13" class="none bg-info">
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 509, in test_edit_custom_text
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1537,31 +1543,11 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id="et12.19" class="none bg-info">
+        <tr id='pt12.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 73, in test_edit_title
-    self.assertEqual(u&#39;O0ü 执&#39;, values[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1646,311 +1632,92 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id="et12.27" class="none bg-info">
+        <tr id='pt12.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.27')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.27" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.27').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 1022, in test_upload_book_cbr
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.28" class="none bg-info">
+        <tr id='pt12.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.28')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.28" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.28').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 987, in test_upload_book_cbt
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.29" class="none bg-info">
+        <tr id='pt12.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.29')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.29" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.29').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 961, in test_upload_book_cbz
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.30" class="none bg-info">
+        <tr id='pt12.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.30')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.30" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.30').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 922, in test_upload_book_epub
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.31" class="none bg-info">
+        <tr id='pt12.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.31')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.31" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.31').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 844, in test_upload_book_fb2
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.32" class="none bg-info">
+        <tr id='pt12.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.32')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.32" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 870, in test_upload_book_lit
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.33" class="none bg-info">
+        <tr id='pt12.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.33')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.33" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.33').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 896, in test_upload_book_mobi
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.34" class="none bg-info">
+        <tr id='pt12.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.34')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.34" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.34').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 818, in test_upload_book_pdf
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.35" class="none bg-info">
+        <tr id='pt12.35' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.35')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.35" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.35').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 769, in test_upload_cover_hdd
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2115,8 +1882,8 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 73, in test_bookslist_edit_title
     bl = self.get_books_list(-1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1827, in get_books_list
-    element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements_by_xpath(&#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1830, in get_books_list
+    element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements(By.XPATH, &#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
 IndexError: list index out of range</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -2144,7 +1911,7 @@ IndexError: list index out of range</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 287, in test_list_visibility
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 291, in test_list_visibility
     self.assertEqual(17, len(bl[&#39;column_elements&#39;]))
 AssertionError: 17 != 20</pre>
                     </div>
@@ -2173,7 +1940,7 @@ AssertionError: 17 != 20</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 326, in test_restricted_rights
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 330, in test_restricted_rights
     self.assertFalse(&#39;Delete&#39; in bl[&#39;table&#39;][0])
 AssertionError: True is not false</pre>
                     </div>
@@ -2215,21 +1982,65 @@ AssertionError: 9 != 10</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">20</td>
-        <td class="text-center">9</td>
-        <td class="text-center">2</td>
-        <td class="text-center">9</td>
+    <tr id="su" class="failClass">
+        <td>TestLoadMetadata</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 20)">Detail</a>
+            <a onclick="showClassDetail('c14', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id="ft14.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft14.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft14.1').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </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('c15', 20)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -2238,7 +2049,7 @@ AssertionError: 9 != 10</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -2247,7 +2058,7 @@ AssertionError: 9 != 10</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -2256,7 +2067,7 @@ AssertionError: 9 != 10</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -2265,210 +2076,70 @@ AssertionError: 9 != 10</pre>
     
     
     
-        <tr id="ft14.5" class="none bg-danger">
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 652, in test_edit_custom_bool
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.6" class="none bg-info">
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.6').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 714, in test_edit_custom_categories
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.7" class="none bg-info">
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.7').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 732, in test_edit_custom_float
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.8" class="none bg-info">
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.8').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 748, in test_edit_custom_int
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.9" class="none bg-info">
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 661, in test_edit_custom_rating
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.10" class="none bg-info">
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 681, in test_edit_custom_single_select
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.11" class="none bg-info">
+        <tr id='pt15.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 697, in test_edit_custom_text
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id='pt15.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -2477,7 +2148,7 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -2486,7 +2157,7 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -2495,7 +2166,7 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -2504,7 +2175,7 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -2513,130 +2184,62 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id="et14.17" class="none bg-info">
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 850, in test_upload_book_epub
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.18" class="none bg-info">
+        <tr id='pt15.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 815, in test_upload_book_lit
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.19" class="none bg-info">
+        <tr id='pt15.19' class='hiddenRow bg-success'>
             <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_et14.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 763, in test_upload_cover_hdd
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft14.20" class="none bg-danger">
+        <tr id='pt15.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 901, in test_watch_metadata
-    self.assertTrue(button)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestLoadMetadataScholar</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'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2650,13 +2253,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 3)">Detail</a>
+            <a onclick="showClassDetail('c17', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -2665,7 +2268,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -2674,7 +2277,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -2684,21 +2287,21 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">5</td>
+        <td class="text-center">7</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 7)">Detail</a>
+            <a onclick="showClassDetail('c18', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -2707,7 +2310,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -2716,7 +2319,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -2725,7 +2328,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2734,7 +2337,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -2743,60 +2346,20 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="et16.6" class="none bg-info">
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 147, in test_email_limit
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.7" class="none bg-info">
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 217, in test_filepicker_two_file
-    accordions[0].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2809,54 +2372,6 @@ IndexError: list index out of range</pre>
         <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', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt17.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestErrorReadColumn</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('c18', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt18.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestFilePicker</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('c19', 1)">Detail</a>
         </td>
@@ -2865,6 +2380,63 @@ IndexError: list index out of range</pre>
     
     
         <tr id='pt19.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestErrorReadColumn</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'>TestErrorReadColumn - test_invalid_custom_column</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt20.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestFilePicker</td>
+        <td class="text-center">3</td>
+        <td class="text-center">2</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('c21', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2872,6 +2444,41 @@ IndexError: list index out of range</pre>
         </tr>
     
     
+    
+        <tr id="st21.2" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st21.2')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st21.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_st21.2').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='pt21.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_two_filepickers</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="passClass">
@@ -2882,13 +2489,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c22', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2906,13 +2513,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2921,7 +2528,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2930,7 +2537,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2940,54 +2547,30 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">2</td>
-        <td class="text-center">9</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('c22', 11)">Detail</a>
+            <a onclick="showClassDetail('c24', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft22.1" class="none bg-danger">
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <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_ft22.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 584, in test_book_download
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2996,139 +2579,43 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft22.3" class="none bg-danger">
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 603, in test_kobo_sync_selected_shelfs
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.4" class="none bg-danger">
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 653, in test_kobo_upload_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.5" class="none bg-danger">
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 448, in test_shelves_add_remove_books
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.6" class="none bg-danger">
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 278, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt22.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -3137,154 +2624,58 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft22.8" class="none bg-danger">
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 515, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.9" class="none bg-danger">
+        <tr id='pt24.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 297, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.10" class="none bg-danger">
+        <tr id='pt24.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 243, in test_sync_unchanged
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.11" class="none bg-danger">
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 257, in test_sync_upload
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">1</td>
-        <td class="text-center">4</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 5)">Detail</a>
+            <a onclick="showClassDetail('c25', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -3293,134 +2684,38 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft23.2" class="none bg-danger">
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 260, in test_kobo_sync_selected_shelfs
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft23.3" class="none bg-danger">
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 164, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft23.4" class="none bg-danger">
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.4').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 237, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft23.5" class="none bg-danger">
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.5').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 193, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3434,13 +2729,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 13)">Detail</a>
+            <a onclick="showClassDetail('c26', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -3449,7 +2744,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -3458,7 +2753,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -3467,7 +2762,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -3476,7 +2771,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -3485,7 +2780,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -3494,7 +2789,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -3503,7 +2798,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -3512,7 +2807,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -3521,7 +2816,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -3530,7 +2825,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -3539,7 +2834,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.12' class='hiddenRow bg-success'>
+        <tr id='pt26.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -3548,7 +2843,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.13' class='hiddenRow bg-success'>
+        <tr id='pt26.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -3566,13 +2861,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 8)">Detail</a>
+            <a onclick="showClassDetail('c27', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -3581,7 +2876,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -3590,7 +2885,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -3599,7 +2894,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -3608,7 +2903,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -3617,7 +2912,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -3626,7 +2921,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -3635,7 +2930,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -3653,13 +2948,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 9)">Detail</a>
+            <a onclick="showClassDetail('c28', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -3668,7 +2963,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -3677,7 +2972,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -3686,7 +2981,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -3695,19 +2990,19 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="st26.5" class="none bg-warning">
+        <tr id="st28.5" 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_st26.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st28.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st26.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st28.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_st26.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st28.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3721,7 +3016,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -3730,7 +3025,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -3739,7 +3034,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -3748,7 +3043,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -3766,13 +3061,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 15)">Detail</a>
+            <a onclick="showClassDetail('c29', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -3781,7 +3076,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -3790,7 +3085,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -3799,7 +3094,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -3808,7 +3103,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -3817,7 +3112,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -3826,7 +3121,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -3835,7 +3130,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -3844,7 +3139,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -3853,7 +3148,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -3862,7 +3157,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt29.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -3871,7 +3166,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt29.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3880,7 +3175,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt29.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3889,7 +3184,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.14' class='hiddenRow bg-success'>
+        <tr id='pt29.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3898,7 +3193,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.15' class='hiddenRow bg-success'>
+        <tr id='pt29.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3916,24 +3211,24 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
+                <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestMergeBooksList - test_merge_book</div>
+                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3949,13 +3244,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3964,7 +3259,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3982,13 +3277,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 23)">Detail</a>
+            <a onclick="showClassDetail('c32', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3997,7 +3292,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -4006,7 +3301,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -4015,7 +3310,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt32.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -4024,7 +3319,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -4033,7 +3328,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt32.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -4042,7 +3337,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt32.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -4051,7 +3346,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt32.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -4060,7 +3355,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt32.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -4069,7 +3364,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt32.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -4078,7 +3373,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt32.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -4087,7 +3382,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt32.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -4096,7 +3391,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt32.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -4105,7 +3400,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt32.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -4114,7 +3409,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt32.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -4123,7 +3418,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.16' class='hiddenRow bg-success'>
+        <tr id='pt32.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -4132,19 +3427,19 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft30.17" class="none bg-danger">
+        <tr id="ft32.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft30.17')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft32.17')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft30.17" class="popup_window test_output" style="display:block;">
+                <div id="div_ft32.17" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft30.17').style.display='none'"><span
+                                onclick="document.getElementById('div_ft32.17').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4161,7 +3456,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.18' class='hiddenRow bg-success'>
+        <tr id='pt32.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -4170,7 +3465,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.19' class='hiddenRow bg-success'>
+        <tr id='pt32.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -4179,7 +3474,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.20' class='hiddenRow bg-success'>
+        <tr id='pt32.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -4188,7 +3483,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.21' class='hiddenRow bg-success'>
+        <tr id='pt32.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -4197,7 +3492,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.22' class='hiddenRow bg-success'>
+        <tr id='pt32.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -4206,7 +3501,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.23' class='hiddenRow bg-success'>
+        <tr id='pt32.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -4216,67 +3511,45 @@ AssertionError: 200 != 500</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestUploadPDF</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">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 1)">Detail</a>
+            <a onclick="showClassDetail('c33', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et31.1" class="none bg-info">
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et31.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et31.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et31.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 129, in test_upload_invalid_pdf
-    self.check_uploaded_pdf({&#39;author&#39;: &#34;Mani Mücks&#34;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 59, in check_uploaded_pdf
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
+        <td class="text-center">5</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('c32', 5)">Detail</a>
+            <a onclick="showClassDetail('c34', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -4285,7 +3558,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -4294,7 +3567,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -4303,38 +3576,16 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id="et32.4" class="none bg-info">
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et32.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et32.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et32.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 191, in sound_test
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -4352,13 +3603,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 8)">Detail</a>
+            <a onclick="showClassDetail('c35', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -4367,7 +3618,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -4376,7 +3627,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -4385,7 +3636,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -4394,7 +3645,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -4403,7 +3654,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt35.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -4412,7 +3663,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt35.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -4421,7 +3672,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt35.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -4439,13 +3690,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 3)">Detail</a>
+            <a onclick="showClassDetail('c36', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -4454,7 +3705,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -4463,7 +3714,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -4473,21 +3724,21 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestShelf</td>
-        <td class="text-center">26</td>
-        <td class="text-center">1</td>
-        <td class="text-center">10</td>
+        <td class="text-center">15</td>
         <td class="text-center">14</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('c35', 26)">Detail</a>
+            <a onclick="showClassDetail('c37', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -4496,657 +3747,118 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id="ft35.2" class="none bg-danger">
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 466, in test_adv_search_shelf
-    self.assertEqual(len(self.adv_search({u&#39;include_shelf&#39;: u&#39;Search&#39;, &#39;book_title&#39;: &#39;book&#39;})), 2)
-AssertionError: 0 != 2</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.3" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_adv_search_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.4" class="none bg-danger">
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 252, in test_arrange_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.5" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_arrange_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et35.6" class="none bg-info">
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 146, in test_create_public_shelf
-    self.create_user(&#39;invalid&#39;, {&#39;edit_shelf_role&#39;: 0, &#39;password&#39;: &#39;1234&#39;, &#39;email&#39;: &#39;bac@b.com&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 976, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_shelf_role&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.7" class="none bg-info">
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_create_public_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft35.8" class="none bg-danger">
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 237, in test_delete_book_of_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.9" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.10" class="none bg-danger">
+        <tr id='pt37.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 57, in test_private_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.11" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_private_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.12" class="none bg-danger">
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.12')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 295, in test_public_private_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.13" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_public_private_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.14" class="none bg-danger">
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.14')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 95, in test_public_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.15" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_public_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.16" class="none bg-danger">
+        <tr id='pt37.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.16')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 168, in test_rename_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.17" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_rename_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.18" class="none bg-danger">
+        <tr id='pt37.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 334, in test_shelf_action_non_shelf_edit_role
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.19" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et35.20" class="none bg-info">
+        <tr id='pt37.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 391, in test_shelf_anonymous
-    self.fill_basic_config({&#39;config_anonbrowse&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.21" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_shelf_anonymous</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.21')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.21" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.21').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="st35.22" class="none bg-warning">
+        <tr id="st37.13" 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_st35.22')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.13')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st35.22" class="popup_window test_output" style="display:none;">
+                <div id="div_st37.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_st35.22').style.display='none'"><span
+                                onclick="document.getElementById('div_st37.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -5160,126 +3872,20 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="ft35.23" class="none bg-danger">
+        <tr id='pt37.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.23')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.23" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.23').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 328, in test_shelf_long_name
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.24" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_shelf_long_name</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.24')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.24" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.24').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.25" class="none bg-danger">
+        <tr id='pt37.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.25')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.25" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.25').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 479, in test_xss_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et35.26" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_xss_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.26')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.26" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.26').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -5293,13 +3899,13 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 9)">Detail</a>
+            <a onclick="showClassDetail('c38', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -5308,7 +3914,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -5317,7 +3923,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -5326,7 +3932,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -5335,7 +3941,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -5344,7 +3950,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -5353,19 +3959,19 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="st36.7" class="none bg-warning">
+        <tr id="st38.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_st36.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st38.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st38.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_st36.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st38.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -5379,7 +3985,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -5388,7 +3994,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.9' class='hiddenRow bg-success'>
+        <tr id='pt38.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -5398,84 +4004,34 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">2</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 2)">Detail</a>
+            <a onclick="showClassDetail('c39', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et37.1" class="none bg-info">
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 82, in test_upload_epub_duplicate
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et37.2" class="none bg-info">
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 110, in test_upload_epub_lang
-    self.change_visibility_me({&#39;locale&#39;: &#34;Italiano&#34;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 887, in change_visibility_me
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;locale&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -5489,13 +4045,13 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 18)">Detail</a>
+            <a onclick="showClassDetail('c40', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -5504,7 +4060,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -5513,7 +4069,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -5522,7 +4078,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -5531,7 +4087,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -5540,7 +4096,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -5549,7 +4105,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -5558,7 +4114,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -5567,7 +4123,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -5576,7 +4132,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -5585,7 +4141,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -5594,7 +4150,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -5603,7 +4159,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -5612,7 +4168,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.14' class='hiddenRow bg-success'>
+        <tr id='pt40.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -5621,7 +4177,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -5630,7 +4186,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -5639,7 +4195,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.17' class='hiddenRow bg-success'>
+        <tr id='pt40.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -5648,7 +4204,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.18' class='hiddenRow bg-success'>
+        <tr id='pt40.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -5666,13 +4222,13 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 1)">Detail</a>
+            <a onclick="showClassDetail('c41', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -5690,13 +4246,13 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 21)">Detail</a>
+            <a onclick="showClassDetail('c42', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -5705,7 +4261,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -5714,7 +4270,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -5723,7 +4279,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -5732,7 +4288,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -5741,7 +4297,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -5750,7 +4306,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -5759,7 +4315,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -5768,7 +4324,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -5777,7 +4333,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -5786,7 +4342,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -5795,7 +4351,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -5804,7 +4360,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -5813,7 +4369,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -5822,7 +4378,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -5831,7 +4387,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -5840,7 +4396,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -5849,7 +4405,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -5858,7 +4414,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.19' class='hiddenRow bg-success'>
+        <tr id='pt42.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -5867,7 +4423,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.20' class='hiddenRow bg-success'>
+        <tr id='pt42.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -5876,7 +4432,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.21' class='hiddenRow bg-success'>
+        <tr id='pt42.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -5886,21 +4442,21 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">34</td>
-        <td class="text-center">20</td>
-        <td class="text-center">4</td>
-        <td class="text-center">10</td>
+        <td class="text-center">34</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('c41', 34)">Detail</a>
+            <a onclick="showClassDetail('c43', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -5909,7 +4465,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -5918,7 +4474,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -5927,7 +4483,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -5936,7 +4492,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -5945,7 +4501,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -5954,7 +4510,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -5963,7 +4519,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -5972,7 +4528,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -5981,7 +4537,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -5990,7 +4546,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -5999,7 +4555,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -6008,7 +4564,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -6017,7 +4573,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -6026,7 +4582,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -6035,7 +4591,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -6044,123 +4600,43 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id="ft41.17" class="none bg-danger">
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.17')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 755, in test_allow_columns
-    self.assertEqual(len(self.adv_search({&#39;book_title&#39;: &#39;Buchtitel&#39;})), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.18" class="none bg-danger">
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 586, in test_allow_tags
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.19" class="none bg-danger">
+        <tr id='pt43.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.19')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 943, in test_archive_books
-    self.assertIsNotNone(details[&#39;archived&#39;])
-AssertionError: unexpectedly None</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.20" class="none bg-info">
+        <tr id='pt43.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 911, in test_authors_max_settings
-    self.assertEqual(len(list_element[1][10][&#39;author&#39;]), 4)
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.21' class='hiddenRow bg-success'>
+        <tr id='pt43.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -6169,7 +4645,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt41.22' class='hiddenRow bg-success'>
+        <tr id='pt43.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -6178,94 +4654,34 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="et41.23" class="none bg-info">
+        <tr id='pt43.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.23')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.23" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.23').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 852, in test_hide_custom_column
-    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.24" class="none bg-info">
+        <tr id='pt43.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.24')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.24" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.24').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 786, in test_link_column_to_read_status
-    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.25" class="none bg-info">
+        <tr id='pt43.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.25')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.25" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.25').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 89, in test_random_books_available
-    list_element[0].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.26' class='hiddenRow bg-success'>
+        <tr id='pt43.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -6274,94 +4690,34 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="ft41.27" class="none bg-danger">
+        <tr id='pt43.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.27')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.27" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.27').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 669, in test_restrict_columns
-    self.assertEqual(len(restricts), 0)
-AssertionError: 1 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.28" class="none bg-info">
+        <tr id='pt43.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.28')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.28" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.28').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 514, in test_restrict_tags
-    self.assertEqual(len(elements[&#39;include_tags&#39;]), 1)
-TypeError: &#39;bool&#39; object is not subscriptable</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.29" class="none bg-info">
+        <tr id='pt43.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.29')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.29" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.29').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 991, in test_save_views_recent
-    self.check_element_on_page((By.ID, &#34;desc&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.30' class='hiddenRow bg-success'>
+        <tr id='pt43.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -6370,156 +4726,38 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id="et41.31" class="none bg-info">
+        <tr id='pt43.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.31')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.31" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.31').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 474, in test_search_order
-    self.search(&#39;book&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1991, in search
-    field.send_keys(term)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 477, in send_keys
-    self._execute(Command.SEND_KEYS_TO_ELEMENT,
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;query&#34; class=&#34;form-control&#34; name=&#34;query&#34; type=&#34;text&#34;&gt; is not reachable by keyboard</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.32" class="none bg-info">
+        <tr id='pt43.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.32')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.32" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 469, in test_search_string
-    self.search(&#39;Hallo&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1991, in search
-    field.send_keys(term)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 477, in send_keys
-    self._execute(Command.SEND_KEYS_TO_ELEMENT,
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;query&#34; class=&#34;form-control&#34; name=&#34;query&#34; type=&#34;text&#34;&gt; is not reachable by keyboard</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.33" class="none bg-info">
+        <tr id='pt43.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.33')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.33" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.33').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 101, in test_user_email_available
-    self.driver.find_element_by_id(&#34;top_user&#34;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;a id=&#34;top_user&#34; href=&#34;/me&#34;&gt; is not clickable at point (2414,25) because another element &lt;div id=&#34;restrictModal&#34; class=&#34;modal fade in&#34;&gt; obscures it</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.34" class="none bg-info">
+        <tr id='pt43.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.34')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.34" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.34').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 118, in test_user_visibility_sidebar
-    self.change_user({&#39;show_32&#39;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1032, in change_user
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;input id=&#34;show_32&#34; name=&#34;show_32&#34; type=&#34;checkbox&#34;&gt; is not clickable at point (486,766) because another element &lt;div id=&#34;restrictModal&#34; class=&#34;modal fade in&#34;&gt; obscures it</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -6533,13 +4771,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 16)">Detail</a>
+            <a onclick="showClassDetail('c44', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -6548,7 +4786,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -6557,7 +4795,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -6566,7 +4804,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -6575,7 +4813,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -6584,7 +4822,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -6593,7 +4831,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -6602,7 +4840,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -6611,7 +4849,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -6620,7 +4858,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -6629,7 +4867,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -6638,7 +4876,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -6647,7 +4885,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -6656,7 +4894,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -6665,7 +4903,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -6674,7 +4912,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -6685,11 +4923,11 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>391</td>
-        <td>281</td>
-        <td>38</td>
-        <td>66</td>
-        <td>6</td>
+        <td>390</td>
+        <td>359</td>
+        <td>17</td>
+        <td>7</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -6717,7 +4955,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-22-generic #22~20.04.1-Ubuntu SMP Tue Nov 9 15:07:24 UTC 2021 x86_64 x86_64</td>
+              <td>Linux 5.13.0-27-generic #29~20.04.1-Ubuntu SMP Fri Jan 14 00:32:30 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -6729,7 +4967,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Babel</th>
-              <td>2.9.0</td>
+              <td>2.9.1</td>
               <td>Basic</td>
             </tr>
           
@@ -6739,15 +4977,21 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>chardet</th>
+              <td>4.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Flask</th>
-              <td>1.1.2</td>
+              <td>2.0.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Flask-Babel</th>
-              <td>1.0.0</td>
+              <td>2.0.0</td>
               <td>Basic</td>
             </tr>
           
@@ -6775,12 +5019,6 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>httplib2</th>
-              <td>0.14.0</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>iso-639</th>
               <td>0.4.5</td>
@@ -6789,25 +5027,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Jinja2</th>
-              <td>2.11.2</td>
+              <td>3.0.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>lxml</th>
-              <td>4.6.3</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>natsort</th>
-              <td>7.1.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>pyasn1</th>
-              <td>0.4.8</td>
+              <td>4.7.1</td>
               <td>Basic</td>
             </tr>
           
@@ -6819,31 +5045,19 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>pytz</th>
-              <td>2019.3</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>2021.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>requests</th>
-              <td>2.22.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>six</th>
-              <td>1.14.0</td>
+              <td>2.27.1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.27</td>
+              <td>1.4.31</td>
               <td>Basic</td>
             </tr>
           
@@ -6855,7 +5069,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Unidecode</th>
-              <td>1.1.1</td>
+              <td>1.3.2</td>
               <td>Basic</td>
             </tr>
           
@@ -6867,13 +5081,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Werkzeug</th>
-              <td>1.0.1</td>
+              <td>2.0.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -6897,13 +5111,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -6927,13 +5141,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -6957,13 +5171,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
             <tr>
               <th>comicapi</th>
-              <td>2.2.0</td>
+              <td>2.2.1</td>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
@@ -6975,7 +5189,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -6999,13 +5213,19 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
+            <tr>
+              <th>scholarly</th>
+              <td>1.5.1</td>
+              <td>TestLoadMetadataScholar</td>
+            </tr>
+          
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -7029,7 +5249,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -7047,13 +5267,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.4.0</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.4.0</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -7065,7 +5285,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.4.0</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -7083,7 +5303,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>SQLAlchemy-Utils</th>
-              <td>0.37.9</td>
+              <td>0.38.2</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -7095,7 +5315,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
 </div>
 
 <script>
-    drawCircle(281, 38, 66, 6);
+    drawCircle(359, 17, 7, 7);
     showCase(5);
 </script>
 

From 477b202c38caf90712c89bc074629d8d42fcd74f Mon Sep 17 00:00:00 2001
From: quarz12 <danielmartinqwe@gmail.com>
Date: Wed, 26 Jan 2022 10:41:42 +0100
Subject: [PATCH 135/412] import try catch

---
 cps/metadata_provider/amazon.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index f77383879..5c8522c7b 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -2,7 +2,10 @@ import concurrent.futures
 import requests
 from bs4 import BeautifulSoup as BS  # requirement
 import lxml     #requirement for better speed
-import cchardet #optional for better speed
+try:
+    import cchardet #optional for better speed
+except ImportError:
+    pass
 from cps.services.Metadata import Metadata
 #from time import time
 from operator import itemgetter

From 6339d25af02818ddafa7e9be2e1e130d68bcaf71 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 26 Jan 2022 18:11:42 +0100
Subject: [PATCH 136/412] Bugfixes from testrun

---
 cps/editbooks.py                        |  3 +-
 cps/helper.py                           |  5 +-
 cps/templates/detail.html               |  2 +-
 cps/templates/feed.xml                  | 32 +++++------
 cps/ub.py                               |  2 +-
 test/Calibre-Web TestSummary_Linux.html | 70 ++++++++++++-------------
 6 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 84bd7b2b1..20184bf9e 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -809,7 +809,8 @@ def edit_book(book_id):
             if "cover_url" in to_save:
                 if to_save["cover_url"]:
                     if not current_user.role_upload():
-                        return "", (403)
+                        calibre_db.session.rollback()
+                        return "", 403
                     if to_save["cover_url"].endswith('/static/generic_cover.jpg'):
                         book.has_cover = 0
                     else:
diff --git a/cps/helper.py b/cps/helper.py
index af90089bd..2daf8494e 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -435,7 +435,7 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
         # Rename all files from old names to new names
         try:
             clean_author_database(renamed_author, calibrepath)
-            if first_author not in renamed_author:
+            if first_author and first_author not in renamed_author:
                 clean_author_database([first_author], calibrepath, localbook)
             if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
                 shutil.rmtree(os.path.dirname(path))
@@ -581,7 +581,8 @@ def update_dir_structure(book_id,
                         first_author=None,
                         orignal_filepath=None,
                         db_filename=None,
-                        renamed_author=False):
+                        renamed_author=None):
+    renamed_author = renamed_author or []
     if config.config_use_google_drive:
         return update_dir_structure_gdrive(book_id, first_author, renamed_author)
     else:
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index ef47bccc0..06357ce81 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -38,7 +38,7 @@
           {% endif %}
             {% if g.user.kindle_mail and entry.kindle_list %}
               {% if entry.kindle_list.__len__() == 1 %}
-                <div id="sendbtn" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=entry.kindle_list[0]['format'], convert=entry.kindle_list[0]['convert'])}}" data-text="{{_('Send to Kindle')}}" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.kindle_list[0]['text']}}</div>
+                <div id="sendbtn" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=entry.kindle_list[0]['format'], convert=entry.kindle_list[0]['convert'])}}" data-text="{{_('Send to Kindle')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.kindle_list[0]['text']}}</div>
               {% else %}
                 <div class="btn-group" role="group">
                   <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index 9073142ec..c2c6ab3c9 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -40,35 +40,35 @@
   {% if entries and entries[0] %}
   {% for entry in entries %}
   <entry>
-    <title>{{entry.title}}</title>
-    <id>urn:uuid:{{entry.uuid}}</id>
-    <updated>{{entry.atom_timestamp}}</updated>
-    {% if entry.authors.__len__() > 0 %}
+    <title>{{entry[0].title}}</title>
+    <id>urn:uuid:{{entry[0].uuid}}</id>
+    <updated>{{entry[0].atom_timestamp}}</updated>
+    {% if entry[0].authors.__len__() > 0 %}
       <author>
-        <name>{{entry.authors[0].name}}</name>
+        <name>{{entry[0].authors[0].name}}</name>
       </author>
     {% endif %}
-    {% if entry.publishers.__len__() > 0 %}
+    {% if entry[0].publishers.__len__() > 0 %}
       <publisher>
-        <name>{{entry.publishers[0].name}}</name>
+        <name>{{entry[0].publishers[0].name}}</name>
       </publisher>
     {% endif %}
-    {% for lang in entry.languages %}
+    {% for lang in entry[0].languages %}
       <dcterms:language>{{lang.lang_code}}</dcterms:language>
     {% endfor %}
-    {% for tag in entry.tags %}
+    {% for tag in entry[0].tags %}
     <category scheme="http://www.bisg.org/standards/bisac_subject/index.html"
               term="{{tag.name}}"
               label="{{tag.name}}"/>
     {% endfor %}
-    {% if entry.comments[0] %}<summary>{{entry.comments[0].text|striptags}}</summary>{% endif %}
-    {% if entry.has_cover %}
-    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image"/>
-    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image/thumbnail"/>
+    {% if entry[0].comments[0] %}<summary>{{entry[0].comments[0].text|striptags}}</summary>{% endif %}
+    {% if entry[0].has_cover %}
+    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry[0].id)}}" rel="http://opds-spec.org/image"/>
+    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry[0].id)}}" rel="http://opds-spec.org/image/thumbnail"/>
     {% endif %}
-    {% for format in entry.data %}
-    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=format.format|lower)}}"
-          length="{{format.uncompressed_size}}" mtime="{{entry.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
+    {% for format in entry[0].data %}
+    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry[0].id, book_format=format.format|lower)}}"
+          length="{{format.uncompressed_size}}" mtime="{{entry[0].atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
     {% endfor %}
   </entry>
   {% endfor %}
diff --git a/cps/ub.py b/cps/ub.py
index c1d6d24ce..e52ce2013 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -90,7 +90,7 @@ def delete_user_session(user_id, session_key):
         session.query(User_Sessions).filter(User_Sessions.user_id==user_id,
                                             User_Sessions.session_key==session_key).delete()
         session.commit()
-    except (exc.OperationalError, exc.InvalidRequestError):
+    except (exc.OperationalError, exc.InvalidRequestError) as e:
         session.rollback()
         log.exception(e)
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index d35870888..c153a3724 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-25 21:16:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-26 07:52:00</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>2022-01-26 01:13:49</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-26 11:49: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>3h 17 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 16 min</p>
         </div>
       </div>
       </div>
@@ -1982,13 +1982,13 @@ AssertionError: 9 != 10</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c14', 1)">Detail</a>
         </td>
@@ -1996,42 +1996,22 @@ AssertionError: 9 != 10</pre>
 
     
     
-        <tr id="ft14.1" class="none bg-danger">
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">19</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('c15', 20)">Detail</a>
@@ -2049,11 +2029,31 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id="et15.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et15.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et15.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 300, in test_edit_author
+    self.assertEqual(u&#39;O0ü 执&#39;, values[&#39;author&#39;][0])
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4925,8 +4925,8 @@ AssertionError: 200 != 500</pre>
         <td>Total</td>
         <td>390</td>
         <td>359</td>
-        <td>17</td>
-        <td>7</td>
+        <td>16</td>
+        <td>8</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5315,7 +5315,7 @@ AssertionError: 200 != 500</pre>
 </div>
 
 <script>
-    drawCircle(359, 17, 7, 7);
+    drawCircle(359, 16, 8, 7);
     showCase(5);
 </script>
 

From 341632376768b10664b78f367c2d948861181e02 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Wed, 26 Jan 2022 23:56:10 -0600
Subject: [PATCH 137/412] Removed title tags from cover images

---
 cps/templates/author.html   | 2 +-
 cps/templates/discover.html | 2 +-
 cps/templates/grid.html     | 2 +-
 cps/templates/image.html    | 7 ++-----
 cps/templates/index.html    | 4 ++--
 cps/templates/search.html   | 2 +-
 cps/templates/shelf.html    | 2 +-
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cps/templates/author.html b/cps/templates/author.html
index 449efa533..9f124876f 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -37,7 +37,7 @@
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
             <span class="img" title="{{entry.title}}">
-              {{ image.book_cover(entry, title=author.name|safe) }}
+              {{ image.book_cover(entry, alt=author.name|safe) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index a39ba6745..4842a7ea9 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -10,7 +10,7 @@
         {% 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">
             <span class="img" title="{{entry.title}}">
-              {{ image.book_cover(entry, alt=entry.title) }}
+              {{ image.book_cover(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 7d3add5e2..638b72459 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -28,7 +28,7 @@
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].series[0].id )}}">
                           <span class="img" title="{{entry[0].series[0].name}}">
-                              {{ image.series(entry[0].series[0], title=entry[0].series[0].name|shortentitle) }}
+                              {{ image.series(entry[0].series[0], alt=entry[0].series[0].name|shortentitle) }}
                               <span class="badge">{{entry.count}}</span>
                             </span>
                       </a>
diff --git a/cps/templates/image.html b/cps/templates/image.html
index 728384a10..0bdba9a51 100644
--- a/cps/templates/image.html
+++ b/cps/templates/image.html
@@ -1,23 +1,20 @@
-{% macro book_cover(book, title=None, alt=None) -%}
+{% macro book_cover(book, alt=None) -%}
     {%- set image_title = book.title if book.title else book.name -%}
-    {%- set image_title = title if title else image_title -%}
     {%- set image_alt = alt if alt else image_title -%}
     {% set srcset = book|get_cover_srcset %}
     <img
         srcset="{{ srcset }}"
         src="{{ url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified) }}"
-        title="{{ image_title }}"
         alt="{{ image_alt }}"
     />
 {%- endmacro %}
 
-{% macro series(series, title=None, alt=None) -%}
+{% macro series(series, alt=None) -%}
     {%- set image_alt = alt if alt else image_title -%}
     {% set srcset = series|get_series_srcset %}
     <img
         srcset="{{ srcset }}"
         src="{{ url_for('web.get_series_cover', series_id=series.id, resolution='og', c='day'|cache_timestamp) }}"
-        title="{{ title }}"
         alt="{{ book_title }}"
     />
 {%- endmacro %}
diff --git a/cps/templates/index.html b/cps/templates/index.html
index ef872ccc5..ff7ff115f 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -10,7 +10,7 @@
       <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" title="{{ entry.title }}">
-                {{ image.book_cover(entry, alt=entry.title) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
@@ -92,7 +92,7 @@
       <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" title="{{ entry.title }}">
-              {{ image.book_cover(entry, alt=entry.title) }}
+              {{ image.book_cover(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 1bc741ca7..129663487 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -46,7 +46,7 @@
         {% if entry.Books.has_cover is defined %}
            <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img" title="{{entry.Books.title}}" >
-                {{ image.book_cover(entry.Books, alt=entry.Books.title) }}
+                {{ image.book_cover(entry.Books) }}
                 {% if entry.Books.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 13a119c07..693f6b4ac 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -35,7 +35,7 @@
       <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" title="{{entry.title}}" >
-                {{ image.book_cover(entry, alt=entry.title) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>

From 50bb74d748f89668fe4abaac81b0c36ae77e66df Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 27 Jan 2022 00:35:45 -0600
Subject: [PATCH 138/412] Add CSRF support for schedule task settings, fixed
 details page not loading

---
 cps/schedule.py                      | 1 -
 cps/services/background_scheduler.py | 1 -
 cps/templates/detail.html            | 2 +-
 cps/templates/schedule_edit.html     | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 2bb7878f7..39c9bc098 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -16,7 +16,6 @@
 #   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 datetime
 
 from . import config, constants
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index 971b0bf79..415b29625 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -16,7 +16,6 @@
 #   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 atexit
 
 from .. import logger
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 109b04d20..3bcf5cc6f 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -5,7 +5,7 @@
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
         <!-- Always use full-sized image for the detail page -->
-        <img id="detailcover" title="{{book.title}}" src="{{url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified)}}" />
+        <img id="detailcover" title="{{entry.title}}" src="{{url_for('web.get_cover', book_id=entry.id, resolution='og', c=entry|last_modified)}}" />
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index 71bb2d1a2..f989baf9f 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -7,6 +7,7 @@
 <div class="discover">
   <h1>{{title}}</h1>
   <form role="form" class="col-md-10 col-lg-6" method="POST" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     <div class="form-group">
       <label for="schedule_start_time">{{_('Time at which tasks start to run')}}</label>
       <select name="schedule_start_time" id="schedule_start_time" class="form-control">

From 42f8209a4ae3a8e3b94c128cfa2f7b5195cb91e2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 28 Jan 2022 20:01:33 +0100
Subject: [PATCH 139/412] Fixed access to shelfs

---
 SECURITY.md  |  2 +-
 cps/kobo.py  |  6 ++---
 cps/shelf.py | 72 +++++++++++++++++++++++++++-------------------------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 3e5a965dd..262e66e2a 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -31,7 +31,7 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                    ||
 | V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
 | V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
-| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @ibarrionuevo         ||
+| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             ||
 
 
 ## Staement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/kobo.py b/cps/kobo.py
index 67304c93e..c5e7d1fec 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -552,11 +552,9 @@ def HandleTagUpdate(tag_id):
         else:
             abort(404, description="Collection isn't known to CalibreWeb")
 
-    if not shelf_lib.check_shelf_edit_permissions(shelf):
-        abort(401, description="User is unauthaurized to edit shelf.")
-
     if request.method == "DELETE":
-        shelf_lib.delete_shelf_helper(shelf)
+        if not shelf_lib.delete_shelf_helper(shelf):
+            abort(401, description="Error deleting Shelf")
     else:
         name = None
         try:
diff --git a/cps/shelf.py b/cps/shelf.py
index ad6a2665a..f57d0ad41 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -23,7 +23,7 @@
 import sys
 from datetime import datetime
 
-from flask import Blueprint, flash, redirect, request, url_for
+from flask import Blueprint, flash, redirect, request, url_for, abort
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -39,10 +39,10 @@ log = logger.create()
 
 def check_shelf_edit_permissions(cur_shelf):
     if not cur_shelf.is_public and not cur_shelf.user_id == int(current_user.id):
-        log.error("User %s not allowed to edit shelf %s", current_user, cur_shelf)
+        log.error("User {} not allowed to edit shelf: {}".format(current_user.id, cur_shelf.name))
         return False
     if cur_shelf.is_public and not current_user.role_edit_shelfs():
-        log.info("User %s not allowed to edit public shelves", current_user)
+        log.info("User {} not allowed to edit public shelves".format(current_user.id))
         return False
     return True
 
@@ -51,7 +51,7 @@ def check_shelf_view_permissions(cur_shelf):
     if cur_shelf.is_public:
         return True
     if current_user.is_anonymous or cur_shelf.user_id != current_user.id:
-        log.error("User is unauthorized to view non-public shelf: %s", cur_shelf)
+        log.error("User is unauthorized to view non-public shelf: {}".format(cur_shelf.name))
         return False
     return True
 
@@ -117,7 +117,7 @@ def add_to_shelf(shelf_id, book_id):
 def search_to_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
     if shelf is None:
-        log.error("Invalid shelf specified: %s", shelf_id)
+        log.error("Invalid shelf specified: {}".format(shelf_id))
         flash(_(u"Invalid shelf specified"), category="error")
         return redirect(url_for('web.index'))
 
@@ -228,7 +228,6 @@ def create_shelf():
     return create_edit_shelf(shelf, page_title=_(u"Create a Shelf"), page="shelfcreate")
 
 
-
 @shelf.route("/shelf/edit/<int:shelf_id>", methods=["GET", "POST"])
 @login_required
 def edit_shelf(shelf_id):
@@ -320,12 +319,13 @@ def check_shelf_is_unique(shelf, title, is_public, shelf_id=False):
 
 def delete_shelf_helper(cur_shelf):
     if not cur_shelf or not check_shelf_edit_permissions(cur_shelf):
-        return
+        return False
     shelf_id = cur_shelf.id
     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("successfully deleted Shelf {}".format(cur_shelf.name))
+    return True
 
 
 @shelf.route("/shelf/delete/<int:shelf_id>", methods=["POST"])
@@ -333,8 +333,10 @@ def delete_shelf_helper(cur_shelf):
 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)
-        flash(_("Shelf successfully deleted"), category="success")
+        if not delete_shelf_helper(cur_shelf):
+            flash(_("Error deleting Shelf"), category="error")
+        else:
+            flash(_("Shelf successfully deleted"), category="success")
     except InvalidRequestError:
         ub.session.rollback()
         log.error("Settings DB is not Writeable")
@@ -359,32 +361,35 @@ def show_shelf(shelf_id, sort_param, page):
 @shelf.route("/shelf/order/<int:shelf_id>", methods=["GET", "POST"])
 @login_required
 def order_shelf(shelf_id):
-    if request.method == "POST":
-        to_save = request.form.to_dict()
-        books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).order_by(
-            ub.BookShelf.order.asc()).all()
-        counter = 0
-        for book in books_in_shelf:
-            setattr(book, 'order', to_save[str(book.book_id)])
-            counter += 1
-            # if order diffrent from before -> shelf.last_modified = datetime.utcnow()
-        try:
-            ub.session.commit()
-        except (OperationalError, InvalidRequestError):
-            ub.session.rollback()
-            log.error("Settings DB is not Writeable")
-            flash(_("Settings DB is not Writeable"), category="error")
-
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
-    result = list()
     if shelf and check_shelf_view_permissions(shelf):
-        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")
+        if request.method == "POST":
+            to_save = request.form.to_dict()
+            books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).order_by(
+                ub.BookShelf.order.asc()).all()
+            counter = 0
+            for book in books_in_shelf:
+                setattr(book, 'order', to_save[str(book.book_id)])
+                counter += 1
+                # if order diffrent from before -> shelf.last_modified = datetime.utcnow()
+            try:
+                ub.session.commit()
+            except (OperationalError, InvalidRequestError):
+                ub.session.rollback()
+                log.error("Settings DB is not Writeable")
+                flash(_("Settings DB is not Writeable"), category="error")
+
+        result = list()
+        if shelf:
+            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")
+    else:
+        abort(404)
 
 
 def change_shelf_order(shelf_id, order):
@@ -404,7 +409,6 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
 
     # 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':

From 62ff6f7e8ad86e31e77f00e7f4ac0523b0b71ce5 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Fri, 28 Jan 2022 23:48:44 -0600
Subject: [PATCH 140/412] Fixed tasks not running if scheduled time starts and
 ends on different days.

---
 cps/schedule.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 39c9bc098..5b97cecb3 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -66,8 +66,7 @@ def register_scheduled_tasks():
             scheduler.schedule(func=end_scheduled_tasks, trigger='cron', hour=end)
 
         # Kick-off tasks, if they should currently be running
-        now = datetime.datetime.now().hour
-        if start <= now < end:
+        if should_task_be_running(start, end):
             scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
 
 
@@ -77,9 +76,13 @@ def register_startup_tasks():
     if scheduler:
         start = config.schedule_start_time
         end = config.schedule_end_time
-        now = datetime.datetime.now().hour
 
         # Run scheduled tasks immediately for development and testing
         # Ignore tasks that should currently be running, as these will be added when registering scheduled tasks
-        if constants.APP_MODE in ['development', 'test'] and not (start <= now < end):
+        if constants.APP_MODE in ['development', 'test'] and not should_task_be_running(start, end):
             scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
+
+
+def should_task_be_running(start, end):
+    now = datetime.datetime.now().hour
+    return (start < end and start <= now < end) or (end < start <= now or now < end)

From 39ac37861fb377dea7962e77bc5043278b2b3d4c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 29 Jan 2022 10:44:33 +0100
Subject: [PATCH 141/412] Added option to enable reconnect Added option to
 perform dry run of updater Added possibility to exclude files from updater

---
 cps/__init__.py |  5 +++++
 cps/admin.py    | 14 +++++++++++-
 cps/cli.py      | 11 +++++++--
 cps/updater.py  | 60 ++++++++++++++++++++++++++++++++-----------------
 cps/web.py      |  7 ------
 exclude.txt     |  0
 6 files changed, 67 insertions(+), 30 deletions(-)
 create mode 100644 exclude.txt

diff --git a/cps/__init__.py b/cps/__init__.py
index 34ccf4383..2bfee12e4 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -186,4 +186,9 @@ def get_timezone():
 
 from .updater import Updater
 updater_thread = Updater()
+
+# Perform dry run of updater and exit afterwards
+if cli.dry_run:
+    updater_thread.dry_run()
+    sys.exit(0)
 updater_thread.start()
diff --git a/cps/admin.py b/cps/admin.py
index c1931ea47..814a455d1 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -39,7 +39,7 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
-from . import constants, logger, helper, services
+from . import constants, logger, helper, services, cli
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, kobo_sync_status
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username
@@ -158,6 +158,18 @@ def shutdown():
     return json.dumps(showtext), 400
 
 
+# method is available without login and not protected by CSRF to make it easy reachable, is per default switched of
+# needed for docker applications, as changes on metadata.db from host are not visible to application
+@admi.route("/reconnect", methods=['GET'])
+def reconnect():
+    if cli.args.r:
+        calibre_db.reconnect_db(config, ub.app_DB_path)
+        return json.dumps({})
+    else:
+        log.debug("'/reconnect' was accessed but is not enabled")
+        abort(404)
+
+
 @admi.route("/admin/view")
 @login_required
 @admin_required
diff --git a/cps/cli.py b/cps/cli.py
index 31ea84176..a63d7282b 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -40,12 +40,15 @@ parser.add_argument('-c', metavar='path',
                     help='path and name to SSL certfile, e.g. /opt/test.cert, works only in combination with keyfile')
 parser.add_argument('-k', metavar='path',
                     help='path and name to SSL keyfile, e.g. /opt/test.key, works only in combination with certfile')
-parser.add_argument('-v', '--version', action='version', help='Shows version number and exits Calibre-web',
+parser.add_argument('-v', '--version', action='version', help='Shows version number and exits Calibre-Web',
                     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('-s', metavar='user:pass', help='Sets specific username to new password and exits Calibre-Web')
 parser.add_argument('-f', action='store_true', help='Flag is depreciated and will be removed in next version')
 parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
+parser.add_argument('-d', action='store_true', help='Dry run of updater to check file permissions in advance '
+                                                    'and exits Calibre-Web')
+parser.add_argument('-r', action='store_true', help='Enable public database reconnect route under /reconnect')
 args = parser.parse_args()
 
 settingspath = args.p or os.path.join(_CONFIG_DIR, "app.db")
@@ -78,6 +81,9 @@ if (args.k and not args.c) or (not args.k and args.c):
 if args.k == "":
     keyfilepath = ""
 
+
+# dry run updater
+dry_run = args.d or None
 # load covers from localhost
 allow_localhost = args.l or None
 # handle and check ip address argument
@@ -106,3 +112,4 @@ if user_credentials and ":" not in user_credentials:
 
 if args.f:
     print("Warning: -f flag is depreciated and will be removed in next version")
+
diff --git a/cps/updater.py b/cps/updater.py
index 9090263fb..1e11ff78b 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -53,12 +53,10 @@ class Updater(threading.Thread):
     def __init__(self):
         threading.Thread.__init__(self)
         self.paused = False
-        # self.pause_cond = threading.Condition(threading.Lock())
         self.can_run = threading.Event()
         self.pause()
         self.status = -1
         self.updateIndex = None
-        # self.run()
 
     def get_current_version_info(self):
         if config.config_updatechannel == constants.UPDATE_STABLE:
@@ -85,15 +83,15 @@ class Updater(threading.Thread):
             log.debug(u'Extracting zipfile')
             tmp_dir = gettempdir()
             z.extractall(tmp_dir)
-            foldername = os.path.join(tmp_dir, z.namelist()[0])[:-1]
-            if not os.path.isdir(foldername):
+            folder_name = os.path.join(tmp_dir, z.namelist()[0])[:-1]
+            if not os.path.isdir(folder_name):
                 self.status = 11
                 log.info(u'Extracted contents of zipfile not found in temp folder')
                 self.pause()
                 return False
             self.status = 4
             log.debug(u'Replacing files')
-            if self.update_source(foldername, constants.BASE_DIR):
+            if self.update_source(folder_name, constants.BASE_DIR):
                 self.status = 6
                 log.debug(u'Preparing restart of server')
                 time.sleep(2)
@@ -184,7 +182,7 @@ class Updater(threading.Thread):
         return rf
 
     @classmethod
-    def check_permissions(cls, root_src_dir, root_dst_dir):
+    def check_permissions(cls, root_src_dir, root_dst_dir, logfunction):
         access = True
         remove_path = len(root_src_dir) + 1
         for src_dir, __, files in os.walk(root_src_dir):
@@ -193,7 +191,7 @@ class Updater(threading.Thread):
             if not os.path.isdir(root_dir): # root_dir.lstrip(os.sep).startswith('.') or
                 continue
             if not os.access(root_dir, os.R_OK|os.W_OK):
-                log.debug("Missing permissions for {}".format(root_dir))
+                logfunction("Missing permissions for {}".format(root_dir))
                 access = False
             for file_ in files:
                 curr_file = os.path.join(root_dir, file_)
@@ -201,7 +199,7 @@ class Updater(threading.Thread):
                 if not os.path.isfile(curr_file): # or curr_file.startswith('.'):
                     continue
                 if not os.access(curr_file, os.R_OK|os.W_OK):
-                    log.debug("Missing permissions for {}".format(curr_file))
+                    logfunction("Missing permissions for {}".format(curr_file))
                     access = False
         return access
 
@@ -258,18 +256,10 @@ class Updater(threading.Thread):
     def update_source(self, source, destination):
         # destination files
         old_list = list()
-        exclude = (
-            os.sep + 'app.db', os.sep + 'calibre-web.log1', os.sep + 'calibre-web.log2', os.sep + 'gdrive.db',
-            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', os.sep + 'cps' + os.sep + '.HOMEDIR',
-            os.sep + 'gmail.json'
-        )
-        additional_path = self.is_venv()
+        exclude = self._add_excluded_files(log.info)
+        additional_path =self.is_venv()
         if additional_path:
-            exclude = exclude + (additional_path,)
-
+            exclude.append(additional_path)
         # check if we are in a package, rename cps.py to __init__.py
         if constants.HOME_CONFIG:
             shutil.move(os.path.join(source, 'cps.py'), os.path.join(source, '__init__.py'))
@@ -293,7 +283,7 @@ class Updater(threading.Thread):
 
         remove_items = self.reduce_dirs(rf, new_list)
 
-        if self.check_permissions(source, destination):
+        if self.check_permissions(source, destination, log.debug):
             self.moveallfiles(source, destination)
 
             for item in remove_items:
@@ -332,6 +322,12 @@ class Updater(threading.Thread):
         log.debug("Stable version: {}".format(constants.STABLE_VERSION))
         return constants.STABLE_VERSION  # Current version
 
+    @classmethod
+    def dry_run(cls):
+        cls._add_excluded_files(print)
+        cls.check_permissions(constants.BASE_DIR, constants.BASE_DIR, print)
+        print("\n*** Finished ***")
+
     @staticmethod
     def _populate_parent_commits(update_data, status, locale, tz, parents):
         try:
@@ -391,6 +387,30 @@ class Updater(threading.Thread):
             status['message'] = _(u'General error')
         return status, update_data
 
+    @staticmethod
+    def _add_excluded_files(logfunction):
+        excluded_files = [
+            os.sep + 'app.db', os.sep + 'calibre-web.log1', os.sep + 'calibre-web.log2', os.sep + 'gdrive.db',
+            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', os.sep + 'cps' + os.sep + '.HOMEDIR',
+            os.sep + 'gmail.json', os.sep + 'exclude.txt'
+        ]
+        try:
+            with open(os.path.join(constants.BASE_DIR, "exclude.txt"), "r") as f:
+                lines = f.readlines()
+            for line in lines:
+                proccessed_line = line.strip("\n\r ").strip("\"'").lstrip("\\/ ").\
+                    replace("\\", os.sep).replace("/", os.sep)
+                if os.path.exists(os.path.join(constants.BASE_DIR, proccessed_line)):
+                    excluded_files.append(os.sep + proccessed_line)
+                else:
+                    logfunction("File list for updater: {} not found".format(line))
+        except (PermissionError, FileNotFoundError):
+            logfunction("Excluded file list for updater not found, or not accessible")
+        return excluded_files
+
     def _nightly_available_updates(self, request_method, locale):
         tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)
         if request_method == "GET":
diff --git a/cps/web.py b/cps/web.py
index 7ecb7e0e6..018c00024 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1104,13 +1104,6 @@ def get_tasks_status():
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 
 
-# method is available without login and not protected by CSRF to make it easy reachable
-@app.route("/reconnect", methods=['GET'])
-def reconnect():
-    calibre_db.reconnect_db(config, ub.app_DB_path)
-    return json.dumps({})
-
-
 # ################################### Search functions ################################################################
 
 @web.route("/search", methods=["GET"])
diff --git a/exclude.txt b/exclude.txt
new file mode 100644
index 000000000..e69de29bb

From bb7f4cf74e86b163546c7dc819b67c99b1d1e682 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 29 Jan 2022 21:02:56 +0100
Subject: [PATCH 142/412] Added optional requirements for metadata amazon
 Better logging of errors in metadata source files

---
 cps/metadata_provider/amazon.py | 2 +-
 cps/search_metadata.py          | 4 ++--
 optional-requirements.txt       | 8 +++++---
 setup.cfg                       | 5 +++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index af926dbf7..558edebce 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -19,7 +19,7 @@
 import concurrent.futures
 import requests
 from bs4 import BeautifulSoup as BS  # requirement
-# import lxml     #requirement for better speed
+
 try:
     import cchardet #optional for better speed
 except ImportError:
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index 4b57bf9eb..d72273f64 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -49,8 +49,8 @@ for f in modules:
         try:
             importlib.import_module("cps.metadata_provider." + a)
             new_list.append(a)
-        except ImportError:
-            log.error("Import error for metadata source: {}".format(a))
+        except ImportError as e:
+            log.error("Import error for metadata source: {} - {}".format(a, e))
             pass
 
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 20996c8ad..e13f32f58 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -31,9 +31,11 @@ SQLAlchemy-Utils>=0.33.5,<0.39.0
 # metadata extraction
 rarfile>=2.7
 scholarly>=1.2.0,<1.6
-markdown2==2.4.2
-html2text==2020.1.16
-python-dateutil==2.8.2
+markdown2>=2.0.0,<2.5.0
+html2text>=2020.1.16,<2022.1.1
+python-dateutil>=2.1,<2.9.0
+beautifulsoup4>=4.0.1,<4.2.0
+cchardet>=2.0.0,<2.2.0
 
 # Comics
 natsort>=2.2.0,<8.1.0
diff --git a/setup.cfg b/setup.cfg
index db2fd3e6c..e6b61e9df 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -86,6 +86,11 @@ oauth =
 metadata = 
 	rarfile>=2.7
 	scholarly>=1.2.0,<1.6
+	markdown2>=2.0.0,<2.5.0
+	html2text>=2020.1.16,<2022.1.1
+	python-dateutil>=2.1,<2.9.0
+	beautifulsoup4>=4.0.1,<4.2.0
+	cchardet>=2.0.0,<2.2.0
 comics = 
 	natsort>=2.2.0,<8.1.0
 	comicapi>=2.2.0,<2.3.0

From f6b46bb1703a21c00100767ec955f29195a2ec96 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 29 Jan 2022 21:22:39 +0100
Subject: [PATCH 143/412] Code cosmetics

---
 cps/admin.py     | 53 +++++++++++++++++++++++++++++-------------------
 cps/constants.py | 23 ++++++++++++---------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 814a455d1..0bed27f05 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -47,10 +47,7 @@ from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from . import debug_info, _BABEL_TRANSLATIONS
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
+from functools import wraps
 
 log = logger.create()
 
@@ -199,6 +196,7 @@ def admin():
                                  feature_support=feature_support, kobo_support=kobo_support,
                                  title=_(u"Admin page"), page="admin")
 
+
 @admi.route("/admin/dbconfig", methods=["GET", "POST"])
 @login_required
 @admin_required
@@ -239,6 +237,7 @@ def ajax_db_config():
 def calibreweb_alive():
     return "", 200
 
+
 @admi.route("/admin/viewconfig")
 @login_required
 @admin_required
@@ -255,6 +254,7 @@ def view_configuration():
                                  translations=translations,
                                  title=_(u"UI Configuration"), page="uiconfig")
 
+
 @admi.route("/admin/usertable")
 @login_required
 @admin_required
@@ -316,8 +316,8 @@ def list_users():
 
     if search:
         all_user = all_user.filter(or_(func.lower(ub.User.name).ilike("%" + search + "%"),
-                                    func.lower(ub.User.kindle_mail).ilike("%" + search + "%"),
-                                    func.lower(ub.User.email).ilike("%" + search + "%")))
+                                       func.lower(ub.User.kindle_mail).ilike("%" + search + "%"),
+                                       func.lower(ub.User.email).ilike("%" + search + "%")))
     if state:
         users = calibre_db.get_checkbox_sorted(all_user.all(), state, off, limit, request.args.get("order", "").lower())
     else:
@@ -337,12 +337,14 @@ def list_users():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @admi.route("/ajax/deleteuser", methods=['POST'])
 @login_required
 @admin_required
 def delete_user():
     user_ids = request.form.to_dict(flat=False)
     users = None
+    message = ""
     if "userid[]" in user_ids:
         users = ub.session.query(ub.User).filter(ub.User.id.in_(user_ids['userid[]'])).all()
     elif "userid" in user_ids:
@@ -370,6 +372,7 @@ def delete_user():
     success.extend(errors)
     return Response(json.dumps(success), mimetype='application/json')
 
+
 @admi.route("/ajax/getlocale")
 @login_required
 @admin_required
@@ -429,9 +432,9 @@ def edit_list_user(param):
                     if user.name == "Guest":
                         raise Exception(_("Guest Name can't be changed"))
                     user.name = check_username(vals['value'])
-                elif param =='email':
+                elif param == 'email':
                     user.email = check_email(vals['value'])
-                elif param =='kobo_only_shelves_sync':
+                elif param == 'kobo_only_shelves_sync':
                     user.kobo_only_shelves_sync = int(vals['value'] == 'true')
                 elif param == 'kindle_mail':
                     user.kindle_mail = valid_email(vals['value']) if vals['value'] else ""
@@ -451,8 +454,8 @@ def edit_list_user(param):
                                               ub.User.id != user.id).count():
                                     return Response(
                                         json.dumps([{'type': "danger",
-                                                     'message':_(u"No admin user remaining, can't remove admin role",
-                                                                 nick=user.name)}]), mimetype='application/json')
+                                                     'message': _(u"No admin user remaining, can't remove admin role",
+                                                                  nick=user.name)}]), mimetype='application/json')
                             user.role &= ~value
                         else:
                             raise Exception(_("Value has to be true or false"))
@@ -515,6 +518,7 @@ def update_table_settings():
         return "Invalid request", 400
     return ""
 
+
 def check_valid_read_column(column):
     if column != "0":
         if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
@@ -522,6 +526,7 @@ def check_valid_read_column(column):
             return False
     return True
 
+
 def check_valid_restricted_column(column):
     if column != "0":
         if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
@@ -560,7 +565,6 @@ def update_view_configuration():
     _config_string(to_save, "config_default_language")
     _config_string(to_save, "config_default_locale")
 
-
     config.config_default_role = constants.selected_roles(to_save)
     config.config_default_role &= ~constants.ROLE_ANONYMOUS
 
@@ -597,13 +601,15 @@ def load_dialogtexts(element_id):
     elif element_id == "restrictions":
         texts["main"] = _('Are you sure you want to change the selected restrictions for the selected user(s)?')
     elif element_id == "sidebar_view":
-        texts["main"] = _('Are you sure you want to change the selected visibility restrictions for the selected user(s)?')
+        texts["main"] = _('Are you sure you want to change the selected visibility restrictions '
+                          'for the selected user(s)?')
     elif element_id == "kobo_only_shelves_sync":
         texts["main"] = _('Are you sure you want to change shelf sync behavior for the selected user(s)?')
     elif element_id == "db_submit":
         texts["main"] = _('Are you sure you want to change Calibre library location?')
     elif element_id == "btnfullsync":
-        texts["main"] = _("Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?")
+        texts["main"] = _("Are you sure you want delete Calibre-Web's sync database "
+                          "to force a full sync with your Kobo Reader?")
     return json.dumps(texts)
 
 
@@ -774,6 +780,7 @@ def prepare_tags(user, action, tags_name, id_list):
 def add_user_0_restriction(res_type):
     return add_restriction(res_type, 0)
 
+
 @admi.route("/ajax/addrestriction/<int:res_type>/<int:user_id>", methods=['POST'])
 @login_required
 @admin_required
@@ -880,8 +887,8 @@ def delete_restriction(res_type, user_id):
 @admin_required
 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 != '']
+        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 != '']
         json_dumps = restrict + allow
@@ -918,6 +925,7 @@ def list_restriction(res_type, user_id):
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @admi.route("/ajax/fullsync", methods=["POST"])
 @login_required
 def ajax_fullsync():
@@ -1179,7 +1187,7 @@ def simulatedbchange():
 
 def _db_simulate_change():
     param = request.form.to_dict()
-    to_save = {}
+    to_save = dict()
     to_save['config_calibre_dir'] = re.sub(r'[\\/]metadata\.db$',
                                            '',
                                            param['config_calibre_dir'],
@@ -1236,6 +1244,7 @@ def _db_configuration_update_helper():
     config.save()
     return _db_configuration_result(None, gdrive_error)
 
+
 def _configuration_update_helper():
     reboot_required = False
     to_save = request.form.to_dict()
@@ -1325,6 +1334,7 @@ def _configuration_update_helper():
 
     return _configuration_result(None, reboot_required)
 
+
 def _configuration_result(error_flash=None, reboot=False):
     resp = {}
     if error_flash:
@@ -1332,9 +1342,9 @@ def _configuration_result(error_flash=None, reboot=False):
         config.load()
         resp['result'] = [{'type': "danger", 'message': error_flash}]
     else:
-        resp['result'] = [{'type': "success", 'message':_(u"Calibre-Web configuration updated")}]
+        resp['result'] = [{'type': "success", 'message': _(u"Calibre-Web configuration updated")}]
     resp['reboot'] = reboot
-    resp['config_upload']= config.config_upload_formats
+    resp['config_upload'] = config.config_upload_formats
     return Response(json.dumps(resp), mimetype='application/json')
 
 
@@ -1416,6 +1426,7 @@ def _handle_new_user(to_save, content, languages, translations, kobo_support):
         log.error("Settings DB is not Writeable")
         flash(_("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():
@@ -1439,7 +1450,7 @@ def _delete_user(content):
                 ub.session.delete(kobo_entry)
             ub.session_commit()
             log.info("User {} deleted".format(content.name))
-            return(_("User '%(nick)s' deleted", nick=content.name))
+            return _("User '%(nick)s' deleted", nick=content.name)
         else:
             log.warning(_("Can't delete Guest User"))
             raise Exception(_("Can't delete Guest User"))
@@ -1737,7 +1748,7 @@ def get_updater_status():
         if request.method == "POST":
             commit = request.form.to_dict()
             if "start" in commit and commit['start'] == 'True':
-                text = {
+                txt = {
                     "1": _(u'Requesting update package'),
                     "2": _(u'Downloading update package'),
                     "3": _(u'Unzipping update package'),
@@ -1752,7 +1763,7 @@ def get_updater_status():
                     "12": _(u'Update failed:') + u' ' + _(u'Update file could not be saved in temp dir'),
                     "13": _(u'Update failed:') + u' ' + _(u'Files could not be replaced during update')
                 }
-                status['text'] = text
+                status['text'] = txt
                 updater_thread.status = 0
                 updater_thread.resume()
                 status['status'] = updater_thread.get_update_status()
diff --git a/cps/constants.py b/cps/constants.py
index 0a964fb73..f90031258 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -21,22 +21,22 @@ import os
 from collections import namedtuple
 from sqlalchemy import __version__ as sql_version
 
-sqlalchemy_version2 = ([int(x) for x in sql_version.split('.')] >= [2,0,0])
+sqlalchemy_version2 = ([int(x) for x in sql_version.split('.')] >= [2, 0, 0])
 
 # if installed via pip this variable is set to true (empty file with name .HOMEDIR present)
 HOME_CONFIG = os.path.isfile(os.path.join(os.path.dirname(os.path.abspath(__file__)), '.HOMEDIR'))
 
-#In executables updater is not available, so variable is set to False there
+# In executables updater is not available, so variable is set to False there
 UPDATER_AVAILABLE = True
 
 # Base dir is parent of current file, necessary if called from different folder
-BASE_DIR            = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),os.pardir))
+BASE_DIR            = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir))
 STATIC_DIR          = os.path.join(BASE_DIR, 'cps', 'static')
 TEMPLATES_DIR       = os.path.join(BASE_DIR, 'cps', 'templates')
 TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
 
 if HOME_CONFIG:
-    home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
+    home_dir = os.path.join(os.path.expanduser("~"), ".calibre-web")
     if not os.path.exists(home_dir):
         os.makedirs(home_dir)
     CONFIG_DIR = os.environ.get('CALIBRE_DBPATH', home_dir)
@@ -133,11 +133,14 @@ except ValueError:
 del env_CALIBRE_PORT
 
 
-EXTENSIONS_AUDIO    = {'mp3', 'mp4', 'ogg', 'opus', 'wav', 'flac', 'm4a', 'm4b'}
-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'}
+EXTENSIONS_AUDIO = {'mp3', 'mp4', 'ogg', 'opus', 'wav', 'flac', 'm4a', 'm4b'}
+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'}
 
 
 def has_flag(value, bit_flag):
@@ -153,7 +156,7 @@ BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, d
 
 STABLE_VERSION = {'version': '0.6.17 Beta'}
 
-NIGHTLY_VERSION = {}
+NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'
 NIGHTLY_VERSION[1] = '$Format:%cI$'
 # NIGHTLY_VERSION[0] = 'bb7d2c6273ae4560e83950d36d64533343623a57'

From 3123a914a456eb11076da09f6c84e7309de2d3b2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 30 Jan 2022 10:57:29 +0100
Subject: [PATCH 144/412] Updated test results Fix updater Added comment
 regarding code taken from calibre source

---
 cps/services/Metadata.py                |   4 +
 cps/updater.py                          |  48 +-
 test/Calibre-Web TestSummary_Linux.html | 965 ++++++++++++++----------
 3 files changed, 615 insertions(+), 402 deletions(-)

diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index f4a5662c6..ab4fd4823 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -72,6 +72,10 @@ class Metadata:
     ) -> Generator[str, None, None]:
         """
         Taken from calibre source code
+        It's a simplified (cut out what is unnecessary) version of
+        https://github.com/kovidgoyal/calibre/blob/99d85b97918625d172227c8ffb7e0c71794966c0/
+        src/calibre/ebooks/metadata/sources/base.py#L363-L367
+        (src/calibre/ebooks/metadata/sources/base.py - lines 363-398)
         """
         title_patterns = [
             (re.compile(pat, re.IGNORECASE), repl)
diff --git a/cps/updater.py b/cps/updater.py
index 1e11ff78b..2166b3344 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -182,29 +182,30 @@ class Updater(threading.Thread):
         return rf
 
     @classmethod
-    def check_permissions(cls, root_src_dir, root_dst_dir, logfunction):
+    def check_permissions(cls, root_src_dir, root_dst_dir, log_function):
         access = True
         remove_path = len(root_src_dir) + 1
         for src_dir, __, files in os.walk(root_src_dir):
             root_dir = os.path.join(root_dst_dir, src_dir[remove_path:])
-            # Skip non existing folders on check
-            if not os.path.isdir(root_dir): # root_dir.lstrip(os.sep).startswith('.') or
+            # Skip non-existing folders on check
+            if not os.path.isdir(root_dir):
                 continue
-            if not os.access(root_dir, os.R_OK|os.W_OK):
-                logfunction("Missing permissions for {}".format(root_dir))
+            if not os.access(root_dir, os.R_OK | os.W_OK):
+                log_function("Missing permissions for {}".format(root_dir))
                 access = False
             for file_ in files:
                 curr_file = os.path.join(root_dir, file_)
-                # Skip non existing files on check
-                if not os.path.isfile(curr_file): # or curr_file.startswith('.'):
+                # Skip non-existing files on check
+                if not os.path.isfile(curr_file):  # or curr_file.startswith('.'):
                     continue
-                if not os.access(curr_file, os.R_OK|os.W_OK):
-                    logfunction("Missing permissions for {}".format(curr_file))
+                if not os.access(curr_file, os.R_OK | os.W_OK):
+                    log_function("Missing permissions for {}".format(curr_file))
                     access = False
         return access
 
     @classmethod
-    def moveallfiles(cls, root_src_dir, root_dst_dir):
+    def move_all_files(cls, root_src_dir, root_dst_dir):
+        permission = None
         new_permissions = os.stat(root_dst_dir)
         log.debug('Performing Update on OS-System: %s', sys.platform)
         change_permissions = not (sys.platform == "win32" or sys.platform == "darwin")
@@ -257,9 +258,10 @@ class Updater(threading.Thread):
         # destination files
         old_list = list()
         exclude = self._add_excluded_files(log.info)
-        additional_path =self.is_venv()
+        additional_path = self.is_venv()
         if additional_path:
             exclude.append(additional_path)
+        exclude = tuple(exclude)
         # check if we are in a package, rename cps.py to __init__.py
         if constants.HOME_CONFIG:
             shutil.move(os.path.join(source, 'cps.py'), os.path.join(source, '__init__.py'))
@@ -284,7 +286,7 @@ class Updater(threading.Thread):
         remove_items = self.reduce_dirs(rf, new_list)
 
         if self.check_permissions(source, destination, log.debug):
-            self.moveallfiles(source, destination)
+            self.move_all_files(source, destination)
 
             for item in remove_items:
                 item_path = os.path.join(destination, item[1:])
@@ -336,6 +338,7 @@ class Updater(threading.Thread):
             remaining_parents_cnt = 10
         except (IndexError, KeyError):
             remaining_parents_cnt = None
+            parent_commit = None
 
         if remaining_parents_cnt is not None:
             while True:
@@ -388,7 +391,7 @@ class Updater(threading.Thread):
         return status, update_data
 
     @staticmethod
-    def _add_excluded_files(logfunction):
+    def _add_excluded_files(log_function):
         excluded_files = [
             os.sep + 'app.db', os.sep + 'calibre-web.log1', os.sep + 'calibre-web.log2', os.sep + 'gdrive.db',
             os.sep + 'vendor', os.sep + 'calibre-web.log', os.sep + '.git', os.sep + 'client_secrets.json',
@@ -401,14 +404,14 @@ class Updater(threading.Thread):
             with open(os.path.join(constants.BASE_DIR, "exclude.txt"), "r") as f:
                 lines = f.readlines()
             for line in lines:
-                proccessed_line = line.strip("\n\r ").strip("\"'").lstrip("\\/ ").\
+                processed_line = line.strip("\n\r ").strip("\"'").lstrip("\\/ ").\
                     replace("\\", os.sep).replace("/", os.sep)
-                if os.path.exists(os.path.join(constants.BASE_DIR, proccessed_line)):
-                    excluded_files.append(os.sep + proccessed_line)
+                if os.path.exists(os.path.join(constants.BASE_DIR, processed_line)):
+                    excluded_files.append(os.sep + processed_line)
                 else:
-                    logfunction("File list for updater: {} not found".format(line))
+                    log_function("File list for updater: {} not found".format(line))
         except (PermissionError, FileNotFoundError):
-            logfunction("Excluded file list for updater not found, or not accessible")
+            log_function("Excluded file list for updater not found, or not accessible")
         return excluded_files
 
     def _nightly_available_updates(self, request_method, locale):
@@ -469,7 +472,7 @@ class Updater(threading.Thread):
         return ''
 
     def _stable_updater_set_status(self, i, newer, status, parents, commit):
-        if i == -1 and newer == False:
+        if i == -1 and newer is False:
             status.update({
                 'update': True,
                 'success': True,
@@ -478,7 +481,7 @@ class Updater(threading.Thread):
                 'history': parents
             })
             self.updateFile = commit[0]['zipball_url']
-        elif i == -1 and newer == True:
+        elif i == -1 and newer is True:
             status.update({
                 'update': True,
                 'success': True,
@@ -515,6 +518,7 @@ class Updater(threading.Thread):
         return status, parents
 
     def _stable_available_updates(self, request_method):
+        status = None
         if request_method == "GET":
             parents = []
             # repository_url = 'https://api.github.com/repos/flatpak/flatpak/releases'  # test URL
@@ -559,7 +563,7 @@ class Updater(threading.Thread):
                 except ValueError:
                     current_version[2] = int(current_version[2].split(' ')[0])-1
 
-                # Check if major versions are identical search for newest non equal commit and update to this one
+                # Check if major versions are identical search for newest non-equal commit and update to this one
                 if major_version_update == current_version[0]:
                     if (minor_version_update == current_version[1] and
                             patch_version_update > current_version[2]) or \
@@ -572,7 +576,7 @@ class Updater(threading.Thread):
                     i -= 1
                     continue
                 if major_version_update > current_version[0]:
-                    # found update update to last version before major update, unless current version is on last version
+                    # found update to last version before major update, unless current version is on last version
                     # before major update
                     if i == (len(commit) - 1):
                         i -= 1
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 9fc44030e..0004c7a0d 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-27 10:57:52</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-29 21:23:00</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>2022-01-27 14:58:14</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-30 01:22:23</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>3h 19 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 18 min</p>
         </div>
       </div>
       </div>
@@ -236,13 +236,13 @@
 
     <tr id="su" class="passClass">
         <td>TestCli</td>
-        <td class="text-center">8</td>
-        <td class="text-center">8</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('c2', 8)">Detail</a>
+            <a onclick="showClassDetail('c2', 9)">Detail</a>
         </td>
     </tr>
 
@@ -304,7 +304,7 @@
     
         <tr id='pt2.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestCli - test_environ_port_setting</div>
+                <div class='testcase'>TestCli - test_dryrun_update</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -312,6 +312,15 @@
     
     
         <tr id='pt2.8' 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.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
             </td>
@@ -411,11 +420,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -461,11 +470,33 @@
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id="ft6.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 357, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1273,6 +1304,30 @@
     
 
 
+    <tr id="su" class="passClass">
+        <td>TestEditAuthors</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('c12', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt12.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
@@ -1281,13 +1336,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 18)">Detail</a>
+            <a onclick="showClassDetail('c13', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1296,7 +1351,7 @@
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1305,7 +1360,7 @@
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1314,7 +1369,7 @@
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1323,7 +1378,7 @@
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1332,7 +1387,7 @@
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1341,7 +1396,7 @@
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt13.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1350,7 +1405,7 @@
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt13.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1359,7 +1414,7 @@
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt13.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1368,7 +1423,7 @@
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt13.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1377,7 +1432,7 @@
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt13.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1386,7 +1441,7 @@
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt13.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1395,7 +1450,7 @@
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt13.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1404,7 +1459,7 @@
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt13.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -1413,7 +1468,7 @@
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt13.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1422,7 +1477,7 @@
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt13.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1431,7 +1486,7 @@
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt13.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1440,7 +1495,7 @@
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt13.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1450,45 +1505,25 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 1)">Detail</a>
+            <a onclick="showClassDetail('c14', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 158, in test_load_metadata
-    self.assertLessEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.001)
-AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1502,13 +1537,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 20)">Detail</a>
+            <a onclick="showClassDetail('c15', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1517,7 +1552,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1526,7 +1561,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1535,7 +1570,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1544,7 +1579,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1553,7 +1588,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1562,7 +1597,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.7' class='hiddenRow bg-success'>
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1571,7 +1606,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1580,7 +1615,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.9' class='hiddenRow bg-success'>
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1589,7 +1624,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.10' class='hiddenRow bg-success'>
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1598,7 +1633,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.11' class='hiddenRow bg-success'>
+        <tr id='pt15.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1607,7 +1642,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id='pt15.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1616,7 +1651,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1625,7 +1660,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1634,7 +1669,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1643,7 +1678,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1652,7 +1687,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.17' class='hiddenRow bg-success'>
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1661,7 +1696,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.18' class='hiddenRow bg-success'>
+        <tr id='pt15.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1670,7 +1705,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.19' class='hiddenRow bg-success'>
+        <tr id='pt15.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1679,7 +1714,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.20' class='hiddenRow bg-success'>
+        <tr id='pt15.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1689,25 +1724,45 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 1)">Detail</a>
+            <a onclick="showClassDetail('c16', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id="ft16.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft16.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft16.1').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
+    self.assertEqual(30, len(results))
+AssertionError: 30 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1721,13 +1776,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 3)">Detail</a>
+            <a onclick="showClassDetail('c17', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1736,7 +1791,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1745,7 +1800,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1763,13 +1818,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 7)">Detail</a>
+            <a onclick="showClassDetail('c18', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1778,7 +1833,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1787,7 +1842,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1796,7 +1851,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1805,7 +1860,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1814,7 +1869,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -1823,7 +1878,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -1841,13 +1896,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1865,13 +1920,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 2)">Detail</a>
+            <a onclick="showClassDetail('c20', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1880,7 +1935,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -1898,13 +1953,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 3)">Detail</a>
+            <a onclick="showClassDetail('c21', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -1913,19 +1968,19 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id="st20.2" class="none bg-warning">
+        <tr id="st21.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st20.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st21.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st20.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st21.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_st20.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st21.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1939,7 +1994,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -1957,13 +2012,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c22', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -1981,13 +2036,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -1996,7 +2051,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2005,7 +2060,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2015,21 +2070,21 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">11</td>
-        <td class="text-center">0</td>
+        <td class="text-center">10</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('c23', 11)">Detail</a>
+            <a onclick="showClassDetail('c24', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2038,7 +2093,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2047,7 +2102,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2056,7 +2111,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2065,7 +2120,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2074,7 +2129,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.6' class='hiddenRow bg-success'>
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2083,7 +2138,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2092,7 +2147,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.8' class='hiddenRow bg-success'>
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2101,16 +2156,36 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.9' class='hiddenRow bg-success'>
+        <tr id="ft24.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft24.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
+    self.assertEqual(1, len(data), data)
+AssertionError: 1 != 0 : []</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt23.10' class='hiddenRow bg-success'>
+        <tr id='pt24.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2119,7 +2194,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.11' class='hiddenRow bg-success'>
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2137,13 +2212,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 5)">Detail</a>
+            <a onclick="showClassDetail('c25', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2152,7 +2227,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2161,7 +2236,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2170,7 +2245,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2179,7 +2254,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2197,13 +2272,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 13)">Detail</a>
+            <a onclick="showClassDetail('c26', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2212,7 +2287,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2221,7 +2296,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2230,7 +2305,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2239,7 +2314,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2248,7 +2323,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2257,7 +2332,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2266,7 +2341,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2275,7 +2350,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2284,7 +2359,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2293,7 +2368,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2302,7 +2377,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.12' class='hiddenRow bg-success'>
+        <tr id='pt26.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2311,7 +2386,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.13' class='hiddenRow bg-success'>
+        <tr id='pt26.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2329,13 +2404,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 8)">Detail</a>
+            <a onclick="showClassDetail('c27', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2344,7 +2419,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2353,7 +2428,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2362,7 +2437,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2371,7 +2446,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2380,7 +2455,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2389,7 +2464,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2398,7 +2473,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2416,13 +2491,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 9)">Detail</a>
+            <a onclick="showClassDetail('c28', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2431,7 +2506,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2440,7 +2515,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2449,7 +2524,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2458,19 +2533,19 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id="st27.5" class="none bg-warning">
+        <tr id="st28.5" 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_st27.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st28.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st27.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st28.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_st27.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st28.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2484,7 +2559,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2493,7 +2568,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2502,7 +2577,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2511,7 +2586,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2529,13 +2604,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 15)">Detail</a>
+            <a onclick="showClassDetail('c29', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2544,7 +2619,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2553,7 +2628,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2562,7 +2637,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2571,7 +2646,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2580,7 +2655,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2589,7 +2664,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2598,7 +2673,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2607,7 +2682,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2616,7 +2691,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2625,7 +2700,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt29.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2634,7 +2709,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt29.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2643,7 +2718,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt29.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2652,7 +2727,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.14' class='hiddenRow bg-success'>
+        <tr id='pt29.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2661,7 +2736,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.15' class='hiddenRow bg-success'>
+        <tr id='pt29.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2679,13 +2754,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2694,7 +2769,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2712,13 +2787,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2727,7 +2802,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2745,13 +2820,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 23)">Detail</a>
+            <a onclick="showClassDetail('c32', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2760,7 +2835,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2769,7 +2844,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2778,7 +2853,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt32.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2787,7 +2862,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2796,7 +2871,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt32.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2805,7 +2880,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt32.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2814,7 +2889,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt32.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2823,7 +2898,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt32.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2832,7 +2907,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt32.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2841,7 +2916,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt32.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2850,7 +2925,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt32.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2859,7 +2934,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt32.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2868,7 +2943,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt32.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2877,7 +2952,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt32.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -2886,7 +2961,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.16' class='hiddenRow bg-success'>
+        <tr id='pt32.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -2895,7 +2970,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.17' class='hiddenRow bg-success'>
+        <tr id='pt32.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -2904,7 +2979,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.18' class='hiddenRow bg-success'>
+        <tr id='pt32.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -2913,7 +2988,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.19' class='hiddenRow bg-success'>
+        <tr id='pt32.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -2922,7 +2997,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.20' class='hiddenRow bg-success'>
+        <tr id='pt32.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -2931,7 +3006,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.21' class='hiddenRow bg-success'>
+        <tr id='pt32.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -2940,7 +3015,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.22' class='hiddenRow bg-success'>
+        <tr id='pt32.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -2949,7 +3024,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.23' class='hiddenRow bg-success'>
+        <tr id='pt32.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2967,13 +3042,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 1)">Detail</a>
+            <a onclick="showClassDetail('c33', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -2991,13 +3066,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 5)">Detail</a>
+            <a onclick="showClassDetail('c34', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3006,7 +3081,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3015,7 +3090,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3024,7 +3099,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3033,7 +3108,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3043,6 +3118,30 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
 
 
+    <tr id="su" class="passClass">
+        <td>TestReconnect</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('c35', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt35.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestRegister</td>
         <td class="text-center">8</td>
@@ -3051,13 +3150,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 8)">Detail</a>
+            <a onclick="showClassDetail('c36', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3066,7 +3165,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3075,7 +3174,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3084,7 +3183,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3093,7 +3192,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3102,7 +3201,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3111,7 +3210,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt36.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3120,7 +3219,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3138,13 +3237,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 3)">Detail</a>
+            <a onclick="showClassDetail('c37', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3153,7 +3252,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3162,7 +3261,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3174,19 +3273,28 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
 
     <tr id="su" class="skipClass">
         <td>TestShelf</td>
+        <td class="text-center">16</td>
         <td class="text-center">15</td>
-        <td class="text-center">14</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('c36', 15)">Detail</a>
+            <a onclick="showClassDetail('c38', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_access_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3195,7 +3303,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3204,7 +3312,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3213,7 +3321,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3222,7 +3330,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3231,7 +3339,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3240,7 +3348,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.7' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3249,7 +3357,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt38.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3258,7 +3366,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.9' class='hiddenRow bg-success'>
+        <tr id='pt38.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3267,7 +3375,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.10' class='hiddenRow bg-success'>
+        <tr id='pt38.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3276,7 +3384,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.11' class='hiddenRow bg-success'>
+        <tr id='pt38.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3285,7 +3393,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.12' class='hiddenRow bg-success'>
+        <tr id='pt38.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3294,19 +3402,19 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id="st36.13" class="none bg-warning">
+        <tr id="st38.14" 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_st36.13')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st38.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.13" class="popup_window test_output" style="display:none;">
+                <div id="div_st38.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_st36.13').style.display='none'"><span
+                                onclick="document.getElementById('div_st38.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3320,7 +3428,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.14' class='hiddenRow bg-success'>
+        <tr id='pt38.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3329,7 +3437,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.15' class='hiddenRow bg-success'>
+        <tr id='pt38.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3339,21 +3447,21 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 9)">Detail</a>
+            <a onclick="showClassDetail('c39', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3362,7 +3470,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3371,7 +3479,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3380,7 +3488,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3389,37 +3497,102 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id="et39.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et39.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 381, in test_perform_update
+    button.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;DialogFinished&#34; class=&#34;btn btn-default hidden&#34; type=&#34;button&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id="et39.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et39.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 298, in test_perform_update_stable_errors
+    self.fill_basic_config({&#39;config_updatechannel&#39;: &#39;Stable&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id="st37.7" class="none bg-warning">
+        <tr id="st39.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_st37.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st39.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st37.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st39.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_st37.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st39.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3433,7 +3606,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3442,11 +3615,31 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id="ft39.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft39.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 413, in test_update_write_protect
+    self.assertTrue(&#39;Update failed&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3460,13 +3653,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 2)">Detail</a>
+            <a onclick="showClassDetail('c40', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3475,7 +3668,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3493,13 +3686,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 18)">Detail</a>
+            <a onclick="showClassDetail('c41', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3508,7 +3701,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3517,7 +3710,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3526,7 +3719,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3535,7 +3728,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3544,7 +3737,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3553,7 +3746,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3562,7 +3755,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3571,7 +3764,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3580,7 +3773,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3589,7 +3782,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3598,7 +3791,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3607,7 +3800,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3616,7 +3809,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.14' class='hiddenRow bg-success'>
+        <tr id='pt41.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3625,7 +3818,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3634,7 +3827,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3643,7 +3836,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.17' class='hiddenRow bg-success'>
+        <tr id='pt41.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3652,7 +3845,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.18' class='hiddenRow bg-success'>
+        <tr id='pt41.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3670,13 +3863,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 1)">Detail</a>
+            <a onclick="showClassDetail('c42', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3694,13 +3887,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 21)">Detail</a>
+            <a onclick="showClassDetail('c43', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3709,7 +3902,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3718,7 +3911,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3727,7 +3920,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3736,7 +3929,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3745,7 +3938,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3754,7 +3947,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3763,7 +3956,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3772,7 +3965,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3781,7 +3974,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3790,7 +3983,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3799,7 +3992,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3808,7 +4001,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3817,7 +4010,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3826,7 +4019,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3835,7 +4028,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3844,7 +4037,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3853,7 +4046,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -3862,7 +4055,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.19' class='hiddenRow bg-success'>
+        <tr id='pt43.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -3871,7 +4064,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.20' class='hiddenRow bg-success'>
+        <tr id='pt43.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -3880,7 +4073,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.21' class='hiddenRow bg-success'>
+        <tr id='pt43.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -3898,13 +4091,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 34)">Detail</a>
+            <a onclick="showClassDetail('c44', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -3913,7 +4106,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -3922,7 +4115,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -3931,7 +4124,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -3940,7 +4133,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -3949,7 +4142,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -3958,7 +4151,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -3967,7 +4160,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -3976,7 +4169,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -3985,7 +4178,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -3994,7 +4187,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4003,7 +4196,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4012,7 +4205,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4021,7 +4214,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4030,7 +4223,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4039,7 +4232,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4048,7 +4241,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4057,7 +4250,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4066,7 +4259,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.19' class='hiddenRow bg-success'>
+        <tr id='pt44.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4075,7 +4268,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.20' class='hiddenRow bg-success'>
+        <tr id='pt44.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4084,7 +4277,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.21' class='hiddenRow bg-success'>
+        <tr id='pt44.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4093,7 +4286,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.22' class='hiddenRow bg-success'>
+        <tr id='pt44.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4102,7 +4295,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.23' class='hiddenRow bg-success'>
+        <tr id='pt44.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4111,7 +4304,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.24' class='hiddenRow bg-success'>
+        <tr id='pt44.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4120,7 +4313,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.25' class='hiddenRow bg-success'>
+        <tr id='pt44.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4129,7 +4322,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.26' class='hiddenRow bg-success'>
+        <tr id='pt44.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4138,7 +4331,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.27' class='hiddenRow bg-success'>
+        <tr id='pt44.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4147,7 +4340,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.28' class='hiddenRow bg-success'>
+        <tr id='pt44.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4156,7 +4349,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.29' class='hiddenRow bg-success'>
+        <tr id='pt44.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4165,7 +4358,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.30' class='hiddenRow bg-success'>
+        <tr id='pt44.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4174,7 +4367,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.31' class='hiddenRow bg-success'>
+        <tr id='pt44.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4183,7 +4376,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.32' class='hiddenRow bg-success'>
+        <tr id='pt44.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4192,7 +4385,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.33' class='hiddenRow bg-success'>
+        <tr id='pt44.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4201,7 +4394,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.34' class='hiddenRow bg-success'>
+        <tr id='pt44.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4219,13 +4412,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 16)">Detail</a>
+            <a onclick="showClassDetail('c45', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4234,7 +4427,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4243,7 +4436,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4252,7 +4445,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4261,7 +4454,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4270,7 +4463,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4279,7 +4472,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4288,7 +4481,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4297,7 +4490,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4306,7 +4499,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4315,7 +4508,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4324,7 +4517,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4333,7 +4526,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4342,7 +4535,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4351,7 +4544,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4360,7 +4553,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4371,10 +4564,10 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>389</td>
-        <td>381</td>
-        <td>1</td>
-        <td>0</td>
+        <td>393</td>
+        <td>380</td>
+        <td>4</td>
+        <td>2</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4635,6 +4828,12 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
+            <tr>
+              <th>beautifulsoup4</th>
+              <td>4.10.0</td>
+              <td>TestLoadMetadata</td>
+            </tr>
+          
             <tr>
               <th>google-api-python-client</th>
               <td>2.36.0</td>
@@ -4665,6 +4864,12 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
+            <tr>
+              <th>beautifulsoup4</th>
+              <td>4.10.0</td>
+              <td>TestLoadMetadataScholar</td>
+            </tr>
+          
             <tr>
               <th>scholarly</th>
               <td>1.5.1</td>
@@ -4763,7 +4968,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
 </div>
 
 <script>
-    drawCircle(381, 1, 0, 7);
+    drawCircle(380, 4, 2, 7);
     showCase(5);
 </script>
 

From 3ae1b97d72ff4d74f07e156d8e4026f12808a509 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 30 Jan 2022 13:44:53 +0100
Subject: [PATCH 145/412] Fix renaming title and author in the same request

---
 cps/helper.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cps/helper.py b/cps/helper.py
index 2daf8494e..f6ea024f7 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -398,6 +398,8 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                     log.debug(ex, exc_info=True)
                     return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                              src=old_author_path, dest=new_author_path, error=str(ex))
+        if first_author.lower() in [r.lower() for r in renamed_author]:
+            path = os.path.join(calibrepath, new_authordir, titledir)
     else:
         new_authordir = get_valid_filename(localbook.authors[0].name)
     new_titledir = get_valid_filename(localbook.title) + " (" + str(book_id) + ")"

From 1e04b511489d3db41754d09627430cef8c5d2cd8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 30 Jan 2022 15:16:42 +0100
Subject: [PATCH 146/412] Renaming of co-authors which are authors in another
 book

---
 cps/editbooks.py |  8 +++----
 cps/helper.py    | 55 ++++++++++++++++++++++++------------------------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 20184bf9e..1ca554524 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -964,8 +964,8 @@ def create_book_on_upload(modif_date, meta):
     authr = meta.author
     sort_authors, input_authors, db_author, renamed_authors = prepare_authors_on_upload(title, authr)
 
-    title_dir = helper.get_valid_filename(title)
-    author_dir = helper.get_valid_filename(db_author.name)
+    title_dir = helper.get_valid_filename(title, chars=96)
+    author_dir = helper.get_valid_filename(db_author.name, chars=96)
 
     # combine path and normalize path from windows systems
     path = os.path.join(author_dir, title_dir).replace('\\', '/')
@@ -1283,8 +1283,8 @@ def merge_list_book():
         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)
+            to_name = helper.get_valid_filename(to_book.title, chars=96) + ' - ' + \
+                      helper.get_valid_filename(to_book.authors[0].name, chars=96)
             for book_id in vals:
                 from_book = calibre_db.get_book(book_id)
                 if from_book:
diff --git a/cps/helper.py b/cps/helper.py
index f6ea024f7..54d9c57c4 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -220,7 +220,7 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
 
-def get_valid_filename(value, replace_whitespace=True):
+def get_valid_filename(value, replace_whitespace=True, chars=128):
     """
     Returns the given string converted to a string that can be used for a clean
     filename. Limits num characters to 128 max.
@@ -242,7 +242,7 @@ def get_valid_filename(value, replace_whitespace=True):
         value = re.sub(r'[*+:\\\"/<>?]+', u'_', value, flags=re.U)
         # pipe has to be replaced with comma
         value = re.sub(r'[|]+', u',', value, flags=re.U)
-    value = value[:128].strip()
+    value = value[:chars].strip()
     if not value:
         raise ValueError("Filename cannot be empty")
     return value
@@ -332,7 +332,7 @@ def delete_book_file(book, calibrepath, book_format=None):
 
 
 def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=None):
-    valid_filename_authors = [get_valid_filename(r) for r in renamed_author]
+    valid_filename_authors = [get_valid_filename(r, chars=96) for r in renamed_author]
     for r in renamed_author:
         if local_book:
             all_books = [local_book]
@@ -343,10 +343,11 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
             book_author_path = book.path.split('/')[0]
             if book_author_path in valid_filename_authors or local_book:
                 new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-                all_new_authordir = get_valid_filename(new_author.name)
+                all_new_authordir = get_valid_filename(new_author.name, chars=96)
                 all_titledir = book.path.split('/')[1]
                 all_new_path = os.path.join(calibrepath, all_new_authordir, all_titledir)
-                all_new_name = get_valid_filename(book.title) + ' - ' + all_new_authordir
+                all_new_name = get_valid_filename(book.title, chars=42) + ' - ' \
+                               + get_valid_filename(new_author.name, chars=42)
                 # change location in database to new author/title path
                 book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
                 for file_format in book.data:
@@ -383,11 +384,11 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
     # 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)
+        new_authordir = get_valid_filename(first_author, chars=96)
         for r in renamed_author:
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-            old_author_dir = get_valid_filename(r)
-            new_author_rename_dir = get_valid_filename(new_author.name)
+            old_author_dir = get_valid_filename(r, chars=96)
+            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
             if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
                 try:
                     old_author_path = os.path.join(calibrepath, old_author_dir)
@@ -401,12 +402,12 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
         if first_author.lower() in [r.lower() for r in renamed_author]:
             path = os.path.join(calibrepath, new_authordir, titledir)
     else:
-        new_authordir = get_valid_filename(localbook.authors[0].name)
-    new_titledir = get_valid_filename(localbook.title) + " (" + str(book_id) + ")"
+        new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
+    new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
 
     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) + ' - ' + new_authordir
+        new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_authordir
         try:
             if orignal_filepath:
                 if not os.path.isdir(new_path):
@@ -434,17 +435,17 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
             return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                      src=path, dest=new_path, error=str(ex))
 
-        # Rename all files from old names to new names
-        try:
-            clean_author_database(renamed_author, calibrepath)
-            if first_author and first_author not in renamed_author:
-                clean_author_database([first_author], calibrepath, localbook)
-            if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
-                shutil.rmtree(os.path.dirname(path))
-        except (OSError, FileNotFoundError) as ex:
-            log.error("Error in rename file in path %s", ex)
-            log.debug(ex, exc_info=True)
-            return _("Error in rename file in path: %(error)s", error=str(ex))
+    # Rename all files from old names to new names
+    try:
+        clean_author_database(renamed_author, calibrepath)
+        if first_author and first_author not in renamed_author:
+            clean_author_database([first_author], calibrepath, localbook)
+        if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+            shutil.rmtree(os.path.dirname(path))
+    except (OSError, FileNotFoundError) as ex:
+        log.error("Error in rename file in path %s", ex)
+        log.debug(ex, exc_info=True)
+        return _("Error in rename file in path: %(error)s", error=str(ex))
     return False
 
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
@@ -453,22 +454,22 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
 
     authordir = book.path.split('/')[0]
     if first_author:
-        new_authordir = get_valid_filename(first_author)
+        new_authordir = get_valid_filename(first_author, chars=96)
         for r in renamed_author:
             # Todo: Rename all authors on gdrive
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-            old_author_dir = get_valid_filename(r)
-            new_author_rename_dir = get_valid_filename(new_author.name)
+            old_author_dir = get_valid_filename(r, chars=96)
+            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
             gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
             if gFile:
                 gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
             else:
                 error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
     else:
-        new_authordir = get_valid_filename(book.authors[0].name)
+        new_authordir = get_valid_filename(book.authors[0].name, chars=96)
 
     titledir = book.path.split('/')[1]
-    new_titledir = get_valid_filename(book.title) + u" (" + str(book_id) + u")"
+    new_titledir = get_valid_filename(book.title, chars=96) + u" (" + str(book_id) + u")"
 
     if titledir != new_titledir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)

From 111ab121b1be8a8710ca36a89ddceb1d32e526d4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 30 Jan 2022 21:27:06 +0100
Subject: [PATCH 147/412] Bugfix upload file with existing author

---
 cps/helper.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 54d9c57c4..c9462ca78 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -400,7 +400,8 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                     return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                              src=old_author_path, dest=new_author_path, error=str(ex))
         if first_author.lower() in [r.lower() for r in renamed_author]:
-            path = os.path.join(calibrepath, new_authordir, titledir)
+            if os.path.isdir(os.path.join(calibrepath, new_authordir)):
+                path = os.path.join(calibrepath, new_authordir, titledir)
     else:
         new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
     new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
@@ -412,8 +413,8 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
             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)
+                shutil.move(os.path.normcase(orignal_filepath), os.path.normcase(os.path.join(new_path, db_filename)))
+                log.debug("Moving title: %s to %s/%s", orignal_filepath, new_path, new_name)
             else:
                 # Check new path is not valid path
                 if not os.path.exists(new_path):

From 4dcc44803c89d71fcf34b575cc6794c45c228a5c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 31 Jan 2022 18:03:28 +0100
Subject: [PATCH 148/412] Update teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 238 ++++++++++--------------
 1 file changed, 98 insertions(+), 140 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 0004c7a0d..aa032162c 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-29 21:23:00</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-30 21:26:41</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>2022-01-30 01:22:23</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-31 01:29:29</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>3h 18 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 21 min</p>
         </div>
       </div>
       </div>
@@ -420,11 +420,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
+        <td class="text-center">15</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -470,33 +470,11 @@
     
     
     
-        <tr id="ft6.5" class="none bg-danger">
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 357, in test_convert_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1306,13 +1284,13 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     <tr id="su" class="passClass">
         <td>TestEditAuthors</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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('c12', 1)">Detail</a>
+            <a onclick="showClassDetail('c12', 6)">Detail</a>
         </td>
     </tr>
 
@@ -1320,7 +1298,52 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1529,11 +1552,11 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">19</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1714,11 +1737,31 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt15.20' class='hiddenRow bg-success'>
+        <tr id="ft15.20" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.20')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.20').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 940, in test_watch_metadata
+    self.assertNotIn(&#39;series&#39;, book)
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=0ec12ad1-d1a5-4308-8d9b-da739ee472a2&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1757,7 +1800,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
     self.assertEqual(30, len(results))
-AssertionError: 30 != 0</pre>
+AssertionError: 30 != 35</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3447,12 +3490,12 @@ AssertionError: 1 != 0 : []</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</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">
             <a onclick="showClassDetail('c39', 9)">Detail</a>
@@ -3497,85 +3540,20 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="et39.5" class="none bg-info">
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <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_et39.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 381, in test_perform_update
-    button.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;DialogFinished&#34; class=&#34;btn btn-default hidden&#34; type=&#34;button&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et39.6" class="none bg-info">
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <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_et39.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 298, in test_perform_update_stable_errors
-    self.fill_basic_config({&#39;config_updatechannel&#39;: &#39;Stable&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3615,31 +3593,11 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft39.9" class="none bg-danger">
+        <tr id='pt39.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft39.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 413, in test_update_write_protect
-    self.assertTrue(&#39;Update failed&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4564,10 +4522,10 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>393</td>
-        <td>380</td>
-        <td>4</td>
-        <td>2</td>
+        <td>398</td>
+        <td>388</td>
+        <td>3</td>
+        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4968,7 +4926,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(380, 4, 2, 7);
+    drawCircle(388, 3, 0, 7);
     showCase(5);
 </script>
 

From 23e47ba4e60e692f6daad8a4616c29e625b895fa Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 31 Jan 2022 18:09:23 +0100
Subject: [PATCH 149/412] Fix for #2299 (scholarly requires Internet connection
 at startup)

---
 cps/about.py                     | 6 +++++-
 cps/editbooks.py                 | 7 -------
 cps/metadata_provider/scholar.py | 9 ++++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 7e8395200..54f0eb916 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -58,10 +58,14 @@ try:
 except ImportError:
     greenlet_Version = None
 
+try:
+    from fake_useragent.errors import FakeUserAgentError
+except (ImportError):
+    FakeUserAgentError = BaseException
 try:
     from scholarly import scholarly
     scholarly_version = _(u'installed')
-except ImportError:
+except (ImportError, FakeUserAgentError):
     scholarly_version = _(u'not installed')
 
 from . import services
diff --git a/cps/editbooks.py b/cps/editbooks.py
index f0b8fb413..2f3b1b88c 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -33,13 +33,6 @@ try:
 except ImportError:
     pass
 
-# Improve this to check if scholarly is available in a global way, like other pythonic libraries
-try:
-    from scholarly import scholarly
-    have_scholar = True
-except ImportError:
-    have_scholar = False
-
 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
diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index df3878318..2a8d3cca3 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -16,7 +16,14 @@
 #  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 scholarly import scholarly
+try:
+    from fake_useragent.errors import FakeUserAgentError
+except (ImportError):
+    FakeUserAgentError = BaseException
+try:
+    from scholarly import scholarly
+except FakeUserAgentError:
+    raise ImportError("No module named 'scholarly'")
 
 from cps.services.Metadata import Metadata
 

From 95e0255aa1da646c50d863a6bb450ca6f06a96b0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 31 Jan 2022 19:19:25 +0100
Subject: [PATCH 150/412] Code cosmetics, removed scholarly from about section

---
 cps/about.py | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 54f0eb916..7ff178e3c 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -25,8 +25,15 @@ import platform
 import sqlite3
 from collections import OrderedDict
 
-import babel, pytz, requests, sqlalchemy
-import werkzeug, flask, flask_login, flask_principal, jinja2
+import babel
+import pytz
+import requests
+import sqlalchemy
+import werkzeug
+import flask
+import flask_login
+import flask_principal
+import jinja2
 from flask_babel import gettext as _
 try:
     from flask_wtf import __version__ as flaskwtf_version
@@ -58,16 +65,6 @@ try:
 except ImportError:
     greenlet_Version = None
 
-try:
-    from fake_useragent.errors import FakeUserAgentError
-except (ImportError):
-    FakeUserAgentError = BaseException
-try:
-    from scholarly import scholarly
-    scholarly_version = _(u'installed')
-except (ImportError, FakeUserAgentError):
-    scholarly_version = _(u'not installed')
-
 from . import services
 
 about = flask.Blueprint('about', __name__)
@@ -82,8 +79,8 @@ if constants.NIGHTLY_VERSION[0] == "$Format:%H$":
     calibre_web_version = constants.STABLE_VERSION['version']
 else:
     calibre_web_version = (constants.STABLE_VERSION['version'] + ' - '
-                    + constants.NIGHTLY_VERSION[0].replace('%','%%') + ' - '
-                    + constants.NIGHTLY_VERSION[1].replace('%','%%'))
+                           + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
+                           + constants.NIGHTLY_VERSION[1].replace('%', '%%'))
 if getattr(sys, 'frozen', False):
     calibre_web_version += " - Exe-Version"
 elif constants.HOME_CONFIG:
@@ -91,7 +88,7 @@ elif constants.HOME_CONFIG:
 
 if not ret:
     _VERSIONS = OrderedDict(
-        Platform = '{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
+        Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
         Python=sys.version,
         Calibre_Web=calibre_web_version,
         WebServer=server.VERSION,
@@ -109,7 +106,6 @@ if not ret:
         iso639=isoLanguages.__version__,
         pytz=pytz.__version__,
         Unidecode=unidecode_version,
-        Scholarly=scholarly_version,
         Flask_SimpleLDAP=u'installed' if bool(services.ldap) else None,
         python_LDAP=services.ldapVersion if bool(services.ldapVersion) else None,
         Goodreads=u'installed' if bool(services.goodreads_support) else None,
@@ -121,23 +117,25 @@ if not ret:
     _VERSIONS.update(uploader.get_versions(True))
 else:
     _VERSIONS = OrderedDict(
-        Platform = '{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
-        Python = sys.version,
+        Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
+        Python=sys.version,
         Calibre_Web=calibre_web_version,
-        Werkzeug = werkzeug.__version__,
+        Werkzeug=werkzeug.__version__,
         Jinja2=jinja2.__version__,
-        pySqlite = sqlite3.version,
-        SQLite = sqlite3.sqlite_version,
+        pySqlite=sqlite3.version,
+        SQLite=sqlite3.sqlite_version,
     )
     _VERSIONS.update(ret)
     _VERSIONS.update(uploader.get_versions(False))
 
+
 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():

From 0bc15636f2c0195ed1238d5af1ed47dc6f95647b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 1 Feb 2022 20:08:42 +0100
Subject: [PATCH 151/412] Bugfixes for renaming authors on gdrive

---
 cps/editbooks.py                        |   2 +-
 cps/helper.py                           |   5 +-
 test/Calibre-Web TestSummary_Linux.html | 925 +++++++++++++-----------
 3 files changed, 516 insertions(+), 416 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 41df5a2e8..215617666 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1066,7 +1066,7 @@ def upload():
 
                 book_id = db_book.id
                 title = db_book.title
-
+                # ToDo this currently doesn't work -> integrate in update_dir_structure_gdrive
                 error = helper.update_dir_structure_file(book_id,
                                                    config.config_calibre_dir,
                                                    input_authors[0],
diff --git a/cps/helper.py b/cps/helper.py
index c9462ca78..26cca79c3 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -464,8 +464,9 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
             if gFile:
                 gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
-            else:
-                error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
+            # author is always co-author and has is never author, no folder is okay
+            #else:
+            #    error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
     else:
         new_authordir = get_valid_filename(book.authors[0].name, chars=96)
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index aa032162c..742ae9fb0 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-30 21:26:41</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-31 21:25:49</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>2022-01-31 01:29:29</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-01 01:40:44</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>3h 21 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 28 min</p>
         </div>
       </div>
       </div>
@@ -1351,32 +1351,52 @@
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestEditBooksList</td>
-        <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+    <tr id="su" class="failClass">
+        <td>TestEditAuthorsGdrive</td>
+        <td class="text-center">6</td>
+        <td class="text-center">2</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 18)">Detail</a>
+            <a onclick="showClassDetail('c13', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id="ft13.1" class="none bg-danger">
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 294, in test_change_capital_co_author
+    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;f777605d-a838-445b-bae2-e6d59822f1fa&#34;)&gt; is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1384,6 +1404,115 @@
     
     
         <tr id='pt13.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft13.4" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 346, in test_change_capital_rename_co_author
+    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;4fcb7fb8-c3e4-4e04-8fb3-6d99d9999b74&#34;)&gt; is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft13.5" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 461, in test_change_capital_rename_two_co_authors
+    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;e4d4c44d-e87d-495b-abc6-f8a5100f2098&#34;)&gt; is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='st13.6' class='none bg-warning'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
+            </td>
+            <td colspan='6' align='center'>SKIP</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEditBooksList</td>
+        <td class="text-center">18</td>
+        <td class="text-center">18</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', 18)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt14.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1392,7 +1521,7 @@
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1401,7 +1530,7 @@
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1410,7 +1539,7 @@
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1419,7 +1548,7 @@
     
     
     
-        <tr id='pt13.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1428,7 +1557,7 @@
     
     
     
-        <tr id='pt13.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1437,7 +1566,7 @@
     
     
     
-        <tr id='pt13.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1446,7 +1575,7 @@
     
     
     
-        <tr id='pt13.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1455,7 +1584,7 @@
     
     
     
-        <tr id='pt13.11' class='hiddenRow bg-success'>
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1464,7 +1593,7 @@
     
     
     
-        <tr id='pt13.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1473,7 +1602,7 @@
     
     
     
-        <tr id='pt13.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1482,7 +1611,7 @@
     
     
     
-        <tr id='pt13.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -1491,7 +1620,7 @@
     
     
     
-        <tr id='pt13.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1500,7 +1629,7 @@
     
     
     
-        <tr id='pt13.16' class='hiddenRow bg-success'>
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1509,7 +1638,7 @@
     
     
     
-        <tr id='pt13.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1518,7 +1647,7 @@
     
     
     
-        <tr id='pt13.18' class='hiddenRow bg-success'>
+        <tr id='pt14.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1536,13 +1665,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 1)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
@@ -1552,21 +1681,21 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <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">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('c15', 20)">Detail</a>
+            <a onclick="showClassDetail('c16', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1575,7 +1704,7 @@
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1584,7 +1713,7 @@
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1593,7 +1722,7 @@
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1602,7 +1731,7 @@
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1611,7 +1740,7 @@
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1620,7 +1749,7 @@
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1629,7 +1758,7 @@
     
     
     
-        <tr id='pt15.8' class='hiddenRow bg-success'>
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1638,7 +1767,7 @@
     
     
     
-        <tr id='pt15.9' class='hiddenRow bg-success'>
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1647,7 +1776,7 @@
     
     
     
-        <tr id='pt15.10' class='hiddenRow bg-success'>
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1656,7 +1785,7 @@
     
     
     
-        <tr id='pt15.11' class='hiddenRow bg-success'>
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1665,7 +1794,7 @@
     
     
     
-        <tr id='pt15.12' class='hiddenRow bg-success'>
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1674,7 +1803,7 @@
     
     
     
-        <tr id='pt15.13' class='hiddenRow bg-success'>
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1683,7 +1812,7 @@
     
     
     
-        <tr id='pt15.14' class='hiddenRow bg-success'>
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1692,7 +1821,7 @@
     
     
     
-        <tr id='pt15.15' class='hiddenRow bg-success'>
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1701,7 +1830,7 @@
     
     
     
-        <tr id='pt15.16' class='hiddenRow bg-success'>
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1710,7 +1839,7 @@
     
     
     
-        <tr id='pt15.17' class='hiddenRow bg-success'>
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1719,7 +1848,7 @@
     
     
     
-        <tr id='pt15.18' class='hiddenRow bg-success'>
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1728,7 +1857,7 @@
     
     
     
-        <tr id='pt15.19' class='hiddenRow bg-success'>
+        <tr id='pt16.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1737,75 +1866,35 @@
     
     
     
-        <tr id="ft15.20" class="none bg-danger">
+        <tr id='pt16.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft15.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 940, in test_watch_metadata
-    self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=0ec12ad1-d1a5-4308-8d9b-da739ee472a2&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft16.1" class="none bg-danger">
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
-    self.assertEqual(30, len(results))
-AssertionError: 30 != 35</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1819,13 +1908,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 3)">Detail</a>
+            <a onclick="showClassDetail('c18', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1834,7 +1923,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1843,7 +1932,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1861,13 +1950,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 7)">Detail</a>
+            <a onclick="showClassDetail('c19', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1876,7 +1965,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1885,7 +1974,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1894,7 +1983,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1903,7 +1992,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1912,7 +2001,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -1921,7 +2010,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -1939,13 +2028,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1963,13 +2052,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 2)">Detail</a>
+            <a onclick="showClassDetail('c21', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1978,7 +2067,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -1996,13 +2085,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2011,19 +2100,19 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id="st21.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st21.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st21.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.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_st21.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2037,7 +2126,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2055,13 +2144,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2079,13 +2168,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2094,7 +2183,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2103,7 +2192,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2113,21 +2202,21 @@ AssertionError: 30 != 35</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">10</td>
-        <td class="text-center">1</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('c24', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2136,7 +2225,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2145,7 +2234,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2154,7 +2243,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2163,7 +2252,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2172,7 +2261,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2181,7 +2270,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2190,7 +2279,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2199,36 +2288,16 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id="ft24.9" class="none bg-danger">
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft24.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
-    self.assertEqual(1, len(data), data)
-AssertionError: 1 != 0 : []</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt24.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2237,7 +2306,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt24.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2255,13 +2324,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 5)">Detail</a>
+            <a onclick="showClassDetail('c26', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2270,7 +2339,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2279,7 +2348,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2288,7 +2357,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2297,7 +2366,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2315,13 +2384,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2330,7 +2399,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2339,7 +2408,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2348,7 +2417,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2357,7 +2426,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2366,7 +2435,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2375,7 +2444,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2384,7 +2453,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2393,7 +2462,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2402,7 +2471,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2411,7 +2480,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2420,7 +2489,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2429,7 +2498,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2447,13 +2516,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 8)">Detail</a>
+            <a onclick="showClassDetail('c28', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2462,7 +2531,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2471,7 +2540,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2480,7 +2549,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2489,7 +2558,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2498,7 +2567,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2507,7 +2576,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2516,7 +2585,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2534,13 +2603,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2549,7 +2618,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2558,7 +2627,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2567,7 +2636,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2576,19 +2645,19 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="st28.5" class="none bg-warning">
+        <tr id="st29.5" 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_st28.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st28.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st28.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2602,7 +2671,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2611,7 +2680,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2620,7 +2689,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2629,7 +2698,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2647,13 +2716,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2662,7 +2731,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2671,7 +2740,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2680,7 +2749,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2689,7 +2758,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2698,7 +2767,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2707,7 +2776,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2716,7 +2785,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2725,7 +2794,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2734,7 +2803,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2743,7 +2812,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2752,7 +2821,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2761,7 +2830,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2770,7 +2839,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2779,7 +2848,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2797,13 +2866,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2812,7 +2881,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2830,13 +2899,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2845,7 +2914,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2863,13 +2932,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2878,7 +2947,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2887,7 +2956,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2896,7 +2965,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2905,7 +2974,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2914,7 +2983,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2923,7 +2992,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2932,7 +3001,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2941,7 +3010,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2950,7 +3019,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2959,7 +3028,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2968,7 +3037,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2977,7 +3046,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2986,7 +3055,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2995,7 +3064,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3004,7 +3073,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3013,7 +3082,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3022,7 +3091,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3031,7 +3100,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3040,7 +3109,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3049,7 +3118,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3058,7 +3127,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3067,7 +3136,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3085,13 +3154,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3109,13 +3178,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 5)">Detail</a>
+            <a onclick="showClassDetail('c35', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3124,7 +3193,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3133,7 +3202,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3142,7 +3211,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3151,7 +3220,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3169,13 +3238,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c36', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3193,13 +3262,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 8)">Detail</a>
+            <a onclick="showClassDetail('c37', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3208,7 +3277,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3217,7 +3286,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3226,7 +3295,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3235,7 +3304,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3244,7 +3313,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3253,7 +3322,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.7' class='hiddenRow bg-success'>
+        <tr id='pt37.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3262,7 +3331,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3280,13 +3349,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 3)">Detail</a>
+            <a onclick="showClassDetail('c38', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3295,7 +3364,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3304,7 +3373,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3322,13 +3391,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 16)">Detail</a>
+            <a onclick="showClassDetail('c39', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3337,7 +3406,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3346,7 +3415,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3355,7 +3424,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3364,7 +3433,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3373,7 +3442,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3382,7 +3451,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3391,7 +3460,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3400,7 +3469,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.9' class='hiddenRow bg-success'>
+        <tr id='pt39.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3409,7 +3478,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.10' class='hiddenRow bg-success'>
+        <tr id='pt39.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3418,7 +3487,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.11' class='hiddenRow bg-success'>
+        <tr id='pt39.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3427,7 +3496,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.12' class='hiddenRow bg-success'>
+        <tr id='pt39.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3436,7 +3505,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.13' class='hiddenRow bg-success'>
+        <tr id='pt39.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3445,19 +3514,19 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="st38.14" class="none bg-warning">
+        <tr id="st39.14" 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_st38.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st39.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st38.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st39.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_st38.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st39.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3471,7 +3540,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.15' class='hiddenRow bg-success'>
+        <tr id='pt39.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3480,7 +3549,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.16' class='hiddenRow bg-success'>
+        <tr id='pt39.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3498,13 +3567,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 9)">Detail</a>
+            <a onclick="showClassDetail('c40', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3513,7 +3582,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3522,7 +3591,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3531,7 +3600,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3540,7 +3609,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3549,7 +3618,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3558,19 +3627,19 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="st39.7" class="none bg-warning">
+        <tr id="st40.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_st39.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st39.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.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_st39.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3584,7 +3653,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3593,7 +3662,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3611,13 +3680,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 2)">Detail</a>
+            <a onclick="showClassDetail('c41', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3626,7 +3695,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3644,13 +3713,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 18)">Detail</a>
+            <a onclick="showClassDetail('c42', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3659,7 +3728,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3668,7 +3737,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3677,7 +3746,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3686,7 +3755,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3695,7 +3764,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3704,7 +3773,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3713,7 +3782,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3722,7 +3791,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3731,7 +3800,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3740,7 +3809,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3749,7 +3818,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3758,7 +3827,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3767,7 +3836,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3776,7 +3845,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3785,7 +3854,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3794,7 +3863,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3803,7 +3872,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3821,13 +3890,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 1)">Detail</a>
+            <a onclick="showClassDetail('c43', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3845,13 +3914,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 21)">Detail</a>
+            <a onclick="showClassDetail('c44', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3860,7 +3929,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3869,7 +3938,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3878,7 +3947,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3887,7 +3956,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3896,7 +3965,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3905,7 +3974,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3914,7 +3983,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3923,7 +3992,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3932,7 +4001,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3941,7 +4010,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3950,7 +4019,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3959,7 +4028,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3968,7 +4037,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3977,7 +4046,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3986,7 +4055,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3995,7 +4064,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4004,7 +4073,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4013,7 +4082,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.19' class='hiddenRow bg-success'>
+        <tr id='pt44.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4022,7 +4091,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.20' class='hiddenRow bg-success'>
+        <tr id='pt44.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4031,7 +4100,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.21' class='hiddenRow bg-success'>
+        <tr id='pt44.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4049,13 +4118,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 34)">Detail</a>
+            <a onclick="showClassDetail('c45', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4064,7 +4133,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4073,7 +4142,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4082,7 +4151,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4091,7 +4160,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4100,7 +4169,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4109,7 +4178,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4118,7 +4187,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4127,7 +4196,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4136,7 +4205,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4145,7 +4214,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4154,7 +4223,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4163,7 +4232,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4172,7 +4241,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4181,7 +4250,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4190,7 +4259,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4199,7 +4268,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4208,7 +4277,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4217,7 +4286,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.19' class='hiddenRow bg-success'>
+        <tr id='pt45.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4226,7 +4295,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.20' class='hiddenRow bg-success'>
+        <tr id='pt45.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4235,7 +4304,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.21' class='hiddenRow bg-success'>
+        <tr id='pt45.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4244,7 +4313,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.22' class='hiddenRow bg-success'>
+        <tr id='pt45.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4253,7 +4322,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.23' class='hiddenRow bg-success'>
+        <tr id='pt45.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4262,7 +4331,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.24' class='hiddenRow bg-success'>
+        <tr id='pt45.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4271,7 +4340,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.25' class='hiddenRow bg-success'>
+        <tr id='pt45.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4280,7 +4349,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.26' class='hiddenRow bg-success'>
+        <tr id='pt45.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4289,7 +4358,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.27' class='hiddenRow bg-success'>
+        <tr id='pt45.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4298,7 +4367,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.28' class='hiddenRow bg-success'>
+        <tr id='pt45.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4307,7 +4376,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.29' class='hiddenRow bg-success'>
+        <tr id='pt45.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4316,7 +4385,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.30' class='hiddenRow bg-success'>
+        <tr id='pt45.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4325,7 +4394,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.31' class='hiddenRow bg-success'>
+        <tr id='pt45.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4334,7 +4403,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.32' class='hiddenRow bg-success'>
+        <tr id='pt45.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4343,7 +4412,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.33' class='hiddenRow bg-success'>
+        <tr id='pt45.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4352,7 +4421,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.34' class='hiddenRow bg-success'>
+        <tr id='pt45.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4370,13 +4439,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 16)">Detail</a>
+            <a onclick="showClassDetail('c46', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4385,7 +4454,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4394,7 +4463,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4403,7 +4472,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4412,7 +4481,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4421,7 +4490,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4430,7 +4499,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4439,7 +4508,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4448,7 +4517,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4457,7 +4526,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4466,7 +4535,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4475,7 +4544,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4484,7 +4553,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4493,7 +4562,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4502,7 +4571,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4511,7 +4580,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4522,11 +4591,11 @@ AssertionError: 1 != 0 : []</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>398</td>
-        <td>388</td>
+        <td>404</td>
+        <td>393</td>
         <td>3</td>
         <td>0</td>
-        <td>7</td>
+        <td>8</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4786,6 +4855,36 @@ AssertionError: 1 != 0 : []</pre>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
+            <tr>
+              <th>google-api-python-client</th>
+              <td>2.36.0</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.20.2</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive2</th>
+              <td>1.10.0</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>6.0</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
             <tr>
               <th>beautifulsoup4</th>
               <td>4.10.0</td>
@@ -4926,7 +5025,7 @@ AssertionError: 1 != 0 : []</pre>
 </div>
 
 <script>
-    drawCircle(388, 3, 0, 7);
+    drawCircle(393, 3, 0, 8);
     showCase(5);
 </script>
 

From e0bf829def15ecd0e9f549e89ae0c0457b5852e4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 1 Feb 2022 20:19:14 +0100
Subject: [PATCH 152/412] Bugfix parsing /Keywords' in doc_info of pdf file
 with type bytes (fixes #2302)

---
 cps/uploader.py           | 5 ++++-
 optional-requirements.txt | 2 +-
 setup.cfg                 | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cps/uploader.py b/cps/uploader.py
index f238b89df..992d188c1 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -233,7 +233,10 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         if subject == '':
             subject = doc_info.subject
         if tags == '' and '/Keywords' in doc_info:
-            tags = doc_info['/Keywords']
+            if isinstance(doc_info['/Keywords'], bytes):
+                tags = doc_info['/Keywords'].decode('utf-8')
+            else:
+                tags = doc_info['/Keywords']
     else:
         title = original_file_name
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 2ebcf1a78..f894fcc13 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -33,7 +33,7 @@ rarfile>=2.7
 scholarly>=1.2.0,<1.6
 
 # Comics
-natsort>=2.2.0,<8.1.0
+natsort>=2.2.0,<8.2.0
 comicapi>=2.2.0,<2.3.0
 
 # Kobo integration
diff --git a/setup.cfg b/setup.cfg
index db2fd3e6c..d17642dd6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -87,7 +87,7 @@ metadata =
 	rarfile>=2.7
 	scholarly>=1.2.0,<1.6
 comics = 
-	natsort>=2.2.0,<8.1.0
+	natsort>=2.2.0,<8.2.0
 	comicapi>=2.2.0,<2.3.0
 kobo = 
 	jsonschema>=3.2.0,<4.5.0

From 1ce45f325397cf0cdc2bd6206e4bd7c15e481968 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 2 Feb 2022 17:42:48 +0100
Subject: [PATCH 153/412] Update teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 128 ++++++++++--------------
 1 file changed, 54 insertions(+), 74 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 742ae9fb0..bd12238ca 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-31 21:25:49</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-01 20:32:05</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>2022-02-01 01:40:44</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-02 00:57:41</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>3h 28 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 39 min</p>
         </div>
       </div>
       </div>
@@ -1354,10 +1354,10 @@
     <tr id="su" class="failClass">
         <td>TestEditAuthorsGdrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">2</td>
-        <td class="text-center">3</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</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('c13', 6)">Detail</a>
         </td>
@@ -1365,31 +1365,11 @@
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 294, in test_change_capital_co_author
-    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;f777605d-a838-445b-bae2-e6d59822f1fa&#34;)&gt; is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1412,55 +1392,44 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
     
     
-        <tr id="ft13.4" class="none bg-danger">
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 346, in test_change_capital_rename_co_author
-    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;4fcb7fb8-c3e4-4e04-8fb3-6d99d9999b74&#34;)&gt; is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft13.5" class="none bg-danger">
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft13.6" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.5')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft13.5" class="popup_window test_output" style="display:block;">
+                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.5').style.display='none'"><span
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 461, in test_change_capital_rename_two_co_authors
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 562, in test_rename_capital_on_upload
     self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;e4d4c44d-e87d-495b-abc6-f8a5100f2098&#34;)&gt; is not false</pre>
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;34a2afba-2e3f-4f75-bc09-67899f2ccfba&#34;, element=&#34;08372364-79c8-4996-97da-de74437e794d&#34;)&gt; is not false</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1469,15 +1438,6 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
         </tr>
     
     
-    
-        <tr id='st13.6' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
-            </td>
-            <td colspan='6' align='center'>SKIP</td>
-        </tr>
-    
-    
 
 
     <tr id="su" class="passClass">
@@ -1657,11 +1617,11 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1671,11 +1631,31 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id="ft15.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4592,10 +4572,10 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>404</td>
-        <td>393</td>
-        <td>3</td>
+        <td>395</td>
+        <td>2</td>
         <td>0</td>
-        <td>8</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4623,7 +4603,7 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-27-generic #29~20.04.1-Ubuntu SMP Fri Jan 14 00:32:30 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-28-generic #31~20.04.1-Ubuntu SMP Wed Jan 19 14:08:10 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -5025,7 +5005,7 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
 </div>
 
 <script>
-    drawCircle(393, 3, 0, 8);
+    drawCircle(395, 2, 0, 7);
     showCase(5);
 </script>
 

From 26a8ac1425e6c892f7686589e29bb4142c0338da Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 09:06:14 +0100
Subject: [PATCH 154/412] Mass rename author before last stage

---
 cps/editbooks.py          |  24 ++++---
 cps/gdriveutils.py        |  46 +++----------
 cps/helper.py             | 136 +++++++++++++++++++++-----------------
 optional-requirements.txt |   2 +-
 4 files changed, 103 insertions(+), 105 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 215617666..16e295358 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -82,7 +82,6 @@ def search_objects_remove(db_book_object, db_type, input_elements):
             type_elements = c_elements.name
         for inp_element in input_elements:
             if inp_element.lower() == type_elements.lower():
-                # if inp_element == type_elements:
                 found = True
                 break
         # if the element was not found in the new list, add it to remove list
@@ -132,7 +131,6 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
         # check if a element with that name exists
         db_element = db_session.query(db_object).filter(db_filter == add_element).first()
         # if no element is found add it
-        # if new_element is None:
         if db_type == 'author':
             new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ',')), "")
         elif db_type == 'series':
@@ -1067,12 +1065,22 @@ def upload():
                 book_id = db_book.id
                 title = db_book.title
                 # ToDo this currently doesn't work -> integrate in update_dir_structure_gdrive
-                error = helper.update_dir_structure_file(book_id,
-                                                   config.config_calibre_dir,
-                                                   input_authors[0],
-                                                   meta.file_path,
-                                                   title_dir + meta.extension.lower(),
-                                                   renamed_author=renamed_authors)
+                if config.config_use_google_drive:
+                    file_name = helper.get_valid_filename(title, chars=42) + \
+                                ' - ' + helper.get_valid_filename(input_authors[0], chars=42) +\
+                                meta.extension.lower()
+
+                    gdrive_path = os.path.join(helper.get_valid_filename(input_authors[0], chars=96),
+                                               title_dir + " (" + str(book_id) + ")",
+                                               file_name)
+                    gdriveutils.uploadFileToEbooksFolder(gdrive_path.replace("\\", "/"), meta.file_path)
+                else:
+                    error = helper.update_dir_structure(book_id,
+                                                        config.config_calibre_dir,
+                                                        input_authors[0],
+                                                        meta.file_path,
+                                                        title_dir + meta.extension.lower(),
+                                                        renamed_author=renamed_authors)
 
                 move_coverfile(meta, db_book)
 
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index de3fbb64d..eae175a04 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -35,10 +35,10 @@ except ImportError:
 from sqlalchemy.exc import OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import text
 
-try:
-    from six import __version__ as six_version
-except ImportError:
-    six_version = "not installed"
+#try:
+#    from six import __version__ as six_version
+#except ImportError:
+#    six_version = "not installed"
 try:
     from httplib2 import __version__ as httplib2_version
 except ImportError:
@@ -355,30 +355,6 @@ def downloadFile(path, filename, output):
     f = getFileFromEbooksFolder(path, filename)
     f.GetContentFile(output)
 
-'''def renameGdriveFolderRemote(origin_file, target_folder):
-    drive = getDrive(Gdrive.Instance().drive)
-    previous_parents = ",".join([parent["id"] for parent in origin_file.get('parents')])
-    children = drive.auth.service.children().list(folderId=previous_parents).execute()
-    gFileTargetDir = getFileFromEbooksFolder(None, target_folder)
-    if not gFileTargetDir or gFileTargetDir['title'] != target_folder:
-        # Folder is not existing, rename folder
-        drive.auth.service.files().patch(fileId=origin_file['id'],
-                                         body={'title': target_folder},
-                                         fields='title').execute()
-        # gFileTargetDir = drive.CreateFile(
-        #    {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
-        #     "mimeType": "application/vnd.google-apps.folder"})
-        # gFileTargetDir.Upload()
-    else:
-        # Move the file to the new folder
-        drive.auth.service.files().update(fileId=origin_file['id'],
-                                          addParents=gFileTargetDir['id'],
-                                          removeParents=previous_parents,
-                                          fields='id, parents').execute()
-    # if previous_parents has no children anymore, delete original fileparent
-    if len(children['items']) == 1:
-        deleteDatabaseEntry(previous_parents)
-        drive.auth.service.files().delete(fileId=previous_parents).execute()'''
 
 def moveGdriveFolderRemote(origin_file, target_folder):
     drive = getDrive(Gdrive.Instance().drive)
@@ -454,24 +430,24 @@ def uploadFileToEbooksFolder(destFile, f):
     splitDir = destFile.split('/')
     for i, x in enumerate(splitDir):
         if i == len(splitDir)-1:
-            existingFiles = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
+            existing_Files = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
                                                  (x.replace("'", r"\'"), parent['id'])}).GetList()
-            if len(existingFiles) > 0:
-                driveFile = existingFiles[0]
+            if len(existing_Files) > 0:
+                driveFile = existing_Files[0]
             else:
                 driveFile = drive.CreateFile({'title': x,
                                               'parents': [{"kind": "drive#fileLink", 'id': parent['id']}], })
             driveFile.SetContentFile(f)
             driveFile.Upload()
         else:
-            existingFolder = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
+            existing_Folder = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
                                                   (x.replace("'", r"\'"), parent['id'])}).GetList()
-            if len(existingFolder) == 0:
+            if len(existing_Folder) == 0:
                 parent = drive.CreateFile({'title': x, 'parents': [{"kind": "drive#fileLink", 'id': parent['id']}],
                     "mimeType": "application/vnd.google-apps.folder"})
                 parent.Upload()
             else:
-                parent = existingFolder[0]
+                parent = existing_Folder[0]
 
 
 def watchChange(drive, channel_id, channel_type, channel_address,
@@ -713,5 +689,5 @@ def get_error_text(client_secrets=None):
 
 
 def get_versions():
-    return {'six': six_version,
+    return { # 'six': six_version,
             'httplib2': httplib2_version}
diff --git a/cps/helper.py b/cps/helper.py
index 26cca79c3..ac5386654 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -369,13 +369,13 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
 
 
 # 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, renamed_author):
+def update_dir_structure_file(book_id, calibre_path, first_author, original_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
     localbook = calibre_db.get_book(book_id)
-    if orignal_filepath:
-        path = orignal_filepath
+    if original_filepath:
+        path = original_filepath
     else:
-        path = os.path.join(calibrepath, localbook.path)
+        path = os.path.join(calibre_path, localbook.path)
 
     # Create (current) authordir and titledir from database
     authordir = localbook.path.split('/')[0]
@@ -389,10 +389,10 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
             old_author_dir = get_valid_filename(r, chars=96)
             new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
-            if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
+            if os.path.isdir(os.path.join(calibre_path, old_author_dir)):
                 try:
-                    old_author_path = os.path.join(calibrepath, old_author_dir)
-                    new_author_path = os.path.join(calibrepath, new_author_rename_dir)
+                    old_author_path = os.path.join(calibre_path, old_author_dir)
+                    new_author_path = os.path.join(calibre_path, new_author_rename_dir)
                     shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
                 except (OSError) as ex:
                     log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
@@ -400,48 +400,72 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                     return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                              src=old_author_path, dest=new_author_path, error=str(ex))
         if first_author.lower() in [r.lower() for r in renamed_author]:
-            if os.path.isdir(os.path.join(calibrepath, new_authordir)):
-                path = os.path.join(calibrepath, new_authordir, titledir)
+            if os.path.isdir(os.path.join(calibre_path, new_authordir)):
+                path = os.path.join(calibre_path, new_authordir, titledir)
     else:
         new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
     new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
 
-    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, chars=96) + ' - ' + new_authordir
-        try:
-            if orignal_filepath:
-                if not os.path.isdir(new_path):
-                    os.makedirs(new_path)
-                shutil.move(os.path.normcase(orignal_filepath), os.path.normcase(os.path.join(new_path, db_filename)))
-                log.debug("Moving title: %s to %s/%s", orignal_filepath, new_path, new_name)
-            else:
-                # Check new path is not valid path
-                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)))
-            # 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_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_path, error=str(ex))
+    if titledir != new_titledir or authordir != new_authordir or original_filepath:
+        error = move_files_on_change(calibre_path,
+                                     new_authordir,
+                                     new_titledir,
+                                     localbook,
+                                     db_filename,
+                                     original_filepath,
+                                     path)
+        if error:
+            return error
 
     # Rename all files from old names to new names
+    return rename_files_on_change(first_author, renamed_author, localbook, original_filepath, path, calibre_path)
+
+
+def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, db_filename, original_filepath, path):
+    new_path = os.path.join(calibre_path, new_authordir, new_titledir)
+    new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_authordir
     try:
-        clean_author_database(renamed_author, calibrepath)
+        if original_filepath:
+            if not os.path.isdir(new_path):
+                os.makedirs(new_path)
+            shutil.move(os.path.normcase(original_filepath), os.path.normcase(os.path.join(new_path, db_filename)))
+            log.debug("Moving title: %s to %s/%s", original_filepath, new_path, new_name)
+        else:
+            # Check new path is not valid path
+            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)))
+        # 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_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_path, error=str(ex))
+    return False
+
+
+def rename_files_on_change(first_author,
+                           renamed_author,
+                           localbook,
+                           orignal_filepath="",
+                           path="",
+                           calibre_path="",
+                           gdrive=False):
+    # Rename all files from old names to new names
+    try:
+        clean_author_database(renamed_author, calibre_path, gdrive)
         if first_author and first_author not in renamed_author:
-            clean_author_database([first_author], calibrepath, localbook)
-        if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+            clean_author_database([first_author], calibre_path, localbook, gdrive)
+        if not gdrive and not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
             shutil.rmtree(os.path.dirname(path))
     except (OSError, FileNotFoundError) as ex:
         log.error("Error in rename file in path %s", ex)
@@ -449,6 +473,7 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
         return _("Error in rename file in path: %(error)s", error=str(ex))
     return False
 
+
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     error = False
     book = calibre_db.get_book(book_id)
@@ -457,16 +482,12 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     if first_author:
         new_authordir = get_valid_filename(first_author, chars=96)
         for r in renamed_author:
-            # Todo: Rename all authors on gdrive
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
             old_author_dir = get_valid_filename(r, chars=96)
             new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
             gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
             if gFile:
                 gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
-            # author is always co-author and has is never author, no folder is okay
-            #else:
-            #    error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
     else:
         new_authordir = get_valid_filename(book.authors[0].name, chars=96)
 
@@ -476,8 +497,7 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     if titledir != new_titledir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
         if gFile:
-            gFile['title'] = new_titledir
-            gFile.Upload()
+            gd.moveGdriveFileRemote(gFile, new_titledir)
             book.path = book.path.split('/')[0] + u'/' + new_titledir
             gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
         else:
@@ -494,15 +514,9 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
 
     # change location in database to new author/title path
     book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
-
-    # Rename all files from old names to new names
-    clean_author_database(renamed_author, "", gdrive=True)
-    if first_author not in renamed_author:
-        clean_author_database([first_author], "", book, gdrive=True)
-
+    error |= rename_files_on_change(first_author, renamed_author, book, gdrive=True)
     return error
 
-
 def delete_book_gdrive(book, book_format):
     error = None
     if book_format:
@@ -582,19 +596,19 @@ def valid_email(email):
 
 
 def update_dir_structure(book_id,
-                        calibrepath,
-                        first_author=None,
-                        orignal_filepath=None,
-                        db_filename=None,
-                        renamed_author=None):
+                         calibre_path,
+                         first_author=None,     # change author of book to this author
+                         original_filepath=None,
+                         db_filename=None,
+                         renamed_author=None):
     renamed_author = renamed_author or []
     if config.config_use_google_drive:
         return update_dir_structure_gdrive(book_id, first_author, renamed_author)
     else:
         return update_dir_structure_file(book_id,
-                                         calibrepath,
+                                         calibre_path,
                                          first_author,
-                                         orignal_filepath,
+                                         original_filepath,
                                          db_filename, renamed_author)
 
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 5de006fec..2370bc7e0 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -10,7 +10,7 @@ pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
 rsa>=3.4.2,<4.9.0
-six>=1.10.0,<1.17.0
+# six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0

From cfa6b405dabf6d28aa7996d2783e75618f6a31d8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 13:21:06 +0100
Subject: [PATCH 155/412] Upload files to gdrive with author rename working

---
 cps/editbooks.py |  21 ++++---
 cps/helper.py    | 144 ++++++++++++++++++++++++++---------------------
 2 files changed, 91 insertions(+), 74 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 16e295358..03cbc233a 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1027,9 +1027,10 @@ def move_coverfile(meta, db_book):
         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")
+    new_coverpath = os.path.join(config.config_calibre_dir, db_book.path)
     try:
-        copyfile(coverfile, new_coverpath)
+        os.makedirs(new_coverpath, exist_ok=True)
+        copyfile(coverfile, os.path.join(new_coverpath, "cover.jpg"))
         if meta.cover:
             os.unlink(meta.cover)
     except OSError as e:
@@ -1064,16 +1065,14 @@ def upload():
 
                 book_id = db_book.id
                 title = db_book.title
-                # ToDo this currently doesn't work -> integrate in update_dir_structure_gdrive
                 if config.config_use_google_drive:
-                    file_name = helper.get_valid_filename(title, chars=42) + \
-                                ' - ' + helper.get_valid_filename(input_authors[0], chars=42) +\
-                                meta.extension.lower()
-
-                    gdrive_path = os.path.join(helper.get_valid_filename(input_authors[0], chars=96),
-                                               title_dir + " (" + str(book_id) + ")",
-                                               file_name)
-                    gdriveutils.uploadFileToEbooksFolder(gdrive_path.replace("\\", "/"), meta.file_path)
+                    helper.upload_new_file_gdrive(book_id,
+                                                  input_authors[0],
+                                                  renamed_authors,
+                                                  title,
+                                                  title_dir,
+                                                  meta.file_path,
+                                                  meta.extension.lower())
                 else:
                     error = helper.update_dir_structure(book_id,
                                                         config.config_calibre_dir,
diff --git a/cps/helper.py b/cps/helper.py
index ac5386654..150fb85c1 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -331,7 +331,7 @@ def delete_book_file(book, calibrepath, book_format=None):
                    path=book.path)
 
 
-def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=None):
+def clean_author_database(renamed_author, calibre_path="", local_book=None, gdrive=None):
     valid_filename_authors = [get_valid_filename(r, chars=96) for r in renamed_author]
     for r in renamed_author:
         if local_book:
@@ -345,7 +345,7 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
                 new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
                 all_new_authordir = get_valid_filename(new_author.name, chars=96)
                 all_titledir = book.path.split('/')[1]
-                all_new_path = os.path.join(calibrepath, all_new_authordir, all_titledir)
+                all_new_path = os.path.join(calibre_path, all_new_authordir, all_titledir)
                 all_new_name = get_valid_filename(book.title, chars=42) + ' - ' \
                                + get_valid_filename(new_author.name, chars=42)
                 # change location in database to new author/title path
@@ -368,6 +368,34 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
                     file_format.name = all_new_name
 
 
+def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=None, gdrive=False):
+    # Create new_author_dir from parameter or from database
+    # Create new title_dir from database and add id
+    if first_author:
+        new_authordir = get_valid_filename(first_author, chars=96)
+        for r in renamed_author:
+            new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
+            old_author_dir = get_valid_filename(r, chars=96)
+            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
+            if gdrive:
+                gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
+                if gFile:
+                    gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
+            else:
+                if os.path.isdir(os.path.join(calibre_path, old_author_dir)):
+                    try:
+                        old_author_path = os.path.join(calibre_path, old_author_dir)
+                        new_author_path = os.path.join(calibre_path, new_author_rename_dir)
+                        shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
+                    except (OSError) as ex:
+                        log.error("Rename author from: %s to %s: %s", old_author_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=old_author_path, dest=new_author_path, error=str(ex))
+    else:
+        new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
+    return new_authordir
+
 # Moves files in file storage during author/title rename, or from temp dir to file storage
 def update_dir_structure_file(book_id, calibre_path, first_author, original_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
@@ -383,27 +411,12 @@ def update_dir_structure_file(book_id, calibre_path, first_author, original_file
 
     # Create new_authordir from parameter or from database
     # Create new titledir from database and add id
+    new_authordir = rename_all_authors(first_author, renamed_author, calibre_path, localbook)
     if first_author:
-        new_authordir = get_valid_filename(first_author, chars=96)
-        for r in renamed_author:
-            new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-            old_author_dir = get_valid_filename(r, chars=96)
-            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
-            if os.path.isdir(os.path.join(calibre_path, old_author_dir)):
-                try:
-                    old_author_path = os.path.join(calibre_path, old_author_dir)
-                    new_author_path = os.path.join(calibre_path, new_author_rename_dir)
-                    shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
-                except (OSError) as ex:
-                    log.error("Rename author from: %s to %s: %s", old_author_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=old_author_path, dest=new_author_path, error=str(ex))
         if first_author.lower() in [r.lower() for r in renamed_author]:
             if os.path.isdir(os.path.join(calibre_path, new_authordir)):
                 path = os.path.join(calibre_path, new_authordir, titledir)
-    else:
-        new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
+
     new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
 
     if titledir != new_titledir or authordir != new_authordir or original_filepath:
@@ -421,6 +434,54 @@ def update_dir_structure_file(book_id, calibre_path, first_author, original_file
     return rename_files_on_change(first_author, renamed_author, localbook, original_filepath, path, calibre_path)
 
 
+def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_dir, original_filepath, filename_ext):
+    error = False
+    book = calibre_db.get_book(book_id)
+    file_name = get_valid_filename(title, chars=42) + ' - ' + \
+                get_valid_filename(first_author, chars=42) + \
+                filename_ext
+    rename_all_authors(first_author, renamed_author, gdrive=True)
+    gdrive_path = os.path.join(get_valid_filename(first_author, chars=96),
+                               title_dir + " (" + str(book_id) + ")")
+    book.path = gdrive_path.replace("\\", "/")
+    gd.uploadFileToEbooksFolder(os.path.join(gdrive_path, file_name).replace("\\", "/"), original_filepath)
+    error |= rename_files_on_change(first_author, renamed_author, localbook=book, gdrive=True)
+    return error
+
+
+def update_dir_structure_gdrive(book_id, first_author, renamed_author):
+    error = False
+    book = calibre_db.get_book(book_id)
+
+    authordir = book.path.split('/')[0]
+    titledir = book.path.split('/')[1]
+    new_authordir = rename_all_authors(first_author, renamed_author, gdrive=True)
+    new_titledir = get_valid_filename(book.title, chars=96) + u" (" + str(book_id) + u")"
+
+    if titledir != new_titledir:
+        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
+        if gFile:
+            gd.moveGdriveFileRemote(gFile, new_titledir)
+            book.path = book.path.split('/')[0] + u'/' + new_titledir
+            gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
+        else:
+            error = _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
+
+    if authordir != new_authordir and authordir not in renamed_author:
+        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
+        if gFile:
+            gd.moveGdriveFolderRemote(gFile, new_authordir)
+            book.path = new_authordir + u'/' + book.path.split('/')[1]
+            gd.updateDatabaseOnEdit(gFile['id'], book.path)
+        else:
+            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
+
+    # change location in database to new author/title path
+    book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
+    error |= rename_files_on_change(first_author, renamed_author, book, gdrive=True)
+    return error
+
+
 def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, db_filename, original_filepath, path):
     new_path = os.path.join(calibre_path, new_authordir, new_titledir)
     new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_authordir
@@ -462,7 +523,7 @@ def rename_files_on_change(first_author,
                            gdrive=False):
     # Rename all files from old names to new names
     try:
-        clean_author_database(renamed_author, calibre_path, gdrive)
+        clean_author_database(renamed_author, calibre_path, gdrive=gdrive)
         if first_author and first_author not in renamed_author:
             clean_author_database([first_author], calibre_path, localbook, gdrive)
         if not gdrive and not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
@@ -474,49 +535,6 @@ def rename_files_on_change(first_author,
     return False
 
 
-def update_dir_structure_gdrive(book_id, first_author, renamed_author):
-    error = False
-    book = calibre_db.get_book(book_id)
-
-    authordir = book.path.split('/')[0]
-    if first_author:
-        new_authordir = get_valid_filename(first_author, chars=96)
-        for r in renamed_author:
-            new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-            old_author_dir = get_valid_filename(r, chars=96)
-            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
-            gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
-            if gFile:
-                gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
-    else:
-        new_authordir = get_valid_filename(book.authors[0].name, chars=96)
-
-    titledir = book.path.split('/')[1]
-    new_titledir = get_valid_filename(book.title, chars=96) + u" (" + str(book_id) + u")"
-
-    if titledir != new_titledir:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
-        if gFile:
-            gd.moveGdriveFileRemote(gFile, new_titledir)
-            book.path = book.path.split('/')[0] + u'/' + new_titledir
-            gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
-        else:
-            error = _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
-
-    if authordir != new_authordir and authordir not in renamed_author:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
-        if gFile:
-            gd.moveGdriveFolderRemote(gFile, new_authordir)
-            book.path = new_authordir + u'/' + book.path.split('/')[1]
-            gd.updateDatabaseOnEdit(gFile['id'], book.path)
-        else:
-            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
-
-    # change location in database to new author/title path
-    book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
-    error |= rename_files_on_change(first_author, renamed_author, book, gdrive=True)
-    return error
-
 def delete_book_gdrive(book, book_format):
     error = None
     if book_format:

From 7254ce6c812bc78ce36eeafdeac9dc5bd29ef66b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 15:11:50 +0100
Subject: [PATCH 156/412] Prevent delete of everything if database wasn't
 really changed

---
 cps/admin.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index c1931ea47..cfb27783c 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1208,15 +1208,16 @@ def _db_configuration_update_helper():
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
                                             gdrive_error)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
-        ub.session.query(ub.Downloads).delete()
-        ub.session.query(ub.ArchivedBook).delete()
-        ub.session.query(ub.ReadBook).delete()
-        ub.session.query(ub.BookShelf).delete()
-        ub.session.query(ub.Bookmark).delete()
-        ub.session.query(ub.KoboReadingState).delete()
-        ub.session.query(ub.KoboStatistics).delete()
-        ub.session.query(ub.KoboSyncedBooks).delete()
-        ub.session_commit()
+        if db_change:
+            ub.session.query(ub.Downloads).delete()
+            ub.session.query(ub.ArchivedBook).delete()
+            ub.session.query(ub.ReadBook).delete()
+            ub.session.query(ub.BookShelf).delete()
+            ub.session.query(ub.Bookmark).delete()
+            ub.session.query(ub.KoboReadingState).delete()
+            ub.session.query(ub.KoboStatistics).delete()
+            ub.session.query(ub.KoboSyncedBooks).delete()
+            ub.session_commit()
         _config_string(to_save, "config_calibre_dir")
         calibre_db.update_config(config)
         if not os.access(os.path.join(config.config_calibre_dir, "metadata.db"), os.W_OK):

From 5b3015619d8f63f47d0afc98ac7e75162070a6a0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 15:36:18 +0100
Subject: [PATCH 157/412] Save book read status on edit in books table

---
 cps/editbooks.py | 36 ++++++++++++++++++------------------
 cps/helper.py    | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 cps/web.py       | 47 +++++++----------------------------------------
 3 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 03cbc233a..4948c2dc3 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1151,24 +1151,24 @@ def table_get_custom_enum(c_id):
 def edit_list_book(param):
     vals = request.form.to_dict()
     book = calibre_db.get_book(vals['pk'])
-    ret = ""
-    if param =='series_index':
+    # ret = ""
+    if param == 'series_index':
         edit_book_series_index(vals['value'], book)
         ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
-    elif param =='tags':
+    elif param == 'tags':
         edit_book_tags(vals['value'], book)
         ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
                        mimetype='application/json')
-    elif param =='series':
+    elif param == 'series':
         edit_book_series(vals['value'], book)
         ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
                        mimetype='application/json')
-    elif param =='publishers':
+    elif param == 'publishers':
         edit_book_publisher(vals['value'], book)
-        ret =  Response(json.dumps({'success': True,
+        ret = Response(json.dumps({'success': True,
                                     'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
                        mimetype='application/json')
-    elif param =='languages':
+    elif param == 'languages':
         invalid = list()
         edit_book_languages(vals['value'], book, invalid=invalid)
         if invalid:
@@ -1179,9 +1179,9 @@ def edit_list_book(param):
             lang_names = list()
             for lang in book.languages:
                 lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
-            ret =  Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
+            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
                             mimetype='application/json')
-    elif param =='author_sort':
+    elif param == 'author_sort':
         book.author_sort = vals['value']
         ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
                        mimetype='application/json')
@@ -1191,27 +1191,27 @@ def edit_list_book(param):
         helper.update_dir_structure(book.id, config.config_calibre_dir)
         ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
                        mimetype='application/json')
-    elif param =='sort':
+    elif param == 'sort':
         book.sort = vals['value']
         ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
                        mimetype='application/json')
-    elif param =='comments':
+    elif param == 'comments':
         edit_book_comments(vals['value'], book)
         ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
                        mimetype='application/json')
-    elif param =='authors':
+    elif param == 'authors':
         input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
         helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
         ret = Response(json.dumps({'success': True,
                                    'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
                        mimetype='application/json')
-    elif param =='is_archived':
-        change_archived_books(book.id, vals['value']=="True")
+    elif param == 'is_archived':
+        change_archived_books(book.id, vals['value'] == "True")
         ret = ""
-    elif param =='read_status':
-        # ToDo save
-        ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
-                       mimetype='application/json')
+    elif param == 'read_status':
+        ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
+        if ret:
+            return ret, 400
     elif param.startswith("custom_column_"):
         new_val = dict()
         new_val[param] = vals['value']
diff --git a/cps/helper.py b/cps/helper.py
index 150fb85c1..b5495930b 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -35,6 +35,7 @@ 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.exc import InvalidRequestError, OperationalError
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash
 from markupsafe import escape
@@ -289,6 +290,53 @@ def get_sorted_author(value):
             value2 = value
     return value2
 
+def edit_book_read_status(book_id, read_status=None):
+    if not config.config_read_column:
+        book = ub.session.query(ub.ReadBook).filter(and_(ub.ReadBook.user_id == int(current_user.id),
+                                                         ub.ReadBook.book_id == book_id)).first()
+        if book:
+            if read_status is None:
+                if book.read_status == ub.ReadBook.STATUS_FINISHED:
+                    book.read_status = ub.ReadBook.STATUS_UNREAD
+                else:
+                    book.read_status = ub.ReadBook.STATUS_FINISHED
+            else:
+                book.read_status = ub.ReadBook.STATUS_FINISHED if read_status else ub.ReadBook.STATUS_UNREAD
+        else:
+            readBook = ub.ReadBook(user_id=current_user.id, book_id = book_id)
+            readBook.read_status = ub.ReadBook.STATUS_FINISHED
+            book = readBook
+        if not book.kobo_reading_state:
+            kobo_reading_state = ub.KoboReadingState(user_id=current_user.id, book_id=book_id)
+            kobo_reading_state.current_bookmark = ub.KoboBookmark()
+            kobo_reading_state.statistics = ub.KoboStatistics()
+            book.kobo_reading_state = kobo_reading_state
+        ub.session.merge(book)
+        ub.session_commit("Book {} readbit toggled".format(book_id))
+    else:
+        try:
+            calibre_db.update_title_sort(config)
+            book = calibre_db.get_filtered_book(book_id)
+            read_status = getattr(book, 'custom_column_' + str(config.config_read_column))
+            if len(read_status):
+                if read_status is None:
+                    read_status[0].value = not read_status[0].value
+                else:
+                    read_status[0].value = read_status is True
+                calibre_db.session.commit()
+            else:
+                cc_class = db.cc_classes[config.config_read_column]
+                new_cc = cc_class(value=read_status or 1, book=book_id)
+                calibre_db.session.add(new_cc)
+                calibre_db.session.commit()
+        except (KeyError, AttributeError):
+            log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
+            return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column)
+        except (OperationalError, InvalidRequestError) as e:
+            calibre_db.session.rollback()
+            log.error(u"Read status could not set: {}".format(e))
+            return "Read status could not set: {}".format(e), 400
+    return ""
 
 # Deletes a book fro the local filestorage, returns True if deleting is successfull, otherwise false
 def delete_book_file(book, calibrepath, book_format=None):
diff --git a/cps/web.py b/cps/web.py
index 018c00024..6d33f8097 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,7 +50,8 @@ from . import calibre_db, kobo_sync_status
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
 from .helper import check_valid_domain, render_task_status, check_email, check_username, \
     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, valid_email
+    send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email, \
+    edit_book_read_status
 from .pagination import Pagination
 from .redirect import redirect_back
 from .usermanagement import login_required_if_no_ano
@@ -154,46 +155,12 @@ def bookmark(book_id, book_format):
 @web.route("/ajax/toggleread/<int:book_id>", methods=['POST'])
 @login_required
 def toggle_read(book_id):
-    if not config.config_read_column:
-        book = ub.session.query(ub.ReadBook).filter(and_(ub.ReadBook.user_id == int(current_user.id),
-                                                         ub.ReadBook.book_id == book_id)).first()
-        if book:
-            if book.read_status == ub.ReadBook.STATUS_FINISHED:
-                book.read_status = ub.ReadBook.STATUS_UNREAD
-            else:
-                book.read_status = ub.ReadBook.STATUS_FINISHED
-        else:
-            readBook = ub.ReadBook(user_id=current_user.id, book_id = book_id)
-            readBook.read_status = ub.ReadBook.STATUS_FINISHED
-            book = readBook
-        if not book.kobo_reading_state:
-            kobo_reading_state = ub.KoboReadingState(user_id=current_user.id, book_id=book_id)
-            kobo_reading_state.current_bookmark = ub.KoboBookmark()
-            kobo_reading_state.statistics = ub.KoboStatistics()
-            book.kobo_reading_state = kobo_reading_state
-        ub.session.merge(book)
-        ub.session_commit("Book {} readbit toggled".format(book_id))
+    message = edit_book_read_status(book_id)
+    if message:
+        return message, 400
     else:
-        try:
-            calibre_db.update_title_sort(config)
-            book = calibre_db.get_filtered_book(book_id)
-            read_status = getattr(book, 'custom_column_' + str(config.config_read_column))
-            if len(read_status):
-                read_status[0].value = not read_status[0].value
-                calibre_db.session.commit()
-            else:
-                cc_class = db.cc_classes[config.config_read_column]
-                new_cc = cc_class(value=1, book=book_id)
-                calibre_db.session.add(new_cc)
-                calibre_db.session.commit()
-        except (KeyError, AttributeError):
-            log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
-            return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column), 400
-        except (OperationalError, InvalidRequestError) as e:
-            calibre_db.session.rollback()
-            log.error(u"Read status could not set: {}".format(e))
-            return "Read status could not set: {}".format(e), 400
-    return ""
+        return message
+
 
 @web.route("/ajax/togglearchived/<int:book_id>", methods=['POST'])
 @login_required

From 0ce41aef56c718e37114ba1ece97c1ab5bed2267 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 19:05:14 +0100
Subject: [PATCH 158/412] Detect missing database file also in gdrive mode

---
 cps/config_sql.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index ebc4ca240..5b94fc020 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -304,9 +304,8 @@ class _ConfigSQL(object):
 
         have_metadata_db = bool(self.config_calibre_dir)
         if have_metadata_db:
-            if not self.config_use_google_drive:
-                db_file = os.path.join(self.config_calibre_dir, 'metadata.db')
-                have_metadata_db = os.path.isfile(db_file)
+            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().lower() for x in self.config_upload_formats.split(',')]
         if os.environ.get('FLASK_DEBUG'):

From 89877835b30df88953e60f167112eaff53284312 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 19:05:26 +0100
Subject: [PATCH 159/412] Detect missing database file also in gdrive mode

---
 cps/config_sql.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index ebc4ca240..5b94fc020 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -304,9 +304,8 @@ class _ConfigSQL(object):
 
         have_metadata_db = bool(self.config_calibre_dir)
         if have_metadata_db:
-            if not self.config_use_google_drive:
-                db_file = os.path.join(self.config_calibre_dir, 'metadata.db')
-                have_metadata_db = os.path.isfile(db_file)
+            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().lower() for x in self.config_upload_formats.split(',')]
         if os.environ.get('FLASK_DEBUG'):

From 895f68033f3849c34328bc523f1f9812c4171b93 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 14:22:55 +0100
Subject: [PATCH 160/412] Improved detection of changed database

---
 cps/MyLoginManager.py                   |    5 +-
 cps/__init__.py                         |    2 +-
 cps/admin.py                            |   11 +-
 cps/config_sql.py                       |   24 +-
 cps/db.py                               |   22 +-
 cps/gdriveutils.py                      |    3 +-
 cps/kobo_sync_status.py                 |    2 +-
 cps/tasks/convert.py                    |    4 +-
 cps/ub.py                               |  123 +-
 test/Calibre-Web TestSummary_Linux.html | 1447 +++++++++++++++++++++--
 10 files changed, 1456 insertions(+), 187 deletions(-)

diff --git a/cps/MyLoginManager.py b/cps/MyLoginManager.py
index 7c916bd55..2f06be94b 100644
--- a/cps/MyLoginManager.py
+++ b/cps/MyLoginManager.py
@@ -27,8 +27,9 @@ from flask import session
 
 class MyLoginManager(LoginManager):
     def _session_protection_failed(self):
-        sess = session._get_current_object()
+        _session = session._get_current_object()
         ident = self._session_identifier_generator()
-        if(sess and not (len(sess) == 1 and sess.get('csrf_token', None))) and ident != sess.get('_id', None):
+        if(_session and not (len(_session) == 1
+                             and _session.get('csrf_token', None))) and ident != _session.get('_id', None):
             return super(). _session_protection_failed()
         return False
diff --git a/cps/__init__.py b/cps/__init__.py
index 2bfee12e4..2dfad699d 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -156,7 +156,7 @@ def create_app():
         services.goodreads_support.connect(config.config_goodreads_api_key,
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
-
+    config.store_calibre_uuid(calibre_db, db.Library_Id)
     return app
 
 @babel.localeselector
diff --git a/cps/admin.py b/cps/admin.py
index 71186b516..4876d421b 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1192,8 +1192,10 @@ def _db_simulate_change():
                                            '',
                                            param['config_calibre_dir'],
                                            flags=re.IGNORECASE).strip()
-    db_change = config.config_calibre_dir != to_save["config_calibre_dir"] and config.config_calibre_dir
-    db_valid = calibre_db.check_valid_db(to_save["config_calibre_dir"], ub.app_DB_path)
+    db_valid, db_change = calibre_db.check_valid_db(to_save["config_calibre_dir"],
+                                                    ub.app_DB_path,
+                                                    config.config_calibre_uuid)
+    db_change = bool(db_change and config.config_calibre_dir)
     return db_change, db_valid
 
 
@@ -1223,12 +1225,15 @@ def _db_configuration_update_helper():
     except Exception as ex:
         return _db_configuration_result('{}'.format(ex), gdrive_error)
 
-    if db_change or not db_valid or not config.db_configured:
+    if db_change or not db_valid or not config.db_configured \
+          or config.config_calibre_dir != to_save["config_calibre_dir"]:
         if not calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path):
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
                                             gdrive_error)
+        config.store_calibre_uuid(calibre_db, db.Library_Id)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         if db_change:
+            log.info("Calibre Database changed, delete all Calibre-Web info related to old Database")
             ub.session.query(ub.Downloads).delete()
             ub.session.query(ub.ArchivedBook).delete()
             ub.session.query(ub.ReadBook).delete()
diff --git a/cps/config_sql.py b/cps/config_sql.py
index 5b94fc020..01523a010 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -62,6 +62,7 @@ class _Settings(_Base):
     mail_gmail_token = Column(JSON, default={})
 
     config_calibre_dir = Column(String)
+    config_calibre_uuid = Column(String)
     config_port = Column(Integer, default=constants.DEFAULT_PORT)
     config_external_port = Column(Integer, default=constants.DEFAULT_PORT)
     config_certfile = Column(String)
@@ -350,6 +351,14 @@ class _ConfigSQL(object):
         # self.config_calibre_dir = None
         self.save()
 
+    def store_calibre_uuid(self, calibre_db, Library_table):
+        try:
+            calibre_uuid = calibre_db.session.query(Library_table).one_or_none()
+            if self.config_calibre_uuid != calibre_uuid.uuid:
+                self.config_calibre_uuid = calibre_uuid.uuid
+                self.save()
+        except AttributeError:
+            pass
 
 def _migrate_table(session, orm_class):
     changed = False
@@ -438,19 +447,12 @@ def load_configuration(session):
         session.add(_Settings())
         session.commit()
     conf = _ConfigSQL(session)
-    # Migrate from global restrictions to user based restrictions
-    #if bool(conf.config_default_show & constants.MATURE_CONTENT) and conf.config_denied_tags == "":
-    #    conf.config_denied_tags = conf.config_mature_content_tags
-    #    conf.save()
-    #    session.query(ub.User).filter(ub.User.mature_content != True). \
-    #        update({"denied_tags": conf.config_mature_content_tags}, synchronize_session=False)
-    #    session.commit()
     return conf
 
-def get_flask_session_key(session):
-    flask_settings = session.query(_Flask_Settings).one_or_none()
+def get_flask_session_key(_session):
+    flask_settings = _session.query(_Flask_Settings).one_or_none()
     if flask_settings == None:
         flask_settings = _Flask_Settings(os.urandom(32))
-        session.add(flask_settings)
-        session.commit()
+        _session.add(flask_settings)
+        _session.commit()
     return flask_settings.flask_session_key
diff --git a/cps/db.py b/cps/db.py
index aa697ec60..a3b93d896 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -93,6 +93,12 @@ books_publishers_link = Table('books_publishers_link', Base.metadata,
                               )
 
 
+class Library_Id(Base):
+    __tablename__ = 'library_id'
+    id = Column(Integer, primary_key=True)
+    uuid = Column(String, nullable=False)
+
+
 class Identifiers(Base):
     __tablename__ = 'identifiers'
 
@@ -525,12 +531,12 @@ class CalibreDB():
         return cc_classes
 
     @classmethod
-    def check_valid_db(cls, config_calibre_dir, app_db_path):
+    def check_valid_db(cls, config_calibre_dir, app_db_path, config_calibre_uuid):
         if not config_calibre_dir:
-            return False
+            return False, False
         dbpath = os.path.join(config_calibre_dir, "metadata.db")
         if not os.path.exists(dbpath):
-            return False
+            return False, False
         try:
             check_engine = create_engine('sqlite://',
                           echo=False,
@@ -540,10 +546,16 @@ class CalibreDB():
             with check_engine.begin() as connection:
                 connection.execute(text("attach database '{}' as calibre;".format(dbpath)))
                 connection.execute(text("attach database '{}' as app_settings;".format(app_db_path)))
+                local_session = scoped_session(sessionmaker())
+                local_session.configure(bind=connection)
+                database_uuid = local_session().query(Library_Id).one_or_none()
+                # local_session.dispose()
+
             check_engine.connect()
+            db_change = config_calibre_uuid != database_uuid.uuid
         except Exception:
-            return False
-        return True
+            return False, False
+        return True, db_change
 
     @classmethod
     def update_config(cls, config):
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index eae175a04..57f272ff7 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -196,7 +196,8 @@ def migrate():
 if not os.path.exists(cli.gdpath):
     try:
         Base.metadata.create_all(engine)
-    except Exception:
+    except Exception as ex:
+        log.error("Error connect to database: {} - {}".format(cli.gdpath, ex))
         raise
 migrate()
 
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index 19679e594..7a2018612 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -47,7 +47,7 @@ def remove_synced_book(book_id, all=False, session=None):
         ub.session_commit()
     else:
         session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
-        ub.session_commit(sess=session)
+        ub.session_commit(_session=session)
 
 
 
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 596bf95c0..8fd544a85 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -31,7 +31,7 @@ from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
 from cps.kobo_sync_status import remove_synced_book
-from cps.ub import ini
+from cps.ub import init_db_thread
 
 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
@@ -148,7 +148,7 @@ class TaskConvert(CalibreTask):
                     local_db.session.merge(new_format)
                     local_db.session.commit()
                     if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
-                        ub_session = ini()
+                        ub_session = init_db_thread()
                         remove_synced_book(book_id, True, ub_session)
                         ub_session.close()
                 except SQLAlchemyError as e:
diff --git a/cps/ub.py b/cps/ub.py
index e52ce2013..786dc909b 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -37,6 +37,7 @@ except ImportError as e:
         from flask_dance.consumer.storage.sqla import OAuthConsumerMixin
         oauth_support = True
     except ImportError as e:
+        OAuthConsumerMixin = BaseException
         oauth_support = False
 from sqlalchemy import create_engine, exc, exists, event, text
 from sqlalchemy import Column, ForeignKey
@@ -510,7 +511,7 @@ class RemoteAuthToken(Base):
 
 
 # Add missing tables during migration of database
-def add_missing_tables(engine, session):
+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"):
@@ -527,26 +528,26 @@ def add_missing_tables(engine, session):
         Registration.__table__.create(bind=engine)
         with engine.connect() as conn:
             conn.execute("insert into registration (domain, allow) values('%.%',1)")
-        session.commit()
+        _session.commit()
 
 
 # migrate all settings missing in registration table
-def migrate_registration_table(engine, session):
+def migrate_registration_table(engine, _session):
     try:
-        session.query(exists().where(Registration.allow)).scalar()
-        session.commit()
+        _session.query(exists().where(Registration.allow)).scalar()
+        _session.commit()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
         with engine.connect() as conn:
             conn.execute("ALTER TABLE registration ADD column 'allow' INTEGER")
             conn.execute("update registration set 'allow' = 1")
-        session.commit()
+        _session.commit()
     try:
         # Handle table exists, but no content
-        cnt = session.query(Registration).count()
+        cnt = _session.query(Registration).count()
         if not cnt:
             with engine.connect() as conn:
                 conn.execute("insert into registration (domain, allow) values('%.%',1)")
-            session.commit()
+            _session.commit()
     except exc.OperationalError:  # Database is not writeable
         print('Settings database is not writeable. Exiting...')
         sys.exit(2)
@@ -564,9 +565,9 @@ def migrate_guest_password(engine):
         sys.exit(2)
 
 
-def migrate_shelfs(engine, session):
+def migrate_shelfs(engine, _session):
     try:
-        session.query(exists().where(Shelf.uuid)).scalar()
+        _session.query(exists().where(Shelf.uuid)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
             conn.execute("ALTER TABLE shelf ADD column 'uuid' STRING")
@@ -574,33 +575,33 @@ def migrate_shelfs(engine, session):
             conn.execute("ALTER TABLE shelf ADD column 'last_modified' DATETIME")
             conn.execute("ALTER TABLE book_shelf_link ADD column 'date_added' DATETIME")
             conn.execute("ALTER TABLE shelf ADD column 'kobo_sync' BOOLEAN DEFAULT false")
-        for shelf in session.query(Shelf).all():
+        for shelf in _session.query(Shelf).all():
             shelf.uuid = str(uuid.uuid4())
             shelf.created = datetime.datetime.now()
             shelf.last_modified = datetime.datetime.now()
-        for book_shelf in session.query(BookShelf).all():
+        for book_shelf in _session.query(BookShelf).all():
             book_shelf.date_added = datetime.datetime.now()
-        session.commit()
+        _session.commit()
 
     try:
-        session.query(exists().where(Shelf.kobo_sync)).scalar()
+        _session.query(exists().where(Shelf.kobo_sync)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
 
             conn.execute("ALTER TABLE shelf ADD column 'kobo_sync' BOOLEAN DEFAULT false")
-        session.commit()
+        _session.commit()
 
     try:
-        session.query(exists().where(BookShelf.order)).scalar()
+        _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()
+        _session.commit()
 
 
-def migrate_readBook(engine, session):
+def migrate_readBook(engine, _session):
     try:
-        session.query(exists().where(ReadBook.read_status)).scalar()
+        _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")
@@ -608,46 +609,46 @@ def migrate_readBook(engine, session):
             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()
+        _session.commit()
+    test = _session.query(ReadBook).filter(ReadBook.last_modified == None).all()
     for book in test:
         book.last_modified = datetime.datetime.utcnow()
-    session.commit()
+    _session.commit()
 
 
-def migrate_remoteAuthToken(engine, session):
+def migrate_remoteAuthToken(engine, _session):
     try:
-        session.query(exists().where(RemoteAuthToken.token_type)).scalar()
-        session.commit()
+        _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()
+        _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)
+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()
+        _session.query(exists().where(User.sidebar_view)).scalar()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
         with engine.connect() as conn:
             conn.execute("ALTER TABLE user ADD column `sidebar_view` Integer DEFAULT 1")
-        session.commit()
+        _session.commit()
         create = True
     try:
         if create:
             with engine.connect() as conn:
                 conn.execute("SELECT language_books FROM user")
-            session.commit()
+            _session.commit()
     except exc.OperationalError:
         with engine.connect() as conn:
             conn.execute("UPDATE user SET 'sidebar_view' = (random_books* :side_random + language_books * :side_lang "
@@ -657,32 +658,32 @@ def migrate_Database(session):
                       'side_series': constants.SIDEBAR_SERIES, 'side_category': constants.SIDEBAR_CATEGORY,
                       'side_hot': constants.SIDEBAR_HOT, 'side_autor': constants.SIDEBAR_AUTHOR,
                       'detail_random': constants.DETAIL_RANDOM})
-        session.commit()
+        _session.commit()
     try:
-        session.query(exists().where(User.denied_tags)).scalar()
+        _session.query(exists().where(User.denied_tags)).scalar()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
         with engine.connect() as conn:
             conn.execute("ALTER TABLE user ADD column `denied_tags` String DEFAULT ''")
             conn.execute("ALTER TABLE user ADD column `allowed_tags` String DEFAULT ''")
             conn.execute("ALTER TABLE user ADD column `denied_column_value` String DEFAULT ''")
             conn.execute("ALTER TABLE user ADD column `allowed_column_value` String DEFAULT ''")
-        session.commit()
+        _session.commit()
     try:
-        session.query(exists().where(User.view_settings)).scalar()
+        _session.query(exists().where(User.view_settings)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
             conn.execute("ALTER TABLE user ADD column `view_settings` VARCHAR(10) DEFAULT '{}'")
-        session.commit()
+        _session.commit()
     try:
-        session.query(exists().where(User.kobo_only_shelves_sync)).scalar()
+        _session.query(exists().where(User.kobo_only_shelves_sync)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
             conn.execute("ALTER TABLE user ADD column `kobo_only_shelves_sync` SMALLINT DEFAULT 0")
-        session.commit()
+        _session.commit()
 
     try:
         # check if name is in User table instead of nickname
-        session.query(exists().where(User.name)).scalar()
+        _session.query(exists().where(User.name)).scalar()
     except exc.OperationalError:
         # Create new table user_id and copy contents of table user into it
         with engine.connect() as conn:
@@ -712,20 +713,20 @@ def migrate_Database(session):
             # delete old user table and rename new user_id table to user:
             conn.execute(text("DROP TABLE user"))
             conn.execute(text("ALTER TABLE user_id RENAME TO user"))
-        session.commit()
-    if session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first() \
+        _session.commit()
+    if _session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first() \
        is None:
-        create_anonymous_user(session)
+        create_anonymous_user(_session)
 
     migrate_guest_password(engine)
 
 
-def clean_database(session):
+def clean_database(_session):
     # Remove expired remote login tokens
     now = datetime.datetime.now()
-    session.query(RemoteAuthToken).filter(now > RemoteAuthToken.expiration).\
+    _session.query(RemoteAuthToken).filter(now > RemoteAuthToken.expiration).\
         filter(RemoteAuthToken.token_type != 1).delete()
-    session.commit()
+    _session.commit()
 
 
 # Save downloaded books per user in calibre-web's own database
@@ -750,22 +751,22 @@ def delete_download(book_id):
         session.rollback()
 
 # Generate user Guest (translated text), as anonymous user, no rights
-def create_anonymous_user(session):
+def create_anonymous_user(_session):
     user = User()
     user.name = "Guest"
     user.email = 'no@email'
     user.role = constants.ROLE_ANONYMOUS
     user.password = ''
 
-    session.add(user)
+    _session.add(user)
     try:
-        session.commit()
+        _session.commit()
     except Exception:
-        session.rollback()
+        _session.rollback()
 
 
 # Generate User admin with admin123 password, and access to everything
-def create_admin_user(session):
+def create_admin_user(_session):
     user = User()
     user.name = "admin"
     user.role = constants.ADMIN_USER_ROLES
@@ -773,13 +774,13 @@ def create_admin_user(session):
 
     user.password = generate_password_hash(constants.DEFAULT_PASSWORD)
 
-    session.add(user)
+    _session.add(user)
     try:
-        session.commit()
+        _session.commit()
     except Exception:
-        session.rollback()
+        _session.rollback()
 
-def ini():
+def init_db_thread():
     global app_DB_path
     engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
 
@@ -844,8 +845,8 @@ def dispose():
             except Exception:
                 pass
 
-def session_commit(success=None, sess=None):
-    s = sess if sess else session
+def session_commit(success=None, _session=None):
+    s = _session if _session else session
     try:
         s.commit()
         if success:
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index bd12238ca..af8cfcd9a 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-01 20:32:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-05 20:19: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>2022-02-02 00:57:41</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-06 00:20:42</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>3h 39 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 15 min</p>
         </div>
       </div>
       </div>
@@ -330,13 +330,13 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestCliGdrivedb</td>
         <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c3', 2)">Detail</a>
         </td>
@@ -344,20 +344,89 @@
 
     
     
-        <tr id='pt3.1' class='hiddenRow bg-success'>
+        <tr id="et3.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et3.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 179, in test_cli_gdrive_location
+    self.fill_db_config({&#39;config_google_drive_folder&#39;: &#39;test&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 254, in fill_db_config
+    select = Select(cls.driver.find_element(By.ID, key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_google_drive_folder&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt3.2' class='hiddenRow bg-success'>
+        <tr id="et3.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et3.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 144, in test_gdrive_db_nonwrite
+    self.fill_db_config({&#39;config_use_google_drive&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 250, in fill_db_config
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;input id=&#34;config_use_google_drive&#34; name=&#34;config_use_google_drive&#34; type=&#34;checkbox&#34;&gt; is not clickable at point (473,225) because another element &lt;div id=&#34;GeneralChangeModal&#34; class=&#34;modal fade in&#34;&gt; obscures it
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementClickInterceptedError@chrome://remote/content/shared/webdriver/Errors.jsm:282:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:166:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1351,12 +1420,12 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAuthorsGdrive</td>
         <td class="text-center">6</td>
         <td class="text-center">5</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 6)">Detail</a>
@@ -1410,26 +1479,26 @@
     
     
     
-        <tr id="ft13.6" class="none bg-danger">
+        <tr id="et13.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.6')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
+                <div id="div_et13.6" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.6').style.display='none'"><span
+                                onclick="document.getElementById('div_et13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 562, in test_rename_capital_on_upload
-    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;34a2afba-2e3f-4f75-bc09-67899f2ccfba&#34;, element=&#34;08372364-79c8-4996-97da-de74437e794d&#34;)&gt; is not false</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 544, in test_rename_capital_on_upload
+    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1617,13 +1686,13 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
@@ -1631,43 +1700,23 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
 
     
     
-        <tr id="ft15.1" class="none bg-danger">
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</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('c16', 20)">Detail</a>
         </td>
@@ -1675,182 +1724,1360 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id="et16.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 877, in test_download_book
+    self.assertEqual(len(list_element), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id="et16.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 291, in test_edit_author
+    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id="et16.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 471, in test_edit_category
+    self.get_book_details(12)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id="et16.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 638, in test_edit_comments
+    self.get_book_details(12)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id="et16.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 653, in test_edit_custom_bool
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id="et16.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 722, in test_edit_custom_categories
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id="et16.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 740, in test_edit_custom_float
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.8' class='hiddenRow bg-success'>
+        <tr id="et16.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 756, in test_edit_custom_int
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.9' class='hiddenRow bg-success'>
+        <tr id="et16.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 669, in test_edit_custom_rating
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.10' class='hiddenRow bg-success'>
+        <tr id="et16.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 689, in test_edit_custom_single_select
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.11' class='hiddenRow bg-success'>
+        <tr id="et16.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 705, in test_edit_custom_text
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.12' class='hiddenRow bg-success'>
+        <tr id="et16.12" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.12')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 580, in test_edit_language
+    self.get_book_details(3)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.13' class='hiddenRow bg-success'>
+        <tr id="et16.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 525, in test_edit_publisher
+    self.get_book_details(7)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.14' class='hiddenRow bg-success'>
+        <tr id="et16.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 610, in test_edit_rating
+    books = self.get_books_displayed()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1185, in get_books_displayed
+    html = cls.driver.page_source
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 926, in page_source
+    return self.execute(Command.GET_PAGE_SOURCE)[&#39;value&#39;]
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 74, in request
+    return self.request_encode_url(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 96, in request_encode_url
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/source (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.15' class='hiddenRow bg-success'>
+        <tr id="et16.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 404, in test_edit_series
+    self.get_book_details(9)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id="et16.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 133, in test_edit_title
+    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.17' class='hiddenRow bg-success'>
+        <tr id="et16.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 848, in test_upload_book_epub
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.18' class='hiddenRow bg-success'>
+        <tr id="et16.18" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 823, in test_upload_book_lit
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.19' class='hiddenRow bg-success'>
+        <tr id="et16.19" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.19')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.19" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 771, in test_upload_cover_hdd
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.20' class='hiddenRow bg-success'>
+        <tr id="et16.20" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.20')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.20').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 908, in test_watch_metadata
+    button = self.check_element_on_page((By.ID, &#34;enable_gdrive_watch&#34;))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 707, in check_element_on_page
+    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2116,11 +3343,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2130,11 +3357,31 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id="ft23.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft23.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_gdrive_setup.py&#34;, line 113, in test_config_gdrive
+    self.assertFalse(use_gdrive.is_selected())
+AssertionError: True is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4572,9 +5819,9 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>404</td>
-        <td>395</td>
-        <td>2</td>
-        <td>0</td>
+        <td>373</td>
+        <td>1</td>
+        <td>23</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4741,7 +5988,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4771,7 +6018,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4801,7 +6048,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4843,7 +6090,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4879,7 +6126,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4921,7 +6168,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5005,7 +6252,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 </div>
 
 <script>
-    drawCircle(395, 2, 0, 7);
+    drawCircle(373, 1, 23, 7);
     showCase(5);
 </script>
 

From 41f89af9595afc8fe617cdca4f316bb32ccb615b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 14:23:35 +0100
Subject: [PATCH 161/412] Log error in case gdrive.db folder can't be found

---
 cps/gdriveutils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index eae175a04..57f272ff7 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -196,7 +196,8 @@ def migrate():
 if not os.path.exists(cli.gdpath):
     try:
         Base.metadata.create_all(engine)
-    except Exception:
+    except Exception as ex:
+        log.error("Error connect to database: {} - {}".format(cli.gdpath, ex))
         raise
 migrate()
 

From 411c13977f030566bdf9505dfce63f5b580f40f9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 16:22:28 +0100
Subject: [PATCH 162/412] Fix for #2294 (cover files in epubs with property as
 property in manifest are now found)

---
 .github/FUNDING.yml |  1 +
 cps/epub.py         | 73 ++++++++++++++++++++++++---------------------
 2 files changed, 40 insertions(+), 34 deletions(-)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..c3d0309ef
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: ["https://PayPal.Me/calibreweb",]
diff --git a/cps/epub.py b/cps/epub.py
index cbbdcbbde..b436a7558 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -25,15 +25,14 @@ from .helper import split_authors
 from .constants import BookMeta
 
 
-
-def extractCover(zipFile, coverFile, coverpath, tmp_file_name):
-    if coverFile is None:
+def extract_cover(zip_file, cover_file, cover_path, tmp_file_name):
+    if cover_file is None:
         return None
     else:
-        zipCoverPath = os.path.join(coverpath, coverFile).replace('\\', '/')
-        cf = zipFile.read(zipCoverPath)
+        zip_cover_path = os.path.join(cover_path, cover_file).replace('\\', '/')
+        cf = zip_file.read(zip_cover_path)
         prefix = os.path.splitext(tmp_file_name)[0]
-        tmp_cover_name = prefix + '.' + os.path.basename(zipCoverPath)
+        tmp_cover_name = prefix + '.' + os.path.basename(zip_cover_path)
         image = open(tmp_cover_name, 'wb')
         image.write(cf)
         image.close()
@@ -47,12 +46,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         'dc': 'http://purl.org/dc/elements/1.1/'
     }
 
-    epubZip = zipfile.ZipFile(tmp_file_path)
+    epub_zip = zipfile.ZipFile(tmp_file_path)
 
-    txt = epubZip.read('META-INF/container.xml')
+    txt = epub_zip.read('META-INF/container.xml')
     tree = etree.fromstring(txt)
     cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
-    cf = epubZip.read(cfname)
+    cf = epub_zip.read(cfname)
     tree = etree.fromstring(cf)
 
     coverpath = os.path.dirname(cfname)
@@ -86,9 +85,9 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     lang = epub_metadata['language'].split('-', 1)[0].lower()
     epub_metadata['language'] = isoLanguages.get_lang3(lang)
 
-    epub_metadata = parse_epbub_series(ns, tree, epub_metadata)
+    epub_metadata = parse_epub_series(ns, tree, epub_metadata)
 
-    coverfile = parse_ebpub_cover(ns, tree, epubZip, coverpath, tmp_file_path)
+    cover_file = parse_epub_cover(ns, tree, epub_zip, coverpath, tmp_file_path)
 
     if not epub_metadata['title']:
         title = original_file_name
@@ -100,7 +99,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         extension=original_file_extension,
         title=title.encode('utf-8').decode('utf-8'),
         author=epub_metadata['creator'].encode('utf-8').decode('utf-8'),
-        cover=coverfile,
+        cover=cover_file,
         description=epub_metadata['description'],
         tags=epub_metadata['subject'].encode('utf-8').decode('utf-8'),
         series=epub_metadata['series'].encode('utf-8').decode('utf-8'),
@@ -108,37 +107,43 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         languages=epub_metadata['language'],
         publisher="")
 
-def parse_ebpub_cover(ns, tree, epubZip, coverpath, tmp_file_path):
-    coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
-    coverfile = None
-    if len(coversection) > 0:
-        coverfile = extractCover(epubZip, coversection[0], coverpath, tmp_file_path)
+
+def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
+    cover_section = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
+    cover_file = None
+    if len(cover_section) > 0:
+        cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
     else:
         meta_cover = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='cover']/@content", namespaces=ns)
         if len(meta_cover) > 0:
-            coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='"+meta_cover[0]+"']/@href", namespaces=ns)
+            cover_section = tree.xpath(
+                "/pkg:package/pkg:manifest/pkg:item[@id='"+meta_cover[0]+"']/@href", namespaces=ns)
+            if not cover_section:
+                cover_section = tree.xpath(
+                    "/pkg:package/pkg:manifest/pkg:item[@properties='" + meta_cover[0] + "']/@href", namespaces=ns)
         else:
-            coversection = tree.xpath("/pkg:package/pkg:guide/pkg:reference/@href", namespaces=ns)
-        if len(coversection) > 0:
-            filetype = coversection[0].rsplit('.', 1)[-1]
+            cover_section = tree.xpath("/pkg:package/pkg:guide/pkg:reference/@href", namespaces=ns)
+        if len(cover_section) > 0:
+            filetype = cover_section[0].rsplit('.', 1)[-1]
             if filetype == "xhtml" or filetype == "html":  # if cover is (x)html format
-                markup = epubZip.read(os.path.join(coverpath, coversection[0]))
-                markupTree = etree.fromstring(markup)
+                markup = epub_zip.read(os.path.join(cover_path, cover_section[0]))
+                markup_tree = etree.fromstring(markup)
                 # no matter xhtml or html with no namespace
-                imgsrc = markupTree.xpath("//*[local-name() = 'img']/@src")
+                img_src = markup_tree.xpath("//*[local-name() = 'img']/@src")
                 # Alternative image source
-                if not len(imgsrc):
-                    imgsrc = markupTree.xpath("//attribute::*[contains(local-name(), 'href')]")
-                if len(imgsrc):
-                    # imgsrc maybe startwith "../"" so fullpath join then relpath to cwd
-                    filename = os.path.relpath(os.path.join(os.path.dirname(os.path.join(coverpath, coversection[0])),
-                                                            imgsrc[0]))
-                    coverfile = extractCover(epubZip, filename, "", tmp_file_path)
+                if not len(img_src):
+                    img_src = markup_tree.xpath("//attribute::*[contains(local-name(), 'href')]")
+                if len(img_src):
+                    # img_src maybe start with "../"" so fullpath join then relpath to cwd
+                    filename = os.path.relpath(os.path.join(os.path.dirname(os.path.join(cover_path, cover_section[0])),
+                                                            img_src[0]))
+                    cover_file = extract_cover(epub_zip, filename, "", tmp_file_path)
             else:
-                coverfile = extractCover(epubZip, coversection[0], coverpath, tmp_file_path)
-    return coverfile
+                cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
+    return cover_file
 
-def parse_epbub_series(ns, tree, epub_metadata):
+
+def parse_epub_series(ns, tree, epub_metadata):
     series = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='calibre:series']/@content", namespaces=ns)
     if len(series) > 0:
         epub_metadata['series'] = series[0]

From 0c3c0c06649629eae615a9db978eb189e03edfe7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 16:33:12 +0100
Subject: [PATCH 163/412] Improved logging of book title on upload

---
 cps/editbooks.py    | 4 ++--
 cps/tasks/upload.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 4948c2dc3..9fce12725 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -670,7 +670,7 @@ def upload_single_file(request, book, book_id):
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
             uploadText=_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
-            WorkerThread.add(current_user.name, TaskUpload(uploadText))
+            WorkerThread.add(current_user.name, TaskUpload(uploadText), escape(book.title))
 
             return uploader.process(
                 saved_filename, *os.path.splitext(requested_file.filename),
@@ -1092,7 +1092,7 @@ def upload():
                     flash(error, category="error")
                 link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
                 uploadText = _(u"File %(file)s uploaded", file=link)
-                WorkerThread.add(current_user.name, TaskUpload(uploadText))
+                WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(title)))
 
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
diff --git a/cps/tasks/upload.py b/cps/tasks/upload.py
index 2a667c287..e0bb0094b 100644
--- a/cps/tasks/upload.py
+++ b/cps/tasks/upload.py
@@ -20,11 +20,12 @@ from datetime import datetime
 from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS
 
 class TaskUpload(CalibreTask):
-    def __init__(self, taskMessage):
+    def __init__(self, taskMessage, book_title):
         super(TaskUpload, self).__init__(taskMessage)
         self.start_time = self.end_time = datetime.now()
         self.stat = STAT_FINISH_SUCCESS
         self.progress = 1
+        self.book_title = book_title
 
     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"""
@@ -34,4 +35,4 @@ class TaskUpload(CalibreTask):
         return "Upload"
 
     def __str__(self):
-        return "Upload {}".format(self.message)
+        return "Upload {}".format(self.book_title)

From 3bb41aca6de1e84b5d0e862224943719eb0ad4da Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 18:57:58 +0100
Subject: [PATCH 164/412] Bugfix for already present mobi file during convert
 (fixes #1900)

---
 cps/tasks/convert.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 596bf95c0..90513b09f 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -116,8 +116,20 @@ class TaskConvert(CalibreTask):
             log.info("Book id %d already converted to %s", book_id, format_new_ext)
             cur_book = local_db.get_book(book_id)
             self.title = cur_book.title
-            self.results['path'] = file_path
+            self.results['path'] = cur_book.path
             self.results['title'] = self.title
+            new_format = db.Data(name=os.path.basename(file_path),
+                                 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()
+                self._handleError(error_message)
+                return
             self._handleSuccess()
             local_db.session.close()
             return os.path.basename(file_path + format_new_ext)

From 7c623941de04f8c3612facf187b27eb28d29238b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 7 Feb 2022 13:55:18 +0100
Subject: [PATCH 165/412] Bugfixes after testrun Enabled re-encode of
 bookformats

---
 cps/editbooks.py                        |   2 +-
 cps/tasks/convert.py                    |  62 +++----
 test/Calibre-Web TestSummary_Linux.html | 210 +++++++++++++++---------
 3 files changed, 167 insertions(+), 107 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 9fce12725..fcf043a50 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -670,7 +670,7 @@ def upload_single_file(request, book, book_id):
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
             uploadText=_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
-            WorkerThread.add(current_user.name, TaskUpload(uploadText), escape(book.title))
+            WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(book.title)))
 
             return uploader.process(
                 saved_filename, *os.path.splitext(requested_file.filename),
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 90513b09f..c8b8229c5 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -118,21 +118,24 @@ class TaskConvert(CalibreTask):
             self.title = cur_book.title
             self.results['path'] = cur_book.path
             self.results['title'] = self.title
-            new_format = db.Data(name=os.path.basename(file_path),
-                                 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)
+            new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id)\
+                .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none()
+            if not new_format:
+                new_format = db.Data(name=os.path.basename(file_path),
+                                     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()
+                    self._handleError(error_message)
+                    return
+                self._handleSuccess()
                 local_db.session.close()
-                self._handleError(error_message)
-                return
-            self._handleSuccess()
-            local_db.session.close()
-            return os.path.basename(file_path + format_new_ext)
+                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,
@@ -153,22 +156,25 @@ class TaskConvert(CalibreTask):
         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,
+                new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id) \
+                    .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none()
+                if not new_format:
+                    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()
-                    if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
-                        ub_session = ini()
-                        remove_synced_book(book_id, True, ub_session)
-                        ub_session.close()
-                except SQLAlchemyError as e:
-                    local_db.session.rollback()
-                    log.error("Database error: %s", e)
-                    local_db.session.close()
-                    self._handleError(error_message)
-                    return
+                    try:
+                        local_db.session.merge(new_format)
+                        local_db.session.commit()
+                        if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                            ub_session = ini()
+                            remove_synced_book(book_id, True, ub_session)
+                            ub_session.close()
+                    except SQLAlchemyError as e:
+                        local_db.session.rollback()
+                        log.error("Database error: %s", e)
+                        local_db.session.close()
+                        self._handleError(error_message)
+                        return
                 self.results['path'] = cur_book.path
                 self.title = cur_book.title
                 self.results['title'] = self.title
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index bd12238ca..1be6540c0 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-01 20:32:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-06 21:09:18</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>2022-02-02 00:57:41</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-07 01:33:46</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>3h 39 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 38 min</p>
         </div>
       </div>
       </div>
@@ -639,11 +639,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -662,11 +662,33 @@
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id="ft8.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft8.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft8.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft8.2').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 163, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -681,11 +703,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -704,11 +726,33 @@
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id="ft9.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft9.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 213, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -723,13 +767,13 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">19</td>
-        <td class="text-center">17</td>
-        <td class="text-center">0</td>
+        <td class="text-center">15</td>
         <td class="text-center">0</td>
         <td class="text-center">2</td>
+        <td class="text-center">2</td>
         <td class="text-center">
             <a onclick="showClassDetail('c10', 19)">Detail</a>
         </td>
@@ -764,20 +808,70 @@
     
     
     
-        <tr id='pt10.4' class='hiddenRow bg-success'>
+        <tr id="et10.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.4').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 709, in test_delete_role
+    self.fill_basic_config({&#39;config_uploading&#39;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.5' class='hiddenRow bg-success'>
+        <tr id="et10.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.5').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 861, in test_details_popup
+    books[1][0][&#39;ele&#39;].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1351,11 +1445,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditAuthorsGdrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</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">
@@ -1410,31 +1504,11 @@
     
     
     
-        <tr id="ft13.6" class="none bg-danger">
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 562, in test_rename_capital_on_upload
-    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;34a2afba-2e3f-4f75-bc09-67899f2ccfba&#34;, element=&#34;08372364-79c8-4996-97da-de74437e794d&#34;)&gt; is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1617,13 +1691,13 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
@@ -1631,31 +1705,11 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
 
     
     
-        <tr id="ft15.1" class="none bg-danger">
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4572,9 +4626,9 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>404</td>
-        <td>395</td>
+        <td>393</td>
+        <td>2</td>
         <td>2</td>
-        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4741,7 +4795,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4771,7 +4825,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4801,7 +4855,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4843,7 +4897,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4879,7 +4933,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4921,7 +4975,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5005,7 +5059,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 </div>
 
 <script>
-    drawCircle(395, 2, 0, 7);
+    drawCircle(393, 2, 2, 7);
     showCase(5);
 </script>
 

From 764389ea2a027a087fbbdcd5264fd57d5c276a70 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 8 Feb 2022 20:15:01 +0100
Subject: [PATCH 166/412] small change

---
 cps/tasks/thumbnail.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index d147f10d8..c0887e0ad 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -18,6 +18,7 @@
 
 from __future__ import division, print_function, unicode_literals
 import os
+from urllib.request import urlopen
 
 from .. import constants
 from cps import config, db, fs, gdriveutils, logger, ub
@@ -25,10 +26,6 @@ from cps.services.worker import CalibreTask, STAT_CANCELLED, STAT_ENDED
 from datetime import datetime
 from sqlalchemy import func, text, or_
 
-try:
-    from urllib.request import urlopen
-except ImportError as e:
-    from urllib2 import urlopen
 
 try:
     from wand.image import Image
@@ -372,7 +369,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                             dimensions = get_best_fit(width, height, img.width, img.height)
 
                             # resize and crop the image
-                            img.resize(width=int(dimensions['width']), height=int(dimensions['height']), filter='lanczos')
+                            img.resize(width=int(dimensions['width']), height=int(dimensions['height']),
+                                       filter='lanczos')
                             img.crop(width=int(width / 2.0), height=int(height / 2.0), gravity='center')
 
                             # add the image to the canvas

From 461dd05e2f3ddcf5ce47cfaf343d22ea829e50a6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 8 Feb 2022 20:18:32 +0100
Subject: [PATCH 167/412] Readd cache directory to the excluded files during
 update

---
 cps/updater.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/updater.py b/cps/updater.py
index 2166b3344..2d62fe79d 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -398,7 +398,7 @@ class Updater(threading.Thread):
             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', os.sep + 'cps' + os.sep + '.HOMEDIR',
-            os.sep + 'gmail.json', os.sep + 'exclude.txt'
+            os.sep + 'gmail.json', os.sep + 'exclude.txt', os.sep + 'cps' + os.sep + 'cache'
         ]
         try:
             with open(os.path.join(constants.BASE_DIR, "exclude.txt"), "r") as f:

From 0981337cdf5f639b4d917e8f89c72b81be3b99ff Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 9 Feb 2022 20:57:39 +0100
Subject: [PATCH 168/412] Update optional_requirements

---
 cps/dep_check.py          | 2 +-
 optional-requirements.txt | 3 +--
 setup.cfg                 | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cps/dep_check.py b/cps/dep_check.py
index 12436d1d1..1c404940a 100644
--- a/cps/dep_check.py
+++ b/cps/dep_check.py
@@ -3,7 +3,7 @@ import re
 
 from .constants import BASE_DIR
 try:
-    from importlib_metadata import version
+    from importlib.metadata import version
     importlib = True
     ImportNotFound = BaseException
 except ImportError:
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 2370bc7e0..f7c7b572b 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -10,7 +10,6 @@ pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
 rsa>=3.4.2,<4.9.0
-# six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
@@ -34,7 +33,7 @@ scholarly>=1.2.0,<1.6
 markdown2>=2.0.0,<2.5.0
 html2text>=2020.1.16,<2022.1.1
 python-dateutil>=2.1,<2.9.0
-beautifulsoup4>=4.0.1,<4.2.0
+beautifulsoup4>=4.0.1,<4.11.0
 cchardet>=2.0.0,<2.2.0
 
 # Comics
diff --git a/setup.cfg b/setup.cfg
index 5053d19f1..98df890c2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,6 +38,7 @@ console_scripts =
 [options]
 include_package_data = True
 install_requires = 
+	APScheduler>=3.6.3,<3.8.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
 	Flask-Login>=0.3.2,<0.5.1
@@ -70,7 +71,6 @@ gdrive =
 	PyDrive2>=1.3.1,<1.11.0
 	PyYAML>=3.12
 	rsa>=3.4.2,<4.9.0
-	six>=1.10.0,<1.17.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
 	google-api-python-client>=1.7.11,<2.37.0
@@ -89,7 +89,7 @@ metadata =
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1
 	python-dateutil>=2.1,<2.9.0
-	beautifulsoup4>=4.0.1,<4.2.0
+	beautifulsoup4>=4.0.1,<4.11.0
 	cchardet>=2.0.0,<2.2.0
 comics = 
 	natsort>=2.2.0,<8.2.0

From 7317084a4ed9c03f109e27e4a478dee840e69726 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 11:11:08 +0100
Subject: [PATCH 169/412] Update requirements

---
 optional-requirements.txt | 1 -
 setup.cfg                 | 1 -
 2 files changed, 2 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 2370bc7e0..123f46868 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -10,7 +10,6 @@ pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
 rsa>=3.4.2,<4.9.0
-# six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
diff --git a/setup.cfg b/setup.cfg
index 5053d19f1..e67747761 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -70,7 +70,6 @@ gdrive =
 	PyDrive2>=1.3.1,<1.11.0
 	PyYAML>=3.12
 	rsa>=3.4.2,<4.9.0
-	six>=1.10.0,<1.17.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
 	google-api-python-client>=1.7.11,<2.37.0

From 295888c654b114f350c2973bd12f8865af54f962 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 11:20:09 +0100
Subject: [PATCH 170/412] Find imports in executables

---
 cps/about.py     |  1 +
 cps/dep_check.py | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 7ff178e3c..ec7b11726 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -81,6 +81,7 @@ else:
     calibre_web_version = (constants.STABLE_VERSION['version'] + ' - '
                            + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
                            + constants.NIGHTLY_VERSION[1].replace('%', '%%'))
+
 if getattr(sys, 'frozen', False):
     calibre_web_version += " - Exe-Version"
 elif constants.HOME_CONFIG:
diff --git a/cps/dep_check.py b/cps/dep_check.py
index 12436d1d1..5e8e36cfe 100644
--- a/cps/dep_check.py
+++ b/cps/dep_check.py
@@ -1,5 +1,7 @@
 import os
 import re
+import sys
+import json
 
 from .constants import BASE_DIR
 try:
@@ -8,7 +10,7 @@ try:
     ImportNotFound = BaseException
 except ImportError:
     importlib = False
-
+    version = None
 
 if not importlib:
     try:
@@ -20,6 +22,9 @@ if not importlib:
 
 def load_dependencys(optional=False):
     deps = list()
+    if getattr(sys, 'frozen', False):
+        with open(os.path.join(BASE_DIR, ".pip_installed")) as f:
+            exe_deps = json.loads(f.readlines())
     if importlib or pkgresources:
         if optional:
             req_path = os.path.join(BASE_DIR, "optional-requirements.txt")
@@ -31,10 +36,13 @@ def load_dependencys(optional=False):
                     if not line.startswith('#') and not line == '\n' and not line.startswith('git'):
                         res = re.match(r'(.*?)([<=>\s]+)([\d\.]+),?\s?([<=>\s]+)?([\d\.]+)?', line.strip())
                         try:
-                            if importlib:
-                                dep_version = version(res.group(1))
+                            if getattr(sys, 'frozen', False):
+                                dep_version = exe_deps[res.group(1).lower()]
                             else:
-                                dep_version = pkg_resources.get_distribution(res.group(1)).version
+                                if importlib:
+                                    dep_version = version(res.group(1))
+                                else:
+                                    dep_version = pkg_resources.get_distribution(res.group(1)).version
                         except ImportNotFound:
                             if optional:
                                 continue

From 0436f0f9b252dc4a35a232abfd5a02657c02b42c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 11:58:56 +0100
Subject: [PATCH 171/412] Improved dependency check for executables

---
 cps/dep_check.py          | 12 ++++++++----
 optional-requirements.txt |  2 +-
 requirements.txt          |  2 +-
 setup.cfg                 |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cps/dep_check.py b/cps/dep_check.py
index 5e8e36cfe..84e16e85c 100644
--- a/cps/dep_check.py
+++ b/cps/dep_check.py
@@ -23,8 +23,12 @@ if not importlib:
 def load_dependencys(optional=False):
     deps = list()
     if getattr(sys, 'frozen', False):
-        with open(os.path.join(BASE_DIR, ".pip_installed")) as f:
-            exe_deps = json.loads(f.readlines())
+        pip_installed = os.path.join(BASE_DIR, ".pip_installed")
+        if os.path.exists(pip_installed):
+            with open(pip_installed) as f:
+                exe_deps = json.loads("".join(f.readlines()))
+        else:
+            return deps
     if importlib or pkgresources:
         if optional:
             req_path = os.path.join(BASE_DIR, "optional-requirements.txt")
@@ -37,13 +41,13 @@ def load_dependencys(optional=False):
                         res = re.match(r'(.*?)([<=>\s]+)([\d\.]+),?\s?([<=>\s]+)?([\d\.]+)?', line.strip())
                         try:
                             if getattr(sys, 'frozen', False):
-                                dep_version = exe_deps[res.group(1).lower()]
+                                dep_version = exe_deps[res.group(1).lower().replace('_','-')]
                             else:
                                 if importlib:
                                     dep_version = version(res.group(1))
                                 else:
                                     dep_version = pkg_resources.get_distribution(res.group(1)).version
-                        except ImportNotFound:
+                        except (ImportNotFound, KeyError):
                             if optional:
                                 continue
                             dep_version = "not installed"
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 123f46868..f7c7b572b 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -33,7 +33,7 @@ scholarly>=1.2.0,<1.6
 markdown2>=2.0.0,<2.5.0
 html2text>=2020.1.16,<2022.1.1
 python-dateutil>=2.1,<2.9.0
-beautifulsoup4>=4.0.1,<4.2.0
+beautifulsoup4>=4.0.1,<4.11.0
 cchardet>=2.0.0,<2.2.0
 
 # Comics
diff --git a/requirements.txt b/requirements.txt
index 0b95dfa37..d9bed7bb6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
 Flask>=1.0.2,<2.1.0
 iso-639>=0.4.5,<0.5.0
-PyPDF3>=1.0.0,<1.0.6
+PyPDF3>=1.0.0,<1.0.7
 pytz>=2016.10
 requests>=2.11.1,<2.28.0
 SQLAlchemy>=1.3.0,<1.5.0
diff --git a/setup.cfg b/setup.cfg
index e67747761..128741517 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,7 +45,7 @@ install_requires =
 	backports_abc>=0.4
 	Flask>=1.0.2,<2.1.0
 	iso-639>=0.4.5,<0.5.0
-	PyPDF3>=1.0.0,<1.0.6
+	PyPDF3>=1.0.0,<1.0.7
 	pytz>=2016.10
 	requests>=2.11.1,<2.28.0
 	SQLAlchemy>=1.3.0,<1.5.0
@@ -88,7 +88,7 @@ metadata =
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1
 	python-dateutil>=2.1,<2.9.0
-	beautifulsoup4>=4.0.1,<4.2.0
+	beautifulsoup4>=4.0.1,<4.11.0
 	cchardet>=2.0.0,<2.2.0
 comics = 
 	natsort>=2.2.0,<8.2.0

From 6b026513cbe877c1ac103e0fcaf92a1e90719183 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 12:12:30 +0100
Subject: [PATCH 172/412] refactored about

---
 cps/about.py | 86 ++++++++--------------------------------------------
 1 file changed, 12 insertions(+), 74 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index ec7b11726..8f2bf715b 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -25,47 +25,15 @@ import platform
 import sqlite3
 from collections import OrderedDict
 
-import babel
-import pytz
-import requests
-import sqlalchemy
 import werkzeug
 import flask
 import flask_login
-import flask_principal
 import jinja2
 from flask_babel import gettext as _
-try:
-    from flask_wtf import __version__ as flaskwtf_version
-except ImportError:
-    flaskwtf_version = _(u'not installed')
 
-from . import db, calibre_db, converter, uploader, server, isoLanguages, constants, gdriveutils, dep_check
+from . import db, calibre_db, converter, uploader, constants, dep_check
 from .render_template import render_title_template
 
-try:
-    from flask_login import __version__ as flask_loginVersion
-except ImportError:
-    from flask_login.__about__ import __version__ as flask_loginVersion
-try:
-    # pylint: disable=unused-import
-    import unidecode
-    # _() necessary to make babel aware of string for translation
-    unidecode_version = _(u'installed')
-except ImportError:
-    unidecode_version = _(u'not installed')
-
-try:
-    from flask_dance import __version__ as flask_danceVersion
-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__)
 
@@ -87,47 +55,17 @@ if getattr(sys, 'frozen', False):
 elif constants.HOME_CONFIG:
     calibre_web_version += " - pyPi"
 
-if not ret:
-    _VERSIONS = OrderedDict(
-        Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
-        Python=sys.version,
-        Calibre_Web=calibre_web_version,
-        WebServer=server.VERSION,
-        Flask=flask.__version__,
-        Flask_Login=flask_loginVersion,
-        Flask_Principal=flask_principal.__version__,
-        Flask_WTF=flaskwtf_version,
-        Werkzeug=werkzeug.__version__,
-        Babel=babel.__version__,
-        Jinja2=jinja2.__version__,
-        Requests=requests.__version__,
-        SqlAlchemy=sqlalchemy.__version__,
-        pySqlite=sqlite3.version,
-        SQLite=sqlite3.sqlite_version,
-        iso639=isoLanguages.__version__,
-        pytz=pytz.__version__,
-        Unidecode=unidecode_version,
-        Flask_SimpleLDAP=u'installed' if bool(services.ldap) else None,
-        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,
-        greenlet=greenlet_Version
-    )
-    _VERSIONS.update(gdriveutils.get_versions())
-    _VERSIONS.update(uploader.get_versions(True))
-else:
-    _VERSIONS = OrderedDict(
-        Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
-        Python=sys.version,
-        Calibre_Web=calibre_web_version,
-        Werkzeug=werkzeug.__version__,
-        Jinja2=jinja2.__version__,
-        pySqlite=sqlite3.version,
-        SQLite=sqlite3.sqlite_version,
-    )
-    _VERSIONS.update(ret)
-    _VERSIONS.update(uploader.get_versions(False))
+_VERSIONS = OrderedDict(
+    Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
+    Python=sys.version,
+    Calibre_Web=calibre_web_version,
+    Werkzeug=werkzeug.__version__,
+    Jinja2=jinja2.__version__,
+    pySqlite=sqlite3.version,
+    SQLite=sqlite3.sqlite_version,
+)
+_VERSIONS.update(ret)
+_VERSIONS.update(uploader.get_versions(False))
 
 
 def collect_stats():

From ba23ada1fe63ed79326ca4a8f3ff220dc09739b0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 12:32:35 +0100
Subject: [PATCH 173/412] Reenable showing of academic cover in case no cover
 was found from scholary

---
 cps/metadata_provider/scholar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index bbf50fb3e..f94a65f47 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -47,7 +47,7 @@ class scholar(Metadata):
             scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
             for result in scholar_gen:
                 match = self._parse_search_result(
-                    result=result, generic_cover=generic_cover, locale=locale
+                    result=result, generic_cover="", locale=locale
                 )
                 val.append(match)
         return val

From 9c5970bbfc0f16e71eeb8641104c09f75d7f16bd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 12:34:54 +0100
Subject: [PATCH 174/412] Bugfix for empty search results from google

---
 cps/metadata_provider/google.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index 11e86aa12..fbb689659 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -46,7 +46,7 @@ class Google(Metadata):
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = "+".join(tokens)
             results = requests.get(Google.SEARCH_URL + query)
-            for result in results.json()["items"]:
+            for result in results.json().get("items", []):
                 val.append(
                     self._parse_search_result(
                         result=result, generic_cover=generic_cover, locale=locale

From 7bb3cac7fbab8e370287483d6213873566d99038 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 12:41:29 +0100
Subject: [PATCH 175/412] Avoid problems with percent encoded utf-8 abstracts
 on certain chinese papers

---
 cps/metadata_provider/scholar.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index f94a65f47..b0c10b665 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -17,7 +17,7 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 import itertools
 from typing import Dict, List, Optional
-from urllib.parse import quote
+from urllib.parse import quote, unquote
 
 try:
     from fake_useragent.errors import FakeUserAgentError
@@ -66,7 +66,7 @@ class scholar(Metadata):
         )
 
         match.cover = result.get("image", {}).get("original_url", generic_cover)
-        match.description = result["bib"].get("abstract", "")
+        match.description = unquote(result["bib"].get("abstract", ""))
         match.publisher = result["bib"].get("venue", "")
         match.publishedDate = result["bib"].get("pub_year") + "-01-01"
         match.identifiers = {"scholar": match.id}

From 8f665ebd5846a3464265c47942d874afb3e45cb6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 9 Feb 2022 18:17:00 +0100
Subject: [PATCH 176/412] Update Teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 2279 +++++++++--------------
 1 file changed, 860 insertions(+), 1419 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index af8cfcd9a..2ba781258 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-05 20:19:09</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-09 06:42: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>2022-02-06 00:20:42</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-09 11:35: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>Duration: </strong>3h 15 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 6 min</p>
         </div>
       </div>
       </div>
@@ -330,13 +330,13 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCliGdrivedb</td>
         <td class="text-center">2</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c3', 2)">Detail</a>
         </td>
@@ -344,89 +344,20 @@
 
     
     
-        <tr id="et3.1" class="none bg-info">
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 179, in test_cli_gdrive_location
-    self.fill_db_config({&#39;config_google_drive_folder&#39;: &#39;test&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 254, in fill_db_config
-    select = Select(cls.driver.find_element(By.ID, key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_google_drive_folder&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et3.2" class="none bg-info">
+        <tr id='pt3.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 144, in test_gdrive_db_nonwrite
-    self.fill_db_config({&#39;config_use_google_drive&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 250, in fill_db_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;input id=&#34;config_use_google_drive&#34; name=&#34;config_use_google_drive&#34; type=&#34;checkbox&#34;&gt; is not clickable at point (473,225) because another element &lt;div id=&#34;GeneralChangeModal&#34; class=&#34;modal fade in&#34;&gt; obscures it
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementClickInterceptedError@chrome://remote/content/shared/webdriver/Errors.jsm:282:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:166:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -489,11 +420,11 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">13</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -503,11 +434,33 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
 
     
     
-        <tr id='pt6.1' class='hiddenRow bg-success'>
+        <tr id="ft6.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 606, in test_calibre_log
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Failed&#39;
+- Convert: PDF -&gt; ODT: book9
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -521,83 +474,281 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id="ft6.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 198, in test_convert_email
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Finished&#39;
+- Convert: PDF -&gt; ODT: book9
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id="ft6.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 242, in test_convert_failed_and_email
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: book6 send to Kindle&#39; != &#39;Failed&#39;
+- E-mail: book6 send to Kindle
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id="ft6.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 328, in test_convert_only
+    self.assertEqual(ret_orig[-6][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; MOBI: book8&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; MOBI: book8
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id="ft6.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 568, in test_convert_options
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id="ft6.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.8' class='hiddenRow bg-success'>
+        <tr id="ft6.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 142, in test_convert_wrong_excecutable
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: book6 send to Kindle&#39; != &#39;Failed&#39;
+- E-mail: book6 send to Kindle
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id="ft6.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 508, in test_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.10' class='hiddenRow bg-success'>
+        <tr id="ft6.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 439, in test_email_failed
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id="ft6.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 401, in test_email_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -611,39 +762,105 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id="ft6.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 482, in test_ssl_smtp_setup_error
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.14' class='hiddenRow bg-success'>
+        <tr id="ft6.14" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.14')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 462, in test_starttls_smtp_setup_error
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.15' class='hiddenRow bg-success'>
+        <tr id="ft6.15" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.15')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 542, in test_user_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">6</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -653,66 +870,196 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id="ft7.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 193, in test_convert_email
+    self.assertTrue(&#34;E-mail&#34; in ret[-1][&#39;task&#39;])
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id="ft7.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 234, in test_convert_failed_and_email
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Failed&#39;
+- E-mail: Test e-mail
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id="ft7.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 324, in test_convert_only
+    self.assertEqual(ret[-6][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Finished&#39;
+- E-mail: Test e-mail
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id="ft7.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 158, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; LIT: book8
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id="ft7.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 430, in test_email_failed
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Failed&#39;
+- Convert: EPUB -&gt; LIT: book8
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id="ft7.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 389, in test_email_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; LIT: book8
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -731,11 +1078,33 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id="ft8.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft8.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft8.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft8.2').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 126, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; KEPUB: book7
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -750,11 +1119,11 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -773,11 +1142,33 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id="ft9.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft9.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 174, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; KEPUB: book7
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1496,9 +1887,9 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 544, in test_rename_capital_on_upload
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 547, in test_rename_capital_on_upload
+    self.assertEqual(&#39;Useless&#39;, details[&#39;title&#39;])
+KeyError: &#39;title&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1710,13 +2101,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</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('c16', 20)">Detail</a>
         </td>
@@ -1724,1360 +2115,182 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
 
     
     
-        <tr id="et16.1" class="none bg-info">
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 877, in test_download_book
-    self.assertEqual(len(list_element), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.2" class="none bg-info">
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 291, in test_edit_author
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.3" class="none bg-info">
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 471, in test_edit_category
-    self.get_book_details(12)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.4" class="none bg-info">
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 638, in test_edit_comments
-    self.get_book_details(12)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.5" class="none bg-info">
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 653, in test_edit_custom_bool
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.6" class="none bg-info">
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 722, in test_edit_custom_categories
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.7" class="none bg-info">
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 740, in test_edit_custom_float
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.8" class="none bg-info">
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 756, in test_edit_custom_int
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.9" class="none bg-info">
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 669, in test_edit_custom_rating
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.10" class="none bg-info">
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 689, in test_edit_custom_single_select
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.11" class="none bg-info">
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 705, in test_edit_custom_text
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.12" class="none bg-info">
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 580, in test_edit_language
-    self.get_book_details(3)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.13" class="none bg-info">
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 525, in test_edit_publisher
-    self.get_book_details(7)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.14" class="none bg-info">
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 610, in test_edit_rating
-    books = self.get_books_displayed()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1185, in get_books_displayed
-    html = cls.driver.page_source
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 926, in page_source
-    return self.execute(Command.GET_PAGE_SOURCE)[&#39;value&#39;]
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 74, in request
-    return self.request_encode_url(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 96, in request_encode_url
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/source (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.15" class="none bg-info">
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 404, in test_edit_series
-    self.get_book_details(9)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.16" class="none bg-info">
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 133, in test_edit_title
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.17" class="none bg-info">
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 848, in test_upload_book_epub
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.18" class="none bg-info">
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 823, in test_upload_book_lit
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.19" class="none bg-info">
+        <tr id='pt16.19' class='hiddenRow bg-success'>
             <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_et16.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 771, in test_upload_cover_hdd
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.20" class="none bg-info">
+        <tr id='pt16.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 908, in test_watch_metadata
-    button = self.check_element_on_page((By.ID, &#34;enable_gdrive_watch&#34;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 707, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3107,11 +2320,11 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3121,20 +2334,64 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id="ft18.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft18.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 81, in test_STARTTLS
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Finished&#39;
+- E-mail: Test e-mail
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id="ft18.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft18.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 102, in test_STARTTLS_SSL_setup_error
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
+- E-mail: Buuko send to Kindle
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3149,12 +2406,12 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestSSL</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">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c19', 7)">Detail</a>
@@ -3163,20 +2420,64 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id="ft19.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft19.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 122, in test_SSL_None_setup_error
+    self.assertEqual(&#39;Failed&#39;, ret[-1][&#39;result&#39;])
+AssertionError: &#39;Failed&#39; != &#39;E-mail: Buuko send to Kindle&#39;
+- Failed
++ E-mail: Buuko send to Kindle</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id="ft19.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft19.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 101, in test_SSL_STARTTLS_setup_error
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
+- E-mail: Buuko send to Kindle
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3199,20 +2500,62 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id='pt19.5' class='hiddenRow bg-success'>
+        <tr id="ft19.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft19.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 79, in test_SSL_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Finished&#39;
+- E-mail: Buuko send to Kindle
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt19.6' class='hiddenRow bg-success'>
+        <tr id="et19.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et19.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et19.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 167, in test_email_limit
+    details = self.get_book_details(int(book_details[&#39;cover&#39;].split(&#39;/&#39;)[-1].split(&#39;?&#39;)[0]))
+ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3343,13 +2686,13 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSetupGdrive</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
@@ -3357,31 +2700,11 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
 
     
     
-        <tr id="ft23.1" class="none bg-danger">
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_gdrive_setup.py&#34;, line 113, in test_config_gdrive
-    self.assertFalse(use_gdrive.is_selected())
-AssertionError: True is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4397,12 +3720,12 @@ AssertionError: True is not false</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">4</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('c35', 5)">Detail</a>
@@ -4438,11 +3761,33 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id="et35.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 222, in sound_test
+    self.delete_book(int(details[&#39;cover&#39;].split(&#39;/&#39;)[-1].split(&#39;?&#39;)[0]))
+ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4786,12 +4131,12 @@ AssertionError: True is not false</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">1</td>
         <td class="text-center">
             <a onclick="showClassDetail('c40', 9)">Detail</a>
@@ -4836,20 +4181,90 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id="et40.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et40.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et40.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et40.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 381, in test_perform_update
+    button.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;DialogFinished&#34; class=&#34;btn btn-default hidden&#34; type=&#34;button&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id="et40.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et40.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et40.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et40.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 318, in test_perform_update_stable_errors
+    performUpdate.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4889,11 +4304,31 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id="ft40.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft40.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft40.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft40.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 409, in test_update_write_protect
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;message&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -5819,9 +5254,9 @@ AssertionError: True is not false</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>404</td>
-        <td>373</td>
-        <td>1</td>
-        <td>23</td>
+        <td>365</td>
+        <td>27</td>
+        <td>5</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5860,6 +5295,12 @@ AssertionError: True is not false</pre>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>APScheduler</th>
+              <td>3.7.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Babel</th>
               <td>2.9.1</td>
@@ -5976,7 +5417,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Werkzeug</th>
-              <td>2.0.2</td>
+              <td>2.0.3</td>
               <td>Basic</td>
             </tr>
           
@@ -6252,7 +5693,7 @@ AssertionError: True is not false</pre>
 </div>
 
 <script>
-    drawCircle(373, 1, 23, 7);
+    drawCircle(365, 27, 5, 7);
     showCase(5);
 </script>
 

From e9b674f46e3fc08e9e83f3d1b6968725e294c9cf Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 8 Feb 2022 19:35:00 +0100
Subject: [PATCH 177/412] Fix a problem with sending emails from custom domain
 name server (#2301)

---
 cps/tasks/convert.py |  2 ++
 cps/tasks/mail.py    | 54 +++++++++++++++++---------------------------
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index e610b14b5..98cd7b485 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -35,6 +35,8 @@ from cps.ub import init_db_thread
 
 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
+
+
 log = logger.create()
 
 
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 03526c8bd..1e652b02c 100644
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -23,16 +23,8 @@ import threading
 import socket
 import mimetypes
 
-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 io import StringIO
+from email.message import EmailMessage
 
 
 
@@ -131,19 +123,24 @@ class TaskEmail(CalibreTask):
         self.results = dict()
 
     def prepare_message(self):
-        message = MIMEMultipart()
+        message = EmailMessage()
+        # message = MIMEMultipart()
         message['to'] = self.recipent
         message['from'] = self.settings["mail_from"]
         message['subject'] = self.subject
         message['Message-Id'] = make_msgid('calibre-web')
         message['Date'] = formatdate(localtime=True)
-        text = self.text
-        msg = MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8')
-        message.attach(msg)
+        # text = self.text
+        message.set_content(self.text.encode('UTF-8'), "text", "plain")
         if self.attachment:
-            result = self._get_attachment(self.filepath, self.attachment)
-            if result:
-                message.attach(result)
+            data = self._get_attachment(self.filepath, self.attachment)
+            if data:
+                # Set mimetype
+                content_type, encoding = mimetypes.guess_type(self.attachment)
+                if content_type is None or encoding is not None:
+                    content_type = 'application/octet-stream'
+                main_type, sub_type = content_type.split('/', 1)
+                message.add_attachment(data, maintype=main_type, subtype=sub_type, filename=self.attachment)
             else:
                 self._handleError(u"Attachment not found")
                 return
@@ -226,15 +223,15 @@ class TaskEmail(CalibreTask):
             self._progress = x
 
     @classmethod
-    def _get_attachment(cls, bookpath, filename):
+    def _get_attachment(cls, book_path, filename):
         """Get file as MIMEBase message"""
         calibre_path = config.config_calibre_dir
         if config.config_use_google_drive:
-            df = gdriveutils.getFileFromEbooksFolder(bookpath, filename)
+            df = gdriveutils.getFileFromEbooksFolder(book_path, filename)
             if df:
-                datafile = os.path.join(calibre_path, bookpath, filename)
-                if not os.path.exists(os.path.join(calibre_path, bookpath)):
-                    os.makedirs(os.path.join(calibre_path, bookpath))
+                datafile = os.path.join(calibre_path, book_path, filename)
+                if not os.path.exists(os.path.join(calibre_path, book_path)):
+                    os.makedirs(os.path.join(calibre_path, book_path))
                 df.GetContentFile(datafile)
             else:
                 return None
@@ -244,23 +241,14 @@ class TaskEmail(CalibreTask):
             os.remove(datafile)
         else:
             try:
-                file_ = open(os.path.join(calibre_path, bookpath, filename), 'rb')
+                file_ = open(os.path.join(calibre_path, book_path, filename), 'rb')
                 data = file_.read()
                 file_.close()
             except IOError as e:
                 log.debug_or_exception(e, stacklevel=3)
                 log.error(u'The requested file could not be read. Maybe wrong permissions?')
                 return None
-        # Set mimetype
-        content_type, encoding = mimetypes.guess_type(filename)
-        if content_type is None or encoding is not None:
-            content_type = 'application/octet-stream'
-        main_type, sub_type = content_type.split('/', 1)
-        attachment = MIMEBase(main_type, sub_type)
-        attachment.set_payload(data)
-        encoders.encode_base64(attachment)
-        attachment.add_header('Content-Disposition', 'attachment', filename=filename)
-        return attachment
+        return data
 
     @property
     def name(self):

From ef7c6731bcb2035320fce731114d22b209869928 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 14 Feb 2022 17:35:20 +0100
Subject: [PATCH 178/412] Possible fix for #2301 (sending emails from custom
 domain name server)

---
 cps/tasks/mail.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 cps/tasks/mail.py

diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
old mode 100644
new mode 100755
index 1e652b02c..80adbbcc5
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -16,7 +16,6 @@
 #  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 sys
 import os
 import smtplib
 import threading
@@ -25,7 +24,7 @@ import mimetypes
 
 from io import StringIO
 from email.message import EmailMessage
-
+from email.utils import parseaddr
 
 
 from email import encoders
@@ -37,6 +36,7 @@ from cps.services import gmail
 from cps import logger, config
 
 from cps import gdriveutils
+import uuid
 
 log = logger.create()
 
@@ -122,15 +122,27 @@ class TaskEmail(CalibreTask):
         self.asyncSMTP = None
         self.results = dict()
 
+    # from calibre code:
+    # https://github.com/kovidgoyal/calibre/blob/731ccd92a99868de3e2738f65949f19768d9104c/src/calibre/utils/smtp.py#L60
+    def get_msgid_domain(self):
+        try:
+            # Parse out the address from the From line, and then the domain from that
+            from_email = parseaddr(self.settings["mail_from"])[1]
+            msgid_domain = from_email.partition('@')[2].strip()
+            # This can sometimes sneak through parseaddr if the input is malformed
+            msgid_domain = msgid_domain.rstrip('>').strip()
+        except Exception:
+            msgid_domain = ''
+        return msgid_domain or 'calibre-web.com'
+
     def prepare_message(self):
         message = EmailMessage()
         # message = MIMEMultipart()
-        message['to'] = self.recipent
-        message['from'] = self.settings["mail_from"]
-        message['subject'] = self.subject
-        message['Message-Id'] = make_msgid('calibre-web')
+        message['From'] = self.settings["mail_from"]
+        message['To'] = self.recipent
+        message['Subject'] = self.subject
         message['Date'] = formatdate(localtime=True)
-        # text = self.text
+        message['Message-Id'] = "{}@{}".format(uuid.uuid4(), self.get_msgid_domain()) # f"<{uuid.uuid4()}@{get_msgid_domain(from_)}>" # make_msgid('calibre-web')
         message.set_content(self.text.encode('UTF-8'), "text", "plain")
         if self.attachment:
             data = self._get_attachment(self.filepath, self.attachment)

From 0aac961cde83c22abd4985f720679aa588f79e05 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 19 Feb 2022 09:41:10 +0100
Subject: [PATCH 179/412] Update readme Bugfix debug logging during update
 unrar-free is now also recognized for displaying unrar version in about
 section, removed unused not configured string

---
 README.md        | 14 +++++---------
 cps/converter.py | 11 ++++++-----
 cps/updater.py   |  4 ++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index ea9d9ba03..d9c50f7f0 100644
--- a/README.md
+++ b/README.md
@@ -40,16 +40,12 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 ## Installation
 
 #### Installation via pip (recommended)
-1. Install calibre web via pip with the command `pip install calibreweb` (Depending on your OS and or distro the command could also be `pip3`). 
-2. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details 
-3. Calibre-Web can be started afterwards by typing `cps` or `python3 -m cps` 
+1. To avoid problems with already installed python dependencies, it's recommended to create a virtual environment for Calibre-Web
+2. Install Calibre-Web via pip with the command `pip install calibreweb` (Depending on your OS and or distro the command could also be `pip3`). 
+3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details 
+4. Calibre-Web can be started afterwards by typing `cps` or `python3 -m cps` 
 
-#### Manual installation
-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)
-
-Issues with Ubuntu:
-Please note that running the above install command can fail on some versions of Ubuntu, saying `"can't combine user with prefix"`. This is a [known bug](https://github.com/pypa/pip/issues/3826) and can be remedied by using the command `pip install --system --target vendor -r requirements.txt` instead.
+In the Wiki there are also examples for a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation) and for installation on [Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20)
 
 ## Quick start
 
diff --git a/cps/converter.py b/cps/converter.py
index fcbabbfc1..bb197467b 100644
--- a/cps/converter.py
+++ b/cps/converter.py
@@ -27,7 +27,6 @@ from .subproc_wrapper import process_wait
 log = logger.create()
 
 # _() necessary to make babel aware of string for translation
-_NOT_CONFIGURED = _('not configured')
 _NOT_INSTALLED = _('not installed')
 _EXECUTION_ERROR = _('Execution permissions missing')
 
@@ -48,14 +47,16 @@ def _get_command_version(path, pattern, argument=None):
 
 
 def get_calibre_version():
-    return _get_command_version(config.config_converterpath, r'ebook-convert.*\(calibre', '--version') \
-           or _NOT_CONFIGURED
+    return _get_command_version(config.config_converterpath, r'ebook-convert.*\(calibre', '--version')
 
 
 def get_unrar_version():
-    return _get_command_version(config.config_rarfile_location, r'UNRAR.*\d') or _NOT_CONFIGURED
+    unrar_version = _get_command_version(config.config_rarfile_location, r'UNRAR.*\d')
+    if unrar_version == "not installed":
+        unrar_version = _get_command_version(config.config_rarfile_location, r'unrar.*\d','-V')
+    return unrar_version
 
 def get_kepubify_version():
-    return _get_command_version(config.config_kepubifypath, r'kepubify\s','--version') or _NOT_CONFIGURED
+    return _get_command_version(config.config_kepubifypath, r'kepubify\s','--version')
 
 
diff --git a/cps/updater.py b/cps/updater.py
index 2166b3344..181c43749 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -214,7 +214,7 @@ class Updater(threading.Thread):
             if not os.path.exists(dst_dir):
                 try:
                     os.makedirs(dst_dir)
-                    log.debug('Create directory: {}', dst_dir)
+                    log.debug('Create directory: {}'.format(dst_dir))
                 except OSError as e:
                     log.error('Failed creating folder: {} with error {}'.format(dst_dir, e))
                 if change_permissions:
@@ -233,7 +233,7 @@ class Updater(threading.Thread):
                         permission = os.stat(dst_file)
                     try:
                         os.remove(dst_file)
-                        log.debug('Remove file before copy: %s', dst_file)
+                        log.debug('Remove file before copy: {}'.format(dst_file))
                     except OSError as e:
                         log.error('Failed removing file: {} with error {}'.format(dst_file, e))
                 else:

From 8007e450b3178f517b83b0989744c6df38867932 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 19 Feb 2022 10:04:21 +0100
Subject: [PATCH 180/412] Bugfix for cbr support without comicapi

---
 cps/comic.py              | 2 +-
 optional-requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/comic.py b/cps/comic.py
index 647114604..9e7f4f8f2 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -97,7 +97,7 @@ def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecu
         try:
             rarfile.UNRAR_TOOL = rarExecutable
             cf = rarfile.RarFile(tmp_file_name)
-            for name in cf.getnames():
+            for name in cf.namelist():
                 ext = os.path.splitext(name)
                 if len(ext) > 1:
                     extension = ext[1].lower()
diff --git a/optional-requirements.txt b/optional-requirements.txt
index f7c7b572b..04f7bb0c1 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -28,7 +28,7 @@ Flask-Dance>=2.0.0,<5.2.0
 SQLAlchemy-Utils>=0.33.5,<0.39.0
 
 # metadata extraction
-rarfile>=2.7
+rarfile>=3.2
 scholarly>=1.2.0,<1.6
 markdown2>=2.0.0,<2.5.0
 html2text>=2020.1.16,<2022.1.1

From 86b779f39b3725ecfdb9b8b6e837a219baab26e9 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Fri, 25 Feb 2022 01:01:12 +0800
Subject: [PATCH 181/412] Add douban metadate provider

---
 cps/metadata_provider/douban.py | 175 ++++++++++++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 cps/metadata_provider/douban.py

diff --git a/cps/metadata_provider/douban.py b/cps/metadata_provider/douban.py
new file mode 100644
index 000000000..5eda21ec4
--- /dev/null
+++ b/cps/metadata_provider/douban.py
@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 xlivevil
+#
+#  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 re
+from concurrent import futures
+from typing import List, Optional
+
+import requests
+from html2text import HTML2Text
+from lxml import etree
+
+from cps import logger
+from cps.services.Metadata import Metadata, MetaRecord, MetaSourceInfo
+
+log = logger.create()
+
+
+def html2text(html: str) -> str:
+
+    h2t = HTML2Text()
+    h2t.body_width = 0
+    h2t.single_line_break = True
+    h2t.emphasis_mark = "*"
+    return h2t.handle(html)
+
+
+class Douban(Metadata):
+    __name__ = "豆瓣"
+    __id__ = "douban"
+    DESCRIPTION = "豆瓣"
+    META_URL = "https://book.douban.com/"
+    SEARCH_URL = "https://www.douban.com/j/search"
+
+    ID_PATTERN = re.compile(r"sid: (?P<id>\d+),")
+    AUTHORS_PATTERN = re.compile(r"作者|译者")
+    PUBLISHER_PATTERN = re.compile(r"出版社")
+    SUBTITLE_PATTERN = re.compile(r"副标题")
+    PUBLISHED_DATE_PATTERN = re.compile(r"出版年")
+    SERIES_PATTERN = re.compile(r"丛书")
+    IDENTIFIERS_PATTERN = re.compile(r"ISBN|统一书号")
+
+    TITTLE_XPATH = "//span[@property='v:itemreviewed']"
+    COVER_XPATH = "//a[@class='nbg']"
+    INFO_XPATH = "//*[@id='info']//span[@class='pl']"
+    TAGS_XPATH = "//a[contains(@class, 'tag')]"
+    DESCRIPTION_XPATH = "//div[@id='link-report']//div[@class='intro']"
+    RATING_XPATH = "//div[@class='rating_self clearfix']/strong"
+
+    session = requests.Session()
+    session.headers = {
+        'user-agent':
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36 Edg/98.0.1108.56',
+    }
+
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
+        if self.active:
+            log.debug(f"starting search {query} on douban")
+            if title_tokens := list(
+                self.get_title_tokens(query, strip_joiners=False)
+            ):
+                query = "+".join(title_tokens)
+
+            try:
+                r = self.session.get(
+                    self.SEARCH_URL, params={"cat": 1001, "q": query}
+                )
+                r.raise_for_status()
+
+            except Exception as e:
+                log.warning(e)
+                return None
+
+            results = r.json()
+            if results["total"] == 0:
+                return val
+
+            book_id_list = [
+                self.ID_PATTERN.search(item).group("id")
+                for item in results["items"][:10] if self.ID_PATTERN.search(item)
+            ]
+
+            with futures.ThreadPoolExecutor(max_workers=5) as executor:
+
+                fut = [
+                    executor.submit(self._parse_single_book, book_id, generic_cover)
+                    for book_id in book_id_list
+                ]
+                
+                val = [
+                    future.result() 
+                    for future in futures.as_completed(fut) if future.result()
+                ]
+
+        return val
+
+    def _parse_single_book(
+        self, id: str, generic_cover: str = ""
+    ) -> Optional[MetaRecord]:
+        url = f"https://book.douban.com/subject/{id}/"
+
+        try:
+            r = self.session.get(url)
+            r.raise_for_status()
+        except Exception as e:
+            log.warning(e)
+            return None
+
+        match = MetaRecord(
+            id=id,
+            title="",
+            authors=[],
+            url=url,
+            source=MetaSourceInfo(
+                id=self.__id__,
+                description=self.DESCRIPTION,
+                link=self.META_URL,
+            ),
+        )
+
+        html = etree.HTML(r.content.decode("utf8"))
+
+        match.title = html.xpath(self.TITTLE_XPATH)[0].text
+        match.cover = html.xpath(self.COVER_XPATH)[0].attrib["href"] or generic_cover
+        try:
+            rating_num = float(html.xpath(self.RATING_XPATH)[0].text.strip())
+        except ValueError:
+            rating_num = 0
+        match.rating = int(-1 * rating_num // 2 * -1) if rating_num else 0
+
+        tag_elements = html.xpath(self.TAGS_XPATH)
+        if len(tag_elements):
+            match.tags = [tag_element.text for tag_element in tag_elements]
+
+        description_element = html.xpath(self.DESCRIPTION_XPATH)
+        if len(description_element):
+            match.description = html2text(etree.tostring(
+                description_element[-1], encoding="utf8").decode("utf8"))
+
+        info = html.xpath(self.INFO_XPATH)
+
+        for element in info:
+            text = element.text
+            if self.AUTHORS_PATTERN.search(text):
+                next = element.getnext()
+                while next is not None and next.tag != "br":
+                    match.authors.append(next.text)
+                    next = next.getnext()
+            elif self.PUBLISHER_PATTERN.search(text):
+                match.publisher = element.tail.strip()
+            elif self.SUBTITLE_PATTERN.search(text):
+                match.title = f'{match.title}:' + element.tail.strip()
+            elif self.PUBLISHED_DATE_PATTERN.search(text):
+                match.publishedDate = element.tail.strip()
+            elif self.SUBTITLE_PATTERN.search(text):
+                match.series = element.getnext().text
+            elif i_type := self.IDENTIFIERS_PATTERN.search(text):
+                match.identifiers[i_type.group()] = element.tail.strip()
+
+        return match

From 695ce836813969aaffb3dac288536cdf7ff3edc9 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Fri, 25 Feb 2022 01:12:22 +0800
Subject: [PATCH 182/412] Fix Uncaught RangeError

---
 cps/static/js/edit_books.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/js/edit_books.js b/cps/static/js/edit_books.js
index 0bfe078cf..c1eb319d4 100644
--- a/cps/static/js/edit_books.js
+++ b/cps/static/js/edit_books.js
@@ -33,7 +33,7 @@ $(".datepicker").datepicker({
     if (results) {
         pubDate = new Date(results[1], parseInt(results[2], 10) - 1, results[3]) || new Date(this.value);
         $(this).next('input')
-            .val(pubDate.toLocaleDateString(language))
+            .val(pubDate.toLocaleDateString(language.replaceAll("_","-")))
             .removeClass("hidden");
     }
 }).trigger("change");

From 97cf20764bcc5ca37a7d58791d350e962c4edbc8 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Fri, 25 Feb 2022 12:18:07 +0800
Subject: [PATCH 183/412] Add exception handling and logger in metadata
 provider

---
 cps/metadata_provider/amazon.py       | 33 +++++++++++++++++++--------
 cps/metadata_provider/comicvine.py    | 16 +++++++++----
 cps/metadata_provider/google.py       | 10 +++++++-
 cps/metadata_provider/lubimyczytac.py | 17 ++++++++++++--
 cps/metadata_provider/scholar.py      | 10 +++++++-
 cps/search_metadata.py                |  2 +-
 cps/static/js/get_meta.js             | 19 +++++++++------
 7 files changed, 81 insertions(+), 26 deletions(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index 558edebce..5c74cf711 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -19,15 +19,20 @@
 import concurrent.futures
 import requests
 from bs4 import BeautifulSoup as BS  # requirement
+from typing import List, Optional
 
 try:
     import cchardet #optional for better speed
 except ImportError:
     pass
+from cps import logger
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 #from time import time
 from operator import itemgetter
 
+log = logger.create()
+
+
 class Amazon(Metadata):
     __name__ = "Amazon"
     __id__ = "amazon"
@@ -46,12 +51,16 @@ class Amazon(Metadata):
 
     def search(
         self, query: str, generic_cover: str = "", locale: str = "en"
-    ):
+    ) -> Optional[List[MetaRecord]]:
         #timer=time()
-        def inner(link,index)->[dict,int]:
-             with self.session as session:
-                r = session.get(f"https://www.amazon.com/{link}")
-                r.raise_for_status()
+        def inner(link,index) -> tuple[dict,int]:
+            with self.session as session:
+                try:
+                    r = session.get(f"https://www.amazon.com/{link}")
+                    r.raise_for_status()
+                except Exception as e:
+                    log.warning(e)
+                    return
                 long_soup = BS(r.text, "lxml")  #~4sec :/
                 soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
                 if soup2 is None:
@@ -107,11 +116,15 @@ class Amazon(Metadata):
 
         val = list()
         if self.active:
-            results = self.session.get(
-                f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}"
-                f"%2Cdigital-text&ref=nb_sb_noss",
-                headers=self.headers)
-            results.raise_for_status()
+            try:
+                results = self.session.get(
+                    f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}"
+                    f"%2Cdigital-text&ref=nb_sb_noss",
+                    headers=self.headers)
+                results.raise_for_status()
+            except Exception as e:
+                    log.warning(e)
+                    return None
             soup = BS(results.text, 'html.parser')
             links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
                           soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py
index 56618d4b4..b4d8d34ce 100644
--- a/cps/metadata_provider/comicvine.py
+++ b/cps/metadata_provider/comicvine.py
@@ -21,8 +21,11 @@ from typing import Dict, List, Optional
 from urllib.parse import quote
 
 import requests
+from cps import logger
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
+log = logger.create()
+
 
 class ComicVine(Metadata):
     __name__ = "ComicVine"
@@ -46,10 +49,15 @@ class ComicVine(Metadata):
             if title_tokens:
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = "%20".join(tokens)
-            result = requests.get(
-                f"{ComicVine.BASE_URL}{query}{ComicVine.QUERY_PARAMS}",
-                headers=ComicVine.HEADERS,
-            )
+            try:
+                result = requests.get(
+                    f"{ComicVine.BASE_URL}{query}{ComicVine.QUERY_PARAMS}",
+                    headers=ComicVine.HEADERS,
+                )
+                result.raise_for_status()
+            except Exception as e:
+                log.warning(e)
+                return None
             for result in result.json()["results"]:
                 match = self._parse_search_result(
                     result=result, generic_cover=generic_cover, locale=locale
diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index fbb689659..98fadd372 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -22,9 +22,12 @@ from urllib.parse import quote
 
 import requests
 
+from cps import logger
 from cps.isoLanguages import get_lang3, get_language_name
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
+log = logger.create()
+
 
 class Google(Metadata):
     __name__ = "Google"
@@ -45,7 +48,12 @@ class Google(Metadata):
             if title_tokens:
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = "+".join(tokens)
-            results = requests.get(Google.SEARCH_URL + query)
+            try:
+                results = requests.get(Google.SEARCH_URL + query)
+                results.raise_for_status()
+            except Exception as e:
+                log.warning(e)
+                return None
             for result in results.json().get("items", []):
                 val.append(
                     self._parse_search_result(
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 814a785e7..e4abe9dbc 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -27,9 +27,12 @@ from html2text import HTML2Text
 from lxml.html import HtmlElement, fromstring, tostring
 from markdown2 import Markdown
 
+from cps import logger
 from cps.isoLanguages import get_language_name
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
+log = logger.create()
+
 SYMBOLS_TO_TRANSLATE = (
     "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
     "oOuUoOoOuUeEaAuUiIaAcCeElLnNoOsSzZzZ",
@@ -112,7 +115,12 @@ class LubimyCzytac(Metadata):
         self, query: str, generic_cover: str = "", locale: str = "en"
     ) -> Optional[List[MetaRecord]]:
         if self.active:
-            result = requests.get(self._prepare_query(title=query))
+            try:
+                result = requests.get(self._prepare_query(title=query))
+                result.raise_for_status()
+            except Exception as e:
+                log.warning(e)
+                return None
             root = fromstring(result.text)
             lc_parser = LubimyCzytacParser(root=root, metadata=self)
             matches = lc_parser.parse_search_results()
@@ -200,7 +208,12 @@ class LubimyCzytacParser:
     def parse_single_book(
         self, match: MetaRecord, generic_cover: str, locale: str
     ) -> MetaRecord:
-        response = requests.get(match.url)
+        try:
+            response = requests.get(match.url)
+            response.raise_for_status()
+        except Exception as e:
+            log.warning(e)
+            return None
         self.root = fromstring(response.text)
         match.cover = self._parse_cover(generic_cover=generic_cover)
         match.description = self._parse_description()
diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index b0c10b665..7feb0ee9b 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -28,8 +28,12 @@ try:
 except FakeUserAgentError:
     raise ImportError("No module named 'scholarly'")
 
+from cps import logger
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
+log = logger.create()
+
+
 class scholar(Metadata):
     __name__ = "Google Scholar"
     __id__ = "googlescholar"
@@ -44,7 +48,11 @@ class scholar(Metadata):
             if title_tokens:
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = " ".join(tokens)
-            scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
+            try:
+                scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
+            except Exception as e:
+                log.warning(e)
+                return None
             for result in scholar_gen:
                 match = self._parse_search_result(
                     result=result, generic_cover="", locale=locale
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index d72273f64..d02667d53 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -130,6 +130,6 @@ def metadata_search():
                 if active.get(c.__id__, True)
             }
             for future in concurrent.futures.as_completed(meta):
-                data.extend([asdict(x) for x in future.result()])
+                data.extend([asdict(x) for x in future.result() if x])
     # log.info({'Time elapsed {}'.format(current_milli_time()-start)})
     return Response(json.dumps(data), mimetype="application/json")
diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index 6db1a2617..43a40fa65 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -92,14 +92,19 @@ $(function () {
                 data: {"query": keyword},
                 dataType: "json",
                 success: function success(data) {
-                    $("#meta-info").html("<ul id=\"book-list\" class=\"media-list\"></ul>");
-                    data.forEach(function(book) {
-                        var $book = $(templates.bookResult(book));
-                        $book.find("img").on("click", function () {
-                            populateForm(book);
+                    if (data.length) {
+                        $("#meta-info").html("<ul id=\"book-list\" class=\"media-list\"></ul>");
+                        data.forEach(function(book) {
+                            var $book = $(templates.bookResult(book));
+                            $book.find("img").on("click", function () {
+                                populateForm(book);
+                            });
+                            $("#book-list").append($book);
                         });
-                        $("#book-list").append($book);
-                    });
+                    }
+                    else {
+                        $("#meta-info").html("<p class=\"text-danger\">" + msg.no_result + "!</p>" + $("#meta-info")[0].innerHTML)
+                    }
                 },
                 error: function error() {
                     $("#meta-info").html("<p class=\"text-danger\">" + msg.search_error + "!</p>" + $("#meta-info")[0].innerHTML);

From 965352c8d96c9eae7a6867ff76b0db137d04b0b8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 26 Feb 2022 08:05:35 +0100
Subject: [PATCH 184/412] Don't allow redirects on cover uploads, catch more
 addresses which resolve to localhost

---
 cps/helper.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index b5495930b..c162f7eef 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -734,10 +734,10 @@ def save_cover_from_url(url, book_path):
         if not cli.allow_localhost:
             # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
             ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
-            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1" or ip == "0.0.0.0" or ip == "::":
                 log.error("Localhost was accessed for cover upload")
                 return False, _("You are not allowed to access localhost for cover uploads")
-        img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
+        img = requests.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)
     except (socket.gaierror,

From 598618e4285d4450c74c9920941eef3242db880e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 1 Mar 2022 16:36:46 +0100
Subject: [PATCH 185/412] Fix rename_files_on_change return handling Updated
 test result

---
 cps/helper.py                           |   11 +-
 test/Calibre-Web TestSummary_Linux.html | 2491 ++++-------------------
 2 files changed, 350 insertions(+), 2152 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index c162f7eef..03a2d03b8 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -493,12 +493,10 @@ def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_d
                                title_dir + " (" + str(book_id) + ")")
     book.path = gdrive_path.replace("\\", "/")
     gd.uploadFileToEbooksFolder(os.path.join(gdrive_path, file_name).replace("\\", "/"), original_filepath)
-    error |= rename_files_on_change(first_author, renamed_author, localbook=book, gdrive=True)
-    return error
+    return rename_files_on_change(first_author, renamed_author, localbook=book, gdrive=True)
 
 
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
-    error = False
     book = calibre_db.get_book(book_id)
 
     authordir = book.path.split('/')[0]
@@ -513,7 +511,7 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             book.path = book.path.split('/')[0] + u'/' + new_titledir
             gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
         else:
-            error = _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
+            return _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
 
     if authordir != new_authordir and authordir not in renamed_author:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
@@ -522,12 +520,11 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             book.path = new_authordir + u'/' + book.path.split('/')[1]
             gd.updateDatabaseOnEdit(gFile['id'], book.path)
         else:
-            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
+            return _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
 
     # change location in database to new author/title path
     book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
-    error |= rename_files_on_change(first_author, renamed_author, book, gdrive=True)
-    return error
+    return rename_files_on_change(first_author, renamed_author, book, gdrive=True)
 
 
 def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, db_filename, original_filepath, path):
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index af8cfcd9a..c569a45dd 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-05 20:19:09</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-28 21:38:15</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>2022-02-06 00:20:42</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-01 01:36:56</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>3h 15 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 14 min</p>
         </div>
       </div>
       </div>
@@ -330,13 +330,13 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCliGdrivedb</td>
         <td class="text-center">2</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c3', 2)">Detail</a>
         </td>
@@ -344,89 +344,20 @@
 
     
     
-        <tr id="et3.1" class="none bg-info">
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 179, in test_cli_gdrive_location
-    self.fill_db_config({&#39;config_google_drive_folder&#39;: &#39;test&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 254, in fill_db_config
-    select = Select(cls.driver.find_element(By.ID, key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_google_drive_folder&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et3.2" class="none bg-info">
+        <tr id='pt3.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 144, in test_gdrive_db_nonwrite
-    self.fill_db_config({&#39;config_use_google_drive&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 250, in fill_db_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;input id=&#34;config_use_google_drive&#34; name=&#34;config_use_google_drive&#34; type=&#34;checkbox&#34;&gt; is not clickable at point (473,225) because another element &lt;div id=&#34;GeneralChangeModal&#34; class=&#34;modal fade in&#34;&gt; obscures it
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementClickInterceptedError@chrome://remote/content/shared/webdriver/Errors.jsm:282:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:166:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1496,9 +1427,9 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 544, in test_rename_capital_on_upload
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 579, in test_rename_capital_on_upload
+    self.assertEqual(&#39;Useless&#39;, details[&#39;title&#39;])
+KeyError: &#39;title&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1713,9 +1644,9 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">20</td>
+        <td class="text-center">15</td>
+        <td class="text-center">3</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c16', 20)">Detail</a>
@@ -1724,31 +1655,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
 
     
     
-        <tr id="et16.1" class="none bg-info">
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 877, in test_download_book
-    self.assertEqual(len(list_element), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1770,77 +1681,9 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 291, in test_edit_author
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 392, in test_edit_author
+    self.assertEqual(values[&#39;author&#39;][0], &#39;Pipo, Pipe&#39;)
+IndexError: list index out of range</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1850,751 +1693,119 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id="et16.3" class="none bg-info">
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 471, in test_edit_category
-    self.get_book_details(12)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.4" class="none bg-info">
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 638, in test_edit_comments
-    self.get_book_details(12)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.5" class="none bg-info">
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 653, in test_edit_custom_bool
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.6" class="none bg-info">
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 722, in test_edit_custom_categories
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.7" class="none bg-info">
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 740, in test_edit_custom_float
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.8" class="none bg-info">
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 756, in test_edit_custom_int
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.9" class="none bg-info">
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 669, in test_edit_custom_rating
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.10" class="none bg-info">
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 689, in test_edit_custom_single_select
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.11" class="none bg-info">
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 705, in test_edit_custom_text
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.12" class="none bg-info">
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 580, in test_edit_language
-    self.get_book_details(3)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.13" class="none bg-info">
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 525, in test_edit_publisher
-    self.get_book_details(7)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.14" class="none bg-info">
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 610, in test_edit_rating
-    books = self.get_books_displayed()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1185, in get_books_displayed
-    html = cls.driver.page_source
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 926, in page_source
-    return self.execute(Command.GET_PAGE_SOURCE)[&#39;value&#39;]
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 74, in request
-    return self.request_encode_url(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 96, in request_encode_url
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/source (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.15" class="none bg-info">
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 404, in test_edit_series
-    self.get_book_details(9)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2616,77 +1827,9 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 133, in test_edit_title
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 183, in test_edit_title
+    self.assertEqual(&#39;Unknown&#39;, values[&#39;title&#39;])
+KeyError: &#39;title&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2696,94 +1839,28 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id="et16.17" class="none bg-info">
+        <tr id="ft16.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.17')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.17')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et16.17" class="popup_window test_output" style="display:block;">
+                <div id="div_ft16.17" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.17').style.display='none'"><span
+                                onclick="document.getElementById('div_ft16.17').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 848, in test_upload_book_epub
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 865, in test_upload_book_epub
+    self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
+AssertionError: &#39;8936&#39; != &#39;1103&#39;
+- 8936
++ 1103</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2793,191 +1870,35 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id="et16.18" class="none bg-info">
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 823, in test_upload_book_lit
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.19" class="none bg-info">
+        <tr id="ft16.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_et16.19')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.19')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et16.19" class="popup_window test_output" style="display:block;">
+                <div id="div_ft16.19" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.19').style.display='none'"><span
+                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 771, in test_upload_cover_hdd
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 778, in test_upload_cover_hdd
+    self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
+AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2987,92 +1908,26 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id="et16.20" class="none bg-info">
+        <tr id="ft16.20" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.20')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.20')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et16.20" class="popup_window test_output" style="display:block;">
+                <div id="div_ft16.20" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.20').style.display='none'"><span
+                                onclick="document.getElementById('div_ft16.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 908, in test_watch_metadata
-    button = self.check_element_on_page((By.ID, &#34;enable_gdrive_watch&#34;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 707, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 947, in test_watch_metadata
+    self.assertNotIn(&#39;series&#39;, book)
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=cd72c8b1-57d4-4162-a993-661f44e62822&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3149,11 +2004,11 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3181,11 +2036,31 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id="ft19.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft19.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 130, in test_SSL_logging_email
+    self.assertTrue(len(re.findall(&#39;subject: Calibre-Web test e-mail&#39;, data)),&#34;Email logging not working&#34;)
+AssertionError: 0 is not true : Email logging not working</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3343,13 +2218,13 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSetupGdrive</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
@@ -3357,31 +2232,11 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
 
     
     
-        <tr id="ft23.1" class="none bg-danger">
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_gdrive_setup.py&#34;, line 113, in test_config_gdrive
-    self.assertFalse(use_gdrive.is_selected())
-AssertionError: True is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4899,929 +3754,275 @@ AssertionError: True is not false</pre>
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestUploadEPubs</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">6</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">6</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 2)">Detail</a>
+            <a onclick="showClassDetail('c41', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id="et41.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
+                <div class='testcase'>setUpClass (test_upload_epubs)</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt41.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 28, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
+During handling of the above exception, another exception occurred:
 
-    <tr id="su" class="passClass">
-        <td>TestUserList</td>
-        <td class="text-center">18</td>
-        <td class="text-center">18</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('c42', 18)">Detail</a>
-        </td>
-    </tr>
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 32, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.2" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_user_list)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 53, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#34;config_uploading&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
-    
-    
-        <tr id='pt42.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_edit_user_email</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_list_visibility</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_admin_role</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_check_sort</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_download_role</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_button</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_email</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_language</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_name</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_requests</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.17' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_search</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.18' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_sort</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
+During handling of the above exception, another exception occurred:
 
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 57, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.3" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_user_load)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_load.py&#34;, line 61, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#39;config_access_log&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
-    <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('c43', 1)">Detail</a>
-        </td>
-    </tr>
+During handling of the above exception, another exception occurred:
 
-    
-    
-        <tr id='pt43.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserLoad - test_user_change_vis</div>
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_load.py&#34;, line 65, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
+    
+        <tr id="et41.4" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_user_template)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_template.py&#34;, line 20, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
+During handling of the above exception, another exception occurred:
 
-    <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('c44', 21)">Detail</a>
-        </td>
-    </tr>
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_template.py&#34;, line 22, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.5" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_visiblilitys)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 25, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
-    
-    
-        <tr id='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.21' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
+During handling of the above exception, another exception occurred:
 
-
-    <tr id="su" class="passClass">
-        <td>TestCalibreWebVisibilitys</td>
-        <td class="text-center">34</td>
-        <td class="text-center">34</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('c45', 34)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt45.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 27, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id="et41.6" class="none bg-info">
             <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
+                <div class='testcase'>setUpClass (test_zz_helper)</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 25, in setUpClass
+    from cps import helper, updater
+ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown location)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.26' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.27' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.28' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.29' 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='pt45.30' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.31' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.32' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.33' 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='pt45.34' 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('c46', 16)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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>404</td>
-        <td>373</td>
-        <td>1</td>
-        <td>23</td>
+        <td>318</td>
+        <td>298</td>
+        <td>4</td>
+        <td>9</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5850,7 +4051,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-28-generic #31~20.04.1-Ubuntu SMP Wed Jan 19 14:08:10 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-30-generic #33~20.04.1-Ubuntu SMP Mon Feb 7 14:25:10 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -5880,7 +4081,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Flask</th>
-              <td>2.0.2</td>
+              <td>2.0.3</td>
               <td>Basic</td>
             </tr>
           
@@ -5934,7 +4135,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>PyPDF3</th>
-              <td>1.0.5</td>
+              <td>1.0.6</td>
               <td>Basic</td>
             </tr>
           
@@ -5964,7 +4165,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.3.2</td>
+              <td>1.3.3</td>
               <td>Basic</td>
             </tr>
           
@@ -5976,13 +4177,13 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Werkzeug</th>
-              <td>2.0.2</td>
+              <td>2.0.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -6012,7 +4213,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -6042,7 +4243,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -6084,7 +4285,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -6120,7 +4321,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -6162,7 +4363,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -6252,7 +4453,7 @@ AssertionError: True is not false</pre>
 </div>
 
 <script>
-    drawCircle(373, 1, 23, 7);
+    drawCircle(298, 4, 9, 7);
     showCase(5);
 </script>
 

From 9efd644360ef8eefc02363ba1109151773f6301c Mon Sep 17 00:00:00 2001
From: Bharat KNV <bharatknv@gmail.com>
Date: Sun, 6 Mar 2022 15:56:54 +0530
Subject: [PATCH 186/412] Change dark theme from black to dark gray and add a
 black theme

---
 cps/static/css/epub_themes.css | 7 ++++++-
 cps/static/css/main.css        | 7 ++++++-
 cps/static/js/reading/epub.js  | 1 +
 cps/templates/read.html        | 6 +++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/cps/static/css/epub_themes.css b/cps/static/css/epub_themes.css
index 4f6866818..16c27805d 100644
--- a/cps/static/css/epub_themes.css
+++ b/cps/static/css/epub_themes.css
@@ -4,11 +4,16 @@
 }
 
 .darkTheme {
-	background: #000;
+	background: #202124;
 	color: #fff
 }
 
 .sepiaTheme {
 	background: #ece1ca;
 	color: #000;
+}
+
+.blackTheme {
+	background: #000;
+	color: #fff
 }
\ No newline at end of file
diff --git a/cps/static/css/main.css b/cps/static/css/main.css
index 84f032296..03cb0a011 100644
--- a/cps/static/css/main.css
+++ b/cps/static/css/main.css
@@ -578,7 +578,7 @@ input:-moz-placeholder { color: #454545; }
 }
 
 .md-content .themes button.darkTheme {
-  background-color: black;
+  background-color: #202124;
   color: white;
 }
 
@@ -592,6 +592,11 @@ input:-moz-placeholder { color: #454545; }
   color: black;
 }
 
+.md-content .themes button.blackTheme {
+  background-color: black;
+  color: white;
+}
+
 /* Effect 1: Fade in and scale up */
 .md-effect-1 .md-content {
   -webkit-transform: scale(0.7);
diff --git a/cps/static/js/reading/epub.js b/cps/static/js/reading/epub.js
index 5e6748121..79f74b74b 100644
--- a/cps/static/js/reading/epub.js
+++ b/cps/static/js/reading/epub.js
@@ -16,6 +16,7 @@ var reader;
     reader.rendition.themes.register("lightTheme", "/static/css/epub_themes.css");
     reader.rendition.themes.register("darkTheme", "/static/css/epub_themes.css");
     reader.rendition.themes.register("sepiaTheme", "/static/css/epub_themes.css");
+    reader.rendition.themes.register("blackTheme", "/static/css/epub_themes.css");
 
     if (calibre.useBookmarks) {
         reader.on("reader:bookmarked", updateBookmark.bind(reader, "add"));
diff --git a/cps/templates/read.html b/cps/templates/read.html
index ed33e850d..7f473d1f7 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -76,6 +76,7 @@
                   <button type="button" id="lightTheme" class="lightTheme" onclick="selectTheme(this.id)"><span id="lightSelected">✓</span>{{_('Light')}}</button> 
                   <button type="button" id="darkTheme" class="darkTheme" onclick="selectTheme(this.id)"><span id="darkSelected"> </span>{{_('Dark')}}</button>
                   <button type="button" id="sepiaTheme" class="sepiaTheme" onclick="selectTheme(this.id)"><span id="sepiaSelected"> </span>{{_('Sepia')}}</button>
+                  <button type="button" id="blackTheme" class="blackTheme" onclick="selectTheme(this.id)"><span id="blackSelected"> </span>{{_('Black')}}</button>
               </div>
               <div>
                   <p>
@@ -115,7 +116,7 @@
 
             // Apply theme to rest of the page. TODO - Do this smarter
             if (id == "darkTheme") {
-              document.getElementById("main").style.backgroundColor = "black";
+              document.getElementById("main").style.backgroundColor = "#202124";
             }
             else if (id == "lightTheme") {
               document.getElementById("main").style.backgroundColor = "white";
@@ -123,6 +124,9 @@
             else if (id == "sepiaTheme") {
               document.getElementById("main").style.backgroundColor = "#ece1ca";
             }
+            else if (id == "blackTheme") {
+              document.getElementById("main").style.backgroundColor = "black";
+            }
           }
       </script>
       <script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>

From 153a443fca5e6a875c9d30f97eeecd7c9b99e4dd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@gmail.com>
Date: Sun, 6 Mar 2022 14:02:06 +0100
Subject: [PATCH 187/412] Update setup config

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 128741517..5b8ce6788 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -83,7 +83,7 @@ oauth =
 	Flask-Dance>=2.0.0,<5.2.0
 	SQLAlchemy-Utils>=0.33.5,<0.39.0
 metadata = 
-	rarfile>=2.7
+	rarfile>=3.2
 	scholarly>=1.2.0,<1.6
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1

From c53817859a0e46820a0a92bbd0697805f7e65445 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Mar 2022 16:02:01 +0100
Subject: [PATCH 188/412] Version update Updated testresult

---
 SECURITY.md                             |    2 +
 cps/constants.py                        |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 1226 +++++++++++++++++------
 3 files changed, 903 insertions(+), 327 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 262e66e2a..26ce3c555 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -32,6 +32,8 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
 | V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
 | V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             ||
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                            ||
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             ||
 
 
 ## Staement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/constants.py b/cps/constants.py
index f90031258..a96f614be 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -154,7 +154,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.17 Beta'}
+STABLE_VERSION = {'version': '0.6.17'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index c569a45dd..5daf8267c 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-28 21:38:15</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-02 20:56:18</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>2022-03-01 01:36:56</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-03 01:48:44</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>3h 14 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 5 min</p>
         </div>
       </div>
       </div>
@@ -1351,12 +1351,12 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditAuthorsGdrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">5</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">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 6)">Detail</a>
@@ -1410,31 +1410,11 @@
     
     
     
-        <tr id="et13.6" class="none bg-info">
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et13.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 579, in test_rename_capital_on_upload
-    self.assertEqual(&#39;Useless&#39;, details[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1641,12 +1621,12 @@ KeyError: &#39;title&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">15</td>
+        <td class="text-center">17</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c16', 20)">Detail</a>
@@ -1664,31 +1644,11 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id="et16.2" class="none bg-info">
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 392, in test_edit_author
-    self.assertEqual(values[&#39;author&#39;][0], &#39;Pipo, Pipe&#39;)
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1810,31 +1770,11 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="et16.16" class="none bg-info">
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 183, in test_edit_title
-    self.assertEqual(&#39;Unknown&#39;, values[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1927,7 +1867,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 947, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=cd72c8b1-57d4-4162-a993-661f44e62822&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=22ded0fa-26b4-429d-81fc-bc75707c4e4c&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2004,11 +1944,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</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">
@@ -2036,31 +1976,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="ft19.3" class="none bg-danger">
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft19.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 130, in test_SSL_logging_email
-    self.assertTrue(len(re.findall(&#39;subject: Calibre-Web test e-mail&#39;, data)),&#34;Email logging not working&#34;)
-AssertionError: 0 is not true : Email logging not working</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3754,275 +3674,929 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">6</td>
+    <tr id="su" class="passClass">
+        <td>TestUploadEPubs</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">6</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 6)">Detail</a>
+            <a onclick="showClassDetail('c41', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et41.1" class="none bg-info">
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_upload_epubs)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 28, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 32, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.2" class="none bg-info">
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_user_list)</div>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 53, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#34;config_uploading&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
-During handling of the above exception, another exception occurred:
 
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 57, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+    <tr id="su" class="passClass">
+        <td>TestUserList</td>
+        <td class="text-center">18</td>
+        <td class="text-center">18</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('c42', 18)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt42.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.3" class="none bg-info">
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_user_load)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_load.py&#34;, line 61, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#39;config_access_log&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_load.py&#34;, line 65, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.4" class="none bg-info">
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_user_template)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_template.py&#34;, line 20, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_template.py&#34;, line 22, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.5" class="none bg-info">
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_visiblilitys)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 25, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 27, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.6" class="none bg-info">
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_zz_helper)</div>
+                <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 25, in setUpClass
-    from cps import helper, updater
-ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown location)</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_button</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_name</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_requests</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_search</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_sort</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('c43', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt43.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('c44', 21)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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='pt44.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">34</td>
+        <td class="text-center">34</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('c45', 34)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt45.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.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='pt45.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.27' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.28' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.29' 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='pt45.30' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.31' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.32' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.33' 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='pt45.34' 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('c46', 16)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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='pt46.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>318</td>
-        <td>298</td>
-        <td>4</td>
-        <td>9</td>
+        <td>404</td>
+        <td>394</td>
+        <td>3</td>
+        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4183,7 +4757,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4213,7 +4787,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4243,7 +4817,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4285,7 +4859,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4321,7 +4895,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4363,7 +4937,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4453,7 +5027,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
 </div>
 
 <script>
-    drawCircle(298, 4, 9, 7);
+    drawCircle(394, 3, 0, 7);
     showCase(5);
 </script>
 

From 753319c8b63df34db9dfdf2e1078950070d410f3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@gmail.com>
Date: Sun, 6 Mar 2022 16:30:50 +0100
Subject: [PATCH 189/412] Version bump

---
 cps/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/constants.py b/cps/constants.py
index a96f614be..cb5348d55 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -154,7 +154,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.17'}
+STABLE_VERSION = {'version': '0.6.18 Beta'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'

From 34478079d83755ce843ba200638717929ecc3010 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 9 Mar 2022 14:45:39 +0100
Subject: [PATCH 190/412] Prevent local variable 'from_book' referenced before
 assignment during merge of books Merge books source book: Each book in own
 row Merge books, sources are deleted before dialog shows up again

---
 cps/editbooks.py       | 2 +-
 cps/static/js/table.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index fcf043a50..483e8a7e0 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1263,8 +1263,8 @@ def simulate_merge_list_book():
         to_book = calibre_db.get_book(vals[0]).title
         vals.pop(0)
         if to_book:
+            from_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 ""
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index dce1d06c3..ae8c591b3 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -107,8 +107,9 @@ $(function() {
             url: window.location.pathname + "/../ajax/simulatemerge",
             data: JSON.stringify({"Merge_books":selections}),
             success: function success(booTitles) {
+                $('#merge_from').empty();
                 $.each(booTitles.from, function(i, item) {
-                    $("<span>- " + item + "</span>").appendTo("#merge_from");
+                    $("<span>- " + item + "</span><p></p>").appendTo("#merge_from");
                 });
                 $("#merge_to").text("- " + booTitles.to);
 

From b54a170a00f3b5ecf4d4e2888db7f092522ba552 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Sat, 12 Mar 2022 13:54:37 +0800
Subject: [PATCH 191/412] Add clean_date method in douban metadata_provider

---
 cps/metadata_provider/douban.py | 37 ++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/cps/metadata_provider/douban.py b/cps/metadata_provider/douban.py
index 5eda21ec4..ee21f5877 100644
--- a/cps/metadata_provider/douban.py
+++ b/cps/metadata_provider/douban.py
@@ -88,7 +88,7 @@ class Douban(Metadata):
 
             results = r.json()
             if results["total"] == 0:
-                return val
+                return []
 
             book_id_list = [
                 self.ID_PATTERN.search(item).group("id")
@@ -139,7 +139,7 @@ class Douban(Metadata):
         match.cover = html.xpath(self.COVER_XPATH)[0].attrib["href"] or generic_cover
         try:
             rating_num = float(html.xpath(self.RATING_XPATH)[0].text.strip())
-        except ValueError:
+        except Exception:
             rating_num = 0
         match.rating = int(-1 * rating_num // 2 * -1) if rating_num else 0
 
@@ -166,10 +166,41 @@ class Douban(Metadata):
             elif self.SUBTITLE_PATTERN.search(text):
                 match.title = f'{match.title}:' + element.tail.strip()
             elif self.PUBLISHED_DATE_PATTERN.search(text):
-                match.publishedDate = element.tail.strip()
+                match.publishedDate = self._clean_date(element.tail.strip())
             elif self.SUBTITLE_PATTERN.search(text):
                 match.series = element.getnext().text
             elif i_type := self.IDENTIFIERS_PATTERN.search(text):
                 match.identifiers[i_type.group()] = element.tail.strip()
 
         return match
+
+    
+    def _clean_date(self, date: str) -> str:
+        """
+        Clean up the date string to be in the format YYYY-MM-DD
+
+        Examples of possible patterns:
+            '2014-7-16', '1988年4月', '1995-04', '2021-8', '2020-12-1', '1996年',
+            '1972', '2004/11/01', '1959年3月北京第1版第1印'
+        """
+        year = date[:4]
+        moon = "01"
+        day = "01"
+
+        if len(date) > 5:
+            digit = []
+            ls = []
+            for i in range(5, len(date)):
+                if date[i].isdigit():
+                    digit.append(date[i])
+                elif digit:
+                    ls.append("".join(digit) if len(digit)==2 else f"0{digit[0]}")
+                    digit = []
+            if digit:
+                ls.append("".join(digit) if len(digit)==2 else f"0{digit[0]}")
+
+            moon = ls[0]
+            if len(ls)>1:
+                day = ls[1]     
+
+        return f"{year}-{moon}-{day}"

From 49692b4a454f762edbefc6642dfb0f50b75418e6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 08:27:18 +0100
Subject: [PATCH 192/412] Update catch errors for load metadata from amazon
 (#2333)

---
 cps/metadata_provider/amazon.py | 62 +++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index 558edebce..acea7e07e 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -25,8 +25,11 @@ try:
 except ImportError:
     pass
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
+import cps.logger as logger
+
 #from time import time
 from operator import itemgetter
+log = logger.create()
 
 class Amazon(Metadata):
     __name__ = "Amazon"
@@ -48,15 +51,15 @@ class Amazon(Metadata):
         self, query: str, generic_cover: str = "", locale: str = "en"
     ):
         #timer=time()
-        def inner(link,index)->[dict,int]:
-             with self.session as session:
-                r = session.get(f"https://www.amazon.com/{link}")
-                r.raise_for_status()
-                long_soup = BS(r.text, "lxml")  #~4sec :/
-                soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
-                if soup2 is None:
-                    return
-                try:
+        def inner(link, index) -> [dict, int]:
+            try:
+                with self.session as session:
+                    r = session.get(f"https://www.amazon.com{link}")
+                    r.raise_for_status()
+                    long_soup = BS(r.text, "lxml")  #~4sec :/
+                    soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
+                    if soup2 is None:
+                        return
                     match = MetaRecord(
                         title = "",
                         authors = "",
@@ -65,7 +68,7 @@ class Amazon(Metadata):
                             description="Amazon Books",
                             link="https://amazon.com/"
                         ),
-                        url = f"https://www.amazon.com/{link}",
+                        url = f"https://www.amazon.com{link}",
                         #the more searches the slower, these are too hard to find in reasonable time or might not even exist
                         publisher= "",  # very unreliable
                         publishedDate= "",  # very unreliable
@@ -101,22 +104,27 @@ class Amazon(Metadata):
                     except (AttributeError, TypeError):
                         match.cover = ""
                     return match, index
-                except Exception as e:
-                    print(e)
-                    return
+            except Exception as e:
+                log.debug_or_exception(e)
+                return
 
         val = list()
-        if self.active:
-            results = self.session.get(
-                f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}"
-                f"%2Cdigital-text&ref=nb_sb_noss",
-                headers=self.headers)
-            results.raise_for_status()
-            soup = BS(results.text, 'html.parser')
-            links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
-                          soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
-            with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-                fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
-                val=list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
-        result=list(filter(lambda x: x, val))
-        return [x[0] for x in sorted(result, key=itemgetter(1))] #sort by amazons listing order for best relevance
+        try:
+            if self.active:
+                results = self.session.get(
+                    f"https://www.amazon.com/s?k={query.replace(' ', '+')}"
+                    f"&i=digital-text&sprefix={query.replace(' ', '+')}"
+                    f"%2Cdigital-text&ref=nb_sb_noss",
+                    headers=self.headers)
+                results.raise_for_status()
+                soup = BS(results.text, 'html.parser')
+                links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
+                              soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
+                with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+                    fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
+                    val = list(map(lambda x: x.result(), concurrent.futures.as_completed(fut)))
+            result = list(filter(lambda x: x, val))
+            return [x[0] for x in sorted(result, key=itemgetter(1))] #sort by amazons listing order for best relevance
+        except requests.exceptions.HTTPError as e:
+            log.debug_or_exception(e)
+            return []

From d80297e1a87523adc2b5731695cd91f06b265ae6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 10:00:38 +0100
Subject: [PATCH 193/412] Bugfix sorting user table

---
 cps/admin.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cps/admin.py b/cps/admin.py
index 4876d421b..18bd87ec7 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -298,10 +298,13 @@ def list_users():
     limit = int(request.args.get("limit") or 10)
     search = request.args.get("search")
     sort = request.args.get("sort", "id")
-    order = request.args.get("order", "").lower()
     state = None
     if sort == "state":
         state = json.loads(request.args.get("state", "[]"))
+    else:
+        if sort not in ub.User.__table__.columns.keys():
+            sort = "id"
+    order = request.args.get("order", "").lower()
 
     if sort != "state" and order:
         order = text(sort + " " + order)

From 547ea93dc9b8cace6383374d66da1b51de64342d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 10:19:21 +0100
Subject: [PATCH 194/412] First fix for #2325 (edit book table with readonly
 database)

---
 cps/editbooks.py | 152 ++++++++++++++++++++++++-----------------------
 1 file changed, 78 insertions(+), 74 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 483e8a7e0..7e251696c 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1152,80 +1152,81 @@ def edit_list_book(param):
     vals = request.form.to_dict()
     book = calibre_db.get_book(vals['pk'])
     # ret = ""
-    if param == 'series_index':
-        edit_book_series_index(vals['value'], book)
-        ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
-    elif param == 'tags':
-        edit_book_tags(vals['value'], book)
-        ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
-                       mimetype='application/json')
-    elif param == 'series':
-        edit_book_series(vals['value'], book)
-        ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
-                       mimetype='application/json')
-    elif param == 'publishers':
-        edit_book_publisher(vals['value'], book)
-        ret = Response(json.dumps({'success': True,
-                                    'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
-                       mimetype='application/json')
-    elif param == 'languages':
-        invalid = list()
-        edit_book_languages(vals['value'], book, invalid=invalid)
-        if invalid:
-            ret = Response(json.dumps({'success': False,
-                                       'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
-                           mimetype='application/json')
-        else:
-            lang_names = list()
-            for lang in book.languages:
-                lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
-            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
-                            mimetype='application/json')
-    elif param == 'author_sort':
-        book.author_sort = vals['value']
-        ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
-                       mimetype='application/json')
-    elif param == 'title':
-        sort = book.sort
-        handle_title_on_edit(book, vals.get('value', ""))
-        helper.update_dir_structure(book.id, config.config_calibre_dir)
-        ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
-                       mimetype='application/json')
-    elif param == 'sort':
-        book.sort = vals['value']
-        ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
-                       mimetype='application/json')
-    elif param == 'comments':
-        edit_book_comments(vals['value'], book)
-        ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
-                       mimetype='application/json')
-    elif param == 'authors':
-        input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
-        helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
-        ret = Response(json.dumps({'success': True,
-                                   'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
-                       mimetype='application/json')
-    elif param == 'is_archived':
-        change_archived_books(book.id, vals['value'] == "True")
-        ret = ""
-    elif param == 'read_status':
-        ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
-        if ret:
-            return ret, 400
-    elif param.startswith("custom_column_"):
-        new_val = dict()
-        new_val[param] = vals['value']
-        edit_single_cc_data(book.id, book, param[14:], new_val)
-        # ToDo: Very hacky find better solution
-        if vals['value'] in ["True", "False"]:
-            ret = ""
-        else:
-            ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
-                           mimetype='application/json')
-    else:
-        return _("Parameter not found"), 400
-    book.last_modified = datetime.utcnow()
     try:
+        if param == 'series_index':
+            edit_book_series_index(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
+        elif param == 'tags':
+            edit_book_tags(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
+                           mimetype='application/json')
+        elif param == 'series':
+            edit_book_series(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
+                           mimetype='application/json')
+        elif param == 'publishers':
+            edit_book_publisher(vals['value'], book)
+            ret = Response(json.dumps({'success': True,
+                                        'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
+                           mimetype='application/json')
+        elif param == 'languages':
+            invalid = list()
+            edit_book_languages(vals['value'], book, invalid=invalid)
+            if invalid:
+                ret = Response(json.dumps({'success': False,
+                                           'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
+                               mimetype='application/json')
+            else:
+                lang_names = list()
+                for lang in book.languages:
+                    lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
+                ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
+                                mimetype='application/json')
+        elif param == 'author_sort':
+            book.author_sort = vals['value']
+            ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
+                           mimetype='application/json')
+        elif param == 'title':
+            sort = book.sort
+            handle_title_on_edit(book, vals.get('value', ""))
+            helper.update_dir_structure(book.id, config.config_calibre_dir)
+            ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
+                           mimetype='application/json')
+        elif param == 'sort':
+            book.sort = vals['value']
+            ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
+                           mimetype='application/json')
+        elif param == 'comments':
+            edit_book_comments(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
+                           mimetype='application/json')
+        elif param == 'authors':
+            input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
+            helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
+            ret = Response(json.dumps({'success': True,
+                                       'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
+                           mimetype='application/json')
+        elif param == 'is_archived':
+            change_archived_books(book.id, vals['value'] == "True")
+            ret = ""
+        elif param == 'read_status':
+            ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
+            if ret:
+                return ret, 400
+        elif param.startswith("custom_column_"):
+            new_val = dict()
+            new_val[param] = vals['value']
+            edit_single_cc_data(book.id, book, param[14:], new_val)
+            # ToDo: Very hacky find better solution
+            if vals['value'] in ["True", "False"]:
+                ret = ""
+            else:
+                ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
+                               mimetype='application/json')
+        else:
+            return _("Parameter not found"), 400
+        book.last_modified = datetime.utcnow()
+
         calibre_db.session.commit()
         # revert change for sort if automatic fields link is deactivated
         if param == 'title' and vals.get('checkT') == "false":
@@ -1233,7 +1234,10 @@ def edit_list_book(param):
             calibre_db.session.commit()
     except (OperationalError, IntegrityError) as e:
         calibre_db.session.rollback()
-        log.error("Database error: %s", e)
+        log.error("Database error: {}".format(e))
+        ret = Response(json.dumps({'success': False,
+                                   'msg': 'Database error: {}'.format(e.orig)}),
+                       mimetype='application/json')
     return ret
 
 

From 3a0dacc6a69d3d7edf4abc362d1052f55b0330a3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 14:27:41 +0100
Subject: [PATCH 195/412] log message on not found author

---
 cps/db.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cps/db.py b/cps/db.py
index a3b93d896..caf0ee6ef 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -788,8 +788,9 @@ class CalibreDB():
             error = False
             for auth in sort_authors:
                 results = self.session.query(Authors).filter(Authors.sort == auth.lstrip().strip()).all()
-                # ToDo: How to handle not found authorname
+                # ToDo: How to handle not found author name
                 if not len(results):
+                    log.error("Author {} not found to display name in right order".format(auth))
                     error = True
                     break
                 for r in results:

From 2b31b6a306407f049b5e58daaf8a186ba53eea93 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 16:51:50 +0100
Subject: [PATCH 196/412] Fix for #2325 (author sort order differs from authors
 order with readonly database)

---
 cps/db.py                    | 25 +++++++----
 cps/templates/author.html    |  4 +-
 cps/templates/detail.html    |  2 +-
 cps/templates/discover.html  |  2 +-
 cps/templates/index.html     |  4 +-
 cps/templates/listenmp3.html |  2 +-
 cps/templates/shelf.html     |  2 +-
 cps/templates/shelfdown.html |  2 +-
 cps/web.py                   | 80 ++++++++++++++++++------------------
 9 files changed, 65 insertions(+), 58 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index caf0ee6ef..6ff0d03e7 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -17,7 +17,7 @@
 #  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 sys
+import copy
 import os
 import re
 import ast
@@ -776,6 +776,8 @@ class CalibreDB():
 
     # Orders all Authors in the list according to authors sort
     def order_authors(self, entries, list_return=False, combined=False):
+        # entries_copy = copy.deepcopy(entries)
+        # entries_copy =[]
         for entry in entries:
             if combined:
                 sort_authors = entry.Books.author_sort.split('&')
@@ -785,26 +787,31 @@ class CalibreDB():
                 sort_authors = entry.author_sort.split('&')
                 ids = [a.id for a in entry.authors]
             authors_ordered = list()
-            error = False
+            # error = False
             for auth in sort_authors:
                 results = self.session.query(Authors).filter(Authors.sort == auth.lstrip().strip()).all()
                 # ToDo: How to handle not found author name
                 if not len(results):
                     log.error("Author {} not found to display name in right order".format(auth))
-                    error = True
+                    # error = True
                     break
                 for r in results:
                     if r.id in ids:
                         authors_ordered.append(r)
-            if not error:
+                        ids.remove(r.id)
+            for author_id in ids:
+                result = self.session.query(Authors).filter(Authors.id == author_id).first()
+                authors_ordered.append(result)
+
+            if list_return:
                 if combined:
                     entry.Books.authors = authors_ordered
                 else:
-                    entry.authors = authors_ordered
-        if list_return:
-            return entries
-        else:
-            return authors_ordered
+                    entry.ordered_authors = authors_ordered
+            else:
+                return authors_ordered
+        return entries
+
 
     def get_typeahead(self, database, query, replace=('', ''), tag_filter=true()):
         query = query or ''
diff --git a/cps/templates/author.html b/cps/templates/author.html
index d832ad5c1..fc811368a 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -47,7 +47,7 @@
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -110,7 +110,7 @@
       <div class="meta">
         <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
-		  {% for author in entry.authors %}
+		  {% for author in entry.ordered_authors %}
 			{% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
 				<a class="author-name author-hidden" href="https://www.goodreads.com/author/show/{{ author.gid }}" target="_blank" rel="noopener">{{author.name.replace('|',',')}}</a>
 				{% if loop.last %}
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 06357ce81..c2153db8b 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -99,7 +99,7 @@
       </div>
       <h2 id="title">{{entry.title}}</h2>
       <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             <a href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id ) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 74448b980..bceb6a8ad 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -20,7 +20,7 @@
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 162adc7db..b69a92846 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -19,7 +19,7 @@
           <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -101,7 +101,7 @@
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 279ec28ff..7da62a20f 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -105,7 +105,7 @@
 
   <div class="sm2-playlist-wrapper">
     <ul class="sm2-playlist-bd">
-      <li><a href="{{ url_for('web.serve_book', book_id=mp3file,book_format=audioformat)}}"><b>{% for author in entry.authors %}{{author.name.replace('|',',')}}
+      <li><a href="{{ url_for('web.serve_book', book_id=mp3file,book_format=audioformat)}}"><b>{% for author in entry.ordered_authors %}{{author.name.replace('|',',')}}
         {% if not loop.last %} & {% endif %} {% endfor %}</b> - {{entry.title}}</a></li>
     </ul>
   </div>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index adfead60b..2e4cf906a 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -44,7 +44,7 @@
           <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index 1d7813101..78f00b5ec 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -37,7 +37,7 @@
       <div class="meta">
         <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             <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;
diff --git a/cps/web.py b/cps/web.py
index 6d33f8097..94f511b1b 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -300,43 +300,43 @@ def get_matching_tags():
     return json_dumps
 
 
-def get_sort_function(sort, data):
+def get_sort_function(sort_param, data):
     order = [db.Books.timestamp.desc()]
-    if sort == 'stored':
-        sort = current_user.get_view_property(data, 'stored')
+    if sort_param == 'stored':
+        sort_param = current_user.get_view_property(data, 'stored')
     else:
-        current_user.set_view_property(data, 'stored', sort)
-    if sort == 'pubnew':
+        current_user.set_view_property(data, 'stored', sort_param)
+    if sort_param == 'pubnew':
         order = [db.Books.pubdate.desc()]
-    if sort == 'pubold':
+    if sort_param == 'pubold':
         order = [db.Books.pubdate]
-    if sort == 'abc':
+    if sort_param == 'abc':
         order = [db.Books.sort]
-    if sort == 'zyx':
+    if sort_param == 'zyx':
         order = [db.Books.sort.desc()]
-    if sort == 'new':
+    if sort_param == 'new':
         order = [db.Books.timestamp.desc()]
-    if sort == 'old':
+    if sort_param == 'old':
         order = [db.Books.timestamp]
-    if sort == 'authaz':
+    if sort_param == 'authaz':
         order = [db.Books.author_sort.asc(), db.Series.name, db.Books.series_index]
-    if sort == 'authza':
+    if sort_param == 'authza':
         order = [db.Books.author_sort.desc(), db.Series.name.desc(), db.Books.series_index.desc()]
-    if sort == 'seriesasc':
+    if sort_param == 'seriesasc':
         order = [db.Books.series_index.asc()]
-    if sort == 'seriesdesc':
+    if sort_param == 'seriesdesc':
         order = [db.Books.series_index.desc()]
-    if sort == 'hotdesc':
+    if sort_param == 'hotdesc':
         order = [func.count(ub.Downloads.book_id).desc()]
-    if sort == 'hotasc':
+    if sort_param == 'hotasc':
         order = [func.count(ub.Downloads.book_id).asc()]
-    if sort is None:
-        sort = "new"
-    return order, sort
+    if sort_param is None:
+        sort_param = "new"
+    return order, sort_param
 
 
-def render_books_list(data, sort, book_id, page):
-    order = get_sort_function(sort, data)
+def render_books_list(data, sort_param, book_id, page):
+    order = get_sort_function(sort_param, data)
     if data == "rated":
         return render_rated_books(page, book_id, order=order)
     elif data == "discover":
@@ -604,7 +604,7 @@ def render_language_books(page, name, order):
 
 
 def render_read_books(page, are_read, as_xml=False, order=None):
-    sort = order[0] if order else []
+    sort_param = order[0] if order else []
     if not config.config_read_column:
         if are_read:
             db_filter = and_(ub.ReadBook.user_id == int(current_user.id),
@@ -614,7 +614,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db_filter,
-                                                                sort,
+                                                                sort_param,
                                                                 False, 0,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
@@ -629,7 +629,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
             entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                     db.Books,
                                                                     db_filter,
-                                                                    sort,
+                                                                    sort_param,
                                                                     False, 0,
                                                                     db.books_series_link,
                                                                     db.Books.id == db.books_series_link.c.book,
@@ -656,8 +656,8 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                                      title=name, page=pagename, order=order[1])
 
 
-def render_archived_books(page, sort):
-    order = sort[0] or []
+def render_archived_books(page, sort_param):
+    order = sort_param[0] or []
     archived_books = (
         ub.session.query(ub.ArchivedBook)
         .filter(ub.ArchivedBook.user_id == int(current_user.id))
@@ -678,7 +678,7 @@ def render_archived_books(page, sort):
     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, order=sort[1])
+                                 title=name, page=pagename, order=sort_param[1])
 
 
 def render_prepare_search_form(cc):
@@ -767,32 +767,32 @@ def list_books():
     off = int(request.args.get("offset") or 0)
     limit = int(request.args.get("limit") or config.config_books_per_page)
     search = request.args.get("search")
-    sort = request.args.get("sort", "id")
+    sort_param = request.args.get("sort", "id")
     order = request.args.get("order", "").lower()
     state = None
     join = tuple()
 
-    if sort == "state":
+    if sort_param == "state":
         state = json.loads(request.args.get("state", "[]"))
-    elif sort == "tags":
+    elif sort_param == "tags":
         order = [db.Tags.name.asc()] if order == "asc" else [db.Tags.name.desc()]
         join = db.books_tags_link, db.Books.id == db.books_tags_link.c.book, db.Tags
-    elif sort == "series":
+    elif sort_param == "series":
         order = [db.Series.name.asc()] if order == "asc" else [db.Series.name.desc()]
         join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
-    elif sort == "publishers":
+    elif sort_param == "publishers":
         order = [db.Publishers.name.asc()] if order == "asc" else [db.Publishers.name.desc()]
         join = db.books_publishers_link, db.Books.id == db.books_publishers_link.c.book, db.Publishers
-    elif sort == "authors":
+    elif sort_param == "authors":
         order = [db.Authors.name.asc(), db.Series.name, db.Books.series_index] if order == "asc" \
             else [db.Authors.name.desc(), db.Series.name.desc(), db.Books.series_index.desc()]
         join = db.books_authors_link, db.Books.id == db.books_authors_link.c.book, db.Authors, \
                db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
-    elif sort == "languages":
+    elif sort_param == "languages":
         order = [db.Languages.lang_code.asc()] if order == "asc" else [db.Languages.lang_code.desc()]
         join = db.books_languages_link, db.Books.id == db.books_languages_link.c.book, db.Languages
-    elif order and sort in ["sort", "title", "authors_sort", "series_index"]:
-        order = [text(sort + " " + order)]
+    elif order and sort_param in ["sort", "title", "authors_sort", "series_index"]:
+        order = [text(sort_param + " " + order)]
     elif not state:
         order = [db.Books.timestamp.desc()]
 
@@ -817,7 +817,7 @@ def list_books():
                 except (KeyError, AttributeError):
                     log.error("Custom Column No.%d is not existing in calibre database", read_column)
                     # Skip linking read column and return None instead of read status
-                    books =calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
+                    books = calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
             books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
                                                           int(current_user.id) == ub.ArchivedBook.user_id))
                      .filter(calibre_db.common_filters(allow_show_archived=True)).all())
@@ -1263,7 +1263,7 @@ def extend_search_term(searchterm,
 
 
 def render_adv_search_results(term, offset=None, order=None, limit=None):
-    sort = order[0] if order else [db.Books.sort]
+    sort_param = order[0] if order else [db.Books.sort]
     pagination = None
 
     cc = get_cc_columns(filter_config_custom_read=True)
@@ -1378,7 +1378,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             log.debug_or_exception(ex)
             flash(_("Error on search for custom columns, please restart Calibre-Web"), category="error")
 
-    q = q.order_by(*sort).all()
+    q = q.order_by(*sort_param).all()
     flask_session['query'] = json.dumps(term)
     ub.store_combo_ids(q)
     result_count = len(q)
@@ -1792,7 +1792,7 @@ def show_book(book_id):
 
         entry.tags = sort(entry.tags, key=lambda tag: tag.name)
 
-        entry.authors = calibre_db.order_authors([entry])
+        entry.ordered_authors = calibre_db.order_authors([entry])
 
         entry.kindle_list = check_send_to_kindle(entry)
         entry.reader_list = check_read_formats(entry)

From 4379669cf89b440ecd83d562966d290d9a6ac9b3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 17:14:54 +0100
Subject: [PATCH 197/412] Database error is more detailed renamed
 debug_or_exception to error_or_exception

---
 cps/admin.py                    | 34 ++++++++++++-------------
 cps/db.py                       |  8 +++---
 cps/editbooks.py                | 23 ++++++++++-------
 cps/gdrive.py                   |  2 +-
 cps/gdriveutils.py              |  2 +-
 cps/helper.py                   |  4 +--
 cps/logger.py                   |  2 +-
 cps/metadata_provider/amazon.py |  4 +--
 cps/oauth_bb.py                 |  4 +--
 cps/services/worker.py          |  2 +-
 cps/shelf.py                    | 44 ++++++++++++++++-----------------
 cps/tasks/mail.py               | 10 ++++----
 cps/ub.py                       |  2 +-
 cps/updater.py                  |  2 +-
 cps/web.py                      |  4 +--
 15 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 18bd87ec7..60a674e87 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1216,10 +1216,10 @@ def _db_configuration_update_helper():
 
         # gdrive_error drive setup
         gdrive_error = _configuration_gdrive_helper(to_save)
-    except (OperationalError, InvalidRequestError):
+    except (OperationalError, InvalidRequestError) as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        _db_configuration_result(_("Settings DB is not Writeable"), gdrive_error)
+        log.error_or_exception("Settings Database error: {}".format(e))
+        _db_configuration_result(_(u"Database error: %(error)s.", error=e.orig), gdrive_error)
     try:
         metadata_db = os.path.join(to_save['config_calibre_dir'], "metadata.db")
         if config.config_use_google_drive and is_gdrive_ready() and not os.path.exists(metadata_db):
@@ -1332,10 +1332,10 @@ def _configuration_update_helper():
             unrar_status = helper.check_unrar(config.config_rarfile_location)
             if unrar_status:
                 return _configuration_result(unrar_status)
-    except (OperationalError, InvalidRequestError):
+    except (OperationalError, InvalidRequestError) as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        _configuration_result(_("Settings DB is not Writeable"))
+        log.error_or_exception("Settings Database error: {}".format(e))
+        _configuration_result(_(u"Database error: %(error)s.", error=e.orig))
 
     config.save()
     if reboot_required:
@@ -1430,10 +1430,10 @@ def _handle_new_user(to_save, content, languages, translations, kobo_support):
         ub.session.rollback()
         log.error("Found an existing account for {} or {}".format(content.name, content.email))
         flash(_("Found an existing account for this e-mail address or name."), category="error")
-    except OperationalError:
+    except OperationalError as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
 
 
 def _delete_user(content):
@@ -1547,10 +1547,10 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
         ub.session.rollback()
         log.error("An unknown error occurred while changing user: {}".format(str(ex)))
         flash(_(u"An unknown error occurred. Please try again later."), category="error")
-    except OperationalError:
+    except OperationalError as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
     return ""
 
 
@@ -1616,10 +1616,10 @@ def update_mailsettings():
         _config_int(to_save, "mail_size", lambda y: int(y)*1024*1024)
     try:
         config.save()
-    except (OperationalError, InvalidRequestError):
+    except (OperationalError, InvalidRequestError) as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
         return edit_mailsettings()
 
     if to_save.get("test"):
@@ -1851,7 +1851,7 @@ def import_ldap_users():
     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)
+        log.error_or_exception(e)
         showtext['text'] = _(u'Error: %(ldaperror)s', ldaperror=e)
         return json.dumps(showtext)
     if not new_users:
@@ -1879,7 +1879,7 @@ def import_ldap_users():
         try:
             user_data = services.ldap.get_object_details(user=user_identifier, query_filter=query_filter)
         except AttributeError as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
             continue
         if user_data:
             user_count, message = ldap_import_create_user(user, user_data)
diff --git a/cps/db.py b/cps/db.py
index 6ff0d03e7..2292614ca 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -597,7 +597,7 @@ class CalibreDB():
                 cc = conn.execute(text("SELECT id, datatype FROM custom_columns"))
                 cls.setup_db_cc_classes(cc)
             except OperationalError as e:
-                log.debug_or_exception(e)
+                log.error_or_exception(e)
 
         cls.session_factory = scoped_session(sessionmaker(autocommit=False,
                                                           autoflush=True,
@@ -769,7 +769,7 @@ class CalibreDB():
                                     len(query.all()))
             entries = query.order_by(*order).offset(off).limit(pagesize).all()
         except Exception as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
         # display authors in right order
         entries = self.order_authors(entries, True, join_archive_read)
         return entries, randm, pagination
@@ -792,7 +792,7 @@ class CalibreDB():
                 results = self.session.query(Authors).filter(Authors.sort == auth.lstrip().strip()).all()
                 # ToDo: How to handle not found author name
                 if not len(results):
-                    log.error("Author {} not found to display name in right order".format(auth))
+                    log.error("Author {} not found to display name in right order".format(auth.strip()))
                     # error = True
                     break
                 for r in results:
@@ -974,5 +974,5 @@ def lcase(s):
         return unidecode.unidecode(s.lower())
     except Exception as ex:
         log = logger.create()
-        log.debug_or_exception(ex)
+        log.error_or_exception(ex)
         return s.lower()
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 7e251696c..3a08f0610 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -337,7 +337,7 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                         kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
                 calibre_db.session.rollback()
                 if jsonResponse:
                     return json.dumps([{"location": url_for("editbook.edit_book", book_id=book_id),
@@ -663,8 +663,8 @@ def upload_single_file(request, book, book_id):
                     calibre_db.update_title_sort(config)
                 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")
+                    log.error_or_exception("Database error: {}".format(e))
+                    flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
                     return redirect(url_for('web.show_book', book_id=book.id))
 
             # Queue uploader info
@@ -756,7 +756,7 @@ def edit_book(book_id):
     try:
         calibre_db.update_title_sort(config)
     except sqliteOperationalError as e:
-        log.debug_or_exception(e)
+        log.error_or_exception(e)
         calibre_db.session.rollback()
 
     # Show form
@@ -864,8 +864,13 @@ def edit_book(book_id):
         calibre_db.session.rollback()
         flash(str(e), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
+    except (OperationalError, IntegrityError) as e:
+        log.error_or_exception("Database error: {}".format(e))
+        calibre_db.session.rollback()
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
+        return redirect(url_for('web.show_book', book_id=book.id))
     except Exception as ex:
-        log.debug_or_exception(ex)
+        log.error_or_exception(ex)
         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))
@@ -1103,8 +1108,8 @@ def upload():
                         return Response(json.dumps(resp), mimetype='application/json')
             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")
+                log.error_or_exception("Database error: {}".format(e))
+                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
         return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
 
 
@@ -1234,7 +1239,7 @@ def edit_list_book(param):
             calibre_db.session.commit()
     except (OperationalError, IntegrityError) as e:
         calibre_db.session.rollback()
-        log.error("Database error: {}".format(e))
+        log.error_or_exception("Database error: {}".format(e))
         ret = Response(json.dumps({'success': False,
                                    'msg': 'Database error: {}'.format(e.orig)}),
                        mimetype='application/json')
@@ -1344,7 +1349,7 @@ def table_xchange_author_title():
                 calibre_db.session.commit()
             except (OperationalError, IntegrityError) as e:
                 calibre_db.session.rollback()
-                log.error("Database error: %s", e)
+                log.error_or_exception("Database error: %s", e)
                 return json.dumps({'success': False})
 
             if config.config_use_google_drive:
diff --git a/cps/gdrive.py b/cps/gdrive.py
index e782cb9e5..60e3d47b0 100644
--- a/cps/gdrive.py
+++ b/cps/gdrive.py
@@ -152,7 +152,7 @@ try:
                     move(os.path.join(tmp_dir, "tmp_metadata.db"), dbpath)
                     calibre_db.reconnect_db(config, ub.app_DB_path)
         except Exception as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
         return ''
 except AttributeError:
     pass
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 57f272ff7..0b704db40 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -215,7 +215,7 @@ def getDrive(drive=None, gauth=None):
             except RefreshError as e:
                 log.error("Google Drive error: %s", e)
             except Exception as ex:
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
         else:
             # Initialize the saved creds
             gauth.Authorize()
diff --git a/cps/helper.py b/cps/helper.py
index 03a2d03b8..b0b28a998 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -713,7 +713,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 ex:
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
                 return get_cover_on_failure(use_generic_cover_on_failure)
         else:
             cover_file_path = os.path.join(config.config_calibre_dir, book.path)
@@ -861,7 +861,7 @@ def check_unrar(unrarLocation):
             log.debug("unrar version %s", version)
 
     except (OSError, UnicodeDecodeError) as err:
-        log.debug_or_exception(err)
+        log.error_or_exception(err)
         return _('Error excecuting UnRar')
 
 
diff --git a/cps/logger.py b/cps/logger.py
index 053d0bd3c..fcc25c27b 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -42,7 +42,7 @@ logging.addLevelName(logging.CRITICAL, "CRIT")
 
 class _Logger(logging.Logger):
 
-    def debug_or_exception(self, message, stacklevel=2, *args, **kwargs):
+    def error_or_exception(self, message, stacklevel=2, *args, **kwargs):
         if sys.version_info > (3, 7):
             if is_debug_enabled():
                 self.exception(message, stacklevel=stacklevel, *args, **kwargs)
diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index acea7e07e..73c7e1fc8 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -105,7 +105,7 @@ class Amazon(Metadata):
                         match.cover = ""
                     return match, index
             except Exception as e:
-                log.debug_or_exception(e)
+                log.error_or_exception(e)
                 return
 
         val = list()
@@ -126,5 +126,5 @@ class Amazon(Metadata):
             result = list(filter(lambda x: x, val))
             return [x[0] for x in sorted(result, key=itemgetter(1))] #sort by amazons listing order for best relevance
         except requests.exceptions.HTTPError as e:
-            log.debug_or_exception(e)
+            log.error_or_exception(e)
             return []
diff --git a/cps/oauth_bb.py b/cps/oauth_bb.py
index d9efd41e4..d9a60c0e0 100644
--- a/cps/oauth_bb.py
+++ b/cps/oauth_bb.py
@@ -149,7 +149,7 @@ def bind_oauth_or_register(provider_id, provider_user_id, redirect_url, provider
                     log.info("Link to {} Succeeded".format(provider_name))
                     return redirect(url_for('web.profile'))
                 except Exception as ex:
-                    log.debug_or_exception(ex)
+                    log.error_or_exception(ex)
                     ub.session.rollback()
             else:
                 flash(_(u"Login failed, No User Linked With OAuth Account"), category="error")
@@ -197,7 +197,7 @@ def unlink_oauth(provider):
                 flash(_(u"Unlink to %(oauth)s Succeeded", oauth=oauth_check[provider]), category="success")
                 log.info("Unlink to {} Succeeded".format(oauth_check[provider]))
             except Exception as ex:
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
                 ub.session.rollback()
                 flash(_(u"Unlink to %(oauth)s Failed", oauth=oauth_check[provider]), category="error")
     except NoResultFound:
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 076c91048..aea6d640a 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -178,7 +178,7 @@ class CalibreTask:
             self.run(*args)
         except Exception as ex:
             self._handleError(str(ex))
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
 
         self.end_time = datetime.now()
 
diff --git a/cps/shelf.py b/cps/shelf.py
index 27939cdc7..0bf12164f 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -94,10 +94,10 @@ def add_to_shelf(shelf_id, book_id):
     try:
         ub.session.merge(shelf)
         ub.session.commit()
-    except (OperationalError, InvalidRequestError):
+    except (OperationalError, InvalidRequestError) as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_(u"Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
         if "HTTP_REFERER" in request.environ:
             return redirect(request.environ["HTTP_REFERER"])
         else:
@@ -154,10 +154,10 @@ def search_to_shelf(shelf_id):
             ub.session.merge(shelf)
             ub.session.commit()
             flash(_(u"Books have been added to shelf: %(sname)s", sname=shelf.name), category="success")
-        except (OperationalError, InvalidRequestError):
+        except (OperationalError, InvalidRequestError) as e:
             ub.session.rollback()
-            log.error("Settings DB is not Writeable")
-            flash(_("Settings DB is not Writeable"), category="error")
+            log.error_or_exception("Settings Database error: {}".format(e))
+            flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
     else:
         log.error("Could not add books to shelf: {}".format(shelf.name))
         flash(_(u"Could not add books to shelf: %(sname)s", sname=shelf.name), category="error")
@@ -197,10 +197,10 @@ def remove_from_shelf(shelf_id, book_id):
             ub.session.delete(book_shelf)
             shelf.last_modified = datetime.utcnow()
             ub.session.commit()
-        except (OperationalError, InvalidRequestError):
+        except (OperationalError, InvalidRequestError) as e:
             ub.session.rollback()
-            log.error("Settings DB is not Writeable")
-            flash(_("Settings DB is not Writeable"), category="error")
+            log.error_or_exception("Settings Database error: {}".format(e))
+            flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
             if "HTTP_REFERER" in request.environ:
                 return redirect(request.environ["HTTP_REFERER"])
             else:
@@ -273,12 +273,12 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
                 return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
             except (OperationalError, InvalidRequestError) as ex:
                 ub.session.rollback()
-                log.debug_or_exception(ex)
-                log.error("Settings DB is not Writeable")
-                flash(_("Settings DB is not Writeable"), category="error")
+                log.error_or_exception(ex)
+                log.error_or_exception("Settings Database error: {}".format(ex))
+                flash(_(u"Database error: %(error)s.", error=ex.orig), category="error")
             except Exception as ex:
                 ub.session.rollback()
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
                 flash(_(u"There was an error"), category="error")
     return render_title_template('shelf_edit.html',
                                  shelf=shelf,
@@ -337,10 +337,10 @@ def delete_shelf(shelf_id):
             flash(_("Error deleting Shelf"), category="error")
         else:
             flash(_("Shelf successfully deleted"), category="success")
-    except InvalidRequestError:
+    except InvalidRequestError as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
     return redirect(url_for('web.index'))
 
 
@@ -374,10 +374,10 @@ def order_shelf(shelf_id):
                 # if order diffrent from before -> shelf.last_modified = datetime.utcnow()
             try:
                 ub.session.commit()
-            except (OperationalError, InvalidRequestError):
+            except (OperationalError, InvalidRequestError) as e:
                 ub.session.rollback()
-                log.error("Settings DB is not Writeable")
-                flash(_("Settings DB is not Writeable"), category="error")
+                log.error_or_exception("Settings Database error: {}".format(e))
+                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
 
         result = list()
         if shelf:
@@ -450,10 +450,10 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
             try:
                 ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == entry.book_id).delete()
                 ub.session.commit()
-            except (OperationalError, InvalidRequestError):
+            except (OperationalError, InvalidRequestError) as e:
                 ub.session.rollback()
-                log.error("Settings DB is not Writeable")
-                flash(_("Settings DB is not Writeable"), category="error")
+                log.error_or_exception("Settings Database error: {}".format(e))
+                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
 
         return render_title_template(page,
                                      entries=result,
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 80adbbcc5..4954c2d62 100755
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -167,10 +167,10 @@ class TaskEmail(CalibreTask):
             else:
                 self.send_gmail_email(msg)
         except MemoryError as e:
-            log.debug_or_exception(e, stacklevel=3)
+            log.error_or_exception(e, stacklevel=3)
             self._handleError(u'MemoryError sending e-mail: {}'.format(str(e)))
         except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
-            log.debug_or_exception(e, stacklevel=3)
+            log.error_or_exception(e, stacklevel=3)
             if hasattr(e, "smtp_error"):
                 text = e.smtp_error.decode('utf-8').replace("\n", '. ')
             elif hasattr(e, "message"):
@@ -181,10 +181,10 @@ class TaskEmail(CalibreTask):
                 text = ''
             self._handleError(u'Smtplib Error sending e-mail: {}'.format(text))
         except (socket.error) as e:
-            log.debug_or_exception(e, stacklevel=3)
+            log.error_or_exception(e, stacklevel=3)
             self._handleError(u'Socket Error sending e-mail: {}'.format(e.strerror))
         except Exception as ex:
-            log.debug_or_exception(ex, stacklevel=3)
+            log.error_or_exception(ex, stacklevel=3)
             self._handleError(u'Error sending e-mail: {}'.format(ex))
 
     def send_standard_email(self, msg):
@@ -257,7 +257,7 @@ class TaskEmail(CalibreTask):
                 data = file_.read()
                 file_.close()
             except IOError as e:
-                log.debug_or_exception(e, stacklevel=3)
+                log.error_or_exception(e, stacklevel=3)
                 log.error(u'The requested file could not be read. Maybe wrong permissions?')
                 return None
         return data
diff --git a/cps/ub.py b/cps/ub.py
index 786dc909b..a2be004c6 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -853,5 +853,5 @@ def session_commit(success=None, _session=None):
             log.info(success)
     except (exc.OperationalError, exc.InvalidRequestError) as e:
         s.rollback()
-        log.debug_or_exception(e)
+        log.error_or_exception(e)
     return ""
diff --git a/cps/updater.py b/cps/updater.py
index 181c43749..f73410025 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -117,7 +117,7 @@ class Updater(threading.Thread):
         except (IOError, OSError) as ex:
             self.status = 12
             log.error(u'Possible Reason for error: update file could not be saved in temp dir')
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
         self.pause()
         return False
 
diff --git a/cps/web.py b/cps/web.py
index 94f511b1b..e3ad47196 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1375,7 +1375,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         try:
             q = adv_search_custom_columns(cc, term, q)
         except AttributeError as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
             flash(_("Error on search for custom columns, please restart Calibre-Web"), category="error")
 
     q = q.order_by(*sort_param).all()
@@ -1437,7 +1437,7 @@ def serve_book(book_id, book_format, anyname):
             df = getFileFromEbooksFolder(book.path, data.name + "." + book_format)
             return do_gdrive_download(df, headers, (book_format.upper() == 'TXT'))
         except AttributeError as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
             return "File Not Found"
     else:
         if book_format.upper() == 'TXT':

From 8e2536c53b8978ec05c9cb84615a179c38aa5080 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 18:01:11 +0100
Subject: [PATCH 198/412] Improved cover extraction for epub files

---
 cps/comic.py | 78 ++++++++++++++++++----------------------------------
 cps/cover.py | 48 ++++++++++++++++++++++++++++++++
 cps/epub.py  | 35 +++++++++++++----------
 3 files changed, 95 insertions(+), 66 deletions(-)
 create mode 100644 cps/cover.py

diff --git a/cps/comic.py b/cps/comic.py
index 9e7f4f8f2..2549579e6 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-#     Copyright (C) 2018 OzzieIsaacs
+#     Copyright (C) 2018-2022 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
@@ -18,19 +18,16 @@
 
 import os
 
-from . import logger, isoLanguages
+from . import logger, isoLanguages, cover
 from .constants import BookMeta
 
-
-log = logger.create()
-
-
 try:
     from wand.image import Image
     use_IM = True
 except (ImportError, RuntimeError) as e:
     use_IM = False
 
+log = logger.create()
 
 try:
     from comicapi.comicarchive import ComicArchive, MetaDataStyle
@@ -51,29 +48,8 @@ except (ImportError, LookupError) as e:
         use_rarfile = False
     use_comic_meta = False
 
-NO_JPEG_EXTENSIONS = ['.png', '.webp', '.bmp']
-COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
 
-def _cover_processing(tmp_file_name, img, extension):
-    tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
-    if extension in NO_JPEG_EXTENSIONS:
-        if use_IM:
-            with Image(blob=img) as imgc:
-                imgc.format = 'jpeg'
-                imgc.transform_colorspace('rgb')
-                imgc.save(filename=tmp_cover_name)
-                return tmp_cover_name
-        else:
-            return None
-    if img:
-        with open(tmp_cover_name, 'wb') as f:
-            f.write(img)
-        return tmp_cover_name
-    else:
-        return None
-
-
-def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable):
+def _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_executable):
     cover_data = extension = None
     if original_file_extension.upper() == '.CBZ':
         cf = zipfile.ZipFile(tmp_file_name)
@@ -81,7 +57,7 @@ def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecu
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
-                if extension in COVER_EXTENSIONS:
+                if extension in cover.COVER_EXTENSIONS:
                     cover_data = cf.read(name)
                     break
     elif original_file_extension.upper() == '.CBT':
@@ -90,44 +66,44 @@ def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecu
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
-                if extension in COVER_EXTENSIONS:
+                if extension in cover.COVER_EXTENSIONS:
                     cover_data = cf.extractfile(name).read()
                     break
     elif original_file_extension.upper() == '.CBR' and use_rarfile:
         try:
-            rarfile.UNRAR_TOOL = rarExecutable
+            rarfile.UNRAR_TOOL = rar_executable
             cf = rarfile.RarFile(tmp_file_name)
             for name in cf.namelist():
                 ext = os.path.splitext(name)
                 if len(ext) > 1:
                     extension = ext[1].lower()
-                    if extension in COVER_EXTENSIONS:
+                    if extension in cover.COVER_EXTENSIONS:
                         cover_data = cf.read(name)
                         break
         except Exception as ex:
-            log.debug('Rarfile failed with error: %s', ex)
+            log.debug('Rarfile failed with error: {}'.format(ex))
     return cover_data, extension
 
 
-def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
+def _extract_cover(tmp_file_name, original_file_extension, rar_executable):
     cover_data = extension = None
     if use_comic_meta:
-        archive = ComicArchive(tmp_file_name, rar_exe_path=rarExecutable)
+        archive = ComicArchive(tmp_file_name, rar_exe_path=rar_executable)
         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:
+                if extension in cover.COVER_EXTENSIONS:
                     cover_data = archive.getPage(index)
                     break
     else:
-        cover_data, extension = _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable)
-    return _cover_processing(tmp_file_name, cover_data, extension)
+        cover_data, extension = _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_executable)
+    return cover.cover_processing(tmp_file_name, cover_data, extension)
 
 
-def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rarExecutable):
+def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rar_executable):
     if use_comic_meta:
-        archive = ComicArchive(tmp_file_path, rar_exe_path=rarExecutable)
+        archive = ComicArchive(tmp_file_path, rar_exe_path=rar_executable)
         if archive.seemsToBeAComicArchive():
             if archive.hasMetadata(MetaDataStyle.CIX):
                 style = MetaDataStyle.CIX
@@ -137,23 +113,23 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
                 style = None
 
             # if style is not None:
-            loadedMetadata = archive.readMetadata(style)
+            loaded_metadata = archive.readMetadata(style)
 
-            lang = loadedMetadata.language or ""
-            loadedMetadata.language = isoLanguages.get_lang3(lang)
+            lang = loaded_metadata.language or ""
+            loaded_metadata.language = isoLanguages.get_lang3(lang)
 
             return BookMeta(
                 file_path=tmp_file_path,
                 extension=original_file_extension,
-                title=loadedMetadata.title or original_file_name,
+                title=loaded_metadata.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, rarExecutable),
-                description=loadedMetadata.comments or "",
+                                   for credit in loaded_metadata.credits if credit["role"] == "Writer"]) or 'Unknown',
+                cover=_extract_cover(tmp_file_path, original_file_extension, rar_executable),
+                description=loaded_metadata.comments or "",
                 tags="",
-                series=loadedMetadata.series or "",
-                series_id=loadedMetadata.issue or "",
-                languages=loadedMetadata.language,
+                series=loaded_metadata.series or "",
+                series_id=loaded_metadata.issue or "",
+                languages=loaded_metadata.language,
                 publisher="")
 
     return BookMeta(
@@ -161,7 +137,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, rarExecutable),
+        cover=_extract_cover(tmp_file_path, original_file_extension, rar_executable),
         description="",
         tags="",
         series="",
diff --git a/cps/cover.py b/cps/cover.py
new file mode 100644
index 000000000..5dd295342
--- /dev/null
+++ b/cps/cover.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2022 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 os
+
+try:
+    from wand.image import Image
+    use_IM = True
+except (ImportError, RuntimeError) as e:
+    use_IM = False
+
+
+NO_JPEG_EXTENSIONS = ['.png', '.webp', '.bmp']
+COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
+
+
+def cover_processing(tmp_file_name, img, extension):
+    tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
+    if extension in NO_JPEG_EXTENSIONS:
+        if use_IM:
+            with Image(blob=img) as imgc:
+                imgc.format = 'jpeg'
+                imgc.transform_colorspace('rgb')
+                imgc.save(filename=tmp_cover_name)
+                return tmp_cover_name
+        else:
+            return None
+    if img:
+        with open(tmp_cover_name, 'wb') as f:
+            f.write(img)
+        return tmp_cover_name
+    else:
+        return None
diff --git a/cps/epub.py b/cps/epub.py
index b436a7558..563590e82 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -20,23 +20,26 @@ import os
 import zipfile
 from lxml import etree
 
-from . import isoLanguages
+from . import isoLanguages, cover
 from .helper import split_authors
 from .constants import BookMeta
 
 
-def extract_cover(zip_file, cover_file, cover_path, tmp_file_name):
+def _extract_cover(zip_file, cover_file, cover_path, tmp_file_name):
     if cover_file is None:
         return None
     else:
+        cf = extension = None
         zip_cover_path = os.path.join(cover_path, cover_file).replace('\\', '/')
-        cf = zip_file.read(zip_cover_path)
+
         prefix = os.path.splitext(tmp_file_name)[0]
         tmp_cover_name = prefix + '.' + os.path.basename(zip_cover_path)
-        image = open(tmp_cover_name, 'wb')
-        image.write(cf)
-        image.close()
-        return tmp_cover_name
+        ext = os.path.splitext(tmp_cover_name)
+        if len(ext) > 1:
+            extension = ext[1].lower()
+        if extension in cover.COVER_EXTENSIONS:
+            cf = zip_file.read(zip_cover_path)
+        return cover.cover_processing(tmp_file_name, cf, extension)
 
 
 def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
@@ -70,9 +73,9 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
             else:
                 epub_metadata[s] = tmp[0]
         else:
-            epub_metadata[s] = u'Unknown'
+            epub_metadata[s] = 'Unknown'
 
-    if epub_metadata['subject'] == u'Unknown':
+    if epub_metadata['subject'] == 'Unknown':
         epub_metadata['subject'] = ''
 
     if epub_metadata['description'] == u'Unknown':
@@ -112,7 +115,7 @@ def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
     cover_section = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
     cover_file = None
     if len(cover_section) > 0:
-        cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
+        cover_file = _extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
     else:
         meta_cover = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='cover']/@content", namespaces=ns)
         if len(meta_cover) > 0:
@@ -123,10 +126,10 @@ def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
                     "/pkg:package/pkg:manifest/pkg:item[@properties='" + meta_cover[0] + "']/@href", namespaces=ns)
         else:
             cover_section = tree.xpath("/pkg:package/pkg:guide/pkg:reference/@href", namespaces=ns)
-        if len(cover_section) > 0:
-            filetype = cover_section[0].rsplit('.', 1)[-1]
+        for cs in cover_section:
+            filetype = cs.rsplit('.', 1)[-1]
             if filetype == "xhtml" or filetype == "html":  # if cover is (x)html format
-                markup = epub_zip.read(os.path.join(cover_path, cover_section[0]))
+                markup = epub_zip.read(os.path.join(cover_path, cs))
                 markup_tree = etree.fromstring(markup)
                 # no matter xhtml or html with no namespace
                 img_src = markup_tree.xpath("//*[local-name() = 'img']/@src")
@@ -137,9 +140,11 @@ def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
                     # img_src maybe start with "../"" so fullpath join then relpath to cwd
                     filename = os.path.relpath(os.path.join(os.path.dirname(os.path.join(cover_path, cover_section[0])),
                                                             img_src[0]))
-                    cover_file = extract_cover(epub_zip, filename, "", tmp_file_path)
+                    cover_file = _extract_cover(epub_zip, filename, "", tmp_file_path)
             else:
-                cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
+                cover_file = _extract_cover(epub_zip, cs, cover_path, tmp_file_path)
+            if cover_file:
+                break
     return cover_file
 
 

From 3b5e5f9b9099ae6e07834ddc0d7539a1a1c07d77 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 22:15:19 +0100
Subject: [PATCH 199/412] Undo check of read checkbox in case of error Display
 error message in details modal dialog Bugfix set archive bit in booktable
 Translate error message readstatus change

---
 cps/editbooks.py         |  7 +++++--
 cps/helper.py            |  2 +-
 cps/static/js/details.js | 22 ++++++++++++++++------
 cps/static/js/main.js    |  1 +
 cps/static/js/table.js   |  2 ++
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 3a08f0610..30535ef3d 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1212,8 +1212,11 @@ def edit_list_book(param):
                                        'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
                            mimetype='application/json')
         elif param == 'is_archived':
-            change_archived_books(book.id, vals['value'] == "True")
-            ret = ""
+            is_archived = change_archived_books(book.id, vals['value'] == "True",
+                                                message="Book {} archivebit set to: {}".format(book.id, vals['value']))
+            if is_archived:
+                kobo_sync_status.remove_synced_book(book.id)
+            return ""
         elif param == 'read_status':
             ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
             if ret:
diff --git a/cps/helper.py b/cps/helper.py
index b0b28a998..74a8dbbba 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -335,7 +335,7 @@ def edit_book_read_status(book_id, read_status=None):
         except (OperationalError, InvalidRequestError) as e:
             calibre_db.session.rollback()
             log.error(u"Read status could not set: {}".format(e))
-            return "Read status could not set: {}".format(e), 400
+            return _("Read status could not set: {}".format(e.orig))
     return ""
 
 # Deletes a book fro the local filestorage, returns True if deleting is successfull, otherwise false
diff --git a/cps/static/js/details.js b/cps/static/js/details.js
index 6f99595d6..f0259f8cc 100644
--- a/cps/static/js/details.js
+++ b/cps/static/js/details.js
@@ -28,14 +28,24 @@ $("#have_read_cb").on("change", function() {
         data: $(this).closest("form").serialize(),
         error: function(response) {
             var data = [{type:"danger", message:response.responseText}]
-            $("#flash_success").remove();
+            // $("#flash_success").parent().remove();
             $("#flash_danger").remove();
+            $(".row-fluid.text-center").remove();
             if (!jQuery.isEmptyObject(data)) {
-                data.forEach(function (item) {
-                    $(".navbar").after('<div class="row-fluid text-center" >' +
-                        '<div id="flash_' + item.type + '" class="alert alert-' + item.type + '">' + item.message + '</div>' +
-                        '</div>');
-                });
+                $("#have_read_cb").prop("checked", !$("#have_read_cb").prop("checked"));
+                if($("#bookDetailsModal").is(":visible")) {
+                    data.forEach(function (item) {
+                        $(".modal-header").after('<div id="flash_' + item.type +
+                            '" class="text-center alert alert-' + item.type + '">' + item.message + '</div>');
+                    });
+                } else
+                {
+                    data.forEach(function (item) {
+                        $(".navbar").after('<div class="row-fluid text-center" >' +
+                            '<div id="flash_' + item.type + '" class="alert alert-' + item.type + '">' + item.message + '</div>' +
+                            '</div>');
+                    });
+                }
             }
         }
     });
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 75599d9ba..b18cf229d 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -515,6 +515,7 @@ $(function() {
 
     $("#bookDetailsModal")
         .on("show.bs.modal", function(e) {
+            $("#flash_danger").remove();
             var $modalBody = $(this).find(".modal-body");
 
             // Prevent static assets from loading multiple times
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index ae8c591b3..8af7592f2 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -812,11 +812,13 @@ function checkboxChange(checkbox, userId, field, field_index) {
 
 function BookCheckboxChange(checkbox, userId, field) {
     var value = checkbox.checked ? "True" : "False";
+    var element = checkbox;
     $.ajax({
         method: "post",
         url: getPath() + "/ajax/editbooks/" + field,
         data: {"pk": userId, "value": value},
         error: function(data) {
+            element.checked = !element.checked;
             handleListServerResponse([{type:"danger", message:data.responseText}])
         },
         success: handleListServerResponse

From 296f76b5fb96c6a0747af49fba81d01514ab2092 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 13 Mar 2022 10:23:13 +0100
Subject: [PATCH 200/412] Fixes after testrun Code cosmetics

---
 cps/admin.py                            |   2 +-
 cps/templates/listenmp3.html            |   2 +-
 cps/templates/read.html                 |   2 +-
 cps/web.py                              |  17 +-
 test/Calibre-Web TestSummary_Linux.html | 503 ++++++++++++++----------
 5 files changed, 297 insertions(+), 229 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 60a674e87..3d4ca6096 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -499,7 +499,7 @@ def edit_list_user(param):
                 else:
                     return _("Parameter not found"), 400
         except Exception as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
             return str(ex), 400
     ub.session_commit()
     return ""
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 7da62a20f..2067bf38c 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -134,7 +134,7 @@ window.calibre = {
         filePath: "{{ url_for('static', filename='js/libs/') }}",
         cssPath: "{{ url_for('static', filename='css/') }}",
         bookUrl: "{{ url_for('static', filename=mp3file) }}/",
-        bookmarkUrl: "{{ url_for('web.bookmark', book_id=mp3file, book_format=audioformat.upper()) }}",
+        bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=mp3file, book_format=audioformat.upper()) }}",
         bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
         useBookmarks: "{{ g.user.is_authenticated | tojson }}"
             };
diff --git a/cps/templates/read.html b/cps/templates/read.html
index 1766eb1bc..f69d662f6 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -86,7 +86,7 @@
           window.calibre = {
               filePath: "{{ url_for('static', filename='js/libs/') }}",
               cssPath: "{{ url_for('static', filename='css/') }}",
-              bookmarkUrl: "{{ url_for('web.bookmark', book_id=bookid, book_format='EPUB') }}",
+              bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=bookid, book_format='EPUB') }}",
               bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format='epub', anyname='file.epub') }}",
               bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
               useBookmarks: "{{ g.user.is_authenticated | tojson }}"
diff --git a/cps/web.py b/cps/web.py
index e3ad47196..8c057b9d1 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -26,6 +26,7 @@ import json
 import mimetypes
 import chardet  # dependency of requests
 import copy
+from functools import wraps
 
 from babel.dates import format_date
 from babel import Locale as LC
@@ -59,6 +60,7 @@ from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
 from .kobo_sync_status import change_archived_books
 
+
 feature_support = {
     'ldap': bool(services.ldap),
     'goodreads': bool(services.goodreads_support),
@@ -72,11 +74,6 @@ except ImportError:
     feature_support['oauth'] = False
     oauth_check = {}
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
-
 try:
     from natsort import natsorted as sort
 except ImportError:
@@ -134,7 +131,7 @@ def get_email_status_json():
 
 @web.route("/ajax/bookmark/<int:book_id>/<book_format>", methods=['POST'])
 @login_required
-def bookmark(book_id, book_format):
+def set_bookmark(book_id, book_format):
     bookmark_key = request.form["bookmark"]
     ub.session.query(ub.Bookmark).filter(and_(ub.Bookmark.user_id == int(current_user.id),
                                               ub.Bookmark.book_id == book_id,
@@ -642,7 +639,8 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                         column=config.config_read_column),
                       category="error")
                 return redirect(url_for("web.index"))
-            # ToDo: Handle error Case for opds
+            return [] # ToDo: Handle error Case for opds
+
     if as_xml:
         return entries, pagination
     else:
@@ -809,6 +807,7 @@ def list_books():
                                     and_(ub.ReadBook.user_id == int(current_user.id),
                                          ub.ReadBook.book_id == db.Books.id)))
             else:
+                read_column = ""
                 try:
                     read_column = db.cc_classes[config.config_read_column]
                     books = (calibre_db.session.query(db.Books, read_column.value, ub.ArchivedBook.is_archived)
@@ -1725,12 +1724,14 @@ def profile():
 @viewer_required
 def read_book(book_id, book_format):
     book = calibre_db.get_filtered_book(book_id)
+    book.ordered_authors = calibre_db.order_authors([book], False)
+
     if not book:
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
         return redirect(url_for("web.index"))
 
-    # check if book has bookmark
+    # check if book has a bookmark
     bookmark = None
     if current_user.is_authenticated:
         bookmark = ub.session.query(ub.Bookmark).filter(and_(ub.Bookmark.user_id == int(current_user.id),
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 5daf8267c..580cf3c9b 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-02 20:56:18</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-12 22:57:13</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>2022-03-03 01:48:44</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-13 03:46:17</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>4h 5 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 0 min</p>
         </div>
       </div>
       </div>
@@ -725,13 +725,13 @@
 
     <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">19</td>
         <td class="text-center">17</td>
+        <td class="text-center">16</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 19)">Detail</a>
+            <a onclick="showClassDetail('c10', 17)">Detail</a>
         </td>
     </tr>
 
@@ -863,42 +863,7 @@
     
     
     
-        <tr id="st10.15" 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_st10.15')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st10.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_st10.15').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.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='st10.17' class='none bg-warning'>
+        <tr id='st10.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -907,7 +872,7 @@
     
     
     
-        <tr id='pt10.18' class='hiddenRow bg-success'>
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -916,7 +881,7 @@
     
     
     
-        <tr id='pt10.19' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -1867,7 +1832,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 947, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=22ded0fa-26b4-429d-81fc-bc75707c4e4c&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=4a23d5c4-e97a-42e1-bd43-351fb1de43df&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3172,11 +3137,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3213,11 +3178,35 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id="ft35.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 216, in sound_test
+    self.assertEqual(title, title_item.text)
+AssertionError: &#39;Unknown - music&#39; != &#39;- music&#39;
+- Unknown - music
++ - music</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3232,12 +3221,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestReconnect</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="errorClass">
+        <td>TestReadOnlyDatabase</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('c36', 1)">Detail</a>
@@ -3246,7 +3235,65 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id="et36.1" class="none bg-info">
+            <td>
+                <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_readonly_db.py&#34;, line 49, in test_readonly_path
+    self.fill_basic_config({&#39;config_rarfile_location&#39;: unrar_path(), &#34;config_unicode_filename&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 346, in _fill_basic_config
+    ele = cls.driver.find_element(By.ID, key)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_rarfile_location&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestReconnect</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('c37', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3264,13 +3311,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 8)">Detail</a>
+            <a onclick="showClassDetail('c38', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3279,7 +3326,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3288,7 +3335,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3297,7 +3344,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3306,7 +3353,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3315,7 +3362,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3324,7 +3371,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3333,7 +3380,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3351,13 +3398,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 3)">Detail</a>
+            <a onclick="showClassDetail('c39', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3366,7 +3413,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3375,7 +3422,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3393,13 +3440,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 16)">Detail</a>
+            <a onclick="showClassDetail('c40', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3408,7 +3455,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3417,7 +3464,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3426,7 +3473,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3435,7 +3482,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3444,7 +3491,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3453,7 +3500,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3462,7 +3509,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3471,7 +3518,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3480,7 +3527,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3489,7 +3536,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3498,7 +3545,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3507,7 +3554,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3516,19 +3563,19 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="st39.14" class="none bg-warning">
+        <tr id="st40.14" 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_st39.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st39.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.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_st39.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3542,7 +3589,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3551,7 +3598,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3569,13 +3616,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 9)">Detail</a>
+            <a onclick="showClassDetail('c41', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3584,7 +3631,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3593,7 +3640,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3602,7 +3649,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3611,7 +3658,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3620,7 +3667,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3629,19 +3676,19 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="st40.7" class="none bg-warning">
+        <tr id="st41.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_st40.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st40.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3655,7 +3702,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3664,7 +3711,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3682,13 +3729,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 2)">Detail</a>
+            <a onclick="showClassDetail('c42', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3697,7 +3744,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3707,21 +3754,21 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">17</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('c42', 18)">Detail</a>
+            <a onclick="showClassDetail('c43', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3730,7 +3777,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3739,7 +3786,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3748,7 +3795,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3757,7 +3804,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3766,7 +3813,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3775,7 +3822,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3784,7 +3831,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3793,7 +3840,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3802,7 +3849,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3811,7 +3858,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3820,7 +3867,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3829,7 +3876,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3838,7 +3885,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3847,7 +3894,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3856,16 +3903,36 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id="ft43.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.16')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 640, in test_user_list_requests
+    self.assertEqual(400, result.status_code)
+AssertionError: 400 != 500</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3874,7 +3941,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3892,13 +3959,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 1)">Detail</a>
+            <a onclick="showClassDetail('c44', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3916,13 +3983,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 21)">Detail</a>
+            <a onclick="showClassDetail('c45', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3931,7 +3998,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3940,7 +4007,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3949,7 +4016,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3958,7 +4025,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3967,7 +4034,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3976,7 +4043,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3985,7 +4052,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3994,7 +4061,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4003,7 +4070,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4012,7 +4079,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4021,7 +4088,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4030,7 +4097,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4039,7 +4106,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4048,7 +4115,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4057,7 +4124,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4066,7 +4133,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4075,7 +4142,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4084,7 +4151,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.19' class='hiddenRow bg-success'>
+        <tr id='pt45.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4093,7 +4160,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.20' class='hiddenRow bg-success'>
+        <tr id='pt45.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4102,7 +4169,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.21' class='hiddenRow bg-success'>
+        <tr id='pt45.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4120,13 +4187,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 34)">Detail</a>
+            <a onclick="showClassDetail('c46', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4135,7 +4202,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4144,7 +4211,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4153,7 +4220,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4162,7 +4229,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4171,7 +4238,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4180,7 +4247,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4189,7 +4256,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4198,7 +4265,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4207,7 +4274,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4216,7 +4283,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4225,7 +4292,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4234,7 +4301,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4243,7 +4310,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4252,7 +4319,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4261,7 +4328,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4270,7 +4337,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4279,7 +4346,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4288,7 +4355,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4297,7 +4364,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4306,7 +4373,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4315,7 +4382,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.22' class='hiddenRow bg-success'>
+        <tr id='pt46.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4324,7 +4391,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.23' class='hiddenRow bg-success'>
+        <tr id='pt46.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4333,7 +4400,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.24' class='hiddenRow bg-success'>
+        <tr id='pt46.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4342,7 +4409,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.25' class='hiddenRow bg-success'>
+        <tr id='pt46.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4351,7 +4418,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.26' class='hiddenRow bg-success'>
+        <tr id='pt46.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4360,7 +4427,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.27' class='hiddenRow bg-success'>
+        <tr id='pt46.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4369,7 +4436,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.28' class='hiddenRow bg-success'>
+        <tr id='pt46.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4378,7 +4445,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.29' class='hiddenRow bg-success'>
+        <tr id='pt46.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4387,7 +4454,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.30' class='hiddenRow bg-success'>
+        <tr id='pt46.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4396,7 +4463,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.31' class='hiddenRow bg-success'>
+        <tr id='pt46.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4405,7 +4472,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.32' class='hiddenRow bg-success'>
+        <tr id='pt46.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4414,7 +4481,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.33' class='hiddenRow bg-success'>
+        <tr id='pt46.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4423,7 +4490,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.34' class='hiddenRow bg-success'>
+        <tr id='pt46.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4441,13 +4508,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 16)">Detail</a>
+            <a onclick="showClassDetail('c47', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4456,7 +4523,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4465,7 +4532,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4474,7 +4541,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4483,7 +4550,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4492,7 +4559,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4501,7 +4568,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4510,7 +4577,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4519,7 +4586,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4528,7 +4595,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4537,7 +4604,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4546,7 +4613,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4555,7 +4622,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4564,7 +4631,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4573,7 +4640,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4582,7 +4649,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4593,11 +4660,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>404</td>
-        <td>394</td>
-        <td>3</td>
-        <td>0</td>
-        <td>7</td>
+        <td>403</td>
+        <td>391</td>
+        <td>5</td>
+        <td>1</td>
+        <td>6</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4625,7 +4692,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-30-generic #33~20.04.1-Ubuntu SMP Mon Feb 7 14:25:10 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-35-generic #40~20.04.1-Ubuntu SMP Mon Mar 7 09:18:32 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4727,7 +4794,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.31</td>
+              <td>1.4.32</td>
               <td>Basic</td>
             </tr>
           
@@ -4739,7 +4806,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>Unidecode</th>
-              <td>1.3.3</td>
+              <td>1.3.4</td>
               <td>Basic</td>
             </tr>
           
@@ -4757,7 +4824,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4787,7 +4854,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4817,7 +4884,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4859,7 +4926,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4895,7 +4962,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4931,13 +4998,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>scholarly</th>
-              <td>1.5.1</td>
+              <td>1.6.0</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5027,7 +5094,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 </div>
 
 <script>
-    drawCircle(394, 3, 0, 7);
+    drawCircle(391, 5, 1, 6);
     showCase(5);
 </script>
 

From 4545f4a20d9ff90b99bbd4e3e34b6de4441d6367 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 13 Mar 2022 12:34:21 +0100
Subject: [PATCH 201/412] Better epub cover parsing with multiple cover-image
 items Code cosmetics renamed variables refactored xml page generation
 refactored prepare author

---
 cps.py                        |   4 +-
 cps/__init__.py               |   2 +-
 cps/admin.py                  |  57 +++---
 cps/db.py                     |  66 +++----
 cps/editbooks.py              | 309 +++++++++++++++++---------------
 cps/epub.py                   |  20 ++-
 cps/helper.py                 | 177 ++++++++++---------
 cps/opds.py                   | 241 ++++++++++---------------
 cps/pagination.py             |   8 +-
 cps/remotelogin.py            |   5 +-
 cps/templates/book_edit.html  |   4 +-
 cps/templates/book_table.html |  16 +-
 cps/templates/detail.html     |   4 +-
 cps/templates/layout.html     |   2 +-
 cps/usermanagement.py         |   5 +-
 cps/web.py                    | 322 ++++++++++++++++++----------------
 optional-requirements.txt     |   8 +-
 requirements.txt              |   3 +-
 18 files changed, 609 insertions(+), 644 deletions(-)

diff --git a/cps.py b/cps.py
index 277da288f..8959679ab 100755
--- a/cps.py
+++ b/cps.py
@@ -40,7 +40,7 @@ from cps.about import about
 from cps.shelf import shelf
 from cps.admin import admi
 from cps.gdrive import gdrive
-from cps.editbooks import editbook
+from cps.editbooks import EditBook
 from cps.remotelogin import remotelogin
 from cps.search_metadata import meta
 from cps.error_handler import init_errorhandler
@@ -73,7 +73,7 @@ def main():
     app.register_blueprint(remotelogin)
     app.register_blueprint(meta)
     app.register_blueprint(gdrive)
-    app.register_blueprint(editbook)
+    app.register_blueprint(EditBook)
     if kobo_available:
         app.register_blueprint(kobo)
         app.register_blueprint(kobo_auth)
diff --git a/cps/__init__.py b/cps/__init__.py
index 2dfad699d..0b912d23c 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -156,7 +156,7 @@ def create_app():
         services.goodreads_support.connect(config.config_goodreads_api_key,
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
-    config.store_calibre_uuid(calibre_db, db.Library_Id)
+    config.store_calibre_uuid(calibre_db, db.LibraryId)
     return app
 
 @babel.localeselector
diff --git a/cps/admin.py b/cps/admin.py
index 3d4ca6096..5d8ed9c16 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -27,8 +27,9 @@ import json
 import time
 import operator
 from datetime import datetime, timedelta
+from functools import wraps
 
-from babel import Locale as LC
+from babel import Locale
 from babel.dates import format_datetime
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
 from flask_login import login_required, current_user, logout_user, confirm_login
@@ -47,7 +48,6 @@ from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from . import debug_info, _BABEL_TRANSLATIONS
 
-from functools import wraps
 
 log = logger.create()
 
@@ -189,10 +189,10 @@ 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()
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    return render_title_template("admin.html", allUser=allUser, email=email_settings, config=config, commit=commit,
+    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")
 
@@ -242,12 +242,12 @@ def calibreweb_alive():
 @login_required
 @admin_required
 def view_configuration():
-    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()
+    read_column = calibre_db.session.query(db.CustomColumns)\
+        .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all()
+    restrict_columns = calibre_db.session.query(db.CustomColumns)\
+        .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all()
     languages = calibre_db.speaking_language()
-    translations = [LC('en')] + babel.list_translations()
+    translations = [Locale('en')] + babel.list_translations()
     return render_title_template("config_view_edit.html", conf=config, readColumns=read_column,
                                  restrictColumns=restrict_columns,
                                  languages=languages,
@@ -261,8 +261,8 @@ def view_configuration():
 def edit_user_table():
     visibility = current_user.view_settings.get('useredit', {})
     languages = calibre_db.speaking_language()
-    translations = babel.list_translations() + [LC('en')]
-    allUser = ub.session.query(ub.User)
+    translations = babel.list_translations() + [Locale('en')]
+    all_user = ub.session.query(ub.User)
     tags = calibre_db.session.query(db.Tags)\
         .join(db.books_tags_link)\
         .join(db.Books)\
@@ -274,10 +274,10 @@ def edit_user_table():
     else:
         custom_values = []
     if not config.config_anonbrowse:
-        allUser = allUser.filter(ub.User.role.op('&')(constants.ROLE_ANONYMOUS) != constants.ROLE_ANONYMOUS)
+        all_user = all_user.filter(ub.User.role.op('&')(constants.ROLE_ANONYMOUS) != constants.ROLE_ANONYMOUS)
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     return render_title_template("user_table.html",
-                                 users=allUser.all(),
+                                 users=all_user.all(),
                                  tags=tags,
                                  custom_values=custom_values,
                                  translations=translations,
@@ -332,7 +332,7 @@ def list_users():
         if user.default_language == "all":
             user.default = _("All")
         else:
-            user.default = LC.parse(user.default_language).get_language_name(get_locale())
+            user.default = Locale.parse(user.default_language).get_language_name(get_locale())
 
     table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": users}
     js_list = json.dumps(table_entries, cls=db.AlchemyEncoder)
@@ -380,7 +380,7 @@ def delete_user():
 @login_required
 @admin_required
 def table_get_locale():
-    locale = babel.list_translations() + [LC('en')]
+    locale = babel.list_translations() + [Locale('en')]
     ret = list()
     current_locale = get_locale()
     for loc in locale:
@@ -444,7 +444,7 @@ def edit_list_user(param):
                 elif param.endswith('role'):
                     value = int(vals['field_index'])
                     if user.name == "Guest" and value in \
-                                 [constants.ROLE_ADMIN, constants.ROLE_PASSWD, constants.ROLE_EDIT_SHELFS]:
+                            [constants.ROLE_ADMIN, constants.ROLE_PASSWD, constants.ROLE_EDIT_SHELFS]:
                         raise Exception(_("Guest can't have this role"))
                     # check for valid value, last on checks for power of 2 value
                     if value > 0 and value <= constants.ROLE_VIEWER and (value & value-1 == 0 or value == 1):
@@ -524,16 +524,16 @@ def update_table_settings():
 
 def check_valid_read_column(column):
     if column != "0":
-        if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
-              .filter(and_(db.Custom_Columns.datatype == 'bool', db.Custom_Columns.mark_for_delete == 0)).all():
+        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
+              .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all():
             return False
     return True
 
 
 def check_valid_restricted_column(column):
     if column != "0":
-        if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
-              .filter(and_(db.Custom_Columns.datatype == 'text', db.Custom_Columns.mark_for_delete == 0)).all():
+        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
+              .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all():
             return False
     return True
 
@@ -1078,12 +1078,12 @@ def _configuration_oauth_helper(to_save):
     reboot_required = False
     for element in oauthblueprints:
         if to_save["config_" + str(element['id']) + "_oauth_client_id"] != element['oauth_client_id'] \
-            or to_save["config_" + str(element['id']) + "_oauth_client_secret"] != element['oauth_client_secret']:
+                or to_save["config_" + str(element['id']) + "_oauth_client_secret"] != element['oauth_client_secret']:
             reboot_required = True
             element['oauth_client_id'] = to_save["config_" + str(element['id']) + "_oauth_client_id"]
             element['oauth_client_secret'] = to_save["config_" + str(element['id']) + "_oauth_client_secret"]
         if to_save["config_" + str(element['id']) + "_oauth_client_id"] \
-            and to_save["config_" + str(element['id']) + "_oauth_client_secret"]:
+                and to_save["config_" + str(element['id']) + "_oauth_client_secret"]:
             active_oauths += 1
             element["active"] = 1
         else:
@@ -1136,7 +1136,7 @@ def _configuration_ldap_helper(to_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:
+            or not config.config_ldap_user_object:
         return reboot_required, _configuration_result(_('Please Enter a LDAP Provider, '
                                                         'Port, DN and User Object Identifier'))
 
@@ -1211,6 +1211,7 @@ def _db_configuration_update_helper():
                                            '',
                                            to_save['config_calibre_dir'],
                                            flags=re.IGNORECASE)
+    db_valid = False
     try:
         db_change, db_valid = _db_simulate_change()
 
@@ -1229,11 +1230,11 @@ def _db_configuration_update_helper():
         return _db_configuration_result('{}'.format(ex), gdrive_error)
 
     if db_change or not db_valid or not config.db_configured \
-          or config.config_calibre_dir != to_save["config_calibre_dir"]:
+            or config.config_calibre_dir != to_save["config_calibre_dir"]:
         if not calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path):
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
                                             gdrive_error)
-        config.store_calibre_uuid(calibre_db, db.Library_Id)
+        config.store_calibre_uuid(calibre_db, db.LibraryId)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         if db_change:
             log.info("Calibre Database changed, delete all Calibre-Web info related to old Database")
@@ -1272,7 +1273,7 @@ def _configuration_update_helper():
         _config_checkbox_int(to_save, "config_unicode_filename")
         # 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)
+                            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")
@@ -1560,7 +1561,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
 def new_user():
     content = ub.User()
     languages = calibre_db.speaking_language()
-    translations = [LC('en')] + babel.list_translations()
+    translations = [Locale('en')] + babel.list_translations()
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     if request.method == "POST":
         to_save = request.form.to_dict()
@@ -1647,7 +1648,7 @@ def edit_user(user_id):
         flash(_(u"User not found"), category="error")
         return redirect(url_for('admin.admin'))
     languages = calibre_db.speaking_language(return_all_languages=True)
-    translations = babel.list_translations() + [LC('en')]
+    translations = babel.list_translations() + [Locale('en')]
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     if request.method == "POST":
         to_save = request.form.to_dict()
diff --git a/cps/db.py b/cps/db.py
index 2292614ca..b910363b7 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -17,13 +17,13 @@
 #  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 copy
 import os
 import re
 import ast
 import json
 from datetime import datetime
 from urllib.parse import quote
+import unidecode
 
 from sqlalchemy import create_engine
 from sqlalchemy import Table, Column, ForeignKey, CheckConstraint
@@ -49,11 +49,6 @@ from .pagination import Pagination
 
 from weakref import WeakSet
 
-try:
-    import unidecode
-    use_unidecode = True
-except ImportError:
-    use_unidecode = False
 
 log = logger.create()
 
@@ -93,7 +88,7 @@ books_publishers_link = Table('books_publishers_link', Base.metadata,
                               )
 
 
-class Library_Id(Base):
+class LibraryId(Base):
     __tablename__ = 'library_id'
     id = Column(Integer, primary_key=True)
     uuid = Column(String, nullable=False)
@@ -112,7 +107,7 @@ class Identifiers(Base):
         self.type = id_type
         self.book = book
 
-    def formatType(self):
+    def format_type(self):
         format_type = self.type.lower()
         if format_type == 'amazon':
             return u"Amazon"
@@ -184,8 +179,8 @@ class Comments(Base):
     book = Column(Integer, ForeignKey('books.id'), nullable=False, unique=True)
     text = Column(String(collation='NOCASE'), nullable=False)
 
-    def __init__(self, text, book):
-        self.text = text
+    def __init__(self, comment, book):
+        self.text = comment
         self.book = book
 
     def get(self):
@@ -367,7 +362,6 @@ class Books(Base):
         self.path = path
         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,
                                                                  self.timestamp, self.pubdate, self.series_index,
@@ -375,10 +369,10 @@ class Books(Base):
 
     @property
     def atom_timestamp(self):
-        return (self.timestamp.strftime('%Y-%m-%dT%H:%M:%S+00:00') or '')
+        return self.timestamp.strftime('%Y-%m-%dT%H:%M:%S+00:00') or ''
 
 
-class Custom_Columns(Base):
+class CustomColumns(Base):
     __tablename__ = 'custom_columns'
 
     id = Column(Integer, primary_key=True)
@@ -436,7 +430,7 @@ class AlchemyEncoder(json.JSONEncoder):
         return json.JSONEncoder.default(self, o)
 
 
-class CalibreDB():
+class CalibreDB:
     _init = False
     engine = None
     config = None
@@ -450,17 +444,17 @@ class CalibreDB():
         """
         self.session = None
         if self._init:
-            self.initSession(expire_on_commit)
+            self.init_session(expire_on_commit)
 
         self.instances.add(self)
 
-    def initSession(self, expire_on_commit=True):
+    def init_session(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_cc_classes(self, cc):
+    def setup_db_cc_classes(cls, cc):
         cc_ids = []
         books_custom_column_links = {}
         for row in cc:
@@ -539,16 +533,16 @@ class CalibreDB():
             return False, False
         try:
             check_engine = create_engine('sqlite://',
-                          echo=False,
-                          isolation_level="SERIALIZABLE",
-                          connect_args={'check_same_thread': False},
-                          poolclass=StaticPool)
+                                         echo=False,
+                                         isolation_level="SERIALIZABLE",
+                                         connect_args={'check_same_thread': False},
+                                         poolclass=StaticPool)
             with check_engine.begin() as connection:
                 connection.execute(text("attach database '{}' as calibre;".format(dbpath)))
                 connection.execute(text("attach database '{}' as app_settings;".format(app_db_path)))
                 local_session = scoped_session(sessionmaker())
                 local_session.configure(bind=connection)
-                database_uuid = local_session().query(Library_Id).one_or_none()
+                database_uuid = local_session().query(LibraryId).one_or_none()
                 # local_session.dispose()
 
             check_engine.connect()
@@ -603,7 +597,7 @@ class CalibreDB():
                                                           autoflush=True,
                                                           bind=cls.engine))
         for inst in cls.instances:
-            inst.initSession()
+            inst.init_session()
 
         cls._init = True
         return True
@@ -644,12 +638,10 @@ class CalibreDB():
     # Language and content filters for displaying in the UI
     def common_filters(self, allow_show_archived=False, return_all_languages=False):
         if not allow_show_archived:
-            archived_books = (
-                ub.session.query(ub.ArchivedBook)
-                    .filter(ub.ArchivedBook.user_id == int(current_user.id))
-                    .filter(ub.ArchivedBook.is_archived == True)
-                    .all()
-            )
+            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 = Books.id.notin_(archived_book_ids)
         else:
@@ -668,11 +660,11 @@ class CalibreDB():
                 pos_cc_list = current_user.allowed_column_value.split(',')
                 pos_content_cc_filter = true() if pos_cc_list == [''] else \
                     getattr(Books, 'custom_column_' + str(self.config.config_restricted_column)). \
-                        any(cc_classes[self.config.config_restricted_column].value.in_(pos_cc_list))
+                    any(cc_classes[self.config.config_restricted_column].value.in_(pos_cc_list))
                 neg_cc_list = current_user.denied_column_value.split(',')
                 neg_content_cc_filter = false() if neg_cc_list == [''] else \
                     getattr(Books, 'custom_column_' + str(self.config.config_restricted_column)). \
-                        any(cc_classes[self.config.config_restricted_column].value.in_(neg_cc_list))
+                    any(cc_classes[self.config.config_restricted_column].value.in_(neg_cc_list))
             except (KeyError, AttributeError):
                 pos_content_cc_filter = false()
                 neg_content_cc_filter = true()
@@ -728,7 +720,7 @@ class CalibreDB():
                 query = (self.session.query(database, ub.ReadBook.read_status, ub.ArchivedBook.is_archived)
                          .select_from(Books)
                          .outerjoin(ub.ReadBook,
-                               and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id)))
+                                    and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id)))
             else:
                 try:
                     read_column = cc_classes[config_read_column]
@@ -738,7 +730,7 @@ class CalibreDB():
                 except (KeyError, AttributeError):
                     log.error("Custom Column No.%d is not existing in calibre database", read_column)
                     # Skip linking read column and return None instead of read status
-                    query =self.session.query(database, None, ub.ArchivedBook.is_archived)
+                    query = self.session.query(database, None, ub.ArchivedBook.is_archived)
             query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
                                                           int(current_user.id) == ub.ArchivedBook.user_id))
         else:
@@ -812,7 +804,6 @@ class CalibreDB():
                 return authors_ordered
         return entries
 
-
     def get_typeahead(self, database, query, replace=('', ''), tag_filter=true()):
         query = query or ''
         self.session.connection().connection.connection.create_function("lower", 1, lcase)
@@ -872,7 +863,7 @@ class CalibreDB():
                 ))
 
     # read search results from calibre-database and return it (function is used for feed and simple search
-    def get_search_results(self, term, offset=None, order=None, limit=None, allow_show_archived=False,
+    def get_search_results(self, term, offset=None, order=None, limit=None,
                            config_read_column=False, *join):
         order = order[0] if order else [Books.sort]
         pagination = None
@@ -915,7 +906,6 @@ class CalibreDB():
                 lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
             return sorted(languages, key=lambda x: x.name, reverse=reverse_order)
 
-
     def update_title_sort(self, config, conn=None):
         # user defined sort function for calibre databases (Series, etc.)
         def _title_sort(title):
@@ -973,6 +963,6 @@ def lcase(s):
     try:
         return unidecode.unidecode(s.lower())
     except Exception as ex:
-        log = logger.create()
-        log.error_or_exception(ex)
+        _log = logger.create()
+        _log.error_or_exception(ex)
         return s.lower()
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 30535ef3d..728164f91 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -31,7 +31,7 @@ from functools import wraps
 try:
     from lxml.html.clean import clean_html
 except ImportError:
-    pass
+    clean_html = None
 
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
@@ -48,7 +48,7 @@ from .usermanagement import login_required_if_no_ano
 from .kobo_sync_status import change_archived_books
 
 
-editbook = Blueprint('editbook', __name__)
+EditBook = Blueprint('edit-book', __name__)
 log = logger.create()
 
 
@@ -61,6 +61,7 @@ def upload_required(f):
 
     return inner
 
+
 def edit_required(f):
     @wraps(f)
     def inner(*args, **kwargs):
@@ -70,6 +71,7 @@ def edit_required(f):
 
     return inner
 
+
 def search_objects_remove(db_book_object, db_type, input_elements):
     del_elements = []
     for c_elements in db_book_object:
@@ -119,6 +121,7 @@ def remove_objects(db_book_object, db_session, del_elements):
                 db_session.delete(del_element)
     return changed
 
+
 def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
     changed = False
     if db_type == 'languages':
@@ -128,7 +131,7 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
     else:
         db_filter = db_object.name
     for add_element in add_elements:
-        # check if a element with that name exists
+        # check if an element with that name exists
         db_element = db_session.query(db_object).filter(db_filter == add_element).first()
         # if no element is found add it
         if db_type == 'author':
@@ -147,7 +150,6 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
             db_book_object.append(new_element)
         else:
             db_element = create_objects_for_addition(db_element, add_element, db_type)
-            changed = True
             # add element to book
             changed = True
             db_book_object.append(db_element)
@@ -178,7 +180,7 @@ def create_objects_for_addition(db_element, add_element, db_type):
     return db_element
 
 
-# Modifies different Database objects, first check if elements if elements have to be deleted,
+# Modifies different Database objects, first check if elements have to be deleted,
 # because they are no longer used, than check if elements have to be added to database
 def modify_database_object(input_elements, db_book_object, db_object, db_session, db_type):
     # passing input_elements not as a list may lead to undesired results
@@ -207,7 +209,7 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
     input_dict = dict([(identifier.type.lower(), identifier) for identifier in input_identifiers])
     if len(input_identifiers) != len(input_dict):
         error = True
-    db_dict = dict([(identifier.type.lower(), identifier) for identifier in db_identifiers ])
+    db_dict = dict([(identifier.type.lower(), identifier) for identifier in db_identifiers])
     # delete db identifiers not present in input or modify them with input val
     for identifier_type, identifier in db_dict.items():
         if identifier_type not in input_dict.keys():
@@ -224,14 +226,15 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
             changed = True
     return changed, error
 
-@editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
+
+@EditBook.route("/ajax/delete/<int:book_id>", methods=["POST"])
 @login_required
 def delete_book_from_details(book_id):
     return Response(delete_book_from_table(book_id, "", True), mimetype='application/json')
 
 
-@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
-@editbook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
+@EditBook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
+@EditBook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
 @login_required
 def delete_book_ajax(book_id, book_format):
     return delete_book_from_table(book_id, book_format, False)
@@ -252,8 +255,8 @@ def delete_whole_book(book_id, book):
     modify_database_object([u''], book.languages, db.Languages, calibre_db.session, 'languages')
     modify_database_object([u''], book.publishers, db.Publishers, calibre_db.session, 'publishers')
 
-    cc = calibre_db.session.query(db.Custom_Columns). \
-        filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    cc = calibre_db.session.query(db.CustomColumns). \
+        filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
     for c in cc:
         cc_string = "custom_column_" + str(c.id)
         if not c.is_multiple:
@@ -283,18 +286,18 @@ def delete_whole_book(book_id, book):
     calibre_db.session.query(db.Books).filter(db.Books.id == book_id).delete()
 
 
-def render_delete_book_result(book_format, jsonResponse, warning, book_id):
+def render_delete_book_result(book_format, json_response, warning, book_id):
     if book_format:
-        if jsonResponse:
-            return json.dumps([warning, {"location": url_for("editbook.edit_book", book_id=book_id),
+        if json_response:
+            return json.dumps([warning, {"location": url_for("edit-book.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))
+            return redirect(url_for('edit-book.edit_book', book_id=book_id))
     else:
-        if jsonResponse:
+        if json_response:
             return json.dumps([warning, {"location": url_for('web.index'),
                                          "type": "success",
                                          "format": book_format,
@@ -304,7 +307,7 @@ def render_delete_book_result(book_format, jsonResponse, warning, book_id):
             return redirect(url_for('web.index'))
 
 
-def delete_book_from_table(book_id, book_format, jsonResponse):
+def delete_book_from_table(book_id, book_format, json_response):
     warning = {}
     if current_user.role_delete_books():
         book = calibre_db.get_book(book_id)
@@ -312,20 +315,20 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
             try:
                 result, error = helper.delete_book(book, config.config_calibre_dir, book_format=book_format.upper())
                 if not result:
-                    if jsonResponse:
-                        return json.dumps([{"location": url_for("editbook.edit_book", book_id=book_id),
-                                           "type": "danger",
-                                           "format": "",
-                                           "message": error}])
+                    if json_response:
+                        return json.dumps([{"location": url_for("edit-book.edit_book", book_id=book_id),
+                                            "type": "danger",
+                                            "format": "",
+                                            "message": error}])
                     else:
                         flash(error, category="error")
-                        return redirect(url_for('editbook.edit_book', book_id=book_id))
+                        return redirect(url_for('edit-book.edit_book', book_id=book_id))
                 if error:
-                    if jsonResponse:
-                        warning = {"location": url_for("editbook.edit_book", book_id=book_id),
-                                                "type": "warning",
-                                                "format": "",
-                                                "message": error}
+                    if json_response:
+                        warning = {"location": url_for("edit-book.edit_book", book_id=book_id),
+                                   "type": "warning",
+                                   "format": "",
+                                   "message": error}
                     else:
                         flash(error, category="warning")
                 if not book_format:
@@ -339,35 +342,36 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
             except Exception as ex:
                 log.error_or_exception(ex)
                 calibre_db.session.rollback()
-                if jsonResponse:
-                    return json.dumps([{"location": url_for("editbook.edit_book", book_id=book_id),
+                if json_response:
+                    return json.dumps([{"location": url_for("edit-book.edit_book", book_id=book_id),
                                         "type": "danger",
                                         "format": "",
                                         "message": ex}])
                 else:
                     flash(str(ex), category="error")
-                    return redirect(url_for('editbook.edit_book', book_id=book_id))
+                    return redirect(url_for('edit-book.edit_book', book_id=book_id))
 
         else:
             # book not found
             log.error('Book with id "%s" could not be deleted: not found', book_id)
-        return render_delete_book_result(book_format, jsonResponse, warning, book_id)
+        return render_delete_book_result(book_format, json_response, warning, book_id)
     message = _("You are missing permissions to delete books")
-    if jsonResponse:
-        return json.dumps({"location": url_for("editbook.edit_book", book_id=book_id),
+    if json_response:
+        return json.dumps({"location": url_for("edit-book.edit_book", book_id=book_id),
                            "type": "danger",
                            "format": "",
                            "message": message})
     else:
         flash(message, category="error")
-        return redirect(url_for('editbook.edit_book', book_id=book_id))
+        return redirect(url_for('edit-book.edit_book', book_id=book_id))
 
 
 def render_edit_book(book_id):
-    cc = calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    cc = calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
     if not book:
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
         return redirect(url_for("web.index"))
 
     for lang in book.languages:
@@ -380,9 +384,9 @@ def render_edit_book(book_id):
         author_names.append(authr.name.replace('|', ','))
 
     # Option for showing convertbook button
-    valid_source_formats=list()
+    valid_source_formats = list()
     allowed_conversion_formats = list()
-    kepub_possible=None
+    kepub_possible = None
     if config.config_converterpath:
         for file in book.data:
             if file.format.lower() in constants.EXTENSIONS_CONVERT_FROM:
@@ -430,6 +434,7 @@ def edit_book_ratings(to_save, book):
             changed = True
     return changed
 
+
 def edit_book_tags(tags, book):
     input_tags = tags.split(',')
     input_tags = list(map(lambda it: it.strip(), input_tags))
@@ -446,48 +451,48 @@ def edit_book_series(series, book):
 
 def edit_book_series_index(series_index, book):
     # Add default series_index to book
-    modif_date = False
+    modify_date = False
     series_index = series_index or '1'
     if not series_index.replace('.', '', 1).isdigit():
         flash(_("%(seriesindex)s is not a valid number, skipping", seriesindex=series_index), category="warning")
         return False
     if str(book.series_index) != series_index:
         book.series_index = series_index
-        modif_date = True
-    return modif_date
+        modify_date = True
+    return modify_date
 
 
 # Handle book comments/description
 def edit_book_comments(comments, book):
-    modif_date = False
+    modify_date = False
     if comments:
         comments = clean_html(comments)
     if len(book.comments):
         if book.comments[0].text != comments:
             book.comments[0].text = comments
-            modif_date = True
+            modify_date = True
     else:
         if comments:
-            book.comments.append(db.Comments(text=comments, book=book.id))
-            modif_date = True
-    return modif_date
+            book.comments.append(db.Comments(comment=comments, book=book.id))
+            modify_date = True
+    return modify_date
 
 
-def edit_book_languages(languages, book, upload=False, invalid=None):
+def edit_book_languages(languages, book, upload_mode=False, invalid=None):
     input_languages = languages.split(',')
     unknown_languages = []
-    if not upload:
+    if not upload_mode:
         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)
+    for lang in unknown_languages:
+        log.error("'%s' is not a valid language", lang)
         if isinstance(invalid, list):
-            invalid.append(l)
+            invalid.append(lang)
         else:
-            raise ValueError(_(u"'%(langname)s' is not a valid language", langname=l))
+            raise ValueError(_(u"'%(langname)s' is not a valid language", langname=lang))
     # ToDo: Not working correct
-    if upload and len(input_l) == 1:
+    if upload_mode and len(input_l) == 1:
         # If the language of the file is excluded from the users view, it's not imported, to allow the user to view
         # 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":
@@ -571,17 +576,20 @@ def edit_cc_data_string(book, c, to_save, cc_db_value, cc_string):
         getattr(book, cc_string).append(new_cc)
     return changed, to_save
 
+
 def edit_single_cc_data(book_id, book, column_id, to_save):
-    cc = (calibre_db.session.query(db.Custom_Columns)
-          .filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions))
-          .filter(db.Custom_Columns.id == column_id)
+    cc = (calibre_db.session.query(db.CustomColumns)
+          .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions))
+          .filter(db.CustomColumns.id == column_id)
           .all())
     return edit_cc_data(book_id, book, to_save, cc)
 
+
 def edit_all_cc_data(book_id, book, to_save):
-    cc = calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    cc = calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
     return edit_cc_data(book_id, book, to_save, cc)
 
+
 def edit_cc_data(book_id, book, to_save, cc):
     changed = False
     for c in cc:
@@ -614,10 +622,11 @@ def edit_cc_data(book_id, book, to_save, cc):
                                               'custom')
     return changed
 
-def upload_single_file(request, book, book_id):
+
+def upload_single_file(file_request, book, book_id):
     # Check and handle Uploaded file
-    if 'btn-upload-format' in request.files:
-        requested_file = request.files['btn-upload-format']
+    if 'btn-upload-format' in file_request.files:
+        requested_file = file_request.files['btn-upload-format']
         # check for empty request
         if requested_file.filename != '':
             if not current_user.role_upload():
@@ -669,17 +678,17 @@ def upload_single_file(request, book, book_id):
 
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
-            uploadText=_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
-            WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(book.title)))
+            upload_text = _(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
+            WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(book.title)))
 
             return uploader.process(
                 saved_filename, *os.path.splitext(requested_file.filename),
                 rarExecutable=config.config_rarfile_location)
 
 
-def upload_cover(request, book):
-    if 'btn-upload-cover' in request.files:
-        requested_file = request.files['btn-upload-cover']
+def upload_cover(cover_request, book):
+    if 'btn-upload-cover' in cover_request.files:
+        requested_file = cover_request.files['btn-upload-cover']
         # check for empty request
         if requested_file.filename != '':
             if not current_user.role_upload():
@@ -706,8 +715,8 @@ def handle_title_on_edit(book, book_title):
 
 def handle_author_on_edit(book, author_name, update_stored=True):
     # handle author(s)
-    # renamed = False
-    input_authors = author_name.split('&')
+    input_authors, renamed = prepare_authors(author_name)
+    '''input_authors = author_name.split('&')
     input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
     # Remove duplicates in authors list
     input_authors = helper.uniq(input_authors)
@@ -725,7 +734,7 @@ def handle_author_on_edit(book, author_name, update_stored=True):
             sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
             sorted_old_author = helper.get_sorted_author(in_aut)
             for one_book in all_books:
-                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
+                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)'''
 
     change = modify_database_object(input_authors, book.authors, db.Authors, calibre_db.session, 'author')
 
@@ -746,11 +755,11 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     return input_authors, change, renamed
 
 
-@editbook.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
+@EditBook.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_book(book_id):
-    modif_date = False
+    modify_date = False
 
     # create the function for sorting...
     try:
@@ -767,13 +776,14 @@ def edit_book(book_id):
 
     # Book not found
     if not book:
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
         return redirect(url_for("web.index"))
 
     meta = upload_single_file(request, book, book_id)
     if upload_cover(request, book) is True:
         book.has_cover = 1
-        modif_date = True
+        modify_date = True
     try:
         to_save = request.form.to_dict()
         merge_metadata(to_save, meta)
@@ -786,15 +796,15 @@ def edit_book(book_id):
         input_authors, authorchange, renamed = handle_author_on_edit(book, to_save["author_name"])
         if authorchange or title_change:
             edited_books_id = book.id
-            modif_date = True
+            modify_date = True
 
         if config.config_use_google_drive:
             gdriveutils.updateGdriveCalibreFromLocal()
 
-        error = False
+        error = ""
         if edited_books_id:
             error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                               renamed_author=renamed)
+                                                renamed_author=renamed)
 
         if not error:
             if "cover_url" in to_save:
@@ -808,32 +818,32 @@ def edit_book(book_id):
                         result, error = helper.save_cover_from_url(to_save["cover_url"], book.path)
                         if result is True:
                             book.has_cover = 1
-                            modif_date = True
+                            modify_date = True
                         else:
                             flash(error, category="error")
 
             # Add default series_index to book
-            modif_date |= edit_book_series_index(to_save["series_index"], book)
+            modify_date |= edit_book_series_index(to_save["series_index"], book)
             # Handle book comments/description
-            modif_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
+            modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
             # Handle identifiers
             input_identifiers = identifier_list(to_save, book)
             modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
             if warning:
                 flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
-            modif_date |= modification
+            modify_date |= modification
             # Handle book tags
-            modif_date |= edit_book_tags(to_save['tags'], book)
+            modify_date |= edit_book_tags(to_save['tags'], book)
             # Handle book series
-            modif_date |= edit_book_series(to_save["series"], book)
+            modify_date |= edit_book_series(to_save["series"], book)
             # handle book publisher
-            modif_date |= edit_book_publisher(to_save['publisher'], book)
+            modify_date |= edit_book_publisher(to_save['publisher'], book)
             # handle book languages
-            modif_date |= edit_book_languages(to_save['languages'], book)
+            modify_date |= edit_book_languages(to_save['languages'], book)
             # handle book ratings
-            modif_date |= edit_book_ratings(to_save, book)
+            modify_date |= edit_book_ratings(to_save, book)
             # handle cc data
-            modif_date |= edit_all_cc_data(book_id, book, to_save)
+            modify_date |= edit_all_cc_data(book_id, book, to_save)
 
             if to_save["pubdate"]:
                 try:
@@ -843,7 +853,7 @@ def edit_book(book_id):
             else:
                 book.pubdate = db.Books.DEFAULT_PUBDATE
 
-            if modif_date:
+            if modify_date:
                 book.last_modified = datetime.utcnow()
                 kobo_sync_status.remove_synced_book(edited_books_id, all=True)
 
@@ -905,14 +915,7 @@ def identifier_list(to_save, book):
     return result
 
 
-def prepare_authors_on_upload(title, authr):
-    if title != _(u'Unknown') and authr != _(u'Unknown'):
-        entry = calibre_db.check_exists_book(authr, title)
-        if entry:
-            log.info("Uploaded book probably exists in library")
-            flash(_(u"Uploaded book probably exists in the library, consider to change before upload new: ")
-                  + Markup(render_title_template('book_exists_flash.html', entry=entry)), category="warning")
-
+def prepare_authors(authr):
     # handle authors
     input_authors = authr.split('&')
     # handle_authors(input_authors)
@@ -935,6 +938,18 @@ def prepare_authors_on_upload(title, authr):
             sorted_old_author = helper.get_sorted_author(in_aut)
             for one_book in all_books:
                 one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
+    return input_authors, renamed
+
+
+def prepare_authors_on_upload(title, authr):
+    if title != _(u'Unknown') and authr != _(u'Unknown'):
+        entry = calibre_db.check_exists_book(authr, title)
+        if entry:
+            log.info("Uploaded book probably exists in library")
+            flash(_(u"Uploaded book probably exists in the library, consider to change before upload new: ")
+                  + Markup(render_title_template('book_exists_flash.html', entry=entry)), category="warning")
+
+    input_authors, renamed = prepare_authors(authr)
 
     sort_authors_list = list()
     db_author = None
@@ -955,7 +970,7 @@ def prepare_authors_on_upload(title, authr):
     return sort_authors, input_authors, db_author, renamed
 
 
-def create_book_on_upload(modif_date, meta):
+def create_book_on_upload(modify_date, meta):
     title = meta.title
     authr = meta.author
     sort_authors, input_authors, db_author, renamed_authors = prepare_authors_on_upload(title, authr)
@@ -963,34 +978,34 @@ def create_book_on_upload(modif_date, meta):
     title_dir = helper.get_valid_filename(title, chars=96)
     author_dir = helper.get_valid_filename(db_author.name, chars=96)
 
-    # combine path and normalize path from windows systems
+    # 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, meta.cover, db_author, [], "")
 
-    modif_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
-                                         'author')
+    modify_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
+                                          'author')
 
     # Add series_index to book
-    modif_date |= edit_book_series_index(meta.series_id, db_book)
+    modify_date |= edit_book_series_index(meta.series_id, db_book)
 
     # add languages
-    invalid=[]
-    modif_date |= edit_book_languages(meta.languages, db_book, upload=True, invalid=invalid)
+    invalid = []
+    modify_date |= edit_book_languages(meta.languages, db_book, upload_mode=True, invalid=invalid)
     if invalid:
-        for l in invalid:
-            flash(_(u"'%(langname)s' is not a valid language", langname=l), category="warning")
+        for lang in invalid:
+            flash(_(u"'%(langname)s' is not a valid language", langname=lang), category="warning")
 
     # handle tags
-    modif_date |= edit_book_tags(meta.tags, db_book)
+    modify_date |= edit_book_tags(meta.tags, db_book)
 
     # handle publisher
-    modif_date |= edit_book_publisher(meta.publisher, db_book)
+    modify_date |= edit_book_publisher(meta.publisher, db_book)
 
     # handle series
-    modif_date |= edit_book_series(meta.series, db_book)
+    modify_date |= edit_book_series(meta.series, db_book)
 
     # Add file to book
     file_size = os.path.getsize(meta.file_path)
@@ -1002,6 +1017,7 @@ def create_book_on_upload(modif_date, meta):
     calibre_db.session.flush()
     return db_book, input_authors, title_dir, renamed_authors
 
+
 def file_handling_on_upload(requested_file):
     # check if file extension is correct
     if '.' in requested_file.filename:
@@ -1045,7 +1061,7 @@ def move_coverfile(meta, db_book):
               category="error")
 
 
-@editbook.route("/upload", methods=["POST"])
+@EditBook.route("/upload", methods=["POST"])
 @login_required_if_no_ano
 @upload_required
 def upload():
@@ -1054,7 +1070,7 @@ def upload():
     if request.method == 'POST' and 'btn-upload' in request.files:
         for requested_file in request.files.getlist("btn-upload"):
             try:
-                modif_date = False
+                modify_date = False
                 # create the function for sorting...
                 calibre_db.update_title_sort(config)
                 calibre_db.session.connection().connection.connection.create_function('uuid4', 0, lambda: str(uuid4()))
@@ -1063,10 +1079,10 @@ def upload():
                 if error:
                     return error
 
-                db_book, input_authors, title_dir, renamed_authors = create_book_on_upload(modif_date, meta)
+                db_book, input_authors, title_dir, renamed_authors = create_book_on_upload(modify_date, meta)
 
-                # Comments needs book id therefore only possible after flush
-                modif_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
+                # Comments need book id therefore only possible after flush
+                modify_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
 
                 book_id = db_book.id
                 title = db_book.title
@@ -1096,12 +1112,12 @@ def upload():
                 if error:
                     flash(error, category="error")
                 link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
-                uploadText = _(u"File %(file)s uploaded", file=link)
-                WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(title)))
+                upload_text = _(u"File %(file)s uploaded", file=link)
+                WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
 
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
-                        resp = {"location": url_for('editbook.edit_book', book_id=book_id)}
+                        resp = {"location": url_for('edit-book.edit_book', book_id=book_id)}
                         return Response(json.dumps(resp), mimetype='application/json')
                     else:
                         resp = {"location": url_for('web.show_book', book_id=book_id)}
@@ -1113,7 +1129,7 @@ def upload():
         return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
 
 
-@editbook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
+@EditBook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def convert_bookformat(book_id):
@@ -1123,7 +1139,7 @@ def convert_bookformat(book_id):
 
     if (book_format_from is None) or (book_format_to is None):
         flash(_(u"Source or destination format for conversion missing"), category="error")
-        return redirect(url_for('editbook.edit_book', book_id=book_id))
+        return redirect(url_for('edit-book.edit_book', book_id=book_id))
 
     log.info('converting: book id: %s from: %s to: %s', book_id, book_format_from, book_format_to)
     rtn = helper.convert_book_format(book_id, config.config_calibre_dir, book_format_from.upper(),
@@ -1131,31 +1147,33 @@ def convert_bookformat(book_id):
 
     if rtn is None:
         flash(_(u"Book successfully queued for converting to %(book_format)s",
-                    book_format=book_format_to),
-                    category="success")
+                book_format=book_format_to),
+              category="success")
     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))
+    return redirect(url_for('edit-book.edit_book', book_id=book_id))
 
-@editbook.route("/ajax/getcustomenum/<int:c_id>")
+
+@EditBook.route("/ajax/getcustomenum/<int:c_id>")
 @login_required
 def table_get_custom_enum(c_id):
     ret = list()
-    cc = (calibre_db.session.query(db.Custom_Columns)
-              .filter(db.Custom_Columns.id == c_id)
-              .filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).one_or_none())
+    cc = (calibre_db.session.query(db.CustomColumns)
+          .filter(db.CustomColumns.id == c_id)
+          .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).one_or_none())
     ret.append({'value': "", 'text': ""})
     for idx, en in enumerate(cc.get_display_dict()['enum_values']):
         ret.append({'value': en, 'text': en})
     return json.dumps(ret)
 
 
-@editbook.route("/ajax/editbooks/<param>", methods=['POST'])
+@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'])
+    sort_param = ""
     # ret = ""
     try:
         if param == 'series_index':
@@ -1172,7 +1190,7 @@ def edit_list_book(param):
         elif param == 'publishers':
             edit_book_publisher(vals['value'], book)
             ret = Response(json.dumps({'success': True,
-                                        'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
+                                       'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
                            mimetype='application/json')
         elif param == 'languages':
             invalid = list()
@@ -1186,13 +1204,13 @@ def edit_list_book(param):
                 for lang in book.languages:
                     lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
                 ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
-                                mimetype='application/json')
+                               mimetype='application/json')
         elif param == 'author_sort':
             book.author_sort = vals['value']
             ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
                            mimetype='application/json')
         elif param == 'title':
-            sort = book.sort
+            sort_param = book.sort
             handle_title_on_edit(book, vals.get('value', ""))
             helper.update_dir_structure(book.id, config.config_calibre_dir)
             ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
@@ -1208,12 +1226,13 @@ def edit_list_book(param):
         elif param == 'authors':
             input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
             helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
-            ret = Response(json.dumps({'success': True,
-                                       'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
-                           mimetype='application/json')
+            ret = Response(json.dumps({
+                'success': True,
+                'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
+                mimetype='application/json')
         elif param == 'is_archived':
             is_archived = change_archived_books(book.id, vals['value'] == "True",
-                                                message="Book {} archivebit set to: {}".format(book.id, vals['value']))
+                                                message="Book {} archive bit set to: {}".format(book.id, vals['value']))
             if is_archived:
                 kobo_sync_status.remove_synced_book(book.id)
             return ""
@@ -1238,7 +1257,7 @@ def edit_list_book(param):
         calibre_db.session.commit()
         # revert change for sort if automatic fields link is deactivated
         if param == 'title' and vals.get('checkT') == "false":
-            book.sort = sort
+            book.sort = sort_param
             calibre_db.session.commit()
     except (OperationalError, IntegrityError) as e:
         calibre_db.session.rollback()
@@ -1249,7 +1268,7 @@ def edit_list_book(param):
     return ret
 
 
-@editbook.route("/ajax/sort_value/<field>/<int:bookid>")
+@EditBook.route("/ajax/sort_value/<field>/<int:bookid>")
 @login_required
 def get_sorted_entry(field, bookid):
     if field in ['title', 'authors', 'sort', 'author_sort']:
@@ -1266,7 +1285,7 @@ def get_sorted_entry(field, bookid):
     return ""
 
 
-@editbook.route("/ajax/simulatemerge", methods=['POST'])
+@EditBook.route("/ajax/simulatemerge", methods=['POST'])
 @login_required
 @edit_required
 def simulate_merge_list_book():
@@ -1282,7 +1301,7 @@ def simulate_merge_list_book():
     return ""
 
 
-@editbook.route("/ajax/mergebooks", methods=['POST'])
+@EditBook.route("/ajax/mergebooks", methods=['POST'])
 @login_required
 @edit_required
 def merge_list_book():
@@ -1295,8 +1314,9 @@ def merge_list_book():
         if to_book:
             for file in to_book.data:
                 to_file.append(file.format)
-            to_name = helper.get_valid_filename(to_book.title, chars=96) + ' - ' + \
-                      helper.get_valid_filename(to_book.authors[0].name, chars=96)
+            to_name = helper.get_valid_filename(to_book.title,
+                                                chars=96) + ' - ' + helper.get_valid_filename(to_book.authors[0].name,
+                                                                                              chars=96)
             for book_id in vals:
                 from_book = calibre_db.get_book(book_id)
                 if from_book:
@@ -1314,19 +1334,20 @@ def merge_list_book():
                                                         element.format,
                                                         element.uncompressed_size,
                                                         to_name))
-                    delete_book_from_table(from_book.id,"", True)
+                    delete_book_from_table(from_book.id, "", True)
                     return json.dumps({'success': True})
     return ""
 
 
-@editbook.route("/ajax/xchange", methods=['POST'])
+@EditBook.route("/ajax/xchange", methods=['POST'])
 @login_required
 @edit_required
 def table_xchange_author_title():
     vals = request.get_json().get('xchange')
+    edited_books_id = False
     if vals:
         for val in vals:
-            modif_date = False
+            modify_date = False
             book = calibre_db.get_book(val)
             authors = book.title
             book.authors = calibre_db.order_authors([book])
@@ -1338,15 +1359,15 @@ def table_xchange_author_title():
             input_authors, authorchange, renamed = handle_author_on_edit(book, authors)
             if authorchange or title_change:
                 edited_books_id = book.id
-                modif_date = True
+                modify_date = True
 
             if config.config_use_google_drive:
                 gdriveutils.updateGdriveCalibreFromLocal()
 
             if edited_books_id:
                 helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                           renamed_author=renamed)
-            if modif_date:
+                                            renamed_author=renamed)
+            if modify_date:
                 book.last_modified = datetime.utcnow()
             try:
                 calibre_db.session.commit()
diff --git a/cps/epub.py b/cps/epub.py
index 563590e82..80c12c356 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -53,11 +53,11 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     txt = epub_zip.read('META-INF/container.xml')
     tree = etree.fromstring(txt)
-    cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
-    cf = epub_zip.read(cfname)
+    cf_name = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
+    cf = epub_zip.read(cf_name)
     tree = etree.fromstring(cf)
 
-    coverpath = os.path.dirname(cfname)
+    cover_path = os.path.dirname(cf_name)
 
     p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0]
 
@@ -90,7 +90,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     epub_metadata = parse_epub_series(ns, tree, epub_metadata)
 
-    cover_file = parse_epub_cover(ns, tree, epub_zip, coverpath, tmp_file_path)
+    cover_file = parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path)
 
     if not epub_metadata['title']:
         title = original_file_name
@@ -114,9 +114,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
     cover_section = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
     cover_file = None
-    if len(cover_section) > 0:
-        cover_file = _extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
-    else:
+    # if len(cover_section) > 0:
+    for cs in cover_section:
+        cover_file = _extract_cover(epub_zip, cs, cover_path, tmp_file_path)
+        if cover_file:
+            break
+    if not cover_file:
         meta_cover = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='cover']/@content", namespaces=ns)
         if len(meta_cover) > 0:
             cover_section = tree.xpath(
@@ -143,8 +146,7 @@ def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
                     cover_file = _extract_cover(epub_zip, filename, "", tmp_file_path)
             else:
                 cover_file = _extract_cover(epub_zip, cs, cover_path, tmp_file_path)
-            if cover_file:
-                break
+            if cover_file: break
     return cover_file
 
 
diff --git a/cps/helper.py b/cps/helper.py
index 74a8dbbba..3b0c2a04c 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -23,11 +23,10 @@ import mimetypes
 import re
 import shutil
 import socket
-import unicodedata
 from datetime import datetime, timedelta
 from tempfile import gettempdir
-from urllib.parse import urlparse
 import requests
+import unidecode
 
 from babel.dates import format_datetime
 from babel.units import format_unit
@@ -41,15 +40,19 @@ from werkzeug.security import generate_password_hash
 from markupsafe import escape
 from urllib.parse import quote
 
+
 try:
-    import unidecode
-    use_unidecode = True
+    import advocate
+    from advocate.exceptions import UnacceptableAddressException
+    use_advocate = True
 except ImportError:
-    use_unidecode = False
+    use_advocate = False
+    advocate = requests
+    UnacceptableAddressException = MissingSchema = BaseException
 
 from . import calibre_db, cli
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub, kobo_sync_status
+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
@@ -143,7 +146,7 @@ def check_send_to_kindle_with_converter(formats):
                             'text': _('Convert %(orig)s to %(format)s and send to Kindle',
                                       orig='Epub',
                                       format='Mobi')})
-    if 'AZW3' in formats and not 'MOBI' in formats:
+    if 'AZW3' in formats and 'MOBI' not in formats:
         bookformats.append({'format': 'Mobi',
                             'convert': 2,
                             'text': _('Convert %(orig)s to %(format)s and send to Kindle',
@@ -185,11 +188,11 @@ def check_send_to_kindle(entry):
 # Check if a reader is existing for any of the book formats, if not, return empty list, otherwise return
 # list with supported formats
 def check_read_formats(entry):
-    EXTENSIONS_READER = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU'}
+    extensions_reader = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU'}
     bookformats = list()
     if len(entry.data):
         for ele in iter(entry.data):
-            if ele.format.upper() in EXTENSIONS_READER:
+            if ele.format.upper() in extensions_reader:
                 bookformats.append(ele.format.lower())
     return bookformats
 
@@ -213,10 +216,10 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
         if entry.format.upper() == book_format.upper():
             converted_file_name = entry.name + '.' + book_format.lower()
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(book.title))
-            EmailText = _(u"%(book)s send to Kindle", book=link)
+            email_text = _(u"%(book)s send to Kindle", book=link)
             WorkerThread.add(user_id, TaskEmail(_(u"Send to Kindle"), book.path, converted_file_name,
                              config.get_mail_settings(), kindle_mail,
-                             EmailText, _(u'This e-mail has been sent via Calibre-Web.')))
+                             email_text, _(u'This e-mail has been sent via Calibre-Web.')))
             return
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
@@ -229,15 +232,8 @@ def get_valid_filename(value, replace_whitespace=True, chars=128):
     if value[-1:] == u'.':
         value = value[:-1]+u'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
-    if use_unidecode:
-        if config.config_unicode_filename:
-            value = (unidecode.unidecode(value))
-    else:
-        value = value.replace(u'§', u'SS')
-        value = value.replace(u'ß', u'ss')
-        value = unicodedata.normalize('NFKD', value)
-        re_slugify = re.compile(r'[\W\s-]', re.UNICODE)
-        value = re_slugify.sub('', value)
+    if config.config_unicode_filename:
+        value = (unidecode.unidecode(value))
     if replace_whitespace:
         #  *+:\"/<>? are replaced by _
         value = re.sub(r'[*+:\\\"/<>?]+', u'_', value, flags=re.U)
@@ -266,6 +262,7 @@ def split_authors(values):
 
 
 def get_sorted_author(value):
+    value2 = None
     try:
         if ',' not in value:
             regexes = [r"^(JR|SR)\.?$", r"^I{1,3}\.?$", r"^IV\.?$"]
@@ -290,6 +287,7 @@ def get_sorted_author(value):
             value2 = value
     return value2
 
+
 def edit_book_read_status(book_id, read_status=None):
     if not config.config_read_column:
         book = ub.session.query(ub.ReadBook).filter(and_(ub.ReadBook.user_id == int(current_user.id),
@@ -303,9 +301,9 @@ def edit_book_read_status(book_id, read_status=None):
             else:
                 book.read_status = ub.ReadBook.STATUS_FINISHED if read_status else ub.ReadBook.STATUS_UNREAD
         else:
-            readBook = ub.ReadBook(user_id=current_user.id, book_id = book_id)
-            readBook.read_status = ub.ReadBook.STATUS_FINISHED
-            book = readBook
+            read_book = ub.ReadBook(user_id=current_user.id, book_id=book_id)
+            read_book.read_status = ub.ReadBook.STATUS_FINISHED
+            book = read_book
         if not book.kobo_reading_state:
             kobo_reading_state = ub.KoboReadingState(user_id=current_user.id, book_id=book_id)
             kobo_reading_state.current_bookmark = ub.KoboBookmark()
@@ -332,12 +330,13 @@ def edit_book_read_status(book_id, read_status=None):
         except (KeyError, AttributeError):
             log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
             return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column)
-        except (OperationalError, InvalidRequestError) as e:
+        except (OperationalError, InvalidRequestError) as ex:
             calibre_db.session.rollback()
-            log.error(u"Read status could not set: {}".format(e))
-            return _("Read status could not set: {}".format(e.orig))
+            log.error(u"Read status could not set: {}".format(ex))
+            return _("Read status could not set: {}".format(ex.orig))
     return ""
 
+
 # Deletes a book fro the local filestorage, returns True if deleting is successfull, otherwise false
 def delete_book_file(book, calibrepath, book_format=None):
     # check that path is 2 elements deep, check that target path has no subfolders
@@ -361,15 +360,15 @@ def delete_book_file(book, calibrepath, book_format=None):
                                            id=book.id,
                                            path=book.path)
                     shutil.rmtree(path)
-                except (IOError, OSError) as e:
-                    log.error("Deleting book %s failed: %s", book.id, e)
-                    return False, _("Deleting book %(id)s failed: %(message)s", id=book.id, message=e)
+                except (IOError, OSError) as ex:
+                    log.error("Deleting book %s failed: %s", book.id, ex)
+                    return False, _("Deleting book %(id)s failed: %(message)s", id=book.id, message=ex)
                 authorpath = os.path.join(calibrepath, os.path.split(book.path)[0])
                 if not os.listdir(authorpath):
                     try:
                         shutil.rmtree(authorpath)
-                    except (IOError, OSError) as e:
-                        log.error("Deleting authorpath for book %s failed: %s", book.id, e)
+                    except (IOError, OSError) as ex:
+                        log.error("Deleting authorpath for book %s failed: %s", book.id, ex)
                 return True, None
 
     log.error("Deleting book %s from database only, book path in database not valid: %s",
@@ -395,21 +394,21 @@ def clean_author_database(renamed_author, calibre_path="", local_book=None, gdri
                 all_titledir = book.path.split('/')[1]
                 all_new_path = os.path.join(calibre_path, all_new_authordir, all_titledir)
                 all_new_name = get_valid_filename(book.title, chars=42) + ' - ' \
-                               + get_valid_filename(new_author.name, chars=42)
+                    + get_valid_filename(new_author.name, chars=42)
                 # change location in database to new author/title path
                 book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
                 for file_format in book.data:
                     if not gdrive:
                         shutil.move(os.path.normcase(os.path.join(all_new_path,
                                                                   file_format.name + '.' + file_format.format.lower())),
-                            os.path.normcase(os.path.join(all_new_path,
-                                                          all_new_name + '.' + file_format.format.lower())))
+                                    os.path.normcase(os.path.join(all_new_path,
+                                                                  all_new_name + '.' + file_format.format.lower())))
                     else:
-                        gFile = gd.getFileFromEbooksFolder(all_new_path,
-                                                           file_format.name + '.' + file_format.format.lower())
-                        if gFile:
-                            gd.moveGdriveFileRemote(gFile, all_new_name + u'.' + file_format.format.lower())
-                            gd.updateDatabaseOnEdit(gFile['id'], all_new_name + u'.' + file_format.format.lower())
+                        g_file = gd.getFileFromEbooksFolder(all_new_path,
+                                                            file_format.name + '.' + file_format.format.lower())
+                        if g_file:
+                            gd.moveGdriveFileRemote(g_file, all_new_name + u'.' + file_format.format.lower())
+                            gd.updateDatabaseOnEdit(g_file['id'], all_new_name + u'.' + file_format.format.lower())
                         else:
                             log.error("File {} not found on gdrive"
                                       .format(all_new_path, file_format.name + '.' + file_format.format.lower()))
@@ -426,16 +425,16 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
             old_author_dir = get_valid_filename(r, chars=96)
             new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
             if gdrive:
-                gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
-                if gFile:
-                    gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
+                g_file = gd.getFileFromEbooksFolder(None, old_author_dir)
+                if g_file:
+                    gd.moveGdriveFolderRemote(g_file, new_author_rename_dir)
             else:
                 if os.path.isdir(os.path.join(calibre_path, old_author_dir)):
                     try:
                         old_author_path = os.path.join(calibre_path, old_author_dir)
                         new_author_path = os.path.join(calibre_path, new_author_rename_dir)
                         shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
-                    except (OSError) as ex:
+                    except OSError as ex:
                         log.error("Rename author from: %s to %s: %s", old_author_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",
@@ -444,6 +443,7 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
         new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
     return new_authordir
 
+
 # Moves files in file storage during author/title rename, or from temp dir to file storage
 def update_dir_structure_file(book_id, calibre_path, first_author, original_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
@@ -483,11 +483,9 @@ def update_dir_structure_file(book_id, calibre_path, first_author, original_file
 
 
 def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_dir, original_filepath, filename_ext):
-    error = False
     book = calibre_db.get_book(book_id)
     file_name = get_valid_filename(title, chars=42) + ' - ' + \
-                get_valid_filename(first_author, chars=42) + \
-                filename_ext
+        get_valid_filename(first_author, chars=42) + filename_ext
     rename_all_authors(first_author, renamed_author, gdrive=True)
     gdrive_path = os.path.join(get_valid_filename(first_author, chars=96),
                                title_dir + " (" + str(book_id) + ")")
@@ -505,20 +503,20 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     new_titledir = get_valid_filename(book.title, chars=96) + u" (" + str(book_id) + u")"
 
     if titledir != new_titledir:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
-        if gFile:
-            gd.moveGdriveFileRemote(gFile, new_titledir)
+        g_file = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
+        if g_file:
+            gd.moveGdriveFileRemote(g_file, new_titledir)
             book.path = book.path.split('/')[0] + u'/' + new_titledir
-            gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
+            gd.updateDatabaseOnEdit(g_file['id'], book.path)     # only child folder affected
         else:
             return _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
 
     if authordir != new_authordir and authordir not in renamed_author:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
-        if gFile:
-            gd.moveGdriveFolderRemote(gFile, new_authordir)
+        g_file = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
+        if g_file:
+            gd.moveGdriveFolderRemote(g_file, new_authordir)
             book.path = new_authordir + u'/' + book.path.split('/')[1]
-            gd.updateDatabaseOnEdit(gFile['id'], book.path)
+            gd.updateDatabaseOnEdit(g_file['id'], book.path)
         else:
             return _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
 
@@ -542,15 +540,15 @@ def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, d
                 # 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)
+            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.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
         # change location in database to new author/title path
-        localbook.path = os.path.join(new_authordir, new_titledir).replace('\\','/')
+        localbook.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
     except OSError as ex:
         log.error("Rename title from: %s to %s: %s", path, new_path, ex)
         log.debug(ex, exc_info=True)
@@ -587,12 +585,12 @@ def delete_book_gdrive(book, book_format):
         for entry in book.data:
             if entry.format.upper() == book_format:
                 name = entry.name + '.' + book_format
-        gFile = gd.getFileFromEbooksFolder(book.path, name)
+        g_file = gd.getFileFromEbooksFolder(book.path, name)
     else:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), book.path.split('/')[1])
-    if gFile:
-        gd.deleteDatabaseEntry(gFile['id'])
-        gFile.Trash()
+        g_file = gd.getFileFromEbooksFolder(os.path.dirname(book.path), book.path.split('/')[1])
+    if g_file:
+        gd.deleteDatabaseEntry(g_file['id'])
+        g_file.Trash()
     else:
         error = _(u'Book path %(path)s not found on Google Drive', path=book.path)  # file not found
 
@@ -624,12 +622,13 @@ def generate_random_password():
 
 def uniq(inpt):
     output = []
-    inpt = [ " ".join(inp.split()) for inp in inpt]
+    inpt = [" ".join(inp.split()) for inp in inpt]
     for x in inpt:
         if x not in output:
             output.append(x)
     return output
 
+
 def check_email(email):
     email = valid_email(email)
     if ub.session.query(ub.User).filter(func.lower(ub.User.email) == email.lower()).first():
@@ -642,7 +641,7 @@ def check_username(username):
     username = username.strip()
     if ub.session.query(ub.User).filter(func.lower(ub.User.name) == username.lower()).scalar():
         log.error(u"This username is already taken")
-        raise Exception (_(u"This username is already taken"))
+        raise Exception(_(u"This username is already taken"))
     return username
 
 
@@ -728,13 +727,13 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
-        if not cli.allow_localhost:
-            # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
-            ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
-            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1" or ip == "0.0.0.0" or ip == "::":
-                log.error("Localhost was accessed for cover upload")
-                return False, _("You are not allowed to access localhost for cover uploads")
-        img = requests.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
+        if cli.allow_localhost:
+            img = requests.get(url, timeout=(10, 200), allow_redirects=False)  # ToDo: Error Handling
+        elif use_advocate:
+            img = advocate.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
+        else:
+            log.error("python modul advocate is not installed but is needed")
+            return False, _("Python modul 'advocate' is not installed but is needed for cover downloads")
         img.raise_for_status()
         return save_cover(img, book_path)
     except (socket.gaierror,
@@ -746,6 +745,9 @@ def save_cover_from_url(url, book_path):
     except MissingDelegateError as ex:
         log.info(u'File Format Error %s', ex)
         return False, _("Cover Format Error")
+    except UnacceptableAddressException:
+        log.error("Localhost was accessed for cover upload")
+        return False, _("You are not allowed to access localhost for cover uploads")
 
 
 def save_cover_from_filestorage(filepath, saved_filename, img):
@@ -808,7 +810,7 @@ def save_cover(img, book_path):
             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').replace("\\","/"),
+            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
@@ -820,9 +822,9 @@ def save_cover(img, book_path):
 
 def do_download_file(book, book_format, client, data, headers):
     if config.config_use_google_drive:
-        #startTime = time.time()
+        # startTime = time.time()
         df = gd.getFileFromEbooksFolder(book.path, data.name + "." + book_format)
-        #log.debug('%s', time.time() - startTime)
+        # log.debug('%s', time.time() - startTime)
         if df:
             return gd.do_gdrive_download(df, headers)
         else:
@@ -846,16 +848,16 @@ def do_download_file(book, book_format, client, data, headers):
 ##################################
 
 
-def check_unrar(unrarLocation):
-    if not unrarLocation:
+def check_unrar(unrar_location):
+    if not unrar_location:
         return
 
-    if not os.path.exists(unrarLocation):
+    if not os.path.exists(unrar_location):
         return _('Unrar binary file not found')
 
     try:
-        unrarLocation = [unrarLocation]
-        value = process_wait(unrarLocation, pattern='UNRAR (.*) freeware')
+        unrar_location = [unrar_location]
+        value = process_wait(unrar_location, pattern='UNRAR (.*) freeware')
         if value:
             version = value.group(1)
             log.debug("unrar version %s", version)
@@ -882,19 +884,19 @@ def json_serial(obj):
 
 # helper function for displaying the runtime of tasks
 def format_runtime(runtime):
-    retVal = ""
+    ret_val = ""
     if runtime.days:
-        retVal = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
+        ret_val = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
     mins, seconds = divmod(runtime.seconds, 60)
     hours, minutes = divmod(mins, 60)
     # ToDo: locale.number_symbols._data['timeSeparator'] -> localize time separator ?
     if hours:
-        retVal += '{:d}:{:02d}:{:02d}s'.format(hours, minutes, seconds)
+        ret_val += '{:d}:{:02d}:{:02d}s'.format(hours, minutes, seconds)
     elif minutes:
-        retVal += '{:2d}:{:02d}s'.format(minutes, seconds)
+        ret_val += '{:2d}:{:02d}s'.format(minutes, seconds)
     else:
-        retVal += '{:2d}s'.format(seconds)
-    return retVal
+        ret_val += '{:2d}s'.format(seconds)
+    return ret_val
 
 
 # helper function to apply localize status information in tasklist entries
@@ -951,8 +953,8 @@ def check_valid_domain(domain_text):
 
 
 def get_cc_columns(filter_config_custom_read=False):
-    tmpcc = calibre_db.session.query(db.Custom_Columns)\
-        .filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    tmpcc = calibre_db.session.query(db.CustomColumns)\
+        .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
     cc = []
     r = None
     if config.config_columns_to_ignore:
@@ -971,6 +973,7 @@ def get_cc_columns(filter_config_custom_read=False):
 def get_download_link(book_id, book_format, client):
     book_format = book_format.split(".")[0]
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
+    data1= ""
     if book:
         data1 = calibre_db.get_book_format(book.id, book_format.upper())
     else:
diff --git a/cps/opds.py b/cps/opds.py
index 1f9b9db4b..c0637c6ba 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -28,7 +28,6 @@ from flask import Blueprint, request, render_template, Response, g, make_respons
 from flask_login import current_user
 from sqlalchemy.sql.expression import func, text, or_, and_, true
 from werkzeug.security import check_password_hash
-from tornado.httputil import HTTPServerRequest
 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
@@ -99,26 +98,7 @@ def feed_normal_search():
 @opds.route("/opds/books")
 @requires_basic_auth_if_no_ano
 def feed_booksindex():
-    shift = 0
-    off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(db.Books.sort, 1, 1)).label('id'))\
-        .filter(calibre_db.common_filters()).group_by(func.upper(func.substr(db.Books.sort, 1, 1))).all()
-
-    elements = []
-    if off == 0:
-        elements.append({'id': "00", 'name':_("All")})
-        shift = 1
-    for entry in entries[
-                 off + shift - 1:
-                 int(off + int(config.config_books_per_page) - shift)]:
-        elements.append({'id': entry.id, 'name': entry.id})
-
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(entries) + 1)
-    return render_xml_template('feed.xml',
-                               letterelements=elements,
-                               folder='opds.feed_letter_books',
-                               pagination=pagination)
+    return render_element_index(db.Books.sort, None, 'opds.feed_letter_books')
 
 
 @opds.route("/opds/books/letter/<book_id>")
@@ -171,43 +151,23 @@ def feed_hot():
     hot_books = all_books.offset(off).limit(config.config_books_per_page)
     entries = list()
     for book in hot_books:
-        downloadBook = calibre_db.get_book(book.Downloads.book_id)
-        if downloadBook:
+        download_book = calibre_db.get_book(book.Downloads.book_id)
+        if download_book:
             entries.append(
                 calibre_db.get_filtered_book(book.Downloads.book_id)
             )
         else:
             ub.delete_download(book.Downloads.book_id)
-    numBooks = entries.__len__()
+    num_books = entries.__len__()
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1),
-                            config.config_books_per_page, numBooks)
+                            config.config_books_per_page, num_books)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
 @opds.route("/opds/author")
 @requires_basic_auth_if_no_ano
 def feed_authorindex():
-    shift = 0
-    off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(db.Authors.sort, 1, 1)).label('id'))\
-        .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()
-
-    elements = []
-    if off == 0:
-        elements.append({'id': "00", 'name':_("All")})
-        shift = 1
-    for entry in entries[
-                 off + shift - 1:
-                 int(off + int(config.config_books_per_page) - shift)]:
-        elements.append({'id': entry.id, 'name': entry.id})
-
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(entries) + 1)
-    return render_xml_template('feed.xml',
-                               letterelements=elements,
-                               folder='opds.feed_letter_author',
-                               pagination=pagination)
+    return render_element_index(db.Authors.sort, db.books_authors_link, 'opds.feed_letter_author')
 
 
 @opds.route("/opds/author/letter/<book_id>")
@@ -228,12 +188,7 @@ def feed_letter_author(book_id):
 @opds.route("/opds/author/<int:book_id>")
 @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), 0,
-                                                        db.Books,
-                                                        db.Books.authors.any(db.Authors.id == book_id),
-                                                        [db.Books.timestamp.desc()])
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    return render_xml_dataset(db.Authors, book_id)
 
 
 @opds.route("/opds/publisher")
@@ -254,37 +209,14 @@ def feed_publisherindex():
 @opds.route("/opds/publisher/<int:book_id>")
 @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), 0,
-                                                        db.Books,
-                                                        db.Books.publishers.any(db.Publishers.id == book_id),
-                                                        [db.Books.timestamp.desc()])
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    return render_xml_dataset(db.Publishers, book_id)
 
 
 @opds.route("/opds/category")
 @requires_basic_auth_if_no_ano
 def feed_categoryindex():
-    shift = 0
-    off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(db.Tags.name, 1, 1)).label('id'))\
-        .join(db.books_tags_link).join(db.Books).filter(calibre_db.common_filters())\
-        .group_by(func.upper(func.substr(db.Tags.name, 1, 1))).all()
-    elements = []
-    if off == 0:
-        elements.append({'id': "00", 'name':_("All")})
-        shift = 1
-    for entry in entries[
-                 off + shift - 1:
-                 int(off + int(config.config_books_per_page) - shift)]:
-        elements.append({'id': entry.id, 'name': entry.id})
+    return render_element_index(db.Tags.name, db.books_tags_link, 'opds.feed_letter_category')
 
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(entries) + 1)
-    return render_xml_template('feed.xml',
-                               letterelements=elements,
-                               folder='opds.feed_letter_category',
-                               pagination=pagination)
 
 @opds.route("/opds/category/letter/<book_id>")
 @requires_basic_auth_if_no_ano
@@ -306,36 +238,14 @@ def feed_letter_category(book_id):
 @opds.route("/opds/category/<int:book_id>")
 @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), 0,
-                                                        db.Books,
-                                                        db.Books.tags.any(db.Tags.id == book_id),
-                                                        [db.Books.timestamp.desc()])
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    return render_xml_dataset(db.Tags, book_id)
 
 
 @opds.route("/opds/series")
 @requires_basic_auth_if_no_ano
 def feed_seriesindex():
-    shift = 0
-    off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(db.Series.sort, 1, 1)).label('id'))\
-        .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()
-    elements = []
-    if off == 0:
-        elements.append({'id': "00", 'name':_("All")})
-        shift = 1
-    for entry in entries[
-                 off + shift - 1:
-                 int(off + int(config.config_books_per_page) - shift)]:
-        elements.append({'id': entry.id, 'name': entry.id})
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(entries) + 1)
-    return render_xml_template('feed.xml',
-                               letterelements=elements,
-                               folder='opds.feed_letter_series',
-                               pagination=pagination)
+    return render_element_index(db.Series.sort, db.books_series_link, 'opds.feed_letter_series')
+
 
 @opds.route("/opds/series/letter/<book_id>")
 @requires_basic_auth_if_no_ano
@@ -370,7 +280,7 @@ def feed_series(book_id):
 def feed_ratingindex():
     off = request.args.get("offset") or 0
     entries = calibre_db.session.query(db.Ratings, func.count('books_ratings_link.book').label('count'),
-                               (db.Ratings.rating / 2).label('name')) \
+                                       (db.Ratings.rating / 2).label('name')) \
         .join(db.books_ratings_link)\
         .join(db.Books)\
         .filter(calibre_db.common_filters()) \
@@ -388,12 +298,7 @@ def feed_ratingindex():
 @opds.route("/opds/ratings/<book_id>")
 @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), 0,
-                                                        db.Books,
-                                                        db.Books.ratings.any(db.Ratings.id == book_id),
-                                                        [db.Books.timestamp.desc()])
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    return render_xml_dataset(db.Tags, book_id)
 
 
 @opds.route("/opds/formats")
@@ -491,7 +396,7 @@ def feed_shelf(book_id):
 @requires_basic_auth_if_no_ano
 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
+    # workaround, loading the user from the request and checking its 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():
@@ -517,48 +422,6 @@ def get_metadata_calibre_companion(uuid, library):
         return ""
 
 
-def feed_search(term):
-    if term:
-        entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column)
-        entries_count = len(entries) if len(entries) > 0 else 1
-        pagination = Pagination(1, entries_count, entries_count)
-        items = [entry[0] for entry in entries]
-        return render_xml_template('feed.xml', searchterm=term, entries=items, pagination=pagination)
-    else:
-        return render_xml_template('feed.xml', searchterm="")
-
-
-def check_auth(username, password):
-    try:
-        username = username.encode('windows-1252')
-    except UnicodeEncodeError:
-        username = username.encode('utf-8')
-    user = ub.session.query(ub.User).filter(func.lower(ub.User.name) ==
-                                            username.decode('utf-8').lower()).first()
-    if bool(user and check_password_hash(str(user.password), password)):
-        return True
-    else:
-        ip_Address = request.headers.get('X-Forwarded-For', request.remote_addr)
-        log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ip_Address)
-        return False
-
-
-def authenticate():
-    return Response(
-        'Could not verify your access level for that URL.\n'
-        'You have to login with proper credentials', 401,
-        {'WWW-Authenticate': 'Basic realm="Login Required"'})
-
-
-def render_xml_template(*args, **kwargs):
-    # ToDo: return time in current timezone similar to %z
-    currtime = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S+00:00")
-    xml = render_template(current_time=currtime, instance=config.config_calibre_web_title, *args, **kwargs)
-    response = make_response(xml)
-    response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
-    return response
-
-
 @opds.route("/opds/thumb_240_240/<book_id>")
 @opds.route("/opds/cover_240_240/<book_id>")
 @opds.route("/opds/cover_90_90/<book_id>")
@@ -582,3 +445,77 @@ def feed_unread_books():
     off = request.args.get("offset") or 0
     result, pagination = render_read_books(int(off) / (int(config.config_books_per_page)) + 1, False, True)
     return render_xml_template('feed.xml', entries=result, pagination=pagination)
+
+
+def feed_search(term):
+    if term:
+        entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column)
+        entries_count = len(entries) if len(entries) > 0 else 1
+        pagination = Pagination(1, entries_count, entries_count)
+        items = [entry[0] for entry in entries]
+        return render_xml_template('feed.xml', searchterm=term, entries=items, pagination=pagination)
+    else:
+        return render_xml_template('feed.xml', searchterm="")
+
+
+def check_auth(username, password):
+    try:
+        username = username.encode('windows-1252')
+    except UnicodeEncodeError:
+        username = username.encode('utf-8')
+    user = ub.session.query(ub.User).filter(func.lower(ub.User.name) ==
+                                            username.decode('utf-8').lower()).first()
+    if bool(user and check_password_hash(str(user.password), password)):
+        return True
+    else:
+        ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
+        log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ip_address)
+        return False
+
+
+def authenticate():
+    return Response(
+        'Could not verify your access level for that URL.\n'
+        'You have to login with proper credentials', 401,
+        {'WWW-Authenticate': 'Basic realm="Login Required"'})
+
+
+def render_xml_template(*args, **kwargs):
+    # ToDo: return time in current timezone similar to %z
+    currtime = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S+00:00")
+    xml = render_template(current_time=currtime, instance=config.config_calibre_web_title, *args, **kwargs)
+    response = make_response(xml)
+    response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
+    return response
+
+
+def render_xml_dataset(data_table, book_id):
+    off = request.args.get("offset") or 0
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
+                                                        db.Books,
+                                                        data_table.any(data_table.id == book_id),
+                                                        [db.Books.timestamp.desc()])
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+
+
+def render_element_index(database_column, linked_table, folder):
+    shift = 0
+    off = int(request.args.get("offset") or 0)
+    entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'))
+    if linked_table:
+        entries = entries.join(linked_table).join(db.Books)
+    entries = entries.filter(calibre_db.common_filters()).group_by(func.upper(func.substr(database_column, 1, 1))).all()
+    elements = []
+    if off == 0:
+        elements.append({'id': "00", 'name': _("All")})
+        shift = 1
+    for entry in entries[
+                 off + shift - 1:
+                 int(off + int(config.config_books_per_page) - shift)]:
+        elements.append({'id': entry.id, 'name': entry.id})
+    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
+                            len(entries) + 1)
+    return render_xml_template('feed.xml',
+                               letterelements=elements,
+                               folder=folder,
+                               pagination=pagination)
diff --git a/cps/pagination.py b/cps/pagination.py
index 7a9bfb702..bda9f4c8c 100644
--- a/cps/pagination.py
+++ b/cps/pagination.py
@@ -57,10 +57,10 @@ class Pagination(object):
     def has_next(self):
         return self.page < self.pages
 
-    # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shwn
-    # left_edge: first left_edges count of all pages are shown as number                                    -> 1,2 shwn
-    # left_current: left_current count below current page are shown as number, means if current page 5      -> 3,4 shwn
-    # left_current: right_current count above current page are shown as number, means if current page 5     -> 6,7 shwn
+    # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shown
+    # left_edge: first left_edges count of all pages are shown as number                                    -> 1,2 shown
+    # left_current: left_current count below current page are shown as number, means if current page 5      -> 3,4 shown
+    # left_current: right_current count above current page are shown as number, means if current page 5     -> 6,7 shown
     def iter_pages(self, left_edge=2, left_current=2,
                    right_current=4, right_edge=2):
         last = 0
diff --git a/cps/remotelogin.py b/cps/remotelogin.py
index a9994f09e..ea613c29a 100644
--- a/cps/remotelogin.py
+++ b/cps/remotelogin.py
@@ -22,6 +22,7 @@
 
 import json
 from datetime import datetime
+from functools import wraps
 
 from flask import Blueprint, request, make_response, abort, url_for, flash, redirect
 from flask_login import login_required, current_user, login_user
@@ -31,10 +32,6 @@ 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()
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 57470858c..98866fd68 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -22,7 +22,7 @@
 
 {%  if source_formats|length > 0 and conversion_formats|length > 0 %}
   <div class="text-center more-stuff"><h4>{{_('Convert book format:')}}</h4>
-      <form class="padded-bottom" action="{{ url_for('editbook.convert_bookformat', book_id=book.id) }}" method="post" id="book_convert_frm">
+      <form class="padded-bottom" action="{{ url_for('edit-book.convert_bookformat', book_id=book.id) }}" method="post" id="book_convert_frm">
           <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
           <div class="form-group">
               <div class="text-left">
@@ -48,7 +48,7 @@
 {% endif %}
 
   </div>
-<form role="form" action="{{ url_for('editbook.edit_book', book_id=book.id) }}" method="post" enctype="multipart/form-data" id="book_edit_frm">
+<form role="form" action="{{ url_for('edit-book.edit_book', book_id=book.id) }}" method="post" enctype="multipart/form-data" id="book_edit_frm">
   <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
   <div class="col-sm-9 col-xs-12">
     <div class="form-group">
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index 4b379b370..9ba173bb9 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -6,7 +6,7 @@
     data-escape="true"
     {% if g.user.role_edit() %}
         data-editable-type="text"
-        data-editable-url="{{ url_for('editbook.edit_list_book', param=parameter)}}"
+        data-editable-url="{{ url_for('edit-book.edit_list_book', param=parameter)}}"
         data-editable-title="{{ edit_text }}"
         data-edit="true"
         {% if validate %}data-edit-validate="{{ _('This Field is Required') }}" {% endif %}
@@ -66,30 +66,30 @@
             {{ text_table_row('authors', _('Enter Authors'),_('Authors'), true, true) }}
             {{ text_table_row('tags', _('Enter Categories'),_('Categories'), false, true) }}
             {{ text_table_row('series', _('Enter Series'),_('Series'), false, true) }}
-            <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>
+            <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('edit-book.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, true) }}
             <!--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, true) }}
-            <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('editbook.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
+            <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
             {% if g.user.check_visibility(32768) %}
                 {{ book_checkbox_row('is_archived', _('Archiv Status'), false)}}
             {%  endif %}
             {{ book_checkbox_row('read_status', _('Read Status'), false)}}
             {% for c in cc %}
               {% if c.datatype == "int" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "rating" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-formatter="ratingFormatter" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.5" data-editable-step="1" data-editable-min="1" data-editable-max="5" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-formatter="ratingFormatter" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.5" data-editable-step="1" data-editable-min="1" data-editable-max="5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "float" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "enumeration" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="select" data-editable-source={{ url_for('editbook.table_get_custom_enum', c_id=c.id)  }} data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="select" data-editable-source={{ url_for('edit-book.table_get_custom_enum', c_id=c.id)  }} data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype in ["datetime"] %}
                   <!-- missing -->
               {% elif c.datatype == "text" %}
                  {{ text_table_row('custom_column_' + c.id|string, _('Enter ') + c.name, c.name, false, false) }}
               {% elif c.datatype == "comments" %}
-                  <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                  <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "bool" %}
                   {{ book_checkbox_row('custom_column_' + c.id|string, c.name, false)}}
               {% else %}
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index c2153db8b..38005cb9d 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -138,7 +138,7 @@
         <p>
         <span class="glyphicon glyphicon-link"></span>
         {% for identifier in entry.identifiers %}
-          <a href="{{identifier}}" target="_blank" class="btn btn-xs btn-success" role="button">{{identifier.formatType()}}</a>
+          <a href="{{identifier}}" target="_blank" class="btn btn-xs btn-success" role="button">{{identifier.format_type()}}</a>
         {%endfor%}
       </p>
       </div>
@@ -295,7 +295,7 @@
       {% 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-primary" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
+          <a href="{{ url_for('edit-book.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/layout.html b/cps/templates/layout.html
index ec69c91ba..0d0df7785 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -60,7 +60,7 @@
             {% if g.user.is_authenticated or g.allow_anonymous %}
               {% if g.user.role_upload() and g.allow_upload %}
                   <li>
-                    <form id="form-upload" class="navbar-form" action="{{ url_for('editbook.upload') }}" data-title="{{_('Uploading...')}}" data-footer="{{_('Close')}}" data-failed="{{_('Error')}}" data-message="{{_('Upload done, processing, please wait...')}}" method="post" enctype="multipart/form-data">
+                    <form id="form-upload" class="navbar-form" action="{{ url_for('edit-book.upload') }}" data-title="{{_('Uploading...')}}" data-footer="{{_('Close')}}" data-failed="{{_('Error')}}" data-message="{{_('Upload done, processing, please wait...')}}" method="post" enctype="multipart/form-data">
                       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
                       <div class="form-group">
                         <span class="btn btn-default btn-file">{{_('Upload')}}<input id="btn-upload" name="btn-upload"
diff --git a/cps/usermanagement.py b/cps/usermanagement.py
index 71da7701c..62fe6f77f 100644
--- a/cps/usermanagement.py
+++ b/cps/usermanagement.py
@@ -18,6 +18,7 @@
 
 import base64
 import binascii
+from functools import wraps
 
 from sqlalchemy.sql.expression import func
 from werkzeug.security import check_password_hash
@@ -25,10 +26,6 @@ from flask_login import login_required, login_user
 
 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)
diff --git a/cps/web.py b/cps/web.py
index 8c057b9d1..6f2f1af15 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -29,7 +29,7 @@ import copy
 from functools import wraps
 
 from babel.dates import format_date
-from babel import Locale as LC
+from babel import Locale
 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
@@ -60,7 +60,6 @@ from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
 from .kobo_sync_status import change_archived_books
 
-
 feature_support = {
     'ldap': bool(services.ldap),
     'goodreads': bool(services.goodreads_support),
@@ -69,10 +68,12 @@ 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
     oauth_check = {}
+    register_user_with_oauth = logout_oauth_user = get_oauth_status = None
 
 try:
     from natsort import natsorted as sort
@@ -82,8 +83,11 @@ except ImportError:
 
 @app.after_request
 def add_security_headers(resp):
-    resp.headers['Content-Security-Policy'] = "default-src 'self'" + ''.join([' '+host for host in config.config_trustedhosts.strip().split(',')]) + " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:"
-    if request.endpoint == "editbook.edit_book" or config.config_use_google_drive:
+    csp = "default-src 'self'"
+    csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
+    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:"
+    resp.headers['Content-Security-Policy'] = csp
+    if request.endpoint == "edit-book.edit_book" or config.config_use_google_drive:
         resp.headers['Content-Security-Policy'] += " *"
     elif request.endpoint == "web.read_book":
         resp.headers['Content-Security-Policy'] += " blob:;style-src-elem 'self' blob: 'unsafe-inline';"
@@ -93,6 +97,7 @@ def add_security_headers(resp):
     resp.headers['Strict-Transport-Security'] = 'max-age=31536000;'
     return resp
 
+
 web = Blueprint('web', __name__)
 log = logger.create()
 
@@ -119,6 +124,7 @@ def viewer_required(f):
 
     return inner
 
+
 # ################################### data provider functions #########################################################
 
 
@@ -140,11 +146,11 @@ def set_bookmark(book_id, book_format):
         ub.session_commit()
         return "", 204
 
-    lbookmark = ub.Bookmark(user_id=current_user.id,
-                            book_id=book_id,
-                            format=book_format,
-                            bookmark_key=bookmark_key)
-    ub.session.merge(lbookmark)
+    l_bookmark = ub.Bookmark(user_id=current_user.id,
+                             book_id=book_id,
+                             format=book_format,
+                             bookmark_key=bookmark_key)
+    ub.session.merge(l_bookmark)
     ub.session_commit("Bookmark for user {} in book {} created".format(current_user.id, book_id))
     return "", 201
 
@@ -162,7 +168,7 @@ def toggle_read(book_id):
 @web.route("/ajax/togglearchived/<int:book_id>", methods=['POST'])
 @login_required
 def toggle_archived(book_id):
-    is_archived = change_archived_books(book_id, message="Book {} archivebit toggled".format(book_id))
+    is_archived = change_archived_books(book_id, message="Book {} archive bit toggled".format(book_id))
     if is_archived:
         remove_synced_book(book_id)
     return ""
@@ -230,6 +236,7 @@ def get_comic_book(book_id, book_format, page):
         return "", 204
 '''
 
+
 # ################################### Typeahead ##################################################################
 
 
@@ -297,6 +304,12 @@ def get_matching_tags():
     return json_dumps
 
 
+def generate_char_list(data_colum, db_link):
+    return (calibre_db.session.query(func.upper(func.substr(data_colum, 1, 1)).label('char'))
+            .join(db_link).join(db.Books).filter(calibre_db.common_filters())
+            .group_by(func.upper(func.substr(data_colum, 1, 1))).all())
+
+
 def get_sort_function(sort_param, data):
     order = [db.Books.timestamp.desc()]
     if sort_param == 'stored':
@@ -373,7 +386,7 @@ def render_books_list(data, sort_param, book_id, page):
     else:
         website = data or "newest"
         entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order[0],
-        														False, 0,
+                                                                False, 0,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -407,12 +420,13 @@ def render_discover_books(page, book_id):
     else:
         abort(404)
 
+
 def render_hot_books(page, order):
     if current_user.check_visibility(constants.SIDEBAR_HOT):
         if order[1] not in ['hotasc', 'hotdesc']:
-        # Unary expression comparsion only working (for this expression) in sqlalchemy 1.4+
-        #if not (order[0][0].compare(func.count(ub.Downloads.book_id).desc()) or
-        #        order[0][0].compare(func.count(ub.Downloads.book_id).asc())):
+            # Unary expression comparsion only working (for this expression) in sqlalchemy 1.4+
+            # if not (order[0][0].compare(func.count(ub.Downloads.book_id).desc()) or
+            #        order[0][0].compare(func.count(ub.Downloads.book_id).asc())):
             order = [func.count(ub.Downloads.book_id).desc()], 'hotdesc'
         if current_user.show_detail_random():
             random = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \
@@ -420,19 +434,19 @@ def render_hot_books(page, order):
         else:
             random = false()
         off = int(int(config.config_books_per_page) * (page - 1))
-        all_books = ub.session.query(ub.Downloads, func.count(ub.Downloads.book_id))\
+        all_books = ub.session.query(ub.Downloads, func.count(ub.Downloads.book_id)) \
             .order_by(*order[0]).group_by(ub.Downloads.book_id)
         hot_books = all_books.offset(off).limit(config.config_books_per_page)
         entries = list()
         for book in hot_books:
-            downloadBook = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).filter(
+            download_book = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).filter(
                 db.Books.id == book.Downloads.book_id).first()
-            if downloadBook:
-                entries.append(downloadBook)
+            if download_book:
+                entries.append(download_book)
             else:
                 ub.delete_download(book.Downloads.book_id)
-        numBooks = entries.__len__()
-        pagination = Pagination(page, config.config_books_per_page, numBooks)
+        num_books = entries.__len__()
+        pagination = Pagination(page, config.config_books_per_page, num_books)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Hot Books (Most Downloaded)"), page="hot", order=order[1])
     else:
@@ -462,8 +476,8 @@ def render_downloaded_books(page, order, user_id):
                                                             db.Series,
                                                             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():
+            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)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
         return render_title_template('index.html',
@@ -471,7 +485,7 @@ def render_downloaded_books(page, order, user_id):
                                      entries=entries,
                                      pagination=pagination,
                                      id=user_id,
-                                     title=_(u"Downloaded books by %(user)s",user=user.name),
+                                     title=_(u"Downloaded books by %(user)s", user=user.name),
                                      page="download",
                                      order=order[1])
     else:
@@ -639,29 +653,27 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                         column=config.config_read_column),
                       category="error")
                 return redirect(url_for("web.index"))
-            return [] # ToDo: Handle error Case for opds
+            return []  # 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"
+            page_name = "read"
         else:
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
-            pagename = "unread"
+            page_name = "unread"
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=name, page=pagename, order=order[1])
+                                     title=name, page=page_name, order=order[1])
 
 
 def render_archived_books(page, sort_param):
     order = sort_param[0] 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_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)
@@ -674,40 +686,40 @@ def render_archived_books(page, sort_param):
                                                                                 False, 0)
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
-    pagename = "archived"
+    page_name = "archived"
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=name, page=pagename, order=sort_param[1])
+                                 title=name, page=page_name, order=sort_param[1])
 
 
 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)\
+    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'))\
+        .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)\
+    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)\
+        .group_by(text('books_series_link.series')) \
+        .order_by(db.Series.name) \
         .filter(calibre_db.common_filters()).all()
-    shelves = ub.session.query(ub.Shelf)\
-        .filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id)))\
+    shelves = ub.session.query(ub.Shelf) \
+        .filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id))) \
         .order_by(ub.Shelf.name).all()
-    extensions = calibre_db.session.query(db.Data)\
-        .join(db.Books)\
+    extensions = calibre_db.session.query(db.Data) \
+        .join(db.Books) \
         .filter(calibre_db.common_filters()) \
-        .group_by(db.Data.format)\
+        .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,shelves=shelves, title=_(u"Advanced Search"), cc=cc, page="advsearch")
+                                 series=series, shelves=shelves, title=_(u"Advanced Search"), cc=cc, page="advsearch")
 
 
 def render_search_results(term, offset=None, order=None, limit=None):
@@ -716,7 +728,6 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                                                       offset,
                                                                       order,
                                                                       limit,
-                                                                      False,
                                                                       config.config_read_column,
                                                                       *join)
     return render_title_template('search.html',
@@ -759,12 +770,13 @@ def books_table():
     return render_title_template('book_table.html', title=_(u"Books List"), cc=cc, page="book_table",
                                  visiblility=visibility)
 
+
 @web.route("/ajax/listbooks")
 @login_required
 def list_books():
     off = int(request.args.get("offset") or 0)
     limit = int(request.args.get("limit") or config.config_books_per_page)
-    search = request.args.get("search")
+    search_param = request.args.get("search")
     sort_param = request.args.get("sort", "id")
     order = request.args.get("order", "").lower()
     state = None
@@ -784,8 +796,8 @@ def list_books():
     elif sort_param == "authors":
         order = [db.Authors.name.asc(), db.Series.name, db.Books.series_index] if order == "asc" \
             else [db.Authors.name.desc(), db.Series.name.desc(), db.Books.series_index.desc()]
-        join = db.books_authors_link, db.Books.id == db.books_authors_link.c.book, db.Authors, \
-               db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
+        join = db.books_authors_link, db.Books.id == db.books_authors_link.c.book, db.Authors, db.books_series_link, \
+            db.Books.id == db.books_series_link.c.book, db.Series
     elif sort_param == "languages":
         order = [db.Languages.lang_code.asc()] if order == "asc" else [db.Languages.lang_code.desc()]
         join = db.books_languages_link, db.Books.id == db.books_languages_link.c.book, db.Languages
@@ -794,10 +806,11 @@ def list_books():
     elif not state:
         order = [db.Books.timestamp.desc()]
 
-    total_count = filtered_count = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(allow_show_archived=True)).count()
+    total_count = filtered_count = calibre_db.session.query(db.Books).filter(
+        calibre_db.common_filters(allow_show_archived=True)).count()
     if state is not None:
-        if search:
-            books = calibre_db.search_query(search, config.config_read_column).all()
+        if search_param:
+            books = calibre_db.search_query(search_param, config.config_read_column).all()
             filtered_count = len(books)
         else:
             if not config.config_read_column:
@@ -818,15 +831,14 @@ def list_books():
                     # Skip linking read column and return None instead of read status
                     books = calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
             books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                          int(current_user.id) == ub.ArchivedBook.user_id))
+                                                           int(current_user.id) == ub.ArchivedBook.user_id))
                      .filter(calibre_db.common_filters(allow_show_archived=True)).all())
         entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True)
-    elif search:
-        entries, filtered_count, __ = calibre_db.get_search_results(search,
+    elif search_param:
+        entries, filtered_count, __ = calibre_db.get_search_results(search_param,
                                                                     off,
-                                                                    [order,''],
+                                                                    [order, ''],
                                                                     limit,
-                                                                    True,
                                                                     config.config_read_column,
                                                                     *join)
     else:
@@ -845,9 +857,9 @@ def list_books():
         val = entry[0]
         val.read_status = entry[1] == ub.ReadBook.STATUS_FINISHED
         val.is_archived = entry[2] is True
-        for index in range(0, len(val.languages)):
-            val.languages[index].language_name = isoLanguages.get_language_name(get_locale(), val.languages[
-                index].lang_code)
+        for lang_index in range(0, len(val.languages)):
+            val.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), val.languages[
+                lang_index].lang_code)
         result.append(val)
 
     table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": result}
@@ -857,6 +869,7 @@ def list_books():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @web.route("/ajax/table_settings", methods=['POST'])
 @login_required
 def update_table_settings():
@@ -886,19 +899,18 @@ def author_list():
         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(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()
+        char_list = generate_char_list(db.Authors.sort, db.books_authors_link)
         # If not creating a copy, readonly databases can not display authornames with "|" in it as changing the name
         # starts a change session
-        autor_copy = copy.deepcopy(entries)
-        for entry in autor_copy:
+        author_copy = copy.deepcopy(entries)
+        for entry in author_copy:
             entry.Authors.name = entry.Authors.name.replace('|', ',')
-        return render_title_template('list.html', entries=autor_copy, folder='web.books_list', charlist=charlist,
+        return render_title_template('list.html', entries=author_copy, folder='web.books_list', charlist=char_list,
                                      title=u"Authors", page="authorlist", data='author', order=order_no)
     else:
         abort(404)
 
+
 @web.route("/downloadlist")
 @login_required_if_no_ano
 def download_list():
@@ -909,12 +921,12 @@ def download_list():
         order = ub.User.name.asc()
         order_no = 1
     if current_user.check_visibility(constants.SIDEBAR_DOWNLOAD) and current_user.role_admin():
-        entries = ub.session.query(ub.User, func.count(ub.Downloads.book_id).label('count'))\
+        entries = ub.session.query(ub.User, func.count(ub.Downloads.book_id).label('count')) \
             .join(ub.Downloads).group_by(ub.Downloads.user_id).order_by(order).all()
-        charlist = ub.session.query(func.upper(func.substr(ub.User.name, 1, 1)).label('char')) \
+        char_list = ub.session.query(func.upper(func.substr(ub.User.name, 1, 1)).label('char')) \
             .filter(ub.User.role.op('&')(constants.ROLE_ANONYMOUS) != constants.ROLE_ANONYMOUS) \
             .group_by(func.upper(func.substr(ub.User.name, 1, 1))).all()
-        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
+        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Downloads"), page="downloadlist", data="download", order=order_no)
     else:
         abort(404)
@@ -933,10 +945,8 @@ def publisher_list():
         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(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()
-        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
+        char_list = generate_char_list(db.Publishers.name, db.books_publishers_link)
+        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher", order=order_no)
     else:
         abort(404)
@@ -952,25 +962,19 @@ def series_list():
         else:
             order = db.Series.sort.asc()
             order_no = 1
+        char_list = generate_char_list(db.Series.sort, db.books_series_link)
         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(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()
-            return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
+            return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", order=order_no)
         else:
             entries = calibre_db.session.query(db.Books, func.count('books_series_link').label('count'),
                                                func.max(db.Books.series_index), db.Books.id) \
-                .join(db.books_series_link).join(db.Series).filter(calibre_db.common_filters())\
+                .join(db.books_series_link).join(db.Series).filter(calibre_db.common_filters()) \
                 .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()
-
-            return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=charlist,
+            return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view",
                                          order=order_no)
     else:
@@ -988,7 +992,7 @@ def ratings_list():
             order = db.Ratings.rating.asc()
             order_no = 1
         entries = calibre_db.session.query(db.Ratings, func.count('books_ratings_link.book').label('count'),
-                                   (db.Ratings.rating / 2).label('name')) \
+                                           (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(order).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
@@ -1023,14 +1027,14 @@ def formats_list():
 def language_overview():
     if current_user.check_visibility(constants.SIDEBAR_LANGUAGE) and current_user.filter_language() == u"all":
         order_no = 0 if current_user.get_view_property('language', 'dir') == 'desc' else 1
-        charlist = list()
+        char_list = list()
         languages = calibre_db.speaking_language(reverse_order=not order_no, with_count=True)
         for lang in languages:
             upper_lang = lang[0].name[0].upper()
-            if upper_lang not in charlist:
-                charlist.append(upper_lang)
+            if upper_lang not in char_list:
+                char_list.append(upper_lang)
         return render_title_template('languages.html', languages=languages,
-                                     charlist=charlist, title=_(u"Languages"), page="langlist",
+                                     charlist=char_list, title=_(u"Languages"), page="langlist",
                                      data="language", order=order_no)
     else:
         abort(404)
@@ -1049,10 +1053,8 @@ def category_list():
         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(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()) \
-            .group_by(func.upper(func.substr(db.Tags.name, 1, 1))).all()
-        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
+        char_list = generate_char_list(db.Tags.name, db.books_tags_link)
+        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Categories"), page="catlist", data="category", order=order_no)
     else:
         abort(404)
@@ -1176,7 +1178,15 @@ def adv_search_read_status(q, read_status):
     return q
 
 
-def adv_search_extension(q, include_extension_inputs, exclude_extension_inputs):
+def adv_search_text(q, include_inputs, exclude_inputs, data_value):
+    for inp in include_inputs:
+        q = q.filter(db.Books.data.any(data_value == inp))
+    for excl in exclude_inputs:
+        q = q.filter(not_(db.Books.data.any(data_value == excl)))
+    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:
@@ -1197,15 +1207,17 @@ def adv_search_serie(q, include_series_inputs, exclude_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
+    return q'''
+
 
 def adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
-    q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)\
+    q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id) \
         .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
     if len(include_shelf_inputs) > 0:
         q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
     return q
 
+
 def extend_search_term(searchterm,
                        author_name,
                        book_title,
@@ -1232,7 +1244,7 @@ def extend_search_term(searchterm,
                                            format='medium', locale=get_locale())])
         except ValueError:
             pub_end = u""
-    elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
+    elements = {'tag': db.Tags, 'serie': db.Series, 'shelf': ub.Shelf}
     for key, db_element in elements.items():
         tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
         searchterm.extend(tag.name for tag in tag_names)
@@ -1284,8 +1296,8 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
                                                   int(current_user.id) == ub.ArchivedBook.user_id))
 
-    q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book)\
-        .outerjoin(db.Series)\
+    q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book) \
+        .outerjoin(db.Series) \
         .filter(calibre_db.common_filters(True))
 
     # parse multiselects to a complete dict
@@ -1311,43 +1323,43 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     if publisher:
         publisher = publisher.strip().lower()
 
-    searchterm = []
+    search_term = []
     cc_present = False
     for c in cc:
         if c.datatype == "datetime":
             column_start = term.get('custom_column_' + str(c.id) + '_start')
             column_end = term.get('custom_column_' + str(c.id) + '_end')
             if column_start:
-                searchterm.extend([u"{} >= {}".format(c.name,
-                                                      format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
-                                                                      format='medium',
-                                                                      locale=get_locale())
-                                                      )])
+                search_term.extend([u"{} >= {}".format(c.name,
+                                                       format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
+                                                                   format='medium',
+                                                                   locale=get_locale())
+                                                       )])
                 cc_present = True
             if column_end:
-                searchterm.extend([u"{} <= {}".format(c.name,
-                                                      format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
-                                                                      format='medium',
-                                                                      locale=get_locale())
-                                                      )])
+                search_term.extend([u"{} <= {}".format(c.name,
+                                                       format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
+                                                                   format='medium',
+                                                                   locale=get_locale())
+                                                       )])
                 cc_present = True
         elif term.get('custom_column_' + str(c.id)):
-            searchterm.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
+            search_term.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
             cc_present = True
 
-
-    if any(tags.values()) 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 read_status:
-        searchterm, pub_start, pub_end = extend_search_term(searchterm,
-                                                            author_name,
-                                                            book_title,
-                                                            publisher,
-                                                            pub_start,
-                                                            pub_end,
-                                                            tags,
-                                                            rating_high,
-                                                            rating_low,
-                                                            read_status)
+    if any(tags.values()) 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 read_status:
+        search_term, pub_start, pub_end = extend_search_term(search_term,
+                                                             author_name,
+                                                             book_title,
+                                                             publisher,
+                                                             pub_start,
+                                                             pub_end,
+                                                             tags,
+                                                             rating_high,
+                                                             rating_low,
+                                                             read_status)
         # q = q.filter()
         if author_name:
             q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
@@ -1360,12 +1372,12 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         q = adv_search_read_status(q, read_status)
         if publisher:
             q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
-        q = adv_search_tag(q, tags['include_tag'], tags['exclude_tag'])
-        q = adv_search_serie(q, tags['include_serie'], tags['exclude_serie'])
+        q = adv_search_text(q, tags['include_tag'], tags['exclude_tag'], db.Tags.id)
+        q = adv_search_text(q, tags['include_serie'], tags['exclude_serie'], db.Series.id)
+        q = adv_search_text(q, tags['include_extension'], tags['exclude_extension'], db.Data.format)
         q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
-        q = adv_search_extension(q, tags['include_extension'], tags['exclude_extension'])
-        q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
-        q = adv_search_ratings(q, rating_high, rating_low)
+        q = adv_search_language(q, tags['include_language'], tags['exclude_language'], )
+        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 + "%")))
@@ -1390,7 +1402,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         limit_all = result_count
     entries = calibre_db.order_authors(q[offset:limit_all], list_return=True, combined=True)
     return render_title_template('search.html',
-                                 adv_searchterm=searchterm,
+                                 adv_searchterm=search_term,
                                  pagination=pagination,
                                  entries=entries,
                                  result_count=result_count,
@@ -1414,10 +1426,12 @@ def advanced_search_form():
 def get_cover(book_id):
     return get_book_cover(book_id)
 
+
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")
 
+
 @web.route("/show/<int:book_id>/<book_format>", defaults={'anyname': 'None'})
 @web.route("/show/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
@@ -1561,7 +1575,7 @@ def login():
                       category="success")
                 return redirect_back(url_for("web.index"))
             elif login_result is None and user and check_password_hash(str(user.password), form['password']) \
-                and user.name != "Guest":
+                    and user.name != "Guest":
                 login_user(user, remember=bool(form.get('remember_me')))
                 ub.store_user_session()
                 log.info("Local Fallback Login as: '%s'", user.name)
@@ -1573,23 +1587,23 @@ def login():
                 log.info(error)
                 flash(_(u"Could not login: %(message)s", message=error), category="error")
             else:
-                ip_Address = request.headers.get('X-Forwarded-For', request.remote_addr)
-                log.warning('LDAP Login failed for user "%s" IP-address: %s', form['username'], ip_Address)
+                ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
+                log.warning('LDAP Login failed for user "%s" IP-address: %s', form['username'], ip_address)
                 flash(_(u"Wrong Username or Password"), category="error")
         else:
-            ip_Address = request.headers.get('X-Forwarded-For', request.remote_addr)
+            ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
             if 'forgot' in form and form['forgot'] == 'forgot':
                 if user is not None and user.name != "Guest":
                     ret, __ = reset_password(user.id)
                     if ret == 1:
                         flash(_(u"New Password was send to your email address"), category="info")
-                        log.info('Password reset for user "%s" IP-address: %s', form['username'], ip_Address)
+                        log.info('Password reset for user "%s" IP-address: %s', form['username'], ip_address)
                     else:
                         log.error(u"An unknown error occurred. Please try again later")
                         flash(_(u"An unknown error occurred. Please try again later."), category="error")
                 else:
                     flash(_(u"Please enter valid username to reset password"), category="error")
-                    log.warning('Username missing for password reset IP-address: %s', ip_Address)
+                    log.warning('Username missing for password reset IP-address: %s', ip_address)
             else:
                 if user and check_password_hash(str(user.password), form['password']) and user.name != "Guest":
                     login_user(user, remember=bool(form.get('remember_me')))
@@ -1599,7 +1613,7 @@ def login():
                     config.config_is_initial = False
                     return redirect_back(url_for("web.index"))
                 else:
-                    log.warning('Login failed for user "%s" IP-address: %s', form['username'], ip_Address)
+                    log.warning('Login failed for user "%s" IP-address: %s', form['username'], ip_address)
                     flash(_(u"Wrong Username or Password"), category="error")
 
     next_url = request.args.get('next', default=url_for("web.index"), type=str)
@@ -1617,7 +1631,7 @@ def login():
 @login_required
 def logout():
     if current_user is not None and current_user.is_authenticated:
-        ub.delete_user_session(current_user.id, flask_session.get('_id',""))
+        ub.delete_user_session(current_user.id, flask_session.get('_id', ""))
         logout_user()
         if feature_support['oauth'] and (config.config_login_type == 2 or config.config_login_type == 3):
             logout_oauth_user()
@@ -1639,7 +1653,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
             current_user.email = check_email(to_save["email"])
         if current_user.role_admin():
             if to_save.get("name", current_user.name) != current_user.name:
-                # Query User name, if not existing, change
+                # Query username, if not existing, change
                 current_user.name = check_username(to_save["name"])
         current_user.random_books = 1 if to_save.get("show_random") == "on" else 0
         if to_save.get("default_language"):
@@ -1693,7 +1707,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
 @login_required
 def profile():
     languages = calibre_db.speaking_language()
-    translations = babel.list_translations() + [LC('en')]
+    translations = babel.list_translations() + [Locale('en')]
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     if feature_support['oauth'] and config.config_login_type == 2:
         oauth_status = get_oauth_status()
@@ -1727,7 +1741,8 @@ def read_book(book_id, book_format):
     book.ordered_authors = calibre_db.order_authors([book], False)
 
     if not book:
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
         return redirect(url_for("web.index"))
 
@@ -1768,7 +1783,8 @@ def read_book(book_id, book_format):
                 return render_title_template('readcbr.html', comicfile=all_name, title=title,
                                              extension=fileExt)
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
         return redirect(url_for("web.index"))
 
 
@@ -1782,14 +1798,14 @@ def show_book(book_id):
         entry = entries[0]
         entry.read_status = read_book == ub.ReadBook.STATUS_FINISHED
         entry.is_archived = archived_book
-        for index in range(0, len(entry.languages)):
-            entry.languages[index].language_name = isoLanguages.get_language_name(get_locale(), entry.languages[
-                index].lang_code)
+        for lang_index in range(0, len(entry.languages)):
+            entry.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), entry.languages[
+                lang_index].lang_code)
         cc = get_cc_columns(filter_config_custom_read=True)
-        book_in_shelfs = []
+        book_in_shelves = []
         shelfs = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all()
         for sh in shelfs:
-            book_in_shelfs.append(sh.shelf)
+            book_in_shelves.append(sh.shelf)
 
         entry.tags = sort(entry.tags, key=lambda tag: tag.name)
 
@@ -1806,9 +1822,9 @@ def show_book(book_id):
         return render_title_template('detail.html',
                                      entry=entry,
                                      cc=cc,
-                                     is_xhr=request.headers.get('X-Requested-With')=='XMLHttpRequest',
+                                     is_xhr=request.headers.get('X-Requested-With') == 'XMLHttpRequest',
                                      title=entry.title,
-                                     books_shelfs=book_in_shelfs,
+                                     books_shelfs=book_in_shelves,
                                      page="book")
     else:
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 04f7bb0c1..aea1efb7a 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.37.0
+google-api-python-client>=1.7.11,<2.41.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -12,8 +12,8 @@ PyYAML>=3.12
 rsa>=3.4.2,<4.9.0
 
 # Gmail
-google-auth-oauthlib>=0.4.3,<0.5.0
-google-api-python-client>=1.7.11,<2.37.0
+google-auth-oauthlib>=0.4.3,<0.6.0
+google-api-python-client>=1.7.11,<2.41.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
@@ -29,7 +29,7 @@ SQLAlchemy-Utils>=0.33.5,<0.39.0
 
 # metadata extraction
 rarfile>=3.2
-scholarly>=1.2.0,<1.6
+scholarly>=1.2.0,<1.7
 markdown2>=2.0.0,<2.5.0
 html2text>=2020.1.16,<2022.1.1
 python-dateutil>=2.1,<2.9.0
diff --git a/requirements.txt b/requirements.txt
index d9bed7bb6..de08fbdaa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,7 @@ SQLAlchemy>=1.3.0,<1.5.0
 tornado>=4.1,<6.2
 Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.4.0
-lxml>=3.8.0,<4.8.0
+lxml>=3.8.0,<4.9.0
 flask-wtf>=0.14.2,<1.1.0
 chardet>=3.0.0,<4.1.0
+advocate>=1.0.0,<1.1.0

From 8f3bb2e3380e93ef940b6aeaefd7713b50277a72 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 14 Mar 2022 17:12:35 +0100
Subject: [PATCH 202/412] Bugfixes from testrun

---
 cps/admin.py                            |   8 +-
 cps/opds.py                             |  10 +-
 cps/web.py                              |  71 +-
 test/Calibre-Web TestSummary_Linux.html | 986 +++++++++++++++---------
 4 files changed, 669 insertions(+), 406 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 5d8ed9c16..fedee340a 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -863,10 +863,10 @@ def delete_restriction(res_type, user_id):
             usr = current_user
         if element['id'].startswith('a'):
             usr.allowed_tags = restriction_deletion(element, usr.list_allowed_tags)
-            ub.session_commit("Deleted allowed tags of user {}: {}".format(usr.name, usr.list_allowed_tags))
+            ub.session_commit("Deleted allowed tags of user {}: {}".format(usr.name, element['Element']))
         elif element['id'].startswith('d'):
             usr.denied_tags = restriction_deletion(element, usr.list_denied_tags)
-            ub.session_commit("Deleted denied tags of user {}: {}".format(usr.name, usr.list_allowed_tags))
+            ub.session_commit("Deleted denied tag of user {}: {}".format(usr.name, element['Element']))
     elif res_type == 3:  # Columns per user
         if isinstance(user_id, int):
             usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
@@ -875,12 +875,12 @@ def delete_restriction(res_type, user_id):
         if element['id'].startswith('a'):
             usr.allowed_column_value = restriction_deletion(element, usr.list_allowed_column_values)
             ub.session_commit("Deleted allowed columns of user {}: {}".format(usr.name,
-                                                                              usr.list_allowed_column_values))
+                                                                              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("Deleted denied columns of user {}: {}".format(usr.name,
-                                                                             usr.list_denied_column_values))
+                                                                             usr.list_denied_column_values()))
     return ""
 
 
diff --git a/cps/opds.py b/cps/opds.py
index c0637c6ba..c8ccdea9c 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -26,7 +26,7 @@ from functools import wraps
 
 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_, true
+from sqlalchemy.sql.expression import func, text, or_, and_, any_, true
 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
@@ -34,7 +34,7 @@ from .pagination import Pagination
 from .web import render_read_books
 from .usermanagement import load_user_from_request
 from flask_babel import gettext as _
-
+from sqlalchemy.orm import InstrumentedAttribute
 opds = Blueprint('opds', __name__)
 
 log = logger.create()
@@ -298,7 +298,7 @@ def feed_ratingindex():
 @opds.route("/opds/ratings/<book_id>")
 @requires_basic_auth_if_no_ano
 def feed_ratings(book_id):
-    return render_xml_dataset(db.Tags, book_id)
+    return render_xml_dataset(db.Ratings, book_id)
 
 
 @opds.route("/opds/formats")
@@ -493,7 +493,7 @@ def render_xml_dataset(data_table, book_id):
     off = request.args.get("offset") or 0
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
-                                                        data_table.any(data_table.id == book_id),
+                                                        getattr(db.Books, data_table.__tablename__).any(data_table.id == book_id),
                                                         [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
@@ -502,7 +502,7 @@ def render_element_index(database_column, linked_table, folder):
     shift = 0
     off = int(request.args.get("offset") or 0)
     entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'))
-    if linked_table:
+    if linked_table is not None:
         entries = entries.join(linked_table).join(db.Books)
     entries = entries.filter(calibre_db.common_filters()).group_by(func.upper(func.substr(database_column, 1, 1))).all()
     elements = []
diff --git a/cps/web.py b/cps/web.py
index 6f2f1af15..b1f27035c 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1129,27 +1129,6 @@ def adv_search_custom_columns(cc, term, q):
     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:
@@ -1178,38 +1157,32 @@ def adv_search_read_status(q, read_status):
     return q
 
 
-def adv_search_text(q, include_inputs, exclude_inputs, data_value):
+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:
+        return adv_search_text(q, include_languages_inputs, exclude_languages_inputs, db.Languages.id)
+    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_text(q, include_inputs, exclude_inputs, data_table):
     for inp in include_inputs:
-        q = q.filter(db.Books.data.any(data_value == inp))
+        q = q.filter(getattr(db.Books, data_table.class_.__tablename__).any(data_table == inp))
     for excl in exclude_inputs:
-        q = q.filter(not_(db.Books.data.any(data_value == excl)))
+        q = q.filter(not_(getattr(db.Books, data_table.class_.__tablename__).any(data_table == excl)))
     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 adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
     q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id) \
         .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
@@ -1376,7 +1349,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         q = adv_search_text(q, tags['include_serie'], tags['exclude_serie'], db.Series.id)
         q = adv_search_text(q, tags['include_extension'], tags['exclude_extension'], db.Data.format)
         q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
-        q = adv_search_language(q, tags['include_language'], tags['exclude_language'], )
+        q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
         q = adv_search_ratings(q, rating_high, rating_low, )
 
         if description:
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 580cf3c9b..b2de4c818 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-12 22:57:13</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-13 21:32:38</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>2022-03-13 03:46:17</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-14 02:20:13</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>4h 0 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 59 min</p>
         </div>
       </div>
       </div>
@@ -363,11 +363,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestCoverEditBooks</td>
         <td class="text-center">2</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</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">
@@ -386,11 +386,31 @@
     
     
     
-        <tr id='pt4.2' class='hiddenRow bg-success'>
+        <tr id="ft4.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft4.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft4.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft4.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cover_edit_books.py&#34;, line 56, in test_upload_jpg
+    self.assertTrue(&#34;Error Downloading Cover&#34; in self.check_element_on_page((By.ID, &#34;flash_danger&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -681,11 +701,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -704,11 +724,33 @@
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id="ft9.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft9.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 213, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1586,12 +1628,12 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">17</td>
+        <td class="text-center">16</td>
         <td class="text-center">3</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('c16', 20)">Detail</a>
@@ -1609,11 +1651,41 @@
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id="et16.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 402, in test_edit_author
+    self.fill_basic_config({&#34;config_unicode_filename&#34;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1761,7 +1833,7 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 865, in test_upload_book_epub
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 868, in test_upload_book_epub
     self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
 AssertionError: &#39;8936&#39; != &#39;1103&#39;
 - 8936
@@ -1801,7 +1873,7 @@ AssertionError: &#39;8936&#39; != &#39;1103&#39;
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 778, in test_upload_cover_hdd
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 781, in test_upload_cover_hdd
     self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
 AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
@@ -1830,9 +1902,9 @@ AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 947, in test_watch_metadata
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 950, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=4a23d5c4-e97a-42e1-bd43-351fb1de43df&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=f66a16a8-b9e1-446d-b1ad-21b11df67753&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2891,12 +2963,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestOPDSFeed</td>
         <td class="text-center">23</td>
-        <td class="text-center">23</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">4</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c33', 23)">Detail</a>
@@ -2905,20 +2977,62 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id="ft33.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 60, in test_opds
+    self.assertEqual(200, r.status_code)
+AssertionError: 200 != 500</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id="et33.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 339, in test_opds_author
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2977,11 +3091,31 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id="ft33.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 100, in test_opds_guest_user
+    self.assertEqual(200, r.status_code)
+AssertionError: 200 != 500</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3004,20 +3138,62 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id="ft33.12" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.12')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 375, in test_opds_non_admin
+    self.assertEqual(401, r.status_code)
+AssertionError: 401 != 200</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id="et33.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 286, in test_opds_publisher
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3031,11 +3207,33 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.15' class='hiddenRow bg-success'>
+        <tr id="et33.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 435, in test_opds_ratings
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3049,20 +3247,62 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id="ft33.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.17')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 563, in test_opds_search
+    self.assertEqual(401, r.status_code)
+AssertionError: 401 != 200</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt33.18' class='hiddenRow bg-success'>
+        <tr id="et33.18" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 260, in test_opds_series
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3076,11 +3316,33 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.20' class='hiddenRow bg-success'>
+        <tr id="et33.20" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.20')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.20').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 297, in test_opds_tags
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3113,12 +3375,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestUploadPDF</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</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('c34', 1)">Detail</a>
@@ -3127,144 +3389,34 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id="et34.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="failClass">
-        <td>TestReader</td>
-        <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c35', 5)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt35.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='pt35.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='pt35.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="ft35.4" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestReader - test_sound_listener</div>
+                <div class='testcase'>tearDownClass (test_opds_feed)</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.4')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et34.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft35.4" class="popup_window test_output" style="display:block;">
+                <div id="div_et34.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.4').style.display='none'"><span
+                                onclick="document.getElementById('div_et34.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 216, in sound_test
-    self.assertEqual(title, title_item.text)
-AssertionError: &#39;Unknown - music&#39; != &#39;- music&#39;
-- Unknown - music
-+ - music</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='pt35.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="errorClass">
-        <td>TestReadOnlyDatabase</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('c36', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et36.1" class="none bg-info">
-            <td>
-                <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_readonly_db.py&#34;, line 49, in test_readonly_path
-    self.fill_basic_config({&#39;config_rarfile_location&#39;: unrar_path(), &#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 346, in _fill_basic_config
-    ele = cls.driver.find_element(By.ID, key)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 33, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
   File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
     return self.execute(Command.FIND_ELEMENT, {
   File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
     self.error_handler.check_response(response)
   File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
     raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_rarfile_location&#34;]
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
 Stacktrace:
 WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
 NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
@@ -3280,7 +3432,91 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 
 
     <tr id="su" class="passClass">
-        <td>TestReconnect</td>
+        <td>TestUploadPDF</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('c35', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt35.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</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('c36', 5)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt36.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='pt36.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='pt36.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='pt36.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='pt36.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>TestReadOnlyDatabase</td>
         <td class="text-center">1</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
@@ -3294,6 +3530,30 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
         <tr id='pt37.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestReconnect</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('c38', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3311,13 +3571,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3326,7 +3586,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3335,7 +3595,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3344,7 +3604,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3353,7 +3613,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3362,7 +3622,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3371,7 +3631,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3380,7 +3640,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3398,13 +3658,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3413,7 +3673,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3422,7 +3682,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3432,21 +3692,21 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestShelf</td>
         <td class="text-center">16</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3455,7 +3715,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3464,16 +3724,36 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id="ft41.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 530, in test_adv_search_shelf
+    self.assertEqual(len(self.adv_search({u&#39;include_shelf&#39;: u&#39;Search&#39;, &#39;include_tag&#39;: &#39;Gênot&#39;})), 2)
+AssertionError: 3 != 2</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3482,7 +3762,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3491,7 +3771,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3500,7 +3780,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3509,7 +3789,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3518,7 +3798,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3527,7 +3807,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3536,7 +3816,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3545,7 +3825,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3554,7 +3834,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3563,19 +3843,19 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="st40.14" class="none bg-warning">
+        <tr id="st41.14" 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_st40.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st40.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3589,7 +3869,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3598,7 +3878,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3616,13 +3896,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 9)">Detail</a>
+            <a onclick="showClassDetail('c42', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3631,7 +3911,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3640,7 +3920,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3649,7 +3929,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3658,7 +3938,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3667,7 +3947,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3676,19 +3956,19 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="st41.7" class="none bg-warning">
+        <tr id="st42.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_st41.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.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_st41.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3702,7 +3982,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3711,7 +3991,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3723,19 +4003,37 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 
     <tr id="su" class="passClass">
         <td>TestUploadEPubs</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</td>
+        <td class="text-center">4</td>
+        <td class="text-center">4</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('c42', 2)">Detail</a>
+            <a onclick="showClassDetail('c43', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt43.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3744,7 +4042,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3754,21 +4052,21 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">17</td>
-        <td class="text-center">1</td>
+        <td class="text-center">18</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('c43', 18)">Detail</a>
+            <a onclick="showClassDetail('c44', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3777,7 +4075,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3786,7 +4084,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3795,7 +4093,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3804,7 +4102,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3813,7 +4111,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3822,7 +4120,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3831,7 +4129,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3840,7 +4138,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3849,7 +4147,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3858,7 +4156,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3867,7 +4165,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3876,7 +4174,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3885,7 +4183,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3894,7 +4192,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3903,36 +4201,16 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft43.16" class="none bg-danger">
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.16')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 640, in test_user_list_requests
-    self.assertEqual(400, result.status_code)
-AssertionError: 400 != 500</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3941,7 +4219,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3959,13 +4237,13 @@ AssertionError: 400 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 1)">Detail</a>
+            <a onclick="showClassDetail('c45', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3983,13 +4261,13 @@ AssertionError: 400 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 21)">Detail</a>
+            <a onclick="showClassDetail('c46', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3998,7 +4276,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4007,7 +4285,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4016,7 +4294,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4025,7 +4303,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4034,7 +4312,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4043,7 +4321,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4052,7 +4330,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4061,7 +4339,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4070,7 +4348,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4079,7 +4357,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4088,7 +4366,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4097,7 +4375,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4106,7 +4384,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4115,7 +4393,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4124,7 +4402,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4133,7 +4411,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4142,7 +4420,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4151,7 +4429,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4160,7 +4438,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4169,7 +4447,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4187,13 +4465,13 @@ AssertionError: 400 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 34)">Detail</a>
+            <a onclick="showClassDetail('c47', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4202,7 +4480,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4211,7 +4489,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4220,7 +4498,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4229,7 +4507,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4238,7 +4516,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4247,7 +4525,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4256,7 +4534,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4265,7 +4543,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4274,7 +4552,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4283,7 +4561,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4292,7 +4570,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4301,7 +4579,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4310,7 +4588,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4319,7 +4597,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4328,7 +4606,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4337,7 +4615,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4346,7 +4624,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4355,7 +4633,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4364,7 +4642,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4373,7 +4651,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4382,7 +4660,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.22' class='hiddenRow bg-success'>
+        <tr id='pt47.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4391,7 +4669,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.23' class='hiddenRow bg-success'>
+        <tr id='pt47.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4400,7 +4678,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.24' class='hiddenRow bg-success'>
+        <tr id='pt47.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4409,7 +4687,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.25' class='hiddenRow bg-success'>
+        <tr id='pt47.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4418,7 +4696,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.26' class='hiddenRow bg-success'>
+        <tr id='pt47.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4427,7 +4705,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.27' class='hiddenRow bg-success'>
+        <tr id='pt47.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4436,7 +4714,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.28' class='hiddenRow bg-success'>
+        <tr id='pt47.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4445,7 +4723,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.29' class='hiddenRow bg-success'>
+        <tr id='pt47.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4454,7 +4732,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.30' class='hiddenRow bg-success'>
+        <tr id='pt47.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4463,7 +4741,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.31' class='hiddenRow bg-success'>
+        <tr id='pt47.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4472,7 +4750,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.32' class='hiddenRow bg-success'>
+        <tr id='pt47.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4481,7 +4759,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.33' class='hiddenRow bg-success'>
+        <tr id='pt47.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4490,7 +4768,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.34' class='hiddenRow bg-success'>
+        <tr id='pt47.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4508,13 +4786,13 @@ AssertionError: 400 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 16)">Detail</a>
+            <a onclick="showClassDetail('c48', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4523,7 +4801,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4532,7 +4810,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4541,7 +4819,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4550,7 +4828,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4559,7 +4837,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4568,7 +4846,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4577,7 +4855,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4586,7 +4864,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4595,7 +4873,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4604,7 +4882,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4613,7 +4891,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4622,7 +4900,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4631,7 +4909,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4640,7 +4918,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4649,7 +4927,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4660,10 +4938,10 @@ AssertionError: 400 != 500</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>403</td>
-        <td>391</td>
-        <td>5</td>
-        <td>1</td>
+        <td>406</td>
+        <td>383</td>
+        <td>10</td>
+        <td>7</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4702,6 +4980,12 @@ AssertionError: 400 != 500</pre>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>advocate</th>
+              <td>1.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Babel</th>
               <td>2.9.1</td>
@@ -4770,7 +5054,13 @@ AssertionError: 400 != 500</pre>
           
             <tr>
               <th>lxml</th>
-              <td>4.7.1</td>
+              <td>4.8.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>pyasn1</th>
+              <td>0.4.8</td>
               <td>Basic</td>
             </tr>
           
@@ -5094,7 +5384,7 @@ AssertionError: 400 != 500</pre>
 </div>
 
 <script>
-    drawCircle(391, 5, 1, 6);
+    drawCircle(383, 10, 7, 6);
     showCase(5);
 </script>
 

From 399ddc5d6f036f5ca160b3bbea815d01f5118982 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 15 Mar 2022 18:44:36 +0100
Subject: [PATCH 203/412] Update testresults

---
 cps/helper.py                           |  10 +-
 test/Calibre-Web TestSummary_Linux.html | 760 +++++++-----------------
 2 files changed, 217 insertions(+), 553 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 3b0c2a04c..4dabcfcea 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -738,16 +738,18 @@ def save_cover_from_url(url, book_path):
         return save_cover(img, book_path)
     except (socket.gaierror,
             requests.exceptions.HTTPError,
+            requests.exceptions.InvalidURL,
             requests.exceptions.ConnectionError,
             requests.exceptions.Timeout) as ex:
-        log.info(u'Cover Download Error %s', ex)
+        # "Invalid host" can be the result of a redirect response
+        log.error(u'Cover Download Error %s', ex)
         return False, _("Error Downloading Cover")
     except MissingDelegateError as ex:
         log.info(u'File Format Error %s', ex)
         return False, _("Cover Format Error")
-    except UnacceptableAddressException:
-        log.error("Localhost was accessed for cover upload")
-        return False, _("You are not allowed to access localhost for cover uploads")
+    except UnacceptableAddressException as e:
+        log.error("Localhost or local network was accessed for cover upload")
+        return False, _("You are not allowed to access localhost or the local network for cover uploads")
 
 
 def save_cover_from_filestorage(filepath, saved_filename, img):
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index b2de4c818..e3b7a3d7d 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-13 21:32:38</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-14 21:13: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>Stop Time: </strong>2022-03-14 02:20:13</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-15 02:05:20</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>3h 59 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 3 min</p>
         </div>
       </div>
       </div>
@@ -363,11 +363,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestCoverEditBooks</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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">
@@ -386,31 +386,11 @@
     
     
     
-        <tr id="ft4.2" class="none bg-danger">
+        <tr id='pt4.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft4.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft4.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft4.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cover_edit_books.py&#34;, line 56, in test_upload_jpg
-    self.assertTrue(&#34;Error Downloading Cover&#34; in self.check_element_on_page((By.ID, &#34;flash_danger&#34;)).text)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -701,11 +681,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -724,33 +704,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft9.2" class="none bg-danger">
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft9.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 213, in test_convert_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1628,12 +1586,12 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">16</td>
+        <td class="text-center">17</td>
         <td class="text-center">3</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('c16', 20)">Detail</a>
@@ -1651,41 +1609,11 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="et16.2" class="none bg-info">
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 402, in test_edit_author
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1833,7 +1761,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 868, in test_upload_book_epub
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 853, in test_upload_book_epub
     self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
 AssertionError: &#39;8936&#39; != &#39;1103&#39;
 - 8936
@@ -1873,7 +1801,7 @@ AssertionError: &#39;8936&#39; != &#39;1103&#39;
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 781, in test_upload_cover_hdd
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 766, in test_upload_cover_hdd
     self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
 AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
@@ -1902,9 +1830,9 @@ AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 950, in test_watch_metadata
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 935, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=f66a16a8-b9e1-446d-b1ad-21b11df67753&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=2e081d1c-86d2-461f-a309-e51e1e378161&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2963,12 +2891,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestOPDSFeed</td>
         <td class="text-center">23</td>
-        <td class="text-center">14</td>
-        <td class="text-center">4</td>
-        <td class="text-center">5</td>
+        <td class="text-center">23</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('c33', 23)">Detail</a>
@@ -2977,62 +2905,20 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     
     
-        <tr id="ft33.1" class="none bg-danger">
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 60, in test_opds
-    self.assertEqual(200, r.status_code)
-AssertionError: 200 != 500</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et33.2" class="none bg-info">
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 339, in test_opds_author
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3091,31 +2977,11 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
     
     
-        <tr id="ft33.9" class="none bg-danger">
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 100, in test_opds_guest_user
-    self.assertEqual(200, r.status_code)
-AssertionError: 200 != 500</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3138,62 +3004,20 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id="ft33.12" class="none bg-danger">
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.12')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 375, in test_opds_non_admin
-    self.assertEqual(401, r.status_code)
-AssertionError: 401 != 200</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et33.13" class="none bg-info">
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 286, in test_opds_publisher
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3207,33 +3031,11 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
     
     
-        <tr id="et33.15" class="none bg-info">
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 435, in test_opds_ratings
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3247,62 +3049,20 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
     
     
-        <tr id="ft33.17" class="none bg-danger">
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.17')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 563, in test_opds_search
-    self.assertEqual(401, r.status_code)
-AssertionError: 401 != 200</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et33.18" class="none bg-info">
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 260, in test_opds_series
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3316,33 +3076,11 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
     
     
-        <tr id="et33.20" class="none bg-info">
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 297, in test_opds_tags
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3375,62 +3113,6 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</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('c34', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et34.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_opds_feed)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et34.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et34.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et34.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 33, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
     <tr id="su" class="passClass">
         <td>TestUploadPDF</td>
         <td class="text-center">1</td>
@@ -3439,13 +3121,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3463,13 +3145,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 5)">Detail</a>
+            <a onclick="showClassDetail('c35', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3478,7 +3160,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3487,7 +3169,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3496,7 +3178,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3505,7 +3187,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3523,13 +3205,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c36', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3547,13 +3229,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3571,13 +3253,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 8)">Detail</a>
+            <a onclick="showClassDetail('c38', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3586,7 +3268,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3595,7 +3277,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3604,7 +3286,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3613,7 +3295,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3622,7 +3304,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3631,7 +3313,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3640,7 +3322,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3658,13 +3340,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 3)">Detail</a>
+            <a onclick="showClassDetail('c39', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3673,7 +3355,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3682,7 +3364,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3692,21 +3374,21 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestShelf</td>
         <td class="text-center">16</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
+        <td class="text-center">15</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('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c40', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3715,7 +3397,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3724,36 +3406,16 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft41.3" class="none bg-danger">
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 530, in test_adv_search_shelf
-    self.assertEqual(len(self.adv_search({u&#39;include_shelf&#39;: u&#39;Search&#39;, &#39;include_tag&#39;: &#39;Gênot&#39;})), 2)
-AssertionError: 3 != 2</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3762,7 +3424,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3771,7 +3433,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3780,7 +3442,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3789,7 +3451,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3798,7 +3460,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3807,7 +3469,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3816,7 +3478,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3825,7 +3487,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3834,7 +3496,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3843,19 +3505,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st41.14" class="none bg-warning">
+        <tr id="st40.14" 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_st41.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.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_st41.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3869,7 +3531,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3878,7 +3540,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3896,13 +3558,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 9)">Detail</a>
+            <a onclick="showClassDetail('c41', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3911,7 +3573,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3920,7 +3582,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3929,7 +3591,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3938,7 +3600,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3947,7 +3609,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3956,19 +3618,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st42.7" class="none bg-warning">
+        <tr id="st41.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_st42.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st42.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st42.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3982,7 +3644,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3991,7 +3653,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -4009,13 +3671,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 4)">Detail</a>
+            <a onclick="showClassDetail('c42', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -4024,7 +3686,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -4033,7 +3695,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4042,7 +3704,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4060,13 +3722,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 18)">Detail</a>
+            <a onclick="showClassDetail('c43', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4075,7 +3737,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4084,7 +3746,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4093,7 +3755,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4102,7 +3764,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4111,7 +3773,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4120,7 +3782,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4129,7 +3791,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4138,7 +3800,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4147,7 +3809,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4156,7 +3818,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4165,7 +3827,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4174,7 +3836,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4183,7 +3845,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4192,7 +3854,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4201,7 +3863,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4210,7 +3872,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4219,7 +3881,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4237,13 +3899,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 1)">Detail</a>
+            <a onclick="showClassDetail('c44', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4261,13 +3923,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 21)">Detail</a>
+            <a onclick="showClassDetail('c45', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4276,7 +3938,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4285,7 +3947,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4294,7 +3956,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4303,7 +3965,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4312,7 +3974,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4321,7 +3983,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4330,7 +3992,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4339,7 +4001,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4348,7 +4010,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4357,7 +4019,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4366,7 +4028,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4375,7 +4037,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4384,7 +4046,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4393,7 +4055,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4402,7 +4064,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4411,7 +4073,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4420,7 +4082,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4429,7 +4091,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt45.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4438,7 +4100,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt45.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4447,7 +4109,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt45.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4465,13 +4127,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 34)">Detail</a>
+            <a onclick="showClassDetail('c46', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4480,7 +4142,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4489,7 +4151,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4498,7 +4160,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4507,7 +4169,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4516,7 +4178,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4525,7 +4187,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4534,7 +4196,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4543,7 +4205,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4552,7 +4214,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4561,7 +4223,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4570,7 +4232,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4579,7 +4241,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4588,7 +4250,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4597,7 +4259,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4606,7 +4268,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4615,7 +4277,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4624,7 +4286,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4633,7 +4295,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4642,7 +4304,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4651,7 +4313,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4660,7 +4322,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.22' class='hiddenRow bg-success'>
+        <tr id='pt46.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4669,7 +4331,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.23' class='hiddenRow bg-success'>
+        <tr id='pt46.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4678,7 +4340,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.24' class='hiddenRow bg-success'>
+        <tr id='pt46.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4687,7 +4349,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.25' class='hiddenRow bg-success'>
+        <tr id='pt46.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4696,7 +4358,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.26' class='hiddenRow bg-success'>
+        <tr id='pt46.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4705,7 +4367,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.27' class='hiddenRow bg-success'>
+        <tr id='pt46.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4714,7 +4376,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.28' class='hiddenRow bg-success'>
+        <tr id='pt46.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4723,7 +4385,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.29' class='hiddenRow bg-success'>
+        <tr id='pt46.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4732,7 +4394,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.30' class='hiddenRow bg-success'>
+        <tr id='pt46.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4741,7 +4403,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.31' class='hiddenRow bg-success'>
+        <tr id='pt46.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4750,7 +4412,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.32' class='hiddenRow bg-success'>
+        <tr id='pt46.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4759,7 +4421,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.33' class='hiddenRow bg-success'>
+        <tr id='pt46.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4768,7 +4430,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.34' class='hiddenRow bg-success'>
+        <tr id='pt46.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4786,13 +4448,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c48', 16)">Detail</a>
+            <a onclick="showClassDetail('c47', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4801,7 +4463,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4810,7 +4472,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4819,7 +4481,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4828,7 +4490,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4837,7 +4499,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4846,7 +4508,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4855,7 +4517,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4864,7 +4526,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4873,7 +4535,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4882,7 +4544,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4891,7 +4553,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4900,7 +4562,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4909,7 +4571,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4918,7 +4580,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4927,7 +4589,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4938,10 +4600,10 @@ AssertionError: 3 != 2</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>406</td>
-        <td>383</td>
-        <td>10</td>
-        <td>7</td>
+        <td>405</td>
+        <td>396</td>
+        <td>3</td>
+        <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -5384,7 +5046,7 @@ AssertionError: 3 != 2</pre>
 </div>
 
 <script>
-    drawCircle(383, 10, 7, 6);
+    drawCircle(396, 3, 0, 6);
     showCase(5);
 </script>
 

From 57cd8160a05e5297ce78509f0c28538415749854 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 16 Mar 2022 16:28:58 +0100
Subject: [PATCH 204/412] Removed accidently added line regarding
 "InstrumentedAttribute"

---
 cps/opds.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cps/opds.py b/cps/opds.py
index c8ccdea9c..180fcacbf 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -34,7 +34,6 @@ from .pagination import Pagination
 from .web import render_read_books
 from .usermanagement import load_user_from_request
 from flask_babel import gettext as _
-from sqlalchemy.orm import InstrumentedAttribute
 opds = Blueprint('opds', __name__)
 
 log = logger.create()

From 034ab73ccc9e209d5fea6ea9a81a351700c63fc8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 16 Mar 2022 16:57:18 +0100
Subject: [PATCH 205/412] Added environment variables for reconnect

---
 cps/admin.py       |  2 +-
 cps/cli.py         |  6 +++++-
 cps/gdriveutils.py | 20 +++++++-------------
 cps/helper.py      |  9 +++------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index fedee340a..0b90327e5 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -159,7 +159,7 @@ def shutdown():
 # needed for docker applications, as changes on metadata.db from host are not visible to application
 @admi.route("/reconnect", methods=['GET'])
 def reconnect():
-    if cli.args.r:
+    if cli.reconnect_enable:
         calibre_db.reconnect_db(config, ub.app_DB_path)
         return json.dumps({})
     else:
diff --git a/cps/cli.py b/cps/cli.py
index a63d7282b..36c03513e 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -84,10 +84,14 @@ if args.k == "":
 
 # dry run updater
 dry_run = args.d or None
+# enable reconnect endpoint for docker database reconnect
+reconnect_enable = args.r or os.environ.get("CALIBRE_RECONNECT", None)
 # load covers from localhost
-allow_localhost = args.l or None
+allow_localhost = args.l or os.environ.get("CALIBRE_LOCALHOST", None)
 # handle and check ip address argument
 ip_address = args.i or None
+
+
 if ip_address:
     try:
         # try to parse the given ip address with socket
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 0b704db40..e75f37421 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -81,7 +81,7 @@ if gdrive_support:
     if not logger.is_debug_enabled():
         logger.get('googleapiclient.discovery').setLevel(logger.logging.ERROR)
 else:
-    log.debug("Cannot import pydrive,httplib2, using gdrive will not work: %s", importError)
+    log.debug("Cannot import pydrive, httplib2, using gdrive will not work: %s", importError)
 
 
 class Singleton:
@@ -272,8 +272,7 @@ def getEbooksFolderId(drive=None):
         try:
             session.commit()
         except OperationalError as ex:
-            log.error("gdrive.db DB is not Writeable")
-            log.debug('Database error: %s', ex)
+            log.error_or_exception('Database error: %s', ex)
             session.rollback()
         return gDriveId.gdrive_id
 
@@ -322,8 +321,7 @@ def getFolderId(path, drive):
         else:
             currentFolderId = storedPathName.gdrive_id
     except OperationalError as ex:
-        log.error("gdrive.db DB is not Writeable")
-        log.debug('Database error: %s', ex)
+        log.error_or_exception('Database error: %s', ex)
         session.rollback()
     except ApiRequestError as ex:
         log.error('{} {}'.format(ex.error['message'], path))
@@ -547,8 +545,7 @@ def deleteDatabaseOnChange():
         session.commit()
     except (OperationalError, InvalidRequestError) as ex:
         session.rollback()
-        log.debug('Database error: %s', ex)
-        log.error(u"GDrive DB is not Writeable")
+        log.error_or_exception('Database error: %s', ex)
 
 
 def updateGdriveCalibreFromLocal():
@@ -566,8 +563,7 @@ def updateDatabaseOnEdit(ID,newPath):
         try:
             session.commit()
         except OperationalError as ex:
-            log.error("gdrive.db DB is not Writeable")
-            log.debug('Database error: %s', ex)
+            log.error_or_exception('Database error: %s', ex)
             session.rollback()
 
 
@@ -577,8 +573,7 @@ def deleteDatabaseEntry(ID):
     try:
         session.commit()
     except OperationalError as ex:
-        log.error("gdrive.db DB is not Writeable")
-        log.debug('Database error: %s', ex)
+        log.error_or_exception('Database error: %s', ex)
         session.rollback()
 
 
@@ -599,8 +594,7 @@ def get_cover_via_gdrive(cover_path):
             try:
                 session.commit()
             except OperationalError as ex:
-                log.error("gdrive.db DB is not Writeable")
-                log.debug('Database error: %s', ex)
+                log.error_or_exception('Database error: %s', ex)
                 session.rollback()
         return df.metadata.get('webContentLink')
     else:
diff --git a/cps/helper.py b/cps/helper.py
index 4dabcfcea..7dd3ca9fc 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -435,8 +435,7 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
                         new_author_path = os.path.join(calibre_path, new_author_rename_dir)
                         shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
                     except OSError as ex:
-                        log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
-                        log.debug(ex, exc_info=True)
+                        log.error_or_exception("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
                         return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                                  src=old_author_path, dest=new_author_path, error=str(ex))
     else:
@@ -550,8 +549,7 @@ def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, d
         # 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_path, ex)
-        log.debug(ex, exc_info=True)
+        log.error_or_exception("Rename title from: %s to %s: %s", path, new_path, ex)
         return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                  src=path, dest=new_path, error=str(ex))
     return False
@@ -572,8 +570,7 @@ def rename_files_on_change(first_author,
         if not gdrive and not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
             shutil.rmtree(os.path.dirname(path))
     except (OSError, FileNotFoundError) as ex:
-        log.error("Error in rename file in path %s", ex)
-        log.debug(ex, exc_info=True)
+        log.error_or_exception("Error in rename file in path %s", ex)
         return _("Error in rename file in path: %(error)s", error=str(ex))
     return False
 

From 06e88456416fda3ccad0d36dd653d01f8486a207 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 16 Mar 2022 20:31:25 +0100
Subject: [PATCH 206/412] Implement delete thumbnail entry Implement delete
 cache_dir on database change

---
 cps/admin.py           |  1 +
 cps/fs.py              |  1 -
 cps/helper.py          |  3 +++
 cps/tasks/thumbnail.py | 29 +++++++++++++++++++++++++----
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 5f9d0a0d1..fea20ddce 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1248,6 +1248,7 @@ def _db_configuration_update_helper():
             ub.session.query(ub.KoboReadingState).delete()
             ub.session.query(ub.KoboStatistics).delete()
             ub.session.query(ub.KoboSyncedBooks).delete()
+            helper.delete_thumbnail_cache()
             ub.session_commit()
         _config_string(to_save, "config_calibre_dir")
         calibre_db.update_config(config)
diff --git a/cps/fs.py b/cps/fs.py
index 0171a5d51..2f83378dd 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -16,7 +16,6 @@
 #   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
 from . import logger
 from .constants import CACHE_DIR
 from os import makedirs, remove
diff --git a/cps/helper.py b/cps/helper.py
index 7d7a4ae9d..c8db50c24 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -1074,3 +1074,6 @@ def get_download_link(book_id, book_format, client):
 
 def clear_cover_thumbnail_cache(book_id):
     WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
+
+def delete_thumbnail_cache():
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index c0887e0ad..31dc1f7bb 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -214,6 +214,9 @@ class TaskGenerateCoverThumbnails(CalibreTask):
     def name(self):
         return 'GenerateCoverThumbnails'
 
+    def __str__(self):
+        return "GenerateCoverThumbnails"
+
     @property
     def is_cancellable(self):
         return True
@@ -421,6 +424,9 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
     def name(self):
         return 'GenerateSeriesThumbnails'
 
+    def __str__(self):
+        return "GenerateSeriesThumbnails"
+
     @property
     def is_cancellable(self):
         return True
@@ -436,10 +442,12 @@ class TaskClearCoverThumbnailCache(CalibreTask):
 
     def run(self, worker_thread):
         if self.app_db_session:
-            if self.book_id:
+            if self.book_id > 0:    # make sure all thumbnails aren't getting deleted due to a bug
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
                 for thumbnail in thumbnails:
                     self.delete_thumbnail(thumbnail)
+            else:
+                self.delete_all_thumbnails()
 
         self._handleSuccess()
         self.app_db_session.remove()
@@ -452,15 +460,28 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             .all()
 
     def delete_thumbnail(self, thumbnail):
-        thumbnail.expiration = datetime.utcnow()
-
+        # thumbnail.expiration = datetime.utcnow()
         try:
-            self.app_db_session.commit()
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
+            self.app_db_session \
+                .query(ub.Thumbnail) \
+                .filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_COVER) \
+                .filter(ub.Thumbnail.entity_id == thumbnail.entity_id) \
+                .delete()
+            self.app_db_session.commit()
         except Exception as ex:
             self.log.info(u'Error deleting book thumbnail: ' + str(ex))
             self._handleError(u'Error deleting book thumbnail: ' + str(ex))
 
+    def delete_all_thumbnails(self):
+        try:
+            self.app_db_session.query(ub.Thumbnail).filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_COVER).delete()
+            self.app_db_session.commit()
+            self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error deleting thumbnail directory: ' + str(ex))
+            self._handleError(u'Error deleting thumbnail directory: ' + str(ex))
+
     @property
     def name(self):
         return 'ThumbnailsClear'

From f34fc002da86114bcc9af379ec0b7dc115c1a133 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 16 Mar 2022 20:33:11 +0100
Subject: [PATCH 207/412] Implement missing cache delete Task identifier

---
 cps/tasks/thumbnail.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 31dc1f7bb..00bd09ad2 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -486,6 +486,9 @@ class TaskClearCoverThumbnailCache(CalibreTask):
     def name(self):
         return 'ThumbnailsClear'
 
+    def __str__(self):
+        return "Delete Thumbnail cache directory"
+
     @property
     def is_cancellable(self):
         return False

From 39459603d4220deeffa10549bb0e7315bb3e45f9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 19 Mar 2022 18:01:51 +0100
Subject: [PATCH 208/412] Update SECURITY.md

---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 26ce3c555..54be54bd1 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -36,6 +36,6 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             ||
 
 
-## Staement regarding Log4j (CVE-2021-44228 and related)
+## Statement regarding Log4j (CVE-2021-44228 and related)
 
 Calibre-web is not affected by bugs related to Log4j. Calibre-Web is a python program, therefore not using Java, and not using the Java logging feature log4j. 

From 8cb5989c97b2adeb15f11f38b8e2dec3efcbaf5a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 20 Mar 2022 11:21:15 +0100
Subject: [PATCH 209/412] Catch additional error on not existing custom column
 linked to read column (#2341) Prevent metadata changes are lost on edit books
 with errors (#2326) Better log output Renamed log message on database delete

---
 cps/admin.py                            |   2 +-
 cps/db.py                               |  18 +-
 cps/editbooks.py                        | 306 +++++++++++++-----------
 cps/helper.py                           |  56 ++---
 cps/render_template.py                  |   4 +-
 cps/templates/detail.html               |   2 +-
 cps/ub.py                               |  14 +-
 cps/web.py                              |  20 +-
 optional-requirements.txt               |   4 +-
 test/Calibre-Web TestSummary_Linux.html | 127 +++++++---
 10 files changed, 312 insertions(+), 241 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 0b90327e5..447e02279 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1237,7 +1237,7 @@ def _db_configuration_update_helper():
         config.store_calibre_uuid(calibre_db, db.LibraryId)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         if db_change:
-            log.info("Calibre Database changed, delete all Calibre-Web info related to old Database")
+            log.info("Calibre Database changed, all Calibre-Web info related to old Database gets deleted")
             ub.session.query(ub.Downloads).delete()
             ub.session.query(ub.ArchivedBook).delete()
             ub.session.query(ub.ReadBook).delete()
diff --git a/cps/db.py b/cps/db.py
index b910363b7..f2fe9b78c 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -620,8 +620,8 @@ class CalibreDB:
                 bd = (self.session.query(Books, read_column.value, ub.ArchivedBook.is_archived).select_from(Books)
                       .join(read_column, read_column.book == book_id,
                       isouter=True))
-            except (KeyError, AttributeError):
-                log.error("Custom Column No.%d is not existing in calibre database", read_column)
+            except (KeyError, AttributeError, IndexError):
+                log.error("Custom Column No.{} is not existing in calibre database".format(read_column))
                 # Skip linking read column and return None instead of read status
                 bd = self.session.query(Books, None, ub.ArchivedBook.is_archived)
         return (bd.filter(Books.id == book_id)
@@ -665,11 +665,11 @@ class CalibreDB:
                 neg_content_cc_filter = false() if neg_cc_list == [''] else \
                     getattr(Books, 'custom_column_' + str(self.config.config_restricted_column)). \
                     any(cc_classes[self.config.config_restricted_column].value.in_(neg_cc_list))
-            except (KeyError, AttributeError):
+            except (KeyError, AttributeError, IndexError):
                 pos_content_cc_filter = false()
                 neg_content_cc_filter = true()
-                log.error(u"Custom Column No.%d is not existing in calibre database",
-                          self.config.config_restricted_column)
+                log.error("Custom Column No.{} is not existing in calibre database".format(
+                    self.config.config_restricted_column))
                 flash(_("Custom Column No.%(column)d is not existing in calibre database",
                         column=self.config.config_restricted_column),
                       category="error")
@@ -727,8 +727,8 @@ class CalibreDB:
                     query = (self.session.query(database, read_column.value, ub.ArchivedBook.is_archived)
                              .select_from(Books)
                              .outerjoin(read_column, read_column.book == Books.id))
-                except (KeyError, AttributeError):
-                    log.error("Custom Column No.%d is not existing in calibre database", read_column)
+                except (KeyError, AttributeError, IndexError):
+                    log.error("Custom Column No.{} is not existing in calibre database".format(read_column))
                     # Skip linking read column and return None instead of read status
                     query = self.session.query(database, None, ub.ArchivedBook.is_archived)
             query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
@@ -839,8 +839,8 @@ class CalibreDB:
                 read_column = cc_classes[config_read_column]
                 query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value).select_from(Books)
                          .outerjoin(read_column, read_column.book == Books.id))
-            except (KeyError, AttributeError):
-                log.error("Custom Column No.%d is not existing in calibre database", config_read_column)
+            except (KeyError, AttributeError, IndexError):
+                log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column))
                 # Skip linking read column
                 query = self.session.query(Books, ub.ArchivedBook.is_archived, None)
         query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 728164f91..c07e5d243 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -289,13 +289,13 @@ def delete_whole_book(book_id, book):
 def render_delete_book_result(book_format, json_response, warning, book_id):
     if book_format:
         if json_response:
-            return json.dumps([warning, {"location": url_for("edit-book.edit_book", book_id=book_id),
+            return json.dumps([warning, {"location": url_for("edit-book.show_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('edit-book.edit_book', book_id=book_id))
+            return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
     else:
         if json_response:
             return json.dumps([warning, {"location": url_for('web.index'),
@@ -316,16 +316,16 @@ def delete_book_from_table(book_id, book_format, json_response):
                 result, error = helper.delete_book(book, config.config_calibre_dir, book_format=book_format.upper())
                 if not result:
                     if json_response:
-                        return json.dumps([{"location": url_for("edit-book.edit_book", book_id=book_id),
+                        return json.dumps([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                             "type": "danger",
                                             "format": "",
                                             "message": error}])
                     else:
                         flash(error, category="error")
-                        return redirect(url_for('edit-book.edit_book', book_id=book_id))
+                        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
                 if error:
                     if json_response:
-                        warning = {"location": url_for("edit-book.edit_book", book_id=book_id),
+                        warning = {"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                    "type": "warning",
                                    "format": "",
                                    "message": error}
@@ -343,13 +343,13 @@ def delete_book_from_table(book_id, book_format, json_response):
                 log.error_or_exception(ex)
                 calibre_db.session.rollback()
                 if json_response:
-                    return json.dumps([{"location": url_for("edit-book.edit_book", book_id=book_id),
+                    return json.dumps([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                         "type": "danger",
                                         "format": "",
                                         "message": ex}])
                 else:
                     flash(str(ex), category="error")
-                    return redirect(url_for('edit-book.edit_book', book_id=book_id))
+                    return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
         else:
             # book not found
@@ -357,13 +357,13 @@ def delete_book_from_table(book_id, book_format, json_response):
         return render_delete_book_result(book_format, json_response, warning, book_id)
     message = _("You are missing permissions to delete books")
     if json_response:
-        return json.dumps({"location": url_for("edit-book.edit_book", book_id=book_id),
+        return json.dumps({"location": url_for("edit-book.show_edit_book", book_id=book_id),
                            "type": "danger",
                            "format": "",
                            "message": message})
     else:
         flash(message, category="error")
-        return redirect(url_for('edit-book.edit_book', book_id=book_id))
+        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
 
 def render_edit_book(book_id):
@@ -413,18 +413,18 @@ def render_edit_book(book_id):
 
 def edit_book_ratings(to_save, book):
     changed = False
-    if to_save["rating"].strip():
+    if to_save.get("rating","").strip():
         old_rating = False
         if len(book.ratings) > 0:
             old_rating = book.ratings[0].rating
-        ratingx2 = int(float(to_save["rating"]) * 2)
-        if ratingx2 != old_rating:
+        rating_x2 = int(float(to_save.get("rating","")) * 2)
+        if rating_x2 != old_rating:
             changed = True
-            is_rating = calibre_db.session.query(db.Ratings).filter(db.Ratings.rating == ratingx2).first()
+            is_rating = calibre_db.session.query(db.Ratings).filter(db.Ratings.rating == rating_x2).first()
             if is_rating:
                 book.ratings.append(is_rating)
             else:
-                new_rating = db.Ratings(rating=ratingx2)
+                new_rating = db.Ratings(rating=rating_x2)
                 book.ratings.append(new_rating)
             if old_rating:
                 book.ratings.remove(book.ratings[0])
@@ -622,24 +622,26 @@ def edit_cc_data(book_id, book, to_save, cc):
                                               'custom')
     return changed
 
-
+# returns None if no file is uploaded
+# returns False if an error occours, in all other cases the ebook metadata is returned
 def upload_single_file(file_request, book, book_id):
     # Check and handle Uploaded file
-    if 'btn-upload-format' in file_request.files:
-        requested_file = file_request.files['btn-upload-format']
+    requested_file = file_request.files.get('btn-upload-format', None)
+    if requested_file:
         # check for empty request
         if requested_file.filename != '':
             if not current_user.role_upload():
-                abort(403)
+                flash(_(u"User has no rights to upload additional file formats"), category="error")
+                return False
             if '.' in requested_file.filename:
                 file_ext = requested_file.filename.rsplit('.', 1)[-1].lower()
                 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))
+                    return False
             else:
                 flash(_('File to be uploaded must have an extension'), category="error")
-                return redirect(url_for('web.show_book', book_id=book.id))
+                return False
 
             file_name = book.path.rsplit('/', 1)[-1]
             filepath = os.path.normpath(os.path.join(config.config_calibre_dir, book.path))
@@ -651,12 +653,12 @@ def upload_single_file(file_request, book, book_id):
                     os.makedirs(filepath)
                 except OSError:
                     flash(_(u"Failed to create path %(path)s (Permission denied).", path=filepath), category="error")
-                    return redirect(url_for('web.show_book', book_id=book.id))
+                    return False
             try:
                 requested_file.save(saved_filename)
             except OSError:
                 flash(_(u"Failed to store file %(file)s.", file=saved_filename), category="error")
-                return redirect(url_for('web.show_book', book_id=book.id))
+                return False
 
             file_size = os.path.getsize(saved_filename)
             is_format = calibre_db.get_book_format(book_id, file_ext.upper())
@@ -674,7 +676,7 @@ def upload_single_file(file_request, book, book_id):
                     calibre_db.session.rollback()
                     log.error_or_exception("Database error: {}".format(e))
                     flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-                    return redirect(url_for('web.show_book', book_id=book.id))
+                    return False # return redirect(url_for('web.show_book', book_id=book.id))
 
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
@@ -684,15 +686,16 @@ def upload_single_file(file_request, book, book_id):
             return uploader.process(
                 saved_filename, *os.path.splitext(requested_file.filename),
                 rarExecutable=config.config_rarfile_location)
-
+    return None
 
 def upload_cover(cover_request, book):
-    if 'btn-upload-cover' in cover_request.files:
-        requested_file = cover_request.files['btn-upload-cover']
+    requested_file = cover_request.files.get('btn-upload-cover', None)
+    if requested_file:
         # check for empty request
         if requested_file.filename != '':
             if not current_user.role_upload():
-                abort(403)
+                flash(_(u"User has no rights to upload cover"), category="error")
+                return False
             ret, message = helper.save_cover(requested_file, book.path)
             if ret is True:
                 return True
@@ -716,25 +719,6 @@ def handle_title_on_edit(book, book_title):
 def handle_author_on_edit(book, author_name, update_stored=True):
     # handle author(s)
     input_authors, renamed = prepare_authors(author_name)
-    '''input_authors = author_name.split('&')
-    input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
-    # Remove duplicates in authors list
-    input_authors = helper.uniq(input_authors)
-    # we have all author names now
-    if input_authors == ['']:
-        input_authors = [_(u'Unknown')]  # prevent empty Author
-
-    renamed = list()
-    for in_aut in input_authors:
-        renamed_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == in_aut).first()
-        if renamed_author and in_aut != renamed_author.name:
-            renamed.append(renamed_author.name)
-            all_books = calibre_db.session.query(db.Books) \
-                .filter(db.Books.authors.any(db.Authors.name == renamed_author.name)).all()
-            sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
-            sorted_old_author = helper.get_sorted_author(in_aut)
-            for one_book in all_books:
-                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)'''
 
     change = modify_database_object(input_authors, book.authors, db.Authors, calibre_db.session, 'author')
 
@@ -754,12 +738,19 @@ def handle_author_on_edit(book, author_name, update_stored=True):
         change = True
     return input_authors, change, renamed
 
+@EditBook.route("/admin/book/<int:book_id>", methods=['GET'])
+@login_required_if_no_ano
+@edit_required
+def show_edit_book(book_id):
+    return render_edit_book(book_id)
 
-@EditBook.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
+
+@EditBook.route("/admin/book/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_book(book_id):
     modify_date = False
+    edit_error = False
 
     # create the function for sorting...
     try:
@@ -768,109 +759,120 @@ def edit_book(book_id):
         log.error_or_exception(e)
         calibre_db.session.rollback()
 
-    # Show form
-    if request.method != 'POST':
-        return render_edit_book(book_id)
-
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-
     # Book not found
     if not book:
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
               category="error")
         return redirect(url_for("web.index"))
 
-    meta = upload_single_file(request, book, book_id)
-    if upload_cover(request, book) is True:
-        book.has_cover = 1
-        modify_date = True
+    to_save = request.form.to_dict()
+
     try:
-        to_save = request.form.to_dict()
-        merge_metadata(to_save, meta)
-        # Update book
+        # Update folder of book on local disk
         edited_books_id = None
-
-        # handle book title
+        title_author_error = None
+        # handle book title change
         title_change = handle_title_on_edit(book, to_save["book_title"])
-
-        input_authors, authorchange, renamed = handle_author_on_edit(book, to_save["author_name"])
-        if authorchange or title_change:
+        # handle book author change
+        input_authors, author_change, renamed = handle_author_on_edit(book, to_save["author_name"])
+        if author_change or title_change:
             edited_books_id = book.id
             modify_date = True
+            title_author_error = helper.update_dir_structure(edited_books_id,
+                                                             config.config_calibre_dir,
+                                                             input_authors[0],
+                                                             renamed_author=renamed)
+        if title_author_error:
+            flash(title_author_error, category="error")
+            calibre_db.session.rollback()
+            book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
 
+        # handle upload other formats from local disk
+        meta = upload_single_file(request, book, book_id)
+        # only merge metadata if file was uploaded and no error occurred (meta equals not false or none)
+        if meta:
+            merge_metadata(to_save, meta)
+        # handle upload covers from local disk
+        cover_upload_success = upload_cover(request, book)
+        if cover_upload_success:
+            book.has_cover = 1
+            modify_date = True
+
+        # upload new covers or new file formats to google drive
         if config.config_use_google_drive:
             gdriveutils.updateGdriveCalibreFromLocal()
 
-        error = ""
-        if edited_books_id:
-            error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                                renamed_author=renamed)
+        if to_save.get("cover_url", None):
+            if not current_user.role_upload():
+                edit_error = True
+                flash(_(u"User has no rights to upload cover"), category="error")
+            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
+                    modify_date = True
+                else:
+                    flash(error, category="error")
 
-        if not error:
-            if "cover_url" in to_save:
-                if to_save["cover_url"]:
-                    if not current_user.role_upload():
-                        calibre_db.session.rollback()
-                        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
-                            modify_date = True
-                        else:
-                            flash(error, category="error")
-
-            # Add default series_index to book
-            modify_date |= edit_book_series_index(to_save["series_index"], book)
-            # Handle book comments/description
-            modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
-            # Handle identifiers
-            input_identifiers = identifier_list(to_save, book)
-            modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
-            if warning:
-                flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
-            modify_date |= modification
-            # Handle book tags
-            modify_date |= edit_book_tags(to_save['tags'], book)
-            # Handle book series
-            modify_date |= edit_book_series(to_save["series"], book)
-            # handle book publisher
-            modify_date |= edit_book_publisher(to_save['publisher'], book)
-            # handle book languages
+        # Add default series_index to book
+        modify_date |= edit_book_series_index(to_save["series_index"], book)
+        # Handle book comments/description
+        modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
+        # Handle identifiers
+        input_identifiers = identifier_list(to_save, book)
+        modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
+        if warning:
+            flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
+        modify_date |= modification
+        # Handle book tags
+        modify_date |= edit_book_tags(to_save['tags'], book)
+        # Handle book series
+        modify_date |= edit_book_series(to_save["series"], book)
+        # handle book publisher
+        modify_date |= edit_book_publisher(to_save['publisher'], book)
+        # handle book languages
+        try:
             modify_date |= edit_book_languages(to_save['languages'], book)
-            # handle book ratings
-            modify_date |= edit_book_ratings(to_save, book)
-            # handle cc data
-            modify_date |= edit_all_cc_data(book_id, book, to_save)
+        except ValueError as e:
+            flash(str(e), category="error")
+            edit_error = True
+        # handle book ratings
+        modify_date |= edit_book_ratings(to_save, book)
+        # handle cc data
+        modify_date |= edit_all_cc_data(book_id, book, to_save)
 
-            if to_save["pubdate"]:
-                try:
-                    book.pubdate = datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
-                except ValueError:
-                    book.pubdate = db.Books.DEFAULT_PUBDATE
-            else:
+        if to_save.get("pubdate", None):
+            try:
+                book.pubdate = datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
+            except ValueError as e:
                 book.pubdate = db.Books.DEFAULT_PUBDATE
-
-            if modify_date:
-                book.last_modified = datetime.utcnow()
-                kobo_sync_status.remove_synced_book(edited_books_id, all=True)
-
-            calibre_db.session.merge(book)
-            calibre_db.session.commit()
-            if config.config_use_google_drive:
-                gdriveutils.updateGdriveCalibreFromLocal()
-            if "detail_view" in to_save:
-                return redirect(url_for('web.show_book', book_id=book.id))
-            else:
-                flash(_("Metadata successfully updated"), category="success")
-                return render_edit_book(book_id)
+                flash(str(e), category="error")
+                edit_error = True
+        else:
+            book.pubdate = db.Books.DEFAULT_PUBDATE
+
+        if modify_date:
+            book.last_modified = datetime.utcnow()
+            kobo_sync_status.remove_synced_book(edited_books_id, all=True)
+
+        calibre_db.session.merge(book)
+        calibre_db.session.commit()
+        if config.config_use_google_drive:
+            gdriveutils.updateGdriveCalibreFromLocal()
+        if meta is not False \
+            and edit_error is not True \
+                and title_author_error is not True \
+                and cover_upload_success is not False:
+            flash(_("Metadata successfully updated"), category="success")
+        if "detail_view" in to_save:
+            return redirect(url_for('web.show_book', book_id=book.id))
         else:
-            calibre_db.session.rollback()
-            flash(error, category="error")
             return render_edit_book(book_id)
     except ValueError as e:
+        log.error_or_exception("Error: {}".format(e))
         calibre_db.session.rollback()
         flash(str(e), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
@@ -882,14 +884,14 @@ def edit_book(book_id):
     except Exception as ex:
         log.error_or_exception(ex)
         calibre_db.session.rollback()
-        flash(_("Error editing book, please check logfile for details"), category="error")
+        flash(_("Error editing book: {}".format(ex)), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
 
 
 def merge_metadata(to_save, meta):
-    if to_save['author_name'] == _(u'Unknown'):
+    if to_save.get('author_name', "") == _(u'Unknown'):
         to_save['author_name'] = ''
-    if to_save['book_title'] == _(u'Unknown'):
+    if to_save.get('book_title', "") == _(u'Unknown'):
         to_save['book_title'] = ''
     for s_field, m_field in [
             ('tags', 'tags'), ('author_name', 'author'), ('series', 'series'),
@@ -1117,7 +1119,7 @@ def upload():
 
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
-                        resp = {"location": url_for('edit-book.edit_book', book_id=book_id)}
+                        resp = {"location": url_for('edit-book.show_edit_book', book_id=book_id)}
                         return Response(json.dumps(resp), mimetype='application/json')
                     else:
                         resp = {"location": url_for('web.show_book', book_id=book_id)}
@@ -1139,7 +1141,7 @@ def convert_bookformat(book_id):
 
     if (book_format_from is None) or (book_format_to is None):
         flash(_(u"Source or destination format for conversion missing"), category="error")
-        return redirect(url_for('edit-book.edit_book', book_id=book_id))
+        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
     log.info('converting: book id: %s from: %s to: %s', book_id, book_format_from, book_format_to)
     rtn = helper.convert_book_format(book_id, config.config_calibre_dir, book_format_from.upper(),
@@ -1151,7 +1153,7 @@ def convert_bookformat(book_id):
               category="success")
     else:
         flash(_(u"There was an error converting this book: %(res)s", res=rtn), category="error")
-    return redirect(url_for('edit-book.edit_book', book_id=book_id))
+    return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
 
 @EditBook.route("/ajax/getcustomenum/<int:c_id>")
@@ -1211,10 +1213,15 @@ def edit_list_book(param):
                            mimetype='application/json')
         elif param == 'title':
             sort_param = book.sort
-            handle_title_on_edit(book, vals.get('value', ""))
-            helper.update_dir_structure(book.id, config.config_calibre_dir)
-            ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
-                           mimetype='application/json')
+            if handle_title_on_edit(book, vals.get('value', "")):
+                rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir)
+                if not rename_error:
+                    ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
+                                   mimetype='application/json')
+                else:
+                    ret = Response(json.dumps({'success': False,
+                                               'msg': rename_error}),
+                                   mimetype='application/json')
         elif param == 'sort':
             book.sort = vals['value']
             ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
@@ -1225,11 +1232,17 @@ def edit_list_book(param):
                            mimetype='application/json')
         elif param == 'authors':
             input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
-            helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
-            ret = Response(json.dumps({
-                'success': True,
-                'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
-                mimetype='application/json')
+            rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0],
+                                                       renamed_author=renamed)
+            if not rename_error:
+                ret = Response(json.dumps({
+                    'success': True,
+                    'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
+                    mimetype='application/json')
+            else:
+                ret = Response(json.dumps({'success': False,
+                                           'msg': rename_error}),
+                               mimetype='application/json')
         elif param == 'is_archived':
             is_archived = change_archived_books(book.id, vals['value'] == "True",
                                                 message="Book {} archive bit set to: {}".format(book.id, vals['value']))
@@ -1356,8 +1369,8 @@ def table_xchange_author_title():
                 author_names.append(authr.name.replace('|', ','))
 
             title_change = handle_title_on_edit(book, " ".join(author_names))
-            input_authors, authorchange, renamed = handle_author_on_edit(book, authors)
-            if authorchange or title_change:
+            input_authors, author_change, renamed = handle_author_on_edit(book, authors)
+            if author_change or title_change:
                 edited_books_id = book.id
                 modify_date = True
 
@@ -1365,8 +1378,9 @@ def table_xchange_author_title():
                 gdriveutils.updateGdriveCalibreFromLocal()
 
             if edited_books_id:
-                helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                            renamed_author=renamed)
+                # toDo: Handle error
+                edit_error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
+                                                         renamed_author=renamed)
             if modify_date:
                 book.last_modified = datetime.utcnow()
             try:
diff --git a/cps/helper.py b/cps/helper.py
index 7dd3ca9fc..3a2276e92 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -327,8 +327,9 @@ def edit_book_read_status(book_id, read_status=None):
                 new_cc = cc_class(value=read_status or 1, book=book_id)
                 calibre_db.session.add(new_cc)
                 calibre_db.session.commit()
-        except (KeyError, AttributeError):
-            log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
+        except (KeyError, AttributeError, IndexError):
+            log.error(
+                "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column)
         except (OperationalError, InvalidRequestError) as ex:
             calibre_db.session.rollback()
@@ -435,7 +436,8 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
                         new_author_path = os.path.join(calibre_path, new_author_rename_dir)
                         shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
                     except OSError as ex:
-                        log.error_or_exception("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
+                        log.error("Rename author from: %s to %s: %s", old_author_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=old_author_path, dest=new_author_path, error=str(ex))
     else:
@@ -446,31 +448,31 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
 # Moves files in file storage during author/title rename, or from temp dir to file storage
 def update_dir_structure_file(book_id, calibre_path, first_author, original_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
-    localbook = calibre_db.get_book(book_id)
+    local_book = calibre_db.get_book(book_id)
     if original_filepath:
         path = original_filepath
     else:
-        path = os.path.join(calibre_path, localbook.path)
+        path = os.path.join(calibre_path, local_book.path)
 
-    # Create (current) authordir and titledir from database
-    authordir = localbook.path.split('/')[0]
-    titledir = localbook.path.split('/')[1]
+    # Create (current) author_dir and title_dir from database
+    author_dir = local_book.path.split('/')[0]
+    title_dir = local_book.path.split('/')[1]
 
-    # Create new_authordir from parameter or from database
-    # Create new titledir from database and add id
-    new_authordir = rename_all_authors(first_author, renamed_author, calibre_path, localbook)
+    # Create new_author_dir from parameter or from database
+    # Create new title_dir from database and add id
+    new_author_dir = rename_all_authors(first_author, renamed_author, calibre_path, local_book)
     if first_author:
         if first_author.lower() in [r.lower() for r in renamed_author]:
-            if os.path.isdir(os.path.join(calibre_path, new_authordir)):
-                path = os.path.join(calibre_path, new_authordir, titledir)
+            if os.path.isdir(os.path.join(calibre_path, new_author_dir)):
+                path = os.path.join(calibre_path, new_author_dir, title_dir)
 
-    new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
+    new_title_dir = get_valid_filename(local_book.title, chars=96) + " (" + str(book_id) + ")"
 
-    if titledir != new_titledir or authordir != new_authordir or original_filepath:
+    if title_dir != new_title_dir or author_dir != new_author_dir or original_filepath:
         error = move_files_on_change(calibre_path,
-                                     new_authordir,
-                                     new_titledir,
-                                     localbook,
+                                     new_author_dir,
+                                     new_title_dir,
+                                     local_book,
                                      db_filename,
                                      original_filepath,
                                      path)
@@ -478,7 +480,7 @@ def update_dir_structure_file(book_id, calibre_path, first_author, original_file
             return error
 
     # Rename all files from old names to new names
-    return rename_files_on_change(first_author, renamed_author, localbook, original_filepath, path, calibre_path)
+    return rename_files_on_change(first_author, renamed_author, local_book, original_filepath, path, calibre_path)
 
 
 def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_dir, original_filepath, filename_ext):
@@ -490,7 +492,7 @@ def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_d
                                title_dir + " (" + str(book_id) + ")")
     book.path = gdrive_path.replace("\\", "/")
     gd.uploadFileToEbooksFolder(os.path.join(gdrive_path, file_name).replace("\\", "/"), original_filepath)
-    return rename_files_on_change(first_author, renamed_author, localbook=book, gdrive=True)
+    return rename_files_on_change(first_author, renamed_author, local_book=book, gdrive=True)
 
 
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
@@ -549,7 +551,7 @@ def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, d
         # 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_or_exception("Rename title from: %s to %s: %s", path, new_path, ex)
+        log.error_or_exception("Rename title from {} to {} failed with error: {}".format(path, new_path, ex))
         return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                  src=path, dest=new_path, error=str(ex))
     return False
@@ -557,8 +559,8 @@ def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, d
 
 def rename_files_on_change(first_author,
                            renamed_author,
-                           localbook,
-                           orignal_filepath="",
+                           local_book,
+                           original_filepath="",
                            path="",
                            calibre_path="",
                            gdrive=False):
@@ -566,12 +568,12 @@ def rename_files_on_change(first_author,
     try:
         clean_author_database(renamed_author, calibre_path, gdrive=gdrive)
         if first_author and first_author not in renamed_author:
-            clean_author_database([first_author], calibre_path, localbook, gdrive)
-        if not gdrive and not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+            clean_author_database([first_author], calibre_path, local_book, gdrive)
+        if not gdrive and not renamed_author and not original_filepath and len(os.listdir(os.path.dirname(path))) == 0:
             shutil.rmtree(os.path.dirname(path))
     except (OSError, FileNotFoundError) as ex:
-        log.error_or_exception("Error in rename file in path %s", ex)
-        return _("Error in rename file in path: %(error)s", error=str(ex))
+        log.error_or_exception("Error in rename file in path {}".format(ex))
+        return _("Error in rename file in path: {}".format(str(ex)))
     return False
 
 
diff --git a/cps/render_template.py b/cps/render_template.py
index 7cd341ea0..09a324978 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -110,8 +110,8 @@ def get_readbooks_ids():
             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)
+        except (KeyError, AttributeError, IndexError):
+            log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             return []
 
 # Returns the template for rendering and includes the instance name
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 38005cb9d..3ced58546 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -295,7 +295,7 @@
       {% 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('edit-book.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>
+          <a href="{{ url_for('edit-book.show_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/ub.py b/cps/ub.py
index a2be004c6..4bb66ff69 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -67,6 +67,7 @@ logged_in = dict()
 def signal_store_user_session(object, user):
     store_user_session()
 
+
 def store_user_session():
     if flask_session.get('user_id', ""):
         flask_session['_user_id'] = flask_session.get('user_id', "")
@@ -85,15 +86,16 @@ def store_user_session():
     else:
         log.error("No user id in session")
 
+
 def delete_user_session(user_id, session_key):
     try:
         log.debug("Deleted session_key: " + session_key)
-        session.query(User_Sessions).filter(User_Sessions.user_id==user_id,
-                                            User_Sessions.session_key==session_key).delete()
+        session.query(User_Sessions).filter(User_Sessions.user_id == user_id,
+                                            User_Sessions.session_key == session_key).delete()
         session.commit()
-    except (exc.OperationalError, exc.InvalidRequestError) as e:
+    except (exc.OperationalError, exc.InvalidRequestError) as ex:
         session.rollback()
-        log.exception(e)
+        log.exception(ex)
 
 
 def check_user_session(user_id, session_key):
@@ -209,9 +211,9 @@ class UserBase:
             pass
         try:
             session.commit()
-        except (exc.OperationalError, exc.InvalidRequestError):
+        except (exc.OperationalError, exc.InvalidRequestError) as e:
             session.rollback()
-            # ToDo: Error message
+            log.error_or_exception(e)
 
     def __repr__(self):
         return '<User %r>' % self.name
diff --git a/cps/web.py b/cps/web.py
index b1f27035c..d21ba6300 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -87,7 +87,7 @@ def add_security_headers(resp):
     csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
     csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:"
     resp.headers['Content-Security-Policy'] = csp
-    if request.endpoint == "edit-book.edit_book" or config.config_use_google_drive:
+    if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
         resp.headers['Content-Security-Policy'] += " *"
     elif request.endpoint == "web.read_book":
         resp.headers['Content-Security-Policy'] += " blob:;style-src-elem 'self' blob: 'unsafe-inline';"
@@ -646,8 +646,8 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                                                                     db.Books.id == db.books_series_link.c.book,
                                                                     db.Series,
                                                                     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)
+        except (KeyError, AttributeError, IndexError):
+            log.error("Custom Column No.{} is not existing in calibre database".format(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),
@@ -826,8 +826,9 @@ def list_books():
                     books = (calibre_db.session.query(db.Books, read_column.value, ub.ArchivedBook.is_archived)
                              .select_from(db.Books)
                              .outerjoin(read_column, read_column.book == db.Books.id))
-                except (KeyError, AttributeError):
-                    log.error("Custom Column No.%d is not existing in calibre database", read_column)
+                except (KeyError, AttributeError, IndexError):
+                    log.error(
+                        "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
                     # Skip linking read column and return None instead of read status
                     books = calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
             books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
@@ -1139,8 +1140,9 @@ def adv_search_read_status(q, read_status):
                 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)
-            except (KeyError, AttributeError):
-                log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
+            except (KeyError, AttributeError, IndexError):
+                log.error(
+                    "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
                 flash(_("Custom Column No.%(column)d is not existing in calibre database",
                         column=config.config_read_column),
                       category="error")
@@ -1262,8 +1264,8 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
                      .select_from(db.Books)
                      .outerjoin(read_column, read_column.book == db.Books.id))
-        except (KeyError, AttributeError):
-            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
+        except (KeyError, AttributeError, IndexError):
+            log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             # Skip linking read column
             query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
     query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
diff --git a/optional-requirements.txt b/optional-requirements.txt
index aea1efb7a..e54b0829f 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.41.0
+google-api-python-client>=1.7.11,<2.42.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.41.0
+google-api-python-client>=1.7.11,<2.42.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index e3b7a3d7d..7be8da35b 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-14 21:13:33</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-19 22:04:05</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>2022-03-15 02:05:20</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-20 02:50: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>Duration: </strong>4h 3 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 58 min</p>
         </div>
       </div>
       </div>
@@ -1589,8 +1589,8 @@
     <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">17</td>
-        <td class="text-center">3</td>
+        <td class="text-center">16</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1735,11 +1735,31 @@
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id="ft16.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.16')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft16.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft16.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 145, in test_edit_title
+    self.assertTrue(self.check_element_on_page((By.ID, &#39;flash_success&#39;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1761,7 +1781,7 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 853, in test_upload_book_epub
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 855, in test_upload_book_epub
     self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
 AssertionError: &#39;8936&#39; != &#39;1103&#39;
 - 8936
@@ -1801,7 +1821,7 @@ AssertionError: &#39;8936&#39; != &#39;1103&#39;
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 766, in test_upload_cover_hdd
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 768, in test_upload_cover_hdd
     self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
 AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
@@ -1830,9 +1850,9 @@ AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 935, in test_watch_metadata
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 937, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=2e081d1c-86d2-461f-a309-e51e1e378161&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=34e51cc2-2413-4a23-8324-26d568a421ba&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2825,34 +2845,65 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestMergeBooksList</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</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('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id="et31.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestMergeBooksList - test_book_merge</div>
+                <div class='testcase'>setUpClass (test_merge_books_list)</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt31.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et31.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et31.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et31.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 24, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 175, in startup
+    inst.driver = webdriver.Firefox()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/firefox/webdriver.py&#34;, line 178, in __init__
+    RemoteWebDriver.__init__(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 269, in __init__
+    self.start_session(capabilities, browser_profile)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in start_session
+    response = self.execute(Command.NEW_SESSION, parameters)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.WebDriverException: Message: Process unexpectedly closed with status 0
+
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 28, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4600,10 +4651,10 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>405</td>
-        <td>396</td>
-        <td>3</td>
-        <td>0</td>
+        <td>404</td>
+        <td>393</td>
+        <td>4</td>
+        <td>1</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4776,7 +4827,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4806,7 +4857,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4836,7 +4887,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4878,7 +4929,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4914,7 +4965,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4956,7 +5007,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5046,7 +5097,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 </div>
 
 <script>
-    drawCircle(396, 3, 0, 6);
+    drawCircle(393, 4, 1, 6);
     showCase(5);
 </script>
 

From c0d066098637e0724c42f28e956dc767e1900d62 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 20 Mar 2022 19:13:07 +0100
Subject: [PATCH 210/412] Added names for jobs to make log more readable Bugfix
 logging delete thumbnail

---
 cps/schedule.py                      |  8 ++++----
 cps/services/background_scheduler.py | 16 ++++++++--------
 cps/tasks/thumbnail.py               |  5 ++++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 5b97cecb3..79e0006cb 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -30,15 +30,15 @@ def get_scheduled_tasks(reconnect=True):
 
     # Reconnect Calibre database (metadata.db)
     if reconnect:
-        tasks.append(lambda: TaskReconnectDatabase())
+        tasks.append([lambda: TaskReconnectDatabase(), 'reconnect'])
 
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
-        tasks.append(lambda: TaskGenerateCoverThumbnails())
+        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers'])
 
     # Generate all missing series thumbnails
     if config.schedule_generate_series_covers:
-        tasks.append(lambda: TaskGenerateSeriesThumbnails())
+        tasks.append([lambda: TaskGenerateSeriesThumbnails(), 'generate book covers'])
 
     return tasks
 
@@ -63,7 +63,7 @@ def register_scheduled_tasks():
         # Register scheduled tasks
         if start != end:
             scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
-            scheduler.schedule(func=end_scheduled_tasks, trigger='cron', hour=end)
+            scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=end)
 
         # Kick-off tasks, if they should currently be running
         if should_task_be_running(start, end):
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index 415b29625..eee5b7cda 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -47,37 +47,37 @@ class BackgroundScheduler:
 
         return cls._instance
 
-    def schedule(self, func, trigger, **trigger_args):
+    def schedule(self, func, trigger, name=None, **trigger_args):
         if use_APScheduler:
-            return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+            return self.scheduler.add_job(func=func, trigger=trigger, name=name, **trigger_args)
 
     # Expects a lambda expression for the task
-    def schedule_task(self, task, user=None, trigger='cron', **trigger_args):
+    def schedule_task(self, task, user=None, name=None, trigger='cron', **trigger_args):
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
                 worker_task.scheduled = True
                 WorkerThread.add(user, worker_task)
-            return self.schedule(func=scheduled_task, trigger=trigger, **trigger_args)
+            return self.schedule(func=scheduled_task, trigger=trigger, name=name, **trigger_args)
 
     # Expects a list of lambda expressions for the tasks
     def schedule_tasks(self, tasks, user=None, trigger='cron', **trigger_args):
         if use_APScheduler:
             for task in tasks:
-                self.schedule_task(task, user=user, trigger=trigger, **trigger_args)
+                self.schedule_task(task[0], user=user, trigger=trigger, name=task[1], **trigger_args)
 
     # Expects a lambda expression for the task
-    def schedule_task_immediately(self, task, user=None):
+    def schedule_task_immediately(self, task, user=None, name=None):
         if use_APScheduler:
             def immediate_task():
                 WorkerThread.add(user, task())
-            return self.schedule(func=immediate_task, trigger='date')
+            return self.schedule(func=immediate_task, trigger='date', name=name)
 
     # Expects a list of lambda expressions for the tasks
     def schedule_tasks_immediately(self, tasks, user=None):
         if use_APScheduler:
             for task in tasks:
-                self.schedule_task_immediately(task, user)
+                self.schedule_task_immediately(task[0], user, name="immediately " + task[1])
 
     # Remove all jobs
     def remove_all_jobs(self):
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 00bd09ad2..3601ff93a 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -487,7 +487,10 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         return 'ThumbnailsClear'
 
     def __str__(self):
-        return "Delete Thumbnail cache directory"
+        if self.book_id > 0:
+            return "Delete Thumbnail cache for book " + str(self.book_id)
+        else:
+            return "Delete Thumbnail cache directory"
 
     @property
     def is_cancellable(self):

From f5b79930ad56f62281d7e173f23558178d55215b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 20 Mar 2022 20:02:57 +0100
Subject: [PATCH 211/412] Bugfix remember sort order of series and authors if
 entered from link below book cover (#2340)

---
 cps/templates/author.html    |  8 ++++----
 cps/templates/discover.html  |  6 +++---
 cps/templates/index.html     | 12 ++++++------
 cps/templates/languages.html |  2 +-
 cps/templates/search.html    |  6 +++---
 cps/templates/shelf.html     |  6 +++---
 cps/templates/shelfdown.html |  4 ++--
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/cps/templates/author.html b/cps/templates/author.html
index fc811368a..b691d3985 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -52,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_param='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='stored', 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 %}
@@ -60,7 +60,7 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <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>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
           {% for format in entry.data %}
@@ -71,7 +71,7 @@
         </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 )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
@@ -123,7 +123,7 @@
         </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 )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index bceb6a8ad..852d6210d 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -25,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_param='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='stored', 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 %}
@@ -33,13 +33,13 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <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>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', 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 )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
diff --git a/cps/templates/index.html b/cps/templates/index.html
index b69a92846..79ee29b6d 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -24,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_param='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='stored', 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 %}
@@ -32,13 +32,13 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <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>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', 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 )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
@@ -106,7 +106,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_param='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='stored') }}">{{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 %}
@@ -114,7 +114,7 @@
               {% 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_param='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='stored') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
           {% for format in entry.data %}
@@ -125,7 +125,7 @@
         </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 )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
diff --git a/cps/templates/languages.html b/cps/templates/languages.html
index 8331cb947..c83398d5f 100644
--- a/cps/templates/languages.html
+++ b/cps/templates/languages.html
@@ -23,7 +23,7 @@
     {% endif %}
     <div class="row" data-id="{{lang[0].name}}">
         <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{lang[1]}}</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[0].lang_code, data=data, sort_param='new')}}">{{lang[0].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[0].lang_code, data=data, sort_param='stored')}}">{{lang[0].name}}</a></div>
     </div>
   {% endfor %}
       </div>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index a7ba5e68a..4f8d607bb 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -61,7 +61,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_param='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='stored', 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 %}
@@ -69,7 +69,7 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <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>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
           {% for format in entry.Books.data %}
@@ -80,7 +80,7 @@
         </p>
         {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.Books.series[0].id )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
             {{entry.Books.series[0].name}}
           </a>
           ({{entry.Books.series_index|formatseriesindex}})
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 2e4cf906a..e5cb2ffbd 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -49,7 +49,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_param='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='stored', 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 %}
@@ -57,13 +57,13 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <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>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', 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 )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index 78f00b5ec..c800dca7b 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -38,7 +38,7 @@
         <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
           {% for author in entry.ordered_authors %}
-            <a href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
+            <a href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
@@ -46,7 +46,7 @@
         </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 )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index}})

From 0d49b56883dc525a8b687d84f070e29363625144 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 21 Mar 2022 18:50:02 +0100
Subject: [PATCH 212/412] Update gmail.json location

---
 README.md             | 2 +-
 cps/services/gmail.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d9c50f7f0..fb8bcd7fc 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 1. To avoid problems with already installed python dependencies, it's recommended to create a virtual environment for Calibre-Web
 2. Install Calibre-Web via pip with the command `pip install calibreweb` (Depending on your OS and or distro the command could also be `pip3`). 
 3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details 
-4. Calibre-Web can be started afterwards by typing `cps` or `python3 -m cps` 
+4. Calibre-Web can be started afterwards by typing `cps` 
 
 In the Wiki there are also examples for a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation) and for installation on [Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20)
 
diff --git a/cps/services/gmail.py b/cps/services/gmail.py
index ff36b3084..3a4eab7f9 100644
--- a/cps/services/gmail.py
+++ b/cps/services/gmail.py
@@ -25,7 +25,7 @@ from google.oauth2.credentials import Credentials
 from datetime import datetime
 import base64
 from flask_babel import gettext as _
-from ..constants import BASE_DIR
+from ..constants import CONFIG_DIR
 from .. import logger
 
 
@@ -53,11 +53,11 @@ def setup_gmail(token):
         if creds and creds.expired and creds.refresh_token:
             creds.refresh(Request())
         else:
-            cred_file = os.path.join(BASE_DIR, 'gmail.json')
+            cred_file = os.path.join(CONFIG_DIR, 'gmail.json')
             if not os.path.exists(cred_file):
                 raise Exception(_("Found no valid gmail.json file with OAuth information"))
             flow = InstalledAppFlow.from_client_secrets_file(
-                os.path.join(BASE_DIR, 'gmail.json'), SCOPES)
+                os.path.join(CONFIG_DIR, 'gmail.json'), SCOPES)
             creds = flow.run_local_server(port=0)
             user_info = get_user_info(creds)
         return {

From a6a8f7eb43ddf3d4a740288fdf73eb38d7adaa50 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 21 Mar 2022 19:33:57 +0100
Subject: [PATCH 213/412] Series Link in series view no longer clickable

---
 cps/templates/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cps/templates/index.html b/cps/templates/index.html
index 79ee29b6d..28807343e 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -125,9 +125,13 @@
         </p>
         {% if entry.series.__len__() > 0 %}
         <p class="series">
+        {% if page != "series" %}
           <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
+        {% else %}
+            <span>{{entry.series[0].name}}</span>
+        {% endif %}
           ({{entry.series_index|formatseriesindex}})
         </p>
         {% endif %}

From 504e58abdb2907663979daab8a395ddafbadfa23 Mon Sep 17 00:00:00 2001
From: Nicolas Ferrari <nferrari@alwaysdata.com>
Date: Tue, 22 Mar 2022 06:49:51 +0100
Subject: [PATCH 214/412] Installation on a Cloud Provider wiki link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb8bcd7fc..94be5b33f 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details 
 4. Calibre-Web can be started afterwards by typing `cps` 
 
-In the Wiki there are also examples for a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation) and for installation on [Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20)
+In the Wiki there are also examples for: a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation), [installation on Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20), [installation on a Cloud Provider](https://github.com/janeczku/calibre-web/wiki/How-To:-Install-Calibre-Web-on-a-Cloud-Provider).
 
 ## Quick start
 

From 2a5e9a97bbaeaa92f989374d47b531b01e8a6ad3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 24 Mar 2022 18:19:41 +0100
Subject: [PATCH 215/412] Fix #2349 (import error on python <3.7 dataclasses
 solved)

---
 cps/search_metadata.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index d72273f64..79e27554e 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -23,7 +23,7 @@ import json
 import os
 import sys
 # from time import time
-from dataclasses import asdict
+
 
 from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
@@ -32,7 +32,7 @@ from sqlalchemy.exc import InvalidRequestError, OperationalError
 from sqlalchemy.orm.attributes import flag_modified
 
 from cps.services.Metadata import Metadata
-from . import constants, get_locale, logger, ub
+from . import constants, get_locale, logger, ub, web_server
 
 # current_milli_time = lambda: int(round(time() * 1000))
 
@@ -40,6 +40,14 @@ meta = Blueprint("metadata", __name__)
 
 log = logger.create()
 
+try:
+    from dataclasses import asdict
+except ImportError:
+    log.info('*** "dataclasses" is needed for calibre-web to run. Please install it using pip: "pip install dataclasses" ***')
+    print('*** "dataclasses" is needed for calibre-web to run. Please install it using pip: "pip install dataclasses" ***')
+    web_server.stop(True)
+    sys.exit(6)
+
 new_list = list()
 meta_dir = os.path.join(constants.BASE_DIR, "cps", "metadata_provider")
 modules = os.listdir(os.path.join(constants.BASE_DIR, "cps", "metadata_provider"))

From 14a6e7c42c6d27369467a05986a82f16d73290f8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 25 Mar 2022 18:30:12 +0100
Subject: [PATCH 216/412] Deactivated several functions for kindle tolino and
 kobo. Opening books now working for ebook readers

---
 cps/admin.py                         |  2 +-
 cps/render_template.py               | 19 ++++++++++---------
 cps/templates/admin.html             |  4 +++-
 cps/templates/book_exists_flash.html |  4 ++--
 cps/templates/config_view_edit.html  |  2 ++
 cps/templates/discover.html          |  4 ++--
 cps/templates/email_edit.html        |  2 +-
 cps/templates/index.html             | 10 +++++-----
 cps/templates/layout.html            |  2 +-
 cps/templates/search.html            |  4 ++--
 cps/templates/shelf.html             |  4 ++--
 cps/templates/user_edit.html         |  4 ++--
 12 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 447e02279..1004ee785 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1493,7 +1493,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
             content.role &= ~constants.ROLE_ANONYMOUS
 
         val = [int(k[5:]) for k in to_save if k.startswith('show_')]
-        sidebar = get_sidebar_config()
+        sidebar, __ = get_sidebar_config()
         for element in sidebar:
             value = element['visibility']
             if value in val and not content.check_visibility(value):
diff --git a/cps/render_template.py b/cps/render_template.py
index 09a324978..911180491 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -16,7 +16,7 @@
 #  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 import render_template, request
 from flask_babel import gettext as _
 from flask import g
 from werkzeug.local import LocalProxy
@@ -30,6 +30,7 @@ log = logger.create()
 
 def get_sidebar_config(kwargs=None):
     kwargs = kwargs or []
+    simple = bool([e for e in ['kindle', 'tolino', "kobo"] if (e in request.headers.get('User-Agent', "").lower())])
     if 'content' in kwargs:
         content = kwargs['content']
         content = isinstance(content, (User, LocalProxy)) and not content.role_anonymous()
@@ -93,12 +94,12 @@ def get_sidebar_config(kwargs=None):
         {"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
+    if not simple:
+        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, simple
 
 def get_readbooks_ids():
     if not config.config_read_column:
@@ -116,7 +117,7 @@ def get_readbooks_ids():
 
 # 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,
+    sidebar, simple = get_sidebar_config(kwargs)
+    return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple,
                            accept=constants.EXTENSIONS_UPLOAD, read_book_ids=get_readbooks_ids(),
                            *args, **kwargs)
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 6cd7815e0..c8c6eb824 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -47,7 +47,9 @@
         {% endfor %}
       </table>
     {% endif %}
-        <a class="btn btn-default" id="admin_user_table" href="{{url_for('admin.edit_user_table')}}">{{_('Edit Users')}}</a>
+        {% if not simple %}
+          <a class="btn btn-default" id="admin_user_table" href="{{url_for('admin.edit_user_table')}}">{{_('Edit Users')}}</a>
+        {% endif %}
         <a class="btn btn-default" id="admin_new_user" href="{{url_for('admin.new_user')}}">{{_('Add New User')}}</a>
       {% 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>
diff --git a/cps/templates/book_exists_flash.html b/cps/templates/book_exists_flash.html
index b0855120d..b55192ce2 100644
--- a/cps/templates/book_exists_flash.html
+++ b/cps/templates/book_exists_flash.html
@@ -1,3 +1,3 @@
-<a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+<a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
 	<span class="title">{{entry.title|shortentitle}}</span>
-</a>
\ No newline at end of file
+</a>
diff --git a/cps/templates/config_view_edit.html b/cps/templates/config_view_edit.html
index 1dc02a5ea..e4fea44d7 100644
--- a/cps/templates/config_view_edit.html
+++ b/cps/templates/config_view_edit.html
@@ -162,8 +162,10 @@
             <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if conf.show_detail_random() %}checked{% endif %}>
             <label for="Show_detail_random">{{_('Show Random Books in Detail View')}}</label>
         </div>
+      {% if not simple %}
         <a href="#" id="get_tags" data-id="0" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied Tags')}}</a>
         <a href="#" id="get_column_values" data-id="0" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied custom column values')}}</a>
+      {% endif %}
       </div>
     </div>
   </div>
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 852d6210d..900dad8c1 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -7,7 +7,7 @@
     <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">
+          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
             <span class="img" title="{{entry.title}}">
               <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 %}
@@ -16,7 +16,7 @@
         {% endif %}
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index 9f23f78bf..2a8442099 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -69,7 +69,7 @@
    {% endif %}
       <a href="{{ url_for('admin.admin') }}" id="email_back" class="btn btn-default">{{_('Back')}}</a>
   </form>
-    {% if g.allow_registration %}
+    {% if g.allow_registration and not simple%}
   <div class="col-md-10 col-lg-6">
     <h2>{{_('Allowed Domains (Whitelist)')}}</h2>
     <form id="domain_add_allow" action="{{ url_for('admin.add_domain',allow=1)}}" method="POST">
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 28807343e..a4547705a 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -7,7 +7,7 @@
    {% 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">
+          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
               <span class="img" title="{{ entry.title }}">
                 <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 %}
@@ -15,7 +15,7 @@
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
@@ -24,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_param='stored', 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='stored', 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 %}
@@ -89,7 +89,7 @@
     {% 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">
+          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
             <span class="img" title="{{ entry.title }}">
               <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 %}
@@ -97,7 +97,7 @@
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 0d0df7785..46f03da1c 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -69,7 +69,7 @@
                     </form>
                   </li>
               {% endif %}
-              {% if not g.user.is_anonymous %}
+              {% if not g.user.is_anonymous and not simple%}
                 <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
               {% endif %}
               {% if g.user.role_admin() %}
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 4f8d607bb..77c01c80f 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -43,7 +43,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
         {% if entry.Books.has_cover is defined %}
-           <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+           <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
             <span class="img" title="{{entry.Books.title}}" >
                 <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}" />
                 {% if entry.Books.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
@@ -52,7 +52,7 @@
         {% endif %}
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{entry.Books.title}}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index e5cb2ffbd..a7b5bcf0d 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -32,7 +32,7 @@
     {% 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">
+            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
               <span class="img" title="{{entry.title}}" >
                 <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 %}
@@ -40,7 +40,7 @@
             </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index de7a4fb30..b489cbafa 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -83,7 +83,7 @@
           <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if content.show_detail_random() %}checked{% endif %}>
           <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 ) %}
+      {% if ( g.user and g.user.role_admin() and not new_user ) and not simple %}
       <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 %}
@@ -131,7 +131,7 @@
       </div>
     {% endif %}
   {% endif %}
-    {% if kobo_support and not content.role_anonymous() %}
+    {% if kobo_support and not content.role_anonymous() and not simple%}
     <div class="form-group">
       <input type="checkbox" name="kobo_only_shelves_sync" id="kobo_only_shelves_sync" {% if content.kobo_only_shelves_sync %}checked{% endif %}>
       <label for="kobo_only_shelves_sync">{{_('Sync only books in selected shelves with Kobo')}}</label>

From 32a3c45ee0f7e13bd61075f32a4dcebc415585a1 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 26 Mar 2022 19:35:56 +0100
Subject: [PATCH 217/412] Refactored load read status for web access and opds
 access Refactored and removed discover html page Bugfix show author Bugfix
 open dialog in author page Fix for #2341 (advanced search with linked read
 column and read column having a higher number than number of available custom
 columns)

---
 cps/db.py                               |   53 +-
 cps/opds.py                             |   68 +-
 cps/render_template.py                  |    6 +-
 cps/shelf.py                            |    2 +-
 cps/templates/author.html               |   32 +-
 cps/templates/discover.html             |   65 --
 cps/templates/feed.xml                  |   32 +-
 cps/templates/index.html                |   61 +-
 cps/templates/search.html               |    2 +-
 cps/templates/shelf.html                |   26 +-
 cps/templates/shelfdown.html            |   18 +-
 cps/web.py                              |  141 ++-
 test/Calibre-Web TestSummary_Linux.html | 1042 ++++++++++++++---------
 13 files changed, 846 insertions(+), 702 deletions(-)
 delete mode 100644 cps/templates/discover.html

diff --git a/cps/db.py b/cps/db.py
index f2fe9b78c..3b193e1ae 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -680,6 +680,25 @@ class CalibreDB:
         return and_(lang_filter, pos_content_tags_filter, ~neg_content_tags_filter,
                     pos_content_cc_filter, ~neg_content_cc_filter, archived_filter)
 
+    def generate_linked_query(self, config_read_column, database):
+        if not config_read_column:
+            query = (self.session.query(database, ub.ArchivedBook.is_archived, ub.ReadBook.read_status)
+                     .select_from(Books)
+                     .outerjoin(ub.ReadBook,
+                                and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id)))
+        else:
+            try:
+                read_column = cc_classes[config_read_column]
+                query = (self.session.query(database, ub.ArchivedBook.is_archived, read_column.value)
+                         .select_from(Books)
+                         .outerjoin(read_column, read_column.book == Books.id))
+            except (KeyError, AttributeError, IndexError):
+                log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column))
+                # Skip linking read column and return None instead of read status
+                query = self.session.query(database, None, ub.ArchivedBook.is_archived)
+        return query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
+                                                     int(current_user.id) == ub.ArchivedBook.user_id))
+
     @staticmethod
     def get_checkbox_sorted(inputlist, state, offset, limit, order, combo=False):
         outcome = list()
@@ -709,30 +728,14 @@ class CalibreDB:
                                            join_archive_read, config_read_column, *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)) \
-                .order_by(func.random()) \
-                .limit(self.config.config_random_books).all()
+            random_query = self.generate_linked_query(config_read_column, database)
+            randm = (random_query.filter(self.common_filters(allow_show_archived))
+                     .order_by(func.random())
+                     .limit(self.config.config_random_books).all())
         else:
             randm = false()
         if join_archive_read:
-            if not config_read_column:
-                query = (self.session.query(database, ub.ReadBook.read_status, ub.ArchivedBook.is_archived)
-                         .select_from(Books)
-                         .outerjoin(ub.ReadBook,
-                                    and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id)))
-            else:
-                try:
-                    read_column = cc_classes[config_read_column]
-                    query = (self.session.query(database, read_column.value, ub.ArchivedBook.is_archived)
-                             .select_from(Books)
-                             .outerjoin(read_column, read_column.book == Books.id))
-                except (KeyError, AttributeError, IndexError):
-                    log.error("Custom Column No.{} is not existing in calibre database".format(read_column))
-                    # Skip linking read column and return None instead of read status
-                    query = self.session.query(database, None, ub.ArchivedBook.is_archived)
-            query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
-                                                          int(current_user.id) == ub.ArchivedBook.user_id))
+            query = self.generate_linked_query(config_read_column, database)
         else:
             query = self.session.query(database)
         off = int(int(pagesize) * (page - 1))
@@ -830,21 +833,23 @@ class CalibreDB:
         authorterms = re.split("[, ]+", term)
         for authorterm in authorterms:
             q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + authorterm + "%")))
-        if not config_read_column:
+        query = self.generate_linked_query(config_read_column, Books)
+        '''if not config_read_column:
             query = (self.session.query(Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(Books)
                      .outerjoin(ub.ReadBook, and_(Books.id == ub.ReadBook.book_id,
                                                   int(current_user.id) == ub.ReadBook.user_id)))
         else:
             try:
                 read_column = cc_classes[config_read_column]
-                query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value).select_from(Books)
+                query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value)
+                         .select_from(Books)
                          .outerjoin(read_column, read_column.book == Books.id))
             except (KeyError, AttributeError, IndexError):
                 log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column))
                 # Skip linking read column
                 query = self.session.query(Books, ub.ArchivedBook.is_archived, None)
         query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
-                                                      int(current_user.id) == ub.ArchivedBook.user_id))
+                                                      int(current_user.id) == ub.ArchivedBook.user_id))'''
 
         if len(join) == 6:
             query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5])
diff --git a/cps/opds.py b/cps/opds.py
index 180fcacbf..702ffe1e7 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -26,7 +26,8 @@ from functools import wraps
 
 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_, any_, true
+from sqlalchemy.sql.expression import func, text, or_, and_, true
+from sqlalchemy.exc import InvalidRequestError, OperationalError
 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
@@ -108,7 +109,8 @@ def feed_letter_books(book_id):
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         letter,
-                                                        [db.Books.sort])
+                                                        [db.Books.sort],
+                                                        True, config.config_read_column)
 
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
@@ -118,15 +120,16 @@ def feed_letter_books(book_id):
 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), 0,
-                                                        db.Books, True, [db.Books.timestamp.desc()])
+                                                        db.Books, True, [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
 @opds.route("/opds/discover")
 @requires_basic_auth_if_no_ano
 def feed_discover():
-    entries = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).order_by(func.random())\
-        .limit(config.config_books_per_page)
+    query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+    entries = query.filter(calibre_db.common_filters()).order_by(func.random()).limit(config.config_books_per_page)
     pagination = Pagination(1, config.config_books_per_page, int(config.config_books_per_page))
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
@@ -137,7 +140,8 @@ 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), 0,
                                                         db.Books, db.Books.ratings.any(db.Ratings.rating > 9),
-                                                        [db.Books.timestamp.desc()])
+                                                        [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -150,11 +154,11 @@ def feed_hot():
     hot_books = all_books.offset(off).limit(config.config_books_per_page)
     entries = list()
     for book in hot_books:
-        download_book = calibre_db.get_book(book.Downloads.book_id)
+        query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+        download_book = query.filter(calibre_db.common_filters()).filter(
+            book.Downloads.book_id == db.Books.id).first()
         if download_book:
-            entries.append(
-                calibre_db.get_filtered_book(book.Downloads.book_id)
-            )
+            entries.append(download_book)
         else:
             ub.delete_download(book.Downloads.book_id)
     num_books = entries.__len__()
@@ -270,7 +274,8 @@ def feed_series(book_id):
     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])
+                                                        [db.Books.series_index],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -324,7 +329,8 @@ def feed_format(book_id):
     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()])
+                                                        [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -351,7 +357,8 @@ def feed_languages(book_id):
     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()])
+                                                        [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -381,13 +388,25 @@ def feed_shelf(book_id):
     result = list()
     # user is allowed to access shelf
     if shelf:
-        books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == book_id).order_by(
-            ub.BookShelf.order.asc()).all()
-        for book in books_in_shelf:
-            cur_book = calibre_db.get_book(book.book_id)
-            result.append(cur_book)
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(result))
+        result, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+                                                           config.config_books_per_page,
+                                                           db.Books,
+                                                           ub.BookShelf.shelf == shelf.id,
+                                                           [ub.BookShelf.order.asc()],
+                                                           True, config.config_read_column,
+                                                           ub.BookShelf, ub.BookShelf.book_id == db.Books.id)
+        # delete shelf 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) as e:
+                ub.session.rollback()
+                log.error_or_exception("Settings Database error: {}".format(e))
     return render_xml_template('feed.xml', entries=result, pagination=pagination)
 
 
@@ -451,8 +470,7 @@ def feed_search(term):
         entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column)
         entries_count = len(entries) if len(entries) > 0 else 1
         pagination = Pagination(1, entries_count, entries_count)
-        items = [entry[0] for entry in entries]
-        return render_xml_template('feed.xml', searchterm=term, entries=items, pagination=pagination)
+        return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
     else:
         return render_xml_template('feed.xml', searchterm="")
 
@@ -493,14 +511,16 @@ def render_xml_dataset(data_table, book_id):
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         getattr(db.Books, data_table.__tablename__).any(data_table.id == book_id),
-                                                        [db.Books.timestamp.desc()])
+                                                        [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
 def render_element_index(database_column, linked_table, folder):
     shift = 0
     off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'))
+    entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'), None, None)
+    # query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
     if linked_table is not None:
         entries = entries.join(linked_table).join(db.Books)
     entries = entries.filter(calibre_db.common_filters()).group_by(func.upper(func.substr(database_column, 1, 1))).all()
diff --git a/cps/render_template.py b/cps/render_template.py
index 911180491..1bc5454dd 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -101,7 +101,7 @@ def get_sidebar_config(kwargs=None):
              "show_text": _('Show Books List'), "config_show": content})
     return sidebar, simple
 
-def get_readbooks_ids():
+'''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()
@@ -113,11 +113,11 @@ def get_readbooks_ids():
             return frozenset([x.book for x in readBooks])
         except (KeyError, AttributeError, IndexError):
             log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-            return []
+            return []'''
 
 # Returns the template for rendering and includes the instance name
 def render_title_template(*args, **kwargs):
     sidebar, simple = get_sidebar_config(kwargs)
     return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple,
-                           accept=constants.EXTENSIONS_UPLOAD, read_book_ids=get_readbooks_ids(),
+                           accept=constants.EXTENSIONS_UPLOAD, # read_book_ids=get_readbooks_ids(),
                            *args, **kwargs)
diff --git a/cps/shelf.py b/cps/shelf.py
index 0bf12164f..35f2941d2 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -439,7 +439,7 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
                                                            db.Books,
                                                            ub.BookShelf.shelf == shelf_id,
                                                            [ub.BookShelf.order.asc()],
-                                                           False, 0,
+                                                           True, config.config_read_column,
                                                            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) \
diff --git a/cps/templates/author.html b/cps/templates/author.html
index b691d3985..f7aeb3e1f 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -31,23 +31,22 @@
       <a id="pub_old" data-toggle="tooltip" title="{{_('Sort according to publishing date, oldest first')}}" class="btn btn-primary{% if order == "pubold" %} active{% endif%}" 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 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) }}">
-            <span class="img" title="{{entry.title}}">
-              <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 %}
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+            <span class="img" title="{{entry.Books.title}}">
+              <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" />
+              {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
-          <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+          <p title="{{ entry.Books.title }}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -63,23 +62,23 @@
               <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
-          {% for format in entry.data %}
+          {% for format in entry.Books.data %}
             {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
             <span class="glyphicon glyphicon-music"></span>
             {% endif %}
           {% endfor %}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
-          ({{entry.series_index|formatseriesindex}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
-        {% if entry.ratings.__len__() > 0 %}
+        {% if entry.Books.ratings.__len__() > 0 %}
         <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+          {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}
           <span class="glyphicon glyphicon-star good"></span>
           {% if loop.last and loop.index < 5 %}
           {% for numer in range(5 - loop.index) %}
@@ -92,7 +91,6 @@
       </div>
     </div>
     {% endfor %}
-    {% endif %}
   </div>
 </div>
 
@@ -110,7 +108,7 @@
       <div class="meta">
         <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
-		  {% for author in entry.ordered_authors %}
+		  {% for author in entry.authors %}
 			{% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
 				<a class="author-name author-hidden" href="https://www.goodreads.com/author/show/{{ author.gid }}" target="_blank" rel="noopener">{{author.name.replace('|',',')}}</a>
 				{% if loop.last %}
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
deleted file mode 100644
index 900dad8c1..000000000
--- a/cps/templates/discover.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% extends "layout.html" %}
-{% block body %}
-<div class="discover load-more">
-  <h2>{{title}}</h2>
-  <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) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-            <span class="img" title="{{entry.title}}">
-              <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>
-      <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-          <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
-        </a>
-        <p class="author">
-          {% for author in entry.ordered_authors %}
-            {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
-              {% 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_param='stored', 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 %}
-            {% else %}
-              {% if not loop.first %}
-                <span>&amp;</span>
-              {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', 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='stored', 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)) %}
-            <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-empty"></span>
-              {% endfor %}
-            {% endif %}
-          {% endfor %}
-        </div>
-        {% endif %}
-      </div>
-    </div>
-    {% endfor %}
-  </div>
-</div>
-{% endblock %}
diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index 9073142ec..940fb0dac 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -40,35 +40,35 @@
   {% if entries and entries[0] %}
   {% for entry in entries %}
   <entry>
-    <title>{{entry.title}}</title>
-    <id>urn:uuid:{{entry.uuid}}</id>
-    <updated>{{entry.atom_timestamp}}</updated>
-    {% if entry.authors.__len__() > 0 %}
+    <title>{{entry.Books.title}}</title>
+    <id>urn:uuid:{{entry.Books.uuid}}</id>
+    <updated>{{entry.Books.atom_timestamp}}</updated>
+    {% if entry.Books.authors.__len__() > 0 %}
       <author>
-        <name>{{entry.authors[0].name}}</name>
+        <name>{{entry.Books.authors[0].name}}</name>
       </author>
     {% endif %}
-    {% if entry.publishers.__len__() > 0 %}
+    {% if entry.Books.publishers.__len__() > 0 %}
       <publisher>
-        <name>{{entry.publishers[0].name}}</name>
+        <name>{{entry.Books.publishers[0].name}}</name>
       </publisher>
     {% endif %}
-    {% for lang in entry.languages %}
+    {% for lang in entry.Books.languages %}
       <dcterms:language>{{lang.lang_code}}</dcterms:language>
     {% endfor %}
-    {% for tag in entry.tags %}
+    {% for tag in entry.Books.tags %}
     <category scheme="http://www.bisg.org/standards/bisac_subject/index.html"
               term="{{tag.name}}"
               label="{{tag.name}}"/>
     {% endfor %}
-    {% if entry.comments[0] %}<summary>{{entry.comments[0].text|striptags}}</summary>{% endif %}
-    {% if entry.has_cover %}
-    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image"/>
-    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image/thumbnail"/>
+    {% if entry.Books.comments[0] %}<summary>{{entry.Books.comments[0].text|striptags}}</summary>{% endif %}
+    {% if entry.Books.has_cover %}
+    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.Books.id)}}" rel="http://opds-spec.org/image"/>
+    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.Books.id)}}" rel="http://opds-spec.org/image/thumbnail"/>
     {% endif %}
-    {% for format in entry.data %}
-    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=format.format|lower)}}"
-          length="{{format.uncompressed_size}}" mtime="{{entry.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
+    {% for format in entry.Books.data %}
+    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.Books.id, book_format=format.format|lower)}}"
+          length="{{format.uncompressed_size}}" mtime="{{entry.Books.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
     {% endfor %}
   </entry>
   {% endfor %}
diff --git a/cps/templates/index.html b/cps/templates/index.html
index a4547705a..4cbf520ed 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -1,25 +1,25 @@
 {% extends "layout.html" %}
 {% block body %}
-{% if g.user.show_detail_random() %}
+{% if g.user.show_detail_random() and page != "discover" %}
 <div class="discover random-books">
   <h2 class="random-books">{{_('Discover (Random Books)')}}</h2>
   <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) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-              <span class="img" title="{{ entry.title }}">
-                <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 %}
+          <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+              <span class="img" title="{{ entry.Books.title }}">
+                <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}" />
+                {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-          <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+          <p title="{{entry.Books.title}}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -36,17 +36,17 @@
             {% endif %}
           {% endfor %}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
-          ({{entry.series_index|formatseriesindex}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
-        {% if entry.ratings.__len__() > 0 %}
+        {% if entry.Books.ratings.__len__() > 0 %}
         <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+          {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}
             <span class="glyphicon glyphicon-star good"></span>
             {% if loop.last and loop.index < 5 %}
               {% for numer in range(5 - loop.index) %}
@@ -64,6 +64,7 @@
 {% endif %}
 <div class="discover load-more">
   <h2 class="{{title}}">{{title}}</h2>
+   {% if page != 'discover' %}
     <div class="filterheader hidden-xs">
     {% if page == 'hot' %}
       <a data-toggle="tooltip" title="{{_('Sort ascending according to download count')}}" id="hot_asc" class="btn btn-primary{% if order == "hotasc" %} active{% endif%}" href="{{url_for('web.books_list', data=page, book_id=id, sort_param='hotasc')}}"><span class="glyphicon glyphicon-sort-by-order"></span></a>
@@ -83,25 +84,25 @@
       {% endif %}
     {% endif %}
     </div>
-
+   {% endif %}
   <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) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-            <span class="img" title="{{ entry.title }}">
-              <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 %}
+          <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+            <span class="img" title="{{ entry.Books.title }}">
+              <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}"/>
+              {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-          <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+          <p title="{{ entry.Books.title }}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -117,27 +118,27 @@
               <a class="author-name" href="{{url_for('web.books_list', data='author', book_id=author.id, sort_param='stored') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
-          {% for format in entry.data %}
+          {% for format in entry.Books.data %}
             {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
             <span class="glyphicon glyphicon-music"></span>
             {% endif %}
           {%endfor%}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
         {% if page != "series" %}
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
         {% else %}
-            <span>{{entry.series[0].name}}</span>
+            <span>{{entry.Books.series[0].name}}</span>
         {% endif %}
-          ({{entry.series_index|formatseriesindex}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
-        {% if entry.ratings.__len__() > 0 %}
+        {% if entry.Books.ratings.__len__() > 0 %}
         <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+          {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}
             <span class="glyphicon glyphicon-star good"></span>
             {% if loop.last and loop.index < 5 %}
               {% for numer in range(5 - loop.index) %}
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 77c01c80f..318d06f16 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -46,7 +46,7 @@
            <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
             <span class="img" title="{{entry.Books.title}}" >
                 <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}" />
-                {% if entry.Books.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+                {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
         {% endif %}
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index a7b5bcf0d..0e9b0bd52 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -32,19 +32,19 @@
     {% 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) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-              <span class="img" title="{{entry.title}}" >
-                <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 %}
+            <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+              <span class="img" title="{{entry.Books.title}}" >
+                <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}" />
+                {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-          <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+          <p title="{{entry.Books.title}}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -61,17 +61,17 @@
             {% endif %}
           {% endfor %}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
-          ({{entry.series_index|formatseriesindex}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
-        {% if entry.ratings.__len__() > 0 %}
+        {% if entry.Books.ratings.__len__() > 0 %}
         <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+          {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}
             <span class="glyphicon glyphicon-star good"></span>
             {% if loop.last and loop.index < 5 %}
               {% for numer in range(5 - loop.index) %}
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index c800dca7b..f1a0b1375 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -35,31 +35,31 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
 
       <div class="meta">
-        <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
+        <p title="{{entry.Books.title}}" class="title">{{entry.Books.title|shortentitle}}</p>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             <a href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
           {% endfor %}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
-          ({{entry.series_index}})
+          ({{entry.Books.series_index}})
         </p>
         {% endif %}
       </div>
 
 	  <div class="btn-group" role="group" aria-label="Download, send to Kindle, reading">
           {% if g.user.role_download() %}
-            {% if entry.data|length %}
+            {% if entry.Books.data|length %}
             <div class="btn-group" role="group">
-                {% 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">
+                {% for format in entry.Books.data %}
+                <a href="{{ url_for('web.download_link', book_id=entry.Books.id, book_format=format.format|lower, anyname=entry.Books.id|string+'.'+format.format|lower) }}" id="btnGroupDrop{{entry.Books.id}}{{format.format|lower}}" class="btn btn-primary" role="button">
                   <span class="glyphicon glyphicon-download"></span>{{format.format}} ({{ format.uncompressed_size|filesizeformat }})
                 </a>
                 {% endfor %}
diff --git a/cps/web.py b/cps/web.py
index d21ba6300..525fccbed 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -85,7 +85,10 @@ except ImportError:
 def add_security_headers(resp):
     csp = "default-src 'self'"
     csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
-    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:"
+    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' "
+    if request.path.startswith("/author/") and config.config_use_goodreads:
+        csp += "images.gr-assets.com i.gr-assets.com s.gr-assets.com"
+    csp += " data:"
     resp.headers['Content-Security-Policy'] = csp
     if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
         resp.headers['Content-Security-Policy'] += " *"
@@ -350,7 +353,7 @@ def render_books_list(data, sort_param, book_id, page):
     if data == "rated":
         return render_rated_books(page, book_id, order=order)
     elif data == "discover":
-        return render_discover_books(page, book_id)
+        return render_discover_books(book_id)
     elif data == "unread":
         return render_read_books(page, False, order=order)
     elif data == "read":
@@ -386,7 +389,7 @@ def render_books_list(data, sort_param, book_id, page):
     else:
         website = data or "newest"
         entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order[0],
-                                                                False, 0,
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -400,7 +403,7 @@ def render_rated_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.ratings.any(db.Ratings.rating > 9),
                                                                 order[0],
-                                                                False, 0,
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -411,11 +414,13 @@ def render_rated_books(page, book_id, order):
         abort(404)
 
 
-def render_discover_books(page, book_id):
+def render_discover_books(book_id):
     if current_user.check_visibility(constants.SIDEBAR_RANDOM):
-        entries, __, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, [func.randomblob(2)])
+        entries, __, ___ = calibre_db.fill_indexpage(1, 0, db.Books, True, [func.randomblob(2)],
+                                                            join_archive_read=True,
+                                                            config_read_column=config.config_read_column)
         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,
+        return render_title_template('index.html', random=false(), entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Discover (Random Books)"), page="discover")
     else:
         abort(404)
@@ -429,18 +434,22 @@ def render_hot_books(page, order):
             #        order[0][0].compare(func.count(ub.Downloads.book_id).asc())):
             order = [func.count(ub.Downloads.book_id).desc()], 'hotdesc'
         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)
+            random_query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+            random = (random_query.filter(calibre_db.common_filters())
+                     .order_by(func.random())
+                     .limit(config.config_random_books).all())
         else:
             random = false()
+
         off = int(int(config.config_books_per_page) * (page - 1))
         all_books = ub.session.query(ub.Downloads, func.count(ub.Downloads.book_id)) \
             .order_by(*order[0]).group_by(ub.Downloads.book_id)
         hot_books = all_books.offset(off).limit(config.config_books_per_page)
         entries = list()
         for book in hot_books:
-            download_book = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).filter(
-                db.Books.id == book.Downloads.book_id).first()
+            query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+            download_book = query.filter(calibre_db.common_filters()).filter(
+                book.Downloads.book_id == db.Books.id).first()
             if download_book:
                 entries.append(download_book)
             else:
@@ -459,26 +468,20 @@ def render_downloaded_books(page, order, user_id):
     else:
         user_id = current_user.id
     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,
+        entries, random, pagination = calibre_db.fill_indexpage(page,
                                                             0,
                                                             db.Books,
                                                             ub.Downloads.user_id == user_id,
                                                             order[0],
-                                                            False, 0,
+                                                            True, config.config_read_column,
                                                             db.books_series_link,
                                                             db.Books.id == db.books_series_link.c.book,
                                                             db.Series,
                                                             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)
+            if not (calibre_db.session.query(db.Books).filter(calibre_db.common_filters())
+                    .filter(db.Books.id == book.Books.id).first()):
+                ub.delete_download(book.Books.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
         return render_title_template('index.html',
                                      random=random,
@@ -497,9 +500,9 @@ def render_author_books(page, author_id, order):
                                                         db.Books,
                                                         db.Books.authors.any(db.Authors.id == author_id),
                                                         [order[0][0], db.Series.name, db.Books.series_index],
-                                                        False, 0,
+                                                        True, config.config_read_column,
                                                         db.books_series_link,
-                                                        db.Books.id == db.books_series_link.c.book,
+                                                        db.books_series_link.c.book == db.Books.id,
                                                         db.Series)
     if entries is None or not len(entries):
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
@@ -515,7 +518,8 @@ def render_author_books(page, author_id, order):
     other_books = []
     if services.goodreads_support and config.config_use_goodreads:
         author_info = services.goodreads_support.get_author_info(author_name)
-        other_books = services.goodreads_support.get_other_books(author_info, entries)
+        book_entries = [entry.Books for entry in entries]
+        other_books = services.goodreads_support.get_other_books(author_info, book_entries)
     return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
                                  title=_(u"Author: %(name)s", name=author_name), author=author_info,
                                  other_books=other_books, page="author", order=order[1])
@@ -528,7 +532,7 @@ def render_publisher_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.publishers.any(db.Publishers.id == book_id),
                                                                 [db.Series.name, order[0][0], db.Books.series_index],
-                                                                False, 0,
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -546,7 +550,8 @@ def render_series_books(page, book_id, order):
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
-                                                                [order[0][0]])
+                                                                [order[0][0]],
+                                                                True, config.config_read_column)
         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", order=order[1])
     else:
@@ -558,7 +563,8 @@ def render_ratings_books(page, book_id, order):
     entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                             db.Books,
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
-                                                            [order[0][0]])
+                                                            [order[0][0]],
+                                                            True, config.config_read_column)
     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)),
@@ -574,7 +580,8 @@ def render_formats_books(page, book_id, order):
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
-                                                                [order[0][0]])
+                                                                [order[0][0]],
+                                                                True, config.config_read_column)
         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",
@@ -590,7 +597,7 @@ def render_category_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.tags.any(db.Tags.id == book_id),
                                                                 [order[0][0], db.Series.name, db.Books.series_index],
-                                                                False, 0,
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -609,7 +616,8 @@ def render_language_books(page, name, order):
     entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
-                                                            [order[0][0]])
+                                                            [order[0][0]],
+                                                            True, config.config_read_column)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language", order=order[1])
 
@@ -622,30 +630,12 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                              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,
-                                                                sort_param,
-                                                                False, 0,
-                                                                db.books_series_link,
-                                                                db.Books.id == db.books_series_link.c.book,
-                                                                db.Series,
-                                                                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,
-                                                                    sort_param,
-                                                                    False, 0,
-                                                                    db.books_series_link,
-                                                                    db.Books.id == db.books_series_link.c.book,
-                                                                    db.Series,
-                                                                    db.cc_classes[config.config_read_column])
         except (KeyError, AttributeError, IndexError):
             log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             if not as_xml:
@@ -655,6 +645,15 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                 return redirect(url_for("web.index"))
             return []  # ToDo: Handle error Case for opds
 
+    entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                            db.Books,
+                                                            db_filter,
+                                                            sort_param,
+                                                            True, config.config_read_column,
+                                                            db.books_series_link,
+                                                            db.Books.id == db.books_series_link.c.book,
+                                                            db.Series)
+
     if as_xml:
         return entries, pagination
     else:
@@ -683,7 +682,7 @@ def render_archived_books(page, sort_param):
                                                                                 archived_filter,
                                                                                 order,
                                                                                 True,
-                                                                                False, 0)
+                                                                                True, config.config_read_column)
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     page_name = "archived"
@@ -723,7 +722,7 @@ def render_prepare_search_form(cc):
 
 
 def render_search_results(term, offset=None, order=None, limit=None):
-    join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
+    join = db.books_series_link, db.books_series_link.c.book == db.Books.id, db.Series
     entries, result_count, pagination = calibre_db.get_search_results(term,
                                                                       offset,
                                                                       order,
@@ -813,27 +812,8 @@ def list_books():
             books = calibre_db.search_query(search_param, config.config_read_column).all()
             filtered_count = len(books)
         else:
-            if not config.config_read_column:
-                books = (calibre_db.session.query(db.Books, ub.ReadBook.read_status, ub.ArchivedBook.is_archived)
-                         .select_from(db.Books)
-                         .outerjoin(ub.ReadBook,
-                                    and_(ub.ReadBook.user_id == int(current_user.id),
-                                         ub.ReadBook.book_id == db.Books.id)))
-            else:
-                read_column = ""
-                try:
-                    read_column = db.cc_classes[config.config_read_column]
-                    books = (calibre_db.session.query(db.Books, read_column.value, ub.ArchivedBook.is_archived)
-                             .select_from(db.Books)
-                             .outerjoin(read_column, read_column.book == db.Books.id))
-                except (KeyError, AttributeError, IndexError):
-                    log.error(
-                        "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-                    # Skip linking read column and return None instead of read status
-                    books = calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
-            books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                           int(current_user.id) == ub.ArchivedBook.user_id))
-                     .filter(calibre_db.common_filters(allow_show_archived=True)).all())
+            query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+            books = query.filter(calibre_db.common_filters(allow_show_archived=True)).all()
         entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True)
     elif search_param:
         entries, filtered_count, __ = calibre_db.get_search_results(search_param,
@@ -856,8 +836,8 @@ def list_books():
     result = list()
     for entry in entries:
         val = entry[0]
-        val.read_status = entry[1] == ub.ReadBook.STATUS_FINISHED
-        val.is_archived = entry[2] is True
+        val.is_archived = entry[1] is True
+        val.read_status = entry[2] == ub.ReadBook.STATUS_FINISHED
         for lang_index in range(0, len(val.languages)):
             val.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), val.languages[
                 lang_index].lang_code)
@@ -1254,24 +1234,25 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
 
     cc = get_cc_columns(filter_config_custom_read=True)
     calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
-    if not config.config_read_column:
+    query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+    '''if not config.config_read_column:
         query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(db.Books)
                  .outerjoin(ub.ReadBook, and_(db.Books.id == ub.ReadBook.book_id,
                                               int(current_user.id) == ub.ReadBook.user_id)))
     else:
         try:
-            read_column = cc[config.config_read_column]
+            read_column = db.cc_classes[config.config_read_column]
             query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
-                     .select_from(db.Books)
-                     .outerjoin(read_column, read_column.book == db.Books.id))
+                    .select_from(db.Books)
+                    .outerjoin(read_column, read_column.book == db.Books.id))
         except (KeyError, AttributeError, IndexError):
             log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             # Skip linking read column
             query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
     query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                  int(current_user.id) == ub.ArchivedBook.user_id))
+                                                  int(current_user.id) == ub.ArchivedBook.user_id))'''
 
-    q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book) \
+    q = query.outerjoin(db.books_series_link, db.books_series_link.c.book == db.Books.id) \
         .outerjoin(db.Series) \
         .filter(calibre_db.common_filters(True))
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 7be8da35b..4427548ab 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-19 22:04:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-26 21:40:01</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>2022-03-20 02:50:09</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-27 04:18: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>3h 58 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 50 min</p>
         </div>
       </div>
       </div>
@@ -891,11 +891,11 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooks</td>
         <td class="text-center">36</td>
-        <td class="text-center">35</td>
-        <td class="text-center">0</td>
+        <td class="text-center">34</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -1237,11 +1237,31 @@
     
     
     
-        <tr id='pt11.36' class='hiddenRow bg-success'>
+        <tr id="ft11.36" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.36')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.36" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.36').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 799, in test_upload_cover_hdd
+    self.assertFalse(self.check_element_on_page((By.CLASS_NAME, &#34;alert&#34;)))
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;53d4d98b-a28b-426d-b0d6-c6ad1500540a&#34;, element=&#34;e0d0a1a6-960e-41c3-9639-bbda2c2be4d5&#34;)&gt; is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1589,8 +1609,8 @@
     <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">16</td>
-        <td class="text-center">4</td>
+        <td class="text-center">18</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1735,31 +1755,11 @@
     
     
     
-        <tr id="ft16.16" class="none bg-danger">
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.16')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 145, in test_edit_title
-    self.assertTrue(self.check_element_on_page((By.ID, &#39;flash_success&#39;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1833,31 +1833,11 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
     
     
-        <tr id="ft16.20" class="none bg-danger">
+        <tr id='pt16.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 937, in test_watch_metadata
-    self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=34e51cc2-2413-4a23-8324-26d568a421ba&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2031,11 +2011,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestErrorReadColumn</td>
         <td class="text-center">2</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</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">
@@ -2054,11 +2034,87 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id="ft21.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 46, in test_invalid_custom_read_column
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</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('c22', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et22.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_error_read_column)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et22.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et22.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 33, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2072,13 +2128,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2087,19 +2143,19 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="st22.2" class="none bg-warning">
+        <tr id="st23.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st22.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st23.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_st22.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st23.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2113,7 +2169,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2131,13 +2187,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 1)">Detail</a>
+            <a onclick="showClassDetail('c24', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2147,43 +2203,113 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 3)">Detail</a>
+            <a onclick="showClassDetail('c25', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id="ft25.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 96, in test_author_page
+    self.assertTrue(self.check_element_on_page((By.CLASS_NAME, &#34;author-photo&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id="et25.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.2" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 61, in test_author_page_invalid
+    self.fill_basic_config({&#39;config_goodreads_api_key&#39;: &#39;rgg&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id="ft25.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 113, in test_goodreads_about
+    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2197,13 +2323,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 11)">Detail</a>
+            <a onclick="showClassDetail('c26', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2212,7 +2338,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2221,7 +2347,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2230,7 +2356,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2239,7 +2365,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2248,7 +2374,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2257,7 +2383,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2266,7 +2392,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2275,7 +2401,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2284,7 +2410,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2293,7 +2419,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2311,13 +2437,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 5)">Detail</a>
+            <a onclick="showClassDetail('c27', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2326,7 +2452,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2335,7 +2461,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2344,7 +2470,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2353,7 +2479,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2371,13 +2497,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 13)">Detail</a>
+            <a onclick="showClassDetail('c28', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2386,7 +2512,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2395,7 +2521,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2404,7 +2530,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2413,7 +2539,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2422,7 +2548,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2431,7 +2557,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2440,7 +2566,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2449,7 +2575,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2458,7 +2584,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2467,7 +2593,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2476,7 +2602,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2485,7 +2611,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2495,21 +2621,21 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestCalibreWebListOrders</td>
+        <td class="text-center">10</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">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 8)">Detail</a>
+            <a onclick="showClassDetail('c29', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2518,7 +2644,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2527,7 +2653,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2536,7 +2662,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2545,7 +2671,67 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id="ft29.5" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 394, in test_order_authors_all_links
+    self.assertEqual(books[1][0][&#39;title&#39;], &#34;testbook&#34;)
+AssertionError: &#39;Very long extra super turbo cool title without any issue of ...&#39; != &#39;testbook&#39;
+- Very long extra super turbo cool title without any issue of ...
++ testbook</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et29.6" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et29.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et29.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 382, in test_order_series_all_links
+    author_books[1][0][&#39;series_ele&#39;].click()
+KeyError: &#39;series_ele&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2554,7 +2740,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2563,7 +2749,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2572,7 +2758,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2590,13 +2776,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 9)">Detail</a>
+            <a onclick="showClassDetail('c30', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2605,7 +2791,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2614,7 +2800,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2623,7 +2809,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2632,19 +2818,19 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="st29.5" class="none bg-warning">
+        <tr id="st30.5" 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_st29.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st29.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st30.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_st29.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st30.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2658,7 +2844,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2667,7 +2853,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2676,7 +2862,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2685,7 +2871,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2703,13 +2889,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 15)">Detail</a>
+            <a onclick="showClassDetail('c31', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2718,7 +2904,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2727,7 +2913,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2736,7 +2922,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2745,7 +2931,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2754,7 +2940,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2763,7 +2949,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2772,7 +2958,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2781,7 +2967,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2790,7 +2976,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2799,7 +2985,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2808,7 +2994,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2817,7 +3003,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2826,7 +3012,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2835,7 +3021,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2845,72 +3031,8 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</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('c31', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et31.1" class="none bg-info">
-            <td>
-                <div class='testcase'>setUpClass (test_merge_books_list)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et31.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et31.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et31.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 24, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 175, in startup
-    inst.driver = webdriver.Firefox()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/firefox/webdriver.py&#34;, line 178, in __init__
-    RemoteWebDriver.__init__(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 269, in __init__
-    self.start_session(capabilities, browser_profile)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in start_session
-    response = self.execute(Command.NEW_SESSION, parameters)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.WebDriverException: Message: Process unexpectedly closed with status 0
-
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 28, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
     <tr id="su" class="passClass">
-        <td>TestOAuthLogin</td>
+        <td>TestMergeBooksList</td>
         <td class="text-center">2</td>
         <td class="text-center">2</td>
         <td class="text-center">0</td>
@@ -2925,7 +3047,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
         <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
+                <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2933,6 +3055,39 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
         <tr id='pt32.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestMergeBooksList - test_delete_book</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('c33', 2)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt33.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='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2950,13 +3105,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 23)">Detail</a>
+            <a onclick="showClassDetail('c34', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2965,7 +3120,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2974,7 +3129,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2983,7 +3138,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2992,7 +3147,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3001,7 +3156,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3010,7 +3165,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3019,7 +3174,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3028,7 +3183,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id='pt34.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3037,7 +3192,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.10' class='hiddenRow bg-success'>
+        <tr id='pt34.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3046,7 +3201,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.11' class='hiddenRow bg-success'>
+        <tr id='pt34.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3055,7 +3210,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id='pt34.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3064,7 +3219,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id='pt34.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3073,7 +3228,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.14' class='hiddenRow bg-success'>
+        <tr id='pt34.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3082,7 +3237,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.15' class='hiddenRow bg-success'>
+        <tr id='pt34.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3091,7 +3246,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.16' class='hiddenRow bg-success'>
+        <tr id='pt34.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3100,7 +3255,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id='pt34.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3109,7 +3264,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.18' class='hiddenRow bg-success'>
+        <tr id='pt34.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3118,7 +3273,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.19' class='hiddenRow bg-success'>
+        <tr id='pt34.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3127,7 +3282,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.20' class='hiddenRow bg-success'>
+        <tr id='pt34.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3136,7 +3291,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.21' class='hiddenRow bg-success'>
+        <tr id='pt34.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3145,7 +3300,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.22' class='hiddenRow bg-success'>
+        <tr id='pt34.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3154,7 +3309,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.23' class='hiddenRow bg-success'>
+        <tr id='pt34.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3172,13 +3327,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 1)">Detail</a>
+            <a onclick="showClassDetail('c35', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3196,13 +3351,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3211,7 +3366,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3220,7 +3375,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3229,7 +3384,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3238,7 +3393,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3256,13 +3411,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3280,13 +3435,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3304,13 +3459,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3319,7 +3474,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3328,7 +3483,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3337,7 +3492,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3346,7 +3501,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3355,7 +3510,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3364,7 +3519,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3373,7 +3528,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3391,13 +3546,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3406,7 +3561,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3415,7 +3570,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3433,13 +3588,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3448,7 +3603,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3457,7 +3612,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3466,7 +3621,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3475,7 +3630,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3484,7 +3639,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3493,7 +3648,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3502,7 +3657,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3511,7 +3666,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3520,7 +3675,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3529,7 +3684,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3538,7 +3693,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3547,7 +3702,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3556,19 +3711,19 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id="st40.14" class="none bg-warning">
+        <tr id="st41.14" 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_st40.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st40.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3582,7 +3737,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3591,7 +3746,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3609,13 +3764,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 9)">Detail</a>
+            <a onclick="showClassDetail('c42', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3624,7 +3779,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3633,7 +3788,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3642,7 +3797,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3651,7 +3806,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3660,7 +3815,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3669,19 +3824,19 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id="st41.7" class="none bg-warning">
+        <tr id="st42.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_st41.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.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_st41.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3695,7 +3850,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3704,7 +3859,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3722,13 +3877,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 4)">Detail</a>
+            <a onclick="showClassDetail('c43', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -3737,7 +3892,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -3746,7 +3901,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3755,7 +3910,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3773,13 +3928,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 18)">Detail</a>
+            <a onclick="showClassDetail('c44', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3788,7 +3943,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3797,7 +3952,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3806,7 +3961,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3815,7 +3970,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3824,7 +3979,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3833,7 +3988,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3842,7 +3997,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3851,7 +4006,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3860,7 +4015,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3869,7 +4024,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3878,7 +4033,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3887,7 +4042,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3896,7 +4051,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3905,7 +4060,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3914,7 +4069,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3923,7 +4078,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3932,7 +4087,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3950,13 +4105,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 1)">Detail</a>
+            <a onclick="showClassDetail('c45', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3974,13 +4129,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 21)">Detail</a>
+            <a onclick="showClassDetail('c46', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3989,7 +4144,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3998,7 +4153,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4007,7 +4162,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4016,7 +4171,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4025,7 +4180,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4034,7 +4189,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4043,7 +4198,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4052,7 +4207,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4061,7 +4216,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4070,7 +4225,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4079,7 +4234,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4088,7 +4243,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4097,7 +4252,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4106,7 +4261,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4115,7 +4270,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4124,7 +4279,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4133,7 +4288,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4142,7 +4297,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4151,7 +4306,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4160,7 +4315,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4170,21 +4325,21 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestCalibreWebVisibilitys</td>
-        <td class="text-center">34</td>
-        <td class="text-center">34</td>
-        <td class="text-center">0</td>
+        <td class="text-center">35</td>
+        <td class="text-center">33</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 34)">Detail</a>
+            <a onclick="showClassDetail('c47', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4193,7 +4348,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4202,7 +4357,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4211,7 +4366,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4220,7 +4375,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4229,7 +4384,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4238,7 +4393,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4247,7 +4402,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4256,7 +4411,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4265,7 +4420,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4274,7 +4429,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4283,7 +4438,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4292,7 +4447,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4301,7 +4456,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4310,7 +4465,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4319,7 +4474,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4328,7 +4483,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4337,7 +4492,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4346,7 +4501,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4355,7 +4510,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4364,7 +4519,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4373,7 +4528,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.22' class='hiddenRow bg-success'>
+        <tr id='pt47.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4382,7 +4537,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.23' class='hiddenRow bg-success'>
+        <tr id='pt47.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4391,16 +4546,36 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.24' class='hiddenRow bg-success'>
+        <tr id="ft47.24" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft47.24')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft47.24" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft47.24').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 814, in test_link_column_to_read_status
+    self.assertTrue(author[1][0][&#39;read&#39;])
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.25' class='hiddenRow bg-success'>
+        <tr id='pt47.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4409,7 +4584,36 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.26' class='hiddenRow bg-success'>
+        <tr id="ft47.26" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft47.26')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft47.26" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft47.26').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 898, in test_read_status_visible
+    self.assertEqual(len(list_element[1]), 1)
+AssertionError: 0 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt47.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4418,7 +4622,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.27' class='hiddenRow bg-success'>
+        <tr id='pt47.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4427,7 +4631,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.28' class='hiddenRow bg-success'>
+        <tr id='pt47.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4436,7 +4640,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.29' class='hiddenRow bg-success'>
+        <tr id='pt47.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4445,7 +4649,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.30' class='hiddenRow bg-success'>
+        <tr id='pt47.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4454,7 +4658,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.31' class='hiddenRow bg-success'>
+        <tr id='pt47.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4463,7 +4667,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.32' class='hiddenRow bg-success'>
+        <tr id='pt47.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4472,7 +4676,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.33' class='hiddenRow bg-success'>
+        <tr id='pt47.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4481,7 +4685,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.34' class='hiddenRow bg-success'>
+        <tr id='pt47.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4499,13 +4703,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 16)">Detail</a>
+            <a onclick="showClassDetail('c48', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4514,7 +4718,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4523,7 +4727,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4532,7 +4736,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4541,7 +4745,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4550,7 +4754,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4559,7 +4763,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4568,7 +4772,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4577,7 +4781,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4586,7 +4790,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4595,7 +4799,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4604,7 +4808,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4613,7 +4817,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4622,7 +4826,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4631,7 +4835,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4640,7 +4844,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4651,10 +4855,10 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>404</td>
-        <td>393</td>
-        <td>4</td>
-        <td>1</td>
+        <td>409</td>
+        <td>391</td>
+        <td>9</td>
+        <td>3</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4683,7 +4887,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-35-generic #40~20.04.1-Ubuntu SMP Mon Mar 7 09:18:32 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-37-generic #42~20.04.1-Ubuntu SMP Tue Mar 15 15:44:28 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4761,7 +4965,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>Jinja2</th>
-              <td>3.0.3</td>
+              <td>3.1.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4785,7 +4989,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>pytz</th>
-              <td>2021.3</td>
+              <td>2022.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4827,7 +5031,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4857,7 +5061,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4887,7 +5091,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4929,7 +5133,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4965,7 +5169,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5007,7 +5211,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5097,7 +5301,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
 </div>
 
 <script>
-    drawCircle(393, 4, 1, 6);
+    drawCircle(391, 9, 3, 6);
     showCase(5);
 </script>
 

From 2f949ce1dda03d4c65016547489c79a9e415be01 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 27 Mar 2022 14:07:58 +0200
Subject: [PATCH 218/412] Enabled search for text based custom column content
 in simple search (fix for #2279)

---
 cps/db.py     | 75 +++++++++++++++++++++++++++------------------------
 cps/helper.py | 18 -------------
 cps/opds.py   |  2 +-
 cps/web.py    | 39 ++++++++-------------------
 4 files changed, 52 insertions(+), 82 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 3b193e1ae..3f64fbb58 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -819,38 +819,21 @@ class CalibreDB:
     def check_exists_book(self, authr, title):
         self.session.connection().connection.connection.create_function("lower", 1, lcase)
         q = list()
-        authorterms = re.split(r'\s*&\s*', authr)
-        for authorterm in authorterms:
-            q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + authorterm + "%")))
+        author_terms = re.split(r'\s*&\s*', authr)
+        for author_term in author_terms:
+            q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + author_term + "%")))
 
         return self.session.query(Books) \
             .filter(and_(Books.authors.any(and_(*q)), func.lower(Books.title).ilike("%" + title + "%"))).first()
 
-    def search_query(self, term, config_read_column, *join):
+    def search_query(self, term, config, *join):
         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 + "%")))
-        query = self.generate_linked_query(config_read_column, Books)
-        '''if not config_read_column:
-            query = (self.session.query(Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(Books)
-                     .outerjoin(ub.ReadBook, and_(Books.id == ub.ReadBook.book_id,
-                                                  int(current_user.id) == ub.ReadBook.user_id)))
-        else:
-            try:
-                read_column = cc_classes[config_read_column]
-                query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value)
-                         .select_from(Books)
-                         .outerjoin(read_column, read_column.book == Books.id))
-            except (KeyError, AttributeError, IndexError):
-                log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column))
-                # Skip linking read column
-                query = self.session.query(Books, ub.ArchivedBook.is_archived, None)
-        query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
-                                                      int(current_user.id) == ub.ArchivedBook.user_id))'''
-
+        author_terms = re.split("[, ]+", term)
+        for author_term in author_terms:
+            q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + author_term + "%")))
+        query = self.generate_linked_query(config.config_read_column, Books)
         if len(join) == 6:
             query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5])
         if len(join) == 3:
@@ -859,20 +842,42 @@ class CalibreDB:
             query = query.outerjoin(join[0], join[1])
         elif len(join) == 1:
             query = query.outerjoin(join[0])
-        return query.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 + "%")
-                ))
+
+        cc = self.get_cc_columns(config, filter_config_custom_read=True)
+        filter_expression = [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 + "%")]
+        for c in cc:
+            if c.datatype not in ["datetime", "rating", "bool", "int", "float"]:
+                filter_expression.append(
+                    getattr(Books,
+                            'custom_column_' + str(c.id)).any(
+                        func.lower(cc_classes[c.id].value).ilike("%" + term + "%")))
+        return query.filter(self.common_filters(True)).filter(or_(*filter_expression))
+
+    def get_cc_columns(self, config, filter_config_custom_read=False):
+        tmp_cc = self.session.query(CustomColumns).filter(CustomColumns.datatype.notin_(cc_exceptions)).all()
+        cc = []
+        r = None
+        if config.config_columns_to_ignore:
+            r = re.compile(config.config_columns_to_ignore)
+
+        for col in tmp_cc:
+            if filter_config_custom_read and config.config_read_column and config.config_read_column == col.id:
+                continue
+            if r and r.match(col.name):
+                continue
+            cc.append(col)
+
+        return cc
 
     # read search results from calibre-database and return it (function is used for feed and simple search
-    def get_search_results(self, term, offset=None, order=None, limit=None,
-                           config_read_column=False, *join):
+    def get_search_results(self, term, config, offset=None, order=None, limit=None, *join):
         order = order[0] if order else [Books.sort]
         pagination = None
-        result = self.search_query(term, config_read_column, *join).order_by(*order).all()
+        result = self.search_query(term, config, *join).order_by(*order).all()
         result_count = len(result)
         if offset != None and limit != None:
             offset = int(offset)
diff --git a/cps/helper.py b/cps/helper.py
index 3a2276e92..765cf22b8 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -953,24 +953,6 @@ def check_valid_domain(domain_text):
     return not len(result)
 
 
-def get_cc_columns(filter_config_custom_read=False):
-    tmpcc = calibre_db.session.query(db.CustomColumns)\
-        .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
-    cc = []
-    r = None
-    if config.config_columns_to_ignore:
-        r = re.compile(config.config_columns_to_ignore)
-
-    for col in tmpcc:
-        if filter_config_custom_read and config.config_read_column and config.config_read_column == col.id:
-            continue
-        if r and r.match(col.name):
-            continue
-        cc.append(col)
-
-    return cc
-
-
 def get_download_link(book_id, book_format, client):
     book_format = book_format.split(".")[0]
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
diff --git a/cps/opds.py b/cps/opds.py
index 702ffe1e7..8907f6287 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -467,7 +467,7 @@ def feed_unread_books():
 
 def feed_search(term):
     if term:
-        entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column)
+        entries, __, ___ = calibre_db.get_search_results(term, config=config)
         entries_count = len(entries) if len(entries) > 0 else 1
         pagination = Pagination(1, entries_count, entries_count)
         return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
diff --git a/cps/web.py b/cps/web.py
index 525fccbed..e8bf48e35 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,7 +50,7 @@ from . import babel, db, ub, config, get_locale, app
 from . import calibre_db, kobo_sync_status
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
 from .helper import check_valid_domain, render_task_status, check_email, check_username, \
-    get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
+    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, valid_email, \
     edit_book_read_status
 from .pagination import Pagination
@@ -724,10 +724,10 @@ def render_prepare_search_form(cc):
 def render_search_results(term, offset=None, order=None, limit=None):
     join = db.books_series_link, db.books_series_link.c.book == db.Books.id, db.Series
     entries, result_count, pagination = calibre_db.get_search_results(term,
+                                                                      config,
                                                                       offset,
                                                                       order,
                                                                       limit,
-                                                                      config.config_read_column,
                                                                       *join)
     return render_title_template('search.html',
                                  searchterm=term,
@@ -765,7 +765,7 @@ def books_list(data, sort_param, book_id, page):
 @login_required
 def books_table():
     visibility = current_user.view_settings.get('table', {})
-    cc = get_cc_columns(filter_config_custom_read=True)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
     return render_title_template('book_table.html', title=_(u"Books List"), cc=cc, page="book_table",
                                  visiblility=visibility)
 
@@ -809,7 +809,7 @@ def list_books():
         calibre_db.common_filters(allow_show_archived=True)).count()
     if state is not None:
         if search_param:
-            books = calibre_db.search_query(search_param, config.config_read_column).all()
+            books = calibre_db.search_query(search_param, config).all()
             filtered_count = len(books)
         else:
             query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
@@ -817,10 +817,10 @@ def list_books():
         entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True)
     elif search_param:
         entries, filtered_count, __ = calibre_db.get_search_results(search_param,
+                                                                    config,
                                                                     off,
                                                                     [order, ''],
                                                                     limit,
-                                                                    config.config_read_column,
                                                                     *join)
     else:
         entries, __, __ = calibre_db.fill_indexpage_with_archived_books((int(off) / (int(limit)) + 1),
@@ -1232,26 +1232,9 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     sort_param = order[0] if order else [db.Books.sort]
     pagination = None
 
-    cc = get_cc_columns(filter_config_custom_read=True)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
     calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
     query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
-    '''if not config.config_read_column:
-        query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(db.Books)
-                 .outerjoin(ub.ReadBook, and_(db.Books.id == ub.ReadBook.book_id,
-                                              int(current_user.id) == ub.ReadBook.user_id)))
-    else:
-        try:
-            read_column = db.cc_classes[config.config_read_column]
-            query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
-                    .select_from(db.Books)
-                    .outerjoin(read_column, read_column.book == db.Books.id))
-        except (KeyError, AttributeError, IndexError):
-            log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-            # Skip linking read column
-            query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
-    query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                  int(current_user.id) == ub.ArchivedBook.user_id))'''
-
     q = query.outerjoin(db.books_series_link, db.books_series_link.c.book == db.Books.id) \
         .outerjoin(db.Series) \
         .filter(calibre_db.common_filters(True))
@@ -1338,7 +1321,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         if description:
             q = q.filter(db.Books.comments.any(func.lower(db.Comments.text).ilike("%" + description + "%")))
 
-        # search custom culumns
+        # search custom columns
         try:
             q = adv_search_custom_columns(cc, term, q)
         except AttributeError as ex:
@@ -1370,7 +1353,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
 @login_required_if_no_ano
 def advanced_search_form():
     # Build custom columns names
-    cc = get_cc_columns(filter_config_custom_read=True)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
     return render_prepare_search_form(cc)
 
 
@@ -1757,10 +1740,10 @@ def show_book(book_id):
         for lang_index in range(0, len(entry.languages)):
             entry.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), entry.languages[
                 lang_index].lang_code)
-        cc = get_cc_columns(filter_config_custom_read=True)
+        cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
         book_in_shelves = []
-        shelfs = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all()
-        for sh in shelfs:
+        shelves = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all()
+        for sh in shelves:
             book_in_shelves.append(sh.shelf)
 
         entry.tags = sort(entry.tags, key=lambda tag: tag.name)

From baffe1f5377cd2d6bf1a53b59eef1f7aadda0f9a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 28 Mar 2022 13:58:41 +0200
Subject: [PATCH 219/412] Plus ("+" vs. "%2B") encoded search strings for opds
 search feeds are now working in request string (fix for #2175)

---
 cps/gevent_wsgi.py                      |  29 +
 cps/opds.py                             |   2 +-
 cps/server.py                           |  10 +-
 cps/tornado_wsgi.py                     |  94 +++
 test/Calibre-Web TestSummary_Linux.html | 938 ++++++++----------------
 5 files changed, 445 insertions(+), 628 deletions(-)
 create mode 100644 cps/gevent_wsgi.py
 create mode 100644 cps/tornado_wsgi.py

diff --git a/cps/gevent_wsgi.py b/cps/gevent_wsgi.py
new file mode 100644
index 000000000..b044f31b7
--- /dev/null
+++ b/cps/gevent_wsgi.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 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 gevent.pywsgi import WSGIHandler
+
+class MyWSGIHandler(WSGIHandler):
+    def get_environ(self):
+        env = super().get_environ()
+        path, __ = self.path.split('?', 1) if '?' in self.path else (self.path, '')
+        env['RAW_URI'] = path
+        return env
+
+
diff --git a/cps/opds.py b/cps/opds.py
index 8907f6287..cb8f397e0 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -85,7 +85,7 @@ def feed_osd():
 @requires_basic_auth_if_no_ano
 def feed_cc_search(query):
     # Handle strange query from Libera Reader with + instead of spaces
-    plus_query = unquote_plus(request.base_url.split('/opds/search/')[1]).strip()
+    plus_query = unquote_plus(request.environ['RAW_URI'].split('/opds/search/')[1]).strip()
     return feed_search(plus_query)
 
 
diff --git a/cps/server.py b/cps/server.py
index e261c50a2..0ffdbd18c 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -25,6 +25,7 @@ import subprocess  # nosec
 
 try:
     from gevent.pywsgi import WSGIServer
+    from .gevent_wsgi import MyWSGIHandler
     from gevent.pool import Pool
     from gevent import __version__ as _version
     from greenlet import GreenletExit
@@ -32,7 +33,7 @@ try:
     VERSION = 'Gevent ' + _version
     _GEVENT = True
 except ImportError:
-    from tornado.wsgi import WSGIContainer
+    from .tornado_wsgi import MyWSGIContainer
     from tornado.httpserver import HTTPServer
     from tornado.ioloop import IOLoop
     from tornado import version as _version
@@ -202,7 +203,8 @@ class WebServer(object):
             if output is None:
                 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)
+            self.wsgiserver = WSGIServer(sock, self.app, log=self.access_logger, handler_class=MyWSGIHandler,
+                                         spawn=Pool(), **ssl_args)
             if ssl_args:
                 wrap_socket = self.wsgiserver.wrap_socket
                 def my_wrap_socket(*args, **kwargs):
@@ -225,8 +227,8 @@ class WebServer(object):
             asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
         log.info('Starting Tornado server on %s', _readable_listen_address(self.listen_address, self.listen_port))
 
-        # Max Buffersize set to 200MB            )
-        http_server = HTTPServer(WSGIContainer(self.app),
+        # Max Buffersize set to 200MB
+        http_server = HTTPServer(MyWSGIContainer(self.app),
                                  max_buffer_size=209700000,
                                  ssl_options=self.ssl_args)
         http_server.listen(self.listen_port, self.listen_address)
diff --git a/cps/tornado_wsgi.py b/cps/tornado_wsgi.py
new file mode 100644
index 000000000..af93219c6
--- /dev/null
+++ b/cps/tornado_wsgi.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 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 tornado.wsgi import WSGIContainer
+import tornado
+
+from tornado import escape
+from tornado import httputil
+
+from typing import List, Tuple, Optional, Callable, Any, Dict, Text
+from types import TracebackType
+import typing
+
+if typing.TYPE_CHECKING:
+    from typing import Type  # noqa: F401
+    from wsgiref.types import WSGIApplication as WSGIAppType  # noqa: F4
+
+class MyWSGIContainer(WSGIContainer):
+
+    def __call__(self, request: httputil.HTTPServerRequest) -> None:
+        data = {}  # type: Dict[str, Any]
+        response = []  # type: List[bytes]
+
+        def start_response(
+            status: str,
+            headers: List[Tuple[str, str]],
+            exc_info: Optional[
+                Tuple[
+                    "Optional[Type[BaseException]]",
+                    Optional[BaseException],
+                    Optional[TracebackType],
+                ]
+            ] = None,
+        ) -> Callable[[bytes], Any]:
+            data["status"] = status
+            data["headers"] = headers
+            return response.append
+
+        app_response = self.wsgi_application(
+            MyWSGIContainer.environ(request), start_response
+        )
+        try:
+            response.extend(app_response)
+            body = b"".join(response)
+        finally:
+            if hasattr(app_response, "close"):
+                app_response.close()  # type: ignore
+        if not data:
+            raise Exception("WSGI app did not call start_response")
+
+        status_code_str, reason = data["status"].split(" ", 1)
+        status_code = int(status_code_str)
+        headers = data["headers"]  # type: List[Tuple[str, str]]
+        header_set = set(k.lower() for (k, v) in headers)
+        body = escape.utf8(body)
+        if status_code != 304:
+            if "content-length" not in header_set:
+                headers.append(("Content-Length", str(len(body))))
+            if "content-type" not in header_set:
+                headers.append(("Content-Type", "text/html; charset=UTF-8"))
+        if "server" not in header_set:
+            headers.append(("Server", "TornadoServer/%s" % tornado.version))
+
+        start_line = httputil.ResponseStartLine("HTTP/1.1", status_code, reason)
+        header_obj = httputil.HTTPHeaders()
+        for key, value in headers:
+            header_obj.add(key, value)
+        assert request.connection is not None
+        request.connection.write_headers(start_line, header_obj, chunk=body)
+        request.connection.finish()
+        self._log(status_code, request)
+
+    @staticmethod
+    def environ(request: httputil.HTTPServerRequest) -> Dict[Text, Any]:
+        environ = WSGIContainer.environ(request)
+        environ['RAW_URI'] = request.path
+        return environ
+
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 4427548ab..54fda2b13 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-26 21:40:01</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-28 06:40:49</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>2022-03-27 04:18:33</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-28 12:18:13</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>4h 50 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 46 min</p>
         </div>
       </div>
       </div>
@@ -891,11 +891,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
         <td class="text-center">36</td>
-        <td class="text-center">34</td>
-        <td class="text-center">1</td>
+        <td class="text-center">35</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -1237,31 +1237,11 @@
     
     
     
-        <tr id="ft11.36" class="none bg-danger">
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.36')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.36" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.36').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 799, in test_upload_cover_hdd
-    self.assertFalse(self.check_element_on_page((By.CLASS_NAME, &#34;alert&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;53d4d98b-a28b-426d-b0d6-c6ad1500540a&#34;, element=&#34;e0d0a1a6-960e-41c3-9639-bbda2c2be4d5&#34;)&gt; is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1606,15 +1586,15 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">20</td>
         <td class="text-center">18</td>
-        <td class="text-center">2</td>
+        <td class="text-center">18</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', 20)">Detail</a>
+            <a onclick="showClassDetail('c16', 18)">Detail</a>
         </td>
     </tr>
 
@@ -1764,38 +1744,7 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
     
     
-        <tr id="ft16.17" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.17')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 855, in test_upload_book_epub
-    self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
-AssertionError: &#39;8936&#39; != &#39;1103&#39;
-- 8936
-+ 1103</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.18' class='hiddenRow bg-success'>
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1804,36 +1753,7 @@ AssertionError: &#39;8936&#39; != &#39;1103&#39;
     
     
     
-        <tr id="ft16.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_ft16.19')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 768, in test_upload_cover_hdd
-    self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
-AssertionError: 0.0 not greater than 0.02</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.20' class='hiddenRow bg-success'>
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -2011,11 +1931,11 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestErrorReadColumn</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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">
@@ -2034,87 +1954,11 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
     
     
-        <tr id="ft21.2" class="none bg-danger">
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 46, in test_invalid_custom_read_column
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</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('c22', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et22.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_error_read_column)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et22.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et22.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 33, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2128,13 +1972,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2143,19 +1987,19 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="st23.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st23.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.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_st23.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2169,7 +2013,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2187,13 +2031,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2203,113 +2047,43 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="errorClass">
+    <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">2</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft25.1" class="none bg-danger">
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 96, in test_author_page
-    self.assertTrue(self.check_element_on_page((By.CLASS_NAME, &#34;author-photo&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.2" class="none bg-info">
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.2" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 61, in test_author_page_invalid
-    self.fill_basic_config({&#39;config_goodreads_api_key&#39;: &#39;rgg&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft25.3" class="none bg-danger">
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 113, in test_goodreads_about
-    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2323,13 +2097,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2338,7 +2112,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2347,7 +2121,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2356,7 +2130,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2365,7 +2139,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2374,7 +2148,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2383,7 +2157,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2392,7 +2166,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2401,7 +2175,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2410,7 +2184,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2419,7 +2193,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2437,13 +2211,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 5)">Detail</a>
+            <a onclick="showClassDetail('c26', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2452,7 +2226,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2461,7 +2235,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2470,7 +2244,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2479,7 +2253,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2497,13 +2271,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2512,7 +2286,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2521,7 +2295,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2530,7 +2304,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2539,7 +2313,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2548,7 +2322,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2557,7 +2331,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2566,7 +2340,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2575,7 +2349,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2584,7 +2358,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2593,7 +2367,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2602,7 +2376,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2611,7 +2385,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2621,21 +2395,21 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebListOrders</td>
         <td class="text-center">10</td>
-        <td class="text-center">8</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</td>
+        <td class="text-center">10</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', 10)">Detail</a>
+            <a onclick="showClassDetail('c28', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2644,7 +2418,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2653,7 +2427,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2662,7 +2436,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2671,67 +2445,25 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft29.5" class="none bg-danger">
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 394, in test_order_authors_all_links
-    self.assertEqual(books[1][0][&#39;title&#39;], &#34;testbook&#34;)
-AssertionError: &#39;Very long extra super turbo cool title without any issue of ...&#39; != &#39;testbook&#39;
-- Very long extra super turbo cool title without any issue of ...
-+ testbook</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et29.6" class="none bg-info">
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et29.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et29.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 382, in test_order_series_all_links
-    author_books[1][0][&#39;series_ele&#39;].click()
-KeyError: &#39;series_ele&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2740,7 +2472,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2749,7 +2481,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2758,7 +2490,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2776,13 +2508,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2791,7 +2523,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2800,7 +2532,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2809,7 +2541,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2818,19 +2550,19 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id="st30.5" class="none bg-warning">
+        <tr id="st29.5" 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_st30.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st30.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st30.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2844,7 +2576,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2853,7 +2585,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2862,7 +2594,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2871,7 +2603,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2889,13 +2621,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2904,7 +2636,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2913,7 +2645,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2922,7 +2654,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2931,7 +2663,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2940,7 +2672,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2949,7 +2681,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2958,7 +2690,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2967,7 +2699,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2976,7 +2708,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2985,7 +2717,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2994,7 +2726,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3003,7 +2735,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3012,7 +2744,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3021,7 +2753,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3039,13 +2771,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -3054,7 +2786,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -3072,13 +2804,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3087,7 +2819,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3105,13 +2837,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3120,7 +2852,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3129,7 +2861,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3138,7 +2870,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3147,7 +2879,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3156,7 +2888,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3165,7 +2897,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3174,7 +2906,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3183,7 +2915,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3192,7 +2924,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3201,7 +2933,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3210,7 +2942,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3219,7 +2951,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3228,7 +2960,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3237,7 +2969,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3246,7 +2978,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3255,7 +2987,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3264,7 +2996,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3273,7 +3005,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3282,7 +3014,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3291,7 +3023,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3300,7 +3032,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3309,7 +3041,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3327,13 +3059,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3351,13 +3083,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 5)">Detail</a>
+            <a onclick="showClassDetail('c35', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3366,7 +3098,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3375,7 +3107,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3384,7 +3116,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3393,7 +3125,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3411,13 +3143,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c36', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3435,13 +3167,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3459,13 +3191,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 8)">Detail</a>
+            <a onclick="showClassDetail('c38', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3474,7 +3206,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3483,7 +3215,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3492,7 +3224,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3501,7 +3233,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3510,7 +3242,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3519,7 +3251,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3528,7 +3260,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3546,13 +3278,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 3)">Detail</a>
+            <a onclick="showClassDetail('c39', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3561,7 +3293,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3570,7 +3302,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3588,13 +3320,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c40', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3603,7 +3335,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3612,7 +3344,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3621,7 +3353,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3630,7 +3362,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3639,7 +3371,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3648,7 +3380,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3657,7 +3389,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3666,7 +3398,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3675,7 +3407,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3684,7 +3416,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3693,7 +3425,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3702,7 +3434,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3711,19 +3443,19 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id="st41.14" class="none bg-warning">
+        <tr id="st40.14" 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_st41.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.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_st41.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3737,7 +3469,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3746,7 +3478,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3764,13 +3496,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 9)">Detail</a>
+            <a onclick="showClassDetail('c41', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3779,7 +3511,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3788,7 +3520,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3797,7 +3529,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3806,7 +3538,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3815,7 +3547,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3824,19 +3556,19 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id="st42.7" class="none bg-warning">
+        <tr id="st41.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_st42.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st42.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st42.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3850,7 +3582,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3859,7 +3591,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3877,13 +3609,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 4)">Detail</a>
+            <a onclick="showClassDetail('c42', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -3892,7 +3624,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -3901,7 +3633,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3910,7 +3642,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3928,13 +3660,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 18)">Detail</a>
+            <a onclick="showClassDetail('c43', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3943,7 +3675,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3952,7 +3684,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3961,7 +3693,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3970,7 +3702,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3979,7 +3711,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3988,7 +3720,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3997,7 +3729,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4006,7 +3738,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4015,7 +3747,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4024,7 +3756,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4033,7 +3765,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4042,7 +3774,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4051,7 +3783,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4060,7 +3792,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4069,7 +3801,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4078,7 +3810,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4087,7 +3819,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4105,13 +3837,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 1)">Detail</a>
+            <a onclick="showClassDetail('c44', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4129,13 +3861,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 21)">Detail</a>
+            <a onclick="showClassDetail('c45', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4144,7 +3876,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4153,7 +3885,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4162,7 +3894,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4171,7 +3903,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4180,7 +3912,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4189,7 +3921,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4198,7 +3930,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4207,7 +3939,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4216,7 +3948,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4225,7 +3957,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4234,7 +3966,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4243,7 +3975,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4252,7 +3984,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4261,7 +3993,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4270,7 +4002,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4279,7 +4011,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4288,7 +4020,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4297,7 +4029,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt45.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4306,7 +4038,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt45.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4315,7 +4047,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt45.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4325,21 +4057,21 @@ KeyError: &#39;series_ele&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">35</td>
-        <td class="text-center">33</td>
-        <td class="text-center">2</td>
+        <td class="text-center">35</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('c47', 35)">Detail</a>
+            <a onclick="showClassDetail('c46', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4348,7 +4080,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4357,7 +4089,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4366,7 +4098,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4375,7 +4107,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4384,7 +4116,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4393,7 +4125,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4402,7 +4134,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4411,7 +4143,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4420,7 +4152,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4429,7 +4161,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4438,7 +4170,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4447,7 +4179,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4456,7 +4188,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4465,7 +4197,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4474,7 +4206,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4483,7 +4215,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4492,7 +4224,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4501,7 +4233,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4510,7 +4242,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4519,7 +4251,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4528,7 +4260,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.22' class='hiddenRow bg-success'>
+        <tr id='pt46.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4537,7 +4269,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.23' class='hiddenRow bg-success'>
+        <tr id='pt46.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4546,36 +4278,16 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id="ft47.24" class="none bg-danger">
+        <tr id='pt46.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft47.24')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft47.24" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft47.24').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 814, in test_link_column_to_read_status
-    self.assertTrue(author[1][0][&#39;read&#39;])
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt47.25' class='hiddenRow bg-success'>
+        <tr id='pt46.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4584,36 +4296,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft47.26" class="none bg-danger">
+        <tr id='pt46.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft47.26')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft47.26" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft47.26').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 898, in test_read_status_visible
-    self.assertEqual(len(list_element[1]), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt47.27' class='hiddenRow bg-success'>
+        <tr id='pt46.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4622,7 +4314,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.28' class='hiddenRow bg-success'>
+        <tr id='pt46.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4631,7 +4323,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.29' class='hiddenRow bg-success'>
+        <tr id='pt46.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4640,7 +4332,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.30' class='hiddenRow bg-success'>
+        <tr id='pt46.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4649,7 +4341,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.31' class='hiddenRow bg-success'>
+        <tr id='pt46.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4658,7 +4350,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.32' class='hiddenRow bg-success'>
+        <tr id='pt46.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4667,7 +4359,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.33' class='hiddenRow bg-success'>
+        <tr id='pt46.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4676,7 +4368,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.34' class='hiddenRow bg-success'>
+        <tr id='pt46.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4685,7 +4377,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.35' class='hiddenRow bg-success'>
+        <tr id='pt46.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4703,13 +4395,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c48', 16)">Detail</a>
+            <a onclick="showClassDetail('c47', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4718,7 +4410,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4727,7 +4419,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4736,7 +4428,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4745,7 +4437,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4754,7 +4446,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4763,7 +4455,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4772,7 +4464,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4781,7 +4473,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4790,7 +4482,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4799,7 +4491,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4808,7 +4500,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4817,7 +4509,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4826,7 +4518,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4835,7 +4527,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4844,7 +4536,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4855,10 +4547,10 @@ AssertionError: 0 != 1</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>409</td>
-        <td>391</td>
-        <td>9</td>
-        <td>3</td>
+        <td>406</td>
+        <td>400</td>
+        <td>0</td>
+        <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -5301,7 +4993,7 @@ AssertionError: 0 != 1</pre>
 </div>
 
 <script>
-    drawCircle(391, 9, 3, 6);
+    drawCircle(400, 0, 0, 6);
     showCase(5);
 </script>
 

From 73d359af05701cb1cf2ace7dee26f14ea7238cb4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 28 Mar 2022 19:02:12 +0200
Subject: [PATCH 220/412] Bugfix logging with gdrive Update
 optional-requirements.txt

---
 cps/gdriveutils.py        | 29 +++++++++++++++--------------
 cps/helper.py             |  2 +-
 optional-requirements.txt |  4 ++--
 setup.cfg                 |  4 ++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index e75f37421..6073777e6 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -32,7 +32,7 @@ try:
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.exc import OperationalError, InvalidRequestError
+from sqlalchemy.exc import OperationalError, InvalidRequestError, IntegrityError
 from sqlalchemy.sql.expression import text
 
 #try:
@@ -81,7 +81,7 @@ if gdrive_support:
     if not logger.is_debug_enabled():
         logger.get('googleapiclient.discovery').setLevel(logger.logging.ERROR)
 else:
-    log.debug("Cannot import pydrive, httplib2, using gdrive will not work: %s", importError)
+    log.debug("Cannot import pydrive, httplib2, using gdrive will not work: {}".format(importError))
 
 
 class Singleton:
@@ -213,7 +213,7 @@ def getDrive(drive=None, gauth=None):
             try:
                 gauth.Refresh()
             except RefreshError as e:
-                log.error("Google Drive error: %s", e)
+                log.error("Google Drive error: {}".format(e))
             except Exception as ex:
                 log.error_or_exception(ex)
         else:
@@ -225,7 +225,7 @@ def getDrive(drive=None, gauth=None):
         try:
             drive.auth.Refresh()
         except RefreshError as e:
-            log.error("Google Drive error: %s", e)
+            log.error("Google Drive error: {}".format(e))
     return drive
 
 def listRootFolders():
@@ -234,7 +234,7 @@ def listRootFolders():
         folder = "'root' in parents and mimeType = 'application/vnd.google-apps.folder' and trashed = false"
         fileList = drive.ListFile({'q': folder}).GetList()
     except (ServerNotFoundError, ssl.SSLError, RefreshError) as e:
-        log.info("GDrive Error %s" % e)
+        log.info("GDrive Error {}".format(e))
         fileList = []
     return fileList
 
@@ -272,7 +272,7 @@ def getEbooksFolderId(drive=None):
         try:
             session.commit()
         except OperationalError as ex:
-            log.error_or_exception('Database error: %s', ex)
+            log.error_or_exception('Database error: {}'.format(ex))
             session.rollback()
         return gDriveId.gdrive_id
 
@@ -288,6 +288,7 @@ def getFile(pathId, fileName, drive):
 
 def getFolderId(path, drive):
     # drive = getDrive(drive)
+    currentFolderId = None
     try:
         currentFolderId = getEbooksFolderId(drive)
         sqlCheckPath = path if path[-1] == '/' else path + '/'
@@ -320,8 +321,8 @@ def getFolderId(path, drive):
                 session.commit()
         else:
             currentFolderId = storedPathName.gdrive_id
-    except OperationalError as ex:
-        log.error_or_exception('Database error: %s', ex)
+    except (OperationalError, IntegrityError) as ex:
+        log.error_or_exception('Database error: {}'.format(ex))
         session.rollback()
     except ApiRequestError as ex:
         log.error('{} {}'.format(ex.error['message'], path))
@@ -545,7 +546,7 @@ def deleteDatabaseOnChange():
         session.commit()
     except (OperationalError, InvalidRequestError) as ex:
         session.rollback()
-        log.error_or_exception('Database error: %s', ex)
+        log.error_or_exception('Database error: {}'.format(ex))
 
 
 def updateGdriveCalibreFromLocal():
@@ -563,7 +564,7 @@ def updateDatabaseOnEdit(ID,newPath):
         try:
             session.commit()
         except OperationalError as ex:
-            log.error_or_exception('Database error: %s', ex)
+            log.error_or_exception('Database error: {}'.format(ex))
             session.rollback()
 
 
@@ -573,7 +574,7 @@ def deleteDatabaseEntry(ID):
     try:
         session.commit()
     except OperationalError as ex:
-        log.error_or_exception('Database error: %s', ex)
+        log.error_or_exception('Database error: {}'.format(ex))
         session.rollback()
 
 
@@ -594,7 +595,7 @@ def get_cover_via_gdrive(cover_path):
             try:
                 session.commit()
             except OperationalError as ex:
-                log.error_or_exception('Database error: %s', ex)
+                log.error_or_exception('Database error: {}'.format(ex))
                 session.rollback()
         return df.metadata.get('webContentLink')
     else:
@@ -616,7 +617,7 @@ def do_gdrive_download(df, headers, convert_encoding=False):
 
     def stream(convert_encoding):
         for byte in s:
-            headers = {"Range": 'bytes=%s-%s' % (byte[0], byte[1])}
+            headers = {"Range": 'bytes={}-{}'.format(byte[0], byte[1])}
             resp, content = df.auth.Get_Http_Object().request(download_url, headers=headers)
             if resp.status == 206:
                 if convert_encoding:
@@ -624,7 +625,7 @@ def do_gdrive_download(df, headers, convert_encoding=False):
                     content = content.decode(result['encoding']).encode('utf-8')
                 yield content
             else:
-                log.warning('An error occurred: %s', resp)
+                log.warning('An error occurred: {}'.format(resp))
                 return
     return Response(stream_with_context(stream(convert_encoding)), headers=headers)
 
diff --git a/cps/helper.py b/cps/helper.py
index 765cf22b8..4928d3887 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -708,7 +708,7 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
                 if path:
                     return redirect(path)
                 else:
-                    log.error('%s/cover.jpg not found on Google Drive', book.path)
+                    log.error('{}/cover.jpg not found on Google Drive'.format(book.path))
                     return get_cover_on_failure(use_generic_cover_on_failure)
             except Exception as ex:
                 log.error_or_exception(ex)
diff --git a/optional-requirements.txt b/optional-requirements.txt
index e54b0829f..208d889dc 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.42.0
+google-api-python-client>=1.7.11,<2.43.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.42.0
+google-api-python-client>=1.7.11,<2.43.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/setup.cfg b/setup.cfg
index 5b8ce6788..9ad1164a8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -59,7 +59,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.37.0
+	google-api-python-client>=1.7.11,<2.43.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -72,7 +72,7 @@ gdrive =
 	rsa>=3.4.2,<4.9.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
-	google-api-python-client>=1.7.11,<2.37.0
+	google-api-python-client>=1.7.11,<2.43.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From 7861f8a89a6657b209dae2fde6a31d4d4330b141 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 28 Mar 2022 21:43:23 +0200
Subject: [PATCH 221/412] Prevent problems with werkzeug and flask_login on new
 installations

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index de08fbdaa..7b03ffe40 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+werkzeug<2.1.0
 Babel>=1.3,<3.0
 Flask-Babel>=0.11.1,<2.1.0
 Flask-Login>=0.3.2,<0.5.1

From 834edadc280128c9bda86c4273056e1fd9daa19d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 29 Mar 2022 18:28:53 +0200
Subject: [PATCH 222/412] Possible fix for #2350 and #2351 (databse locked) Fix
 for #2309 (long unicode filenames could get to long)

---
 cps.py                                  | 10 ++---
 cps/helper.py                           | 18 ++++++++-
 test/Calibre-Web TestSummary_Linux.html | 50 +++++++++++++++++--------
 3 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/cps.py b/cps.py
index 8959679ab..bffdfc7f9 100755
--- a/cps.py
+++ b/cps.py
@@ -16,11 +16,11 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
-try:
-    from gevent import monkey
-    monkey.patch_all()
-except ImportError:
-    pass
+#try:
+#from gevent import monkey
+#monkey.patch_all()
+#except ImportError:
+#    pass
 
 import sys
 import os
diff --git a/cps/helper.py b/cps/helper.py
index 4928d3887..742188d0b 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -19,6 +19,7 @@
 
 import os
 import io
+import sys
 import mimetypes
 import re
 import shutil
@@ -224,11 +225,23 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
 
+def shorten_component(s, by_what):
+    l = len(s)
+    if l < by_what:
+        return s
+    l = (l - by_what)//2
+    if l <= 0:
+        return s
+    return s[:l] + s[-l:]
+
+
 def get_valid_filename(value, replace_whitespace=True, chars=128):
     """
     Returns the given string converted to a string that can be used for a clean
     filename. Limits num characters to 128 max.
     """
+
+
     if value[-1:] == u'.':
         value = value[:-1]+u'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
@@ -239,7 +252,10 @@ def get_valid_filename(value, replace_whitespace=True, chars=128):
         value = re.sub(r'[*+:\\\"/<>?]+', u'_', value, flags=re.U)
         # pipe has to be replaced with comma
         value = re.sub(r'[|]+', u',', value, flags=re.U)
-    value = value[:chars].strip()
+
+    filename_encoding_for_length = 'utf-16' if sys.platform == "win32" or sys.platform == "darwin" else 'utf-8'
+    value = value.encode(filename_encoding_for_length)[:chars].decode('utf-8', errors='ignore').strip()
+
     if not value:
         raise ValueError("Filename cannot be empty")
     return value
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 54fda2b13..524db5183 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,14 +37,14 @@
       <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>2022-03-28 06:40:49</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-28 21:45:14</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>2022-03-28 12:18:13</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-29 03:21:52</p>
             
         </div>
       </div>
@@ -1562,11 +1562,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1576,11 +1576,31 @@
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id="ft15.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4548,8 +4568,8 @@
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>406</td>
-        <td>400</td>
-        <td>0</td>
+        <td>399</td>
+        <td>1</td>
         <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
@@ -4643,6 +4663,12 @@
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>gevent</th>
+              <td>21.12.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>greenlet</th>
               <td>1.1.2</td>
@@ -4697,12 +4723,6 @@
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>tornado</th>
-              <td>6.1</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>Unidecode</th>
               <td>1.3.4</td>
@@ -4993,7 +5013,7 @@
 </div>
 
 <script>
-    drawCircle(400, 0, 0, 6);
+    drawCircle(399, 1, 0, 6);
     showCase(5);
 </script>
 

From c06754975ed11c1691ad81780b6ba27468aa4760 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 2 Apr 2022 11:37:02 +0200
Subject: [PATCH 223/412] Added bookeen to the reader for "simple theming"
 (#1861)

---
 cps.py                 | 5 -----
 cps/render_template.py | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cps.py b/cps.py
index bffdfc7f9..2db11e2bd 100755
--- a/cps.py
+++ b/cps.py
@@ -16,11 +16,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
-#try:
-#from gevent import monkey
-#monkey.patch_all()
-#except ImportError:
-#    pass
 
 import sys
 import os
diff --git a/cps/render_template.py b/cps/render_template.py
index 1bc5454dd..0c5423c9c 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -30,7 +30,8 @@ log = logger.create()
 
 def get_sidebar_config(kwargs=None):
     kwargs = kwargs or []
-    simple = bool([e for e in ['kindle', 'tolino', "kobo"] if (e in request.headers.get('User-Agent', "").lower())])
+    simple = bool([e for e in ['kindle', 'tolino', "kobo", "bookeen"]
+                   if (e in request.headers.get('User-Agent', "").lower())])
     if 'content' in kwargs:
         content = kwargs['content']
         content = isinstance(content, (User, LocalProxy)) and not content.role_anonymous()

From f36d3a76be04ae6d899ef0a5bb6070bf785bd4dd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 2 Apr 2022 17:29:30 +0200
Subject: [PATCH 224/412] Return false if custom columns generate an error
 during connect database Replaced existing with valid in readme to make it
 more clear what database is needed

---
 README.md | 2 +-
 cps/db.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 94be5b33f..c528f09d1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # About
 
-Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing [Calibre](https://calibre-ebook.com) database.
+Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using a valid [Calibre](https://calibre-ebook.com) database.
 
 [![GitHub License](https://img.shields.io/github/license/janeczku/calibre-web?style=flat-square)](https://github.com/janeczku/calibre-web/blob/master/LICENSE)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/w/janeczku/calibre-web?logo=github&style=flat-square&label=commits)]()
diff --git a/cps/db.py b/cps/db.py
index 3f64fbb58..d2977e073 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -592,6 +592,7 @@ class CalibreDB:
                 cls.setup_db_cc_classes(cc)
             except OperationalError as e:
                 log.error_or_exception(e)
+                return False
 
         cls.session_factory = scoped_session(sessionmaker(autocommit=False,
                                                           autoflush=True,

From fee76741a02899d2dfdc2ce29cfc27901a06383c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 3 Apr 2022 13:38:42 +0200
Subject: [PATCH 225/412] Update Testresult

---
 SECURITY.md                             |  4 ++++
 cps/constants.py                        |  2 +-
 setup.cfg                               |  8 ++++---
 test/Calibre-Web TestSummary_Linux.html | 32 +++++++++++++------------
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 54be54bd1..78d5c6e22 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -32,8 +32,12 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
 | V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
 | V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             ||
+| V 0.6.16      | It's prevented to get the name of a private shelfs. Thanks to @nhiephon                                            ||
 | V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                            ||
 | V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             ||
+| V 0.6.18      | Possible SQL Injection is prevented in user table  Thanks to Iman Sharafaldin (Forward Security)                   ||
+| V 0.6.18      | The SSRF protection no longer can be bypassed by IPV6/IPV4 embedding. Thanks to  @416e6e61                         ||
+| V 0.6.18      | The SSRF protection no longer can be bypassed to connect to other servers in the local network. Thanks to @michaellrowley ||
 
 
 ## Statement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/constants.py b/cps/constants.py
index cb5348d55..c2eb0527b 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -154,7 +154,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.18 Beta'}
+STABLE_VERSION = {'version': '0.6.18'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/setup.cfg b/setup.cfg
index 9ad1164a8..49496fc98 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,6 +38,7 @@ console_scripts =
 [options]
 include_package_data = True
 install_requires = 
+	werkzeug<2.1.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
 	Flask-Login>=0.3.2,<0.5.1
@@ -52,9 +53,10 @@ install_requires =
 	tornado>=4.1,<6.2
 	Wand>=0.4.4,<0.7.0
 	unidecode>=0.04.19,<1.4.0
-	lxml>=3.8.0,<4.8.0
+	lxml>=3.8.0,<4.9.0
 	flask-wtf>=0.14.2,<1.1.0
 	chardet>=3.0.0,<4.1.0
+	advocate>=1.0.0,<1.1.0
 	
 
 [options.extras_require]
@@ -71,7 +73,7 @@ gdrive =
 	PyYAML>=3.12
 	rsa>=3.4.2,<4.9.0
 gmail = 
-	google-auth-oauthlib>=0.4.3,<0.5.0
+	google-auth-oauthlib>=0.4.3,<0.6.0
 	google-api-python-client>=1.7.11,<2.43.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
@@ -84,7 +86,7 @@ oauth =
 	SQLAlchemy-Utils>=0.33.5,<0.39.0
 metadata = 
 	rarfile>=3.2
-	scholarly>=1.2.0,<1.6
+	scholarly>=1.2.0,<1.7
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1
 	python-dateutil>=2.1,<2.9.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 524db5183..392fdbead 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-28 21:45:14</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-03 07:19:10</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>2022-03-29 03:21:52</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-03 12:55:38</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>4h 46 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 47 min</p>
         </div>
       </div>
       </div>
@@ -1593,9 +1593,11 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 235, in test_load_metadata
+    self.assertEqual(&#34;奇想西遊記1&#34;, results[3][&#39;title&#39;])
+AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
+- 奇想西遊記1
++ 巧讀西遊記</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4599,7 +4601,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-37-generic #42~20.04.1-Ubuntu SMP Tue Mar 15 15:44:28 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-39-generic #44~20.04.1-Ubuntu SMP Thu Mar 24 16:43:35 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4659,13 +4661,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>Flask-WTF</th>
-              <td>1.0.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>gevent</th>
-              <td>21.12.0</td>
+              <td>1.0.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4719,7 +4715,13 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.32</td>
+              <td>1.4.34</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>tornado</th>
+              <td>6.1</td>
               <td>Basic</td>
             </tr>
           

From 8adae6ed0cd749f52af0300923c74c8c7c28b241 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 3 Apr 2022 20:26:43 +0200
Subject: [PATCH 226/412] Handle permission errors for static files (Fix for
 #2358) Version bump

---
 cps/cache_buster.py    | 15 +++++++++------
 cps/constants.py       |  2 +-
 cps/error_handler.py   |  5 +++--
 cps/helper.py          |  9 ++++++---
 cps/render_template.py | 14 +++++++++-----
 cps/web.py             |  6 +++++-
 6 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/cps/cache_buster.py b/cps/cache_buster.py
index 9619d6054..ba19afd68 100644
--- a/cps/cache_buster.py
+++ b/cps/cache_buster.py
@@ -47,13 +47,16 @@ def init_cache_busting(app):
         for filename in filenames:
             # compute version component
             rooted_filename = os.path.join(dirpath, filename)
-            with open(rooted_filename, 'rb') as f:
-                file_hash = hashlib.md5(f.read()).hexdigest()[:7] # nosec
+            try:
+                with open(rooted_filename, 'rb') as f:
+                    file_hash = hashlib.md5(f.read()).hexdigest()[:7] # nosec
+                # save version to tables
+                file_path = rooted_filename.replace(static_folder, "")
+                file_path = file_path.replace("\\", "/")  # Convert Windows path to web path
+                hash_table[file_path] = file_hash
+            except PermissionError:
+                log.error("No permission to access {} file.".format(rooted_filename))
 
-            # save version to tables
-            file_path = rooted_filename.replace(static_folder, "")
-            file_path = file_path.replace("\\", "/")  # Convert Windows path to web path
-            hash_table[file_path] = file_hash
     log.debug('Finished computing cache-busting values')
 
     def bust_filename(filename):
diff --git a/cps/constants.py b/cps/constants.py
index c2eb0527b..f40d16b01 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -154,7 +154,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.18'}
+STABLE_VERSION = {'version': '0.6.19 Beta'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/cps/error_handler.py b/cps/error_handler.py
index 37b7500e5..67252a660 100644
--- a/cps/error_handler.py
+++ b/cps/error_handler.py
@@ -42,8 +42,9 @@ def error_http(error):
 
 def internal_error(error):
     return render_template('http_error.html',
-                           error_code="Internal Server Error",
-                           error_name=str(error),
+                           error_code="500 Internal Server Error",
+                           error_name='The server encountered an internal error and was unable to complete your '
+                                      'request. There is an error in the application.',
                            issue=True,
                            unconfigured=False,
                            error_stack=traceback.format_exc().split("\n"),
diff --git a/cps/helper.py b/cps/helper.py
index 742188d0b..5d5cc0210 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -698,9 +698,12 @@ def delete_book(book, calibrepath, book_format):
 
 def get_cover_on_failure(use_generic_cover):
     if use_generic_cover:
-        return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
-    else:
-        return None
+        try:
+            return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
+        except PermissionError:
+            log.error("No permission to access generic_cover.jpg file.")
+            abort(403)
+    abort(404)
 
 
 def get_book_cover(book_id):
diff --git a/cps/render_template.py b/cps/render_template.py
index 0c5423c9c..d2f40d6c1 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -18,11 +18,11 @@
 
 from flask import render_template, request
 from flask_babel import gettext as _
-from flask import g
+from flask import g, abort
 from werkzeug.local import LocalProxy
 from flask_login import current_user
 
-from . import config, constants, ub, logger, db, calibre_db
+from . import config, constants, logger
 from .ub import User
 
 
@@ -119,6 +119,10 @@ def get_sidebar_config(kwargs=None):
 # Returns the template for rendering and includes the instance name
 def render_title_template(*args, **kwargs):
     sidebar, simple = get_sidebar_config(kwargs)
-    return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple,
-                           accept=constants.EXTENSIONS_UPLOAD, # read_book_ids=get_readbooks_ids(),
-                           *args, **kwargs)
+    try:
+        return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple,
+                               accept=constants.EXTENSIONS_UPLOAD,
+                               *args, **kwargs)
+    except PermissionError:
+        log.error("No permission to access {} file.".format(args[0]))
+        abort(403)
diff --git a/cps/web.py b/cps/web.py
index e8bf48e35..a0ecbb8e4 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1368,7 +1368,11 @@ def get_cover(book_id):
 
 @web.route("/robots.txt")
 def get_robots():
-    return send_from_directory(constants.STATIC_DIR, "robots.txt")
+    try:
+        return send_from_directory(constants.STATIC_DIR, "robots.txt")
+    except PermissionError:
+        log.error("No permission to access robots.txt file.")
+        abort(403)
 
 
 @web.route("/show/<int:book_id>/<book_format>", defaults={'anyname': 'None'})

From 42b0226f1a2ac9f457ae693d87517252dbb7c2ec Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 4 Apr 2022 13:58:47 +0200
Subject: [PATCH 227/412] Fix for missing "query" entry in flask_session

---
 cps/web.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index a0ecbb8e4..e6ca4d038 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -383,7 +383,7 @@ def render_books_list(data, sort_param, book_id, page):
         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'])
+        term = json.loads(flask_session.get('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:
@@ -1556,7 +1556,7 @@ def login():
                     config.config_is_initial = False
                     return redirect_back(url_for("web.index"))
                 else:
-                    log.warning('Login failed for user "%s" IP-address: %s', form['username'], ip_address)
+                    log.warning('Login failed for user "{}" IP-address: {}'.format(form['username'], ip_address))
                     flash(_(u"Wrong Username or Password"), category="error")
 
     next_url = request.args.get('next', default=url_for("web.index"), type=str)

From d912c1c47606ada9b636d56905e4ac714efd9710 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 4 Apr 2022 14:37:39 +0200
Subject: [PATCH 228/412] Bugfix Quick start section

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c528f09d1..267f21ef2 100644
--- a/README.md
+++ b/README.md
@@ -49,10 +49,11 @@ In the Wiki there are also examples for: a [manual installation](https://github.
 
 ## Quick start
 
-Point your browser to `http://localhost:8083` or `http://localhost:8083/opds` for the OPDS catalog
-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)
-Go to Login page
+Point your browser to `http://localhost:8083` or `http://localhost:8083/opds` for the OPDS catalog \
+Login with default admin login \
+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) \
+Afterwards you can configure your Calibre-Web instance ([Basic Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#basic-configuration) and [UI Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#ui-configuration) on admin page)  
 
 #### Default admin login:
 *Username:* admin\
@@ -67,7 +68,7 @@ Optionally, to enable on-the-fly conversion from one ebook format to another whe
 
 [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/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`.
+[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
 

From 2d0af0ab496b84c97e1564d97eb5415f9ec6236b Mon Sep 17 00:00:00 2001
From: Wulf Rajek <40003252+AnonTester@users.noreply.github.com>
Date: Tue, 5 Apr 2022 01:26:35 +0100
Subject: [PATCH 229/412] Add pubdate, publisher and identifiers metadata #2163

---
 cps/comic.py     |  8 +++++--
 cps/constants.py |  2 +-
 cps/editbooks.py | 17 ++++++++++++++-
 cps/epub.py      | 22 ++++++++++++++++++--
 cps/fb2.py       |  4 +++-
 cps/uploader.py  | 54 +++++++-----------------------------------------
 6 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/cps/comic.py b/cps/comic.py
index 2549579e6..8f3a6f61e 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -130,7 +130,9 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
                 series=loaded_metadata.series or "",
                 series_id=loaded_metadata.issue or "",
                 languages=loaded_metadata.language,
-                publisher="")
+                publisher="",
+                pubdate="",
+                identifiers=[])
 
     return BookMeta(
         file_path=tmp_file_path,
@@ -143,4 +145,6 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
         series="",
         series_id="",
         languages="",
-        publisher="")
+        publisher="",
+        pubdate="",
+        identifiers=[])
diff --git a/cps/constants.py b/cps/constants.py
index f40d16b01..762336ddc 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -152,7 +152,7 @@ def selected_roles(dictionary):
 
 # :rtype: BookMeta
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
-                                  'series_id, languages, publisher')
+                                  'series_id, languages, publisher, pubdate, identifiers')
 
 STABLE_VERSION = {'version': '0.6.19 Beta'}
 
diff --git a/cps/editbooks.py b/cps/editbooks.py
index c07e5d243..db87d8911 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -983,8 +983,13 @@ def create_book_on_upload(modify_date, meta):
     # combine path and normalize path from Windows systems
     path = os.path.join(author_dir, title_dir).replace('\\', '/')
 
+    if meta.pubdate != "":
+        pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
+    else:
+        pubdate = datetime(101, 1, 1)
+
     # Calibre adds books with utc as timezone
-    db_book = db.Books(title, "", sort_authors, datetime.utcnow(), datetime(101, 1, 1),
+    db_book = db.Books(title, "", sort_authors, datetime.utcnow(), pubdate,
                        '1', datetime.utcnow(), path, meta.cover, db_author, [], "")
 
     modify_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
@@ -1017,6 +1022,16 @@ def create_book_on_upload(modify_date, meta):
 
     # flush content, get db_book.id available
     calibre_db.session.flush()
+
+    # Handle identifiers now that db_book.id is available
+    identifier_list = []
+    for type_key, type_value in meta.identifiers:
+        identifier_list.append(db.Identifiers(type_value, type_key, db_book.id))
+    modification, warning = modify_identifiers(identifier_list, db_book.identifiers, calibre_db.session)
+    if warning:
+        flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
+    modify_date |= modification
+
     return db_book, input_authors, title_dir, renamed_authors
 
 
diff --git a/cps/epub.py b/cps/epub.py
index 80c12c356..d358d0385 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -63,13 +63,15 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     epub_metadata = {}
 
-    for s in ['title', 'description', 'creator', 'language', 'subject']:
+    for s in ['title', 'description', 'creator', 'language', 'subject', 'publisher', 'date']:
         tmp = p.xpath('dc:%s/text()' % s, namespaces=ns)
         if len(tmp) > 0:
             if s == 'creator':
                 epub_metadata[s] = ' & '.join(split_authors(tmp))
             elif s == 'subject':
                 epub_metadata[s] = ', '.join(tmp)
+            elif s == 'date':
+                epub_metadata[s] = tmp[0][:10]
             else:
                 epub_metadata[s] = tmp[0]
         else:
@@ -78,6 +80,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     if epub_metadata['subject'] == 'Unknown':
         epub_metadata['subject'] = ''
 
+    if epub_metadata['publisher'] == u'Unknown':
+        epub_metadata['publisher'] = ''
+
+    if epub_metadata['date'] == u'Unknown':
+        epub_metadata['date'] = ''
+
     if epub_metadata['description'] == u'Unknown':
         description = tree.xpath("//*[local-name() = 'description']/text()")
         if len(description) > 0:
@@ -92,6 +100,14 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     cover_file = parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path)
 
+    identifiers = []
+    for node in p.xpath('dc:identifier', namespaces=ns):
+        identifier_name=node.attrib.values()[-1];
+        identifier_value=node.text;
+        if identifier_name in ('uuid','calibre'):
+            continue;
+        identifiers.append( [identifier_name, identifier_value] )
+
     if not epub_metadata['title']:
         title = original_file_name
     else:
@@ -108,7 +124,9 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         series=epub_metadata['series'].encode('utf-8').decode('utf-8'),
         series_id=epub_metadata['series_id'].encode('utf-8').decode('utf-8'),
         languages=epub_metadata['language'],
-        publisher="")
+        publisher=epub_metadata['publisher'].encode('utf-8').decode('utf-8'),
+        pubdate=epub_metadata['date'],
+        identifiers=identifiers)
 
 
 def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
diff --git a/cps/fb2.py b/cps/fb2.py
index 21586736f..c4b89fd6c 100644
--- a/cps/fb2.py
+++ b/cps/fb2.py
@@ -77,4 +77,6 @@ def get_fb2_info(tmp_file_path, original_file_extension):
         series="",
         series_id="",
         languages="",
-        publisher="")
+        publisher="",
+        pubdate="",
+        identifiers=[])
diff --git a/cps/uploader.py b/cps/uploader.py
index 992d188c1..7a0359b3d 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -107,52 +107,10 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension):
         series="",
         series_id="",
         languages="",
-        publisher="")
-
-
-def parse_xmp(pdf_file):
-    """
-    Parse XMP Metadata and prepare for BookMeta object
-    """
-    try:
-        xmp_info = pdf_file.getXmpMetadata()
-    except Exception as ex:
-        log.debug('Can not read XMP metadata {}'.format(ex))
-        return None
-
-    if xmp_info:
-        try:
-            xmp_author = xmp_info.dc_creator # list
-        except AttributeError:
-            xmp_author = ['']
-
-        if xmp_info.dc_title:
-            xmp_title = xmp_info.dc_title['x-default']
-        else:
-            xmp_title = ''
-
-        if xmp_info.dc_description:
-            xmp_description = xmp_info.dc_description['x-default']
-        else:
-            xmp_description = ''
-
-        languages = []
-        try:
-            for i in xmp_info.dc_language:
-                #calibre-web currently only takes one language.
-                languages.append(isoLanguages.get_lang3(i))
-        except AttributeError:
-            languages.append('')
-
-        xmp_tags = ', '.join(xmp_info.dc_subject)
-        xmp_publisher = ', '.join(xmp_info.dc_publisher)
-
-        return {'author': xmp_author,
-                    'title': xmp_title,
-                    'subject': xmp_description,
-                    'tags': xmp_tags, 'languages': languages,
-                    'publisher': xmp_publisher
-                    }
+        publisher="",
+        pubdate="",
+        identifiers=[]
+        )
 
 
 def parse_xmp(pdf_file):
@@ -251,7 +209,9 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         series="",
         series_id="",
         languages=','.join(languages),
-        publisher=publisher)
+        publisher=publisher,
+        pubdate="",
+        identifiers=[])
 
 
 def pdf_preview(tmp_file_path, tmp_dir):

From a63af5882ed9e97284dc81cc198e06267b68ca1a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 5 Apr 2022 19:04:42 +0200
Subject: [PATCH 230/412] Fix for #2363 (Handle empty response from
 lubimyczytac metadata provider)

---
 cps/metadata_provider/lubimyczytac.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 814a785e7..90a6b2d83 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -113,17 +113,18 @@ class LubimyCzytac(Metadata):
     ) -> Optional[List[MetaRecord]]:
         if self.active:
             result = requests.get(self._prepare_query(title=query))
-            root = fromstring(result.text)
-            lc_parser = LubimyCzytacParser(root=root, metadata=self)
-            matches = lc_parser.parse_search_results()
-            if matches:
-                with ThreadPool(processes=10) as pool:
-                    final_matches = pool.starmap(
-                        lc_parser.parse_single_book,
-                        [(match, generic_cover, locale) for match in matches],
-                    )
-                return final_matches
-            return matches
+            if result.text:
+                root = fromstring(result.text)
+                lc_parser = LubimyCzytacParser(root=root, metadata=self)
+                matches = lc_parser.parse_search_results()
+                if matches:
+                    with ThreadPool(processes=10) as pool:
+                        final_matches = pool.starmap(
+                            lc_parser.parse_single_book,
+                            [(match, generic_cover, locale) for match in matches],
+                        )
+                    return final_matches
+                return matches
 
     def _prepare_query(self, title: str) -> str:
         query = ""

From d770e5392ee43789d51fcdbece4ad9f2c9f75d4c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 6 Apr 2022 11:12:57 +0200
Subject: [PATCH 231/412] Further fix for #2363

---
 cps/metadata_provider/lubimyczytac.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 90a6b2d83..4a77f4ea1 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -125,6 +125,7 @@ class LubimyCzytac(Metadata):
                         )
                     return final_matches
                 return matches
+            return []
 
     def _prepare_query(self, title: str) -> str:
         query = ""

From 1136383b9a2d0787018ff245f174a7f914cc8b4a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 11 Apr 2022 19:15:50 +0200
Subject: [PATCH 232/412] Bugfix for cli folder names as -p or -g parameters

---
 cps/__init__.py    |  4 ++--
 cps/cli.py         | 13 ++++++++++---
 cps/constants.py   |  2 ++
 cps/gdriveutils.py | 11 ++++-------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index 0b912d23c..62e45e727 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -91,7 +91,7 @@ if wtf_present:
 else:
     csrf = None
 
-ub.init_db(cli.settingspath)
+ub.init_db(cli.settings_path)
 # pylint: disable=no-member
 config = config_sql.load_configuration(ub.session)
 
@@ -106,7 +106,7 @@ log = logger.create()
 from . import services
 
 db.CalibreDB.update_config(config)
-db.CalibreDB.setup_db(config.config_calibre_dir, cli.settingspath)
+db.CalibreDB.setup_db(config.config_calibre_dir, cli.settings_path)
 
 
 calibre_db = db.CalibreDB()
diff --git a/cps/cli.py b/cps/cli.py
index 36c03513e..629fd76d2 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -24,7 +24,7 @@ import socket
 from .constants import CONFIG_DIR as _CONFIG_DIR
 from .constants import STABLE_VERSION as _STABLE_VERSION
 from .constants import NIGHTLY_VERSION as _NIGHTLY_VERSION
-
+from .constants import DEFAULT_SETTINGS_FILE, DEFAULT_GDRIVE_FILE
 
 def version_info():
     if _NIGHTLY_VERSION[1].startswith('$Format'):
@@ -51,8 +51,15 @@ parser.add_argument('-d', action='store_true', help='Dry run of updater to check
 parser.add_argument('-r', action='store_true', help='Enable public database reconnect route under /reconnect')
 args = parser.parse_args()
 
-settingspath = args.p or os.path.join(_CONFIG_DIR, "app.db")
-gdpath       = args.g or os.path.join(_CONFIG_DIR, "gdrive.db")
+settings_path = args.p or os.path.join(_CONFIG_DIR, DEFAULT_SETTINGS_FILE)
+gd_path = args.g or os.path.join(_CONFIG_DIR, DEFAULT_GDRIVE_FILE)
+
+if os.path.isdir(settings_path):
+    settings_path = os.path.join(settings_path, DEFAULT_SETTINGS_FILE)
+
+if os.path.isdir(gd_path):
+    gd_path = os.path.join(gd_path, DEFAULT_GDRIVE_FILE)
+
 
 # handle and check parameter for ssl encryption
 certfilepath = None
diff --git a/cps/constants.py b/cps/constants.py
index f40d16b01..57c98be10 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -43,6 +43,8 @@ if HOME_CONFIG:
 else:
     CONFIG_DIR = os.environ.get('CALIBRE_DBPATH', BASE_DIR)
 
+DEFAULT_SETTINGS_FILE = "app.db"
+DEFAULT_GDRIVE_FILE = "gdrive.db"
 
 ROLE_USER               = 0 << 0
 ROLE_ADMIN              = 1 << 0
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 6073777e6..ee8ee9537 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -35,10 +35,6 @@ except ImportError:
 from sqlalchemy.exc import OperationalError, InvalidRequestError, IntegrityError
 from sqlalchemy.sql.expression import text
 
-#try:
-#    from six import __version__ as six_version
-#except ImportError:
-#    six_version = "not installed"
 try:
     from httplib2 import __version__ as httplib2_version
 except ImportError:
@@ -141,11 +137,12 @@ class Gdrive:
     def __init__(self):
         self.drive = getDrive(gauth=Gauth.Instance().auth)
 
+
 def is_gdrive_ready():
     return os.path.exists(SETTINGS_YAML) and os.path.exists(CREDENTIALS)
 
 
-engine = create_engine('sqlite:///{0}'.format(cli.gdpath), echo=False)
+engine = create_engine('sqlite:///{0}'.format(cli.gd_path), echo=False)
 Base = declarative_base()
 
 # Open session for database connection
@@ -193,11 +190,11 @@ def migrate():
                 session.execute('ALTER TABLE gdrive_ids2 RENAME to gdrive_ids')
             break
 
-if not os.path.exists(cli.gdpath):
+if not os.path.exists(cli.gd_path):
     try:
         Base.metadata.create_all(engine)
     except Exception as ex:
-        log.error("Error connect to database: {} - {}".format(cli.gdpath, ex))
+        log.error("Error connect to database: {} - {}".format(cli.gd_path, ex))
         raise
 migrate()
 

From 652d0fd86faac32680444c96d57327fd29c8a7b8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 11 Apr 2022 19:40:43 +0200
Subject: [PATCH 233/412] Update google-api-python-client version

---
 optional-requirements.txt | 4 ++--
 setup.cfg                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 208d889dc..fea410e5c 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.43.0
+google-api-python-client>=1.7.11,<2.44.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.43.0
+google-api-python-client>=1.7.11,<2.44.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/setup.cfg b/setup.cfg
index 49496fc98..e9c236047 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -61,7 +61,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.43.0
+	google-api-python-client>=1.7.11,<2.44.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -74,7 +74,7 @@ gdrive =
 	rsa>=3.4.2,<4.9.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.6.0
-	google-api-python-client>=1.7.11,<2.43.0
+	google-api-python-client>=1.7.11,<2.44.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From adf6728f142378d1b3b2c81acae21d02858d6de3 Mon Sep 17 00:00:00 2001
From: Wulf Rajek <40003252+AnonTester@users.noreply.github.com>
Date: Tue, 12 Apr 2022 00:22:05 +0100
Subject: [PATCH 234/412] Gracefully deal with incorrect dates

---
 cps/editbooks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index db87d8911..b14f79e00 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -983,9 +983,9 @@ def create_book_on_upload(modify_date, meta):
     # combine path and normalize path from Windows systems
     path = os.path.join(author_dir, title_dir).replace('\\', '/')
 
-    if meta.pubdate != "":
+    try:
         pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
-    else:
+    except:
         pubdate = datetime(101, 1, 1)
 
     # Calibre adds books with utc as timezone

From 028e6855a71bb064ffc5a8b34cd240e5e5442c06 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 12 Apr 2022 18:45:06 +0200
Subject: [PATCH 235/412] Pagination button disapears in standard theme once
 infinite scroll is triggered

---
 cps/static/js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index b18cf229d..91084f06e 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -381,8 +381,8 @@ $(function() {
             //extraScrollPx: 300
         });
         $loadMore.on( "append.infiniteScroll", function( event, response, path, data ) {
+            $(".pagination").addClass("hidden").html(() => $(response).find(".pagination").html());
             if ($("body").hasClass("blur")) {
-                $(".pagination").addClass("hidden").html(() => $(response).find(".pagination").html());
                 $(" a:not(.dropdown-toggle) ")
                   .removeAttr("data-toggle");
             }

From 83b99fcb1a6fc60a81023fec835e22883c2a903e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 12 Apr 2022 19:33:00 +0200
Subject: [PATCH 236/412] Fix cover upload url with spaces at the end Support
 image/jpg as upload format mimetype, remove redundant check of mimetype

---
 cps/editbooks.py |  2 +-
 cps/helper.py    | 30 ++++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index c07e5d243..ab2bd55e1 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -810,7 +810,7 @@ def edit_book(book_id):
             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)
+                result, error = helper.save_cover_from_url(to_save["cover_url"].strip(), book.path)
                 if result is True:
                     book.has_cover = 1
                     modify_date = True
diff --git a/cps/helper.py b/cps/helper.py
index 5d5cc0210..69b3e2f83 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -753,6 +753,9 @@ def save_cover_from_url(url, book_path):
             log.error("python modul advocate is not installed but is needed")
             return False, _("Python modul 'advocate' is not installed but is needed for cover downloads")
         img.raise_for_status()
+        #            # cover_processing()
+            # move_coverfile(meta, db_book)
+
         return save_cover(img, book_path)
     except (socket.gaierror,
             requests.exceptions.HTTPError,
@@ -802,24 +805,23 @@ def save_cover(img, book_path):
     content_type = img.headers.get('content-type')
 
     if use_IM:
-        if content_type not in ('image/jpeg', 'image/png', 'image/webp', 'image/bmp'):
+        if content_type not in ('image/jpeg', 'image/jpg', '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 != 'image/jpg':
-            try:
-                if hasattr(img, 'stream'):
-                    imgc = Image(blob=img.stream)
-                else:
-                    imgc = Image(blob=io.BytesIO(img.content))
-                imgc.format = 'jpeg'
-                imgc.transform_colorspace("rgb")
-                img = imgc
-            except (BlobError, MissingDelegateError):
-                log.error("Invalid cover file content")
-                return False, _("Invalid cover file content")
+        try:
+            if hasattr(img, 'stream'):
+                imgc = Image(blob=img.stream)
+            else:
+                imgc = Image(blob=io.BytesIO(img.content))
+            imgc.format = 'jpeg'
+            imgc.transform_colorspace("rgb")
+            img = imgc
+        except (BlobError, MissingDelegateError):
+            log.error("Invalid cover file content")
+            return False, _("Invalid cover file content")
     else:
-        if content_type not in 'image/jpeg':
+        if content_type not in ['image/jpeg', 'image/jpg']:
             log.error("Only jpg/jpeg files are supported as coverfile")
             return False, _("Only jpg/jpeg files are supported as coverfile")
 

From df53a5d8c97fe6790f75ed1d9e073b5f614dfc01 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 13 Apr 2022 18:37:23 +0200
Subject: [PATCH 237/412] Prevent none comment while upload pdf documents

---
 cps/uploader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/uploader.py b/cps/uploader.py
index 992d188c1..6aa811be5 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -231,7 +231,7 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         if title == '':
             title = doc_info.title if doc_info.title else original_file_name
         if subject == '':
-            subject = doc_info.subject
+            subject = doc_info.subject or ""
         if tags == '' and '/Keywords' in doc_info:
             if isinstance(doc_info['/Keywords'], bytes):
                 tags = doc_info['/Keywords'].decode('utf-8')

From 2f3e5eadebd58dd4940d6f143c34f0368f084ccd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 13 Apr 2022 19:34:14 +0200
Subject: [PATCH 238/412] Bug fix after merge (renamed variable)

---
 cps/ub.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/ub.py b/cps/ub.py
index 8d273c530..0360b5727 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -857,7 +857,7 @@ def init_db(app_db_path):
 
 
 def get_new_session_instance():
-    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settingspath), echo=False)
+    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settings_path), echo=False)
     new_session = scoped_session(sessionmaker())
     new_session.configure(bind=new_engine)
 

From 6184e2b7bc79b4b1a5fcd4251c73c64d522db18d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 14 Apr 2022 19:58:15 +0200
Subject: [PATCH 239/412] Updated cve numbers

---
 SECURITY.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 78d5c6e22..1b93b5f9d 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -24,20 +24,20 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.13      | JavaScript could get executed  in the shelf title                                                                  ||
 | V 0.6.13      | Login with the old session cookie after logout. Thanks to @ibarrionuevo                                            ||
 | V 0.6.14      | CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)                                              |CVE-2021-25965|
-| V 0.6.14      | Migrated some routes to POST-requests (CSRF protection). Thanks to @scara31                                        ||
-| V 0.6.15      | Fix for "javascript:" script links in identifier. Thanks to @scara31                                               ||
+| V 0.6.14      | Migrated some routes to POST-requests (CSRF protection). Thanks to @scara31                                        |CVE-2021-4164|
+| V 0.6.15      | Fix for "javascript:" script links in identifier. Thanks to @scara31                                               |CVE-2021-4170|
 | V 0.6.15      | Cross-Site Scripting vulnerability on uploaded cover file names. Thanks to @ibarrionuevo                           ||
 | V 0.6.15      | Creating public shelfs is now denied if user is missing the edit public shelf right. Thanks to @ibarrionuevo       ||
 | V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                    ||
-| V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
-| V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
-| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             ||
-| V 0.6.16      | It's prevented to get the name of a private shelfs. Thanks to @nhiephon                                            ||
-| V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                            ||
-| V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             ||
+| V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   |CVE-2022-0352|
+| V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               |CVE-2022-0339|
+| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             |CVE-2022-0273|
+| V 0.6.16      | It's prevented to get the name of a private shelfs. Thanks to @nhiephon                                            |CVE-2022-0405|
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                            |CVE-2022-0767|
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             |CVE-2022-0766|
 | V 0.6.18      | Possible SQL Injection is prevented in user table  Thanks to Iman Sharafaldin (Forward Security)                   ||
-| V 0.6.18      | The SSRF protection no longer can be bypassed by IPV6/IPV4 embedding. Thanks to  @416e6e61                         ||
-| V 0.6.18      | The SSRF protection no longer can be bypassed to connect to other servers in the local network. Thanks to @michaellrowley ||
+| V 0.6.18      | The SSRF protection no longer can be bypassed by IPV6/IPV4 embedding. Thanks to  @416e6e61                         |CVE-2022-0939|
+| V 0.6.18      | The SSRF protection no longer can be bypassed to connect to other servers in the local network. Thanks to @michaellrowley |CVE-2022-0990|
 
 
 ## Statement regarding Log4j (CVE-2021-44228 and related)

From 09b381101b8975b22df304e8d5d6069d66bb9784 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 16 Apr 2022 17:01:41 +0200
Subject: [PATCH 240/412] Added "None" to list of file formats, tags, series,
 languages Unified languages.html and list.html template

---
 cps/db.py                    |  31 +++++-
 cps/templates/languages.html |  35 -------
 cps/templates/list.html      |   4 +-
 cps/web.py                   | 194 ++++++++++++++++++++++++++---------
 4 files changed, 176 insertions(+), 88 deletions(-)
 delete mode 100644 cps/templates/languages.html

diff --git a/cps/db.py b/cps/db.py
index d2977e073..ff3922742 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -903,9 +903,19 @@ class CalibreDB:
                     .join(books_languages_link).join(Books)\
                     .filter(self.common_filters(return_all_languages=return_all_languages)) \
                     .group_by(text('books_languages_link.lang_code')).all()
+            tags = list()
             for lang in languages:
-                lang[0].name = isoLanguages.get_language_name(get_locale(), lang[0].lang_code)
-            return sorted(languages, key=lambda x: x[0].name, reverse=reverse_order)
+                tag = Category(isoLanguages.get_language_name(get_locale(), lang[0].lang_code), lang[0].lang_code)
+                tags.append([tag, lang[1]])
+            # Append all books without language to list
+            if not return_all_languages:
+                no_lang_count = (self.session.query(Books)
+                                 .outerjoin(books_languages_link).outerjoin(Languages)
+                                 .filter(Languages.lang_code == None)
+                                 .filter(self.common_filters())
+                                 .count())
+                tags.append([Category(_("None"), "none"), no_lang_count])
+            return sorted(tags, key=lambda x: x[0].name, reverse=reverse_order)
         else:
             if not languages:
                 languages = self.session.query(Languages) \
@@ -977,3 +987,20 @@ def lcase(s):
         _log = logger.create()
         _log.error_or_exception(ex)
         return s.lower()
+
+
+class Category:
+    name = None
+    id = None
+    count = None
+
+    def __init__(self, name, cat_id):
+        self.name = name
+        self.id = cat_id
+        self.count = 1
+
+'''class Count:
+    count = None
+
+    def __init__(self, count):
+        self.count = count'''
diff --git a/cps/templates/languages.html b/cps/templates/languages.html
deleted file mode 100644
index c83398d5f..000000000
--- a/cps/templates/languages.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "layout.html" %}
-{% block body %}
-  <h1>{{title}}</h1>
-  <div class="filterheader hidden-xs">
-    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-    <div id="asc" data-order="{{ order }}" data-id="{{ data }}" class="btn btn-primary {% if order == 1 %} active{% endif%}"><span class="glyphicon glyphicon-sort-by-alphabet"></span></div>
-    <div id="desc" data-id="{{ data }}" class="btn btn-primary{% if order == 0 %} active{% endif%}"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></div>
-    {% if charlist|length %}
-    <div id="all" class="active btn btn-primary {% if charlist|length > 9 %}hidden-sm{% endif %}">{{_('All')}}</div>
-    {% endif %}
-    <div class="btn-group character {% if charlist|length > 9 %}hidden-sm{% endif %}" role="group">
-      {% for char in charlist%}
-      <div class="btn btn-primary char">{{char}}</div>
-      {% endfor %}
-    </div>
-  </div>
-  <div class="container">
-      <div div id="list" class="col-xs-12 col-sm-6">
-  {% for lang in languages %}
-      {% if loop.index0 == (loop.length/2)|int and loop.length > 20 %}
-      </div>
-      <div id="second" class="col-xs-12 col-sm-6">
-    {% endif %}
-    <div class="row" data-id="{{lang[0].name}}">
-        <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{lang[1]}}</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[0].lang_code, data=data, sort_param='stored')}}">{{lang[0].name}}</a></div>
-    </div>
-  {% endfor %}
-      </div>
-  </div>
-{% endblock %}
-{% block js %}
-<script src="{{ url_for('static', filename='js/filter_list.js') }}"></script>
-{% endblock %}
-
diff --git a/cps/templates/list.html b/cps/templates/list.html
index 71dbea11e..ed59661e4 100644
--- a/cps/templates/list.html
+++ b/cps/templates/list.html
@@ -14,7 +14,7 @@
       {% endif %}
       <div class="btn-group character {% if charlist|length > 9 %}hidden-sm{% endif %}" role="group">
         {% for char in charlist%}
-        <div class="btn btn-primary char">{{char.char}}</div>
+        <div class="btn btn-primary char">{{char[0]}}</div>
         {% endfor %}
       </div>
 
@@ -30,7 +30,7 @@
         <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-2 col-sm-2 col-md-1" align="left"><span class="badge">{{entry[1]}}</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_param='stored', book_id=entry.format )}}{% else %}{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].id )}}{% endif %}">
           {% if entry.name %}
           <div class="rating">
diff --git a/cps/web.py b/cps/web.py
index e6ca4d038..ae4b12a85 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -307,10 +307,20 @@ def get_matching_tags():
     return json_dumps
 
 
-def generate_char_list(data_colum, db_link):
-    return (calibre_db.session.query(func.upper(func.substr(data_colum, 1, 1)).label('char'))
+def generate_char_list(entries): # data_colum, db_link):
+    char_list = list()
+    for entry in entries:
+        upper_char = entry[0].name[0].upper()
+        if upper_char not in char_list:
+            char_list.append(upper_char)
+    return char_list
+
+
+def query_char_list(data_colum, db_link):
+    results = (calibre_db.session.query(func.upper(func.substr(data_colum, 1, 1)).label('char'))
             .join(db_link).join(db.Books).filter(calibre_db.common_filters())
             .group_by(func.upper(func.substr(data_colum, 1, 1))).all())
+    return results
 
 
 def get_sort_function(sort_param, data):
@@ -526,36 +536,66 @@ 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:
+    if book_id == '-1':
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
-                                                                db.Books.publishers.any(db.Publishers.id == book_id),
+                                                                db.Publishers.name == None,
                                                                 [db.Series.name, order[0][0], db.Books.series_index],
                                                                 True, config.config_read_column,
+                                                                db.books_publishers_link,
+                                                                db.Books.id == db.books_publishers_link.c.book,
+                                                                db.Publishers,
+                                                                db.books_series_link,
+                                                                db.Books.id == db.books_series_link.c.book,
+                                                                db.Series)
+        publisher = _("None")
+    else:
+        publisher = calibre_db.session.query(db.Publishers).filter(db.Publishers.id == book_id).first()
+        if publisher:
+            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][0],
+                                                                     db.Books.series_index],
+                                                                    True, config.config_read_column,
+                                                                    db.books_series_link,
+                                                                    db.Books.id == db.books_series_link.c.book,
+                                                                    db.Series)
+            publisher = publisher.name
+        else:
+            abort(404)
+
+    return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
+                                 title=_(u"Publisher: %(name)s", name=publisher),
+                                 page="publisher",
+                                 order=order[1])
+
+
+def render_series_books(page, book_id, order):
+    if book_id == '-1':
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Series.name == None,
+                                                                [order[0][0]],
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Publisher: %(name)s", name=publisher.name),
-                                     page="publisher",
-                                     order=order[1])
+        series_name = _("None")
     else:
-        abort(404)
-
-
-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, 0,
-                                                                db.Books,
-                                                                db.Books.series.any(db.Series.id == book_id),
-                                                                [order[0][0]],
-                                                                True, config.config_read_column)
-        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", order=order[1])
-    else:
-        abort(404)
+        series_name = calibre_db.session.query(db.Series).filter(db.Series.id == book_id).first()
+        if series_name:
+            entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                    db.Books,
+                                                                    db.Books.series.any(db.Series.id == book_id),
+                                                                    [order[0][0]],
+                                                                    True, config.config_read_column)
+            series_name = series_name.name
+        else:
+            abort(404)
+    return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
+                                 title=_(u"Series: %(serie)s", serie=series_name), page="series", order=order[1])
 
 
 def render_ratings_books(page, book_id, order):
@@ -591,33 +631,61 @@ 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:
+    if book_id == '-1':
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
-                                                                db.Books.tags.any(db.Tags.id == book_id),
+                                                                db.Tags.name == None,
                                                                 [order[0][0], db.Series.name, db.Books.series_index],
                                                                 True, config.config_read_column,
+                                                                db.books_tags_link,
+                                                                db.Books.id == db.books_tags_link.c.book,
+                                                                db.Tags,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Category: %(name)s", name=name.name), page="category", order=order[1])
+        tagsname = _("None")
     else:
-        abort(404)
+        tagsname = calibre_db.session.query(db.Tags).filter(db.Tags.id == book_id).first()
+        if tagsname:
+            entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                    db.Books,
+                                                                    db.Books.tags.any(db.Tags.id == book_id),
+                                                                    [order[0][0], db.Series.name,
+                                                                     db.Books.series_index],
+                                                                    True, config.config_read_column,
+                                                                    db.books_series_link,
+                                                                    db.Books.id == db.books_series_link.c.book,
+                                                                    db.Series)
+            tagsname = tagsname.name
+        else:
+            abort(404)
+    return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
+                                 title=_(u"Category: %(name)s", name=tagsname), page="category", order=order[1])
 
 
 def render_language_books(page, name, order):
     try:
-        lang_name = isoLanguages.get_language_name(get_locale(), name)
+        if name.lower() != "none":
+            lang_name = isoLanguages.get_language_name(get_locale(), name)
+        else:
+            lang_name = _("None")
     except KeyError:
         abort(404)
-
-    entries, random, pagination = calibre_db.fill_indexpage(page, 0,
-                                                            db.Books,
-                                                            db.Books.languages.any(db.Languages.lang_code == name),
-                                                            [order[0][0]],
-                                                            True, config.config_read_column)
+    if name == "none":
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Languages.lang_code == None,
+                                                                [order[0][0]],
+                                                                True, config.config_read_column,
+                                                                db.books_languages_link,
+                                                                db.Books.id == db.books_languages_link.c.book,
+                                                                db.Languages)
+    else:
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Books.languages.any(db.Languages.lang_code == name),
+                                                                [order[0][0]],
+                                                                True, config.config_read_column)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language", order=order[1])
 
@@ -880,7 +948,7 @@ def author_list():
         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(order).all()
-        char_list = generate_char_list(db.Authors.sort, db.books_authors_link)
+        char_list = query_char_list(db.Authors.sort, db.books_authors_link)
         # If not creating a copy, readonly databases can not display authornames with "|" in it as changing the name
         # starts a change session
         author_copy = copy.deepcopy(entries)
@@ -926,7 +994,14 @@ def publisher_list():
         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(order).all()
-        char_list = generate_char_list(db.Publishers.name, db.books_publishers_link)
+        no_publisher_count = (calibre_db.session.query(db.Books)
+                           .outerjoin(db.books_publishers_link).outerjoin(db.Publishers)
+                           .filter(db.Publishers.name == None)
+                           .filter(calibre_db.common_filters())
+                           .count())
+        if no_publisher_count:
+            entries.append([db.Category(_("None"), "-1"), no_publisher_count])
+        char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher", order=order_no)
     else:
@@ -943,11 +1018,18 @@ def series_list():
         else:
             order = db.Series.sort.asc()
             order_no = 1
-        char_list = generate_char_list(db.Series.sort, db.books_series_link)
+        char_list = query_char_list(db.Series.sort, db.books_series_link)
         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(order).all()
+            no_series_count = (calibre_db.session.query(db.Books)
+                            .outerjoin(db.books_series_link).outerjoin(db.Series)
+                            .filter(db.Series.name == None)
+                            .filter(calibre_db.common_filters())
+                            .count())
+            if no_series_count:
+                entries.append([db.Category(_("None"), "-1"), no_series_count])
             return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", order=order_no)
         else:
@@ -976,6 +1058,12 @@ def ratings_list():
                                            (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(order).all()
+        no_rating_count = (calibre_db.session.query(db.Books)
+                           .outerjoin(db.books_ratings_link).outerjoin(db.Ratings)
+                           .filter(db.Ratings.name == None)
+                           .filter(calibre_db.common_filters())
+                           .count())
+        entries.append([db.Category(_("None"), "-1"), no_rating_count])
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
                                      title=_(u"Ratings list"), page="ratingslist", data="ratings", order=order_no)
     else:
@@ -997,6 +1085,12 @@ def formats_list():
                                            db.Data.format.label('format')) \
             .join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(db.Data.format).order_by(order).all()
+        no_format_count = (calibre_db.session.query(db.Books).outerjoin(db.Data)
+                           .filter(db.Data.format == None)
+                           .filter(calibre_db.common_filters())
+                           .count())
+        if no_format_count:
+            entries.append([db.Category(_("None"), "-1"), no_format_count])
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
                                      title=_(u"File formats list"), page="formatslist", data="formats", order=order_no)
     else:
@@ -1008,15 +1102,10 @@ def formats_list():
 def language_overview():
     if current_user.check_visibility(constants.SIDEBAR_LANGUAGE) and current_user.filter_language() == u"all":
         order_no = 0 if current_user.get_view_property('language', 'dir') == 'desc' else 1
-        char_list = list()
         languages = calibre_db.speaking_language(reverse_order=not order_no, with_count=True)
-        for lang in languages:
-            upper_lang = lang[0].name[0].upper()
-            if upper_lang not in char_list:
-                char_list.append(upper_lang)
-        return render_title_template('languages.html', languages=languages,
-                                     charlist=char_list, title=_(u"Languages"), page="langlist",
-                                     data="language", order=order_no)
+        char_list = generate_char_list(languages)
+        return render_title_template('list.html', entries=languages, folder='web.books_list', charlist=char_list,
+                                     title=_(u"Languages"), page="langlist", data="language", order=order_no)
     else:
         abort(404)
 
@@ -1034,7 +1123,14 @@ def category_list():
         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(order).filter(calibre_db.common_filters()) \
             .group_by(text('books_tags_link.tag')).all()
-        char_list = generate_char_list(db.Tags.name, db.books_tags_link)
+        no_tag_count = (calibre_db.session.query(db.Books)
+                         .outerjoin(db.books_tags_link).outerjoin(db.Tags)
+                        .filter(db.Tags.name == None)
+                         .filter(calibre_db.common_filters())
+                         .count())
+        if no_tag_count:
+            entries.append([db.Category(_("None"), "-1"), no_tag_count])
+        char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Categories"), page="catlist", data="category", order=order_no)
     else:

From c61e5d6ac03deaff00d1b4b85f2204ffb56c556b Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 17 Apr 2022 11:54:46 +0200
Subject: [PATCH 241/412] Fix amazon metadata-provider

---
 cps/metadata_provider/amazon.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index fef636693..7de0d4153 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -113,9 +113,9 @@ class Amazon(Metadata):
                     except (AttributeError, TypeError):
                         match.cover = ""
                     return match, index
-            except Exception as e:
-                log.error_or_exception(e)
-                return
+                except Exception as e:
+                    log.error_or_exception(e)
+                    return
 
         val = list()
         if self.active:

From c92d65aad3ea4f2247e34c2d5c7946852959cbd8 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 17 Apr 2022 19:05:56 +0200
Subject: [PATCH 242/412] Catch more errors on import metadata provider

---
 cps/search_metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index 4bbca58fb..0070e78f1 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -57,7 +57,7 @@ for f in modules:
         try:
             importlib.import_module("cps.metadata_provider." + a)
             new_list.append(a)
-        except ImportError as e:
+        except (ImportError, IndentationError, SyntaxError) as e:
             log.error("Import error for metadata source: {} - {}".format(a, e))
             pass
 

From 3cbbf6fa860f0e497794a808f84aac107f05bd75 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Mon, 18 Apr 2022 12:42:05 +0800
Subject: [PATCH 243/412] Update Simplifield Chinese translation

---
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        |  Bin 50015 -> 51107 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 1236 ++++++++--------
 messages.pot                                  | 1275 +++++++++--------
 3 files changed, 1280 insertions(+), 1231 deletions(-)

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index d0ffc14cfa5de9b938d7fce5491833ef83bc8c9e..a2e59093ef91fea52df06200bc7adefc43ba2e1d 100644
GIT binary patch
delta 13491
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

delta 12496
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

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 73bc4efa4..1f7099cf2 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-15 09:19+0100\n"
+"POT-Creation-Date: 2022-04-18 12:20+0800\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,578 +16,581 @@ msgstr ""
 "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"
+"Generated-By: Babel 2.9.1\n"
 
-#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
-msgid "not installed"
-msgstr "未安装"
-
-#: cps/about.py:47 cps/about.py:63
-msgid "installed"
-msgstr "已安装"
-
-#: cps/about.py:145
+#: cps/about.py:86
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/admin.py:144
+#: cps/admin.py:141
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/admin.py:146
+#: cps/admin.py:143
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/admin.py:154
+#: cps/admin.py:151
 msgid "Reconnect successful"
 msgstr "重新连接成功"
 
-#: cps/admin.py:157
+#: cps/admin.py:154
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
-#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
-#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
-#: cps/uploader.py:103
+#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
+#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
+#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:188
+#: cps/admin.py:197
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/admin.py:207
+#: cps/admin.py:217
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:244
+#: cps/admin.py:255
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:277 cps/templates/admin.html:50
+#: cps/admin.py:289 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "管理用户"
 
-#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1615
+#: cps/admin.py:360 cps/admin.py:1648
 msgid "User not found"
 msgstr "找不到用户"
 
-#: cps/admin.py:357
+#: cps/admin.py:374
 msgid "{} users deleted successfully"
 msgstr "成功删除 {} 个用户"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:133
+#: cps/admin.py:397 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "显示全部"
 
-#: cps/admin.py:400 cps/admin.py:406
+#: cps/admin.py:418 cps/admin.py:424
 msgid "Malformed request"
 msgstr "格式错误的请求"
 
-#: cps/admin.py:418 cps/admin.py:1493
+#: cps/admin.py:436 cps/admin.py:1526
 msgid "Guest Name can't be changed"
 msgstr "访客名称无法更改"
 
-#: cps/admin.py:430
+#: cps/admin.py:448
 msgid "Guest can't have this role"
 msgstr "游客无法拥有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1451
+#: cps/admin.py:460 cps/admin.py:1484
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
-#: cps/admin.py:446 cps/admin.py:460
+#: cps/admin.py:464 cps/admin.py:478
 msgid "Value has to be true or false"
 msgstr "值必须是 true 或 false"
 
-#: cps/admin.py:448
+#: cps/admin.py:466
 msgid "Invalid role"
 msgstr "无效角色"
 
-#: cps/admin.py:452
+#: cps/admin.py:470
 msgid "Guest can't have this view"
 msgstr "游客无法拥有此视图"
 
-#: cps/admin.py:462
+#: cps/admin.py:480
 msgid "Invalid view"
 msgstr "无效视图"
 
-#: cps/admin.py:465
+#: cps/admin.py:483
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "游客的本地化是自动侦测而无法设置的"
 
-#: cps/admin.py:469
+#: cps/admin.py:487
 msgid "No Valid Locale Given"
 msgstr "无可用本地化"
 
-#: cps/admin.py:480
+#: cps/admin.py:498
 msgid "No Valid Book Language Given"
 msgstr "无有效书籍语言"
 
-#: cps/admin.py:482
+#: cps/admin.py:500 cps/editbooks.py:1267
 msgid "Parameter not found"
 msgstr "参数未找到"
 
-#: cps/admin.py:533
+#: cps/admin.py:553
 msgid "Invalid Read Column"
 msgstr "无效的阅读列"
 
-#: cps/admin.py:539
+#: cps/admin.py:559
 msgid "Invalid Restricted Column"
 msgstr "无效的限制列"
 
-#: cps/admin.py:560 cps/admin.py:1323
+#: cps/admin.py:579 cps/admin.py:1355
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:572
+#: cps/admin.py:591
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "您确定删除Kobo Token吗？"
 
-#: cps/admin.py:574
+#: cps/admin.py:593
 msgid "Do you really want to delete this domain?"
 msgstr "您确定要删除此域吗？"
 
-#: cps/admin.py:576
+#: cps/admin.py:595
 msgid "Do you really want to delete this user?"
 msgstr "您确定要删除此用户吗？"
 
-#: cps/admin.py:578
+#: cps/admin.py:597
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您确定要删除此书架吗？"
 
-#: cps/admin.py:580
+#: cps/admin.py:599
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "您确定要修改选定用户的本地化设置吗？"
 
-#: cps/admin.py:582
+#: cps/admin.py:601
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "您确定要修改选定用户的可见书籍语言吗？"
 
-#: cps/admin.py:584
+#: cps/admin.py:603
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定角色吗？"
 
-#: cps/admin.py:586
+#: cps/admin.py:605
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定限制吗？"
 
-#: cps/admin.py:588
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定可视化限制吗？"
 
-#: cps/admin.py:590
+#: cps/admin.py:610
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "您确定要更改所选用户的书架同步行为吗？"
 
-#: cps/admin.py:592
+#: cps/admin.py:612
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "您确定要更改 Calibre 库位置吗？"
 
-#: cps/admin.py:594
+#: cps/admin.py:614
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr ""
+msgstr "您确定要删除 Calibre-Web 的同步数据库以强制与您的 Kobo Reader 进行完全同步吗"
 
-#: cps/admin.py:743
+#: cps/admin.py:764
 msgid "Tag not found"
 msgstr "标签未找到"
 
-#: cps/admin.py:755
+#: cps/admin.py:776
 msgid "Invalid Action"
 msgstr "无效的动作"
 
-#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
+#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒绝"
 
-#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
+#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允许"
 
-#: cps/admin.py:913
+#: cps/admin.py:936
 msgid "{} sync entries deleted"
-msgstr ""
+msgstr "{} 同步项目被删除"
 
-#: cps/admin.py:1036
+#: cps/admin.py:1059
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:1081
+#: cps/admin.py:1104
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1087
+#: cps/admin.py:1110
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:1117
+#: cps/admin.py:1140
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:1123
+#: cps/admin.py:1146
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "请输入一个LDAP服务账号和密码 "
 
-#: cps/admin.py:1126
+#: cps/admin.py:1149
 msgid "Please Enter a LDAP Service Account"
 msgstr "请输入一个LDAP服务账号"
 
-#: cps/admin.py:1131
+#: cps/admin.py:1154
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1133
+#: cps/admin.py:1156
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1160
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1139
+#: cps/admin.py:1162
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1169
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成员用户过滤器需要有一个“%s”格式标识符"
 
-#: cps/admin.py:1148
+#: cps/admin.py:1171
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成员用户过滤器中有不匹配的括号"
 
-#: cps/admin.py:1155
+#: cps/admin.py:1178
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1521
-#: cps/admin.py:1590 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:279 cps/shelf.py:341 cps/shelf.py:376 cps/shelf.py:451
-msgid "Settings DB is not Writeable"
-msgstr "设置数据库不可写入"
-
-#: cps/admin.py:1208
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "数据库路径无效，请输入正确的路径"
-
-#: cps/admin.py:1223
-msgid "DB is not Writeable"
-msgstr "数据库不可写入"
-
-#: cps/admin.py:1235
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "密钥文件路径无效，请输入正确的路径"
-
-#: cps/admin.py:1239
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "证书文件路径无效，请输入正确的路径"
-
-#: cps/admin.py:1346
-msgid "Database Settings updated"
-msgstr "数据库设置已更新"
-
-#: cps/admin.py:1354
-msgid "Database Configuration"
-msgstr "数据库配置"
-
-#: cps/admin.py:1370 cps/web.py:1479
-msgid "Please fill out all fields!"
-msgstr "请填写所有字段！"
-
-#: cps/admin.py:1378
-msgid "E-mail is not from valid domain"
-msgstr "邮箱不在有效域中"
-
-#: cps/admin.py:1384 cps/admin.py:1543
-msgid "Add new user"
-msgstr "添加新用户"
-
-#: cps/admin.py:1395
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "用户“%(user)s”已创建"
-
-#: cps/admin.py:1401
-msgid "Found an existing account for this e-mail address or name."
-msgstr "使用此邮箱或用户名的账号已经存在。"
-
-#: cps/admin.py:1430
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "用户“%(nick)s”已删除"
-
-#: cps/admin.py:1432 cps/admin.py:1433
-msgid "Can't delete Guest User"
-msgstr "无法删除游客用户"
-
-#: cps/admin.py:1436
-msgid "No admin user remaining, can't delete user"
-msgstr "管理员账户不存在，无法删除用户"
-
-#: cps/admin.py:1509 cps/admin.py:1634
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "编辑用户 %(nick)s"
-
-#: cps/admin.py:1513
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "用户“%(nick)s”已更新"
-
-#: cps/admin.py:1517 cps/admin.py:1649 cps/web.py:1504 cps/web.py:1564
-msgid "An unknown error occurred. Please try again later."
-msgstr "发生一个未知错误，请稍后再试。"
-
-#: cps/admin.py:1552 cps/templates/admin.html:98
-msgid "Edit E-mail Server Settings"
-msgstr "编辑邮件服务器设置"
-
-#: cps/admin.py:1571
-msgid "Gmail Account Verification Successful"
-msgstr "G-Mail账号校验成功"
-
-#: cps/admin.py:1597
-#, python-format
-msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
-
-#: cps/admin.py:1600
-#, python-format
-msgid "There was an error sending the Test e-mail: %(res)s"
-msgstr "发送测试邮件时出错：%(res)s"
-
-#: cps/admin.py:1602
-msgid "Please configure your e-mail address first..."
-msgstr "请先配置您的邮箱地址..."
-
-#: cps/admin.py:1604
-msgid "E-mail server settings updated"
-msgstr "邮件服务器设置已更新"
-
-#: cps/admin.py:1646
-#, python-format
-msgid "Password for user %(user)s reset"
-msgstr "用户 %(user)s 的密码已重置"
-
-#: cps/admin.py:1652 cps/web.py:1444
-msgid "Please configure the SMTP mail settings first..."
-msgstr "请先配置SMTP邮箱设置..."
-
-#: cps/admin.py:1663
-msgid "Logfile viewer"
-msgstr "日志文件查看器"
-
-#: cps/admin.py:1729
-msgid "Requesting update package"
-msgstr "正在请求更新包"
-
-#: cps/admin.py:1730
-msgid "Downloading update package"
-msgstr "正在下载更新包"
-
-#: cps/admin.py:1731
-msgid "Unzipping update package"
-msgstr "正在解压更新包"
-
-#: cps/admin.py:1732
-msgid "Replacing files"
-msgstr "正在替换文件"
-
-#: cps/admin.py:1733
-msgid "Database connections are closed"
-msgstr "数据库连接已关闭"
-
-#: cps/admin.py:1734
-msgid "Stopping server"
-msgstr "正在停止服务器"
-
-#: cps/admin.py:1735
-msgid "Update finished, please press okay and reload page"
-msgstr "更新完成，请点击确定并刷新页面"
-
-#: cps/admin.py:1736 cps/admin.py:1737 cps/admin.py:1738 cps/admin.py:1739
-#: cps/admin.py:1740 cps/admin.py:1741
-msgid "Update failed:"
-msgstr "更新失败："
-
-#: cps/admin.py:1736 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
-msgid "HTTP Error"
-msgstr "HTTP错误"
-
-#: cps/admin.py:1737 cps/updater.py:387 cps/updater.py:599
-msgid "Connection error"
-msgstr "连接错误"
-
-#: cps/admin.py:1738 cps/updater.py:389 cps/updater.py:601
-msgid "Timeout while establishing connection"
-msgstr "建立连接超时"
-
-#: cps/admin.py:1739 cps/updater.py:391 cps/updater.py:603
-msgid "General error"
-msgstr "一般错误"
-
-#: cps/admin.py:1740
-msgid "Update file could not be saved in temp dir"
-msgstr "更新文件无法保存在临时目录中"
-
-#: cps/admin.py:1741
-msgid "Files could not be replaced during update"
-msgstr "更新期间无法替换文件"
-
-#: cps/admin.py:1765
-msgid "Failed to extract at least One LDAP User"
-msgstr "未能提取至少一个LDAP用户"
-
-#: cps/admin.py:1810
-msgid "Failed to Create at Least One LDAP User"
-msgstr "未能创建至少一个LDAP用户"
-
-#: cps/admin.py:1823
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "错误：%(ldaperror)s"
-
-#: cps/admin.py:1827
-msgid "Error: No user returned in response of LDAP server"
-msgstr "错误：在LDAP服务器的响应中没有返回用户"
-
-#: cps/admin.py:1860
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "数据库中没有找到至少一个LDAP用户"
-
-#: cps/admin.py:1862
-msgid "{} User Successfully Imported"
-msgstr "{} 用户被成功导入"
-
-#: cps/converter.py:30
-msgid "not configured"
-msgstr "未配置"
-
-#: cps/converter.py:32
-msgid "Execution permissions missing"
-msgstr "缺少执行权限"
-
-#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
-#, python-format
-msgid "Custom Column No.%(column)d is not existing in calibre database"
-msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
-
-#: cps/editbooks.py:300 cps/editbooks.py:302
-msgid "Book Format Successfully Deleted"
-msgstr "书籍格式已成功删除"
-
-#: cps/editbooks.py:309 cps/editbooks.py:311
-msgid "Book Successfully Deleted"
-msgstr "书籍已成功删除"
-
-#: cps/editbooks.py:361
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
-#: cps/web.py:1744 cps/web.py:1811
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
-
-#: cps/editbooks.py:410
-msgid "edit metadata"
-msgstr "编辑元数据"
-
-#: cps/editbooks.py:458
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
-
-#: cps/editbooks.py:494 cps/editbooks.py:958
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "'%(langname)s' 不是一种有效语言"
-
-#: cps/editbooks.py:634 cps/editbooks.py:985
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
-
-#: cps/editbooks.py:638 cps/editbooks.py:989
-msgid "File to be uploaded must have an extension"
-msgstr "要上传的文件必须具有扩展名"
-
-#: cps/editbooks.py:650
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "创建路径 %(path)s 失败(权限拒绝)。"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "保存文件 %(file)s 失败。"
-
-#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
+#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
+#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
+#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
+#: cps/web.py:1742
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:678
+#: cps/admin.py:1235
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "数据库路径无效，请输入正确的路径"
+
+#: cps/admin.py:1253
+msgid "DB is not Writeable"
+msgstr "数据库不可写入"
+
+#: cps/admin.py:1266
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "密钥文件路径无效，请输入正确的路径"
+
+#: cps/admin.py:1270
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "证书文件路径无效，请输入正确的路径"
+
+#: cps/admin.py:1378
+msgid "Database Settings updated"
+msgstr "数据库设置已更新"
+
+#: cps/admin.py:1386
+msgid "Database Configuration"
+msgstr "数据库配置"
+
+#: cps/admin.py:1402 cps/web.py:1557
+msgid "Please fill out all fields!"
+msgstr "请填写所有字段！"
+
+#: cps/admin.py:1410
+msgid "E-mail is not from valid domain"
+msgstr "邮箱不在有效域中"
+
+#: cps/admin.py:1416 cps/admin.py:1576
+msgid "Add new user"
+msgstr "添加新用户"
+
+#: cps/admin.py:1427
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "用户“%(user)s”已创建"
+
+#: cps/admin.py:1433
+msgid "Found an existing account for this e-mail address or name."
+msgstr "使用此邮箱或用户名的账号已经存在。"
+
+#: cps/admin.py:1463
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "用户“%(nick)s”已删除"
+
+#: cps/admin.py:1465 cps/admin.py:1466
+msgid "Can't delete Guest User"
+msgstr "无法删除游客用户"
+
+#: cps/admin.py:1469
+msgid "No admin user remaining, can't delete user"
+msgstr "管理员账户不存在，无法删除用户"
+
+#: cps/admin.py:1542 cps/admin.py:1667
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "编辑用户 %(nick)s"
+
+#: cps/admin.py:1546
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "用户“%(nick)s”已更新"
+
+#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
+msgid "An unknown error occurred. Please try again later."
+msgstr "发生一个未知错误，请稍后再试。"
+
+#: cps/admin.py:1585 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "编辑邮件服务器设置"
+
+#: cps/admin.py:1604
+msgid "Gmail Account Verification Successful"
+msgstr "G-Mail账号校验成功"
+
+#: cps/admin.py:1630
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
+
+#: cps/admin.py:1633
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "发送测试邮件时出错：%(res)s"
+
+#: cps/admin.py:1635
+msgid "Please configure your e-mail address first..."
+msgstr "请先配置您的邮箱地址..."
+
+#: cps/admin.py:1637
+msgid "E-mail server settings updated"
+msgstr "邮件服务器设置已更新"
+
+#: cps/admin.py:1679
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "用户 %(user)s 的密码已重置"
+
+#: cps/admin.py:1685 cps/web.py:1522
+msgid "Please configure the SMTP mail settings first..."
+msgstr "请先配置SMTP邮箱设置..."
+
+#: cps/admin.py:1696
+msgid "Logfile viewer"
+msgstr "日志文件查看器"
+
+#: cps/admin.py:1762
+msgid "Requesting update package"
+msgstr "正在请求更新包"
+
+#: cps/admin.py:1763
+msgid "Downloading update package"
+msgstr "正在下载更新包"
+
+#: cps/admin.py:1764
+msgid "Unzipping update package"
+msgstr "正在解压更新包"
+
+#: cps/admin.py:1765
+msgid "Replacing files"
+msgstr "正在替换文件"
+
+#: cps/admin.py:1766
+msgid "Database connections are closed"
+msgstr "数据库连接已关闭"
+
+#: cps/admin.py:1767
+msgid "Stopping server"
+msgstr "正在停止服务器"
+
+#: cps/admin.py:1768
+msgid "Update finished, please press okay and reload page"
+msgstr "更新完成，请点击确定并刷新页面"
+
+#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
+#: cps/admin.py:1773 cps/admin.py:1774
+msgid "Update failed:"
+msgstr "更新失败："
+
+#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+msgid "HTTP Error"
+msgstr "HTTP错误"
+
+#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+msgid "Connection error"
+msgstr "连接错误"
+
+#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+msgid "Timeout while establishing connection"
+msgstr "建立连接超时"
+
+#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+msgid "General error"
+msgstr "一般错误"
+
+#: cps/admin.py:1773
+msgid "Update file could not be saved in temp dir"
+msgstr "更新文件无法保存在临时目录中"
+
+#: cps/admin.py:1774
+msgid "Files could not be replaced during update"
+msgstr "更新期间无法替换文件"
+
+#: cps/admin.py:1798
+msgid "Failed to extract at least One LDAP User"
+msgstr "未能提取至少一个LDAP用户"
+
+#: cps/admin.py:1843
+msgid "Failed to Create at Least One LDAP User"
+msgstr "未能创建至少一个LDAP用户"
+
+#: cps/admin.py:1856
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "错误：%(ldaperror)s"
+
+#: cps/admin.py:1860
+msgid "Error: No user returned in response of LDAP server"
+msgstr "错误：在LDAP服务器的响应中没有返回用户"
+
+#: cps/admin.py:1893
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "数据库中没有找到至少一个LDAP用户"
+
+#: cps/admin.py:1895
+msgid "{} User Successfully Imported"
+msgstr "{} 用户被成功导入"
+
+#: cps/converter.py:30
+msgid "not installed"
+msgstr "未安装"
+
+#: cps/converter.py:31
+msgid "Execution permissions missing"
+msgstr "缺少执行权限"
+
+#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
+
+#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
+#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
+#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+msgid "None"
+msgstr "无"
+
+#: cps/editbooks.py:295 cps/editbooks.py:297
+msgid "Book Format Successfully Deleted"
+msgstr "书籍格式已成功删除"
+
+#: cps/editbooks.py:304 cps/editbooks.py:306
+msgid "Book Successfully Deleted"
+msgstr "书籍已成功删除"
+
+#: cps/editbooks.py:358
+msgid "You are missing permissions to delete books"
+msgstr "您没有删除书籍的权限"
+
+#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
+#: cps/web.py:1825 cps/web.py:1870
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
+
+#: cps/editbooks.py:408
+msgid "edit metadata"
+msgstr "编辑元数据"
+
+#: cps/editbooks.py:457
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
+
+#: cps/editbooks.py:493 cps/editbooks.py:1001
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s' 不是一种有效语言"
+
+#: cps/editbooks.py:634
+msgid "User has no rights to upload additional file formats"
+msgstr "用户没有权限上传其他文件格式"
+
+#: cps/editbooks.py:639 cps/editbooks.py:1029
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
+
+#: cps/editbooks.py:643 cps/editbooks.py:1033
+msgid "File to be uploaded must have an extension"
+msgstr "要上传的文件必须具有扩展名"
+
+#: cps/editbooks.py:655
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "创建路径 %(path)s 失败(权限拒绝)。"
+
+#: cps/editbooks.py:660
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "保存文件 %(file)s 失败。"
+
+#: cps/editbooks.py:683
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:814
+#: cps/editbooks.py:697 cps/editbooks.py:809
+msgid "User has no rights to upload cover"
+msgstr "用户没有权限上传封面"
+
+#: cps/editbooks.py:828
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:848
+#: cps/editbooks.py:869
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:861
-msgid "Error editing book, please check logfile for details"
-msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
+#: cps/editbooks.py:887
+msgid "Error editing book: {}"
+msgstr "编辑书籍时出错: {}"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:951
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:997
+#: cps/editbooks.py:1041
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:1016
+#: cps/editbooks.py:1061
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:1063
+#: cps/editbooks.py:1117
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:1088
+#: cps/editbooks.py:1143
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1151
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:1100
+#: cps/editbooks.py:1155
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -600,174 +603,190 @@ msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/helper.py:77
+#: cps/helper.py:81
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id为 %(book)d 的书籍的 %(format)s 格式"
 
-#: cps/helper.py:83 cps/tasks/convert.py:73
+#: cps/helper.py:87 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:88
+#: cps/helper.py:92
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
+#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "发送到Kindle"
 
-#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
+#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "此邮件已经通过Calibre-Web发送。"
 
-#: cps/helper.py:109
+#: cps/helper.py:113
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web测试邮件"
 
-#: cps/helper.py:110
+#: cps/helper.py:114
 msgid "Test e-mail"
 msgstr "测试邮件"
 
-#: cps/helper.py:127
+#: cps/helper.py:131
 msgid "Get Started with Calibre-Web"
 msgstr "开启Calibre-Web之旅"
 
-#: cps/helper.py:132
+#: cps/helper.py:136
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
-#: cps/helper.py:143 cps/helper.py:149
+#: cps/helper.py:147 cps/helper.py:153
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "转换 %(orig)s 到 %(format)s 并发送到Kindle"
 
-#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
+#: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "发送 %(format)s 到Kindle"
 
-#: cps/helper.py:216 cps/tasks/convert.py:90
+#: cps/helper.py:220 cps/tasks/convert.py:92
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s发送到Kindle"
 
-#: cps/helper.py:221
+#: cps/helper.py:225
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取请求的文件。可能有错误的权限设置？"
 
-#: cps/helper.py:313
+#: cps/helper.py:353
+msgid "Read status could not set: {}"
+msgstr "阅读状态无法设置: {}"
+
+#: cps/helper.py:376
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
 
-#: cps/helper.py:319
+#: cps/helper.py:382
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "删除书籍 %(id)s失败：%(message)s"
 
-#: cps/helper.py:330
+#: cps/helper.py:393
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "仅从数据库中删除书籍 %(id)s，数据库中的书籍路径无效： %(path)s"
 
-#: cps/helper.py:385
+#: cps/helper.py:458
 #, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "将标题从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "将作者从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
 
-#: cps/helper.py:400
-#, 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:425 cps/helper.py:435 cps/helper.py:443
+#: cps/helper.py:529 cps/helper.py:538
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:464
+#: cps/helper.py:572
+#, 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:592
+msgid "Error in rename file in path: {}"
+msgstr "重命名此路径: {}文件时出错"
+
+#: cps/helper.py:610
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:504 cps/web.py:1659
+#: cps/helper.py:651 cps/web.py:1737
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
-#: cps/helper.py:512
+#: cps/helper.py:659
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/helper.py:522
+#: cps/helper.py:669
 msgid "Invalid e-mail address format"
 msgstr "无效的邮件地址格式"
 
-#: cps/helper.py:595
+#: cps/helper.py:754
+msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+msgstr "下载封面必须的 Python 模块'advocate' 未安装"
+
+#: cps/helper.py:767
 msgid "Error Downloading Cover"
 msgstr "下载封面时出错"
 
-#: cps/helper.py:598
+#: cps/helper.py:770
 msgid "Cover Format Error"
 msgstr "封面格式出错"
 
-#: cps/helper.py:608
+#: cps/helper.py:773
+msgid "You are not allowed to access localhost or the local network for cover uploads"
+msgstr "您没有访问本地主机或本地网络进行封面上传"
+
+#: cps/helper.py:783
 msgid "Failed to create path for cover"
 msgstr "创建封面路径失败"
 
-#: cps/helper.py:624
+#: cps/helper.py:799
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的图片文件，或者无法存储"
 
-#: cps/helper.py:635
+#: cps/helper.py:810
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件"
 
-#: cps/helper.py:648
+#: cps/helper.py:822
 msgid "Invalid cover file content"
 msgstr "封面文件内容无效"
 
-#: cps/helper.py:652
+#: cps/helper.py:826
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:704
+#: cps/helper.py:878
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:715
+#: cps/helper.py:889
 msgid "Error excecuting UnRar"
 msgstr "执行UnRar时出错"
 
-#: cps/helper.py:763
+#: cps/helper.py:937
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:765
+#: cps/helper.py:939
 msgid "Failed"
 msgstr "失败"
 
-#: cps/helper.py:767
+#: cps/helper.py:941
 msgid "Started"
 msgstr "已开始"
 
-#: cps/helper.py:769
+#: cps/helper.py:943
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:771
+#: cps/helper.py:945
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: cps/kobo_auth.py:127
-msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+#: cps/kobo_auth.py:128
+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:130 cps/kobo_auth.py:158
+#: cps/kobo_auth.py:154
 msgid "Kobo Setup"
 msgstr "Kobo 设置"
 
@@ -776,7 +795,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -837,163 +856,163 @@ msgstr "Google Oauth 错误，请重试。"
 msgid "Google Oauth error: {}"
 msgstr "Google Oauth 错误: {}"
 
-#: cps/opds.py:384
+#: cps/opds.py:298
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
+#: cps/remotelogin.py:62 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
 msgid "Login"
 msgstr "登录"
 
-#: cps/remotelogin.py:77 cps/remotelogin.py:111
+#: cps/remotelogin.py:74 cps/remotelogin.py:108
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/remotelogin.py:86 cps/remotelogin.py:119
+#: cps/remotelogin.py:83 cps/remotelogin.py:116
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/remotelogin.py:95
+#: cps/remotelogin.py:92
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/render_template.py:39 cps/web.py:416
+#: cps/render_template.py:41 cps/web.py:407
 msgid "Books"
 msgstr "书籍"
 
-#: cps/render_template.py:41
+#: cps/render_template.py:43
 msgid "Show recent books"
 msgstr "显示最近书籍"
 
-#: cps/render_template.py:42 cps/templates/index.xml:25
+#: cps/render_template.py:44 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "热门书籍"
 
-#: cps/render_template.py:44
+#: cps/render_template.py:46
 msgid "Show Hot Books"
 msgstr "显示热门书籍"
 
-#: cps/render_template.py:46 cps/render_template.py:51
+#: cps/render_template.py:48 cps/render_template.py:53
 msgid "Downloaded Books"
 msgstr "下载历史"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:50 cps/render_template.py:55
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "显示下载过的书籍"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
+#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
-#: cps/render_template.py:58 cps/templates/user_table.html:161
+#: cps/render_template.py:60 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
-#: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:676
+#: cps/render_template.py:61 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:729
 msgid "Read Books"
 msgstr "已读书籍"
 
-#: cps/render_template.py:61
+#: cps/render_template.py:63
 msgid "Show read and unread"
 msgstr "显示阅读状态"
 
-#: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:679
+#: cps/render_template.py:65 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:732
 msgid "Unread Books"
 msgstr "未读书籍"
 
-#: cps/render_template.py:65
+#: cps/render_template.py:67
 msgid "Show unread"
 msgstr "显示未读"
 
-#: cps/render_template.py:66
+#: cps/render_template.py:68
 msgid "Discover"
 msgstr "发现"
 
-#: cps/render_template.py:68 cps/templates/index.xml:50
+#: cps/render_template.py:70 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "显示随机书籍"
 
-#: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1041
+#: cps/render_template.py:71 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1135
 msgid "Categories"
 msgstr "分类"
 
-#: cps/render_template.py:71 cps/templates/user_table.html:158
+#: cps/render_template.py:73 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "显示分类选择"
 
-#: cps/render_template.py:72 cps/templates/book_edit.html:90
+#: cps/render_template.py:74 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
+#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
 msgid "Series"
 msgstr "丛书"
 
-#: cps/render_template.py:74 cps/templates/user_table.html:157
+#: cps/render_template.py:76 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "显示丛书选择"
 
-#: cps/render_template.py:75 cps/templates/book_table.html:66
+#: cps/render_template.py:77 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "作者"
 
-#: cps/render_template.py:77 cps/templates/user_table.html:160
+#: cps/render_template.py:79 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "显示作者选择"
 
-#: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:925
+#: cps/render_template.py:81 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:1006
 msgid "Publishers"
 msgstr "出版社"
 
-#: cps/render_template.py:81 cps/templates/user_table.html:163
+#: cps/render_template.py:83 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "显示出版社选择"
 
-#: cps/render_template.py:82 cps/templates/book_table.html:70
+#: cps/render_template.py:84 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1018
+#: cps/web.py:1108
 msgid "Languages"
 msgstr "语言"
 
-#: cps/render_template.py:85 cps/templates/user_table.html:155
+#: cps/render_template.py:87 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "显示语言选择"
 
-#: cps/render_template.py:86 cps/templates/index.xml:104
+#: cps/render_template.py:88 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "评分"
 
-#: cps/render_template.py:88 cps/templates/user_table.html:164
+#: cps/render_template.py:90 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "显示评分选择"
 
-#: cps/render_template.py:89 cps/templates/index.xml:112
+#: cps/render_template.py:91 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "文件格式"
 
-#: cps/render_template.py:91 cps/templates/user_table.html:165
+#: cps/render_template.py:93 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/render_template.py:93 cps/web.py:703
+#: cps/render_template.py:95 cps/web.py:755
 msgid "Archived Books"
 msgstr "归档书籍"
 
-#: cps/render_template.py:95 cps/templates/user_table.html:166
+#: cps/render_template.py:97 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:97 cps/web.py:780
+#: cps/render_template.py:100 cps/web.py:837
 msgid "Books List"
 msgstr "书籍列表"
 
-#: cps/render_template.py:99 cps/templates/user_table.html:168
+#: cps/render_template.py:102 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "显示书籍列表"
 
@@ -1017,7 +1036,7 @@ msgstr "此书籍已被添加到书架：%(sname)s"
 
 #: cps/shelf.py:126
 msgid "You are not allowed to add a book to the shelf"
-msgstr "你没有向书架添加书籍的权限"
+msgstr "您没有向书架添加书籍的权限"
 
 #: cps/shelf.py:144
 #, python-format
@@ -1041,267 +1060,270 @@ msgstr "此书已从书架 %(sname)s 中删除"
 
 #: cps/shelf.py:218
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr "抱歉，你没有从这个书架删除书籍的权限"
+msgstr "抱歉，您没有从这个书架删除书籍的权限"
 
 #: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "创建书架"
 
-#: cps/shelf.py:237
+#: cps/shelf.py:236
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "对不起，您没有编辑这个书架的权限"
 
-#: cps/shelf.py:239
+#: cps/shelf.py:238
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/shelf.py:249
+#: cps/shelf.py:248
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr "抱歉，你没有创建公开书架的权限"
+msgstr "抱歉，您没有创建公开书架的权限"
 
-#: cps/shelf.py:266
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已创建"
 
-#: cps/shelf.py:269
+#: cps/shelf.py:268
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已修改"
 
-#: cps/shelf.py:283
+#: cps/shelf.py:282
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/shelf.py:305
+#: cps/shelf.py:304
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:316
+#: cps/shelf.py:315
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有书架：%(title)s已经存在已经存在。"
 
 #: cps/shelf.py:337
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "书籍已成功删除"
+msgid "Error deleting Shelf"
+msgstr "删除书架时出错"
 
-#: cps/shelf.py:386
+#: cps/shelf.py:339
+msgid "Shelf successfully deleted"
+msgstr "书架已成功删除"
+
+#: cps/shelf.py:389
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/shelf.py:456
+#: cps/shelf.py:461
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架：%(name)s"
 
-#: cps/shelf.py:460
+#: cps/shelf.py:465
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
+#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
 msgid "Unexpected data while reading update information"
 msgstr "读取更新信息时出现意外数据"
 
-#: cps/updater.py:410 cps/updater.py:521
+#: cps/updater.py:433 cps/updater.py:545
 msgid "No update available. You already have the latest version installed"
 msgstr "无可用更新。您已经安装了最新版本"
 
-#: cps/updater.py:428
+#: cps/updater.py:451
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "有新的更新。单击下面的按钮以更新到最新版本。"
 
-#: cps/updater.py:446
+#: cps/updater.py:469
 msgid "Could not fetch update information"
 msgstr "无法获取更新信息"
 
-#: cps/updater.py:456
+#: cps/updater.py:479
 msgid "Click on the button below to update to the latest stable version."
 msgstr "点击下面按钮更新到最新稳定版本。"
 
-#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
+#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
 #, 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:507
+#: cps/updater.py:531
 msgid "No release information available"
 msgstr "无可用发布信息"
 
-#: cps/templates/index.html:5 cps/web.py:440
+#: cps/templates/index.html:5 cps/web.py:434
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:471
+#: cps/web.py:470
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:507
+#: cps/web.py:501
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下载过的书籍"
 
-#: cps/web.py:539
+#: cps/web.py:534
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:554
+#: cps/web.py:570
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:598
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:582
+#: cps/web.py:610
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:597
+#: cps/web.py:626
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:615
+#: cps/web.py:663
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:631
+#: cps/web.py:690
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
+#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
 msgid "Advanced Search"
 msgstr "高级搜索"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1077
+#: cps/web.py:807 cps/web.py:1164
 msgid "Search"
 msgstr "搜索"
 
-#: cps/templates/admin.html:16 cps/web.py:903
+#: cps/templates/admin.html:16 cps/web.py:979
 msgid "Downloads"
 msgstr "下载次数"
 
-#: cps/web.py:980
+#: cps/web.py:1068
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:1001
+#: cps/web.py:1095
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1215
+#: cps/web.py:1286
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1222
+#: cps/web.py:1293
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1244
+#: cps/web.py:1315
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1246
+#: cps/web.py:1317
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1248
+#: cps/web.py:1319
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/web.py:1353
+#: cps/web.py:1425
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/web.py:1449
+#: cps/web.py:1527
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1453
+#: cps/web.py:1531
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1455
+#: cps/web.py:1533
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1472
+#: cps/web.py:1550
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
-#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
-#: cps/web.py:1515
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
+#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
+#: cps/web.py:1593
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1507
+#: cps/web.py:1585
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1510
+#: cps/web.py:1588
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1524
+#: cps/web.py:1602
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1543
+#: cps/web.py:1621
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1549
+#: cps/web.py:1627
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1553 cps/web.py:1578
+#: cps/web.py:1631 cps/web.py:1656
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1560
+#: cps/web.py:1638
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1566
+#: cps/web.py:1644
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1573
+#: cps/web.py:1651
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1639 cps/web.py:1688
+#: cps/web.py:1717 cps/web.py:1766
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1655
+#: cps/web.py:1733
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1309,36 +1331,36 @@ msgstr "资料已更新"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "找不到包含 OAuth 信息的有效 gmail.json 文件"
 
-#: cps/tasks/convert.py:137
+#: cps/tasks/convert.py:154
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre 电子书转换器%(tool)s没有发现"
 
-#: cps/tasks/convert.py:163
+#: cps/tasks/convert.py:187
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "硬盘上找不到 %(format)s 格式"
 
-#: cps/tasks/convert.py:167
+#: cps/tasks/convert.py:191
 msgid "Ebook converter failed with unknown error"
 msgstr "发生未知错误，书籍转换失败"
 
-#: cps/tasks/convert.py:177
+#: cps/tasks/convert.py:201
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 转换失败：%(error)s"
 
-#: cps/tasks/convert.py:199
+#: cps/tasks/convert.py:223
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 
-#: cps/tasks/convert.py:222
+#: cps/tasks/convert.py:246
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "电子书转换器失败： %(error)s"
 
-#: cps/tasks/convert.py:245
+#: cps/tasks/convert.py:269
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 运行失败，错误信息：%(error)s"
@@ -1393,7 +1415,7 @@ msgid "Edit"
 msgstr "编辑书籍"
 
 #: cps/templates/admin.html:25 cps/templates/book_edit.html:16
-#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
+#: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
@@ -1403,179 +1425,179 @@ msgstr "删除数据"
 msgid "Public Shelf"
 msgstr "公共书架"
 
-#: cps/templates/admin.html:51
+#: cps/templates/admin.html:53
 msgid "Add New User"
 msgstr "添加新用户"
 
-#: cps/templates/admin.html:53
+#: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "导入LDAP用户"
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:62
 msgid "E-mail Server Settings"
 msgstr "SMTP邮件服务器设置"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP主机名"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:71 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP端口"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:75 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "加密"
 
-#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:79 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP用户名"
 
-#: cps/templates/admin.html:81 cps/templates/admin.html:92
+#: cps/templates/admin.html:83 cps/templates/admin.html:94
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "发件人邮箱"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:90
 msgid "E-Mail Service"
 msgstr "电子邮件服务"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:91
 msgid "Gmail via Oauth2"
 msgstr "通过Oauth2的Gmail"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:106
 msgid "Configuration"
 msgstr "配置"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Calibre Database Directory"
 msgstr "Calibre 数据库路径"
 
-#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:113 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "日志级别"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "External Port"
 msgstr "扩展端口"
 
-#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "每页书籍数"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:133
 msgid "Uploads"
 msgstr "上传"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:137
 msgid "Anonymous Browsing"
 msgstr "匿名浏览"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:141
 msgid "Public Registration"
 msgstr "开放注册"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:145
 msgid "Magic Link Remote Login"
 msgstr "魔法链接远程登录"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:149
 msgid "Reverse Proxy Login"
 msgstr "反向代理登录"
 
-#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:154 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "反向代理头部名称"
 
-#: cps/templates/admin.html:157
+#: cps/templates/admin.html:159
 msgid "Edit Calibre Database Configuration"
 msgstr "编辑Calibre数据库配置"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:160
 msgid "Edit Basic Configuration"
 msgstr "编辑基本配置"
 
-#: cps/templates/admin.html:159
+#: cps/templates/admin.html:161
 msgid "Edit UI Configuration"
 msgstr "编辑界面配置"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:166
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:167
 msgid "Download Debug Package"
 msgstr "下载Debug包"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:168
 msgid "View Logs"
 msgstr "查看日志文件"
 
-#: cps/templates/admin.html:169
+#: cps/templates/admin.html:171
 msgid "Reconnect Calibre Database"
 msgstr "重新连接到Calibre数据库"
 
-#: cps/templates/admin.html:170
+#: cps/templates/admin.html:172
 msgid "Restart"
 msgstr "重启"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:173
 msgid "Shutdown"
 msgstr "停止"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:178
 msgid "Update"
 msgstr "更新"
 
-#: cps/templates/admin.html:180
+#: cps/templates/admin.html:182
 msgid "Version"
 msgstr "版本"
 
-#: cps/templates/admin.html:181
+#: cps/templates/admin.html:183
 msgid "Details"
 msgstr "详情"
 
-#: cps/templates/admin.html:187
+#: cps/templates/admin.html:189
 msgid "Current version"
 msgstr "当前版本"
 
-#: cps/templates/admin.html:194
+#: cps/templates/admin.html:196
 msgid "Check for Update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:197
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:208
+#: cps/templates/admin.html:210
 msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
-#: cps/templates/admin.html:213 cps/templates/admin.html:227
-#: cps/templates/admin.html:247 cps/templates/config_db.html:70
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:249 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "确定"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
+#: cps/templates/admin.html:216 cps/templates/admin.html:230
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:226
+#: cps/templates/admin.html:228
 msgid "Are you sure you want to shutdown?"
 msgstr "您确定要关闭吗？"
 
-#: cps/templates/admin.html:238
+#: cps/templates/admin.html:240
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -1587,44 +1609,43 @@ msgstr "通过"
 msgid "In Library"
 msgstr "在书库"
 
-#: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:73
+#: cps/templates/search.html:30 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "按图书日期排序，最新优先"
 
-#: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "按图书日期排序，最旧优先"
 
-#: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "按标题按字母顺序排序"
 
-#: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "按标题逆字母顺序排序"
 
-#: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:79
+#: cps/templates/search.html:36 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新优先"
 
-#: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:54
+#: cps/templates/author.html:56 cps/templates/author.html:115
+#: cps/templates/index.html:29 cps/templates/index.html:112
+#: cps/templates/search.html:66 cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "减少"
 
-#: cps/templates/author.html:101
+#: cps/templates/author.html:99
 msgid "More by"
 msgstr "更多"
 
@@ -1749,7 +1770,7 @@ msgid "Fetch Metadata"
 msgstr "获取元数据"
 
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
@@ -1876,26 +1897,34 @@ msgstr "输入简介"
 msgid "Comments"
 msgstr "简介"
 
-#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
-#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
-#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
-#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
+#: cps/templates/book_table.html:75
+msgid "Archiv Status"
+msgstr "存档状态"
+
+#: cps/templates/book_table.html:77 cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "阅读状态"
+
+#: cps/templates/book_table.html:80 cps/templates/book_table.html:82
+#: cps/templates/book_table.html:84 cps/templates/book_table.html:86
+#: cps/templates/book_table.html:90 cps/templates/book_table.html:92
+#: cps/templates/book_table.html:96
 msgid "Enter "
 msgstr "输入"
 
-#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
+#: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
 msgid "Are you really sure?"
 msgstr "您真的确认？"
 
-#: cps/templates/book_table.html:114
+#: cps/templates/book_table.html:117
 msgid "Books with Title will be merged from:"
 msgstr "这本书籍将被合并："
 
-#: cps/templates/book_table.html:118
+#: cps/templates/book_table.html:121
 msgid "Into Book with Title:"
 msgstr "合并到这本书籍："
 
-#: cps/templates/book_table.html:123
+#: cps/templates/book_table.html:126
 msgid "Merge"
 msgstr "合并"
 
@@ -2071,11 +2100,6 @@ msgstr "LDAP服务器端口"
 msgid "LDAP Encryption"
 msgstr "LDAP 加密"
 
-#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
-#: cps/templates/email_edit.html:41
-msgid "None"
-msgstr "无"
-
 #: cps/templates/config_edit.html:205
 msgid "TLS"
 msgstr "TLS协议"
@@ -2292,11 +2316,11 @@ msgstr "新用户默认显示权限"
 msgid "Show Random Books in Detail View"
 msgstr "在主页显示随机书籍"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
+#: cps/templates/config_view_edit.html:166 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "添加显示或隐藏书籍的标签值"
 
-#: cps/templates/config_view_edit.html:166
+#: cps/templates/config_view_edit.html:167
 msgid "Add Allowed/Denied custom column values"
 msgstr "添加显示或隐藏书籍的自定义栏目值"
 
@@ -2345,13 +2369,13 @@ msgstr "归档"
 msgid "Description:"
 msgstr "简介:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:14
+#: cps/templates/detail.html:256 cps/templates/search.html:15
 msgid "Add to shelf"
 msgstr "添加到书架"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:20
+#: cps/templates/search.html:21
 msgid "(Public)"
 msgstr "(公共)"
 
@@ -2429,10 +2453,14 @@ msgstr "禁止注册的域名（黑名单）"
 msgid "Next"
 msgstr "下一个"
 
-#: cps/templates/generate_kobo_auth_url.html:5
+#: cps/templates/generate_kobo_auth_url.html:6
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "在文本编辑器中打开.kobo/Kobo eReader.conf，添加（或编辑）:"
 
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Kobo Token:"
+msgstr "Kobo Token:"
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Web 实例未配置，请联系您的管理员！"
@@ -2449,29 +2477,29 @@ msgstr "回到首页"
 msgid "Logout User"
 msgstr "登出账号"
 
-#: cps/templates/index.html:69
+#: cps/templates/index.html:70
 msgid "Sort ascending according to download count"
 msgstr "按下载数排序"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort descending according to download count"
 msgstr "按下载数逆序排序"
 
-#: cps/templates/index.html:76 cps/templates/search.html:33
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母顺序排序"
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
+#: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母顺序排序"
 
-#: cps/templates/index.html:81
+#: cps/templates/index.html:82
 msgid "Sort ascending according to series index"
 msgstr "按丛书编号排序"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort descending according to series index"
 msgstr "按丛书编号逆排序"
 
@@ -2901,10 +2929,6 @@ msgstr "出版日期从"
 msgid "Published Date To"
 msgstr "出版日期到"
 
-#: cps/templates/search_form.html:42
-msgid "Read Status"
-msgstr "阅读状态"
-
 #: cps/templates/search_form.html:59
 msgid "Exclude Tags"
 msgstr "排除标签"
@@ -3067,7 +3091,7 @@ msgstr "新建或查看"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr ""
+msgstr "强制与kobo完全同步"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
diff --git a/messages.pot b/messages.pot
index 7fc390686..b3c098090 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,585 +8,588 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-15 09:19+0100\n"
+"POT-Creation-Date: 2022-04-18 12:20+0800\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.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
-#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
-msgid "not installed"
-msgstr ""
-
-#: cps/about.py:47 cps/about.py:63
-msgid "installed"
-msgstr ""
-
-#: cps/about.py:145
+#: cps/about.py:86
 msgid "Statistics"
 msgstr ""
 
-#: cps/admin.py:144
+#: cps/admin.py:141
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/admin.py:146
+#: cps/admin.py:143
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:151
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:154
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
-#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
-#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
-#: cps/uploader.py:103
+#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
+#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
+#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
 msgid "Unknown"
 msgstr ""
 
-#: cps/admin.py:188
+#: cps/admin.py:197
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:207
+#: cps/admin.py:217
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:244
+#: cps/admin.py:255
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:277 cps/templates/admin.html:50
+#: cps/admin.py:289 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr ""
 
-#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1615
+#: cps/admin.py:360 cps/admin.py:1648
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:357
+#: cps/admin.py:374
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:133
+#: cps/admin.py:397 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
 
-#: cps/admin.py:400 cps/admin.py:406
+#: cps/admin.py:418 cps/admin.py:424
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1493
+#: cps/admin.py:436 cps/admin.py:1526
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:430
+#: cps/admin.py:448
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1451
+#: cps/admin.py:460 cps/admin.py:1484
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:446 cps/admin.py:460
+#: cps/admin.py:464 cps/admin.py:478
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:466
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:452
+#: cps/admin.py:470
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:462
+#: cps/admin.py:480
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:465
+#: cps/admin.py:483
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:469
+#: cps/admin.py:487
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:498
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:482
+#: cps/admin.py:500 cps/editbooks.py:1267
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:533
+#: cps/admin.py:553
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:539
+#: cps/admin.py:559
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1323
+#: cps/admin.py:579 cps/admin.py:1355
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:572
+#: cps/admin.py:591
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:574
+#: cps/admin.py:593
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:576
+#: cps/admin.py:595
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578
+#: cps/admin.py:597
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:580
+#: cps/admin.py:599
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:582
+#: cps/admin.py:601
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:584
+#: cps/admin.py:603
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:605
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:588
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:610
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:592
+#: cps/admin.py:612
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:614
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:743
+#: cps/admin.py:764
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:755
+#: cps/admin.py:776
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
+#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
+#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:913
+#: cps/admin.py:936
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1036
+#: cps/admin.py:1059
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1081
+#: cps/admin.py:1104
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1087
+#: cps/admin.py:1110
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1117
+#: cps/admin.py:1140
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1123
+#: cps/admin.py:1146
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1149
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1131
+#: cps/admin.py:1154
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1133
+#: cps/admin.py:1156
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1160
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1139
+#: cps/admin.py:1162
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1146
+#: cps/admin.py:1169
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1148
+#: cps/admin.py:1171
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1155
+#: cps/admin.py:1178
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1521
-#: cps/admin.py:1590 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:279 cps/shelf.py:341 cps/shelf.py:376 cps/shelf.py:451
-msgid "Settings DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1208
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1223
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1235
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1239
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1346
-msgid "Database Settings updated"
-msgstr ""
-
-#: cps/admin.py:1354
-msgid "Database Configuration"
-msgstr ""
-
-#: cps/admin.py:1370 cps/web.py:1479
-msgid "Please fill out all fields!"
-msgstr ""
-
-#: cps/admin.py:1378
-msgid "E-mail is not from valid domain"
-msgstr ""
-
-#: cps/admin.py:1384 cps/admin.py:1543
-msgid "Add new user"
-msgstr ""
-
-#: cps/admin.py:1395
-#, python-format
-msgid "User '%(user)s' created"
-msgstr ""
-
-#: cps/admin.py:1401
-msgid "Found an existing account for this e-mail address or name."
-msgstr ""
-
-#: cps/admin.py:1430
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr ""
-
-#: cps/admin.py:1432 cps/admin.py:1433
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1436
-msgid "No admin user remaining, can't delete user"
-msgstr ""
-
-#: cps/admin.py:1509 cps/admin.py:1634
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr ""
-
-#: cps/admin.py:1513
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr ""
-
-#: cps/admin.py:1517 cps/admin.py:1649 cps/web.py:1504 cps/web.py:1564
-msgid "An unknown error occurred. Please try again later."
-msgstr ""
-
-#: cps/admin.py:1552 cps/templates/admin.html:98
-msgid "Edit E-mail Server Settings"
-msgstr ""
-
-#: cps/admin.py:1571
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1597
-#, python-format
-msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr ""
-
-#: cps/admin.py:1600
-#, python-format
-msgid "There was an error sending the Test e-mail: %(res)s"
-msgstr ""
-
-#: cps/admin.py:1602
-msgid "Please configure your e-mail address first..."
-msgstr ""
-
-#: cps/admin.py:1604
-msgid "E-mail server settings updated"
-msgstr ""
-
-#: cps/admin.py:1646
-#, python-format
-msgid "Password for user %(user)s reset"
-msgstr ""
-
-#: cps/admin.py:1652 cps/web.py:1444
-msgid "Please configure the SMTP mail settings first..."
-msgstr ""
-
-#: cps/admin.py:1663
-msgid "Logfile viewer"
-msgstr ""
-
-#: cps/admin.py:1729
-msgid "Requesting update package"
-msgstr ""
-
-#: cps/admin.py:1730
-msgid "Downloading update package"
-msgstr ""
-
-#: cps/admin.py:1731
-msgid "Unzipping update package"
-msgstr ""
-
-#: cps/admin.py:1732
-msgid "Replacing files"
-msgstr ""
-
-#: cps/admin.py:1733
-msgid "Database connections are closed"
-msgstr ""
-
-#: cps/admin.py:1734
-msgid "Stopping server"
-msgstr ""
-
-#: cps/admin.py:1735
-msgid "Update finished, please press okay and reload page"
-msgstr ""
-
-#: cps/admin.py:1736 cps/admin.py:1737 cps/admin.py:1738 cps/admin.py:1739
-#: cps/admin.py:1740 cps/admin.py:1741
-msgid "Update failed:"
-msgstr ""
-
-#: cps/admin.py:1736 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
-msgid "HTTP Error"
-msgstr ""
-
-#: cps/admin.py:1737 cps/updater.py:387 cps/updater.py:599
-msgid "Connection error"
-msgstr ""
-
-#: cps/admin.py:1738 cps/updater.py:389 cps/updater.py:601
-msgid "Timeout while establishing connection"
-msgstr ""
-
-#: cps/admin.py:1739 cps/updater.py:391 cps/updater.py:603
-msgid "General error"
-msgstr ""
-
-#: cps/admin.py:1740
-msgid "Update file could not be saved in temp dir"
-msgstr ""
-
-#: cps/admin.py:1741
-msgid "Files could not be replaced during update"
-msgstr ""
-
-#: cps/admin.py:1765
-msgid "Failed to extract at least One LDAP User"
-msgstr ""
-
-#: cps/admin.py:1810
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/admin.py:1823
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/admin.py:1827
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/admin.py:1860
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/admin.py:1862
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/converter.py:30
-msgid "not configured"
-msgstr ""
-
-#: cps/converter.py:32
-msgid "Execution permissions missing"
-msgstr ""
-
-#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
-#, python-format
-msgid "Custom Column No.%(column)d is not existing in calibre database"
-msgstr ""
-
-#: cps/editbooks.py:300 cps/editbooks.py:302
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:309 cps/editbooks.py:311
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:361
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
-#: cps/web.py:1744 cps/web.py:1811
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr ""
-
-#: cps/editbooks.py:410
-msgid "edit metadata"
-msgstr ""
-
-#: cps/editbooks.py:458
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:494 cps/editbooks.py:958
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr ""
-
-#: cps/editbooks.py:634 cps/editbooks.py:985
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr ""
-
-#: cps/editbooks.py:638 cps/editbooks.py:989
-msgid "File to be uploaded must have an extension"
-msgstr ""
-
-#: cps/editbooks.py:650
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr ""
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr ""
-
-#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
+#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
+#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
+#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
+#: cps/web.py:1742
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:678
+#: cps/admin.py:1235
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1253
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1266
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1270
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1378
+msgid "Database Settings updated"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Database Configuration"
+msgstr ""
+
+#: cps/admin.py:1402 cps/web.py:1557
+msgid "Please fill out all fields!"
+msgstr ""
+
+#: cps/admin.py:1410
+msgid "E-mail is not from valid domain"
+msgstr ""
+
+#: cps/admin.py:1416 cps/admin.py:1576
+msgid "Add new user"
+msgstr ""
+
+#: cps/admin.py:1427
+#, python-format
+msgid "User '%(user)s' created"
+msgstr ""
+
+#: cps/admin.py:1433
+msgid "Found an existing account for this e-mail address or name."
+msgstr ""
+
+#: cps/admin.py:1463
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr ""
+
+#: cps/admin.py:1465 cps/admin.py:1466
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1469
+msgid "No admin user remaining, can't delete user"
+msgstr ""
+
+#: cps/admin.py:1542 cps/admin.py:1667
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr ""
+
+#: cps/admin.py:1546
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr ""
+
+#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/admin.py:1585 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr ""
+
+#: cps/admin.py:1604
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1630
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr ""
+
+#: cps/admin.py:1633
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
+
+#: cps/admin.py:1635
+msgid "Please configure your e-mail address first..."
+msgstr ""
+
+#: cps/admin.py:1637
+msgid "E-mail server settings updated"
+msgstr ""
+
+#: cps/admin.py:1679
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr ""
+
+#: cps/admin.py:1685 cps/web.py:1522
+msgid "Please configure the SMTP mail settings first..."
+msgstr ""
+
+#: cps/admin.py:1696
+msgid "Logfile viewer"
+msgstr ""
+
+#: cps/admin.py:1762
+msgid "Requesting update package"
+msgstr ""
+
+#: cps/admin.py:1763
+msgid "Downloading update package"
+msgstr ""
+
+#: cps/admin.py:1764
+msgid "Unzipping update package"
+msgstr ""
+
+#: cps/admin.py:1765
+msgid "Replacing files"
+msgstr ""
+
+#: cps/admin.py:1766
+msgid "Database connections are closed"
+msgstr ""
+
+#: cps/admin.py:1767
+msgid "Stopping server"
+msgstr ""
+
+#: cps/admin.py:1768
+msgid "Update finished, please press okay and reload page"
+msgstr ""
+
+#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
+#: cps/admin.py:1773 cps/admin.py:1774
+msgid "Update failed:"
+msgstr ""
+
+#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+msgid "HTTP Error"
+msgstr ""
+
+#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+msgid "Connection error"
+msgstr ""
+
+#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+msgid "Timeout while establishing connection"
+msgstr ""
+
+#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+msgid "General error"
+msgstr ""
+
+#: cps/admin.py:1773
+msgid "Update file could not be saved in temp dir"
+msgstr ""
+
+#: cps/admin.py:1774
+msgid "Files could not be replaced during update"
+msgstr ""
+
+#: cps/admin.py:1798
+msgid "Failed to extract at least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1843
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1856
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1860
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1893
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1895
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:30
+msgid "not installed"
+msgstr ""
+
+#: cps/converter.py:31
+msgid "Execution permissions missing"
+msgstr ""
+
+#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr ""
+
+#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
+#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
+#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+msgid "None"
+msgstr ""
+
+#: cps/editbooks.py:295 cps/editbooks.py:297
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:304 cps/editbooks.py:306
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:358
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
+#: cps/web.py:1825 cps/web.py:1870
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr ""
+
+#: cps/editbooks.py:408
+msgid "edit metadata"
+msgstr ""
+
+#: cps/editbooks.py:457
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:493 cps/editbooks.py:1001
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr ""
+
+#: cps/editbooks.py:634
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:639 cps/editbooks.py:1029
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr ""
+
+#: cps/editbooks.py:643 cps/editbooks.py:1033
+msgid "File to be uploaded must have an extension"
+msgstr ""
+
+#: cps/editbooks.py:655
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:660
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr ""
+
+#: cps/editbooks.py:683
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:814
+#: cps/editbooks.py:697 cps/editbooks.py:809
+msgid "User has no rights to upload cover"
+msgstr ""
+
+#: cps/editbooks.py:828
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:848
+#: cps/editbooks.py:869
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:861
-msgid "Error editing book, please check logfile for details"
+#: cps/editbooks.py:887
+msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:951
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:997
+#: cps/editbooks.py:1041
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1016
+#: cps/editbooks.py:1061
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1063
+#: cps/editbooks.py:1117
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1088
+#: cps/editbooks.py:1143
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1151
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1100
+#: cps/editbooks.py:1155
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -599,174 +602,190 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:77
+#: cps/helper.py:81
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:83 cps/tasks/convert.py:73
+#: cps/helper.py:87 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:88
+#: cps/helper.py:92
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
+#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
+#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:109
+#: cps/helper.py:113
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:110
+#: cps/helper.py:114
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:127
+#: cps/helper.py:131
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:132
+#: cps/helper.py:136
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:143 cps/helper.py:149
+#: cps/helper.py:147 cps/helper.py:153
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
+#: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:216 cps/tasks/convert.py:90
+#: cps/helper.py:220 cps/tasks/convert.py:92
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:225
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:313
+#: cps/helper.py:353
+msgid "Read status could not set: {}"
+msgstr ""
+
+#: cps/helper.py:376
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:319
+#: cps/helper.py:382
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:330
+#: cps/helper.py:393
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:385
+#: cps/helper.py:458
 #, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:400
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
+#: cps/helper.py:529 cps/helper.py:538
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:464
+#: cps/helper.py:572
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:592
+msgid "Error in rename file in path: {}"
+msgstr ""
+
+#: cps/helper.py:610
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:504 cps/web.py:1659
+#: cps/helper.py:651 cps/web.py:1737
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:512
+#: cps/helper.py:659
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:522
+#: cps/helper.py:669
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:595
-msgid "Error Downloading Cover"
-msgstr ""
-
-#: cps/helper.py:598
-msgid "Cover Format Error"
-msgstr ""
-
-#: cps/helper.py:608
-msgid "Failed to create path for cover"
-msgstr ""
-
-#: cps/helper.py:624
-msgid "Cover-file is not a valid image file, or could not be stored"
-msgstr ""
-
-#: cps/helper.py:635
-msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr ""
-
-#: cps/helper.py:648
-msgid "Invalid cover file content"
-msgstr ""
-
-#: cps/helper.py:652
-msgid "Only jpg/jpeg files are supported as coverfile"
-msgstr ""
-
-#: cps/helper.py:704
-msgid "Unrar binary file not found"
-msgstr ""
-
-#: cps/helper.py:715
-msgid "Error excecuting UnRar"
-msgstr ""
-
-#: cps/helper.py:763
-msgid "Waiting"
-msgstr ""
-
-#: cps/helper.py:765
-msgid "Failed"
+#: cps/helper.py:754
+msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
 msgstr ""
 
 #: cps/helper.py:767
+msgid "Error Downloading Cover"
+msgstr ""
+
+#: cps/helper.py:770
+msgid "Cover Format Error"
+msgstr ""
+
+#: cps/helper.py:773
+msgid "You are not allowed to access localhost or the local network for cover uploads"
+msgstr ""
+
+#: cps/helper.py:783
+msgid "Failed to create path for cover"
+msgstr ""
+
+#: cps/helper.py:799
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr ""
+
+#: cps/helper.py:810
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
+
+#: cps/helper.py:822
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:826
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr ""
+
+#: cps/helper.py:878
+msgid "Unrar binary file not found"
+msgstr ""
+
+#: cps/helper.py:889
+msgid "Error excecuting UnRar"
+msgstr ""
+
+#: cps/helper.py:937
+msgid "Waiting"
+msgstr ""
+
+#: cps/helper.py:939
+msgid "Failed"
+msgstr ""
+
+#: cps/helper.py:941
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:769
+#: cps/helper.py:943
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:771
+#: cps/helper.py:945
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:127
-msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+#: cps/kobo_auth.py:128
+msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
+#: cps/kobo_auth.py:154
 msgid "Kobo Setup"
 msgstr ""
 
@@ -775,7 +794,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -836,163 +855,163 @@ msgstr ""
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:384
+#: cps/opds.py:298
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
+#: cps/remotelogin.py:62 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
 msgid "Login"
 msgstr ""
 
-#: cps/remotelogin.py:77 cps/remotelogin.py:111
+#: cps/remotelogin.py:74 cps/remotelogin.py:108
 msgid "Token not found"
 msgstr ""
 
-#: cps/remotelogin.py:86 cps/remotelogin.py:119
+#: cps/remotelogin.py:83 cps/remotelogin.py:116
 msgid "Token has expired"
 msgstr ""
 
-#: cps/remotelogin.py:95
+#: cps/remotelogin.py:92
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/render_template.py:39 cps/web.py:416
+#: cps/render_template.py:41 cps/web.py:407
 msgid "Books"
 msgstr ""
 
-#: cps/render_template.py:41
+#: cps/render_template.py:43
 msgid "Show recent books"
 msgstr ""
 
-#: cps/render_template.py:42 cps/templates/index.xml:25
+#: cps/render_template.py:44 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr ""
 
-#: cps/render_template.py:44
+#: cps/render_template.py:46
 msgid "Show Hot Books"
 msgstr ""
 
-#: cps/render_template.py:46 cps/render_template.py:51
+#: cps/render_template.py:48 cps/render_template.py:53
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:50 cps/render_template.py:55
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
+#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
 msgid "Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/user_table.html:161
+#: cps/render_template.py:60 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:676
+#: cps/render_template.py:61 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:729
 msgid "Read Books"
 msgstr ""
 
-#: cps/render_template.py:61
+#: cps/render_template.py:63
 msgid "Show read and unread"
 msgstr ""
 
-#: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:679
+#: cps/render_template.py:65 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:732
 msgid "Unread Books"
 msgstr ""
 
-#: cps/render_template.py:65
+#: cps/render_template.py:67
 msgid "Show unread"
 msgstr ""
 
-#: cps/render_template.py:66
+#: cps/render_template.py:68
 msgid "Discover"
 msgstr ""
 
-#: cps/render_template.py:68 cps/templates/index.xml:50
+#: cps/render_template.py:70 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr ""
 
-#: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1041
+#: cps/render_template.py:71 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1135
 msgid "Categories"
 msgstr ""
 
-#: cps/render_template.py:71 cps/templates/user_table.html:158
+#: cps/render_template.py:73 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr ""
 
-#: cps/render_template.py:72 cps/templates/book_edit.html:90
+#: cps/render_template.py:74 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
+#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
 msgid "Series"
 msgstr ""
 
-#: cps/render_template.py:74 cps/templates/user_table.html:157
+#: cps/render_template.py:76 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr ""
 
-#: cps/render_template.py:75 cps/templates/book_table.html:66
+#: cps/render_template.py:77 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr ""
 
-#: cps/render_template.py:77 cps/templates/user_table.html:160
+#: cps/render_template.py:79 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr ""
 
-#: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:925
+#: cps/render_template.py:81 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:1006
 msgid "Publishers"
 msgstr ""
 
-#: cps/render_template.py:81 cps/templates/user_table.html:163
+#: cps/render_template.py:83 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr ""
 
-#: cps/render_template.py:82 cps/templates/book_table.html:70
+#: cps/render_template.py:84 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1018
+#: cps/web.py:1108
 msgid "Languages"
 msgstr ""
 
-#: cps/render_template.py:85 cps/templates/user_table.html:155
+#: cps/render_template.py:87 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr ""
 
-#: cps/render_template.py:86 cps/templates/index.xml:104
+#: cps/render_template.py:88 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr ""
 
-#: cps/render_template.py:88 cps/templates/user_table.html:164
+#: cps/render_template.py:90 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/render_template.py:89 cps/templates/index.xml:112
+#: cps/render_template.py:91 cps/templates/index.xml:112
 msgid "File formats"
 msgstr ""
 
-#: cps/render_template.py:91 cps/templates/user_table.html:165
+#: cps/render_template.py:93 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:703
+#: cps/render_template.py:95 cps/web.py:755
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:95 cps/templates/user_table.html:166
+#: cps/render_template.py:97 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:780
+#: cps/render_template.py:100 cps/web.py:837
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:99 cps/templates/user_table.html:168
+#: cps/render_template.py:102 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
@@ -1046,260 +1065,264 @@ msgstr ""
 msgid "Create a Shelf"
 msgstr ""
 
-#: cps/shelf.py:237
+#: cps/shelf.py:236
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr ""
 
-#: cps/shelf.py:239
+#: cps/shelf.py:238
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/shelf.py:249
+#: cps/shelf.py:248
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:266
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/shelf.py:269
+#: cps/shelf.py:268
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/shelf.py:283
+#: cps/shelf.py:282
 msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:305
+#: cps/shelf.py:304
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:316
+#: cps/shelf.py:315
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
 #: cps/shelf.py:337
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:339
 msgid "Shelf successfully deleted"
 msgstr ""
 
-#: cps/shelf.py:386
+#: cps/shelf.py:389
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:456
+#: cps/shelf.py:461
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:460
+#: cps/shelf.py:465
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
+#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:410 cps/updater.py:521
+#: cps/updater.py:433 cps/updater.py:545
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:428
+#: cps/updater.py:451
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:446
+#: cps/updater.py:469
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:456
+#: cps/updater.py:479
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
+#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:507
+#: cps/updater.py:531
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:440
+#: cps/templates/index.html:5 cps/web.py:434
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:471
+#: cps/web.py:470
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:507
+#: cps/web.py:501
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:539
+#: cps/web.py:534
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:554
+#: cps/web.py:570
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:569
+#: cps/web.py:598
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:582
+#: cps/web.py:610
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:626
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:615
+#: cps/web.py:663
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:631
+#: cps/web.py:690
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
+#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
 msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1077
+#: cps/web.py:807 cps/web.py:1164
 msgid "Search"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:903
+#: cps/templates/admin.html:16 cps/web.py:979
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:980
+#: cps/web.py:1068
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1001
+#: cps/web.py:1095
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1215
+#: cps/web.py:1286
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1222
+#: cps/web.py:1293
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1244
+#: cps/web.py:1315
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1246
+#: cps/web.py:1317
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1248
+#: cps/web.py:1319
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1353
+#: cps/web.py:1425
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1449
+#: cps/web.py:1527
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1453
+#: cps/web.py:1531
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1455
+#: cps/web.py:1533
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1472
+#: cps/web.py:1550
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
-#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
-#: cps/web.py:1515
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
+#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
+#: cps/web.py:1593
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1507
+#: cps/web.py:1585
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1510
+#: cps/web.py:1588
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1524
+#: cps/web.py:1602
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1543
+#: cps/web.py:1621
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1549
+#: cps/web.py:1627
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1553 cps/web.py:1578
+#: cps/web.py:1631 cps/web.py:1656
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1638
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1566
+#: cps/web.py:1644
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1573
+#: cps/web.py:1651
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1639 cps/web.py:1688
+#: cps/web.py:1717 cps/web.py:1766
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1655
+#: cps/web.py:1733
 msgid "Profile updated"
 msgstr ""
 
@@ -1307,36 +1330,36 @@ msgstr ""
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:137
+#: cps/tasks/convert.py:154
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:163
+#: cps/tasks/convert.py:187
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:167
+#: cps/tasks/convert.py:191
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:177
+#: cps/tasks/convert.py:201
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:199
+#: cps/tasks/convert.py:223
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:222
+#: cps/tasks/convert.py:246
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:245
+#: cps/tasks/convert.py:269
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1391,7 +1414,7 @@ msgid "Edit"
 msgstr ""
 
 #: cps/templates/admin.html:25 cps/templates/book_edit.html:16
-#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
+#: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
@@ -1401,179 +1424,179 @@ msgstr ""
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:51
+#: cps/templates/admin.html:53
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:53
+#: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:62
 msgid "E-mail Server Settings"
 msgstr ""
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr ""
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:71 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr ""
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:75 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr ""
 
-#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:79 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr ""
 
-#: cps/templates/admin.html:81 cps/templates/admin.html:92
+#: cps/templates/admin.html:83 cps/templates/admin.html:94
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:90
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:91
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:106
 msgid "Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:113 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:133
 msgid "Uploads"
 msgstr ""
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:137
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:141
 msgid "Public Registration"
 msgstr ""
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:145
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:149
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:154 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/admin.html:157
+#: cps/templates/admin.html:159
 msgid "Edit Calibre Database Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:160
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:159
+#: cps/templates/admin.html:161
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:166
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:167
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:168
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:169
+#: cps/templates/admin.html:171
 msgid "Reconnect Calibre Database"
 msgstr ""
 
-#: cps/templates/admin.html:170
+#: cps/templates/admin.html:172
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:173
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:178
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:180
+#: cps/templates/admin.html:182
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:181
+#: cps/templates/admin.html:183
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:187
+#: cps/templates/admin.html:189
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:194
+#: cps/templates/admin.html:196
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:197
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:208
+#: cps/templates/admin.html:210
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:213 cps/templates/admin.html:227
-#: cps/templates/admin.html:247 cps/templates/config_db.html:70
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:249 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
+#: cps/templates/admin.html:216 cps/templates/admin.html:230
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:226
+#: cps/templates/admin.html:228
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:238
+#: cps/templates/admin.html:240
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1585,44 +1608,43 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:73
+#: cps/templates/search.html:30 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:79
+#: cps/templates/search.html:36 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 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:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:54
+#: cps/templates/author.html:56 cps/templates/author.html:115
+#: cps/templates/index.html:29 cps/templates/index.html:112
+#: cps/templates/search.html:66 cps/templates/shelf.html:54
 msgid "reduce"
 msgstr ""
 
-#: cps/templates/author.html:101
+#: cps/templates/author.html:99
 msgid "More by"
 msgstr ""
 
@@ -1747,7 +1769,7 @@ msgid "Fetch Metadata"
 msgstr ""
 
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
@@ -1874,26 +1896,34 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
-#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
-#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
-#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
+#: cps/templates/book_table.html:75
+msgid "Archiv Status"
+msgstr ""
+
+#: cps/templates/book_table.html:77 cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/book_table.html:80 cps/templates/book_table.html:82
+#: cps/templates/book_table.html:84 cps/templates/book_table.html:86
+#: cps/templates/book_table.html:90 cps/templates/book_table.html:92
+#: cps/templates/book_table.html:96
 msgid "Enter "
 msgstr ""
 
-#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
+#: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_table.html:114
+#: cps/templates/book_table.html:117
 msgid "Books with Title will be merged from:"
 msgstr ""
 
-#: cps/templates/book_table.html:118
+#: cps/templates/book_table.html:121
 msgid "Into Book with Title:"
 msgstr ""
 
-#: cps/templates/book_table.html:123
+#: cps/templates/book_table.html:126
 msgid "Merge"
 msgstr ""
 
@@ -2069,11 +2099,6 @@ msgstr ""
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
-#: cps/templates/email_edit.html:41
-msgid "None"
-msgstr ""
-
 #: cps/templates/config_edit.html:205
 msgid "TLS"
 msgstr ""
@@ -2290,11 +2315,11 @@ msgstr ""
 msgid "Show Random Books in Detail View"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
+#: cps/templates/config_view_edit.html:166 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:166
+#: cps/templates/config_view_edit.html:167
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
@@ -2343,13 +2368,13 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:256 cps/templates/search.html:14
+#: cps/templates/detail.html:256 cps/templates/search.html:15
 msgid "Add to shelf"
 msgstr ""
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:20
+#: cps/templates/search.html:21
 msgid "(Public)"
 msgstr ""
 
@@ -2427,10 +2452,14 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: cps/templates/generate_kobo_auth_url.html:5
+#: cps/templates/generate_kobo_auth_url.html:6
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Kobo Token:"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
@@ -2447,29 +2476,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:69
+#: cps/templates/index.html:70
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:76 cps/templates/search.html:33
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
+#: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:81
+#: cps/templates/index.html:82
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2899,10 +2928,6 @@ msgstr ""
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:42
-msgid "Read Status"
-msgstr ""
-
 #: cps/templates/search_form.html:59
 msgid "Exclude Tags"
 msgstr ""

From a8680a45cadca5bdf5c20c17210ce15842a7437d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 19 Apr 2022 15:05:41 +0200
Subject: [PATCH 244/412] Bugfixes from Testrun Update teststatus

---
 cps/db.py                               |    7 +-
 cps/metadata_provider/amazon.py         |   18 +-
 cps/templates/list.html                 |    2 +-
 cps/web.py                              |   40 +-
 test/Calibre-Web TestSummary_Linux.html | 2075 +++++++++++++++++------
 5 files changed, 1564 insertions(+), 578 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index ff3922742..68e02b815 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -914,7 +914,8 @@ class CalibreDB:
                                  .filter(Languages.lang_code == None)
                                  .filter(self.common_filters())
                                  .count())
-                tags.append([Category(_("None"), "none"), no_lang_count])
+                if no_lang_count:
+                    tags.append([Category(_("None"), "none"), no_lang_count])
             return sorted(tags, key=lambda x: x[0].name, reverse=reverse_order)
         else:
             if not languages:
@@ -993,10 +994,12 @@ class Category:
     name = None
     id = None
     count = None
+    rating = None
 
-    def __init__(self, name, cat_id):
+    def __init__(self, name, cat_id, rating=None):
         self.name = name
         self.id = cat_id
+        self.rating = rating
         self.count = 1
 
 '''class Count:
diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index 7de0d4153..da3aed798 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -56,13 +56,13 @@ class Amazon(Metadata):
         self, query: str, generic_cover: str = "", locale: str = "en"
     ) -> Optional[List[MetaRecord]]:
         #timer=time()
-        def inner(link,index) -> tuple[dict,int]:
+        def inner(link, index) -> [dict, int]:
             with self.session as session:
                 try:
                     r = session.get(f"https://www.amazon.com/{link}")
                     r.raise_for_status()
-                except Exception as e:
-                    log.warning(e)
+                except Exception as ex:
+                    log.warning(ex)
                     return
                 long_soup = BS(r.text, "lxml")  #~4sec :/
                 soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
@@ -126,16 +126,16 @@ class Amazon(Metadata):
                     headers=self.headers)
                 results.raise_for_status()
             except requests.exceptions.HTTPError as e:
-               log.error_or_exception(e)
-               return None
+                log.error_or_exception(e)
+                return None
             except Exception as e:
-               log.warning(e)
-               return None
+                log.warning(e)
+                return None
             soup = BS(results.text, 'html.parser')
             links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
                           soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
             with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
                 fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
-                val=list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
-        result=list(filter(lambda x: x, val))
+                val = list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
+        result = list(filter(lambda x: x, val))
         return [x[0] for x in sorted(result, key=itemgetter(1))] #sort by amazons listing order for best relevance
diff --git a/cps/templates/list.html b/cps/templates/list.html
index ed59661e4..a9089823a 100644
--- a/cps/templates/list.html
+++ b/cps/templates/list.html
@@ -29,7 +29,7 @@
         </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="row" {% if entry[0].sort %}data-name="{{entry[0].name}}"{% endif %} data-id="{% if entry[0].sort %}{{entry[0].sort}}{% else %}{% if entry[0].format %}{{entry[0].format}}{% else %}{% if entry[0].rating %}{{entry[0].rating}}{% else %}{{entry[0].name}}{% endif %}{% endif %}{% endif %}">
         <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{entry[1]}}</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_param='stored', book_id=entry.format )}}{% else %}{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].id )}}{% endif %}">
           {% if entry.name %}
diff --git a/cps/web.py b/cps/web.py
index ae4b12a85..517539f8d 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -599,17 +599,29 @@ 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, 0,
-                                                            db.Books,
-                                                            db.Books.ratings.any(db.Ratings.id == book_id),
-                                                            [order[0][0]],
-                                                            True, config.config_read_column)
-    if name and name.rating <= 10:
+    if book_id == '-1':
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Books.ratings == None,
+                                                                [order[0][0]],
+                                                                True, config.config_read_column,
+                                                                db.books_series_link,
+                                                                db.Books.id == db.books_series_link.c.book,
+                                                                db.Series)
+        title = _(u"Rating: None")
+        rating = -1
+    else:
+        name = calibre_db.session.query(db.Ratings).filter(db.Ratings.id == book_id).first()
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Books.ratings.any(db.Ratings.id == book_id),
+                                                                [order[0][0]],
+                                                                True, config.config_read_column)
+        title = _(u"Rating: %(rating)s stars", rating=int(name.rating / 2))
+        rating = name.rating
+    if title and 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",
-                                     order=order[1])
+                                     title=title, page="ratings", order=order[1])
     else:
         abort(404)
 
@@ -1001,6 +1013,7 @@ def publisher_list():
                            .count())
         if no_publisher_count:
             entries.append([db.Category(_("None"), "-1"), no_publisher_count])
+        entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
         char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher", order=order_no)
@@ -1030,6 +1043,7 @@ def series_list():
                             .count())
             if no_series_count:
                 entries.append([db.Category(_("None"), "-1"), no_series_count])
+            entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
             return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", order=order_no)
         else:
@@ -1060,10 +1074,11 @@ def ratings_list():
             .group_by(text('books_ratings_link.rating')).order_by(order).all()
         no_rating_count = (calibre_db.session.query(db.Books)
                            .outerjoin(db.books_ratings_link).outerjoin(db.Ratings)
-                           .filter(db.Ratings.name == None)
+                           .filter(db.Ratings.rating == None)
                            .filter(calibre_db.common_filters())
                            .count())
-        entries.append([db.Category(_("None"), "-1"), no_rating_count])
+        entries.append([db.Category(_("None"), "-1", -1), no_rating_count])
+        entries = sorted(entries, key=lambda x: x[0].rating, reverse=not order_no)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
                                      title=_(u"Ratings list"), page="ratingslist", data="ratings", order=order_no)
     else:
@@ -1130,6 +1145,7 @@ def category_list():
                          .count())
         if no_tag_count:
             entries.append([db.Category(_("None"), "-1"), no_tag_count])
+        entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
         char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Categories"), page="catlist", data="category", order=order_no)
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 392fdbead..d384225fa 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-03 07:19:10</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-18 20:29:19</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>2022-04-03 12:55:38</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-19 07:55:03</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>4h 47 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>10h 36 min</p>
         </div>
       </div>
       </div>
@@ -102,15 +102,15 @@
     </tr>
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">18</td>
+        <td class="text-center">5</td>
+        <td class="text-center">6</td>
+        <td class="text-center">7</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c1', 13)">Detail</a>
+            <a onclick="showClassDetail('c1', 18)">Detail</a>
         </td>
     </tr>
 
@@ -134,11 +134,33 @@
     
     
     
-        <tr id='pt1.3' class='hiddenRow bg-success'>
+        <tr id="ft1.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_category</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 405, in test_guest_change_visibility_category
+    self.assertEqual(books[0][&#39;title&#39;], &#39;Gênot&#39;)
+AssertionError: &#39;None&#39; != &#39;Gênot&#39;
+- None
++ Gênot</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -161,20 +183,64 @@
     
     
     
-        <tr id='pt1.6' class='hiddenRow bg-success'>
+        <tr id="ft1.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_language</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 259, in test_guest_change_visibility_language
+    self.assertEqual(books[1][&#39;id&#39;], &#39;eng&#39;)
+AssertionError: &#39;none&#39; != &#39;eng&#39;
+- none
++ eng</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.7' class='hiddenRow bg-success'>
+        <tr id="ft1.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_publisher</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 322, in test_guest_change_visibility_publisher
+    self.assertEqual(books[0][&#39;title&#39;], &#39;Randomhäus&#39;)
+AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
+- None
++ Randomhäus</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -188,67 +254,368 @@
     
     
     
-        <tr id='pt1.9' class='hiddenRow bg-success'>
+        <tr id="et1.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 364, in test_guest_change_visibility_rating
+    self.assertEqual(books[1][&#39;id&#39;], &#39;2&#39;)
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.10' class='hiddenRow bg-success'>
+        <tr id="et1.10" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft1.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 289, in test_guest_change_visibility_series
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.11' class='hiddenRow bg-success'>
+        <tr id="et1.12" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.12')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft1.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 54, in test_guest_random_books_available
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;books_rand&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.12' class='hiddenRow bg-success'>
+        <tr id="et1.14" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et1.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 384, in test_guest_restricted_settings_visibility
+    self.assertIsNone(rights[&#39;show_512&#39;])
+TypeError: &#39;bool&#39; object is not subscriptable</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.13' class='hiddenRow bg-success'>
+        <tr id="et1.16" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft1.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.17')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 135, in test_guest_visibility_sidebar
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et1.18" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestCli</td>
-        <td class="text-center">9</td>
-        <td class="text-center">9</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</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('c2', 9)">Detail</a>
+            <a onclick="showClassDetail('c2', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt2.1' class='hiddenRow bg-success'>
+        <tr id="et2.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_anonymous)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et2.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et2.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 26, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestCli</td>
+        <td class="text-center">9</td>
+        <td class="text-center">4</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c3', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_already_started</div>
             </td>
@@ -257,34 +624,121 @@
     
     
     
-        <tr id='pt2.2' class='hiddenRow bg-success'>
+        <tr id="ft3.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCli - test_bind_to_single_interface</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 316, in test_bind_to_single_interface
+    self.assertTrue(re.findall(&#39;Reached error page:\sabout:neterror\?e=connectionFailure&#39;, error))
+AssertionError: [] is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt2.3' class='hiddenRow bg-success'>
+        <tr id="ft3.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCli - test_change_password</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 446, in test_change_password
+    self.login(&#34;admin&#34;, &#34;adm:in12&#34;)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16
+
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 453, in test_change_password
+    self.assertFalse(e)
+AssertionError: TimeoutException(&#39;&#39;, None, [&#39;WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5&#39;, &#39;NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5&#39;, &#39;element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16&#39;, &#39;&#39;]) is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt2.4' class='hiddenRow bg-success'>
+        <tr id="ft3.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCli - test_cli_SSL_files</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 280, in test_cli_SSL_files
+    self.driver.get(&#34;https://127.0.0.1:8083&#34;)
+selenium.common.exceptions.WebDriverException: Message: Reached error page: about:neterror?e=netTimeout&amp;u=https%3A//127.0.0.1%3A8083/&amp;c=UTF-8&amp;d=The%20server%20at%20127.0.0.1%20is%20taking%20too%20long%20to%20respond.
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+UnknownError@chrome://remote/content/shared/webdriver/Errors.jsm:510:5
+checkReadyState@chrome://remote/content/marionette/navigate.js:64:24
+onNavigation@chrome://remote/content/marionette/navigate.js:312:39
+emit@resource://gre/modules/EventEmitter.jsm:160:20
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm:44:25
+
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 282, in test_cli_SSL_files
+    self.assertIsNone(&#34;Error&#34;, &#34;HTTPS Connection could not established with key/cert file&#34;)
+AssertionError: &#39;Error&#39; is not None : HTTPS Connection could not established with key/cert file</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt2.5' class='hiddenRow bg-success'>
+        <tr id='pt3.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_cli_different_folder</div>
             </td>
@@ -293,16 +747,46 @@
     
     
     
-        <tr id='pt2.6' class='hiddenRow bg-success'>
+        <tr id="et3.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestCli - test_cli_different_settings_database</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et3.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 125, in test_cli_different_settings_database
+    self.fill_db_config({&#39;config_calibre_dir&#39;: TEST_DB})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 223, in fill_db_config
+    cls.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 87, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt2.7' class='hiddenRow bg-success'>
+        <tr id='pt3.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_dryrun_update</div>
             </td>
@@ -311,7 +795,7 @@
     
     
     
-        <tr id='pt2.8' class='hiddenRow bg-success'>
+        <tr id='pt3.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_environ_port_setting</div>
             </td>
@@ -320,11 +804,43 @@
     
     
     
-        <tr id='pt2.9' class='hiddenRow bg-success'>
+        <tr id="ft3.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 408, in test_settingsdb_not_writeable
+    self.fill_db_config({&#39;config_calibre_dir&#39;: TEST_DB})
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16
+
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 413, in test_settingsdb_not_writeable
+    self.assertFalse(True, &#34;Inital config failed with nonwriteable database&#34;)
+AssertionError: True is not false : Inital config failed with nonwriteable database</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -332,19 +848,28 @@
 
     <tr id="su" class="passClass">
         <td>TestCliGdrivedb</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</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('c3', 2)">Detail</a>
+            <a onclick="showClassDetail('c4', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt3.1' class='hiddenRow bg-success'>
+        <tr id='pt4.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_folder</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt4.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
@@ -353,7 +878,7 @@
     
     
     
-        <tr id='pt3.2' class='hiddenRow bg-success'>
+        <tr id='pt4.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
@@ -371,13 +896,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c4', 2)">Detail</a>
+            <a onclick="showClassDetail('c5', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt4.1' class='hiddenRow bg-success'>
+        <tr id='pt5.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_invalid_jpg_hdd</div>
             </td>
@@ -386,7 +911,7 @@
     
     
     
-        <tr id='pt4.2' class='hiddenRow bg-success'>
+        <tr id='pt5.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
@@ -396,25 +921,45 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c5', 1)">Detail</a>
+            <a onclick="showClassDetail('c6', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt5.1' class='hiddenRow bg-success'>
+        <tr id="ft6.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestDeleteDatabase - test_delete_books_in_database</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_delete_database.py&#34;, line 70, in test_delete_books_in_database
+    self.assertEqual(0, len(list_element))
+AssertionError: 0 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -428,13 +973,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 15)">Detail</a>
+            <a onclick="showClassDetail('c7', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt6.1' class='hiddenRow bg-success'>
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
@@ -443,7 +988,7 @@
     
     
     
-        <tr id='pt6.2' class='hiddenRow bg-success'>
+        <tr id='pt7.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
             </td>
@@ -452,7 +997,7 @@
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id='pt7.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
@@ -461,7 +1006,7 @@
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id='pt7.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
@@ -470,7 +1015,7 @@
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id='pt7.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
@@ -479,7 +1024,7 @@
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id='pt7.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
@@ -488,7 +1033,7 @@
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id='pt7.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
@@ -497,7 +1042,7 @@
     
     
     
-        <tr id='pt6.8' class='hiddenRow bg-success'>
+        <tr id='pt7.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
@@ -506,7 +1051,7 @@
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id='pt7.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
@@ -515,7 +1060,7 @@
     
     
     
-        <tr id='pt6.10' class='hiddenRow bg-success'>
+        <tr id='pt7.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
@@ -524,7 +1069,7 @@
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id='pt7.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
@@ -533,7 +1078,7 @@
     
     
     
-        <tr id='pt6.12' class='hiddenRow bg-success'>
+        <tr id='pt7.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
             </td>
@@ -542,7 +1087,7 @@
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id='pt7.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
@@ -551,7 +1096,7 @@
     
     
     
-        <tr id='pt6.14' class='hiddenRow bg-success'>
+        <tr id='pt7.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
@@ -560,7 +1105,7 @@
     
     
     
-        <tr id='pt6.15' class='hiddenRow bg-success'>
+        <tr id='pt7.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
@@ -578,13 +1123,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c7', 6)">Detail</a>
+            <a onclick="showClassDetail('c8', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
@@ -593,7 +1138,7 @@
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
             </td>
@@ -602,7 +1147,7 @@
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id='pt8.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
@@ -611,7 +1156,7 @@
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id='pt8.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
             </td>
@@ -620,7 +1165,7 @@
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id='pt8.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
             </td>
@@ -629,7 +1174,7 @@
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id='pt8.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
@@ -647,13 +1192,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c8', 3)">Detail</a>
+            <a onclick="showClassDetail('c9', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt8.1' class='hiddenRow bg-success'>
+        <tr id='pt9.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_deactivate</div>
             </td>
@@ -662,7 +1207,7 @@
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
@@ -671,7 +1216,7 @@
     
     
     
-        <tr id='pt8.3' class='hiddenRow bg-success'>
+        <tr id='pt9.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_wrong_excecutable</div>
             </td>
@@ -689,13 +1234,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 3)">Detail</a>
+            <a onclick="showClassDetail('c10', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt9.1' class='hiddenRow bg-success'>
+        <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_deactivate</div>
             </td>
@@ -704,7 +1249,7 @@
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
@@ -713,7 +1258,7 @@
     
     
     
-        <tr id='pt9.3' class='hiddenRow bg-success'>
+        <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_wrong_excecutable</div>
             </td>
@@ -731,13 +1276,13 @@
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 17)">Detail</a>
+            <a onclick="showClassDetail('c11', 17)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt10.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_cbz_comicinfo</div>
             </td>
@@ -746,7 +1291,7 @@
     
     
     
-        <tr id='pt10.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
             </td>
@@ -755,7 +1300,7 @@
     
     
     
-        <tr id='pt10.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
@@ -764,7 +1309,7 @@
     
     
     
-        <tr id='pt10.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
@@ -773,7 +1318,7 @@
     
     
     
-        <tr id='pt10.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
@@ -782,7 +1327,7 @@
     
     
     
-        <tr id='pt10.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
@@ -791,7 +1336,7 @@
     
     
     
-        <tr id='pt10.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
             </td>
@@ -800,7 +1345,7 @@
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
@@ -809,7 +1354,7 @@
     
     
     
-        <tr id='pt10.9' class='hiddenRow bg-success'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
@@ -818,7 +1363,7 @@
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id='pt11.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
@@ -827,7 +1372,7 @@
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id='pt11.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -836,7 +1381,7 @@
     
     
     
-        <tr id='pt10.12' class='hiddenRow bg-success'>
+        <tr id='pt11.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -845,7 +1390,7 @@
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id='pt11.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -854,7 +1399,7 @@
     
     
     
-        <tr id='pt10.14' class='hiddenRow bg-success'>
+        <tr id='pt11.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -863,7 +1408,7 @@
     
     
     
-        <tr id='st10.15' class='none bg-warning'>
+        <tr id='st11.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -872,7 +1417,7 @@
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id='pt11.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -881,7 +1426,7 @@
     
     
     
-        <tr id='pt10.17' class='hiddenRow bg-success'>
+        <tr id='pt11.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -899,13 +1444,13 @@
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 36)">Detail</a>
+            <a onclick="showClassDetail('c12', 36)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -914,7 +1459,7 @@
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -923,7 +1468,7 @@
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -932,7 +1477,7 @@
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -941,7 +1486,7 @@
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -950,7 +1495,7 @@
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -959,7 +1504,7 @@
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -968,7 +1513,7 @@
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -977,7 +1522,7 @@
     
     
     
-        <tr id='pt11.9' class='hiddenRow bg-success'>
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -986,7 +1531,7 @@
     
     
     
-        <tr id='pt11.10' class='hiddenRow bg-success'>
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -995,7 +1540,7 @@
     
     
     
-        <tr id='pt11.11' class='hiddenRow bg-success'>
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1004,7 +1549,7 @@
     
     
     
-        <tr id='pt11.12' class='hiddenRow bg-success'>
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1013,7 +1558,7 @@
     
     
     
-        <tr id='pt11.13' class='hiddenRow bg-success'>
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1022,7 +1567,7 @@
     
     
     
-        <tr id='pt11.14' class='hiddenRow bg-success'>
+        <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1031,7 +1576,7 @@
     
     
     
-        <tr id='pt11.15' class='hiddenRow bg-success'>
+        <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1040,7 +1585,7 @@
     
     
     
-        <tr id='pt11.16' class='hiddenRow bg-success'>
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1049,7 +1594,7 @@
     
     
     
-        <tr id='pt11.17' class='hiddenRow bg-success'>
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1058,7 +1603,7 @@
     
     
     
-        <tr id='pt11.18' class='hiddenRow bg-success'>
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1067,7 +1612,7 @@
     
     
     
-        <tr id='pt11.19' class='hiddenRow bg-success'>
+        <tr id='pt12.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1076,19 +1621,19 @@
     
     
     
-        <tr id="st11.20" class="none bg-warning">
+        <tr id="st12.20" 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_st11.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1102,7 +1647,7 @@
     
     
     
-        <tr id='pt11.21' class='hiddenRow bg-success'>
+        <tr id='pt12.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1111,7 +1656,7 @@
     
     
     
-        <tr id='pt11.22' class='hiddenRow bg-success'>
+        <tr id='pt12.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1120,7 +1665,7 @@
     
     
     
-        <tr id='pt11.23' class='hiddenRow bg-success'>
+        <tr id='pt12.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1129,7 +1674,7 @@
     
     
     
-        <tr id='pt11.24' class='hiddenRow bg-success'>
+        <tr id='pt12.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1138,7 +1683,7 @@
     
     
     
-        <tr id='pt11.25' class='hiddenRow bg-success'>
+        <tr id='pt12.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1147,7 +1692,7 @@
     
     
     
-        <tr id='pt11.26' class='hiddenRow bg-success'>
+        <tr id='pt12.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1156,7 +1701,7 @@
     
     
     
-        <tr id='pt11.27' class='hiddenRow bg-success'>
+        <tr id='pt12.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1165,7 +1710,7 @@
     
     
     
-        <tr id='pt11.28' class='hiddenRow bg-success'>
+        <tr id='pt12.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1174,7 +1719,7 @@
     
     
     
-        <tr id='pt11.29' class='hiddenRow bg-success'>
+        <tr id='pt12.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1183,7 +1728,7 @@
     
     
     
-        <tr id='pt11.30' class='hiddenRow bg-success'>
+        <tr id='pt12.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1192,7 +1737,7 @@
     
     
     
-        <tr id='pt11.31' class='hiddenRow bg-success'>
+        <tr id='pt12.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1201,7 +1746,7 @@
     
     
     
-        <tr id='pt11.32' class='hiddenRow bg-success'>
+        <tr id='pt12.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1210,7 +1755,7 @@
     
     
     
-        <tr id='pt11.33' class='hiddenRow bg-success'>
+        <tr id='pt12.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1219,7 +1764,7 @@
     
     
     
-        <tr id='pt11.34' class='hiddenRow bg-success'>
+        <tr id='pt12.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1228,7 +1773,7 @@
     
     
     
-        <tr id='pt11.35' class='hiddenRow bg-success'>
+        <tr id='pt12.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1237,7 +1782,7 @@
     
     
     
-        <tr id='pt11.36' class='hiddenRow bg-success'>
+        <tr id='pt12.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1255,13 +1800,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 6)">Detail</a>
+            <a onclick="showClassDetail('c13', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
             </td>
@@ -1270,7 +1815,7 @@
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
             </td>
@@ -1279,7 +1824,7 @@
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
             </td>
@@ -1288,7 +1833,7 @@
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
             </td>
@@ -1297,7 +1842,7 @@
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1306,7 +1851,7 @@
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
             </td>
@@ -1324,13 +1869,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 6)">Detail</a>
+            <a onclick="showClassDetail('c14', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
             </td>
@@ -1339,7 +1884,7 @@
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
             </td>
@@ -1348,7 +1893,7 @@
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
             </td>
@@ -1357,7 +1902,7 @@
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
             </td>
@@ -1366,7 +1911,7 @@
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1375,7 +1920,7 @@
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
@@ -1385,21 +1930,21 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 18)">Detail</a>
+            <a onclick="showClassDetail('c15', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1408,16 +1953,36 @@
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id="ft15.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 155, in test_bookslist_edit_categories
+    self.assertEqual(2, len(elements))
+AssertionError: 2 != 3</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1426,7 +1991,7 @@
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1435,7 +2000,7 @@
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1444,7 +2009,7 @@
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1453,7 +2018,7 @@
     
     
     
-        <tr id='pt14.7' class='hiddenRow bg-success'>
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1462,7 +2027,7 @@
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1471,7 +2036,7 @@
     
     
     
-        <tr id='pt14.9' class='hiddenRow bg-success'>
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1480,7 +2045,7 @@
     
     
     
-        <tr id='pt14.10' class='hiddenRow bg-success'>
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1489,25 +2054,65 @@
     
     
     
-        <tr id='pt14.11' class='hiddenRow bg-success'>
+        <tr id="ft15.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 231, in test_bookslist_edit_languages
+    self.assertEqual(4, len(elements))
+AssertionError: 4 != 5</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id="ft15.12" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.12')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 205, in test_bookslist_edit_publisher
+    self.assertEqual(2, len(elements))
+AssertionError: 2 != 3</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1516,7 +2121,7 @@
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -1525,7 +2130,7 @@
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1534,7 +2139,7 @@
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1543,7 +2148,7 @@
     
     
     
-        <tr id='pt14.17' class='hiddenRow bg-success'>
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1552,52 +2157,72 @@
     
     
     
-        <tr id='pt14.18' class='hiddenRow bg-success'>
+        <tr id="ft15.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 51, in test_search_books_list
+    bl = self.check_search(bl, &#34;genot&#34;, 4, &#34;Categories&#34;, &#34;Gênot&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 43, in check_search
+    self.assertEqual(count, len(bl[&#39;table&#39;]))
+AssertionError: 4 != 5</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestLoadMetadata</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">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 1)">Detail</a>
+            <a onclick="showClassDetail('c16', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft15.1" class="none bg-danger">
+        <tr id="et16.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
+                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.1').style.display='none'"><span
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 235, in test_load_metadata
-    self.assertEqual(&#34;奇想西遊記1&#34;, results[3][&#39;title&#39;])
-AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
-- 奇想西遊記1
-+ 巧讀西遊記</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 63, in test_load_metadata
+    if &#39;https://comicvine.gamespot.com/&#39; == results[10][&#39;source&#39;]:
+IndexError: list index out of range</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1616,13 +2241,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 18)">Detail</a>
+            <a onclick="showClassDetail('c17', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1631,7 +2256,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1640,7 +2265,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1649,7 +2274,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1658,7 +2283,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1667,7 +2292,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1676,7 +2301,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1685,7 +2310,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.8' class='hiddenRow bg-success'>
+        <tr id='pt17.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1694,7 +2319,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.9' class='hiddenRow bg-success'>
+        <tr id='pt17.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1703,7 +2328,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.10' class='hiddenRow bg-success'>
+        <tr id='pt17.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1712,7 +2337,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.11' class='hiddenRow bg-success'>
+        <tr id='pt17.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1721,7 +2346,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.12' class='hiddenRow bg-success'>
+        <tr id='pt17.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1730,7 +2355,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.13' class='hiddenRow bg-success'>
+        <tr id='pt17.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1739,7 +2364,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.14' class='hiddenRow bg-success'>
+        <tr id='pt17.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1748,7 +2373,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.15' class='hiddenRow bg-success'>
+        <tr id='pt17.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1757,7 +2382,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id='pt17.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1766,7 +2391,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.17' class='hiddenRow bg-success'>
+        <tr id='pt17.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1775,7 +2400,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.18' class='hiddenRow bg-success'>
+        <tr id='pt17.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1785,25 +2410,45 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id="ft18.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft18.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
+    self.assertEqual(30, len(results))
+AssertionError: 30 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1817,13 +2462,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 3)">Detail</a>
+            <a onclick="showClassDetail('c19', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1832,7 +2477,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1841,7 +2486,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1859,13 +2504,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 7)">Detail</a>
+            <a onclick="showClassDetail('c20', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1874,7 +2519,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1883,7 +2528,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt20.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1892,7 +2537,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.4' class='hiddenRow bg-success'>
+        <tr id='pt20.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1901,7 +2546,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.5' class='hiddenRow bg-success'>
+        <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1910,7 +2555,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.6' class='hiddenRow bg-success'>
+        <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -1919,7 +2564,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.7' class='hiddenRow bg-success'>
+        <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -1937,13 +2582,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1961,13 +2606,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 2)">Detail</a>
+            <a onclick="showClassDetail('c22', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1976,7 +2621,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -1994,13 +2639,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2009,19 +2654,19 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id="st22.2" class="none bg-warning">
+        <tr id="st23.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st22.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st23.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_st22.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st23.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2035,7 +2680,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2053,13 +2698,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 1)">Detail</a>
+            <a onclick="showClassDetail('c24', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2077,13 +2722,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 3)">Detail</a>
+            <a onclick="showClassDetail('c25', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2092,7 +2737,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2101,7 +2746,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2111,30 +2756,52 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">11</td>
-        <td class="text-center">0</td>
+        <td class="text-center">10</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('c25', 11)">Detail</a>
+            <a onclick="showClassDetail('c26', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id="ft26.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft26.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft26.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 581, in test_book_download
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 168, in inital_sync
+    self.assertEqual(r.status_code, 200)
+AssertionError: 404 != 200</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2143,7 +2810,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2152,7 +2819,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2161,7 +2828,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2170,7 +2837,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2179,7 +2846,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2188,7 +2855,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2197,7 +2864,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2206,7 +2873,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2215,7 +2882,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2233,13 +2900,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 5)">Detail</a>
+            <a onclick="showClassDetail('c27', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2248,7 +2915,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2257,7 +2924,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2266,7 +2933,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2275,7 +2942,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2293,13 +2960,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 13)">Detail</a>
+            <a onclick="showClassDetail('c28', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2308,7 +2975,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2317,7 +2984,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2326,7 +2993,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2335,7 +3002,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2344,7 +3011,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2353,7 +3020,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2362,7 +3029,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2371,7 +3038,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2380,7 +3047,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2389,7 +3056,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2398,7 +3065,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2407,7 +3074,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2417,21 +3084,21 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestCalibreWebListOrders</td>
         <td class="text-center">10</td>
-        <td class="text-center">10</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 10)">Detail</a>
+            <a onclick="showClassDetail('c29', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2440,7 +3107,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2449,7 +3116,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2458,16 +3125,36 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id="ft29.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 194, in test_lang_sort
+    self.assertEqual(len(list_element), 3)
+AssertionError: 4 != 3</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
@@ -2476,7 +3163,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
@@ -2485,38 +3172,120 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id="ft29.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 161, in test_publisher_sort
+    self.assertEqual(list_element[0][&#39;title&#39;], &#34;Randomhäus&#34;)
+AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
+- None
++ Randomhäus</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id="et29.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et29.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et29.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 239, in test_ratings_sort
+    self.assertEqual(list_element[0][&#39;title&#39;], &#34;2&#34;)
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id="ft29.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 39, in test_series_sort
+    self.assertTrue(list)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id="ft29.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 222, in test_tags_sort
+    self.assertEqual(len(list_element), 2)
+AssertionError: 3 != 2</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2530,13 +3299,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 9)">Detail</a>
+            <a onclick="showClassDetail('c30', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2545,7 +3314,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2554,7 +3323,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2563,7 +3332,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2572,19 +3341,19 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id="st29.5" class="none bg-warning">
+        <tr id="st30.5" 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_st29.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st29.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st30.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_st29.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st30.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2598,7 +3367,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2607,7 +3376,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2616,7 +3385,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2625,7 +3394,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2643,13 +3412,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 15)">Detail</a>
+            <a onclick="showClassDetail('c31', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2658,7 +3427,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2667,7 +3436,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2676,7 +3445,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2685,7 +3454,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2694,7 +3463,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2703,7 +3472,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2712,7 +3481,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2721,7 +3490,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2730,7 +3499,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2739,7 +3508,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2748,7 +3517,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2757,7 +3526,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2766,7 +3535,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2775,7 +3544,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2793,13 +3562,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2808,7 +3577,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2826,13 +3595,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c33', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2841,7 +3610,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2859,13 +3628,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 23)">Detail</a>
+            <a onclick="showClassDetail('c34', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2874,7 +3643,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2883,7 +3652,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2892,7 +3661,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2901,7 +3670,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2910,7 +3679,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2919,7 +3688,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2928,7 +3697,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2937,7 +3706,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id='pt34.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2946,7 +3715,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.10' class='hiddenRow bg-success'>
+        <tr id='pt34.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2955,7 +3724,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.11' class='hiddenRow bg-success'>
+        <tr id='pt34.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2964,7 +3733,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id='pt34.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2973,7 +3742,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id='pt34.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2982,7 +3751,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.14' class='hiddenRow bg-success'>
+        <tr id='pt34.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2991,7 +3760,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.15' class='hiddenRow bg-success'>
+        <tr id='pt34.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3000,7 +3769,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.16' class='hiddenRow bg-success'>
+        <tr id='pt34.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3009,7 +3778,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id='pt34.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3018,7 +3787,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.18' class='hiddenRow bg-success'>
+        <tr id='pt34.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3027,7 +3796,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.19' class='hiddenRow bg-success'>
+        <tr id='pt34.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3036,7 +3805,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.20' class='hiddenRow bg-success'>
+        <tr id='pt34.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3045,7 +3814,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.21' class='hiddenRow bg-success'>
+        <tr id='pt34.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3054,7 +3823,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.22' class='hiddenRow bg-success'>
+        <tr id='pt34.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3063,7 +3832,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.23' class='hiddenRow bg-success'>
+        <tr id='pt34.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3081,13 +3850,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 1)">Detail</a>
+            <a onclick="showClassDetail('c35', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3097,6 +3866,48 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
+    <tr id="su" class="passClass">
+        <td>TestPipInstall</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('c36', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt36.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_command_start</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt36.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt36.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_module_start</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
@@ -3105,13 +3916,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 5)">Detail</a>
+            <a onclick="showClassDetail('c37', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3120,7 +3931,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3129,7 +3940,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3138,7 +3949,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3147,7 +3958,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3165,13 +3976,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3189,13 +4000,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c39', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3213,13 +4024,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 8)">Detail</a>
+            <a onclick="showClassDetail('c40', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3228,7 +4039,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3237,7 +4048,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3246,7 +4057,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3255,7 +4066,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3264,7 +4075,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3273,7 +4084,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3282,7 +4093,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3300,13 +4111,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 3)">Detail</a>
+            <a onclick="showClassDetail('c41', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3315,7 +4126,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3324,7 +4135,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3342,13 +4153,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 16)">Detail</a>
+            <a onclick="showClassDetail('c42', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3357,7 +4168,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3366,7 +4177,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3375,7 +4186,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3384,7 +4195,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3393,7 +4204,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3402,7 +4213,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3411,7 +4222,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3420,7 +4231,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3429,7 +4240,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3438,7 +4249,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3447,7 +4258,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3456,7 +4267,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3465,19 +4276,19 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id="st40.14" class="none bg-warning">
+        <tr id="st42.14" 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_st40.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.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_st40.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3491,7 +4302,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3500,7 +4311,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3518,13 +4329,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 9)">Detail</a>
+            <a onclick="showClassDetail('c43', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3533,7 +4344,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3542,7 +4353,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3551,7 +4362,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3560,7 +4371,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3569,7 +4380,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3578,19 +4389,19 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id="st41.7" class="none bg-warning">
+        <tr id="st43.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_st41.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st43.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st43.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_st41.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st43.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3604,7 +4415,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3613,7 +4424,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3623,21 +4434,21 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">4</td>
-        <td class="text-center">4</td>
-        <td class="text-center">0</td>
+        <td class="text-center">3</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('c42', 4)">Detail</a>
+            <a onclick="showClassDetail('c44', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -3646,7 +4457,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -3655,7 +4466,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3664,11 +4475,33 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id="ft44.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 92, in test_upload_epub_lang
+    self.assertEqual(&#39;Tedesco&#39;, list_element[2].text)
+AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
+- Tedesco
++ Norvegese bokmål</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3682,13 +4515,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 18)">Detail</a>
+            <a onclick="showClassDetail('c45', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3697,7 +4530,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3706,7 +4539,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3715,7 +4548,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3724,7 +4557,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3733,7 +4566,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3742,7 +4575,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3751,7 +4584,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3760,7 +4593,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3769,7 +4602,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3778,7 +4611,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3787,7 +4620,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3796,7 +4629,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3805,7 +4638,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3814,7 +4647,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3823,7 +4656,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3832,7 +4665,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3841,7 +4674,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3859,13 +4692,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 1)">Detail</a>
+            <a onclick="showClassDetail('c46', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3883,13 +4716,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 21)">Detail</a>
+            <a onclick="showClassDetail('c47', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3898,7 +4731,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3907,7 +4740,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3916,7 +4749,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3925,7 +4758,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3934,7 +4767,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3943,7 +4776,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3952,7 +4785,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3961,7 +4794,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3970,7 +4803,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3979,7 +4812,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3988,7 +4821,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3997,7 +4830,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4006,7 +4839,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4015,7 +4848,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4024,7 +4857,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4033,7 +4866,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4042,7 +4875,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4051,7 +4884,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4060,7 +4893,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4069,7 +4902,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4079,21 +4912,21 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">35</td>
-        <td class="text-center">35</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">30</td>
+        <td class="text-center">1</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 35)">Detail</a>
+            <a onclick="showClassDetail('c48', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4102,7 +4935,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4111,7 +4944,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4120,7 +4953,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4129,7 +4962,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4138,7 +4971,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4147,7 +4980,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4156,7 +4989,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4165,7 +4998,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4174,7 +5007,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4183,7 +5016,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4192,7 +5025,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4201,7 +5034,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4210,52 +5043,186 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id="et48.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et48.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et48.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 349, in test_admin_change_visibility_rating
+    self.verify_order(&#34;nav_rate&#34;, 0, order=order)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1332, in verify_order
+    list_elements[index][&#39;ele&#39;].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id="et48.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et48.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et48.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 196, in test_admin_change_visibility_read
+    self.change_user({&#39;show_256&#39;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
+    ele = cls.driver.find_element(By.ID, checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;show_256&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id="et48.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et48.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et48.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 290, in test_admin_change_visibility_series
+    self.change_user({&#39;show_4&#39;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
+    ele = cls.driver.find_element(By.ID, checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;show_4&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id="et48.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et48.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et48.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 733, in test_allow_columns
+    self.fill_view_config({&#39;config_restricted_column&#39;: &#34;Custom Text 人物 *&#39;()&amp;&#34;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 363, in fill_view_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, &#34;discover&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id="ft48.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft48.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft48.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft48.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 596, in test_allow_tags
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt48.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4264,7 +5231,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt48.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4273,7 +5240,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt48.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4282,7 +5249,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.22' class='hiddenRow bg-success'>
+        <tr id='pt48.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4291,7 +5258,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.23' class='hiddenRow bg-success'>
+        <tr id='pt48.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4300,7 +5267,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.24' class='hiddenRow bg-success'>
+        <tr id='pt48.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4309,7 +5276,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.25' class='hiddenRow bg-success'>
+        <tr id='pt48.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4318,7 +5285,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.26' class='hiddenRow bg-success'>
+        <tr id='pt48.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
@@ -4327,7 +5294,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.27' class='hiddenRow bg-success'>
+        <tr id='pt48.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4336,7 +5303,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.28' class='hiddenRow bg-success'>
+        <tr id='pt48.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4345,7 +5312,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.29' class='hiddenRow bg-success'>
+        <tr id='pt48.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4354,7 +5321,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.30' class='hiddenRow bg-success'>
+        <tr id='pt48.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4363,7 +5330,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.31' class='hiddenRow bg-success'>
+        <tr id='pt48.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4372,7 +5339,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.32' class='hiddenRow bg-success'>
+        <tr id='pt48.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4381,7 +5348,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.33' class='hiddenRow bg-success'>
+        <tr id='pt48.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4390,7 +5357,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.34' class='hiddenRow bg-success'>
+        <tr id='pt48.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4399,7 +5366,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.35' class='hiddenRow bg-success'>
+        <tr id='pt48.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4417,13 +5384,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 16)">Detail</a>
+            <a onclick="showClassDetail('c49', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt49.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4432,7 +5399,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt49.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4441,7 +5408,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt49.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4450,7 +5417,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt49.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4459,7 +5426,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt49.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4468,7 +5435,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt49.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4477,7 +5444,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt49.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4486,7 +5453,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt49.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4495,7 +5462,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt49.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4504,7 +5471,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt49.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4513,7 +5480,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt49.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4522,7 +5489,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt49.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4531,7 +5498,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt49.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4540,7 +5507,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt49.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4549,7 +5516,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt49.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4558,7 +5525,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt49.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4569,10 +5536,10 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>406</td>
-        <td>399</td>
-        <td>1</td>
-        <td>0</td>
+        <td>416</td>
+        <td>372</td>
+        <td>23</td>
+        <td>15</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4715,7 +5682,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.34</td>
+              <td>1.4.35</td>
               <td>Basic</td>
             </tr>
           
@@ -4745,7 +5712,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4775,7 +5742,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4805,7 +5772,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4847,7 +5814,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4877,13 +5844,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.10.0</td>
+              <td>4.11.1</td>
               <td>TestLoadMetadata</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4913,7 +5880,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.10.0</td>
+              <td>4.11.1</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
@@ -4925,7 +5892,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4997,7 +5964,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>Flask-Dance</th>
-              <td>5.1.0</td>
+              <td>6.0.0</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -5015,7 +5982,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
 </div>
 
 <script>
-    drawCircle(399, 1, 0, 6);
+    drawCircle(372, 23, 15, 6);
     showCase(5);
 </script>
 

From 2303fc08148de0bb09d1a41e88da314de0b6f9de Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 20 Apr 2022 07:05:22 +0200
Subject: [PATCH 245/412] Updated requirements Update after testrun

---
 requirements.txt                        |    2 +-
 setup.cfg                               |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 1988 +++++++----------------
 3 files changed, 570 insertions(+), 1422 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7b03ffe40..81320aa3a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 werkzeug<2.1.0
 Babel>=1.3,<3.0
 Flask-Babel>=0.11.1,<2.1.0
-Flask-Login>=0.3.2,<0.5.1
+Flask-Login>=0.3.2,<0.6.1
 Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
 Flask>=1.0.2,<2.1.0
diff --git a/setup.cfg b/setup.cfg
index e9c236047..251d9db03 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -41,7 +41,7 @@ install_requires =
 	werkzeug<2.1.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
-	Flask-Login>=0.3.2,<0.5.1
+	Flask-Login>=0.3.2,<0.6.1
 	Flask-Principal>=0.3.2,<0.5.1
 	backports_abc>=0.4
 	Flask>=1.0.2,<2.1.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index d384225fa..1c874a620 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-18 20:29:19</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-19 20:47:12</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>2022-04-19 07:55:03</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-20 02:31:36</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>10h 36 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 53 min</p>
         </div>
       </div>
       </div>
@@ -102,15 +102,15 @@
     </tr>
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestAnonymous</td>
-        <td class="text-center">18</td>
-        <td class="text-center">5</td>
-        <td class="text-center">6</td>
-        <td class="text-center">7</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', 18)">Detail</a>
+            <a onclick="showClassDetail('c1', 13)">Detail</a>
         </td>
     </tr>
 
@@ -134,33 +134,11 @@
     
     
     
-        <tr id="ft1.3" class="none bg-danger">
+        <tr id='pt1.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 405, in test_guest_change_visibility_category
-    self.assertEqual(books[0][&#39;title&#39;], &#39;Gênot&#39;)
-AssertionError: &#39;None&#39; != &#39;Gênot&#39;
-- None
-+ Gênot</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -183,64 +161,20 @@ AssertionError: &#39;None&#39; != &#39;Gênot&#39;
     
     
     
-        <tr id="ft1.6" class="none bg-danger">
+        <tr id='pt1.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_language</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 259, in test_guest_change_visibility_language
-    self.assertEqual(books[1][&#39;id&#39;], &#39;eng&#39;)
-AssertionError: &#39;none&#39; != &#39;eng&#39;
-- none
-+ eng</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft1.7" class="none bg-danger">
+        <tr id='pt1.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 322, in test_guest_change_visibility_publisher
-    self.assertEqual(books[0][&#39;title&#39;], &#39;Randomhäus&#39;)
-AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
-- None
-+ Randomhäus</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -254,368 +188,67 @@ AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
     
     
     
-        <tr id="et1.9" class="none bg-info">
+        <tr id='pt1.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 364, in test_guest_change_visibility_rating
-    self.assertEqual(books[1][&#39;id&#39;], &#39;2&#39;)
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et1.10" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft1.11" class="none bg-danger">
+        <tr id='pt1.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 289, in test_guest_change_visibility_series
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et1.12" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft1.13" class="none bg-danger">
+        <tr id='pt1.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 54, in test_guest_random_books_available
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;books_rand&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et1.14" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et1.15" class="none bg-info">
+        <tr id='pt1.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 384, in test_guest_restricted_settings_visibility
-    self.assertIsNone(rights[&#39;show_512&#39;])
-TypeError: &#39;bool&#39; object is not subscriptable</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et1.16" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft1.17" class="none bg-danger">
+        <tr id='pt1.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.17')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 135, in test_guest_visibility_sidebar
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et1.18" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</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('c2', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et2.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_anonymous)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et2.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et2.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 26, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCli</td>
         <td class="text-center">9</td>
-        <td class="text-center">4</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</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('c3', 9)">Detail</a>
+            <a onclick="showClassDetail('c2', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt3.1' class='hiddenRow bg-success'>
+        <tr id='pt2.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_already_started</div>
             </td>
@@ -624,121 +257,34 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft3.2" class="none bg-danger">
+        <tr id='pt2.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_bind_to_single_interface</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 316, in test_bind_to_single_interface
-    self.assertTrue(re.findall(&#39;Reached error page:\sabout:neterror\?e=connectionFailure&#39;, error))
-AssertionError: [] is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft3.3" class="none bg-danger">
+        <tr id='pt2.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_change_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 446, in test_change_password
-    self.login(&#34;admin&#34;, &#34;adm:in12&#34;)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16
-
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 453, in test_change_password
-    self.assertFalse(e)
-AssertionError: TimeoutException(&#39;&#39;, None, [&#39;WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5&#39;, &#39;NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5&#39;, &#39;element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16&#39;, &#39;&#39;]) is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft3.4" class="none bg-danger">
+        <tr id='pt2.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_cli_SSL_files</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 280, in test_cli_SSL_files
-    self.driver.get(&#34;https://127.0.0.1:8083&#34;)
-selenium.common.exceptions.WebDriverException: Message: Reached error page: about:neterror?e=netTimeout&amp;u=https%3A//127.0.0.1%3A8083/&amp;c=UTF-8&amp;d=The%20server%20at%20127.0.0.1%20is%20taking%20too%20long%20to%20respond.
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-UnknownError@chrome://remote/content/shared/webdriver/Errors.jsm:510:5
-checkReadyState@chrome://remote/content/marionette/navigate.js:64:24
-onNavigation@chrome://remote/content/marionette/navigate.js:312:39
-emit@resource://gre/modules/EventEmitter.jsm:160:20
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm:44:25
-
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 282, in test_cli_SSL_files
-    self.assertIsNone(&#34;Error&#34;, &#34;HTTPS Connection could not established with key/cert file&#34;)
-AssertionError: &#39;Error&#39; is not None : HTTPS Connection could not established with key/cert file</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt3.5' class='hiddenRow bg-success'>
+        <tr id='pt2.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_cli_different_folder</div>
             </td>
@@ -747,46 +293,16 @@ AssertionError: &#39;Error&#39; is not None : HTTPS Connection could not establi
     
     
     
-        <tr id="et3.6" class="none bg-info">
+        <tr id='pt2.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_cli_different_settings_database</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 125, in test_cli_different_settings_database
-    self.fill_db_config({&#39;config_calibre_dir&#39;: TEST_DB})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 223, in fill_db_config
-    cls.login(&#39;admin&#39;, &#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 87, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt3.7' class='hiddenRow bg-success'>
+        <tr id='pt2.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_dryrun_update</div>
             </td>
@@ -795,7 +311,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt3.8' class='hiddenRow bg-success'>
+        <tr id='pt2.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_environ_port_setting</div>
             </td>
@@ -804,43 +320,11 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft3.9" class="none bg-danger">
+        <tr id='pt2.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 408, in test_settingsdb_not_writeable
-    self.fill_db_config({&#39;config_calibre_dir&#39;: TEST_DB})
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16
-
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 413, in test_settingsdb_not_writeable
-    self.assertFalse(True, &#34;Inital config failed with nonwriteable database&#34;)
-AssertionError: True is not false : Inital config failed with nonwriteable database</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -854,13 +338,13 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c4', 3)">Detail</a>
+            <a onclick="showClassDetail('c3', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt4.1' class='hiddenRow bg-success'>
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_folder</div>
             </td>
@@ -869,7 +353,7 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
     
     
     
-        <tr id='pt4.2' class='hiddenRow bg-success'>
+        <tr id='pt3.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
@@ -878,7 +362,7 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
     
     
     
-        <tr id='pt4.3' class='hiddenRow bg-success'>
+        <tr id='pt3.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
@@ -896,13 +380,13 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c5', 2)">Detail</a>
+            <a onclick="showClassDetail('c4', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt5.1' class='hiddenRow bg-success'>
+        <tr id='pt4.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_invalid_jpg_hdd</div>
             </td>
@@ -911,7 +395,7 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
     
     
     
-        <tr id='pt5.2' class='hiddenRow bg-success'>
+        <tr id='pt4.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
@@ -921,45 +405,25 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestDeleteDatabase</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 1)">Detail</a>
+            <a onclick="showClassDetail('c5', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft6.1" class="none bg-danger">
+        <tr id='pt5.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestDeleteDatabase - test_delete_books_in_database</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_delete_database.py&#34;, line 70, in test_delete_books_in_database
-    self.assertEqual(0, len(list_element))
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -973,13 +437,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c7', 15)">Detail</a>
+            <a onclick="showClassDetail('c6', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
@@ -988,7 +452,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
             </td>
@@ -997,7 +461,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
@@ -1006,7 +470,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
@@ -1015,7 +479,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
@@ -1024,7 +488,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
@@ -1033,7 +497,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.7' class='hiddenRow bg-success'>
+        <tr id='pt6.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
@@ -1042,7 +506,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.8' class='hiddenRow bg-success'>
+        <tr id='pt6.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
@@ -1051,7 +515,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.9' class='hiddenRow bg-success'>
+        <tr id='pt6.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
@@ -1060,7 +524,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.10' class='hiddenRow bg-success'>
+        <tr id='pt6.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
@@ -1069,7 +533,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.11' class='hiddenRow bg-success'>
+        <tr id='pt6.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
@@ -1078,7 +542,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.12' class='hiddenRow bg-success'>
+        <tr id='pt6.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
             </td>
@@ -1087,7 +551,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.13' class='hiddenRow bg-success'>
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
@@ -1096,7 +560,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.14' class='hiddenRow bg-success'>
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
@@ -1105,7 +569,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.15' class='hiddenRow bg-success'>
+        <tr id='pt6.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
@@ -1123,13 +587,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c8', 6)">Detail</a>
+            <a onclick="showClassDetail('c7', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt8.1' class='hiddenRow bg-success'>
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
@@ -1138,7 +602,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id='pt7.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
             </td>
@@ -1147,7 +611,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.3' class='hiddenRow bg-success'>
+        <tr id='pt7.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
@@ -1156,7 +620,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.4' class='hiddenRow bg-success'>
+        <tr id='pt7.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
             </td>
@@ -1165,7 +629,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.5' class='hiddenRow bg-success'>
+        <tr id='pt7.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
             </td>
@@ -1174,7 +638,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.6' class='hiddenRow bg-success'>
+        <tr id='pt7.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
@@ -1192,13 +656,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 3)">Detail</a>
+            <a onclick="showClassDetail('c8', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt9.1' class='hiddenRow bg-success'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_deactivate</div>
             </td>
@@ -1207,7 +671,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
@@ -1216,7 +680,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt9.3' class='hiddenRow bg-success'>
+        <tr id='pt8.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_wrong_excecutable</div>
             </td>
@@ -1234,13 +698,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 3)">Detail</a>
+            <a onclick="showClassDetail('c9', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt10.1' class='hiddenRow bg-success'>
+        <tr id='pt9.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_deactivate</div>
             </td>
@@ -1249,7 +713,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt10.2' class='hiddenRow bg-success'>
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
@@ -1258,7 +722,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt10.3' class='hiddenRow bg-success'>
+        <tr id='pt9.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_wrong_excecutable</div>
             </td>
@@ -1276,13 +740,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 17)">Detail</a>
+            <a onclick="showClassDetail('c10', 17)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_cbz_comicinfo</div>
             </td>
@@ -1291,7 +755,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
             </td>
@@ -1300,7 +764,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
@@ -1309,7 +773,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
@@ -1318,7 +782,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
@@ -1327,7 +791,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
@@ -1336,7 +800,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id='pt10.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
             </td>
@@ -1345,7 +809,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
@@ -1354,7 +818,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.9' class='hiddenRow bg-success'>
+        <tr id='pt10.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
@@ -1363,7 +827,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.10' class='hiddenRow bg-success'>
+        <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
@@ -1372,7 +836,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.11' class='hiddenRow bg-success'>
+        <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1381,7 +845,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.12' class='hiddenRow bg-success'>
+        <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -1390,7 +854,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.13' class='hiddenRow bg-success'>
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -1399,7 +863,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.14' class='hiddenRow bg-success'>
+        <tr id='pt10.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -1408,7 +872,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='st11.15' class='none bg-warning'>
+        <tr id='st10.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -1417,7 +881,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.16' class='hiddenRow bg-success'>
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -1426,7 +890,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.17' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -1444,13 +908,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 36)">Detail</a>
+            <a onclick="showClassDetail('c11', 36)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1459,7 +923,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1468,7 +932,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1477,7 +941,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1486,7 +950,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1495,7 +959,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1504,7 +968,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1513,7 +977,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1522,7 +986,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1531,7 +995,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt11.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1540,7 +1004,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt11.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1549,7 +1013,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt11.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1558,7 +1022,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt11.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1567,7 +1031,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt11.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1576,7 +1040,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt11.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1585,7 +1049,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt11.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1594,7 +1058,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt11.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1603,7 +1067,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt11.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1612,7 +1076,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.19' class='hiddenRow bg-success'>
+        <tr id='pt11.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1621,19 +1085,19 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id="st12.20" class="none bg-warning">
+        <tr id="st11.20" 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_st12.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1647,7 +1111,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.21' class='hiddenRow bg-success'>
+        <tr id='pt11.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1656,7 +1120,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.22' class='hiddenRow bg-success'>
+        <tr id='pt11.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1665,7 +1129,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.23' class='hiddenRow bg-success'>
+        <tr id='pt11.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1674,7 +1138,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.24' class='hiddenRow bg-success'>
+        <tr id='pt11.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1683,7 +1147,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.25' class='hiddenRow bg-success'>
+        <tr id='pt11.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1692,7 +1156,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.26' class='hiddenRow bg-success'>
+        <tr id='pt11.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1701,7 +1165,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.27' class='hiddenRow bg-success'>
+        <tr id='pt11.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1710,7 +1174,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.28' class='hiddenRow bg-success'>
+        <tr id='pt11.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1719,7 +1183,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.29' class='hiddenRow bg-success'>
+        <tr id='pt11.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1728,7 +1192,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.30' class='hiddenRow bg-success'>
+        <tr id='pt11.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1737,7 +1201,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.31' class='hiddenRow bg-success'>
+        <tr id='pt11.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1746,7 +1210,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.32' class='hiddenRow bg-success'>
+        <tr id='pt11.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1755,7 +1219,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.33' class='hiddenRow bg-success'>
+        <tr id='pt11.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1764,7 +1228,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.34' class='hiddenRow bg-success'>
+        <tr id='pt11.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1773,7 +1237,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.35' class='hiddenRow bg-success'>
+        <tr id='pt11.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1782,7 +1246,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.36' class='hiddenRow bg-success'>
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1800,13 +1264,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 6)">Detail</a>
+            <a onclick="showClassDetail('c12', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
             </td>
@@ -1815,7 +1279,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
             </td>
@@ -1824,7 +1288,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
             </td>
@@ -1833,7 +1297,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
             </td>
@@ -1842,7 +1306,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1851,7 +1315,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
             </td>
@@ -1869,13 +1333,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 6)">Detail</a>
+            <a onclick="showClassDetail('c13', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
             </td>
@@ -1884,7 +1348,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
             </td>
@@ -1893,7 +1357,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
             </td>
@@ -1902,7 +1366,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
             </td>
@@ -1911,7 +1375,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1920,7 +1384,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
@@ -1933,18 +1397,18 @@ AssertionError: 0 != 1</pre>
     <tr id="su" class="failClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">14</td>
-        <td class="text-center">4</td>
+        <td class="text-center">15</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 18)">Detail</a>
+            <a onclick="showClassDetail('c14', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1953,19 +1417,19 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id="ft15.2" class="none bg-danger">
+        <tr id="ft14.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.2')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.2')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft15.2" class="popup_window test_output" style="display:block;">
+                <div id="div_ft14.2" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.2').style.display='none'"><span
+                                onclick="document.getElementById('div_ft14.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1982,7 +1446,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1991,7 +1455,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -2000,7 +1464,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -2009,7 +1473,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -2018,7 +1482,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -2027,7 +1491,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -2036,7 +1500,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -2045,7 +1509,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -2054,55 +1518,37 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id="ft15.11" class="none bg-danger">
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft15.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 231, in test_bookslist_edit_languages
-    self.assertEqual(4, len(elements))
-AssertionError: 4 != 5</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft15.12" class="none bg-danger">
+        <tr id="ft14.12" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.12')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.12')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft15.12" class="popup_window test_output" style="display:block;">
+                <div id="div_ft14.12" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.12').style.display='none'"><span
+                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 205, in test_bookslist_edit_publisher
-    self.assertEqual(2, len(elements))
-AssertionError: 2 != 3</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 206, in test_bookslist_edit_publisher
+    self.assertEqual(&#34;Pandöm,Ti|s@d&#34;, elements[0].text)
+AssertionError: &#39;Pandöm,Ti|s@d&#39; != &#39;None&#39;
+- Pandöm,Ti|s@d
++ None</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2112,7 +1558,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -2121,7 +1567,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -2130,7 +1576,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -2139,7 +1585,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.16' class='hiddenRow bg-success'>
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -2148,7 +1594,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -2157,19 +1603,19 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id="ft15.18" class="none bg-danger">
+        <tr id="ft14.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.18')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.18')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft15.18" class="popup_window test_output" style="display:block;">
+                <div id="div_ft14.18" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.18').style.display='none'"><span
+                                onclick="document.getElementById('div_ft14.18').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2189,45 +1635,25 @@ AssertionError: 4 != 5</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</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">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et16.1" class="none bg-info">
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 63, in test_load_metadata
-    if &#39;https://comicvine.gamespot.com/&#39; == results[10][&#39;source&#39;]:
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2241,13 +1667,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 18)">Detail</a>
+            <a onclick="showClassDetail('c16', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -2256,7 +1682,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -2265,7 +1691,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -2274,7 +1700,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -2283,7 +1709,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -2292,7 +1718,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -2301,7 +1727,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -2310,7 +1736,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.8' class='hiddenRow bg-success'>
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -2319,7 +1745,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.9' class='hiddenRow bg-success'>
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -2328,7 +1754,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.10' class='hiddenRow bg-success'>
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -2337,7 +1763,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.11' class='hiddenRow bg-success'>
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -2346,7 +1772,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.12' class='hiddenRow bg-success'>
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -2355,7 +1781,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.13' class='hiddenRow bg-success'>
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -2364,7 +1790,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.14' class='hiddenRow bg-success'>
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -2373,7 +1799,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.15' class='hiddenRow bg-success'>
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -2382,7 +1808,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.16' class='hiddenRow bg-success'>
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -2391,7 +1817,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.17' class='hiddenRow bg-success'>
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -2400,7 +1826,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.18' class='hiddenRow bg-success'>
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -2410,45 +1836,25 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft18.1" class="none bg-danger">
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft18.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
-    self.assertEqual(30, len(results))
-AssertionError: 30 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2462,13 +1868,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 3)">Detail</a>
+            <a onclick="showClassDetail('c18', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -2477,7 +1883,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -2486,7 +1892,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -2504,13 +1910,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 7)">Detail</a>
+            <a onclick="showClassDetail('c19', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -2519,7 +1925,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -2528,7 +1934,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -2537,7 +1943,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2546,7 +1952,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -2555,7 +1961,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -2564,7 +1970,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2582,13 +1988,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2606,13 +2012,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 2)">Detail</a>
+            <a onclick="showClassDetail('c21', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2621,7 +2027,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -2639,13 +2045,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2654,19 +2060,19 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id="st23.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st23.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.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_st23.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2680,7 +2086,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2698,13 +2104,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2722,13 +2128,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2737,7 +2143,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2746,7 +2152,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2756,52 +2162,30 @@ AssertionError: 30 != 0</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">10</td>
-        <td class="text-center">1</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('c26', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft26.1" class="none bg-danger">
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <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_ft26.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft26.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 581, in test_book_download
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 168, in inital_sync
-    self.assertEqual(r.status_code, 200)
-AssertionError: 404 != 200</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2810,7 +2194,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2819,7 +2203,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2828,7 +2212,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2837,7 +2221,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2846,7 +2230,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2855,7 +2239,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2864,7 +2248,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2873,7 +2257,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2882,7 +2266,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2900,13 +2284,13 @@ AssertionError: 404 != 200</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 5)">Detail</a>
+            <a onclick="showClassDetail('c26', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2915,7 +2299,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2924,7 +2308,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2933,7 +2317,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2942,7 +2326,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2960,13 +2344,13 @@ AssertionError: 404 != 200</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2975,7 +2359,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2984,7 +2368,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2993,7 +2377,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -3002,7 +2386,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -3011,7 +2395,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -3020,7 +2404,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -3029,7 +2413,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -3038,7 +2422,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -3047,7 +2431,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -3056,7 +2440,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -3065,7 +2449,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -3074,7 +2458,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -3084,21 +2468,21 @@ AssertionError: 404 != 200</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebListOrders</td>
         <td class="text-center">10</td>
-        <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">10</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', 10)">Detail</a>
+            <a onclick="showClassDetail('c28', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -3107,7 +2491,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -3116,7 +2500,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -3125,36 +2509,16 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id="ft29.4" class="none bg-danger">
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 194, in test_lang_sort
-    self.assertEqual(len(list_element), 3)
-AssertionError: 4 != 3</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
@@ -3163,7 +2527,7 @@ AssertionError: 4 != 3</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
@@ -3172,120 +2536,38 @@ AssertionError: 4 != 3</pre>
     
     
     
-        <tr id="ft29.7" class="none bg-danger">
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 161, in test_publisher_sort
-    self.assertEqual(list_element[0][&#39;title&#39;], &#34;Randomhäus&#34;)
-AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
-- None
-+ Randomhäus</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et29.8" class="none bg-info">
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et29.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et29.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 239, in test_ratings_sort
-    self.assertEqual(list_element[0][&#39;title&#39;], &#34;2&#34;)
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft29.9" class="none bg-danger">
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 39, in test_series_sort
-    self.assertTrue(list)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft29.10" class="none bg-danger">
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 222, in test_tags_sort
-    self.assertEqual(len(list_element), 2)
-AssertionError: 3 != 2</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3299,13 +2581,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -3314,7 +2596,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -3323,7 +2605,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -3332,7 +2614,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -3341,19 +2623,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st30.5" class="none bg-warning">
+        <tr id="st29.5" 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_st30.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st30.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st30.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3367,7 +2649,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -3376,7 +2658,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -3385,7 +2667,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -3394,7 +2676,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -3412,13 +2694,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -3427,7 +2709,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -3436,7 +2718,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -3445,7 +2727,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -3454,7 +2736,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -3463,7 +2745,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -3472,7 +2754,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -3481,7 +2763,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -3490,7 +2772,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -3499,7 +2781,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -3508,7 +2790,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -3517,7 +2799,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3526,7 +2808,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3535,7 +2817,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3544,7 +2826,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3562,13 +2844,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -3577,7 +2859,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -3595,13 +2877,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3610,7 +2892,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3628,13 +2910,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3643,7 +2925,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3652,7 +2934,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3661,7 +2943,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3670,7 +2952,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3679,7 +2961,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3688,7 +2970,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3697,7 +2979,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3706,7 +2988,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3715,7 +2997,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3724,7 +3006,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3733,7 +3015,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3742,7 +3024,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3751,7 +3033,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3760,7 +3042,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3769,7 +3051,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3778,7 +3060,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3787,7 +3069,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3796,7 +3078,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3805,7 +3087,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3814,7 +3096,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3823,7 +3105,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3832,7 +3114,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3850,13 +3132,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3874,13 +3156,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 3)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_command_start</div>
             </td>
@@ -3889,7 +3171,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
             </td>
@@ -3898,7 +3180,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_module_start</div>
             </td>
@@ -3916,13 +3198,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3931,7 +3213,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3940,7 +3222,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3949,7 +3231,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3958,7 +3240,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3976,13 +3258,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -4000,13 +3282,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -4024,13 +3306,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -4039,7 +3321,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -4048,7 +3330,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -4057,7 +3339,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -4066,7 +3348,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -4075,7 +3357,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -4084,7 +3366,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -4093,7 +3375,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -4111,13 +3393,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -4126,7 +3408,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -4135,7 +3417,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -4153,13 +3435,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -4168,7 +3450,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -4177,7 +3459,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -4186,7 +3468,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -4195,7 +3477,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -4204,7 +3486,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -4213,7 +3495,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -4222,7 +3504,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -4231,7 +3513,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -4240,7 +3522,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -4249,7 +3531,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -4258,7 +3540,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -4267,7 +3549,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -4276,19 +3558,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st42.14" class="none bg-warning">
+        <tr id="st41.14" 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_st42.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st42.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st42.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4302,7 +3584,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -4311,7 +3593,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -4329,13 +3611,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 9)">Detail</a>
+            <a onclick="showClassDetail('c42', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -4344,7 +3626,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -4353,7 +3635,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -4362,7 +3644,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -4371,7 +3653,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -4380,7 +3662,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -4389,19 +3671,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st43.7" class="none bg-warning">
+        <tr id="st42.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_st43.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st43.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.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_st43.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4415,7 +3697,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -4424,7 +3706,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -4442,13 +3724,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 4)">Detail</a>
+            <a onclick="showClassDetail('c43', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -4457,7 +3739,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -4466,7 +3748,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4475,28 +3757,28 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="ft44.4" class="none bg-danger">
+        <tr id="ft43.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.4')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.4')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
+                <div id="div_ft43.4" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.4').style.display='none'"><span
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 92, in test_upload_epub_lang
-    self.assertEqual(&#39;Tedesco&#39;, list_element[2].text)
-AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
-- Tedesco
-+ Norvegese bokmål</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 94, in test_upload_epub_lang
+    self.assertEqual(&#34;Lingua: Tedesco&#34;, self.driver.find_elements(By.TAG_NAME, &#34;h2&#34;)[1].text)
+AssertionError: &#39;Lingua: Tedesco&#39; != &#39;Lingua: Norvegese bokmål&#39;
+- Lingua: Tedesco
++ Lingua: Norvegese bokmål</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4515,13 +3797,13 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 18)">Detail</a>
+            <a onclick="showClassDetail('c44', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4530,7 +3812,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4539,7 +3821,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4548,7 +3830,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4557,7 +3839,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4566,7 +3848,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4575,7 +3857,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4584,7 +3866,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4593,7 +3875,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4602,7 +3884,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4611,7 +3893,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4620,7 +3902,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4629,7 +3911,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4638,7 +3920,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4647,7 +3929,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4656,7 +3938,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4665,7 +3947,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4674,7 +3956,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4692,13 +3974,13 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 1)">Detail</a>
+            <a onclick="showClassDetail('c45', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4716,13 +3998,13 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 21)">Detail</a>
+            <a onclick="showClassDetail('c46', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4731,7 +4013,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4740,7 +4022,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4749,7 +4031,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4758,7 +4040,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4767,7 +4049,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4776,7 +4058,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4785,7 +4067,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4794,7 +4076,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4803,7 +4085,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4812,7 +4094,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4821,7 +4103,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4830,7 +4112,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4839,7 +4121,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4848,7 +4130,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4857,7 +4139,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4866,7 +4148,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4875,7 +4157,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4884,7 +4166,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4893,7 +4175,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4902,7 +4184,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4912,21 +4194,21 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">35</td>
-        <td class="text-center">30</td>
-        <td class="text-center">1</td>
-        <td class="text-center">4</td>
+        <td class="text-center">35</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('c48', 35)">Detail</a>
+            <a onclick="showClassDetail('c47', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4935,7 +4217,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4944,7 +4226,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4953,7 +4235,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4962,7 +4244,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4971,7 +4253,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4980,7 +4262,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4989,7 +4271,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4998,7 +4280,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -5007,7 +4289,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -5016,7 +4298,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -5025,7 +4307,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -5034,7 +4316,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -5043,186 +4325,52 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id="et48.14" class="none bg-info">
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et48.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et48.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 349, in test_admin_change_visibility_rating
-    self.verify_order(&#34;nav_rate&#34;, 0, order=order)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1332, in verify_order
-    list_elements[index][&#39;ele&#39;].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et48.15" class="none bg-info">
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et48.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et48.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 196, in test_admin_change_visibility_read
-    self.change_user({&#39;show_256&#39;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
-    ele = cls.driver.find_element(By.ID, checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;show_256&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et48.16" class="none bg-info">
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et48.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et48.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 290, in test_admin_change_visibility_series
-    self.change_user({&#39;show_4&#39;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
-    ele = cls.driver.find_element(By.ID, checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;show_4&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et48.17" class="none bg-info">
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et48.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et48.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 733, in test_allow_columns
-    self.fill_view_config({&#39;config_restricted_column&#39;: &#34;Custom Text 人物 *&#39;()&amp;&#34;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 363, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, &#34;discover&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft48.18" class="none bg-danger">
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft48.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft48.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft48.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 596, in test_allow_tags
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt48.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -5231,7 +4379,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -5240,7 +4388,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -5249,7 +4397,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.22' class='hiddenRow bg-success'>
+        <tr id='pt47.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -5258,7 +4406,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.23' class='hiddenRow bg-success'>
+        <tr id='pt47.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -5267,7 +4415,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.24' class='hiddenRow bg-success'>
+        <tr id='pt47.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -5276,7 +4424,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.25' class='hiddenRow bg-success'>
+        <tr id='pt47.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -5285,7 +4433,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.26' class='hiddenRow bg-success'>
+        <tr id='pt47.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
@@ -5294,7 +4442,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.27' class='hiddenRow bg-success'>
+        <tr id='pt47.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -5303,7 +4451,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.28' class='hiddenRow bg-success'>
+        <tr id='pt47.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -5312,7 +4460,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.29' class='hiddenRow bg-success'>
+        <tr id='pt47.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -5321,7 +4469,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.30' class='hiddenRow bg-success'>
+        <tr id='pt47.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -5330,7 +4478,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.31' class='hiddenRow bg-success'>
+        <tr id='pt47.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -5339,7 +4487,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.32' class='hiddenRow bg-success'>
+        <tr id='pt47.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -5348,7 +4496,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.33' class='hiddenRow bg-success'>
+        <tr id='pt47.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -5357,7 +4505,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.34' class='hiddenRow bg-success'>
+        <tr id='pt47.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -5366,7 +4514,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.35' class='hiddenRow bg-success'>
+        <tr id='pt47.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -5384,13 +4532,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c49', 16)">Detail</a>
+            <a onclick="showClassDetail('c48', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt49.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -5399,7 +4547,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -5408,7 +4556,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -5417,7 +4565,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -5426,7 +4574,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -5435,7 +4583,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -5444,7 +4592,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -5453,7 +4601,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -5462,7 +4610,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -5471,7 +4619,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -5480,7 +4628,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -5489,7 +4637,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -5498,7 +4646,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -5507,7 +4655,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -5516,7 +4664,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -5525,7 +4673,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -5536,10 +4684,10 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>416</td>
-        <td>372</td>
-        <td>23</td>
-        <td>15</td>
+        <td>410</td>
+        <td>400</td>
+        <td>4</td>
+        <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -5616,7 +4764,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask-Login</th>
-              <td>0.5.0</td>
+              <td>0.6.0</td>
               <td>Basic</td>
             </tr>
           
@@ -5712,7 +4860,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5730,7 +4878,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5742,7 +4890,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5760,7 +4908,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5772,7 +4920,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5790,7 +4938,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5814,7 +4962,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5832,7 +4980,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5850,7 +4998,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5868,7 +5016,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5892,7 +5040,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5910,7 +5058,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5982,7 +5130,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(372, 23, 15, 6);
+    drawCircle(400, 4, 0, 6);
     showCase(5);
 </script>
 

From 5c342d4e7c8f7bfb8740599d69b7607c69a2b09c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 22 Apr 2022 09:06:37 +0200
Subject: [PATCH 246/412] use get for dicts

---
 cps/web.py | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index 517539f8d..8d8b9043e 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1568,13 +1568,13 @@ def register():
 
     if request.method == "POST":
         to_save = request.form.to_dict()
-        nickname = to_save["email"].strip() if config.config_register_email else to_save.get('name')
+        nickname = to_save.get("email", "").strip() if config.config_register_email else to_save.get('name')
         if not nickname or not to_save.get("email"):
             flash(_(u"Please fill out all fields!"), category="error")
             return render_title_template('register.html', title=_("Register"), page="register")
         try:
             nickname = check_username(nickname)
-            email = check_email(to_save["email"])
+            email = check_email(to_save.get("email", ""))
         except Exception as ex:
             flash(str(ex), category="error")
             return render_title_template('register.html', title=_("Register"), page="register")
@@ -1592,14 +1592,15 @@ def register():
                 ub.session.commit()
                 if feature_support['oauth']:
                     register_user_with_oauth(content)
-                send_registration_mail(to_save["email"].strip(), nickname, password)
+                send_registration_mail(to_save.get("email", "").strip(), nickname, password)
             except Exception:
                 ub.session.rollback()
                 flash(_(u"An unknown error occurred. Please try again later."), category="error")
                 return render_title_template('register.html', title=_("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', nickname, to_save["email"])
+            log.warning('Registering failed for user "{}" e-mail address: {}'.format(nickname,
+                                                                                     to_save.get("email","")))
             return render_title_template('register.html', title=_("Register"), page="register")
         flash(_(u"Confirmation e-mail was send to your e-mail account."), category="success")
         return redirect(url_for('web.login'))
@@ -1625,7 +1626,7 @@ def login():
             if login_result:
                 login_user(user, remember=bool(form.get('remember_me')))
                 ub.store_user_session()
-                log.debug(u"You are now logged in as: '%s'", user.name)
+                log.debug(u"You are now logged in as: '{}'".format(user.name))
                 flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.name),
                       category="success")
                 return redirect_back(url_for("web.index"))
@@ -1633,7 +1634,7 @@ def login():
                     and user.name != "Guest":
                 login_user(user, remember=bool(form.get('remember_me')))
                 ub.store_user_session()
-                log.info("Local Fallback Login as: '%s'", user.name)
+                log.info("Local Fallback Login as: '{}'".format(user.name))
                 flash(_(u"Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known",
                         nickname=user.name),
                       category="warning")
@@ -1647,7 +1648,7 @@ def login():
                 flash(_(u"Wrong Username or Password"), category="error")
         else:
             ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
-            if 'forgot' in form and form['forgot'] == 'forgot':
+            if form.get('forgot', "") == 'forgot':
                 if user is not None and user.name != "Guest":
                     ret, __ = reset_password(user.id)
                     if ret == 1:
@@ -1700,21 +1701,19 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
     current_user.random_books = 0
     if current_user.role_passwd() or current_user.role_admin():
         if to_save.get("password"):
-            current_user.password = generate_password_hash(to_save["password"])
+            current_user.password = generate_password_hash(to_save.get("password"))
     try:
         if to_save.get("kindle_mail", current_user.kindle_mail) != current_user.kindle_mail:
-            current_user.kindle_mail = valid_email(to_save["kindle_mail"])
+            current_user.kindle_mail = valid_email(to_save.get("kindle_mail"))
         if to_save.get("email", current_user.email) != current_user.email:
-            current_user.email = check_email(to_save["email"])
+            current_user.email = check_email(to_save.get("email"))
         if current_user.role_admin():
             if to_save.get("name", current_user.name) != current_user.name:
                 # Query username, if not existing, change
-                current_user.name = check_username(to_save["name"])
+                current_user.name = check_username(to_save.get("name"))
         current_user.random_books = 1 if to_save.get("show_random") == "on" else 0
-        if to_save.get("default_language"):
-            current_user.default_language = to_save["default_language"]
-        if to_save.get("locale"):
-            current_user.locale = to_save["locale"]
+        current_user.default_language = to_save.get("default_language", "all")
+        current_user.locale = to_save.get("locale", "en")
         old_state = current_user.kobo_only_shelves_sync
         # 1 -> 0: nothing has to be done
         # 0 -> 1: all synced books have to be added to archived books, + currently synced shelfs which

From 9a8093db310e68866338e015975a0abdfb1d95e7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 22 Apr 2022 16:13:51 +0200
Subject: [PATCH 247/412] Thumbnail is generated directly after a book is added

---
 cps/__init__.py        |  6 -----
 cps/db.py              |  5 ++++-
 cps/editbooks.py       |  1 +
 cps/helper.py          | 12 +++++++---
 cps/kobo.py            |  8 +++----
 cps/tasks/thumbnail.py | 50 ++++++++++++++++++++++++++----------------
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index f6df9636d..68947905d 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -179,12 +179,6 @@ def get_locale():
     return negotiate_locale(preferred or ['en'], _BABEL_TRANSLATIONS)
 
 
-@babel.timezoneselector
-def get_timezone():
-    user = getattr(g, 'user', None)
-    return user.timezone if user else None
-
-
 from .updater import Updater
 updater_thread = Updater()
 
diff --git a/cps/db.py b/cps/db.py
index 68e02b815..3dd2907da 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -940,7 +940,10 @@ class CalibreDB:
             return title.strip()
 
         conn = conn or self.session.connection().connection.connection
-        conn.create_function("title_sort", 1, _title_sort)
+        try:
+            conn.create_function("title_sort", 1, _title_sort)
+        except OperationalError:
+            pass
 
     @classmethod
     def dispose(cls):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 8e815fd40..1d61c8dd0 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1132,6 +1132,7 @@ def upload():
                 link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
                 upload_text = _(u"File %(file)s uploaded", file=link)
                 WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
+                helper.add_book_to_thumbnail_cache(book_id)
 
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
diff --git a/cps/helper.py b/cps/helper.py
index 9d8a1d3bd..77317343c 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -60,7 +60,7 @@ from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS, STAT_ENDED, \
     STAT_CANCELLED
 from .tasks.mail import TaskEmail
-from .tasks.thumbnail import TaskClearCoverThumbnailCache
+from .tasks.thumbnail import TaskClearCoverThumbnailCache, TaskGenerateCoverThumbnails
 
 log = logger.create()
 
@@ -715,9 +715,10 @@ def get_book_cover(book_id, resolution=None):
     return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
 
 
-def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
+# Called only by kobo sync -> cover not found should be answered with 404 and not with default cover
+def get_book_cover_with_uuid(book_uuid, resolution=None):
     book = calibre_db.get_book_by_uuid(book_uuid)
-    return get_book_cover_internal(book, use_generic_cover_on_failure)
+    return get_book_cover_internal(book, use_generic_cover_on_failure=False, resolution=resolution)
 
 
 def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
@@ -1079,5 +1080,10 @@ def get_download_link(book_id, book_format, client):
 def clear_cover_thumbnail_cache(book_id):
     WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
 
+
 def delete_thumbnail_cache():
     WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
+
+
+def add_book_to_thumbnail_cache(book_id):
+    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id))
diff --git a/cps/kobo.py b/cps/kobo.py
index d02660b23..f2a3b2f85 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -45,7 +45,7 @@ import requests
 
 
 from . import config, logger, kobo_auth, db, calibre_db, helper, shelf as shelf_lib, ub, csrf, kobo_sync_status
-from .constants import sqlalchemy_version2
+from .constants import sqlalchemy_version2, COVER_THUMBNAIL_SMALL
 from .helper import get_download_link
 from .services import SyncToken as SyncToken
 from .web import download_required
@@ -915,10 +915,8 @@ def get_current_bookmark_response(current_bookmark):
 @kobo.route("/<book_uuid>/<width>/<height>/<isGreyscale>/image.jpg", defaults={'Quality': ""})
 @kobo.route("/<book_uuid>/<width>/<height>/<Quality>/<isGreyscale>/image.jpg")
 @requires_kobo_auth
-def HandleCoverImageRequest(book_uuid, width, height,Quality, isGreyscale):
-    book_cover = helper.get_book_cover_with_uuid(
-        book_uuid, use_generic_cover_on_failure=False
-    )
+def HandleCoverImageRequest(book_uuid, width, height, Quality, isGreyscale):
+    book_cover = helper.get_book_cover_with_uuid(book_uuid, resolution=COVER_THUMBNAIL_SMALL)
     if not book_cover:
         if config.config_kobo_proxy:
             log.debug("Cover for unknown book: %s proxied to kobo" % book_uuid)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 3601ff93a..0d824e7cb 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -64,9 +64,10 @@ def get_best_fit(width, height, image_width, image_height):
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
-    def __init__(self, task_message=''):
+    def __init__(self, book_id=-1, task_message=''):
         super(TaskGenerateCoverThumbnails, self).__init__(task_message)
         self.log = logger.create()
+        self.book_id = book_id
         self.app_db_session = ub.get_new_session_instance()
         self.calibre_db = db.CalibreDB(expire_on_commit=False)
         self.cache = fs.FileSystem()
@@ -77,31 +78,20 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def run(self, worker_thread):
         if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
+            if self.book_id < 0:
+                self.create_book_cover_thumbnails(self.book_id)
+                self._handleSuccess()
+                self.app_db_session.remove()
+                return
             self.message = 'Scanning Books'
             books_with_covers = self.get_books_with_covers()
             count = len(books_with_covers)
 
             total_generated = 0
             for i, book in enumerate(books_with_covers):
-                generated = 0
-                book_cover_thumbnails = self.get_book_cover_thumbnails(book.id)
 
                 # Generate new thumbnails for missing covers
-                resolutions = list(map(lambda t: t.resolution, book_cover_thumbnails))
-                missing_resolutions = list(set(self.resolutions).difference(resolutions))
-                for resolution in missing_resolutions:
-                    generated += 1
-                    self.create_book_cover_thumbnail(book, resolution)
-
-                # Replace outdated or missing thumbnails
-                for thumbnail in book_cover_thumbnails:
-                    if book.last_modified > thumbnail.generated_at:
-                        generated += 1
-                        self.update_book_cover_thumbnail(book, thumbnail)
-
-                    elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
-                        generated += 1
-                        self.update_book_cover_thumbnail(book, thumbnail)
+                generated = self.create_book_cover_thumbnails(book)
 
                 # Increment the progress
                 self.progress = (1.0 / count) * i
@@ -139,7 +129,29 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
             .all()
 
-    def create_book_cover_thumbnail(self, book, resolution):
+    def create_book_cover_thumbnails(self, book):
+        generated = 0
+        book_cover_thumbnails = self.get_book_cover_thumbnails(book.id)
+
+        # Generate new thumbnails for missing covers
+        resolutions = list(map(lambda t: t.resolution, book_cover_thumbnails))
+        missing_resolutions = list(set(self.resolutions).difference(resolutions))
+        for resolution in missing_resolutions:
+            generated += 1
+            self.create_book_cover_single_thumbnail(book, resolution)
+
+        # Replace outdated or missing thumbnails
+        for thumbnail in book_cover_thumbnails:
+            if book.last_modified > thumbnail.generated_at:
+                generated += 1
+                self.update_book_cover_thumbnail(book, thumbnail)
+
+            elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
+                generated += 1
+                self.update_book_cover_thumbnail(book, thumbnail)
+        return generated
+
+    def create_book_cover_single_thumbnail(self, book, resolution):
         thumbnail = ub.Thumbnail()
         thumbnail.type = constants.THUMBNAIL_TYPE_COVER
         thumbnail.entity_id = book.id

From 2f5b9e41acc4aef7cb35eaa1235dceb98c3afb0b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 22 Apr 2022 20:31:03 +0200
Subject: [PATCH 248/412] Reduce number visible System tasks in Tasks list

---
 cps/helper.py          |  7 ++++---
 cps/services/worker.py | 25 +++++++++----------------
 cps/tasks/thumbnail.py | 25 +++++++++++++------------
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 77317343c..43b7141d7 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -991,7 +991,7 @@ def format_runtime(runtime):
 # helper function to apply localize status information in tasklist entries
 def render_task_status(tasklist):
     renderedtasklist = list()
-    for __, user, __, task in tasklist:
+    for __, user, __, task, __ in tasklist:
         if user == current_user.name or current_user.role_admin():
             ret = {}
             if task.start_time:
@@ -1078,7 +1078,8 @@ def get_download_link(book_id, book_format, client):
 
 
 def clear_cover_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id, _("Replace Thumbnail for book {}".format(book_id))),
+                     hidden=True)
 
 
 def delete_thumbnail_cache():
@@ -1086,4 +1087,4 @@ def delete_thumbnail_cache():
 
 
 def add_book_to_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id))
+    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 68e243124..c1a8c3840 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -43,7 +43,7 @@ STAT_CANCELLED = 5
 # Only retain this many tasks in dequeued list
 TASK_CLEANUP_TRIGGER = 20
 
-QueuedTask = namedtuple('QueuedTask', 'num, user, added, task')
+QueuedTask = namedtuple('QueuedTask', 'num, user, added, task, hidden')
 
 
 def _get_main_thread():
@@ -84,7 +84,7 @@ class WorkerThread(threading.Thread):
         self.start()
 
     @classmethod
-    def add(cls, user, task):
+    def add(cls, user, task, hidden=False):
         ins = cls.get_instance()
         ins.num += 1
         username = user if user is not None else 'System'
@@ -94,6 +94,7 @@ class WorkerThread(threading.Thread):
             user=username,
             added=datetime.now(),
             task=task,
+            hidden=hidden
         ))
 
     @property
@@ -114,10 +115,10 @@ class WorkerThread(threading.Thread):
             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
+                # otherwise, loop off the oldest dead tasks until we hit the target trigger
+                ret = sorted(dead, key=lambda y: y.task.end_time)[-TASK_CLEANUP_TRIGGER:] + alive
 
-            self.dequeued = sorted(ret, key=lambda x: x.num)
+            self.dequeued = sorted(ret, key=lambda y: y.num)
 
     # Main thread loop starting the different tasks
     def run(self):
@@ -144,11 +145,11 @@ class WorkerThread(threading.Thread):
 
             # 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
+                # CalibreTask.start() should wrap all exceptions in its own error handling
                 item.task.start(self)
 
-            # remove self_cleanup tasks from list
-            if item.task.self_cleanup:
+            # remove self_cleanup tasks and hidden "System Tasks" from list
+            if item.task.self_cleanup or item.hidden:
                 self.dequeued.remove(item)
 
             self.queue.task_done()
@@ -241,14 +242,6 @@ class CalibreTask:
         # By default, we're good to clean a task if it's "Done"
         return self.stat in (STAT_FINISH_SUCCESS, STAT_FAIL, STAT_ENDED, STAT_CANCELLED)
 
-    '''@progress.setter
-    def progress(self, x):        
-        if x > 1: 
-            x = 1
-        if x < 0: 
-            x = 0
-        self._progress = x'''
-
     @property
     def self_cleanup(self):
         return self._self_cleanup
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 0d824e7cb..c66c30ecc 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -78,13 +78,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def run(self, worker_thread):
         if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
-            if self.book_id < 0:
-                self.create_book_cover_thumbnails(self.book_id)
-                self._handleSuccess()
-                self.app_db_session.remove()
-                return
             self.message = 'Scanning Books'
-            books_with_covers = self.get_books_with_covers()
+            books_with_covers = self.get_books_with_covers(self.book_id)
             count = len(books_with_covers)
 
             total_generated = 0
@@ -115,10 +110,12 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self._handleSuccess()
         self.app_db_session.remove()
 
-    def get_books_with_covers(self):
+    def get_books_with_covers(self, book_id=-1):
+        filter_exp = (db.Books.id == book_id) if book_id != -1 else True
         return self.calibre_db.session \
             .query(db.Books) \
             .filter(db.Books.has_cover == 1) \
+            .filter(filter_exp) \
             .all()
 
     def get_book_cover_thumbnails(self, book_id):
@@ -224,10 +221,13 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return 'GenerateCoverThumbnails'
+        return 'Cover Thumbnails'
 
     def __str__(self):
-        return "GenerateCoverThumbnails"
+        if self.book_id > 0:
+            return "Add Thumbnail for book {}".format(self.book_id)
+        else:
+            return "Generate Cover Thumbnails"
 
     @property
     def is_cancellable(self):
@@ -434,7 +434,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return 'GenerateSeriesThumbnails'
+        return 'Cover Thumbnails'
 
     def __str__(self):
         return "GenerateSeriesThumbnails"
@@ -496,11 +496,12 @@ class TaskClearCoverThumbnailCache(CalibreTask):
 
     @property
     def name(self):
-        return 'ThumbnailsClear'
+        return 'Cover Thumbnails'
 
+    # needed for logging
     def __str__(self):
         if self.book_id > 0:
-            return "Delete Thumbnail cache for book " + str(self.book_id)
+            return "Replace Thumbnail cache for book " + str(self.book_id)
         else:
             return "Delete Thumbnail cache directory"
 

From 069dc2766fc82fd520a729113c709fb159cf81c3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 23 Apr 2022 19:56:02 +0200
Subject: [PATCH 249/412] Update optional-requirements Bugfix with serializing
 tasks Bugfix order of tasks (id was used instead of task_id) Code cosmetics

---
 cps/editbooks.py          | 36 +++++++++--------
 cps/helper.py             | 13 ++++---
 cps/kobo.py               | 82 ++++++++++++++++++++-------------------
 cps/schedule.py           |  2 +-
 cps/services/worker.py    |  2 +-
 cps/static/js/table.js    |  4 +-
 cps/tasks/thumbnail.py    |  6 +--
 optional-requirements.txt |  4 +-
 8 files changed, 79 insertions(+), 70 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 1d61c8dd0..f2ad969c2 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -241,7 +241,7 @@ def delete_book_ajax(book_id, book_format):
 
 
 def delete_whole_book(book_id, book):
-    # delete book from Shelfs, Downloads, Read list
+    # delete book from shelves, 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)
@@ -383,7 +383,7 @@ def render_edit_book(book_id):
     for authr in book.authors:
         author_names.append(authr.name.replace('|', ','))
 
-    # Option for showing convertbook button
+    # Option for showing convert_book button
     valid_source_formats = list()
     allowed_conversion_formats = list()
     kepub_possible = None
@@ -413,11 +413,11 @@ def render_edit_book(book_id):
 
 def edit_book_ratings(to_save, book):
     changed = False
-    if to_save.get("rating","").strip():
+    if to_save.get("rating", "").strip():
         old_rating = False
         if len(book.ratings) > 0:
             old_rating = book.ratings[0].rating
-        rating_x2 = int(float(to_save.get("rating","")) * 2)
+        rating_x2 = int(float(to_save.get("rating", "")) * 2)
         if rating_x2 != old_rating:
             changed = True
             is_rating = calibre_db.session.query(db.Ratings).filter(db.Ratings.rating == rating_x2).first()
@@ -622,8 +622,9 @@ def edit_cc_data(book_id, book, to_save, cc):
                                               'custom')
     return changed
 
+
 # returns None if no file is uploaded
-# returns False if an error occours, in all other cases the ebook metadata is returned
+# returns False if an error occurs, in all other cases the ebook metadata is returned
 def upload_single_file(file_request, book, book_id):
     # Check and handle Uploaded file
     requested_file = file_request.files.get('btn-upload-format', None)
@@ -676,7 +677,7 @@ def upload_single_file(file_request, book, book_id):
                     calibre_db.session.rollback()
                     log.error_or_exception("Database error: {}".format(e))
                     flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-                    return False # return redirect(url_for('web.show_book', book_id=book.id))
+                    return False  # return redirect(url_for('web.show_book', book_id=book.id))
 
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
@@ -688,6 +689,7 @@ def upload_single_file(file_request, book, book_id):
                 rarExecutable=config.config_rarfile_location)
     return None
 
+
 def upload_cover(cover_request, book):
     requested_file = cover_request.files.get('btn-upload-cover', None)
     if requested_file:
@@ -698,7 +700,7 @@ def upload_cover(cover_request, book):
                 return False
             ret, message = helper.save_cover(requested_file, book.path)
             if ret is True:
-                helper.clear_cover_thumbnail_cache(book.id)
+                helper.replace_cover_thumbnail_cache(book.id)
                 return True
             else:
                 flash(message, category="error")
@@ -739,6 +741,7 @@ def handle_author_on_edit(book, author_name, update_stored=True):
         change = True
     return input_authors, change, renamed
 
+
 @EditBook.route("/admin/book/<int:book_id>", methods=['GET'])
 @login_required_if_no_ano
 @edit_required
@@ -815,6 +818,7 @@ def edit_book(book_id):
                 if result is True:
                     book.has_cover = 1
                     modify_date = True
+                    helper.replace_cover_thumbnail_cache(book.id)
                 else:
                     flash(error, category="error")
 
@@ -986,7 +990,7 @@ def create_book_on_upload(modify_date, meta):
 
     try:
         pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
-    except:
+    except ValueError:
         pubdate = datetime(101, 1, 1)
 
     # Calibre adds books with utc as timezone
@@ -1063,18 +1067,18 @@ def file_handling_on_upload(requested_file):
 def move_coverfile(meta, db_book):
     # move cover to final directory, including book id
     if meta.cover:
-        coverfile = meta.cover
+        cover_file = 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_file = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
+    new_cover_path = os.path.join(config.config_calibre_dir, db_book.path)
     try:
-        os.makedirs(new_coverpath, exist_ok=True)
-        copyfile(coverfile, os.path.join(new_coverpath, "cover.jpg"))
+        os.makedirs(new_cover_path, exist_ok=True)
+        copyfile(cover_file, os.path.join(new_cover_path, "cover.jpg"))
         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,
+        log.error("Failed to move cover file %s: %s", new_cover_path, e)
+        flash(_(u"Failed to Move Cover File %(file)s: %(error)s", file=new_cover_path,
                 error=e),
               category="error")
 
@@ -1193,7 +1197,7 @@ def edit_list_book(param):
     vals = request.form.to_dict()
     book = calibre_db.get_book(vals['pk'])
     sort_param = ""
-    # ret = ""
+    ret = ""
     try:
         if param == 'series_index':
             edit_book_series_index(vals['value'], book)
diff --git a/cps/helper.py b/cps/helper.py
index 43b7141d7..ea5820dd1 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -820,9 +820,6 @@ def save_cover_from_url(url, book_path):
             log.error("python modul advocate is not installed but is needed")
             return False, _("Python modul 'advocate' is not installed but is needed for cover downloads")
         img.raise_for_status()
-        #            # cover_processing()
-            # move_coverfile(meta, db_book)
-
         return save_cover(img, book_path)
     except (socket.gaierror,
             requests.exceptions.HTTPError,
@@ -1020,7 +1017,7 @@ def render_task_status(tasklist):
             ret['user'] = escape(user)  # prevent xss
 
             # Hidden fields
-            ret['id'] = task.id
+            ret['task_id'] = task.id
             ret['stat'] = task.stat
             ret['is_cancellable'] = task.is_cancellable
 
@@ -1078,8 +1075,12 @@ def get_download_link(book_id, book_format, client):
 
 
 def clear_cover_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id, _("Replace Thumbnail for book {}".format(book_id))),
-                     hidden=True)
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
+
+
+def replace_cover_thumbnail_cache(book_id):
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
+    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
 
 
 def delete_thumbnail_cache():
diff --git a/cps/kobo.py b/cps/kobo.py
index f2a3b2f85..46e68acbb 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -148,8 +148,8 @@ def HandleSyncRequest():
         sync_token.books_last_created = datetime.datetime.min
         sync_token.reading_state_last_modified = datetime.datetime.min
 
-    new_books_last_modified = sync_token.books_last_modified # needed for sync selected shelfs only
-    new_books_last_created = sync_token.books_last_created # needed to distinguish between new and changed entitlement
+    new_books_last_modified = sync_token.books_last_modified  # needed for sync selected shelfs only
+    new_books_last_created = sync_token.books_last_created  # needed to distinguish between new and changed entitlement
     new_reading_state_last_modified = sync_token.reading_state_last_modified
 
     new_archived_last_modified = datetime.datetime.min
@@ -176,18 +176,17 @@ def HandleSyncRequest():
                            .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
                                                                           ub.ArchivedBook.user_id == current_user.id))
                            .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
-                                           .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
-                .filter(ub.BookShelf.date_added > sync_token.books_last_modified)
-                .filter(db.Data.format.in_(KOBO_FORMATS))
-                .filter(calibre_db.common_filters(allow_show_archived=True))
-                .order_by(db.Books.id)
-                .order_by(ub.ArchivedBook.last_modified)
-                .join(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)
-                .join(ub.Shelf)
-                .filter(ub.Shelf.user_id == current_user.id)
-                .filter(ub.Shelf.kobo_sync)
-                .distinct()
-        )
+                                                      .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
+                           .filter(ub.BookShelf.date_added > sync_token.books_last_modified)
+                           .filter(db.Data.format.in_(KOBO_FORMATS))
+                           .filter(calibre_db.common_filters(allow_show_archived=True))
+                           .order_by(db.Books.id)
+                           .order_by(ub.ArchivedBook.last_modified)
+                           .join(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)
+                           .join(ub.Shelf)
+                           .filter(ub.Shelf.user_id == current_user.id)
+                           .filter(ub.Shelf.kobo_sync)
+                           .distinct())
     else:
         if sqlalchemy_version2:
             changed_entries = select(db.Books, ub.ArchivedBook.last_modified, ub.ArchivedBook.is_archived)
@@ -196,16 +195,14 @@ def HandleSyncRequest():
                                                        ub.ArchivedBook.last_modified,
                                                        ub.ArchivedBook.is_archived)
         changed_entries = (changed_entries
-                   .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                                  ub.ArchivedBook.user_id == current_user.id))
-                   .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
-                                              .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
-                   .filter(calibre_db.common_filters(allow_show_archived=True))
-                   .filter(db.Data.format.in_(KOBO_FORMATS))
-                   .order_by(db.Books.last_modified)
-                   .order_by(db.Books.id)
-        )
-
+                           .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                                          ub.ArchivedBook.user_id == current_user.id))
+                           .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
+                                                      .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
+                           .filter(calibre_db.common_filters(allow_show_archived=True))
+                           .filter(db.Data.format.in_(KOBO_FORMATS))
+                           .order_by(db.Books.last_modified)
+                           .order_by(db.Books.id))
 
     reading_states_in_new_entitlements = []
     if sqlalchemy_version2:
@@ -215,7 +212,7 @@ def HandleSyncRequest():
     log.debug("Books to Sync: {}".format(len(books.all())))
     for book in books:
         formats = [data.format for data in book.Books.data]
-        if not 'KEPUB' in formats and config.config_kepubifypath and 'EPUB' in formats:
+        if 'KEPUB' not 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.name)
 
         kobo_reading_state = get_or_create_reading_state(book.Books.id)
@@ -262,7 +259,7 @@ def HandleSyncRequest():
             .columns(db.Books).first()
     else:
         max_change = changed_entries.from_self().filter(ub.ArchivedBook.is_archived)\
-            .filter(ub.ArchivedBook.user_id==current_user.id) \
+            .filter(ub.ArchivedBook.user_id == current_user.id) \
             .order_by(func.datetime(ub.ArchivedBook.last_modified).desc()).first()
 
     max_change = max_change.last_modified if max_change else new_archived_last_modified
@@ -425,9 +422,9 @@ def get_author(book):
     author_list = []
     autor_roles = []
     for author in book.authors:
-        autor_roles.append({"Name":author.name})    #.encode('unicode-escape').decode('latin-1')
+        autor_roles.append({"Name": author.name})
         author_list.append(author.name)
-    return {"ContributorRoles": autor_roles, "Contributors":author_list}
+    return {"ContributorRoles": autor_roles, "Contributors": author_list}
 
 
 def get_publisher(book):
@@ -441,6 +438,7 @@ def get_series(book):
         return None
     return book.series[0].name
 
+
 def get_seriesindex(book):
     return book.series_index or 1
 
@@ -485,7 +483,7 @@ def get_metadata(book):
         "Language": "en",
         "PhoneticPronunciations": {},
         "PublicationDate": convert_to_kobo_timestamp_string(book.pubdate),
-        "Publisher": {"Imprint": "", "Name": get_publisher(book),},
+        "Publisher": {"Imprint": "", "Name": get_publisher(book), },
         "RevisionId": book_uuid,
         "Title": book.title,
         "WorkId": book_uuid,
@@ -504,6 +502,7 @@ def get_metadata(book):
 
     return metadata
 
+
 @csrf.exempt
 @kobo.route("/v1/library/tags", methods=["POST", "DELETE"])
 @requires_kobo_auth
@@ -718,7 +717,6 @@ def sync_shelves(sync_token, sync_results, only_kobo_shelves=False):
             *extra_filters
         ).distinct().order_by(func.datetime(ub.Shelf.last_modified).asc())
 
-
     for shelf in shelflist:
         if not shelf_lib.check_shelf_view_permissions(shelf):
             continue
@@ -764,6 +762,7 @@ def create_kobo_tag(shelf):
         )
     return {"Tag": tag}
 
+
 @csrf.exempt
 @kobo.route("/v1/library/<book_uuid>/state", methods=["GET", "PUT"])
 @requires_kobo_auth
@@ -808,7 +807,7 @@ def HandleStateRequest(book_uuid):
                 book_read = kobo_reading_state.book_read_link
                 new_book_read_status = get_ub_read_status(request_status_info["Status"])
                 if new_book_read_status == ub.ReadBook.STATUS_IN_PROGRESS \
-                    and new_book_read_status != book_read.read_status:
+                        and new_book_read_status != book_read.read_status:
                     book_read.times_started_reading += 1
                     book_read.last_time_started_reading = datetime.datetime.utcnow()
                 book_read.read_status = new_book_read_status
@@ -848,7 +847,7 @@ def get_ub_read_status(kobo_read_status):
 
 def get_or_create_reading_state(book_id):
     book_read = ub.session.query(ub.ReadBook).filter(ub.ReadBook.book_id == book_id,
-                                                          ub.ReadBook.user_id == int(current_user.id)).one_or_none()
+                                                     ub.ReadBook.user_id == int(current_user.id)).one_or_none()
     if not book_read:
         book_read = ub.ReadBook(user_id=current_user.id, book_id=book_id)
     if not book_read.kobo_reading_state:
@@ -912,6 +911,7 @@ def get_current_bookmark_response(current_bookmark):
         }
     return resp
 
+
 @kobo.route("/<book_uuid>/<width>/<height>/<isGreyscale>/image.jpg", defaults={'Quality': ""})
 @kobo.route("/<book_uuid>/<width>/<height>/<Quality>/<isGreyscale>/image.jpg")
 @requires_kobo_auth
@@ -989,8 +989,8 @@ def handle_getests():
     if config.config_kobo_proxy:
         return redirect_or_proxy_request()
     else:
-        testkey = request.headers.get("X-Kobo-userkey","")
-        return make_response(jsonify({"Result": "Success", "TestKey":testkey, "Tests": {}}))
+        testkey = request.headers.get("X-Kobo-userkey", "")
+        return make_response(jsonify({"Result": "Success", "TestKey": testkey, "Tests": {}}))
 
 
 @csrf.exempt
@@ -1020,7 +1020,7 @@ def make_calibre_web_auth_response():
     content = request.get_json()
     AccessToken = base64.b64encode(os.urandom(24)).decode('utf-8')
     RefreshToken = base64.b64encode(os.urandom(24)).decode('utf-8')
-    return  make_response(
+    return make_response(
         jsonify(
             {
                 "AccessToken": AccessToken,
@@ -1158,14 +1158,16 @@ def NATIVE_KOBO_RESOURCES():
         "eula_page": "https://www.kobo.com/termsofuse?style=onestore",
         "exchange_auth": "https://storeapi.kobo.com/v1/auth/exchange",
         "external_book": "https://storeapi.kobo.com/v1/products/books/external/{Ids}",
-        "facebook_sso_page": "https://authorize.kobo.com/signin/provider/Facebook/login?returnUrl=http://store.kobobooks.com/",
+        "facebook_sso_page":
+            "https://authorize.kobo.com/signin/provider/Facebook/login?returnUrl=http://store.kobobooks.com/",
         "featured_list": "https://storeapi.kobo.com/v1/products/featured/{FeaturedListId}",
         "featured_lists": "https://storeapi.kobo.com/v1/products/featured",
         "free_books_page": {
             "EN": "https://www.kobo.com/{region}/{language}/p/free-ebooks",
             "FR": "https://www.kobo.com/{region}/{language}/p/livres-gratuits",
             "IT": "https://www.kobo.com/{region}/{language}/p/libri-gratuiti",
-            "NL": "https://www.kobo.com/{region}/{language}/List/bekijk-het-overzicht-van-gratis-ebooks/QpkkVWnUw8sxmgjSlCbJRg",
+            "NL": "https://www.kobo.com/{region}/{language}/"
+                  "List/bekijk-het-overzicht-van-gratis-ebooks/QpkkVWnUw8sxmgjSlCbJRg",
             "PT": "https://www.kobo.com/{region}/{language}/p/livros-gratis",
         },
         "fte_feedback": "https://storeapi.kobo.com/v1/products/ftefeedback",
@@ -1190,7 +1192,8 @@ def NATIVE_KOBO_RESOURCES():
         "library_stack": "https://storeapi.kobo.com/v1/user/library/stacks/{LibraryItemId}",
         "library_sync": "https://storeapi.kobo.com/v1/library/sync",
         "love_dashboard_page": "https://store.kobobooks.com/{culture}/kobosuperpoints",
-        "love_points_redemption_page": "https://store.kobobooks.com/{culture}/KoboSuperPointsRedemption?productId={ProductId}",
+        "love_points_redemption_page":
+            "https://store.kobobooks.com/{culture}/KoboSuperPointsRedemption?productId={ProductId}",
         "magazine_landing_page": "https://store.kobobooks.com/emagazines",
         "notifications_registration_issue": "https://storeapi.kobo.com/v1/notifications/registration",
         "oauth_host": "https://oauth.kobo.com",
@@ -1206,7 +1209,8 @@ def NATIVE_KOBO_RESOURCES():
         "product_recommendations": "https://storeapi.kobo.com/v1/products/{ProductId}/recommendations",
         "product_reviews": "https://storeapi.kobo.com/v1/products/{ProductIds}/reviews",
         "products": "https://storeapi.kobo.com/v1/products",
-        "provider_external_sign_in_page": "https://authorize.kobo.com/ExternalSignIn/{providerName}?returnUrl=http://store.kobobooks.com/",
+        "provider_external_sign_in_page":
+            "https://authorize.kobo.com/ExternalSignIn/{providerName}?returnUrl=http://store.kobobooks.com/",
         "purchase_buy": "https://www.kobo.com/checkout/createpurchase/",
         "purchase_buy_templated": "https://www.kobo.com/{culture}/checkout/createpurchase/{ProductId}",
         "quickbuy_checkout": "https://storeapi.kobo.com/v1/store/quickbuy/{PurchaseId}/checkout",
diff --git a/cps/schedule.py b/cps/schedule.py
index 79e0006cb..5500f1a9c 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -45,7 +45,7 @@ def get_scheduled_tasks(reconnect=True):
 
 def end_scheduled_tasks():
     worker = WorkerThread.get_instance()
-    for __, __, __, task in worker.tasks:
+    for __, __, __, task, __ in worker.tasks:
         if task.scheduled and task.is_cancellable:
             worker.end_task(task.id)
 
diff --git a/cps/services/worker.py b/cps/services/worker.py
index c1a8c3840..63d83bfb3 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -156,7 +156,7 @@ class WorkerThread(threading.Thread):
 
     def end_task(self, task_id):
         ins = self.get_instance()
-        for __, __, __, task in ins.tasks:
+        for __, __, __, task, __ in ins.tasks:
             if str(task.id) == str(task_id) and task.is_cancellable:
                 task.stat = STAT_CANCELLED if task.stat == STAT_WAITING else STAT_ENDED
 
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index bb38fc9fb..47c3b70e8 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -641,9 +641,9 @@ function UserActions (value, row) {
 /* Function for cancelling tasks */
 function TaskActions (value, row) {
     var cancellableStats = [0, 1, 2];
-    if (row.id && row.is_cancellable && cancellableStats.includes(row.stat)) {
+    if (row.task_id && row.is_cancellable && cancellableStats.includes(row.stat)) {
         return [
-            "<div class=\"task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.id + "\" title=\"Cancel\">",
+            "<div class=\"task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.task_id + "\" title=\"Cancel\">",
             "<i class=\"glyphicon glyphicon-ban-circle\"></i>",
             "</div>"
         ].join("");
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index c66c30ecc..d11ef50c0 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -50,7 +50,7 @@ def get_best_fit(width, height, image_width, image_height):
     resize_height = int(height / 2.0)
     aspect_ratio = image_width / image_height
 
-    # If this image's aspect ratio is different than the first image, then resize this image
+    # If this image's aspect ratio is different from the first image, then resize this image
     # to fill the width and height of the first image
     if aspect_ratio < width / height:
         resize_width = int(width / 2.0)
@@ -225,7 +225,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def __str__(self):
         if self.book_id > 0:
-            return "Add Thumbnail for book {}".format(self.book_id)
+            return "Add Cover Thumbnails for Book {}".format(self.book_id)
         else:
             return "Generate Cover Thumbnails"
 
@@ -501,7 +501,7 @@ class TaskClearCoverThumbnailCache(CalibreTask):
     # needed for logging
     def __str__(self):
         if self.book_id > 0:
-            return "Replace Thumbnail cache for book " + str(self.book_id)
+            return "Replace/Delete Cover Thumbnails for book " + str(self.book_id)
         else:
             return "Delete Thumbnail cache directory"
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index fea410e5c..07e1ad885 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.44.0
+google-api-python-client>=1.7.11,<2.46.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.44.0
+google-api-python-client>=1.7.11,<2.46.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0

From 6e783cd7ee9bd1cf2ea580ad2f359a444efc966f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 23 Apr 2022 20:08:26 +0200
Subject: [PATCH 250/412] Make Task Stop Action green (marked as clickable)

---
 cps/static/js/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 47c3b70e8..e04c75621 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -643,7 +643,7 @@ function TaskActions (value, row) {
     var cancellableStats = [0, 1, 2];
     if (row.task_id && row.is_cancellable && cancellableStats.includes(row.stat)) {
         return [
-            "<div class=\"task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.task_id + "\" title=\"Cancel\">",
+            "<div class=\"danger task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.task_id + "\" title=\"Cancel\">",
             "<i class=\"glyphicon glyphicon-ban-circle\"></i>",
             "</div>"
         ].join("");

From bf049d8240ecd20195184ebee6dac75c92a5c3cc Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Apr 2022 11:05:22 +0200
Subject: [PATCH 251/412] Make series cover cache invisible

---
 cps/templates/admin.html         | 4 ++--
 cps/templates/schedule_edit.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index cdaec9bdf..efbd4c6c1 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -178,10 +178,10 @@
             <div class="col-xs-6 col-sm-3">{{_('Generate book cover thumbnails')}}</div>
             <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_book_covers) }}</div>
           </div>
-          <div class="row">
+          <!--div class="row">
             <div class="col-xs-6 col-sm-3">{{_('Generate series cover thumbnails')}}</div>
             <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_series_covers) }}</div>
-          </div>
+          </div-->
         </div>
       <a class="btn btn-default scheduledtasks" id="admin_edit_scheduled_tasks" href="{{url_for('admin.edit_scheduledtasks')}}">{{_('Edit Scheduled Tasks Settings')}}</a>
     </div>
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index f989baf9f..599e79973 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -28,10 +28,10 @@
       <input type="checkbox" id="schedule_generate_book_covers" name="schedule_generate_book_covers" {% if config.schedule_generate_book_covers %}checked{% endif %}>
       <label for="schedule_generate_book_covers">{{_('Generate Book Cover Thumbnails')}}</label>
     </div>
-    <div class="form-group">
+    <!--div class="form-group">
       <input type="checkbox" id="schedule_generate_series_covers" name="schedule_generate_series_covers" {% if config.schedule_generate_series_covers %}checked{% endif %}>
       <label for="schedule_generate_series_covers">{{_('Generate Series Cover Thumbnails')}}</label>
-    </div>
+    </div-->
     <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
     <a href="{{ url_for('admin.admin') }}" id="email_back" class="btn btn-default">{{_('Cancel')}}</a>
   </form>

From bc96ff9a3985777f009e2a1b3f49e4e04bd00656 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Apr 2022 11:14:39 +0200
Subject: [PATCH 252/412] Enable scheduled side deleting of thumbnails of
 deleted books

---
 cps/schedule.py        |  3 ++-
 cps/tasks/thumbnail.py | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 5500f1a9c..1da52d6f9 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -21,7 +21,7 @@ import datetime
 from . import config, constants
 from .services.background_scheduler import BackgroundScheduler
 from .tasks.database import TaskReconnectDatabase
-from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails
+from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails, TaskClearCoverThumbnailCache
 from .services.worker import WorkerThread
 
 
@@ -35,6 +35,7 @@ def get_scheduled_tasks(reconnect=True):
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
         tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers'])
+        tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers'])
 
     # Generate all missing series thumbnails
     if config.schedule_generate_series_covers:
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index d11ef50c0..f60154207 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -16,7 +16,6 @@
 #   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 os
 from urllib.request import urlopen
 
@@ -449,18 +448,24 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
         self.app_db_session = ub.get_new_session_instance()
         self.cache = fs.FileSystem()
 
     def run(self, worker_thread):
         if self.app_db_session:
-            if self.book_id > 0:    # make sure all thumbnails aren't getting deleted due to a bug
+            if self.book_id == 0:  # delete superfluous thumbnails
+                thumbnails = (self.calibre_db.session.query(ub.Thumbnail)
+                              .join(db.Books, ub.Thumbnail.entity_id == db.Books.id, isouter=True)
+                              .filter(db.Books.id == None)
+                              .all())
+            elif self.book_id > 0:  # make sure single book is selected
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
+            if self.book_id < 0:
+                self.delete_all_thumbnails()
+            else:
                 for thumbnail in thumbnails:
                     self.delete_thumbnail(thumbnail)
-            else:
-                self.delete_all_thumbnails()
-
         self._handleSuccess()
         self.app_db_session.remove()
 
@@ -472,7 +477,6 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             .all()
 
     def delete_thumbnail(self, thumbnail):
-        # thumbnail.expiration = datetime.utcnow()
         try:
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.app_db_session \

From 8421a17a82ea8540d4759b0ca4b583b3ea15dad2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Apr 2022 13:15:41 +0200
Subject: [PATCH 253/412] Always catch sqlite create_function error

---
 cps/db.py        |  3 ++-
 cps/editbooks.py | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 3dd2907da..9f6440aac 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -25,6 +25,7 @@ from datetime import datetime
 from urllib.parse import quote
 import unidecode
 
+from sqlite3 import OperationalError as sqliteOperationalError
 from sqlalchemy import create_engine
 from sqlalchemy import Table, Column, ForeignKey, CheckConstraint
 from sqlalchemy import String, Integer, Boolean, TIMESTAMP, Float
@@ -942,7 +943,7 @@ class CalibreDB:
         conn = conn or self.session.connection().connection.connection
         try:
             conn.create_function("title_sort", 1, _title_sort)
-        except OperationalError:
+        except sqliteOperationalError:
             pass
 
     @classmethod
diff --git a/cps/editbooks.py b/cps/editbooks.py
index f2ad969c2..eab79472e 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -37,7 +37,7 @@ from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, R
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError
-from sqlite3 import OperationalError as sqliteOperationalError
+# from sqlite3 import OperationalError as sqliteOperationalError
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status
 from . import config, get_locale, ub, db
 from . import calibre_db
@@ -757,11 +757,11 @@ def edit_book(book_id):
     edit_error = False
 
     # create the function for sorting...
-    try:
-        calibre_db.update_title_sort(config)
-    except sqliteOperationalError as e:
-        log.error_or_exception(e)
-        calibre_db.session.rollback()
+    #try:
+    calibre_db.update_title_sort(config)
+    #except sqliteOperationalError as e:
+    #    log.error_or_exception(e)
+    #    calibre_db.session.rollback()
 
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
     # Book not found

From 1e723dff3a70ca268657e9307dd60cfdab6e95f4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Apr 2022 18:40:50 +0200
Subject: [PATCH 254/412] Make texts in Background thread translatable

---
 cps/about.py             |  6 +++---
 cps/converter.py         |  9 +++++----
 cps/editbooks.py         |  7 ++++---
 cps/helper.py            | 12 +++++++-----
 cps/tasks/convert.py     | 39 ++++++++++++++++++-------------------
 cps/tasks/database.py    | 11 ++++-------
 cps/tasks/mail.py        | 17 ++++++++--------
 cps/tasks/thumbnail.py   | 42 ++++++++++++++++++++--------------------
 cps/tasks/upload.py      |  9 ++++++---
 cps/templates/stats.html |  2 +-
 10 files changed, 78 insertions(+), 76 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 8f2bf715b..92dc41aac 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -69,9 +69,9 @@ _VERSIONS.update(uploader.get_versions(False))
 
 
 def collect_stats():
-    _VERSIONS['ebook converter'] = _(converter.get_calibre_version())
-    _VERSIONS['unrar'] = _(converter.get_unrar_version())
-    _VERSIONS['kepubify'] = _(converter.get_kepubify_version())
+    _VERSIONS['ebook converter'] = converter.get_calibre_version()
+    _VERSIONS['unrar'] = converter.get_unrar_version()
+    _VERSIONS['kepubify'] = converter.get_kepubify_version()
     return _VERSIONS
 
 
diff --git a/cps/converter.py b/cps/converter.py
index bb197467b..af2a6c09f 100644
--- a/cps/converter.py
+++ b/cps/converter.py
@@ -18,7 +18,8 @@
 
 import os
 import re
-from flask_babel import gettext as _
+
+from flask_babel import lazy_gettext as N_
 
 from . import config, logger
 from .subproc_wrapper import process_wait
@@ -26,9 +27,9 @@ from .subproc_wrapper import process_wait
 
 log = logger.create()
 
-# _() necessary to make babel aware of string for translation
-_NOT_INSTALLED = _('not installed')
-_EXECUTION_ERROR = _('Execution permissions missing')
+# strings getting translated when used
+_NOT_INSTALLED = N_('not installed')
+_EXECUTION_ERROR = N_('Execution permissions missing')
 
 
 def _get_command_version(path, pattern, argument=None):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index eab79472e..768f18303 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -25,7 +25,7 @@ from datetime import datetime
 import json
 from shutil import copyfile
 from uuid import uuid4
-from markupsafe import escape
+from markupsafe import escape  # dependency of flask
 from functools import wraps
 
 try:
@@ -35,6 +35,7 @@ except ImportError:
 
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
+from flask_babel import lazy_gettext as N_
 from flask_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError
 # from sqlite3 import OperationalError as sqliteOperationalError
@@ -681,7 +682,7 @@ def upload_single_file(file_request, book, book_id):
 
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
-            upload_text = _(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
+            upload_text = N_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
             WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(book.title)))
 
             return uploader.process(
@@ -1134,7 +1135,7 @@ def upload():
                 if error:
                     flash(error, category="error")
                 link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
-                upload_text = _(u"File %(file)s uploaded", file=link)
+                upload_text = N_(u"File %(file)s uploaded", file=link)
                 WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
                 helper.add_book_to_thumbnail_cache(book_id)
 
diff --git a/cps/helper.py b/cps/helper.py
index ea5820dd1..5c532dbac 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -33,6 +33,7 @@ from babel.dates import format_datetime
 from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
+from flask_babel import lazy_gettext as N_
 from flask_login import current_user
 from sqlalchemy.sql.expression import true, false, and_, or_, text, func
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -53,7 +54,7 @@ except ImportError:
 
 from . import calibre_db, cli
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub, kobo_sync_status, fs
+from . import logger, config, get_locale, db, ub, fs
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
@@ -111,9 +112,10 @@ def convert_book_format(book_id, calibrepath, old_book_format, new_book_format,
     return None
 
 
+# Texts are not lazy translated as they are supposed to get send out as is
 def send_test_mail(kindle_mail, user_name):
     WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web test e-mail'), None, None,
-                     config.get_mail_settings(), kindle_mail, _(u"Test e-mail"),
+                     config.get_mail_settings(), kindle_mail, N_(u"Test e-mail"),
                                           _(u'This e-mail has been sent via Calibre-Web.')))
     return
 
@@ -135,7 +137,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
         attachment=None,
         settings=config.get_mail_settings(),
         recipient=e_mail,
-        taskMessage=_(u"Registration e-mail for user: %(name)s", name=user_name),
+        task_message=N_(u"Registration e-mail for user: %(name)s", name=user_name),
         text=txt
     ))
     return
@@ -219,7 +221,7 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
         if entry.format.upper() == book_format.upper():
             converted_file_name = entry.name + '.' + book_format.lower()
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(book.title))
-            email_text = _(u"%(book)s send to Kindle", book=link)
+            email_text = N_(u"%(book)s send to Kindle", book=link)
             WorkerThread.add(user_id, TaskEmail(_(u"Send to Kindle"), book.path, converted_file_name,
                              config.get_mail_settings(), kindle_mail,
                              email_text, _(u'This e-mail has been sent via Calibre-Web.')))
@@ -1012,7 +1014,7 @@ def render_task_status(tasklist):
                 else:
                     ret['status'] = _(u'Unknown Status')
 
-            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message) if task.message else _(task.name)
+            ret['taskMessage'] = "{}: {}".format(task.name, task.message) if task.message else task.name
             ret['progress'] = "{} %".format(int(task.progress * 100))
             ret['user'] = escape(user)  # prevent xss
 
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 028d7dbfa..e65d314ae 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -18,12 +18,12 @@
 
 import os
 import re
-
 from glob import glob
 from shutil import copyfile
 from markupsafe import escape
 
 from sqlalchemy.exc import SQLAlchemyError
+from flask_babel import lazy_gettext as N_
 
 from cps.services.worker import CalibreTask
 from cps import db
@@ -41,10 +41,10 @@ log = logger.create()
 
 
 class TaskConvert(CalibreTask):
-    def __init__(self, file_path, bookid, taskMessage, settings, kindle_mail, user=None):
-        super(TaskConvert, self).__init__(taskMessage)
+    def __init__(self, file_path, book_id, task_message, settings, kindle_mail, user=None):
+        super(TaskConvert, self).__init__(task_message)
         self.file_path = file_path
-        self.bookid = bookid
+        self.book_id = book_id
         self.title = ""
         self.settings = settings
         self.kindle_mail = kindle_mail
@@ -56,9 +56,9 @@ class TaskConvert(CalibreTask):
         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)
+            cur_book = worker_db.get_book(self.book_id)
             self.title = cur_book.title
-            data = worker_db.get_book_format(self.bookid, self.settings['old_book_format'])
+            data = worker_db.get_book_format(self.book_id, self.settings['old_book_format'])
             df = gdriveutils.getFileFromEbooksFolder(cur_book.path,
                                                      data.name + "." + self.settings['old_book_format'].lower())
             if df:
@@ -89,7 +89,7 @@ class TaskConvert(CalibreTask):
                 # 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:
-                    EmailText = _(u"%(book)s send to Kindle", book=escape(self.title))
+                    EmailText = N_(u"%(book)s send to Kindle", book=escape(self.title))
                     worker_thread.add(self.user, TaskEmail(self.settings['subject'],
                                                            self.results["path"],
                                                            filename,
@@ -106,7 +106,7 @@ class TaskConvert(CalibreTask):
         error_message = None
         local_db = db.CalibreDB(expire_on_commit=False)
         file_path = self.file_path
-        book_id = self.bookid
+        book_id = self.book_id
         format_old_ext = u'.' + self.settings['old_book_format'].lower()
         format_new_ext = u'.' + self.settings['new_book_format'].lower()
 
@@ -114,7 +114,7 @@ class TaskConvert(CalibreTask):
         # 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']):
+                local_db.get_book_format(self.book_id, 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.title = cur_book.title
@@ -133,7 +133,7 @@ class TaskConvert(CalibreTask):
                     local_db.session.rollback()
                     log.error("Database error: %s", e)
                     local_db.session.close()
-                    self._handleError(error_message)
+                    self._handleError(N_("Database error: %(error)s.", error=e))
                     return
                 self._handleSuccess()
                 local_db.session.close()
@@ -150,8 +150,7 @@ class TaskConvert(CalibreTask):
         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))
+                self._handleError(N_(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)
 
@@ -184,11 +183,11 @@ class TaskConvert(CalibreTask):
                     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())
+                error_message = N_('%(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')
+            error_message = N_('Ebook converter failed with unknown error')
         self._handleError(error_message)
         return
 
@@ -198,7 +197,7 @@ class TaskConvert(CalibreTask):
         try:
             p = process_open(command, quotes)
         except OSError as e:
-            return 1, _(u"Kepubify-converter failed: %(error)s", error=e)
+            return 1, N_(u"Kepubify-converter failed: %(error)s", error=e)
         self.progress = 0.01
         while True:
             nextline = p.stdout.readlines()
@@ -219,7 +218,7 @@ class TaskConvert(CalibreTask):
                 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",
+                return 1, N_(u"Converted file not found or more than one file in folder %(folder)s",
                             folder=os.path.dirname(file_path))
         return check, None
 
@@ -243,7 +242,7 @@ class TaskConvert(CalibreTask):
 
             p = process_open(command, quotes, newlines=False)
         except OSError as e:
-            return 1, _(u"Ebook-converter failed: %(error)s", error=e)
+            return 1, N_(u"Ebook-converter failed: %(error)s", error=e)
 
         while p.poll() is None:
             nextline = p.stdout.readline()
@@ -266,15 +265,15 @@ class TaskConvert(CalibreTask):
             ele = ele.decode('utf-8', errors="ignore").strip('\n')
             log.debug(ele)
             if not ele.startswith('Traceback') and not ele.startswith('  File'):
-                error_message = _("Calibre failed with error: %(error)s", error=ele)
+                error_message = N_("Calibre failed with error: %(error)s", error=ele)
         return check, error_message
 
     @property
     def name(self):
-        return "Convert"
+        return N_("Convert")
 
     def __str__(self):
-        return "Convert {} {}".format(self.bookid, self.kindle_mail)
+        return "Convert {} {}".format(self.book_id, self.kindle_mail)
 
     @property
     def is_cancellable(self):
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 0441d5641..6dd10f7c2 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -16,19 +16,16 @@
 #   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
+from urllib.request import urlopen
+
+from flask_babel import lazy_gettext as N_
 
 from cps import config, logger
 from cps.services.worker import CalibreTask
 
-try:
-    from urllib.request import urlopen
-except ImportError as e:
-    from urllib2 import urlopen
-
 
 class TaskReconnectDatabase(CalibreTask):
-    def __init__(self, task_message=u'Reconnecting Calibre database'):
+    def __init__(self, task_message=N_('Reconnecting Calibre database')):
         super(TaskReconnectDatabase, self).__init__(task_message)
         self.log = logger.create()
         self.listen_address = config.get_config_ipaddress()
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 2a3956341..ad38a400d 100755
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -26,9 +26,8 @@ from io import StringIO
 from email.message import EmailMessage
 from email.utils import parseaddr
 
-
-from email import encoders
-from email.utils import formatdate, make_msgid
+from flask_babel import lazy_gettext as N_
+from email.utils import formatdate
 from email.generator import Generator
 
 from cps.services.worker import CalibreTask
@@ -111,13 +110,13 @@ class EmailSSL(EmailBase, smtplib.SMTP_SSL):
 
 
 class TaskEmail(CalibreTask):
-    def __init__(self, subject, filepath, attachment, settings, recipient, taskMessage, text, internal=False):
-        super(TaskEmail, self).__init__(taskMessage)
+    def __init__(self, subject, filepath, attachment, settings, recipient, task_message, text, internal=False):
+        super(TaskEmail, self).__init__(task_message)
         self.subject = subject
         self.attachment = attachment
         self.settings = settings
         self.filepath = filepath
-        self.recipent = recipient
+        self.recipient = recipient
         self.text = text
         self.asyncSMTP = None
         self.results = dict()
@@ -139,7 +138,7 @@ class TaskEmail(CalibreTask):
         message = EmailMessage()
         # message = MIMEMultipart()
         message['From'] = self.settings["mail_from"]
-        message['To'] = self.recipent
+        message['To'] = self.recipient
         message['Subject'] = self.subject
         message['Date'] = formatdate(localtime=True)
         message['Message-Id'] = "{}@{}".format(uuid.uuid4(), self.get_msgid_domain()) # f"<{uuid.uuid4()}@{get_msgid_domain(from_)}>" # make_msgid('calibre-web')
@@ -212,7 +211,7 @@ class TaskEmail(CalibreTask):
         gen = Generator(fp, mangle_from_=False)
         gen.flatten(msg)
 
-        self.asyncSMTP.sendmail(self.settings["mail_from"], self.recipent, fp.getvalue())
+        self.asyncSMTP.sendmail(self.settings["mail_from"], self.recipient, fp.getvalue())
         self.asyncSMTP.quit()
         self._handleSuccess()
         log.debug("E-mail send successfully")
@@ -264,7 +263,7 @@ class TaskEmail(CalibreTask):
 
     @property
     def name(self):
-        return "E-mail"
+        return N_("E-mail")
 
     @property
     def is_cancellable(self):
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index f60154207..dcfd4226d 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -24,7 +24,7 @@ from cps import config, db, fs, gdriveutils, logger, ub
 from cps.services.worker import CalibreTask, STAT_CANCELLED, STAT_ENDED
 from datetime import datetime
 from sqlalchemy import func, text, or_
-
+from flask_babel import lazy_gettext as N_
 
 try:
     from wand.image import Image
@@ -92,7 +92,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
                 if generated > 0:
                     total_generated += generated
-                    self.message = u'Generated {0} cover thumbnails'.format(total_generated)
+                    self.message = N_(u'Generated %(count)s cover thumbnails', count=total_generated)
 
                 # Check if job has been cancelled or ended
                 if self.stat == STAT_CANCELLED:
@@ -159,8 +159,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self.app_db_session.commit()
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
-            self.log.info(u'Error creating book thumbnail: ' + str(ex))
-            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.log.info('Error creating book thumbnail: ' + str(ex))
+            self._handleError('Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def update_book_cover_thumbnail(self, book, thumbnail):
@@ -171,8 +171,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
-            self.log.info(u'Error updating book thumbnail: ' + str(ex))
-            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.log.info('Error updating book thumbnail: ' + str(ex))
+            self._handleError('Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def generate_book_thumbnail(self, book, thumbnail):
@@ -199,7 +199,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                             img.save(filename=filename)
                 except Exception as ex:
                     # Bubble exception to calling function
-                    self.log.info(u'Error generating thumbnail file: ' + str(ex))
+                    self.log.info('Error generating thumbnail file: ' + str(ex))
                     raise ex
                 finally:
                     if stream is not None:
@@ -220,7 +220,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return 'Cover Thumbnails'
+        return N_('Cover Thumbnails')
 
     def __str__(self):
         if self.book_id > 0:
@@ -279,7 +279,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
                 if generated > 0:
                     total_generated += generated
-                    self.message = u'Generated {0} series thumbnails'.format(total_generated)
+                    self.message = N_('Generated {0} series thumbnails').format(total_generated)
 
                 # Check if job has been cancelled or ended
                 if self.stat == STAT_CANCELLED:
@@ -335,8 +335,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.app_db_session.commit()
             self.generate_series_thumbnail(series_books, thumbnail)
         except Exception as ex:
-            self.log.info(u'Error creating book thumbnail: ' + str(ex))
-            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.log.info('Error creating book thumbnail: ' + str(ex))
+            self._handleError('Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def update_series_thumbnail(self, series_books, thumbnail):
@@ -347,8 +347,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_series_thumbnail(series_books, thumbnail)
         except Exception as ex:
-            self.log.info(u'Error updating book thumbnail: ' + str(ex))
-            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.log.info('Error updating book thumbnail: ' + str(ex))
+            self._handleError('Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def generate_series_thumbnail(self, series_books, thumbnail):
@@ -391,7 +391,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                             canvas.composite(img, left, top)
 
                     except Exception as ex:
-                        self.log.info(u'Error generating thumbnail file: ' + str(ex))
+                        self.log.info('Error generating thumbnail file: ' + str(ex))
                         raise ex
                     finally:
                         if stream is not None:
@@ -433,7 +433,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return 'Cover Thumbnails'
+        return N_('Cover Thumbnails')
 
     def __str__(self):
         return "GenerateSeriesThumbnails"
@@ -444,7 +444,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
 
 class TaskClearCoverThumbnailCache(CalibreTask):
-    def __init__(self, book_id, task_message=u'Clearing cover thumbnail cache'):
+    def __init__(self, book_id, task_message=N_('Clearing cover thumbnail cache')):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
@@ -486,8 +486,8 @@ class TaskClearCoverThumbnailCache(CalibreTask):
                 .delete()
             self.app_db_session.commit()
         except Exception as ex:
-            self.log.info(u'Error deleting book thumbnail: ' + str(ex))
-            self._handleError(u'Error deleting book thumbnail: ' + str(ex))
+            self.log.info('Error deleting book thumbnail: ' + str(ex))
+            self._handleError('Error deleting book thumbnail: ' + str(ex))
 
     def delete_all_thumbnails(self):
         try:
@@ -495,12 +495,12 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             self.app_db_session.commit()
             self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
-            self.log.info(u'Error deleting thumbnail directory: ' + str(ex))
-            self._handleError(u'Error deleting thumbnail directory: ' + str(ex))
+            self.log.info('Error deleting thumbnail directory: ' + str(ex))
+            self._handleError('Error deleting thumbnail directory: ' + str(ex))
 
     @property
     def name(self):
-        return 'Cover Thumbnails'
+        return N_('Cover Thumbnails')
 
     # needed for logging
     def __str__(self):
diff --git a/cps/tasks/upload.py b/cps/tasks/upload.py
index cf5a64ac8..bc8ba1e09 100644
--- a/cps/tasks/upload.py
+++ b/cps/tasks/upload.py
@@ -17,11 +17,14 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from datetime import datetime
+
+from flask_babel import lazy_gettext as N_
+
 from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS
 
 class TaskUpload(CalibreTask):
-    def __init__(self, taskMessage, book_title):
-        super(TaskUpload, self).__init__(taskMessage)
+    def __init__(self, task_message, book_title):
+        super(TaskUpload, self).__init__(task_message)
         self.start_time = self.end_time = datetime.now()
         self.stat = STAT_FINISH_SUCCESS
         self.progress = 1
@@ -32,7 +35,7 @@ class TaskUpload(CalibreTask):
 
     @property
     def name(self):
-        return "Upload"
+        return N_("Upload")
 
     def __str__(self):
         return "Upload {}".format(self.book_title)
diff --git a/cps/templates/stats.html b/cps/templates/stats.html
index 052c920a4..62a293089 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -39,7 +39,7 @@
   {% if version %}
     <tr>
       <th>{{library}}</th>
-      <td>{{_(version)}}</td>
+      <td>{{version}}</td>
     </tr>
   {% endif %}
   {% endfor %}

From ae9a970782d54324ab778579a77d9ace5050b21c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 25 Apr 2022 08:24:14 +0200
Subject: [PATCH 255/412] Add button to update cover cache (for usecase
 sideloaded changed cover) Bugfix logig start background schedue

---
 cps/admin.py                         | 15 ++++++++++++++-
 cps/helper.py                        |  4 ++++
 cps/schedule.py                      | 10 +++++-----
 cps/services/background_scheduler.py | 12 ++++++------
 cps/static/js/main.js                | 11 +++++++++++
 cps/static/js/table.js               |  2 +-
 cps/templates/admin.html             |  6 ++++++
 7 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 1319c42a9..91b34eba1 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -44,7 +44,7 @@ from . import constants, logger, helper, services, cli
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, \
     kobo_sync_status, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
-    valid_email, check_username
+    valid_email, check_username, update_thumbnail_cache
 from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from .services.worker import WorkerThread
@@ -169,6 +169,17 @@ def reconnect():
         abort(404)
 
 
+@admi.route("/ajax/updateThumbnails", methods=['POST'])
+@admin_required
+@login_required
+def update_thumbnails():
+    content = config.get_scheduled_task_settings()
+    if content['schedule_generate_book_covers']:
+        log.info("Update of Cover cache requested")
+        update_thumbnail_cache()
+    return ""
+
+
 @admi.route("/admin/view")
 @login_required
 @admin_required
@@ -612,6 +623,8 @@ def load_dialogtexts(element_id):
         texts["main"] = _('Are you sure you want to change shelf sync behavior for the selected user(s)?')
     elif element_id == "db_submit":
         texts["main"] = _('Are you sure you want to change Calibre library location?')
+    elif element_id == "admin_refresh_cover_cache":
+        texts["main"] = _('Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?')
     elif element_id == "btnfullsync":
         texts["main"] = _("Are you sure you want delete Calibre-Web's sync database "
                           "to force a full sync with your Kobo Reader?")
diff --git a/cps/helper.py b/cps/helper.py
index 5c532dbac..d97d6475f 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -1091,3 +1091,7 @@ def delete_thumbnail_cache():
 
 def add_book_to_thumbnail_cache(book_id):
     WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
+
+
+def update_thumbnail_cache():
+    WorkerThread.add(None, TaskGenerateCoverThumbnails())
diff --git a/cps/schedule.py b/cps/schedule.py
index 1da52d6f9..a051bd5f2 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -30,16 +30,16 @@ def get_scheduled_tasks(reconnect=True):
 
     # Reconnect Calibre database (metadata.db)
     if reconnect:
-        tasks.append([lambda: TaskReconnectDatabase(), 'reconnect'])
+        tasks.append([lambda: TaskReconnectDatabase(), 'reconnect', False])
 
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
-        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers'])
-        tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers'])
+        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers', False])
+        tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers', True])
 
     # Generate all missing series thumbnails
     if config.schedule_generate_series_covers:
-        tasks.append([lambda: TaskGenerateSeriesThumbnails(), 'generate book covers'])
+        tasks.append([lambda: TaskGenerateSeriesThumbnails(), 'generate book covers', False])
 
     return tasks
 
@@ -86,4 +86,4 @@ def register_startup_tasks():
 
 def should_task_be_running(start, end):
     now = datetime.datetime.now().hour
-    return (start < end and start <= now < end) or (end < start <= now or now < end)
+    return (start < end and start <= now < end) or (end < start and (now < end or start <= now ))
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index eee5b7cda..27285fd93 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -52,32 +52,32 @@ class BackgroundScheduler:
             return self.scheduler.add_job(func=func, trigger=trigger, name=name, **trigger_args)
 
     # Expects a lambda expression for the task
-    def schedule_task(self, task, user=None, name=None, trigger='cron', **trigger_args):
+    def schedule_task(self, task, user=None, name=None, hidden=False, trigger='cron', **trigger_args):
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
                 worker_task.scheduled = True
-                WorkerThread.add(user, worker_task)
+                WorkerThread.add(user, worker_task, hidden=hidden)
             return self.schedule(func=scheduled_task, trigger=trigger, name=name, **trigger_args)
 
     # Expects a list of lambda expressions for the tasks
     def schedule_tasks(self, tasks, user=None, trigger='cron', **trigger_args):
         if use_APScheduler:
             for task in tasks:
-                self.schedule_task(task[0], user=user, trigger=trigger, name=task[1], **trigger_args)
+                self.schedule_task(task[0], user=user, trigger=trigger, name=task[1], hidden=task[2], **trigger_args)
 
     # Expects a lambda expression for the task
-    def schedule_task_immediately(self, task, user=None, name=None):
+    def schedule_task_immediately(self, task, user=None, name=None, hidden=False):
         if use_APScheduler:
             def immediate_task():
-                WorkerThread.add(user, task())
+                WorkerThread.add(user, task(), hidden)
             return self.schedule(func=immediate_task, trigger='date', name=name)
 
     # Expects a list of lambda expressions for the tasks
     def schedule_tasks_immediately(self, tasks, user=None):
         if use_APScheduler:
             for task in tasks:
-                self.schedule_task_immediately(task[0], user, name="immediately " + task[1])
+                self.schedule_task_immediately(task[0], user, name="immediately " + task[1], hidden=task[2])
 
     # Remove all jobs
     def remove_all_jobs(self):
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 91084f06e..04d47d6be 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -474,6 +474,17 @@ $(function() {
             }
         });
     });
+    $("#admin_refresh_cover_cache").click(function() {
+        confirmDialog("admin_refresh_cover_cache", "GeneralChangeModal", 0, function () {
+            $.ajax({
+                method:"post",
+                contentType: "application/json; charset=utf-8",
+                dataType: "json",
+                url: getPath() + "/ajax/updateThumbnails",
+            });
+        });
+    });
+
     $("#restart_database").click(function() {
         $("#DialogHeader").addClass("hidden");
         $("#DialogFinished").addClass("hidden");
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index e04c75621..548ca8c4c 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -550,7 +550,7 @@ $(function() {
 
     $("#user-table").on("click-cell.bs.table", function (field, value, row, $element) {
         if (value === "denied_column_value") {
-            ConfirmDialog("btndeluser", "GeneralDeleteModal", $element.id, user_handle);
+            confirmDialog("btndeluser", "GeneralDeleteModal", $element.id, user_handle);
         }
     });
 
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index efbd4c6c1..8b0bbc457 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -184,6 +184,9 @@
           </div-->
         </div>
       <a class="btn btn-default scheduledtasks" id="admin_edit_scheduled_tasks" href="{{url_for('admin.edit_scheduledtasks')}}">{{_('Edit Scheduled Tasks Settings')}}</a>
+      {% if config.schedule_generate_book_covers %}
+        <a class="btn btn-default" id="admin_refresh_cover_cache">{{_('Refresh Thumbnail Cover Cache')}}</a>
+      {%  endif %}
     </div>
   </div>
 
@@ -279,3 +282,6 @@
   </div>
 </div>
 {% endblock %}
+{% block modal %}
+{{ change_confirm_modal() }}
+{% endblock %}

From d83c73103070b2cd943b7cacf88c16f709da7051 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 25 Apr 2022 08:28:29 +0200
Subject: [PATCH 256/412] Reconnect only if reconnect is enabled

---
 cps/admin.py          | 2 +-
 cps/schedule.py       | 4 ++--
 cps/tasks/database.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 91b34eba1..6db36dd23 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1681,7 +1681,7 @@ def update_scheduledtasks():
         schedule.end_scheduled_tasks()
 
         # Re-register tasks with new settings
-        schedule.register_scheduled_tasks()
+        schedule.register_scheduled_tasks(cli.reconnect_enable)
     except IntegrityError as ex:
         ub.session.rollback()
         log.error("An unknown error occurred while saving scheduled tasks settings")
diff --git a/cps/schedule.py b/cps/schedule.py
index a051bd5f2..5f8b2e862 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -51,7 +51,7 @@ def end_scheduled_tasks():
             worker.end_task(task.id)
 
 
-def register_scheduled_tasks():
+def register_scheduled_tasks(reconnect=True):
     scheduler = BackgroundScheduler()
 
     if scheduler:
@@ -68,7 +68,7 @@ def register_scheduled_tasks():
 
         # Kick-off tasks, if they should currently be running
         if should_task_be_running(start, end):
-            scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
+            scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(reconnect))
 
 
 def register_startup_tasks():
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 6dd10f7c2..e5aa26dae 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -39,7 +39,7 @@ class TaskReconnectDatabase(CalibreTask):
             urlopen('http://' + address + ':' + str(port) + '/reconnect')
             self._handleSuccess()
         except Exception as ex:
-            self._handleError(u'Unable to reconnect Calibre database: ' + str(ex))
+            self._handleError('Unable to reconnect Calibre database: ' + str(ex))
 
     @property
     def name(self):

From 6e8445fed50fe7150c80f12ef958f9a1fe308fa6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 25 Apr 2022 17:00:07 +0200
Subject: [PATCH 257/412] Changed schedule start- and end-time to schedule
 start and duration Localized display of schedule start-time and duration
 Removed displaying scheduling settings if "APScheduler" is missing Input
 check for start-time and duration

---
 cps.py                           |  2 +-
 cps/admin.py                     | 76 +++++++++++++++++++++-----------
 cps/config_sql.py                |  3 +-
 cps/schedule.py                  | 26 ++++++-----
 cps/tasks/database.py            |  1 +
 cps/templates/admin.html         | 15 ++++---
 cps/templates/schedule_edit.html | 17 ++++---
 7 files changed, 90 insertions(+), 50 deletions(-)

diff --git a/cps.py b/cps.py
index 17cceb0ab..55d9339c4 100755
--- a/cps.py
+++ b/cps.py
@@ -77,7 +77,7 @@ def main():
         app.register_blueprint(oauth)
 
     # Register scheduled tasks
-    register_scheduled_tasks()
+    register_scheduled_tasks()  # ToDo only reconnect if reconnect is enabled
     register_startup_tasks()
 
     success = web_server.start()
diff --git a/cps/admin.py b/cps/admin.py
index 6db36dd23..9dc450966 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -24,13 +24,12 @@ import os
 import re
 import base64
 import json
-import time
 import operator
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, time
 from functools import wraps
 
 from babel import Locale
-from babel.dates import format_datetime
+from babel.dates import format_datetime, format_time, format_timedelta
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
 from flask_login import login_required, current_user, logout_user, confirm_login
 from flask_babel import gettext as _
@@ -58,7 +57,8 @@ feature_support = {
         'goodreads': bool(services.goodreads_support),
         'kobo':  bool(services.kobo),
         'updater': constants.UPDATER_AVAILABLE,
-        'gmail': bool(services.gmail)
+        'gmail': bool(services.gmail),
+        'scheduler': schedule.use_APScheduler
     }
 
 try:
@@ -184,6 +184,7 @@ def update_thumbnails():
 @login_required
 @admin_required
 def admin():
+    locale = get_locale()
     version = updater_thread.get_current_version_info()
     if version is False:
         commit = _(u'Unknown')
@@ -198,15 +199,19 @@ def admin():
                     form_date -= timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
                 elif commit[19] == '-':
                     form_date += timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
-            commit = format_datetime(form_date - tz, format='short', locale=get_locale())
+            commit = format_datetime(form_date - tz, format='short', locale=locale)
         else:
             commit = version['version']
 
     all_user = ub.session.query(ub.User).all()
     email_settings = config.get_mail_settings()
-    kobo_support = feature_support['kobo'] and config.config_kobo_sync
+    schedule_time = format_time(time(hour=config.schedule_start_time), format="short", locale=locale)
+    t = timedelta(hours=config.schedule_duration // 60, minutes=config.schedule_duration % 60)
+    schedule_duration = format_timedelta(t, format="short", threshold=.99, locale=locale)
+
     return render_title_template("admin.html", allUser=all_user, email=email_settings, config=config, commit=commit,
-                                 feature_support=feature_support, kobo_support=kobo_support,
+                                 feature_support=feature_support, schedule_time=schedule_time,
+                                 schedule_duration=schedule_duration,
                                  title=_(u"Admin page"), page="admin")
 
 
@@ -1660,36 +1665,57 @@ def update_mailsettings():
 @admin_required
 def edit_scheduledtasks():
     content = config.get_scheduled_task_settings()
-    return render_title_template("schedule_edit.html", config=content, title=_(u"Edit Scheduled Tasks Settings"))
+    time_field = list()
+    duration_field = list()
+
+    locale = get_locale()
+    for n in range(24):
+        time_field.append((n , format_time(time(hour=n), format="short", locale=locale)))
+    for n in range(5, 65, 5):
+        t = timedelta(hours=n // 60, minutes=n % 60)
+        duration_field.append((n, format_timedelta(t, format="short", threshold=.99, locale=locale)))
+
+    return render_title_template("schedule_edit.html", config=content, starttime=time_field, duration=duration_field, title=_(u"Edit Scheduled Tasks Settings"))
 
 
 @admi.route("/admin/scheduledtasks", methods=["POST"])
 @login_required
 @admin_required
 def update_scheduledtasks():
+    error = False
     to_save = request.form.to_dict()
-    _config_int(to_save, "schedule_start_time")
-    _config_int(to_save, "schedule_end_time")
+    if "0" <= to_save.get("schedule_start_time") <= "23":
+        _config_int(to_save, "schedule_start_time")
+    else:
+        flash(_(u"Invalid start time for task specified"), category="error")
+        error = True
+    if "0" < to_save.get("schedule_duration") <= "60":
+        _config_int(to_save, "schedule_duration")
+    else:
+        flash(_(u"Invalid duration for task specified"), category="error")
+        error = True
     _config_checkbox(to_save, "schedule_generate_book_covers")
     _config_checkbox(to_save, "schedule_generate_series_covers")
+    _config_checkbox(to_save, "schedule_reconnect")
 
-    try:
-        config.save()
-        flash(_(u"Scheduled tasks settings updated"), category="success")
+    if not error:
+        try:
+            config.save()
+            flash(_(u"Scheduled tasks settings updated"), category="success")
 
-        # Cancel any running tasks
-        schedule.end_scheduled_tasks()
+            # Cancel any running tasks
+            schedule.end_scheduled_tasks()
 
-        # Re-register tasks with new settings
-        schedule.register_scheduled_tasks(cli.reconnect_enable)
-    except IntegrityError as ex:
-        ub.session.rollback()
-        log.error("An unknown error occurred while saving scheduled tasks settings")
-        flash(_(u"An unknown error occurred. Please try again later."), category="error")
-    except OperationalError:
-        ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+            # Re-register tasks with new settings
+            schedule.register_scheduled_tasks(config.schedule_reconnect)
+        except IntegrityError:
+            ub.session.rollback()
+            log.error("An unknown error occurred while saving scheduled tasks settings")
+            flash(_(u"An unknown error occurred. Please try again later."), category="error")
+        except OperationalError:
+            ub.session.rollback()
+            log.error("Settings DB is not Writeable")
+            flash(_("Settings DB is not Writeable"), category="error")
 
     return edit_scheduledtasks()
 
diff --git a/cps/config_sql.py b/cps/config_sql.py
index a8beaabb6..f4fbb5540 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -142,9 +142,10 @@ class _Settings(_Base):
     config_allow_reverse_proxy_header_login = Column(Boolean, default=False)
 
     schedule_start_time = Column(Integer, default=4)
-    schedule_end_time = Column(Integer, default=6)
+    schedule_duration = Column(Integer, default=10)
     schedule_generate_book_covers = Column(Boolean, default=False)
     schedule_generate_series_covers = Column(Boolean, default=False)
+    schedule_reconnect = Column(Boolean, default=False)
 
     def __repr__(self):
         return self.__class__.__name__
diff --git a/cps/schedule.py b/cps/schedule.py
index 5f8b2e862..72f9b2302 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -19,7 +19,7 @@
 import datetime
 
 from . import config, constants
-from .services.background_scheduler import BackgroundScheduler
+from .services.background_scheduler import BackgroundScheduler, use_APScheduler
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails, TaskClearCoverThumbnailCache
 from .services.worker import WorkerThread
@@ -27,7 +27,7 @@ from .services.worker import WorkerThread
 
 def get_scheduled_tasks(reconnect=True):
     tasks = list()
-
+    # config.schedule_reconnect or
     # Reconnect Calibre database (metadata.db)
     if reconnect:
         tasks.append([lambda: TaskReconnectDatabase(), 'reconnect', False])
@@ -59,15 +59,14 @@ def register_scheduled_tasks(reconnect=True):
         scheduler.remove_all_jobs()
 
         start = config.schedule_start_time
-        end = config.schedule_end_time
+        duration = config.schedule_duration
 
         # Register scheduled tasks
-        if start != end:
-            scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
-            scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=end)
+        scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
+        scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=start) #  toDo
 
         # Kick-off tasks, if they should currently be running
-        if should_task_be_running(start, end):
+        if should_task_be_running(start, duration):
             scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(reconnect))
 
 
@@ -76,14 +75,17 @@ def register_startup_tasks():
 
     if scheduler:
         start = config.schedule_start_time
-        end = config.schedule_end_time
+        duration = config.schedule_duration
 
         # Run scheduled tasks immediately for development and testing
         # Ignore tasks that should currently be running, as these will be added when registering scheduled tasks
-        if constants.APP_MODE in ['development', 'test'] and not should_task_be_running(start, end):
+        if constants.APP_MODE in ['development', 'test'] and not should_task_be_running(start, duration):
             scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
 
 
-def should_task_be_running(start, end):
-    now = datetime.datetime.now().hour
-    return (start < end and start <= now < end) or (end < start and (now < end or start <= now ))
+def should_task_be_running(start, duration):
+    now = datetime.datetime.now()
+    start_time = datetime.datetime.now().replace(hour=start, minute=0, second=0, microsecond=0)
+    end_time = start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
+    return start_time < now < end_time
+    # return (start < end and start <= now < end) or (end < start and (now < end or start <= now ))
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index e5aa26dae..afc4db2cc 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -31,6 +31,7 @@ class TaskReconnectDatabase(CalibreTask):
         self.listen_address = config.get_config_ipaddress()
         self.listen_port = config.config_port
 
+
     def run(self, worker_thread):
         address = self.listen_address if self.listen_address else 'localhost'
         port = self.listen_port if self.listen_port else 8083
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 8b0bbc457..8a20b73e8 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -161,18 +161,18 @@
       <a class="btn btn-default" id="view_config" href="{{url_for('admin.view_configuration')}}">{{_('Edit UI Configuration')}}</a>
     </div>
   </div>
-
+{%  if feature_support['scheduler'] %}
   <div class="row">
     <div class="col">
       <h2>{{_('Scheduled Tasks')}}</h2>
         <div class="col-xs-12 col-sm-12 scheduled_tasks_details">
           <div class="row">
             <div class="col-xs-6 col-sm-3">{{_('Time at which tasks start to run')}}</div>
-            <div class="col-xs-6 col-sm-3">{{config.schedule_start_time}}:00</div>
+            <div class="col-xs-6 col-sm-3">{{schedule_time}}</div>
           </div>
           <div class="row">
-            <div class="col-xs-6 col-sm-3">{{_('Time at which tasks stop running')}}</div>
-            <div class="col-xs-6 col-sm-3">{{config.schedule_end_time}}:00</div>
+            <div class="col-xs-6 col-sm-3">{{_('Maximum tasks duration')}}</div>
+            <div class="col-xs-6 col-sm-3">{{schedule_duration}}</div>
           </div>
           <div class="row">
             <div class="col-xs-6 col-sm-3">{{_('Generate book cover thumbnails')}}</div>
@@ -182,6 +182,11 @@
             <div class="col-xs-6 col-sm-3">{{_('Generate series cover thumbnails')}}</div>
             <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_series_covers) }}</div>
           </div-->
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Reconnect to Calibre Library')}}</div>
+            <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_reconnect) }}</div>
+          </div>
+
         </div>
       <a class="btn btn-default scheduledtasks" id="admin_edit_scheduled_tasks" href="{{url_for('admin.edit_scheduledtasks')}}">{{_('Edit Scheduled Tasks Settings')}}</a>
       {% if config.schedule_generate_book_covers %}
@@ -189,7 +194,7 @@
       {%  endif %}
     </div>
   </div>
-
+{%  endif %}
   <div class="row form-group">
     <h2>{{_('Administration')}}</h2>
     <a class="btn btn-default" id="debug" href="{{url_for('admin.download_debug')}}">{{_('Download Debug Package')}}</a>
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index 599e79973..55658ce78 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -11,16 +11,16 @@
     <div class="form-group">
       <label for="schedule_start_time">{{_('Time at which tasks start to run')}}</label>
       <select name="schedule_start_time" id="schedule_start_time" class="form-control">
-        {% for n in range(24) %}
-          <option value="{{n}}" {% if config.schedule_start_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+        {% for n in starttime %}
+          <option value="{{n[0]}}" {% if config.schedule_start_time == n[0] %}selected{% endif %}>{{n[1]}}</option>
         {% endfor %}
       </select>
     </div>
     <div class="form-group">
-      <label for="schedule_end_time">{{_('Time at which tasks stop running')}}</label>
-      <select name="schedule_end_time" id="schedule_end_time" class="form-control">
-        {% for n in range(24) %}
-          <option value="{{n}}" {% if config.schedule_end_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+      <label for="schedule_duration">{{_('Maximum tasks duration')}}</label>
+      <select name="schedule_duration" id="schedule_duration" class="form-control">
+        {% for n in duration %}
+          <option value="{{n[0]}}" {% if config.schedule_duration == n[0] %}selected{% endif %}>{{n[1]}}</option>
         {% endfor %}
       </select>
     </div>
@@ -32,6 +32,11 @@
       <input type="checkbox" id="schedule_generate_series_covers" name="schedule_generate_series_covers" {% if config.schedule_generate_series_covers %}checked{% endif %}>
       <label for="schedule_generate_series_covers">{{_('Generate Series Cover Thumbnails')}}</label>
     </div-->
+    <div class="form-group">
+      <input type="checkbox" id="schedule_reconnect" name="schedule_reconnect" {% if config.schedule_generate_book_covers %}checked{% endif %}>
+      <label for="schedule_reconnect">{{_('Reconnect to Calibre Library')}}</label>
+    </div>
+
     <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
     <a href="{{ url_for('admin.admin') }}" id="email_back" class="btn btn-default">{{_('Cancel')}}</a>
   </form>

From 21ebdc01303d751aa4fc8cd82781c16ae9907245 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 10:49:06 +0200
Subject: [PATCH 258/412] Bugfixes from testrun

---
 cps/admin.py                            |    4 +-
 cps/schedule.py                         |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 2724 ++++++++++++-----------
 3 files changed, 1367 insertions(+), 1363 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 9dc450966..73442ef25 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1684,12 +1684,12 @@ def edit_scheduledtasks():
 def update_scheduledtasks():
     error = False
     to_save = request.form.to_dict()
-    if "0" <= to_save.get("schedule_start_time") <= "23":
+    if 0 <= int(to_save.get("schedule_start_time")) <= 23:
         _config_int(to_save, "schedule_start_time")
     else:
         flash(_(u"Invalid start time for task specified"), category="error")
         error = True
-    if "0" < to_save.get("schedule_duration") <= "60":
+    if 0 < int(to_save.get("schedule_duration")) <= 60:
         _config_int(to_save, "schedule_duration")
     else:
         flash(_(u"Invalid duration for task specified"), category="error")
diff --git a/cps/schedule.py b/cps/schedule.py
index 72f9b2302..8b70da6a7 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -34,8 +34,8 @@ def get_scheduled_tasks(reconnect=True):
 
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
-        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers', False])
         tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers', True])
+        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers', False])
 
     # Generate all missing series thumbnails
     if config.schedule_generate_series_covers:
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 2ba781258..df55a0371 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-09 06:42:55</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-25 20:37:58</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>2022-02-09 11:35:55</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-26 02:14:54</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>4h 6 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 44 min</p>
         </div>
       </div>
       </div>
@@ -332,19 +332,28 @@
 
     <tr id="su" class="passClass">
         <td>TestCliGdrivedb</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</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('c3', 2)">Detail</a>
+            <a onclick="showClassDetail('c3', 3)">Detail</a>
         </td>
     </tr>
 
     
     
         <tr id='pt3.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_folder</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt3.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
@@ -353,7 +362,7 @@
     
     
     
-        <tr id='pt3.2' class='hiddenRow bg-success'>
+        <tr id='pt3.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
@@ -420,11 +429,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">2</td>
-        <td class="text-center">13</td>
+        <td class="text-center">15</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -434,33 +443,11 @@
 
     
     
-        <tr id="ft6.1" class="none bg-danger">
+        <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 606, in test_calibre_log
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Failed&#39;
-- Convert: PDF -&gt; ODT: book9
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -474,281 +461,83 @@ AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Failed&#39;
     
     
     
-        <tr id="ft6.3" class="none bg-danger">
+        <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 198, in test_convert_email
-    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Finished&#39;
-- Convert: PDF -&gt; ODT: book9
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.4" class="none bg-danger">
+        <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 242, in test_convert_failed_and_email
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: book6 send to Kindle&#39; != &#39;Failed&#39;
-- E-mail: book6 send to Kindle
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.5" class="none bg-danger">
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 328, in test_convert_only
-    self.assertEqual(ret_orig[-6][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; MOBI: book8&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; MOBI: book8
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.6" class="none bg-danger">
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 568, in test_convert_options
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.7" class="none bg-danger">
+        <tr id='pt6.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.8" class="none bg-danger">
+        <tr id='pt6.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 142, in test_convert_wrong_excecutable
-    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: book6 send to Kindle&#39; != &#39;Failed&#39;
-- E-mail: book6 send to Kindle
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.9" class="none bg-danger">
+        <tr id='pt6.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 508, in test_convert_xss
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.10" class="none bg-danger">
+        <tr id='pt6.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 439, in test_email_failed
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.11" class="none bg-danger">
+        <tr id='pt6.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 401, in test_email_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -762,95 +551,29 @@ AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="ft6.13" class="none bg-danger">
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 482, in test_ssl_smtp_setup_error
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.14" class="none bg-danger">
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.14')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 462, in test_starttls_smtp_setup_error
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.15" class="none bg-danger">
+        <tr id='pt6.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.15')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 542, in test_user_convert_xss
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -858,37 +581,91 @@ AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
 
     <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
+        <td class="text-center">7</td>
         <td class="text-center">6</td>
-        <td class="text-center">0</td>
-        <td class="text-center">6</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('c7', 6)">Detail</a>
+            <a onclick="showClassDetail('c7', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft7.1" class="none bg-danger">
+        <tr id='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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='pt7.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="ft7.7" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_thumbnail_cache</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.1')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.7')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
+                <div id="div_ft7.7" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.1').style.display='none'"><span
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 193, in test_convert_email
-    self.assertTrue(&#34;E-mail&#34; in ret[-1][&#39;task&#39;])
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 441, in test_thumbnail_cache
+    self.assertTrue(os.path.exists(thumbnail_cache_path))
 AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -898,168 +675,13 @@ AssertionError: False is not true</pre>
         </tr>
     
     
-    
-        <tr id="ft7.2" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 234, in test_convert_failed_and_email
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Failed&#39;
-- E-mail: Test e-mail
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft7.3" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 324, in test_convert_only
-    self.assertEqual(ret[-6][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Finished&#39;
-- E-mail: Test e-mail
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft7.4" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 158, in test_convert_parameter
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; LIT: book8
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft7.5" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 430, in test_email_failed
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Failed&#39;
-- Convert: EPUB -&gt; LIT: book8
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft7.6" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 389, in test_email_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; LIT: book8
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1078,33 +700,11 @@ AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="ft8.2" class="none bg-danger">
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft8.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft8.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft8.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 126, in test_convert_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; KEPUB: book7
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1119,11 +719,11 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1142,33 +742,11 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="ft9.2" class="none bg-danger">
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft9.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 174, in test_convert_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; KEPUB: book7
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1183,15 +761,15 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">19</td>
         <td class="text-center">17</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">10</td>
         <td class="text-center">2</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 19)">Detail</a>
+            <a onclick="showClassDetail('c10', 17)">Detail</a>
         </td>
     </tr>
 
@@ -1242,11 +820,34 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.6' class='hiddenRow bg-success'>
+        <tr id="ft10.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 461, in test_edit_book_identifier
+    self.assertEqual(&#39;Hallo1&#39;, list(result[&#39;identifier&#39;][-1].keys())[0])
+AssertionError: &#39;Hallo1&#39; != &#39;Hallo&#39;
+- Hallo1
+?      -
++ Hallo</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1260,11 +861,31 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id="ft10.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 614, in test_edit_book_identifier_standard
+    self.assertEqual(final_length, reference_length)
+AssertionError: 14 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1305,41 +926,26 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id="et10.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt10.14' 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="st10.15" 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_st10.15')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.13')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.15" class="popup_window test_output" style="display:none;">
+                <div id="div_et10.13" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st10.15').style.display='none'"><span
+                                onclick="document.getElementById('div_et10.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
-                        <pre class="text-left">Not implemented</pre>
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 166, in test_upload_metadata_cbr
+    self.assertEqual(&#39;Test 执book&#39;, details[&#39;title&#39;])
+KeyError: &#39;title&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1349,16 +955,46 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id="et10.14" class="none bg-info">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 185, in test_upload_metadata_cbt
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='st10.17' class='none bg-warning'>
+        <tr id='st10.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -1367,20 +1003,145 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.18' class='hiddenRow bg-success'>
+        <tr id="et10.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 810, in test_xss_comment_edit
+    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.19' class='hiddenRow bg-success'>
+        <tr id="et10.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 832, in test_xss_custom_comment_edit
+    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c11', 2)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et11.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_edit_additional_books)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.1').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 44, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 475, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et11.2" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_thumbnail_env)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnail_env.py&#34;, line 26, in setUpClass
+    add_dependency(cls.json_line, cls.__name__)
+AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;json_line&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1394,13 +1155,13 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 36)">Detail</a>
+            <a onclick="showClassDetail('c12', 36)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1409,7 +1170,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1418,7 +1179,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1427,7 +1188,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1436,7 +1197,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1445,7 +1206,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1454,7 +1215,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1463,7 +1224,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1472,7 +1233,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.9' class='hiddenRow bg-success'>
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1481,7 +1242,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.10' class='hiddenRow bg-success'>
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1490,7 +1251,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.11' class='hiddenRow bg-success'>
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1499,7 +1260,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.12' class='hiddenRow bg-success'>
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1508,7 +1269,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.13' class='hiddenRow bg-success'>
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1517,7 +1278,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.14' class='hiddenRow bg-success'>
+        <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1526,7 +1287,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.15' class='hiddenRow bg-success'>
+        <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1535,7 +1296,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.16' class='hiddenRow bg-success'>
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1544,7 +1305,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.17' class='hiddenRow bg-success'>
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1553,7 +1314,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.18' class='hiddenRow bg-success'>
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1562,7 +1323,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.19' class='hiddenRow bg-success'>
+        <tr id='pt12.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1571,19 +1332,19 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="st11.20" class="none bg-warning">
+        <tr id="st12.20" 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_st11.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1597,7 +1358,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.21' class='hiddenRow bg-success'>
+        <tr id='pt12.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1606,7 +1367,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.22' class='hiddenRow bg-success'>
+        <tr id='pt12.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1615,7 +1376,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.23' class='hiddenRow bg-success'>
+        <tr id='pt12.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1624,7 +1385,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.24' class='hiddenRow bg-success'>
+        <tr id='pt12.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1633,7 +1394,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.25' class='hiddenRow bg-success'>
+        <tr id='pt12.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1642,7 +1403,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.26' class='hiddenRow bg-success'>
+        <tr id='pt12.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1651,7 +1412,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.27' class='hiddenRow bg-success'>
+        <tr id='pt12.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1660,7 +1421,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.28' class='hiddenRow bg-success'>
+        <tr id='pt12.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1669,7 +1430,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.29' class='hiddenRow bg-success'>
+        <tr id='pt12.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1678,7 +1439,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.30' class='hiddenRow bg-success'>
+        <tr id='pt12.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1687,7 +1448,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.31' class='hiddenRow bg-success'>
+        <tr id='pt12.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1696,7 +1457,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.32' class='hiddenRow bg-success'>
+        <tr id='pt12.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1705,7 +1466,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.33' class='hiddenRow bg-success'>
+        <tr id='pt12.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1714,7 +1475,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.34' class='hiddenRow bg-success'>
+        <tr id='pt12.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1723,7 +1484,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.35' class='hiddenRow bg-success'>
+        <tr id='pt12.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1732,7 +1493,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.36' class='hiddenRow bg-success'>
+        <tr id='pt12.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1742,82 +1503,13 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditAuthors</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('c12', 6)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt12.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>TestEditAuthorsGdrive</td>
-        <td class="text-center">6</td>
         <td class="text-center">5</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 6)">Detail</a>
         </td>
@@ -1827,7 +1519,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
         <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1836,7 +1528,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
         <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1845,7 +1537,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
         <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1854,7 +1546,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
         <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1862,6 +1554,103 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
         <tr id='pt13.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft13.6" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author.py&#34;, line 471, in test_rename_capital_on_upload
+    self.assertEqual([&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;], details[&#39;author&#39;])
+AssertionError: Lists differ: [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;] != [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;, &#39;Liu Yang&#39;]
+
+Second list contains 1 additional elements.
+First extra element 4:
+&#39;Liu Yang&#39;
+
+- [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;]
++ [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;, &#39;Liu Yang&#39;]
+?                                                                    ++++++++++++</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="failClass">
+        <td>TestEditAuthorsGdrive</td>
+        <td class="text-center">6</td>
+        <td class="text-center">5</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('c14', 6)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt14.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1870,26 +1659,33 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="et13.6" class="none bg-info">
+        <tr id="ft14.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.6')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.6')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et13.6" class="popup_window test_output" style="display:block;">
+                <div id="div_ft14.6" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et13.6').style.display='none'"><span
+                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 547, in test_rename_capital_on_upload
-    self.assertEqual(&#39;Useless&#39;, details[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 564, in test_rename_capital_on_upload
+    self.assertEqual([&#39;Asterix Lionherd&#39;], details[&#39;author&#39;])
+AssertionError: Lists differ: [&#39;Asterix Lionherd&#39;] != [&#39;Asterix Lionherd&#39;, &#39;Asterix Lionherd&#39;]
+
+Second list contains 1 additional elements.
+First extra element 1:
+&#39;Asterix Lionherd&#39;
+
+- [&#39;Asterix Lionherd&#39;]
++ [&#39;Asterix Lionherd&#39;, &#39;Asterix Lionherd&#39;]</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1908,13 +1704,13 @@ KeyError: &#39;title&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 18)">Detail</a>
+            <a onclick="showClassDetail('c15', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1923,7 +1719,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1932,7 +1728,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1941,7 +1737,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1950,7 +1746,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1959,7 +1755,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1968,7 +1764,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.7' class='hiddenRow bg-success'>
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1977,7 +1773,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1986,7 +1782,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.9' class='hiddenRow bg-success'>
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1995,7 +1791,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.10' class='hiddenRow bg-success'>
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -2004,7 +1800,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.11' class='hiddenRow bg-success'>
+        <tr id='pt15.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -2013,7 +1809,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id='pt15.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -2022,7 +1818,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -2031,7 +1827,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -2040,7 +1836,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -2049,7 +1845,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -2058,7 +1854,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.17' class='hiddenRow bg-success'>
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -2067,7 +1863,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.18' class='hiddenRow bg-success'>
+        <tr id='pt15.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -2085,13 +1881,13 @@ KeyError: &#39;title&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 1)">Detail</a>
+            <a onclick="showClassDetail('c16', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
@@ -2103,19 +1899,19 @@ KeyError: &#39;title&#39;</pre>
 
     <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">20</td>
-        <td class="text-center">20</td>
+        <td class="text-center">18</td>
+        <td class="text-center">18</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', 20)">Detail</a>
+            <a onclick="showClassDetail('c17', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -2124,7 +1920,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -2133,7 +1929,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -2142,7 +1938,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -2151,7 +1947,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -2160,7 +1956,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -2169,7 +1965,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -2178,7 +1974,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.8' class='hiddenRow bg-success'>
+        <tr id='pt17.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -2187,7 +1983,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.9' class='hiddenRow bg-success'>
+        <tr id='pt17.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -2196,7 +1992,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.10' class='hiddenRow bg-success'>
+        <tr id='pt17.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -2205,7 +2001,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.11' class='hiddenRow bg-success'>
+        <tr id='pt17.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -2214,7 +2010,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.12' class='hiddenRow bg-success'>
+        <tr id='pt17.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -2223,7 +2019,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.13' class='hiddenRow bg-success'>
+        <tr id='pt17.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -2232,7 +2028,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.14' class='hiddenRow bg-success'>
+        <tr id='pt17.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -2241,7 +2037,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.15' class='hiddenRow bg-success'>
+        <tr id='pt17.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -2250,7 +2046,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id='pt17.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -2259,16 +2055,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.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='pt16.18' class='hiddenRow bg-success'>
+        <tr id='pt17.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -2277,16 +2064,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.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='pt16.20' class='hiddenRow bg-success'>
+        <tr id='pt17.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -2304,13 +2082,13 @@ KeyError: &#39;title&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
@@ -2320,83 +2098,39 @@ KeyError: &#39;title&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSTARTTLS</td>
         <td class="text-center">3</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</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('c18', 3)">Detail</a>
+            <a onclick="showClassDetail('c19', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft18.1" class="none bg-danger">
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft18.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 81, in test_STARTTLS
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Finished&#39;
-- E-mail: Test e-mail
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft18.2" class="none bg-danger">
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft18.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 102, in test_STARTTLS_SSL_setup_error
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
-- E-mail: Buuko send to Kindle
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -2406,83 +2140,39 @@ AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">3</td>
-        <td class="text-center">3</td>
-        <td class="text-center">1</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('c19', 7)">Detail</a>
+            <a onclick="showClassDetail('c20', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft19.1" class="none bg-danger">
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft19.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 122, in test_SSL_None_setup_error
-    self.assertEqual(&#39;Failed&#39;, ret[-1][&#39;result&#39;])
-AssertionError: &#39;Failed&#39; != &#39;E-mail: Buuko send to Kindle&#39;
-- Failed
-+ E-mail: Buuko send to Kindle</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft19.2" class="none bg-danger">
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft19.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 101, in test_SSL_STARTTLS_setup_error
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
-- E-mail: Buuko send to Kindle
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt20.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -2491,7 +2181,7 @@ AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
     
     
     
-        <tr id='pt19.4' class='hiddenRow bg-success'>
+        <tr id='pt20.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2500,67 +2190,25 @@ AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
     
     
     
-        <tr id="ft19.5" class="none bg-danger">
+        <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft19.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 79, in test_SSL_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Finished&#39;
-- E-mail: Buuko send to Kindle
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et19.6" class="none bg-info">
+        <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et19.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et19.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 167, in test_email_limit
-    details = self.get_book_details(int(book_details[&#39;cover&#39;].split(&#39;/&#39;)[-1].split(&#39;?&#39;)[0]))
-ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt19.7' class='hiddenRow bg-success'>
+        <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2578,13 +2226,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2602,13 +2250,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 2)">Detail</a>
+            <a onclick="showClassDetail('c22', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2617,7 +2265,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -2635,13 +2283,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2650,19 +2298,19 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id="st22.2" class="none bg-warning">
+        <tr id="st23.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st22.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st23.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_st22.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st23.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2676,7 +2324,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2694,13 +2342,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 1)">Detail</a>
+            <a onclick="showClassDetail('c24', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2718,13 +2366,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 3)">Detail</a>
+            <a onclick="showClassDetail('c25', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2733,7 +2381,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2742,7 +2390,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2760,13 +2408,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 11)">Detail</a>
+            <a onclick="showClassDetail('c26', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2775,7 +2423,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2784,7 +2432,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2793,7 +2441,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2802,7 +2450,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2811,7 +2459,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2820,7 +2468,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2829,7 +2477,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2838,7 +2486,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2847,7 +2495,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2856,7 +2504,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2866,39 +2514,108 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestKoboSyncBig</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">6</td>
+        <td class="text-center">3</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 5)">Detail</a>
+            <a onclick="showClassDetail('c27', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id="ft27.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestKoboSyncBig - test_download_cover</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft27.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 472, in test_download_cover
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et27.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt26.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 412, in test_kobo_sync_multi_user
+    self.check_element_on_page((By.XPATH, &#34;//*[@id=&#39;archived_cb&#39;]&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id="et27.3" class="none bg-info">
+            <td>
+                <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelves</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 279, in test_kobo_sync_selected_shelves
+    self.check_element_on_page((By.ID, &#34;add-to-shelf&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2907,7 +2624,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2916,7 +2633,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2934,13 +2651,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 13)">Detail</a>
+            <a onclick="showClassDetail('c28', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2949,7 +2666,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2958,7 +2675,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2967,7 +2684,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2976,7 +2693,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2985,7 +2702,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2994,7 +2711,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -3003,7 +2720,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -3012,7 +2729,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -3021,7 +2738,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -3030,7 +2747,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -3039,7 +2756,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -3048,7 +2765,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -3060,19 +2777,19 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
 
     <tr id="su" class="passClass">
         <td>TestCalibreWebListOrders</td>
-        <td class="text-center">8</td>
-        <td class="text-center">8</td>
+        <td class="text-center">10</td>
+        <td class="text-center">10</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', 8)">Detail</a>
+            <a onclick="showClassDetail('c29', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -3081,7 +2798,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -3090,7 +2807,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -3099,7 +2816,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -3108,7 +2825,25 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -3117,7 +2852,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -3126,7 +2861,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -3135,7 +2870,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -3153,13 +2888,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 9)">Detail</a>
+            <a onclick="showClassDetail('c30', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -3168,7 +2903,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -3177,7 +2912,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -3186,7 +2921,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -3195,19 +2930,19 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id="st29.5" class="none bg-warning">
+        <tr id="st30.5" 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_st29.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st29.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st30.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_st29.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st30.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3221,7 +2956,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -3230,7 +2965,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -3239,7 +2974,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -3248,7 +2983,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -3266,13 +3001,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 15)">Detail</a>
+            <a onclick="showClassDetail('c31', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -3281,7 +3016,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -3290,7 +3025,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -3299,7 +3034,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -3308,7 +3043,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -3317,7 +3052,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -3326,7 +3061,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -3335,7 +3070,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -3344,7 +3079,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -3353,7 +3088,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -3362,7 +3097,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -3371,7 +3106,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3380,7 +3115,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3389,7 +3124,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3398,7 +3133,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3416,13 +3151,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -3431,7 +3166,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -3449,13 +3184,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c33', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3464,7 +3199,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3482,13 +3217,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 23)">Detail</a>
+            <a onclick="showClassDetail('c34', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3497,7 +3232,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3506,7 +3241,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3515,7 +3250,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3524,7 +3259,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3533,7 +3268,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3542,7 +3277,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3551,7 +3286,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3560,7 +3295,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id='pt34.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3569,7 +3304,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.10' class='hiddenRow bg-success'>
+        <tr id='pt34.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3578,7 +3313,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.11' class='hiddenRow bg-success'>
+        <tr id='pt34.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3587,7 +3322,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id='pt34.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3596,7 +3331,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id='pt34.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3605,7 +3340,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.14' class='hiddenRow bg-success'>
+        <tr id='pt34.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3614,7 +3349,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.15' class='hiddenRow bg-success'>
+        <tr id='pt34.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3623,7 +3358,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.16' class='hiddenRow bg-success'>
+        <tr id='pt34.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3632,7 +3367,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id='pt34.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3641,7 +3376,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.18' class='hiddenRow bg-success'>
+        <tr id='pt34.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3650,7 +3385,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.19' class='hiddenRow bg-success'>
+        <tr id='pt34.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3659,7 +3394,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.20' class='hiddenRow bg-success'>
+        <tr id='pt34.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3668,7 +3403,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.21' class='hiddenRow bg-success'>
+        <tr id='pt34.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3677,7 +3412,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.22' class='hiddenRow bg-success'>
+        <tr id='pt34.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3686,7 +3421,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.23' class='hiddenRow bg-success'>
+        <tr id='pt34.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3704,13 +3439,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 1)">Detail</a>
+            <a onclick="showClassDetail('c35', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3721,68 +3456,46 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
 
 
     <tr id="su" class="errorClass">
-        <td>TestReader</td>
-        <td class="text-center">5</td>
-        <td class="text-center">4</td>
+        <td>_FailedTest</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('c35', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id="et36.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestReader - test_comic_reader</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt35.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='pt35.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="et35.4" class="none bg-info">
-            <td>
-                <div class='testcase'>TestReader - test_sound_listener</div>
+                <div class='testcase'>_FailedTest - test_pip_install</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.4')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et35.4" class="popup_window test_output" style="display:block;">
+                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.4').style.display='none'"><span
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 222, in sound_test
-    self.delete_book(int(details[&#39;cover&#39;].split(&#39;/&#39;)[-1].split(&#39;?&#39;)[0]))
-ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
+                        <pre class="text-left">ImportError: Failed to import test module: test_pip_install
+Traceback (most recent call last):
+  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 436, in _find_test_path
+    module = self._get_module_from_name(name)
+  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 377, in _get_module_from_name
+    __import__(name)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_pip_install.py&#34;, line 15, in &lt;module&gt;
+    from build import make_release
+  File &#34;/home/ozzie/Development/calibre-web-test/build/make_release.py&#34;, line 14, in &lt;module&gt;
+    from helper_environment import environment, add_dependency
+ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_environment&#39; (/home/ozzie/Development/calibre-web-test/test/helper_environment.py)</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3791,8 +3504,59 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         </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('c37', 5)">Detail</a>
+        </td>
+    </tr>
+
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+    
+        <tr id='pt37.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='pt37.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='pt37.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='pt37.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='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3802,6 +3566,30 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
 
 
+    <tr id="su" class="passClass">
+        <td>TestReadOnlyDatabase</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('c38', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt38.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestReconnect</td>
         <td class="text-center">1</td>
@@ -3810,13 +3598,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 1)">Detail</a>
+            <a onclick="showClassDetail('c39', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3834,13 +3622,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 8)">Detail</a>
+            <a onclick="showClassDetail('c40', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3849,7 +3637,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3858,7 +3646,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3867,7 +3655,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3876,7 +3664,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3885,7 +3673,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3894,7 +3682,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3903,7 +3691,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3921,13 +3709,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 3)">Detail</a>
+            <a onclick="showClassDetail('c41', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3936,7 +3724,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3945,7 +3733,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3963,13 +3751,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 16)">Detail</a>
+            <a onclick="showClassDetail('c42', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3978,7 +3766,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3987,7 +3775,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3996,7 +3784,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -4005,7 +3793,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -4014,7 +3802,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -4023,7 +3811,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -4032,7 +3820,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -4041,7 +3829,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -4050,7 +3838,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -4059,7 +3847,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -4068,7 +3856,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -4077,7 +3865,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -4086,19 +3874,19 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id="st39.14" class="none bg-warning">
+        <tr id="st42.14" 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_st39.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st39.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.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_st39.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4112,7 +3900,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -4121,7 +3909,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -4131,21 +3919,248 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>TestUpdater</td>
-        <td class="text-center">9</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</td>
+    <tr id="su" class="failClass">
+        <td>TestThumbnails</td>
+        <td class="text-center">8</td>
+        <td class="text-center">0</td>
+        <td class="text-center">7</td>
+        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 9)">Detail</a>
+            <a onclick="showClassDetail('c43', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id="ft43.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 210, in test_cache_non_writable
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.2" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 178, in test_cache_of_deleted_book
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.3" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 77, in test_cover_cache_on_database_change
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.4" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 117, in test_cover_change_on_upload_new_cover
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='st43.5' class='none bg-warning'>
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_for_series</div>
+            </td>
+            <td colspan='6' align='center'>SKIP</td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.6" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 224, in test_cover_on_upload_book
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.7" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 152, in test_remove_cover_from_cache
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.8" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 262, in test_sideloaded_book
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="failClass">
+        <td>TestUpdater</td>
+        <td class="text-center">9</td>
+        <td class="text-center">7</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c44', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -4154,7 +4169,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -4163,7 +4178,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -4172,7 +4187,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -4181,41 +4196,26 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id="et40.5" class="none bg-info">
+        <tr id="ft44.5" class="none bg-danger">
             <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_et40.5')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.5')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et40.5" class="popup_window test_output" style="display:block;">
+                <div id="div_ft44.5" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et40.5').style.display='none'"><span
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 381, in test_perform_update
-    button.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;DialogFinished&#34; class=&#34;btn btn-default hidden&#34; type=&#34;button&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 359, in test_perform_update
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4225,63 +4225,28 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id="et40.6" class="none bg-info">
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <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_et40.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et40.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et40.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 318, in test_perform_update_stable_errors
-    performUpdate.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st40.7" class="none bg-warning">
+        <tr id="st44.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_st40.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st44.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st44.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_st40.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st44.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4295,7 +4260,7 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -4304,26 +4269,50 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id="ft40.9" class="none bg-danger">
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestUploadEPubs</td>
+        <td class="text-center">4</td>
+        <td class="text-center">3</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('c45', 4)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et45.1" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft40.9')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et45.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft40.9" class="popup_window test_output" style="display:block;">
+                <div id="div_et45.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft40.9').style.display='none'"><span
+                                onclick="document.getElementById('div_et45.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 409, in test_update_write_protect
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;message&#34;)))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 188, in test_upload_epub_cover
+    os.remove(&#39;cover_image.png&#39;)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4332,23 +4321,17 @@ AssertionError: False is not true</pre>
         </tr>
     
     
-
-
-    <tr id="su" class="passClass">
-        <td>TestUploadEPubs</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('c41', 2)">Detail</a>
-        </td>
-    </tr>
-
+    
+        <tr id='pt45.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+    
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4357,7 +4340,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4375,13 +4358,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 18)">Detail</a>
+            <a onclick="showClassDetail('c46', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4390,7 +4373,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4399,7 +4382,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4408,7 +4391,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4417,7 +4400,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4426,7 +4409,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4435,7 +4418,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4444,7 +4427,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4453,7 +4436,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4462,7 +4445,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4471,7 +4454,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4480,7 +4463,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4489,7 +4472,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4498,7 +4481,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4507,7 +4490,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4516,7 +4499,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4525,7 +4508,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4534,7 +4517,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4552,13 +4535,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 1)">Detail</a>
+            <a onclick="showClassDetail('c47', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4576,13 +4559,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 21)">Detail</a>
+            <a onclick="showClassDetail('c48', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4591,7 +4574,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4600,7 +4583,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4609,7 +4592,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4618,7 +4601,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4627,7 +4610,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4636,7 +4619,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4645,7 +4628,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4654,7 +4637,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4663,7 +4646,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4672,7 +4655,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4681,7 +4664,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4690,7 +4673,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4699,7 +4682,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4708,7 +4691,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4717,7 +4700,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4726,7 +4709,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt48.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4735,7 +4718,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt48.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4744,7 +4727,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.19' class='hiddenRow bg-success'>
+        <tr id='pt48.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4753,7 +4736,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.20' class='hiddenRow bg-success'>
+        <tr id='pt48.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4762,7 +4745,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.21' class='hiddenRow bg-success'>
+        <tr id='pt48.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4774,19 +4757,19 @@ AssertionError: False is not true</pre>
 
     <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
-        <td class="text-center">34</td>
-        <td class="text-center">34</td>
+        <td class="text-center">35</td>
+        <td class="text-center">35</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('c45', 34)">Detail</a>
+            <a onclick="showClassDetail('c49', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt49.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4795,7 +4778,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt49.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4804,7 +4787,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt49.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4813,7 +4796,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt49.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4822,7 +4805,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt49.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4831,7 +4814,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt49.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4840,7 +4823,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt49.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4849,7 +4832,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt49.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4858,7 +4841,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt49.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4867,7 +4850,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt49.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4876,7 +4859,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt49.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4885,7 +4868,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt49.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4894,7 +4877,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt49.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4903,7 +4886,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt49.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4912,7 +4895,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt49.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4921,7 +4904,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt49.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4930,7 +4913,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt49.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4939,7 +4922,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt49.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4948,7 +4931,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt49.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4957,7 +4940,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt49.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4966,7 +4949,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt49.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4975,7 +4958,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.22' class='hiddenRow bg-success'>
+        <tr id='pt49.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4984,7 +4967,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.23' class='hiddenRow bg-success'>
+        <tr id='pt49.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4993,7 +4976,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.24' class='hiddenRow bg-success'>
+        <tr id='pt49.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -5002,7 +4985,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.25' class='hiddenRow bg-success'>
+        <tr id='pt49.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -5011,7 +4994,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.26' class='hiddenRow bg-success'>
+        <tr id='pt49.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt49.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -5020,7 +5012,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.27' class='hiddenRow bg-success'>
+        <tr id='pt49.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -5029,7 +5021,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.28' class='hiddenRow bg-success'>
+        <tr id='pt49.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -5038,7 +5030,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.29' class='hiddenRow bg-success'>
+        <tr id='pt49.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -5047,7 +5039,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.30' class='hiddenRow bg-success'>
+        <tr id='pt49.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -5056,7 +5048,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.31' class='hiddenRow bg-success'>
+        <tr id='pt49.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -5065,7 +5057,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.32' class='hiddenRow bg-success'>
+        <tr id='pt49.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -5074,7 +5066,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.33' class='hiddenRow bg-success'>
+        <tr id='pt49.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -5083,7 +5075,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.34' class='hiddenRow bg-success'>
+        <tr id='pt49.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -5101,13 +5093,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 16)">Detail</a>
+            <a onclick="showClassDetail('c50', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt50.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -5116,7 +5108,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt50.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -5125,7 +5117,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt50.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -5134,7 +5126,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt50.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -5143,7 +5135,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt50.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -5152,7 +5144,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt50.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -5161,7 +5153,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt50.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -5170,7 +5162,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt50.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -5179,7 +5171,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt50.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -5188,7 +5180,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt50.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -5197,7 +5189,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt50.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -5206,7 +5198,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt50.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -5215,7 +5207,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt50.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -5224,7 +5216,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt50.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -5233,7 +5225,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt50.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -5242,7 +5234,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt50.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -5253,10 +5245,10 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>404</td>
-        <td>365</td>
-        <td>27</td>
-        <td>5</td>
+        <td>420</td>
+        <td>389</td>
+        <td>14</td>
+        <td>10</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5285,7 +5277,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-28-generic #31~20.04.1-Ubuntu SMP Wed Jan 19 14:08:10 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-40-generic #45~20.04.1-Ubuntu SMP Mon Apr 4 09:38:31 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -5295,15 +5287,21 @@ AssertionError: False is not true</pre>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>advocate</th>
+              <td>1.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>APScheduler</th>
-              <td>3.7.0</td>
+              <td>3.9.1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Babel</th>
-              <td>2.9.1</td>
+              <td>2.10.1</td>
               <td>Basic</td>
             </tr>
           
@@ -5321,7 +5319,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask</th>
-              <td>2.0.2</td>
+              <td>2.0.3</td>
               <td>Basic</td>
             </tr>
           
@@ -5333,7 +5331,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask-Login</th>
-              <td>0.5.0</td>
+              <td>0.6.0</td>
               <td>Basic</td>
             </tr>
           
@@ -5345,7 +5343,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask-WTF</th>
-              <td>1.0.0</td>
+              <td>1.0.1</td>
               <td>Basic</td>
             </tr>
           
@@ -5363,25 +5361,31 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Jinja2</th>
-              <td>3.0.3</td>
+              <td>3.1.1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>lxml</th>
-              <td>4.7.1</td>
+              <td>4.8.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>pyasn1</th>
+              <td>0.4.8</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>PyPDF3</th>
-              <td>1.0.5</td>
+              <td>1.0.6</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>pytz</th>
-              <td>2021.3</td>
+              <td>2022.1</td>
               <td>Basic</td>
             </tr>
           
@@ -5393,7 +5397,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.31</td>
+              <td>1.4.35</td>
               <td>Basic</td>
             </tr>
           
@@ -5405,7 +5409,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.3.2</td>
+              <td>1.3.4</td>
               <td>Basic</td>
             </tr>
           
@@ -5423,7 +5427,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5441,7 +5445,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5453,7 +5457,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5471,7 +5475,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5483,7 +5487,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5501,7 +5505,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5525,7 +5529,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5543,7 +5547,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5555,13 +5559,13 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.10.0</td>
+              <td>4.11.1</td>
               <td>TestLoadMetadata</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5579,7 +5583,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5591,19 +5595,19 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.10.0</td>
+              <td>4.11.1</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>scholarly</th>
-              <td>1.5.1</td>
+              <td>1.6.0</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5621,7 +5625,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5675,7 +5679,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask-Dance</th>
-              <td>5.1.0</td>
+              <td>6.0.0</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -5693,7 +5697,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(365, 27, 5, 7);
+    drawCircle(389, 14, 10, 7);
     showCase(5);
 </script>
 

From 2b03cae0171068fc2cac4514ce248e234a056d35 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 10:55:11 +0200
Subject: [PATCH 259/412] Bugfix scheduler end task

---
 cps/schedule.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 8b70da6a7..9bc248f16 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -63,7 +63,9 @@ def register_scheduled_tasks(reconnect=True):
 
         # Register scheduled tasks
         scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
-        scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=start) #  toDo
+        end_time = calclulate_end_time(start, duration)
+        scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=end_time.hour,
+                           minute=end_time.minute)
 
         # Kick-off tasks, if they should currently be running
         if should_task_be_running(start, duration):
@@ -88,4 +90,8 @@ def should_task_be_running(start, duration):
     start_time = datetime.datetime.now().replace(hour=start, minute=0, second=0, microsecond=0)
     end_time = start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
     return start_time < now < end_time
-    # return (start < end and start <= now < end) or (end < start and (now < end or start <= now ))
+
+def calclulate_end_time(start, duration):
+    start_time = datetime.datetime.now().replace(hour=start, minute=0)
+    return start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
+

From 9410b47144a4c78397701398e2c8f15ce2ebdc40 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 11:04:00 +0200
Subject: [PATCH 260/412] Refactored startup for compatibility with pyinstaller
 5.0

---
 cps.py                   |  77 +++---------------
 cps/__init__.py          |  84 ++++++++++++-------
 cps/admin.py             |   2 +-
 cps/cli.py               | 169 ++++++++++++++++++++-------------------
 cps/config_sql.py        |  32 ++++----
 cps/db.py                |   8 +-
 cps/editbooks.py         |  28 +++----
 cps/gdriveutils.py       |   9 ++-
 cps/main.py              |  71 ++++++++++++++++
 cps/tasks/mail.py        |   5 +-
 cps/templates/admin.html |   2 +-
 cps/ub.py                |   8 +-
 cps/updater.py           |  12 ++-
 setup.cfg                |   6 +-
 14 files changed, 283 insertions(+), 230 deletions(-)
 create mode 100644 cps/main.py

diff --git a/cps.py b/cps.py
index 55d9339c4..91bb1d74a 100755
--- a/cps.py
+++ b/cps.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 #  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-#    Copyright (C) 2012-2019  OzzieIsaacs
+#    Copyright (C) 2022 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
@@ -17,72 +17,19 @@
 #  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 sys
 import os
+import sys
 
+# Are we running from commandline?
+if __package__ == '':
+    # Add local path to sys.path so we can import cps
+    path = os.path.dirname(os.path.dirname(__file__))
+    sys.path.insert(0, path)
 
-# Insert local directories into path
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'vendor'))
-
-
-from cps import create_app
-from cps import web_server
-from cps.opds import opds
-from cps.web import web
-from cps.jinjia import jinjia
-from cps.about import about
-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.search_metadata import meta
-from cps.error_handler import init_errorhandler
-from cps.schedule import register_scheduled_tasks, register_startup_tasks
-
-try:
-    from cps.kobo import kobo, get_kobo_activated
-    from cps.kobo_auth import kobo_auth
-    kobo_available = get_kobo_activated()
-except (ImportError, AttributeError):   # Catch also error for not installed flask-WTF (missing csrf decorator)
-    kobo_available = False
-
-try:
-    from cps.oauth_bb import oauth
-    oauth_available = True
-except ImportError:
-    oauth_available = False
-
-
-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)
-    app.register_blueprint(meta)
-    app.register_blueprint(gdrive)
-    app.register_blueprint(EditBook)
-    if kobo_available:
-        app.register_blueprint(kobo)
-        app.register_blueprint(kobo_auth)
-    if oauth_available:
-        app.register_blueprint(oauth)
-
-    # Register scheduled tasks
-    register_scheduled_tasks()  # ToDo only reconnect if reconnect is enabled
-    register_startup_tasks()
-
-    success = web_server.start()
-    sys.exit(0 if success else 1)
-
+from cps.main import main as _main
 
 if __name__ == '__main__':
-    main()
+    _main()
+
+
+
diff --git a/cps/__init__.py b/cps/__init__.py
index 68947905d..269599ad1 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -19,8 +19,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
-__package__ = "cps"
-
 import sys
 import os
 import mimetypes
@@ -28,15 +26,23 @@ import mimetypes
 from babel import Locale as LC
 from babel import negotiate_locale
 from babel.core import UnknownLocaleError
-from flask import Flask, request, g
+from flask import request, g
+from flask import Flask
 from .MyLoginManager import MyLoginManager
 from flask_babel import Babel
 from flask_principal import Principal
 
-from . import config_sql, logger, cache_buster, cli, ub, db
+from . import config_sql
+from . import logger
+from . import cache_buster
+from .cli import CliParameter
+from .constants import CONFIG_DIR
+from . import ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
 from .dep_check import dependency_check
+from . import services
+from .updater import Updater
 
 try:
     import lxml
@@ -50,6 +56,7 @@ try:
 except ImportError:
     wtf_present = False
 
+
 mimetypes.init()
 mimetypes.add_type('application/xhtml+xml', '.xhtml')
 mimetypes.add_type('application/epub+zip', '.epub')
@@ -81,37 +88,55 @@ app.config.update(
 
 
 lm = MyLoginManager()
-lm.login_view = 'web.login'
-lm.anonymous_user = ub.Anonymous
-lm.session_protection = 'strong'
-
-if wtf_present:
-    csrf = CSRFProtect()
-    csrf.init_app(app)
-else:
-    csrf = None
-
-ub.init_db(cli.settings_path)
-# pylint: disable=no-member
-config = config_sql.load_configuration(ub.session)
-
-web_server = WebServer()
 
 babel = Babel()
 _BABEL_TRANSLATIONS = set()
 
 log = logger.create()
 
+config = config_sql._ConfigSQL()
 
-from . import services
-
-db.CalibreDB.update_config(config)
-db.CalibreDB.setup_db(config.config_calibre_dir, cli.settings_path)
+cli_param = CliParameter()
 
+if wtf_present:
+    csrf = CSRFProtect()
+else:
+    csrf = None
 
 calibre_db = db.CalibreDB()
 
+web_server = WebServer()
+
+updater_thread = Updater()
+
+
 def create_app():
+    lm.login_view = 'web.login'
+    lm.anonymous_user = ub.Anonymous
+    lm.session_protection = 'strong'
+
+    if csrf:
+        csrf.init_app(app)
+
+    cli_param.init()
+
+    ub.init_db(os.path.join(CONFIG_DIR, "app.db"), cli_param.user_credentials)
+
+    # ub.init_db(os.path.join(CONFIG_DIR, "app.db"))
+    # pylint: disable=no-member
+    config_sql.load_configuration(config, ub.session, cli_param)
+
+    db.CalibreDB.update_config(config)
+    db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
+    calibre_db.init_db()
+
+    updater_thread.init_updater(config, web_server)
+    # Perform dry run of updater and exit afterwards
+    if cli_param.dry_run:
+        updater_thread.dry_run()
+        sys.exit(0)
+    updater_thread.start()
+
     if sys.version_info < (3, 0):
         log.info(
             '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, please update your installation to Python3 ***')
@@ -156,7 +181,7 @@ def create_app():
         services.goodreads_support.connect(config.config_goodreads_api_key,
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
-    config.store_calibre_uuid(calibre_db, db.LibraryId)
+    config.store_calibre_uuid(calibre_db, db.Library_Id)
     return app
 
 
@@ -179,11 +204,8 @@ def get_locale():
     return negotiate_locale(preferred or ['en'], _BABEL_TRANSLATIONS)
 
 
-from .updater import Updater
-updater_thread = Updater()
+'''@babel.timezoneselector
+def get_timezone():
+    user = getattr(g, 'user', None)
+    return user.timezone if user else None'''
 
-# Perform dry run of updater and exit afterwards
-if cli.dry_run:
-    updater_thread.dry_run()
-    sys.exit(0)
-updater_thread.start()
diff --git a/cps/admin.py b/cps/admin.py
index 73442ef25..46da062e3 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1254,7 +1254,7 @@ def _db_configuration_update_helper():
         if not calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path):
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
                                             gdrive_error)
-        config.store_calibre_uuid(calibre_db, db.LibraryId)
+        config.store_calibre_uuid(calibre_db, db.Library_Id)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         if db_change:
             log.info("Calibre Database changed, all Calibre-Web info related to old Database gets deleted")
diff --git a/cps/cli.py b/cps/cli.py
index 629fd76d2..cf4f36fb0 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -31,96 +31,99 @@ def version_info():
         return "Calibre-Web version: %s - unkown git-clone" % _STABLE_VERSION['version']
     return "Calibre-Web version: %s -%s" % (_STABLE_VERSION['version'], _NIGHTLY_VERSION[1])
 
+class CliParameter(object):
 
-parser = argparse.ArgumentParser(description='Calibre Web is a web app'
-                                 ' providing a interface for browsing, reading and downloading eBooks\n', prog='cps.py')
-parser.add_argument('-p', metavar='path', help='path and name to settings db, e.g. /opt/cw.db')
-parser.add_argument('-g', metavar='path', help='path and name to gdrive db, e.g. /opt/gd.db')
-parser.add_argument('-c', metavar='path',
-                    help='path and name to SSL certfile, e.g. /opt/test.cert, works only in combination with keyfile')
-parser.add_argument('-k', metavar='path',
-                    help='path and name to SSL keyfile, e.g. /opt/test.key, works only in combination with certfile')
-parser.add_argument('-v', '--version', action='version', help='Shows version number and exits Calibre-Web',
-                    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 and exits Calibre-Web')
-parser.add_argument('-f', action='store_true', help='Flag is depreciated and will be removed in next version')
-parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
-parser.add_argument('-d', action='store_true', help='Dry run of updater to check file permissions in advance '
-                                                    'and exits Calibre-Web')
-parser.add_argument('-r', action='store_true', help='Enable public database reconnect route under /reconnect')
-args = parser.parse_args()
+    def init(self):
+        self.arg_parser()
 
-settings_path = args.p or os.path.join(_CONFIG_DIR, DEFAULT_SETTINGS_FILE)
-gd_path = args.g or os.path.join(_CONFIG_DIR, DEFAULT_GDRIVE_FILE)
+    def arg_parser(self):
+        parser = argparse.ArgumentParser(description='Calibre Web is a web app'
+                                                     ' providing a interface for browsing, reading and downloading eBooks\n',
+                                         prog='cps.py')
+        parser.add_argument('-p', metavar='path', help='path and name to settings db, e.g. /opt/cw.db')
+        parser.add_argument('-g', metavar='path', help='path and name to gdrive db, e.g. /opt/gd.db')
+        parser.add_argument('-c', metavar='path',
+                            help='path and name to SSL certfile, e.g. /opt/test.cert, works only in combination with keyfile')
+        parser.add_argument('-k', metavar='path',
+                            help='path and name to SSL keyfile, e.g. /opt/test.key, works only in combination with certfile')
+        parser.add_argument('-v', '--version', action='version', help='Shows version number and exits Calibre-Web',
+                            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 and exits Calibre-Web')
+        parser.add_argument('-f', action='store_true', help='Flag is depreciated and will be removed in next version')
+        parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
+        parser.add_argument('-d', action='store_true', help='Dry run of updater to check file permissions in advance '
+                                                            'and exits Calibre-Web')
+        parser.add_argument('-r', action='store_true', help='Enable public database reconnect route under /reconnect')
+        args = parser.parse_args()
 
-if os.path.isdir(settings_path):
-    settings_path = os.path.join(settings_path, DEFAULT_SETTINGS_FILE)
+        self.settings_path = args.p or os.path.join(_CONFIG_DIR, DEFAULT_SETTINGS_FILE)
+        self.gd_path = args.g or os.path.join(_CONFIG_DIR, DEFAULT_GDRIVE_FILE)
 
-if os.path.isdir(gd_path):
-    gd_path = os.path.join(gd_path, DEFAULT_GDRIVE_FILE)
+        if os.path.isdir(self.settings_path):
+            self.settings_path = os.path.join(self.settings_path, DEFAULT_SETTINGS_FILE)
+
+        if os.path.isdir(self.gd_path):
+            self.gd_path = os.path.join(self.gd_path, DEFAULT_GDRIVE_FILE)
 
 
-# handle and check parameter for ssl encryption
-certfilepath = None
-keyfilepath = None
-if args.c:
-    if os.path.isfile(args.c):
-        certfilepath = args.c
-    else:
-        print("Certfile path is invalid. Exiting...")
-        sys.exit(1)
-
-if args.c == "":
-    certfilepath = ""
-
-if args.k:
-    if os.path.isfile(args.k):
-        keyfilepath = args.k
-    else:
-        print("Keyfile path is invalid. Exiting...")
-        sys.exit(1)
-
-if (args.k and not args.c) or (not args.k and args.c):
-    print("Certfile and Keyfile have to be used together. Exiting...")
-    sys.exit(1)
-
-if args.k == "":
-    keyfilepath = ""
-
-
-# dry run updater
-dry_run = args.d or None
-# enable reconnect endpoint for docker database reconnect
-reconnect_enable = args.r or os.environ.get("CALIBRE_RECONNECT", None)
-# load covers from localhost
-allow_localhost = args.l or os.environ.get("CALIBRE_LOCALHOST", None)
-# handle and check ip address argument
-ip_address = args.i or None
-
-
-if ip_address:
-    try:
-        # try to parse the given ip address with socket
-        if hasattr(socket, 'inet_pton'):
-            if ':' in ip_address:
-                socket.inet_pton(socket.AF_INET6, ip_address)
+        # handle and check parameter for ssl encryption
+        self.certfilepath = None
+        self.keyfilepath = None
+        if args.c:
+            if os.path.isfile(args.c):
+                self.certfilepath = args.c
             else:
-                socket.inet_pton(socket.AF_INET, ip_address)
-        else:
-            # on windows python < 3.4, inet_pton is not available
-            # inet_atom only handles IPv4 addresses
-            socket.inet_aton(ip_address)
-    except socket.error as err:
-        print(ip_address, ':', err)
-        sys.exit(1)
+                print("Certfile path is invalid. Exiting...")
+                sys.exit(1)
 
-# handle and check user password argument
-user_credentials = args.s or None
-if user_credentials and ":" not in user_credentials:
-    print("No valid 'username:password' format")
-    sys.exit(3)
+        if args.c == "":
+            self.certfilepath = ""
 
-if args.f:
-    print("Warning: -f flag is depreciated and will be removed in next version")
+        if args.k:
+            if os.path.isfile(args.k):
+                self.keyfilepath = args.k
+            else:
+                print("Keyfile path is invalid. Exiting...")
+                sys.exit(1)
 
+        if (args.k and not args.c) or (not args.k and args.c):
+            print("Certfile and Keyfile have to be used together. Exiting...")
+            sys.exit(1)
+
+        if args.k == "":
+            self.keyfilepath = ""
+
+        # dry run updater
+        self.dry_run =args.d or None
+        # enable reconnect endpoint for docker database reconnect
+        self.reconnect_enable = args.r or os.environ.get("CALIBRE_RECONNECT", None)
+        # load covers from localhost
+        self.allow_localhost = args.l or os.environ.get("CALIBRE_LOCALHOST", None)
+        # handle and check ip address argument
+        self.ip_address = args.i or None
+        if self.ip_address:
+            try:
+                # try to parse the given ip address with socket
+                if hasattr(socket, 'inet_pton'):
+                    if ':' in self.ip_address:
+                        socket.inet_pton(socket.AF_INET6, self.ip_address)
+                    else:
+                        socket.inet_pton(socket.AF_INET, self.ip_address)
+                else:
+                    # on windows python < 3.4, inet_pton is not available
+                    # inet_atom only handles IPv4 addresses
+                    socket.inet_aton(self.ip_address)
+            except socket.error as err:
+                print(self.ip_address, ':', err)
+                sys.exit(1)
+
+        # handle and check user password argument
+        self.user_credentials = args.s or None
+        if self.user_credentials and ":" not in self.user_credentials:
+            print("No valid 'username:password' format")
+            sys.exit(3)
+
+        if args.f:
+            print("Warning: -f flag is depreciated and will be removed in next version")
diff --git a/cps/config_sql.py b/cps/config_sql.py
index f4fbb5540..e20f7ac2c 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -29,7 +29,7 @@ try:
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
 
-from . import constants, cli, logger
+from . import constants, logger
 
 
 log = logger.create()
@@ -154,12 +154,16 @@ class _Settings(_Base):
 # Class holds all application specific settings in calibre-web
 class _ConfigSQL(object):
     # pylint: disable=no-member
-    def __init__(self, session):
+    def __init__(self):
+        pass
+
+    def init_config(self, session, cli):
         self._session = session
         self._settings = None
         self.db_configured = None
         self.config_calibre_dir = None
         self.load()
+        self.cli = cli
 
         change = False
         if self.config_converterpath == None:  # pylint: disable=access-member-before-definition
@@ -184,22 +188,21 @@ class _ConfigSQL(object):
         return self._settings
 
     def get_config_certfile(self):
-        if cli.certfilepath:
-            return cli.certfilepath
-        if cli.certfilepath == "":
+        if self.cli.certfilepath:
+            return self.cli.certfilepath
+        if self.cli.certfilepath == "":
             return None
         return self.config_certfile
 
     def get_config_keyfile(self):
-        if cli.keyfilepath:
-            return cli.keyfilepath
-        if cli.certfilepath == "":
+        if self.cli.keyfilepath:
+            return self.cli.keyfilepath
+        if self.cli.certfilepath == "":
             return None
         return self.config_keyfile
 
-    @staticmethod
-    def get_config_ipaddress():
-        return cli.ip_address or ""
+    def get_config_ipaddress(self):
+        return self.cli.ip_address or ""
 
     def _has_role(self, role_flag):
         return constants.has_flag(self.config_default_role, role_flag)
@@ -449,14 +452,15 @@ def _migrate_database(session):
     _migrate_table(session, _Flask_Settings)
 
 
-def load_configuration(session):
+def load_configuration(conf, session, cli):
     _migrate_database(session)
 
     if not session.query(_Settings).count():
         session.add(_Settings())
         session.commit()
-    conf = _ConfigSQL(session)
-    return conf
+    # conf = _ConfigSQL()
+    conf.init_config(session, cli)
+    # return conf
 
 def get_flask_session_key(_session):
     flask_settings = _session.query(_Flask_Settings).one_or_none()
diff --git a/cps/db.py b/cps/db.py
index 9f6440aac..69796c517 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -89,7 +89,7 @@ books_publishers_link = Table('books_publishers_link', Base.metadata,
                               )
 
 
-class LibraryId(Base):
+class Library_Id(Base):
     __tablename__ = 'library_id'
     id = Column(Integer, primary_key=True)
     uuid = Column(String, nullable=False)
@@ -440,10 +440,12 @@ class CalibreDB:
     # instances alive once they reach the end of their respective scopes
     instances = WeakSet()
 
-    def __init__(self, expire_on_commit=True):
+    def __init__(self):
         """ Initialize a new CalibreDB session
         """
         self.session = None
+
+    def init_db(self, expire_on_commit=True):
         if self._init:
             self.init_session(expire_on_commit)
 
@@ -543,7 +545,7 @@ class CalibreDB:
                 connection.execute(text("attach database '{}' as app_settings;".format(app_db_path)))
                 local_session = scoped_session(sessionmaker())
                 local_session.configure(bind=connection)
-                database_uuid = local_session().query(LibraryId).one_or_none()
+                database_uuid = local_session().query(Library_Id).one_or_none()
                 # local_session.dispose()
 
             check_engine.connect()
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 768f18303..9ac1557bf 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -49,7 +49,7 @@ from .usermanagement import login_required_if_no_ano
 from .kobo_sync_status import change_archived_books
 
 
-EditBook = Blueprint('edit-book', __name__)
+editbook = Blueprint('edit-book', __name__)
 log = logger.create()
 
 
@@ -228,14 +228,14 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
     return changed, error
 
 
-@EditBook.route("/ajax/delete/<int:book_id>", methods=["POST"])
+@editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
 @login_required
 def delete_book_from_details(book_id):
     return Response(delete_book_from_table(book_id, "", True), mimetype='application/json')
 
 
-@EditBook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
-@EditBook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
+@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
+@editbook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
 @login_required
 def delete_book_ajax(book_id, book_format):
     return delete_book_from_table(book_id, book_format, False)
@@ -743,14 +743,14 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     return input_authors, change, renamed
 
 
-@EditBook.route("/admin/book/<int:book_id>", methods=['GET'])
+@editbook.route("/admin/book/<int:book_id>", methods=['GET'])
 @login_required_if_no_ano
 @edit_required
 def show_edit_book(book_id):
     return render_edit_book(book_id)
 
 
-@EditBook.route("/admin/book/<int:book_id>", methods=['POST'])
+@editbook.route("/admin/book/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_book(book_id):
@@ -1084,7 +1084,7 @@ def move_coverfile(meta, db_book):
               category="error")
 
 
-@EditBook.route("/upload", methods=["POST"])
+@editbook.route("/upload", methods=["POST"])
 @login_required_if_no_ano
 @upload_required
 def upload():
@@ -1153,7 +1153,7 @@ def upload():
         return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
 
 
-@EditBook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
+@editbook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def convert_bookformat(book_id):
@@ -1178,7 +1178,7 @@ def convert_bookformat(book_id):
     return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
 
-@EditBook.route("/ajax/getcustomenum/<int:c_id>")
+@editbook.route("/ajax/getcustomenum/<int:c_id>")
 @login_required
 def table_get_custom_enum(c_id):
     ret = list()
@@ -1191,7 +1191,7 @@ def table_get_custom_enum(c_id):
     return json.dumps(ret)
 
 
-@EditBook.route("/ajax/editbooks/<param>", methods=['POST'])
+@editbook.route("/ajax/editbooks/<param>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_list_book(param):
@@ -1303,7 +1303,7 @@ def edit_list_book(param):
     return ret
 
 
-@EditBook.route("/ajax/sort_value/<field>/<int:bookid>")
+@editbook.route("/ajax/sort_value/<field>/<int:bookid>")
 @login_required
 def get_sorted_entry(field, bookid):
     if field in ['title', 'authors', 'sort', 'author_sort']:
@@ -1320,7 +1320,7 @@ def get_sorted_entry(field, bookid):
     return ""
 
 
-@EditBook.route("/ajax/simulatemerge", methods=['POST'])
+@editbook.route("/ajax/simulatemerge", methods=['POST'])
 @login_required
 @edit_required
 def simulate_merge_list_book():
@@ -1336,7 +1336,7 @@ def simulate_merge_list_book():
     return ""
 
 
-@EditBook.route("/ajax/mergebooks", methods=['POST'])
+@editbook.route("/ajax/mergebooks", methods=['POST'])
 @login_required
 @edit_required
 def merge_list_book():
@@ -1374,7 +1374,7 @@ def merge_list_book():
     return ""
 
 
-@EditBook.route("/ajax/xchange", methods=['POST'])
+@editbook.route("/ajax/xchange", methods=['POST'])
 @login_required
 @edit_required
 def table_xchange_author_title():
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index ee8ee9537..9990e3db0 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -63,7 +63,7 @@ except ImportError as err:
         importError = err
         gdrive_support = False
 
-from . import logger, cli, config
+from . import logger, cli_param, config
 from .constants import CONFIG_DIR as _CONFIG_DIR
 
 
@@ -142,7 +142,7 @@ def is_gdrive_ready():
     return os.path.exists(SETTINGS_YAML) and os.path.exists(CREDENTIALS)
 
 
-engine = create_engine('sqlite:///{0}'.format(cli.gd_path), echo=False)
+engine = create_engine('sqlite:///{0}'.format(cli_param.gd_path), echo=False)
 Base = declarative_base()
 
 # Open session for database connection
@@ -190,11 +190,11 @@ def migrate():
                 session.execute('ALTER TABLE gdrive_ids2 RENAME to gdrive_ids')
             break
 
-if not os.path.exists(cli.gd_path):
+if not os.path.exists(cli_param.gd_path):
     try:
         Base.metadata.create_all(engine)
     except Exception as ex:
-        log.error("Error connect to database: {} - {}".format(cli.gd_path, ex))
+        log.error("Error connect to database: {} - {}".format(cli_param.gd_path, ex))
         raise
 migrate()
 
@@ -544,6 +544,7 @@ def deleteDatabaseOnChange():
     except (OperationalError, InvalidRequestError) as ex:
         session.rollback()
         log.error_or_exception('Database error: {}'.format(ex))
+        session.rollback()
 
 
 def updateGdriveCalibreFromLocal():
diff --git a/cps/main.py b/cps/main.py
new file mode 100644
index 000000000..b960028e0
--- /dev/null
+++ b/cps/main.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2012-2022 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 sys
+
+from . import create_app
+from .jinjia import jinjia
+from .shelf import shelf
+from .remotelogin import remotelogin
+from .search_metadata import meta
+from .error_handler import init_errorhandler
+
+try:
+    from kobo import kobo, get_kobo_activated
+    from kobo_auth import kobo_auth
+    kobo_available = get_kobo_activated()
+except (ImportError, AttributeError):   # Catch also error for not installed flask-WTF (missing csrf decorator)
+    kobo_available = False
+
+try:
+    from oauth_bb import oauth
+    oauth_available = True
+except ImportError:
+    oauth_available = False
+
+
+def main():
+    app = create_app()
+
+    from .web import web
+    from .opds import opds
+    from .admin import admi
+    from .gdrive import gdrive
+    from .editbooks import editbook
+    from .about import about
+
+    from . import web_server
+    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)
+    app.register_blueprint(meta)
+    app.register_blueprint(gdrive)
+    app.register_blueprint(editbook)
+    if kobo_available:
+        app.register_blueprint(kobo)
+        app.register_blueprint(kobo_auth)
+    if oauth_available:
+        app.register_blueprint(oauth)
+    success = web_server.start()
+    sys.exit(0 if success else 1)
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index ad38a400d..be240c795 100755
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -24,11 +24,10 @@ import mimetypes
 
 from io import StringIO
 from email.message import EmailMessage
-from email.utils import parseaddr
-
+from email.utils import formatdate, parseaddr
+from email.generator import Generator
 from flask_babel import lazy_gettext as N_
 from email.utils import formatdate
-from email.generator import Generator
 
 from cps.services.worker import CalibreTask
 from cps.services import gmail
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 8a20b73e8..f1c3749a6 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -210,7 +210,7 @@
 
   <div class="row">
     <div class="col">
-      <h2>{{_('Update')}}</h2>
+      <h2>{{_('Version Information')}}</h2>
       <table class="table table-striped" id="update_table">
         <thead>
           <tr>
diff --git a/cps/ub.py b/cps/ub.py
index 0360b5727..fdeff2bc7 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -53,7 +53,7 @@ except ImportError:
 from sqlalchemy.orm import backref, relationship, sessionmaker, Session, scoped_session
 from werkzeug.security import generate_password_hash
 
-from . import constants, logger, cli
+from . import constants, logger
 
 log = logger.create()
 
@@ -816,7 +816,7 @@ def init_db_thread():
     return Session()
 
 
-def init_db(app_db_path):
+def init_db(app_db_path, user_credentials=None):
     # Open session for database connection
     global session
     global app_DB_path
@@ -837,8 +837,8 @@ def init_db(app_db_path):
         create_admin_user(session)
         create_anonymous_user(session)
 
-    if cli.user_credentials:
-        username, password = cli.user_credentials.split(':', 1)
+    if user_credentials:
+        username, password = user_credentials.split(':', 1)
         user = session.query(User).filter(func.lower(User.name) == username.lower()).first()
         if user:
             if not password:
diff --git a/cps/updater.py b/cps/updater.py
index 021df0056..f651719eb 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -31,7 +31,7 @@ import requests
 from babel.dates import format_datetime
 from flask_babel import gettext as _
 
-from . import constants, logger, config, web_server
+from . import constants, logger  #  config, web_server
 
 
 log = logger.create()
@@ -58,13 +58,17 @@ class Updater(threading.Thread):
         self.status = -1
         self.updateIndex = None
 
+    def init_updater(self, config, web_server):
+        self.config = config
+        self.web_server = web_server
+
     def get_current_version_info(self):
-        if config.config_updatechannel == constants.UPDATE_STABLE:
+        if self.config.config_updatechannel == constants.UPDATE_STABLE:
             return self._stable_version_info()
         return self._nightly_version_info()
 
     def get_available_updates(self, request_method, locale):
-        if config.config_updatechannel == constants.UPDATE_STABLE:
+        if self.config.config_updatechannel == constants.UPDATE_STABLE:
             return self._stable_available_updates(request_method)
         return self._nightly_available_updates(request_method, locale)
 
@@ -95,7 +99,7 @@ class Updater(threading.Thread):
                 self.status = 6
                 log.debug(u'Preparing restart of server')
                 time.sleep(2)
-                web_server.stop(True)
+                self.web_server.stop(True)
                 self.status = 7
                 time.sleep(2)
                 return True
diff --git a/setup.cfg b/setup.cfg
index 5e4278497..9daae0c9a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -54,7 +54,7 @@ install_requires =
 	tornado>=4.1,<6.2
 	Wand>=0.4.4,<0.7.0
 	unidecode>=0.04.19,<1.4.0
-	lxml>=3.8.0,<4.8.0
+	lxml>=3.8.0,<4.9.0
 	flask-wtf>=0.14.2,<1.1.0
 	chardet>=3.0.0,<4.1.0
 	advocate>=1.0.0,<1.1.0
@@ -62,7 +62,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.44.0
+	google-api-python-client>=1.7.11,<2.46.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -75,7 +75,7 @@ gdrive =
 	rsa>=3.4.2,<4.9.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.6.0
-	google-api-python-client>=1.7.11,<2.44.0
+	google-api-python-client>=1.7.11,<2.46.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From e7464f26948bc6695b99de5420fc035e5ba6b12b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 11:28:20 +0200
Subject: [PATCH 261/412] Refactored web.py to shrink size of file

---
 cps/__init__.py                |  85 ++-----
 cps/about.py                   |   2 +-
 cps/admin.py                   |  22 +-
 cps/babel.py                   |  30 +++
 cps/db.py                      |   2 +-
 cps/editbooks.py               |   3 +-
 cps/error_handler.py           |   1 +
 cps/gdriveutils.py             |   5 -
 cps/helper.py                  |  64 +----
 cps/isoLanguages.py            |   2 +-
 cps/main.py                    |   6 +-
 cps/oauth.py                   |  14 +-
 cps/opds.py                    |   5 +-
 cps/redirect.py                |   1 -
 cps/render_template.py         |   3 +-
 cps/search.py                  | 422 +++++++++++++++++++++++++++++++++
 cps/search_metadata.py         |   6 +-
 cps/tasks/convert.py           |   6 +-
 cps/tasks/thumbnail.py         |   9 +-
 cps/tasks_status.py            |  95 ++++++++
 cps/templates/layout.html      |   6 +-
 cps/templates/search_form.html |   2 +-
 cps/templates/tasks.html       |   2 +-
 cps/ub.py                      |   2 +-
 cps/updater.py                 |   2 +-
 cps/uploader.py                |  27 +--
 cps/web.py                     | 396 ++-----------------------------
 27 files changed, 639 insertions(+), 581 deletions(-)
 create mode 100644 cps/babel.py
 create mode 100644 cps/search.py
 create mode 100644 cps/tasks_status.py

diff --git a/cps/__init__.py b/cps/__init__.py
index 269599ad1..0a452b17d 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -23,32 +23,22 @@ import sys
 import os
 import mimetypes
 
-from babel import Locale as LC
-from babel import negotiate_locale
-from babel.core import UnknownLocaleError
-from flask import request, g
 from flask import Flask
 from .MyLoginManager import MyLoginManager
-from flask_babel import Babel
 from flask_principal import Principal
 
-from . import config_sql
-from . import logger
-from . import cache_buster
 from .cli import CliParameter
 from .constants import CONFIG_DIR
-from . import ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
 from .dep_check import dependency_check
 from . import services
 from .updater import Updater
-
-try:
-    import lxml
-    lxml_present = True
-except ImportError:
-    lxml_present = False
+from .babel import babel, BABEL_TRANSLATIONS
+from . import config_sql
+from . import logger
+from . import cache_buster
+from . import ub, db
 
 try:
     from flask_wtf.csrf import CSRFProtect
@@ -78,6 +68,8 @@ mimetypes.add_type('application/ogg', '.oga')
 mimetypes.add_type('text/css', '.css')
 mimetypes.add_type('text/javascript; charset=UTF-8', '.js')
 
+log = logger.create()
+
 app = Flask(__name__)
 app.config.update(
     SESSION_COOKIE_HTTPONLY=True,
@@ -86,14 +78,8 @@ app.config.update(
     WTF_CSRF_SSL_STRICT=False
 )
 
-
 lm = MyLoginManager()
 
-babel = Babel()
-_BABEL_TRANSLATIONS = set()
-
-log = logger.create()
-
 config = config_sql._ConfigSQL()
 
 cli_param = CliParameter()
@@ -120,9 +106,8 @@ def create_app():
 
     cli_param.init()
 
-    ub.init_db(os.path.join(CONFIG_DIR, "app.db"), cli_param.user_credentials)
+    ub.init_db(cli_param.settings_path, cli_param.user_credentials)
 
-    # ub.init_db(os.path.join(CONFIG_DIR, "app.db"))
     # pylint: disable=no-member
     config_sql.load_configuration(config, ub.session, cli_param)
 
@@ -139,26 +124,26 @@ def create_app():
 
     if sys.version_info < (3, 0):
         log.info(
-            '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, please update your installation to Python3 ***')
+            '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, '
+            'please update your installation to Python3 ***')
         print(
-            '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, please update your installation to Python3 ***')
+            '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, '
+            'please update your installation to Python3 ***')
         web_server.stop(True)
         sys.exit(5)
-    if not lxml_present:
-        log.info('*** "lxml" is needed for calibre-web to run. Please install it using pip: "pip install lxml" ***')
-        print('*** "lxml" is needed for calibre-web to run. Please install it using pip: "pip install lxml" ***')
-        web_server.stop(True)
-        sys.exit(6)
     if not wtf_present:
-        log.info('*** "flask-WTF" is needed for calibre-web to run. Please install it using pip: "pip install flask-WTF" ***')
-        print('*** "flask-WTF" is needed for calibre-web to run. Please install it using pip: "pip install flask-WTF" ***')
+        log.info('*** "flask-WTF" is needed for calibre-web to run. '
+                 'Please install it using pip: "pip install flask-WTF" ***')
+        print('*** "flask-WTF" is needed for calibre-web to run. '
+              'Please install it using pip: "pip install flask-WTF" ***')
         web_server.stop(True)
         sys.exit(7)
     for res in dependency_check() + dependency_check(True):
-        log.info('*** "{}" version does not fit the requirements. Should: {}, Found: {}, please consider installing required version ***'
-            .format(res['name'],
-                 res['target'],
-                 res['found']))
+        log.info('*** "{}" version does not fit the requirements. '
+                 'Should: {}, Found: {}, please consider installing required version ***'
+                 .format(res['name'],
+                         res['target'],
+                         res['found']))
     app.wsgi_app = ReverseProxied(app.wsgi_app)
 
     if os.environ.get('FLASK_DEBUG'):
@@ -172,8 +157,8 @@ def create_app():
     web_server.init_app(app, config)
 
     babel.init_app(app)
-    _BABEL_TRANSLATIONS.update(str(item) for item in babel.list_translations())
-    _BABEL_TRANSLATIONS.add('en')
+    BABEL_TRANSLATIONS.update(str(item) for item in babel.list_translations())
+    BABEL_TRANSLATIONS.add('en')
 
     if services.ldap:
         services.ldap.init_app(app, config)
@@ -185,27 +170,3 @@ def create_app():
     return app
 
 
-@babel.localeselector
-def get_locale():
-    # if a user is logged in, use the locale from the user settings
-    user = getattr(g, 'user', None)
-    if user is not None and hasattr(user, "locale"):
-        if user.name != 'Guest':   # if the account is the guest account bypass the config lang settings
-            return user.locale
-
-    preferred = list()
-    if request.accept_languages:
-        for x in request.accept_languages.values():
-            try:
-                preferred.append(str(LC.parse(x.replace('-', '_'))))
-            except (UnknownLocaleError, ValueError) as e:
-                log.debug('Could not parse locale "%s": %s', x, e)
-
-    return negotiate_locale(preferred or ['en'], _BABEL_TRANSLATIONS)
-
-
-'''@babel.timezoneselector
-def get_timezone():
-    user = getattr(g, 'user', None)
-    return user.timezone if user else None'''
-
diff --git a/cps/about.py b/cps/about.py
index 92dc41aac..1b68818dd 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -65,7 +65,7 @@ _VERSIONS = OrderedDict(
     SQLite=sqlite3.sqlite_version,
 )
 _VERSIONS.update(ret)
-_VERSIONS.update(uploader.get_versions(False))
+_VERSIONS.update(uploader.get_versions())
 
 
 def collect_stats():
diff --git a/cps/admin.py b/cps/admin.py
index 46da062e3..29f2319e7 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -28,11 +28,10 @@ import operator
 from datetime import datetime, timedelta, time
 from functools import wraps
 
-from babel import Locale
-from babel.dates import format_datetime, format_time, format_timedelta
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
 from flask_login import login_required, current_user, logout_user, confirm_login
 from flask_babel import gettext as _
+from flask_babel import get_locale,  format_time, format_datetime, format_timedelta
 from flask import session as flask_session
 from sqlalchemy import and_
 from sqlalchemy.orm.attributes import flag_modified
@@ -40,14 +39,14 @@ from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
 from . import constants, logger, helper, services, cli
-from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, \
+from . import db, calibre_db, ub, web_server, config, updater_thread, babel, gdriveutils, \
     kobo_sync_status, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username, update_thumbnail_cache
 from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from .services.worker import WorkerThread
-from . import debug_info, _BABEL_TRANSLATIONS
+from . import debug_info, BABEL_TRANSLATIONS
 
 
 log = logger.create()
@@ -205,9 +204,9 @@ def admin():
 
     all_user = ub.session.query(ub.User).all()
     email_settings = config.get_mail_settings()
-    schedule_time = format_time(time(hour=config.schedule_start_time), format="short", locale=locale)
+    schedule_time = format_time(time(hour=config.schedule_start_time), format="short")
     t = timedelta(hours=config.schedule_duration // 60, minutes=config.schedule_duration % 60)
-    schedule_duration = format_timedelta(t, format="short", threshold=.99, locale=locale)
+    schedule_duration = format_timedelta(t, threshold=.99)
 
     return render_title_template("admin.html", allUser=all_user, email=email_settings, config=config, commit=commit,
                                  feature_support=feature_support, schedule_time=schedule_time,
@@ -279,7 +278,7 @@ def view_configuration():
 def edit_user_table():
     visibility = current_user.view_settings.get('useredit', {})
     languages = calibre_db.speaking_language()
-    translations = babel.list_translations() + [Locale('en')]
+    translations = [LC('en')] + babel.list_translations()
     all_user = ub.session.query(ub.User)
     tags = calibre_db.session.query(db.Tags)\
         .join(db.books_tags_link)\
@@ -398,7 +397,7 @@ def delete_user():
 @login_required
 @admin_required
 def table_get_locale():
-    locale = babel.list_translations() + [Locale('en')]
+    locale = [LC('en')] + babel.list_translations()
     ret = list()
     current_locale = get_locale()
     for loc in locale:
@@ -499,7 +498,7 @@ def edit_list_user(param):
                 elif param == 'locale':
                     if user.name == "Guest":
                         raise Exception(_("Guest's Locale is determined automatically and can't be set"))
-                    if vals['value'] in _BABEL_TRANSLATIONS:
+                    if vals['value'] in BABEL_TRANSLATIONS:
                         user.locale = vals['value']
                     else:
                         raise Exception(_("No Valid Locale Given"))
@@ -1668,12 +1667,11 @@ def edit_scheduledtasks():
     time_field = list()
     duration_field = list()
 
-    locale = get_locale()
     for n in range(24):
-        time_field.append((n , format_time(time(hour=n), format="short", locale=locale)))
+        time_field.append((n , format_time(time(hour=n), format="short",)))
     for n in range(5, 65, 5):
         t = timedelta(hours=n // 60, minutes=n % 60)
-        duration_field.append((n, format_timedelta(t, format="short", threshold=.99, locale=locale)))
+        duration_field.append((n, format_timedelta(t, threshold=.9)))
 
     return render_title_template("schedule_edit.html", config=content, starttime=time_field, duration=duration_field, title=_(u"Edit Scheduled Tasks Settings"))
 
diff --git a/cps/babel.py b/cps/babel.py
new file mode 100644
index 000000000..b0d5c238f
--- /dev/null
+++ b/cps/babel.py
@@ -0,0 +1,30 @@
+from babel import Locale as LC
+from babel import negotiate_locale
+from flask_babel import Babel
+from babel.core import UnknownLocaleError
+from flask import request, g
+
+from . import logger
+
+log = logger.create()
+
+babel = Babel()
+BABEL_TRANSLATIONS = set()
+
+@babel.localeselector
+def get_locale():
+    # if a user is logged in, use the locale from the user settings
+    user = getattr(g, 'user', None)
+    if user is not None and hasattr(user, "locale"):
+        if user.name != 'Guest':   # if the account is the guest account bypass the config lang settings
+            return user.locale
+
+    preferred = list()
+    if request.accept_languages:
+        for x in request.accept_languages.values():
+            try:
+                preferred.append(str(LC.parse(x.replace('-', '_'))))
+            except (UnknownLocaleError, ValueError) as e:
+                log.debug('Could not parse locale "%s": %s', x, e)
+
+    return negotiate_locale(preferred or ['en'], BABEL_TRANSLATIONS)
diff --git a/cps/db.py b/cps/db.py
index 69796c517..f28baeca5 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -43,6 +43,7 @@ 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 flask_babel import gettext as _
+from flask_babel import get_locale
 from flask import flash
 
 from . import logger, ub, isoLanguages
@@ -898,7 +899,6 @@ class CalibreDB:
 
     # Creates for all stored languages a translated speaking name in the array for the UI
     def speaking_language(self, languages=None, return_all_languages=False, with_count=False, reverse_order=False):
-        from . import get_locale
 
         if with_count:
             if not languages:
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 9ac1557bf..3ac3dfb8c 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -36,11 +36,12 @@ except ImportError:
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
+from flask_babel import get_locale
 from flask_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError
 # from sqlite3 import OperationalError as sqliteOperationalError
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status
-from . import config, get_locale, ub, db
+from . import config, ub, db
 from . import calibre_db
 from .services.worker import WorkerThread
 from .tasks.upload import TaskUpload
diff --git a/cps/error_handler.py b/cps/error_handler.py
index 67252a660..7c003bdb3 100644
--- a/cps/error_handler.py
+++ b/cps/error_handler.py
@@ -17,6 +17,7 @@
 #  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:
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 9990e3db0..e2e0a5361 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -680,8 +680,3 @@ def get_error_text(client_secrets=None):
         return 'Callback url (redirect url) is missing in client_secrets.json'
     if client_secrets:
         client_secrets.update(filedata['web'])
-
-
-def get_versions():
-    return { # 'six': six_version,
-            'httplib2': httplib2_version}
diff --git a/cps/helper.py b/cps/helper.py
index d97d6475f..aec146681 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -29,11 +29,11 @@ from tempfile import gettempdir
 import requests
 import unidecode
 
-from babel.dates import format_datetime
-from babel.units import format_unit
+
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
+from flask_babel import format_datetime, get_locale
 from flask_login import current_user
 from sqlalchemy.sql.expression import true, false, and_, or_, text, func
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -54,7 +54,7 @@ except ImportError:
 
 from . import calibre_db, cli
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub, fs
+from . import logger, config, db, ub, fs
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
@@ -970,64 +970,6 @@ def json_serial(obj):
     raise TypeError("Type %s not serializable" % type(obj))
 
 
-# helper function for displaying the runtime of tasks
-def format_runtime(runtime):
-    ret_val = ""
-    if runtime.days:
-        ret_val = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
-    mins, seconds = divmod(runtime.seconds, 60)
-    hours, minutes = divmod(mins, 60)
-    # ToDo: locale.number_symbols._data['timeSeparator'] -> localize time separator ?
-    if hours:
-        ret_val += '{:d}:{:02d}:{:02d}s'.format(hours, minutes, seconds)
-    elif minutes:
-        ret_val += '{:2d}:{:02d}s'.format(minutes, seconds)
-    else:
-        ret_val += '{:2d}s'.format(seconds)
-    return ret_val
-
-
-# helper function to apply localize status information in tasklist entries
-def render_task_status(tasklist):
-    renderedtasklist = list()
-    for __, user, __, task, __ in tasklist:
-        if user == current_user.name 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:
-                    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')
-                elif task.stat == STAT_ENDED:
-                    ret['status'] = _(u'Ended')
-                elif task.stat == STAT_CANCELLED:
-                    ret['status'] = _(u'Cancelled')
-                else:
-                    ret['status'] = _(u'Unknown Status')
-
-            ret['taskMessage'] = "{}: {}".format(task.name, task.message) if task.message else task.name
-            ret['progress'] = "{} %".format(int(task.progress * 100))
-            ret['user'] = escape(user)  # prevent xss
-
-            # Hidden fields
-            ret['task_id'] = task.id
-            ret['stat'] = task.stat
-            ret['is_cancellable'] = task.is_cancellable
-
-            renderedtasklist.append(ret)
-
-    return renderedtasklist
-
-
 def tags_filters():
     negtags_list = current_user.list_denied_tags()
     postags_list = current_user.list_allowed_tags()
diff --git a/cps/isoLanguages.py b/cps/isoLanguages.py
index 50447aca7..31e3dade3 100644
--- a/cps/isoLanguages.py
+++ b/cps/isoLanguages.py
@@ -49,7 +49,7 @@ except ImportError:
 
 
 def get_language_names(locale):
-    return _LANGUAGE_NAMES.get(locale)
+    return _LANGUAGE_NAMES.get(str(locale))
 
 
 def get_language_name(locale, lang_code):
diff --git a/cps/main.py b/cps/main.py
index b960028e0..304a244ae 100644
--- a/cps/main.py
+++ b/cps/main.py
@@ -24,6 +24,7 @@ from .shelf import shelf
 from .remotelogin import remotelogin
 from .search_metadata import meta
 from .error_handler import init_errorhandler
+from .tasks_status import tasks
 
 try:
     from kobo import kobo, get_kobo_activated
@@ -48,16 +49,19 @@ def main():
     from .gdrive import gdrive
     from .editbooks import editbook
     from .about import about
+    from .search import search
 
     from . import web_server
     init_errorhandler()
 
+    app.register_blueprint(search)
+    app.register_blueprint(tasks)
     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(admi)
     app.register_blueprint(remotelogin)
     app.register_blueprint(meta)
     app.register_blueprint(gdrive)
diff --git a/cps/oauth.py b/cps/oauth.py
index f8e5c1fd3..0caa61ec5 100644
--- a/cps/oauth.py
+++ b/cps/oauth.py
@@ -19,18 +19,12 @@
 from flask import session
 
 try:
-    from flask_dance.consumer.backend.sqla import SQLAlchemyBackend, first, _get_real_user
+    from flask_dance.consumer.storage.sqla import SQLAlchemyStorage as SQLAlchemyBackend
+    from flask_dance.consumer.storage.sqla import first, _get_real_user
     from sqlalchemy.orm.exc import NoResultFound
-    backend_resultcode = False       # prevent storing values with this resultcode
+    backend_resultcode = True  # prevent storing values with this resultcode
 except ImportError:
-    # fails on flask-dance >1.3, due to renaming
-    try:
-        from flask_dance.consumer.storage.sqla import SQLAlchemyStorage as SQLAlchemyBackend
-        from flask_dance.consumer.storage.sqla import first, _get_real_user
-        from sqlalchemy.orm.exc import NoResultFound
-        backend_resultcode = True  # prevent storing values with this resultcode
-    except ImportError:
-        pass
+    pass
 
 
 class OAuthBackend(SQLAlchemyBackend):
diff --git a/cps/opds.py b/cps/opds.py
index cb8f397e0..2b8ab6d6c 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -26,15 +26,18 @@ from functools import wraps
 
 from flask import Blueprint, request, render_template, Response, g, make_response, abort
 from flask_login import current_user
+from flask_babel import get_locale
 from sqlalchemy.sql.expression import func, text, or_, and_, true
 from sqlalchemy.exc import InvalidRequestError, OperationalError
 from werkzeug.security import check_password_hash
-from . import constants, logger, config, db, calibre_db, ub, services, get_locale, isoLanguages
+
+from . import constants, logger, config, db, calibre_db, ub, services, isoLanguages
 from .helper import get_download_link, get_book_cover
 from .pagination import Pagination
 from .web import render_read_books
 from .usermanagement import load_user_from_request
 from flask_babel import gettext as _
+
 opds = Blueprint('opds', __name__)
 
 log = logger.create()
diff --git a/cps/redirect.py b/cps/redirect.py
index 8bd681093..9382a205b 100644
--- a/cps/redirect.py
+++ b/cps/redirect.py
@@ -29,7 +29,6 @@
 
 from urllib.parse import urlparse, urljoin
 
-
 from flask import request, url_for, redirect
 
 
diff --git a/cps/render_template.py b/cps/render_template.py
index d2f40d6c1..0750a9c48 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -16,9 +16,8 @@
 #  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, request
+from flask import render_template, g, abort, request
 from flask_babel import gettext as _
-from flask import g, abort
 from werkzeug.local import LocalProxy
 from flask_login import current_user
 
diff --git a/cps/search.py b/cps/search.py
new file mode 100644
index 000000000..429aea174
--- /dev/null
+++ b/cps/search.py
@@ -0,0 +1,422 @@
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 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 json
+from datetime import datetime
+
+from flask import Blueprint, request, redirect, url_for, flash
+from flask import session as flask_session
+from flask_login import current_user
+from flask_babel import get_locale, format_date
+from flask_babel import gettext as _
+from sqlalchemy.sql.expression import func, not_, and_, or_, text
+from sqlalchemy.sql.functions import coalesce
+
+from . import logger, db, calibre_db, config, ub
+from .usermanagement import login_required_if_no_ano
+from .render_template import render_title_template
+from .pagination import Pagination
+
+search = Blueprint('search', __name__)
+
+log = logger.create()
+
+
+@search.route("/search", methods=["GET"])
+@login_required_if_no_ano
+def simple_search():
+    term = request.args.get("query")
+    if term:
+        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term.strip()))
+    else:
+        return render_title_template('search.html',
+                                     searchterm="",
+                                     result_count=0,
+                                     title=_(u"Search"),
+                                     page="search")
+
+
+@search.route("/advsearch", methods=['POST'])
+@login_required_if_no_ano
+def advanced_search():
+    values = dict(request.form)
+    params = ['include_tag', 'exclude_tag', 'include_serie', 'exclude_serie', 'include_shelf', 'exclude_shelf',
+              '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=""))
+
+
+@search.route("/advsearch", methods=['GET'])
+@login_required_if_no_ano
+def advanced_search_form():
+    # Build custom columns names
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_prepare_search_form(cc)
+
+
+def adv_search_custom_columns(cc, term, q):
+    for c in cc:
+        if c.datatype == "datetime":
+            custom_start = term.get('custom_column_' + str(c.id) + '_start')
+            custom_end = term.get('custom_column_' + str(c.id) + '_end')
+            if custom_start:
+                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                    func.datetime(db.cc_classes[c.id].value) >= func.datetime(custom_start)))
+            if custom_end:
+                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                    func.datetime(db.cc_classes[c.id].value) <= func.datetime(custom_end)))
+        else:
+            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:
+            try:
+                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)
+            except (KeyError, AttributeError):
+                log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
+                flash(_("Custom Column No.%(column)d is not existing in calibre database",
+                        column=config.config_read_column),
+                      category="error")
+                return q
+        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 adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
+    q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)\
+        .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
+    if len(include_shelf_inputs) > 0:
+        q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
+    return q
+
+def extend_search_term(searchterm,
+                       author_name,
+                       book_title,
+                       publisher,
+                       pub_start,
+                       pub_end,
+                       tags,
+                       rating_high,
+                       rating_low,
+                       read_status,
+                       ):
+    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_end = u""
+    elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
+    for key, db_element in elements.items():
+        tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
+        searchterm.extend(tag.name for tag in tag_names)
+        tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['exclude_' + key])).all()
+        searchterm.extend(tag.name for tag in tag_names)
+    language_names = calibre_db.session.query(db.Languages). \
+        filter(db.Languages.id.in_(tags['include_language'])).all()
+    if language_names:
+        language_names = calibre_db.speaking_language(language_names)
+    searchterm.extend(language.name for language in language_names)
+    language_names = calibre_db.session.query(db.Languages). \
+        filter(db.Languages.id.in_(tags['exclude_language'])).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 tags['include_extension'])
+    searchterm.extend(ext for ext in tags['exclude_extension'])
+    # 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):
+    sort = order[0] if order else [db.Books.sort]
+    pagination = None
+
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
+    if not config.config_read_column:
+        query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(db.Books)
+                 .outerjoin(ub.ReadBook, and_(db.Books.id == ub.ReadBook.book_id,
+                                              int(current_user.id) == ub.ReadBook.user_id)))
+    else:
+        try:
+            read_column = cc[config.config_read_column]
+            query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
+                     .select_from(db.Books)
+                     .outerjoin(read_column, read_column.book == db.Books.id))
+        except (KeyError, AttributeError):
+            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
+            # Skip linking read column
+            query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
+    query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                  int(current_user.id) == ub.ArchivedBook.user_id))
+
+    q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book)\
+        .outerjoin(db.Series)\
+        .filter(calibre_db.common_filters(True))
+
+    # parse multi selects to a complete dict
+    tags = dict()
+    elements = ['tag', 'serie', 'shelf', 'language', 'extension']
+    for element in elements:
+        tags['include_' + element] = term.get('include_' + element)
+        tags['exclude_' + element] = term.get('exclude_' + element)
+
+    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:
+        book_title = book_title.strip().lower()
+    if publisher:
+        publisher = publisher.strip().lower()
+
+    search_term = []
+    cc_present = False
+    for c in cc:
+        if c.datatype == "datetime":
+            column_start = term.get('custom_column_' + str(c.id) + '_start')
+            column_end = term.get('custom_column_' + str(c.id) + '_end')
+            if column_start:
+                search_term.extend([u"{} >= {}".format(c.name,
+                                                       format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
+                                                                   format='medium',
+                                                                   locale=get_locale())
+                                                       )])
+                cc_present = True
+            if column_end:
+                search_term.extend([u"{} <= {}".format(c.name,
+                                                       format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
+                                                                   format='medium',
+                                                                   locale=get_locale())
+                                                       )])
+                cc_present = True
+        elif term.get('custom_column_' + str(c.id)):
+            search_term.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
+            cc_present = True
+
+
+    if any(tags.values()) 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 read_status:
+        search_term, pub_start, pub_end = extend_search_term(search_term,
+                                                             author_name,
+                                                             book_title,
+                                                             publisher,
+                                                             pub_start,
+                                                             pub_end,
+                                                             tags,
+                                                             rating_high,
+                                                             rating_low,
+                                                             read_status)
+        if author_name:
+            q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
+        if book_title:
+            q = q.filter(func.lower(db.Books.title).ilike("%" + book_title + "%"))
+        if pub_start:
+            q = q.filter(func.datetime(db.Books.pubdate) > func.datetime(pub_start))
+        if pub_end:
+            q = q.filter(func.datetime(db.Books.pubdate) < func.datetime(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 + "%")))
+        q = adv_search_tag(q, tags['include_tag'], tags['exclude_tag'])
+        q = adv_search_serie(q, tags['include_serie'], tags['exclude_serie'])
+        q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
+        q = adv_search_extension(q, tags['include_extension'], tags['exclude_extension'])
+        q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
+        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 columns
+        try:
+            q = adv_search_custom_columns(cc, term, q)
+        except AttributeError as ex:
+            log.debug_or_exception(ex)
+            flash(_("Error on search for custom columns, please restart Calibre-Web"), category="error")
+
+    q = q.order_by(*sort).all()
+    flask_session['query'] = json.dumps(term)
+    ub.store_combo_ids(q)
+    result_count = len(q)
+    if offset is not None and limit is not 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
+    entries = calibre_db.order_authors(q[offset:limit_all], list_return=True, combined=True)
+    return render_title_template('search.html',
+                                 adv_searchterm=search_term,
+                                 pagination=pagination,
+                                 entries=entries,
+                                 result_count=result_count,
+                                 title=_(u"Advanced Search"), page="advsearch",
+                                 order=order[1])
+
+
+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()
+    shelves = ub.session.query(ub.Shelf)\
+        .filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id)))\
+        .order_by(ub.Shelf.name).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,shelves=shelves, title=_(u"Advanced Search"), cc=cc, page="advsearch")
+
+
+def render_search_results(term, offset=None, order=None, limit=None):
+    join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
+    entries, result_count, pagination = calibre_db.get_search_results(term,
+                                                                      config,
+                                                                      offset,
+                                                                      order,
+                                                                      limit,
+                                                                      False,
+                                                                      *join)
+    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",
+                                 order=order[1])
+
+
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index 0070e78f1..ae95a28e3 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -22,17 +22,17 @@ import inspect
 import json
 import os
 import sys
-# from time import time
-
+from dataclasses import asdict
 
 from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
 from flask_login import login_required
+from flask_babel import get_locale
 from sqlalchemy.exc import InvalidRequestError, OperationalError
 from sqlalchemy.orm.attributes import flag_modified
 
 from cps.services.Metadata import Metadata
-from . import constants, get_locale, logger, ub, web_server
+from . import constants, logger, ub, web_server
 
 # current_milli_time = lambda: int(round(time() * 1000))
 
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index e65d314ae..bc7e928a9 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -55,7 +55,8 @@ class TaskConvert(CalibreTask):
     def run(self, worker_thread):
         self.worker_thread = worker_thread
         if config.config_use_google_drive:
-            worker_db = db.CalibreDB(expire_on_commit=False)
+            worker_db = db.CalibreDB()
+            worker_db.init_db(expire_on_commit=False)
             cur_book = worker_db.get_book(self.book_id)
             self.title = cur_book.title
             data = worker_db.get_book_format(self.book_id, self.settings['old_book_format'])
@@ -104,7 +105,8 @@ class TaskConvert(CalibreTask):
 
     def _convert_ebook_format(self):
         error_message = None
-        local_db = db.CalibreDB(expire_on_commit=False)
+        local_db = db.CalibreDB()
+        local_db.init_db(expire_on_commit=False)
         file_path = self.file_path
         book_id = self.book_id
         format_old_ext = u'.' + self.settings['old_book_format'].lower()
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index dcfd4226d..2ecc57c83 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -68,7 +68,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self.log = logger.create()
         self.book_id = book_id
         self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB()
+        self.calibre_db.init_db(expire_on_commit=False)
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
@@ -238,7 +239,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
         super(TaskGenerateSeriesThumbnails, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB()
+        self.calibre_db.init_db(expire_on_commit=False)
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
@@ -448,7 +450,8 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
-        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB()
+        self.calibre_db.init_db(expire_on_commit=False)
         self.app_db_session = ub.get_new_session_instance()
         self.cache = fs.FileSystem()
 
diff --git a/cps/tasks_status.py b/cps/tasks_status.py
new file mode 100644
index 000000000..ca9b5796c
--- /dev/null
+++ b/cps/tasks_status.py
@@ -0,0 +1,95 @@
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 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 markupsafe import escape
+
+from flask import Blueprint, jsonify
+from flask_login import login_required, current_user
+from flask_babel import gettext as _
+from flask_babel import get_locale, format_datetime
+from babel.units import format_unit
+
+from . import logger
+from .render_template import render_title_template
+from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
+
+tasks = Blueprint('tasks', __name__)
+
+log = logger.create()
+
+
+@tasks.route("/ajax/emailstat")
+@login_required
+def get_email_status_json():
+    tasks = WorkerThread.getInstance().tasks
+    return jsonify(render_task_status(tasks))
+
+
+@tasks.route("/tasks")
+@login_required
+def get_tasks_status():
+    # if current user admin, show all email, otherwise only own emails
+    tasks = WorkerThread.getInstance().tasks
+    answer = render_task_status(tasks)
+    return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
+
+
+# helper function to apply localize status information in tasklist entries
+def render_task_status(tasklist):
+    rendered_tasklist = list()
+    for __, user, __, task in tasklist:
+        if user == current_user.name 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:
+                    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:
+                    ret['status'] = _(u'Unknown Status')
+
+            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message)
+            ret['progress'] = "{} %".format(int(task.progress * 100))
+            ret['user'] = escape(user)  # prevent xss
+            rendered_tasklist.append(ret)
+
+    return rendered_tasklist
+
+
+# helper function for displaying the runtime of tasks
+def format_runtime(runtime):
+    ret_val = ""
+    if runtime.days:
+        ret_val = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
+    minutes, seconds = divmod(runtime.seconds, 60)
+    hours, minutes = divmod(minutes, 60)
+    # ToDo: locale.number_symbols._data['timeSeparator'] -> localize time separator ?
+    if hours:
+        ret_val += '{:d}:{:02d}:{:02d}s'.format(hours, minutes, seconds)
+    elif minutes:
+        ret_val += '{:2d}:{:02d}s'.format(minutes, seconds)
+    else:
+        ret_val += '{:2d}s'.format(seconds)
+    return ret_val
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 420129372..7502514a1 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -41,7 +41,7 @@
           <a class="navbar-brand" href="{{url_for('web.index')}}">{{instance}}</a>
         </div>
         {% if g.user.is_authenticated or g.allow_anonymous %}
-          <form class="navbar-form navbar-left" role="search" action="{{url_for('web.search')}}" method="GET">
+          <form class="navbar-form navbar-left" role="search" action="{{url_for('search.simple_search')}}" method="GET">
             <div class="form-group input-group input-group-sm">
               <label for="query" class="sr-only">{{_('Search')}}</label>
               <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search Library')}}" value="{{searchterm}}">
@@ -54,7 +54,7 @@
         <div class="navbar-collapse collapse">
           {% if g.user.is_authenticated or g.allow_anonymous %}
           <ul class="nav navbar-nav ">
-            <li><a href="{{url_for('web.advanced_search')}}" id="advanced_search"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
+            <li><a href="{{url_for('search.advanced_search')}}" id="advanced_search"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
           </ul>
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">
@@ -71,7 +71,7 @@
                   </li>
               {% endif %}
               {% if not g.user.is_anonymous and not simple%}
-                <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
+                <li><a id="top_tasks" href="{{url_for('tasks.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
               {% endif %}
               {% if g.user.role_admin() %}
                 <li><a id="top_admin" data-text="{{_('Settings')}}" href="{{url_for('admin.admin')}}"><span class="glyphicon glyphicon-dashboard"></span> <span class="hidden-sm">{{_('Admin')}}</span></a></li>
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index c24ccd916..7bb9872a3 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -2,7 +2,7 @@
 {% block body %}
 <h1 class="{{page}}">{{title}}</h1>
 <div class="col-md-10 col-lg-6">
-  <form role="form" id="search" action="{{ url_for('web.advanced_search_form') }}" method="POST">
+  <form role="form" id="search" action="{{ url_for('search.advanced_search_form') }}" method="POST">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     <div class="form-group">
       <label for="book_title">{{_('Book Title')}}</label>
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index 0e5a352bd..b0b5b3bd0 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -5,7 +5,7 @@
 {% block body %}
 <div class="discover">
     <h2>{{_('Tasks')}}</h2>
-    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('web.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
+    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('task.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
       <thead>
         <tr>
             {% if g.user.role_admin() %}
diff --git a/cps/ub.py b/cps/ub.py
index fdeff2bc7..fd7a90efc 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -857,7 +857,7 @@ def init_db(app_db_path, user_credentials=None):
 
 
 def get_new_session_instance():
-    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settings_path), echo=False)
+    new_engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
     new_session = scoped_session(sessionmaker())
     new_session.configure(bind=new_engine)
 
diff --git a/cps/updater.py b/cps/updater.py
index f651719eb..b47b80f58 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -28,7 +28,7 @@ from io import BytesIO
 from tempfile import gettempdir
 
 import requests
-from babel.dates import format_datetime
+from flask_babel import format_datetime
 from flask_babel import gettext as _
 
 from . import constants, logger  #  config, web_server
diff --git a/cps/uploader.py b/cps/uploader.py
index 276db3260..5dbd1249c 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -27,12 +27,6 @@ from .helper import split_authors
 
 log = logger.create()
 
-
-try:
-    from lxml.etree import LXML_VERSION as lxmlversion
-except ImportError:
-    lxmlversion = None
-
 try:
     from wand.image import Image, Color
     from wand import version as ImageVersion
@@ -101,7 +95,7 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension):
         extension=original_file_extension,
         title=original_file_name,
         author=_(u'Unknown'),
-        cover=None, #pdf_preview(tmp_file_path, original_file_name),
+        cover=None,
         description="",
         tags="",
         series="",
@@ -237,29 +231,12 @@ def pdf_preview(tmp_file_path, tmp_dir):
         return None
 
 
-def get_versions(all=True):
+def get_versions():
     ret = dict()
     if not use_generic_pdf_cover:
         ret['Image Magick'] = ImageVersion.MAGICK_VERSION
     else:
         ret['Image Magick'] = u'not installed'
-    if all:
-        if not use_generic_pdf_cover:
-            ret['Wand'] = ImageVersion.VERSION
-        else:
-            ret['Wand'] = u'not installed'
-        if use_pdf_meta:
-            ret['PyPdf'] = PyPdfVersion
-        else:
-            ret['PyPdf'] = u'not installed'
-        if lxmlversion:
-            ret['lxml'] = '.'.join(map(str, lxmlversion))
-        else:
-            ret['lxml'] = u'not installed'
-        if comic.use_comic_meta:
-            ret['Comic_API'] = comic.comic_version or u'installed'
-        else:
-            ret['Comic_API'] = u'not installed'
     return ret
 
 
diff --git a/cps/web.py b/cps/web.py
index 44c195af9..178ed18c3 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1,5 +1,3 @@
-# -*- 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,
@@ -21,35 +19,32 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from datetime import datetime
 import json
 import mimetypes
 import chardet  # dependency of requests
 import copy
-from functools import wraps
 
-from babel.dates import format_date
 from babel import Locale
 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_babel import get_locale
 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, false, not_, and_, or_
+from sqlalchemy.sql.expression import text, func, false, not_, and_
 from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.sql.functions import coalesce
 
-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
-from . import babel, db, ub, config, get_locale, app
+from . import babel, db, ub, config, app
 from . import calibre_db, kobo_sync_status
+from .search import render_search_results, render_adv_search_results
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
-from .helper import check_valid_domain, render_task_status, check_email, check_username, \
+from .helper import check_valid_domain, check_email, check_username, \
     get_book_cover, get_series_cover_thumbnail, get_download_link, send_mail, generate_random_password, \
     send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email, \
     edit_book_read_status
@@ -75,10 +70,12 @@ except ImportError:
     oauth_check = {}
     register_user_with_oauth = logout_oauth_user = get_oauth_status = None
 
-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
+from functools import wraps
+
+#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
 
 
 @app.after_request
@@ -102,6 +99,7 @@ def add_security_headers(resp):
 
 
 web = Blueprint('web', __name__)
+
 log = logger.create()
 
 
@@ -770,57 +768,6 @@ def render_archived_books(page, sort_param):
                                  title=name, page=page_name, order=sort_param[1])
 
 
-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()
-    shelves = ub.session.query(ub.Shelf) \
-        .filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id))) \
-        .order_by(ub.Shelf.name).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, shelves=shelves, title=_(u"Advanced Search"), cc=cc, page="advsearch")
-
-
-def render_search_results(term, offset=None, order=None, limit=None):
-    join = db.books_series_link, db.books_series_link.c.book == db.Books.id, db.Series
-    entries, result_count, pagination = calibre_db.get_search_results(term,
-                                                                      config,
-                                                                      offset,
-                                                                      order,
-                                                                      limit,
-                                                                      *join)
-    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",
-                                 order=order[1])
-
-
 # ################################### View Books list ##################################################################
 
 
@@ -1153,321 +1100,6 @@ def category_list():
         abort(404)
 
 
-# ################################### Task functions ################################################################
-
-
-@web.route("/tasks")
-@login_required
-def get_tasks_status():
-    # if current user admin, show all email, otherwise only own emails
-    tasks = WorkerThread.get_instance().tasks
-    answer = render_task_status(tasks)
-    return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
-
-
-# ################################### Search functions ################################################################
-
-@web.route("/search", methods=["GET"])
-@login_required_if_no_ano
-def search():
-    term = request.args.get("query")
-    if term:
-        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term.strip()))
-    else:
-        return render_title_template('search.html',
-                                     searchterm="",
-                                     result_count=0,
-                                     title=_(u"Search"),
-                                     page="search")
-
-
-@web.route("/advsearch", methods=['POST'])
-@login_required_if_no_ano
-def advanced_search():
-    values = dict(request.form)
-    params = ['include_tag', 'exclude_tag', 'include_serie', 'exclude_serie', 'include_shelf', 'exclude_shelf',
-              '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:
-        if c.datatype == "datetime":
-            custom_start = term.get('custom_column_' + str(c.id) + '_start')
-            custom_end = term.get('custom_column_' + str(c.id) + '_end')
-            if custom_start:
-                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                    func.datetime(db.cc_classes[c.id].value) >= func.datetime(custom_start)))
-            if custom_end:
-                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                    func.datetime(db.cc_classes[c.id].value) <= func.datetime(custom_end)))
-        else:
-            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_read_status(q, read_status):
-    if read_status:
-        if config.config_read_column:
-            try:
-                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)
-            except (KeyError, AttributeError, IndexError):
-                log.error(
-                    "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-                flash(_("Custom Column No.%(column)d is not existing in calibre database",
-                        column=config.config_read_column),
-                      category="error")
-                return q
-        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_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:
-        return adv_search_text(q, include_languages_inputs, exclude_languages_inputs, db.Languages.id)
-    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_text(q, include_inputs, exclude_inputs, data_table):
-    for inp in include_inputs:
-        q = q.filter(getattr(db.Books, data_table.class_.__tablename__).any(data_table == inp))
-    for excl in exclude_inputs:
-        q = q.filter(not_(getattr(db.Books, data_table.class_.__tablename__).any(data_table == excl)))
-    return q
-
-
-def adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
-    q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id) \
-        .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
-    if len(include_shelf_inputs) > 0:
-        q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
-    return q
-
-
-def extend_search_term(searchterm,
-                       author_name,
-                       book_title,
-                       publisher,
-                       pub_start,
-                       pub_end,
-                       tags,
-                       rating_high,
-                       rating_low,
-                       read_status,
-                       ):
-    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_end = u""
-    elements = {'tag': db.Tags, 'serie': db.Series, 'shelf': ub.Shelf}
-    for key, db_element in elements.items():
-        tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
-        searchterm.extend(tag.name for tag in tag_names)
-        tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['exclude_' + key])).all()
-        searchterm.extend(tag.name for tag in tag_names)
-    language_names = calibre_db.session.query(db.Languages). \
-        filter(db.Languages.id.in_(tags['include_language'])).all()
-    if language_names:
-        language_names = calibre_db.speaking_language(language_names)
-    searchterm.extend(language.name for language in language_names)
-    language_names = calibre_db.session.query(db.Languages). \
-        filter(db.Languages.id.in_(tags['exclude_language'])).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 tags['include_extension'])
-    searchterm.extend(ext for ext in tags['exclude_extension'])
-    # 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):
-    sort_param = order[0] if order else [db.Books.sort]
-    pagination = None
-
-    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
-    calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
-    query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
-    q = query.outerjoin(db.books_series_link, db.books_series_link.c.book == db.Books.id) \
-        .outerjoin(db.Series) \
-        .filter(calibre_db.common_filters(True))
-
-    # parse multiselects to a complete dict
-    tags = dict()
-    elements = ['tag', 'serie', 'shelf', 'language', 'extension']
-    for element in elements:
-        tags['include_' + element] = term.get('include_' + element)
-        tags['exclude_' + element] = term.get('exclude_' + element)
-
-    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:
-        book_title = book_title.strip().lower()
-    if publisher:
-        publisher = publisher.strip().lower()
-
-    search_term = []
-    cc_present = False
-    for c in cc:
-        if c.datatype == "datetime":
-            column_start = term.get('custom_column_' + str(c.id) + '_start')
-            column_end = term.get('custom_column_' + str(c.id) + '_end')
-            if column_start:
-                search_term.extend([u"{} >= {}".format(c.name,
-                                                       format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
-                                                                   format='medium',
-                                                                   locale=get_locale())
-                                                       )])
-                cc_present = True
-            if column_end:
-                search_term.extend([u"{} <= {}".format(c.name,
-                                                       format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
-                                                                   format='medium',
-                                                                   locale=get_locale())
-                                                       )])
-                cc_present = True
-        elif term.get('custom_column_' + str(c.id)):
-            search_term.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
-            cc_present = True
-
-    if any(tags.values()) 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 read_status:
-        search_term, pub_start, pub_end = extend_search_term(search_term,
-                                                             author_name,
-                                                             book_title,
-                                                             publisher,
-                                                             pub_start,
-                                                             pub_end,
-                                                             tags,
-                                                             rating_high,
-                                                             rating_low,
-                                                             read_status)
-        # q = q.filter()
-        if author_name:
-            q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
-        if book_title:
-            q = q.filter(func.lower(db.Books.title).ilike("%" + book_title + "%"))
-        if pub_start:
-            q = q.filter(func.datetime(db.Books.pubdate) > func.datetime(pub_start))
-        if pub_end:
-            q = q.filter(func.datetime(db.Books.pubdate) < func.datetime(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 + "%")))
-        q = adv_search_text(q, tags['include_tag'], tags['exclude_tag'], db.Tags.id)
-        q = adv_search_text(q, tags['include_serie'], tags['exclude_serie'], db.Series.id)
-        q = adv_search_text(q, tags['include_extension'], tags['exclude_extension'], db.Data.format)
-        q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
-        q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
-        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 columns
-        try:
-            q = adv_search_custom_columns(cc, term, q)
-        except AttributeError as ex:
-            log.error_or_exception(ex)
-            flash(_("Error on search for custom columns, please restart Calibre-Web"), category="error")
-
-    q = q.order_by(*sort_param).all()
-    flask_session['query'] = json.dumps(term)
-    ub.store_combo_ids(q)
-    result_count = len(q)
-    if offset is not None and limit is not 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
-    entries = calibre_db.order_authors(q[offset:limit_all], list_return=True, combined=True)
-    return render_title_template('search.html',
-                                 adv_searchterm=search_term,
-                                 pagination=pagination,
-                                 entries=entries,
-                                 result_count=result_count,
-                                 title=_(u"Advanced Search"),
-                                 page="advsearch",
-                                 order=order[1])
-
-
-@web.route("/advsearch", methods=['GET'])
-@login_required_if_no_ano
-def advanced_search_form():
-    # Build custom columns names
-    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
-    return render_prepare_search_form(cc)
 
 
 # ################################### Download/Send ##################################################################
@@ -1892,10 +1524,10 @@ def show_book(book_id):
         entry.kindle_list = check_send_to_kindle(entry)
         entry.reader_list = check_read_formats(entry)
 
-        entry.audioentries = []
+        entry.audio_entries = []
         for media_format in entry.data:
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
-                entry.audioentries.append(media_format.format.lower())
+                entry.audio_entries.append(media_format.format.lower())
 
         return render_title_template('detail.html',
                                      entry=entry,

From 2e007a160e652b2e7bbdeb5a8319560188324502 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 14:44:55 +0200
Subject: [PATCH 262/412] reenable startup logging Bugfixes from refactoring
 and merge

---
 cps/__init__.py          |    9 +-
 cps/admin.py             |  957 +++++++++++-----------
 cps/babel.py             |   18 +-
 cps/editbooks.py         | 1627 +++++++++++++++++++-------------------
 cps/helper.py            |   80 +-
 cps/kobo_auth.py         |   76 +-
 cps/main.py              |    8 +-
 cps/opds.py              |   28 +-
 cps/search.py            |    1 -
 cps/services/__init__.py |    5 +-
 cps/shelf.py             |  219 ++---
 cps/tasks_status.py      |    4 +-
 cps/templates/tasks.html |    2 +-
 cps/web.py               |    8 +-
 14 files changed, 1516 insertions(+), 1526 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index 0a452b17d..f597aab59 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -27,16 +27,15 @@ from flask import Flask
 from .MyLoginManager import MyLoginManager
 from flask_principal import Principal
 
+from . import logger
 from .cli import CliParameter
 from .constants import CONFIG_DIR
 from .reverseproxy import ReverseProxied
 from .server import WebServer
 from .dep_check import dependency_check
-from . import services
 from .updater import Updater
-from .babel import babel, BABEL_TRANSLATIONS
+from .babel import babel
 from . import config_sql
-from . import logger
 from . import cache_buster
 from . import ub, db
 
@@ -157,8 +156,8 @@ def create_app():
     web_server.init_app(app, config)
 
     babel.init_app(app)
-    BABEL_TRANSLATIONS.update(str(item) for item in babel.list_translations())
-    BABEL_TRANSLATIONS.add('en')
+
+    from . import services
 
     if services.ldap:
         services.ldap.init_app(app, config)
diff --git a/cps/admin.py b/cps/admin.py
index 29f2319e7..f5ae10372 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -28,6 +28,7 @@ import operator
 from datetime import datetime, timedelta, time
 from functools import wraps
 
+
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
 from flask_login import login_required, current_user, logout_user, confirm_login
 from flask_babel import gettext as _
@@ -38,15 +39,16 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
-from . import constants, logger, helper, services, cli
-from . import db, calibre_db, ub, web_server, config, updater_thread, babel, gdriveutils, \
+from . import constants, logger, helper, services, cli_param
+from . import db, calibre_db, ub, web_server, config, updater_thread, gdriveutils, \
     kobo_sync_status, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
-    valid_email, check_username, update_thumbnail_cache
+    valid_email, check_username
 from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from .services.worker import WorkerThread
-from . import debug_info, BABEL_TRANSLATIONS
+from .babel import get_available_translations, get_available_locale, get_user_locale_language
+from . import debug_info
 
 
 log = logger.create()
@@ -57,7 +59,8 @@ feature_support = {
         'kobo':  bool(services.kobo),
         'updater': constants.UPDATER_AVAILABLE,
         'gmail': bool(services.gmail),
-        'scheduler': schedule.use_APScheduler
+        'scheduler': schedule.use_APScheduler,
+        'gdrive': gdrive_support
     }
 
 try:
@@ -76,7 +79,6 @@ except ImportError as err:
     oauth_check = {}
 
 
-feature_support['gdrive'] = gdrive_support
 admi = Blueprint('admin', __name__)
 
 
@@ -160,7 +162,7 @@ def shutdown():
 # needed for docker applications, as changes on metadata.db from host are not visible to application
 @admi.route("/reconnect", methods=['GET'])
 def reconnect():
-    if cli.reconnect_enable:
+    if cli_param.reconnect_enable:
         calibre_db.reconnect_db(config, ub.app_DB_path)
         return json.dumps({})
     else:
@@ -175,7 +177,7 @@ def update_thumbnails():
     content = config.get_scheduled_task_settings()
     if content['schedule_generate_book_covers']:
         log.info("Update of Cover cache requested")
-        update_thumbnail_cache()
+        helper.update_thumbnail_cache()
     return ""
 
 
@@ -264,7 +266,7 @@ def view_configuration():
     restrict_columns = calibre_db.session.query(db.CustomColumns)\
         .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all()
     languages = calibre_db.speaking_language()
-    translations = [Locale('en')] + babel.list_translations()
+    translations = get_available_locale()
     return render_title_template("config_view_edit.html", conf=config, readColumns=read_column,
                                  restrictColumns=restrict_columns,
                                  languages=languages,
@@ -278,7 +280,7 @@ def view_configuration():
 def edit_user_table():
     visibility = current_user.view_settings.get('useredit', {})
     languages = calibre_db.speaking_language()
-    translations = [LC('en')] + babel.list_translations()
+    translations = get_available_locale()
     all_user = ub.session.query(ub.User)
     tags = calibre_db.session.query(db.Tags)\
         .join(db.books_tags_link)\
@@ -349,7 +351,7 @@ def list_users():
         if user.default_language == "all":
             user.default = _("All")
         else:
-            user.default = Locale.parse(user.default_language).get_language_name(get_locale())
+            user.default = get_user_locale_language(user.default_language)
 
     table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": users}
     js_list = json.dumps(table_entries, cls=db.AlchemyEncoder)
@@ -397,7 +399,7 @@ def delete_user():
 @login_required
 @admin_required
 def table_get_locale():
-    locale = [LC('en')] + babel.list_translations()
+    locale = get_available_locale()
     ret = list()
     current_locale = get_locale()
     for loc in locale:
@@ -498,7 +500,7 @@ def edit_list_user(param):
                 elif param == 'locale':
                     if user.name == "Guest":
                         raise Exception(_("Guest's Locale is determined automatically and can't be set"))
-                    if vals['value'] in BABEL_TRANSLATIONS:
+                    if vals['value'] in get_available_translations():
                         user.locale = vals['value']
                     else:
                         raise Exception(_("No Valid Locale Given"))
@@ -539,22 +541,6 @@ def update_table_settings():
     return ""
 
 
-def check_valid_read_column(column):
-    if column != "0":
-        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
-              .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all():
-            return False
-    return True
-
-
-def check_valid_restricted_column(column):
-    if column != "0":
-        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
-              .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all():
-            return False
-    return True
-
-
 @admi.route("/admin/viewconfig", methods=["POST"])
 @login_required
 @admin_required
@@ -759,43 +745,6 @@ def edit_restriction(res_type, user_id):
             ub.session_commit("Changed denied columns of user {} to {}".format(usr.name, usr.denied_column_value))
     return ""
 
-
-def restriction_addition(element, list_func):
-    elementlist = list_func()
-    if elementlist == ['']:
-        elementlist = []
-    if not element['add_element'] in elementlist:
-        elementlist += [element['add_element']]
-    return ','.join(elementlist)
-
-
-def restriction_deletion(element, list_func):
-    elementlist = list_func()
-    if element['Element'] in elementlist:
-        elementlist.remove(element['Element'])
-    return ','.join(elementlist)
-
-
-def prepare_tags(user, action, tags_name, id_list):
-    if "tags" in tags_name:
-        tags = calibre_db.session.query(db.Tags).filter(db.Tags.id.in_(id_list)).all()
-        if not tags:
-            raise Exception(_("Tag not found"))
-        new_tags_list = [x.name for x in tags]
-    else:
-        tags = calibre_db.session.query(db.cc_classes[config.config_restricted_column])\
-            .filter(db.cc_classes[config.config_restricted_column].id.in_(id_list)).all()
-        new_tags_list = [x.value for x in tags]
-    saved_tags_list = user.__dict__[tags_name].split(",") if len(user.__dict__[tags_name]) else []
-    if action == "remove":
-        saved_tags_list = [x for x in saved_tags_list if x not in new_tags_list]
-    elif action == "add":
-        saved_tags_list.extend(x for x in new_tags_list if x not in saved_tags_list)
-    else:
-        raise Exception(_("Invalid Action"))
-    return ",".join(saved_tags_list)
-
-
 @admi.route("/ajax/addrestriction/<int:res_type>", methods=['POST'])
 @login_required
 @admin_required
@@ -964,6 +913,58 @@ def ajax_pathchooser():
     return pathchooser()
 
 
+def check_valid_read_column(column):
+    if column != "0":
+        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
+              .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all():
+            return False
+    return True
+
+
+def check_valid_restricted_column(column):
+    if column != "0":
+        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
+              .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all():
+            return False
+    return True
+
+
+def restriction_addition(element, list_func):
+    elementlist = list_func()
+    if elementlist == ['']:
+        elementlist = []
+    if not element['add_element'] in elementlist:
+        elementlist += [element['add_element']]
+    return ','.join(elementlist)
+
+
+def restriction_deletion(element, list_func):
+    elementlist = list_func()
+    if element['Element'] in elementlist:
+        elementlist.remove(element['Element'])
+    return ','.join(elementlist)
+
+
+def prepare_tags(user, action, tags_name, id_list):
+    if "tags" in tags_name:
+        tags = calibre_db.session.query(db.Tags).filter(db.Tags.id.in_(id_list)).all()
+        if not tags:
+            raise Exception(_("Tag not found"))
+        new_tags_list = [x.name for x in tags]
+    else:
+        tags = calibre_db.session.query(db.cc_classes[config.config_restricted_column])\
+            .filter(db.cc_classes[config.config_restricted_column].id.in_(id_list)).all()
+        new_tags_list = [x.value for x in tags]
+    saved_tags_list = user.__dict__[tags_name].split(",") if len(user.__dict__[tags_name]) else []
+    if action == "remove":
+        saved_tags_list = [x for x in saved_tags_list if x not in new_tags_list]
+    elif action == "add":
+        saved_tags_list.extend(x for x in new_tags_list if x not in saved_tags_list)
+    else:
+        raise Exception(_("Invalid Action"))
+    return ",".join(saved_tags_list)
+
+
 def pathchooser():
     browse_for = "folder"
     folder_only = request.args.get('folder', False) == "true"
@@ -1207,6 +1208,420 @@ def simulatedbchange():
     return Response(json.dumps({"change": db_change, "valid": db_valid}), mimetype='application/json')
 
 
+@admi.route("/admin/user/new", methods=["GET", "POST"])
+@login_required
+@admin_required
+def new_user():
+    content = ub.User()
+    languages = calibre_db.speaking_language()
+    translations = get_available_locale()
+    kobo_support = feature_support['kobo'] and config.config_kobo_sync
+    if request.method == "POST":
+        to_save = request.form.to_dict()
+        _handle_new_user(to_save, content, languages, translations, kobo_support)
+    else:
+        content.role = config.config_default_role
+        content.sidebar_view = config.config_default_show
+        content.locale = config.config_default_locale
+        content.default_language = config.config_default_language
+    return render_title_template("user_edit.html", new_user=1, content=content,
+                                 config=config, translations=translations,
+                                 languages=languages, title=_(u"Add new user"), page="newuser",
+                                 kobo_support=kobo_support, registered_oauth=oauth_check)
+
+
+@admi.route("/admin/mailsettings")
+@login_required
+@admin_required
+def edit_mailsettings():
+    content = config.get_mail_settings()
+    return render_title_template("email_edit.html", content=content, title=_(u"Edit E-mail Server Settings"),
+                                 page="mailset", feature_support=feature_support)
+
+
+@admi.route("/admin/mailsettings", methods=["POST"])
+@login_required
+@admin_required
+def update_mailsettings():
+    to_save = request.form.to_dict()
+    _config_int(to_save, "mail_server_type")
+    if to_save.get("invalidate"):
+        config.mail_gmail_token = {}
+        try:
+            flag_modified(config, "mail_gmail_token")
+        except AttributeError:
+            pass
+    elif to_save.get("gmail"):
+        try:
+            config.mail_gmail_token = services.gmail.setup_gmail(config.mail_gmail_token)
+            flash(_(u"Gmail Account Verification Successful"), category="success")
+        except Exception as ex:
+            flash(str(ex), category="error")
+            log.error(ex)
+            return edit_mailsettings()
+
+    else:
+        _config_string(to_save, "mail_server")
+        _config_int(to_save, "mail_port")
+        _config_int(to_save, "mail_use_ssl")
+        _config_string(to_save, "mail_login")
+        _config_string(to_save, "mail_password")
+        _config_string(to_save, "mail_from")
+        _config_int(to_save, "mail_size", lambda y: int(y)*1024*1024)
+    try:
+        config.save()
+    except (OperationalError, InvalidRequestError) as e:
+        ub.session.rollback()
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
+        return edit_mailsettings()
+
+    if to_save.get("test"):
+        if current_user.email:
+            result = send_test_mail(current_user.email, current_user.name)
+            if result is None:
+                flash(_(u"Test e-mail queued for sending to %(email)s, please check Tasks for result",
+                        email=current_user.email), category="info")
+            else:
+                flash(_(u"There was an error sending the Test e-mail: %(res)s", res=result), category="error")
+        else:
+            flash(_(u"Please configure your e-mail address first..."), category="error")
+    else:
+        flash(_(u"E-mail server settings updated"), category="success")
+
+    return edit_mailsettings()
+
+
+@admi.route("/admin/scheduledtasks")
+@login_required
+@admin_required
+def edit_scheduledtasks():
+    content = config.get_scheduled_task_settings()
+    time_field = list()
+    duration_field = list()
+
+    for n in range(24):
+        time_field.append((n , format_time(time(hour=n), format="short",)))
+    for n in range(5, 65, 5):
+        t = timedelta(hours=n // 60, minutes=n % 60)
+        duration_field.append((n, format_timedelta(t, threshold=.9)))
+
+    return render_title_template("schedule_edit.html",
+                                 config=content,
+                                 starttime=time_field,
+                                 duration=duration_field,
+                                 title=_(u"Edit Scheduled Tasks Settings"))
+
+
+@admi.route("/admin/scheduledtasks", methods=["POST"])
+@login_required
+@admin_required
+def update_scheduledtasks():
+    error = False
+    to_save = request.form.to_dict()
+    if 0 <= int(to_save.get("schedule_start_time")) <= 23:
+        _config_int(to_save, "schedule_start_time")
+    else:
+        flash(_(u"Invalid start time for task specified"), category="error")
+        error = True
+    if 0 < int(to_save.get("schedule_duration")) <= 60:
+        _config_int(to_save, "schedule_duration")
+    else:
+        flash(_(u"Invalid duration for task specified"), category="error")
+        error = True
+    _config_checkbox(to_save, "schedule_generate_book_covers")
+    _config_checkbox(to_save, "schedule_generate_series_covers")
+    _config_checkbox(to_save, "schedule_reconnect")
+
+    if not error:
+        try:
+            config.save()
+            flash(_(u"Scheduled tasks settings updated"), category="success")
+
+            # Cancel any running tasks
+            schedule.end_scheduled_tasks()
+
+            # Re-register tasks with new settings
+            schedule.register_scheduled_tasks(config.schedule_reconnect)
+        except IntegrityError:
+            ub.session.rollback()
+            log.error("An unknown error occurred while saving scheduled tasks settings")
+            flash(_(u"An unknown error occurred. Please try again later."), category="error")
+        except OperationalError:
+            ub.session.rollback()
+            log.error("Settings DB is not Writeable")
+            flash(_("Settings DB is not Writeable"), category="error")
+
+    return edit_scheduledtasks()
+
+
+@admi.route("/admin/user/<int:user_id>", methods=["GET", "POST"])
+@login_required
+@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 or (not config.config_anonbrowse and content.name == "Guest"):
+        flash(_(u"User not found"), category="error")
+        return redirect(url_for('admin.admin'))
+    languages = calibre_db.speaking_language(return_all_languages=True)
+    translations = get_available_locale()
+    kobo_support = feature_support['kobo'] and config.config_kobo_sync
+    if request.method == "POST":
+        to_save = request.form.to_dict()
+        resp = _handle_edit_user(to_save, content, languages, translations, kobo_support)
+        if resp:
+            return resp
+    return render_title_template("user_edit.html",
+                                 translations=translations,
+                                 languages=languages,
+                                 new_user=0,
+                                 content=content,
+                                 config=config,
+                                 registered_oauth=oauth_check,
+                                 mail_configured=config.get_mail_server_configured(),
+                                 kobo_support=kobo_support,
+                                 title=_(u"Edit User %(nick)s", nick=content.name),
+                                 page="edituser")
+
+
+@admi.route("/admin/resetpassword/<int:user_id>", methods=["POST"])
+@login_required
+@admin_required
+def reset_user_password(user_id):
+    if current_user is not None and current_user.is_authenticated:
+        ret, message = reset_password(user_id)
+        if ret == 1:
+            log.debug(u"Password for user %s reset", message)
+            flash(_(u"Password for user %(user)s reset", user=message), category="success")
+        elif ret == 0:
+            log.error(u"An unknown error occurred. Please try again later.")
+            flash(_(u"An unknown error occurred. Please try again later."), category="error")
+        else:
+            log.error(u"Please configure the SMTP mail settings first...")
+            flash(_(u"Please configure the SMTP mail settings first..."), category="error")
+    return redirect(url_for('admin.admin'))
+
+
+@admi.route("/admin/logfile")
+@login_required
+@admin_required
+def view_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,
+                                 log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT),
+                                 logfiles=logfiles,
+                                 page="logfile")
+
+
+@admi.route("/ajax/log/<int:logtype>")
+@login_required
+@admin_required
+def send_logfile(logtype):
+    if logtype == 1:
+        logfile = logger.get_accesslogfile(config.config_access_logfile)
+        return send_from_directory(os.path.dirname(logfile),
+                                   os.path.basename(logfile))
+    if logtype == 0:
+        logfile = logger.get_logfile(config.config_logfile)
+        return send_from_directory(os.path.dirname(logfile),
+                                   os.path.basename(logfile))
+    else:
+        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
+@admin_required
+def get_update_status():
+    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'])
+@login_required
+@admin_required
+def get_updater_status():
+    status = {}
+    if feature_support['updater']:
+        if request.method == "POST":
+            commit = request.form.to_dict()
+            if "start" in commit and commit['start'] == 'True':
+                txt = {
+                    "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'),
+                    "13": _(u'Update failed:') + u' ' + _(u'Files could not be replaced during update')
+                }
+                status['text'] = txt
+                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 ldap_import_create_user(user, user_data):
+    user_login_field = extract_dynamic_field_from_filter(user, config.config_ldap_user_object)
+
+    try:
+        username = user_data[user_login_field][0].decode('utf-8')
+    except KeyError as ex:
+        log.error("Failed to extract LDAP user: %s - %s", user, ex)
+        message = _(u'Failed to extract at least One LDAP User')
+        return 0, message
+
+    # check for duplicate username
+    if ub.session.query(ub.User).filter(func.lower(ub.User.name) == username.lower()).first():
+        # if ub.session.query(ub.User).filter(ub.User.name == username).first():
+        log.warning("LDAP User  %s Already in Database", user_data)
+        return 0, None
+
+    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'
+
+    try:
+        # check for duplicate email
+        useremail = check_email(useremail)
+    except Exception as ex:
+        log.warning("LDAP Email Error: {}, {}".format(user_data, ex))
+        return 0, None
+    content = ub.User()
+    content.name = username
+    content.password = ''  # dummy password which will be replaced by ldap one
+    content.email = useremail
+    content.kindle_mail = kindlemail
+    content.default_language = config.config_default_language
+    content.locale = config.config_default_locale
+    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()
+        return 1, None    # increase no of users
+    except Exception as ex:
+        log.warning("Failed to create LDAP user: %s - %s", user, ex)
+        ub.session.rollback()
+        message = _(u'Failed to Create at Least One LDAP User')
+        return 0, message
+
+
+@admi.route('/import_ldap_users', methods=["POST"])
+@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.error_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 ex:
+                log.warning(ex)
+                continue
+        else:
+            user_identifier = user
+            query_filter = None
+        try:
+            user_data = services.ldap.get_object_details(user=user_identifier, query_filter=query_filter)
+        except AttributeError as ex:
+            log.error_or_exception(ex)
+            continue
+        if user_data:
+            user_count, message = ldap_import_create_user(user, user_data)
+            if message:
+                showtext['text'] = message
+            else:
+                imported += user_count
+        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)
+
+
+@admi.route("/ajax/canceltask", methods=['POST'])
+@login_required
+@admin_required
+def cancel_task():
+    task_id = request.get_json().get('task_id', None)
+    worker = WorkerThread.get_instance()
+    worker.end_task(task_id)
+    return ""
+
+
 def _db_simulate_change():
     param = request.form.to_dict()
     to_save = dict()
@@ -1575,406 +1990,6 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
     return ""
 
 
-@admi.route("/admin/user/new", methods=["GET", "POST"])
-@login_required
-@admin_required
-def new_user():
-    content = ub.User()
-    languages = calibre_db.speaking_language()
-    translations = [Locale('en')] + babel.list_translations()
-    kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    if request.method == "POST":
-        to_save = request.form.to_dict()
-        _handle_new_user(to_save, content, languages, translations, kobo_support)
-    else:
-        content.role = config.config_default_role
-        content.sidebar_view = config.config_default_show
-        content.locale = config.config_default_locale
-        content.default_language = config.config_default_language
-    return render_title_template("user_edit.html", new_user=1, content=content,
-                                 config=config, translations=translations,
-                                 languages=languages, title=_(u"Add new user"), page="newuser",
-                                 kobo_support=kobo_support, registered_oauth=oauth_check)
-
-
-@admi.route("/admin/mailsettings")
-@login_required
-@admin_required
-def edit_mailsettings():
-    content = config.get_mail_settings()
-    return render_title_template("email_edit.html", content=content, title=_(u"Edit E-mail Server Settings"),
-                                 page="mailset", feature_support=feature_support)
-
-
-@admi.route("/admin/mailsettings", methods=["POST"])
-@login_required
-@admin_required
-def update_mailsettings():
-    to_save = request.form.to_dict()
-    _config_int(to_save, "mail_server_type")
-    if to_save.get("invalidate"):
-        config.mail_gmail_token = {}
-        try:
-            flag_modified(config, "mail_gmail_token")
-        except AttributeError:
-            pass
-    elif to_save.get("gmail"):
-        try:
-            config.mail_gmail_token = services.gmail.setup_gmail(config.mail_gmail_token)
-            flash(_(u"Gmail Account Verification Successful"), category="success")
-        except Exception as ex:
-            flash(str(ex), category="error")
-            log.error(ex)
-            return edit_mailsettings()
-
-    else:
-        _config_string(to_save, "mail_server")
-        _config_int(to_save, "mail_port")
-        _config_int(to_save, "mail_use_ssl")
-        _config_string(to_save, "mail_login")
-        _config_string(to_save, "mail_password")
-        _config_string(to_save, "mail_from")
-        _config_int(to_save, "mail_size", lambda y: int(y)*1024*1024)
-    try:
-        config.save()
-    except (OperationalError, InvalidRequestError) as e:
-        ub.session.rollback()
-        log.error_or_exception("Settings Database error: {}".format(e))
-        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-        return edit_mailsettings()
-
-    if to_save.get("test"):
-        if current_user.email:
-            result = send_test_mail(current_user.email, current_user.name)
-            if result is None:
-                flash(_(u"Test e-mail queued for sending to %(email)s, please check Tasks for result",
-                        email=current_user.email), category="info")
-            else:
-                flash(_(u"There was an error sending the Test e-mail: %(res)s", res=result), category="error")
-        else:
-            flash(_(u"Please configure your e-mail address first..."), category="error")
-    else:
-        flash(_(u"E-mail server settings updated"), category="success")
-
-    return edit_mailsettings()
-
-
-@admi.route("/admin/scheduledtasks")
-@login_required
-@admin_required
-def edit_scheduledtasks():
-    content = config.get_scheduled_task_settings()
-    time_field = list()
-    duration_field = list()
-
-    for n in range(24):
-        time_field.append((n , format_time(time(hour=n), format="short",)))
-    for n in range(5, 65, 5):
-        t = timedelta(hours=n // 60, minutes=n % 60)
-        duration_field.append((n, format_timedelta(t, threshold=.9)))
-
-    return render_title_template("schedule_edit.html", config=content, starttime=time_field, duration=duration_field, title=_(u"Edit Scheduled Tasks Settings"))
-
-
-@admi.route("/admin/scheduledtasks", methods=["POST"])
-@login_required
-@admin_required
-def update_scheduledtasks():
-    error = False
-    to_save = request.form.to_dict()
-    if 0 <= int(to_save.get("schedule_start_time")) <= 23:
-        _config_int(to_save, "schedule_start_time")
-    else:
-        flash(_(u"Invalid start time for task specified"), category="error")
-        error = True
-    if 0 < int(to_save.get("schedule_duration")) <= 60:
-        _config_int(to_save, "schedule_duration")
-    else:
-        flash(_(u"Invalid duration for task specified"), category="error")
-        error = True
-    _config_checkbox(to_save, "schedule_generate_book_covers")
-    _config_checkbox(to_save, "schedule_generate_series_covers")
-    _config_checkbox(to_save, "schedule_reconnect")
-
-    if not error:
-        try:
-            config.save()
-            flash(_(u"Scheduled tasks settings updated"), category="success")
-
-            # Cancel any running tasks
-            schedule.end_scheduled_tasks()
-
-            # Re-register tasks with new settings
-            schedule.register_scheduled_tasks(config.schedule_reconnect)
-        except IntegrityError:
-            ub.session.rollback()
-            log.error("An unknown error occurred while saving scheduled tasks settings")
-            flash(_(u"An unknown error occurred. Please try again later."), category="error")
-        except OperationalError:
-            ub.session.rollback()
-            log.error("Settings DB is not Writeable")
-            flash(_("Settings DB is not Writeable"), category="error")
-
-    return edit_scheduledtasks()
-
-
-@admi.route("/admin/user/<int:user_id>", methods=["GET", "POST"])
-@login_required
-@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 or (not config.config_anonbrowse and content.name == "Guest"):
-        flash(_(u"User not found"), category="error")
-        return redirect(url_for('admin.admin'))
-    languages = calibre_db.speaking_language(return_all_languages=True)
-    translations = babel.list_translations() + [Locale('en')]
-    kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    if request.method == "POST":
-        to_save = request.form.to_dict()
-        resp = _handle_edit_user(to_save, content, languages, translations, kobo_support)
-        if resp:
-            return resp
-    return render_title_template("user_edit.html",
-                                 translations=translations,
-                                 languages=languages,
-                                 new_user=0,
-                                 content=content,
-                                 config=config,
-                                 registered_oauth=oauth_check,
-                                 mail_configured=config.get_mail_server_configured(),
-                                 kobo_support=kobo_support,
-                                 title=_(u"Edit User %(nick)s", nick=content.name),
-                                 page="edituser")
-
-
-@admi.route("/admin/resetpassword/<int:user_id>", methods=["POST"])
-@login_required
-@admin_required
-def reset_user_password(user_id):
-    if current_user is not None and current_user.is_authenticated:
-        ret, message = reset_password(user_id)
-        if ret == 1:
-            log.debug(u"Password for user %s reset", message)
-            flash(_(u"Password for user %(user)s reset", user=message), category="success")
-        elif ret == 0:
-            log.error(u"An unknown error occurred. Please try again later.")
-            flash(_(u"An unknown error occurred. Please try again later."), category="error")
-        else:
-            log.error(u"Please configure the SMTP mail settings first...")
-            flash(_(u"Please configure the SMTP mail settings first..."), category="error")
-    return redirect(url_for('admin.admin'))
-
-
-@admi.route("/admin/logfile")
-@login_required
-@admin_required
-def view_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,
-                                 log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT),
-                                 logfiles=logfiles,
-                                 page="logfile")
-
-
-@admi.route("/ajax/log/<int:logtype>")
-@login_required
-@admin_required
-def send_logfile(logtype):
-    if logtype == 1:
-        logfile = logger.get_accesslogfile(config.config_access_logfile)
-        return send_from_directory(os.path.dirname(logfile),
-                                   os.path.basename(logfile))
-    if logtype == 0:
-        logfile = logger.get_logfile(config.config_logfile)
-        return send_from_directory(os.path.dirname(logfile),
-                                   os.path.basename(logfile))
-    else:
-        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
-@admin_required
-def get_update_status():
-    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'])
-@login_required
-@admin_required
-def get_updater_status():
-    status = {}
-    if feature_support['updater']:
-        if request.method == "POST":
-            commit = request.form.to_dict()
-            if "start" in commit and commit['start'] == 'True':
-                txt = {
-                    "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'),
-                    "13": _(u'Update failed:') + u' ' + _(u'Files could not be replaced during update')
-                }
-                status['text'] = txt
-                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 ldap_import_create_user(user, user_data):
-    user_login_field = extract_dynamic_field_from_filter(user, config.config_ldap_user_object)
-
-    try:
-        username = user_data[user_login_field][0].decode('utf-8')
-    except KeyError as ex:
-        log.error("Failed to extract LDAP user: %s - %s", user, ex)
-        message = _(u'Failed to extract at least One LDAP User')
-        return 0, message
-
-    # check for duplicate username
-    if ub.session.query(ub.User).filter(func.lower(ub.User.name) == username.lower()).first():
-        # if ub.session.query(ub.User).filter(ub.User.name == username).first():
-        log.warning("LDAP User  %s Already in Database", user_data)
-        return 0, None
-
-    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'
-
-    try:
-        # check for duplicate email
-        useremail = check_email(useremail)
-    except Exception as ex:
-        log.warning("LDAP Email Error: {}, {}".format(user_data, ex))
-        return 0, None
-    content = ub.User()
-    content.name = username
-    content.password = ''  # dummy password which will be replaced by ldap one
-    content.email = useremail
-    content.kindle_mail = kindlemail
-    content.default_language = config.config_default_language
-    content.locale = config.config_default_locale
-    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()
-        return 1, None    # increase no of users
-    except Exception as ex:
-        log.warning("Failed to create LDAP user: %s - %s", user, ex)
-        ub.session.rollback()
-        message = _(u'Failed to Create at Least One LDAP User')
-        return 0, message
-
-
-@admi.route('/import_ldap_users', methods=["POST"])
-@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.error_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 ex:
-                log.warning(ex)
-                continue
-        else:
-            user_identifier = user
-            query_filter = None
-        try:
-            user_data = services.ldap.get_object_details(user=user_identifier, query_filter=query_filter)
-        except AttributeError as ex:
-            log.error_or_exception(ex)
-            continue
-        if user_data:
-            user_count, message = ldap_import_create_user(user, user_data)
-            if message:
-                showtext['text'] = message
-            else:
-                imported += user_count
-        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:
@@ -1994,13 +2009,3 @@ def extract_dynamic_field_from_filter(user, filtr):
 def extract_user_identifier(user, filtr):
     dynamic_field = extract_dynamic_field_from_filter(user, filtr)
     return extract_user_data_from_field(user, dynamic_field)
-
-
-@admi.route("/ajax/canceltask", methods=['POST'])
-@login_required
-@admin_required
-def cancel_task():
-    task_id = request.get_json().get('task_id', None)
-    worker = WorkerThread.get_instance()
-    worker.end_task(task_id)
-    return ""
diff --git a/cps/babel.py b/cps/babel.py
index b0d5c238f..c16758097 100644
--- a/cps/babel.py
+++ b/cps/babel.py
@@ -1,4 +1,4 @@
-from babel import Locale as LC
+from babel import Locale
 from babel import negotiate_locale
 from flask_babel import Babel
 from babel.core import UnknownLocaleError
@@ -9,7 +9,7 @@ from . import logger
 log = logger.create()
 
 babel = Babel()
-BABEL_TRANSLATIONS = set()
+
 
 @babel.localeselector
 def get_locale():
@@ -23,8 +23,18 @@ def get_locale():
     if request.accept_languages:
         for x in request.accept_languages.values():
             try:
-                preferred.append(str(LC.parse(x.replace('-', '_'))))
+                preferred.append(str(Locale.parse(x.replace('-', '_'))))
             except (UnknownLocaleError, ValueError) as e:
                 log.debug('Could not parse locale "%s": %s', x, e)
 
-    return negotiate_locale(preferred or ['en'], BABEL_TRANSLATIONS)
+    return negotiate_locale(preferred or ['en'], get_available_translations())
+
+
+def get_user_locale_language(user_language):
+    return Locale.parse(user_language).get_language_name(get_locale())
+
+def get_available_locale():
+    return [Locale('en')] + babel.list_translations()
+
+def get_available_translations():
+    return set(str(item) for item in get_available_locale())
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 3ac3dfb8c..d36150506 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -39,10 +39,9 @@ from flask_babel import lazy_gettext as N_
 from flask_babel import get_locale
 from flask_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError
-# from sqlite3 import OperationalError as sqliteOperationalError
+
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status
-from . import config, ub, db
-from . import calibre_db
+from . import config, ub, db, calibre_db
 from .services.worker import WorkerThread
 from .tasks.upload import TaskUpload
 from .render_template import render_title_template
@@ -74,161 +73,6 @@ def edit_required(f):
     return inner
 
 
-def search_objects_remove(db_book_object, db_type, input_elements):
-    del_elements = []
-    for c_elements in db_book_object:
-        found = False
-        if db_type == 'languages':
-            type_elements = c_elements.lang_code
-        elif db_type == 'custom':
-            type_elements = c_elements.value
-        else:
-            type_elements = c_elements.name
-        for inp_element in input_elements:
-            if inp_element.lower() == type_elements.lower():
-                found = True
-                break
-        # if the element was not found in the new list, add it to remove list
-        if not found:
-            del_elements.append(c_elements)
-    return del_elements
-
-
-def search_objects_add(db_book_object, db_type, input_elements):
-    add_elements = []
-    for inp_element in input_elements:
-        found = False
-        for c_elements in db_book_object:
-            if db_type == 'languages':
-                type_elements = c_elements.lang_code
-            elif db_type == 'custom':
-                type_elements = c_elements.value
-            else:
-                type_elements = c_elements.name
-            if inp_element == type_elements:
-                found = True
-                break
-        if not found:
-            add_elements.append(inp_element)
-    return add_elements
-
-
-def remove_objects(db_book_object, db_session, del_elements):
-    changed = False
-    if len(del_elements) > 0:
-        for del_element in del_elements:
-            db_book_object.remove(del_element)
-            changed = True
-            if len(del_element.books) == 0:
-                db_session.delete(del_element)
-    return changed
-
-
-def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
-    changed = False
-    if db_type == 'languages':
-        db_filter = db_object.lang_code
-    elif db_type == 'custom':
-        db_filter = db_object.value
-    else:
-        db_filter = db_object.name
-    for add_element in add_elements:
-        # check if an element with that name exists
-        db_element = db_session.query(db_object).filter(db_filter == add_element).first()
-        # if no element is found add it
-        if db_type == 'author':
-            new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ',')), "")
-        elif db_type == 'series':
-            new_element = db_object(add_element, add_element)
-        elif db_type == 'custom':
-            new_element = db_object(value=add_element)
-        elif db_type == 'publisher':
-            new_element = db_object(add_element, None)
-        else:  # db_type should be tag or language
-            new_element = db_object(add_element)
-        if db_element is None:
-            changed = True
-            db_session.add(new_element)
-            db_book_object.append(new_element)
-        else:
-            db_element = create_objects_for_addition(db_element, add_element, db_type)
-            # add element to book
-            changed = True
-            db_book_object.append(db_element)
-    return changed
-
-
-def create_objects_for_addition(db_element, add_element, db_type):
-    if db_type == 'custom':
-        if db_element.value != add_element:
-            db_element.value = add_element
-    elif db_type == 'languages':
-        if db_element.lang_code != add_element:
-            db_element.lang_code = add_element
-    elif db_type == 'series':
-        if db_element.name != add_element:
-            db_element.name = add_element
-            db_element.sort = add_element
-    elif db_type == 'author':
-        if db_element.name != add_element:
-            db_element.name = add_element
-            db_element.sort = helper.get_sorted_author(add_element.replace('|', ','))
-    elif db_type == 'publisher':
-        if db_element.name != add_element:
-            db_element.name = add_element
-            db_element.sort = None
-    elif db_element.name != add_element:
-        db_element.name = add_element
-    return db_element
-
-
-# Modifies different Database objects, first check if elements have to be deleted,
-# because they are no longer used, than check if elements have to be added to database
-def modify_database_object(input_elements, db_book_object, db_object, db_session, db_type):
-    # passing input_elements not as a list may lead to undesired results
-    if not isinstance(input_elements, list):
-        raise TypeError(str(input_elements) + " should be passed as a list")
-    input_elements = [x for x in input_elements if x != '']
-    # we have all input element (authors, series, tags) names now
-    # 1. search for elements to remove
-    del_elements = search_objects_remove(db_book_object, db_type, input_elements)
-    # 2. search for elements that need to be added
-    add_elements = search_objects_add(db_book_object, db_type, input_elements)
-    # if there are elements to remove, we remove them now
-    changed = remove_objects(db_book_object, db_session, del_elements)
-    # if there are elements to add, we add them now!
-    if len(add_elements) > 0:
-        changed |= add_objects(db_book_object, db_object, db_session, db_type, add_elements)
-    return changed
-
-
-def modify_identifiers(input_identifiers, db_identifiers, db_session):
-    """Modify Identifiers to match input information.
-       input_identifiers is a list of read-to-persist Identifiers objects.
-       db_identifiers is a list of already persisted list of Identifiers objects."""
-    changed = False
-    error = False
-    input_dict = dict([(identifier.type.lower(), identifier) for identifier in input_identifiers])
-    if len(input_identifiers) != len(input_dict):
-        error = True
-    db_dict = dict([(identifier.type.lower(), identifier) for identifier in db_identifiers])
-    # delete db identifiers not present in input or modify them with input val
-    for identifier_type, identifier in db_dict.items():
-        if identifier_type not in input_dict.keys():
-            db_session.delete(identifier)
-            changed = True
-        else:
-            input_identifier = input_dict[identifier_type]
-            identifier.type = input_identifier.type
-            identifier.val = input_identifier.val
-    # add input identifiers not present in db
-    for identifier_type, identifier in input_dict.items():
-        if identifier_type not in db_dict.keys():
-            db_session.add(identifier)
-            changed = True
-    return changed, error
-
-
 @editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
 @login_required
 def delete_book_from_details(book_id):
@@ -242,6 +86,677 @@ def delete_book_ajax(book_id, book_format):
     return delete_book_from_table(book_id, book_format, False)
 
 
+@editbook.route("/admin/book/<int:book_id>", methods=['GET'])
+@login_required_if_no_ano
+@edit_required
+def show_edit_book(book_id):
+    return render_edit_book(book_id)
+
+
+@editbook.route("/admin/book/<int:book_id>", methods=['POST'])
+@login_required_if_no_ano
+@edit_required
+def edit_book(book_id):
+    modify_date = False
+    edit_error = False
+
+    # create the function for sorting...
+    calibre_db.update_title_sort(config)
+
+    book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
+    # Book not found
+    if not book:
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
+        return redirect(url_for("web.index"))
+
+    to_save = request.form.to_dict()
+
+    try:
+        # Update folder of book on local disk
+        edited_books_id = None
+        title_author_error = None
+        # handle book title change
+        title_change = handle_title_on_edit(book, to_save["book_title"])
+        # handle book author change
+        input_authors, author_change, renamed = handle_author_on_edit(book, to_save["author_name"])
+        if author_change or title_change:
+            edited_books_id = book.id
+            modify_date = True
+            title_author_error = helper.update_dir_structure(edited_books_id,
+                                                             config.config_calibre_dir,
+                                                             input_authors[0],
+                                                             renamed_author=renamed)
+        if title_author_error:
+            flash(title_author_error, category="error")
+            calibre_db.session.rollback()
+            book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
+
+        # handle upload other formats from local disk
+        meta = upload_single_file(request, book, book_id)
+        # only merge metadata if file was uploaded and no error occurred (meta equals not false or none)
+        if meta:
+            merge_metadata(to_save, meta)
+        # handle upload covers from local disk
+        cover_upload_success = upload_cover(request, book)
+        if cover_upload_success:
+            book.has_cover = 1
+            modify_date = True
+
+        # upload new covers or new file formats to google drive
+        if config.config_use_google_drive:
+            gdriveutils.updateGdriveCalibreFromLocal()
+
+        if to_save.get("cover_url", None):
+            if not current_user.role_upload():
+                edit_error = True
+                flash(_(u"User has no rights to upload cover"), category="error")
+            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"].strip(), book.path)
+                if result is True:
+                    book.has_cover = 1
+                    modify_date = True
+                    helper.replace_cover_thumbnail_cache(book.id)
+                else:
+                    flash(error, category="error")
+
+        # Add default series_index to book
+        modify_date |= edit_book_series_index(to_save["series_index"], book)
+        # Handle book comments/description
+        modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
+        # Handle identifiers
+        input_identifiers = identifier_list(to_save, book)
+        modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
+        if warning:
+            flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
+        modify_date |= modification
+        # Handle book tags
+        modify_date |= edit_book_tags(to_save['tags'], book)
+        # Handle book series
+        modify_date |= edit_book_series(to_save["series"], book)
+        # handle book publisher
+        modify_date |= edit_book_publisher(to_save['publisher'], book)
+        # handle book languages
+        try:
+            modify_date |= edit_book_languages(to_save['languages'], book)
+        except ValueError as e:
+            flash(str(e), category="error")
+            edit_error = True
+        # handle book ratings
+        modify_date |= edit_book_ratings(to_save, book)
+        # handle cc data
+        modify_date |= edit_all_cc_data(book_id, book, to_save)
+
+        if to_save.get("pubdate", None):
+            try:
+                book.pubdate = datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
+            except ValueError as e:
+                book.pubdate = db.Books.DEFAULT_PUBDATE
+                flash(str(e), category="error")
+                edit_error = True
+        else:
+            book.pubdate = db.Books.DEFAULT_PUBDATE
+
+        if modify_date:
+            book.last_modified = datetime.utcnow()
+            kobo_sync_status.remove_synced_book(edited_books_id, all=True)
+
+        calibre_db.session.merge(book)
+        calibre_db.session.commit()
+        if config.config_use_google_drive:
+            gdriveutils.updateGdriveCalibreFromLocal()
+        if meta is not False \
+            and edit_error is not True \
+                and title_author_error is not True \
+                and cover_upload_success is not False:
+            flash(_("Metadata successfully updated"), category="success")
+        if "detail_view" in to_save:
+            return redirect(url_for('web.show_book', book_id=book.id))
+        else:
+            return render_edit_book(book_id)
+    except ValueError as e:
+        log.error_or_exception("Error: {}".format(e))
+        calibre_db.session.rollback()
+        flash(str(e), category="error")
+        return redirect(url_for('web.show_book', book_id=book.id))
+    except (OperationalError, IntegrityError) as e:
+        log.error_or_exception("Database error: {}".format(e))
+        calibre_db.session.rollback()
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
+        return redirect(url_for('web.show_book', book_id=book.id))
+    except Exception as ex:
+        log.error_or_exception(ex)
+        calibre_db.session.rollback()
+        flash(_("Error editing book: {}".format(ex)), category="error")
+        return redirect(url_for('web.show_book', book_id=book.id))
+
+
+@editbook.route("/upload", methods=["POST"])
+@login_required_if_no_ano
+@upload_required
+def upload():
+    if not config.config_uploading:
+        abort(404)
+    if request.method == 'POST' and 'btn-upload' in request.files:
+        for requested_file in request.files.getlist("btn-upload"):
+            try:
+                modify_date = False
+                # create the function for sorting...
+                calibre_db.update_title_sort(config)
+                calibre_db.session.connection().connection.connection.create_function('uuid4', 0, lambda: str(uuid4()))
+
+                meta, error = file_handling_on_upload(requested_file)
+                if error:
+                    return error
+
+                db_book, input_authors, title_dir, renamed_authors = create_book_on_upload(modify_date, meta)
+
+                # Comments need book id therefore only possible after flush
+                modify_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
+
+                book_id = db_book.id
+                title = db_book.title
+                if config.config_use_google_drive:
+                    helper.upload_new_file_gdrive(book_id,
+                                                  input_authors[0],
+                                                  renamed_authors,
+                                                  title,
+                                                  title_dir,
+                                                  meta.file_path,
+                                                  meta.extension.lower())
+                else:
+                    error = helper.update_dir_structure(book_id,
+                                                        config.config_calibre_dir,
+                                                        input_authors[0],
+                                                        meta.file_path,
+                                                        title_dir + meta.extension.lower(),
+                                                        renamed_author=renamed_authors)
+
+                move_coverfile(meta, db_book)
+
+                # save data to database, reread data
+                calibre_db.session.commit()
+
+                if config.config_use_google_drive:
+                    gdriveutils.updateGdriveCalibreFromLocal()
+                if error:
+                    flash(error, category="error")
+                link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
+                upload_text = N_(u"File %(file)s uploaded", file=link)
+                WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
+                helper.add_book_to_thumbnail_cache(book_id)
+
+                if len(request.files.getlist("btn-upload")) < 2:
+                    if current_user.role_edit() or current_user.role_admin():
+                        resp = {"location": url_for('edit-book.show_edit_book', book_id=book_id)}
+                        return Response(json.dumps(resp), mimetype='application/json')
+                    else:
+                        resp = {"location": url_for('web.show_book', book_id=book_id)}
+                        return Response(json.dumps(resp), mimetype='application/json')
+            except (OperationalError, IntegrityError) as e:
+                calibre_db.session.rollback()
+                log.error_or_exception("Database error: {}".format(e))
+                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
+        return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+
+
+@editbook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
+@login_required_if_no_ano
+@edit_required
+def convert_bookformat(book_id):
+    # check to see if we have form fields to work with -  if not send user back
+    book_format_from = request.form.get('book_format_from', None)
+    book_format_to = request.form.get('book_format_to', None)
+
+    if (book_format_from is None) or (book_format_to is None):
+        flash(_(u"Source or destination format for conversion missing"), category="error")
+        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
+
+    log.info('converting: book id: %s from: %s to: %s', book_id, book_format_from, book_format_to)
+    rtn = helper.convert_book_format(book_id, config.config_calibre_dir, book_format_from.upper(),
+                                     book_format_to.upper(), current_user.name)
+
+    if rtn is None:
+        flash(_(u"Book successfully queued for converting to %(book_format)s",
+                book_format=book_format_to),
+              category="success")
+    else:
+        flash(_(u"There was an error converting this book: %(res)s", res=rtn), category="error")
+    return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
+
+
+@editbook.route("/ajax/getcustomenum/<int:c_id>")
+@login_required
+def table_get_custom_enum(c_id):
+    ret = list()
+    cc = (calibre_db.session.query(db.CustomColumns)
+          .filter(db.CustomColumns.id == c_id)
+          .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).one_or_none())
+    ret.append({'value': "", 'text': ""})
+    for idx, en in enumerate(cc.get_display_dict()['enum_values']):
+        ret.append({'value': en, 'text': en})
+    return json.dumps(ret)
+
+
+@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'])
+    sort_param = ""
+    ret = ""
+    try:
+        if param == 'series_index':
+            edit_book_series_index(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
+        elif param == 'tags':
+            edit_book_tags(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
+                           mimetype='application/json')
+        elif param == 'series':
+            edit_book_series(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
+                           mimetype='application/json')
+        elif param == 'publishers':
+            edit_book_publisher(vals['value'], book)
+            ret = Response(json.dumps({'success': True,
+                                       'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
+                           mimetype='application/json')
+        elif param == 'languages':
+            invalid = list()
+            edit_book_languages(vals['value'], book, invalid=invalid)
+            if invalid:
+                ret = Response(json.dumps({'success': False,
+                                           'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
+                               mimetype='application/json')
+            else:
+                lang_names = list()
+                for lang in book.languages:
+                    lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
+                ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
+                               mimetype='application/json')
+        elif param == 'author_sort':
+            book.author_sort = vals['value']
+            ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
+                           mimetype='application/json')
+        elif param == 'title':
+            sort_param = book.sort
+            if handle_title_on_edit(book, vals.get('value', "")):
+                rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir)
+                if not rename_error:
+                    ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
+                                   mimetype='application/json')
+                else:
+                    ret = Response(json.dumps({'success': False,
+                                               'msg': rename_error}),
+                                   mimetype='application/json')
+        elif param == 'sort':
+            book.sort = vals['value']
+            ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
+                           mimetype='application/json')
+        elif param == 'comments':
+            edit_book_comments(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
+                           mimetype='application/json')
+        elif param == 'authors':
+            input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
+            rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0],
+                                                       renamed_author=renamed)
+            if not rename_error:
+                ret = Response(json.dumps({
+                    'success': True,
+                    'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
+                    mimetype='application/json')
+            else:
+                ret = Response(json.dumps({'success': False,
+                                           'msg': rename_error}),
+                               mimetype='application/json')
+        elif param == 'is_archived':
+            is_archived = change_archived_books(book.id, vals['value'] == "True",
+                                                message="Book {} archive bit set to: {}".format(book.id, vals['value']))
+            if is_archived:
+                kobo_sync_status.remove_synced_book(book.id)
+            return ""
+        elif param == 'read_status':
+            ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
+            if ret:
+                return ret, 400
+        elif param.startswith("custom_column_"):
+            new_val = dict()
+            new_val[param] = vals['value']
+            edit_single_cc_data(book.id, book, param[14:], new_val)
+            # ToDo: Very hacky find better solution
+            if vals['value'] in ["True", "False"]:
+                ret = ""
+            else:
+                ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
+                               mimetype='application/json')
+        else:
+            return _("Parameter not found"), 400
+        book.last_modified = datetime.utcnow()
+
+        calibre_db.session.commit()
+        # revert change for sort if automatic fields link is deactivated
+        if param == 'title' and vals.get('checkT') == "false":
+            book.sort = sort_param
+            calibre_db.session.commit()
+    except (OperationalError, IntegrityError) as e:
+        calibre_db.session.rollback()
+        log.error_or_exception("Database error: {}".format(e))
+        ret = Response(json.dumps({'success': False,
+                                   'msg': 'Database error: {}'.format(e.orig)}),
+                       mimetype='application/json')
+    return ret
+
+
+@editbook.route("/ajax/sort_value/<field>/<int:bookid>")
+@login_required
+def get_sorted_entry(field, bookid):
+    if field in ['title', 'authors', 'sort', 'author_sort']:
+        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})
+            if field == 'sort':
+                return json.dumps({'sort': book.title})
+            if field == 'author_sort':
+                return json.dumps({'author_sort': book.author})
+    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:
+            from_book = []
+            for book_id in vals:
+                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,
+                                                chars=96) + ' - ' + helper.get_valid_filename(to_book.authors[0].name,
+                                                                                              chars=96)
+            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_table(from_book.id, "", True)
+                    return json.dumps({'success': True})
+    return ""
+
+
+@editbook.route("/ajax/xchange", methods=['POST'])
+@login_required
+@edit_required
+def table_xchange_author_title():
+    vals = request.get_json().get('xchange')
+    edited_books_id = False
+    if vals:
+        for val in vals:
+            modify_date = False
+            book = calibre_db.get_book(val)
+            authors = book.title
+            book.authors = calibre_db.order_authors([book])
+            author_names = []
+            for authr in book.authors:
+                author_names.append(authr.name.replace('|', ','))
+
+            title_change = handle_title_on_edit(book, " ".join(author_names))
+            input_authors, author_change, renamed = handle_author_on_edit(book, authors)
+            if author_change or title_change:
+                edited_books_id = book.id
+                modify_date = True
+
+            if config.config_use_google_drive:
+                gdriveutils.updateGdriveCalibreFromLocal()
+
+            if edited_books_id:
+                # toDo: Handle error
+                edit_error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
+                                                         renamed_author=renamed)
+            if modify_date:
+                book.last_modified = datetime.utcnow()
+            try:
+                calibre_db.session.commit()
+            except (OperationalError, IntegrityError) as e:
+                calibre_db.session.rollback()
+                log.error_or_exception("Database error: %s", e)
+                return json.dumps({'success': False})
+
+            if config.config_use_google_drive:
+                gdriveutils.updateGdriveCalibreFromLocal()
+        return json.dumps({'success': True})
+    return ""
+
+
+def merge_metadata(to_save, meta):
+    if to_save.get('author_name', "") == _(u'Unknown'):
+        to_save['author_name'] = ''
+    if to_save.get('book_title', "") == _(u'Unknown'):
+        to_save['book_title'] = ''
+    for s_field, m_field in [
+            ('tags', 'tags'), ('author_name', 'author'), ('series', 'series'),
+            ('series_index', 'series_id'), ('languages', 'languages'),
+            ('book_title', 'title')]:
+        to_save[s_field] = to_save[s_field] or getattr(meta, m_field, '')
+    to_save["description"] = to_save["description"] or Markup(
+        getattr(meta, 'description', '')).unescape()
+
+
+def identifier_list(to_save, book):
+    """Generate a list of Identifiers from form information"""
+    id_type_prefix = 'identifier-type-'
+    id_val_prefix = 'identifier-val-'
+    result = []
+    for type_key, type_value in to_save.items():
+        if not type_key.startswith(id_type_prefix):
+            continue
+        val_key = id_val_prefix + type_key[len(id_type_prefix):]
+        if val_key not in to_save.keys():
+            continue
+        result.append(db.Identifiers(to_save[val_key], type_value, book.id))
+    return result
+
+
+def prepare_authors(authr):
+    # handle authors
+    input_authors = authr.split('&')
+    # handle_authors(input_authors)
+    input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
+    # Remove duplicates in authors list
+    input_authors = helper.uniq(input_authors)
+
+    # we have all author names now
+    if input_authors == ['']:
+        input_authors = [_(u'Unknown')]  # prevent empty Author
+
+    renamed = list()
+    for in_aut in input_authors:
+        renamed_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == in_aut).first()
+        if renamed_author and in_aut != renamed_author.name:
+            renamed.append(renamed_author.name)
+            all_books = calibre_db.session.query(db.Books) \
+                .filter(db.Books.authors.any(db.Authors.name == renamed_author.name)).all()
+            sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
+            sorted_old_author = helper.get_sorted_author(in_aut)
+            for one_book in all_books:
+                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
+    return input_authors, renamed
+
+
+def prepare_authors_on_upload(title, authr):
+    if title != _(u'Unknown') and authr != _(u'Unknown'):
+        entry = calibre_db.check_exists_book(authr, title)
+        if entry:
+            log.info("Uploaded book probably exists in library")
+            flash(_(u"Uploaded book probably exists in the library, consider to change before upload new: ")
+                  + Markup(render_title_template('book_exists_flash.html', entry=entry)), category="warning")
+
+    input_authors, renamed = prepare_authors(authr)
+
+    sort_authors_list = list()
+    db_author = None
+    for inp in input_authors:
+        stored_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == inp).first()
+        if not stored_author:
+            if not db_author:
+                db_author = db.Authors(inp, helper.get_sorted_author(inp), "")
+                calibre_db.session.add(db_author)
+                calibre_db.session.commit()
+            sort_author = helper.get_sorted_author(inp)
+        else:
+            if not db_author:
+                db_author = stored_author
+            sort_author = stored_author.sort
+        sort_authors_list.append(sort_author)
+    sort_authors = ' & '.join(sort_authors_list)
+    return sort_authors, input_authors, db_author, renamed
+
+
+def create_book_on_upload(modify_date, meta):
+    title = meta.title
+    authr = meta.author
+    sort_authors, input_authors, db_author, renamed_authors = prepare_authors_on_upload(title, authr)
+
+    title_dir = helper.get_valid_filename(title, chars=96)
+    author_dir = helper.get_valid_filename(db_author.name, chars=96)
+
+    # combine path and normalize path from Windows systems
+    path = os.path.join(author_dir, title_dir).replace('\\', '/')
+
+    try:
+        pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
+    except ValueError:
+        pubdate = datetime(101, 1, 1)
+
+    # Calibre adds books with utc as timezone
+    db_book = db.Books(title, "", sort_authors, datetime.utcnow(), pubdate,
+                       '1', datetime.utcnow(), path, meta.cover, db_author, [], "")
+
+    modify_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
+                                          'author')
+
+    # Add series_index to book
+    modify_date |= edit_book_series_index(meta.series_id, db_book)
+
+    # add languages
+    invalid = []
+    modify_date |= edit_book_languages(meta.languages, db_book, upload_mode=True, invalid=invalid)
+    if invalid:
+        for lang in invalid:
+            flash(_(u"'%(langname)s' is not a valid language", langname=lang), category="warning")
+
+    # handle tags
+    modify_date |= edit_book_tags(meta.tags, db_book)
+
+    # handle publisher
+    modify_date |= edit_book_publisher(meta.publisher, db_book)
+
+    # handle series
+    modify_date |= edit_book_series(meta.series, db_book)
+
+    # Add file to book
+    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)
+
+    # flush content, get db_book.id available
+    calibre_db.session.flush()
+
+    # Handle identifiers now that db_book.id is available
+    identifier_list = []
+    for type_key, type_value in meta.identifiers:
+        identifier_list.append(db.Identifiers(type_value, type_key, db_book.id))
+    modification, warning = modify_identifiers(identifier_list, db_book.identifiers, calibre_db.session)
+    if warning:
+        flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
+    modify_date |= modification
+
+    return db_book, input_authors, title_dir, renamed_authors
+
+
+def file_handling_on_upload(requested_file):
+    # 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 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 None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+    else:
+        flash(_('File to be uploaded must have an extension'), category="error")
+        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+
+    # extract metadata from file
+    try:
+        meta = uploader.upload(requested_file, config.config_rarfile_location)
+    except (IOError, OSError):
+        log.error("File %s could not saved to temp dir", requested_file.filename)
+        flash(_(u"File %(filename)s could not saved to temp dir",
+                filename=requested_file.filename), category="error")
+        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+    return meta, None
+
+
+def move_coverfile(meta, db_book):
+    # move cover to final directory, including book id
+    if meta.cover:
+        cover_file = meta.cover
+    else:
+        cover_file = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
+    new_cover_path = os.path.join(config.config_calibre_dir, db_book.path)
+    try:
+        os.makedirs(new_cover_path, exist_ok=True)
+        copyfile(cover_file, os.path.join(new_cover_path, "cover.jpg"))
+        if meta.cover:
+            os.unlink(meta.cover)
+    except OSError as e:
+        log.error("Failed to move cover file %s: %s", new_cover_path, e)
+        flash(_(u"Failed to Move Cover File %(file)s: %(error)s", file=new_cover_path,
+                error=e),
+              category="error")
+
+
 def delete_whole_book(book_id, book):
     # delete book from shelves, Downloads, Read list
     ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).delete()
@@ -744,676 +1259,156 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     return input_authors, change, renamed
 
 
-@editbook.route("/admin/book/<int:book_id>", methods=['GET'])
-@login_required_if_no_ano
-@edit_required
-def show_edit_book(book_id):
-    return render_edit_book(book_id)
+def search_objects_remove(db_book_object, db_type, input_elements):
+    del_elements = []
+    for c_elements in db_book_object:
+        found = False
+        if db_type == 'languages':
+            type_elements = c_elements.lang_code
+        elif db_type == 'custom':
+            type_elements = c_elements.value
+        else:
+            type_elements = c_elements.name
+        for inp_element in input_elements:
+            if inp_element.lower() == type_elements.lower():
+                found = True
+                break
+        # if the element was not found in the new list, add it to remove list
+        if not found:
+            del_elements.append(c_elements)
+    return del_elements
 
 
-@editbook.route("/admin/book/<int:book_id>", methods=['POST'])
-@login_required_if_no_ano
-@edit_required
-def edit_book(book_id):
-    modify_date = False
-    edit_error = False
-
-    # create the function for sorting...
-    #try:
-    calibre_db.update_title_sort(config)
-    #except sqliteOperationalError as e:
-    #    log.error_or_exception(e)
-    #    calibre_db.session.rollback()
-
-    book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-    # Book not found
-    if not book:
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
-              category="error")
-        return redirect(url_for("web.index"))
-
-    to_save = request.form.to_dict()
-
-    try:
-        # Update folder of book on local disk
-        edited_books_id = None
-        title_author_error = None
-        # handle book title change
-        title_change = handle_title_on_edit(book, to_save["book_title"])
-        # handle book author change
-        input_authors, author_change, renamed = handle_author_on_edit(book, to_save["author_name"])
-        if author_change or title_change:
-            edited_books_id = book.id
-            modify_date = True
-            title_author_error = helper.update_dir_structure(edited_books_id,
-                                                             config.config_calibre_dir,
-                                                             input_authors[0],
-                                                             renamed_author=renamed)
-        if title_author_error:
-            flash(title_author_error, category="error")
-            calibre_db.session.rollback()
-            book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-
-        # handle upload other formats from local disk
-        meta = upload_single_file(request, book, book_id)
-        # only merge metadata if file was uploaded and no error occurred (meta equals not false or none)
-        if meta:
-            merge_metadata(to_save, meta)
-        # handle upload covers from local disk
-        cover_upload_success = upload_cover(request, book)
-        if cover_upload_success:
-            book.has_cover = 1
-            modify_date = True
-
-        # upload new covers or new file formats to google drive
-        if config.config_use_google_drive:
-            gdriveutils.updateGdriveCalibreFromLocal()
-
-        if to_save.get("cover_url", None):
-            if not current_user.role_upload():
-                edit_error = True
-                flash(_(u"User has no rights to upload cover"), category="error")
-            if to_save["cover_url"].endswith('/static/generic_cover.jpg'):
-                book.has_cover = 0
+def search_objects_add(db_book_object, db_type, input_elements):
+    add_elements = []
+    for inp_element in input_elements:
+        found = False
+        for c_elements in db_book_object:
+            if db_type == 'languages':
+                type_elements = c_elements.lang_code
+            elif db_type == 'custom':
+                type_elements = c_elements.value
             else:
-                result, error = helper.save_cover_from_url(to_save["cover_url"].strip(), book.path)
-                if result is True:
-                    book.has_cover = 1
-                    modify_date = True
-                    helper.replace_cover_thumbnail_cache(book.id)
-                else:
-                    flash(error, category="error")
-
-        # Add default series_index to book
-        modify_date |= edit_book_series_index(to_save["series_index"], book)
-        # Handle book comments/description
-        modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
-        # Handle identifiers
-        input_identifiers = identifier_list(to_save, book)
-        modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
-        if warning:
-            flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
-        modify_date |= modification
-        # Handle book tags
-        modify_date |= edit_book_tags(to_save['tags'], book)
-        # Handle book series
-        modify_date |= edit_book_series(to_save["series"], book)
-        # handle book publisher
-        modify_date |= edit_book_publisher(to_save['publisher'], book)
-        # handle book languages
-        try:
-            modify_date |= edit_book_languages(to_save['languages'], book)
-        except ValueError as e:
-            flash(str(e), category="error")
-            edit_error = True
-        # handle book ratings
-        modify_date |= edit_book_ratings(to_save, book)
-        # handle cc data
-        modify_date |= edit_all_cc_data(book_id, book, to_save)
-
-        if to_save.get("pubdate", None):
-            try:
-                book.pubdate = datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
-            except ValueError as e:
-                book.pubdate = db.Books.DEFAULT_PUBDATE
-                flash(str(e), category="error")
-                edit_error = True
-        else:
-            book.pubdate = db.Books.DEFAULT_PUBDATE
-
-        if modify_date:
-            book.last_modified = datetime.utcnow()
-            kobo_sync_status.remove_synced_book(edited_books_id, all=True)
-
-        calibre_db.session.merge(book)
-        calibre_db.session.commit()
-        if config.config_use_google_drive:
-            gdriveutils.updateGdriveCalibreFromLocal()
-        if meta is not False \
-            and edit_error is not True \
-                and title_author_error is not True \
-                and cover_upload_success is not False:
-            flash(_("Metadata successfully updated"), category="success")
-        if "detail_view" in to_save:
-            return redirect(url_for('web.show_book', book_id=book.id))
-        else:
-            return render_edit_book(book_id)
-    except ValueError as e:
-        log.error_or_exception("Error: {}".format(e))
-        calibre_db.session.rollback()
-        flash(str(e), category="error")
-        return redirect(url_for('web.show_book', book_id=book.id))
-    except (OperationalError, IntegrityError) as e:
-        log.error_or_exception("Database error: {}".format(e))
-        calibre_db.session.rollback()
-        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-        return redirect(url_for('web.show_book', book_id=book.id))
-    except Exception as ex:
-        log.error_or_exception(ex)
-        calibre_db.session.rollback()
-        flash(_("Error editing book: {}".format(ex)), category="error")
-        return redirect(url_for('web.show_book', book_id=book.id))
+                type_elements = c_elements.name
+            if inp_element == type_elements:
+                found = True
+                break
+        if not found:
+            add_elements.append(inp_element)
+    return add_elements
 
 
-def merge_metadata(to_save, meta):
-    if to_save.get('author_name', "") == _(u'Unknown'):
-        to_save['author_name'] = ''
-    if to_save.get('book_title', "") == _(u'Unknown'):
-        to_save['book_title'] = ''
-    for s_field, m_field in [
-            ('tags', 'tags'), ('author_name', 'author'), ('series', 'series'),
-            ('series_index', 'series_id'), ('languages', 'languages'),
-            ('book_title', 'title')]:
-        to_save[s_field] = to_save[s_field] or getattr(meta, m_field, '')
-    to_save["description"] = to_save["description"] or Markup(
-        getattr(meta, 'description', '')).unescape()
+def remove_objects(db_book_object, db_session, del_elements):
+    changed = False
+    if len(del_elements) > 0:
+        for del_element in del_elements:
+            db_book_object.remove(del_element)
+            changed = True
+            if len(del_element.books) == 0:
+                db_session.delete(del_element)
+    return changed
 
 
-def identifier_list(to_save, book):
-    """Generate a list of Identifiers from form information"""
-    id_type_prefix = 'identifier-type-'
-    id_val_prefix = 'identifier-val-'
-    result = []
-    for type_key, type_value in to_save.items():
-        if not type_key.startswith(id_type_prefix):
-            continue
-        val_key = id_val_prefix + type_key[len(id_type_prefix):]
-        if val_key not in to_save.keys():
-            continue
-        result.append(db.Identifiers(to_save[val_key], type_value, book.id))
-    return result
-
-
-def prepare_authors(authr):
-    # handle authors
-    input_authors = authr.split('&')
-    # handle_authors(input_authors)
-    input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
-    # Remove duplicates in authors list
-    input_authors = helper.uniq(input_authors)
-
-    # we have all author names now
-    if input_authors == ['']:
-        input_authors = [_(u'Unknown')]  # prevent empty Author
-
-    renamed = list()
-    for in_aut in input_authors:
-        renamed_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == in_aut).first()
-        if renamed_author and in_aut != renamed_author.name:
-            renamed.append(renamed_author.name)
-            all_books = calibre_db.session.query(db.Books) \
-                .filter(db.Books.authors.any(db.Authors.name == renamed_author.name)).all()
-            sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
-            sorted_old_author = helper.get_sorted_author(in_aut)
-            for one_book in all_books:
-                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
-    return input_authors, renamed
-
-
-def prepare_authors_on_upload(title, authr):
-    if title != _(u'Unknown') and authr != _(u'Unknown'):
-        entry = calibre_db.check_exists_book(authr, title)
-        if entry:
-            log.info("Uploaded book probably exists in library")
-            flash(_(u"Uploaded book probably exists in the library, consider to change before upload new: ")
-                  + Markup(render_title_template('book_exists_flash.html', entry=entry)), category="warning")
-
-    input_authors, renamed = prepare_authors(authr)
-
-    sort_authors_list = list()
-    db_author = None
-    for inp in input_authors:
-        stored_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == inp).first()
-        if not stored_author:
-            if not db_author:
-                db_author = db.Authors(inp, helper.get_sorted_author(inp), "")
-                calibre_db.session.add(db_author)
-                calibre_db.session.commit()
-            sort_author = helper.get_sorted_author(inp)
-        else:
-            if not db_author:
-                db_author = stored_author
-            sort_author = stored_author.sort
-        sort_authors_list.append(sort_author)
-    sort_authors = ' & '.join(sort_authors_list)
-    return sort_authors, input_authors, db_author, renamed
-
-
-def create_book_on_upload(modify_date, meta):
-    title = meta.title
-    authr = meta.author
-    sort_authors, input_authors, db_author, renamed_authors = prepare_authors_on_upload(title, authr)
-
-    title_dir = helper.get_valid_filename(title, chars=96)
-    author_dir = helper.get_valid_filename(db_author.name, chars=96)
-
-    # combine path and normalize path from Windows systems
-    path = os.path.join(author_dir, title_dir).replace('\\', '/')
-
-    try:
-        pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
-    except ValueError:
-        pubdate = datetime(101, 1, 1)
-
-    # Calibre adds books with utc as timezone
-    db_book = db.Books(title, "", sort_authors, datetime.utcnow(), pubdate,
-                       '1', datetime.utcnow(), path, meta.cover, db_author, [], "")
-
-    modify_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
-                                          'author')
-
-    # Add series_index to book
-    modify_date |= edit_book_series_index(meta.series_id, db_book)
-
-    # add languages
-    invalid = []
-    modify_date |= edit_book_languages(meta.languages, db_book, upload_mode=True, invalid=invalid)
-    if invalid:
-        for lang in invalid:
-            flash(_(u"'%(langname)s' is not a valid language", langname=lang), category="warning")
-
-    # handle tags
-    modify_date |= edit_book_tags(meta.tags, db_book)
-
-    # handle publisher
-    modify_date |= edit_book_publisher(meta.publisher, db_book)
-
-    # handle series
-    modify_date |= edit_book_series(meta.series, db_book)
-
-    # Add file to book
-    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)
-
-    # flush content, get db_book.id available
-    calibre_db.session.flush()
-
-    # Handle identifiers now that db_book.id is available
-    identifier_list = []
-    for type_key, type_value in meta.identifiers:
-        identifier_list.append(db.Identifiers(type_value, type_key, db_book.id))
-    modification, warning = modify_identifiers(identifier_list, db_book.identifiers, calibre_db.session)
-    if warning:
-        flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
-    modify_date |= modification
-
-    return db_book, input_authors, title_dir, renamed_authors
-
-
-def file_handling_on_upload(requested_file):
-    # 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 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 None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
+    changed = False
+    if db_type == 'languages':
+        db_filter = db_object.lang_code
+    elif db_type == 'custom':
+        db_filter = db_object.value
     else:
-        flash(_('File to be uploaded must have an extension'), category="error")
-        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
-
-    # extract metadata from file
-    try:
-        meta = uploader.upload(requested_file, config.config_rarfile_location)
-    except (IOError, OSError):
-        log.error("File %s could not saved to temp dir", requested_file.filename)
-        flash(_(u"File %(filename)s could not saved to temp dir",
-                filename=requested_file.filename), category="error")
-        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
-    return meta, None
-
-
-def move_coverfile(meta, db_book):
-    # move cover to final directory, including book id
-    if meta.cover:
-        cover_file = meta.cover
-    else:
-        cover_file = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
-    new_cover_path = os.path.join(config.config_calibre_dir, db_book.path)
-    try:
-        os.makedirs(new_cover_path, exist_ok=True)
-        copyfile(cover_file, os.path.join(new_cover_path, "cover.jpg"))
-        if meta.cover:
-            os.unlink(meta.cover)
-    except OSError as e:
-        log.error("Failed to move cover file %s: %s", new_cover_path, e)
-        flash(_(u"Failed to Move Cover File %(file)s: %(error)s", file=new_cover_path,
-                error=e),
-              category="error")
-
-
-@editbook.route("/upload", methods=["POST"])
-@login_required_if_no_ano
-@upload_required
-def upload():
-    if not config.config_uploading:
-        abort(404)
-    if request.method == 'POST' and 'btn-upload' in request.files:
-        for requested_file in request.files.getlist("btn-upload"):
-            try:
-                modify_date = False
-                # create the function for sorting...
-                calibre_db.update_title_sort(config)
-                calibre_db.session.connection().connection.connection.create_function('uuid4', 0, lambda: str(uuid4()))
-
-                meta, error = file_handling_on_upload(requested_file)
-                if error:
-                    return error
-
-                db_book, input_authors, title_dir, renamed_authors = create_book_on_upload(modify_date, meta)
-
-                # Comments need book id therefore only possible after flush
-                modify_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
-
-                book_id = db_book.id
-                title = db_book.title
-                if config.config_use_google_drive:
-                    helper.upload_new_file_gdrive(book_id,
-                                                  input_authors[0],
-                                                  renamed_authors,
-                                                  title,
-                                                  title_dir,
-                                                  meta.file_path,
-                                                  meta.extension.lower())
-                else:
-                    error = helper.update_dir_structure(book_id,
-                                                        config.config_calibre_dir,
-                                                        input_authors[0],
-                                                        meta.file_path,
-                                                        title_dir + meta.extension.lower(),
-                                                        renamed_author=renamed_authors)
-
-                move_coverfile(meta, db_book)
-
-                # save data to database, reread data
-                calibre_db.session.commit()
-
-                if config.config_use_google_drive:
-                    gdriveutils.updateGdriveCalibreFromLocal()
-                if error:
-                    flash(error, category="error")
-                link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
-                upload_text = N_(u"File %(file)s uploaded", file=link)
-                WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
-                helper.add_book_to_thumbnail_cache(book_id)
-
-                if len(request.files.getlist("btn-upload")) < 2:
-                    if current_user.role_edit() or current_user.role_admin():
-                        resp = {"location": url_for('edit-book.show_edit_book', book_id=book_id)}
-                        return Response(json.dumps(resp), mimetype='application/json')
-                    else:
-                        resp = {"location": url_for('web.show_book', book_id=book_id)}
-                        return Response(json.dumps(resp), mimetype='application/json')
-            except (OperationalError, IntegrityError) as e:
-                calibre_db.session.rollback()
-                log.error_or_exception("Database error: {}".format(e))
-                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-        return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
-
-
-@editbook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
-@login_required_if_no_ano
-@edit_required
-def convert_bookformat(book_id):
-    # check to see if we have form fields to work with -  if not send user back
-    book_format_from = request.form.get('book_format_from', None)
-    book_format_to = request.form.get('book_format_to', None)
-
-    if (book_format_from is None) or (book_format_to is None):
-        flash(_(u"Source or destination format for conversion missing"), category="error")
-        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
-
-    log.info('converting: book id: %s from: %s to: %s', book_id, book_format_from, book_format_to)
-    rtn = helper.convert_book_format(book_id, config.config_calibre_dir, book_format_from.upper(),
-                                     book_format_to.upper(), current_user.name)
-
-    if rtn is None:
-        flash(_(u"Book successfully queued for converting to %(book_format)s",
-                book_format=book_format_to),
-              category="success")
-    else:
-        flash(_(u"There was an error converting this book: %(res)s", res=rtn), category="error")
-    return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
-
-
-@editbook.route("/ajax/getcustomenum/<int:c_id>")
-@login_required
-def table_get_custom_enum(c_id):
-    ret = list()
-    cc = (calibre_db.session.query(db.CustomColumns)
-          .filter(db.CustomColumns.id == c_id)
-          .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).one_or_none())
-    ret.append({'value': "", 'text': ""})
-    for idx, en in enumerate(cc.get_display_dict()['enum_values']):
-        ret.append({'value': en, 'text': en})
-    return json.dumps(ret)
-
-
-@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'])
-    sort_param = ""
-    ret = ""
-    try:
-        if param == 'series_index':
-            edit_book_series_index(vals['value'], book)
-            ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
-        elif param == 'tags':
-            edit_book_tags(vals['value'], book)
-            ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
-                           mimetype='application/json')
-        elif param == 'series':
-            edit_book_series(vals['value'], book)
-            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
-                           mimetype='application/json')
-        elif param == 'publishers':
-            edit_book_publisher(vals['value'], book)
-            ret = Response(json.dumps({'success': True,
-                                       'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
-                           mimetype='application/json')
-        elif param == 'languages':
-            invalid = list()
-            edit_book_languages(vals['value'], book, invalid=invalid)
-            if invalid:
-                ret = Response(json.dumps({'success': False,
-                                           'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
-                               mimetype='application/json')
-            else:
-                lang_names = list()
-                for lang in book.languages:
-                    lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
-                ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
-                               mimetype='application/json')
-        elif param == 'author_sort':
-            book.author_sort = vals['value']
-            ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
-                           mimetype='application/json')
-        elif param == 'title':
-            sort_param = book.sort
-            if handle_title_on_edit(book, vals.get('value', "")):
-                rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir)
-                if not rename_error:
-                    ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
-                                   mimetype='application/json')
-                else:
-                    ret = Response(json.dumps({'success': False,
-                                               'msg': rename_error}),
-                                   mimetype='application/json')
-        elif param == 'sort':
-            book.sort = vals['value']
-            ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
-                           mimetype='application/json')
-        elif param == 'comments':
-            edit_book_comments(vals['value'], book)
-            ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
-                           mimetype='application/json')
-        elif param == 'authors':
-            input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
-            rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0],
-                                                       renamed_author=renamed)
-            if not rename_error:
-                ret = Response(json.dumps({
-                    'success': True,
-                    'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
-                    mimetype='application/json')
-            else:
-                ret = Response(json.dumps({'success': False,
-                                           'msg': rename_error}),
-                               mimetype='application/json')
-        elif param == 'is_archived':
-            is_archived = change_archived_books(book.id, vals['value'] == "True",
-                                                message="Book {} archive bit set to: {}".format(book.id, vals['value']))
-            if is_archived:
-                kobo_sync_status.remove_synced_book(book.id)
-            return ""
-        elif param == 'read_status':
-            ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
-            if ret:
-                return ret, 400
-        elif param.startswith("custom_column_"):
-            new_val = dict()
-            new_val[param] = vals['value']
-            edit_single_cc_data(book.id, book, param[14:], new_val)
-            # ToDo: Very hacky find better solution
-            if vals['value'] in ["True", "False"]:
-                ret = ""
-            else:
-                ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
-                               mimetype='application/json')
+        db_filter = db_object.name
+    for add_element in add_elements:
+        # check if an element with that name exists
+        db_element = db_session.query(db_object).filter(db_filter == add_element).first()
+        # if no element is found add it
+        if db_type == 'author':
+            new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ',')), "")
+        elif db_type == 'series':
+            new_element = db_object(add_element, add_element)
+        elif db_type == 'custom':
+            new_element = db_object(value=add_element)
+        elif db_type == 'publisher':
+            new_element = db_object(add_element, None)
+        else:  # db_type should be tag or language
+            new_element = db_object(add_element)
+        if db_element is None:
+            changed = True
+            db_session.add(new_element)
+            db_book_object.append(new_element)
         else:
-            return _("Parameter not found"), 400
-        book.last_modified = datetime.utcnow()
-
-        calibre_db.session.commit()
-        # revert change for sort if automatic fields link is deactivated
-        if param == 'title' and vals.get('checkT') == "false":
-            book.sort = sort_param
-            calibre_db.session.commit()
-    except (OperationalError, IntegrityError) as e:
-        calibre_db.session.rollback()
-        log.error_or_exception("Database error: {}".format(e))
-        ret = Response(json.dumps({'success': False,
-                                   'msg': 'Database error: {}'.format(e.orig)}),
-                       mimetype='application/json')
-    return ret
+            db_element = create_objects_for_addition(db_element, add_element, db_type)
+            # add element to book
+            changed = True
+            db_book_object.append(db_element)
+    return changed
 
 
-@editbook.route("/ajax/sort_value/<field>/<int:bookid>")
-@login_required
-def get_sorted_entry(field, bookid):
-    if field in ['title', 'authors', 'sort', 'author_sort']:
-        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})
-            if field == 'sort':
-                return json.dumps({'sort': book.title})
-            if field == 'author_sort':
-                return json.dumps({'author_sort': book.author})
-    return ""
+def create_objects_for_addition(db_element, add_element, db_type):
+    if db_type == 'custom':
+        if db_element.value != add_element:
+            db_element.value = add_element
+    elif db_type == 'languages':
+        if db_element.lang_code != add_element:
+            db_element.lang_code = add_element
+    elif db_type == 'series':
+        if db_element.name != add_element:
+            db_element.name = add_element
+            db_element.sort = add_element
+    elif db_type == 'author':
+        if db_element.name != add_element:
+            db_element.name = add_element
+            db_element.sort = helper.get_sorted_author(add_element.replace('|', ','))
+    elif db_type == 'publisher':
+        if db_element.name != add_element:
+            db_element.name = add_element
+            db_element.sort = None
+    elif db_element.name != add_element:
+        db_element.name = add_element
+    return db_element
 
 
-@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:
-            from_book = []
-            for book_id in vals:
-                from_book.append(calibre_db.get_book(book_id).title)
-            return json.dumps({'to': to_book, 'from': from_book})
-    return ""
+# Modifies different Database objects, first check if elements have to be deleted,
+# because they are no longer used, than check if elements have to be added to database
+def modify_database_object(input_elements, db_book_object, db_object, db_session, db_type):
+    # passing input_elements not as a list may lead to undesired results
+    if not isinstance(input_elements, list):
+        raise TypeError(str(input_elements) + " should be passed as a list")
+    input_elements = [x for x in input_elements if x != '']
+    # we have all input element (authors, series, tags) names now
+    # 1. search for elements to remove
+    del_elements = search_objects_remove(db_book_object, db_type, input_elements)
+    # 2. search for elements that need to be added
+    add_elements = search_objects_add(db_book_object, db_type, input_elements)
+    # if there are elements to remove, we remove them now
+    changed = remove_objects(db_book_object, db_session, del_elements)
+    # if there are elements to add, we add them now!
+    if len(add_elements) > 0:
+        changed |= add_objects(db_book_object, db_object, db_session, db_type, add_elements)
+    return changed
 
 
-@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,
-                                                chars=96) + ' - ' + helper.get_valid_filename(to_book.authors[0].name,
-                                                                                              chars=96)
-            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_table(from_book.id, "", True)
-                    return json.dumps({'success': True})
-    return ""
-
-
-@editbook.route("/ajax/xchange", methods=['POST'])
-@login_required
-@edit_required
-def table_xchange_author_title():
-    vals = request.get_json().get('xchange')
-    edited_books_id = False
-    if vals:
-        for val in vals:
-            modify_date = False
-            book = calibre_db.get_book(val)
-            authors = book.title
-            book.authors = calibre_db.order_authors([book])
-            author_names = []
-            for authr in book.authors:
-                author_names.append(authr.name.replace('|', ','))
-
-            title_change = handle_title_on_edit(book, " ".join(author_names))
-            input_authors, author_change, renamed = handle_author_on_edit(book, authors)
-            if author_change or title_change:
-                edited_books_id = book.id
-                modify_date = True
-
-            if config.config_use_google_drive:
-                gdriveutils.updateGdriveCalibreFromLocal()
-
-            if edited_books_id:
-                # toDo: Handle error
-                edit_error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                                         renamed_author=renamed)
-            if modify_date:
-                book.last_modified = datetime.utcnow()
-            try:
-                calibre_db.session.commit()
-            except (OperationalError, IntegrityError) as e:
-                calibre_db.session.rollback()
-                log.error_or_exception("Database error: %s", e)
-                return json.dumps({'success': False})
-
-            if config.config_use_google_drive:
-                gdriveutils.updateGdriveCalibreFromLocal()
-        return json.dumps({'success': True})
-    return ""
+def modify_identifiers(input_identifiers, db_identifiers, db_session):
+    """Modify Identifiers to match input information.
+       input_identifiers is a list of read-to-persist Identifiers objects.
+       db_identifiers is a list of already persisted list of Identifiers objects."""
+    changed = False
+    error = False
+    input_dict = dict([(identifier.type.lower(), identifier) for identifier in input_identifiers])
+    if len(input_identifiers) != len(input_dict):
+        error = True
+    db_dict = dict([(identifier.type.lower(), identifier) for identifier in db_identifiers])
+    # delete db identifiers not present in input or modify them with input val
+    for identifier_type, identifier in db_dict.items():
+        if identifier_type not in input_dict.keys():
+            db_session.delete(identifier)
+            changed = True
+        else:
+            input_identifier = input_dict[identifier_type]
+            identifier.type = input_identifier.type
+            identifier.val = input_identifier.val
+    # add input identifiers not present in db
+    for identifier_type, identifier in input_dict.items():
+        if identifier_type not in db_dict.keys():
+            db_session.add(identifier)
+            changed = True
+    return changed, error
diff --git a/cps/helper.py b/cps/helper.py
index aec146681..7c76d1805 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -29,11 +29,9 @@ from tempfile import gettempdir
 import requests
 import unidecode
 
-
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
-from flask_babel import format_datetime, get_locale
 from flask_login import current_user
 from sqlalchemy.sql.expression import true, false, and_, or_, text, func
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -42,7 +40,6 @@ from werkzeug.security import generate_password_hash
 from markupsafe import escape
 from urllib.parse import quote
 
-
 try:
     import advocate
     from advocate.exceptions import UnacceptableAddressException
@@ -52,14 +49,13 @@ except ImportError:
     advocate = requests
     UnacceptableAddressException = MissingSchema = BaseException
 
-from . import calibre_db, cli
+from . import calibre_db, cli_param
 from .tasks.convert import TaskConvert
 from . import logger, config, db, ub, fs
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
-from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS, STAT_ENDED, \
-    STAT_CANCELLED
+from .services.worker import WorkerThread
 from .tasks.mail import TaskEmail
 from .tasks.thumbnail import TaskClearCoverThumbnailCache, TaskGenerateCoverThumbnails
 
@@ -76,10 +72,10 @@ except (ImportError, RuntimeError) as e:
 
 
 # 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):
+def convert_book_format(book_id, calibre_path, 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)
+    file_path = os.path.join(calibre_path, 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)
@@ -144,20 +140,20 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
 
 
 def check_send_to_kindle_with_converter(formats):
-    bookformats = list()
+    book_formats = list()
     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')})
+        book_formats.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 'MOBI' not 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.append({'format': 'Mobi',
+                             'convert': 2,
+                             'text': _('Convert %(orig)s to %(format)s and send to Kindle',
+                                       orig='Azw3',
+                                       format='Mobi')})
+    return book_formats
 
 
 def check_send_to_kindle(entry):
@@ -165,26 +161,26 @@ def check_send_to_kindle(entry):
         returns all available book formats for sending to Kindle
     """
     formats = list()
-    bookformats = list()
+    book_formats = list()
     if len(entry.data):
         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')})
+            book_formats.append({'format': 'Mobi',
+                                 'convert': 0,
+                                 'text': _('Send %(format)s to Kindle', format='Mobi')})
         if 'PDF' in formats:
-            bookformats.append({'format': 'Pdf',
-                                'convert': 0,
-                                'text': _('Send %(format)s to Kindle', format='Pdf')})
+            book_formats.append({'format': 'Pdf',
+                                 'convert': 0,
+                                 'text': _('Send %(format)s to Kindle', format='Pdf')})
         if 'AZW' in formats:
-            bookformats.append({'format': 'Azw',
-                                'convert': 0,
-                                'text': _('Send %(format)s to Kindle', format='Azw')})
+            book_formats.append({'format': 'Azw',
+                                 'convert': 0,
+                                 'text': _('Send %(format)s to Kindle', format='Azw')})
         if config.config_converterpath:
-            bookformats.extend(check_send_to_kindle_with_converter(formats))
-        return bookformats
+            book_formats.extend(check_send_to_kindle_with_converter(formats))
+        return book_formats
     else:
         log.error(u'Cannot find book entry %d', entry.id)
         return None
@@ -194,12 +190,12 @@ def check_send_to_kindle(entry):
 # list with supported formats
 def check_read_formats(entry):
     extensions_reader = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU'}
-    bookformats = list()
+    book_formats = list()
     if len(entry.data):
         for ele in iter(entry.data):
             if ele.format.upper() in extensions_reader:
-                bookformats.append(ele.format.lower())
-    return bookformats
+                book_formats.append(ele.format.lower())
+    return book_formats
 
 
 # Files are processed in the following order/priority:
@@ -229,23 +225,11 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
 
-def shorten_component(s, by_what):
-    l = len(s)
-    if l < by_what:
-        return s
-    l = (l - by_what)//2
-    if l <= 0:
-        return s
-    return s[:l] + s[-l:]
-
-
 def get_valid_filename(value, replace_whitespace=True, chars=128):
     """
     Returns the given string converted to a string that can be used for a clean
     filename. Limits num characters to 128 max.
     """
-
-
     if value[-1:] == u'.':
         value = value[:-1]+u'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
@@ -814,7 +798,7 @@ def get_series_thumbnail(series_id, resolution):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
-        if cli.allow_localhost:
+        if cli_param.allow_localhost:
             img = requests.get(url, timeout=(10, 200), allow_redirects=False)  # ToDo: Error Handling
         elif use_advocate:
             img = advocate.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index 5668e6dad..9865b993d 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -71,47 +71,8 @@ from flask_babel import gettext as _
 from . import logger, config, calibre_db, db, helper, ub, lm
 from .render_template import render_title_template
 
-
 log = logger.create()
 
-
-def register_url_value_preprocessor(kobo):
-    @kobo.url_value_preprocessor
-    # pylint: disable=unused-variable
-    def pop_auth_token(__, values):
-        g.auth_token = values.pop("auth_token")
-
-
-def disable_failed_auth_redirect_for_blueprint(bp):
-    lm.blueprint_login_views[bp.name] = None
-
-
-def get_auth_token():
-    if "auth_token" in g:
-        return g.get("auth_token")
-    else:
-        return None
-
-
-def requires_kobo_auth(f):
-    @wraps(f)
-    def inner(*args, **kwargs):
-        auth_token = get_auth_token()
-        if auth_token is not None:
-            user = (
-                ub.session.query(ub.User)
-                .join(ub.RemoteAuthToken)
-                .filter(ub.RemoteAuthToken.auth_token == auth_token).filter(ub.RemoteAuthToken.token_type==1)
-                .first()
-            )
-            if user is not None:
-                login_user(user)
-                return f(*args, **kwargs)
-            log.debug("Received Kobo request without a recognizable auth token.")
-            return abort(401)
-    return inner
-
-
 kobo_auth = Blueprint("kobo_auth", __name__, url_prefix="/kobo_auth")
 
 
@@ -165,3 +126,40 @@ def delete_auth_token(user_id):
         .filter(ub.RemoteAuthToken.token_type==1).delete()
 
     return ub.session_commit()
+
+
+def disable_failed_auth_redirect_for_blueprint(bp):
+    lm.blueprint_login_views[bp.name] = None
+
+
+def get_auth_token():
+    if "auth_token" in g:
+        return g.get("auth_token")
+    else:
+        return None
+
+
+def register_url_value_preprocessor(kobo):
+    @kobo.url_value_preprocessor
+    # pylint: disable=unused-variable
+    def pop_auth_token(__, values):
+        g.auth_token = values.pop("auth_token")
+
+
+def requires_kobo_auth(f):
+    @wraps(f)
+    def inner(*args, **kwargs):
+        auth_token = get_auth_token()
+        if auth_token is not None:
+            user = (
+                ub.session.query(ub.User)
+                .join(ub.RemoteAuthToken)
+                .filter(ub.RemoteAuthToken.auth_token == auth_token).filter(ub.RemoteAuthToken.token_type==1)
+                .first()
+            )
+            if user is not None:
+                login_user(user)
+                return f(*args, **kwargs)
+            log.debug("Received Kobo request without a recognizable auth token.")
+            return abort(401)
+    return inner
diff --git a/cps/main.py b/cps/main.py
index 304a244ae..ccf03c15e 100644
--- a/cps/main.py
+++ b/cps/main.py
@@ -20,11 +20,7 @@ import sys
 
 from . import create_app
 from .jinjia import jinjia
-from .shelf import shelf
 from .remotelogin import remotelogin
-from .search_metadata import meta
-from .error_handler import init_errorhandler
-from .tasks_status import tasks
 
 try:
     from kobo import kobo, get_kobo_activated
@@ -50,6 +46,10 @@ def main():
     from .editbooks import editbook
     from .about import about
     from .search import search
+    from .search_metadata import meta
+    from .shelf import shelf
+    from .tasks_status import tasks
+    from .error_handler import init_errorhandler
 
     from . import web_server
     init_errorhandler()
diff --git a/cps/opds.py b/cps/opds.py
index 2b8ab6d6c..60dbd551a 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -56,20 +56,6 @@ def requires_basic_auth_if_no_ano(f):
     return decorated
 
 
-class FeedObject:
-    def __init__(self, rating_id, rating_name):
-        self.rating_id = rating_id
-        self.rating_name = rating_name
-
-    @property
-    def id(self):
-        return self.rating_id
-
-    @property
-    def name(self):
-        return self.rating_name
-
-
 @opds.route("/opds/")
 @opds.route("/opds")
 @requires_basic_auth_if_no_ano
@@ -468,6 +454,20 @@ def feed_unread_books():
     return render_xml_template('feed.xml', entries=result, pagination=pagination)
 
 
+class FeedObject:
+    def __init__(self, rating_id, rating_name):
+        self.rating_id = rating_id
+        self.rating_name = rating_name
+
+    @property
+    def id(self):
+        return self.rating_id
+
+    @property
+    def name(self):
+        return self.rating_name
+
+
 def feed_search(term):
     if term:
         entries, __, ___ = calibre_db.get_search_results(term, config=config)
diff --git a/cps/search.py b/cps/search.py
index 429aea174..cd172b6b6 100644
--- a/cps/search.py
+++ b/cps/search.py
@@ -406,7 +406,6 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                                                       offset,
                                                                       order,
                                                                       limit,
-                                                                      False,
                                                                       *join)
     return render_title_template('search.html',
                                  searchterm=term,
diff --git a/cps/services/__init__.py b/cps/services/__init__.py
index 32a9d485d..f93eca340 100644
--- a/cps/services/__init__.py
+++ b/cps/services/__init__.py
@@ -18,11 +18,10 @@
 
 from .. import logger
 
-
 log = logger.create()
 
-
-try: from . import goodreads_support
+try:
+    from . import goodreads_support
 except ImportError as err:
     log.debug("Cannot import goodreads, showing authors-metadata will not work: %s", err)
     goodreads_support = None
diff --git a/cps/shelf.py b/cps/shelf.py
index 35f2941d2..49d9a6335 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -33,27 +33,9 @@ from . import calibre_db, config, db, logger, ub
 from .render_template import render_title_template
 from .usermanagement import login_required_if_no_ano
 
-shelf = Blueprint('shelf', __name__)
 log = logger.create()
 
-
-def check_shelf_edit_permissions(cur_shelf):
-    if not cur_shelf.is_public and not cur_shelf.user_id == int(current_user.id):
-        log.error("User {} not allowed to edit shelf: {}".format(current_user.id, cur_shelf.name))
-        return False
-    if cur_shelf.is_public and not current_user.role_edit_shelfs():
-        log.info("User {} not allowed to edit public shelves".format(current_user.id))
-        return False
-    return True
-
-
-def check_shelf_view_permissions(cur_shelf):
-    if cur_shelf.is_public:
-        return True
-    if current_user.is_anonymous or cur_shelf.user_id != current_user.id:
-        log.error("User is unauthorized to view non-public shelf: {}".format(cur_shelf.name))
-        return False
-    return True
+shelf = Blueprint('shelf', __name__)
 
 
 @shelf.route("/shelf/add/<int:shelf_id>/<int:book_id>", methods=["POST"])
@@ -238,96 +220,6 @@ def edit_shelf(shelf_id):
     return create_edit_shelf(shelf, page_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, page_title, page, shelf_id=False):
-    sync_only_selected_shelves = current_user.kobo_only_shelves_sync
-    # calibre_db.session.query(ub.Shelf).filter(ub.Shelf.user_id == current_user.id).filter(ub.Shelf.kobo_sync).count()
-    if request.method == "POST":
-        to_save = request.form.to_dict()
-        if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
-            flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
-            return redirect(url_for('web.index'))
-        is_public = 1 if to_save.get("is_public") == "on" else 0
-        if config.config_kobo_sync:
-            shelf.kobo_sync = True if to_save.get("kobo_sync") else False
-            if shelf.kobo_sync:
-                ub.session.query(ub.ShelfArchive).filter(ub.ShelfArchive.user_id == current_user.id).filter(
-                    ub.ShelfArchive.uuid == shelf.uuid).delete()
-                ub.session_commit()
-        shelf_title = to_save.get("title", "")
-        if check_shelf_is_unique(shelf, shelf_title, is_public, shelf_id):
-            shelf.name = shelf_title
-            shelf.is_public = is_public
-            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=shelf_title)
-            else:
-                shelf_action = "changed"
-                flash_text = _(u"Shelf %(title)s changed", title=shelf_title)
-            try:
-                ub.session.commit()
-                log.info(u"Shelf {} {}".format(shelf_title, shelf_action))
-                flash(flash_text, category="success")
-                return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
-            except (OperationalError, InvalidRequestError) as ex:
-                ub.session.rollback()
-                log.error_or_exception(ex)
-                log.error_or_exception("Settings Database error: {}".format(ex))
-                flash(_(u"Database error: %(error)s.", error=ex.orig), category="error")
-            except Exception as ex:
-                ub.session.rollback()
-                log.error_or_exception(ex)
-                flash(_(u"There was an error"), category="error")
-    return render_title_template('shelf_edit.html',
-                                 shelf=shelf,
-                                 title=page_title,
-                                 page=page,
-                                 kobo_sync_enabled=config.config_kobo_sync,
-                                 sync_only_selected_shelves=sync_only_selected_shelves)
-
-
-def check_shelf_is_unique(shelf, title, is_public, shelf_id=False):
-    if shelf_id:
-        ident = ub.Shelf.id != shelf_id
-    else:
-        ident = true()
-    if is_public == 1:
-        is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                                   .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 1)) \
-                                   .filter(ident) \
-                                   .first() is None
-
-        if not is_shelf_name_unique:
-            log.error("A public shelf with the name '{}' already exists.".format(title))
-            flash(_(u"A public shelf with the name '%(title)s' already exists.", title=title),
-                  category="error")
-    else:
-        is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                                   .filter((ub.Shelf.name == 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:
-            log.error("A private shelf with the name '{}' already exists.".format(title))
-            flash(_(u"A private shelf with the name '%(title)s' already exists.", title=title),
-                  category="error")
-    return is_shelf_name_unique
-
-
-def delete_shelf_helper(cur_shelf):
-    if not cur_shelf or not check_shelf_edit_permissions(cur_shelf):
-        return False
-    shelf_id = cur_shelf.id
-    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("successfully deleted Shelf {}".format(cur_shelf.name))
-    return True
-
-
 @shelf.route("/shelf/delete/<int:shelf_id>", methods=["POST"])
 @login_required
 def delete_shelf(shelf_id):
@@ -392,6 +284,115 @@ def order_shelf(shelf_id):
         abort(404)
 
 
+def check_shelf_edit_permissions(cur_shelf):
+    if not cur_shelf.is_public and not cur_shelf.user_id == int(current_user.id):
+        log.error("User {} not allowed to edit shelf: {}".format(current_user.id, cur_shelf.name))
+        return False
+    if cur_shelf.is_public and not current_user.role_edit_shelfs():
+        log.info("User {} not allowed to edit public shelves".format(current_user.id))
+        return False
+    return True
+
+
+def check_shelf_view_permissions(cur_shelf):
+    if cur_shelf.is_public:
+        return True
+    if current_user.is_anonymous or cur_shelf.user_id != current_user.id:
+        log.error("User is unauthorized to view non-public shelf: {}".format(cur_shelf.name))
+        return False
+    return True
+
+
+# if shelf ID is set, we are editing a shelf
+def create_edit_shelf(shelf, page_title, page, shelf_id=False):
+    sync_only_selected_shelves = current_user.kobo_only_shelves_sync
+    # calibre_db.session.query(ub.Shelf).filter(ub.Shelf.user_id == current_user.id).filter(ub.Shelf.kobo_sync).count()
+    if request.method == "POST":
+        to_save = request.form.to_dict()
+        if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
+            flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
+            return redirect(url_for('web.index'))
+        is_public = 1 if to_save.get("is_public") == "on" else 0
+        if config.config_kobo_sync:
+            shelf.kobo_sync = True if to_save.get("kobo_sync") else False
+            if shelf.kobo_sync:
+                ub.session.query(ub.ShelfArchive).filter(ub.ShelfArchive.user_id == current_user.id).filter(
+                    ub.ShelfArchive.uuid == shelf.uuid).delete()
+                ub.session_commit()
+        shelf_title = to_save.get("title", "")
+        if check_shelf_is_unique(shelf_title, is_public, shelf_id):
+            shelf.name = shelf_title
+            shelf.is_public = is_public
+            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=shelf_title)
+            else:
+                shelf_action = "changed"
+                flash_text = _(u"Shelf %(title)s changed", title=shelf_title)
+            try:
+                ub.session.commit()
+                log.info(u"Shelf {} {}".format(shelf_title, shelf_action))
+                flash(flash_text, category="success")
+                return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
+            except (OperationalError, InvalidRequestError) as ex:
+                ub.session.rollback()
+                log.error_or_exception(ex)
+                log.error_or_exception("Settings Database error: {}".format(ex))
+                flash(_(u"Database error: %(error)s.", error=ex.orig), category="error")
+            except Exception as ex:
+                ub.session.rollback()
+                log.error_or_exception(ex)
+                flash(_(u"There was an error"), category="error")
+    return render_title_template('shelf_edit.html',
+                                 shelf=shelf,
+                                 title=page_title,
+                                 page=page,
+                                 kobo_sync_enabled=config.config_kobo_sync,
+                                 sync_only_selected_shelves=sync_only_selected_shelves)
+
+
+def check_shelf_is_unique(title, is_public, shelf_id=False):
+    if shelf_id:
+        ident = ub.Shelf.id != shelf_id
+    else:
+        ident = true()
+    if is_public == 1:
+        is_shelf_name_unique = ub.session.query(ub.Shelf) \
+                                   .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 1)) \
+                                   .filter(ident) \
+                                   .first() is None
+
+        if not is_shelf_name_unique:
+            log.error("A public shelf with the name '{}' already exists.".format(title))
+            flash(_(u"A public shelf with the name '%(title)s' already exists.", title=title),
+                  category="error")
+    else:
+        is_shelf_name_unique = ub.session.query(ub.Shelf) \
+                                   .filter((ub.Shelf.name == 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:
+            log.error("A private shelf with the name '{}' already exists.".format(title))
+            flash(_(u"A private shelf with the name '%(title)s' already exists.", title=title),
+                  category="error")
+    return is_shelf_name_unique
+
+
+def delete_shelf_helper(cur_shelf):
+    if not cur_shelf or not check_shelf_edit_permissions(cur_shelf):
+        return False
+    shelf_id = cur_shelf.id
+    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("successfully deleted Shelf {}".format(cur_shelf.name))
+    return True
+
+
 def change_shelf_order(shelf_id, order):
     result = calibre_db.session.query(db.Books).outerjoin(db.books_series_link,
                                                           db.Books.id == db.books_series_link.c.book)\
diff --git a/cps/tasks_status.py b/cps/tasks_status.py
index ca9b5796c..e355ed85c 100644
--- a/cps/tasks_status.py
+++ b/cps/tasks_status.py
@@ -34,7 +34,7 @@ log = logger.create()
 @tasks.route("/ajax/emailstat")
 @login_required
 def get_email_status_json():
-    tasks = WorkerThread.getInstance().tasks
+    tasks = WorkerThread.get_instance().tasks
     return jsonify(render_task_status(tasks))
 
 
@@ -42,7 +42,7 @@ def get_email_status_json():
 @login_required
 def get_tasks_status():
     # if current user admin, show all email, otherwise only own emails
-    tasks = WorkerThread.getInstance().tasks
+    tasks = WorkerThread.get_instance().tasks
     answer = render_task_status(tasks)
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index b0b5b3bd0..5cbc5f8b0 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -5,7 +5,7 @@
 {% block body %}
 <div class="discover">
     <h2>{{_('Tasks')}}</h2>
-    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('task.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
+    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('tasks.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
       <thead>
         <tr>
             {% if g.user.role_admin() %}
diff --git a/cps/web.py b/cps/web.py
index 178ed18c3..834251913 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -72,10 +72,10 @@ except ImportError:
 
 from functools import wraps
 
-#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
+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
 
 
 @app.after_request

From aaa749933d16a57b06309f01ef33962a866e3cc1 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 14:55:00 +0200
Subject: [PATCH 263/412] Further migration to flask_babel Bugfix sort order
 Bugfix tasklist

---
 cps/admin.py              |  2 +-
 cps/babel.py              |  3 +--
 cps/db.py                 |  2 +-
 cps/jinjia.py             |  9 +++++----
 cps/search.py             | 13 +++++--------
 cps/search_metadata.py    |  8 ++++----
 cps/tasks_status.py       | 23 +++++++++++++++++------
 cps/web.py                | 12 ++++++------
 optional-requirements.txt |  4 ++--
 9 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index f5ae10372..91a161266 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -200,7 +200,7 @@ def admin():
                     form_date -= timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
                 elif commit[19] == '-':
                     form_date += timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
-            commit = format_datetime(form_date - tz, format='short', locale=locale)
+            commit = format_datetime(form_date - tz, format='short')
         else:
             commit = version['version']
 
diff --git a/cps/babel.py b/cps/babel.py
index c16758097..f5ecaf5a5 100644
--- a/cps/babel.py
+++ b/cps/babel.py
@@ -1,6 +1,5 @@
-from babel import Locale
 from babel import negotiate_locale
-from flask_babel import Babel
+from flask_babel import Babel, Locale
 from babel.core import UnknownLocaleError
 from flask import request, g
 
diff --git a/cps/db.py b/cps/db.py
index f28baeca5..21104622d 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -919,7 +919,7 @@ class CalibreDB:
                                  .count())
                 if no_lang_count:
                     tags.append([Category(_("None"), "none"), no_lang_count])
-            return sorted(tags, key=lambda x: x[0].name, reverse=reverse_order)
+            return sorted(tags, key=lambda x: x[0].name.lower(), reverse=reverse_order)
         else:
             if not languages:
                 languages = self.session.query(Languages) \
diff --git a/cps/jinjia.py b/cps/jinjia.py
index f88b36a26..e42c650c5 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -22,15 +22,16 @@
 
 # custom jinja filters
 
+from markupsafe import escape
 import datetime
 import mimetypes
 from uuid import uuid4
 
-from babel.dates import format_date
+# from babel.dates import format_date
 from flask import Blueprint, request, url_for
-from flask_babel import get_locale
+from flask_babel import format_date
 from flask_login import current_user
-from markupsafe import escape
+
 from . import constants, logger
 
 jinjia = Blueprint('jinjia', __name__)
@@ -76,7 +77,7 @@ def mimetype_filter(val):
 @jinjia.app_template_filter('formatdate')
 def formatdate_filter(val):
     try:
-        return format_date(val, format='medium', locale=get_locale())
+        return format_date(val, format='medium')
     except AttributeError as e:
         log.error('Babel error: %s, Current user locale: %s, Current User: %s', e,
                   current_user.locale,
diff --git a/cps/search.py b/cps/search.py
index cd172b6b6..602881bf3 100644
--- a/cps/search.py
+++ b/cps/search.py
@@ -20,7 +20,7 @@ from datetime import datetime
 from flask import Blueprint, request, redirect, url_for, flash
 from flask import session as flask_session
 from flask_login import current_user
-from flask_babel import get_locale, format_date
+from flask_babel import format_date
 from flask_babel import gettext as _
 from sqlalchemy.sql.expression import func, not_, and_, or_, text
 from sqlalchemy.sql.functions import coalesce
@@ -193,14 +193,14 @@ def extend_search_term(searchterm,
         try:
             searchterm.extend([_(u"Published after ") +
                                format_date(datetime.strptime(pub_start, "%Y-%m-%d"),
-                                           format='medium', locale=get_locale())])
+                                           format='medium')])
         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())])
+                                           format='medium')])
         except ValueError:
             pub_end = u""
     elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
@@ -291,22 +291,19 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             if column_start:
                 search_term.extend([u"{} >= {}".format(c.name,
                                                        format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
-                                                                   format='medium',
-                                                                   locale=get_locale())
+                                                                   format='medium')
                                                        )])
                 cc_present = True
             if column_end:
                 search_term.extend([u"{} <= {}".format(c.name,
                                                        format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
-                                                                   format='medium',
-                                                                   locale=get_locale())
+                                                                   format='medium')
                                                        )])
                 cc_present = True
         elif term.get('custom_column_' + str(c.id)):
             search_term.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
             cc_present = True
 
-
     if any(tags.values()) 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 read_status:
         search_term, pub_start, pub_end = extend_search_term(search_term,
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index ae95a28e3..e018da326 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -22,7 +22,6 @@ import inspect
 import json
 import os
 import sys
-from dataclasses import asdict
 
 from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
@@ -57,9 +56,10 @@ for f in modules:
         try:
             importlib.import_module("cps.metadata_provider." + a)
             new_list.append(a)
-        except (ImportError, IndentationError, SyntaxError) as e:
-            log.error("Import error for metadata source: {} - {}".format(a, e))
-            pass
+        except (IndentationError, SyntaxError) as e:
+            log.error("Syntax error for metadata source: {} - {}".format(a, e))
+        except ImportError as e:
+            log.debug("Import error for metadata source: {} - {}".format(a, e))
 
 
 def list_classes(provider_list):
diff --git a/cps/tasks_status.py b/cps/tasks_status.py
index e355ed85c..e5f919754 100644
--- a/cps/tasks_status.py
+++ b/cps/tasks_status.py
@@ -19,12 +19,13 @@ from markupsafe import escape
 from flask import Blueprint, jsonify
 from flask_login import login_required, current_user
 from flask_babel import gettext as _
-from flask_babel import get_locale, format_datetime
+from flask_babel import format_datetime
 from babel.units import format_unit
 
 from . import logger
 from .render_template import render_title_template
-from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
+from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS, STAT_ENDED, \
+    STAT_CANCELLED
 
 tasks = Blueprint('tasks', __name__)
 
@@ -50,11 +51,11 @@ def get_tasks_status():
 # helper function to apply localize status information in tasklist entries
 def render_task_status(tasklist):
     rendered_tasklist = list()
-    for __, user, __, task in tasklist:
+    for __, user, __, task, __ in tasklist:
         if user == current_user.name or current_user.role_admin():
             ret = {}
             if task.start_time:
-                ret['starttime'] = format_datetime(task.start_time, format='short', locale=get_locale())
+                ret['starttime'] = format_datetime(task.start_time, format='short')
                 ret['runtime'] = format_runtime(task.runtime)
 
             # localize the task status
@@ -67,12 +68,22 @@ def render_task_status(tasklist):
                     ret['status'] = _(u'Started')
                 elif task.stat == STAT_FINISH_SUCCESS:
                     ret['status'] = _(u'Finished')
+                elif task.stat == STAT_ENDED:
+                    ret['status'] = _(u'Ended')
+                elif task.stat == STAT_CANCELLED:
+                    ret['status'] = _(u'Cancelled')
                 else:
                     ret['status'] = _(u'Unknown Status')
 
-            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message)
+            ret['taskMessage'] = "{}: {}".format(task.name, task.message) if task.message else task.name
             ret['progress'] = "{} %".format(int(task.progress * 100))
             ret['user'] = escape(user)  # prevent xss
+
+            # Hidden fields
+            ret['task_id'] = task.id
+            ret['stat'] = task.stat
+            ret['is_cancellable'] = task.is_cancellable
+
             rendered_tasklist.append(ret)
 
     return rendered_tasklist
@@ -82,7 +93,7 @@ def render_task_status(tasklist):
 def format_runtime(runtime):
     ret_val = ""
     if runtime.days:
-        ret_val = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
+        ret_val = format_unit(runtime.days, 'duration-day', length="long") + ', '
     minutes, seconds = divmod(runtime.seconds, 60)
     hours, minutes = divmod(minutes, 60)
     # ToDo: locale.number_symbols._data['timeSeparator'] -> localize time separator ?
diff --git a/cps/web.py b/cps/web.py
index 834251913..1aa4cc1b7 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -24,7 +24,6 @@ import mimetypes
 import chardet  # dependency of requests
 import copy
 
-from babel import Locale
 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
@@ -40,7 +39,7 @@ from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash, check_password_hash
 
 from . import constants, logger, isoLanguages, services
-from . import babel, db, ub, config, app
+from . import db, ub, config, app
 from . import calibre_db, kobo_sync_status
 from .search import render_search_results, render_adv_search_results
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
@@ -50,6 +49,7 @@ from .helper import check_valid_domain, check_email, check_username, \
     edit_book_read_status
 from .pagination import Pagination
 from .redirect import redirect_back
+from .babel import get_available_locale
 from .usermanagement import login_required_if_no_ano
 from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
@@ -960,7 +960,7 @@ def publisher_list():
                            .count())
         if no_publisher_count:
             entries.append([db.Category(_("None"), "-1"), no_publisher_count])
-        entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
+        entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
         char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher", order=order_no)
@@ -990,7 +990,7 @@ def series_list():
                             .count())
             if no_series_count:
                 entries.append([db.Category(_("None"), "-1"), no_series_count])
-            entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
+            entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
             return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", order=order_no)
         else:
@@ -1092,7 +1092,7 @@ def category_list():
                          .count())
         if no_tag_count:
             entries.append([db.Category(_("None"), "-1"), no_tag_count])
-        entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
+        entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
         char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Categories"), page="catlist", data="category", order=order_no)
@@ -1417,7 +1417,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
 @login_required
 def profile():
     languages = calibre_db.speaking_language()
-    translations = babel.list_translations() + [Locale('en')]
+    translations = get_available_locale()
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     if feature_support['oauth'] and config.config_login_type == 2:
         oauth_status = get_oauth_status()
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 07e1ad885..4360d221f 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.46.0
+google-api-python-client>=1.7.11,<2.50.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.46.0
+google-api-python-client>=1.7.11,<2.50.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0

From a968ddaef23eca781f70cc1c678ae7382dc7c2e4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 28 Apr 2022 20:57:09 +0200
Subject: [PATCH 264/412] Bugfixes after testrun

---
 cps/__init__.py                         |    5 +
 cps/helper.py                           |   24 +-
 cps/main.py                             |   13 +-
 test/Calibre-Web TestSummary_Linux.html | 3103 +++++++++++++++--------
 4 files changed, 2112 insertions(+), 1033 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index f597aab59..3f92571b5 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -166,6 +166,11 @@ def create_app():
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
     config.store_calibre_uuid(calibre_db, db.Library_Id)
+    # Register scheduled tasks
+    from .schedule import register_scheduled_tasks, register_startup_tasks
+    register_scheduled_tasks(config.schedule_reconnect)
+    register_startup_tasks()
+
     return app
 
 
diff --git a/cps/helper.py b/cps/helper.py
index 7c76d1805..7362eb9e2 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -342,9 +342,9 @@ def edit_book_read_status(book_id, read_status=None):
     return ""
 
 
-# Deletes a book fro the local filestorage, returns True if deleting is successfull, otherwise false
+# Deletes a book from the local filestorage, returns True if deleting is successful, otherwise false
 def delete_book_file(book, calibrepath, book_format=None):
-    # check that path is 2 elements deep, check that target path has no subfolders
+    # check that path is 2 elements deep, check that target path has no sub folders
     if book.path.count('/') == 1:
         path = os.path.join(calibrepath, book.path)
         if book_format:
@@ -679,7 +679,8 @@ def update_dir_structure(book_id,
 
 
 def delete_book(book, calibrepath, book_format):
-    clear_cover_thumbnail_cache(book.id)
+    if not book_format:
+        clear_cover_thumbnail_cache(book.id)        ## here it breaks
     if config.config_use_google_drive:
         return delete_book_gdrive(book, book_format)
     else:
@@ -1003,21 +1004,26 @@ def get_download_link(book_id, book_format, client):
 
 
 def clear_cover_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
 
 
 def replace_cover_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
-    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
+        WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
 
 
 def delete_thumbnail_cache():
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
 
 
 def add_book_to_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
 
 
 def update_thumbnail_cache():
-    WorkerThread.add(None, TaskGenerateCoverThumbnails())
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskGenerateCoverThumbnails())
diff --git a/cps/main.py b/cps/main.py
index ccf03c15e..16d288acf 100644
--- a/cps/main.py
+++ b/cps/main.py
@@ -22,13 +22,6 @@ from . import create_app
 from .jinjia import jinjia
 from .remotelogin import remotelogin
 
-try:
-    from kobo import kobo, get_kobo_activated
-    from kobo_auth import kobo_auth
-    kobo_available = get_kobo_activated()
-except (ImportError, AttributeError):   # Catch also error for not installed flask-WTF (missing csrf decorator)
-    kobo_available = False
-
 try:
     from oauth_bb import oauth
     oauth_available = True
@@ -50,6 +43,12 @@ def main():
     from .shelf import shelf
     from .tasks_status import tasks
     from .error_handler import init_errorhandler
+    try:
+        from .kobo import kobo, get_kobo_activated
+        from .kobo_auth import kobo_auth
+        kobo_available = get_kobo_activated()
+    except (ImportError, AttributeError):  # Catch also error for not installed flask-WTF (missing csrf decorator)
+        kobo_available = False
 
     from . import web_server
     init_errorhandler()
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index df55a0371..cf3e893d7 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-25 20:37:58</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-27 19:55: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>2022-04-26 02:14:54</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-28 01:28:47</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>4h 44 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 34 min</p>
         </div>
       </div>
       </div>
@@ -236,13 +236,13 @@
 
     <tr id="su" class="passClass">
         <td>TestCli</td>
-        <td class="text-center">9</td>
-        <td class="text-center">9</td>
+        <td class="text-center">10</td>
+        <td class="text-center">10</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('c2', 9)">Detail</a>
+            <a onclick="showClassDetail('c2', 10)">Detail</a>
         </td>
     </tr>
 
@@ -321,6 +321,15 @@
     
     
         <tr id='pt2.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_no_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
             </td>
@@ -332,13 +341,13 @@
 
     <tr id="su" class="passClass">
         <td>TestCliGdrivedb</td>
-        <td class="text-center">3</td>
-        <td class="text-center">3</td>
+        <td class="text-center">4</td>
+        <td class="text-center">4</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', 3)">Detail</a>
+            <a onclick="showClassDetail('c3', 4)">Detail</a>
         </td>
     </tr>
 
@@ -370,6 +379,15 @@
         </tr>
     
     
+    
+        <tr id='pt3.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCliGdrivedb - test_no_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="passClass">
@@ -761,12 +779,12 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">17</td>
-        <td class="text-center">10</td>
-        <td class="text-center">2</td>
-        <td class="text-center">4</td>
+        <td class="text-center">16</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('c10', 17)">Detail</a>
@@ -820,34 +838,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft10.6" class="none bg-danger">
+        <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 461, in test_edit_book_identifier
-    self.assertEqual(&#39;Hallo1&#39;, list(result[&#39;identifier&#39;][-1].keys())[0])
-AssertionError: &#39;Hallo1&#39; != &#39;Hallo&#39;
-- Hallo1
-?      -
-+ Hallo</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -861,31 +856,11 @@ AssertionError: &#39;Hallo1&#39; != &#39;Hallo&#39;
     
     
     
-        <tr id="ft10.8" class="none bg-danger">
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 614, in test_edit_book_identifier_standard
-    self.assertEqual(final_length, reference_length)
-AssertionError: 14 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -926,70 +901,20 @@ AssertionError: 14 != 0</pre>
     
     
     
-        <tr id="et10.13" class="none bg-info">
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 166, in test_upload_metadata_cbr
-    self.assertEqual(&#39;Test 执book&#39;, details[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.14" class="none bg-info">
+        <tr id='pt10.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 185, in test_upload_metadata_cbt
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1003,145 +928,20 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="et10.16" class="none bg-info">
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 810, in test_xss_comment_edit
-    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.17" class="none bg-info">
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 832, in test_xss_custom_comment_edit
-    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c11', 2)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et11.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_edit_additional_books)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 44, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 475, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et11.2" class="none bg-info">
-            <td>
-                <div class='testcase'>setUpClass (test_thumbnail_env)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnail_env.py&#34;, line 26, in setUpClass
-    add_dependency(cls.json_line, cls.__name__)
-AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;json_line&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1155,13 +955,13 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 36)">Detail</a>
+            <a onclick="showClassDetail('c11', 36)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1170,7 +970,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1179,7 +979,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1188,7 +988,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1197,7 +997,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1206,7 +1006,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1215,7 +1015,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1224,7 +1024,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1233,7 +1033,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1242,7 +1042,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt11.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1251,7 +1051,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt11.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1260,7 +1060,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt11.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1269,7 +1069,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt11.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1278,7 +1078,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt11.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1287,7 +1087,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt11.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1296,7 +1096,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt11.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1305,7 +1105,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt11.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1314,7 +1114,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt11.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1323,7 +1123,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.19' class='hiddenRow bg-success'>
+        <tr id='pt11.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1332,19 +1132,19 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id="st12.20" class="none bg-warning">
+        <tr id="st11.20" 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_st12.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1358,7 +1158,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.21' class='hiddenRow bg-success'>
+        <tr id='pt11.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1367,7 +1167,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.22' class='hiddenRow bg-success'>
+        <tr id='pt11.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1376,7 +1176,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.23' class='hiddenRow bg-success'>
+        <tr id='pt11.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1385,7 +1185,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.24' class='hiddenRow bg-success'>
+        <tr id='pt11.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1394,7 +1194,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.25' class='hiddenRow bg-success'>
+        <tr id='pt11.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1403,7 +1203,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.26' class='hiddenRow bg-success'>
+        <tr id='pt11.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1412,7 +1212,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.27' class='hiddenRow bg-success'>
+        <tr id='pt11.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1421,7 +1221,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.28' class='hiddenRow bg-success'>
+        <tr id='pt11.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1430,7 +1230,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.29' class='hiddenRow bg-success'>
+        <tr id='pt11.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1439,7 +1239,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.30' class='hiddenRow bg-success'>
+        <tr id='pt11.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1448,7 +1248,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.31' class='hiddenRow bg-success'>
+        <tr id='pt11.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1457,7 +1257,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.32' class='hiddenRow bg-success'>
+        <tr id='pt11.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1466,7 +1266,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.33' class='hiddenRow bg-success'>
+        <tr id='pt11.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1475,7 +1275,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.34' class='hiddenRow bg-success'>
+        <tr id='pt11.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1484,7 +1284,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.35' class='hiddenRow bg-success'>
+        <tr id='pt11.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1493,7 +1293,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.36' class='hiddenRow bg-success'>
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1503,11 +1303,80 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditAuthors</td>
         <td class="text-center">6</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</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('c12', 6)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt12.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEditAuthorsGdrive</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">
@@ -1519,7 +1388,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
         <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1528,7 +1397,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
         <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1537,7 +1406,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
         <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1546,7 +1415,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
         <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1554,103 +1423,6 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
         <tr id='pt13.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="ft13.6" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author.py&#34;, line 471, in test_rename_capital_on_upload
-    self.assertEqual([&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;], details[&#39;author&#39;])
-AssertionError: Lists differ: [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;] != [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;, &#39;Liu Yang&#39;]
-
-Second list contains 1 additional elements.
-First extra element 4:
-&#39;Liu Yang&#39;
-
-- [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;]
-+ [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;, &#39;Liu Yang&#39;]
-?                                                                    ++++++++++++</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="failClass">
-        <td>TestEditAuthorsGdrive</td>
-        <td class="text-center">6</td>
-        <td class="text-center">5</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('c14', 6)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt14.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1659,38 +1431,11 @@ First extra element 4:
     
     
     
-        <tr id="ft14.6" class="none bg-danger">
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 564, in test_rename_capital_on_upload
-    self.assertEqual([&#39;Asterix Lionherd&#39;], details[&#39;author&#39;])
-AssertionError: Lists differ: [&#39;Asterix Lionherd&#39;] != [&#39;Asterix Lionherd&#39;, &#39;Asterix Lionherd&#39;]
-
-Second list contains 1 additional elements.
-First extra element 1:
-&#39;Asterix Lionherd&#39;
-
-- [&#39;Asterix Lionherd&#39;]
-+ [&#39;Asterix Lionherd&#39;, &#39;Asterix Lionherd&#39;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1704,13 +1449,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 18)">Detail</a>
+            <a onclick="showClassDetail('c14', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1719,7 +1464,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1728,7 +1473,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1737,7 +1482,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1746,7 +1491,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1755,7 +1500,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1764,7 +1509,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1773,7 +1518,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1782,7 +1527,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1791,7 +1536,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1800,7 +1545,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.11' class='hiddenRow bg-success'>
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1809,7 +1554,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1818,7 +1563,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1827,7 +1572,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -1836,7 +1581,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1845,7 +1590,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.16' class='hiddenRow bg-success'>
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1854,7 +1599,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1863,7 +1608,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.18' class='hiddenRow bg-success'>
+        <tr id='pt14.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1881,13 +1626,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
@@ -1905,13 +1650,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 18)">Detail</a>
+            <a onclick="showClassDetail('c16', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1920,7 +1665,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1929,7 +1674,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1938,7 +1683,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1947,7 +1692,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1956,7 +1701,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1965,7 +1710,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1974,7 +1719,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.8' class='hiddenRow bg-success'>
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1983,7 +1728,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.9' class='hiddenRow bg-success'>
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1992,7 +1737,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.10' class='hiddenRow bg-success'>
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -2001,7 +1746,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.11' class='hiddenRow bg-success'>
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -2010,7 +1755,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.12' class='hiddenRow bg-success'>
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -2019,7 +1764,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.13' class='hiddenRow bg-success'>
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -2028,7 +1773,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.14' class='hiddenRow bg-success'>
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -2037,7 +1782,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.15' class='hiddenRow bg-success'>
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -2046,7 +1791,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.16' class='hiddenRow bg-success'>
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -2055,7 +1800,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.17' class='hiddenRow bg-success'>
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -2064,7 +1809,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.18' class='hiddenRow bg-success'>
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -2082,13 +1827,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
@@ -2106,13 +1851,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 3)">Detail</a>
+            <a onclick="showClassDetail('c18', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -2121,7 +1866,7 @@ First extra element 1:
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -2130,7 +1875,7 @@ First extra element 1:
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -2148,13 +1893,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 7)">Detail</a>
+            <a onclick="showClassDetail('c19', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -2163,7 +1908,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -2172,7 +1917,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -2181,7 +1926,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2190,7 +1935,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -2199,7 +1944,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -2208,7 +1953,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2226,13 +1971,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2250,13 +1995,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 2)">Detail</a>
+            <a onclick="showClassDetail('c21', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2265,7 +2010,7 @@ First extra element 1:
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -2283,13 +2028,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2298,19 +2043,19 @@ First extra element 1:
     
     
     
-        <tr id="st23.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st23.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.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_st23.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2324,7 +2069,7 @@ First extra element 1:
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2342,13 +2087,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2366,13 +2111,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2381,7 +2126,7 @@ First extra element 1:
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2390,7 +2135,7 @@ First extra element 1:
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2400,115 +2145,1281 @@ First extra element 1:
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestKoboSync</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">1</td>
+        <td class="text-center">10</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id="et25.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.1" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556c4d49d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 582, in test_book_download
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556c4d49d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id="ft25.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 579, in test_kobo_about
+    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id="et25.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.3" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556dfa7c10&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 601, in test_kobo_sync_selected_shelfs
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556dfa7c10&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id="et25.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.4" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556c3f18b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 651, in test_kobo_upload_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556c3f18b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id="et25.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.5" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e0fe880&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 446, in test_shelves_add_remove_books
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e0fe880&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id="et25.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.6" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e17b130&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 276, in test_sync_changed_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e17b130&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id="et25.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.7" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 229, in test_sync_invalid
+    r = requests.post(self.kobo_adress+&#39;x/v1/auth/device&#39;, json=payload, timeout=10)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id="et25.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.8" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e17bbb0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 513, in test_sync_reading_state
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e17bbb0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id="et25.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.9" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556df84580&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 295, in test_sync_shelf
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556df84580&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id="et25.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.10" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e136400&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 242, in test_sync_unchanged
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e136400&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id="et25.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.11" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556df22cd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 256, in test_sync_upload
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556df22cd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c26', 5)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et26.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_kobo_sync)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e71a3a0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 54, in tearDownClass
+    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e71a3a0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et26.2" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_kobo_sync_big)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556dfafaf0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 61, in tearDownClass
+    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556dfafaf0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et26.3" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_reverse_proxy)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555ff86280&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 37, in tearDownClass
+    cls.driver.get(&#39;http://&#39; + get_Host_IP() + &#39;:8083&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=58627): Max retries exceeded with url: /session/d45b05f4-c689-4cdf-9ed6-19561cd0e50e/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555ff86280&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et26.4" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_updater)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 27, in setUpClass
+    cls.proxy = Proxy()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_proxy.py&#34;, line 305, in __init__
+    self.m = DumpMaster(opts, with_termlog=False, with_dumper=False)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/tools/dump.py&#34;, line 28, in __init__
+    self.addons.add(*addons.default_addons())
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 199, in add
+    self.chain.append(self.register(i))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 184, in register
+    self.invoke_addon(addon, LoadHook(l))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 264, in invoke_addon
+    func(*event.args())
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addons/proxyserver.py&#34;, line 101, in load
+    loader.add_option(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 91, in add_option
+    ctx.log.warn(&#34;Over-riding existing option %s&#34; % name)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/log.py&#34;, line 55, in warn
+    self(txt, &#34;warn&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/log.py&#34;, line 64, in __call__
+    asyncio.get_event_loop().call_soon(
+  File &#34;/usr/lib/python3.8/asyncio/base_events.py&#34;, line 719, in call_soon
+    self._check_closed()
+  File &#34;/usr/lib/python3.8/asyncio/base_events.py&#34;, line 508, in _check_closed
+    raise RuntimeError(&#39;Event loop is closed&#39;)
+RuntimeError: Event loop is closed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et26.5" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_zz_helper)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 25, in setUpClass
+    from cps import helper, updater
+  File &#34;/home/ozzie/Development/calibre-web/cps/helper.py&#34;, line 53, in &lt;module&gt;
+    from .tasks.convert import TaskConvert
+  File &#34;/home/ozzie/Development/calibre-web/cps/tasks/convert.py&#34;, line 36, in &lt;module&gt;
+    from cps.tasks.mail import TaskEmail
+  File &#34;/home/ozzie/Development/calibre-web/cps/tasks/mail.py&#34;, line 36, in &lt;module&gt;
+    from cps import gdriveutils
+  File &#34;/home/ozzie/Development/calibre-web/cps/gdriveutils.py&#34;, line 145, in &lt;module&gt;
+    engine = create_engine(&#39;sqlite:///{0}&#39;.format(cli_param.gd_path), echo=False)
+AttributeError: &#39;CliParameter&#39; object has no attribute &#39;gd_path&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2517,9 +3428,9 @@ First extra element 1:
     <tr id="su" class="errorClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">6</td>
-        <td class="text-center">3</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">6</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c27', 6)">Detail</a>
@@ -2528,26 +3439,88 @@ First extra element 1:
 
     
     
-        <tr id="ft27.1" class="none bg-danger">
+        <tr id="et27.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_download_cover</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.1')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft27.1" class="popup_window test_output" style="display:block;">
+                <div id="div_et27.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft27.1').style.display='none'"><span
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 472, in test_download_cover
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555fed7e50&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 471, in test_download_cover
+    self.fill_thumbnail_config({&#39;schedule_generate_book_covers&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 238, in fill_thumbnail_config
+    ele = cls.driver.find_element(By.ID, checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555fed7e50&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2574,9 +3547,73 @@ AssertionError: False is not true</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 412, in test_kobo_sync_multi_user
-    self.check_element_on_page((By.XPATH, &#34;//*[@id=&#39;archived_cb&#39;]&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555fed7910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 334, in test_kobo_sync_multi_user
+    self.create_user(&#39;user1&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;ada@b.com&#39;, &#34;edit_role&#34;: 1, &#34;download_role&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1008, in create_user
+    return cls.change_user(config)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1062, in change_user
+    ele = cls.driver.find_element(By.ID, checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555fed7910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2603,9 +3640,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 279, in test_kobo_sync_selected_shelves
-    self.check_element_on_page((By.ID, &#34;add-to-shelf&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 271, in test_kobo_sync_selected_shelves
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
+    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2615,40 +3654,106 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id="et27.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 173, in test_sync_changed_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
+    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id="et27.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 248, in test_sync_reading_state
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
+    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id="et27.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 204, in test_sync_shelf
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
+    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">10</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('c28', 13)">Detail</a>
@@ -2747,29 +3852,109 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id="et28.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et28.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et28.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et28.11').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1047, in test_ldap_kobo_sync
+    self.check_element_on_page((By.ID, &#34;config_create_kobo_token&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id="et28.12" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et28.12')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et28.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et28.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 922, in test_ldap_opds_anonymous
+    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id="et28.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et28.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et28.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et28.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 832, in test_ldap_opds_download_book
+    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2880,11 +4065,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestLogging</td>
         <td class="text-center">9</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
+        <td class="text-center">7</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -2912,11 +4097,33 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id="ft30.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft30.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft30.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft30.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_logging.py&#34;, line 249, in test_debuginfo_download
+    self.assertEqual(resp.headers[&#39;Content-Type&#39;], &#39;application/zip&#39;)
+AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
+- text/html; charset=utf-8
++ application/zip</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3176,11 +4383,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">1</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3199,11 +4406,31 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id="ft33.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_oauth.py&#34;, line 53, in test_visible_oauth
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;config_1_oauth&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3506,12 +4733,12 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">4</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('c37', 5)">Detail</a>
@@ -3547,11 +4774,33 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id="et37.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 197, in sound_test
+    self.assertTrue(os.path.splitext(file_name)[1][1:] in listen_button.text)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3701,12 +4950,12 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestReverseProxy</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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c41', 3)">Detail</a>
@@ -3715,29 +4964,157 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id="et41.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555ff994f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 48, in test_logout
+    self.logout()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 104, in logout
+    logout = cls.check_element_on_page((By.ID, &#34;logout&#34;))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 739, in check_element_on_page
+    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=58627): Max retries exceeded with url: /session/d45b05f4-c689-4cdf-9ed6-19561cd0e50e/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555ff994f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id="ft41.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 56, in test_move_page
+    self.assertTrue(self.goto_page(&#34;admin_setup&#34;))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id="ft41.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 45, in test_reverse_about
+    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3920,14 +5297,14 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
 
 
     <tr id="su" class="failClass">
-        <td>TestThumbnails</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
-        <td class="text-center">7</td>
+        <td>TestThumbnailsEnv</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 8)">Detail</a>
+            <a onclick="showClassDetail('c43', 1)">Detail</a>
         </td>
     </tr>
 
@@ -3935,7 +5312,7 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
         <tr id="ft43.1" class="none bg-danger">
             <td>
-                <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
+                <div class='testcase'>TestThumbnailsEnv - test_cover_cache_env_on_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -3950,191 +5327,8 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 210, in test_cache_non_writable
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.2" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 178, in test_cache_of_deleted_book
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.3" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 77, in test_cover_cache_on_database_change
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.4" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 117, in test_cover_change_on_upload_new_cover
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='st43.5' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestThumbnails - test_cover_for_series</div>
-            </td>
-            <td colspan='6' align='center'>SKIP</td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.6" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 224, in test_cover_on_upload_book
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.7" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 152, in test_remove_cover_from_cache
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.8" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 262, in test_sideloaded_book
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnail_env.py&#34;, line 60, in test_cover_cache_env_on_database_change
+    self.assertTrue(os.path.exists(thumbail_cache_path))
 AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -4147,14 +5341,14 @@ AssertionError: False is not true</pre>
 
 
     <tr id="su" class="failClass">
-        <td>TestUpdater</td>
-        <td class="text-center">9</td>
-        <td class="text-center">7</td>
-        <td class="text-center">1</td>
+        <td>TestThumbnails</td>
+        <td class="text-center">8</td>
+        <td class="text-center">2</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 9)">Detail</a>
+            <a onclick="showClassDetail('c44', 8)">Detail</a>
         </td>
     </tr>
 
@@ -4162,59 +5356,61 @@ AssertionError: False is not true</pre>
     
         <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
+                <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id="ft44.2" class="none bg-danger">
             <td>
-                <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.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='pt44.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="ft44.5" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestUpdater - test_perform_update</div>
+                <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.5')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.2')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft44.5" class="popup_window test_output" style="display:block;">
+                <div id="div_ft44.2" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.5').style.display='none'"><span
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 359, in test_perform_update
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 199, in test_cache_of_deleted_book
+    self.assertEqual(220, count_files(thumbnail_cache_path))
+AssertionError: 220 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.3" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 83, in test_cover_cache_on_database_change
+    self.assertTrue(os.path.exists(thumbnail_cache_path))
 AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -4225,32 +5421,26 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id="ft44.4" class="none bg-danger">
             <td>
-                <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="st44.7" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
+                <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st44.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.4')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st44.7" class="popup_window test_output" style="display:none;">
+                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st44.7').style.display='none'"><span
+                                onclick="document.getElementById('div_ft44.4').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>
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 125, in test_cover_change_on_upload_new_cover
+    self.assertTrue(os.path.exists(thumbnail_cache_path))
+AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4260,31 +5450,89 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='st44.5' class='none bg-warning'>
             <td>
-                <div class='testcase'>TestUpdater - test_reconnect_database</div>
+                <div class='testcase'>TestThumbnails - test_cover_for_series</div>
+            </td>
+            <td colspan='6' align='center'>SKIP</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id="ft44.7" class="none bg-danger">
             <td>
-                <div class='testcase'>TestUpdater - test_update_write_protect</div>
+                <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 164, in test_remove_cover_from_cache
+    self.assertEqual(book_thumbnail_reference - 2, count_files(thumbnail_cache_path))
+AssertionError: -2 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.8" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 281, in test_sideloaded_book
+    self.assertEqual(book_thumbnail_reference + 2, count_files(thumbnail_cache_path))
+AssertionError: 2 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">4</td>
-        <td class="text-center">3</td>
+        <td class="text-center">4</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('c45', 4)">Detail</a>
@@ -4293,31 +5541,11 @@ AssertionError: False is not true</pre>
 
     
     
-        <tr id="et45.1" class="none bg-info">
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et45.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et45.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et45.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 188, in test_upload_epub_cover
-    os.remove(&#39;cover_image.png&#39;)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -5084,172 +6312,13 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
     
     
 
-
-    <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('c50', 16)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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>420</td>
-        <td>389</td>
-        <td>14</td>
-        <td>10</td>
-        <td>7</td>
+        <td>401</td>
+        <td>356</td>
+        <td>12</td>
+        <td>27</td>
+        <td>6</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -5397,7 +6466,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.35</td>
+              <td>1.4.36</td>
               <td>Basic</td>
             </tr>
           
@@ -5427,7 +6496,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5457,7 +6526,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5487,7 +6556,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5529,7 +6598,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5565,7 +6634,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5607,7 +6676,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5697,7 +6766,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
 </div>
 
 <script>
-    drawCircle(389, 14, 10, 7);
+    drawCircle(356, 12, 27, 6);
     showCase(5);
 </script>
 

From ef4b5e2881062199272a4ff7d577dffdade3b5ac Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 28 Apr 2022 21:40:48 +0200
Subject: [PATCH 265/412] Bugfix audio player Bugfix Debugfile export

---
 cps/config_sql.py         | 2 +-
 cps/templates/detail.html | 8 ++++----
 setup.cfg                 | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index e20f7ac2c..743b2ce7c 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -296,7 +296,7 @@ class _ConfigSQL(object):
     def toDict(self):
         storage = {}
         for k, v in self.__dict__.items():
-            if k[0] != '_' and not k.endswith("password") and not k.endswith("secret"):
+            if k[0] != '_' and not k.endswith("password") and not k.endswith("secret") and not k == "cli":
                 storage[k] = v
         return storage
 
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 5d7c846e1..3af205fb5 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -71,9 +71,9 @@
                 {% endif %}
               </div>
             {% endif %}
-            {% if entry.audioentries|length > 0 and g.user.role_viewer() %}
+            {% if entry.audio_entries|length > 0 and g.user.role_viewer() %}
               <div class="btn-group" role="group">
-              {% if entry.audioentries|length > 1 %}
+              {% if entry.audio_entries|length > 1 %}
                 <button id="listen-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}}
                   <span class="caret"></span>
@@ -86,13 +86,13 @@
                   <ul class="dropdown-menu" aria-labelledby="listen-in-browser">
 
               {% for format in entry.data %}
-                  {% if format.format|lower in entry.audioentries %}
+                  {% if format.format|lower in entry.audio_entries %}
                     <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>
                 {% else %}
-                  <a target="_blank" href="{{url_for('web.read_book', book_id=entry.id, book_format=entry.audioentries[0])}}" id="listenbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}} - {{entry.audioentries[0]}}</a>
+                  <a target="_blank" href="{{url_for('web.read_book', book_id=entry.id, book_format=entry.audio_entries[0])}}" id="listenbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}} - {{entry.audio_entries[0]}}</a>
                 {% endif %}
               </div>
             {% endif %}
diff --git a/setup.cfg b/setup.cfg
index 9daae0c9a..aff22e9ef 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,7 +38,7 @@ console_scripts =
 [options]
 include_package_data = True
 install_requires = 
-	APScheduler>=3.6.3,<3.8.0
+	APScheduler>=3.6.3,<3.10.0
 	werkzeug<2.1.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
@@ -62,7 +62,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.46.0
+	google-api-python-client>=1.7.11,<2.50.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -75,7 +75,7 @@ gdrive =
 	rsa>=3.4.2,<4.9.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.6.0
-	google-api-python-client>=1.7.11,<2.46.0
+	google-api-python-client>=1.7.11,<2.50.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From 258b4a6767d23d288e228126fe925a69d542d03e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 28 Apr 2022 21:43:26 +0200
Subject: [PATCH 266/412] Bugfix OAuth Login

---
 cps/main.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/cps/main.py b/cps/main.py
index 16d288acf..d3591c064 100644
--- a/cps/main.py
+++ b/cps/main.py
@@ -22,13 +22,6 @@ from . import create_app
 from .jinjia import jinjia
 from .remotelogin import remotelogin
 
-try:
-    from oauth_bb import oauth
-    oauth_available = True
-except ImportError:
-    oauth_available = False
-
-
 def main():
     app = create_app()
 
@@ -50,6 +43,12 @@ def main():
     except (ImportError, AttributeError):  # Catch also error for not installed flask-WTF (missing csrf decorator)
         kobo_available = False
 
+    try:
+        from .oauth_bb import oauth
+        oauth_available = True
+    except ImportError:
+        oauth_available = False
+
     from . import web_server
     init_errorhandler()
 

From 5d5a94c9e59fcc66c19ed05cc495f2b30cc9e7c2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 29 Apr 2022 18:16:37 +0200
Subject: [PATCH 267/412] Bugfix start as program

---
 cps.py          | 13 ++++++-------
 cps/__init__.py |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cps.py b/cps.py
index 91bb1d74a..e4f9c520c 100755
--- a/cps.py
+++ b/cps.py
@@ -20,16 +20,15 @@
 import os
 import sys
 
-# Are we running from commandline?
-if __package__ == '':
-    # Add local path to sys.path so we can import cps
-    path = os.path.dirname(os.path.dirname(__file__))
-    sys.path.insert(0, path)
 
-from cps.main import main as _main
+# Add local path to sys.path so we can import cps
+path = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(0, path)
+
+from cps.main import main
 
 if __name__ == '__main__':
-    _main()
+    main()
 
 
 
diff --git a/cps/__init__.py b/cps/__init__.py
index 3f92571b5..1ba1f778e 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -19,6 +19,8 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
+__package__ = "cps"
+
 import sys
 import os
 import mimetypes

From e8e4d87d398a4aa2c366fce48bbb399de21ae7e9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 30 Apr 2022 08:26:00 +0200
Subject: [PATCH 268/412] Bugfix session commit Bugfix get_locale Bugfix
 reconnect database schedule Bugfix no permission error message logging Bugfix
 updater

---
 cps/admin.py                            |    3 +-
 cps/db.py                               |    5 +-
 cps/fs.py                               |   12 +-
 cps/helper.py                           |    3 +-
 cps/schedule.py                         |    2 +-
 cps/tasks/convert.py                    |    6 +-
 cps/tasks/thumbnail.py                  |   39 +-
 cps/templates/schedule_edit.html        |    2 +-
 cps/updater.py                          |   18 +-
 test/Calibre-Web TestSummary_Linux.html | 2596 +++++------------------
 10 files changed, 585 insertions(+), 2101 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 91a161266..76275922f 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -185,7 +185,6 @@ def update_thumbnails():
 @login_required
 @admin_required
 def admin():
-    locale = get_locale()
     version = updater_thread.get_current_version_info()
     if version is False:
         commit = _(u'Unknown')
@@ -1460,7 +1459,7 @@ def download_debug():
 def get_update_status():
     if feature_support['updater']:
         log.info(u"Update status requested")
-        return updater_thread.get_available_updates(request.method, locale=get_locale())
+        return updater_thread.get_available_updates(request.method)
     else:
         return ''
 
diff --git a/cps/db.py b/cps/db.py
index 21104622d..f4dc4ccb3 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -441,10 +441,13 @@ class CalibreDB:
     # instances alive once they reach the end of their respective scopes
     instances = WeakSet()
 
-    def __init__(self):
+    def __init__(self, expire_on_commit=True, init=False):
         """ Initialize a new CalibreDB session
         """
         self.session = None
+        if init:
+            self.init_db(expire_on_commit)
+
 
     def init_db(self, expire_on_commit=True):
         if self._init:
diff --git a/cps/fs.py b/cps/fs.py
index 2f83378dd..996499c3e 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -39,7 +39,7 @@ class FileSystem:
                 makedirs(self._cache_dir)
             except OSError:
                 self.log.info(f'Failed to create path {self._cache_dir} (Permission denied).')
-                return False
+                raise
 
         path = join(self._cache_dir, cache_type)
         if cache_type and not isdir(path):
@@ -47,7 +47,7 @@ class FileSystem:
                 makedirs(path)
             except OSError:
                 self.log.info(f'Failed to create path {path} (Permission denied).')
-                return False
+                raise
 
         return path if cache_type else self._cache_dir
 
@@ -58,7 +58,7 @@ class FileSystem:
                 makedirs(path)
             except OSError:
                 self.log.info(f'Failed to create path {path} (Permission denied).')
-                return False
+                raise
 
         return path
 
@@ -75,7 +75,7 @@ class FileSystem:
                 rmtree(self._cache_dir)
             except OSError:
                 self.log.info(f'Failed to delete path {self._cache_dir} (Permission denied).')
-                return False
+                raise
 
         path = join(self._cache_dir, cache_type)
         if cache_type and isdir(path):
@@ -83,7 +83,7 @@ class FileSystem:
                 rmtree(path)
             except OSError:
                 self.log.info(f'Failed to delete path {path} (Permission denied).')
-                return False
+                raise
 
     def delete_cache_file(self, filename, cache_type=None):
         path = self.get_cache_file_path(filename, cache_type)
@@ -92,4 +92,4 @@ class FileSystem:
                 remove(path)
             except OSError:
                 self.log.info(f'Failed to delete path {path} (Permission denied).')
-                return False
+                raise
diff --git a/cps/helper.py b/cps/helper.py
index 7362eb9e2..757e48da8 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -1015,8 +1015,7 @@ def replace_cover_thumbnail_cache(book_id):
 
 
 def delete_thumbnail_cache():
-    if config.schedule_generate_book_covers:
-        WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
 
 
 def add_book_to_thumbnail_cache(book_id):
diff --git a/cps/schedule.py b/cps/schedule.py
index 9bc248f16..faadfb7ee 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -62,7 +62,7 @@ def register_scheduled_tasks(reconnect=True):
         duration = config.schedule_duration
 
         # Register scheduled tasks
-        scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
+        scheduler.schedule_tasks(tasks=get_scheduled_tasks(reconnect), trigger='cron', hour=start)
         end_time = calclulate_end_time(start, duration)
         scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=end_time.hour,
                            minute=end_time.minute)
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index bc7e928a9..3062850dd 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -55,8 +55,7 @@ class TaskConvert(CalibreTask):
     def run(self, worker_thread):
         self.worker_thread = worker_thread
         if config.config_use_google_drive:
-            worker_db = db.CalibreDB()
-            worker_db.init_db(expire_on_commit=False)
+            worker_db = db.CalibreDB(expire_on_commit=False, init=True)
             cur_book = worker_db.get_book(self.book_id)
             self.title = cur_book.title
             data = worker_db.get_book_format(self.book_id, self.settings['old_book_format'])
@@ -105,8 +104,7 @@ class TaskConvert(CalibreTask):
 
     def _convert_ebook_format(self):
         error_message = None
-        local_db = db.CalibreDB()
-        local_db.init_db(expire_on_commit=False)
+        local_db = db.CalibreDB(expire_on_commit=False, init=True)
         file_path = self.file_path
         book_id = self.book_id
         format_old_ext = u'.' + self.settings['old_book_format'].lower()
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 2ecc57c83..ace9cecce 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -68,8 +68,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self.log = logger.create()
         self.book_id = book_id
         self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB()
-        self.calibre_db.init_db(expire_on_commit=False)
+        # self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
@@ -77,7 +76,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         ]
 
     def run(self, worker_thread):
-        if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
+        if use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
             self.message = 'Scanning Books'
             books_with_covers = self.get_books_with_covers(self.book_id)
             count = len(books_with_covers)
@@ -112,11 +111,10 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def get_books_with_covers(self, book_id=-1):
         filter_exp = (db.Books.id == book_id) if book_id != -1 else True
-        return self.calibre_db.session \
-            .query(db.Books) \
-            .filter(db.Books.has_cover == 1) \
-            .filter(filter_exp) \
-            .all()
+        calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
+        books_cover = calibre_db.session.query(db.Books).filter(db.Books.has_cover == 1).filter(filter_exp).all()
+        calibre_db.session.close()
+        return books_cover
 
     def get_book_cover_thumbnails(self, book_id):
         return self.app_db_session \
@@ -160,7 +158,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self.app_db_session.commit()
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
-            self.log.info('Error creating book thumbnail: ' + str(ex))
+            self.log.debug('Error creating book thumbnail: ' + str(ex))
             self._handleError('Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -172,7 +170,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
-            self.log.info('Error updating book thumbnail: ' + str(ex))
+            self.log.debug('Error updating book thumbnail: ' + str(ex))
             self._handleError('Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -200,7 +198,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                             img.save(filename=filename)
                 except Exception as ex:
                     # Bubble exception to calling function
-                    self.log.info('Error generating thumbnail file: ' + str(ex))
+                    self.log.debug('Error generating thumbnail file: ' + str(ex))
                     raise ex
                 finally:
                     if stream is not None:
@@ -239,8 +237,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
         super(TaskGenerateSeriesThumbnails, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB()
-        self.calibre_db.init_db(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
@@ -337,7 +334,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.app_db_session.commit()
             self.generate_series_thumbnail(series_books, thumbnail)
         except Exception as ex:
-            self.log.info('Error creating book thumbnail: ' + str(ex))
+            self.log.debug('Error creating book thumbnail: ' + str(ex))
             self._handleError('Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -349,7 +346,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_series_thumbnail(series_books, thumbnail)
         except Exception as ex:
-            self.log.info('Error updating book thumbnail: ' + str(ex))
+            self.log.debug('Error updating book thumbnail: ' + str(ex))
             self._handleError('Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -393,7 +390,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                             canvas.composite(img, left, top)
 
                     except Exception as ex:
-                        self.log.info('Error generating thumbnail file: ' + str(ex))
+                        self.log.debug('Error generating thumbnail file: ' + str(ex))
                         raise ex
                     finally:
                         if stream is not None:
@@ -450,18 +447,18 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
-        self.calibre_db = db.CalibreDB()
-        self.calibre_db.init_db(expire_on_commit=False)
         self.app_db_session = ub.get_new_session_instance()
         self.cache = fs.FileSystem()
 
     def run(self, worker_thread):
         if self.app_db_session:
             if self.book_id == 0:  # delete superfluous thumbnails
-                thumbnails = (self.calibre_db.session.query(ub.Thumbnail)
+                calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
+                thumbnails = (calibre_db.session.query(ub.Thumbnail)
                               .join(db.Books, ub.Thumbnail.entity_id == db.Books.id, isouter=True)
                               .filter(db.Books.id == None)
                               .all())
+                calibre_db.session.close()
             elif self.book_id > 0:  # make sure single book is selected
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
             if self.book_id < 0:
@@ -489,7 +486,7 @@ class TaskClearCoverThumbnailCache(CalibreTask):
                 .delete()
             self.app_db_session.commit()
         except Exception as ex:
-            self.log.info('Error deleting book thumbnail: ' + str(ex))
+            self.log.debug('Error deleting book thumbnail: ' + str(ex))
             self._handleError('Error deleting book thumbnail: ' + str(ex))
 
     def delete_all_thumbnails(self):
@@ -498,7 +495,7 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             self.app_db_session.commit()
             self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
-            self.log.info('Error deleting thumbnail directory: ' + str(ex))
+            self.log.debug('Error deleting thumbnail directory: ' + str(ex))
             self._handleError('Error deleting thumbnail directory: ' + str(ex))
 
     @property
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index 55658ce78..83dd6c689 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -33,7 +33,7 @@
       <label for="schedule_generate_series_covers">{{_('Generate Series Cover Thumbnails')}}</label>
     </div-->
     <div class="form-group">
-      <input type="checkbox" id="schedule_reconnect" name="schedule_reconnect" {% if config.schedule_generate_book_covers %}checked{% endif %}>
+      <input type="checkbox" id="schedule_reconnect" name="schedule_reconnect" {% if config.schedule_reconnect %}checked{% endif %}>
       <label for="schedule_reconnect">{{_('Reconnect to Calibre Library')}}</label>
     </div>
 
diff --git a/cps/updater.py b/cps/updater.py
index b47b80f58..757e43fcf 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -67,10 +67,10 @@ class Updater(threading.Thread):
             return self._stable_version_info()
         return self._nightly_version_info()
 
-    def get_available_updates(self, request_method, locale):
+    def get_available_updates(self, request_method):
         if self.config.config_updatechannel == constants.UPDATE_STABLE:
             return self._stable_available_updates(request_method)
-        return self._nightly_available_updates(request_method, locale)
+        return self._nightly_available_updates(request_method)
 
     def do_work(self):
         try:
@@ -335,7 +335,7 @@ class Updater(threading.Thread):
         print("\n*** Finished ***")
 
     @staticmethod
-    def _populate_parent_commits(update_data, status, locale, tz, parents):
+    def _populate_parent_commits(update_data, status, tz, parents):
         try:
             parent_commit = update_data['parents'][0]
             # limit the maximum search depth
@@ -360,7 +360,7 @@ class Updater(threading.Thread):
                         parent_commit_date = datetime.datetime.strptime(
                             parent_data['committer']['date'], '%Y-%m-%dT%H:%M:%SZ') - tz
                         parent_commit_date = format_datetime(
-                            parent_commit_date, format='short', locale=locale)
+                            parent_commit_date, format='short')
 
                         parents.append([parent_commit_date,
                                         parent_data['message'].replace('\r\n', '<p>').replace('\n', '<p>')])
@@ -418,7 +418,7 @@ class Updater(threading.Thread):
             log_function("Excluded file list for updater not found, or not accessible")
         return excluded_files
 
-    def _nightly_available_updates(self, request_method, locale):
+    def _nightly_available_updates(self, request_method):
         tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)
         if request_method == "GET":
             repository_url = _REPOSITORY_API_URL
@@ -459,14 +459,14 @@ class Updater(threading.Thread):
                     update_data['committer']['date'], '%Y-%m-%dT%H:%M:%SZ') - tz
                 parents.append(
                     [
-                        format_datetime(new_commit_date, format='short', locale=locale),
+                        format_datetime(new_commit_date, format='short'),
                         update_data['message'],
                         update_data['sha']
                     ]
                 )
                 # it only makes sense to analyze the parents if we know the current commit hash
                 if status['current_commit_hash'] != '':
-                    parents = self._populate_parent_commits(update_data, status, locale, tz, parents)
+                    parents = self._populate_parent_commits(update_data, status, tz, parents)
                 status['history'] = parents[::-1]
             except (IndexError, KeyError):
                 status['success'] = False
@@ -595,7 +595,7 @@ class Updater(threading.Thread):
         return json.dumps(status)
 
     def _get_request_path(self):
-        if config.config_updatechannel == constants.UPDATE_STABLE:
+        if self.config.config_updatechannel == constants.UPDATE_STABLE:
             return self.updateFile
         return _REPOSITORY_API_URL + '/zipball/master'
 
@@ -623,7 +623,7 @@ class Updater(threading.Thread):
                     status['message'] = _(u'HTTP Error') + ': ' + commit['message']
             else:
                 status['message'] = _(u'HTTP Error') + ': ' + str(e)
-        except requests.exceptions.ConnectionError:
+        except requests.exceptions.ConnectionError as e:
             status['message'] = _(u'Connection error')
         except requests.exceptions.Timeout:
             status['message'] = _(u'Timeout while establishing connection')
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index cf3e893d7..913913b17 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-27 19:55:57</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-29 21:17:05</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>2022-04-28 01:28:47</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-30 03:15:20</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>4h 34 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>5h 5 min</p>
         </div>
       </div>
       </div>
@@ -600,8 +600,8 @@
     <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">7</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</td>
+        <td class="text-center">5</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -611,11 +611,31 @@
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id="ft7.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 198, in test_convert_email
+    self.assertTrue(&#34;E-mail&#34; in ret[-1][&#39;task&#39;])
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -682,9 +702,9 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 441, in test_thumbnail_cache
-    self.assertTrue(os.path.exists(thumbnail_cache_path))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 442, in test_thumbnail_cache
+    self.assertEqual(10*2, count_files(thumbnail_cache_path))
+AssertionError: 20 != 0</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1642,11 +1662,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">17</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1809,11 +1829,31 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.18' class='hiddenRow bg-success'>
+        <tr id="ft16.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft16.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft16.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 931, in test_watch_metadata
+    self.assertNotIn(&#39;series&#39;, book)
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5/og?c=1651263008&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2145,12 +2185,12 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</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">1</td>
-        <td class="text-center">10</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c25', 11)">Detail</a>
@@ -2159,1610 +2199,190 @@ AssertionError: False is not true</pre>
 
     
     
-        <tr id="et25.1" class="none bg-info">
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <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_et25.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.1" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556c4d49d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 582, in test_book_download
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556c4d49d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft25.2" class="none bg-danger">
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 579, in test_kobo_about
-    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.3" class="none bg-info">
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</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:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556dfa7c10&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 601, in test_kobo_sync_selected_shelfs
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556dfa7c10&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.4" class="none bg-info">
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</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:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556c3f18b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 651, in test_kobo_upload_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556c3f18b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.5" class="none bg-info">
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.5" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e0fe880&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 446, in test_shelves_add_remove_books
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e0fe880&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.6" class="none bg-info">
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.6" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e17b130&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 276, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e17b130&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.7" class="none bg-info">
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.7" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 229, in test_sync_invalid
-    r = requests.post(self.kobo_adress+&#39;x/v1/auth/device&#39;, json=payload, timeout=10)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.8" class="none bg-info">
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.8" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e17bbb0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 513, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e17bbb0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.9" class="none bg-info">
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.9" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556df84580&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 295, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556df84580&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.10" class="none bg-info">
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.10" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e136400&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 242, in test_sync_unchanged
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e136400&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.11" class="none bg-info">
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.11" class="popup_window test_output" style="display:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556df22cd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 256, in test_sync_upload
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556df22cd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c26', 5)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et26.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_kobo_sync)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e71a3a0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 54, in tearDownClass
-    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e71a3a0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et26.2" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_kobo_sync_big)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556dfafaf0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 61, in tearDownClass
-    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556dfafaf0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et26.3" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_reverse_proxy)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555ff86280&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 37, in tearDownClass
-    cls.driver.get(&#39;http://&#39; + get_Host_IP() + &#39;:8083&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=58627): Max retries exceeded with url: /session/d45b05f4-c689-4cdf-9ed6-19561cd0e50e/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555ff86280&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et26.4" class="none bg-info">
-            <td>
-                <div class='testcase'>setUpClass (test_updater)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 27, in setUpClass
-    cls.proxy = Proxy()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_proxy.py&#34;, line 305, in __init__
-    self.m = DumpMaster(opts, with_termlog=False, with_dumper=False)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/tools/dump.py&#34;, line 28, in __init__
-    self.addons.add(*addons.default_addons())
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 199, in add
-    self.chain.append(self.register(i))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 184, in register
-    self.invoke_addon(addon, LoadHook(l))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 264, in invoke_addon
-    func(*event.args())
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addons/proxyserver.py&#34;, line 101, in load
-    loader.add_option(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 91, in add_option
-    ctx.log.warn(&#34;Over-riding existing option %s&#34; % name)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/log.py&#34;, line 55, in warn
-    self(txt, &#34;warn&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/log.py&#34;, line 64, in __call__
-    asyncio.get_event_loop().call_soon(
-  File &#34;/usr/lib/python3.8/asyncio/base_events.py&#34;, line 719, in call_soon
-    self._check_closed()
-  File &#34;/usr/lib/python3.8/asyncio/base_events.py&#34;, line 508, in _check_closed
-    raise RuntimeError(&#39;Event loop is closed&#39;)
-RuntimeError: Event loop is closed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et26.5" class="none bg-info">
-            <td>
-                <div class='testcase'>setUpClass (test_zz_helper)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 25, in setUpClass
-    from cps import helper, updater
-  File &#34;/home/ozzie/Development/calibre-web/cps/helper.py&#34;, line 53, in &lt;module&gt;
-    from .tasks.convert import TaskConvert
-  File &#34;/home/ozzie/Development/calibre-web/cps/tasks/convert.py&#34;, line 36, in &lt;module&gt;
-    from cps.tasks.mail import TaskEmail
-  File &#34;/home/ozzie/Development/calibre-web/cps/tasks/mail.py&#34;, line 36, in &lt;module&gt;
-    from cps import gdriveutils
-  File &#34;/home/ozzie/Development/calibre-web/cps/gdriveutils.py&#34;, line 145, in &lt;module&gt;
-    engine = create_engine(&#39;sqlite:///{0}&#39;.format(cli_param.gd_path), echo=False)
-AttributeError: &#39;CliParameter&#39; object has no attribute &#39;gd_path&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">6</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</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('c27', 6)">Detail</a>
+            <a onclick="showClassDetail('c26', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et27.1" class="none bg-info">
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_download_cover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555fed7e50&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 471, in test_download_cover
-    self.fill_thumbnail_config({&#39;schedule_generate_book_covers&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 238, in fill_thumbnail_config
-    ele = cls.driver.find_element(By.ID, checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555fed7e50&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.2" class="none bg-info">
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555fed7910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 334, in test_kobo_sync_multi_user
-    self.create_user(&#39;user1&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;ada@b.com&#39;, &#34;edit_role&#34;: 1, &#34;download_role&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1008, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1062, in change_user
-    ele = cls.driver.find_element(By.ID, checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555fed7910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.3" class="none bg-info">
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelves</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 271, in test_kobo_sync_selected_shelves
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
-    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.4" class="none bg-info">
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 173, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
-    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.5" class="none bg-info">
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 248, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
-    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.6" class="none bg-info">
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 204, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
-    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">10</td>
+        <td class="text-center">13</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('c28', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -3771,7 +2391,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -3780,7 +2400,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -3789,7 +2409,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -3798,7 +2418,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -3807,7 +2427,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -3816,7 +2436,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -3825,7 +2445,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -3834,7 +2454,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -3843,7 +2463,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -3852,109 +2472,29 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id="et28.11" class="none bg-info">
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et28.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et28.11').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1047, in test_ldap_kobo_sync
-    self.check_element_on_page((By.ID, &#34;config_create_kobo_token&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et28.12" class="none bg-info">
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et28.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et28.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 922, in test_ldap_opds_anonymous
-    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et28.13" class="none bg-info">
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et28.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et28.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 832, in test_ldap_opds_download_book
-    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3968,13 +2508,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 10)">Detail</a>
+            <a onclick="showClassDetail('c28', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -3983,7 +2523,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -3992,7 +2532,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -4001,7 +2541,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -4010,7 +2550,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
@@ -4019,7 +2559,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
@@ -4028,7 +2568,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -4037,7 +2577,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -4046,7 +2586,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -4055,7 +2595,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -4065,21 +2605,21 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestLogging</td>
         <td class="text-center">9</td>
-        <td class="text-center">7</td>
-        <td class="text-center">1</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">
-            <a onclick="showClassDetail('c30', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -4088,7 +2628,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -4097,38 +2637,16 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft30.3" class="none bg-danger">
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft30.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft30.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft30.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_logging.py&#34;, line 249, in test_debuginfo_download
-    self.assertEqual(resp.headers[&#39;Content-Type&#39;], &#39;application/zip&#39;)
-AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
-- text/html; charset=utf-8
-+ application/zip</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -4137,19 +2655,19 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id="st30.5" class="none bg-warning">
+        <tr id="st29.5" 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_st30.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st30.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st30.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4163,7 +2681,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -4172,7 +2690,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -4181,7 +2699,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -4190,7 +2708,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -4208,13 +2726,13 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -4223,7 +2741,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -4232,7 +2750,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -4241,7 +2759,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -4250,7 +2768,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -4259,7 +2777,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -4268,7 +2786,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -4277,7 +2795,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -4286,7 +2804,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -4295,7 +2813,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -4304,7 +2822,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -4313,7 +2831,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -4322,7 +2840,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -4331,7 +2849,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -4340,7 +2858,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -4358,13 +2876,13 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -4373,7 +2891,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -4383,21 +2901,21 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestOAuthLogin</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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('c33', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -4406,31 +2924,11 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id="ft33.2" class="none bg-danger">
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_oauth.py&#34;, line 53, in test_visible_oauth
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;config_1_oauth&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4444,13 +2942,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -4459,7 +2957,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -4468,7 +2966,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -4477,7 +2975,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -4486,7 +2984,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -4495,7 +2993,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -4504,7 +3002,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -4513,7 +3011,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -4522,7 +3020,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -4531,7 +3029,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -4540,7 +3038,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -4549,7 +3047,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -4558,7 +3056,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -4567,7 +3065,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -4576,7 +3074,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -4585,7 +3083,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -4594,7 +3092,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -4603,7 +3101,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -4612,7 +3110,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -4621,7 +3119,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -4630,7 +3128,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -4639,7 +3137,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -4648,7 +3146,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -4666,13 +3164,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -4682,72 +3180,63 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_FailedTest</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="passClass">
+        <td>TestPipInstall</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">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 1)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et36.1" class="none bg-info">
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>_FailedTest - test_pip_install</div>
+                <div class='testcase'>TestPipInstall - test_command_start</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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_pip_install
-Traceback (most recent call last):
-  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 436, in _find_test_path
-    module = self._get_module_from_name(name)
-  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 377, in _get_module_from_name
-    __import__(name)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_pip_install.py&#34;, line 15, in &lt;module&gt;
-    from build import make_release
-  File &#34;/home/ozzie/Development/calibre-web-test/build/make_release.py&#34;, line 14, in &lt;module&gt;
-    from helper_environment import environment, add_dependency
-ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_environment&#39; (/home/ozzie/Development/calibre-web-test/test/helper_environment.py)</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt35.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt35.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_module_start</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
+        <td class="text-center">5</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('c37', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -4756,7 +3245,7 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -4765,7 +3254,7 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -4774,38 +3263,16 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
     
     
-        <tr id="et37.4" class="none bg-info">
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 197, in sound_test
-    self.assertTrue(os.path.splitext(file_name)[1][1:] in listen_button.text)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -4823,13 +3290,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -4847,13 +3314,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -4871,13 +3338,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -4886,7 +3353,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -4895,7 +3362,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -4904,7 +3371,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -4913,7 +3380,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -4922,7 +3389,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -4931,7 +3398,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -4940,7 +3407,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -4950,171 +3417,43 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestReverseProxy</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">2</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et41.1" class="none bg-info">
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555ff994f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 48, in test_logout
-    self.logout()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 104, in logout
-    logout = cls.check_element_on_page((By.ID, &#34;logout&#34;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 739, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=58627): Max retries exceeded with url: /session/d45b05f4-c689-4cdf-9ed6-19561cd0e50e/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555ff994f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.2" class="none bg-danger">
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 56, in test_move_page
-    self.assertTrue(self.goto_page(&#34;admin_setup&#34;))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.3" class="none bg-danger">
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 45, in test_reverse_about
-    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -5128,13 +3467,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -5143,7 +3482,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -5152,7 +3491,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -5161,7 +3500,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -5170,7 +3509,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -5179,7 +3518,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -5188,7 +3527,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -5197,7 +3536,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -5206,7 +3545,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -5215,7 +3554,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -5224,7 +3563,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -5233,7 +3572,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -5242,7 +3581,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -5251,19 +3590,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st42.14" class="none bg-warning">
+        <tr id="st41.14" 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_st42.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st42.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st42.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -5277,7 +3616,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -5286,7 +3625,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -5296,45 +3635,25 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestThumbnailsEnv</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 1)">Detail</a>
+            <a onclick="showClassDetail('c42', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft43.1" class="none bg-danger">
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnailsEnv - test_cover_cache_env_on_database_change</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnail_env.py&#34;, line 60, in test_cover_cache_env_on_database_change
-    self.assertTrue(os.path.exists(thumbail_cache_path))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -5343,18 +3662,18 @@ AssertionError: False is not true</pre>
     <tr id="su" class="failClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">2</td>
-        <td class="text-center">5</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 8)">Detail</a>
+            <a onclick="showClassDetail('c43', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
             </td>
@@ -5363,94 +3682,34 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft44.2" class="none bg-danger">
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 199, in test_cache_of_deleted_book
-    self.assertEqual(220, count_files(thumbnail_cache_path))
-AssertionError: 220 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft44.3" class="none bg-danger">
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 83, in test_cover_cache_on_database_change
-    self.assertTrue(os.path.exists(thumbnail_cache_path))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft44.4" class="none bg-danger">
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 125, in test_cover_change_on_upload_new_cover
-    self.assertTrue(os.path.exists(thumbnail_cache_path))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='st44.5' class='none bg-warning'>
+        <tr id='st43.5' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_for_series</div>
             </td>
@@ -5459,7 +3718,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
@@ -5468,26 +3727,90 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft44.7" class="none bg-danger">
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.8" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.7')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.8')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft44.7" class="popup_window test_output" style="display:block;">
+                <div id="div_ft43.8" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.7').style.display='none'"><span
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 164, in test_remove_cover_from_cache
-    self.assertEqual(book_thumbnail_reference - 2, count_files(thumbnail_cache_path))
-AssertionError: -2 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 310, in test_sideloaded_book
+    self.assertAlmostEqual(diff(BytesIO(list_cover), BytesIO(old_list_cover), delete_diff_file=True), 0.0,
+AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.005138437597261127 difference)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestUpdater</td>
+        <td class="text-center">9</td>
+        <td class="text-center">4</td>
+        <td class="text-center">3</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c44', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt44.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="et44.2" 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_et44.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et44.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 268, in test_check_update_nightly_request_errors
+    self.check_updater(&#39;Could not fetch&#39;, &#34;alert&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 76, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -5497,26 +3820,137 @@ AssertionError: -2 != 0</pre>
     
     
     
-        <tr id="ft44.8" class="none bg-danger">
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
+                <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.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="ft44.5" class="none bg-danger">
+            <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_ft44.8')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.5')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft44.8" class="popup_window test_output" style="display:block;">
+                <div id="div_ft44.5" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.8').style.display='none'"><span
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 281, in test_sideloaded_book
-    self.assertEqual(book_thumbnail_reference + 2, count_files(thumbnail_cache_path))
-AssertionError: 2 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 363, in test_perform_update
+    self.assertTrue(thumbail_cache_path)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.6" class="none bg-danger">
+            <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_ft44.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 321, in test_perform_update_stable_errors
+    self.assertTrue(&#39;HTTP Error&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="st44.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_st44.7')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st44.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_st44.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='pt44.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="ft44.9" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestUpdater - test_update_write_protect</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 424, in test_update_write_protect
+    self.assertTrue(&#39;Update failed&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
+AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -6312,13 +4746,67 @@ AssertionError: 2 != 0</pre>
     
     
 
+
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</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('c50', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et50.1" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_zz_helper)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et50.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et50.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et50.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 30, in setUpClass
+    from cps import cli_param
+  File &#34;/home/ozzie/Development/calibre-web/cps/__init__.py&#34;, line 29, in &lt;module&gt;
+    from .MyLoginManager import MyLoginManager
+  File &#34;/home/ozzie/Development/calibre-web/cps/MyLoginManager.py&#34;, line 24, in &lt;module&gt;
+    from flask_login import LoginManager
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/__init__.py&#34;, line 16, in &lt;module&gt;
+    from .login_manager import LoginManager
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/login_manager.py&#34;, line 24, in &lt;module&gt;
+    from .utils import (login_url as make_login_url, _create_identifier,
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/utils.py&#34;, line 13, in &lt;module&gt;
+    from werkzeug.security import safe_str_cmp
+ImportError: cannot import name &#39;safe_str_cmp&#39; from &#39;werkzeug.security&#39; (/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/werkzeug/security.py)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>401</td>
-        <td>356</td>
-        <td>12</td>
-        <td>27</td>
-        <td>6</td>
+        <td>408</td>
+        <td>392</td>
+        <td>7</td>
+        <td>2</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -6430,7 +4918,7 @@ AssertionError: 2 != 0</pre>
           
             <tr>
               <th>Jinja2</th>
-              <td>3.1.1</td>
+              <td>3.1.2</td>
               <td>Basic</td>
             </tr>
           
@@ -6766,7 +5254,7 @@ AssertionError: 2 != 0</pre>
 </div>
 
 <script>
-    drawCircle(356, 12, 27, 6);
+    drawCircle(392, 7, 2, 7);
     showCase(5);
 </script>
 

From 12f3a13d1da3205e5f8c27edcae0c628c6510656 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 1 May 2022 10:25:07 +0200
Subject: [PATCH 269/412] Fix typo Fix missing maim.py file in update pypi
 package Bugfix after last testrun

---
 cps/helper.py                           |   4 +-
 cps/updater.py                          |   3 +-
 test/Calibre-Web TestSummary_Linux.html | 395 ++++++++++++------------
 3 files changed, 203 insertions(+), 199 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 757e48da8..ed11e1c0a 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -804,8 +804,8 @@ def save_cover_from_url(url, book_path):
         elif use_advocate:
             img = advocate.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
         else:
-            log.error("python modul advocate is not installed but is needed")
-            return False, _("Python modul 'advocate' is not installed but is needed for cover downloads")
+            log.error("python module advocate is not installed but is needed")
+            return False, _("Python module 'advocate' is not installed but is needed for cover downloads")
         img.raise_for_status()
         return save_cover(img, book_path)
     except (socket.gaierror,
diff --git a/cps/updater.py b/cps/updater.py
index 757e43fcf..13d774bf3 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -266,8 +266,9 @@ class Updater(threading.Thread):
         if additional_path:
             exclude.append(additional_path)
         exclude = tuple(exclude)
-        # check if we are in a package, rename cps.py to __init__.py
+        # check if we are in a package, rename cps.py to __init__.py and __main__.py
         if constants.HOME_CONFIG:
+            shutil.copy(os.path.join(source, 'cps.py'), os.path.join(source, '__main__.py'))
             shutil.move(os.path.join(source, 'cps.py'), os.path.join(source, '__init__.py'))
 
         for root, dirs, files in os.walk(destination, topdown=True):
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 913913b17..027aaa818 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-29 21:17:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-30 21:05:13</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>2022-04-30 03:15:20</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-05-01 02:54:00</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>5h 5 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 55 min</p>
         </div>
       </div>
       </div>
@@ -600,8 +600,8 @@
     <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">7</td>
-        <td class="text-center">5</td>
-        <td class="text-center">2</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -611,31 +611,11 @@
 
     
     
-        <tr id="ft7.1" class="none bg-danger">
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 198, in test_convert_email
-    self.assertTrue(&#34;E-mail&#34; in ret[-1][&#39;task&#39;])
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -702,7 +682,7 @@ AssertionError: False is not true</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 442, in test_thumbnail_cache
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 443, in test_thumbnail_cache
     self.assertEqual(10*2, count_files(thumbnail_cache_path))
 AssertionError: 20 != 0</pre>
                     </div>
@@ -1662,11 +1642,11 @@ AssertionError: 20 != 0</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">18</td>
-        <td class="text-center">17</td>
-        <td class="text-center">1</td>
+        <td class="text-center">18</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1829,31 +1809,11 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id="ft16.18" class="none bg-danger">
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 931, in test_watch_metadata
-    self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5/og?c=1651263008&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3662,8 +3622,8 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     <tr id="su" class="failClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</td>
+        <td class="text-center">5</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -3700,11 +3660,31 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id="ft43.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 135, in test_cover_change_on_upload_new_cover
+    self.assertGreaterEqual(diff(BytesIO(updated_cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.038404302739168276 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3753,9 +3733,9 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 310, in test_sideloaded_book
-    self.assertAlmostEqual(diff(BytesIO(list_cover), BytesIO(old_list_cover), delete_diff_file=True), 0.0,
-AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.005138437597261127 difference)</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 308, in test_sideloaded_book
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(old_cover), delete_diff_file=True), 0.04)
+AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3766,12 +3746,12 @@ AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.0051384375972
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">4</td>
-        <td class="text-center">3</td>
-        <td class="text-center">1</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">
             <a onclick="showClassDetail('c44', 9)">Detail</a>
@@ -3789,33 +3769,11 @@ AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.0051384375972
     
     
     
-        <tr id="et44.2" class="none bg-info">
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <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_et44.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et44.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 268, in test_check_update_nightly_request_errors
-    self.check_updater(&#39;Could not fetch&#39;, &#34;alert&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 76, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3838,60 +3796,20 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id="ft44.5" class="none bg-danger">
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <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_ft44.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 363, in test_perform_update
-    self.assertTrue(thumbail_cache_path)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft44.6" class="none bg-danger">
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <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_ft44.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 321, in test_perform_update_stable_errors
-    self.assertTrue(&#39;HTTP Error&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3931,31 +3849,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft44.9" class="none bg-danger">
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 424, in test_update_write_protect
-    self.assertTrue(&#39;Update failed&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4747,65 +4645,170 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">1</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>
         <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('c50', 1)">Detail</a>
+            <a onclick="showClassDetail('c50', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et50.1" class="none bg-info">
+        <tr id='pt50.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_zz_helper)</div>
+                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et50.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et50.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et50.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 30, in setUpClass
-    from cps import cli_param
-  File &#34;/home/ozzie/Development/calibre-web/cps/__init__.py&#34;, line 29, in &lt;module&gt;
-    from .MyLoginManager import MyLoginManager
-  File &#34;/home/ozzie/Development/calibre-web/cps/MyLoginManager.py&#34;, line 24, in &lt;module&gt;
-    from flask_login import LoginManager
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/__init__.py&#34;, line 16, in &lt;module&gt;
-    from .login_manager import LoginManager
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/login_manager.py&#34;, line 24, in &lt;module&gt;
-    from .utils import (login_url as make_login_url, _create_identifier,
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/utils.py&#34;, line 13, in &lt;module&gt;
-    from werkzeug.security import safe_str_cmp
-ImportError: cannot import name &#39;safe_str_cmp&#39; from &#39;werkzeug.security&#39; (/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/werkzeug/security.py)</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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='pt50.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>408</td>
-        <td>392</td>
-        <td>7</td>
-        <td>2</td>
+        <td>423</td>
+        <td>413</td>
+        <td>3</td>
+        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5254,7 +5257,7 @@ ImportError: cannot import name &#39;safe_str_cmp&#39; from &#39;werkzeug.securi
 </div>
 
 <script>
-    drawCircle(392, 7, 2, 7);
+    drawCircle(413, 3, 0, 7);
     showCase(5);
 </script>
 

From 7b45324149e11e261e53aa9d6f1c6821128767ec Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 1 May 2022 10:35:00 +0200
Subject: [PATCH 270/412] Bugfix time and datetime.time

---
 cps/admin.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 76275922f..3b3ef3836 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -25,7 +25,9 @@ import re
 import base64
 import json
 import operator
-from datetime import datetime, timedelta, time
+import time
+from datetime import datetime, timedelta
+from datetime import time as datetime_time
 from functools import wraps
 
 
@@ -205,7 +207,7 @@ def admin():
 
     all_user = ub.session.query(ub.User).all()
     email_settings = config.get_mail_settings()
-    schedule_time = format_time(time(hour=config.schedule_start_time), format="short")
+    schedule_time = format_time(datetime_time(hour=config.schedule_start_time), format="short")
     t = timedelta(hours=config.schedule_duration // 60, minutes=config.schedule_duration % 60)
     schedule_duration = format_timedelta(t, threshold=.99)
 

From 49655e9f2db89cfc77ddbd2c2c3646ea929edd40 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 1 May 2022 10:38:31 +0200
Subject: [PATCH 271/412] More bugfixes for time and datetime.time

---
 cps/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/admin.py b/cps/admin.py
index 3b3ef3836..c928fe19d 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1302,7 +1302,7 @@ def edit_scheduledtasks():
     duration_field = list()
 
     for n in range(24):
-        time_field.append((n , format_time(time(hour=n), format="short",)))
+        time_field.append((n, format_time(datetime_time(hour=n), format="short",)))
     for n in range(5, 65, 5):
         t = timedelta(hours=n // 60, minutes=n % 60)
         duration_field.append((n, format_timedelta(t, threshold=.9)))

From 3233b357f83b13490d692a06c13f631d45d440ab Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 1 May 2022 11:13:36 +0200
Subject: [PATCH 272/412] Changed Readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 267f21ef2..c34220416 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,10 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 - Admin interface
 - User Interface in brazilian, czech, dutch, english, finnish, french, german, greek, hungarian, italian, japanese, khmer, korean, polish, russian, simplified and traditional chinese, spanish, swedish, turkish, ukrainian
 - OPDS feed for eBook reader apps 
-- Filter and search by titles, authors, tags, series and language
+- Filter and search by titles, authors, tags, series, book format and language
 - Create a custom book collection (shelves)
 - Support for editing eBook metadata and deleting eBooks from Calibre library
+- Support for downloading eBook metadata from various sources, sources can be extended via external plugins
 - Support for converting eBooks through Calibre binaries
 - Restrict eBook download to logged-in users
 - Support for public user registration

From cde51e743a643b312f2760195ac4195962818f6d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 1 May 2022 12:36:35 +0200
Subject: [PATCH 273/412] Removed duplicate Werkzeug entry in about page Code
 cosmetics

---
 cps/about.py             | 66 +++++++++++++++++++---------------------
 cps/dep_check.py         | 23 +++++++-------
 cps/templates/stats.html |  2 +-
 cps/uploader.py          |  2 +-
 4 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 1b68818dd..31e843b93 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -25,7 +25,6 @@ import platform
 import sqlite3
 from collections import OrderedDict
 
-import werkzeug
 import flask
 import flask_login
 import jinja2
@@ -37,41 +36,40 @@ from .render_template import render_title_template
 
 about = flask.Blueprint('about', __name__)
 
-ret = dict()
-req = dep_check.load_dependencys(False)
-opt = dep_check.load_dependencys(True)
+modules = dict()
+req = dep_check.load_dependencies(False)
+opt = dep_check.load_dependencies(True)
 for i in (req + opt):
-    ret[i[1]] = i[0]
-
-if constants.NIGHTLY_VERSION[0] == "$Format:%H$":
-    calibre_web_version = constants.STABLE_VERSION['version']
-else:
-    calibre_web_version = (constants.STABLE_VERSION['version'] + ' - '
-                           + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
-                           + constants.NIGHTLY_VERSION[1].replace('%', '%%'))
-
-if getattr(sys, 'frozen', False):
-    calibre_web_version += " - Exe-Version"
-elif constants.HOME_CONFIG:
-    calibre_web_version += " - pyPi"
-
-_VERSIONS = OrderedDict(
-    Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
-    Python=sys.version,
-    Calibre_Web=calibre_web_version,
-    Werkzeug=werkzeug.__version__,
-    Jinja2=jinja2.__version__,
-    pySqlite=sqlite3.version,
-    SQLite=sqlite3.sqlite_version,
-)
-_VERSIONS.update(ret)
-_VERSIONS.update(uploader.get_versions())
+    modules[i[1]] = i[0]
+modules['Jinja2'] = jinja2.__version__
+modules['pySqlite'] = sqlite3.version
+modules['SQLite'] = sqlite3.sqlite_version
+sorted_modules = OrderedDict((sorted(modules.items(), key=lambda x: x[0].casefold())))
 
 
 def collect_stats():
-    _VERSIONS['ebook converter'] = converter.get_calibre_version()
-    _VERSIONS['unrar'] = converter.get_unrar_version()
-    _VERSIONS['kepubify'] = converter.get_kepubify_version()
+    if constants.NIGHTLY_VERSION[0] == "$Format:%H$":
+        calibre_web_version = constants.STABLE_VERSION['version']
+    else:
+        calibre_web_version = (constants.STABLE_VERSION['version'] + ' - '
+                               + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
+                               + constants.NIGHTLY_VERSION[1].replace('%', '%%'))
+
+    if getattr(sys, 'frozen', False):
+        calibre_web_version += " - Exe-Version"
+    elif constants.HOME_CONFIG:
+        calibre_web_version += " - pyPi"
+
+    _VERSIONS = {'Calibre Web': calibre_web_version}
+    _VERSIONS.update(OrderedDict(
+        Python=sys.version,
+        Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
+    ))
+    _VERSIONS.update(uploader.get_magick_version())
+    _VERSIONS['Unrar'] = converter.get_unrar_version()
+    _VERSIONS['Ebook converter'] = converter.get_calibre_version()
+    _VERSIONS['Kepubify'] = converter.get_kepubify_version()
+    _VERSIONS.update(sorted_modules)
     return _VERSIONS
 
 
@@ -80,7 +78,7 @@ def collect_stats():
 def stats():
     counter = calibre_db.session.query(db.Books).count()
     authors = calibre_db.session.query(db.Authors).count()
-    categorys = calibre_db.session.query(db.Tags).count()
+    categories = calibre_db.session.query(db.Tags).count()
     series = calibre_db.session.query(db.Series).count()
     return render_title_template('stats.html', bookcounter=counter, authorcounter=authors, versions=collect_stats(),
-                                 categorycounter=categorys, seriecounter=series, title=_(u"Statistics"), page="stat")
+                                 categorycounter=categories, seriecounter=series, title=_(u"Statistics"), page="stat")
diff --git a/cps/dep_check.py b/cps/dep_check.py
index 929185c27..431d70195 100644
--- a/cps/dep_check.py
+++ b/cps/dep_check.py
@@ -20,7 +20,8 @@ if not importlib:
     except ImportError as e:
         pkgresources = False
 
-def load_dependencys(optional=False):
+
+def load_dependencies(optional=False):
     deps = list()
     if getattr(sys, 'frozen', False):
         pip_installed = os.path.join(BASE_DIR, ".pip_installed")
@@ -57,7 +58,7 @@ def load_dependencys(optional=False):
 
 def dependency_check(optional=False):
     d = list()
-    deps = load_dependencys(optional)
+    deps = load_dependencies(optional)
     for dep in deps:
         try:
             dep_version_int = [int(x) for x in dep[0].split('.')]
@@ -67,28 +68,28 @@ def dependency_check(optional=False):
             high_check = None
         except ValueError:
             d.append({'name': dep[1],
-                     'target': "available",
-                     'found': "Not available"
-                     })
+                      'target': "available",
+                      'found': "Not available"
+                      })
             continue
 
         if dep[2].strip() == "==":
             if dep_version_int != low_check:
                 d.append({'name': dep[1],
-                            'found': dep[0],
-                            "target": dep[2] + dep[3]})
+                          'found': dep[0],
+                          "target": dep[2] + dep[3]})
                 continue
         elif dep[2].strip() == ">=":
             if dep_version_int < low_check:
                 d.append({'name': dep[1],
-                            'found': dep[0],
-                            "target": dep[2] + dep[3]})
+                          'found': dep[0],
+                          "target": dep[2] + dep[3]})
                 continue
         elif dep[2].strip() == ">":
             if dep_version_int <= low_check:
                 d.append({'name': dep[1],
-                            'found': dep[0],
-                            "target": dep[2] + dep[3]})
+                          'found': dep[0],
+                          "target": dep[2] + dep[3]})
                 continue
         if dep[4] and dep[5]:
             if dep[4].strip() == "<":
diff --git a/cps/templates/stats.html b/cps/templates/stats.html
index 62a293089..07219ea6c 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -30,7 +30,7 @@
 <table id="libs" class="table">
   <thead>
     <tr>
-      <th>{{_('Program Library')}}</th>
+      <th>{{_('Program')}}</th>
       <th>{{_('Installed Version')}}</th>
     </tr>
   </thead>
diff --git a/cps/uploader.py b/cps/uploader.py
index 5dbd1249c..92035356a 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -231,7 +231,7 @@ def pdf_preview(tmp_file_path, tmp_dir):
         return None
 
 
-def get_versions():
+def get_magick_version():
     ret = dict()
     if not use_generic_pdf_cover:
         ret['Image Magick'] = ImageVersion.MAGICK_VERSION

From ae5053e0721dc2b767995b5794146ba3f275b927 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 1 May 2022 13:24:11 +0200
Subject: [PATCH 274/412] Added missing translation strings Update German
 Translation

---
 cps/helper.py                                 |    2 +-
 cps/templates/grid.html                       |    2 +-
 cps/templates/list.html                       |    2 +-
 cps/translations/cs/LC_MESSAGES/messages.mo   |  Bin 38838 -> 38752 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 1621 ++++++++--------
 cps/translations/de/LC_MESSAGES/messages.mo   |  Bin 55454 -> 59356 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 1632 ++++++++--------
 cps/translations/el/LC_MESSAGES/messages.mo   |  Bin 56620 -> 56504 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 1621 ++++++++--------
 cps/translations/es/LC_MESSAGES/messages.mo   |  Bin 50452 -> 50362 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 1619 ++++++++--------
 cps/translations/fi/LC_MESSAGES/messages.mo   |  Bin 26983 -> 26899 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 1621 ++++++++--------
 cps/translations/fr/LC_MESSAGES/messages.mo   |  Bin 54828 -> 54720 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 1619 ++++++++--------
 cps/translations/hu/LC_MESSAGES/messages.mo   |  Bin 24748 -> 24658 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 1621 ++++++++--------
 cps/translations/it/LC_MESSAGES/messages.mo   |  Bin 55470 -> 55382 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 1611 ++++++++--------
 cps/translations/ja/LC_MESSAGES/messages.mo   |  Bin 19466 -> 19424 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 1637 +++++++++--------
 cps/translations/km/LC_MESSAGES/messages.mo   |  Bin 24109 -> 24032 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 1633 ++++++++--------
 cps/translations/ko/LC_MESSAGES/messages.mo   |  Bin 55026 -> 54938 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   | 1609 ++++++++--------
 cps/translations/nl/LC_MESSAGES/messages.mo   |  Bin 49721 -> 49635 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 1619 ++++++++--------
 cps/translations/pl/LC_MESSAGES/messages.mo   |  Bin 51554 -> 51457 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 1619 ++++++++--------
 .../pt_BR/LC_MESSAGES/messages.mo             |  Bin 46099 -> 46006 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 1619 ++++++++--------
 cps/translations/ru/LC_MESSAGES/messages.mo   |  Bin 46957 -> 46862 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 1621 ++++++++--------
 cps/translations/sv/LC_MESSAGES/messages.mo   |  Bin 47950 -> 47868 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 1607 ++++++++--------
 cps/translations/tr/LC_MESSAGES/messages.mo   |  Bin 22376 -> 22341 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 1637 +++++++++--------
 cps/translations/uk/LC_MESSAGES/messages.mo   |  Bin 17666 -> 17623 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 1633 ++++++++--------
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        |  Bin 51107 -> 50885 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 1609 ++++++++--------
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        |  Bin 48155 -> 48080 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 1611 ++++++++--------
 messages.pot                                  | 1623 ++++++++--------
 44 files changed, 18356 insertions(+), 15692 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index ed11e1c0a..cb9cb4365 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -805,7 +805,7 @@ def save_cover_from_url(url, book_path):
             img = advocate.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
         else:
             log.error("python module advocate is not installed but is needed")
-            return False, _("Python module 'advocate' is not installed but is needed for cover downloads")
+            return False, _("Python module 'advocate' is not installed but is needed for cover uploads")
         img.raise_for_status()
         return save_cover(img, book_path)
     except (socket.gaierror,
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 638b72459..1905d52db 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -18,7 +18,7 @@
         <div class="btn btn-primary char">{{char.char}}</div>
         {% endfor %}
       </div>
-        <div class="update-view btn btn-primary" data-target="series_view" id="list-button" data-view="list">List</div>
+        <div class="update-view btn btn-primary" data-target="series_view" id="list-button" data-view="list">{{_('List')}}</div>
     </div>
 
     {% if entries[0] %}
diff --git a/cps/templates/list.html b/cps/templates/list.html
index a9089823a..84fda1d05 100644
--- a/cps/templates/list.html
+++ b/cps/templates/list.html
@@ -19,7 +19,7 @@
       </div>
 
       {% if data == "series" %}
-      <button class="update-view btn btn-primary" data-target="series_view" id="grid-button" data-view="grid">Grid</button>
+      <button class="update-view btn btn-primary" data-target="series_view" id="grid-button" data-view="grid">{{_('Grid')}}</button>
       {% endif %}
     </div>
   <div class="container">
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 0ae3a98a765da51423b0d826e2d013152ab6ddcc..118cc08278f41d75edce175afa79974791b06524 100644
GIT binary patch
delta 8854
zcmYM&3!INt{=o5vnPJS;b#fasF5_-8BgQR4?lt66Zd19G6dEDr_LF;wB)Tq@UX-oW
zQkzXysm+$uUReFB6}4?qYsvm?QTcy9bDr1h->dC?&UwyrF5mM#&yW4>OO=mpubenq
zGkHVAKlzoTs3A72VeS9_Y1kx+im2vdTO5M+n~yc|vAF&M=2L$UQ}HB@#ItxU4s04l
zUGORFjGtgi6eXfs&7!C$4fU`pj>aS$kC)(0*a8<|8g9WXd>J!vFV@Bn(0<3`_G$&8
zUk=)@0GTi<M#t$~VIqq9P;kIf%*HZw0n;!AXP^t2gYNhNwBKfQpdDyL_8^;$KEX`<
z8SS6mJc=4%Bdm{Iu^2~UHRg|2Qn2GXG;~|g1#L%nwg=nbU$8O$f=-mrc0H0lSO?3o
z9xlf!_!L&hXR#{oLO1dzCgaDLs72xLal;ujROc`slUjxWo1r`Hfjo)^q6?aV?QtWz
zkPopdUcgS+sa1&JG;BwGCh~9eH2-nI2U>Cd*HJi5gDdOOI)vyNv_2Kx(NfICP4V+L
z;^#-=`oGbLrLih^UJng*J{qxZ$eN-uG{2X}?T@x0{!Z{Z4NiCn$K!YCK&5PpM2$vb
z8s3c#yc9jMC(*3lfll-t8uBc*>qL3j3yY9P(M(Lir!W(@CMaA+;T8176X<n2j~Upu
zFyufN%%on5={OGi;4SEpynyD!Av78Pi!QMCrBT!!TcG1j!YrJDE-<l(f&;F@Y}|xi
z$L-hwPoX)|go8F|I$<7mLnAR38{wVk0ydzL+l7w1H}(KJ{t<NIuaP53L_bn+peAhF
z2`)!p?2WFt6szJ`tcDXY6{n#`b|)IzHF5iHbi8-a{-2}$PM{I1#N9IjeKCjmqY)I`
z(QW8XR-tG4Yji;$U|sw(dXG<{M^T0Fn8mfRCbmWwd^y&@L1=D`!|He^I{pfDfm<<)
z`J=Zem|TBCSNtjZ!dGaroI`i;6XsxT5~c^XLB9{TB5R5g=t6d&3-|-N(<A7@{)yhA
zv*>&^I`WPk8&dGh3ejZhh~!^XhRhkQLL;;no8#xPRk-91*e-T3y2B|r1Xp4m{1~ss
zQ|N-amxOr+mk|FP8fMbqg!f@z+=YBSqhIh6Y{oB!JLrxscp!4+qp@f%EJu&(0d!~U
z(ea){BY6<bsiT;QC((I-=uG^*F4<gScitAAU<B62o6$3$hr{s^wBNVrM76qx$TdPI
zC_oodgg)<t9%(OhoWbZVn2auLPJ)6ju0$tZj{|WlI>70;{Q??^%x**j3(&J3glr}%
zLvP8$=zE*ciMC+_{9Wu}tVR6{y75E`Uk5uj!Ma!+*9XV-v1oG5Lce6sqF=-l=ngV3
z5AQWX7g&NtI0Uc2d(b1=hi>oyy70dvkx4|SDR?I5;|Hmvwprf*4P|3&h0W2O3`GZ;
zitcnF@@jN1vZ-i4HpHZ!VPW~`5p+S%ybqd`W3aRLznp?uxec9o7ha0LM<+Oi-i{y9
z?}FQMr%lkL?25kMAM4?@n2Y7;k*q=Ae;C`~Ms#EEVa4zNhZOAiF;>Q7=mNe(LtKlv
zx5j4J9*1B)F2dgUG?E_CKd=$z(dYy{(1rEE$~X+oossAf&cy`(i#G9}LOhPcusYvK
z@BKtH86QE<@Hpn<$=LKOLqyu56P2R5QiiN0T8l3DFX(kl>KhhVgw}`lCH|i2LK^zv
z<LFL~V+l5-F&Rgo3mA>&$^<lN%j5P%*o^wUXm)Q$k7gfw_8*}O{Ga&wH)sz1)GrZ2
zoYg-x<e@JVp#yb8b6^NM;25lelhN<P^w=fw^G9R1ptorUR>cEx`(M!w9Ye?cDnY@W
zoJI$X2817nI%vH;HpRY}ic{kDJFq_W71$g%V+(u_jl>!ByOP8Cx!@+q6j3X5z8Pq;
zChno&PM^T4_!2ttYv_(Yz>3hJFMNacuRJIWoP!=oZd`AJPF#$>-vd)|Fxqbfrs0H8
zPejuwRHI=YCgC#V>l)pQ=EB?P!hS&qsxml)FdJP^ZA`&Jbb`y!9rlhLhHhX28i^Tk
z{VvS#{;#0mi|es9Zbq~CAR6N6D#8a1&<T5>1CB!P`DAq9W#~rkM?W+Vqe=E68qvL&
zj)%}AI)<stAEjI!LYjpYAC}mz=m5je2uzCWQ_)B)L?>E-E@)Hy{6);Cz89VN7<y#?
zi+=g4m4<opFyZwpi5rHaS$i8g@lveV2|Cb=ar-`WphM`6PNEAsheqOJY?UG5JCcdE
z_rfe3fF9X(Lx_JGg)$o4;Vo#r9DQLPX5(UPjO(xfUqN%_6ZASAjr|fG_#1R#r_e9x
zdE{pyN*@}Y55k(%hYltFexWAP&;i$@Xa7eu7cQWm)aKWOU$wsI0_LC-ZNwV*Ozf+e
zO?`jt5v)%A>$v^{wx^ytENr+-f`TFGg}yix-T94Z@=ZpQY%zLNPhkeWfgaU+==)#9
zp21@3{%NHpbU?=&hyE%~#7ta-Eikc$!Uzh#MF&o&;!)H^&psc0p#*DSUo=UtL$m#M
zbYXX+N3kJ({&?(;*!Qtwp=hq0K_Zxl&Qowg|K9>1q@okmKy#rf*2F?|!d}=42cz%J
zMvr0v8nGp4Zfrs$uo;`<0d$=2(G8_sYf^LmwJ7+(X^B3V5L=FhZXtSx%g})zMhAWz
z_f_Hpg`Vm1QQ<Eluc4v-2YRHHMu&P0^xhYu$vGS+djD^rFdpAVfAtE+@JDbgLpwf%
z<M2szK|i58PZ}GNF&#ToFG4506?1Sd*2f329=?F~dpB;shzTdC&*+A{IeG-0(Sdr!
z?bo0aPDIcCHuS8Q#O*7wHubew2e)7?+>MU&5qf<;N57<%%0mBUWyIf=b)g|2hofgZ
z3)|o(^vvH!Cq9HG>38T^{)p~0<N9y}O|b#>5orH%ybM>y^*!hU52HEr?e)apou8qh
zBBVEjP^F_C3eXAKpvl-9-PzUXj>e-QUV<)c6S{%t(HuF9m*Owz(H7nq{zP>%4yOKc
zf`SwMgl(}hiQoX2q7#qC*;tOb_)lzv$rHj~$(mw5^*-o?ldv(aM*F{nd3X@r=)cg7
zTtts7kv1`0kG$A^Xvb-BJ%Jw4R&>BOaULE;BQ|DIm|y~WREx18-j7CV8}`RN*bGx{
z3Lmc4$WbMtJ`_rMa07Z)+tDQa5>3wUun2!Z7uNdb@Tu;OCRaJu#YN~5JceH5t;jbm
zdIgP4>f~@+iqHsMhZXn#ZVH7otU;4%4|?DK6xWZVN%Nn$J?)n8iEV&gX)i^O<X)_T
z&tVIE2~EZ$XfmHgk2Y^g=r<5E5;P2@V8=3a;=9p>+=uRbBf8>`Fcr^W3Z6$NjBX7_
zQ59{^j_Y;Mqsv7@UxL0r4ju0%Or%j*LBS5|urI!b4*YZ6o_t%_VJkFJ1F$L1!D{$K
z{Co>~?cPB*@)@?nf1w*}Fg5%Jl%W0kP38Q}&g*IL8ZE@O_!yc*@1j}yC1&6c=)ft{
z!tKaGciavgumhS4gYin7gucHGjpXmq$eu=XCuutIw@_<(NUo;nLOP;58yeTgU{&g~
z(KBBVy9;|!KZ|ap<L%)SJ2G|+Hm7}m>?v$Ty-qoQfyJH)3SN^JkgsF(CRWGX8KGk#
zy0cN}MCI5GcVJsQg+{8u9bp5V(f0>oM;wc3_#md^uh57*hnHhw4~3c(E}%Qkni&SF
zi{AIvXc7&;LY#mO@E{uMt>^;wVi|sh_Uk$;OgsgR+$_w*`RI||7oI1gwef=|un7;g
zq1WvLbb>E18!w<olg{UGJT^ynv=VFMdbIyGH01lR7M{St_%j-rfp>=S##G4p-%7!b
zbI}E?i97rTJ=3?a1|CNvaTe{LIVWUwV=SS5IS$3y=+V53PIwkwSn^#VqPf_UdN&-!
z{LwrLhU5^|#ZR!}Mf4gb-yK4ij!s+;y~pj)BkP2n@CvNBmgseR0*%~jH~{y@R-YRd
zG8z*FJeWhlv)PD#7@o&V@F14rS6B}(n-@Y}ie0IXL33vVX5e$!5?@8XCr8oulIDj6
z<)UB8F6cr>&FB8Rlle60GVFkB(4^Uip6&Z_{d25L{cG%lC($G=ToAJTD(p;sF}B0q
z*dI@zx2I@fSlCQ-zDE}le?$E=4Gz2mO`cb=2Y!ZEV*~mX;S?N(PoN<`g(I<GQ8>bR
z=>5J2-Qn|SBtAkn@*m8@YWIX(X_cVRo`$*Ti_c?2JdEz-d-N#UEDlN52m4W<hgaY}
zOva=o;b>CPBdLu}*aF>YcXa%|ar^D)#uG~^cy=2w3pb<L{+rmh(Q9@%etsNHy3=Sf
zo{yhrEe*+5AN}C8#=6)swiI2^WX!?&$VL;<Llk`BWpv`*as6Oi{}}7gei9upS{8oC
z>tSQ6J<&*wM;H1y+J7t7$2ZViID%fwl;z>)xfrvUKN>^99ZkWja3;FKH?b)m!Cbt6
zPEc<}SZDznu@bbsA2z{Z*a&B1Ra}qWu3yFVU!(8sz-;D^-lE`H{2A@|1sdAZXk?OC
zh6QG067_m$66T@{F2}042UGD6as5Lqr2aQ_oRoXRpB1a48!EztD;+{Xr(+ddjV950
zH2I!IL%J7B@G$nq%=<!i55;2Yv#|j_hi>Q{G$M!5aeu&ScoF?BR9i*-J@clk!h{{s
zP!2%PYy_s^Vzl3C^h}>bCwd)S=-<!@PM`yyMkASaf9PKqJ<<+n4h=$Y-NgHezbjl%
zg9E;X?)b0hMBm0%SsmINqy4&|1C5O9)6rbHFK*u+yC0qS7<xqi#dN%gDVUyE6GB%5
z4b7G4PD{}aH=?1u8I8o8*u|JkeRceN9lDWcunoS8=F0bIPMkx>yNE_A<$*9yB7=g-
z)(HD!G1_r1X5%9CY}aB>d>acfX>GVp#n_Je4QTsnwEr9EME^#Q=p1HYwFkqvb&;b=
zL@g;4@Sryunp?07&O#%y9er^ZI?#SJl%JqU`vto5O6x*)H$ykn7d?{EX!0&VKR^%R
z)%YBC^ZuWs;6%j_g#o&wJ1;}CeHu=}EpdC=`tZf9kNLE>z?wJ!J?pV(Zrp(`d==*5
z<LErEqo4S9unF@=$0@jz<PBlvP0>h{#P&gtWC$A4k!TW*LnpoqP1;qMfzMzId>M_@
z$7l{5!<Kjg&5fE5vq{e`he9j75*=tdy7J|igB#GZe*vrGcUT*LMt4;6k<i`{U1&RO
ziyd}$X)?9h&R6?Q%-ESXe0XwN$9C<D@{2ljEiT?U|GMs#k~$Z*-?@9#uGTx3Eg6`-
K^V4;oCjTGA6+MFh

delta 8922
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

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 9066dd543..c352614a7 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\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,596 +15,621 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistika"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Server restartován, znovu načtěte stránku"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Vypínám server, zavřete okno"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Úspěšně obnovené připojení"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Stránka správce"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Základní konfigurace"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Konfigurace uživatelského rozhraní"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Uživatel admin"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Vše"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Zobrazit vše"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Opravdu chcete odstranit Kobo token?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Opravdu chcete vypnout?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zakázat"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Povolit"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json není nakonfigurováno pro webové aplikace"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 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:1110
+#: cps/admin.py:1131
 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:1140
+#: cps/admin.py:1161
 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:1146
+#: cps/admin.py:1167
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, 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:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr objektů skupiny LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, 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:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr uživatelských objektů LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Přidat nového uživatele"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Změnit SMTP nastavení"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
 
-#: cps/admin.py:1235
-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:1253
-msgid "DB is not Writeable"
-msgstr "Databáze není zapisovatelná"
-
-#: cps/admin.py:1266
-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:1270
-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:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "Nastavení e-mailového serveru aktualizováno"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Konfigurace funkcí"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Vyplňte všechna pole!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "E-mail není z platné domény"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Přidat nového uživatele"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Uživatel '%(user)s' vytvořen"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Uživatel '%(nick)s' smazán"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Upravit uživatele %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Uživatel '%(nick)s' aktualizován"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Neznámá chyba. Opakujte prosím později."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Změnit SMTP nastavení"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Neznámá chyba. Opakujte prosím později."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Upravit uživatele %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 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:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Chyba: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+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:1689
+msgid "DB is not Writeable"
+msgstr "Databáze není zapisovatelná"
+
+#: cps/admin.py:1702
+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:1706
+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:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "Nastavení e-mailového serveru aktualizováno"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Konfigurace funkcí"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Vyplňte všechna pole!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "E-mail není z platné domény"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Uživatel '%(user)s' vytvořen"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Uživatel '%(nick)s' smazán"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Uživatel '%(nick)s' aktualizován"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "není nainstalováno"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Žádné"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Formát knihy úspěšně smazán"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Kniha úspěšně smazána"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "upravit metadata"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s není platným jazykem"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-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:655
-#, 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:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Uložení souboru %(file)s se nezdařilo."
-
-#: cps/editbooks.py:683
-#, 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:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Metadata úspěšně aktualizována"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-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:1041
-#, 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:1061
-#, 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:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Soubor %(file)s nahrán"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Chybí zdrojový nebo cílový formát pro převod"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, 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"
 
+#: cps/editbooks.py:630
+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:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s není platným jazykem"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+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:735
+#, 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:755
+#, 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:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Formát knihy úspěšně smazán"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Kniha úspěšně smazána"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "upravit metadata"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, 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:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Uložení souboru %(file)s se nezdařilo."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Formát souboru %(ext)s přidán do %(book)s"
+
 #: cps/gdrive.py:58
 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"
@@ -613,27 +638,27 @@ msgstr "Google Drive nastavení nebylo dokončeno, zkuste  znovu deaktivovat a a
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Doména zpětného volání není ověřena, postupujte podle pokynů k ověření domény v konzole pro vývojáře google"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s nenalezen na Google Drive: %(fn)s"
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nenalezen: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Poslat do Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Tento e-mail byl odeslán přes Calibre-Web."
 
@@ -673,132 +698,112 @@ msgstr "Poslat do Kindle"
 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:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Mazání knihy selhalo %(id)s failed: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Mazání knihy %(id)s, cesta ke knize není platná %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Soubor %(file)s nenalezen na Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Zadané uživatelské jméno je již použito"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Chyba stahování obalu"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Chyba formátu obalu"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Vytvoření cesty obalu selhalo"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 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:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Pouze jpg/jpeg jsou podporované soubory pro obal"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "Unrar binární soubor nenalezen"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Chyba provádění UnRar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Čekám"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Selhalo"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Spuštěno"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Dokončeno"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Neznámý stav"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Kobo nastavení"
 
@@ -807,7 +812,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -868,12 +873,12 @@ msgstr "Google Oauth chyba, prosím opakujte později."
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -889,456 +894,489 @@ msgstr "Token vypršel"
 msgid "Success! Please return to your device"
 msgstr "Úspěch! Vraťte se prosím do zařízení"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Knihy"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Zobrazit nedávné knihy"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Žhavé knihy"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Zobrazit žhavé knihy"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Nejlépe hodnocené knihy"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Zobrazit nejlépe hodnocené knihy"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Zobrazit nepřečtené"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Objevte"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Kategorie"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Zobrazit výběr kategorie"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Série"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Zobrazit výběr sérií"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Autoři"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Zobrazit výběr autora"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Vydavatelé"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Zobrazit výběr vydavatele"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Jazyky"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Zobrazit výběr jazyka"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Hodnocení"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Zobrazit výběr hodnocení"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Formáty souborů"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Zobrazit výběr formátů"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Archivované knihy"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Zobrazit archivované knihy"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Zadána neplatná police"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Lituji, nejste oprávněni přidat knihu do police: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Kniha je již součástí police: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Kniha byla přidána do police: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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: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
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Nelze přidat knihy do police: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Kniha byla odebrána z police: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Vytvořit polici"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Lituji, nejste oprávněni odebrat knihu z této police: %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Upravit polici"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Police %(title)s vytvořena"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Police %(title)s změněna"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Došlo k chybě"
-
-#: cps/shelf.py:304
-#, 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:315
-#, 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:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Kniha úspěšně smazána"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Změnit  pořadí Police: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Police: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Neočekávaná data při čtení informací o aktualizaci"
-
-#: cps/updater.py:433 cps/updater.py:545
-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:451
-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:469
-msgid "Could not fetch update information"
-msgstr "Nelze získat informace o aktualizaci"
-
-#: cps/updater.py:479
-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/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Nejsou k dispozici žádné informace o verzi"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Objevte (Náhodné knihy)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Žhavé knihy (Nejstahovanější)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr ""
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Autoři: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Vydavatel: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Série: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Hodnocení: %(rating)s stars"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Soubor formátů: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Kategorie: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Jazyky: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Rozšířené hledání"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Hledat"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Stáhnutí"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Seznam hodnocení"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Seznam formátů"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Úlohy"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Rozšířené hledání"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Zadána neplatná police"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Lituji, nejste oprávněni přidat knihu do police: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Kniha je již součástí police: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Kniha byla přidána do police: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Knihy jsou již součástí police: %(name)s"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Knihy byly přidány do police: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Nelze přidat knihy do police: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Kniha byla odebrána z police: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Vytvořit polici"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Lituji, nejste oprávněni odebrat knihu z této police: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Upravit polici"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Kniha úspěšně smazána"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Změnit  pořadí Police: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Police %(title)s vytvořena"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Police %(title)s změněna"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Došlo k chybě"
+
+#: cps/shelf.py:369
+#, 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:380
+#, 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:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Police: '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Úlohy"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Čekám"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Selhalo"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Spuštěno"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Dokončeno"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Neznámý stav"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Neočekávaná data při čtení informací o aktualizaci"
+
+#: cps/updater.py:438 cps/updater.py:550
+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:456
+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:474
+msgid "Could not fetch update information"
+msgstr "Nelze získat informace o aktualizaci"
+
+#: cps/updater.py:484
+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/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Nejsou k dispozici žádné informace o verzi"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Objevte (Náhodné knihy)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Žhavé knihy (Nejstahovanější)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Autoři: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Vydavatel: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Série: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Hodnocení: %(rating)s stars"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Soubor formátů: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategorie: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Jazyky: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Stáhnutí"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Seznam hodnocení"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Seznam formátů"
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, 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:1533
+#: cps/web.py:1205
 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:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, 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:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
@@ -1346,40 +1384,75 @@ msgstr "Profil aktualizován"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre převaděč %(tool)s nenalezen"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-převaděč selhal: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, 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:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Převaděč eknih selhal: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Nahrávat"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Uživatelé"
@@ -1399,7 +1472,7 @@ msgstr "E-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Poslat do Kindle e-mailová adresa"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Správce"
@@ -1409,13 +1482,8 @@ msgstr "Správce"
 msgid "Password"
 msgstr "Heslo"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Nahrávat"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Stahovat"
@@ -1429,7 +1497,7 @@ msgstr "Prohlížení knih"
 msgid "Edit"
 msgstr "Upravovat"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1542,78 +1610,107 @@ msgstr "Upravit základní konfiguraci"
 msgid "Edit UI Configuration"
 msgstr "Upravit konfiguraci uživatelského rozhraní"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Správa"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Zobrazit log"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Znovupřipojení ke Calibre databázi"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Restartovat"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Vypnout"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Aktualizovat"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Verze"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Detaily"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Současná verze"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Zkontrolovat aktualizace"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Provést aktualizaci"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Opravdu chcete restartovat?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Opravdu chcete vypnout?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Probíhá aktualizace, prosím nenačítejte stránku znovu"
 
@@ -1625,39 +1722,39 @@ msgstr "přes"
 msgid "In Library"
 msgstr "V knihovně"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "redukovat"
 
@@ -1665,165 +1762,166 @@ msgstr "redukovat"
 msgid "More by"
 msgstr "Více od"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Smazat knihu"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Smazat formáty:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Převést formát knihy:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Převést z:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "vyberte možnost"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Převést do:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Převést knihu"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Název knihy"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Popis"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "Identifikátory"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "Typy identifikátorů"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "Hodnota identifikátorů"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Odstranit"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "Přidat identifikátor"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Štítky"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "ID série"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Hodnocení"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 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:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Nahrát obal z místní jednotky"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Datum vydání"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Vydavatel"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Jazyk"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ano"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Ne"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Nahrát formát"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Zobrazit knihu po uložení"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Získat metadata"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Uložit"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Klíčové slovo"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr "Hledat klíčové slovo"
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 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:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Načítání..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Zavřít"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Zdroj"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Chyba vyhledávání!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nebyly nalezeny žádné výsledky! Zadejte jiné klíčové slovo."
 
@@ -1932,6 +2030,7 @@ msgid "Enter "
 msgstr "Identifikátory"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Jste si opravdu jisti?"
 
@@ -2346,62 +2445,62 @@ msgstr "Přidat povolené/zakázané štítky"
 msgid "Add Allowed/Denied custom column values"
 msgstr "Přidat povolené/zakázané hodnoty vlastních sloupců"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Číst v prohližeči"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Poslechnout v prohlížeči"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Publikováno"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Označit jako nepřečtené"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Označit jako přečtené"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Přečteno"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Obnovit z archivu"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Archívovat"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Archivováno"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Popis:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Přidat do police"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Veřejné)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Upravit metadata"
 
@@ -2445,7 +2544,7 @@ msgstr "Limit velikosti souboru"
 msgid "Save and Send Test E-mail"
 msgstr "Uložit nastavení a odeslat zkušební e-mail"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Zpět"
@@ -2471,7 +2570,7 @@ msgstr "Zadejte jméno domény"
 msgid "Denied Domains (Blacklist)"
 msgstr "Zakázané domény pro registraci"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Další"
 
@@ -2484,6 +2583,10 @@ msgstr "Otevřte soubor .kobo/Kobo eReader.conf v textovém editoru a vložte (n
 msgid "Kobo Token:"
 msgstr "Kobo Sync token"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2501,29 +2604,29 @@ msgstr "Zpět domů"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2587,7 +2690,7 @@ msgstr "Knihy řazené podle hodnocení"
 msgid "Books ordered by file formats"
 msgstr "Knihy seřazené podle souboru formátů"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Police"
@@ -2596,63 +2699,67 @@ msgstr "Police"
 msgid "Books organized in shelves"
 msgstr "Knihy organizované v policích"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Domů"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Přepnout navigaci"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Hledat v knihovně"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Nahrávání..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Chyba"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Nastavení"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Účet"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Odhlásit se"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Prosím neobnovujte stránku"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Procházet"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "O knihovně"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Předchozí"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Podrobnosti o knize"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Zapamatovat si"
@@ -2757,7 +2864,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Kniha"
@@ -2939,15 +3046,23 @@ msgstr "Jakmile tak učiníte, budete automaticky přihlášeni na tomto zaříz
 msgid "This verification link will expire in 10 minutes."
 msgstr "Tento ověřovací odkaz vyprší za 10 minut."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Nenalezeny žádné výsledky"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Termín vyhledávání:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Výsledky pro:"
 
@@ -3000,23 +3115,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Smazat tuto polici"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3061,8 +3176,8 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Knihovna programu"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3092,6 +3207,18 @@ msgstr "Doba spuštění"
 msgid "Start Time"
 msgstr "Čas spuštění"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Resetovat uživatelské heslo"
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 9095d5bbc1c81be917e89ab70a0e5b451e72edcb..f70977c47740995a5b9abf5cb642b3390bdb7477 100644
GIT binary patch
delta 15838
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
K67%2epZY(`1Kq^{

delta 12411
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
XbhWCN>*kH_?!22}9_~H25<UM9g#v7F

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 5aba0fe8d..6efba2ec2 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-04-18 20:01+0200\n"
-"PO-Revision-Date: 2022-01-10 17:37+0100\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
+"PO-Revision-Date: 2022-05-01 13:22+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
 "Language-Team: \n"
@@ -16,585 +16,610 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet, Seite bitte neu laden"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird heruntergefahren, Fenster bitte schließen"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Erfolgreich neu verbunden"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Benutzer bearbeiten"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Alle"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "{} Benutzer erfolgreich gelöscht"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Zeige alle"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "Ungültige Anfrage"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "Guest Name kann nicht geändert werden"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "Guest Benutzer kann diese Rolle nicht haben"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "Wert muss true oder false sein"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "Ungültige Rolle"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "Guest Benutzer kann diese Sichtbarkeit nicht haben"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "Ungültige Sichtbarkeit"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Guest Sprache wird automatisch bestimmt und kann nicht eingestellt werden"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "Keine gültige Sprache gewählt"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "Keine gültige Buchsprache gewählt"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "Parameter wurde nicht gefunden"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr "Ungültige Lese Spalte"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr "Ungültiger Spaltenname für Einschränkung"
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Möchten Sie wirklich den Kobo Token löschen?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "Möchten Sie wirklich diese Domain löschen?"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "Möchten Sie wirklich diesen Benutzer löschen?"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Möchten Sie wirklich dieses Bücherregal löschen?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Möchten Sie wirklich die Anzeigesprache der ausgewählten Benutzer ändern?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Möchten Sie wirklich die Büchersprachen für die ausgewählten Benutzer ändern?"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Möchten Sie wirklich die ausgewählte Rolle für die ausgewählten Benutzer verändern?"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Möchten Sie wirklich die ausgewählten Sichtbarkeitsbeschränkungen der ausgewählten Benutzer ändern?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Möchten Sie wirklich die Sichtbarkeiten für die ausgewählten Benutzer verändern?"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Möchten Sie wirklich die Synchronisation von Bücherregalen für die ausgewählten Benutzer verändern?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Ort der Calibre Datenbank editieren?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr "Calibre-Web wird nach neuen Covern suchen und Cover Miniaturansichten aktualisieren, dies kann eine Weile dauern?"
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Möchten Sie wirklich die Synchronisationsdatenbank von Calibre-Web löschen, um eine komplette Synchronisation zu erzwingen?"
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr "Tag nicht gefunden"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "Ungültige Aktion"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Verbieten"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Erlauben"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr "{} Synchronisationseinträge gelöscht"
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr "Tag nicht gefunden"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "Ungültige Aktion"
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json ist nicht für Web Anwendungen konfiguriert"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 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:1110
+#: cps/admin.py:1131
 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:1140
+#: cps/admin.py:1161
 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:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Bitte einen LDAP Service Account und Password eingeben"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr "Bitte einen LDAP Service Account eingeben"
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, 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:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gruppen Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, 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:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Benutzer Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, 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:1171
+#: cps/admin.py:1192
 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:1178
+#: cps/admin.py:1199
 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:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Neuen Benutzer hinzufügen"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "SMTP-Einstellungen ändern"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr "Gmail Account Verifikation erfolgreich"
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
 
-#: cps/admin.py:1235
-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:1253
-msgid "DB is not Writeable"
-msgstr "Datenbank ist nicht schreibbar"
-
-#: cps/admin.py:1266
-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:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
-
-#: cps/admin.py:1378
-msgid "Database Settings updated"
-msgstr "Datenbankeinstellung aktualisiert"
-
-#: cps/admin.py:1386
-msgid "Database Configuration"
-msgstr "Datenbank-Konfiguration"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Bitte alle Felder ausfüllen!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Neuen Benutzer hinzufügen"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Benutzer '%(user)s' angelegt"
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Benutzer '%(nick)s' gelöscht"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr "Guest Benutzer kann nicht gelöscht werden"
-
-#: cps/admin.py:1469
-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:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Benutzer %(nick)s bearbeiten"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Benutzer '%(nick)s' aktualisiert"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "SMTP-Einstellungen ändern"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr "Gmail Account Verifikation erfolgreich"
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail an %(email)s wurde zum Senden in die Warteschlange eingereiht, für das Ergebnis bitte Aufgaben überprüfen"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr "Einstellungen für Geplante Aufgaben"
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr "Ungültigen Startzeitpunkt für Aufgaben spezifiziert"
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr "Ungültige Laufzeit für Aufgaben spezifiziert"
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr "Einstellungen für Geplante Aufgaben aktualisiert"
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr "Einstellungsdatenbank ist nicht schreibbar"
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Benutzer %(nick)s bearbeiten"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr "Dateien konnten während des Updates nicht ausgetauscht werden"
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht extrahiert werden"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fehler: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} Benutzer erfolgreich importiert"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+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:1689
+msgid "DB is not Writeable"
+msgstr "Datenbank ist nicht schreibbar"
+
+#: cps/admin.py:1702
+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:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
+
+#: cps/admin.py:1814
+msgid "Database Settings updated"
+msgstr "Datenbankeinstellung aktualisiert"
+
+#: cps/admin.py:1822
+msgid "Database Configuration"
+msgstr "Datenbank-Konfiguration"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Bitte alle Felder ausfüllen!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Benutzer '%(user)s' angelegt"
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Benutzer '%(nick)s' gelöscht"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr "Guest Benutzer kann nicht gelöscht werden"
+
+#: cps/admin.py:1905
+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:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Benutzer '%(nick)s' aktualisiert"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "Nicht installiert"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, 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/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Keine"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Buch Format erfolgreich gelöscht"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Buch erfolgreich gelöscht"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr "Keine Erlaubnis zum Bücher löschen"
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "Metadaten editieren"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s ist keine gültige Zahl, Eintrag wird ignoriert"
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "'%(langname)s' ist keine gültige Sprache"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Fehler beim Speichern der Datei %(file)s."
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
-msgstr ""
+msgstr "Benutzer hat keine Berechtigung Cover hochzuladen"
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "IDs unterscheiden nicht Groß-Kleinschreibung, alte ID wird überschrieben"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
-msgstr ""
+msgstr "Fehler beim editieren des Buches: {}"
 
-#: cps/editbooks.py:951
-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:1041
-#, 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:1061
-#, 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:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Datei %(file)s hochgeladen"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehler beim Konvertieren des Buches auf: %(res)s"
 
+#: cps/editbooks.py:630
+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:685 cps/editbooks.py:1010
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s' ist keine gültige Sprache"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
+
+#: cps/editbooks.py:735
+#, 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:755
+#, 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:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Buch Format erfolgreich gelöscht"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Buch erfolgreich gelöscht"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr "Keine Erlaubnis zum Bücher löschen"
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "Metadaten editieren"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s ist keine gültige Zahl, Eintrag wird ignoriert"
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr "Benutzer hat kein Recht zusätzliche Dateiformate hochzuladen"
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Fehler beim Speichern der Datei %(file)s."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
+
 #: cps/gdrive.py:58
 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"
@@ -603,27 +628,27 @@ msgstr "Google Drive Setup is nicht komplett, bitte versuche Google Drive zu dea
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback Domain ist nicht verifiziert, bitte Domain in der Google Developer Console verifizieren"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nicht gefunden: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "An Kindle senden"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
 
@@ -663,131 +688,110 @@ msgstr "%(book)s an Kindle senden"
 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:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
-msgstr ""
+msgstr "Gelesenen Status konnte nicht aktualisiert werden: {}"
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Löschen des Ordners für Buch %(id)s ist fehlgeschlagen, der Pfad hat Unterordner: %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Löschen von Buch %(id)s fehlgeschlagen: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Lösche Buch %(id)s nur aus Datenbank, Pfad zum Buch in Datenbank ist nicht gültig: %(path)s"
 
-#: cps/helper.py:458
-#, fuzzy, python-format
+#: cps/helper.py:446
+#, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Umbenennen des Titels '%(src)s' zu '%(dest)s' schlug fehl: %(error)s"
+msgstr "Umbenennen des Autors '%(src)s' zu '%(dest)s' schlug fehl: %(error)s"
 
-#: cps/helper.py:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
-msgstr ""
+msgstr "Fehler beim umbenennen der Datei im Pfad: {}"
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "Ungültiges E-Mail Adressformat"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
-msgstr ""
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
+msgstr "Python Module 'advocate' ist nicht installiert, wird aber für das Cover hochladen benötigt"
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Fehler beim Herunterladen des Covers"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Coverdatei fehlerhaft"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
-msgstr ""
+msgstr "Keine Berechtigung Cover von Localhost oder dem lokalen Netzwerk hochzuladen"
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Fehler beim Erzeugen des Ordners für die Coverdatei"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 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:810
+#: cps/helper.py:861
 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:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr "Ungültiger Cover Dateiinhalt"
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Es werden nur jpg/jpeg Dateien als Cover untertützt"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "UnRar Programm nicht gefunden"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Fehler beim ausführen von UnRar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Wartend"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Fehlgeschlagen"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Gestartet"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Beendet"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Unbekannter Status"
-
-#: cps/kobo_auth.py:128
-#, fuzzy
+#: cps/kobo_auth.py:89
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Kobo Setup"
 
@@ -796,7 +800,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -857,12 +861,12 @@ msgstr "Google Oauth Fehler, bitte später erneut versuchen."
 msgid "Google Oauth error: {}"
 msgstr "Google Oauth Fehler: {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} Sterne"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Login"
 
@@ -878,454 +882,486 @@ msgstr "Token ist abgelaufen"
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Bücher"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Zeige kürzlich hinzugefügte Bücher"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Beliebte Bücher"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Zeige beliebte Bücher"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "Heruntergeladene Bücher"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "Zeige heruntergeladene Bücher"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Best bewertete Bücher"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Bestbewertete Bücher anzeigen"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Zeige Ungelesene"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Entdecke"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Kategorien"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Zeige Kategorienauswahl"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Serien"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Zeige Serienauswahl"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Autoren"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Verleger"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Zeige Verlegerauswahl"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Sprachen"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Zeige Sprachauswahl"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Bewertungen"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Zeige Bewertungsauswahl"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Dateiformate"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Zeige archivierte Bücher"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "Bücherliste"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "Zeige Bücherliste"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Ungültiges Bücherregal angegeben"
-
-#: cps/shelf.py:73
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Du hast keine Berechtigung, ein Buch zu diesem Bücherregal hinzuzufügen"
-
-#: cps/shelf.py:82
-#, 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:107
-#, 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:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr "Keine Erlaubnis Bücher zu diesem Bücherregal hinzuzufügen"
-
-#: 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: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
-#, 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:209
-#, 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:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr "Sie haben keine Berechtigung um Bücher aus diesem Bücherregal zu löschen"
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Bücherregal erzeugen"
-
-#: cps/shelf.py:236
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Dir ist es nicht erlaubt, dieses Bücherregal zu editieren"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Bücherregal editieren"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr "Sie haben keine Berechtigung um öffentliche Bücherregal zu erzeugen"
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Bücherregal %(title)s erzeugt"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Bücherregal %(title)s verändert"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Es trat ein Fehler auf"
-
-#: cps/shelf.py:304
-#, 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:315
-#, 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:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Buch erfolgreich gelöscht"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Bücherregal: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Fehler beim Öffnen des Bücherregals. Bücherregal exisitert nicht oder ist nicht zugänglich"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Updateinformationen enthalten unbekannte Daten"
-
-#: cps/updater.py:433 cps/updater.py:545
-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:451
-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:469
-msgid "Could not fetch update information"
-msgstr "Updateinformationen konnten nicht geladen werden"
-
-#: cps/updater.py:479
-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/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Keine Releaseinformationen verfügbar"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Entdecke (Zufällige Bücher)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Beliebte Bücher (am meisten Downloads)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "Von %(user)s heruntergeladene Bücher"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Author: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Verleger: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Serie: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Bewertung: %(rating)s Sterne"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Dateiformat: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Kategorie: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Sprache: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Erweiterte Suche"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Suche"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Downloads"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Bewertungsliste"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Liste der Dateiformate"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Erweiterte Suche"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Ungültiges Bücherregal angegeben"
+
+#: cps/shelf.py:55
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Du hast keine Berechtigung, ein Buch zu diesem Bücherregal hinzuzufügen"
+
+#: cps/shelf.py:64
+#, 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:89
+#, 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:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr "Keine Erlaubnis Bücher zu diesem Bücherregal hinzuzufügen"
+
+#: cps/shelf.py:126
+#, 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:138
+#, 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:145
+#, 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:191
+#, 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:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "Sie haben keine Berechtigung um Bücher aus diesem Bücherregal zu löschen"
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Bücherregal erzeugen"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Dir ist es nicht erlaubt, dieses Bücherregal zu editieren"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Bücherregal editieren"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr "Fehler beim Löschen des Bücherregals"
+
+#: cps/shelf.py:231
+msgid "Shelf successfully deleted"
+msgstr "Bücherregal erfolgreich gelöscht"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "Sie haben keine Berechtigung um öffentliche Bücherregal zu erzeugen"
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Bücherregal %(title)s erzeugt"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Bücherregal %(title)s verändert"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Es trat ein Fehler auf"
+
+#: cps/shelf.py:369
+#, 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:380
+#, 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:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Bücherregal: '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Wartend"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Gestartet"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Beendet"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr "Beendet"
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Unbekannter Status"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Updateinformationen enthalten unbekannte Daten"
+
+#: cps/updater.py:438 cps/updater.py:550
+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:456
+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:474
+msgid "Could not fetch update information"
+msgstr "Updateinformationen konnten nicht geladen werden"
+
+#: cps/updater.py:484
+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/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Keine Releaseinformationen verfügbar"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Entdecke (Zufällige Bücher)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Beliebte Bücher (am meisten Downloads)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Von %(user)s heruntergeladene Bücher"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Author: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Verleger: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Serie: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr "Bewertung: Keine"
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Bewertung: %(rating)s Sterne"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Dateiformat: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategorie: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Sprache: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Downloads"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Bewertungsliste"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Liste der Dateiformate"
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, 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:1533
+#: cps/web.py:1205
 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:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 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:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, 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:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
@@ -1333,40 +1369,75 @@ msgstr "Profil aktualisiert"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Keine gültige gmail.json Datei mit Oauth informationen gefunden"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre E-Book Konverter %(tool)s nicht gefunden"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s Format nicht gefunden"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "EBook Converter mit unbekanntem Fehler fehlgeschlagen"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify Konverter Aufruf fehlgeschlagen: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, 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:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Fehler des EBook-Converters: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre fehlgeschlagen mit Fehler: %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr "Konvertiere"
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr "Calibre Datenbank wird neu verbunden"
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr "%(count)s Cover Miniaturansichten erzeugt"
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr "Cover Miniaturansichtern"
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr "{0} Serien Miniaturansichten erzeugt"
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr "Cover Miniaturansichten Cache wird gelöscht"
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Upload"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Benutzerliste"
@@ -1386,7 +1457,7 @@ msgstr "E-Mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1396,13 +1467,8 @@ msgstr "Admin"
 msgid "Password"
 msgstr "Passwort"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Upload"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Download"
@@ -1416,7 +1482,7 @@ msgstr "Bücher ansehen"
 msgid "Edit"
 msgstr "Editieren"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1528,78 +1594,107 @@ msgstr "Basiskonfiguration"
 msgid "Edit UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr "Geplante Aufgabe"
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr "Zeitpunkt an dem die Aufgabe startet"
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr "Maximale Aufgabendauer"
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr "Buchcover Miniaturansichten erzeugen"
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr "Seriencover Miniaturansichten erzeugen"
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr "Mit Calibre Bibliothek neuverbinden"
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr "Cover Miniaturansichten aktualisieren"
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "Debug Daten herunterladen"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Logdateien ansehen"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Calibre-DB neu verbinden"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Neustart"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Calibre-Web beenden"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Update"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr "Versionsinformation"
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Details"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Aktuelle Version"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Nach Update suchen"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Update durchführen"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Calibre-Web wirklich neustarten?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Calibre-Web wirklich anhalten?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Updatevorgang, Seite bitte nicht neu laden"
 
@@ -1611,39 +1706,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "In Bibliothek"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "Sortiere nach Buchdatum, Neuestes zuerst"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "Sortiere nach Buchdatum, Aältestes zuerst"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "Sortiere Titel in alphabetischer Reihenfolge"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortiere Titel in umgekehrt alphabetischer Reihenfolge"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortiere nach Herausgabedatum, Neueste zuerst"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortiere nach Herausgabedatum, Älteste zuerst"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "Reduzieren"
 
@@ -1651,164 +1746,165 @@ msgstr "Reduzieren"
 msgid "More by"
 msgstr "Mehr von"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Buch löschen"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Lösche Formate:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Konvertiere Buchformat:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Konvertiere von:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "Wähle eine Option"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Konvertiere nach:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Konvertiere Buch"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Beschreibung"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "IDs"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "ID Typ"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "ID Wert"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Entfernen"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "ID hinzufügen"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "Serien ID"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Bewertung"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 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:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Coverdatei von Lokalem Laufwerk hochladen"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Herausgabedatum"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Herausgeber"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Sprache"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nein"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Format hochladen"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Speichern"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 msgid "Search keyword"
 msgstr "Suche Schlüsselbegriff"
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 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:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Schließen"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Quelle"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Fehler bei der Suche!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Keine Ergebnisse gefunden! Bitte ein anderes Schlüsselwort benutzen."
 
@@ -1901,7 +1997,7 @@ msgstr "Kommentare"
 
 #: cps/templates/book_table.html:75
 msgid "Archiv Status"
-msgstr ""
+msgstr "Archivstatus"
 
 #: cps/templates/book_table.html:77 cps/templates/search_form.html:42
 msgid "Read Status"
@@ -1915,6 +2011,7 @@ msgid "Enter "
 msgstr "Eingeben "
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Sicher?"
 
@@ -2326,62 +2423,62 @@ msgstr "Erlaubte/Verbotene Tags hinzufügen"
 msgid "Add Allowed/Denied custom column values"
 msgstr "Erlaubte/Verbotene Calibre Spalten hinzufügen"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Im Browser lesen"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Im Browser anhören"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Buch %(index)s von %(range)s"
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Herausgabedatum"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Als ungelesen markieren"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Als gelesen markieren"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Gelesen"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Vom Archiv wiederherstellen"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Zum Archiv hinzufügen"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Archiviert"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Öffentlich)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Metadaten bearbeiten"
 
@@ -2425,7 +2522,7 @@ msgstr "Anhangsgröße"
 msgid "Save and Send Test E-mail"
 msgstr "Einstellungen speichern und Test-E-Mail versenden"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Zurück"
@@ -2451,7 +2548,7 @@ msgstr "Domainnamen eingeben"
 msgid "Denied Domains (Blacklist)"
 msgstr "Verbotene Domains für eine Registrierung"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Nächste"
 
@@ -2460,9 +2557,12 @@ msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):
 msgstr "Öffne die .kobo/Kobo eReader.conf Datei in einem Texteditor und füge hinzu (oder ersetze):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
-#, fuzzy
 msgid "Kobo Token:"
-msgstr "Kobo Sync Token"
+msgstr "Kobo Token:"
+
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr "Liste"
 
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2480,29 +2580,29 @@ msgstr "Zurück zur Hauptseite"
 msgid "Logout User"
 msgstr "Benutzer ausloggem"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr "Aufsteigend nach Downloadzahlen sortieren"
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr "Absteigend nach Downloadzahlen sortieren"
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "Sortiere Autoren in alphabetischer Reihenfolge"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Sortiere Autoren in umgekehrt alphabetischer Reihenfolge"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "Sortiere Serienindex aufsteigend"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "Sortiere Serienindex absteigend"
 
@@ -2566,7 +2666,7 @@ msgstr "Bücher nach Bewertungen sortiert"
 msgid "Books ordered by file formats"
 msgstr "Bücher nach Dateiformaten sortiert"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Bücherregale"
@@ -2575,63 +2675,67 @@ msgstr "Bücherregale"
 msgid "Books organized in shelves"
 msgstr "Bücher in Bücherregalen organisiert"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Home"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Nagivation umschalten"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Bibiliothek durchsuchen"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Lade hoch..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Fehler"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Bitte die Seite nicht neu laden"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Über"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Vorheriger Eintrag"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Buchdetails"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr "Raster"
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Merken"
@@ -2736,7 +2840,7 @@ msgstr "Übergeordnetes Verzeichnis"
 msgid "Select"
 msgstr "Auswahl"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 msgid "Ok"
 msgstr "Ok"
 
@@ -2912,15 +3016,23 @@ msgstr "Danach wirst du automatisch auf diesem Gerät eingeloggt sein."
 msgid "This verification link will expire in 10 minutes."
 msgstr "Dieser Link wird in 10 Minuten ablaufen."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr "Thumbnails für Bücher Cover erzeugen"
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr "Thumbnails für Serien Cover erzeugen"
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Keine Ergebnisse"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Suchbegriff:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Ergebnisse für:"
 
@@ -2972,23 +3084,23 @@ msgstr "Von:"
 msgid "To:"
 msgstr "Bis:"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Lösche dieses Bücherregal"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "Bücherregal Eigenschaften bearbeiten"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "Bücher manuell sortieren"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "Manuelles Sortieren deaktivieren"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "Manuelles Sortieren aktivieren"
 
@@ -3033,8 +3145,8 @@ msgid "System Statistics"
 msgstr "System Statistiken"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Programm Bibliothek"
+msgid "Program"
+msgstr "Programm"
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3064,6 +3176,18 @@ msgstr "Laufzeit"
 msgid "Start Time"
 msgstr "Startzeitpunkt"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr "Aktionen"
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr "Diese Aufgabe wird abgebrochen. Der Fortschritt wird gespeichert."
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr "Dies ist eine geplante Aufgabe, sie wird zur geplanten Zeit erneut ausgeführt."
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Benutzerpasswort zurücksetzen"
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index d61f1964155df9fc6f122c5594dd99f691c98b5e..2adc4e841ed362d92bad215287ac9f93cf26932e 100644
GIT binary patch
delta 9414
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

delta 9461
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
S*ZG$f?9QxTw(dfJ+y4NZz%Vrc

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 0a4b6419e..c8dc392fc 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -15,596 +15,621 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Στατιστικά"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Ο διακομιστής επανεκκίνησε, παρακαλούμε φόρτωσε ξανά τη σελίδα"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Πραγματοποιείται κλείσιμο του διακομιστή, παρακαλούμε κλείσε το παράθυρο"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Επιτυχής επανασύνδεση"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Άγνωστη εντολή"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "ʼΑγνωστο"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Σελίδα διαχειριστή"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Βασική Διαμόρφωση"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "UI Διαμόρφωση"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Χρήστης Διαχειριστής"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Όλα"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "Δεν βρέθηκε χρήστης"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Προβολή Όλων"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Ενημερώθηκε η διαμόρφωση Calibre-Web"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Θέλεις πραγματικά να διαγράψεις τη Μονάδα Kobo;"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις κλείσιμο;"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Απόρριψη"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Επιτρέπεται"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json Δεν Έχει Διαμορφωθεί Για Διαδικτυακή Εφαρμογή"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Φύλλο Καταγραφής Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Πρόσβαση Φύλλου Καταγραφης Τοποθεσίας δεν είναι έγκυρη, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Παρακαλούμε Συμπλήρωσε ένα Πάροχο LDAP, Θύρα, DN και Αντικείμενο Αναγνώρισης Χρήστη"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Προσθήκη νέου χρήστη"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "Η DB δεν μπορεί να Γραφτεί"
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Διαμόρφωση Λειτουργίας"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "Το E-mail δεν είναι από έγκυρο domain"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Προσθήκη νέου χρήστη"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Επεξεργασία χρήστη %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Επεξεργασία χρήστη %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Προβολέας αρχείου φύλλου καταγραφής"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Αίτημα πακέτου ενημέρωσης"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Κατεβάζει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Ανοίγει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Αντικατάσταση αρχείων"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Σταματάει το διακομιστή"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Η ενημέρωση απέτυχε:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP Σφάλμα"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Σφάλμα σύνδεσης"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Γενικό σφάλμα"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Σφάλμα: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "Η DB δεν μπορεί να Γραφτεί"
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Διαμόρφωση Λειτουργίας"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "Το E-mail δεν είναι από έγκυρο domain"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "δεν εγκαταστάθηκε"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Κανένα"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "επεξεργασία μεταδεδομένων"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s δεν είναι μια έγκυρη γλώσσα"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "Η επέκταση αρχείου '%(ext)s' δεν επιτρέπεται να ανέβει σε αυτό το διακομιστή"
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Το αρχείο προς ανέβασμα πρέπει να έχει μια επέκταση"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η άδεια απορρήφθηκε)."
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "Μορφή αρχείου %(ext)s προστέθηκε σε %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Τα αναγνωριστικά δεν έχουν Διάκριση Πεζών-Κεφαλαίων Γραμμάτων, Αντικατάσταση Παλιού Αναγνωριστικού"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Τα μεταδεδομένα ενημερώθηκαν επιτυχώς"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "Το βιβλίο που ανέβηκε πιθανόν να υπάρχει στη βιβλιοθήκη, σκέψου να το αλλάξεις πριν ανεβάσεις νέο: "
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr "Το αρχείο %(filename)s δεν μπόρεσε να αποθηκευτεί σε temp dir"
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "Αποτυχία Μετακίνησης Αρχείου Φόντου %(file)s: %(error)s"
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Το αρχείο %(file)s ανέβηκε"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Η δομή πηγής ή προορισμού για μετατροπή λείπει"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Το βιβλίο είναι σε σειρά επιτυχώς για μετατροπή σε %(book_format)s"
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Υπήρξε ένα σφάλμα στη μετατροπή αυτού του βιβλίου: %(res)s"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "Το βιβλίο που ανέβηκε πιθανόν να υπάρχει στη βιβλιοθήκη, σκέψου να το αλλάξεις πριν ανεβάσεις νέο: "
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s δεν είναι μια έγκυρη γλώσσα"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "Η επέκταση αρχείου '%(ext)s' δεν επιτρέπεται να ανέβει σε αυτό το διακομιστή"
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Το αρχείο προς ανέβασμα πρέπει να έχει μια επέκταση"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "Το αρχείο %(filename)s δεν μπόρεσε να αποθηκευτεί σε temp dir"
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "Αποτυχία Μετακίνησης Αρχείου Φόντου %(file)s: %(error)s"
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "επεξεργασία μεταδεδομένων"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η άδεια απορρήφθηκε)."
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Μορφή αρχείου %(ext)s προστέθηκε σε %(book)s"
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Η ρύθμιση του Google Drive δεν ολοκληρώθηκε, προσπάθησε να απενεργοποιήσεις και να ενεργοποιήσεις ξανά το Google Drive"
@@ -613,27 +638,27 @@ msgstr "Η ρύθμιση του Google Drive δεν ολοκληρώθηκε, 
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Η ανάκληση ονόματος δεν έχει επαληθευτεί, παρακαλούμε ακολούθησε τα βήματα για την επαλήθευση ονόματος στην κονσόλα προγραμματιστή google"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s δεν βρέθηκε στο Google Drive: %(fn)s"
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s δεν βρέθηκε: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Αποστολή στο Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Αυτό το e-mail έχει σταλεί μέσω Calibre-Web."
 
@@ -673,132 +698,112 @@ msgstr "Αποστολή στο Kindle"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Το αρχείου που χητήθηκε δεν μπορεί να διαβαστεί. Μπορεί να υπάρχουν λαθασμένες άδειες;"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Η διαγραφή φακέλου βιβλίου για το βιβλίο %(id)s απέτυχε, η πορεία έχει υπό-φακέλους: %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Η διαγραφή βιβλίου %(id)s απέτυχε: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Διαγραφή βιβλίου %(id)s, η πορεία βιβλίου δεν είναι έγκυρη: %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Το αρχείο %(file)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Αυτό το όνομα χρήστη έχει ήδη παρθεί"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Σφάλμα Κατεβάσματος Φόντου"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Σφάλμα Μορφής Φόντου"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Αποτυχία δημιουργίας πορείας για φόντο"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Το αρχείο φόντου δεν είναι ένα έγκυρο αρχείο εικόνας, ή δεν μπόρεσε να αποθηκευτεί"
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Μόνο jpg/jpeg αρχεία υποστηρίζονται ως αρχεία φόντου"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "Δεν βρέθηκε δυαδικό αρχείο Unrar"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Σφάλμα εκτέλεσης UnRar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Αναμονή"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Απέτυχε"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Ξεκίνησε"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Τελείωσε"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "ʼΑγνωστη κατάσταση"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Καθορισμός Kobo"
 
@@ -807,7 +812,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -868,12 +873,12 @@ msgstr "Google Oauth σφάλμα, παρακαλούμε δοκίμασε ξα
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -889,456 +894,489 @@ msgstr "Η μάρκα έχει λήξει"
 msgid "Success! Please return to your device"
 msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Βιβλία"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Προβολή πρόσφατων βιβλίων"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Βιβλία στη Μόδα"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Προβολή Βιβλίων στη Μόδα"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "Κατεβασμένα Βιβλία"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "Προβολή Κατεβασμένων Βιβλίων"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Βιβλία με Κορυφαία Αξιολόγηση"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Βιβλία που Διαβάστηκαν"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Προβολή διαβασμένων και αδιάβαστων"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Βιβλία που δεν Διαβάστηκαν"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Προβολή αδιάβαστων"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Ανακάλυψε"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Προβολή Τυχαίων Βιβλίων"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Κατηγορίες"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Προβολή επιλογών κατηγορίας"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Σειρές"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Προβολή επιλογών σειράς"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Συγγραφείς"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Προβολή επιλογών συγγραφέα"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Εκδότες"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Προβολή επιλογών εκδότη"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Γλώσσες"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Προβολή επιλογών γλώσσας"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Αξιολογήσεις"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Προβολή επιλογών αξιολόγησης"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Μορφές αρχείου"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Προβολή επιλογών μορφής αρχείου"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Αρχειοθετημένα Βιβλία"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Προβολή αρχειοθετημένων βιβλίων"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "Λίστα Βιβλίων"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "Προβολή Λίστας Βιβλίων"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Διευκρινίστηκε μη έγκυρο ράφι"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Συγγνώμη δεν σου επιτρέπεται να προσθέσεις ένα βιβλίο στο ράφι: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Το βιβλίο είναι ήδη μέρος αυτού του ραφιού: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Το βιβλίο έχει προστεθεί στο ράφι: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Δεν μπόρεσε να γίνει η προσθήκη βιβλίων στο ράφι: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Δημιούργησε ένα Ράφι"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Συγγνώμη αλλά δεν σου επιτρέπεται η αφαίρεση ενός βιβλίου από αυτό το ράφι: %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Επεξεργασία ενός ραφιού"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Το ράφι %(title)s δημιουργήθηκε"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Το ράφι %(title)s άλλαξε"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Υπήρξε ένα σφάλμα"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Ράφι: '%(name)s"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Απρόβλεπτα δεδομένα κατά την ανάγνωση των πληροφοριών ενημέρωσης"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "Δεν υπάρχει διαθέσιμη ενημέρωση. Έχεις ήδη την τελευταία έκδοση εγκατεστημένη"
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία έκδοση."
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr "Δεν μπόρεσε να συγκεντρώσει τις πληροφορίες ενημέρωσης"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr "Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία σταθερή έκδοση."
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες αποδέσμευσης"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "Κατεβασμένα βιβλία από %(user)s"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Συγγραφέας: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Εκδότης: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Σειρές: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Αξιολόγηση: %(rating)s stars"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Μορφή αρχείου: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Κατηγορία: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Γλώσσα: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Προχωρημένη Αναζήτηση"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Κατεβασμένα"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Λίστα αξιολογήσεων"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Λίστα μορφών αρχείου"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Εργασίες"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Προχωρημένη Αναζήτηση"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Διευκρινίστηκε μη έγκυρο ράφι"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Συγγνώμη δεν σου επιτρέπεται να προσθέσεις ένα βιβλίο στο ράφι: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Το βιβλίο είναι ήδη μέρος αυτού του ραφιού: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Το βιβλίο έχει προστεθεί στο ράφι: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Τα βιβλία είναι ήδη μέρος του ραφιού: %(name)s"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Βιβλία είχαν προστεθεί στο ραφι: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Δεν μπόρεσε να γίνει η προσθήκη βιβλίων στο ράφι: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Δημιούργησε ένα Ράφι"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Συγγνώμη αλλά δεν σου επιτρέπεται η αφαίρεση ενός βιβλίου από αυτό το ράφι: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Επεξεργασία ενός ραφιού"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Το ράφι %(title)s δημιουργήθηκε"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Το ράφι %(title)s άλλαξε"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Υπήρξε ένα σφάλμα"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Ράφι: '%(name)s"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Εργασίες"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Αναμονή"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Απέτυχε"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Ξεκίνησε"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Τελείωσε"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "ʼΑγνωστη κατάσταση"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Απρόβλεπτα δεδομένα κατά την ανάγνωση των πληροφοριών ενημέρωσης"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Δεν υπάρχει διαθέσιμη ενημέρωση. Έχεις ήδη την τελευταία έκδοση εγκατεστημένη"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία έκδοση."
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "Δεν μπόρεσε να συγκεντρώσει τις πληροφορίες ενημέρωσης"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία σταθερή έκδοση."
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες αποδέσμευσης"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Κατεβασμένα βιβλία από %(user)s"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Συγγραφέας: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Εκδότης: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Σειρές: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Αξιολόγηση: %(rating)s stars"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Μορφή αρχείου: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Κατηγορία: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Γλώσσα: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Κατεβασμένα"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Λίστα αξιολογήσεων"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Λίστα μορφών αρχείου"
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
@@ -1346,40 +1384,75 @@ msgstr "Το προφίλ ενημερώθηκε"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Το εργαλείο μετατροπής Calibre ebook %(tool)s δεν βρέθηκε"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s μορφή δεν βρέθηκε σε δίσκο"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "Ο μετατροπέας Ebook απέτυχε με άγνωστο σφάλμα"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Kepubify απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Το τροποποιημένο αρχείο δεν βρέθηκε ή υπάρχουν περισσότερα από ένα αρχεία στο φάκελο %(folder)s"
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Ebook απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Το Calibre απέτυχε με σφάλμα: %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Ανέβασμα"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Χρήστες"
@@ -1399,7 +1472,7 @@ msgstr "Διεύθυνση E-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Διεύθυνση E-mail Αποστολής στο Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Διαχειριστής"
@@ -1409,13 +1482,8 @@ msgstr "Διαχειριστής"
 msgid "Password"
 msgstr "Κωδικός"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Ανέβασμα"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Κατέβασμα"
@@ -1429,7 +1497,7 @@ msgstr "Προβολή Βιβλίων"
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1542,78 +1610,107 @@ msgstr "Επεξεργασία Βασικής Διαμόρφωσης"
 msgid "Edit UI Configuration"
 msgstr "Επεξεργασία Διαμόρφωσης UI"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Διοίκηση"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Προβολή Φύλλων Καταγραφής"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Επανασύνδεση Βάσης Δεδομένων Calibre"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Επανεκκίνηση"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Κλείσιμο"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Ενημέρωση"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Έκδοση"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Τρέχουσα έκδοση"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Έλεγχος για Ενημέρωση"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Πραγματοποίηση Ενημέρωσης"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις επανεκκίνηση"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις κλείσιμο;"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Γίνεται ενημέρωση, παρακαλούμε μη φορτώσεις ξανά αυτή τη σελίδα"
 
@@ -1625,39 +1722,39 @@ msgstr "μέσω"
 msgid "In Library"
 msgstr "Στη Βιβλιοθήκη"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "μείωση"
 
@@ -1665,165 +1762,166 @@ msgstr "μείωση"
 msgid "More by"
 msgstr "Περισσότερα από"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Διαγραφή Βιβλίου"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Διαγραφή μορφών:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Μετατροπή μορφής βιβλίου:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Μετατροπή από:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "διάλεξε μια επιλογή"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Μετατροπή σε:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Μετατροπή βιβλίου"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Τίτλος Βιβλίου"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Συγγραφέας"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "Αναγνωριστικά"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "Είδος Αναγνωριστικού"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "Τιμή Αναγνωριστικού"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "Προσθήκη Αναγνωριστικού"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Ετικέτες"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "Ταυτότητα Σειράς"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Αξιολόγηση"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Συγκέντρωση Εξώφυλλου από URL (JPEG - Η εικόνα θα κατέβει και θα αποθηκευτεί σε βάση δεδομένων)"
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Ανέβασμα Εξώφυλλου από Τοπικό Δίσκο"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Ημερομηνία Έκδοσης"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Εκδότης"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ναι"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Όχι"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Μορφή Ανεβάσματος"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Προβολή Βιβλίου σε Αποθήκευση"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Συγκέντρωση Μεταδεδομένων"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Λέξη κλειδί"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr "Αναζήτηση λέξης κλειδιού"
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "Κάνε κλικ στο εξώφυλλο για φόρτωση μεταδεδομένων στη φόρμα"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Φόρτωση..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Πηγή"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Σφάλμα αναζήτησης!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Δεν βρέθηκε(αν) αποτέλεσμα(τα)! Παρακαλούμε δοκίμασε μια άλλη λέξη κλειδί."
 
@@ -1932,6 +2030,7 @@ msgid "Enter "
 msgstr "Αναγνωριστικά"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Είσαι πραγματικά σίγουρος/η;"
 
@@ -2346,62 +2445,62 @@ msgstr "Προσθήκη ετικετών Επιτρέπεται/Απορρίπ
 msgid "Add Allowed/Denied custom column values"
 msgstr "Προσθήκη τιμών ειδικά κατασκευασμένων στηλών Επιτρέπεται/Απορρίπτεται"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Διάβασε στο Πρόγραμμα Περιήγησης"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "ʼΑκουσε στο Πρόγραμμα Περιήγησης"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Εκδόθηκε"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Σήμανση ως Αδιάβαστο"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Σήμανση ως Διαβασμένο"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Διαβάστηκε"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Επαναφορά από το αρχείο"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Προσθήκη στο αρχείο"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Αρχειοθετήθηκε"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Περιγραφή"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Προσθήκη στο ράφι"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Δημόσιο)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Επεξεργασία Μεταδεδομένων"
 
@@ -2445,7 +2544,7 @@ msgstr "Όριο Μεγέθους Επισύναψης"
 msgid "Save and Send Test E-mail"
 msgstr "Αποθήκευση και Αποστολή E-mail Δοκιμής"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Πίσω"
@@ -2471,7 +2570,7 @@ msgstr "Όνομα domain"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domains που Απορρίφθηκαν (Μαύρη λίστα)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2484,6 +2583,10 @@ msgstr "ʼΑνοιξε το .kobo/Kobo eReader.conf αρχείο σε πρόγρ
 msgid "Kobo Token:"
 msgstr "Kobo Μονάδα Συγχρονισμού"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2501,29 +2604,29 @@ msgstr "Επιστροφή στην Κεντρική"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2587,7 +2690,7 @@ msgstr "Τα βιβλία ταξινομήθηκαν ανά Αξιολόγηση
 msgid "Books ordered by file formats"
 msgstr "Τα βιβλία ταξινομήθηκαν ανά μορφές αρχείου"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Ράφια"
@@ -2596,63 +2699,67 @@ msgstr "Ράφια"
 msgid "Books organized in shelves"
 msgstr "Βιβλία οργανωμένα σε ράφια"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Κεντρική"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Αλλαγή Θέσης Περιήγησης"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Αναζήτηση Βιβλιοθήκης"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Φόρτωση..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Παρακαλούμε μην ανανεώσεις τη σελίδα"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Περιήγηση"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Σχετικά"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Λεπτομέρειες Βιβλίου"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Να με Θυμάσαι"
@@ -2757,7 +2864,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Βιβλίο"
@@ -2939,15 +3046,23 @@ msgstr "Με την επαλήθευση, θα συνδεθείτε αυτόμα
 msgid "This verification link will expire in 10 minutes."
 msgstr "Αυτός ο σύνδεσμος επαλήθευσης θα λήξει σε 10 λεπτά."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Δεν Βρέθηκαν Αποτελέσματα"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Όρος Αναζήτησης:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Αποτελέσματα για:"
 
@@ -3000,23 +3115,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Διαγραφή αυτού του Ραφιού"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3061,8 +3176,8 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Πρόγραμμα Βιβλιοθήκης"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3092,6 +3207,18 @@ msgstr "Χρόνος Λειτουργίας"
 msgid "Start Time"
 msgstr "Ώρα Έναρξης"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Επαναφορά Κωδικού χρήστη"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index c8c6ae9eb095e4c7cc5df647b0efb6b8f77b5256..cb91cf3fff64c987b57d1dc04c2743a250126350 100644
GIT binary patch
delta 10942
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
G`~Lt9zt4>T

delta 11013
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

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 63bc11614..97ddd392c 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,597 +18,622 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
 # "Last-Translator: victorhck <victorhck@mailbox.org>\n"
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "El servidor se está apagando. Por favor, cierre la ventana"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Reconexión correcta"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Configuración de la interfaz de usuario"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Editar usuarios"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Todo"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "{} usuarios eliminados con éxito"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "Petición mal formulada"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "El nombre de invitado no se puede cambiar"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "El invitado no puede tener ese rol"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 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:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "Valor tiene que ser verdadero o falso"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "Rol inválido"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "El invitado no puede tener esta vista"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "Vista no válida"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "El sitio del invitado se determina automáticamente y no puede ser cambiado"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "No hay un sitio válido"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "No se ha indicado un idioma válido para el libro"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "Parámetro no encontrado"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr "Columna de lectura no válida"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr "Columna restringida no válida"
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "¿Realmente quieres borrar el Token de Kobo?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "¿Realmente deseas borrar este dominio?"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "¿Realmente quieres borrar este usuario?"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "¿Realmente quieres eliminar este estante?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "¿Realmente quieres cambiar el idioma de los usuarios seleccionados?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "¿Realmente quieres cambiar los idiomas visibles del libro de los usuarios seleccionados?"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "¿Realmente quieres cambiar el rol seleccionado de el usuario seleccionado?"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "¿Realmente quieres cambiar las restricciones de los usuarios seleccionados?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "¿Realmente quieres cambiar las restricciones de visibilidad de los usuarios seleccionados?"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "¿Realmente quieres cambiar el comportamiento de sincronización de estante del usuario seleccionado?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "¿Realmente quieres cambiar la ubicación de la biblioteca Calibre?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr "Etiqueta no encontrada"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "Acción no válida"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Denegar"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr "Etiqueta no encontrada"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "Acción no válida"
+
+#: cps/admin.py:1080
 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:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Access Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Por favor, Introduce un proveedor LDAP, puerto, DN y el User Object Identifier"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, introduce una cuenta de servicio LDAP y su contraseña"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr "Por favor, introduce una cuenta de servicio LDAP"
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, 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:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, 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:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "El filtro de usuarios LDAP necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "El filtro de LDAP \"Member User\" tiene paréntesis no coincidentes"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la clave no válidos. Por favor introduce la ruta correcta"
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Añadir un nuevo usuario"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Cambiar parámetros de correo"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr "Verificación de cuenta de Gmail exitosa"
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "La ruta de la base de datos no es válida. Por favor, Introduce la ruta correcta"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "La base de datos no es modificable"
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "La ruta del Keyfile no es válida, por favor, Introduce la ruta correcta"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "La ruta de Certfile no es válida, por favor, Introduce la ruta correcta"
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "Actualizados los ajustes del servidor de correo electrónico"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Configuración de la base de datos"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "¡Por favor, rellena todos los campos!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "El correo electrónico no tiene un dominio válido"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Añadir un nuevo usuario"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Usuario '%(user)s' creado"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Usuario '%(nick)s' eliminado"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr "No puedes borrar al Usuario Invitado"
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "No queda ningún usuario administrador, no se puede borrar al usuario"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Editar Usuario %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Usuario '%(nick)s'  actualizado"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-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:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Cambiar parámetros de correo"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr "Verificación de cuenta de Gmail exitosa"
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Puesto en cola un correo electrónico de prueba enviado a %(email)s, por favor, comprueba el resultado en Tareas"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+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:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Editar Usuario %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 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:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "La actualización del archivo no pudo guardarse en el directorio temporal (Temp Dir)"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Error: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 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:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} Usuario importado con éxito"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "La ruta de la base de datos no es válida. Por favor, Introduce la ruta correcta"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "La base de datos no es modificable"
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "La ruta del Keyfile no es válida, por favor, Introduce la ruta correcta"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "La ruta de Certfile no es válida, por favor, Introduce la ruta correcta"
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "Actualizados los ajustes del servidor de correo electrónico"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Configuración de la base de datos"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "¡Por favor, rellena todos los campos!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "El correo electrónico no tiene un dominio válido"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Usuario '%(user)s' creado"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Usuario '%(nick)s' eliminado"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr "No puedes borrar al Usuario Invitado"
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "No queda ningún usuario administrador, no se puede borrar al usuario"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Usuario '%(nick)s'  actualizado"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "no instalado"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Ninguno"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Formato de libro eliminado con éxito"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Libro eliminado con éxito"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "editar metadatos"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex) no es un número válido, saltando"
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s no es un idioma válido"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "El archivo a subir debe tener una extensión"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Fallo al guardar el archivo %(file)s."
-
-#: cps/editbooks.py:683
-#, 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:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Los identificadores no distinguen entre mayúsculas y minúsculas, sobrescribiendo el identificador antiguo"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Metadatos actualizados con éxito"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-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:1041
-#, 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:1061
-#, 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:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "El fichero %(file)s ha sido subido"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Falta la fuente o el formato de destino para la conversión"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocurrió un error al convertir este libro: %(res)s"
 
+#: cps/editbooks.py:630
+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:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s no es un idioma válido"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "El archivo a subir debe tener una extensión"
+
+#: cps/editbooks.py:735
+#, 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:755
+#, 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:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Formato de libro eliminado con éxito"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Libro eliminado con éxito"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "editar metadatos"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex) no es un número válido, saltando"
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Fallo al guardar el archivo %(file)s."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Archivo con formato %(ext)s añadido a %(book)s"
+
 #: cps/gdrive.py:58
 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"
@@ -617,27 +642,27 @@ msgstr "La configuración de Google Drive no se ha completado, intente desactiva
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "El dominio Callback no se ha verificado, siga los pasos para verificarlo en la consola de desarrollador de Google"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s no encontrado: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Enviar al Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Este correo electrónico ha sido enviado usando Calibre-Web."
 
@@ -677,132 +702,112 @@ msgstr "Enviar al Kindle"
 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:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Fallo al intentar borrar la carpeta del libro %(id)s, la ruta tiene subcarpetas: %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "El eliminado del libro %(id)s falló: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Borrando el libro %(id)s, la ruta del libro es no válida: %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Fichero %(file)s no encontrado en Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Este nombre de usuario ya está en uso"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "Dirección de correo no válida"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Error al descargar la cubierta"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Error en el formato de la cubierta"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Error al crear una ruta para la cubierta"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 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:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Sólo se admiten como portada los archivos jpg/jpeg/png/webp/bmp"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Sólo se admiten como portada los archivos jpg/jpeg"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "No se encuentra el archivo binario UnRar"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Error ejecutando UnRar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Esperando"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Fallido"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Comenzado"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Finalizado"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Estado desconocido"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Configuración de Kobo"
 
@@ -811,7 +816,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -872,12 +877,12 @@ msgstr "Error en Google Oauth, por favor vuelva a intentarlo más tarde."
 msgid "Google Oauth error: {}"
 msgstr "Error Google Oauth {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} Estrellas"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -893,456 +898,489 @@ msgstr "El token ha expirado"
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Libros"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Mostrar libros recientes"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Libros populares"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Mostrar libros populares"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "Libros Descargados"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "Mostrar Libros Descargados"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Libros mejor valorados"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Libros leídos"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Mostrar no leído"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Descubrir"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Categorías"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Mostrar selección de categorías"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Series"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Mostrar selección de series"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Autores"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Editores"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Mostrar selección de editores"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Idiomas"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Mostrar selección de idiomas"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Calificaciones"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Mostrar selección de calificaciones"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Formatos de archivo"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Libros archivados"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Mostrar libros archivados"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "Lista de Libros"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "Mostrar Lista de Libros"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Estantería especificada no válida"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Lo sentimos, no tiene permisos para agregar un libro al estante: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, 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:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "El libro fue agregado a el estante: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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: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
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "No se pudieron agregar libros al estante: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "El libro fue eliminado del estante: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Crear un estante"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Lo siento, no tiene permiso para eliminar un libro del estante: %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Editar un estante"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Estante %(title)s creado"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Estante %(title)s cambiado"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Ha sucedido un error"
-
-#: cps/shelf.py:304
-#, 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:315
-#, 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:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Libro eliminado con éxito"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Cambiar orden del estante: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Estante: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Error al abrir un estante. El estante no existe o no es accesible"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Dato inesperado mientras se leía la información de actualización"
-
-#: cps/updater.py:433 cps/updater.py:545
-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:451
-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:469
-msgid "Could not fetch update information"
-msgstr "No se puede conseguir información sobre la actualización"
-
-#: cps/updater.py:479
-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/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "No hay información del lanzamiento disponible"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Descubrir (Libros al azar)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Libros populares (los más descargados)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "Libros descargados por %(user)s"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Autor/es: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Editor/es: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Series: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Calificación: %(rating)s estrellas"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Formato del archivo: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Categoría : %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Idioma: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Búsqueda avanzada"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Descargas"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Lista de calificaciones"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Lista de formatos"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Tareas"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = $(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Búsqueda avanzada"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Estantería especificada no válida"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Lo sentimos, no tiene permisos para agregar un libro al estante: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, 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:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "El libro fue agregado a el estante: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, 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:138
+#, 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:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "No se pudieron agregar libros al estante: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "El libro fue eliminado del estante: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Crear un estante"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Lo siento, no tiene permiso para eliminar un libro del estante: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Editar un estante"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Libro eliminado con éxito"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Cambiar orden del estante: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Estante %(title)s creado"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Estante %(title)s cambiado"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Ha sucedido un error"
+
+#: cps/shelf.py:369
+#, 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:380
+#, 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:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Estante: '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Tareas"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Esperando"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Fallido"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Comenzado"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Finalizado"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Estado desconocido"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Dato inesperado mientras se leía la información de actualización"
+
+#: cps/updater.py:438 cps/updater.py:550
+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:456
+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:474
+msgid "Could not fetch update information"
+msgstr "No se puede conseguir información sobre la actualización"
+
+#: cps/updater.py:484
+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/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "No hay información del lanzamiento disponible"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Descubrir (Libros al azar)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Libros populares (los más descargados)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Libros descargados por %(user)s"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Autor/es: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Editor/es: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Series: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Calificación: %(rating)s estrellas"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Formato del archivo: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Categoría : %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Idioma: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Descargas"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Lista de calificaciones"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Lista de formatos"
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, 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:1533
+#: cps/web.py:1205
 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:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 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:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, 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:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 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:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
@@ -1350,40 +1388,75 @@ msgstr "Perfil actualizado"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "No se ha encontrado ningún archivo gmail.json válido con información OAuth"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre ebook-convert %(tool)s no encontrado"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s format no encontrado en disco"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "El conversor de Ebook falló con un error desconocido"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converter falló: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Archivo convertido no encontrado, o más de un archivo en el directorio %(folder)s"
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Falló Ebook-converter: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre falló con el error: %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Subir archivo"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Usuarios"
@@ -1403,7 +1476,7 @@ msgstr "Correo electrónico"
 msgid "Send to Kindle E-mail Address"
 msgstr "Enviar al correo de Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1413,13 +1486,8 @@ msgstr "Admin"
 msgid "Password"
 msgstr "Contraseña"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Subir archivo"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Descargar"
@@ -1433,7 +1501,7 @@ msgstr "Ver libros"
 msgid "Edit"
 msgstr "Editar"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1546,78 +1614,107 @@ msgstr "Editar la configuración básica"
 msgid "Edit UI Configuration"
 msgstr "Editar la configuración de la interfaz de usuario"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Administración"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "Descargar paquete de debug"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Ver archivos de registro"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Reconectar a la BD Calibre"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Actualizar"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Versión"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Detalles"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Versión actual"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Comprobar actualizaciones"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Realizar actualización"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "¿Realmente quieres reiniciar?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "¿Realmente quiere detener?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Actualizando. Por favor, no recargue la página"
 
@@ -1629,39 +1726,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "En la Librería"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "Ordenar en base a fecha del libro, más reciente primero"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "Ordenar en base a fecha del libro, menos reciente primero"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "Ordenar en base al título en orden alfabético"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "Ordenar en base al título en orden alfabético invertido"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "Ordenar en base a fecha de publicación, más reciente primero"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "Ordenar en base a fecha de publicación, menos reciente primero"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "reducir"
 
@@ -1669,165 +1766,166 @@ msgstr "reducir"
 msgid "More by"
 msgstr "Más de"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Borrar libro"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Borrar formatos:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Convertir formato de libro:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Convertir desde:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "seleccionar una opción"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Convertir a:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Convertir libro"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Título del libro"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Descripción"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "Identificadores"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "Tipo de identificador"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "Valor de identificador"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Borrar"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "Añadir identificador"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "ID de serie"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Clasificación"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 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:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Subir portada desde un disco local"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Fecha de publicación"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editor"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Idioma"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Sí"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Subir formato"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Ver libro tras la edición"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Obtener metadatos"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Guardar"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Palabra clave"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Buscar por palabras clave "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 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:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Cerrar"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Origen"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "¡Error en la búsqueda!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "¡No se encontraron resultados! Por favor intenta con otra palabra clave."
 
@@ -1936,6 +2034,7 @@ msgid "Enter "
 msgstr "Identificadores"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "¿Estás realmente seguro?"
 
@@ -2350,62 +2449,62 @@ msgstr "Añadir etiquetas Permitidas/Denegados"
 msgid "Add Allowed/Denied custom column values"
 msgstr "Añadir valores personalizados Permitidos/Denegados"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Leer en el navegador"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Escuchar en el navegador"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Publicado"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Marcar como no leido"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Marcar como leido"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Leído"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Restarurar desde el archivo"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Añadir a archivación"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Archivado"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Descripción:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Agregar al estante"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Público)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Editar metadatos"
 
@@ -2449,7 +2548,7 @@ msgstr "Tamaño límite del archivo adjunto"
 msgid "Save and Send Test E-mail"
 msgstr "Guardar y enviar un correo electrónico de prueba"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Regresar"
@@ -2475,7 +2574,7 @@ msgstr "Introducir nombre de dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominios prohibidos (Blaclist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2488,6 +2587,10 @@ msgstr "Abre el archivo .kobo/Kobo eReader.conf en un editor de texto y añade (
 msgid "Kobo Token:"
 msgstr "Token de sincronización de Kobo"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2505,29 +2608,29 @@ msgstr "Volver al inicio"
 msgid "Logout User"
 msgstr "Cerrar sesión"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "Ordenar autores en orden alfabético"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordenar autores en orden alfabético inverso"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "Ordenar ascendientemente en base al índice de serie"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "Ordenar descendientemente en base al índice de serie"
 
@@ -2591,7 +2694,7 @@ msgstr "Libros ordenados por puntuación"
 msgid "Books ordered by file formats"
 msgstr "Libros ordenados por formato de archivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Estanterías"
@@ -2600,63 +2703,67 @@ msgstr "Estanterías"
 msgid "Books organized in shelves"
 msgstr "Libros organizados en estanterías"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Inicio"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Alternar navegación"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Buscar en la librería"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Cargando..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Error"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ajustes"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Cuenta"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Por favor, no actualice la página"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Detalles del libro"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Recordarme"
@@ -2761,7 +2868,7 @@ msgstr "Directorio padre"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Ok"
@@ -2943,15 +3050,23 @@ msgstr "Una vez que lo realice, iniciará sesión automáticamente en ese dispos
 msgid "This verification link will expire in 10 minutes."
 msgstr "El enlace expirará después de 10 minutos."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "No se han encontrado resultados"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Término de búsqueda:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Resultados para:"
 
@@ -3004,23 +3119,23 @@ msgstr "De:"
 msgid "To:"
 msgstr "Para:"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Borrar este estante"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "Editar propiedades del estante"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "Ordenar libros manualmente"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "Deshabilitar cambio de orden"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "Habilitar cambio de orden"
 
@@ -3065,8 +3180,8 @@ msgid "System Statistics"
 msgstr "Estadísticas del sistema"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Biblioteca del programa"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3096,6 +3211,18 @@ msgstr "Tiempo de ejecución"
 msgid "Start Time"
 msgstr "Fecha de inicio"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Resetear contraseña de usuario"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index ecb99d149e9c739b1ef7c48a3f91ded7a6966b4f..5150af1d9e09706ed664edfb663f3e27aa654c94 100644
GIT binary patch
delta 6662
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
D8?@ag

delta 6745
zcmYM&32;}%9l-Gifp8?@3Iqa#gfkGX1TY*?AV^d&7!i=8TtQ9&tprfS@^_4mfK)4o
z2UV285uu=kShOZy6`5MGRa8W)6b}Sitm27`XusdQovEXKcK5yA{q1je-yhv@sLqK)
zbrMHg)Y}yC*XBA=)E-Z#TKoTBHJMRVK=pa-g<qoYwQn0mEpRYeFU1^OfD>>nUX91F
zJ`QXbMGf#GOu`au97Ty}6b0uTA1p^ZTo=C(Ee$5H3GHjKDL#k}v;$k??$G`!GH~=R
z8rU&R!}DmsDKt`yI$%HMkA_h2!D4KQw_;D+gdOo^?1Y~pi;t4C_y=>a8RnuZ8-xZj
z9P8mEOvh=VegnGD<!FGFn9Kap-4vW~ALipHXsXjY5F8H2LR^VvW-s=}XR!x<j;*j+
zb{s%AG|-_)_M=Imy#mePUFZTfW5O4<QgEd;Xvd@IO3q?AHp_{k&bS1P{64Jhhi0w@
z?f(xnBWJKV)}^r+TcQiP8eKpox+QBmlK%k|?x(?y2hqd!5t^!|<lQZ4k9H`)6dZ=R
zcscTSRKdS||2}ku+t2{^qGx44x+U)*Yl_}Sk{12gDG?9QhUJ-(B6NZg!7I=Krl12}
z8`^I{CtQv0{U&UL4`V~zj%M(Wq5fAiV{f7Foes~xPf#%8CS9T^1GCTw2cQv-N0Jd$
zU_IP~p5D!9M)sjwupbTRJv7kI(5?I)9j95>IDo$Be528=OiZR=>StqpT!uq&B|6Y^
zXorL71pf@}C((?Z!~R&OTNLqkbU|<`a*m_Q;8rw{7tzCd6vue~zop;=BiK;)bS(ce
z6DzO;e}~Kw9Y$076B<a%?s0$}F^_tGH1*T59?nBoxCq_S8_|qaA~!j@7jwP;Pf~ED
zhtb1!5>4@W9EX|QG3JaGqXTZjWPB8zXnSbig^j2`gZ6(pw10$-e-d55Idscf5Oo9Q
zkGfK@L+{`yG{QN^@rZ6ix9D+fgU_G?y@?I+Bs#$vbl@aDCXFxyU2zWD-UsVrF&g-#
zm>`&_l!5~+$HurCFTxF2gm0k%rS*yf$U`T%7~QHd=$_6-xAJCmqBZDv_n;Zuj0V0H
zQ}NHe$iE#9(BNr(7d<pzVgpR;9d~SnM%*5qxFh<!C)UOO*cS_tBt&yD2k*rZxEF`u
zcjzI^?-P$#)`$EXz<3%Q=o;*TbJ5h_g%0o(UWH$yr@e&PO#KSX!P~G2Zo_`K7xVEr
zy0sZpF2R0iAS-YnKAoW8%1)yLp20LchfT3zL2MiJd3Q|50(8QXP#=%Ysn5q|cyp-V
zg=XwwwBL4gORCW=NF1Qx-n@;T{ttp*h8OCw9A9jX9=;A}>Ia7QVdw%%(SgUJflo!h
zc#F_X-ia>Y59mBk$IlbdYZSWC@ELl|Qpm4c&>vH95?+e4(SdiNXQc+y@h}?DztKRy
zMl<sZy09h#;*7RJ>z&bY^Dx!>Ur52oE=E&dimqfzsLw%DSb>A_H|QQdgHHT4+W#CH
zSkeXY>CZyP>x>3o5G+Om9E-``|CtngaUMFrvhcz^=xx}7MqYznw^y(^et<3UG`gZX
zg>mN6(17}3Iu@bVt}HkY?VrGeFWyVRh&G1@J1~cOH9EnE*b2{}12y32daAS0dJ%dy
z#-Rf*!VFx6_TLoRccSCepaCBmNd67rC=IUg1hQ?>e?z^~pg6D|=m%vGx-~=5)Q<}F
zv1tFPXsWM4e={o3!}(xv3p&m=G=Lq0$iLU+Pc-<ecObk_pN(!oJq5XmQ3o`zGUS{_
zm6(V7kc$$1j82%&!El1XXeNdQ$6{?@!3uQV$^-=`*ody^Rdg%fKv(o3da6IgHuzO&
zZ^U=m_nHN>(ZKp(cPvNyuf^J5JM@e_iMd#VwfFxs3Ql|`yznC$d4mh%z0E{Ve*w0`
zA~dBF!}F=ZrNMRRmOh4NVmCT|RcNn9$KQ`^Wg<FE!Bl^YPV_C>;b(M!WPXX-Vk#zK
zF1o^=*bT>{{a2zZyc<1q4~6=k;EQNR-au3T4tDqcAE)qW9n#4GU>l>ShQ&W7r?5Ts
z%;E6_g_uQs6#9Xhhm&y~{t7=w10PWwXJ|B9FGII#BD#fh(X)`iM$8}GL&1n1L|3rW
z2ly=7@h@oPZ=owYf)4ZrI#4pdP@OOX9cM6l??<D7PDd_OREfS{9iG3A2~Y9A!V8Tr
zj{n1A1h%IA*XVUyjZVA)y*5u^Ha?AR(K~3MAB6fTbRl1c_VZ{UsUzdVSAf<hk0k$I
zt5r1UUL1{|qbn{biC-LqU8zq)&q5^{;1={lvoF-&K+nQ)G@!Fs9~)c}FCYy&QtyNw
z=8>0>fA@4I4fAmo_P`V9%9~#r|AC=Bn$jZdhGpoNY&japI=l=Y!@l?hI&l__Ze?fW
z(-QSYGdLIBk|hZW-ou^fVS5H^Pba!p$1xwjLnrPwD!x8r(1B;5sa}A-e<M2ao#+<*
z7CYf?H05t%GJc1(_x~pfnKU#a@20Xdy3!%&i&tO+oPefuT4-Ms+AGk&SE3U?fTnf}
zCgF3KhcBQLp2Dv9J(8(J)c*1~<)zr22g}h3A3+b@cJzZ$gZ|m=@90XuKqoqn2A)|O
zXDA=t(urum%g{h>N6*G;G|=DUaPR+C3J&;5@M|;!b;rbJU@G-IEWm;2mMjQvMpyJY
zn&LC)iZiZ=uW2#PqCN#3=Xqr1(cdtO`J;0b_&aJ-7XN>MdFYmGz%<;AW}+JV;hWe9
zldg<S!zR>Qqqn0Q+OHVRSQ+Nyb?Cw#K@V*eCfvK%DO`^yF&`(5jZgm?bSpMuJ$wjL
za4XgZhHgQ1XnzlzQU4ST<lA7=tKvZO&_g)@J<Q{;BL7aXk_Jy{C3>wMM+d0ETzn7R
zvtQ6JU;T0MmUTc6X&-cD7oY)+3hi^SA@xOAh|4e?ccBY;X&m_<PT?R8{{E+pj|V74
zQ#2nP;8yfdtqJYh(L?tlHpj!*5>KL;IUm|nCdALP(DC}B3%C?r@XQ1SC#Xa_t_$_e
zp}q}W;U27u&tgxk#u0b|4J_~Kc!ihYaOw&4y_e9Hp2ntl79FSI#5jON3WY)%`rzd_
z2TO1d_QfC20COkB*EAnJd{fZpvx6Ja)4v}tz*Bf3X7dwSgj3OlJb?Cp1Ua;cXa@yT
z_bj%+H_(WWVQV~%MqY19ymu|p_qwC0FG3I97;KEw(eW0b<E%pWd@VZh7IfSvYGwal
zqTql>(2oB>uZ=(I4w#KjkcY0I2;Hg?=(W2Ny+t#yH{OCyyc1jDJ~T52u^*m6Z&{bA
zWYGIRfr1}~JCM1f^=KepU|Xy^EuJ6?y*@+GfTp1R7NWP~CUm8%(3P%7$9V`{;2!k0
z?MM3^#DtN)Pr(%(N9*4pf3}Ez!QoguJ??lLdKT8AU$_mS{RMP_1Htz(gZgQ7i;`x<
zpWs$#Ml-QJcA3Hc`$91drgmI#3OZmpy3(cSdv^ry#|x?NKv()X`n&!Ww!s!N<J9-W
z+VRn?8W-AUVLR$K%}m5UIvZ)|M8or#iO0}^&Y_W}m&d8hN1vCV1I$3*TZtWTBl><7
zn))}<g&aq><}A9<)LC%`(-RcjyP;_6N1`uWiJtn2=nChdslNgJ6yJ<aVE-Pt5l!t2
z==-mQ`rBv#N747s;0R2<CZ0Djih`*r!=5-D2jg1w)4L!0;c0Y**|X#SHXMo`rWt68
z=b@*41)7n2(8K!#nvqw~@5M1R&}MUL7nq3J#f7LRnxY~!wPol^7KZ1`(0h9ax`KzX
zD;`5LlRP&*15MF!3edny(9GV19`f7K@z-Mp=P!Daf|0%&9vln)gm!E*FJ5sM>_oi;
zvvEEe;A-@cuE%8DhW6Wu9dRGJl}FGFokVZP&sh8a|60wDJ7!@n54wbUDfXg14u{~a
zXvb<a<%iG#KMVD9=)F!|5C@it?tN#>$3l#{cAtCwlEvjqdsO6DsM?h|wsqt3#W|%5
zW-TdSvZCsT{F9BUjtsdmsqui`1%q<><qyd(sG2;qZJngSeG00U56fxWqHO-Pa~3UL
gP_gv->v9$?yME!q@~TafH>A{k<*}-qIo~Ax4?#WkYybcN

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 09dee98c3..39185504e 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,593 +16,618 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Palvelin uudelleenkäynnistetty, ole hyvä ja päivitä sivu"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Palvelinta sammutetaan, ole hyvä ja sulje sivu"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Ylläpitosivu"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Perusasetukset"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Käyttöliittymän asetukset"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Pääkäyttäjä"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Kaikki"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Näytä kaikki"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Haluatko varmasti pysäyttää Calibre-Webin?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Lisää uusi käyttäjä"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Muuta SMTP asetuksia"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "Sähköpostipalvelimen tiedot päivitetty"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Ominaisuuksien asetukset"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Ole hyvä ja täytä kaikki kentät!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "Sähköpostiosoite ei ole toimivasta domainista"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Lisää uusi käyttäjä"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Käyttäjä '%(user)s' lisätty"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Käyttäjä '%(nick)s' poistettu"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-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:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Muokkaa käyttäjää %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Käyttäjä '%(nick)s' päivitetty"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Muuta SMTP asetuksia"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Muokkaa käyttäjää %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 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:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "Sähköpostipalvelimen tiedot päivitetty"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Ominaisuuksien asetukset"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Ole hyvä ja täytä kaikki kentät!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "Sähköpostiosoite ei ole toimivasta domainista"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Käyttäjä '%(user)s' lisätty"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Käyttäjä '%(nick)s' poistettu"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+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:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Käyttäjä '%(nick)s' päivitetty"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "ei asennettu"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Ei mitään"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "muokkaa metadataa"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s ei ole kelvollinen kieli"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Ladattavalla tiedostolla on oltava tiedostopääte"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Tiedoston %(file)s tallennus epäonnistui."
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "Tiedostoformaatti %(ext)s lisätty %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Metadata päivitetty onnistuneesti"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr ""
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr ""
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Tiedosto %(file)s tallennettu"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Lähteen tai kohteen tiedostomuoto puuttuu"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kirja lisätty muutosjonoon muotoon %(book_format)s"
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Kirjan muunnoksessa tapahtui virhe: %(res)s"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr ""
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s ei ole kelvollinen kieli"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Ladattavalla tiedostolla on oltava tiedostopääte"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr ""
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr ""
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "muokkaa metadataa"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Tiedoston %(file)s tallennus epäonnistui."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Tiedostoformaatti %(ext)s lisätty %(book)s"
+
 #: cps/gdrive.py:58
 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"
@@ -611,27 +636,27 @@ msgstr "Google Drive asetukset ei ole valmiit. Koita poistaa Google Drive käyt
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Paluuosoitteen domain ei ole varmistettu, seuraa ohjeita vamistaaksesi sen googlen kehittäjäkonsolissa"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s ei löydy: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Lähetä Kindleen"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Tämä sähköposti on lähetetty Calibre-Web:sta."
 
@@ -671,131 +696,111 @@ msgstr "Lähetä Kindleen"
 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:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Tiedostoa %(file)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Odottaa"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Epäonnistui"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Aloitettu"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Valmistui"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Tuntematon tila"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr ""
 
@@ -804,7 +809,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -865,12 +870,12 @@ msgstr "Google Oauth virhe, yritä myöhemmin uudelleen."
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -886,456 +891,489 @@ msgstr "Valtuutus vanhentunut"
 msgid "Success! Please return to your device"
 msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Kirjat"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Näytä viimeisimmät kirjat"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Kuumat kirjat"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Näytä kuumat kirjat"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Parhaiten arvioidut kirjat"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Näytä luetut ja lukemattomat"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Näyt lukemattomat"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Löydä"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Kategoriat"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Näytä kategoriavalinta"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Sarjat"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Näytä sarjavalinta"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Kirjailijat"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Näytä kirjailijavalinta"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Julkaisijat"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Näytä julkaisijavalinta"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Kielet"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Näytä keilivalinta"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Arvostelut"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Näytä arvosteluvalinta"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Tiedotomuodot"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Näytä tiedostomuotovalinta"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Virheellinen hylly valittu"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Valitettavasti sinulla ei ole oikeutta lisätä kirjaa hyllyyn: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Kirja on jo hyllyssä: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Kirja on lisätty hyllyyn: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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:156
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "Kirjat on lisätty hyllyyn: %(sname)s"
-
-#: cps/shelf.py:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Kirjojen lisäys hyllyyn: %(sname)s epäonnistui"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Kirja on poistettu hyllystä: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "luo hylly"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Valitettavsti sinulla ei ole oikeutta poistaa kirjaa hyllystä: %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Muokkaa hyllyä"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Hylly %(title)s luotu"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Hylly %(title)s muutettu"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Tapahtui virhe"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Metadata päivitetty onnistuneesti"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Muuta hyllyn: '%(name)s' järjestystä"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Hylly: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Odottamatonta tietoa luettaessa päivitystietoa"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "Ei päivitystä saatavilla. Sinulla on jo uusin versio"
-
-#: cps/updater.py:451
-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:469
-msgid "Could not fetch update information"
-msgstr "Päivitystiedon hakeminen epäonnistui"
-
-#: cps/updater.py:479
-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/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Ei päivitystietoa saatavilla"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Löydä (satunnaiset kirjat)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Kuumat kirjat (ladatuimmat)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr ""
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Kirjailija: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Julkaisija: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Sarja: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Arvostelu: %(rating)s tähteä"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Tiedostomuoto: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Kategoria: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Kieli: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Edistynyt haku"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Hae"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "DLS"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Arvostelulistaus"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Tiedostomuotolistaus"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Edistynyt haku"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Virheellinen hylly valittu"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Valitettavasti sinulla ei ole oikeutta lisätä kirjaa hyllyyn: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Kirja on jo hyllyssä: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Kirja on lisätty hyllyyn: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Kirjat on jo osa hyllyssä: %(name)s"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Kirjat on lisätty hyllyyn: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Kirjojen lisäys hyllyyn: %(sname)s epäonnistui"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Kirja on poistettu hyllystä: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "luo hylly"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Valitettavsti sinulla ei ole oikeutta poistaa kirjaa hyllystä: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Muokkaa hyllyä"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Metadata päivitetty onnistuneesti"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Muuta hyllyn: '%(name)s' järjestystä"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Hylly %(title)s luotu"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Hylly %(title)s muutettu"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Tapahtui virhe"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Hylly: '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Odottaa"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Epäonnistui"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Aloitettu"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Valmistui"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Tuntematon tila"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Odottamatonta tietoa luettaessa päivitystietoa"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Ei päivitystä saatavilla. Sinulla on jo uusin versio"
+
+#: cps/updater.py:456
+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:474
+msgid "Could not fetch update information"
+msgstr "Päivitystiedon hakeminen epäonnistui"
+
+#: cps/updater.py:484
+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/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Ei päivitystietoa saatavilla"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Löydä (satunnaiset kirjat)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Kuumat kirjat (ladatuimmat)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Kirjailija: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Julkaisija: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Sarja: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Arvostelu: %(rating)s tähteä"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Tiedostomuoto: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategoria: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Kieli: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "DLS"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Arvostelulistaus"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Tiedostomuotolistaus"
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, 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:1533
+#: cps/web.py:1205
 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:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
@@ -1343,40 +1381,75 @@ msgstr "Profiili päivitetty"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-kirjan muunnos epäonnistui: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Lähetä"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Käyttäjälista"
@@ -1396,7 +1469,7 @@ msgstr "Sähköposti"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Ylläpito"
@@ -1406,13 +1479,8 @@ msgstr "Ylläpito"
 msgid "Password"
 msgstr "Salasana"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Lähetä"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Lataa"
@@ -1426,7 +1494,7 @@ msgstr "Näytä ekirjat"
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1539,78 +1607,107 @@ msgstr ""
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Ylläpito"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Katsele lokitiedostoja"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Uudelleenyhdistä Calibre DB"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Uudellenkäynnistä Calibre-Web"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Sammuta Calibre-Web"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Päivitä"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Versio"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Nykyinen versio"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Tarkista päivitykset"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Päivitä"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Haluatko varmasti uudelleenkäynnistää Calibre-Webin?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Haluatko varmasti pysäyttää Calibre-Webin?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Päivitetään, älä päivitä sivua"
 
@@ -1622,39 +1719,39 @@ msgstr ""
 msgid "In Library"
 msgstr "Kirjastossa"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "vähennä"
 
@@ -1662,165 +1759,166 @@ msgstr "vähennä"
 msgid "More by"
 msgstr "Enemmän"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Poista kirja"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Poista tiedostomuodot:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Muunna kirjan tiedostomuoto:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Muunna muodosta:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "valitse vaihtoehto"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Muunna muotoon:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Muunna kirja"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Kirjan otsikko"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Kirjailija"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Kuvaus"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Tunnisteet"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr ""
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Arvostelu"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 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:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Lataa kuva paikalliselta levyltä"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Julkaisupäivä"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Julkaisija"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Kieli"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Kyllä"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Ei"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Lataa tiedostomuoto"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "katso kirjaa muokkauksen jälkeen"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Hae metadata"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Avainsana"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Hae avainsanaa "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "Klikkaa kantta ladataksesi metadata lomakkeelle"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Sulje"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Lähde"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Hakuvirhe!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Ei osumia! Kokeile jotain tosita hakusanaa."
 
@@ -1929,6 +2027,7 @@ msgid "Enter "
 msgstr "Rekisteröi"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Oletko aivan varma?"
 
@@ -2342,62 +2441,62 @@ msgstr ""
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Lue selaimessa"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Kuuntele selaimessa"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Merkitse lukemattomaksi"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Merkitse luetuksi"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Luettu"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Lisää hyllyyn"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Muokkaa metadataa"
 
@@ -2441,7 +2540,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr "Tallenna asetukset ja testaa sähköpostia"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Palaa"
@@ -2467,7 +2566,7 @@ msgstr "Syötä domainnimi"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Seuraava"
 
@@ -2479,6 +2578,10 @@ msgstr ""
 msgid "Kobo Token:"
 msgstr ""
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
@@ -2495,29 +2598,29 @@ msgstr "Palaa kotiin"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2581,7 +2684,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2590,63 +2693,67 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Koti"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Vaihda navigointi"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Ladataan..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Virhe"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Asetukset"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Tili"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Selaa"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Tietoja"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Edellinen"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Kirjan tiedot"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Muista minut"
@@ -2751,7 +2858,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Kirja"
@@ -2933,15 +3040,23 @@ msgstr "Kun teet näin, sinut kirjataan automaattisesti sisään tälle laitteel
 msgid "This verification link will expire in 10 minutes."
 msgstr "Linkki vanhenee 10 minuutissa."
 
-#: cps/templates/search.html:5
-msgid "No Results Found"
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
 msgstr ""
 
 #: cps/templates/search.html:6
+msgid "No Results Found"
+msgstr ""
+
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr ""
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Tulosket haulle:"
 
@@ -2994,23 +3109,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Poista tämä hylly"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3055,8 +3170,8 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Ohjelmiston luokka"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3086,6 +3201,18 @@ msgstr "Ajoaika"
 msgid "Start Time"
 msgstr "Käynnistysaika"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Nollaa käyttäjän salasana"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 898520fa1254b73f5844e45b3012a5746d417c9a..50465a39691788c6aea58b4c2824313c8bb0779a 100644
GIT binary patch
delta 11200
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
MWOCU{C%1b27e@&#hyVZp

delta 11283
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
S3Wp9_l5je{!tZps$NvDg;6gtD

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index c5eb0fabc..d9def9b14 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -31,596 +31,621 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Reconnecté avec succès"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Page admin"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Éditer les utilisateurs"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Tout"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "{} utilisateurs supprimés avec succès"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Montrer tout"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "Demande malformée"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "Le nom de l’invité ne peut pas être modifié"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "L’invité ne peut pas avoir ce rôle"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 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:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "La valeur doit être vraie ou fausse"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "Rôle invalide"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "L’invité ne peut pas avoir cette vue"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "Vue invalide"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Les paramètres régionaux de l’invité sont déterminés automatiquement et ne peuvent pas être définis"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "Aucun paramètre régional valide n’est donné"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "Aucune langue de livre valide donnée"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "Paramètre non trouvé"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr "Colonne de lecture non valide"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr "Colonne restreinte non valide"
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Voulez-vous vraiment supprimer le jeton Kobo ?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "Voulez-vous vraiment supprimer ce domaine ?"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "Voulez-vous vraiment supprimer cet utilisateur ?"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Voulez-vous vraiment supprimer l’étagère ?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Voulez-vous vraiment supprimer l’étagère ?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Voulez-vous vraiment modifier les langues de livre visibles pour le ou les utilisateurs sélectionnés ?"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Voulez-vous vraiment modifier le rôle sélectionné pour le ou les utilisateurs sélectionnés ?"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Voulez-vous vraiment modifier les restrictions sélectionnées pour le ou les utilisateurs sélectionnés ?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Voulez-vous vraiment modifier les restrictions de visibilité sélectionnées pour le ou les utilisateurs sélectionnés ?"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Voulez-vous vraiment supprimer l’étagère?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Voulez-vous vraiment arrêter Calibre-Web ?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Êtes-vous certain de vouloir supprimer la base de données de synchronisation de Calibre-Web pour forcer une synchronisation complète avec votre liseuse Kobo ?"
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr "Étiquette introuvable"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "Action invalide"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Refuser"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Autoriser"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr "{} entrées de synchronisation supprimées"
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr "Étiquette introuvable"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "Action invalide"
+
+#: cps/admin.py:1080
 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:1104
+#: cps/admin.py:1125
 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:1110
+#: cps/admin.py:1131
 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:1140
+#: cps/admin.py:1161
 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:1146
+#: cps/admin.py:1167
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr "Veuillez entrer un compte de service LDAP"
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, 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:1156
+#: cps/admin.py:1177
 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:1160
+#: cps/admin.py:1181
 #, 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:1162
+#: cps/admin.py:1183
 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:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre utilisateur des membres LDAP doit avoir un identificateur de format \"%s\\ »"
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Le filtre utilisateur de membre LDAP a des parenthèses non appariées"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuillez entrer le chemin correct"
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Ajouter un nouvel utilisateur"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Modifier les paramètres du serveur de courriels"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr "La vérification du compte Gmail réussie"
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "L'emplacement de la base de données est incorrect, veuillez saisir un chemin valide"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "La base de données n'est pas accessible en écriture"
-
-#: cps/admin.py:1266
-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:1270
-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:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "Les paramètres du serveur de courriels ont été mis à jour"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Configuration des options"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Veuillez compléter tous les champs !"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Ajouter un nouvel utilisateur"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Utilisateur '%(user)s' créé"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Utilisateur '%(nick)s' supprimé"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr "Impossible de supprimer l’utilisateur Invité"
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Éditer l'utilisateur %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Utilisateur '%(nick)s'  mis à jour"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Modifier les paramètres du serveur de courriels"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr "La vérification du compte Gmail réussie"
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Teste les courriels en file d’attente pour l’envoi à %(email)s, veuillez vérifier le résultat des tâches"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Éditer l'utilisateur %(nick)s"
+
+#: cps/admin.py:1396
 #, 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:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 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:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr "Les fichiers n’ont pas pu être remplacés pendant la mise à jour"
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erreur : %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 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:1893
+#: cps/admin.py:1610
 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:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} utilisateur importé avec succès"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "L'emplacement de la base de données est incorrect, veuillez saisir un chemin valide"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "La base de données n'est pas accessible en écriture"
+
+#: cps/admin.py:1702
+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:1706
+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:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "Les paramètres du serveur de courriels ont été mis à jour"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Configuration des options"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Veuillez compléter tous les champs !"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Utilisateur '%(user)s' créé"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Utilisateur '%(nick)s' supprimé"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr "Impossible de supprimer l’utilisateur Invité"
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Utilisateur '%(nick)s'  mis à jour"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "non installé"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, 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/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Aucun"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Le format du livre a été supprimé avec succès"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Le livre a été supprimé avec succès"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr "Vous n’avez par les permissions pour supprimer les livres"
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "modifier les métadonnées"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s n’est pas un nombre valide, ignoré"
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s n'est pas une langue valide"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Pour être déposé le fichier doit avoir une extension"
-
-#: cps/editbooks.py:655
-#, 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:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Échec de la sauvegarde du fichier %(file)s."
-
-#: cps/editbooks.py:683
-#, 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:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Les identificateurs ne sont pas sensibles à la casse, écrasant l’ancien identificateur"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Les métadonnées ont bien été mises à jour"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-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:1041
-#, 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:1061
-#, 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:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Le fichier %(file)s a été téléchargé"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 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:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, 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"
 
+#: cps/editbooks.py:630
+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:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s n'est pas une langue valide"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Pour être déposé le fichier doit avoir une extension"
+
+#: cps/editbooks.py:735
+#, 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:755
+#, 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:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Le format du livre a été supprimé avec succès"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Le livre a été supprimé avec succès"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr "Vous n’avez par les permissions pour supprimer les livres"
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "modifier les métadonnées"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s n’est pas un nombre valide, ignoré"
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, 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:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Échec de la sauvegarde du fichier %(file)s."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Le format de fichier %(ext)s a été ajouté à %(book)s"
+
 #: cps/gdrive.py:58
 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"
@@ -629,27 +654,27 @@ msgstr "La configuration de Google Drive n’est pas terminée, essayez de désa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Le domaine de retour d’appel (Callback domain) est non vérifié, veuillez suivre les étapes nécessaires pour vérifier le domaine dans la console de développement de Google"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s introuvable : %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Envoyer vers Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Ce courriel a été envoyé depuis Calibre-Web."
 
@@ -689,132 +714,112 @@ msgstr "Envoyer vers Kindle"
 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:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Échec de la suppression du dossier de livre pour le livre %(id)s, le chemin d’accès comporte des sous-dossiers : %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "La suppression du livre %(id)s a échoué: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Suppression du livre %(id)s, le chemin du livre est invalide : %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, 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:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Cet utilisateur est déjà pris"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "Format de l’adresse courriel invalide"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Erreur lors du téléchargement de la couverture"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Erreur de format de couverture"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Impossible de créer le chemin pour la couverture"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 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:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Seuls les fichiers jpg/jpeg/png/webp/bmp sont supportés comme fichier de couverture"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr "Contenu du fichier de couverture invalide"
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 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:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "Fichier binaire Unrar non trouvé"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Une erreur est survenue lors de l'exécution d'UnRar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "En attente"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Echoué"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Débuté"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Terminé"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Statut inconnu"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Configuration Kobo"
 
@@ -823,7 +828,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -884,12 +889,12 @@ msgstr "Erreur Oauth Google, veuillez réessayer plus tard."
 msgid "Google Oauth error: {}"
 msgstr "Erreur Oauth Google : {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} Étoiles"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Connexion"
 
@@ -905,456 +910,489 @@ msgstr "Jeton expiré"
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Livres"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Afficher les livres récents"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Livres populaires"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Montrer les livres populaires"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "Livres téléchargés"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "Montrer les livres téléchargés"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Livres les mieux notés"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Livres lus"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Montrer lus et non-lus"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Afficher non-lus"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Découvrir"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Catégories"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Montrer la sélection par catégories"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Séries"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Montrer la sélection par séries"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Auteurs"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Éditeurs"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Montrer la sélection par éditeur"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Langues"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Montrer la sélection par langue"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Notes"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Afficher la sélection des évaluations"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Formats de fichier"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Livres archivés"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Afficher les livres archivés"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "Liste des livres"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "Montrer la liste des livres"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "L’étagère indiquée est invalide"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Désolé, vous n’êtes pas autorisé à ajouter un livre dans l’étagère: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, 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:107
-#, 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:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr "Vous n’êtes pas autorisé à ajouter un livre à l’étagère"
-
-#: 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: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
-#, 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:209
-#, 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:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr "Désolé, vous n’êtes pas autorisé à supprimer un livre de cette étagère"
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Créer une étagère"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Désolé, vous n’êtes pas autorisé à enlever un livre de cette étagère : %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Modifier une étagère"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr "Désolé, vous n’êtes pas autorisé à créer une étagère publique"
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Étagère %(title)s créée"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "L’étagère %(title)s a été modifiée"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Il y a eu une erreur"
-
-#: cps/shelf.py:304
-#, 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:315
-#, 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:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Le livre a été supprimé avec succès"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Étagère : '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Erreur à l’ouverture de l’étagère. Elle n’existe plus ou n’est plus accessible"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Données inattendues lors de la lecture des informations de mise à jour"
-
-#: cps/updater.py:433 cps/updater.py:545
-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:451
-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:469
-msgid "Could not fetch update information"
-msgstr "Impossible d'extraire les informations de mise à jour"
-
-#: cps/updater.py:479
-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/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Aucune information concernant cette version n’est disponible"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Découvrir (Livres au hasard)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Livres populaires (les plus téléchargés)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "Livres téléchargés par %(user)s"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Auteur : %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Éditeur : '%(name)s'"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Séries : %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Évaluation : %(rating)s étoiles"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Format de fichier : %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Catégorie : %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Langue : %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Recherche avancée"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Téléchargements"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Liste des évaluations"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Liste de formats de fichiers"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Tâches"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de lecture = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Recherche avancée"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "L’étagère indiquée est invalide"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Désolé, vous n’êtes pas autorisé à ajouter un livre dans l’étagère: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, 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:89
+#, 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:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr "Vous n’êtes pas autorisé à ajouter un livre à l’étagère"
+
+#: cps/shelf.py:126
+#, 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:138
+#, 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:145
+#, 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:191
+#, 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:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "Désolé, vous n’êtes pas autorisé à supprimer un livre de cette étagère"
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Créer une étagère"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Désolé, vous n’êtes pas autorisé à enlever un livre de cette étagère : %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Modifier une étagère"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Le livre a été supprimé avec succès"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "Désolé, vous n’êtes pas autorisé à créer une étagère publique"
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Étagère %(title)s créée"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "L’étagère %(title)s a été modifiée"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Il y a eu une erreur"
+
+#: cps/shelf.py:369
+#, 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:380
+#, 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:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Étagère : '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Tâches"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "En attente"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Echoué"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Débuté"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Terminé"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Statut inconnu"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Données inattendues lors de la lecture des informations de mise à jour"
+
+#: cps/updater.py:438 cps/updater.py:550
+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:456
+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:474
+msgid "Could not fetch update information"
+msgstr "Impossible d'extraire les informations de mise à jour"
+
+#: cps/updater.py:484
+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/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Aucune information concernant cette version n’est disponible"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Découvrir (Livres au hasard)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Livres populaires (les plus téléchargés)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Livres téléchargés par %(user)s"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Auteur : %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Éditeur : '%(name)s'"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Séries : %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Évaluation : %(rating)s étoiles"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Format de fichier : %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Catégorie : %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Langue : %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Téléchargements"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Liste des évaluations"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Liste de formats de fichiers"
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, 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:1533
+#: cps/web.py:1205
 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:1550
+#: cps/web.py:1222
 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/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, 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:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 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:1644
+#: cps/web.py:1317
 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:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
@@ -1362,40 +1400,75 @@ msgstr "Profil mis à jour"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Aucun fichier gmail.json avec information OAuth valide trouvé"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "ebook-convert calibre %(tool)s non trouvé"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Format %(format)s non trouvé sur le disque"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "Le convertisseur Ebook a échoué avec une erreur inconnue"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "La commande Kepubify-converter a échouée : %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, 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:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "La commande ebook-convert a échouée : %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre a échoué avec l’erreur : %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Téléverser"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Liste des utilisateurs"
@@ -1415,7 +1488,7 @@ msgstr "Adresse de courriel"
 msgid "Send to Kindle E-mail Address"
 msgstr "Envoyer vers une adresse de courriel Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administration"
@@ -1425,13 +1498,8 @@ msgstr "Administration"
 msgid "Password"
 msgstr "Mot de passe"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Téléverser"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Télécharger"
@@ -1445,7 +1513,7 @@ msgstr "Afficher les livres"
 msgid "Edit"
 msgstr "Éditer"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1558,78 +1626,107 @@ msgstr "Éditer la configuration principale"
 msgid "Edit UI Configuration"
 msgstr "Éditer la configuration de l’interface utilisateur"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "Télécharger le package de débogage"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Afficher les fichiers journaux"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Reconnecter la base de données Calibre"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Redémarrer Calibre-Web"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Arrêter Calibre-Web"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Mise à jour de Calibre-Web"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Détails"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Version actuelle"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Rechercher les mises à jour"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Effectuer la mise à jour"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annuler"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Voulez-vous vraiment arrêter Calibre-Web?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Mise à jour en cours, ne pas rafraîchir la page"
 
@@ -1641,39 +1738,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "Dans la librairie"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "Trier en fonction de la date du livre, le plus récent en premier"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "Trier en fonction de la date du livre, le plus ancien en premier"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "Trier les titres dans l’ordre alphabétique"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "Trier le titre dans l’ordre alphabétique inverse"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "Trier en fonction de la date de publication, le plus récent en premier"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "Trier en fonction de la date de publication, le plus ancien en premier"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "réduire"
 
@@ -1681,165 +1778,166 @@ msgstr "réduire"
 msgid "More by"
 msgstr "Plus de"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Supprimer le livre"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Supprimer les formats :"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Convertir le format du livre :"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Convertir depuis :"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "choisir une option"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Convertir vers :"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Convertir le livre"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Description"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "Identifiants"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "Type d'identifiant"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "Valeur d'identifiant"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Supprimer"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "Ajouter un identifiant"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "ID de séries"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Évaluation"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 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:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Téléverser la couverture depuis un fichier en local"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Date de publication"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Éditeur"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Langue"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Oui"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Non"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Format du fichier téléversé"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Voir le livre lors de la sauvegarde"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Obtenir les métadonnées"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Mot-clé"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Rechercher le mot-clé "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 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:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Fermer"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Source"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Erreur lors de la recherche!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Aucun résultat. Veuillez essayer avec un nouveau mot clé."
 
@@ -1948,6 +2046,7 @@ msgid "Enter "
 msgstr "Identifiants"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Êtes-vous vraiment sûr?"
 
@@ -2362,62 +2461,62 @@ msgstr "Ajouter les étiquettes autorisées/refusées"
 msgid "Add Allowed/Denied custom column values"
 msgstr "Ajouter les valeurs de colonnes autorisées/refusées"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Lire dans le navigateur"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Écouter dans le navigateur"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Livre %(index)s sur %(range)s"
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Publié"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Marquer comme non lu"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Marquer comme lu"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Lu"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Restaurer à partir de l'archive"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Ajouter comme archive"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Archivé"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Description :"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Public)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Éditer les métadonnées"
 
@@ -2461,7 +2560,7 @@ msgstr "Limite de la taille de la pièce jointe"
 msgid "Save and Send Test E-mail"
 msgstr "Sauvegarder les réglages et tester l’envoi d’un courriel"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Retour"
@@ -2487,7 +2586,7 @@ msgstr "Saisir le nom du domaine"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domaines refusés (Liste noire)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Suivant"
 
@@ -2500,6 +2599,10 @@ msgstr "Ouvrir le fichier .kobo/Kobo eReader.conf dans un éditeur de texte et a
 msgid "Kobo Token:"
 msgstr "Jeton de synchro Kobo"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2517,29 +2620,29 @@ msgstr "Retour à l’accueil"
 msgid "Logout User"
 msgstr "Déconnecter l’utilisateur"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr "Trier de manière ascendante selon le nombre de téléchargements"
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr "Trier de manière descendante selon le nombre de téléchargements"
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "Trier les auteurs dans l’ordre alphabétique"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Trier les auteurs dans l’ordre alphabétique inverse"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "Trier par ordre croissant en fonction de l’index de série"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "Trier par ordre décroissant en fonction de l’index de série"
 
@@ -2603,7 +2706,7 @@ msgstr "Livres classés par évaluation"
 msgid "Books ordered by file formats"
 msgstr "Livres classés par formats de fichiers"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Etagères"
@@ -2612,63 +2715,67 @@ msgstr "Etagères"
 msgid "Books organized in shelves"
 msgstr "Livres organisés par étagères"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Accueil"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Basculer la navigation"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Chercher dans librairie"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Téléversement en cours..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Erreur"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Paramètres"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Compte"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Veuillez ne pas rafraîchir la page"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "À propos"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Précédent"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Détails du livre"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Se rappeler de moi"
@@ -2773,7 +2880,7 @@ msgstr "Répertoire parent"
 msgid "Select"
 msgstr "Sélectionner"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Livre"
@@ -2955,15 +3062,23 @@ msgstr "Une fois fait, vous serez automatiquement connecté à cet appareil."
 msgid "This verification link will expire in 10 minutes."
 msgstr "Le lien expirera après 10 minutes."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Aucun résultat trouvé"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Chercher le terme:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Résultats pour :"
 
@@ -3016,23 +3131,23 @@ msgstr "Depuis"
 msgid "To:"
 msgstr "Vers"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Supprimer cette étagère"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "Éditer les propriétés de l’étagère"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "Organiser les livres manuellement"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "Désactiver l’ordre de modification"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "Activer l’ordre de modification"
 
@@ -3077,8 +3192,8 @@ msgid "System Statistics"
 msgstr "Statistiques système"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Bibliothèque logicielle"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3108,6 +3223,18 @@ msgstr "Durée"
 msgid "Start Time"
 msgstr "Démarrage"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Réinitialiser le mot de passe de l’utilisateur"
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 2faa8dc49fb56bd8c43df08b45aab9e75559dc40..a141af2a011002f43c88ee3aad239355cdd63208 100644
GIT binary patch
delta 5789
zcmYM%32;@_9mnwl*~kKf<RxSw3n46lyzC?r2q+K&B#}TM3t*zLDS{vvDYnXRhoxjR
zh-^UzMFhm6ER9Ag&@u!Rb!@7LFb>j!3=u7nVwr*k0sH;so|!Ul-shZi?>)=^f6jej
z@3C&D+PXRC!+e_!|LVFK(+^XFRr~+HQIW=EQZ2w#T!^~wRSd&JI0M_U0+ae0<A=Y)
z0Cdm?8!-r*Fa$TdI%X#YJ<wur_>=V*_M*KVd*eCeV>)f!C(7+G95tbM?1>{W7AIjA
z)}to+GJ0?i4#PI=ZyaNOppZmEuV`cVm`uL>u^6?2X{do`qAxaJI6iIbO{f*EL#=Qt
z4#wT6flguu-a$ps8)Hm9&cs~CH_a5h*p4Z98zV58WoY1h<XJNfxn$<s_C{2MwxK4x
z-(Ej}{i&ZsJ$D_|PY7Xp1d~w{U5$=9Tu(tE+KYPdD2C!i?1R@)Gxv>iQ<aGdbspwm
zA?p5TP<y2b6_F#TkbjE0{{m`zT}4IcRvhtH==;aJD;bX(upE{1dQ`}Ng9-Qy@-bWZ
z(sPGUEB`yH<4e|SsONu1^%u;;x*ms`SPCk&xe1OjJt&N(K_Mza)oW3ac?<(_rM><F
zD&)J64R78<KIX4{F_!5>MKCDQop>q|eUpibKq)HHvrrRx!l9rXJ&Wp~88z^GsDVC5
z<?1{t#Q#K{mfJWQHJVm926g{bRL2k7_64X2Ihc*BQR5s&?J?&pg;EOFP#qKySLLPz
z3vn?H#KSlgzd=PPc!0Y?4{CzZs1PTkR+@oq8#5X;!C9!iumBa26<E&r<~0iH;5uri
zcTqX_O?KM@Q7Q1C9*no``KXQyQK_p$g?1q-w<}N+eI9k+Mtgl1s=tF>b;p?F6co}k
zsN;7IH6cHiJrYAvD=9%<6=p7~gB7Sfum%;%o#=;$PzyPVn%GCEl$=LJxD%D~+Zf0A
z#xuyBaTe;qeDuW!Py<ast*8vUV-=?3EKI~E9E*D~AFrWuJd`}DpGm0a9z@+Y6{q1Q
zbhIhHqo7d54skn7M$NPkvv4|QU?VC82XO+PMhzHC*z&LfHQ-w8fg4eK;Z@XeeA~7k
zM!i8lNFo0k=quZB8I`NssNEjIj#E7j12G--;0O%DQdDTG&>!njn{2*yxxK#Gx)U|Q
z77W4zLy5m;)<%Pl-AQEsnNHLSdJl6uj6$MnyhyOjbWFyj7>wJo2=}4-yMfBFU#dId
z1Pq{_jhgUC)WRn^6g2ZnYYnQydJMrQQ4?8)3S}c|=FPVLIw~^zaReSjrQ|wlK(E(*
zemH7EqtOqmuqQe-6g1=c)}^SKtwBxf73_&SP#v_Ou78TW#?4vOeLta2!#z~WBGTN*
z4Mr_!6e?m9Q43mtq|z}<DCn3xZ{30F;4tdOcI<^`Y<mYLQoo7Hb>DRN_@$!y8Ec)1
zI<5_<{+dwtZ?*MzF@o{UhZHo>*Qk|TLY;~$wjR&c*8~QlLYIR|K|U(Pg|=RbdcF#K
zV=Z#T%|g_sYqoAd^|K9wb^doz2*r0$@ATuS8@gq>Z?piU$;6;0R*X894zf?pyQqQw
zfqKq|i+wQA8jG5c*IIxYuM{11Tth)Cc@eeJmoNn1M1`=`wzpf)As=&vuOS%6thDk8
zs5fOP_QZKO7=MfE?{(BT`%n`+kWKs*nvZEv?%J&#);p-wcyip8#i2SFfNCFx>L>@p
zaDu&Fjf%u0sAD|`eQ*U1!quqz_vH|O&9sdM4}ONKU$XuiwX$DOA@d*ZcGMTO@>u+J
zH)F<Q3H3d>?q5Xz#U$!pUW=Mw8P3K!T!2SW3-CJkxdZ2-j!7~0#Y)sWd?AM8TGYgL
zpkBc(=)rc>#4e)lyN=ou{=5vd@=Wad@j`-W=Axe8ie7XMQDAZAJJcrX$J;|Ml(DEc
zVF_m9BIH1r9T<bBP^q|zTFDL6gzupu7ROI#6egqYD?mk}5VaR7ky{<}D+=07+mI-l
zQ&@yOM)3=WWmtxLQP=OHPDyrwJ75Fyw~JYiiP&oEr>!?pFQzCS(!lB14@copo&RbI
z2{f!i&G-#mgGW#+n>@xHs2mmQ22_YwVg&BT1pE*)umcsri2L2slz?haL#3z|S%Y~B
zBOD4X6x6{-YQW2=8}A??GNBK+Kd;585Uxbs*KF&1P$52o>gNP1qTixY8^w>l7E+2@
zKm|tQ9CQ?#<rH-8Uq;>d2h?V4LA~kzV(TAcf9hY__8X`H%{Vu-iKxhUQG1{Y2V*U2
zZ#AO!(mvD#FN`Dp%1PLG_qZgWQZN>W;4BQoRj8G`gzQt(jw$G0=<enW^r2pYIu&K;
zi}lE@W*(}aKiccZZT+i4;vdU}D>UeM`A;BB=s~Td4s{$~z<S(;idZl^R1-?VYOF-|
znRy45+iR$WrA~AsIRd+OKPt7As8l@eP)MS%)Lz(z%1tZA;NNf&evjHz)stKwwJt!V
z>S^rS8<<MH8MUC}r~yx6Ja(W4_L=PV<9I0e(GZVXaWd-1VhRReEh^`8um?Ve91ODo
zHNY3hi8U8csf#UkQ<H-lxCXUH8c++`fPuKr)iLi=P;QQ)20o2iNe3ztH&GD^Epe}B
zqd)a=7>tuq_gA1gehjr28ZZ@?pcb$b`Ir-YDRp7wd4SG;5d}ryaqNyy;)A#tXW$3u
z#b_E8ks@T{n<=QhumL$~<}KUai36yoP2oS7I1S72Ih=-HqsH^n7{K@@n?g?<iQ2uB
zP@%3tZO%Cuf-6zyejVz*H!&3djEX=zDl+G7`?shG-$bS29;%<PsctF~u<QT-`4p79
z8P+FI4>n>Sd=YgDwqpt&LhbTP*b5U`mO`A4V{j@eV(T#jkD~7T5$o_5)P(BFiND^(
zOUm7xY{X>hpI{tbMXfY=x_!Z*a_q%W%){O|5reSGwm*tt)EA>x+=zN^6KaC5VG*96
zPW-jfK_prsPs1$CLv5~ksFg24ZN{~zobN`Z<|yj9bEt`QppMypP!kBRa8oh}yC#ka
zwCAC&S2`3TDa=F7bUEhYT2#nRpgKN{3TX$XV_2mdfw8Fj%25-lLq&8M4#!t;Fn(d%
zZ=vpstaA5&lSM%drKph4#Ua>e>n*4bKSLeEPE^Et@!HdSAQH9dW?&@FMqPgjHSuRr
zscAw*bTcYqJ1|1O|9dD5rQw*p@B^xY8>o=oMMWlHraOQK^-dp#I!2375m<ss-S06E
z527~TkC==7XSsj-RiS<x9E{QVUqvC2hHV&yZK%z476;)K9D#jiyDKTiaOxG-d8kdh
z3_Z9L`{6<4ht8bAY>a-$jX)`;P_M>F#y2Y|XvSMmD>;Q)@kLZe|3bYVf@|CtOEhZ0
z0?foZ)Py!+U)+s~U>mBRPjDcf!5I7*m5Rt(e$-S*qM((gp+YkQwRvWuBC!t1mD!FO
z;C)o2KDXDuNA+_HHGtp4Zln@X{SIrbj$9qydMzb9ur)CI%kDwLy&0K_nc4YSSsO18
b|H<dRw2anoat}ne?ky_|Y3=dQ8$SO7Ye;OS

delta 5856
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
YoAZ}EyXa(Xd41uy@qYDn1qVF-2VI7aBLDyZ

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 4d4bd63b3..2d11f5581 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,593 +16,618 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "A kiszolgáló újraindult, tölts be újra az oldalt!"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 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:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Rendszergazda oldala"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Felhasználói felület beállításai"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Rendszergazda felhasználó"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mindent mutass"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Új felhasználó hozzáadása"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "SMTP beállítások változtatása"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "Az e-mail kiszolgáló beállításai frissítve."
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Funkciók beállítása"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Az összes mezőt ki kell tölteni!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "Az e-mail tartománya nem érvényes."
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Új felhasználó hozzáadása"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "A következő felhasználó létrehozva: %(user)s"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "A felhasználó törölve: %(nick)s"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr ""
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr " A felhasználó szerkesztése: %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "A felhasználó frissítve: %(nick)s"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-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:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "SMTP beállítások változtatása"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+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:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr " A felhasználó szerkesztése: %(nick)s"
+
+#: cps/admin.py:1396
 #, 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:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 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:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 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:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "Az e-mail kiszolgáló beállításai frissítve."
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Funkciók beállítása"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Az összes mezőt ki kell tölteni!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "Az e-mail tartománya nem érvényes."
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "A következő felhasználó létrehozva: %(user)s"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "A felhasználó törölve: %(nick)s"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr ""
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "A felhasználó frissítve: %(nick)s"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "nincs telepítve"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Nincs"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "Metaadatok szerkesztése"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "A(z) %(langname)s nem érvényes nyelv"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
-
-#: cps/editbooks.py:655
-#, 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:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Nem sikerült elmenteni a %(file)s fájlt."
-
-#: cps/editbooks.py:683
-#, 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:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "A metaadatok sikeresen frissültek"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr ""
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr ""
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 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:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, 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"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr ""
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "A(z) %(langname)s nem érvényes nyelv"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr ""
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr ""
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "Metaadatok szerkesztése"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, 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:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Nem sikerült elmenteni a %(file)s fájlt."
+
+#: cps/editbooks.py:1201
+#, 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/gdrive.py:58
 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."
@@ -611,27 +636,27 @@ msgstr "A Google Drive beállítása nem fejeződött be, próbáld kikapcsolni
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "A visszahívási tartomány nem ellenőrzött, kövesd az alábbi lépéseket a tartomány ellenőrzéséhez a Google Developer Console-ban:"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nem található: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Küldés Kindle-re"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Ez az e-mail a Calibre-Web-en keresztül lett küldve."
 
@@ -671,131 +696,111 @@ msgstr "Küldés Kindle-re"
 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:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, 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:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Várakozás"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Nem sikerült"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Elindítva"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Végrehajtva"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Ismeretlen állapot"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr ""
 
@@ -804,7 +809,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -865,12 +870,12 @@ msgstr ""
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Belépés"
 
@@ -886,456 +891,489 @@ msgstr "A token érvényessége lejárt."
 msgid "Success! Please return to your device"
 msgstr "Sikerült! Újra használható az eszköz."
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr ""
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Legutóbbi könyvek mutatása"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Kelendő könyvek"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Kelendő könyvek mutatása"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Legjobb könyvek"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr ""
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Felfedezés"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Címkék"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Címke választó mutatása"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Sorozatok"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Sorozat választó mutatása"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Szerzők"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Szerző választó mutatása"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Kiadók"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Kiadó választó mutatása"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Nyelvek"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Nyelv választó mutatása"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr ""
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr ""
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "A megadott polc érvénytelen!"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Elnézést, nem vagy jogosult hozzáadni a könyvet a következő polcra: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, 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:107
-#, 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:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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: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
-#, 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:209
-#, 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:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Polc készítése"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Sajnálom, nincs jogosultságot eltávolítani könyvet erről a polcról: %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Polc szerkesztése"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "A következő polc létre lett hozva: %(title)s"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "A következő polc megváltoztatva: %(title)s"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Hiba történt"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "A metaadatok sikeresen frissültek"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "A következő polc átrendezése: %(name)s"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Polc: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Hiba a polc megnyitásakor. A polc nem létezik vagy nem elérhető."
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Ismeretlen adat a frissítési információk olvasásakor"
-
-#: cps/updater.py:433 cps/updater.py:545
-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:451
-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:469
-msgid "Could not fetch update information"
-msgstr "Nem lehetett begyűjteni a frissítési információkat"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr ""
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Nincs információ a kiadásról."
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Felfedezés (könyvek találomra)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr ""
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr ""
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Kiadó: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Sorozat: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr ""
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr ""
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Címke: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Nyelv: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Részletes keresés"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Keresés"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Letöltések"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Feladatok"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Részletes keresés"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "A megadott polc érvénytelen!"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Elnézést, nem vagy jogosult hozzáadni a könyvet a következő polcra: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, 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:89
+#, 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:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, 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:138
+#, 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:145
+#, 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:191
+#, 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:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Polc készítése"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Sajnálom, nincs jogosultságot eltávolítani könyvet erről a polcról: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Polc szerkesztése"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "A metaadatok sikeresen frissültek"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "A következő polc átrendezése: %(name)s"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "A következő polc létre lett hozva: %(title)s"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "A következő polc megváltoztatva: %(title)s"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Hiba történt"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Polc: '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Feladatok"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Várakozás"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Nem sikerült"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Elindítva"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Végrehajtva"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Ismeretlen állapot"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Ismeretlen adat a frissítési információk olvasásakor"
+
+#: cps/updater.py:438 cps/updater.py:550
+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:456
+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:474
+msgid "Could not fetch update information"
+msgstr "Nem lehetett begyűjteni a frissítési információkat"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr ""
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Nincs információ a kiadásról."
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Felfedezés (könyvek találomra)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr ""
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Kiadó: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Sorozat: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Címke: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Nyelv: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Letöltések"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, 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:1533
+#: cps/web.py:1205
 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:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 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:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
@@ -1343,40 +1381,75 @@ msgstr "A profil frissítve."
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, 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:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Feltöltés"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Felhasználók listája"
@@ -1396,7 +1469,7 @@ msgstr "E-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Rendszergazda"
@@ -1406,13 +1479,8 @@ msgstr "Rendszergazda"
 msgid "Password"
 msgstr "Jelszó"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Feltöltés"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Letöltés"
@@ -1426,7 +1494,7 @@ msgstr ""
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1539,78 +1607,107 @@ msgstr ""
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Adminisztráció"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Újracsatlakozás a Calibre adatbázishoz"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "A Calibre adatbázis újraindítása"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "A Calibre adatbázis leállítása"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Frissítés"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Verzió"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Részletek"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Jelenlegi verzió"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Frissítés keresése"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Frissítés elkezdése"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Valóban újra akarod indítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Frissítés folyamatban, ne töltsd újra az oldalt"
 
@@ -1622,39 +1719,39 @@ msgstr "keresztül"
 msgid "In Library"
 msgstr "Könyvtárban"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "csökkentsd"
 
@@ -1662,165 +1759,166 @@ msgstr "csökkentsd"
 msgid "More by"
 msgstr "Több eszerint:"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Könyv törlése"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Formátumok törlése:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Könyvformátum átalakítása:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Konvertálás erről:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "Válassz egy lehetőséget"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Konvertálás erre:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Könyv konvertálása"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Könyv címe"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Szerző"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Leírás"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Címkék"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr ""
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Értékelés"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 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:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Borító feltöltése helyi meghajtóról"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Kiadás éve"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Kiadó"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Nyelv"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Igen"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nem"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Feltöltés formátuma"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Könyv megnézése szerkesztés után"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Metaadatok beszerzése"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Kulcsszó"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Keresési kulcsszó "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 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:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Bezárás"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Forrás"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Keresési hiba!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nincs találat! Próbálj másik kulcsszót."
 
@@ -1929,6 +2027,7 @@ msgid "Enter "
 msgstr "Regisztrálás"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Biztosan?"
 
@@ -2342,62 +2441,62 @@ msgstr ""
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Olvasás böngészőben"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Legyen olvasatlan"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Legyen olvasott"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Olvasva"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Ismertető:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Hozzáadás polchoz"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Metaadatok szerkesztése"
 
@@ -2441,7 +2540,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr "Beállítások mentése és teszt e-mail küldése"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Vissza"
@@ -2467,7 +2566,7 @@ msgstr "Tartomány megadása"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Következő"
 
@@ -2479,6 +2578,10 @@ msgstr ""
 msgid "Kobo Token:"
 msgstr ""
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
@@ -2495,29 +2598,29 @@ msgstr "Vissza a kezdőlapra"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2581,7 +2684,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2590,63 +2693,67 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Kezdőlap"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Navigáció átkapcsolása"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Hiba"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Beállítások"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Felhasználói fiók"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Kilépés"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Böngészés"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Névjegy"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Előző"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Könyv részletei"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Emlékezz rám"
@@ -2751,7 +2858,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr " "
@@ -2929,15 +3036,23 @@ msgstr "Az első belépés után automatikusan be leszel léptetve ezen az eszk
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/search.html:5
-msgid "No Results Found"
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
 msgstr ""
 
 #: cps/templates/search.html:6
+msgid "No Results Found"
+msgstr ""
+
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr ""
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Találatok a következőhöz:"
 
@@ -2990,23 +3105,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Polc törlése"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3051,8 +3166,8 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Alkalmazás könyvtár"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3082,6 +3197,18 @@ msgstr "Futásidő"
 msgid "Start Time"
 msgstr "Indítás ideje"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Felhasználó jelszavának alaphelyzetbe állítása"
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index c57e40711d4b5909da44cefae0ba6ec9fda5a13f..ad3ce16bf73b2a5b1a1e4977abfddc7e34e133be 100644
GIT binary patch
delta 11708
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

delta 11755
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
NlgHIdcU{@){eOC?gTw#;

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index e3096b316..1dc25f83f 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,586 +15,611 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, per favore ricarica la pagina"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Ricollegato con successo"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Configurazione dell'interfaccia utente"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Modifica gli utenti"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Tutti"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "{} utente eliminato con successo"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "tutte le lingue presenti"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "Richiesta non formulata correttamente"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "L'utente Guest (ospite) non può avere questo ruolo"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 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:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "Il valore deve essere o vero o flaso"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "Ruolo non valido"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "L'utente Guest (ospite) non può avere questa schermata"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "Visualizzazione invalida"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Le impostazioni locali dell'utente Guest (ospite) sono determinate automaticamente e non possono essere configurate"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "Nessuna lingua valida indicata"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "Nessuna lingua valida per il libro"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "Parametro non trovato"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr "Colonna di lettura non valida"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr "Colonna con restrizioni non valida"
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Vuoi veramente eliminare il token di Kobo?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "Vuoi veramente eliminare questo dominio?"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "Vuoi veramente eliminare questo utente?"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Vuoi veramente eliminare questo scaffale?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Sei sicuro di voler modificare le impostazioni locali dell'/degli utente/i selezionato/i?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Sei sicuro di voler modificare le impostazioni delle lingue visualizzabili dell'/degli utente/i selezionato/i?"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Sei sicuro di voler modificare il ruolo evidenziato dell'/degli utente/i selezionato/i?"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Sei sicuro di voler modificare le impostazioni delle restrizioni di visualizzazione dell'/degli utente/i selezionato/i?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Sei sicuro di voler modificare le impostazioni delle restrizioni di visualizzazione dell'/degli utente/i selezionato/i?"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Sei sicuro di voler modificare il comportamento di sincronizzazione dello scaffale per l'/gli utente/i selezionato/i?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Sei sicuro di voler modificare la posizione della libreria di Calibre?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr "Etichetta non trovata"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "Azione non valida"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Nega"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permetti"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr "Etichetta non trovata"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "Azione non valida"
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json non è configurato per Web Application"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 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:1110
+#: cps/admin.py:1131
 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:1140
+#: cps/admin.py:1161
 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:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Per favore digita nome di utente e password del servizio LDAP"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr "Per favore indica un account di servizio LDAP"
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, 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:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, 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:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, 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:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 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:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Aggiungi un nuovo utente"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Modifica le impostazioni del server e-mail"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr "L'account Gmail è stato verificato con successo"
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
 
-#: cps/admin.py:1235
-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:1253
-msgid "DB is not Writeable"
-msgstr "Il DB non è scrivibile"
-
-#: cps/admin.py:1266
-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:1270
-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:1378
-msgid "Database Settings updated"
-msgstr "Configurazione del Database aggiornata"
-
-#: cps/admin.py:1386
-msgid "Database Configuration"
-msgstr "Configurazione del Database"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Per favore compila tutti i campi!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "L'e-mail non proviene da un dominio valido"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Aggiungi un nuovo utente"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "L'utente '%(user)s' è stato creato"
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Trovato un account esistente con questo e-mail o nome di utente"
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "L'utente '%(nick)s' è stato eliminato"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr "Non posso eliminare l'utente Guest (ospite)"
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Modifica l'utente %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "L'utente '%(nick)s' è stato aggiornato"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Si è verificato un errore sconosciuto: per favore riprova."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Modifica le impostazioni del server e-mail"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr "L'account Gmail è stato verificato con successo"
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "L'e-mail di test è stato accodato con successo per essere spedito a  %(email)s, per favore verifica tramite il pulsante 'Compito' il risultato"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Si è verificato un errore sconosciuto: per favore riprova."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Modifica l'utente %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr "Durante l'aggiornamento non è stato possibile sostituire alcuni file"
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr "Fallita l'estrazione di almeno un utente LDAP"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Fallita la creazione di almeno un utente LDAP"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Errore: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Almeno un utente LDAP non è stato trovato nel database"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} utente importato con successo"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+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:1689
+msgid "DB is not Writeable"
+msgstr "Il DB non è scrivibile"
+
+#: cps/admin.py:1702
+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:1706
+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:1814
+msgid "Database Settings updated"
+msgstr "Configurazione del Database aggiornata"
+
+#: cps/admin.py:1822
+msgid "Database Configuration"
+msgstr "Configurazione del Database"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Per favore compila tutti i campi!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "L'e-mail non proviene da un dominio valido"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "L'utente '%(user)s' è stato creato"
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Trovato un account esistente con questo e-mail o nome di utente"
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "L'utente '%(nick)s' è stato eliminato"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr "Non posso eliminare l'utente Guest (ospite)"
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "L'utente '%(nick)s' è stato aggiornato"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "non installato"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, 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/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Nessuna"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Il formato del libro è stato eliminato con successo"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Il libro é stato eliminato con successo"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "modifica i metadati"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s non è un numero valido, proseguo"
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s non è una lingua valida"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Il file da caricare deve avere un'estensione"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Il salvataggio del file %(file)s non è riuscito."
-
-#: cps/editbooks.py:683
-#, 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:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 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:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "I metadati sono stati aggiornati con successo"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiare prima di sottoporlo nuovamente: "
-
-#: cps/editbooks.py:1041
-#, 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:1061
-#, 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:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Il file %(file)s è stato caricato"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Mancano o il formato sorgente o quello di destinazione, entrambi necessari alla conversione"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiare prima di sottoporlo nuovamente: "
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s non è una lingua valida"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Il file da caricare deve avere un'estensione"
+
+#: cps/editbooks.py:735
+#, 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:755
+#, 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:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Il formato del libro è stato eliminato con successo"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Il libro é stato eliminato con successo"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "modifica i metadati"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s non è un numero valido, proseguo"
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Il salvataggio del file %(file)s non è riuscito."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Ho aggiunto il formato %(ext)s al libro %(book)s"
+
 #: cps/gdrive.py:58
 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"
@@ -603,27 +628,27 @@ msgstr "La configurazione di Google Drive non è stata completata correttamente.
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain non è stato verificato. Per favore intraprendi il necessario per verificare il dominio nella developer console di Google"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s non trovato: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Invia a Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
 
@@ -663,131 +688,111 @@ msgstr "%(book)s inviato a Kindle"
 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:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "L'eliminazione della cartella del libro %(id)s non è riuscita, il percorso ha sottocartelle: %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "L'eliminazione del libro %(id)s non è riuscita: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Eliminazione del libro %(id)s unicamente dal database. Il percorso del libro nel database non è valido: %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "File %(file)s non trovato su Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "L'e-mail non è scritto in un formato valido"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Errore nello scaricare la copertina"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Errore di formato della copertina"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Errore nel creare la cartella per la copertina"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 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:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Solamente i file nei formati jpg/jpeg/png/webp/bmp sono supportati per le copertine"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 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:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "Non ho trovato il file binario di UnRar"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Attendi"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Non riuscito"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Avviato"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Terminato"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Stato sconosciuto"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Per favore accedi a calibe-web non da localhost per ottenere un api-endpoint valido per il lettore kobo"
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Configurazione di Kobo"
 
@@ -796,7 +801,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -857,12 +862,12 @@ msgstr "Google, errore Oauth: per favore riprova più tardi."
 msgid "Google Oauth error: {}"
 msgstr "Google, errore Oauth: {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} Stelle"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Accesso"
 
@@ -878,455 +883,488 @@ msgstr "Il token è scaduto"
 msgid "Success! Please return to your device"
 msgstr "Riuscito! Torna al tuo dispositivo"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Libri"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Mostra l'opzione per la selezione dei libri più recenti"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Libri popolari"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Mostra l'opzione per la selezione dei libri più popolari"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "Libri scaricati"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Libri meglio valutati"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Libri letti"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Libri non letti"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Mostra l'opzione per la selezione dei libri non letti"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Per scoprire"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Categorie"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Mostra l'opzione per la selezione delle categorie"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Serie"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Mostra l'opzione per la selezione delle serie"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Autori"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Editori"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Mostra l'opzione per la selezione degli editori"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Lingue"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Mostra l'opzione per la selezione delle lingue"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Valutazioni"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Mostra l'opzione per la selezione delle valutazioni"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Formati file"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Mostra l'opzione per la selezione del formato dei file"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "Elenco libri"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "Mostra l'opzione per visualizzare i libri sottoforma di elenco"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Lo scaffale specificato non è valido"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Mi spiace, ma non sei autorizzato ad aggiungere libri allo scaffale: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Il libro è gia presente nello scaffale: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Il libro è stato aggiunto allo scaffale: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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: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
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Non posso aggiungere libri allo scaffale: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Crea uno scaffale"
-
-#: cps/shelf.py:236
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Spiacente, non sei autorizzato a modificare questo scaffale"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Modifica uno scaffale"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Lo scaffale %(title)s è stato creato"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Lo scaffale %(title)s è stato modificato"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "C'era un errore"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Esiste già uno scaffale pubblico denominato '%(title)s'."
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Esiste già uno scaffale privato denominato '%(title)s'."
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Il libro é stato eliminato con successo"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Scaffale: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è accessibile"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Dati inattesi durante il processo di aggiornamento"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "Nessun aggiornamento disponibile. Hai già installata l'ultima versione"
-
-#: cps/updater.py:451
-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:469
-msgid "Could not fetch update information"
-msgstr "Impossibile recuperare le informazioni di aggiornamento"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr "Clicca sul pulsante per aggiornare all'ultima versione stabile."
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Non sono disponibili informazioni sulla versione"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Scopri (libri casuali)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "I libri più richiesti"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "I libri scaricati da %(user)s"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Autore: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Editore: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Serie: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Valutazione: %(rating)s stelle"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Formato del file: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Categoria: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Lingua: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Ricerca avanzata"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Cerca"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Downloads"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Elenco delle valutazioni"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Elenco dei formati"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Compito"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Stato di lettura = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Ricerca avanzata"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Lo scaffale specificato non è valido"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Mi spiace, ma non sei autorizzato ad aggiungere libri allo scaffale: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Il libro è gia presente nello scaffale: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Il libro è stato aggiunto allo scaffale: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, 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:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "I libri sono stati aggiunti allo scaffale: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Non posso aggiungere libri allo scaffale: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Crea uno scaffale"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Spiacente, non sei autorizzato a modificare questo scaffale"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Modifica uno scaffale"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Il libro é stato eliminato con successo"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Lo scaffale %(title)s è stato creato"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Lo scaffale %(title)s è stato modificato"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "C'era un errore"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Esiste già uno scaffale pubblico denominato '%(title)s'."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Esiste già uno scaffale privato denominato '%(title)s'."
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Scaffale: '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Compito"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Attendi"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Non riuscito"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Avviato"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Terminato"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Stato sconosciuto"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Dati inattesi durante il processo di aggiornamento"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Nessun aggiornamento disponibile. Hai già installata l'ultima versione"
+
+#: cps/updater.py:456
+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:474
+msgid "Could not fetch update information"
+msgstr "Impossibile recuperare le informazioni di aggiornamento"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Clicca sul pulsante per aggiornare all'ultima versione stabile."
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Non sono disponibili informazioni sulla versione"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Scopri (libri casuali)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "I libri più richiesti"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "I libri scaricati da %(user)s"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Autore: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Editore: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Serie: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Valutazione: %(rating)s stelle"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Formato del file: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Categoria: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Lingua: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Downloads"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Elenco delle valutazioni"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Elenco dei formati"
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 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:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
@@ -1334,40 +1372,75 @@ msgstr "Profilo aggiornato"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Ho trovato un gmail.json file senza informazione OAuth"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Non ho trovato il convertitore %(tool)s di libri di Calibre"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Non ho trovato il formato %(format)s nel disco"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "La conversione del libro è terminata con un errore sconosciuto"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Si è verificato un errore con il convertitore Kepubify: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Non ho trovato il file convertito o ci sono più di un file nella cartella %(folder)s"
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Errore nel convertitore: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Si è verificato un errore con Calibre: %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Upload"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Elenco utenti"
@@ -1387,7 +1460,7 @@ msgstr "Indirizzo e-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Invia all'indirizzo e-mail di Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Amministrazione"
@@ -1397,13 +1470,8 @@ msgstr "Amministrazione"
 msgid "Password"
 msgstr "Password"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Upload"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Download"
@@ -1417,7 +1485,7 @@ msgstr "Vedi libri"
 msgid "Edit"
 msgstr "Modifica"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1529,78 +1597,107 @@ msgstr "Modifica la configurazione di base"
 msgid "Edit UI Configuration"
 msgstr "Modifica la configurazione dell'interfaccia utente"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "Scarica Debug Package"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Visualizza Logfile"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Ricollega il database di Calibre"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Riavvia Calibre-Web"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Arresta Calibre-Web"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Aggiornamento"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Versione"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Dettagli"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Versione attuale"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Ricerca aggiornamenti"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Esegui l'aggiornamento"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Vuoi veramente riavviare Calibre-Web?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annulla"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Vuoi veramente arrestare Calibre-Web?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Aggiornamento, non ricaricare la pagina."
 
@@ -1612,39 +1709,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "Nella libreria"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "Ordina secondo la data dei libri, prima i più recenti"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 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:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "Ordina i titoli in ordine alfabetico"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "Ordina i titoli in ordine alfabetico inverso"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 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:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "Ordina secondo la data di pubblicazione, prima i più vecchi"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "riduci"
 
@@ -1652,164 +1749,165 @@ msgstr "riduci"
 msgid "More by"
 msgstr "Altro da"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Elimina libro"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Elimina i formati:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Converti il libro nel formato:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Converti da:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "seleziona un formato"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Converti in:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Converti libro"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Titolo del libro"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autore"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Descrizione"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "Identificatori"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "Tipo di identificatore"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "Valore dell'identificatore"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "Aggiungi un identificatore"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Categorie"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "ID della serie"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Valutazione"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Carica la copertina da URL (jpeg - l'immagine della copertina viene scaricata e salvata nel database)"
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Carica la copertina dal disco locale"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Data di pubblicazione"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editore"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Lingua"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Sì"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Carica formato"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Visualizza il libro dopo la modifica"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Ottieni metadati"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Salva"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Parola chiave"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 msgid "Search keyword"
 msgstr "Cerca parola chiave"
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "Fai clic sulla copertina per caricare i metadati nel modulo"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Chiudi"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Fonte"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Errore nella ricerca!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nessun risultato! Prova con un altro criterio di ricerca."
 
@@ -1917,6 +2015,7 @@ msgid "Enter "
 msgstr "Conferma "
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Sei veramente sicuro?"
 
@@ -2328,62 +2427,62 @@ msgstr "Aggiungi categorie permesse/negate"
 msgid "Add Allowed/Denied custom column values"
 msgstr "Aggiungi valori personali permetti/nega nelle colonne"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Leggi nel navigatore"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Ascolta nel navigatore"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Libro %(index)s di %(range)s"
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Pubblicato"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Marca come non letto"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Marca come letto"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Letto"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Ripristina dall'archivio"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Aggiungi all'archivio"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Archiviato"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Aggiungi allo scaffale"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Pubblico)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Modifica metadati"
 
@@ -2427,7 +2526,7 @@ msgstr "Dimensione massima dell'allegato"
 msgid "Save and Send Test E-mail"
 msgstr "Salva le impostazioni e invia e-mail di test"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Indietro"
@@ -2453,7 +2552,7 @@ msgstr "Digita il nome di dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominii bloccati per la registrazione (Blacklist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Prossimo"
 
@@ -2466,6 +2565,10 @@ msgstr "Apri il file .kobo/Kobo eReader.conf in un editore di testi e aggiungi (
 msgid "Kobo Token:"
 msgstr "Token Kobo Sync"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "L'istanza Calibre-Web non è configurata, per favore contatta l'amministratore"
@@ -2482,29 +2585,29 @@ msgstr "Ritorna alla pagina principale"
 msgid "Logout User"
 msgstr "Disconnetti l'utente"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "Ordina gli autori in ordine alfabetico"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordina gli autori in ordine alfabetico inverso"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "Ordina in ordine ascendente secondo l'indice della serie"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "Ordina in ordine discendente secondo l'indice della serie"
 
@@ -2568,7 +2671,7 @@ msgstr "Libri ordinati per valutazione"
 msgid "Books ordered by file formats"
 msgstr "Libri ordinati per formato"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Scaffali"
@@ -2577,63 +2680,67 @@ msgstr "Scaffali"
 msgid "Books organized in shelves"
 msgstr "Libri organizzati in scaffali"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Home"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Alterna navigazione"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Ricerca nella libreria"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Uploading..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Errore"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Configurazione"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Per favore non ricaricare la pagina"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Naviga"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informazioni su"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Precedente"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Dettagli del libro"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Ricordami"
@@ -2738,7 +2845,7 @@ msgstr "Cartella principale"
 msgid "Select"
 msgstr "Seleziona"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 msgid "Ok"
 msgstr "Ok"
 
@@ -2914,15 +3021,23 @@ msgstr "Una volta completato, verrai automaticamente connesso con questo disposi
 msgid "This verification link will expire in 10 minutes."
 msgstr "Il link scadrà tra 10 minuti."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Nessun risultato trovato"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Termine di ricerca:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Risultati per:"
 
@@ -2974,23 +3089,23 @@ msgstr "Da:"
 msgid "To:"
 msgstr "A:"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Cancella questo scaffale"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "Modifica le caratteristiche dello scaffale"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "Disponi i libri manualmente"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "Disabilita la modifica della disposizione"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "Abilita la modifica della disposizione"
 
@@ -3035,8 +3150,8 @@ msgid "System Statistics"
 msgstr "Statistiche del sistema"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Programma libreria"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3066,6 +3181,18 @@ msgstr "Tempo d'esecuzione"
 msgid "Start Time"
 msgstr "Ora d'inizio"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Reimposta la password dell'utente"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 2c3247e199c49579371d10a56956829f997ed603..03d9ea25314685294a88ef400b3a47611278d56f 100644
GIT binary patch
delta 4539
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

delta 4559
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
B&W8X1

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index ddadb332f..569aab2f8 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -16,588 +16,613 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました。ページを再読み込みしてください"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンしています。ページを閉じてください"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "不明"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "UI設定"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr ""
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "新規ユーザ追加"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "SMTP設定を変更"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "メールサーバの設定を更新しました"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "機能設定"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "全ての項目を入力してください"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "このメールは有効なドメインからのものではありません"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "新規ユーザ追加"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "ユーザ '%(user)s' を作成しました"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "ユーザ '%(nick)s' を削除しました"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr ""
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "%(nick)s を編集"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "ユーザ '%(nick)s' を更新しました"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "不明なエラーが発生しました。あとで再試行してください。"
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "SMTP設定を変更"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "不明なエラーが発生しました。あとで再試行してください。"
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "%(nick)s を編集"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "メールサーバの設定を更新しました"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "機能設定"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "全ての項目を入力してください"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "このメールは有効なドメインからのものではありません"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "ユーザ '%(user)s' を作成しました"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "ユーザ '%(nick)s' を削除しました"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr ""
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "ユーザ '%(nick)s' を更新しました"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "インストールされていません"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "なし"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "メタデータを編集"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s は有効な言語ではありません"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "アップロードするファイルには拡張子が必要です"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "%(path)s の作成に失敗しました (Permission denied)。"
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "%(file)s を保存できません。"
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "メタデータを更新しました"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr ""
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr ""
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "変換元の形式または変換後の形式が指定されていません"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "本の %(book_format)s への変換がキューに追加されました"
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "この本の変換中にエラーが発生しました: %(res)s"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr ""
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s は有効な言語ではありません"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "アップロードするファイルには拡張子が必要です"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr ""
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr ""
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "メタデータを編集"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "%(path)s の作成に失敗しました (Permission denied)。"
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "%(file)s を保存できません。"
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Googleドライブの設定が完了していません。Googleドライブを無効化してから再度有効にしてみてください"
@@ -606,27 +631,27 @@ msgstr "Googleドライブの設定が完了していません。Googleドライ
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "コールバックドメインが認証されていません。Google Developer Consoleでドメインを認証してください"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Googleドライブ: %(fn)s に %(format)s はありません"
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s がありません: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Kindleに送信"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "このメールはCalibre-Web経由で送信されました。"
 
@@ -666,131 +691,111 @@ msgstr "Kindleに送信"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "要求されたファイルを読み込めませんでした。権限設定が正しいか確認してください。"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "待機中"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "失敗"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "開始"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "終了"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "不明"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr ""
 
@@ -799,7 +804,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -860,12 +865,12 @@ msgstr ""
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "ログイン"
 
@@ -881,456 +886,489 @@ msgstr "トークンが無効です"
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr ""
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "最近追加された本を表示"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "人気の本"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr ""
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "読んだ本"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "未読の本"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr ""
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "見つける"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "ランダムで本を表示"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "カテゴリ"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "カテゴリ選択を表示"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "シリーズ"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "シリーズ選択を表示"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "著者"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "著者選択を表示"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "出版社"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "出版社選択を表示"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "言語"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "言語選択を表示"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr ""
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr ""
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "指定された本棚は無効です"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "申し訳ありませんが、あなたは %(shelfname)s に本を追加することが許可されていません"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "この本は %(shelfname)s にすでに追加されています"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "本を %(sname)s に追加しました"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "%(sname)s に本を追加できません"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "本が %(sname)s から削除されました"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "本棚を作成する"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "申し訳ありませんが、%(sname)s から本を削除することが許可されていません"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "本棚を編集する"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "%(title)s を作成しました"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "%(title)s を変更しました"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "エラーが発生しました"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "メタデータを更新しました"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "'%(name)s' 内の本の順番を変更する"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "本棚: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "アップデート情報を読み込み中に予期しないデータが見つかりました"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "アップデートはありません。すでに最新バージョンがインストールされています"
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "アップデートが利用可能です。下のボタンをクリックして最新バージョンにアップデートしてください。"
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr "アップデート情報を取得できません"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr ""
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "リリース情報がありません"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "本を見つける (ランダムで表示)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr ""
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr ""
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr ""
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "出版社: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "シリーズ: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr ""
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr ""
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "カテゴリ: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "言語: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "詳細検索"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "検索"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr ""
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "タスク"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "詳細検索"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "指定された本棚は無効です"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "申し訳ありませんが、あなたは %(shelfname)s に本を追加することが許可されていません"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "この本は %(shelfname)s にすでに追加されています"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "本を %(sname)s に追加しました"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "これらの本は %(name)s にすでに追加されています"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "本が %(sname)s に追加されました"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "%(sname)s に本を追加できません"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "本が %(sname)s から削除されました"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "本棚を作成する"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "申し訳ありませんが、%(sname)s から本を削除することが許可されていません"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "本棚を編集する"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "メタデータを更新しました"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "'%(name)s' 内の本の順番を変更する"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "%(title)s を作成しました"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "%(title)s を変更しました"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "エラーが発生しました"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "本棚: '%(name)s'"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "タスク"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "待機中"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "失敗"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "開始"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "終了"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "不明"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "アップデート情報を読み込み中に予期しないデータが見つかりました"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "アップデートはありません。すでに最新バージョンがインストールされています"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "アップデートが利用可能です。下のボタンをクリックして最新バージョンにアップデートしてください。"
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "アップデート情報を取得できません"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr ""
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "リリース情報がありません"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "本を見つける (ランダムで表示)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr ""
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr ""
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "出版社: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "シリーズ: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "カテゴリ: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "言語: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr ""
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
@@ -1338,40 +1376,75 @@ msgstr "プロフィールを更新しました"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter が失敗しました: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "アップロード"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr ""
@@ -1391,7 +1464,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理者"
@@ -1401,13 +1474,8 @@ msgstr "管理者"
 msgid "Password"
 msgstr "パスワード"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "アップロード"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "ダウンロード"
@@ -1421,7 +1489,7 @@ msgstr ""
 msgid "Edit"
 msgstr "編集"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1534,78 +1602,107 @@ msgstr ""
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:166
-msgid "Administration"
-msgstr "管理"
-
 #: cps/templates/admin.html:167
-msgid "Download Debug Package"
+msgid "Scheduled Tasks"
 msgstr ""
 
-#: cps/templates/admin.html:168
-msgid "View Logs"
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
 msgstr ""
 
-#: cps/templates/admin.html:171
-msgid "Reconnect Calibre Database"
-msgstr ""
-
-#: cps/templates/admin.html:172
-msgid "Restart"
-msgstr ""
-
-#: cps/templates/admin.html:173
-msgid "Shutdown"
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
 msgstr ""
 
 #: cps/templates/admin.html:178
-msgid "Update"
-msgstr "アップデート"
+msgid "Generate book cover thumbnails"
+msgstr ""
 
 #: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
+msgid "Administration"
+msgstr "管理"
+
+#: cps/templates/admin.html:200
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:201
+msgid "View Logs"
+msgstr ""
+
+#: cps/templates/admin.html:204
+msgid "Reconnect Calibre Database"
+msgstr ""
+
+#: cps/templates/admin.html:207
+msgid "Restart"
+msgstr ""
+
+#: cps/templates/admin.html:208
+msgid "Shutdown"
+msgstr ""
+
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
+
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "バージョン"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "詳細"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "現在のバージョン"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "更新を実行"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1617,39 +1714,39 @@ msgstr "経由"
 msgid "In Library"
 msgstr "ライブラリ内"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "減らす"
 
@@ -1657,165 +1754,166 @@ msgstr "減らす"
 msgid "More by"
 msgstr ""
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "本を削除"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "削除する形式:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "変換する形式:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "変換元:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "選択肢を選ぶ"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "変換先:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "本を変換"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "本のタイトル"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "著者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "詳細"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "タグ"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr ""
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "評価"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "言語"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "はい"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "いいえ"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "キーワード"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr "キーワードを検索"
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "カバー画像をクリックしてメタデータをフォームに読み込んでください"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "閉じる"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "ソース"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "検索エラー"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "検索結果が見つかりません。別のキーワードで検索してみてください。"
 
@@ -1924,6 +2022,7 @@ msgid "Enter "
 msgstr "登録"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "よろしいですか?"
 
@@ -2336,62 +2435,62 @@ msgstr ""
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "未読に設定"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "既読に設定"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "読んだ"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "詳細:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "本棚に追加"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr ""
 
@@ -2435,7 +2534,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr ""
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "戻る"
@@ -2461,7 +2560,7 @@ msgstr "ドメイン名を入力"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "次"
 
@@ -2473,6 +2572,10 @@ msgstr ""
 msgid "Kobo Token:"
 msgstr ""
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
@@ -2489,29 +2592,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2575,7 +2678,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2584,63 +2687,67 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "ホーム"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr ""
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "アップロード中..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "エラー"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "設定"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "アカウント"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "ログアウト"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "閲覧"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "このサイトについて"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "前"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "本の詳細"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr ""
@@ -2745,7 +2852,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "本"
@@ -2923,15 +3030,23 @@ msgstr ""
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/search.html:5
-msgid "No Results Found"
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
 msgstr ""
 
 #: cps/templates/search.html:6
+msgid "No Results Found"
+msgstr ""
+
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr ""
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "結果:"
 
@@ -2984,23 +3099,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "この本棚を削除"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3045,7 +3160,7 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
+msgid "Program"
 msgstr ""
 
 #: cps/templates/stats.html:34
@@ -3076,6 +3191,18 @@ msgstr ""
 msgid "Start Time"
 msgstr ""
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "ユーザパスワードをリセット"
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 34b973bbcb09824879b7e8162c8f11c1f29f284d..0bf4f7ffeefc95b6d97dec85481b847483b4bfbb 100644
GIT binary patch
delta 4063
zcmYM#32;qU9LMpKijXISgjf<4kyR`&2}vwTthF~J#1cC}I#E-~Sjt65g)(Cj6fMcL
z8D*xHHZ`>-mX=XQt1_*vmTHZqmZ?$g#M19C_srBh?{m(1_nz}V|MR~$yAJ!@IOOA8
z3-aAy`1g$eVf?SEqu&4j)&v?8M0YLL#!?Kx?bdQTeiS{7pR}IG2K28YA9J6trdW-d
zFSudNxMQMe=*DDJ06nojj>mW`z~;CK{qQSPj0aE?9z$Qegu!?X72sc}d0$}+dK$U&
zC1N}J<1yJd#(YSl2?NJb6JA6u_}KP6gsYuIpaMw17MO~YFdMbdK0AIC`IswwwZ?}?
z45lH`F{NpZ3Lpt<v%Z-~Lpz>^TIgNWh3{i4+<>p+K8(OBR3Oi=9=^1C8oQ|uLERsX
z`aKnukv>=#hoLq)1|1E|rlB1zLVw(7FDOOrU_UCwmoXHtqXMo*?bM(2X@M|Q=HgHR
z_eRY-8I_^Mn2v?008cd`|Jv~-1~kDP)Xtt_5<W*w<PC9;C=-X!&qLi;jyl`p*cb0%
z6nfcSTg*Xia2YBSt5FMYL}E8Pnv#F*=m-Pa`6X2U7S<FG>IP3Ux9Gx96Go!O+oLj&
zfx17-_Qzrz{aL7aHe)v|LlyZABv$jnp}{6iWAdiQt1T)6USw^Pf_zLSU#j|i)KR>H
zui-pYh8EcIO?G@M_F}vgmC0MEz?*U&%3L@mqSKLvm&Rn&&Wo`t?!gqihgvX#A2mS?
z>Us9seh;Mn%mCEH<7~eGm7%4m>MyeW&rq4#ha9<MDrsoPXHjQz!FtENz`U?}$eRLb
zib`o1Dv%f?Mw5bVFbfsvJk)#+sz%mhBpyc9!cFX_=l=l>vST{8bc-+(70_7JL{m`J
zUVvJ7q3y3g?W7pH;8s-TenA~o5a*)%TcGA|gPJ!DHD4cWpyxk}2KSgr_5uer@dv0P
zS%*sH=cpYWK<(fhYDbq*3%x=eMO|JRs+}-vC)E9eQP+(}9o2Mn^us(F;aG@TU?-|5
zD^L?vS^q>`?;Gx37lP`?qpnXw?Jyg)z!+3f=c6(=3zeCLw!b`_{Og9b4CuLCk2>Rn
z)=Ja_-=d1>drZeGsPPuOo%HyHqpCRxH9id$Sb=p3s#exnOHuRfZSA-b9b-T*pwq|`
zX?{jc_y}V$g7>Zh9fUf&EY$TAQ9GK6T5v9E11nLPTVpM=9!4EO6)MnQ9U8jv7HTI?
zQ4`jslvULYu@=Uoe(#71pcm?>hT49fbq>~Id>Jb66}Z61nBCZ&er%K*cpmnr@64v5
zB07XR!yA}^f7|ioXx?)4b1@lLp>8~ida?M&xUbqY)O9oPP27ljul#|dFobA2;Vh(1
zO_{4>PS6;`z;9SnM7%fK($B_TxC9m8G1Nr2aRg>?(FELp@8MG%gtO!M3x^fh7aO*7
z=gC3!H=}CdI=0dC|A<C41Hpu^$O1dKJLrJwFGgkL6V!8l6}3P}N8WBY1O4$Xs&<~B
z?h9c1s)2Z1g1vDO9><lKp1^&qZ%)$CjX$E!=q@Ui(Nv%&8ji}$9P27OUV_R{1qPxI
z=P?o+q22@esQDISDjvije1h!R_;DVN&NPXJQu7vS!M&(d{(zb=w6mL$IjG_~j!W?*
z>iT|6!h>R_VF(stD3)M89>O;;D#bn80`#FMKT0A0+UaJ(8-k~B4>lpsQ}8>Si*dYH
zYbHcx>JT=<Dr}6mk@7Ls*dHUi@rMX!qUJw?#9;nK1?nX&0hraD{OfEdFrbM`toxCy
zn)A38ebd~?i*P#qBgiqDsC4)5dJcxuFG335l%p2Bf(j^zMf5iy7gfx2u?cQ*X!z0C
zi^K67)L91faL+IdFVOd54*K?VQ=W@jU?EP%FHs9MrXYIYI6R2k@C1(T?Y@#*_Hm1~
z9r6?BPeVIjfSRxfBk{EDKSWi16a}J;Oh6S+5$d{1Y>mHL{WxeI026B+h00VRQg`M6
z>S=l4_8s$#2FGsV`?*Ik701voLk0E<6=^fJ$0kfJj>i&w9be*VY&pO^^Bu^m!1xVx
z?@vIIY6fB)uEuEm8f%{aD>Q-`c!eu5n9?uAkFgF$4tC$!?XZA;XVlq!iWIWhk2>4O
zRu7e|BaB29UnkVlG#SHiH}YVaGnnGg(ECygr=oUz6iJG?gj{37GkMSB+o&B^VhmnG
zWy+5qmD))-A2(nDHW=n+ZV~EeE3iF2MP1(}i}NRFGm?e|%B&YLkbXe6`vM8WQ2L`$
zXFk`u1%v2Uq5}U3`I!5B)xr!aTEF*3-Is$3U=dd0&fz@&nmB)iJHZOnbGr?d;^!ET
zL6p9VFde-(AGPzH$nhIr-cnj<2<ogSA|F%A*LM5|mt)B&cixE6ZU$3FlYgahA_I!B
z5S8Lx*cQ)XE<VGln9ZsLZ}y|AzCJ&8!H%ef^HJkFt!Gg8J-}eh8tcAkr=hO<B9=y1
z8s{(>{n@?(>4Dl&9!|&k<(mT!*DKEpy;;}OxxF_bJRzxTVq)>o$S1z39lW06t#QrD
TCq#8^ReUV1S^2d-na%$LwC%d$

delta 4136
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
UZoiNA9#i&qW>oFkoZ->`0?1h6*Z=?k

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 795c58616..757604ded 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,592 +17,617 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "មិនដឹង"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "ទំព័ររដ្ឋបាល"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "បង្ហាញទាំងអស់"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "ប្តូរការកំណត់ SMTP"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "ការកំណត់មុខងារ"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "សូមបំពេញចន្លោះទាំងអស់!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr ""
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr ""
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr ""
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr ""
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "ប្តូរការកំណត់ SMTP"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "ការកំណត់មុខងារ"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "សូមបំពេញចន្លោះទាំងអស់!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr ""
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr ""
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr ""
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "មិនបានតម្លើង"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "គ្មាន"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "កែប្រែទិន្នន័យមេតា"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr ""
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr ""
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr ""
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr ""
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr ""
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr ""
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr ""
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "កែប្រែទិន្នន័យមេតា"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr ""
@@ -611,27 +636,27 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
 
-#: cps/helper.py:81
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "ផ្ញើទៅ Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
@@ -671,130 +696,110 @@ msgstr "ផ្ញើទៅ Kindle"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "កំពុងរង់ចាំ"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "បានបរាជ័យ"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "បានចាប់ផ្តើម"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "បានបញ្ចប់"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr ""
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr ""
 
@@ -803,7 +808,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -864,12 +869,12 @@ msgstr ""
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -885,455 +890,488 @@ msgstr "វត្ថុតាងហួសពេលកំណត់"
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr ""
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "បង្ហាញសៀវភៅមកថ្មី"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "សៀវភៅដែលមានប្រជាប្រិយភាព"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "បង្ហាញសៀវភៅដែលមានប្រជាប្រិយភាព"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr ""
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "ស្រាវជ្រាវ"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "បង្ហាញជម្រើសប្រភេទ"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "ស៊េរី"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "បង្ហាញជម្រើសស៊េរី"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "អ្នកនិពន្ធ"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr ""
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr ""
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "ភាសានានា"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "បង្ហាញផ្នែកភាសា"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr ""
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr ""
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr ""
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "សៀវភៅត្រូវបានបន្ថែមទៅធ្នើ៖ %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: cps/shelf.py:144
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr ""
-
-#: cps/shelf.py:156
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr ""
-
-#: cps/shelf.py:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr ""
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ៖ %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "បង្កើតធ្នើ"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "កែប្រែធ្នើ"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "មានបញ្ហា"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-msgid "Shelf successfully deleted"
-msgstr ""
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "ធ្នើ៖ ‘%(name)s’"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr ""
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr ""
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr ""
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr ""
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr ""
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:531
-msgid "No release information available"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr ""
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr ""
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr ""
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "ស៊េរី៖ %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr ""
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr ""
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "ប្រភេទ៖ %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "ភាសា៖ %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "ស្វែងរកកម្រិតខ្ពស់"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "ឯកសារ DLS"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "កិច្ចការនានា"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "ស្វែងរកកម្រិតខ្ពស់"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "សៀវភៅត្រូវបានបន្ថែមទៅធ្នើ៖ %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ៖ %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "បង្កើតធ្នើ"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "កែប្រែធ្នើ"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "មានបញ្ហា"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "ធ្នើ៖ ‘%(name)s’"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "កិច្ចការនានា"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "កំពុងរង់ចាំ"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "បានបរាជ័យ"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "បានចាប់ផ្តើម"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "បានបញ្ចប់"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr ""
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr ""
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr ""
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr ""
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr ""
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr ""
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/updater.py:536
+msgid "No release information available"
+msgstr ""
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr ""
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr ""
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "ស៊េរី៖ %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "ប្រភេទ៖ %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "ភាសា៖ %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "ឯកសារ DLS"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
@@ -1341,40 +1379,75 @@ msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "អាប់ឡូដ"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "បញ្ជីអ្នកប្រើប្រាស់"
@@ -1394,7 +1467,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr "ឧបករណ៍ Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "រដ្ឋបាល"
@@ -1404,13 +1477,8 @@ msgstr "រដ្ឋបាល"
 msgid "Password"
 msgstr "លេខសម្ងាត់"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "អាប់ឡូដ"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "ទាញយក"
@@ -1424,7 +1492,7 @@ msgstr ""
 msgid "Edit"
 msgstr "កែប្រែ"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1537,78 +1605,107 @@ msgstr ""
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:166
-msgid "Administration"
-msgstr "កិច្ចការរដ្ឋបាល"
-
 #: cps/templates/admin.html:167
-msgid "Download Debug Package"
+msgid "Scheduled Tasks"
 msgstr ""
 
-#: cps/templates/admin.html:168
-msgid "View Logs"
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
 msgstr ""
 
-#: cps/templates/admin.html:171
-msgid "Reconnect Calibre Database"
-msgstr "ភ្ជាប់ទៅ database Calibre ម្តងទៀត"
-
-#: cps/templates/admin.html:172
-msgid "Restart"
-msgstr ""
-
-#: cps/templates/admin.html:173
-msgid "Shutdown"
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
 msgstr ""
 
 #: cps/templates/admin.html:178
-msgid "Update"
+msgid "Generate book cover thumbnails"
 msgstr ""
 
 #: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
+msgid "Administration"
+msgstr "កិច្ចការរដ្ឋបាល"
+
+#: cps/templates/admin.html:200
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:201
+msgid "View Logs"
+msgstr ""
+
+#: cps/templates/admin.html:204
+msgid "Reconnect Calibre Database"
+msgstr "ភ្ជាប់ទៅ database Calibre ម្តងទៀត"
+
+#: cps/templates/admin.html:207
+msgid "Restart"
+msgstr ""
+
+#: cps/templates/admin.html:208
+msgid "Shutdown"
+msgstr ""
+
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
+
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "រកមើលបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "ធ្វើបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "កំពុងធ្វើបច្ចុប្បន្នភាព សូមកុំបើកទំព័រជាថ្មី"
 
@@ -1620,39 +1717,39 @@ msgstr "តាមរយៈ"
 msgid "In Library"
 msgstr "នៅក្នុងបណ្ណាល័យ"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr ""
 
@@ -1660,165 +1757,166 @@ msgstr ""
 msgid "More by"
 msgstr "បន្ថែមទៀតដោយ"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "លុបសៀវភៅ"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "លុបឯកសារទម្រង់៖"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr ""
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr ""
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr ""
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr ""
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "ចំណងជើងសៀវភៅ"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "អ្នកនិពន្ធ"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "ពិពណ៌នា"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Tag"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "លេខសម្គាល់ស៊េរី"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "ការវាយតម្លៃ"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL របស់ក្របមុខ (ឯកសារ JPG ក្របមុខត្រូវបានទាញយក និងរក្សាទុកក្នុង database ក្រោយមកចន្លោះនេះទទេម្តងទៀត)"
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "ថ្ងៃបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "អ្នកបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "ភាសា"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "ទេ"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "ទម្រង់អាប់ឡូដ"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "មើលសៀវភៅក្រោយពីកែប្រែ"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "ពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr "ស្វែងរកពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិន្នន័យមេតាទៅក្នុង form"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "កំពុងដំណើរការ..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "បិទ"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "ប្រភព"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "ការស្វែងរកមានកំហុស!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1926,6 +2024,7 @@ msgid "Enter "
 msgstr "ចុះឈ្មោះ"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr ""
 
@@ -2339,62 +2438,62 @@ msgstr ""
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "អានក្នុងកម្មវិធី browser"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "អាន"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "ពិពណ៌នា"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "បន្ថែមទៅធ្នើ"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
@@ -2438,7 +2537,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr "រក្សាទុកការកំណត់រួចផ្ញើអ៊ីមែលសាកល្បង"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "មកក្រោយ"
@@ -2464,7 +2563,7 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "បន្ទាប់"
 
@@ -2476,6 +2575,10 @@ msgstr ""
 msgid "Kobo Token:"
 msgstr ""
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
@@ -2492,29 +2595,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2578,7 +2681,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2587,63 +2690,67 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "បិទ/បើកការរុករក"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "កំពុងអាប់ឡូត..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr ""
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "ការកំណត់"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "ចេញពីការប្រើប្រាស់"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "រុករក"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "អំពី"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "មុន"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "ព័ត៌មានលម្អិតរបស់សៀវភៅ"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "ចងចាំខ្ញុំ"
@@ -2748,7 +2855,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "សៀវភៅ"
@@ -2926,15 +3033,23 @@ msgstr "ក្រោយពីនេះ អ្នកនឹងត្រូវប
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/search.html:5
-msgid "No Results Found"
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
 msgstr ""
 
 #: cps/templates/search.html:6
+msgid "No Results Found"
+msgstr ""
+
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr ""
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "លទ្ធផលសម្រាប់៖"
 
@@ -2987,23 +3102,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "លុបធ្នើនេះ"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3048,8 +3163,8 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Library របស់កម្មវិធី"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3079,6 +3194,18 @@ msgstr "រយៈពេលដែលបានចាប់ផ្តើម"
 msgid "Start Time"
 msgstr "ពេលចាប់ផ្តើម"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr ""
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index e85e672069dc80a232b18b1e4b716fa073e9ec7d..8677965b692205e9f54cf4d18ecc464a4a31e06d 100644
GIT binary patch
delta 11960
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

delta 12025
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

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 31402b0fa..f7c874879 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -15,585 +15,610 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "통계"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "서버 다시 시작으로 새로고침 필요"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "서버를 종료하는 중, 창을 닫아야 함"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "재연결 성공"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "알 수 없는 명령"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "관리자 페이지"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "기본 설정"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "UI 설정"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "사용자 관리"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "모두"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "사용자를 찾을 수 없음"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "{} 사용자를 성공적으로 삭제함"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "모두 보기"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "잘못된 요청"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "Guest 이름은 수정할 수 없음"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "Guest는 이 권한을 사용할 수 없음"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr "관리자 계정이 하나 뿐일 때는 관리자를 삭제할 수 없음"
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "값으로 rue 또는 false만 설정 가능"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "잘못된 권한"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "Guest는 이 view를 사용할 수 없음"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "잘못된 view"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Guest의 로케일은 자동으로 결정되며 설정할 수 없음"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "유효한 로케일이 아님"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "제공된 책의 언어가 유효하지 않음"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "매개변수를 찾을 수 없음"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr "잘못된 읽기 열"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr "잘못된 제한된 열"
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web 설정이 업데이트 됨"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Kobo Token을 삭제하시겠습니까?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "이 도메인을 삭제하시겠습니까?"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "이 사용자를 삭제하시겠습니까?"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "이 서재를 삭제하시겠습니까?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "선택한 사용자의 언어를 변경하시겠습니까?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "선택한 사용자에 대해 표시되는 책 언어를 변경하시겠습니까?"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "선택한 사용자에 대해 선택한 권한을 변경하시겠습니까?"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "선택한 사용자에 대해 선택한 제한을 변경하시겠습니까?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "선택한 사용자에 대해 선택한 가시성 제한을 변경하시겠습니까?"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "선택한 사용자의 실행기 동기화 동작을 변경하시겠습니까?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "캘리버 서재의 언어를 변경하시겠습니까?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Kobo Reader와 전체 동기화를 강제 실행하기 위해 Calibre-Web의 동기화 데이터베이스를 삭제하시겠습니까?"
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr "태그를 찾을 수 없음"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "잘못된 액션"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "거부됨"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "허용됨"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr "{} 동기화 항목이 삭제됨"
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr "태그를 찾을 수 없음"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "잘못된 액션"
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json이 Web 응용프로그램에 대해 설정되지 않음"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "로그 파일 위치가 오류. 올바른 경로 입력 필요"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "액세스 로그 파일 위치가 올바르지 않음. 올바른 경로 입력 필요"
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "LDAP 공급자, 포트, DN 및 사용자 개체 식별자를 입력"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "LDAP 서비스 계정 및 비밀번호를 입력하십시오"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr "LDAP 서비스 계정을 입력하십시오"
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP 그룹 개체 필터에는 하나의 \"%s\" 형식 식별자가 필요함"
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP 그룹 개체 필터에 일치하지 않는 괄호가 있음"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP 사용자 개체 필터에는 하나의 \"%s\" 형식 식별자 필요"
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP 사용자 개체 필터에 일치하지 않는 괄호가 있음"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP 구성원 사용자 필터에는 하나의 \"%s\" 형식 식별자 필요"
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP 구성원 사용자 필터에 일치하지 않는 괄호가 있음"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "유요하지 않은 LDAP CACertificate, 인증서 또는 키 위치. 올바른 경로를 입력 필요"
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "새 사용자 추가"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "이메일 서버 설정 편집"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr "Gmail 계정 인증 성공"
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "데이터베이스 오류: %(error)s."
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "올바르지 않은 DB 위치. 올바른 경로 입력 필요"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "쓰기 권한이 없는 DB"
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "올바르지 않은 키 파일 위치. 올바른 경로 입력 필요"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "올바르지 않은 인증서 파일 위치. 올바른 경로 입력 필요"
-
-#: cps/admin.py:1378
-msgid "Database Settings updated"
-msgstr "데이터베이스 설정이 업데이트 되었습니다"
-
-#: cps/admin.py:1386
-msgid "Database Configuration"
-msgstr "데이터베이스 구성"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "모든 필드를 채워주십시오!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "유효한 도메인에서 온 이메일이 아니"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "새 사용자 추가"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "사용자 '%(user)s'이(가) 생성됨"
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "사용자 '%(nick)s'이(가) 삭제됨"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr "게스트 사용자는 삭제할 수 없습니다"
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "관리자 계정이 하나 뿐일 때는 관리자 권한을 삭제할 수 없음"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "사용자 %(nick)s 편집"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "사용자 '%(nick)s'가 업데이트 됨"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "이메일 서버 설정 편집"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr "Gmail 계정 인증 성공"
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "%(email)s에 테스트를 위한 이메일을 보냄. 결과 확인 필요"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "테스트 이메일을 보내는 동안 오류가 발생했습니다: %(res)s"
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "먼저 이메일 주소를 구성하십시오..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "이메일 서버 설정 업데이트됨"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "사용자 %(nick)s 편집"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "사용자 %(user)s의 비밀번호 재설정"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "로그 파일 뷰어"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "업데이트 패키지 요청"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "업데이트 패키지 다운로드"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "업데이트 패키지 압축 풀기"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "파일 교체"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "데이터베이스 연결이 닫힙니다"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "서버 중지"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "업데이트가 완료되었습니다. 확인을 누르고 페이지를 새로고침하세요"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "업데이트 실패:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP 오류"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "연결 오류"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "연결 설정 중 시간 초과"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "일반 오류"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr "임시 디렉토리에 업데이트 파일을 저장할 수 없습니다"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr "업데이트하는 동안 파일을 교체할 수 없습니다"
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr "하나 이상의 LDAP 사용자를 추출하지 못했습니다"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "하나 이상의 LDAP 사용자를 생성하지 못했습니다"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "오류: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "오류: LDAP 서버의 응답으로 사용자가 반환되지 않았습니다"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "데이터베이스에서 하나 이상의 LDAP 사용자를 찾을 수 없습니다"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} 사용자 가져오기 성공"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "올바르지 않은 DB 위치. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "쓰기 권한이 없는 DB"
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "올바르지 않은 키 파일 위치. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "올바르지 않은 인증서 파일 위치. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1814
+msgid "Database Settings updated"
+msgstr "데이터베이스 설정이 업데이트 되었습니다"
+
+#: cps/admin.py:1822
+msgid "Database Configuration"
+msgstr "데이터베이스 구성"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "모든 필드를 채워주십시오!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "유효한 도메인에서 온 이메일이 아니"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "사용자 '%(user)s'이(가) 생성됨"
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "사용자 '%(nick)s'이(가) 삭제됨"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr "게스트 사용자는 삭제할 수 없습니다"
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "관리자 계정이 하나 뿐일 때는 관리자 권한을 삭제할 수 없음"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "사용자 '%(nick)s'가 업데이트 됨"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "설치되지 않음"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "실행 권한 누락"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다"
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "None"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "책 형식이 성공적으로 삭제되었습니다"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "책이 성공적으로 삭제되었습니다"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다"
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "메타데이터 편집"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s은(는) 유효한 숫자가 아닙니다. 건너뜁니다"
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "'%(langname)s'은(는) 유효한 언어가 아닙니다"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "파일 확장자 '%(ext)s'은(는) 이 서버에 업로드할 수 없습니다"
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "업로드할 파일에는 확장자가 있어야 합니다"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "%(path)s 경로를 생성하지 못했습니다(권한이 없음)."
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "%(file)s 파일을 저장하지 못했습니다."
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "파일 형식 %(ext)s이(가) %(book)s에 추가되었습니다"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "식별자는 대소문자를 구분하지 않으며 이전 식별자를 덮어씁니다"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "메타데이터가 성공적으로 업데이트되었습니다"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "업로드한 책이 라이브러리에 있을 수 있음. 새로 업로드하기 전에 확인 필요: "
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr "파일 %(filename)s을(를) 임시 디렉토리에 저장할 수 없습니다"
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "표지 파일%(file)s를 이동하지 못했습니다.:%(error)s"
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "파일 %(file)s 업로드됨"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "변환을 위한 소스 또는 대상 형식이 누락되었습니다"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "책이 %(book_format)s(으)로 변환하기 위해 대기 중입니다"
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "이 책을 변환하는 동안 오류가 발생했습니다: %(res)s"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "업로드한 책이 라이브러리에 있을 수 있음. 새로 업로드하기 전에 확인 필요: "
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s'은(는) 유효한 언어가 아닙니다"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "파일 확장자 '%(ext)s'은(는) 이 서버에 업로드할 수 없습니다"
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "업로드할 파일에는 확장자가 있어야 합니다"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "파일 %(filename)s을(를) 임시 디렉토리에 저장할 수 없습니다"
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "표지 파일%(file)s를 이동하지 못했습니다.:%(error)s"
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "책 형식이 성공적으로 삭제되었습니다"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "책이 성공적으로 삭제되었습니다"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "메타데이터 편집"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s은(는) 유효한 숫자가 아닙니다. 건너뜁니다"
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "%(path)s 경로를 생성하지 못했습니다(권한이 없음)."
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "%(file)s 파일을 저장하지 못했습니다."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "파일 형식 %(ext)s이(가) %(book)s에 추가되었습니다"
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Google 드라이브 설정이 완료되지 않았습니다. Google 드라이브를 비활성화했다가 다시 활성화해 보세요"
@@ -602,27 +627,27 @@ msgstr "Google 드라이브 설정이 완료되지 않았습니다. Google 드
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "콜백 도메인이 확인되지 않았습니다. 단계에 따라 Google 개발자 콘솔에서 도메인을 확인하세요"
 
-#: cps/helper.py:81
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "책 ID에 대한 %(format)s 형식을 찾을 수 없음: %(book)d"
 
-#: cps/helper.py:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s을(를) Google 드라이브에서 찾을 수 없음: %(fn)s"
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s을(를) 찾을 수 없음: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "킨들로 보내기"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "이 이메일은 Calibre Web을 통해 전송되었습니다."
 
@@ -662,131 +687,111 @@ msgstr "%(book)s을 킨들로 보내기"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "요청한 파일을 읽을 수 없습니다. 올바른 권한인가요?"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "책 %(id)s에 대한 책 폴더를 삭제하지 못했습니다. 경로에 하위 폴더가 있습니다: %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "%(id)s 도서 삭제 실패: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "데이터베이스에서만 책 %(id)s 을(를) 삭제 중, 데이터베이스의 책 경로가 유효하지 않음: %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google 드라이브에서 %(file)s 파일을 찾을 수 없습니다"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다"
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr "등록되어 있는 이메일 주소입니다"
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "등록되어 있는 username입니다"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "이메일 주소 형식이 잘못되었습니다"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "표지 다운로드 중 오류 발생"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "표지 형식 오류"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "표지 경로 생성 실패"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "표지 파일이 유효한 이미지 파일이 아니거나 저장할 수 없습니다"
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "표지는 jpg/jpeg/png/webp/bmp 파일만 지원됩니다"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr "잘못된 표지 파일 콘텐츠"
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "표지 파일로 jpg/jpeg 파일만 지원됩니다"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "Unrar 바이너리 파일을 찾을 수 없습니다"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "UnRar 실행 오류"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "대기중"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "실패"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "시작됨"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "종료"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "알 수 없는 상태"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr "코보(kobo) 장치에 대한 유효한 api_endpoint를 얻으려면 로컬 호스트가 아닌 곳에서 calibre-web에 액세스하십시오"
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Kobo 설정"
 
@@ -795,7 +800,7 @@ msgstr "Kobo 설정"
 msgid "Register with %(provider)s"
 msgstr "%(provider)s에 등록"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
@@ -856,12 +861,12 @@ msgstr "Google 인증 오류입니다. 나중에 다시 시도하세요."
 msgid "Google Oauth error: {}"
 msgstr "Google 인증 오류: {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} Stars"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "로그인"
 
@@ -877,454 +882,487 @@ msgstr "토큰이 만료되었습니다"
 msgid "Success! Please return to your device"
 msgstr "성공! 기기로 돌아가주세요"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "책"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "최근 책 보기"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "인기있는 책"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "주목받는 책 보기"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "다운로드된 책"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "다운로드된 책 보기"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "평점이 높은 책"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "평점이 높은 책 보기"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "읽은 책"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "읽은 책과 읽지 않은 책 보기"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "읽지 않은 책"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "읽지 않은 책 보기"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "발견"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "무작위 추천"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "카테고리"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "카테고리별 보기"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "시리즈"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "시리즈별 보기"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "저자"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "저자별 보기"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "출판사"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "출판사별 보기"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "언어"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "언어별 보기"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "평점"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "평점별 보기"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "파일 유형"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "파일 유형별 보기"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "보관된 책"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "보관된 책 보기"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "책 목록"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "책 목록 보기"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "잘못된 책장 지정"
-
-#: cps/shelf.py:73
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "죄송합니다. 해당 책장에 책을 추가할 권한이 없습니다"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "책이 이미 책장에 등록됨: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "책장에 책이 등록됨: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr "책장에 책을 추가할 권한이 없습니다"
-
-#: 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:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "책장에 책을 추가할 수 없음: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "책이 책장에서 삭제됨: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다"
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "책장 추가"
-
-#: cps/shelf.py:236
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "죄송합니다. 이 책장을 편집할 권한이 없습니다"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "책장 편집"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr "죄송합니다. 이 공개 책장을 만들 권한이 없습니다"
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "%(title)s 책장이 추가됨"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "%(title)s 책장이 변경됨"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "오류가 발생하였습니다"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "이름이 '%(title)s'인 공개 책장이 이미 있습니다."
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "이름이 '%(title)s'인 개인 책장이 이미 있습니다."
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "책이 성공적으로 삭제되었습니다"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "책장 순서 변경: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "책장: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "업데이트 정보를 읽는 동안 예기치 않은 데이터"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "업데이트가 없습니다. 이미 최신 버전이 설치되어 있습니다"
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr "업데이트 정보를 가져올 수 없습니다"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "출시 정보가 없습니다"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "발견(무작위 도서)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "인기있는 책(가장 많이 다운로드됨)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "%(user)s이(가) 다운로드한 책"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "저자: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "출판사: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "시리즈: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "평가: %(rating)s 별"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "파일 유형: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "카테고리: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "언어: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "상세 검색"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "검색"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "다운로드"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "평점 목록"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "파일 유형 목록"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "작업"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Published after "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Published before "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "평점 <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "평점 >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "읽은 상태 = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오"
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "상세 검색"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "잘못된 책장 지정"
+
+#: cps/shelf.py:55
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "죄송합니다. 해당 책장에 책을 추가할 권한이 없습니다"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "책이 이미 책장에 등록됨: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "책장에 책이 등록됨: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr "책장에 책을 추가할 권한이 없습니다"
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "책장에 이미 책이 등록됨:  %(name)s"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "책이 책장에 등록됨: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "책장에 책을 추가할 수 없음: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "책이 책장에서 삭제됨: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다"
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "책장 추가"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "죄송합니다. 이 책장을 편집할 권한이 없습니다"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "책장 편집"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "책이 성공적으로 삭제되었습니다"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "책장 순서 변경: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "죄송합니다. 이 공개 책장을 만들 권한이 없습니다"
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "%(title)s 책장이 추가됨"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "%(title)s 책장이 변경됨"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "오류가 발생하였습니다"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 공개 책장이 이미 있습니다."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 개인 책장이 이미 있습니다."
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "책장: '%(name)s'"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "작업"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "대기중"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "실패"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "시작됨"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "종료"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "알 수 없는 상태"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "업데이트 정보를 읽는 동안 예기치 않은 데이터"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "업데이트가 없습니다. 이미 최신 버전이 설치되어 있습니다"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "업데이트 정보를 가져올 수 없습니다"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "출시 정보가 없습니다"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "발견(무작위 도서)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "인기있는 책(가장 많이 다운로드됨)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "%(user)s이(가) 다운로드한 책"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "저자: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "출판사: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "시리즈: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "평가: %(rating)s 별"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "파일 유형: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "카테고리: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "언어: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "다운로드"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "평점 목록"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "파일 유형 목록"
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다"
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "책을 보내는 중에 오류 발생: %(res)s"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "등록"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "이메일을 등록할 수 없습니다"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "확인을 위한 이메일이 발송되었습니다."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP 인증을 활성화할 수 없습니다"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "로그인 실패: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "잘못된 사용자명 또는 비밀번호"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "새 비밀번호가 이메일로 전송되었습니다"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "다음 사용자로 로그인: '%(nickname)s"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 프로필"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "프로필이 업데이트 됨"
 
@@ -1332,40 +1370,75 @@ msgstr "프로필이 업데이트 됨"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "인증 정보가 포함된 유효한 gmail.json 파일을 찾을 수 없습니다"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre ebook-convert %(tool)s을(를) 찾을 수 없습니다"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s 형식을 찾을 수 없습니다"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "알 수 없는 오류로 인해 전자책 변환이 실패했습니다"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 변환 실패: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "변환된 파일을 찾을 수 없거나 %(folder)s 폴더에 하나 이상의 파일이 존재합니다"
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "\"전자책 변환 실패: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "오류로 인한 Calibre 실패: %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "업로드"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "사용자"
@@ -1385,7 +1458,7 @@ msgstr "이메일 주소"
 msgid "Send to Kindle E-mail Address"
 msgstr "킨들로 보내기 이메일 주소"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "관리자"
@@ -1395,13 +1468,8 @@ msgstr "관리자"
 msgid "Password"
 msgstr "비밀번호"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "업로드"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "다운로드"
@@ -1415,7 +1483,7 @@ msgstr "책 보기"
 msgid "Edit"
 msgstr "편집"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1527,78 +1595,107 @@ msgstr "기본 환경 설정 편집"
 msgid "Edit UI Configuration"
 msgstr "UI 환경 설정 편집"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "관리"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "Debug Package 다운로드"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "로그 보기"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Calibre DB 다시 연결"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "재시작"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "종료"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "업데이트"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "버전"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "세부 정보"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "현재 버전"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "업데이트 확인"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "업데이트 실행"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "재시작을 하시겠습니까?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "예"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "취소"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "종료를 하시겠습니까?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
 
@@ -1610,39 +1707,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "In Library"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "책 목록 정렬, 최신순"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "책 목록 정렬, 오래된 순"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "가나다 순 정렬"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "가나다 역순 정렬"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "발행일 순으로 정렬, 최신순"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "발행일 순으로 정렬, 오래된 순"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "reduce"
 
@@ -1650,164 +1747,165 @@ msgstr "reduce"
 msgid "More by"
 msgstr "More by"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "책 삭제"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "유형 삭제:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "책 유형 변경:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "변경전 유형:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "옵션 선택"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "변경후 유형:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "책 변경"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "책 제목"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "저자"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "책 소개"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "식별자"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "식별자 유형"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "식별자 값"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "삭제"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "식별자 추가"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "태그"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "시리즈 ID"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "평점"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL로 표지 추가(JPEG - 이미지를 다운로드 하여 DB에 저장합니다)"
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "로컬 디스크에서 표지 업로드"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "출간일"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "출판사"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "언어"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "예"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "아니오"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "업로드 유형"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "저장 후 책 보기"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "메타정보 가져오기"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "저장"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "키워드"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 msgid "Search keyword"
 msgstr "키워드 검색"
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "표지를 클릭하여 양식에 메타데이터 로드"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "불러오는 중..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "닫기"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "출처"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "오류 검색!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "검색 결과가 없습니다! 다른 키워드를 시도하십시오."
 
@@ -1914,6 +2012,7 @@ msgid "Enter "
 msgstr "입력 "
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "정말 확신합니까?"
 
@@ -2325,62 +2424,62 @@ msgstr "허용/거부 태그 추가"
 msgid "Add Allowed/Denied custom column values"
 msgstr "허용/거부 사용자 정의 열 값 추가"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "부라우저에서 보기"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "브라우저에서 듣기"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "책 %(index)s의 %(range)s"
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "출간일"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "읽지 않은 상태로 표시"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "읽은 상태로 표시"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "읽기"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "아카이브에서 복원"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "아카이브에 추가"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "보관됨"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "설명:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "서재에 추가"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(공개)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "메타저오 편집"
 
@@ -2424,7 +2523,7 @@ msgstr "첨부 파일 크기 제한"
 msgid "Save and Send Test E-mail"
 msgstr "저장 후 테스트 이메일 보내기"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "뒤로"
@@ -2450,7 +2549,7 @@ msgstr "도메인 입력"
 msgid "Denied Domains (Blacklist)"
 msgstr "거부 도메인(블랙리스트)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "다음"
 
@@ -2463,6 +2562,10 @@ msgstr "텍스트 편집기에서 .kobo/Kobo eReader.conf 파일을 열고 다
 msgid "Kobo Token:"
 msgstr "코보 연동 토큰"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Web Instance가 구성되지 않았습니다. 관리자에게 문의"
@@ -2479,29 +2582,29 @@ msgstr "홈으로"
 msgid "Logout User"
 msgstr "로그아웃"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr "다운로드 횟수에 따라 오름차순 정렬"
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr "다운로드 횟수에 따라 내림차순 정렬"
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "저자를 가나다순(알파벳순)으로 정렬"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "저자를 가나다(알파벳) 역순으로 정렬"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "시리즈 인덱스에 따라 오름차순 정렬"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "시리즈 인덱스에 따라 내림차순 정렬"
 
@@ -2565,7 +2668,7 @@ msgstr "평점별 정렬"
 msgid "Books ordered by file formats"
 msgstr "파일 종류별 정렬"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "서재"
@@ -2574,63 +2677,67 @@ msgstr "서재"
 msgid "Books organized in shelves"
 msgstr "서재별 정렬"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "홈"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "탐색 활성화"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "검색"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "업로드 중..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "오류"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "설정"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "계정"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "로그아웃"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "페이지를 새로고침 하지 마세요"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "탐색"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "서재 정보"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "이전"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "책 상세정보"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "로그인 유지"
@@ -2735,7 +2842,7 @@ msgstr "상위 폴더"
 msgid "Select"
 msgstr "선택"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 msgid "Ok"
 msgstr "Ok"
 
@@ -2911,15 +3018,23 @@ msgstr "승인이 되면 이 장치에 자동으로 로그인됩니다."
 msgid "This verification link will expire in 10 minutes."
 msgstr "이 확인 링크는 10분 후에 만료됩니다."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "결과 없음"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "검색어:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "결과:"
 
@@ -2971,23 +3086,23 @@ msgstr "부터:"
 msgid "To:"
 msgstr "까지:"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "이 서재 삭제"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "서재 속성 편집"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "수동으로 책 정렬"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "정렬 변경 비활성화"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "정렬 변경 활성화"
 
@@ -3032,8 +3147,8 @@ msgid "System Statistics"
 msgstr "시스템 통계"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "서재 프로그램"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3063,6 +3178,18 @@ msgstr "실행 시간"
 msgid "Start Time"
 msgstr "시작 시간"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "사용자 비밀번호 초기화"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 589137d98382b5ae3e7aa3c4c49285bd086fda62..a9dbabf358ead1e741c59bef6370ea8bdfb90ba6 100644
GIT binary patch
delta 11167
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
V%IU9$wyfN>?Yp4L6$dwX{U33f>CpfH

delta 11239
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
bBSwra9lYWDP~Q%Pqo$0QP@27ez0dyucxMOi

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index a8bd86322..ff4de940f 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -17,595 +17,620 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "De server is herstart, vernieuw de pagina"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met het afsluiten van de server, sluit het venster"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Opnieuw verbinden gelukt"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Systeembeheer"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Basisconfiguratie"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Uiterlijk aanpassen"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Systeembeheerder"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Alles"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "{} gebruikers succesvol verwijderd"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Alle talen"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "Misvormd verzoek"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "Gast naam kan niet worden veranderd"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "Gast kan deze rol niet hebben"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "Waarde moet Waar of Onwaar zijn"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "Ongeldige rol"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "Gast kan dit niet bekijken"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "Ongeldige waarde"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Gasts locale is automatisch bepaald en kan niet handmatig worden ingesteld"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "Geen geldige locale is opgegeven"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "Geen geldige boek taal is opgegeven"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "Parameter is niet gevonden"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr "Ongeldige gelezen kolom"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr "Ongeldige beperkte kolom"
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Wil je je Kobo Token echt verwijderen?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "Wil je dit domein echt verwijderen?"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "Wil je deze gebruiker echt verwijderen?"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Weet je zeker dat je deze boekenplank wilt verwijderen?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Weet je zeker dat je de locales van de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Weet je zeker dat je de zichtbare talen voor de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Weet je zeker dat je de geselecteerde rol van de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Weet je zeker dat je de geselecteerde beperkingen voor de geselecteerde gebruikers(s) wil verwijderen?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Weet je zeker dat je de geselecteerde zichtbaarheidsbeperkingen voor de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Weet je zeker dat je de synchronisatiegedrag van boekenplanken voor de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Weet je zeker dat je de locatie van de Calibre-bibliotheek wil veranderen?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr "Tag niet gevonden"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "Ongeldige actie"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Weigeren"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Toestaan"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr "Tag niet gevonden"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "Ongeldige actie"
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json is niet geconfigureerd voor webapplicatie"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 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:1110
+#: cps/admin.py:1131
 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:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Voer alsjeblieft een LDAP Provider, Port, DN en User Object Identifier in"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Voer een geldig LDAP Service Account en wachtwoord in"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr "Voer een LDAP Service Account in"
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Groep Object Filter Moet Een \"%s\" Formaat Identificiatie hebben"
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Groep Object Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Gebruiker Object Filter moet \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Lid Gebruiker Filter moet een \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Lid Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsjeblieft een geldig pad in."
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Gebruiker toevoegen"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "SMTP-instellingen bewerken"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr "Gmail Account succesvol geverifieerd"
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "Database niet gevonden, voer de juiste locatie in"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "Kan niet schrijven naar database"
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "SSL-sleutellocatie is niet geldig, voer een geldig pad in"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "SSL-certificaatlocatie is niet geldig, voer een geldig pad in"
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "E-mailserver-instellingen bijgewerkt"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Databaseconfiguratie"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Vul alle velden in!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "Het e-mailadres bevat geen geldige domeinnaam"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Gebruiker toevoegen"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Gebruiker '%(user)s' aangemaakt"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Gebruiker '%(nick)s' verwijderd"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr "Kan Gast gebruiker niet verwijderen"
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "Kan laatste systeembeheerder niet verwijderen"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Gebruiker '%(nick)s' bewerken"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Gebruiker '%(nick)s' bijgewerkt"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "SMTP-instellingen bewerken"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr "Gmail Account succesvol geverifieerd"
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail wordt verzonden naar %(email)s, controleer de taken voor het resultaat"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Gebruiker '%(nick)s' bewerken"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mislukt om minstens een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Het is niet gelukt tenminste een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fout: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fout: No user returned in response of LDAP server"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minstens een LDAP Gebruiker is niet gevonden in de Database"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} Gebruiker succesvol geïmporteerd"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "Database niet gevonden, voer de juiste locatie in"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "Kan niet schrijven naar database"
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "SSL-sleutellocatie is niet geldig, voer een geldig pad in"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "SSL-certificaatlocatie is niet geldig, voer een geldig pad in"
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "E-mailserver-instellingen bijgewerkt"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Databaseconfiguratie"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Vul alle velden in!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "Het e-mailadres bevat geen geldige domeinnaam"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Gebruiker '%(user)s' aangemaakt"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Gebruiker '%(nick)s' verwijderd"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr "Kan Gast gebruiker niet verwijderen"
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "Kan laatste systeembeheerder niet verwijderen"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Gebruiker '%(nick)s' bijgewerkt"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "niet geïnstalleerd"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Geen"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Het boekformaat is verwijderd"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Het boek is verwijderd"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "metagegevens bewerken"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s is geen geldig nummer, sla het over"
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s is geen geldige taal"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Kan %(file)s niet opslaan."
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identificatoren zijn niet hoofdlettergevoelig, overschrijf huidige identificatoren"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "De metagegevens zijn bijgewerkt"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-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:1041
-#, 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:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "Omslag %(file)s niet verplaatst: %(error)s"
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Bestand %(file)s geüpload"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Bron- of doelformaat ontbreekt voor conversie"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, 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"
 
+#: cps/editbooks.py:630
+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:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s is geen geldige taal"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
+
+#: cps/editbooks.py:735
+#, 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:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "Omslag %(file)s niet verplaatst: %(error)s"
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Het boekformaat is verwijderd"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Het boek is verwijderd"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "metagegevens bewerken"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s is geen geldig nummer, sla het over"
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Kan %(file)s niet opslaan."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
+
 #: cps/gdrive.py:58
 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"
@@ -614,27 +639,27 @@ msgstr "Het instellen van Google Drive is niet afgerond, heractiveer Google Driv
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Het callback-domein is niet geverifieerd. Volg de stappen in de Google-ontwikkelaarsconsole om het domein te verifiëren"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s niet gevonden %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Versturen naar Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Deze e-mail is verstuurd via Calibre-Web."
 
@@ -674,132 +699,112 @@ msgstr "%(book)s verzonden naar Kindle"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Het opgevraagde bestand kan niet worden gelezen. Ben je hiertoe gemachtigd?"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Het verwijderen van de boekenmap voor boek %(id)s is mislukt, het pad heeft submappen: %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Verwijderen van boek %(id)s mislukt: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Verwijder boek %(id)s alleen uit database, boek pad is ongeldig: %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan de titel '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
 
-#: cps/helper.py:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan de titel '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
 
-#: cps/helper.py:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is al in gebruik"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "Ongeldig E-Mail adres"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Fout bij downloaden omslag"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Onjuist omslagformaat"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Locatie aanmaken voor omslag mislukt"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 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:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Alleen jpg/jpeg/png/webp/bmp bestanden worden ondersteund als omslag"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Alleen jpg/jpeg bestanden zijn toegestaan als omslag"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "Unrar executable niet gevonden"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Fout bij het uitvoeren van Unrar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Wachten"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Mislukt"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Gestart"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Voltooid"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Onbekende status"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Kobo Instellen"
 
@@ -808,7 +813,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -869,12 +874,12 @@ msgstr "Google OAuth fout, probeer het later nog eens."
 msgid "Google Oauth error: {}"
 msgstr "Google OAuth foutmelding: {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} sterren"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Inloggen"
 
@@ -890,456 +895,489 @@ msgstr "Toegangssleutel is verlopen"
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Boeken"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Recent toegevoegde boeken tonen"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Populaire boeken"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Populaire boeken tonen"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "Gedownloade boeken"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "Gedownloade boeken tonen"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Ongelezen boeken tonen"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Willekeurige boeken"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Categorieën"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Categoriekeuze tonen"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Boekenreeksen"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Boekenreeksenkeuze tonen"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Auteurs"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Uitgevers"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Uitgeverskeuze tonen"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Talen"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Taalkeuze tonen"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Beoordelingen"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Beoordelingen tonen"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Bestandsformaten"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Gearchiveerde boeken tonen"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "Boekenlijst"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "Boekenlijst tonen"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Ongeldige boekenplank opgegeven"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Sorry, je mag geen boeken toevoegen aan boekenplank: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, 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:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Het boek is toegevoegd aan boekenplank: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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: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
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Kan boeken niet toevoegen aan boekenplank: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Het boek is verwijderd van boekenplank: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Boekenplank maken"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Je bent niet gemachtigd deze boekenplank aan te passen"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Pas een boekenplank aan"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Boekenplank '%(title)s' aangemaakt"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Boekenplank '%(title)s' is aangepast"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Er is een fout opgetreden"
-
-#: cps/shelf.py:304
-#, 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:315
-#, 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:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Het boek is verwijderd"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Volgorde van boekenplank veranderen: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Boekenplank: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Onverwachte gegevens tijdens het uitlezen van de update-informatie"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "Er is geen update beschikbaar."
-
-#: cps/updater.py:451
-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:469
-msgid "Could not fetch update information"
-msgstr "De update-informatie kan niet worden opgehaald"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr "Klik op de onderstaande knop om de laatste stabiele versie te installeren."
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Geen update-informatie beschikbaar"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Verkennen (willekeurige boeken)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Populaire boeken (meest gedownload)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "Gedownloade boeken door %(user)s"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Auteur: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Uitgever: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Reeks: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Beoordeling: %(rating)s sterren"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Bestandsformaat: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Categorie: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Taal: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Geavanceerd zoeken"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Downloads"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Beoordelingen"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Alle bestandsformaten"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Taken"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lees Status = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Geavanceerd zoeken"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Ongeldige boekenplank opgegeven"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Sorry, je mag geen boeken toevoegen aan boekenplank: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, 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:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Het boek is toegevoegd aan boekenplank: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, 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:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "De boeken zijn toegevoegd aan boekenplank: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Kan boeken niet toevoegen aan boekenplank: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Het boek is verwijderd van boekenplank: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Boekenplank maken"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Je bent niet gemachtigd deze boekenplank aan te passen"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Pas een boekenplank aan"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Het boek is verwijderd"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Volgorde van boekenplank veranderen: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Boekenplank '%(title)s' aangemaakt"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Boekenplank '%(title)s' is aangepast"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Er is een fout opgetreden"
+
+#: cps/shelf.py:369
+#, 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:380
+#, 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:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Boekenplank: '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Taken"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Wachten"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Mislukt"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Gestart"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Voltooid"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Onbekende status"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Onverwachte gegevens tijdens het uitlezen van de update-informatie"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Er is geen update beschikbaar."
+
+#: cps/updater.py:456
+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:474
+msgid "Could not fetch update information"
+msgstr "De update-informatie kan niet worden opgehaald"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Klik op de onderstaande knop om de laatste stabiele versie te installeren."
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Geen update-informatie beschikbaar"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Verkennen (willekeurige boeken)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Populaire boeken (meest gedownload)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Gedownloade boeken door %(user)s"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Auteur: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Uitgever: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Reeks: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Beoordeling: %(rating)s sterren"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Bestandsformaat: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Categorie: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Taal: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Downloads"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Beoordelingen"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Alle bestandsformaten"
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, 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:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 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:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
@@ -1347,40 +1385,75 @@ msgstr "Profiel bijgewerkt"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Geen geldig gmail.json bestand gevonden met OAuth informatie"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre ebook-convert %(tool)s niet gevonden"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s formaat is niet gevonden op de schijf"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "E-Book converter mislukt met een onbekende foutmelding"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converteerder mislukt: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Omgezette bestand is niet gevonden of meer dan een bestand in map %(folder)s"
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-boek-conversie mislukt: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre mislukt met foutmelding: %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Uploaden"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Gebruikers"
@@ -1400,7 +1473,7 @@ msgstr "E-mailadres"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle-e-mailadres"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Beheer"
@@ -1410,13 +1483,8 @@ msgstr "Beheer"
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Uploaden"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Downloaden"
@@ -1430,7 +1498,7 @@ msgstr "Boeken lezen"
 msgid "Edit"
 msgstr "Bewerken"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1543,78 +1611,107 @@ msgstr "Bewerk basisconfiguratie"
 msgid "Edit UI Configuration"
 msgstr "Bewerk gebruikersinterface configuratie"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Systeembeheer"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "Download foutopsporingspakket"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Logboeken bekijken"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Opnieuw verbinden met Calibre database"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Calibre-Web herstarten"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Calibre-Web stoppen"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Bijwerken"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Versie"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Details"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Huidige versie"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Controleren op updates"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Update uitvoeren"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Weet je zeker dat je Calibre-Web wilt herstarten?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Oké"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Weet je zeker dat je Calibre-Web wilt stoppen?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Bezig met bijwerken, vernieuw de pagina niet"
 
@@ -1626,39 +1723,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "In bibliotheek"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "Sorteren op datum, nieuwste boeken eerst"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "Sorteren op datum, oudste boeken eerst"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "Sorteren op alfabetische volgorde"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sorteren op omgekeerde alfabetische volgorde"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "Sorteren op publicatiedatum, nieuwste boeken eerst"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sorteren op publicatiedatum, oudste boeken eerst"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "beperken"
 
@@ -1666,165 +1763,166 @@ msgstr "beperken"
 msgid "More by"
 msgstr "Meer van"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Boek verwijderen"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Formaten verwijderen:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Boekformaat converteren:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Converteren van:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "kies een optie"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Converteren naar:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Boek converteren"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Boektitel"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Omschrijving"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "Identificatoren"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "Identificatie type"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "Identificatie waarde"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "Identificator toevoegen"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Labels"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "Boekenreeks volgnummer"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 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:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Omslag uploaden vanaf de harde schijf"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Publicatiedatum"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Uitgever"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Taal"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nee"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Uploadformaat"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Boek inkijken na bewerking"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Metagegevens ophalen"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Opslaan"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Trefwoord"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Trefwoord zoeken "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 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:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Sluiten"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Bron"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Zoekfout!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Geen resultaten gevonden! Gebruik een ander trefwoord."
 
@@ -1933,6 +2031,7 @@ msgid "Enter "
 msgstr "Identificatoren"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Weet je het zeker?"
 
@@ -2347,62 +2446,62 @@ msgstr "Voeg toegestane/geweigerde tags toe"
 msgid "Add Allowed/Denied custom column values"
 msgstr "Voeg toegestane/geweigerde aangepaste kolomwaarden toe"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Lezen in webbrowser"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Luisteren in webbrowser"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Boek %(index)s van %(range)s"
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Gepubliceerd"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Markeren als ongelezen"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Markeren als gelezen"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Gelezen"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Terughalen uit archief"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Toevoegen aan archief"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Gearchiveerd"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Toevoegen aan boekenplank"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Openbaar)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Metagegevens bewerken"
 
@@ -2446,7 +2545,7 @@ msgstr "Bijlage bestandsgrootte limiet"
 msgid "Save and Send Test E-mail"
 msgstr "Opslaan en test-e-mail versturen"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Annuleren"
@@ -2472,7 +2571,7 @@ msgstr "Voer domeinnaam in"
 msgid "Denied Domains (Blacklist)"
 msgstr "Geweigerde domeinen voor registratie"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Volgende"
 
@@ -2485,6 +2584,10 @@ msgstr "Open het .kobo/Kobo eReader.conf bestand in een teksteditor en voeg toe
 msgid "Kobo Token:"
 msgstr "Kobo Sync Token"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2502,29 +2605,29 @@ msgstr "Terug naar startpagina"
 msgid "Logout User"
 msgstr "Gebruiker uitloggen"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "Auteurs sorteren op alfabetische volgorde"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Auteurs sorteren op omgekeerde alfabetische volgorde"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "Sorteer oplopend volgens de serie index"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "Sorteer aflopend volgens de serie index"
 
@@ -2588,7 +2691,7 @@ msgstr "Boeken gesorteerd op beoordeling"
 msgid "Books ordered by file formats"
 msgstr "Boeken gesorteerd op bestandsformaat"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Boekenplanken"
@@ -2597,63 +2700,67 @@ msgstr "Boekenplanken"
 msgid "Books organized in shelves"
 msgstr "Boeken georganiseerd op boekenplanken"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Startpagina"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Navigatie aanpassen"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Zoek in bibliotheek"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Bezig met uploaden..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Fout"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Instellingen"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Afmelden"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Deze pagina niet vernieuwen"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Verkennen"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informatie"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Vorige"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Boekgegevens"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Gegevens opslaan"
@@ -2758,7 +2865,7 @@ msgstr "Bovenliggende map"
 msgid "Select"
 msgstr "Selecteer"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Oké"
@@ -2940,15 +3047,23 @@ msgstr "Na controle wordt je automatisch op dit apparaat ingelogd."
 msgid "This verification link will expire in 10 minutes."
 msgstr "De link vervalt na 10 minuten."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Geen resultaten gevonden"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Zoekterm:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Resultaten voor:"
 
@@ -3001,23 +3116,23 @@ msgstr "Van:"
 msgid "To:"
 msgstr "Tot:"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Deze boekenplank verwijderen"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "Bewerk boekenplank eigenschappen"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "Boeken handmatig rangschikken"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "Schakel verandering van de volgorde uit"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "Schakel verandering van de volgorde in"
 
@@ -3062,8 +3177,8 @@ msgid "System Statistics"
 msgstr "Systeeminformatie"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Programmabibliotheek"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3093,6 +3208,18 @@ msgstr "Looptijd"
 msgid "Start Time"
 msgstr "Begintijd"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Gebruikerswachtwoord herstellen"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 9fa13572eb1f47b4e6a1ec732d4ee8d19d0032d4..f6526bdcdeaadd1d493d1c6b5a32f78b6132ea61 100644
GIT binary patch
delta 11167
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
XNpecb*zs=Dl5#uRgp~|9?(6#>94i2?

delta 11253
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

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index ce4898e64..065d91961 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -17,596 +17,621 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Ponowne połączenie zakończono sukcesem"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 # ???
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Panel administratora"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Konfiguracja podstawowa"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Konfiguracja Interfejsu"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Edytuj użytkowników"
 
 # ???
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Wszystko"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "{} użytkowników usuniętych pomyślnie"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Pokaż wszystkie"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "Nieprawidłowo sformułowane żądanie"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "Nazwa gościa nie może być zmieniona"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "Gość nie może pełnić tej roli"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 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:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "Wartość musi być prawdziwa lub fałszywa"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "Nieprawidłowa rola"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "Gość nie może tego zobaczyć"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "Nieprawidłowy widok"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Lokalizacja gościa jest określana automatycznie i nie można jej ustawić"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "Nie podano prawidłowej lokalizacji"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "Nie podano obowiązującego języka książki"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "Nie znaleziono parametru"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 #, fuzzy
 msgid "Invalid Read Column"
 msgstr "Nieprawidłowa kolumna odczytu"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 #, fuzzy
 msgid "Invalid Restricted Column"
 msgstr "Nieprawidłowa kolumna z ograniczeniami"
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Czy na pewno chcesz usunąć Token Kobo?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "Czy naprawdę chcesz usunąć tę domenę?"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "Czy naprawdę chcesz usunąć tego użytkownika?"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Czy na pewno chcesz usunąć półkę?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić ustawienia lokalne wybranego użytkownika(ów)?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić widoczne języki książek dla wybranego użytkownika (użytkowników)?"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić wybraną rolę dla wybranego użytkownika (użytkowników)?"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić wybrane ograniczenia dla wybranego użytkownika(ów)?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić wybrane ograniczenia widoczności dla wybranego użytkownika(ów)?"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić zachowanie synchronizacji półek dla wybranego użytkownika(ów)?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Czy na pewno chcesz zmienić lokalizację biblioteki Calibre?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-#, fuzzy
-msgid "Tag not found"
-msgstr "Nie znaleziono znacznika"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "Nieprawidłowe działanie"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zabroń"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Zezwalaj"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+#, fuzzy
+msgid "Tag not found"
+msgstr "Nie znaleziono znacznika"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "Nieprawidłowe działanie"
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json nie został skonfigurowany dla aplikacji webowej"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 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:1140
+#: cps/admin.py:1161
 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:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Proszę wprowadzić konto i hasło usługi LDAP"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr "Proszę wprowadzić konto usługi LDAP"
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, 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:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów grupy LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, 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:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów użytkownika LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr użytkownika członka LDAP musi mieć jedno \"%s\" identyfikator formatu"
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtr użytkownika członka LDAP ma niedopasowane nawiasy"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie jest prawidłowa, Proszę wprowadzić poprawną ścieżkę"
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Dodaj nowego użytkownika"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Zmień ustawienia SMTP"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "Lokalizacja bazy danych jest nieprawidłowa, wprowadź poprawną ścieżkę"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "Baza danych nie jest zapisywalna"
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ścieżkę"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
-
-#: cps/admin.py:1386
-msgid "Database Configuration"
-msgstr "Konfiguracja bazy danych"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Proszę wypełnić wszystkie pola!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "E-mail nie pochodzi z prawidłowej domeny"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Dodaj nowego użytkownika"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Użytkownik '%(user)s' został utworzony"
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Użytkownik '%(nick)s' został usunięty"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-#, fuzzy
-msgid "Can't delete Guest User"
-msgstr "Nie można usunąć użytkownika gościa"
-
-#: cps/admin.py:1469
-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:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Edytuj użytkownika %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Użytkownik '%(nick)s' został zaktualizowany"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Zmień ustawienia SMTP"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, fuzzy, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testowy e-mail czeka w kolejce do wysłania do %(email)s, sprawdź zadania, aby uzyskać wynik"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Edytuj użytkownika %(nick)s"
+
 # ???
-#: cps/admin.py:1679
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Błąd: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 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:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} Użytkownik pomyślnie zaimportowany"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "Lokalizacja bazy danych jest nieprawidłowa, wprowadź poprawną ścieżkę"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "Baza danych nie jest zapisywalna"
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ścieżkę"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
+
+#: cps/admin.py:1822
+msgid "Database Configuration"
+msgstr "Konfiguracja bazy danych"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Proszę wypełnić wszystkie pola!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "E-mail nie pochodzi z prawidłowej domeny"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Użytkownik '%(user)s' został utworzony"
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Użytkownik '%(nick)s' został usunięty"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+#, fuzzy
+msgid "Can't delete Guest User"
+msgstr "Nie można usunąć użytkownika gościa"
+
+#: cps/admin.py:1905
+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:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Użytkownik '%(nick)s' został zaktualizowany"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "nie zainstalowane"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, 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/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Brak"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Plik książki w wybranym formacie został usunięty"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Książka została usunięta"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "edytuj metadane"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s nie jest poprawną liczbą, pomijanie"
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s nie jest prawidłowym językiem"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Plik do wysłania musi mieć rozszerzenie"
-
-#: cps/editbooks.py:655
-#, 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:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Nie można zapisać pliku %(file)s."
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "Format pliku %(ext)s dodany do %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "W identyfikatorach nie jest rozróżniana wielkość liter, nadpisywanie starego identyfikatora"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Metadane zostały pomyślnie zaktualizowane"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-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:1041
-#, 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:1061
-#, 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:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Wysłano plik %(file)s"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Brak formatu źródłowego lub docelowego do konwersji"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Podczas konwersji książki wystąpił błąd: %(res)s"
 
+#: cps/editbooks.py:630
+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:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s nie jest prawidłowym językiem"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Plik do wysłania musi mieć rozszerzenie"
+
+#: cps/editbooks.py:735
+#, 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:755
+#, 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:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Plik książki w wybranym formacie został usunięty"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Książka została usunięta"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "edytuj metadane"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s nie jest poprawną liczbą, pomijanie"
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, 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:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Nie można zapisać pliku %(file)s."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Format pliku %(ext)s dodany do %(book)s"
+
 #: cps/gdrive.py:58
 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"
@@ -615,27 +640,27 @@ msgstr "Konfiguracja Google Drive nie została zakończona, spróbuj dezaktywowa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Zwrotna domena nie jest zweryfikowana, proszę zweryfikowania domenę w konsoli deweloperskiej google"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nie znaleziono: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Wyślij do Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Ten e-mail został wysłany za pośrednictwem Calibre-Web."
 
@@ -677,131 +702,111 @@ msgstr "Wyślij do Kindle"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Żądany plik nie mógł zostać odczytany. Może brakuje uprawnień?"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Usuwanie folderu książki dla książki %(id)s nie powiodło się, ścieżka ma podfoldery: %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, 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:393
+#: cps/helper.py:381
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Usuwanie książki %(id)s, ścieżka książki jest niepoprawna: %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Nie znaleziono pliku %(file)s na Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "Nieprawidłowy format adresu e-mail"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Błąd przy pobieraniu okładki"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Błędny format okładki"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Nie udało się utworzyć ścieżki dla okładki"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 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:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Jako plik okładki obsługiwane są tylko pliki jpg/jpeg/png/webp/bmp"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "Plik wykonywalny programu unrar nie znaleziony"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Błąd przy wykonywaniu unrar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Oczekiwanie"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Nieudane"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Rozpoczynanie"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Zakończone"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Ststus nieznany"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Konfiguracja Kobo"
 
@@ -811,7 +816,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -872,12 +877,12 @@ msgstr "Błąd Google Oauth, proszę spróbować później."
 msgid "Google Oauth error: {}"
 msgstr "Błąd Google Oauth: {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -893,457 +898,490 @@ msgstr "Token wygasł"
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Książki"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Pokaż menu ostatnio dodanych książek"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Najpopularniejsze"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Pokaż menu najpopularniejszych książek"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "Pobrane książki"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "Pokaż pobrane książki"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Najwyżej ocenione"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Pokaż menu najwyżej ocenionych książek"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Przeczytane"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Nieprzeczytane"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Pokaż nieprzeczytane"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Odkrywaj"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Kategorie"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Pokaż menu wyboru kategorii"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Cykle"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Pokaż menu wyboru cyklu"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Autorzy"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Pokaż menu wyboru autora"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Wydawcy"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Pokaż menu wyboru wydawcy"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Języki"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Pokaż menu wyboru języka"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Oceny"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Pokaż menu listy ocen"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Formaty plików"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Pokaż zarchiwizowane książki"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "Lista książek"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "Pokaż listę książek"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Podano niewłaściwą półkę"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Niestety, nie posiadasz uprawnień do dodania książki do półki: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, 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:107
-#, 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:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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: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
-#, 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:209
-#, 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:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Utwórz półkę"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Niestety nie możesz usunąć książki z tej półki %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Edytuj półkę"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Półka %(title)s została utworzona"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Półka %(title)s została zmieniona"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Wystąpił błąd"
-
-#: cps/shelf.py:304
-#, 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:315
-#, 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:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Książka została usunięta"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Zmieniono kolejność półki: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Półka: „%(name)s”"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Błąd otwierania półki. Półka nie istnieje lub jest niedostępna"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Nieoczekiwane dane podczas odczytywania informacji o aktualizacji"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "Brak dostępnej aktualizacji. Masz już zainstalowaną najnowszą wersję"
-
-#: cps/updater.py:451
-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:469
-msgid "Could not fetch update information"
-msgstr "Nie można pobrać informacji o aktualizacji"
-
-#: cps/updater.py:479
-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/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Brak dostępnych informacji o wersji"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Odkrywaj (losowe książki)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Najpopularniejsze książki (najczęściej pobierane)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "Książki pobrane przez %(user)s"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Autor: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Wydawca: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Cykl: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Ocena: %(rating)s gwiazdek"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Format pliku: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Kategoria: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Język: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Wyszukiwanie"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Szukaj"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "DLS"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Lista z ocenami"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Lista formatów"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Zadania"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status przeczytania = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 #, fuzzy
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Wyszukiwanie"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Podano niewłaściwą półkę"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Niestety, nie posiadasz uprawnień do dodania książki do półki: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, 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:89
+#, 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:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, 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:138
+#, 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:145
+#, 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:191
+#, 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:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Utwórz półkę"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Niestety nie możesz usunąć książki z tej półki %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Edytuj półkę"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Książka została usunięta"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Zmieniono kolejność półki: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Półka %(title)s została utworzona"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Półka %(title)s została zmieniona"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Wystąpił błąd"
+
+#: cps/shelf.py:369
+#, 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:380
+#, 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:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Półka: „%(name)s”"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Zadania"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Oczekiwanie"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Nieudane"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Rozpoczynanie"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Zakończone"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Ststus nieznany"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Nieoczekiwane dane podczas odczytywania informacji o aktualizacji"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Brak dostępnej aktualizacji. Masz już zainstalowaną najnowszą wersję"
+
+#: cps/updater.py:456
+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:474
+msgid "Could not fetch update information"
+msgstr "Nie można pobrać informacji o aktualizacji"
+
+#: cps/updater.py:484
+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/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Brak dostępnych informacji o wersji"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Odkrywaj (losowe książki)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Najpopularniejsze książki (najczęściej pobierane)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Książki pobrane przez %(user)s"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Autor: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Wydawca: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Cykl: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Ocena: %(rating)s gwiazdek"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Format pliku: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategoria: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Język: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "DLS"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Lista z ocenami"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Lista formatów"
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, 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:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 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:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, 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:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 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:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
@@ -1351,40 +1389,75 @@ msgstr "Zaktualizowano profil"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Nie znaleziono poprawnego pliku gmail.json z informacjami OAuth"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Nie znaleziono narzędzia calibre %(tool)s do konwertowania"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Nie znaleziono na dysku formatu %(format)s"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "Konwertowanie ebooka zakończyło się niepowodzeniem z nieznanego powodu"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converter spowodowało błąd: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, 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:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Konwertowanie nie powiodło się: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, fuzzy, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre nie powiodło się z błędem: %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Wysyłanie"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Lista użytkowników"
@@ -1405,7 +1478,7 @@ msgid "Send to Kindle E-mail Address"
 msgstr "Adres e-mail dla wysyłania do Kindle"
 
 # ???
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Panel administratora"
@@ -1415,14 +1488,9 @@ msgstr "Panel administratora"
 msgid "Password"
 msgstr "Hasło"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Wysyłanie"
-
 # ???
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Pobieranie"
@@ -1437,7 +1505,7 @@ msgid "Edit"
 msgstr "Edycja"
 
 # ???
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1549,78 +1617,107 @@ msgstr "Edytuj podstawową konfigurację"
 msgid "Edit UI Configuration"
 msgstr "Edytuj konfigurację interfejsu"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Zarządzanie"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "Pobierz pakiet Debug"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Podgląd dziennika"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Połącz ponownie z bazą danych Calibre"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Uruchom ponownie Calibre Web"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Zatrzymaj Calibre Web"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Update (aktualizacja)"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Wersja"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Szczegóły"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Bieżąca wersja"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Sprawdź aktualizacje"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Wykonaj aktualizację"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Na pewno chcesz zatrzymać Calibre Web?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Aktualizowanie, proszę nie odświeżać strony"
 
@@ -1632,39 +1729,39 @@ msgstr "przez"
 msgid "In Library"
 msgstr "W Bibliotece"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "Sortuj książki według daty, najnowsze jako pierwsze"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "Sortuj książki według daty, najstarsze jako pierwsze"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "Sortuj tytuły w porządku alfabetycznym"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortuj tytuły w odwrotnym porządku alfabetycznym"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortuj według daty publikacji, najnowsze jako pierwsze"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortuj według daty publikacji, najstarsze jako pierwsze"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "zwiń"
 
@@ -1672,166 +1769,167 @@ msgstr "zwiń"
 msgid "More by"
 msgstr "Więcej według"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Usuń książkę"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Usuń formaty:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Konwertuj format książki:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Konwertuj z:"
 
 # ???
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "wybierz opcję"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Konwertuj na:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Konwertuj książkę"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Tytuł książki"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Opis"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "Identyfikatory"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "Rodzaj identyfikatora"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "Wartość identyfikatora"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Usuń"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "Dodaj identyfikator"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Etykiety"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "ID cyklu"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Ocena"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 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:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Wyślij okładkę z dysku lokalnego"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Data publikacji"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Wydawca"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Język"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Tak"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nie"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Wyślij format"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Po zapisaniu wyświetl szczegóły książki"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Zapisz"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Słowo kluczowe"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Szukaj słowa kluczowego "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 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:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Zamknij"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Źródło"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Błąd wyszukiwania!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nie znaleziono! Spróbuj użyć innego słowa kluczowego."
 
@@ -1942,6 +2040,7 @@ msgid "Enter "
 msgstr "Identyfikatory"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Czy jesteś pewny?"
 
@@ -2359,62 +2458,62 @@ msgstr "Dodaj dozwolone/zabronione etykiety"
 msgid "Add Allowed/Denied custom column values"
 msgstr "Dodaj dozwolone/zabronione wartości własnych kolumn"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Czytaj w przeglądarce"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Słuchaj w przeglądarce"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Data publikacji"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Oznacz jako nieprzeczytane"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Oznacz jako przeczytane"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Przeczytana"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Przywróć z archiwum"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Dodaj do archiwum"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Zarchiwizowane"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Opis:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Dodaj do półki"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(publiczna)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Edytuj metadane"
 
@@ -2458,7 +2557,7 @@ msgstr "Limit rozmiaru załącznika"
 msgid "Save and Send Test E-mail"
 msgstr "Zapisz ustawienia i wyślij testową wiadomość e-mail"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Wróć"
@@ -2484,7 +2583,7 @@ msgstr "Podaj nazwę domeny"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domeny zabronione (czarna lista)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Następne"
 
@@ -2497,6 +2596,10 @@ msgstr "Otwórz plik .kobo/Kobo eReader.conf w edytorze tekstu i dodaj (lub edyt
 msgid "Kobo Token:"
 msgstr "Token Kobo Sync"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Instancja Calibre-Web jest nieskonfigurowana, proszę skontaktować się z administratorem"
@@ -2516,29 +2619,29 @@ msgstr "Powrót do głównego menu"
 msgid "Logout User"
 msgstr "Wyloguj użytkownika"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "Sortuj autorów w porządku alfabetycznym"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Posortuj autorów w odwrotnym porządku alfabetycznym"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "Sortuj rosnąco według indeksu serii"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "Sortuj malejąco według indeksu serii"
 
@@ -2602,7 +2705,7 @@ msgstr "Książki sortowane według oceny"
 msgid "Books ordered by file formats"
 msgstr "Ksiązki sortowane według formatu"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Półki"
@@ -2611,65 +2714,69 @@ msgstr "Półki"
 msgid "Books organized in shelves"
 msgstr "Książki ułożone na półkach"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Główne menu"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Przełącz nawigację"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Przeszukaj bibliotekę"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Wysyłanie…"
 
 # ???
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Błąd"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Konto"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Proszę nie odświeżać strony"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informacje"
 
 # ???
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Szczegóły książki"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Zapamiętaj mnie"
@@ -2775,7 +2882,7 @@ msgstr "Główny katalog"
 msgid "Select"
 msgstr "Wybierz"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 msgid "Ok"
 msgstr "OK"
 
@@ -2956,15 +3063,23 @@ msgstr "Gdy to zrobisz, automatycznie zalogujesz się na tym urządzeniu."
 msgid "This verification link will expire in 10 minutes."
 msgstr "Link wygaśnie po 10 minutach."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Brak wyników"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Wyszukiwano:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Wyniki dla:"
 
@@ -3016,23 +3131,23 @@ msgstr "Od:"
 msgid "To:"
 msgstr "Do:"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Usuń tą półkę"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "Edytuj właściwości półki"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "Ręczne porządkowanie książek"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "Wyłączenie Zlecenie zmiany"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "Włącz polecenie zmiany"
 
@@ -3077,8 +3192,8 @@ msgid "System Statistics"
 msgstr "Statystyki systemu"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Biblioteka programu"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3109,6 +3224,18 @@ msgstr "Czas wykonania"
 msgid "Start Time"
 msgstr "Start"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Zresetuj hasło użytkownika"
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index b7052210fcf02042be501927e37e1f2a4776dd65..966656e7ab960221dd525484dad12abaf4595d0e 100644
GIT binary patch
delta 10075
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

delta 10138
zcmYM)33!fI`p5C-N)SnetRzIdh>(P=2ol6nO+xK^v_uF7wX2HurBzjHE2wp9?_y74
zs-xB_C4*7552ISu)UK^<ivRcLoa_4cQlE3qd!Do0=RVIH+J9X4DEQUGeL1kqB8PuQ
zdN@uvP7hM;|Npre<v58{Z((h$QP*+mV;fZe(HMwxZG9EGsPD$|co}=(b?k}F>p4zS
zT!>8^$L$=aP?iR-Xvb-Ze&~g-peOdgD%b}Z!x@7<xD+emI;?<27>xT+{Z8BVr>K5D
zF{WP_YQ8A+VScCni-O~%pgOk3O4tRpfE?5VgHa0^j@t3NsD6vl2REQ1vK?#TarDD`
zsQ%Bf8V1HXPF0M<B<6QADR|=)RL2>p&@DwRXboy-+mT<+A%3fg_fZoCa~_p31$8tX
z`7H$VF$_P#a<~zFu@L=n54siV6BM+wv*?3&unayyrNeVu4{BgS7>X|1>!2oRhk9-R
zD)hrq3oXC|+=~q1+{I>CJ<f3&WA8ZPuh7n?K?5v8`Z%kQV{?w9cJc^&Va0f}&^%NK
z-?sIosD*6D>R4hwFSVbSVHN5hjukNl>tMSC;;+z*upP#sLOT!1OJ^HK;&}|fXZCY{
zu7oB`LPf3v=HMXIc!yB8<rr#X_fQM?3w6X*lFTiLaZ}KQgU}ympw9YZ48Tp;3iqHw
z=p>tDY=C~MVnb|&dVV4@hx0yGz^_o_9YXcLh{}OdY=iDUDd^0aGK!KZ2VcAgFp&Cc
zOv7T-fcH=#e1=+}Un4VM4Xi{x7IlqNQ4{7PQ#c=B5bj3h)=8|P`+tUlLh}G4Fo4X^
zLK0A+?1ox#Uuzy}qOqt2yn{Nbg_w!EQR8`~n2Bnkp0A7AKr$-n)6rY^KZ8Or4P8;!
zZU|Pv(WsEmL?z=6RHXik>gUDlOFQz%P>jUN*c^2f-BFPoj9Sn;sB69wtKg^DhWVYn
z6ckd=re=UZBs5MmDk7Pv1q?;y$^ujfi!l_xLcLhNM}_=0hTvb;z-Hzs>!Bi$ii%tY
zy2B{+rJ$XRN3DD&YT~6>6?dW*cnX!xS5X7pLQVJ_^_*X-IhqJmJq|TtOVrLgppK%a
z{d{05@mI%jH0V7r9Tl2cs8FuK7WftFh#nyq!SN#_m7M9Qg>*wLa4>4Z@u>H}G}MAW
zK`rzPRR5i*+&Y>@{B@=$X=s3tQQ2CzxjBMtjG~@zU4zxBAF*CXMXD^T?1Yi1(2vJg
za29G|=TP%pM{TT9OEX`To5D*pbVt3BmZ2iB54DqXs1;ws7<`CIzFO%f2Vzk>Oh9cQ
z6&2B8s8CNv?R*Am;)NKF8&L~#e@8(R+(m`hgSSmJtb*Mz8P)N9)I?iRq5CIlg8isu
zJZ3-t9(C52P~%)jU02W6W?@07=OU3{xSa$FTEHmG#A&FBN^JWXR7ihCh5i{TLgBo=
zBC#PV7y2L<$r*uOxE?jmX4C?9q89X>^=Ayy{dd|rPJ0N(UN``?ke#Sdd2l`&pa$x?
z#oKy@t@p+x+Q%T9b=D!joL~4&3$5SIT-&yoNIehJaS7Je{O2j?%$}kqsQ9vZurBI>
zmY9xXP-kC=ir6mH&X1u&eg$>bzuERjSeCkPhB=}DjHX^06^V3oYoLA<6sp&egm&J<
zRQwVZf!|RJ^Cv8tC>oVa$*7~rLWO<+D%+Q$CjJcLaSLkv%UBLeu_oTlB>oCfV3x`D
z7}NkMr~%rclClHpMU{iffqeABrKkZ{V=R7#W$*{|#`CCtKcNTSKrQGtD&i6CiGK`*
zcoHB1`=SeHBYEa*LSAmp9gM)34rYQ()WSQW7MzEgU;;+sB&>}qQRD2#I4r|UL6J?y
zt~km~K`)#GNK~8$sFkI6G-urfUDW$p^HHH&ffaEND*29KE7V&^8)=OVa2#skt8INB
z>g;bL>E^h7I-4DK!4w+iph9>M%i|IB!|$;YUa{V_pF3U5j=fReA#qp%TceJk6KbJ-
z?B_!<fcg~l*ZrSo8$LljupKqfF7&|@sEIG22L26o<_}T1@yr@TJoR}!Ya>+BwnpVZ
zwr$TvZE!Tc`1yYV1z#Gbq8^xons7a8f*n{DkJ|b*)Y(2kMJR&Tr25rG^-IGj?1gpl
zZB$NdK+RKv+Q3;1(EYzm;bpvwnz%`KlkFK8M13G?2NN+E-$w1U02SI*sN1m>)&B@;
zf=j5Q``Om-qZaTO^?cbL#9uoIq@a$~P$7@D^@gY;X^o!P0h?lH)UB9>TG+R!agL!v
zdj_?ji>Pb-Cu;ovp*HB<(-_v1^VbfdY0!$Bpz1AAE9{7RFx!4U40T;cV-hY$h5R_y
z!cx@46?&O*qEPRPMyT<-p*GYPHU6Mp#J@6yF*F3=Obo_ln2cLdA^Qn+hIddq4eo71
zT^*}XPqb#D#>qiNW}L0(qn?|Kiojyjyc^sULMZG;?fevKfUD@jKTrz_>0>60LG^Ee
znz%daK98{VnHWla6>6NXP!pA)#<^<SAEL%_d-pXvtbtl#EGkqDF&a~?gE5}^eCuAU
zNBs^e^r6}2Xi`zn<)I5dMD^Q_8utP!vOk)-+X?Asb{>vOmRM90CZa-^X6tQH19U=#
zuqWzGn1^+6CTho9P|3Ovm5c|iM^NJ*M;+-8=&$epD-`%i#JOiXB)n?ARvTji?U|?*
zPez4u3pT}XQAzk5m6S=ZnOE(rm`HsJYGGSY6aRqP*ag%=uSwnihZJ61i~janAg@Lz
z+SZ$)7LtXENIoi8-nE}EKt*N^R>jY;Iv&JocomiH&rrGHJHYghM7N8ESPB}j1J=N7
zThB-Ba2DzeccUiy1;g<c>U#R*m^WQ0@@{d`Q4=mgEqDzoa$lhO??*-8M2`Lb|B(jW
z%g3k{dk!>bR|A#hk=8V8chrJMV0p|(g?Kt@!dbR`0cxV<sL*f5K-`I%uVkRxWb0`f
z^x$*UKwh~flzymWs)vd|eT>2$sDY-Sb~GP#y;h=fqtLeBL?z)9TYrv<px+>K#KCR~
z>QKiTgPzpmQ4=Pk&axkF^dJebCH1Hw<|m#!RB|rBT6hSxkW#FT&#*4m8fqetg(Io=
zz!B*FhC*Ws3B%0Ka6?cLScSZ<oej4B7nY~)@i!9zUreK(go?x{)KR@-U51*t5L@5{
z+a5ODEHKgNcG^+UgxRPw%|T`HXw<EkjhbLNs^1p$!eUgvudQcM{qCclE6eukV+h7#
zYt*fJ9hGBlbm{&tr%;cEudyv&L+vz%I4P9LSOGIo$<zb&>Kua6_!cVkpJGisin>KN
zu{l<F-7GW<!>A8NZN!a!%<sHMK`Smm?QAXTo^C`<d=Qm1CsEhvoUPwME$9I%Da(&C
zJBvr{v_00xei(xvU_2J1lJsYEr&EX+ZO*bkYN8cb3D;sA7Fn;N&NyHU=Zw)9ftye}
zF0u6+R-dsZveD?`^RB4=<4}=WFqZfSQYfY&2@j(WK0zHx*>Pq8an@H+p`L>QxE0lJ
zKf3TY)C9ic9cL=WppJ4QY9qy{@qa?)!0qwGKZt_Q1oOAk5g18*0_q5sp(ZRsJ#YqJ
z#`~!3Z#L0H><z3){cUW8bI~79U?aSOifH9G%$qX`b+m2V6!c(c?124IXR`^l;$N@<
zhD<V{Z-d>bXQQ6mhMH(EY9s$fZ~Phk@HW1Je_=3Yy=nfi+aFbTZ=|3z--nv;FlxsS
zP{|WE*?gO|Lxpk@YT{|A2|vU@T!$L)OH{J`3wz^3)C;V0zRCL6(U<yoBm!<{Dg_NZ
z7q#-m=)zUDeLw0<kD>-HMcwD%DaLfv21Z~Qj>F107nNk|PzyVR;dl}CW_*M%{{Aog
zEz>ayyYoQ?YG*644sJ)i$<AU5KF35%dE4a5Fw_F(VRc-Did+%uXs)0Zau2Iv5IGl$
z@fgUzP6oeK!EB7cap=MYs0WKsNqHJIz!OyVSDtE;s2=JF8ljFR14FQvt&c<{-xSn>
z<{+VWR-#)CUr^8kyHFuKiDmExs{Jl1q~)fWzuBmcicl`5;Txz06r(0Oj9SQ9)Ixv3
z7a>Pozi?h2O3u3P*!$mz2E7t9P@(OJ$v71oV=>mk8@68YU2_yKq0aOz>oSa@{w4Oq
z%UByzr!yw@M{RfuCg9%bgi>d5mxh<n`#tl=@J^@>OHoI16t&}0)Pzs%=T&Ez9ks_Y
zwD+|2Y}AB#s0i*rC3lJa{IqSq;-;W8eSoPL_`aE_BkI9{SQRH>4i=#L{fQbdai&SW
zR8;6&qZf8Xg}N{5C<bFq9FH1zG3rR&n<(hPZ*Ul%LM3DK4|oWBpw4O+>MW0-2Dpgz
z@E$5cRcD!R!=|WQ$VJ_ziKypGP!T+jn(r2}akul7LKF>QvrUI|%%<KQ2jMpCgCTRw
z!bYJM@;++frKkyaVht?8=6D13=8K+devo+sUDS`Ea_lyyGr!}S$J>d99IS(dsL-54
zh5imIbUyR-0CyYJe<YT}J*WkIi~e{Hbp)lTNZvzs>Ue)>ezdED%9Utr$ox(m1sCR`
zKTbzKT!dY5Exv*eP?2i;k=f~RR3v7j7Q7O*fnscr7f{(BwZPo2ENnu(Giv+~(5;nx
zOrb8WK&|*7`s064XMGE`Q_lhu5g*ihq7EuDEwMc2p!)p{lW~k~UymAZi>>cP&HG&e
z@z0=ej0T0M@<Q`1n1ns3yD<q*qasj#k@<S<iFzL_K~1;|byNpX*ZC59-~)`o#~6!|
zi_JKlu?6+NFDCvSC|sgp7{+{TCR~W!s2|24thU62FdiFFZ-k0iF6u~Tqas&`>39^i
zG2f-;KeKhmCe)Xp7Jd@j;va4bkrbLPGcSzSP%GPvsdy91V!h=i#Br!lreFYOpeF8%
z-Z&QHaS8_GCRG3ZSOLGc?f*qR=l+927=;Qe%mY!V9jBtQxD#rCUZ^u3iW+zf2I35?
zgiBH5d~W>)L#SUuCFk$xLZ6jpyjY~a+exFKWax=nVK(~UP}F@MhZV8F*4JP?>IYCe
zxPi^k^Y7-l7N`YgVmQ8r>YtA~vUQk@|H2o4{&zkxI}JeXC=7Ld>SI-$gc_g#tKrwE
zNSs4W^dl-l53F9R%(V+e?K}+?$!@6evQbAm5kuS*rcls83s9l|6t%Nms7Rc$UbdE^
zC+&Y=b9{s?u<>d$(FD{2-$LDv8CV17+V;(;1^)wIeE%P&pq-yXCDjeo08ddnD7VI(
zadp&DG(aU=8Y+w1VHVCt-G(!$Yx@*6al%?NerMD*%tbA1{#wpoNwb&+O}q`Y^8>bi
z0Tr^F*ap4UnSSk2XZR{A`94BLZZ)d^4h+SA+xAlQrT!Fkgx>2-uGLvj{54?`4O&PR
zDrp9xc0LU?;1Z0(B8<eVsQz9X%z!m9f_igQuJp6*@7ea%sB!jT6kbFv(8K+ySwJ<c
zPD3&(5?xTYAs4-HG`7Y`*a~-HJA7(w`<eOw0A^!d+V`Q}1HWQZ4E@|JtScr^&&RUp
z-bA4>g+eTkrKpMTqZd9$h1ly06T&K}&ue2jOhDyC3TkKVFd9dqcK9)R;x_cgV$^ec
zkn!Elw-hwNF;o&>!k6$amchmw&9_x5YUP>O5GSKTx)s~vQPfT=Z8AH}#2D&hu^FyJ
zCFMEP#(XzxUd}&=g3h}3iv~KQ-dtIzGai7to|946W<I9iDy)F#P|0@<)$cL-V#O`y
zJx~>OBrQ-8%0nITT#RLY=MxHkSb~l4JZeFewwf=EDAa=bV@sTXiogz3D1SpG-#yg8
z{@YBXYT;|tyP+0Th}!ucbm1X%YvSt^w1YoUXXd@#oK-E<b*YcajSN(hc0o-z3UvhY
zP|tmi{&)a&)~8StUP3*84K>eg^g)k8;;%FJD>NNk7)L!C)uA_PfLzqI8;(k*53vC*
zv>rfR<GWZ1%NLoW2u0nN2B?LNLgmy{tcdRwkr|p`Aq@)g3RJz&cKj!5!o8>ozrmV#
z4-1|}RWB-yx*6@0Gt$*z*ub$lW8W+~(K)tK(eM4Ym+@)XAhC%nDWO?HV$qgCX&#<U
x;}VN*<uz_trS-6ZBZiF{KR7qXHE6JF^w?2D#^#L78CO(m`M{u}iCfak{vSJIP(c6y

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 2431ffaed..c91c62192 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -13,597 +13,622 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Estatística"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado, por favor recarregue a página"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Executando o desligamento do servidor, por favor, feche a janela"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Reconexão bem-sucedida"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Página de administração"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Configuração Básica"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Configuração de UI"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Usuário Admin"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Todos"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "Usuário não encontrado"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 #, fuzzy
 msgid "{} users deleted successfully"
 msgstr "{} Usuário Importado com Sucesso"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mostrar tudo"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nenhum usuário administrador restante, não pode remover a função de administrador"
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Configuração do Calibre-Web atualizada"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Você realmente quer excluir o Kobo Token?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "Você realmente quer excluir este domínio?"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "Você realmente quer excluir este usuário?"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Tem certeza que quer apagar essa estante?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Tem certeza que quer apagar essa estante?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Tem certeza que quer apagar essa estante?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Tem certeza que quer apagar essa estante?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Tens a certeza que queres fechar?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Negar"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permita"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json não está configurado para aplicativo da web"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log não é válida, digite o caminho correto"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log de acesso não é válida, digite o caminho correto"
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Digite um provedor LDAP, porta, DN e identificador de objeto do usuário"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de grupo LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de grupo LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de usuário LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de usuário LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de usuário membro do LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtro de usuário de membro LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificate, Certificados ou chave de localização não é válida, Insira o caminho correto"
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Adicionar novo usuário"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Editar configurações do servidor de e-mail"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "A localização do banco de dados não é válida, digite o caminho correto"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "DB não é gravável"
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "A localização do arquivo-chave não é válida, por favor insira o caminho correto"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "A localização do arquivo de certificação não é válida, digite o caminho correto"
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "Atualização das configurações do servidor de e-mail"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Configuração das Características"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Por favor, preencha todos os campos!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "O e-mail não é de um domínio válido"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Adicionar novo usuário"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Usuário '%(user)s' criado"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Encontrei uma conta existente para este endereço de e-mail ou apelido."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Usuário '%(nick)s' excluído"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "Nenhum usuário administrador restante, não é possível excluir o usuário"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Editar usuário %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Usuário '%(nick)s' atualizado"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Editar configurações do servidor de e-mail"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocorreu um erro ao enviar o e-mail de teste: %(res)s"
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure seu endereço de e-mail primeiro..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Atualização das configurações do servidor de e-mail"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Editar usuário %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Senha para redefinição do usuário %(user)s"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "visualizador de arquivo de registro"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Solicitação de pacote de atualização"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Download do pacote de atualização"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Descompactação de pacote de atualização"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Substituição de arquivos"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "As ligações à base de dados estão fechadas"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Parar servidor"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "Atualização concluída, pressione okay e recarregue a página"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Atualização falhou:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Erro HTTP"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Erro de conexão"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Tempo limite durante o estabelecimento da conexão"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Erro geral"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Arquivo de atualização não pôde ser salvo no diretório temporário"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erro: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erro: Nenhum usuário retornado em resposta do servidor LDAP"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "No mínimo um usuário LDAP não encontrado no banco de dados"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} Usuário Importado com Sucesso"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "A localização do banco de dados não é válida, digite o caminho correto"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "DB não é gravável"
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "A localização do arquivo-chave não é válida, por favor insira o caminho correto"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "A localização do arquivo de certificação não é válida, digite o caminho correto"
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "Atualização das configurações do servidor de e-mail"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Configuração das Características"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Por favor, preencha todos os campos!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "O e-mail não é de um domínio válido"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Usuário '%(user)s' criado"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Encontrei uma conta existente para este endereço de e-mail ou apelido."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Usuário '%(nick)s' excluído"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "Nenhum usuário administrador restante, não é possível excluir o usuário"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Usuário '%(nick)s' atualizado"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "não instalado"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "A coluna personalizada No.%(column)d não existe no banco de dados do calibre"
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Nenhum"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Formato do Livro Eliminado com Sucesso"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Livro Eliminado com Sucesso"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oops! O título do livro seleccionado não está disponível. O arquivo não existe ou não é acessível"
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "editar metadados"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s não é um idioma válido"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "A extensão de arquivo '%(ext)s' não pode ser enviada para este servidor"
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "O arquivo a ser carregado deve ter uma extensão"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Falha ao criar o caminho %(path)s (Permission denied)."
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Falha ao armazenar o arquivo %(file)s."
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "Formato de arquivo %(ext)s adicionado a %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Os identificadores não são sensíveis a maiúsculas ou minúsculas, mas sim a maiúsculas e minúsculas"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Metadados atualizados com sucesso"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "O livro carregado provavelmente existe na biblioteca, considere mudar antes de carregar novo: "
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr "O arquivo %(filename)s não pôde ser salvo no diretório temporário"
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "Falha ao mover arquivo de capa  %(file)s: %(error)s"
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Arquivo %(file)s enviado"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Falta o formato de origem ou destino para a conversão"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Livro enfileirado com sucesso para conversão em %(book_format)s"
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocorreu um erro ao converter este livro: %(res)s"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "O livro carregado provavelmente existe na biblioteca, considere mudar antes de carregar novo: "
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s não é um idioma válido"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "A extensão de arquivo '%(ext)s' não pode ser enviada para este servidor"
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "O arquivo a ser carregado deve ter uma extensão"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "O arquivo %(filename)s não pôde ser salvo no diretório temporário"
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "Falha ao mover arquivo de capa  %(file)s: %(error)s"
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Formato do Livro Eliminado com Sucesso"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Livro Eliminado com Sucesso"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "editar metadados"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Falha ao criar o caminho %(path)s (Permission denied)."
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Falha ao armazenar o arquivo %(file)s."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Formato de arquivo %(ext)s adicionado a %(book)s"
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Configuração do Google Drive não concluída, tente desativar e ativar o Google Drive novamente"
@@ -612,27 +637,27 @@ msgstr "Configuração do Google Drive não concluída, tente desativar e ativar
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "O domínio Callback não é verificado, por favor siga os passos para verificar o domínio no console do desenvolvedor do google"
 
-#: cps/helper.py:81
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Formato %(format)s não encontrado para o id do livro: %(book)d"
 
-#: cps/helper.py:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s não encontrado no Google Drive:  %(fn)s"
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s não encontrado: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Enviar para Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Este e-mail foi enviado via Calibre-Web."
 
@@ -672,132 +697,112 @@ msgstr "Enviar para Kindle"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "O arquivo solicitado não pôde ser lido. Talvez permissões erradas?"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "A exclusão da pasta de livros do livro %(id)s falhou, o caminho tem subpastas: %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Falha ao excluir livro %(id)s: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Excluindo livro %(id)s, caminho do livro inválido: %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Renomear título de: '%(src)s' para '%(dest)s' falhou com o erro: %(error)s"
 
-#: cps/helper.py:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Arquivo %(file)s não encontrado no Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Renomear título de: '%(src)s' para '%(dest)s' falhou com o erro: %(error)s"
 
-#: cps/helper.py:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrado uma conta existente para este endereço de e-mail."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Este nome de usuário já está registrado"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "Formato de endereço de e-mail inválido"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Erro ao Baixar a capa"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Erro de Formato da Capa"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Falha em criar caminho para a capa"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "O arquivo de capa não é um arquivo de imagem válido, ou não pôde ser armazenado"
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Apenas ficheiros jpg/jpeg/png/webp/bmp são suportados como arquivos de capa"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Apenas arquivos jpg/jpeg são suportados como arquivos de capa"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "Unrar arquivo binário não encontrado"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Erro excecutando UnRar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Aguardando"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Falha"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Iniciado em"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Concluído"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Status Desconhecido"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Por favor, acesse o calibre-web de um host não local para obter um api_endpoint válido para o dispositivo kobo"
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Configuração Kobo"
 
@@ -806,7 +811,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -867,12 +872,12 @@ msgstr "Erro no Google Oauth, por favor tente novamente mais tarde."
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Login"
 
@@ -888,456 +893,489 @@ msgstr "O Token expirou"
 msgid "Success! Please return to your device"
 msgstr "Sucesso! Por favor, volte ao seu aparelho"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Livros"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Mostrar livros recentes"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Livros Quentes"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Mostrar Livros Quentes"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "Livros descarregados"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "Mostrar Livros Descarregados"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Livros Mais Bem Avaliados"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Mostrar os melhores livros avaliados"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Livros Lidos"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Mostrar lido e não lido"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Livros Não Lidos"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Mostrar não lido"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Descubra"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Mostrar Livros Aleatórios"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Categorias"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Mostrar seleção de categoria"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Série"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Mostrar selecção de séries"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Autores"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Mostrar selecção de autor"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Editores"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Mostrar selecção de editores"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Idiomas"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Mostrar seleção de idioma"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Classificações"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Mostrar selecção de classificações"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Formatos de arquivo"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Mostrar seleção de formatos de arquivo"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Livros Arquivados"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Mostrar livros arquivados"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "Lista de Livros"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "Mostrar Lista de Livros"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Estante inválida especificada"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Desculpe, você não tem permissão para adicionar um livro à estante: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "O livro já faz parte da estante: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "O livro foi adicionado à estante: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: cps/shelf.py:144
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "Os livros já fazem parte da estante: %(name)s"
-
-#: cps/shelf.py:156
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "Livros foram adicionados à estante: %(sname)s"
-
-#: cps/shelf.py:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Não foi possível adicionar livros à estante: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "O livro foi removido da estante: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Crie uma estante"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Desculpe, você não tem permissão para remover um livro desta estante: %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Editar uma estante"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Estante %(title)s criada"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Estante %(title)s alterada"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Houve um erro"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Já existe uma estante pública com o nome '%(title)s' ."
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Já existe uma estante privada com o nome'%(title)s' ."
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Livro Eliminado com Sucesso"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Alterar ordem da Estante: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Estante: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Erro ao abrir estante. A estante não existe ou não está acessível"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Dados inesperados ao ler informações de atualização"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "Não há atualização disponível. Você já tem a última versão instalada"
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "Uma nova atualização está disponível. Clique no botão abaixo para atualizar para a versão mais recente."
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr "Não consegui obter informações actualizadas"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr "Clique no botão abaixo para atualizar para a última versão estável."
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr "Uma nova atualização está disponível. Clique no botão abaixo para atualizar para a versão: %(version)s"
-
-#: cps/updater.py:531
-msgid "No release information available"
-msgstr "Não há informações de lançamento disponíveis"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Descobrir (Livros Aleatórios)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Hot Books (Os Mais Descarregados)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "Livros baixados por %(user)s"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Autor: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Editor: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Série: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Avaliação: %(rating)s estrelas"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Formato do arquivo: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Categoria: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Idioma: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Pesquisa Avançada"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Pesquisa"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Downloads"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Lista de classificações"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Lista de formatos de arquivo"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Publicado depois de "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Avaliação <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Avaliação >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de leitura  = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Pesquisa Avançada"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Estante inválida especificada"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Desculpe, você não tem permissão para adicionar um livro à estante: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "O livro já faz parte da estante: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "O livro foi adicionado à estante: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Os livros já fazem parte da estante: %(name)s"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Livros foram adicionados à estante: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Não foi possível adicionar livros à estante: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "O livro foi removido da estante: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Crie uma estante"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Desculpe, você não tem permissão para remover um livro desta estante: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Editar uma estante"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Livro Eliminado com Sucesso"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Alterar ordem da Estante: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Estante %(title)s criada"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Estante %(title)s alterada"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Houve um erro"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Já existe uma estante pública com o nome '%(title)s' ."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Já existe uma estante privada com o nome'%(title)s' ."
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Estante: '%(name)s'"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Erro ao abrir estante. A estante não existe ou não está acessível"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Aguardando"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Falha"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Iniciado em"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Concluído"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Status Desconhecido"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Dados inesperados ao ler informações de atualização"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Não há atualização disponível. Você já tem a última versão instalada"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "Uma nova atualização está disponível. Clique no botão abaixo para atualizar para a versão mais recente."
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "Não consegui obter informações actualizadas"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Clique no botão abaixo para atualizar para a última versão estável."
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr "Uma nova atualização está disponível. Clique no botão abaixo para atualizar para a versão: %(version)s"
+
+#: cps/updater.py:536
+msgid "No release information available"
+msgstr "Não há informações de lançamento disponíveis"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Descobrir (Livros Aleatórios)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Hot Books (Os Mais Descarregados)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Livros baixados por %(user)s"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Autor: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Editor: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Série: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Avaliação: %(rating)s estrelas"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Formato do arquivo: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Categoria: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Idioma: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Downloads"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Lista de classificações"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Lista de formatos de arquivo"
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ups! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail válido para Kindle."
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Nome de usuário ou senha incorretos"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "Nova senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Você agora está logado como: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s's"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Perfil atualizado"
 
@@ -1345,40 +1383,75 @@ msgstr "Perfil atualizado"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre ebook-convert %(tool)s não encontrado"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Formato %(format)s não encontrado no disco"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "O conversor de Ebook falhou com erro desconhecido"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "O conversor de Kepubify falhou: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Arquivo convertido não encontrado ou mais de um arquivo na pasta %(folder)s"
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Conversor de ebook falhou: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre falhou com erro: %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Upload"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Usuários"
@@ -1398,7 +1471,7 @@ msgstr "Endereço de e-mail"
 msgid "Send to Kindle E-mail Address"
 msgstr "Enviar para o endereço de e-mail do Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1408,13 +1481,8 @@ msgstr "Admin"
 msgid "Password"
 msgstr "Senha"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Upload"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Baixar"
@@ -1428,7 +1496,7 @@ msgstr "Ver Livros"
 msgid "Edit"
 msgstr "Editar"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1541,78 +1609,107 @@ msgstr "Editar Configuração Básica"
 msgid "Edit UI Configuration"
 msgstr "Editar configuração da IU"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Administração"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "Download do Pacote de Depuração"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Ver Logs"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Reconectar base de dados de calibração"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Reinicie"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Encerramento"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Atualização"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Versão"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Detalhes"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Versão atual"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Verificar Atualizações"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Realizar Atualizações"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Tem a certeza que quer recomeçar?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Tens a certeza que queres fechar?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Atualizando, por favor, não recarregue esta página"
 
@@ -1624,39 +1721,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "Na Biblioteca"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "Classificar de acordo com a data do livro, o mais recente primeiro"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "Classificar de acordo com a data do livro, o mais antigo primeiro"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "Classificar título em ordem alfabética"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "Classificar título em ordem alfabética inversa"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "Classificar de acordo com a data de publicação, o mais novo primeiro"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "Classificar de acordo com a data de publicação, primeiro mais antigo"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "reduzir"
 
@@ -1664,165 +1761,166 @@ msgstr "reduzir"
 msgid "More by"
 msgstr "Mais por"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Eliminar Livro"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Eliminar formatos:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Converta o formato do livro:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Converte de:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "selecione uma opção"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Converte para:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Converter livro"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Título do Livro"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Descrição"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "Identificadores"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "Tipo de identificador"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "Valor do Identificador"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Remover"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "Adicionar Identificador"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "Identificação da série"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Classificação"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Buscar capa na URL (JPEG - Imagem será baixada e armazenada na base de dados)"
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Upload de  capa do disco local"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Data de Publicação"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editora"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Idioma"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Sim"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Não"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Formato de upload"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Ver Livro ao salvar"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Buscar Metadados"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Salvar"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Palavra-chave"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Pesquisar palavra-chave "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "Clique na capa para carregar os metadados para o formulário"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "A carregar..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Fechar"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Fonte"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Erro de busca!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nenhum resultado(s) encontrado(s)! Por favor, tente outra palavra-chave."
 
@@ -1931,6 +2029,7 @@ msgid "Enter "
 msgstr "Identificadores"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Tens mesmo a certeza?"
 
@@ -2345,62 +2444,62 @@ msgstr "Adicionar Etiquetas permitidas/negadas"
 msgid "Add Allowed/Denied custom column values"
 msgstr "Adicionar valores permitidos/negados da coluna personalizada"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Ler no Browser"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Ouvir no Browser"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Publicado em"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Marcar como não lido"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Marcar como lido"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Lido"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Restaurar do arquivo"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Adicionar ao arquivo"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Arquivado em"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Descrição:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Adicionar à estante"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Público)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Editar Metadados"
 
@@ -2444,7 +2543,7 @@ msgstr "Limite do tamanho do anexo"
 msgid "Save and Send Test E-mail"
 msgstr "Salvar e enviar e-mail de teste"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Voltar"
@@ -2470,7 +2569,7 @@ msgstr "Digite o nome do domínio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domínios negados (Blacklist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Próximo"
 
@@ -2483,6 +2582,10 @@ msgstr "Abra o arquivo .kobo/Kobo eReader.conf em um editor de texto e adicione
 msgid "Kobo Token:"
 msgstr "Kobo Sync Token"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2500,29 +2603,29 @@ msgstr "Voltar para casa"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "Ordenar os autores em ordem alfabética"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordenar os autores em ordem alfabética inversa"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "Ordenar ascendente de acordo com o índice de série"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "Ordenação decrescente de acordo com o índice de série"
 
@@ -2586,7 +2689,7 @@ msgstr "Livros encomendados por Rating"
 msgid "Books ordered by file formats"
 msgstr "Livros ordenados por formatos de arquivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Prateleiras"
@@ -2595,63 +2698,67 @@ msgstr "Prateleiras"
 msgid "Books organized in shelves"
 msgstr "Livros organizados em prateleiras"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Início"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Alternar a navegação"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Biblioteca de Pesquisa"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Enviando..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Erro"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Upload feito, processando, por favor aguarde ..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Configurações"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Conta"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Sair"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Por favor, não atualize a página"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Navegue em"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Sobre"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Anterior"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Detalhes do Livro"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Lembre-se de mim"
@@ -2756,7 +2863,7 @@ msgstr "Diretório dos Pais"
 msgid "Select"
 msgstr "Selecione"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Livro"
@@ -2938,15 +3045,23 @@ msgstr "Uma vez verificado, você será automaticamente conectado a este disposi
 msgid "This verification link will expire in 10 minutes."
 msgstr "Este link de verificação expirará dentro de 10 minutos."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Nenhum resultado encontrado"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Termo de busca:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Resultados para:"
 
@@ -2999,23 +3114,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Excluir esta estante"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "Editar as propriedades da estante"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "Organizar os livros manualmente"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "Desativar ordem de modificação"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "Habilitar ordem de modificação"
 
@@ -3060,8 +3175,8 @@ msgid "System Statistics"
 msgstr "Estatísticas do Sistema"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Biblioteca de programas"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3091,6 +3206,18 @@ msgstr "Tempo de execução"
 msgid "Start Time"
 msgstr "Hora de início"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Redefinir senha do usuário"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 68a9eb31ef9a5dc5d734800fe107208a7b3cd576..e28bd234d52ce4a73096fe500513b21ac8b808c1 100644
GIT binary patch
delta 8269
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

delta 8330
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

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index a9077290c..bad834042 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,596 +17,621 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, обновите страницу"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Успешно переподключено"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Настройка интерфейса"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Управление сервером"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Все"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Показать все"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Вы действительно хотите удалить Kobo Token ?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Запретить"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Разрешить"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json не настроен для веб-приложения"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Неправильное расположение файла журнала, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Недопустимое расположение файла журнала доступа, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Пожалуйста, введите провайдера LDAP, порт, DN и идентификатор объекта пользователя"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов группы LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов группы LDAP имеет незавершённые круглые скобки"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов пользователя LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов пользователя LDAP имеет незавершенную круглую скобку"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Добавить пользователя"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Изменить настройки SMTP"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "Расположение Базы Данных неверно, пожалуйста, введите правильный путь."
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "Расположение ключевого файла неверно, пожалуйста, введите правильный путь"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "Настройки E-mail сервера обновлены"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Дополнительный Настройки"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Пожалуйста, заполните все поля!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "E-mail не из существующей доменной зоны"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Добавить пользователя"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Пользователь '%(user)s' добавлен"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Пользователь '%(nick)s' удалён"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "Это последний администратор, невозможно удалить пользователя"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Изменить пользователя %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Пользователь '%(nick)s' обновлён"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Неизвестная ошибка. Попробуйте позже."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Изменить настройки SMTP"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Неизвестная ошибка. Попробуйте позже."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Изменить пользователя %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Ошибка: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "Расположение Базы Данных неверно, пожалуйста, введите правильный путь."
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "Расположение ключевого файла неверно, пожалуйста, введите правильный путь"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "Настройки E-mail сервера обновлены"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Дополнительный Настройки"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Пожалуйста, заполните все поля!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "E-mail не из существующей доменной зоны"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Пользователь '%(user)s' добавлен"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Пользователь '%(nick)s' удалён"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "Это последний администратор, невозможно удалить пользователя"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Пользователь '%(nick)s' обновлён"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "не установлено"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Нет"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "изменить метаданные"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s не допустимый язык"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Загружаемый файл должен иметь расширение"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Не удалось сохранить файл %(file)s."
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "Формат файла %(ext)s добавлен в %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Метаданные обновлены"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "Загруженная книга, вероятно, существует в библиотеке, перед тем как загрузить новую, рассмотрите возможность изменения: "
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr "Файл %(filename)s не удалось сохранить во временную папку"
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Файл %(file)s загружен"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Исходный или целевой формат для конвертирования отсутствует"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Книга успешно поставлена в очередь для конвертирования в %(book_format)s"
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Произошла ошибка при конвертирования этой книги: %(res)s"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "Загруженная книга, вероятно, существует в библиотеке, перед тем как загрузить новую, рассмотрите возможность изменения: "
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s не допустимый язык"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Загружаемый файл должен иметь расширение"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "Файл %(filename)s не удалось сохранить во временную папку"
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr ""
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "изменить метаданные"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Не удалось сохранить файл %(file)s."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Формат файла %(ext)s добавлен в %(book)s"
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Настройка Google Drive не завершена, попробуйте деактивировать и снова активировать Google Drive"
@@ -615,27 +640,27 @@ msgstr "Настройка Google Drive не завершена, попробу
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Не удалось проверить домен обратного вызова, пожалуйста, выполните шаги для проверки домена в консоли разработчика Google."
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s не найден на Google Drive: %(fn)s"
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s не найден: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Отправить на Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Это электронное письмо было отправлено через Caliber-Web."
 
@@ -675,132 +700,112 @@ msgstr "Отправить на Kindle"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Запрашиваемый файл не может быть прочитан. Возможно у вас нет разрешения?"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Файл %(file)s не найден на Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Не удалось создать путь для обложки."
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Только файлы в формате jpg / jpeg поддерживаются как файл обложки"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Ожидание"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Неудачно"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Начало"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Завершено"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Неизвестный статус"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Настройка Kobo"
 
@@ -809,7 +814,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -870,12 +875,12 @@ msgstr "Ошибка Google Oauth, пожалуйста попробуйте п
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Логин"
 
@@ -891,456 +896,489 @@ msgstr "Ключ просрочен"
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Книги"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Показывать недавние книги"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Популярные Книги"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Показывать популярные книги"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Показать непрочитанное"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Обзор"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Показывать Случайные Книги"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Категории"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Показывать выбор категории"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Серии"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Показывать выбор серии"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Авторы"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Издатели"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Показать выбор издателя"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Языки"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Показывать выбор языка"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Рейтинги"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Показать выбор рейтинга"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Форматы файлов"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Показать выбор форматов файлов"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Указана неверная полка"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Извините, но вам не разрешено добавлять книги на полку: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Книги уже размещены на полке: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Книга добавлена на книжную полку: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Не удалось добавить книги на полку: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Книга удалена с полки: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Создать полку"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Извините, вы не можете удалить книгу с полки: %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Изменить полку"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Создана полка %(title)s"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Колка %(title)s изменена"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Произошла ошибка"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Публичная полка с названием '%(title)s' уже существует."
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Приватная полка с названием '%(title)s' уже существует."
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Метаданные обновлены"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Изменить расположение полки '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Полка: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Некорректные данные при чтении информации об обновлении"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "Нет доступных обновлений. Вы используете последнюю версию"
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "Новое обновление доступно. Нажмите на кнопку ниже, чтобы обновить до последней версии."
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr "Не удалось получить информацию об обновлении"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr "Нажмите на кнопку ниже для обновления до последней стабильной версии."
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Информация о выпуске недоступна"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Обзор (Случайные Книги)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Популярные книги (часто загружаемые)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr ""
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Автор: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Издатель: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Серии: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Оценка: %(rating)s звезды(а)"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Формат файла: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Категория: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Язык: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Расширенный поиск"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Поиск"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Скачать"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Список рейтингов"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Список форматов файлов"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Задания"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Расширенный поиск"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Указана неверная полка"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Извините, но вам не разрешено добавлять книги на полку: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Книги уже размещены на полке: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Книга добавлена на книжную полку: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Книги уже размещены на полке: %(name)s"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Книги добавлены на полку: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Не удалось добавить книги на полку: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Книга удалена с полки: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Создать полку"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Извините, вы не можете удалить книгу с полки: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Изменить полку"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Метаданные обновлены"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Изменить расположение полки '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Создана полка %(title)s"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Колка %(title)s изменена"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Произошла ошибка"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Публичная полка с названием '%(title)s' уже существует."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Приватная полка с названием '%(title)s' уже существует."
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Полка: '%(name)s'"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Задания"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Ожидание"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Неудачно"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Начало"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Завершено"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Неизвестный статус"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Некорректные данные при чтении информации об обновлении"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Нет доступных обновлений. Вы используете последнюю версию"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "Новое обновление доступно. Нажмите на кнопку ниже, чтобы обновить до последней версии."
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "Не удалось получить информацию об обновлении"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Нажмите на кнопку ниже для обновления до последней стабильной версии."
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Информация о выпуске недоступна"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Обзор (Случайные Книги)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Популярные книги (часто загружаемые)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Автор: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Издатель: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Серии: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Оценка: %(rating)s звезды(а)"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Формат файла: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Категория: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Язык: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Скачать"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Список рейтингов"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Список форматов файлов"
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
@@ -1348,40 +1386,75 @@ msgstr "Профиль обновлён"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ошибка Ebook-конвертора: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Загрузить"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Список пользователей"
@@ -1401,7 +1474,7 @@ msgstr "Адрес электронной почты"
 msgid "Send to Kindle E-mail Address"
 msgstr "Отправить на Kindle Адрес электронной почты"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Управление"
@@ -1411,13 +1484,8 @@ msgstr "Управление"
 msgid "Password"
 msgstr "Пароль"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Загрузить"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Скачать"
@@ -1431,7 +1499,7 @@ msgstr "Посмотреть электронные книги"
 msgid "Edit"
 msgstr "Редактировать"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1544,78 +1612,107 @@ msgstr "Изменить основные настройки"
 msgid "Edit UI Configuration"
 msgstr "Изменить настройки интерфейса"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Управление"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Просмотреть лог файл"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Пере подключиться к базе жанных Calibre"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Перезагрузить Calibre-Web"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Остановить Calibre-Web"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Обновление"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Версия"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Подробности"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Текущая версия"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Проверка обновлений"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Установить обновления"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Отмена"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Установка обновлений, пожалуйста, не обновляйте страницу"
 
@@ -1627,39 +1724,39 @@ msgstr "с помощью"
 msgid "In Library"
 msgstr "В библиотеке"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "уменьшить"
 
@@ -1667,165 +1764,166 @@ msgstr "уменьшить"
 msgid "More by"
 msgstr "Ещё от"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Удалить книгу"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Удалить форматы:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Конвертировать формат книги:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Конвертировать из:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "выбрать вариант"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Конвертировать в:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Конвертировать книгу"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Название книги"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Автор"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Описание"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Теги"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "ID Серии"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL обложки(jpg, обложка загружается и сохраняется в базе данных, после этого поле снова пустое)"
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Загрузить обложку с диска"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Опубликовано"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Издатель"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Язык"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Да"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Нет"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Загружаемый формат"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Просмотреть книгу после сохранения"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Получить метаданные"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Сохранить"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Ключевое слово"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Поиск по ключевому слову "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "Нажмите на обложку, чтобы получить метаданные"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Закрыть"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Источник"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Ошибка поиска!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Результат(ы) не найдены! Попробуйте другое ключевое слово."
 
@@ -1934,6 +2032,7 @@ msgid "Enter "
 msgstr "Зарегистрироваться"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Вы действительно уверены?"
 
@@ -2348,62 +2447,62 @@ msgstr "Добавить разрешенные / запрещенные тег
 msgid "Add Allowed/Denied custom column values"
 msgstr "Добавить разрешенные / запрещенные значения индивидуальных столбцов"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Читать"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Прослушать в браузере"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Опубликованный"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Отметить как непрочитанное"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Отметить как прочитанное"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Прочесть"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Описание:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Добавить на книжную полку"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Публичная)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Редактировать метаданные"
 
@@ -2447,7 +2546,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr "Сохранить настройки и отправить тестовое письмо"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Назад"
@@ -2473,7 +2572,7 @@ msgstr "Введите доменное имя"
 msgid "Denied Domains (Blacklist)"
 msgstr "Запрещенные домены (черный список)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Далее"
 
@@ -2486,6 +2585,10 @@ msgstr "Откройте файл .kobo / Kobo eReader.conf в текстово
 msgid "Kobo Token:"
 msgstr "Kobo Sync Token"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2503,29 +2606,29 @@ msgstr "Вернуться на главную"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2589,7 +2692,7 @@ msgstr "Книги, упорядоченные по рейтингу"
 msgid "Books ordered by file formats"
 msgstr "Книги отсортированы по формату файла"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Полки"
@@ -2598,63 +2701,67 @@ msgstr "Полки"
 msgid "Books organized in shelves"
 msgstr "Книги организованы на полках"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Главная"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Включить навигацию"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Поиск в библиотеке"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Загружается..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Ошибка"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Настройки"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Учетная запись"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Выход"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Пожалуйста не обновляйте страницу"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Просмотр"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "О программе"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Подробнее о книге"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Запомнить меня"
@@ -2759,7 +2866,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Книга"
@@ -2941,15 +3048,23 @@ msgstr "После этого вы автоматически войдете в
 msgid "This verification link will expire in 10 minutes."
 msgstr "Срок действия ссылки истекает через 10 минут."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Результаты не найдены"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Выражение для поиска:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Результаты для:"
 
@@ -3002,23 +3117,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Удалить эту книжную полку"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3063,8 +3178,8 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Программа"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3094,6 +3209,18 @@ msgstr "Время выполнения"
 msgid "Start Time"
 msgstr "Время начала"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Сбросить пароль пользователя"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 1e216ed2d7d539b4eb2f67bcef3e11a318b272f9..595acfe18f2a1a9e6430bfe420ad52f188dfd4f5 100644
GIT binary patch
delta 10957
zcmYM&3z&~(`oQtm`8Z~bGhxgaW1P>Y$vEZ|Q9@Hl5=yjIDrx<8#D<b0#FnrXN)(C8
zuKX*t9h7aA6xnK9D(%`uMQ!{2dY<e0cXjo7p7-~@?{h!*eLt^i|Jjm1ohg|*npt{z
z!e8r4CdozEqK32o|LfvrNz#^Scg(?Cumvtd?|%g|@kpHi3$vJ~HBXZA*a}BrXB>%(
zu`7OwU6Le~G~jJzxG)NP;2122k76l&0&C$W%)`A{5l>(hJdKsHRLdl(jv45Ex#;yF
z=zUkm`Hkp$w_!!rPwu)fNRoTd8<%1_u0sQO4t-z;8pzA&jz2)}`w9){ESixLt&$`g
z8(<ptLhm1nCU-p6!#l7t>n9H}sEg~+8+T(nd=D#N$=2a|Wi+J?u?jXtcib5-#=$ro
z7viOO1jk~28-BwDNY;~s*a%Bd*OZawFsO<BkZdMn&`1|y9bAiL@g=N;docswMN4%Q
z&CFM5CjN`1u>!lOhE>pcHd>NA%)$=s$iEAW;DQg{g4XU%G}84*u*rTjuwSqnwrHOu
zop2Ibnl<S2k0Vt`wqiaWK{rya1O0{d(LiUS8DHFi{Ci;|7YyVTtdED|4L_j2SL+xa
zXpW}7A6ml^n2XcV46Q_8yarA2i`W!D!NypcsH<W=`g=i&feVj87rGs<!zFQk3Vm^f
z&f)lFpgZk=F4O}v@oMafQ!yPkpbP9oOZ72U$FI@*e?bFDWpW66F=&jYcp{q8WoY-V
zLXwbdKwtDJQr_ewTFZv4>Wf?8g>FZCWGME*YtWKDhW6SU=qdRc2_%)2qo8(gUG#;c
z&=gNVBb<T0a6Y=T2hs1uI&{ImA!SbfiPbQtAT(QNY{>j#tc#<u0p5-VvI5I`{$FI^
z0<T2hK^HoN25=m$;W-?LIYjFVr=rg-K)d^)IA4Ws<O%e2Y(tOnOK7HELyz&tSc~<O
z&l#Bdb7<G*bq^`K9KCTCy0f`h8&_aW+=`ZDA6|qXp@E%77fde<Jyi$IXj`--J>z^H
zrhL&d2BzvMY=Cc}ft)~_s9KM(!;a_z-O$X8Km(eDb?~=nK&!DHK8=>>4Xl9&qu-zb
zmgq_T?Z!$yLsvIIQ<sk}&<TC<05k*R(FJZp1HA_g=t*>kd(qSJKKlG8XaFbC=gy-g
zs7%KjV545CQ0wko@P;910AtYzr=T^S8GkQE7g`$U>(JA(4Qt^pG^6h$$xHr$F4&}Z
z_@o!08=i&+Se#<u3zwlyw;l~(8`j4?=#Gw{J2{R%cozLGl&7E`uXJpQozc^912)7}
z*aTmU9z)+-u5U1v%fM9jL2EP~hu|G(VEfPo4x&5z8C|IQB}u~HNpJp<iwn>UY(Y1$
z4-NDKY=(bFn>nLj=%qTy#`yD}fiKKQOE3!C;$-ZGtC6o~au6*=rT!rkwa|ca(eA$(
z^ROshFGk<@FdE1vv=lF+wSOOnd;Y&=kjI6d1Hua@qc^0`=K6i~1uS5G04+({z)*tP
zXkZPoG&V<nZ-W)E0Da#jXo;^w1DlSOSU;J|z-GB0jr3jQ@8mQ7;fwMIh3g&A67@q%
zGa9Ys6g1@v(GskP^DWqz`O9e29Yem_$$zjMwz!l{rZMQipd$80BOHQ8JSI8|J$}oP
zzmrY;V-%i2106Crlwc+L{PXB{;k7tF66Yte9oNg!U>uC3>k#r!UnH}+VB~wT5q^yJ
zz<KP6EiVgy`b|Sqw-jCA59o8d(fj|3J+bW2&}{wDj1EIHFdi%5OiaVnQ1b5&i@8t+
z*P=Ci67%tCG!qBW7o9>gRcctMeHG+uo76yiV>sH3OV9u}qYJ){HtTz63BN*1@l%RH
z6$TwI4*~SW*31W?3*CujaXy-v`_LV4!K%0qE8`*bJ%2|xavJUSbLbZ|{ff{l`DpF?
zqwh@(Wzd|#NOb3O(TMLsZ+s9-;wm(-M=%55L3ert-O)L0h8e@dzp@oz7W12tZ&k7w
zJ<ji=-<wKTURW=cG-Ke7TBAGYk1jY8?cSm|pMyEfi_sT8fvxa3n)+HJl7twN;n*IZ
z#DRDit6}4jA@D9(p7}t`^88<MVZgs=pecR`4dexEhp%HV`~llww^8APH3i+tsyN?;
z_R3etw<;-lRoL-B?96-~n&I7O0DCdb^ZyoubUYM)IF9c86dHNWqEO>zXlXj50ro<F
zABI(N0$Q5e;`|=;{#EFGe?WU`C%WGMVan$D3j>?sGpvqZMbD$ZXIveukF}XMLwlo7
zynZRVv#Zbr#$Y9!jNX4My5M5;{f}Z@+;%nj_rkkeu(qG0sVRF+xG^2Qu`xEm9+-y{
z(G1;>F0>upz#cRc`>;PALKn^&9Zo?TG!ui+4U8R4{taLv7u@M=G_?z`4z5HWcn)3Q
z^*DbA{eT>c*S|vpIfK5Z#F(&=D(HQ+(9Gn<c^kAeg((K57!1I!I2gO(@6ZVMq8a%!
zn&Q8pfqjIY^Hb;o-=jM%Gd5TQ-AFDPc!xMIKm#0v7rua_;te;T=l5o`>sO+we+#qm
z?`Xv3uMGiYq6@UZ`dEN2RD|9)4qfObtckayrMVx?_*!gF|0O#Zn7R{aP0ye^t~)Nw
zbI=kDz*;yudMo<E`_N3SiSsAX=XaqQ*^35n0BhiJH1PjoRnLFgb>U0Z5RI%Sy5I=(
zfg90<Q&<mI#`$)%yWd6w`4U~|Ec%|b@galR=<nUp_YFlid;^we{bV`=Q+FrkV{!Cp
zY|Z>&w9NJ4KSVlWHrL0ZB`Zds+l*QGAvVSD(f4Le2w%iJbbbw*f$^BKiKa8KJ8wr*
zIXBK1p${xaQ~3xs!p)eA`_Y}9#!^`JhR{?Mu{87A(fU}1c{aN9rZ@;Y+(7>QVx_oH
zh!0>Hd=E46Ao|HYjx<YBXJSb45cIT6K$~?9nu!D00Dr=^SZ`7YbO`$18R$l5p@Gkv
zME)JD;DS5c7~O>i_GX-aj0SQ7%VFKgA%)rKb8WFK_Cin10Q6K`kM>M4dKw-@d*&(3
z!dFuati_ku5dRbB)ou(s%f_Z$AAv3~2QR|;==oibdH5_|iHFdITHX`_?S?jGZ}k2m
zbi<SILQ~ITP=N~%qLKbSx)ZJ82k4E5qW_APpArJk!t(sy8clH*bmxU=rbfr#C!p_}
ziU#m&tmyfl$G}=IK?7Nj`M4R4{6q9bC(#AYpea6&HeJn|Lx$>N6Xt!;_uYi<_&4Zr
zycg}6wek94EbaL}9xt3kQ+yt+eaWdI;%d>_=z{gpk~BhhJ_z0M@aS}Wx&#}-&Rj3J
zB{b&@Y|DHNX5sso;rTzsz?zo)Rrph|A^PGz$R?A)NLiCz=qbpa9{%swNG!>GF%HBB
z&<q_$QkxvZ#`q0(#Ef5u)b~T1@G49>n9jiFTZG>DRJ`FBnz|pcDpr{hYmPqG8mr-e
zczrZxGM|FhdJbB;yV3jaMUUs>SPfsD5zqfeT(FCeqhGd+Tf?WaJ-YBfv<a_4cQgYt
z@ZmV$guZY;w#3iTQfABy$FmmNTX|@JZP9@G&Lsc68I0jV5w68ycn<k`CYRn8{%d$E
z`r@Cl12(@s)N&l!q)V|KZo)eFDZ0Q}tc2-zgaGSd4d$)U>zAY$xZ}&QI^K%bej(Zu
zOVOHcMIYFKF0dDU(I@Err?4rWLj%p375?nF96K^E#!k2s+v9g=X;RsDh8Hx$7F=kL
zzGxg;tA)tF)Fd0xZ-1HDA+S8O>-(bjjgQxh<MlOhzB|r8Moad6oR`1r!lyZvG-2Ql
z2BTlX5$FykU|U>@_Qq>yjlV^EAo)#5aW2+kT8JEwWF$7jH_#sVH~PLG(NmE(Cv2o0
zW_tdwWYB{jCZQ2-z+Bvg*7hhG*cnX6(mdmW)p01cK%c)0U2r$1;j8Ed4xrDM`fd1E
zyG(SQAy|XolCccz@>|g#euw>VC0e_qn2*(qLnaE*+E2tDco(|hZgioy&|dl&-SKy5
z;6GvkR+t;+mtd+h7e+AffyL+!)?+qqLNo9Vn$j=OK&spwnx_l8a8JAlFGClaf@Wwo
zx`AbQ4gMK(Fn3<KZ{R%gZ|#e?V0Vwl$~X<ZK07)O8!%rS=bJH$`3|&HAEM3s6Sl_u
z`C%hPXwQs81H2XM;)7_WH_s>k{_saG)WgGQAZO90EBU*y!)Dlvc^5Q8cVaFUM>k*-
z=I>%FJdI{7=bo^U%P@=iD6E5bpwBN&F=)tO7uLo@XoRQGo~XPaq_P3}U?+4(!>~S1
zi1WGV{VUMk*oeOGPv{0eLce^c(ZI?r4C|)aF|hVmU@4r0J~#zU(LA)K%h3g%h`;Yd
zGxa{&1E0qE*I0r1S+x0*MIqoyXaEh-_q9XTOC`M-xRZY94kzFMoP$2_26n;2Xh7BO
z4PD+i+CJJldO4cGaabN_V<nu2KK}sPW9zVu=YI<WPr+wch_&tu%`_4{E_X-wpfx@p
z&0ZXOWFUG<rsG&#fbQ@g*b=`-Gn#vUXwE{km!@GJ>nG1Lux5wQ)O{D{KVU27RhEQ5
zPP=0n=Do2p4nU9B2(&c!Vpn_=`{PG(-td92^CI-Qo6sJ*9aE<2UIuyiB-#u6F$2Gd
z^V8^guJB+eQ6rqdya0V}E&AM>==+XfBm4ogu<p|Ef5{5alFULkGIwb_{|mTa^F4@_
za5)<3I<$MYU^>2ynfM8&;deL`e?og_@UkSi7AK;=??ZR`S9C+iqd%g@z2ZaU--Vhy
z6e4er6`5a#roIS$(E_wLR$w_ih`#s;R>f0jfTfm)fU98^^EPO}m*a4pfMakM8hFjr
zitxZh^aXdLU%F*j1-D^M+=~Wu2rtHRD+v<&qMy`d=<hqx9{36eV%Ec<L^q-DUy5dG
zJzA>NZU$`_e1tu*{HpMU8;G@-4?|NoIbNTI)tUbmP2qC1me0lCccOv(2|d;)u?ALJ
z9Wvbr%QA0;Jv{#%8JOCcXsw?|7e0WVh7(u^|AW3L?f2nNy&N=<>(QpV1N&kzR>6Jo
z`a!fAkD?n%9tkC@dO_-+!@wGKM4N8_y5N;q52v9EFG3?<i{7^Z-Rbst{quPJ1ll8K
z(5C(wJ7bAQLn*tWnHh$4SwES^pcgL0!T2`%p{czl)VK%sW_~|5#sg@|&!PeTgl3}l
zW8uFCTB7&0iSrTIl=)R?PZVQwd>d0;7<|v*YHYJM^uoPZ#C$heikj;}N?V~N>5leH
zfAsv{5$9{sOdh}%_$3a(s_Vm-?^^V^CD;I8Sx@~hX7CvoeDI<_gimH`G}1BH2RC48
z{02R)|3Z)5&*(8se?0U+4(2j%fnL7?y?-KltY@Il%|SQzz~iY<la29*J<$Vb4Zn!<
zZ{qytI4|===!sfrDO#cnwvYBl7rF**x~b@bbFd7qKzrzsRJ^be?b<D9q<=&ocoTi`
zF|3WJ(VC|{8Rq%el6i0RxnH5pI~yC~a<tYv(EI*|O)z~!_^_oqF>t4S(S-)%a2$sQ
z^gPzZS1}8ZqNm{(bfFp>!+ovMCM-k)9Ui?I4QxJo{{!fKPhnZl{~iV|ybn#;VJwf|
zq5+&izg(p^g?V+f33IR%wnUq_Eq2A5upB;)zGpL*!5wG@UXJq<n8EtVKQ9dU<*CpM
zRneL?#nRX{&I_>u^P!lAMd*tsp<O){d*K>1^~catkUSj%X^Hijc0!x|N-WFz$s`9j
z4UKpvR>V1IDi@-eS&wGwc`U>?(fi764hv<X8S8<0co`b#ZRmUEp*{5|`o0~Qa^W`^
z_~QNO4nId9{1$!S99r|tXTpO`(VpmrHq!`nXLq6ZuSR#c4b9~1=<^?<0e&0j=bs_}
zzNqS!@ZuKe3kuN(MxxDfGp1oNR>mdh0*|02*ouvD2O7{}Y>6edh7V6`%w~QqHpRJU
z$)4Uy{{7+8c*8H)jCuC6p(I1l8?TJ>`Dh^b#rbNqWb4qTdkW3qw)p#Qtit?N^o#cw
zG_X^cjtx`Kg)VN5?zBBxk^$%ohoUbWg_ZC+9EVfU`}boH`~q#(oNcj0*nxRBY>T&`
zC0d8=a8JCR`Zoh_Y`i`Ei$oDNV*VSni5^2!{06#{cd;sdikbKwR>Km{hmzGmGuj-@
z)MeNSN242C7O$^HGLT9(GH_?R(AvC)*778pvdkSJRc+CEFU-er@%ke4{?+K0aSwLD
zPta0kybv;2fChF6X5eIO@A;p_U@RA&K_jlbGaReBn8iF7-ElvxiC3XbdkcF1A~dxR
z<3;!adMrP{EIf*4^cVELM!Uk7um@iF|Nlh{Ozn8g#p!76S9$|JhSqi?n(}AR`(KIk
z_u~9>wAQE4fOB39@9Bt^usa$^A1sMCV9Mh%nL!I&f~ICS*1&h8Utl5gAJG?gc_{=m
z2)%zOTHA409Vek1xC{M6&x<ZV*Silr#@k=wb*AJMF6dEQc7L<_+h;X<sMYrRMW3c`
wyRooL#f~l8w9RVUzFWI?+Xqa`Em5jVt2Wzzb<5WswoiGyU)Aj|?^ssme?z{)IsgCw

delta 11018
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

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 1a276632a..70c688a2d 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,594 +16,619 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistik"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Server startas om, vänligen uppdatera sidan"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Stänger servern, vänligen stäng fönstret"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "Återanslutning lyckades"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Okänd"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Administrationssida"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Användargränssnitt konfiguration"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Redigera användare"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Alla"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "Användaren hittades inte"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "{} användare har tagits bort"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Visa alla"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "Felaktig begäran"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "Gästnamn kan inte ändras"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "Gäst kan inte ha den här rollen"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Ingen administratörsanvändare kvar, kan inte ta bort administratörsrollen"
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "Värdet måste vara sant eller falskt"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "Ogiltig roll"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "Gästen kan inte ha den här vyn"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "Ogiltig vy"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Gästens språk bestäms automatiskt och kan inte ställas in"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "Inget giltigt språk anges"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "Inget giltigt bokspråk anges"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "Parameter hittades inte"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 #, fuzzy
 msgid "Invalid Read Column"
 msgstr "Ogiltig roll"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Vill du verkligen ta bort Kobo-token?"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "Vill du verkligen ta bort den här domänen?"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "Vill du verkligen ta bort den här användaren?"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 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:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Är du säker på att du vill ändra språk för valda användare?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Är du säker på att du vill ändra synliga bokspråk för valda användare?"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Är du säker på att du vill ändra den valda rollen för de valda användarna?"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Är du säker på att du vill ändra de valda begränsningarna för de valda användarna?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Är du säker på att du vill ändra de valda synlighetsbegränsningarna för de valda användarna?"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Är du säker på att du vill ändra den valda rollen för de valda användarna?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr "Taggen hittades inte"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "Ogiltig åtgärd"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Förneka"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Tillåt"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr "Taggen hittades inte"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "Ogiltig åtgärd"
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json är inte konfigurerad för webbapplikation"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Loggfilens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Åtkomstloggplatsens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Vänligen ange en LDAP-leverantör, port, DN och användarobjektidentifierare"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-gruppobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-gruppobjektfilter har omatchande parentes"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-användarobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-användarobjektfilter har omatchad parentes"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Användarfilter för LDAP-medlemmar måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Användarfilter för LDAP-medlemmar har omatchad parentes"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
-#, python-format
-msgid "Database error: %(error)s."
-msgstr "Databasfel: %(error)s."
-
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "DB-plats är inte giltig, vänligen ange rätt sökväg"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "DB är inte skrivbar"
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "Keyfile-platsen är inte giltig, vänligen ange rätt sökväg"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "Certfile-platsen är inte giltig, vänligen ange rätt sökväg"
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "E-postserverinställningar uppdaterade"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Funktion konfiguration"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Fyll i alla fält!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "E-posten är inte från giltig domän"
-
-#: cps/admin.py:1416 cps/admin.py:1576
+#: cps/admin.py:1230 cps/admin.py:1852
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Användaren '%(user)s' skapad"
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Hittade ett befintligt konto för den här e-postadressen eller namnet."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Användaren '%(nick)s' borttagen"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr "Det går inte att ta bort gästanvändaren"
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Redigera användaren %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Användaren '%(nick)s' uppdaterad"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Ett okänt fel uppstod. Försök igen senare."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
+#: cps/admin.py:1239 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:1604
+#: cps/admin.py:1258
 #, fuzzy
 msgid "Gmail Account Verification Successful"
 msgstr "Verifiering av G-mail-kontot lyckades"
 
-#: cps/admin.py:1630
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "Databasfel: %(error)s."
+
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testa e-post i kö för att skicka till %(email)s, vänligen kontrollera Uppgifter för resultat"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Ett okänt fel uppstod. Försök igen senare."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Redigera användaren %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Uppdateringsfilen kunde inte sparas i Temp Dir"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fel: %(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fel: Ingen användare återges som svar på LDAP-servern"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minst en LDAP-användare hittades inte i databasen"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} användare har importerats"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "DB-plats är inte giltig, vänligen ange rätt sökväg"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "DB är inte skrivbar"
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "Keyfile-platsen är inte giltig, vänligen ange rätt sökväg"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "Certfile-platsen är inte giltig, vänligen ange rätt sökväg"
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "E-postserverinställningar uppdaterade"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Funktion konfiguration"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Fyll i alla fält!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "E-posten är inte från giltig domän"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Användaren '%(user)s' skapad"
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Hittade ett befintligt konto för den här e-postadressen eller namnet."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Användaren '%(nick)s' borttagen"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr "Det går inte att ta bort gästanvändaren"
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Användaren '%(nick)s' uppdaterad"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "inte installerad"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Ingen"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "Bokformat har tagits bort"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "Boken har tagits bort"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 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/editbooks.py:408
-msgid "edit metadata"
-msgstr "redigera metadata"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s är inte ett giltigt språk"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Filen som ska laddas upp måste ha en ändelse"
-
-#: cps/editbooks.py:655
-#, 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:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "Det gick inte att lagra filen %(file)s."
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "Filformatet %(ext)s lades till %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identifierare är inte skiftlägeskänsliga, skriver över gammal identifierare"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Metadata uppdaterades"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-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:1041
-#, 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:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "Det gick inte att flytta omslagsfil %(file)s: %(error)s"
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Filen %(file)s uppladdad"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "Källa eller målformat för konvertering saknas"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Det gick inte att konvertera den här boken: %(res)s"
 
+#: cps/editbooks.py:630
+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:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s är inte ett giltigt språk"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Filen som ska laddas upp måste ha en ändelse"
+
+#: cps/editbooks.py:735
+#, 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:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "Det gick inte att flytta omslagsfil %(file)s: %(error)s"
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "Bokformat har tagits bort"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "Boken har tagits bort"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "redigera metadata"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, 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:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Det gick inte att lagra filen %(file)s."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Filformatet %(ext)s lades till %(book)s"
+
 #: cps/gdrive.py:58
 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"
@@ -612,27 +637,27 @@ msgstr "Installationen av Google Drive är inte klar, försök att inaktivera oc
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Återuppringningsdomänen är inte verifierad, följ stegen för att verifiera domänen i Google utvecklarkonsol"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s hittades inte: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Skicka till Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
 
@@ -672,131 +697,111 @@ msgstr "Skicka till Kindle"
 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:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Borttagning av bokmapp för boken %(id)s misslyckades, sökvägen har undermappar: %(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Borttagning av boken %(id)s misslyckades: %(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Borttagning av boken %(id)s, boksökväg inte giltig: %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Filen %(file)s hittades inte på Google Drive"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, 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:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "Ogiltigt e-postadressformat"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "Fel vid hämtning av omslaget"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "Fel på omslagsformat"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "Det gick inte att skapa sökväg för omslag"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Omslagsfilen är inte en giltig bildfil eller kunde inte lagras"
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Endast jpg/jpeg/png/webp/bmp-filer stöds som omslagsfil"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Endast jpg/jpeg-filer stöds som omslagsfil"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "Unrar binär fil hittades inte"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "Fel vid körning av UnRar"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Väntar"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Misslyckades"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Startad"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Klar"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Okänd status"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Kobo-installation"
 
@@ -805,7 +810,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -866,12 +871,12 @@ msgstr "Google Oauth-fel, försök igen senare."
 msgid "Google Oauth error: {}"
 msgstr "Google Oauth-fel: {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} stjärnor"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Logga in"
 
@@ -887,456 +892,489 @@ msgstr "Token har löpt ut"
 msgid "Success! Please return to your device"
 msgstr "Lyckades! Vänligen återvänd till din enhet"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "Böcker"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Visa senaste böcker"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Heta böcker"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Visa heta böcker"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "Hämtade böcker"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "Visa hämtade böcker"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Bäst rankade böcker"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Lästa böcker"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Visa olästa"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Upptäck"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Kategorier"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Visa kategorival"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Serier"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Visa serieval"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Författare"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Visa författarval"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Förlag"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Visa urval av förlag"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Språk"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Visa språkval"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Betyg"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Visa val av betyg"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Filformat"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Visa val av filformat"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "Arkiverade böcker"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "Visa arkiverade böcker"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "Boklista"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "Visa boklista"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Ogiltig hylla specificerad"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Tyvärr får du inte lägga till en bok på hyllan: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, 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:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Boken har lagts till i hyllan: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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: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
-#, 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:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Boken har tagits bort från hyllan: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Skapa en hylla"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Tyvärr har du inte rätt att ta bort en bok från den här hyllan: %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Redigera en hylla"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Hyllan %(title)s skapad"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Hyllan %(title)s ändrad"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Det fanns ett fel"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "En offentlig hylla med namnet \"%(title)s\" finns redan."
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "En privat hylla med namnet \"%(title)s\" finns redan."
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Boken har tagits bort"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Ändra ordning på hyllan: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Hylla: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Fel vid öppning av hyllan. Hylla finns inte eller är inte tillgänglig"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Oväntade data vid läsning av uppdateringsinformation"
-
-#: cps/updater.py:433 cps/updater.py:545
-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:451
-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:469
-msgid "Could not fetch update information"
-msgstr "Kunde inte hämta uppdateringsinformation"
-
-#: cps/updater.py:479
-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/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Ingen versionsinformation tillgänglig"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Upptäck (slumpmässiga böcker)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Heta böcker (mest hämtade)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "Hämtade böcker av %(user)s"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Författare: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Förlag: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Serier: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Betyg: %(rating)s stars"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Filformat: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Kategori: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Språk: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Avancerad sökning"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Sök"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "Hämtningar"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Betygslista"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Lista över filformat"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Uppgifter"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lässtatus = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Avancerad sökning"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Ogiltig hylla specificerad"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Tyvärr får du inte lägga till en bok på hyllan: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, 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:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Boken har lagts till i hyllan: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, 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:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Böcker har lagts till hyllan: %(sname)s"
+
+#: cps/shelf.py:145
+#, 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:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Boken har tagits bort från hyllan: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Skapa en hylla"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Tyvärr har du inte rätt att ta bort en bok från den här hyllan: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Redigera en hylla"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Boken har tagits bort"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Ändra ordning på hyllan: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Hyllan %(title)s skapad"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Hyllan %(title)s ändrad"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Det fanns ett fel"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "En offentlig hylla med namnet \"%(title)s\" finns redan."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "En privat hylla med namnet \"%(title)s\" finns redan."
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Hylla: '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Väntar"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Misslyckades"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Startad"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Klar"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Okänd status"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Oväntade data vid läsning av uppdateringsinformation"
+
+#: cps/updater.py:438 cps/updater.py:550
+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:456
+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:474
+msgid "Could not fetch update information"
+msgstr "Kunde inte hämta uppdateringsinformation"
+
+#: cps/updater.py:484
+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/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Ingen versionsinformation tillgänglig"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Upptäck (slumpmässiga böcker)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Heta böcker (mest hämtade)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Hämtade böcker av %(user)s"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Författare: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Förlag: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Serier: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Betyg: %(rating)s stars"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Filformat: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategori: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Språk: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "Hämtningar"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Betygslista"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Lista över filformat"
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, 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:1533
+#: cps/web.py:1205
 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:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
@@ -1344,40 +1382,75 @@ msgstr "Profilen uppdaterad"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Hittade ingen giltig gmail.json-fil med OAuth-information"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "calibre e-bokkonverterings %(tool)s hittades inte"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s-format hittades inte på disken"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "E-bokkonverteraren misslyckades med okänt fel"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-konverteraren misslyckades: %(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Konverterad fil hittades inte eller mer än en fil i mappen %(folder)s"
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-bokkonverteraren misslyckades: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "calibre misslyckades med fel: %(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Ladda upp"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Användarlista"
@@ -1397,7 +1470,7 @@ msgstr "E-post"
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administratör"
@@ -1407,13 +1480,8 @@ msgstr "Administratör"
 msgid "Password"
 msgstr "Lösenord"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Ladda upp"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Hämta"
@@ -1427,7 +1495,7 @@ msgstr "Visa e-böcker"
 msgid "Edit"
 msgstr "Redigera"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1540,78 +1608,107 @@ msgstr "Redigera grundläggande konfiguration"
 msgid "Edit UI Configuration"
 msgstr "Redigera UI-konfiguration"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "Hämta felsökningspaketet"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "Visa loggfiler"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "Anslut till Calibre DB igen"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Starta om Calibre-Web"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "Stoppa Calibre-Web"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Uppdatera"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Detaljer"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Aktuell version"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Sök efter uppdatering"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Utför uppdatering"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 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:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Uppdaterar, vänligen uppdatera inte sidan"
 
@@ -1623,39 +1720,39 @@ msgstr "via"
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "Sortera efter bokdatum, nyast först"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "Sortera efter bokdatum, äldsta först"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "Sortera titel i alfabetisk ordning"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortera titel i omvänd alfabetisk ordning"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortera efter publiceringsdatum, nyast först"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortera efter publiceringsdatum, äldsta först"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "minska"
 
@@ -1663,165 +1760,166 @@ msgstr "minska"
 msgid "More by"
 msgstr "Mer av"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Ta bort boken"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Ta bort format:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Konvertera bokformat:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Konvertera från:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "välj ett alternativ"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Konvertera till:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Konvertera boken"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Boktitel"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Författare"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Beskrivning"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "Identifierare"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "Identifierartyp"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "Identifierarvärde"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "Ta bort"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "Lägg till identifierare"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Taggar"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "Serie-ID"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Betyg"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 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:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "Ladda upp omslag från lokal enhet"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Publiceringsdatum"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Förlag"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Språk"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Nej"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Ladda upp format"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "Visa bok vid Spara"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Hämta metadata"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "Spara"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Sökord"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Sök sökord "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 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:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Stäng"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Källa"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Sökningsfel!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Inga resultat hittades! Försök med ett annat sökord."
 
@@ -1930,6 +2028,7 @@ msgid "Enter "
 msgstr "Identifierare"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Är du verkligen säker?"
 
@@ -2344,62 +2443,62 @@ msgstr "Lägg till tillåtna/avvisade taggar"
 msgid "Add Allowed/Denied custom column values"
 msgstr "Lägg till tillåtna/avvisade anpassade kolumnvärden"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Läs i webbläsaren"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "Lyssna i webbläsaren"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "Publicerad"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Markera som oläst"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Markera som läst"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Läst"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "Återställ från arkivet"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "Lägg till i arkivet"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "Arkiverad"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Lägg till hyllan"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Publik)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Redigera metadata"
 
@@ -2444,7 +2543,7 @@ msgstr "Gräns för bilagestorlek"
 msgid "Save and Send Test E-mail"
 msgstr "Spara inställningarna och skicka test-e-post"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Tillbaka"
@@ -2470,7 +2569,7 @@ msgstr "Ange domännamn"
 msgid "Denied Domains (Blacklist)"
 msgstr "Avvisade domäner för registrering"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Nästa"
 
@@ -2483,6 +2582,10 @@ msgstr "Öppna filen .kobo/Kobo eReader.conf i en textredigerare och lägg till
 msgid "Kobo Token:"
 msgstr "Kobo Sync Token"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2500,29 +2603,29 @@ msgstr "Tillbaka till hemmet"
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "Sortera författare i alfabetisk ordning"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Sortera författare i omvänd alfabetisk ordning"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "Sortera stigande enligt serieindex"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "Sortera fallande enligt serieindex"
 
@@ -2586,7 +2689,7 @@ msgstr "Böcker sorterade efter Betyg"
 msgid "Books ordered by file formats"
 msgstr "Böcker ordnade av filformat"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Hyllor"
@@ -2595,63 +2698,67 @@ msgstr "Hyllor"
 msgid "Books organized in shelves"
 msgstr "Böcker organiserade i hyllor"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Hem"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Växla navigering"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "Sök i bibliotek"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Laddar upp..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Fel"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Inställningar"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Konto"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Logga ut"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "Vänligen uppdatera inte sidan"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Bläddra"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Om"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Föregående"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Kom ihåg mig"
@@ -2756,7 +2863,7 @@ msgstr "Föräldramapp"
 msgid "Select"
 msgstr "Välj"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 msgid "Ok"
 msgstr "Ok"
 
@@ -2937,15 +3044,23 @@ msgstr "När du gör det kommer du automatiskt att logga in på den här enheten
 msgid "This verification link will expire in 10 minutes."
 msgstr "Länken går ut efter 10 minuter."
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "Inga resultat hittades"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "Sökterm:"
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Resultat för:"
 
@@ -2997,23 +3112,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Ta bort den här hyllan"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "Redigera hyllegenskaper"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "Ordna böcker manuellt"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "Inaktivera ändring av ordning"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "Aktivera ändring av ordning"
 
@@ -3058,8 +3173,8 @@ msgid "System Statistics"
 msgstr "Systemstatistik"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Programbibliotek"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3089,6 +3204,18 @@ msgstr "Drifttid"
 msgid "Start Time"
 msgstr "Starttid"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Återställ användarlösenordet"
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 50d23b6bdcfa077d7cd0cfbbd411d6989a6f4225..06d8741b4eb86c453471bb9ac52bd7eb83b5d3ca 100644
GIT binary patch
delta 5442
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
X9F&uiI=rN`zWd<TiTbh`LsS0;A#Xq7

delta 5458
zcmYM$32;@_8Nl%q0!e@@K-fZpJk}(vA#BQ`ECDP<79rrmGFEgjG8!BaQ0SwhvIye{
z1_ukN1BJFmq+>%XwHwq42wFj^EmQ>oMcRm>ARQ5<|9|eCX(p53Ip^Jb&Ue1EywvSV
zIkzh%d7@S0je(y@DIpZ#x@Ok?|8uo<2>q#khrO|1o9MY&*oyknxV{b()L+DMJcKha
z(Kdu8xERxMIi}*1$WY0!hC(I{Rk2&q7j{Jtgx#1;{V$k<Z=)TYz;<{#Zoh)Y-i$^k
z(gwR=DQ00gmg3#WT*7mh$N1qT3TZUdVGDc<jr2q0H+;gM#`qoPVx#s^y)7DeK00s_
z7UBTxg?C~Ju0k`n2Z!P(I2aRoOqB7%ObUH)HWuSrBzxhvXaH|w2RwuPhVS{)5!=&f
z`(Xa~+*EWT_hDzOjN3QhUDRu^D`w_L0heHswlIu>YdHgb@jh&cYjG4-qcb>(E=?x+
zHKna^ASTevm7{y*UNkeC&{Xe0pMMRT;~QwE-Yp>iuF+K*T;onm%Qfzcru;_igk#W|
z-Hmoofj;*L8tBTneG@wHc613}!KV0o%)r;tOuZG?Kki8W&A@pY#$d*E(SQ??->`r`
zW@IfI(93A1euEBFhX!yI-2)$^nfL<Dl+oV^Y3O@n(dTbNCtQ)FU`I>Q4pznwtVd`3
za~yy**aJ_*Hc3Q#pm*#9WXv!h-8-w$6jvh$Bh;aL>;oK&&6rhpOirO-N*+N2c^Zvy
zGxo%n(bOG7GjIwG^enojUm~j)uAu`Ku%5nOhOYe#WZQ)MaT=~dpL-waCmB-NlFl?6
z9iR<5KnHZ~y2tf?Xvag*fG46UorkXVVl<E>@*B4B$EDbdoVf4~I+6dN?_I>Ep8vFN
z(M(#PYjzzPNH;W)VjO`3aTq>?cDM@-@Bo_fchEKc6z%6S`u<gPg6ZVj3}>Uy<zpV>
zhn^JJf1wPW$&b(%D$t8$AvVTpbii%sb33sS?#7<@DkktWj>gm;(R<_20e^_Z67E1V
zk;G(z!s_^e7qOK39`xp_M>kCY3#Jp$wOoQju?mOaVKl(>qNw9cbZ@jlk7?JqeE_;7
z!_lR@rHK4Hqq#JAwcdxOY&n{$)tH7G(ap3a_7!vq_G3DpM4$f@4dfEq&o}6Mjf<l_
zk%t-7N1(@kTrv4)lHo2I#^Y)<;v?u)`w<%06>L~L@@#uP8rUForo-d<1oVQMiatLZ
zQ?UYXzz5LG{R$2IOp<~T)ngO9gm!oZ4J3mNpzYB$EJ6n!f<AX68qmb}^LyjZ7oq2V
z8Jg;6vEeGl=G0$9_d;?%g@ypoV|6Juvv>4jx7fkxF25OlZVtK^9*OH4&?Tus2Yek3
z;5~HU&*Ju!K2blp*qrf0F@=UyqBq^}xL%3Qcrlupm1xS=VKb~k-+KYg&@YfXDEtmN
z0O1(A7ru{8?Hl!zfeak7v4!Wq0|oEsUhxAJ=mk-Uo`T2Gz;+|663(GlZEnA4pi(rz
z+t8WM!5pkacl!#opY`Yj{)*Xn2-7_O$0=muM`#Mq`vIo$mJep3$FcxzpNxe#1E=GU
z(f9w3S@;ne$mi%%`JLPp+M^lig0>f8(!xz~!%TE9JcvfRB(ASOGqNUb--6C~J9><2
z&|O}KMR*W<;8*B-c|`9X=#2(ADt2-y`FBRMX=s7-(2f?N9WBM>DcpE?J@v#uZb`fy
zU4oyX@BInA``^X{*5h2v9K;t7E<iJI3=RA=nu&9R$iJK6JPmE|8??h5{y{Sn32ceQ
zaeWy2c^MjbIU2|;Y>kg$TYLuHE5Af1aumHszQs|PGbGBy)FcH5o{L7d2y^f;G=R0}
z`L04E-i4;H7G0u!Xn+UNQ}I4_$Ft}XWRf<L5e8rh&c{3Pc{GsZ*Az_65UwY(97drL
zKa37sjot87<SRRTfPQ`r9jJ)wjLR`hLZ4fLW~Lg=z;^V@?J!p3dE@|vwS1K}od4G-
zxOV%o6`nyOy^Ln2a5&#wI0D&EVGWw8KVU-!&;Smi?_WfILmJ=NzCR}Rc5FxeK{SJ_
zu$Sk5BZba1?8Alt&^5k{raYa?f&UdkCb~IG(Bn1`U8+&&+D=86;2v~ORiaC{4DIJh
zG~lPuaW?q5=YI!<>u?v|jDJIC)b^(6oR7p_)aRoERG|UAfX?uBEWqRO=a<nvkuowG
zI2UJ9Z;xi65)EKACXIYE1v~mRIzS!zz!7w&XV6V_0sCNgc8*TNPWY49t(c&`4?Ey#
z^ttaaAA9j%NhyxU3Haz}^6y&L(cplW(aqR&Omy?*qHEa&UGuqUO7Foed;kr28Fs~0
z=zuSwGd+%N@k=zr8D;!8g@x#I&zB{m86Kd)j^0HFIEfB;F0Ox$uIYc#HBTKIr92ls
z_a*36Jr<qmbTl)S=u$j`U2z+x;(l}jhmsULF2~SRpN#9D#a=`^zJi>b&~#k%PiPss
zbSu#Js?eEk#g4cK)9@eYKp&!+tw%HSHM&H}tnpFAMcA2!GBgwSViR15J#jIn<2JOz
znz+6P)2Q#oA$R}{;2N^*p(8umjLt<fHy^v<66C#PsHWhi*p5c{Pjqcg;ULWUL3Ck^
z#VOPu#st<O2PK?E?xN6rLbTiGVmkGCXrK$wOg)NC@#(m}sX^9%XZ*q5_=7`eN>8Ah
zvL0Q6@6ltH#ciZL(KQ{9uJQfo5-dkEQiTq<Id0#9#nk^8x1Ys!j2|vgD8!73e6wK*
z=HXN5K-)2a`>+|FMh7~N&b09@QNWq#z<Jml6LEWQbkp5{BsGjck``8C(hiPL$iQQm
zg{RO>@&&p{(kDfBK?56sb~qEW@lGtl3iRfD7VURCw#S|5+SkROzlR2Rb`tA9lEPOs
z_`-n6(U;0Fbd%hLUQ8>|8E-)Yt3?BQ6Fp{U(dW|GARfO0^ttOXfm31^#_b!>{%WR>
ze<R#SgQ@!$y6H}#8EH2)%18n;srN<KbQosiSoD-k$Ch{p7UBYQt*g-I|BUwkMqEFP
zEvX+*QpllDj~<tAu`!OgHA>}Z<QqCnL(l&@?2QMo3tmFLr$W1FQNZQsZl8k=@KEd%
zSVH|dbPpZC7MMIr!PK8YXH<^~yn?P#{`6?g3y~~`QD|n?qnY|C&ch?<`-94(j?1t$
z^>Xw+s6aEg8tr!@awR9jRti06*c<yP8d>&?D6mdwiVM-r*9V=!cr>-QqVLZ_Gxs=l
z#??3gYtT%bz_xfHuBXp5U=DB|1qUd?T<nYP?$KyR<7)riIyb-e>wcFSH5=Hc|MiK|
dlA$I2YcH0zOi8_=Z~xl#ff<R~)aj#B{|7$CK#TwY

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 7234d5bba..662ac2d6d 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,590 +16,615 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "İstatistikler"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Sunucu yeniden başlatıldı, lütfen sayfayı yeniden yükleyin"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Sunucu kapatıyor, lütfen pencereyi kapatın"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Yönetim sayfası"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Temel Ayarlar"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Arayüz Ayarları"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr ""
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Tümü"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Yeni kullanıcı ekle"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr ""
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "E-posta sunucusu ayarları güncellendi"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Özellik Yapılandırması"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Lütfen tüm alanları doldurun!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "E-posta izin verilen bir servisten değil"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Yeni kullanıcı ekle"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "'%(user)s' kullanıcısı oluşturuldu"
-
-#: cps/admin.py:1433
-#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
-msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Kullanıcı '%(nick)s' silindi"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "%(nick)s kullanıcısını düzenle"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "'%(nick)s' kullanıcısı güncellendi"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr ""
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, 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:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "%(nick)s kullanıcısını düzenle"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 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:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Bağlantı kurulmaya çalışırken zaman aşımına uğradı"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "E-posta sunucusu ayarları güncellendi"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Özellik Yapılandırması"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Lütfen tüm alanları doldurun!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "E-posta izin verilen bir servisten değil"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "'%(user)s' kullanıcısı oluşturuldu"
+
+#: cps/admin.py:1869
+#, fuzzy
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Kullanıcı '%(nick)s' silindi"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "'%(nick)s' kullanıcısı güncellendi"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "yüklü değil"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Hiçbiri"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "metaveri düzenle"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s geçerli bir dil değil"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, 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:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "%(file)s dosyası kaydedilemedi."
-
-#: cps/editbooks.py:683
-#, 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:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "Metaveri başarıyla güncellendi"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-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:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "%(file)s dosyası yüklendi"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 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:1151
+#: cps/editbooks.py:322
 #, 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:1155
+#: cps/editbooks.py:326
 #, 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"
 
+#: cps/editbooks.py:630
+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:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s geçerli bir dil değil"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, 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:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr ""
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "metaveri düzenle"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "%(file)s dosyası kaydedilemedi."
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "%(book)s kitabına %(ext)s dosya biçimi eklendi"
+
 #: cps/gdrive.py:58
 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"
@@ -608,27 +633,27 @@ msgstr "Google Drive kurulumu tamamlanmadı, Google Drive'ı devre dışı bıra
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Geri yönlendirme alanı (callback domain) doğrulanamadı, lütfen Google geliştirici konsolunda alan adını doğrulamak için gerekli adımları izleyin."
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, 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:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s bulunamadı: %(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Kindle'a gönder"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Bu e-Posta Calibre-Web ile gönderilmiştir."
 
@@ -668,131 +693,111 @@ msgstr "Kindle'a gönder"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "İstenilen dosya okunamadı. Yanlış izinlerden kaynaklanabilir?"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, python-format
 msgid "Rename author 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "%(file)s dosyası Google Drive'da bulunamadı"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bu e-posta adresi için bir hesap mevcut."
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "Bu kullanıcı adı zaten alındı"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "Bekleniyor"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "Başarısız"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "Başladı"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "Bitti"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "Bilinmeyen Durum"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr ""
 
@@ -801,7 +806,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -862,12 +867,12 @@ msgstr "Google Oauth hatası, lütfen tekrar deneyin."
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Giriş"
 
@@ -883,456 +888,489 @@ msgstr "Token süresi doldu"
 msgid "Success! Please return to your device"
 msgstr "Başarılı! Lütfen cihazınıza dönün"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "eKitaplar"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Son eKitapları göster"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Popüler"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr ""
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Okunanlar"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Okunan ve okunmayanları göster"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Okunmamışlar"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "Okunmamışları göster"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Keşfet"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Rastgele Kitap Göster"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Kategoriler"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Kategori seçimini göster"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Seriler"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Seri seçimini göster"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Yazarlar"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Yazar seçimini göster"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "Yayıncılar"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "Yayıncı seçimini göster"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Diller"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Dil seçimini göster"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Değerlendirmeler"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "Değerlendirme seçimini göster"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Biçimler"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "Dosya biçimi seçimini göster"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "Geçersiz kitaplık seçildi"
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Maalesef bu kitaplığa eKitap eklemenize izin verilmiyor: %(shelfname)s"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "eKitap zaten bu kitaplıkta bulunuyor: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "eKitap kitaplığa eklendi: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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:156
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "eKitaplar kitaplığa eklendi: %(sname)s"
-
-#: cps/shelf.py:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "eKitaplar kitaplığa eklenemedi: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "eKitap kitaplıktan silindi: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Kitaplık oluştur"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Maalesef bu kitaplıktan eKitap silmenize izin verilmiyor: %(sname)s"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Kitaplığı düzenle"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "%(title)s kitaplığı oluşturuldu."
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "%(title)s kitaplığı değiştirildi"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Bir hata oluştu"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "Metaveri başarıyla güncellendi"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Kitaplık: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Kitaplık açılırken hata oluştu. Kitaplık mevcut değil ya da erişilebilir değil"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "Güncelleme bilgileri okunurken beklenmeyen veri"
-
-#: cps/updater.py:433 cps/updater.py:545
-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:451
-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:469
-msgid "Could not fetch update information"
-msgstr "Güncelleme bilgileri alınamadı"
-
-#: cps/updater.py:479
-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/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "Sürüm bilgisi mevcut değil"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Keşfet (Rastgele)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr ""
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr ""
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Yazar: %(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Yayınevi: %(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Seri: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "Değerlendirme: %(rating)s yıldız"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "Biçim: %(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Kategori: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Dil: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Gelişmiş Arama"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Ara"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr ""
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "Değerlendirme listesi"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "Biçim listesi"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "Görevler"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Gelişmiş Arama"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Geçersiz kitaplık seçildi"
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Maalesef bu kitaplığa eKitap eklemenize izin verilmiyor: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "eKitap zaten bu kitaplıkta bulunuyor: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "eKitap kitaplığa eklendi: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "eKitaplar zaten bu kitaplıkta bulunuyor: %(name)s"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "eKitaplar kitaplığa eklendi: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "eKitaplar kitaplığa eklenemedi: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "eKitap kitaplıktan silindi: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Kitaplık oluştur"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Maalesef bu kitaplıktan eKitap silmenize izin verilmiyor: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Kitaplığı düzenle"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Metaveri başarıyla güncellendi"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "%(title)s kitaplığı oluşturuldu."
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "%(title)s kitaplığı değiştirildi"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Bir hata oluştu"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Kitaplık: '%(name)s'"
+
+#: cps/shelf.py:466
+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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Görevler"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Bekleniyor"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Başarısız"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Başladı"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Bitti"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Bilinmeyen Durum"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Güncelleme bilgileri okunurken beklenmeyen veri"
+
+#: cps/updater.py:438 cps/updater.py:550
+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:456
+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:474
+msgid "Could not fetch update information"
+msgstr "Güncelleme bilgileri alınamadı"
+
+#: cps/updater.py:484
+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/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "Sürüm bilgisi mevcut değil"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Keşfet (Rastgele)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr ""
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Yazar: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Yayınevi: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Seri: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Değerlendirme: %(rating)s yıldız"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Biçim: %(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategori: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Dil: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr ""
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "Değerlendirme listesi"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "Biçim listesi"
+
+#: cps/web.py:1199
 #, 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:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 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/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 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:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
@@ -1340,40 +1378,75 @@ msgstr "Profil güncellendi"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "eKitap-Dönüştürücü hatası: %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Yükleme"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr ""
@@ -1393,7 +1466,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Yönetim"
@@ -1403,13 +1476,8 @@ msgstr "Yönetim"
 msgid "Password"
 msgstr "Şifre"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Yükleme"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "İndirme"
@@ -1423,7 +1491,7 @@ msgstr ""
 msgid "Edit"
 msgstr "Düzenleme"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1536,78 +1604,107 @@ msgstr ""
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:166
-msgid "Administration"
-msgstr "Yönetim"
-
 #: cps/templates/admin.html:167
-msgid "Download Debug Package"
+msgid "Scheduled Tasks"
 msgstr ""
 
-#: cps/templates/admin.html:168
-msgid "View Logs"
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
 msgstr ""
 
-#: cps/templates/admin.html:171
-msgid "Reconnect Calibre Database"
-msgstr ""
-
-#: cps/templates/admin.html:172
-msgid "Restart"
-msgstr ""
-
-#: cps/templates/admin.html:173
-msgid "Shutdown"
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
 msgstr ""
 
 #: cps/templates/admin.html:178
-msgid "Update"
-msgstr "Güncelleme"
+msgid "Generate book cover thumbnails"
+msgstr ""
 
 #: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
+msgid "Administration"
+msgstr "Yönetim"
+
+#: cps/templates/admin.html:200
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:201
+msgid "View Logs"
+msgstr ""
+
+#: cps/templates/admin.html:204
+msgid "Reconnect Calibre Database"
+msgstr ""
+
+#: cps/templates/admin.html:207
+msgid "Restart"
+msgstr ""
+
+#: cps/templates/admin.html:208
+msgid "Shutdown"
+msgstr ""
+
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
+
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "Sürüm"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "Detaylar"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "Geçerli sürüm"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Güncelle"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1619,39 +1716,39 @@ msgstr "ile"
 msgid "In Library"
 msgstr "Kitaplıkta"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "azalt"
 
@@ -1659,165 +1756,166 @@ msgstr "azalt"
 msgid "More by"
 msgstr "daha fazla"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "eKitabı Sil"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "Biçimleri Sil:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "Biçime dönüştür:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Biçimden dönüştür:"
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "bir seçenek seçin"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Dönüştür:"
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "eKitabı dönüştür"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Kitap Adı"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Yazar"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Açıklama"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Etiketler"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr ""
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Değerlendirme"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Yayınevi"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Dil"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Evet"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Hayır"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Anahtar Kelime"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr "Anahtar kelime ara"
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 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:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Kapak"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Kaynak"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Arama hatası!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1926,6 +2024,7 @@ msgid "Enter "
 msgstr "Kayıt ol"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "Emin misiniz?"
 
@@ -2338,62 +2437,62 @@ msgstr ""
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "Okunmadı olarak işaretle"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "Okundu olarak işaretle"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Okudum"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Açıklama:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Kitaplığa ekle"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr ""
 
@@ -2437,7 +2536,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr ""
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Geri"
@@ -2463,7 +2562,7 @@ msgstr "Servis adı girin"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2475,6 +2574,10 @@ msgstr ""
 msgid "Kobo Token:"
 msgstr ""
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2492,29 +2595,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2578,7 +2681,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr "Biçime göre sıralanmış eKitaplar"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2587,63 +2690,67 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "Anasayfa"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr ""
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Yükleniyor..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "Hata"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "Hesap"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Çıkış"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Gözat"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Hakkında"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Önceki"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "eKitap Detayları"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr ""
@@ -2748,7 +2855,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Kitap"
@@ -2930,15 +3037,23 @@ msgstr ""
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/search.html:5
-msgid "No Results Found"
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
 msgstr ""
 
 #: cps/templates/search.html:6
+msgid "No Results Found"
+msgstr ""
+
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr ""
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Sonuçlar:"
 
@@ -2991,23 +3106,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Bu Kitaplığı sil"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3052,7 +3167,7 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
+msgid "Program"
 msgstr ""
 
 #: cps/templates/stats.html:34
@@ -3083,6 +3198,18 @@ msgstr ""
 msgid "Start Time"
 msgstr ""
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "Kullanıcı şifresini sıfırla"
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 7dd8dec37134b4adb4d0f4902381e1632ac87729..a81ed1fb11abe70ec4282cf037508fd648ad6398 100644
GIT binary patch
delta 3539
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
RB&T?{dIm&#Po$3w`wu;EYOMeO

delta 3580
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
C5O&Z2

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index ae89e56dc..1f9548a09 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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\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,592 +15,617 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезавантажено, будь-ласка, перезавантажте сторінку"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "Виконується зупинка серверу, будь-ласка, закрийте вікно"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "Сторінка адміністратора"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Керування сервером"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Показати всі"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "Додати користувача"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Змінити налаштування SMTP"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "З'єднання з базою даних закрите"
-
-#: cps/admin.py:1386
-#, fuzzy
-msgid "Database Configuration"
-msgstr "Особливі налаштування"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "Будь-ласка, заповніть всі поля!"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr ""
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "Додати користувача"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "Користувач '%(user)s' додан"
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr ""
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "Користувача '%(nick)s' видалено"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr ""
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "Змінити користувача %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "Користувача '%(nick)s' оновлено"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr ""
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "Змінити налаштування SMTP"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Змінити користувача %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "З'єднання з базою даних закрите"
+
+#: cps/admin.py:1822
+#, fuzzy
+msgid "Database Configuration"
+msgstr "Особливі налаштування"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "Будь-ласка, заповніть всі поля!"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr ""
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Користувач '%(user)s' додан"
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr ""
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Користувача '%(nick)s' видалено"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr ""
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Користувача '%(nick)s' оновлено"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "не встановлено"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "Ні"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "змінити метадані"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr ""
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr ""
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "Завантажувальний файл повинен мати розширення"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr ""
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr ""
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr ""
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr ""
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr ""
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr ""
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr ""
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr ""
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "Завантажувальний файл повинен мати розширення"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr ""
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr ""
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "змінити метадані"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr ""
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr ""
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr ""
@@ -609,27 +634,27 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Домен зворотнього зв'язку не підтверджено. Виконайте дії для підтвердження домену, будь-ласка"
 
-#: cps/helper.py:81
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "Відправити на Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
@@ -669,130 +694,110 @@ msgstr "Відправити на Kindle"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr ""
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr ""
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr ""
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr ""
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr ""
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr ""
 
@@ -801,7 +806,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -862,12 +867,12 @@ msgstr ""
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -883,455 +888,488 @@ msgstr "Час дії токено вичерпано"
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr ""
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "Показувати останні книги"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "Популярні книги"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "Показувати популярні книги"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "Книги з найкращим рейтингом"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "Прочитані книги"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr ""
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "Огляд"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "Категорії"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "Показувати вибір категорії"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "Серії"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "Показувати вибір серії"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "Автори"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "Показувати вибір автора"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr ""
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr ""
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "Мови"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "Показувати вибір мови"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr ""
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr ""
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr ""
-
-#: cps/shelf.py:73
-#, fuzzy
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Книга додана на книжкову полицю: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: cps/shelf.py:144
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr ""
-
-#: cps/shelf.py:156
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr ""
-
-#: cps/shelf.py:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr ""
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Книга видалена з книжкової полиці: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "створити книжкову полицю"
-
-#: cps/shelf.py:236
-#, fuzzy
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "Змінити книжкову полицю"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Створена книжкова полиця %(title)s"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Книжкова полиця %(title)s змінена"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "Сталась помилка"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-msgid "Shelf successfully deleted"
-msgstr ""
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Змінити розташування книжкової полиці '%(name)s'"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Книжкова полиця: '%(name)s'"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr ""
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr ""
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr ""
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr ""
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr ""
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:531
-msgid "No release information available"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "Огляд (випадкові книги)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "Популярні книги (найбільш завантажувані)"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr ""
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr ""
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr ""
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Серії: %(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr ""
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr ""
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Категорія: %(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Мова: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "Розширений пошук"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Пошук"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "DLS"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr ""
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Розширений пошук"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/shelf.py:55
+#, fuzzy
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Книга додана на книжкову полицю: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Книга видалена з книжкової полиці: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "створити книжкову полицю"
+
+#: cps/shelf.py:218
+#, fuzzy
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Змінити книжкову полицю"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Змінити розташування книжкової полиці '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Створена книжкова полиця %(title)s"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Книжкова полиця %(title)s змінена"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Сталась помилка"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Книжкова полиця: '%(name)s'"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr ""
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr ""
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr ""
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr ""
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr ""
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr ""
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr ""
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr ""
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr ""
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr ""
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr ""
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/updater.py:536
+msgid "No release information available"
+msgstr ""
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Огляд (випадкові книги)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Популярні книги (найбільш завантажувані)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr ""
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr ""
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Серії: %(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Категорія: %(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Мова: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "DLS"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
@@ -1339,40 +1377,75 @@ msgstr "Профіль оновлено"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Додати нову книгу"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Список користувачів"
@@ -1392,7 +1465,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Адмін"
@@ -1402,13 +1475,8 @@ msgstr "Адмін"
 msgid "Password"
 msgstr "Пароль"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "Додати нову книгу"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Завантажити"
@@ -1422,7 +1490,7 @@ msgstr ""
 msgid "Edit"
 msgstr "Редагувати"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1535,78 +1603,107 @@ msgstr ""
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:166
-msgid "Administration"
-msgstr "Адміністрування"
-
 #: cps/templates/admin.html:167
-msgid "Download Debug Package"
+msgid "Scheduled Tasks"
 msgstr ""
 
-#: cps/templates/admin.html:168
-msgid "View Logs"
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
 msgstr ""
 
-#: cps/templates/admin.html:171
-msgid "Reconnect Calibre Database"
-msgstr "Повторне підключення до БД Calibre"
-
-#: cps/templates/admin.html:172
-msgid "Restart"
-msgstr ""
-
-#: cps/templates/admin.html:173
-msgid "Shutdown"
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
 msgstr ""
 
 #: cps/templates/admin.html:178
-msgid "Update"
+msgid "Generate book cover thumbnails"
 msgstr ""
 
 #: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
+msgid "Administration"
+msgstr "Адміністрування"
+
+#: cps/templates/admin.html:200
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:201
+msgid "View Logs"
+msgstr ""
+
+#: cps/templates/admin.html:204
+msgid "Reconnect Calibre Database"
+msgstr "Повторне підключення до БД Calibre"
+
+#: cps/templates/admin.html:207
+msgid "Restart"
+msgstr ""
+
+#: cps/templates/admin.html:208
+msgid "Shutdown"
+msgstr ""
+
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
+
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "Перевірка оновлень"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "Встановити оновлення"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
 
@@ -1618,39 +1715,39 @@ msgstr "через"
 msgid "In Library"
 msgstr "У бібліотеці"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr ""
 
@@ -1658,165 +1755,166 @@ msgstr ""
 msgid "More by"
 msgstr "Більше за"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "Видалити книгу"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr ""
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr ""
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr ""
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr ""
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "Назва книги"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "Автор"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "Опис"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "Теги"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr ""
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "Опубліковано"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Видавець"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Мова"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "Так"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "Ні"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "Формат завантаження"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "переглянути книгу після редагування"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "Отримати метадані"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Ключове слово"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " Пошук по ключовому слову"
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "Натисніть на обкладинку, щоб отримати метадані"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Закрити"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "Джерело"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "Помилка пошуку!"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1924,6 +2022,7 @@ msgid "Enter "
 msgstr "Зареєструватись"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr ""
 
@@ -2337,62 +2436,62 @@ msgstr ""
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "Відкрити в браузері"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "Прочитано"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "Опис:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Додати на книжкову полицю"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "Редагувати метадані"
 
@@ -2436,7 +2535,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr "Зберегти налаштування і відправити тестове повідомлення"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Назад"
@@ -2462,7 +2561,7 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Далі"
 
@@ -2474,6 +2573,10 @@ msgstr ""
 msgid "Kobo Token:"
 msgstr ""
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
@@ -2490,29 +2593,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2576,7 +2679,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2585,63 +2688,67 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "Включити навігацію"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "Завантаження..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr ""
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Налаштування"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "Вийти"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "Перегляд"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Про програму"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Попередній перегляд"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Деталі"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "Запам'ятати мене"
@@ -2746,7 +2853,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 #, fuzzy
 msgid "Ok"
 msgstr "Книга"
@@ -2924,15 +3031,23 @@ msgstr "Після цього ви автоматично ввійдете в с
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/search.html:5
-msgid "No Results Found"
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
 msgstr ""
 
 #: cps/templates/search.html:6
+msgid "No Results Found"
+msgstr ""
+
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr ""
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "Результати для:"
 
@@ -2985,23 +3100,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "Видалити цю книжкову полицю"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3046,8 +3161,8 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "Назва"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3077,6 +3192,18 @@ msgstr ""
 msgid "Start Time"
 msgstr ""
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr ""
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index a771e299c9f52a8e8d1632459b7a7444b79ae6ba..20c6919b6926761df822a4fc95ec0317e13e0983 100644
GIT binary patch
delta 12169
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
G0{;)NSeO3*

delta 12385
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

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 2cd0a4cad..e49bc6789 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,585 +16,610 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "重新连接成功"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "管理用户"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "找不到用户"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "成功删除 {} 个用户"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "显示全部"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "格式错误的请求"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "访客名称无法更改"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "游客无法拥有此角色"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "值必须是 true 或 false"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "无效角色"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "游客无法拥有此视图"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "无效视图"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "游客的本地化是自动侦测而无法设置的"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "无可用本地化"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "无有效书籍语言"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "参数未找到"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr "无效的阅读列"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr "无效的限制列"
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "您确定删除Kobo Token吗？"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "您确定要删除此域吗？"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "您确定要删除此用户吗？"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您确定要删除此书架吗？"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "您确定要修改选定用户的本地化设置吗？"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "您确定要修改选定用户的可见书籍语言吗？"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定角色吗？"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定限制吗？"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定可视化限制吗？"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "您确定要更改所选用户的书架同步行为吗？"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "您确定要更改 Calibre 库位置吗？"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "您确定要删除 Calibre-Web 的同步数据库以强制与您的 Kobo Reader 进行完全同步吗"
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr "标签未找到"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "无效的动作"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒绝"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允许"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr "{} 同步项目被删除"
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr "标签未找到"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "无效的动作"
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "请输入一个LDAP服务账号和密码 "
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr "请输入一个LDAP服务账号"
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成员用户过滤器需要有一个“%s”格式标识符"
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成员用户过滤器中有不匹配的括号"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "添加新用户"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "编辑邮件服务器设置"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr "G-Mail账号校验成功"
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "数据库路径无效，请输入正确的路径"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "数据库不可写入"
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "密钥文件路径无效，请输入正确的路径"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "证书文件路径无效，请输入正确的路径"
-
-#: cps/admin.py:1378
-msgid "Database Settings updated"
-msgstr "数据库设置已更新"
-
-#: cps/admin.py:1386
-msgid "Database Configuration"
-msgstr "数据库配置"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "请填写所有字段！"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "邮箱不在有效域中"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "添加新用户"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "用户“%(user)s”已创建"
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr "使用此邮箱或用户名的账号已经存在。"
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "用户“%(nick)s”已删除"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr "无法删除游客用户"
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "管理员账户不存在，无法删除用户"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "编辑用户 %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "用户“%(nick)s”已更新"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "发生一个未知错误，请稍后再试。"
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "编辑邮件服务器设置"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr "G-Mail账号校验成功"
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "发生一个未知错误，请稍后再试。"
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "编辑用户 %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件无法保存在临时目录中"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr "更新期间无法替换文件"
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一个LDAP用户"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能创建至少一个LDAP用户"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "错误：%(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "错误：在LDAP服务器的响应中没有返回用户"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "数据库中没有找到至少一个LDAP用户"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} 用户被成功导入"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "数据库路径无效，请输入正确的路径"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "数据库不可写入"
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "密钥文件路径无效，请输入正确的路径"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "证书文件路径无效，请输入正确的路径"
+
+#: cps/admin.py:1814
+msgid "Database Settings updated"
+msgstr "数据库设置已更新"
+
+#: cps/admin.py:1822
+msgid "Database Configuration"
+msgstr "数据库配置"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "请填写所有字段！"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "邮箱不在有效域中"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "用户“%(user)s”已创建"
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr "使用此邮箱或用户名的账号已经存在。"
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "用户“%(nick)s”已删除"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr "无法删除游客用户"
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "管理员账户不存在，无法删除用户"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "用户“%(nick)s”已更新"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "未安装"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "无"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "书籍格式已成功删除"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "书籍已成功删除"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr "您没有删除书籍的权限"
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "编辑元数据"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "'%(langname)s' 不是一种有效语言"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr "用户没有权限上传其他文件格式"
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "要上传的文件必须具有扩展名"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "创建路径 %(path)s 失败(权限拒绝)。"
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "保存文件 %(file)s 失败。"
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "已添加 %(ext)s 格式到 %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr "用户没有权限上传封面"
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr "编辑书籍时出错: {}"
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr "文件 %(filename)s 无法保存到临时目录"
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "移动封面文件失败 %(file)s：%(error)s"
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s' 不是一种有效语言"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "要上传的文件必须具有扩展名"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "文件 %(filename)s 无法保存到临时目录"
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "移动封面文件失败 %(file)s：%(error)s"
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "书籍格式已成功删除"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "书籍已成功删除"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr "您没有删除书籍的权限"
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "编辑元数据"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr "用户没有权限上传其他文件格式"
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "创建路径 %(path)s 失败(权限拒绝)。"
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "保存文件 %(file)s 失败。"
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "已添加 %(ext)s 格式到 %(book)s"
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云端硬盘"
@@ -603,27 +628,27 @@ msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "发送到Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "此邮件已经通过Calibre-Web发送。"
 
@@ -663,130 +688,110 @@ msgstr "%(book)s发送到Kindle"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取请求的文件。可能有错误的权限设置？"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr "阅读状态无法设置: {}"
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "删除书籍 %(id)s失败：%(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "仅从数据库中删除书籍 %(id)s，数据库中的书籍路径无效： %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr "重命名此路径: {}文件时出错"
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "无效的邮件地址格式"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
-msgstr "下载封面必须的 Python 模块'advocate' 未安装"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
+msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "下载封面时出错"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "封面格式出错"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr "您没有访问本地主机或本地网络进行封面上传"
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "创建封面路径失败"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的图片文件，或者无法存储"
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr "封面文件内容无效"
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "执行UnRar时出错"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "等待中"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "失败"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "已开始"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "已完成"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "未知状态"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Kobo 设置"
 
@@ -795,7 +800,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -856,12 +861,12 @@ msgstr "Google Oauth 错误，请重试。"
 msgid "Google Oauth error: {}"
 msgstr "Google Oauth 错误: {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "登录"
 
@@ -877,453 +882,486 @@ msgstr "Token已过期"
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "书籍"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "显示最近书籍"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "热门书籍"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "显示热门书籍"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "下载历史"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "显示下载过的书籍"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "已读书籍"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "显示阅读状态"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "未读书籍"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "显示未读"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "发现"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "显示随机书籍"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "分类"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "显示分类选择"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "丛书"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "显示丛书选择"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "作者"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "显示作者选择"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "出版社"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "显示出版社选择"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "语言"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "显示语言选择"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "评分"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "显示评分选择"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "文件格式"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "归档书籍"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "书籍列表"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "显示书籍列表"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "指定的书架无效"
-
-#: cps/shelf.py:73
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "对不起，您没有添加书籍到这个书架的权限"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "此书籍已经是书架 %(shelfname)s 的一部分"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "此书籍已被添加到书架：%(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr "您没有向书架添加书籍的权限"
-
-#: 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:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "无法添加书籍到书架：%(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "此书已从书架 %(sname)s 中删除"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr "抱歉，您没有从这个书架删除书籍的权限"
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "创建书架"
-
-#: cps/shelf.py:236
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "对不起，您没有编辑这个书架的权限"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "编辑书架"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr "抱歉，您没有创建公开书架的权限"
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "书架 %(title)s 已创建"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "书架 %(title)s 已修改"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "发生错误"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "公共书架：%(title)s已经存在已经存在。"
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "私有书架：%(title)s已经存在已经存在。"
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr "删除书架时出错"
-
-#: cps/shelf.py:339
-msgid "Shelf successfully deleted"
-msgstr "书架已成功删除"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "修改书架 %(name)s 顺序"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "书架：%(name)s"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "打开书架出错。书架不存在或不可访问"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "读取更新信息时出现意外数据"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "无可用更新。您已经安装了最新版本"
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "有新的更新。单击下面的按钮以更新到最新版本。"
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr "无法获取更新信息"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr "点击下面按钮更新到最新稳定版本。"
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "无可用发布信息"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "发现(随机书籍)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "热门书籍（最多下载）"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "%(user)s 下载过的书籍"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "作者：%(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "出版社：%(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "丛书：%(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "评分：%(rating)s 星"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "文件格式：%(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "分类：%(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "语言：%(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "高级搜索"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "搜索"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "下载次数"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "评分列表"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "文件格式列表"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "任务列表"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "高级搜索"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "指定的书架无效"
+
+#: cps/shelf.py:55
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "对不起，您没有添加书籍到这个书架的权限"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "此书籍已经是书架 %(shelfname)s 的一部分"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "此书籍已被添加到书架：%(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr "您没有向书架添加书籍的权限"
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "书籍已经在书架 %(name)s 中了"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "书籍已经被添加到书架 %(sname)s 中"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "无法添加书籍到书架：%(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "此书已从书架 %(sname)s 中删除"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "抱歉，您没有从这个书架删除书籍的权限"
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "创建书架"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "对不起，您没有编辑这个书架的权限"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "编辑书架"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr "删除书架时出错"
+
+#: cps/shelf.py:231
+msgid "Shelf successfully deleted"
+msgstr "书架已成功删除"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "修改书架 %(name)s 顺序"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "抱歉，您没有创建公开书架的权限"
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "书架 %(title)s 已创建"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "书架 %(title)s 已修改"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "发生错误"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "公共书架：%(title)s已经存在已经存在。"
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "私有书架：%(title)s已经存在已经存在。"
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "书架：%(name)s"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "打开书架出错。书架不存在或不可访问"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "任务列表"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "等待中"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "失败"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "已开始"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "已完成"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "未知状态"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "读取更新信息时出现意外数据"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "无可用更新。您已经安装了最新版本"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "有新的更新。单击下面的按钮以更新到最新版本。"
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "无法获取更新信息"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "点击下面按钮更新到最新稳定版本。"
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "无可用发布信息"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "发现(随机书籍)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "热门书籍（最多下载）"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "%(user)s 下载过的书籍"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "作者：%(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "出版社：%(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "丛书：%(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "评分：%(rating)s 星"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "文件格式：%(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "分类：%(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "语言：%(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "下载次数"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "评分列表"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "文件格式列表"
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1331,40 +1369,75 @@ msgstr "资料已更新"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "找不到包含 OAuth 信息的有效 gmail.json 文件"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre 电子书转换器%(tool)s没有发现"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "硬盘上找不到 %(format)s 格式"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "发生未知错误，书籍转换失败"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 转换失败：%(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "电子书转换器失败： %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 运行失败，错误信息：%(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "上传书籍"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "用户列表"
@@ -1384,7 +1457,7 @@ msgstr "邮箱地址"
 msgid "Send to Kindle E-mail Address"
 msgstr "接收书籍的Kindle邮箱地址"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理权限"
@@ -1394,13 +1467,8 @@ msgstr "管理权限"
 msgid "Password"
 msgstr "密码"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "上传书籍"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "下载书籍"
@@ -1414,7 +1482,7 @@ msgstr "查看书籍"
 msgid "Edit"
 msgstr "编辑书籍"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1526,78 +1594,107 @@ msgstr "编辑基本配置"
 msgid "Edit UI Configuration"
 msgstr "编辑界面配置"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "下载Debug包"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "查看日志文件"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "重新连接到Calibre数据库"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "重启"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "停止"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "更新"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "版本"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "详情"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "当前版本"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "确定"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "您确定要关闭吗？"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -1609,39 +1706,39 @@ msgstr "通过"
 msgid "In Library"
 msgstr "在书库"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "按图书日期排序，最新优先"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "按图书日期排序，最旧优先"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "按标题按字母顺序排序"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "按标题逆字母顺序排序"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新优先"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "按出版日期排序，最旧优先"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "减少"
 
@@ -1649,164 +1746,165 @@ msgstr "减少"
 msgid "More by"
 msgstr "更多"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "删除书籍"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "删除格式:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "转换书籍格式:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "转换从："
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "选择一个选项"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "转换到："
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "转换书籍"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "书名"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "作者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "简介"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "书号"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "书号类型"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "书号编号"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "移除"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "添加书号"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "标签"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "丛书编号"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "评分"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "从URL获取封面（JPEG - 图片将下载并存储在数据库中）"
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "从本地磁盘上传封面"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "出版日期"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "语言"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "确认"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "没有"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "上传格式"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "查看保存书籍"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "保存"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "关键字"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 msgid "Search keyword"
 msgstr " 搜索关键字 "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "单击封面将元数据加载到表单"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "关闭"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "源"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "搜索错误！"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "无搜索结果！请尝试另一个关键字。"
 
@@ -1913,6 +2011,7 @@ msgid "Enter "
 msgstr "输入"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "您真的确认？"
 
@@ -2324,62 +2423,62 @@ msgstr "添加显示或隐藏书籍的标签值"
 msgid "Add Allowed/Denied custom column values"
 msgstr "添加显示或隐藏书籍的自定义栏目值"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "在线阅读"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "在线听书"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "%(range)s 第%(index)s册"
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "出版日期"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "标为未读"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "标为已读"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "已读"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "从档案还原"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "添加到归档"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "归档"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "简介:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "添加到书架"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(公共)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "编辑元数据"
 
@@ -2423,7 +2522,7 @@ msgstr "附件大小限制"
 msgid "Save and Send Test E-mail"
 msgstr "保存设置并发送测试邮件"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "后退"
@@ -2449,7 +2548,7 @@ msgstr "输入域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止注册的域名（黑名单）"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "下一个"
 
@@ -2461,6 +2560,10 @@ msgstr "在文本编辑器中打开.kobo/Kobo eReader.conf，添加（或编辑
 msgid "Kobo Token:"
 msgstr "Kobo Token:"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Web 实例未配置，请联系您的管理员！"
@@ -2477,29 +2580,29 @@ msgstr "回到首页"
 msgid "Logout User"
 msgstr "登出账号"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr "按下载数排序"
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr "按下载数逆序排序"
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母顺序排序"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母顺序排序"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "按丛书编号排序"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "按丛书编号逆排序"
 
@@ -2563,7 +2666,7 @@ msgstr "书籍按评分排序"
 msgid "Books ordered by file formats"
 msgstr "书籍按文件格式排序"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "书架列表"
@@ -2572,63 +2675,67 @@ msgstr "书架列表"
 msgid "Books organized in shelves"
 msgstr "书架上的书"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "首页"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "切换导航"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "搜索书库"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "正在上传..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "错误"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "设置"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "账号"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "注销"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "请不要刷新页面"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "按条件浏览"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "关于"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "上一个"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "书籍详情"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "记住我"
@@ -2733,7 +2840,7 @@ msgstr "父目录"
 msgid "Select"
 msgstr "选择"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 msgid "Ok"
 msgstr "完成"
 
@@ -2909,15 +3016,23 @@ msgstr "验证后，您将自动在新设备上登录。"
 msgid "This verification link will expire in 10 minutes."
 msgstr "此验证链接将在10分钟后失效。"
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "无搜索结果"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "搜索项："
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "结果："
 
@@ -2969,23 +3084,23 @@ msgstr "从："
 msgid "To:"
 msgstr "到："
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "删除此书架"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "编辑书架属性"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "手动排列书籍排列顺序"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "禁止改变顺序"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "允许改变顺序"
 
@@ -3030,8 +3145,8 @@ msgid "System Statistics"
 msgstr "系统统计"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "程序名称"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3061,6 +3176,18 @@ msgstr "运行时间"
 msgid "Start Time"
 msgstr "开始时间"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "重置用户密码"
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 4dce851ca5fceb982950afa56f2b910c30f3d249..e9dabfe3a3560e428f4ab17ae1f2d91c212de833 100644
GIT binary patch
delta 11629
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

delta 11692
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

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 8f5928703..bab864cb3 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -16,587 +16,612 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr "服務器已重啟，請刷新頁面"
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr "正在關閉服務器，請關閉窗口"
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr "重新連接成功"
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr "管理頁"
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "管理用戶"
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr "找不到用戶"
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr "成功刪除 {} 個用戶"
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "顯示全部"
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr "格式錯誤的請求"
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr "訪客名稱無法更改"
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr "遊客無法擁有此角色"
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr "管理員賬戶不存在，無法刪除管理員角色"
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr "值必須是 true 或 false"
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr "無效角色"
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr "遊客無法擁有此視圖"
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr "無效視圖"
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "訪客的本地化是自動偵測而無法設置的"
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr "無可用本地化"
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr "無有效書籍語言"
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr "參數未找到"
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr "無效的閱讀列"
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr "無效的限制列"
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "您確定刪除Kobo Token嗎？"
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr "您確定要刪除此網域嗎？"
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr "您確定要刪除此用戶嗎？"
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您確定要刪除此書架嗎？"
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "您確定要修改選定用戶的本地化設置嗎？"
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "您確定要修改選定用戶的可見書籍語言嗎？"
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "您確定要修改選定用戶的選定角色嗎？"
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "您確定要修改選定用戶的選定限制嗎？"
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "您確定要修改選定用戶的選定可視化限制嗎？"
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "您確定要更改所選用戶的書架同步行為嗎？"
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "您確定要更改 Calibre 庫位置嗎？"
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr "標籤未找到"
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr "無效的動作"
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒絕"
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允許"
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr "標籤未找到"
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr "無效的動作"
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未為 Web 應用程序配置"
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日誌文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "訪問日誌路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "請輸入LDAP主機、端口、DN和用戶對象標識符"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "請輸入一個LDAP服務賬號和密碼 "
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr "請輸入一個LDAP服務賬號"
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP群組對象過濾器需要一個具有“%s”格式標識符號"
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP群組對象過濾器的括號不匹配"
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用戶對象過濾器需要一個具有“%s”格式標識符"
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用戶對象過濾器的括號不匹配"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成員用戶過濾器需要有一個“%s”格式標識符號"
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成員用戶過濾器中有不匹配的括號"
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr "添加新用戶"
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "編輯郵件服務器設置"
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr "G-Mail賬號驗證成功"
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "數據庫路徑無效，請輸入正確的路徑"
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr "數據庫不可寫入"
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "密鑰文件路徑無效，請輸入正確的路徑"
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "證書文件路徑無效，請輸入正確的路徑"
-
-#: cps/admin.py:1378
-#, fuzzy
-msgid "Database Settings updated"
-msgstr "郵件服務器設置已更新"
-
-#: cps/admin.py:1386
-msgid "Database Configuration"
-msgstr "數據庫配置"
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr "請填寫所有欄位！"
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr "郵箱不在有效網域中"
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr "添加新用戶"
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "用戶“%(user)s”已創建"
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr "使用此郵箱或用戶名的賬號已經存在。"
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "用戶“%(nick)s”已刪除"
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr "無法刪除訪客用戶"
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr "管理員賬戶不存在，無法刪除用戶"
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "編輯用戶 %(nick)s"
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "用戶“%(nick)s”已更新"
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr "發生一個未知錯誤，請稍後再試。"
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr "編輯郵件服務器設置"
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr "G-Mail賬號驗證成功"
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "發送給%(email)s的測試郵件已進入隊列。請檢查任務結果"
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "發送測試郵件時出錯：%(res)s"
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr "請先配置您的郵箱地址..."
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr "發生一個未知錯誤，請稍後再試。"
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "編輯用戶 %(nick)s"
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr "日誌文件查看器"
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr "正在請求更新包"
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr "正在下載更新包"
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr "正在解壓更新包"
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr "正在替換文件"
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr "數據庫連接已關閉"
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr "正在停止服務器"
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，請點擊確定並刷新頁面"
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr "更新失敗："
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP錯誤"
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "連接錯誤"
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "建立連接超時"
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "一般錯誤"
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件無法保存在臨時目錄中"
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr "更新時檔案無法替換變更"
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一個LDAP用戶"
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能創建至少一個LDAP用戶"
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "錯誤：%(ldaperror)s"
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr "錯誤：在LDAP服務器的響應中沒有返回用戶"
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "數據庫中沒有找到至少一個LDAP用戶"
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr "{} 用戶被成功導入"
 
-#: cps/converter.py:30
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "數據庫路徑無效，請輸入正確的路徑"
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr "數據庫不可寫入"
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "密鑰文件路徑無效，請輸入正確的路徑"
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "證書文件路徑無效，請輸入正確的路徑"
+
+#: cps/admin.py:1814
+#, fuzzy
+msgid "Database Settings updated"
+msgstr "郵件服務器設置已更新"
+
+#: cps/admin.py:1822
+msgid "Database Configuration"
+msgstr "數據庫配置"
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr "請填寫所有欄位！"
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr "郵箱不在有效網域中"
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "用戶“%(user)s”已創建"
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr "使用此郵箱或用戶名的賬號已經存在。"
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "用戶“%(nick)s”已刪除"
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr "無法刪除訪客用戶"
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr "管理員賬戶不存在，無法刪除用戶"
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "用戶“%(nick)s”已更新"
+
+#: cps/converter.py:31
 msgid "not installed"
 msgstr "未安裝"
 
-#: cps/converter.py:31
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr "無"
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr "書籍格式已成功刪除"
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr "書籍已成功刪除"
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr "編輯元數據"
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s 不是一個有效的數值，忽略"
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, fuzzy, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s 不是一種有效語言"
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "不能上傳文件附檔名為“%(ext)s”的文件到此服務器"
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr "要上傳的文件必須具有附檔名"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "創建路徑 %(path)s 失敗(權限拒絕)。"
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "保存文件 %(file)s 失敗。"
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "已添加 %(ext)s 格式到 %(book)s"
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "標識符不區分大小寫，覆蓋舊標識符"
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr "已成功更新元數據"
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "上傳的書籍可能已經存在，建議修改後重新上傳： "
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr "文件 %(filename)s 無法保存到臨時目錄"
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "移動封面文件失敗 %(file)s：%(error)s"
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上傳"
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr "轉換的來源或目的格式不存在"
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "書籍已經被成功加入到 %(book_format)s 格式轉換隊列"
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "轉換此書籍時出現錯誤： %(res)s"
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "上傳的書籍可能已經存在，建議修改後重新上傳： "
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, fuzzy, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s 不是一種有效語言"
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "不能上傳文件附檔名為“%(ext)s”的文件到此服務器"
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr "要上傳的文件必須具有附檔名"
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "文件 %(filename)s 無法保存到臨時目錄"
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "移動封面文件失敗 %(file)s：%(error)s"
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr "書籍格式已成功刪除"
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr "書籍已成功刪除"
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr "編輯元數據"
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s 不是一個有效的數值，忽略"
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "創建路徑 %(path)s 失敗(權限拒絕)。"
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "保存文件 %(file)s 失敗。"
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "已添加 %(ext)s 格式到 %(book)s"
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Google Drive 設置未完成，請嘗試停用並再次激活Google雲端硬碟"
@@ -605,27 +630,27 @@ msgstr "Google Drive 設置未完成，請嘗試停用並再次激活Google雲
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回調網域名稱尚未被驗證，請在google開發者控制台按步驟驗證網域名稱"
 
-#: cps/helper.py:81
+#: 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:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr "發送到Kindle"
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "此郵件已經通過Calibre-Web發送。"
 
@@ -665,131 +690,111 @@ msgstr "%(book)s發送到Kindle"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "無法讀取請求的文件。可能有錯誤的權限設置？"
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "刪除書的文件夾%(id)s失敗，路徑有子文件夾：%(path)s"
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "刪除書籍 %(id)s失敗：%(message)s"
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "僅從數據庫中刪除書籍 %(id)s，數據庫中的書籍路徑無效： %(path)s"
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, fuzzy, 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:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, 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:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此郵箱的賬號已經存在。"
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr "此用戶名已被使用"
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr "無效的郵件地址格式"
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr "下載封面時出錯"
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr "封面格式出錯"
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr "創建封面路徑失敗"
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的圖片文件，或者無法儲存"
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp格式文件"
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "僅將jpg、jpeg文件作為封面文件"
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar執行文件"
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr "執行UnRar時出錯"
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr "等待中"
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr "失敗"
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr "已開始"
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr "已完成"
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr "未知狀態"
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 #, fuzzy
 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:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr "Kobo 設置"
 
@@ -798,7 +803,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -859,12 +864,12 @@ msgstr "Google Oauth 錯誤，請重試。"
 msgid "Google Oauth error: {}"
 msgstr "Google Oauth 錯誤: {}"
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr "登入"
 
@@ -880,454 +885,487 @@ msgstr "Token已過期"
 msgid "Success! Please return to your device"
 msgstr "成功！請返回您的設備"
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr "書籍"
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr "顯示最近書籍"
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "熱門書籍"
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr "顯示熱門書籍"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr "已下載書籍"
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "顯示下載過的書籍"
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr "最高評分書籍"
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "顯示最高評分書籍"
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr "已讀書籍"
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr "顯示閱讀狀態"
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr "未讀書籍"
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr "顯示未讀"
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr "發現"
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "隨機顯示書籍"
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr "分類"
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "顯示分類選擇"
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr "叢書"
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "顯示叢書選擇"
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "作者"
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "顯示作者選擇"
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr "出版社"
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "顯示出版社選擇"
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr "語言"
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "顯示語言選擇"
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "評分"
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "顯示評分選擇"
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "文件格式"
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "顯示文件格式選擇"
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr "歸檔書籍"
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "顯示歸檔書籍"
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr "書籍列表"
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "顯示書籍列表"
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "指定的書架無效"
-
-#: cps/shelf.py:73
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "對不起，您沒有添加書籍到這個書架的權限"
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "此書籍已經是書架 %(shelfname)s 的一部分"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "此書籍已被添加到書架：%(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: 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:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "無法添加書籍到書架：%(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "此書已從書架 %(sname)s 中刪除"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "創建書架"
-
-#: cps/shelf.py:236
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "對不起，您沒有編輯這個書架的權限"
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr "編輯書架"
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "書架 %(title)s 已創建"
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "書架 %(title)s 已修改"
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr "發生錯誤"
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "公共書架：%(title)s已經存在已經存在。"
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "私有書架：%(title)s已經存在。"
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "書籍已成功刪除"
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "修改書架 %(name)s 順序"
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "書架：%(name)s"
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "打開書架出錯。書架不存在或不可訪問"
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr "讀取更新信息時出現未預期數據"
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr "無可用更新。您已經安裝了最新版本"
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "有新的更新。單擊下面的按鈕以更新到最新版本。"
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr "無法獲取更新信息"
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr "點擊下面按鈕更新到最新穩定版本。"
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, 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:531
-msgid "No release information available"
-msgstr "無可用發佈信息"
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr "發現(隨機書籍)"
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr "熱門書籍（最多下載）"
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "%(user)s 下載過的書籍"
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr "作者：%(name)s"
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "出版社：%(name)s"
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "叢書：%(serie)s"
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "評分：%(rating)s 星"
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr "文件格式：%(format)s"
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr "分類：%(name)s"
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr "語言：%(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr "進階搜尋"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "搜尋"
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr "下載次數"
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr "評分列表"
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr "文件格式列表"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr "任務列表"
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr "出版時間晚於 "
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr "出版時間早於 "
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評分 <= %(rating)s"
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評分 >= %(rating)s"
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "閱讀狀態 = %(status)s"
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "進階搜尋"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "指定的書架無效"
+
+#: cps/shelf.py:55
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "對不起，您沒有添加書籍到這個書架的權限"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "此書籍已經是書架 %(shelfname)s 的一部分"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "此書籍已被添加到書架：%(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "書籍已經在書架 %(name)s 中了"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "書籍已經被添加到書架 %(sname)s 中"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "無法添加書籍到書架：%(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "此書已從書架 %(sname)s 中刪除"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "創建書架"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "對不起，您沒有編輯這個書架的權限"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "編輯書架"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "書籍已成功刪除"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "修改書架 %(name)s 順序"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "書架 %(title)s 已創建"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "書架 %(title)s 已修改"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "發生錯誤"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "公共書架：%(title)s已經存在已經存在。"
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "私有書架：%(title)s已經存在。"
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "書架：%(name)s"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "打開書架出錯。書架不存在或不可訪問"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "任務列表"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "等待中"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "失敗"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "已開始"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "已完成"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "未知狀態"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "讀取更新信息時出現未預期數據"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "無可用更新。您已經安裝了最新版本"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "有新的更新。單擊下面的按鈕以更新到最新版本。"
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "無法獲取更新信息"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "點擊下面按鈕更新到最新穩定版本。"
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, 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:536
+msgid "No release information available"
+msgstr "無可用發佈信息"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "發現(隨機書籍)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "熱門書籍（最多下載）"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "%(user)s 下載過的書籍"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "作者：%(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "出版社：%(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "叢書：%(serie)s"
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "評分：%(rating)s 星"
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr "文件格式：%(format)s"
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr "分類：%(name)s"
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr "語言：%(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr "下載次數"
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr "評分列表"
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr "文件格式列表"
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”登入"
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr "資料已更新"
 
@@ -1335,40 +1373,75 @@ msgstr "資料已更新"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "找不到包含 OAuth 信息的有效 gmail.json 文件"
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "沒有發現Calibre 電子書轉換器%(tool)s"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "硬碟上找不到 %(format)s 格式"
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr "發生未知錯誤，書籍轉換失敗"
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 轉換失敗：%(error)s"
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到轉換後的文件或文件夾%(folder)s中有多個文件"
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "電子書轉換器失敗： %(error)s"
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 運行失敗，錯誤信息：%(error)s"
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "上傳書籍"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "用戶列表"
@@ -1388,7 +1461,7 @@ msgstr "郵箱地址"
 msgid "Send to Kindle E-mail Address"
 msgstr "接收書籍的Kindle郵箱地址"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理權限"
@@ -1398,13 +1471,8 @@ msgstr "管理權限"
 msgid "Password"
 msgstr "密碼"
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "上傳書籍"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "下載書籍"
@@ -1418,7 +1486,7 @@ msgstr "查看書籍"
 msgid "Edit"
 msgstr "編輯書籍"
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1530,78 +1598,107 @@ msgstr "編輯基本配置"
 msgid "Edit UI Configuration"
 msgstr "編輯界面配置"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr ""
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr ""
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:167
+#: cps/templates/admin.html:200
 msgid "Download Debug Package"
 msgstr "下載除錯包"
 
-#: cps/templates/admin.html:168
+#: cps/templates/admin.html:201
 msgid "View Logs"
 msgstr "查看日誌文件"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
 msgstr "重新連接到Calibre數據庫"
 
-#: cps/templates/admin.html:172
+#: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "重啟"
 
-#: cps/templates/admin.html:173
+#: cps/templates/admin.html:208
 msgid "Shutdown"
 msgstr "停止"
 
-#: cps/templates/admin.html:178
-msgid "Update"
-msgstr "更新"
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
 
-#: cps/templates/admin.html:182
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr "版本"
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr "詳情"
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr "當前版本"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr "檢查更新"
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr "執行更新"
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr "您確定要重啟嗎？"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "確定"
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr "您確定要關閉嗎？"
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，請不要刷新頁面"
 
@@ -1613,39 +1710,39 @@ msgstr "通過"
 msgid "In Library"
 msgstr "在書庫"
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr "按圖書日期排序，最新優先"
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr "按圖書日期排序，最舊優先"
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr "按標題按字母順序排序"
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr "按標題逆字母順序排序"
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新優先"
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr "按出版日期排序，最舊優先"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr "減少"
 
@@ -1653,165 +1750,166 @@ msgstr "減少"
 msgid "More by"
 msgstr "更多"
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr "刪除書籍"
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr "刪除格式:"
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr "轉換書籍格式:"
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "轉換從："
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "選擇一個選項"
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "轉換到："
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "轉換書籍"
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr "書名"
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr "作者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr "簡介"
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr "書號"
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr "書號類型"
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr "書號編號"
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr "移除"
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr "添加書號"
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr "標籤"
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr "叢書編號"
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr "評分"
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "從URL獲取封面（JPEG - 圖片將下載並存儲在數據庫中）"
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr "從本地硬碟上傳封面"
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr "出版日期"
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "語言"
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr "確認"
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr "沒有"
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr "上傳格式"
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr "查看保存書籍"
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr "獲取元數據"
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr "儲存"
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "關鍵字"
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 #, fuzzy
 msgid "Search keyword"
 msgstr " 搜索關鍵字 "
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr "單擊封面將元數據加載到表單"
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr "加載中..."
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "關閉"
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr "來源"
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr "搜索錯誤！"
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr "無搜索結果！請嘗試另一個關鍵字。"
 
@@ -1920,6 +2018,7 @@ msgid "Enter "
 msgstr "書號"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr "您真的確認？"
 
@@ -2333,62 +2432,62 @@ msgstr "添加顯示或隱藏書籍的標籤值"
 msgid "Add Allowed/Denied custom column values"
 msgstr "添加顯示或隱藏書籍的自定義欄位值"
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr "在線閱讀"
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr "在線聽書"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "%(range)s 第%(index)s冊"
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr "出版日期"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr "標為未讀"
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr "標為已讀"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr "已讀"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr "從歸檔檔案還原"
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr "添加到歸檔"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr "歸檔"
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr "簡介:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "添加到書架"
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(公共)"
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr "編輯元數據"
 
@@ -2432,7 +2531,7 @@ msgstr "附件大小限制"
 msgid "Save and Send Test E-mail"
 msgstr "保存設置並發送測試郵件"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "後退"
@@ -2458,7 +2557,7 @@ msgstr "輸入網域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止註冊的網域名（黑名單）"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "下一個"
 
@@ -2471,6 +2570,10 @@ msgstr "在文本編輯器中打開.kobo/Kobo eReader.conf，添加（或編輯
 msgid "Kobo Token:"
 msgstr "Kobo 同步 Token"
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Web 實例未配置，請聯繫您的系統管理員！"
@@ -2487,29 +2590,29 @@ msgstr "回到首頁"
 msgid "Logout User"
 msgstr "登出賬號"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母順序排序"
 
-#: cps/templates/index.html:78 cps/templates/search.html:35
-#: cps/templates/shelf.html:24
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母順序排序"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr "按叢書編號排序"
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr "按叢書編號逆排序"
 
@@ -2573,7 +2676,7 @@ msgstr "書籍按評分排序"
 msgid "Books ordered by file formats"
 msgstr "書籍按文件格式排序"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "書架列表"
@@ -2582,63 +2685,67 @@ msgstr "書架列表"
 msgid "Books organized in shelves"
 msgstr "書架上的書"
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr "首頁"
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr "切換導航"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr "搜索書庫"
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr "正在上傳..."
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr "錯誤"
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr "上傳完成，正在處理中，請稍候..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "設置"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr "賬號"
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr "登出"
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr "請不要刷新頁面"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr "瀏覽"
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "關於"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "上一個"
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "書籍詳情"
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr "記住我"
@@ -2743,7 +2850,7 @@ msgstr "父目錄"
 msgid "Select"
 msgstr "選擇"
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 msgid "Ok"
 msgstr "完成"
 
@@ -2919,15 +3026,23 @@ msgstr "驗證後，您將自動在新設備上登入。"
 msgid "This verification link will expire in 10 minutes."
 msgstr "此驗證連接將在10分鐘後失效。"
 
-#: cps/templates/search.html:5
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/search.html:6
 msgid "No Results Found"
 msgstr "無搜索結果"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr "搜索項："
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr "結果："
 
@@ -2979,23 +3094,23 @@ msgstr "從："
 msgid "To:"
 msgstr "到："
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr "刪除此書架"
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr "編輯書架屬性"
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr "手動排列書籍排列順序"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr "禁止改變順序"
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr "允許改變順序"
 
@@ -3040,8 +3155,8 @@ msgid "System Statistics"
 msgstr "系統統計"
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "程式名稱"
+msgid "Program"
+msgstr ""
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3071,6 +3186,18 @@ msgstr "運行時間"
 msgid "Start Time"
 msgstr "開始時間"
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr "重置用戶密碼"
diff --git a/messages.pot b/messages.pot
index 4477a1381..9eb386142 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,592 +8,617 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-04-18 20:01+0200\n"
+"POT-Creation-Date: 2022-05-01 13:22+0200\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.9.1\n"
+"Generated-By: Babel 2.8.0\n"
 
-#: cps/about.py:86
+#: cps/about.py:84
 msgid "Statistics"
 msgstr ""
 
-#: cps/admin.py:141
+#: cps/admin.py:146
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/admin.py:143
+#: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:151
+#: cps/admin.py:156
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:159
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
-#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
-#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
+#: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
+#: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
 msgid "Unknown"
 msgstr ""
 
-#: cps/admin.py:197
+#: cps/admin.py:217
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:217
+#: cps/admin.py:237
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:255
+#: cps/admin.py:275
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:289 cps/templates/admin.html:51
+#: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr ""
 
-#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:360 cps/admin.py:1648
+#: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:374
+#: cps/admin.py:394
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:397 cps/templates/config_view_edit.html:133
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:424
+#: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:1526
+#: cps/admin.py:456 cps/admin.py:1962
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:468
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:460 cps/admin.py:1484
+#: cps/admin.py:480 cps/admin.py:1920
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:464 cps/admin.py:478
+#: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:466
+#: cps/admin.py:486
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:470
+#: cps/admin.py:490
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:500
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:483
+#: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:487
+#: cps/admin.py:507
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:498
+#: cps/admin.py:518
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:500 cps/editbooks.py:1267
+#: cps/admin.py:520 cps/editbooks.py:438
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:553
+#: cps/admin.py:557
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:559
+#: cps/admin.py:563
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:579 cps/admin.py:1355
+#: cps/admin.py:583 cps/admin.py:1791
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:591
+#: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:599
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:599
+#: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:610
+#: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:612
+#: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:614
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr ""
+
+#: cps/admin.py:620
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:764
-msgid "Tag not found"
-msgstr ""
-
-#: cps/admin.py:776
-msgid "Invalid Action"
-msgstr ""
-
-#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
+#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:936
+#: cps/admin.py:905
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:953
+msgid "Tag not found"
+msgstr ""
+
+#: cps/admin.py:965
+msgid "Invalid Action"
+msgstr ""
+
+#: cps/admin.py:1080
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1104
+#: cps/admin.py:1125
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1110
+#: cps/admin.py:1131
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1140
+#: cps/admin.py:1161
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1146
+#: cps/admin.py:1167
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1149
+#: cps/admin.py:1170
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1154
+#: cps/admin.py:1175
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1156
+#: cps/admin.py:1177
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1160
+#: cps/admin.py:1181
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1162
+#: cps/admin.py:1183
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1169
+#: cps/admin.py:1190
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1171
+#: cps/admin.py:1192
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1178
+#: cps/admin.py:1199
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
-#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
-#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
-#: cps/web.py:1742
+#: cps/admin.py:1230 cps/admin.py:1852
+msgid "Add new user"
+msgstr ""
+
+#: cps/admin.py:1239 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr ""
+
+#: cps/admin.py:1258
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1277 cps/admin.py:1658 cps/admin.py:1775 cps/admin.py:1873
+#: cps/admin.py:1990 cps/editbooks.py:227 cps/editbooks.py:301
+#: cps/editbooks.py:1196 cps/shelf.py:82 cps/shelf.py:142 cps/shelf.py:185
+#: cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343 cps/shelf.py:457
+#: cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1235
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1253
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1266
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1270
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1378
-msgid "Database Settings updated"
-msgstr ""
-
-#: cps/admin.py:1386
-msgid "Database Configuration"
-msgstr ""
-
-#: cps/admin.py:1402 cps/web.py:1557
-msgid "Please fill out all fields!"
-msgstr ""
-
-#: cps/admin.py:1410
-msgid "E-mail is not from valid domain"
-msgstr ""
-
-#: cps/admin.py:1416 cps/admin.py:1576
-msgid "Add new user"
-msgstr ""
-
-#: cps/admin.py:1427
-#, python-format
-msgid "User '%(user)s' created"
-msgstr ""
-
-#: cps/admin.py:1433
-msgid "Found an existing account for this e-mail address or name."
-msgstr ""
-
-#: cps/admin.py:1463
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr ""
-
-#: cps/admin.py:1465 cps/admin.py:1466
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1469
-msgid "No admin user remaining, can't delete user"
-msgstr ""
-
-#: cps/admin.py:1542 cps/admin.py:1667
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr ""
-
-#: cps/admin.py:1546
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr ""
-
-#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
-msgid "An unknown error occurred. Please try again later."
-msgstr ""
-
-#: cps/admin.py:1585 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
-msgstr ""
-
-#: cps/admin.py:1604
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1630
+#: cps/admin.py:1284
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1633
+#: cps/admin.py:1287
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1635
+#: cps/admin.py:1289
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1637
+#: cps/admin.py:1291
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1679
+#: cps/admin.py:1314 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr ""
+
+#: cps/admin.py:1326
+msgid "Invalid start time for task specified"
+msgstr ""
+
+#: cps/admin.py:1331
+msgid "Invalid duration for task specified"
+msgstr ""
+
+#: cps/admin.py:1340
+msgid "Scheduled tasks settings updated"
+msgstr ""
+
+#: cps/admin.py:1350 cps/admin.py:1399 cps/admin.py:1986 cps/web.py:1254
+#: cps/web.py:1315
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/admin.py:1354
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1384 cps/admin.py:1978
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr ""
+
+#: cps/admin.py:1396
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1685 cps/web.py:1522
+#: cps/admin.py:1402 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1696
+#: cps/admin.py:1413
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1762
+#: cps/admin.py:1479
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1763
+#: cps/admin.py:1480
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1764
+#: cps/admin.py:1481
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1765
+#: cps/admin.py:1482
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1766
+#: cps/admin.py:1483
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1767
+#: cps/admin.py:1484
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1768
+#: cps/admin.py:1485
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
-#: cps/admin.py:1773 cps/admin.py:1774
+#: cps/admin.py:1486 cps/admin.py:1487 cps/admin.py:1488 cps/admin.py:1489
+#: cps/admin.py:1490 cps/admin.py:1491
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+#: cps/admin.py:1486 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+#: cps/admin.py:1487 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+#: cps/admin.py:1488 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+#: cps/admin.py:1489 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1773
+#: cps/admin.py:1490
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1774
+#: cps/admin.py:1491
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1798
+#: cps/admin.py:1515
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1843
+#: cps/admin.py:1560
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1856
+#: cps/admin.py:1573
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1860
+#: cps/admin.py:1577
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1893
+#: cps/admin.py:1610
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1895
+#: cps/admin.py:1612
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/converter.py:30
-msgid "not installed"
+#: cps/admin.py:1670
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1689
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1702
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1706
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1814
+msgid "Database Settings updated"
+msgstr ""
+
+#: cps/admin.py:1822
+msgid "Database Configuration"
+msgstr ""
+
+#: cps/admin.py:1838 cps/web.py:1229
+msgid "Please fill out all fields!"
+msgstr ""
+
+#: cps/admin.py:1846
+msgid "E-mail is not from valid domain"
+msgstr ""
+
+#: cps/admin.py:1863
+#, python-format
+msgid "User '%(user)s' created"
+msgstr ""
+
+#: cps/admin.py:1869
+msgid "Found an existing account for this e-mail address or name."
+msgstr ""
+
+#: cps/admin.py:1899
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr ""
+
+#: cps/admin.py:1901 cps/admin.py:1902
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1905
+msgid "No admin user remaining, can't delete user"
+msgstr ""
+
+#: cps/admin.py:1982
+#, python-format
+msgid "User '%(nick)s' updated"
 msgstr ""
 
 #: cps/converter.py:31
+msgid "not installed"
+msgstr ""
+
+#: cps/converter.py:32
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#: cps/db.py:681 cps/search.py:134 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/db.py:924 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
-#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
+#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
 msgid "None"
 msgstr ""
 
-#: cps/editbooks.py:295 cps/editbooks.py:297
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:304 cps/editbooks.py:306
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:358
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
-#: cps/web.py:1825 cps/web.py:1870
+#: cps/editbooks.py:109 cps/editbooks.py:890 cps/web.py:516 cps/web.py:1454
+#: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:408
-msgid "edit metadata"
-msgstr ""
-
-#: cps/editbooks.py:457
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:493 cps/editbooks.py:1001
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr ""
-
-#: cps/editbooks.py:634
-msgid "User has no rights to upload additional file formats"
-msgstr ""
-
-#: cps/editbooks.py:639 cps/editbooks.py:1029
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr ""
-
-#: cps/editbooks.py:643 cps/editbooks.py:1033
-msgid "File to be uploaded must have an extension"
-msgstr ""
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr ""
-
-#: cps/editbooks.py:660
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr ""
-
-#: cps/editbooks.py:683
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr ""
-
-#: cps/editbooks.py:697 cps/editbooks.py:809
+#: cps/editbooks.py:153 cps/editbooks.py:1216
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:828
+#: cps/editbooks.py:173 cps/editbooks.py:711
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:869
+#: cps/editbooks.py:214
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:887
+#: cps/editbooks.py:232
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:951
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr ""
-
-#: cps/editbooks.py:1041
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr ""
-
-#: cps/editbooks.py:1061
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:1117
+#: cps/editbooks.py:287
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1143
+#: cps/editbooks.py:314
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1151
+#: cps/editbooks.py:322
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1155
+#: cps/editbooks.py:326
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
+#: cps/editbooks.py:630
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr ""
+
+#: cps/editbooks.py:685 cps/editbooks.py:1010
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr ""
+
+#: cps/editbooks.py:723 cps/editbooks.py:1157
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr ""
+
+#: cps/editbooks.py:727 cps/editbooks.py:1161
+msgid "File to be uploaded must have an extension"
+msgstr ""
+
+#: cps/editbooks.py:735
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr ""
+
+#: cps/editbooks.py:755
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr ""
+
+#: cps/editbooks.py:812 cps/editbooks.py:814
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:821 cps/editbooks.py:823
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:875
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:925
+msgid "edit metadata"
+msgstr ""
+
+#: cps/editbooks.py:974
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:1152
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:1173
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr ""
+
+#: cps/editbooks.py:1201
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr ""
+
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr ""
@@ -602,27 +627,27 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:81
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:87 cps/tasks/convert.py:75
+#: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:92
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
+#: cps/helper.py:96 cps/helper.py:221 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
@@ -662,130 +687,110 @@ msgstr ""
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:353
+#: cps/helper.py:341
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:364
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:382
+#: cps/helper.py:370
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:393
+#: cps/helper.py:381
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:458
+#: cps/helper.py:446
 #, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:529 cps/helper.py:538
+#: cps/helper.py:518 cps/helper.py:527
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:572
+#: cps/helper.py:561
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:592
+#: cps/helper.py:581
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:599
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:651 cps/web.py:1737
+#: cps/helper.py:640 cps/web.py:1408
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:659
+#: cps/helper.py:648
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:669
+#: cps/helper.py:658
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:754
-msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+#: cps/helper.py:808
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:767
+#: cps/helper.py:818
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:821
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:773
+#: cps/helper.py:824
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:783
+#: cps/helper.py:834
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:799
+#: cps/helper.py:850
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:810
+#: cps/helper.py:861
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:822
+#: cps/helper.py:873
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:826
+#: cps/helper.py:877
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:878
+#: cps/helper.py:929
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:889
+#: cps/helper.py:940
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:937
-msgid "Waiting"
-msgstr ""
-
-#: cps/helper.py:939
-msgid "Failed"
-msgstr ""
-
-#: cps/helper.py:941
-msgid "Started"
-msgstr ""
-
-#: cps/helper.py:943
-msgid "Finished"
-msgstr ""
-
-#: cps/helper.py:945
-msgid "Unknown Status"
-msgstr ""
-
-#: cps/kobo_auth.py:128
+#: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:154
+#: cps/kobo_auth.py:115
 msgid "Kobo Setup"
 msgstr ""
 
@@ -794,7 +799,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -855,12 +860,12 @@ msgstr ""
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:298
+#: cps/opds.py:287
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
 msgid "Login"
 msgstr ""
 
@@ -876,453 +881,486 @@ msgstr ""
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/render_template.py:41 cps/web.py:407
+#: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
 msgstr ""
 
-#: cps/render_template.py:43
+#: cps/render_template.py:42
 msgid "Show recent books"
 msgstr ""
 
-#: cps/render_template.py:44 cps/templates/index.xml:25
+#: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr ""
 
-#: cps/render_template.py:46
+#: cps/render_template.py:45
 msgid "Show Hot Books"
 msgstr ""
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/render_template.py:55
+#: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:60 cps/templates/user_table.html:161
+#: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:61 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:729
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
 msgstr ""
 
-#: cps/render_template.py:63
+#: cps/render_template.py:62
 msgid "Show read and unread"
 msgstr ""
 
-#: cps/render_template.py:65 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:732
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:742
 msgid "Unread Books"
 msgstr ""
 
-#: cps/render_template.py:67
+#: cps/render_template.py:66
 msgid "Show unread"
 msgstr ""
 
-#: cps/render_template.py:68
+#: cps/render_template.py:67
 msgid "Discover"
 msgstr ""
 
-#: cps/render_template.py:70 cps/templates/index.xml:50
+#: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr ""
 
-#: cps/render_template.py:71 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1135
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1098
 msgid "Categories"
 msgstr ""
 
-#: cps/render_template.py:73 cps/templates/user_table.html:158
+#: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr ""
 
-#: cps/render_template.py:74 cps/templates/book_edit.html:90
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
+#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
 msgid "Series"
 msgstr ""
 
-#: cps/render_template.py:76 cps/templates/user_table.html:157
+#: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr ""
 
-#: cps/render_template.py:77 cps/templates/book_table.html:66
+#: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr ""
 
-#: cps/render_template.py:79 cps/templates/user_table.html:160
+#: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr ""
 
-#: cps/render_template.py:81 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:1006
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
 msgstr ""
 
-#: cps/render_template.py:83 cps/templates/user_table.html:163
+#: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr ""
 
-#: cps/render_template.py:84 cps/templates/book_table.html:70
+#: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1108
+#: cps/web.py:1070
 msgid "Languages"
 msgstr ""
 
-#: cps/render_template.py:87 cps/templates/user_table.html:155
+#: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr ""
 
-#: cps/render_template.py:88 cps/templates/index.xml:104
+#: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr ""
 
-#: cps/render_template.py:90 cps/templates/user_table.html:164
+#: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/render_template.py:91 cps/templates/index.xml:112
+#: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr ""
 
-#: cps/render_template.py:93 cps/templates/user_table.html:165
+#: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:95 cps/web.py:755
+#: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/templates/user_table.html:166
+#: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:100 cps/web.py:837
+#: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:102 cps/templates/user_table.html:168
+#: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr ""
-
-#: cps/shelf.py:73
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr ""
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr ""
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr ""
-
-#: cps/shelf.py:144
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr ""
-
-#: cps/shelf.py:156
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr ""
-
-#: cps/shelf.py:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr ""
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr ""
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr ""
-
-#: cps/shelf.py:236
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr ""
-
-#: cps/shelf.py:238
-msgid "Edit a shelf"
-msgstr ""
-
-#: cps/shelf.py:248
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr ""
-
-#: cps/shelf.py:268
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr ""
-
-#: cps/shelf.py:282
-msgid "There was an error"
-msgstr ""
-
-#: cps/shelf.py:304
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:315
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
-
-#: cps/shelf.py:337
-msgid "Error deleting Shelf"
-msgstr ""
-
-#: cps/shelf.py:339
-msgid "Shelf successfully deleted"
-msgstr ""
-
-#: cps/shelf.py:389
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr ""
-
-#: cps/shelf.py:461
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr ""
-
-#: cps/shelf.py:465
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr ""
-
-#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
-msgid "Unexpected data while reading update information"
-msgstr ""
-
-#: cps/updater.py:433 cps/updater.py:545
-msgid "No update available. You already have the latest version installed"
-msgstr ""
-
-#: cps/updater.py:451
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr ""
-
-#: cps/updater.py:469
-msgid "Could not fetch update information"
-msgstr ""
-
-#: cps/updater.py:479
-msgid "Click on the button below to update to the latest stable version."
-msgstr ""
-
-#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:531
-msgid "No release information available"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:434
-msgid "Discover (Random Books)"
-msgstr ""
-
-#: cps/web.py:470
-msgid "Hot Books (Most Downloaded)"
-msgstr ""
-
-#: cps/web.py:501
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr ""
-
-#: cps/web.py:534
-#, python-format
-msgid "Author: %(name)s"
-msgstr ""
-
-#: cps/web.py:570
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr ""
-
-#: cps/web.py:598
-#, python-format
-msgid "Series: %(serie)s"
-msgstr ""
-
-#: cps/web.py:610
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr ""
-
-#: cps/web.py:626
-#, python-format
-msgid "File format: %(format)s"
-msgstr ""
-
-#: cps/web.py:663
-#, python-format
-msgid "Category: %(name)s"
-msgstr ""
-
-#: cps/web.py:690
-#, python-format
-msgid "Language: %(name)s"
-msgstr ""
-
-#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
-msgid "Advanced Search"
-msgstr ""
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:807 cps/web.py:1164
+#: cps/search.py:48 cps/search.py:414 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
 msgid "Search"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:979
-msgid "Downloads"
-msgstr ""
-
-#: cps/web.py:1068
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:1095
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
-msgid "Tasks"
-msgstr ""
-
-#: cps/web.py:1286
+#: cps/search.py:194
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1293
+#: cps/search.py:201
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1315
+#: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1319
+#: cps/search.py:227
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1425
+#: cps/search.py:345
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1527
+#: cps/search.py:364 cps/search.py:396 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr ""
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/shelf.py:55
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr ""
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr ""
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr ""
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr ""
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr ""
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:231
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr ""
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr ""
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr ""
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr ""
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr ""
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr ""
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr ""
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr ""
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr ""
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr ""
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr ""
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr ""
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr ""
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr ""
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr ""
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr ""
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr ""
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr ""
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr ""
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr ""
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/updater.py:536
+msgid "No release information available"
+msgstr ""
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr ""
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr ""
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr ""
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr ""
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr ""
+
+#: cps/web.py:609
+msgid "Rating: None"
+msgstr ""
+
+#: cps/web.py:618
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:636
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:673
+#, python-format
+msgid "Category: %(name)s"
+msgstr ""
+
+#: cps/web.py:700
+#, python-format
+msgid "Language: %(name)s"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/web.py:938
+msgid "Downloads"
+msgstr ""
+
+#: cps/web.py:1030
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1057
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:1199
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1531
+#: cps/web.py:1203
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1533
+#: cps/web.py:1205
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1550
+#: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
-#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
-#: cps/web.py:1593
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
+#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
+#: cps/web.py:1266
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1585
+#: cps/web.py:1257
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1588
+#: cps/web.py:1261
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1602
+#: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1621
+#: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1627
+#: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1631 cps/web.py:1656
+#: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1638
+#: cps/web.py:1311
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1644
+#: cps/web.py:1317
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1651
+#: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1717 cps/web.py:1766
+#: cps/web.py:1388 cps/web.py:1437
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1733
+#: cps/web.py:1404
 msgid "Profile updated"
 msgstr ""
 
@@ -1330,40 +1368,75 @@ msgstr ""
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:154
+#: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:191
+#: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:201
+#: cps/tasks/convert.py:200
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:223
+#: cps/tasks/convert.py:222
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:246
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:269
+#: cps/tasks/convert.py:268
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
 
+#: cps/tasks/convert.py:273
+msgid "Convert"
+msgstr ""
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr ""
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr ""
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr ""
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr ""
@@ -1383,7 +1456,7 @@ msgstr ""
 msgid "Send to Kindle E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr ""
@@ -1393,13 +1466,8 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr ""
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr ""
@@ -1413,7 +1481,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
 #: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
@@ -1525,78 +1593,107 @@ msgstr ""
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:166
-msgid "Administration"
-msgstr ""
-
 #: cps/templates/admin.html:167
-msgid "Download Debug Package"
+msgid "Scheduled Tasks"
 msgstr ""
 
-#: cps/templates/admin.html:168
-msgid "View Logs"
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
 msgstr ""
 
-#: cps/templates/admin.html:171
-msgid "Reconnect Calibre Database"
-msgstr ""
-
-#: cps/templates/admin.html:172
-msgid "Restart"
-msgstr ""
-
-#: cps/templates/admin.html:173
-msgid "Shutdown"
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
 msgstr ""
 
 #: cps/templates/admin.html:178
-msgid "Update"
+msgid "Generate book cover thumbnails"
 msgstr ""
 
 #: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr ""
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr ""
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr ""
+
+#: cps/templates/admin.html:199
+msgid "Administration"
+msgstr ""
+
+#: cps/templates/admin.html:200
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:201
+msgid "View Logs"
+msgstr ""
+
+#: cps/templates/admin.html:204
+msgid "Reconnect Calibre Database"
+msgstr ""
+
+#: cps/templates/admin.html:207
+msgid "Restart"
+msgstr ""
+
+#: cps/templates/admin.html:208
+msgid "Shutdown"
+msgstr ""
+
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr ""
+
+#: cps/templates/admin.html:217
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:183
+#: cps/templates/admin.html:218
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:189
+#: cps/templates/admin.html:224
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:231
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:197
+#: cps/templates/admin.html:232
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:210
+#: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
-#: cps/templates/admin.html:249 cps/templates/config_db.html:70
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:216 cps/templates/admin.html:230
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:228
+#: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:240
+#: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1608,39 +1705,39 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:26 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:76
-#: cps/templates/search.html:33 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:80
-#: cps/templates/search.html:37 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
-#: cps/templates/index.html:29 cps/templates/index.html:112
-#: cps/templates/search.html:66 cps/templates/shelf.html:54
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
 msgid "reduce"
 msgstr ""
 
@@ -1648,164 +1745,165 @@ msgstr ""
 msgid "More by"
 msgstr ""
 
-#: cps/templates/book_edit.html:10
+#: cps/templates/book_edit.html:11
 msgid "Delete Book"
 msgstr ""
 
-#: cps/templates/book_edit.html:13
+#: cps/templates/book_edit.html:14
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:25
 msgid "Convert book format:"
 msgstr ""
 
-#: cps/templates/book_edit.html:29
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr ""
 
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr ""
 
-#: cps/templates/book_edit.html:36
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr ""
 
-#: cps/templates/book_edit.html:45
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
 msgstr ""
 
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
 msgstr ""
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
 msgid "Description"
 msgstr ""
 
-#: cps/templates/book_edit.html:72
+#: cps/templates/book_edit.html:73
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
 msgstr ""
 
-#: cps/templates/book_edit.html:82
+#: cps/templates/book_edit.html:83
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
 msgstr ""
 
-#: cps/templates/book_edit.html:94
+#: cps/templates/book_edit.html:95
 msgid "Series ID"
 msgstr ""
 
-#: cps/templates/book_edit.html:98
+#: cps/templates/book_edit.html:99
 msgid "Rating"
 msgstr ""
 
-#: cps/templates/book_edit.html:103
+#: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:107
+#: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:112
+#: cps/templates/book_edit.html:113
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
 #: cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr ""
 
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
 #: cps/templates/user_edit.html:33
 msgid "Language"
 msgstr ""
 
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
 msgstr ""
 
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
 msgstr ""
 
-#: cps/templates/book_edit.html:200
+#: cps/templates/book_edit.html:201
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:208
+#: cps/templates/book_edit.html:209
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:232
+#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:233
+#: cps/templates/book_edit.html:234
 msgid "Search keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:239
+#: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr ""
 
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
 msgid "Source"
 msgstr ""
 
-#: cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:287
 msgid "Search error!"
 msgstr ""
 
-#: cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1912,6 +2010,7 @@ msgid "Enter "
 msgstr ""
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
 msgid "Are you really sure?"
 msgstr ""
 
@@ -2323,62 +2422,62 @@ msgstr ""
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:173
+#: cps/templates/detail.html:174
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:221
+#: cps/templates/detail.html:222
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:223
 msgid "Read"
 msgstr ""
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:231
+#: cps/templates/detail.html:232
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:233
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:243
+#: cps/templates/detail.html:244
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:256 cps/templates/search.html:15
+#: cps/templates/detail.html:257 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr ""
 
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:21
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
 
-#: cps/templates/detail.html:298
+#: cps/templates/detail.html:299
 msgid "Edit Metadata"
 msgstr ""
 
@@ -2422,7 +2521,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr ""
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr ""
@@ -2448,7 +2547,7 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr ""
 
@@ -2460,6 +2559,10 @@ msgstr ""
 msgid "Kobo Token:"
 msgstr ""
 
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
@@ -2476,29 +2579,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:71
+#: cps/templates/index.html:72
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr ""
-
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:83
+#: cps/templates/index.html:84
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2562,7 +2665,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2571,63 +2674,67 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:29
+#: cps/templates/layout.html:30
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:35
+#: cps/templates/layout.html:36
 msgid "Toggle Navigation"
 msgstr ""
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:47
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
 msgstr ""
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Error"
 msgstr ""
 
-#: cps/templates/layout.html:63
+#: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr ""
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:80
+#: cps/templates/layout.html:81
 msgid "Logout"
 msgstr ""
 
-#: cps/templates/layout.html:118
+#: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:129
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr ""
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:182
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr ""
 
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr ""
+
 #: cps/templates/login.html:18
 msgid "Remember Me"
 msgstr ""
@@ -2732,7 +2839,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: cps/templates/modal_dialogs.html:134
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 msgid "Ok"
 msgstr ""
 
@@ -2908,15 +3015,23 @@ msgstr ""
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/search.html:5
-msgid "No Results Found"
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr ""
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
 msgstr ""
 
 #: cps/templates/search.html:6
+msgid "No Results Found"
+msgstr ""
+
+#: cps/templates/search.html:7
 msgid "Search Term:"
 msgstr ""
 
-#: cps/templates/search.html:8
+#: cps/templates/search.html:9
 msgid "Results for:"
 msgstr ""
 
@@ -2968,23 +3083,23 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
 msgstr ""
 
-#: cps/templates/shelf.html:13
+#: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:16
+#: cps/templates/shelf.html:17
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:17
+#: cps/templates/shelf.html:18
 msgid "Enable Change order"
 msgstr ""
 
@@ -3029,7 +3144,7 @@ msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
-msgid "Program Library"
+msgid "Program"
 msgstr ""
 
 #: cps/templates/stats.html:34
@@ -3060,6 +3175,18 @@ msgstr ""
 msgid "Start Time"
 msgstr ""
 
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr ""
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
 msgstr ""

From 8cb3fe32a575916f8cddba70925027271686dca2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 2 May 2022 17:42:06 +0200
Subject: [PATCH 275/412] Try to prevent error from #2390

---
 cps/dep_check.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/dep_check.py b/cps/dep_check.py
index 431d70195..44f3961a4 100644
--- a/cps/dep_check.py
+++ b/cps/dep_check.py
@@ -65,7 +65,7 @@ def dependency_check(optional=False):
             low_check = [int(x) for x in dep[3].split('.')]
             high_check = [int(x) for x in dep[5].split('.')]
         except AttributeError:
-            high_check = None
+            high_check = []
         except ValueError:
             d.append({'name': dep[1],
                       'target': "available",

From 1bcb714facefed96b4b9e6701fe9bd92956f004f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 3 May 2022 18:43:07 +0200
Subject: [PATCH 276/412] Remove mature tags config option

---
 cps/config_sql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index 743b2ce7c..405a92ece 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -74,7 +74,7 @@ class _Settings(_Base):
     config_authors_max = Column(Integer, default=0)
     config_read_column = Column(Integer, default=0)
     config_title_regex = Column(String, default=r'^(A|The|An|Der|Die|Das|Den|Ein|Eine|Einen|Dem|Des|Einem|Eines)\s+')
-    config_mature_content_tags = Column(String, default='')
+    # config_mature_content_tags = Column(String, default='')
     config_theme = Column(Integer, default=0)
 
     config_log_level = Column(SmallInteger, default=logger.DEFAULT_LOG_LEVEL)

From 0c2f67bc7b048b39f4d4a1b863815cff9f12b55c Mon Sep 17 00:00:00 2001
From: Chris Thurber <skiman6010@gmail.com>
Date: Wed, 4 May 2022 12:42:23 -0400
Subject: [PATCH 277/412] Updates Links in README

Update links for optional pip features and GDrive integration.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c34220416..f75e3cb10 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 #### Installation via pip (recommended)
 1. To avoid problems with already installed python dependencies, it's recommended to create a virtual environment for Calibre-Web
 2. Install Calibre-Web via pip with the command `pip install calibreweb` (Depending on your OS and or distro the command could also be `pip3`). 
-3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details 
+3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-and-Windows) for details 
 4. Calibre-Web can be started afterwards by typing `cps` 
 
 In the Wiki there are also examples for: a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation), [installation on Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20), [installation on a Cloud Provider](https://github.com/janeczku/calibre-web/wiki/How-To:-Install-Calibre-Web-on-a-Cloud-Provider).
@@ -53,7 +53,7 @@ In the Wiki there are also examples for: a [manual installation](https://github.
 Point your browser to `http://localhost:8083` or `http://localhost:8083/opds` for the OPDS catalog \
 Login with default admin login \
 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) \
+Optionally a Google Drive can be used to host the calibre library [-> Using Google Drive integration](https://github.com/janeczku/calibre-web/wiki/G-Drive-Setup#using-google-drive-integration) \
 Afterwards you can configure your Calibre-Web instance ([Basic Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#basic-configuration) and [UI Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#ui-configuration) on admin page)  
 
 #### Default admin login:

From 056ecf0d9071c0dfee86bdd343f8b2ec73fd5801 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaccs@googlemail.com>
Date: Wed, 4 May 2022 19:22:18 +0200
Subject: [PATCH 278/412] Fix for #2394

---
 cps/helper.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index cb9cb4365..91afe7270 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -241,8 +241,7 @@ def get_valid_filename(value, replace_whitespace=True, chars=128):
         # pipe has to be replaced with comma
         value = re.sub(r'[|]+', u',', value, flags=re.U)
 
-    filename_encoding_for_length = 'utf-16' if sys.platform == "win32" or sys.platform == "darwin" else 'utf-8'
-    value = value.encode(filename_encoding_for_length)[:chars].decode('utf-8', errors='ignore').strip()
+    value = value.encode('utf-8')[:chars].decode('utf-8', errors='ignore').strip()
 
     if not value:
         raise ValueError("Filename cannot be empty")

From 5e4cf839bcbc2a30fc421dd66232edcc049933a0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 5 May 2022 18:04:34 +0200
Subject: [PATCH 279/412] Replace "ast" by "json.loads" to handle enums with
 default values/colors (fix for #2398)

---
 cps/db.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index f4dc4ccb3..c4f7ed382 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -19,7 +19,6 @@
 
 import os
 import re
-import ast
 import json
 from datetime import datetime
 from urllib.parse import quote
@@ -388,7 +387,7 @@ class CustomColumns(Base):
     normalized = Column(Boolean)
 
     def get_display_dict(self):
-        display_dict = ast.literal_eval(self.display)
+        display_dict = json.loads(self.display)
         return display_dict
 
 

From c1f1952b04cc8bb489dff94d88d451eebdcbc0e7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 6 May 2022 17:48:58 +0200
Subject: [PATCH 280/412] Updated jsonschema requirement Testupdate Fixed file
 mode of main.js

---
 cps/static/js/main.js                   |    0
 optional-requirements.txt               |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 1086 +++++++++++++++++------
 3 files changed, 791 insertions(+), 297 deletions(-)
 mode change 100755 => 100644 cps/static/js/main.js

diff --git a/cps/static/js/main.js b/cps/static/js/main.js
old mode 100755
new mode 100644
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 4360d221f..a0384bcd5 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -41,4 +41,4 @@ natsort>=2.2.0,<8.2.0
 comicapi>=2.2.0,<2.3.0
 
 # Kobo integration
-jsonschema>=3.2.0,<4.5.0
+jsonschema>=3.2.0,<4.6.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 027aaa818..86255e61b 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-30 21:05:13</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-05-05 20:48:29</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>2022-05-01 02:54:00</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-05-06 02:34:54</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>4h 55 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 53 min</p>
         </div>
       </div>
       </div>
@@ -234,15 +234,15 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestCli</td>
-        <td class="text-center">10</td>
-        <td class="text-center">10</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">12</td>
+        <td class="text-center">9</td>
+        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c2', 10)">Detail</a>
+            <a onclick="showClassDetail('c2', 12)">Detail</a>
         </td>
     </tr>
 
@@ -311,7 +311,47 @@
     
     
     
-        <tr id='pt2.8' class='hiddenRow bg-success'>
+        <tr id="et2.8" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCli - test_enable_reconnect</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et2.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et2.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 605, in test_enable_reconnect
+    self.driver.get(&#34;http://127.0.0.1:8083&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 246, in check_response
+    raise exception_class(message, screen, stacktrace, alert_text)  # type: ignore[call-arg]  # mypy is not smart enough here
+selenium.common.exceptions.UnexpectedAlertPresentException: Alert Text: None
+Message: Dismissed user prompt dialog: Performing shutdown of server, please close window
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+UnexpectedAlertOpenError@chrome://remote/content/shared/webdriver/Errors.jsm:488:5
+GeckoDriver.prototype._handleUserPrompts@chrome://remote/content/marionette/driver.js:2547:13</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_environ_port_setting</div>
             </td>
@@ -320,16 +360,36 @@
     
     
     
-        <tr id='pt2.9' class='hiddenRow bg-success'>
+        <tr id="ft2.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCli - test_no_database</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft2.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft2.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 562, in test_no_database
+    self.assertTrue(database_dir)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt2.10' class='hiddenRow bg-success'>
+        <tr id='pt2.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
             </td>
@@ -337,13 +397,42 @@
         </tr>
     
     
+    
+        <tr id="ft2.12" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestCli - test_writeonly_static_files</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft2.12')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft2.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 650, in test_writeonly_static_files
+    self.assertTrue(self.check_element_on_page((By.ID, &#39;flash_success&#39;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestCliGdrivedb</td>
         <td class="text-center">4</td>
-        <td class="text-center">4</td>
         <td class="text-center">0</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -353,38 +442,131 @@
 
     
     
-        <tr id='pt3.1' class='hiddenRow bg-success'>
+        <tr id="ft3.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_folder</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.1').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 197, in test_cli_gdrive_folder
+    self.start_cw(os.path.join(CALIBRE_WEB_PATH, u&#39;cps.py&#39;), gdrive_dir)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 142, in start_cw
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt3.2' class='hiddenRow bg-success'>
+        <tr id="ft3.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 178, in test_cli_gdrive_location
+    self.start_cw(os.path.join(CALIBRE_WEB_PATH, u&#39;cps.py&#39;), os.path.join(gdrive_dir, u&#39;gü dr.app&#39;))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 142, in start_cw
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt3.3' class='hiddenRow bg-success'>
+        <tr id="ft3.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 146, in test_gdrive_db_nonwrite
+    self.start_cw(os.path.join(CALIBRE_WEB_PATH, u&#39;cps.py&#39;))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 142, in start_cw
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt3.4' class='hiddenRow bg-success'>
+        <tr id="ft3.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_no_database</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 226, in test_no_database
+    self.assertTrue(self.check_element_on_page((By.ID, &#39;flash_success&#39;)))
+AssertionError: False is not true
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 233, in test_no_database
+    self.assertFalse(True, &#34;Inital config failed with normal database&#34;)
+AssertionError: True is not false : Inital config failed with normal database</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -447,12 +629,12 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">4</td>
+        <td class="text-center">6</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c6', 15)">Detail</a>
@@ -470,74 +652,242 @@
     
     
     
-        <tr id='pt6.2' class='hiddenRow bg-success'>
+        <tr id="et6.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.2" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 77, in test_convert_deactivate
+    self.assertEqual(element.text, &#39;not installed&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id="et6.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.3" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 188, in test_convert_email
+    self.assertEqual(len(details[&#39;kindle&#39;]), 1)
+TypeError: object of type &#39;NoneType&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id="et6.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 232, in test_convert_failed_and_email
+    self.assertEqual(len(details[&#39;kindle&#39;]), 1)
+TypeError: object of type &#39;NoneType&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id="et6.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 268, in test_convert_only
+    select = Select(vals[&#39;btn_from&#39;])
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 36, in __init__
+    if webelement.tag_name.lower() != &#34;select&#34;:
+AttributeError: &#39;bool&#39; object has no attribute &#39;tag_name&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id="ft6.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 551, in test_convert_options
+    self.assertEqual(from_book, set([&#39;-- select an option --&#39;, &#34;CBR&#34;]))
+AssertionError: Items in the second set but not the first:
+&#39;CBR&#39;
+&#39;-- select an option --&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id="et6.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 154, in test_convert_parameter
+    select = Select(vals[&#39;btn_from&#39;])
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 36, in __init__
+    if webelement.tag_name.lower() != &#34;select&#34;:
+AttributeError: &#39;bool&#39; object has no attribute &#39;tag_name&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.8' class='hiddenRow bg-success'>
+        <tr id="et6.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 94, in test_convert_wrong_excecutable
+    self.assertEqual(element.text, &#39;not installed&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id="ft6.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 508, in test_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -551,11 +901,33 @@
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id="ft6.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 401, in test_email_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -587,11 +959,33 @@
     
     
     
-        <tr id='pt6.15' class='hiddenRow bg-success'>
+        <tr id="ft6.15" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.15')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 542, in test_user_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -684,7 +1078,7 @@
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 443, in test_thumbnail_cache
     self.assertEqual(10*2, count_files(thumbnail_cache_path))
-AssertionError: 20 != 0</pre>
+AssertionError: 20 != 9</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -695,13 +1089,13 @@ AssertionError: 20 != 0</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEbookConvertKepubify</td>
         <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">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>
@@ -709,41 +1103,103 @@ AssertionError: 20 != 0</pre>
 
     
     
-        <tr id='pt8.1' class='hiddenRow bg-success'>
+        <tr id="et8.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_deactivate</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et8.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et8.1" class="popup_window test_output" style="display:block;">
+                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 64, in test_convert_deactivate
+    self.assertEqual(element.text, &#39;not installed&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id="et8.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et8.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et8.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et8.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 113, in test_convert_only
+    select = Select(vals[&#39;btn_from&#39;])
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 36, in __init__
+    if webelement.tag_name.lower() != &#34;select&#34;:
+AttributeError: &#39;bool&#39; object has no attribute &#39;tag_name&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt8.3' class='hiddenRow bg-success'>
+        <tr id="et8.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_wrong_excecutable</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et8.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et8.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et8.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 80, in test_convert_wrong_excecutable
+    self.assertEqual(element.text, &#39;not installed&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">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('c9', 3)">Detail</a>
         </td>
@@ -751,29 +1207,91 @@ AssertionError: 20 != 0</pre>
 
     
     
-        <tr id='pt9.1' class='hiddenRow bg-success'>
+        <tr id="et9.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_deactivate</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et9.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et9.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 112, in test_convert_deactivate
+    self.assertEqual(element.text, &#39;not installed&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id="et9.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et9.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et9.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 159, in test_convert_only
+    select = Select(vals[&#39;btn_from&#39;])
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 36, in __init__
+    if webelement.tag_name.lower() != &#34;select&#34;:
+AttributeError: &#39;bool&#39; object has no attribute &#39;tag_name&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt9.3' class='hiddenRow bg-success'>
+        <tr id="et9.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_wrong_excecutable</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et9.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et9.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 127, in test_convert_wrong_excecutable
+    self.assertEqual(element.text, &#39;not installed&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1618,13 +2136,13 @@ AssertionError: 20 != 0</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestLoadMetadata</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">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
@@ -1632,11 +2150,31 @@ AssertionError: 20 != 0</pre>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id="et15.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et15.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et15.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 84, in test_load_metadata
+    elif &#39;https://amazon.com/&#39; == results[20][&#39;source&#39;]:
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3266,30 +3804,6 @@ AssertionError: 20 != 0</pre>
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestReconnect</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('c38', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt38.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
     <tr id="su" class="passClass">
         <td>TestRegister</td>
         <td class="text-center">8</td>
@@ -3298,13 +3812,13 @@ AssertionError: 20 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 8)">Detail</a>
+            <a onclick="showClassDetail('c38', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3313,7 +3827,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3322,7 +3836,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3331,7 +3845,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3340,7 +3854,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3349,7 +3863,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3358,7 +3872,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3367,7 +3881,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3385,13 +3899,13 @@ AssertionError: 20 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 3)">Detail</a>
+            <a onclick="showClassDetail('c39', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3400,7 +3914,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3409,7 +3923,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3427,13 +3941,13 @@ AssertionError: 20 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c40', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3442,7 +3956,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3451,7 +3965,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3460,7 +3974,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3469,7 +3983,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3478,7 +3992,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3487,7 +4001,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3496,7 +4010,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3505,7 +4019,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3514,7 +4028,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3523,7 +4037,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3532,7 +4046,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3541,7 +4055,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3550,19 +4064,19 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id="st41.14" class="none bg-warning">
+        <tr id="st40.14" 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_st41.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.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_st41.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3576,7 +4090,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3585,7 +4099,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3603,13 +4117,13 @@ AssertionError: 20 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 1)">Detail</a>
+            <a onclick="showClassDetail('c41', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnailsEnv - test_cover_cache_env_on_database_change</div>
             </td>
@@ -3622,18 +4136,18 @@ AssertionError: 20 != 0</pre>
     <tr id="su" class="failClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">5</td>
-        <td class="text-center">2</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 8)">Detail</a>
+            <a onclick="showClassDetail('c42', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
             </td>
@@ -3642,7 +4156,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
@@ -3651,7 +4165,7 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
             </td>
@@ -3660,26 +4174,26 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id="ft43.4" class="none bg-danger">
+        <tr id="ft42.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.4')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.4')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft43.4" class="popup_window test_output" style="display:block;">
+                <div id="div_ft42.4" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.4').style.display='none'"><span
+                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 135, in test_cover_change_on_upload_new_cover
-    self.assertGreaterEqual(diff(BytesIO(updated_cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.038404302739168276 not greater than or equal to 0.05</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 137, in test_cover_change_on_upload_new_cover
+    self.assertEqual(110*2, count_files(thumbnail_cache_path),)
+AssertionError: 220 != 218</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3689,7 +4203,7 @@ AssertionError: 0.038404302739168276 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='st43.5' class='none bg-warning'>
+        <tr id='st42.5' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_for_series</div>
             </td>
@@ -3698,7 +4212,7 @@ AssertionError: 0.038404302739168276 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
@@ -3707,7 +4221,7 @@ AssertionError: 0.038404302739168276 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
             </td>
@@ -3716,31 +4230,11 @@ AssertionError: 0.038404302739168276 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id="ft43.8" class="none bg-danger">
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 308, in test_sideloaded_book
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(old_cover), delete_diff_file=True), 0.04)
-AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3754,13 +4248,13 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 9)">Detail</a>
+            <a onclick="showClassDetail('c43', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3769,7 +4263,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3778,7 +4272,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3787,7 +4281,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3796,7 +4290,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3805,7 +4299,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3814,19 +4308,19 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id="st44.7" class="none bg-warning">
+        <tr id="st43.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_st44.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st43.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st44.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st43.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_st44.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st43.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3840,7 +4334,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3849,7 +4343,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3867,13 +4361,13 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 4)">Detail</a>
+            <a onclick="showClassDetail('c44', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -3882,7 +4376,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -3891,7 +4385,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3900,7 +4394,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3918,13 +4412,13 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 18)">Detail</a>
+            <a onclick="showClassDetail('c45', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3933,7 +4427,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3942,7 +4436,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3951,7 +4445,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3960,7 +4454,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3969,7 +4463,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3978,7 +4472,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3987,7 +4481,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3996,7 +4490,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4005,7 +4499,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4014,7 +4508,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4023,7 +4517,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4032,7 +4526,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4041,7 +4535,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4050,7 +4544,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4059,7 +4553,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4068,7 +4562,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4077,7 +4571,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4095,13 +4589,13 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 1)">Detail</a>
+            <a onclick="showClassDetail('c46', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4119,13 +4613,13 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c48', 21)">Detail</a>
+            <a onclick="showClassDetail('c47', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4134,7 +4628,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4143,7 +4637,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4152,7 +4646,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4161,7 +4655,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4170,7 +4664,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4179,7 +4673,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4188,7 +4682,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4197,7 +4691,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4206,7 +4700,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4215,7 +4709,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4224,7 +4718,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4233,7 +4727,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4242,7 +4736,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4251,7 +4745,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4260,7 +4754,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4269,7 +4763,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.17' class='hiddenRow bg-success'>
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4278,7 +4772,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.18' class='hiddenRow bg-success'>
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4287,7 +4781,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4296,7 +4790,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4305,7 +4799,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt48.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4323,13 +4817,13 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c49', 35)">Detail</a>
+            <a onclick="showClassDetail('c48', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt49.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4338,7 +4832,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4347,7 +4841,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4356,7 +4850,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4365,7 +4859,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4374,7 +4868,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4383,7 +4877,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4392,7 +4886,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4401,7 +4895,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4410,7 +4904,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4419,7 +4913,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4428,7 +4922,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4437,7 +4931,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4446,7 +4940,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4455,7 +4949,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4464,7 +4958,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4473,7 +4967,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.17' class='hiddenRow bg-success'>
+        <tr id='pt48.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4482,7 +4976,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.18' class='hiddenRow bg-success'>
+        <tr id='pt48.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4491,7 +4985,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.19' class='hiddenRow bg-success'>
+        <tr id='pt48.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4500,7 +4994,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.20' class='hiddenRow bg-success'>
+        <tr id='pt48.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4509,7 +5003,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.21' class='hiddenRow bg-success'>
+        <tr id='pt48.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4518,7 +5012,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.22' class='hiddenRow bg-success'>
+        <tr id='pt48.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4527,7 +5021,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.23' class='hiddenRow bg-success'>
+        <tr id='pt48.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4536,7 +5030,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.24' class='hiddenRow bg-success'>
+        <tr id='pt48.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4545,7 +5039,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.25' class='hiddenRow bg-success'>
+        <tr id='pt48.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4554,7 +5048,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.26' class='hiddenRow bg-success'>
+        <tr id='pt48.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
@@ -4563,7 +5057,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.27' class='hiddenRow bg-success'>
+        <tr id='pt48.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4572,7 +5066,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.28' class='hiddenRow bg-success'>
+        <tr id='pt48.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4581,7 +5075,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.29' class='hiddenRow bg-success'>
+        <tr id='pt48.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4590,7 +5084,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.30' class='hiddenRow bg-success'>
+        <tr id='pt48.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4599,7 +5093,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.31' class='hiddenRow bg-success'>
+        <tr id='pt48.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4608,7 +5102,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.32' class='hiddenRow bg-success'>
+        <tr id='pt48.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4617,7 +5111,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.33' class='hiddenRow bg-success'>
+        <tr id='pt48.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4626,7 +5120,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.34' class='hiddenRow bg-success'>
+        <tr id='pt48.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4635,7 +5129,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt49.35' class='hiddenRow bg-success'>
+        <tr id='pt48.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4653,13 +5147,13 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c50', 16)">Detail</a>
+            <a onclick="showClassDetail('c49', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt50.1' class='hiddenRow bg-success'>
+        <tr id='pt49.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4668,7 +5162,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.2' class='hiddenRow bg-success'>
+        <tr id='pt49.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4677,7 +5171,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.3' class='hiddenRow bg-success'>
+        <tr id='pt49.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4686,7 +5180,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.4' class='hiddenRow bg-success'>
+        <tr id='pt49.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4695,7 +5189,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.5' class='hiddenRow bg-success'>
+        <tr id='pt49.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4704,7 +5198,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.6' class='hiddenRow bg-success'>
+        <tr id='pt49.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4713,7 +5207,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.7' class='hiddenRow bg-success'>
+        <tr id='pt49.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4722,7 +5216,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.8' class='hiddenRow bg-success'>
+        <tr id='pt49.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4731,7 +5225,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.9' class='hiddenRow bg-success'>
+        <tr id='pt49.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4740,7 +5234,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.10' class='hiddenRow bg-success'>
+        <tr id='pt49.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4749,7 +5243,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.11' class='hiddenRow bg-success'>
+        <tr id='pt49.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4758,7 +5252,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.12' class='hiddenRow bg-success'>
+        <tr id='pt49.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4767,7 +5261,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.13' class='hiddenRow bg-success'>
+        <tr id='pt49.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4776,7 +5270,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.14' class='hiddenRow bg-success'>
+        <tr id='pt49.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4785,7 +5279,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.15' class='hiddenRow bg-success'>
+        <tr id='pt49.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4794,7 +5288,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
     
     
     
-        <tr id='pt50.16' class='hiddenRow bg-success'>
+        <tr id='pt49.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4805,10 +5299,10 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>423</td>
-        <td>413</td>
-        <td>3</td>
-        <td>0</td>
+        <td>424</td>
+        <td>391</td>
+        <td>12</td>
+        <td>14</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4987,7 +5481,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.46.0</td>
+              <td>2.47.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5017,7 +5511,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.46.0</td>
+              <td>2.47.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5047,7 +5541,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.46.0</td>
+              <td>2.47.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5089,7 +5583,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.46.0</td>
+              <td>2.47.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5125,7 +5619,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.46.0</td>
+              <td>2.47.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5167,7 +5661,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.46.0</td>
+              <td>2.47.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5209,13 +5703,13 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.4.0</td>
+              <td>4.5.1</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.4.0</td>
+              <td>4.5.1</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -5227,7 +5721,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.4.0</td>
+              <td>4.5.1</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -5257,7 +5751,7 @@ AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
 </div>
 
 <script>
-    drawCircle(413, 3, 0, 7);
+    drawCircle(391, 12, 14, 7);
     showCase(5);
 </script>
 

From fbac3e38ac116855b930ee60fb3c997337ae17b7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 8 May 2022 12:55:54 +0200
Subject: [PATCH 281/412] Eenabled send epubs to E-Reader devices

---
 README.md                               |   4 +-
 cps/admin.py                            |   6 +-
 cps/helper.py                           |  66 +-
 cps/static/js/caliBlur.js               |  16 +-
 cps/tasks/convert.py                    |  16 +-
 cps/templates/admin.html                |   2 +-
 cps/templates/detail.html               |  16 +-
 cps/templates/shelfdown.html            |   2 +-
 cps/templates/user_edit.html            |   2 +-
 cps/templates/user_table.html           |   2 +-
 cps/web.py                              |   6 +-
 test/Calibre-Web TestSummary_Linux.html | 824 +++++++++---------------
 12 files changed, 358 insertions(+), 604 deletions(-)
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 cps/admin.py
 mode change 100644 => 100755 cps/helper.py
 mode change 100644 => 100755 cps/static/js/caliBlur.js
 mode change 100644 => 100755 cps/tasks/convert.py
 mode change 100644 => 100755 cps/templates/admin.html
 mode change 100644 => 100755 cps/templates/detail.html
 mode change 100644 => 100755 cps/templates/shelfdown.html
 mode change 100644 => 100755 cps/templates/user_edit.html
 mode change 100644 => 100755 cps/templates/user_table.html
 mode change 100644 => 100755 cps/web.py

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index c34220416..41cb58188
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 - Support for converting eBooks through Calibre binaries
 - Restrict eBook download to logged-in users
 - Support for public user registration
-- Send eBooks to Kindle devices with the click of a button
+- Send eBooks to E-Readers with the click of a button
 - Sync your Kobo devices through Calibre-Web with your Calibre library
 - Support for reading eBooks directly in the browser (.txt, .epub, .pdf, .cbr, .cbt, .cbz, .djvu)
 - Upload new books in many formats, including audio formats (.mp3, .m4a, .m4b)
@@ -65,7 +65,7 @@ Afterwards you can configure your Calibre-Web instance ([Basic Configuration](ht
 
 python 3.5+
 
-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:
+Optionally, to enable on-the-fly conversion from one ebook format to another when using the send-to-ereader 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.
 
diff --git a/cps/admin.py b/cps/admin.py
old mode 100644
new mode 100755
index c928fe19d..22127eb20
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1521,11 +1521,11 @@ def ldap_import_create_user(user, user_data):
         log.warning("LDAP User  %s Already in Database", user_data)
         return 0, None
 
-    kindlemail = ''
+    ereader_mail = ''
     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')
+            ereader_mail = user_data['mail'][1].decode('utf-8')
 
     else:
         log.debug('No Mail Field Found in LDAP Response')
@@ -1541,7 +1541,7 @@ def ldap_import_create_user(user, user_data):
     content.name = username
     content.password = ''  # dummy password which will be replaced by ldap one
     content.email = useremail
-    content.kindle_mail = kindlemail
+    content.kindle_mail = ereader_mail
     content.default_language = config.config_default_language
     content.locale = config.config_default_locale
     content.role = config.config_default_role
diff --git a/cps/helper.py b/cps/helper.py
old mode 100644
new mode 100755
index 91afe7270..e8e452898
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -72,7 +72,7 @@ except (ImportError, RuntimeError) as e:
 
 
 # Convert existing book entry to new format
-def convert_book_format(book_id, calibre_path, old_book_format, new_book_format, user_id, kindle_mail=None):
+def convert_book_format(book_id, calibre_path, old_book_format, new_book_format, user_id, ereader_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(calibre_path, book.path, data.name)
@@ -91,9 +91,9 @@ def convert_book_format(book_id, calibre_path, old_book_format, new_book_format,
                               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:
+    if ereader_mail:
         settings = config.get_mail_settings()
-        settings['subject'] = _('Send to Kindle')  # pretranslate Subject for e-mail
+        settings['subject'] = _('Send to E-Reader')  # pretranslate Subject for e-mail
         settings['body'] = _(u'This e-mail has been sent via Calibre-Web.')
     else:
         settings = dict()
@@ -104,14 +104,14 @@ def convert_book_format(book_id, calibre_path, old_book_format, new_book_format,
            link)
     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))
+    WorkerThread.add(user_id, TaskConvert(file_path, book.id, txt, settings, ereader_mail, user_id))
     return None
 
 
 # Texts are not lazy translated as they are supposed to get send out as is
-def send_test_mail(kindle_mail, user_name):
+def send_test_mail(ereader_mail, user_name):
     WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web test e-mail'), None, None,
-                     config.get_mail_settings(), kindle_mail, N_(u"Test e-mail"),
+                     config.get_mail_settings(), ereader_mail, N_(u"Test e-mail"),
                                           _(u'This e-mail has been sent via Calibre-Web.')))
     return
 
@@ -139,26 +139,26 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
     return
 
 
-def check_send_to_kindle_with_converter(formats):
+def check_send_to_ereader_with_converter(formats):
     book_formats = list()
-    if 'EPUB' in formats and 'MOBI' not in formats:
-        book_formats.append({'format': 'Mobi',
+    if 'EPUB' in formats and 'EPUB' not in formats:
+        book_formats.append({'format': 'Epub',
                              'convert': 1,
-                             'text': _('Convert %(orig)s to %(format)s and send to Kindle',
-                                       orig='Epub',
-                                       format='Mobi')})
-    if 'AZW3' in formats and 'MOBI' not in formats:
-        book_formats.append({'format': 'Mobi',
+                             'text': _('Convert %(orig)s to %(format)s and send to E-Reader',
+                                       orig='Mobi',
+                                       format='Epub')})
+    if 'AZW3' in formats and 'EPUB' not in formats:
+        book_formats.append({'format': 'Epub',
                              'convert': 2,
-                             'text': _('Convert %(orig)s to %(format)s and send to Kindle',
+                             'text': _('Convert %(orig)s to %(format)s and send to E-Reader',
                                        orig='Azw3',
-                                       format='Mobi')})
+                                       format='Epub')})
     return book_formats
 
 
-def check_send_to_kindle(entry):
+def check_send_to_ereader(entry):
     """
-        returns all available book formats for sending to Kindle
+        returns all available book formats for sending to E-Reader
     """
     formats = list()
     book_formats = list()
@@ -166,20 +166,24 @@ def check_send_to_kindle(entry):
         for ele in iter(entry.data):
             if ele.uncompressed_size < config.mail_size:
                 formats.append(ele.format)
+        if 'EPUB' in formats:
+            book_formats.append({'format': 'Epub',
+                                 'convert': 0,
+                                 'text': _('Send %(format)s to E-Reader', format='Epub')})
         if 'MOBI' in formats:
             book_formats.append({'format': 'Mobi',
                                  'convert': 0,
-                                 'text': _('Send %(format)s to Kindle', format='Mobi')})
+                                 'text': _('Send %(format)s to E-Reader', format='Mobi')})
         if 'PDF' in formats:
             book_formats.append({'format': 'Pdf',
                                  'convert': 0,
-                                 'text': _('Send %(format)s to Kindle', format='Pdf')})
+                                 'text': _('Send %(format)s to E-Reader', format='Pdf')})
         if 'AZW' in formats:
             book_formats.append({'format': 'Azw',
                                  'convert': 0,
-                                 'text': _('Send %(format)s to Kindle', format='Azw')})
+                                 'text': _('Send %(format)s to E-Reader', format='Azw')})
         if config.config_converterpath:
-            book_formats.extend(check_send_to_kindle_with_converter(formats))
+            book_formats.extend(check_send_to_ereader_with_converter(formats))
         return book_formats
     else:
         log.error(u'Cannot find book entry %d', entry.id)
@@ -199,27 +203,27 @@ def check_read_formats(entry):
 
 
 # Files are processed in the following order/priority:
-# 1: If Mobi file is existing, it's directly send to kindle email,
-# 2: If Epub file is existing, it's converted and send to kindle email,
-# 3: If Pdf file is existing, it's directly send to kindle email
-def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
+# 1: If Mobi file is existing, it's directly send to E-Reader email,
+# 2: If Epub file is existing, it's converted and send to E-Reader email,
+# 3: If Pdf file is existing, it's directly send to E-Reader email
+def send_mail(book_id, book_format, convert, ereader_mail, calibrepath, user_id):
     """Send email with attachments"""
     book = calibre_db.get_book(book_id)
 
     if convert == 1:
         # returns None if success, otherwise errormessage
-        return convert_book_format(book_id, calibrepath, u'epub', book_format.lower(), user_id, kindle_mail)
+        return convert_book_format(book_id, calibrepath, u'epub', book_format.lower(), user_id, ereader_mail)
     if convert == 2:
         # returns None if success, otherwise errormessage
-        return convert_book_format(book_id, calibrepath, u'azw3', book_format.lower(), user_id, kindle_mail)
+        return convert_book_format(book_id, calibrepath, u'azw3', book_format.lower(), user_id, ereader_mail)
 
     for entry in iter(book.data):
         if entry.format.upper() == book_format.upper():
             converted_file_name = entry.name + '.' + book_format.lower()
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(book.title))
-            email_text = N_(u"%(book)s send to Kindle", book=link)
-            WorkerThread.add(user_id, TaskEmail(_(u"Send to Kindle"), book.path, converted_file_name,
-                             config.get_mail_settings(), kindle_mail,
+            email_text = N_(u"%(book)s send to E-Reader", book=link)
+            WorkerThread.add(user_id, TaskEmail(_(u"Send to E-Reader"), book.path, converted_file_name,
+                             config.get_mail_settings(), ereader_mail,
                              email_text, _(u'This e-mail has been sent via Calibre-Web.')))
             return
     return _(u"The requested file could not be read. Maybe wrong permissions?")
diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js
old mode 100644
new mode 100755
index f99779bd3..0f179645c
--- a/cps/static/js/caliBlur.js
+++ b/cps/static/js/caliBlur.js
@@ -201,7 +201,7 @@ if ($("body.book").length > 0) {
 
     // Move dropdown lists higher in dom, replace bootstrap toggle with own toggle.
     $('ul[aria-labelledby="read-in-browser"]').insertBefore(".blur-wrapper").addClass("readinbrowser-drop");
-    $('ul[aria-labelledby="send-to-kindle"]').insertBefore(".blur-wrapper").addClass("sendtokindle-drop");
+    $('ul[aria-labelledby="send-to-kereader"]').insertBefore(".blur-wrapper").addClass("sendtoereader-drop");
     $(".leramslist").insertBefore(".blur-wrapper");
     $('ul[aria-labelledby="btnGroupDrop1"]').insertBefore(".blur-wrapper").addClass("leramslist");
     $("#add-to-shelves").insertBefore(".blur-wrapper");
@@ -215,7 +215,7 @@ if ($("body.book").length > 0) {
     });
 
     $("#sendbtn2").click(function () {
-        $(".sendtokindle-drop").toggle();
+        $(".sendtoereader-drop").toggle();
     });
 
 
@@ -242,12 +242,12 @@ if ($("body.book").length > 0) {
 
         if ($("#sendbtn2").length > 0) {
             position = $("#sendbtn2").offset().left
-            if (position + $(".sendtokindle-drop").width() > $(window).width()) {
-                positionOff = position + $(".sendtokindle-drop").width() - $(window).width();
+            if (position + $(".sendtoereader-drop").width() > $(window).width()) {
+                positionOff = position + $(".sendtoereader-drop").width() - $(window).width();
                 ribPosition = position - positionOff - 5
-                $(".sendtokindle-drop").attr("style", "left: " + ribPosition + "px !important; right: auto; top: " + topPos + "px");
+                $(".sendtoereader-drop").attr("style", "left: " + ribPosition + "px !important; right: auto; top: " + topPos + "px");
             } else {
-                $(".sendtokindle-drop").attr("style", "left: " + position + "px !important; right: auto; top: " + topPos + "px");
+                $(".sendtoereader-drop").attr("style", "left: " + position + "px !important; right: auto; top: " + topPos + "px");
             }
         }
 
@@ -300,7 +300,7 @@ if ($("body.book").length > 0) {
 $(document).mouseup(function (e) {
     var container = new Array();
     container.push($('ul[aria-labelledby="read-in-browser"]'));
-    container.push($(".sendtokindle-drop"));
+    container.push($(".sendtoereader-drop"));
     container.push($(".leramslist"));
     container.push($("#add-to-shelves"));
     container.push($(".navbar-collapse.collapse.in"));
@@ -666,7 +666,7 @@ $("#sendbtn").attr({
 
 $("#sendbtn2").attr({
     "data-toggle-two": "tooltip",
-    "title": $("#sendbtn2").text(),                 // "Send to Kindle",
+    "title": $("#sendbtn2").text(),                 // "Send to E-Reader",
     "data-placement": "bottom",
     "data-viewport": ".btn-toolbar"
 })
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
old mode 100644
new mode 100755
index 3062850dd..a9f0f055c
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -41,13 +41,13 @@ log = logger.create()
 
 
 class TaskConvert(CalibreTask):
-    def __init__(self, file_path, book_id, task_message, settings, kindle_mail, user=None):
+    def __init__(self, file_path, book_id, task_message, settings, ereader_mail, user=None):
         super(TaskConvert, self).__init__(task_message)
         self.file_path = file_path
         self.book_id = book_id
         self.title = ""
         self.settings = settings
-        self.kindle_mail = kindle_mail
+        self.ereader_mail = ereader_mail
         self.user = user
 
         self.results = dict()
@@ -85,16 +85,16 @@ class TaskConvert(CalibreTask):
                 # 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
+            if self.ereader_mail:
+                # if we're sending to E-Reader after converting, create a one-off task and run it immediately
                 # todo: figure out how to incorporate this into the progress
                 try:
-                    EmailText = N_(u"%(book)s send to Kindle", book=escape(self.title))
+                    EmailText = N_(u"%(book)s send to E-Reader", book=escape(self.title))
                     worker_thread.add(self.user, TaskEmail(self.settings['subject'],
                                                            self.results["path"],
                                                            filename,
                                                            self.settings,
-                                                           self.kindle_mail,
+                                                           self.ereader_mail,
                                                            EmailText,
                                                            self.settings['body'],
                                                            internal=True)
@@ -112,7 +112,7 @@ class TaskConvert(CalibreTask):
 
         # 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
+        # this will allow send to E-Reader workflow to continue to work
         if os.path.isfile(file_path + format_new_ext) or\
                 local_db.get_book_format(self.book_id, self.settings['new_book_format']):
             log.info("Book id %d already converted to %s", book_id, format_new_ext)
@@ -273,7 +273,7 @@ class TaskConvert(CalibreTask):
         return N_("Convert")
 
     def __str__(self):
-        return "Convert {} {}".format(self.book_id, self.kindle_mail)
+        return "Convert {} {}".format(self.book_id, self.ereader_mail)
 
     @property
     def is_cancellable(self):
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
old mode 100644
new mode 100755
index f1c3749a6..553dcbb68
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -12,7 +12,7 @@
         <tr>
             <th>{{_('Username')}}</th>
             <th>{{_('E-mail Address')}}</th>
-            <th>{{_('Send to Kindle E-mail Address')}}</th>
+            <th>{{_('Send to E-Reader E-mail Address')}}</th>
             <th>{{_('Downloads')}}</th>
             <th class="hidden-xs ">{{_('Admin')}}</th>
             <th class="hidden-xs hidden-sm">{{_('Password')}}</th>
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
old mode 100644
new mode 100755
index 3af205fb5..501516032
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -10,7 +10,7 @@
     </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">
+        <div class="btn-group" role="group" aria-label="Download, send to E-Reader, reading">
           {% if g.user.role_download() %}
             {% if entry.data|length %}
             <div class="btn-group" role="group">
@@ -37,18 +37,18 @@
             </div>
             {% endif %}
           {% endif %}
-            {% if g.user.kindle_mail and entry.kindle_list %}
-              {% if entry.kindle_list.__len__() == 1 %}
-                <div id="sendbtn" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=entry.kindle_list[0]['format'], convert=entry.kindle_list[0]['convert'])}}" data-text="{{_('Send to Kindle')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.kindle_list[0]['text']}}</div>
+            {% if g.user.kindle_mail and entry.email_share_list %}
+              {% if entry.email_share_list.__len__() == 1 %}
+                <div id="sendbtn" data-action="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=entry.email_share_list[0]['format'], convert=entry.email_share_list[0]['convert'])}}" data-text="{{_('Send to E-Reader')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.email_share_list[0]['text']}}</div>
               {% else %}
                 <div class="btn-group" role="group">
                   <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="glyphicon glyphicon-send"></span>{{_('Send to Kindle')}}
+                    <span class="glyphicon glyphicon-send"></span>{{_('Send to E-Reader')}}
                     <span class="caret"></span>
                   </button>
-                    <ul class="dropdown-menu" aria-labelledby="send-to-kindle">
-                    {% for format in entry.kindle_list %}
-                      <li><a class="postAction" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{format['text']}}</a></li>
+                    <ul class="dropdown-menu" aria-labelledby="send-to-ereader">
+                    {% for format in entry.email_share_list %}
+                      <li><a class="postAction" data-action="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{format['text']}}</a></li>
                     {%endfor%}
                     </ul>
                 </div>
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
old mode 100644
new mode 100755
index f1a0b1375..1016c0a25
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -54,7 +54,7 @@
         {% endif %}
       </div>
 
-	  <div class="btn-group" role="group" aria-label="Download, send to Kindle, reading">
+	  <div class="btn-group" role="group" aria-label="Download, send to E-Reader, reading">
           {% if g.user.role_download() %}
             {% if entry.Books.data|length %}
             <div class="btn-group" role="group">
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
old mode 100644
new mode 100755
index b489cbafa..4aff7ee22
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -25,7 +25,7 @@
         </div>
     {% endif %}
     <div class="form-group">
-      <label for="kindle_mail">{{_('Send to Kindle E-mail Address')}}</label>
+      <label for="kindle_mail">{{_('Send to E-Reader E-mail Address')}}</label>
       <input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}">
     </div>
     {% if not content.role_anonymous() %}
diff --git a/cps/templates/user_table.html b/cps/templates/user_table.html
old mode 100644
new mode 100755
index 84dd114b4..cd0295d5a
--- a/cps/templates/user_table.html
+++ b/cps/templates/user_table.html
@@ -133,7 +133,7 @@
             <th data-name="id" data-field="id" id="id" data-visible="false" data-switchable="false"></th>
             {{ user_table_row('name', _('Enter Username'), _('Username'), true) }}
             {{ user_table_row('email', _('Enter E-mail Address'), _('E-mail Address'), true) }}
-            {{ user_table_row('kindle_mail', _('Enter Kindle E-mail Address'), _('Kindle E-mail'), false) }}
+            {{ user_table_row('kindle_mail', _('Enter E-Reader E-mail Address'), _('E-Reader E-mail'), false) }}
             {{ user_select_translations('locale', url_for('admin.table_get_locale'), _('Locale'), true) }}
             {{ user_select_languages('default_language', url_for('admin.table_get_default_lang'), _('Visible Book Languages'), true) }}
             {{ user_table_row('allowed_tags', _("Edit Allowed Tags"), _("Allowed Tags"), false, tags) }}
diff --git a/cps/web.py b/cps/web.py
old mode 100644
new mode 100755
index 1aa4cc1b7..4a2a796ba
--- a/cps/web.py
+++ b/cps/web.py
@@ -45,7 +45,7 @@ from .search import render_search_results, render_adv_search_results
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
 from .helper import check_valid_domain, check_email, check_username, \
     get_book_cover, get_series_cover_thumbnail, get_download_link, send_mail, generate_random_password, \
-    send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email, \
+    send_registration_mail, check_send_to_ereader, check_read_formats, tags_filters, reset_password, valid_email, \
     edit_book_read_status
 from .pagination import Pagination
 from .redirect import redirect_back
@@ -1189,7 +1189,7 @@ def download_link(book_id, book_format, anyname):
 @web.route('/send/<int:book_id>/<book_format>/<int:convert>', methods=["POST"])
 @login_required
 @download_required
-def send_to_kindle(book_id, book_format, convert):
+def send_to_ereader(book_id, book_format, convert):
     if not config.get_mail_server_configured():
         flash(_(u"Please configure the SMTP mail settings first..."), category="error")
     elif current_user.kindle_mail:
@@ -1521,7 +1521,7 @@ def show_book(book_id):
 
         entry.ordered_authors = calibre_db.order_authors([entry])
 
-        entry.kindle_list = check_send_to_kindle(entry)
+        entry.email_share_list = check_send_to_ereader(entry)
         entry.reader_list = check_read_formats(entry)
 
         entry.audio_entries = []
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 86255e61b..79fbdc61c 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-05-05 20:48:29</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-05-07 17:19:13</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>2022-05-06 02:34:54</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-05-07 23:07:20</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>4h 53 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 55 min</p>
         </div>
       </div>
       </div>
@@ -234,12 +234,12 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCli</td>
         <td class="text-center">12</td>
-        <td class="text-center">9</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</td>
+        <td class="text-center">12</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('c2', 12)">Detail</a>
@@ -311,42 +311,11 @@
     
     
     
-        <tr id="et2.8" class="none bg-info">
+        <tr id='pt2.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_enable_reconnect</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et2.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et2.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 605, in test_enable_reconnect
-    self.driver.get(&#34;http://127.0.0.1:8083&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 246, in check_response
-    raise exception_class(message, screen, stacktrace, alert_text)  # type: ignore[call-arg]  # mypy is not smart enough here
-selenium.common.exceptions.UnexpectedAlertPresentException: Alert Text: None
-Message: Dismissed user prompt dialog: Performing shutdown of server, please close window
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-UnexpectedAlertOpenError@chrome://remote/content/shared/webdriver/Errors.jsm:488:5
-GeckoDriver.prototype._handleUserPrompts@chrome://remote/content/marionette/driver.js:2547:13</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -360,31 +329,11 @@ GeckoDriver.prototype._handleUserPrompts@chrome://remote/content/marionette/driv
     
     
     
-        <tr id="ft2.10" class="none bg-danger">
+        <tr id='pt2.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_no_database</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft2.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft2.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 562, in test_no_database
-    self.assertTrue(database_dir)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -398,43 +347,23 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft2.12" class="none bg-danger">
+        <tr id='pt2.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_writeonly_static_files</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft2.12')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft2.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 650, in test_writeonly_static_files
-    self.assertTrue(self.check_element_on_page((By.ID, &#39;flash_success&#39;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestCliGdrivedb</td>
         <td class="text-center">4</td>
-        <td class="text-center">0</td>
         <td class="text-center">4</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', 4)">Detail</a>
         </td>
@@ -442,131 +371,38 @@ AssertionError: False is not true</pre>
 
     
     
-        <tr id="ft3.1" class="none bg-danger">
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_folder</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 197, in test_cli_gdrive_folder
-    self.start_cw(os.path.join(CALIBRE_WEB_PATH, u&#39;cps.py&#39;), gdrive_dir)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 142, in start_cw
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft3.2" class="none bg-danger">
+        <tr id='pt3.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 178, in test_cli_gdrive_location
-    self.start_cw(os.path.join(CALIBRE_WEB_PATH, u&#39;cps.py&#39;), os.path.join(gdrive_dir, u&#39;gü dr.app&#39;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 142, in start_cw
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft3.3" class="none bg-danger">
+        <tr id='pt3.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 146, in test_gdrive_db_nonwrite
-    self.start_cw(os.path.join(CALIBRE_WEB_PATH, u&#39;cps.py&#39;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 142, in start_cw
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft3.4" class="none bg-danger">
+        <tr id='pt3.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_no_database</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 226, in test_no_database
-    self.assertTrue(self.check_element_on_page((By.ID, &#39;flash_success&#39;)))
-AssertionError: False is not true
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 233, in test_no_database
-    self.assertFalse(True, &#34;Inital config failed with normal database&#34;)
-AssertionError: True is not false : Inital config failed with normal database</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -629,12 +465,12 @@ AssertionError: True is not false : Inital config failed with normal database</p
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">6</td>
+        <td class="text-center">15</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', 15)">Detail</a>
@@ -652,242 +488,74 @@ AssertionError: True is not false : Inital config failed with normal database</p
     
     
     
-        <tr id="et6.2" class="none bg-info">
+        <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</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:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 77, in test_convert_deactivate
-    self.assertEqual(element.text, &#39;not installed&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et6.3" class="none bg-info">
+        <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</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:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 188, in test_convert_email
-    self.assertEqual(len(details[&#39;kindle&#39;]), 1)
-TypeError: object of type &#39;NoneType&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et6.4" class="none bg-info">
+        <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 232, in test_convert_failed_and_email
-    self.assertEqual(len(details[&#39;kindle&#39;]), 1)
-TypeError: object of type &#39;NoneType&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et6.5" class="none bg-info">
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 268, in test_convert_only
-    select = Select(vals[&#39;btn_from&#39;])
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 36, in __init__
-    if webelement.tag_name.lower() != &#34;select&#34;:
-AttributeError: &#39;bool&#39; object has no attribute &#39;tag_name&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.6" class="none bg-danger">
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 551, in test_convert_options
-    self.assertEqual(from_book, set([&#39;-- select an option --&#39;, &#34;CBR&#34;]))
-AssertionError: Items in the second set but not the first:
-&#39;CBR&#39;
-&#39;-- select an option --&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et6.7" class="none bg-info">
+        <tr id='pt6.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 154, in test_convert_parameter
-    select = Select(vals[&#39;btn_from&#39;])
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 36, in __init__
-    if webelement.tag_name.lower() != &#34;select&#34;:
-AttributeError: &#39;bool&#39; object has no attribute &#39;tag_name&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et6.8" class="none bg-info">
+        <tr id='pt6.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 94, in test_convert_wrong_excecutable
-    self.assertEqual(element.text, &#39;not installed&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.9" class="none bg-danger">
+        <tr id='pt6.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 508, in test_convert_xss
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -901,33 +569,11 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="ft6.11" class="none bg-danger">
+        <tr id='pt6.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 401, in test_email_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -959,33 +605,11 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="ft6.15" class="none bg-danger">
+        <tr id='pt6.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.15')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 542, in test_user_convert_xss
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -994,8 +618,8 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">7</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</td>
+        <td class="text-center">3</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1005,11 +629,31 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id="ft7.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 200, in test_convert_email
+    self.assertTrue(&#34;Convert&#34; in ret[-2][&#39;task&#39;])
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1023,11 +667,33 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id="ft7.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 330, in test_convert_only
+    self.assertEqual(ret[-6][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1050,11 +716,31 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id="ft7.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 401, in test_email_only
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1076,9 +762,9 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 443, in test_thumbnail_cache
-    self.assertEqual(10*2, count_files(thumbnail_cache_path))
-AssertionError: 20 != 9</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 442, in test_thumbnail_cache
+    self.assertTrue(os.path.exists(thumbnail_cache_path))
+AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1093,8 +779,8 @@ AssertionError: 20 != 9</pre>
         <td>TestEbookConvertKepubify</td>
         <td class="text-center">3</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">3</td>
+        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c8', 3)">Detail</a>
@@ -1103,26 +789,26 @@ AssertionError: 20 != 9</pre>
 
     
     
-        <tr id="et8.1" class="none bg-info">
+        <tr id="ft8.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_deactivate</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et8.1')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft8.1')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et8.1" class="popup_window test_output" style="display:block;">
+                <div id="div_ft8.1" class="popup_window test_output" style="display:block;">
                     <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
+                                onclick="document.getElementById('div_ft8.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 64, in test_convert_deactivate
-    self.assertEqual(element.text, &#39;not installed&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 66, in test_convert_deactivate
+    self.assertFalse(details[&#39;kindlebtn&#39;])
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;08f9d634-ab98-4b2a-8ef0-64104fea59e4&#34;, element=&#34;ccda4037-d63c-46e0-be4e-a8c7917f117f&#34;)&gt; is not false</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1163,26 +849,26 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;tag_name&#39;</pre>
     
     
     
-        <tr id="et8.3" class="none bg-info">
+        <tr id="ft8.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_wrong_excecutable</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et8.3')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft8.3')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et8.3" class="popup_window test_output" style="display:block;">
+                <div id="div_ft8.3" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et8.3').style.display='none'"><span
+                                onclick="document.getElementById('div_ft8.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 80, in test_convert_wrong_excecutable
-    self.assertEqual(element.text, &#39;not installed&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 82, in test_convert_wrong_excecutable
+    self.assertFalse(details[&#39;kindlebtn&#39;])
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;08f9d634-ab98-4b2a-8ef0-64104fea59e4&#34;, element=&#34;57c8b86e-6bb9-454c-a20e-0e38c05bf281&#34;)&gt; is not false</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1197,8 +883,8 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">3</td>
+        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c9', 3)">Detail</a>
@@ -1207,26 +893,26 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
 
     
     
-        <tr id="et9.1" class="none bg-info">
+        <tr id="ft9.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_deactivate</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et9.1')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft9.1')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et9.1" class="popup_window test_output" style="display:block;">
+                <div id="div_ft9.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et9.1').style.display='none'"><span
+                                onclick="document.getElementById('div_ft9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 112, in test_convert_deactivate
-    self.assertEqual(element.text, &#39;not installed&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 114, in test_convert_deactivate
+    self.assertFalse(details[&#39;kindlebtn&#39;])
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;7761912c-cf57-49f4-88d0-faf36b22e36c&#34;, element=&#34;2c9a3a10-07d0-4d04-a5a0-ee09f0f3d0a5&#34;)&gt; is not false</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1267,26 +953,26 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;tag_name&#39;</pre>
     
     
     
-        <tr id="et9.3" class="none bg-info">
+        <tr id="ft9.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_wrong_excecutable</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et9.3')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft9.3')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et9.3" class="popup_window test_output" style="display:block;">
+                <div id="div_ft9.3" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et9.3').style.display='none'"><span
+                                onclick="document.getElementById('div_ft9.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 127, in test_convert_wrong_excecutable
-    self.assertEqual(element.text, &#39;not installed&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 129, in test_convert_wrong_excecutable
+    self.assertFalse(details[&#39;kindlebtn&#39;])
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;7761912c-cf57-49f4-88d0-faf36b22e36c&#34;, element=&#34;6425825b-eacd-4b24-8a86-84bd729786dc&#34;)&gt; is not false</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2136,13 +1822,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</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">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
@@ -2150,31 +1836,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
 
     
     
-        <tr id="et15.1" class="none bg-info">
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et15.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et15.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 84, in test_load_metadata
-    elif &#39;https://amazon.com/&#39; == results[20][&#39;source&#39;]:
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4133,11 +3799,11 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</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">
@@ -4174,31 +3840,11 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="ft42.4" class="none bg-danger">
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft42.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 137, in test_cover_change_on_upload_new_cover
-    self.assertEqual(110*2, count_files(thumbnail_cache_path),)
-AssertionError: 220 != 218</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4353,11 +3999,11 @@ AssertionError: 220 != 218</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">4</td>
-        <td class="text-center">4</td>
-        <td class="text-center">0</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">
@@ -4367,20 +4013,60 @@ AssertionError: 220 != 218</pre>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id="ft44.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 146, in test_upload_epub_cover
+    self.assertAlmostEqual(diff(BytesIO(original), BytesIO(cover_image), delete_diff_file=True), 0.0, delta=0.0001)
+AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405644 difference)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id="ft44.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 205, in test_upload_epub_cover_formats
+    self.assertAlmostEqual(diff(BytesIO(original), BytesIO(cover_image), delete_diff_file=True), 0.0058,
+AssertionError: 0.0 != 0.0058 within 0.0001 delta (0.0058 difference)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4404,12 +4090,12 @@ AssertionError: 220 != 218</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">15</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c45', 18)">Detail</a>
@@ -4490,11 +4176,31 @@ AssertionError: 220 != 218</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id="et45.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et45.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et45.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et45.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 261, in test_user_list_edit_kindle
+    self.assertEqual(&#34;muki1al@b.com&#34;, ul[&#39;table&#39;][1][&#39;Kindle E-mail&#39;][&#39;text&#39;])
+KeyError: &#39;Kindle E-mail&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4562,20 +4268,64 @@ AssertionError: 220 != 218</pre>
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id="et45.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et45.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et45.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et45.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 542, in test_user_list_search
+    self.check_search(ul, &#34;m11&#34;, 1, &#34;Kindle E-mail&#34;, &#34;m11uklial@bds.com&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 86, in check_search
+    self.assertEqual(value, bl[&#39;table&#39;][0][column][&#39;text&#39;])
+KeyError: &#39;Kindle E-mail&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id="ft45.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft45.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft45.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft45.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 560, in test_user_list_sort
+    self.assertEqual(&#34;Kindle E-mail&#34;, ul[&#39;header&#39;][4][&#39;text&#39;])
+AssertionError: &#39;Kindle E-mail&#39; != &#39;E-Reader E-mail&#39;
+- Kindle E-mail
++ E-Reader E-mail</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -5300,9 +5050,9 @@ AssertionError: 220 != 218</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>424</td>
-        <td>391</td>
-        <td>12</td>
-        <td>14</td>
+        <td>402</td>
+        <td>11</td>
+        <td>4</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5751,7 +5501,7 @@ AssertionError: 220 != 218</pre>
 </div>
 
 <script>
-    drawCircle(391, 12, 14, 7);
+    drawCircle(402, 11, 4, 7);
     showCase(5);
 </script>
 

From 8a6a8dcbe8dd86b4673d72d255867e51caebfaa3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 9 May 2022 19:47:43 +0200
Subject: [PATCH 282/412] Transfer gevent errors to log file Transfer warnings
 from warnings module to logfile (#2394)

---
 cps/logger.py | 1 +
 cps/server.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cps/logger.py b/cps/logger.py
index fcc25c27b..82853bba8 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -159,6 +159,7 @@ def setup(log_file, log_level=None):
         r.removeHandler(h)
         h.close()
     r.addHandler(file_handler)
+    logging.captureWarnings(True)
     return "" if log_file == DEFAULT_LOG_FILE else log_file
 
 
diff --git a/cps/server.py b/cps/server.py
index 0ffdbd18c..fb70a723a 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -204,6 +204,7 @@ 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, handler_class=MyWSGIHandler,
+                                         error_log=log,
                                          spawn=Pool(), **ssl_args)
             if ssl_args:
                 wrap_socket = self.wsgiserver.wrap_socket

From 78fb7a975622f9cfa5885b92c3fe33e45e1dc2c7 Mon Sep 17 00:00:00 2001
From: ImanSharaf <78227895+ImanSharaf@users.noreply.github.com>
Date: Sun, 15 May 2022 19:00:16 -0700
Subject: [PATCH 283/412] Update SECURITY.md

I am the person who has reported the SQLi problem. I contacted the MITRE and they have given me this CVE number: CVE-2022-30765
---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 1b93b5f9d..f37c62dc2 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -35,7 +35,7 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.16      | It's prevented to get the name of a private shelfs. Thanks to @nhiephon                                            |CVE-2022-0405|
 | V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                            |CVE-2022-0767|
 | V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             |CVE-2022-0766|
-| V 0.6.18      | Possible SQL Injection is prevented in user table  Thanks to Iman Sharafaldin (Forward Security)                   ||
+| V 0.6.18      | Possible SQL Injection is prevented in user table  Thanks to Iman Sharafaldin (Forward Security)                   |CVE-2022-30765|
 | V 0.6.18      | The SSRF protection no longer can be bypassed by IPV6/IPV4 embedding. Thanks to  @416e6e61                         |CVE-2022-0939|
 | V 0.6.18      | The SSRF protection no longer can be bypassed to connect to other servers in the local network. Thanks to @michaellrowley |CVE-2022-0990|
 

From 3b7cd38d5e263a46e1c67554d3fe4ac443c8c312 Mon Sep 17 00:00:00 2001
From: leexia <ligong90@gmail.com>
Date: Mon, 16 May 2022 13:59:35 +0800
Subject: [PATCH 284/412] Fix grammar mistake

---
 cps/helper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/helper.py b/cps/helper.py
index e8e452898..6db991b06 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -141,7 +141,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
 
 def check_send_to_ereader_with_converter(formats):
     book_formats = list()
-    if 'EPUB' in formats and 'EPUB' not in formats:
+    if 'MOBI' in formats and 'EPUB' not in formats:
         book_formats.append({'format': 'Epub',
                              'convert': 1,
                              'text': _('Convert %(orig)s to %(format)s and send to E-Reader',

From 4ea80e9810a14ca3617f08a4ae5cfa6b50482e9a Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 21 May 2022 21:52:59 +0100
Subject: [PATCH 285/412] Code cosmetics

---
 cps/admin.py        | 12 +++++++-----
 cps/babel.py        |  2 ++
 cps/cache_buster.py | 14 +++++++-------
 cps/cli.py          | 19 ++++++++++---------
 cps/config_sql.py   | 22 ++++++++++++----------
 cps/converter.py    |  7 +++----
 cps/debug_info.py   |  1 +
 cps/dep_check.py    |  2 +-
 cps/logger.py       | 17 +++++++++--------
 9 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 22127eb20..3c889643c 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -160,7 +160,7 @@ def shutdown():
     return json.dumps(showtext), 400
 
 
-# method is available without login and not protected by CSRF to make it easy reachable, is per default switched of
+# method is available without login and not protected by CSRF to make it easy reachable, is per default switched off
 # needed for docker applications, as changes on metadata.db from host are not visible to application
 @admi.route("/reconnect", methods=['GET'])
 def reconnect():
@@ -615,7 +615,8 @@ def load_dialogtexts(element_id):
     elif element_id == "db_submit":
         texts["main"] = _('Are you sure you want to change Calibre library location?')
     elif element_id == "admin_refresh_cover_cache":
-        texts["main"] = _('Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?')
+        texts["main"] = _('Calibre-Web will search for updated Covers '
+                          'and update Cover Thumbnails, this may take a while?')
     elif element_id == "btnfullsync":
         texts["main"] = _("Are you sure you want delete Calibre-Web's sync database "
                           "to force a full sync with your Kobo Reader?")
@@ -746,6 +747,7 @@ def edit_restriction(res_type, user_id):
             ub.session_commit("Changed denied columns of user {} to {}".format(usr.name, usr.denied_column_value))
     return ""
 
+
 @admi.route("/ajax/addrestriction/<int:res_type>", methods=['POST'])
 @login_required
 @admin_required
@@ -1084,7 +1086,7 @@ def _configuration_gdrive_helper(to_save):
                                 gdrive_secrets['redirect_uris'][0]
                             )
 
-    # always show google drive settings, but in case of error deny support
+    # always show Google Drive settings, but in case of error deny support
     new_gdrive_value = (not gdrive_error) and ("config_use_google_drive" in to_save)
     if config.config_use_google_drive and not new_gdrive_value:
         config.config_google_drive_watch_changes_response = {}
@@ -1837,7 +1839,7 @@ def _handle_new_user(to_save, content, languages, translations, kobo_support):
             log.info("Missing entries on new user")
             raise Exception(_(u"Please fill out all fields!"))
         content.email = check_email(to_save["email"])
-        # Query User name, if not existing, change
+        # Query username, if not existing, change
         content.name = check_username(to_save["name"])
         if to_save.get("kindle_mail"):
             content.kindle_mail = valid_email(to_save["kindle_mail"])
@@ -1956,7 +1958,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
         try:
             if to_save.get("email", content.email) != content.email:
                 content.email = check_email(to_save["email"])
-            # Query User name, if not existing, change
+            # Query username, if not existing, change
             if to_save.get("name", content.name) != content.name:
                 if to_save.get("name") == "Guest":
                     raise Exception(_("Guest Name can't be changed"))
diff --git a/cps/babel.py b/cps/babel.py
index f5ecaf5a5..4da808bc7 100644
--- a/cps/babel.py
+++ b/cps/babel.py
@@ -32,8 +32,10 @@ def get_locale():
 def get_user_locale_language(user_language):
     return Locale.parse(user_language).get_language_name(get_locale())
 
+
 def get_available_locale():
     return [Locale('en')] + babel.list_translations()
 
+
 def get_available_translations():
     return set(str(item) for item in get_available_locale())
diff --git a/cps/cache_buster.py b/cps/cache_buster.py
index ba19afd68..0a036b632 100644
--- a/cps/cache_buster.py
+++ b/cps/cache_buster.py
@@ -49,7 +49,7 @@ def init_cache_busting(app):
             rooted_filename = os.path.join(dirpath, filename)
             try:
                 with open(rooted_filename, 'rb') as f:
-                    file_hash = hashlib.md5(f.read()).hexdigest()[:7] # nosec
+                    file_hash = hashlib.md5(f.read()).hexdigest()[:7]  # nosec
                 # save version to tables
                 file_path = rooted_filename.replace(static_folder, "")
                 file_path = file_path.replace("\\", "/")  # Convert Windows path to web path
@@ -59,11 +59,11 @@ def init_cache_busting(app):
 
     log.debug('Finished computing cache-busting values')
 
-    def bust_filename(filename):
-        return hash_table.get(filename, "")
+    def bust_filename(file_name):
+        return hash_table.get(file_name, "")
 
-    def unbust_filename(filename):
-        return filename.split("?", 1)[0]
+    def unbust_filename(file_name):
+        return file_name.split("?", 1)[0]
 
     @app.url_defaults
     # pylint: disable=unused-variable
@@ -76,11 +76,11 @@ def init_cache_busting(app):
             if file_hash:
                 values["q"] = file_hash
 
-    def debusting_static_view(filename):
+    def debusting_static_view(file_name):
         """
         Serve a request for a static file having a busted name.
         """
-        return original_static_view(filename=unbust_filename(filename))
+        return original_static_view(filename=unbust_filename(file_name))
 
     # Replace the default static file view with our debusting view.
     original_static_view = app.view_functions["static"]
diff --git a/cps/cli.py b/cps/cli.py
index cf4f36fb0..5896c7fe0 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -26,26 +26,28 @@ from .constants import STABLE_VERSION as _STABLE_VERSION
 from .constants import NIGHTLY_VERSION as _NIGHTLY_VERSION
 from .constants import DEFAULT_SETTINGS_FILE, DEFAULT_GDRIVE_FILE
 
+
 def version_info():
     if _NIGHTLY_VERSION[1].startswith('$Format'):
         return "Calibre-Web version: %s - unkown git-clone" % _STABLE_VERSION['version']
     return "Calibre-Web version: %s -%s" % (_STABLE_VERSION['version'], _NIGHTLY_VERSION[1])
 
+
 class CliParameter(object):
 
     def init(self):
         self.arg_parser()
 
     def arg_parser(self):
-        parser = argparse.ArgumentParser(description='Calibre Web is a web app'
-                                                     ' providing a interface for browsing, reading and downloading eBooks\n',
+        parser = argparse.ArgumentParser(description='Calibre Web is a web app providing '
+                                                     'a interface for browsing, reading and downloading eBooks\n',
                                          prog='cps.py')
         parser.add_argument('-p', metavar='path', help='path and name to settings db, e.g. /opt/cw.db')
         parser.add_argument('-g', metavar='path', help='path and name to gdrive db, e.g. /opt/gd.db')
-        parser.add_argument('-c', metavar='path',
-                            help='path and name to SSL certfile, e.g. /opt/test.cert, works only in combination with keyfile')
-        parser.add_argument('-k', metavar='path',
-                            help='path and name to SSL keyfile, e.g. /opt/test.key, works only in combination with certfile')
+        parser.add_argument('-c', metavar='path', help='path and name to SSL certfile, e.g. /opt/test.cert, '
+                                                       'works only in combination with keyfile')
+        parser.add_argument('-k', metavar='path', help='path and name to SSL keyfile, e.g. /opt/test.key, '
+                                                       'works only in combination with certfile')
         parser.add_argument('-v', '--version', action='version', help='Shows version number and exits Calibre-Web',
                             version=version_info())
         parser.add_argument('-i', metavar='ip-address', help='Server IP-Address to listen')
@@ -67,7 +69,6 @@ class CliParameter(object):
         if os.path.isdir(self.gd_path):
             self.gd_path = os.path.join(self.gd_path, DEFAULT_GDRIVE_FILE)
 
-
         # handle and check parameter for ssl encryption
         self.certfilepath = None
         self.keyfilepath = None
@@ -96,7 +97,7 @@ class CliParameter(object):
             self.keyfilepath = ""
 
         # dry run updater
-        self.dry_run =args.d or None
+        self.dry_run = args.d or None
         # enable reconnect endpoint for docker database reconnect
         self.reconnect_enable = args.r or os.environ.get("CALIBRE_RECONNECT", None)
         # load covers from localhost
@@ -112,7 +113,7 @@ class CliParameter(object):
                     else:
                         socket.inet_pton(socket.AF_INET, self.ip_address)
                 else:
-                    # on windows python < 3.4, inet_pton is not available
+                    # on Windows python < 3.4, inet_pton is not available
                     # inet_atom only handles IPv4 addresses
                     socket.inet_aton(self.ip_address)
             except socket.error as err:
diff --git a/cps/config_sql.py b/cps/config_sql.py
index 405a92ece..bba3d6508 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -35,6 +35,7 @@ from . import constants, logger
 log = logger.create()
 _Base = declarative_base()
 
+
 class _Flask_Settings(_Base):
     __tablename__ = 'flask_settings'
 
@@ -67,7 +68,7 @@ class _Settings(_Base):
     config_external_port = Column(Integer, default=constants.DEFAULT_PORT)
     config_certfile = Column(String)
     config_keyfile = Column(String)
-    config_trustedhosts = Column(String,default='')
+    config_trustedhosts = Column(String, default='')
     config_calibre_web_title = Column(String, default=u'Calibre-Web')
     config_books_per_page = Column(Integer, default=60)
     config_random_books = Column(Integer, default=4)
@@ -123,7 +124,7 @@ class _Settings(_Base):
     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_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')
@@ -171,7 +172,6 @@ class _ConfigSQL(object):
             self.config_converterpath = autodetect_calibre_binary()
 
         if self.config_kepubifypath == None:  # pylint: disable=access-member-before-definition
-
             change = True
             self.config_kepubifypath = autodetect_kepubify_binary()
 
@@ -257,14 +257,14 @@ class _ConfigSQL(object):
         return logger.get_level_name(self.config_log_level)
 
     def get_mail_settings(self):
-        return {k:v for k, v in self.__dict__.items() if k.startswith('mail_')}
+        return {k: v for k, v in self.__dict__.items() if k.startswith('mail_')}
 
     def get_mail_server_configured(self):
         return bool((self.mail_server != constants.DEFAULT_MAIL_SERVER and self.mail_server_type == 0)
                     or (self.mail_gmail_token != {} and self.mail_server_type == 1))
 
     def get_scheduled_task_settings(self):
-        return {k:v for k, v in self.__dict__.items() if k.startswith('schedule_')}
+        return {k: v for k, v in self.__dict__.items() if k.startswith('schedule_')}
 
     def set_from_dictionary(self, dictionary, field, convertor=None, default=None, encode=None):
         """Possibly updates a field of this object.
@@ -301,7 +301,7 @@ class _ConfigSQL(object):
         return storage
 
     def load(self):
-        '''Load all configuration values from the underlying storage.'''
+        """Load all configuration values from the underlying storage."""
         s = self._read_from_storage()  # type: _Settings
         for k, v in s.__dict__.items():
             if k[0] != '_':
@@ -334,7 +334,7 @@ class _ConfigSQL(object):
                 self._session.rollback()
 
     def save(self):
-        '''Apply all configuration values to the underlying storage.'''
+        """Apply all configuration values to the underlying storage."""
         s = self._read_from_storage()  # type: _Settings
 
         for k, v in self.__dict__.items():
@@ -369,6 +369,7 @@ class _ConfigSQL(object):
         except AttributeError:
             pass
 
+
 def _migrate_table(session, orm_class):
     changed = False
 
@@ -390,9 +391,9 @@ def _migrate_table(session, orm_class):
                 else:
                     column_type = column.type
                 alter_table = text("ALTER TABLE %s ADD COLUMN `%s` %s %s" % (orm_class.__tablename__,
-                                                                        column_name,
-                                                                        column_type,
-                                                                        column_default))
+                                                                             column_name,
+                                                                             column_type,
+                                                                             column_default))
                 log.debug(alter_table)
                 session.execute(alter_table)
                 changed = True
@@ -462,6 +463,7 @@ def load_configuration(conf, session, cli):
     conf.init_config(session, cli)
     # return conf
 
+
 def get_flask_session_key(_session):
     flask_settings = _session.query(_Flask_Settings).one_or_none()
     if flask_settings == None:
diff --git a/cps/converter.py b/cps/converter.py
index af2a6c09f..981b39097 100644
--- a/cps/converter.py
+++ b/cps/converter.py
@@ -54,10 +54,9 @@ def get_calibre_version():
 def get_unrar_version():
     unrar_version = _get_command_version(config.config_rarfile_location, r'UNRAR.*\d')
     if unrar_version == "not installed":
-        unrar_version = _get_command_version(config.config_rarfile_location, r'unrar.*\d','-V')
+        unrar_version = _get_command_version(config.config_rarfile_location, r'unrar.*\d', '-V')
     return unrar_version
 
+
 def get_kepubify_version():
-    return _get_command_version(config.config_kepubifypath, r'kepubify\s','--version')
-
-
+    return _get_command_version(config.config_kepubifypath, r'kepubify\s', '--version')
diff --git a/cps/debug_info.py b/cps/debug_info.py
index dd5e858ed..64fda557f 100644
--- a/cps/debug_info.py
+++ b/cps/debug_info.py
@@ -32,6 +32,7 @@ from .about import collect_stats
 
 log = logger.create()
 
+
 def assemble_logfiles(file_name):
     log_list = sorted(glob.glob(file_name + '*'), reverse=True)
     wfd = BytesIO()
diff --git a/cps/dep_check.py b/cps/dep_check.py
index 44f3961a4..bc015756a 100644
--- a/cps/dep_check.py
+++ b/cps/dep_check.py
@@ -42,7 +42,7 @@ def load_dependencies(optional=False):
                         res = re.match(r'(.*?)([<=>\s]+)([\d\.]+),?\s?([<=>\s]+)?([\d\.]+)?', line.strip())
                         try:
                             if getattr(sys, 'frozen', False):
-                                dep_version = exe_deps[res.group(1).lower().replace('_','-')]
+                                dep_version = exe_deps[res.group(1).lower().replace('_', '-')]
                             else:
                                 if importlib:
                                     dep_version = version(res.group(1))
diff --git a/cps/logger.py b/cps/logger.py
index 82853bba8..13535efba 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -54,7 +54,6 @@ class _Logger(logging.Logger):
             else:
                 self.error(message, *args, **kwargs)
 
-
     def debug_no_auth(self, message, *args, **kwargs):
         message = message.strip("\r\n")
         if message.startswith("send: AUTH"):
@@ -66,6 +65,7 @@ class _Logger(logging.Logger):
 def get(name=None):
     return logging.getLogger(name)
 
+
 def create():
     parent_frame = inspect.stack(0)[1]
     if hasattr(parent_frame, 'frame'):
@@ -75,9 +75,11 @@ def create():
     parent_module = inspect.getmodule(parent_frame)
     return get(parent_module.__name__)
 
+
 def is_debug_enabled():
     return logging.root.level <= logging.DEBUG
 
+
 def is_info_enabled(logger):
     return logging.getLogger(logger).level <= logging.INFO
 
@@ -114,10 +116,10 @@ def get_accesslogfile(log_file):
 
 
 def setup(log_file, log_level=None):
-    '''
+    """
     Configure the logging output.
     May be called multiple times.
-    '''
+    """
     log_level = log_level or DEFAULT_LOG_LEVEL
     logging.setLoggerClass(_Logger)
     logging.getLogger(__package__).setLevel(log_level)
@@ -127,7 +129,7 @@ def setup(log_file, log_level=None):
         # avoid spamming the log with debug messages from libraries
         r.setLevel(log_level)
 
-    # Otherwise name get's destroyed on windows
+    # Otherwise, name gets destroyed on Windows
     if log_file != LOG_TO_STDERR and log_file != LOG_TO_STDOUT:
         log_file = _absolute_log_file(log_file, DEFAULT_LOG_FILE)
 
@@ -164,9 +166,9 @@ def setup(log_file, log_level=None):
 
 
 def create_access_log(log_file, log_name, formatter):
-    '''
+    """
     One-time configuration for the web server's access log.
-    '''
+    """
     log_file = _absolute_log_file(log_file, DEFAULT_ACCESS_LOG)
     logging.debug("access log: %s", log_file)
 
@@ -183,8 +185,7 @@ def create_access_log(log_file, log_name, formatter):
 
     file_handler.setFormatter(formatter)
     access_log.addHandler(file_handler)
-    return access_log, \
-           "" if _absolute_log_file(log_file, DEFAULT_ACCESS_LOG) == DEFAULT_ACCESS_LOG else log_file
+    return access_log, "" if _absolute_log_file(log_file, DEFAULT_ACCESS_LOG) == DEFAULT_ACCESS_LOG else log_file
 
 
 # Enable logging of smtp lib debug output

From 790080f2a0d9d4709da744167954448dc1b76382 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 May 2022 12:49:00 +0100
Subject: [PATCH 286/412] Fix Cache Buster

---
 cps/cache_buster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/cache_buster.py b/cps/cache_buster.py
index 0a036b632..eb6b74332 100644
--- a/cps/cache_buster.py
+++ b/cps/cache_buster.py
@@ -76,11 +76,11 @@ def init_cache_busting(app):
             if file_hash:
                 values["q"] = file_hash
 
-    def debusting_static_view(file_name):
+    def debusting_static_view(filename):
         """
         Serve a request for a static file having a busted name.
         """
-        return original_static_view(filename=unbust_filename(file_name))
+        return original_static_view(filename=unbust_filename(filename))
 
     # Replace the default static file view with our debusting view.
     original_static_view = app.view_functions["static"]

From a3cd217cea1e3ba2c9749451da1f93d36a2ebf9a Mon Sep 17 00:00:00 2001
From: Aisha Tammy <aisha@bsd.ac>
Date: Wed, 25 May 2022 12:14:09 -0400
Subject: [PATCH 287/412] allow @ in auto username detection

Signed-off-by: Aisha Tammy <aisha@bsd.ac>
---
 cps/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/admin.py b/cps/admin.py
index 3c889643c..45d69dbc0 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1994,7 +1994,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
 
 
 def extract_user_data_from_field(user, field):
-    match = re.search(field + r"=([\.\d\s\w-]+)", user, re.IGNORECASE | re.UNICODE)
+    match = re.search(field + r"=([@\.\d\s\w-]+)", user, re.IGNORECASE | re.UNICODE)
     if match:
         return match.group(1)
     else:

From aa442d8c51a9ccb738bf964a0ea1d4c19533f4f1 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 31 May 2022 19:22:57 +0200
Subject: [PATCH 288/412] Update flask-login requirement

---
 cps/redirect.py  | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/redirect.py b/cps/redirect.py
index 9382a205b..09b3101f8 100644
--- a/cps/redirect.py
+++ b/cps/redirect.py
@@ -25,7 +25,7 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# http://flask.pocoo.org/snippets/62/
+# https://web.archive.org/web/20120517003641/http://flask.pocoo.org/snippets/62/
 
 from urllib.parse import urlparse, urljoin
 
diff --git a/requirements.txt b/requirements.txt
index 7a30ae06a..acaf4a403 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ APScheduler>=3.6.3,<3.10.0
 werkzeug<2.1.0
 Babel>=1.3,<3.0
 Flask-Babel>=0.11.1,<2.1.0
-Flask-Login>=0.3.2,<0.6.1
+Flask-Login>=0.3.2,<0.6.2
 Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
 Flask>=1.0.2,<2.1.0

From 7f6e88ce5ea36ea26954efeea7a80d334aa3ed91 Mon Sep 17 00:00:00 2001
From: Thore Schillmann <thoreschillmann@gmail.com>
Date: Wed, 1 Jun 2022 22:06:28 +0200
Subject: [PATCH 289/412] fixes bug 2419

---
 cps/admin.py          | 7 ++++---
 cps/db.py             | 9 ++++-----
 cps/static/js/main.js | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 3c889643c..20b533c71 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1668,9 +1668,10 @@ def _db_configuration_update_helper():
 
     if db_change or not db_valid or not config.db_configured \
             or config.config_calibre_dir != to_save["config_calibre_dir"]:
-        if not calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path):
-            return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
-                                            gdrive_error)
+        if not os.path.exists(metadata_db) or not to_save['config_calibre_dir']:
+            return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'), gdrive_error)
+        else:
+            calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path)
         config.store_calibre_uuid(calibre_db, db.Library_Id)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         if db_change:
diff --git a/cps/db.py b/cps/db.py
index c4f7ed382..0b98f683a 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -567,12 +567,12 @@ class CalibreDB:
 
         if not config_calibre_dir:
             cls.config.invalidate()
-            return False
+            return None
 
         dbpath = os.path.join(config_calibre_dir, "metadata.db")
         if not os.path.exists(dbpath):
             cls.config.invalidate()
-            return False
+            return None
 
         try:
             cls.engine = create_engine('sqlite://',
@@ -588,7 +588,7 @@ class CalibreDB:
             # conn.text_factory = lambda b: b.decode(errors = 'ignore') possible fix for #1302
         except Exception as ex:
             cls.config.invalidate(ex)
-            return False
+            return None
 
         cls.config.db_configured = True
 
@@ -598,7 +598,7 @@ class CalibreDB:
                 cls.setup_db_cc_classes(cc)
             except OperationalError as e:
                 log.error_or_exception(e)
-                return False
+                return None
 
         cls.session_factory = scoped_session(sessionmaker(autocommit=False,
                                                           autoflush=True,
@@ -607,7 +607,6 @@ class CalibreDB:
             inst.init_session()
 
         cls._init = True
-        return True
 
     def get_book(self, book_id):
         return self.session.query(Books).filter(Books.id == book_id).first()
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 04d47d6be..cfb0b2f01 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -677,8 +677,8 @@ $(function() {
                 if ( data.change ) {
                     if ( data.valid ) {
                         confirmDialog(
-                        "db_submit",
-                    "GeneralChangeModal",
+                            "db_submit",
+                            "GeneralChangeModal",
                             0,
                             changeDbSettings
                         );

From c36138b144a78efb4eb1168304c20857231c7910 Mon Sep 17 00:00:00 2001
From: Illia Maier <64944310+Illia-M@users.noreply.github.com>
Date: Fri, 3 Jun 2022 08:59:18 +0300
Subject: [PATCH 290/412] Update Ukrainian translations

---
 cps/translations/uk/LC_MESSAGES/messages.po | 98 ++++++++++-----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 1f9548a09..e4227f3a7 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -31,11 +31,11 @@ msgstr "Виконується зупинка серверу, будь-ласк
 
 #: cps/admin.py:156
 msgid "Reconnect successful"
-msgstr ""
+msgstr "Підключення успішне"
 
 #: cps/admin.py:159
 msgid "Unknown command"
-msgstr ""
+msgstr "Невідома команда"
 
 #: cps/admin.py:192 cps/editbooks.py:571 cps/editbooks.py:573
 #: cps/editbooks.py:609 cps/editbooks.py:626 cps/editbooks.py:1233
@@ -63,15 +63,15 @@ msgstr "Керування сервером"
 #: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
-msgstr ""
+msgstr "Всі"
 
 #: cps/admin.py:380 cps/admin.py:1365
 msgid "User not found"
-msgstr ""
+msgstr "Користувача не знайдено"
 
 #: cps/admin.py:394
 msgid "{} users deleted successfully"
-msgstr ""
+msgstr "{} користувачі видалені успішно"
 
 #: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
@@ -100,7 +100,7 @@ msgstr ""
 
 #: cps/admin.py:486
 msgid "Invalid role"
-msgstr ""
+msgstr "Не правильна роль"
 
 #: cps/admin.py:490
 msgid "Guest can't have this view"
@@ -890,7 +890,7 @@ msgstr "Вдалося! Будь-ласка, поверніться до ваш
 
 #: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
-msgstr ""
+msgstr "Книжки"
 
 #: cps/render_template.py:42
 msgid "Show recent books"
@@ -937,7 +937,7 @@ msgstr "Непрочитані книги"
 
 #: cps/render_template.py:66
 msgid "Show unread"
-msgstr ""
+msgstr "Показати не прочитані"
 
 #: cps/render_template.py:67
 msgid "Discover"
@@ -979,7 +979,7 @@ msgstr "Показувати вибір автора"
 #: cps/render_template.py:80 cps/templates/book_table.html:72
 #: cps/templates/index.xml:76 cps/web.py:966
 msgid "Publishers"
-msgstr ""
+msgstr "Видавництва"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
@@ -997,7 +997,7 @@ msgstr "Показувати вибір мови"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
-msgstr ""
+msgstr "Рейтинги"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
@@ -1005,7 +1005,7 @@ msgstr ""
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
-msgstr ""
+msgstr "Формати файлів"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
@@ -1013,7 +1013,7 @@ msgstr ""
 
 #: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
-msgstr ""
+msgstr "Архівні книжки"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
@@ -1021,7 +1021,7 @@ msgstr ""
 
 #: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
-msgstr ""
+msgstr "Список книжок"
 
 #: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
@@ -1036,21 +1036,21 @@ msgstr "Пошук"
 
 #: cps/search.py:194
 msgid "Published after "
-msgstr ""
+msgstr "Опубліковані після "
 
 #: cps/search.py:201
 msgid "Published before "
-msgstr "Опубліковано до"
+msgstr "Опубліковано до "
 
 #: cps/search.py:223
 #, python-format
 msgid "Rating <= %(rating)s"
-msgstr ""
+msgstr "Рейтинг <= %(rating)s"
 
 #: cps/search.py:225
 #, python-format
 msgid "Rating >= %(rating)s"
-msgstr ""
+msgstr "Рейтинг >= %(rating)s"
 
 #: cps/search.py:227
 #, python-format
@@ -2803,7 +2803,7 @@ msgstr ""
 
 #: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
-msgstr ""
+msgstr "Введіть тег"
 
 #: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
@@ -2831,7 +2831,7 @@ msgstr ""
 
 #: cps/templates/modal_dialogs.html:76
 msgid "Choose File Location"
-msgstr ""
+msgstr "Оберіть розташування файлу"
 
 #: cps/templates/modal_dialogs.html:82
 msgid "type"
@@ -2928,15 +2928,15 @@ msgstr ""
 
 #: cps/templates/readcbr.html:125
 msgid "Best"
-msgstr ""
+msgstr "Краще"
 
 #: cps/templates/readcbr.html:126
 msgid "Width"
-msgstr ""
+msgstr "Ширина"
 
 #: cps/templates/readcbr.html:127
 msgid "Height"
-msgstr ""
+msgstr "Висота"
 
 #: cps/templates/readcbr.html:128
 msgid "Native"
@@ -2944,7 +2944,7 @@ msgstr ""
 
 #: cps/templates/readcbr.html:133
 msgid "Rotate"
-msgstr ""
+msgstr "Повернути"
 
 #: cps/templates/readcbr.html:144
 msgid "Flip"
@@ -2956,11 +2956,11 @@ msgstr ""
 
 #: cps/templates/readcbr.html:148
 msgid "Vertical"
-msgstr ""
+msgstr "Вертикально"
 
 #: cps/templates/readcbr.html:153
 msgid "Direction"
-msgstr ""
+msgstr "Напрям"
 
 #: cps/templates/readcbr.html:156
 msgid "Left to Right"
@@ -2984,11 +2984,11 @@ msgstr ""
 
 #: cps/templates/readcbr.html:174
 msgid "Show"
-msgstr ""
+msgstr "Показати"
 
 #: cps/templates/readcbr.html:175
 msgid "Hide"
-msgstr ""
+msgstr "Сховати"
 
 #: cps/templates/readdjvu.html:5
 msgid "DJVU Reader"
@@ -3078,7 +3078,7 @@ msgstr "Виключити мови"
 
 #: cps/templates/search_form.html:126
 msgid "Extensions"
-msgstr ""
+msgstr "Розширення"
 
 #: cps/templates/search_form.html:134
 msgid "Exclude Extensions"
@@ -3094,11 +3094,11 @@ msgstr ""
 
 #: cps/templates/search_form.html:180
 msgid "From:"
-msgstr ""
+msgstr "Від:"
 
 #: cps/templates/search_form.html:190
 msgid "To:"
-msgstr ""
+msgstr "До:"
 
 #: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
@@ -3158,11 +3158,11 @@ msgstr "Серій в цій бібліотеці"
 
 #: cps/templates/stats.html:29
 msgid "System Statistics"
-msgstr ""
+msgstr "Статистика системи"
 
 #: cps/templates/stats.html:33
 msgid "Program"
-msgstr ""
+msgstr "Програма"
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3170,31 +3170,31 @@ msgstr "Встановлена версія"
 
 #: cps/templates/tasks.html:12
 msgid "User"
-msgstr ""
+msgstr "Користувач"
 
 #: cps/templates/tasks.html:14
 msgid "Task"
-msgstr ""
+msgstr "Завдання"
 
 #: cps/templates/tasks.html:15
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #: cps/templates/tasks.html:16
 msgid "Progress"
-msgstr ""
+msgstr "Прогрес"
 
 #: cps/templates/tasks.html:17
 msgid "Run Time"
-msgstr ""
+msgstr "Тривалість"
 
 #: cps/templates/tasks.html:18
 msgid "Start Time"
-msgstr ""
+msgstr "Час початку"
 
 #: cps/templates/tasks.html:20
 msgid "Actions"
-msgstr ""
+msgstr "Дії"
 
 #: cps/templates/tasks.html:40
 msgid "This task will be cancelled. Any progress made by this task will be saved."
@@ -3206,7 +3206,7 @@ msgstr ""
 
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
-msgstr ""
+msgstr "Скинути пароль користувача"
 
 #: cps/templates/user_edit.html:43
 msgid "Language of Books"
@@ -3214,7 +3214,7 @@ msgstr "Показувати книги на мовах"
 
 #: cps/templates/user_edit.html:54
 msgid "OAuth Settings"
-msgstr ""
+msgstr "Налаштування OAuth"
 
 #: cps/templates/user_edit.html:56
 msgid "Link"
@@ -3230,7 +3230,7 @@ msgstr ""
 
 #: cps/templates/user_edit.html:66
 msgid "Create/View"
-msgstr ""
+msgstr "Створити/Переглянути"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
@@ -3254,7 +3254,7 @@ msgstr ""
 
 #: cps/templates/user_table.html:80 cps/templates/user_table.html:103
 msgid "Select..."
-msgstr ""
+msgstr "Обрати..."
 
 #: cps/templates/user_table.html:131
 #, fuzzy
@@ -3274,7 +3274,7 @@ msgstr "Ваш email-адрес"
 #: cps/templates/user_table.html:136
 #, fuzzy
 msgid "Enter Kindle E-mail Address"
-msgstr "Kindle"
+msgstr ""
 
 #: cps/templates/user_table.html:136
 msgid "Kindle E-mail"
@@ -3282,7 +3282,7 @@ msgstr ""
 
 #: cps/templates/user_table.html:137
 msgid "Locale"
-msgstr ""
+msgstr "Локалізація"
 
 #: cps/templates/user_table.html:138
 msgid "Visible Book Languages"
@@ -3294,15 +3294,15 @@ msgstr ""
 
 #: cps/templates/user_table.html:139
 msgid "Allowed Tags"
-msgstr ""
+msgstr "Дозволені теги"
 
 #: cps/templates/user_table.html:140
 msgid "Edit Denied Tags"
-msgstr ""
+msgstr "Змінити заборонені теги"
 
 #: cps/templates/user_table.html:140
 msgid "Denied Tags"
-msgstr ""
+msgstr "Заборонені теги"
 
 #: cps/templates/user_table.html:141
 msgid "Edit Allowed Column Values"
@@ -3327,7 +3327,7 @@ msgstr "Дозволити зміну пароля"
 
 #: cps/templates/user_table.html:147
 msgid "View"
-msgstr ""
+msgstr "Показати"
 
 #: cps/templates/user_table.html:150
 #, fuzzy

From 25f2af3f03ae84f4c0df685058b4d9bf9e455fd9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 5 Jun 2022 10:06:43 +0200
Subject: [PATCH 291/412] Whitespaces are striped from email address (fixes
 #2432)

---
 cps/admin.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 45d69dbc0..ae9da540c 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1264,13 +1264,13 @@ def update_mailsettings():
             return edit_mailsettings()
 
     else:
-        _config_string(to_save, "mail_server")
         _config_int(to_save, "mail_port")
         _config_int(to_save, "mail_use_ssl")
-        _config_string(to_save, "mail_login")
         _config_string(to_save, "mail_password")
-        _config_string(to_save, "mail_from")
         _config_int(to_save, "mail_size", lambda y: int(y)*1024*1024)
+        config.mail_server = to_save.get('mail_server', "").strip()
+        config.mail_from = to_save.get('mail_login', "").strip()
+        config.email = to_save.get('mail_login', "").strip()
     try:
         config.save()
     except (OperationalError, InvalidRequestError) as e:
@@ -1278,6 +1278,9 @@ def update_mailsettings():
         log.error_or_exception("Settings Database error: {}".format(e))
         flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
         return edit_mailsettings()
+    except Exception as e:
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
+        return edit_mailsettings()
 
     if to_save.get("test"):
         if current_user.email:

From 7685818b165b8824852617d0ed415546b6960a11 Mon Sep 17 00:00:00 2001
From: Illia Maier <64944310+Illia-M@users.noreply.github.com>
Date: Mon, 6 Jun 2022 14:37:07 +0300
Subject: [PATCH 292/412] Update Ukrainian translation

Update Ukrainian translation
---
 cps/translations/uk/LC_MESSAGES/messages.po | 140 ++++++++++----------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index d92b31e1f..ea0469edf 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -369,7 +369,7 @@ msgstr "Розпакування оновлення"
 
 #: cps/admin.py:1484
 msgid "Replacing files"
-msgstr ""
+msgstr "Заміна файлів"
 
 #: cps/admin.py:1485
 msgid "Database connections are closed"
@@ -377,7 +377,7 @@ msgstr "З'єднання з базою даних закрите"
 
 #: cps/admin.py:1486
 msgid "Stopping server"
-msgstr ""
+msgstr "Сервер зупиняється"
 
 #: cps/admin.py:1487
 msgid "Update finished, please press okay and reload page"
@@ -386,15 +386,15 @@ msgstr "Оновлення встановлені, натисніть ok і пе
 #: cps/admin.py:1488 cps/admin.py:1489 cps/admin.py:1490 cps/admin.py:1491
 #: cps/admin.py:1492 cps/admin.py:1493
 msgid "Update failed:"
-msgstr ""
+msgstr "Оновлення неуспішне:"
 
 #: cps/admin.py:1488 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
-msgstr ""
+msgstr "HTTP помилка"
 
 #: cps/admin.py:1489 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
-msgstr ""
+msgstr "Помилка зʼєднання"
 
 #: cps/admin.py:1490 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
@@ -402,7 +402,7 @@ msgstr ""
 
 #: cps/admin.py:1491 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
-msgstr ""
+msgstr "Помилка"
 
 #: cps/admin.py:1492
 msgid "Update file could not be saved in temp dir"
@@ -870,7 +870,7 @@ msgstr ""
 
 #: cps/opds.py:287
 msgid "{} Stars"
-msgstr ""
+msgstr "{} зірок"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
@@ -1179,11 +1179,11 @@ msgstr "Помилка при відкриванні полиці. Полиця
 #: cps/tasks_status.py:48 cps/templates/layout.html:74
 #: cps/templates/tasks.html:7
 msgid "Tasks"
-msgstr ""
+msgstr "Завдання"
 
 #: cps/tasks_status.py:64
 msgid "Waiting"
-msgstr ""
+msgstr "Очікує"
 
 #: cps/tasks_status.py:66
 msgid "Failed"
@@ -1191,23 +1191,23 @@ msgstr ""
 
 #: cps/tasks_status.py:68
 msgid "Started"
-msgstr ""
+msgstr "Розпочато"
 
 #: cps/tasks_status.py:70
 msgid "Finished"
-msgstr ""
+msgstr "Завершено"
 
 #: cps/tasks_status.py:72
 msgid "Ended"
-msgstr ""
+msgstr "Закінчено"
 
 #: cps/tasks_status.py:74
 msgid "Cancelled"
-msgstr ""
+msgstr "Відмінено"
 
 #: cps/tasks_status.py:76
 msgid "Unknown Status"
-msgstr ""
+msgstr "Невідомий статус"
 
 #: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
 msgid "Unexpected data while reading update information"
@@ -1259,7 +1259,7 @@ msgstr ""
 #: cps/web.py:568
 #, python-format
 msgid "Publisher: %(name)s"
-msgstr ""
+msgstr "Видавництво: %(name)s"
 
 #: cps/web.py:596
 #, python-format
@@ -1268,17 +1268,17 @@ msgstr "Серії: %(serie)s"
 
 #: cps/web.py:609
 msgid "Rating: None"
-msgstr ""
+msgstr "Рейтинг: Відсутній"
 
 #: cps/web.py:618
 #, python-format
 msgid "Rating: %(rating)s stars"
-msgstr ""
+msgstr "Рейтинг: %(rating)s зірок"
 
 #: cps/web.py:636
 #, python-format
 msgid "File format: %(format)s"
-msgstr ""
+msgstr "Формат файлу: %(format)s"
 
 #: cps/web.py:673
 #, python-format
@@ -1292,15 +1292,15 @@ msgstr "Мова: %(name)s"
 
 #: cps/templates/admin.html:16 cps/web.py:938
 msgid "Downloads"
-msgstr "DLS"
+msgstr "Завантаження"
 
 #: cps/web.py:1030
 msgid "Ratings list"
-msgstr ""
+msgstr "Список рейтингів"
 
 #: cps/web.py:1057
 msgid "File formats list"
-msgstr ""
+msgstr "Список форматів файлу"
 
 #: cps/web.py:1199
 #, python-format
@@ -1554,7 +1554,7 @@ msgstr "Папка Calibre DB"
 
 #: cps/templates/admin.html:113 cps/templates/config_edit.html:68
 msgid "Log Level"
-msgstr ""
+msgstr "Рівень логування"
 
 #: cps/templates/admin.html:117
 msgid "Port"
@@ -1562,7 +1562,7 @@ msgstr "Порт"
 
 #: cps/templates/admin.html:122
 msgid "External Port"
-msgstr ""
+msgstr "Зовнішній порт"
 
 #: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
@@ -1607,7 +1607,7 @@ msgstr ""
 
 #: cps/templates/admin.html:167
 msgid "Scheduled Tasks"
-msgstr ""
+msgstr "Заплановані завдання"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
 msgid "Time at which tasks start to run"
@@ -1615,7 +1615,7 @@ msgstr ""
 
 #: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
 msgid "Maximum tasks duration"
-msgstr ""
+msgstr "Максимальний час завдання"
 
 #: cps/templates/admin.html:178
 msgid "Generate book cover thumbnails"
@@ -1643,7 +1643,7 @@ msgstr ""
 
 #: cps/templates/admin.html:201
 msgid "View Logs"
-msgstr ""
+msgstr "Переглянути логи"
 
 #: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
@@ -1651,27 +1651,27 @@ msgstr "Повторне підключення до БД Calibre"
 
 #: cps/templates/admin.html:207
 msgid "Restart"
-msgstr ""
+msgstr "Перезавантажити"
 
 #: cps/templates/admin.html:208
 msgid "Shutdown"
-msgstr ""
+msgstr "Вимкнути"
 
 #: cps/templates/admin.html:213
 msgid "Version Information"
-msgstr ""
+msgstr "Інформація про версію"
 
 #: cps/templates/admin.html:217
 msgid "Version"
-msgstr ""
+msgstr "Версія"
 
 #: cps/templates/admin.html:218
 msgid "Details"
-msgstr ""
+msgstr "Деталі"
 
 #: cps/templates/admin.html:224
 msgid "Current version"
-msgstr ""
+msgstr "Поточна версія"
 
 #: cps/templates/admin.html:231
 msgid "Check for Update"
@@ -1683,7 +1683,7 @@ msgstr "Встановити оновлення"
 
 #: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
-msgstr ""
+msgstr "Впевнені що хочете перезавантажити?"
 
 #: cps/templates/admin.html:250 cps/templates/admin.html:264
 #: cps/templates/admin.html:284 cps/templates/config_db.html:70
@@ -1699,7 +1699,7 @@ msgstr "Ok"
 #: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
-msgstr ""
+msgstr "Скасувати"
 
 #: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
@@ -1763,7 +1763,7 @@ msgstr "Видалити книгу"
 
 #: cps/templates/book_edit.html:14
 msgid "Delete formats:"
-msgstr ""
+msgstr "Видалити формати:"
 
 #: cps/templates/book_edit.html:25
 msgid "Convert book format:"
@@ -1771,7 +1771,7 @@ msgstr ""
 
 #: cps/templates/book_edit.html:30
 msgid "Convert from:"
-msgstr ""
+msgstr "Конвертувати з:"
 
 #: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
@@ -1779,11 +1779,11 @@ msgstr ""
 
 #: cps/templates/book_edit.html:37
 msgid "Convert to:"
-msgstr ""
+msgstr "Конвертувати в:"
 
 #: cps/templates/book_edit.html:46
 msgid "Convert book"
-msgstr ""
+msgstr "Конвертувати книгу"
 
 #: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
 msgid "Book Title"
@@ -1801,7 +1801,7 @@ msgstr "Опис"
 
 #: cps/templates/book_edit.html:73
 msgid "Identifiers"
-msgstr ""
+msgstr "Ідентифікатори"
 
 #: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
@@ -1814,11 +1814,11 @@ msgstr ""
 #: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
-msgstr ""
+msgstr "Видалити"
 
 #: cps/templates/book_edit.html:83
 msgid "Add Identifier"
-msgstr ""
+msgstr "Додати ідентифікатор"
 
 #: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
@@ -1883,7 +1883,7 @@ msgstr "Отримати метадані"
 #: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
 #: cps/templates/user_edit.html:142
 msgid "Save"
-msgstr ""
+msgstr "Зберегти"
 
 #: cps/templates/book_edit.html:233
 msgid "Keyword"
@@ -1993,7 +1993,7 @@ msgstr ""
 
 #: cps/templates/book_table.html:71
 msgid "Publishing Date"
-msgstr ""
+msgstr "Дата публікації"
 
 #: cps/templates/book_table.html:72
 msgid "Enter Publishers"
@@ -2001,11 +2001,11 @@ msgstr ""
 
 #: cps/templates/book_table.html:73
 msgid "Enter comments"
-msgstr ""
+msgstr "Введіть коментар"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
-msgstr ""
+msgstr "Коментарі"
 
 #: cps/templates/book_table.html:75
 msgid "Archiv Status"
@@ -2038,7 +2038,7 @@ msgstr ""
 
 #: cps/templates/book_table.html:126
 msgid "Merge"
-msgstr ""
+msgstr "Обʼєднати"
 
 #: cps/templates/config_db.html:12
 msgid "Location of Calibre Database"
@@ -2086,19 +2086,19 @@ msgstr "Розташування ключових слів SSL (залиште 
 
 #: cps/templates/config_edit.html:43
 msgid "Update Channel"
-msgstr ""
+msgstr "Канал оновлення"
 
 #: cps/templates/config_edit.html:45
 msgid "Stable"
-msgstr ""
+msgstr "Стабільний"
 
 #: cps/templates/config_edit.html:46
 msgid "Nightly"
-msgstr ""
+msgstr "Нічний"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr ""
+msgstr "Довірені хости (розділені комою)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
@@ -2186,7 +2186,7 @@ msgstr ""
 
 #: cps/templates/config_edit.html:180
 msgid "Login type"
-msgstr ""
+msgstr "Тип логіну"
 
 #: cps/templates/config_edit.html:182
 msgid "Use Standard Authentication"
@@ -2214,11 +2214,11 @@ msgstr ""
 
 #: cps/templates/config_edit.html:205
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #: cps/templates/config_edit.html:206
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: cps/templates/config_edit.html:210
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
@@ -2238,7 +2238,7 @@ msgstr ""
 
 #: cps/templates/config_edit.html:235
 msgid "Anonymous"
-msgstr ""
+msgstr "Анонім"
 
 #: cps/templates/config_edit.html:236
 msgid "Unauthenticated"
@@ -2290,7 +2290,7 @@ msgstr ""
 
 #: cps/templates/config_edit.html:280
 msgid "Autodetect"
-msgstr ""
+msgstr "Автовизначення"
 
 #: cps/templates/config_edit.html:281
 msgid "Custom Filter"
@@ -2444,7 +2444,7 @@ msgstr "Відкрити в браузері"
 
 #: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
-msgstr ""
+msgstr "Прослухати в браузері"
 
 #: cps/templates/detail.html:125
 #, python-format
@@ -2453,15 +2453,15 @@ msgstr ""
 
 #: cps/templates/detail.html:174
 msgid "Published"
-msgstr ""
+msgstr "Опубліковано"
 
 #: cps/templates/detail.html:222
 msgid "Mark As Unread"
-msgstr ""
+msgstr "Відмітити як не прочитане"
 
 #: cps/templates/detail.html:222
 msgid "Mark As Read"
-msgstr ""
+msgstr "Відмітити як прочитане"
 
 #: cps/templates/detail.html:223
 msgid "Read"
@@ -2469,15 +2469,15 @@ msgstr "Прочитано"
 
 #: cps/templates/detail.html:232
 msgid "Restore from archive"
-msgstr ""
+msgstr "Відновити з архіву"
 
 #: cps/templates/detail.html:232
 msgid "Add to archive"
-msgstr ""
+msgstr "Додати в архів"
 
 #: cps/templates/detail.html:233
 msgid "Archived"
-msgstr ""
+msgstr "Заархівовано"
 
 #: cps/templates/detail.html:244
 msgid "Description:"
@@ -2491,7 +2491,7 @@ msgstr "Додати на книжкову полицю"
 #: cps/templates/feed.xml:79 cps/templates/layout.html:138
 #: cps/templates/search.html:22
 msgid "(Public)"
-msgstr ""
+msgstr "(Публічно)"
 
 #: cps/templates/detail.html:299
 msgid "Edit Metadata"
@@ -2531,7 +2531,7 @@ msgstr "Пароль SMTP"
 
 #: cps/templates/email_edit.html:58
 msgid "Attachment Size Limit"
-msgstr ""
+msgstr "Обмеження розміру вкладення"
 
 #: cps/templates/email_edit.html:66
 msgid "Save and Send Test E-mail"
@@ -2548,20 +2548,20 @@ msgstr ""
 
 #: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
 msgid "Add Domain"
-msgstr ""
+msgstr "Додати домен"
 
 #: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
 #: cps/templates/user_table.html:27
 msgid "Add"
-msgstr ""
+msgstr "Додати"
 
 #: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
 msgid "Enter domainname"
-msgstr ""
+msgstr "Введіть домен"
 
 #: cps/templates/email_edit.html:92
 msgid "Denied Domains (Blacklist)"
-msgstr ""
+msgstr "Заборонені домени (Чорний список)"
 
 #: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
@@ -2577,7 +2577,7 @@ msgstr ""
 
 #: cps/templates/grid.html:21
 msgid "List"
-msgstr ""
+msgstr "Список"
 
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2708,7 +2708,7 @@ msgstr "Завантаження..."
 
 #: cps/templates/layout.html:64
 msgid "Error"
-msgstr ""
+msgstr "Помилка"
 
 #: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."

From 7e7f54cfa7b86bdd6298b6f585242b8b1fd80cee Mon Sep 17 00:00:00 2001
From: Illia Maier <64944310+Illia-M@users.noreply.github.com>
Date: Mon, 6 Jun 2022 16:28:03 +0300
Subject: [PATCH 293/412] Update Ukrainian translation

Update Ukrainian translation
---
 cps/translations/uk/LC_MESSAGES/messages.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index ea0469edf..c631b2524 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -198,13 +198,13 @@ msgstr ""
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
-msgstr ""
+msgstr "Заборонити"
 
 #: cps/admin.py:866 cps/admin.py:872 cps/admin.py:882 cps/admin.py:892
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
-msgstr ""
+msgstr "Дозволити"
 
 #: cps/admin.py:907
 msgid "{} sync entries deleted"
@@ -212,7 +212,7 @@ msgstr ""
 
 #: cps/admin.py:955
 msgid "Tag not found"
-msgstr ""
+msgstr "Тег не знайдено"
 
 #: cps/admin.py:967
 msgid "Invalid Action"
@@ -684,7 +684,7 @@ msgstr ""
 #: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180 cps/helper.py:184
 #, python-format
 msgid "Send %(format)s to E-Reader"
-msgstr ""
+msgstr "Надіслати %(format)s до E-Reader"
 
 #: cps/helper.py:224 cps/tasks/convert.py:92
 #, fuzzy, python-format

From 91df265d40ac56bef1d5d388dfeb6a622168582a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 8 Jun 2022 17:17:07 +0200
Subject: [PATCH 294/412] Fix for #2437 (advanced search for read status
 crashes calibre-web)

---
 cps/db.py              |  8 +++---
 cps/helper.py          |  4 +--
 cps/render_template.py | 13 ----------
 cps/search.py          | 59 ++++++++++++------------------------------
 cps/web.py             |  4 +--
 5 files changed, 25 insertions(+), 63 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 0b98f683a..d1c5ec71c 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -627,7 +627,7 @@ class CalibreDB:
                       .join(read_column, read_column.book == book_id,
                       isouter=True))
             except (KeyError, AttributeError, IndexError):
-                log.error("Custom Column No.{} is not existing in calibre database".format(read_column))
+                log.error("Custom Column No.{} does not exist in calibre database".format(read_column))
                 # Skip linking read column and return None instead of read status
                 bd = self.session.query(Books, None, ub.ArchivedBook.is_archived)
         return (bd.filter(Books.id == book_id)
@@ -674,9 +674,9 @@ class CalibreDB:
             except (KeyError, AttributeError, IndexError):
                 pos_content_cc_filter = false()
                 neg_content_cc_filter = true()
-                log.error("Custom Column No.{} is not existing in calibre database".format(
+                log.error("Custom Column No.{} does not exist in calibre database".format(
                     self.config.config_restricted_column))
-                flash(_("Custom Column No.%(column)d is not existing in calibre database",
+                flash(_("Custom Column No.%(column)d does not exist in calibre database",
                         column=self.config.config_restricted_column),
                       category="error")
 
@@ -699,7 +699,7 @@ class CalibreDB:
                          .select_from(Books)
                          .outerjoin(read_column, read_column.book == Books.id))
             except (KeyError, AttributeError, IndexError):
-                log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column))
+                log.error("Custom Column No.{} does not exist in calibre database".format(config_read_column))
                 # Skip linking read column and return None instead of read status
                 query = self.session.query(database, None, ub.ArchivedBook.is_archived)
         return query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
diff --git a/cps/helper.py b/cps/helper.py
index 6db991b06..f936ed393 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -336,8 +336,8 @@ def edit_book_read_status(book_id, read_status=None):
                 calibre_db.session.commit()
         except (KeyError, AttributeError, IndexError):
             log.error(
-                "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-            return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column)
+                "Custom Column No.{} does not exist in calibre database".format(config.config_read_column))
+            return "Custom Column No.{} does not exist in calibre database".format(config.config_read_column)
         except (OperationalError, InvalidRequestError) as ex:
             calibre_db.session.rollback()
             log.error(u"Read status could not set: {}".format(ex))
diff --git a/cps/render_template.py b/cps/render_template.py
index 0750a9c48..04a50bbb5 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -101,19 +101,6 @@ def get_sidebar_config(kwargs=None):
              "show_text": _('Show Books List'), "config_show": content})
     return sidebar, simple
 
-'''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, IndexError):
-            log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-            return []'''
 
 # Returns the template for rendering and includes the instance name
 def render_title_template(*args, **kwargs):
diff --git a/cps/search.py b/cps/search.py
index 602881bf3..88d790fc5 100644
--- a/cps/search.py
+++ b/cps/search.py
@@ -22,7 +22,7 @@ from flask import session as flask_session
 from flask_login import current_user
 from flask_babel import format_date
 from flask_babel import gettext as _
-from sqlalchemy.sql.expression import func, not_, and_, or_, text
+from sqlalchemy.sql.expression import func, not_, and_, or_, text, true
 from sqlalchemy.sql.functions import coalesce
 
 from . import logger, db, calibre_db, config, ub
@@ -119,32 +119,23 @@ def adv_search_ratings(q, rating_high, rating_low):
     return q
 
 
-def adv_search_read_status(q, read_status):
-    if read_status:
-        if config.config_read_column:
-            try:
-                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)
-            except (KeyError, AttributeError):
-                log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
-                flash(_("Custom Column No.%(column)d is not existing in calibre database",
-                        column=config.config_read_column),
-                      category="error")
-                return q
+def adv_search_read_status(read_status):
+    if not config.config_read_column:
+        if read_status == "True":
+            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
+    else:
+        try:
             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)
+                db_filter = db.cc_classes[config.config_read_column].value == True
             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
+                db_filter = coalesce(db.cc_classes[config.config_read_column].value, False) != True
+        except (KeyError, AttributeError, IndexError):
+            log.error("Custom Column No.{} does not exist in calibre database".format(config.config_read_column))
+            return true()
+    return db_filter
 
 
 def adv_search_extension(q, include_extension_inputs, exclude_extension_inputs):
@@ -238,23 +229,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
 
     cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
     calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
-    if not config.config_read_column:
-        query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(db.Books)
-                 .outerjoin(ub.ReadBook, and_(db.Books.id == ub.ReadBook.book_id,
-                                              int(current_user.id) == ub.ReadBook.user_id)))
-    else:
-        try:
-            read_column = cc[config.config_read_column]
-            query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
-                     .select_from(db.Books)
-                     .outerjoin(read_column, read_column.book == db.Books.id))
-        except (KeyError, AttributeError):
-            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
-            # Skip linking read column
-            query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
-    query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                  int(current_user.id) == ub.ArchivedBook.user_id))
-
+    query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
     q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book)\
         .outerjoin(db.Series)\
         .filter(calibre_db.common_filters(True))
@@ -324,7 +299,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             q = q.filter(func.datetime(db.Books.pubdate) > func.datetime(pub_start))
         if pub_end:
             q = q.filter(func.datetime(db.Books.pubdate) < func.datetime(pub_end))
-        q = adv_search_read_status(q, read_status)
+        q = q.filter(adv_search_read_status(read_status))
         if publisher:
             q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
         q = adv_search_tag(q, tags['include_tag'], tags['exclude_tag'])
diff --git a/cps/web.py b/cps/web.py
index 4a2a796ba..dcccbc325 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -715,9 +715,9 @@ def render_read_books(page, are_read, as_xml=False, order=None):
             else:
                 db_filter = coalesce(db.cc_classes[config.config_read_column].value, False) != True
         except (KeyError, AttributeError, IndexError):
-            log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
+            log.error("Custom Column No.{} does not exist in calibre database".format(config.config_read_column))
             if not as_xml:
-                flash(_("Custom Column No.%(column)d is not existing in calibre database",
+                flash(_("Custom Column No.%(column)d does not exist in calibre database",
                         column=config.config_read_column),
                       category="error")
                 return redirect(url_for("web.index"))

From 78b45f716abede09ba8c671372b8a4fcfe11ae52 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 8 Jun 2022 20:25:35 +0200
Subject: [PATCH 295/412] Bugfix for #2433 (LazyString is not JSON serializable
 if one of kepubify/ebook-convert/unrar is not installed)

---
 cps/debug_info.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/cps/debug_info.py b/cps/debug_info.py
index 64fda557f..6cb30edba 100644
--- a/cps/debug_info.py
+++ b/cps/debug_info.py
@@ -22,6 +22,7 @@ import glob
 import zipfile
 import json
 from io import BytesIO
+from flask_babel.speaklater import LazyString
 
 import os
 
@@ -32,6 +33,12 @@ from .about import collect_stats
 
 log = logger.create()
 
+class lazyEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, LazyString):
+            return str(obj)
+        # Let the base class default method raise the TypeError
+        return json.JSONEncoder.default(self, obj)
 
 def assemble_logfiles(file_name):
     log_list = sorted(glob.glob(file_name + '*'), reverse=True)
@@ -58,8 +65,8 @@ def send_debug():
             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()))
+        zf.writestr('settings.txt', json.dumps(config.toDict(), sort_keys=True, indent=2))
+        zf.writestr('libs.txt', json.dumps(collect_stats(), sort_keys=True, indent=2, cls=lazyEncoder))
         for fp in file_list:
             zf.write(fp, os.path.basename(fp))
     memory_zip.seek(0)

From 89d522e389b2dad36722152029f4b5863e115c68 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 11 Jun 2022 11:35:02 +0200
Subject: [PATCH 296/412] Fix for #2445 (book read status can't be set if
 custom column is linked and read status was set before)

---
 cps/helper.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index f936ed393..d40ffc334 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -322,12 +322,12 @@ def edit_book_read_status(book_id, read_status=None):
         try:
             calibre_db.update_title_sort(config)
             book = calibre_db.get_filtered_book(book_id)
-            read_status = getattr(book, 'custom_column_' + str(config.config_read_column))
-            if len(read_status):
+            book_read_status = getattr(book, 'custom_column_' + str(config.config_read_column))
+            if len(book_read_status):
                 if read_status is None:
-                    read_status[0].value = not read_status[0].value
+                    book_read_status[0].value = not book_read_status[0].value
                 else:
-                    read_status[0].value = read_status is True
+                    book_read_status[0].value = read_status is True
                 calibre_db.session.commit()
             else:
                 cc_class = db.cc_classes[config.config_read_column]

From f85b587d0a6d2e35a648337d7952b980d28caf39 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 13 Jun 2022 17:04:35 +0200
Subject: [PATCH 297/412] Prevent converting of kepub on every new user (#2446)
 Added error logging message if convert fails If convert only task, only
 convert book message is logged

---
 cps/kobo_auth.py     | 2 +-
 cps/tasks/convert.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index 9865b993d..ea9b71b1c 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -107,7 +107,7 @@ def generate_auth_token(user_id):
 
     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:
+        if 'KEPUB' not in formats and config.config_kepubifypath and 'EPUB' in formats:
             helper.convert_book_format(book.id, config.config_calibre_dir, 'EPUB', 'KEPUB', current_user.name)
 
     return render_title_template(
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index a9f0f055c..48fd528e9 100755
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -188,6 +188,8 @@ class TaskConvert(CalibreTask):
         log.info("ebook converter failed with error while converting book")
         if not error_message:
             error_message = N_('Ebook converter failed with unknown error')
+        else:
+            log.error(error_message)
         self._handleError(error_message)
         return
 
@@ -273,7 +275,10 @@ class TaskConvert(CalibreTask):
         return N_("Convert")
 
     def __str__(self):
-        return "Convert {} {}".format(self.book_id, self.ereader_mail)
+        if self.ereader_mail:
+            return "Convert {} {}".format(self.book_id, self.ereader_mail)
+        else:
+            return "Convert {}".format(self.book_id)
 
     @property
     def is_cancellable(self):

From 02e1be09df667c41ff8f9f775047c921b55d0589 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 13 Jun 2022 17:54:35 +0200
Subject: [PATCH 298/412] Catch StaleDataError Update requirements jsonschema

---
 cps/editbooks.py          | 11 ++++++-----
 cps/gdriveutils.py        |  3 ++-
 optional-requirements.txt |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index d36150506..0e7588ea8 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -39,6 +39,7 @@ from flask_babel import lazy_gettext as N_
 from flask_babel import get_locale
 from flask_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError
+from sqlalchemy.orm.exc import StaleDataError
 
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status
 from . import config, ub, db, calibre_db
@@ -221,7 +222,7 @@ def edit_book(book_id):
         calibre_db.session.rollback()
         flash(str(e), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
-    except (OperationalError, IntegrityError) as e:
+    except (OperationalError, IntegrityError, StaleDataError) as e:
         log.error_or_exception("Database error: {}".format(e))
         calibre_db.session.rollback()
         flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
@@ -295,7 +296,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, IntegrityError) as e:
+            except (OperationalError, IntegrityError, StaleDataError) as e:
                 calibre_db.session.rollback()
                 log.error_or_exception("Database error: {}".format(e))
                 flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
@@ -443,7 +444,7 @@ def edit_list_book(param):
         if param == 'title' and vals.get('checkT') == "false":
             book.sort = sort_param
             calibre_db.session.commit()
-    except (OperationalError, IntegrityError) as e:
+    except (OperationalError, IntegrityError, StaleDataError) as e:
         calibre_db.session.rollback()
         log.error_or_exception("Database error: {}".format(e))
         ret = Response(json.dumps({'success': False,
@@ -556,7 +557,7 @@ def table_xchange_author_title():
                 book.last_modified = datetime.utcnow()
             try:
                 calibre_db.session.commit()
-            except (OperationalError, IntegrityError) as e:
+            except (OperationalError, IntegrityError, StaleDataError) as e:
                 calibre_db.session.rollback()
                 log.error_or_exception("Database error: %s", e)
                 return json.dumps({'success': False})
@@ -1190,7 +1191,7 @@ def upload_single_file(file_request, book, book_id):
                     calibre_db.session.add(db_format)
                     calibre_db.session.commit()
                     calibre_db.update_title_sort(config)
-                except (OperationalError, IntegrityError) as e:
+                except (OperationalError, IntegrityError, StaleDataError) as e:
                     calibre_db.session.rollback()
                     log.error_or_exception("Database error: {}".format(e))
                     flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index e2e0a5361..866defaa1 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -33,6 +33,7 @@ try:
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.exc import OperationalError, InvalidRequestError, IntegrityError
+from sqlalchemy.orm.exc import StaleDataError
 from sqlalchemy.sql.expression import text
 
 try:
@@ -318,7 +319,7 @@ def getFolderId(path, drive):
                 session.commit()
         else:
             currentFolderId = storedPathName.gdrive_id
-    except (OperationalError, IntegrityError) as ex:
+    except (OperationalError, IntegrityError, StaleDataError) as ex:
         log.error_or_exception('Database error: {}'.format(ex))
         session.rollback()
     except ApiRequestError as ex:
diff --git a/optional-requirements.txt b/optional-requirements.txt
index a0384bcd5..97f355f22 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -41,4 +41,4 @@ natsort>=2.2.0,<8.2.0
 comicapi>=2.2.0,<2.3.0
 
 # Kobo integration
-jsonschema>=3.2.0,<4.6.0
+jsonschema>=3.2.0,<4.7.0

From 98b554a3a0b995acd1f4a0f58948588ee915410c Mon Sep 17 00:00:00 2001
From: subdiox <subdiox@gmail.com>
Date: Sun, 26 Jun 2022 01:24:44 +0900
Subject: [PATCH 299/412] Fix Japanese translation

---
 cps/translations/ja/LC_MESSAGES/messages.mo |  Bin 19179 -> 67632 bytes
 cps/translations/ja/LC_MESSAGES/messages.po | 1164 +++++++++----------
 2 files changed, 569 insertions(+), 595 deletions(-)

diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index ddbc82308f8a01a3f560da2ed66650d8e6182f04..d00d29d0a43d24bd256ab1fcf624dc88caae7ca3 100644
GIT binary patch
literal 67632
zcmcGX2b>kv+5g8_gS~ehJ19-;SgDF4AVs2yiFbD|u(Ir~dv__CM0Qt^8Wa^pQHlr%
zf*=;eLQHQa@zt1^qKV7yLW=2mlW3Cv_xGH0=FYu)L44!?ei(jp%AER~r=2siZy&VV
zeG$L?ca5TBz<ZB~q9b>UqJ7R(Y!ub@Aq?IODry#Z68I9>75o*b=l1IxMF)XrfC^s%
z#^9&H9^mJ}Q^6;E_;qkE!n^j1qEX;J;I&{Gcmeo4cs}@NaCfk4|0uc?>;>)#)_J@I
z+?8+>csMu>JPmvV>;!%T+z)&W+z0$6cnJ7AQ29PFz{Q^qD&KiNJP_QS@CZ=lT<5U@
zRK6N;fAEW->i-hBJ2($iJ01Wv9_v8m`zok%UI#TkZ-Xa-?}Ph-#|?D(yMl)jz7#wf
z90jV~H-krkUj$X|0<ahO1o%nt9Us39RCynO8sAQryY?Oos^2Gq72tWG#(5!l5%?x}
zHF)q9^cl>6SAoxfp9Oar6h(u<8^JTcHQ)*0TcGs=JdE&hS30^l2UI`GK+(@+a1U@E
zxHq@}JOF$Q+!K5j)VRG2b^_l7cLRR~9t^hm@IS%b3I7Mw`0P$2H9jYRG1whceM7-c
zU?q4OSPz~7E(Cjm-vYaW{{VY~r_#A|!3?PK9{~0IBVaf1aj*;cV^ICtg~1vP9uBJA
zHK69_P9I(hsvVoaW5G9k`k#FIzC&F8Q$W$vWuW>q6g&kS4{E&b2376@pvHRx*ctp0
zcry5Jkg1DK8X83hg5yEu`vR!?7lCTu^PuMOH82DA9OmNZfvRT}_(^a*coO&msQ$kL
zs{UVtqPyL%addM8xIf|Hpz13F4*+imMQ8Vc%D)Oc5PS(d4*UVw2Ye6g3icfC#`^|v
zAHwC}USKV_FE|A}8@v-#`7eT^msi2Fz#oBn?voI$>OBn9b7z1WmkYqX!A1~P63qcc
z53hlu+kb#skH?I3?Y#h0J%d55iyJ_d{~)*@xB^svo&{Czw?K`<8{j427Etw{1XDW;
zJQF+^%!0~41r%N10cyR>1T{}fz~jLeK#lj$K(*s<pvG-an4{WzDyZ=u1Zv*KgDSVq
z;}=1-XC|n2J_w3lo&XuD=tm$+HR=rU9s<^ZMz^5KSqiFsYkhbFsQzyTHSXU7MJI27
zdj4%t^Yv%&aPR}LD|pDK+<NH)YP`pT%6AW_@mL5R0j>iN1HTQbzrO@EAAbbZuKlia
z^>qPN{#l^r;VMw`c|EB9J_2ey*822kK$ZJ7P~-YDP~-SMsC9hQ^==&dgX-@XQ1y)m
zHEz?uBftkht%vpCk>HO&we$C&)@$@>H{ZvA>euO@*83&kq2Omc)`1$g>EJ=&JW%WF
zF;L^X4phA_fvV>Rpvv0@s=j}LYX5$paqa8|Y8<WrRnBNoe5(x9IE({TUJWREYy?%#
zTu|*>3~K&f1~q=K`}7u2?fDC+_U>|nql>*kJ%2c;dOLeO&&Ll0RsU#E^K=8K@*6<S
z!%UA$z?kqxQ0wI_k4Jpg<sS|9BEAaLI4lA+UeAN-&-Xyp|2C+0{|;1p{{<ckcKVzf
zkIta_eHN(a`hXgj5uoVtdaxVV1fB)11CIx{fLbrR-RSg{ZXQR1D*slG3&7(DKL-v4
z-vl+^r)HcSy$Do0XM(D40jP0!1ysF10SAD4lsSGs7}U7cf$GmpQ0=}SJRN)-6y3f7
zY90L>6y5Gw?)tkAsB#YnHSPmI&DZtdnc#S^H~27k4)_yL>wUipH*ZIQ8m|~szq*5J
z@6})oR`~cke0UjnGVxyrHEzEKj{!SnU4Ksl_54uq6mSf9DmWWdyEcI8-`7C3_f7C<
z@HgNHaL+NWoKJ%)ry1N0d=ON=Mc`533m)GDFC_d&Q0t-FSU2D2gX-s{pq{_V<1kS9
zMuDR98$p$O6DYcx2CAL&K|Q|$yae0;4gvoJ8eNTZ{B#7U@*V~izY-KZYyw3GKLoX&
z-vLF}e+Je5eJdS*=?sd#27{Xan?TXSB=8h)u8)5PJelxUK&^{*@O<!};GW=FH@S9P
z2&x|gLAC!{Q2i_O_(f3dc@Vq`Tnml{{|OEPhmUvjxe!!2&x7KJ-}d2mefUqH*6ZF?
zPOe`94j?=gRQtaHo&dfLiVmX*=sG|z@FXw?YMk!}RsKp)&%FXF|6AZ?;NI1a?gxV!
z-%+6YKNkEXcni2Mc)O3E2kuVzF;Mfq8tekD12qmm_3?iLRo?qxCve{yM>j`+7ZW}n
z6kXi_ioO?sYUi_{>iq#I`g{x2eE$K|eC$!{=KWGo?HB^~07rtV=XP)pa4xtvI3LtF
zEd|y8uYqdU&%u4b_rU$Y_d(Uy>1J2%382=`X`txpB2aX6Ehu`Z2UXAK!85>SQ2g#m
zP~*}9svlcH<^L1-3Gknw+WRl?0I*w~>;EO7`uS<_bns@dC%6!d!B@e);CrC>&6zpJ
zPpUxGHw#q%?gG`Hm7wZ-4isH)^5J(t(Z{=>%G;wJo&*j8H6N3~;o#HYS>T=xj&3gm
zHNJO%2ZMKkYX35DFYp;K24D904ybXDCc5^V2=*d)CfEn80M(A=p!)e8@LKSFA09r*
z@!e)nd~>}I{}2?N{Tmzz9yQsGM+Q8P@Ip}I@dl`Ny#<PX-v##v{{U(}qA4zYFHqxi
zAgF$w3yLnT1T}x7L5*j|r`Li9622W&|L6Pg3Q+l<2UX5jL5<gsLDl;%I0*a`sPZqm
z#nI0o@DReoJZ3?q-{SF3@Cd^9`tTZ1?ce0XUjfzMAAqXw4N!Fd4yfmT1FHVrZguo~
z2&npcfk%Ot`*0bkbvOwWo!<*;exCB-H$jc(UqC(oFHp}P^m#AO!P5wj1T~(Y2i1-x
zpvG$rsP(ehhra<{LHH-&<=_claP6!Fk0d+=)HvJ&YCIQ%>i5&2>VMIvzXoc4-UjvD
z??C0>^NX&&qd|pF1Vsnu`uP5!+IJPGdPallUj?Xq6F`mUtv);r)coEH?g~BvUH~oy
zdxJj*)xN`TbLAWlYF;{nYF9T<{OWR0<zEeIUOw${Jg9!$>cca^nDB$3>U{y!_<bEz
zzVCr*_s>9;x7El04OG6}r#e2e52$r_9;o@c2|N+J15~*y!K1;aK+*H}!Q;VqK(+Tj
zpq1C?^6vwx-owDdz>`4DZ*NfZG8jAy%zzr-`#{md5>Vs&4e%K72R{C{pyubmCda={
z@pv()_KpHoel4i+Z2~o}GkyGAP~|QGHJ+<LwQCc2DEJzv@oEQE&fmZo+^gBOw+pEH
zF9DT*ICwZX4%E0z_2Gq}*3;9V%6S!3J@0_(_uoLZckkO>`l+DGJ0H|I3<1^7>p_iY
zId~3u6R7!F40Z)y2SrcO9Zs%Z=rIfSAbPIH&EV;Te-CyBkDBJ@wI8VXG2j{C-C!5+
zB`^ltLFM1;PS=hzLCx3sK3oNAymH{~U=yfyFdf_zyvK(h0{0-i9Mrh40Z#y50#5<o
z0lR^_Pj~cm78nyA0c!l}!Ck>=py+odxEuI@$A>}HzZBH?tpu+Gp9V#z{{b%n518Td
z4FwM(JPMRN83(Fg3qZ}&tDx5F7Et4T+)Ou4*MKVb^WbsdH^DQ(HZTT{nC1F&0jTzT
z4(tSGLAAdYwElRU25LMW@VFAxdfEu8-9Pd1+d#GRAK;$g>9gIq_X72NA5i0a4Jf+$
z6nHF{14Wm2gZqGMK+)wUFa}=-HGh8rRqw8IT=*pLbi%zr_5TL2Gk6!MdY%WhF24-!
z3;qH;4g3u_5<K`zuD)@g+S>qXT)zM+|Gl8bVJWEf^ECKL@Oz-z`=-Y~ftu(2=DK_b
zdpyHqKk#hQKMkG;-UaRlZUFZJzXEC=z6)wRUIW#h--BAm{|hSL-gmir4guA!BSFpE
z8KCIoTu|*B1a<*OfYu*S<=qRao`s;se<`T>ehEASd<7f={toO8UUat`&+*`?gzp7a
z&kLaV!}meaUkj-5I(D9;>oY)&$9bUQF9J0mSAqwC*ZA}@Q0*V<!*!tAGYQl@-U_PU
z%Rr6G8c_4_T_0`%m+XSy;U1U%=)F#VdIeN__qva|!5-i#U=^tKFb@<RtOuoEy#)>h
z51jA)y5Mz$9{^SVpFl_^dLJZfG~<4!XCD868?Q1@^spW*2VVvE2hUvK=^j-7uK`7m
zp8_@B4d9{R67V4KIZ)+%$H%vU%J%_y1lajOhkZbme?6%Az6n%0^`Od`397z_!F|AG
zKD^%JMo{Ch8Ps!cgR1v0pvpbqAt&ErQ0r>|sPtNovpuc^#gD!Qs-D05@a_v;J1zjP
zA$~BZ_B`U_9|KkIMvvbIk0!hYJPeE;#s>i$4h{mFL6!3=cs+RhBhLQ31yuNdz#G7B
zi=ya8a29wj_*+ozKWVWG4*}KhJ3!6*GVo;Z=b-A}Wr=I&v7pBLWKi^av5y}DD*q@@
z{k_G<-|53&^5KVkcqw=!`JVLQZ-XZgeiKyre+M;R2QGE=dNSCR@KxZY;AHSJa3gp*
z_z!R(*ymBVPNsuu$87L2Z~>@w|5H%(z1uSOfWWSx@~s9%FB?661=M_h57d1898|tP
z`S|~U8khYabA0y<@MOYQff~nJQ1d$1r_Tq~zh^;>?@vIj;{%pEJLm#X^LrPlcCG-A
z2VVnK-XB4hPISNue30PdU^noLm9CxFd8`CaA$|&|_AUZ7&rg6V|Hq){;yqCP8uYju
z*Uy3K&umcjt@QX!P|vr4qUQrw!7IQ4;Emu@;3vU@SG##T7F50Gf_s4dz$?HjL5=4<
zKK@bg62hxM<=+O1pZ^W)1a^AD?Xw&TDqIgXfVY92!M}n%!Q<Ar@K8|wne6dP;26To
zK*^K6*ShqhK+#oCa9^+=D0;gF91Py%!_R@Ds~>`=f=4{*=>1Yq{T&AG1zryx3zmZi
zf{mcY`5sW?xC%TS{5Gie{>9@d>)iNU3+_Yw4WQb86R2^R>cjVfTCc0X3E;25o57*$
z-F&?QYF>T;s+<F#a^)W9@f2`R;=B6r*`V@W2#Q{>@Zkxd+Ib6jG58pG5!m7}-r&aV
z2JkfEYr!ty17J_^E1>%OXP<u1(=K0cQ2i<cRo`SEei#%TZU7Gi_j|^TYYZy?>7eNG
zGVm(!GvHa^O0YNhb5Qjj{;cco6`;x=3LXm9dz=X#LwK=If62$c>%)HsHUGyx=juBb
z)Hn<WwO+pfs(p(<mAf9)y8NaOw|o2-sQd?Sbmg1_sy)|$%0Cg*I+zb?oZbOd&%Z&@
zQ<vvmKh6S0SG_@%*AF}h%z{UNlfm=ByFvB;JK+A{`=Ijey~*V}4pjVkpxS*osP^0d
zs@^6azXnvfUj@~UpMxs54b*ra{(>97tH54_$AO}chrsdRTi|GLz>BV&hrw$IKMSg#
zd%fi9KMhp-E(TTKFdwe;_<2zI=Ynd-T2SrZ=+nOiil6)p><_*R4ggPk+3}GHpxXTe
zsPtcek`pIxc39?dsmFK0GnM{j>I6rES{GYD_2-YE+BxVICqK%-^9Vl*4g-G%)`MNY
z;?kFZ#}R%PR6lq5s(bzrurJ|m;00hUsD7;SxE|E}Yy?Fg-v^He5C58*|MNh#=Q^+k
zTn`QbPx!i%pS55o!ZSgQ*L~p0;A1}hJ771$TYUUM-*Dmcz;lVuf@;@7@Nn==Q2l%l
zJPJJZn{J)=0lN|&4;}(O0IJ<<z!Si)f@grO;7stqZ@F?7f-2_?a98m6pz8fIcm;U+
zw;i9!f$HBnP<%Q5jvL4Bp!(GZ6kS~7@zbE@E9<ci6usUCYWz2VdhQ#bo_iA<4E_?F
z40ijjvp1H5Hxd3esOQf9o?9Q6d#nRBuMdNwhZjNR`;kxI3Tk{0e%0~2KA_SoLCwSG
zLA7fMsP_EGhg*I6k>7XodkLuY`Cun-Id~Yj9u)ui7AU&-smFhU%6HTcoPKu-SVg!Q
z{1o^HQ1dhBhpwE@ftsI*;KAThP<-)O@G|gq@J8^E*W9_52Cy^XpMu@NUH`}B>jf%b
z4%9rp0iFo%{krRacTnYC3tk51z#GA*!9Bo3-*EGG40r(HE}-Ij`}jVf#(4;+c^m8T
zX0R9GTS4_>EvV;y3aX#K0uKWJ*T;AIk=xfk5EOln0uKh~f}+Pq!TrIPLCw?mLDl<b
zQ0r}<H{HBffcp?`20sVh1s)3i0o3z*{Mh9?3_OeQIpDcqC8+WigUa{3$8Up26MhR+
z`~M0m-v?k9@X(*Q_FM`cOSl5m^G)DLa2_}UYzMWTE_}<SUka+cp&qXVZzOyJDEfUF
zJPrJX$K8MG_;fdLH1W5A8iyZ)qN5MM%fZT@x#!k{D*r9;6!4ee-rycTcl!<pfuff~
zefSdaGQxepYrrP3H~0pqa`*oQWrL%^bHG=?@!<c0>TmhmuHGD|@qP$Y{Ce;_@D)&e
z=O3Wx@91~jxLyLPKi7lTflq;#f&2W@?Q>iWev$BE@NDq-Upe|137$^)OW=**^FDmk
zyN-Vk05$&8!2#eeK(*(j7B>%PfeN1oYMd|k;Tllmb{nYvPXpDTS3uG0k3rG-uRZ<+
zJcRJSJs!Npt>4ZbF9ntVT2S<SqYu}6{32LK{B%%s`#z}p_iA<J?(gwr@Ic}(@OTxd
zcHIE(2j)OM*95AZ89qGUhaU#_C4LncgBw9T{}!nE`8{|9cv_ol|7D=YXEb;sI2Jq-
zoC#`Nmw`ROe}H>{r?)%0Jrg{P@G!6|I2Jq^ycg7Zd)|kC2deyowz}s}1XX_*a4gst
zya`<8;}6~D=%qWTd{=_Uf#u*Q!6xu%a5lInxDwQStpi0TUj@5??|~YhV}9+%p$n++
zm7w}D8q{;2^?0*Sza13+yW8VZQ2pEhYF@ts?h3vQYW=(mUIm{08`qwx;9i8MgR19l
z@HFrNQ1yQqRQq2ARsS|n<Mx3MpYU6kel~ak@xwsP-%L>DE%xavK(*(qpvL#dpz^hY
z%J(nu3~;yKIr{Di9z%FMsQBsNC&8z|7<?HN-Ms@I3;xlk@Bf}__mQCJ?^ICbp97u_
zUIZQvjs?}9+rUb29;kMG0E&+G`MrBC1D;BF9C#r(7u0j#1&;^c_V{m5<8<5~TzYR%
z^<M39B&c?N8r%n*0;>PhK$Wu))VROs<F|k+@1LOBeb^rzef0q~{?~(g{x(qg?gLK%
z*ZcU_LDAzjpZ<wIx%|h0dj4!s^<D?+xhbH^c?eXw&v|?mR6kn48t~U1um7_fx9@;;
z#Gm~aSMCZ><$ceG-}B*v|LWG|IiS+VfNIBdQ2ky5b_0Lp(|7%wYyT;r+I0!2`M(~#
z3akLtu65x4;B!9wO;F?eeINdr$9F;H+XfyA{sZg@?*G58-pj!5gsVaEm4`ik8C3oj
zQ0wR)pw{=lK-GWD-(9;-^4JYLi1_os>EM;1+VeWt0R9qGKd$|UE9XY=Qo^@^SAv^C
z^|#YMojr1@$E?R?pyr_kJQp1CzLR@1LAC44p!)R=sCp0hz?F9_*op83pz`(i@#UcA
z;Wkj?vkcTcJPnF3ybG$F-+(uOe+Sj?Yyai&22kTu0qXf%z%#*_9$y5{C;T3$a!&iV
zYtPxB=6x6_dYBBV-Uq=W!Eb>Bz<0rG!Os72>+&{G<NF49G}sOv0qz>@Vsvo~IFIl+
zQ1S1B%74f%yV!W01}gknQ0wYuP<&}2xF5I<)N`AC`cFW$d)H6wV(mM?<0T%ez#*hR
z2wnkh12vw#cHPCsV>GDe$AXuF^*;V-P~-MBpZ-%&<Ju0Y{`Y)%&)wYf`+*wYqd|@D
z8KCmr0E(U_g6h{)P;_w*sPeu8s-LfccY+^)*MPV0zKhYxn_yqUd+y=db0v5T;Tyr>
z;1@vE^F#0ea2u#{{|RdTcG=U_-vv~E&hp_wpq?86Du0#79C!-hTfp7H#b7URIoJh!
z3+xK+y4Nnu9DY)+4WB^o2ERze-xbO4e~3GXEBv-`vlk0=kxy6rG}6lmf8S?1p737?
zYrOP>B<*(`aavOut`o`gX%`(m0X|Mz`qz&zQyk6ZI?*R|qTW||PQO#YbNu~4!n<<+
z1+K6Aa!vsECI1J+b>rGVp3&f+i2pA4oxwV;pK*U7*L2dJ1%E)C==5`-e*1Vl8C=0t
z$@L`hQ^D)O+qu5VHIeHo$~c_s2+}n6>EGi7W)Xi2>H2-jqXr+58Vv!5a(%^8-G672
zN4)Jt;`Q5|a6LGRa96Iqef$>i9$(&4AE*3dxqhG<enYwLB<;)O`>W6MPw?|x|KPgI
za=HKZX59Yh^C;%e-2Z}0^!hdMH(c*>iI3<vocl3c7gF}+pnhvS{*$=RyQpY2aWlAH
zCVV&7fu!96{tLW@_!q!83ICc)za_+N1fK)LZy0$##|68x-*WCn--EaYa9u*)7O=@b
z^JePVzZ0+DYpJ-4Q}^|hrC%#?PjQ`0_&guCpGU26{l=57b$bW#Be>osd?{BaOU?gR
zK^&sle6t(5f0}C^;q_d<;@Y2QR}r@xcnIO=!S4~?1Dr#+6F34CZ+nV+{eA>?_V-Lx
zG@tz8x1RX#a(#>IZmw@|E#SJHJpba#aj)M4+<%+<+qfR~&p*liU0k2wI>X03&i&C`
z`i*m7|BE-?=EM8?yi<I53wW=;f0VSJ^ZW`Q7W|y+JH+qrpQ|MOlXT?!K70dshOblk
zPa*uM55L9z7Zu6xG~%Xmy}|u?T!)c%CD;B+<o9LnxAz<6%e%zmW8e?T-<Joj_Rpbu
zM8D&Hd8(Y1B?^3=xRG45eA;60EPpTf5zjYKej_-a@C>fkxc-;$<-Y!}fxjj0Szp&t
z+#_<MEa5C^KLzjO`Vn#ZwQ}w2pY2Zk-w1E!I-dJk#NPty_a*Mn@%LAF{55zSX%BF%
z<$f7?Ci}E=xgSmZc<{$u-MOyjdY|;K6F&`XAp8TahY61b2NL&bt}D3L?{cnXT;~y2
zLtIZ#zj<H}Q1Yu6@m~O?W9oM(X`dwSBp0;*#}c=eyBq!Udz1b)*UN;vfckxw`x}H7
z;+&(;`$He@>+>B>{5*dzJz^@?FNy2TCHbk}t6aY!&%59t;=cu6M7W;&N4QSns^NNq
z>n2|oS)yjbdxA5GTLo_NX&Z<~&9vW__`i>jzs|>9MmX#51wZEc7SHJSGtw^O{vob1
z?!W1uJ)iIuE=zPfaShx*;M2x{?{NK_>r`LPPdu*nc@Fc>?kC2<@Aq6!l4r6{kGcOY
z*YjL|CGBG3M{~cs&#z|=(tpK2(yPcf!I$#^>1T1jl{o$O6cRoN?84Qb;G2Zs;yRQ|
zzXN<;-S5VABk>RUv;zs>uLOPzi5pDbK3v}>+|2bZaVKyc<;!@RxUX^PcQ)4?(q@x(
z7uR>V55L#B`AG<X^GSOLoI<{<ef(VF{>c4BzU<$7ypOo^xjsqwZ{#_b`->IFeKok1
z>qYLDfYQwl=h~IL|4ZDF+)o5oa=k)af3A~>d!6vlxc?MahWlfQ)9<I;pUU+P@k79N
z;#PncaBU_|zhU4TT;JgSY2x);?9<LBe58-NkhmG#58!I$nnd_B;6m_Jo{?U7GvNye
zj{|!VK9>7Ga^J-L8{lxR9$bIs8p`!L=~sfcg1;osTJFEf{R!NU1HTFGMcgY~dl9~j
z@NMAVxb%y;_TpMkcoEnO+|8#Q%rmoz`-2aEmhds$e}$_*_Y+7v+oy4BzbA-)fw)7!
z7l~Qu<Buc!64#%&_9gDRqUZJ`{t@LNZJmGS4saRyPUCup`};`$68CN33xvPT{olD?
z2kQ49aE-f-=J>cP3E#o}CsOO^NWxu+m%cxe=Wpfe%>7Tm&vWTl1-=jN11=!{quigw
z{inIsaOroa$M-yb1zhFtmEMo*G~Mv~5Anxvz2bt=ew3--F2wzoYbN2>z`t-U<vN=1
z=SVN-KK=U)f$NpWM_vGqAa65qJ;2AfZYJ(Q!gq78-vIC?@ZUbHxPheWcLvvPjLlI#
zTyC+@7x*gq@Ac38f%J7;od};p+JWFA!Uy~GT__{R{clLy1^f=U4QwaRwcLl_Na898
zJVSiX5D5+<d=qI4xc>kQziWx#$~D<XTuWLDS3lzPyNBzWg#YTpdlTNw{Z+(Oa$n7T
z8~6JCiu=LfM8Y#I#@X1qy_4&7U&i-*S~d9|@%I66OW5xaUuK9GUh1C@apSqECEp~a
zalOa=o{Uo?`Fa-R{Q_yfAnqyhHFE98wVZ1Uarbi_z_priZ?5orkek`WU&B?)z22#x
z3zkz>U#>RpmylKkeh=)*mE-<@NYn3EU>|TB@hiE17`)X|+<#{g_ZYWC+wWy=zR2}I
zKHNb1CVwwDlkoB2LtNK$uiyRPVxD>57xFZ5Wn6m@{}y;G@i+Ut1fvtV-$>jft{VwI
z$MtpYzt8paRK6*M_1l9!>o=J2y<E@w_y@`RJMLdfJ=2|hza{(+;&<h_3h*$l-dqz>
z`BYvlai<e^12{$z{DyJu!*gE-e^2}mx%B&`$4j`shi86avCzIR^E%Rh>f?^!{yDCg
zD?|D>xZWeJj_VIxpW^zlf9^BjCaxCp>NlPHuX10<buRbQh`Yv8u-%C3M%?aP1;0}|
zm(|pa?~;pi+3Je8z9t^fZFn|Qk*$kP={%;UZbGJ>G<OqM*VJ>{Kt3X3Jr`G2^p1TI
z6+3*QraG>u%#Bay$rnfB<ux^9tFm$by2^=J6*;E5ORi+*RAO~zLbglpv|L<US2L!v
zDocLuCRWmV8a=d6L;bk8UsYwcx;`GH)@?6wM7F#xTTg~uwyrXptE{fbPNsm$ob@;p
zPs~(RR>ai}6Uwr6UE|#N%G%n>>ao#jr*y8$RFCzoD9)~=hRoP()OlD{Hj~T7+3H+F
zT{do@l3YA4Gm#?VOjWKXZm6xQ$yCI3m1D=%=em%;p{%O1yi3$4uFg&(wIWlWRq2_D
znaZk6Syi^XdR0C?X4vY-W#h7j`g(55vQ;&cG=u&L?vz@^)4BS1BDGf5RCoUvO7%r)
zBK$2=)rU!_oT!%O#$~I<#FHu+eATbvi5aT;%K9qJ7JaURz^266$(6bKoElVX9scMK
zmen-WM}5l6v$<S6xMr+K04&ec)6p;;*J|#%#(oY4RM%(g;(j%Cb=mUzcvz->oSuiI
zRgNB`BNY|8;yzUjXSSk8|7>+-wjv&x8Ea|9@#PJ<`kD!Gc}-QrglbVrL)PW%Uo#<7
zS#3oPs(=J5$5gVYRPqpJbre)!fom%X4QGbxDy;z)nJKKhpR1#vtAieeI*dL-Nz8Yq
zu6!Kp$I2jRGeKa2wS)gdwYsepZCV=BP-kOCaAKyqoZgPes;G!D&{Z?Z{U7%m2T_Y|
zhh=iPNi}thlv3mV*{Uov-xrQR=Ur6Iq-v3M2oI>JWQ;9Iw^oRo_7Tv_L=BoH4$q3F
zvhlFGn#ogQEn$tFn^T`<l&zQWKvuQJ8b*z%%Aoy4L*--Ll;q;hqsLX&XRGKpi_E9F
z`Sk%;Lp%_Ia;#64)sD-QW!03b(9!C+p?Z8Z9gVYfb#TO*^6~~KtD<`#xB9v%ab_%J
zV5_hWTCc9Do-(1Pf%3v#+_$b~5<F*Y)W>Eo9#NmER|Yqi46(lnwZcQD)HK8_qN=JX
zv3Sa*<Z+S4VU#*41JkQ;)6$P6P*#`iHac4dugp!UE{|a;nKCgYsDvJtXX8vfrlG3J
zrP|u1l)Ct;nz9<GQ}SSYl~6*t$RZp2dSca<q32b8DSr5q%2}1o#WiCPLscwIrcivc
zbFRyWKkWF8b*n5ZzRFBUK8g8!^wJ8Rs>`oS6M`R0nKf{!kEwkVD|3})l~tAXQy_<g
zh5R>7wGwHd3HKnvT!9~9EIr}Xk3(wN^z2|3)$mMR{SI>E#x>Meu*#IB&L~Z-%f%Bi
z)eTw$QJ?yFFe0`-9$Jk6=-+3U@ws>i>dHV<S6G1kJ;jr`K2tt!f|P<0mA8<;a)LNh
zp3!6rbP-FbfwPbSq8d?C=Q7vSN&Y$6?-N<GmI=*4f|<S#b}K>gH5G8k^7^Q6rhGjA
z<toczQq^NB$2NH0+m~^O`c_%8INB+lgC4@FIHj|7964*;u79>3Rlo-ZnwA!iXfQ#j
zRXoKr<O-L2`za$OlU=59nH(BKwmQyKRIvJj^iU^rzL!>YlCLg1p=KgE$J8PIY?3?V
zmCoXYeJxY0<!#GL3W8<UO}g+}1Tqy0x;W*_shdUmp=)t2-Qk-XvJGksQ&e74jR-Lb
zLob|i`Z*FzmEG~9(t#zJ?78ube^nMCUgd|~jkji1Gi4;0f$#3Hi>cn3(#OjB@ImfK
zK(4k4=mGJV$~yipquwAFGE&@Ob`{x)m2h%#LWZJDqDy?eOw?4Ksg84*F<EGXN8S3Y
z=<a)gAkQMU;xZ?2p>|haDt@rnX2Teyl7^!@AiX*~g3Qj2t*M*RF~t-$HzOs=Gi?xp
zD$xo=0{VGU;MhzxE4V_-O#~<<!nL9{TZf8*e&d2U7A@H_DG?6WaA_v%Y#pGoA^;hk
z3E8@_WEWxgj!ZgdqafP?8;Sc@N`+MSLehY4Dp9Li<VOoeWa~9Dxg<xnj11j8eL|V_
zH8s#y-mFS8j)CZCfwj$43#}HrffRjx66f)tYM3X}Ep4}<nv#v7WKno)ozX!Q?5<uK
zLmf*S#m{Mb%yGILwCCP&K};yiDbvoRs3^$c6t8~p)vB7Y1u155WV>nU6vW#A=S;P<
zmFi1n$fWbdqGNBnSWG-}941$_I9*rAPbXxi#Pyl+qUuTG7@|v6d{r4dGp;aoJ81os
zCw)6V4r6Mh+Qqs0Y;8`<+cHc^o~n+=I{T9~gc&9JVE}T7YHFxHEm5T|NAs?CS~T(H
zS@loAZ0SxGEu-!1AQMEHyj;P$AdjsH5pn*ugShZXQ#9+If%Jo<{%`h;>Fns!L1Xt}
zTfpMTBOEuzLUUD}7WEsKWkAJBN15$OL`@C4qSWEUz6y~evUQAQJaS4cL*?>iOm|ah
zQ9r1#P8_vdQ_Lj#356e(k5lqTHDe)n4B)&q>q-#!^EK3<c4ACVKtf8%)m$r8+=lAt
zM%1rn0>aljIS5D<U^)tfv4tctWJx+oMy1X>No+a!_>40kyQ_$5c!E75dq5HNx;`MY
zS%Z<!iZ}V<7$70heFyK0f7ZBnQh@k}btO~ZJBf6BD&)tk=r*8wEXK_^>E(5hqt=!*
z5(#^&Ohn1-+7d!4m?wfJnSUmfQ(u$RAYQ1cPx))=;t3Ki^(g*$AsAkzQwPfoQ9?)E
zjkr}!LlwRgEeuRwb-=pcL1D<}8<VXs9~T%wWwje7TRcfoFr3P2t&Rzp{_uILM+7#|
z=|Thi@Ec_Ynp0bd=;qp5=-a8BKq=OXuCb{Qq0xu~?0bY`)DMFT8+TAH*8mN<K*p_}
zBv>8y88#@sDvMCC3_WC)M*U<IqHa>TTrh;qW#DbpAvN7k>FnGGT`FKmm_ZsX^Nwgp
z%boR>m~7#3RwFYT_3xW3$-w+R)aAi5$P3jnx(-8FD=O-L<+Y>2qUfKg8y_W-4vI*r
zsY!H@ZhodJ@(+|J>j2t@O3JnDQt8DKt$WlzJ0{amg%<C%j3gqd1S&}UCb=Z}+F<{{
zP>o>)*Gf?qh%*!|mM1x_9CBKCu()t<&KZ~NS6i-kNHe|Oc&3XHbF*cMzFxs%cA~qG
zHm#@*8KpOiMVTF5Q(ZNst1HNqU?x6E(?m^#3e45&bmPLh{i@R#b!-Z%fV67q?YV|B
zmo=yMB_)}EtI%WOonDE<#OxC1FiHEvxSv8(a^-cEwc>l}dySa0Qk<$}$(1={-)R{X
z^{>ns?@n&w&ck7ejE>Dym#BYD+TmfI4RI^y+z@j&FU823@mWm756KMOJ56C{a>@mv
ze9n`V+{Ag8V?M4(o60Bj&z3dFVOBm~3TY?|p6aR4mrjJ{4kK&|bEBGJY9Y61$7@El
zMFo+mE@Ku863v^(L#5A01G-&}>Vy_rC$k^~DOg<5uYZ>6&TEV(PzIHV!4GiCT>-@S
zHZkUN<dWuR6_YhA;SlX>HnY*F+D}MG_YKT><vC$51B|q3FwK{Coz{^H+;EZQ3~F|g
zQzRc$XmdvDzc{%63dz49$vlG=Q_5_&1V8zSlOZnTnU=?|n-UeJSCnPl-T<n>S9`@K
zvYc+Kz@(6@AB!7-W>wK3`(b1z2SMd0K+hZNl6Msyw_bXvJu_-hsU{mAbm`0r<5!Kk
z23aOi{x;)1%>$}!b*Gj`i0SC;^eF|Lz{lBgmK7WMh^sSW(bxu8R*y$QO{hT%W3S-T
z_Q`$_hG)m-J=s1fxQYi<m)A{kENTF|I~6=C8uH-WHqN)>5?l=3bNdB(t=&Zwt%E$}
zTXsKv$#SsBAb&!c)@Zb#x)8xSwdt_j(44Q^xoBLq&P+8Il#9>=nV#)}<w2QsLC5G^
zx+z4a7R70%Vj5B8;*Ft-(>UqoBD3CCuf^9pzV!<}Z+3Edw!Fc7ETgK2XJ9tw07q(}
z>1e|zD1;I+sprt9Q}$oM-U&9Iw^_YMFix>lUp_=ztrjwFRb#q)S}szV5Q3h?pqRss
zDy7|6^TYwFDl!m0%DKo`*c&&Y*(<cXzM-y~Wn;a_)nfl;r7f5p=eSZdU@|(jeBEA!
zHrI<e(MYLksK~|xCfBpkhp?l3AC;PV9~0&}1ikYjJm5IaWE){dj0R7rq$89W+YR29
zf@&b;YIY@t$v3G43zbz?V|uZ`2f~b@cn2~)g7S*K)zNF3%6B#DGHgNO0%bGH=xJ8F
znDP+DFkfo9Q;AL42+Bp=d05hR1hy27F5Oc#q@R)Y;`D%gnc2zgOyRxA)W>pX6ghZP
z1$mo+Sz`9au%{vA>hj9^D;mnu^_9+MmVY`M=7osB+%FvqDM;<`tXT_={KI&uXz!&k
zz7=N}LfPAJQ!N%YMY}pGgDy1MQur86NDbOGgGBm(McZ~$G!Rond&z}jW}q2PZo+H;
zMhzbvcfNAifXm}<@gTEsf{UvnuXUL9X(o>P9F)#3)FCr05jO=CU`;9Qnk~%dwzfrm
zc>;1>X0C&cg$2s0gD~r}6Kb(S>s)Ro->oE#6#?xXhn4O3>39YMEmY!ceX=lE45KRr
zvcim)>{khS?{+x%kj^Cr;qt>Bti>)=7+`-3|F0z%)o=b;cA#WsW5D_5Th?5vzcjfn
zTZ^ZkURN}jd&DVs<itIP^o|BrRo2>nZr-AS=DsrK9P}btRztE`IqL_qbR-JMTq_<x
z7?+^!=Z)6}p2<=o$3j=Z4|FNHbdtkbN{3Xo_hgtQWp+;1X>wTZrr3StCuB=&x>*5M
zSv8I~88Y!$X^7o#%E8^nh%#)cxdR(%i+`Y&u@k3}?t4d<XREVy@H*o^KIC_vJ*&z)
z4fDySQAno8EQx$H%T0!(TQQ}c^D3v-Wa7HY<)3HB^}KPdQW+|sCp%mK;q4&Ptv$aW
zl2uU!wV<qNXN(E9;Yo`_$Ccut5<_k*Qqohq&N}tMesjlsCX6pP1sy$2Cm-T#se6py
zVoz-&MTNQYQ`D>A37>6ZWyUq9SHw{s=!LES#2Zo=<B!{<Py7T~?;S`gA~_Aj*wi=F
z8p}b!K}TRj@CVaLmR|*I()(M*$dW)o0k#Dn%KY##b9JZkxiPD&tcaZdcZf8ca`Owb
zmYqfr(p<DL0b4?K@*%s&ijyYFIb=y}%j?{Vd}!FGbP$0rO@!&it!-xx*tk&#lUf;+
z=!%gehsCDFL|0^WdMLW0lHI#%=gi<f8(mR@7xoI=j<;wdpo-giZ+Iqmap$XR5UoKi
zL_|mV11rw4n+jj6(<iA6x%9ocdnCR3Wzd~Qh<!6Th_In7p-K3f#ASx!56l-B4br9{
z-R2*5L}I(tW4m;XF<64g;s67Cpn+k^?5~E!rk|)3qj4-SzY9$Jj4A3ogt37k*blwE
z_aNBZRtFoJI;jCm%2ZFmX~G6ig?q$ptWkC~Mu?ql;1*A`-2Pe%=G7Zi4LSBjO?Io*
zboJika}2MKJKPh3GNa);Iy01H8SZ!RDYGcW@eX5@*uRLC`s5+xhjUURsn{CHjgND+
z*>c<aNb(eNaqrPeQjI`EyG*ezQ3Rc3|F)hHcEX`_MMlt9W!b>195ZEy1~@L#vYJdC
z2aRw<*JDZKBBHE^ANc?m586>An_Z0EhT6#8>Y$5xg<RNfdq<|ur_MbwZb2rNN=r;E
z_gvw2j>Yxsqs<w|LAB2UNA5fncOLX<(pfX(Pa&o=N*pnhp6_;Xbr+P?HBRTJ6ngs6
zoxQG&A6pCY)@c<tn4S_FC+ysRh;M$%%(iMTud9J`U!B##$y_|JGFw&Q`sot%bUHk=
z>?Zb4$Y-AIR0#zM@fEl-M^(cY#Vi<bIoHQ=Y%{mrvP@C3eTOTgo#~j!iKpaFl;R}i
zFvX3m(m;y;-CVkEJH;&BrH=72o>I4Q<a$sd$A|Q}#1o>vo$oTLkhGjDBnfO%A-6%p
z632!Oi_c?bW;z1SJru)SQJ1<7m@-;0Y1@ncu*vLLk}a#9>sZ)L2nKlG_a9=U@mE8I
z==&jxyX+Wv9p~Omq<W5T$MQt`<z(;))#JG}r&Ok*$Ea%QJeIA&nirgco|#)tN@WvJ
zT3Z(!b2`8x7C|Xk6#5U@jR<mQ4(g)8>}0amx_9r+t<(bp+hCL~poXhU&d<TVr#k`L
z*@e5yP8IJ#>1Kh{O<|4t19_%Ngr}3osKAa1PRf?;=vgWZJqvq5`GQGg95U=f$onvb
zgt0go*iyGUx@KBr-k+yv<NAe`Y=})742emtK>675VczhdBoP)MLEMD)zxNk+mAl7?
zO7j8x7_D>4&hqg3u+Lww9c>=f8Dj@--#_1YtZFfFlq-}S?L76j12|DCM}fQY>P!{$
zF@Z|!vYc09%CBalE$)-UtC^`t0*;UfPOhBLFu{a6N?|xAcC`+tMD{<5u|F#*J0(Y?
z-}4?V))>pRTAi(m2ldaV6r7oIMkf_(E4OS)Gz3k8!^7%HkccHVy-|{?WJa4ssJs<r
z$w^Nsag|QvN$e45560rOAUTI9pFftN|EPto4AElZIL?q7{xK3cHUc^K3F%^<o=|X-
z781Z=8jp7Zzk5DEvPHQSVI<=8u&|<W1Wn9V=M&vp%E#KVnBW7H4#=A8>NRb@%hZ5<
zrUG`9)g6fQSxl?qfjXv0x^T*>&7b2}iGEurb+-RHj_-yuW!{b`KE+RQUj3wq?&1NC
z5RLC3p>ZxuiTk<(V3+~Yx;yv0m<03ByO=KF(e!4U*q(o$<Z5PzRp(bqns-HR#Uxt`
z{CUHnW$gA<!`?c+Wq~3sO$YO1==f-;^lLYfPOt7N&c%~rX*zz&(T1Tq(u6!RJ+`au
z{+Wsn<4oB@*j_xTqgp(T+HPh<(A7-?yQy|;kDF?<@IjmmZZkU9P%9q^51~bvVy!f4
zL}3frd(>8s?ExFC?NNq9>cgL{sm+~$wUb(m{;&nhp`ki8wFBkr*cpHIP%CmI)Q)e2
zhRRE09`@vfqD&^|l;><{HirO{3}y_narf~!eR`M<oE2xm5rEk+#(7#a&^X#yeRAz1
z9?Wd!Xhvu571gD8G_3zXV@c3F+7(hpD_H#3)}-Q?PUs|@fD7D$6!%(y$sMg3$U)F0
z$3l?BY8n-U6eLLTnYkoGup;pOm`#OzfF5W^ghyFiG@MQHL6LYkC#>~ArQ}bTkR3rl
z_^_=!DJpmuBomt|!-kl>H^iGFP)FCe{}3A(lN4T&Nok3tN*F<nI(`|X$WG+3D#DnB
zW_fAuN61e3nKPFyG~=^X<D{c8hGVn-SU{Yqt^6D(S8Ho3nHGtB5dbEx?fd$6hyrxj
zSci5n&9BCDV4R#;kv`AC1)VFEs?p(rg2PUZ@ps5wQDX#BmmR}IyBB}#1ruLbS_p_B
zO!=S>MitoF{%sPUn-y0TBX?ngRn&ylkUJqX%kxWX6P!ki(<v3<H7&dj=1jiIj_-Q!
zVNhi0T}^F66$%PQDu>U^cBb$0GaCCKCIeH6btt1kOeMHQcv0!2KI#s}>N$L}!|Iq0
zz4#GsVv~N*opm9|V!~rtapVHEna&OG!GsNNuQ(W=cSf!}_fe@GP#@<u^DJPV<>XGA
z)&5B(STL58)s>cy8(EWz$&3*%NJaQ##z_ndR3ppd=>zgf9367WTClDKQ&6F*IZviN
z>-e-x#YAbT*~HhMh&sLJW*Y!`v)VaEoc});r3D!Qk+p~TqKn}~@|09_{4PXZQYx}f
z85>?9M_;{C=L0eoLJ6D+%dm0l>d+1%lF|i2WX|mpm|~~@ywlBYN4OV!Qunc1LYchx
zqvk0;d^(r`7IvwrT?7`c`6Y*E%UNA=58A<faZ44!de>pZgwrOvdOj(y45sp@m~-%T
zB~NJ10_U#qCzp71j84{?NSTC3BhFP;WXl*Ha|UY1w!88eTS$ED-sj%WPJz0Odsut8
zF=aaN(InDLhqQX(^J`KdAn)Z8`xA#rS$33QOMbxQS}iGMR<1!~t5Mz6CG*2+&`RdZ
z@46d7Wha<BBfgp`5BI}r<mlx5lk|O&kAYVSh*#Oh@?`l@wfK!~0p{w;wXMaVv&U6|
zNubae+pu+9&7{8iVmC${j(6H&&i|?$?Levf;y-GjnIwwvEH<1p8ZODLCXTGBC7S{o
zVEC8k+Qi8{s5EgS$4&j)35rCax6^sO322L5Wtm^P@Lj(vOjR-O0~wLtsLhW1VSZu8
z5yufP4{@?NAtq^-x{8(Q9u2QyC6Un}9px?h;SJUCNL-nbNkO?hG^8%%s<MQne=Z~@
zK4QdRU2?=3*RBc%b!W7E980*X*}~*)EYTMNyPGmgF`zSD?8$PJnE%_OJw^^55setx
zXZT3Fp}J^<>XiOwGH)cq@5Nm-qFmkr`(MLi?-nH?zgLiiz1^3DM^{#0rWG9{N`>WS
z)+Vc09D?W?QI65WVf?ztzdh;z^TD~yeQ+e38@+uNr_`PhLf)_=C{@}+IHDC^#4S8M
zi@B$lVcioulU2&0w7Ts)Vn;7Zm!_nmr=>30*ys0+HQeENkW1T9M3H*J1GSYI{<ni0
z4rITFJH4150tg7xSn|WGhr}xAU8Ou)JO$yw-qPoHedK^}Ohn2_tX=O|W|0VY5`KB~
z0i9%qimF7ot{~H6{C%BU^Qkv1uyl3s-n70Eo;G;W6G^Ef$0Xt%P8PE5MPlou&Mj)1
zIK%EWyaDuPibU-Q9si-D^<sk97GVdjLwuc%Y*+aFd2xrZbauT@a;Gui0dQZ-th03N
zOiZ%>QpY`cM@G@2Gk0Us77E9gV+m=k9aa+Z2PKkWb@JIVCp&QN*#h;&GNfaq5V!-i
z_O7#g1dbe|cN7+zycbqxs(_W`<xb8PmIRf>O3%_8THcYA#2bTx67Y>{oog{BX;t2-
zS{z>+w7%kmIv5n%b*eEE*s?f^N@lWj9D#R$%#-SxsK_2JqGNt3KIwvUwr+~^CB?b7
zNTU&z+C+{xMn})FBa%%^h}~WuXThRNg*WF2@tOl0jUu`oKjn`zWePrMu;WK$al3WA
z6XgdFll3`ev?Pz}?W1zu?2#0w-5PV9=wSo48h<F_!Hhh$X!|+!2FDI^`gv9jJ5_Rr
z{3XiIF_G5hg4ScI+ZP0+^RnaV8eKZ8pLly=)@L+D%ieoQzxKz06djFrW#zMAo0+<?
zy{wGLPB(FTc{{ez*q7Gz_Nq-X?67?e9QL6{0-d+f?BRSjo!G5m(?+ld)JN8Fa)uB)
zL}w#`>I&_};%<@}WV)RF@3kaFh>N0C`3(@=V#<!Fudy$ou;L_X2(w%#$a1f3z=x8Y
zRj6<tNtNN=*-hNK?#!iV)eL&?vKXPATfGtC7Pp4T@d_B7XdU+Kv}2jTk>yU(N0d%C
zQEBTW|77rxjF`g4%Y-=9KWSKq`;^bi^n#HnKE$K_M5b&xlOuf}r`|(OTy@&>@$V7m
z9a8p=ot0(NgFHn|j+lb*!4@Yd6yc42I&X|Qe{jwYl4bbZ#MPN8+)t{jVO6G1i(abo
zm{R^P@*|drVwstX&3H#g?_$R?m=piDG;K_chZ)M|ksPUFY}Z$IyDSWysi1B`#+y8S
zh9e$odZyZ0vz+ph2gW=ziLIG`@}oWCZNuc<by|+^j1x;KdEMQ$t6oPNLg`Sjd%3fF
z+(&0Zyi*3x87F;tQNyUJ;0Zg+=!;4mU351%^!4^?wX2C0lRtJ<rF}%JHaoeNQ4-Cc
z*^{MO-N4(l6sV&YNFm<YV{1oMB0se-wRY+nD3T0vnYowxq@9@;MziT%0TSV6%ewz#
zF~MjgulbF{iH_@K2rmMT&6uROqZ0PYkZTQdrnhU->!C>V7+J?lZOoUfDL$~G*D85A
zE?b*H*y}`5hZhV+RZAyf9^{0BC`NIbhm$KRL(}d1A@Q#+c#|}>i^2o$EUZUczVM_F
z)LD4=8et8s2Mtz!|J9u{E}3L}%C=_NjZ3yO-TKQr!by|P;#TUY>Ra4*p+aMW{XEKj
zz^RWj{e$Sq?_)$hgWs<UL7OU@q{3rhA>DZidM80SLJL@fJ5~!FCC6%gMPvLa(}WqB
zTO_U-&!&;|ue2s_k1zvC-o(*s+P*CSQ~BMS7PQ9V``M{+TfDa0rcEU#!6gnf%`${4
z(C8_>uEq}Qr)rv%sWgAIdkVTRmO;icNIQH!O6vqN3g4VT=-_R^0mWgc<hwN9McLqL
zM-xIVcZJe1nQ$%u?cj0n)(3WotVDARC^|X8XqnQd3oo@8+eFY5dy3X#({r{@W_O4e
zCuU3JO45Ao!S|&m=;69>TwLy<V7e5?HyE8k@jib8sQgYV_3>hX)o=`Lx|$c+j|vK}
zd9XNIo7VnaVcUDi+^;T6YEe*a7&d&QW}q7@VL}j6^>q!Vri|g!XW8glr;-GW2c=&3
zCCyGgM)ne|{<D=Pr@R~=7VX!bCH5<@b1e!Jj27rg`KJ6Awvat0S}4b}e~89T;$5rP
zNm)i((8&v<xo9+m2&F{MFEZMstOnT}acEq_f+OrY%*N}yLE&H2NQ+~Uq~A{#Dd+QQ
z@Y2SI`=XhgOK!7=I*i5@fhJ$iaX0sVexd(6R9#$LkuBrD(3Z564_Kx4Q9Hhypp0w{
zx})HTvZCVa?6oWC)MYC;9zc65`&Kp7oq(&KCXY02q};y9_qm*XbT8))fe*^zM8{bj
zHmTg1c75TZPi<}3r-{s1VmC4)2@&a>A@i#J&BzE&4NG<lA~cN#6l13t!q?&&_x@Lo
zPliPG?0@=4?VJa?Kr|&W1wUjwZvBFU4YbXTEjF*!x=-)8<EBV7Qg!g&4&Uf(cUZT?
zYiTACyq25)a*y_VbO^57po(sOarBM@ooX|%)9|buHQlbxjjgQc*0*77t{XBu9#>yq
zo9o@9$5@WD@Xia;ug6WOQsuXdZ|LEv+@2mbbY!=FNG*x^ZvBzGz2jazd-dwp^W1J{
zo*$oie($r-KBH%^o;^Da8_K($+Kx}<JM;W*J;{1r+_P8jUOl_@JcoRPGr9V1BQf%G
z968tPRJ>$dQCTxNzR2HPHdZ8|7F|MS_f5p!@lBZ|&}}3}gJR-~1`ochs<JyTDqPZO
z7-W;F>Lyu%Q>(hxg1L*&ypXrVlyY&;3p-ss=;{IaQ984G&rT4Kj>mS>=O}vHo<tAa
z+?CZA+P4sJSzg>wKc?IH`Fv{l7(NQX$;BFJ8olH5%PQ+Txz`L(M!NOoD;$0K@LN^f
ztNWQfyPw%93U7|YElu-+r>~`P^|q;vTQ)C=2KATztM$#>{4I@Z+ZH}SB2iA)?UIXI
zn(u3Adc39i#g^trTAG_%ny0rkKH1XP)Y3GwrSavK#)n#(?xB(-f9p$2TVI?@p4K%F
zv@TrP(s+M9n-fGW%`;k>A8%<|*3vv*wd>oN)LmHX4(n)XoL$s{P!288;<5tQwlv@0
z(!9nx@ThfQHOWZi!cT6tG(G8?)3mguc>^6B)PLvlwKP4aV)gtJZfJOpwZif-+umC7
zWZS|Stuvo*X<XHI-@4W{jK+$N1K2W^@qE6eiN-R*<Z*+xAYz|IE-crl(-@_Eaa&hT
z-MZ?LlEp=xTbh?!)1KA;jjLPKH7i-;!Boy@Tlx651$RLcTQ+{FrEz*o)2x=pds-S-
zwlp=hZhoMpi2+{K(s;WS&ulJkX}pghpZjdR<B4taXLX5EMc!#eLKm}Jr$63)@5<J>
zPi}2~$sS!m&$eu&Y$ju2OVefzaML^+vQ=skW2e3@Z(BIEZT`BJ=DV!b8(W%JC}%;#
zlUkI&r7_<qs`!{&Q`8O-7v_(ci=)(1eJ|B2X3v}=(rYxf8qaC1cg<;?F~_a7wnrZ{
zVpw2<wYqT0XzWA)J1C;1aWl)$rb<iq!;7;?Ufa_2j4eN=Y;{ZHGHcgz8$;%!=>?G@
zbkf9pu=bZ&R`RWFUHo+0jHyg>`|V4Nq@iRrvTe<yHjB5nG~aDxJg@bR$69AT<fb+~
zRjv-m5$e=ROX_4HX~v_in_p_3xj5Roay>-Uqixo_*1MLAY-mf<ywZu3#>#=R7PmC5
z)=Jh*$ZNdD^+1FdN`N&@f2?(l=-)>{eOs5$Em$^5+SVm2+m~%>o&Ky_F`<ycHtw()
z9ZUCxv}j?%LU>y2kogGh@v|Ai?Q55`-!*OP)H|Z&F5TF4?1OF%`KV~?;~UzaUe~s4
zVf)idqt-j1!sUK^BR^lwFfj3i)@3u=9(r11VqJ?&7_4obF>~93W%<~a=BZ)+JTJ+o
zwLiCV+e6dx;ZpRuwnL_7Sb<yk(4Dbt7$Lm1aqZSsbGEKzctVS8xC;1KKFzhZrTLzg
z=ErOVmgdu3hisUOX~mC)C>b6o(d5a6bsED*A8KKEG&$2-Xs1@j^e*8UBg|+AjS8ja
zmyr{X(Uwj3w$5qXwrIn)#nT)sh_-B;)Aj(om`YX}8N;||w=dY#e($0n58yG2SZ|Vj
z;wCFvr_I^=`0}kwVAiGBPwVW>bRu$K9A@pd`A=<KzQQ#*Pj>AypKaUFSRC875&p2b
zI97r{(qR$fO&XE|UPkRsRKUn)*=Nq|Y&Hs@*v4J6+ZHbB-<Rp|v}CPqeepS#RQrQG
zxLTf34X?;>s{U_W>7Mc(YeGDhsOk4FE{eRmm}nF>bciklPGClktlbdpprmb$8{1|g
zP;Hb8<mXx^Yqzdk)4KLSb>qJ;(Q)h0$+fMs?%VPb0`lW1I^B<iX?+Y$PM2$X6_W+u
z`na21#BKlkhR=2-+5(uvB6p0!t4}-Md?z~HycLl$O4D}fQ)~2@=a}CQCuP$oA8m0;
zHtWDi$q%L5wi&am_!a7y6gsq{4Q&r?c4{4;+-jY62Ww0|pR~w;yPUaY(<a)!bvX(e
zTEMIVoxbh47q-0cK#>aIHHRiI4gFiH#x}i1PYWE^jv#2sD+e$ltw~lfDvQ+jRX#z=
zl~ZrS171f7CW2eg)`zvOEEMTz>z%9UG*Yeg&P`F<baa+kQR|{j41rsv2(PKz8Xu1&
zRHYM0)kHhTfYSHZ;`S$=NWNIx`rHd%)HzWZ<eoERAP^@2H4oT3;trN$y9w$h8jBMd
zt9@R2=|4=1Cg_E_6_zftadtsA=3_>v+%esdIiW?gM?Ip=-o)-fRrC6!(<K7OhAiN<
z6tTef&~Zqf*NYC$Sm|h?ZP|#ON0Cr?%HVTrh(~2QCZDUNYa7MzVUKgs{$`s&W5PJ!
z<-(36<)lAf>x*$F>dqG9`?O`_R1<I*Gf1hX88pZ0&@g@E5h|RHWY!A1umf^+y=$E|
zQxvNJG_!Vw>0qnF#G2ZHSZ`{yVSch@YGdp4hh5M;(o(D=iUe(1R<y6i9%OP7X{pj$
zH{Y>!Ii<14l1W>TUxsKL=r6Jz?e6jWw!FMVccwj~yFHB{ws1=McUp^LS#Iq!rnfJ9
z**${ZZc@8xlftyuOpw)W_dSia8VJu+g)>{4y<#f*H;vk9M}Bw;H6rB7OQsFLFVgyk
zY}A6~73NoKCGy&hR|#TN4ygfmwlu+18GO`SDRDt%z<F-2Q@k)(cN`QZw`U%qgzbC+
zm$5C)GsAOaXkE6x?LKBI&o#v9!nsJFQBE%76c{H?F}0gU6sA>P+mO3JMpj<!m-FV)
z_GgxOfs(R>L(i;ObzMeW;g@ogK0=Eq`!c#yO)M(FzL{%UGv<}bN~gyy%}|T<VX4g0
z+*YTP<*M+7->&I?8q%EStdP*~hc!Kzq8Mz=2xb^2(_YjnIN5BLgcg~!PH5eE46p}T
z+jH9%G;Ny?O^`Ip1ep6D{rG;%54ST1RZA1*rs*rPG|caiQuQ^T&eHJ2mas}a%;1L|
zlx+CiE;OUh?MkOemlI@P=waST!SZ@4j8@t;^JL%yOfwQP-(GAhs1|Z~K?7@?G!>RG
zPmCkyVQQU?`B+>E2C-k#(GK`jdg+T*rNb%tj46hN()JMU8P?>->lbj!dZ8sM=ST2-
zIr;AxDy*jcKFp*<^Ay*k(TR^MxQd$QwJ+VoFh!*s+%(Urv^)wCLLFv=Hm+@7xpv!<
zM<_oer;GvVF;u)g|3;wnLZTL#yZMCjV407J%%7d!`lT1PY+Qrk2hp-vQU5>8KZa~Y
zeqe)md-?z3D1#)_&-Qy?Xl<TLLpnO+%mk(>HjGkb=Gpk6MKMN;#lBaqL5<t`G8QCj
z51LES`L_A2OB{%r5Z2tHu-fv*olAgam<PynTsKh(C$SZ6ygu+2n_jGQ`1tcQAt(n0
zvY3?`wSDQa_GdBDybT>WWh6>IW=wD3!->0^qJp{tr)J$tkaYBud*N-0jW5zmFVhlx
z`?%ISntMZRQ;QrVa4E5_lvaqyPV2>xfig&5&+4W5G3~K!{+)6dJ35y_WpwVE+j__J
zP-!9|3#mLUqL>or&7Ebu6fT2L0ddIaF{@C-ROZ%(MIS^)6?7)U)@65^(>m?QU%*hN
zG+8$=LD4K`KgBDut@)1D#p~6hx$|3JX26Rca9&4senU~3*iioS$!?kXt%hW(OD?|1
z#}=?G<g0he`(;p&N~21Q)|Sl=<DV^RmIdj@qR76qOwX9sw&`~TRVal0+;K|TH~|YM
zWOVs^sFlk$MeTE6woMb*fia^dzrtBF(2r9Q78`qJ-dKuj^B-ewoqm7&Lu*+$<!oc}
z2Xsi30#xKw_R=s_n7WQ+5qV-O^3=!R=2bbe1SBgO=ZH~wtFLgr^%ZBYKpF)`-ur{8
z*1xZ34B>_mE1|FS?;F<pyw>S=w#{FoE(C%|D_jL09C2HiTSEQQqmB+*T3?jOH)yA_
z+HCp<+|)V>a02W@8sk)gU@(~V$;hO%2G);@4a$QUgIf)-AJdVkNUC^}lQ1i&Qr~>m
z6nm2v-d9RX%`dcq$DTCuu&JB{mkfm@ELdu)_cl1AixD&*ob*|@-k5*%x5O+FHENce
z0Sadc4b(X0=V$7Un@qJWjVP1I3wS8rTBI*le=@y1USJEQY79FJsr3*x5h9<qJ;!j~
zuOJdOMYv0NMw}jt&$chT1KvaLB!~=cV$<vS*1PUT1wit6U$FSQdEvt@3w<)iA50F0
zbe1QMbd;RcFa?C_R4=8C2)o$lgp8U|)L}fZeYDE7S7Z5({8vG3MD*tOQNq-l$ZTRd
zx8s}*50{`_uOjd0VLIYBiu^_cTyUv6klvz_a?&AR+Pu;_mhD2HOXRdQ?o5JpqE^`k
z>usDiZtsEO+7kH-(L%!RAQP)>cE{?h(`F8PURI!E6&Eb!uwxmfpv&lBvT3Zd-<Ibo
zh^aLS;!$)gvw5^2xWR;azGJM(84Muj+}@4>v{Tk+qBez!^OfcAG=*xt^tg1aYoZ$C
z*=C@f(23O6cY)1i8k^`FQsRH96vZs2bUozuoh~U_iof8^gqGT(S<#V&M#Z1>=FyJ1
z($dLoi6z@gCAbm9Sd>XDCLf#jedc3>Kf)My(pg{74tQU_gpjGQwhp9~pSS#@#xM%Z
z2w$-zNE6H&B`fS&C%rQz2MrOu#~g>ImssSJ9op}`O{{O*G}P+F*nKqLf>DEtpD7Zf
zp+PC(iZpWH4UhBXlzxik?nJCB#dB%VcLx>~bVsMa+qRq$s^5>JCcovHU&hXjYJwmL
z&mahFw~Tb#SL4~@be+`E0Ky$$_84C9dzJ)L1)H8_F}CY0&yC}Zrf_#GXzMDt%L*1&
z`+^s?&3-DJ>j>?zrQ94w9|kj{?eRrA`O&eYwg>NTo%<Xvim3gWrY)QBBbo(`Zz^pD
zrMCwt#N|olNTSjXinK)@bznhhc9RrY$~_Z!*3LfQbhxC*ykj&UWwyTAz3i8y{05O(
zf?B-3hXs~l=~(f%{N73G(G=;X>nPPl+2h{qP8X1u?CAn%WH6z<1tmc`wMZh%zUZJr
z2ID8_nclh$<-rX*Zfolqw~j0~z4f)*R|D)=JKUmm?IL!&cd9(o|GbY%{Yuu82-=rj
zvL#mG_ROu|!2FOh&`8rN2vb_L3z+tpBz%N(RV|HoCr&_9Yvlv+848Zn1p_tBZ6x{%
ze2B>q7Jf-S>3?tgnvChotX`)GFv;d(X@1!F2EG<toGJYcO=0uBLFEbVO1Fr0C?W0R
zz{cIQjGdr}^CPXx@J@>Twar@6`r<R3y(x%wtEnI=y?P1~+;9{`xdjzD^6*F73Uq!m
zd-GM(nr+RD4t=EK)A8Q8uyef3ghdi1%P4AH$AmE0c(~|XlkJ!`uI;#&s;x=v{?hBA
zqYDBlql4?t8f#zif^FcISW0OnA(%-r;C4`3sjt{WN+tauJ1S@AyWTeQCANi1cinx`
z*}2tdcbb%(Gbnh1N_1YW_8XFkl9wXIoqOKCsxPK42MTm7r=yd-1;VcsA4}E$e||pA
zhEkKx(kSUpqQ_faK!d?CJCgy8<pIxscb}PG=^1-kaQh7$ncqg3Ufp-=nO>(963-$6
z_h4fsHK0;cJ099~GTkXsfry&s@nv#1sc!z<hx@%Vt+eGMH-Yrf)uHEkzd;vM&|w`Z
zbI6rT0@*wpPmN#WlRLXpy`2K&_fEW%;T&6fC#=MC$^P+^>@v%zTi{|y`c=S%jnvFR
zm@Y8kM4Di}Ze|BWX_DXG%-cc?SE+W2ky>WR0lip<B?C(?*t#khKIb4}5UoNPsNCDp
z?;L^c?QW;W-+P!e4fakHA8kl?$|aYG3VZS;2HZN5szUw6&<ip`6zO-f8CA|L*p8)_
z|LMoDA6{B(hYq$g`a$iSJ7?<)OQU4-qt(J*b>H&BV{R|TTMhD%rzIasi7CoKY>1zQ
zo%@1jb~xI`2L0OE?E5>Fogp%}SlI27GUm@*FT(lSde`)**!b1Zd7~MMa_V@P@kJfD
z8{RH|0;F&~FW7Opm<IfFR>K^VjEn!9%EUhHg|fWY|1PK*jb?GMSXQ~WE%cWa(v-xs
z2hY|lV}wD^7|551QnqJ)P@<Np3mreg0UFdhr)8R}3{&6lL9@0Nr?;CqUMYXQx2fEo
zs+b!T<x<jm2s8d6<)EB=c&3k5<o0Sz{#rxp)LE{rCL0(l$8WUL=&cV?YEyB~`9lt+
zpDa>cS1<>S@;Qb-&!ATV<7AX|U}f5z)=e;;nVd$o+R>IE9lbGNGSp<Sd$}<Gocl8c
zdfTR$ehYTdLwAgldL?__yk=m>nHJdxS&B+<WY??xnc404uBY#oN2-MTLl49x8!;VY
z88zo6#RH9TJ3Xi%&gCW!Fy9W}to6fWgo`guyJ#iyiW<CYZ8l5*+t*8Qe;BLagn=#c
z{6V^u2iQEVrUkjd4l4+D>5@2A$Jplw-Z!Oq)OTXG{2!DkoMoFWC^6d3IR?BD?zM&|
zz5lv{F;e>YLtu1H1j8QYwaw<V2d5F?6HGCztbn6$uYTm8OeGlmwujMo=4sI^Lnqy-
zhYQd5B2n#dp*xz~wtkZ~+?`)kQWtjHs8M{##TSU;;`;O_FOr24wad%D8ul*zPUli)
zMcW>JB(zj!UOtSB;N&^R$>OMO-P5hlZwNaDn>MwrW5z8v$2XHe+?f-P@_{z<zteLQ
zwZ>^$@;h^MJ^$_lUO1@v{!|o3^3-MdFt3Lpja!$ka68eh>*nUSq-S#k^f4no&zxE5
zY=6@-9zwm{IMZ$Zg)C0?=nT*79r*Zo+(|%2xa|p!IKj7`mq$MB5Tx@9np!#Y>9>3E
z`%Xj0fCV`NFbGB(CY{(m=3XGlrTi60a?k!(Z=1i==>psCoMUI`R<&(d*>?Nf-f`IR
z$PcBtnIETxoW^Rq3sUn*k|g0=9`xMQwl<Mr)*3nPjf<EEe-%6J(6qJ2_K<ASS=GKY
zZ<goxfxU|8=5D&!j?n^R(f-VO(N?eqqQE`aoN^WboDExkgAwV1e6l;ufxeBXWfM7{
z;0})~%8Q`1#>GTUyQ6h2{(*wmfugqAciMW93^KEv>0@z1uZ!GCt<Wq}=t>H6aywlz
zDLdaL8Esk?oU8Q}<!8jb{!~zY$W+`KTrI6DW(6`T>_I4Cm0OwosSjS=E&LN9G_0fB
zD{ZU$U4G8=sIfCl;4}8zv-pt|CRjoydf+V__59;_$;yop>Z>X@;`a8Nh|~LxX$i^l
z5N~kgpNepQcO<pxgW+DFvf7#|OwVh|hyqJ@!rCpr#<l(W<j;@E5uozevs43YK}f}w
zah}S>@?p4Ud7+=M2C3bfox<(@k_W?<E`4faz6>l}9lhcJ!pAYPcI+-W1^4my!ZT;R
zc@+Li2@Ox2=aK<0&UFLI=8sekCYa3+=hZcXUu*PHizjtPhrD5Kw0V?&-aW%`Zw|Ay
zy>x#LZ`Kp7FS3Af#ZKLN=hK1bn3v655aQdVD{xHP{Xr9x@SI7X7IY|j^N3p<bX&ql
z6`&0iSXW5}j>-#G&&Nwv1>>5hZ)+`MoFA{9$mm~H2#qgzB0u~)KfK#1;A0wI84FB?
zQIyD>nbk>ObEG3yb$V<NnoY_8vyK%%=KZUj)@1j`(_*^hC&OQ2aWV-DPOo%XQEAKD
z({z5k)uht%@eu~FbOHbU0D51xw*>8^y+3d-3E`YbJ|b#;4wZ0L3x{duZitFB1C{_H
zee25UNrLYDc3#wW|55~Z4;>WONfORB_!OtW1mi>t5k`Q0vN+0rOUM>pqPVQa0B)Vh
zoFXNIxfOgi?)4cI%BE+TqpgjPU}Hr2^Pi2IamMJQG_4EQwJutOCX;eDIv=IxD!)dd
zpty7U<D1%^VBH5@uklGfrN@_X^@m)#&_~;p{P2g$-9fi*liZ(x=@O2g$F|+=1S#K3
z;)_V4Wa(J)>{G4d5=liEdJ9<1giG$5BDeFqq{&11E_u<~vDvPJ|Me@=9fl+Qj%#R-
zX^;g0ub@nAG|Sm0h6M!CI}iBEptdsU(BSPYO|uHtR7qcOdL%@ic2GL0m8qwA5ou~^
zi89^r<&#ScGk=}N9jx=JbKVCa1B)U{Jfo$$!!2!lr&cegvoz3xIXJY^@iD)8D8Nsi
zUq-3$RLq`4e{Fwu0f&lF7g1r^!IqvKrC*2CTE}7J5+sgOzU=mg9^JZpzWf!<c-s*h
zjQ<?Sjjv1;<)nxbM;uYtI8YsS*k+qm#oCcI$M$(klj|GX{SY@=ad_vVNMS>i>fD{S
zvRLS>08|DTJOh~L;S5K~W7U4M-uQ#w<K2NO6^_;V+QVM9JzD6Vz`BdPg%@57!c)hA
zIK3$)o))>i*7j%aYI_9VUTKe@j82)MaJd4V7hV;%Y8`zSyGLXf?zm{05kB1Ee0u(S
z8#azj?9RX{P2oxM6&~yCkT0(;r`HE(BQX#gAyUR?CX%3~@j;B=qBRuE&q8;`M=CLu
z*$owQpPT|LEZ1ZSbcK2Fym#I@@=15wD5u%f&pVBlFg-E!np#qs80Ewjy`4{d;0@TG
z@oQ|!y|9?_lVI?QCD=DK3SK00ON8Tb`s+c34?qLj@{(*p60!iNrjJOv0-e0}Z=+fM
z`wJyzF~dv<z!<D&B>ZWi65p6{7EIm`e#c|Hv>TCk%L{CauMO^k0!ic7Oj@9NS0BzJ
z?_KQ;hm+r<ZN_G*NI9uiLPBXTmiLbN*9D8}L6kwPkhA$GO4<5PCVy-w)>^~*dh+Gg
z&8*5GJlrhp_|d|@Q?#RUidic@DEqLCX^Ht04x+A<mH>}PZFgwCrCP}VOz9*=4nhCd
zh+>w4V|_bywq!ehvZ$ajl6#y+L-g4za!4LFH?ho+42>)7qzBDg?p~be>`uOP3FDcb
zVE($1Ek~F&MEhbS&MG1{{;k4FGsbA^au%@FsPh~c*_ivQ>}fTKFa^#aoEOz7r^(q>
zuOcNG86UMmFQc*Krze_LiB~ASauvKLrQWjiSxRsaIFcRliCUUcb^?`aGviTLdEUcW
zNPb2R;T==v)4hmP<P}fsFRW(Rpi>K{8pACxR*308#G>;9WRA`4zWNnP_6^rzTcf<Z
z(k1I@2NH4T3cx8|=!)4<k;zB-*xIxcII|Ei>Fph9Q0diiKV44bS>BV0_F_9G)D82T
zp@TDyYeQA^$iK|vm_eR+qvS<q{Y{Fz%8~4dFs~h0TK=K@18E&aM<wku937v`zhPXU
zNI6b`giE!o;~1vN+X)0`38n`my;?qGGTn!EU~=0Q-=WuXb};YBD7n7@CB|4%JKJH;
zrv}yD$@UqDLE6u$;Fd<zBk7AGW^*1VuW*ZD>fBCX;`%hk3^VapAq;s@L9d4Yx1}V9
zth^HdxgELhUnSE87jmo7`9YjoT1pl6`Q%wLgLd20r`qP+@4T0u&Emh;i%0pB+TvPy
z#h-Zyg}|Ag!;&p=!Zqr6KsjPBx%JVf+U|d>)LrLf_qj_x*+n8%SD<z<@J+K>gxeM%
zzE-;#KzR?*PMHbO$pqyOm8Lug`P6)yyx^4@j5_a>GEWGq&L5#zHO&5aRZBA~K7YPC
z{YR{zh@DW!OzTZ+Ql3;i6#e-sM@DhspRaO}8X`M%F_V2MqqZc5FU+}^-f`Oli}HWV
zDv9+Pn#<&4z0<<EMiLv(w#o|JC56rt_w}Q=;E!7Q&xRy^4|`ds!0%yleVXaW?8U(9
z6TVcSOWVFFs_)j#cZZiGow{Xjfp}JI4vW=n?7ElPqU6pwW`eZUkc;iQH;-UzsYlW!
ztxTRrn~5Yz^%Pv&x$|Zx+J`s$wa+@oWL;We(V11Lme0U8?hmi<6)B05b&F-rssimq
znHgqsS_0eNbG9QpEDN0=mwBqstV!nN<sxI}lM7U5R*sKO^WFSPi0ur(T7MWOuuN?g
zVQ+gD9(-Rkjjz;EwN}d9ml>4Q2Ab51mx2i++d|y3iEbA^Q_$)}o8P+ffwpOQ$MhtJ
z)#q>$Nj-XY4LjMeI(<E@gtNdW$R#0W_F`)H2pyZjL9)(dQk+%eqzxLH{Ru8INRSh(
z;6uT7h?L`#_S#sXerpOd>|Ktz52>eUME;wqnxXKpp~XPh!7Nc?$9JCCV{Kc{2O{+n
z{8R*l|JY1g)7-J7)>3hwSE7foJ}g#-&en)?tG@g=o6_FW=V(yaRA+?!M}s8y-NKLr
zF*ziq{W%eH^8?0Ar&2Bxz|-5y>ZS_^8c(jX`Zq*wLzUP3p^V6#QZdn_c1j|>;J5~E
zI=-byZuVt0sd$8=)`uR^DK&EruXX`XUY4yes(s~)t<7`1Z^|iJd2hY_nXrOpSq}BB
za6ivISfB!jzaO@34y!yhrNR9ZcgD!(Plgq!>Y~3VgMSx}P^=T$-xbSm&;9ph75<?y
zceXSNM@+4DnPFyw1s1{TbjBVu1LL;W{p32cFGfkOIF8wbYUG^_rH*bCdESiq8K+G@
z*S6Bwbo$7LuQMfqZRydFCqsKmrBS|Dd<&FY7_wjAD!^<S)1Qo_y$cP(Ef5^qBcTxY
zMabYL6ZdMJ^8lX(>g^v(SO(2<%7nKX{geLd81DFK@~uvm0xjVv@8V?RLE~-T)}tYL
zYsxxQ@R`pYK3Y@_?3;zQbLAH1bxqNpMe?#x(YJ>a@<?Uy1e3(%X({hNWt^~&?`>&X
z${pelZUH~qR1m=H%lF3Y9Zq+WqvO;_isqlTtf{c%gneUJr*9>HnQqB-?|({1F~Z@+
zhJuA1ca||n;@xbEZ$O_E4M{QfxmvW^kx6d4oezOm$k3EUBu+S@(}wI`u`j3@b0;un
zBT!GKMJBrPB%cz|7Xpg81>0n@^*qS+?EK%!Cj|<0Eze~;C>JSnDnDMyQTi}&`Iiz`
zw%)NGODIY{y&E$+LB7(&u;vQV!y6f?bd0F<JNW5=fY~Um;7_@^C_8JzmmpfwV#3Q6
zf2s|)zcVkT%#f7_nN6qs(o!E=VCKW`ooLDzk$0oW5h8C;a_C3}Cgr3LndM_mX~{cM
z3!ZSF(ep>~5D3z5wv%<+>Ia+#PX`LhQ1=U@IV6dbQd)Dq5l%Pq-om88#&_WP_8~L(
zP0xH<N|3oTM#WD%Cw_5kVssTJ?5K0DXT?uAOT_oLab?(fD(rrNxkBC!g>1*7$d65$
zhje_}HjO(BIb5gM#}>7(TY^~N#60@R{aaV^f0Go`;QW@wD8~YRek9!@+XA@9b<U1s
zt@aaU-*pZQgbbJ*ymG$%7Z*NCeeicmq<W2^TXA7EI)?Qz*O%%a>aF|av1g6{|7tSj
z&<$qT4BF|=Im;90h4^RKAml4rW@o%)i+{TR^tQ{?I(HeiVR4Sc->{=%(wRyZ(~<F*
zvubvD)viOmPGC|g2T;YMI<_orByI0Qf(7ppZ<{)8yZN@;zGV-Vs5;*`_KWrUWryZ(
zx1t?3!dawzBSC^^?nCZqZ8#Q*1kzITNiV|~^Cu?5kw?cclRY$Z+PJTWMcbx6*t!u9
zkhw3KAK|-+It}T;9f}Nb;RK2_=)AWB>6DkGt&I!Y)+}|d2B&A6;)4Q6tM1&S55Wii
zYxZb<1BVZ{x`QW-+=Ab~*ckS~%r^5|qA91XXJe-Dx|Qxv`<VR0Y3E+z2yfYR%uYKB
zvp9!n!Zq>^Zx~c~R|nn8cU~Rx<DoyfXKFi2(RMaqT(ZlBMl9tXM&<50m?Y>L{%`JK
z+slDzn@0s!OW2ynLx;TH(N|T`vi#OI<IcBzrL$qkU~~EgFb@8EYaKN%zfEhrluabr
z=l`#@bJwjR2Ey<@3LP!9lt@%GG&}*1fsoj63nzjOK?*_;5&=>~fItWYJj~$)cniM&
zpRw1wXLCVNMJK!Vj_vXIpQ|e_Ffbf6`vJSjSOQOq$EwKzDk2j%)fPlgy(ggGI_mqh
z0$CQutSShzj9{6RLhtJGiPOAI;6e+vG<M836N2UfL-2F;{vA8zr|C0ENn<}d^ZT9O
zyJ-Gm?0nWvUfIX4sAR3*>0yvwWP9vh=Cm}I=<oeLV>4irZHr|+UGo70_XiC!EGaU3
zg}dr^rB!+{LQScxBR1mm-~?0x)Ey|OZR9_WH5phfO<7xEt2aI%H;u6Imqke*HLsI3
zD2nz-90)sTI`@Bkg^MvEBJ`?oE0a{J2qJ)>jy50y1#u|&oZC+NgY)NBn;d&u77wlt
z3!TqGP!I5fM5IrcW9jtg{#M}vK8|^5cPV%djjVBl_&sbMZ!#~j-}8rdG#0(Ag7&7f
z!+_P@y8yQ@T$<;d@h%Vyzzp%#5vtBIPFw8UT)jcl(X;uSxe3I^HbS{y6hET}>|qja
z3hY!YHXH>|-&rZS1HBKkd?}%V?ORtdWLCUJpKgYG0Ut`32v;_+16>=^v4L8!&zsD@
z=Lw8<dr0z~k(}Z>M{PZMIR0a^jA%23_ZfPw@vprXGO*6aHpWA3tMwukC$uO>Q?t6I
z3WXGIF#+oa5wLF&i8BN8vD;$&87t`O?IV~^2Wa4!3A5<*bV3sB5++nwYdZhSTYYZI
zTMtfPzEkxV6NV`$Y6Lfl+31;U504wY4vx90HJ;68*FN)#uG5>Ta6~6whMvO(49S~p
zsKJ4MvUOm+Tkq1`-6@Hh9=%?col<uBp7~K!HYlU%G+!<0FY*)Ac`wh_{}sZ$n|ToF
zf1J*)^0>P9k|Nmy#fS)zvRHk)v+SQc6IobSma6r>Vq)V^sG@OV=M&$L^7$q63jRle
zPR9~5A$^hIPCyJTc6E`!IE=!9htuYaWS&+w>vKzqeSh=*QV}TtAuLW4DgP?CKq9`s
z+oWbfh68}+@+-?TH`Rg3kyxV0GjpW85_zF~ID1PRjAgalGm{SvUu_?LR%F(Qa=8{D
z7%8Nv2Z+Q0#n^^1jDD2b4Vl|t4)#W#v`r^(&%}XF-;P+Fvu8|7)E;U2_A(=MM*=Eg
z#~dHW+8<durTsX^X!@J~xuc_?b2F#mcxmRC3`Ho=#hfg(@8#4w^{?48%MG?QV3%FQ
z&c?w3MgX8=&|g%1${N`XDjT~_+Uf5&$hy_e#!rbpmuJkn@*(6_Qn!j(BMfl)JPdEe
zo;WtRrCG1u$5PL)nD~Tbmi&lR1S^+dWeTeSiB+7;EI>d|ltbsmoO@wBcOJKN#fifQ
zDDm5>v|pgIg3}3XN@ROvc~E~jE{a=^|13N(6$4(4XG^IB`!)V(xxu+_kr}8}hZJE7
zz!w{t1=TDZs$(qRiLfU!;rJ34|K0ZVH$_+2ayVDhls_ls@P^s-&4eFk?-~gj`RXMi
zyKD7EQXR7i1Mgav?sPLZlkySYD8QOL7KepzOWp&qy8Y!D@m^4Sh0q2nq5??Voc3Yf
z>MmWmdeJP4omhl)Y)eJ*gs(F&WQzDy2gV&AexiRi=XMub`7aJ1YcBj;_8;lzgSwKl
zM7lAy>eiCrFJ`hqXe{8pp)SsuYRfNHZot`l?~f<XuHWElQ{8hTVLpfvoj$^F2=k{V
ioFlFgpEUV`OFwJu4KZA~F~)DMcaEtl->k}w8RZY8owSkw

delta 6961
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
L9P_*CTay0|un~|}

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index fc4671cf4..d23fc80a7 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
 "POT-Creation-Date: 2022-06-18 18:44+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
-"Last-Translator: white <space_white@yahoo.com>\n"
+"Last-Translator: subdiox <subdiox@gmail.com>\n"
 "Language: ja\n"
 "Language-Team: ja <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -24,19 +24,19 @@ msgstr "統計"
 
 #: cps/admin.py:146
 msgid "Server restarted, please reload page"
-msgstr "サーバを再起動しました。ページを再読み込みしてください"
+msgstr "サーバーを再起動しました。ページを再読み込みしてください"
 
 #: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
-msgstr "サーバをシャットダウンしています。ページを閉じてください"
+msgstr "サーバーをシャットダウンしています。ページを閉じてください"
 
 #: cps/admin.py:156
 msgid "Reconnect successful"
-msgstr ""
+msgstr "再接続成功"
 
 #: cps/admin.py:159
 msgid "Unknown command"
-msgstr ""
+msgstr "不明なコマンド"
 
 #: cps/admin.py:192 cps/editbooks.py:572 cps/editbooks.py:574
 #: cps/editbooks.py:610 cps/editbooks.py:627 cps/editbooks.py:1234
@@ -58,228 +58,228 @@ msgstr "UI設定"
 
 #: cps/admin.py:309 cps/templates/admin.html:51
 msgid "Edit Users"
-msgstr ""
+msgstr "ユーザーを編集"
 
 #: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
-msgstr ""
+msgstr "全て"
 
 #: cps/admin.py:380 cps/admin.py:1370
 msgid "User not found"
-msgstr ""
+msgstr "ユーザーが見つかりません"
 
 #: cps/admin.py:394
 msgid "{} users deleted successfully"
-msgstr ""
+msgstr "{}人のユーザーが削除されました"
 
 #: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
-msgstr ""
+msgstr "全て表示"
 
 #: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
-msgstr ""
+msgstr "不正なリクエスト"
 
 #: cps/admin.py:456 cps/admin.py:1968
 msgid "Guest Name can't be changed"
-msgstr ""
+msgstr "ゲストユーザーの名前は変更できません"
 
 #: cps/admin.py:468
 msgid "Guest can't have this role"
-msgstr ""
+msgstr "ゲストユーザーはこのロールを持つことができません"
 
 #: cps/admin.py:480 cps/admin.py:1926
 msgid "No admin user remaining, can't remove admin role"
-msgstr ""
+msgstr "管理者ユーザーが残っておらず、管理者ロールを削除できません"
 
 #: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
-msgstr ""
+msgstr "値はtrueかfalseのどちらかでなければなりません"
 
 #: cps/admin.py:486
 msgid "Invalid role"
-msgstr ""
+msgstr "無効なロール"
 
 #: cps/admin.py:490
 msgid "Guest can't have this view"
-msgstr ""
+msgstr "ゲストユーザーはこの画面を表示できません"
 
 #: cps/admin.py:500
 msgid "Invalid view"
-msgstr ""
+msgstr "無効な表示"
 
 #: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
-msgstr ""
+msgstr "ゲストユーザーの言語設定は自動的に決定されるため、固定することはできません"
 
 #: cps/admin.py:507
 msgid "No Valid Locale Given"
-msgstr ""
+msgstr "有効な言語設定がありません"
 
 #: cps/admin.py:518
 msgid "No Valid Book Language Given"
-msgstr ""
+msgstr "有効な本の言語がありません"
 
 #: cps/admin.py:520 cps/editbooks.py:439
 msgid "Parameter not found"
-msgstr ""
+msgstr "パラメータが見つかりません"
 
 #: cps/admin.py:557
 msgid "Invalid Read Column"
-msgstr ""
+msgstr "無効な読み取り列"
 
 #: cps/admin.py:563
 msgid "Invalid Restricted Column"
-msgstr ""
+msgstr "無効な制限列"
 
 #: cps/admin.py:583 cps/admin.py:1797
 msgid "Calibre-Web configuration updated"
-msgstr "Calibre-Web の設定を更新しました"
+msgstr "Calibre-Webの設定を更新しました"
 
 #: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
-msgstr ""
+msgstr "Koboのトークンを削除してもよろしいですか？"
 
 #: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
-msgstr ""
+msgstr "このドメインを削除してもよろしいですか？"
 
 #: cps/admin.py:599
 msgid "Do you really want to delete this user?"
-msgstr ""
+msgstr "このユーザーを削除してもよろしいですか？"
 
 #: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
-msgstr ""
+msgstr "この本棚を削除してもよろしいですか？"
 
 #: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
-msgstr ""
+msgstr "選択したユーザーの言語設定を変更してもよろしいですか？"
 
 #: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
-msgstr ""
+msgstr "選択したユーザーが表示できる本の言語を変更してもよろしいですか？"
 
 #: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
-msgstr ""
+msgstr "選択したユーザーの選択したロールを変更してもよろしいですか？"
 
 #: cps/admin.py:609
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
-msgstr ""
+msgstr "選択したユーザーの選択した制限を変更してもよろしいですか？"
 
 #: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
-msgstr ""
+msgstr "選択したユーザーの選択した表示制限を変更してもよろしいですか？"
 
 #: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
-msgstr ""
+msgstr "選択したユーザーの本棚同期の動作を変更してもよろしいですか？"
 
 #: cps/admin.py:616
 msgid "Are you sure you want to change Calibre library location?"
-msgstr ""
+msgstr "Calibreライブラリのパスを変更してもよろしいですか？"
 
 #: cps/admin.py:618
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
-msgstr ""
+msgstr "Calibre-Webは新しい表紙を検索してそのサムネイルを更新しますが、これにはしばらく時間がかかるかもしれません"
 
 #: cps/admin.py:621
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr ""
+msgstr "Calibre-Webの同期DBを削除して強制的にKoboリーダーと同期してもよろしいですか？"
 
 #: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
-msgstr ""
+msgstr "拒否"
 
 #: cps/admin.py:866 cps/admin.py:872 cps/admin.py:882 cps/admin.py:892
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
-msgstr ""
+msgstr "許可"
 
 #: cps/admin.py:907
 msgid "{} sync entries deleted"
-msgstr ""
+msgstr "{}件の同期項目を削除しました"
 
 #: cps/admin.py:955
 msgid "Tag not found"
-msgstr ""
+msgstr "タグが見つかりません"
 
 #: cps/admin.py:967
 msgid "Invalid Action"
-msgstr ""
+msgstr "無効なアクションです"
 
 #: cps/admin.py:1082
 msgid "client_secrets.json Is Not Configured For Web Application"
-msgstr ""
+msgstr "client_secrets.jsonがWebアプリケーション用に設定されていません"
 
 #: cps/admin.py:1127
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "ログファイルの場所が無効です。正しいパスを入力してください"
 
 #: cps/admin.py:1133
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "アクセスログファイルの場所が無効です。正しいパスを入力してください"
 
 #: cps/admin.py:1163
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
-msgstr ""
+msgstr "LDAPのプロバイダ、ポート番号、DN、ユーザーIDを入力してください"
 
 #: cps/admin.py:1169
 msgid "Please Enter a LDAP Service Account and Password"
-msgstr ""
+msgstr "LDAPのサービスアカウント名とパスワードを入力してください"
 
 #: cps/admin.py:1172
 msgid "Please Enter a LDAP Service Account"
-msgstr ""
+msgstr "LDAPのサービスアカウント名を入力してください"
 
 #: cps/admin.py:1177
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
-msgstr ""
+msgstr "LDAPのグループフィルタには \"%s\" というフォーマットのIDが一つ必要です"
 
 #: cps/admin.py:1179
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
-msgstr ""
+msgstr "LDAPのグループフィルタ内の括弧が一致しません"
 
 #: cps/admin.py:1183
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
-msgstr ""
+msgstr "LDAPのユーザーフィルタには \"%s\" というフォーマットのIDが一つ必要です"
 
 #: cps/admin.py:1185
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
-msgstr ""
+msgstr "LDAPのユーザーフィルタ内の括弧が一致しません"
 
 #: cps/admin.py:1192
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
-msgstr ""
+msgstr "LDAPのメンバーフィルタには \"%s\" というフォーマットのIDが一つ必要です"
 
 #: cps/admin.py:1194
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
-msgstr ""
+msgstr "LDAPのメンバーフィルタ内の括弧が一致しません"
 
 #: cps/admin.py:1201
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "LDAPのCA証明書、証明書、キーの場所が無効です。正しいパスを入力してください"
 
 #: cps/admin.py:1232 cps/admin.py:1858
 msgid "Add new user"
-msgstr "新規ユーザ追加"
+msgstr "新規ユーザー追加"
 
 #: cps/admin.py:1241 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
-msgstr "SMTP設定を変更"
+msgstr "メールサーバー設定を編集"
 
 #: cps/admin.py:1260
 msgid "Gmail Account Verification Successful"
-msgstr ""
+msgstr "Gmailアカウントを認証しました"
 
 #: cps/admin.py:1279 cps/admin.py:1282 cps/admin.py:1663 cps/admin.py:1781
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
@@ -288,41 +288,41 @@ msgstr ""
 #: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
 #, python-format
 msgid "Database error: %(error)s."
-msgstr ""
+msgstr "DBエラー: %(error)s"
 
 #: cps/admin.py:1289
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr ""
+msgstr "%(email)s へのテストメール送信がキューに追加されました。結果を見るにはタスクを確認してください"
 
 #: cps/admin.py:1292
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
-msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
+msgstr "%(res)s へのテストメール送信中にエラーが発生しました"
 
 #: cps/admin.py:1294
 msgid "Please configure your e-mail address first..."
-msgstr ""
+msgstr "初めにメールアドレスを設定してください"
 
 #: cps/admin.py:1296
 msgid "E-mail server settings updated"
-msgstr "メールサーバの設定を更新しました"
+msgstr "メールサーバーの設定を更新しました"
 
 #: cps/admin.py:1319 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
-msgstr ""
+msgstr "スケジュールタスク設定を編集"
 
 #: cps/admin.py:1331
 msgid "Invalid start time for task specified"
-msgstr ""
+msgstr "指定したタスクの開始時刻が無効です"
 
 #: cps/admin.py:1336
 msgid "Invalid duration for task specified"
-msgstr ""
+msgstr "指定したタスクの期間が無効です"
 
 #: cps/admin.py:1345
 msgid "Scheduled tasks settings updated"
-msgstr ""
+msgstr "スケジュールタスクの設定を更新しました"
 
 #: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
 #: cps/web.py:1315
@@ -331,17 +331,17 @@ msgstr "不明なエラーが発生しました。あとで再試行してくだ
 
 #: cps/admin.py:1359
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "設定DBが書き込みできません"
 
 #: cps/admin.py:1389 cps/admin.py:1984
 #, python-format
 msgid "Edit User %(nick)s"
-msgstr "%(nick)s を編集"
+msgstr "ユーザー %(nick)s を編集"
 
 #: cps/admin.py:1401
 #, python-format
 msgid "Password for user %(user)s reset"
-msgstr "%(user)s 用のパスワードをリセット"
+msgstr "ユーザー %(user)s のパスワードをリセット"
 
 #: cps/admin.py:1407 cps/web.py:1194
 msgid "Please configure the SMTP mail settings first..."
@@ -349,7 +349,7 @@ msgstr "初めにSMTPメールの設定をしてください"
 
 #: cps/admin.py:1418
 msgid "Logfile viewer"
-msgstr ""
+msgstr "ログファイルビューア"
 
 #: cps/admin.py:1484
 msgid "Requesting update package"
@@ -369,15 +369,15 @@ msgstr "ファイルを置換中"
 
 #: cps/admin.py:1488
 msgid "Database connections are closed"
-msgstr "データベースの接続を切断完了"
+msgstr "DB接続を切断"
 
 #: cps/admin.py:1489
 msgid "Stopping server"
-msgstr "サーバ停止中"
+msgstr "サーバー停止中"
 
 #: cps/admin.py:1490
 msgid "Update finished, please press okay and reload page"
-msgstr "アップデート完了、OKを押してページをリロードしてください"
+msgstr "アップデート完了、OKを押してページを再読み込みしてください"
 
 #: cps/admin.py:1491 cps/admin.py:1492 cps/admin.py:1493 cps/admin.py:1494
 #: cps/admin.py:1495 cps/admin.py:1496
@@ -394,7 +394,7 @@ msgstr "接続エラー"
 
 #: cps/admin.py:1493 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
-msgstr "接続を確立中にタイムアウトしました"
+msgstr "接続確立中にタイムアウトしました"
 
 #: cps/admin.py:1494 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
@@ -402,62 +402,60 @@ msgstr "エラー発生"
 
 #: cps/admin.py:1495
 msgid "Update file could not be saved in temp dir"
-msgstr ""
+msgstr "更新データを一時フォルダに保存できませんでした"
 
 #: cps/admin.py:1496
 msgid "Files could not be replaced during update"
-msgstr ""
+msgstr "更新中にファイルを置換できませんでした"
 
 #: cps/admin.py:1520
 msgid "Failed to extract at least One LDAP User"
-msgstr ""
+msgstr "少なくとも1人のLDAPユーザーの抽出に失敗しました"
 
 #: cps/admin.py:1565
 msgid "Failed to Create at Least One LDAP User"
-msgstr ""
+msgstr "少なくとも1人のLDAPユーザーの作成に失敗しました"
 
 #: cps/admin.py:1578
 #, python-format
 msgid "Error: %(ldaperror)s"
-msgstr ""
+msgstr "エラー: %(ldaperror)s"
 
 #: cps/admin.py:1582
 msgid "Error: No user returned in response of LDAP server"
-msgstr ""
+msgstr "エラー: LDAPサーバーのレスポンスでユーザーが返されません"
 
 #: cps/admin.py:1615
 msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
+msgstr "DB内にLDAPユーザーが1人も見つかりません"
 
 #: cps/admin.py:1617
 msgid "{} User Successfully Imported"
-msgstr ""
+msgstr "{}人のユーザーをインポートしました"
 
 #: cps/admin.py:1675
 msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "DBの場所が無効です。正しいパスを入力してください"
 
 #: cps/admin.py:1695
 msgid "DB is not Writeable"
-msgstr ""
+msgstr "DBへの書き込みができません"
 
 #: cps/admin.py:1708
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "キーファイルの場所が無効です。正しいパスを入力してください"
 
 #: cps/admin.py:1712
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "証明書ファイルの場所が無効です。正しいパスを入力してください"
 
 #: cps/admin.py:1820
-#, fuzzy
 msgid "Database Settings updated"
-msgstr "メールサーバの設定を更新しました"
+msgstr "DB設定を更新しました"
 
 #: cps/admin.py:1828
-#, fuzzy
 msgid "Database Configuration"
-msgstr "機能設定"
+msgstr "DB設定"
 
 #: cps/admin.py:1844 cps/web.py:1229
 msgid "Please fill out all fields!"
@@ -470,30 +468,29 @@ msgstr "このメールは有効なドメインからのものではありませ
 #: cps/admin.py:1869
 #, python-format
 msgid "User '%(user)s' created"
-msgstr "ユーザ '%(user)s' を作成しました"
+msgstr "ユーザー '%(user)s' を作成しました"
 
 #: cps/admin.py:1875
-#, fuzzy
 msgid "Found an existing account for this e-mail address or name."
-msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
+msgstr "このメールアドレスかニックネームで登録されたアカウントがすでに存在します。"
 
 #: cps/admin.py:1905
 #, python-format
 msgid "User '%(nick)s' deleted"
-msgstr "ユーザ '%(nick)s' を削除しました"
+msgstr "ユーザー '%(nick)s' を削除しました"
 
 #: cps/admin.py:1907 cps/admin.py:1908
 msgid "Can't delete Guest User"
-msgstr ""
+msgstr "ゲストユーザーは削除できません"
 
 #: cps/admin.py:1911
 msgid "No admin user remaining, can't delete user"
-msgstr ""
+msgstr "管理者ユーザーが残っておらず、ユーザーを削除できません"
 
 #: cps/admin.py:1988
 #, python-format
 msgid "User '%(nick)s' updated"
-msgstr "ユーザ '%(nick)s' を更新しました"
+msgstr "ユーザー '%(nick)s' を更新しました"
 
 #: cps/converter.py:31
 msgid "not installed"
@@ -501,12 +498,12 @@ msgstr "インストールされていません"
 
 #: cps/converter.py:32
 msgid "Execution permissions missing"
-msgstr ""
+msgstr "実行権限がありません"
 
 #: cps/db.py:679 cps/web.py:720
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
-msgstr ""
+msgstr "カスタムカラムの%(column)d列目がcalibreのDBに存在しません"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
@@ -518,15 +515,15 @@ msgstr "なし"
 #: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
 #: cps/web.py:1496 cps/web.py:1541
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr ""
+msgstr "選択した本は利用できません。ファイルが存在しないか、アクセスできません"
 
 #: cps/editbooks.py:154 cps/editbooks.py:1217
 msgid "User has no rights to upload cover"
-msgstr ""
+msgstr "ユーザーは表紙をアップロードする権限がありません"
 
 #: cps/editbooks.py:174 cps/editbooks.py:712
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
-msgstr ""
+msgstr "IDは大文字小文字を区別しません。元のIDを上書きします"
 
 #: cps/editbooks.py:215
 msgid "Metadata successfully updated"
@@ -534,12 +531,12 @@ msgstr "メタデータを更新しました"
 
 #: cps/editbooks.py:233
 msgid "Error editing book: {}"
-msgstr ""
+msgstr "本編集中のエラー: {}"
 
 #: cps/editbooks.py:288
 #, python-format
 msgid "File %(file)s uploaded"
-msgstr ""
+msgstr "ファイル %(file)s をアップロードしました"
 
 #: cps/editbooks.py:315
 msgid "Source or destination format for conversion missing"
@@ -557,17 +554,17 @@ msgstr "この本の変換中にエラーが発生しました: %(res)s"
 
 #: cps/editbooks.py:631
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr ""
+msgstr "アップロードした本はすでにライブラリに存在します。新しくアップロードする前に変更を加えてください: "
 
 #: cps/editbooks.py:686 cps/editbooks.py:1011
-#, fuzzy, python-format
+#, python-format
 msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s は有効な言語ではありません"
+msgstr "'%(langname)s' は有効な言語ではありません"
 
 #: cps/editbooks.py:724 cps/editbooks.py:1158
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
+msgstr "ファイル拡張子 '%(ext)s' をこのサーバーにアップロードすることは許可されていません"
 
 #: cps/editbooks.py:728 cps/editbooks.py:1162
 msgid "File to be uploaded must have an extension"
@@ -576,24 +573,24 @@ msgstr "アップロードするファイルには拡張子が必要です"
 #: cps/editbooks.py:736
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
-msgstr ""
+msgstr "ファイル %(filename)s は一時フォルダに保存できませんでした"
 
 #: cps/editbooks.py:756
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr ""
+msgstr "表紙ファイル %(file)s の移動に失敗しました: %(error)s"
 
 #: cps/editbooks.py:813 cps/editbooks.py:815
 msgid "Book Format Successfully Deleted"
-msgstr ""
+msgstr "本の形式を削除しました"
 
 #: cps/editbooks.py:822 cps/editbooks.py:824
 msgid "Book Successfully Deleted"
-msgstr ""
+msgstr "本を削除しました"
 
 #: cps/editbooks.py:876
 msgid "You are missing permissions to delete books"
-msgstr ""
+msgstr "本を削除する権限がありません"
 
 #: cps/editbooks.py:926
 msgid "edit metadata"
@@ -602,11 +599,11 @@ msgstr "メタデータを編集"
 #: cps/editbooks.py:975
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
+msgstr "%(seriesindex)s は有効な数字ではありません。スキップします"
 
 #: cps/editbooks.py:1153
 msgid "User has no rights to upload additional file formats"
-msgstr ""
+msgstr "新たなファイル形式をアップロードする権限がありません"
 
 #: cps/editbooks.py:1174
 #, python-format
@@ -616,7 +613,7 @@ msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 #: cps/editbooks.py:1179
 #, python-format
 msgid "Failed to store file %(file)s."
-msgstr "%(file)s を保存できません。"
+msgstr "ファイル %(file)s を保存できません。"
 
 #: cps/editbooks.py:1202
 #, python-format
@@ -625,7 +622,7 @@ msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
 
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr "Googleドライブの設定が完了していません。Googleドライブを無効化してから再度有効にしてみてください"
+msgstr "Googleドライブの設定が完了していません。Googleドライブを無効にしてから再度有効にしてみてください"
 
 #: cps/gdrive.py:95
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
@@ -648,9 +645,8 @@ msgstr "%(format)s がありません: %(fn)s"
 
 #: cps/helper.py:96 cps/helper.py:225 cps/templates/detail.html:42
 #: cps/templates/detail.html:46
-#, fuzzy
 msgid "Send to E-Reader"
-msgstr "Kindleに送信"
+msgstr "E-Readerに送信"
 
 #: cps/helper.py:97 cps/helper.py:115 cps/helper.py:227
 msgid "This e-mail has been sent via Calibre-Web."
@@ -671,22 +667,22 @@ msgstr "Calibre-Webを始める"
 #: cps/helper.py:136
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
-msgstr "ユーザ: %(name)s 用の登録メール"
+msgstr "ユーザー: %(name)s 用の登録メール"
 
 #: cps/helper.py:147 cps/helper.py:153
-#, fuzzy, python-format
+#, python-format
 msgid "Convert %(orig)s to %(format)s and send to E-Reader"
-msgstr "%(orig)s を %(format)s に変換してからKindleに送信"
+msgstr "%(orig)s を %(format)s に変換してからE-Readerに送信"
 
 #: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180 cps/helper.py:184
-#, fuzzy, python-format
+#, python-format
 msgid "Send %(format)s to E-Reader"
-msgstr "Kindleに %(format)s を送信"
+msgstr "E-Readerに %(format)s を送信"
 
 #: cps/helper.py:224 cps/tasks/convert.py:92
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to E-Reader"
-msgstr "Kindleに送信"
+msgstr "%(book)s をE-Readerに送信"
 
 #: cps/helper.py:229
 msgid "The requested file could not be read. Maybe wrong permissions?"
@@ -694,27 +690,27 @@ msgstr "要求されたファイルを読み込めませんでした。権限設
 
 #: cps/helper.py:344
 msgid "Read status could not set: {}"
-msgstr ""
+msgstr "読み込みステータスを設定できません: {}"
 
 #: cps/helper.py:367
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr ""
+msgstr "%(id)s の本フォルダの削除に失敗しました。そこにはサブフォルダがあります: %(path)s"
 
 #: cps/helper.py:373
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
-msgstr ""
+msgstr "本 %(id)s の削除に失敗しました: %(message)s"
 
 #: cps/helper.py:384
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
-msgstr ""
+msgstr "本 %(id)s はDBのみから削除されます。DB内の本のパスが有効ではありません: %(path)s"
 
 #: cps/helper.py:449
-#, fuzzy, python-format
+#, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "エラー: %(error)s により、タイトルを %(src)s から %(dest)s に変更できませんでした。"
+msgstr "エラー: %(error)s により、作者名を %(src)s から %(dest)s に変更できませんでした"
 
 #: cps/helper.py:521 cps/helper.py:530
 #, python-format
@@ -724,11 +720,11 @@ msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 #: cps/helper.py:564
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "エラー: %(error)s により、タイトルを %(src)s から %(dest)s に変更できませんでした。"
+msgstr "エラー: %(error)s により、タイトルを %(src)s から %(dest)s に変更できませんでした"
 
 #: cps/helper.py:584
 msgid "Error in rename file in path: {}"
-msgstr ""
+msgstr "ファイル名の変更でエラーが発生しました: {}"
 
 #: cps/helper.py:602
 #, python-format
@@ -736,74 +732,73 @@ msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
 #: cps/helper.py:643 cps/web.py:1408
-#, fuzzy
 msgid "Found an existing account for this e-mail address"
-msgstr "このメールアドレスで登録されたアカウントがあります"
+msgstr "このメールアドレスで登録されたアカウントがすでに存在します"
 
 #: cps/helper.py:651
 msgid "This username is already taken"
-msgstr ""
+msgstr "このユーザー名はすでに使われています"
 
 #: cps/helper.py:661
 msgid "Invalid e-mail address format"
-msgstr ""
+msgstr "メールアドレスの形式が無効"
 
 #: cps/helper.py:811
 msgid "Python module 'advocate' is not installed but is needed for cover uploads"
-msgstr ""
+msgstr "表紙のアップロードに必要なPythonモジュール 'advocate' がインストールされていません"
 
 #: cps/helper.py:821
 msgid "Error Downloading Cover"
-msgstr ""
+msgstr "表紙のダウンロードに失敗しました"
 
 #: cps/helper.py:824
 msgid "Cover Format Error"
-msgstr ""
+msgstr "表紙形式エラー"
 
 #: cps/helper.py:827
 msgid "You are not allowed to access localhost or the local network for cover uploads"
-msgstr ""
+msgstr "表紙アップロードのためにlocalhostやローカルネットワークにアクセスすることは許可されていません"
 
 #: cps/helper.py:837
 msgid "Failed to create path for cover"
-msgstr ""
+msgstr "表紙ファイルの作成に失敗しました"
 
 #: cps/helper.py:853
 msgid "Cover-file is not a valid image file, or could not be stored"
-msgstr ""
+msgstr "表紙ファイルが有効な画像ファイルでないか、または保存できませんでした"
 
 #: cps/helper.py:864
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr ""
+msgstr "表紙ファイルは jpg/jpeg/png/webp/bmp のみ対応しています"
 
 #: cps/helper.py:876
 msgid "Invalid cover file content"
-msgstr ""
+msgstr "表紙ファイルの内容が無効です"
 
 #: cps/helper.py:880
 msgid "Only jpg/jpeg files are supported as coverfile"
-msgstr ""
+msgstr "表紙ファイルは jpg/jpeg のみ対応しています"
 
 #: cps/helper.py:932
 msgid "Unrar binary file not found"
-msgstr ""
+msgstr "Unrarのバイナリファイルが見つかりません"
 
 #: cps/helper.py:943
 msgid "Error excecuting UnRar"
-msgstr ""
+msgstr "Unrarの実行中にエラーが発生しました"
 
 #: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
-msgstr ""
+msgstr "localhost以外からCalibre-Webにアクセスし、有効なKobo端末用APIエンドポイントを取得してください"
 
 #: cps/kobo_auth.py:115
 msgid "Kobo Setup"
-msgstr ""
+msgstr "Kobo設定"
 
 #: cps/oauth_bb.py:77
 #, python-format
 msgid "Register with %(provider)s"
-msgstr ""
+msgstr "%(provider)s で登録"
 
 #: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
 #, python-format
@@ -813,62 +808,62 @@ msgstr "%(nickname)s としてログイン中"
 #: cps/oauth_bb.py:148
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
-msgstr ""
+msgstr "%(oauth)s との連携に成功しました"
 
 #: cps/oauth_bb.py:155
 msgid "Login failed, No User Linked With OAuth Account"
-msgstr ""
+msgstr "ログイン失敗、OAuthアカウントと連携しているユーザーが存在しません"
 
 #: cps/oauth_bb.py:197
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
+msgstr "%(oauth)s との連携解除に成功しました"
 
 #: cps/oauth_bb.py:202
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
-msgstr ""
+msgstr "%(oauth)s との連携解除に失敗しました"
 
 #: cps/oauth_bb.py:205
 #, python-format
 msgid "Not Linked to %(oauth)s"
-msgstr ""
+msgstr "%(oauth)s と連携していません"
 
 #: cps/oauth_bb.py:261
 msgid "Failed to log in with GitHub."
-msgstr ""
+msgstr "GitHubアカウントでのログインに失敗しました。"
 
 #: cps/oauth_bb.py:267
 msgid "Failed to fetch user info from GitHub."
-msgstr ""
+msgstr "GitHubからのユーザー情報取得に失敗しました。"
 
 #: cps/oauth_bb.py:279
 msgid "Failed to log in with Google."
-msgstr ""
+msgstr "Googleアカウントでのログインに失敗しました。"
 
 #: cps/oauth_bb.py:285
 msgid "Failed to fetch user info from Google."
-msgstr ""
+msgstr "Googleからのユーザー情報取得に失敗しました。"
 
 #: cps/oauth_bb.py:332
 msgid "GitHub Oauth error, please retry later."
-msgstr ""
+msgstr "GitHub OAuth エラー、再度お試しください。"
 
 #: cps/oauth_bb.py:335
 msgid "GitHub Oauth error: {}"
-msgstr ""
+msgstr "GitHub OAuth エラー: {}"
 
 #: cps/oauth_bb.py:356
 msgid "Google Oauth error, please retry later."
-msgstr ""
+msgstr "Google OAuth エラー、再度お試しください。"
 
 #: cps/oauth_bb.py:359
 msgid "Google Oauth error: {}"
-msgstr ""
+msgstr "Google OAuth エラー: {}"
 
 #: cps/opds.py:287
 msgid "{} Stars"
-msgstr ""
+msgstr "星{}"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
@@ -889,7 +884,7 @@ msgstr "成功です！端末に戻ってください"
 
 #: cps/render_template.py:40 cps/web.py:405
 msgid "Books"
-msgstr ""
+msgstr "本"
 
 #: cps/render_template.py:42
 msgid "Show recent books"
@@ -901,29 +896,29 @@ msgstr "人気の本"
 
 #: cps/render_template.py:45
 msgid "Show Hot Books"
-msgstr ""
+msgstr "人気の本を表示"
 
 #: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
-msgstr ""
+msgstr "ダウンロードされた本"
 
 #: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
-msgstr ""
+msgstr "ダウンロードされた本を表示"
 
 #: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
-msgstr ""
+msgstr "高評価の本"
 
 #: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
-msgstr ""
+msgstr "高評価の本を表示"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
 #: cps/templates/index.xml:58 cps/web.py:739
 msgid "Read Books"
-msgstr "読んだ本"
+msgstr "既読の本"
 
 #: cps/render_template.py:62
 msgid "Show read and unread"
@@ -936,7 +931,7 @@ msgstr "未読の本"
 
 #: cps/render_template.py:66
 msgid "Show unread"
-msgstr ""
+msgstr "未読の本を表示"
 
 #: cps/render_template.py:67
 msgid "Discover"
@@ -945,7 +940,7 @@ msgstr "見つける"
 #: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
-msgstr "ランダムで本を表示"
+msgstr "ランダムに本を表示"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
 #: cps/templates/index.xml:83 cps/web.py:1098
@@ -969,11 +964,11 @@ msgstr "シリーズ選択を表示"
 #: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
-msgstr "著者"
+msgstr "作者"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
-msgstr "著者選択を表示"
+msgstr "作者選択を表示"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
 #: cps/templates/index.xml:76 cps/web.py:966
@@ -996,35 +991,35 @@ msgstr "言語選択を表示"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
-msgstr ""
+msgstr "評価"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
-msgstr ""
+msgstr "評価選択を表示"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
-msgstr ""
+msgstr "ファイル形式"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
-msgstr ""
+msgstr "ファイル形式選択を表示"
 
 #: cps/render_template.py:94 cps/web.py:765
 msgid "Archived Books"
-msgstr ""
+msgstr "アーカイブされた本"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
 msgid "Show archived books"
-msgstr ""
+msgstr "アーカイブされた本を表示"
 
 #: cps/render_template.py:99 cps/web.py:796
 msgid "Books List"
-msgstr ""
+msgstr "本の一覧"
 
 #: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
-msgstr ""
+msgstr "本の一覧を表示"
 
 #: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
@@ -1054,11 +1049,11 @@ msgstr "評価 >= %(rating)s"
 #: cps/search.py:218
 #, python-format
 msgid "Read Status = %(status)s"
-msgstr ""
+msgstr "既読/未読状況 = %(status)s"
 
 #: cps/search.py:320
 msgid "Error on search for custom columns, please restart Calibre-Web"
-msgstr ""
+msgstr "カスタムカラムの検索でエラーが発生しました。Calibre-Webを再起動してください"
 
 #: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
 msgid "Advanced Search"
@@ -1069,9 +1064,8 @@ msgid "Invalid shelf specified"
 msgstr "指定された本棚は無効です"
 
 #: cps/shelf.py:55
-#, fuzzy
 msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "申し訳ありませんが、あなたは %(shelfname)s に本を追加することが許可されていません"
+msgstr "申し訳ありませんが、あなたはこの本棚に本を追加することが許可されていません"
 
 #: cps/shelf.py:64
 #, python-format
@@ -1085,7 +1079,7 @@ msgstr "本を %(sname)s に追加しました"
 
 #: cps/shelf.py:108
 msgid "You are not allowed to add a book to the shelf"
-msgstr ""
+msgstr "あなたはこの本棚に本を追加することが許可されていません"
 
 #: cps/shelf.py:126
 #, python-format
@@ -1109,16 +1103,15 @@ msgstr "本が %(sname)s から削除されました"
 
 #: cps/shelf.py:200
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
+msgstr "申し訳ありませんが、あなたはこの本棚から本を削除することが許可されていません"
 
 #: cps/shelf.py:210 cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "本棚を作成する"
 
 #: cps/shelf.py:218
-#, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
-msgstr "申し訳ありませんが、%(sname)s から本を削除することが許可されていません"
+msgstr "申し訳ありませんが、あなたはこの本棚を編集することが許可されていません"
 
 #: cps/shelf.py:220
 msgid "Edit a shelf"
@@ -1126,12 +1119,11 @@ msgstr "本棚を編集する"
 
 #: cps/shelf.py:229
 msgid "Error deleting Shelf"
-msgstr ""
+msgstr "本棚の削除中にエラーが発生しました"
 
 #: cps/shelf.py:231
-#, fuzzy
 msgid "Shelf successfully deleted"
-msgstr "メタデータを更新しました"
+msgstr "本棚を削除しました"
 
 #: cps/shelf.py:281
 #, python-format
@@ -1140,7 +1132,7 @@ msgstr "'%(name)s' 内の本の順番を変更する"
 
 #: cps/shelf.py:313
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
+msgstr "申し訳ありませんが、あなたはみんなの本棚を作成することが許可されていません"
 
 #: cps/shelf.py:330
 #, python-format
@@ -1159,12 +1151,12 @@ msgstr "エラーが発生しました"
 #: cps/shelf.py:369
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+msgstr "'%(title)s' という名前のみんなの本棚はすでに存在します。"
 
 #: cps/shelf.py:380
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+msgstr "'%(title)s' という名前の本棚はすでに存在します。"
 
 #: cps/shelf.py:462
 #, python-format
@@ -1198,11 +1190,11 @@ msgstr "終了"
 
 #: cps/tasks_status.py:72
 msgid "Ended"
-msgstr ""
+msgstr "終了"
 
 #: cps/tasks_status.py:74
 msgid "Cancelled"
-msgstr ""
+msgstr "キャンセル"
 
 #: cps/tasks_status.py:76
 msgid "Unknown Status"
@@ -1210,7 +1202,7 @@ msgstr "不明"
 
 #: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
 msgid "Unexpected data while reading update information"
-msgstr "アップデート情報を読み込み中に予期しないデータが見つかりました"
+msgstr "アップデート情報の読み込み中に予期しないデータが見つかりました"
 
 #: cps/updater.py:438 cps/updater.py:550
 msgid "No update available. You already have the latest version installed"
@@ -1226,7 +1218,7 @@ msgstr "アップデート情報を取得できません"
 
 #: cps/updater.py:484
 msgid "Click on the button below to update to the latest stable version."
-msgstr ""
+msgstr "下のボタンをクリックして最新の安定バージョンにアップデートしてください。"
 
 #: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
 #, python-format
@@ -1239,21 +1231,21 @@ msgstr "リリース情報がありません"
 
 #: cps/templates/index.html:6 cps/web.py:432
 msgid "Discover (Random Books)"
-msgstr "本を見つける (ランダムで表示)"
+msgstr "本を見つける (ランダムに表示)"
 
 #: cps/web.py:468
 msgid "Hot Books (Most Downloaded)"
-msgstr ""
+msgstr "人気の本 (最もダウンロードされた本)"
 
 #: cps/web.py:499
 #, python-format
 msgid "Downloaded books by %(user)s"
-msgstr ""
+msgstr "%(user)s がダウンロードした本"
 
 #: cps/web.py:532
 #, python-format
 msgid "Author: %(name)s"
-msgstr ""
+msgstr "作者: %(name)s"
 
 #: cps/web.py:568
 #, python-format
@@ -1267,17 +1259,17 @@ msgstr "シリーズ: %(serie)s"
 
 #: cps/web.py:609
 msgid "Rating: None"
-msgstr ""
+msgstr "評価: なし"
 
 #: cps/web.py:618
 #, python-format
 msgid "Rating: %(rating)s stars"
-msgstr ""
+msgstr "評価: 星%(rating)s"
 
 #: cps/web.py:636
 #, python-format
 msgid "File format: %(format)s"
-msgstr ""
+msgstr "ファイル形式: %(format)s"
 
 #: cps/web.py:673
 #, python-format
@@ -1291,15 +1283,15 @@ msgstr "言語: %(name)s"
 
 #: cps/templates/admin.html:16 cps/web.py:938
 msgid "Downloads"
-msgstr ""
+msgstr "ダウンロード数"
 
 #: cps/web.py:1030
 msgid "Ratings list"
-msgstr ""
+msgstr "評価一覧"
 
 #: cps/web.py:1057
 msgid "File formats list"
-msgstr ""
+msgstr "ファイル形式一覧"
 
 #: cps/web.py:1199
 #, python-format
@@ -1317,7 +1309,7 @@ msgstr "初めにKindleのメールアドレスを設定してください"
 
 #: cps/web.py:1222
 msgid "E-Mail server is not configured, please contact your administrator!"
-msgstr ""
+msgstr "メールサーバーが設定されていません。管理者に連絡してください"
 
 #: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
 #: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
@@ -1335,34 +1327,34 @@ msgstr "確認メールがこのメールアドレスに送信されました。
 
 #: cps/web.py:1275
 msgid "Cannot activate LDAP authentication"
-msgstr ""
+msgstr "LDAP認証を有効化できません"
 
 #: cps/web.py:1294
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
-msgstr ""
+msgstr "代わりに '%(nickname)s' としてログインします。LDAPサーバーにアクセスできないか、ユーザーが存在しません"
 
 #: cps/web.py:1300
 #, python-format
 msgid "Could not login: %(message)s"
-msgstr ""
+msgstr "ログインできません: %(message)s"
 
 #: cps/web.py:1304 cps/web.py:1329
 msgid "Wrong Username or Password"
-msgstr "ユーザ名またはパスワードが違います"
+msgstr "ユーザー名またはパスワードが違います"
 
 #: cps/web.py:1311
 msgid "New Password was send to your email address"
-msgstr ""
+msgstr "新しいパスワードがあなたのメールアドレスに送信されました"
 
 #: cps/web.py:1317
 msgid "Please enter valid username to reset password"
-msgstr ""
+msgstr "パスワードをリセットするには、有効なユーザー名を入力してください"
 
 #: cps/web.py:1324
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
-msgstr ""
+msgstr "'%(nickname)s' としてログインしました"
 
 #: cps/web.py:1388 cps/web.py:1437
 #, python-format
@@ -1375,31 +1367,31 @@ msgstr "プロフィールを更新しました"
 
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
-msgstr ""
+msgstr "OAuth情報を含んだ有効なgmail.jsonファイルが見つかりません"
 
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
-msgstr ""
+msgstr "Calibre ebook-convert %(tool)s が見つかりません"
 
 #: cps/tasks/convert.py:186
 #, python-format
 msgid "%(format)s format not found on disk"
-msgstr ""
+msgstr "%(format)s 形式は存在しません"
 
 #: cps/tasks/convert.py:190
 msgid "Ebook converter failed with unknown error"
-msgstr ""
+msgstr "Ebook converter が不明なエラーで失敗しました"
 
 #: cps/tasks/convert.py:202
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
-msgstr ""
+msgstr "Kepubify-converter が失敗しました: %(error)s"
 
 #: cps/tasks/convert.py:224
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
-msgstr ""
+msgstr "変換されたファイルが見つからないか、またはフォルダー %(folder)s 内に複数存在します"
 
 #: cps/tasks/convert.py:247
 #, python-format
@@ -1409,37 +1401,37 @@ msgstr "Ebook-converter が失敗しました: %(error)s"
 #: cps/tasks/convert.py:270
 #, python-format
 msgid "Calibre failed with error: %(error)s"
-msgstr ""
+msgstr "Calibre が失敗しました: %(error)s"
 
 #: cps/tasks/convert.py:275
 msgid "Convert"
-msgstr ""
+msgstr "変換"
 
 #: cps/tasks/database.py:28
 msgid "Reconnecting Calibre database"
-msgstr ""
+msgstr "Calibre DBと再接続中"
 
 #: cps/tasks/mail.py:265
 msgid "E-mail"
-msgstr ""
+msgstr "メール"
 
 #: cps/tasks/thumbnail.py:95
 #, python-format
 msgid "Generated %(count)s cover thumbnails"
-msgstr ""
+msgstr "表紙サムネイルを%(count)s個生成しました"
 
 #: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
 #: cps/tasks/thumbnail.py:503
 msgid "Cover Thumbnails"
-msgstr ""
+msgstr "表紙サムネイル"
 
 #: cps/tasks/thumbnail.py:281
 msgid "Generated {0} series thumbnails"
-msgstr ""
+msgstr "シリーズのサムネイルを{0}個生成しました"
 
 #: cps/tasks/thumbnail.py:446
 msgid "Clearing cover thumbnail cache"
-msgstr ""
+msgstr "表紙サムネイルのキャッシュを消去中"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
 #: cps/templates/layout.html:67 cps/templates/user_table.html:145
@@ -1448,23 +1440,22 @@ msgstr "アップロード"
 
 #: cps/templates/admin.html:9
 msgid "Users"
-msgstr ""
+msgstr "ユーザー"
 
 #: cps/templates/admin.html:13 cps/templates/login.html:9
 #: cps/templates/login.html:10 cps/templates/register.html:9
 #: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
 msgid "Username"
-msgstr "ユーザ名"
+msgstr "ユーザー名"
 
 #: cps/templates/admin.html:14 cps/templates/register.html:14
 #: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
 msgid "E-mail Address"
-msgstr ""
+msgstr "メールアドレス"
 
 #: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-#, fuzzy
 msgid "Send to E-Reader E-mail Address"
-msgstr "あなたのメールアドレス"
+msgstr "E-Readerメールアドレス"
 
 #: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
@@ -1484,7 +1475,7 @@ msgstr "ダウンロード"
 
 #: cps/templates/admin.html:23
 msgid "View Books"
-msgstr ""
+msgstr "閲覧"
 
 #: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
@@ -1500,27 +1491,27 @@ msgstr "削除"
 
 #: cps/templates/admin.html:26
 msgid "Public Shelf"
-msgstr ""
+msgstr "みんなの本棚"
 
 #: cps/templates/admin.html:53
 msgid "Add New User"
-msgstr ""
+msgstr "新規ユーザーを追加"
 
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
-msgstr ""
+msgstr "LDAPユーザーをインポート"
 
 #: cps/templates/admin.html:62
 msgid "E-mail Server Settings"
-msgstr ""
+msgstr "メールサーバー設定"
 
 #: cps/templates/admin.html:67 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
-msgstr ""
+msgstr "SMTPホスト名"
 
 #: cps/templates/admin.html:71 cps/templates/email_edit.html:35
 msgid "SMTP Port"
-msgstr ""
+msgstr "SMTPポート番号"
 
 #: cps/templates/admin.html:75 cps/templates/email_edit.html:39
 msgid "Encryption"
@@ -1528,20 +1519,20 @@ msgstr "暗号化"
 
 #: cps/templates/admin.html:79 cps/templates/email_edit.html:47
 msgid "SMTP Login"
-msgstr ""
+msgstr "SMTPログイン"
 
 #: cps/templates/admin.html:83 cps/templates/admin.html:94
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
-msgstr ""
+msgstr "Fromメールアドレス"
 
 #: cps/templates/admin.html:90
 msgid "E-Mail Service"
-msgstr ""
+msgstr "メールサービス"
 
 #: cps/templates/admin.html:91
 msgid "Gmail via Oauth2"
-msgstr ""
+msgstr "OAuth2経由のGmail"
 
 #: cps/templates/admin.html:106
 msgid "Configuration"
@@ -1549,7 +1540,7 @@ msgstr "設定"
 
 #: cps/templates/admin.html:109
 msgid "Calibre Database Directory"
-msgstr ""
+msgstr "Calibre DBのディレクトリ"
 
 #: cps/templates/admin.html:113 cps/templates/config_edit.html:68
 msgid "Log Level"
@@ -1561,76 +1552,75 @@ msgstr "ポート番号"
 
 #: cps/templates/admin.html:122
 msgid "External Port"
-msgstr ""
+msgstr "外部ポート"
 
 #: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
-msgstr ""
+msgstr "1ページに表示する冊数"
 
 #: cps/templates/admin.html:133
 msgid "Uploads"
-msgstr ""
+msgstr "アップロード"
 
 #: cps/templates/admin.html:137
 msgid "Anonymous Browsing"
-msgstr ""
+msgstr "匿名での閲覧"
 
 #: cps/templates/admin.html:141
 msgid "Public Registration"
-msgstr ""
+msgstr "誰でも登録可能"
 
 #: cps/templates/admin.html:145
 msgid "Magic Link Remote Login"
-msgstr ""
+msgstr "マジックリンクによるリモートログイン"
 
 #: cps/templates/admin.html:149
 msgid "Reverse Proxy Login"
-msgstr ""
+msgstr "リバースプロキシによるログイン"
 
 #: cps/templates/admin.html:154 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
-msgstr ""
+msgstr "リバースプロキシのヘッダー名"
 
 #: cps/templates/admin.html:159
-#, fuzzy
 msgid "Edit Calibre Database Configuration"
-msgstr "Calibre-Web の設定を更新しました"
+msgstr "Calibre DBの設定を編集"
 
 #: cps/templates/admin.html:160
 msgid "Edit Basic Configuration"
-msgstr ""
+msgstr "基本設定を編集"
 
 #: cps/templates/admin.html:161
 msgid "Edit UI Configuration"
-msgstr ""
+msgstr "UI設定を編集"
 
 #: cps/templates/admin.html:167
 msgid "Scheduled Tasks"
-msgstr ""
+msgstr "スケジュールタスク"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
 msgid "Time at which tasks start to run"
-msgstr ""
+msgstr "タスクを開始する時間"
 
 #: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
 msgid "Maximum tasks duration"
-msgstr ""
+msgstr "最大タスク継続時間"
 
 #: cps/templates/admin.html:178
 msgid "Generate book cover thumbnails"
-msgstr ""
+msgstr "本の表紙サムネイルを生成"
 
 #: cps/templates/admin.html:182
 msgid "Generate series cover thumbnails"
-msgstr ""
+msgstr "シリーズの表紙サムネイルを生成"
 
 #: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
 msgid "Reconnect to Calibre Library"
-msgstr ""
+msgstr "Calibreライブラリに再接続"
 
 #: cps/templates/admin.html:193
 msgid "Refresh Thumbnail Cover Cache"
-msgstr ""
+msgstr "表紙サムネイルのキャッシュを更新"
 
 #: cps/templates/admin.html:199
 msgid "Administration"
@@ -1638,27 +1628,27 @@ msgstr "管理"
 
 #: cps/templates/admin.html:200
 msgid "Download Debug Package"
-msgstr ""
+msgstr "デバッグパッケージをダウンロード"
 
 #: cps/templates/admin.html:201
 msgid "View Logs"
-msgstr ""
+msgstr "ログを表示"
 
 #: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
-msgstr ""
+msgstr "Calibre DBに再接続"
 
 #: cps/templates/admin.html:207
 msgid "Restart"
-msgstr ""
+msgstr "再起動"
 
 #: cps/templates/admin.html:208
 msgid "Shutdown"
-msgstr ""
+msgstr "シャットダウン"
 
 #: cps/templates/admin.html:213
 msgid "Version Information"
-msgstr ""
+msgstr "バージョン情報"
 
 #: cps/templates/admin.html:217
 msgid "Version"
@@ -1674,20 +1664,20 @@ msgstr "現在のバージョン"
 
 #: cps/templates/admin.html:231
 msgid "Check for Update"
-msgstr ""
+msgstr "アップデートを確認"
 
 #: cps/templates/admin.html:232
 msgid "Perform Update"
-msgstr "更新を実行"
+msgstr "アップデートを実行"
 
 #: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
-msgstr ""
+msgstr "再起動してもよろしいですか？"
 
 #: cps/templates/admin.html:250 cps/templates/admin.html:264
 #: cps/templates/admin.html:284 cps/templates/config_db.html:70
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: cps/templates/admin.html:251 cps/templates/admin.html:265
 #: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
@@ -1698,15 +1688,15 @@ msgstr ""
 #: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
-msgstr ""
+msgstr "シャットダウンしてもよろしいですか？"
 
 #: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
-msgstr ""
+msgstr "アップデート中です。このページをリロードしないでください"
 
 #: cps/templates/author.html:15
 msgid "via"
@@ -1719,32 +1709,32 @@ msgstr "ライブラリ内"
 #: cps/templates/author.html:26 cps/templates/index.html:74
 #: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, newest first"
-msgstr ""
+msgstr "追加日が新しい順にソート"
 
 #: cps/templates/author.html:27 cps/templates/index.html:75
 #: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort according to book date, oldest first"
-msgstr ""
+msgstr "追加日が古い順にソート"
 
 #: cps/templates/author.html:28 cps/templates/index.html:76
 #: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in alphabetical order"
-msgstr ""
+msgstr "五十音順にソート"
 
 #: cps/templates/author.html:29 cps/templates/index.html:77
 #: cps/templates/search.html:34 cps/templates/shelf.html:23
 msgid "Sort title in reverse alphabetical order"
-msgstr ""
+msgstr "逆五十音順にソート"
 
 #: cps/templates/author.html:30 cps/templates/index.html:80
 #: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, newest first"
-msgstr ""
+msgstr "発売日が新しい順にソート"
 
 #: cps/templates/author.html:31 cps/templates/index.html:81
 #: cps/templates/search.html:38 cps/templates/shelf.html:27
 msgid "Sort according to publishing date, oldest first"
-msgstr ""
+msgstr "発売日が古い順にソート"
 
 #: cps/templates/author.html:56 cps/templates/author.html:115
 #: cps/templates/index.html:30 cps/templates/index.html:113
@@ -1754,7 +1744,7 @@ msgstr "減らす"
 
 #: cps/templates/author.html:99
 msgid "More by"
-msgstr ""
+msgstr "同じ作者が書いた本: "
 
 #: cps/templates/book_edit.html:11
 msgid "Delete Book"
@@ -1774,7 +1764,7 @@ msgstr "変換元:"
 
 #: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
-msgstr "選択肢を選ぶ"
+msgstr "選択肢から選ぶ"
 
 #: cps/templates/book_edit.html:37
 msgid "Convert to:"
@@ -1791,7 +1781,7 @@ msgstr "本のタイトル"
 #: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
 #: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
-msgstr "著者"
+msgstr "作者"
 
 #: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
 #: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
@@ -1800,24 +1790,24 @@ msgstr "詳細"
 
 #: cps/templates/book_edit.html:73
 msgid "Identifiers"
-msgstr ""
+msgstr "識別子"
 
 #: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
 msgid "Identifier Type"
-msgstr ""
+msgstr "識別子タイプ"
 
 #: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
 msgid "Identifier Value"
-msgstr ""
+msgstr "識別子の値"
 
 #: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
 #: cps/templates/user_table.html:24
 msgid "Remove"
-msgstr ""
+msgstr "削除"
 
 #: cps/templates/book_edit.html:83
 msgid "Add Identifier"
-msgstr ""
+msgstr "識別子を追加"
 
 #: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
@@ -1825,7 +1815,7 @@ msgstr "タグ"
 
 #: cps/templates/book_edit.html:95
 msgid "Series ID"
-msgstr ""
+msgstr "シリーズID"
 
 #: cps/templates/book_edit.html:99
 msgid "Rating"
@@ -1833,15 +1823,15 @@ msgstr "評価"
 
 #: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
-msgstr ""
+msgstr "表紙をURLから取得 (JPEG画像がダウンロードされDBに保存されます)"
 
 #: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
-msgstr ""
+msgstr "表紙をアップロード"
 
 #: cps/templates/book_edit.html:113
 msgid "Published Date"
-msgstr ""
+msgstr "発売日"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
@@ -1857,24 +1847,24 @@ msgstr "言語"
 #: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
 #: cps/templates/search_form.html:164
 msgid "Yes"
-msgstr "はい"
+msgstr "既読"
 
 #: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
 #: cps/templates/search_form.html:165
 msgid "No"
-msgstr "いいえ"
+msgstr "未読"
 
 #: cps/templates/book_edit.html:201
 msgid "Upload Format"
-msgstr ""
+msgstr "アップロード形式"
 
 #: cps/templates/book_edit.html:209
 msgid "View Book on Save"
-msgstr ""
+msgstr "保存後に本を表示"
 
 #: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
-msgstr ""
+msgstr "メタデータを取得"
 
 #: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
@@ -1882,16 +1872,15 @@ msgstr ""
 #: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
 #: cps/templates/user_edit.html:142
 msgid "Save"
-msgstr ""
+msgstr "保存"
 
 #: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "キーワード"
 
 #: cps/templates/book_edit.html:234
-#, fuzzy
 msgid "Search keyword"
-msgstr "キーワードを検索"
+msgstr "キーワード検索"
 
 #: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
@@ -1923,31 +1912,31 @@ msgstr "検索結果が見つかりません。別のキーワードで検索し
 #: cps/templates/user_table.html:14 cps/templates/user_table.html:77
 #: cps/templates/user_table.html:100
 msgid "This Field is Required"
-msgstr ""
+msgstr "この項目は必須です"
 
 #: cps/templates/book_table.html:37
 msgid "Merge selected books"
-msgstr ""
+msgstr "選択した本を統合"
 
 #: cps/templates/book_table.html:38 cps/templates/user_table.html:124
 msgid "Remove Selections"
-msgstr ""
+msgstr "選択した本を削除"
 
 #: cps/templates/book_table.html:41
 msgid "Exchange author and title"
-msgstr ""
+msgstr "作者とタイトルを交換"
 
 #: cps/templates/book_table.html:47
 msgid "Update Title Sort automatically"
-msgstr ""
+msgstr "タイトルのよみがなを自動で更新"
 
 #: cps/templates/book_table.html:51
 msgid "Update Author Sort automatically"
-msgstr ""
+msgstr "作者のよみがなを自動で更新"
 
 #: cps/templates/book_table.html:63 cps/templates/book_table.html:69
 msgid "Enter Title"
-msgstr ""
+msgstr "タイトルを入力"
 
 #: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
 #: cps/templates/shelf_edit.html:8
@@ -1956,72 +1945,70 @@ msgstr "タイトル"
 
 #: cps/templates/book_table.html:64
 msgid "Enter Title Sort"
-msgstr ""
+msgstr "タイトルのよみがなを入力"
 
 #: cps/templates/book_table.html:64
 msgid "Title Sort"
-msgstr ""
+msgstr "タイトルのよみがな"
 
 #: cps/templates/book_table.html:65
 msgid "Enter Author Sort"
-msgstr ""
+msgstr "作者名のよみがなを入力"
 
 #: cps/templates/book_table.html:65
 msgid "Author Sort"
-msgstr ""
+msgstr "作者名のよみがな"
 
 #: cps/templates/book_table.html:66
 msgid "Enter Authors"
-msgstr ""
+msgstr "作者名を入力"
 
 #: cps/templates/book_table.html:67
 msgid "Enter Categories"
-msgstr ""
+msgstr "カテゴリ名を入力"
 
 #: cps/templates/book_table.html:68
 msgid "Enter Series"
-msgstr ""
+msgstr "シリーズ名を入力"
 
 #: cps/templates/book_table.html:69
 msgid "Series Index"
-msgstr ""
+msgstr "巻数"
 
 #: cps/templates/book_table.html:70
 msgid "Enter Languages"
-msgstr ""
+msgstr "言語を入力"
 
 #: cps/templates/book_table.html:71
 msgid "Publishing Date"
-msgstr ""
+msgstr "発売日"
 
 #: cps/templates/book_table.html:72
 msgid "Enter Publishers"
-msgstr ""
+msgstr "出版社を入力"
 
 #: cps/templates/book_table.html:73
-#, fuzzy
 msgid "Enter comments"
-msgstr "ドメイン名を入力"
+msgstr "コメントを入力"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
-msgstr ""
+msgstr "コメント"
 
 #: cps/templates/book_table.html:75
 msgid "Archiv Status"
-msgstr ""
+msgstr "アーカイブ状況"
 
 #: cps/templates/book_table.html:77 cps/templates/search_form.html:42
 msgid "Read Status"
-msgstr ""
+msgstr "既読/未読"
 
 #: cps/templates/book_table.html:80 cps/templates/book_table.html:82
 #: cps/templates/book_table.html:84 cps/templates/book_table.html:86
 #: cps/templates/book_table.html:90 cps/templates/book_table.html:92
 #: cps/templates/book_table.html:96
-#, fuzzy
 msgid "Enter "
-msgstr "登録"
+msgstr "入力: "
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
 #: cps/templates/tasks.html:36
@@ -2030,19 +2017,19 @@ msgstr "よろしいですか?"
 
 #: cps/templates/book_table.html:117
 msgid "Books with Title will be merged from:"
-msgstr ""
+msgstr "このタイトルの本から"
 
 #: cps/templates/book_table.html:121
 msgid "Into Book with Title:"
-msgstr ""
+msgstr "このタイトルの本に統合します"
 
 #: cps/templates/book_table.html:126
 msgid "Merge"
-msgstr ""
+msgstr "統合"
 
 #: cps/templates/config_db.html:12
 msgid "Location of Calibre Database"
-msgstr ""
+msgstr "Calibre DBの場所"
 
 #: cps/templates/config_db.html:22
 msgid "Use Google Drive?"
@@ -2058,7 +2045,7 @@ msgstr "Googleドライブ上のCalibreフォルダ"
 
 #: cps/templates/config_db.html:40
 msgid "Metadata Watch Channel ID"
-msgstr ""
+msgstr "メタデータ監視用チャンネルID"
 
 #: cps/templates/config_db.html:43
 msgid "Revoke"
@@ -2066,27 +2053,27 @@ msgstr "取り消す"
 
 #: cps/templates/config_db.html:68
 msgid "New db location is invalid, please enter valid path"
-msgstr ""
+msgstr "入力したDBの場所が無効です。有効なパスを入力してください"
 
 #: cps/templates/config_edit.html:18
 msgid "Server Configuration"
-msgstr "サーバ設定"
+msgstr "サーバー設定"
 
 #: cps/templates/config_edit.html:25
 msgid "Server Port"
-msgstr "ポート"
+msgstr "ポート番号"
 
 #: cps/templates/config_edit.html:28
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL証明書の場所 (非SSLサーバでは空欄にしてください)"
+msgstr "SSL証明書の場所 (非SSLサーバーでは空欄にしてください)"
 
 #: cps/templates/config_edit.html:35
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL鍵ファイルの場所 (非SSLサーバでは空欄にしてください)"
+msgstr "SSL鍵ファイルの場所 (非SSLサーバーでは空欄にしてください)"
 
 #: cps/templates/config_edit.html:43
 msgid "Update Channel"
-msgstr ""
+msgstr "アップデートチャンネル"
 
 #: cps/templates/config_edit.html:45
 msgid "Stable"
@@ -2098,11 +2085,11 @@ msgstr "最新"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr ""
+msgstr "信頼するホスト名 (カンマ区切り)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
-msgstr "ログファイルの設定"
+msgstr "ログファイル設定"
 
 #: cps/templates/config_edit.html:77
 msgid "Location and name of logfile (calibre-web.log for no entry)"
@@ -2110,11 +2097,11 @@ msgstr "ログファイル名 (空欄の場合はcalibre-web.log)"
 
 #: cps/templates/config_edit.html:82
 msgid "Enable Access Log"
-msgstr ""
+msgstr "アクセスログを保存する"
 
 #: cps/templates/config_edit.html:85
 msgid "Location and name of access logfile (access.log for no entry)"
-msgstr ""
+msgstr "アクセスログのファイル名 (空欄の場合はaccess.log)"
 
 #: cps/templates/config_edit.html:96
 msgid "Feature Configuration"
@@ -2122,55 +2109,55 @@ msgstr "機能設定"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr ""
+msgstr "ダウンロード時にタイトルと作者名の中にある2バイト文字を変換する"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
-msgstr ""
+msgstr "アップロード機能を有効にする"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr ""
+msgstr "(ユーザーにアップロード権限を与えることも忘れないでください)"
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
-msgstr ""
+msgstr "アップロードを許可するファイル形式"
 
 #: cps/templates/config_edit.html:118
 msgid "Enable Anonymous Browsing"
-msgstr ""
+msgstr "匿名での閲覧を許可"
 
 #: cps/templates/config_edit.html:122
 msgid "Enable Public Registration"
-msgstr ""
+msgstr "誰でも登録可能にする"
 
 #: cps/templates/config_edit.html:127
 msgid "Use E-Mail as Username"
-msgstr ""
+msgstr "メールアドレスをユーザー名として使う"
 
 #: cps/templates/config_edit.html:132
 msgid "Enable Magic Link Remote Login"
-msgstr ""
+msgstr "マジックリンクによるリモートログインを有効にする"
 
 #: cps/templates/config_edit.html:137
 msgid "Enable Kobo sync"
-msgstr ""
+msgstr "Koboの同期を有効にする"
 
 #: cps/templates/config_edit.html:142
 msgid "Proxy unknown requests to Kobo Store"
-msgstr ""
+msgstr "Koboストアへの不明なリクエストをプロキシ"
 
 #: cps/templates/config_edit.html:145
 msgid "Server External Port (for port forwarded API calls)"
-msgstr ""
+msgstr "サーバーの外部ポート番号 (APIの呼び出しをポートフォワーディングするため)"
 
 #: cps/templates/config_edit.html:153
 msgid "Use Goodreads"
-msgstr ""
+msgstr "Goodreadsを利用"
 
 #: cps/templates/config_edit.html:154
 msgid "Create an API Key"
-msgstr ""
+msgstr "APIキーを作成"
 
 #: cps/templates/config_edit.html:158
 msgid "Goodreads API Key"
@@ -2182,138 +2169,138 @@ msgstr "GoodreadsのAPIシークレット"
 
 #: cps/templates/config_edit.html:169
 msgid "Allow Reverse Proxy Authentication"
-msgstr ""
+msgstr "リバースプロキシの認証を許可"
 
 #: cps/templates/config_edit.html:180
 msgid "Login type"
-msgstr ""
+msgstr "ログインの種類"
 
 #: cps/templates/config_edit.html:182
 msgid "Use Standard Authentication"
-msgstr ""
+msgstr "通常の認証を利用"
 
 #: cps/templates/config_edit.html:184
 msgid "Use LDAP Authentication"
-msgstr ""
+msgstr "LDAP認証を利用"
 
 #: cps/templates/config_edit.html:187
 msgid "Use OAuth"
-msgstr ""
+msgstr "OAuthを利用"
 
 #: cps/templates/config_edit.html:194
 msgid "LDAP Server Host Name or IP Address"
-msgstr ""
+msgstr "LDAPサーバーのホスト名またはIPアドレス"
 
 #: cps/templates/config_edit.html:198
 msgid "LDAP Server Port"
-msgstr ""
+msgstr "LDAPサーバーのポート番号"
 
 #: cps/templates/config_edit.html:202
 msgid "LDAP Encryption"
-msgstr ""
+msgstr "LDAPの暗号化方式"
 
 #: cps/templates/config_edit.html:205
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #: cps/templates/config_edit.html:206
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: cps/templates/config_edit.html:210
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
-msgstr ""
+msgstr "LDAPのCA証明書のパス (クライアント証明書による認証の場合のみ必要)"
 
 #: cps/templates/config_edit.html:217
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
-msgstr ""
+msgstr "LDAP証明書のパス (クライアント証明書による認証の場合のみ必要)"
 
 #: cps/templates/config_edit.html:224
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
-msgstr ""
+msgstr "LDAPのキーファイルのパス (クライアント証明書による認証の場合のみ必要)"
 
 #: cps/templates/config_edit.html:233
 msgid "LDAP Authentication"
-msgstr ""
+msgstr "LDAP認証"
 
 #: cps/templates/config_edit.html:235
 msgid "Anonymous"
-msgstr ""
+msgstr "匿名"
 
 #: cps/templates/config_edit.html:236
 msgid "Unauthenticated"
-msgstr ""
+msgstr "認証失敗"
 
 #: cps/templates/config_edit.html:237
 msgid "Simple"
-msgstr ""
+msgstr "簡単"
 
 #: cps/templates/config_edit.html:242
 msgid "LDAP Administrator Username"
-msgstr ""
+msgstr "LDAP管理者のユーザー名"
 
 #: cps/templates/config_edit.html:248
 msgid "LDAP Administrator Password"
-msgstr ""
+msgstr "LDAP管理者のパスワード"
 
 #: cps/templates/config_edit.html:253
 msgid "LDAP Distinguished Name (DN)"
-msgstr ""
+msgstr "LDAPの識別名 (DN)"
 
 #: cps/templates/config_edit.html:257
 msgid "LDAP User Object Filter"
-msgstr ""
+msgstr "LDAPユーザーフィルタ"
 
 #: cps/templates/config_edit.html:262
 msgid "LDAP Server is OpenLDAP?"
-msgstr ""
+msgstr "LDAPサーバーはOpenLDAPですか？"
 
 #: cps/templates/config_edit.html:264
 msgid "Following Settings are Needed For User Import"
-msgstr ""
+msgstr "以下の設定はユーザーのインポートのために必要です"
 
 #: cps/templates/config_edit.html:266
 msgid "LDAP Group Object Filter"
-msgstr ""
+msgstr "LDAPグループフィルタ"
 
 #: cps/templates/config_edit.html:270
 msgid "LDAP Group Name"
-msgstr ""
+msgstr "LDAPグループ名"
 
 #: cps/templates/config_edit.html:274
 msgid "LDAP Group Members Field"
-msgstr ""
+msgstr "LDAPグループメンバーフィールド"
 
 #: cps/templates/config_edit.html:278
 msgid "LDAP Member User Filter Detection"
-msgstr ""
+msgstr "LDAPメンバーユーザーフィルタ検出"
 
 #: cps/templates/config_edit.html:280
 msgid "Autodetect"
-msgstr ""
+msgstr "自動検出"
 
 #: cps/templates/config_edit.html:281
 msgid "Custom Filter"
-msgstr ""
+msgstr "カスタムフィルタ"
 
 #: cps/templates/config_edit.html:286
 msgid "LDAP Member User Filter"
-msgstr ""
+msgstr "LDAPメンバーユーザーフィルタ"
 
 #: cps/templates/config_edit.html:297
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
-msgstr ""
+msgstr "%(provider)s OAuth 認証情報を入手"
 
 #: cps/templates/config_edit.html:300
 #, python-format
 msgid "%(provider)s OAuth Client Id"
-msgstr ""
+msgstr "%(provider)s OAuth クライアントID"
 
 #: cps/templates/config_edit.html:304
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
-msgstr ""
+msgstr "%(provider)s OAuth クライアントシークレット"
 
 #: cps/templates/config_edit.html:320
 msgid "External binaries"
@@ -2321,15 +2308,15 @@ msgstr "外部バイナリ"
 
 #: cps/templates/config_edit.html:326
 msgid "Path to Calibre E-Book Converter"
-msgstr ""
+msgstr "Calibre E-Book Converterのパス"
 
 #: cps/templates/config_edit.html:334
 msgid "Calibre E-Book Converter Settings"
-msgstr ""
+msgstr "Calibre E-Book Converterの設定"
 
 #: cps/templates/config_edit.html:337
 msgid "Path to Kepubify E-Book Converter"
-msgstr ""
+msgstr "Kepubify E-Book Converterのパス"
 
 #: cps/templates/config_edit.html:345
 msgid "Location of Unrar binary"
@@ -2341,11 +2328,11 @@ msgstr "表示設定"
 
 #: cps/templates/config_view_edit.html:32
 msgid "No. of Random Books to Display"
-msgstr ""
+msgstr "ランダムに表示する本の冊数"
 
 #: cps/templates/config_view_edit.html:36
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
-msgstr ""
+msgstr "非表示にする前に表示する作者数 (0=非表示にしない)"
 
 #: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
 msgid "Theme"
@@ -2361,27 +2348,27 @@ msgstr "caliBlur! ダークテーマ"
 
 #: cps/templates/config_view_edit.html:47
 msgid "Regular Expression for Ignoring Columns"
-msgstr ""
+msgstr "無視するカラムの正規表現"
 
 #: cps/templates/config_view_edit.html:51
 msgid "Link Read/Unread Status to Calibre Column"
-msgstr ""
+msgstr "既読/未読をリンクするCalibreのカラム"
 
 #: cps/templates/config_view_edit.html:60
 msgid "View Restrictions based on Calibre column"
-msgstr ""
+msgstr "表示制限をリンクするCalibreのカラム"
 
 #: cps/templates/config_view_edit.html:69
 msgid "Regular Expression for Title Sorting"
-msgstr ""
+msgstr "タイトルをソートするための正規表現"
 
 #: cps/templates/config_view_edit.html:80
 msgid "Default Settings for New Users"
-msgstr ""
+msgstr "新規ユーザーのデフォルト設定"
 
 #: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
-msgstr ""
+msgstr "管理者ユーザー"
 
 #: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
@@ -2389,7 +2376,7 @@ msgstr "ダウンロードを許可"
 
 #: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
-msgstr ""
+msgstr "本のビューアを許可"
 
 #: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
@@ -2401,7 +2388,7 @@ msgstr "編集を許可"
 
 #: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
-msgstr ""
+msgstr "本の削除を許可"
 
 #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
@@ -2412,47 +2399,46 @@ msgid "Allow Editing Public Shelves"
 msgstr "みんなの本棚の編集を許可"
 
 #: cps/templates/config_view_edit.html:123
-#, fuzzy
 msgid "Default Language"
-msgstr "言語を除外"
+msgstr "言語設定のデフォルト"
 
 #: cps/templates/config_view_edit.html:131
 msgid "Default Visible Language of Books"
-msgstr ""
+msgstr "表示する本の言語設定のデフォルト"
 
 #: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
-msgstr ""
+msgstr "新規ユーザーのデフォルト表示設定"
 
 #: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
-msgstr ""
+msgstr "詳細画面でランダムに本を表示"
 
 #: cps/templates/config_view_edit.html:166 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
-msgstr ""
+msgstr "許可/拒否タグを追加"
 
 #: cps/templates/config_view_edit.html:167
 msgid "Add Allowed/Denied custom column values"
-msgstr ""
+msgstr "許可/拒否カスタムカラムを追加"
 
 #: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
-msgstr ""
+msgstr "ブラウザで読む"
 
 #: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
-msgstr ""
+msgstr "ブラウザで聞く"
 
 #: cps/templates/detail.html:125
 #, python-format
 msgid "Book %(index)s of %(range)s"
-msgstr ""
+msgstr "%(range)s 第%(index)s巻"
 
 #: cps/templates/detail.html:174
 msgid "Published"
-msgstr ""
+msgstr "発売日"
 
 #: cps/templates/detail.html:222
 msgid "Mark As Unread"
@@ -2464,19 +2450,19 @@ msgstr "既読に設定"
 
 #: cps/templates/detail.html:223
 msgid "Read"
-msgstr "読んだ"
+msgstr "既読"
 
 #: cps/templates/detail.html:232
 msgid "Restore from archive"
-msgstr ""
+msgstr "アーカイブから復元"
 
 #: cps/templates/detail.html:232
 msgid "Add to archive"
-msgstr ""
+msgstr "アーカイブに追加"
 
 #: cps/templates/detail.html:233
 msgid "Archived"
-msgstr ""
+msgstr "アーカイブ済み"
 
 #: cps/templates/detail.html:244
 msgid "Description:"
@@ -2490,31 +2476,31 @@ msgstr "本棚に追加"
 #: cps/templates/feed.xml:79 cps/templates/layout.html:138
 #: cps/templates/search.html:22
 msgid "(Public)"
-msgstr ""
+msgstr "(公開)"
 
 #: cps/templates/detail.html:299
 msgid "Edit Metadata"
-msgstr ""
+msgstr "メタデータを編集"
 
 #: cps/templates/email_edit.html:13
 msgid "Choose Server Type"
-msgstr ""
+msgstr "サーバーの種類を選択"
 
 #: cps/templates/email_edit.html:15
 msgid "Use Standard E-Mail Account"
-msgstr ""
+msgstr "標準のメールアカウントを使用"
 
 #: cps/templates/email_edit.html:16
 msgid "Gmail Account with OAuth2 Verification"
-msgstr ""
+msgstr "OAuth2認証を用いたGmailアカウント"
 
 #: cps/templates/email_edit.html:22
 msgid "Setup Gmail Account as E-Mail Server"
-msgstr ""
+msgstr "Gmailアカウントをメールサーバーとして設定"
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
-msgstr ""
+msgstr "Gmailへのアクセスを失効"
 
 #: cps/templates/email_edit.html:42
 msgid "STARTTLS"
@@ -2526,15 +2512,15 @@ msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:51
 msgid "SMTP Password"
-msgstr ""
+msgstr "SMTPのパスワード"
 
 #: cps/templates/email_edit.html:58
 msgid "Attachment Size Limit"
-msgstr ""
+msgstr "添付ファイルのサイズ制限"
 
 #: cps/templates/email_edit.html:66
 msgid "Save and Send Test E-mail"
-msgstr ""
+msgstr "保存してテストメールを送信"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:30
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
@@ -2543,7 +2529,7 @@ msgstr "戻る"
 
 #: cps/templates/email_edit.html:74
 msgid "Allowed Domains (Whitelist)"
-msgstr ""
+msgstr "許可するドメイン名 (ホワイトリスト)"
 
 #: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
 msgid "Add Domain"
@@ -2560,7 +2546,7 @@ msgstr "ドメイン名を入力"
 
 #: cps/templates/email_edit.html:92
 msgid "Denied Domains (Blacklist)"
-msgstr ""
+msgstr "拒否するドメイン名 (ブラックリスト)"
 
 #: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
@@ -2568,57 +2554,57 @@ msgstr "次"
 
 #: cps/templates/generate_kobo_auth_url.html:6
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr ""
+msgstr ".kobo/Kobo eReader.confファイルをテキストエディタで開いて追加(編集)してください:"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
-msgstr ""
+msgstr "Koboトークン:"
 
 #: cps/templates/grid.html:21
 msgid "List"
-msgstr ""
+msgstr "一覧"
 
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
-msgstr ""
+msgstr "Calibre-Webインスタンスが未設定です。管理者に連絡してください"
 
 #: cps/templates/http_error.html:41
 msgid "Create Issue"
-msgstr ""
+msgstr "Issueを作成"
 
 #: cps/templates/http_error.html:48
 msgid "Return to Home"
-msgstr ""
+msgstr "ホームに戻る"
 
 #: cps/templates/http_error.html:50
 msgid "Logout User"
-msgstr ""
+msgstr "ユーザーをログアウト"
 
 #: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
-msgstr ""
+msgstr "ダウンロード数が少ない順にソート"
 
 #: cps/templates/index.html:72
 msgid "Sort descending according to download count"
-msgstr ""
+msgstr "ダウンロード数が多い順にソート"
 
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
-msgstr ""
+msgstr "作者名を五十音順にソート"
 
 #: cps/templates/index.html:79 cps/templates/search.html:36
 #: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
-msgstr ""
+msgstr "作者名を逆五十音順にソート"
 
 #: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
-msgstr ""
+msgstr "巻数が小さい順にソート"
 
 #: cps/templates/index.html:84
 msgid "Sort descending according to series index"
-msgstr ""
+msgstr "巻数が大きい順にソート"
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2626,11 +2612,11 @@ msgstr "開始"
 
 #: cps/templates/index.xml:18
 msgid "Alphabetical Books"
-msgstr ""
+msgstr "五十音順の本"
 
 #: cps/templates/index.xml:22
 msgid "Books sorted alphabetically"
-msgstr ""
+msgstr "五十音順にソートされた本"
 
 #: cps/templates/index.xml:29
 msgid "Popular publications from this catalog based on Downloads."
@@ -2642,7 +2628,7 @@ msgstr "評価に基づいた、この出版社が出している有名な本"
 
 #: cps/templates/index.xml:39
 msgid "Recently added Books"
-msgstr ""
+msgstr "最近追加された本"
 
 #: cps/templates/index.xml:43
 msgid "The latest Books"
@@ -2654,7 +2640,7 @@ msgstr "ランダム"
 
 #: cps/templates/index.xml:73
 msgid "Books ordered by Author"
-msgstr "著者名順"
+msgstr "作者名順"
 
 #: cps/templates/index.xml:80
 msgid "Books ordered by publisher"
@@ -2670,24 +2656,24 @@ msgstr "シリーズ順"
 
 #: cps/templates/index.xml:101
 msgid "Books ordered by Languages"
-msgstr ""
+msgstr "言語順"
 
 #: cps/templates/index.xml:108
 msgid "Books ordered by Rating"
-msgstr ""
+msgstr "評価順"
 
 #: cps/templates/index.xml:116
 msgid "Books ordered by file formats"
-msgstr ""
+msgstr "ファイル形式順"
 
 #: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
-msgstr ""
+msgstr "本棚"
 
 #: cps/templates/index.xml:123
 msgid "Books organized in shelves"
-msgstr ""
+msgstr "本棚に整理された本"
 
 #: cps/templates/layout.html:30
 msgid "Home"
@@ -2695,11 +2681,11 @@ msgstr "ホーム"
 
 #: cps/templates/layout.html:36
 msgid "Toggle Navigation"
-msgstr ""
+msgstr "ナビゲーションを実行"
 
 #: cps/templates/layout.html:47
 msgid "Search Library"
-msgstr ""
+msgstr "ライブラリ内を検索"
 
 #: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
@@ -2728,7 +2714,7 @@ msgstr "ログアウト"
 
 #: cps/templates/layout.html:119
 msgid "Please do not refresh the page"
-msgstr ""
+msgstr "ページを更新しないでください"
 
 #: cps/templates/layout.html:129
 msgid "Browse"
@@ -2748,75 +2734,75 @@ msgstr "本の詳細"
 
 #: cps/templates/list.html:22
 msgid "Grid"
-msgstr ""
+msgstr "表"
 
 #: cps/templates/login.html:18
 msgid "Remember Me"
-msgstr ""
+msgstr "アカウント情報を記憶する"
 
 #: cps/templates/login.html:23
 msgid "Forgot Password?"
-msgstr ""
+msgstr "パスワードを忘れた場合"
 
 #: cps/templates/login.html:26
 msgid "Log in with Magic Link"
-msgstr ""
+msgstr "マジックリンクでログイン"
 
 #: cps/templates/logviewer.html:6
 msgid "Show Calibre-Web Log: "
-msgstr ""
+msgstr "Calibre-Webのログを表示: "
 
 #: cps/templates/logviewer.html:8
 msgid "Calibre-Web Log: "
-msgstr ""
+msgstr "Calibre-Webのログ: "
 
 #: cps/templates/logviewer.html:8
 msgid "Stream output, can't be displayed"
-msgstr ""
+msgstr "ストリームの出力を表示できません"
 
 #: cps/templates/logviewer.html:12
 msgid "Show Access Log: "
-msgstr ""
+msgstr "アクセスログを表示: "
 
 #: cps/templates/logviewer.html:18
 msgid "Download Calibre-Web Log"
-msgstr ""
+msgstr "Calibre-Webのログをダウンロード"
 
 #: cps/templates/logviewer.html:21
 msgid "Download Access Log"
-msgstr ""
+msgstr "アクセスログをダウンロード"
 
 #: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
-msgstr ""
+msgstr "許可/拒否タグを選択"
 
 #: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
-msgstr ""
+msgstr "許可/拒否カスタムカラムを選択"
 
 #: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
-msgstr ""
+msgstr "ユーザーの許可/拒否タグを選択"
 
 #: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
-msgstr ""
+msgstr "ユーザーの許可/拒否カスタムカラムを選択"
 
 #: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
-msgstr ""
+msgstr "タグを入力"
 
 #: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
-msgstr ""
+msgstr "表示制限を追加"
 
 #: cps/templates/modal_dialogs.html:50
 msgid "This book format will be permanently erased from database"
-msgstr ""
+msgstr "このファイル形式はDBから完全に削除されます"
 
 #: cps/templates/modal_dialogs.html:51
 msgid "This book will be permanently erased from database"
-msgstr ""
+msgstr "この本はDBとローカルから完全に削除されます"
 
 #: cps/templates/modal_dialogs.html:52
 msgid "and hard disk"
@@ -2824,48 +2810,47 @@ msgstr ""
 
 #: cps/templates/modal_dialogs.html:56
 msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
+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 ""
+msgstr "本を安全に削除するためには、初めに本をアーカイブした上で端末と同期する必要があります"
 
 #: cps/templates/modal_dialogs.html:76
 msgid "Choose File Location"
-msgstr ""
+msgstr "ファイルの場所を選択"
 
 #: cps/templates/modal_dialogs.html:82
 msgid "type"
-msgstr ""
+msgstr "種類"
 
 #: cps/templates/modal_dialogs.html:83
 msgid "name"
-msgstr ""
+msgstr "名前"
 
 #: cps/templates/modal_dialogs.html:84
 msgid "size"
-msgstr ""
+msgstr "サイズ"
 
 #: cps/templates/modal_dialogs.html:90
 msgid "Parent Directory"
-msgstr ""
+msgstr "親ディレクトリ"
 
 #: cps/templates/modal_dialogs.html:98
 msgid "Select"
-msgstr ""
+msgstr "選択"
 
 #: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
-#, fuzzy
 msgid "Ok"
-msgstr "本"
+msgstr "OK"
 
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
-msgstr ""
+msgstr "Calibre-WebのeBookカタログ"
 
 #: cps/templates/read.html:6
 msgid "epub Reader"
-msgstr ""
+msgstr "EPUBリーダー"
 
 #: cps/templates/read.html:77 cps/templates/readcbr.html:116
 msgid "Light"
@@ -2877,20 +2862,19 @@ msgstr "ダーク"
 
 #: cps/templates/read.html:79
 msgid "Sepia"
-msgstr ""
+msgstr "セピア"
 
 #: cps/templates/read.html:80
-#, fuzzy
 msgid "Black"
-msgstr "戻る"
+msgstr "ブラック"
 
 #: cps/templates/read.html:84
 msgid "Reflow text when sidebars are open."
-msgstr ""
+msgstr "サイドバーが開いているとき、テキストを再度流し込みます。"
 
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
-msgstr ""
+msgstr "コミックリーダー"
 
 #: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
@@ -2934,7 +2918,7 @@ msgstr "画像を反転する"
 
 #: cps/templates/readcbr.html:122
 msgid "Scale"
-msgstr "サイズ"
+msgstr "スケール"
 
 #: cps/templates/readcbr.html:125
 msgid "Best"
@@ -2982,80 +2966,79 @@ msgstr "右から左"
 
 #: cps/templates/readcbr.html:165
 msgid "Reset to Top"
-msgstr ""
+msgstr "一番上にリセット"
 
 #: cps/templates/readcbr.html:166
 msgid "Remember Position"
-msgstr ""
+msgstr "位置を維持"
 
 #: cps/templates/readcbr.html:171
 msgid "Scrollbar"
-msgstr ""
+msgstr "スクロールバー"
 
 #: cps/templates/readcbr.html:174
 msgid "Show"
-msgstr ""
+msgstr "表示"
 
 #: cps/templates/readcbr.html:175
 msgid "Hide"
-msgstr ""
+msgstr "非表示"
 
 #: cps/templates/readdjvu.html:5
 msgid "DJVU Reader"
-msgstr ""
+msgstr "DJVUリーダー"
 
 #: cps/templates/readpdf.html:29
 msgid "PDF Reader"
-msgstr ""
+msgstr "PDFリーダー"
 
 #: cps/templates/readtxt.html:6
-#, fuzzy
 msgid "txt Reader"
-msgstr "テキストリーダ"
+msgstr "テキストリーダー"
 
 #: cps/templates/register.html:4
 msgid "Register New Account"
-msgstr ""
+msgstr "新規アカウントを登録"
 
 #: cps/templates/register.html:10
 msgid "Choose a username"
-msgstr "ユーザ名を入力してください"
+msgstr "ユーザー名を入力してください"
 
 #: cps/templates/register.html:15
 msgid "Your email address"
-msgstr "あなたのメールアドレス"
+msgstr "メールアドレス"
 
 #: cps/templates/remote_login.html:5
 msgid "Magic Link - Authorise New Device"
-msgstr ""
+msgstr "マジックリンク - 新規端末を認証する"
 
 #: cps/templates/remote_login.html:7
 msgid "On another device, login and visit:"
-msgstr ""
+msgstr "他の端末でログインしてアクセスしてください:"
 
 #: cps/templates/remote_login.html:11
 msgid "Once verified, you will automatically be logged in on this device."
-msgstr ""
+msgstr "一度承認されると、自動的にこの端末でログインされます。"
 
 #: cps/templates/remote_login.html:14
 msgid "This verification link will expire in 10 minutes."
-msgstr ""
+msgstr "この確認リンクの有効期限は10分です。"
 
 #: cps/templates/schedule_edit.html:29
 msgid "Generate Book Cover Thumbnails"
-msgstr ""
+msgstr "本の表紙サムネイルを生成"
 
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
-msgstr ""
+msgstr "シリーズの表紙サムネイルを生成"
 
 #: cps/templates/search.html:6
 msgid "No Results Found"
-msgstr ""
+msgstr "結果が見つかりません"
 
 #: cps/templates/search.html:7
 msgid "Search Term:"
-msgstr ""
+msgstr "検索する単語:"
 
 #: cps/templates/search.html:9
 msgid "Results for:"
@@ -3063,52 +3046,51 @@ msgstr "結果:"
 
 #: cps/templates/search_form.html:21
 msgid "Published Date From"
-msgstr ""
+msgstr "発売日(〜から)"
 
 #: cps/templates/search_form.html:31
 msgid "Published Date To"
-msgstr ""
+msgstr "発売日(〜まで)"
 
 #: cps/templates/search_form.html:59
 msgid "Exclude Tags"
-msgstr "タグを除外"
+msgstr "除外するタグ"
 
 #: cps/templates/search_form.html:77
 msgid "Exclude Series"
-msgstr "シリーズを除外"
+msgstr "除外するシリーズ"
 
 #: cps/templates/search_form.html:95
-#, fuzzy
 msgid "Exclude Shelves"
-msgstr "シリーズを除外"
+msgstr "除外する本棚"
 
 #: cps/templates/search_form.html:115
 msgid "Exclude Languages"
-msgstr "言語を除外"
+msgstr "除外する言語"
 
 #: cps/templates/search_form.html:126
 msgid "Extensions"
-msgstr ""
+msgstr "拡張子"
 
 #: cps/templates/search_form.html:134
 msgid "Exclude Extensions"
-msgstr ""
+msgstr "除外する拡張子"
 
 #: cps/templates/search_form.html:144
 msgid "Rating Above"
-msgstr ""
+msgstr "評価(〜以上)"
 
 #: cps/templates/search_form.html:148
 msgid "Rating Below"
-msgstr ""
+msgstr "評価(〜以下)"
 
 #: cps/templates/search_form.html:180
 msgid "From:"
-msgstr ""
+msgstr "〜から:"
 
 #: cps/templates/search_form.html:190
 msgid "To:"
-msgstr ""
+msgstr "〜まで:"
 
 #: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
@@ -3116,63 +3098,63 @@ msgstr "この本棚を削除"
 
 #: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
-msgstr ""
+msgstr "本棚のプロパティを編集"
 
 #: cps/templates/shelf.html:17
 msgid "Arrange books manually"
-msgstr ""
+msgstr "手動で本を並び替える"
 
 #: cps/templates/shelf.html:18
 msgid "Disable Change order"
-msgstr ""
+msgstr "並び順の変更を無効にする"
 
 #: cps/templates/shelf.html:18
 msgid "Enable Change order"
-msgstr ""
+msgstr "並び順の変更を有効にする"
 
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
-msgstr ""
+msgstr "みんなと共有"
 
 #: cps/templates/shelf_edit.html:21
 msgid "Sync this shelf with Kobo device"
-msgstr ""
+msgstr "この本棚をKobo端末と同期"
 
 #: cps/templates/shelf_order.html:5
 msgid "Drag to Rearrange Order"
-msgstr ""
+msgstr "ドラッグして並び順を変更"
 
 #: cps/templates/shelf_order.html:33
 msgid "Hidden Book"
-msgstr ""
+msgstr "非表示の本"
 
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
-msgstr ""
+msgstr "ライブラリの統計"
 
 #: cps/templates/stats.html:12
 msgid "Books in this Library"
-msgstr "このライブラリ内の本"
+msgstr "このライブラリ内の本の冊数"
 
 #: cps/templates/stats.html:16
 msgid "Authors in this Library"
-msgstr "このライブラリ内の著者"
+msgstr "このライブラリ内の作者数"
 
 #: cps/templates/stats.html:20
 msgid "Categories in this Library"
-msgstr "このライブラリ内のカテゴリ"
+msgstr "このライブラリ内のカテゴリ数"
 
 #: cps/templates/stats.html:24
 msgid "Series in this Library"
-msgstr "このライブラリ内のシリーズ"
+msgstr "このライブラリ内のシリーズ数"
 
 #: cps/templates/stats.html:29
 msgid "System Statistics"
-msgstr ""
+msgstr "システムの統計"
 
 #: cps/templates/stats.html:33
 msgid "Program"
-msgstr ""
+msgstr "プログラム"
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3180,7 +3162,7 @@ msgstr "インストールされたバージョン"
 
 #: cps/templates/tasks.html:12
 msgid "User"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
 #: cps/templates/tasks.html:14
 msgid "Task"
@@ -3196,165 +3178,157 @@ msgstr "進捗"
 
 #: cps/templates/tasks.html:17
 msgid "Run Time"
-msgstr ""
+msgstr "稼働時間"
 
 #: cps/templates/tasks.html:18
 msgid "Start Time"
-msgstr ""
+msgstr "開始時刻"
 
 #: cps/templates/tasks.html:20
 msgid "Actions"
-msgstr ""
+msgstr "アクション"
 
 #: cps/templates/tasks.html:40
 msgid "This task will be cancelled. Any progress made by this task will be saved."
-msgstr ""
+msgstr "このタスクはキャンセルされます。このタスクによる進捗はすべて保存されます。"
 
 #: cps/templates/tasks.html:41
 msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
-msgstr ""
+msgstr "これがスケジュールタスクの場合、次のスケジュールの時刻にはもう一度実行されます。"
 
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
-msgstr "ユーザパスワードをリセット"
+msgstr "パスワードをリセット"
 
 #: cps/templates/user_edit.html:43
 msgid "Language of Books"
-msgstr ""
+msgstr "本の言語"
 
 #: cps/templates/user_edit.html:54
 msgid "OAuth Settings"
-msgstr ""
+msgstr "OAuth設定"
 
 #: cps/templates/user_edit.html:56
 msgid "Link"
-msgstr ""
+msgstr "リンク"
 
 #: cps/templates/user_edit.html:58
 msgid "Unlink"
-msgstr ""
+msgstr "リンク解除"
 
 #: cps/templates/user_edit.html:64
 msgid "Kobo Sync Token"
-msgstr ""
+msgstr "Kobo同期トークン"
 
 #: cps/templates/user_edit.html:66
 msgid "Create/View"
-msgstr ""
+msgstr "作成/表示"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr ""
+msgstr "強制的にKoboと完全同期"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
-msgstr ""
+msgstr "許可/拒否カスタムカラムを追加"
 
 #: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
-msgstr ""
+msgstr "選択した本棚内の本のみKoboと同期"
 
 #: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
-msgstr ""
+msgstr "ユーザーを削除"
 
 #: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
-msgstr ""
+msgstr "Koboの認証URLを生成"
 
 #: cps/templates/user_table.html:80 cps/templates/user_table.html:103
 msgid "Select..."
-msgstr ""
+msgstr "選択..."
 
 #: cps/templates/user_table.html:131
 msgid "Edit User"
-msgstr ""
+msgstr "ユーザーを編集"
 
 #: cps/templates/user_table.html:134
-#, fuzzy
 msgid "Enter Username"
-msgstr "ユーザ名を入力してください"
+msgstr "ユーザー名を入力してください"
 
 #: cps/templates/user_table.html:135
-#, fuzzy
 msgid "Enter E-mail Address"
-msgstr "あなたのメールアドレス"
+msgstr "メールアドレスを入力してください"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "Enter E-Reader E-mail Address"
-msgstr "あなたのメールアドレス"
+msgstr "E-Readerメールアドレスを入力してください"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "E-Reader E-mail"
-msgstr "テストメール"
+msgstr "E-Readerメール"
 
 #: cps/templates/user_table.html:137
-#, fuzzy
 msgid "Locale"
-msgstr "サイズ"
+msgstr "地域"
 
 #: cps/templates/user_table.html:138
 msgid "Visible Book Languages"
-msgstr ""
+msgstr "表示する本の言語"
 
 #: cps/templates/user_table.html:139
 msgid "Edit Allowed Tags"
-msgstr ""
+msgstr "許可タグを編集"
 
 #: cps/templates/user_table.html:139
 msgid "Allowed Tags"
-msgstr ""
+msgstr "許可タグ"
 
 #: cps/templates/user_table.html:140
 msgid "Edit Denied Tags"
-msgstr ""
+msgstr "拒否タグを編集"
 
 #: cps/templates/user_table.html:140
 msgid "Denied Tags"
-msgstr ""
+msgstr "拒否タグ"
 
 #: cps/templates/user_table.html:141
 msgid "Edit Allowed Column Values"
-msgstr ""
+msgstr "許可カスタムカラムを編集"
 
 #: cps/templates/user_table.html:141
 msgid "Allowed Column Values"
-msgstr ""
+msgstr "許可カスタムカラム"
 
 #: cps/templates/user_table.html:142
 msgid "Edit Denied Column Values"
-msgstr ""
+msgstr "拒否カスタムカラムを編集"
 
 #: cps/templates/user_table.html:142
 msgid "Denied Column Values"
-msgstr ""
+msgstr "拒否カスタムカラム"
 
 #: cps/templates/user_table.html:144
-#, fuzzy
 msgid "Change Password"
-msgstr "パスワード変更を許可"
+msgstr "パスワード変更"
 
 #: cps/templates/user_table.html:147
 msgid "View"
-msgstr ""
+msgstr "閲覧"
 
 #: cps/templates/user_table.html:150
-#, fuzzy
 msgid "Edit Public Shelves"
-msgstr "本棚を編集する"
+msgstr "みんなの本棚を編集"
 
 #: cps/templates/user_table.html:152
 msgid "Sync selected Shelves with Kobo"
-msgstr ""
+msgstr "選択した本棚をKoboと同期"
 
 #: cps/templates/user_table.html:156
-#, fuzzy
 msgid "Show read/unread selection"
-msgstr "シリーズ選択を表示"
+msgstr "既読/未読の選択を表示"
 
 #: cps/templates/user_table.html:159
 msgid "Show random books"
-msgstr "ランダムで本を表示"
+msgstr "ランダムに本を表示"
 

From 92b6dbf26f146776362bdf22f4cf3748f33fe7ae Mon Sep 17 00:00:00 2001
From: subdiox <subdiox@gmail.com>
Date: Sun, 26 Jun 2022 01:29:08 +0900
Subject: [PATCH 300/412] Fix one Japanese translation

---
 cps/translations/ja/LC_MESSAGES/messages.mo | Bin 67632 -> 67663 bytes
 cps/translations/ja/LC_MESSAGES/messages.po |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index d00d29d0a43d24bd256ab1fcf624dc88caae7ca3..88418ca47d54a1a82e2cf79e0ad58bb1c04086b6 100644
GIT binary patch
delta 12830
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

delta 12817
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
T`Ffg^ExEHRaGUGv`O5QuM7X~T

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index d23fc80a7..b770e88b3 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -2802,11 +2802,11 @@ msgstr "このファイル形式はDBから完全に削除されます"
 
 #: cps/templates/modal_dialogs.html:51
 msgid "This book will be permanently erased from database"
-msgstr "この本はDBとローカルから完全に削除されます"
+msgstr "この本はDBと"
 
 #: cps/templates/modal_dialogs.html:52
 msgid "and hard disk"
-msgstr ""
+msgstr "ローカルから完全に削除されます"
 
 #: cps/templates/modal_dialogs.html:56
 msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."

From 12071f3e640d9304e269de7204f993aa9b3f8f3f Mon Sep 17 00:00:00 2001
From: subdiox <subdiox@gmail.com>
Date: Sun, 26 Jun 2022 10:26:45 +0900
Subject: [PATCH 301/412] Fix author & series ID translation

---
 cps/translations/ja/LC_MESSAGES/messages.mo | Bin 67663 -> 67655 bytes
 cps/translations/ja/LC_MESSAGES/messages.po |  36 ++++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 88418ca47d54a1a82e2cf79e0ad58bb1c04086b6..e58148bb9ecec674174eb1d0169a262e802baeae 100644
GIT binary patch
delta 1724
zcmZ|Pe@xX?7{~E*<$|UVKa>RliFXo`($vt2ws2)ukPR8x*2aLbHgzH-Gq=R9fE1%h
zkeF*~gH1NAblUyHRb$lLvP~&R8EvgCyI#ZT?2@8hOX>ajp7XDNz0P^gd7kr}^S$t6
zxBpDH|3u}&V1hAb&2?jB89sp(_z3R8H0;Aocm$I%?Qdf$F@Vb3fsf-mxC#eRc^7dm
z-gM518k5Dm2(?}wH9@aH9RU^Ej5+uwCgNU9$AhRsUtm6ty7*mG!ITNx_#(_;{u<85
zMpS+uYTsu#56`&xm5HEDm~tC3{;>%~r~;*^gBwtZdr^f>q6&{V!>9|yumQ~tYa{CA
z{=jWmdehb&Le={-=mP#p8z{iVER?x<GpdnKP&Yq~g?QDiXWp_GScPh=5+A}wEW@`^
zjeUp7IO68Nqh2_8$pt2ycTgLrFddU`+lKN`2XDY9aSsMC<opG-KZbFbe8-r_a5k!e
zrKrY=ozGz!=bLp5I#{Sdb#w){<1JLemY6N{7M3vY!&1C}x^eDZW1hjMF%@^Zc^B$a
zoWtc>|JRsh*o12AC@$uF^F0F{9K$S3_|KS`7(i_-M8#i5eTt2!7wSU2$RV78XHj*2
z#wxssx_QYx>sr(ctwZJ4;S$a_O&Z`JuD~%=p_Kdf;2hMqFGl@nYEcKbVJ4o$=kY9V
zz|<-G=eZGiVl#xgz<JETYpCBwyz!afJ_hR<XyFnn;U4PAQhav)0_y+5>o^<R@nQTJ
zm3PFge~W7T8mhsVGk=<$zlyIAZ^IXHbeb>dJ!w{)&wG;9r~>6!f>kbl2=#Qw-1=$M
z)1F5)Fy`h_w|*P-#D2fed)YateQQy_scO_kH~EA1rp*LYFoe44SNI-Aa6Q(?`@BEP
zVSJW(6xGmE3HD|$VK(y}Sb-m*4*UyK&`h`WQ&FEX1J%gtat10?>H;;W#LcLN+MJ!3
z$GivQ@f0q_AuPZsF2YAcnM(qVMdLmD$9K0IOQgFi+;TkJ+7WIU4!3*|Zu!(Ltjx_@
zu(h`Sje;fxdK(7j#$l*uU`3oaICuEN>E58~bAM9agNlV)_eI(VBb^6SB=qi={WiH^
zs5;9_e*f288#(^lPl;Y+&-gd-Ns&`uU+z0$EWPs%XNR_5Utl-(PbB!YvG?d?z)SdH
OvT24lSaW~Y%>Mz*J9N_k

delta 1721
zcmZ|Oe@K;A9LMqV==H~%S!;yX>B=m(bZg6~5haVt$SGKvjW*_@L9B=^XT^+Q&%A1j
ztS}=gN=V54Ar;0Y!hTQ$E=FSwTp(?$Kb{G;wdyY2Y?bZ(dCvK_zh38j&-s4O_nhb6
ztF4jit&#5PH~dUvOzAyiQgI~~;fI)o%{T$uaRYYaIDF;4G1XXv%JcCx+=27)Br5L?
zPR1wB+y}<wFfT!^uYO?su)szFDpZHB;x^2{gE$e7qY9nF*YT!{CnapbD5~+<7{xU>
z4eL?)?Wlv}I0dh}cp~B3gtWiyhCEb4393L9>fkR?i3d@IdQkgrIR8Xlz<X%SCQNtM
zqh4+h>#%Cb*6l^r`@?sEjA0un#+fXvbn_-uBj2KKehp{fL$^NVAA5ntsK!3R7qA{H
zFotUEM;wPY+<XA_!v0+sc;qzy+Kp*Akqud>hGw7+{utlF-I$N(owrc?y%A%QF$*VQ
z4yu89sKypLD{unmn^g>UvalZ2Q3AK(C@NvgBU|VzT)?~?%kekVji>)-%)3~MFJYsb
zA3%MIpYa{7KQ?9#ZbvnC8fS98`H6uJ_MX^+nK*`d5o+Tc7q3QridxiD9zeZFC#GW`
zs?M)igLhCjU;5NqiF%<`sQiss%=u=!26z(Z;%!u+=%{U|0QKz`qJA_RPzSeQHum5W
z?8Eml`<eZF)*?@AdNBw4F^WT|-^N(u8NZFe2Mn}u7nP9WdEt{qQS)V}zt<=DGVZ}l
z>_FvpyY=r;jSrz3^pdP^J8Q6#cng-{%_PqcpLA-n7d}ZDs=#Vofa_em6ZLdw-1;@t
z)Apkpxb5a6Zv7eRi8CTz__DdEeU+%+)TgM6eG&2PO`8a);Ca+dui!WM7p}mqDPH(5
zxQdIIkDwZwpK5Qo0&|)BScOMX2j0i=n4V_qXQMu49;%VD<qTA)$_3V=66;V6wK&_b
zfcare!Am#`d$ABl@J-B*XBX$!&i?)4(ZR2qjb)&9Ptb5Gi0up-E(Hy{gN81*FfXrQ
z`sZsuTUWSQf&H60CMRQjU&q|!aPY(Ny=mc~=0s#{!Sjj*v9^Kc&VgM=R3yHm=a@|{
zytpPOOm6AVvyoH3^ksyRroqc8nL+Gq(AX6;UI=36-Ybol->a~@4kc0}+O@x9I6vI|
P-SFo0a8NS(;+X#der<C6

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index b770e88b3..c3845a21b 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -710,7 +710,7 @@ msgstr "本 %(id)s はDBのみから削除されます。DB内の本のパスが
 #: cps/helper.py:449
 #, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "エラー: %(error)s により、作者名を %(src)s から %(dest)s に変更できませんでした"
+msgstr "エラー: %(error)s により、著者名を %(src)s から %(dest)s に変更できませんでした"
 
 #: cps/helper.py:521 cps/helper.py:530
 #, python-format
@@ -964,11 +964,11 @@ msgstr "シリーズ選択を表示"
 #: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
-msgstr "作者"
+msgstr "著者"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
-msgstr "作者選択を表示"
+msgstr "著者選択を表示"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
 #: cps/templates/index.xml:76 cps/web.py:966
@@ -1245,7 +1245,7 @@ msgstr "%(user)s がダウンロードした本"
 #: cps/web.py:532
 #, python-format
 msgid "Author: %(name)s"
-msgstr "作者: %(name)s"
+msgstr "著者: %(name)s"
 
 #: cps/web.py:568
 #, python-format
@@ -1744,7 +1744,7 @@ msgstr "減らす"
 
 #: cps/templates/author.html:99
 msgid "More by"
-msgstr "同じ作者が書いた本: "
+msgstr "同じ著者が書いた本: "
 
 #: cps/templates/book_edit.html:11
 msgid "Delete Book"
@@ -1781,7 +1781,7 @@ msgstr "本のタイトル"
 #: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
 #: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
 msgid "Author"
-msgstr "作者"
+msgstr "著者"
 
 #: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
 #: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
@@ -1815,7 +1815,7 @@ msgstr "タグ"
 
 #: cps/templates/book_edit.html:95
 msgid "Series ID"
-msgstr "シリーズID"
+msgstr "巻数"
 
 #: cps/templates/book_edit.html:99
 msgid "Rating"
@@ -1924,7 +1924,7 @@ msgstr "選択した本を削除"
 
 #: cps/templates/book_table.html:41
 msgid "Exchange author and title"
-msgstr "作者とタイトルを交換"
+msgstr "著者とタイトルを交換"
 
 #: cps/templates/book_table.html:47
 msgid "Update Title Sort automatically"
@@ -1932,7 +1932,7 @@ msgstr "タイトルのよみがなを自動で更新"
 
 #: cps/templates/book_table.html:51
 msgid "Update Author Sort automatically"
-msgstr "作者のよみがなを自動で更新"
+msgstr "著者のよみがなを自動で更新"
 
 #: cps/templates/book_table.html:63 cps/templates/book_table.html:69
 msgid "Enter Title"
@@ -1953,15 +1953,15 @@ msgstr "タイトルのよみがな"
 
 #: cps/templates/book_table.html:65
 msgid "Enter Author Sort"
-msgstr "作者名のよみがなを入力"
+msgstr "著者名のよみがなを入力"
 
 #: cps/templates/book_table.html:65
 msgid "Author Sort"
-msgstr "作者名のよみがな"
+msgstr "著者名のよみがな"
 
 #: cps/templates/book_table.html:66
 msgid "Enter Authors"
-msgstr "作者名を入力"
+msgstr "著者名を入力"
 
 #: cps/templates/book_table.html:67
 msgid "Enter Categories"
@@ -2109,7 +2109,7 @@ msgstr "機能設定"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr "ダウンロード時にタイトルと作者名の中にある2バイト文字を変換する"
+msgstr "ダウンロード時にタイトルと著者名の中にある2バイト文字を変換する"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
@@ -2332,7 +2332,7 @@ msgstr "ランダムに表示する本の冊数"
 
 #: cps/templates/config_view_edit.html:36
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
-msgstr "非表示にする前に表示する作者数 (0=非表示にしない)"
+msgstr "非表示にする前に表示する著者数 (0=非表示にしない)"
 
 #: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
 msgid "Theme"
@@ -2591,12 +2591,12 @@ msgstr "ダウンロード数が多い順にソート"
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
-msgstr "作者名を五十音順にソート"
+msgstr "著者名を五十音順にソート"
 
 #: cps/templates/index.html:79 cps/templates/search.html:36
 #: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
-msgstr "作者名を逆五十音順にソート"
+msgstr "著者名を逆五十音順にソート"
 
 #: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
@@ -2640,7 +2640,7 @@ msgstr "ランダム"
 
 #: cps/templates/index.xml:73
 msgid "Books ordered by Author"
-msgstr "作者名順"
+msgstr "著者名順"
 
 #: cps/templates/index.xml:80
 msgid "Books ordered by publisher"
@@ -3138,7 +3138,7 @@ msgstr "このライブラリ内の本の冊数"
 
 #: cps/templates/stats.html:16
 msgid "Authors in this Library"
-msgstr "このライブラリ内の作者数"
+msgstr "このライブラリ内の著者数"
 
 #: cps/templates/stats.html:20
 msgid "Categories in this Library"

From b47c1d24318847deab3ca1e6acf27f78040c60b5 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Thu, 30 Jun 2022 21:24:22 +0800
Subject: [PATCH 302/412] Update Simplifield Chinese translation

---
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 50258 -> 53457 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 103 +++++++++---------
 2 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index b39f3ae567f2a347e4cb4c699e9b862d6a5de12e..1c62a60b76792445d09c6038dda2dd3dddba7748 100644
GIT binary patch
delta 15309
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

delta 12316
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%0Dw6|Ie=BlP<4-{a@P^grqQ+T#
zfd9LJI&7ptE8k`v4w#2gd-|2t|3z(0*g<DG)Yde>z@W4;!7gcE=L@FRnGhEIFynY=
z;D@HK1P3=O77|$8{O90DEt-b}inM$!_)W{)(BQM}riTQJWaSG9#Ai1Nj>>+aVBxG0
z{YE4<e{uAn#BQClgIl}46%x#TqDx5N)|0p1>X8|IzQ>~lf@}Lk<qIC~`%}Td&Ow&~
zSDzmf7&>@opzn~1!FPtdoj>sWh&zGc$Roi;FT52V7(1?0@Y=XNp}}4LGx;Oa8YHGQ
z$f#2%rB>}g^5kGhqrjQTFBC|tRWq$naKw}&`GU=-{!<{>a{8jsK%KWn1vb6)Tj0~c
z?%@78DItOTb6*X9{C0e3@Xo?lLISfFUkOZFk`erV$=$HP@9)M0SH1U4NHBU;gOEUA
z^_9TlHBE!}*Q^f>Zr*SwB)D%=URYq~_8$VrcH{;+?ffW^y{lYs>aI`n2S<J!9}@U;
b?{~o~pX@0ZxcPZzF#C%@Xz<3dOZol_x&#vV

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 791f36979..40f8a1272 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-06-18 18:44+0200\n"
+"POT-Creation-Date: 2022-06-30 19:36+0800\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
 "Language-Team: zh_Hans_CN <LL@li.org>\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.9.1\n"
 
 #: cps/about.py:84
 msgid "Statistics"
@@ -184,7 +184,7 @@ msgstr "您确定要更改 Calibre 库位置吗？"
 
 #: cps/admin.py:618
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
-msgstr ""
+msgstr "Calibre-Web 将搜索更新封面，并更新缩略图，这可能需要一段时间"
 
 #: cps/admin.py:621
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
@@ -310,19 +310,19 @@ msgstr "邮件服务器设置已更新"
 
 #: cps/admin.py:1319 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
-msgstr ""
+msgstr "编辑计划任务设置"
 
 #: cps/admin.py:1331
 msgid "Invalid start time for task specified"
-msgstr ""
+msgstr "指定任务的开始时间无效"
 
 #: cps/admin.py:1336
 msgid "Invalid duration for task specified"
-msgstr ""
+msgstr "指定任务的持续时间无效"
 
 #: cps/admin.py:1345
 msgid "Scheduled tasks settings updated"
-msgstr ""
+msgstr "已更新计划任务设置"
 
 #: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
 #: cps/web.py:1315
@@ -331,7 +331,7 @@ msgstr "发生一个未知错误，请稍后再试。"
 
 #: cps/admin.py:1359
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "设置数据库不可写"
 
 #: cps/admin.py:1389 cps/admin.py:1984
 #, python-format
@@ -501,7 +501,7 @@ msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
 #: cps/db.py:679 cps/web.py:720
-#, fuzzy, python-format
+#, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
@@ -645,9 +645,8 @@ msgstr "找不到 %(format)s：%(fn)s"
 
 #: cps/helper.py:96 cps/helper.py:225 cps/templates/detail.html:42
 #: cps/templates/detail.html:46
-#, fuzzy
 msgid "Send to E-Reader"
-msgstr "发送到Kindle"
+msgstr "发送到电子阅读器"
 
 #: cps/helper.py:97 cps/helper.py:115 cps/helper.py:227
 msgid "This e-mail has been sent via Calibre-Web."
@@ -671,19 +670,19 @@ msgid "Registration e-mail for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
 #: cps/helper.py:147 cps/helper.py:153
-#, fuzzy, python-format
+#, python-format
 msgid "Convert %(orig)s to %(format)s and send to E-Reader"
-msgstr "转换 %(orig)s 到 %(format)s 并发送到Kindle"
+msgstr "转换 %(orig)s 到 %(format)s 并发送到电子阅读器"
 
 #: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180 cps/helper.py:184
-#, fuzzy, python-format
+#, python-format
 msgid "Send %(format)s to E-Reader"
-msgstr "发送 %(format)s 到Kindle"
+msgstr "发送 %(format)s 到电子阅读器"
 
 #: cps/helper.py:224 cps/tasks/convert.py:92
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to E-Reader"
-msgstr "%(book)s发送到Kindle"
+msgstr "%(book)s发送到电子阅读器"
 
 #: cps/helper.py:229
 msgid "The requested file could not be read. Maybe wrong permissions?"
@@ -746,7 +745,7 @@ msgstr "无效的邮件地址格式"
 
 #: cps/helper.py:811
 msgid "Python module 'advocate' is not installed but is needed for cover uploads"
-msgstr ""
+msgstr "上传封面需要的Python模块'advocate'未安装"
 
 #: cps/helper.py:821
 msgid "Error Downloading Cover"
@@ -1191,11 +1190,11 @@ msgstr "已完成"
 
 #: cps/tasks_status.py:72
 msgid "Ended"
-msgstr ""
+msgstr "已结束"
 
 #: cps/tasks_status.py:74
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #: cps/tasks_status.py:76
 msgid "Unknown Status"
@@ -1260,7 +1259,7 @@ msgstr "丛书：%(serie)s"
 
 #: cps/web.py:609
 msgid "Rating: None"
-msgstr ""
+msgstr "评分：无"
 
 #: cps/web.py:618
 #, python-format
@@ -1406,33 +1405,33 @@ msgstr "Calibre 运行失败，错误信息：%(error)s"
 
 #: cps/tasks/convert.py:275
 msgid "Convert"
-msgstr ""
+msgstr "转换"
 
 #: cps/tasks/database.py:28
 msgid "Reconnecting Calibre database"
-msgstr ""
+msgstr "正在重新连接到Calibre数据库"
 
 #: cps/tasks/mail.py:265
 msgid "E-mail"
-msgstr ""
+msgstr "电子邮件"
 
 #: cps/tasks/thumbnail.py:95
 #, python-format
 msgid "Generated %(count)s cover thumbnails"
-msgstr ""
+msgstr "生成了 %(count)s 个封面缩略图"
 
 #: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
 #: cps/tasks/thumbnail.py:503
 msgid "Cover Thumbnails"
-msgstr ""
+msgstr "封面缩略图"
 
 #: cps/tasks/thumbnail.py:281
 msgid "Generated {0} series thumbnails"
-msgstr ""
+msgstr "生成了 %(count)s 个丛书缩略图"
 
 #: cps/tasks/thumbnail.py:446
 msgid "Clearing cover thumbnail cache"
-msgstr ""
+msgstr "正在清理封面缩略图缓存"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
 #: cps/templates/layout.html:67 cps/templates/user_table.html:145
@@ -1455,9 +1454,8 @@ msgid "E-mail Address"
 msgstr "邮箱地址"
 
 #: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-#, fuzzy
 msgid "Send to E-Reader E-mail Address"
-msgstr "接收书籍的Kindle邮箱地址"
+msgstr "接收书籍的电子阅读器邮箱地址"
 
 #: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
@@ -1598,31 +1596,31 @@ msgstr "编辑界面配置"
 
 #: cps/templates/admin.html:167
 msgid "Scheduled Tasks"
-msgstr ""
+msgstr "计划任务"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
 msgid "Time at which tasks start to run"
-msgstr ""
+msgstr "任务开始运行的时间"
 
 #: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
 msgid "Maximum tasks duration"
-msgstr ""
+msgstr "最长任务持续时间"
 
 #: cps/templates/admin.html:178
 msgid "Generate book cover thumbnails"
-msgstr ""
+msgstr "生成书籍封面缩略图"
 
 #: cps/templates/admin.html:182
 msgid "Generate series cover thumbnails"
-msgstr ""
+msgstr "生成丛书封面缩略图"
 
 #: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
 msgid "Reconnect to Calibre Library"
-msgstr ""
+msgstr "重新连接到Calibre库"
 
 #: cps/templates/admin.html:193
 msgid "Refresh Thumbnail Cover Cache"
-msgstr ""
+msgstr "刷新封面缩略图缓存"
 
 #: cps/templates/admin.html:199
 msgid "Administration"
@@ -1650,7 +1648,7 @@ msgstr "停止"
 
 #: cps/templates/admin.html:213
 msgid "Version Information"
-msgstr ""
+msgstr "版本信息"
 
 #: cps/templates/admin.html:217
 msgid "Version"
@@ -2564,7 +2562,7 @@ msgstr "Kobo Token:"
 
 #: cps/templates/grid.html:21
 msgid "List"
-msgstr ""
+msgstr "列表"
 
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2736,7 +2734,7 @@ msgstr "书籍详情"
 
 #: cps/templates/list.html:22
 msgid "Grid"
-msgstr ""
+msgstr "网格"
 
 #: cps/templates/login.html:18
 msgid "Remember Me"
@@ -2864,12 +2862,11 @@ msgstr "深色"
 
 #: cps/templates/read.html:79
 msgid "Sepia"
-msgstr ""
+msgstr "棕色"
 
 #: cps/templates/read.html:80
-#, fuzzy
 msgid "Black"
-msgstr "后退"
+msgstr "黑色"
 
 #: cps/templates/read.html:84
 msgid "Reflow text when sidebars are open."
@@ -3029,11 +3026,11 @@ msgstr "此验证链接将在10分钟后失效。"
 
 #: cps/templates/schedule_edit.html:29
 msgid "Generate Book Cover Thumbnails"
-msgstr ""
+msgstr "生成书籍封面缩略图"
 
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
-msgstr ""
+msgstr "生成丛书封面缩略图"
 
 #: cps/templates/search.html:6
 msgid "No Results Found"
@@ -3157,7 +3154,7 @@ msgstr "系统统计"
 
 #: cps/templates/stats.html:33
 msgid "Program"
-msgstr ""
+msgstr "程序"
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3189,15 +3186,15 @@ msgstr "开始时间"
 
 #: cps/templates/tasks.html:20
 msgid "Actions"
-msgstr ""
+msgstr "活动"
 
 #: cps/templates/tasks.html:40
 msgid "This task will be cancelled. Any progress made by this task will be saved."
-msgstr ""
+msgstr "这个任务将被取消。此任务取得的所有进展都将被保存"
 
 #: cps/templates/tasks.html:41
 msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
-msgstr ""
+msgstr "如果这是计划任务，则将在下一个计划的时间内重新运行"
 
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
@@ -3264,14 +3261,12 @@ msgid "Enter E-mail Address"
 msgstr "输入邮箱地址"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "Enter E-Reader E-mail Address"
-msgstr "输入Kindle邮箱地址"
+msgstr "输入电子阅读器邮箱地址"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "E-Reader E-mail"
-msgstr "测试邮件"
+msgstr "电子阅读器邮箱"
 
 #: cps/templates/user_table.html:137
 msgid "Locale"

From c4104ddaf4982cbfb4008fa945d9cec127b96a56 Mon Sep 17 00:00:00 2001
From: Kian-Meng Ang <kianmeng@cpan.org>
Date: Fri, 1 Jul 2022 21:26:06 +0800
Subject: [PATCH 303/412] Fix typos

---
 cps/cli.py         | 2 +-
 cps/helper.py      | 4 ++--
 cps/kobo.py        | 4 ++--
 cps/remotelogin.py | 2 +-
 cps/shelf.py       | 2 +-
 cps/ub.py          | 4 ++--
 cps/web.py         | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cps/cli.py b/cps/cli.py
index 5896c7fe0..6f58dcc49 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -29,7 +29,7 @@ from .constants import DEFAULT_SETTINGS_FILE, DEFAULT_GDRIVE_FILE
 
 def version_info():
     if _NIGHTLY_VERSION[1].startswith('$Format'):
-        return "Calibre-Web version: %s - unkown git-clone" % _STABLE_VERSION['version']
+        return "Calibre-Web version: %s - unknown git-clone" % _STABLE_VERSION['version']
     return "Calibre-Web version: %s -%s" % (_STABLE_VERSION['version'], _NIGHTLY_VERSION[1])
 
 
diff --git a/cps/helper.py b/cps/helper.py
index d40ffc334..99c37e16e 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -121,7 +121,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
     txt = "Hello %s!\r\n" % user_name
     if not resend:
         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 += "Please log in to your account using the following information:\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"
@@ -940,7 +940,7 @@ def check_unrar(unrar_location):
 
     except (OSError, UnicodeDecodeError) as err:
         log.error_or_exception(err)
-        return _('Error excecuting UnRar')
+        return _('Error executing UnRar')
 
 
 def json_serial(obj):
diff --git a/cps/kobo.py b/cps/kobo.py
index 46e68acbb..c379e9a21 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -155,7 +155,7 @@ def HandleSyncRequest():
     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
+    # We reload the book database so that the user gets 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)
 
@@ -508,7 +508,7 @@ def get_metadata(book):
 @requires_kobo_auth
 # Creates a Shelf with the given items, and returns the shelf's uuid.
 def HandleTagCreate():
-    # catch delete requests, otherwise the are handeld in the book delete handler
+    # catch delete requests, otherwise the are handled in the book delete handler
     if request.method == "DELETE":
         abort(405)
     name, items = None, None
diff --git a/cps/remotelogin.py b/cps/remotelogin.py
index ea613c29a..037979ead 100644
--- a/cps/remotelogin.py
+++ b/cps/remotelogin.py
@@ -126,7 +126,7 @@ def token_verified():
         ub.session_commit("User {} logged in via remotelogin, token deleted".format(user.name))
 
         data['status'] = 'success'
-        log.debug(u"Remote Login for userid %s succeded", user.id)
+        log.debug(u"Remote Login for userid %s succeeded", user.id)
         flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.name), category="success")
 
     response = make_response(json.dumps(data, ensure_ascii=False))
diff --git a/cps/shelf.py b/cps/shelf.py
index 49d9a6335..9ddc0d1a1 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -263,7 +263,7 @@ def order_shelf(shelf_id):
             for book in books_in_shelf:
                 setattr(book, 'order', to_save[str(book.book_id)])
                 counter += 1
-                # if order diffrent from before -> shelf.last_modified = datetime.utcnow()
+                # if order different from before -> shelf.last_modified = datetime.utcnow()
             try:
                 ub.session.commit()
             except (OperationalError, InvalidRequestError) as e:
diff --git a/cps/ub.py b/cps/ub.py
index fd7a90efc..96e674d46 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -263,7 +263,7 @@ class OAuthProvider(Base):
     active = Column(Boolean)
 
 
-# Class for anonymous user is derived from User base and completly overrides methods and properties for the
+# Class for anonymous user is derived from User base and completely overrides methods and properties for the
 # anonymous user
 class Anonymous(AnonymousUserMixin, UserBase):
     def __init__(self):
@@ -769,7 +769,7 @@ def update_download(book_id, user_id):
             session.rollback()
 
 
-# Delete non exisiting downloaded books in calibre-web's own database
+# Delete non existing downloaded books in calibre-web's own database
 def delete_download(book_id):
     session.query(Downloads).filter(book_id == Downloads.book_id).delete()
     try:
diff --git a/cps/web.py b/cps/web.py
index dcccbc325..3a6f9e60c 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -437,7 +437,7 @@ def render_discover_books(book_id):
 def render_hot_books(page, order):
     if current_user.check_visibility(constants.SIDEBAR_HOT):
         if order[1] not in ['hotasc', 'hotdesc']:
-            # Unary expression comparsion only working (for this expression) in sqlalchemy 1.4+
+            # Unary expression comparison only working (for this expression) in sqlalchemy 1.4+
             # if not (order[0][0].compare(func.count(ub.Downloads.book_id).desc()) or
             #        order[0][0].compare(func.count(ub.Downloads.book_id).asc())):
             order = [func.count(ub.Downloads.book_id).desc()], 'hotdesc'

From c2545315e163747ec935654fe4bd49636b3ef3d5 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 16 Jul 2022 19:09:19 +0200
Subject: [PATCH 304/412] Fix Ratings with 0 stars are counted as None

---
 cps/web.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index 3a6f9e60c..5fb62e70a 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -598,14 +598,16 @@ def render_series_books(page, book_id, order):
 
 def render_ratings_books(page, book_id, order):
     if book_id == '-1':
+        db_filter = coalesce(db.Ratings.rating, 0) < 1
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
-                                                                db.Books.ratings == None,
+                                                                db_filter,
                                                                 [order[0][0]],
                                                                 True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
-                                                                db.Series)
+                                                                db.Series,
+                                                                db.books_ratings_link, db.Ratings)
         title = _(u"Rating: None")
         rating = -1
     else:
@@ -1018,10 +1020,11 @@ def ratings_list():
         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()) \
+            .filter(db.Ratings.rating > 0) \
             .group_by(text('books_ratings_link.rating')).order_by(order).all()
         no_rating_count = (calibre_db.session.query(db.Books)
                            .outerjoin(db.books_ratings_link).outerjoin(db.Ratings)
-                           .filter(db.Ratings.rating == None)
+                           .filter(or_(db.Ratings.rating == None, db.Ratings.rating == 0))
                            .filter(calibre_db.common_filters())
                            .count())
         entries.append([db.Category(_("None"), "-1", -1), no_rating_count])

From a72f16fd3ace38be9827a5e0cf97d2356cc1e8eb Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 16 Jul 2022 19:27:44 +0200
Subject: [PATCH 305/412] Fix missing or_ import

---
 cps/web.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/web.py b/cps/web.py
index 5fb62e70a..9c7d527c1 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -31,7 +31,7 @@ from flask_babel import gettext as _
 from flask_babel import get_locale
 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, false, not_, and_
+from sqlalchemy.sql.expression import text, func, false, not_, and_, or_
 from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.sql.functions import coalesce
 

From a3f7dc2a5ab6bd8e56d2c443ae81755ea1cacc32 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 23 Jul 2022 07:23:13 +0200
Subject: [PATCH 306/412] Bugfix search with wrong custom column configured

---
 cps/metadata_provider/scholar.py        |   2 +
 cps/search.py                           |   3 +
 optional-requirements.txt               |   6 +-
 setup.cfg                               |   2 +-
 test/Calibre-Web TestSummary_Linux.html | 831 ++++++------------------
 5 files changed, 205 insertions(+), 639 deletions(-)

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 7feb0ee9b..498184ec2 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -49,6 +49,8 @@ class scholar(Metadata):
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = " ".join(tokens)
             try:
+                scholarly.set_timeout(20)
+                scholarly.set_retries(2)
                 scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
             except Exception as e:
                 log.warning(e)
diff --git a/cps/search.py b/cps/search.py
index 88d790fc5..17d54b4e0 100644
--- a/cps/search.py
+++ b/cps/search.py
@@ -134,6 +134,9 @@ def adv_search_read_status(read_status):
                 db_filter = coalesce(db.cc_classes[config.config_read_column].value, False) != True
         except (KeyError, AttributeError, IndexError):
             log.error("Custom Column No.{} does not exist in calibre database".format(config.config_read_column))
+            flash(_("Custom Column No.%(column)d does not exist in calibre database",
+                    column=config.config_read_column),
+                  category="error")
             return true()
     return db_filter
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 97f355f22..d18463a3c 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -29,11 +29,11 @@ SQLAlchemy-Utils>=0.33.5,<0.39.0
 
 # metadata extraction
 rarfile>=3.2
-scholarly>=1.2.0,<1.7
+scholarly>=1.2.0,<1.8
 markdown2>=2.0.0,<2.5.0
 html2text>=2020.1.16,<2022.1.1
 python-dateutil>=2.1,<2.9.0
-beautifulsoup4>=4.0.1,<4.11.0
+beautifulsoup4>=4.0.1,<4.12.0
 cchardet>=2.0.0,<2.2.0
 
 # Comics
@@ -41,4 +41,4 @@ natsort>=2.2.0,<8.2.0
 comicapi>=2.2.0,<2.3.0
 
 # Kobo integration
-jsonschema>=3.2.0,<4.7.0
+jsonschema>=3.2.0,<4.8.0
diff --git a/setup.cfg b/setup.cfg
index 92e64f6a1..c24dfc97d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -97,5 +97,5 @@ comics =
 	natsort>=2.2.0,<8.2.0
 	comicapi>=2.2.0,<2.3.0
 kobo = 
-	jsonschema>=3.2.0,<4.6.0
+	jsonschema>=3.2.0,<4.7.0
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 8953c08ca..7abc87928 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-06-05 22:14:00</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-07-18 11:00:52</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>2022-06-06 04:06:43</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-07-18 17:02:49</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>4h 57 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>5h 1 min</p>
         </div>
       </div>
       </div>
@@ -465,13 +465,13 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">11</td>
-        <td class="text-center">3</td>
+        <td class="text-center">14</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('c6', 15)">Detail</a>
         </td>
@@ -479,11 +479,31 @@
 
     
     
-        <tr id='pt6.1' class='hiddenRow bg-success'>
+        <tr id="ft6.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 676, in test_calibre_log
+    self.assertTrue(&#34;1% Eingabe wird zu HTML konvertiert&#34; in data)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -497,64 +517,20 @@
     
     
     
-        <tr id="ft6.3" class="none bg-danger">
+        <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 223, in test_convert_email
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et6.4" class="none bg-info">
+        <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 254, in test_convert_failed_and_email
-    select.select_by_visible_text(&#39;AZW3&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 140, in select_by_visible_text
-    raise NoSuchElementException(&#34;Could not locate element with visible text: %s&#34; % text)
-selenium.common.exceptions.NoSuchElementException: Message: Could not locate element with visible text: AZW3</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -568,33 +544,11 @@ selenium.common.exceptions.NoSuchElementException: Message: Could not locate ele
     
     
     
-        <tr id="ft6.6" class="none bg-danger">
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 622, in test_convert_options
-    self.assertEqual(from_book, set([&#39;-- select an option --&#39;, &#34;TXT&#34;]))
-AssertionError: Items in the first set but not the second:
-&#39;EPUB&#39;
-&#39;AZW3&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -635,33 +589,11 @@ AssertionError: Items in the first set but not the second:
     
     
     
-        <tr id="ft6.11" class="none bg-danger">
+        <tr id='pt6.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 460, in test_email_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -703,12 +635,12 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</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('c7', 6)">Detail</a>
@@ -717,64 +649,20 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     
     
-        <tr id="ft7.1" class="none bg-danger">
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 226, in test_convert_email
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et7.2" class="none bg-info">
+        <tr id='pt7.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et7.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et7.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et7.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 244, in test_convert_failed_and_email
-    select.select_by_visible_text(&#39;AZW3&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 140, in select_by_visible_text
-    raise NoSuchElementException(&#34;Could not locate element with visible text: %s&#34; % text)
-selenium.common.exceptions.NoSuchElementException: Message: Could not locate element with visible text: AZW3</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -806,33 +694,11 @@ selenium.common.exceptions.NoSuchElementException: Message: Could not locate ele
     
     
     
-        <tr id="ft7.6" class="none bg-danger">
+        <tr id='pt7.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 460, in test_email_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1951,9 +1817,9 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 185, in test_edit_title
-    self.assertEqual(&#39;The camicdemo&#39;, books[1][8][&#39;title&#39;])
-IndexError: list index out of range</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 230, in test_edit_title
+    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1982,11 +1848,11 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1996,90 +1862,26 @@ IndexError: list index out of range</pre>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id="ft17.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="failClass">
-        <td>TestSTARTTLS</td>
-        <td class="text-center">3</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c18', 3)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="ft18.1" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
-            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.1')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft17.1')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft18.1" class="popup_window test_output" style="display:block;">
+                <div id="div_ft17.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft18.1').style.display='none'"><span
+                                onclick="document.getElementById('div_ft17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 81, in test_STARTTLS
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</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'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="ft18.3" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft18.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 113, in test_STARTTLS_resend_password
-    self.assertTrue(wait_Email_received(self.email_server.handler.check_email_received))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
+    self.assertEqual(30, len(results))
+AssertionError: 30 != 0</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2092,91 +1894,48 @@ AssertionError: False is not true</pre>
 
     <tr id="su" class="errorClass">
         <td>_ErrorHolder</td>
-        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 2)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et19.1" class="none bg-info">
+        <tr id="et18.1" class="none bg-info">
             <td>
-                <div class='testcase'>tearDownClass (test_email_STARTTLS)</div>
+                <div class='testcase'>tearDownClass (test_edit_metadata_scholar)</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et19.1')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et18.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et19.1" class="popup_window test_output" style="display:block;">
+                <div id="div_et18.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et19.1').style.display='none'"><span
+                                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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 54, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 475, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 34, in tearDownClass
+    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
   File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
     self.error_handler.check_response(response)
   File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
     raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+selenium.common.exceptions.TimeoutException: Message: TimedPromise timed out after 300000 ms
 Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et19.2" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_email_ssl)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et19.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et19.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 52, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 475, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:186:5
+TimeoutError@chrome://remote/content/shared/webdriver/Errors.jsm:475:5
+bail@chrome://remote/content/marionette/sync.js:226:19</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2187,12 +1946,54 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="errorClass">
+    <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('c19', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt19.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.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='pt19.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">7</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</td>
-        <td class="text-center">3</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('c20', 7)">Detail</a>
@@ -2219,171 +2020,47 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft20.3" class="none bg-danger">
+        <tr id='pt20.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft20.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft20.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft20.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 130, in test_SSL_logging_email
-    self.assertTrue(len(re.findall(&#39;Subject: Calibre-Web test e-mail&#39;, data)), &#34;Email logging not working&#34;)
-AssertionError: 0 is not true : Email logging not working</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft20.4" class="none bg-danger">
+        <tr id='pt20.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft20.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft20.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft20.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 196, in test_SSL_non_admin_user
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et20.5" class="none bg-info">
+        <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et20.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et20.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et20.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 64, in test_SSL_only
-    self.setup_server(False, {&#39;mail_use_ssl&#39;: &#39;SSL/TLS&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 722, in setup_server
-    select = Select(cls.driver.find_element(By.ID, key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et20.6" class="none bg-info">
+        <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et20.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et20.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et20.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 135, in test_email_limit
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et20.7" class="none bg-info">
+        <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et20.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et20.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et20.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 217, in test_filepicker_two_file
-    accordions[0].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2413,11 +2090,11 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestErrorReadColumn</td>
         <td class="text-center">2</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</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">
@@ -2436,11 +2113,31 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id="ft22.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft22.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 51, in test_invalid_custom_read_column
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3692,12 +3389,12 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestRegister</td>
         <td class="text-center">8</td>
-        <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">3</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('c39', 8)">Detail</a>
@@ -3706,31 +3403,11 @@ IndexError: list index out of range</pre>
 
     
     
-        <tr id="ft39.1" class="none bg-danger">
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft39.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 211, in test_forgot_password
-    self.assertTrue(self.check_user_logged_in(&#39;forget&#39;, noCompare=True))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3762,154 +3439,38 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft39.5" class="none bg-danger">
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft39.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 222, in test_registering_only_email
-    self.assertTrue(wait_Email_received(self.email_server.handler.check_email_received))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et39.6" class="none bg-info">
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 132, in test_registering_user
-    self.assertEqual(u&#39;flash_success&#39;,self.register(u&#39;u1&#39;, &#39;huj@de.de&#39;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 124, in register
-    username = cls.driver.find_element(By.NAME, &#34;name&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [name=&#34;name&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et39.7" class="none bg-info">
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 151, in test_registering_user_fail
-    self.assertEqual(u&#39;flash_success&#39;,self.register(u&#39;udouble&#39;, &#39;huj@de.com&#39;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 124, in register
-    username = cls.driver.find_element(By.NAME, &#34;name&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [name=&#34;name&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et39.8" class="none bg-info">
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 173, in test_user_change_password
-    self.assertEqual(u&#39;flash_success&#39;,self.register(u&#39;upasswd&#39;, &#39;passwd@de.com&#39;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 124, in register
-    username = cls.driver.find_element(By.NAME, &#34;name&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [name=&#34;name&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -5303,10 +4864,10 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>425</td>
-        <td>396</td>
-        <td>11</td>
-        <td>11</td>
+        <td>424</td>
+        <td>412</td>
+        <td>3</td>
+        <td>2</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5335,7 +4896,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.15.0-33-generic #34~20.04.1-Ubuntu SMP Thu May 19 15:51:16 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.15.0-41-generic #44~20.04.1-Ubuntu SMP Fri Jun 24 13:27:29 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -5359,7 +4920,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>Babel</th>
-              <td>2.10.1</td>
+              <td>2.10.3</td>
               <td>Basic</td>
             </tr>
           
@@ -5455,7 +5016,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.37</td>
+              <td>1.4.39</td>
               <td>Basic</td>
             </tr>
           
@@ -5473,7 +5034,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>Wand</th>
-              <td>0.6.7</td>
+              <td>0.6.8</td>
               <td>Basic</td>
             </tr>
           
@@ -5485,7 +5046,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.49.0</td>
+              <td>2.53.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5503,7 +5064,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.1</td>
+              <td>1.10.2</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5515,7 +5076,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.49.0</td>
+              <td>2.53.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5533,7 +5094,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.1</td>
+              <td>1.10.2</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5545,7 +5106,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.49.0</td>
+              <td>2.53.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5563,7 +5124,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.1</td>
+              <td>1.10.2</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5587,7 +5148,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.49.0</td>
+              <td>2.53.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5605,7 +5166,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.1</td>
+              <td>1.10.2</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5623,7 +5184,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.49.0</td>
+              <td>2.53.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5641,7 +5202,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.1</td>
+              <td>1.10.2</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5659,13 +5220,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>scholarly</th>
-              <td>1.7.0</td>
+              <td>1.7.1</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.49.0</td>
+              <td>2.53.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5683,7 +5244,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.1</td>
+              <td>1.10.2</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5707,13 +5268,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>jsonschema</th>
-              <td>4.6.0</td>
+              <td>4.7.2</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.6.0</td>
+              <td>4.7.2</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -5725,13 +5286,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>jsonschema</th>
-              <td>4.6.0</td>
+              <td>4.7.2</td>
               <td>TestLdapLogin</td>
             </tr>
           
             <tr>
               <th>python-ldap</th>
-              <td>3.4.0</td>
+              <td>3.4.2</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -5743,7 +5304,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
           
             <tr>
               <th>SQLAlchemy-Utils</th>
-              <td>0.38.2</td>
+              <td>0.38.3</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -5755,7 +5316,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 </div>
 
 <script>
-    drawCircle(396, 11, 11, 7);
+    drawCircle(412, 3, 2, 7);
     showCase(5);
 </script>
 

From 46e5305f2332799db329123be1486fdc2c2d8d03 Mon Sep 17 00:00:00 2001
From: viljasenville <54019006+viljasenville@users.noreply.github.com>
Date: Wed, 27 Jul 2022 11:17:20 +0300
Subject: [PATCH 307/412] Comic reader: ignore special files originating from
 Apple devices

---
 cps/static/js/kthoom.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cps/static/js/kthoom.js b/cps/static/js/kthoom.js
index 268fe9ecb..51dbadba8 100644
--- a/cps/static/js/kthoom.js
+++ b/cps/static/js/kthoom.js
@@ -163,6 +163,14 @@ kthoom.ImageFile = function(file) {
             this.mimeType = undefined;
             break;
     }
+
+    // Reset mime type for special files originating from Apple devices
+    // This folder may contain files having image extensions (for example .jpg) but those files are not actual images
+    // Trying to view these files cause corrupted/empty pages in the comic reader and files should be ignored
+    if (this.filename.indexOf("__MACOSX") !== -1) {
+        this.mimeType = undefined;
+    }
+
     if ( this.mimeType !== undefined) {
         this.dataURI = createURLFromArray(file.fileData, this.mimeType);
     }

From 828be29a80773a2f77f9d14b0717e1618a70decf Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 30 Jul 2022 18:13:09 +0200
Subject: [PATCH 308/412] Update teststatus

---
 setup.cfg                               |   6 +-
 test/Calibre-Web TestSummary_Linux.html | 899 +++++++++++-------------
 2 files changed, 416 insertions(+), 489 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index c24dfc97d..de4e47144 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -87,15 +87,15 @@ oauth =
 	SQLAlchemy-Utils>=0.33.5,<0.39.0
 metadata = 
 	rarfile>=3.2
-	scholarly>=1.2.0,<1.7
+	scholarly>=1.2.0,<1.8
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1
 	python-dateutil>=2.1,<2.9.0
-	beautifulsoup4>=4.0.1,<4.11.0
+	beautifulsoup4>=4.0.1,<4.12.0
 	cchardet>=2.0.0,<2.2.0
 comics = 
 	natsort>=2.2.0,<8.2.0
 	comicapi>=2.2.0,<2.3.0
 kobo = 
-	jsonschema>=3.2.0,<4.7.0
+	jsonschema>=3.2.0,<4.8.0
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 7abc87928..701e14310 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,14 +37,14 @@
       <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>2022-07-18 11:00:52</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-07-29 22:16:18</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>2022-07-18 17:02:49</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-07-30 04:12:54</p>
             
         </div>
       </div>
@@ -468,8 +468,8 @@
     <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
+        <td class="text-center">13</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -479,31 +479,11 @@
 
     
     
-        <tr id="ft6.1" class="none bg-danger">
+        <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 676, in test_calibre_log
-    self.assertTrue(&#34;1% Eingabe wird zu HTML konvertiert&#34; in data)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -526,11 +506,31 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id="ft6.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 260, in test_convert_failed_and_email
+    self.assertEqual(1, task_len)
+AssertionError: 1 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -544,11 +544,32 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id="ft6.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 622, in test_convert_options
+    self.assertEqual(from_book, set([&#39;-- select an option --&#39;, &#34;TXT&#34;]))
+AssertionError: Items in the first set but not the second:
+&#39;AZW3&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1627,11 +1648,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1641,22 +1662,42 @@ AssertionError: False is not true</pre>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id="ft15.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">18</td>
-        <td class="text-center">17</td>
+        <td class="text-center">18</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('c16', 18)">Detail</a>
@@ -1800,31 +1841,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="et16.16" class="none bg-info">
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 230, in test_edit_title
-    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1848,13 +1869,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
@@ -1862,85 +1883,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
 
     
     
-        <tr id="ft17.1" class="none bg-danger">
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft17.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft17.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
-    self.assertEqual(30, len(results))
-AssertionError: 30 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</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('c18', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et18.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_edit_metadata_scholar)</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:block;">
-                    <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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 34, in tearDownClass
-    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: TimedPromise timed out after 300000 ms
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:186:5
-TimeoutError@chrome://remote/content/shared/webdriver/Errors.jsm:475:5
-bail@chrome://remote/content/marionette/sync.js:226:19</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1954,13 +1901,13 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 3)">Detail</a>
+            <a onclick="showClassDetail('c18', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1969,7 +1916,7 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1978,7 +1925,7 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1996,13 +1943,13 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 7)">Detail</a>
+            <a onclick="showClassDetail('c19', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -2011,7 +1958,7 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -2020,7 +1967,7 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -2029,7 +1976,7 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
     
     
-        <tr id='pt20.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2038,7 +1985,7 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
     
     
-        <tr id='pt20.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -2047,7 +1994,7 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
     
     
-        <tr id='pt20.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -2056,7 +2003,7 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
     
     
-        <tr id='pt20.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2074,13 +2021,13 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2090,21 +2037,21 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestErrorReadColumn</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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>
+            <a onclick="showClassDetail('c21', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2113,31 +2060,11 @@ bail@chrome://remote/content/marionette/sync.js:226:19</pre>
     
     
     
-        <tr id="ft22.2" class="none bg-danger">
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 51, in test_invalid_custom_read_column
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2151,13 +2078,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2166,19 +2093,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st23.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st23.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.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_st23.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2192,7 +2119,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2210,13 +2137,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2234,13 +2161,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2249,7 +2176,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2258,7 +2185,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2276,13 +2203,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2291,7 +2218,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2300,7 +2227,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2309,7 +2236,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2318,7 +2245,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2327,7 +2254,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2336,7 +2263,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2345,7 +2272,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2354,7 +2281,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2363,7 +2290,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2372,7 +2299,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2390,13 +2317,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 6)">Detail</a>
+            <a onclick="showClassDetail('c26', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_download_cover</div>
             </td>
@@ -2405,7 +2332,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2414,7 +2341,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelves</div>
             </td>
@@ -2423,7 +2350,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2432,7 +2359,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2441,7 +2368,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2459,13 +2386,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2474,7 +2401,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2483,7 +2410,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2492,7 +2419,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2501,7 +2428,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2510,7 +2437,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2519,7 +2446,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2528,7 +2455,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2537,7 +2464,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2546,7 +2473,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2555,7 +2482,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2564,7 +2491,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2573,7 +2500,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2591,13 +2518,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 10)">Detail</a>
+            <a onclick="showClassDetail('c28', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2606,7 +2533,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2615,7 +2542,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2624,7 +2551,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2633,7 +2560,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
@@ -2642,7 +2569,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
@@ -2651,7 +2578,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2660,7 +2587,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2669,7 +2596,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2678,7 +2605,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2696,13 +2623,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2711,7 +2638,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2720,7 +2647,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2729,7 +2656,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2738,19 +2665,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st30.5" class="none bg-warning">
+        <tr id="st29.5" 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_st30.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st30.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st30.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2764,7 +2691,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2773,7 +2700,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2782,7 +2709,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2791,7 +2718,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2809,13 +2736,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2824,7 +2751,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2833,7 +2760,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2842,7 +2769,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2851,7 +2778,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2860,7 +2787,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2869,7 +2796,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2878,7 +2805,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2887,7 +2814,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2896,7 +2823,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2905,7 +2832,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2914,7 +2841,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2923,7 +2850,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2932,7 +2859,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2941,7 +2868,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2959,13 +2886,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2974,7 +2901,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2992,13 +2919,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3007,7 +2934,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3025,13 +2952,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3040,7 +2967,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3049,7 +2976,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3058,7 +2985,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3067,7 +2994,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3076,7 +3003,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3085,7 +3012,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3094,7 +3021,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3103,7 +3030,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3112,7 +3039,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3121,7 +3048,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3130,7 +3057,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3139,7 +3066,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3148,7 +3075,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3157,7 +3084,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3166,7 +3093,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3175,7 +3102,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3184,7 +3111,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3193,7 +3120,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3202,7 +3129,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3211,7 +3138,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3220,7 +3147,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3229,7 +3156,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3247,13 +3174,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3271,13 +3198,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 3)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_command_start</div>
             </td>
@@ -3286,7 +3213,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
             </td>
@@ -3295,7 +3222,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_module_start</div>
             </td>
@@ -3313,13 +3240,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3328,7 +3255,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3337,7 +3264,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3346,7 +3273,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3355,7 +3282,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3373,13 +3300,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3397,13 +3324,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 8)">Detail</a>
+            <a onclick="showClassDetail('c38', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3412,7 +3339,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3421,7 +3348,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3430,7 +3357,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3439,7 +3366,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3448,7 +3375,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3457,7 +3384,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3466,7 +3393,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3484,13 +3411,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 3)">Detail</a>
+            <a onclick="showClassDetail('c39', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3499,7 +3426,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3508,7 +3435,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3526,13 +3453,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c40', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3541,7 +3468,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3550,7 +3477,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3559,7 +3486,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3568,7 +3495,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3577,7 +3504,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3586,7 +3513,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3595,7 +3522,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3604,7 +3531,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3613,7 +3540,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3622,7 +3549,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3631,7 +3558,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3640,7 +3567,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3649,19 +3576,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st41.14" class="none bg-warning">
+        <tr id="st40.14" 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_st41.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.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_st41.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3675,7 +3602,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3684,7 +3611,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3702,13 +3629,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 1)">Detail</a>
+            <a onclick="showClassDetail('c41', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnailsEnv - test_cover_cache_env_on_database_change</div>
             </td>
@@ -3726,13 +3653,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 8)">Detail</a>
+            <a onclick="showClassDetail('c42', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
             </td>
@@ -3741,7 +3668,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
@@ -3750,7 +3677,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
             </td>
@@ -3759,7 +3686,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
@@ -3768,7 +3695,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='st43.5' class='none bg-warning'>
+        <tr id='st42.5' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_for_series</div>
             </td>
@@ -3777,7 +3704,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
@@ -3786,7 +3713,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
             </td>
@@ -3795,7 +3722,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
             </td>
@@ -3813,13 +3740,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 9)">Detail</a>
+            <a onclick="showClassDetail('c43', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3828,7 +3755,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3837,7 +3764,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3846,7 +3773,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3855,7 +3782,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3864,7 +3791,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3873,19 +3800,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st44.7" class="none bg-warning">
+        <tr id="st43.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_st44.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st43.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st44.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st43.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_st44.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st43.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3899,7 +3826,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3908,7 +3835,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3926,13 +3853,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 4)">Detail</a>
+            <a onclick="showClassDetail('c44', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -3941,7 +3868,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -3950,7 +3877,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3959,7 +3886,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3977,13 +3904,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 18)">Detail</a>
+            <a onclick="showClassDetail('c45', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3992,7 +3919,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4001,7 +3928,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4010,7 +3937,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4019,7 +3946,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4028,7 +3955,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4037,7 +3964,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4046,7 +3973,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4055,7 +3982,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4064,7 +3991,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4073,7 +4000,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4082,7 +4009,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4091,7 +4018,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4100,7 +4027,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4109,7 +4036,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4118,7 +4045,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4127,7 +4054,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4136,7 +4063,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4154,13 +4081,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 1)">Detail</a>
+            <a onclick="showClassDetail('c46', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4178,13 +4105,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c48', 21)">Detail</a>
+            <a onclick="showClassDetail('c47', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4193,7 +4120,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4202,7 +4129,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4211,7 +4138,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4220,7 +4147,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4229,7 +4156,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4238,7 +4165,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4247,7 +4174,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4256,7 +4183,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4265,7 +4192,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4274,7 +4201,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4283,7 +4210,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4292,7 +4219,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4301,7 +4228,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4310,7 +4237,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4319,7 +4246,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4328,7 +4255,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.17' class='hiddenRow bg-success'>
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4337,7 +4264,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.18' class='hiddenRow bg-success'>
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4346,7 +4273,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4355,7 +4282,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4364,7 +4291,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4382,13 +4309,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c49', 35)">Detail</a>
+            <a onclick="showClassDetail('c48', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt49.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4397,7 +4324,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4406,7 +4333,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4415,7 +4342,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4424,7 +4351,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4433,7 +4360,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4442,7 +4369,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4451,7 +4378,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4460,7 +4387,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4469,7 +4396,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4478,7 +4405,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4487,7 +4414,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4496,7 +4423,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4505,7 +4432,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4514,7 +4441,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4523,7 +4450,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4532,7 +4459,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.17' class='hiddenRow bg-success'>
+        <tr id='pt48.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4541,7 +4468,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.18' class='hiddenRow bg-success'>
+        <tr id='pt48.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4550,7 +4477,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.19' class='hiddenRow bg-success'>
+        <tr id='pt48.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4559,7 +4486,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.20' class='hiddenRow bg-success'>
+        <tr id='pt48.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4568,7 +4495,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.21' class='hiddenRow bg-success'>
+        <tr id='pt48.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4577,7 +4504,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.22' class='hiddenRow bg-success'>
+        <tr id='pt48.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4586,7 +4513,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.23' class='hiddenRow bg-success'>
+        <tr id='pt48.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4595,7 +4522,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.24' class='hiddenRow bg-success'>
+        <tr id='pt48.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4604,7 +4531,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.25' class='hiddenRow bg-success'>
+        <tr id='pt48.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4613,7 +4540,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.26' class='hiddenRow bg-success'>
+        <tr id='pt48.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
@@ -4622,7 +4549,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.27' class='hiddenRow bg-success'>
+        <tr id='pt48.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4631,7 +4558,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.28' class='hiddenRow bg-success'>
+        <tr id='pt48.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4640,7 +4567,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.29' class='hiddenRow bg-success'>
+        <tr id='pt48.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4649,7 +4576,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.30' class='hiddenRow bg-success'>
+        <tr id='pt48.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4658,7 +4585,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.31' class='hiddenRow bg-success'>
+        <tr id='pt48.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4667,7 +4594,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.32' class='hiddenRow bg-success'>
+        <tr id='pt48.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4676,7 +4603,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.33' class='hiddenRow bg-success'>
+        <tr id='pt48.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4685,7 +4612,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.34' class='hiddenRow bg-success'>
+        <tr id='pt48.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4694,7 +4621,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.35' class='hiddenRow bg-success'>
+        <tr id='pt48.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4712,13 +4639,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c50', 16)">Detail</a>
+            <a onclick="showClassDetail('c49', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt50.1' class='hiddenRow bg-success'>
+        <tr id='pt49.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4727,7 +4654,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.2' class='hiddenRow bg-success'>
+        <tr id='pt49.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4736,7 +4663,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.3' class='hiddenRow bg-success'>
+        <tr id='pt49.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4745,7 +4672,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.4' class='hiddenRow bg-success'>
+        <tr id='pt49.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4754,7 +4681,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.5' class='hiddenRow bg-success'>
+        <tr id='pt49.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4763,7 +4690,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.6' class='hiddenRow bg-success'>
+        <tr id='pt49.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4772,7 +4699,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.7' class='hiddenRow bg-success'>
+        <tr id='pt49.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4781,7 +4708,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.8' class='hiddenRow bg-success'>
+        <tr id='pt49.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4790,7 +4717,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.9' class='hiddenRow bg-success'>
+        <tr id='pt49.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4799,7 +4726,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.10' class='hiddenRow bg-success'>
+        <tr id='pt49.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4808,7 +4735,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.11' class='hiddenRow bg-success'>
+        <tr id='pt49.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4817,7 +4744,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.12' class='hiddenRow bg-success'>
+        <tr id='pt49.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4826,7 +4753,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.13' class='hiddenRow bg-success'>
+        <tr id='pt49.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4835,7 +4762,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.14' class='hiddenRow bg-success'>
+        <tr id='pt49.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4844,7 +4771,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.15' class='hiddenRow bg-success'>
+        <tr id='pt49.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4853,7 +4780,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt50.16' class='hiddenRow bg-success'>
+        <tr id='pt49.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4864,10 +4791,10 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>424</td>
-        <td>412</td>
+        <td>423</td>
+        <td>413</td>
         <td>3</td>
-        <td>2</td>
+        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5046,7 +4973,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.53.0</td>
+              <td>2.55.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5064,7 +4991,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.2</td>
+              <td>1.14.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5076,7 +5003,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.53.0</td>
+              <td>2.55.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5094,7 +5021,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.2</td>
+              <td>1.14.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5106,7 +5033,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.53.0</td>
+              <td>2.55.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5124,7 +5051,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.2</td>
+              <td>1.14.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5148,7 +5075,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.53.0</td>
+              <td>2.55.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5166,7 +5093,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.2</td>
+              <td>1.14.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5184,7 +5111,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.53.0</td>
+              <td>2.55.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5202,7 +5129,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.2</td>
+              <td>1.14.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5220,13 +5147,13 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>scholarly</th>
-              <td>1.7.1</td>
+              <td>1.7.2</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.53.0</td>
+              <td>2.55.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5244,7 +5171,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.2</td>
+              <td>1.14.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5268,13 +5195,13 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.7.2</td>
+              <td>4.8.0</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.7.2</td>
+              <td>4.8.0</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -5286,7 +5213,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.7.2</td>
+              <td>4.8.0</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -5316,7 +5243,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(412, 3, 2, 7);
+    drawCircle(413, 3, 0, 7);
     showCase(5);
 </script>
 

From 68e21e1098aab8dcbfcf024cc296bc43936bfe3c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 31 Jul 2022 11:28:11 +0200
Subject: [PATCH 309/412] Fix #2495, Fix #2494 (Convert for not existent file
 no longer fails)

---
 cps/helper.py             | 2 +-
 optional-requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 99c37e16e..c427b4833 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -75,11 +75,11 @@ except (ImportError, RuntimeError) as e:
 def convert_book_format(book_id, calibre_path, old_book_format, new_book_format, user_id, ereader_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(calibre_path, 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
+    file_path = os.path.join(calibre_path, book.path, data.name)
     if config.config_use_google_drive:
         if not gd.getFileFromEbooksFolder(book.path, data.name + "." + old_book_format.lower()):
             error_message = _(u"%(format)s not found on Google Drive: %(fn)s",
diff --git a/optional-requirements.txt b/optional-requirements.txt
index d18463a3c..57a4038fc 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -41,4 +41,4 @@ natsort>=2.2.0,<8.2.0
 comicapi>=2.2.0,<2.3.0
 
 # Kobo integration
-jsonschema>=3.2.0,<4.8.0
+jsonschema>=3.2.0,<4.9.0

From fc9c641e55a3c912acbc6c5f1924fedd0b57317f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 31 Jul 2022 11:30:56 +0200
Subject: [PATCH 310/412] Updated brazilian translation (fix #2496)

---
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 38306 -> 38242 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 58718 -> 58646 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 55885 -> 55808 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 49901 -> 49839 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 26606 -> 26606 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 116 +--
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 54214 -> 54122 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 24357 -> 24357 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 116 +--
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 54737 -> 54671 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 63459 -> 63369 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 23905 -> 23905 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 116 +--
 cps/translations/ko/LC_MESSAGES/messages.mo   | Bin 54244 -> 54185 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 49054 -> 48982 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 50872 -> 50803 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 117 +--
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 45516 -> 59965 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 963 +++++++++---------
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 46450 -> 46450 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 116 +--
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 47311 -> 47246 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 117 +--
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 22085 -> 22085 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 116 +--
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 24153 -> 24153 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 116 +--
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 53459 -> 53399 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 117 +--
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 47453 -> 47393 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 117 +--
 messages.pot                                  | 116 +--
 41 files changed, 1629 insertions(+), 1667 deletions(-)

diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index d838e1bd90af91c69df663211dad5c8ef9f7d2ad..291014ebf2052270edea02f4e8da6c75de9d82d0 100644
GIT binary patch
delta 8738
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
N{Y}=cbJb6D`ZteLBwhdj

delta 8787
zcmYM(3!KkY-oWu+!x)2czZ(pLaUD&$jB(2)lKZ%X+$p()6)TO$Ul$cou}QLR=^>S*
zeU#Q_(=H`XX!B&XUFAu&txC1AO7(m`bI$Aa^y=07ob&(v&iS72`JSKJJ@s_j<J;3x
zA675BKH;whX-Sfe|Eg;5|NlDNBuNVB9>KQw3;JB!rb$vA2cZ4&n1f5OJU)!0@IP@h
zUcfFmEH_CCaTTT~Nh;Y-qbCE0FatB2B}o~qhIOzO=3zUmfTOT7PR2?&4{PF5^trWh
zd=L8EYq5VESui<;&hvSxsU-Q1h7bOXRWPf02%sVQLK8HQJaorB(dUZMiKe0%xDnZ8
zvI?_s2m1U=*Z_}Wef$D1!}Jzxmi3cD8a~(?P2DIopo!?tZp1ct8<PFxS#+VlqDS%_
z*1{aNUk^KBIUI(b<~5jsH=rAtk7e<0Ox2*VCJt;yQ~Ctv;4XB+x6z$`h5Vgd;2#Fm
zq-By^ii6QWmSGWY$4>Yurenia93SQ)e<#EFhXI$g;{30nv6cZN`v;n$OInA1HX1+&
zY=}e9-{-{N?~46L(Tx2O-T9$7{#P_(|3qR*vWU7Gc0$LmYD4~AU={-ga0gDo-=Y)!
zjMQb4&h{!`D>Q%(=#dS@E;tpP@V98nUq%;t6MNyu$lpmWX)q(h&>9(?qS1lIbo9lI
zSP7p-&;CWs!oye*-^D)oDS8yG^Fu8ZqeZv~4Qw5D!>#Cir?4`9jRy8JI$x@4`%ul<
zcsT=Y(VCcy7Rf?vj7!j+Z^TCUJX(bRgJ$X+I^j>zObVk4{aWaP&Cw(1jLtI|nLm}3
z(D23OXr!w#12<wOZpQMs9X+Dw(NrFe;}_5g(+a}#4bkWF&`kA2cYZt8#&zh1p29|~
zpB$p$*?o@gxB{26E>=PBZA<hB`l3}^jMec5G~g1fhIga2^e|S%=g~~PiU#-z8ptnb
zEmbDnrT4!c4PVGbi=zX&gCaEIV(fu4(VBP?nIriVR>!kw0A(m77pR2>)(pKh1?Yl9
z(dWjYM>Ypj7ST;KsHbETGFNg4P0>%-0vmP=_C+V09bJj;a2pQA*RU4W=JF55wrD`N
zpzEx}+W32Pz1KUD|0`*nW1u;9>l}7I72UxtXvB9RS2)>-*1`ewsE(jJJBCj90h-B*
z{0U=CWn&h$L>KOa-jcy+K(h)te-~KCKuz3&p7|aefyd*6t+?baG#pLccyxhjXdv_A
z?+ekQO`-FwL~p@XG_V)Y_g+KSJ?4W0XncY$kY5yj=z?|V55#6T4L$3-k(iQA=q-60
zeeZpAq0i8T&qr%?4cECny7NBhbCa<yrsl_im2qGrT3r8yez{JgU%))RChlM$`r>#r
zz(rVqYw!x(haOSVJ!~Ws4ZH!GnSAs}3d49R=|{t=AB(1P61KwW*Z}WEQ}r~u)4j;w
z$wB@>Y)Lv-BO806flWjgT8y6gt!Pm`gl6tpv?xErbnpK;8toalh%V5!XE@`|=y#z9
zy3@&MQQnMBumbDh1K1FsMUUh#S|e{`8+;GlSjH70uuAB2wJ|M4qY(`QXo9AAIJU;A
zcqy*I9DEsj<44HxCQUh?MmPaoU@02dt(b=QqqXxJ^a%fezW+YvV`Dn0Vj4qec<(o(
z#dsV&!^VBW!Y!i%unFU{(1li`wXzABGdYR|T(xhwj=j(T=f(cL=#lQle)vvb^6yR>
z^AX_cCgZRyu0sRZfELSRXw^O&$6v-~^bcYUJcAyMvwHSfXn=Ll-&>$HRD@=DQ0!0W
zNB(_bUVLx~S_5m)2_M38xE1|AJQMvh`upFa|BDviS@di(`-k7Fp&M$1&YO#FBp;ox
zM~X&$8YAMsT+F3^JDP!Qar`;-xmU3Tp2R%NxGH3#J^Eo8iRExI@<=iRU2rE_tozW6
z{2ene^(74>`5xU-1qz@vb?6H%&=;;iCmx9&$+fXR6J2;d`u<WZk1NsV)}cFpEcUl!
zCjC8FhV_&EH2C->2hm!%<mwPvH*})DXbK0T0Tp99&OsMgfbMX4^nP>$kD&qYjQ!nc
zfUlzO9mCe%|C2PV;)(-9ihE#F`eV@vmZA~gj($+qpvANW&D?IRh;N`pc>)dmBAU7M
zLE-yRFIs@UKL9hl|JTNWY3PfK(1n(vJ6Rup--0>xccTlRKo>ZJe&PHx*AG=~^qS?z
z{?%x4PDK|k!P1Rj%89nbANHUVy@BrNV>F;I(M+6+{)Cs)FFPcR7ovgoM2}_&R=|;H
zkxh#I8R$F<&?8$ig#7zKS;;_i+>R7Q@)mmL$D{9}6MuvTb{f6M-ymP@ByDK;y%+k2
zO@H)5G!6~)9`uO!VQc&r{V+8gM*a(EbQ=}|n2Rp-0Gg_Yqt9R!`Y%V1VpaMd#{SoM
zDg9s29bY;;WTX&%uRpr;YtU;v5&bh`Ns5MNwE-*PF7&Kk!OHme=;!DT&SOh#T^uGH
zf&S??4zqAE=HUt)i967F(?*2As-S0I2Yo)3Poo-*ZfNlgL96|GG_d*TQLK)?uZ=zx
z{WF#Ziq^{KXa>JQGjTqS|AMYlo~W#i`dHoj-<*aE7Gf*xjlMVsooFGNvRlyFSdV64
zBeuZ5AQL73KzDQzYhr~_;k(ip9UmK=fgZ&otm^$=O2diQpcAjf1DEh0ljxbIt_lCa
z@f@1!570CHA@(bb3HLq^EzUtW4aeXV+>4#D(by#Eh@;WxR^xc@|3fs4=zDbM7qK~(
z9T)zMr8T<XH1zCl!uq%h>)}=`#C>u6-{=B0t_>+~j2=w^I!{p?zZz36IG#owoQ|IL
zQgr-QG?go{7XA)v;PdE2ucO!Z9rTO&1NwZ!@gcCwFo*si^k{FyHn;&j^8Mq<zY8B>
zz$!hBp5?dbPSYoZBgn=E^arEQ&%_RRYwYhv13Ze>%qM8EeSxJJMKe`)V)(rgI)Af?
z<lk!S%78oThwf+`*2kr2U>ndKY(Z<}D7MG*=-K8?3jgLb2?x@D3Jv6YY>Pjl@3)*B
z7B0p`^k=4MG^FtnHo~8<F=kUaIoJ(dZ~`{LJJIK#M4x*N-RY<3M*fW+L7A!HcGQjb
zM4!7p_HRZrl6sVe6YjwhJb|Wc1SRYO*P>@tg4wtN&D7)AA9tgF>ivv$F?V`6s&2^F
zIT?c<)i$&U-$#q{G!}UOzoB7dxz~lF>WEHsC7Sw)=>46Id_$5YXhx1;b3BJlF#Gzj
z^B$N_e*{`fw_#OWANx<BwX&ylJjMS;L!*d+ljspNm=UgH5$4hFg%;mTw0c*dXZd?9
zhwq_*o<g7d8eOpB4IzMRWT#1cG|(wn9&g8V)=yT`aH4gXfgAk+H^=@q^sIJbGdzUl
z@hfz~^XS>vn;Cv@hF8)bfX;hg9Dfkq;7e$R-o;cdjm%l$jN73PbVje)XmlrYu^pz+
z9qvHC`G?Tw-a%{SEP89I&JI=I2CbPfXi+XgGqnnxcf)MX-+TBZ1MYYqI^nBm4Saxo
z@f<oq*Eu1T!?5&h(GSu3=vK6rUO)pmh?#gQ_RpXh&bTogd6gT<zh{3n1HEtsx|4(G
zC-t*v&fIXF#zvQ8D}LXG%$dA}-ijXc_?ludy2G95bFZKq`vP4jZGQNV*S;wlZ5ddO
zrfLVega5{=_&#>TFR=pV{wiFbd^96P*d2$W8Ciqw_%W=8Povj+FIq$IVm|&0eLt1E
zAf&nw4PZD<z`5vyhtY+9L{nGprf?lAqeqsF{@yf>x5K9NyQ0@@B6^eyu?nt1kLD4a
z;{E>vjfxD^Ul<~4fxgfcTi{5nfh9N)??W^59y;Nf=tcCoN_<xhAP4=u4|=2{uo~Wk
zW?}`_VEyD#8dmi#?2K>XFwFRMIGQo&f-BI#9z;{R6MNzj9D`YlLq@JgpPPfF@1fW5
zLCnHO&_K6idDc(%(eTV($4+<*ORwe4A+UDnP6psrI5zq?8puDfIc6>i3$#bS3*E5}
zPQoF$80+C{XvR-s%IZHuqdMl@67FXawxr)5{ou?;UtEu7YA5=gcmoae3oMV7OM-Rq
za{4)F&5XpFI6n4&g=zGcl#u^EG?p^pPF}%|_#qZz&86YPGZ_2RFF~)*el)Q3{|F1V
zMpJz`I&ojLcKTxvoQs2T2NvLuSd8tKk$+RZd|CK^t6oH_I*W1dZ4GpX-O&Z7pgXw}
z8{;OlR$jtOvC{JJUU$r<KLg#!9q3W~2|MF)?1x#YTlr6G8Y8hRu1C-2Vf09zKo{JD
zruZlt*oioP$!%fhwXqW8c~}`cpw-?dItrb4M*RIIwB}N`(Xbj<#|Iumi|rZoUhl=a
zcrbbr4d?>a#>%&coi<0G?~N`zIQA#S{w%D;_)>Jfbx6^slI=8_Fz^<ds_)Q9+ujjg
zD8%~ohhRILiGDFRU>+VocYFrj(T_L?(^tfQ)xuo*GqEAALFeC&)x7^N(r|)9@rQS?
zDg95-D$lqxRB;RR{^rMiH}t)}XvRjMMK}$8ZXuf4+tAEBhz7VB%iwk_X8mL*4I@sw
zD=ah=J?m>?e=_FNzX6?S1Lol4=#KWIfqooK?hYTE#%K+-K#Q*ndIZDKBAkJ#-ZUPi
z(F{-FWtg!tOi+YI+zY+`1JSd+4xM;0n#xt^(L9I-cmRFwP4wtK#s+v1eXs7SFn^m>
z<ll)eW5ARRLSGn%7S|%QSXQIgYb$y*e?up{fbOi;J>k7}(W}t$Y3Oq$=sX)@|2ecK
z4&Oum{o!nUAaiwCxG82Z-UTaSFHFb5Xof~$Cf<qe^#1t!<7f>$i4|~9^Z=Hn|7QIC
zZFD22Q#9JpD8D8YMF%WTzYtxp7nZ~R=t4u#qMD5TaUuHLUbG1Rf(CdDdt&;%p?0ps
zw)7WbJKP+{Q*YAng`d%d3hoPMREU-74@4&(haS}|Y>s!JnRyz!;BGV{XVLe5K+ih!
z{*cLRv`CwwJMV)z-v8@qxTCw!Guebz=|1#Ba~ucb7uXdG*M@}_Vh;UfSOp(Nt9mC+
z$Is&UpmpKPI39BtpNR&x3Tu1+AE99lJdZ|x1RLY~=#DO;-|}+536bZbJL!i8ejS>L
zCD9e=k*q~Cx&bZ1-(hw9BU+qCuoCMhr)lKjw`kGTe<0LAQ*24U4f??tiJsjUY=w8C
z6Fr9p{yKVVPM~N16;{Rk^&yiz(G876$0uTzk<O!GaV*-kr^$WQs$6&TwCkoVS~zp=
zjGR$(i>K_m;_@R+GYUH86m%}?u&d_iCu>!ozhK_4_ivtlVAI_FJ4&Bfu<M1{J6io8
Dut7Xm

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index ce16ecb07..8b59d648e 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2020-06-09 21:11+0100\n"
 "Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
 "Language: cs_CZ\n"
@@ -290,7 +290,7 @@ msgstr ""
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
@@ -329,8 +329,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
@@ -348,7 +348,7 @@ msgstr "Upravit uživatele %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
@@ -466,7 +466,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
@@ -510,20 +510,20 @@ msgstr "není nainstalováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Žádné"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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ý"
 
@@ -638,7 +638,7 @@ msgstr "Google Drive nastavení nebylo dokončeno, zkuste  znovu deaktivovat a a
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Doména zpětného volání není ověřena, postupujte podle pokynů k ověření domény v konzole pro vývojáře google"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formát pro knihu: %(book)d nenalezen"
@@ -742,7 +742,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
@@ -796,7 +796,8 @@ msgid "Unrar binary file not found"
 msgstr "Unrar binární soubor nenalezen"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Chyba provádění UnRar"
 
 #: cps/kobo_auth.py:89
@@ -813,7 +814,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -879,7 +880,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -929,7 +930,7 @@ msgid "Show Top Rated Books"
 msgstr "Zobrazit nejlépe hodnocené knihy"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
@@ -938,7 +939,7 @@ msgid "Show read and unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
@@ -956,7 +957,7 @@ msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -966,7 +967,7 @@ msgstr "Zobrazit výběr kategorie"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Série"
 
@@ -984,7 +985,7 @@ msgid "Show author selection"
 msgstr "Zobrazit výběr autora"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Vydavatelé"
 
@@ -994,7 +995,7 @@ msgstr "Zobrazit výběr vydavatele"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -1018,7 +1019,7 @@ msgstr "Formáty souborů"
 msgid "Show file formats selection"
 msgstr "Zobrazit výběr formátů"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Archivované knihy"
 
@@ -1026,7 +1027,7 @@ msgstr "Archivované knihy"
 msgid "Show archived books"
 msgstr "Zobrazit archivované knihy"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr ""
 
@@ -1034,41 +1035,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Hledat"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
@@ -1273,111 +1274,111 @@ msgstr "Vydavatel: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Stáhnutí"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Seznam hodnocení"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, 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:1205
+#: cps/web.py:1208
 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:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, 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:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 0020515dfa0f55ed74f6734fb2d2ed84d5758a3a..db2c06dc57ee10fe1e45a8e7a28a44942aab8c11 100644
GIT binary patch
delta 12532
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
JUN^Ye{{W+8CHVjV

delta 12586
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
P*YE-T?Q1JOA71x=DHJ(T

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 918647b83..d28850122 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2022-05-01 13:22+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -285,7 +285,7 @@ msgstr "Gmail Account Verifikation erfolgreich"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
@@ -324,8 +324,8 @@ msgstr "Ungültige Laufzeit für Aufgaben spezifiziert"
 msgid "Scheduled tasks settings updated"
 msgstr "Einstellungen für Geplante Aufgaben aktualisiert"
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
@@ -343,7 +343,7 @@ msgstr "Benutzer %(nick)s bearbeiten"
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
@@ -457,7 +457,7 @@ msgstr "Datenbankeinstellung aktualisiert"
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
@@ -500,20 +500,20 @@ msgstr "Nicht installiert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Keine"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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"
 
@@ -628,7 +628,7 @@ msgstr "Google Drive Setup is nicht komplett, bitte versuche Google Drive zu dea
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback Domain ist nicht verifiziert, bitte Domain in der Google Developer Console verifizieren"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s Format für Buch-ID %(book)d nicht gefunden"
@@ -732,7 +732,7 @@ msgstr "Fehler beim umbenennen der Datei im Pfad: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
 
@@ -785,7 +785,8 @@ msgid "Unrar binary file not found"
 msgstr "UnRar Programm nicht gefunden"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Fehler beim ausführen von UnRar"
 
 #: cps/kobo_auth.py:89
@@ -801,7 +802,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -867,7 +868,7 @@ msgid "{} Stars"
 msgstr "{} Sterne"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Login"
 
@@ -917,7 +918,7 @@ msgid "Show Top Rated Books"
 msgstr "Bestbewertete Bücher anzeigen"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
@@ -926,7 +927,7 @@ msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
@@ -944,7 +945,7 @@ msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -954,7 +955,7 @@ msgstr "Zeige Kategorienauswahl"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Serien"
 
@@ -972,7 +973,7 @@ msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Verleger"
 
@@ -982,7 +983,7 @@ msgstr "Zeige Verlegerauswahl"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -1006,7 +1007,7 @@ msgstr "Dateiformate"
 msgid "Show file formats selection"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
@@ -1014,7 +1015,7 @@ msgstr "Archivierte Bücher"
 msgid "Show archived books"
 msgstr "Zeige archivierte Bücher"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Bücherliste"
 
@@ -1022,41 +1023,41 @@ msgstr "Bücherliste"
 msgid "Show Books List"
 msgstr "Zeige Bücherliste"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Suche"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -1258,111 +1259,111 @@ msgstr "Verleger: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr "Bewertung: Keine"
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Bewertungsliste"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, 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:1205
+#: cps/web.py:1208
 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:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 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:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, 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:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 06bb65f782b2d2dc60b2b63e2904c1fe4e700ddb..c9c68c856ef2d0bfbbf0585e6f8ad28caab41a5d 100644
GIT binary patch
delta 9295
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

delta 9354
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
UIL0bkv#|N*N;_818qoFs04$m_z5oCK

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index eaf53380a..06d6e24a3 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -290,7 +290,7 @@ msgstr ""
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
@@ -329,8 +329,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
@@ -348,7 +348,7 @@ msgstr "Επεξεργασία χρήστη %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
@@ -466,7 +466,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
@@ -510,20 +510,20 @@ msgstr "δεν εγκαταστάθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Κανένα"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -638,7 +638,7 @@ msgstr "Η ρύθμιση του Google Drive δεν ολοκληρώθηκε, 
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Η ανάκληση ονόματος δεν έχει επαληθευτεί, παρακαλούμε ακολούθησε τα βήματα για την επαλήθευση ονόματος στην κονσόλα προγραμματιστή google"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s η δομή δεν βρέθηκε για την ταυτότητα βιβλίου: %(book)d"
@@ -742,7 +742,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
@@ -796,7 +796,8 @@ msgid "Unrar binary file not found"
 msgstr "Δεν βρέθηκε δυαδικό αρχείο Unrar"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Σφάλμα εκτέλεσης UnRar"
 
 #: cps/kobo_auth.py:89
@@ -813,7 +814,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -879,7 +880,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -929,7 +930,7 @@ msgid "Show Top Rated Books"
 msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Βιβλία που Διαβάστηκαν"
 
@@ -938,7 +939,7 @@ msgid "Show read and unread"
 msgstr "Προβολή διαβασμένων και αδιάβαστων"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Βιβλία που δεν Διαβάστηκαν"
 
@@ -956,7 +957,7 @@ msgid "Show Random Books"
 msgstr "Προβολή Τυχαίων Βιβλίων"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -966,7 +967,7 @@ msgstr "Προβολή επιλογών κατηγορίας"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Σειρές"
 
@@ -984,7 +985,7 @@ msgid "Show author selection"
 msgstr "Προβολή επιλογών συγγραφέα"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Εκδότες"
 
@@ -994,7 +995,7 @@ msgstr "Προβολή επιλογών εκδότη"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Γλώσσες"
 
@@ -1018,7 +1019,7 @@ msgstr "Μορφές αρχείου"
 msgid "Show file formats selection"
 msgstr "Προβολή επιλογών μορφής αρχείου"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Αρχειοθετημένα Βιβλία"
 
@@ -1026,7 +1027,7 @@ msgstr "Αρχειοθετημένα Βιβλία"
 msgid "Show archived books"
 msgstr "Προβολή αρχειοθετημένων βιβλίων"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Λίστα Βιβλίων"
 
@@ -1034,41 +1035,41 @@ msgstr "Λίστα Βιβλίων"
 msgid "Show Books List"
 msgstr "Προβολή Λίστας Βιβλίων"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
@@ -1273,111 +1274,111 @@ msgstr "Εκδότης: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Σειρές: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Αξιολόγηση: %(rating)s stars"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Μορφή αρχείου: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Κατηγορία: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Κατεβασμένα"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Λίστα αξιολογήσεων"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 9c749170eb36e6acdb2fbc6c6683960e76b4f45f..a2be7e2b31fd907bc205f3e8b645d02a96047915 100644
GIT binary patch
delta 10823
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

delta 10871
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

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 7f5c2ae7d..6a6cd65b9 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -294,7 +294,7 @@ msgstr "Verificación de cuenta de Gmail exitosa"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
@@ -333,8 +333,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
@@ -352,7 +352,7 @@ msgstr "Editar Usuario %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
@@ -470,7 +470,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
@@ -514,20 +514,20 @@ msgstr "no instalado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Ninguno"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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"
 
@@ -642,7 +642,7 @@ msgstr "La configuración de Google Drive no se ha completado, intente desactiva
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "El dominio Callback no se ha verificado, siga los pasos para verificarlo en la consola de desarrollador de Google"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formato no encontrado para el id del libro: %(book)d"
@@ -746,7 +746,7 @@ msgstr ""
 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:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
@@ -800,7 +800,8 @@ msgid "Unrar binary file not found"
 msgstr "No se encuentra el archivo binario UnRar"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Error ejecutando UnRar"
 
 #: cps/kobo_auth.py:89
@@ -817,7 +818,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -883,7 +884,7 @@ msgid "{} Stars"
 msgstr "{} Estrellas"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -933,7 +934,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Libros leídos"
 
@@ -942,7 +943,7 @@ msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
@@ -960,7 +961,7 @@ msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Categorías"
 
@@ -970,7 +971,7 @@ msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Series"
 
@@ -988,7 +989,7 @@ msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Editores"
 
@@ -998,7 +999,7 @@ msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -1022,7 +1023,7 @@ msgstr "Formatos de archivo"
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Libros archivados"
 
@@ -1030,7 +1031,7 @@ msgstr "Libros archivados"
 msgid "Show archived books"
 msgstr "Mostrar libros archivados"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Lista de Libros"
 
@@ -1038,41 +1039,41 @@ msgstr "Lista de Libros"
 msgid "Show Books List"
 msgstr "Mostrar Lista de Libros"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = $(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
@@ -1277,111 +1278,111 @@ msgstr "Editor/es: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Descargas"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, 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:1205
+#: cps/web.py:1208
 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:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 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:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, 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:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 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:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index abbd474432b7b886bd60f478121ce04726dfd341..43a8885271fbfdfdc61950b22389889f96441680 100644
GIT binary patch
delta 22
ecmaENp7Gsz#tk!U*^Lbq3=OS}HqW>9*8%`=w+LeZ

delta 22
ecmaENp7Gsz#tk!U*$vGU49%@fHqW>9*8%`>5(sVp

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index f11d200e2..4d88c7e9a 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -290,7 +290,7 @@ msgstr ""
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -329,8 +329,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
@@ -348,7 +348,7 @@ msgstr "Muokkaa käyttäjää %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
@@ -464,7 +464,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
@@ -508,20 +508,20 @@ msgstr "ei asennettu"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Ei mitään"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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:"
 
@@ -636,7 +636,7 @@ msgstr "Google Drive asetukset ei ole valmiit. Koita poistaa Google Drive käyt
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Paluuosoitteen domain ei ole varmistettu, seuraa ohjeita vamistaaksesi sen googlen kehittäjäkonsolissa"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s tiedostomuotoa ei löytynyt kirjalle: %(book)d"
@@ -740,7 +740,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
@@ -794,7 +794,7 @@ msgid "Unrar binary file not found"
 msgstr ""
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+msgid "Error executing UnRar"
 msgstr ""
 
 #: cps/kobo_auth.py:89
@@ -810,7 +810,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -876,7 +876,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -926,7 +926,7 @@ msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
@@ -935,7 +935,7 @@ msgid "Show read and unread"
 msgstr "Näytä luetut ja lukemattomat"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
@@ -953,7 +953,7 @@ msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Kategoriat"
 
@@ -963,7 +963,7 @@ msgstr "Näytä kategoriavalinta"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Sarjat"
 
@@ -981,7 +981,7 @@ msgid "Show author selection"
 msgstr "Näytä kirjailijavalinta"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Julkaisijat"
 
@@ -991,7 +991,7 @@ msgstr "Näytä julkaisijavalinta"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Kielet"
 
@@ -1015,7 +1015,7 @@ msgstr "Tiedotomuodot"
 msgid "Show file formats selection"
 msgstr "Näytä tiedostomuotovalinta"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr ""
 
@@ -1023,7 +1023,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr ""
 
@@ -1031,41 +1031,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Hae"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
@@ -1270,111 +1270,111 @@ msgstr "Julkaisija: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Arvostelulistaus"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, 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:1205
+#: cps/web.py:1208
 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:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index a294764784808ad75b2c06e0673bb5feb4937642..88794a64f21e6e350d3ebeea2ae4f7ba673b9ec6 100644
GIT binary patch
delta 11069
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

delta 11154
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

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 781d0b784..ba6e4ab0d 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -306,7 +306,7 @@ msgstr "La vérification du compte Gmail réussie"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
@@ -345,8 +345,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
@@ -364,7 +364,7 @@ msgstr "Éditer l'utilisateur %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
@@ -482,7 +482,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
@@ -526,20 +526,20 @@ msgstr "non installé"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonne personnalisée No.%(column)d n'existe pas dans la base de données calibre"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Aucun"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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"
 
@@ -654,7 +654,7 @@ msgstr "La configuration de Google Drive n’est pas terminée, essayez de désa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Le domaine de retour d’appel (Callback domain) est non vérifié, veuillez suivre les étapes nécessaires pour vérifier le domaine dans la console de développement de Google"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "le format %(format)s est introuvable pour le livre : %(book)d"
@@ -758,7 +758,7 @@ msgstr ""
 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:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
@@ -812,7 +812,8 @@ msgid "Unrar binary file not found"
 msgstr "Fichier binaire Unrar non trouvé"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Une erreur est survenue lors de l'exécution d'UnRar"
 
 #: cps/kobo_auth.py:89
@@ -829,7 +830,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -895,7 +896,7 @@ msgid "{} Stars"
 msgstr "{} Étoiles"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Connexion"
 
@@ -945,7 +946,7 @@ msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Livres lus"
 
@@ -954,7 +955,7 @@ msgid "Show read and unread"
 msgstr "Montrer lus et non-lus"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
@@ -972,7 +973,7 @@ msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Catégories"
 
@@ -982,7 +983,7 @@ msgstr "Montrer la sélection par catégories"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Séries"
 
@@ -1000,7 +1001,7 @@ msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Éditeurs"
 
@@ -1010,7 +1011,7 @@ msgstr "Montrer la sélection par éditeur"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Langues"
 
@@ -1034,7 +1035,7 @@ msgstr "Formats de fichier"
 msgid "Show file formats selection"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Livres archivés"
 
@@ -1042,7 +1043,7 @@ msgstr "Livres archivés"
 msgid "Show archived books"
 msgstr "Afficher les livres archivés"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Liste des livres"
 
@@ -1050,41 +1051,41 @@ msgstr "Liste des livres"
 msgid "Show Books List"
 msgstr "Montrer la liste des livres"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de lecture = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
@@ -1289,111 +1290,111 @@ msgstr "Éditeur : '%(name)s'"
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Liste des évaluations"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, 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:1205
+#: cps/web.py:1208
 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:1222
+#: cps/web.py:1225
 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/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, 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:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 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:1317
+#: cps/web.py:1320
 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:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 7bffebeed9ea997f03c172e89ffbcf93920b1bc8..9f895ccb09394f6207bf5e6f3e4692fc9a2ac282 100644
GIT binary patch
delta 22
ecmZ3wk8$Zf#trXG*o_Sp3=OS}Hh(oS&;kHw`Uolj

delta 22
ecmZ3wk8$Zf#trXG*bU7T49%@fHh(oS&;kHxRR}cz

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 9d24ca721..1aecfe72a 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -290,7 +290,7 @@ msgstr ""
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -329,8 +329,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
@@ -348,7 +348,7 @@ msgstr " A felhasználó szerkesztése: %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
@@ -464,7 +464,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
@@ -508,20 +508,20 @@ msgstr "nincs telepítve"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Nincs"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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:"
 
@@ -636,7 +636,7 @@ msgstr "A Google Drive beállítása nem fejeződött be, próbáld kikapcsolni
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "A visszahívási tartomány nem ellenőrzött, kövesd az alábbi lépéseket a tartomány ellenőrzéséhez a Google Developer Console-ban:"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "A(z) %(format)s formátum nem található a következő könyvhöz: %(book)d"
@@ -740,7 +740,7 @@ msgstr ""
 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:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
@@ -794,7 +794,7 @@ msgid "Unrar binary file not found"
 msgstr ""
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+msgid "Error executing UnRar"
 msgstr ""
 
 #: cps/kobo_auth.py:89
@@ -810,7 +810,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -876,7 +876,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Belépés"
 
@@ -926,7 +926,7 @@ msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
@@ -935,7 +935,7 @@ msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
@@ -953,7 +953,7 @@ msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Címkék"
 
@@ -963,7 +963,7 @@ msgstr "Címke választó mutatása"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Sorozatok"
 
@@ -981,7 +981,7 @@ msgid "Show author selection"
 msgstr "Szerző választó mutatása"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Kiadók"
 
@@ -991,7 +991,7 @@ msgstr "Kiadó választó mutatása"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -1015,7 +1015,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr ""
 
@@ -1023,7 +1023,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr ""
 
@@ -1031,41 +1031,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Keresés"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
@@ -1270,111 +1270,111 @@ msgstr "Kiadó: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Letöltések"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, 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:1205
+#: cps/web.py:1208
 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:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 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:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 5433214778c2f51f1dc468d389a9f08c15c4af3c..b8413516573c36a6b590496fcefc284bce1515b0 100644
GIT binary patch
delta 11532
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

delta 11594
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

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index ff8bc7372..a625e8eb9 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -285,7 +285,7 @@ msgstr "L'account Gmail è stato verificato con successo"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
@@ -324,8 +324,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
@@ -343,7 +343,7 @@ msgstr "Modifica l'utente %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
@@ -457,7 +457,7 @@ msgstr "Configurazione del Database aggiornata"
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
@@ -500,20 +500,20 @@ msgstr "non installato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonna personale no.%(column)d non esiste nel database di Calibre"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Nessuna"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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"
 
@@ -628,7 +628,7 @@ msgstr "La configurazione di Google Drive non è stata completata correttamente.
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain non è stato verificato. Per favore intraprendi il necessario per verificare il dominio nella developer console di Google"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Formato %(format)s non trovato per il libro: %(book)d"
@@ -732,7 +732,7 @@ msgstr ""
 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:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
@@ -785,7 +785,8 @@ msgid "Unrar binary file not found"
 msgstr "Non ho trovato il file binario di UnRar"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
 #: cps/kobo_auth.py:89
@@ -802,7 +803,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -868,7 +869,7 @@ msgid "{} Stars"
 msgstr "{} Stelle"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Accesso"
 
@@ -918,7 +919,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Libri letti"
 
@@ -927,7 +928,7 @@ msgid "Show read and unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Libri non letti"
 
@@ -945,7 +946,7 @@ msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Categorie"
 
@@ -955,7 +956,7 @@ msgstr "Mostra l'opzione per la selezione delle categorie"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Serie"
 
@@ -973,7 +974,7 @@ msgid "Show author selection"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Editori"
 
@@ -983,7 +984,7 @@ msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Lingue"
 
@@ -1007,7 +1008,7 @@ msgstr "Formati file"
 msgid "Show file formats selection"
 msgstr "Mostra l'opzione per la selezione del formato dei file"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
@@ -1015,7 +1016,7 @@ msgstr "Libri archiviati"
 msgid "Show archived books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Elenco libri"
 
@@ -1023,41 +1024,41 @@ msgstr "Elenco libri"
 msgid "Show Books List"
 msgstr "Mostra l'opzione per visualizzare i libri sottoforma di elenco"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Cerca"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Stato di lettura = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
@@ -1261,111 +1262,111 @@ msgstr "Editore: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Elenco delle valutazioni"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 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:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index b065669a65ff024e647dae32deb174d9cb4906d9..edd663c91489976c6a9b519d860efc585defaca3 100644
GIT binary patch
delta 12706
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
NyP8nc>BHHr{|9Z7S3Up$

delta 12746
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
EA3|<);s5{u

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index e93df087c..74abce633 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: subdiox <subdiox@gmail.com>\n"
 "Language: ja\n"
@@ -285,7 +285,7 @@ msgstr "Gmailアカウントを認証しました"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "DBエラー: %(error)s"
@@ -324,8 +324,8 @@ msgstr "指定したタスクの期間が無効です"
 msgid "Scheduled tasks settings updated"
 msgstr "スケジュールタスクの設定を更新しました"
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
@@ -343,7 +343,7 @@ msgstr "ユーザー %(nick)s を編集"
 msgid "Password for user %(user)s reset"
 msgstr "ユーザー %(user)s のパスワードをリセット"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
@@ -457,7 +457,7 @@ msgstr "DB設定を更新しました"
 msgid "Database Configuration"
 msgstr "DB設定"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
@@ -500,20 +500,20 @@ msgstr "インストールされていません"
 msgid "Execution permissions missing"
 msgstr "実行権限がありません"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "カスタムカラムの%(column)d列目がcalibreのDBに存在しません"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "なし"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "選択した本は利用できません。ファイルが存在しないか、アクセスできません"
 
@@ -628,7 +628,7 @@ msgstr "Googleドライブの設定が完了していません。Googleドライ
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "コールバックドメインが認証されていません。Google Developer Consoleでドメインを認証してください"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "ID: %(book)d の本に %(format)s フォーマットはありません"
@@ -731,7 +731,7 @@ msgstr "ファイル名の変更でエラーが発生しました: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr "このメールアドレスで登録されたアカウントがすでに存在します"
 
@@ -784,7 +784,8 @@ msgid "Unrar binary file not found"
 msgstr "Unrarのバイナリファイルが見つかりません"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Unrarの実行中にエラーが発生しました"
 
 #: cps/kobo_auth.py:89
@@ -800,7 +801,7 @@ msgstr "Kobo設定"
 msgid "Register with %(provider)s"
 msgstr "%(provider)s で登録"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -866,7 +867,7 @@ msgid "{} Stars"
 msgstr "星{}"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "ログイン"
 
@@ -916,7 +917,7 @@ msgid "Show Top Rated Books"
 msgstr "高評価の本を表示"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "既読の本"
 
@@ -925,7 +926,7 @@ msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "未読の本"
 
@@ -943,7 +944,7 @@ msgid "Show Random Books"
 msgstr "ランダムに本を表示"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -953,7 +954,7 @@ msgstr "カテゴリ選択を表示"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "シリーズ"
 
@@ -971,7 +972,7 @@ msgid "Show author selection"
 msgstr "著者選択を表示"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "出版社"
 
@@ -981,7 +982,7 @@ msgstr "出版社選択を表示"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "言語"
 
@@ -1005,7 +1006,7 @@ msgstr "ファイル形式"
 msgid "Show file formats selection"
 msgstr "ファイル形式選択を表示"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "アーカイブされた本"
 
@@ -1013,7 +1014,7 @@ msgstr "アーカイブされた本"
 msgid "Show archived books"
 msgstr "アーカイブされた本を表示"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "本の一覧"
 
@@ -1021,41 +1022,41 @@ msgstr "本の一覧"
 msgid "Show Books List"
 msgstr "本の一覧を表示"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "検索"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "既読/未読状況 = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "カスタムカラムの検索でエラーが発生しました。Calibre-Webを再起動してください"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "詳細検索"
 
@@ -1257,111 +1258,111 @@ msgstr "出版社: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr "評価: なし"
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "評価: 星%(rating)s"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "ファイル形式: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "ダウンロード数"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "評価一覧"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "ファイル形式一覧"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "メールサーバーが設定されていません。管理者に連絡してください"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP認証を有効化できません"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "代わりに '%(nickname)s' としてログインします。LDAPサーバーにアクセスできないか、ユーザーが存在しません"
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "ログインできません: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "ユーザー名またはパスワードが違います"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "新しいパスワードがあなたのメールアドレスに送信されました"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "パスワードをリセットするには、有効なユーザー名を入力してください"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "'%(nickname)s' としてログインしました"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 560d590912de554194e96edb5c26e7c700d73b79..ae8f24dcc9337f4dd06e9f22db1fbe9f7d558179 100644
GIT binary patch
delta 22
ecmaF3i}B$u#tpZX*^Lbq3=OS}Ha}9Xw*&xh9SE=h

delta 22
ecmaF3i}B$u#tpZX*$vGU49%@fHa}9Xw*&xhcnG@y

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 0000e91b5..8736dc07c 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -291,7 +291,7 @@ msgstr ""
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -330,8 +330,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -349,7 +349,7 @@ msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
@@ -465,7 +465,7 @@ msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
@@ -508,20 +508,20 @@ msgstr "មិនបានតម្លើង"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "គ្មាន"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -636,7 +636,7 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
@@ -740,7 +740,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgid "Unrar binary file not found"
 msgstr ""
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+msgid "Error executing UnRar"
 msgstr ""
 
 #: cps/kobo_auth.py:89
@@ -809,7 +809,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -875,7 +875,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -925,7 +925,7 @@ msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
@@ -934,7 +934,7 @@ msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
@@ -952,7 +952,7 @@ msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
@@ -962,7 +962,7 @@ msgstr "បង្ហាញជម្រើសប្រភេទ"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "ស៊េរី"
 
@@ -980,7 +980,7 @@ msgid "Show author selection"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr ""
 
@@ -990,7 +990,7 @@ msgstr ""
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "ភាសានានា"
 
@@ -1014,7 +1014,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr ""
 
@@ -1022,7 +1022,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr ""
 
@@ -1030,41 +1030,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
@@ -1268,111 +1268,111 @@ msgstr ""
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "ឯកសារ DLS"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index 864c624691caec534f4d411df667fc9835e0e880..a007f4a1e634a5ed4ad59c7fba656a65d2ab513b 100644
GIT binary patch
delta 11790
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
Kb-|);>Hh;uCVLqG

delta 11855
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

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 8ce4c31df..9d912a0b8 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -284,7 +284,7 @@ msgstr "Gmail 계정 인증 성공"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "데이터베이스 오류: %(error)s."
@@ -323,8 +323,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
 
@@ -342,7 +342,7 @@ msgstr "사용자 %(nick)s 편집"
 msgid "Password for user %(user)s reset"
 msgstr "사용자 %(user)s의 비밀번호 재설정"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
 
@@ -456,7 +456,7 @@ msgstr "데이터베이스 설정이 업데이트 되었습니다"
 msgid "Database Configuration"
 msgstr "데이터베이스 구성"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "모든 필드를 채워주십시오!"
 
@@ -499,20 +499,20 @@ msgstr "설치되지 않음"
 msgid "Execution permissions missing"
 msgstr "실행 권한 누락"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "None"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다"
 
@@ -627,7 +627,7 @@ msgstr "Google 드라이브 설정이 완료되지 않았습니다. Google 드
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "콜백 도메인이 확인되지 않았습니다. 단계에 따라 Google 개발자 콘솔에서 도메인을 확인하세요"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "책 ID에 대한 %(format)s 형식을 찾을 수 없음: %(book)d"
@@ -731,7 +731,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr "등록되어 있는 이메일 주소입니다"
 
@@ -784,7 +784,8 @@ msgid "Unrar binary file not found"
 msgstr "Unrar 바이너리 파일을 찾을 수 없습니다"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "UnRar 실행 오류"
 
 #: cps/kobo_auth.py:89
@@ -801,7 +802,7 @@ msgstr "Kobo 설정"
 msgid "Register with %(provider)s"
 msgstr "%(provider)s에 등록"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
@@ -867,7 +868,7 @@ msgid "{} Stars"
 msgstr "{} Stars"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "로그인"
 
@@ -917,7 +918,7 @@ msgid "Show Top Rated Books"
 msgstr "평점이 높은 책 보기"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "읽은 책"
 
@@ -926,7 +927,7 @@ msgid "Show read and unread"
 msgstr "읽은 책과 읽지 않은 책 보기"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "읽지 않은 책"
 
@@ -944,7 +945,7 @@ msgid "Show Random Books"
 msgstr "무작위 추천"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "카테고리"
 
@@ -954,7 +955,7 @@ msgstr "카테고리별 보기"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "시리즈"
 
@@ -972,7 +973,7 @@ msgid "Show author selection"
 msgstr "저자별 보기"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "출판사"
 
@@ -982,7 +983,7 @@ msgstr "출판사별 보기"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "언어"
 
@@ -1006,7 +1007,7 @@ msgstr "파일 유형"
 msgid "Show file formats selection"
 msgstr "파일 유형별 보기"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "보관된 책"
 
@@ -1014,7 +1015,7 @@ msgstr "보관된 책"
 msgid "Show archived books"
 msgstr "보관된 책 보기"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "책 목록"
 
@@ -1022,41 +1023,41 @@ msgstr "책 목록"
 msgid "Show Books List"
 msgstr "책 목록 보기"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "검색"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Published after "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Published before "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "평점 <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "평점 >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "읽은 상태 = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "상세 검색"
 
@@ -1259,111 +1260,111 @@ msgstr "출판사: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "시리즈: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "평가: %(rating)s 별"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "파일 유형: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "카테고리: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "언어: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "다운로드"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "평점 목록"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "파일 유형 목록"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다"
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "책을 보내는 중에 오류 발생: %(res)s"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "등록"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "이메일을 등록할 수 없습니다"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "확인을 위한 이메일이 발송되었습니다."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP 인증을 활성화할 수 없습니다"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "로그인 실패: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "잘못된 사용자명 또는 비밀번호"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "새 비밀번호가 이메일로 전송되었습니다"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "다음 사용자로 로그인: '%(nickname)s"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 프로필"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "프로필이 업데이트 됨"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 281de2ab016cb1cac03575ccba60121b1f3c037a..701d0c3a6e355b26606e4ba310db61c8bff460a0 100644
GIT binary patch
delta 11016
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

delta 11089
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
T#h%ilVqTtAG;3Gk^3?wWnQP#E

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index f05ce8b48..5ac4c332c 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -291,7 +291,7 @@ msgstr "Gmail Account succesvol geverifieerd"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
@@ -330,8 +330,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
@@ -349,7 +349,7 @@ msgstr "Gebruiker '%(nick)s' bewerken"
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
@@ -467,7 +467,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
@@ -511,20 +511,20 @@ msgstr "niet geïnstalleerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Geen"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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"
 
@@ -639,7 +639,7 @@ msgstr "Het instellen van Google Drive is niet afgerond, heractiveer Google Driv
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Het callback-domein is niet geverifieerd. Volg de stappen in de Google-ontwikkelaarsconsole om het domein te verifiëren"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formaat niet gevonden voor boek met id: %(book)d"
@@ -743,7 +743,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
@@ -797,7 +797,8 @@ msgid "Unrar binary file not found"
 msgstr "Unrar executable niet gevonden"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Fout bij het uitvoeren van Unrar"
 
 #: cps/kobo_auth.py:89
@@ -814,7 +815,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -880,7 +881,7 @@ msgid "{} Stars"
 msgstr "{} sterren"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Inloggen"
 
@@ -930,7 +931,7 @@ msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
@@ -939,7 +940,7 @@ msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
@@ -957,7 +958,7 @@ msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -967,7 +968,7 @@ msgstr "Categoriekeuze tonen"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Boekenreeksen"
 
@@ -985,7 +986,7 @@ msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Uitgevers"
 
@@ -995,7 +996,7 @@ msgstr "Uitgeverskeuze tonen"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Talen"
 
@@ -1019,7 +1020,7 @@ msgstr "Bestandsformaten"
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
@@ -1027,7 +1028,7 @@ msgstr "Gearchiveerde boeken"
 msgid "Show archived books"
 msgstr "Gearchiveerde boeken tonen"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Boekenlijst"
 
@@ -1035,41 +1036,41 @@ msgstr "Boekenlijst"
 msgid "Show Books List"
 msgstr "Boekenlijst tonen"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lees Status = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
@@ -1274,111 +1275,111 @@ msgstr "Uitgever: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, 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:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 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:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index fcabf8d316c6e50731e788faf298a494abdebbfc..66a2c88226df7d25ffa29b4468a1f1736790d8cc 100644
GIT binary patch
delta 11016
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
G^Zx)=IOK%@

delta 11085
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
Mc=E3EWh>JD2SFwM!2kdN

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index d57948037..a2b77171a 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -291,7 +291,7 @@ msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
@@ -330,8 +330,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
@@ -350,7 +350,7 @@ msgstr "Edytuj użytkownika %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
@@ -468,7 +468,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
@@ -512,20 +512,20 @@ msgstr "nie zainstalowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Niestandardowa kolumna No.%(column)d nie istnieje w bazie calibre"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Brak"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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"
 
@@ -640,7 +640,7 @@ msgstr "Konfiguracja Google Drive nie została zakończona, spróbuj dezaktywowa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Zwrotna domena nie jest zweryfikowana, proszę zweryfikowania domenę w konsoli deweloperskiej google"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Nie znaleziono formatu %(format)s dla id książki: %(book)d"
@@ -746,7 +746,7 @@ msgstr ""
 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:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
@@ -799,7 +799,8 @@ msgid "Unrar binary file not found"
 msgstr "Plik wykonywalny programu unrar nie znaleziony"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Błąd przy wykonywaniu unrar"
 
 #: cps/kobo_auth.py:89
@@ -817,7 +818,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -883,7 +884,7 @@ msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -933,7 +934,7 @@ msgid "Show Top Rated Books"
 msgstr "Pokaż menu najwyżej ocenionych książek"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Przeczytane"
 
@@ -942,7 +943,7 @@ msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Nieprzeczytane"
 
@@ -960,7 +961,7 @@ msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -970,7 +971,7 @@ msgstr "Pokaż menu wyboru kategorii"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Cykle"
 
@@ -988,7 +989,7 @@ msgid "Show author selection"
 msgstr "Pokaż menu wyboru autora"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Wydawcy"
 
@@ -998,7 +999,7 @@ msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Języki"
 
@@ -1022,7 +1023,7 @@ msgstr "Formaty plików"
 msgid "Show file formats selection"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
@@ -1030,7 +1031,7 @@ msgstr "Zarchiwizowane książki"
 msgid "Show archived books"
 msgstr "Pokaż zarchiwizowane książki"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Lista książek"
 
@@ -1038,42 +1039,42 @@ msgstr "Lista książek"
 msgid "Show Books List"
 msgstr "Pokaż listę książek"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Szukaj"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status przeczytania = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 #, fuzzy
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
@@ -1278,111 +1279,111 @@ msgstr "Wydawca: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, 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:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 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:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, 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:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 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:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 868d8e9e50478fa61ebdba589bf1b8d7384232cf..7ed2b11bc360bdc99556e5abb7a26396fefe211a 100644
GIT binary patch
literal 59965
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
JZ{}g9{}1CZNB{r;

delta 15702
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

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 5b863bdc6..8d32c6747 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: cps/about.py:84
 msgid "Statistics"
-msgstr "Estatística"
+msgstr "Estatísticas"
 
 #: cps/admin.py:146
 msgid "Server restarted, please reload page"
@@ -25,7 +25,7 @@ msgstr "Servidor reiniciado, por favor recarregue a página"
 
 #: cps/admin.py:148
 msgid "Performing shutdown of server, please close window"
-msgstr "Executando o desligamento do servidor, por favor, feche a janela"
+msgstr "Executando o desligamento do servidor, por favor feche a janela"
 
 #: cps/admin.py:156
 msgid "Reconnect successful"
@@ -43,7 +43,7 @@ msgstr "Desconhecido"
 
 #: cps/admin.py:217
 msgid "Admin page"
-msgstr "Página de administração"
+msgstr "Página de Administração"
 
 #: cps/admin.py:237
 msgid "Basic Configuration"
@@ -54,9 +54,8 @@ msgid "UI Configuration"
 msgstr "Configuração de UI"
 
 #: cps/admin.py:309 cps/templates/admin.html:51
-#, fuzzy
 msgid "Edit Users"
-msgstr "Usuário Admin"
+msgstr "Editar Usuários"
 
 #: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
@@ -68,70 +67,69 @@ msgid "User not found"
 msgstr "Usuário não encontrado"
 
 #: cps/admin.py:394
-#, fuzzy
 msgid "{} users deleted successfully"
-msgstr "{} Usuário Importado com Sucesso"
+msgstr "{} usuário(s) deletedos com sucesso"
 
 #: cps/admin.py:417 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
-msgstr "Mostrar tudo"
+msgstr "Mostrar Tudo"
 
 #: cps/admin.py:438 cps/admin.py:444
 msgid "Malformed request"
-msgstr ""
+msgstr "Requisição Malformada"
 
 #: cps/admin.py:456 cps/admin.py:1968
 msgid "Guest Name can't be changed"
-msgstr ""
+msgstr "Nome do Convidado não pode ser alterado"
 
 #: cps/admin.py:468
 msgid "Guest can't have this role"
-msgstr ""
+msgstr "Convidado não pode ter esta função"
 
 #: cps/admin.py:480 cps/admin.py:1926
 msgid "No admin user remaining, can't remove admin role"
-msgstr "Nenhum usuário administrador restante, não pode remover a função de administrador"
+msgstr "Nenhum usuário administrador restante, impossível remover a função de administrador"
 
 #: cps/admin.py:484 cps/admin.py:498
 msgid "Value has to be true or false"
-msgstr ""
+msgstr "Valor não pode ser Verdadeiro ou Falso"
 
 #: cps/admin.py:486
 msgid "Invalid role"
-msgstr ""
+msgstr "Função Inválida"
 
 #: cps/admin.py:490
 msgid "Guest can't have this view"
-msgstr ""
+msgstr "Convidado não pode ter esta visão"
 
 #: cps/admin.py:500
 msgid "Invalid view"
-msgstr ""
+msgstr "Visão Inválida"
 
 #: cps/admin.py:503
 msgid "Guest's Locale is determined automatically and can't be set"
-msgstr ""
+msgstr "O idioma do Convidado é detectado automaticamente e não pode ser alterado"
 
 #: cps/admin.py:507
 msgid "No Valid Locale Given"
-msgstr ""
+msgstr "Nenhum Idioma Válido Fornecido"
 
 #: cps/admin.py:518
 msgid "No Valid Book Language Given"
-msgstr ""
+msgstr "Nenhum Idioma do Livro Válido Fornecido"
 
 #: cps/admin.py:520 cps/editbooks.py:439
 msgid "Parameter not found"
-msgstr ""
+msgstr "Parametro não encontrado"
 
 #: cps/admin.py:557
 msgid "Invalid Read Column"
-msgstr ""
+msgstr "Coluna Lido Inválida"
 
 #: cps/admin.py:563
 msgid "Invalid Restricted Column"
-msgstr ""
+msgstr "Coluna Restrito Inválida"
 
 #: cps/admin.py:583 cps/admin.py:1797
 msgid "Calibre-Web configuration updated"
@@ -139,59 +137,55 @@ msgstr "Configuração do Calibre-Web atualizada"
 
 #: cps/admin.py:595
 msgid "Do you really want to delete the Kobo Token?"
-msgstr "Você realmente quer excluir o Kobo Token?"
+msgstr "Você realmente quer apagar a Kobo Token?"
 
 #: cps/admin.py:597
 msgid "Do you really want to delete this domain?"
-msgstr "Você realmente quer excluir este domínio?"
+msgstr "Você realmente quer apagar este domínio?"
 
 #: cps/admin.py:599
 msgid "Do you really want to delete this user?"
-msgstr "Você realmente quer excluir este usuário?"
+msgstr "Você realmente quer apagar este usuário?"
 
 #: cps/admin.py:601
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Tem certeza que quer apagar essa estante?"
 
 #: cps/admin.py:603
-#, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
-msgstr "Tem certeza que quer apagar essa estante?"
+msgstr "Tem certeza que quer alterar o idioma do(s) usuário(s) selecionados?"
 
 #: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
-msgstr ""
+msgstr "Tem certeza que quer alterar os idiomas de livros visíveis par o usuário(s) selecionado(s)?"
 
 #: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
-msgstr ""
+msgstr "Tem certeza que quer alterar a função selecionada para o(s) usuário(s) selecionado(s)?"
 
 #: cps/admin.py:609
-#, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
-msgstr "Tem certeza que quer apagar essa estante?"
+msgstr "Tem certeza que quer alterar as restriçõeo selecionada para o(s) usuário(s) selecionado(s)?"
 
 #: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
-msgstr ""
+msgstr "Tem certeza de que quer alterar as restrições de visibilidade selecionadas para os usuários selecionados?"
 
 #: cps/admin.py:614
-#, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
-msgstr "Tem certeza que quer apagar essa estante?"
+msgstr "Tem certeza de que quer alterar o comportamento de sincronização da estante para o usuário selecionado?"
 
 #: cps/admin.py:616
-#, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
-msgstr "Tens a certeza que queres fechar?"
+msgstr "Tem certeza que queres alterar a localização da biblioteca Calibre?"
 
 #: cps/admin.py:618
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
-msgstr ""
+msgstr "O Calibre-Web buscará por Capas atualizadas e atualizará as Miniaturas de Capas, isso pode demorar um pouco"
 
 #: cps/admin.py:621
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr ""
+msgstr "Tem certeza de que deseja apagar o banco de dados de sincronização do Calibre-Web para forçar uma sincronização completa com seu Kobo Reader?"
 
 #: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
@@ -203,23 +197,23 @@ msgstr "Negar"
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
-msgstr "Permita"
+msgstr "Permitir"
 
 #: cps/admin.py:907
 msgid "{} sync entries deleted"
-msgstr ""
+msgstr "{} entradas de sincronização deletadas"
 
 #: cps/admin.py:955
 msgid "Tag not found"
-msgstr ""
+msgstr "Tag não encontrada"
 
 #: cps/admin.py:967
 msgid "Invalid Action"
-msgstr ""
+msgstr "Ação Inválida"
 
 #: cps/admin.py:1082
 msgid "client_secrets.json Is Not Configured For Web Application"
-msgstr "client_secrets.json não está configurado para aplicativo da web"
+msgstr "client_secrets.json Não Está Configurado para Aplicação Web"
 
 #: cps/admin.py:1127
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
@@ -234,13 +228,12 @@ msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Digite um provedor LDAP, porta, DN e identificador de objeto do usuário"
 
 #: cps/admin.py:1169
-#, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
-msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
+msgstr "Por favor, digite uma Conta de Serviço LDAP e Senha"
 
 #: cps/admin.py:1172
 msgid "Please Enter a LDAP Service Account"
-msgstr ""
+msgstr "Por favor, digite uma Conta de Serviço LDAP"
 
 #: cps/admin.py:1177
 #, python-format
@@ -271,7 +264,7 @@ msgstr "Filtro de usuário de membro LDAP tem parênteses incomparáveis"
 
 #: cps/admin.py:1201
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
-msgstr "LDAP CACertificate, Certificados ou chave de localização não é válida, Insira o caminho correto"
+msgstr "Localização de LDAP CACertificate, Certificados ou Key Inválida, Insira o Caminho Correto"
 
 #: cps/admin.py:1232 cps/admin.py:1858
 msgid "Add new user"
@@ -283,13 +276,13 @@ msgstr "Editar configurações do servidor de e-mail"
 
 #: cps/admin.py:1260
 msgid "Gmail Account Verification Successful"
-msgstr ""
+msgstr "Verificação da Conta Gmail com Sucesso"
 
 #: cps/admin.py:1279 cps/admin.py:1282 cps/admin.py:1663 cps/admin.py:1781
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
@@ -297,7 +290,7 @@ msgstr "Erro de banco de dados: %(error)s."
 #: cps/admin.py:1289
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr ""
+msgstr "E-mail de teste enfileirado para envio para %(email)s, verifique o resultado em Tarefas"
 
 #: cps/admin.py:1292
 #, python-format
@@ -314,46 +307,46 @@ msgstr "Atualização das configurações do servidor de e-mail"
 
 #: cps/admin.py:1319 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
-msgstr ""
+msgstr "Editar configurações de tarefas agendadas"
 
 #: cps/admin.py:1331
 msgid "Invalid start time for task specified"
-msgstr ""
+msgstr "Hora de início inválida para a tarefa especificada"
 
 #: cps/admin.py:1336
 msgid "Invalid duration for task specified"
-msgstr ""
+msgstr "Duração inválida para a tarefa especificada"
 
 #: cps/admin.py:1345
 msgid "Scheduled tasks settings updated"
-msgstr ""
+msgstr "Configurações de tarefas agendadas atualizadas"
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
 #: cps/admin.py:1359
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "Settings DB não é gravável"
 
 #: cps/admin.py:1389 cps/admin.py:1984
 #, python-format
 msgid "Edit User %(nick)s"
-msgstr "Editar usuário %(nick)s"
+msgstr "Editar Usuário %(nick)s"
 
 #: cps/admin.py:1401
 #, python-format
 msgid "Password for user %(user)s reset"
-msgstr "Senha para redefinição do usuário %(user)s"
+msgstr "Senha do usuário %(user)s redefinida"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
 #: cps/admin.py:1418
 msgid "Logfile viewer"
-msgstr "visualizador de arquivo de registro"
+msgstr "Visualizador do Log"
 
 #: cps/admin.py:1484
 msgid "Requesting update package"
@@ -361,23 +354,23 @@ msgstr "Solicitação de pacote de atualização"
 
 #: cps/admin.py:1485
 msgid "Downloading update package"
-msgstr "Download do pacote de atualização"
+msgstr "Baixando pacote de atualização"
 
 #: cps/admin.py:1486
 msgid "Unzipping update package"
-msgstr "Descompactação de pacote de atualização"
+msgstr "Descompactando pacote de atualização"
 
 #: cps/admin.py:1487
 msgid "Replacing files"
-msgstr "Substituição de arquivos"
+msgstr "Substituindo arquivos"
 
 #: cps/admin.py:1488
 msgid "Database connections are closed"
-msgstr "As ligações à base de dados estão fechadas"
+msgstr "As conexões à base de dados estão fechadas"
 
 #: cps/admin.py:1489
 msgid "Stopping server"
-msgstr "Parar servidor"
+msgstr "Parando servidor"
 
 #: cps/admin.py:1490
 msgid "Update finished, please press okay and reload page"
@@ -405,22 +398,20 @@ msgid "General error"
 msgstr "Erro geral"
 
 #: cps/admin.py:1495
-#, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Arquivo de atualização não pôde ser salvo no diretório temporário"
 
 #: cps/admin.py:1496
 msgid "Files could not be replaced during update"
-msgstr ""
+msgstr "Arquivos não puderam ser substituídos durante a atualização"
 
 #: cps/admin.py:1520
-#, fuzzy
 msgid "Failed to extract at least One LDAP User"
-msgstr "Falha na criação no mínimo de um usuário LDAP"
+msgstr "Falha ao extrair pelo menos um usuário LDAP"
 
 #: cps/admin.py:1565
 msgid "Failed to Create at Least One LDAP User"
-msgstr "Falha na criação no mínimo de um usuário LDAP"
+msgstr "Falha ao criar pelo menos um usuário LDAP"
 
 #: cps/admin.py:1578
 #, python-format
@@ -429,7 +420,7 @@ msgstr "Erro: %(ldaperror)s"
 
 #: cps/admin.py:1582
 msgid "Error: No user returned in response of LDAP server"
-msgstr "Erro: Nenhum usuário retornado em resposta do servidor LDAP"
+msgstr "Erro: Nenhum usuário retornado na resposta do servidor LDAP"
 
 #: cps/admin.py:1615
 msgid "At Least One LDAP User Not Found in Database"
@@ -449,23 +440,21 @@ msgstr "DB não é gravável"
 
 #: cps/admin.py:1708
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "A localização do arquivo-chave não é válida, por favor insira o caminho correto"
+msgstr "Localização do Keyfile Inválida, Insira o Caminho Correto"
 
 #: cps/admin.py:1712
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "A localização do arquivo de certificação não é válida, digite o caminho correto"
+msgstr "Localização do Certfile Inválida, Insira o Caminho Correto"
 
 #: cps/admin.py:1820
-#, fuzzy
 msgid "Database Settings updated"
-msgstr "Atualização das configurações do servidor de e-mail"
+msgstr "Configurações do Banco de Dados Atualizada"
 
 #: cps/admin.py:1828
-#, fuzzy
 msgid "Database Configuration"
-msgstr "Configuração das Características"
+msgstr "Configuração do Banco de Dados"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
@@ -479,9 +468,8 @@ msgid "User '%(user)s' created"
 msgstr "Usuário '%(user)s' criado"
 
 #: cps/admin.py:1875
-#, fuzzy
 msgid "Found an existing account for this e-mail address or name."
-msgstr "Encontrei uma conta existente para este endereço de e-mail ou apelido."
+msgstr "Encontrada uma conta existente para este endereço de e-mail ou apelido."
 
 #: cps/admin.py:1905
 #, python-format
@@ -490,11 +478,11 @@ msgstr "Usuário '%(nick)s' excluído"
 
 #: cps/admin.py:1907 cps/admin.py:1908
 msgid "Can't delete Guest User"
-msgstr ""
+msgstr "Impossível excluir Convidado"
 
 #: cps/admin.py:1911
 msgid "No admin user remaining, can't delete user"
-msgstr "Nenhum usuário administrador restante, não é possível excluir o usuário"
+msgstr "Nenhum usuário administrador restante, não é possível apagar o usuário"
 
 #: cps/admin.py:1988
 #, python-format
@@ -509,30 +497,30 @@ msgstr "não instalado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:679 cps/web.py:720
-#, fuzzy, python-format
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
+#, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
-msgstr "A coluna personalizada No.%(column)d não existe no banco de dados do calibre"
+msgstr "A Coluna Personalizada No.%(column)d não existe no banco de dados do calibre"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Nenhum"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr "Oops! O título do livro seleccionado não está disponível. O arquivo não existe ou não é acessível"
+msgstr "Oops! O Livro selecionado não está disponível. O arquivo não existe ou não é acessível"
 
 #: cps/editbooks.py:154 cps/editbooks.py:1217
 msgid "User has no rights to upload cover"
-msgstr ""
+msgstr "Usuário não tem permissão para fazer upload da capa"
 
 #: cps/editbooks.py:174 cps/editbooks.py:712
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
-msgstr "Os identificadores não são sensíveis a maiúsculas ou minúsculas, mas sim a maiúsculas e minúsculas"
+msgstr "Os identificadores não diferenciam maiúsculas de minúsculas, substituindo o identificador antigo"
 
 #: cps/editbooks.py:215
 msgid "Metadata successfully updated"
@@ -540,7 +528,7 @@ msgstr "Metadados atualizados com sucesso"
 
 #: cps/editbooks.py:233
 msgid "Error editing book: {}"
-msgstr ""
+msgstr "Erro ao editar o livro: {}"
 
 #: cps/editbooks.py:288
 #, python-format
@@ -549,7 +537,7 @@ msgstr "Arquivo %(file)s enviado"
 
 #: cps/editbooks.py:315
 msgid "Source or destination format for conversion missing"
-msgstr "Falta o formato de origem ou destino para a conversão"
+msgstr "Formato de origem ou destino para conversão ausente"
 
 #: cps/editbooks.py:323
 #, python-format
@@ -563,10 +551,10 @@ msgstr "Ocorreu um erro ao converter este livro: %(res)s"
 
 #: cps/editbooks.py:631
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "O livro carregado provavelmente existe na biblioteca, considere mudar antes de carregar novo: "
+msgstr "O livro carregado provavelmente existe na biblioteca, considere alterar antes de carregar novo: "
 
 #: cps/editbooks.py:686 cps/editbooks.py:1011
-#, fuzzy, python-format
+#, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s não é um idioma válido"
 
@@ -587,19 +575,19 @@ msgstr "O arquivo %(filename)s não pôde ser salvo no diretório temporário"
 #: cps/editbooks.py:756
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "Falha ao mover arquivo de capa  %(file)s: %(error)s"
+msgstr "Falha ao mover arquivo de capa %(file)s: %(error)s"
 
 #: cps/editbooks.py:813 cps/editbooks.py:815
 msgid "Book Format Successfully Deleted"
-msgstr "Formato do Livro Eliminado com Sucesso"
+msgstr "Formato do Livro Apagado com Sucesso"
 
 #: cps/editbooks.py:822 cps/editbooks.py:824
 msgid "Book Successfully Deleted"
-msgstr "Livro Eliminado com Sucesso"
+msgstr "Livro Apagado com Sucesso"
 
 #: cps/editbooks.py:876
 msgid "You are missing permissions to delete books"
-msgstr ""
+msgstr "Você não tem permissão para apagar livros"
 
 #: cps/editbooks.py:926
 msgid "edit metadata"
@@ -608,11 +596,11 @@ msgstr "editar metadados"
 #: cps/editbooks.py:975
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
+msgstr "%(seriesindex)s não é um número válido, ignorando"
 
 #: cps/editbooks.py:1153
 msgid "User has no rights to upload additional file formats"
-msgstr ""
+msgstr "Usuário não tem direitos para fazer upload de formatos de arquivo adicionais"
 
 #: cps/editbooks.py:1174
 #, python-format
@@ -635,9 +623,9 @@ msgstr "Configuração do Google Drive não concluída, tente desativar e ativar
 
 #: cps/gdrive.py:95
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "O domínio Callback não é verificado, por favor siga os passos para verificar o domínio no console do desenvolvedor do google"
+msgstr "O domínio Callback não foi verificado, por favor siga os passos para verificar o domínio no console do desenvolvedor do google"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Formato %(format)s não encontrado para o id do livro: %(book)d"
@@ -645,7 +633,7 @@ msgstr "Formato %(format)s não encontrado para o id do livro: %(book)d"
 #: cps/helper.py:86 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "%(format)s não encontrado no Google Drive:  %(fn)s"
+msgstr "%(format)s não encontrado no Google Drive: %(fn)s"
 
 #: cps/helper.py:91
 #, python-format
@@ -654,9 +642,8 @@ msgstr "%(format)s não encontrado: %(fn)s"
 
 #: cps/helper.py:96 cps/helper.py:225 cps/templates/detail.html:42
 #: cps/templates/detail.html:46
-#, fuzzy
 msgid "Send to E-Reader"
-msgstr "Enviar para Kindle"
+msgstr "Enviar para E-Reader"
 
 #: cps/helper.py:97 cps/helper.py:115 cps/helper.py:227
 msgid "This e-mail has been sent via Calibre-Web."
@@ -680,19 +667,19 @@ msgid "Registration e-mail for user: %(name)s"
 msgstr "E-mail de registro do usuário: %(name)s"
 
 #: cps/helper.py:147 cps/helper.py:153
-#, fuzzy, python-format
+#, python-format
 msgid "Convert %(orig)s to %(format)s and send to E-Reader"
-msgstr "Converta %(orig)s em %(format)s e envie para o Kindle"
+msgstr "Converter %(orig)s em %(format)s e enviar para E-Reader"
 
 #: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180 cps/helper.py:184
-#, fuzzy, python-format
+#, python-format
 msgid "Send %(format)s to E-Reader"
-msgstr "Envie  %(format)s para o Kindle"
+msgstr "Enviar %(format)s para o E-Reader"
 
 #: cps/helper.py:224 cps/tasks/convert.py:92
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to E-Reader"
-msgstr "Enviar para Kindle"
+msgstr "%(book)s enviado para E-Reader"
 
 #: cps/helper.py:229
 msgid "The requested file could not be read. Maybe wrong permissions?"
@@ -700,7 +687,7 @@ msgstr "O arquivo solicitado não pôde ser lido. Talvez permissões erradas?"
 
 #: cps/helper.py:344
 msgid "Read status could not set: {}"
-msgstr ""
+msgstr "Status Lido não pode ser alterado: {}"
 
 #: cps/helper.py:367
 #, python-format
@@ -713,14 +700,14 @@ msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Falha ao excluir livro %(id)s: %(message)s"
 
 #: cps/helper.py:384
-#, fuzzy, python-format
+#, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
-msgstr "Excluindo livro %(id)s, caminho do livro inválido: %(path)s"
+msgstr "Excluindo livro %(id)s somente do banco de dados, caminho do livro inválido: %(path)s"
 
 #: cps/helper.py:449
-#, fuzzy, python-format
+#, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Renomear título de: '%(src)s' para '%(dest)s' falhou com o erro: %(error)s"
+msgstr "Renomear autor de: '%(src)s' para '%(dest)s' falhou com o erro: %(error)s"
 
 #: cps/helper.py:521 cps/helper.py:530
 #, python-format
@@ -734,17 +721,16 @@ msgstr "Renomear título de: '%(src)s' para '%(dest)s' falhou com o erro: %(erro
 
 #: cps/helper.py:584
 msgid "Error in rename file in path: {}"
-msgstr ""
+msgstr "Erro ao renomear arquivo no caminho: {}"
 
 #: cps/helper.py:602
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:643 cps/web.py:1408
-#, fuzzy
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
-msgstr "Encontrado uma conta existente para este endereço de e-mail."
+msgstr "Encontrada uma conta existente para este endereço de e-mail."
 
 #: cps/helper.py:651
 msgid "This username is already taken"
@@ -756,7 +742,7 @@ msgstr "Formato de endereço de e-mail inválido"
 
 #: cps/helper.py:811
 msgid "Python module 'advocate' is not installed but is needed for cover uploads"
-msgstr ""
+msgstr "O módulo Python 'advocate' não está instalado, mas é necessário para uploads de capa"
 
 #: cps/helper.py:821
 msgid "Error Downloading Cover"
@@ -768,7 +754,7 @@ msgstr "Erro de Formato da Capa"
 
 #: cps/helper.py:827
 msgid "You are not allowed to access localhost or the local network for cover uploads"
-msgstr ""
+msgstr "Você não tem permissão para acessar localhost ou a rede local para uploads de capa"
 
 #: cps/helper.py:837
 msgid "Failed to create path for cover"
@@ -780,11 +766,11 @@ msgstr "O arquivo de capa não é um arquivo de imagem válido, ou não pôde se
 
 #: cps/helper.py:864
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr "Apenas ficheiros jpg/jpeg/png/webp/bmp são suportados como arquivos de capa"
+msgstr "Apenas arquivos jpg/jpeg/png/webp/bmp são suportados como arquivos de capa"
 
 #: cps/helper.py:876
 msgid "Invalid cover file content"
-msgstr ""
+msgstr "Conteúdo do arquivo de capa inválido"
 
 #: cps/helper.py:880
 msgid "Only jpg/jpeg files are supported as coverfile"
@@ -792,14 +778,14 @@ msgstr "Apenas arquivos jpg/jpeg são suportados como arquivos de capa"
 
 #: cps/helper.py:932
 msgid "Unrar binary file not found"
-msgstr "Unrar arquivo binário não encontrado"
+msgstr "Binário Unrar não encontrado"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Erro excecutando UnRar"
 
 #: cps/kobo_auth.py:89
-#, fuzzy
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Por favor, acesse o calibre-web de um host não local para obter um api_endpoint válido para o dispositivo kobo"
 
@@ -812,7 +798,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -824,7 +810,7 @@ msgstr "Link para %(oauth)s bem-sucedido"
 
 #: cps/oauth_bb.py:155
 msgid "Login failed, No User Linked With OAuth Account"
-msgstr "Login falhou, nenhum utilizador ligado a uma conta OAuth"
+msgstr "Login falhou, nenhum usuário ligado a uma conta OAuth"
 
 #: cps/oauth_bb.py:197
 #, python-format
@@ -855,30 +841,30 @@ msgstr "Falha no login com o Google."
 
 #: cps/oauth_bb.py:285
 msgid "Failed to fetch user info from Google."
-msgstr "Falha em ir buscar informações de usuário ao Google."
+msgstr "Falha na busca de informações de usuário no Google."
 
 #: cps/oauth_bb.py:332
 msgid "GitHub Oauth error, please retry later."
-msgstr "Erro de GitHub Oauth, por favor tente novamente mais tarde."
+msgstr "Erro no Oauth do GitHub, tente novamente mais tarde."
 
 #: cps/oauth_bb.py:335
 msgid "GitHub Oauth error: {}"
-msgstr ""
+msgstr "Erro no Oauth do GitHub: {}"
 
 #: cps/oauth_bb.py:356
 msgid "Google Oauth error, please retry later."
-msgstr "Erro no Google Oauth, por favor tente novamente mais tarde."
+msgstr "Erro no Google Oauth, tente novamente mais tarde."
 
 #: cps/oauth_bb.py:359
 msgid "Google Oauth error: {}"
-msgstr ""
+msgstr "Erro no Oauth do Google: {}"
 
 #: cps/opds.py:287
 msgid "{} Stars"
-msgstr ""
+msgstr "{} Estrelas"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Login"
 
@@ -912,12 +898,12 @@ msgstr "Mostrar Livros Quentes"
 
 #: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
-msgstr "Livros descarregados"
+msgstr "Livros Baixados"
 
 #: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
-msgstr "Mostrar Livros Descarregados"
+msgstr "Mostrar Livros Baixados"
 
 #: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
 msgid "Top Rated Books"
@@ -925,10 +911,10 @@ msgstr "Livros Mais Bem Avaliados"
 
 #: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
-msgstr "Mostrar os melhores livros avaliados"
+msgstr "Mostrar Livros Mais Bem Avaliados"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Livros Lidos"
 
@@ -937,13 +923,13 @@ msgid "Show read and unread"
 msgstr "Mostrar lido e não lido"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Livros Não Lidos"
 
 #: cps/render_template.py:66
 msgid "Show unread"
-msgstr "Mostrar não lido"
+msgstr "Mostrar Não Lidos"
 
 #: cps/render_template.py:67
 msgid "Discover"
@@ -955,7 +941,7 @@ msgid "Show Random Books"
 msgstr "Mostrar Livros Aleatórios"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Categorias"
 
@@ -965,13 +951,13 @@ msgstr "Mostrar seleção de categoria"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Série"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
-msgstr "Mostrar selecção de séries"
+msgstr "Mostrar seleção de séries"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
@@ -980,20 +966,20 @@ msgstr "Autores"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
-msgstr "Mostrar selecção de autor"
+msgstr "Mostrar seleção de autor"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
-msgstr "Editores"
+msgstr "Editoras"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
-msgstr "Mostrar selecção de editores"
+msgstr "Mostrar seleção de editoras"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -1003,11 +989,11 @@ msgstr "Mostrar seleção de idioma"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
-msgstr "Classificações"
+msgstr "Avaliações"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
-msgstr "Mostrar selecção de classificações"
+msgstr "Mostrar seleção de avaliações"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
@@ -1017,7 +1003,7 @@ msgstr "Formatos de arquivo"
 msgid "Show file formats selection"
 msgstr "Mostrar seleção de formatos de arquivo"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Livros Arquivados"
 
@@ -1025,7 +1011,7 @@ msgstr "Livros Arquivados"
 msgid "Show archived books"
 msgstr "Mostrar livros arquivados"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Lista de Livros"
 
@@ -1033,41 +1019,41 @@ msgstr "Lista de Livros"
 msgid "Show Books List"
 msgstr "Mostrar Lista de Livros"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
-msgstr "Pesquisa"
+msgstr "Pesquisar"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Publicado depois de "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Avaliação <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Avaliação >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
-msgstr "Status de leitura  = %(status)s"
+msgstr "Status de leitura = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
-msgstr ""
+msgstr "Erro na pesquisa de colunas personalizadas, reinicie o Calibre-Web"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
@@ -1076,9 +1062,8 @@ msgid "Invalid shelf specified"
 msgstr "Estante inválida especificada"
 
 #: cps/shelf.py:55
-#, fuzzy
 msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Desculpe, você não tem permissão para adicionar um livro à estante: %(shelfname)s"
+msgstr "Desculpe, você não tem permissão para adicionar um livro a esta estante"
 
 #: cps/shelf.py:64
 #, python-format
@@ -1092,7 +1077,7 @@ msgstr "O livro foi adicionado à estante: %(sname)s"
 
 #: cps/shelf.py:108
 msgid "You are not allowed to add a book to the shelf"
-msgstr ""
+msgstr "Você não tem permissão para adicionar um livro à estante"
 
 #: cps/shelf.py:126
 #, python-format
@@ -1116,16 +1101,15 @@ msgstr "O livro foi removido da estante: %(sname)s"
 
 #: cps/shelf.py:200
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
+msgstr "Desculpe, você não tem permissão para remover um livro desta estante"
 
 #: cps/shelf.py:210 cps/templates/layout.html:141
 msgid "Create a Shelf"
-msgstr "Crie uma estante"
+msgstr "Crie uma Estante"
 
 #: cps/shelf.py:218
-#, fuzzy
 msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Desculpe, você não tem permissão para remover um livro desta estante: %(sname)s"
+msgstr "Desculpe, você não tem permissão para editar esta estante"
 
 #: cps/shelf.py:220
 msgid "Edit a shelf"
@@ -1133,12 +1117,11 @@ msgstr "Editar uma estante"
 
 #: cps/shelf.py:229
 msgid "Error deleting Shelf"
-msgstr ""
+msgstr "Erro apagando Estante"
 
 #: cps/shelf.py:231
-#, fuzzy
 msgid "Shelf successfully deleted"
-msgstr "Livro Eliminado com Sucesso"
+msgstr "Estante Apagada com Sucesso"
 
 #: cps/shelf.py:281
 #, python-format
@@ -1147,7 +1130,7 @@ msgstr "Alterar ordem da Estante: '%(name)s'"
 
 #: cps/shelf.py:313
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
+msgstr "Desculpe, você não tem permissão para criar uma estante pública"
 
 #: cps/shelf.py:330
 #, python-format
@@ -1197,7 +1180,7 @@ msgstr "Falha"
 
 #: cps/tasks_status.py:68
 msgid "Started"
-msgstr "Iniciado em"
+msgstr "Iniciado"
 
 #: cps/tasks_status.py:70
 msgid "Finished"
@@ -1205,11 +1188,11 @@ msgstr "Concluído"
 
 #: cps/tasks_status.py:72
 msgid "Ended"
-msgstr ""
+msgstr "Terminado"
 
 #: cps/tasks_status.py:74
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #: cps/tasks_status.py:76
 msgid "Unknown Status"
@@ -1229,7 +1212,7 @@ msgstr "Uma nova atualização está disponível. Clique no botão abaixo para a
 
 #: cps/updater.py:474
 msgid "Could not fetch update information"
-msgstr "Não consegui obter informações actualizadas"
+msgstr "Não foi possível buscar as informações de atualização"
 
 #: cps/updater.py:484
 msgid "Click on the button below to update to the latest stable version."
@@ -1250,7 +1233,7 @@ msgstr "Descobrir (Livros Aleatórios)"
 
 #: cps/web.py:468
 msgid "Hot Books (Most Downloaded)"
-msgstr "Hot Books (Os Mais Descarregados)"
+msgstr "Livros Quentess (Mais Baixados)"
 
 #: cps/web.py:499
 #, python-format
@@ -1265,124 +1248,124 @@ msgstr "Autor: %(name)s"
 #: cps/web.py:568
 #, python-format
 msgid "Publisher: %(name)s"
-msgstr "Editor: %(name)s"
+msgstr "Editora: %(name)s"
 
 #: cps/web.py:596
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
-msgstr ""
+msgstr "Avaliação: Nenhuma"
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Avaliação: %(rating)s estrelas"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato do arquivo: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
-msgstr "Lista de classificações"
+msgstr "Lista de Avaliações"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Lista de formatos de arquivo"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
-msgstr "Ups! Ocorreu um erro ao enviar este livro: %(res)s"
+msgstr "Ops! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
-msgstr "Por favor, atualize seu perfil com um endereço de e-mail válido para Kindle."
+msgstr "Por favor, atualize seu perfil com um endereço de e-mail Envie Para o Kindle válido."
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
-msgstr "Nome de usuário ou senha incorretos"
+msgstr "Nome de Usuário ou Senha incorretos"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
-msgstr "Nova senha foi enviada para seu endereço de e-mail"
+msgstr "Nova Senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Você agora está logado como: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
-msgstr "Perfil de %(name)s's"
+msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Perfil atualizado"
 
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
-msgstr ""
+msgstr "Não foi encontrado nenhum arquivo gmail.json válido com informações do OAuth"
 
 #: cps/tasks/convert.py:153
 #, python-format
@@ -1401,7 +1384,7 @@ msgstr "O conversor de Ebook falhou com erro desconhecido"
 #: cps/tasks/convert.py:202
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
-msgstr "O conversor de Kepubify falhou: %(error)s"
+msgstr "Kepubify-converter falhou: %(error)s"
 
 #: cps/tasks/convert.py:224
 #, python-format
@@ -1411,7 +1394,7 @@ msgstr "Arquivo convertido não encontrado ou mais de um arquivo na pasta %(fold
 #: cps/tasks/convert.py:247
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
-msgstr "Conversor de ebook falhou: %(error)s"
+msgstr "Ebook-converter falhou: %(error)s"
 
 #: cps/tasks/convert.py:270
 #, python-format
@@ -1420,33 +1403,33 @@ msgstr "Calibre falhou com erro: %(error)s"
 
 #: cps/tasks/convert.py:275
 msgid "Convert"
-msgstr ""
+msgstr "Converter"
 
 #: cps/tasks/database.py:28
 msgid "Reconnecting Calibre database"
-msgstr ""
+msgstr "Reconectando banco de dados Calibre"
 
 #: cps/tasks/mail.py:265
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #: cps/tasks/thumbnail.py:95
 #, python-format
 msgid "Generated %(count)s cover thumbnails"
-msgstr ""
+msgstr "Gerado %(count)s miniaturas de capa"
 
 #: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
 #: cps/tasks/thumbnail.py:503
 msgid "Cover Thumbnails"
-msgstr ""
+msgstr "Miniatura da Capa"
 
 #: cps/tasks/thumbnail.py:281
 msgid "Generated {0} series thumbnails"
-msgstr ""
+msgstr "Gerado {0} miniaturas de série"
 
 #: cps/tasks/thumbnail.py:446
 msgid "Clearing cover thumbnail cache"
-msgstr ""
+msgstr "Limpando o cache de miniaturas da capa"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
 #: cps/templates/layout.html:67 cps/templates/user_table.html:145
@@ -1469,9 +1452,8 @@ msgid "E-mail Address"
 msgstr "Endereço de e-mail"
 
 #: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-#, fuzzy
 msgid "Send to E-Reader E-mail Address"
-msgstr "Enviar para o endereço de e-mail do Kindle"
+msgstr "Enviar para o endereço de e-mail do E-Reader"
 
 #: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
@@ -1503,7 +1485,7 @@ msgstr "Editar"
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
-msgstr "Eliminar"
+msgstr "Apagar"
 
 #: cps/templates/admin.html:26
 msgid "Public Shelf"
@@ -1523,11 +1505,11 @@ msgstr "Configurações do servidor de e-mail"
 
 #: cps/templates/admin.html:67 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
-msgstr "SMTP Nome do anfitrião"
+msgstr "SMTP Hostname"
 
 #: cps/templates/admin.html:71 cps/templates/email_edit.html:35
 msgid "SMTP Port"
-msgstr "Porto SMTP"
+msgstr "Porta SMTP"
 
 #: cps/templates/admin.html:75 cps/templates/email_edit.html:39
 msgid "Encryption"
@@ -1544,11 +1526,11 @@ msgstr "Do E-mail"
 
 #: cps/templates/admin.html:90
 msgid "E-Mail Service"
-msgstr ""
+msgstr "Serviço de E-Mail"
 
 #: cps/templates/admin.html:91
 msgid "Gmail via Oauth2"
-msgstr ""
+msgstr "Gmail via Oauth2"
 
 #: cps/templates/admin.html:106
 msgid "Configuration"
@@ -1556,19 +1538,19 @@ msgstr "Configuração"
 
 #: cps/templates/admin.html:109
 msgid "Calibre Database Directory"
-msgstr "Diretório do Banco de Dados de Calibres"
+msgstr "Diretório do Banco de Dados Calibre"
 
 #: cps/templates/admin.html:113 cps/templates/config_edit.html:68
 msgid "Log Level"
-msgstr "Nível de registo"
+msgstr "Nível de Log"
 
 #: cps/templates/admin.html:117
 msgid "Port"
-msgstr "Porto"
+msgstr "Porta"
 
 #: cps/templates/admin.html:122
 msgid "External Port"
-msgstr "Porto externo"
+msgstr "Porta externa"
 
 #: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
@@ -1592,52 +1574,51 @@ msgstr "Login remoto Magic Link"
 
 #: cps/templates/admin.html:149
 msgid "Reverse Proxy Login"
-msgstr "Login de Proxy Reversa"
+msgstr "Login de Proxy Reverso"
 
 #: cps/templates/admin.html:154 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "Nome do cabeçalho do Proxy Reverso"
 
 #: cps/templates/admin.html:159
-#, fuzzy
 msgid "Edit Calibre Database Configuration"
-msgstr "Editar Configuração Básica"
+msgstr "Editar Configuração do Banco de Dados do Calibre"
 
 #: cps/templates/admin.html:160
 msgid "Edit Basic Configuration"
-msgstr "Editar Configuração Básica"
+msgstr "Editar Configurações Básicas"
 
 #: cps/templates/admin.html:161
 msgid "Edit UI Configuration"
-msgstr "Editar configuração da IU"
+msgstr "Editar Configuração de UI"
 
 #: cps/templates/admin.html:167
 msgid "Scheduled Tasks"
-msgstr ""
+msgstr "Tarefas Agendadas"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
 msgid "Time at which tasks start to run"
-msgstr ""
+msgstr "Hora em que as tarefas começam a ser executadas"
 
 #: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
 msgid "Maximum tasks duration"
-msgstr ""
+msgstr "Duração máxima das tarefas"
 
 #: cps/templates/admin.html:178
 msgid "Generate book cover thumbnails"
-msgstr ""
+msgstr "Gerar miniaturas de capa de livro"
 
 #: cps/templates/admin.html:182
 msgid "Generate series cover thumbnails"
-msgstr ""
+msgstr "Gerar miniaturas de capa de séries"
 
 #: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
 msgid "Reconnect to Calibre Library"
-msgstr ""
+msgstr "Reconectar à Biblioteca do Calibre"
 
 #: cps/templates/admin.html:193
 msgid "Refresh Thumbnail Cover Cache"
-msgstr ""
+msgstr "Atualizar Cache de Capas de Miniaturas"
 
 #: cps/templates/admin.html:199
 msgid "Administration"
@@ -1645,7 +1626,7 @@ msgstr "Administração"
 
 #: cps/templates/admin.html:200
 msgid "Download Debug Package"
-msgstr "Download do Pacote de Depuração"
+msgstr "Baixar Pacote de Depuração"
 
 #: cps/templates/admin.html:201
 msgid "View Logs"
@@ -1653,19 +1634,19 @@ msgstr "Ver Logs"
 
 #: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
-msgstr "Reconectar base de dados de calibração"
+msgstr "Reconectar Banco de dados Calibre"
 
 #: cps/templates/admin.html:207
 msgid "Restart"
-msgstr "Reinicie"
+msgstr "Reiniciar"
 
 #: cps/templates/admin.html:208
 msgid "Shutdown"
-msgstr "Encerramento"
+msgstr "Desligar"
 
 #: cps/templates/admin.html:213
 msgid "Version Information"
-msgstr ""
+msgstr "Informação da Versão"
 
 #: cps/templates/admin.html:217
 msgid "Version"
@@ -1689,7 +1670,7 @@ msgstr "Realizar Atualizações"
 
 #: cps/templates/admin.html:245
 msgid "Are you sure you want to restart?"
-msgstr "Tem a certeza que quer recomeçar?"
+msgstr "Tem a certeza que quer reiniciar?"
 
 #: cps/templates/admin.html:250 cps/templates/admin.html:264
 #: cps/templates/admin.html:284 cps/templates/config_db.html:70
@@ -1709,11 +1690,11 @@ msgstr "Cancelar"
 
 #: cps/templates/admin.html:263
 msgid "Are you sure you want to shutdown?"
-msgstr "Tens a certeza que queres fechar?"
+msgstr "Tem certeza que quer encerrar?"
 
 #: cps/templates/admin.html:275
 msgid "Updating, please do not reload this page"
-msgstr "Atualizando, por favor, não recarregue esta página"
+msgstr "Atualizando, por favor não recarregue esta página"
 
 #: cps/templates/author.html:15
 msgid "via"
@@ -1765,19 +1746,19 @@ msgstr "Mais por"
 
 #: cps/templates/book_edit.html:11
 msgid "Delete Book"
-msgstr "Eliminar Livro"
+msgstr "Apagar Livro"
 
 #: cps/templates/book_edit.html:14
 msgid "Delete formats:"
-msgstr "Eliminar formatos:"
+msgstr "Apagar formatos:"
 
 #: cps/templates/book_edit.html:25
 msgid "Convert book format:"
-msgstr "Converta o formato do livro:"
+msgstr "Converter formato do livro:"
 
 #: cps/templates/book_edit.html:30
 msgid "Convert from:"
-msgstr "Converte de:"
+msgstr "Converter de:"
 
 #: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
@@ -1785,7 +1766,7 @@ msgstr "selecione uma opção"
 
 #: cps/templates/book_edit.html:37
 msgid "Convert to:"
-msgstr "Converte para:"
+msgstr "Converter para:"
 
 #: cps/templates/book_edit.html:46
 msgid "Convert book"
@@ -1828,7 +1809,7 @@ msgstr "Adicionar Identificador"
 
 #: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
-msgstr "Etiquetas"
+msgstr "Tags"
 
 #: cps/templates/book_edit.html:95
 msgid "Series ID"
@@ -1836,7 +1817,7 @@ msgstr "Identificação da série"
 
 #: cps/templates/book_edit.html:99
 msgid "Rating"
-msgstr "Classificação"
+msgstr "Avaliação"
 
 #: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
@@ -1844,7 +1825,7 @@ msgstr "Buscar capa na URL (JPEG - Imagem será baixada e armazenada na base de
 
 #: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
-msgstr "Upload de  capa do disco local"
+msgstr "Upload de Capa do Disco Local"
 
 #: cps/templates/book_edit.html:113
 msgid "Published Date"
@@ -1877,7 +1858,7 @@ msgstr "Formato de upload"
 
 #: cps/templates/book_edit.html:209
 msgid "View Book on Save"
-msgstr "Ver Livro ao salvar"
+msgstr "Ver Livro ao Salvar"
 
 #: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
@@ -1896,9 +1877,8 @@ msgid "Keyword"
 msgstr "Palavra-chave"
 
 #: cps/templates/book_edit.html:234
-#, fuzzy
 msgid "Search keyword"
-msgstr " Pesquisar palavra-chave "
+msgstr "Pesquisar palavra-chave"
 
 #: cps/templates/book_edit.html:240
 msgid "Click the cover to load metadata to the form"
@@ -1906,7 +1886,7 @@ msgstr "Clique na capa para carregar os metadados para o formulário"
 
 #: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
 msgid "Loading..."
-msgstr "A carregar..."
+msgstr "Carregando..."
 
 #: cps/templates/book_edit.html:251 cps/templates/layout.html:64
 #: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
@@ -1934,7 +1914,7 @@ msgstr "Este campo é obrigatório"
 
 #: cps/templates/book_table.html:37
 msgid "Merge selected books"
-msgstr "Fundir livros selecionados"
+msgstr "Mesclar livros selecionados"
 
 #: cps/templates/book_table.html:38 cps/templates/user_table.html:124
 msgid "Remove Selections"
@@ -1942,19 +1922,19 @@ msgstr "Remover Seleções"
 
 #: cps/templates/book_table.html:41
 msgid "Exchange author and title"
-msgstr ""
+msgstr "Trocar autor e título"
 
 #: cps/templates/book_table.html:47
 msgid "Update Title Sort automatically"
-msgstr "Atualizar a Classificação de  Título  automaticamente"
+msgstr "Atualizar Ordenação de Título automaticamente"
 
 #: cps/templates/book_table.html:51
 msgid "Update Author Sort automatically"
-msgstr "Atualizar a Classificação do Autor  automaticamente"
+msgstr "Atualizar Ordenação de Autor automaticamente"
 
 #: cps/templates/book_table.html:63 cps/templates/book_table.html:69
 msgid "Enter Title"
-msgstr "Digite o título"
+msgstr "Digite o Título"
 
 #: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
 #: cps/templates/shelf_edit.html:8
@@ -1963,19 +1943,19 @@ msgstr "Título"
 
 #: cps/templates/book_table.html:64
 msgid "Enter Title Sort"
-msgstr "Digite o título Sort"
+msgstr "Digite a ordenação do título"
 
 #: cps/templates/book_table.html:64
 msgid "Title Sort"
-msgstr "Título Ordenar"
+msgstr "Ordenação de Título"
 
 #: cps/templates/book_table.html:65
 msgid "Enter Author Sort"
-msgstr "Digite Author Sort"
+msgstr "Digite a Ordenação de Author"
 
 #: cps/templates/book_table.html:65
 msgid "Author Sort"
-msgstr "Ordenar Autor"
+msgstr "Ordenação de Autor"
 
 #: cps/templates/book_table.html:66
 msgid "Enter Authors"
@@ -1983,69 +1963,67 @@ msgstr "Entrar Autores"
 
 #: cps/templates/book_table.html:67
 msgid "Enter Categories"
-msgstr "Entrar nas categorias"
+msgstr "Entrar Categorias"
 
 #: cps/templates/book_table.html:68
 msgid "Enter Series"
-msgstr "Entrar na série"
+msgstr "Entrar Série"
 
 #: cps/templates/book_table.html:69
 msgid "Series Index"
-msgstr "Índice da série"
+msgstr "Índice da Série"
 
 #: cps/templates/book_table.html:70
 msgid "Enter Languages"
-msgstr "Entrar idiomas"
+msgstr "Entrar Idiomas"
 
 #: cps/templates/book_table.html:71
 msgid "Publishing Date"
-msgstr "Data de publicação"
+msgstr "Data de Publicação"
 
 #: cps/templates/book_table.html:72
 msgid "Enter Publishers"
-msgstr "Entrar Editores"
+msgstr "Entrar Editoras"
 
 #: cps/templates/book_table.html:73
-#, fuzzy
 msgid "Enter comments"
-msgstr "Digite o nome do domínio"
+msgstr "Entrar Comentários"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
-msgstr ""
+msgstr "Comentários"
 
 #: cps/templates/book_table.html:75
 msgid "Archiv Status"
-msgstr ""
+msgstr "Status Arquivado"
 
 #: cps/templates/book_table.html:77 cps/templates/search_form.html:42
 msgid "Read Status"
-msgstr "Ler Estado"
+msgstr "Status Lido"
 
 #: cps/templates/book_table.html:80 cps/templates/book_table.html:82
 #: cps/templates/book_table.html:84 cps/templates/book_table.html:86
 #: cps/templates/book_table.html:90 cps/templates/book_table.html:92
 #: cps/templates/book_table.html:96
-#, fuzzy
 msgid "Enter "
-msgstr "Identificadores"
+msgstr "Entrar "
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
 #: cps/templates/tasks.html:36
 msgid "Are you really sure?"
-msgstr "Tens mesmo a certeza?"
+msgstr "Você realmente tem certeza?"
 
 #: cps/templates/book_table.html:117
 msgid "Books with Title will be merged from:"
-msgstr "Os livros com título serão fundidos a partir de:"
+msgstr "Livros com Título serão mesclados de:"
 
 #: cps/templates/book_table.html:121
 msgid "Into Book with Title:"
-msgstr "Into Book with Title:"
+msgstr "Em livro com título:"
 
 #: cps/templates/book_table.html:126
 msgid "Merge"
-msgstr "Fundir"
+msgstr "Mesclar"
 
 #: cps/templates/config_db.html:12
 msgid "Location of Calibre Database"
@@ -2053,7 +2031,7 @@ msgstr "Localização da Base de Dados Calibre"
 
 #: cps/templates/config_db.html:22
 msgid "Use Google Drive?"
-msgstr "Use o Google Drive?"
+msgstr "User Google Drive?"
 
 #: cps/templates/config_db.html:27
 msgid "Authenticate Google Drive"
@@ -2061,7 +2039,7 @@ msgstr "Autenticar o Google Drive"
 
 #: cps/templates/config_db.html:32
 msgid "Google Drive Calibre folder"
-msgstr "Pasta Google Drive Calibre"
+msgstr "Pasta Calibre no Google Drive"
 
 #: cps/templates/config_db.html:40
 msgid "Metadata Watch Channel ID"
@@ -2072,9 +2050,8 @@ msgid "Revoke"
 msgstr "Revogar"
 
 #: cps/templates/config_db.html:68
-#, fuzzy
 msgid "New db location is invalid, please enter valid path"
-msgstr "A localização do banco de dados não é válida, digite o caminho correto"
+msgstr "Novo local do banco de dados inválido, insira um caminho válido"
 
 #: cps/templates/config_edit.html:18
 msgid "Server Configuration"
@@ -2082,19 +2059,19 @@ msgstr "Configuração do Servidor"
 
 #: cps/templates/config_edit.html:25
 msgid "Server Port"
-msgstr "Porta do servidor"
+msgstr "Porta do Servidor"
 
 #: cps/templates/config_edit.html:28
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL certfile location (deixe-o vazio para Servidores não-SSL)"
+msgstr "Localização do certfile SSL (deixe vazio para Servidores não-SSL)"
 
 #: cps/templates/config_edit.html:35
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL Keyfile location (deixe-o vazio para servidores não-SSL)"
+msgstr "Localização do Keyfile SSL (deixe vazio para Servidores não-SSL)"
 
 #: cps/templates/config_edit.html:43
 msgid "Update Channel"
-msgstr "Canal de atualização"
+msgstr "Canal de Atualização"
 
 #: cps/templates/config_edit.html:45
 msgid "Stable"
@@ -2102,15 +2079,15 @@ msgstr "Estável"
 
 #: cps/templates/config_edit.html:46
 msgid "Nightly"
-msgstr "Nocturno"
+msgstr "Nightly"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr ""
+msgstr "Hosts confiáveis (Separado por vírgula)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
-msgstr "Configuração do ficheiro de registo"
+msgstr "Configuração do Arquivo de Log"
 
 #: cps/templates/config_edit.html:77
 msgid "Location and name of logfile (calibre-web.log for no entry)"
@@ -2126,11 +2103,11 @@ msgstr "Localização e nome do arquivo de log de acesso (access.log para nenhum
 
 #: cps/templates/config_edit.html:96
 msgid "Feature Configuration"
-msgstr "Configuração das Características"
+msgstr "Configuração do Recursos"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr ""
+msgstr "Converta caracteres não ingleses em título e autor enquanto salva em disco"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
@@ -2138,11 +2115,11 @@ msgstr "Habilitar Uploads"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr ""
+msgstr "(Por favor, certifique-se de que os usuários também tenham direitos de upload)"
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
-msgstr "Upload de formatos de arquivo permitidos"
+msgstr "Formatos de arquivo de upload permitidos"
 
 #: cps/templates/config_edit.html:118
 msgid "Enable Anonymous Browsing"
@@ -2158,23 +2135,23 @@ msgstr "Use e-mail como nome de usuário"
 
 #: cps/templates/config_edit.html:132
 msgid "Enable Magic Link Remote Login"
-msgstr "Habilitar login remoto do Magic Link"
+msgstr "Habilitar Login Remoto do Magic Link"
 
 #: cps/templates/config_edit.html:137
 msgid "Enable Kobo sync"
-msgstr "Activar a sincronização de Kobo"
+msgstr "Ativar Kobo sync"
 
 #: cps/templates/config_edit.html:142
 msgid "Proxy unknown requests to Kobo Store"
-msgstr "Proxy de pedidos desconhecidos para a loja Kobo"
+msgstr "Solicitações desconhecidas de proxy para a Kobo Store"
 
 #: cps/templates/config_edit.html:145
 msgid "Server External Port (for port forwarded API calls)"
-msgstr "Porta externa do servidor (para chamadas API de porta encaminhadas)"
+msgstr "Porta externa do servidor (para chamadas API encaminhadas)"
 
 #: cps/templates/config_edit.html:153
 msgid "Use Goodreads"
-msgstr "Use Goodreads"
+msgstr "Usar Goodreads"
 
 #: cps/templates/config_edit.html:154
 msgid "Create an API Key"
@@ -2182,15 +2159,15 @@ msgstr "Criar uma chave API"
 
 #: cps/templates/config_edit.html:158
 msgid "Goodreads API Key"
-msgstr "Goodreads Chave API"
+msgstr "Chave API Goodreads"
 
 #: cps/templates/config_edit.html:162
 msgid "Goodreads API Secret"
-msgstr "Goodreads API Secreto"
+msgstr "Senha API Goodreads"
 
 #: cps/templates/config_edit.html:169
 msgid "Allow Reverse Proxy Authentication"
-msgstr "Permitir a Autenticação por Proxy Reversa"
+msgstr "Permitir a Autenticação por Proxy Reverso"
 
 #: cps/templates/config_edit.html:180
 msgid "Login type"
@@ -2198,15 +2175,15 @@ msgstr "Tipo de Login"
 
 #: cps/templates/config_edit.html:182
 msgid "Use Standard Authentication"
-msgstr "Usar autenticação padrão"
+msgstr "Usar Autenticação padrão"
 
 #: cps/templates/config_edit.html:184
 msgid "Use LDAP Authentication"
-msgstr "Usar autenticação LDAP"
+msgstr "Usar Autenticação LDAP"
 
 #: cps/templates/config_edit.html:187
 msgid "Use OAuth"
-msgstr "Use OAuth"
+msgstr "Usar OAuth"
 
 #: cps/templates/config_edit.html:194
 msgid "LDAP Server Host Name or IP Address"
@@ -2230,15 +2207,15 @@ msgstr "SSL"
 
 #: cps/templates/config_edit.html:210
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP CACertificate Path (Somente necessário para Autenticação de Certificado de Cliente)"
+msgstr "Caminho do CACertificate LDAP (Necessário apenas para autenticação de certificado de cliente)"
 
 #: cps/templates/config_edit.html:217
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP Certificate Path (Somente necessário para Autenticação de Certificado de Cliente)"
+msgstr "Caminho do Certificado LDAP (Necessário apenas para autenticação de certificado de cliente)"
 
 #: cps/templates/config_edit.html:224
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP Keyfile Path (Somente necessário para Autenticação de Certificado de Cliente)"
+msgstr "Caminho do Keyfile LDAP (Necessário apenas para autenticação de certificado de cliente)"
 
 #: cps/templates/config_edit.html:233
 msgid "LDAP Authentication"
@@ -2266,19 +2243,19 @@ msgstr "Senha de Administrador LDAP"
 
 #: cps/templates/config_edit.html:253
 msgid "LDAP Distinguished Name (DN)"
-msgstr "Nome distinto LDAP (DN)"
+msgstr "Nome Distinto LDAP (DN)"
 
 #: cps/templates/config_edit.html:257
 msgid "LDAP User Object Filter"
-msgstr "Filtro de objeto do usuário LDAP"
+msgstr "Filtro de Objeto do Usuário LDAP"
 
 #: cps/templates/config_edit.html:262
 msgid "LDAP Server is OpenLDAP?"
-msgstr "O LDAP Server é OpenLDAP?"
+msgstr "O Servidor LDAP é OpenLDAP?"
 
 #: cps/templates/config_edit.html:264
 msgid "Following Settings are Needed For User Import"
-msgstr "As seguintes configurações são necessárias para a importação do usuário"
+msgstr "As seguintes configurações são necessárias para a mportação de Usuários"
 
 #: cps/templates/config_edit.html:266
 msgid "LDAP Group Object Filter"
@@ -2311,7 +2288,7 @@ msgstr "Filtro de Utilizador Membro LDAP"
 #: cps/templates/config_edit.html:297
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
-msgstr "Obtenha a credencial OAuth de %(provider)s"
+msgstr "Obter credenciais OAuth de %(provider)s"
 
 #: cps/templates/config_edit.html:300
 #, python-format
@@ -2321,7 +2298,7 @@ msgstr "ID do cliente OAuth de %(provider)s"
 #: cps/templates/config_edit.html:304
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
-msgstr "%(provider)s  Cliente segredo do  OAuth"
+msgstr "Senha do cliente Oauth de %(provider)s"
 
 #: cps/templates/config_edit.html:320
 msgid "External binaries"
@@ -2333,7 +2310,7 @@ msgstr "Caminho para o Calibre E-Book Converter"
 
 #: cps/templates/config_edit.html:334
 msgid "Calibre E-Book Converter Settings"
-msgstr "Configurações do conversor de E-Book Calibre"
+msgstr "Configurações do Calibre E-Book Converter"
 
 #: cps/templates/config_edit.html:337
 msgid "Path to Kepubify E-Book Converter"
@@ -2341,11 +2318,11 @@ msgstr "Caminho para Kepubify E-Book Converter"
 
 #: cps/templates/config_edit.html:345
 msgid "Location of Unrar binary"
-msgstr "Localização do binário Unrar"
+msgstr "Caminho para o binário Unrar"
 
 #: cps/templates/config_view_edit.html:17
 msgid "View Configuration"
-msgstr "Ver configuração"
+msgstr "Configuração de Visualização"
 
 #: cps/templates/config_view_edit.html:32
 msgid "No. of Random Books to Display"
@@ -2353,7 +2330,7 @@ msgstr "Nº de Livros Aleatórios a Exibir"
 
 #: cps/templates/config_view_edit.html:36
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
-msgstr "Nº de Autores a Exibir Antes de Esconder (0=Esconder Desativado)"
+msgstr "Nº de Autores a Exibir Antes de Esconder (0=Desativar Esconder)"
 
 #: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
 msgid "Theme"
@@ -2365,7 +2342,7 @@ msgstr "Tema Padrão"
 
 #: cps/templates/config_view_edit.html:43
 msgid "caliBlur! Dark Theme"
-msgstr "caliBlur! Tema Negro"
+msgstr "Tema caliBlur! Dark"
 
 #: cps/templates/config_view_edit.html:47
 msgid "Regular Expression for Ignoring Columns"
@@ -2373,7 +2350,7 @@ msgstr "Expressão Regular para Ignorar Colunas"
 
 #: cps/templates/config_view_edit.html:51
 msgid "Link Read/Unread Status to Calibre Column"
-msgstr "Ligar o estado de leitura/análise à coluna Calibre"
+msgstr "Ligar Lido/Não Lido à coluna Calibre"
 
 #: cps/templates/config_view_edit.html:60
 msgid "View Restrictions based on Calibre column"
@@ -2381,11 +2358,11 @@ msgstr "Exibir restrições com base na coluna Calibre"
 
 #: cps/templates/config_view_edit.html:69
 msgid "Regular Expression for Title Sorting"
-msgstr "Expressão regular para classificação de títulos"
+msgstr "Expressão regular para ordenação de Títulos"
 
 #: cps/templates/config_view_edit.html:80
 msgid "Default Settings for New Users"
-msgstr "Configurações padrão para novos usuários"
+msgstr "Configuração padrão para novos usuários"
 
 #: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
 msgid "Admin User"
@@ -2397,7 +2374,7 @@ msgstr "Permitir Downloads"
 
 #: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
-msgstr "Permitir que o eBook Viewer"
+msgstr "Permitir Visualizador de eBook"
 
 #: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
@@ -2409,42 +2386,40 @@ msgstr "Permitir Editar"
 
 #: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
-msgstr "Permitir Livros Excluídos"
+msgstr "Permitir Apagar Livros"
 
 #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
-msgstr "Permitir mudança de senha"
+msgstr "Permitir Alterar Senha"
 
 #: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
-msgstr "Permitir a Edição de Prateleiras Públicas"
+msgstr "Permitir a Edição de Estantes Públicas"
 
 #: cps/templates/config_view_edit.html:123
-#, fuzzy
 msgid "Default Language"
-msgstr "Excluir idiomas"
+msgstr "Idioma Padrão"
 
 #: cps/templates/config_view_edit.html:131
-#, fuzzy
 msgid "Default Visible Language of Books"
-msgstr "Língua dos Livros"
+msgstr "Idioma Padrão dos Livros Visíveis"
 
 #: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
-msgstr "Visibilidades por defeito para novos utilizadores"
+msgstr "Visibilidade Padrão para Novos Usuários"
 
 #: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
-msgstr "Mostrar Livros Aleatórios em Vista de Detalhe"
+msgstr "Mostrar Livros Aleatórios em Visualização de Detalhes"
 
 #: cps/templates/config_view_edit.html:166 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
-msgstr "Adicionar Etiquetas permitidas/negadas"
+msgstr "Adicionar Tags Permitidas/Negadas"
 
 #: cps/templates/config_view_edit.html:167
 msgid "Add Allowed/Denied custom column values"
-msgstr "Adicionar valores permitidos/negados da coluna personalizada"
+msgstr "Adicionar Valores Permitidos/Negados de Coluna Personalizada"
 
 #: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
@@ -2455,9 +2430,9 @@ msgid "Listen in Browser"
 msgstr "Ouvir no Browser"
 
 #: cps/templates/detail.html:125
-#, fuzzy, python-format
+#, python-format
 msgid "Book %(index)s of %(range)s"
-msgstr ""
+msgstr "Livro %(index)s de %(range)s"
 
 #: cps/templates/detail.html:174
 msgid "Published"
@@ -2465,11 +2440,11 @@ msgstr "Publicado em"
 
 #: cps/templates/detail.html:222
 msgid "Mark As Unread"
-msgstr "Marcar como não lido"
+msgstr "Marcar como Não Lido"
 
 #: cps/templates/detail.html:222
 msgid "Mark As Read"
-msgstr "Marcar como lido"
+msgstr "Marcar como Lido"
 
 #: cps/templates/detail.html:223
 msgid "Read"
@@ -2485,7 +2460,7 @@ msgstr "Adicionar ao arquivo"
 
 #: cps/templates/detail.html:233
 msgid "Archived"
-msgstr "Arquivado em"
+msgstr "Arquivado"
 
 #: cps/templates/detail.html:244
 msgid "Description:"
@@ -2507,23 +2482,23 @@ msgstr "Editar Metadados"
 
 #: cps/templates/email_edit.html:13
 msgid "Choose Server Type"
-msgstr ""
+msgstr "Escolha o Tipo do Servidor"
 
 #: cps/templates/email_edit.html:15
 msgid "Use Standard E-Mail Account"
-msgstr ""
+msgstr "Use Conta de E-Mail Padrão"
 
 #: cps/templates/email_edit.html:16
 msgid "Gmail Account with OAuth2 Verification"
-msgstr ""
+msgstr "Conta Gmail com Verificação OAuth2"
 
 #: cps/templates/email_edit.html:22
 msgid "Setup Gmail Account as E-Mail Server"
-msgstr ""
+msgstr "Configurar conta do Gmail como servidor de e-mail"
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
-msgstr ""
+msgstr "Revogar Acesso ao GMail"
 
 #: cps/templates/email_edit.html:42
 msgid "STARTTLS"
@@ -2539,7 +2514,7 @@ msgstr "Senha SMTP"
 
 #: cps/templates/email_edit.html:58
 msgid "Attachment Size Limit"
-msgstr "Limite do tamanho do anexo"
+msgstr "Limite do Tamanho do Anexo"
 
 #: cps/templates/email_edit.html:66
 msgid "Save and Send Test E-mail"
@@ -2552,7 +2527,7 @@ msgstr "Voltar"
 
 #: cps/templates/email_edit.html:74
 msgid "Allowed Domains (Whitelist)"
-msgstr "Domínios Permitidos (Whitelist)"
+msgstr "Domínios Permitidos (Lista Branca)"
 
 #: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
 msgid "Add Domain"
@@ -2561,7 +2536,7 @@ msgstr "Adicionar Domínio"
 #: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
 #: cps/templates/user_table.html:27
 msgid "Add"
-msgstr "Adicione"
+msgstr "Adicionar"
 
 #: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
 msgid "Enter domainname"
@@ -2569,7 +2544,7 @@ msgstr "Digite o nome do domínio"
 
 #: cps/templates/email_edit.html:92
 msgid "Denied Domains (Blacklist)"
-msgstr "Domínios negados (Blacklist)"
+msgstr "Domínios Negados (Lista Negra)"
 
 #: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
@@ -2580,56 +2555,54 @@ msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):
 msgstr "Abra o arquivo .kobo/Kobo eReader.conf em um editor de texto e adicione (ou edite):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
-#, fuzzy
 msgid "Kobo Token:"
-msgstr "Kobo Sync Token"
+msgstr "Token Kobo:"
 
 #: cps/templates/grid.html:21
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #: cps/templates/http_error.html:31
-#, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
-msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
+msgstr "Instancia do Calibre-Web não configurado, por favor contacte o seu administrador"
 
 #: cps/templates/http_error.html:41
 msgid "Create Issue"
-msgstr "Criar Edição"
+msgstr "Criar Issue"
 
 #: cps/templates/http_error.html:48
 msgid "Return to Home"
-msgstr "Voltar para casa"
+msgstr "Voltar para Início"
 
 #: cps/templates/http_error.html:50
 msgid "Logout User"
-msgstr ""
+msgstr "Deslogar"
 
 #: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
-msgstr ""
+msgstr "Ordenar em ordem crescente de acordo com a contagem de downloads"
 
 #: cps/templates/index.html:72
 msgid "Sort descending according to download count"
-msgstr ""
+msgstr "Ordenar em ordem decrescente de acordo com a contagem de downloads"
 
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
 msgid "Sort authors in alphabetical order"
-msgstr "Ordenar os autores em ordem alfabética"
+msgstr "Ordenar Autores em ordem alfabética"
 
 #: cps/templates/index.html:79 cps/templates/search.html:36
 #: cps/templates/shelf.html:25
 msgid "Sort authors in reverse alphabetical order"
-msgstr "Ordenar os autores em ordem alfabética inversa"
+msgstr "Ordenar Autores em ordem alfabética inversa"
 
 #: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
-msgstr "Ordenar ascendente de acordo com o índice de série"
+msgstr "Ordenar em ordem crescente de acordo com o índice de série"
 
 #: cps/templates/index.html:84
 msgid "Sort descending according to series index"
-msgstr "Ordenação decrescente de acordo com o índice de série"
+msgstr "Ordenação em ordem decrescente de acordo com o índice de série"
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2637,11 +2610,11 @@ msgstr "Início"
 
 #: cps/templates/index.xml:18
 msgid "Alphabetical Books"
-msgstr ""
+msgstr "Livros Alfabéticos"
 
 #: cps/templates/index.xml:22
 msgid "Books sorted alphabetically"
-msgstr ""
+msgstr "Livros ordenados alfabeticamente"
 
 #: cps/templates/index.xml:29
 msgid "Popular publications from this catalog based on Downloads."
@@ -2649,7 +2622,7 @@ msgstr "Publicações populares deste catálogo baseadas em Downloads."
 
 #: cps/templates/index.xml:36
 msgid "Popular publications from this catalog based on Rating."
-msgstr "Publicações populares deste catálogo baseadas em Rating."
+msgstr "Publicações populares deste catálogo baseadas em Avaliação."
 
 #: cps/templates/index.xml:39
 msgid "Recently added Books"
@@ -2665,11 +2638,11 @@ msgstr "Livros Aleatórios"
 
 #: cps/templates/index.xml:73
 msgid "Books ordered by Author"
-msgstr "Livros encomendados pelo Autor"
+msgstr "Livros ordenados por Autor"
 
 #: cps/templates/index.xml:80
 msgid "Books ordered by publisher"
-msgstr "Livros encomendados pela editora"
+msgstr "Livros ordenados por editora"
 
 #: cps/templates/index.xml:87
 msgid "Books ordered by category"
@@ -2677,15 +2650,15 @@ msgstr "Livros ordenados por categoria"
 
 #: cps/templates/index.xml:94
 msgid "Books ordered by series"
-msgstr "Livros encomendados por série"
+msgstr "Livros ordenados por série"
 
 #: cps/templates/index.xml:101
 msgid "Books ordered by Languages"
-msgstr "Livros encomendados por Idiomas"
+msgstr "Livros ordenados por Idiomas"
 
 #: cps/templates/index.xml:108
 msgid "Books ordered by Rating"
-msgstr "Livros encomendados por Rating"
+msgstr "Livros ordenados por Avaliação"
 
 #: cps/templates/index.xml:116
 msgid "Books ordered by file formats"
@@ -2694,11 +2667,11 @@ msgstr "Livros ordenados por formatos de arquivo"
 #: cps/templates/index.xml:119 cps/templates/layout.html:136
 #: cps/templates/search_form.html:87
 msgid "Shelves"
-msgstr "Prateleiras"
+msgstr "Estantes"
 
 #: cps/templates/index.xml:123
 msgid "Books organized in shelves"
-msgstr "Livros organizados em prateleiras"
+msgstr "Livros organizados em Estantes"
 
 #: cps/templates/layout.html:30
 msgid "Home"
@@ -2706,11 +2679,11 @@ msgstr "Início"
 
 #: cps/templates/layout.html:36
 msgid "Toggle Navigation"
-msgstr "Alternar a navegação"
+msgstr "Alternar Navegação"
 
 #: cps/templates/layout.html:47
 msgid "Search Library"
-msgstr "Biblioteca de Pesquisa"
+msgstr "Pesquisar na Biblioteca"
 
 #: cps/templates/layout.html:64 cps/templates/layout.html:118
 msgid "Uploading..."
@@ -2722,7 +2695,7 @@ msgstr "Erro"
 
 #: cps/templates/layout.html:64
 msgid "Upload done, processing, please wait..."
-msgstr "Upload feito, processando, por favor aguarde ..."
+msgstr "Upload concluído, processando, por favor aguarde ..."
 
 #: cps/templates/layout.html:77 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
@@ -2759,7 +2732,7 @@ msgstr "Detalhes do Livro"
 
 #: cps/templates/list.html:22
 msgid "Grid"
-msgstr ""
+msgstr "Grade"
 
 #: cps/templates/login.html:18
 msgid "Remember Me"
@@ -2767,7 +2740,7 @@ msgstr "Lembre-se de mim"
 
 #: cps/templates/login.html:23
 msgid "Forgot Password?"
-msgstr "Esqueceu-se da senha?"
+msgstr "Esqueceu a senha?"
 
 #: cps/templates/login.html:26
 msgid "Log in with Magic Link"
@@ -2775,11 +2748,11 @@ msgstr "Entre com o Magic Link"
 
 #: cps/templates/logviewer.html:6
 msgid "Show Calibre-Web Log: "
-msgstr "Mostrar Calibre-Web Log: "
+msgstr "Mostrar Log Calibre-Web: "
 
 #: cps/templates/logviewer.html:8
 msgid "Calibre-Web Log: "
-msgstr "Calibre-Web Log: "
+msgstr "Log Calibre-Web: "
 
 #: cps/templates/logviewer.html:8
 msgid "Stream output, can't be displayed"
@@ -2787,31 +2760,31 @@ msgstr "Saída do fluxo, não pode ser exibida"
 
 #: cps/templates/logviewer.html:12
 msgid "Show Access Log: "
-msgstr "Mostrar registo de acesso: "
+msgstr "Mostrar Log de Acesso: "
 
 #: cps/templates/logviewer.html:18
 msgid "Download Calibre-Web Log"
-msgstr "Baixar Calibre-Web Log"
+msgstr "Baixar Log Calibre-Web"
 
 #: cps/templates/logviewer.html:21
 msgid "Download Access Log"
-msgstr "Download do Log de Acesso"
+msgstr "Baixar Log de Acesso"
 
 #: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
-msgstr "Selecione Etiquetas permitidas/negadas"
+msgstr "Selecione Tags Permitidas/Negadas"
 
 #: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
-msgstr "Selecione Valores Permitidos/Não Permitidos da Coluna Personalizada"
+msgstr "Selecione Valores Permitidos/Negadaos da Coluna Personalizada"
 
 #: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
-msgstr "Selecione Etiquetas de usuário permitidas/negadas"
+msgstr "Selecione Tags de usuário Permitidas/Negadas"
 
 #: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
-msgstr "Selecione Valores de Coluna Personalizada Permitidos/Denegados do Usuário"
+msgstr "Selecione Valores de Coluna Personalizada Permitidos/Negados do Usuário"
 
 #: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
@@ -2819,15 +2792,15 @@ msgstr "Digite a tag"
 
 #: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
-msgstr "Adicionar restrição de visualização"
+msgstr "Adicionar Restrição de Visualização"
 
 #: cps/templates/modal_dialogs.html:50
 msgid "This book format will be permanently erased from database"
-msgstr "Este formato de livro será permanentemente apagado da base de dados"
+msgstr "Este formato de livro será apagado permanentemente do banco de dados"
 
 #: cps/templates/modal_dialogs.html:51
 msgid "This book will be permanently erased from database"
-msgstr "Este livro será apagado permanentemente da base de dados"
+msgstr "Este livro será apagado permanentemente do banco de dados"
 
 #: cps/templates/modal_dialogs.html:52
 msgid "and hard disk"
@@ -2835,7 +2808,7 @@ msgstr "e disco rígido"
 
 #: cps/templates/modal_dialogs.html:56
 msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Nota importante Kobo Nota: os livros apagados permanecerão em qualquer dispositivo Kobo emparelhado."
+msgstr "Nota importante Kobo: os livros apagados permanecerão em qualquer dispositivo Kobo emparelhado."
 
 #: cps/templates/modal_dialogs.html:57
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
@@ -2843,7 +2816,7 @@ msgstr "Os livros devem primeiro ser arquivados e o dispositivo deve ser sincron
 
 #: cps/templates/modal_dialogs.html:76
 msgid "Choose File Location"
-msgstr "Escolha a localização do arquivo"
+msgstr "Escolha a Localização do Arquivo"
 
 #: cps/templates/modal_dialogs.html:82
 msgid "type"
@@ -2859,29 +2832,27 @@ msgstr "tamanho"
 
 #: cps/templates/modal_dialogs.html:90
 msgid "Parent Directory"
-msgstr "Diretório dos Pais"
+msgstr "Diretório Acima"
 
 #: cps/templates/modal_dialogs.html:98
 msgid "Select"
 msgstr "Selecione"
 
 #: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
-#, fuzzy
 msgid "Ok"
-msgstr "Livro"
+msgstr "Ok"
 
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Catálogo de e-books Calibre-Web"
 
 #: cps/templates/read.html:6
-#, fuzzy
 msgid "epub Reader"
-msgstr "leitor de PDF"
+msgstr "leitor de epub"
 
 #: cps/templates/read.html:77 cps/templates/readcbr.html:116
 msgid "Light"
-msgstr "Luz"
+msgstr "Claro"
 
 #: cps/templates/read.html:78 cps/templates/readcbr.html:117
 msgid "Dark"
@@ -2889,21 +2860,19 @@ msgstr "Escuro"
 
 #: cps/templates/read.html:79
 msgid "Sepia"
-msgstr ""
+msgstr "Sépia"
 
 #: cps/templates/read.html:80
-#, fuzzy
 msgid "Black"
-msgstr "Voltar"
+msgstr "Preto"
 
 #: cps/templates/read.html:84
 msgid "Reflow text when sidebars are open."
-msgstr "Refluxo de texto quando as barras laterais estão abertas."
+msgstr "Refluir o texto quando as barras laterais estiverem abertas."
 
 #: cps/templates/readcbr.html:7
-#, fuzzy
 msgid "Comic Reader"
-msgstr "leitor de PDF"
+msgstr "Leitor de Quadrinhos"
 
 #: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
@@ -2919,35 +2888,35 @@ msgstr "Página seguinte"
 
 #: cps/templates/readcbr.html:94
 msgid "Scale to Best"
-msgstr "Escala ao Melhor"
+msgstr "Dimensionar para Melhor"
 
 #: cps/templates/readcbr.html:95
 msgid "Scale to Width"
-msgstr "Escala à Largura"
+msgstr "Dimensionar para Largura"
 
 #: cps/templates/readcbr.html:96
 msgid "Scale to Height"
-msgstr "Escala à Altura"
+msgstr "Dimensionar para Altura"
 
 #: cps/templates/readcbr.html:97
 msgid "Scale to Native"
-msgstr "Escala para Nativo"
+msgstr "Dimensionar para a Nativo"
 
 #: cps/templates/readcbr.html:98
 msgid "Rotate Right"
-msgstr "Rodar para a direita"
+msgstr "Girar para direita"
 
 #: cps/templates/readcbr.html:99
 msgid "Rotate Left"
-msgstr "Rodar para a esquerda"
+msgstr "Girar para esqueda"
 
 #: cps/templates/readcbr.html:100
 msgid "Flip Image"
-msgstr "Flip Image"
+msgstr "Inverter Imagem"
 
 #: cps/templates/readcbr.html:122
 msgid "Scale"
-msgstr "Balança"
+msgstr "Dimensionar"
 
 #: cps/templates/readcbr.html:125
 msgid "Best"
@@ -2971,7 +2940,7 @@ msgstr "Rodar"
 
 #: cps/templates/readcbr.html:144
 msgid "Flip"
-msgstr "Flip"
+msgstr "Inverter"
 
 #: cps/templates/readcbr.html:147
 msgid "Horizontal"
@@ -2991,42 +2960,39 @@ msgstr "Esquerda para a direita"
 
 #: cps/templates/readcbr.html:157
 msgid "Right to Left"
-msgstr "Da direita para a esquerda"
+msgstr "Direita para a esquerda"
 
 #: cps/templates/readcbr.html:165
 msgid "Reset to Top"
-msgstr ""
+msgstr "Redefinir para o topo"
 
 #: cps/templates/readcbr.html:166
 msgid "Remember Position"
-msgstr ""
+msgstr "Lembrar Posição"
 
 #: cps/templates/readcbr.html:171
 msgid "Scrollbar"
-msgstr ""
+msgstr "Barra de Rolagem"
 
 #: cps/templates/readcbr.html:174
 msgid "Show"
-msgstr ""
+msgstr "Mostrar"
 
 #: cps/templates/readcbr.html:175
 msgid "Hide"
-msgstr ""
+msgstr "Esconder"
 
 #: cps/templates/readdjvu.html:5
-#, fuzzy
 msgid "DJVU Reader"
-msgstr "leitor de PDF"
+msgstr "leitor de DJVU"
 
 #: cps/templates/readpdf.html:29
-#, fuzzy
 msgid "PDF Reader"
-msgstr "leitor de PDF"
+msgstr "Leitor de PDF"
 
 #: cps/templates/readtxt.html:6
-#, fuzzy
 msgid "txt Reader"
-msgstr "leitor de PDF"
+msgstr "Leitor de TXT"
 
 #: cps/templates/register.html:4
 msgid "Register New Account"
@@ -3042,7 +3008,7 @@ msgstr "Seu endereço de e-mail"
 
 #: cps/templates/remote_login.html:5
 msgid "Magic Link - Authorise New Device"
-msgstr "Magic Link - Autorizar novo dispositivo"
+msgstr "Magic Link - Autorizar Novo Dispositivo"
 
 #: cps/templates/remote_login.html:7
 msgid "On another device, login and visit:"
@@ -3054,15 +3020,15 @@ msgstr "Uma vez verificado, você será automaticamente conectado a este disposi
 
 #: cps/templates/remote_login.html:14
 msgid "This verification link will expire in 10 minutes."
-msgstr "Este link de verificação expirará dentro de 10 minutos."
+msgstr "Este link de verificação irá expirar em 10 minutos."
 
 #: cps/templates/schedule_edit.html:29
 msgid "Generate Book Cover Thumbnails"
-msgstr ""
+msgstr "Gerar miniaturas de capa de Livro"
 
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
-msgstr ""
+msgstr "Gerar miniaturas de capa de Série"
 
 #: cps/templates/search.html:6
 msgid "No Results Found"
@@ -3086,16 +3052,15 @@ msgstr "Data de Publicação Até"
 
 #: cps/templates/search_form.html:59
 msgid "Exclude Tags"
-msgstr "Excluir Etiquetas"
+msgstr "Excluir Tags"
 
 #: cps/templates/search_form.html:77
 msgid "Exclude Series"
 msgstr "Excluir Série"
 
 #: cps/templates/search_form.html:95
-#, fuzzy
 msgid "Exclude Shelves"
-msgstr "Excluir Série"
+msgstr "Excluir Estante"
 
 #: cps/templates/search_form.html:115
 msgid "Exclude Languages"
@@ -3111,27 +3076,27 @@ msgstr "Excluir extensões"
 
 #: cps/templates/search_form.html:144
 msgid "Rating Above"
-msgstr "Classificação Acima"
+msgstr "Avaliação Acima"
 
 #: cps/templates/search_form.html:148
 msgid "Rating Below"
-msgstr "Classificação Abaixo"
+msgstr "Avaliação Abaixo"
 
 #: cps/templates/search_form.html:180
 msgid "From:"
-msgstr ""
+msgstr "De:"
 
 #: cps/templates/search_form.html:190
 msgid "To:"
-msgstr ""
+msgstr "Para:"
 
 #: cps/templates/shelf.html:13
 msgid "Delete this Shelf"
-msgstr "Excluir esta estante"
+msgstr "Apagar esta estante"
 
 #: cps/templates/shelf.html:14
 msgid "Edit Shelf Properties"
-msgstr "Editar as propriedades da estante"
+msgstr "Editar Propriedades da Estante"
 
 #: cps/templates/shelf.html:17
 msgid "Arrange books manually"
@@ -3139,19 +3104,19 @@ msgstr "Organizar os livros manualmente"
 
 #: cps/templates/shelf.html:18
 msgid "Disable Change order"
-msgstr "Desativar ordem de modificação"
+msgstr "Desabilitar Alterar Ordem"
 
 #: cps/templates/shelf.html:18
 msgid "Enable Change order"
-msgstr "Habilitar ordem de modificação"
+msgstr "Habilitar Alterar Ordem"
 
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
-msgstr "Partilhar com Todos"
+msgstr "Compartilhar com Todos"
 
 #: cps/templates/shelf_edit.html:21
 msgid "Sync this shelf with Kobo device"
-msgstr ""
+msgstr "sincronizar esta Estante com o Dispositivo Kobo"
 
 #: cps/templates/shelf_order.html:5
 msgid "Drag to Rearrange Order"
@@ -3187,7 +3152,7 @@ msgstr "Estatísticas do Sistema"
 
 #: cps/templates/stats.html:33
 msgid "Program"
-msgstr ""
+msgstr "Programa"
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3219,15 +3184,15 @@ msgstr "Hora de início"
 
 #: cps/templates/tasks.html:20
 msgid "Actions"
-msgstr ""
+msgstr "Ações"
 
 #: cps/templates/tasks.html:40
 msgid "This task will be cancelled. Any progress made by this task will be saved."
-msgstr ""
+msgstr "Esta tarefa será cancelada. Qualquer progresso feito por esta tarefa será salvo."
 
 #: cps/templates/tasks.html:41
 msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
-msgstr ""
+msgstr "Se esta for uma tarefa agendada, ela será executada novamente durante o próximo horário agendado."
 
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
@@ -3235,7 +3200,7 @@ msgstr "Redefinir senha do usuário"
 
 #: cps/templates/user_edit.html:43
 msgid "Language of Books"
-msgstr "Língua dos Livros"
+msgstr "Idioma dos Livros"
 
 #: cps/templates/user_edit.html:54
 msgid "OAuth Settings"
@@ -3247,11 +3212,11 @@ msgstr "Link"
 
 #: cps/templates/user_edit.html:58
 msgid "Unlink"
-msgstr "Desbloqueio"
+msgstr "Desvincular"
 
 #: cps/templates/user_edit.html:64
 msgid "Kobo Sync Token"
-msgstr "Kobo Sync Token"
+msgstr "Token de Sincronização Kobo"
 
 #: cps/templates/user_edit.html:66
 msgid "Create/View"
@@ -3259,123 +3224,107 @@ msgstr "Criar/Ver"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr ""
+msgstr "Forçar sincronização completa Kobo"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
-msgstr "Adicionar valores permitidos/definidos da coluna personalizada"
+msgstr "Adicionar valores Permitidos/Negados da coluna personalizada"
 
 #: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
-msgstr ""
+msgstr "Sincronizar apenas livros em estantes selecionadas com Kobo"
 
 #: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
 msgid "Delete User"
-msgstr "Eliminar Utilizador"
+msgstr "Apagar Usuário"
 
 #: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
-msgstr "Gerar o Kobo Auth URL"
+msgstr "Gerar URL de Autenticação Kobo"
 
 #: cps/templates/user_table.html:80 cps/templates/user_table.html:103
-#, fuzzy
 msgid "Select..."
-msgstr "Selecione"
+msgstr "Selecione..."
 
 #: cps/templates/user_table.html:131
-#, fuzzy
 msgid "Edit User"
-msgstr "Usuário Admin"
+msgstr "Editar Usuário"
 
 #: cps/templates/user_table.html:134
-#, fuzzy
 msgid "Enter Username"
 msgstr "Escolha um nome de usuário"
 
 #: cps/templates/user_table.html:135
-#, fuzzy
 msgid "Enter E-mail Address"
 msgstr "Seu endereço de e-mail"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "Enter E-Reader E-mail Address"
-msgstr "Enviar para o endereço de e-mail do Kindle"
+msgstr "Digite o endereço de e-mail do E-Reader"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "E-Reader E-mail"
-msgstr "E-mail de teste"
+msgstr "E-mail do E-Reader"
 
 #: cps/templates/user_table.html:137
-#, fuzzy
 msgid "Locale"
-msgstr "Balança"
+msgstr "Idioma"
 
 #: cps/templates/user_table.html:138
 msgid "Visible Book Languages"
-msgstr ""
+msgstr "Idiomas dos Livros Visíveis"
 
 #: cps/templates/user_table.html:139
-#, fuzzy
 msgid "Edit Allowed Tags"
-msgstr "Selecione Etiquetas permitidas/negadas"
+msgstr "Editar Tags Permitidas"
 
 #: cps/templates/user_table.html:139
 msgid "Allowed Tags"
-msgstr ""
+msgstr "Tags Permitidas"
 
 #: cps/templates/user_table.html:140
-#, fuzzy
 msgid "Edit Denied Tags"
-msgstr "Selecione Etiquetas permitidas/negadas"
+msgstr "Editar Tags Não Permitidas"
 
 #: cps/templates/user_table.html:140
 msgid "Denied Tags"
-msgstr ""
+msgstr "Tags Não Permitidas"
 
 #: cps/templates/user_table.html:141
-#, fuzzy
 msgid "Edit Allowed Column Values"
-msgstr "Adicionar valores permitidos/negados da coluna personalizada"
+msgstr "Editar Valores de Coluna Permitidos"
 
 #: cps/templates/user_table.html:141
-#, fuzzy
 msgid "Allowed Column Values"
-msgstr "Adicionar valores permitidos/negados da coluna personalizada"
+msgstr "Valores de Coluna Permitidos"
 
 #: cps/templates/user_table.html:142
-#, fuzzy
 msgid "Edit Denied Column Values"
-msgstr "Adicionar valores permitidos/negados da coluna personalizada"
+msgstr "Editar Valores de Coluna Não Permitidos"
 
 #: cps/templates/user_table.html:142
-#, fuzzy
 msgid "Denied Column Values"
-msgstr "Adicionar valores permitidos/negados da coluna personalizada"
+msgstr "Valores de Coluna Não Permitidos"
 
 #: cps/templates/user_table.html:144
-#, fuzzy
 msgid "Change Password"
-msgstr "Permitir mudança de senha"
+msgstr "Alterar senha"
 
 #: cps/templates/user_table.html:147
 msgid "View"
-msgstr ""
+msgstr "Ver"
 
 #: cps/templates/user_table.html:150
-#, fuzzy
 msgid "Edit Public Shelves"
-msgstr "Estante Pública"
+msgstr "Editar Estantes Públicas"
 
 #: cps/templates/user_table.html:152
 msgid "Sync selected Shelves with Kobo"
-msgstr ""
+msgstr "Sincronizar Estantes Selecionadas com Kobo"
 
 #: cps/templates/user_table.html:156
-#, fuzzy
 msgid "Show read/unread selection"
-msgstr "Mostrar selecção de séries"
+msgstr "Mostrar seleção de lidos/não lidos"
 
 #: cps/templates/user_table.html:159
 msgid "Show random books"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 6b1280031d243a95ea3d91b3577bd457366da136..f5980c8294f1be9a65d4c747562565d90863f8e1 100644
GIT binary patch
delta 22
ecmezLis{oUrVTs&*^Lbq3=OS}HXrcclnMZPLkXt<

delta 22
ecmezLis{oUrVTs&*$vGU49%@fHXrcclnMZPo(Zx5

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 9367427b6..2fbcd8511 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -292,7 +292,7 @@ msgstr ""
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -331,8 +331,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
@@ -350,7 +350,7 @@ msgstr "Изменить пользователя %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
@@ -468,7 +468,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
@@ -512,20 +512,20 @@ msgstr "не установлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Нет"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
@@ -640,7 +640,7 @@ msgstr "Настройка Google Drive не завершена, попробу
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Не удалось проверить домен обратного вызова, пожалуйста, выполните шаги для проверки домена в консоли разработчика Google."
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s форма не найден для книги с id: %(book)d"
@@ -744,7 +744,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Этот адрес электронной почты уже зарегистрирован."
@@ -798,7 +798,7 @@ msgid "Unrar binary file not found"
 msgstr ""
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+msgid "Error executing UnRar"
 msgstr ""
 
 #: cps/kobo_auth.py:89
@@ -815,7 +815,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -881,7 +881,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Логин"
 
@@ -931,7 +931,7 @@ msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
@@ -940,7 +940,7 @@ msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
@@ -958,7 +958,7 @@ msgid "Show Random Books"
 msgstr "Показывать Случайные Книги"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Категории"
 
@@ -968,7 +968,7 @@ msgstr "Показывать выбор категории"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Серии"
 
@@ -986,7 +986,7 @@ msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Издатели"
 
@@ -996,7 +996,7 @@ msgstr "Показать выбор издателя"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Языки"
 
@@ -1020,7 +1020,7 @@ msgstr "Форматы файлов"
 msgid "Show file formats selection"
 msgstr "Показать выбор форматов файлов"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr ""
 
@@ -1028,7 +1028,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr ""
 
@@ -1036,41 +1036,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Поиск"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
@@ -1275,111 +1275,111 @@ msgstr "Издатель: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Скачать"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Список рейтингов"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 1cb390be0e2704c4a4281d72eb2782ceb1ef5077..0d3698ddd6cbe08f6669da2d60e48903d1bafcd8 100644
GIT binary patch
delta 10807
zcmYM&3z*MU{=o5X3^Q)SxXdsN<2IPw2IW$2QHa=*<WAXH`InT-zfyiFT|^SAd*qf&
zsBMzsuTmS;ib}SNbWvMUR;q2Hwe9;o=RD7UpJ$)fIp5#;p7S}M^EqF%??kzUC(5Nh
zt(mqo;eU^mOOgioeQkUH|G)ohl_W)UcVJUIj;*m)VHn>FYtkPR`%^KW{=Jxin{gO!
z#mlhTnMu+WCt{Z*NhQl@RN%n}*b@(7I_9xTd2Eh3*a}-<Z>)@0VJ1$;s(3pZ`yzDQ
zn)v)}blk_W|1G-SFIbuNlYf^rShP(TSQD!=pfMUi5&FVeXdvgHJ06OTD@FsFiDqyP
zHo;|B4R@mB_hB78jP>zXtjhXH?Y2phi;dBN=VAvOf|c;L_<RAH(&d<m>(Cu<#dC2F
z4#i6Cl4Kx`!Lhg=2VqA0Bq6!UFl>x-FlD5xXk_CqBpJyeG}6i(d_By^ir5XSU~jB}
z7okTr7R^jCnu*z%hV!r%E{y$^Se5=-%*W@7$iE95;DIk5N6+pQ8fg>KKrG2%G_VwQ
z!;N@0euExO!;azoW=K|(c1WEjW6+J<g~Rc2G|+#c8L!rf{QIC~r?Asrm`8skI^YKM
z_a(9a6q@>7=oucs=6C|lP|jK5y@qItyJAZmh0Sm-X5sqy`}PzKGjIr9s1zq)b+%{!
zI&|WB==EEKX6iXKz?ZQmevDqLV`x#f=o|v*j2_hptc{b=@hLQr)M6UFX{<(5{56`=
zT3pU*SP$7;(gK}mG<t^DpcCGNj=K-7jmNPMu1AmZ7+Pa>h|b&51r1;rQnaaL5)CI@
zgQoUbG_sxOg!|DQeTFV{967$^G}gi*3c_ML9~<F?Xl5p3L%ahGU^SY_-RQh~%jEn&
zrr`o#qYM9no>|5@NiqP7Fc)W`FFt@SxH9(Fq8lhdZ^J9-wS5E4(0k~${RVUJ2Q<?e
zY`>NF|127&Y8*Q7E_7#$ur98~Y}|n!!TZ<%|A7Wpu6tN84_%-In#rE%Q4Eg##ppaM
z&`iC6DO2<z4X;ZnTD6UPgdO%l7wC^>=1Mf68CVY&q5-YL`uHMxL<g`Aei=Q9W~6%0
zaQ5}kB5vK2^EY*!dEf$l(TOiZGcXlhU@kVqrD#CUp*!4%PV_1I{<mlVzoG9{>J^S4
z7d_&3=<}ZFx_{`E3XzTBfoJ<Cbig!pfw{521iclj(G+h$HkG`Jp79x6A-+XPHd@^S
z(11px^GrblxCLGKUd+QsQZ(Gb3uxr8p)bCRR_m8&Z5+imSo6G4{k^ae{pnbMe~xZP
zCq5jt0L)xN^hmnnMK}}<EVY7$3p|4s$A{=b$MJm3>l?msSE4(ghwfkn8t7&$#8=Sb
z{SMRcXLMsH(fQJt%*=McBJ6|Ry#F(3@X<@2L66{TtcE|L0VNlNYR^Ff?Swubjb%rL
z1~L~tiU-hQd<uu+ZuGtS{la^F(BDU5F6$>V%Nj{?KXNsbjcDXYup<7126hVFS;hY0
z_bO;rXQLD5qi1|B8rUH8y)kI5T!jX@4hP^itjzjJ8a;ogj-F9t^lUn#XL$jd@`>mX
zTo?QEuo?Xa(4yOpd~K7xn2zZehCr*Mf#srs7Dg|?l-KME8Ut}A4#!uKIg(r+`k|SK
zPA~_(|M$oKhS=YRR{wsaPLqm*LhbZN173)Y@k#XT-@smYY7qHvO5+?#(v*!u7nq7=
z#fHAH0(;?p%)r`%L&oyZowvhEcpg^6LGk%WtU&)7^ysExE4%^C#LB_s-_*avgUa|0
zdgceQJ03=BB7aE8#Ar0Y8_@+9qs90bdUPe|5xj|+SndxYfGliBKL=f>AG*#ZDH^6`
z1iIr{Xh2J_Dy~5%dKTTuPPEE*qhHET&>Hy#J@eWZhlv~Dne>~YJ0F4ud?`9^ESAGm
zF%2WT3TxoQ=$UUoceEP|@esDhj7!4b-MS**m}De!kCVsI56y?@f~Dw&{*7*+Hh0kl
zo1#Tq5c;WPAPs9^FgoG&*cP{-ss9R@BgwxseEFu~0QzgO7M?%@uP`jsMmFZtZxro?
zW_SV`$nDqx7h`Yl|LZi|S^8z+OVtJ4NpbAoffh>%@-0dBp*zkV&K1Rr(H+l2i*q4b
zgb!kMToa#fL3jQV8u*u3_V@o%8lFws<srgMbU+?vVG+8+KCyo(I=&bkHx(_ax#)uT
zp|!IdEwYVR8%v^Z#NQ8L%7I5|)WuS?IBJXt6Vyd_)*M}+5Ub!>==k2~f+NudCZm5m
zr(*vR^k|<(GqXQF{{$U(Vg&gwpiy;X_(pd`Q#1-)=vH(G3(!m~!G5>~UHBN*!_#Oc
zaz=#>oQVe15#3;a^z4VB<0qoyXOH6iU0`v1@GyFIo6zUm(Li2BC)$hd<RCikD>O4d
z#{OyaXsV13|8}f{UFp}uZa5Up@IrK+2U0Xl@p3e>)#yEc30>f?=uY2@9!7WaBO2ft
zV?sXz4KN3NuNnG#2lV=OMXP=y=Hi3c1XIt_FyaH~3!laQ*XV>lU^bpckD&J0klF(5
zNdFu(L)W55Hw)d_6S2P@P4!;P!Nbv0$b6}!=D3iOX6OQ~(FuB>JMV`EFdXaP6f^^K
zv8*OApZ*&3%y*#+9z@3<M;ERzK3wBGwBHr$djBt`;Y5?sg>FVCT7sr(9s2ug=!6H*
z9e;-gT8d`Qf48-Q^k@;bqdzJ-A6wGjj;8)AEM)y8{fh8n2h68G8Xb5GI`NZesyD^{
z7ib2KptVwp7U5~MxH7H`{Tk@|_0dc=!N%ADo8zUJa%VTuD31%!;#q_i<+A81bfI<V
z&Nt(QxDCrby%WRVaI(>H!>}ffLcgq2&<!j{GrS+Y6-OtMf2*?DA48Q6$A<K8!y;UP
z&2c|gz?0}se@6qaTpVnG?yzmN2O8Mm*dK=maxI#nC(sP8D<=QGxRnPLaW{JAdod5c
z#rl~3r*IpZqF=uDn2!U{i6&zsyfOA4MmM$&J<5aV{ArWIpRQHVOt(zYXhGv_ycEZx
z*RBN9@f9>>Z=f%HhVJ|rTE)Mk*Ei>?5NP9QcTD5?2z1=o=*;LsH1O1uG%{#xK~ww^
zy7RxH0UVCMA4Mnp2@T*^^e8G%4rg5lE75O>t*`?c_-J&VY3Tg3&<xMP^4|Z)Xtd<P
z6Ig(6qQ&zAy5sWy6Ru+xS~Lad^YLgvQ(}J_n&LU=+20+1e>l1fSuk0JuD2F5y#Mde
zaK|4-OL5Z~-1V!&pYN|-6N>XUv?vRvgtNaKUFb$^fcIciT#IJ(Z^%^1`$)2qUe|_O
zumR7e|0$O9{@0lr{zg+5P0<xt87E;goQ7xNLul&vqDA<5^dwq*HLnZfI-tK#LO*14
zFbf~ROk9Wlz7@;<{{K$=;VU%tKcT6uczrm#D(DNf(CgV6{lpH$8aNIu;;GmKA40#B
z+c68@MT_uDbVI+P@8wS;|2`<17ACw5+t8nkp5;U6^<0h?*V9-NUql1igXiHta0IrT
z&cEsLHssrs?8l3+^NcX>9oUI}2^Qgz8RXw8&7B$UYZ3a#@I-Wh*;oZ1#9Fut-PzXo
z{B3l{A7O3$H+uG2{~Kx|7d_I>=sexg`3Io$T$!Tb3pb)wc^jI6r?4G<glA!;8$!|a
z#E$f5qStBz`u?-n8n>hK96^sN>qf31wnxAH_oBu6G+OkjJv1D6H2zTOrtm`nI<Rl-
zPe9Ks75j^@IsMIO0Pmy4bqL+S_h^c9XNB4rgl2F$dgOOwUGM)U8aX`Jg;ViUEW{x<
zhZ?vEop26%E1pJovJI_;Pp~H*M+0nkO9-qNX45Z51G@#Sr3L7EkKqvS|8q2)AZ>P7
zurF4lKM>u)2y}w^=mL+RXZI9Z-8<v+{dfWWuh1hqlezs8PC#$ReDu8%?1^t;HU6Je
zx-~42gBDQ%y3=#eh%bm<hMnmbqvMvLx1<Cu!foh|51|?S84aM(oKPzR(2ZS;4R9Q$
zT;OIJrepyc`Dz@6AERHivu_K5j6~0RGFr{k&_AqF@%e)2Qf$ccWwE~l^XczGYvvoY
zSgYMm{;l$Ew}+ifMvLS+G{QSD7gwUG-w~hh#rpKWLjy^l8&X^g-QhXd8wa2nnvX8L
zIQjw>(EoHU`EN_3!W|)HozNYQ!+e~C^>7|G$5q$}-$bf6`4$bZ+?}Bo^3Y7SL*MI%
zZfFAL;f&Z{g4WL36b*~wMRdY_=+2Lz)m`DP5LjJw;XdfuUy0@M2K2p~(F`p`kMv1&
zf#=Z-y@6)t{n$T@eo<5Zq+zlBibh)g?yztUI#D6IP&af3J+MEHMgv@fUGN1ofD`C#
zDK{^e70r*fLo?O`Gra#JXc*xY=mb-+tf;U({RL>%@4z1TFSK|%-4p)%z=Y`ISitj-
zqRISF6D`nNF$BkAF}ktWv5oit01Z=EenI%;Hb9GK5VpXD=n*}Sm2gk&{~fKJ?=cPQ
z-y6R5`B;^H0eYJ{qDOHRcEwrP54YH7{p2(aciwqnc(Ffv6vNO|U4;fR7d`up==hzn
z{~lU&-=IbJJ5I!U_l5UnqwhV5&bJ*K<KHorPvch_-Lc-HQ2oQP0{!u^UyRnkwO9qG
zp*u{W#kv5i<9f6vUc_p+2Z!LtXkdl+bF;87`upnp$-g^&mIpO(SM&q)ejh;>N?RNv
z&%(;|TVq@7j80UH*2Z*9#}drK?Py?cqk$g6d_09UvHlYBKa@t>CH!|<ybX=`bM%Gw
ze-0B|gbnGB!A!gvEvorwAS>})d>02}=F;%x9E1Ko2R-{|Z~z`fkF-<jfv~`6G(}gV
zXLKjF#}(KM-@}Sn>%nl=xoE~ZpwIhYZM+c8+&J_IXT{&=pn=?tUgND;2U7=VnBwoy
ziGIbN_&b`?o)3jg%*Gu0kD|Ar1PyoxI?)H{d&kf~+B_U;={)R9e;{V!qWF9{QiQ2w
z9SwK#7J6m}qsP!Q`W-F0nvaA98=^bxf-Zb18u(;%+;!+qZ;8)0#^)tyZM=*Y^KR_y
z{r?+{Y#x+<G^8dMbLn?MzXL;Y5H7_6JdA^}(qrK-pO<4Z`j4V1e+BE~E;JK|u^g77
z<4(nXqsRHH8tW%bXjl{j@l0HbU2rFk#8YT33|kidmU}096rZCh{S`fu^yOh(7Ft~A
z#r|Y8laFF++>96DK}@xy(dvot;s|U={~kOS*P}0fjcxEG8fc3Z6dYcMX}ATe;x_aM
zcVjL52>He*$FMp65}!9%8OFC?N&dah-Fe`P{n4F`M33b9_<UaUQS=Nq#r~Gq-yQq=
z(3<!HJ&IB^kkiquRbidxXw7wAl?n^?=YcPbM~kR9_OC}%d;=QjU1)%d(TO);U3>{W
z^ABSGCp2SKSBLkyVLkfiV<Q}g9(5{3!+}qs#q|+Z!(>g^X(qZ*HV(x?G@#jNk=~2>
zxDMU<o9IHHq2o@XMVRqq2sAHxHoBqI5E{NP5*;`lE8;wK;YH}ttVYlBd355J(NF8%
z*#8tQ!edw-OVJ|!4ZC8ewP8b3(0OKJ1=deeG|a#q;XzV@p3RHVx6oQR82dkB8vXL?
z!nh1{;d*H1nj#Y?Md+>RjJ<IZn)(gsEqDvd{{3G{qaqKI^&zr!G&MEQv#pP2pc9&r
z3$O={M8`dhPPiJ)%)8hEKSu+~*bwH)Mr)@XI$uAmNc|-vXgKkBtc26i7iXg{EI`k8
zHTvQ<^z8Rw0e*vdnE6x~-x|HPebGz~N8g`>WwjIg_hQP4R?%?cm(T^@i35(HHSr%b
zpjsQly={yx&=yT~Z)}GB(15PSHn;@+zU;&%cmi8u?M>lmx^LqA{b33Z^nNVF=g=eh
zEDroS_H#CeKpLXIx5f<Yi0ODPn!&#D_raJ+e;E2<n}}`jcC>i^vYGr_tvh+(PG3hS
z{urI`3v|M7u?qf#<MDTN{P?HCpL#RUqTGUIM}(c|@4+HG<C$<o9kB!bi_zzEQ#2g-
zJT}GeurXHuODLiuG{qw@6USi|PC<|0R<w4Opl7@m&EyWOhM(iv_)m0W&7Td=TVr+l
zsctmf*@fuYT!x-y3QgH+bl_{TzaLxC|1myqP!h(sM!$d;qZ_&gJ<6462H!>l`v7a;
zDeUO|uku{@dwEYZ;$>JFH)1|+#Vq^~{SF*Oi}s8yVSEF$`U|lE_DA3UBj)2&G^6*U
z<4VvE-n&?K|G%SQYJbM&SpNBN_N~z3Dnie;8`i|0==e)we?sg}$0DBJjt0C1t)boM
z5$;0+Ie_J`6bronr)ads##=*b24fxi<DxUr56*ma;<wO%K0#CY1$wqWVr@K$E}Z#7
zDDLcNE*9{-Ay&onv4$zRgoaMVCI4xaSMqJE<Jl$0d+k0my<<^+QBk)JB|EO(Tfbz@
I-G%M{3xcStA^-pY

delta 10857
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

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index f1cb5499a..6b151de94 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -290,7 +290,7 @@ msgstr "Verifiering av G-mail-kontot lyckades"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Databasfel: %(error)s."
@@ -329,8 +329,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
@@ -348,7 +348,7 @@ msgstr "Redigera användaren %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
@@ -466,7 +466,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
@@ -509,20 +509,20 @@ msgstr "inte installerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Ingen"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 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"
 
@@ -637,7 +637,7 @@ msgstr "Installationen av Google Drive är inte klar, försök att inaktivera oc
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Återuppringningsdomänen är inte verifierad, följ stegen för att verifiera domänen i Google utvecklarkonsol"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formatet hittades inte för bok-id: %(book)d"
@@ -741,7 +741,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
@@ -794,7 +794,8 @@ msgid "Unrar binary file not found"
 msgstr "Unrar binär fil hittades inte"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "Fel vid körning av UnRar"
 
 #: cps/kobo_auth.py:89
@@ -811,7 +812,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -877,7 +878,7 @@ msgid "{} Stars"
 msgstr "{} stjärnor"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Logga in"
 
@@ -927,7 +928,7 @@ msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Lästa böcker"
 
@@ -936,7 +937,7 @@ msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
@@ -954,7 +955,7 @@ msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -964,7 +965,7 @@ msgstr "Visa kategorival"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Serier"
 
@@ -982,7 +983,7 @@ msgid "Show author selection"
 msgstr "Visa författarval"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Förlag"
 
@@ -992,7 +993,7 @@ msgstr "Visa urval av förlag"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Språk"
 
@@ -1016,7 +1017,7 @@ msgstr "Filformat"
 msgid "Show file formats selection"
 msgstr "Visa val av filformat"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Arkiverade böcker"
 
@@ -1024,7 +1025,7 @@ msgstr "Arkiverade böcker"
 msgid "Show archived books"
 msgstr "Visa arkiverade böcker"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Boklista"
 
@@ -1032,41 +1033,41 @@ msgstr "Boklista"
 msgid "Show Books List"
 msgstr "Visa boklista"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Sök"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lässtatus = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
@@ -1271,111 +1272,111 @@ msgstr "Förlag: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Hämtningar"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Betygslista"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, 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:1205
+#: cps/web.py:1208
 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:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 63bc0cc0658bf611170436990fd42f0dec594ca8..4c369f70609ebfc3437c1004b93301a3c4cedd78 100644
GIT binary patch
delta 22
ecmX@QhVkec#tjKZ?8b%)hK5!~o70W%DFXmu1qaOl

delta 22
ecmX@QhVkec#tjKZ?1p9vhUQi#o70W%DFXmuU<cR$

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 568d20256..9e76c97d8 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -286,7 +286,7 @@ msgstr ""
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -325,8 +325,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
@@ -344,7 +344,7 @@ msgstr "%(nick)s kullanıcısını düzenle"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
@@ -461,7 +461,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
@@ -505,20 +505,20 @@ msgstr "yüklü değil"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Hiçbiri"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -633,7 +633,7 @@ msgstr "Google Drive kurulumu tamamlanmadı, Google Drive'ı devre dışı bıra
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Geri yönlendirme alanı (callback domain) doğrulanamadı, lütfen Google geliştirici konsolunda alan adını doğrulamak için gerekli adımları izleyin."
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(book)d nolu kitap için %(format)s biçimi bulunamadı"
@@ -737,7 +737,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bu e-posta adresi için bir hesap mevcut."
@@ -791,7 +791,7 @@ msgid "Unrar binary file not found"
 msgstr ""
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+msgid "Error executing UnRar"
 msgstr ""
 
 #: cps/kobo_auth.py:89
@@ -807,7 +807,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -873,7 +873,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Giriş"
 
@@ -923,7 +923,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Okunanlar"
 
@@ -932,7 +932,7 @@ msgid "Show read and unread"
 msgstr "Okunan ve okunmayanları göster"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Okunmamışlar"
 
@@ -950,7 +950,7 @@ msgid "Show Random Books"
 msgstr "Rastgele Kitap Göster"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -960,7 +960,7 @@ msgstr "Kategori seçimini göster"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Seriler"
 
@@ -978,7 +978,7 @@ msgid "Show author selection"
 msgstr "Yazar seçimini göster"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Yayıncılar"
 
@@ -988,7 +988,7 @@ msgstr "Yayıncı seçimini göster"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Diller"
 
@@ -1012,7 +1012,7 @@ msgstr "Biçimler"
 msgid "Show file formats selection"
 msgstr "Dosya biçimi seçimini göster"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr ""
 
@@ -1020,7 +1020,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr ""
 
@@ -1028,41 +1028,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Ara"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
@@ -1267,111 +1267,111 @@ msgstr "Yayınevi: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Değerlendirme listesi"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Biçim listesi"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, 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:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 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/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 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:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 4c6eb49d48fa83474dae16c22fa6fb18ec95be97..bb864517bc2be0b86a65bc2bb5be875c18debb8d 100644
GIT binary patch
delta 22
dcmcb)hw<hf#tm#b?8b%)hK5!~n|XD7i~wGM2GRfk

delta 22
dcmcb)hw<hf#tm#b?1p9vhUQi#n|XD7i~wHS2HgMv

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 4c1dc5a50..be4f56d6d 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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -289,7 +289,7 @@ msgstr ""
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -328,8 +328,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr "Змінити користувача %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
@@ -463,7 +463,7 @@ msgstr "З'єднання з базою даних закрите"
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
@@ -506,20 +506,20 @@ msgstr "не встановлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "Ні"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
@@ -634,7 +634,7 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Домен зворотнього зв'язку не підтверджено. Виконайте дії для підтвердження домену, будь-ласка"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
@@ -738,7 +738,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -791,7 +791,7 @@ msgid "Unrar binary file not found"
 msgstr ""
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+msgid "Error executing UnRar"
 msgstr ""
 
 #: cps/kobo_auth.py:89
@@ -807,7 +807,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -873,7 +873,7 @@ msgid "{} Stars"
 msgstr "{} зірок"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -923,7 +923,7 @@ msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "Прочитані книги"
 
@@ -932,7 +932,7 @@ msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
@@ -950,7 +950,7 @@ msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "Категорії"
 
@@ -960,7 +960,7 @@ msgstr "Показувати вибір категорії"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "Серії"
 
@@ -978,7 +978,7 @@ msgid "Show author selection"
 msgstr "Показувати вибір автора"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "Видавництва"
 
@@ -988,7 +988,7 @@ msgstr ""
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "Мови"
 
@@ -1012,7 +1012,7 @@ msgstr "Формати файлів"
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "Архівні книжки"
 
@@ -1020,7 +1020,7 @@ msgstr "Архівні книжки"
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "Список книжок"
 
@@ -1028,41 +1028,41 @@ msgstr "Список книжок"
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Пошук"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "Опубліковані після "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "Опубліковано до "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
@@ -1266,111 +1266,111 @@ msgstr "Видавництво: %(name)s"
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr "Рейтинг: Відсутній"
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Рейтинг: %(rating)s зірок"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файлу: %(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "Завантаження"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "Список рейтингів"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "Список форматів файлу"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 5a33406659f92d2350444e671f5d6d50cbb49d2c..d57d3b4120c40a5047700d21dff7077336002404 100644
GIT binary patch
delta 12706
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
IUKx<}KO8*r+yDRo

delta 12744
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

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 9c24309bc..412794f09 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -285,7 +285,7 @@ msgstr "G-Mail账号校验成功"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
@@ -324,8 +324,8 @@ msgstr "指定任务的持续时间无效"
 msgid "Scheduled tasks settings updated"
 msgstr "已更新计划任务设置"
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
@@ -343,7 +343,7 @@ msgstr "编辑用户 %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
@@ -457,7 +457,7 @@ msgstr "数据库设置已更新"
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
@@ -500,20 +500,20 @@ msgstr "未安装"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "无"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
@@ -628,7 +628,7 @@ msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id为 %(book)d 的书籍的 %(format)s 格式"
@@ -731,7 +731,7 @@ msgstr "重命名此路径: {}文件时出错"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
@@ -784,7 +784,8 @@ msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "执行UnRar时出错"
 
 #: cps/kobo_auth.py:89
@@ -800,7 +801,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -866,7 +867,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "登录"
 
@@ -916,7 +917,7 @@ msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "已读书籍"
 
@@ -925,7 +926,7 @@ msgid "Show read and unread"
 msgstr "显示阅读状态"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "未读书籍"
 
@@ -943,7 +944,7 @@ msgid "Show Random Books"
 msgstr "显示随机书籍"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "分类"
 
@@ -953,7 +954,7 @@ msgstr "显示分类选择"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "丛书"
 
@@ -971,7 +972,7 @@ msgid "Show author selection"
 msgstr "显示作者选择"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "出版社"
 
@@ -981,7 +982,7 @@ msgstr "显示出版社选择"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "语言"
 
@@ -1005,7 +1006,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "归档书籍"
 
@@ -1013,7 +1014,7 @@ msgstr "归档书籍"
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "书籍列表"
 
@@ -1021,41 +1022,41 @@ msgstr "书籍列表"
 msgid "Show Books List"
 msgstr "显示书籍列表"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "搜索"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "高级搜索"
 
@@ -1257,111 +1258,111 @@ msgstr "出版社：%(name)s"
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr "评分：无"
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "下载次数"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "资料已更新"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index a338eb21067dd2edb78db6b777c5421af6bf9237..0184ea871a0da32144a46641e8f966d3752db390 100644
GIT binary patch
delta 11468
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

delta 11512
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
bn-$KOTv$Em;_6*LuUVvvPZlOEE~)>2HkKZi

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index d2a1564d7..3282374aa 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -285,7 +285,7 @@ msgstr "G-Mail賬號驗證成功"
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
@@ -324,8 +324,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
@@ -343,7 +343,7 @@ msgstr "編輯用戶 %(nick)s"
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
@@ -459,7 +459,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
@@ -502,20 +502,20 @@ msgstr "未安裝"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "無"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
@@ -630,7 +630,7 @@ msgstr "Google Drive 設置未完成，請嘗試停用並再次激活Google雲
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回調網域名稱尚未被驗證，請在google開發者控制台按步驟驗證網域名稱"
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id為 %(book)d 的書籍的 %(format)s 格式"
@@ -734,7 +734,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此郵箱的賬號已經存在。"
 
@@ -787,7 +787,8 @@ msgid "Unrar binary file not found"
 msgstr "找不到Unrar執行文件"
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+#, fuzzy
+msgid "Error executing UnRar"
 msgstr "執行UnRar時出錯"
 
 #: cps/kobo_auth.py:89
@@ -804,7 +805,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -870,7 +871,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr "登入"
 
@@ -920,7 +921,7 @@ msgid "Show Top Rated Books"
 msgstr "顯示最高評分書籍"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr "已讀書籍"
 
@@ -929,7 +930,7 @@ msgid "Show read and unread"
 msgstr "顯示閱讀狀態"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr "未讀書籍"
 
@@ -947,7 +948,7 @@ msgid "Show Random Books"
 msgstr "隨機顯示書籍"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr "分類"
 
@@ -957,7 +958,7 @@ msgstr "顯示分類選擇"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr "叢書"
 
@@ -975,7 +976,7 @@ msgid "Show author selection"
 msgstr "顯示作者選擇"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr "出版社"
 
@@ -985,7 +986,7 @@ msgstr "顯示出版社選擇"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr "語言"
 
@@ -1009,7 +1010,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "顯示文件格式選擇"
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr "歸檔書籍"
 
@@ -1017,7 +1018,7 @@ msgstr "歸檔書籍"
 msgid "Show archived books"
 msgstr "顯示歸檔書籍"
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr "書籍列表"
 
@@ -1025,41 +1026,41 @@ msgstr "書籍列表"
 msgid "Show Books List"
 msgstr "顯示書籍列表"
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "搜尋"
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr "出版時間晚於 "
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr "出版時間早於 "
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評分 <= %(rating)s"
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評分 >= %(rating)s"
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "閱讀狀態 = %(status)s"
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
@@ -1262,111 +1263,111 @@ msgstr "出版社：%(name)s"
 msgid "Series: %(serie)s"
 msgstr "叢書：%(serie)s"
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "評分：%(rating)s 星"
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分類：%(name)s"
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr "語言：%(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr "下載次數"
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr "評分列表"
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”登入"
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr "資料已更新"
 
diff --git a/messages.pot b/messages.pot
index 731112c87..0de4f9bb0 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-16 17:49+0200\n"
+"POT-Creation-Date: 2022-07-31 11:29+0200\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"
@@ -284,7 +284,7 @@ msgstr ""
 #: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
 #: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1413
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -323,8 +323,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1254
-#: cps/web.py:1315
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -342,7 +342,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1407 cps/web.py:1194
+#: cps/admin.py:1407 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
@@ -456,7 +456,7 @@ msgstr ""
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1844 cps/web.py:1229
+#: cps/admin.py:1844 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr ""
 
@@ -499,20 +499,20 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:679 cps/web.py:720
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:922 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:656 cps/web.py:681 cps/web.py:962
-#: cps/web.py:992 cps/web.py:1027 cps/web.py:1055 cps/web.py:1094
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr ""
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1454
-#: cps/web.py:1496 cps/web.py:1541
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -627,7 +627,7 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:80
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
@@ -730,7 +730,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:643 cps/web.py:1408
+#: cps/helper.py:643 cps/web.py:1411
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -783,7 +783,7 @@ msgid "Unrar binary file not found"
 msgstr ""
 
 #: cps/helper.py:943
-msgid "Error excecuting UnRar"
+msgid "Error executing UnRar"
 msgstr ""
 
 #: cps/kobo_auth.py:89
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1286
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -865,7 +865,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1335
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
 msgid "Login"
 msgstr ""
 
@@ -915,7 +915,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:739
+#: cps/templates/index.xml:58 cps/web.py:741
 msgid "Read Books"
 msgstr ""
 
@@ -924,7 +924,7 @@ msgid "Show read and unread"
 msgstr ""
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:742
+#: cps/templates/index.xml:65 cps/web.py:744
 msgid "Unread Books"
 msgstr ""
 
@@ -942,7 +942,7 @@ msgid "Show Random Books"
 msgstr ""
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1098
+#: cps/templates/index.xml:83 cps/web.py:1101
 msgid "Categories"
 msgstr ""
 
@@ -952,7 +952,7 @@ msgstr ""
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:995 cps/web.py:1002
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
 msgid "Series"
 msgstr ""
 
@@ -970,7 +970,7 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:966
+#: cps/templates/index.xml:76 cps/web.py:968
 msgid "Publishers"
 msgstr ""
 
@@ -980,7 +980,7 @@ msgstr ""
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1070
+#: cps/web.py:1073
 msgid "Languages"
 msgstr ""
 
@@ -1004,7 +1004,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:94 cps/web.py:765
+#: cps/render_template.py:94 cps/web.py:767
 msgid "Archived Books"
 msgstr ""
 
@@ -1012,7 +1012,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:796
+#: cps/render_template.py:99 cps/web.py:798
 msgid "Books List"
 msgstr ""
 
@@ -1020,41 +1020,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:389 cps/templates/book_edit.html:236
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
 #: cps/templates/layout.html:46 cps/templates/layout.html:49
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr ""
 
-#: cps/search.py:185
+#: cps/search.py:188
 msgid "Published after "
 msgstr ""
 
-#: cps/search.py:192
+#: cps/search.py:195
 msgid "Published before "
 msgstr ""
 
-#: cps/search.py:214
+#: cps/search.py:217
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/search.py:216
+#: cps/search.py:219
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/search.py:218
+#: cps/search.py:221
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:320
+#: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:339 cps/search.py:371 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
 msgstr ""
 
@@ -1256,111 +1256,111 @@ msgstr ""
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:609
+#: cps/web.py:611
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:620
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:636
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:673
+#: cps/web.py:675
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:700
+#: cps/web.py:702
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:938
+#: cps/templates/admin.html:16 cps/web.py:940
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:1030
+#: cps/web.py:1033
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1057
+#: cps/web.py:1060
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:1199
+#: cps/web.py:1202
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1203
+#: cps/web.py:1206
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1205
+#: cps/web.py:1208
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1222
+#: cps/web.py:1225
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1223
-#: cps/web.py:1230 cps/web.py:1236 cps/web.py:1255 cps/web.py:1260
-#: cps/web.py:1266
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1257
+#: cps/web.py:1260
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1261
+#: cps/web.py:1264
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1275
+#: cps/web.py:1278
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1294
+#: cps/web.py:1297
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1300
+#: cps/web.py:1303
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1304 cps/web.py:1329
+#: cps/web.py:1307 cps/web.py:1332
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1311
+#: cps/web.py:1314
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/web.py:1320
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1324
+#: cps/web.py:1327
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1388 cps/web.py:1437
+#: cps/web.py:1391 cps/web.py:1440
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1404
+#: cps/web.py:1407
 msgid "Profile updated"
 msgstr ""
 

From b5d5660d04acc98283b4ff4a798596d0d270441e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 31 Jul 2022 16:14:03 +0200
Subject: [PATCH 311/412] Update version

---
 cps/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/constants.py b/cps/constants.py
index 0f3b25308..d00760671 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -163,7 +163,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher, pubdate, identifiers')
 
-STABLE_VERSION = {'version': '0.6.19 Beta'}
+STABLE_VERSION = {'version': '0.6.19'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'

From 8a5112502d37ff88daf768e8a856990bae576322 Mon Sep 17 00:00:00 2001
From: Martin Brodbeck <martin@brodbeck-online.de>
Date: Fri, 12 Aug 2022 11:51:26 +0200
Subject: [PATCH 312/412] Considers the language of the ebook instead of always
 specifying "English".

---
 cps/kobo.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index c379e9a21..e886d95b0 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -443,6 +443,12 @@ def get_seriesindex(book):
     return book.series_index or 1
 
 
+def get_language(book):
+    if not book.languages:
+        return 'en'
+    return book.languages[0].lang_code
+
+
 def get_metadata(book):
     download_urls = []
     kepub = [data for data in book.data if data.format == 'KEPUB']
@@ -480,7 +486,7 @@ def get_metadata(book):
         "IsInternetArchive": False,
         "IsPreOrder": False,
         "IsSocialEnabled": True,
-        "Language": "en",
+        "Language": get_language(book),
         "PhoneticPronunciations": {},
         "PublicationDate": convert_to_kobo_timestamp_string(book.pubdate),
         "Publisher": {"Imprint": "", "Name": get_publisher(book), },

From cd143b7ef4b6232ca28f2acf15cff8162f426998 Mon Sep 17 00:00:00 2001
From: Martin Brodbeck <martin@brodbeck-online.de>
Date: Fri, 12 Aug 2022 15:18:50 +0200
Subject: [PATCH 313/412] Use part1 instead of part3 language codes

---
 cps/kobo.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index e886d95b0..9814e83d0 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -45,6 +45,7 @@ import requests
 
 
 from . import config, logger, kobo_auth, db, calibre_db, helper, shelf as shelf_lib, ub, csrf, kobo_sync_status
+from . import isoLanguages
 from .constants import sqlalchemy_version2, COVER_THUMBNAIL_SMALL
 from .helper import get_download_link
 from .services import SyncToken as SyncToken
@@ -446,7 +447,7 @@ def get_seriesindex(book):
 def get_language(book):
     if not book.languages:
         return 'en'
-    return book.languages[0].lang_code
+    return isoLanguages.get(part3=book.languages[0].lang_code).part1
 
 
 def get_metadata(book):

From 9de474e6656b787bc03ae6dccdad645214523100 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Aug 2022 10:03:01 +0200
Subject: [PATCH 314/412] Add galician language to available translations
 (#2510)

---
 README.md                                     |    2 +-
 babel.cfg                                     |    4 +-
 cps/iso_language_names.py                     |  378 ++
 .../locales/bootstrap-datepicker.gl.min.js    |    1 +
 cps/translations/cs/LC_MESSAGES/messages.mo   |  Bin 38242 -> 38242 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/de/LC_MESSAGES/messages.mo   |  Bin 58646 -> 59469 bytes
 cps/translations/de/LC_MESSAGES/messages.po   |   40 +-
 cps/translations/el/LC_MESSAGES/messages.mo   |  Bin 55808 -> 55808 bytes
 cps/translations/el/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/es/LC_MESSAGES/messages.mo   |  Bin 49839 -> 49839 bytes
 cps/translations/es/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/fi/LC_MESSAGES/messages.mo   |  Bin 26606 -> 26606 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/fr/LC_MESSAGES/messages.mo   |  Bin 54122 -> 54122 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/gl/LC_MESSAGES/messages.mo   |  Bin 0 -> 59874 bytes
 cps/translations/gl/LC_MESSAGES/messages.po   | 3332 +++++++++++++++++
 cps/translations/hu/LC_MESSAGES/messages.mo   |  Bin 24357 -> 24357 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/it/LC_MESSAGES/messages.mo   |  Bin 54671 -> 54671 bytes
 cps/translations/it/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/ja/LC_MESSAGES/messages.mo   |  Bin 63369 -> 63369 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/km/LC_MESSAGES/messages.mo   |  Bin 23905 -> 23905 bytes
 cps/translations/km/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/ko/LC_MESSAGES/messages.mo   |  Bin 54185 -> 54185 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/nl/LC_MESSAGES/messages.mo   |  Bin 48982 -> 48982 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/pl/LC_MESSAGES/messages.mo   |  Bin 50803 -> 50803 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   |    4 +-
 .../pt_BR/LC_MESSAGES/messages.mo             |  Bin 59965 -> 59965 bytes
 .../pt_BR/LC_MESSAGES/messages.po             |    4 +-
 cps/translations/ru/LC_MESSAGES/messages.mo   |  Bin 46450 -> 46450 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/sv/LC_MESSAGES/messages.mo   |  Bin 47246 -> 47246 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/tr/LC_MESSAGES/messages.mo   |  Bin 22085 -> 22085 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   |    4 +-
 cps/translations/uk/LC_MESSAGES/messages.mo   |  Bin 24153 -> 24153 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   |    4 +-
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        |  Bin 53399 -> 53399 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        |    4 +-
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        |  Bin 47393 -> 47393 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        |    4 +-
 messages.pot                                  |    4 +-
 47 files changed, 3772 insertions(+), 65 deletions(-)
 create mode 100644 cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.gl.min.js
 create mode 100644 cps/translations/gl/LC_MESSAGES/messages.mo
 create mode 100644 cps/translations/gl/LC_MESSAGES/messages.po

diff --git a/README.md b/README.md
index ff303c9fd..569e7b60b 100755
--- a/README.md
+++ b/README.md
@@ -19,7 +19,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 brazilian, czech, dutch, english, finnish, french, german, greek, hungarian, italian, japanese, khmer, korean, polish, russian, simplified and traditional chinese, spanish, swedish, turkish, ukrainian
+- User Interface in brazilian, czech, dutch, english, finnish, french, galician, german, greek, hungarian, italian, japanese, khmer, korean, polish, russian, simplified and traditional chinese, spanish, swedish, turkish, ukrainian
 - OPDS feed for eBook reader apps 
 - Filter and search by titles, authors, tags, series, book format and language
 - Create a custom book collection (shelves)
diff --git a/babel.cfg b/babel.cfg
index 128f13b68..9c7ce3a79 100644
--- a/babel.cfg
+++ b/babel.cfg
@@ -1,3 +1,5 @@
 [python: **.py]
+
+# has to be executed with jinja2 >=2.9 to have autoescape enabled automatically
 [jinja2: **/templates/**.*ml]
-extensions=jinja2.ext.autoescape,jinja2.ext.with_
\ No newline at end of file
+extensions=jinja2.ext.with_
diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index f86e5612e..648078132 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -2517,6 +2517,384 @@ LANGUAGE_NAMES = {
         "zxx": "pas de contenu linguistique",
         "zza": "zaza"
     },
+    "gl": {
+        "abk": "Abjaziano",
+        "ace": "Achinés",
+        "ach": "Acolí",
+        "ada": "Adangme",
+        "ady": "Adigué",
+        "aar": "Afar",
+        "afh": "Afrihili",
+        "afr": "Africáner",
+        "ain": "Ainu (Xapón)",
+        "aka": "Akan",
+        "akk": "Acadio",
+        "sqi": "Albanian",
+        "ale": "Aleutiano",
+        "amh": "Amhárico",
+        "anp": "Angika",
+        "ara": "Árabe",
+        "arg": "Aragonés",
+        "arp": "Arapaho",
+        "arw": "Arawak",
+        "hye": "Armenian",
+        "asm": "Asamés",
+        "ast": "Asturiano",
+        "ava": "Avárico",
+        "ave": "Avéstico",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Acerbaixano",
+        "ban": "Balinés",
+        "bal": "Baluchi",
+        "bam": "Bambara",
+        "bas": "Basa (Camerún)",
+        "bak": "Bashkir",
+        "eus": "Vasco",
+        "bej": "Beja",
+        "bel": "Bielorruso",
+        "bem": "Bemba (Zambia)",
+        "ben": "Bengalí",
+        "bit": "Berinomo",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "byn": "Bilin",
+        "bin": "Bini",
+        "bis": "Bislama",
+        "zbl": "Símbolos Blis",
+        "bos": "Bosnio",
+        "bra": "Braj",
+        "bre": "Bretón",
+        "bug": "Buginés",
+        "bul": "Búlgaro",
+        "bua": "Buriat",
+        "mya": "Birmano",
+        "cad": "Caddo",
+        "cat": "Catalán",
+        "ceb": "Cebuano",
+        "chg": "Chagatai",
+        "cha": "Chamorro",
+        "che": "Checheno",
+        "chr": "Cherokee",
+        "chy": "Cheyenne",
+        "chb": "Chibcha",
+        "zho": "Chinés",
+        "chn": "Chinook; argot",
+        "chp": "Chipewyan",
+        "cho": "Choctaw",
+        "cht": "Cholón",
+        "chk": "Chuukese",
+        "chv": "Chuvash",
+        "cop": "Copto",
+        "cor": "Cornish",
+        "cos": "Corso",
+        "cre": "Cree",
+        "mus": "Creek",
+        "hrv": "Croata",
+        "ces": "Checo",
+        "dak": "Dakota",
+        "dan": "Danés",
+        "dar": "Dargwa",
+        "del": "Delaware",
+        "div": "Dhivehi",
+        "din": "Dinka",
+        "doi": "Dogri (macrolingua)",
+        "dgr": "Dogrib",
+        "dua": "Duala",
+        "nld": "Holandés",
+        "dse": "Lingua de signos holandés",
+        "dyu": "Dyula",
+        "dzo": "Dzongkha",
+        "efi": "Efik",
+        "egy": "Exipcio (antigo)",
+        "eka": "Ekajuk",
+        "elx": "Elamita",
+        "eng": "Inglés",
+        "enu": "Enu",
+        "myv": "Erzya",
+        "epo": "Esperanto",
+        "est": "Estonio",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang (Guinea ecuatorial)",
+        "fat": "Fanti",
+        "fao": "Feroés",
+        "fij": "Fixino",
+        "fil": "Filipino",
+        "fin": "Finés",
+        "fon": "Fon",
+        "fra": "Francés",
+        "fur": "Friuliano",
+        "ful": "Fulah",
+        "gaa": "Ga",
+        "glg": "Galego",
+        "lug": "Ganda",
+        "gay": "Gayo",
+        "gba": "Gbaya (República centroafricana)",
+        "hmj": "Ge",
+        "gez": "Geez",
+        "kat": "Xeorxiano",
+        "deu": "Alemán",
+        "gil": "Gilbertés",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "Gótico",
+        "grb": "Grebo",
+        "grn": "Guaraní",
+        "guj": "Gujarati",
+        "gwi": "Gwichʼin",
+        "hai": "Haida",
+        "hau": "Haussa",
+        "haw": "Hawaiano",
+        "heb": "Hebreo",
+        "her": "Herero",
+        "hil": "Hiligaynon",
+        "hin": "Hindi",
+        "hmo": "Hiri Motu",
+        "hit": "Hitita",
+        "hmn": "Hmong",
+        "hun": "Húngaro",
+        "hup": "Hupa",
+        "iba": "Iban",
+        "isl": "Islandés",
+        "ido": "Ido",
+        "ibo": "Igbo",
+        "ilo": "Iloko",
+        "ind": "Indonesio",
+        "inh": "Ingush",
+        "ina": "Interlingua (lingua internacional auxiliar)",
+        "ile": "Interlingue",
+        "iku": "Inuktitut",
+        "ipk": "Inupiak",
+        "gle": "Irlandés",
+        "ita": "Italiano",
+        "jpn": "Xaponés",
+        "jav": "Xavanés",
+        "jrb": "Xudeu-Árabe",
+        "jpr": "Xudeu-Persa",
+        "kbd": "Kabardian",
+        "kab": "Kabyle",
+        "kac": "Kachin",
+        "kal": "Kalaallisut",
+        "xal": "Kalmyk",
+        "kam": "Kamba (Kenya)",
+        "kan": "Kannada",
+        "kau": "Kanuri",
+        "kaa": "Kara-Kalpak",
+        "krc": "Karachay-Balkar",
+        "krl": "Karelian",
+        "kas": "Kashmiri",
+        "csb": "Kashubiano",
+        "kaw": "Kawi",
+        "kaz": "Kazako",
+        "kha": "Khasi",
+        "kho": "Khotanese",
+        "kik": "Kikuyu",
+        "kmb": "Kimbundu",
+        "kin": "Kinyarwanda",
+        "kir": "Kirghizo",
+        "tlh": "Klingon",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kok": "Konkani (macrolingua)",
+        "kor": "Coreano",
+        "kos": "Kosraeano",
+        "kpe": "Kpelle",
+        "kua": "Kuanyama",
+        "kum": "Kumyk",
+        "kur": "Kurdo",
+        "kru": "Kurukh",
+        "kut": "Kutenai",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "Laosiano",
+        "lat": "Latín",
+        "lav": "Letón",
+        "lez": "Lezghiano",
+        "lim": "Limburgués",
+        "lin": "Lingala",
+        "lit": "Lituano",
+        "jbo": "Lojban",
+        "loz": "Lozi",
+        "lub": "Luba-Katanga",
+        "lua": "Luba-Lulua",
+        "lui": "Luiseno",
+        "smj": "Sami Lule",
+        "lun": "Lunda",
+        "luo": "Luo (Kenia e Tanzania)",
+        "lus": "Lushai",
+        "ltz": "Luxemburgués",
+        "mkd": "Macedonio",
+        "mad": "Madurese",
+        "mag": "Magahi",
+        "mai": "Maithili",
+        "mak": "Makasar",
+        "mlg": "Malgache",
+        "msa": "Malayo (macroLingua)",
+        "mal": "Malayalamo",
+        "mlt": "Maltés",
+        "mnc": "Manchu",
+        "mdr": "Mandar",
+        "man": "Mandingo",
+        "mni": "Manipuri",
+        "glv": "Manx [Gaélico de Manx]",
+        "mri": "Maorí",
+        "arn": "Mapudungun",
+        "mar": "Marath",
+        "chm": "Mari (Rusia)",
+        "mah": "Marshalés",
+        "mwr": "Marwari",
+        "mas": "Masai",
+        "men": "Mende (Sierra Leone)",
+        "mic": "Mi'kmaq",
+        "min": "Minangkabau",
+        "mwl": "Mirandés",
+        "moh": "Mohawk",
+        "mdf": "Moksha",
+        "lol": "Mongo",
+        "mon": "Mongolian",
+        "mos": "Mossi",
+        "mul": "Varios idiomas",
+        "nqo": "N'Ko",
+        "nau": "Naurí",
+        "nav": "Navajo",
+        "ndo": "Ndonga",
+        "nap": "Neapolitano",
+        "nia": "Nias",
+        "niu": "Niués",
+        "zxx": "Sen contido lingüístico",
+        "nog": "Nogai",
+        "nor": "Noruegués",
+        "nob": "Noruego Bokmål",
+        "nno": "Noruegués nynorsk",
+        "nym": "Nyamwezi",
+        "nya": "Nyanja",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Occitano (después de 1500)",
+        "oji": "Ojibwa",
+        "orm": "Oromo (Afan)",
+        "osa": "Osage",
+        "oss": "Osetio",
+        "pal": "Pahlavi",
+        "pau": "Palauan",
+        "pli": "Pali",
+        "pam": "Pampanga",
+        "pag": "Pangasinan",
+        "pan": "Punjabí",
+        "pap": "Papiamento",
+        "fas": "Persa",
+        "phn": "Fenicio",
+        "pon": "Pohnpeian",
+        "pol": "Polaco",
+        "por": "Portugués",
+        "pus": "Pashtún",
+        "que": "Quechúa",
+        "raj": "Rajasthani",
+        "rap": "Rapanui",
+        "ron": "Romanés",
+        "roh": "Romanche",
+        "rom": "Romaní",
+        "run": "Kiroundi",
+        "rus": "Ruso",
+        "smo": "Samoano",
+        "sad": "Sandawe",
+        "sag": "Sango",
+        "san": "Sánscrito",
+        "sat": "Santali",
+        "srd": "Sardo",
+        "sas": "Sasak",
+        "sco": "Escocés",
+        "sel": "Selkup",
+        "srp": "Serbio",
+        "srr": "Serer",
+        "shn": "Shan",
+        "sna": "Shona",
+        "scn": "Siciliano",
+        "sid": "Sidamo",
+        "bla": "Siksika",
+        "snd": "Sindhi",
+        "sin": "Cingalés",
+        "den": "Eslavo (Athapascan)",
+        "slk": "Eslovaco",
+        "slv": "Esloveno",
+        "sog": "Sogdian",
+        "som": "Somalí",
+        "snk": "Soninke",
+        "spa": "Español",
+        "srn": "Sranan Tongo",
+        "suk": "Sukuma",
+        "sux": "Sumerio",
+        "sun": "Sundanés",
+        "sus": "Susu",
+        "swa": "Swahili (macrolingua)",
+        "ssw": "Siswati",
+        "swe": "Sueco",
+        "syr": "Syriac",
+        "tgl": "Tagalo",
+        "tah": "Tahitiano",
+        "tgk": "Tajiko",
+        "tmh": "Tamashek",
+        "tam": "Tamil",
+        "tat": "Tártaro",
+        "tel": "Telougou",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tha": "Thai",
+        "bod": "Tibetano",
+        "tig": "Tigre",
+        "tir": "Tigrinya",
+        "tem": "Timne",
+        "tiv": "Tiv",
+        "tli": "Tlingit",
+        "tpi": "Tok Pisin",
+        "tkl": "Tokelau",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Islas Tonga)",
+        "tsi": "Tsimshian",
+        "tso": "Tsonga",
+        "tsn": "Setchwana",
+        "tum": "Tumbuka",
+        "tur": "Turco",
+        "tuk": "Turkmeno",
+        "tvl": "Tuvalu",
+        "tyv": "Tuvinian",
+        "twi": "Tchi",
+        "udm": "Udmurt",
+        "uga": "Ugarítico",
+        "uig": "Uiguro",
+        "ukr": "Ucraíno",
+        "umb": "Umbundu",
+        "mis": "Idiomas no codificados",
+        "und": "Sen determinar",
+        "urd": "Urdu",
+        "uzb": "Uzbeko",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "Vietnamita",
+        "vol": "Volapük",
+        "vot": "Votic",
+        "wln": "Valón",
+        "war": "Waray (Filipinas)",
+        "was": "Washo",
+        "cym": "Galés",
+        "wal": "Wolaytta",
+        "wol": "Wolof",
+        "xho": "Xhosa",
+        "sah": "Yakut",
+        "yao": "Yao",
+        "yap": "Yapese",
+        "yid": "Yiddish",
+        "yor": "Yoruba",
+        "zap": "Zapoteco",
+        "zza": "Zaza",
+        "zen": "Zenaga",
+        "zha": "Zhuang",
+        "zul": "Zulú",
+        "zun": "Zuni"
+    },
     "hu": {
         "aar": "Afar",
         "abk": "Abház",
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.gl.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.gl.min.js
new file mode 100644
index 000000000..3d92606b3
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.gl.min.js
@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.gl={days:["Domingo","Luns","Martes","Mércores","Xoves","Venres","Sábado"],daysShort:["Dom","Lun","Mar","Mér","Xov","Ven","Sáb"],daysMin:["Do","Lu","Ma","Me","Xo","Ve","Sa"],months:["Xaneiro","Febreiro","Marzo","Abril","Maio","Xuño","Xullo","Agosto","Setembro","Outubro","Novembro","Decembro"],monthsShort:["Xan","Feb","Mar","Abr","Mai","Xun","Xul","Ago","Sep","Out","Nov","Dec"],today:"Hoxe",clear:"Limpar",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);
\ No newline at end of file
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 291014ebf2052270edea02f4e8da6c75de9d82d0..1dde9a90b441ba317e7fb6f6daa3a2bed5bfdebe 100644
GIT binary patch
delta 32
ocmaE~is{iRrVZR-To$@U<_d-eRtAQfMZ+8z8I3oGh4a_}0I^>QUjP6A

delta 32
ocmaE~is{iRrVZR-T;{sQh6;v;Rz{YaMZ+8z84Wjwh4a_}0I_okVgLXD

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 8b59d648e..2b1405204 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\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,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index db2c06dc57ee10fe1e45a8e7a28a44942aab8c11..17fa643914e73f89db0b83b476efc7b58d9dc1b2 100644
GIT binary patch
delta 13361
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

delta 12616
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

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index d28850122..642ea3019 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-07-31 11:29+0200\n"
-"PO-Revision-Date: 2022-05-01 13:22+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
+"PO-Revision-Date: 2022-08-27 10:00+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
 "Language-Team: \n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
@@ -501,7 +501,7 @@ msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
 #: cps/db.py:679 cps/search.py:137 cps/web.py:722
-#, fuzzy, python-format
+#, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
 
@@ -645,9 +645,8 @@ msgstr "%(format)s nicht gefunden: %(fn)s"
 
 #: cps/helper.py:96 cps/helper.py:225 cps/templates/detail.html:42
 #: cps/templates/detail.html:46
-#, fuzzy
 msgid "Send to E-Reader"
-msgstr "An Kindle senden"
+msgstr "An E-Reader senden"
 
 #: cps/helper.py:97 cps/helper.py:115 cps/helper.py:227
 msgid "This e-mail has been sent via Calibre-Web."
@@ -671,19 +670,19 @@ msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrierungs-E-Mail für Benutzer %(name)s"
 
 #: cps/helper.py:147 cps/helper.py:153
-#, fuzzy, python-format
+#, python-format
 msgid "Convert %(orig)s to %(format)s and send to E-Reader"
-msgstr "Konvertiere %(orig)s nach %(format)s und sende an Kindle"
+msgstr "Konvertiere %(orig)s nach %(format)s und sende an E-Reader"
 
 #: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180 cps/helper.py:184
-#, fuzzy, python-format
+#, python-format
 msgid "Send %(format)s to E-Reader"
-msgstr "Sende %(format)s an Kindle"
+msgstr "Sende %(format)s an E-Reader"
 
 #: cps/helper.py:224 cps/tasks/convert.py:92
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to E-Reader"
-msgstr "%(book)s an Kindle senden"
+msgstr "%(book)s an E-Reader gesendet"
 
 #: cps/helper.py:229
 msgid "The requested file could not be read. Maybe wrong permissions?"
@@ -785,9 +784,8 @@ msgid "Unrar binary file not found"
 msgstr "UnRar Programm nicht gefunden"
 
 #: cps/helper.py:943
-#, fuzzy
 msgid "Error executing UnRar"
-msgstr "Fehler beim ausführen von UnRar"
+msgstr "Fehler beim Ausführen von UnRar"
 
 #: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
@@ -1456,9 +1454,8 @@ msgid "E-mail Address"
 msgstr "E-Mail"
 
 #: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-#, fuzzy
 msgid "Send to E-Reader E-mail Address"
-msgstr "Kindle"
+msgstr "An E-Reader E-Mail Adresse senden"
 
 #: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
@@ -2865,12 +2862,11 @@ msgstr "Dunkel"
 
 #: cps/templates/read.html:79
 msgid "Sepia"
-msgstr ""
+msgstr "Sepia"
 
 #: cps/templates/read.html:80
-#, fuzzy
 msgid "Black"
-msgstr "Zurück"
+msgstr "Schwarz"
 
 #: cps/templates/read.html:84
 msgid "Reflow text when sidebars are open."
@@ -3265,14 +3261,12 @@ msgid "Enter E-mail Address"
 msgstr "E-Mail-Adresse eingeben"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "Enter E-Reader E-mail Address"
-msgstr "Kindle E-mail Adresse eingeben"
+msgstr "E-Reader E-Mail Adresse eingeben"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "E-Reader E-mail"
-msgstr "Test-E-Mail"
+msgstr "E-Reader E-Mail"
 
 #: cps/templates/user_table.html:137
 msgid "Locale"
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index c9c68c856ef2d0bfbbf0585e6f8ad28caab41a5d..2354f3214d35e403fe01da783dc5b63ca20b3cc3 100644
GIT binary patch
delta 32
ocmZqJ!rZWhc|&(JmxZp8xq_jAm4V^rsnNWQjK-T6$HdkG0I!b<Y5)KL

delta 32
ocmZqJ!rZWhc|&(Jm$|O7p@N~Im67G<snNWQjE0*R$HdkG0I#D8Z2$lO

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 06d6e24a3..96e1e54c8 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index a2be7e2b31fd907bc205f3e8b645d02a96047915..c65d8eaa246ed1caac1cd758a99d7bf972b913dd 100644
GIT binary patch
delta 32
ocmZ4A%DldndBfoxE(={Fa|J^KD+9yLXLD2-8I3o8%H10R0KDW2ssI20

delta 32
ocmZ4A%DldndBfoxE^}RDLj^-aD<jLzXLD2-84Wjo%H10R0KE7MtpET3

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 6a6cd65b9..bf1330a7a 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 # "Last-Translator: victorhck <victorhck@mailbox.org>\n"
 #: cps/about.py:84
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index 43a8885271fbfdfdc61950b22389889f96441680..43da2a3360e85b92716f429fc0ecbf82c8fe8532 100644
GIT binary patch
delta 32
ocmaENp7Gsz#tqYKxh!;z%oPj`tPBh{FR+zkWHjEq-%ei>0L>c;-v9sr

delta 32
ocmaENp7Gsz#tqYKxy*Hq4HXOxt&A);FR+zkWHj8o-%ei>0L?E7;s5{u

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 4d88c7e9a..c465cf1a6 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 88794a64f21e6e350d3ebeea2ae4f7ba673b9ec6..d37561ef9cec5db6f93bddb7f74c32281c52a320 100644
GIT binary patch
delta 32
ocmaF0jQQ0v<_(4gTo$@U<_d-eRtAQftqXV=8I3o47AhtI0J;4M`~Uy|

delta 32
ocmaF0jQQ0v<_(4gT;{sQh6;v;Rz{YatqXV=84Wjk7AhtI0J;$g{{R30

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index ba6e4ab0d..5d99af6bc 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -31,7 +31,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/gl/LC_MESSAGES/messages.mo b/cps/translations/gl/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3e3c6538392c3e946eef2fb7fc8f4a2261bed09e
GIT binary patch
literal 59874
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%0Avs
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
BsoMYm

literal 0
HcmV?d00001

diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po
new file mode 100644
index 000000000..f7c95e12a
--- /dev/null
+++ b/cps/translations/gl/LC_MESSAGES/messages.po
@@ -0,0 +1,3332 @@
+# Translation to Galician for Calibre-Web.
+# pollitor <pollitor@gmx.com>, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
+"PO-Revision-Date: 2022-08-11 16:46+0200\n"
+"Last-Translator: pollitor <pollitor@gmx.com>\n"
+"Language: gl\n"
+"Language-Team: gl\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.10.3\n"
+
+#: cps/about.py:84
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: cps/admin.py:146
+msgid "Server restarted, please reload page"
+msgstr "Servidor reiniciado. Por favor, recargue a páxina"
+
+#: cps/admin.py:148
+msgid "Performing shutdown of server, please close window"
+msgstr "O servidor estase apagando. Por favor, peche a xanela"
+
+#: cps/admin.py:156
+msgid "Reconnect successful"
+msgstr "Reconexión correcta"
+
+#: cps/admin.py:159
+msgid "Unknown command"
+msgstr "Orde descoñecida"
+
+#: cps/admin.py:192 cps/editbooks.py:572 cps/editbooks.py:574
+#: cps/editbooks.py:610 cps/editbooks.py:627 cps/editbooks.py:1234
+#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: cps/admin.py:217
+msgid "Admin page"
+msgstr "Páxina de administración"
+
+#: cps/admin.py:237
+msgid "Basic Configuration"
+msgstr "Configuración Básica"
+
+#: cps/admin.py:275
+msgid "UI Configuration"
+msgstr "Configuración da Interface de Usuario"
+
+#: cps/admin.py:309 cps/templates/admin.html:51
+msgid "Edit Users"
+msgstr "Editar Usuarios"
+
+#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/templates/list.html:13
+msgid "All"
+msgstr "Todo"
+
+#: cps/admin.py:380 cps/admin.py:1370
+msgid "User not found"
+msgstr "Usuario non atopado"
+
+#: cps/admin.py:394
+msgid "{} users deleted successfully"
+msgstr "{} usuarios borrados con éxito"
+
+#: cps/admin.py:417 cps/templates/config_view_edit.html:133
+#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
+msgid "Show All"
+msgstr "Mostrar Todo"
+
+#: cps/admin.py:438 cps/admin.py:444
+msgid "Malformed request"
+msgstr "Petición mal formada"
+
+#: cps/admin.py:456 cps/admin.py:1968
+msgid "Guest Name can't be changed"
+msgstr "O nome do convidado non se pode cambiar"
+
+#: cps/admin.py:468
+msgid "Guest can't have this role"
+msgstr "O convidado non pode ter este rol"
+
+#: cps/admin.py:480 cps/admin.py:1926
+msgid "No admin user remaining, can't remove admin role"
+msgstr "Non queda ningún usuario administrador, non se pode eliminar ao usuario"
+
+#: cps/admin.py:484 cps/admin.py:498
+msgid "Value has to be true or false"
+msgstr "O Valor ten que ser verdadeiro ou falso"
+
+#: cps/admin.py:486
+msgid "Invalid role"
+msgstr "Rol non válido"
+
+#: cps/admin.py:490
+msgid "Guest can't have this view"
+msgstr "O convidado non pode ter esta vista"
+
+#: cps/admin.py:500
+msgid "Invalid view"
+msgstr "Vista non válida"
+
+#: cps/admin.py:503
+msgid "Guest's Locale is determined automatically and can't be set"
+msgstr "O sitio do convidado determínase automáticamente e non se pode cambiar"
+
+#: cps/admin.py:507
+msgid "No Valid Locale Given"
+msgstr "Non hai unha localización válida"
+
+#: cps/admin.py:518
+msgid "No Valid Book Language Given"
+msgstr "Non se indicou unha lingua válida para o libro"
+
+#: cps/admin.py:520 cps/editbooks.py:439
+msgid "Parameter not found"
+msgstr "Parámetro non atopado"
+
+#: cps/admin.py:557
+msgid "Invalid Read Column"
+msgstr "Columna de lectura non válida"
+
+#: cps/admin.py:563
+msgid "Invalid Restricted Column"
+msgstr "Columna restrinxida non válida"
+
+#: cps/admin.py:583 cps/admin.py:1797
+msgid "Calibre-Web configuration updated"
+msgstr "Configuración de Calibre-Web actualizada"
+
+#: cps/admin.py:595
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "De verdade queres borrar o Token de Kobo?"
+
+#: cps/admin.py:597
+msgid "Do you really want to delete this domain?"
+msgstr "De verdade desexas borrar este dominio?"
+
+#: cps/admin.py:599
+msgid "Do you really want to delete this user?"
+msgstr "De verdade queres borrar este usuario?"
+
+#: cps/admin.py:601
+msgid "Are you sure you want to delete this shelf?"
+msgstr "De verdade queres eliminar este andel?"
+
+#: cps/admin.py:603
+msgid "Are you sure you want to change locales of selected user(s)?"
+msgstr "De verdade queres cambiar a linguaxe dos usuarios seleccionados?"
+
+#: cps/admin.py:605
+msgid "Are you sure you want to change visible book languages for selected user(s)?"
+msgstr "De verdade queres cambiar as linguas visibles do libro dos usuarios seleccionados?"
+
+#: cps/admin.py:607
+msgid "Are you sure you want to change the selected role for the selected user(s)?"
+msgstr "De verdade queres cambiar o rol seleccionado do usuario seleccionado?"
+
+#: cps/admin.py:609
+msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
+msgstr "De verdade queres cambiar as restricións escollidas dos usuarios seleccionados?"
+
+#: cps/admin.py:611
+msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
+msgstr "De verdade queres cambiar as restricións de visibilidade dos usuarios seleccionados?"
+
+#: cps/admin.py:614
+msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgstr "De verdade queres cambiar o comportamento da sincronización do andel para o usuario seleccionado?"
+
+#: cps/admin.py:616
+msgid "Are you sure you want to change Calibre library location?"
+msgstr "De verdade queres cambiar a localización da biblioteca Calibre?"
+
+#: cps/admin.py:618
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr "Calibre-web buscará cubertas actualizadas e miniaturas de cubertas actualizadas, isto pode levar un intre?"
+
+#: cps/admin.py:621
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr "Está seguro que quere borrar a base de datos de sincronización de Calibre-Web para forzar unha sincronización completa co seu lector Kobo?"
+
+#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
+#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
+#: cps/templates/user_table.html:58
+msgid "Deny"
+msgstr "Denegar"
+
+#: cps/admin.py:866 cps/admin.py:872 cps/admin.py:882 cps/admin.py:892
+#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
+#: cps/templates/user_table.html:61
+msgid "Allow"
+msgstr "Permitir"
+
+#: cps/admin.py:907
+msgid "{} sync entries deleted"
+msgstr "Elimináronse {} entradas de sincronización"
+
+#: cps/admin.py:955
+msgid "Tag not found"
+msgstr "Etiqueta non atopada"
+
+#: cps/admin.py:967
+msgid "Invalid Action"
+msgstr "Acción non válida"
+
+#: cps/admin.py:1082
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr "client_secrets.json non está configurado para a aplicación web"
+
+#: cps/admin.py:1127
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "A localización do arquivo de rexistro non é válida. Por favor, Introduce a ruta correcta"
+
+#: cps/admin.py:1133
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "A localización do rexistro de accesos non é válida. Por favor, Introduce a ruta correcta"
+
+#: cps/admin.py:1163
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr "Por favor, Introduce un provedor LDAP, porto, DN e o User Object Identifier"
+
+#: cps/admin.py:1169
+msgid "Please Enter a LDAP Service Account and Password"
+msgstr "Por favor, introduce unha conta de servizo LDAP e o seu contrasinal"
+
+#: cps/admin.py:1172
+msgid "Please Enter a LDAP Service Account"
+msgstr "Por favor, introduce unha conta de servizo LDAP"
+
+#: cps/admin.py:1177
+#, python-format
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP Group Object Filter necesita ter un identificador de formato \"%s\""
+
+#: cps/admin.py:1179
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr "O LDAP Group Object Filter ten parénteses que non casan"
+
+#: cps/admin.py:1183
+#, python-format
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP Group Object Filter necesita ter un identificador de formato \"%s\""
+
+#: cps/admin.py:1185
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr "O LDAP Group Object Filter ten parénteses que non casan"
+
+#: cps/admin.py:1192
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr "O filtro de usuarios LDAP necesita ter un identificador de formato \"%s\""
+
+#: cps/admin.py:1194
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr "O filtro de LDAP \"Member User\" ten parénteses que non casan"
+
+#: cps/admin.py:1201
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr "As localizacións do certificado da CA do LDAP, do certificado ou da chave non válidos. Por favor introduce a ruta correcta"
+
+#: cps/admin.py:1232 cps/admin.py:1858
+msgid "Add new user"
+msgstr "Engadir un usuario novo"
+
+#: cps/admin.py:1241 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Cambiar os parámetros do correo"
+
+#: cps/admin.py:1260
+msgid "Gmail Account Verification Successful"
+msgstr "Verificación da conta de Gmail exitosa"
+
+#: cps/admin.py:1279 cps/admin.py:1282 cps/admin.py:1663 cps/admin.py:1781
+#: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
+#: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
+#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "Error na base de datos: %(error)s."
+
+#: cps/admin.py:1289
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr "Posto en cola un correo electrónico de proba enviado a %(email)s, por favor, comproba o resultado nas Tarefas"
+
+#: cps/admin.py:1292
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "Ocurreu un error enviando o correo electrónico de proba: %(res)s"
+
+#: cps/admin.py:1294
+msgid "Please configure your e-mail address first..."
+msgstr "Por favor, configure o seu correo electrónico primeiro..."
+
+#: cps/admin.py:1296
+msgid "E-mail server settings updated"
+msgstr "Actualizáronse os axustes do servidor de correo electrónico"
+
+#: cps/admin.py:1319 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr "Editar a Configuración das Tarefas Programadas"
+
+#: cps/admin.py:1331
+msgid "Invalid start time for task specified"
+msgstr "Indicada unha hora incorrecta de comezo de tarefa"
+
+#: cps/admin.py:1336
+msgid "Invalid duration for task specified"
+msgstr "Indicada unha duracción incorrecta para a tarefa"
+
+#: cps/admin.py:1345
+msgid "Scheduled tasks settings updated"
+msgstr "Actualizouse a configuración das tarefas programadas"
+
+#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/web.py:1318
+msgid "An unknown error occurred. Please try again later."
+msgstr "Sucedeu un erro descoñecido. Por favor volva a intentalo máis tarde."
+
+#: cps/admin.py:1359
+msgid "Settings DB is not Writeable"
+msgstr "A configuración da DB non se pode escribir"
+
+#: cps/admin.py:1389 cps/admin.py:1984
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Editar o Usuario %(nick)s"
+
+#: cps/admin.py:1401
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "Reiniciada a contrasinal para o usuario %(user)s"
+
+#: cps/admin.py:1407 cps/web.py:1197
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Configura primeiro os parámetros do servidor SMTP..."
+
+#: cps/admin.py:1418
+msgid "Logfile viewer"
+msgstr "Visor do ficheiro de rexistro"
+
+#: cps/admin.py:1484
+msgid "Requesting update package"
+msgstr "Solicitando paquete de actualización"
+
+#: cps/admin.py:1485
+msgid "Downloading update package"
+msgstr "Descargando paquete de actualización"
+
+#: cps/admin.py:1486
+msgid "Unzipping update package"
+msgstr "Descomprimendo paquete de actualización"
+
+#: cps/admin.py:1487
+msgid "Replacing files"
+msgstr "Remplazando archivos"
+
+#: cps/admin.py:1488
+msgid "Database connections are closed"
+msgstr "As conexións coa base datos están pechadas"
+
+#: cps/admin.py:1489
+msgid "Stopping server"
+msgstr "Detendo o servidor"
+
+#: cps/admin.py:1490
+msgid "Update finished, please press okay and reload page"
+msgstr "Actualización finalizada. Por favor, prema OK e recargue a páxina"
+
+#: cps/admin.py:1491 cps/admin.py:1492 cps/admin.py:1493 cps/admin.py:1494
+#: cps/admin.py:1495 cps/admin.py:1496
+msgid "Update failed:"
+msgstr "A actualización fallou:"
+
+#: cps/admin.py:1491 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+msgid "HTTP Error"
+msgstr "Erro HTTP"
+
+#: cps/admin.py:1492 cps/updater.py:391 cps/updater.py:628
+msgid "Connection error"
+msgstr "Erro de conexión"
+
+#: cps/admin.py:1493 cps/updater.py:393 cps/updater.py:630
+msgid "Timeout while establishing connection"
+msgstr "Tempo esgotado mentras se trataba de establecer a conexión"
+
+#: cps/admin.py:1494 cps/updater.py:395 cps/updater.py:632
+msgid "General error"
+msgstr "Erro xeral"
+
+#: cps/admin.py:1495
+msgid "Update file could not be saved in temp dir"
+msgstr "A actualización do arquivo non se puido gardar no directorio temporal (Temp Dir)"
+
+#: cps/admin.py:1496
+msgid "Files could not be replaced during update"
+msgstr "Non se puideron substituír os ficheiros durante a actualización"
+
+#: cps/admin.py:1520
+msgid "Failed to extract at least One LDAP User"
+msgstr "Erro ao extraer polo menos un usuario LDAP"
+
+#: cps/admin.py:1565
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Erro ao crear polo menos un usuario LDAP"
+
+#: cps/admin.py:1578
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Erro: %(ldaperror)s"
+
+#: cps/admin.py:1582
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Erro: o servidor LDAP non devolveu ningún usuario"
+
+#: cps/admin.py:1615
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Polo menos, un usuario LDAP non se atopou na base de datos"
+
+#: cps/admin.py:1617
+msgid "{} User Successfully Imported"
+msgstr "Usuario {} importado con éxito"
+
+#: cps/admin.py:1675
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "A localización da base de datos non é válida. Por favor, Introduce a ruta correcta"
+
+#: cps/admin.py:1695
+msgid "DB is not Writeable"
+msgstr "A base de datos non é modificable"
+
+#: cps/admin.py:1708
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "A localización do Keyfile non é válida, por favor, Introduce a ruta correcta"
+
+#: cps/admin.py:1712
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "A localización do Certfile non é válida, por favor, Introduce a ruta correcta"
+
+#: cps/admin.py:1820
+msgid "Database Settings updated"
+msgstr "Actualizados os axustes da base de datos"
+
+#: cps/admin.py:1828
+msgid "Database Configuration"
+msgstr "Configuración da base de datos"
+
+#: cps/admin.py:1844 cps/web.py:1232
+msgid "Please fill out all fields!"
+msgstr "Por favor, cubra todos os campos!"
+
+#: cps/admin.py:1852
+msgid "E-mail is not from valid domain"
+msgstr "O correo electrónico non ven dun dominio válido"
+
+#: cps/admin.py:1869
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Usuario '%(user)s' creado"
+
+#: cps/admin.py:1875
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Atopada unha conta existente para este correo electrónico ou nome de usuario."
+
+#: cps/admin.py:1905
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Usuario '%(nick)s' eliminado"
+
+#: cps/admin.py:1907 cps/admin.py:1908
+msgid "Can't delete Guest User"
+msgstr "Non se pode borrar ao Usuario Invitado"
+
+#: cps/admin.py:1911
+msgid "No admin user remaining, can't delete user"
+msgstr "Non queda ningún usuario administrador, non se pode borrar ao usuario"
+
+#: cps/admin.py:1988
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Usuario '%(nick)s' actualizado"
+
+#: cps/converter.py:31
+msgid "not installed"
+msgstr "non instalado"
+
+#: cps/converter.py:32
+msgid "Execution permissions missing"
+msgstr "Faltan permisos de execución"
+
+#: cps/db.py:679 cps/search.py:137 cps/web.py:722
+#, python-format
+msgid "Custom Column No.%(column)d does not exist in calibre database"
+msgstr "Columna personalizada No.%(column)d non existe na base de datos calibre"
+
+#: cps/db.py:922 cps/templates/config_edit.html:204
+#: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
+#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
+#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+msgid "None"
+msgstr "Ningún"
+
+#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
+#: cps/web.py:1499 cps/web.py:1544
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "oh, oh, o libro seleccionado non está disponible. O arquivo non existe ou non está accesible"
+
+#: cps/editbooks.py:154 cps/editbooks.py:1217
+msgid "User has no rights to upload cover"
+msgstr "O usuario non ten permisos para subir a cuberta"
+
+#: cps/editbooks.py:174 cps/editbooks.py:712
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "Os identificadores non distinguen entre maiúsculas e minúsculas, sobrescribindo o identificador antigo"
+
+#: cps/editbooks.py:215
+msgid "Metadata successfully updated"
+msgstr "Metadatos actualizados con éxito"
+
+#: cps/editbooks.py:233
+msgid "Error editing book: {}"
+msgstr "Erro editando libro: {}"
+
+#: cps/editbooks.py:288
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "O ficheiro %(file)s subiuse"
+
+#: cps/editbooks.py:315
+msgid "Source or destination format for conversion missing"
+msgstr "Falta a fonte ou o formato de destino para a conversión"
+
+#: cps/editbooks.py:323
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr "Libro posto na cola para a súa conversión a %(book_format)s"
+
+#: cps/editbooks.py:327
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "Houbo un erro ao convertir este libro: %(res)s"
+
+#: cps/editbooks.py:631
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "O libro cargado probablemente existe na biblioteca, considera cambialo antes de subilo outra vez: "
+
+#: cps/editbooks.py:686 cps/editbooks.py:1011
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s non é unha lingua válida"
+
+#: cps/editbooks.py:724 cps/editbooks.py:1158
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "Non se permite subir arquivos coa extensión '%(ext)s' a este servidor"
+
+#: cps/editbooks.py:728 cps/editbooks.py:1162
+msgid "File to be uploaded must have an extension"
+msgstr "O arquivo que se vai cargar debe ter unha extensión"
+
+#: cps/editbooks.py:736
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "El archivo %(filename)s non puido gravarse no directorio temporal (Temp Dir)"
+
+#: cps/editbooks.py:756
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "Fallo ao mover o arquivo de cuberta %(file)s: %(error)s"
+
+#: cps/editbooks.py:813 cps/editbooks.py:815
+msgid "Book Format Successfully Deleted"
+msgstr "Formato de libro eliminado con éxito"
+
+#: cps/editbooks.py:822 cps/editbooks.py:824
+msgid "Book Successfully Deleted"
+msgstr "Libro eliminado con éxito"
+
+#: cps/editbooks.py:876
+msgid "You are missing permissions to delete books"
+msgstr "Vostede non ten permisos para borrar libros"
+
+#: cps/editbooks.py:926
+msgid "edit metadata"
+msgstr "editar metadatos"
+
+#: cps/editbooks.py:975
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s non é un número válido, saltando"
+
+#: cps/editbooks.py:1153
+msgid "User has no rights to upload additional file formats"
+msgstr "O usuario non ten permisos para cargar formatos de ficheiro adicionais"
+
+#: cps/editbooks.py:1174
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Fallo ao crear a ruta %(path)s (permiso denegado)"
+
+#: cps/editbooks.py:1179
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Fallo ao gardar o arquivo %(file)s."
+
+#: cps/editbooks.py:1202
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Arquivo con formato %(ext)s engadido a %(book)s"
+
+#: cps/gdrive.py:58
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "A configuración de Google Drive non se completou, intente desactivar e activar Google Drive outra vez"
+
+#: cps/gdrive.py:95
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "O dominio Callback non se comprobou, siga os pasos para comprobalo na consola de desenvolvedor de Google"
+
+#: cps/helper.py:79
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s formato non atopado para o id do libro: %(book)d"
+
+#: cps/helper.py:86 cps/tasks/convert.py:75
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s non atopado en Google Drive: %(fn)s"
+
+#: cps/helper.py:91
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s non atopado: %(fn)s"
+
+#: cps/helper.py:96 cps/helper.py:225 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
+msgid "Send to E-Reader"
+msgstr "Enviar ao Kindle"
+
+#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:227
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Este correo electrónico enviouse empregando Calibre-Web."
+
+#: cps/helper.py:113
+msgid "Calibre-Web test e-mail"
+msgstr "Correo de proba de Calibre-Web"
+
+#: cps/helper.py:114
+msgid "Test e-mail"
+msgstr "Comprobar correo electrónico"
+
+#: cps/helper.py:131
+msgid "Get Started with Calibre-Web"
+msgstr "Primeiros pasos con Calibre-Web"
+
+#: cps/helper.py:136
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Correo electrónico de rexistro para o usuario: %(name)s"
+
+#: cps/helper.py:147 cps/helper.py:153
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgstr "Convertir %(orig)s a %(format)s e enviar ao Kindle"
+
+#: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180 cps/helper.py:184
+#, python-format
+msgid "Send %(format)s to E-Reader"
+msgstr "Enviado %(format)s ao Kindle"
+
+#: cps/helper.py:224 cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Enviar ao Kindle %(book)s"
+
+#: cps/helper.py:229
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "O arquivo solicitado non pode lerse. Quizais existen problemas cos permisos?"
+
+#: cps/helper.py:344
+msgid "Read status could not set: {}"
+msgstr "O estado de lectura non pode fixarse: {}"
+
+#: cps/helper.py:367
+#, python-format
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "Fallo ao intentar borrar a carpeta do libro %(id)s, a ruta ten subcarpetas: %(path)s"
+
+#: cps/helper.py:373
+#, python-format
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "O borrado do libro %(id)s fallou: %(message)s"
+
+#: cps/helper.py:384
+#, python-format
+msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
+msgstr "Borrando o libro %(id)s, a ruta de libro non é válida: %(path)s"
+
+#: cps/helper.py:449
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "O renomeado do título de: '%(src)s' a '%(dest)s' fallou co erro: %(error)s"
+
+#: cps/helper.py:521 cps/helper.py:530
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Ficheiro %(file)s non atopado en Google Drive"
+
+#: cps/helper.py:564
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "O renomeado do título de: '%(src)s' a '%(dest)s' fallou co erro: %(error)s"
+
+#: cps/helper.py:584
+msgid "Error in rename file in path: {}"
+msgstr "Erro ao renomear o ficheiro na ruta: {}"
+
+#: cps/helper.py:602
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "A ruta %(path)s do libro non se atopou en Google Drive"
+
+#: cps/helper.py:643 cps/web.py:1411
+msgid "Found an existing account for this e-mail address"
+msgstr "Atopada unha conta existente para ese enderezo de correo electrónico"
+
+#: cps/helper.py:651
+msgid "This username is already taken"
+msgstr "Este nome de usuario xa está en uso"
+
+#: cps/helper.py:661
+msgid "Invalid e-mail address format"
+msgstr "Enderezo de correo non válido"
+
+#: cps/helper.py:811
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
+msgstr "O módulo Python 'advocate' non está instalado pero se necesita para as cargas de cubertas"
+
+#: cps/helper.py:821
+msgid "Error Downloading Cover"
+msgstr "Erro ao descargar a cuberta"
+
+#: cps/helper.py:824
+msgid "Cover Format Error"
+msgstr "Erro no formato da cuberta"
+
+#: cps/helper.py:827
+msgid "You are not allowed to access localhost or the local network for cover uploads"
+msgstr "Non ten permiso para acceder a localhost ou á rede local para as cargas de cubertas"
+
+#: cps/helper.py:837
+msgid "Failed to create path for cover"
+msgstr "Erro ao crear unha ruta para a cuberta"
+
+#: cps/helper.py:853
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr "O arquivo de cuberta non é unha imaxe válida"
+
+#: cps/helper.py:864
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr "Soamente se admiten como cuberta os arquivos jpg/jpeg/png/webp/bmp"
+
+#: cps/helper.py:876
+msgid "Invalid cover file content"
+msgstr "Contido do arquivo de cuberta non válido"
+
+#: cps/helper.py:880
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr "Soamente se admiten como cuberta os arquivos jpg/jpeg"
+
+#: cps/helper.py:932
+msgid "Unrar binary file not found"
+msgstr "Non se atopa o arquivo binario de UnRar"
+
+#: cps/helper.py:943
+msgid "Error executing UnRar"
+msgstr "Erro executando UnRar"
+
+#: cps/kobo_auth.py:89
+msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
+msgstr "Por favor, accede a calibre-web dende unha ubicación que non sexa localhost para obter unha api_endpoint válida para o teu dispositivo Kobo"
+
+#: cps/kobo_auth.py:115
+msgid "Kobo Setup"
+msgstr "Configuración de Kobo"
+
+#: cps/oauth_bb.py:77
+#, python-format
+msgid "Register with %(provider)s"
+msgstr "Rexistrado con %(provider)s"
+
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "Iniciou sesión como : '%(nickname)s'"
+
+#: cps/oauth_bb.py:148
+#, python-format
+msgid "Link to %(oauth)s Succeeded"
+msgstr "O enlace a %(oauth)s realizouse con éxito"
+
+#: cps/oauth_bb.py:155
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr "Acceso errado, ningún usuario enlazado coa conta OAuth"
+
+#: cps/oauth_bb.py:197
+#, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr "%(oauth)s desenlazado con éxito"
+
+#: cps/oauth_bb.py:202
+#, python-format
+msgid "Unlink to %(oauth)s Failed"
+msgstr "Erro ao desenlazar %(oauth)s"
+
+#: cps/oauth_bb.py:205
+#, python-format
+msgid "Not Linked to %(oauth)s"
+msgstr "Non vinculado con %(oauth)s"
+
+#: cps/oauth_bb.py:261
+msgid "Failed to log in with GitHub."
+msgstr "Erro ao iniciar sesión con GitHub."
+
+#: cps/oauth_bb.py:267
+msgid "Failed to fetch user info from GitHub."
+msgstr "Erro ao obter a información do usuario de GitHub."
+
+#: cps/oauth_bb.py:279
+msgid "Failed to log in with Google."
+msgstr "Erro ao iniciar sesión con Google."
+
+#: cps/oauth_bb.py:285
+msgid "Failed to fetch user info from Google."
+msgstr "Erro ao obter información do usuario de Google."
+
+#: cps/oauth_bb.py:332
+msgid "GitHub Oauth error, please retry later."
+msgstr "Erro en GitHub Oauth, por favor, volva a intentalo máis tarde."
+
+#: cps/oauth_bb.py:335
+msgid "GitHub Oauth error: {}"
+msgstr "Erro GitHub Oauth {}"
+
+#: cps/oauth_bb.py:356
+msgid "Google Oauth error, please retry later."
+msgstr "Erro en Google Oauth, por favor volva a intentalo máis tarde."
+
+#: cps/oauth_bb.py:359
+msgid "Google Oauth error: {}"
+msgstr "Erro Google Oauth {}"
+
+#: cps/opds.py:287
+msgid "{} Stars"
+msgstr "{} Estrelas"
+
+#: cps/remotelogin.py:62 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+msgid "Login"
+msgstr "Inicio de sesión"
+
+#: cps/remotelogin.py:74 cps/remotelogin.py:108
+msgid "Token not found"
+msgstr "Token non atopado"
+
+#: cps/remotelogin.py:83 cps/remotelogin.py:116
+msgid "Token has expired"
+msgstr "O token expirou"
+
+#: cps/remotelogin.py:92
+msgid "Success! Please return to your device"
+msgstr "Correcto! Por favor volte ao seu dispositivo"
+
+#: cps/render_template.py:40 cps/web.py:405
+msgid "Books"
+msgstr "Libros"
+
+#: cps/render_template.py:42
+msgid "Show recent books"
+msgstr "Mostrar libros recentes"
+
+#: cps/render_template.py:43 cps/templates/index.xml:25
+msgid "Hot Books"
+msgstr "Libros populares"
+
+#: cps/render_template.py:45
+msgid "Show Hot Books"
+msgstr "Mostrar libros populares"
+
+#: cps/render_template.py:47 cps/render_template.py:52
+msgid "Downloaded Books"
+msgstr "Libros descargados"
+
+#: cps/render_template.py:49 cps/render_template.py:54
+#: cps/templates/user_table.html:167
+msgid "Show Downloaded Books"
+msgstr "Mostrar libros descargados"
+
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+msgid "Top Rated Books"
+msgstr "Libros mellor valorados"
+
+#: cps/render_template.py:59 cps/templates/user_table.html:161
+msgid "Show Top Rated Books"
+msgstr "Mostrar libros mellor valorados"
+
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:741
+msgid "Read Books"
+msgstr "Libros lidos"
+
+#: cps/render_template.py:62
+msgid "Show read and unread"
+msgstr "Mostrar lidos e non lidos"
+
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:744
+msgid "Unread Books"
+msgstr "Libros non lidos"
+
+#: cps/render_template.py:66
+msgid "Show unread"
+msgstr "Mostrar non lidos"
+
+#: cps/render_template.py:67
+msgid "Discover"
+msgstr "Descubrir"
+
+#: cps/render_template.py:69 cps/templates/index.xml:50
+#: cps/templates/user_table.html:162
+msgid "Show Random Books"
+msgstr "Mostrar libros ao chou"
+
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1101
+msgid "Categories"
+msgstr "Categorías"
+
+#: cps/render_template.py:72 cps/templates/user_table.html:158
+msgid "Show category selection"
+msgstr "Mostrar selección de categorías"
+
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
+#: cps/templates/book_table.html:68 cps/templates/index.xml:90
+#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+msgid "Series"
+msgstr "Series"
+
+#: cps/render_template.py:75 cps/templates/user_table.html:157
+msgid "Show series selection"
+msgstr "Mostrar selección de series"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:66
+#: cps/templates/index.xml:69
+msgid "Authors"
+msgstr "Autores"
+
+#: cps/render_template.py:78 cps/templates/user_table.html:160
+msgid "Show author selection"
+msgstr "Mostrar selección de autores"
+
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:968
+msgid "Publishers"
+msgstr "Editores"
+
+#: cps/render_template.py:82 cps/templates/user_table.html:163
+msgid "Show publisher selection"
+msgstr "Mostrar selección de editores"
+
+#: cps/render_template.py:83 cps/templates/book_table.html:70
+#: cps/templates/index.xml:97 cps/templates/search_form.html:107
+#: cps/web.py:1073
+msgid "Languages"
+msgstr "Linguas"
+
+#: cps/render_template.py:86 cps/templates/user_table.html:155
+msgid "Show language selection"
+msgstr "Mostrar selección de linguas"
+
+#: cps/render_template.py:87 cps/templates/index.xml:104
+msgid "Ratings"
+msgstr "Valoracións"
+
+#: cps/render_template.py:89 cps/templates/user_table.html:164
+msgid "Show ratings selection"
+msgstr "Mostrar selección de valoracións"
+
+#: cps/render_template.py:90 cps/templates/index.xml:112
+msgid "File formats"
+msgstr "Formatos de arquivo"
+
+#: cps/render_template.py:92 cps/templates/user_table.html:165
+msgid "Show file formats selection"
+msgstr "Mostrar selección de formatos de arquivo"
+
+#: cps/render_template.py:94 cps/web.py:767
+msgid "Archived Books"
+msgstr "Libros arquivados"
+
+#: cps/render_template.py:96 cps/templates/user_table.html:166
+msgid "Show archived books"
+msgstr "Mostrar libros arquivados"
+
+#: cps/render_template.py:99 cps/web.py:798
+msgid "Books List"
+msgstr "Lista de libros"
+
+#: cps/render_template.py:101 cps/templates/user_table.html:168
+msgid "Show Books List"
+msgstr "Mostrar lista de libros"
+
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
+msgid "Search"
+msgstr "Buscar"
+
+#: cps/search.py:188
+msgid "Published after "
+msgstr "Publicado despóis de "
+
+#: cps/search.py:195
+msgid "Published before "
+msgstr "Publicado antes de "
+
+#: cps/search.py:217
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Valoración <= %(rating)s"
+
+#: cps/search.py:219
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Valoración >= %(rating)s"
+
+#: cps/search.py:221
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr "Estado de lectura = %(status)s"
+
+#: cps/search.py:323
+msgid "Error on search for custom columns, please restart Calibre-Web"
+msgstr "Erro na busca de columnas personalizadas, por favor reinicia Calibre-Web"
+
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Búsqueda avanzada"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Andel especificado non válido"
+
+#: cps/shelf.py:55
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Sentímolo, non ten permisos para engdir un libro ao andel: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "O libro xa forma parte do andel: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "O libro engadiuse ao andel: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr "Non ten permiso para engadir un libro ao andel"
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Os libros xa forman parte do andel: %(name)s"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Os libros engadíronse ao andel: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Non se pudideron engadir libros ao andel: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "O libro eliminouse do andel: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "Síntoo, non ten permiso para quitar un libro do andel"
+
+#: cps/shelf.py:210 cps/templates/layout.html:141
+msgid "Create a Shelf"
+msgstr "Crear un andel"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Síntoo, non ten permiso para editar o andel: %(sname)s"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Editar un andel"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr "Erro borrando o estante"
+
+#: cps/shelf.py:231
+msgid "Shelf successfully deleted"
+msgstr "Andel eliminado con éxito"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Cambiar a orde do andel: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "Síntoo, non ten permiso para crear un andel público"
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Andel %(title)s creado"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Andel %(title)s cambiado"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Ocorreu un erro"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Xa existe un andel público co nome '%(title)s'."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Xa existe un andel privado co nome '%(title)s'."
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Andel: '%(name)s'"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Erro ao abrir un andel. O andel non existe ou non se pode acceder"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Esperando"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Fallou"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Comezado"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Rematado"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr "Rematado"
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Estado descoñecido"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Dato inesperado mentres líase a información de actualización"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Actualización non dispoñiible. Xa tes instalada a versión máis recente"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "Unha nova actualización está dispoñible. Preme no botón inferior para actualizar á versión máis reciente."
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "Non se pode conseguir información sobre a actualización"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Preme no botón de abaixo para actualizar á última versión estable."
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr "Hai unha nova actualización dispoñible. Preme no botón de abaixo para actualizar á versión: %(version)s"
+
+#: cps/updater.py:536
+msgid "No release information available"
+msgstr "Non hai información do lanzamento dispoñible"
+
+#: cps/templates/index.html:6 cps/web.py:432
+msgid "Discover (Random Books)"
+msgstr "Descubrir (Libros ao chou)"
+
+#: cps/web.py:468
+msgid "Hot Books (Most Downloaded)"
+msgstr "Libros populares (os máis descargados)"
+
+#: cps/web.py:499
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Libros descargados por %(user)s"
+
+#: cps/web.py:532
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Autor/es: %(name)s"
+
+#: cps/web.py:568
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Editor/es: %(name)s"
+
+#: cps/web.py:596
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Series: %(serie)s"
+
+#: cps/web.py:611
+msgid "Rating: None"
+msgstr "Valoración: Ningunha"
+
+#: cps/web.py:620
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Valoración: %(rating)s estrelas"
+
+#: cps/web.py:638
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Formato do arquivo: %(format)s"
+
+#: cps/web.py:675
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Categoría: %(name)s"
+
+#: cps/web.py:702
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Lingua: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:940
+msgid "Downloads"
+msgstr "Descargas"
+
+#: cps/web.py:1033
+msgid "Ratings list"
+msgstr "Lista de valoracións"
+
+#: cps/web.py:1060
+msgid "File formats list"
+msgstr "Lista de formatos"
+
+#: cps/web.py:1202
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "Libro posto na cola de envío a %(kindlemail)s"
+
+#: cps/web.py:1206
+#, python-format
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr "Oh, oh! Houbo un erro no envío do libro: %(res)s"
+
+#: cps/web.py:1208
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr "Por favor actualiza o teu perfil co enderezo de correo do teu kindle..."
+
+#: cps/web.py:1225
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "O servidor de correo non está configurado, por favor, avisa ao teu administrador!"
+
+#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
+#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
+#: cps/web.py:1269
+msgid "Register"
+msgstr "Rexistro"
+
+#: cps/web.py:1260
+msgid "Your e-mail is not allowed to register"
+msgstr "O seu correo electrónico non está permitido para rexistrarse"
+
+#: cps/web.py:1264
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "Mandouse un correo electrónico de verificación á súa conta de correo."
+
+#: cps/web.py:1278
+msgid "Cannot activate LDAP authentication"
+msgstr "Non se pode activar a autenticación LDAP"
+
+#: cps/web.py:1297
+#, python-format
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr "Fallback login como: '%(nickname)s', non se pode acceder ao servidor LDAP ou usuario descoñecido"
+
+#: cps/web.py:1303
+#, python-format
+msgid "Could not login: %(message)s"
+msgstr "Non se puido entrar: %(message)s"
+
+#: cps/web.py:1307 cps/web.py:1332
+msgid "Wrong Username or Password"
+msgstr "Usuario ou contrasinal no válido"
+
+#: cps/web.py:1314
+msgid "New Password was send to your email address"
+msgstr "Unha nova contrasinal enviouse ao seu enderezo de correo electrónico"
+
+#: cps/web.py:1320
+msgid "Please enter valid username to reset password"
+msgstr "Por favor, introduce un usuario válido para restablecer a contrasinal"
+
+#: cps/web.py:1327
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "Agora estás conectado como: '%(nickname)s'"
+
+#: cps/web.py:1391 cps/web.py:1440
+#, python-format
+msgid "%(name)s's profile"
+msgstr "Perfil de %(name)s"
+
+#: cps/web.py:1407
+msgid "Profile updated"
+msgstr "Perfil actualizado"
+
+#: cps/services/gmail.py:58
+msgid "Found no valid gmail.json file with OAuth information"
+msgstr "Non se atopou ningún arquivo gmail.json válido con información OAuth"
+
+#: cps/tasks/convert.py:153
+#, python-format
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr "Non se atopou Calibre ebook-convert %(tool)s"
+
+#: cps/tasks/convert.py:186
+#, python-format
+msgid "%(format)s format not found on disk"
+msgstr "O formato %(format)s non se atopou no disco"
+
+#: cps/tasks/convert.py:190
+msgid "Ebook converter failed with unknown error"
+msgstr "O conversor de Ebook fallou cun erro descoñecido"
+
+#: cps/tasks/convert.py:202
+#, python-format
+msgid "Kepubify-converter failed: %(error)s"
+msgstr "Kepubify-converter fallou: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr "Arquivo convertido non atopado, ou máis dun arquivo no directorio %(folder)s"
+
+#: cps/tasks/convert.py:247
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Fallou Ebook-converter: %(error)s"
+
+#: cps/tasks/convert.py:270
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "Calibre fallou co erro: %(error)s"
+
+#: cps/tasks/convert.py:275
+msgid "Convert"
+msgstr "Convertir"
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr "Reconectando a base de datos de Calibre"
+
+#: cps/tasks/mail.py:265
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr "Xeradas %(count)s miniaturas de cubertas"
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr "Miniaturas de cubertas"
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr "Xeradas {0} miniaturas de series"
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr "Limpando caché de miniaturas de cubertas"
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Subir arquivo"
+
+#: cps/templates/admin.html:9
+msgid "Users"
+msgstr "Usuarios"
+
+#: cps/templates/admin.html:13 cps/templates/login.html:9
+#: cps/templates/login.html:10 cps/templates/register.html:9
+#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
+msgid "Username"
+msgstr "Nome de usuario"
+
+#: cps/templates/admin.html:14 cps/templates/register.html:14
+#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
+msgid "E-mail Address"
+msgstr "Enderezo de correo electrónico"
+
+#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
+msgid "Send to E-Reader E-mail Address"
+msgstr "Enviar ao enderezo de correo electrónico do Kindle"
+
+#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/user_table.html:143
+msgid "Admin"
+msgstr "Administrador"
+
+#: cps/templates/admin.html:18 cps/templates/login.html:13
+#: cps/templates/login.html:14 cps/templates/user_edit.html:23
+msgid "Password"
+msgstr "Contrasinal"
+
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
+#: cps/templates/user_table.html:146
+msgid "Download"
+msgstr "Descargar"
+
+#: cps/templates/admin.html:23
+msgid "View Books"
+msgstr "Ver libros"
+
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
+#: cps/templates/user_table.html:148
+msgid "Edit"
+msgstr "Editar"
+
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
+#: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
+#: cps/templates/user_table.html:149
+msgid "Delete"
+msgstr "Borrar"
+
+#: cps/templates/admin.html:26
+msgid "Public Shelf"
+msgstr "Andel público"
+
+#: cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "Engadir novo usuario"
+
+#: cps/templates/admin.html:55
+msgid "Import LDAP Users"
+msgstr "Importar usuarios LDAP"
+
+#: cps/templates/admin.html:62
+msgid "E-mail Server Settings"
+msgstr "Axustes do servidor de correo electrónico"
+
+#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
+msgid "SMTP Hostname"
+msgstr "Servidor SMTP"
+
+#: cps/templates/admin.html:71 cps/templates/email_edit.html:35
+msgid "SMTP Port"
+msgstr "Porto SMTP"
+
+#: cps/templates/admin.html:75 cps/templates/email_edit.html:39
+msgid "Encryption"
+msgstr "Cifraxe"
+
+#: cps/templates/admin.html:79 cps/templates/email_edit.html:47
+msgid "SMTP Login"
+msgstr "Login SMTP"
+
+#: cps/templates/admin.html:83 cps/templates/admin.html:94
+#: cps/templates/email_edit.html:55
+msgid "From E-mail"
+msgstr "Dende o correo electrónico"
+
+#: cps/templates/admin.html:90
+msgid "E-Mail Service"
+msgstr "Servizo de correo electrónico"
+
+#: cps/templates/admin.html:91
+msgid "Gmail via Oauth2"
+msgstr "Gmail por Oauth2"
+
+#: cps/templates/admin.html:106
+msgid "Configuration"
+msgstr "Configuración"
+
+#: cps/templates/admin.html:109
+msgid "Calibre Database Directory"
+msgstr "Directorio da base de datos de Calibre"
+
+#: cps/templates/admin.html:113 cps/templates/config_edit.html:68
+msgid "Log Level"
+msgstr "Nivel de rexistro"
+
+#: cps/templates/admin.html:117
+msgid "Port"
+msgstr "Porto"
+
+#: cps/templates/admin.html:122
+msgid "External Port"
+msgstr "Porto externo"
+
+#: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
+msgid "Books per Page"
+msgstr "Libros por páxina"
+
+#: cps/templates/admin.html:133
+msgid "Uploads"
+msgstr "Cargas"
+
+#: cps/templates/admin.html:137
+msgid "Anonymous Browsing"
+msgstr "Navegación anónima"
+
+#: cps/templates/admin.html:141
+msgid "Public Registration"
+msgstr "Rexistro público"
+
+#: cps/templates/admin.html:145
+msgid "Magic Link Remote Login"
+msgstr "Acceso remoto mediante enlace máxico"
+
+#: cps/templates/admin.html:149
+msgid "Reverse Proxy Login"
+msgstr "Acceso mediante Proxy inverso"
+
+#: cps/templates/admin.html:154 cps/templates/config_edit.html:173
+msgid "Reverse Proxy Header Name"
+msgstr "Nome de cabeceira do Proxy inverso"
+
+#: cps/templates/admin.html:159
+msgid "Edit Calibre Database Configuration"
+msgstr "Editar a configuración da base de datos de Calibre"
+
+#: cps/templates/admin.html:160
+msgid "Edit Basic Configuration"
+msgstr "Editar a configuración básica"
+
+#: cps/templates/admin.html:161
+msgid "Edit UI Configuration"
+msgstr "Editar a configuración da interfaz de usuario"
+
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr "Tarefas programadas"
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr "Hora de comezo das tarefas"
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr "Duración máxima das tarefas"
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr "Xerar as miniaturas das cubertas dos libros"
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr "Xerar as miniaturas das cubertas das series"
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr "Reconectar á librería de Calibre"
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr "Refrescar a caché de miniaturas das cubertas"
+
+#: cps/templates/admin.html:199
+msgid "Administration"
+msgstr "Administración"
+
+#: cps/templates/admin.html:200
+msgid "Download Debug Package"
+msgstr "Descargar o paquete de depuración"
+
+#: cps/templates/admin.html:201
+msgid "View Logs"
+msgstr "Ver arquivos de rexistro"
+
+#: cps/templates/admin.html:204
+msgid "Reconnect Calibre Database"
+msgstr "Reconectar á base de datos de Calibre"
+
+#: cps/templates/admin.html:207
+msgid "Restart"
+msgstr "Reiniciar"
+
+#: cps/templates/admin.html:208
+msgid "Shutdown"
+msgstr "Apagar"
+
+#: cps/templates/admin.html:213
+msgid "Version Information"
+msgstr "Información de versión"
+
+#: cps/templates/admin.html:217
+msgid "Version"
+msgstr "Versión"
+
+#: cps/templates/admin.html:218
+msgid "Details"
+msgstr "Detalles"
+
+#: cps/templates/admin.html:224
+msgid "Current version"
+msgstr "Versión actual"
+
+#: cps/templates/admin.html:231
+msgid "Check for Update"
+msgstr "Comprobar actualizacións"
+
+#: cps/templates/admin.html:232
+msgid "Perform Update"
+msgstr "Realizar actualización"
+
+#: cps/templates/admin.html:245
+msgid "Are you sure you want to restart?"
+msgstr "De verdade queres reiniciar?"
+
+#: cps/templates/admin.html:250 cps/templates/admin.html:264
+#: cps/templates/admin.html:284 cps/templates/config_db.html:70
+msgid "OK"
+msgstr "Vale"
+
+#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
+#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
+#: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
+#: cps/templates/user_edit.html:144
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: cps/templates/admin.html:263
+msgid "Are you sure you want to shutdown?"
+msgstr "De verdade quere deter?"
+
+#: cps/templates/admin.html:275
+msgid "Updating, please do not reload this page"
+msgstr "Actualizando. Por favor, non recargue a páxina"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "via"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "Na Librería"
+
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
+msgid "Sort according to book date, newest first"
+msgstr "Ordear pola data do libro, máis recente primeiro"
+
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
+msgid "Sort according to book date, oldest first"
+msgstr "Ordear pola data do libro, máis antigo primeiro"
+
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
+msgid "Sort title in alphabetical order"
+msgstr "Ordear polo título en orden alfabético"
+
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
+msgid "Sort title in reverse alphabetical order"
+msgstr "Ordear polo título en orde alfabético invertido"
+
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
+msgid "Sort according to publishing date, newest first"
+msgstr "Ordear pola data de publicación, máis recente primeiro"
+
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
+msgid "Sort according to publishing date, oldest first"
+msgstr "Ordear pola data de publicación, máis antigo primeiro"
+
+#: cps/templates/author.html:56 cps/templates/author.html:115
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
+msgid "reduce"
+msgstr "reducir"
+
+#: cps/templates/author.html:99
+msgid "More by"
+msgstr "Máis de"
+
+#: cps/templates/book_edit.html:11
+msgid "Delete Book"
+msgstr "Borrar libro"
+
+#: cps/templates/book_edit.html:14
+msgid "Delete formats:"
+msgstr "Borrar formatos:"
+
+#: cps/templates/book_edit.html:25
+msgid "Convert book format:"
+msgstr "Convertir formato de libro:"
+
+#: cps/templates/book_edit.html:30
+msgid "Convert from:"
+msgstr "Convertir dende:"
+
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
+msgid "select an option"
+msgstr "seleccionar unha opción"
+
+#: cps/templates/book_edit.html:37
+msgid "Convert to:"
+msgstr "Convertir a:"
+
+#: cps/templates/book_edit.html:46
+msgid "Convert book"
+msgstr "Convertir libro"
+
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
+msgid "Book Title"
+msgstr "Título do libro"
+
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
+msgid "Author"
+msgstr "Autor"
+
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
+msgid "Description"
+msgstr "Descrición"
+
+#: cps/templates/book_edit.html:73
+msgid "Identifiers"
+msgstr "Identificadores"
+
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+msgid "Identifier Type"
+msgstr "Tipo de identificador"
+
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+msgid "Identifier Value"
+msgstr "Valor de identificador"
+
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
+#: cps/templates/user_table.html:24
+msgid "Remove"
+msgstr "Borrar"
+
+#: cps/templates/book_edit.html:83
+msgid "Add Identifier"
+msgstr "Engadir identificador"
+
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: cps/templates/book_edit.html:95
+msgid "Series ID"
+msgstr "ID de serie"
+
+#: cps/templates/book_edit.html:99
+msgid "Rating"
+msgstr "Valoración"
+
+#: cps/templates/book_edit.html:104
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "Obter portada de URL (JPEG, a portada descargarase e almacenarase na base de datos)"
+
+#: cps/templates/book_edit.html:108
+msgid "Upload Cover from Local Disk"
+msgstr "Cargar portada dende un disco local"
+
+#: cps/templates/book_edit.html:113
+msgid "Published Date"
+msgstr "Data de publicación"
+
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
+#: cps/templates/search_form.html:16
+msgid "Publisher"
+msgstr "Editor"
+
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
+#: cps/templates/user_edit.html:33
+msgid "Language"
+msgstr "Lingua"
+
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
+#: cps/templates/search_form.html:164
+msgid "Yes"
+msgstr "Sí"
+
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
+#: cps/templates/search_form.html:165
+msgid "No"
+msgstr "Non"
+
+#: cps/templates/book_edit.html:201
+msgid "Upload Format"
+msgstr "Cargar formato"
+
+#: cps/templates/book_edit.html:209
+msgid "View Book on Save"
+msgstr "Ver libro ao gardar"
+
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
+msgid "Fetch Metadata"
+msgstr "Obter metadatos"
+
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
+msgid "Save"
+msgstr "Gardar"
+
+#: cps/templates/book_edit.html:233
+msgid "Keyword"
+msgstr "Palabra chave"
+
+#: cps/templates/book_edit.html:234
+msgid "Search keyword"
+msgstr "Buscar por palabras chave "
+
+#: cps/templates/book_edit.html:240
+msgid "Click the cover to load metadata to the form"
+msgstr "Premer na portada para cargar los metadatos no formulario"
+
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
+#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:163
+msgid "Close"
+msgstr "Pechar"
+
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
+msgid "Source"
+msgstr "Orixe"
+
+#: cps/templates/book_edit.html:287
+msgid "Search error!"
+msgstr "Erro na busca!"
+
+#: cps/templates/book_edit.html:288
+msgid "No Result(s) found! Please try another keyword."
+msgstr "Non se atoparon resultados! Por favor intenta con outra palabra chave."
+
+#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
+#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
+#: cps/templates/user_table.html:100
+msgid "This Field is Required"
+msgstr "Este campo é necesario"
+
+#: cps/templates/book_table.html:37
+msgid "Merge selected books"
+msgstr "Unir libros seleccionados"
+
+#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
+msgid "Remove Selections"
+msgstr "Eliminar selección"
+
+#: cps/templates/book_table.html:41
+msgid "Exchange author and title"
+msgstr "Intercambiar autor e título"
+
+#: cps/templates/book_table.html:47
+msgid "Update Title Sort automatically"
+msgstr "Actualizar orde do título automáticamente"
+
+#: cps/templates/book_table.html:51
+msgid "Update Author Sort automatically"
+msgstr "Actualizar orde do autor automáticamente"
+
+#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
+msgid "Enter Title"
+msgstr "Introduce título"
+
+#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
+#: cps/templates/shelf_edit.html:8
+msgid "Title"
+msgstr "Título"
+
+#: cps/templates/book_table.html:64
+msgid "Enter Title Sort"
+msgstr "Introduce a orde do título"
+
+#: cps/templates/book_table.html:64
+msgid "Title Sort"
+msgstr "Orde do título"
+
+#: cps/templates/book_table.html:65
+msgid "Enter Author Sort"
+msgstr "Introduce orde do autor"
+
+#: cps/templates/book_table.html:65
+msgid "Author Sort"
+msgstr "Orde do autor"
+
+#: cps/templates/book_table.html:66
+msgid "Enter Authors"
+msgstr "Introduce os autores"
+
+#: cps/templates/book_table.html:67
+msgid "Enter Categories"
+msgstr "Introduce as categorías"
+
+#: cps/templates/book_table.html:68
+msgid "Enter Series"
+msgstr "Introduce as series"
+
+#: cps/templates/book_table.html:69
+msgid "Series Index"
+msgstr "Índice da serie"
+
+#: cps/templates/book_table.html:70
+msgid "Enter Languages"
+msgstr "Introduce as linguas"
+
+#: cps/templates/book_table.html:71
+msgid "Publishing Date"
+msgstr "Data de publicación"
+
+#: cps/templates/book_table.html:72
+msgid "Enter Publishers"
+msgstr "Introduce os Editores"
+
+#: cps/templates/book_table.html:73
+msgid "Enter comments"
+msgstr "Introducir os comentarios"
+
+#: cps/templates/book_table.html:73
+msgid "Comments"
+msgstr "Comentarios"
+
+#: cps/templates/book_table.html:75
+msgid "Archiv Status"
+msgstr "Estado do arquivo"
+
+#: cps/templates/book_table.html:77 cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "Leer estado"
+
+#: cps/templates/book_table.html:80 cps/templates/book_table.html:82
+#: cps/templates/book_table.html:84 cps/templates/book_table.html:86
+#: cps/templates/book_table.html:90 cps/templates/book_table.html:92
+#: cps/templates/book_table.html:96
+msgid "Enter "
+msgstr "Introduce "
+
+#: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
+msgid "Are you really sure?"
+msgstr "De verdade estás seguro?"
+
+#: cps/templates/book_table.html:117
+msgid "Books with Title will be merged from:"
+msgstr "Libros co título uniranse de:"
+
+#: cps/templates/book_table.html:121
+msgid "Into Book with Title:"
+msgstr "No libro co título:"
+
+#: cps/templates/book_table.html:126
+msgid "Merge"
+msgstr "Unir"
+
+#: cps/templates/config_db.html:12
+msgid "Location of Calibre Database"
+msgstr "Localización da base de datos Calibre"
+
+#: cps/templates/config_db.html:22
+msgid "Use Google Drive?"
+msgstr "Usar Google Drive?"
+
+#: cps/templates/config_db.html:27
+msgid "Authenticate Google Drive"
+msgstr "Autenticar Google Drive"
+
+#: cps/templates/config_db.html:32
+msgid "Google Drive Calibre folder"
+msgstr "Carpeta de Google Drive para Calibre"
+
+#: cps/templates/config_db.html:40
+msgid "Metadata Watch Channel ID"
+msgstr "Metadata Watch Channel ID"
+
+#: cps/templates/config_db.html:43
+msgid "Revoke"
+msgstr "Revogar"
+
+#: cps/templates/config_db.html:68
+msgid "New db location is invalid, please enter valid path"
+msgstr "A localización da base de datos non é válida. Por favor, Introduce a ruta correcta"
+
+#: cps/templates/config_edit.html:18
+msgid "Server Configuration"
+msgstr "Configuración do servidor"
+
+#: cps/templates/config_edit.html:25
+msgid "Server Port"
+msgstr "Porto do servidor"
+
+#: cps/templates/config_edit.html:28
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "Localización do arquivo de certificado SSL (deixar en branco se non hai un servidor SSL)"
+
+#: cps/templates/config_edit.html:35
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "Localización do arquivo clave SSL (dejar en blanco si no hay un servidor SSL)"
+
+#: cps/templates/config_edit.html:43
+msgid "Update Channel"
+msgstr "Canle de actualización"
+
+#: cps/templates/config_edit.html:45
+msgid "Stable"
+msgstr "Estable"
+
+#: cps/templates/config_edit.html:46
+msgid "Nightly"
+msgstr "Nocturno"
+
+#: cps/templates/config_edit.html:50
+msgid "Trusted Hosts (Comma Separated)"
+msgstr "Anfitrións de confianza (Separados por comas)"
+
+#: cps/templates/config_edit.html:61
+msgid "Logfile Configuration"
+msgstr "Configuración do arquivo de rexistro"
+
+#: cps/templates/config_edit.html:77
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr "Localización e nome do arquivo de rexistro (se non se especifica será calibre-web.log)"
+
+#: cps/templates/config_edit.html:82
+msgid "Enable Access Log"
+msgstr "Habilitar rexistro de acceso"
+
+#: cps/templates/config_edit.html:85
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr "Localización e nombre do archivo de rexistro de acceso (access.log non ten ningunha entrada)"
+
+#: cps/templates/config_edit.html:96
+msgid "Feature Configuration"
+msgstr "Configuración de características"
+
+#: cps/templates/config_edit.html:104
+msgid "Convert non-English characters in title and author while saving to disk"
+msgstr "Convertir caracteres non ingleses no título e no autor mentres se graba no disco"
+
+#: cps/templates/config_edit.html:108
+msgid "Enable Uploads"
+msgstr "Permitir cargas"
+
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr "(Por favor asegúrese que os usuarios teñen permisos de carga)"
+
+#: cps/templates/config_edit.html:112
+msgid "Allowed Upload Fileformats"
+msgstr "Formatos de arquivo permitidos para carga"
+
+#: cps/templates/config_edit.html:118
+msgid "Enable Anonymous Browsing"
+msgstr "Permitir navegación anónima"
+
+#: cps/templates/config_edit.html:122
+msgid "Enable Public Registration"
+msgstr "Permitir rexistro público"
+
+#: cps/templates/config_edit.html:127
+msgid "Use E-Mail as Username"
+msgstr "Utilizar correo electrónico como nome de usuario"
+
+#: cps/templates/config_edit.html:132
+msgid "Enable Magic Link Remote Login"
+msgstr "Permitir inicio de sesión remoto (\"magic link\")"
+
+#: cps/templates/config_edit.html:137
+msgid "Enable Kobo sync"
+msgstr "Activar a sincronización con Kobo"
+
+#: cps/templates/config_edit.html:142
+msgid "Proxy unknown requests to Kobo Store"
+msgstr "Peticións proxy á tenda Kobo descoñecidas"
+
+#: cps/templates/config_edit.html:145
+msgid "Server External Port (for port forwarded API calls)"
+msgstr "Porto externo do servidor (para peticións API)"
+
+#: cps/templates/config_edit.html:153
+msgid "Use Goodreads"
+msgstr "Usar Goodreads"
+
+#: cps/templates/config_edit.html:154
+msgid "Create an API Key"
+msgstr "Obter unha API Key"
+
+#: cps/templates/config_edit.html:158
+msgid "Goodreads API Key"
+msgstr "Goodreads API Key"
+
+#: cps/templates/config_edit.html:162
+msgid "Goodreads API Secret"
+msgstr "Goodreads API Secret"
+
+#: cps/templates/config_edit.html:169
+msgid "Allow Reverse Proxy Authentication"
+msgstr "Permitir Autenticación Proxy Inversa"
+
+#: cps/templates/config_edit.html:180
+msgid "Login type"
+msgstr "Tipo de inicio de sesión"
+
+#: cps/templates/config_edit.html:182
+msgid "Use Standard Authentication"
+msgstr "Usar autenticación estándar"
+
+#: cps/templates/config_edit.html:184
+msgid "Use LDAP Authentication"
+msgstr "Usar autenticación LDAP"
+
+#: cps/templates/config_edit.html:187
+msgid "Use OAuth"
+msgstr "Usar OAuth"
+
+#: cps/templates/config_edit.html:194
+msgid "LDAP Server Host Name or IP Address"
+msgstr "Nome de anfitrión ou enderezo IP do servidor LDAP"
+
+#: cps/templates/config_edit.html:198
+msgid "LDAP Server Port"
+msgstr "Porto do servidor LDAP"
+
+#: cps/templates/config_edit.html:202
+msgid "LDAP Encryption"
+msgstr "Cifrado LDAP"
+
+#: cps/templates/config_edit.html:205
+msgid "TLS"
+msgstr "TLS"
+
+#: cps/templates/config_edit.html:206
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/config_edit.html:210
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr "Ruta LDAP CACertificate (So necesaria para certificado de autenticación de cliente)"
+
+#: cps/templates/config_edit.html:217
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr "Ruta LDAP Certificate (So necesaria para certificado de autenticación de cliente)"
+
+#: cps/templates/config_edit.html:224
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr "Ruta LDAP Keyfile (So necesaria para certificado de autenticación de cliente)"
+
+#: cps/templates/config_edit.html:233
+msgid "LDAP Authentication"
+msgstr "Autenticación LDAP"
+
+#: cps/templates/config_edit.html:235
+msgid "Anonymous"
+msgstr "Anónimo"
+
+#: cps/templates/config_edit.html:236
+msgid "Unauthenticated"
+msgstr "Non autenticado"
+
+#: cps/templates/config_edit.html:237
+msgid "Simple"
+msgstr "Simple"
+
+#: cps/templates/config_edit.html:242
+msgid "LDAP Administrator Username"
+msgstr "Nome de usuario de administrador LDAP"
+
+#: cps/templates/config_edit.html:248
+msgid "LDAP Administrator Password"
+msgstr "Contrasinal de administrador LDAP"
+
+#: cps/templates/config_edit.html:253
+msgid "LDAP Distinguished Name (DN)"
+msgstr "Nome distinguido LDAP (DN)"
+
+#: cps/templates/config_edit.html:257
+msgid "LDAP User Object Filter"
+msgstr "Filtro de obxectos de usuario LDAP"
+
+#: cps/templates/config_edit.html:262
+msgid "LDAP Server is OpenLDAP?"
+msgstr "O servidor LDAP é OpenLDAP?"
+
+#: cps/templates/config_edit.html:264
+msgid "Following Settings are Needed For User Import"
+msgstr "As seguintes configuracións son necesarias para a importación de usuarios"
+
+#: cps/templates/config_edit.html:266
+msgid "LDAP Group Object Filter"
+msgstr "Filtro de obxectos de grupo LDAP"
+
+#: cps/templates/config_edit.html:270
+msgid "LDAP Group Name"
+msgstr "Nome de grupo LDAP"
+
+#: cps/templates/config_edit.html:274
+msgid "LDAP Group Members Field"
+msgstr "Campo de membros de grupo LDAP"
+
+#: cps/templates/config_edit.html:278
+msgid "LDAP Member User Filter Detection"
+msgstr "Filtro de detección LDAP Member User"
+
+#: cps/templates/config_edit.html:280
+msgid "Autodetect"
+msgstr "Auto detectar"
+
+#: cps/templates/config_edit.html:281
+msgid "Custom Filter"
+msgstr "Filtro personalizado"
+
+#: cps/templates/config_edit.html:286
+msgid "LDAP Member User Filter"
+msgstr "Filtro LDAP Member User"
+
+#: cps/templates/config_edit.html:297
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr "Obter a Credencial OAuth de %(provider)s"
+
+#: cps/templates/config_edit.html:300
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr "Id de cliente de OAuth de %(provider)s"
+
+#: cps/templates/config_edit.html:304
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr "Secreto OAuth de Cliente de %(provider)s"
+
+#: cps/templates/config_edit.html:320
+msgid "External binaries"
+msgstr "Binarios externos"
+
+#: cps/templates/config_edit.html:326
+msgid "Path to Calibre E-Book Converter"
+msgstr "Ruta para Calibre E-Book Converter"
+
+#: cps/templates/config_edit.html:334
+msgid "Calibre E-Book Converter Settings"
+msgstr "Axustes de Calibre E-Book Converter"
+
+#: cps/templates/config_edit.html:337
+msgid "Path to Kepubify E-Book Converter"
+msgstr "Ruta para Kepubify E-Book Converter"
+
+#: cps/templates/config_edit.html:345
+msgid "Location of Unrar binary"
+msgstr "Localización do binario de Unrar"
+
+#: cps/templates/config_view_edit.html:17
+msgid "View Configuration"
+msgstr "Ver configuración"
+
+#: cps/templates/config_view_edit.html:32
+msgid "No. of Random Books to Display"
+msgstr "Número de libros aleatorios a mostrar"
+
+#: cps/templates/config_view_edit.html:36
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr "Número de autores para mostrar antes de agochar (0 = desactivar o agochamento)"
+
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+msgid "Theme"
+msgstr "Tema"
+
+#: cps/templates/config_view_edit.html:42
+msgid "Standard Theme"
+msgstr "Tema estándar"
+
+#: cps/templates/config_view_edit.html:43
+msgid "caliBlur! Dark Theme"
+msgstr "caliBlur! Tema Escuro"
+
+#: cps/templates/config_view_edit.html:47
+msgid "Regular Expression for Ignoring Columns"
+msgstr "Expresión regular para ignorar columnas"
+
+#: cps/templates/config_view_edit.html:51
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr "Enlazar á columna de Calibre de lido/sen ler"
+
+#: cps/templates/config_view_edit.html:60
+msgid "View Restrictions based on Calibre column"
+msgstr "Ver restricións baseadas na columna de Calibre"
+
+#: cps/templates/config_view_edit.html:69
+msgid "Regular Expression for Title Sorting"
+msgstr "Expresión regular para ordear títulos"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
+msgstr "Axustes por defecto para novos usuarios"
+
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
+msgid "Admin User"
+msgstr "Usuario administrador"
+
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
+msgid "Allow Downloads"
+msgstr "Permitir descargas"
+
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
+msgid "Allow eBook Viewer"
+msgstr "Permitir visor de libros"
+
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
+msgid "Allow Uploads"
+msgstr "Permitir cargas de arquivos"
+
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
+msgid "Allow Edit"
+msgstr "Permitir editar"
+
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
+msgid "Allow Delete Books"
+msgstr "Permitir borrar libros"
+
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
+msgid "Allow Changing Password"
+msgstr "Permitir cambiar a contrasinal"
+
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
+msgid "Allow Editing Public Shelves"
+msgstr "Permitir editar andeis públicos"
+
+#: cps/templates/config_view_edit.html:123
+msgid "Default Language"
+msgstr "Lingua predeterminada"
+
+#: cps/templates/config_view_edit.html:131
+msgid "Default Visible Language of Books"
+msgstr "Lingua visible predeterminada dos libros"
+
+#: cps/templates/config_view_edit.html:147
+msgid "Default Visibilities for New Users"
+msgstr "Visibilidade predeterminada para novos usuarios"
+
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
+#: cps/templates/user_table.html:154
+msgid "Show Random Books in Detail View"
+msgstr "Mostrar libros aleatorios na vista detallada"
+
+#: cps/templates/config_view_edit.html:166 cps/templates/user_edit.html:87
+msgid "Add Allowed/Denied Tags"
+msgstr "Engadir etiquetas Permitidas/denegados"
+
+#: cps/templates/config_view_edit.html:167
+msgid "Add Allowed/Denied custom column values"
+msgstr "Engadir valores personalizados Permitidos/denegados"
+
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
+msgid "Read in Browser"
+msgstr "Ler no navegador"
+
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
+msgid "Listen in Browser"
+msgstr "Escoitar no navegador"
+
+#: cps/templates/detail.html:125
+#, python-format
+msgid "Book %(index)s of %(range)s"
+msgstr "Libro %(index)s de %(range)s"
+
+#: cps/templates/detail.html:174
+msgid "Published"
+msgstr "Publicado"
+
+#: cps/templates/detail.html:222
+msgid "Mark As Unread"
+msgstr "Marcar como non lido"
+
+#: cps/templates/detail.html:222
+msgid "Mark As Read"
+msgstr "Marcar como lido"
+
+#: cps/templates/detail.html:223
+msgid "Read"
+msgstr "Lido"
+
+#: cps/templates/detail.html:232
+msgid "Restore from archive"
+msgstr "Restaurar dende o arquivo"
+
+#: cps/templates/detail.html:232
+msgid "Add to archive"
+msgstr "Engadir a arquivo"
+
+#: cps/templates/detail.html:233
+msgid "Archived"
+msgstr "Arquivado"
+
+#: cps/templates/detail.html:244
+msgid "Description:"
+msgstr "Descrición:"
+
+#: cps/templates/detail.html:257 cps/templates/search.html:16
+msgid "Add to shelf"
+msgstr "Engadir ao andel"
+
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/search.html:22
+msgid "(Public)"
+msgstr "(Público)"
+
+#: cps/templates/detail.html:299
+msgid "Edit Metadata"
+msgstr "Editar metadatos"
+
+#: cps/templates/email_edit.html:13
+msgid "Choose Server Type"
+msgstr "Escolle tipo de servidor"
+
+#: cps/templates/email_edit.html:15
+msgid "Use Standard E-Mail Account"
+msgstr "Usar conta de correo electrónico estándar"
+
+#: cps/templates/email_edit.html:16
+msgid "Gmail Account with OAuth2 Verification"
+msgstr "Verificación de conta Gmail con OAuth2"
+
+#: cps/templates/email_edit.html:22
+msgid "Setup Gmail Account as E-Mail Server"
+msgstr "Configurar conta de Gmail como servidor de correo"
+
+#: cps/templates/email_edit.html:24
+msgid "Revoke Gmail Access"
+msgstr "Revogar acceso a Gmail"
+
+#: cps/templates/email_edit.html:42
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:43
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:51
+msgid "SMTP Password"
+msgstr "Contrasinal SMTP"
+
+#: cps/templates/email_edit.html:58
+msgid "Attachment Size Limit"
+msgstr "Tamaño límite do arquivo achegado"
+
+#: cps/templates/email_edit.html:66
+msgid "Save and Send Test E-mail"
+msgstr "Gardar e enviar un correo electrónico de proba"
+
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
+msgid "Back"
+msgstr "Voltar"
+
+#: cps/templates/email_edit.html:74
+msgid "Allowed Domains (Whitelist)"
+msgstr "Dominios permitidos para rexistrarse"
+
+#: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
+msgid "Add Domain"
+msgstr "Engadir dominio"
+
+#: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
+#: cps/templates/user_table.html:27
+msgid "Add"
+msgstr "Engadir"
+
+#: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
+msgid "Enter domainname"
+msgstr "Introducir nome de dominio"
+
+#: cps/templates/email_edit.html:92
+msgid "Denied Domains (Blacklist)"
+msgstr "Dominios prohibidos (Blaclist)"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+msgid "Next"
+msgstr "Seguinte"
+
+#: cps/templates/generate_kobo_auth_url.html:6
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr "Abre o arquivo .kobo/Kobo eReader.conf nun editor de texto e engade (ou edita):"
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Kobo Token:"
+msgstr "Token de sincronización de Kobo"
+
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr "Lista"
+
+#: cps/templates/http_error.html:31
+msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
+msgstr "A instancia de Calibre-Web non está configurada, por favor contacta co teu administrador"
+
+#: cps/templates/http_error.html:41
+msgid "Create Issue"
+msgstr "Crear una incidencia"
+
+#: cps/templates/http_error.html:48
+msgid "Return to Home"
+msgstr "Voltar ao inicio"
+
+#: cps/templates/http_error.html:50
+msgid "Logout User"
+msgstr "Pechar sesión"
+
+#: cps/templates/index.html:71
+msgid "Sort ascending according to download count"
+msgstr "Ordear carra arriba segundo a conta de descargas"
+
+#: cps/templates/index.html:72
+msgid "Sort descending according to download count"
+msgstr "Ordear cara abaixo segundo a conta de descargas"
+
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr "Ordenar autores en orde alfabética"
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
+msgid "Sort authors in reverse alphabetical order"
+msgstr "Ordenar autores en orde alfabética reversa"
+
+#: cps/templates/index.html:83
+msgid "Sort ascending according to series index"
+msgstr "Ordear cara arriba segundo ao índice de serie"
+
+#: cps/templates/index.html:84
+msgid "Sort descending according to series index"
+msgstr "Ordear cara abaixo segundo ao índice de serie"
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "Comezar"
+
+#: cps/templates/index.xml:18
+msgid "Alphabetical Books"
+msgstr "Libros alfabéticos"
+
+#: cps/templates/index.xml:22
+msgid "Books sorted alphabetically"
+msgstr "Libros ordeados alfabéticamente"
+
+#: cps/templates/index.xml:29
+msgid "Popular publications from this catalog based on Downloads."
+msgstr "Publicacións populares do catálogo baseadas nas descargas."
+
+#: cps/templates/index.xml:36
+msgid "Popular publications from this catalog based on Rating."
+msgstr "Publicacións populares do catálogo baseadas na valoración."
+
+#: cps/templates/index.xml:39
+msgid "Recently added Books"
+msgstr "Libros engadidos recentemente"
+
+#: cps/templates/index.xml:43
+msgid "The latest Books"
+msgstr "Últimos libros"
+
+#: cps/templates/index.xml:46
+msgid "Random Books"
+msgstr "Libros ao chou"
+
+#: cps/templates/index.xml:73
+msgid "Books ordered by Author"
+msgstr "Libros ordeados por autor"
+
+#: cps/templates/index.xml:80
+msgid "Books ordered by publisher"
+msgstr "Libros ordeados por editor"
+
+#: cps/templates/index.xml:87
+msgid "Books ordered by category"
+msgstr "Libros ordeados por categorías"
+
+#: cps/templates/index.xml:94
+msgid "Books ordered by series"
+msgstr "Libros ordeados por series"
+
+#: cps/templates/index.xml:101
+msgid "Books ordered by Languages"
+msgstr "Libros ordeados por lingua"
+
+#: cps/templates/index.xml:108
+msgid "Books ordered by Rating"
+msgstr "Libros ordeados por valoración"
+
+#: cps/templates/index.xml:116
+msgid "Books ordered by file formats"
+msgstr "Libros ordeados por formato de arquivo"
+
+#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/search_form.html:87
+msgid "Shelves"
+msgstr "Andeis"
+
+#: cps/templates/index.xml:123
+msgid "Books organized in shelves"
+msgstr "Libros organizados en andeis"
+
+#: cps/templates/layout.html:30
+msgid "Home"
+msgstr "Inicio"
+
+#: cps/templates/layout.html:36
+msgid "Toggle Navigation"
+msgstr "Alternar navegación"
+
+#: cps/templates/layout.html:47
+msgid "Search Library"
+msgstr "Buscar na librería"
+
+#: cps/templates/layout.html:64 cps/templates/layout.html:118
+msgid "Uploading..."
+msgstr "Cargando..."
+
+#: cps/templates/layout.html:64
+msgid "Error"
+msgstr "Erro"
+
+#: cps/templates/layout.html:64
+msgid "Upload done, processing, please wait..."
+msgstr "Carga feita, procesando, por favor agarde..."
+
+#: cps/templates/layout.html:77 cps/templates/read.html:72
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
+msgid "Settings"
+msgstr "Axustes"
+
+#: cps/templates/layout.html:79
+msgid "Account"
+msgstr "Conta"
+
+#: cps/templates/layout.html:81
+msgid "Logout"
+msgstr "Pechar sesión"
+
+#: cps/templates/layout.html:119
+msgid "Please do not refresh the page"
+msgstr "Por favor, non actualice a páxina"
+
+#: cps/templates/layout.html:129
+msgid "Browse"
+msgstr "Navegar"
+
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
+msgid "About"
+msgstr "Acerca de"
+
+#: cps/templates/layout.html:156
+msgid "Previous"
+msgstr "Previo"
+
+#: cps/templates/layout.html:183
+msgid "Book Details"
+msgstr "Detalles do libro"
+
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr "Reixa"
+
+#: cps/templates/login.html:18
+msgid "Remember Me"
+msgstr "Lembrarme"
+
+#: cps/templates/login.html:23
+msgid "Forgot Password?"
+msgstr "Esqueceu a contrasinal?"
+
+#: cps/templates/login.html:26
+msgid "Log in with Magic Link"
+msgstr "Iniciar sesión cun enlace máxico"
+
+#: cps/templates/logviewer.html:6
+msgid "Show Calibre-Web Log: "
+msgstr "Mostrar o rexistro de Calibre-Web: "
+
+#: cps/templates/logviewer.html:8
+msgid "Calibre-Web Log: "
+msgstr "Rexistro de Calibre-Web: "
+
+#: cps/templates/logviewer.html:8
+msgid "Stream output, can't be displayed"
+msgstr "A saída do fluxo non se pode mostrar"
+
+#: cps/templates/logviewer.html:12
+msgid "Show Access Log: "
+msgstr "Mostrar rexistro de acceso:"
+
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr "Descargar o rexistro de Calibre-Web"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Descargar o rexistro de acceso"
+
+#: cps/templates/modal_dialogs.html:6
+msgid "Select Allowed/Denied Tags"
+msgstr "Seleccionar etiquetas Permitidas/Negadas"
+
+#: cps/templates/modal_dialogs.html:7
+msgid "Select Allowed/Denied Custom Column Values"
+msgstr "Seleccionar valores propios de columnas Permitidas/Denegadas"
+
+#: cps/templates/modal_dialogs.html:8
+msgid "Select Allowed/Denied Tags of User"
+msgstr "Seleccionar etiquetas de usuario Permitido/Denegado"
+
+#: cps/templates/modal_dialogs.html:9
+msgid "Select Allowed/Denied Custom Column Values of User"
+msgstr "Seleccionar columnas personalizadas de usuario Permitido/Denegado"
+
+#: cps/templates/modal_dialogs.html:15
+msgid "Enter Tag"
+msgstr "Introduce a etiqueta"
+
+#: cps/templates/modal_dialogs.html:24
+msgid "Add View Restriction"
+msgstr "Engadir restricción de vista"
+
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "Este formato de libro borrarase permanentemente da base de datos"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "O libro borrarase permanentemente da base de datos"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "e do 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: os libros eliminados permanecerán nos dispositivos Kobo emparellados."
+
+#: 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 poida eliminarse con seguridade debe arquivarse e sincronizarse co dispositivo."
+
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr "Escolla a localización do arquivo"
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr "tipo"
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr "nome"
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr "tamaño"
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr "Directorio pai"
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr "Seleccionar"
+
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
+msgid "Ok"
+msgstr "Vale"
+
+#: cps/templates/osd.xml:5
+msgid "Calibre-Web eBook Catalog"
+msgstr "Catálogo de libros electrónicos de Calibre-Web"
+
+#: cps/templates/read.html:6
+msgid "epub Reader"
+msgstr "Lector epub"
+
+#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+msgid "Light"
+msgstr "Claro"
+
+#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+msgid "Dark"
+msgstr "Oscuro"
+
+#: cps/templates/read.html:79
+msgid "Sepia"
+msgstr "Sepia"
+
+#: cps/templates/read.html:80
+msgid "Black"
+msgstr "Negro"
+
+#: cps/templates/read.html:84
+msgid "Reflow text when sidebars are open."
+msgstr "Refluxo do texto cando as barras laterais están abertas."
+
+#: cps/templates/readcbr.html:7
+msgid "Comic Reader"
+msgstr "Lector de Cómics"
+
+#: cps/templates/readcbr.html:89
+msgid "Keyboard Shortcuts"
+msgstr "Atallos de teclado"
+
+#: cps/templates/readcbr.html:92
+msgid "Previous Page"
+msgstr "Páxina anterior"
+
+#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+msgid "Next Page"
+msgstr "Páxina seguinte"
+
+#: cps/templates/readcbr.html:94
+msgid "Scale to Best"
+msgstr "Escalar ao mellor"
+
+#: cps/templates/readcbr.html:95
+msgid "Scale to Width"
+msgstr "Escalar ao ancho"
+
+#: cps/templates/readcbr.html:96
+msgid "Scale to Height"
+msgstr "Escalar ao alto"
+
+#: cps/templates/readcbr.html:97
+msgid "Scale to Native"
+msgstr "Escalado nativo"
+
+#: cps/templates/readcbr.html:98
+msgid "Rotate Right"
+msgstr "Xirar cara a dereita"
+
+#: cps/templates/readcbr.html:99
+msgid "Rotate Left"
+msgstr "Xirar cara a esquerda"
+
+#: cps/templates/readcbr.html:100
+msgid "Flip Image"
+msgstr "Voltear a imaxe"
+
+#: cps/templates/readcbr.html:122
+msgid "Scale"
+msgstr "Escalar"
+
+#: cps/templates/readcbr.html:125
+msgid "Best"
+msgstr "Mellor"
+
+#: cps/templates/readcbr.html:126
+msgid "Width"
+msgstr "Ancho"
+
+#: cps/templates/readcbr.html:127
+msgid "Height"
+msgstr "Alto"
+
+#: cps/templates/readcbr.html:128
+msgid "Native"
+msgstr "Nativo"
+
+#: cps/templates/readcbr.html:133
+msgid "Rotate"
+msgstr "Rotar"
+
+#: cps/templates/readcbr.html:144
+msgid "Flip"
+msgstr "Voltear"
+
+#: cps/templates/readcbr.html:147
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: cps/templates/readcbr.html:148
+msgid "Vertical"
+msgstr "Vertical"
+
+#: cps/templates/readcbr.html:153
+msgid "Direction"
+msgstr "Dirección"
+
+#: cps/templates/readcbr.html:156
+msgid "Left to Right"
+msgstr "De esquerda a dereita"
+
+#: cps/templates/readcbr.html:157
+msgid "Right to Left"
+msgstr "De dereita a esquerda"
+
+#: cps/templates/readcbr.html:165
+msgid "Reset to Top"
+msgstr "Voltar ao comezo"
+
+#: cps/templates/readcbr.html:166
+msgid "Remember Position"
+msgstr "Lembrar posición"
+
+#: cps/templates/readcbr.html:171
+msgid "Scrollbar"
+msgstr "Barra de desprazamento"
+
+#: cps/templates/readcbr.html:174
+msgid "Show"
+msgstr "Mostrar"
+
+#: cps/templates/readcbr.html:175
+msgid "Hide"
+msgstr "Agochar"
+
+#: cps/templates/readdjvu.html:5
+msgid "DJVU Reader"
+msgstr "Lector DJVU"
+
+#: cps/templates/readpdf.html:29
+msgid "PDF Reader"
+msgstr "Lector PDF"
+
+#: cps/templates/readtxt.html:6
+msgid "txt Reader"
+msgstr "Lector txt"
+
+#: cps/templates/register.html:4
+msgid "Register New Account"
+msgstr "Rexistre unha conta nova"
+
+#: cps/templates/register.html:10
+msgid "Choose a username"
+msgstr "Escolla un nome de usuario"
+
+#: cps/templates/register.html:15
+msgid "Your email address"
+msgstr "O teu enderezo de correo"
+
+#: cps/templates/remote_login.html:5
+msgid "Magic Link - Authorise New Device"
+msgstr "Enlace Máxico - Autorizar un novo dispositivo"
+
+#: cps/templates/remote_login.html:7
+msgid "On another device, login and visit:"
+msgstr "Utiliza otro dispositivo, inicia sesión e visita:"
+
+#: cps/templates/remote_login.html:11
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr "Unha vez verificado, iniciará sesión automáticamente neste dispositivo."
+
+#: cps/templates/remote_login.html:14
+msgid "This verification link will expire in 10 minutes."
+msgstr "O enlace de verificación caducará despois de 10 minutos."
+
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr "Xerar miniaturas de cubertas de libros"
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr "Xerar miniaturas de cubertas de series"
+
+#: cps/templates/search.html:6
+msgid "No Results Found"
+msgstr "Non se atoparon resultados"
+
+#: cps/templates/search.html:7
+msgid "Search Term:"
+msgstr "Termo de busca:"
+
+#: cps/templates/search.html:9
+msgid "Results for:"
+msgstr "Resultados para:"
+
+#: cps/templates/search_form.html:21
+msgid "Published Date From"
+msgstr "Data de publicación dende"
+
+#: cps/templates/search_form.html:31
+msgid "Published Date To"
+msgstr "Data de publicación ata"
+
+#: cps/templates/search_form.html:59
+msgid "Exclude Tags"
+msgstr "Excluir etiquetas"
+
+#: cps/templates/search_form.html:77
+msgid "Exclude Series"
+msgstr "Excluir series"
+
+#: cps/templates/search_form.html:95
+msgid "Exclude Shelves"
+msgstr "Excluir andeis"
+
+#: cps/templates/search_form.html:115
+msgid "Exclude Languages"
+msgstr "Excluir linguas"
+
+#: cps/templates/search_form.html:126
+msgid "Extensions"
+msgstr "Extensións"
+
+#: cps/templates/search_form.html:134
+msgid "Exclude Extensions"
+msgstr "Excluir extensións"
+
+#: cps/templates/search_form.html:144
+msgid "Rating Above"
+msgstr "Valoración superior a"
+
+#: cps/templates/search_form.html:148
+msgid "Rating Below"
+msgstr "Valoración inferior a"
+
+#: cps/templates/search_form.html:180
+msgid "From:"
+msgstr "De:"
+
+#: cps/templates/search_form.html:190
+msgid "To:"
+msgstr "Para:"
+
+#: cps/templates/shelf.html:13
+msgid "Delete this Shelf"
+msgstr "Borrar este andel"
+
+#: cps/templates/shelf.html:14
+msgid "Edit Shelf Properties"
+msgstr "Editar propiedades do andel"
+
+#: cps/templates/shelf.html:17
+msgid "Arrange books manually"
+msgstr "Ordear libros manualmente"
+
+#: cps/templates/shelf.html:18
+msgid "Disable Change order"
+msgstr "Desactivar o cambio de orde"
+
+#: cps/templates/shelf.html:18
+msgid "Enable Change order"
+msgstr "Activar o cambio de orde"
+
+#: cps/templates/shelf_edit.html:14
+msgid "Share with Everyone"
+msgstr "Compartir con todos"
+
+#: cps/templates/shelf_edit.html:21
+msgid "Sync this shelf with Kobo device"
+msgstr "Sincronizar este andel cun dispositivo Kobo"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag to Rearrange Order"
+msgstr "Arrastra para reorganizar a orde"
+
+#: cps/templates/shelf_order.html:33
+msgid "Hidden Book"
+msgstr "Libro agochado"
+
+#: cps/templates/stats.html:7
+msgid "Library Statistics"
+msgstr "Estatísticas da Biblioteca"
+
+#: cps/templates/stats.html:12
+msgid "Books in this Library"
+msgstr "Libros nesta biblioteca"
+
+#: cps/templates/stats.html:16
+msgid "Authors in this Library"
+msgstr "Autores nesta biblioteca"
+
+#: cps/templates/stats.html:20
+msgid "Categories in this Library"
+msgstr "Categorías nesta biblioteca"
+
+#: cps/templates/stats.html:24
+msgid "Series in this Library"
+msgstr "Series nesta biblioteca"
+
+#: cps/templates/stats.html:29
+msgid "System Statistics"
+msgstr "Estadísticas do sistema"
+
+#: cps/templates/stats.html:33
+msgid "Program"
+msgstr "Programa"
+
+#: cps/templates/stats.html:34
+msgid "Installed Version"
+msgstr "Versión instalada"
+
+#: cps/templates/tasks.html:12
+msgid "User"
+msgstr "Usuario"
+
+#: cps/templates/tasks.html:14
+msgid "Task"
+msgstr "Tarefa"
+
+#: cps/templates/tasks.html:15
+msgid "Status"
+msgstr "Estado"
+
+#: cps/templates/tasks.html:16
+msgid "Progress"
+msgstr "Progreso"
+
+#: cps/templates/tasks.html:17
+msgid "Run Time"
+msgstr "Tempo de execución"
+
+#: cps/templates/tasks.html:18
+msgid "Start Time"
+msgstr "Hora de inicio"
+
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr "Accións"
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr "Esta tarefa cancelarase. Non se gardará ningún progreso feito por esta tarefa."
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr "Se esta é unha tarefa programada, volverá a lanzarse na próxima hora programada."
+
+#: cps/templates/user_edit.html:20
+msgid "Reset user Password"
+msgstr "Restablecer contrasinal de usuario"
+
+#: cps/templates/user_edit.html:43
+msgid "Language of Books"
+msgstr "Linguaxe de libros"
+
+#: cps/templates/user_edit.html:54
+msgid "OAuth Settings"
+msgstr "Axustes OAuth"
+
+#: cps/templates/user_edit.html:56
+msgid "Link"
+msgstr "Ligar"
+
+#: cps/templates/user_edit.html:58
+msgid "Unlink"
+msgstr "Desligar"
+
+#: cps/templates/user_edit.html:64
+msgid "Kobo Sync Token"
+msgstr "Token de sincronización de Kobo"
+
+#: cps/templates/user_edit.html:66
+msgid "Create/View"
+msgstr "Crear/Ver"
+
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr "Forzar sincronización completa de kobo"
+
+#: cps/templates/user_edit.html:88
+msgid "Add allowed/Denied Custom Column Values"
+msgstr "Engadir columnas de valores propios de Permitidos/Denegados"
+
+#: cps/templates/user_edit.html:137
+msgid "Sync only books in selected shelves with Kobo"
+msgstr "Sincronizar con Kobo soamente os libros dos andeis seleccionados"
+
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
+msgid "Delete User"
+msgstr "Borrar usuario"
+
+#: cps/templates/user_edit.html:159
+msgid "Generate Kobo Auth URL"
+msgstr "Xerar Auth URL de Kobo"
+
+#: cps/templates/user_table.html:80 cps/templates/user_table.html:103
+msgid "Select..."
+msgstr "Selección..."
+
+#: cps/templates/user_table.html:131
+msgid "Edit User"
+msgstr "Editar usuario"
+
+#: cps/templates/user_table.html:134
+msgid "Enter Username"
+msgstr "Introduce o nome do usuario"
+
+#: cps/templates/user_table.html:135
+msgid "Enter E-mail Address"
+msgstr "Introduce o enderezo de correo electrónico"
+
+#: cps/templates/user_table.html:136
+msgid "Enter E-Reader E-mail Address"
+msgstr "Introduce o enderezo de correo electrónico Kindle"
+
+#: cps/templates/user_table.html:136
+msgid "E-Reader E-mail"
+msgstr "Comprobar o correo electrónico"
+
+#: cps/templates/user_table.html:137
+msgid "Locale"
+msgstr "Lingua"
+
+#: cps/templates/user_table.html:138
+msgid "Visible Book Languages"
+msgstr "Linguas de libros visibles"
+
+#: cps/templates/user_table.html:139
+msgid "Edit Allowed Tags"
+msgstr "Editar etiquetas Permitidas"
+
+#: cps/templates/user_table.html:139
+msgid "Allowed Tags"
+msgstr "Etiquetas Permitidas"
+
+#: cps/templates/user_table.html:140
+msgid "Edit Denied Tags"
+msgstr "Editar Etiquetas Denegadas"
+
+#: cps/templates/user_table.html:140
+msgid "Denied Tags"
+msgstr "Etiquetas Denegadas"
+
+#: cps/templates/user_table.html:141
+msgid "Edit Allowed Column Values"
+msgstr "Editar valores permitidos para a columna"
+
+#: cps/templates/user_table.html:141
+msgid "Allowed Column Values"
+msgstr "Valores permitidos da columna"
+
+#: cps/templates/user_table.html:142
+msgid "Edit Denied Column Values"
+msgstr "Editar valores non permitidos para a columna"
+
+#: cps/templates/user_table.html:142
+msgid "Denied Column Values"
+msgstr "Valores non permitidos dea columna"
+
+#: cps/templates/user_table.html:144
+msgid "Change Password"
+msgstr "Cambiar a contrasinal"
+
+#: cps/templates/user_table.html:147
+msgid "View"
+msgstr "Vista"
+
+#: cps/templates/user_table.html:150
+msgid "Edit Public Shelves"
+msgstr "Editar andeis públicos"
+
+#: cps/templates/user_table.html:152
+msgid "Sync selected Shelves with Kobo"
+msgstr "sincronizar andeis seleccionados con Kobo"
+
+#: cps/templates/user_table.html:156
+msgid "Show read/unread selection"
+msgstr "Mostrar selección lidos/non lidos"
+
+#: cps/templates/user_table.html:159
+msgid "Show random books"
+msgstr "Mostrar libros ao chou"
+
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 9f895ccb09394f6207bf5e6f3e4692fc9a2ac282..1ae553ecdf3cf6d4bed3ce1fac3ad8eecab80b66 100644
GIT binary patch
delta 31
ncmZ3wk8$Zf#tm;wxGZ#y%oPj`tPBh%e>3^bXuSE8sj(&iz+wxp

delta 31
ncmZ3wk8$Zf#tm;wxXg8p4HXOxt&A)ue>3^bXt?>4sj(&iz;O$*

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 1aecfe72a..437184ecd 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index b8413516573c36a6b590496fcefc284bce1515b0..87bad995f7bf1596985ad0369b368ef075a6a578 100644
GIT binary patch
delta 32
ocmeBQ&D_75dBdd=E(={Fa|J^KD+9yLcS^(=8I3o8DV-e;0KlXR$^ZZW

delta 32
ocmeBQ&D_75dBdd=E^}RDLj^-aD<jLzcS^(=84WjoDV-e;0Km8l%>V!Z

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index a625e8eb9..52190f841 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index edd663c91489976c6a9b519d860efc585defaca3..a894f1db0e198074728504a55d1f56a9098db8a8 100644
GIT binary patch
delta 32
ncmeBt&)oT*c>_-~mxZp8xq_jAm4V@Av1VCDM&r#UEuqB#vGWQ0

delta 32
ncmeBt&)oT*c>_-~m$|O7p@N~Im67FUv1VCDM#Ie}EuqB#vIhzN

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 74abce633..7774344f0 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: subdiox <subdiox@gmail.com>\n"
 "Language: ja\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index ae8f24dcc9337f4dd06e9f22db1fbe9f7d558179..3b9af33521f5a652ddb1cf67ca5e09afb0911f02 100644
GIT binary patch
delta 31
ncmaF3i}B$u#tk=>xh!;z%oPj`tPBh%KUV(EXuSEhN}B}$$g&I#

delta 31
ncmaF3i}B$u#tk=>xy*Hq4HXOxt&A)uKUV(EXt?>dN}B}$$iWN{

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 8736dc07c..046044137 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index a007f4a1e634a5ed4ad59c7fba656a65d2ab513b..ad7b3967d662704935341ee8fef39b16b477fc02 100644
GIT binary patch
delta 32
ocmZ3voO$JP<_$d+To$@U<_d-eRtAQfr&X+EWHjFFP?Z@80KSn69RL6T

delta 32
ocmZ3voO$JP<_$d+T;{sQh6;v;Rz{Yar&X+EWHj9DP?Z@80KTOQAOHXW

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 9d912a0b8..c4ed17650 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 701d0c3a6e355b26606e4ba310db61c8bff460a0..a5ef30ccdac816ea55f0d125ca7f21480443bcd0 100644
GIT binary patch
delta 37
tcmccikLlV!rVW$xxGZ#y%oPj`tPBh{&&@MsWHRQOEKne_`9*%7KL8X(4RZhh

delta 37
tcmccikLlV!rVW$xxXg8p4HXOxt&A);&&@MsWHRKMEKne_`9*%7KL8YH4R!zk

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 5ac4c332c..b4df92711 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 66a2c88226df7d25ffa29b4468a1f1736790d8cc..4c01ac10ebd6e0ec1841d6044476b1b189b40760 100644
GIT binary patch
delta 32
ocmey|!~D62d4pFzmxZp8xq_jAm4V^rko+u0M&r%<3$}y;0Kd5lVgLXD

delta 32
ocmey|!~D62d4pFzm$|O7p@N~Im67G<ko+u0M#Ihf3$}y;0Kd%(WdHyG

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index a2b77171a..0ff9e9a02 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 7ed2b11bc360bdc99556e5abb7a26396fefe211a..18f5b56c61e4f9cefd75875673be1dd6cf604aa6 100644
GIT binary patch
delta 32
ocmdmcg?aB4<_%w)xGZ#y%oPj`tPBh{|8H_&Vl>|D(E2w80NZyA#{d8T

delta 32
ocmdmcg?aB4<_%w)xXg8p4HXOxt&A);|8H_&Vl>?B(E2w80NaZU$^ZZW

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 8d32c6747..861b8ff57 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index f5980c8294f1be9a65d4c747562565d90863f8e1..ccca28670081edd2d1082dc521919e687e5f557a 100644
GIT binary patch
delta 32
ocmezLis{oUrVZQuxh!;z%oPj`tPBh{AN2QRWHjE)9hja10NWr7f&c&j

delta 32
ocmezLis{oUrVZQuxy*Hq4HXOxt&A);AN2QRWHj8&9hja10NXSRg#Z8m

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 2fbcd8511..1cab90336 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 0d3698ddd6cbe08f6669da2d60e48903d1bafcd8..cda3046bd3bb50d1150c2f6ddb190482a626c352 100644
GIT binary patch
delta 32
ocmeDC$kg|dX+v)gmxZp8xq_jAm4V^r={cH=jK-S}=AQKe0L7ULtN;K2

delta 32
ocmeDC$kg|dX+v)gm$|O7p@N~Im67G<={cH=jE0*J=AQKe0L85fuK)l5

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 6b151de94..3c9228d5e 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 4c369f70609ebfc3437c1004b93301a3c4cedd78..59552cc79dadb9546ddb0aaaac3ebdd6a368e4ac 100644
GIT binary patch
delta 32
ocmX@QhVkec#tm^sTo$@U<_d-eRtAQfGmJzT8I3pB86Q^y0I{M8{Qv*}

delta 32
ocmX@QhVkec#tm^sT;{sQh6;v;Rz{YaGmJzT84Wkr86Q^y0I{|T00000

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 9e76c97d8..3751f2e0e 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index bb864517bc2be0b86a65bc2bb5be875c18debb8d..57e440e0c4d27d6a8962e9fc1a2a025d359cb6be 100644
GIT binary patch
delta 32
ocmcb)hw<hf#tkewTo$@U<_d-eRtAQf`E)WF8I3nr=sq+60I#kI^#A|>

delta 32
ocmcb)hw<hf#tkewT;{sQh6;v;Rz{Ya`E)WF84WjA=sq+60I$Lc_y7O^

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index be4f56d6d..e08f296b3 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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\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,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index d57d3b4120c40a5047700d21dff7077336002404..b72a64b5dfdf3d02cdb20af0eede609f16be7bca 100644
GIT binary patch
delta 32
ocmbQfka_w-<_({kxGZ#y%oPj`tPBh{|7p@@WHjEa(UR{20K?!5IsgCw

delta 32
ocmbQfka_w-<_({kxXg8p4HXOxt&A);|7p@@WHj8Y(UR{20K@bPJpcdz

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 412794f09..ed478ad57 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 0184ea871a0da32144a46641e8f966d3752db390..51cbee38da89897789efdc0cd75c86dd0878dd3a 100644
GIT binary patch
delta 32
ocmZ4ZiD}^{rVS+}To$@U<_d-eRtAQf>q@j48I3ouDlK;g0LKCgNB{r;

delta 32
ocmZ4ZiD}^{rVS+}T;{sQh6;v;Rz{Ya>q@j484WkDDlK;g0LK;!O8@`>

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 3282374aa..4ee775f31 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"
diff --git a/messages.pot b/messages.pot
index 0de4f9bb0..789c4c535 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-07-31 11:29+0200\n"
+"POT-Creation-Date: 2022-08-27 10:01+0200\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.10.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: cps/about.py:84
 msgid "Statistics"

From dc3cafd23d2d087ca77f6dcc90a2e72a300c0cd1 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Aug 2022 10:13:38 +0200
Subject: [PATCH 315/412] Debug message improved (fix for #2516)

---
 cps/kobo.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index c379e9a21..386b658d5 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -958,7 +958,7 @@ def HandleBookDeletionRequest(book_uuid):
 @csrf.exempt
 @kobo.route("/v1/library/<dummy>", methods=["DELETE", "GET"])
 def HandleUnimplementedRequest(dummy=None):
-    log.debug("Unimplemented Library Request received: %s", request.base_url)
+    log.debug("Unimplemented Library Request received: %s (request is forwarded to kobo if configured)", request.base_url)
     return redirect_or_proxy_request()
 
 
@@ -970,7 +970,7 @@ def HandleUnimplementedRequest(dummy=None):
 @kobo.route("/v1/user/recommendations", methods=["GET", "POST"])
 @kobo.route("/v1/analytics/<dummy>", methods=["GET", "POST"])
 def HandleUserRequest(dummy=None):
-    log.debug("Unimplemented User Request received: %s", request.base_url)
+    log.debug("Unimplemented User Request received: %s (request is forwarded to kobo if configured)", request.base_url)
     return redirect_or_proxy_request()
 
 
@@ -1010,7 +1010,7 @@ def handle_getests():
 @kobo.route("/v1/affiliate", methods=["GET", "POST"])
 @kobo.route("/v1/deals", methods=["GET", "POST"])
 def HandleProductsRequest(dummy=None):
-    log.debug("Unimplemented Products Request received: %s", request.base_url)
+    log.debug("Unimplemented Products Request received: %s (request is forwarded to kobo if configured)", request.base_url)
     return redirect_or_proxy_request()
 
 

From e5c8a7ce50593c2aa06735ba36314b31839f6c0e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Aug 2022 10:20:53 +0200
Subject: [PATCH 316/412] Change landing page for issues, to reduce number of
 empty issues

---
 CONTRIBUTING.md               | 4 ++--
 cps/templates/http_error.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c6006ad12..2ab32cf93 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,9 +26,9 @@ The Calibre-Web documentation is hosted in the Github [Wiki](https://github.com/
 
 Do not open up a GitHub issue if the bug is a **security vulnerability** in Calibre-Web. Instead, please write an email to "ozzie.fernandez.isaacs@googlemail.com".
 
-Ensure the ***bug was not already reported** by searching on GitHub under [Issues](https://github.com/janeczku/calibre-web/issues). Please also check if a solution for your problem can be found in the [wiki](https://github.com/janeczku/calibre-web/wiki).
+Ensure the **bug was not already reported** by searching on GitHub under [Issues](https://github.com/janeczku/calibre-web/issues). Please also check if a solution for your problem can be found in the [wiki](https://github.com/janeczku/calibre-web/wiki).
 
-If you're unable to find an **open issue** addressing the problem, open a [new one](https://github.com/janeczku/calibre-web/issues/new?assignees=&labels=&template=bug_report.md&title=). Be sure to include a **title** and **clear description**, as much relevant information as possible, the **issue form** helps you providing the right information. Deleting the form and just pasting the stack trace doesn't speed up fixing the problem. If your issue could be resolved, consider closing the issue.
+If you're unable to find an **open issue** addressing the problem, open a [new one](https://github.com/janeczku/calibre-web/issues/new/choose). Be sure to include a **title** and **clear description**, as much relevant information as possible, the **issue form** helps you providing the right information. Deleting the form and just pasting the stack trace doesn't speed up fixing the problem. If your issue could be resolved, consider closing the issue.
 
 ### **Feature Request**
 
diff --git a/cps/templates/http_error.html b/cps/templates/http_error.html
index 8abd0c16b..103d10851 100644
--- a/cps/templates/http_error.html
+++ b/cps/templates/http_error.html
@@ -38,7 +38,7 @@
   {% if issue %}
     <div class="row">
     <div class="col errorlink">Please report this issue with all related information:
-        <a href="https://github.com/janeczku/calibre-web/issues/new?assignees=&labels=&template=bug_report.md&title=">{{_('Create Issue')}}</a>
+        <a href="https://github.com/janeczku/calibre-web/issues/new/choose=">{{_('Create Issue')}}</a>
     </div>
       </div>
     {% endif %}

From ec8844c7d4440a8338372f6cff352e1f0c038033 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Aug 2022 15:44:21 +0200
Subject: [PATCH 317/412] Make pyPDF2 again to the favorite pdf metadata
 extractor

---
 cps/uploader.py  | 15 +++++++++------
 requirements.txt |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cps/uploader.py b/cps/uploader.py
index 92035356a..ecf4868cc 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -37,16 +37,15 @@ except (ImportError, RuntimeError) as e:
     use_generic_pdf_cover = True
 
 try:
-    from PyPDF3 import PdfFileReader
-    from PyPDF3 import __version__ as PyPdfVersion
+    from PyPDF2 import PdfFileReader
     use_pdf_meta = True
 except ImportError as ex:
+    log.debug('PyPDF2 is recommended for best performance in metadata extracting from pdf files: %s', ex)
     try:
-        from PyPDF2 import PdfFileReader
-        from PyPDF2 import __version__ as PyPdfVersion
+        from PyPDF3 import PdfFileReader
         use_pdf_meta = True
     except ImportError as e:
-        log.debug('Cannot import PyPDF3/PyPDF2, extracting pdf metadata will not work: %s / %s', ex, e)
+        log.debug('Cannot import PyPDF3/PyPDF2, extracting pdf metadata will not work: %s / %s', e)
         use_pdf_meta = False
 
 try:
@@ -114,7 +113,7 @@ def parse_xmp(pdf_file):
     try:
         xmp_info = pdf_file.getXmpMetadata()
     except Exception as ex:
-        log.debug('Can not read XMP metadata {}'.format(ex))
+        log.debug('Can not read PDF XMP metadata {}'.format(ex))
         return None
 
     if xmp_info:
@@ -160,6 +159,10 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         with open(tmp_file_path, 'rb') as f:
             pdf_file = PdfFileReader(f)
             doc_info = pdf_file.getDocumentInfo()
+            try:
+                doc_info = pdf_file.getDocumentInfo()
+            except Exception as exc:
+                log.debug('Can not read PDF DocumentInfo {}'.format(exc))
             xmp_info = parse_xmp(pdf_file)
 
     if xmp_info:
diff --git a/requirements.txt b/requirements.txt
index acaf4a403..0c20c71d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
 Flask>=1.0.2,<2.1.0
 iso-639>=0.4.5,<0.5.0
-PyPDF3>=1.0.0,<1.0.7
+PyPDF2>=1.20,<2.11.0
 pytz>=2016.10
 requests>=2.11.1,<2.28.0
 SQLAlchemy>=1.3.0,<1.5.0

From 89d226e36b229933663a11c6179b990e935485bb Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 28 Aug 2022 15:54:43 +0200
Subject: [PATCH 318/412] Allow deletion of kindle email address and force
 e-mail address to be valid

---
 cps/admin.py  |  7 +++++--
 cps/helper.py | 12 +++++++-----
 cps/web.py    |  7 +++++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index f222be026..d47bfc3f7 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1960,8 +1960,11 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
         if to_save.get("locale"):
             content.locale = to_save["locale"]
         try:
-            if to_save.get("email", content.email) != content.email:
-                content.email = check_email(to_save["email"])
+            new_email = check_email(to_save.get("email", content.email))
+            if not new_email:
+                raise Exception(_(u"E-Mail Address can't be empty and has to be a valid E-Mail"))
+            if new_email != content.email:
+                content.email = new_email
             # Query username, if not existing, change
             if to_save.get("name", content.name) != content.name:
                 if to_save.get("name") == "Guest":
diff --git a/cps/helper.py b/cps/helper.py
index c427b4833..5c929944a 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -654,11 +654,13 @@ def check_username(username):
 
 def valid_email(email):
     email = email.strip()
-    # 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])?)*$",
-                     email):
-        log.error(u"Invalid e-mail address format")
-        raise Exception(_(u"Invalid e-mail address format"))
+    # if email is not deleted
+    if email:
+        # 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])?)*$",
+                         email):
+            log.error(u"Invalid e-mail address format")
+            raise Exception(_(u"Invalid e-mail address format"))
     return email
 
 # ################################# External interface #################################
diff --git a/cps/web.py b/cps/web.py
index 9c7d527c1..cbfa50c45 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1364,8 +1364,11 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
     try:
         if to_save.get("kindle_mail", current_user.kindle_mail) != current_user.kindle_mail:
             current_user.kindle_mail = valid_email(to_save.get("kindle_mail"))
-        if to_save.get("email", current_user.email) != current_user.email:
-            current_user.email = check_email(to_save.get("email"))
+        new_email = check_email(to_save.get("email", current_user.email))
+        if not new_email:
+            raise Exception(_(u"E-Mail Address can't be empty and has to be a valid E-Mail"))
+        if new_email != current_user.email:
+            current_user.email = new_email
         if current_user.role_admin():
             if to_save.get("name", current_user.name) != current_user.name:
                 # Query username, if not existing, change

From bf0375d51d17d0c5992da47e7888002c562728fd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 28 Aug 2022 15:59:25 +0200
Subject: [PATCH 319/412] Bugfix change emails

---
 cps/admin.py | 4 ++--
 cps/web.py   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index d47bfc3f7..b70beab5a 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1960,11 +1960,11 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
         if to_save.get("locale"):
             content.locale = to_save["locale"]
         try:
-            new_email = check_email(to_save.get("email", content.email))
+            new_email = valid_email(to_save.get("email", content.email))
             if not new_email:
                 raise Exception(_(u"E-Mail Address can't be empty and has to be a valid E-Mail"))
             if new_email != content.email:
-                content.email = new_email
+                content.email = check_email(new_email)
             # Query username, if not existing, change
             if to_save.get("name", content.name) != content.name:
                 if to_save.get("name") == "Guest":
diff --git a/cps/web.py b/cps/web.py
index cbfa50c45..579d388ad 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1364,11 +1364,11 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
     try:
         if to_save.get("kindle_mail", current_user.kindle_mail) != current_user.kindle_mail:
             current_user.kindle_mail = valid_email(to_save.get("kindle_mail"))
-        new_email = check_email(to_save.get("email", current_user.email))
+        new_email = valid_email(to_save.get("email", current_user.email))
         if not new_email:
             raise Exception(_(u"E-Mail Address can't be empty and has to be a valid E-Mail"))
         if new_email != current_user.email:
-            current_user.email = new_email
+            current_user.email = check_email(new_email)
         if current_user.role_admin():
             if to_save.get("name", current_user.name) != current_user.name:
                 # Query username, if not existing, change

From a9b20ca136d194d323d5c3cb88aa1d02940ef56a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 29 Aug 2022 19:08:04 +0200
Subject: [PATCH 320/412] Fix for big database not showing tags

---
 cps/web.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/web.py b/cps/web.py
index 579d388ad..e1b69ce9c 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1087,7 +1087,7 @@ def category_list():
             order_no = 1
         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(order).filter(calibre_db.common_filters()) \
-            .group_by(text('books_tags_link.tag')).all()
+            .group_by(db.Tags.id).all()
         no_tag_count = (calibre_db.session.query(db.Books)
                          .outerjoin(db.books_tags_link).outerjoin(db.Tags)
                         .filter(db.Tags.name == None)

From 7750ebde0f9e248acbd87cb0c4dc4d0f2e1b8a4a Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 5 Sep 2022 19:42:02 +0200
Subject: [PATCH 321/412] Update pdf Reader

---
 .key                                          |     1 +
 .../libs/images/findbarButton-next-dark.svg   |     6 -
 .../images/findbarButton-previous-dark.svg    |     5 -
 cps/static/css/libs/images/grab.cur           |   Bin 326 -> 0 bytes
 cps/static/css/libs/images/grabbing.cur       |   Bin 326 -> 0 bytes
 ...yToolbarButton-documentProperties-dark.svg |    16 -
 .../secondaryToolbarButton-firstPage-dark.svg |     2 -
 .../secondaryToolbarButton-handTool-dark.svg  |     2 -
 .../secondaryToolbarButton-lastPage-dark.svg  |     2 -
 .../secondaryToolbarButton-rotateCcw-dark.svg |     2 -
 .../secondaryToolbarButton-rotateCw-dark.svg  |     5 -
 ...aryToolbarButton-scrollHorizontal-dark.svg |     2 -
 .../secondaryToolbarButton-scrollPage.svg     |     1 +
 ...ndaryToolbarButton-scrollVertical-dark.svg |     2 -
 ...ondaryToolbarButton-scrollWrapped-dark.svg |     2 -
 ...secondaryToolbarButton-selectTool-dark.svg |     5 -
 ...secondaryToolbarButton-spreadEven-dark.svg |     2 -
 ...secondaryToolbarButton-spreadNone-dark.svg |     2 -
 .../secondaryToolbarButton-spreadOdd-dark.svg |     2 -
 .../images/toolbarButton-bookmark-dark.svg    |     2 -
 .../toolbarButton-currentOutlineItem.svg      |     1 +
 .../images/toolbarButton-download-dark.svg    |     5 -
 .../images/toolbarButton-editorFreeText.svg   |    24 +
 .../libs/images/toolbarButton-editorInk.svg   |     9 +
 .../images/toolbarButton-menuArrow-dark.svg   |     1 -
 .../images/toolbarButton-openFile-dark.svg    |     5 -
 .../images/toolbarButton-pageDown-dark.svg    |     8 -
 .../libs/images/toolbarButton-pageUp-dark.svg |    13 -
 .../toolbarButton-presentationMode-dark.svg   |     2 -
 .../libs/images/toolbarButton-print-dark.svg  |     5 -
 .../libs/images/toolbarButton-search-dark.svg |     5 -
 ...lbarButton-secondaryToolbarToggle-dark.svg |     5 -
 .../toolbarButton-sidebarToggle-dark.svg      |     5 -
 .../toolbarButton-viewAttachments-dark.svg    |     2 -
 .../images/toolbarButton-viewLayers-dark.svg  |     1 -
 .../images/toolbarButton-viewOutline-dark.svg |     2 -
 .../toolbarButton-viewThumbnail-dark.svg      |     5 -
 .../libs/images/toolbarButton-zoomIn-dark.svg |     5 -
 .../images/toolbarButton-zoomOut-dark.svg     |     5 -
 .../libs/images/treeitem-collapsed-dark.svg   |     2 -
 .../libs/images/treeitem-expanded-dark.svg    |     2 -
 cps/static/css/libs/viewer.css                |  4251 +-
 cps/static/js/libs/pdf.js                     | 18539 +--
 cps/static/js/libs/pdf.worker.js              | 94870 ++++++++++------
 cps/static/js/libs/viewer.js                  | 16248 +--
 cps/static/locale/ach/viewer.properties       |     7 -
 cps/static/locale/af/viewer.properties        |     7 -
 cps/static/locale/an/viewer.properties        |    75 +-
 cps/static/locale/ar/viewer.properties        |    21 +-
 cps/static/locale/ast/viewer.properties       |   129 +-
 cps/static/locale/az/viewer.properties        |    17 +-
 cps/static/locale/be/viewer.properties        |    52 +-
 cps/static/locale/bg/viewer.properties        |     7 -
 cps/static/locale/bn/viewer.properties        |    11 +-
 cps/static/locale/bo/viewer.properties        |     7 -
 cps/static/locale/br/viewer.properties        |    55 +-
 cps/static/locale/brx/viewer.properties       |     6 -
 cps/static/locale/bs/viewer.properties        |     7 -
 cps/static/locale/ca/viewer.properties        |    23 +-
 cps/static/locale/cak/viewer.properties       |    17 +-
 cps/static/locale/ckb/viewer.properties       |   126 +-
 cps/static/locale/cs/viewer.properties        |    50 +-
 cps/static/locale/cy/viewer.properties        |    66 +-
 cps/static/locale/da/viewer.properties        |    36 +-
 cps/static/locale/de/viewer.properties        |    52 +-
 cps/static/locale/dsb/viewer.properties       |    52 +-
 cps/static/locale/el/viewer.properties        |    90 +-
 cps/static/locale/en-CA/viewer.properties     |    48 +-
 cps/static/locale/en-GB/viewer.properties     |    56 +-
 cps/static/locale/en-US/viewer.properties     |    41 +-
 cps/static/locale/eo/viewer.properties        |    50 +-
 cps/static/locale/es-AR/viewer.properties     |    50 +-
 cps/static/locale/es-CL/viewer.properties     |    60 +-
 cps/static/locale/es-ES/viewer.properties     |    38 +-
 cps/static/locale/es-MX/viewer.properties     |    50 +-
 cps/static/locale/et/viewer.properties        |    36 +-
 cps/static/locale/eu/viewer.properties        |    38 +-
 cps/static/locale/fa/viewer.properties        |     7 -
 cps/static/locale/ff/viewer.properties        |     7 -
 cps/static/locale/fi/viewer.properties        |    36 +-
 cps/static/locale/fr/viewer.properties        |    48 +-
 cps/static/locale/fy-NL/viewer.properties     |    52 +-
 cps/static/locale/ga-IE/viewer.properties     |    30 +-
 cps/static/locale/gd/viewer.properties        |    21 +-
 cps/static/locale/gl/viewer.properties        |    17 +-
 cps/static/locale/gn/viewer.properties        |    50 +-
 cps/static/locale/gu-IN/viewer.properties     |     7 -
 cps/static/locale/he/viewer.properties        |    56 +-
 cps/static/locale/hi-IN/viewer.properties     |     9 -
 cps/static/locale/hr/viewer.properties        |    29 +-
 cps/static/locale/hsb/viewer.properties       |    52 +-
 cps/static/locale/hu/viewer.properties        |    50 +-
 cps/static/locale/hy-AM/viewer.properties     |     9 -
 cps/static/locale/hye/viewer.properties       |    27 +-
 cps/static/locale/ia/viewer.properties        |    54 +-
 cps/static/locale/id/viewer.properties        |    50 +-
 cps/static/locale/is/viewer.properties        |    67 +-
 cps/static/locale/it/viewer.properties        |    44 +-
 cps/static/locale/ja/viewer.properties        |    71 +-
 cps/static/locale/ka/viewer.properties        |    78 +-
 cps/static/locale/kab/viewer.properties       |    54 +-
 cps/static/locale/kk/viewer.properties        |    49 +-
 cps/static/locale/km/viewer.properties        |    40 +-
 cps/static/locale/kn/viewer.properties        |     6 -
 cps/static/locale/ko/viewer.properties        |    72 +-
 cps/static/locale/lij/viewer.properties       |     7 -
 cps/static/locale/lo/viewer.properties        |     7 -
 cps/static/locale/locale.properties           |    12 +
 cps/static/locale/lt/viewer.properties        |    42 +-
 cps/static/locale/ltg/viewer.properties       |     7 -
 cps/static/locale/lv/viewer.properties        |     7 -
 cps/static/locale/mk/viewer.properties        |     6 -
 cps/static/locale/mr/viewer.properties        |     7 -
 cps/static/locale/ms/viewer.properties        |     7 -
 cps/static/locale/my/viewer.properties        |     7 -
 cps/static/locale/nb-NO/viewer.properties     |    50 +-
 cps/static/locale/ne-NP/viewer.properties     |    46 +-
 cps/static/locale/nl/viewer.properties        |    45 +-
 cps/static/locale/nn-NO/viewer.properties     |    50 +-
 cps/static/locale/oc/viewer.properties        |    78 +-
 cps/static/locale/pa-IN/viewer.properties     |    56 +-
 cps/static/locale/pl/viewer.properties        |    52 +-
 cps/static/locale/pt-BR/viewer.properties     |    80 +-
 cps/static/locale/pt-PT/viewer.properties     |    50 +-
 cps/static/locale/rm/viewer.properties        |    30 +-
 cps/static/locale/ro/viewer.properties        |    11 +-
 cps/static/locale/ru/viewer.properties        |    52 +-
 cps/static/locale/sat/viewer.properties       |   197 +
 cps/static/locale/sc/viewer.properties        |   239 +
 cps/static/locale/sco/viewer.properties       |   248 +
 cps/static/locale/si/viewer.properties        |   151 +-
 cps/static/locale/sk/viewer.properties        |    56 +-
 cps/static/locale/sl/viewer.properties        |    50 +-
 cps/static/locale/son/viewer.properties       |     7 -
 cps/static/locale/sq/viewer.properties        |    20 +-
 cps/static/locale/sr/viewer.properties        |    36 +-
 cps/static/locale/sv-SE/viewer.properties     |    49 +-
 cps/static/locale/szl/viewer.properties       |    27 +-
 cps/static/locale/ta/viewer.properties        |     7 -
 cps/static/locale/te/viewer.properties        |     8 +-
 cps/static/locale/tg/viewer.properties        |   281 +
 cps/static/locale/th/viewer.properties        |    35 +-
 cps/static/locale/tl/viewer.properties        |   143 +-
 cps/static/locale/tr/viewer.properties        |    50 +-
 cps/static/locale/trs/viewer.properties       |     7 -
 cps/static/locale/uk/viewer.properties        |    54 +-
 cps/static/locale/ur/viewer.properties        |    11 +-
 cps/static/locale/uz/viewer.properties        |     6 -
 cps/static/locale/vi/viewer.properties        |    52 +-
 cps/static/locale/wo/viewer.properties        |     2 -
 cps/static/locale/xh/viewer.properties        |     7 -
 cps/static/locale/zh-CN/viewer.properties     |    52 +-
 cps/static/locale/zh-TW/viewer.properties     |    52 +-
 cps/static/standard_fonts/FoxitDingbats.pfb   |   Bin 0 -> 29513 bytes
 cps/static/standard_fonts/FoxitFixed.pfb      |   Bin 0 -> 17597 bytes
 cps/static/standard_fonts/FoxitFixedBold.pfb  |   Bin 0 -> 18055 bytes
 .../standard_fonts/FoxitFixedBoldItalic.pfb   |   Bin 0 -> 19151 bytes
 .../standard_fonts/FoxitFixedItalic.pfb       |   Bin 0 -> 18746 bytes
 cps/static/standard_fonts/FoxitSans.pfb       |   Bin 0 -> 15025 bytes
 cps/static/standard_fonts/FoxitSansBold.pfb   |   Bin 0 -> 16344 bytes
 .../standard_fonts/FoxitSansBoldItalic.pfb    |   Bin 0 -> 16418 bytes
 cps/static/standard_fonts/FoxitSansItalic.pfb |   Bin 0 -> 16339 bytes
 cps/static/standard_fonts/FoxitSerif.pfb      |   Bin 0 -> 19469 bytes
 cps/static/standard_fonts/FoxitSerifBold.pfb  |   Bin 0 -> 19395 bytes
 .../standard_fonts/FoxitSerifBoldItalic.pfb   |   Bin 0 -> 20733 bytes
 .../standard_fonts/FoxitSerifItalic.pfb       |   Bin 0 -> 21227 bytes
 cps/static/standard_fonts/FoxitSymbol.pfb     |   Bin 0 -> 16729 bytes
 cps/static/standard_fonts/LICENSE_FOXIT       |    27 +
 cps/static/standard_fonts/LICENSE_LIBERATION  |   102 +
 .../standard_fonts/LiberationSans-Bold.ttf    |   Bin 0 -> 137052 bytes
 .../LiberationSans-BoldItalic.ttf             |   Bin 0 -> 135124 bytes
 .../standard_fonts/LiberationSans-Italic.ttf  |   Bin 0 -> 162036 bytes
 .../standard_fonts/LiberationSans-Regular.ttf |   Bin 0 -> 139512 bytes
 cps/templates/readpdf.html                    |   392 +-
 174 files changed, 88719 insertions(+), 50911 deletions(-)
 create mode 100644 .key
 delete mode 100644 cps/static/css/libs/images/findbarButton-next-dark.svg
 delete mode 100644 cps/static/css/libs/images/findbarButton-previous-dark.svg
 delete mode 100644 cps/static/css/libs/images/grab.cur
 delete mode 100644 cps/static/css/libs/images/grabbing.cur
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-documentProperties-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-firstPage-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-handTool-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-lastPage-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-rotateCcw-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-rotateCw-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-scrollHorizontal-dark.svg
 create mode 100644 cps/static/css/libs/images/secondaryToolbarButton-scrollPage.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-scrollVertical-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-scrollWrapped-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-selectTool-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-spreadEven-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-spreadNone-dark.svg
 delete mode 100644 cps/static/css/libs/images/secondaryToolbarButton-spreadOdd-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-bookmark-dark.svg
 create mode 100644 cps/static/css/libs/images/toolbarButton-currentOutlineItem.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-download-dark.svg
 create mode 100644 cps/static/css/libs/images/toolbarButton-editorFreeText.svg
 create mode 100644 cps/static/css/libs/images/toolbarButton-editorInk.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-menuArrow-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-openFile-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-pageDown-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-pageUp-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-presentationMode-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-print-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-search-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-secondaryToolbarToggle-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-sidebarToggle-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-viewAttachments-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-viewLayers-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-viewOutline-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-viewThumbnail-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-zoomIn-dark.svg
 delete mode 100644 cps/static/css/libs/images/toolbarButton-zoomOut-dark.svg
 delete mode 100644 cps/static/css/libs/images/treeitem-collapsed-dark.svg
 delete mode 100644 cps/static/css/libs/images/treeitem-expanded-dark.svg
 create mode 100644 cps/static/locale/sat/viewer.properties
 create mode 100644 cps/static/locale/sc/viewer.properties
 create mode 100644 cps/static/locale/sco/viewer.properties
 create mode 100644 cps/static/locale/tg/viewer.properties
 create mode 100644 cps/static/standard_fonts/FoxitDingbats.pfb
 create mode 100644 cps/static/standard_fonts/FoxitFixed.pfb
 create mode 100644 cps/static/standard_fonts/FoxitFixedBold.pfb
 create mode 100644 cps/static/standard_fonts/FoxitFixedBoldItalic.pfb
 create mode 100644 cps/static/standard_fonts/FoxitFixedItalic.pfb
 create mode 100644 cps/static/standard_fonts/FoxitSans.pfb
 create mode 100644 cps/static/standard_fonts/FoxitSansBold.pfb
 create mode 100644 cps/static/standard_fonts/FoxitSansBoldItalic.pfb
 create mode 100644 cps/static/standard_fonts/FoxitSansItalic.pfb
 create mode 100644 cps/static/standard_fonts/FoxitSerif.pfb
 create mode 100644 cps/static/standard_fonts/FoxitSerifBold.pfb
 create mode 100644 cps/static/standard_fonts/FoxitSerifBoldItalic.pfb
 create mode 100644 cps/static/standard_fonts/FoxitSerifItalic.pfb
 create mode 100644 cps/static/standard_fonts/FoxitSymbol.pfb
 create mode 100644 cps/static/standard_fonts/LICENSE_FOXIT
 create mode 100644 cps/static/standard_fonts/LICENSE_LIBERATION
 create mode 100644 cps/static/standard_fonts/LiberationSans-Bold.ttf
 create mode 100644 cps/static/standard_fonts/LiberationSans-BoldItalic.ttf
 create mode 100644 cps/static/standard_fonts/LiberationSans-Italic.ttf
 create mode 100644 cps/static/standard_fonts/LiberationSans-Regular.ttf

diff --git a/.key b/.key
new file mode 100644
index 000000000..905cf23a6
--- /dev/null
+++ b/.key
@@ -0,0 +1 @@
+onLmA_LND5S8jNSvi8nNSGwevE13f7t8pW-wgWAXZgo=
\ No newline at end of file
diff --git a/cps/static/css/libs/images/findbarButton-next-dark.svg b/cps/static/css/libs/images/findbarButton-next-dark.svg
deleted file mode 100644
index 80df70bc1..000000000
--- a/cps/static/css/libs/images/findbarButton-next-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M8 12a1 1 0 0 1-.707-.293l-5-5a1 1 0 0 1 1.414-1.414L8
-9.586l4.293-4.293a1 1 0 0 1 1.414 1.414l-5 5A1 1 0 0 1 8 12z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/findbarButton-previous-dark.svg b/cps/static/css/libs/images/findbarButton-previous-dark.svg
deleted file mode 100644
index d304a9b8c..000000000
--- a/cps/static/css/libs/images/findbarButton-previous-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M13 11a1 1 0 0 1-.707-.293L8 6.414l-4.293 4.293a1 1 0 0 1-1.414-1.414l5-5a1 1 0 0 1 1.414 0l5 5A1 1 0 0 1 13 11z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/grab.cur b/cps/static/css/libs/images/grab.cur
deleted file mode 100644
index db7ad5aed3ef958aa13903afa769386382a87ad3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmajZAr8Vo5QX7?si;7#!yvj6Nx}i(C<r8XV2@Ub;|e_h36+S3$J>G{p)>hLyxD99
z76ej)=-vic0UL9~!GgO~9_MsOnufoUx`QHG)5E@a!o?nT8@#*2`fMlI9X~2&%Qwtd
fAElzRww7{H`T9z)QIL|gUwP@h-(DMO`2YPI1=f8x

diff --git a/cps/static/css/libs/images/grabbing.cur b/cps/static/css/libs/images/grabbing.cur
deleted file mode 100644
index e0dfd04e4d3fcbaa6588c8cbb9e9065609bcb862..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmZQzU}9ioP*7lC;0HnjMg|5k1_lNVAO;FCH~=vt5Q0Dhn8YOh|NoCEh)sn30RsaF
z^8>N`2L=Xv5dHz=L$Uk|1_tQ_266z<4TQl5{{R0$_yG_fVE_NW0fd=>Y#@FBr9t9P
K<`XsxO$7j30D*Y`

diff --git a/cps/static/css/libs/images/secondaryToolbarButton-documentProperties-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-documentProperties-dark.svg
deleted file mode 100644
index 306e628d7..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-documentProperties-dark.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16
-16"
-fill="rgba(255,255,255,1)">
-<path 
-   d="M8 16a8 8 0 1 1 8-8 8.009 8.009 0 0 1-8 8zM8 2a6 6 0 1 0 6 6 6.006 6.006 0 0 0-6-6z">
-</path>
-<path 
-   d="M8 7a1 1 0 0 0-1 1v3a1 1 0 0 0 2 0V8a1 1 0 0 0-1-1z">
-</path>
-<circle
-   cx="8" cy="5" r="1.188">
-</circle>
-</svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-firstPage-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-firstPage-dark.svg
deleted file mode 100644
index c13ff8671..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-firstPage-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
-fill="rgba(255,255,255,1)"><path d="M13 13c-.3 0-.5-.1-.7-.3L8 8.4l-4.3 4.3c-.9.9-2.3-.5-1.4-1.4l5-5c.4-.4 1-.4 1.4 0l5 5c.6.6.2 1.7-.7 1.7zm0-11H3C1.7 2 1.7 4 3 4h10c1.3 0 1.3-2 0-2z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-handTool-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-handTool-dark.svg
deleted file mode 100644
index 834d8b0da..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-handTool-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-fill="rgba(255,255,255,1)"><path d="M15 3.7V13c0 1.5-1.53 3-3 3H7.13c-.72 0-1.63-.5-2.13-1l-5-5s.84-1 .87-1c.13-.1.33-.2.53-.2.1 0 .3.1.4.2L4 10.6V2.7c0-.6.4-1 1-1s1 .4 1 1v4.6h1V1c0-.6.4-1 1-1s1 .4 1 1v6.3h1V1.7c0-.6.4-1 1-1s1 .4 1 1v5.7h1V3.7c0-.6.4-1 1-1s1 .4 1 1z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-lastPage-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-lastPage-dark.svg
deleted file mode 100644
index 8633e420a..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-lastPage-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
-fill="rgba(255,255,255,1)"><path d="M8 10c-.3 0-.5-.1-.7-.3l-5-5c-.9-.9.5-2.3 1.4-1.4L8 7.6l4.3-4.3c.9-.9 2.3.5 1.4 1.4l-5 5c-.2.2-.4.3-.7.3zm5 2H3c-1.3 0-1.3 2 0 2h10c1.3 0 1.3-2 0-2z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-rotateCcw-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-rotateCcw-dark.svg
deleted file mode 100644
index 1a92f802c..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-rotateCcw-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-fill="rgba(255,255,255,1)"><path d="M1 1a1 1 0 011 1v2.4A7 7 0 118 15a7 7 0 01-4.9-2 1 1 0 011.4-1.5 5 5 0 10-1-5.5H6a1 1 0 010 2H1a1 1 0 01-1-1V2a1 1 0 011-1z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-rotateCw-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-rotateCw-dark.svg
deleted file mode 100644
index 2a4ef7385..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-rotateCw-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M15 1a1 1 0 0 0-1 1v2.418A6.995 6.995 0 1 0 8 15a6.954 6.954 0 0 0 4.95-2.05 1 1 0 0 0-1.414-1.414A5.019 5.019 0 1 1 12.549 6H10a1 1 0 0 0 0 2h5a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-scrollHorizontal-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-scrollHorizontal-dark.svg
deleted file mode 100644
index 337f85ef4..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-scrollHorizontal-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-fill="rgba(255,255,255,1)"><path d="M0 4h1.5c1 0 1.5.5 1.5 1.5v5c0 1-.5 1.5-1.5 1.5H0zM9.5 4c1 0 1.5.5 1.5 1.5v5c0 1-.5 1.5-1.5 1.5h-3c-1 0-1.5-.5-1.5-1.5v-5C5 4.5 5.5 4 6.5 4zM16 4h-1.5c-1 0-1.5.5-1.5 1.5v5c0 1 .5 1.5 1.5 1.5H16z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-scrollPage.svg b/cps/static/css/libs/images/secondaryToolbarButton-scrollPage.svg
new file mode 100644
index 000000000..bea2f0d67
--- /dev/null
+++ b/cps/static/css/libs/images/secondaryToolbarButton-scrollPage.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M9.5 4c1 0 1.5.5 1.5 1.5v5c0 1-.5 1.5-1.5 1.5h-3c-1 0-1.5-.5-1.5-1.5v-5C5 4.5 5.5 4 6.5 4z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-scrollVertical-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-scrollVertical-dark.svg
deleted file mode 100644
index 41bdd8f14..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-scrollVertical-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-fill="rgba(255,255,255,1)"><path d="M9.5 4c1 0 1.5.5 1.5 1.5v5c0 1-.5 1.5-1.5 1.5h-3c-1 0-1.5-.5-1.5-1.5v-5C5 4.5 5.5 4 6.5 4zM11 0v.5c0 1-.5 1.5-1.5 1.5h-3C5.5 2 5 1.5 5 .5V0h6zM11 16v-.5c0-1-.5-1.5-1.5-1.5h-3c-1 0-1.5.5-1.5 1.5v.5h6z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-scrollWrapped-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-scrollWrapped-dark.svg
deleted file mode 100644
index cd50526ff..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-scrollWrapped-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
-fill="rgba(255,255,255,1)"><path d="M5.5 4c1 0 1.5.5 1.5 1.5v5c0 1-.5 1.5-1.5 1.5h-3c-1 0-1.5-.5-1.5-1.5v-5C1 4.5 1.5 4 2.5 4zM7 0v.5C7 1.5 6.5 2 5.5 2h-3C1.5 2 1 1.5 1 .5V0h6zM7 16v-.5c0-1-.5-1.5-1.5-1.5h-3c-1 0-1.5.5-1.5 1.5v.5h6zM13.5 4c1 0 1.5.5 1.5 1.5v5c0 1-.5 1.5-1.5 1.5h-3c-1 0-1.5-.5-1.5-1.5v-5c0-1 .5-1.5 1.5-1.5zM15 0v.5c0 1-.5 1.5-1.5 1.5h-3C9.5 2 9 1.5 9 .5V0h6zM15 16v-.507c0-1-.5-1.5-1.5-1.5h-3C9.5 14 9 14.5 9 15.5v.5h6z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-selectTool-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-selectTool-dark.svg
deleted file mode 100644
index 7a95098af..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-selectTool-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M12.408 8.217l-8.083-6.7A.2.2 0 0 0 4 1.672V12.3a.2.2 0 0 0 .333.146l2.56-2.372 1.857 3.9A1.125 1.125 0 1 0 10.782 13L8.913 9.075l3.4-.51a.2.2 0 0 0 .095-.348z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-spreadEven-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-spreadEven-dark.svg
deleted file mode 100644
index 0c9586ed8..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-spreadEven-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
-fill="rgba(255,255,255,1)"><path d="M1.5 3.5C.5 3.5 0 4 0 5v6.5c0 1 .5 1.5 1.5 1.5h4c1 0 1.5-.5 1.5-1.5V5c0-1-.5-1.5-1.5-1.5zm2 1.2c.8 0 1.4.2 1.8.6.5.4.7 1 .7 1.7 0 .5-.2 1-.5 1.4-.2.3-.5.7-1 1l-.6.4c-.4.3-.6.4-.75.56-.15.14-.25.24-.35.44H6v1.3H1c0-.6.1-1.1.3-1.5.3-.6.7-1 1.5-1.6.7-.4 1.1-.8 1.28-1 .32-.3.42-.6.42-1 0-.3-.1-.6-.23-.8-.17-.2-.37-.3-.77-.3s-.7.1-.9.5c-.04.2-.1.5-.1.9H1.1c0-.6.1-1.1.3-1.5.4-.7 1.1-1.1 2.1-1.1zM10.54 3.54C9.5 3.54 9 4 9 5v6.5c0 1 .5 1.5 1.54 1.5h4c.96 0 1.46-.5 1.46-1.5V5c0-1-.5-1.46-1.5-1.46zm1.9.95c.7 0 1.3.2 1.7.5.4.4.6.8.6 1.4 0 .4-.1.8-.4 1.1-.2.2-.3.3-.5.4.1 0 .3.1.6.3.4.3.5.8.5 1.4 0 .6-.2 1.2-.6 1.6-.4.5-1.1.7-1.9.7-1 0-1.8-.3-2.2-1-.14-.29-.24-.69-.24-1.29h1.4c0 .3 0 .5.1.7.2.4.5.5 1 .5.3 0 .5-.1.7-.3.2-.2.3-.5.3-.8 0-.5-.2-.8-.6-.95-.2-.05-.5-.15-1-.15v-1c.5 0 .8-.1 1-.14.3-.1.5-.4.5-.9 0-.3-.1-.5-.2-.7-.2-.2-.4-.3-.7-.3-.3 0-.6.1-.75.3-.2.2-.2.5-.2.86h-1.34c0-.4.1-.7.19-1.1 0-.12.2-.32.4-.62.2-.2.4-.3.7-.4.3-.1.6-.1 1-.1z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-spreadNone-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-spreadNone-dark.svg
deleted file mode 100644
index 75e1b985d..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-spreadNone-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-fill="rgba(255,255,255,1)"><path d="M6 3c-1 0-1.5.5-1.5 1.5v7c0 1 .5 1.5 1.5 1.5h4c1 0 1.5-.5 1.5-1.5v-7c0-1-.5-1.5-1.5-1.5z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-spreadOdd-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-spreadOdd-dark.svg
deleted file mode 100644
index 8dff9598e..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-spreadOdd-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
-fill="rgba(255,255,255,1)"><path d="M10.56 3.5C9.56 3.5 9 4 9 5v6.5c0 1 .5 1.5 1.5 1.5h4c1 0 1.5-.5 1.5-1.5V5c0-1-.5-1.5-1.5-1.5zm1.93 1.2c.8 0 1.4.2 1.8.64.5.4.7 1 .7 1.7 0 .5-.2 1-.5 1.44-.2.3-.6.6-1 .93l-.6.4c-.4.3-.6.4-.7.55-.1.1-.2.2-.3.4h3.2v1.27h-5c0-.5.1-1 .3-1.43.2-.49.7-1 1.5-1.54.7-.5 1.1-.8 1.3-1.02.3-.3.4-.7.4-1.05 0-.3-.1-.6-.3-.77-.2-.2-.4-.3-.7-.3-.4 0-.7.2-.9.5-.1.2-.1.5-.2.9h-1.4c0-.6.2-1.1.3-1.5.4-.7 1.1-1.1 2-1.1zM1.54 3.5C.54 3.5 0 4 0 5v6.5c0 1 .5 1.5 1.54 1.5h4c1 0 1.5-.5 1.5-1.5V5c0-1-.5-1.5-1.5-1.5zm1.8 1.125H4.5V12H3V6.9H1.3v-1c.5 0 .8 0 .97-.03.33-.07.53-.17.73-.37.1-.2.2-.3.25-.5.05-.2.05-.3.05-.3z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-bookmark-dark.svg b/cps/static/css/libs/images/toolbarButton-bookmark-dark.svg
deleted file mode 100644
index 7bf332972..000000000
--- a/cps/static/css/libs/images/toolbarButton-bookmark-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-fill="rgba(255,255,255,1)"><path d="M4 16V2s0-1 1-1h6s1 0 1 1v14l-4-5z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-currentOutlineItem.svg b/cps/static/css/libs/images/toolbarButton-currentOutlineItem.svg
new file mode 100644
index 000000000..c1c72b208
--- /dev/null
+++ b/cps/static/css/libs/images/toolbarButton-currentOutlineItem.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="m14 9h-6c-1.3 0-1.3 2 0 2h6c1.3 0 1.3-2 0-2zm-5.2-8h-3.8c-1.3 0-1.3 2 0 2h1.7zm-6.8 0c-1 0-1.3 1-0.7 1.7 0.7 0.6 1.7 0.3 1.7-0.7 0-0.5-0.4-1-1-1zm3 8c-1 0-1.3 1-0.7 1.7 0.6 0.6 1.7 0.2 1.7-0.7 0-0.5-0.4-1-1-1zm0.3-4h-0.3c-1.4 0-1.4 2 0 2h2.3zm-3.3 0c-0.9 0-1.4 1-0.7 1.7 0.7 0.6 1.7 0.2 1.7-0.7 0-0.6-0.5-1-1-1zm12 8h-9c-1.3 0-1.3 2 0 2h9c1.3 0 1.3-2 0-2zm-12 0c-1 0-1.3 1-0.7 1.7 0.7 0.6 1.7 0.2 1.7-0.712 0-0.5-0.4-1-1-1z"/><path d="m7.37 4.838 3.93-3.911v2.138h3.629v3.546h-3.629v2.138l-3.93-3.911"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-download-dark.svg b/cps/static/css/libs/images/toolbarButton-download-dark.svg
deleted file mode 100644
index d2a92e5d4..000000000
--- a/cps/static/css/libs/images/toolbarButton-download-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M14 3h-2v2h2v8H2V5h7V3h-.849L6.584 1.538A2 2 0 0 0 5.219 1H2a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zM2 3h3.219l1.072 1H2z"></path><path d="M8.146 6.146a.5.5 0 0 0 0 .707l2 2a.5.5 0 0 0 .707 0l2-2a.5.5 0 1 0-.707-.707L11 7.293V.5a.5.5 0 0 0-1 0v6.793L8.854 6.146a.5.5 0 0 0-.708 0z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-editorFreeText.svg b/cps/static/css/libs/images/toolbarButton-editorFreeText.svg
new file mode 100644
index 000000000..f0f11b47c
--- /dev/null
+++ b/cps/static/css/libs/images/toolbarButton-editorFreeText.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- copied from https://www.svgrepo.com/svg/255881/text -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<g>
+	<g transform="scale(0.03125)">
+		<path d="M405.787,43.574H8.17c-4.513,0-8.17,3.658-8.17,8.17v119.83c0,4.512,3.657,8.17,8.17,8.17h32.681
+			c4.513,0,8.17-3.658,8.17-8.17v-24.511h95.319v119.83c0,4.512,3.657,8.17,8.17,8.17c4.513,0,8.17-3.658,8.17-8.17v-128
+			c0-4.512-3.657-8.17-8.17-8.17H40.851c-4.513,0-8.17,3.658-8.17,8.17v24.511H16.34V59.915h381.277v103.489h-16.34v-24.511
+			c0-4.512-3.657-8.17-8.17-8.17h-111.66c-4.513,0-8.17,3.658-8.17,8.17v288.681c0,4.512,3.657,8.17,8.17,8.17h57.191v16.34H95.319
+			v-16.34h57.191c4.513,0,8.17-3.658,8.17-8.17v-128c0-4.512-3.657-8.17-8.17-8.17c-4.513,0-8.17,3.658-8.17,8.17v119.83H87.149
+			c-4.513,0-8.17,3.658-8.17,8.17v32.681c0,4.512,3.657,8.17,8.17,8.17h239.66c4.513,0,8.17-3.658,8.17-8.17v-32.681
+			c0-4.512-3.657-8.17-8.17-8.17h-57.192v-272.34h95.319v24.511c0,4.512,3.657,8.17,8.17,8.17h32.681c4.513,0,8.17-3.658,8.17-8.17
+			V51.745C413.957,47.233,410.3,43.574,405.787,43.574z"/>
+	</g>
+</g>
+<g>
+	<g transform="scale(0.03125)">
+		<path d="M503.83,452.085h-24.511V59.915h24.511c4.513,0,8.17-3.658,8.17-8.17s-3.657-8.17-8.17-8.17h-65.362
+			c-4.513,0-8.17,3.658-8.17,8.17s3.657,8.17,8.17,8.17h24.511v392.17h-24.511c-4.513,0-8.17,3.658-8.17,8.17s3.657,8.17,8.17,8.17
+			h65.362c4.513,0,8.17-3.658,8.17-8.17S508.343,452.085,503.83,452.085z"/>
+	</g>
+</g>
+</svg>
diff --git a/cps/static/css/libs/images/toolbarButton-editorInk.svg b/cps/static/css/libs/images/toolbarButton-editorInk.svg
new file mode 100644
index 000000000..2b37e85f3
--- /dev/null
+++ b/cps/static/css/libs/images/toolbarButton-editorInk.svg
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
+  <g>
+    <g transform="scale(0.03125)">
+      <path d="m455.1,137.9l-32.4,32.4-81-81.1 32.4-32.4c6.6-6.6 18.1-6.6 24.7,0l56.3,56.4c6.8,6.8 6.8,17.9 0,24.7zm-270.7,271l-81-81.1 209.4-209.7 81,81.1-209.4,209.7zm-99.7-42l60.6,60.7-84.4,23.8 23.8-84.5zm399.3-282.6l-56.3-56.4c-11-11-50.7-31.8-82.4,0l-285.3,285.5c-2.5,2.5-4.3,5.5-5.2,8.9l-43,153.1c-2,7.1 0.1,14.7 5.2,20 5.2,5.3 15.6,6.2 20,5.2l153-43.1c3.4-0.9 6.4-2.7 8.9-5.2l285.1-285.5c22.7-22.7 22.7-59.7 0-82.5z"/>
+    </g>
+  </g>
+</svg>
diff --git a/cps/static/css/libs/images/toolbarButton-menuArrow-dark.svg b/cps/static/css/libs/images/toolbarButton-menuArrow-dark.svg
deleted file mode 100644
index eb7f50e6d..000000000
--- a/cps/static/css/libs/images/toolbarButton-menuArrow-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="rgba(255,255,255,1)"><path d="M8 11a1 1 0 01-.707-.293l-2.99-2.99c-.91-.942.471-2.324 1.414-1.414L8 8.586l2.283-2.283c.943-.91 2.324.472 1.414 1.414l-2.99 2.99A1 1 0 018 11z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-openFile-dark.svg b/cps/static/css/libs/images/toolbarButton-openFile-dark.svg
deleted file mode 100644
index 0bd612f0e..000000000
--- a/cps/static/css/libs/images/toolbarButton-openFile-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M14.859 3.2a1.335 1.335 0 0 1-1.217.8H13v1h1v8H2V5h8V4h-.642a1.365 1.365 0 0 1-1.325-1.11L6.584 1.538A2 2 0 0 0 5.219 1H2a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V5a2 2 0 0 0-1.141-1.8zM2 3h3.219l1.072 1H2zm7.854-.146L11 1.707V8.5a.5.5 0 0 0 1 0V1.707l1.146 1.146a.5.5 0 1 0 .707-.707l-2-2a.5.5 0 0 0-.707 0l-2 2a.5.5 0 0 0 .707.707z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-pageDown-dark.svg b/cps/static/css/libs/images/toolbarButton-pageDown-dark.svg
deleted file mode 100644
index c2ca60c8f..000000000
--- a/cps/static/css/libs/images/toolbarButton-pageDown-dark.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16
-16"
-fill="rgba(255,255,255,1)"><path transform='rotate(90) translate(0, -16)'
-d="M15.707 7.293l-6-6a1 1 0 0 0-1.414 1.414L12.586 7H1a1 1 0 0 0 0 2h11.586l-4.293
-4.293a1 1 0 1 0 1.414 1.414l6-6a1 1 0 0 0 0-1.414z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-pageUp-dark.svg b/cps/static/css/libs/images/toolbarButton-pageUp-dark.svg
deleted file mode 100644
index dddc4ab26..000000000
--- a/cps/static/css/libs/images/toolbarButton-pageUp-dark.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16
-16"
-fill="rgba(255,255,255,1)">
-<path 
-   transform='rotate(90) translate(0, -16)'
-   d="M15 7H3.414l4.293-4.293a1 1 0 0
-0-1.414-1.414l-6 6a1 1 0 0 0 0 1.414l6 6a1 1 0 0 0 1.414-1.414L3.414 9H15a1 1 0 0
-0 0-2z">
-</path>
-</svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-presentationMode-dark.svg b/cps/static/css/libs/images/toolbarButton-presentationMode-dark.svg
deleted file mode 100644
index 13fa9dc7c..000000000
--- a/cps/static/css/libs/images/toolbarButton-presentationMode-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
-fill="rgba(255,255,255,1)"><path d="M.5 1H7s0-1 1-1 1 1 1 1h6.5s.5 0 .5.5-.5.5-.5.5H.5S0 2 0 1.5.5 1 .5 1zM1 3h14v7c0 2-1 2-2 2H3c-1 0-2 0-2-2zm5 1v7l6-3.5zM3.72 15.33l.53-2s0-.5.65-.35c.51.13.38.63.38.63l-.53 2s0 .5-.64.35c-.53-.13-.39-.63-.39-.63zM11.24 15.61l-.53-1.99s0-.5.38-.63c.51-.13.64.35.64.35l.53 2s0 .5-.38.63c-.5.13-.64-.35-.65-.35z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-print-dark.svg b/cps/static/css/libs/images/toolbarButton-print-dark.svg
deleted file mode 100644
index ad37022f0..000000000
--- a/cps/static/css/libs/images/toolbarButton-print-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M14 5h-1V1a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v4H2a2 2 0 0 0-2 2v5h3v3a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-3h3V7a2 2 0 0 0-2-2zM2.5 8a.5.5 0 1 1 .5-.5.5.5 0 0 1-.5.5zm9.5 7H4v-5h8zm0-10H4V1h8zm-6.5 7h4a.5.5 0 0 0 0-1h-4a.5.5 0 1 0 0 1zm0 2h5a.5.5 0 0 0 0-1h-5a.5.5 0 1 0 0 1z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-search-dark.svg b/cps/static/css/libs/images/toolbarButton-search-dark.svg
deleted file mode 100644
index cec8a4206..000000000
--- a/cps/static/css/libs/images/toolbarButton-search-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M15.707 14.293l-4.822-4.822a6.019 6.019 0 1 0-1.414 1.414l4.822 4.822a1 1 0 0 0 1.414-1.414zM6 10a4 4 0 1 1 4-4 4 4 0 0 1-4 4z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-secondaryToolbarToggle-dark.svg b/cps/static/css/libs/images/toolbarButton-secondaryToolbarToggle-dark.svg
deleted file mode 100644
index 0160c07cd..000000000
--- a/cps/static/css/libs/images/toolbarButton-secondaryToolbarToggle-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M8.707 7.293l-5-5a1 1 0 0 0-1.414 1.414L6.586 8l-4.293 4.293a1 1 0 1 0 1.414 1.414l5-5a1 1 0 0 0 0-1.414zm6 0l-5-5a1 1 0 0 0-1.414 1.414L12.586 8l-4.293 4.293a1 1 0 1 0 1.414 1.414l5-5a1 1 0 0 0 0-1.414z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-sidebarToggle-dark.svg b/cps/static/css/libs/images/toolbarButton-sidebarToggle-dark.svg
deleted file mode 100644
index 0118e41a8..000000000
--- a/cps/static/css/libs/images/toolbarButton-sidebarToggle-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M3 1h10a3.008 3.008 0 0 1 3 3v8a3.009 3.009 0 0 1-3 3H3a3.005 3.005 0 0 1-3-3V4a3.013 3.013 0 0 1 3-3zm11 11V4a1 1 0 0 0-1-1H8v10h5a1 1 0 0 0 1-1zM2 12a1 1 0 0 0 1 1h4V3H3a1 1 0 0 0-1 1v8z"></path><path d="M3.5 5h2a.5.5 0 0 0 0-1h-2a.5.5 0 0 0 0 1zm0 2h2a.5.5 0 0 0 0-1h-2a.5.5 0 0 0 0 1zm1 2h1a.5.5 0 0 0 0-1h-1a.5.5 0 0 0 0 1z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-viewAttachments-dark.svg b/cps/static/css/libs/images/toolbarButton-viewAttachments-dark.svg
deleted file mode 100644
index c9714fdea..000000000
--- a/cps/static/css/libs/images/toolbarButton-viewAttachments-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-fill="rgba(255,255,255,1)"><path d="M6.2 2s.5-.5 1.06 0c.5.5 0 1 0 1l-4.6 4.61s-2.5 2.5 0 5 5 0 5 0L13.8 6.4s1.6-1.6 0-3.2-3.2 0-3.2 0L5.8 8s-.7.7 0 1.4 1.4 0 1.4 0l3.9-3.9s.6-.5 1 0c.5.5 0 1 0 1l-3.8 4s-1.8 1.8-3.5 0C3 8.7 4.8 7 4.8 7l4.7-4.9s2.7-2.6 5.3 0c2.6 2.6 0 5.3 0 5.3l-6.2 6.3s-3.5 3.5-7 0 0-7 0-7z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-viewLayers-dark.svg b/cps/static/css/libs/images/toolbarButton-viewLayers-dark.svg
deleted file mode 100644
index 76b042a95..000000000
--- a/cps/static/css/libs/images/toolbarButton-viewLayers-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4.233 4.233" height="16" width="16" fill="rgba(255,255,255,1)"><path d="M.15 2.992c-.198.1-.2.266-.002.365l1.604.802a.93.93 0 00.729-.001l1.602-.801c.198-.1.197-.264 0-.364l-.695-.348c-1.306.595-2.542 0-2.542 0m-.264.53l.658-.329c.6.252 1.238.244 1.754 0l.659.329-1.536.768zM.15 1.935c-.198.1-.198.265 0 .364l1.604.802a.926.926 0 00.727 0l1.603-.802c.198-.099.198-.264 0-.363l-.694-.35c-1.14.56-2.546.001-2.546.001m-.264.53l.664-.332c.52.266 1.261.235 1.75.002l.659.33-1.537.768zM.15.877c-.198.099-.198.264 0 .363l1.604.802a.926.926 0 00.727 0l1.603-.802c.198-.099.198-.264 0-.363L2.481.075a.926.926 0 00-.727 0zm.43.182L2.117.29l1.538.769-1.538.768z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-viewOutline-dark.svg b/cps/static/css/libs/images/toolbarButton-viewOutline-dark.svg
deleted file mode 100644
index 1704d961a..000000000
--- a/cps/static/css/libs/images/toolbarButton-viewOutline-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-fill="rgba(255,255,255,1)"><path d="M14 9H8c-1.3 0-1.3 2 0 2h6c1.3 0 1.3-2 0-2zm0-8H5C3.7 1 3.7 3 5 3h9c1.3 0 1.3-2 0-2zM2 1C1 1 .7 2 1.3 2.7 2 3.3 3 3 3 2c0-.5-.4-1-1-1zm3 8c-1 0-1.3 1-.7 1.7.6.6 1.7.2 1.7-.7 0-.5-.4-1-1-1zM14 5H5C3.6 5 3.6 7 5 7h9c1.3 0 1.3-2 0-2zM2 5c-.9 0-1.4 1-.7 1.7C2 7.3 3 6.9 3 6c0-.6-.5-1-1-1zM14 13H5c-1.3 0-1.3 2 0 2h9c1.3 0 1.3-2 0-2zM2 13c-1 0-1.3 1-.7 1.7.7.6 1.7.2 1.7-.712 0-.5-.4-1-1-1z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-viewThumbnail-dark.svg b/cps/static/css/libs/images/toolbarButton-viewThumbnail-dark.svg
deleted file mode 100644
index 17c55f7b8..000000000
--- a/cps/static/css/libs/images/toolbarButton-viewThumbnail-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><g style="--darkreader-inline-fill:rgba(81, 82, 83, 0.8);" data-darkreader-inline-fill=""><rect x="1" y="1" width="6" height="6" rx="1" ry="1"></rect><rect x="9" y="1" width="6" height="6" rx="1" ry="1"></rect><rect x="1" y="9" width="6" height="6" rx="1" ry="1"></rect><rect x="9" y="9" width="6" height="6" rx="1" ry="1"></rect></g></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-zoomIn-dark.svg b/cps/static/css/libs/images/toolbarButton-zoomIn-dark.svg
deleted file mode 100644
index 9b615541e..000000000
--- a/cps/static/css/libs/images/toolbarButton-zoomIn-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><path d="M14 7H9V2a1 1 0 0 0-2 0v5H2a1 1 0 0 0 0 2h5v5a1 1 0 0 0 2 0V9h5a1 1 0 0 0 0-2z"></path></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-zoomOut-dark.svg b/cps/static/css/libs/images/toolbarButton-zoomOut-dark.svg
deleted file mode 100644
index 0fb3594d1..000000000
--- a/cps/static/css/libs/images/toolbarButton-zoomOut-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
-fill="rgba(255,255,255,1)"><rect x="2" y="7" width="12" height="2" rx="1"></rect></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/treeitem-collapsed-dark.svg b/cps/static/css/libs/images/treeitem-collapsed-dark.svg
deleted file mode 100644
index 1fb655162..000000000
--- a/cps/static/css/libs/images/treeitem-collapsed-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
-fill="rgba(255,255,255,1)"><path d="M13 9L6 5v8z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/images/treeitem-expanded-dark.svg b/cps/static/css/libs/images/treeitem-expanded-dark.svg
deleted file mode 100644
index 695b0aa61..000000000
--- a/cps/static/css/libs/images/treeitem-expanded-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
-fill="rgba(255,255,255,1)"><path d="M10 13l4-7H6z"/></svg>
\ No newline at end of file
diff --git a/cps/static/css/libs/viewer.css b/cps/static/css/libs/viewer.css
index cd4781bf4..c357a9fde 100644
--- a/cps/static/css/libs/viewer.css
+++ b/cps/static/css/libs/viewer.css
@@ -15,6 +15,7 @@
 
 .textLayer {
   position: absolute;
+  text-align: initial;
   left: 0;
   top: 0;
   right: 0;
@@ -22,9 +23,14 @@
   overflow: hidden;
   opacity: 0.2;
   line-height: 1;
+  -webkit-text-size-adjust: none;
+     -moz-text-size-adjust: none;
+          text-size-adjust: none;
+  forced-color-adjust: none;
 }
 
-.textLayer > span {
+.textLayer span,
+.textLayer br {
   color: transparent;
   position: absolute;
   white-space: pre;
@@ -32,6 +38,13 @@
   transform-origin: 0% 0%;
 }
 
+/* Only necessary in Google Chrome, see issue 14205, and most unfortunately
+ * the problem doesn't show up in "text" reference tests. */
+.textLayer span.markedContent {
+  top: 0;
+  height: 0;
+}
+
 .textLayer .highlight {
   margin: -1px;
   padding: 1px;
@@ -39,16 +52,20 @@
   border-radius: 4px;
 }
 
+.textLayer .highlight.appended {
+  position: initial;
+}
+
 .textLayer .highlight.begin {
-  border-radius: 4px 0px 0px 4px;
+  border-radius: 4px 0 0 4px;
 }
 
 .textLayer .highlight.end {
-  border-radius: 0px 4px 4px 0px;
+  border-radius: 0 4px 4px 0;
 }
 
 .textLayer .highlight.middle {
-  border-radius: 0px;
+  border-radius: 0;
 }
 
 .textLayer .highlight.selected {
@@ -63,28 +80,61 @@
   background: rgba(0, 0, 255, 1);
 }
 
+/* Avoids https://github.com/mozilla/pdf.js/issues/13840 in Chrome */
+.textLayer br::-moz-selection {
+  background: transparent;
+}
+.textLayer br::selection {
+  background: transparent;
+}
+
 .textLayer .endOfContent {
   display: block;
   position: absolute;
-  left: 0px;
+  left: 0;
   top: 100%;
-  right: 0px;
-  bottom: 0px;
+  right: 0;
+  bottom: 0;
   z-index: -1;
   cursor: default;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
 }
 
 .textLayer .endOfContent.active {
-  top: 0px;
+  top: 0;
 }
 
 
+:root {
+  --annotation-unfocused-field-background: url("data:image/svg+xml;charset=UTF-8,<svg width='1px' height='1px' xmlns='http://www.w3.org/2000/svg'><rect width='100%' height='100%' style='fill:rgba(0, 54, 255, 0.13);'/></svg>");
+}
+
+@media (forced-colors: active) {
+  .annotationLayer .textWidgetAnnotation input:required,
+  .annotationLayer .textWidgetAnnotation textarea:required,
+  .annotationLayer .choiceWidgetAnnotation select:required,
+  .annotationLayer .buttonWidgetAnnotation.checkBox input:required,
+  .annotationLayer .buttonWidgetAnnotation.radioButton input:required {
+    outline: 1.5px solid selectedItem;
+  }
+}
+
+.annotationLayer {
+  position: absolute;
+  top: 0;
+  left: 0;
+  pointer-events: none;
+  transform-origin: 0 0;
+}
+
 .annotationLayer section {
   position: absolute;
+  text-align: initial;
+  pointer-events: auto;
+  box-sizing: border-box;
+  transform-origin: 0 0;
 }
 
 .annotationLayer .linkAnnotation > a,
@@ -97,16 +147,23 @@
   height: 100%;
 }
 
+.annotationLayer .buttonWidgetAnnotation.pushButton > canvas {
+  width: 100%;
+  height: 100%;
+}
+
 .annotationLayer .linkAnnotation > a:hover,
 .annotationLayer .buttonWidgetAnnotation.pushButton > a:hover {
   opacity: 0.2;
   background: rgba(255, 255, 0, 1);
-  box-shadow: 0px 2px 10px rgba(255, 255, 0, 1);
+  box-shadow: 0 2px 10px rgba(255, 255, 0, 1);
 }
 
 .annotationLayer .textAnnotation img {
   position: absolute;
   cursor: pointer;
+  width: 100%;
+  height: 100%;
 }
 
 .annotationLayer .textWidgetAnnotation input,
@@ -114,17 +171,24 @@
 .annotationLayer .choiceWidgetAnnotation select,
 .annotationLayer .buttonWidgetAnnotation.checkBox input,
 .annotationLayer .buttonWidgetAnnotation.radioButton input {
-  background-color: rgba(0, 54, 255, 0.13);
+  background-image: var(--annotation-unfocused-field-background);
   border: 1px solid transparent;
   box-sizing: border-box;
-  font-size: 9px;
+  font: calc(9px * var(--scale-factor)) sans-serif;
   height: 100%;
   margin: 0;
-  padding: 0 3px;
   vertical-align: top;
   width: 100%;
 }
 
+.annotationLayer .textWidgetAnnotation input:required,
+.annotationLayer .textWidgetAnnotation textarea:required,
+.annotationLayer .choiceWidgetAnnotation select:required,
+.annotationLayer .buttonWidgetAnnotation.checkBox input:required,
+.annotationLayer .buttonWidgetAnnotation.radioButton input:required {
+  outline: 1.5px solid red;
+}
+
 .annotationLayer .choiceWidgetAnnotation select option {
   padding: 0;
 }
@@ -134,8 +198,6 @@
 }
 
 .annotationLayer .textWidgetAnnotation textarea {
-  font: message-box;
-  font-size: 9px;
   resize: none;
 }
 
@@ -164,10 +226,20 @@
   border: 1px solid transparent;
 }
 
+.annotationLayer .textWidgetAnnotation input :focus,
+.annotationLayer .textWidgetAnnotation textarea :focus,
+.annotationLayer .choiceWidgetAnnotation select :focus,
+.annotationLayer .buttonWidgetAnnotation.checkBox :focus,
+.annotationLayer .buttonWidgetAnnotation.radioButton :focus {
+  background-image: none;
+  background-color: transparent;
+  outline: auto;
+}
+
 .annotationLayer .buttonWidgetAnnotation.checkBox input:checked:before,
 .annotationLayer .buttonWidgetAnnotation.checkBox input:checked:after,
 .annotationLayer .buttonWidgetAnnotation.radioButton input:checked:before {
-  background-color: rgba(0, 0, 0, 1);
+  background-color: CanvasText;
   content: "";
   display: block;
   position: absolute;
@@ -209,7 +281,7 @@
    * area, causing horizontal scrolling. We avoid this by extending the width
    * when the element has focus and revert this when it loses focus.
    */
-  width: 115%;
+  width: 103%;
 }
 
 .annotationLayer .buttonWidgetAnnotation.checkBox input,
@@ -217,46 +289,59 @@
   -webkit-appearance: none;
      -moz-appearance: none;
           appearance: none;
-  padding: 0;
+}
+
+.annotationLayer .popupTriggerArea {
+  height: 100%;
+  width: 100%;
 }
 
 .annotationLayer .popupWrapper {
   position: absolute;
-  width: 20em;
+  font-size: calc(9px * var(--scale-factor));
+  width: 100%;
+  min-width: calc(180px * var(--scale-factor));
+  pointer-events: none;
 }
 
 .annotationLayer .popup {
   position: absolute;
-  z-index: 200;
-  max-width: 20em;
+  max-width: calc(180px * var(--scale-factor));
   background-color: rgba(255, 255, 153, 1);
-  box-shadow: 0px 2px 5px rgba(136, 136, 136, 1);
-  border-radius: 2px;
-  padding: 6px;
-  margin-left: 5px;
+  box-shadow: 0 calc(2px * var(--scale-factor)) calc(5px * var(--scale-factor))
+    rgba(136, 136, 136, 1);
+  border-radius: calc(2px * var(--scale-factor));
+  padding: calc(6px * var(--scale-factor));
+  margin-left: calc(5px * var(--scale-factor));
   cursor: pointer;
   font: message-box;
-  font-size: 9px;
+  white-space: normal;
   word-wrap: break-word;
+  pointer-events: auto;
 }
 
 .annotationLayer .popup > * {
-  font-size: 9px;
+  font-size: calc(9px * var(--scale-factor));
 }
 
 .annotationLayer .popup h1 {
   display: inline-block;
 }
 
-.annotationLayer .popup span {
+.annotationLayer .popupDate {
   display: inline-block;
-  margin-left: 5px;
+  margin-left: calc(5px * var(--scale-factor));
 }
 
-.annotationLayer .popup p {
+.annotationLayer .popupContent {
   border-top: 1px solid rgba(51, 51, 51, 1);
-  margin-top: 2px;
-  padding-top: 2px;
+  margin-top: calc(2px * var(--scale-factor));
+  padding-top: calc(2px * var(--scale-factor));
+}
+
+.annotationLayer .richText > * {
+  white-space: pre-wrap;
+  font-size: calc(9px * var(--scale-factor));
 }
 
 .annotationLayer .highlightAnnotation,
@@ -276,6 +361,527 @@
   cursor: pointer;
 }
 
+.annotationLayer section svg {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+}
+
+.annotationLayer .annotationTextContent {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+  color: transparent;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
+  pointer-events: none;
+}
+
+.annotationLayer .annotationTextContent span {
+  width: 100%;
+  display: inline-block;
+}
+
+
+:root {
+  --xfa-unfocused-field-background: url("data:image/svg+xml;charset=UTF-8,<svg width='1px' height='1px' xmlns='http://www.w3.org/2000/svg'><rect width='100%' height='100%' style='fill:rgba(0, 54, 255, 0.13);'/></svg>");
+}
+
+@media (forced-colors: active) {
+  .xfaLayer *:required {
+    outline: 1.5px solid selectedItem;
+  }
+}
+
+.xfaLayer .highlight {
+  margin: -1px;
+  padding: 1px;
+  background-color: rgba(239, 203, 237, 1);
+  border-radius: 4px;
+}
+
+.xfaLayer .highlight.appended {
+  position: initial;
+}
+
+.xfaLayer .highlight.begin {
+  border-radius: 4px 0 0 4px;
+}
+
+.xfaLayer .highlight.end {
+  border-radius: 0 4px 4px 0;
+}
+
+.xfaLayer .highlight.middle {
+  border-radius: 0;
+}
+
+.xfaLayer .highlight.selected {
+  background-color: rgba(203, 223, 203, 1);
+}
+
+.xfaLayer ::-moz-selection {
+  background: rgba(0, 0, 255, 1);
+}
+
+.xfaLayer ::selection {
+  background: rgba(0, 0, 255, 1);
+}
+
+.xfaPage {
+  overflow: hidden;
+  position: relative;
+}
+
+.xfaContentarea {
+  position: absolute;
+}
+
+.xfaPrintOnly {
+  display: none;
+}
+
+.xfaLayer {
+  position: absolute;
+  text-align: initial;
+  top: 0;
+  left: 0;
+  transform-origin: 0 0;
+  line-height: 1.2;
+}
+
+.xfaLayer * {
+  color: inherit;
+  font: inherit;
+  font-style: inherit;
+  font-weight: inherit;
+  font-kerning: inherit;
+  letter-spacing: -0.01px;
+  text-align: inherit;
+  text-decoration: inherit;
+  box-sizing: border-box;
+  background-color: transparent;
+  padding: 0;
+  margin: 0;
+  pointer-events: auto;
+  line-height: inherit;
+}
+
+.xfaLayer *:required {
+  outline: 1.5px solid red;
+}
+
+.xfaLayer div {
+  pointer-events: none;
+}
+
+.xfaLayer svg {
+  pointer-events: none;
+}
+
+.xfaLayer svg * {
+  pointer-events: none;
+}
+
+.xfaLayer a {
+  color: blue;
+}
+
+.xfaRich li {
+  margin-left: 3em;
+}
+
+.xfaFont {
+  color: black;
+  font-weight: normal;
+  font-kerning: none;
+  font-size: 10px;
+  font-style: normal;
+  letter-spacing: 0;
+  text-decoration: none;
+  vertical-align: 0;
+}
+
+.xfaCaption {
+  overflow: hidden;
+  flex: 0 0 auto;
+}
+
+.xfaCaptionForCheckButton {
+  overflow: hidden;
+  flex: 1 1 auto;
+}
+
+.xfaLabel {
+  height: 100%;
+  width: 100%;
+}
+
+.xfaLeft {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.xfaRight {
+  display: flex;
+  flex-direction: row-reverse;
+  align-items: center;
+}
+
+.xfaLeft > .xfaCaption,
+.xfaLeft > .xfaCaptionForCheckButton,
+.xfaRight > .xfaCaption,
+.xfaRight > .xfaCaptionForCheckButton {
+  max-height: 100%;
+}
+
+.xfaTop {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.xfaBottom {
+  display: flex;
+  flex-direction: column-reverse;
+  align-items: flex-start;
+}
+
+.xfaTop > .xfaCaption,
+.xfaTop > .xfaCaptionForCheckButton,
+.xfaBottom > .xfaCaption,
+.xfaBottom > .xfaCaptionForCheckButton {
+  width: 100%;
+}
+
+.xfaBorder {
+  background-color: transparent;
+  position: absolute;
+  pointer-events: none;
+}
+
+.xfaWrapped {
+  width: 100%;
+  height: 100%;
+}
+
+.xfaTextfield:focus,
+.xfaSelect:focus {
+  background-image: none;
+  background-color: transparent;
+  outline: auto;
+  outline-offset: -1px;
+}
+
+.xfaCheckbox:focus,
+.xfaRadio:focus {
+  outline: auto;
+}
+
+.xfaTextfield,
+.xfaSelect {
+  height: 100%;
+  width: 100%;
+  flex: 1 1 auto;
+  border: none;
+  resize: none;
+  background-image: var(--xfa-unfocused-field-background);
+}
+
+.xfaTop > .xfaTextfield,
+.xfaTop > .xfaSelect,
+.xfaBottom > .xfaTextfield,
+.xfaBottom > .xfaSelect {
+  flex: 0 1 auto;
+}
+
+.xfaButton {
+  cursor: pointer;
+  width: 100%;
+  height: 100%;
+  border: none;
+  text-align: center;
+}
+
+.xfaLink {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.xfaCheckbox,
+.xfaRadio {
+  width: 100%;
+  height: 100%;
+  flex: 0 0 auto;
+  border: none;
+}
+
+.xfaRich {
+  white-space: pre-wrap;
+  width: 100%;
+  height: 100%;
+}
+
+.xfaImage {
+  -o-object-position: left top;
+     object-position: left top;
+  -o-object-fit: contain;
+     object-fit: contain;
+  width: 100%;
+  height: 100%;
+}
+
+.xfaLrTb,
+.xfaRlTb,
+.xfaTb {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+}
+
+.xfaLr {
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+}
+
+.xfaRl {
+  display: flex;
+  flex-direction: row-reverse;
+  align-items: stretch;
+}
+
+.xfaTb > div {
+  justify-content: left;
+}
+
+.xfaPosition {
+  position: relative;
+}
+
+.xfaArea {
+  position: relative;
+}
+
+.xfaValignMiddle {
+  display: flex;
+  align-items: center;
+}
+
+.xfaTable {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+}
+
+.xfaTable .xfaRow {
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+}
+
+.xfaTable .xfaRlRow {
+  display: flex;
+  flex-direction: row-reverse;
+  align-items: stretch;
+  flex: 1;
+}
+
+.xfaTable .xfaRlRow > div {
+  flex: 1;
+}
+
+.xfaNonInteractive input,
+.xfaNonInteractive textarea,
+.xfaDisabled input,
+.xfaDisabled textarea,
+.xfaReadOnly input,
+.xfaReadOnly textarea {
+  background: initial;
+}
+
+@media print {
+  .xfaTextfield,
+  .xfaSelect {
+    background: transparent;
+  }
+
+  .xfaSelect {
+    -webkit-appearance: none;
+       -moz-appearance: none;
+            appearance: none;
+    text-indent: 1px;
+    text-overflow: "";
+  }
+}
+
+
+:root {
+  --focus-outline: solid 2px blue;
+  --hover-outline: dashed 2px blue;
+  --freetext-line-height: 1.35;
+  --freetext-padding: 2px;
+  --editorInk-editing-cursor: url(images/toolbarButton-editorInk.svg) 0 16;
+}
+
+@media (forced-colors: active) {
+  :root {
+    --focus-outline: solid 3px ButtonText;
+    --hover-outline: dashed 3px ButtonText;
+  }
+}
+
+[data-editor-rotation="90"] {
+  transform: rotate(90deg);
+}
+[data-editor-rotation="180"] {
+  transform: rotate(180deg);
+}
+[data-editor-rotation="270"] {
+  transform: rotate(270deg);
+}
+
+.annotationEditorLayer {
+  background: transparent;
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-size: calc(100px * var(--scale-factor));
+  transform-origin: 0 0;
+}
+
+.annotationEditorLayer .selectedEditor {
+  outline: var(--focus-outline);
+  resize: none;
+}
+
+.annotationEditorLayer .freeTextEditor {
+  position: absolute;
+  background: transparent;
+  border-radius: 3px;
+  padding: calc(var(--freetext-padding) * var(--scale-factor));
+  resize: none;
+  width: auto;
+  height: auto;
+  z-index: 1;
+  transform-origin: 0 0;
+  touch-action: none;
+}
+
+.annotationEditorLayer .freeTextEditor .internal {
+  background: transparent;
+  border: none;
+  top: 0;
+  left: 0;
+  overflow: visible;
+  white-space: nowrap;
+  resize: none;
+  font: 10px sans-serif;
+  line-height: var(--freetext-line-height);
+}
+
+.annotationEditorLayer .freeTextEditor .overlay {
+  position: absolute;
+  display: none;
+  background: transparent;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.annotationEditorLayer .freeTextEditor .overlay.enabled {
+  display: block;
+}
+
+.annotationEditorLayer .freeTextEditor .internal:empty::before {
+  content: attr(default-content);
+  color: gray;
+}
+
+.annotationEditorLayer .freeTextEditor .internal:focus {
+  outline: none;
+}
+
+.annotationEditorLayer .inkEditor.disabled {
+  resize: none;
+}
+
+.annotationEditorLayer .inkEditor.disabled.selectedEditor {
+  resize: horizontal;
+}
+
+.annotationEditorLayer .freeTextEditor:hover:not(.selectedEditor),
+.annotationEditorLayer .inkEditor:hover:not(.selectedEditor) {
+  outline: var(--hover-outline);
+}
+
+.annotationEditorLayer .inkEditor {
+  position: absolute;
+  background: transparent;
+  border-radius: 3px;
+  overflow: auto;
+  width: 100%;
+  height: 100%;
+  z-index: 1;
+  transform-origin: 0 0;
+  cursor: auto;
+}
+
+.annotationEditorLayer .inkEditor.editing {
+  resize: none;
+  cursor: var(--editorInk-editing-cursor), pointer;
+}
+
+.annotationEditorLayer .inkEditor .inkEditorCanvas {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  touch-action: none;
+}
+
+:root {
+  --viewer-container-height: 0;
+  --pdfViewer-padding-bottom: 0;
+  --page-margin: 1px auto -8px;
+  --page-border: 9px solid transparent;
+  --page-border-image: url(images/shadow.png) 9 9 repeat;
+  --spreadHorizontalWrapped-margin-LR: -3.5px;
+  --scale-factor: 1;
+}
+
+@media screen and (forced-colors: active) {
+  :root {
+    --pdfViewer-padding-bottom: 9px;
+    --page-margin: 8px auto -1px;
+    --page-border: 1px solid CanvasText;
+    --page-border-image: none;
+    --spreadHorizontalWrapped-margin-LR: 3.5px;
+  }
+}
+
+[data-main-rotation="90"] {
+  transform: rotate(90deg) translateY(-100%);
+}
+[data-main-rotation="180"] {
+  transform: rotate(180deg) translate(-100%, -100%);
+}
+[data-main-rotation="270"] {
+  transform: rotate(270deg) translateX(-100%);
+}
+
+.pdfViewer {
+  padding-bottom: var(--pdfViewer-padding-bottom);
+}
+
 .pdfViewer .canvasWrapper {
   overflow: hidden;
 }
@@ -284,18 +890,24 @@
   direction: ltr;
   width: 816px;
   height: 1056px;
-  margin: 1px auto -8px auto;
+  margin: var(--page-margin);
   position: relative;
   overflow: visible;
-  border: 9px solid transparent;
+  border: var(--page-border);
+  -o-border-image: var(--page-border-image);
+     border-image: var(--page-border-image);
   background-clip: content-box;
-  -o-border-image: url(images/shadow.png) 9 9 repeat;
-     border-image: url(images/shadow.png) 9 9 repeat;
   background-color: rgba(255, 255, 255, 1);
 }
 
+.pdfViewer .dummyPage {
+  position: relative;
+  width: 0;
+  height: var(--viewer-container-height);
+}
+
 .pdfViewer.removePageBorders .page {
-  margin: 0px auto 10px auto;
+  margin: 0 auto 10px;
   border: none;
 }
 
@@ -329,6 +941,7 @@
 }
 
 .spread .page,
+.spread .dummyPage,
 .pdfViewer.scrollHorizontal .page,
 .pdfViewer.scrollWrapped .page,
 .pdfViewer.scrollHorizontal .spread,
@@ -340,8 +953,8 @@
 .spread .page,
 .pdfViewer.scrollHorizontal .page,
 .pdfViewer.scrollWrapped .page {
-  margin-left: -3.5px;
-  margin-right: -3.5px;
+  margin-left: var(--spreadHorizontalWrapped-margin-LR);
+  margin-right: var(--spreadHorizontalWrapped-margin-LR);
 }
 
 .pdfViewer.removePageBorders .spread .page,
@@ -369,85 +982,86 @@
   bottom: 0;
   background: url("images/loading-icon.gif") center no-repeat;
 }
+.pdfViewer .page .loadingIcon.notVisible {
+  background: none;
+}
+
+.pdfViewer.enablePermissions .textLayer span {
+  -webkit-user-select: none !important;
+     -moz-user-select: none !important;
+          user-select: none !important;
+  cursor: not-allowed;
+}
 
 .pdfPresentationMode .pdfViewer {
-  margin-left: 0;
-  margin-right: 0;
+  padding-bottom: 0;
 }
 
-.pdfPresentationMode .pdfViewer .page,
-.pdfPresentationMode .pdfViewer .spread {
-  display: block;
+.pdfPresentationMode .spread {
+  margin: 0;
 }
 
-.pdfPresentationMode .pdfViewer .page,
-.pdfPresentationMode .pdfViewer.removePageBorders .page {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.pdfPresentationMode:-ms-fullscreen .pdfViewer .page {
-  margin-bottom: 100% !important;
-}
-
-.pdfPresentationMode:-webkit-full-screen .pdfViewer .page {
-  margin-bottom: 100%;
-  border: 0;
-}
-
-.pdfPresentationMode:-moz-full-screen .pdfViewer .page {
-  margin-bottom: 100%;
-  border: 0;
-}
-
-.pdfPresentationMode:fullscreen .pdfViewer .page {
-  margin-bottom: 100%;
-  border: 0;
+.pdfPresentationMode .pdfViewer .page {
+  margin: 0 auto;
+  border: 2px solid transparent;
 }
 
 :root {
+  --dir-factor: 1;
   --sidebar-width: 200px;
   --sidebar-transition-duration: 200ms;
   --sidebar-transition-timing-function: ease;
+  --scale-select-container-width: 140px;
+  --scale-select-overflow: 22px;
 
   --toolbar-icon-opacity: 0.7;
   --doorhanger-icon-opacity: 0.9;
 
   --main-color: rgba(12, 12, 13, 1);
   --body-bg-color: rgba(237, 237, 240, 1);
-  --errorWrapper-bg-color: rgba(255, 74, 74, 1);
+  --errorWrapper-bg-color: rgba(255, 110, 110, 1);
+  --progressBar-percent: 0%;
+  --progressBar-end-offset: 0;
   --progressBar-color: rgba(10, 132, 255, 1);
   --progressBar-indeterminate-bg-color: rgba(221, 221, 222, 1);
   --progressBar-indeterminate-blend-color: rgba(116, 177, 239, 1);
   --scrollbar-color: auto;
   --scrollbar-bg-color: auto;
+  --toolbar-icon-bg-color: rgba(0, 0, 0, 1);
+  --toolbar-icon-hover-bg-color: rgba(0, 0, 0, 1);
 
-  --sidebar-bg-color: rgba(245, 246, 247, 1);
+  --sidebar-narrow-bg-color: rgba(237, 237, 240, 0.9);
+  --sidebar-toolbar-bg-color: rgba(245, 246, 247, 1);
   --toolbar-bg-color: rgba(249, 249, 250, 1);
   --toolbar-border-color: rgba(204, 204, 204, 1);
   --button-hover-color: rgba(221, 222, 223, 1);
+  --toggled-btn-color: rgba(0, 0, 0, 1);
   --toggled-btn-bg-color: rgba(0, 0, 0, 0.3);
+  --toggled-hover-active-btn-color: rgba(0, 0, 0, 0.4);
   --dropdown-btn-bg-color: rgba(215, 215, 219, 1);
   --separator-color: rgba(0, 0, 0, 0.3);
   --field-color: rgba(6, 6, 6, 1);
   --field-bg-color: rgba(255, 255, 255, 1);
   --field-border-color: rgba(187, 187, 188, 1);
-  --findbar-nextprevious-btn-bg-color: rgba(227, 228, 230, 1);
-  --outline-color: rgba(0, 0, 0, 0.8);
-  --outline-hover-color: rgba(0, 0, 0, 0.9);
-  --outline-active-color: rgba(0, 0, 0, 0.08);
-  --outline-active-bg-color: rgba(0, 0, 0, 1);
+  --treeitem-color: rgba(0, 0, 0, 0.8);
+  --treeitem-hover-color: rgba(0, 0, 0, 0.9);
+  --treeitem-selected-color: rgba(0, 0, 0, 0.9);
+  --treeitem-selected-bg-color: rgba(0, 0, 0, 0.25);
   --sidebaritem-bg-color: rgba(0, 0, 0, 0.15);
   --doorhanger-bg-color: rgba(255, 255, 255, 1);
   --doorhanger-border-color: rgba(12, 12, 13, 0.2);
-  --doorhanger-hover-color: rgba(237, 237, 237, 1);
+  --doorhanger-hover-color: rgba(12, 12, 13, 1);
+  --doorhanger-hover-bg-color: rgba(237, 237, 237, 1);
   --doorhanger-separator-color: rgba(222, 222, 222, 1);
-  --overlay-button-bg-color: rgba(12, 12, 13, 0.1);
-  --overlay-button-hover-color: rgba(12, 12, 13, 0.3);
+  --dialog-button-border: 0 none;
+  --dialog-button-bg-color: rgba(12, 12, 13, 0.1);
+  --dialog-button-hover-bg-color: rgba(12, 12, 13, 0.3);
 
-  /*--loading-icon: url(images/loading.svg);
+  --loading-icon: url(images/loading.svg);
   --treeitem-expanded-icon: url(images/treeitem-expanded.svg);
   --treeitem-collapsed-icon: url(images/treeitem-collapsed.svg);
+  --toolbarButton-editorFreeText-icon: url(images/toolbarButton-editorFreeText.svg);
+  --toolbarButton-editorInk-icon: url(images/toolbarButton-editorInk.svg);
   --toolbarButton-menuArrow-icon: url(images/toolbarButton-menuArrow.svg);
   --toolbarButton-sidebarToggle-icon: url(images/toolbarButton-sidebarToggle.svg);
   --toolbarButton-secondaryToolbarToggle-icon: url(images/toolbarButton-secondaryToolbarToggle.svg);
@@ -464,6 +1078,7 @@
   --toolbarButton-viewOutline-icon: url(images/toolbarButton-viewOutline.svg);
   --toolbarButton-viewAttachments-icon: url(images/toolbarButton-viewAttachments.svg);
   --toolbarButton-viewLayers-icon: url(images/toolbarButton-viewLayers.svg);
+  --toolbarButton-currentOutlineItem-icon: url(images/toolbarButton-currentOutlineItem.svg);
   --toolbarButton-search-icon: url(images/toolbarButton-search.svg);
   --findbarButton-previous-icon: url(images/findbarButton-previous.svg);
   --findbarButton-next-icon: url(images/findbarButton-next.svg);
@@ -473,48 +1088,82 @@
   --secondaryToolbarButton-rotateCw-icon: url(images/secondaryToolbarButton-rotateCw.svg);
   --secondaryToolbarButton-selectTool-icon: url(images/secondaryToolbarButton-selectTool.svg);
   --secondaryToolbarButton-handTool-icon: url(images/secondaryToolbarButton-handTool.svg);
+  --secondaryToolbarButton-scrollPage-icon: url(images/secondaryToolbarButton-scrollPage.svg);
   --secondaryToolbarButton-scrollVertical-icon: url(images/secondaryToolbarButton-scrollVertical.svg);
   --secondaryToolbarButton-scrollHorizontal-icon: url(images/secondaryToolbarButton-scrollHorizontal.svg);
   --secondaryToolbarButton-scrollWrapped-icon: url(images/secondaryToolbarButton-scrollWrapped.svg);
   --secondaryToolbarButton-spreadNone-icon: url(images/secondaryToolbarButton-spreadNone.svg);
   --secondaryToolbarButton-spreadOdd-icon: url(images/secondaryToolbarButton-spreadOdd.svg);
   --secondaryToolbarButton-spreadEven-icon: url(images/secondaryToolbarButton-spreadEven.svg);
-  --secondaryToolbarButton-documentProperties-icon: url(images/secondaryToolbarButton-documentProperties.svg);*/
+  --secondaryToolbarButton-documentProperties-icon: url(images/secondaryToolbarButton-documentProperties.svg);
+}
+
+[dir="rtl"]:root {
+  --dir-factor: -1;
 }
 
 @media (prefers-color-scheme: dark) {
   :root {
     --main-color: rgba(249, 249, 250, 1);
     --body-bg-color: rgba(42, 42, 46, 1);
-    --errorWrapper-bg-color: rgba(199, 17, 17, 1);
+    --errorWrapper-bg-color: rgba(169, 14, 14, 1);
     --progressBar-color: rgba(0, 96, 223, 1);
     --progressBar-indeterminate-bg-color: rgba(40, 40, 43, 1);
     --progressBar-indeterminate-blend-color: rgba(20, 68, 133, 1);
     --scrollbar-color: rgba(121, 121, 123, 1);
     --scrollbar-bg-color: rgba(35, 35, 39, 1);
+    --toolbar-icon-bg-color: rgba(255, 255, 255, 1);
+    --toolbar-icon-hover-bg-color: rgba(255, 255, 255, 1);
 
-    --sidebar-bg-color: rgba(50, 50, 52, 1);
+    --sidebar-narrow-bg-color: rgba(42, 42, 46, 0.9);
+    --sidebar-toolbar-bg-color: rgba(50, 50, 52, 1);
     --toolbar-bg-color: rgba(56, 56, 61, 1);
     --toolbar-border-color: rgba(12, 12, 13, 1);
     --button-hover-color: rgba(102, 102, 103, 1);
+    --toggled-btn-color: rgba(255, 255, 255, 1);
     --toggled-btn-bg-color: rgba(0, 0, 0, 0.3);
+    --toggled-hover-active-btn-color: rgba(0, 0, 0, 0.4);
     --dropdown-btn-bg-color: rgba(74, 74, 79, 1);
     --separator-color: rgba(0, 0, 0, 0.3);
     --field-color: rgba(250, 250, 250, 1);
     --field-bg-color: rgba(64, 64, 68, 1);
     --field-border-color: rgba(115, 115, 115, 1);
-    --findbar-nextprevious-btn-bg-color: rgba(89, 89, 89, 1);
-    --outline-color: rgba(255, 255, 255, 0.8);
-    --outline-hover-color: rgba(255, 255, 255, 0.9);
-    --outline-active-color: rgba(255, 255, 255, 0.08);
-    --outline-active-bg-color: rgba(255, 255, 255, 1);
+    --treeitem-color: rgba(255, 255, 255, 0.8);
+    --treeitem-hover-color: rgba(255, 255, 255, 0.9);
+    --treeitem-selected-color: rgba(255, 255, 255, 0.9);
+    --treeitem-selected-bg-color: rgba(255, 255, 255, 0.25);
     --sidebaritem-bg-color: rgba(255, 255, 255, 0.15);
     --doorhanger-bg-color: rgba(74, 74, 79, 1);
     --doorhanger-border-color: rgba(39, 39, 43, 1);
-    --doorhanger-hover-color: rgba(93, 94, 98, 1);
+    --doorhanger-hover-color: rgba(249, 249, 250, 1);
+    --doorhanger-hover-bg-color: rgba(93, 94, 98, 1);
     --doorhanger-separator-color: rgba(92, 92, 97, 1);
-    --overlay-button-bg-color: rgba(92, 92, 97, 1);
-    --overlay-button-hover-color: rgba(115, 115, 115, 1);
+    --dialog-button-bg-color: rgba(92, 92, 97, 1);
+    --dialog-button-hover-bg-color: rgba(115, 115, 115, 1);
+
+    /* This image is used in <input> elements, which unfortunately means that
+     * the `mask-image` approach used with all of the other images doesn't work
+     * here; hence why we still have two versions of this particular image. */
+    --loading-icon: url(images/loading-dark.svg);
+  }
+}
+
+@media screen and (forced-colors: active) {
+  :root {
+    --button-hover-color: Highlight;
+    --doorhanger-hover-bg-color: Highlight;
+    --toolbar-icon-opacity: 1;
+    --toolbar-icon-bg-color: ButtonText;
+    --toolbar-icon-hover-bg-color: ButtonFace;
+    --toggled-btn-color: HighlightText;
+    --toggled-btn-bg-color: LinkText;
+    --doorhanger-hover-color: ButtonFace;
+    --doorhanger-border-color-whcm: 1px solid ButtonText;
+    --doorhanger-triangle-opacity-whcm: 0;
+    --dialog-button-border: 1px solid Highlight;
+    --dialog-button-hover-bg-color: Highlight;
+    --dialog-button-hover-color: ButtonFace;
+    --field-border-color: ButtonText;
   }
 }
 
@@ -523,211 +1172,32 @@
   margin: 0;
 }
 
-html {
-  height: 100%;
-  width: 100%;
-  /* Font size is needed to make the activity bar the correct size. */
-  font-size: 10px;
-}
-
+html,
 body {
   height: 100%;
   width: 100%;
-  background-color: rgba(237, 237, 240, 1);
-  background-color: var(--body-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  body {
-  background-color: rgba(42, 42, 46, 1);
-  background-color: var(--body-bg-color);
-  }
 }
 
 body {
-  font: message-box;
-  outline: none;
-  scrollbar-color: auto auto;
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  body {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  body {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  body {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  body {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-input {
-  font: message-box;
-  outline: none;
-  scrollbar-color: auto auto;
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  input {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  input {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  input {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  input {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-button {
-  font: message-box;
-  outline: none;
-  scrollbar-color: auto auto;
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  button {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  button {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  button {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  button {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
+  background-color: var(--body-bg-color);
 }
 
+body,
+input,
+button,
 select {
   font: message-box;
   outline: none;
-  scrollbar-color: auto auto;
   scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  select {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  select {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  select {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  select {
-  scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-  scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-  }
-}
-
-.hidden {
-  display: none !important;
-}
+.hidden,
 [hidden] {
   display: none !important;
 }
 
-.pdfViewer.enablePermissions .textLayer > span {
-  -webkit-user-select: none !important;
-     -moz-user-select: none !important;
-      -ms-user-select: none !important;
-          user-select: none !important;
-  cursor: not-allowed;
-}
-
-#viewerContainer.pdfPresentationMode:-ms-fullscreen {
-  top: 0px !important;
-  overflow: hidden !important;
-}
-
-#viewerContainer.pdfPresentationMode:-ms-fullscreen::-ms-backdrop {
-  background-color: rgba(0, 0, 0, 1);
-}
-
 #viewerContainer.pdfPresentationMode:-webkit-full-screen {
-  top: 0px;
-  border-top: 2px solid rgba(0, 0, 0, 0);
+  top: 0;
   background-color: rgba(0, 0, 0, 1);
   width: 100%;
   height: 100%;
@@ -737,33 +1207,8 @@ select {
           user-select: none;
 }
 
-#viewerContainer.pdfPresentationMode:-moz-full-screen {
-  top: 0px;
-  border-top: 2px solid rgba(0, 0, 0, 0);
-  background-color: rgba(0, 0, 0, 1);
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  cursor: none;
-  -moz-user-select: none;
-       user-select: none;
-}
-
-#viewerContainer.pdfPresentationMode:-ms-fullscreen {
-  top: 0px;
-  border-top: 2px solid rgba(0, 0, 0, 0);
-  background-color: rgba(0, 0, 0, 1);
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  cursor: none;
-  -ms-user-select: none;
-      user-select: none;
-}
-
 #viewerContainer.pdfPresentationMode:fullscreen {
-  top: 0px;
-  border-top: 2px solid rgba(0, 0, 0, 0);
+  top: 0;
   background-color: rgba(0, 0, 0, 1);
   width: 100%;
   height: 100%;
@@ -771,7 +1216,6 @@ select {
   cursor: none;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
 }
 
@@ -779,36 +1223,20 @@ select {
   display: none;
 }
 
-.pdfPresentationMode:-moz-full-screen a:not(.internalLink) {
-  display: none;
-}
-
-.pdfPresentationMode:-ms-fullscreen a:not(.internalLink) {
-  display: none;
-}
-
 .pdfPresentationMode:fullscreen a:not(.internalLink) {
   display: none;
 }
 
-.pdfPresentationMode:-webkit-full-screen .textLayer > span {
+.pdfPresentationMode:-webkit-full-screen .textLayer span {
   cursor: none;
 }
 
-.pdfPresentationMode:-moz-full-screen .textLayer > span {
-  cursor: none;
-}
-
-.pdfPresentationMode:-ms-fullscreen .textLayer > span {
-  cursor: none;
-}
-
-.pdfPresentationMode:fullscreen .textLayer > span {
+.pdfPresentationMode:fullscreen .textLayer span {
   cursor: none;
 }
 
 .pdfPresentationMode.pdfPresentationModeControls > *,
-.pdfPresentationMode.pdfPresentationModeControls .textLayer > span {
+.pdfPresentationMode.pdfPresentationModeControls .textLayer span {
   cursor: default;
 }
 
@@ -818,54 +1246,58 @@ select {
   position: relative;
 }
 
+[dir="ltr"] #sidebarContainer {
+  left: calc(-1 * var(--sidebar-width));
+}
+
+[dir="rtl"] #sidebarContainer {
+  right: calc(-1 * var(--sidebar-width));
+}
+
+[dir="ltr"] #sidebarContainer {
+  border-right: var(--doorhanger-border-color-whcm);
+}
+
+[dir="rtl"] #sidebarContainer {
+  border-left: var(--doorhanger-border-color-whcm);
+}
+
+[dir="ltr"] #sidebarContainer {
+  transition-property: left;
+}
+
+[dir="rtl"] #sidebarContainer {
+  transition-property: right;
+}
+
 #sidebarContainer {
   position: absolute;
   top: 32px;
   bottom: 0;
-  width: 200px;
+  inset-inline-start: calc(-1 * var(--sidebar-width));
   width: var(--sidebar-width);
   visibility: hidden;
   z-index: 100;
   border-top: 1px solid rgba(51, 51, 51, 1);
-  transition-duration: 200ms;
+  -webkit-border-end: var(--doorhanger-border-color-whcm);
+          border-inline-end: var(--doorhanger-border-color-whcm);
+  transition-property: inset-inline-start;
   transition-duration: var(--sidebar-transition-duration);
-  transition-timing-function: ease;
   transition-timing-function: var(--sidebar-transition-timing-function);
 }
-html[dir="ltr"] #sidebarContainer {
-  transition-property: left;
-  left: -200px;
-  left: calc(0px - var(--sidebar-width));
-}
-html[dir="rtl"] #sidebarContainer {
-  transition-property: right;
-  right: -200px;
-  right: calc(0px - var(--sidebar-width));
-}
-
-.loadingInProgress #sidebarContainer {
-  top: 36px;
-}
-
-#outerContainer.sidebarResizing #sidebarContainer {
-  /* Improve responsiveness and avoid visual glitches when the sidebar is resized. */
-  transition-duration: 0s;
-  /* Prevent e.g. the thumbnails being selected when the sidebar is resized. */
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-}
 
 #outerContainer.sidebarMoving #sidebarContainer,
 #outerContainer.sidebarOpen #sidebarContainer {
   visibility: visible;
 }
-html[dir="ltr"] #outerContainer.sidebarOpen #sidebarContainer {
-  left: 0px;
+[dir="ltr"] #outerContainer.sidebarOpen #sidebarContainer {
+  left: 0;
 }
-html[dir="rtl"] #outerContainer.sidebarOpen #sidebarContainer {
-  right: 0px;
+[dir="rtl"] #outerContainer.sidebarOpen #sidebarContainer {
+  right: 0;
+}
+#outerContainer.sidebarOpen #sidebarContainer {
+  inset-inline-start: 0;
 }
 
 #mainContainer {
@@ -874,30 +1306,30 @@ html[dir="rtl"] #outerContainer.sidebarOpen #sidebarContainer {
   right: 0;
   bottom: 0;
   left: 0;
-  min-width: 320px;
+  min-width: 350px;
+}
+
+[dir="ltr"] #sidebarContent {
+  left: 0;
+}
+
+[dir="rtl"] #sidebarContent {
+  right: 0;
 }
 
 #sidebarContent {
   top: 32px;
   bottom: 0;
+  inset-inline-start: 0;
   overflow: auto;
-  -webkit-overflow-scrolling: touch;
   position: absolute;
   width: 100%;
   background-color: rgba(0, 0, 0, 0.1);
-}
-html[dir="ltr"] #sidebarContent {
-  left: 0;
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25);
-}
-html[dir="rtl"] #sidebarContent {
-  right: 0;
-  box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.25);
+  box-shadow: inset calc(-1px * var(--dir-factor)) 0 0 rgba(0, 0, 0, 0.25);
 }
 
 #viewerContainer {
   overflow: auto;
-  -webkit-overflow-scrolling: touch;
   position: absolute;
   top: 32px;
   right: 0;
@@ -906,32 +1338,31 @@ html[dir="rtl"] #sidebarContent {
   outline: none;
 }
 #viewerContainer:not(.pdfPresentationMode) {
-  transition-duration: 200ms;
   transition-duration: var(--sidebar-transition-duration);
-  transition-timing-function: ease;
   transition-timing-function: var(--sidebar-transition-timing-function);
 }
 
-#outerContainer.sidebarResizing #viewerContainer {
-  /* Improve responsiveness and avoid visual glitches when the sidebar is resized. */
-  transition-duration: 0s;
-}
-
-html[dir="ltr"]
-  #outerContainer.sidebarOpen
-  #viewerContainer:not(.pdfPresentationMode) {
-  transition-property: left;
-  left: 200px;
+[dir="ltr"] #outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
   left: var(--sidebar-width);
 }
-html[dir="rtl"]
-  #outerContainer.sidebarOpen
-  #viewerContainer:not(.pdfPresentationMode) {
-  transition-property: right;
-  right: 200px;
+
+[dir="rtl"] #outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
   right: var(--sidebar-width);
 }
 
+[dir="ltr"] #outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
+  transition-property: left;
+}
+
+[dir="rtl"] #outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
+  transition-property: right;
+}
+
+#outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
+  inset-inline-start: var(--sidebar-width);
+  transition-property: inset-inline-start;
+}
+
 .toolbar {
   position: relative;
   left: 0;
@@ -947,256 +1378,127 @@ html[dir="rtl"]
 #toolbarSidebar {
   width: 100%;
   height: 32px;
-  background-color: rgba(245, 246, 247, 1);
-  background-color: var(--sidebar-bg-color);
+  background-color: var(--sidebar-toolbar-bg-color);
+  box-shadow: inset calc(-1px * var(--dir-factor)) 0 0 rgba(0, 0, 0, 0.25),
+    0 1px 0 rgba(0, 0, 0, 0.15), 0 0 1px rgba(0, 0, 0, 0.1);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #toolbarSidebar {
-  background-color: rgba(50, 50, 52, 1);
-  background-color: var(--sidebar-bg-color);
-  }
-}
-html[dir="ltr"] #toolbarSidebar {
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(0, 0, 0, 0.15),
-    0 0 1px rgba(0, 0, 0, 0.1);
-}
-html[dir="rtl"] #toolbarSidebar {
-  box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(0, 0, 0, 0.15),
-    0 0 1px rgba(0, 0, 0, 0.1);
+[dir="ltr"] #sidebarResizer {
+  right: -6px;
 }
 
-html[dir="ltr"] #toolbarSidebar .toolbarButton {
-  margin-right: 2px !important;
-}
-html[dir="rtl"] #toolbarSidebar .toolbarButton {
-  margin-left: 2px !important;
+[dir="rtl"] #sidebarResizer {
+  left: -6px;
 }
 
 #sidebarResizer {
   position: absolute;
   top: 0;
   bottom: 0;
+  inset-inline-end: -6px;
   width: 6px;
   z-index: 200;
   cursor: ew-resize;
 }
-html[dir="ltr"] #sidebarResizer {
-  right: -6px;
-}
-html[dir="rtl"] #sidebarResizer {
-  left: -6px;
-}
 
-#toolbarContainer {
+#toolbarContainer,
+.findbar,
+.secondaryToolbar,
+.editorParamsToolbar {
   position: relative;
   height: 32px;
-  background-color: rgba(249, 249, 250, 1);
   background-color: var(--toolbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #toolbarContainer {
-  background-color: rgba(56, 56, 61, 1);
-  background-color: var(--toolbar-bg-color);
-  }
-}
-
-.findbar {
-  position: relative;
-  height: 32px;
-  background-color: rgba(249, 249, 250, 1);
-  background-color: var(--toolbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .findbar {
-  background-color: rgba(56, 56, 61, 1);
-  background-color: var(--toolbar-bg-color);
-  }
-}
-
-.secondaryToolbar {
-  position: relative;
-  height: 32px;
-  background-color: rgba(249, 249, 250, 1);
-  background-color: var(--toolbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbar {
-  background-color: rgba(56, 56, 61, 1);
-  background-color: var(--toolbar-bg-color);
-  }
-}
-html[dir="ltr"] #toolbarContainer {
-  box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
   box-shadow: 0 1px 0 var(--toolbar-border-color);
 }
-@media (prefers-color-scheme: dark) {
-
-  html[dir="ltr"] #toolbarContainer {
-  box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-  }
-}
-.findbar {
-  box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  .findbar {
-  box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-  }
-}
-.secondaryToolbar {
-  box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbar {
-  box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-  }
-}
-html[dir="rtl"] #toolbarContainer {
-  box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  html[dir="rtl"] #toolbarContainer {
-  box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-  }
-}
-.findbar {
-  box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  .findbar {
-  box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-  }
-}
-.secondaryToolbar {
-  box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbar {
-  box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
-  box-shadow: 0 1px 0 var(--toolbar-border-color);
-  }
-}
 
 #toolbarViewer {
   height: 32px;
 }
 
+[dir="ltr"] #loadingBar {
+  left: 0;
+  right: var(--progressBar-end-offset);
+}
+
+[dir="rtl"] #loadingBar {
+  right: 0;
+  left: var(--progressBar-end-offset);
+}
+
+[dir="ltr"] #loadingBar {
+  transition-property: left;
+}
+
+[dir="rtl"] #loadingBar {
+  transition-property: right;
+}
+
 #loadingBar {
-  position: relative;
-  width: 100%;
+  position: absolute;
+  inset-inline: 0 var(--progressBar-end-offset);
   height: 4px;
-  background-color: rgba(237, 237, 240, 1);
   background-color: var(--body-bg-color);
-  border-bottom: 1px solid rgba(204, 204, 204, 1);
   border-bottom: 1px solid var(--toolbar-border-color);
+  transition-property: inset-inline-start;
+  transition-duration: var(--sidebar-transition-duration);
+  transition-timing-function: var(--sidebar-transition-timing-function);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar {
-  border-bottom: 1px solid rgba(12, 12, 13, 1);
-  border-bottom: 1px solid var(--toolbar-border-color);
-  }
+[dir="ltr"] #outerContainer.sidebarOpen #loadingBar {
+  left: var(--sidebar-width);
 }
 
-@media (prefers-color-scheme: dark) {
+[dir="rtl"] #outerContainer.sidebarOpen #loadingBar {
+  right: var(--sidebar-width);
+}
 
-  #loadingBar {
-  background-color: rgba(42, 42, 46, 1);
-  background-color: var(--body-bg-color);
-  }
+#outerContainer.sidebarOpen #loadingBar {
+  inset-inline-start: var(--sidebar-width);
 }
 
 #loadingBar .progress {
   position: absolute;
   top: 0;
   left: 0;
-  width: 0%;
+  width: 100%;
+  transform: scaleX(var(--progressBar-percent));
+  transform-origin: 0 0;
   height: 100%;
-  background-color: rgba(10, 132, 255, 1);
   background-color: var(--progressBar-color);
   overflow: hidden;
-  transition: width 200ms;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress {
-  background-color: rgba(0, 96, 223, 1);
-  background-color: var(--progressBar-color);
-  }
+  transition: transform 200ms;
 }
 
 @-webkit-keyframes progressIndeterminate {
   0% {
-    left: -142px;
+    transform: translateX(-142px);
   }
   100% {
-    left: 0;
+    transform: translateX(0);
   }
 }
 
 @keyframes progressIndeterminate {
   0% {
-    left: -142px;
+    transform: translateX(-142px);
   }
   100% {
-    left: 0;
+    transform: translateX(0);
   }
 }
 
-#loadingBar .progress.indeterminate {
-  background-color: rgba(221, 221, 222, 1);
+#loadingBar.indeterminate .progress {
+  transform: none;
   background-color: var(--progressBar-indeterminate-bg-color);
   transition: none;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate {
-  background-color: rgba(40, 40, 43, 1);
-  background-color: var(--progressBar-indeterminate-bg-color);
-  }
-}
-
-#loadingBar .progress.indeterminate .glimmer {
+#loadingBar.indeterminate .progress .glimmer {
   position: absolute;
   top: 0;
   left: 0;
   height: 100%;
   width: calc(100% + 150px);
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(116, 177, 239, 1) 0,
-    rgba(221, 221, 222, 1) 5px,
-    rgba(221, 221, 222, 1) 45px,
-    rgba(10, 132, 255, 1) 55px,
-    rgba(10, 132, 255, 1) 95px,
-    rgba(116, 177, 239, 1) 100px
-  );
   background: repeating-linear-gradient(
     135deg,
     var(--progressBar-indeterminate-blend-color) 0,
@@ -1210,365 +1512,61 @@ html[dir="rtl"] #toolbarContainer {
           animation: progressIndeterminate 1s linear infinite;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate .glimmer {
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(20, 68, 133, 1) 0,
-    rgba(40, 40, 43, 1) 5px,
-    rgba(40, 40, 43, 1) 45px,
-    rgba(0, 96, 223, 1) 55px,
-    rgba(0, 96, 223, 1) 95px,
-    rgba(20, 68, 133, 1) 100px
-  );
-  background: repeating-linear-gradient(
-    135deg,
-    var(--progressBar-indeterminate-blend-color) 0,
-    var(--progressBar-indeterminate-bg-color) 5px,
-    var(--progressBar-indeterminate-bg-color) 45px,
-    var(--progressBar-color) 55px,
-    var(--progressBar-color) 95px,
-    var(--progressBar-indeterminate-blend-color) 100px
-  );
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate .glimmer {
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(20, 68, 133, 1) 0,
-    rgba(40, 40, 43, 1) 5px,
-    rgba(40, 40, 43, 1) 45px,
-    rgba(0, 96, 223, 1) 55px,
-    rgba(0, 96, 223, 1) 95px,
-    rgba(20, 68, 133, 1) 100px
-  );
-  background: repeating-linear-gradient(
-    135deg,
-    var(--progressBar-indeterminate-blend-color) 0,
-    var(--progressBar-indeterminate-bg-color) 5px,
-    var(--progressBar-indeterminate-bg-color) 45px,
-    var(--progressBar-color) 55px,
-    var(--progressBar-color) 95px,
-    var(--progressBar-indeterminate-blend-color) 100px
-  );
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate .glimmer {
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(20, 68, 133, 1) 0,
-    rgba(40, 40, 43, 1) 5px,
-    rgba(40, 40, 43, 1) 45px,
-    rgba(0, 96, 223, 1) 55px,
-    rgba(0, 96, 223, 1) 95px,
-    rgba(20, 68, 133, 1) 100px
-  );
-  background: repeating-linear-gradient(
-    135deg,
-    var(--progressBar-indeterminate-blend-color) 0,
-    var(--progressBar-indeterminate-bg-color) 5px,
-    var(--progressBar-indeterminate-bg-color) 45px,
-    var(--progressBar-color) 55px,
-    var(--progressBar-color) 95px,
-    var(--progressBar-indeterminate-blend-color) 100px
-  );
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate .glimmer {
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(20, 68, 133, 1) 0,
-    rgba(40, 40, 43, 1) 5px,
-    rgba(40, 40, 43, 1) 45px,
-    rgba(0, 96, 223, 1) 55px,
-    rgba(0, 96, 223, 1) 95px,
-    rgba(20, 68, 133, 1) 100px
-  );
-  background: repeating-linear-gradient(
-    135deg,
-    var(--progressBar-indeterminate-blend-color) 0,
-    var(--progressBar-indeterminate-bg-color) 5px,
-    var(--progressBar-indeterminate-bg-color) 45px,
-    var(--progressBar-color) 55px,
-    var(--progressBar-color) 95px,
-    var(--progressBar-indeterminate-blend-color) 100px
-  );
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate .glimmer {
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(20, 68, 133, 1) 0,
-    rgba(40, 40, 43, 1) 5px,
-    rgba(40, 40, 43, 1) 45px,
-    rgba(0, 96, 223, 1) 55px,
-    rgba(0, 96, 223, 1) 95px,
-    rgba(20, 68, 133, 1) 100px
-  );
-  background: repeating-linear-gradient(
-    135deg,
-    var(--progressBar-indeterminate-blend-color) 0,
-    var(--progressBar-indeterminate-bg-color) 5px,
-    var(--progressBar-indeterminate-bg-color) 45px,
-    var(--progressBar-color) 55px,
-    var(--progressBar-color) 95px,
-    var(--progressBar-indeterminate-blend-color) 100px
-  );
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate .glimmer {
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(20, 68, 133, 1) 0,
-    rgba(40, 40, 43, 1) 5px,
-    rgba(40, 40, 43, 1) 45px,
-    rgba(0, 96, 223, 1) 55px,
-    rgba(0, 96, 223, 1) 95px,
-    rgba(20, 68, 133, 1) 100px
-  );
-  background: repeating-linear-gradient(
-    135deg,
-    var(--progressBar-indeterminate-blend-color) 0,
-    var(--progressBar-indeterminate-bg-color) 5px,
-    var(--progressBar-indeterminate-bg-color) 45px,
-    var(--progressBar-color) 55px,
-    var(--progressBar-color) 95px,
-    var(--progressBar-indeterminate-blend-color) 100px
-  );
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate .glimmer {
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(20, 68, 133, 1) 0,
-    rgba(40, 40, 43, 1) 5px,
-    rgba(40, 40, 43, 1) 45px,
-    rgba(0, 96, 223, 1) 55px,
-    rgba(0, 96, 223, 1) 95px,
-    rgba(20, 68, 133, 1) 100px
-  );
-  background: repeating-linear-gradient(
-    135deg,
-    var(--progressBar-indeterminate-blend-color) 0,
-    var(--progressBar-indeterminate-bg-color) 5px,
-    var(--progressBar-indeterminate-bg-color) 45px,
-    var(--progressBar-color) 55px,
-    var(--progressBar-color) 95px,
-    var(--progressBar-indeterminate-blend-color) 100px
-  );
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate .glimmer {
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(20, 68, 133, 1) 0,
-    rgba(40, 40, 43, 1) 5px,
-    rgba(40, 40, 43, 1) 45px,
-    rgba(0, 96, 223, 1) 55px,
-    rgba(0, 96, 223, 1) 95px,
-    rgba(20, 68, 133, 1) 100px
-  );
-  background: repeating-linear-gradient(
-    135deg,
-    var(--progressBar-indeterminate-blend-color) 0,
-    var(--progressBar-indeterminate-bg-color) 5px,
-    var(--progressBar-indeterminate-bg-color) 45px,
-    var(--progressBar-color) 55px,
-    var(--progressBar-color) 95px,
-    var(--progressBar-indeterminate-blend-color) 100px
-  );
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #loadingBar .progress.indeterminate .glimmer {
-  background: repeating-linear-gradient(
-    135deg,
-    rgba(20, 68, 133, 1) 0,
-    rgba(40, 40, 43, 1) 5px,
-    rgba(40, 40, 43, 1) 45px,
-    rgba(0, 96, 223, 1) 55px,
-    rgba(0, 96, 223, 1) 95px,
-    rgba(20, 68, 133, 1) 100px
-  );
-  background: repeating-linear-gradient(
-    135deg,
-    var(--progressBar-indeterminate-blend-color) 0,
-    var(--progressBar-indeterminate-bg-color) 5px,
-    var(--progressBar-indeterminate-bg-color) 45px,
-    var(--progressBar-color) 55px,
-    var(--progressBar-color) 95px,
-    var(--progressBar-indeterminate-blend-color) 100px
-  );
-  }
+#outerContainer.sidebarResizing #sidebarContainer,
+#outerContainer.sidebarResizing #viewerContainer,
+#outerContainer.sidebarResizing #loadingBar {
+  /* Improve responsiveness and avoid visual glitches when the sidebar is resized. */
+  transition-duration: 0s;
 }
 
 .findbar,
-.secondaryToolbar {
+.secondaryToolbar,
+.editorParamsToolbar {
   top: 32px;
   position: absolute;
   z-index: 10000;
   height: auto;
-  min-width: 16px;
-  padding: 0px 4px 0px 4px;
-  margin: 4px 2px 4px 2px;
-  color: rgba(217, 217, 217, 1);
+  padding: 0 4px;
+  margin: 4px 2px;
   font-size: 12px;
   line-height: 14px;
   text-align: left;
   cursor: default;
 }
 
-.findbar {
-  min-width: 300px;
-  background-color: rgba(249, 249, 250, 1);
-  background-color: var(--toolbar-bg-color);
+[dir="ltr"] .findbar {
+  left: 64px;
 }
 
-@media (prefers-color-scheme: dark) {
+[dir="rtl"] .findbar {
+  right: 64px;
+}
 
-  .findbar {
-  background-color: rgba(56, 56, 61, 1);
+.findbar {
+  inset-inline-start: 64px;
+  min-width: 300px;
   background-color: var(--toolbar-bg-color);
-  }
 }
 .findbar > div {
   height: 32px;
 }
-.findbar.wrapContainers > div {
+[dir="ltr"] .findbar > div#findbarInputContainer {
+  margin-right: 4px;
+}
+[dir="rtl"] .findbar > div#findbarInputContainer {
+  margin-left: 4px;
+}
+.findbar > div#findbarInputContainer {
+  -webkit-margin-end: 4px;
+          margin-inline-end: 4px;
+}
+.findbar.wrapContainers > div,
+.findbar.wrapContainers > div#findbarMessageContainer > * {
   clear: both;
 }
 .findbar.wrapContainers > div#findbarMessageContainer {
   height: auto;
 }
-html[dir="ltr"] .findbar {
-  left: 64px;
-}
-html[dir="rtl"] .findbar {
-  right: 64px;
-}
-
-html[dir="ltr"] .findbar .splitToolbarButton {
-  margin-left: 0px;
-  margin-top: 3px;
-}
-
-html[dir="rtl"] .findbar .splitToolbarButton {
-  margin-right: 0px;
-  margin-top: 3px;
-}
-
-.findbar .splitToolbarButton .findNext {
-  width: 29px;
-}
-
-html[dir="ltr"] .findbar .splitToolbarButton .findNext {
-  border-right: 1px solid rgba(187, 187, 188, 1);
-  border-right: 1px solid var(--field-border-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  html[dir="ltr"] .findbar .splitToolbarButton .findNext {
-  border-right: 1px solid rgba(115, 115, 115, 1);
-  border-right: 1px solid var(--field-border-color);
-  }
-}
-
-html[dir="rtl"] .findbar .splitToolbarButton .findNext {
-  border-left: 1px solid rgba(187, 187, 188, 1);
-  border-left: 1px solid var(--field-border-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  html[dir="rtl"] .findbar .splitToolbarButton .findNext {
-  border-left: 1px solid rgba(115, 115, 115, 1);
-  border-left: 1px solid var(--field-border-color);
-  }
-}
-
-.findbar .splitToolbarButton .toolbarButton {
-  background-color: rgba(227, 228, 230, 1);
-  background-color: var(--findbar-nextprevious-btn-bg-color);
-  border-radius: 0px;
-  height: 26px;
-  border-top: 1px solid rgba(187, 187, 188, 1);
-  border-top: 1px solid var(--field-border-color);
-  border-bottom: 1px solid rgba(187, 187, 188, 1);
-  border-bottom: 1px solid var(--field-border-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .findbar .splitToolbarButton .toolbarButton {
-  border-bottom: 1px solid rgba(115, 115, 115, 1);
-  border-bottom: 1px solid var(--field-border-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .findbar .splitToolbarButton .toolbarButton {
-  border-top: 1px solid rgba(115, 115, 115, 1);
-  border-top: 1px solid var(--field-border-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .findbar .splitToolbarButton .toolbarButton {
-  background-color: rgba(89, 89, 89, 1);
-  background-color: var(--findbar-nextprevious-btn-bg-color);
-  }
-}
-
-.findbar .splitToolbarButton .toolbarButton::before {
-  top: 5px;
-}
-
-html[dir="ltr"] .findbar .splitToolbarButton > .findPrevious {
-  border-radius: 0;
-}
-html[dir="ltr"] .findbar .splitToolbarButton > .findNext {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 2px;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-}
-
-html[dir="rtl"] .findbar .splitToolbarButton > .findPrevious {
-  border-radius: 0;
-}
-html[dir="rtl"] .findbar .splitToolbarButton > .findNext {
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 0;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-}
 
 .findbar input[type="checkbox"] {
   pointer-events: none;
@@ -1577,360 +1575,385 @@ html[dir="rtl"] .findbar .splitToolbarButton > .findNext {
 .findbar label {
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
 }
 
-.findbar label:hover {
-  background-color: rgba(221, 222, 223, 1);
+.findbar label:hover,
+.findbar input:focus-visible + label {
+  color: var(--toggled-btn-color);
   background-color: var(--button-hover-color);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .findbar label:hover {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-
-.findbar input:focus + label {
-  background-color: rgba(221, 222, 223, 1);
-  background-color: var(--button-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .findbar input:focus + label {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-
-html[dir="ltr"] #findInput {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-html[dir="rtl"] #findInput {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
 .findbar .toolbarField[type="checkbox"]:checked + .toolbarLabel {
-  background-color: rgba(0, 0, 0, 0.3) !important;
   background-color: var(--toggled-btn-bg-color) !important;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .findbar .toolbarField[type="checkbox"]:checked + .toolbarLabel {
-  background-color: rgba(0, 0, 0, 0.3) !important;
-  background-color: var(--toggled-btn-bg-color) !important;
-  }
+  color: var(--toggled-btn-color);
 }
 
 #findInput {
   width: 200px;
 }
-#findInput::-webkit-input-placeholder {
-  color: rgba(191, 191, 191, 1);
-}
 #findInput::-moz-placeholder {
   font-style: normal;
 }
-#findInput:-ms-input-placeholder {
-  font-style: normal;
-}
-#findInput::-ms-input-placeholder {
-  font-style: normal;
-}
 #findInput::placeholder {
   font-style: normal;
 }
 #findInput[data-status="pending"] {
-  background-image: url(images/loading.svg);
-  /*background-image: var(--loading-icon);*/
+  background-image: var(--loading-icon);
   background-repeat: no-repeat;
-  background-position: 98%;
+  background-position: calc(50% + 48% * var(--dir-factor));
 }
-@media (prefers-color-scheme: dark) {
-
-  #findInput[data-status="pending"] {
-  background-image: url(images/loading-dark.svg);
-  /*background-image: var(--loading-icon);*/
-  }
-}
-html[dir="rtl"] #findInput[data-status="pending"] {
-  background-position: 3px;
+#findInput[data-status="notFound"] {
+  background-color: rgba(255, 102, 102, 1);
 }
 
-.secondaryToolbar {
-  padding: 6px 0 10px 0;
-  height: auto;
-  z-index: 30000;
-  background-color: rgba(255, 255, 255, 1);
-  background-color: var(--doorhanger-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbar {
-  background-color: rgba(74, 74, 79, 1);
-  background-color: var(--doorhanger-bg-color);
-  }
-}
-html[dir="ltr"] .secondaryToolbar {
+[dir="ltr"] .secondaryToolbar,[dir="ltr"] 
+.editorParamsToolbar {
   right: 4px;
 }
-html[dir="rtl"] .secondaryToolbar {
+
+[dir="rtl"] .secondaryToolbar,[dir="rtl"] 
+.editorParamsToolbar {
   left: 4px;
 }
 
+.secondaryToolbar,
+.editorParamsToolbar {
+  padding: 6px 0 10px;
+  inset-inline-end: 4px;
+  height: auto;
+  z-index: 30000;
+  background-color: var(--doorhanger-bg-color);
+}
+
+.editorParamsToolbarContainer {
+  width: 220px;
+  margin-bottom: -4px;
+}
+
+.editorParamsToolbarContainer > .editorParamsSetter {
+  min-height: 26px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-inline: 10px;
+}
+
+[dir="ltr"] .editorParamsToolbarContainer .editorParamsLabel {
+  padding-right: 10px;
+}
+
+[dir="rtl"] .editorParamsToolbarContainer .editorParamsLabel {
+  padding-left: 10px;
+}
+
+.editorParamsToolbarContainer .editorParamsLabel {
+  -webkit-padding-end: 10px;
+          padding-inline-end: 10px;
+  flex: none;
+  color: var(--main-color);
+}
+
+.editorParamsToolbarContainer .editorParamsColor {
+  width: 32px;
+  height: 32px;
+  flex: none;
+}
+
+.editorParamsToolbarContainer .editorParamsSlider {
+  background-color: transparent;
+  width: 90px;
+  flex: 0 1 0;
+}
+
+.editorParamsToolbarContainer .editorParamsSlider::-moz-range-progress {
+  background-color: black;
+}
+
+.editorParamsToolbarContainer .editorParamsSlider::-webkit-slider-runnable-track,
+.editorParamsToolbarContainer .editorParamsSlider::-moz-range-track {
+  background-color: black;
+}
+
+.editorParamsToolbarContainer .editorParamsSlider::-webkit-slider-thumb,
+.editorParamsToolbarContainer .editorParamsSlider::-moz-range-thumb {
+  background-color: white;
+}
+
 #secondaryToolbarButtonContainer {
   max-width: 220px;
-  max-height: 400px;
+  min-height: 26px;
+  max-height: calc(var(--viewer-container-height) - 40px);
   overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
   margin-bottom: -4px;
 }
 
-#secondaryToolbarButtonContainer.hiddenScrollModeButtons > .scrollModeButtons,
-#secondaryToolbarButtonContainer.hiddenSpreadModeButtons > .spreadModeButtons {
-  display: none !important;
+[dir="ltr"] #editorInkParamsToolbar {
+  right: 40px;
 }
 
-.doorHanger {
-  border-radius: 2px;
-  box-shadow: 0 1px 5px rgba(12, 12, 13, 0.2),
-    0 0 0 1px rgba(12, 12, 13, 0.2);
-  box-shadow: 0 1px 5px var(--doorhanger-border-color),
-    0 0 0 1px var(--doorhanger-border-color);
+[dir="rtl"] #editorInkParamsToolbar {
+  left: 40px;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .doorHanger {
-  box-shadow: 0 1px 5px rgba(39, 39, 43, 1),
-    0 0 0 1px rgba(39, 39, 43, 1);
-  box-shadow: 0 1px 5px var(--doorhanger-border-color),
-    0 0 0 1px var(--doorhanger-border-color);
-  }
+#editorInkParamsToolbar {
+  inset-inline-end: 40px;
+  background-color: var(--toolbar-bg-color);
 }
 
+[dir="ltr"] #editorFreeTextParamsToolbar {
+  right: 68px;
+}
+
+[dir="rtl"] #editorFreeTextParamsToolbar {
+  left: 68px;
+}
+
+#editorFreeTextParamsToolbar {
+  inset-inline-end: 68px;
+  background-color: var(--toolbar-bg-color);
+}
+
+.doorHanger,
 .doorHangerRight {
   border-radius: 2px;
-  box-shadow: 0 1px 5px rgba(12, 12, 13, 0.2),
-    0 0 0 1px rgba(12, 12, 13, 0.2);
   box-shadow: 0 1px 5px var(--doorhanger-border-color),
     0 0 0 1px var(--doorhanger-border-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .doorHangerRight {
-  box-shadow: 0 1px 5px rgba(39, 39, 43, 1),
-    0 0 0 1px rgba(39, 39, 43, 1);
-  box-shadow: 0 1px 5px var(--doorhanger-border-color),
-    0 0 0 1px var(--doorhanger-border-color);
-  }
+  border: var(--doorhanger-border-color-whcm);
 }
 .doorHanger:after,
 .doorHanger:before,
 .doorHangerRight:after,
 .doorHangerRight:before {
   bottom: 100%;
-  border: solid rgba(0, 0, 0, 0);
+  border: 8px solid rgba(0, 0, 0, 0);
   content: " ";
   height: 0;
   width: 0;
   position: absolute;
   pointer-events: none;
+  opacity: var(--doorhanger-triangle-opacity-whcm);
 }
-.doorHanger:after,
-.doorHangerRight:after {
-  border-width: 8px;
-}
-.doorHanger:after {
-  border-bottom-color: rgba(249, 249, 250, 1);
-  border-bottom-color: var(--toolbar-bg-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  .doorHanger:after {
-  border-bottom-color: rgba(56, 56, 61, 1);
-  border-bottom-color: var(--toolbar-bg-color);
-  }
-}
-.doorHangerRight:after {
-  border-bottom-color: rgba(255, 255, 255, 1);
-  border-bottom-color: var(--doorhanger-bg-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  .doorHangerRight:after {
-  border-bottom-color: rgba(74, 74, 79, 1);
-  border-bottom-color: var(--doorhanger-bg-color);
-  }
-}
-.doorHanger:before {
-  border-bottom-color: rgba(12, 12, 13, 0.2);
-  border-bottom-color: var(--doorhanger-border-color);
-  border-width: 9px;
-}
-@media (prefers-color-scheme: dark) {
-
-  .doorHanger:before {
-  border-bottom-color: rgba(39, 39, 43, 1);
-  border-bottom-color: var(--doorhanger-border-color);
-  }
-}
-.doorHangerRight:before {
-  border-bottom-color: rgba(12, 12, 13, 0.2);
-  border-bottom-color: var(--doorhanger-border-color);
-  border-width: 9px;
-}
-@media (prefers-color-scheme: dark) {
-
-  .doorHangerRight:before {
-  border-bottom-color: rgba(39, 39, 43, 1);
-  border-bottom-color: var(--doorhanger-border-color);
-  }
-}
-
-html[dir="ltr"] .doorHanger:after,
-html[dir="rtl"] .doorHangerRight:after {
+[dir="ltr"] .doorHanger:after {
   left: 10px;
+}
+[dir="rtl"] .doorHanger:after {
+  right: 10px;
+}
+[dir="ltr"] .doorHanger:after {
   margin-left: -8px;
 }
-
-html[dir="ltr"] .doorHanger:before,
-html[dir="rtl"] .doorHangerRight:before {
-  left: 10px;
-  margin-left: -9px;
-}
-
-html[dir="rtl"] .doorHanger:after,
-html[dir="ltr"] .doorHangerRight:after {
-  right: 10px;
+[dir="rtl"] .doorHanger:after {
   margin-right: -8px;
 }
-
-html[dir="rtl"] .doorHanger:before,
-html[dir="ltr"] .doorHangerRight:before {
+.doorHanger:after {
+  inset-inline-start: 10px;
+  -webkit-margin-start: -8px;
+          margin-inline-start: -8px;
+  border-bottom-color: var(--toolbar-bg-color);
+}
+[dir="ltr"] .doorHangerRight:after {
   right: 10px;
+}
+[dir="rtl"] .doorHangerRight:after {
+  left: 10px;
+}
+[dir="ltr"] .doorHangerRight:after {
+  margin-right: -8px;
+}
+[dir="rtl"] .doorHangerRight:after {
+  margin-left: -8px;
+}
+.doorHangerRight:after {
+  inset-inline-end: 10px;
+  -webkit-margin-end: -8px;
+          margin-inline-end: -8px;
+  border-bottom-color: var(--doorhanger-bg-color);
+}
+.doorHanger:before,
+.doorHangerRight:before {
+  border-bottom-color: var(--doorhanger-border-color);
+  border-width: 9px;
+}
+[dir="ltr"] .doorHanger:before {
+  left: 10px;
+}
+[dir="rtl"] .doorHanger:before {
+  right: 10px;
+}
+[dir="ltr"] .doorHanger:before {
+  margin-left: -9px;
+}
+[dir="rtl"] .doorHanger:before {
   margin-right: -9px;
 }
+.doorHanger:before {
+  inset-inline-start: 10px;
+  -webkit-margin-start: -9px;
+          margin-inline-start: -9px;
+}
+[dir="ltr"] .doorHangerRight:before {
+  right: 10px;
+}
+[dir="rtl"] .doorHangerRight:before {
+  left: 10px;
+}
+[dir="ltr"] .doorHangerRight:before {
+  margin-right: -9px;
+}
+[dir="rtl"] .doorHangerRight:before {
+  margin-left: -9px;
+}
+.doorHangerRight:before {
+  inset-inline-end: 10px;
+  -webkit-margin-end: -9px;
+          margin-inline-end: -9px;
+}
 
 #findResultsCount {
   background-color: rgba(217, 217, 217, 1);
   color: rgba(82, 82, 82, 1);
   text-align: center;
-  padding: 3px 4px;
+  padding: 4px 5px;
   margin: 5px;
 }
 
 #findMsg {
   color: rgba(251, 0, 0, 1);
 }
+
+#findResultsCount:empty,
 #findMsg:empty {
   display: none;
 }
 
-#findInput.notFound {
-  background-color: rgba(255, 102, 102, 1);
-}
-
 #toolbarViewerMiddle {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
 }
 
-html[dir="ltr"] #toolbarViewerLeft,
-html[dir="rtl"] #toolbarViewerRight {
+[dir="ltr"] #toolbarViewerLeft,[dir="ltr"] 
+#toolbarSidebarLeft {
   float: left;
 }
-html[dir="ltr"] #toolbarViewerRight,
-html[dir="rtl"] #toolbarViewerLeft {
-  float: right;
-}
-html[dir="ltr"] #toolbarViewerLeft > *,
-html[dir="ltr"] #toolbarViewerMiddle > *,
-html[dir="ltr"] #toolbarViewerRight > *,
-html[dir="ltr"] .findbar * {
-  position: relative;
-  float: left;
-}
-html[dir="rtl"] #toolbarViewerLeft > *,
-html[dir="rtl"] #toolbarViewerMiddle > *,
-html[dir="rtl"] #toolbarViewerRight > *,
-html[dir="rtl"] .findbar * {
-  position: relative;
+
+[dir="rtl"] #toolbarViewerLeft,[dir="rtl"] 
+#toolbarSidebarLeft {
   float: right;
 }
 
-html[dir="ltr"] .splitToolbarButton {
-  margin: 2px 2px 0;
-  display: inline-block;
+#toolbarViewerLeft,
+#toolbarSidebarLeft {
+  float: inline-start;
 }
-html[dir="rtl"] .splitToolbarButton {
-  margin: 2px 2px 0;
-  display: inline-block;
+[dir="ltr"] #toolbarViewerRight,[dir="ltr"] 
+#toolbarSidebarRight {
+  float: right;
 }
-html[dir="ltr"] .splitToolbarButton > .toolbarButton {
-  border-radius: 2px;
+[dir="rtl"] #toolbarViewerRight,[dir="rtl"] 
+#toolbarSidebarRight {
   float: left;
 }
-html[dir="rtl"] .splitToolbarButton > .toolbarButton {
-  border-radius: 2px;
+#toolbarViewerRight,
+#toolbarSidebarRight {
+  float: inline-end;
+}
+
+[dir="ltr"] #toolbarViewerLeft > *,[dir="ltr"] 
+#toolbarViewerMiddle > *,[dir="ltr"] 
+#toolbarViewerRight > *,[dir="ltr"] 
+#toolbarSidebarLeft *,[dir="ltr"] 
+#toolbarSidebarRight *,[dir="ltr"] 
+.findbar * {
+  float: left;
+}
+
+[dir="rtl"] #toolbarViewerLeft > *,[dir="rtl"] 
+#toolbarViewerMiddle > *,[dir="rtl"] 
+#toolbarViewerRight > *,[dir="rtl"] 
+#toolbarSidebarLeft *,[dir="rtl"] 
+#toolbarSidebarRight *,[dir="rtl"] 
+.findbar * {
   float: right;
 }
 
+#toolbarViewerLeft > *,
+#toolbarViewerMiddle > *,
+#toolbarViewerRight > *,
+#toolbarSidebarLeft *,
+#toolbarSidebarRight *,
+.findbar * {
+  position: relative;
+  float: inline-start;
+}
+
+[dir="ltr"] #toolbarViewerLeft {
+  padding-left: 1px;
+}
+
+[dir="rtl"] #toolbarViewerLeft {
+  padding-right: 1px;
+}
+
+#toolbarViewerLeft {
+  -webkit-padding-start: 1px;
+          padding-inline-start: 1px;
+}
+[dir="ltr"] #toolbarViewerRight {
+  padding-right: 1px;
+}
+[dir="rtl"] #toolbarViewerRight {
+  padding-left: 1px;
+}
+#toolbarViewerRight {
+  -webkit-padding-end: 1px;
+          padding-inline-end: 1px;
+}
+[dir="ltr"] #toolbarSidebarRight {
+  padding-right: 2px;
+}
+[dir="rtl"] #toolbarSidebarRight {
+  padding-left: 2px;
+}
+#toolbarSidebarRight {
+  -webkit-padding-end: 2px;
+          padding-inline-end: 2px;
+}
+
+.splitToolbarButton {
+  margin: 2px;
+  display: inline-block;
+}
+[dir="ltr"] .splitToolbarButton > .toolbarButton {
+  float: left;
+}
+[dir="rtl"] .splitToolbarButton > .toolbarButton {
+  float: right;
+}
+.splitToolbarButton > .toolbarButton {
+  float: inline-start;
+}
+
 .toolbarButton,
 .secondaryToolbarButton,
-.overlayButton {
+.dialogButton {
   border: 0 none;
   background: none;
   width: 28px;
   height: 28px;
 }
-.overlayButton {
-  background-color: rgba(12, 12, 13, 0.1);
-  background-color: var(--overlay-button-bg-color);
-}
-@media (prefers-color-scheme: dark) {
 
-  .overlayButton {
-  background-color: rgba(92, 92, 97, 1);
-  background-color: var(--overlay-button-bg-color);
-  }
+.dialogButton:hover,
+.dialogButton:focus-visible {
+  background-color: var(--dialog-button-hover-bg-color);
 }
 
-.overlayButton:hover {
-  background-color: rgba(12, 12, 13, 0.3);
-  background-color: var(--overlay-button-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .overlayButton:hover {
-  background-color: rgba(115, 115, 115, 1);
-  background-color: var(--overlay-button-hover-color);
-  }
-}
-
-.overlayButton:focus {
-  background-color: rgba(12, 12, 13, 0.3);
-  background-color: var(--overlay-button-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .overlayButton:focus {
-  background-color: rgba(115, 115, 115, 1);
-  background-color: var(--overlay-button-hover-color);
-  }
+.dialogButton:hover > span,
+.dialogButton:focus-visible > span {
+  color: var(--dialog-button-hover-color);
 }
 
 .toolbarButton > span {
@@ -1942,466 +1965,143 @@ html[dir="rtl"] .splitToolbarButton > .toolbarButton {
 
 .toolbarButton[disabled],
 .secondaryToolbarButton[disabled],
-.overlayButton[disabled] {
+.dialogButton[disabled] {
   opacity: 0.5;
 }
 
-.splitToolbarButton.toggled .toolbarButton {
-  margin: 0;
-}
-
-.splitToolbarButton > .toolbarButton:hover {
-  background-color: rgba(221, 222, 223, 1);
-  background-color: var(--button-hover-color);
-  z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .splitToolbarButton > .toolbarButton:hover {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-
-.splitToolbarButton > .toolbarButton:focus {
-  background-color: rgba(221, 222, 223, 1);
-  background-color: var(--button-hover-color);
-  z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .splitToolbarButton > .toolbarButton:focus {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-
+.splitToolbarButton > .toolbarButton:hover,
+.splitToolbarButton > .toolbarButton:focus-visible,
 .dropdownToolbarButton:hover {
-  background-color: rgba(221, 222, 223, 1);
   background-color: var(--button-hover-color);
-  z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .dropdownToolbarButton:hover {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-
-.toolbarButton.textButton:hover {
-  background-color: rgba(221, 222, 223, 1);
-  background-color: var(--button-hover-color);
-  z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.textButton:hover {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-
-.toolbarButton.textButton:focus {
-  background-color: rgba(221, 222, 223, 1);
-  background-color: var(--button-hover-color);
-  z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.textButton:focus {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
 }
 .splitToolbarButton > .toolbarButton {
   position: relative;
-}
-html[dir="ltr"] .splitToolbarButton > .toolbarButton:first-child,
-html[dir="rtl"] .splitToolbarButton > .toolbarButton:last-child {
-  position: relative;
   margin: 0;
 }
-html[dir="ltr"] .splitToolbarButton > .toolbarButton:last-child,
-html[dir="rtl"] .splitToolbarButton > .toolbarButton:first-child {
-  position: relative;
-  margin: 0;
+[dir="ltr"] #toolbarSidebar .splitToolbarButton > .toolbarButton {
+  margin-right: 2px;
 }
-.splitToolbarButtonSeparator {
-  padding: 10px 0;
-  width: 1px;
-  background-color: rgba(0, 0, 0, 0.3);
-  background-color: var(--separator-color);
-  z-index: 99;
-  display: inline-block;
-  margin: 4px 0;
+[dir="rtl"] #toolbarSidebar .splitToolbarButton > .toolbarButton {
+  margin-left: 2px;
 }
-@media (prefers-color-scheme: dark) {
-
-  .splitToolbarButtonSeparator {
-  background-color: rgba(0, 0, 0, 0.3);
-  background-color: var(--separator-color);
-  }
+#toolbarSidebar .splitToolbarButton > .toolbarButton {
+  -webkit-margin-end: 2px;
+          margin-inline-end: 2px;
 }
 
-.findbar .splitToolbarButtonSeparator {
-  background-color: rgba(187, 187, 188, 1);
-  background-color: var(--field-border-color);
-  margin: 0;
-  padding: 13px 0;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .findbar .splitToolbarButtonSeparator {
-  background-color: rgba(115, 115, 115, 1);
-  background-color: var(--field-border-color);
-  }
-}
-
-html[dir="ltr"] .splitToolbarButtonSeparator {
+[dir="ltr"] .splitToolbarButtonSeparator {
   float: left;
 }
-html[dir="rtl"] .splitToolbarButtonSeparator {
+
+[dir="rtl"] .splitToolbarButtonSeparator {
   float: right;
 }
 
-.toolbarButton {
+.splitToolbarButtonSeparator {
+  float: inline-start;
+  margin: 4px 0;
+  width: 1px;
+  height: 20px;
+  background-color: var(--separator-color);
+}
+
+.toolbarButton,
+.dropdownToolbarButton,
+.secondaryToolbarButton,
+.dialogButton {
   min-width: 16px;
-  padding: 2px 6px 0;
-  border: none;
-  border-radius: 2px;
-  color: rgba(12, 12, 13, 1);
-  color: var(--main-color);
-  font-size: 12px;
-  line-height: 14px;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  /* Opera does not support user-select, use <... unselectable="on"> instead */
-  cursor: default;
-  box-sizing: border-box;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton {
-  color: rgba(249, 249, 250, 1);
-  color: var(--main-color);
-  }
-}
-
-.dropdownToolbarButton {
-  min-width: 16px;
-  padding: 2px 6px 0;
-  border: none;
-  border-radius: 2px;
-  color: rgba(12, 12, 13, 1);
-  color: var(--main-color);
-  font-size: 12px;
-  line-height: 14px;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  /* Opera does not support user-select, use <... unselectable="on"> instead */
-  cursor: default;
-  box-sizing: border-box;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .dropdownToolbarButton {
-  color: rgba(249, 249, 250, 1);
-  color: var(--main-color);
-  }
-}
-
-.secondaryToolbarButton {
-  min-width: 16px;
-  padding: 2px 6px 0;
-  border: none;
-  border-radius: 2px;
-  color: rgba(12, 12, 13, 1);
-  color: var(--main-color);
-  font-size: 12px;
-  line-height: 14px;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  /* Opera does not support user-select, use <... unselectable="on"> instead */
-  cursor: default;
-  box-sizing: border-box;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton {
-  color: rgba(249, 249, 250, 1);
-  color: var(--main-color);
-  }
-}
-
-.overlayButton {
-  min-width: 16px;
-  padding: 2px 6px 0;
-  border: none;
-  border-radius: 2px;
-  color: rgba(12, 12, 13, 1);
-  color: var(--main-color);
-  font-size: 12px;
-  line-height: 14px;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  /* Opera does not support user-select, use <... unselectable="on"> instead */
-  cursor: default;
-  box-sizing: border-box;
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .overlayButton {
-  color: rgba(249, 249, 250, 1);
-  color: var(--main-color);
-  }
-}
-
-html[dir="ltr"] .toolbarButton,
-html[dir="ltr"] .overlayButton,
-html[dir="ltr"] .dropdownToolbarButton {
-  margin: 2px 1px;
-}
-html[dir="rtl"] .toolbarButton,
-html[dir="rtl"] .overlayButton,
-html[dir="rtl"] .dropdownToolbarButton {
   margin: 2px 1px;
+  padding: 2px 6px 0;
+  border: none;
+  border-radius: 2px;
+  color: var(--main-color);
+  font-size: 12px;
+  line-height: 14px;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
+  cursor: default;
+  box-sizing: border-box;
 }
 
-html[dir="ltr"] #toolbarViewerLeft > .toolbarButton:first-child,
-html[dir="rtl"] #toolbarViewerRight > .toolbarButton:last-child {
-  margin-left: 2px;
-}
-
-html[dir="ltr"] #toolbarViewerRight > .toolbarButton:last-child,
-html[dir="rtl"] #toolbarViewerLeft > .toolbarButton:first-child {
-  margin-right: 2px;
-}
-.toolbarButton:hover {
-  background-color: rgba(221, 222, 223, 1);
+.toolbarButton:hover,
+.toolbarButton:focus-visible {
   background-color: var(--button-hover-color);
 }
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton:hover {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-.toolbarButton:focus {
-  background-color: rgba(221, 222, 223, 1);
-  background-color: var(--button-hover-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton:focus {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-.secondaryToolbarButton:hover {
-  background-color: rgba(237, 237, 237, 1);
-  background-color: var(--doorhanger-hover-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton:hover {
-  background-color: rgba(93, 94, 98, 1);
-  background-color: var(--doorhanger-hover-color);
-  }
-}
-.secondaryToolbarButton:focus {
-  background-color: rgba(237, 237, 237, 1);
-  background-color: var(--doorhanger-hover-color);
-}
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton:focus {
-  background-color: rgba(93, 94, 98, 1);
-  background-color: var(--doorhanger-hover-color);
-  }
-}
-
-.toolbarButton.toggled {
-  background-color: rgba(0, 0, 0, 0.3);
-  background-color: var(--toggled-btn-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.toggled {
-  background-color: rgba(0, 0, 0, 0.3);
-  background-color: var(--toggled-btn-bg-color);
-  }
-}
-
-.splitToolbarButton.toggled > .toolbarButton.toggled {
-  background-color: rgba(0, 0, 0, 0.3);
-  background-color: var(--toggled-btn-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .splitToolbarButton.toggled > .toolbarButton.toggled {
-  background-color: rgba(0, 0, 0, 0.3);
-  background-color: var(--toggled-btn-bg-color);
-  }
+.secondaryToolbarButton:hover,
+.secondaryToolbarButton:focus-visible {
+  background-color: var(--doorhanger-hover-bg-color);
+  color: var(--doorhanger-hover-color);
 }
 
+.toolbarButton.toggled,
+.splitToolbarButton.toggled > .toolbarButton.toggled,
 .secondaryToolbarButton.toggled {
-  background-color: rgba(0, 0, 0, 0.3);
   background-color: var(--toggled-btn-bg-color);
+  color: var(--toggled-btn-color);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.toggled {
-  background-color: rgba(0, 0, 0, 0.3);
-  background-color: var(--toggled-btn-bg-color);
-  }
+.toolbarButton.toggled::before,
+.secondaryToolbarButton.toggled::before {
+  background-color: var(--toggled-btn-color);
 }
 
 .toolbarButton.toggled:hover:active,
 .splitToolbarButton.toggled > .toolbarButton.toggled:hover:active,
 .secondaryToolbarButton.toggled:hover:active {
-  background-color: rgba(0, 0, 0, 0.4);
+  background-color: var(--toggled-hover-active-btn-color);
 }
 
 .dropdownToolbarButton {
-  width: 140px;
+  width: var(--scale-select-container-width);
   padding: 0;
   overflow: hidden;
-  background-color: rgba(215, 215, 219, 1);
   background-color: var(--dropdown-btn-bg-color);
-  margin-top: 2px !important;
 }
-
-@media (prefers-color-scheme: dark) {
-
-  .dropdownToolbarButton {
-  background-color: rgba(74, 74, 79, 1);
-  background-color: var(--dropdown-btn-bg-color);
-  }
-}
-.dropdownToolbarButton::after {
-  position: absolute;
-  display: inline-block;
-  top: 6px;
-  content: url(images/toolbarButton-menuArrow.svg);
-  /*content: var(--toolbarButton-menuArrow-icon);*/
-  pointer-events: none;
-  max-width: 16px;
-}
-@media (prefers-color-scheme: dark) {
-
-  .dropdownToolbarButton::after {
-  content: url(images/toolbarButton-menuArrow-dark.svg);
-  /*content: var(--toolbarButton-menuArrow-icon);*/
-  }
-}
-html[dir="ltr"] .dropdownToolbarButton::after {
+[dir="ltr"] .dropdownToolbarButton::after {
   right: 7px;
 }
-html[dir="rtl"] .dropdownToolbarButton::after {
+[dir="rtl"] .dropdownToolbarButton::after {
   left: 7px;
 }
+.dropdownToolbarButton::after {
+  top: 6px;
+  inset-inline-end: 7px;
+  pointer-events: none;
+  -webkit-mask-image: var(--toolbarButton-menuArrow-icon);
+          mask-image: var(--toolbarButton-menuArrow-icon);
+}
+
+[dir="ltr"] .dropdownToolbarButton > select {
+  padding-left: 4px;
+}
+
+[dir="rtl"] .dropdownToolbarButton > select {
+  padding-right: 4px;
+}
 
 .dropdownToolbarButton > select {
-  width: 162px;
+  width: calc(
+    var(--scale-select-container-width) + var(--scale-select-overflow)
+  );
   height: 28px;
   font-size: 12px;
-  color: rgba(12, 12, 13, 1);
   color: var(--main-color);
   margin: 0;
   padding: 1px 0 2px;
+  -webkit-padding-start: 4px;
+          padding-inline-start: 4px;
   border: none;
-  background-color: rgba(215, 215, 219, 1);
   background-color: var(--dropdown-btn-bg-color);
 }
-
-@media (prefers-color-scheme: dark) {
-
-  .dropdownToolbarButton > select {
-  background-color: rgba(74, 74, 79, 1);
-  background-color: var(--dropdown-btn-bg-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .dropdownToolbarButton > select {
-  color: rgba(249, 249, 250, 1);
-  color: var(--main-color);
-  }
-}
-html[dir="ltr"] .dropdownToolbarButton > select {
-  padding-left: 4px;
-}
-html[dir="rtl"] .dropdownToolbarButton > select {
-  padding-right: 4px;
-}
-.dropdownToolbarButton > select:hover {
-  background-color: rgba(221, 222, 223, 1);
+.dropdownToolbarButton > select:hover,
+.dropdownToolbarButton > select:focus-visible {
   background-color: var(--button-hover-color);
+  color: var(--toggled-btn-color);
 }
-@media (prefers-color-scheme: dark) {
-
-  .dropdownToolbarButton > select:hover {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-
-.dropdownToolbarButton > select:focus {
-  background-color: rgba(221, 222, 223, 1);
-  background-color: var(--button-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .dropdownToolbarButton > select:focus {
-  background-color: rgba(102, 102, 103, 1);
-  background-color: var(--button-hover-color);
-  }
-}
-
 .dropdownToolbarButton > select > option {
-  background: rgba(255, 255, 255, 1);
   background: var(--doorhanger-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .dropdownToolbarButton > select > option {
-  background: rgba(74, 74, 79, 1);
-  background: var(--doorhanger-bg-color);
-  }
-}
-
-#customScaleOption {
-  display: none;
-}
-
-#pageWidthOption {
-  border-bottom: 1px rgba(255, 255, 255, 0.5) solid;
+  color: var(--main-color);
 }
 
 .toolbarButtonSpacer {
@@ -2410,383 +2110,193 @@ html[dir="rtl"] .dropdownToolbarButton > select {
   height: 1px;
 }
 
-html[dir="ltr"] #findPrevious {
-  margin-left: 0;
-}
-html[dir="ltr"] #findNext {
-  margin-right: 3px;
-}
-
-html[dir="rtl"] #findPrevious {
-  margin-right: 0;
-}
-html[dir="rtl"] #findNext {
-  margin-left: 3px;
-}
-
-.toolbarButton::before {
-  opacity: 0.7;
-  opacity: var(--toolbar-icon-opacity);
-  top: 6px;
-}
-
-.secondaryToolbarButton::before {
-  opacity: 0.9;
-  opacity: var(--doorhanger-icon-opacity);
-  top: 5px;
-}
-
 .toolbarButton::before,
-.secondaryToolbarButton::before {
+.secondaryToolbarButton::before,
+.dropdownToolbarButton::after,
+.treeItemToggler::before {
   /* All matching images have a size of 16x16
    * All relevant containers have a size of 28x28 */
   position: absolute;
   display: inline-block;
-  left: 6px;
-  max-width: 16px;
+  width: 16px;
+  height: 16px;
+
+  content: "";
+  background-color: var(--toolbar-icon-bg-color);
+  -webkit-mask-size: cover;
+          mask-size: cover;
 }
 
-html[dir="ltr"] .secondaryToolbarButton::before {
+.dropdownToolbarButton:hover::after,
+.dropdownToolbarButton:focus-visible::after,
+.dropdownToolbarButton:active::after {
+  background-color: var(--toolbar-icon-hover-bg-color);
+}
+
+.toolbarButton::before {
+  opacity: var(--toolbar-icon-opacity);
+  top: 6px;
+  left: 6px;
+}
+
+.toolbarButton:hover::before,
+.toolbarButton:focus-visible::before,
+.secondaryToolbarButton:hover::before,
+.secondaryToolbarButton:focus-visible::before {
+  background-color: var(--toolbar-icon-hover-bg-color);
+}
+
+[dir="ltr"] .secondaryToolbarButton::before {
   left: 12px;
 }
-html[dir="rtl"] .secondaryToolbarButton::before {
+
+[dir="rtl"] .secondaryToolbarButton::before {
   right: 12px;
 }
 
-.toolbarButton#sidebarToggle::before {
-  content: url(images/toolbarButton-sidebarToggle.svg);
-  /*content: var(--toolbarButton-sidebarToggle-icon);*/
+.secondaryToolbarButton::before {
+  opacity: var(--doorhanger-icon-opacity);
+  top: 5px;
+  inset-inline-start: 12px;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton#sidebarToggle::before {
-  content: url(images/toolbarButton-sidebarToggle-dark.svg);
-  /*content: var(--toolbarButton-sidebarToggle-icon);*/
-  }
-}
-html[dir="rtl"] .toolbarButton#sidebarToggle::before {
-  transform: scaleX(-1);
+#sidebarToggle::before {
+  -webkit-mask-image: var(--toolbarButton-sidebarToggle-icon);
+          mask-image: var(--toolbarButton-sidebarToggle-icon);
+  transform: scaleX(var(--dir-factor));
 }
 
-.toolbarButton#secondaryToolbarToggle::before {
-  content: url(images/toolbarButton-secondaryToolbarToggle.svg);
-  /*content: var(--toolbarButton-secondaryToolbarToggle-icon);*/
+#secondaryToolbarToggle::before {
+  -webkit-mask-image: var(--toolbarButton-secondaryToolbarToggle-icon);
+          mask-image: var(--toolbarButton-secondaryToolbarToggle-icon);
+  transform: scaleX(var(--dir-factor));
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton#secondaryToolbarToggle::before {
-  content: url(images/toolbarButton-secondaryToolbarToggle-dark.svg);
-  /*content: var(--toolbarButton-secondaryToolbarToggle-icon);*/
-  }
-}
-html[dir="rtl"] .toolbarButton#secondaryToolbarToggle::before {
-  transform: scaleX(-1);
+#findPrevious::before {
+  -webkit-mask-image: var(--findbarButton-previous-icon);
+          mask-image: var(--findbarButton-previous-icon);
 }
 
-.toolbarButton.findPrevious::before {
-  content: url(images/findbarButton-previous.svg);
-  /*content: var(--findbarButton-previous-icon);*/
+#findNext::before {
+  -webkit-mask-image: var(--findbarButton-next-icon);
+          mask-image: var(--findbarButton-next-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.findPrevious::before {
-  content: url(images/findbarButton-previous-dark.svg);
-  /*content: var(--findbarButton-previous-icon);*/
-  }
-}
-html[dir="rtl"] .toolbarButton.findPrevious::before {
-  transform: scaleX(-1);
+#previous::before {
+  -webkit-mask-image: var(--toolbarButton-pageUp-icon);
+          mask-image: var(--toolbarButton-pageUp-icon);
 }
 
-.toolbarButton.findNext::before {
-  content: url(images/findbarButton-next.svg);
-  /*content: var(--findbarButton-next-icon);*/
+#next::before {
+  -webkit-mask-image: var(--toolbarButton-pageDown-icon);
+          mask-image: var(--toolbarButton-pageDown-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.findNext::before {
-  content: url(images/findbarButton-next-dark.svg);
-  /*content: var(--findbarButton-next-icon);*/
-  }
-}
-html[dir="rtl"] .toolbarButton.findNext::before {
-  transform: scaleX(-1);
+#zoomOut::before {
+  -webkit-mask-image: var(--toolbarButton-zoomOut-icon);
+          mask-image: var(--toolbarButton-zoomOut-icon);
 }
 
-.toolbarButton.pageUp::before {
-  content: url(images/toolbarButton-pageUp.svg);
-  /*content: var(--toolbarButton-pageUp-icon);*/
+#zoomIn::before {
+  -webkit-mask-image: var(--toolbarButton-zoomIn-icon);
+          mask-image: var(--toolbarButton-zoomIn-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.pageUp::before {
-  content: url(images/toolbarButton-pageUp-dark.svg);
-  /*content: var(--toolbarButton-pageUp-icon);*/
-  }
-}
-html[dir="rtl"] .toolbarButton.pageUp::before {
-  transform: scaleX(-1);
+#presentationMode::before,
+#secondaryPresentationMode::before {
+  -webkit-mask-image: var(--toolbarButton-presentationMode-icon);
+          mask-image: var(--toolbarButton-presentationMode-icon);
 }
 
-.toolbarButton.pageDown::before {
-  content: url(images/toolbarButton-pageDown.svg);
-  /*content: var(--toolbarButton-pageDown-icon);*/
+#editorFreeText::before {
+  -webkit-mask-image: var(--toolbarButton-editorFreeText-icon);
+          mask-image: var(--toolbarButton-editorFreeText-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.pageDown::before {
-  content: url(images/toolbarButton-pageDown-dark.svg);
-  /*content: var(--toolbarButton-pageDown-icon);*/
-  }
-}
-html[dir="rtl"] .toolbarButton.pageDown::before {
-  transform: scaleX(-1);
+#editorInk::before {
+  -webkit-mask-image: var(--toolbarButton-editorInk-icon);
+          mask-image: var(--toolbarButton-editorInk-icon);
 }
 
-.toolbarButton.zoomOut::before {
-  content: url(images/toolbarButton-zoomOut.svg);
-  /*content: var(--toolbarButton-zoomOut-icon);*/
+#print::before,
+#secondaryPrint::before {
+  -webkit-mask-image: var(--toolbarButton-print-icon);
+          mask-image: var(--toolbarButton-print-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.zoomOut::before {
-  content: url(images/toolbarButton-zoomOut-dark.svg);
-  /*content: var(--toolbarButton-zoomOut-icon);*/
-  }
+#openFile::before,
+#secondaryOpenFile::before {
+  -webkit-mask-image: var(--toolbarButton-openFile-icon);
+          mask-image: var(--toolbarButton-openFile-icon);
 }
 
-.toolbarButton.zoomIn::before {
-  content: url(images/toolbarButton-zoomIn.svg);
-  /*content: var(--toolbarButton-zoomIn-icon);*/
+#download::before,
+#secondaryDownload::before {
+  -webkit-mask-image: var(--toolbarButton-download-icon);
+          mask-image: var(--toolbarButton-download-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.zoomIn::before {
-  content: url(images/toolbarButton-zoomIn-dark.svg);
-  /*content: var(--toolbarButton-zoomIn-icon);*/
-  }
-}
-
-.toolbarButton.presentationMode::before {
-  content: url(images/toolbarButton-presentationMode.svg);
-  /*content: var(--toolbarButton-presentationMode-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.presentationMode::before {
-  content: url(images/toolbarButton-presentationMode-dark.svg);
-  /*content: var(--toolbarButton-presentationMode-icon);*/
-  }
-}
-
-.secondaryToolbarButton.presentationMode::before {
-  content: url(images/toolbarButton-presentationMode.svg);
-  /*content: var(--toolbarButton-presentationMode-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.presentationMode::before {
-  content: url(images/toolbarButton-presentationMode-dark.svg);
-  /*content: var(--toolbarButton-presentationMode-icon);*/
-  }
-}
-
-.toolbarButton.print::before {
-  content: url(images/toolbarButton-print.svg);
-  /*content: var(--toolbarButton-print-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.print::before {
-  content: url(images/toolbarButton-print-dark.svg);
-  /*content: var(--toolbarButton-print-icon);*/
-  }
-}
-
-.secondaryToolbarButton.print::before {
-  content: url(images/toolbarButton-print.svg);
-  /*content: var(--toolbarButton-print-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.print::before {
-  content: url(images/toolbarButton-print-dark.svg);
-  /*content: var(--toolbarButton-print-icon);*/
-  }
-}
-
-.toolbarButton.openFile::before {
-  content: url(images/toolbarButton-openFile.svg);
-  /*content: var(--toolbarButton-openFile-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.openFile::before {
-  content: url(images/toolbarButton-openFile-dark.svg);
-  /*content: var(--toolbarButton-openFile-icon);*/
-  }
-}
-
-.secondaryToolbarButton.openFile::before {
-  content: url(images/toolbarButton-openFile.svg);
-  /*content: var(--toolbarButton-openFile-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.openFile::before {
-  content: url(images/toolbarButton-openFile-dark.svg);
-  /*content: var(--toolbarButton-openFile-icon);*/
-  }
-}
-
-.toolbarButton.download::before {
-  content: url(images/toolbarButton-download.svg);
-  /*content: var(--toolbarButton-download-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.download::before {
-  content: url(images/toolbarButton-download-dark.svg);
-  /*content: var(--toolbarButton-download-icon);*/
-  }
-}
-
-.secondaryToolbarButton.download::before {
-  content: url(images/toolbarButton-download.svg);
-  /*content: var(--toolbarButton-download-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.download::before {
-  content: url(images/toolbarButton-download-dark.svg);
-  /*content: var(--toolbarButton-download-icon);*/
-  }
-}
-
-.secondaryToolbarButton.bookmark {
+a.secondaryToolbarButton {
   padding-top: 6px;
   text-decoration: none;
 }
-
-.bookmark[href="#"] {
+a.toolbarButton[href="#"],
+a.secondaryToolbarButton[href="#"] {
   opacity: 0.5;
   pointer-events: none;
 }
 
-.toolbarButton.bookmark::before {
-  content: url(images/toolbarButton-bookmark.svg);
-  /*content: var(--toolbarButton-bookmark-icon);*/
+#viewBookmark::before,
+#secondaryViewBookmark::before {
+  -webkit-mask-image: var(--toolbarButton-bookmark-icon);
+          mask-image: var(--toolbarButton-bookmark-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarButton.bookmark::before {
-  content: url(images/toolbarButton-bookmark-dark.svg);
-  /*content: var(--toolbarButton-bookmark-icon);*/
-  }
+#viewThumbnail::before {
+  -webkit-mask-image: var(--toolbarButton-viewThumbnail-icon);
+          mask-image: var(--toolbarButton-viewThumbnail-icon);
 }
 
-.secondaryToolbarButton.bookmark::before {
-  content: url(images/toolbarButton-bookmark.svg);
-  /*content: var(--toolbarButton-bookmark-icon);*/
+#viewOutline::before {
+  -webkit-mask-image: var(--toolbarButton-viewOutline-icon);
+          mask-image: var(--toolbarButton-viewOutline-icon);
+  transform: scaleX(var(--dir-factor));
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.bookmark::before {
-  content: url(images/toolbarButton-bookmark-dark.svg);
-  /*content: var(--toolbarButton-bookmark-icon);*/
-  }
+#viewAttachments::before {
+  -webkit-mask-image: var(--toolbarButton-viewAttachments-icon);
+          mask-image: var(--toolbarButton-viewAttachments-icon);
 }
 
-#viewThumbnail.toolbarButton::before {
-  content: url(images/toolbarButton-viewThumbnail.svg);
-  /*content: var(--toolbarButton-viewThumbnail-icon);*/
+#viewLayers::before {
+  -webkit-mask-image: var(--toolbarButton-viewLayers-icon);
+          mask-image: var(--toolbarButton-viewLayers-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #viewThumbnail.toolbarButton::before {
-  content: url(images/toolbarButton-viewThumbnail-dark.svg);
-  /*content: var(--toolbarButton-viewThumbnail-icon);*/
-  }
+#currentOutlineItem::before {
+  -webkit-mask-image: var(--toolbarButton-currentOutlineItem-icon);
+          mask-image: var(--toolbarButton-currentOutlineItem-icon);
+  transform: scaleX(var(--dir-factor));
 }
 
-#viewOutline.toolbarButton::before {
-  content: url(images/toolbarButton-viewOutline.svg);
-  /*content: var(--toolbarButton-viewOutline-icon);*/
+#viewFind::before {
+  -webkit-mask-image: var(--toolbarButton-search-icon);
+          mask-image: var(--toolbarButton-search-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #viewOutline.toolbarButton::before {
-  content: url(images/toolbarButton-viewOutline-dark.svg);
-  /*content: var(--toolbarButton-viewOutline-icon);*/
-  }
-}
-html[dir="rtl"] #viewOutline.toolbarButton::before {
-  transform: scaleX(-1);
+[dir="ltr"] .pdfSidebarNotification::after {
+  left: 17px;
 }
 
-#viewAttachments.toolbarButton::before {
-  content: url(images/toolbarButton-viewAttachments.svg);
-  /*content: var(--toolbarButton-viewAttachments-icon);*/
+[dir="rtl"] .pdfSidebarNotification::after {
+  right: 17px;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #viewAttachments.toolbarButton::before {
-  content: url(images/toolbarButton-viewAttachments-dark.svg);
-  /*content: var(--toolbarButton-viewAttachments-icon);*/
-  }
-}
-
-#viewLayers.toolbarButton::before {
-  content: url(images/toolbarButton-viewLayers.svg);
-  /*content: var(--toolbarButton-viewLayers-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #viewLayers.toolbarButton::before {
-  content: url(images/toolbarButton-viewLayers-dark.svg);
-  /*content: var(--toolbarButton-viewLayers-icon);*/
-  }
-}
-
-#viewFind.toolbarButton::before {
-  content: url(images/toolbarButton-search.svg);
-  /*content: var(--toolbarButton-search-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #viewFind.toolbarButton::before {
-  content: url(images/toolbarButton-search-dark.svg);
-  /*content: var(--toolbarButton-search-icon);*/
-  }
-}
-
-.toolbarButton.pdfSidebarNotification::after {
+.pdfSidebarNotification::after {
   position: absolute;
   display: inline-block;
   top: 1px;
+  inset-inline-start: 17px;
   /* Create a filled circle, with a diameter of 9 pixels, using only CSS: */
   content: "";
   background-color: rgba(112, 219, 85, 1);
@@ -2794,333 +2304,177 @@ html[dir="rtl"] #viewOutline.toolbarButton::before {
   width: 9px;
   border-radius: 50%;
 }
-html[dir="ltr"] .toolbarButton.pdfSidebarNotification::after {
-  left: 17px;
+
+[dir="ltr"] .secondaryToolbarButton {
+  padding-left: 36px;
 }
-html[dir="rtl"] .toolbarButton.pdfSidebarNotification::after {
-  right: 17px;
+
+[dir="rtl"] .secondaryToolbarButton {
+  padding-right: 36px;
+}
+
+[dir="ltr"] .secondaryToolbarButton {
+  text-align: left;
+}
+
+[dir="rtl"] .secondaryToolbarButton {
+  text-align: right;
 }
 
 .secondaryToolbarButton {
   position: relative;
   margin: 0;
-  padding: 0 0 1px 0;
+  padding: 0 0 1px;
+  -webkit-padding-start: 36px;
+          padding-inline-start: 36px;
   height: auto;
   min-height: 26px;
   width: auto;
   min-width: 100%;
+  text-align: start;
   white-space: normal;
   border-radius: 0;
   box-sizing: border-box;
 }
-html[dir="ltr"] .secondaryToolbarButton {
-  padding-left: 36px;
-  text-align: left;
-}
-html[dir="rtl"] .secondaryToolbarButton {
-  padding-right: 36px;
-  text-align: right;
-}
-
-html[dir="ltr"] .secondaryToolbarButton > span {
+[dir="ltr"] .secondaryToolbarButton > span {
   padding-right: 4px;
 }
-html[dir="rtl"] .secondaryToolbarButton > span {
+[dir="rtl"] .secondaryToolbarButton > span {
   padding-left: 4px;
 }
-
-.secondaryToolbarButton.firstPage::before {
-  content: url(images/secondaryToolbarButton-firstPage.svg);
-  /*content: var(--secondaryToolbarButton-firstPage-icon);*/
+.secondaryToolbarButton > span {
+  -webkit-padding-end: 4px;
+          padding-inline-end: 4px;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.firstPage::before {
-  content: url(images/secondaryToolbarButton-firstPage-dark.svg);
-  /*content: var(--secondaryToolbarButton-firstPage-icon);*/
-  }
+#firstPage::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-firstPage-icon);
+          mask-image: var(--secondaryToolbarButton-firstPage-icon);
 }
 
-.secondaryToolbarButton.lastPage::before {
-  content: url(images/secondaryToolbarButton-lastPage.svg);
-  /*content: var(--secondaryToolbarButton-lastPage-icon);*/
+#lastPage::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-lastPage-icon);
+          mask-image: var(--secondaryToolbarButton-lastPage-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.lastPage::before {
-  content: url(images/secondaryToolbarButton-lastPage-dark.svg);
-  /*content: var(--secondaryToolbarButton-lastPage-icon);*/
-  }
+#pageRotateCcw::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-rotateCcw-icon);
+          mask-image: var(--secondaryToolbarButton-rotateCcw-icon);
 }
 
-.secondaryToolbarButton.rotateCcw::before {
-  content: url(images/secondaryToolbarButton-rotateCcw.svg);
-  /*content: var(--secondaryToolbarButton-rotateCcw-icon);*/
+#pageRotateCw::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-rotateCw-icon);
+          mask-image: var(--secondaryToolbarButton-rotateCw-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.rotateCcw::before {
-  content: url(images/secondaryToolbarButton-rotateCcw-dark.svg);
-  /*content: var(--secondaryToolbarButton-rotateCcw-icon);*/
-  }
+#cursorSelectTool::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-selectTool-icon);
+          mask-image: var(--secondaryToolbarButton-selectTool-icon);
 }
 
-.secondaryToolbarButton.rotateCw::before {
-  content: url(images/secondaryToolbarButton-rotateCw.svg);
-  /*content: var(--secondaryToolbarButton-rotateCw-icon);*/
+#cursorHandTool::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-handTool-icon);
+          mask-image: var(--secondaryToolbarButton-handTool-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.rotateCw::before {
-  content: url(images/secondaryToolbarButton-rotateCw-dark.svg);
-  /*content: var(--secondaryToolbarButton-rotateCw-icon);*/
-  }
+#scrollPage::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-scrollPage-icon);
+          mask-image: var(--secondaryToolbarButton-scrollPage-icon);
 }
 
-.secondaryToolbarButton.selectTool::before {
-  content: url(images/secondaryToolbarButton-selectTool.svg);
-  /*content: var(--secondaryToolbarButton-selectTool-icon);*/
+#scrollVertical::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-scrollVertical-icon);
+          mask-image: var(--secondaryToolbarButton-scrollVertical-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.selectTool::before {
-  content: url(images/secondaryToolbarButton-selectTool-dark.svg);
-  /*content: var(--secondaryToolbarButton-selectTool-icon);*/
-  }
+#scrollHorizontal::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-scrollHorizontal-icon);
+          mask-image: var(--secondaryToolbarButton-scrollHorizontal-icon);
 }
 
-.secondaryToolbarButton.handTool::before {
-  content: url(images/secondaryToolbarButton-handTool.svg);
-  /*content: var(--secondaryToolbarButton-handTool-icon);*/
+#scrollWrapped::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-scrollWrapped-icon);
+          mask-image: var(--secondaryToolbarButton-scrollWrapped-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.handTool::before {
-  content: url(images/secondaryToolbarButton-handTool-dark.svg);
-  /*content: var(--secondaryToolbarButton-handTool-icon);*/
-  }
+#spreadNone::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-spreadNone-icon);
+          mask-image: var(--secondaryToolbarButton-spreadNone-icon);
 }
 
-.secondaryToolbarButton.scrollVertical::before {
-  content: url(images/secondaryToolbarButton-scrollVertical.svg);
-  /*content: var(--secondaryToolbarButton-scrollVertical-icon);*/
+#spreadOdd::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-spreadOdd-icon);
+          mask-image: var(--secondaryToolbarButton-spreadOdd-icon);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.scrollVertical::before {
-  content: url(images/secondaryToolbarButton-scrollVertical-dark.svg);
-  /*content: var(--secondaryToolbarButton-scrollVertical-icon);*/
-  }
+#spreadEven::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-spreadEven-icon);
+          mask-image: var(--secondaryToolbarButton-spreadEven-icon);
 }
 
-.secondaryToolbarButton.scrollHorizontal::before {
-  content: url(images/secondaryToolbarButton-scrollHorizontal.svg);
-  /*content: var(--secondaryToolbarButton-scrollHorizontal-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.scrollHorizontal::before {
-  content: url(images/secondaryToolbarButton-scrollHorizontal-dark.svg);
-  /*content: var(--secondaryToolbarButton-scrollHorizontal-icon);*/
-  }
-}
-
-.secondaryToolbarButton.scrollWrapped::before {
-  content: url(images/secondaryToolbarButton-scrollWrapped.svg);
-  /*content: var(--secondaryToolbarButton-scrollWrapped-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.scrollWrapped::before {
-  content: url(images/secondaryToolbarButton-scrollWrapped-dark.svg);
-  /*content: var(--secondaryToolbarButton-scrollWrapped-icon);*/
-  }
-}
-
-.secondaryToolbarButton.spreadNone::before {
-  content: url(images/secondaryToolbarButton-spreadNone.svg);
-  /*content: var(--secondaryToolbarButton-spreadNone-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.spreadNone::before {
-  content: url(images/secondaryToolbarButton-spreadNone-dark.svg);
-  /*content: var(--secondaryToolbarButton-spreadNone-icon);*/
-  }
-}
-
-.secondaryToolbarButton.spreadOdd::before {
-  content: url(images/secondaryToolbarButton-spreadOdd.svg);
-  /*content: var(--secondaryToolbarButton-spreadOdd-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.spreadOdd::before {
-  content: url(images/secondaryToolbarButton-spreadOdd-dark.svg);
-  /*content: var(--secondaryToolbarButton-spreadOdd-icon);*/
-  }
-}
-
-.secondaryToolbarButton.spreadEven::before {
-  content: url(images/secondaryToolbarButton-spreadEven.svg);
-  /*content: var(--secondaryToolbarButton-spreadEven-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.spreadEven::before {
-  content: url(images/secondaryToolbarButton-spreadEven-dark.svg);
-  /*content: var(--secondaryToolbarButton-spreadEven-icon);*/
-  }
-}
-
-.secondaryToolbarButton.documentProperties::before {
-  content: url(images/secondaryToolbarButton-documentProperties.svg);
-  /*content: var(--secondaryToolbarButton-documentProperties-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .secondaryToolbarButton.documentProperties::before {
-  content: url(images/secondaryToolbarButton-documentProperties-dark.svg);
-  /*content: var(--secondaryToolbarButton-documentProperties-icon);*/
-  }
+#documentProperties::before {
+  -webkit-mask-image: var(--secondaryToolbarButton-documentProperties-icon);
+          mask-image: var(--secondaryToolbarButton-documentProperties-icon);
 }
 
 .verticalToolbarSeparator {
   display: block;
-  padding: 11px 0;
   margin: 5px 2px;
   width: 1px;
-  background-color: rgba(0, 0, 0, 0.3);
+  height: 22px;
   background-color: var(--separator-color);
 }
-
-@media (prefers-color-scheme: dark) {
-
-  .verticalToolbarSeparator {
-  background-color: rgba(0, 0, 0, 0.3);
-  background-color: var(--separator-color);
-  }
-}
-html[dir="ltr"] .verticalToolbarSeparator {
-  margin-left: 2px;
-}
-html[dir="rtl"] .verticalToolbarSeparator {
-  margin-right: 2px;
-}
-
 .horizontalToolbarSeparator {
   display: block;
-  margin: 6px 0 5px 0;
+  margin: 6px 0;
   height: 1px;
   width: 100%;
-  border-top: 1px solid rgba(222, 222, 222, 1);
-  border-top: 1px solid var(--doorhanger-separator-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .horizontalToolbarSeparator {
-  border-top: 1px solid rgba(92, 92, 97, 1);
-  border-top: 1px solid var(--doorhanger-separator-color);
-  }
+  background-color: var(--doorhanger-separator-color);
 }
 
 .toolbarField {
   padding: 4px 7px;
-  margin: 3px 0 3px 0;
+  margin: 3px 0;
   border-radius: 2px;
-  background-color: rgba(255, 255, 255, 1);
   background-color: var(--field-bg-color);
   background-clip: padding-box;
-  border-width: 1px;
-  border-style: solid;
-  border-color: rgba(187, 187, 188, 1);
-  border-color: var(--field-border-color);
+  border: 1px solid var(--field-border-color);
   box-shadow: none;
-  color: rgba(6, 6, 6, 1);
   color: var(--field-color);
   font-size: 12px;
   line-height: 16px;
   outline-style: none;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarField {
-  color: rgba(250, 250, 250, 1);
-  color: var(--field-color);
-  }
+[dir="ltr"] .toolbarField[type="checkbox"] {
+  margin-left: 7px;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarField {
-  border-color: rgba(115, 115, 115, 1);
-  border-color: var(--field-border-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarField {
-  background-color: rgba(64, 64, 68, 1);
-  background-color: var(--field-bg-color);
-  }
+[dir="rtl"] .toolbarField[type="checkbox"] {
+  margin-right: 7px;
 }
 
 .toolbarField[type="checkbox"] {
   opacity: 0;
   position: absolute !important;
   left: 0;
+  margin: 10px 0 3px;
+  -webkit-margin-start: 7px;
+          margin-inline-start: 7px;
 }
 
-html[dir="ltr"] .toolbarField[type="checkbox"] {
-  margin: 10px 0 3px 7px;
-}
-
-html[dir="rtl"] .toolbarField[type="checkbox"] {
-  margin: 10px 7px 3px 0;
-}
-
-.toolbarField.pageNumber {
+#pageNumber {
   -moz-appearance: textfield; /* hides the spinner in moz */
-  min-width: 16px;
   text-align: right;
   width: 40px;
 }
-
-.toolbarField.pageNumber.visiblePageIsLoading {
-  background-image: url(images/loading.svg);
-  /*background-image: var(--loading-icon);*/
+#pageNumber.visiblePageIsLoading {
+  background-image: var(--loading-icon);
   background-repeat: no-repeat;
   background-position: 3px;
 }
-
-@media (prefers-color-scheme: dark) {
-
-  .toolbarField.pageNumber.visiblePageIsLoading {
-  background-image: url(images/loading-dark.svg);
-  /*background-image: var(--loading-icon);*/
-  }
-}
-
-.toolbarField.pageNumber::-webkit-inner-spin-button,
-.toolbarField.pageNumber::-webkit-outer-spin-button {
+#pageNumber::-webkit-inner-spin-button {
   -webkit-appearance: none;
-  margin: 0;
 }
 
 .toolbarField:focus {
@@ -3129,45 +2483,49 @@ html[dir="rtl"] .toolbarField[type="checkbox"] {
 
 .toolbarLabel {
   min-width: 16px;
-  padding: 6px;
+  padding: 7px;
   margin: 2px;
-  border: 1px solid rgba(0, 0, 0, 0);
   border-radius: 2px;
-  color: rgba(12, 12, 13, 1);
   color: var(--main-color);
   font-size: 12px;
   line-height: 14px;
   text-align: left;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
   cursor: default;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .toolbarLabel {
-  color: rgba(249, 249, 250, 1);
-  color: var(--main-color);
-  }
+[dir="ltr"] #numPages.toolbarLabel {
+  padding-left: 3px;
 }
 
-html[dir="ltr"] #numPages.toolbarLabel {
-  padding-left: 2px;
-}
-html[dir="rtl"] #numPages.toolbarLabel {
-  padding-right: 2px;
+[dir="rtl"] #numPages.toolbarLabel {
+  padding-right: 3px;
 }
 
-#thumbnailView {
+#numPages.toolbarLabel {
+  -webkit-padding-start: 3px;
+          padding-inline-start: 3px;
+}
+
+#thumbnailView,
+#outlineView,
+#attachmentsView,
+#layersView {
   position: absolute;
-  width: calc(100% - 60px);
+  width: calc(100% - 8px);
   top: 0;
   bottom: 0;
-  padding: 10px 30px 0;
+  padding: 4px 4px 0;
   overflow: auto;
-  -webkit-overflow-scrolling: touch;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
+}
+#thumbnailView {
+  width: calc(100% - 60px);
+  padding: 10px 30px 0;
 }
 
 #thumbnailView > a:active,
@@ -3175,27 +2533,29 @@ html[dir="rtl"] #numPages.toolbarLabel {
   outline: 0;
 }
 
-.thumbnail {
-  margin: 0 10px 5px 10px;
-}
-html[dir="ltr"] .thumbnail {
+[dir="ltr"] .thumbnail {
   float: left;
 }
-html[dir="rtl"] .thumbnail {
+
+[dir="rtl"] .thumbnail {
   float: right;
 }
 
+.thumbnail {
+  float: inline-start;
+  margin: 0 10px 5px;
+}
+
 #thumbnailView > a:last-of-type > .thumbnail {
   margin-bottom: 10px;
 }
-
 #thumbnailView > a:last-of-type > .thumbnail:not([data-loaded]) {
   margin-bottom: 9px;
 }
 
 .thumbnail:not([data-loaded]) {
   border: 1px dashed rgba(132, 132, 132, 1);
-  margin: -1px 9px 4px 9px;
+  margin: -1px 9px 4px;
 }
 
 .thumbnailImage {
@@ -3217,306 +2577,140 @@ a:focus > .thumbnail > .thumbnailSelectionRing > .thumbnailImage,
   opacity: 0.9;
 }
 
-a:focus > .thumbnail > .thumbnailSelectionRing {
-  background-color: rgba(0, 0, 0, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  background-clip: padding-box;
-  color: rgba(255, 255, 255, 0.9);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  a:focus > .thumbnail > .thumbnailSelectionRing {
-  background-color: rgba(255, 255, 255, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  }
-}
-
+a:focus > .thumbnail > .thumbnailSelectionRing,
 .thumbnail:hover > .thumbnailSelectionRing {
-  background-color: rgba(0, 0, 0, 0.15);
   background-color: var(--sidebaritem-bg-color);
   background-clip: padding-box;
   color: rgba(255, 255, 255, 0.9);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .thumbnail:hover > .thumbnailSelectionRing {
-  background-color: rgba(255, 255, 255, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  }
-}
-
 .thumbnail.selected > .thumbnailSelectionRing > .thumbnailImage {
   opacity: 1;
 }
 
 .thumbnail.selected > .thumbnailSelectionRing {
-  background-color: rgba(0, 0, 0, 0.15);
   background-color: var(--sidebaritem-bg-color);
   background-clip: padding-box;
   color: rgba(255, 255, 255, 1);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .thumbnail.selected > .thumbnailSelectionRing {
-  background-color: rgba(255, 255, 255, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  }
-}
-
-#outlineView,
-#attachmentsView,
-#layersView {
-  position: absolute;
-  width: calc(100% - 8px);
-  top: 0;
-  bottom: 0;
-  padding: 4px 4px 0;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-}
-
-html[dir="ltr"] .treeWithDeepNesting > .treeItem,
-html[dir="ltr"] .treeItem > .treeItems {
+[dir="ltr"] .treeWithDeepNesting > .treeItem,[dir="ltr"] 
+.treeItem > .treeItems {
   margin-left: 20px;
 }
 
-html[dir="rtl"] .treeWithDeepNesting > .treeItem,
-html[dir="rtl"] .treeItem > .treeItems {
+[dir="rtl"] .treeWithDeepNesting > .treeItem,[dir="rtl"] 
+.treeItem > .treeItems {
   margin-right: 20px;
 }
 
+.treeWithDeepNesting > .treeItem,
+.treeItem > .treeItems {
+  -webkit-margin-start: 20px;
+          margin-inline-start: 20px;
+}
+
+[dir="ltr"] .treeItem > a {
+  padding-left: 4px;
+}
+
+[dir="rtl"] .treeItem > a {
+  padding-right: 4px;
+}
+
 .treeItem > a {
   text-decoration: none;
   display: inline-block;
-  min-width: 95%;
   /* Subtract the right padding (left, in RTL mode) of the container: */
   min-width: calc(100% - 4px);
   height: auto;
   margin-bottom: 1px;
+  padding: 2px 0 5px;
+  -webkit-padding-start: 4px;
+          padding-inline-start: 4px;
   border-radius: 2px;
-  color: rgba(0, 0, 0, 0.8);
-  color: var(--outline-color);
+  color: var(--treeitem-color);
   font-size: 13px;
   line-height: 15px;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
   white-space: normal;
   cursor: pointer;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .treeItem > a {
-  color: rgba(255, 255, 255, 0.8);
-  color: var(--outline-color);
-  }
-}
-html[dir="ltr"] .treeItem > a {
-  padding: 2px 0 5px 4px;
-}
-html[dir="rtl"] .treeItem > a {
-  padding: 2px 4px 5px 0;
-}
-
-#layersView .treeItem > a > * {
+#layersView .treeItem > a * {
   cursor: pointer;
 }
-html[dir="ltr"] #layersView .treeItem > a > label {
+[dir="ltr"] #layersView .treeItem > a > label {
   padding-left: 4px;
 }
-html[dir="rtl"] #layersView .treesItem > a > label {
+[dir="rtl"] #layersView .treeItem > a > label {
   padding-right: 4px;
 }
+#layersView .treeItem > a > label {
+  -webkit-padding-start: 4px;
+          padding-inline-start: 4px;
+}
+[dir="ltr"] #layersView .treeItem > a > label > input {
+  float: left;
+}
+[dir="rtl"] #layersView .treeItem > a > label > input {
+  float: right;
+}
+#layersView .treeItem > a > label > input {
+  float: inline-start;
+  margin-top: 1px;
+}
+
+[dir="ltr"] .treeItemToggler {
+  float: left;
+}
+
+[dir="rtl"] .treeItemToggler {
+  float: right;
+}
 
 .treeItemToggler {
   position: relative;
+  float: inline-start;
   height: 0;
   width: 0;
   color: rgba(255, 255, 255, 0.5);
 }
-.treeItemToggler::before {
-  content: url(images/treeitem-expanded.svg);
-  /*content: var(--treeitem-expanded-icon);*/
-  display: inline-block;
-  position: absolute;
-  max-width: 16px;
+[dir="ltr"] .treeItemToggler::before {
+  right: 4px;
 }
-@media (prefers-color-scheme: dark) {
-
-  .treeItemToggler::before {
-  content: url(images/treeitem-expanded-dark.svg);
-  /*content: var(--treeitem-expanded-icon);*/
-  }
+[dir="rtl"] .treeItemToggler::before {
+  left: 4px;
+}
+.treeItemToggler::before {
+  inset-inline-end: 4px;
+  -webkit-mask-image: var(--treeitem-expanded-icon);
+          mask-image: var(--treeitem-expanded-icon);
 }
 .treeItemToggler.treeItemsHidden::before {
-  content: url(images/treeitem-collapsed.svg);
-  /*content: var(--treeitem-collapsed-icon);*/
-  max-width: 16px;
-}
-@media (prefers-color-scheme: dark) {
-
-  .treeItemToggler.treeItemsHidden::before {
-  content: url(images/treeitem-collapsed-dark.svg);
-  /*content: var(--treeitem-collapsed-icon);*/
-  }
-}
-html[dir="rtl"] .treeItemToggler.treeItemsHidden::before {
-  transform: scaleX(-1);
+  -webkit-mask-image: var(--treeitem-collapsed-icon);
+          mask-image: var(--treeitem-collapsed-icon);
+  transform: scaleX(var(--dir-factor));
 }
 .treeItemToggler.treeItemsHidden ~ .treeItems {
   display: none;
 }
-html[dir="ltr"] .treeItemToggler {
-  float: left;
-}
-html[dir="rtl"] .treeItemToggler {
-  float: right;
-}
-html[dir="ltr"] .treeItemToggler::before {
-  right: 4px;
-}
-html[dir="rtl"] .treeItemToggler::before {
-  left: 4px;
-}
-
-.treeItemToggler:hover {
-  background-color: rgba(0, 0, 0, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  background-clip: padding-box;
-  border-radius: 2px;
-  color: rgba(0, 0, 0, 0.9);
-  color: var(--outline-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItemToggler:hover {
-  color: rgba(255, 255, 255, 0.9);
-  color: var(--outline-hover-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItemToggler:hover {
-  background-color: rgba(255, 255, 255, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  }
-}
-
-.treeItemToggler:hover + a {
-  background-color: rgba(0, 0, 0, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  background-clip: padding-box;
-  border-radius: 2px;
-  color: rgba(0, 0, 0, 0.9);
-  color: var(--outline-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItemToggler:hover + a {
-  color: rgba(255, 255, 255, 0.9);
-  color: var(--outline-hover-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItemToggler:hover + a {
-  background-color: rgba(255, 255, 255, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  }
-}
-
-.treeItemToggler:hover ~ .treeItems {
-  background-color: rgba(0, 0, 0, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  background-clip: padding-box;
-  border-radius: 2px;
-  color: rgba(0, 0, 0, 0.9);
-  color: var(--outline-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItemToggler:hover ~ .treeItems {
-  color: rgba(255, 255, 255, 0.9);
-  color: var(--outline-hover-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItemToggler:hover ~ .treeItems {
-  background-color: rgba(255, 255, 255, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  }
+
+.treeItem.selected > a {
+  background-color: var(--treeitem-selected-bg-color);
+  color: var(--treeitem-selected-color);
 }
 
+.treeItemToggler:hover,
+.treeItemToggler:hover + a,
+.treeItemToggler:hover ~ .treeItems,
 .treeItem > a:hover {
-  background-color: rgba(0, 0, 0, 0.15);
   background-color: var(--sidebaritem-bg-color);
   background-clip: padding-box;
   border-radius: 2px;
-  color: rgba(0, 0, 0, 0.9);
-  color: var(--outline-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItem > a:hover {
-  color: rgba(255, 255, 255, 0.9);
-  color: var(--outline-hover-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItem > a:hover {
-  background-color: rgba(255, 255, 255, 0.15);
-  background-color: var(--sidebaritem-bg-color);
-  }
-}
-
-.treeItem.selected {
-  background-color: rgba(0, 0, 0, 1);
-  background-color: var(--outline-active-bg-color);
-  background-clip: padding-box;
-  color: rgba(0, 0, 0, 0.08);
-  color: var(--outline-active-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItem.selected {
-  color: rgba(255, 255, 255, 0.08);
-  color: var(--outline-active-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  .treeItem.selected {
-  background-color: rgba(255, 255, 255, 1);
-  background-color: var(--outline-active-bg-color);
-  }
-}
-
-.noResults {
-  font-size: 12px;
-  color: rgba(255, 255, 255, 0.8);
-  font-style: italic;
-  cursor: default;
+  color: var(--treeitem-hover-color);
 }
 
 /* TODO: file FF bug to support ::-moz-selection:window-inactive
@@ -3530,9 +2724,7 @@ html[dir="rtl"] .treeItemToggler::before {
 }
 
 #errorWrapper {
-  background: none repeat scroll 0 0 rgba(255, 74, 74, 1);
-  background: none repeat scroll 0 0 var(--errorWrapper-bg-color);
-  color: rgba(12, 12, 13, 1);
+  background-color: var(--errorWrapper-bg-color);
   color: var(--main-color);
   left: 0;
   position: absolute;
@@ -3541,289 +2733,115 @@ html[dir="rtl"] .treeItemToggler::before {
   padding: 3px 6px;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #errorWrapper {
-  color: rgba(249, 249, 250, 1);
-  color: var(--main-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #errorWrapper {
-  background: none repeat scroll 0 0 rgba(199, 17, 17, 1);
-  background: none repeat scroll 0 0 var(--errorWrapper-bg-color);
-  }
-}
-.loadingInProgress #errorWrapper {
-  top: 37px;
-}
-
 #errorMessageLeft {
   float: left;
 }
-
 #errorMessageRight {
   float: right;
 }
 
+#errorSpacer {
+  clear: both;
+}
 #errorMoreInfo {
-  background-color: rgba(255, 255, 255, 1);
   background-color: var(--field-bg-color);
-  color: rgba(6, 6, 6, 1);
   color: var(--field-color);
-  border: 1px solid rgba(187, 187, 188, 1);
   border: 1px solid var(--field-border-color);
   padding: 3px;
   margin: 3px;
   width: 98%;
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #errorMoreInfo {
-  border: 1px solid rgba(115, 115, 115, 1);
-  border: 1px solid var(--field-border-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #errorMoreInfo {
-  color: rgba(250, 250, 250, 1);
-  color: var(--field-color);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-
-  #errorMoreInfo {
-  background-color: rgba(64, 64, 68, 1);
-  background-color: var(--field-bg-color);
-  }
-}
-
-.overlayButton {
+.dialogButton {
   width: auto;
-  margin: 3px 4px 2px 4px !important;
-  padding: 2px 11px 2px 11px;
+  margin: 3px 4px 2px !important;
+  padding: 2px 11px;
+  color: var(--main-color);
+  background-color: var(--dialog-button-bg-color);
+  border: var(--dialog-button-border) !important;
 }
 
-#overlayContainer {
-  display: table;
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0, 0, 0, 0.2);
-  z-index: 40000;
-}
-#overlayContainer > * {
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-}
-
-#overlayContainer > .container {
-  display: table-cell;
-  vertical-align: middle;
-  text-align: center;
-}
-
-#overlayContainer > .container > .dialog {
-  display: inline-block;
+dialog {
+  margin: auto;
   padding: 15px;
   border-spacing: 4px;
-  color: rgba(12, 12, 13, 1);
   color: var(--main-color);
   font-size: 12px;
   line-height: 14px;
-  background-color: rgba(255, 255, 255, 1);
   background-color: var(--doorhanger-bg-color);
   border: 1px solid rgba(0, 0, 0, 0.5);
   border-radius: 4px;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
 }
-
-@media (prefers-color-scheme: dark) {
-
-  #overlayContainer > .container > .dialog {
-  background-color: rgba(74, 74, 79, 1);
-  background-color: var(--doorhanger-bg-color);
-  }
+dialog::-webkit-backdrop {
+  background-color: rgba(0, 0, 0, 0.2);
+}
+dialog::backdrop {
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  #overlayContainer > .container > .dialog {
-  color: rgba(249, 249, 250, 1);
-  color: var(--main-color);
-  }
-}
-
-.dialog > .row {
+dialog > .row {
   display: table-row;
 }
 
-.dialog > .row > * {
+dialog > .row > * {
   display: table-cell;
 }
 
-.dialog .toolbarField {
+dialog .toolbarField {
   margin: 5px 0;
 }
 
-.dialog .separator {
+dialog .separator {
   display: block;
-  margin: 4px 0 4px 0;
+  margin: 4px 0;
   height: 1px;
   width: 100%;
-  background-color: rgba(0, 0, 0, 0.3);
   background-color: var(--separator-color);
 }
 
-@media (prefers-color-scheme: dark) {
-
-  .dialog .separator {
-  background-color: rgba(0, 0, 0, 0.3);
-  background-color: var(--separator-color);
-  }
-}
-
-.dialog .buttonRow {
+dialog .buttonRow {
   text-align: center;
   vertical-align: middle;
 }
 
-.dialog :link {
+dialog :link {
   color: rgba(255, 255, 255, 1);
 }
 
-#passwordOverlay > .dialog {
+#passwordDialog {
   text-align: center;
 }
-#passwordOverlay .toolbarField {
+#passwordDialog .toolbarField {
   width: 200px;
 }
 
-#documentPropertiesOverlay > .dialog {
+#documentPropertiesDialog {
   text-align: left;
 }
-#documentPropertiesOverlay .row > * {
-  min-width: 100px;
-}
-html[dir="ltr"] #documentPropertiesOverlay .row > * {
+[dir="ltr"] #documentPropertiesDialog .row > * {
   text-align: left;
 }
-html[dir="rtl"] #documentPropertiesOverlay .row > * {
+[dir="rtl"] #documentPropertiesDialog .row > * {
   text-align: right;
 }
-#documentPropertiesOverlay .row > span {
+#documentPropertiesDialog .row > * {
+  min-width: 100px;
+  text-align: start;
+}
+#documentPropertiesDialog .row > span {
   width: 125px;
   word-wrap: break-word;
 }
-#documentPropertiesOverlay .row > p {
+#documentPropertiesDialog .row > p {
   max-width: 225px;
   word-wrap: break-word;
 }
-#documentPropertiesOverlay .buttonRow {
+#documentPropertiesDialog .buttonRow {
   margin-top: 10px;
 }
 
-.clearBoth {
-  clear: both;
-}
-
-.fileInput {
-  background: rgba(255, 255, 255, 1);
-  color: rgba(0, 0, 0, 1);
-  margin-top: 5px;
-  visibility: hidden;
-  position: fixed;
-  right: 0;
-  top: 0;
-}
-
-#PDFBug {
-  background: none repeat scroll 0 0 rgba(255, 255, 255, 1);
-  border: 1px solid rgba(102, 102, 102, 1);
-  position: fixed;
-  top: 32px;
-  right: 0;
-  bottom: 0;
-  font-size: 10px;
-  padding: 0;
-  width: 300px;
-}
-#PDFBug .controls {
-  background: rgba(238, 238, 238, 1);
-  border-bottom: 1px solid rgba(102, 102, 102, 1);
-  padding: 3px;
-}
-#PDFBug .panels {
-  bottom: 0;
-  left: 0;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  position: absolute;
-  right: 0;
-  top: 27px;
-}
-#PDFBug .panels > div {
-  padding: 5px;
-}
-#PDFBug button.active {
-  font-weight: bold;
-}
-.debuggerShowText {
-  background: none repeat scroll 0 0 rgba(255, 255, 0, 1);
-  color: rgba(0, 0, 255, 1);
-}
-.debuggerHideText:hover {
-  background: none repeat scroll 0 0 rgba(255, 255, 0, 1);
-}
-#PDFBug .stats {
-  font-family: courier;
-  font-size: 10px;
-  white-space: pre;
-}
-#PDFBug .stats .title {
-  font-weight: bold;
-}
-#PDFBug table {
-  font-size: 10px;
-}
-
-#viewer.textLayer-visible .textLayer {
-  opacity: 1;
-}
-
-#viewer.textLayer-visible .canvasWrapper {
-  background-color: rgba(128, 255, 128, 1);
-}
-
-#viewer.textLayer-visible .canvasWrapper canvas {
-  mix-blend-mode: screen;
-}
-
-#viewer.textLayer-visible .textLayer > span {
-  background-color: rgba(255, 255, 0, 0.1);
-  color: rgba(0, 0, 0, 1);
-  border: solid 1px rgba(255, 0, 0, 0.5);
-  box-sizing: border-box;
-}
-
-#viewer.textLayer-hover .textLayer > span:hover {
-  background-color: rgba(255, 255, 255, 1);
-  color: rgba(0, 0, 0, 1);
-}
-
-#viewer.textLayer-shadow .textLayer > span {
-  background-color: rgba(255, 255, 255, 0.6);
-  color: rgba(0, 0, 0, 1);
-}
-
 .grab-to-pan-grab {
-  cursor: url("images/grab.cur"), move !important;
   cursor: -webkit-grab !important;
   cursor: grab !important;
 }
@@ -3833,7 +2851,6 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
 }
 .grab-to-pan-grab:active,
 .grab-to-pan-grabbing {
-  cursor: url("images/grabbing.cur"), move !important;
   cursor: -webkit-grabbing !important;
   cursor: grabbing !important;
   position: fixed;
@@ -3856,51 +2873,9 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
 }
 
 @media print {
-  /* General rules for printing. */
   body {
     background: rgba(0, 0, 0, 0) none;
   }
-
-  /* Rules for browsers that don't support mozPrintCallback. */
-  #sidebarContainer,
-  #secondaryToolbar,
-  .toolbar,
-  #loadingBox,
-  #errorWrapper,
-  .textLayer {
-    display: none;
-  }
-  #viewerContainer {
-    overflow: visible;
-  }
-
-  #mainContainer,
-  #viewerContainer,
-  .page,
-  .page canvas {
-    position: static;
-    padding: 0;
-    margin: 0;
-  }
-
-  .page {
-    float: left;
-    display: none;
-    border: none;
-    box-shadow: none;
-    background-clip: content-box;
-    background-color: rgba(255, 255, 255, 1);
-  }
-
-  .page[data-loaded] {
-    display: block;
-  }
-
-  .fileInput {
-    display: none;
-  }
-
-  /* Rules for browsers that support PDF.js printing */
   body[data-pdfjsprinting] #outerContainer {
     display: none;
   }
@@ -3911,18 +2886,38 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
     height: 100%;
   }
   /* wrapper around (scaled) print canvas elements */
-  #printContainer > div {
-    position: relative;
-    top: 0;
-    left: 0;
-    width: 1px;
-    height: 1px;
-    overflow: visible;
+  #printContainer > .printedPage {
     page-break-after: always;
     page-break-inside: avoid;
+
+    /* The wrapper always cover the whole page. */
+    height: 100%;
+    width: 100%;
+
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
   }
-  #printContainer canvas,
-  #printContainer img {
+
+  #printContainer > .xfaPrintedPage .xfaPage {
+    position: absolute;
+  }
+
+  #printContainer > .xfaPrintedPage {
+    page-break-after: always;
+    page-break-inside: avoid;
+    width: 100%;
+    height: 100%;
+    position: relative;
+  }
+
+  #printContainer > .printedPage canvas,
+  #printContainer > .printedPage img {
+    /* The intrinsic canvas / image size will make sure that we fit the page. */
+    max-width: 100%;
+    max-height: 100%;
+
     direction: ltr;
     display: block;
   }
@@ -3945,28 +2940,21 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
 }
 
 @media all and (max-width: 840px) {
-  #sidebarContent {
-    background-color: rgba(0, 0, 0, 0.7);
+  #sidebarContainer {
+    background-color: var(--sidebar-narrow-bg-color);
   }
-
-  html[dir="ltr"] #outerContainer.sidebarOpen #viewerContainer {
-    left: 0px !important;
+  [dir="ltr"] #outerContainer.sidebarOpen #viewerContainer {
+    left: 0 !important;
   }
-  html[dir="rtl"] #outerContainer.sidebarOpen #viewerContainer {
-    right: 0px !important;
+  [dir="rtl"] #outerContainer.sidebarOpen #viewerContainer {
+    right: 0 !important;
   }
-
-  #outerContainer .hiddenLargeView,
-  #outerContainer .hiddenMediumView {
-    display: inherit;
-  }
-  #outerContainer .visibleLargeView,
-  #outerContainer .visibleMediumView {
-    display: none;
+  #outerContainer.sidebarOpen #viewerContainer {
+    inset-inline-start: 0 !important;
   }
 }
 
-@media all and (max-width: 770px) {
+@media all and (max-width: 820px) {
   #outerContainer .hiddenLargeView {
     display: none;
   }
@@ -3975,7 +2963,7 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
   }
 }
 
-@media all and (max-width: 700px) {
+@media all and (max-width: 750px) {
   #outerContainer .hiddenMediumView {
     display: none;
   }
@@ -3984,7 +2972,7 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
   }
 }
 
-@media all and (max-width: 640px) {
+@media all and (max-width: 690px) {
   .hiddenSmallView,
   .hiddenSmallView * {
     display: none;
@@ -3995,15 +2983,18 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
   .toolbarButtonSpacer {
     width: 0;
   }
-  html[dir="ltr"] .findbar {
+  [dir="ltr"] .findbar {
     left: 34px;
   }
-  html[dir="rtl"] .findbar {
+  [dir="rtl"] .findbar {
     right: 34px;
   }
+  .findbar {
+    inset-inline-start: 34px;
+  }
 }
 
-@media all and (max-width: 535px) {
+@media all and (max-width: 560px) {
   #scaleSelectContainer {
     display: none;
   }
diff --git a/cps/static/js/libs/pdf.js b/cps/static/js/libs/pdf.js
index 8d59e6dd9..63248c598 100644
--- a/cps/static/js/libs/pdf.js
+++ b/cps/static/js/libs/pdf.js
@@ -1,8 +1,8 @@
 /**
  * @licstart The following is the entire license notice for the
- * Javascript code in this page
+ * JavaScript code in this page
  *
- * Copyright 2020 Mozilla Foundation
+ * Copyright 2022 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
  * limitations under the License.
  *
  * @licend The above is the entire license notice for the
- * Javascript code in this page
+ * JavaScript code in this page
  */
 
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -29,925 +29,91 @@
 		exports["pdfjs-dist/build/pdf"] = factory();
 	else
 		root["pdfjs-dist/build/pdf"] = root.pdfjsLib = factory();
-})(this, function() {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __w_pdfjs_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __w_pdfjs_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__w_pdfjs_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__w_pdfjs_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__w_pdfjs_require__.d = function(exports, name, getter) {
-/******/ 		if(!__w_pdfjs_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__w_pdfjs_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__w_pdfjs_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __w_pdfjs_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__w_pdfjs_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __w_pdfjs_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__w_pdfjs_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__w_pdfjs_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__w_pdfjs_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__w_pdfjs_require__.p = "";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __w_pdfjs_require__(__w_pdfjs_require__.s = 0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "addLinkAttributes", {
-  enumerable: true,
-  get: function () {
-    return _display_utils.addLinkAttributes;
-  }
-});
-Object.defineProperty(exports, "getFilenameFromUrl", {
-  enumerable: true,
-  get: function () {
-    return _display_utils.getFilenameFromUrl;
-  }
-});
-Object.defineProperty(exports, "LinkTarget", {
-  enumerable: true,
-  get: function () {
-    return _display_utils.LinkTarget;
-  }
-});
-Object.defineProperty(exports, "loadScript", {
-  enumerable: true,
-  get: function () {
-    return _display_utils.loadScript;
-  }
-});
-Object.defineProperty(exports, "PDFDateString", {
-  enumerable: true,
-  get: function () {
-    return _display_utils.PDFDateString;
-  }
-});
-Object.defineProperty(exports, "RenderingCancelledException", {
-  enumerable: true,
-  get: function () {
-    return _display_utils.RenderingCancelledException;
-  }
-});
-Object.defineProperty(exports, "build", {
-  enumerable: true,
-  get: function () {
-    return _api.build;
-  }
-});
-Object.defineProperty(exports, "getDocument", {
-  enumerable: true,
-  get: function () {
-    return _api.getDocument;
-  }
-});
-Object.defineProperty(exports, "LoopbackPort", {
-  enumerable: true,
-  get: function () {
-    return _api.LoopbackPort;
-  }
-});
-Object.defineProperty(exports, "PDFDataRangeTransport", {
-  enumerable: true,
-  get: function () {
-    return _api.PDFDataRangeTransport;
-  }
-});
-Object.defineProperty(exports, "PDFWorker", {
-  enumerable: true,
-  get: function () {
-    return _api.PDFWorker;
-  }
-});
-Object.defineProperty(exports, "version", {
-  enumerable: true,
-  get: function () {
-    return _api.version;
-  }
-});
-Object.defineProperty(exports, "CMapCompressionType", {
-  enumerable: true,
-  get: function () {
-    return _util.CMapCompressionType;
-  }
-});
-Object.defineProperty(exports, "createObjectURL", {
-  enumerable: true,
-  get: function () {
-    return _util.createObjectURL;
-  }
-});
-Object.defineProperty(exports, "createPromiseCapability", {
-  enumerable: true,
-  get: function () {
-    return _util.createPromiseCapability;
-  }
-});
-Object.defineProperty(exports, "createValidAbsoluteUrl", {
-  enumerable: true,
-  get: function () {
-    return _util.createValidAbsoluteUrl;
-  }
-});
-Object.defineProperty(exports, "InvalidPDFException", {
-  enumerable: true,
-  get: function () {
-    return _util.InvalidPDFException;
-  }
-});
-Object.defineProperty(exports, "MissingPDFException", {
-  enumerable: true,
-  get: function () {
-    return _util.MissingPDFException;
-  }
-});
-Object.defineProperty(exports, "OPS", {
-  enumerable: true,
-  get: function () {
-    return _util.OPS;
-  }
-});
-Object.defineProperty(exports, "PasswordResponses", {
-  enumerable: true,
-  get: function () {
-    return _util.PasswordResponses;
-  }
-});
-Object.defineProperty(exports, "PermissionFlag", {
-  enumerable: true,
-  get: function () {
-    return _util.PermissionFlag;
-  }
-});
-Object.defineProperty(exports, "removeNullCharacters", {
-  enumerable: true,
-  get: function () {
-    return _util.removeNullCharacters;
-  }
-});
-Object.defineProperty(exports, "shadow", {
-  enumerable: true,
-  get: function () {
-    return _util.shadow;
-  }
-});
-Object.defineProperty(exports, "UnexpectedResponseException", {
-  enumerable: true,
-  get: function () {
-    return _util.UnexpectedResponseException;
-  }
-});
-Object.defineProperty(exports, "UNSUPPORTED_FEATURES", {
-  enumerable: true,
-  get: function () {
-    return _util.UNSUPPORTED_FEATURES;
-  }
-});
-Object.defineProperty(exports, "Util", {
-  enumerable: true,
-  get: function () {
-    return _util.Util;
-  }
-});
-Object.defineProperty(exports, "VerbosityLevel", {
-  enumerable: true,
-  get: function () {
-    return _util.VerbosityLevel;
-  }
-});
-Object.defineProperty(exports, "AnnotationLayer", {
-  enumerable: true,
-  get: function () {
-    return _annotation_layer.AnnotationLayer;
-  }
-});
-Object.defineProperty(exports, "apiCompatibilityParams", {
-  enumerable: true,
-  get: function () {
-    return _api_compatibility.apiCompatibilityParams;
-  }
-});
-Object.defineProperty(exports, "GlobalWorkerOptions", {
-  enumerable: true,
-  get: function () {
-    return _worker_options.GlobalWorkerOptions;
-  }
-});
-Object.defineProperty(exports, "renderTextLayer", {
-  enumerable: true,
-  get: function () {
-    return _text_layer.renderTextLayer;
-  }
-});
-Object.defineProperty(exports, "SVGGraphics", {
-  enumerable: true,
-  get: function () {
-    return _svg.SVGGraphics;
-  }
-});
-
-var _display_utils = __w_pdfjs_require__(1);
-
-var _api = __w_pdfjs_require__(5);
-
-var _util = __w_pdfjs_require__(2);
-
-var _annotation_layer = __w_pdfjs_require__(19);
-
-var _api_compatibility = __w_pdfjs_require__(9);
-
-var _worker_options = __w_pdfjs_require__(12);
-
-var _text_layer = __w_pdfjs_require__(20);
-
-var _svg = __w_pdfjs_require__(21);
-
-const pdfjsVersion = '2.6.347';
-const pdfjsBuild = '3be9c65f';
-{
-  const {
-    isNodeJS
-  } = __w_pdfjs_require__(4);
-
-  if (isNodeJS) {
-    const PDFNodeStream = __w_pdfjs_require__(22).PDFNodeStream;
-
-    (0, _api.setPDFNetworkStreamFactory)(params => {
-      return new PDFNodeStream(params);
-    });
-  } else {
-    const PDFNetworkStream = __w_pdfjs_require__(25).PDFNetworkStream;
-
-    let PDFFetchStream;
-
-    if ((0, _display_utils.isFetchSupported)()) {
-      PDFFetchStream = __w_pdfjs_require__(26).PDFFetchStream;
-    }
-
-    (0, _api.setPDFNetworkStreamFactory)(params => {
-      if (PDFFetchStream && (0, _display_utils.isValidFetchUrl)(params.url)) {
-        return new PDFFetchStream(params);
-      }
-
-      return new PDFNetworkStream(params);
-    });
-  }
-}
-
-/***/ }),
+})(globalThis, () => {
+return /******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	var __webpack_modules__ = ([
+/* 0 */,
 /* 1 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.addLinkAttributes = addLinkAttributes;
-exports.getFilenameFromUrl = getFilenameFromUrl;
-exports.isFetchSupported = isFetchSupported;
-exports.isValidFetchUrl = isValidFetchUrl;
-exports.loadScript = loadScript;
-exports.deprecated = deprecated;
-exports.PDFDateString = exports.StatTimer = exports.DOMSVGFactory = exports.DOMCMapReaderFactory = exports.BaseCMapReaderFactory = exports.DOMCanvasFactory = exports.BaseCanvasFactory = exports.DEFAULT_LINK_REL = exports.LinkTarget = exports.RenderingCancelledException = exports.PageViewport = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-const DEFAULT_LINK_REL = "noopener noreferrer nofollow";
-exports.DEFAULT_LINK_REL = DEFAULT_LINK_REL;
-const SVG_NS = "http://www.w3.org/2000/svg";
-
-class BaseCanvasFactory {
-  constructor() {
-    if (this.constructor === BaseCanvasFactory) {
-      (0, _util.unreachable)("Cannot initialize BaseCanvasFactory.");
-    }
-  }
-
-  create(width, height) {
-    (0, _util.unreachable)("Abstract method `create` called.");
-  }
-
-  reset(canvasAndContext, width, height) {
-    if (!canvasAndContext.canvas) {
-      throw new Error("Canvas is not specified");
-    }
-
-    if (width <= 0 || height <= 0) {
-      throw new Error("Invalid canvas size");
-    }
-
-    canvasAndContext.canvas.width = width;
-    canvasAndContext.canvas.height = height;
-  }
-
-  destroy(canvasAndContext) {
-    if (!canvasAndContext.canvas) {
-      throw new Error("Canvas is not specified");
-    }
-
-    canvasAndContext.canvas.width = 0;
-    canvasAndContext.canvas.height = 0;
-    canvasAndContext.canvas = null;
-    canvasAndContext.context = null;
-  }
-
-}
-
-exports.BaseCanvasFactory = BaseCanvasFactory;
-
-class DOMCanvasFactory extends BaseCanvasFactory {
-  constructor({
-    ownerDocument = globalThis.document
-  } = {}) {
-    super();
-    this._document = ownerDocument;
-  }
-
-  create(width, height) {
-    if (width <= 0 || height <= 0) {
-      throw new Error("Invalid canvas size");
-    }
-
-    const canvas = this._document.createElement("canvas");
-
-    const context = canvas.getContext("2d");
-    canvas.width = width;
-    canvas.height = height;
-    return {
-      canvas,
-      context
-    };
-  }
-
-}
-
-exports.DOMCanvasFactory = DOMCanvasFactory;
-
-class BaseCMapReaderFactory {
-  constructor({
-    baseUrl = null,
-    isCompressed = false
-  }) {
-    if (this.constructor === BaseCMapReaderFactory) {
-      (0, _util.unreachable)("Cannot initialize BaseCMapReaderFactory.");
-    }
-
-    this.baseUrl = baseUrl;
-    this.isCompressed = isCompressed;
-  }
-
-  async fetch({
-    name
-  }) {
-    if (!this.baseUrl) {
-      throw new Error('The CMap "baseUrl" parameter must be specified, ensure that ' + 'the "cMapUrl" and "cMapPacked" API parameters are provided.');
-    }
-
-    if (!name) {
-      throw new Error("CMap name must be specified.");
-    }
-
-    const url = this.baseUrl + name + (this.isCompressed ? ".bcmap" : "");
-    const compressionType = this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE;
-    return this._fetchData(url, compressionType).catch(reason => {
-      throw new Error(`Unable to load ${this.isCompressed ? "binary " : ""}CMap at: ${url}`);
-    });
-  }
-
-  _fetchData(url, compressionType) {
-    (0, _util.unreachable)("Abstract method `_fetchData` called.");
-  }
-
-}
-
-exports.BaseCMapReaderFactory = BaseCMapReaderFactory;
-
-class DOMCMapReaderFactory extends BaseCMapReaderFactory {
-  _fetchData(url, compressionType) {
-    if (isFetchSupported() && isValidFetchUrl(url, document.baseURI)) {
-      return fetch(url).then(async response => {
-        if (!response.ok) {
-          throw new Error(response.statusText);
-        }
-
-        let cMapData;
-
-        if (this.isCompressed) {
-          cMapData = new Uint8Array(await response.arrayBuffer());
-        } else {
-          cMapData = (0, _util.stringToBytes)(await response.text());
-        }
-
-        return {
-          cMapData,
-          compressionType
-        };
-      });
-    }
-
-    return new Promise((resolve, reject) => {
-      const request = new XMLHttpRequest();
-      request.open("GET", url, true);
-
-      if (this.isCompressed) {
-        request.responseType = "arraybuffer";
-      }
-
-      request.onreadystatechange = () => {
-        if (request.readyState !== XMLHttpRequest.DONE) {
-          return;
-        }
-
-        if (request.status === 200 || request.status === 0) {
-          let cMapData;
-
-          if (this.isCompressed && request.response) {
-            cMapData = new Uint8Array(request.response);
-          } else if (!this.isCompressed && request.responseText) {
-            cMapData = (0, _util.stringToBytes)(request.responseText);
-          }
-
-          if (cMapData) {
-            resolve({
-              cMapData,
-              compressionType
-            });
-            return;
-          }
-        }
-
-        reject(new Error(request.statusText));
-      };
-
-      request.send(null);
-    });
-  }
-
-}
-
-exports.DOMCMapReaderFactory = DOMCMapReaderFactory;
-
-class DOMSVGFactory {
-  create(width, height) {
-    (0, _util.assert)(width > 0 && height > 0, "Invalid SVG dimensions");
-    const svg = document.createElementNS(SVG_NS, "svg:svg");
-    svg.setAttribute("version", "1.1");
-    svg.setAttribute("width", width + "px");
-    svg.setAttribute("height", height + "px");
-    svg.setAttribute("preserveAspectRatio", "none");
-    svg.setAttribute("viewBox", "0 0 " + width + " " + height);
-    return svg;
-  }
-
-  createElement(type) {
-    (0, _util.assert)(typeof type === "string", "Invalid SVG element type");
-    return document.createElementNS(SVG_NS, type);
-  }
-
-}
-
-exports.DOMSVGFactory = DOMSVGFactory;
-
-class PageViewport {
-  constructor({
-    viewBox,
-    scale,
-    rotation,
-    offsetX = 0,
-    offsetY = 0,
-    dontFlip = false
-  }) {
-    this.viewBox = viewBox;
-    this.scale = scale;
-    this.rotation = rotation;
-    this.offsetX = offsetX;
-    this.offsetY = offsetY;
-    const centerX = (viewBox[2] + viewBox[0]) / 2;
-    const centerY = (viewBox[3] + viewBox[1]) / 2;
-    let rotateA, rotateB, rotateC, rotateD;
-    rotation = rotation % 360;
-    rotation = rotation < 0 ? rotation + 360 : rotation;
-
-    switch (rotation) {
-      case 180:
-        rotateA = -1;
-        rotateB = 0;
-        rotateC = 0;
-        rotateD = 1;
-        break;
-
-      case 90:
-        rotateA = 0;
-        rotateB = 1;
-        rotateC = 1;
-        rotateD = 0;
-        break;
-
-      case 270:
-        rotateA = 0;
-        rotateB = -1;
-        rotateC = -1;
-        rotateD = 0;
-        break;
-
-      case 0:
-        rotateA = 1;
-        rotateB = 0;
-        rotateC = 0;
-        rotateD = -1;
-        break;
-
-      default:
-        throw new Error("PageViewport: Invalid rotation, must be a multiple of 90 degrees.");
-    }
-
-    if (dontFlip) {
-      rotateC = -rotateC;
-      rotateD = -rotateD;
-    }
-
-    let offsetCanvasX, offsetCanvasY;
-    let width, height;
-
-    if (rotateA === 0) {
-      offsetCanvasX = Math.abs(centerY - viewBox[1]) * scale + offsetX;
-      offsetCanvasY = Math.abs(centerX - viewBox[0]) * scale + offsetY;
-      width = Math.abs(viewBox[3] - viewBox[1]) * scale;
-      height = Math.abs(viewBox[2] - viewBox[0]) * scale;
-    } else {
-      offsetCanvasX = Math.abs(centerX - viewBox[0]) * scale + offsetX;
-      offsetCanvasY = Math.abs(centerY - viewBox[1]) * scale + offsetY;
-      width = Math.abs(viewBox[2] - viewBox[0]) * scale;
-      height = Math.abs(viewBox[3] - viewBox[1]) * scale;
-    }
-
-    this.transform = [rotateA * scale, rotateB * scale, rotateC * scale, rotateD * scale, offsetCanvasX - rotateA * scale * centerX - rotateC * scale * centerY, offsetCanvasY - rotateB * scale * centerX - rotateD * scale * centerY];
-    this.width = width;
-    this.height = height;
-  }
-
-  clone({
-    scale = this.scale,
-    rotation = this.rotation,
-    offsetX = this.offsetX,
-    offsetY = this.offsetY,
-    dontFlip = false
-  } = {}) {
-    return new PageViewport({
-      viewBox: this.viewBox.slice(),
-      scale,
-      rotation,
-      offsetX,
-      offsetY,
-      dontFlip
-    });
-  }
-
-  convertToViewportPoint(x, y) {
-    return _util.Util.applyTransform([x, y], this.transform);
-  }
-
-  convertToViewportRectangle(rect) {
-    const topLeft = _util.Util.applyTransform([rect[0], rect[1]], this.transform);
-
-    const bottomRight = _util.Util.applyTransform([rect[2], rect[3]], this.transform);
-
-    return [topLeft[0], topLeft[1], bottomRight[0], bottomRight[1]];
-  }
-
-  convertToPdfPoint(x, y) {
-    return _util.Util.applyInverseTransform([x, y], this.transform);
-  }
-
-}
-
-exports.PageViewport = PageViewport;
-
-class RenderingCancelledException extends _util.BaseException {
-  constructor(msg, type) {
-    super(msg);
-    this.type = type;
-  }
-
-}
-
-exports.RenderingCancelledException = RenderingCancelledException;
-const LinkTarget = {
-  NONE: 0,
-  SELF: 1,
-  BLANK: 2,
-  PARENT: 3,
-  TOP: 4
-};
-exports.LinkTarget = LinkTarget;
-
-function addLinkAttributes(link, {
-  url,
-  target,
-  rel,
-  enabled = true
-} = {}) {
-  (0, _util.assert)(url && typeof url === "string", 'addLinkAttributes: A valid "url" parameter must provided.');
-  const urlNullRemoved = (0, _util.removeNullCharacters)(url);
-
-  if (enabled) {
-    link.href = link.title = urlNullRemoved;
-  } else {
-    link.href = "";
-    link.title = `Disabled: ${urlNullRemoved}`;
-
-    link.onclick = () => {
-      return false;
-    };
-  }
-
-  let targetStr = "";
-
-  switch (target) {
-    case LinkTarget.NONE:
-      break;
-
-    case LinkTarget.SELF:
-      targetStr = "_self";
-      break;
-
-    case LinkTarget.BLANK:
-      targetStr = "_blank";
-      break;
-
-    case LinkTarget.PARENT:
-      targetStr = "_parent";
-      break;
-
-    case LinkTarget.TOP:
-      targetStr = "_top";
-      break;
-  }
-
-  link.target = targetStr;
-  link.rel = typeof rel === "string" ? rel : DEFAULT_LINK_REL;
-}
-
-function getFilenameFromUrl(url) {
-  const anchor = url.indexOf("#");
-  const query = url.indexOf("?");
-  const end = Math.min(anchor > 0 ? anchor : url.length, query > 0 ? query : url.length);
-  return url.substring(url.lastIndexOf("/", end) + 1, end);
-}
-
-class StatTimer {
-  constructor() {
-    this.started = Object.create(null);
-    this.times = [];
-  }
-
-  time(name) {
-    if (name in this.started) {
-      (0, _util.warn)(`Timer is already running for ${name}`);
-    }
-
-    this.started[name] = Date.now();
-  }
-
-  timeEnd(name) {
-    if (!(name in this.started)) {
-      (0, _util.warn)(`Timer has not been started for ${name}`);
-    }
-
-    this.times.push({
-      name,
-      start: this.started[name],
-      end: Date.now()
-    });
-    delete this.started[name];
-  }
-
-  toString() {
-    const outBuf = [];
-    let longest = 0;
-
-    for (const time of this.times) {
-      const name = time.name;
-
-      if (name.length > longest) {
-        longest = name.length;
-      }
-    }
-
-    for (const time of this.times) {
-      const duration = time.end - time.start;
-      outBuf.push(`${time.name.padEnd(longest)} ${duration}ms\n`);
-    }
-
-    return outBuf.join("");
-  }
-
-}
-
-exports.StatTimer = StatTimer;
-
-function isFetchSupported() {
-  return typeof fetch !== "undefined" && typeof Response !== "undefined" && "body" in Response.prototype && typeof ReadableStream !== "undefined";
-}
-
-function isValidFetchUrl(url, baseUrl) {
-  try {
-    const {
-      protocol
-    } = baseUrl ? new URL(url, baseUrl) : new URL(url);
-    return protocol === "http:" || protocol === "https:";
-  } catch (ex) {
-    return false;
-  }
-}
-
-function loadScript(src) {
-  return new Promise((resolve, reject) => {
-    const script = document.createElement("script");
-    script.src = src;
-    script.onload = resolve;
-
-    script.onerror = function () {
-      reject(new Error(`Cannot load script at: ${script.src}`));
-    };
-
-    (document.head || document.documentElement).appendChild(script);
-  });
-}
-
-function deprecated(details) {
-  console.log("Deprecated API usage: " + details);
-}
-
-let pdfDateStringRegex;
-
-class PDFDateString {
-  static toDateObject(input) {
-    if (!input || !(0, _util.isString)(input)) {
-      return null;
-    }
-
-    if (!pdfDateStringRegex) {
-      pdfDateStringRegex = new RegExp("^D:" + "(\\d{4})" + "(\\d{2})?" + "(\\d{2})?" + "(\\d{2})?" + "(\\d{2})?" + "(\\d{2})?" + "([Z|+|-])?" + "(\\d{2})?" + "'?" + "(\\d{2})?" + "'?");
-    }
-
-    const matches = pdfDateStringRegex.exec(input);
-
-    if (!matches) {
-      return null;
-    }
-
-    const year = parseInt(matches[1], 10);
-    let month = parseInt(matches[2], 10);
-    month = month >= 1 && month <= 12 ? month - 1 : 0;
-    let day = parseInt(matches[3], 10);
-    day = day >= 1 && day <= 31 ? day : 1;
-    let hour = parseInt(matches[4], 10);
-    hour = hour >= 0 && hour <= 23 ? hour : 0;
-    let minute = parseInt(matches[5], 10);
-    minute = minute >= 0 && minute <= 59 ? minute : 0;
-    let second = parseInt(matches[6], 10);
-    second = second >= 0 && second <= 59 ? second : 0;
-    const universalTimeRelation = matches[7] || "Z";
-    let offsetHour = parseInt(matches[8], 10);
-    offsetHour = offsetHour >= 0 && offsetHour <= 23 ? offsetHour : 0;
-    let offsetMinute = parseInt(matches[9], 10) || 0;
-    offsetMinute = offsetMinute >= 0 && offsetMinute <= 59 ? offsetMinute : 0;
-
-    if (universalTimeRelation === "-") {
-      hour += offsetHour;
-      minute += offsetMinute;
-    } else if (universalTimeRelation === "+") {
-      hour -= offsetHour;
-      minute -= offsetMinute;
-    }
-
-    return new Date(Date.UTC(year, month, day, hour, minute, second));
-  }
-
-}
-
-exports.PDFDateString = PDFDateString;
-
-/***/ }),
-/* 2 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+}));
+exports.VerbosityLevel = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.UNSUPPORTED_FEATURES = exports.TextRenderingMode = exports.StreamType = exports.RenderingIntentFlag = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.LINE_FACTOR = exports.LINE_DESCENT_FACTOR = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FontType = exports.FeatureTest = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.AnnotationType = exports.AnnotationStateModelType = exports.AnnotationReviewState = exports.AnnotationReplyType = exports.AnnotationMode = exports.AnnotationMarkedState = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationEditorType = exports.AnnotationEditorPrefix = exports.AnnotationEditorParamsType = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
 exports.arrayByteLength = arrayByteLength;
 exports.arraysToBytes = arraysToBytes;
 exports.assert = assert;
 exports.bytesToString = bytesToString;
 exports.createPromiseCapability = createPromiseCapability;
+exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
 exports.escapeString = escapeString;
 exports.getModificationDate = getModificationDate;
 exports.getVerbosityLevel = getVerbosityLevel;
 exports.info = info;
 exports.isArrayBuffer = isArrayBuffer;
 exports.isArrayEqual = isArrayEqual;
-exports.isBool = isBool;
-exports.isNum = isNum;
-exports.isString = isString;
-exports.isSameOrigin = isSameOrigin;
-exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
-exports.removeNullCharacters = removeNullCharacters;
+exports.isAscii = isAscii;
+exports.objectFromMap = objectFromMap;
+exports.objectSize = objectSize;
 exports.setVerbosityLevel = setVerbosityLevel;
 exports.shadow = shadow;
 exports.string32 = string32;
 exports.stringToBytes = stringToBytes;
 exports.stringToPDFString = stringToPDFString;
+exports.stringToUTF16BEString = stringToUTF16BEString;
 exports.stringToUTF8String = stringToUTF8String;
+exports.unreachable = unreachable;
 exports.utf8StringToString = utf8StringToString;
 exports.warn = warn;
-exports.unreachable = unreachable;
-exports.IsEvalSupportedCached = exports.IsLittleEndianCached = exports.createObjectURL = exports.FormatError = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.MissingPDFException = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationStateModelType = exports.AnnotationReviewState = exports.AnnotationReplyType = exports.AnnotationMarkedState = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VerbosityLevel = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = exports.BaseException = void 0;
 
-__w_pdfjs_require__(3);
+__w_pdfjs_require__(2);
 
 const IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
 exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
 const FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0];
 exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
+const LINE_FACTOR = 1.35;
+exports.LINE_FACTOR = LINE_FACTOR;
+const LINE_DESCENT_FACTOR = 0.35;
+exports.LINE_DESCENT_FACTOR = LINE_DESCENT_FACTOR;
+const RenderingIntentFlag = {
+  ANY: 0x01,
+  DISPLAY: 0x02,
+  PRINT: 0x04,
+  ANNOTATIONS_FORMS: 0x10,
+  ANNOTATIONS_STORAGE: 0x20,
+  ANNOTATIONS_DISABLE: 0x40,
+  OPLIST: 0x100
+};
+exports.RenderingIntentFlag = RenderingIntentFlag;
+const AnnotationMode = {
+  DISABLE: 0,
+  ENABLE: 1,
+  ENABLE_FORMS: 2,
+  ENABLE_STORAGE: 3
+};
+exports.AnnotationMode = AnnotationMode;
+const AnnotationEditorPrefix = "pdfjs_internal_editor_";
+exports.AnnotationEditorPrefix = AnnotationEditorPrefix;
+const AnnotationEditorType = {
+  DISABLE: -1,
+  NONE: 0,
+  FREETEXT: 3,
+  INK: 15
+};
+exports.AnnotationEditorType = AnnotationEditorType;
+const AnnotationEditorParamsType = {
+  FREETEXT_SIZE: 1,
+  FREETEXT_COLOR: 2,
+  FREETEXT_OPACITY: 3,
+  INK_COLOR: 11,
+  INK_THICKNESS: 12,
+  INK_OPACITY: 13
+};
+exports.AnnotationEditorParamsType = AnnotationEditorParamsType;
 const PermissionFlag = {
   PRINT: 0x04,
   MODIFY_CONTENTS: 0x08,
@@ -1073,6 +239,36 @@ const AnnotationBorderStyleType = {
   UNDERLINE: 5
 };
 exports.AnnotationBorderStyleType = AnnotationBorderStyleType;
+const AnnotationActionEventType = {
+  E: "Mouse Enter",
+  X: "Mouse Exit",
+  D: "Mouse Down",
+  U: "Mouse Up",
+  Fo: "Focus",
+  Bl: "Blur",
+  PO: "PageOpen",
+  PC: "PageClose",
+  PV: "PageVisible",
+  PI: "PageInvisible",
+  K: "Keystroke",
+  F: "Format",
+  V: "Validate",
+  C: "Calculate"
+};
+exports.AnnotationActionEventType = AnnotationActionEventType;
+const DocumentActionEventType = {
+  WC: "WillClose",
+  WS: "WillSave",
+  DS: "DidSave",
+  WP: "WillPrint",
+  DP: "DidPrint"
+};
+exports.DocumentActionEventType = DocumentActionEventType;
+const PageActionEventType = {
+  O: "PageOpen",
+  C: "PageClose"
+};
+exports.PageActionEventType = PageActionEventType;
 const StreamType = {
   UNKNOWN: "UNKNOWN",
   FLATE: "FLATE",
@@ -1089,6 +285,7 @@ exports.StreamType = StreamType;
 const FontType = {
   UNKNOWN: "UNKNOWN",
   TYPE1: "TYPE1",
+  TYPE1STANDARD: "TYPE1STANDARD",
   TYPE1C: "TYPE1C",
   CIDFONTTYPE0: "CIDFONTTYPE0",
   CIDFONTTYPE0C: "CIDFONTTYPE0C",
@@ -1210,6 +407,7 @@ const UNSUPPORTED_FEATURES = {
   unknown: "unknown",
   forms: "forms",
   javaScript: "javaScript",
+  signatures: "signatures",
   smask: "smask",
   shadingPattern: "shadingPattern",
   font: "font",
@@ -1224,8 +422,10 @@ const UNSUPPORTED_FEATURES = {
   errorOperatorList: "errorOperatorList",
   errorFontToUnicode: "errorFontToUnicode",
   errorFontLoadNative: "errorFontLoadNative",
+  errorFontBuildPath: "errorFontBuildPath",
   errorFontGetPath: "errorFontGetPath",
-  errorMarkedContent: "errorMarkedContent"
+  errorMarkedContent: "errorMarkedContent",
+  errorContentSubStream: "errorContentSubStream"
 };
 exports.UNSUPPORTED_FEATURES = UNSUPPORTED_FEATURES;
 const PasswordResponses = {
@@ -1267,23 +467,6 @@ function assert(cond, msg) {
   }
 }
 
-function isSameOrigin(baseUrl, otherUrl) {
-  let base;
-
-  try {
-    base = new URL(baseUrl);
-
-    if (!base.origin || base.origin === "null") {
-      return false;
-    }
-  } catch (e) {
-    return false;
-  }
-
-  const other = new URL(otherUrl, base);
-  return base.origin === other.origin;
-}
-
 function _isValidProtocol(url) {
   if (!url) {
     return false;
@@ -1302,12 +485,28 @@ function _isValidProtocol(url) {
   }
 }
 
-function createValidAbsoluteUrl(url, baseUrl) {
+function createValidAbsoluteUrl(url, baseUrl = null, options = null) {
   if (!url) {
     return null;
   }
 
   try {
+    if (options && typeof url === "string") {
+      if (options.addDefaultProtocol && url.startsWith("www.")) {
+        const dots = url.match(/\./g);
+
+        if (dots && dots.length >= 2) {
+          url = `http://${url}`;
+        }
+      }
+
+      if (options.tryConvertEncoding) {
+        try {
+          url = stringToUTF8String(url);
+        } catch (ex) {}
+      }
+    }
+
     const absoluteUrl = baseUrl ? new URL(url, baseUrl) : new URL(url);
 
     if (_isValidProtocol(absoluteUrl)) {
@@ -1329,13 +528,13 @@ function shadow(obj, prop, value) {
 }
 
 const BaseException = function BaseExceptionClosure() {
-  function BaseException(message) {
+  function BaseException(message, name) {
     if (this.constructor === BaseException) {
       unreachable("Cannot initialize BaseException.");
     }
 
     this.message = message;
-    this.name = this.constructor.name;
+    this.name = name;
   }
 
   BaseException.prototype = new Error();
@@ -1347,7 +546,7 @@ exports.BaseException = BaseException;
 
 class PasswordException extends BaseException {
   constructor(msg, code) {
-    super(msg);
+    super(msg, "PasswordException");
     this.code = code;
   }
 
@@ -1357,7 +556,7 @@ exports.PasswordException = PasswordException;
 
 class UnknownErrorException extends BaseException {
   constructor(msg, details) {
-    super(msg);
+    super(msg, "UnknownErrorException");
     this.details = details;
   }
 
@@ -1365,17 +564,27 @@ class UnknownErrorException extends BaseException {
 
 exports.UnknownErrorException = UnknownErrorException;
 
-class InvalidPDFException extends BaseException {}
+class InvalidPDFException extends BaseException {
+  constructor(msg) {
+    super(msg, "InvalidPDFException");
+  }
+
+}
 
 exports.InvalidPDFException = InvalidPDFException;
 
-class MissingPDFException extends BaseException {}
+class MissingPDFException extends BaseException {
+  constructor(msg) {
+    super(msg, "MissingPDFException");
+  }
+
+}
 
 exports.MissingPDFException = MissingPDFException;
 
 class UnexpectedResponseException extends BaseException {
   constructor(msg, status) {
-    super(msg);
+    super(msg, "UnexpectedResponseException");
     this.status = status;
   }
 
@@ -1383,26 +592,29 @@ class UnexpectedResponseException extends BaseException {
 
 exports.UnexpectedResponseException = UnexpectedResponseException;
 
-class FormatError extends BaseException {}
+class FormatError extends BaseException {
+  constructor(msg) {
+    super(msg, "FormatError");
+  }
+
+}
 
 exports.FormatError = FormatError;
 
-class AbortException extends BaseException {}
-
-exports.AbortException = AbortException;
-const NullCharactersRegExp = /\x00/g;
-
-function removeNullCharacters(str) {
-  if (typeof str !== "string") {
-    warn("The argument for removeNullCharacters must be a string.");
-    return str;
+class AbortException extends BaseException {
+  constructor(msg) {
+    super(msg, "AbortException");
   }
 
-  return str.replace(NullCharactersRegExp, "");
 }
 
+exports.AbortException = AbortException;
+
 function bytesToString(bytes) {
-  assert(bytes !== null && typeof bytes === "object" && bytes.length !== undefined, "Invalid argument for bytesToString");
+  if (typeof bytes !== "object" || bytes === null || bytes.length === undefined) {
+    unreachable("Invalid argument for bytesToString");
+  }
+
   const length = bytes.length;
   const MAX_ARGUMENT_COUNT = 8192;
 
@@ -1422,7 +634,10 @@ function bytesToString(bytes) {
 }
 
 function stringToBytes(str) {
-  assert(typeof str === "string", "Invalid argument for stringToBytes");
+  if (typeof str !== "string") {
+    unreachable("Invalid argument for stringToBytes");
+  }
+
   const length = str.length;
   const bytes = new Uint8Array(length);
 
@@ -1438,8 +653,11 @@ function arrayByteLength(arr) {
     return arr.length;
   }
 
-  assert(arr.byteLength !== undefined, "arrayByteLength - invalid argument.");
-  return arr.byteLength;
+  if (arr.byteLength !== undefined) {
+    return arr.byteLength;
+  }
+
+  unreachable("Invalid argument for arrayByteLength");
 }
 
 function arraysToBytes(arr) {
@@ -1481,6 +699,20 @@ function string32(value) {
   return String.fromCharCode(value >> 24 & 0xff, value >> 16 & 0xff, value >> 8 & 0xff, value & 0xff);
 }
 
+function objectSize(obj) {
+  return Object.keys(obj).length;
+}
+
+function objectFromMap(map) {
+  const obj = Object.create(null);
+
+  for (const [key, value] of map) {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
 function isLittleEndian() {
   const buffer8 = new Uint8Array(4);
   buffer8[0] = 1;
@@ -1488,14 +720,6 @@ function isLittleEndian() {
   return view32[0] === 1;
 }
 
-const IsLittleEndianCached = {
-  get value() {
-    return shadow(this, "value", isLittleEndian());
-  }
-
-};
-exports.IsLittleEndianCached = IsLittleEndianCached;
-
 function isEvalSupported() {
   try {
     new Function("");
@@ -1505,21 +729,81 @@ function isEvalSupported() {
   }
 }
 
-const IsEvalSupportedCached = {
-  get value() {
-    return shadow(this, "value", isEvalSupported());
+class FeatureTest {
+  static get isLittleEndian() {
+    return shadow(this, "isLittleEndian", isLittleEndian());
   }
 
-};
-exports.IsEvalSupportedCached = IsEvalSupportedCached;
-const rgbBuf = ["rgb(", 0, ",", 0, ",", 0, ")"];
+  static get isEvalSupported() {
+    return shadow(this, "isEvalSupported", isEvalSupported());
+  }
+
+  static get isOffscreenCanvasSupported() {
+    return shadow(this, "isOffscreenCanvasSupported", typeof OffscreenCanvas !== "undefined");
+  }
+
+}
+
+exports.FeatureTest = FeatureTest;
+const hexNumbers = [...Array(256).keys()].map(n => n.toString(16).padStart(2, "0"));
 
 class Util {
-  static makeCssRgb(r, g, b) {
-    rgbBuf[1] = r;
-    rgbBuf[3] = g;
-    rgbBuf[5] = b;
-    return rgbBuf.join("");
+  static makeHexColor(r, g, b) {
+    return `#${hexNumbers[r]}${hexNumbers[g]}${hexNumbers[b]}`;
+  }
+
+  static scaleMinMax(transform, minMax) {
+    let temp;
+
+    if (transform[0]) {
+      if (transform[0] < 0) {
+        temp = minMax[0];
+        minMax[0] = minMax[1];
+        minMax[1] = temp;
+      }
+
+      minMax[0] *= transform[0];
+      minMax[1] *= transform[0];
+
+      if (transform[3] < 0) {
+        temp = minMax[2];
+        minMax[2] = minMax[3];
+        minMax[3] = temp;
+      }
+
+      minMax[2] *= transform[3];
+      minMax[3] *= transform[3];
+    } else {
+      temp = minMax[0];
+      minMax[0] = minMax[2];
+      minMax[2] = temp;
+      temp = minMax[1];
+      minMax[1] = minMax[3];
+      minMax[3] = temp;
+
+      if (transform[1] < 0) {
+        temp = minMax[2];
+        minMax[2] = minMax[3];
+        minMax[3] = temp;
+      }
+
+      minMax[2] *= transform[1];
+      minMax[3] *= transform[1];
+
+      if (transform[2] < 0) {
+        temp = minMax[0];
+        minMax[0] = minMax[1];
+        minMax[1] = temp;
+      }
+
+      minMax[0] *= transform[2];
+      minMax[1] *= transform[2];
+    }
+
+    minMax[0] += transform[4];
+    minMax[1] += transform[4];
+    minMax[2] += transform[5];
+    minMax[3] += transform[5];
   }
 
   static transform(m1, m2) {
@@ -1563,7 +847,7 @@ class Util {
     const c = m[2] * transpose[0] + m[3] * transpose[2];
     const d = m[2] * transpose[1] + m[3] * transpose[3];
     const first = (a + d) / 2;
-    const second = Math.sqrt((a + d) * (a + d) - 4 * (a * d - c * b)) / 2;
+    const second = Math.sqrt((a + d) ** 2 - 4 * (a * d - c * b)) / 2;
     const sx = first + second || 1;
     const sy = first - second || 1;
     return [Math.sqrt(sx), Math.sqrt(sy)];
@@ -1586,62 +870,157 @@ class Util {
   }
 
   static intersect(rect1, rect2) {
-    function compare(a, b) {
-      return a - b;
-    }
+    const xLow = Math.max(Math.min(rect1[0], rect1[2]), Math.min(rect2[0], rect2[2]));
+    const xHigh = Math.min(Math.max(rect1[0], rect1[2]), Math.max(rect2[0], rect2[2]));
 
-    const orderedX = [rect1[0], rect1[2], rect2[0], rect2[2]].sort(compare);
-    const orderedY = [rect1[1], rect1[3], rect2[1], rect2[3]].sort(compare);
-    const result = [];
-    rect1 = Util.normalizeRect(rect1);
-    rect2 = Util.normalizeRect(rect2);
-
-    if (orderedX[0] === rect1[0] && orderedX[1] === rect2[0] || orderedX[0] === rect2[0] && orderedX[1] === rect1[0]) {
-      result[0] = orderedX[1];
-      result[2] = orderedX[2];
-    } else {
+    if (xLow > xHigh) {
       return null;
     }
 
-    if (orderedY[0] === rect1[1] && orderedY[1] === rect2[1] || orderedY[0] === rect2[1] && orderedY[1] === rect1[1]) {
-      result[1] = orderedY[1];
-      result[3] = orderedY[2];
-    } else {
+    const yLow = Math.max(Math.min(rect1[1], rect1[3]), Math.min(rect2[1], rect2[3]));
+    const yHigh = Math.min(Math.max(rect1[1], rect1[3]), Math.max(rect2[1], rect2[3]));
+
+    if (yLow > yHigh) {
       return null;
     }
 
-    return result;
+    return [xLow, yLow, xHigh, yHigh];
+  }
+
+  static bezierBoundingBox(x0, y0, x1, y1, x2, y2, x3, y3) {
+    const tvalues = [],
+          bounds = [[], []];
+    let a, b, c, t, t1, t2, b2ac, sqrtb2ac;
+
+    for (let i = 0; i < 2; ++i) {
+      if (i === 0) {
+        b = 6 * x0 - 12 * x1 + 6 * x2;
+        a = -3 * x0 + 9 * x1 - 9 * x2 + 3 * x3;
+        c = 3 * x1 - 3 * x0;
+      } else {
+        b = 6 * y0 - 12 * y1 + 6 * y2;
+        a = -3 * y0 + 9 * y1 - 9 * y2 + 3 * y3;
+        c = 3 * y1 - 3 * y0;
+      }
+
+      if (Math.abs(a) < 1e-12) {
+        if (Math.abs(b) < 1e-12) {
+          continue;
+        }
+
+        t = -c / b;
+
+        if (0 < t && t < 1) {
+          tvalues.push(t);
+        }
+
+        continue;
+      }
+
+      b2ac = b * b - 4 * c * a;
+      sqrtb2ac = Math.sqrt(b2ac);
+
+      if (b2ac < 0) {
+        continue;
+      }
+
+      t1 = (-b + sqrtb2ac) / (2 * a);
+
+      if (0 < t1 && t1 < 1) {
+        tvalues.push(t1);
+      }
+
+      t2 = (-b - sqrtb2ac) / (2 * a);
+
+      if (0 < t2 && t2 < 1) {
+        tvalues.push(t2);
+      }
+    }
+
+    let j = tvalues.length,
+        mt;
+    const jlen = j;
+
+    while (j--) {
+      t = tvalues[j];
+      mt = 1 - t;
+      bounds[0][j] = mt * mt * mt * x0 + 3 * mt * mt * t * x1 + 3 * mt * t * t * x2 + t * t * t * x3;
+      bounds[1][j] = mt * mt * mt * y0 + 3 * mt * mt * t * y1 + 3 * mt * t * t * y2 + t * t * t * y3;
+    }
+
+    bounds[0][jlen] = x0;
+    bounds[1][jlen] = y0;
+    bounds[0][jlen + 1] = x3;
+    bounds[1][jlen + 1] = y3;
+    bounds[0].length = bounds[1].length = jlen + 2;
+    return [Math.min(...bounds[0]), Math.min(...bounds[1]), Math.max(...bounds[0]), Math.max(...bounds[1])];
   }
 
 }
 
 exports.Util = Util;
-const PDFStringTranslateTable = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014, 0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C, 0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160, 0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC];
+const PDFStringTranslateTable = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2d8, 0x2c7, 0x2c6, 0x2d9, 0x2dd, 0x2db, 0x2da, 0x2dc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014, 0x2013, 0x192, 0x2044, 0x2039, 0x203a, 0x2212, 0x2030, 0x201e, 0x201c, 0x201d, 0x2018, 0x2019, 0x201a, 0x2122, 0xfb01, 0xfb02, 0x141, 0x152, 0x160, 0x178, 0x17d, 0x131, 0x142, 0x153, 0x161, 0x17e, 0, 0x20ac];
 
 function stringToPDFString(str) {
-  const length = str.length,
-        strBuf = [];
+  if (str[0] >= "\xEF") {
+    let encoding;
 
-  if (str[0] === "\xFE" && str[1] === "\xFF") {
-    for (let i = 2; i < length; i += 2) {
-      strBuf.push(String.fromCharCode(str.charCodeAt(i) << 8 | str.charCodeAt(i + 1)));
+    if (str[0] === "\xFE" && str[1] === "\xFF") {
+      encoding = "utf-16be";
+    } else if (str[0] === "\xFF" && str[1] === "\xFE") {
+      encoding = "utf-16le";
+    } else if (str[0] === "\xEF" && str[1] === "\xBB" && str[2] === "\xBF") {
+      encoding = "utf-8";
     }
-  } else if (str[0] === "\xFF" && str[1] === "\xFE") {
-    for (let i = 2; i < length; i += 2) {
-      strBuf.push(String.fromCharCode(str.charCodeAt(i + 1) << 8 | str.charCodeAt(i)));
-    }
-  } else {
-    for (let i = 0; i < length; ++i) {
-      const code = PDFStringTranslateTable[str.charCodeAt(i)];
-      strBuf.push(code ? String.fromCharCode(code) : str.charAt(i));
+
+    if (encoding) {
+      try {
+        const decoder = new TextDecoder(encoding, {
+          fatal: true
+        });
+        const buffer = stringToBytes(str);
+        return decoder.decode(buffer);
+      } catch (ex) {
+        warn(`stringToPDFString: "${ex}".`);
+      }
     }
   }
 
+  const strBuf = [];
+
+  for (let i = 0, ii = str.length; i < ii; i++) {
+    const code = PDFStringTranslateTable[str.charCodeAt(i)];
+    strBuf.push(code ? String.fromCharCode(code) : str.charAt(i));
+  }
+
   return strBuf.join("");
 }
 
 function escapeString(str) {
-  return str.replace(/([\(\)\\])/g, "\\$1");
+  return str.replace(/([()\\\n\r])/g, match => {
+    if (match === "\n") {
+      return "\\n";
+    } else if (match === "\r") {
+      return "\\r";
+    }
+
+    return `\\${match}`;
+  });
+}
+
+function isAscii(str) {
+  return /^[\x00-\x7F]*$/.test(str);
+}
+
+function stringToUTF16BEString(str) {
+  const buf = ["\xFE\xFF"];
+
+  for (let i = 0, ii = str.length; i < ii; i++) {
+    const char = str.charCodeAt(i);
+    buf.push(String.fromCharCode(char >> 8 & 0xff), String.fromCharCode(char & 0xff));
+  }
+
+  return buf.join("");
 }
 
 function stringToUTF8String(str) {
@@ -1652,18 +1031,6 @@ function utf8StringToString(str) {
   return unescape(encodeURIComponent(str));
 }
 
-function isBool(v) {
-  return typeof v === "boolean";
-}
-
-function isNum(v) {
-  return typeof v === "number";
-}
-
-function isString(v) {
-  return typeof v === "string";
-}
-
 function isArrayBuffer(v) {
   return typeof v === "object" && v !== null && v.byteLength !== undefined;
 }
@@ -1673,13 +1040,17 @@ function isArrayEqual(arr1, arr2) {
     return false;
   }
 
-  return arr1.every(function (element, index) {
-    return element === arr2[index];
-  });
+  for (let i = 0, ii = arr1.length; i < ii; i++) {
+    if (arr1[i] !== arr2[i]) {
+      return false;
+    }
+  }
+
+  return true;
 }
 
-function getModificationDate(date = new Date(Date.now())) {
-  const buffer = [date.getUTCFullYear().toString(), (date.getUTCMonth() + 1).toString().padStart(2, "0"), (date.getUTCDate() + 1).toString().padStart(2, "0"), date.getUTCHours().toString().padStart(2, "0"), date.getUTCMinutes().toString().padStart(2, "0"), date.getUTCSeconds().toString().padStart(2, "0")];
+function getModificationDate(date = new Date()) {
+  const buffer = [date.getUTCFullYear().toString(), (date.getUTCMonth() + 1).toString().padStart(2, "0"), date.getUTCDate().toString().padStart(2, "0"), date.getUTCHours().toString().padStart(2, "0"), date.getUTCMinutes().toString().padStart(2, "0"), date.getUTCSeconds().toString().padStart(2, "0")];
   return buffer.join("");
 }
 
@@ -1706,106 +1077,88 @@ function createPromiseCapability() {
   return capability;
 }
 
-const createObjectURL = function createObjectURLClosure() {
-  const digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-  return function createObjectURL(data, contentType, forceDataSchema = false) {
-    if (!forceDataSchema && URL.createObjectURL) {
-      const blob = new Blob([data], {
-        type: contentType
-      });
-      return URL.createObjectURL(blob);
-    }
-
-    let buffer = `data:${contentType};base64,`;
-
-    for (let i = 0, ii = data.length; i < ii; i += 3) {
-      const b1 = data[i] & 0xff;
-      const b2 = data[i + 1] & 0xff;
-      const b3 = data[i + 2] & 0xff;
-      const d1 = b1 >> 2,
-            d2 = (b1 & 3) << 4 | b2 >> 4;
-      const d3 = i + 1 < ii ? (b2 & 0xf) << 2 | b3 >> 6 : 64;
-      const d4 = i + 2 < ii ? b3 & 0x3f : 64;
-      buffer += digits[d1] + digits[d2] + digits[d3] + digits[d4];
-    }
-
-    return buffer;
-  };
-}();
-
-exports.createObjectURL = createObjectURL;
-
 /***/ }),
-/* 3 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 2 */
+/***/ ((__unused_webpack_module, __unused_webpack_exports, __w_pdfjs_require__) => {
 
 
-var _is_node = __w_pdfjs_require__(4);
+
+var _is_node = __w_pdfjs_require__(3);
 
 ;
 
 /***/ }),
-/* 4 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 3 */
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.isNodeJS = void 0;
 const isNodeJS = typeof process === "object" && process + "" === "[object process]" && !process.versions.nw && !(process.versions.electron && process.type && process.type !== "browser");
 exports.isNodeJS = isNodeJS;
 
 /***/ }),
-/* 5 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 4 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.build = exports.RenderTask = exports.PDFWorkerUtil = exports.PDFWorker = exports.PDFPageProxy = exports.PDFDocumentProxy = exports.PDFDocumentLoadingTask = exports.PDFDataRangeTransport = exports.LoopbackPort = exports.DefaultStandardFontDataFactory = exports.DefaultCanvasFactory = exports.DefaultCMapReaderFactory = void 0;
 exports.getDocument = getDocument;
 exports.setPDFNetworkStreamFactory = setPDFNetworkStreamFactory;
-exports.build = exports.version = exports.PDFPageProxy = exports.PDFDocumentProxy = exports.PDFWorker = exports.PDFDataRangeTransport = exports.LoopbackPort = void 0;
+exports.version = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
 
-var _display_utils = __w_pdfjs_require__(1);
+var _annotation_storage = __w_pdfjs_require__(5);
 
-var _font_loader = __w_pdfjs_require__(6);
+var _display_utils = __w_pdfjs_require__(8);
 
-var _node_utils = __w_pdfjs_require__(7);
+var _font_loader = __w_pdfjs_require__(11);
 
-var _annotation_storage = __w_pdfjs_require__(8);
+var _canvas = __w_pdfjs_require__(12);
 
-var _api_compatibility = __w_pdfjs_require__(9);
+var _worker_options = __w_pdfjs_require__(15);
 
-var _canvas = __w_pdfjs_require__(10);
+var _is_node = __w_pdfjs_require__(3);
 
-var _worker_options = __w_pdfjs_require__(12);
+var _message_handler = __w_pdfjs_require__(16);
 
-var _is_node = __w_pdfjs_require__(4);
+var _metadata = __w_pdfjs_require__(17);
 
-var _message_handler = __w_pdfjs_require__(13);
+var _optional_content_config = __w_pdfjs_require__(18);
 
-var _metadata = __w_pdfjs_require__(14);
+var _transport_stream = __w_pdfjs_require__(19);
 
-var _optional_content_config = __w_pdfjs_require__(16);
-
-var _transport_stream = __w_pdfjs_require__(17);
-
-var _webgl = __w_pdfjs_require__(18);
+var _xfa_text = __w_pdfjs_require__(20);
 
 const DEFAULT_RANGE_CHUNK_SIZE = 65536;
 const RENDERING_CANCELLED_TIMEOUT = 100;
-const DefaultCanvasFactory = _is_node.isNodeJS ? _node_utils.NodeCanvasFactory : _display_utils.DOMCanvasFactory;
-const DefaultCMapReaderFactory = _is_node.isNodeJS ? _node_utils.NodeCMapReaderFactory : _display_utils.DOMCMapReaderFactory;
+let DefaultCanvasFactory = _display_utils.DOMCanvasFactory;
+exports.DefaultCanvasFactory = DefaultCanvasFactory;
+let DefaultCMapReaderFactory = _display_utils.DOMCMapReaderFactory;
+exports.DefaultCMapReaderFactory = DefaultCMapReaderFactory;
+let DefaultStandardFontDataFactory = _display_utils.DOMStandardFontDataFactory;
+exports.DefaultStandardFontDataFactory = DefaultStandardFontDataFactory;
+
+if (_is_node.isNodeJS) {
+  const {
+    NodeCanvasFactory,
+    NodeCMapReaderFactory,
+    NodeStandardFontDataFactory
+  } = __w_pdfjs_require__(21);
+
+  exports.DefaultCanvasFactory = DefaultCanvasFactory = NodeCanvasFactory;
+  exports.DefaultCMapReaderFactory = DefaultCMapReaderFactory = NodeCMapReaderFactory;
+  exports.DefaultStandardFontDataFactory = DefaultStandardFontDataFactory = NodeStandardFontDataFactory;
+}
+
 let createPDFNetworkStream;
 
 function setPDFNetworkStreamFactory(pdfNetworkStreamFactory) {
@@ -1816,7 +1169,7 @@ function getDocument(src) {
   const task = new PDFDocumentLoadingTask();
   let source;
 
-  if (typeof src === "string") {
+  if (typeof src === "string" || src instanceof URL) {
     source = {
       url: src
     };
@@ -1830,7 +1183,7 @@ function getDocument(src) {
     };
   } else {
     if (typeof src !== "object") {
-      throw new Error("Invalid parameter in getDocument, " + "need either Uint8Array, string or a parameter object");
+      throw new Error("Invalid parameter in getDocument, " + "need either string, URL, TypedArray, or parameter object.");
     }
 
     if (!src.url && !src.data && !src.range) {
@@ -1845,53 +1198,97 @@ function getDocument(src) {
       worker = null;
 
   for (const key in source) {
-    if (key === "url" && typeof window !== "undefined") {
-      params[key] = new URL(source[key], window.location).href;
-      continue;
-    } else if (key === "range") {
-      rangeTransport = source[key];
-      continue;
-    } else if (key === "worker") {
-      worker = source[key];
-      continue;
-    } else if (key === "data" && !(source[key] instanceof Uint8Array)) {
-      const pdfBytes = source[key];
+    const value = source[key];
 
-      if (typeof pdfBytes === "string") {
-        params[key] = (0, _util.stringToBytes)(pdfBytes);
-      } else if (typeof pdfBytes === "object" && pdfBytes !== null && !isNaN(pdfBytes.length)) {
-        params[key] = new Uint8Array(pdfBytes);
-      } else if ((0, _util.isArrayBuffer)(pdfBytes)) {
-        params[key] = new Uint8Array(pdfBytes);
-      } else {
-        throw new Error("Invalid PDF binary data: either typed array, " + "string or array-like object is expected in the " + "data property.");
-      }
+    switch (key) {
+      case "url":
+        if (typeof window !== "undefined") {
+          try {
+            params[key] = new URL(value, window.location).href;
+            continue;
+          } catch (ex) {
+            (0, _util.warn)(`Cannot create valid URL: "${ex}".`);
+          }
+        } else if (typeof value === "string" || value instanceof URL) {
+          params[key] = value.toString();
+          continue;
+        }
 
-      continue;
+        throw new Error("Invalid PDF url data: " + "either string or URL-object is expected in the url property.");
+
+      case "range":
+        rangeTransport = value;
+        continue;
+
+      case "worker":
+        worker = value;
+        continue;
+
+      case "data":
+        if (_is_node.isNodeJS && typeof Buffer !== "undefined" && value instanceof Buffer) {
+          params[key] = new Uint8Array(value);
+        } else if (value instanceof Uint8Array) {
+          break;
+        } else if (typeof value === "string") {
+          params[key] = (0, _util.stringToBytes)(value);
+        } else if (typeof value === "object" && value !== null && !isNaN(value.length)) {
+          params[key] = new Uint8Array(value);
+        } else if ((0, _util.isArrayBuffer)(value)) {
+          params[key] = new Uint8Array(value);
+        } else {
+          throw new Error("Invalid PDF binary data: either TypedArray, " + "string, or array-like object is expected in the data property.");
+        }
+
+        continue;
     }
 
-    params[key] = source[key];
+    params[key] = value;
   }
 
-  params.rangeChunkSize = params.rangeChunkSize || DEFAULT_RANGE_CHUNK_SIZE;
   params.CMapReaderFactory = params.CMapReaderFactory || DefaultCMapReaderFactory;
+  params.StandardFontDataFactory = params.StandardFontDataFactory || DefaultStandardFontDataFactory;
   params.ignoreErrors = params.stopAtErrors !== true;
   params.fontExtraProperties = params.fontExtraProperties === true;
   params.pdfBug = params.pdfBug === true;
+  params.enableXfa = params.enableXfa === true;
 
-  if (!Number.isInteger(params.maxImageSize)) {
+  if (!Number.isInteger(params.rangeChunkSize) || params.rangeChunkSize < 1) {
+    params.rangeChunkSize = DEFAULT_RANGE_CHUNK_SIZE;
+  }
+
+  if (typeof params.docBaseUrl !== "string" || (0, _display_utils.isDataScheme)(params.docBaseUrl)) {
+    params.docBaseUrl = null;
+  }
+
+  if (!Number.isInteger(params.maxImageSize) || params.maxImageSize < -1) {
     params.maxImageSize = -1;
   }
 
+  if (typeof params.cMapUrl !== "string") {
+    params.cMapUrl = null;
+  }
+
+  if (typeof params.standardFontDataUrl !== "string") {
+    params.standardFontDataUrl = null;
+  }
+
+  if (typeof params.useWorkerFetch !== "boolean") {
+    params.useWorkerFetch = params.CMapReaderFactory === _display_utils.DOMCMapReaderFactory && params.StandardFontDataFactory === _display_utils.DOMStandardFontDataFactory;
+  }
+
   if (typeof params.isEvalSupported !== "boolean") {
     params.isEvalSupported = true;
   }
 
   if (typeof params.disableFontFace !== "boolean") {
-    params.disableFontFace = _api_compatibility.apiCompatibilityParams.disableFontFace || false;
+    params.disableFontFace = _is_node.isNodeJS;
   }
 
-  if (typeof params.ownerDocument === "undefined") {
+  if (typeof params.useSystemFonts !== "boolean") {
+    params.useSystemFonts = !_is_node.isNodeJS && !params.disableFontFace;
+  }
+
+  if (typeof params.ownerDocument !== "object" || params.ownerDocument === null) {
     params.ownerDocument = globalThis.document;
   }
 
@@ -1934,6 +1331,7 @@ function getDocument(src) {
           length: params.length,
           initialData: params.initialData,
           progressiveDone: params.progressiveDone,
+          contentDispositionFilename: params.contentDispositionFilename,
           disableRange: params.disableRange,
           disableStream: params.disableStream
         }, rangeTransport);
@@ -1957,7 +1355,6 @@ function getDocument(src) {
       }
 
       const messageHandler = new _message_handler.MessageHandler(docId, workerId, worker.port);
-      messageHandler.postMessageTransfers = worker.postMessageTransfers;
       const transport = new WorkerTransport(messageHandler, task, networkStream, params);
       task._transport = transport;
       messageHandler.send("Ready", null);
@@ -1966,20 +1363,21 @@ function getDocument(src) {
   return task;
 }
 
-function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
+async function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
   if (worker.destroyed) {
-    return Promise.reject(new Error("Worker was destroyed"));
+    throw new Error("Worker was destroyed");
   }
 
   if (pdfDataRangeTransport) {
     source.length = pdfDataRangeTransport.length;
     source.initialData = pdfDataRangeTransport.initialData;
     source.progressiveDone = pdfDataRangeTransport.progressiveDone;
+    source.contentDispositionFilename = pdfDataRangeTransport.contentDispositionFilename;
   }
 
-  return worker.messageHandler.sendWithPromise("GetDocRequest", {
+  const workerId = await worker.messageHandler.sendWithPromise("GetDocRequest", {
     docId,
-    apiVersion: '2.6.347',
+    apiVersion: '2.16.105',
     source: {
       data: source.data,
       url: source.url,
@@ -1990,63 +1388,67 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
     },
     maxImageSize: source.maxImageSize,
     disableFontFace: source.disableFontFace,
-    postMessageTransfers: worker.postMessageTransfers,
     docBaseUrl: source.docBaseUrl,
     ignoreErrors: source.ignoreErrors,
     isEvalSupported: source.isEvalSupported,
-    fontExtraProperties: source.fontExtraProperties
-  }).then(function (workerId) {
-    if (worker.destroyed) {
-      throw new Error("Worker was destroyed");
-    }
-
-    return workerId;
+    fontExtraProperties: source.fontExtraProperties,
+    enableXfa: source.enableXfa,
+    useSystemFonts: source.useSystemFonts,
+    cMapUrl: source.useWorkerFetch ? source.cMapUrl : null,
+    standardFontDataUrl: source.useWorkerFetch ? source.standardFontDataUrl : null
   });
-}
-
-const PDFDocumentLoadingTask = function PDFDocumentLoadingTaskClosure() {
-  let nextDocumentId = 0;
-
-  class PDFDocumentLoadingTask {
-    constructor() {
-      this._capability = (0, _util.createPromiseCapability)();
-      this._transport = null;
-      this._worker = null;
-      this.docId = "d" + nextDocumentId++;
-      this.destroyed = false;
-      this.onPassword = null;
-      this.onProgress = null;
-      this.onUnsupportedFeature = null;
-    }
-
-    get promise() {
-      return this._capability.promise;
-    }
-
-    destroy() {
-      this.destroyed = true;
-      const transportDestroyed = !this._transport ? Promise.resolve() : this._transport.destroy();
-      return transportDestroyed.then(() => {
-        this._transport = null;
-
-        if (this._worker) {
-          this._worker.destroy();
-
-          this._worker = null;
-        }
-      });
-    }
 
+  if (source.data) {
+    source.data = null;
   }
 
-  return PDFDocumentLoadingTask;
-}();
+  if (worker.destroyed) {
+    throw new Error("Worker was destroyed");
+  }
+
+  return workerId;
+}
+
+class PDFDocumentLoadingTask {
+  static #docId = 0;
+
+  constructor() {
+    this._capability = (0, _util.createPromiseCapability)();
+    this._transport = null;
+    this._worker = null;
+    this.docId = `d${PDFDocumentLoadingTask.#docId++}`;
+    this.destroyed = false;
+    this.onPassword = null;
+    this.onProgress = null;
+    this.onUnsupportedFeature = null;
+  }
+
+  get promise() {
+    return this._capability.promise;
+  }
+
+  async destroy() {
+    this.destroyed = true;
+    await this._transport?.destroy();
+    this._transport = null;
+
+    if (this._worker) {
+      this._worker.destroy();
+
+      this._worker = null;
+    }
+  }
+
+}
+
+exports.PDFDocumentLoadingTask = PDFDocumentLoadingTask;
 
 class PDFDataRangeTransport {
-  constructor(length, initialData, progressiveDone = false) {
+  constructor(length, initialData, progressiveDone = false, contentDispositionFilename = null) {
     this.length = length;
     this.initialData = initialData;
     this.progressiveDone = progressiveDone;
+    this.contentDispositionFilename = contentDispositionFilename;
     this._rangeListeners = [];
     this._progressListeners = [];
     this._progressiveReadListeners = [];
@@ -2118,18 +1520,46 @@ class PDFDocumentProxy {
   constructor(pdfInfo, transport) {
     this._pdfInfo = pdfInfo;
     this._transport = transport;
+    Object.defineProperty(this, "fingerprint", {
+      get() {
+        (0, _display_utils.deprecated)("`PDFDocumentProxy.fingerprint`, " + "please use `PDFDocumentProxy.fingerprints` instead.");
+        return this.fingerprints[0];
+      }
+
+    });
+    Object.defineProperty(this, "getStats", {
+      value: async () => {
+        (0, _display_utils.deprecated)("`PDFDocumentProxy.getStats`, " + "please use the `PDFDocumentProxy.stats`-getter instead.");
+        return this.stats || {
+          streamTypes: {},
+          fontTypes: {}
+        };
+      }
+    });
   }
 
   get annotationStorage() {
-    return (0, _util.shadow)(this, "annotationStorage", new _annotation_storage.AnnotationStorage());
+    return this._transport.annotationStorage;
   }
 
   get numPages() {
     return this._pdfInfo.numPages;
   }
 
-  get fingerprint() {
-    return this._pdfInfo.fingerprint;
+  get fingerprints() {
+    return this._pdfInfo.fingerprints;
+  }
+
+  get stats() {
+    return this._transport.stats;
+  }
+
+  get isPureXfa() {
+    return !!this._transport._htmlForXfa;
+  }
+
+  get allXfaHtml() {
+    return this._transport._htmlForXfa;
   }
 
   getPage(pageNumber) {
@@ -2176,6 +1606,10 @@ class PDFDocumentProxy {
     return this._transport.getJavaScript();
   }
 
+  getJSActions() {
+    return this._transport.getDocJSActions();
+  }
+
   getOutline() {
     return this._transport.getOutline();
   }
@@ -2192,6 +1626,10 @@ class PDFDocumentProxy {
     return this._transport.getMetadata();
   }
 
+  getMarkInfo() {
+    return this._transport.getMarkInfo();
+  }
+
   getData() {
     return this._transport.getData();
   }
@@ -2200,12 +1638,8 @@ class PDFDocumentProxy {
     return this._transport.downloadInfoCapability.promise;
   }
 
-  getStats() {
-    return this._transport.getStats();
-  }
-
-  cleanup() {
-    return this._transport.startCleanup();
+  cleanup(keepLoadedFonts = false) {
+    return this._transport.startCleanup(keepLoadedFonts || this.isPureXfa);
   }
 
   destroy() {
@@ -2220,8 +1654,24 @@ class PDFDocumentProxy {
     return this._transport.loadingTask;
   }
 
-  saveDocument(annotationStorage) {
-    return this._transport.saveDocument(annotationStorage);
+  saveDocument() {
+    if (this._transport.annotationStorage.size <= 0) {
+      (0, _display_utils.deprecated)("saveDocument called while `annotationStorage` is empty, " + "please use the getData-method instead.");
+    }
+
+    return this._transport.saveDocument();
+  }
+
+  getFieldObjects() {
+    return this._transport.getFieldObjects();
+  }
+
+  hasJSActions() {
+    return this._transport.hasJSActions();
+  }
+
+  getCalculationOrderIds() {
+    return this._transport.getCalculationOrderIds();
   }
 
 }
@@ -2238,9 +1688,11 @@ class PDFPageProxy {
     this._pdfBug = pdfBug;
     this.commonObjs = transport.commonObjs;
     this.objs = new PDFObjects();
+    this._bitmaps = new Set();
     this.cleanupAfterRender = false;
     this.pendingCleanup = false;
     this._intentStates = new Map();
+    this._annotationPromises = new Map();
     this.destroyed = false;
   }
 
@@ -2282,46 +1734,103 @@ class PDFPageProxy {
   }
 
   getAnnotations({
-    intent = null
+    intent = "display"
   } = {}) {
-    if (!this.annotationsPromise || this.annotationsIntent !== intent) {
-      this.annotationsPromise = this._transport.getAnnotations(this._pageIndex, intent);
-      this.annotationsIntent = intent;
+    const intentArgs = this._transport.getRenderingIntent(intent);
+
+    let promise = this._annotationPromises.get(intentArgs.cacheKey);
+
+    if (!promise) {
+      promise = this._transport.getAnnotations(this._pageIndex, intentArgs.renderingIntent);
+
+      this._annotationPromises.set(intentArgs.cacheKey, promise);
+
+      promise = promise.then(annotations => {
+        for (const annotation of annotations) {
+          if (annotation.titleObj !== undefined) {
+            Object.defineProperty(annotation, "title", {
+              get() {
+                (0, _display_utils.deprecated)("`title`-property on annotation, please use `titleObj` instead.");
+                return annotation.titleObj.str;
+              }
+
+            });
+          }
+
+          if (annotation.contentsObj !== undefined) {
+            Object.defineProperty(annotation, "contents", {
+              get() {
+                (0, _display_utils.deprecated)("`contents`-property on annotation, please use `contentsObj` instead.");
+                return annotation.contentsObj.str;
+              }
+
+            });
+          }
+        }
+
+        return annotations;
+      });
     }
 
-    return this.annotationsPromise;
+    return promise;
+  }
+
+  getJSActions() {
+    return this._jsActionsPromise ||= this._transport.getPageJSActions(this._pageIndex);
+  }
+
+  async getXfa() {
+    return this._transport._htmlForXfa?.children[this._pageIndex] || null;
   }
 
   render({
     canvasContext,
     viewport,
     intent = "display",
-    enableWebGL = false,
-    renderInteractiveForms = false,
+    annotationMode = _util.AnnotationMode.ENABLE,
     transform = null,
     imageLayer = null,
     canvasFactory = null,
     background = null,
-    annotationStorage = null,
-    optionalContentConfigPromise = null
+    optionalContentConfigPromise = null,
+    annotationCanvasMap = null,
+    pageColors = null,
+    printAnnotationStorage = null
   }) {
+    if (arguments[0]?.renderInteractiveForms !== undefined) {
+      (0, _display_utils.deprecated)("render no longer accepts the `renderInteractiveForms`-option, " + "please use the `annotationMode`-option instead.");
+
+      if (arguments[0].renderInteractiveForms === true && annotationMode === _util.AnnotationMode.ENABLE) {
+        annotationMode = _util.AnnotationMode.ENABLE_FORMS;
+      }
+    }
+
+    if (arguments[0]?.includeAnnotationStorage !== undefined) {
+      (0, _display_utils.deprecated)("render no longer accepts the `includeAnnotationStorage`-option, " + "please use the `annotationMode`-option instead.");
+
+      if (arguments[0].includeAnnotationStorage === true && annotationMode === _util.AnnotationMode.ENABLE) {
+        annotationMode = _util.AnnotationMode.ENABLE_STORAGE;
+      }
+    }
+
     if (this._stats) {
       this._stats.time("Overall");
     }
 
-    const renderingIntent = intent === "print" ? "print" : "display";
+    const intentArgs = this._transport.getRenderingIntent(intent, annotationMode, printAnnotationStorage);
+
     this.pendingCleanup = false;
 
     if (!optionalContentConfigPromise) {
       optionalContentConfigPromise = this._transport.getOptionalContentConfig();
     }
 
-    let intentState = this._intentStates.get(renderingIntent);
+    let intentState = this._intentStates.get(intentArgs.cacheKey);
 
     if (!intentState) {
       intentState = Object.create(null);
 
-      this._intentStates.set(renderingIntent, intentState);
+      this._intentStates.set(intentArgs.cacheKey, intentState);
     }
 
     if (intentState.streamReaderCancelTimeout) {
@@ -2332,38 +1841,28 @@ class PDFPageProxy {
     const canvasFactoryInstance = canvasFactory || new DefaultCanvasFactory({
       ownerDocument: this._ownerDocument
     });
-    const webGLContext = new _webgl.WebGLContext({
-      enable: enableWebGL
-    });
+    const intentPrint = !!(intentArgs.renderingIntent & _util.RenderingIntentFlag.PRINT);
 
     if (!intentState.displayReadyCapability) {
       intentState.displayReadyCapability = (0, _util.createPromiseCapability)();
       intentState.operatorList = {
         fnArray: [],
         argsArray: [],
-        lastChunk: false
+        lastChunk: false,
+        separateAnnots: null
       };
 
       if (this._stats) {
         this._stats.time("Page Request");
       }
 
-      this._pumpOperatorList({
-        pageIndex: this._pageIndex,
-        intent: renderingIntent,
-        renderInteractiveForms: renderInteractiveForms === true,
-        annotationStorage: annotationStorage && annotationStorage.getAll() || null
-      });
+      this._pumpOperatorList(intentArgs);
     }
 
     const complete = error => {
-      const i = intentState.renderTasks.indexOf(internalRenderTask);
+      intentState.renderTasks.delete(internalRenderTask);
 
-      if (i >= 0) {
-        intentState.renderTasks.splice(i, 1);
-      }
-
-      if (this.cleanupAfterRender || renderingIntent === "print") {
+      if (this.cleanupAfterRender || intentPrint) {
         this.pendingCleanup = true;
       }
 
@@ -2374,7 +1873,7 @@ class PDFPageProxy {
 
         this._abortOperatorList({
           intentState,
-          reason: error
+          reason: error instanceof Error ? error : new Error(error)
         });
       } else {
         internalRenderTask.capability.resolve();
@@ -2398,19 +1897,15 @@ class PDFPageProxy {
       },
       objs: this.objs,
       commonObjs: this.commonObjs,
+      annotationCanvasMap,
       operatorList: intentState.operatorList,
       pageIndex: this._pageIndex,
       canvasFactory: canvasFactoryInstance,
-      webGLContext,
-      useRequestAnimationFrame: renderingIntent !== "print",
-      pdfBug: this._pdfBug
+      useRequestAnimationFrame: !intentPrint,
+      pdfBug: this._pdfBug,
+      pageColors
     });
-
-    if (!intentState.renderTasks) {
-      intentState.renderTasks = [];
-    }
-
-    intentState.renderTasks.push(internalRenderTask);
+    (intentState.renderTasks ||= new Set()).add(internalRenderTask);
     const renderTask = internalRenderTask.task;
     Promise.all([intentState.displayReadyCapability.promise, optionalContentConfigPromise]).then(([transparency, optionalContentConfig]) => {
       if (this.pendingCleanup) {
@@ -2431,26 +1926,26 @@ class PDFPageProxy {
     return renderTask;
   }
 
-  getOperatorList() {
+  getOperatorList({
+    intent = "display",
+    annotationMode = _util.AnnotationMode.ENABLE,
+    printAnnotationStorage = null
+  } = {}) {
     function operatorListChanged() {
       if (intentState.operatorList.lastChunk) {
         intentState.opListReadCapability.resolve(intentState.operatorList);
-        const i = intentState.renderTasks.indexOf(opListTask);
-
-        if (i >= 0) {
-          intentState.renderTasks.splice(i, 1);
-        }
+        intentState.renderTasks.delete(opListTask);
       }
     }
 
-    const renderingIntent = "oplist";
+    const intentArgs = this._transport.getRenderingIntent(intent, annotationMode, printAnnotationStorage, true);
 
-    let intentState = this._intentStates.get(renderingIntent);
+    let intentState = this._intentStates.get(intentArgs.cacheKey);
 
     if (!intentState) {
       intentState = Object.create(null);
 
-      this._intentStates.set(renderingIntent, intentState);
+      this._intentStates.set(intentArgs.cacheKey, intentState);
     }
 
     let opListTask;
@@ -2459,36 +1954,33 @@ class PDFPageProxy {
       opListTask = Object.create(null);
       opListTask.operatorListChanged = operatorListChanged;
       intentState.opListReadCapability = (0, _util.createPromiseCapability)();
-      intentState.renderTasks = [];
-      intentState.renderTasks.push(opListTask);
+      (intentState.renderTasks ||= new Set()).add(opListTask);
       intentState.operatorList = {
         fnArray: [],
         argsArray: [],
-        lastChunk: false
+        lastChunk: false,
+        separateAnnots: null
       };
 
       if (this._stats) {
         this._stats.time("Page Request");
       }
 
-      this._pumpOperatorList({
-        pageIndex: this._pageIndex,
-        intent: renderingIntent
-      });
+      this._pumpOperatorList(intentArgs);
     }
 
     return intentState.opListReadCapability.promise;
   }
 
   streamTextContent({
-    normalizeWhitespace = false,
-    disableCombineTextItems = false
+    disableCombineTextItems = false,
+    includeMarkedContent = false
   } = {}) {
     const TEXT_CONTENT_CHUNK_SIZE = 100;
     return this._transport.messageHandler.sendWithStream("GetTextContent", {
       pageIndex: this._pageIndex,
-      normalizeWhitespace: normalizeWhitespace === true,
-      combineTextItems: disableCombineTextItems !== true
+      combineTextItems: disableCombineTextItems !== true,
+      includeMarkedContent: includeMarkedContent === true
     }, {
       highWaterMark: TEXT_CONTENT_CHUNK_SIZE,
 
@@ -2500,6 +1992,12 @@ class PDFPageProxy {
   }
 
   getTextContent(params = {}) {
+    if (this._transport._htmlForXfa) {
+      return this.getXfa().then(xfa => {
+        return _xfa_text.XfaText.textContent(xfa);
+      });
+    }
+
     const readableStream = this.streamTextContent(params);
     return new Promise(function (resolve, reject) {
       function pump() {
@@ -2527,19 +2025,22 @@ class PDFPageProxy {
     });
   }
 
+  getStructTree() {
+    return this._structTreePromise ||= this._transport.getStructTree(this._pageIndex);
+  }
+
   _destroy() {
     this.destroyed = true;
-    this._transport.pageCache[this._pageIndex] = null;
     const waitOn = [];
 
-    for (const [intent, intentState] of this._intentStates) {
+    for (const intentState of this._intentStates.values()) {
       this._abortOperatorList({
         intentState,
         reason: new Error("Page was destroyed."),
         force: true
       });
 
-      if (intent === "oplist") {
+      if (intentState.opListReadCapability) {
         continue;
       }
 
@@ -2550,7 +2051,17 @@ class PDFPageProxy {
     }
 
     this.objs.clear();
-    this.annotationsPromise = null;
+
+    for (const bitmap of this._bitmaps) {
+      bitmap.close();
+    }
+
+    this._bitmaps.clear();
+
+    this._annotationPromises.clear();
+
+    this._jsActionsPromise = null;
+    this._structTreePromise = null;
     this.pendingCleanup = false;
     return Promise.all(waitOn);
   }
@@ -2569,7 +2080,7 @@ class PDFPageProxy {
       renderTasks,
       operatorList
     } of this._intentStates.values()) {
-      if (renderTasks.length !== 0 || !operatorList.lastChunk) {
+      if (renderTasks.size > 0 || !operatorList.lastChunk) {
         return false;
       }
     }
@@ -2577,18 +2088,28 @@ class PDFPageProxy {
     this._intentStates.clear();
 
     this.objs.clear();
-    this.annotationsPromise = null;
+
+    this._annotationPromises.clear();
+
+    this._jsActionsPromise = null;
+    this._structTreePromise = null;
 
     if (resetStats && this._stats) {
       this._stats = new _display_utils.StatTimer();
     }
 
+    for (const bitmap of this._bitmaps) {
+      bitmap.close();
+    }
+
+    this._bitmaps.clear();
+
     this.pendingCleanup = false;
     return true;
   }
 
-  _startRenderPage(transparency, intent) {
-    const intentState = this._intentStates.get(intent);
+  _startRenderPage(transparency, cacheKey) {
+    const intentState = this._intentStates.get(cacheKey);
 
     if (!intentState) {
       return;
@@ -2610,9 +2131,10 @@ class PDFPageProxy {
     }
 
     intentState.operatorList.lastChunk = operatorListChunk.lastChunk;
+    intentState.operatorList.separateAnnots = operatorListChunk.separateAnnots;
 
-    for (let i = 0; i < intentState.renderTasks.length; i++) {
-      intentState.renderTasks[i].operatorListChanged();
+    for (const internalRenderTask of intentState.renderTasks) {
+      internalRenderTask.operatorListChanged();
     }
 
     if (operatorListChunk.lastChunk) {
@@ -2620,14 +2142,21 @@ class PDFPageProxy {
     }
   }
 
-  _pumpOperatorList(args) {
-    (0, _util.assert)(args.intent, 'PDFPageProxy._pumpOperatorList: Expected "intent" argument.');
-
-    const readableStream = this._transport.messageHandler.sendWithStream("GetOperatorList", args);
+  _pumpOperatorList({
+    renderingIntent,
+    cacheKey,
+    annotationStorageMap
+  }) {
+    const readableStream = this._transport.messageHandler.sendWithStream("GetOperatorList", {
+      pageIndex: this._pageIndex,
+      intent: renderingIntent,
+      cacheKey,
+      annotationStorage: annotationStorageMap
+    });
 
     const reader = readableStream.getReader();
 
-    const intentState = this._intentStates.get(args.intent);
+    const intentState = this._intentStates.get(cacheKey);
 
     intentState.streamReader = reader;
 
@@ -2658,8 +2187,8 @@ class PDFPageProxy {
         if (intentState.operatorList) {
           intentState.operatorList.lastChunk = true;
 
-          for (let i = 0; i < intentState.renderTasks.length; i++) {
-            intentState.renderTasks[i].operatorListChanged();
+          for (const internalRenderTask of intentState.renderTasks) {
+            internalRenderTask.operatorListChanged();
           }
 
           this._tryCleanup();
@@ -2683,14 +2212,12 @@ class PDFPageProxy {
     reason,
     force = false
   }) {
-    (0, _util.assert)(reason instanceof Error || typeof reason === "object" && reason !== null, 'PDFPageProxy._abortOperatorList: Expected "reason" argument.');
-
     if (!intentState.streamReader) {
       return;
     }
 
     if (!force) {
-      if (intentState.renderTasks.length !== 0) {
+      if (intentState.renderTasks.size > 0) {
         return;
       }
 
@@ -2708,16 +2235,16 @@ class PDFPageProxy {
       }
     }
 
-    intentState.streamReader.cancel(new _util.AbortException(reason && reason.message));
+    intentState.streamReader.cancel(new _util.AbortException(reason.message)).catch(() => {});
     intentState.streamReader = null;
 
     if (this._transport.destroyed) {
       return;
     }
 
-    for (const [intent, curIntentState] of this._intentStates) {
+    for (const [curCacheKey, curIntentState] of this._intentStates) {
       if (curIntentState === intentState) {
-        this._intentStates.delete(intent);
+        this._intentStates.delete(curCacheKey);
 
         break;
       }
@@ -2735,85 +2262,20 @@ class PDFPageProxy {
 exports.PDFPageProxy = PDFPageProxy;
 
 class LoopbackPort {
-  constructor(defer = true) {
+  constructor() {
     this._listeners = [];
-    this._defer = defer;
-    this._deferred = Promise.resolve(undefined);
+    this._deferred = Promise.resolve();
   }
 
   postMessage(obj, transfers) {
-    function cloneValue(value) {
-      if (typeof value !== "object" || value === null) {
-        return value;
-      }
-
-      if (cloned.has(value)) {
-        return cloned.get(value);
-      }
-
-      let buffer, result;
-
-      if ((buffer = value.buffer) && (0, _util.isArrayBuffer)(buffer)) {
-        const transferable = transfers && transfers.includes(buffer);
-
-        if (transferable) {
-          result = new value.constructor(buffer, value.byteOffset, value.byteLength);
-        } else {
-          result = new value.constructor(value);
-        }
-
-        cloned.set(value, result);
-        return result;
-      }
-
-      result = Array.isArray(value) ? [] : {};
-      cloned.set(value, result);
-
-      for (const i in value) {
-        let desc,
-            p = value;
-
-        while (!(desc = Object.getOwnPropertyDescriptor(p, i))) {
-          p = Object.getPrototypeOf(p);
-        }
-
-        if (typeof desc.value === "undefined") {
-          continue;
-        }
-
-        if (typeof desc.value === "function") {
-          if (value.hasOwnProperty && value.hasOwnProperty(i)) {
-            throw new Error(`LoopbackPort.postMessage - cannot clone: ${value[i]}`);
-          }
-
-          continue;
-        }
-
-        result[i] = cloneValue(desc.value);
-      }
-
-      return result;
-    }
-
-    if (!this._defer) {
-      this._listeners.forEach(listener => {
-        listener.call(this, {
-          data: obj
-        });
-      });
-
-      return;
-    }
-
-    const cloned = new WeakMap();
-    const e = {
-      data: cloneValue(obj)
+    const event = {
+      data: structuredClone(obj, transfers)
     };
 
     this._deferred.then(() => {
-      this._listeners.forEach(listener => {
-        listener.call(this, e);
-      });
+      for (const listener of this._listeners) {
+        listener.call(this, event);
+      }
     });
   }
 
@@ -2834,305 +2296,309 @@ class LoopbackPort {
 }
 
 exports.LoopbackPort = LoopbackPort;
-
-const PDFWorker = function PDFWorkerClosure() {
-  const pdfWorkerPorts = new WeakMap();
-  let isWorkerDisabled = false;
-  let fallbackWorkerSrc;
-  let nextFakeWorkerId = 0;
-  let fakeWorkerCapability;
-
+const PDFWorkerUtil = {
+  isWorkerDisabled: false,
+  fallbackWorkerSrc: null,
+  fakeWorkerId: 0
+};
+exports.PDFWorkerUtil = PDFWorkerUtil;
+{
   if (_is_node.isNodeJS && typeof require === "function") {
-    isWorkerDisabled = true;
-    fallbackWorkerSrc = "./pdf.worker.js";
-  } else if (typeof document === "object" && "currentScript" in document) {
-    const pdfjsFilePath = document.currentScript && document.currentScript.src;
+    PDFWorkerUtil.isWorkerDisabled = true;
+    PDFWorkerUtil.fallbackWorkerSrc = "./pdf.worker.js";
+  } else if (typeof document === "object") {
+    const pdfjsFilePath = document?.currentScript?.src;
 
     if (pdfjsFilePath) {
-      fallbackWorkerSrc = pdfjsFilePath.replace(/(\.(?:min\.)?js)(\?.*)?$/i, ".worker$1$2");
+      PDFWorkerUtil.fallbackWorkerSrc = pdfjsFilePath.replace(/(\.(?:min\.)?js)(\?.*)?$/i, ".worker$1$2");
     }
   }
 
-  function getWorkerSrc() {
+  PDFWorkerUtil.isSameOrigin = function (baseUrl, otherUrl) {
+    let base;
+
+    try {
+      base = new URL(baseUrl);
+
+      if (!base.origin || base.origin === "null") {
+        return false;
+      }
+    } catch (e) {
+      return false;
+    }
+
+    const other = new URL(otherUrl, base);
+    return base.origin === other.origin;
+  };
+
+  PDFWorkerUtil.createCDNWrapper = function (url) {
+    const wrapper = `importScripts("${url}");`;
+    return URL.createObjectURL(new Blob([wrapper]));
+  };
+}
+
+class PDFWorker {
+  static #workerPorts = new WeakMap();
+
+  constructor({
+    name = null,
+    port = null,
+    verbosity = (0, _util.getVerbosityLevel)()
+  } = {}) {
+    if (port && PDFWorker.#workerPorts.has(port)) {
+      throw new Error("Cannot use more than one PDFWorker per port.");
+    }
+
+    this.name = name;
+    this.destroyed = false;
+    this.verbosity = verbosity;
+    this._readyCapability = (0, _util.createPromiseCapability)();
+    this._port = null;
+    this._webWorker = null;
+    this._messageHandler = null;
+
+    if (port) {
+      PDFWorker.#workerPorts.set(port, this);
+
+      this._initializeFromPort(port);
+
+      return;
+    }
+
+    this._initialize();
+  }
+
+  get promise() {
+    return this._readyCapability.promise;
+  }
+
+  get port() {
+    return this._port;
+  }
+
+  get messageHandler() {
+    return this._messageHandler;
+  }
+
+  _initializeFromPort(port) {
+    this._port = port;
+    this._messageHandler = new _message_handler.MessageHandler("main", "worker", port);
+
+    this._messageHandler.on("ready", function () {});
+
+    this._readyCapability.resolve();
+  }
+
+  _initialize() {
+    if (!PDFWorkerUtil.isWorkerDisabled && !PDFWorker._mainThreadWorkerMessageHandler) {
+      let {
+        workerSrc
+      } = PDFWorker;
+
+      try {
+        if (!PDFWorkerUtil.isSameOrigin(window.location.href, workerSrc)) {
+          workerSrc = PDFWorkerUtil.createCDNWrapper(new URL(workerSrc, window.location).href);
+        }
+
+        const worker = new Worker(workerSrc);
+        const messageHandler = new _message_handler.MessageHandler("main", "worker", worker);
+
+        const terminateEarly = () => {
+          worker.removeEventListener("error", onWorkerError);
+          messageHandler.destroy();
+          worker.terminate();
+
+          if (this.destroyed) {
+            this._readyCapability.reject(new Error("Worker was destroyed"));
+          } else {
+            this._setupFakeWorker();
+          }
+        };
+
+        const onWorkerError = () => {
+          if (!this._webWorker) {
+            terminateEarly();
+          }
+        };
+
+        worker.addEventListener("error", onWorkerError);
+        messageHandler.on("test", data => {
+          worker.removeEventListener("error", onWorkerError);
+
+          if (this.destroyed) {
+            terminateEarly();
+            return;
+          }
+
+          if (data) {
+            this._messageHandler = messageHandler;
+            this._port = worker;
+            this._webWorker = worker;
+
+            this._readyCapability.resolve();
+
+            messageHandler.send("configure", {
+              verbosity: this.verbosity
+            });
+          } else {
+            this._setupFakeWorker();
+
+            messageHandler.destroy();
+            worker.terminate();
+          }
+        });
+        messageHandler.on("ready", data => {
+          worker.removeEventListener("error", onWorkerError);
+
+          if (this.destroyed) {
+            terminateEarly();
+            return;
+          }
+
+          try {
+            sendTest();
+          } catch (e) {
+            this._setupFakeWorker();
+          }
+        });
+
+        const sendTest = () => {
+          const testObj = new Uint8Array();
+          messageHandler.send("test", testObj, [testObj.buffer]);
+        };
+
+        sendTest();
+        return;
+      } catch (e) {
+        (0, _util.info)("The worker has been disabled.");
+      }
+    }
+
+    this._setupFakeWorker();
+  }
+
+  _setupFakeWorker() {
+    if (!PDFWorkerUtil.isWorkerDisabled) {
+      (0, _util.warn)("Setting up fake worker.");
+      PDFWorkerUtil.isWorkerDisabled = true;
+    }
+
+    PDFWorker._setupFakeWorkerGlobal.then(WorkerMessageHandler => {
+      if (this.destroyed) {
+        this._readyCapability.reject(new Error("Worker was destroyed"));
+
+        return;
+      }
+
+      const port = new LoopbackPort();
+      this._port = port;
+      const id = `fake${PDFWorkerUtil.fakeWorkerId++}`;
+      const workerHandler = new _message_handler.MessageHandler(id + "_worker", id, port);
+      WorkerMessageHandler.setup(workerHandler, port);
+      const messageHandler = new _message_handler.MessageHandler(id, id + "_worker", port);
+      this._messageHandler = messageHandler;
+
+      this._readyCapability.resolve();
+
+      messageHandler.send("configure", {
+        verbosity: this.verbosity
+      });
+    }).catch(reason => {
+      this._readyCapability.reject(new Error(`Setting up fake worker failed: "${reason.message}".`));
+    });
+  }
+
+  destroy() {
+    this.destroyed = true;
+
+    if (this._webWorker) {
+      this._webWorker.terminate();
+
+      this._webWorker = null;
+    }
+
+    PDFWorker.#workerPorts.delete(this._port);
+    this._port = null;
+
+    if (this._messageHandler) {
+      this._messageHandler.destroy();
+
+      this._messageHandler = null;
+    }
+  }
+
+  static fromPort(params) {
+    if (!params?.port) {
+      throw new Error("PDFWorker.fromPort - invalid method signature.");
+    }
+
+    if (this.#workerPorts.has(params.port)) {
+      return this.#workerPorts.get(params.port);
+    }
+
+    return new PDFWorker(params);
+  }
+
+  static get workerSrc() {
     if (_worker_options.GlobalWorkerOptions.workerSrc) {
       return _worker_options.GlobalWorkerOptions.workerSrc;
     }
 
-    if (typeof fallbackWorkerSrc !== "undefined") {
+    if (PDFWorkerUtil.fallbackWorkerSrc !== null) {
       if (!_is_node.isNodeJS) {
         (0, _display_utils.deprecated)('No "GlobalWorkerOptions.workerSrc" specified.');
       }
 
-      return fallbackWorkerSrc;
+      return PDFWorkerUtil.fallbackWorkerSrc;
     }
 
     throw new Error('No "GlobalWorkerOptions.workerSrc" specified.');
   }
 
-  function getMainThreadWorkerMessageHandler() {
-    let mainWorkerMessageHandler;
-
+  static get _mainThreadWorkerMessageHandler() {
     try {
-      mainWorkerMessageHandler = globalThis.pdfjsWorker && globalThis.pdfjsWorker.WorkerMessageHandler;
-    } catch (ex) {}
-
-    return mainWorkerMessageHandler || null;
+      return globalThis.pdfjsWorker?.WorkerMessageHandler || null;
+    } catch (ex) {
+      return null;
+    }
   }
 
-  function setupFakeWorkerGlobal() {
-    if (fakeWorkerCapability) {
-      return fakeWorkerCapability.promise;
-    }
-
-    fakeWorkerCapability = (0, _util.createPromiseCapability)();
-
-    const loader = async function () {
-      const mainWorkerMessageHandler = getMainThreadWorkerMessageHandler();
+  static get _setupFakeWorkerGlobal() {
+    const loader = async () => {
+      const mainWorkerMessageHandler = this._mainThreadWorkerMessageHandler;
 
       if (mainWorkerMessageHandler) {
         return mainWorkerMessageHandler;
       }
 
       if (_is_node.isNodeJS && typeof require === "function") {
-        const worker = eval("require")(getWorkerSrc());
+        const worker = eval("require")(this.workerSrc);
         return worker.WorkerMessageHandler;
       }
 
-      await (0, _display_utils.loadScript)(getWorkerSrc());
+      await (0, _display_utils.loadScript)(this.workerSrc);
       return window.pdfjsWorker.WorkerMessageHandler;
     };
 
-    loader().then(fakeWorkerCapability.resolve, fakeWorkerCapability.reject);
-    return fakeWorkerCapability.promise;
+    return (0, _util.shadow)(this, "_setupFakeWorkerGlobal", loader());
   }
 
-  function createCDNWrapper(url) {
-    const wrapper = "importScripts('" + url + "');";
-    return URL.createObjectURL(new Blob([wrapper]));
-  }
-
-  class PDFWorker {
-    constructor({
-      name = null,
-      port = null,
-      verbosity = (0, _util.getVerbosityLevel)()
-    } = {}) {
-      if (port && pdfWorkerPorts.has(port)) {
-        throw new Error("Cannot use more than one PDFWorker per port");
-      }
-
-      this.name = name;
-      this.destroyed = false;
-      this.postMessageTransfers = true;
-      this.verbosity = verbosity;
-      this._readyCapability = (0, _util.createPromiseCapability)();
-      this._port = null;
-      this._webWorker = null;
-      this._messageHandler = null;
-
-      if (port) {
-        pdfWorkerPorts.set(port, this);
-
-        this._initializeFromPort(port);
-
-        return;
-      }
-
-      this._initialize();
-    }
-
-    get promise() {
-      return this._readyCapability.promise;
-    }
-
-    get port() {
-      return this._port;
-    }
-
-    get messageHandler() {
-      return this._messageHandler;
-    }
-
-    _initializeFromPort(port) {
-      this._port = port;
-      this._messageHandler = new _message_handler.MessageHandler("main", "worker", port);
-
-      this._messageHandler.on("ready", function () {});
-
-      this._readyCapability.resolve();
-    }
-
-    _initialize() {
-      if (typeof Worker !== "undefined" && !isWorkerDisabled && !getMainThreadWorkerMessageHandler()) {
-        let workerSrc = getWorkerSrc();
-
-        try {
-          if (!(0, _util.isSameOrigin)(window.location.href, workerSrc)) {
-            workerSrc = createCDNWrapper(new URL(workerSrc, window.location).href);
-          }
-
-          const worker = new Worker(workerSrc);
-          const messageHandler = new _message_handler.MessageHandler("main", "worker", worker);
-
-          const terminateEarly = () => {
-            worker.removeEventListener("error", onWorkerError);
-            messageHandler.destroy();
-            worker.terminate();
-
-            if (this.destroyed) {
-              this._readyCapability.reject(new Error("Worker was destroyed"));
-            } else {
-              this._setupFakeWorker();
-            }
-          };
-
-          const onWorkerError = () => {
-            if (!this._webWorker) {
-              terminateEarly();
-            }
-          };
-
-          worker.addEventListener("error", onWorkerError);
-          messageHandler.on("test", data => {
-            worker.removeEventListener("error", onWorkerError);
-
-            if (this.destroyed) {
-              terminateEarly();
-              return;
-            }
-
-            if (data) {
-              this._messageHandler = messageHandler;
-              this._port = worker;
-              this._webWorker = worker;
-
-              if (!data.supportTransfers) {
-                this.postMessageTransfers = false;
-              }
-
-              this._readyCapability.resolve();
-
-              messageHandler.send("configure", {
-                verbosity: this.verbosity
-              });
-            } else {
-              this._setupFakeWorker();
-
-              messageHandler.destroy();
-              worker.terminate();
-            }
-          });
-          messageHandler.on("ready", data => {
-            worker.removeEventListener("error", onWorkerError);
-
-            if (this.destroyed) {
-              terminateEarly();
-              return;
-            }
-
-            try {
-              sendTest();
-            } catch (e) {
-              this._setupFakeWorker();
-            }
-          });
-
-          const sendTest = () => {
-            const testObj = new Uint8Array([this.postMessageTransfers ? 255 : 0]);
-
-            try {
-              messageHandler.send("test", testObj, [testObj.buffer]);
-            } catch (ex) {
-              (0, _util.warn)("Cannot use postMessage transfers.");
-              testObj[0] = 0;
-              messageHandler.send("test", testObj);
-            }
-          };
-
-          sendTest();
-          return;
-        } catch (e) {
-          (0, _util.info)("The worker has been disabled.");
-        }
-      }
-
-      this._setupFakeWorker();
-    }
-
-    _setupFakeWorker() {
-      if (!isWorkerDisabled) {
-        (0, _util.warn)("Setting up fake worker.");
-        isWorkerDisabled = true;
-      }
-
-      setupFakeWorkerGlobal().then(WorkerMessageHandler => {
-        if (this.destroyed) {
-          this._readyCapability.reject(new Error("Worker was destroyed"));
-
-          return;
-        }
-
-        const port = new LoopbackPort();
-        this._port = port;
-        const id = "fake" + nextFakeWorkerId++;
-        const workerHandler = new _message_handler.MessageHandler(id + "_worker", id, port);
-        WorkerMessageHandler.setup(workerHandler, port);
-        const messageHandler = new _message_handler.MessageHandler(id, id + "_worker", port);
-        this._messageHandler = messageHandler;
-
-        this._readyCapability.resolve();
-
-        messageHandler.send("configure", {
-          verbosity: this.verbosity
-        });
-      }).catch(reason => {
-        this._readyCapability.reject(new Error(`Setting up fake worker failed: "${reason.message}".`));
-      });
-    }
-
-    destroy() {
-      this.destroyed = true;
-
-      if (this._webWorker) {
-        this._webWorker.terminate();
-
-        this._webWorker = null;
-      }
-
-      pdfWorkerPorts.delete(this._port);
-      this._port = null;
-
-      if (this._messageHandler) {
-        this._messageHandler.destroy();
-
-        this._messageHandler = null;
-      }
-    }
-
-    static fromPort(params) {
-      if (!params || !params.port) {
-        throw new Error("PDFWorker.fromPort - invalid method signature.");
-      }
-
-      if (pdfWorkerPorts.has(params.port)) {
-        return pdfWorkerPorts.get(params.port);
-      }
-
-      return new PDFWorker(params);
-    }
-
-    static getWorkerSrc() {
-      return getWorkerSrc();
-    }
-
-  }
-
-  return PDFWorker;
-}();
+}
 
 exports.PDFWorker = PDFWorker;
+{
+  PDFWorker.getWorkerSrc = function () {
+    (0, _display_utils.deprecated)("`PDFWorker.getWorkerSrc()`, please use `PDFWorker.workerSrc` instead.");
+    return this.workerSrc;
+  };
+}
 
 class WorkerTransport {
+  #docStats = null;
+  #pageCache = new Map();
+  #pagePromises = new Map();
+  #metadataPromise = null;
+
   constructor(messageHandler, loadingTask, networkStream, params) {
     this.messageHandler = messageHandler;
     this.loadingTask = loadingTask;
@@ -3140,25 +2606,92 @@ class WorkerTransport {
     this.fontLoader = new _font_loader.FontLoader({
       docId: loadingTask.docId,
       onUnsupportedFeature: this._onUnsupportedFeature.bind(this),
-      ownerDocument: params.ownerDocument
+      ownerDocument: params.ownerDocument,
+      styleElement: params.styleElement
     });
     this._params = params;
-    this.CMapReaderFactory = new params.CMapReaderFactory({
-      baseUrl: params.cMapUrl,
-      isCompressed: params.cMapPacked
-    });
+
+    if (!params.useWorkerFetch) {
+      this.CMapReaderFactory = new params.CMapReaderFactory({
+        baseUrl: params.cMapUrl,
+        isCompressed: params.cMapPacked
+      });
+      this.StandardFontDataFactory = new params.StandardFontDataFactory({
+        baseUrl: params.standardFontDataUrl
+      });
+    }
+
     this.destroyed = false;
     this.destroyCapability = null;
     this._passwordCapability = null;
     this._networkStream = networkStream;
     this._fullReader = null;
     this._lastProgress = null;
-    this.pageCache = [];
-    this.pagePromises = [];
     this.downloadInfoCapability = (0, _util.createPromiseCapability)();
     this.setupMessageHandler();
   }
 
+  get annotationStorage() {
+    return (0, _util.shadow)(this, "annotationStorage", new _annotation_storage.AnnotationStorage());
+  }
+
+  get stats() {
+    return this.#docStats;
+  }
+
+  getRenderingIntent(intent, annotationMode = _util.AnnotationMode.ENABLE, printAnnotationStorage = null, isOpList = false) {
+    let renderingIntent = _util.RenderingIntentFlag.DISPLAY;
+    let annotationMap = null;
+
+    switch (intent) {
+      case "any":
+        renderingIntent = _util.RenderingIntentFlag.ANY;
+        break;
+
+      case "display":
+        break;
+
+      case "print":
+        renderingIntent = _util.RenderingIntentFlag.PRINT;
+        break;
+
+      default:
+        (0, _util.warn)(`getRenderingIntent - invalid intent: ${intent}`);
+    }
+
+    switch (annotationMode) {
+      case _util.AnnotationMode.DISABLE:
+        renderingIntent += _util.RenderingIntentFlag.ANNOTATIONS_DISABLE;
+        break;
+
+      case _util.AnnotationMode.ENABLE:
+        break;
+
+      case _util.AnnotationMode.ENABLE_FORMS:
+        renderingIntent += _util.RenderingIntentFlag.ANNOTATIONS_FORMS;
+        break;
+
+      case _util.AnnotationMode.ENABLE_STORAGE:
+        renderingIntent += _util.RenderingIntentFlag.ANNOTATIONS_STORAGE;
+        const annotationStorage = renderingIntent & _util.RenderingIntentFlag.PRINT && printAnnotationStorage instanceof _annotation_storage.PrintAnnotationStorage ? printAnnotationStorage : this.annotationStorage;
+        annotationMap = annotationStorage.serializable;
+        break;
+
+      default:
+        (0, _util.warn)(`getRenderingIntent - invalid annotationMode: ${annotationMode}`);
+    }
+
+    if (isOpList) {
+      renderingIntent += _util.RenderingIntentFlag.OPLIST;
+    }
+
+    return {
+      renderingIntent,
+      cacheKey: `${renderingIntent}_${_annotation_storage.AnnotationStorage.getHash(annotationMap)}`,
+      annotationStorageMap: annotationMap
+    };
+  }
+
   destroy() {
     if (this.destroyCapability) {
       return this.destroyCapability.promise;
@@ -3172,17 +2705,26 @@ class WorkerTransport {
     }
 
     const waitOn = [];
-    this.pageCache.forEach(function (page) {
-      if (page) {
-        waitOn.push(page._destroy());
-      }
-    });
-    this.pageCache.length = 0;
-    this.pagePromises.length = 0;
+
+    for (const page of this.#pageCache.values()) {
+      waitOn.push(page._destroy());
+    }
+
+    this.#pageCache.clear();
+    this.#pagePromises.clear();
+
+    if (this.hasOwnProperty("annotationStorage")) {
+      this.annotationStorage.resetModified();
+    }
+
     const terminated = this.messageHandler.sendWithPromise("Terminate", null);
     waitOn.push(terminated);
     Promise.all(waitOn).then(() => {
+      this.commonObjs.clear();
       this.fontLoader.clear();
+      this.#metadataPromise = null;
+      this._getFieldObjectsPromise = null;
+      this._hasJSActionsPromise = null;
 
       if (this._networkStream) {
         this._networkStream.cancelAllRequests(new _util.AbortException("Worker was terminated."));
@@ -3248,17 +2790,15 @@ class WorkerTransport {
       const fullReader = this._fullReader;
       fullReader.headersReady.then(() => {
         if (!fullReader.isStreamingSupported || !fullReader.isRangeSupported) {
-          if (this._lastProgress && loadingTask.onProgress) {
-            loadingTask.onProgress(this._lastProgress);
+          if (this._lastProgress) {
+            loadingTask.onProgress?.(this._lastProgress);
           }
 
           fullReader.onProgress = evt => {
-            if (loadingTask.onProgress) {
-              loadingTask.onProgress({
-                loaded: evt.loaded,
-                total: evt.total
-              });
-            }
+            loadingTask.onProgress?.({
+              loaded: evt.loaded,
+              total: evt.total
+            });
           };
         }
 
@@ -3312,6 +2852,8 @@ class WorkerTransport {
       pdfInfo
     }) => {
       this._numPages = pdfInfo.numPages;
+      this._htmlForXfa = pdfInfo.htmlForXfa;
+      delete pdfInfo.htmlForXfa;
 
       loadingTask._capability.resolve(new PDFDocumentProxy(pdfInfo, this));
     });
@@ -3338,11 +2880,9 @@ class WorkerTransport {
         case "UnknownErrorException":
           reason = new _util.UnknownErrorException(ex.message, ex.details);
           break;
-      }
 
-      if (!(reason instanceof Error)) {
-        const msg = "DocException - expected a valid Error.";
-        (0, _util.warn)(msg);
+        default:
+          (0, _util.unreachable)("DocException - expected a valid Error.");
       }
 
       loadingTask._capability.reject(reason);
@@ -3352,9 +2892,13 @@ class WorkerTransport {
 
       if (loadingTask.onPassword) {
         const updatePassword = password => {
-          this._passwordCapability.resolve({
-            password
-          });
+          if (password instanceof Error) {
+            this._passwordCapability.reject(password);
+          } else {
+            this._passwordCapability.resolve({
+              password
+            });
+          }
         };
 
         try {
@@ -3369,13 +2913,10 @@ class WorkerTransport {
       return this._passwordCapability.promise;
     });
     messageHandler.on("DataLoaded", data => {
-      if (loadingTask.onProgress) {
-        loadingTask.onProgress({
-          loaded: data.length,
-          total: data.length
-        });
-      }
-
+      loadingTask.onProgress?.({
+        loaded: data.length,
+        total: data.length
+      });
       this.downloadInfoCapability.resolve(data);
     });
     messageHandler.on("StartRenderPage", data => {
@@ -3383,17 +2924,15 @@ class WorkerTransport {
         return;
       }
 
-      const page = this.pageCache[data.pageIndex];
+      const page = this.#pageCache.get(data.pageIndex);
 
-      page._startRenderPage(data.transparency, data.intent);
+      page._startRenderPage(data.transparency, data.cacheKey);
     });
-    messageHandler.on("commonobj", data => {
+    messageHandler.on("commonobj", ([id, type, exportedData]) => {
       if (this.destroyed) {
         return;
       }
 
-      const [id, type, exportedData] = data;
-
       if (this.commonObjs.has(id)) {
         return;
       }
@@ -3411,7 +2950,7 @@ class WorkerTransport {
 
           let fontRegistry = null;
 
-          if (params.pdfBug && globalThis.FontInspector && globalThis.FontInspector.enabled) {
+          if (params.pdfBug && globalThis.FontInspector?.enabled) {
             fontRegistry = {
               registerFont(font, url) {
                 globalThis.FontInspector.fontAdded(font, url);
@@ -3449,16 +2988,15 @@ class WorkerTransport {
           throw new Error(`Got unknown common object type ${type}`);
       }
     });
-    messageHandler.on("obj", data => {
+    messageHandler.on("obj", ([id, pageIndex, type, imageData]) => {
       if (this.destroyed) {
-        return undefined;
+        return;
       }
 
-      const [id, pageIndex, type, imageData] = data;
-      const pageProxy = this.pageCache[pageIndex];
+      const pageProxy = this.#pageCache.get(pageIndex);
 
       if (pageProxy.objs.has(id)) {
-        return undefined;
+        return;
       }
 
       switch (type) {
@@ -3466,52 +3004,79 @@ class WorkerTransport {
           pageProxy.objs.resolve(id, imageData);
           const MAX_IMAGE_SIZE_TO_STORE = 8000000;
 
-          if (imageData && "data" in imageData && imageData.data.length > MAX_IMAGE_SIZE_TO_STORE) {
-            pageProxy.cleanupAfterRender = true;
+          if (imageData) {
+            let length;
+
+            if (imageData.bitmap) {
+              const {
+                bitmap,
+                width,
+                height
+              } = imageData;
+              length = width * height * 4;
+
+              pageProxy._bitmaps.add(bitmap);
+            } else {
+              length = imageData.data?.length || 0;
+            }
+
+            if (length > MAX_IMAGE_SIZE_TO_STORE) {
+              pageProxy.cleanupAfterRender = true;
+            }
           }
 
           break;
 
+        case "Pattern":
+          pageProxy.objs.resolve(id, imageData);
+          break;
+
         default:
           throw new Error(`Got unknown object type ${type}`);
       }
-
-      return undefined;
     });
     messageHandler.on("DocProgress", data => {
       if (this.destroyed) {
         return;
       }
 
-      if (loadingTask.onProgress) {
-        loadingTask.onProgress({
-          loaded: data.loaded,
-          total: data.total
-        });
-      }
+      loadingTask.onProgress?.({
+        loaded: data.loaded,
+        total: data.total
+      });
     });
-    messageHandler.on("UnsupportedFeature", this._onUnsupportedFeature.bind(this));
-    messageHandler.on("FetchBuiltInCMap", (data, sink) => {
+    messageHandler.on("DocStats", data => {
       if (this.destroyed) {
-        sink.error(new Error("Worker was destroyed"));
         return;
       }
 
-      let fetched = false;
+      this.#docStats = Object.freeze({
+        streamTypes: Object.freeze(data.streamTypes),
+        fontTypes: Object.freeze(data.fontTypes)
+      });
+    });
+    messageHandler.on("UnsupportedFeature", this._onUnsupportedFeature.bind(this));
+    messageHandler.on("FetchBuiltInCMap", data => {
+      if (this.destroyed) {
+        return Promise.reject(new Error("Worker was destroyed."));
+      }
 
-      sink.onPull = () => {
-        if (fetched) {
-          sink.close();
-          return;
-        }
+      if (!this.CMapReaderFactory) {
+        return Promise.reject(new Error("CMapReaderFactory not initialized, see the `useWorkerFetch` parameter."));
+      }
 
-        fetched = true;
-        this.CMapReaderFactory.fetch(data).then(function (builtInCMap) {
-          sink.enqueue(builtInCMap, 1, [builtInCMap.cMapData.buffer]);
-        }).catch(function (reason) {
-          sink.error(reason);
-        });
-      };
+      return this.CMapReaderFactory.fetch(data);
+    });
+    messageHandler.on("FetchStandardFontData", data => {
+      if (this.destroyed) {
+        return Promise.reject(new Error("Worker was destroyed."));
+      }
+
+      if (!this.StandardFontDataFactory) {
+        return Promise.reject(new Error("StandardFontDataFactory not initialized, see the `useWorkerFetch` parameter."));
+      }
+
+      return this.StandardFontDataFactory.fetch(data);
     });
   }
 
@@ -3522,9 +3087,7 @@ class WorkerTransport {
       return;
     }
 
-    if (this.loadingTask.onUnsupportedFeature) {
-      this.loadingTask.onUnsupportedFeature(featureId);
-    }
+    this.loadingTask.onUnsupportedFeature?.(featureId);
   }
 
   getData() {
@@ -3533,13 +3096,14 @@ class WorkerTransport {
 
   getPage(pageNumber) {
     if (!Number.isInteger(pageNumber) || pageNumber <= 0 || pageNumber > this._numPages) {
-      return Promise.reject(new Error("Invalid page request"));
+      return Promise.reject(new Error("Invalid page request."));
     }
 
-    const pageIndex = pageNumber - 1;
+    const pageIndex = pageNumber - 1,
+          cachedPromise = this.#pagePromises.get(pageIndex);
 
-    if (pageIndex in this.pagePromises) {
-      return this.pagePromises[pageIndex];
+    if (cachedPromise) {
+      return cachedPromise;
     }
 
     const promise = this.messageHandler.sendWithPromise("GetPage", {
@@ -3550,18 +3114,21 @@ class WorkerTransport {
       }
 
       const page = new PDFPageProxy(pageIndex, pageInfo, this, this._params.ownerDocument, this._params.pdfBug);
-      this.pageCache[pageIndex] = page;
+      this.#pageCache.set(pageIndex, page);
       return page;
     });
-    this.pagePromises[pageIndex] = promise;
+    this.#pagePromises.set(pageIndex, promise);
     return promise;
   }
 
   getPageIndex(ref) {
+    if (typeof ref !== "object" || ref === null || !Number.isInteger(ref.num) || ref.num < 0 || !Number.isInteger(ref.gen) || ref.gen < 0) {
+      return Promise.reject(new Error("Invalid pageIndex request."));
+    }
+
     return this.messageHandler.sendWithPromise("GetPageIndex", {
-      ref
-    }).catch(function (reason) {
-      return Promise.reject(new Error(reason));
+      num: ref.num,
+      gen: ref.gen
     });
   }
 
@@ -3572,18 +3139,29 @@ class WorkerTransport {
     });
   }
 
-  saveDocument(annotationStorage) {
+  saveDocument() {
     return this.messageHandler.sendWithPromise("SaveDocument", {
+      isPureXfa: !!this._htmlForXfa,
       numPages: this._numPages,
-      annotationStorage: annotationStorage && annotationStorage.getAll() || null,
-      filename: this._fullReader ? this._fullReader.filename : null
+      annotationStorage: this.annotationStorage.serializable,
+      filename: this._fullReader?.filename ?? null
     }).finally(() => {
-      if (annotationStorage) {
-        annotationStorage.resetModified();
-      }
+      this.annotationStorage.resetModified();
     });
   }
 
+  getFieldObjects() {
+    return this._getFieldObjectsPromise ||= this.messageHandler.sendWithPromise("GetFieldObjects", null);
+  }
+
+  hasJSActions() {
+    return this._hasJSActionsPromise ||= this.messageHandler.sendWithPromise("HasJSActions", null);
+  }
+
+  getCalculationOrderIds() {
+    return this.messageHandler.sendWithPromise("GetCalculationOrderIds", null);
+  }
+
   getDestinations() {
     return this.messageHandler.sendWithPromise("GetDestinations", null);
   }
@@ -3626,6 +3204,22 @@ class WorkerTransport {
     return this.messageHandler.sendWithPromise("GetJavaScript", null);
   }
 
+  getDocJSActions() {
+    return this.messageHandler.sendWithPromise("GetDocJSActions", null);
+  }
+
+  getPageJSActions(pageIndex) {
+    return this.messageHandler.sendWithPromise("GetPageJSActions", {
+      pageIndex
+    });
+  }
+
+  getStructTree(pageIndex) {
+    return this.messageHandler.sendWithPromise("GetStructTree", {
+      pageIndex
+    });
+  }
+
   getOutline() {
     return this.messageHandler.sendWithPromise("GetOutline", null);
   }
@@ -3641,75 +3235,82 @@ class WorkerTransport {
   }
 
   getMetadata() {
-    return this.messageHandler.sendWithPromise("GetMetadata", null).then(results => {
+    return this.#metadataPromise ||= this.messageHandler.sendWithPromise("GetMetadata", null).then(results => {
       return {
         info: results[0],
         metadata: results[1] ? new _metadata.Metadata(results[1]) : null,
-        contentDispositionFilename: this._fullReader ? this._fullReader.filename : null
+        contentDispositionFilename: this._fullReader?.filename ?? null,
+        contentLength: this._fullReader?.contentLength ?? null
       };
     });
   }
 
-  getStats() {
-    return this.messageHandler.sendWithPromise("GetStats", null);
+  getMarkInfo() {
+    return this.messageHandler.sendWithPromise("GetMarkInfo", null);
   }
 
-  startCleanup() {
-    return this.messageHandler.sendWithPromise("Cleanup", null).then(() => {
-      for (let i = 0, ii = this.pageCache.length; i < ii; i++) {
-        const page = this.pageCache[i];
+  async startCleanup(keepLoadedFonts = false) {
+    await this.messageHandler.sendWithPromise("Cleanup", null);
 
-        if (page) {
-          const cleanupSuccessful = page.cleanup();
+    if (this.destroyed) {
+      return;
+    }
 
-          if (!cleanupSuccessful) {
-            throw new Error(`startCleanup: Page ${i + 1} is currently rendering.`);
-          }
-        }
+    for (const page of this.#pageCache.values()) {
+      const cleanupSuccessful = page.cleanup();
+
+      if (!cleanupSuccessful) {
+        throw new Error(`startCleanup: Page ${page.pageNumber} is currently rendering.`);
       }
+    }
 
-      this.commonObjs.clear();
+    this.commonObjs.clear();
+
+    if (!keepLoadedFonts) {
       this.fontLoader.clear();
-    });
+    }
+
+    this.#metadataPromise = null;
+    this._getFieldObjectsPromise = null;
+    this._hasJSActionsPromise = null;
   }
 
   get loadingParams() {
     const params = this._params;
     return (0, _util.shadow)(this, "loadingParams", {
       disableAutoFetch: params.disableAutoFetch,
-      disableFontFace: params.disableFontFace
+      enableXfa: params.enableXfa
     });
   }
 
 }
 
 class PDFObjects {
-  constructor() {
-    this._objs = Object.create(null);
-  }
+  #objs = Object.create(null);
 
-  _ensureObj(objId) {
-    if (this._objs[objId]) {
-      return this._objs[objId];
+  #ensureObj(objId) {
+    const obj = this.#objs[objId];
+
+    if (obj) {
+      return obj;
     }
 
-    return this._objs[objId] = {
+    return this.#objs[objId] = {
       capability: (0, _util.createPromiseCapability)(),
-      data: null,
-      resolved: false
+      data: null
     };
   }
 
   get(objId, callback = null) {
     if (callback) {
-      this._ensureObj(objId).capability.promise.then(callback);
-
+      const obj = this.#ensureObj(objId);
+      obj.capability.promise.then(() => callback(obj.data));
       return null;
     }
 
-    const obj = this._objs[objId];
+    const obj = this.#objs[objId];
 
-    if (!obj || !obj.resolved) {
+    if (!obj?.capability.settled) {
       throw new Error(`Requesting object that isn't resolved yet ${objId}.`);
     }
 
@@ -3717,237 +3318,2375 @@ class PDFObjects {
   }
 
   has(objId) {
-    const obj = this._objs[objId];
-    return obj ? obj.resolved : false;
+    const obj = this.#objs[objId];
+    return obj?.capability.settled || false;
   }
 
-  resolve(objId, data) {
-    const obj = this._ensureObj(objId);
-
-    obj.resolved = true;
+  resolve(objId, data = null) {
+    const obj = this.#ensureObj(objId);
     obj.data = data;
-    obj.capability.resolve(data);
+    obj.capability.resolve();
   }
 
   clear() {
-    this._objs = Object.create(null);
+    this.#objs = Object.create(null);
   }
 
 }
 
 class RenderTask {
+  #internalRenderTask = null;
+
   constructor(internalRenderTask) {
-    this._internalRenderTask = internalRenderTask;
+    this.#internalRenderTask = internalRenderTask;
     this.onContinue = null;
   }
 
   get promise() {
-    return this._internalRenderTask.capability.promise;
+    return this.#internalRenderTask.capability.promise;
   }
 
   cancel() {
-    this._internalRenderTask.cancel();
+    this.#internalRenderTask.cancel();
+  }
+
+  get separateAnnots() {
+    const {
+      separateAnnots
+    } = this.#internalRenderTask.operatorList;
+
+    if (!separateAnnots) {
+      return false;
+    }
+
+    const {
+      annotationCanvasMap
+    } = this.#internalRenderTask;
+    return separateAnnots.form || separateAnnots.canvas && annotationCanvasMap?.size > 0;
   }
 
 }
 
-const InternalRenderTask = function InternalRenderTaskClosure() {
-  const canvasInRendering = new WeakSet();
+exports.RenderTask = RenderTask;
 
-  class InternalRenderTask {
-    constructor({
-      callback,
-      params,
-      objs,
-      commonObjs,
-      operatorList,
-      pageIndex,
-      canvasFactory,
-      webGLContext,
-      useRequestAnimationFrame = false,
-      pdfBug = false
-    }) {
-      this.callback = callback;
-      this.params = params;
-      this.objs = objs;
-      this.commonObjs = commonObjs;
-      this.operatorListIdx = null;
-      this.operatorList = operatorList;
-      this._pageIndex = pageIndex;
-      this.canvasFactory = canvasFactory;
-      this.webGLContext = webGLContext;
-      this._pdfBug = pdfBug;
-      this.running = false;
-      this.graphicsReadyCallback = null;
-      this.graphicsReady = false;
-      this._useRequestAnimationFrame = useRequestAnimationFrame === true && typeof window !== "undefined";
-      this.cancelled = false;
-      this.capability = (0, _util.createPromiseCapability)();
-      this.task = new RenderTask(this);
-      this._continueBound = this._continue.bind(this);
-      this._scheduleNextBound = this._scheduleNext.bind(this);
-      this._nextBound = this._next.bind(this);
-      this._canvas = params.canvasContext.canvas;
-    }
-
-    get completed() {
-      return this.capability.promise.catch(function () {});
-    }
-
-    initializeGraphics({
-      transparency = false,
-      optionalContentConfig
-    }) {
-      if (this.cancelled) {
-        return;
-      }
-
-      if (this._canvas) {
-        if (canvasInRendering.has(this._canvas)) {
-          throw new Error("Cannot use the same canvas during multiple render() operations. " + "Use different canvas or ensure previous operations were " + "cancelled or completed.");
-        }
-
-        canvasInRendering.add(this._canvas);
-      }
-
-      if (this._pdfBug && globalThis.StepperManager && globalThis.StepperManager.enabled) {
-        this.stepper = globalThis.StepperManager.create(this._pageIndex);
-        this.stepper.init(this.operatorList);
-        this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
-      }
-
-      const {
-        canvasContext,
-        viewport,
-        transform,
-        imageLayer,
-        background
-      } = this.params;
-      this.gfx = new _canvas.CanvasGraphics(canvasContext, this.commonObjs, this.objs, this.canvasFactory, this.webGLContext, imageLayer, optionalContentConfig);
-      this.gfx.beginDrawing({
-        transform,
-        viewport,
-        transparency,
-        background
-      });
-      this.operatorListIdx = 0;
-      this.graphicsReady = true;
-
-      if (this.graphicsReadyCallback) {
-        this.graphicsReadyCallback();
-      }
-    }
-
-    cancel(error = null) {
-      this.running = false;
-      this.cancelled = true;
-
-      if (this.gfx) {
-        this.gfx.endDrawing();
-      }
-
-      if (this._canvas) {
-        canvasInRendering.delete(this._canvas);
-      }
-
-      this.callback(error || new _display_utils.RenderingCancelledException(`Rendering cancelled, page ${this._pageIndex + 1}`, "canvas"));
-    }
-
-    operatorListChanged() {
-      if (!this.graphicsReady) {
-        if (!this.graphicsReadyCallback) {
-          this.graphicsReadyCallback = this._continueBound;
-        }
-
-        return;
-      }
-
-      if (this.stepper) {
-        this.stepper.updateOperatorList(this.operatorList);
-      }
-
-      if (this.running) {
-        return;
-      }
-
-      this._continue();
-    }
-
-    _continue() {
-      this.running = true;
-
-      if (this.cancelled) {
-        return;
-      }
-
-      if (this.task.onContinue) {
-        this.task.onContinue(this._scheduleNextBound);
-      } else {
-        this._scheduleNext();
-      }
-    }
-
-    _scheduleNext() {
-      if (this._useRequestAnimationFrame) {
-        window.requestAnimationFrame(() => {
-          this._nextBound().catch(this.cancel.bind(this));
-        });
-      } else {
-        Promise.resolve().then(this._nextBound).catch(this.cancel.bind(this));
-      }
-    }
-
-    async _next() {
-      if (this.cancelled) {
-        return;
-      }
-
-      this.operatorListIdx = this.gfx.executeOperatorList(this.operatorList, this.operatorListIdx, this._continueBound, this.stepper);
-
-      if (this.operatorListIdx === this.operatorList.argsArray.length) {
-        this.running = false;
-
-        if (this.operatorList.lastChunk) {
-          this.gfx.endDrawing();
-
-          if (this._canvas) {
-            canvasInRendering.delete(this._canvas);
-          }
-
-          this.callback();
-        }
-      }
-    }
+class InternalRenderTask {
+  static #canvasInUse = new WeakSet();
 
+  constructor({
+    callback,
+    params,
+    objs,
+    commonObjs,
+    annotationCanvasMap,
+    operatorList,
+    pageIndex,
+    canvasFactory,
+    useRequestAnimationFrame = false,
+    pdfBug = false,
+    pageColors = null
+  }) {
+    this.callback = callback;
+    this.params = params;
+    this.objs = objs;
+    this.commonObjs = commonObjs;
+    this.annotationCanvasMap = annotationCanvasMap;
+    this.operatorListIdx = null;
+    this.operatorList = operatorList;
+    this._pageIndex = pageIndex;
+    this.canvasFactory = canvasFactory;
+    this._pdfBug = pdfBug;
+    this.pageColors = pageColors;
+    this.running = false;
+    this.graphicsReadyCallback = null;
+    this.graphicsReady = false;
+    this._useRequestAnimationFrame = useRequestAnimationFrame === true && typeof window !== "undefined";
+    this.cancelled = false;
+    this.capability = (0, _util.createPromiseCapability)();
+    this.task = new RenderTask(this);
+    this._cancelBound = this.cancel.bind(this);
+    this._continueBound = this._continue.bind(this);
+    this._scheduleNextBound = this._scheduleNext.bind(this);
+    this._nextBound = this._next.bind(this);
+    this._canvas = params.canvasContext.canvas;
   }
 
-  return InternalRenderTask;
-}();
+  get completed() {
+    return this.capability.promise.catch(function () {});
+  }
 
-const version = '2.6.347';
+  initializeGraphics({
+    transparency = false,
+    optionalContentConfig
+  }) {
+    if (this.cancelled) {
+      return;
+    }
+
+    if (this._canvas) {
+      if (InternalRenderTask.#canvasInUse.has(this._canvas)) {
+        throw new Error("Cannot use the same canvas during multiple render() operations. " + "Use different canvas or ensure previous operations were " + "cancelled or completed.");
+      }
+
+      InternalRenderTask.#canvasInUse.add(this._canvas);
+    }
+
+    if (this._pdfBug && globalThis.StepperManager?.enabled) {
+      this.stepper = globalThis.StepperManager.create(this._pageIndex);
+      this.stepper.init(this.operatorList);
+      this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
+    }
+
+    const {
+      canvasContext,
+      viewport,
+      transform,
+      imageLayer,
+      background
+    } = this.params;
+    this.gfx = new _canvas.CanvasGraphics(canvasContext, this.commonObjs, this.objs, this.canvasFactory, imageLayer, optionalContentConfig, this.annotationCanvasMap, this.pageColors);
+    this.gfx.beginDrawing({
+      transform,
+      viewport,
+      transparency,
+      background
+    });
+    this.operatorListIdx = 0;
+    this.graphicsReady = true;
+
+    if (this.graphicsReadyCallback) {
+      this.graphicsReadyCallback();
+    }
+  }
+
+  cancel(error = null) {
+    this.running = false;
+    this.cancelled = true;
+
+    if (this.gfx) {
+      this.gfx.endDrawing();
+    }
+
+    if (this._canvas) {
+      InternalRenderTask.#canvasInUse.delete(this._canvas);
+    }
+
+    this.callback(error || new _display_utils.RenderingCancelledException(`Rendering cancelled, page ${this._pageIndex + 1}`, "canvas"));
+  }
+
+  operatorListChanged() {
+    if (!this.graphicsReady) {
+      if (!this.graphicsReadyCallback) {
+        this.graphicsReadyCallback = this._continueBound;
+      }
+
+      return;
+    }
+
+    if (this.stepper) {
+      this.stepper.updateOperatorList(this.operatorList);
+    }
+
+    if (this.running) {
+      return;
+    }
+
+    this._continue();
+  }
+
+  _continue() {
+    this.running = true;
+
+    if (this.cancelled) {
+      return;
+    }
+
+    if (this.task.onContinue) {
+      this.task.onContinue(this._scheduleNextBound);
+    } else {
+      this._scheduleNext();
+    }
+  }
+
+  _scheduleNext() {
+    if (this._useRequestAnimationFrame) {
+      window.requestAnimationFrame(() => {
+        this._nextBound().catch(this._cancelBound);
+      });
+    } else {
+      Promise.resolve().then(this._nextBound).catch(this._cancelBound);
+    }
+  }
+
+  async _next() {
+    if (this.cancelled) {
+      return;
+    }
+
+    this.operatorListIdx = this.gfx.executeOperatorList(this.operatorList, this.operatorListIdx, this._continueBound, this.stepper);
+
+    if (this.operatorListIdx === this.operatorList.argsArray.length) {
+      this.running = false;
+
+      if (this.operatorList.lastChunk) {
+        this.gfx.endDrawing();
+
+        if (this._canvas) {
+          InternalRenderTask.#canvasInUse.delete(this._canvas);
+        }
+
+        this.callback();
+      }
+    }
+  }
+
+}
+
+const version = '2.16.105';
 exports.version = version;
-const build = '3be9c65f';
+const build = '172ccdbe5';
 exports.build = build;
 
 /***/ }),
-/* 6 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 5 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.PrintAnnotationStorage = exports.AnnotationStorage = void 0;
+
+var _util = __w_pdfjs_require__(1);
+
+var _editor = __w_pdfjs_require__(6);
+
+var _murmurhash = __w_pdfjs_require__(10);
+
+class AnnotationStorage {
+  constructor() {
+    this._storage = new Map();
+    this._modified = false;
+    this.onSetModified = null;
+    this.onResetModified = null;
+    this.onAnnotationEditor = null;
+  }
+
+  getValue(key, defaultValue) {
+    const value = this._storage.get(key);
+
+    if (value === undefined) {
+      return defaultValue;
+    }
+
+    return Object.assign(defaultValue, value);
+  }
+
+  getRawValue(key) {
+    return this._storage.get(key);
+  }
+
+  remove(key) {
+    this._storage.delete(key);
+
+    if (this._storage.size === 0) {
+      this.resetModified();
+    }
+
+    if (typeof this.onAnnotationEditor === "function") {
+      for (const value of this._storage.values()) {
+        if (value instanceof _editor.AnnotationEditor) {
+          return;
+        }
+      }
+
+      this.onAnnotationEditor(null);
+    }
+  }
+
+  setValue(key, value) {
+    const obj = this._storage.get(key);
+
+    let modified = false;
+
+    if (obj !== undefined) {
+      for (const [entry, val] of Object.entries(value)) {
+        if (obj[entry] !== val) {
+          modified = true;
+          obj[entry] = val;
+        }
+      }
+    } else {
+      modified = true;
+
+      this._storage.set(key, value);
+    }
+
+    if (modified) {
+      this.#setModified();
+    }
+
+    if (value instanceof _editor.AnnotationEditor && typeof this.onAnnotationEditor === "function") {
+      this.onAnnotationEditor(value.constructor._type);
+    }
+  }
+
+  has(key) {
+    return this._storage.has(key);
+  }
+
+  getAll() {
+    return this._storage.size > 0 ? (0, _util.objectFromMap)(this._storage) : null;
+  }
+
+  get size() {
+    return this._storage.size;
+  }
+
+  #setModified() {
+    if (!this._modified) {
+      this._modified = true;
+
+      if (typeof this.onSetModified === "function") {
+        this.onSetModified();
+      }
+    }
+  }
+
+  resetModified() {
+    if (this._modified) {
+      this._modified = false;
+
+      if (typeof this.onResetModified === "function") {
+        this.onResetModified();
+      }
+    }
+  }
+
+  get print() {
+    return new PrintAnnotationStorage(this);
+  }
+
+  get serializable() {
+    if (this._storage.size === 0) {
+      return null;
+    }
+
+    const clone = new Map();
+
+    for (const [key, val] of this._storage) {
+      const serialized = val instanceof _editor.AnnotationEditor ? val.serialize() : val;
+
+      if (serialized) {
+        clone.set(key, serialized);
+      }
+    }
+
+    return clone;
+  }
+
+  static getHash(map) {
+    if (!map) {
+      return "";
+    }
+
+    const hash = new _murmurhash.MurmurHash3_64();
+
+    for (const [key, val] of map) {
+      hash.update(`${key}:${JSON.stringify(val)}`);
+    }
+
+    return hash.hexdigest();
+  }
+
+}
+
+exports.AnnotationStorage = AnnotationStorage;
+
+class PrintAnnotationStorage extends AnnotationStorage {
+  #serializable = null;
+
+  constructor(parent) {
+    super();
+    this.#serializable = structuredClone(parent.serializable);
+  }
+
+  get print() {
+    (0, _util.unreachable)("Should not call PrintAnnotationStorage.print");
+  }
+
+  get serializable() {
+    return this.#serializable;
+  }
+
+}
+
+exports.PrintAnnotationStorage = PrintAnnotationStorage;
+
+/***/ }),
+/* 6 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.AnnotationEditor = void 0;
+
+var _tools = __w_pdfjs_require__(7);
+
+var _util = __w_pdfjs_require__(1);
+
+class AnnotationEditor {
+  #boundFocusin = this.focusin.bind(this);
+  #boundFocusout = this.focusout.bind(this);
+  #hasBeenSelected = false;
+  #isEditing = false;
+  #isInEditMode = false;
+  #zIndex = AnnotationEditor._zIndex++;
+  static _colorManager = new _tools.ColorManager();
+  static _zIndex = 1;
+
+  constructor(parameters) {
+    if (this.constructor === AnnotationEditor) {
+      (0, _util.unreachable)("Cannot initialize AnnotationEditor.");
+    }
+
+    this.parent = parameters.parent;
+    this.id = parameters.id;
+    this.width = this.height = null;
+    this.pageIndex = parameters.parent.pageIndex;
+    this.name = parameters.name;
+    this.div = null;
+    const [width, height] = this.parent.viewportBaseDimensions;
+    this.x = parameters.x / width;
+    this.y = parameters.y / height;
+    this.rotation = this.parent.viewport.rotation;
+    this.isAttachedToDOM = false;
+  }
+
+  static get _defaultLineColor() {
+    return (0, _util.shadow)(this, "_defaultLineColor", this._colorManager.getHexCode("CanvasText"));
+  }
+
+  setInBackground() {
+    this.div.style.zIndex = 0;
+  }
+
+  setInForeground() {
+    this.div.style.zIndex = this.#zIndex;
+  }
+
+  focusin(event) {
+    if (!this.#hasBeenSelected) {
+      this.parent.setSelected(this);
+    } else {
+      this.#hasBeenSelected = false;
+    }
+  }
+
+  focusout(event) {
+    if (!this.isAttachedToDOM) {
+      return;
+    }
+
+    const target = event.relatedTarget;
+
+    if (target?.closest(`#${this.id}`)) {
+      return;
+    }
+
+    event.preventDefault();
+
+    if (!this.parent.isMultipleSelection) {
+      this.commitOrRemove();
+    }
+  }
+
+  commitOrRemove() {
+    if (this.isEmpty()) {
+      this.remove();
+    } else {
+      this.commit();
+    }
+  }
+
+  commit() {
+    this.parent.addToAnnotationStorage(this);
+  }
+
+  dragstart(event) {
+    const rect = this.parent.div.getBoundingClientRect();
+    this.startX = event.clientX - rect.x;
+    this.startY = event.clientY - rect.y;
+    event.dataTransfer.setData("text/plain", this.id);
+    event.dataTransfer.effectAllowed = "move";
+  }
+
+  setAt(x, y, tx, ty) {
+    const [width, height] = this.parent.viewportBaseDimensions;
+    [tx, ty] = this.screenToPageTranslation(tx, ty);
+    this.x = (x + tx) / width;
+    this.y = (y + ty) / height;
+    this.div.style.left = `${100 * this.x}%`;
+    this.div.style.top = `${100 * this.y}%`;
+  }
+
+  translate(x, y) {
+    const [width, height] = this.parent.viewportBaseDimensions;
+    [x, y] = this.screenToPageTranslation(x, y);
+    this.x += x / width;
+    this.y += y / height;
+    this.div.style.left = `${100 * this.x}%`;
+    this.div.style.top = `${100 * this.y}%`;
+  }
+
+  screenToPageTranslation(x, y) {
+    const {
+      rotation
+    } = this.parent.viewport;
+
+    switch (rotation) {
+      case 90:
+        return [y, -x];
+
+      case 180:
+        return [-x, -y];
+
+      case 270:
+        return [-y, x];
+
+      default:
+        return [x, y];
+    }
+  }
+
+  setDims(width, height) {
+    const [parentWidth, parentHeight] = this.parent.viewportBaseDimensions;
+    this.div.style.width = `${100 * width / parentWidth}%`;
+    this.div.style.height = `${100 * height / parentHeight}%`;
+  }
+
+  getInitialTranslation() {
+    return [0, 0];
+  }
+
+  render() {
+    this.div = document.createElement("div");
+    this.div.setAttribute("data-editor-rotation", (360 - this.rotation) % 360);
+    this.div.className = this.name;
+    this.div.setAttribute("id", this.id);
+    this.div.setAttribute("tabIndex", 0);
+    this.setInForeground();
+    this.div.addEventListener("focusin", this.#boundFocusin);
+    this.div.addEventListener("focusout", this.#boundFocusout);
+    const [tx, ty] = this.getInitialTranslation();
+    this.translate(tx, ty);
+    (0, _tools.bindEvents)(this, this.div, ["dragstart", "pointerdown"]);
+    return this.div;
+  }
+
+  pointerdown(event) {
+    const isMac = _tools.KeyboardManager.platform.isMac;
+
+    if (event.button !== 0 || event.ctrlKey && isMac) {
+      event.preventDefault();
+      return;
+    }
+
+    if (event.ctrlKey && !isMac || event.shiftKey || event.metaKey && isMac) {
+      this.parent.toggleSelected(this);
+    } else {
+      this.parent.setSelected(this);
+    }
+
+    this.#hasBeenSelected = true;
+  }
+
+  getRect(tx, ty) {
+    const [parentWidth, parentHeight] = this.parent.viewportBaseDimensions;
+    const [pageWidth, pageHeight] = this.parent.pageDimensions;
+    const shiftX = pageWidth * tx / parentWidth;
+    const shiftY = pageHeight * ty / parentHeight;
+    const x = this.x * pageWidth;
+    const y = this.y * pageHeight;
+    const width = this.width * pageWidth;
+    const height = this.height * pageHeight;
+
+    switch (this.rotation) {
+      case 0:
+        return [x + shiftX, pageHeight - y - shiftY - height, x + shiftX + width, pageHeight - y - shiftY];
+
+      case 90:
+        return [x + shiftY, pageHeight - y + shiftX, x + shiftY + height, pageHeight - y + shiftX + width];
+
+      case 180:
+        return [x - shiftX - width, pageHeight - y + shiftY, x - shiftX, pageHeight - y + shiftY + height];
+
+      case 270:
+        return [x - shiftY - height, pageHeight - y - shiftX - width, x - shiftY, pageHeight - y - shiftX];
+
+      default:
+        throw new Error("Invalid rotation");
+    }
+  }
+
+  getRectInCurrentCoords(rect, pageHeight) {
+    const [x1, y1, x2, y2] = rect;
+    const width = x2 - x1;
+    const height = y2 - y1;
+
+    switch (this.rotation) {
+      case 0:
+        return [x1, pageHeight - y2, width, height];
+
+      case 90:
+        return [x1, pageHeight - y1, height, width];
+
+      case 180:
+        return [x2, pageHeight - y1, width, height];
+
+      case 270:
+        return [x2, pageHeight - y2, height, width];
+
+      default:
+        throw new Error("Invalid rotation");
+    }
+  }
+
+  onceAdded() {}
+
+  isEmpty() {
+    return false;
+  }
+
+  enableEditMode() {
+    this.#isInEditMode = true;
+  }
+
+  disableEditMode() {
+    this.#isInEditMode = false;
+  }
+
+  isInEditMode() {
+    return this.#isInEditMode;
+  }
+
+  shouldGetKeyboardEvents() {
+    return false;
+  }
+
+  needsToBeRebuilt() {
+    return this.div && !this.isAttachedToDOM;
+  }
+
+  rebuild() {
+    this.div?.addEventListener("focusin", this.#boundFocusin);
+  }
+
+  serialize() {
+    (0, _util.unreachable)("An editor must be serializable");
+  }
+
+  static deserialize(data, parent) {
+    const editor = new this.prototype.constructor({
+      parent,
+      id: parent.getNextId()
+    });
+    editor.rotation = data.rotation;
+    const [pageWidth, pageHeight] = parent.pageDimensions;
+    const [x, y, width, height] = editor.getRectInCurrentCoords(data.rect, pageHeight);
+    editor.x = x / pageWidth;
+    editor.y = y / pageHeight;
+    editor.width = width / pageWidth;
+    editor.height = height / pageHeight;
+    return editor;
+  }
+
+  remove() {
+    this.div.removeEventListener("focusin", this.#boundFocusin);
+    this.div.removeEventListener("focusout", this.#boundFocusout);
+
+    if (!this.isEmpty()) {
+      this.commit();
+    }
+
+    this.parent.remove(this);
+  }
+
+  select() {
+    this.div?.classList.add("selectedEditor");
+  }
+
+  unselect() {
+    this.div?.classList.remove("selectedEditor");
+  }
+
+  updateParams(type, value) {}
+
+  disableEditing() {}
+
+  enableEditing() {}
+
+  get propertiesToUpdate() {
+    return {};
+  }
+
+  get contentDiv() {
+    return this.div;
+  }
+
+  get isEditing() {
+    return this.#isEditing;
+  }
+
+  set isEditing(value) {
+    this.#isEditing = value;
+
+    if (value) {
+      this.parent.setSelected(this);
+      this.parent.setActiveEditor(this);
+    } else {
+      this.parent.setActiveEditor(null);
+    }
+  }
+
+}
+
+exports.AnnotationEditor = AnnotationEditor;
+
+/***/ }),
+/* 7 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.KeyboardManager = exports.CommandManager = exports.ColorManager = exports.AnnotationEditorUIManager = void 0;
+exports.bindEvents = bindEvents;
+exports.opacityToHex = opacityToHex;
+
+var _util = __w_pdfjs_require__(1);
+
+var _display_utils = __w_pdfjs_require__(8);
+
+function bindEvents(obj, element, names) {
+  for (const name of names) {
+    element.addEventListener(name, obj[name].bind(obj));
+  }
+}
+
+function opacityToHex(opacity) {
+  return Math.round(Math.min(255, Math.max(1, 255 * opacity))).toString(16).padStart(2, "0");
+}
+
+class IdManager {
+  #id = 0;
+
+  getId() {
+    return `${_util.AnnotationEditorPrefix}${this.#id++}`;
+  }
+
+}
+
+class CommandManager {
+  #commands = [];
+  #locked = false;
+  #maxSize;
+  #position = -1;
+
+  constructor(maxSize = 128) {
+    this.#maxSize = maxSize;
+  }
+
+  add({
+    cmd,
+    undo,
+    mustExec,
+    type = NaN,
+    overwriteIfSameType = false,
+    keepUndo = false
+  }) {
+    if (mustExec) {
+      cmd();
+    }
+
+    if (this.#locked) {
+      return;
+    }
+
+    const save = {
+      cmd,
+      undo,
+      type
+    };
+
+    if (this.#position === -1) {
+      if (this.#commands.length > 0) {
+        this.#commands.length = 0;
+      }
+
+      this.#position = 0;
+      this.#commands.push(save);
+      return;
+    }
+
+    if (overwriteIfSameType && this.#commands[this.#position].type === type) {
+      if (keepUndo) {
+        save.undo = this.#commands[this.#position].undo;
+      }
+
+      this.#commands[this.#position] = save;
+      return;
+    }
+
+    const next = this.#position + 1;
+
+    if (next === this.#maxSize) {
+      this.#commands.splice(0, 1);
+    } else {
+      this.#position = next;
+
+      if (next < this.#commands.length) {
+        this.#commands.splice(next);
+      }
+    }
+
+    this.#commands.push(save);
+  }
+
+  undo() {
+    if (this.#position === -1) {
+      return;
+    }
+
+    this.#locked = true;
+    this.#commands[this.#position].undo();
+    this.#locked = false;
+    this.#position -= 1;
+  }
+
+  redo() {
+    if (this.#position < this.#commands.length - 1) {
+      this.#position += 1;
+      this.#locked = true;
+      this.#commands[this.#position].cmd();
+      this.#locked = false;
+    }
+  }
+
+  hasSomethingToUndo() {
+    return this.#position !== -1;
+  }
+
+  hasSomethingToRedo() {
+    return this.#position < this.#commands.length - 1;
+  }
+
+  destroy() {
+    this.#commands = null;
+  }
+
+}
+
+exports.CommandManager = CommandManager;
+
+class KeyboardManager {
+  constructor(callbacks) {
+    this.buffer = [];
+    this.callbacks = new Map();
+    this.allKeys = new Set();
+    const isMac = KeyboardManager.platform.isMac;
+
+    for (const [keys, callback] of callbacks) {
+      for (const key of keys) {
+        const isMacKey = key.startsWith("mac+");
+
+        if (isMac && isMacKey) {
+          this.callbacks.set(key.slice(4), callback);
+          this.allKeys.add(key.split("+").at(-1));
+        } else if (!isMac && !isMacKey) {
+          this.callbacks.set(key, callback);
+          this.allKeys.add(key.split("+").at(-1));
+        }
+      }
+    }
+  }
+
+  static get platform() {
+    const platform = typeof navigator !== "undefined" ? navigator.platform : "";
+    return (0, _util.shadow)(this, "platform", {
+      isWin: platform.includes("Win"),
+      isMac: platform.includes("Mac")
+    });
+  }
+
+  #serialize(event) {
+    if (event.altKey) {
+      this.buffer.push("alt");
+    }
+
+    if (event.ctrlKey) {
+      this.buffer.push("ctrl");
+    }
+
+    if (event.metaKey) {
+      this.buffer.push("meta");
+    }
+
+    if (event.shiftKey) {
+      this.buffer.push("shift");
+    }
+
+    this.buffer.push(event.key);
+    const str = this.buffer.join("+");
+    this.buffer.length = 0;
+    return str;
+  }
+
+  exec(self, event) {
+    if (!this.allKeys.has(event.key)) {
+      return;
+    }
+
+    const callback = this.callbacks.get(this.#serialize(event));
+
+    if (!callback) {
+      return;
+    }
+
+    callback.bind(self)();
+    event.stopPropagation();
+    event.preventDefault();
+  }
+
+}
+
+exports.KeyboardManager = KeyboardManager;
+
+class ClipboardManager {
+  #elements = null;
+
+  copy(element) {
+    if (!element) {
+      return;
+    }
+
+    if (Array.isArray(element)) {
+      this.#elements = element.map(el => el.serialize());
+    } else {
+      this.#elements = [element.serialize()];
+    }
+
+    this.#elements = this.#elements.filter(el => !!el);
+
+    if (this.#elements.length === 0) {
+      this.#elements = null;
+    }
+  }
+
+  paste() {
+    return this.#elements;
+  }
+
+  isEmpty() {
+    return this.#elements === null;
+  }
+
+  destroy() {
+    this.#elements = null;
+  }
+
+}
+
+class ColorManager {
+  static _colorsMapping = new Map([["CanvasText", [0, 0, 0]], ["Canvas", [255, 255, 255]]]);
+
+  get _colors() {
+    const colors = new Map([["CanvasText", null], ["Canvas", null]]);
+    (0, _display_utils.getColorValues)(colors);
+    return (0, _util.shadow)(this, "_colors", colors);
+  }
+
+  convert(color) {
+    const rgb = (0, _display_utils.getRGB)(color);
+
+    if (!window.matchMedia("(forced-colors: active)").matches) {
+      return rgb;
+    }
+
+    for (const [name, RGB] of this._colors) {
+      if (RGB.every((x, i) => x === rgb[i])) {
+        return ColorManager._colorsMapping.get(name);
+      }
+    }
+
+    return rgb;
+  }
+
+  getHexCode(name) {
+    const rgb = this._colors.get(name);
+
+    if (!rgb) {
+      return name;
+    }
+
+    return _util.Util.makeHexColor(...rgb);
+  }
+
+}
+
+exports.ColorManager = ColorManager;
+
+class AnnotationEditorUIManager {
+  #activeEditor = null;
+  #allEditors = new Map();
+  #allLayers = new Map();
+  #clipboardManager = new ClipboardManager();
+  #commandManager = new CommandManager();
+  #currentPageIndex = 0;
+  #editorTypes = null;
+  #eventBus = null;
+  #idManager = new IdManager();
+  #isEnabled = false;
+  #mode = _util.AnnotationEditorType.NONE;
+  #selectedEditors = new Set();
+  #boundKeydown = this.keydown.bind(this);
+  #boundOnEditingAction = this.onEditingAction.bind(this);
+  #boundOnPageChanging = this.onPageChanging.bind(this);
+  #previousStates = {
+    isEditing: false,
+    isEmpty: true,
+    hasEmptyClipboard: true,
+    hasSomethingToUndo: false,
+    hasSomethingToRedo: false,
+    hasSelectedEditor: false
+  };
+  #container = null;
+  static _keyboardManager = new KeyboardManager([[["ctrl+a", "mac+meta+a"], AnnotationEditorUIManager.prototype.selectAll], [["ctrl+c", "mac+meta+c"], AnnotationEditorUIManager.prototype.copy], [["ctrl+v", "mac+meta+v"], AnnotationEditorUIManager.prototype.paste], [["ctrl+x", "mac+meta+x"], AnnotationEditorUIManager.prototype.cut], [["ctrl+z", "mac+meta+z"], AnnotationEditorUIManager.prototype.undo], [["ctrl+y", "ctrl+shift+Z", "mac+meta+shift+Z"], AnnotationEditorUIManager.prototype.redo], [["Backspace", "alt+Backspace", "ctrl+Backspace", "shift+Backspace", "mac+Backspace", "mac+alt+Backspace", "mac+ctrl+Backspace", "Delete", "ctrl+Delete", "shift+Delete"], AnnotationEditorUIManager.prototype.delete], [["Escape", "mac+Escape"], AnnotationEditorUIManager.prototype.unselectAll]]);
+
+  constructor(container, eventBus) {
+    this.#container = container;
+    this.#eventBus = eventBus;
+
+    this.#eventBus._on("editingaction", this.#boundOnEditingAction);
+
+    this.#eventBus._on("pagechanging", this.#boundOnPageChanging);
+  }
+
+  destroy() {
+    this.#removeKeyboardManager();
+
+    this.#eventBus._off("editingaction", this.#boundOnEditingAction);
+
+    this.#eventBus._off("pagechanging", this.#boundOnPageChanging);
+
+    for (const layer of this.#allLayers.values()) {
+      layer.destroy();
+    }
+
+    this.#allLayers.clear();
+    this.#allEditors.clear();
+    this.#activeEditor = null;
+    this.#selectedEditors.clear();
+    this.#clipboardManager.destroy();
+    this.#commandManager.destroy();
+  }
+
+  onPageChanging({
+    pageNumber
+  }) {
+    this.#currentPageIndex = pageNumber - 1;
+  }
+
+  focusMainContainer() {
+    this.#container.focus();
+  }
+
+  #addKeyboardManager() {
+    this.#container.addEventListener("keydown", this.#boundKeydown);
+  }
+
+  #removeKeyboardManager() {
+    this.#container.removeEventListener("keydown", this.#boundKeydown);
+  }
+
+  keydown(event) {
+    if (!this.getActive()?.shouldGetKeyboardEvents()) {
+      AnnotationEditorUIManager._keyboardManager.exec(this, event);
+    }
+  }
+
+  onEditingAction(details) {
+    if (["undo", "redo", "cut", "copy", "paste", "delete", "selectAll"].includes(details.name)) {
+      this[details.name]();
+    }
+  }
+
+  #dispatchUpdateStates(details) {
+    const hasChanged = Object.entries(details).some(([key, value]) => this.#previousStates[key] !== value);
+
+    if (hasChanged) {
+      this.#eventBus.dispatch("annotationeditorstateschanged", {
+        source: this,
+        details: Object.assign(this.#previousStates, details)
+      });
+    }
+  }
+
+  #dispatchUpdateUI(details) {
+    this.#eventBus.dispatch("annotationeditorparamschanged", {
+      source: this,
+      details
+    });
+  }
+
+  setEditingState(isEditing) {
+    if (isEditing) {
+      this.#addKeyboardManager();
+      this.#dispatchUpdateStates({
+        isEditing: this.#mode !== _util.AnnotationEditorType.NONE,
+        isEmpty: this.#isEmpty(),
+        hasSomethingToUndo: this.#commandManager.hasSomethingToUndo(),
+        hasSomethingToRedo: this.#commandManager.hasSomethingToRedo(),
+        hasSelectedEditor: false,
+        hasEmptyClipboard: this.#clipboardManager.isEmpty()
+      });
+    } else {
+      this.#removeKeyboardManager();
+      this.#dispatchUpdateStates({
+        isEditing: false
+      });
+    }
+  }
+
+  registerEditorTypes(types) {
+    this.#editorTypes = types;
+
+    for (const editorType of this.#editorTypes) {
+      this.#dispatchUpdateUI(editorType.defaultPropertiesToUpdate);
+    }
+  }
+
+  getId() {
+    return this.#idManager.getId();
+  }
+
+  addLayer(layer) {
+    this.#allLayers.set(layer.pageIndex, layer);
+
+    if (this.#isEnabled) {
+      layer.enable();
+    } else {
+      layer.disable();
+    }
+  }
+
+  removeLayer(layer) {
+    this.#allLayers.delete(layer.pageIndex);
+  }
+
+  updateMode(mode) {
+    this.#mode = mode;
+
+    if (mode === _util.AnnotationEditorType.NONE) {
+      this.setEditingState(false);
+      this.#disableAll();
+    } else {
+      this.setEditingState(true);
+      this.#enableAll();
+
+      for (const layer of this.#allLayers.values()) {
+        layer.updateMode(mode);
+      }
+    }
+  }
+
+  updateToolbar(mode) {
+    if (mode === this.#mode) {
+      return;
+    }
+
+    this.#eventBus.dispatch("switchannotationeditormode", {
+      source: this,
+      mode
+    });
+  }
+
+  updateParams(type, value) {
+    for (const editor of this.#selectedEditors) {
+      editor.updateParams(type, value);
+    }
+
+    for (const editorType of this.#editorTypes) {
+      editorType.updateDefaultParams(type, value);
+    }
+  }
+
+  #enableAll() {
+    if (!this.#isEnabled) {
+      this.#isEnabled = true;
+
+      for (const layer of this.#allLayers.values()) {
+        layer.enable();
+      }
+    }
+  }
+
+  #disableAll() {
+    this.unselectAll();
+
+    if (this.#isEnabled) {
+      this.#isEnabled = false;
+
+      for (const layer of this.#allLayers.values()) {
+        layer.disable();
+      }
+    }
+  }
+
+  getEditors(pageIndex) {
+    const editors = [];
+
+    for (const editor of this.#allEditors.values()) {
+      if (editor.pageIndex === pageIndex) {
+        editors.push(editor);
+      }
+    }
+
+    return editors;
+  }
+
+  getEditor(id) {
+    return this.#allEditors.get(id);
+  }
+
+  addEditor(editor) {
+    this.#allEditors.set(editor.id, editor);
+  }
+
+  removeEditor(editor) {
+    this.#allEditors.delete(editor.id);
+    this.unselect(editor);
+  }
+
+  #addEditorToLayer(editor) {
+    const layer = this.#allLayers.get(editor.pageIndex);
+
+    if (layer) {
+      layer.addOrRebuild(editor);
+    } else {
+      this.addEditor(editor);
+    }
+  }
+
+  setActiveEditor(editor) {
+    if (this.#activeEditor === editor) {
+      return;
+    }
+
+    this.#activeEditor = editor;
+
+    if (editor) {
+      this.#dispatchUpdateUI(editor.propertiesToUpdate);
+    }
+  }
+
+  toggleSelected(editor) {
+    if (this.#selectedEditors.has(editor)) {
+      this.#selectedEditors.delete(editor);
+      editor.unselect();
+      this.#dispatchUpdateStates({
+        hasSelectedEditor: this.hasSelection
+      });
+      return;
+    }
+
+    this.#selectedEditors.add(editor);
+    editor.select();
+    this.#dispatchUpdateUI(editor.propertiesToUpdate);
+    this.#dispatchUpdateStates({
+      hasSelectedEditor: true
+    });
+  }
+
+  setSelected(editor) {
+    for (const ed of this.#selectedEditors) {
+      if (ed !== editor) {
+        ed.unselect();
+      }
+    }
+
+    this.#selectedEditors.clear();
+    this.#selectedEditors.add(editor);
+    editor.select();
+    this.#dispatchUpdateUI(editor.propertiesToUpdate);
+    this.#dispatchUpdateStates({
+      hasSelectedEditor: true
+    });
+  }
+
+  isSelected(editor) {
+    return this.#selectedEditors.has(editor);
+  }
+
+  unselect(editor) {
+    editor.unselect();
+    this.#selectedEditors.delete(editor);
+    this.#dispatchUpdateStates({
+      hasSelectedEditor: this.hasSelection
+    });
+  }
+
+  get hasSelection() {
+    return this.#selectedEditors.size !== 0;
+  }
+
+  undo() {
+    this.#commandManager.undo();
+    this.#dispatchUpdateStates({
+      hasSomethingToUndo: this.#commandManager.hasSomethingToUndo(),
+      hasSomethingToRedo: true,
+      isEmpty: this.#isEmpty()
+    });
+  }
+
+  redo() {
+    this.#commandManager.redo();
+    this.#dispatchUpdateStates({
+      hasSomethingToUndo: true,
+      hasSomethingToRedo: this.#commandManager.hasSomethingToRedo(),
+      isEmpty: this.#isEmpty()
+    });
+  }
+
+  addCommands(params) {
+    this.#commandManager.add(params);
+    this.#dispatchUpdateStates({
+      hasSomethingToUndo: true,
+      hasSomethingToRedo: false,
+      isEmpty: this.#isEmpty()
+    });
+  }
+
+  #isEmpty() {
+    if (this.#allEditors.size === 0) {
+      return true;
+    }
+
+    if (this.#allEditors.size === 1) {
+      for (const editor of this.#allEditors.values()) {
+        return editor.isEmpty();
+      }
+    }
+
+    return false;
+  }
+
+  delete() {
+    if (this.#activeEditor) {
+      this.#activeEditor.commitOrRemove();
+    }
+
+    if (!this.hasSelection) {
+      return;
+    }
+
+    const editors = [...this.#selectedEditors];
+
+    const cmd = () => {
+      for (const editor of editors) {
+        editor.remove();
+      }
+    };
+
+    const undo = () => {
+      for (const editor of editors) {
+        this.#addEditorToLayer(editor);
+      }
+    };
+
+    this.addCommands({
+      cmd,
+      undo,
+      mustExec: true
+    });
+  }
+
+  copy() {
+    if (this.#activeEditor) {
+      this.#activeEditor.commitOrRemove();
+    }
+
+    if (this.hasSelection) {
+      const editors = [];
+
+      for (const editor of this.#selectedEditors) {
+        if (!editor.isEmpty()) {
+          editors.push(editor);
+        }
+      }
+
+      if (editors.length === 0) {
+        return;
+      }
+
+      this.#clipboardManager.copy(editors);
+      this.#dispatchUpdateStates({
+        hasEmptyClipboard: false
+      });
+    }
+  }
+
+  cut() {
+    this.copy();
+    this.delete();
+  }
+
+  paste() {
+    if (this.#clipboardManager.isEmpty()) {
+      return;
+    }
+
+    this.unselectAll();
+    const layer = this.#allLayers.get(this.#currentPageIndex);
+    const newEditors = this.#clipboardManager.paste().map(data => layer.deserialize(data));
+
+    const cmd = () => {
+      for (const editor of newEditors) {
+        this.#addEditorToLayer(editor);
+      }
+
+      this.#selectEditors(newEditors);
+    };
+
+    const undo = () => {
+      for (const editor of newEditors) {
+        editor.remove();
+      }
+    };
+
+    this.addCommands({
+      cmd,
+      undo,
+      mustExec: true
+    });
+  }
+
+  #selectEditors(editors) {
+    this.#selectedEditors.clear();
+
+    for (const editor of editors) {
+      if (editor.isEmpty()) {
+        continue;
+      }
+
+      this.#selectedEditors.add(editor);
+      editor.select();
+    }
+
+    this.#dispatchUpdateStates({
+      hasSelectedEditor: true
+    });
+  }
+
+  selectAll() {
+    for (const editor of this.#selectedEditors) {
+      editor.commit();
+    }
+
+    this.#selectEditors(this.#allEditors.values());
+  }
+
+  unselectAll() {
+    if (this.#activeEditor) {
+      this.#activeEditor.commitOrRemove();
+      return;
+    }
+
+    if (this.#selectEditors.size === 0) {
+      return;
+    }
+
+    for (const editor of this.#selectedEditors) {
+      editor.unselect();
+    }
+
+    this.#selectedEditors.clear();
+    this.#dispatchUpdateStates({
+      hasSelectedEditor: false
+    });
+  }
+
+  isActive(editor) {
+    return this.#activeEditor === editor;
+  }
+
+  getActive() {
+    return this.#activeEditor;
+  }
+
+  getMode() {
+    return this.#mode;
+  }
+
+}
+
+exports.AnnotationEditorUIManager = AnnotationEditorUIManager;
+
+/***/ }),
+/* 8 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.StatTimer = exports.RenderingCancelledException = exports.PixelsPerInch = exports.PageViewport = exports.PDFDateString = exports.DOMStandardFontDataFactory = exports.DOMSVGFactory = exports.DOMCanvasFactory = exports.DOMCMapReaderFactory = exports.AnnotationPrefix = void 0;
+exports.deprecated = deprecated;
+exports.getColorValues = getColorValues;
+exports.getCurrentTransform = getCurrentTransform;
+exports.getCurrentTransformInverse = getCurrentTransformInverse;
+exports.getFilenameFromUrl = getFilenameFromUrl;
+exports.getPdfFilenameFromUrl = getPdfFilenameFromUrl;
+exports.getRGB = getRGB;
+exports.getXfaPageViewport = getXfaPageViewport;
+exports.isDataScheme = isDataScheme;
+exports.isPdfFile = isPdfFile;
+exports.isValidFetchUrl = isValidFetchUrl;
+exports.loadScript = loadScript;
+
+var _base_factory = __w_pdfjs_require__(9);
+
+var _util = __w_pdfjs_require__(1);
+
+const SVG_NS = "http://www.w3.org/2000/svg";
+const AnnotationPrefix = "pdfjs_internal_id_";
+exports.AnnotationPrefix = AnnotationPrefix;
+
+class PixelsPerInch {
+  static CSS = 96.0;
+  static PDF = 72.0;
+  static PDF_TO_CSS_UNITS = this.CSS / this.PDF;
+}
+
+exports.PixelsPerInch = PixelsPerInch;
+
+class DOMCanvasFactory extends _base_factory.BaseCanvasFactory {
+  constructor({
+    ownerDocument = globalThis.document
+  } = {}) {
+    super();
+    this._document = ownerDocument;
+  }
+
+  _createCanvas(width, height) {
+    const canvas = this._document.createElement("canvas");
+
+    canvas.width = width;
+    canvas.height = height;
+    return canvas;
+  }
+
+}
+
+exports.DOMCanvasFactory = DOMCanvasFactory;
+
+async function fetchData(url, asTypedArray = false) {
+  if (isValidFetchUrl(url, document.baseURI)) {
+    const response = await fetch(url);
+
+    if (!response.ok) {
+      throw new Error(response.statusText);
+    }
+
+    return asTypedArray ? new Uint8Array(await response.arrayBuffer()) : (0, _util.stringToBytes)(await response.text());
+  }
+
+  return new Promise((resolve, reject) => {
+    const request = new XMLHttpRequest();
+    request.open("GET", url, true);
+
+    if (asTypedArray) {
+      request.responseType = "arraybuffer";
+    }
+
+    request.onreadystatechange = () => {
+      if (request.readyState !== XMLHttpRequest.DONE) {
+        return;
+      }
+
+      if (request.status === 200 || request.status === 0) {
+        let data;
+
+        if (asTypedArray && request.response) {
+          data = new Uint8Array(request.response);
+        } else if (!asTypedArray && request.responseText) {
+          data = (0, _util.stringToBytes)(request.responseText);
+        }
+
+        if (data) {
+          resolve(data);
+          return;
+        }
+      }
+
+      reject(new Error(request.statusText));
+    };
+
+    request.send(null);
+  });
+}
+
+class DOMCMapReaderFactory extends _base_factory.BaseCMapReaderFactory {
+  _fetchData(url, compressionType) {
+    return fetchData(url, this.isCompressed).then(data => {
+      return {
+        cMapData: data,
+        compressionType
+      };
+    });
+  }
+
+}
+
+exports.DOMCMapReaderFactory = DOMCMapReaderFactory;
+
+class DOMStandardFontDataFactory extends _base_factory.BaseStandardFontDataFactory {
+  _fetchData(url) {
+    return fetchData(url, true);
+  }
+
+}
+
+exports.DOMStandardFontDataFactory = DOMStandardFontDataFactory;
+
+class DOMSVGFactory extends _base_factory.BaseSVGFactory {
+  _createSVG(type) {
+    return document.createElementNS(SVG_NS, type);
+  }
+
+}
+
+exports.DOMSVGFactory = DOMSVGFactory;
+
+class PageViewport {
+  constructor({
+    viewBox,
+    scale,
+    rotation,
+    offsetX = 0,
+    offsetY = 0,
+    dontFlip = false
+  }) {
+    this.viewBox = viewBox;
+    this.scale = scale;
+    this.rotation = rotation;
+    this.offsetX = offsetX;
+    this.offsetY = offsetY;
+    const centerX = (viewBox[2] + viewBox[0]) / 2;
+    const centerY = (viewBox[3] + viewBox[1]) / 2;
+    let rotateA, rotateB, rotateC, rotateD;
+    rotation %= 360;
+
+    if (rotation < 0) {
+      rotation += 360;
+    }
+
+    switch (rotation) {
+      case 180:
+        rotateA = -1;
+        rotateB = 0;
+        rotateC = 0;
+        rotateD = 1;
+        break;
+
+      case 90:
+        rotateA = 0;
+        rotateB = 1;
+        rotateC = 1;
+        rotateD = 0;
+        break;
+
+      case 270:
+        rotateA = 0;
+        rotateB = -1;
+        rotateC = -1;
+        rotateD = 0;
+        break;
+
+      case 0:
+        rotateA = 1;
+        rotateB = 0;
+        rotateC = 0;
+        rotateD = -1;
+        break;
+
+      default:
+        throw new Error("PageViewport: Invalid rotation, must be a multiple of 90 degrees.");
+    }
+
+    if (dontFlip) {
+      rotateC = -rotateC;
+      rotateD = -rotateD;
+    }
+
+    let offsetCanvasX, offsetCanvasY;
+    let width, height;
+
+    if (rotateA === 0) {
+      offsetCanvasX = Math.abs(centerY - viewBox[1]) * scale + offsetX;
+      offsetCanvasY = Math.abs(centerX - viewBox[0]) * scale + offsetY;
+      width = Math.abs(viewBox[3] - viewBox[1]) * scale;
+      height = Math.abs(viewBox[2] - viewBox[0]) * scale;
+    } else {
+      offsetCanvasX = Math.abs(centerX - viewBox[0]) * scale + offsetX;
+      offsetCanvasY = Math.abs(centerY - viewBox[1]) * scale + offsetY;
+      width = Math.abs(viewBox[2] - viewBox[0]) * scale;
+      height = Math.abs(viewBox[3] - viewBox[1]) * scale;
+    }
+
+    this.transform = [rotateA * scale, rotateB * scale, rotateC * scale, rotateD * scale, offsetCanvasX - rotateA * scale * centerX - rotateC * scale * centerY, offsetCanvasY - rotateB * scale * centerX - rotateD * scale * centerY];
+    this.width = width;
+    this.height = height;
+  }
+
+  clone({
+    scale = this.scale,
+    rotation = this.rotation,
+    offsetX = this.offsetX,
+    offsetY = this.offsetY,
+    dontFlip = false
+  } = {}) {
+    return new PageViewport({
+      viewBox: this.viewBox.slice(),
+      scale,
+      rotation,
+      offsetX,
+      offsetY,
+      dontFlip
+    });
+  }
+
+  convertToViewportPoint(x, y) {
+    return _util.Util.applyTransform([x, y], this.transform);
+  }
+
+  convertToViewportRectangle(rect) {
+    const topLeft = _util.Util.applyTransform([rect[0], rect[1]], this.transform);
+
+    const bottomRight = _util.Util.applyTransform([rect[2], rect[3]], this.transform);
+
+    return [topLeft[0], topLeft[1], bottomRight[0], bottomRight[1]];
+  }
+
+  convertToPdfPoint(x, y) {
+    return _util.Util.applyInverseTransform([x, y], this.transform);
+  }
+
+}
+
+exports.PageViewport = PageViewport;
+
+class RenderingCancelledException extends _util.BaseException {
+  constructor(msg, type) {
+    super(msg, "RenderingCancelledException");
+    this.type = type;
+  }
+
+}
+
+exports.RenderingCancelledException = RenderingCancelledException;
+
+function isDataScheme(url) {
+  const ii = url.length;
+  let i = 0;
+
+  while (i < ii && url[i].trim() === "") {
+    i++;
+  }
+
+  return url.substring(i, i + 5).toLowerCase() === "data:";
+}
+
+function isPdfFile(filename) {
+  return typeof filename === "string" && /\.pdf$/i.test(filename);
+}
+
+function getFilenameFromUrl(url) {
+  const anchor = url.indexOf("#");
+  const query = url.indexOf("?");
+  const end = Math.min(anchor > 0 ? anchor : url.length, query > 0 ? query : url.length);
+  return url.substring(url.lastIndexOf("/", end) + 1, end);
+}
+
+function getPdfFilenameFromUrl(url, defaultFilename = "document.pdf") {
+  if (typeof url !== "string") {
+    return defaultFilename;
+  }
+
+  if (isDataScheme(url)) {
+    (0, _util.warn)('getPdfFilenameFromUrl: ignore "data:"-URL for performance reasons.');
+    return defaultFilename;
+  }
+
+  const reURI = /^(?:(?:[^:]+:)?\/\/[^/]+)?([^?#]*)(\?[^#]*)?(#.*)?$/;
+  const reFilename = /[^/?#=]+\.pdf\b(?!.*\.pdf\b)/i;
+  const splitURI = reURI.exec(url);
+  let suggestedFilename = reFilename.exec(splitURI[1]) || reFilename.exec(splitURI[2]) || reFilename.exec(splitURI[3]);
+
+  if (suggestedFilename) {
+    suggestedFilename = suggestedFilename[0];
+
+    if (suggestedFilename.includes("%")) {
+      try {
+        suggestedFilename = reFilename.exec(decodeURIComponent(suggestedFilename))[0];
+      } catch (ex) {}
+    }
+  }
+
+  return suggestedFilename || defaultFilename;
+}
+
+class StatTimer {
+  constructor() {
+    this.started = Object.create(null);
+    this.times = [];
+  }
+
+  time(name) {
+    if (name in this.started) {
+      (0, _util.warn)(`Timer is already running for ${name}`);
+    }
+
+    this.started[name] = Date.now();
+  }
+
+  timeEnd(name) {
+    if (!(name in this.started)) {
+      (0, _util.warn)(`Timer has not been started for ${name}`);
+    }
+
+    this.times.push({
+      name,
+      start: this.started[name],
+      end: Date.now()
+    });
+    delete this.started[name];
+  }
+
+  toString() {
+    const outBuf = [];
+    let longest = 0;
+
+    for (const time of this.times) {
+      const name = time.name;
+
+      if (name.length > longest) {
+        longest = name.length;
+      }
+    }
+
+    for (const time of this.times) {
+      const duration = time.end - time.start;
+      outBuf.push(`${time.name.padEnd(longest)} ${duration}ms\n`);
+    }
+
+    return outBuf.join("");
+  }
+
+}
+
+exports.StatTimer = StatTimer;
+
+function isValidFetchUrl(url, baseUrl) {
+  try {
+    const {
+      protocol
+    } = baseUrl ? new URL(url, baseUrl) : new URL(url);
+    return protocol === "http:" || protocol === "https:";
+  } catch (ex) {
+    return false;
+  }
+}
+
+function loadScript(src, removeScriptElement = false) {
+  return new Promise((resolve, reject) => {
+    const script = document.createElement("script");
+    script.src = src;
+
+    script.onload = function (evt) {
+      if (removeScriptElement) {
+        script.remove();
+      }
+
+      resolve(evt);
+    };
+
+    script.onerror = function () {
+      reject(new Error(`Cannot load script at: ${script.src}`));
+    };
+
+    (document.head || document.documentElement).append(script);
+  });
+}
+
+function deprecated(details) {
+  console.log("Deprecated API usage: " + details);
+}
+
+let pdfDateStringRegex;
+
+class PDFDateString {
+  static toDateObject(input) {
+    if (!input || typeof input !== "string") {
+      return null;
+    }
+
+    if (!pdfDateStringRegex) {
+      pdfDateStringRegex = new RegExp("^D:" + "(\\d{4})" + "(\\d{2})?" + "(\\d{2})?" + "(\\d{2})?" + "(\\d{2})?" + "(\\d{2})?" + "([Z|+|-])?" + "(\\d{2})?" + "'?" + "(\\d{2})?" + "'?");
+    }
+
+    const matches = pdfDateStringRegex.exec(input);
+
+    if (!matches) {
+      return null;
+    }
+
+    const year = parseInt(matches[1], 10);
+    let month = parseInt(matches[2], 10);
+    month = month >= 1 && month <= 12 ? month - 1 : 0;
+    let day = parseInt(matches[3], 10);
+    day = day >= 1 && day <= 31 ? day : 1;
+    let hour = parseInt(matches[4], 10);
+    hour = hour >= 0 && hour <= 23 ? hour : 0;
+    let minute = parseInt(matches[5], 10);
+    minute = minute >= 0 && minute <= 59 ? minute : 0;
+    let second = parseInt(matches[6], 10);
+    second = second >= 0 && second <= 59 ? second : 0;
+    const universalTimeRelation = matches[7] || "Z";
+    let offsetHour = parseInt(matches[8], 10);
+    offsetHour = offsetHour >= 0 && offsetHour <= 23 ? offsetHour : 0;
+    let offsetMinute = parseInt(matches[9], 10) || 0;
+    offsetMinute = offsetMinute >= 0 && offsetMinute <= 59 ? offsetMinute : 0;
+
+    if (universalTimeRelation === "-") {
+      hour += offsetHour;
+      minute += offsetMinute;
+    } else if (universalTimeRelation === "+") {
+      hour -= offsetHour;
+      minute -= offsetMinute;
+    }
+
+    return new Date(Date.UTC(year, month, day, hour, minute, second));
+  }
+
+}
+
+exports.PDFDateString = PDFDateString;
+
+function getXfaPageViewport(xfaPage, {
+  scale = 1,
+  rotation = 0
+}) {
+  const {
+    width,
+    height
+  } = xfaPage.attributes.style;
+  const viewBox = [0, 0, parseInt(width), parseInt(height)];
+  return new PageViewport({
+    viewBox,
+    scale,
+    rotation
+  });
+}
+
+function getRGB(color) {
+  if (color.startsWith("#")) {
+    const colorRGB = parseInt(color.slice(1), 16);
+    return [(colorRGB & 0xff0000) >> 16, (colorRGB & 0x00ff00) >> 8, colorRGB & 0x0000ff];
+  }
+
+  if (color.startsWith("rgb(")) {
+    return color.slice(4, -1).split(",").map(x => parseInt(x));
+  }
+
+  if (color.startsWith("rgba(")) {
+    return color.slice(5, -1).split(",").map(x => parseInt(x)).slice(0, 3);
+  }
+
+  (0, _util.warn)(`Not a valid color format: "${color}"`);
+  return [0, 0, 0];
+}
+
+function getColorValues(colors) {
+  const span = document.createElement("span");
+  span.style.visibility = "hidden";
+  document.body.append(span);
+
+  for (const name of colors.keys()) {
+    span.style.color = name;
+    const computedColor = window.getComputedStyle(span).color;
+    colors.set(name, getRGB(computedColor));
+  }
+
+  span.remove();
+}
+
+function getCurrentTransform(ctx) {
+  const {
+    a,
+    b,
+    c,
+    d,
+    e,
+    f
+  } = ctx.getTransform();
+  return [a, b, c, d, e, f];
+}
+
+function getCurrentTransformInverse(ctx) {
+  const {
+    a,
+    b,
+    c,
+    d,
+    e,
+    f
+  } = ctx.getTransform().invertSelf();
+  return [a, b, c, d, e, f];
+}
+
+/***/ }),
+/* 9 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.BaseStandardFontDataFactory = exports.BaseSVGFactory = exports.BaseCanvasFactory = exports.BaseCMapReaderFactory = void 0;
+
+var _util = __w_pdfjs_require__(1);
+
+class BaseCanvasFactory {
+  constructor() {
+    if (this.constructor === BaseCanvasFactory) {
+      (0, _util.unreachable)("Cannot initialize BaseCanvasFactory.");
+    }
+  }
+
+  create(width, height) {
+    if (width <= 0 || height <= 0) {
+      throw new Error("Invalid canvas size");
+    }
+
+    const canvas = this._createCanvas(width, height);
+
+    return {
+      canvas,
+      context: canvas.getContext("2d")
+    };
+  }
+
+  reset(canvasAndContext, width, height) {
+    if (!canvasAndContext.canvas) {
+      throw new Error("Canvas is not specified");
+    }
+
+    if (width <= 0 || height <= 0) {
+      throw new Error("Invalid canvas size");
+    }
+
+    canvasAndContext.canvas.width = width;
+    canvasAndContext.canvas.height = height;
+  }
+
+  destroy(canvasAndContext) {
+    if (!canvasAndContext.canvas) {
+      throw new Error("Canvas is not specified");
+    }
+
+    canvasAndContext.canvas.width = 0;
+    canvasAndContext.canvas.height = 0;
+    canvasAndContext.canvas = null;
+    canvasAndContext.context = null;
+  }
+
+  _createCanvas(width, height) {
+    (0, _util.unreachable)("Abstract method `_createCanvas` called.");
+  }
+
+}
+
+exports.BaseCanvasFactory = BaseCanvasFactory;
+
+class BaseCMapReaderFactory {
+  constructor({
+    baseUrl = null,
+    isCompressed = false
+  }) {
+    if (this.constructor === BaseCMapReaderFactory) {
+      (0, _util.unreachable)("Cannot initialize BaseCMapReaderFactory.");
+    }
+
+    this.baseUrl = baseUrl;
+    this.isCompressed = isCompressed;
+  }
+
+  async fetch({
+    name
+  }) {
+    if (!this.baseUrl) {
+      throw new Error('The CMap "baseUrl" parameter must be specified, ensure that ' + 'the "cMapUrl" and "cMapPacked" API parameters are provided.');
+    }
+
+    if (!name) {
+      throw new Error("CMap name must be specified.");
+    }
+
+    const url = this.baseUrl + name + (this.isCompressed ? ".bcmap" : "");
+    const compressionType = this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE;
+    return this._fetchData(url, compressionType).catch(reason => {
+      throw new Error(`Unable to load ${this.isCompressed ? "binary " : ""}CMap at: ${url}`);
+    });
+  }
+
+  _fetchData(url, compressionType) {
+    (0, _util.unreachable)("Abstract method `_fetchData` called.");
+  }
+
+}
+
+exports.BaseCMapReaderFactory = BaseCMapReaderFactory;
+
+class BaseStandardFontDataFactory {
+  constructor({
+    baseUrl = null
+  }) {
+    if (this.constructor === BaseStandardFontDataFactory) {
+      (0, _util.unreachable)("Cannot initialize BaseStandardFontDataFactory.");
+    }
+
+    this.baseUrl = baseUrl;
+  }
+
+  async fetch({
+    filename
+  }) {
+    if (!this.baseUrl) {
+      throw new Error('The standard font "baseUrl" parameter must be specified, ensure that ' + 'the "standardFontDataUrl" API parameter is provided.');
+    }
+
+    if (!filename) {
+      throw new Error("Font filename must be specified.");
+    }
+
+    const url = `${this.baseUrl}${filename}`;
+    return this._fetchData(url).catch(reason => {
+      throw new Error(`Unable to load font data at: ${url}`);
+    });
+  }
+
+  _fetchData(url) {
+    (0, _util.unreachable)("Abstract method `_fetchData` called.");
+  }
+
+}
+
+exports.BaseStandardFontDataFactory = BaseStandardFontDataFactory;
+
+class BaseSVGFactory {
+  constructor() {
+    if (this.constructor === BaseSVGFactory) {
+      (0, _util.unreachable)("Cannot initialize BaseSVGFactory.");
+    }
+  }
+
+  create(width, height, skipDimensions = false) {
+    if (width <= 0 || height <= 0) {
+      throw new Error("Invalid SVG dimensions");
+    }
+
+    const svg = this._createSVG("svg:svg");
+
+    svg.setAttribute("version", "1.1");
+
+    if (!skipDimensions) {
+      svg.setAttribute("width", `${width}px`);
+      svg.setAttribute("height", `${height}px`);
+    }
+
+    svg.setAttribute("preserveAspectRatio", "none");
+    svg.setAttribute("viewBox", `0 0 ${width} ${height}`);
+    return svg;
+  }
+
+  createElement(type) {
+    if (typeof type !== "string") {
+      throw new Error("Invalid SVG element type");
+    }
+
+    return this._createSVG(type);
+  }
+
+  _createSVG(type) {
+    (0, _util.unreachable)("Abstract method `_createSVG` called.");
+  }
+
+}
+
+exports.BaseSVGFactory = BaseSVGFactory;
+
+/***/ }),
+/* 10 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.MurmurHash3_64 = void 0;
+
+var _util = __w_pdfjs_require__(1);
+
+const SEED = 0xc3d2e1f0;
+const MASK_HIGH = 0xffff0000;
+const MASK_LOW = 0xffff;
+
+class MurmurHash3_64 {
+  constructor(seed) {
+    this.h1 = seed ? seed & 0xffffffff : SEED;
+    this.h2 = seed ? seed & 0xffffffff : SEED;
+  }
+
+  update(input) {
+    let data, length;
+
+    if (typeof input === "string") {
+      data = new Uint8Array(input.length * 2);
+      length = 0;
+
+      for (let i = 0, ii = input.length; i < ii; i++) {
+        const code = input.charCodeAt(i);
+
+        if (code <= 0xff) {
+          data[length++] = code;
+        } else {
+          data[length++] = code >>> 8;
+          data[length++] = code & 0xff;
+        }
+      }
+    } else if ((0, _util.isArrayBuffer)(input)) {
+      data = input.slice();
+      length = data.byteLength;
+    } else {
+      throw new Error("Wrong data format in MurmurHash3_64_update. " + "Input must be a string or array.");
+    }
+
+    const blockCounts = length >> 2;
+    const tailLength = length - blockCounts * 4;
+    const dataUint32 = new Uint32Array(data.buffer, 0, blockCounts);
+    let k1 = 0,
+        k2 = 0;
+    let h1 = this.h1,
+        h2 = this.h2;
+    const C1 = 0xcc9e2d51,
+          C2 = 0x1b873593;
+    const C1_LOW = C1 & MASK_LOW,
+          C2_LOW = C2 & MASK_LOW;
+
+    for (let i = 0; i < blockCounts; i++) {
+      if (i & 1) {
+        k1 = dataUint32[i];
+        k1 = k1 * C1 & MASK_HIGH | k1 * C1_LOW & MASK_LOW;
+        k1 = k1 << 15 | k1 >>> 17;
+        k1 = k1 * C2 & MASK_HIGH | k1 * C2_LOW & MASK_LOW;
+        h1 ^= k1;
+        h1 = h1 << 13 | h1 >>> 19;
+        h1 = h1 * 5 + 0xe6546b64;
+      } else {
+        k2 = dataUint32[i];
+        k2 = k2 * C1 & MASK_HIGH | k2 * C1_LOW & MASK_LOW;
+        k2 = k2 << 15 | k2 >>> 17;
+        k2 = k2 * C2 & MASK_HIGH | k2 * C2_LOW & MASK_LOW;
+        h2 ^= k2;
+        h2 = h2 << 13 | h2 >>> 19;
+        h2 = h2 * 5 + 0xe6546b64;
+      }
+    }
+
+    k1 = 0;
+
+    switch (tailLength) {
+      case 3:
+        k1 ^= data[blockCounts * 4 + 2] << 16;
+
+      case 2:
+        k1 ^= data[blockCounts * 4 + 1] << 8;
+
+      case 1:
+        k1 ^= data[blockCounts * 4];
+        k1 = k1 * C1 & MASK_HIGH | k1 * C1_LOW & MASK_LOW;
+        k1 = k1 << 15 | k1 >>> 17;
+        k1 = k1 * C2 & MASK_HIGH | k1 * C2_LOW & MASK_LOW;
+
+        if (blockCounts & 1) {
+          h1 ^= k1;
+        } else {
+          h2 ^= k1;
+        }
+
+    }
+
+    this.h1 = h1;
+    this.h2 = h2;
+  }
+
+  hexdigest() {
+    let h1 = this.h1,
+        h2 = this.h2;
+    h1 ^= h2 >>> 1;
+    h1 = h1 * 0xed558ccd & MASK_HIGH | h1 * 0x8ccd & MASK_LOW;
+    h2 = h2 * 0xff51afd7 & MASK_HIGH | ((h2 << 16 | h1 >>> 16) * 0xafd7ed55 & MASK_HIGH) >>> 16;
+    h1 ^= h2 >>> 1;
+    h1 = h1 * 0x1a85ec53 & MASK_HIGH | h1 * 0xec53 & MASK_LOW;
+    h2 = h2 * 0xc4ceb9fe & MASK_HIGH | ((h2 << 16 | h1 >>> 16) * 0xb9fe1a85 & MASK_HIGH) >>> 16;
+    h1 ^= h2 >>> 1;
+    const hex1 = (h1 >>> 0).toString(16),
+          hex2 = (h2 >>> 0).toString(16);
+    return hex1.padStart(8, "0") + hex2.padStart(8, "0");
+  }
+
+}
+
+exports.MurmurHash3_64 = MurmurHash3_64;
+
+/***/ }),
+/* 11 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.FontLoader = exports.FontFaceObject = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
 
 class BaseFontLoader {
   constructor({
     docId,
     onUnsupportedFeature,
-    ownerDocument = globalThis.document
+    ownerDocument = globalThis.document,
+    styleElement = null
   }) {
     if (this.constructor === BaseFontLoader) {
       (0, _util.unreachable)("Cannot initialize BaseFontLoader.");
@@ -3973,7 +5712,7 @@ class BaseFontLoader {
       styleElement = this.styleElement = this._document.createElement("style");
       styleElement.id = `PDFJS_FONT_STYLE_TAG_${this.docId}`;
 
-      this._document.documentElement.getElementsByTagName("head")[0].appendChild(styleElement);
+      this._document.documentElement.getElementsByTagName("head")[0].append(styleElement);
     }
 
     const styleSheet = styleElement.sheet;
@@ -3981,9 +5720,10 @@ class BaseFontLoader {
   }
 
   clear() {
-    this.nativeFontFaces.forEach(nativeFontFace => {
+    for (const nativeFontFace of this.nativeFontFaces) {
       this._document.fonts.delete(nativeFontFace);
-    });
+    }
+
     this.nativeFontFaces.length = 0;
 
     if (this.styleElement) {
@@ -4043,8 +5783,8 @@ class BaseFontLoader {
   }
 
   get isFontLoadingAPISupported() {
-    const supported = typeof this._document !== "undefined" && !!this._document.fonts;
-    return (0, _util.shadow)(this, "isFontLoadingAPISupported", supported);
+    const hasFonts = !!this._document?.fonts;
+    return (0, _util.shadow)(this, "isFontLoadingAPISupported", hasFonts);
   }
 
   get isSyncFontLoadingSupported() {
@@ -4082,7 +5822,7 @@ exports.FontLoader = FontLoader;
       } else {
         const m = /Mozilla\/5.0.*?rv:(\d+).*? Gecko/.exec(navigator.userAgent);
 
-        if (m && m[1] >= 14) {
+        if (m?.[1] >= 14) {
           supported = true;
         }
       }
@@ -4183,8 +5923,8 @@ exports.FontLoader = FontLoader;
       this.insertRule(rule);
       const names = [];
 
-      for (i = 0, ii = fonts.length; i < ii; i++) {
-        names.push(fonts[i].loadedName);
+      for (const font of fonts) {
+        names.push(font.loadedName);
       }
 
       names.push(loadTestFontId);
@@ -4196,19 +5936,18 @@ exports.FontLoader = FontLoader;
       div.style.position = "absolute";
       div.style.top = div.style.left = "0px";
 
-      for (i = 0, ii = names.length; i < ii; ++i) {
+      for (const name of names) {
         const span = this._document.createElement("span");
 
         span.textContent = "Hi";
-        span.style.fontFamily = names[i];
-        div.appendChild(span);
+        span.style.fontFamily = name;
+        div.append(span);
       }
 
-      this._document.body.appendChild(div);
+      this._document.body.append(div);
 
       isFontReady(loadTestFontId, () => {
-        this._document.body.removeChild(div);
-
+        div.remove();
         request.complete();
       });
     }
@@ -4221,7 +5960,7 @@ class FontFaceObject {
     isEvalSupported = true,
     disableFontFace = false,
     ignoreErrors = false,
-    onUnsupportedFeature = null,
+    onUnsupportedFeature,
     fontRegistry = null
   }) {
     this.compiledGlyphs = Object.create(null);
@@ -4242,7 +5981,21 @@ class FontFaceObject {
       return null;
     }
 
-    const nativeFontFace = new FontFace(this.loadedName, this.data, {});
+    let nativeFontFace;
+
+    if (!this.cssFontInfo) {
+      nativeFontFace = new FontFace(this.loadedName, this.data, {});
+    } else {
+      const css = {
+        weight: this.cssFontInfo.fontWeight
+      };
+
+      if (this.cssFontInfo.italicAngle) {
+        css.style = `oblique ${this.cssFontInfo.italicAngle}deg`;
+      }
+
+      nativeFontFace = new FontFace(this.cssFontInfo.fontFamily, this.data, css);
+    }
 
     if (this.fontRegistry) {
       this.fontRegistry.registerFont(this);
@@ -4256,9 +6009,21 @@ class FontFaceObject {
       return null;
     }
 
-    const data = (0, _util.bytesToString)(new Uint8Array(this.data));
+    const data = (0, _util.bytesToString)(this.data);
     const url = `url(data:${this.mimetype};base64,${btoa(data)});`;
-    const rule = `@font-face {font-family:"${this.loadedName}";src:${url}}`;
+    let rule;
+
+    if (!this.cssFontInfo) {
+      rule = `@font-face {font-family:"${this.loadedName}";src:${url}}`;
+    } else {
+      let css = `font-weight: ${this.cssFontInfo.fontWeight};`;
+
+      if (this.cssFontInfo.italicAngle) {
+        css += `font-style: oblique ${this.cssFontInfo.italicAngle}deg;`;
+      }
+
+      rule = `@font-face {font-family:"${this.cssFontInfo.fontFamily}";${css}src:${url}}`;
+    }
 
     if (this.fontRegistry) {
       this.fontRegistry.registerFont(this, url);
@@ -4272,7 +6037,7 @@ class FontFaceObject {
       return this.compiledGlyphs[character];
     }
 
-    let cmds, current;
+    let cmds;
 
     try {
       cmds = objs.get(this.loadedName + "_path_" + character);
@@ -4281,39 +6046,27 @@ class FontFaceObject {
         throw ex;
       }
 
-      if (this._onUnsupportedFeature) {
-        this._onUnsupportedFeature({
-          featureId: _util.UNSUPPORTED_FEATURES.errorFontGetPath
-        });
-      }
+      this._onUnsupportedFeature({
+        featureId: _util.UNSUPPORTED_FEATURES.errorFontGetPath
+      });
 
       (0, _util.warn)(`getPathGenerator - ignoring character: "${ex}".`);
       return this.compiledGlyphs[character] = function (c, size) {};
     }
 
-    if (this.isEvalSupported && _util.IsEvalSupportedCached.value) {
-      let args,
-          js = "";
+    if (this.isEvalSupported && _util.FeatureTest.isEvalSupported) {
+      const jsBuf = [];
 
-      for (let i = 0, ii = cmds.length; i < ii; i++) {
-        current = cmds[i];
-
-        if (current.args !== undefined) {
-          args = current.args.join(",");
-        } else {
-          args = "";
-        }
-
-        js += "c." + current.cmd + "(" + args + ");\n";
+      for (const current of cmds) {
+        const args = current.args !== undefined ? current.args.join(",") : "";
+        jsBuf.push("c.", current.cmd, "(", args, ");\n");
       }
 
-      return this.compiledGlyphs[character] = new Function("c", "size", js);
+      return this.compiledGlyphs[character] = new Function("c", "size", jsBuf.join(""));
     }
 
     return this.compiledGlyphs[character] = function (c, size) {
-      for (let i = 0, ii = cmds.length; i < ii; i++) {
-        current = cmds[i];
-
+      for (const current of cmds) {
         if (current.cmd === "scale") {
           current.args = [size, -size];
         }
@@ -4328,350 +6081,259 @@ class FontFaceObject {
 exports.FontFaceObject = FontFaceObject;
 
 /***/ }),
-/* 7 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 12 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.NodeCMapReaderFactory = exports.NodeCanvasFactory = void 0;
-
-var _display_utils = __w_pdfjs_require__(1);
-
-var _is_node = __w_pdfjs_require__(4);
-
-var _util = __w_pdfjs_require__(2);
-
-let NodeCanvasFactory = class {
-  constructor() {
-    (0, _util.unreachable)("Not implemented: NodeCanvasFactory");
-  }
-
-};
-exports.NodeCanvasFactory = NodeCanvasFactory;
-let NodeCMapReaderFactory = class {
-  constructor() {
-    (0, _util.unreachable)("Not implemented: NodeCMapReaderFactory");
-  }
-
-};
-exports.NodeCMapReaderFactory = NodeCMapReaderFactory;
-
-if (_is_node.isNodeJS) {
-  exports.NodeCanvasFactory = NodeCanvasFactory = class extends _display_utils.BaseCanvasFactory {
-    create(width, height) {
-      if (width <= 0 || height <= 0) {
-        throw new Error("Invalid canvas size");
-      }
-
-      const Canvas = require("canvas");
-
-      const canvas = Canvas.createCanvas(width, height);
-      return {
-        canvas,
-        context: canvas.getContext("2d")
-      };
-    }
-
-  };
-  exports.NodeCMapReaderFactory = NodeCMapReaderFactory = class extends _display_utils.BaseCMapReaderFactory {
-    _fetchData(url, compressionType) {
-      return new Promise((resolve, reject) => {
-        const fs = require("fs");
-
-        fs.readFile(url, (error, data) => {
-          if (error || !data) {
-            reject(new Error(error));
-            return;
-          }
-
-          resolve({
-            cMapData: new Uint8Array(data),
-            compressionType
-          });
-        });
-      });
-    }
-
-  };
-}
-
-/***/ }),
-/* 8 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.AnnotationStorage = void 0;
-
-class AnnotationStorage {
-  constructor() {
-    this._storage = new Map();
-    this._modified = false;
-    this.onSetModified = null;
-    this.onResetModified = null;
-  }
-
-  getOrCreateValue(key, defaultValue) {
-    if (this._storage.has(key)) {
-      return this._storage.get(key);
-    }
-
-    this._storage.set(key, defaultValue);
-
-    return defaultValue;
-  }
-
-  setValue(key, value) {
-    if (this._storage.get(key) !== value) {
-      this._setModified();
-    }
-
-    this._storage.set(key, value);
-  }
-
-  getAll() {
-    if (this._storage.size === 0) {
-      return null;
-    }
-
-    return Object.fromEntries(this._storage);
-  }
-
-  get size() {
-    return this._storage.size;
-  }
-
-  _setModified() {
-    if (!this._modified) {
-      this._modified = true;
-
-      if (typeof this.onSetModified === "function") {
-        this.onSetModified();
-      }
-    }
-  }
-
-  resetModified() {
-    if (this._modified) {
-      this._modified = false;
-
-      if (typeof this.onResetModified === "function") {
-        this.onResetModified();
-      }
-    }
-  }
-
-}
-
-exports.AnnotationStorage = AnnotationStorage;
-
-/***/ }),
-/* 9 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.apiCompatibilityParams = void 0;
-
-var _is_node = __w_pdfjs_require__(4);
-
-const compatibilityParams = Object.create(null);
-{
-  (function checkFontFace() {
-    if (_is_node.isNodeJS) {
-      compatibilityParams.disableFontFace = true;
-    }
-  })();
-}
-const apiCompatibilityParams = Object.freeze(compatibilityParams);
-exports.apiCompatibilityParams = apiCompatibilityParams;
-
-/***/ }),
-/* 10 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+}));
 exports.CanvasGraphics = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _display_utils = __w_pdfjs_require__(8);
 
-var _pattern_helper = __w_pdfjs_require__(11);
+var _util = __w_pdfjs_require__(1);
 
-var MIN_FONT_SIZE = 16;
-var MAX_FONT_SIZE = 100;
-var MAX_GROUP_SIZE = 4096;
-var MIN_WIDTH_FACTOR = 0.65;
-var COMPILE_TYPE3_GLYPHS = true;
-var MAX_SIZE_TO_COMPILE = 1000;
-var FULL_CHUNK_HEIGHT = 16;
+var _pattern_helper = __w_pdfjs_require__(13);
 
-function addContextCurrentTransform(ctx) {
-  if (!ctx.mozCurrentTransform) {
-    ctx._originalSave = ctx.save;
-    ctx._originalRestore = ctx.restore;
-    ctx._originalRotate = ctx.rotate;
-    ctx._originalScale = ctx.scale;
-    ctx._originalTranslate = ctx.translate;
-    ctx._originalTransform = ctx.transform;
-    ctx._originalSetTransform = ctx.setTransform;
-    ctx._transformMatrix = ctx._transformMatrix || [1, 0, 0, 1, 0, 0];
-    ctx._transformStack = [];
-    Object.defineProperty(ctx, "mozCurrentTransform", {
-      get: function getCurrentTransform() {
-        return this._transformMatrix;
-      }
-    });
-    Object.defineProperty(ctx, "mozCurrentTransformInverse", {
-      get: function getCurrentTransformInverse() {
-        var m = this._transformMatrix;
-        var a = m[0],
-            b = m[1],
-            c = m[2],
-            d = m[3],
-            e = m[4],
-            f = m[5];
-        var ad_bc = a * d - b * c;
-        var bc_ad = b * c - a * d;
-        return [d / ad_bc, b / bc_ad, c / bc_ad, a / ad_bc, (d * e - c * f) / bc_ad, (b * e - a * f) / ad_bc];
-      }
-    });
+var _image_utils = __w_pdfjs_require__(14);
 
-    ctx.save = function ctxSave() {
-      var old = this._transformMatrix;
+var _is_node = __w_pdfjs_require__(3);
 
-      this._transformStack.push(old);
+const MIN_FONT_SIZE = 16;
+const MAX_FONT_SIZE = 100;
+const MAX_GROUP_SIZE = 4096;
+const EXECUTION_TIME = 15;
+const EXECUTION_STEPS = 10;
+const MAX_SIZE_TO_COMPILE = _is_node.isNodeJS && typeof Path2D === "undefined" ? -1 : 1000;
+const FULL_CHUNK_HEIGHT = 16;
 
-      this._transformMatrix = old.slice(0, 6);
-
-      this._originalSave();
-    };
-
-    ctx.restore = function ctxRestore() {
-      var prev = this._transformStack.pop();
-
-      if (prev) {
-        this._transformMatrix = prev;
-
-        this._originalRestore();
-      }
-    };
-
-    ctx.translate = function ctxTranslate(x, y) {
-      var m = this._transformMatrix;
-      m[4] = m[0] * x + m[2] * y + m[4];
-      m[5] = m[1] * x + m[3] * y + m[5];
-
-      this._originalTranslate(x, y);
-    };
-
-    ctx.scale = function ctxScale(x, y) {
-      var m = this._transformMatrix;
-      m[0] = m[0] * x;
-      m[1] = m[1] * x;
-      m[2] = m[2] * y;
-      m[3] = m[3] * y;
-
-      this._originalScale(x, y);
-    };
-
-    ctx.transform = function ctxTransform(a, b, c, d, e, f) {
-      var m = this._transformMatrix;
-      this._transformMatrix = [m[0] * a + m[2] * b, m[1] * a + m[3] * b, m[0] * c + m[2] * d, m[1] * c + m[3] * d, m[0] * e + m[2] * f + m[4], m[1] * e + m[3] * f + m[5]];
-
-      ctx._originalTransform(a, b, c, d, e, f);
-    };
-
-    ctx.setTransform = function ctxSetTransform(a, b, c, d, e, f) {
-      this._transformMatrix = [a, b, c, d, e, f];
-
-      ctx._originalSetTransform(a, b, c, d, e, f);
-    };
-
-    ctx.rotate = function ctxRotate(angle) {
-      var cosValue = Math.cos(angle);
-      var sinValue = Math.sin(angle);
-      var m = this._transformMatrix;
-      this._transformMatrix = [m[0] * cosValue + m[2] * sinValue, m[1] * cosValue + m[3] * sinValue, m[0] * -sinValue + m[2] * cosValue, m[1] * -sinValue + m[3] * cosValue, m[4], m[5]];
-
-      this._originalRotate(angle);
-    };
+function mirrorContextOperations(ctx, destCtx) {
+  if (ctx._removeMirroring) {
+    throw new Error("Context is already forwarding operations.");
   }
+
+  ctx.__originalSave = ctx.save;
+  ctx.__originalRestore = ctx.restore;
+  ctx.__originalRotate = ctx.rotate;
+  ctx.__originalScale = ctx.scale;
+  ctx.__originalTranslate = ctx.translate;
+  ctx.__originalTransform = ctx.transform;
+  ctx.__originalSetTransform = ctx.setTransform;
+  ctx.__originalResetTransform = ctx.resetTransform;
+  ctx.__originalClip = ctx.clip;
+  ctx.__originalMoveTo = ctx.moveTo;
+  ctx.__originalLineTo = ctx.lineTo;
+  ctx.__originalBezierCurveTo = ctx.bezierCurveTo;
+  ctx.__originalRect = ctx.rect;
+  ctx.__originalClosePath = ctx.closePath;
+  ctx.__originalBeginPath = ctx.beginPath;
+
+  ctx._removeMirroring = () => {
+    ctx.save = ctx.__originalSave;
+    ctx.restore = ctx.__originalRestore;
+    ctx.rotate = ctx.__originalRotate;
+    ctx.scale = ctx.__originalScale;
+    ctx.translate = ctx.__originalTranslate;
+    ctx.transform = ctx.__originalTransform;
+    ctx.setTransform = ctx.__originalSetTransform;
+    ctx.resetTransform = ctx.__originalResetTransform;
+    ctx.clip = ctx.__originalClip;
+    ctx.moveTo = ctx.__originalMoveTo;
+    ctx.lineTo = ctx.__originalLineTo;
+    ctx.bezierCurveTo = ctx.__originalBezierCurveTo;
+    ctx.rect = ctx.__originalRect;
+    ctx.closePath = ctx.__originalClosePath;
+    ctx.beginPath = ctx.__originalBeginPath;
+    delete ctx._removeMirroring;
+  };
+
+  ctx.save = function ctxSave() {
+    destCtx.save();
+
+    this.__originalSave();
+  };
+
+  ctx.restore = function ctxRestore() {
+    destCtx.restore();
+
+    this.__originalRestore();
+  };
+
+  ctx.translate = function ctxTranslate(x, y) {
+    destCtx.translate(x, y);
+
+    this.__originalTranslate(x, y);
+  };
+
+  ctx.scale = function ctxScale(x, y) {
+    destCtx.scale(x, y);
+
+    this.__originalScale(x, y);
+  };
+
+  ctx.transform = function ctxTransform(a, b, c, d, e, f) {
+    destCtx.transform(a, b, c, d, e, f);
+
+    this.__originalTransform(a, b, c, d, e, f);
+  };
+
+  ctx.setTransform = function ctxSetTransform(a, b, c, d, e, f) {
+    destCtx.setTransform(a, b, c, d, e, f);
+
+    this.__originalSetTransform(a, b, c, d, e, f);
+  };
+
+  ctx.resetTransform = function ctxResetTransform() {
+    destCtx.resetTransform();
+
+    this.__originalResetTransform();
+  };
+
+  ctx.rotate = function ctxRotate(angle) {
+    destCtx.rotate(angle);
+
+    this.__originalRotate(angle);
+  };
+
+  ctx.clip = function ctxRotate(rule) {
+    destCtx.clip(rule);
+
+    this.__originalClip(rule);
+  };
+
+  ctx.moveTo = function (x, y) {
+    destCtx.moveTo(x, y);
+
+    this.__originalMoveTo(x, y);
+  };
+
+  ctx.lineTo = function (x, y) {
+    destCtx.lineTo(x, y);
+
+    this.__originalLineTo(x, y);
+  };
+
+  ctx.bezierCurveTo = function (cp1x, cp1y, cp2x, cp2y, x, y) {
+    destCtx.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y);
+
+    this.__originalBezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y);
+  };
+
+  ctx.rect = function (x, y, width, height) {
+    destCtx.rect(x, y, width, height);
+
+    this.__originalRect(x, y, width, height);
+  };
+
+  ctx.closePath = function () {
+    destCtx.closePath();
+
+    this.__originalClosePath();
+  };
+
+  ctx.beginPath = function () {
+    destCtx.beginPath();
+
+    this.__originalBeginPath();
+  };
 }
 
-var CachedCanvases = function CachedCanvasesClosure() {
-  function CachedCanvases(canvasFactory) {
+class CachedCanvases {
+  constructor(canvasFactory) {
     this.canvasFactory = canvasFactory;
     this.cache = Object.create(null);
   }
 
-  CachedCanvases.prototype = {
-    getCanvas: function CachedCanvases_getCanvas(id, width, height, trackTransform) {
-      var canvasEntry;
+  getCanvas(id, width, height) {
+    let canvasEntry;
 
-      if (this.cache[id] !== undefined) {
-        canvasEntry = this.cache[id];
-        this.canvasFactory.reset(canvasEntry, width, height);
-        canvasEntry.context.setTransform(1, 0, 0, 1, 0, 0);
-      } else {
-        canvasEntry = this.canvasFactory.create(width, height);
-        this.cache[id] = canvasEntry;
-      }
-
-      if (trackTransform) {
-        addContextCurrentTransform(canvasEntry.context);
-      }
-
-      return canvasEntry;
-    },
-
-    clear() {
-      for (var id in this.cache) {
-        var canvasEntry = this.cache[id];
-        this.canvasFactory.destroy(canvasEntry);
-        delete this.cache[id];
-      }
+    if (this.cache[id] !== undefined) {
+      canvasEntry = this.cache[id];
+      this.canvasFactory.reset(canvasEntry, width, height);
+    } else {
+      canvasEntry = this.canvasFactory.create(width, height);
+      this.cache[id] = canvasEntry;
     }
 
-  };
-  return CachedCanvases;
-}();
+    return canvasEntry;
+  }
+
+  delete(id) {
+    delete this.cache[id];
+  }
+
+  clear() {
+    for (const id in this.cache) {
+      const canvasEntry = this.cache[id];
+      this.canvasFactory.destroy(canvasEntry);
+      delete this.cache[id];
+    }
+  }
+
+}
+
+function drawImageAtIntegerCoords(ctx, srcImg, srcX, srcY, srcW, srcH, destX, destY, destW, destH) {
+  const [a, b, c, d, tx, ty] = (0, _display_utils.getCurrentTransform)(ctx);
+
+  if (b === 0 && c === 0) {
+    const tlX = destX * a + tx;
+    const rTlX = Math.round(tlX);
+    const tlY = destY * d + ty;
+    const rTlY = Math.round(tlY);
+    const brX = (destX + destW) * a + tx;
+    const rWidth = Math.abs(Math.round(brX) - rTlX) || 1;
+    const brY = (destY + destH) * d + ty;
+    const rHeight = Math.abs(Math.round(brY) - rTlY) || 1;
+    ctx.setTransform(Math.sign(a), 0, 0, Math.sign(d), rTlX, rTlY);
+    ctx.drawImage(srcImg, srcX, srcY, srcW, srcH, 0, 0, rWidth, rHeight);
+    ctx.setTransform(a, b, c, d, tx, ty);
+    return [rWidth, rHeight];
+  }
+
+  if (a === 0 && d === 0) {
+    const tlX = destY * c + tx;
+    const rTlX = Math.round(tlX);
+    const tlY = destX * b + ty;
+    const rTlY = Math.round(tlY);
+    const brX = (destY + destH) * c + tx;
+    const rWidth = Math.abs(Math.round(brX) - rTlX) || 1;
+    const brY = (destX + destW) * b + ty;
+    const rHeight = Math.abs(Math.round(brY) - rTlY) || 1;
+    ctx.setTransform(0, Math.sign(b), Math.sign(c), 0, rTlX, rTlY);
+    ctx.drawImage(srcImg, srcX, srcY, srcW, srcH, 0, 0, rHeight, rWidth);
+    ctx.setTransform(a, b, c, d, tx, ty);
+    return [rHeight, rWidth];
+  }
+
+  ctx.drawImage(srcImg, srcX, srcY, srcW, srcH, destX, destY, destW, destH);
+  const scaleX = Math.hypot(a, b);
+  const scaleY = Math.hypot(c, d);
+  return [scaleX * destW, scaleY * destH];
+}
 
 function compileType3Glyph(imgData) {
-  var POINT_TO_PROCESS_LIMIT = 1000;
-  var width = imgData.width,
-      height = imgData.height;
-  var i,
-      j,
-      j0,
-      width1 = width + 1;
-  var points = new Uint8Array(width1 * (height + 1));
-  var POINT_TYPES = new Uint8Array([0, 2, 4, 0, 1, 0, 5, 4, 8, 10, 0, 8, 0, 2, 1, 0]);
-  var lineSize = width + 7 & ~7,
-      data0 = imgData.data;
-  var data = new Uint8Array(lineSize * height),
-      pos = 0,
-      ii;
+  const {
+    width,
+    height
+  } = imgData;
 
-  for (i = 0, ii = data0.length; i < ii; i++) {
-    var mask = 128,
-        elem = data0[i];
+  if (width > MAX_SIZE_TO_COMPILE || height > MAX_SIZE_TO_COMPILE) {
+    return null;
+  }
+
+  const POINT_TO_PROCESS_LIMIT = 1000;
+  const POINT_TYPES = new Uint8Array([0, 2, 4, 0, 1, 0, 5, 4, 8, 10, 0, 8, 0, 2, 1, 0]);
+  const width1 = width + 1;
+  let points = new Uint8Array(width1 * (height + 1));
+  let i, j, j0;
+  const lineSize = width + 7 & ~7;
+  let data = new Uint8Array(lineSize * height),
+      pos = 0;
+
+  for (const elem of imgData.data) {
+    let mask = 128;
 
     while (mask > 0) {
       data[pos++] = elem & mask ? 0 : 255;
@@ -4679,7 +6341,7 @@ function compileType3Glyph(imgData) {
     }
   }
 
-  var count = 0;
+  let count = 0;
   pos = 0;
 
   if (data[pos] !== 0) {
@@ -4710,7 +6372,7 @@ function compileType3Glyph(imgData) {
       ++count;
     }
 
-    var sum = (data[pos] ? 4 : 0) + (data[pos - lineSize] ? 8 : 0);
+    let sum = (data[pos] ? 4 : 0) + (data[pos - lineSize] ? 8 : 0);
 
     for (j = 1; j < width; j++) {
       sum = (sum >> 2) + (data[pos + 1] ? 4 : 0) + (data[pos - lineSize + 1] ? 8 : 0);
@@ -4759,12 +6421,12 @@ function compileType3Glyph(imgData) {
     return null;
   }
 
-  var steps = new Int32Array([0, width1, -1, 0, -width1, 0, 0, 0, 1]);
-  var outlines = [];
+  const steps = new Int32Array([0, width1, -1, 0, -width1, 0, 0, 0, 1]);
+  const path = new Path2D();
 
   for (i = 0; count && i <= height; i++) {
-    var p = i * width1;
-    var end = p + width;
+    let p = i * width1;
+    const end = p + width;
 
     while (p < end && !points[p]) {
       p++;
@@ -4774,19 +6436,18 @@ function compileType3Glyph(imgData) {
       continue;
     }
 
-    var coords = [p % width1, i];
-    var type = points[p],
-        p0 = p,
-        pp;
+    path.moveTo(p % width1, i);
+    const p0 = p;
+    let type = points[p];
 
     do {
-      var step = steps[type];
+      const step = steps[type];
 
       do {
         p += step;
       } while (!points[p]);
 
-      pp = points[p];
+      const pp = points[p];
 
       if (pp !== 5 && pp !== 10) {
         type = pp;
@@ -4796,34 +6457,24 @@ function compileType3Glyph(imgData) {
         points[p] &= type >> 2 | type << 2;
       }
 
-      coords.push(p % width1);
-      coords.push(p / width1 | 0);
+      path.lineTo(p % width1, p / width1 | 0);
 
       if (!points[p]) {
         --count;
       }
     } while (p0 !== p);
 
-    outlines.push(coords);
     --i;
   }
 
-  var drawOutline = function (c) {
+  data = null;
+  points = null;
+
+  const drawOutline = function (c) {
     c.save();
     c.scale(1 / width, -1 / height);
     c.translate(0, -height);
-    c.beginPath();
-
-    for (let k = 0, kk = outlines.length; k < kk; k++) {
-      var o = outlines[k];
-      c.moveTo(o[0], o[1]);
-
-      for (let l = 2, ll = o.length; l < ll; l += 2) {
-        c.lineTo(o[l], o[l + 1]);
-      }
-    }
-
-    c.fill();
+    c.fill(path);
     c.beginPath();
     c.restore();
   };
@@ -4831,8 +6482,8 @@ function compileType3Glyph(imgData) {
   return drawOutline;
 }
 
-var CanvasExtraState = function CanvasExtraStateClosure() {
-  function CanvasExtraState() {
+class CanvasExtraState {
+  constructor(width, height) {
     this.alphaIsShape = false;
     this.fontSize = 0;
     this.fontSizeScale = 1;
@@ -4856,29 +6507,471 @@ var CanvasExtraState = function CanvasExtraStateClosure() {
     this.strokeAlpha = 1;
     this.lineWidth = 1;
     this.activeSMask = null;
-    this.resumeSMaskCtx = null;
     this.transferMaps = null;
+    this.startNewPathAndClipBox([0, 0, width, height]);
   }
 
-  CanvasExtraState.prototype = {
-    clone: function CanvasExtraState_clone() {
-      return Object.create(this);
-    },
-    setCurrentPoint: function CanvasExtraState_setCurrentPoint(x, y) {
-      this.x = x;
-      this.y = y;
+  clone() {
+    const clone = Object.create(this);
+    clone.clipBox = this.clipBox.slice();
+    return clone;
+  }
+
+  setCurrentPoint(x, y) {
+    this.x = x;
+    this.y = y;
+  }
+
+  updatePathMinMax(transform, x, y) {
+    [x, y] = _util.Util.applyTransform([x, y], transform);
+    this.minX = Math.min(this.minX, x);
+    this.minY = Math.min(this.minY, y);
+    this.maxX = Math.max(this.maxX, x);
+    this.maxY = Math.max(this.maxY, y);
+  }
+
+  updateRectMinMax(transform, rect) {
+    const p1 = _util.Util.applyTransform(rect, transform);
+
+    const p2 = _util.Util.applyTransform(rect.slice(2), transform);
+
+    this.minX = Math.min(this.minX, p1[0], p2[0]);
+    this.minY = Math.min(this.minY, p1[1], p2[1]);
+    this.maxX = Math.max(this.maxX, p1[0], p2[0]);
+    this.maxY = Math.max(this.maxY, p1[1], p2[1]);
+  }
+
+  updateScalingPathMinMax(transform, minMax) {
+    _util.Util.scaleMinMax(transform, minMax);
+
+    this.minX = Math.min(this.minX, minMax[0]);
+    this.maxX = Math.max(this.maxX, minMax[1]);
+    this.minY = Math.min(this.minY, minMax[2]);
+    this.maxY = Math.max(this.maxY, minMax[3]);
+  }
+
+  updateCurvePathMinMax(transform, x0, y0, x1, y1, x2, y2, x3, y3, minMax) {
+    const box = _util.Util.bezierBoundingBox(x0, y0, x1, y1, x2, y2, x3, y3);
+
+    if (minMax) {
+      minMax[0] = Math.min(minMax[0], box[0], box[2]);
+      minMax[1] = Math.max(minMax[1], box[0], box[2]);
+      minMax[2] = Math.min(minMax[2], box[1], box[3]);
+      minMax[3] = Math.max(minMax[3], box[1], box[3]);
+      return;
     }
-  };
-  return CanvasExtraState;
-}();
 
-var CanvasGraphics = function CanvasGraphicsClosure() {
-  var EXECUTION_TIME = 15;
-  var EXECUTION_STEPS = 10;
+    this.updateRectMinMax(transform, box);
+  }
 
-  function CanvasGraphics(canvasCtx, commonObjs, objs, canvasFactory, webGLContext, imageLayer, optionalContentConfig) {
+  getPathBoundingBox(pathType = _pattern_helper.PathType.FILL, transform = null) {
+    const box = [this.minX, this.minY, this.maxX, this.maxY];
+
+    if (pathType === _pattern_helper.PathType.STROKE) {
+      if (!transform) {
+        (0, _util.unreachable)("Stroke bounding box must include transform.");
+      }
+
+      const scale = _util.Util.singularValueDecompose2dScale(transform);
+
+      const xStrokePad = scale[0] * this.lineWidth / 2;
+      const yStrokePad = scale[1] * this.lineWidth / 2;
+      box[0] -= xStrokePad;
+      box[1] -= yStrokePad;
+      box[2] += xStrokePad;
+      box[3] += yStrokePad;
+    }
+
+    return box;
+  }
+
+  updateClipFromPath() {
+    const intersect = _util.Util.intersect(this.clipBox, this.getPathBoundingBox());
+
+    this.startNewPathAndClipBox(intersect || [0, 0, 0, 0]);
+  }
+
+  isEmptyClip() {
+    return this.minX === Infinity;
+  }
+
+  startNewPathAndClipBox(box) {
+    this.clipBox = box;
+    this.minX = Infinity;
+    this.minY = Infinity;
+    this.maxX = 0;
+    this.maxY = 0;
+  }
+
+  getClippedPathBoundingBox(pathType = _pattern_helper.PathType.FILL, transform = null) {
+    return _util.Util.intersect(this.clipBox, this.getPathBoundingBox(pathType, transform));
+  }
+
+}
+
+function putBinaryImageData(ctx, imgData, transferMaps = null) {
+  if (typeof ImageData !== "undefined" && imgData instanceof ImageData) {
+    ctx.putImageData(imgData, 0, 0);
+    return;
+  }
+
+  const height = imgData.height,
+        width = imgData.width;
+  const partialChunkHeight = height % FULL_CHUNK_HEIGHT;
+  const fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
+  const totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
+  const chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
+  let srcPos = 0,
+      destPos;
+  const src = imgData.data;
+  const dest = chunkImgData.data;
+  let i, j, thisChunkHeight, elemsInThisChunk;
+  let transferMapRed, transferMapGreen, transferMapBlue, transferMapGray;
+
+  if (transferMaps) {
+    switch (transferMaps.length) {
+      case 1:
+        transferMapRed = transferMaps[0];
+        transferMapGreen = transferMaps[0];
+        transferMapBlue = transferMaps[0];
+        transferMapGray = transferMaps[0];
+        break;
+
+      case 4:
+        transferMapRed = transferMaps[0];
+        transferMapGreen = transferMaps[1];
+        transferMapBlue = transferMaps[2];
+        transferMapGray = transferMaps[3];
+        break;
+    }
+  }
+
+  if (imgData.kind === _util.ImageKind.GRAYSCALE_1BPP) {
+    const srcLength = src.byteLength;
+    const dest32 = new Uint32Array(dest.buffer, 0, dest.byteLength >> 2);
+    const dest32DataLength = dest32.length;
+    const fullSrcDiff = width + 7 >> 3;
+    let white = 0xffffffff;
+    let black = _util.FeatureTest.isLittleEndian ? 0xff000000 : 0x000000ff;
+
+    if (transferMapGray) {
+      if (transferMapGray[0] === 0xff && transferMapGray[0xff] === 0) {
+        [white, black] = [black, white];
+      }
+    }
+
+    for (i = 0; i < totalChunks; i++) {
+      thisChunkHeight = i < fullChunks ? FULL_CHUNK_HEIGHT : partialChunkHeight;
+      destPos = 0;
+
+      for (j = 0; j < thisChunkHeight; j++) {
+        const srcDiff = srcLength - srcPos;
+        let k = 0;
+        const kEnd = srcDiff > fullSrcDiff ? width : srcDiff * 8 - 7;
+        const kEndUnrolled = kEnd & ~7;
+        let mask = 0;
+        let srcByte = 0;
+
+        for (; k < kEndUnrolled; k += 8) {
+          srcByte = src[srcPos++];
+          dest32[destPos++] = srcByte & 128 ? white : black;
+          dest32[destPos++] = srcByte & 64 ? white : black;
+          dest32[destPos++] = srcByte & 32 ? white : black;
+          dest32[destPos++] = srcByte & 16 ? white : black;
+          dest32[destPos++] = srcByte & 8 ? white : black;
+          dest32[destPos++] = srcByte & 4 ? white : black;
+          dest32[destPos++] = srcByte & 2 ? white : black;
+          dest32[destPos++] = srcByte & 1 ? white : black;
+        }
+
+        for (; k < kEnd; k++) {
+          if (mask === 0) {
+            srcByte = src[srcPos++];
+            mask = 128;
+          }
+
+          dest32[destPos++] = srcByte & mask ? white : black;
+          mask >>= 1;
+        }
+      }
+
+      while (destPos < dest32DataLength) {
+        dest32[destPos++] = 0;
+      }
+
+      ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+    }
+  } else if (imgData.kind === _util.ImageKind.RGBA_32BPP) {
+    const hasTransferMaps = !!(transferMapRed || transferMapGreen || transferMapBlue);
+    j = 0;
+    elemsInThisChunk = width * FULL_CHUNK_HEIGHT * 4;
+
+    for (i = 0; i < fullChunks; i++) {
+      dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
+      srcPos += elemsInThisChunk;
+
+      if (hasTransferMaps) {
+        for (let k = 0; k < elemsInThisChunk; k += 4) {
+          if (transferMapRed) {
+            dest[k + 0] = transferMapRed[dest[k + 0]];
+          }
+
+          if (transferMapGreen) {
+            dest[k + 1] = transferMapGreen[dest[k + 1]];
+          }
+
+          if (transferMapBlue) {
+            dest[k + 2] = transferMapBlue[dest[k + 2]];
+          }
+        }
+      }
+
+      ctx.putImageData(chunkImgData, 0, j);
+      j += FULL_CHUNK_HEIGHT;
+    }
+
+    if (i < totalChunks) {
+      elemsInThisChunk = width * partialChunkHeight * 4;
+      dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
+
+      if (hasTransferMaps) {
+        for (let k = 0; k < elemsInThisChunk; k += 4) {
+          if (transferMapRed) {
+            dest[k + 0] = transferMapRed[dest[k + 0]];
+          }
+
+          if (transferMapGreen) {
+            dest[k + 1] = transferMapGreen[dest[k + 1]];
+          }
+
+          if (transferMapBlue) {
+            dest[k + 2] = transferMapBlue[dest[k + 2]];
+          }
+        }
+      }
+
+      ctx.putImageData(chunkImgData, 0, j);
+    }
+  } else if (imgData.kind === _util.ImageKind.RGB_24BPP) {
+    const hasTransferMaps = !!(transferMapRed || transferMapGreen || transferMapBlue);
+    thisChunkHeight = FULL_CHUNK_HEIGHT;
+    elemsInThisChunk = width * thisChunkHeight;
+
+    for (i = 0; i < totalChunks; i++) {
+      if (i >= fullChunks) {
+        thisChunkHeight = partialChunkHeight;
+        elemsInThisChunk = width * thisChunkHeight;
+      }
+
+      destPos = 0;
+
+      for (j = elemsInThisChunk; j--;) {
+        dest[destPos++] = src[srcPos++];
+        dest[destPos++] = src[srcPos++];
+        dest[destPos++] = src[srcPos++];
+        dest[destPos++] = 255;
+      }
+
+      if (hasTransferMaps) {
+        for (let k = 0; k < destPos; k += 4) {
+          if (transferMapRed) {
+            dest[k + 0] = transferMapRed[dest[k + 0]];
+          }
+
+          if (transferMapGreen) {
+            dest[k + 1] = transferMapGreen[dest[k + 1]];
+          }
+
+          if (transferMapBlue) {
+            dest[k + 2] = transferMapBlue[dest[k + 2]];
+          }
+        }
+      }
+
+      ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+    }
+  } else {
+    throw new Error(`bad image kind: ${imgData.kind}`);
+  }
+}
+
+function putBinaryImageMask(ctx, imgData) {
+  if (imgData.bitmap) {
+    ctx.drawImage(imgData.bitmap, 0, 0);
+    return;
+  }
+
+  const height = imgData.height,
+        width = imgData.width;
+  const partialChunkHeight = height % FULL_CHUNK_HEIGHT;
+  const fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
+  const totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
+  const chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
+  let srcPos = 0;
+  const src = imgData.data;
+  const dest = chunkImgData.data;
+
+  for (let i = 0; i < totalChunks; i++) {
+    const thisChunkHeight = i < fullChunks ? FULL_CHUNK_HEIGHT : partialChunkHeight;
+    ({
+      srcPos
+    } = (0, _image_utils.applyMaskImageData)({
+      src,
+      srcPos,
+      dest,
+      width,
+      height: thisChunkHeight
+    }));
+    ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+  }
+}
+
+function copyCtxState(sourceCtx, destCtx) {
+  const properties = ["strokeStyle", "fillStyle", "fillRule", "globalAlpha", "lineWidth", "lineCap", "lineJoin", "miterLimit", "globalCompositeOperation", "font"];
+
+  for (let i = 0, ii = properties.length; i < ii; i++) {
+    const property = properties[i];
+
+    if (sourceCtx[property] !== undefined) {
+      destCtx[property] = sourceCtx[property];
+    }
+  }
+
+  if (sourceCtx.setLineDash !== undefined) {
+    destCtx.setLineDash(sourceCtx.getLineDash());
+    destCtx.lineDashOffset = sourceCtx.lineDashOffset;
+  }
+}
+
+function resetCtxToDefault(ctx, foregroundColor) {
+  ctx.strokeStyle = ctx.fillStyle = foregroundColor || "#000000";
+  ctx.fillRule = "nonzero";
+  ctx.globalAlpha = 1;
+  ctx.lineWidth = 1;
+  ctx.lineCap = "butt";
+  ctx.lineJoin = "miter";
+  ctx.miterLimit = 10;
+  ctx.globalCompositeOperation = "source-over";
+  ctx.font = "10px sans-serif";
+
+  if (ctx.setLineDash !== undefined) {
+    ctx.setLineDash([]);
+    ctx.lineDashOffset = 0;
+  }
+}
+
+function composeSMaskBackdrop(bytes, r0, g0, b0) {
+  const length = bytes.length;
+
+  for (let i = 3; i < length; i += 4) {
+    const alpha = bytes[i];
+
+    if (alpha === 0) {
+      bytes[i - 3] = r0;
+      bytes[i - 2] = g0;
+      bytes[i - 1] = b0;
+    } else if (alpha < 255) {
+      const alpha_ = 255 - alpha;
+      bytes[i - 3] = bytes[i - 3] * alpha + r0 * alpha_ >> 8;
+      bytes[i - 2] = bytes[i - 2] * alpha + g0 * alpha_ >> 8;
+      bytes[i - 1] = bytes[i - 1] * alpha + b0 * alpha_ >> 8;
+    }
+  }
+}
+
+function composeSMaskAlpha(maskData, layerData, transferMap) {
+  const length = maskData.length;
+  const scale = 1 / 255;
+
+  for (let i = 3; i < length; i += 4) {
+    const alpha = transferMap ? transferMap[maskData[i]] : maskData[i];
+    layerData[i] = layerData[i] * alpha * scale | 0;
+  }
+}
+
+function composeSMaskLuminosity(maskData, layerData, transferMap) {
+  const length = maskData.length;
+
+  for (let i = 3; i < length; i += 4) {
+    const y = maskData[i - 3] * 77 + maskData[i - 2] * 152 + maskData[i - 1] * 28;
+    layerData[i] = transferMap ? layerData[i] * transferMap[y >> 8] >> 8 : layerData[i] * y >> 16;
+  }
+}
+
+function genericComposeSMask(maskCtx, layerCtx, width, height, subtype, backdrop, transferMap, layerOffsetX, layerOffsetY, maskOffsetX, maskOffsetY) {
+  const hasBackdrop = !!backdrop;
+  const r0 = hasBackdrop ? backdrop[0] : 0;
+  const g0 = hasBackdrop ? backdrop[1] : 0;
+  const b0 = hasBackdrop ? backdrop[2] : 0;
+  let composeFn;
+
+  if (subtype === "Luminosity") {
+    composeFn = composeSMaskLuminosity;
+  } else {
+    composeFn = composeSMaskAlpha;
+  }
+
+  const PIXELS_TO_PROCESS = 1048576;
+  const chunkSize = Math.min(height, Math.ceil(PIXELS_TO_PROCESS / width));
+
+  for (let row = 0; row < height; row += chunkSize) {
+    const chunkHeight = Math.min(chunkSize, height - row);
+    const maskData = maskCtx.getImageData(layerOffsetX - maskOffsetX, row + (layerOffsetY - maskOffsetY), width, chunkHeight);
+    const layerData = layerCtx.getImageData(layerOffsetX, row + layerOffsetY, width, chunkHeight);
+
+    if (hasBackdrop) {
+      composeSMaskBackdrop(maskData.data, r0, g0, b0);
+    }
+
+    composeFn(maskData.data, layerData.data, transferMap);
+    layerCtx.putImageData(layerData, layerOffsetX, row + layerOffsetY);
+  }
+}
+
+function composeSMask(ctx, smask, layerCtx, layerBox) {
+  const layerOffsetX = layerBox[0];
+  const layerOffsetY = layerBox[1];
+  const layerWidth = layerBox[2] - layerOffsetX;
+  const layerHeight = layerBox[3] - layerOffsetY;
+
+  if (layerWidth === 0 || layerHeight === 0) {
+    return;
+  }
+
+  genericComposeSMask(smask.context, layerCtx, layerWidth, layerHeight, smask.subtype, smask.backdrop, smask.transferMap, layerOffsetX, layerOffsetY, smask.offsetX, smask.offsetY);
+  ctx.save();
+  ctx.globalAlpha = 1;
+  ctx.globalCompositeOperation = "source-over";
+  ctx.setTransform(1, 0, 0, 1, 0, 0);
+  ctx.drawImage(layerCtx.canvas, 0, 0);
+  ctx.restore();
+}
+
+function getImageSmoothingEnabled(transform, interpolate) {
+  const scale = _util.Util.singularValueDecompose2dScale(transform);
+
+  scale[0] = Math.fround(scale[0]);
+  scale[1] = Math.fround(scale[1]);
+  const actualScale = Math.fround((globalThis.devicePixelRatio || 1) * _display_utils.PixelsPerInch.PDF_TO_CSS_UNITS);
+
+  if (interpolate !== undefined) {
+    return interpolate;
+  } else if (scale[0] <= actualScale || scale[1] <= actualScale) {
+    return true;
+  }
+
+  return false;
+}
+
+const LINE_CAP_STYLES = ["butt", "round", "square"];
+const LINE_JOIN_STYLES = ["miter", "round", "bevel"];
+const NORMAL_CLIP = {};
+const EO_CLIP = {};
+
+class CanvasGraphics {
+  constructor(canvasCtx, commonObjs, objs, canvasFactory, imageLayer, optionalContentConfig, annotationCanvasMap, pageColors) {
     this.ctx = canvasCtx;
-    this.current = new CanvasExtraState();
+    this.current = new CanvasExtraState(this.ctx.canvas.width, this.ctx.canvas.height);
     this.stateStack = [];
     this.pendingClip = null;
     this.pendingEOFill = false;
@@ -4887,7 +6980,6 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
     this.commonObjs = commonObjs;
     this.objs = objs;
     this.canvasFactory = canvasFactory;
-    this.webGLContext = webGLContext;
     this.imageLayer = imageLayer;
     this.groupStack = [];
     this.processingType3 = null;
@@ -4897,1841 +6989,1918 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
     this.smaskStack = [];
     this.smaskCounter = 0;
     this.tempSMask = null;
+    this.suspendedCtx = null;
     this.contentVisible = true;
     this.markedContentStack = [];
     this.optionalContentConfig = optionalContentConfig;
     this.cachedCanvases = new CachedCanvases(this.canvasFactory);
-
-    if (canvasCtx) {
-      addContextCurrentTransform(canvasCtx);
-    }
-
+    this.cachedPatterns = new Map();
+    this.annotationCanvasMap = annotationCanvasMap;
+    this.viewportScale = 1;
+    this.outputScaleX = 1;
+    this.outputScaleY = 1;
+    this.backgroundColor = pageColors?.background || null;
+    this.foregroundColor = pageColors?.foreground || null;
+    this._cachedScaleForStroking = null;
     this._cachedGetSinglePixelWidth = null;
+    this._cachedBitmapsMap = new Map();
   }
 
-  function putBinaryImageData(ctx, imgData, transferMaps = null) {
-    if (typeof ImageData !== "undefined" && imgData instanceof ImageData) {
-      ctx.putImageData(imgData, 0, 0);
-      return;
+  getObject(data, fallback = null) {
+    if (typeof data === "string") {
+      return data.startsWith("g_") ? this.commonObjs.get(data) : this.objs.get(data);
     }
 
-    var height = imgData.height,
-        width = imgData.width;
-    var partialChunkHeight = height % FULL_CHUNK_HEIGHT;
-    var fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
-    var totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
-    var chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
-    var srcPos = 0,
-        destPos;
-    var src = imgData.data;
-    var dest = chunkImgData.data;
-    var i, j, thisChunkHeight, elemsInThisChunk;
-    let transferMapRed, transferMapGreen, transferMapBlue, transferMapGray;
+    return fallback;
+  }
 
-    if (transferMaps) {
-      switch (transferMaps.length) {
-        case 1:
-          transferMapRed = transferMaps[0];
-          transferMapGreen = transferMaps[0];
-          transferMapBlue = transferMaps[0];
-          transferMapGray = transferMaps[0];
-          break;
+  beginDrawing({
+    transform,
+    viewport,
+    transparency = false,
+    background = null
+  }) {
+    const width = this.ctx.canvas.width;
+    const height = this.ctx.canvas.height;
+    const defaultBackgroundColor = background || "#ffffff";
+    this.ctx.save();
 
-        case 4:
-          transferMapRed = transferMaps[0];
-          transferMapGreen = transferMaps[1];
-          transferMapBlue = transferMaps[2];
-          transferMapGray = transferMaps[3];
-          break;
+    if (this.foregroundColor && this.backgroundColor) {
+      this.ctx.fillStyle = this.foregroundColor;
+      const fg = this.foregroundColor = this.ctx.fillStyle;
+      this.ctx.fillStyle = this.backgroundColor;
+      const bg = this.backgroundColor = this.ctx.fillStyle;
+      let isValidDefaultBg = true;
+      let defaultBg = defaultBackgroundColor;
+      this.ctx.fillStyle = defaultBackgroundColor;
+      defaultBg = this.ctx.fillStyle;
+      isValidDefaultBg = typeof defaultBg === "string" && /^#[0-9A-Fa-f]{6}$/.test(defaultBg);
+
+      if (fg === "#000000" && bg === "#ffffff" || fg === bg || !isValidDefaultBg) {
+        this.foregroundColor = this.backgroundColor = null;
+      } else {
+        const [rB, gB, bB] = (0, _display_utils.getRGB)(defaultBg);
+
+        const newComp = x => {
+          x /= 255;
+          return x <= 0.03928 ? x / 12.92 : ((x + 0.055) / 1.055) ** 2.4;
+        };
+
+        const lumB = Math.round(0.2126 * newComp(rB) + 0.7152 * newComp(gB) + 0.0722 * newComp(bB));
+
+        this.selectColor = (r, g, b) => {
+          const lumC = 0.2126 * newComp(r) + 0.7152 * newComp(g) + 0.0722 * newComp(b);
+          return Math.round(lumC) === lumB ? bg : fg;
+        };
       }
     }
 
-    if (imgData.kind === _util.ImageKind.GRAYSCALE_1BPP) {
-      var srcLength = src.byteLength;
-      var dest32 = new Uint32Array(dest.buffer, 0, dest.byteLength >> 2);
-      var dest32DataLength = dest32.length;
-      var fullSrcDiff = width + 7 >> 3;
-      var white = 0xffffffff;
-      var black = _util.IsLittleEndianCached.value ? 0xff000000 : 0x000000ff;
+    this.ctx.fillStyle = this.backgroundColor || defaultBackgroundColor;
+    this.ctx.fillRect(0, 0, width, height);
+    this.ctx.restore();
 
-      if (transferMapGray) {
-        if (transferMapGray[0] === 0xff && transferMapGray[0xff] === 0) {
-          [white, black] = [black, white];
-        }
-      }
-
-      for (i = 0; i < totalChunks; i++) {
-        thisChunkHeight = i < fullChunks ? FULL_CHUNK_HEIGHT : partialChunkHeight;
-        destPos = 0;
-
-        for (j = 0; j < thisChunkHeight; j++) {
-          var srcDiff = srcLength - srcPos;
-          let k = 0;
-          var kEnd = srcDiff > fullSrcDiff ? width : srcDiff * 8 - 7;
-          var kEndUnrolled = kEnd & ~7;
-          var mask = 0;
-          var srcByte = 0;
-
-          for (; k < kEndUnrolled; k += 8) {
-            srcByte = src[srcPos++];
-            dest32[destPos++] = srcByte & 128 ? white : black;
-            dest32[destPos++] = srcByte & 64 ? white : black;
-            dest32[destPos++] = srcByte & 32 ? white : black;
-            dest32[destPos++] = srcByte & 16 ? white : black;
-            dest32[destPos++] = srcByte & 8 ? white : black;
-            dest32[destPos++] = srcByte & 4 ? white : black;
-            dest32[destPos++] = srcByte & 2 ? white : black;
-            dest32[destPos++] = srcByte & 1 ? white : black;
-          }
-
-          for (; k < kEnd; k++) {
-            if (mask === 0) {
-              srcByte = src[srcPos++];
-              mask = 128;
-            }
-
-            dest32[destPos++] = srcByte & mask ? white : black;
-            mask >>= 1;
-          }
-        }
-
-        while (destPos < dest32DataLength) {
-          dest32[destPos++] = 0;
-        }
-
-        ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
-      }
-    } else if (imgData.kind === _util.ImageKind.RGBA_32BPP) {
-      const hasTransferMaps = !!(transferMapRed || transferMapGreen || transferMapBlue);
-      j = 0;
-      elemsInThisChunk = width * FULL_CHUNK_HEIGHT * 4;
-
-      for (i = 0; i < fullChunks; i++) {
-        dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
-        srcPos += elemsInThisChunk;
-
-        if (hasTransferMaps) {
-          for (let k = 0; k < elemsInThisChunk; k += 4) {
-            if (transferMapRed) {
-              dest[k + 0] = transferMapRed[dest[k + 0]];
-            }
-
-            if (transferMapGreen) {
-              dest[k + 1] = transferMapGreen[dest[k + 1]];
-            }
-
-            if (transferMapBlue) {
-              dest[k + 2] = transferMapBlue[dest[k + 2]];
-            }
-          }
-        }
-
-        ctx.putImageData(chunkImgData, 0, j);
-        j += FULL_CHUNK_HEIGHT;
-      }
-
-      if (i < totalChunks) {
-        elemsInThisChunk = width * partialChunkHeight * 4;
-        dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
-
-        if (hasTransferMaps) {
-          for (let k = 0; k < elemsInThisChunk; k += 4) {
-            if (transferMapRed) {
-              dest[k + 0] = transferMapRed[dest[k + 0]];
-            }
-
-            if (transferMapGreen) {
-              dest[k + 1] = transferMapGreen[dest[k + 1]];
-            }
-
-            if (transferMapBlue) {
-              dest[k + 2] = transferMapBlue[dest[k + 2]];
-            }
-          }
-        }
-
-        ctx.putImageData(chunkImgData, 0, j);
-      }
-    } else if (imgData.kind === _util.ImageKind.RGB_24BPP) {
-      const hasTransferMaps = !!(transferMapRed || transferMapGreen || transferMapBlue);
-      thisChunkHeight = FULL_CHUNK_HEIGHT;
-      elemsInThisChunk = width * thisChunkHeight;
-
-      for (i = 0; i < totalChunks; i++) {
-        if (i >= fullChunks) {
-          thisChunkHeight = partialChunkHeight;
-          elemsInThisChunk = width * thisChunkHeight;
-        }
-
-        destPos = 0;
-
-        for (j = elemsInThisChunk; j--;) {
-          dest[destPos++] = src[srcPos++];
-          dest[destPos++] = src[srcPos++];
-          dest[destPos++] = src[srcPos++];
-          dest[destPos++] = 255;
-        }
-
-        if (hasTransferMaps) {
-          for (let k = 0; k < destPos; k += 4) {
-            if (transferMapRed) {
-              dest[k + 0] = transferMapRed[dest[k + 0]];
-            }
-
-            if (transferMapGreen) {
-              dest[k + 1] = transferMapGreen[dest[k + 1]];
-            }
-
-            if (transferMapBlue) {
-              dest[k + 2] = transferMapBlue[dest[k + 2]];
-            }
-          }
-        }
-
-        ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
-      }
-    } else {
-      throw new Error(`bad image kind: ${imgData.kind}`);
-    }
-  }
-
-  function putBinaryImageMask(ctx, imgData) {
-    var height = imgData.height,
-        width = imgData.width;
-    var partialChunkHeight = height % FULL_CHUNK_HEIGHT;
-    var fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
-    var totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
-    var chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
-    var srcPos = 0;
-    var src = imgData.data;
-    var dest = chunkImgData.data;
-
-    for (var i = 0; i < totalChunks; i++) {
-      var thisChunkHeight = i < fullChunks ? FULL_CHUNK_HEIGHT : partialChunkHeight;
-      var destPos = 3;
-
-      for (var j = 0; j < thisChunkHeight; j++) {
-        var mask = 0;
-
-        for (var k = 0; k < width; k++) {
-          if (!mask) {
-            var elem = src[srcPos++];
-            mask = 128;
-          }
-
-          dest[destPos] = elem & mask ? 0 : 255;
-          destPos += 4;
-          mask >>= 1;
-        }
-      }
-
-      ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
-    }
-  }
-
-  function copyCtxState(sourceCtx, destCtx) {
-    var properties = ["strokeStyle", "fillStyle", "fillRule", "globalAlpha", "lineWidth", "lineCap", "lineJoin", "miterLimit", "globalCompositeOperation", "font"];
-
-    for (var i = 0, ii = properties.length; i < ii; i++) {
-      var property = properties[i];
-
-      if (sourceCtx[property] !== undefined) {
-        destCtx[property] = sourceCtx[property];
-      }
-    }
-
-    if (sourceCtx.setLineDash !== undefined) {
-      destCtx.setLineDash(sourceCtx.getLineDash());
-      destCtx.lineDashOffset = sourceCtx.lineDashOffset;
-    }
-  }
-
-  function resetCtxToDefault(ctx) {
-    ctx.strokeStyle = "#000000";
-    ctx.fillStyle = "#000000";
-    ctx.fillRule = "nonzero";
-    ctx.globalAlpha = 1;
-    ctx.lineWidth = 1;
-    ctx.lineCap = "butt";
-    ctx.lineJoin = "miter";
-    ctx.miterLimit = 10;
-    ctx.globalCompositeOperation = "source-over";
-    ctx.font = "10px sans-serif";
-
-    if (ctx.setLineDash !== undefined) {
-      ctx.setLineDash([]);
-      ctx.lineDashOffset = 0;
-    }
-  }
-
-  function composeSMaskBackdrop(bytes, r0, g0, b0) {
-    var length = bytes.length;
-
-    for (var i = 3; i < length; i += 4) {
-      var alpha = bytes[i];
-
-      if (alpha === 0) {
-        bytes[i - 3] = r0;
-        bytes[i - 2] = g0;
-        bytes[i - 1] = b0;
-      } else if (alpha < 255) {
-        var alpha_ = 255 - alpha;
-        bytes[i - 3] = bytes[i - 3] * alpha + r0 * alpha_ >> 8;
-        bytes[i - 2] = bytes[i - 2] * alpha + g0 * alpha_ >> 8;
-        bytes[i - 1] = bytes[i - 1] * alpha + b0 * alpha_ >> 8;
-      }
-    }
-  }
-
-  function composeSMaskAlpha(maskData, layerData, transferMap) {
-    var length = maskData.length;
-    var scale = 1 / 255;
-
-    for (var i = 3; i < length; i += 4) {
-      var alpha = transferMap ? transferMap[maskData[i]] : maskData[i];
-      layerData[i] = layerData[i] * alpha * scale | 0;
-    }
-  }
-
-  function composeSMaskLuminosity(maskData, layerData, transferMap) {
-    var length = maskData.length;
-
-    for (var i = 3; i < length; i += 4) {
-      var y = maskData[i - 3] * 77 + maskData[i - 2] * 152 + maskData[i - 1] * 28;
-      layerData[i] = transferMap ? layerData[i] * transferMap[y >> 8] >> 8 : layerData[i] * y >> 16;
-    }
-  }
-
-  function genericComposeSMask(maskCtx, layerCtx, width, height, subtype, backdrop, transferMap) {
-    var hasBackdrop = !!backdrop;
-    var r0 = hasBackdrop ? backdrop[0] : 0;
-    var g0 = hasBackdrop ? backdrop[1] : 0;
-    var b0 = hasBackdrop ? backdrop[2] : 0;
-    var composeFn;
-
-    if (subtype === "Luminosity") {
-      composeFn = composeSMaskLuminosity;
-    } else {
-      composeFn = composeSMaskAlpha;
-    }
-
-    var PIXELS_TO_PROCESS = 1048576;
-    var chunkSize = Math.min(height, Math.ceil(PIXELS_TO_PROCESS / width));
-
-    for (var row = 0; row < height; row += chunkSize) {
-      var chunkHeight = Math.min(chunkSize, height - row);
-      var maskData = maskCtx.getImageData(0, row, width, chunkHeight);
-      var layerData = layerCtx.getImageData(0, row, width, chunkHeight);
-
-      if (hasBackdrop) {
-        composeSMaskBackdrop(maskData.data, r0, g0, b0);
-      }
-
-      composeFn(maskData.data, layerData.data, transferMap);
-      maskCtx.putImageData(layerData, 0, row);
-    }
-  }
-
-  function composeSMask(ctx, smask, layerCtx, webGLContext) {
-    var mask = smask.canvas;
-    var maskCtx = smask.context;
-    ctx.setTransform(smask.scaleX, 0, 0, smask.scaleY, smask.offsetX, smask.offsetY);
-    var backdrop = smask.backdrop || null;
-
-    if (!smask.transferMap && webGLContext.isEnabled) {
-      const composed = webGLContext.composeSMask({
-        layer: layerCtx.canvas,
-        mask,
-        properties: {
-          subtype: smask.subtype,
-          backdrop
-        }
-      });
-      ctx.setTransform(1, 0, 0, 1, 0, 0);
-      ctx.drawImage(composed, smask.offsetX, smask.offsetY);
-      return;
-    }
-
-    genericComposeSMask(maskCtx, layerCtx, mask.width, mask.height, smask.subtype, backdrop, smask.transferMap);
-    ctx.drawImage(mask, 0, 0);
-  }
-
-  var LINE_CAP_STYLES = ["butt", "round", "square"];
-  var LINE_JOIN_STYLES = ["miter", "round", "bevel"];
-  var NORMAL_CLIP = {};
-  var EO_CLIP = {};
-  CanvasGraphics.prototype = {
-    beginDrawing({
-      transform,
-      viewport,
-      transparency = false,
-      background = null
-    }) {
-      var width = this.ctx.canvas.width;
-      var height = this.ctx.canvas.height;
+    if (transparency) {
+      const transparentCanvas = this.cachedCanvases.getCanvas("transparent", width, height);
+      this.compositeCtx = this.ctx;
+      this.transparentCanvas = transparentCanvas.canvas;
+      this.ctx = transparentCanvas.context;
       this.ctx.save();
-      this.ctx.fillStyle = background || "rgb(255, 255, 255)";
-      this.ctx.fillRect(0, 0, width, height);
-      this.ctx.restore();
+      this.ctx.transform(...(0, _display_utils.getCurrentTransform)(this.compositeCtx));
+    }
 
-      if (transparency) {
-        var transparentCanvas = this.cachedCanvases.getCanvas("transparent", width, height, true);
-        this.compositeCtx = this.ctx;
-        this.transparentCanvas = transparentCanvas.canvas;
-        this.ctx = transparentCanvas.context;
-        this.ctx.save();
-        this.ctx.transform.apply(this.ctx, this.compositeCtx.mozCurrentTransform);
-      }
+    this.ctx.save();
+    resetCtxToDefault(this.ctx, this.foregroundColor);
 
-      this.ctx.save();
-      resetCtxToDefault(this.ctx);
+    if (transform) {
+      this.ctx.transform(...transform);
+      this.outputScaleX = transform[0];
+      this.outputScaleY = transform[0];
+    }
 
-      if (transform) {
-        this.ctx.transform.apply(this.ctx, transform);
-      }
+    this.ctx.transform(...viewport.transform);
+    this.viewportScale = viewport.scale;
+    this.baseTransform = (0, _display_utils.getCurrentTransform)(this.ctx);
 
-      this.ctx.transform.apply(this.ctx, viewport.transform);
-      this.baseTransform = this.ctx.mozCurrentTransform.slice();
+    if (this.imageLayer) {
+      (0, _display_utils.deprecated)("The `imageLayer` functionality will be removed in the future.");
+      this.imageLayer.beginLayout();
+    }
+  }
 
-      if (this.imageLayer) {
-        this.imageLayer.beginLayout();
-      }
-    },
+  executeOperatorList(operatorList, executionStartIdx, continueCallback, stepper) {
+    const argsArray = operatorList.argsArray;
+    const fnArray = operatorList.fnArray;
+    let i = executionStartIdx || 0;
+    const argsArrayLen = argsArray.length;
 
-    executeOperatorList: function CanvasGraphics_executeOperatorList(operatorList, executionStartIdx, continueCallback, stepper) {
-      var argsArray = operatorList.argsArray;
-      var fnArray = operatorList.fnArray;
-      var i = executionStartIdx || 0;
-      var argsArrayLen = argsArray.length;
+    if (argsArrayLen === i) {
+      return i;
+    }
 
-      if (argsArrayLen === i) {
+    const chunkOperations = argsArrayLen - i > EXECUTION_STEPS && typeof continueCallback === "function";
+    const endTime = chunkOperations ? Date.now() + EXECUTION_TIME : 0;
+    let steps = 0;
+    const commonObjs = this.commonObjs;
+    const objs = this.objs;
+    let fnId;
+
+    while (true) {
+      if (stepper !== undefined && i === stepper.nextBreakPoint) {
+        stepper.breakIt(i, continueCallback);
         return i;
       }
 
-      var chunkOperations = argsArrayLen - i > EXECUTION_STEPS && typeof continueCallback === "function";
-      var endTime = chunkOperations ? Date.now() + EXECUTION_TIME : 0;
-      var steps = 0;
-      var commonObjs = this.commonObjs;
-      var objs = this.objs;
-      var fnId;
+      fnId = fnArray[i];
 
-      while (true) {
-        if (stepper !== undefined && i === stepper.nextBreakPoint) {
-          stepper.breakIt(i, continueCallback);
-          return i;
-        }
+      if (fnId !== _util.OPS.dependency) {
+        this[fnId].apply(this, argsArray[i]);
+      } else {
+        for (const depObjId of argsArray[i]) {
+          const objsPool = depObjId.startsWith("g_") ? commonObjs : objs;
 
-        fnId = fnArray[i];
-
-        if (fnId !== _util.OPS.dependency) {
-          this[fnId].apply(this, argsArray[i]);
-        } else {
-          for (const depObjId of argsArray[i]) {
-            const objsPool = depObjId.startsWith("g_") ? commonObjs : objs;
-
-            if (!objsPool.has(depObjId)) {
-              objsPool.get(depObjId, continueCallback);
-              return i;
-            }
-          }
-        }
-
-        i++;
-
-        if (i === argsArrayLen) {
-          return i;
-        }
-
-        if (chunkOperations && ++steps > EXECUTION_STEPS) {
-          if (Date.now() > endTime) {
-            continueCallback();
+          if (!objsPool.has(depObjId)) {
+            objsPool.get(depObjId, continueCallback);
             return i;
           }
-
-          steps = 0;
         }
       }
-    },
-    endDrawing: function CanvasGraphics_endDrawing() {
-      if (this.current.activeSMask !== null) {
-        this.endSMaskGroup();
+
+      i++;
+
+      if (i === argsArrayLen) {
+        return i;
       }
 
+      if (chunkOperations && ++steps > EXECUTION_STEPS) {
+        if (Date.now() > endTime) {
+          continueCallback();
+          return i;
+        }
+
+        steps = 0;
+      }
+    }
+  }
+
+  #restoreInitialState() {
+    while (this.stateStack.length || this.inSMaskMode) {
+      this.restore();
+    }
+
+    this.ctx.restore();
+
+    if (this.transparentCanvas) {
+      this.ctx = this.compositeCtx;
+      this.ctx.save();
+      this.ctx.setTransform(1, 0, 0, 1, 0, 0);
+      this.ctx.drawImage(this.transparentCanvas, 0, 0);
       this.ctx.restore();
+      this.transparentCanvas = null;
+    }
+  }
 
-      if (this.transparentCanvas) {
-        this.ctx = this.compositeCtx;
-        this.ctx.save();
-        this.ctx.setTransform(1, 0, 0, 1, 0, 0);
-        this.ctx.drawImage(this.transparentCanvas, 0, 0);
-        this.ctx.restore();
-        this.transparentCanvas = null;
-      }
+  endDrawing() {
+    this.#restoreInitialState();
+    this.cachedCanvases.clear();
+    this.cachedPatterns.clear();
 
-      this.cachedCanvases.clear();
-      this.webGLContext.clear();
-
-      if (this.imageLayer) {
-        this.imageLayer.endLayout();
-      }
-    },
-    setLineWidth: function CanvasGraphics_setLineWidth(width) {
-      this.current.lineWidth = width;
-      this.ctx.lineWidth = width;
-    },
-    setLineCap: function CanvasGraphics_setLineCap(style) {
-      this.ctx.lineCap = LINE_CAP_STYLES[style];
-    },
-    setLineJoin: function CanvasGraphics_setLineJoin(style) {
-      this.ctx.lineJoin = LINE_JOIN_STYLES[style];
-    },
-    setMiterLimit: function CanvasGraphics_setMiterLimit(limit) {
-      this.ctx.miterLimit = limit;
-    },
-    setDash: function CanvasGraphics_setDash(dashArray, dashPhase) {
-      var ctx = this.ctx;
-
-      if (ctx.setLineDash !== undefined) {
-        ctx.setLineDash(dashArray);
-        ctx.lineDashOffset = dashPhase;
-      }
-    },
-
-    setRenderingIntent(intent) {},
-
-    setFlatness(flatness) {},
-
-    setGState: function CanvasGraphics_setGState(states) {
-      for (var i = 0, ii = states.length; i < ii; i++) {
-        var state = states[i];
-        var key = state[0];
-        var value = state[1];
-
-        switch (key) {
-          case "LW":
-            this.setLineWidth(value);
-            break;
-
-          case "LC":
-            this.setLineCap(value);
-            break;
-
-          case "LJ":
-            this.setLineJoin(value);
-            break;
-
-          case "ML":
-            this.setMiterLimit(value);
-            break;
-
-          case "D":
-            this.setDash(value[0], value[1]);
-            break;
-
-          case "RI":
-            this.setRenderingIntent(value);
-            break;
-
-          case "FL":
-            this.setFlatness(value);
-            break;
-
-          case "Font":
-            this.setFont(value[0], value[1]);
-            break;
-
-          case "CA":
-            this.current.strokeAlpha = state[1];
-            break;
-
-          case "ca":
-            this.current.fillAlpha = state[1];
-            this.ctx.globalAlpha = state[1];
-            break;
-
-          case "BM":
-            this.ctx.globalCompositeOperation = value;
-            break;
-
-          case "SMask":
-            if (this.current.activeSMask) {
-              if (this.stateStack.length > 0 && this.stateStack[this.stateStack.length - 1].activeSMask === this.current.activeSMask) {
-                this.suspendSMaskGroup();
-              } else {
-                this.endSMaskGroup();
-              }
-            }
-
-            this.current.activeSMask = value ? this.tempSMask : null;
-
-            if (this.current.activeSMask) {
-              this.beginSMaskGroup();
-            }
-
-            this.tempSMask = null;
-            break;
-
-          case "TR":
-            this.current.transferMaps = value;
+    for (const cache of this._cachedBitmapsMap.values()) {
+      for (const canvas of cache.values()) {
+        if (typeof HTMLCanvasElement !== "undefined" && canvas instanceof HTMLCanvasElement) {
+          canvas.width = canvas.height = 0;
         }
       }
-    },
-    beginSMaskGroup: function CanvasGraphics_beginSMaskGroup() {
-      var activeSMask = this.current.activeSMask;
-      var drawnWidth = activeSMask.canvas.width;
-      var drawnHeight = activeSMask.canvas.height;
-      var cacheId = "smaskGroupAt" + this.groupLevel;
-      var scratchCanvas = this.cachedCanvases.getCanvas(cacheId, drawnWidth, drawnHeight, true);
-      var currentCtx = this.ctx;
-      var currentTransform = currentCtx.mozCurrentTransform;
-      this.ctx.save();
-      var groupCtx = scratchCanvas.context;
-      groupCtx.scale(1 / activeSMask.scaleX, 1 / activeSMask.scaleY);
-      groupCtx.translate(-activeSMask.offsetX, -activeSMask.offsetY);
-      groupCtx.transform.apply(groupCtx, currentTransform);
-      activeSMask.startTransformInverse = groupCtx.mozCurrentTransformInverse;
-      copyCtxState(currentCtx, groupCtx);
-      this.ctx = groupCtx;
-      this.setGState([["BM", "source-over"], ["ca", 1], ["CA", 1]]);
-      this.groupStack.push(currentCtx);
-      this.groupLevel++;
-    },
-    suspendSMaskGroup: function CanvasGraphics_endSMaskGroup() {
-      var groupCtx = this.ctx;
-      this.groupLevel--;
-      this.ctx = this.groupStack.pop();
-      composeSMask(this.ctx, this.current.activeSMask, groupCtx, this.webGLContext);
-      this.ctx.restore();
-      this.ctx.save();
-      copyCtxState(groupCtx, this.ctx);
-      this.current.resumeSMaskCtx = groupCtx;
 
-      var deltaTransform = _util.Util.transform(this.current.activeSMask.startTransformInverse, groupCtx.mozCurrentTransform);
+      cache.clear();
+    }
 
-      this.ctx.transform.apply(this.ctx, deltaTransform);
-      groupCtx.save();
-      groupCtx.setTransform(1, 0, 0, 1, 0, 0);
-      groupCtx.clearRect(0, 0, groupCtx.canvas.width, groupCtx.canvas.height);
-      groupCtx.restore();
-    },
-    resumeSMaskGroup: function CanvasGraphics_endSMaskGroup() {
-      var groupCtx = this.current.resumeSMaskCtx;
-      var currentCtx = this.ctx;
-      this.ctx = groupCtx;
-      this.groupStack.push(currentCtx);
-      this.groupLevel++;
-    },
-    endSMaskGroup: function CanvasGraphics_endSMaskGroup() {
-      var groupCtx = this.ctx;
-      this.groupLevel--;
-      this.ctx = this.groupStack.pop();
-      composeSMask(this.ctx, this.current.activeSMask, groupCtx, this.webGLContext);
-      this.ctx.restore();
-      copyCtxState(groupCtx, this.ctx);
+    this._cachedBitmapsMap.clear();
 
-      var deltaTransform = _util.Util.transform(this.current.activeSMask.startTransformInverse, groupCtx.mozCurrentTransform);
+    if (this.imageLayer) {
+      this.imageLayer.endLayout();
+    }
+  }
 
-      this.ctx.transform.apply(this.ctx, deltaTransform);
-    },
-    save: function CanvasGraphics_save() {
-      this.ctx.save();
-      var old = this.current;
-      this.stateStack.push(old);
-      this.current = old.clone();
-      this.current.resumeSMaskCtx = null;
-    },
-    restore: function CanvasGraphics_restore() {
-      if (this.current.resumeSMaskCtx) {
-        this.resumeSMaskGroup();
+  _scaleImage(img, inverseTransform) {
+    const width = img.width;
+    const height = img.height;
+    let widthScale = Math.max(Math.hypot(inverseTransform[0], inverseTransform[1]), 1);
+    let heightScale = Math.max(Math.hypot(inverseTransform[2], inverseTransform[3]), 1);
+    let paintWidth = width,
+        paintHeight = height;
+    let tmpCanvasId = "prescale1";
+    let tmpCanvas, tmpCtx;
+
+    while (widthScale > 2 && paintWidth > 1 || heightScale > 2 && paintHeight > 1) {
+      let newWidth = paintWidth,
+          newHeight = paintHeight;
+
+      if (widthScale > 2 && paintWidth > 1) {
+        newWidth = Math.ceil(paintWidth / 2);
+        widthScale /= paintWidth / newWidth;
       }
 
-      if (this.current.activeSMask !== null && (this.stateStack.length === 0 || this.stateStack[this.stateStack.length - 1].activeSMask !== this.current.activeSMask)) {
-        this.endSMaskGroup();
+      if (heightScale > 2 && paintHeight > 1) {
+        newHeight = Math.ceil(paintHeight / 2);
+        heightScale /= paintHeight / newHeight;
       }
 
-      if (this.stateStack.length !== 0) {
-        this.current = this.stateStack.pop();
+      tmpCanvas = this.cachedCanvases.getCanvas(tmpCanvasId, newWidth, newHeight);
+      tmpCtx = tmpCanvas.context;
+      tmpCtx.clearRect(0, 0, newWidth, newHeight);
+      tmpCtx.drawImage(img, 0, 0, paintWidth, paintHeight, 0, 0, newWidth, newHeight);
+      img = tmpCanvas.canvas;
+      paintWidth = newWidth;
+      paintHeight = newHeight;
+      tmpCanvasId = tmpCanvasId === "prescale1" ? "prescale2" : "prescale1";
+    }
+
+    return {
+      img,
+      paintWidth,
+      paintHeight
+    };
+  }
+
+  _createMaskCanvas(img) {
+    const ctx = this.ctx;
+    const {
+      width,
+      height
+    } = img;
+    const fillColor = this.current.fillColor;
+    const isPatternFill = this.current.patternFill;
+    const currentTransform = (0, _display_utils.getCurrentTransform)(ctx);
+    let cache, cacheKey, scaled, maskCanvas;
+
+    if ((img.bitmap || img.data) && img.count > 1) {
+      const mainKey = img.bitmap || img.data.buffer;
+      const withoutTranslation = currentTransform.slice(0, 4);
+      cacheKey = JSON.stringify(isPatternFill ? withoutTranslation : [withoutTranslation, fillColor]);
+      cache = this._cachedBitmapsMap.get(mainKey);
+
+      if (!cache) {
+        cache = new Map();
+
+        this._cachedBitmapsMap.set(mainKey, cache);
+      }
+
+      const cachedImage = cache.get(cacheKey);
+
+      if (cachedImage && !isPatternFill) {
+        const offsetX = Math.round(Math.min(currentTransform[0], currentTransform[2]) + currentTransform[4]);
+        const offsetY = Math.round(Math.min(currentTransform[1], currentTransform[3]) + currentTransform[5]);
+        return {
+          canvas: cachedImage,
+          offsetX,
+          offsetY
+        };
+      }
+
+      scaled = cachedImage;
+    }
+
+    if (!scaled) {
+      maskCanvas = this.cachedCanvases.getCanvas("maskCanvas", width, height);
+      putBinaryImageMask(maskCanvas.context, img);
+    }
+
+    let maskToCanvas = _util.Util.transform(currentTransform, [1 / width, 0, 0, -1 / height, 0, 0]);
+
+    maskToCanvas = _util.Util.transform(maskToCanvas, [1, 0, 0, 1, 0, -height]);
+
+    const cord1 = _util.Util.applyTransform([0, 0], maskToCanvas);
+
+    const cord2 = _util.Util.applyTransform([width, height], maskToCanvas);
+
+    const rect = _util.Util.normalizeRect([cord1[0], cord1[1], cord2[0], cord2[1]]);
+
+    const drawnWidth = Math.round(rect[2] - rect[0]) || 1;
+    const drawnHeight = Math.round(rect[3] - rect[1]) || 1;
+    const fillCanvas = this.cachedCanvases.getCanvas("fillCanvas", drawnWidth, drawnHeight);
+    const fillCtx = fillCanvas.context;
+    const offsetX = Math.min(cord1[0], cord2[0]);
+    const offsetY = Math.min(cord1[1], cord2[1]);
+    fillCtx.translate(-offsetX, -offsetY);
+    fillCtx.transform(...maskToCanvas);
+
+    if (!scaled) {
+      scaled = this._scaleImage(maskCanvas.canvas, (0, _display_utils.getCurrentTransformInverse)(fillCtx));
+      scaled = scaled.img;
+
+      if (cache && isPatternFill) {
+        cache.set(cacheKey, scaled);
+      }
+    }
+
+    fillCtx.imageSmoothingEnabled = getImageSmoothingEnabled((0, _display_utils.getCurrentTransform)(fillCtx), img.interpolate);
+    drawImageAtIntegerCoords(fillCtx, scaled, 0, 0, scaled.width, scaled.height, 0, 0, width, height);
+    fillCtx.globalCompositeOperation = "source-in";
+
+    const inverse = _util.Util.transform((0, _display_utils.getCurrentTransformInverse)(fillCtx), [1, 0, 0, 1, -offsetX, -offsetY]);
+
+    fillCtx.fillStyle = isPatternFill ? fillColor.getPattern(ctx, this, inverse, _pattern_helper.PathType.FILL) : fillColor;
+    fillCtx.fillRect(0, 0, width, height);
+
+    if (cache && !isPatternFill) {
+      this.cachedCanvases.delete("fillCanvas");
+      cache.set(cacheKey, fillCanvas.canvas);
+    }
+
+    return {
+      canvas: fillCanvas.canvas,
+      offsetX: Math.round(offsetX),
+      offsetY: Math.round(offsetY)
+    };
+  }
+
+  setLineWidth(width) {
+    if (width !== this.current.lineWidth) {
+      this._cachedScaleForStroking = null;
+    }
+
+    this.current.lineWidth = width;
+    this.ctx.lineWidth = width;
+  }
+
+  setLineCap(style) {
+    this.ctx.lineCap = LINE_CAP_STYLES[style];
+  }
+
+  setLineJoin(style) {
+    this.ctx.lineJoin = LINE_JOIN_STYLES[style];
+  }
+
+  setMiterLimit(limit) {
+    this.ctx.miterLimit = limit;
+  }
+
+  setDash(dashArray, dashPhase) {
+    const ctx = this.ctx;
+
+    if (ctx.setLineDash !== undefined) {
+      ctx.setLineDash(dashArray);
+      ctx.lineDashOffset = dashPhase;
+    }
+  }
+
+  setRenderingIntent(intent) {}
+
+  setFlatness(flatness) {}
+
+  setGState(states) {
+    for (let i = 0, ii = states.length; i < ii; i++) {
+      const state = states[i];
+      const key = state[0];
+      const value = state[1];
+
+      switch (key) {
+        case "LW":
+          this.setLineWidth(value);
+          break;
+
+        case "LC":
+          this.setLineCap(value);
+          break;
+
+        case "LJ":
+          this.setLineJoin(value);
+          break;
+
+        case "ML":
+          this.setMiterLimit(value);
+          break;
+
+        case "D":
+          this.setDash(value[0], value[1]);
+          break;
+
+        case "RI":
+          this.setRenderingIntent(value);
+          break;
+
+        case "FL":
+          this.setFlatness(value);
+          break;
+
+        case "Font":
+          this.setFont(value[0], value[1]);
+          break;
+
+        case "CA":
+          this.current.strokeAlpha = state[1];
+          break;
+
+        case "ca":
+          this.current.fillAlpha = state[1];
+          this.ctx.globalAlpha = state[1];
+          break;
+
+        case "BM":
+          this.ctx.globalCompositeOperation = value;
+          break;
+
+        case "SMask":
+          this.current.activeSMask = value ? this.tempSMask : null;
+          this.tempSMask = null;
+          this.checkSMaskState();
+          break;
+
+        case "TR":
+          this.current.transferMaps = value;
+      }
+    }
+  }
+
+  get inSMaskMode() {
+    return !!this.suspendedCtx;
+  }
+
+  checkSMaskState() {
+    const inSMaskMode = this.inSMaskMode;
+
+    if (this.current.activeSMask && !inSMaskMode) {
+      this.beginSMaskMode();
+    } else if (!this.current.activeSMask && inSMaskMode) {
+      this.endSMaskMode();
+    }
+  }
+
+  beginSMaskMode() {
+    if (this.inSMaskMode) {
+      throw new Error("beginSMaskMode called while already in smask mode");
+    }
+
+    const drawnWidth = this.ctx.canvas.width;
+    const drawnHeight = this.ctx.canvas.height;
+    const cacheId = "smaskGroupAt" + this.groupLevel;
+    const scratchCanvas = this.cachedCanvases.getCanvas(cacheId, drawnWidth, drawnHeight);
+    this.suspendedCtx = this.ctx;
+    this.ctx = scratchCanvas.context;
+    const ctx = this.ctx;
+    ctx.setTransform(...(0, _display_utils.getCurrentTransform)(this.suspendedCtx));
+    copyCtxState(this.suspendedCtx, ctx);
+    mirrorContextOperations(ctx, this.suspendedCtx);
+    this.setGState([["BM", "source-over"], ["ca", 1], ["CA", 1]]);
+  }
+
+  endSMaskMode() {
+    if (!this.inSMaskMode) {
+      throw new Error("endSMaskMode called while not in smask mode");
+    }
+
+    this.ctx._removeMirroring();
+
+    copyCtxState(this.ctx, this.suspendedCtx);
+    this.ctx = this.suspendedCtx;
+    this.suspendedCtx = null;
+  }
+
+  compose(dirtyBox) {
+    if (!this.current.activeSMask) {
+      return;
+    }
+
+    if (!dirtyBox) {
+      dirtyBox = [0, 0, this.ctx.canvas.width, this.ctx.canvas.height];
+    } else {
+      dirtyBox[0] = Math.floor(dirtyBox[0]);
+      dirtyBox[1] = Math.floor(dirtyBox[1]);
+      dirtyBox[2] = Math.ceil(dirtyBox[2]);
+      dirtyBox[3] = Math.ceil(dirtyBox[3]);
+    }
+
+    const smask = this.current.activeSMask;
+    const suspendedCtx = this.suspendedCtx;
+    composeSMask(suspendedCtx, smask, this.ctx, dirtyBox);
+    this.ctx.save();
+    this.ctx.setTransform(1, 0, 0, 1, 0, 0);
+    this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
+    this.ctx.restore();
+  }
+
+  save() {
+    if (this.inSMaskMode) {
+      copyCtxState(this.ctx, this.suspendedCtx);
+      this.suspendedCtx.save();
+    } else {
+      this.ctx.save();
+    }
+
+    const old = this.current;
+    this.stateStack.push(old);
+    this.current = old.clone();
+  }
+
+  restore() {
+    if (this.stateStack.length === 0 && this.inSMaskMode) {
+      this.endSMaskMode();
+    }
+
+    if (this.stateStack.length !== 0) {
+      this.current = this.stateStack.pop();
+
+      if (this.inSMaskMode) {
+        this.suspendedCtx.restore();
+        copyCtxState(this.suspendedCtx, this.ctx);
+      } else {
         this.ctx.restore();
-        this.pendingClip = null;
-        this._cachedGetSinglePixelWidth = null;
       }
-    },
-    transform: function CanvasGraphics_transform(a, b, c, d, e, f) {
-      this.ctx.transform(a, b, c, d, e, f);
+
+      this.checkSMaskState();
+      this.pendingClip = null;
+      this._cachedScaleForStroking = null;
       this._cachedGetSinglePixelWidth = null;
-    },
-    constructPath: function CanvasGraphics_constructPath(ops, args) {
-      var ctx = this.ctx;
-      var current = this.current;
-      var x = current.x,
-          y = current.y;
+    }
+  }
 
-      for (var i = 0, j = 0, ii = ops.length; i < ii; i++) {
-        switch (ops[i] | 0) {
-          case _util.OPS.rectangle:
-            x = args[j++];
-            y = args[j++];
-            var width = args[j++];
-            var height = args[j++];
+  transform(a, b, c, d, e, f) {
+    this.ctx.transform(a, b, c, d, e, f);
+    this._cachedScaleForStroking = null;
+    this._cachedGetSinglePixelWidth = null;
+  }
 
-            if (width === 0 && ctx.lineWidth < this.getSinglePixelWidth()) {
-              width = this.getSinglePixelWidth();
-            }
+  constructPath(ops, args, minMax) {
+    const ctx = this.ctx;
+    const current = this.current;
+    let x = current.x,
+        y = current.y;
+    let startX, startY;
+    const currentTransform = (0, _display_utils.getCurrentTransform)(ctx);
+    const isScalingMatrix = currentTransform[0] === 0 && currentTransform[3] === 0 || currentTransform[1] === 0 && currentTransform[2] === 0;
+    const minMaxForBezier = isScalingMatrix ? minMax.slice(0) : null;
 
-            if (height === 0 && ctx.lineWidth < this.getSinglePixelWidth()) {
-              height = this.getSinglePixelWidth();
-            }
+    for (let i = 0, j = 0, ii = ops.length; i < ii; i++) {
+      switch (ops[i] | 0) {
+        case _util.OPS.rectangle:
+          x = args[j++];
+          y = args[j++];
+          const width = args[j++];
+          const height = args[j++];
+          const xw = x + width;
+          const yh = y + height;
+          ctx.moveTo(x, y);
 
-            var xw = x + width;
-            var yh = y + height;
-            ctx.moveTo(x, y);
+          if (width === 0 || height === 0) {
+            ctx.lineTo(xw, yh);
+          } else {
             ctx.lineTo(xw, y);
             ctx.lineTo(xw, yh);
             ctx.lineTo(x, yh);
-            ctx.lineTo(x, y);
-            ctx.closePath();
-            break;
+          }
 
-          case _util.OPS.moveTo:
-            x = args[j++];
-            y = args[j++];
-            ctx.moveTo(x, y);
-            break;
+          if (!isScalingMatrix) {
+            current.updateRectMinMax(currentTransform, [x, y, xw, yh]);
+          }
 
-          case _util.OPS.lineTo:
-            x = args[j++];
-            y = args[j++];
-            ctx.lineTo(x, y);
-            break;
+          ctx.closePath();
+          break;
 
-          case _util.OPS.curveTo:
-            x = args[j + 4];
-            y = args[j + 5];
-            ctx.bezierCurveTo(args[j], args[j + 1], args[j + 2], args[j + 3], x, y);
-            j += 6;
-            break;
+        case _util.OPS.moveTo:
+          x = args[j++];
+          y = args[j++];
+          ctx.moveTo(x, y);
 
-          case _util.OPS.curveTo2:
-            ctx.bezierCurveTo(x, y, args[j], args[j + 1], args[j + 2], args[j + 3]);
-            x = args[j + 2];
-            y = args[j + 3];
-            j += 4;
-            break;
+          if (!isScalingMatrix) {
+            current.updatePathMinMax(currentTransform, x, y);
+          }
 
-          case _util.OPS.curveTo3:
-            x = args[j + 2];
-            y = args[j + 3];
-            ctx.bezierCurveTo(args[j], args[j + 1], x, y, x, y);
-            j += 4;
-            break;
+          break;
 
-          case _util.OPS.closePath:
-            ctx.closePath();
-            break;
-        }
+        case _util.OPS.lineTo:
+          x = args[j++];
+          y = args[j++];
+          ctx.lineTo(x, y);
+
+          if (!isScalingMatrix) {
+            current.updatePathMinMax(currentTransform, x, y);
+          }
+
+          break;
+
+        case _util.OPS.curveTo:
+          startX = x;
+          startY = y;
+          x = args[j + 4];
+          y = args[j + 5];
+          ctx.bezierCurveTo(args[j], args[j + 1], args[j + 2], args[j + 3], x, y);
+          current.updateCurvePathMinMax(currentTransform, startX, startY, args[j], args[j + 1], args[j + 2], args[j + 3], x, y, minMaxForBezier);
+          j += 6;
+          break;
+
+        case _util.OPS.curveTo2:
+          startX = x;
+          startY = y;
+          ctx.bezierCurveTo(x, y, args[j], args[j + 1], args[j + 2], args[j + 3]);
+          current.updateCurvePathMinMax(currentTransform, startX, startY, x, y, args[j], args[j + 1], args[j + 2], args[j + 3], minMaxForBezier);
+          x = args[j + 2];
+          y = args[j + 3];
+          j += 4;
+          break;
+
+        case _util.OPS.curveTo3:
+          startX = x;
+          startY = y;
+          x = args[j + 2];
+          y = args[j + 3];
+          ctx.bezierCurveTo(args[j], args[j + 1], x, y, x, y);
+          current.updateCurvePathMinMax(currentTransform, startX, startY, args[j], args[j + 1], x, y, x, y, minMaxForBezier);
+          j += 4;
+          break;
+
+        case _util.OPS.closePath:
+          ctx.closePath();
+          break;
       }
+    }
 
-      current.setCurrentPoint(x, y);
-    },
-    closePath: function CanvasGraphics_closePath() {
-      this.ctx.closePath();
-    },
-    stroke: function CanvasGraphics_stroke(consumePath) {
-      consumePath = typeof consumePath !== "undefined" ? consumePath : true;
-      var ctx = this.ctx;
-      var strokeColor = this.current.strokeColor;
-      ctx.globalAlpha = this.current.strokeAlpha;
+    if (isScalingMatrix) {
+      current.updateScalingPathMinMax(currentTransform, minMaxForBezier);
+    }
 
-      if (this.contentVisible) {
-        if (strokeColor && strokeColor.hasOwnProperty("type") && strokeColor.type === "Pattern") {
-          ctx.save();
-          const transform = ctx.mozCurrentTransform;
+    current.setCurrentPoint(x, y);
+  }
 
-          const scale = _util.Util.singularValueDecompose2dScale(transform)[0];
+  closePath() {
+    this.ctx.closePath();
+  }
 
-          ctx.strokeStyle = strokeColor.getPattern(ctx, this);
-          ctx.lineWidth = Math.max(this.getSinglePixelWidth() * MIN_WIDTH_FACTOR, this.current.lineWidth * scale);
-          ctx.stroke();
-          ctx.restore();
-        } else {
-          ctx.lineWidth = Math.max(this.getSinglePixelWidth() * MIN_WIDTH_FACTOR, this.current.lineWidth);
-          ctx.stroke();
-        }
-      }
+  stroke(consumePath) {
+    consumePath = typeof consumePath !== "undefined" ? consumePath : true;
+    const ctx = this.ctx;
+    const strokeColor = this.current.strokeColor;
+    ctx.globalAlpha = this.current.strokeAlpha;
 
-      if (consumePath) {
-        this.consumePath();
-      }
-
-      ctx.globalAlpha = this.current.fillAlpha;
-    },
-    closeStroke: function CanvasGraphics_closeStroke() {
-      this.closePath();
-      this.stroke();
-    },
-    fill: function CanvasGraphics_fill(consumePath) {
-      consumePath = typeof consumePath !== "undefined" ? consumePath : true;
-      var ctx = this.ctx;
-      var fillColor = this.current.fillColor;
-      var isPatternFill = this.current.patternFill;
-      var needRestore = false;
-
-      if (isPatternFill) {
+    if (this.contentVisible) {
+      if (typeof strokeColor === "object" && strokeColor?.getPattern) {
         ctx.save();
-
-        if (this.baseTransform) {
-          ctx.setTransform.apply(ctx, this.baseTransform);
-        }
-
-        ctx.fillStyle = fillColor.getPattern(ctx, this);
-        needRestore = true;
-      }
-
-      if (this.contentVisible) {
-        if (this.pendingEOFill) {
-          ctx.fill("evenodd");
-          this.pendingEOFill = false;
-        } else {
-          ctx.fill();
-        }
-      }
-
-      if (needRestore) {
+        ctx.strokeStyle = strokeColor.getPattern(ctx, this, (0, _display_utils.getCurrentTransformInverse)(ctx), _pattern_helper.PathType.STROKE);
+        this.rescaleAndStroke(false);
         ctx.restore();
+      } else {
+        this.rescaleAndStroke(true);
       }
+    }
 
-      if (consumePath) {
-        this.consumePath();
-      }
-    },
-    eoFill: function CanvasGraphics_eoFill() {
-      this.pendingEOFill = true;
-      this.fill();
-    },
-    fillStroke: function CanvasGraphics_fillStroke() {
-      this.fill(false);
-      this.stroke(false);
-      this.consumePath();
-    },
-    eoFillStroke: function CanvasGraphics_eoFillStroke() {
-      this.pendingEOFill = true;
-      this.fillStroke();
-    },
-    closeFillStroke: function CanvasGraphics_closeFillStroke() {
-      this.closePath();
-      this.fillStroke();
-    },
-    closeEOFillStroke: function CanvasGraphics_closeEOFillStroke() {
-      this.pendingEOFill = true;
-      this.closePath();
-      this.fillStroke();
-    },
-    endPath: function CanvasGraphics_endPath() {
-      this.consumePath();
-    },
-    clip: function CanvasGraphics_clip() {
-      this.pendingClip = NORMAL_CLIP;
-    },
-    eoClip: function CanvasGraphics_eoClip() {
-      this.pendingClip = EO_CLIP;
-    },
-    beginText: function CanvasGraphics_beginText() {
-      this.current.textMatrix = _util.IDENTITY_MATRIX;
-      this.current.textMatrixScale = 1;
-      this.current.x = this.current.lineX = 0;
-      this.current.y = this.current.lineY = 0;
-    },
-    endText: function CanvasGraphics_endText() {
-      var paths = this.pendingTextPaths;
-      var ctx = this.ctx;
+    if (consumePath) {
+      this.consumePath(this.current.getClippedPathBoundingBox());
+    }
 
-      if (paths === undefined) {
-        ctx.beginPath();
-        return;
-      }
+    ctx.globalAlpha = this.current.fillAlpha;
+  }
 
+  closeStroke() {
+    this.closePath();
+    this.stroke();
+  }
+
+  fill(consumePath) {
+    consumePath = typeof consumePath !== "undefined" ? consumePath : true;
+    const ctx = this.ctx;
+    const fillColor = this.current.fillColor;
+    const isPatternFill = this.current.patternFill;
+    let needRestore = false;
+
+    if (isPatternFill) {
       ctx.save();
-      ctx.beginPath();
+      ctx.fillStyle = fillColor.getPattern(ctx, this, (0, _display_utils.getCurrentTransformInverse)(ctx), _pattern_helper.PathType.FILL);
+      needRestore = true;
+    }
 
-      for (var i = 0; i < paths.length; i++) {
-        var path = paths[i];
-        ctx.setTransform.apply(ctx, path.transform);
-        ctx.translate(path.x, path.y);
-        path.addToPath(ctx, path.fontSize);
+    const intersect = this.current.getClippedPathBoundingBox();
+
+    if (this.contentVisible && intersect !== null) {
+      if (this.pendingEOFill) {
+        ctx.fill("evenodd");
+        this.pendingEOFill = false;
+      } else {
+        ctx.fill();
+      }
+    }
+
+    if (needRestore) {
+      ctx.restore();
+    }
+
+    if (consumePath) {
+      this.consumePath(intersect);
+    }
+  }
+
+  eoFill() {
+    this.pendingEOFill = true;
+    this.fill();
+  }
+
+  fillStroke() {
+    this.fill(false);
+    this.stroke(false);
+    this.consumePath();
+  }
+
+  eoFillStroke() {
+    this.pendingEOFill = true;
+    this.fillStroke();
+  }
+
+  closeFillStroke() {
+    this.closePath();
+    this.fillStroke();
+  }
+
+  closeEOFillStroke() {
+    this.pendingEOFill = true;
+    this.closePath();
+    this.fillStroke();
+  }
+
+  endPath() {
+    this.consumePath();
+  }
+
+  clip() {
+    this.pendingClip = NORMAL_CLIP;
+  }
+
+  eoClip() {
+    this.pendingClip = EO_CLIP;
+  }
+
+  beginText() {
+    this.current.textMatrix = _util.IDENTITY_MATRIX;
+    this.current.textMatrixScale = 1;
+    this.current.x = this.current.lineX = 0;
+    this.current.y = this.current.lineY = 0;
+  }
+
+  endText() {
+    const paths = this.pendingTextPaths;
+    const ctx = this.ctx;
+
+    if (paths === undefined) {
+      ctx.beginPath();
+      return;
+    }
+
+    ctx.save();
+    ctx.beginPath();
+
+    for (const path of paths) {
+      ctx.setTransform(...path.transform);
+      ctx.translate(path.x, path.y);
+      path.addToPath(ctx, path.fontSize);
+    }
+
+    ctx.restore();
+    ctx.clip();
+    ctx.beginPath();
+    delete this.pendingTextPaths;
+  }
+
+  setCharSpacing(spacing) {
+    this.current.charSpacing = spacing;
+  }
+
+  setWordSpacing(spacing) {
+    this.current.wordSpacing = spacing;
+  }
+
+  setHScale(scale) {
+    this.current.textHScale = scale / 100;
+  }
+
+  setLeading(leading) {
+    this.current.leading = -leading;
+  }
+
+  setFont(fontRefName, size) {
+    const fontObj = this.commonObjs.get(fontRefName);
+    const current = this.current;
+
+    if (!fontObj) {
+      throw new Error(`Can't find font for ${fontRefName}`);
+    }
+
+    current.fontMatrix = fontObj.fontMatrix || _util.FONT_IDENTITY_MATRIX;
+
+    if (current.fontMatrix[0] === 0 || current.fontMatrix[3] === 0) {
+      (0, _util.warn)("Invalid font matrix for font " + fontRefName);
+    }
+
+    if (size < 0) {
+      size = -size;
+      current.fontDirection = -1;
+    } else {
+      current.fontDirection = 1;
+    }
+
+    this.current.font = fontObj;
+    this.current.fontSize = size;
+
+    if (fontObj.isType3Font) {
+      return;
+    }
+
+    const name = fontObj.loadedName || "sans-serif";
+    let bold = "normal";
+
+    if (fontObj.black) {
+      bold = "900";
+    } else if (fontObj.bold) {
+      bold = "bold";
+    }
+
+    const italic = fontObj.italic ? "italic" : "normal";
+    const typeface = `"${name}", ${fontObj.fallbackName}`;
+    let browserFontSize = size;
+
+    if (size < MIN_FONT_SIZE) {
+      browserFontSize = MIN_FONT_SIZE;
+    } else if (size > MAX_FONT_SIZE) {
+      browserFontSize = MAX_FONT_SIZE;
+    }
+
+    this.current.fontSizeScale = size / browserFontSize;
+    this.ctx.font = `${italic} ${bold} ${browserFontSize}px ${typeface}`;
+  }
+
+  setTextRenderingMode(mode) {
+    this.current.textRenderingMode = mode;
+  }
+
+  setTextRise(rise) {
+    this.current.textRise = rise;
+  }
+
+  moveText(x, y) {
+    this.current.x = this.current.lineX += x;
+    this.current.y = this.current.lineY += y;
+  }
+
+  setLeadingMoveText(x, y) {
+    this.setLeading(-y);
+    this.moveText(x, y);
+  }
+
+  setTextMatrix(a, b, c, d, e, f) {
+    this.current.textMatrix = [a, b, c, d, e, f];
+    this.current.textMatrixScale = Math.hypot(a, b);
+    this.current.x = this.current.lineX = 0;
+    this.current.y = this.current.lineY = 0;
+  }
+
+  nextLine() {
+    this.moveText(0, this.current.leading);
+  }
+
+  paintChar(character, x, y, patternTransform) {
+    const ctx = this.ctx;
+    const current = this.current;
+    const font = current.font;
+    const textRenderingMode = current.textRenderingMode;
+    const fontSize = current.fontSize / current.fontSizeScale;
+    const fillStrokeMode = textRenderingMode & _util.TextRenderingMode.FILL_STROKE_MASK;
+    const isAddToPathSet = !!(textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG);
+    const patternFill = current.patternFill && !font.missingFile;
+    let addToPath;
+
+    if (font.disableFontFace || isAddToPathSet || patternFill) {
+      addToPath = font.getPathGenerator(this.commonObjs, character);
+    }
+
+    if (font.disableFontFace || patternFill) {
+      ctx.save();
+      ctx.translate(x, y);
+      ctx.beginPath();
+      addToPath(ctx, fontSize);
+
+      if (patternTransform) {
+        ctx.setTransform(...patternTransform);
+      }
+
+      if (fillStrokeMode === _util.TextRenderingMode.FILL || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
+        ctx.fill();
+      }
+
+      if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
+        ctx.stroke();
       }
 
       ctx.restore();
-      ctx.clip();
-      ctx.beginPath();
-      delete this.pendingTextPaths;
-    },
-    setCharSpacing: function CanvasGraphics_setCharSpacing(spacing) {
-      this.current.charSpacing = spacing;
-    },
-    setWordSpacing: function CanvasGraphics_setWordSpacing(spacing) {
-      this.current.wordSpacing = spacing;
-    },
-    setHScale: function CanvasGraphics_setHScale(scale) {
-      this.current.textHScale = scale / 100;
-    },
-    setLeading: function CanvasGraphics_setLeading(leading) {
-      this.current.leading = -leading;
-    },
-    setFont: function CanvasGraphics_setFont(fontRefName, size) {
-      var fontObj = this.commonObjs.get(fontRefName);
-      var current = this.current;
-
-      if (!fontObj) {
-        throw new Error(`Can't find font for ${fontRefName}`);
+    } else {
+      if (fillStrokeMode === _util.TextRenderingMode.FILL || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
+        ctx.fillText(character, x, y);
       }
 
-      current.fontMatrix = fontObj.fontMatrix ? fontObj.fontMatrix : _util.FONT_IDENTITY_MATRIX;
-
-      if (current.fontMatrix[0] === 0 || current.fontMatrix[3] === 0) {
-        (0, _util.warn)("Invalid font matrix for font " + fontRefName);
+      if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
+        ctx.strokeText(character, x, y);
       }
+    }
 
-      if (size < 0) {
-        size = -size;
-        current.fontDirection = -1;
-      } else {
-        current.fontDirection = 1;
+    if (isAddToPathSet) {
+      const paths = this.pendingTextPaths || (this.pendingTextPaths = []);
+      paths.push({
+        transform: (0, _display_utils.getCurrentTransform)(ctx),
+        x,
+        y,
+        fontSize,
+        addToPath
+      });
+    }
+  }
+
+  get isFontSubpixelAAEnabled() {
+    const {
+      context: ctx
+    } = this.cachedCanvases.getCanvas("isFontSubpixelAAEnabled", 10, 10);
+    ctx.scale(1.5, 1);
+    ctx.fillText("I", 0, 10);
+    const data = ctx.getImageData(0, 0, 10, 10).data;
+    let enabled = false;
+
+    for (let i = 3; i < data.length; i += 4) {
+      if (data[i] > 0 && data[i] < 255) {
+        enabled = true;
+        break;
       }
+    }
 
-      this.current.font = fontObj;
-      this.current.fontSize = size;
+    return (0, _util.shadow)(this, "isFontSubpixelAAEnabled", enabled);
+  }
 
-      if (fontObj.isType3Font) {
-        return;
-      }
+  showText(glyphs) {
+    const current = this.current;
+    const font = current.font;
 
-      var name = fontObj.loadedName || "sans-serif";
-      let bold = "normal";
+    if (font.isType3Font) {
+      return this.showType3Text(glyphs);
+    }
 
-      if (fontObj.black) {
-        bold = "900";
-      } else if (fontObj.bold) {
-        bold = "bold";
-      }
+    const fontSize = current.fontSize;
 
-      var italic = fontObj.italic ? "italic" : "normal";
-      var typeface = `"${name}", ${fontObj.fallbackName}`;
-      let browserFontSize = size;
+    if (fontSize === 0) {
+      return undefined;
+    }
 
-      if (size < MIN_FONT_SIZE) {
-        browserFontSize = MIN_FONT_SIZE;
-      } else if (size > MAX_FONT_SIZE) {
-        browserFontSize = MAX_FONT_SIZE;
-      }
+    const ctx = this.ctx;
+    const fontSizeScale = current.fontSizeScale;
+    const charSpacing = current.charSpacing;
+    const wordSpacing = current.wordSpacing;
+    const fontDirection = current.fontDirection;
+    const textHScale = current.textHScale * fontDirection;
+    const glyphsLength = glyphs.length;
+    const vertical = font.vertical;
+    const spacingDir = vertical ? 1 : -1;
+    const defaultVMetrics = font.defaultVMetrics;
+    const widthAdvanceScale = fontSize * current.fontMatrix[0];
+    const simpleFillText = current.textRenderingMode === _util.TextRenderingMode.FILL && !font.disableFontFace && !current.patternFill;
+    ctx.save();
+    ctx.transform(...current.textMatrix);
+    ctx.translate(current.x, current.y + current.textRise);
 
-      this.current.fontSizeScale = size / browserFontSize;
-      this.ctx.font = `${italic} ${bold} ${browserFontSize}px ${typeface}`;
-    },
-    setTextRenderingMode: function CanvasGraphics_setTextRenderingMode(mode) {
-      this.current.textRenderingMode = mode;
-    },
-    setTextRise: function CanvasGraphics_setTextRise(rise) {
-      this.current.textRise = rise;
-    },
-    moveText: function CanvasGraphics_moveText(x, y) {
-      this.current.x = this.current.lineX += x;
-      this.current.y = this.current.lineY += y;
-    },
-    setLeadingMoveText: function CanvasGraphics_setLeadingMoveText(x, y) {
-      this.setLeading(-y);
-      this.moveText(x, y);
-    },
-    setTextMatrix: function CanvasGraphics_setTextMatrix(a, b, c, d, e, f) {
-      this.current.textMatrix = [a, b, c, d, e, f];
-      this.current.textMatrixScale = Math.sqrt(a * a + b * b);
-      this.current.x = this.current.lineX = 0;
-      this.current.y = this.current.lineY = 0;
-    },
-    nextLine: function CanvasGraphics_nextLine() {
-      this.moveText(0, this.current.leading);
-    },
+    if (fontDirection > 0) {
+      ctx.scale(textHScale, -1);
+    } else {
+      ctx.scale(textHScale, 1);
+    }
 
-    paintChar(character, x, y, patternTransform) {
-      var ctx = this.ctx;
-      var current = this.current;
-      var font = current.font;
-      var textRenderingMode = current.textRenderingMode;
-      var fontSize = current.fontSize / current.fontSizeScale;
-      var fillStrokeMode = textRenderingMode & _util.TextRenderingMode.FILL_STROKE_MASK;
-      var isAddToPathSet = !!(textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG);
-      const patternFill = current.patternFill && !font.missingFile;
-      var addToPath;
+    let patternTransform;
 
-      if (font.disableFontFace || isAddToPathSet || patternFill) {
-        addToPath = font.getPathGenerator(this.commonObjs, character);
-      }
-
-      if (font.disableFontFace || patternFill) {
-        ctx.save();
-        ctx.translate(x, y);
-        ctx.beginPath();
-        addToPath(ctx, fontSize);
-
-        if (patternTransform) {
-          ctx.setTransform.apply(ctx, patternTransform);
-        }
-
-        if (fillStrokeMode === _util.TextRenderingMode.FILL || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
-          ctx.fill();
-        }
-
-        if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
-          ctx.stroke();
-        }
-
-        ctx.restore();
-      } else {
-        if (fillStrokeMode === _util.TextRenderingMode.FILL || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
-          ctx.fillText(character, x, y);
-        }
-
-        if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
-          ctx.strokeText(character, x, y);
-        }
-      }
-
-      if (isAddToPathSet) {
-        var paths = this.pendingTextPaths || (this.pendingTextPaths = []);
-        paths.push({
-          transform: ctx.mozCurrentTransform,
-          x,
-          y,
-          fontSize,
-          addToPath
-        });
-      }
-    },
-
-    get isFontSubpixelAAEnabled() {
-      const {
-        context: ctx
-      } = this.cachedCanvases.getCanvas("isFontSubpixelAAEnabled", 10, 10);
-      ctx.scale(1.5, 1);
-      ctx.fillText("I", 0, 10);
-      var data = ctx.getImageData(0, 0, 10, 10).data;
-      var enabled = false;
-
-      for (var i = 3; i < data.length; i += 4) {
-        if (data[i] > 0 && data[i] < 255) {
-          enabled = true;
-          break;
-        }
-      }
-
-      return (0, _util.shadow)(this, "isFontSubpixelAAEnabled", enabled);
-    },
-
-    showText: function CanvasGraphics_showText(glyphs) {
-      var current = this.current;
-      var font = current.font;
-
-      if (font.isType3Font) {
-        return this.showType3Text(glyphs);
-      }
-
-      var fontSize = current.fontSize;
-
-      if (fontSize === 0) {
-        return undefined;
-      }
-
-      var ctx = this.ctx;
-      var fontSizeScale = current.fontSizeScale;
-      var charSpacing = current.charSpacing;
-      var wordSpacing = current.wordSpacing;
-      var fontDirection = current.fontDirection;
-      var textHScale = current.textHScale * fontDirection;
-      var glyphsLength = glyphs.length;
-      var vertical = font.vertical;
-      var spacingDir = vertical ? 1 : -1;
-      var defaultVMetrics = font.defaultVMetrics;
-      var widthAdvanceScale = fontSize * current.fontMatrix[0];
-      var simpleFillText = current.textRenderingMode === _util.TextRenderingMode.FILL && !font.disableFontFace && !current.patternFill;
+    if (current.patternFill) {
       ctx.save();
-      let patternTransform;
+      const pattern = current.fillColor.getPattern(ctx, this, (0, _display_utils.getCurrentTransformInverse)(ctx), _pattern_helper.PathType.FILL);
+      patternTransform = (0, _display_utils.getCurrentTransform)(ctx);
+      ctx.restore();
+      ctx.fillStyle = pattern;
+    }
 
-      if (current.patternFill) {
-        ctx.save();
-        const pattern = current.fillColor.getPattern(ctx, this);
-        patternTransform = ctx.mozCurrentTransform;
-        ctx.restore();
-        ctx.fillStyle = pattern;
+    let lineWidth = current.lineWidth;
+    const scale = current.textMatrixScale;
+
+    if (scale === 0 || lineWidth === 0) {
+      const fillStrokeMode = current.textRenderingMode & _util.TextRenderingMode.FILL_STROKE_MASK;
+
+      if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
+        lineWidth = this.getSinglePixelWidth();
+      }
+    } else {
+      lineWidth /= scale;
+    }
+
+    if (fontSizeScale !== 1.0) {
+      ctx.scale(fontSizeScale, fontSizeScale);
+      lineWidth /= fontSizeScale;
+    }
+
+    ctx.lineWidth = lineWidth;
+    let x = 0,
+        i;
+
+    for (i = 0; i < glyphsLength; ++i) {
+      const glyph = glyphs[i];
+
+      if (typeof glyph === "number") {
+        x += spacingDir * glyph * fontSize / 1000;
+        continue;
       }
 
-      ctx.transform.apply(ctx, current.textMatrix);
-      ctx.translate(current.x, current.y + current.textRise);
-
-      if (fontDirection > 0) {
-        ctx.scale(textHScale, -1);
-      } else {
-        ctx.scale(textHScale, 1);
-      }
-
-      var lineWidth = current.lineWidth;
-      var scale = current.textMatrixScale;
-
-      if (scale === 0 || lineWidth === 0) {
-        var fillStrokeMode = current.textRenderingMode & _util.TextRenderingMode.FILL_STROKE_MASK;
-
-        if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
-          this._cachedGetSinglePixelWidth = null;
-          lineWidth = this.getSinglePixelWidth() * MIN_WIDTH_FACTOR;
-        }
-      } else {
-        lineWidth /= scale;
-      }
-
-      if (fontSizeScale !== 1.0) {
-        ctx.scale(fontSizeScale, fontSizeScale);
-        lineWidth /= fontSizeScale;
-      }
-
-      ctx.lineWidth = lineWidth;
-      var x = 0,
-          i;
-
-      for (i = 0; i < glyphsLength; ++i) {
-        var glyph = glyphs[i];
-
-        if ((0, _util.isNum)(glyph)) {
-          x += spacingDir * glyph * fontSize / 1000;
-          continue;
-        }
-
-        var restoreNeeded = false;
-        var spacing = (glyph.isSpace ? wordSpacing : 0) + charSpacing;
-        var character = glyph.fontChar;
-        var accent = glyph.accent;
-        var scaledX, scaledY, scaledAccentX, scaledAccentY;
-        var width = glyph.width;
-
-        if (vertical) {
-          var vmetric, vx, vy;
-          vmetric = glyph.vmetric || defaultVMetrics;
-          vx = glyph.vmetric ? vmetric[1] : width * 0.5;
-          vx = -vx * widthAdvanceScale;
-          vy = vmetric[2] * widthAdvanceScale;
-          width = vmetric ? -vmetric[0] : width;
-          scaledX = vx / fontSizeScale;
-          scaledY = (x + vy) / fontSizeScale;
-        } else {
-          scaledX = x / fontSizeScale;
-          scaledY = 0;
-        }
-
-        if (font.remeasure && width > 0) {
-          var measuredWidth = ctx.measureText(character).width * 1000 / fontSize * fontSizeScale;
-
-          if (width < measuredWidth && this.isFontSubpixelAAEnabled) {
-            var characterScaleX = width / measuredWidth;
-            restoreNeeded = true;
-            ctx.save();
-            ctx.scale(characterScaleX, 1);
-            scaledX /= characterScaleX;
-          } else if (width !== measuredWidth) {
-            scaledX += (width - measuredWidth) / 2000 * fontSize / fontSizeScale;
-          }
-        }
-
-        if (this.contentVisible && (glyph.isInFont || font.missingFile)) {
-          if (simpleFillText && !accent) {
-            ctx.fillText(character, scaledX, scaledY);
-          } else {
-            this.paintChar(character, scaledX, scaledY, patternTransform);
-
-            if (accent) {
-              scaledAccentX = scaledX + fontSize * accent.offset.x / fontSizeScale;
-              scaledAccentY = scaledY - fontSize * accent.offset.y / fontSizeScale;
-              this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY, patternTransform);
-            }
-          }
-        }
-
-        var charWidth;
-
-        if (vertical) {
-          charWidth = width * widthAdvanceScale - spacing * fontDirection;
-        } else {
-          charWidth = width * widthAdvanceScale + spacing * fontDirection;
-        }
-
-        x += charWidth;
-
-        if (restoreNeeded) {
-          ctx.restore();
-        }
-      }
+      let restoreNeeded = false;
+      const spacing = (glyph.isSpace ? wordSpacing : 0) + charSpacing;
+      const character = glyph.fontChar;
+      const accent = glyph.accent;
+      let scaledX, scaledY;
+      let width = glyph.width;
 
       if (vertical) {
-        current.y -= x;
+        const vmetric = glyph.vmetric || defaultVMetrics;
+        const vx = -(glyph.vmetric ? vmetric[1] : width * 0.5) * widthAdvanceScale;
+        const vy = vmetric[2] * widthAdvanceScale;
+        width = vmetric ? -vmetric[0] : width;
+        scaledX = vx / fontSizeScale;
+        scaledY = (x + vy) / fontSizeScale;
       } else {
-        current.x += x * textHScale;
+        scaledX = x / fontSizeScale;
+        scaledY = 0;
       }
 
-      ctx.restore();
-    },
-    showType3Text: function CanvasGraphics_showType3Text(glyphs) {
-      var ctx = this.ctx;
-      var current = this.current;
-      var font = current.font;
-      var fontSize = current.fontSize;
-      var fontDirection = current.fontDirection;
-      var spacingDir = font.vertical ? 1 : -1;
-      var charSpacing = current.charSpacing;
-      var wordSpacing = current.wordSpacing;
-      var textHScale = current.textHScale * fontDirection;
-      var fontMatrix = current.fontMatrix || _util.FONT_IDENTITY_MATRIX;
-      var glyphsLength = glyphs.length;
-      var isTextInvisible = current.textRenderingMode === _util.TextRenderingMode.INVISIBLE;
-      var i, glyph, width, spacingLength;
+      if (font.remeasure && width > 0) {
+        const measuredWidth = ctx.measureText(character).width * 1000 / fontSize * fontSizeScale;
 
-      if (isTextInvisible || fontSize === 0) {
-        return;
+        if (width < measuredWidth && this.isFontSubpixelAAEnabled) {
+          const characterScaleX = width / measuredWidth;
+          restoreNeeded = true;
+          ctx.save();
+          ctx.scale(characterScaleX, 1);
+          scaledX /= characterScaleX;
+        } else if (width !== measuredWidth) {
+          scaledX += (width - measuredWidth) / 2000 * fontSize / fontSizeScale;
+        }
       }
 
-      this._cachedGetSinglePixelWidth = null;
-      ctx.save();
-      ctx.transform.apply(ctx, current.textMatrix);
-      ctx.translate(current.x, current.y);
-      ctx.scale(textHScale, fontDirection);
+      if (this.contentVisible && (glyph.isInFont || font.missingFile)) {
+        if (simpleFillText && !accent) {
+          ctx.fillText(character, scaledX, scaledY);
+        } else {
+          this.paintChar(character, scaledX, scaledY, patternTransform);
 
-      for (i = 0; i < glyphsLength; ++i) {
-        glyph = glyphs[i];
-
-        if ((0, _util.isNum)(glyph)) {
-          spacingLength = spacingDir * glyph * fontSize / 1000;
-          this.ctx.translate(spacingLength, 0);
-          current.x += spacingLength * textHScale;
-          continue;
+          if (accent) {
+            const scaledAccentX = scaledX + fontSize * accent.offset.x / fontSizeScale;
+            const scaledAccentY = scaledY - fontSize * accent.offset.y / fontSizeScale;
+            this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY, patternTransform);
+          }
         }
-
-        var spacing = (glyph.isSpace ? wordSpacing : 0) + charSpacing;
-        var operatorList = font.charProcOperatorList[glyph.operatorListId];
-
-        if (!operatorList) {
-          (0, _util.warn)(`Type3 character "${glyph.operatorListId}" is not available.`);
-          continue;
-        }
-
-        if (this.contentVisible) {
-          this.processingType3 = glyph;
-          this.save();
-          ctx.scale(fontSize, fontSize);
-          ctx.transform.apply(ctx, fontMatrix);
-          this.executeOperatorList(operatorList);
-          this.restore();
-        }
-
-        var transformed = _util.Util.applyTransform([glyph.width, 0], fontMatrix);
-
-        width = transformed[0] * fontSize + spacing;
-        ctx.translate(width, 0);
-        current.x += width * textHScale;
       }
 
-      ctx.restore();
-      this.processingType3 = null;
-    },
-    setCharWidth: function CanvasGraphics_setCharWidth(xWidth, yWidth) {},
-    setCharWidthAndBounds: function CanvasGraphics_setCharWidthAndBounds(xWidth, yWidth, llx, lly, urx, ury) {
-      this.ctx.rect(llx, lly, urx - llx, ury - lly);
+      let charWidth;
+
+      if (vertical) {
+        charWidth = width * widthAdvanceScale - spacing * fontDirection;
+      } else {
+        charWidth = width * widthAdvanceScale + spacing * fontDirection;
+      }
+
+      x += charWidth;
+
+      if (restoreNeeded) {
+        ctx.restore();
+      }
+    }
+
+    if (vertical) {
+      current.y -= x;
+    } else {
+      current.x += x * textHScale;
+    }
+
+    ctx.restore();
+    this.compose();
+    return undefined;
+  }
+
+  showType3Text(glyphs) {
+    const ctx = this.ctx;
+    const current = this.current;
+    const font = current.font;
+    const fontSize = current.fontSize;
+    const fontDirection = current.fontDirection;
+    const spacingDir = font.vertical ? 1 : -1;
+    const charSpacing = current.charSpacing;
+    const wordSpacing = current.wordSpacing;
+    const textHScale = current.textHScale * fontDirection;
+    const fontMatrix = current.fontMatrix || _util.FONT_IDENTITY_MATRIX;
+    const glyphsLength = glyphs.length;
+    const isTextInvisible = current.textRenderingMode === _util.TextRenderingMode.INVISIBLE;
+    let i, glyph, width, spacingLength;
+
+    if (isTextInvisible || fontSize === 0) {
+      return;
+    }
+
+    this._cachedScaleForStroking = null;
+    this._cachedGetSinglePixelWidth = null;
+    ctx.save();
+    ctx.transform(...current.textMatrix);
+    ctx.translate(current.x, current.y);
+    ctx.scale(textHScale, fontDirection);
+
+    for (i = 0; i < glyphsLength; ++i) {
+      glyph = glyphs[i];
+
+      if (typeof glyph === "number") {
+        spacingLength = spacingDir * glyph * fontSize / 1000;
+        this.ctx.translate(spacingLength, 0);
+        current.x += spacingLength * textHScale;
+        continue;
+      }
+
+      const spacing = (glyph.isSpace ? wordSpacing : 0) + charSpacing;
+      const operatorList = font.charProcOperatorList[glyph.operatorListId];
+
+      if (!operatorList) {
+        (0, _util.warn)(`Type3 character "${glyph.operatorListId}" is not available.`);
+        continue;
+      }
+
+      if (this.contentVisible) {
+        this.processingType3 = glyph;
+        this.save();
+        ctx.scale(fontSize, fontSize);
+        ctx.transform(...fontMatrix);
+        this.executeOperatorList(operatorList);
+        this.restore();
+      }
+
+      const transformed = _util.Util.applyTransform([glyph.width, 0], fontMatrix);
+
+      width = transformed[0] * fontSize + spacing;
+      ctx.translate(width, 0);
+      current.x += width * textHScale;
+    }
+
+    ctx.restore();
+    this.processingType3 = null;
+  }
+
+  setCharWidth(xWidth, yWidth) {}
+
+  setCharWidthAndBounds(xWidth, yWidth, llx, lly, urx, ury) {
+    this.ctx.rect(llx, lly, urx - llx, ury - lly);
+    this.ctx.clip();
+    this.endPath();
+  }
+
+  getColorN_Pattern(IR) {
+    let pattern;
+
+    if (IR[0] === "TilingPattern") {
+      const color = IR[1];
+      const baseTransform = this.baseTransform || (0, _display_utils.getCurrentTransform)(this.ctx);
+      const canvasGraphicsFactory = {
+        createCanvasGraphics: ctx => {
+          return new CanvasGraphics(ctx, this.commonObjs, this.objs, this.canvasFactory);
+        }
+      };
+      pattern = new _pattern_helper.TilingPattern(IR, color, this.ctx, canvasGraphicsFactory, baseTransform);
+    } else {
+      pattern = this._getPattern(IR[1], IR[2]);
+    }
+
+    return pattern;
+  }
+
+  setStrokeColorN() {
+    this.current.strokeColor = this.getColorN_Pattern(arguments);
+  }
+
+  setFillColorN() {
+    this.current.fillColor = this.getColorN_Pattern(arguments);
+    this.current.patternFill = true;
+  }
+
+  setStrokeRGBColor(r, g, b) {
+    const color = this.selectColor?.(r, g, b) || _util.Util.makeHexColor(r, g, b);
+
+    this.ctx.strokeStyle = color;
+    this.current.strokeColor = color;
+  }
+
+  setFillRGBColor(r, g, b) {
+    const color = this.selectColor?.(r, g, b) || _util.Util.makeHexColor(r, g, b);
+
+    this.ctx.fillStyle = color;
+    this.current.fillColor = color;
+    this.current.patternFill = false;
+  }
+
+  _getPattern(objId, matrix = null) {
+    let pattern;
+
+    if (this.cachedPatterns.has(objId)) {
+      pattern = this.cachedPatterns.get(objId);
+    } else {
+      pattern = (0, _pattern_helper.getShadingPattern)(this.objs.get(objId));
+      this.cachedPatterns.set(objId, pattern);
+    }
+
+    if (matrix) {
+      pattern.matrix = matrix;
+    }
+
+    return pattern;
+  }
+
+  shadingFill(objId) {
+    if (!this.contentVisible) {
+      return;
+    }
+
+    const ctx = this.ctx;
+    this.save();
+
+    const pattern = this._getPattern(objId);
+
+    ctx.fillStyle = pattern.getPattern(ctx, this, (0, _display_utils.getCurrentTransformInverse)(ctx), _pattern_helper.PathType.SHADING);
+    const inv = (0, _display_utils.getCurrentTransformInverse)(ctx);
+
+    if (inv) {
+      const canvas = ctx.canvas;
+      const width = canvas.width;
+      const height = canvas.height;
+
+      const bl = _util.Util.applyTransform([0, 0], inv);
+
+      const br = _util.Util.applyTransform([0, height], inv);
+
+      const ul = _util.Util.applyTransform([width, 0], inv);
+
+      const ur = _util.Util.applyTransform([width, height], inv);
+
+      const x0 = Math.min(bl[0], br[0], ul[0], ur[0]);
+      const y0 = Math.min(bl[1], br[1], ul[1], ur[1]);
+      const x1 = Math.max(bl[0], br[0], ul[0], ur[0]);
+      const y1 = Math.max(bl[1], br[1], ul[1], ur[1]);
+      this.ctx.fillRect(x0, y0, x1 - x0, y1 - y0);
+    } else {
+      this.ctx.fillRect(-1e10, -1e10, 2e10, 2e10);
+    }
+
+    this.compose(this.current.getClippedPathBoundingBox());
+    this.restore();
+  }
+
+  beginInlineImage() {
+    (0, _util.unreachable)("Should not call beginInlineImage");
+  }
+
+  beginImageData() {
+    (0, _util.unreachable)("Should not call beginImageData");
+  }
+
+  paintFormXObjectBegin(matrix, bbox) {
+    if (!this.contentVisible) {
+      return;
+    }
+
+    this.save();
+    this.baseTransformStack.push(this.baseTransform);
+
+    if (Array.isArray(matrix) && matrix.length === 6) {
+      this.transform(...matrix);
+    }
+
+    this.baseTransform = (0, _display_utils.getCurrentTransform)(this.ctx);
+
+    if (bbox) {
+      const width = bbox[2] - bbox[0];
+      const height = bbox[3] - bbox[1];
+      this.ctx.rect(bbox[0], bbox[1], width, height);
+      this.current.updateRectMinMax((0, _display_utils.getCurrentTransform)(this.ctx), bbox);
       this.clip();
       this.endPath();
-    },
-    getColorN_Pattern: function CanvasGraphics_getColorN_Pattern(IR) {
-      var pattern;
+    }
+  }
 
-      if (IR[0] === "TilingPattern") {
-        var color = IR[1];
-        var baseTransform = this.baseTransform || this.ctx.mozCurrentTransform.slice();
-        var canvasGraphicsFactory = {
-          createCanvasGraphics: ctx => {
-            return new CanvasGraphics(ctx, this.commonObjs, this.objs, this.canvasFactory, this.webGLContext);
-          }
-        };
-        pattern = new _pattern_helper.TilingPattern(IR, color, this.ctx, canvasGraphicsFactory, baseTransform);
-      } else {
-        pattern = (0, _pattern_helper.getShadingPatternFromIR)(IR);
-      }
+  paintFormXObjectEnd() {
+    if (!this.contentVisible) {
+      return;
+    }
 
-      return pattern;
-    },
-    setStrokeColorN: function CanvasGraphics_setStrokeColorN() {
-      this.current.strokeColor = this.getColorN_Pattern(arguments);
-    },
-    setFillColorN: function CanvasGraphics_setFillColorN() {
-      this.current.fillColor = this.getColorN_Pattern(arguments);
-      this.current.patternFill = true;
-    },
-    setStrokeRGBColor: function CanvasGraphics_setStrokeRGBColor(r, g, b) {
-      var color = _util.Util.makeCssRgb(r, g, b);
+    this.restore();
+    this.baseTransform = this.baseTransformStack.pop();
+  }
 
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillRGBColor: function CanvasGraphics_setFillRGBColor(r, g, b) {
-      var color = _util.Util.makeCssRgb(r, g, b);
+  beginGroup(group) {
+    if (!this.contentVisible) {
+      return;
+    }
 
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-      this.current.patternFill = false;
-    },
-    shadingFill: function CanvasGraphics_shadingFill(patternIR) {
-      if (!this.contentVisible) {
-        return;
-      }
+    this.save();
 
-      var ctx = this.ctx;
-      this.save();
-      var pattern = (0, _pattern_helper.getShadingPatternFromIR)(patternIR);
-      ctx.fillStyle = pattern.getPattern(ctx, this, true);
-      var inv = ctx.mozCurrentTransformInverse;
-
-      if (inv) {
-        var canvas = ctx.canvas;
-        var width = canvas.width;
-        var height = canvas.height;
-
-        var bl = _util.Util.applyTransform([0, 0], inv);
-
-        var br = _util.Util.applyTransform([0, height], inv);
-
-        var ul = _util.Util.applyTransform([width, 0], inv);
-
-        var ur = _util.Util.applyTransform([width, height], inv);
-
-        var x0 = Math.min(bl[0], br[0], ul[0], ur[0]);
-        var y0 = Math.min(bl[1], br[1], ul[1], ur[1]);
-        var x1 = Math.max(bl[0], br[0], ul[0], ur[0]);
-        var y1 = Math.max(bl[1], br[1], ul[1], ur[1]);
-        this.ctx.fillRect(x0, y0, x1 - x0, y1 - y0);
-      } else {
-        this.ctx.fillRect(-1e10, -1e10, 2e10, 2e10);
-      }
-
-      this.restore();
-    },
-    beginInlineImage: function CanvasGraphics_beginInlineImage() {
-      (0, _util.unreachable)("Should not call beginInlineImage");
-    },
-    beginImageData: function CanvasGraphics_beginImageData() {
-      (0, _util.unreachable)("Should not call beginImageData");
-    },
-    paintFormXObjectBegin: function CanvasGraphics_paintFormXObjectBegin(matrix, bbox) {
-      if (!this.contentVisible) {
-        return;
-      }
-
-      this.save();
-      this.baseTransformStack.push(this.baseTransform);
-
-      if (Array.isArray(matrix) && matrix.length === 6) {
-        this.transform.apply(this, matrix);
-      }
-
-      this.baseTransform = this.ctx.mozCurrentTransform;
-
-      if (bbox) {
-        var width = bbox[2] - bbox[0];
-        var height = bbox[3] - bbox[1];
-        this.ctx.rect(bbox[0], bbox[1], width, height);
-        this.clip();
-        this.endPath();
-      }
-    },
-    paintFormXObjectEnd: function CanvasGraphics_paintFormXObjectEnd() {
-      if (!this.contentVisible) {
-        return;
-      }
-
-      this.restore();
-      this.baseTransform = this.baseTransformStack.pop();
-    },
-    beginGroup: function CanvasGraphics_beginGroup(group) {
-      if (!this.contentVisible) {
-        return;
-      }
-
-      this.save();
-      var currentCtx = this.ctx;
-
-      if (!group.isolated) {
-        (0, _util.info)("TODO: Support non-isolated groups.");
-      }
-
-      if (group.knockout) {
-        (0, _util.warn)("Knockout groups not supported.");
-      }
-
-      var currentTransform = currentCtx.mozCurrentTransform;
-
-      if (group.matrix) {
-        currentCtx.transform.apply(currentCtx, group.matrix);
-      }
-
-      if (!group.bbox) {
-        throw new Error("Bounding box is required.");
-      }
-
-      var bounds = _util.Util.getAxialAlignedBoundingBox(group.bbox, currentCtx.mozCurrentTransform);
-
-      var canvasBounds = [0, 0, currentCtx.canvas.width, currentCtx.canvas.height];
-      bounds = _util.Util.intersect(bounds, canvasBounds) || [0, 0, 0, 0];
-      var offsetX = Math.floor(bounds[0]);
-      var offsetY = Math.floor(bounds[1]);
-      var drawnWidth = Math.max(Math.ceil(bounds[2]) - offsetX, 1);
-      var drawnHeight = Math.max(Math.ceil(bounds[3]) - offsetY, 1);
-      var scaleX = 1,
-          scaleY = 1;
-
-      if (drawnWidth > MAX_GROUP_SIZE) {
-        scaleX = drawnWidth / MAX_GROUP_SIZE;
-        drawnWidth = MAX_GROUP_SIZE;
-      }
-
-      if (drawnHeight > MAX_GROUP_SIZE) {
-        scaleY = drawnHeight / MAX_GROUP_SIZE;
-        drawnHeight = MAX_GROUP_SIZE;
-      }
-
-      var cacheId = "groupAt" + this.groupLevel;
-
-      if (group.smask) {
-        cacheId += "_smask_" + this.smaskCounter++ % 2;
-      }
-
-      var scratchCanvas = this.cachedCanvases.getCanvas(cacheId, drawnWidth, drawnHeight, true);
-      var groupCtx = scratchCanvas.context;
-      groupCtx.scale(1 / scaleX, 1 / scaleY);
-      groupCtx.translate(-offsetX, -offsetY);
-      groupCtx.transform.apply(groupCtx, currentTransform);
-
-      if (group.smask) {
-        this.smaskStack.push({
-          canvas: scratchCanvas.canvas,
-          context: groupCtx,
-          offsetX,
-          offsetY,
-          scaleX,
-          scaleY,
-          subtype: group.smask.subtype,
-          backdrop: group.smask.backdrop,
-          transferMap: group.smask.transferMap || null,
-          startTransformInverse: null
-        });
-      } else {
-        currentCtx.setTransform(1, 0, 0, 1, 0, 0);
-        currentCtx.translate(offsetX, offsetY);
-        currentCtx.scale(scaleX, scaleY);
-      }
-
-      copyCtxState(currentCtx, groupCtx);
-      this.ctx = groupCtx;
-      this.setGState([["BM", "source-over"], ["ca", 1], ["CA", 1]]);
-      this.groupStack.push(currentCtx);
-      this.groupLevel++;
+    if (this.inSMaskMode) {
+      this.endSMaskMode();
       this.current.activeSMask = null;
-    },
-    endGroup: function CanvasGraphics_endGroup(group) {
-      if (!this.contentVisible) {
-        return;
-      }
+    }
 
-      this.groupLevel--;
-      var groupCtx = this.ctx;
-      this.ctx = this.groupStack.pop();
+    const currentCtx = this.ctx;
 
-      if (this.ctx.imageSmoothingEnabled !== undefined) {
-        this.ctx.imageSmoothingEnabled = false;
-      } else {
-        this.ctx.mozImageSmoothingEnabled = false;
-      }
+    if (!group.isolated) {
+      (0, _util.info)("TODO: Support non-isolated groups.");
+    }
 
-      if (group.smask) {
-        this.tempSMask = this.smaskStack.pop();
-      } else {
-        this.ctx.drawImage(groupCtx.canvas, 0, 0);
-      }
+    if (group.knockout) {
+      (0, _util.warn)("Knockout groups not supported.");
+    }
 
+    const currentTransform = (0, _display_utils.getCurrentTransform)(currentCtx);
+
+    if (group.matrix) {
+      currentCtx.transform(...group.matrix);
+    }
+
+    if (!group.bbox) {
+      throw new Error("Bounding box is required.");
+    }
+
+    let bounds = _util.Util.getAxialAlignedBoundingBox(group.bbox, (0, _display_utils.getCurrentTransform)(currentCtx));
+
+    const canvasBounds = [0, 0, currentCtx.canvas.width, currentCtx.canvas.height];
+    bounds = _util.Util.intersect(bounds, canvasBounds) || [0, 0, 0, 0];
+    const offsetX = Math.floor(bounds[0]);
+    const offsetY = Math.floor(bounds[1]);
+    let drawnWidth = Math.max(Math.ceil(bounds[2]) - offsetX, 1);
+    let drawnHeight = Math.max(Math.ceil(bounds[3]) - offsetY, 1);
+    let scaleX = 1,
+        scaleY = 1;
+
+    if (drawnWidth > MAX_GROUP_SIZE) {
+      scaleX = drawnWidth / MAX_GROUP_SIZE;
+      drawnWidth = MAX_GROUP_SIZE;
+    }
+
+    if (drawnHeight > MAX_GROUP_SIZE) {
+      scaleY = drawnHeight / MAX_GROUP_SIZE;
+      drawnHeight = MAX_GROUP_SIZE;
+    }
+
+    this.current.startNewPathAndClipBox([0, 0, drawnWidth, drawnHeight]);
+    let cacheId = "groupAt" + this.groupLevel;
+
+    if (group.smask) {
+      cacheId += "_smask_" + this.smaskCounter++ % 2;
+    }
+
+    const scratchCanvas = this.cachedCanvases.getCanvas(cacheId, drawnWidth, drawnHeight);
+    const groupCtx = scratchCanvas.context;
+    groupCtx.scale(1 / scaleX, 1 / scaleY);
+    groupCtx.translate(-offsetX, -offsetY);
+    groupCtx.transform(...currentTransform);
+
+    if (group.smask) {
+      this.smaskStack.push({
+        canvas: scratchCanvas.canvas,
+        context: groupCtx,
+        offsetX,
+        offsetY,
+        scaleX,
+        scaleY,
+        subtype: group.smask.subtype,
+        backdrop: group.smask.backdrop,
+        transferMap: group.smask.transferMap || null,
+        startTransformInverse: null
+      });
+    } else {
+      currentCtx.setTransform(1, 0, 0, 1, 0, 0);
+      currentCtx.translate(offsetX, offsetY);
+      currentCtx.scale(scaleX, scaleY);
+      currentCtx.save();
+    }
+
+    copyCtxState(currentCtx, groupCtx);
+    this.ctx = groupCtx;
+    this.setGState([["BM", "source-over"], ["ca", 1], ["CA", 1]]);
+    this.groupStack.push(currentCtx);
+    this.groupLevel++;
+  }
+
+  endGroup(group) {
+    if (!this.contentVisible) {
+      return;
+    }
+
+    this.groupLevel--;
+    const groupCtx = this.ctx;
+    const ctx = this.groupStack.pop();
+    this.ctx = ctx;
+    this.ctx.imageSmoothingEnabled = false;
+
+    if (group.smask) {
+      this.tempSMask = this.smaskStack.pop();
       this.restore();
-    },
-    beginAnnotations: function CanvasGraphics_beginAnnotations() {
-      this.save();
-
-      if (this.baseTransform) {
-        this.ctx.setTransform.apply(this.ctx, this.baseTransform);
-      }
-    },
-    endAnnotations: function CanvasGraphics_endAnnotations() {
+    } else {
+      this.ctx.restore();
+      const currentMtx = (0, _display_utils.getCurrentTransform)(this.ctx);
       this.restore();
-    },
-    beginAnnotation: function CanvasGraphics_beginAnnotation(rect, transform, matrix) {
-      this.save();
-      resetCtxToDefault(this.ctx);
-      this.current = new CanvasExtraState();
+      this.ctx.save();
+      this.ctx.setTransform(...currentMtx);
 
-      if (Array.isArray(rect) && rect.length === 4) {
-        var width = rect[2] - rect[0];
-        var height = rect[3] - rect[1];
+      const dirtyBox = _util.Util.getAxialAlignedBoundingBox([0, 0, groupCtx.canvas.width, groupCtx.canvas.height], currentMtx);
+
+      this.ctx.drawImage(groupCtx.canvas, 0, 0);
+      this.ctx.restore();
+      this.compose(dirtyBox);
+    }
+  }
+
+  beginAnnotation(id, rect, transform, matrix, hasOwnCanvas) {
+    this.#restoreInitialState();
+    resetCtxToDefault(this.ctx, this.foregroundColor);
+    this.ctx.save();
+    this.save();
+
+    if (this.baseTransform) {
+      this.ctx.setTransform(...this.baseTransform);
+    }
+
+    if (Array.isArray(rect) && rect.length === 4) {
+      const width = rect[2] - rect[0];
+      const height = rect[3] - rect[1];
+
+      if (hasOwnCanvas && this.annotationCanvasMap) {
+        transform = transform.slice();
+        transform[4] -= rect[0];
+        transform[5] -= rect[1];
+        rect = rect.slice();
+        rect[0] = rect[1] = 0;
+        rect[2] = width;
+        rect[3] = height;
+
+        const [scaleX, scaleY] = _util.Util.singularValueDecompose2dScale((0, _display_utils.getCurrentTransform)(this.ctx));
+
+        const {
+          viewportScale
+        } = this;
+        const canvasWidth = Math.ceil(width * this.outputScaleX * viewportScale);
+        const canvasHeight = Math.ceil(height * this.outputScaleY * viewportScale);
+        this.annotationCanvas = this.canvasFactory.create(canvasWidth, canvasHeight);
+        const {
+          canvas,
+          context
+        } = this.annotationCanvas;
+        this.annotationCanvasMap.set(id, canvas);
+        this.annotationCanvas.savedCtx = this.ctx;
+        this.ctx = context;
+        this.ctx.setTransform(scaleX, 0, 0, -scaleY, 0, height * scaleY);
+        resetCtxToDefault(this.ctx, this.foregroundColor);
+      } else {
+        resetCtxToDefault(this.ctx, this.foregroundColor);
         this.ctx.rect(rect[0], rect[1], width, height);
-        this.clip();
+        this.ctx.clip();
         this.endPath();
       }
+    }
 
-      this.transform.apply(this, transform);
-      this.transform.apply(this, matrix);
-    },
-    endAnnotation: function CanvasGraphics_endAnnotation() {
-      this.restore();
-    },
-    paintImageMaskXObject: function CanvasGraphics_paintImageMaskXObject(img) {
-      if (!this.contentVisible) {
-        return;
+    this.current = new CanvasExtraState(this.ctx.canvas.width, this.ctx.canvas.height);
+    this.transform(...transform);
+    this.transform(...matrix);
+  }
+
+  endAnnotation() {
+    if (this.annotationCanvas) {
+      this.ctx = this.annotationCanvas.savedCtx;
+      delete this.annotationCanvas.savedCtx;
+      delete this.annotationCanvas;
+    }
+  }
+
+  paintImageMaskXObject(img) {
+    if (!this.contentVisible) {
+      return;
+    }
+
+    const count = img.count;
+    img = this.getObject(img.data, img);
+    img.count = count;
+    const ctx = this.ctx;
+    const glyph = this.processingType3;
+
+    if (glyph) {
+      if (glyph.compiled === undefined) {
+        glyph.compiled = compileType3Glyph(img);
       }
 
-      var ctx = this.ctx;
-      var width = img.width,
-          height = img.height;
-      var fillColor = this.current.fillColor;
-      var isPatternFill = this.current.patternFill;
-      var glyph = this.processingType3;
-
-      if (COMPILE_TYPE3_GLYPHS && glyph && glyph.compiled === undefined) {
-        if (width <= MAX_SIZE_TO_COMPILE && height <= MAX_SIZE_TO_COMPILE) {
-          glyph.compiled = compileType3Glyph({
-            data: img.data,
-            width,
-            height
-          });
-        } else {
-          glyph.compiled = null;
-        }
-      }
-
-      if (glyph && glyph.compiled) {
+      if (glyph.compiled) {
         glyph.compiled(ctx);
         return;
       }
+    }
 
-      var maskCanvas = this.cachedCanvases.getCanvas("maskCanvas", width, height);
-      var maskCtx = maskCanvas.context;
+    const mask = this._createMaskCanvas(img);
+
+    const maskCanvas = mask.canvas;
+    ctx.save();
+    ctx.setTransform(1, 0, 0, 1, 0, 0);
+    ctx.drawImage(maskCanvas, mask.offsetX, mask.offsetY);
+    ctx.restore();
+    this.compose();
+  }
+
+  paintImageMaskXObjectRepeat(img, scaleX, skewX = 0, skewY = 0, scaleY, positions) {
+    if (!this.contentVisible) {
+      return;
+    }
+
+    img = this.getObject(img.data, img);
+    const ctx = this.ctx;
+    ctx.save();
+    const currentTransform = (0, _display_utils.getCurrentTransform)(ctx);
+    ctx.transform(scaleX, skewX, skewY, scaleY, 0, 0);
+
+    const mask = this._createMaskCanvas(img);
+
+    ctx.setTransform(1, 0, 0, 1, 0, 0);
+
+    for (let i = 0, ii = positions.length; i < ii; i += 2) {
+      const trans = _util.Util.transform(currentTransform, [scaleX, skewX, skewY, scaleY, positions[i], positions[i + 1]]);
+
+      const [x, y] = _util.Util.applyTransform([0, 0], trans);
+
+      ctx.drawImage(mask.canvas, x, y);
+    }
+
+    ctx.restore();
+    this.compose();
+  }
+
+  paintImageMaskXObjectGroup(images) {
+    if (!this.contentVisible) {
+      return;
+    }
+
+    const ctx = this.ctx;
+    const fillColor = this.current.fillColor;
+    const isPatternFill = this.current.patternFill;
+
+    for (const image of images) {
+      const {
+        data,
+        width,
+        height,
+        transform
+      } = image;
+      const maskCanvas = this.cachedCanvases.getCanvas("maskCanvas", width, height);
+      const maskCtx = maskCanvas.context;
       maskCtx.save();
+      const img = this.getObject(data, image);
       putBinaryImageMask(maskCtx, img);
       maskCtx.globalCompositeOperation = "source-in";
-      maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this) : fillColor;
+      maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this, (0, _display_utils.getCurrentTransformInverse)(ctx), _pattern_helper.PathType.FILL) : fillColor;
       maskCtx.fillRect(0, 0, width, height);
       maskCtx.restore();
-      this.paintInlineImageXObject(maskCanvas.canvas);
-    },
+      ctx.save();
+      ctx.transform(...transform);
+      ctx.scale(1, -1);
+      drawImageAtIntegerCoords(ctx, maskCanvas.canvas, 0, 0, width, height, 0, -1, 1, 1);
+      ctx.restore();
+    }
 
-    paintImageMaskXObjectRepeat(imgData, scaleX, skewX = 0, skewY = 0, scaleY, positions) {
-      if (!this.contentVisible) {
-        return;
-      }
+    this.compose();
+  }
 
-      var width = imgData.width;
-      var height = imgData.height;
-      var fillColor = this.current.fillColor;
-      var isPatternFill = this.current.patternFill;
-      var maskCanvas = this.cachedCanvases.getCanvas("maskCanvas", width, height);
-      var maskCtx = maskCanvas.context;
-      maskCtx.save();
-      putBinaryImageMask(maskCtx, imgData);
-      maskCtx.globalCompositeOperation = "source-in";
-      maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this) : fillColor;
-      maskCtx.fillRect(0, 0, width, height);
-      maskCtx.restore();
-      var ctx = this.ctx;
+  paintImageXObject(objId) {
+    if (!this.contentVisible) {
+      return;
+    }
 
-      for (var i = 0, ii = positions.length; i < ii; i += 2) {
-        ctx.save();
-        ctx.transform(scaleX, skewX, skewY, scaleY, positions[i], positions[i + 1]);
-        ctx.scale(1, -1);
-        ctx.drawImage(maskCanvas.canvas, 0, 0, width, height, 0, -1, 1, 1);
-        ctx.restore();
-      }
-    },
+    const imgData = this.getObject(objId);
 
-    paintImageMaskXObjectGroup: function CanvasGraphics_paintImageMaskXObjectGroup(images) {
-      if (!this.contentVisible) {
-        return;
-      }
+    if (!imgData) {
+      (0, _util.warn)("Dependent image isn't ready yet");
+      return;
+    }
 
-      var ctx = this.ctx;
-      var fillColor = this.current.fillColor;
-      var isPatternFill = this.current.patternFill;
+    this.paintInlineImageXObject(imgData);
+  }
 
-      for (var i = 0, ii = images.length; i < ii; i++) {
-        var image = images[i];
-        var width = image.width,
-            height = image.height;
-        var maskCanvas = this.cachedCanvases.getCanvas("maskCanvas", width, height);
-        var maskCtx = maskCanvas.context;
-        maskCtx.save();
-        putBinaryImageMask(maskCtx, image);
-        maskCtx.globalCompositeOperation = "source-in";
-        maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this) : fillColor;
-        maskCtx.fillRect(0, 0, width, height);
-        maskCtx.restore();
-        ctx.save();
-        ctx.transform.apply(ctx, image.transform);
-        ctx.scale(1, -1);
-        ctx.drawImage(maskCanvas.canvas, 0, 0, width, height, 0, -1, 1, 1);
-        ctx.restore();
-      }
-    },
-    paintImageXObject: function CanvasGraphics_paintImageXObject(objId) {
-      if (!this.contentVisible) {
-        return;
-      }
+  paintImageXObjectRepeat(objId, scaleX, scaleY, positions) {
+    if (!this.contentVisible) {
+      return;
+    }
 
-      const imgData = objId.startsWith("g_") ? this.commonObjs.get(objId) : this.objs.get(objId);
+    const imgData = this.getObject(objId);
 
-      if (!imgData) {
-        (0, _util.warn)("Dependent image isn't ready yet");
-        return;
-      }
+    if (!imgData) {
+      (0, _util.warn)("Dependent image isn't ready yet");
+      return;
+    }
 
-      this.paintInlineImageXObject(imgData);
-    },
-    paintImageXObjectRepeat: function CanvasGraphics_paintImageXObjectRepeat(objId, scaleX, scaleY, positions) {
-      if (!this.contentVisible) {
-        return;
-      }
+    const width = imgData.width;
+    const height = imgData.height;
+    const map = [];
 
-      const imgData = objId.startsWith("g_") ? this.commonObjs.get(objId) : this.objs.get(objId);
+    for (let i = 0, ii = positions.length; i < ii; i += 2) {
+      map.push({
+        transform: [scaleX, 0, 0, scaleY, positions[i], positions[i + 1]],
+        x: 0,
+        y: 0,
+        w: width,
+        h: height
+      });
+    }
 
-      if (!imgData) {
-        (0, _util.warn)("Dependent image isn't ready yet");
-        return;
-      }
+    this.paintInlineImageXObjectGroup(imgData, map);
+  }
 
-      var width = imgData.width;
-      var height = imgData.height;
-      var map = [];
+  paintInlineImageXObject(imgData) {
+    if (!this.contentVisible) {
+      return;
+    }
 
-      for (var i = 0, ii = positions.length; i < ii; i += 2) {
-        map.push({
-          transform: [scaleX, 0, 0, scaleY, positions[i], positions[i + 1]],
-          x: 0,
-          y: 0,
-          w: width,
-          h: height
-        });
-      }
+    const width = imgData.width;
+    const height = imgData.height;
+    const ctx = this.ctx;
+    this.save();
+    ctx.scale(1 / width, -1 / height);
+    let imgToPaint;
 
-      this.paintInlineImageXObjectGroup(imgData, map);
-    },
-    paintInlineImageXObject: function CanvasGraphics_paintInlineImageXObject(imgData) {
-      if (!this.contentVisible) {
-        return;
-      }
+    if (typeof HTMLElement === "function" && imgData instanceof HTMLElement || !imgData.data) {
+      imgToPaint = imgData;
+    } else {
+      const tmpCanvas = this.cachedCanvases.getCanvas("inlineImage", width, height);
+      const tmpCtx = tmpCanvas.context;
+      putBinaryImageData(tmpCtx, imgData, this.current.transferMaps);
+      imgToPaint = tmpCanvas.canvas;
+    }
 
-      var width = imgData.width;
-      var height = imgData.height;
-      var ctx = this.ctx;
-      this.save();
-      ctx.scale(1 / width, -1 / height);
-      var currentTransform = ctx.mozCurrentTransformInverse;
-      var a = currentTransform[0],
-          b = currentTransform[1];
-      var widthScale = Math.max(Math.sqrt(a * a + b * b), 1);
-      var c = currentTransform[2],
-          d = currentTransform[3];
-      var heightScale = Math.max(Math.sqrt(c * c + d * d), 1);
-      var imgToPaint, tmpCanvas;
+    const scaled = this._scaleImage(imgToPaint, (0, _display_utils.getCurrentTransformInverse)(ctx));
 
-      if (typeof HTMLElement === "function" && imgData instanceof HTMLElement || !imgData.data) {
-        imgToPaint = imgData;
-      } else {
-        tmpCanvas = this.cachedCanvases.getCanvas("inlineImage", width, height);
-        var tmpCtx = tmpCanvas.context;
-        putBinaryImageData(tmpCtx, imgData, this.current.transferMaps);
-        imgToPaint = tmpCanvas.canvas;
-      }
+    ctx.imageSmoothingEnabled = getImageSmoothingEnabled((0, _display_utils.getCurrentTransform)(ctx), imgData.interpolate);
+    const [rWidth, rHeight] = drawImageAtIntegerCoords(ctx, scaled.img, 0, 0, scaled.paintWidth, scaled.paintHeight, 0, -height, width, height);
 
-      var paintWidth = width,
-          paintHeight = height;
-      var tmpCanvasId = "prescale1";
+    if (this.imageLayer) {
+      const [left, top] = _util.Util.applyTransform([0, -height], (0, _display_utils.getCurrentTransform)(this.ctx));
 
-      while (widthScale > 2 && paintWidth > 1 || heightScale > 2 && paintHeight > 1) {
-        var newWidth = paintWidth,
-            newHeight = paintHeight;
+      this.imageLayer.appendImage({
+        imgData,
+        left,
+        top,
+        width: rWidth,
+        height: rHeight
+      });
+    }
 
-        if (widthScale > 2 && paintWidth > 1) {
-          newWidth = Math.ceil(paintWidth / 2);
-          widthScale /= paintWidth / newWidth;
-        }
+    this.compose();
+    this.restore();
+  }
 
-        if (heightScale > 2 && paintHeight > 1) {
-          newHeight = Math.ceil(paintHeight / 2);
-          heightScale /= paintHeight / newHeight;
-        }
+  paintInlineImageXObjectGroup(imgData, map) {
+    if (!this.contentVisible) {
+      return;
+    }
 
-        tmpCanvas = this.cachedCanvases.getCanvas(tmpCanvasId, newWidth, newHeight);
-        tmpCtx = tmpCanvas.context;
-        tmpCtx.clearRect(0, 0, newWidth, newHeight);
-        tmpCtx.drawImage(imgToPaint, 0, 0, paintWidth, paintHeight, 0, 0, newWidth, newHeight);
-        imgToPaint = tmpCanvas.canvas;
-        paintWidth = newWidth;
-        paintHeight = newHeight;
-        tmpCanvasId = tmpCanvasId === "prescale1" ? "prescale2" : "prescale1";
-      }
+    const ctx = this.ctx;
+    const w = imgData.width;
+    const h = imgData.height;
+    const tmpCanvas = this.cachedCanvases.getCanvas("inlineImage", w, h);
+    const tmpCtx = tmpCanvas.context;
+    putBinaryImageData(tmpCtx, imgData, this.current.transferMaps);
 
-      ctx.drawImage(imgToPaint, 0, 0, paintWidth, paintHeight, 0, -height, width, height);
+    for (const entry of map) {
+      ctx.save();
+      ctx.transform(...entry.transform);
+      ctx.scale(1, -1);
+      drawImageAtIntegerCoords(ctx, tmpCanvas.canvas, entry.x, entry.y, entry.w, entry.h, 0, -1, 1, 1);
 
       if (this.imageLayer) {
-        var position = this.getCanvasPosition(0, -height);
+        const [left, top] = _util.Util.applyTransform([entry.x, entry.y], (0, _display_utils.getCurrentTransform)(this.ctx));
+
         this.imageLayer.appendImage({
           imgData,
-          left: position[0],
-          top: position[1],
-          width: width / currentTransform[0],
-          height: height / currentTransform[3]
+          left,
+          top,
+          width: w,
+          height: h
         });
       }
 
-      this.restore();
-    },
-    paintInlineImageXObjectGroup: function CanvasGraphics_paintInlineImageXObjectGroup(imgData, map) {
-      if (!this.contentVisible) {
-        return;
-      }
+      ctx.restore();
+    }
 
-      var ctx = this.ctx;
-      var w = imgData.width;
-      var h = imgData.height;
-      var tmpCanvas = this.cachedCanvases.getCanvas("inlineImage", w, h);
-      var tmpCtx = tmpCanvas.context;
-      putBinaryImageData(tmpCtx, imgData, this.current.transferMaps);
+    this.compose();
+  }
 
-      for (var i = 0, ii = map.length; i < ii; i++) {
-        var entry = map[i];
-        ctx.save();
-        ctx.transform.apply(ctx, entry.transform);
-        ctx.scale(1, -1);
-        ctx.drawImage(tmpCanvas.canvas, entry.x, entry.y, entry.w, entry.h, 0, -1, 1, 1);
+  paintSolidColorImageMask() {
+    if (!this.contentVisible) {
+      return;
+    }
 
-        if (this.imageLayer) {
-          var position = this.getCanvasPosition(entry.x, entry.y);
-          this.imageLayer.appendImage({
-            imgData,
-            left: position[0],
-            top: position[1],
-            width: w,
-            height: h
-          });
-        }
+    this.ctx.fillRect(0, 0, 1, 1);
+    this.compose();
+  }
 
-        ctx.restore();
-      }
-    },
-    paintSolidColorImageMask: function CanvasGraphics_paintSolidColorImageMask() {
-      if (!this.contentVisible) {
-        return;
-      }
+  markPoint(tag) {}
 
-      this.ctx.fillRect(0, 0, 1, 1);
-    },
-    markPoint: function CanvasGraphics_markPoint(tag) {},
-    markPointProps: function CanvasGraphics_markPointProps(tag, properties) {},
-    beginMarkedContent: function CanvasGraphics_beginMarkedContent(tag) {
+  markPointProps(tag, properties) {}
+
+  beginMarkedContent(tag) {
+    this.markedContentStack.push({
+      visible: true
+    });
+  }
+
+  beginMarkedContentProps(tag, properties) {
+    if (tag === "OC") {
+      this.markedContentStack.push({
+        visible: this.optionalContentConfig.isVisible(properties)
+      });
+    } else {
       this.markedContentStack.push({
         visible: true
       });
-    },
-    beginMarkedContentProps: function CanvasGraphics_beginMarkedContentProps(tag, properties) {
-      if (tag === "OC") {
-        this.markedContentStack.push({
-          visible: this.optionalContentConfig.isVisible(properties)
-        });
-      } else {
-        this.markedContentStack.push({
-          visible: true
-        });
-      }
+    }
 
-      this.contentVisible = this.isContentVisible();
-    },
-    endMarkedContent: function CanvasGraphics_endMarkedContent() {
-      this.markedContentStack.pop();
-      this.contentVisible = this.isContentVisible();
-    },
-    beginCompat: function CanvasGraphics_beginCompat() {},
-    endCompat: function CanvasGraphics_endCompat() {},
-    consumePath: function CanvasGraphics_consumePath() {
-      var ctx = this.ctx;
+    this.contentVisible = this.isContentVisible();
+  }
 
-      if (this.pendingClip) {
+  endMarkedContent() {
+    this.markedContentStack.pop();
+    this.contentVisible = this.isContentVisible();
+  }
+
+  beginCompat() {}
+
+  endCompat() {}
+
+  consumePath(clipBox) {
+    const isEmpty = this.current.isEmptyClip();
+
+    if (this.pendingClip) {
+      this.current.updateClipFromPath();
+    }
+
+    if (!this.pendingClip) {
+      this.compose(clipBox);
+    }
+
+    const ctx = this.ctx;
+
+    if (this.pendingClip) {
+      if (!isEmpty) {
         if (this.pendingClip === EO_CLIP) {
           ctx.clip("evenodd");
         } else {
           ctx.clip();
         }
-
-        this.pendingClip = null;
       }
 
-      ctx.beginPath();
-    },
+      this.pendingClip = null;
+    }
 
-    getSinglePixelWidth(scale) {
-      if (this._cachedGetSinglePixelWidth === null) {
-        const inverse = this.ctx.mozCurrentTransformInverse;
-        this._cachedGetSinglePixelWidth = Math.sqrt(Math.max(inverse[0] * inverse[0] + inverse[1] * inverse[1], inverse[2] * inverse[2] + inverse[3] * inverse[3]));
+    this.current.startNewPathAndClipBox(this.current.clipBox);
+    ctx.beginPath();
+  }
+
+  getSinglePixelWidth() {
+    if (!this._cachedGetSinglePixelWidth) {
+      const m = (0, _display_utils.getCurrentTransform)(this.ctx);
+
+      if (m[1] === 0 && m[2] === 0) {
+        this._cachedGetSinglePixelWidth = 1 / Math.min(Math.abs(m[0]), Math.abs(m[3]));
+      } else {
+        const absDet = Math.abs(m[0] * m[3] - m[2] * m[1]);
+        const normX = Math.hypot(m[0], m[2]);
+        const normY = Math.hypot(m[1], m[3]);
+        this._cachedGetSinglePixelWidth = Math.max(normX, normY) / absDet;
       }
+    }
 
-      return this._cachedGetSinglePixelWidth;
-    },
+    return this._cachedGetSinglePixelWidth;
+  }
 
-    getCanvasPosition: function CanvasGraphics_getCanvasPosition(x, y) {
-      var transform = this.ctx.mozCurrentTransform;
-      return [transform[0] * x + transform[2] * y + transform[4], transform[1] * x + transform[3] * y + transform[5]];
-    },
-    isContentVisible: function CanvasGraphics_isContentVisible() {
-      for (let i = this.markedContentStack.length - 1; i >= 0; i--) {
-        if (!this.markedContentStack[i].visible) {
-          return false;
+  getScaleForStroking() {
+    if (!this._cachedScaleForStroking) {
+      const {
+        lineWidth
+      } = this.current;
+      const m = (0, _display_utils.getCurrentTransform)(this.ctx);
+      let scaleX, scaleY;
+
+      if (m[1] === 0 && m[2] === 0) {
+        const normX = Math.abs(m[0]);
+        const normY = Math.abs(m[3]);
+
+        if (lineWidth === 0) {
+          scaleX = 1 / normX;
+          scaleY = 1 / normY;
+        } else {
+          const scaledXLineWidth = normX * lineWidth;
+          const scaledYLineWidth = normY * lineWidth;
+          scaleX = scaledXLineWidth < 1 ? 1 / scaledXLineWidth : 1;
+          scaleY = scaledYLineWidth < 1 ? 1 / scaledYLineWidth : 1;
+        }
+      } else {
+        const absDet = Math.abs(m[0] * m[3] - m[2] * m[1]);
+        const normX = Math.hypot(m[0], m[1]);
+        const normY = Math.hypot(m[2], m[3]);
+
+        if (lineWidth === 0) {
+          scaleX = normY / absDet;
+          scaleY = normX / absDet;
+        } else {
+          const baseArea = lineWidth * absDet;
+          scaleX = normY > baseArea ? normY / baseArea : 1;
+          scaleY = normX > baseArea ? normX / baseArea : 1;
         }
       }
 
-      return true;
+      this._cachedScaleForStroking = [scaleX, scaleY];
     }
-  };
 
-  for (var op in _util.OPS) {
-    CanvasGraphics.prototype[_util.OPS[op]] = CanvasGraphics.prototype[op];
+    return this._cachedScaleForStroking;
   }
 
-  return CanvasGraphics;
-}();
+  rescaleAndStroke(saveRestore) {
+    const {
+      ctx
+    } = this;
+    const {
+      lineWidth
+    } = this.current;
+    const [scaleX, scaleY] = this.getScaleForStroking();
+    ctx.lineWidth = lineWidth || 1;
+
+    if (scaleX === 1 && scaleY === 1) {
+      ctx.stroke();
+      return;
+    }
+
+    let savedMatrix, savedDashes, savedDashOffset;
+
+    if (saveRestore) {
+      savedMatrix = (0, _display_utils.getCurrentTransform)(ctx);
+      savedDashes = ctx.getLineDash().slice();
+      savedDashOffset = ctx.lineDashOffset;
+    }
+
+    ctx.scale(scaleX, scaleY);
+    const scale = Math.max(scaleX, scaleY);
+    ctx.setLineDash(ctx.getLineDash().map(x => x / scale));
+    ctx.lineDashOffset /= scale;
+    ctx.stroke();
+
+    if (saveRestore) {
+      ctx.setTransform(...savedMatrix);
+      ctx.setLineDash(savedDashes);
+      ctx.lineDashOffset = savedDashOffset;
+    }
+  }
+
+  isContentVisible() {
+    for (let i = this.markedContentStack.length - 1; i >= 0; i--) {
+      if (!this.markedContentStack[i].visible) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+}
 
 exports.CanvasGraphics = CanvasGraphics;
 
+for (const op in _util.OPS) {
+  if (CanvasGraphics.prototype[op] !== undefined) {
+    CanvasGraphics.prototype[_util.OPS[op]] = CanvasGraphics.prototype[op];
+  }
+}
+
 /***/ }),
-/* 11 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 13 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.getShadingPatternFromIR = getShadingPatternFromIR;
-exports.TilingPattern = void 0;
+}));
+exports.TilingPattern = exports.PathType = void 0;
+exports.getShadingPattern = getShadingPattern;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
 
-var ShadingIRs = {};
+var _display_utils = __w_pdfjs_require__(8);
+
+var _is_node = __w_pdfjs_require__(3);
+
+const PathType = {
+  FILL: "Fill",
+  STROKE: "Stroke",
+  SHADING: "Shading"
+};
+exports.PathType = PathType;
 
 function applyBoundingBox(ctx, bbox) {
-  if (!bbox || typeof Path2D === "undefined") {
+  if (!bbox || _is_node.isNodeJS) {
     return;
   }
 
@@ -6742,259 +8911,303 @@ function applyBoundingBox(ctx, bbox) {
   ctx.clip(region);
 }
 
-ShadingIRs.RadialAxial = {
-  fromIR: function RadialAxial_fromIR(raw) {
-    var type = raw[1];
-    var bbox = raw[2];
-    var colorStops = raw[3];
-    var p0 = raw[4];
-    var p1 = raw[5];
-    var r0 = raw[6];
-    var r1 = raw[7];
-    return {
-      type: "Pattern",
-      getPattern: function RadialAxial_getPattern(ctx) {
-        applyBoundingBox(ctx, bbox);
-        var grad;
-
-        if (type === "axial") {
-          grad = ctx.createLinearGradient(p0[0], p0[1], p1[0], p1[1]);
-        } else if (type === "radial") {
-          grad = ctx.createRadialGradient(p0[0], p0[1], r0, p1[0], p1[1], r1);
-        }
-
-        for (var i = 0, ii = colorStops.length; i < ii; ++i) {
-          var c = colorStops[i];
-          grad.addColorStop(c[0], c[1]);
-        }
-
-        return grad;
-      }
-    };
+class BaseShadingPattern {
+  constructor() {
+    if (this.constructor === BaseShadingPattern) {
+      (0, _util.unreachable)("Cannot initialize BaseShadingPattern.");
+    }
   }
-};
 
-var createMeshCanvas = function createMeshCanvasClosure() {
-  function drawTriangle(data, context, p1, p2, p3, c1, c2, c3) {
-    var coords = context.coords,
+  getPattern() {
+    (0, _util.unreachable)("Abstract method `getPattern` called.");
+  }
+
+}
+
+class RadialAxialShadingPattern extends BaseShadingPattern {
+  constructor(IR) {
+    super();
+    this._type = IR[1];
+    this._bbox = IR[2];
+    this._colorStops = IR[3];
+    this._p0 = IR[4];
+    this._p1 = IR[5];
+    this._r0 = IR[6];
+    this._r1 = IR[7];
+    this.matrix = null;
+  }
+
+  _createGradient(ctx) {
+    let grad;
+
+    if (this._type === "axial") {
+      grad = ctx.createLinearGradient(this._p0[0], this._p0[1], this._p1[0], this._p1[1]);
+    } else if (this._type === "radial") {
+      grad = ctx.createRadialGradient(this._p0[0], this._p0[1], this._r0, this._p1[0], this._p1[1], this._r1);
+    }
+
+    for (const colorStop of this._colorStops) {
+      grad.addColorStop(colorStop[0], colorStop[1]);
+    }
+
+    return grad;
+  }
+
+  getPattern(ctx, owner, inverse, pathType) {
+    let pattern;
+
+    if (pathType === PathType.STROKE || pathType === PathType.FILL) {
+      const ownerBBox = owner.current.getClippedPathBoundingBox(pathType, (0, _display_utils.getCurrentTransform)(ctx)) || [0, 0, 0, 0];
+      const width = Math.ceil(ownerBBox[2] - ownerBBox[0]) || 1;
+      const height = Math.ceil(ownerBBox[3] - ownerBBox[1]) || 1;
+      const tmpCanvas = owner.cachedCanvases.getCanvas("pattern", width, height, true);
+      const tmpCtx = tmpCanvas.context;
+      tmpCtx.clearRect(0, 0, tmpCtx.canvas.width, tmpCtx.canvas.height);
+      tmpCtx.beginPath();
+      tmpCtx.rect(0, 0, tmpCtx.canvas.width, tmpCtx.canvas.height);
+      tmpCtx.translate(-ownerBBox[0], -ownerBBox[1]);
+      inverse = _util.Util.transform(inverse, [1, 0, 0, 1, ownerBBox[0], ownerBBox[1]]);
+      tmpCtx.transform(...owner.baseTransform);
+
+      if (this.matrix) {
+        tmpCtx.transform(...this.matrix);
+      }
+
+      applyBoundingBox(tmpCtx, this._bbox);
+      tmpCtx.fillStyle = this._createGradient(tmpCtx);
+      tmpCtx.fill();
+      pattern = ctx.createPattern(tmpCanvas.canvas, "no-repeat");
+      const domMatrix = new DOMMatrix(inverse);
+
+      try {
+        pattern.setTransform(domMatrix);
+      } catch (ex) {
+        (0, _util.warn)(`RadialAxialShadingPattern.getPattern: "${ex?.message}".`);
+      }
+    } else {
+      applyBoundingBox(ctx, this._bbox);
+      pattern = this._createGradient(ctx);
+    }
+
+    return pattern;
+  }
+
+}
+
+function drawTriangle(data, context, p1, p2, p3, c1, c2, c3) {
+  const coords = context.coords,
         colors = context.colors;
-    var bytes = data.data,
+  const bytes = data.data,
         rowSize = data.width * 4;
-    var tmp;
+  let tmp;
 
-    if (coords[p1 + 1] > coords[p2 + 1]) {
-      tmp = p1;
-      p1 = p2;
-      p2 = tmp;
-      tmp = c1;
-      c1 = c2;
-      c2 = tmp;
-    }
+  if (coords[p1 + 1] > coords[p2 + 1]) {
+    tmp = p1;
+    p1 = p2;
+    p2 = tmp;
+    tmp = c1;
+    c1 = c2;
+    c2 = tmp;
+  }
 
-    if (coords[p2 + 1] > coords[p3 + 1]) {
-      tmp = p2;
-      p2 = p3;
-      p3 = tmp;
-      tmp = c2;
-      c2 = c3;
-      c3 = tmp;
-    }
+  if (coords[p2 + 1] > coords[p3 + 1]) {
+    tmp = p2;
+    p2 = p3;
+    p3 = tmp;
+    tmp = c2;
+    c2 = c3;
+    c3 = tmp;
+  }
 
-    if (coords[p1 + 1] > coords[p2 + 1]) {
-      tmp = p1;
-      p1 = p2;
-      p2 = tmp;
-      tmp = c1;
-      c1 = c2;
-      c2 = tmp;
-    }
+  if (coords[p1 + 1] > coords[p2 + 1]) {
+    tmp = p1;
+    p1 = p2;
+    p2 = tmp;
+    tmp = c1;
+    c1 = c2;
+    c2 = tmp;
+  }
 
-    var x1 = (coords[p1] + context.offsetX) * context.scaleX;
-    var y1 = (coords[p1 + 1] + context.offsetY) * context.scaleY;
-    var x2 = (coords[p2] + context.offsetX) * context.scaleX;
-    var y2 = (coords[p2 + 1] + context.offsetY) * context.scaleY;
-    var x3 = (coords[p3] + context.offsetX) * context.scaleX;
-    var y3 = (coords[p3 + 1] + context.offsetY) * context.scaleY;
+  const x1 = (coords[p1] + context.offsetX) * context.scaleX;
+  const y1 = (coords[p1 + 1] + context.offsetY) * context.scaleY;
+  const x2 = (coords[p2] + context.offsetX) * context.scaleX;
+  const y2 = (coords[p2 + 1] + context.offsetY) * context.scaleY;
+  const x3 = (coords[p3] + context.offsetX) * context.scaleX;
+  const y3 = (coords[p3 + 1] + context.offsetY) * context.scaleY;
 
-    if (y1 >= y3) {
-      return;
-    }
+  if (y1 >= y3) {
+    return;
+  }
 
-    var c1r = colors[c1],
+  const c1r = colors[c1],
         c1g = colors[c1 + 1],
         c1b = colors[c1 + 2];
-    var c2r = colors[c2],
+  const c2r = colors[c2],
         c2g = colors[c2 + 1],
         c2b = colors[c2 + 2];
-    var c3r = colors[c3],
+  const c3r = colors[c3],
         c3g = colors[c3 + 1],
         c3b = colors[c3 + 2];
-    var minY = Math.round(y1),
+  const minY = Math.round(y1),
         maxY = Math.round(y3);
-    var xa, car, cag, cab;
-    var xb, cbr, cbg, cbb;
-
-    for (var y = minY; y <= maxY; y++) {
-      if (y < y2) {
-        let k;
-
-        if (y < y1) {
-          k = 0;
-        } else if (y1 === y2) {
-          k = 1;
-        } else {
-          k = (y1 - y) / (y1 - y2);
-        }
-
-        xa = x1 - (x1 - x2) * k;
-        car = c1r - (c1r - c2r) * k;
-        cag = c1g - (c1g - c2g) * k;
-        cab = c1b - (c1b - c2b) * k;
-      } else {
-        let k;
-
-        if (y > y3) {
-          k = 1;
-        } else if (y2 === y3) {
-          k = 0;
-        } else {
-          k = (y2 - y) / (y2 - y3);
-        }
-
-        xa = x2 - (x2 - x3) * k;
-        car = c2r - (c2r - c3r) * k;
-        cag = c2g - (c2g - c3g) * k;
-        cab = c2b - (c2b - c3b) * k;
-      }
+  let xa, car, cag, cab;
+  let xb, cbr, cbg, cbb;
 
+  for (let y = minY; y <= maxY; y++) {
+    if (y < y2) {
       let k;
 
       if (y < y1) {
         k = 0;
-      } else if (y > y3) {
-        k = 1;
       } else {
-        k = (y1 - y) / (y1 - y3);
+        k = (y1 - y) / (y1 - y2);
       }
 
-      xb = x1 - (x1 - x3) * k;
-      cbr = c1r - (c1r - c3r) * k;
-      cbg = c1g - (c1g - c3g) * k;
-      cbb = c1b - (c1b - c3b) * k;
-      var x1_ = Math.round(Math.min(xa, xb));
-      var x2_ = Math.round(Math.max(xa, xb));
-      var j = rowSize * y + x1_ * 4;
+      xa = x1 - (x1 - x2) * k;
+      car = c1r - (c1r - c2r) * k;
+      cag = c1g - (c1g - c2g) * k;
+      cab = c1b - (c1b - c2b) * k;
+    } else {
+      let k;
 
-      for (var x = x1_; x <= x2_; x++) {
-        k = (xa - x) / (xa - xb);
-
-        if (k < 0) {
-          k = 0;
-        } else if (k > 1) {
-          k = 1;
-        }
-
-        bytes[j++] = car - (car - cbr) * k | 0;
-        bytes[j++] = cag - (cag - cbg) * k | 0;
-        bytes[j++] = cab - (cab - cbb) * k | 0;
-        bytes[j++] = 255;
+      if (y > y3) {
+        k = 1;
+      } else if (y2 === y3) {
+        k = 0;
+      } else {
+        k = (y2 - y) / (y2 - y3);
       }
+
+      xa = x2 - (x2 - x3) * k;
+      car = c2r - (c2r - c3r) * k;
+      cag = c2g - (c2g - c3g) * k;
+      cab = c2b - (c2b - c3b) * k;
+    }
+
+    let k;
+
+    if (y < y1) {
+      k = 0;
+    } else if (y > y3) {
+      k = 1;
+    } else {
+      k = (y1 - y) / (y1 - y3);
+    }
+
+    xb = x1 - (x1 - x3) * k;
+    cbr = c1r - (c1r - c3r) * k;
+    cbg = c1g - (c1g - c3g) * k;
+    cbb = c1b - (c1b - c3b) * k;
+    const x1_ = Math.round(Math.min(xa, xb));
+    const x2_ = Math.round(Math.max(xa, xb));
+    let j = rowSize * y + x1_ * 4;
+
+    for (let x = x1_; x <= x2_; x++) {
+      k = (xa - x) / (xa - xb);
+
+      if (k < 0) {
+        k = 0;
+      } else if (k > 1) {
+        k = 1;
+      }
+
+      bytes[j++] = car - (car - cbr) * k | 0;
+      bytes[j++] = cag - (cag - cbg) * k | 0;
+      bytes[j++] = cab - (cab - cbb) * k | 0;
+      bytes[j++] = 255;
     }
   }
+}
 
-  function drawFigure(data, figure, context) {
-    var ps = figure.coords;
-    var cs = figure.colors;
-    var i, ii;
+function drawFigure(data, figure, context) {
+  const ps = figure.coords;
+  const cs = figure.colors;
+  let i, ii;
 
-    switch (figure.type) {
-      case "lattice":
-        var verticesPerRow = figure.verticesPerRow;
-        var rows = Math.floor(ps.length / verticesPerRow) - 1;
-        var cols = verticesPerRow - 1;
+  switch (figure.type) {
+    case "lattice":
+      const verticesPerRow = figure.verticesPerRow;
+      const rows = Math.floor(ps.length / verticesPerRow) - 1;
+      const cols = verticesPerRow - 1;
 
-        for (i = 0; i < rows; i++) {
-          var q = i * verticesPerRow;
+      for (i = 0; i < rows; i++) {
+        let q = i * verticesPerRow;
 
-          for (var j = 0; j < cols; j++, q++) {
-            drawTriangle(data, context, ps[q], ps[q + 1], ps[q + verticesPerRow], cs[q], cs[q + 1], cs[q + verticesPerRow]);
-            drawTriangle(data, context, ps[q + verticesPerRow + 1], ps[q + 1], ps[q + verticesPerRow], cs[q + verticesPerRow + 1], cs[q + 1], cs[q + verticesPerRow]);
-          }
+        for (let j = 0; j < cols; j++, q++) {
+          drawTriangle(data, context, ps[q], ps[q + 1], ps[q + verticesPerRow], cs[q], cs[q + 1], cs[q + verticesPerRow]);
+          drawTriangle(data, context, ps[q + verticesPerRow + 1], ps[q + 1], ps[q + verticesPerRow], cs[q + verticesPerRow + 1], cs[q + 1], cs[q + verticesPerRow]);
         }
+      }
 
-        break;
+      break;
 
-      case "triangles":
-        for (i = 0, ii = ps.length; i < ii; i += 3) {
-          drawTriangle(data, context, ps[i], ps[i + 1], ps[i + 2], cs[i], cs[i + 1], cs[i + 2]);
-        }
+    case "triangles":
+      for (i = 0, ii = ps.length; i < ii; i += 3) {
+        drawTriangle(data, context, ps[i], ps[i + 1], ps[i + 2], cs[i], cs[i + 1], cs[i + 2]);
+      }
 
-        break;
+      break;
 
-      default:
-        throw new Error("illegal figure");
-    }
+    default:
+      throw new Error("illegal figure");
+  }
+}
+
+class MeshShadingPattern extends BaseShadingPattern {
+  constructor(IR) {
+    super();
+    this._coords = IR[2];
+    this._colors = IR[3];
+    this._figures = IR[4];
+    this._bounds = IR[5];
+    this._bbox = IR[7];
+    this._background = IR[8];
+    this.matrix = null;
   }
 
-  function createMeshCanvas(bounds, combinesScale, coords, colors, figures, backgroundColor, cachedCanvases, webGLContext) {
-    var EXPECTED_SCALE = 1.1;
-    var MAX_PATTERN_SIZE = 3000;
-    var BORDER_SIZE = 2;
-    var offsetX = Math.floor(bounds[0]);
-    var offsetY = Math.floor(bounds[1]);
-    var boundsWidth = Math.ceil(bounds[2]) - offsetX;
-    var boundsHeight = Math.ceil(bounds[3]) - offsetY;
-    var width = Math.min(Math.ceil(Math.abs(boundsWidth * combinesScale[0] * EXPECTED_SCALE)), MAX_PATTERN_SIZE);
-    var height = Math.min(Math.ceil(Math.abs(boundsHeight * combinesScale[1] * EXPECTED_SCALE)), MAX_PATTERN_SIZE);
-    var scaleX = boundsWidth / width;
-    var scaleY = boundsHeight / height;
-    var context = {
-      coords,
-      colors,
+  _createMeshCanvas(combinedScale, backgroundColor, cachedCanvases) {
+    const EXPECTED_SCALE = 1.1;
+    const MAX_PATTERN_SIZE = 3000;
+    const BORDER_SIZE = 2;
+    const offsetX = Math.floor(this._bounds[0]);
+    const offsetY = Math.floor(this._bounds[1]);
+    const boundsWidth = Math.ceil(this._bounds[2]) - offsetX;
+    const boundsHeight = Math.ceil(this._bounds[3]) - offsetY;
+    const width = Math.min(Math.ceil(Math.abs(boundsWidth * combinedScale[0] * EXPECTED_SCALE)), MAX_PATTERN_SIZE);
+    const height = Math.min(Math.ceil(Math.abs(boundsHeight * combinedScale[1] * EXPECTED_SCALE)), MAX_PATTERN_SIZE);
+    const scaleX = boundsWidth / width;
+    const scaleY = boundsHeight / height;
+    const context = {
+      coords: this._coords,
+      colors: this._colors,
       offsetX: -offsetX,
       offsetY: -offsetY,
       scaleX: 1 / scaleX,
       scaleY: 1 / scaleY
     };
-    var paddedWidth = width + BORDER_SIZE * 2;
-    var paddedHeight = height + BORDER_SIZE * 2;
-    var canvas, tmpCanvas, i, ii;
+    const paddedWidth = width + BORDER_SIZE * 2;
+    const paddedHeight = height + BORDER_SIZE * 2;
+    const tmpCanvas = cachedCanvases.getCanvas("mesh", paddedWidth, paddedHeight, false);
+    const tmpCtx = tmpCanvas.context;
+    const data = tmpCtx.createImageData(width, height);
 
-    if (webGLContext.isEnabled) {
-      canvas = webGLContext.drawFigures({
-        width,
-        height,
-        backgroundColor,
-        figures,
-        context
-      });
-      tmpCanvas = cachedCanvases.getCanvas("mesh", paddedWidth, paddedHeight, false);
-      tmpCanvas.context.drawImage(canvas, BORDER_SIZE, BORDER_SIZE);
-      canvas = tmpCanvas.canvas;
-    } else {
-      tmpCanvas = cachedCanvases.getCanvas("mesh", paddedWidth, paddedHeight, false);
-      var tmpCtx = tmpCanvas.context;
-      var data = tmpCtx.createImageData(width, height);
+    if (backgroundColor) {
+      const bytes = data.data;
 
-      if (backgroundColor) {
-        var bytes = data.data;
-
-        for (i = 0, ii = bytes.length; i < ii; i += 4) {
-          bytes[i] = backgroundColor[0];
-          bytes[i + 1] = backgroundColor[1];
-          bytes[i + 2] = backgroundColor[2];
-          bytes[i + 3] = 255;
-        }
+      for (let i = 0, ii = bytes.length; i < ii; i += 4) {
+        bytes[i] = backgroundColor[0];
+        bytes[i + 1] = backgroundColor[1];
+        bytes[i + 2] = backgroundColor[2];
+        bytes[i + 3] = 255;
       }
-
-      for (i = 0; i < figures.length; i++) {
-        drawFigure(data, figures[i], context);
-      }
-
-      tmpCtx.putImageData(data, BORDER_SIZE, BORDER_SIZE);
-      canvas = tmpCanvas.canvas;
     }
 
+    for (const figure of this._figures) {
+      drawFigure(data, figure, context);
+    }
+
+    tmpCtx.putImageData(data, BORDER_SIZE, BORDER_SIZE);
+    const canvas = tmpCanvas.canvas;
     return {
       canvas,
       offsetX: offsetX - BORDER_SIZE * scaleX,
@@ -7004,82 +9217,72 @@ var createMeshCanvas = function createMeshCanvasClosure() {
     };
   }
 
-  return createMeshCanvas;
-}();
+  getPattern(ctx, owner, inverse, pathType) {
+    applyBoundingBox(ctx, this._bbox);
+    let scale;
 
-ShadingIRs.Mesh = {
-  fromIR: function Mesh_fromIR(raw) {
-    var coords = raw[2];
-    var colors = raw[3];
-    var figures = raw[4];
-    var bounds = raw[5];
-    var matrix = raw[6];
-    var bbox = raw[7];
-    var background = raw[8];
-    return {
-      type: "Pattern",
-      getPattern: function Mesh_getPattern(ctx, owner, shadingFill) {
-        applyBoundingBox(ctx, bbox);
-        var scale;
+    if (pathType === PathType.SHADING) {
+      scale = _util.Util.singularValueDecompose2dScale((0, _display_utils.getCurrentTransform)(ctx));
+    } else {
+      scale = _util.Util.singularValueDecompose2dScale(owner.baseTransform);
 
-        if (shadingFill) {
-          scale = _util.Util.singularValueDecompose2dScale(ctx.mozCurrentTransform);
-        } else {
-          scale = _util.Util.singularValueDecompose2dScale(owner.baseTransform);
+      if (this.matrix) {
+        const matrixScale = _util.Util.singularValueDecompose2dScale(this.matrix);
 
-          if (matrix) {
-            var matrixScale = _util.Util.singularValueDecompose2dScale(matrix);
-
-            scale = [scale[0] * matrixScale[0], scale[1] * matrixScale[1]];
-          }
-        }
-
-        var temporaryPatternCanvas = createMeshCanvas(bounds, scale, coords, colors, figures, shadingFill ? null : background, owner.cachedCanvases, owner.webGLContext);
-
-        if (!shadingFill) {
-          ctx.setTransform.apply(ctx, owner.baseTransform);
-
-          if (matrix) {
-            ctx.transform.apply(ctx, matrix);
-          }
-        }
-
-        ctx.translate(temporaryPatternCanvas.offsetX, temporaryPatternCanvas.offsetY);
-        ctx.scale(temporaryPatternCanvas.scaleX, temporaryPatternCanvas.scaleY);
-        return ctx.createPattern(temporaryPatternCanvas.canvas, "no-repeat");
+        scale = [scale[0] * matrixScale[0], scale[1] * matrixScale[1]];
       }
-    };
-  }
-};
-ShadingIRs.Dummy = {
-  fromIR: function Dummy_fromIR() {
-    return {
-      type: "Pattern",
-      getPattern: function Dummy_fromIR_getPattern() {
-        return "hotpink";
+    }
+
+    const temporaryPatternCanvas = this._createMeshCanvas(scale, pathType === PathType.SHADING ? null : this._background, owner.cachedCanvases);
+
+    if (pathType !== PathType.SHADING) {
+      ctx.setTransform(...owner.baseTransform);
+
+      if (this.matrix) {
+        ctx.transform(...this.matrix);
       }
-    };
-  }
-};
+    }
 
-function getShadingPatternFromIR(raw) {
-  var shadingIR = ShadingIRs[raw[0]];
-
-  if (!shadingIR) {
-    throw new Error(`Unknown IR type: ${raw[0]}`);
+    ctx.translate(temporaryPatternCanvas.offsetX, temporaryPatternCanvas.offsetY);
+    ctx.scale(temporaryPatternCanvas.scaleX, temporaryPatternCanvas.scaleY);
+    return ctx.createPattern(temporaryPatternCanvas.canvas, "no-repeat");
   }
 
-  return shadingIR.fromIR(raw);
 }
 
-var TilingPattern = function TilingPatternClosure() {
-  var PaintType = {
-    COLORED: 1,
-    UNCOLORED: 2
-  };
-  var MAX_PATTERN_SIZE = 3000;
+class DummyShadingPattern extends BaseShadingPattern {
+  getPattern() {
+    return "hotpink";
+  }
 
-  function TilingPattern(IR, color, ctx, canvasGraphicsFactory, baseTransform) {
+}
+
+function getShadingPattern(IR) {
+  switch (IR[0]) {
+    case "RadialAxial":
+      return new RadialAxialShadingPattern(IR);
+
+    case "Mesh":
+      return new MeshShadingPattern(IR);
+
+    case "Dummy":
+      return new DummyShadingPattern();
+  }
+
+  throw new Error(`Unknown IR type: ${IR[0]}`);
+}
+
+const PaintType = {
+  COLORED: 1,
+  UNCOLORED: 2
+};
+
+class TilingPattern {
+  static get MAX_PATTERN_SIZE() {
+    return (0, _util.shadow)(this, "MAX_PATTERN_SIZE", 3000);
+  }
+
+  constructor(IR, color, ctx, canvasGraphicsFactory, baseTransform) {
     this.operatorList = IR[2];
     this.matrix = IR[3] || [1, 0, 0, 1, 0, 0];
     this.bbox = IR[4];
@@ -7088,122 +9291,220 @@ var TilingPattern = function TilingPatternClosure() {
     this.paintType = IR[7];
     this.tilingType = IR[8];
     this.color = color;
+    this.ctx = ctx;
     this.canvasGraphicsFactory = canvasGraphicsFactory;
     this.baseTransform = baseTransform;
-    this.type = "Pattern";
-    this.ctx = ctx;
   }
 
-  TilingPattern.prototype = {
-    createPatternCanvas: function TilinPattern_createPatternCanvas(owner) {
-      var operatorList = this.operatorList;
-      var bbox = this.bbox;
-      var xstep = this.xstep;
-      var ystep = this.ystep;
-      var paintType = this.paintType;
-      var tilingType = this.tilingType;
-      var color = this.color;
-      var canvasGraphicsFactory = this.canvasGraphicsFactory;
-      (0, _util.info)("TilingType: " + tilingType);
-      var x0 = bbox[0],
+  createPatternCanvas(owner) {
+    const operatorList = this.operatorList;
+    const bbox = this.bbox;
+    const xstep = this.xstep;
+    const ystep = this.ystep;
+    const paintType = this.paintType;
+    const tilingType = this.tilingType;
+    const color = this.color;
+    const canvasGraphicsFactory = this.canvasGraphicsFactory;
+    (0, _util.info)("TilingType: " + tilingType);
+    const x0 = bbox[0],
           y0 = bbox[1],
           x1 = bbox[2],
           y1 = bbox[3];
 
-      var matrixScale = _util.Util.singularValueDecompose2dScale(this.matrix);
+    const matrixScale = _util.Util.singularValueDecompose2dScale(this.matrix);
 
-      var curMatrixScale = _util.Util.singularValueDecompose2dScale(this.baseTransform);
+    const curMatrixScale = _util.Util.singularValueDecompose2dScale(this.baseTransform);
 
-      var combinedScale = [matrixScale[0] * curMatrixScale[0], matrixScale[1] * curMatrixScale[1]];
-      var dimx = this.getSizeAndScale(xstep, this.ctx.canvas.width, combinedScale[0]);
-      var dimy = this.getSizeAndScale(ystep, this.ctx.canvas.height, combinedScale[1]);
-      var tmpCanvas = owner.cachedCanvases.getCanvas("pattern", dimx.size, dimy.size, true);
-      var tmpCtx = tmpCanvas.context;
-      var graphics = canvasGraphicsFactory.createCanvasGraphics(tmpCtx);
-      graphics.groupLevel = owner.groupLevel;
-      this.setFillAndStrokeStyleToContext(graphics, paintType, color);
-      graphics.transform(dimx.scale, 0, 0, dimy.scale, 0, 0);
-      graphics.transform(1, 0, 0, 1, -x0, -y0);
-      this.clipBbox(graphics, bbox, x0, y0, x1, y1);
-      graphics.executeOperatorList(operatorList);
-      this.ctx.transform(1, 0, 0, 1, x0, y0);
-      this.ctx.scale(1 / dimx.scale, 1 / dimy.scale);
-      return tmpCanvas.canvas;
-    },
-    getSizeAndScale: function TilingPattern_getSizeAndScale(step, realOutputSize, scale) {
-      step = Math.abs(step);
-      var maxSize = Math.max(MAX_PATTERN_SIZE, realOutputSize);
-      var size = Math.ceil(step * scale);
+    const combinedScale = [matrixScale[0] * curMatrixScale[0], matrixScale[1] * curMatrixScale[1]];
+    const dimx = this.getSizeAndScale(xstep, this.ctx.canvas.width, combinedScale[0]);
+    const dimy = this.getSizeAndScale(ystep, this.ctx.canvas.height, combinedScale[1]);
+    const tmpCanvas = owner.cachedCanvases.getCanvas("pattern", dimx.size, dimy.size, true);
+    const tmpCtx = tmpCanvas.context;
+    const graphics = canvasGraphicsFactory.createCanvasGraphics(tmpCtx);
+    graphics.groupLevel = owner.groupLevel;
+    this.setFillAndStrokeStyleToContext(graphics, paintType, color);
+    let adjustedX0 = x0;
+    let adjustedY0 = y0;
+    let adjustedX1 = x1;
+    let adjustedY1 = y1;
 
-      if (size >= maxSize) {
-        size = maxSize;
-      } else {
-        scale = size / step;
-      }
-
-      return {
-        scale,
-        size
-      };
-    },
-    clipBbox: function clipBbox(graphics, bbox, x0, y0, x1, y1) {
-      if (Array.isArray(bbox) && bbox.length === 4) {
-        var bboxWidth = x1 - x0;
-        var bboxHeight = y1 - y0;
-        graphics.ctx.rect(x0, y0, bboxWidth, bboxHeight);
-        graphics.clip();
-        graphics.endPath();
-      }
-    },
-    setFillAndStrokeStyleToContext: function setFillAndStrokeStyleToContext(graphics, paintType, color) {
-      const context = graphics.ctx,
-            current = graphics.current;
-
-      switch (paintType) {
-        case PaintType.COLORED:
-          var ctx = this.ctx;
-          context.fillStyle = ctx.fillStyle;
-          context.strokeStyle = ctx.strokeStyle;
-          current.fillColor = ctx.fillStyle;
-          current.strokeColor = ctx.strokeStyle;
-          break;
-
-        case PaintType.UNCOLORED:
-          var cssColor = _util.Util.makeCssRgb(color[0], color[1], color[2]);
-
-          context.fillStyle = cssColor;
-          context.strokeStyle = cssColor;
-          current.fillColor = cssColor;
-          current.strokeColor = cssColor;
-          break;
-
-        default:
-          throw new _util.FormatError(`Unsupported paint type: ${paintType}`);
-      }
-    },
-    getPattern: function TilingPattern_getPattern(ctx, owner) {
-      ctx = this.ctx;
-      ctx.setTransform.apply(ctx, this.baseTransform);
-      ctx.transform.apply(ctx, this.matrix);
-      var temporaryPatternCanvas = this.createPatternCanvas(owner);
-      return ctx.createPattern(temporaryPatternCanvas, "repeat");
+    if (x0 < 0) {
+      adjustedX0 = 0;
+      adjustedX1 += Math.abs(x0);
     }
-  };
-  return TilingPattern;
-}();
+
+    if (y0 < 0) {
+      adjustedY0 = 0;
+      adjustedY1 += Math.abs(y0);
+    }
+
+    tmpCtx.translate(-(dimx.scale * adjustedX0), -(dimy.scale * adjustedY0));
+    graphics.transform(dimx.scale, 0, 0, dimy.scale, 0, 0);
+    tmpCtx.save();
+    this.clipBbox(graphics, adjustedX0, adjustedY0, adjustedX1, adjustedY1);
+    graphics.baseTransform = (0, _display_utils.getCurrentTransform)(graphics.ctx);
+    graphics.executeOperatorList(operatorList);
+    graphics.endDrawing();
+    return {
+      canvas: tmpCanvas.canvas,
+      scaleX: dimx.scale,
+      scaleY: dimy.scale,
+      offsetX: adjustedX0,
+      offsetY: adjustedY0
+    };
+  }
+
+  getSizeAndScale(step, realOutputSize, scale) {
+    step = Math.abs(step);
+    const maxSize = Math.max(TilingPattern.MAX_PATTERN_SIZE, realOutputSize);
+    let size = Math.ceil(step * scale);
+
+    if (size >= maxSize) {
+      size = maxSize;
+    } else {
+      scale = size / step;
+    }
+
+    return {
+      scale,
+      size
+    };
+  }
+
+  clipBbox(graphics, x0, y0, x1, y1) {
+    const bboxWidth = x1 - x0;
+    const bboxHeight = y1 - y0;
+    graphics.ctx.rect(x0, y0, bboxWidth, bboxHeight);
+    graphics.current.updateRectMinMax((0, _display_utils.getCurrentTransform)(graphics.ctx), [x0, y0, x1, y1]);
+    graphics.clip();
+    graphics.endPath();
+  }
+
+  setFillAndStrokeStyleToContext(graphics, paintType, color) {
+    const context = graphics.ctx,
+          current = graphics.current;
+
+    switch (paintType) {
+      case PaintType.COLORED:
+        const ctx = this.ctx;
+        context.fillStyle = ctx.fillStyle;
+        context.strokeStyle = ctx.strokeStyle;
+        current.fillColor = ctx.fillStyle;
+        current.strokeColor = ctx.strokeStyle;
+        break;
+
+      case PaintType.UNCOLORED:
+        const cssColor = _util.Util.makeHexColor(color[0], color[1], color[2]);
+
+        context.fillStyle = cssColor;
+        context.strokeStyle = cssColor;
+        current.fillColor = cssColor;
+        current.strokeColor = cssColor;
+        break;
+
+      default:
+        throw new _util.FormatError(`Unsupported paint type: ${paintType}`);
+    }
+  }
+
+  getPattern(ctx, owner, inverse, pathType) {
+    let matrix = inverse;
+
+    if (pathType !== PathType.SHADING) {
+      matrix = _util.Util.transform(matrix, owner.baseTransform);
+
+      if (this.matrix) {
+        matrix = _util.Util.transform(matrix, this.matrix);
+      }
+    }
+
+    const temporaryPatternCanvas = this.createPatternCanvas(owner);
+    let domMatrix = new DOMMatrix(matrix);
+    domMatrix = domMatrix.translate(temporaryPatternCanvas.offsetX, temporaryPatternCanvas.offsetY);
+    domMatrix = domMatrix.scale(1 / temporaryPatternCanvas.scaleX, 1 / temporaryPatternCanvas.scaleY);
+    const pattern = ctx.createPattern(temporaryPatternCanvas.canvas, "repeat");
+
+    try {
+      pattern.setTransform(domMatrix);
+    } catch (ex) {
+      (0, _util.warn)(`TilingPattern.getPattern: "${ex?.message}".`);
+    }
+
+    return pattern;
+  }
+
+}
 
 exports.TilingPattern = TilingPattern;
 
 /***/ }),
-/* 12 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 14 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.applyMaskImageData = applyMaskImageData;
+
+var _util = __w_pdfjs_require__(1);
+
+function applyMaskImageData({
+  src,
+  srcPos = 0,
+  dest,
+  destPos = 0,
+  width,
+  height,
+  inverseDecode = false
+}) {
+  const opaque = _util.FeatureTest.isLittleEndian ? 0xff000000 : 0x000000ff;
+  const [zeroMapping, oneMapping] = !inverseDecode ? [opaque, 0] : [0, opaque];
+  const widthInSource = width >> 3;
+  const widthRemainder = width & 7;
+  const srcLength = src.length;
+  dest = new Uint32Array(dest.buffer);
+
+  for (let i = 0; i < height; i++) {
+    for (const max = srcPos + widthInSource; srcPos < max; srcPos++) {
+      const elem = srcPos < srcLength ? src[srcPos] : 255;
+      dest[destPos++] = elem & 0b10000000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b1000000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b100000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b10000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b1000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b100 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b10 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b1 ? oneMapping : zeroMapping;
+    }
+
+    if (widthRemainder === 0) {
+      continue;
+    }
+
+    const elem = srcPos < srcLength ? src[srcPos++] : 255;
+
+    for (let j = 0; j < widthRemainder; j++) {
+      dest[destPos++] = elem & 1 << 7 - j ? oneMapping : zeroMapping;
+    }
+  }
+
+  return {
+    srcPos,
+    destPos
+  };
+}
+
+/***/ }),
+/* 15 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.GlobalWorkerOptions = void 0;
 const GlobalWorkerOptions = Object.create(null);
 exports.GlobalWorkerOptions = GlobalWorkerOptions;
@@ -7211,18 +9512,17 @@ GlobalWorkerOptions.workerPort = GlobalWorkerOptions.workerPort === undefined ?
 GlobalWorkerOptions.workerSrc = GlobalWorkerOptions.workerSrc === undefined ? "" : GlobalWorkerOptions.workerSrc;
 
 /***/ }),
-/* 13 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 16 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.MessageHandler = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
 
 const CallbackKind = {
   UNKNOWN: 0,
@@ -7242,8 +9542,8 @@ const StreamKind = {
 };
 
 function wrapReason(reason) {
-  if (typeof reason !== "object" || reason === null) {
-    return reason;
+  if (!(reason instanceof Error || typeof reason === "object" && reason !== null)) {
+    (0, _util.unreachable)('wrapReason: Expected "reason" to be a (possibly cloned) Error.');
   }
 
   switch (reason.name) {
@@ -7253,6 +9553,9 @@ function wrapReason(reason) {
     case "MissingPDFException":
       return new _util.MissingPDFException(reason.message);
 
+    case "PasswordException":
+      return new _util.PasswordException(reason.message, reason.code);
+
     case "UnexpectedResponseException":
       return new _util.UnexpectedResponseException(reason.message, reason.status);
 
@@ -7271,7 +9574,6 @@ class MessageHandler {
     this.comObj = comObj;
     this.callbackId = 1;
     this.streamId = 1;
-    this.postMessageTransfers = true;
     this.streamSinks = Object.create(null);
     this.streamControllers = Object.create(null);
     this.callbackCapabilities = Object.create(null);
@@ -7365,7 +9667,7 @@ class MessageHandler {
   }
 
   send(actionName, data, transfers) {
-    this._postMessage({
+    this.comObj.postMessage({
       sourceName: this.sourceName,
       targetName: this.targetName,
       action: actionName,
@@ -7379,7 +9681,7 @@ class MessageHandler {
     this.callbackCapabilities[callbackId] = capability;
 
     try {
-      this._postMessage({
+      this.comObj.postMessage({
         sourceName: this.sourceName,
         targetName: this.targetName,
         action: actionName,
@@ -7394,10 +9696,10 @@ class MessageHandler {
   }
 
   sendWithStream(actionName, data, queueingStrategy, transfers) {
-    const streamId = this.streamId++;
-    const sourceName = this.sourceName;
-    const targetName = this.targetName;
-    const comObj = this.comObj;
+    const streamId = this.streamId++,
+          sourceName = this.sourceName,
+          targetName = this.targetName,
+          comObj = this.comObj;
     return new ReadableStream({
       start: controller => {
         const startCapability = (0, _util.createPromiseCapability)();
@@ -7408,8 +9710,7 @@ class MessageHandler {
           cancelCall: null,
           isClosed: false
         };
-
-        this._postMessage({
+        comObj.postMessage({
           sourceName,
           targetName,
           action: actionName,
@@ -7417,7 +9718,6 @@ class MessageHandler {
           data,
           desiredSize: controller.desiredSize
         }, transfers);
-
         return startCapability.promise;
       },
       pull: controller => {
@@ -7450,12 +9750,12 @@ class MessageHandler {
   }
 
   _createStreamSink(data) {
-    const self = this;
-    const action = this.actionHandler[data.action];
-    const streamId = data.streamId;
-    const sourceName = this.sourceName;
-    const targetName = data.sourceName;
-    const comObj = this.comObj;
+    const streamId = data.streamId,
+          sourceName = this.sourceName,
+          targetName = data.sourceName,
+          comObj = this.comObj;
+    const self = this,
+          action = this.actionHandler[data.action];
     const streamSink = {
       enqueue(chunk, size = 1, transfers) {
         if (this.isCancelled) {
@@ -7470,7 +9770,7 @@ class MessageHandler {
           this.ready = this.sinkCapability.promise;
         }
 
-        self._postMessage({
+        comObj.postMessage({
           sourceName,
           targetName,
           stream: StreamKind.ENQUEUE,
@@ -7543,32 +9843,34 @@ class MessageHandler {
   }
 
   _processStreamMessage(data) {
-    const streamId = data.streamId;
-    const sourceName = this.sourceName;
-    const targetName = data.sourceName;
-    const comObj = this.comObj;
+    const streamId = data.streamId,
+          sourceName = this.sourceName,
+          targetName = data.sourceName,
+          comObj = this.comObj;
+    const streamController = this.streamControllers[streamId],
+          streamSink = this.streamSinks[streamId];
 
     switch (data.stream) {
       case StreamKind.START_COMPLETE:
         if (data.success) {
-          this.streamControllers[streamId].startCall.resolve();
+          streamController.startCall.resolve();
         } else {
-          this.streamControllers[streamId].startCall.reject(wrapReason(data.reason));
+          streamController.startCall.reject(wrapReason(data.reason));
         }
 
         break;
 
       case StreamKind.PULL_COMPLETE:
         if (data.success) {
-          this.streamControllers[streamId].pullCall.resolve();
+          streamController.pullCall.resolve();
         } else {
-          this.streamControllers[streamId].pullCall.reject(wrapReason(data.reason));
+          streamController.pullCall.reject(wrapReason(data.reason));
         }
 
         break;
 
       case StreamKind.PULL:
-        if (!this.streamSinks[streamId]) {
+        if (!streamSink) {
           comObj.postMessage({
             sourceName,
             targetName,
@@ -7579,16 +9881,13 @@ class MessageHandler {
           break;
         }
 
-        if (this.streamSinks[streamId].desiredSize <= 0 && data.desiredSize > 0) {
-          this.streamSinks[streamId].sinkCapability.resolve();
+        if (streamSink.desiredSize <= 0 && data.desiredSize > 0) {
+          streamSink.sinkCapability.resolve();
         }
 
-        this.streamSinks[streamId].desiredSize = data.desiredSize;
-        const {
-          onPull
-        } = this.streamSinks[data.streamId];
+        streamSink.desiredSize = data.desiredSize;
         new Promise(function (resolve) {
-          resolve(onPull && onPull());
+          resolve(streamSink.onPull && streamSink.onPull());
         }).then(function () {
           comObj.postMessage({
             sourceName,
@@ -7609,58 +9908,55 @@ class MessageHandler {
         break;
 
       case StreamKind.ENQUEUE:
-        (0, _util.assert)(this.streamControllers[streamId], "enqueue should have stream controller");
+        (0, _util.assert)(streamController, "enqueue should have stream controller");
 
-        if (this.streamControllers[streamId].isClosed) {
+        if (streamController.isClosed) {
           break;
         }
 
-        this.streamControllers[streamId].controller.enqueue(data.chunk);
+        streamController.controller.enqueue(data.chunk);
         break;
 
       case StreamKind.CLOSE:
-        (0, _util.assert)(this.streamControllers[streamId], "close should have stream controller");
+        (0, _util.assert)(streamController, "close should have stream controller");
 
-        if (this.streamControllers[streamId].isClosed) {
+        if (streamController.isClosed) {
           break;
         }
 
-        this.streamControllers[streamId].isClosed = true;
-        this.streamControllers[streamId].controller.close();
+        streamController.isClosed = true;
+        streamController.controller.close();
 
-        this._deleteStreamController(streamId);
+        this._deleteStreamController(streamController, streamId);
 
         break;
 
       case StreamKind.ERROR:
-        (0, _util.assert)(this.streamControllers[streamId], "error should have stream controller");
-        this.streamControllers[streamId].controller.error(wrapReason(data.reason));
+        (0, _util.assert)(streamController, "error should have stream controller");
+        streamController.controller.error(wrapReason(data.reason));
 
-        this._deleteStreamController(streamId);
+        this._deleteStreamController(streamController, streamId);
 
         break;
 
       case StreamKind.CANCEL_COMPLETE:
         if (data.success) {
-          this.streamControllers[streamId].cancelCall.resolve();
+          streamController.cancelCall.resolve();
         } else {
-          this.streamControllers[streamId].cancelCall.reject(wrapReason(data.reason));
+          streamController.cancelCall.reject(wrapReason(data.reason));
         }
 
-        this._deleteStreamController(streamId);
+        this._deleteStreamController(streamController, streamId);
 
         break;
 
       case StreamKind.CANCEL:
-        if (!this.streamSinks[streamId]) {
+        if (!streamSink) {
           break;
         }
 
-        const {
-          onCancel
-        } = this.streamSinks[data.streamId];
         new Promise(function (resolve) {
-          resolve(onCancel && onCancel(wrapReason(data.reason)));
+          resolve(streamSink.onCancel && streamSink.onCancel(wrapReason(data.reason)));
         }).then(function () {
           comObj.postMessage({
             sourceName,
@@ -7678,8 +9974,8 @@ class MessageHandler {
             reason: wrapReason(reason)
           });
         });
-        this.streamSinks[streamId].sinkCapability.reject(wrapReason(data.reason));
-        this.streamSinks[streamId].isCancelled = true;
+        streamSink.sinkCapability.reject(wrapReason(data.reason));
+        streamSink.isCancelled = true;
         delete this.streamSinks[streamId];
         break;
 
@@ -7688,21 +9984,11 @@ class MessageHandler {
     }
   }
 
-  async _deleteStreamController(streamId) {
-    await Promise.allSettled([this.streamControllers[streamId].startCall, this.streamControllers[streamId].pullCall, this.streamControllers[streamId].cancelCall].map(function (capability) {
-      return capability && capability.promise;
-    }));
+  async _deleteStreamController(streamController, streamId) {
+    await Promise.allSettled([streamController.startCall && streamController.startCall.promise, streamController.pullCall && streamController.pullCall.promise, streamController.cancelCall && streamController.cancelCall.promise]);
     delete this.streamControllers[streamId];
   }
 
-  _postMessage(message, transfers) {
-    if (transfers && this.postMessageTransfers) {
-      this.comObj.postMessage(message, transfers);
-    } else {
-      this.comObj.postMessage(message);
-    }
-  }
-
   destroy() {
     this.comObj.removeEventListener("message", this._onComObjOnMessage);
   }
@@ -7712,121 +9998,44 @@ class MessageHandler {
 exports.MessageHandler = MessageHandler;
 
 /***/ }),
-/* 14 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 17 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.Metadata = void 0;
 
-var _util = __w_pdfjs_require__(2);
-
-var _xml_parser = __w_pdfjs_require__(15);
+var _util = __w_pdfjs_require__(1);
 
 class Metadata {
-  constructor(data) {
-    (0, _util.assert)(typeof data === "string", "Metadata: input is not a string");
-    data = this._repair(data);
-    const parser = new _xml_parser.SimpleXMLParser();
-    const xmlDocument = parser.parseFromString(data);
-    this._metadataMap = new Map();
+  #metadataMap;
+  #data;
 
-    if (xmlDocument) {
-      this._parse(xmlDocument);
-    }
+  constructor({
+    parsedData,
+    rawData
+  }) {
+    this.#metadataMap = parsedData;
+    this.#data = rawData;
   }
 
-  _repair(data) {
-    return data.replace(/^[^<]+/, "").replace(/>\\376\\377([^<]+)/g, function (all, codes) {
-      const bytes = codes.replace(/\\([0-3])([0-7])([0-7])/g, function (code, d1, d2, d3) {
-        return String.fromCharCode(d1 * 64 + d2 * 8 + d3 * 1);
-      }).replace(/&(amp|apos|gt|lt|quot);/g, function (str, name) {
-        switch (name) {
-          case "amp":
-            return "&";
-
-          case "apos":
-            return "'";
-
-          case "gt":
-            return ">";
-
-          case "lt":
-            return "<";
-
-          case "quot":
-            return '"';
-        }
-
-        throw new Error(`_repair: ${name} isn't defined.`);
-      });
-      let chars = "";
-
-      for (let i = 0, ii = bytes.length; i < ii; i += 2) {
-        const code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1);
-
-        if (code >= 32 && code < 127 && code !== 60 && code !== 62 && code !== 38) {
-          chars += String.fromCharCode(code);
-        } else {
-          chars += "&#x" + (0x10000 + code).toString(16).substring(1) + ";";
-        }
-      }
-
-      return ">" + chars;
-    });
-  }
-
-  _parse(xmlDocument) {
-    let rdf = xmlDocument.documentElement;
-
-    if (rdf.nodeName.toLowerCase() !== "rdf:rdf") {
-      rdf = rdf.firstChild;
-
-      while (rdf && rdf.nodeName.toLowerCase() !== "rdf:rdf") {
-        rdf = rdf.nextSibling;
-      }
-    }
-
-    const nodeName = rdf ? rdf.nodeName.toLowerCase() : null;
-
-    if (!rdf || nodeName !== "rdf:rdf" || !rdf.hasChildNodes()) {
-      return;
-    }
-
-    const children = rdf.childNodes;
-
-    for (let i = 0, ii = children.length; i < ii; i++) {
-      const desc = children[i];
-
-      if (desc.nodeName.toLowerCase() !== "rdf:description") {
-        continue;
-      }
-
-      for (let j = 0, jj = desc.childNodes.length; j < jj; j++) {
-        if (desc.childNodes[j].nodeName.toLowerCase() !== "#text") {
-          const entry = desc.childNodes[j];
-          const name = entry.nodeName.toLowerCase();
-
-          this._metadataMap.set(name, entry.textContent.trim());
-        }
-      }
-    }
+  getRaw() {
+    return this.#data;
   }
 
   get(name) {
-    return this._metadataMap.has(name) ? this._metadataMap.get(name) : null;
+    return this.#metadataMap.get(name) ?? null;
   }
 
   getAll() {
-    return Object.fromEntries(this._metadataMap);
+    return (0, _util.objectFromMap)(this.#metadataMap);
   }
 
   has(name) {
-    return this._metadataMap.has(name);
+    return this.#metadataMap.has(name);
   }
 
 }
@@ -7834,477 +10043,51 @@ class Metadata {
 exports.Metadata = Metadata;
 
 /***/ }),
-/* 15 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 18 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.SimpleXMLParser = void 0;
-const XMLParserErrorCode = {
-  NoError: 0,
-  EndOfDocument: -1,
-  UnterminatedCdat: -2,
-  UnterminatedXmlDeclaration: -3,
-  UnterminatedDoctypeDeclaration: -4,
-  UnterminatedComment: -5,
-  MalformedElement: -6,
-  OutOfMemory: -7,
-  UnterminatedAttributeValue: -8,
-  UnterminatedElement: -9,
-  ElementNeverBegun: -10
-};
-
-function isWhitespace(s, index) {
-  const ch = s[index];
-  return ch === " " || ch === "\n" || ch === "\r" || ch === "\t";
-}
-
-function isWhitespaceString(s) {
-  for (let i = 0, ii = s.length; i < ii; i++) {
-    if (!isWhitespace(s, i)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-class XMLParserBase {
-  _resolveEntities(s) {
-    return s.replace(/&([^;]+);/g, (all, entity) => {
-      if (entity.substring(0, 2) === "#x") {
-        return String.fromCharCode(parseInt(entity.substring(2), 16));
-      } else if (entity.substring(0, 1) === "#") {
-        return String.fromCharCode(parseInt(entity.substring(1), 10));
-      }
-
-      switch (entity) {
-        case "lt":
-          return "<";
-
-        case "gt":
-          return ">";
-
-        case "amp":
-          return "&";
-
-        case "quot":
-          return '"';
-      }
-
-      return this.onResolveEntity(entity);
-    });
-  }
-
-  _parseContent(s, start) {
-    const attributes = [];
-    let pos = start;
-
-    function skipWs() {
-      while (pos < s.length && isWhitespace(s, pos)) {
-        ++pos;
-      }
-    }
-
-    while (pos < s.length && !isWhitespace(s, pos) && s[pos] !== ">" && s[pos] !== "/") {
-      ++pos;
-    }
-
-    const name = s.substring(start, pos);
-    skipWs();
-
-    while (pos < s.length && s[pos] !== ">" && s[pos] !== "/" && s[pos] !== "?") {
-      skipWs();
-      let attrName = "",
-          attrValue = "";
-
-      while (pos < s.length && !isWhitespace(s, pos) && s[pos] !== "=") {
-        attrName += s[pos];
-        ++pos;
-      }
-
-      skipWs();
-
-      if (s[pos] !== "=") {
-        return null;
-      }
-
-      ++pos;
-      skipWs();
-      const attrEndChar = s[pos];
-
-      if (attrEndChar !== '"' && attrEndChar !== "'") {
-        return null;
-      }
-
-      const attrEndIndex = s.indexOf(attrEndChar, ++pos);
-
-      if (attrEndIndex < 0) {
-        return null;
-      }
-
-      attrValue = s.substring(pos, attrEndIndex);
-      attributes.push({
-        name: attrName,
-        value: this._resolveEntities(attrValue)
-      });
-      pos = attrEndIndex + 1;
-      skipWs();
-    }
-
-    return {
-      name,
-      attributes,
-      parsed: pos - start
-    };
-  }
-
-  _parseProcessingInstruction(s, start) {
-    let pos = start;
-
-    function skipWs() {
-      while (pos < s.length && isWhitespace(s, pos)) {
-        ++pos;
-      }
-    }
-
-    while (pos < s.length && !isWhitespace(s, pos) && s[pos] !== ">" && s[pos] !== "/") {
-      ++pos;
-    }
-
-    const name = s.substring(start, pos);
-    skipWs();
-    const attrStart = pos;
-
-    while (pos < s.length && (s[pos] !== "?" || s[pos + 1] !== ">")) {
-      ++pos;
-    }
-
-    const value = s.substring(attrStart, pos);
-    return {
-      name,
-      value,
-      parsed: pos - start
-    };
-  }
-
-  parseXml(s) {
-    let i = 0;
-
-    while (i < s.length) {
-      const ch = s[i];
-      let j = i;
-
-      if (ch === "<") {
-        ++j;
-        const ch2 = s[j];
-        let q;
-
-        switch (ch2) {
-          case "/":
-            ++j;
-            q = s.indexOf(">", j);
-
-            if (q < 0) {
-              this.onError(XMLParserErrorCode.UnterminatedElement);
-              return;
-            }
-
-            this.onEndElement(s.substring(j, q));
-            j = q + 1;
-            break;
-
-          case "?":
-            ++j;
-
-            const pi = this._parseProcessingInstruction(s, j);
-
-            if (s.substring(j + pi.parsed, j + pi.parsed + 2) !== "?>") {
-              this.onError(XMLParserErrorCode.UnterminatedXmlDeclaration);
-              return;
-            }
-
-            this.onPi(pi.name, pi.value);
-            j += pi.parsed + 2;
-            break;
-
-          case "!":
-            if (s.substring(j + 1, j + 3) === "--") {
-              q = s.indexOf("-->", j + 3);
-
-              if (q < 0) {
-                this.onError(XMLParserErrorCode.UnterminatedComment);
-                return;
-              }
-
-              this.onComment(s.substring(j + 3, q));
-              j = q + 3;
-            } else if (s.substring(j + 1, j + 8) === "[CDATA[") {
-              q = s.indexOf("]]>", j + 8);
-
-              if (q < 0) {
-                this.onError(XMLParserErrorCode.UnterminatedCdat);
-                return;
-              }
-
-              this.onCdata(s.substring(j + 8, q));
-              j = q + 3;
-            } else if (s.substring(j + 1, j + 8) === "DOCTYPE") {
-              const q2 = s.indexOf("[", j + 8);
-              let complexDoctype = false;
-              q = s.indexOf(">", j + 8);
-
-              if (q < 0) {
-                this.onError(XMLParserErrorCode.UnterminatedDoctypeDeclaration);
-                return;
-              }
-
-              if (q2 > 0 && q > q2) {
-                q = s.indexOf("]>", j + 8);
-
-                if (q < 0) {
-                  this.onError(XMLParserErrorCode.UnterminatedDoctypeDeclaration);
-                  return;
-                }
-
-                complexDoctype = true;
-              }
-
-              const doctypeContent = s.substring(j + 8, q + (complexDoctype ? 1 : 0));
-              this.onDoctype(doctypeContent);
-              j = q + (complexDoctype ? 2 : 1);
-            } else {
-              this.onError(XMLParserErrorCode.MalformedElement);
-              return;
-            }
-
-            break;
-
-          default:
-            const content = this._parseContent(s, j);
-
-            if (content === null) {
-              this.onError(XMLParserErrorCode.MalformedElement);
-              return;
-            }
-
-            let isClosed = false;
-
-            if (s.substring(j + content.parsed, j + content.parsed + 2) === "/>") {
-              isClosed = true;
-            } else if (s.substring(j + content.parsed, j + content.parsed + 1) !== ">") {
-              this.onError(XMLParserErrorCode.UnterminatedElement);
-              return;
-            }
-
-            this.onBeginElement(content.name, content.attributes, isClosed);
-            j += content.parsed + (isClosed ? 2 : 1);
-            break;
-        }
-      } else {
-        while (j < s.length && s[j] !== "<") {
-          j++;
-        }
-
-        const text = s.substring(i, j);
-        this.onText(this._resolveEntities(text));
-      }
-
-      i = j;
-    }
-  }
-
-  onResolveEntity(name) {
-    return `&${name};`;
-  }
-
-  onPi(name, value) {}
-
-  onComment(text) {}
-
-  onCdata(text) {}
-
-  onDoctype(doctypeContent) {}
-
-  onText(text) {}
-
-  onBeginElement(name, attributes, isEmpty) {}
-
-  onEndElement(name) {}
-
-  onError(code) {}
-
-}
-
-class SimpleDOMNode {
-  constructor(nodeName, nodeValue) {
-    this.nodeName = nodeName;
-    this.nodeValue = nodeValue;
-    Object.defineProperty(this, "parentNode", {
-      value: null,
-      writable: true
-    });
-  }
-
-  get firstChild() {
-    return this.childNodes && this.childNodes[0];
-  }
-
-  get nextSibling() {
-    const childNodes = this.parentNode.childNodes;
-
-    if (!childNodes) {
-      return undefined;
-    }
-
-    const index = childNodes.indexOf(this);
-
-    if (index === -1) {
-      return undefined;
-    }
-
-    return childNodes[index + 1];
-  }
-
-  get textContent() {
-    if (!this.childNodes) {
-      return this.nodeValue || "";
-    }
-
-    return this.childNodes.map(function (child) {
-      return child.textContent;
-    }).join("");
-  }
-
-  hasChildNodes() {
-    return this.childNodes && this.childNodes.length > 0;
-  }
-
-}
-
-class SimpleXMLParser extends XMLParserBase {
-  constructor() {
-    super();
-    this._currentFragment = null;
-    this._stack = null;
-    this._errorCode = XMLParserErrorCode.NoError;
-  }
-
-  parseFromString(data) {
-    this._currentFragment = [];
-    this._stack = [];
-    this._errorCode = XMLParserErrorCode.NoError;
-    this.parseXml(data);
-
-    if (this._errorCode !== XMLParserErrorCode.NoError) {
-      return undefined;
-    }
-
-    const [documentElement] = this._currentFragment;
-
-    if (!documentElement) {
-      return undefined;
-    }
-
-    return {
-      documentElement
-    };
-  }
-
-  onResolveEntity(name) {
-    switch (name) {
-      case "apos":
-        return "'";
-    }
-
-    return super.onResolveEntity(name);
-  }
-
-  onText(text) {
-    if (isWhitespaceString(text)) {
-      return;
-    }
-
-    const node = new SimpleDOMNode("#text", text);
-
-    this._currentFragment.push(node);
-  }
-
-  onCdata(text) {
-    const node = new SimpleDOMNode("#text", text);
-
-    this._currentFragment.push(node);
-  }
-
-  onBeginElement(name, attributes, isEmpty) {
-    const node = new SimpleDOMNode(name);
-    node.childNodes = [];
-
-    this._currentFragment.push(node);
-
-    if (isEmpty) {
-      return;
-    }
-
-    this._stack.push(this._currentFragment);
-
-    this._currentFragment = node.childNodes;
-  }
-
-  onEndElement(name) {
-    this._currentFragment = this._stack.pop() || [];
-    const lastElement = this._currentFragment[this._currentFragment.length - 1];
-
-    if (!lastElement) {
-      return;
-    }
-
-    for (let i = 0, ii = lastElement.childNodes.length; i < ii; i++) {
-      lastElement.childNodes[i].parentNode = lastElement;
-    }
-  }
-
-  onError(code) {
-    this._errorCode = code;
-  }
-
-}
-
-exports.SimpleXMLParser = SimpleXMLParser;
-
-/***/ }),
-/* 16 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+}));
 exports.OptionalContentConfig = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
+
+const INTERNAL = Symbol("INTERNAL");
 
 class OptionalContentGroup {
+  #visible = true;
+
   constructor(name, intent) {
-    this.visible = true;
     this.name = name;
     this.intent = intent;
   }
 
+  get visible() {
+    return this.#visible;
+  }
+
+  _setVisible(internal, visible) {
+    if (internal !== INTERNAL) {
+      (0, _util.unreachable)("Internal method `_setVisible` called.");
+    }
+
+    this.#visible = visible;
+  }
+
 }
 
 class OptionalContentConfig {
+  #cachedHasInitialVisibility = true;
+  #groups = new Map();
+  #initialVisibility = null;
+  #order = null;
+
   constructor(data) {
     this.name = null;
     this.creator = null;
-    this._order = null;
-    this._groups = new Map();
 
     if (data === null) {
       return;
@@ -8312,48 +10095,111 @@ class OptionalContentConfig {
 
     this.name = data.name;
     this.creator = data.creator;
-    this._order = data.order;
+    this.#order = data.order;
 
     for (const group of data.groups) {
-      this._groups.set(group.id, new OptionalContentGroup(group.name, group.intent));
+      this.#groups.set(group.id, new OptionalContentGroup(group.name, group.intent));
     }
 
     if (data.baseState === "OFF") {
-      for (const group of this._groups) {
-        group.visible = false;
+      for (const group of this.#groups.values()) {
+        group._setVisible(INTERNAL, false);
       }
     }
 
     for (const on of data.on) {
-      this._groups.get(on).visible = true;
+      this.#groups.get(on)._setVisible(INTERNAL, true);
     }
 
     for (const off of data.off) {
-      this._groups.get(off).visible = false;
+      this.#groups.get(off)._setVisible(INTERNAL, false);
+    }
+
+    this.#initialVisibility = new Map();
+
+    for (const [id, group] of this.#groups) {
+      this.#initialVisibility.set(id, group.visible);
     }
   }
 
+  #evaluateVisibilityExpression(array) {
+    const length = array.length;
+
+    if (length < 2) {
+      return true;
+    }
+
+    const operator = array[0];
+
+    for (let i = 1; i < length; i++) {
+      const element = array[i];
+      let state;
+
+      if (Array.isArray(element)) {
+        state = this.#evaluateVisibilityExpression(element);
+      } else if (this.#groups.has(element)) {
+        state = this.#groups.get(element).visible;
+      } else {
+        (0, _util.warn)(`Optional content group not found: ${element}`);
+        return true;
+      }
+
+      switch (operator) {
+        case "And":
+          if (!state) {
+            return false;
+          }
+
+          break;
+
+        case "Or":
+          if (state) {
+            return true;
+          }
+
+          break;
+
+        case "Not":
+          return !state;
+
+        default:
+          return true;
+      }
+    }
+
+    return operator === "And";
+  }
+
   isVisible(group) {
+    if (this.#groups.size === 0) {
+      return true;
+    }
+
+    if (!group) {
+      (0, _util.warn)("Optional content group not defined.");
+      return true;
+    }
+
     if (group.type === "OCG") {
-      if (!this._groups.has(group.id)) {
+      if (!this.#groups.has(group.id)) {
         (0, _util.warn)(`Optional content group not found: ${group.id}`);
         return true;
       }
 
-      return this._groups.get(group.id).visible;
+      return this.#groups.get(group.id).visible;
     } else if (group.type === "OCMD") {
       if (group.expression) {
-        (0, _util.warn)("Visibility expression not supported yet.");
+        return this.#evaluateVisibilityExpression(group.expression);
       }
 
       if (!group.policy || group.policy === "AnyOn") {
         for (const id of group.ids) {
-          if (!this._groups.has(id)) {
+          if (!this.#groups.has(id)) {
             (0, _util.warn)(`Optional content group not found: ${id}`);
             return true;
           }
 
-          if (this._groups.get(id).visible) {
+          if (this.#groups.get(id).visible) {
             return true;
           }
         }
@@ -8361,12 +10207,12 @@ class OptionalContentConfig {
         return false;
       } else if (group.policy === "AllOn") {
         for (const id of group.ids) {
-          if (!this._groups.has(id)) {
+          if (!this.#groups.has(id)) {
             (0, _util.warn)(`Optional content group not found: ${id}`);
             return true;
           }
 
-          if (!this._groups.get(id).visible) {
+          if (!this.#groups.get(id).visible) {
             return false;
           }
         }
@@ -8374,12 +10220,12 @@ class OptionalContentConfig {
         return true;
       } else if (group.policy === "AnyOff") {
         for (const id of group.ids) {
-          if (!this._groups.has(id)) {
+          if (!this.#groups.has(id)) {
             (0, _util.warn)(`Optional content group not found: ${id}`);
             return true;
           }
 
-          if (!this._groups.get(id).visible) {
+          if (!this.#groups.get(id).visible) {
             return true;
           }
         }
@@ -8387,12 +10233,12 @@ class OptionalContentConfig {
         return false;
       } else if (group.policy === "AllOff") {
         for (const id of group.ids) {
-          if (!this._groups.has(id)) {
+          if (!this.#groups.has(id)) {
             (0, _util.warn)(`Optional content group not found: ${id}`);
             return true;
           }
 
-          if (this._groups.get(id).visible) {
+          if (this.#groups.get(id).visible) {
             return false;
           }
         }
@@ -8409,36 +10255,50 @@ class OptionalContentConfig {
   }
 
   setVisibility(id, visible = true) {
-    if (!this._groups.has(id)) {
+    if (!this.#groups.has(id)) {
       (0, _util.warn)(`Optional content group not found: ${id}`);
       return;
     }
 
-    this._groups.get(id).visible = !!visible;
+    this.#groups.get(id)._setVisible(INTERNAL, !!visible);
+
+    this.#cachedHasInitialVisibility = null;
+  }
+
+  get hasInitialVisibility() {
+    if (this.#cachedHasInitialVisibility !== null) {
+      return this.#cachedHasInitialVisibility;
+    }
+
+    for (const [id, group] of this.#groups) {
+      const visible = this.#initialVisibility.get(id);
+
+      if (group.visible !== visible) {
+        return this.#cachedHasInitialVisibility = false;
+      }
+    }
+
+    return this.#cachedHasInitialVisibility = true;
   }
 
   getOrder() {
-    if (!this._groups.size) {
+    if (!this.#groups.size) {
       return null;
     }
 
-    if (this._order) {
-      return this._order.slice();
+    if (this.#order) {
+      return this.#order.slice();
     }
 
-    return Array.from(this._groups.keys());
+    return [...this.#groups.keys()];
   }
 
   getGroups() {
-    if (!this._groups.size) {
-      return null;
-    }
-
-    return Object.fromEntries(this._groups);
+    return this.#groups.size > 0 ? (0, _util.objectFromMap)(this.#groups) : null;
   }
 
   getGroup(id) {
-    return this._groups.get(id) || null;
+    return this.#groups.get(id) || null;
   }
 
 }
@@ -8446,27 +10306,29 @@ class OptionalContentConfig {
 exports.OptionalContentConfig = OptionalContentConfig;
 
 /***/ }),
-/* 17 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 19 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFDataTransportStream = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
+
+var _display_utils = __w_pdfjs_require__(8);
 
 class PDFDataTransportStream {
   constructor(params, pdfDataRangeTransport) {
     (0, _util.assert)(pdfDataRangeTransport, 'PDFDataTransportStream - missing required "pdfDataRangeTransport" argument.');
     this._queuedChunks = [];
     this._progressiveDone = params.progressiveDone || false;
+    this._contentDispositionFilename = params.contentDispositionFilename || null;
     const initialData = params.initialData;
 
-    if (initialData && initialData.length > 0) {
+    if (initialData?.length > 0) {
       const buffer = new Uint8Array(initialData).buffer;
 
       this._queuedChunks.push(buffer);
@@ -8531,14 +10393,14 @@ class PDFDataTransportStream {
   }
 
   get _progressiveDataLength() {
-    return this._fullRequestReader ? this._fullRequestReader._loaded : 0;
+    return this._fullRequestReader?._loaded ?? 0;
   }
 
   _onProgress(evt) {
     if (evt.total === undefined) {
       const firstReader = this._rangeReaders[0];
 
-      if (firstReader && firstReader.onProgress) {
+      if (firstReader?.onProgress) {
         firstReader.onProgress({
           loaded: evt.loaded
         });
@@ -8546,7 +10408,7 @@ class PDFDataTransportStream {
     } else {
       const fullReader = this._fullRequestReader;
 
-      if (fullReader && fullReader.onProgress) {
+      if (fullReader?.onProgress) {
         fullReader.onProgress({
           loaded: evt.loaded,
           total: evt.total
@@ -8575,7 +10437,7 @@ class PDFDataTransportStream {
     (0, _util.assert)(!this._fullRequestReader, "PDFDataTransportStream.getFullReader can only be called once.");
     const queuedChunks = this._queuedChunks;
     this._queuedChunks = null;
-    return new PDFDataTransportStreamReader(this, queuedChunks, this._progressiveDone);
+    return new PDFDataTransportStreamReader(this, queuedChunks, this._progressiveDone, this._contentDispositionFilename);
   }
 
   getRangeReader(begin, end) {
@@ -8597,11 +10459,9 @@ class PDFDataTransportStream {
       this._fullRequestReader.cancel(reason);
     }
 
-    const readers = this._rangeReaders.slice(0);
-
-    readers.forEach(function (rangeReader) {
-      rangeReader.cancel(reason);
-    });
+    for (const reader of this._rangeReaders.slice(0)) {
+      reader.cancel(reason);
+    }
 
     this._pdfDataRangeTransport.abort();
   }
@@ -8611,10 +10471,10 @@ class PDFDataTransportStream {
 exports.PDFDataTransportStream = PDFDataTransportStream;
 
 class PDFDataTransportStreamReader {
-  constructor(stream, queuedChunks, progressiveDone = false) {
+  constructor(stream, queuedChunks, progressiveDone = false, contentDispositionFilename = null) {
     this._stream = stream;
     this._done = progressiveDone || false;
-    this._filename = null;
+    this._filename = (0, _display_utils.isPdfFile)(contentDispositionFilename) ? contentDispositionFilename : null;
     this._queuedChunks = queuedChunks || [];
     this._loaded = 0;
 
@@ -8694,14 +10554,14 @@ class PDFDataTransportStreamReader {
   cancel(reason) {
     this._done = true;
 
-    this._requests.forEach(function (requestCapability) {
+    for (const requestCapability of this._requests) {
       requestCapability.resolve({
         value: undefined,
         done: true
       });
-    });
+    }
 
-    this._requests = [];
+    this._requests.length = 0;
   }
 
   progressiveDone() {
@@ -8740,14 +10600,14 @@ class PDFDataTransportStreamRangeReader {
         done: false
       });
 
-      this._requests.forEach(function (requestCapability) {
+      for (const requestCapability of this._requests) {
         requestCapability.resolve({
           value: undefined,
           done: true
         });
-      });
+      }
 
-      this._requests = [];
+      this._requests.length = 0;
     }
 
     this._done = true;
@@ -8786,14 +10646,14 @@ class PDFDataTransportStreamRangeReader {
   cancel(reason) {
     this._done = true;
 
-    this._requests.forEach(function (requestCapability) {
+    for (const requestCapability of this._requests) {
       requestCapability.resolve({
         value: undefined,
         done: true
       });
-    });
+    }
 
-    this._requests = [];
+    this._requests.length = 0;
 
     this._stream._removeRangeReader(this);
   }
@@ -8801,469 +10661,2165 @@ class PDFDataTransportStreamRangeReader {
 }
 
 /***/ }),
-/* 18 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 20 */
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.WebGLContext = void 0;
+}));
+exports.XfaText = void 0;
 
-var _util = __w_pdfjs_require__(2);
+class XfaText {
+  static textContent(xfa) {
+    const items = [];
+    const output = {
+      items,
+      styles: Object.create(null)
+    };
 
-class WebGLContext {
-  constructor({
-    enable = false
-  }) {
-    this._enabled = enable === true;
-  }
+    function walk(node) {
+      if (!node) {
+        return;
+      }
 
-  get isEnabled() {
-    let enabled = this._enabled;
+      let str = null;
+      const name = node.name;
 
-    if (enabled) {
-      enabled = WebGLUtils.tryInitGL();
+      if (name === "#text") {
+        str = node.value;
+      } else if (!XfaText.shouldBuildText(name)) {
+        return;
+      } else if (node?.attributes?.textContent) {
+        str = node.attributes.textContent;
+      } else if (node.value) {
+        str = node.value;
+      }
+
+      if (str !== null) {
+        items.push({
+          str
+        });
+      }
+
+      if (!node.children) {
+        return;
+      }
+
+      for (const child of node.children) {
+        walk(child);
+      }
     }
 
-    return (0, _util.shadow)(this, "isEnabled", enabled);
+    walk(xfa);
+    return output;
   }
 
-  composeSMask({
-    layer,
-    mask,
-    properties
-  }) {
-    return WebGLUtils.composeSMask(layer, mask, properties);
-  }
-
-  drawFigures({
-    width,
-    height,
-    backgroundColor,
-    figures,
-    context
-  }) {
-    return WebGLUtils.drawFigures(width, height, backgroundColor, figures, context);
-  }
-
-  clear() {
-    WebGLUtils.cleanup();
+  static shouldBuildText(name) {
+    return !(name === "textarea" || name === "input" || name === "option" || name === "select");
   }
 
 }
 
-exports.WebGLContext = WebGLContext;
+exports.XfaText = XfaText;
 
-var WebGLUtils = function WebGLUtilsClosure() {
-  function loadShader(gl, code, shaderType) {
-    var shader = gl.createShader(shaderType);
-    gl.shaderSource(shader, code);
-    gl.compileShader(shader);
-    var compiled = gl.getShaderParameter(shader, gl.COMPILE_STATUS);
+/***/ }),
+/* 21 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
-    if (!compiled) {
-      var errorMsg = gl.getShaderInfoLog(shader);
-      throw new Error("Error during shader compilation: " + errorMsg);
-    }
 
-    return shader;
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.NodeStandardFontDataFactory = exports.NodeCanvasFactory = exports.NodeCMapReaderFactory = void 0;
+
+var _base_factory = __w_pdfjs_require__(9);
+
+;
+
+const fetchData = function (url) {
+  return new Promise((resolve, reject) => {
+    const fs = require("fs");
+
+    fs.readFile(url, (error, data) => {
+      if (error || !data) {
+        reject(new Error(error));
+        return;
+      }
+
+      resolve(new Uint8Array(data));
+    });
+  });
+};
+
+class NodeCanvasFactory extends _base_factory.BaseCanvasFactory {
+  _createCanvas(width, height) {
+    const Canvas = require("canvas");
+
+    return Canvas.createCanvas(width, height);
   }
 
-  function createVertexShader(gl, code) {
-    return loadShader(gl, code, gl.VERTEX_SHADER);
-  }
+}
 
-  function createFragmentShader(gl, code) {
-    return loadShader(gl, code, gl.FRAGMENT_SHADER);
-  }
+exports.NodeCanvasFactory = NodeCanvasFactory;
 
-  function createProgram(gl, shaders) {
-    var program = gl.createProgram();
-
-    for (var i = 0, ii = shaders.length; i < ii; ++i) {
-      gl.attachShader(program, shaders[i]);
-    }
-
-    gl.linkProgram(program);
-    var linked = gl.getProgramParameter(program, gl.LINK_STATUS);
-
-    if (!linked) {
-      var errorMsg = gl.getProgramInfoLog(program);
-      throw new Error("Error during program linking: " + errorMsg);
-    }
-
-    return program;
-  }
-
-  function createTexture(gl, image, textureId) {
-    gl.activeTexture(textureId);
-    var texture = gl.createTexture();
-    gl.bindTexture(gl.TEXTURE_2D, texture);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
-    return texture;
-  }
-
-  var currentGL, currentCanvas;
-
-  function generateGL() {
-    if (currentGL) {
-      return;
-    }
-
-    currentCanvas = document.createElement("canvas");
-    currentGL = currentCanvas.getContext("webgl", {
-      premultipliedalpha: false
+class NodeCMapReaderFactory extends _base_factory.BaseCMapReaderFactory {
+  _fetchData(url, compressionType) {
+    return fetchData(url).then(data => {
+      return {
+        cMapData: data,
+        compressionType
+      };
     });
   }
 
-  var smaskVertexShaderCode = "\
-  attribute vec2 a_position;                                    \
-  attribute vec2 a_texCoord;                                    \
-                                                                \
-  uniform vec2 u_resolution;                                    \
-                                                                \
-  varying vec2 v_texCoord;                                      \
-                                                                \
-  void main() {                                                 \
-    vec2 clipSpace = (a_position / u_resolution) * 2.0 - 1.0;   \
-    gl_Position = vec4(clipSpace * vec2(1, -1), 0, 1);          \
-                                                                \
-    v_texCoord = a_texCoord;                                    \
-  }                                                             ";
-  var smaskFragmentShaderCode = "\
-  precision mediump float;                                      \
-                                                                \
-  uniform vec4 u_backdrop;                                      \
-  uniform int u_subtype;                                        \
-  uniform sampler2D u_image;                                    \
-  uniform sampler2D u_mask;                                     \
-                                                                \
-  varying vec2 v_texCoord;                                      \
-                                                                \
-  void main() {                                                 \
-    vec4 imageColor = texture2D(u_image, v_texCoord);           \
-    vec4 maskColor = texture2D(u_mask, v_texCoord);             \
-    if (u_backdrop.a > 0.0) {                                   \
-      maskColor.rgb = maskColor.rgb * maskColor.a +             \
-                      u_backdrop.rgb * (1.0 - maskColor.a);     \
-    }                                                           \
-    float lum;                                                  \
-    if (u_subtype == 0) {                                       \
-      lum = maskColor.a;                                        \
-    } else {                                                    \
-      lum = maskColor.r * 0.3 + maskColor.g * 0.59 +            \
-            maskColor.b * 0.11;                                 \
-    }                                                           \
-    imageColor.a *= lum;                                        \
-    imageColor.rgb *= imageColor.a;                             \
-    gl_FragColor = imageColor;                                  \
-  }                                                             ";
-  var smaskCache = null;
+}
 
-  function initSmaskGL() {
-    var canvas, gl;
-    generateGL();
-    canvas = currentCanvas;
-    currentCanvas = null;
-    gl = currentGL;
-    currentGL = null;
-    var vertexShader = createVertexShader(gl, smaskVertexShaderCode);
-    var fragmentShader = createFragmentShader(gl, smaskFragmentShaderCode);
-    var program = createProgram(gl, [vertexShader, fragmentShader]);
-    gl.useProgram(program);
-    var cache = {};
-    cache.gl = gl;
-    cache.canvas = canvas;
-    cache.resolutionLocation = gl.getUniformLocation(program, "u_resolution");
-    cache.positionLocation = gl.getAttribLocation(program, "a_position");
-    cache.backdropLocation = gl.getUniformLocation(program, "u_backdrop");
-    cache.subtypeLocation = gl.getUniformLocation(program, "u_subtype");
-    var texCoordLocation = gl.getAttribLocation(program, "a_texCoord");
-    var texLayerLocation = gl.getUniformLocation(program, "u_image");
-    var texMaskLocation = gl.getUniformLocation(program, "u_mask");
-    var texCoordBuffer = gl.createBuffer();
-    gl.bindBuffer(gl.ARRAY_BUFFER, texCoordBuffer);
-    gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0]), gl.STATIC_DRAW);
-    gl.enableVertexAttribArray(texCoordLocation);
-    gl.vertexAttribPointer(texCoordLocation, 2, gl.FLOAT, false, 0, 0);
-    gl.uniform1i(texLayerLocation, 0);
-    gl.uniform1i(texMaskLocation, 1);
-    smaskCache = cache;
+exports.NodeCMapReaderFactory = NodeCMapReaderFactory;
+
+class NodeStandardFontDataFactory extends _base_factory.BaseStandardFontDataFactory {
+  _fetchData(url) {
+    return fetchData(url);
   }
 
-  function composeSMask(layer, mask, properties) {
-    var width = layer.width,
-        height = layer.height;
+}
 
-    if (!smaskCache) {
-      initSmaskGL();
-    }
-
-    var cache = smaskCache,
-        canvas = cache.canvas,
-        gl = cache.gl;
-    canvas.width = width;
-    canvas.height = height;
-    gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
-    gl.uniform2f(cache.resolutionLocation, width, height);
-
-    if (properties.backdrop) {
-      gl.uniform4f(cache.resolutionLocation, properties.backdrop[0], properties.backdrop[1], properties.backdrop[2], 1);
-    } else {
-      gl.uniform4f(cache.resolutionLocation, 0, 0, 0, 0);
-    }
-
-    gl.uniform1i(cache.subtypeLocation, properties.subtype === "Luminosity" ? 1 : 0);
-    var texture = createTexture(gl, layer, gl.TEXTURE0);
-    var maskTexture = createTexture(gl, mask, gl.TEXTURE1);
-    var buffer = gl.createBuffer();
-    gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-    gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([0, 0, width, 0, 0, height, 0, height, width, 0, width, height]), gl.STATIC_DRAW);
-    gl.enableVertexAttribArray(cache.positionLocation);
-    gl.vertexAttribPointer(cache.positionLocation, 2, gl.FLOAT, false, 0, 0);
-    gl.clearColor(0, 0, 0, 0);
-    gl.enable(gl.BLEND);
-    gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
-    gl.clear(gl.COLOR_BUFFER_BIT);
-    gl.drawArrays(gl.TRIANGLES, 0, 6);
-    gl.flush();
-    gl.deleteTexture(texture);
-    gl.deleteTexture(maskTexture);
-    gl.deleteBuffer(buffer);
-    return canvas;
-  }
-
-  var figuresVertexShaderCode = "\
-  attribute vec2 a_position;                                    \
-  attribute vec3 a_color;                                       \
-                                                                \
-  uniform vec2 u_resolution;                                    \
-  uniform vec2 u_scale;                                         \
-  uniform vec2 u_offset;                                        \
-                                                                \
-  varying vec4 v_color;                                         \
-                                                                \
-  void main() {                                                 \
-    vec2 position = (a_position + u_offset) * u_scale;          \
-    vec2 clipSpace = (position / u_resolution) * 2.0 - 1.0;     \
-    gl_Position = vec4(clipSpace * vec2(1, -1), 0, 1);          \
-                                                                \
-    v_color = vec4(a_color / 255.0, 1.0);                       \
-  }                                                             ";
-  var figuresFragmentShaderCode = "\
-  precision mediump float;                                      \
-                                                                \
-  varying vec4 v_color;                                         \
-                                                                \
-  void main() {                                                 \
-    gl_FragColor = v_color;                                     \
-  }                                                             ";
-  var figuresCache = null;
-
-  function initFiguresGL() {
-    var canvas, gl;
-    generateGL();
-    canvas = currentCanvas;
-    currentCanvas = null;
-    gl = currentGL;
-    currentGL = null;
-    var vertexShader = createVertexShader(gl, figuresVertexShaderCode);
-    var fragmentShader = createFragmentShader(gl, figuresFragmentShaderCode);
-    var program = createProgram(gl, [vertexShader, fragmentShader]);
-    gl.useProgram(program);
-    var cache = {};
-    cache.gl = gl;
-    cache.canvas = canvas;
-    cache.resolutionLocation = gl.getUniformLocation(program, "u_resolution");
-    cache.scaleLocation = gl.getUniformLocation(program, "u_scale");
-    cache.offsetLocation = gl.getUniformLocation(program, "u_offset");
-    cache.positionLocation = gl.getAttribLocation(program, "a_position");
-    cache.colorLocation = gl.getAttribLocation(program, "a_color");
-    figuresCache = cache;
-  }
-
-  function drawFigures(width, height, backgroundColor, figures, context) {
-    if (!figuresCache) {
-      initFiguresGL();
-    }
-
-    var cache = figuresCache,
-        canvas = cache.canvas,
-        gl = cache.gl;
-    canvas.width = width;
-    canvas.height = height;
-    gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
-    gl.uniform2f(cache.resolutionLocation, width, height);
-    var count = 0;
-    var i, ii, rows;
-
-    for (i = 0, ii = figures.length; i < ii; i++) {
-      switch (figures[i].type) {
-        case "lattice":
-          rows = figures[i].coords.length / figures[i].verticesPerRow | 0;
-          count += (rows - 1) * (figures[i].verticesPerRow - 1) * 6;
-          break;
-
-        case "triangles":
-          count += figures[i].coords.length;
-          break;
-      }
-    }
-
-    var coords = new Float32Array(count * 2);
-    var colors = new Uint8Array(count * 3);
-    var coordsMap = context.coords,
-        colorsMap = context.colors;
-    var pIndex = 0,
-        cIndex = 0;
-
-    for (i = 0, ii = figures.length; i < ii; i++) {
-      var figure = figures[i],
-          ps = figure.coords,
-          cs = figure.colors;
-
-      switch (figure.type) {
-        case "lattice":
-          var cols = figure.verticesPerRow;
-          rows = ps.length / cols | 0;
-
-          for (var row = 1; row < rows; row++) {
-            var offset = row * cols + 1;
-
-            for (var col = 1; col < cols; col++, offset++) {
-              coords[pIndex] = coordsMap[ps[offset - cols - 1]];
-              coords[pIndex + 1] = coordsMap[ps[offset - cols - 1] + 1];
-              coords[pIndex + 2] = coordsMap[ps[offset - cols]];
-              coords[pIndex + 3] = coordsMap[ps[offset - cols] + 1];
-              coords[pIndex + 4] = coordsMap[ps[offset - 1]];
-              coords[pIndex + 5] = coordsMap[ps[offset - 1] + 1];
-              colors[cIndex] = colorsMap[cs[offset - cols - 1]];
-              colors[cIndex + 1] = colorsMap[cs[offset - cols - 1] + 1];
-              colors[cIndex + 2] = colorsMap[cs[offset - cols - 1] + 2];
-              colors[cIndex + 3] = colorsMap[cs[offset - cols]];
-              colors[cIndex + 4] = colorsMap[cs[offset - cols] + 1];
-              colors[cIndex + 5] = colorsMap[cs[offset - cols] + 2];
-              colors[cIndex + 6] = colorsMap[cs[offset - 1]];
-              colors[cIndex + 7] = colorsMap[cs[offset - 1] + 1];
-              colors[cIndex + 8] = colorsMap[cs[offset - 1] + 2];
-              coords[pIndex + 6] = coords[pIndex + 2];
-              coords[pIndex + 7] = coords[pIndex + 3];
-              coords[pIndex + 8] = coords[pIndex + 4];
-              coords[pIndex + 9] = coords[pIndex + 5];
-              coords[pIndex + 10] = coordsMap[ps[offset]];
-              coords[pIndex + 11] = coordsMap[ps[offset] + 1];
-              colors[cIndex + 9] = colors[cIndex + 3];
-              colors[cIndex + 10] = colors[cIndex + 4];
-              colors[cIndex + 11] = colors[cIndex + 5];
-              colors[cIndex + 12] = colors[cIndex + 6];
-              colors[cIndex + 13] = colors[cIndex + 7];
-              colors[cIndex + 14] = colors[cIndex + 8];
-              colors[cIndex + 15] = colorsMap[cs[offset]];
-              colors[cIndex + 16] = colorsMap[cs[offset] + 1];
-              colors[cIndex + 17] = colorsMap[cs[offset] + 2];
-              pIndex += 12;
-              cIndex += 18;
-            }
-          }
-
-          break;
-
-        case "triangles":
-          for (var j = 0, jj = ps.length; j < jj; j++) {
-            coords[pIndex] = coordsMap[ps[j]];
-            coords[pIndex + 1] = coordsMap[ps[j] + 1];
-            colors[cIndex] = colorsMap[cs[j]];
-            colors[cIndex + 1] = colorsMap[cs[j] + 1];
-            colors[cIndex + 2] = colorsMap[cs[j] + 2];
-            pIndex += 2;
-            cIndex += 3;
-          }
-
-          break;
-      }
-    }
-
-    if (backgroundColor) {
-      gl.clearColor(backgroundColor[0] / 255, backgroundColor[1] / 255, backgroundColor[2] / 255, 1.0);
-    } else {
-      gl.clearColor(0, 0, 0, 0);
-    }
-
-    gl.clear(gl.COLOR_BUFFER_BIT);
-    var coordsBuffer = gl.createBuffer();
-    gl.bindBuffer(gl.ARRAY_BUFFER, coordsBuffer);
-    gl.bufferData(gl.ARRAY_BUFFER, coords, gl.STATIC_DRAW);
-    gl.enableVertexAttribArray(cache.positionLocation);
-    gl.vertexAttribPointer(cache.positionLocation, 2, gl.FLOAT, false, 0, 0);
-    var colorsBuffer = gl.createBuffer();
-    gl.bindBuffer(gl.ARRAY_BUFFER, colorsBuffer);
-    gl.bufferData(gl.ARRAY_BUFFER, colors, gl.STATIC_DRAW);
-    gl.enableVertexAttribArray(cache.colorLocation);
-    gl.vertexAttribPointer(cache.colorLocation, 3, gl.UNSIGNED_BYTE, false, 0, 0);
-    gl.uniform2f(cache.scaleLocation, context.scaleX, context.scaleY);
-    gl.uniform2f(cache.offsetLocation, context.offsetX, context.offsetY);
-    gl.drawArrays(gl.TRIANGLES, 0, count);
-    gl.flush();
-    gl.deleteBuffer(coordsBuffer);
-    gl.deleteBuffer(colorsBuffer);
-    return canvas;
-  }
-
-  return {
-    tryInitGL() {
-      try {
-        generateGL();
-        return !!currentGL;
-      } catch (ex) {}
-
-      return false;
-    },
-
-    composeSMask,
-    drawFigures,
-
-    cleanup() {
-      if (smaskCache && smaskCache.canvas) {
-        smaskCache.canvas.width = 0;
-        smaskCache.canvas.height = 0;
-      }
-
-      if (figuresCache && figuresCache.canvas) {
-        figuresCache.canvas.width = 0;
-        figuresCache.canvas.height = 0;
-      }
-
-      smaskCache = null;
-      figuresCache = null;
-    }
-
-  };
-}();
+exports.NodeStandardFontDataFactory = NodeStandardFontDataFactory;
 
 /***/ }),
-/* 19 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 22 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.AnnotationEditorLayer = void 0;
+
+var _tools = __w_pdfjs_require__(7);
+
+var _util = __w_pdfjs_require__(1);
+
+var _freetext = __w_pdfjs_require__(23);
+
+var _ink = __w_pdfjs_require__(24);
+
+class AnnotationEditorLayer {
+  #accessibilityManager;
+  #allowClick = false;
+  #boundPointerup = this.pointerup.bind(this);
+  #boundPointerdown = this.pointerdown.bind(this);
+  #editors = new Map();
+  #hadPointerDown = false;
+  #isCleaningUp = false;
+  #uiManager;
+  static _initialized = false;
+
+  constructor(options) {
+    if (!AnnotationEditorLayer._initialized) {
+      AnnotationEditorLayer._initialized = true;
+
+      _freetext.FreeTextEditor.initialize(options.l10n);
+
+      _ink.InkEditor.initialize(options.l10n);
+
+      options.uiManager.registerEditorTypes([_freetext.FreeTextEditor, _ink.InkEditor]);
+    }
+
+    this.#uiManager = options.uiManager;
+    this.annotationStorage = options.annotationStorage;
+    this.pageIndex = options.pageIndex;
+    this.div = options.div;
+    this.#accessibilityManager = options.accessibilityManager;
+    this.#uiManager.addLayer(this);
+  }
+
+  updateToolbar(mode) {
+    this.#uiManager.updateToolbar(mode);
+  }
+
+  updateMode(mode = this.#uiManager.getMode()) {
+    this.#cleanup();
+
+    if (mode === _util.AnnotationEditorType.INK) {
+      this.addInkEditorIfNeeded(false);
+      this.disableClick();
+    } else {
+      this.enableClick();
+    }
+
+    this.#uiManager.unselectAll();
+  }
+
+  addInkEditorIfNeeded(isCommitting) {
+    if (!isCommitting && this.#uiManager.getMode() !== _util.AnnotationEditorType.INK) {
+      return;
+    }
+
+    if (!isCommitting) {
+      for (const editor of this.#editors.values()) {
+        if (editor.isEmpty()) {
+          editor.setInBackground();
+          return;
+        }
+      }
+    }
+
+    const editor = this.#createAndAddNewEditor({
+      offsetX: 0,
+      offsetY: 0
+    });
+    editor.setInBackground();
+  }
+
+  setEditingState(isEditing) {
+    this.#uiManager.setEditingState(isEditing);
+  }
+
+  addCommands(params) {
+    this.#uiManager.addCommands(params);
+  }
+
+  enable() {
+    this.div.style.pointerEvents = "auto";
+
+    for (const editor of this.#editors.values()) {
+      editor.enableEditing();
+    }
+  }
+
+  disable() {
+    this.div.style.pointerEvents = "none";
+
+    for (const editor of this.#editors.values()) {
+      editor.disableEditing();
+    }
+  }
+
+  setActiveEditor(editor) {
+    const currentActive = this.#uiManager.getActive();
+
+    if (currentActive === editor) {
+      return;
+    }
+
+    this.#uiManager.setActiveEditor(editor);
+  }
+
+  enableClick() {
+    this.div.addEventListener("pointerdown", this.#boundPointerdown);
+    this.div.addEventListener("pointerup", this.#boundPointerup);
+  }
+
+  disableClick() {
+    this.div.removeEventListener("pointerdown", this.#boundPointerdown);
+    this.div.removeEventListener("pointerup", this.#boundPointerup);
+  }
+
+  attach(editor) {
+    this.#editors.set(editor.id, editor);
+  }
+
+  detach(editor) {
+    this.#editors.delete(editor.id);
+    this.#accessibilityManager?.removePointerInTextLayer(editor.contentDiv);
+  }
+
+  remove(editor) {
+    this.#uiManager.removeEditor(editor);
+    this.detach(editor);
+    this.annotationStorage.remove(editor.id);
+    editor.div.style.display = "none";
+    setTimeout(() => {
+      editor.div.style.display = "";
+      editor.div.remove();
+      editor.isAttachedToDOM = false;
+
+      if (document.activeElement === document.body) {
+        this.#uiManager.focusMainContainer();
+      }
+    }, 0);
+
+    if (!this.#isCleaningUp) {
+      this.addInkEditorIfNeeded(false);
+    }
+  }
+
+  #changeParent(editor) {
+    if (editor.parent === this) {
+      return;
+    }
+
+    this.attach(editor);
+    editor.pageIndex = this.pageIndex;
+    editor.parent?.detach(editor);
+    editor.parent = this;
+
+    if (editor.div && editor.isAttachedToDOM) {
+      editor.div.remove();
+      this.div.append(editor.div);
+    }
+  }
+
+  add(editor) {
+    this.#changeParent(editor);
+    this.#uiManager.addEditor(editor);
+    this.attach(editor);
+
+    if (!editor.isAttachedToDOM) {
+      const div = editor.render();
+      this.div.append(div);
+      editor.isAttachedToDOM = true;
+    }
+
+    this.moveEditorInDOM(editor);
+    editor.onceAdded();
+    this.addToAnnotationStorage(editor);
+  }
+
+  moveEditorInDOM(editor) {
+    this.#accessibilityManager?.moveElementInDOM(this.div, editor.div, editor.contentDiv, true);
+  }
+
+  addToAnnotationStorage(editor) {
+    if (!editor.isEmpty() && !this.annotationStorage.has(editor.id)) {
+      this.annotationStorage.setValue(editor.id, editor);
+    }
+  }
+
+  addOrRebuild(editor) {
+    if (editor.needsToBeRebuilt()) {
+      editor.rebuild();
+    } else {
+      this.add(editor);
+    }
+  }
+
+  addANewEditor(editor) {
+    const cmd = () => {
+      this.addOrRebuild(editor);
+    };
+
+    const undo = () => {
+      editor.remove();
+    };
+
+    this.addCommands({
+      cmd,
+      undo,
+      mustExec: true
+    });
+  }
+
+  addUndoableEditor(editor) {
+    const cmd = () => {
+      this.addOrRebuild(editor);
+    };
+
+    const undo = () => {
+      editor.remove();
+    };
+
+    this.addCommands({
+      cmd,
+      undo,
+      mustExec: false
+    });
+  }
+
+  getNextId() {
+    return this.#uiManager.getId();
+  }
+
+  #createNewEditor(params) {
+    switch (this.#uiManager.getMode()) {
+      case _util.AnnotationEditorType.FREETEXT:
+        return new _freetext.FreeTextEditor(params);
+
+      case _util.AnnotationEditorType.INK:
+        return new _ink.InkEditor(params);
+    }
+
+    return null;
+  }
+
+  deserialize(data) {
+    switch (data.annotationType) {
+      case _util.AnnotationEditorType.FREETEXT:
+        return _freetext.FreeTextEditor.deserialize(data, this);
+
+      case _util.AnnotationEditorType.INK:
+        return _ink.InkEditor.deserialize(data, this);
+    }
+
+    return null;
+  }
+
+  #createAndAddNewEditor(event) {
+    const id = this.getNextId();
+    const editor = this.#createNewEditor({
+      parent: this,
+      id,
+      x: event.offsetX,
+      y: event.offsetY
+    });
+
+    if (editor) {
+      this.add(editor);
+    }
+
+    return editor;
+  }
+
+  setSelected(editor) {
+    this.#uiManager.setSelected(editor);
+  }
+
+  toggleSelected(editor) {
+    this.#uiManager.toggleSelected(editor);
+  }
+
+  isSelected(editor) {
+    return this.#uiManager.isSelected(editor);
+  }
+
+  unselect(editor) {
+    this.#uiManager.unselect(editor);
+  }
+
+  pointerup(event) {
+    const isMac = _tools.KeyboardManager.platform.isMac;
+
+    if (event.button !== 0 || event.ctrlKey && isMac) {
+      return;
+    }
+
+    if (event.target !== this.div) {
+      return;
+    }
+
+    if (!this.#hadPointerDown) {
+      return;
+    }
+
+    this.#hadPointerDown = false;
+
+    if (!this.#allowClick) {
+      this.#allowClick = true;
+      return;
+    }
+
+    this.#createAndAddNewEditor(event);
+  }
+
+  pointerdown(event) {
+    const isMac = _tools.KeyboardManager.platform.isMac;
+
+    if (event.button !== 0 || event.ctrlKey && isMac) {
+      return;
+    }
+
+    if (event.target !== this.div) {
+      return;
+    }
+
+    this.#hadPointerDown = true;
+    const editor = this.#uiManager.getActive();
+    this.#allowClick = !editor || editor.isEmpty();
+  }
+
+  drop(event) {
+    const id = event.dataTransfer.getData("text/plain");
+    const editor = this.#uiManager.getEditor(id);
+
+    if (!editor) {
+      return;
+    }
+
+    event.preventDefault();
+    event.dataTransfer.dropEffect = "move";
+    this.#changeParent(editor);
+    const rect = this.div.getBoundingClientRect();
+    const endX = event.clientX - rect.x;
+    const endY = event.clientY - rect.y;
+    editor.translate(endX - editor.startX, endY - editor.startY);
+    this.moveEditorInDOM(editor);
+    editor.div.focus();
+  }
+
+  dragover(event) {
+    event.preventDefault();
+  }
+
+  destroy() {
+    if (this.#uiManager.getActive()?.parent === this) {
+      this.#uiManager.setActiveEditor(null);
+    }
+
+    for (const editor of this.#editors.values()) {
+      this.#accessibilityManager?.removePointerInTextLayer(editor.contentDiv);
+      editor.isAttachedToDOM = false;
+      editor.div.remove();
+      editor.parent = null;
+    }
+
+    this.div = null;
+    this.#editors.clear();
+    this.#uiManager.removeLayer(this);
+  }
+
+  #cleanup() {
+    this.#isCleaningUp = true;
+
+    for (const editor of this.#editors.values()) {
+      if (editor.isEmpty()) {
+        editor.remove();
+      }
+    }
+
+    this.#isCleaningUp = false;
+  }
+
+  render(parameters) {
+    this.viewport = parameters.viewport;
+    (0, _tools.bindEvents)(this, this.div, ["dragover", "drop"]);
+    this.setDimensions();
+
+    for (const editor of this.#uiManager.getEditors(this.pageIndex)) {
+      this.add(editor);
+    }
+
+    this.updateMode();
+  }
+
+  update(parameters) {
+    this.viewport = parameters.viewport;
+    this.setDimensions();
+    this.updateMode();
+  }
+
+  get scaleFactor() {
+    return this.viewport.scale;
+  }
+
+  get pageDimensions() {
+    const [pageLLx, pageLLy, pageURx, pageURy] = this.viewport.viewBox;
+    const width = pageURx - pageLLx;
+    const height = pageURy - pageLLy;
+    return [width, height];
+  }
+
+  get viewportBaseDimensions() {
+    const {
+      width,
+      height,
+      rotation
+    } = this.viewport;
+    return rotation % 180 === 0 ? [width, height] : [height, width];
+  }
+
+  setDimensions() {
+    const {
+      width,
+      height,
+      rotation
+    } = this.viewport;
+    const flipOrientation = rotation % 180 !== 0,
+          widthStr = Math.floor(width) + "px",
+          heightStr = Math.floor(height) + "px";
+    this.div.style.width = flipOrientation ? heightStr : widthStr;
+    this.div.style.height = flipOrientation ? widthStr : heightStr;
+    this.div.setAttribute("data-main-rotation", rotation);
+  }
+
+}
+
+exports.AnnotationEditorLayer = AnnotationEditorLayer;
+
+/***/ }),
+/* 23 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.FreeTextEditor = void 0;
+
+var _util = __w_pdfjs_require__(1);
+
+var _tools = __w_pdfjs_require__(7);
+
+var _editor = __w_pdfjs_require__(6);
+
+class FreeTextEditor extends _editor.AnnotationEditor {
+  #boundEditorDivBlur = this.editorDivBlur.bind(this);
+  #boundEditorDivFocus = this.editorDivFocus.bind(this);
+  #boundEditorDivKeydown = this.editorDivKeydown.bind(this);
+  #color;
+  #content = "";
+  #hasAlreadyBeenCommitted = false;
+  #fontSize;
+  static _freeTextDefaultContent = "";
+  static _l10nPromise;
+  static _internalPadding = 0;
+  static _defaultColor = null;
+  static _defaultFontSize = 10;
+  static _keyboardManager = new _tools.KeyboardManager([[["ctrl+Enter", "mac+meta+Enter", "Escape", "mac+Escape"], FreeTextEditor.prototype.commitOrRemove]]);
+  static _type = "freetext";
+
+  constructor(params) {
+    super({ ...params,
+      name: "freeTextEditor"
+    });
+    this.#color = params.color || FreeTextEditor._defaultColor || _editor.AnnotationEditor._defaultLineColor;
+    this.#fontSize = params.fontSize || FreeTextEditor._defaultFontSize;
+  }
+
+  static initialize(l10n) {
+    this._l10nPromise = new Map(["free_text_default_content", "editor_free_text_aria_label"].map(str => [str, l10n.get(str)]));
+    const style = getComputedStyle(document.documentElement);
+    this._internalPadding = parseFloat(style.getPropertyValue("--freetext-padding"));
+  }
+
+  static updateDefaultParams(type, value) {
+    switch (type) {
+      case _util.AnnotationEditorParamsType.FREETEXT_SIZE:
+        FreeTextEditor._defaultFontSize = value;
+        break;
+
+      case _util.AnnotationEditorParamsType.FREETEXT_COLOR:
+        FreeTextEditor._defaultColor = value;
+        break;
+    }
+  }
+
+  updateParams(type, value) {
+    switch (type) {
+      case _util.AnnotationEditorParamsType.FREETEXT_SIZE:
+        this.#updateFontSize(value);
+        break;
+
+      case _util.AnnotationEditorParamsType.FREETEXT_COLOR:
+        this.#updateColor(value);
+        break;
+    }
+  }
+
+  static get defaultPropertiesToUpdate() {
+    return [[_util.AnnotationEditorParamsType.FREETEXT_SIZE, FreeTextEditor._defaultFontSize], [_util.AnnotationEditorParamsType.FREETEXT_COLOR, FreeTextEditor._defaultColor || _editor.AnnotationEditor._defaultLineColor]];
+  }
+
+  get propertiesToUpdate() {
+    return [[_util.AnnotationEditorParamsType.FREETEXT_SIZE, this.#fontSize], [_util.AnnotationEditorParamsType.FREETEXT_COLOR, this.#color]];
+  }
+
+  #updateFontSize(fontSize) {
+    const setFontsize = size => {
+      this.editorDiv.style.fontSize = `calc(${size}px * var(--scale-factor))`;
+      this.translate(0, -(size - this.#fontSize) * this.parent.scaleFactor);
+      this.#fontSize = size;
+      this.#setEditorDimensions();
+    };
+
+    const savedFontsize = this.#fontSize;
+    this.parent.addCommands({
+      cmd: () => {
+        setFontsize(fontSize);
+      },
+      undo: () => {
+        setFontsize(savedFontsize);
+      },
+      mustExec: true,
+      type: _util.AnnotationEditorParamsType.FREETEXT_SIZE,
+      overwriteIfSameType: true,
+      keepUndo: true
+    });
+  }
+
+  #updateColor(color) {
+    const savedColor = this.#color;
+    this.parent.addCommands({
+      cmd: () => {
+        this.#color = color;
+        this.editorDiv.style.color = color;
+      },
+      undo: () => {
+        this.#color = savedColor;
+        this.editorDiv.style.color = savedColor;
+      },
+      mustExec: true,
+      type: _util.AnnotationEditorParamsType.FREETEXT_COLOR,
+      overwriteIfSameType: true,
+      keepUndo: true
+    });
+  }
+
+  getInitialTranslation() {
+    return [-FreeTextEditor._internalPadding * this.parent.scaleFactor, -(FreeTextEditor._internalPadding + this.#fontSize) * this.parent.scaleFactor];
+  }
+
+  rebuild() {
+    super.rebuild();
+
+    if (this.div === null) {
+      return;
+    }
+
+    if (!this.isAttachedToDOM) {
+      this.parent.add(this);
+    }
+  }
+
+  enableEditMode() {
+    if (this.isInEditMode()) {
+      return;
+    }
+
+    this.parent.setEditingState(false);
+    this.parent.updateToolbar(_util.AnnotationEditorType.FREETEXT);
+    super.enableEditMode();
+    this.enableEditing();
+    this.overlayDiv.classList.remove("enabled");
+    this.editorDiv.contentEditable = true;
+    this.div.draggable = false;
+    this.editorDiv.addEventListener("keydown", this.#boundEditorDivKeydown);
+    this.editorDiv.addEventListener("focus", this.#boundEditorDivFocus);
+    this.editorDiv.addEventListener("blur", this.#boundEditorDivBlur);
+  }
+
+  disableEditMode() {
+    if (!this.isInEditMode()) {
+      return;
+    }
+
+    this.parent.setEditingState(true);
+    super.disableEditMode();
+    this.disableEditing();
+    this.overlayDiv.classList.add("enabled");
+    this.editorDiv.contentEditable = false;
+    this.div.draggable = true;
+    this.editorDiv.removeEventListener("keydown", this.#boundEditorDivKeydown);
+    this.editorDiv.removeEventListener("focus", this.#boundEditorDivFocus);
+    this.editorDiv.removeEventListener("blur", this.#boundEditorDivBlur);
+    this.div.focus();
+    this.isEditing = false;
+  }
+
+  focusin(event) {
+    super.focusin(event);
+
+    if (event.target !== this.editorDiv) {
+      this.editorDiv.focus();
+    }
+  }
+
+  onceAdded() {
+    if (this.width) {
+      return;
+    }
+
+    this.enableEditMode();
+    this.editorDiv.focus();
+  }
+
+  isEmpty() {
+    return !this.editorDiv || this.editorDiv.innerText.trim() === "";
+  }
+
+  remove() {
+    this.isEditing = false;
+    this.parent.setEditingState(true);
+    super.remove();
+  }
+
+  #extractText() {
+    const divs = this.editorDiv.getElementsByTagName("div");
+
+    if (divs.length === 0) {
+      return this.editorDiv.innerText;
+    }
+
+    const buffer = [];
+
+    for (let i = 0, ii = divs.length; i < ii; i++) {
+      const div = divs[i];
+      const first = div.firstChild;
+
+      if (first?.nodeName === "#text") {
+        buffer.push(first.data);
+      } else {
+        buffer.push("");
+      }
+    }
+
+    return buffer.join("\n");
+  }
+
+  #setEditorDimensions() {
+    const [parentWidth, parentHeight] = this.parent.viewportBaseDimensions;
+    const rect = this.div.getBoundingClientRect();
+    this.width = rect.width / parentWidth;
+    this.height = rect.height / parentHeight;
+  }
+
+  commit() {
+    super.commit();
+
+    if (!this.#hasAlreadyBeenCommitted) {
+      this.#hasAlreadyBeenCommitted = true;
+      this.parent.addUndoableEditor(this);
+    }
+
+    this.disableEditMode();
+    this.#content = this.#extractText().trimEnd();
+    this.#setEditorDimensions();
+  }
+
+  shouldGetKeyboardEvents() {
+    return this.isInEditMode();
+  }
+
+  dblclick(event) {
+    this.enableEditMode();
+    this.editorDiv.focus();
+  }
+
+  keydown(event) {
+    if (event.target === this.div && event.key === "Enter") {
+      this.enableEditMode();
+      this.editorDiv.focus();
+    }
+  }
+
+  editorDivKeydown(event) {
+    FreeTextEditor._keyboardManager.exec(this, event);
+  }
+
+  editorDivFocus(event) {
+    this.isEditing = true;
+  }
+
+  editorDivBlur(event) {
+    this.isEditing = false;
+  }
+
+  disableEditing() {
+    this.editorDiv.setAttribute("role", "comment");
+    this.editorDiv.removeAttribute("aria-multiline");
+  }
+
+  enableEditing() {
+    this.editorDiv.setAttribute("role", "textbox");
+    this.editorDiv.setAttribute("aria-multiline", true);
+  }
+
+  render() {
+    if (this.div) {
+      return this.div;
+    }
+
+    let baseX, baseY;
+
+    if (this.width) {
+      baseX = this.x;
+      baseY = this.y;
+    }
+
+    super.render();
+    this.editorDiv = document.createElement("div");
+    this.editorDiv.className = "internal";
+    this.editorDiv.setAttribute("id", `${this.id}-editor`);
+    this.enableEditing();
+
+    FreeTextEditor._l10nPromise.get("editor_free_text_aria_label").then(msg => this.editorDiv?.setAttribute("aria-label", msg));
+
+    FreeTextEditor._l10nPromise.get("free_text_default_content").then(msg => this.editorDiv?.setAttribute("default-content", msg));
+
+    this.editorDiv.contentEditable = true;
+    const {
+      style
+    } = this.editorDiv;
+    style.fontSize = `calc(${this.#fontSize}px * var(--scale-factor))`;
+    style.color = this.#color;
+    this.div.append(this.editorDiv);
+    this.overlayDiv = document.createElement("div");
+    this.overlayDiv.classList.add("overlay", "enabled");
+    this.div.append(this.overlayDiv);
+    (0, _tools.bindEvents)(this, this.div, ["dblclick", "keydown"]);
+
+    if (this.width) {
+      const [parentWidth, parentHeight] = this.parent.viewportBaseDimensions;
+      this.setAt(baseX * parentWidth, baseY * parentHeight, this.width * parentWidth, this.height * parentHeight);
+
+      for (const line of this.#content.split("\n")) {
+        const div = document.createElement("div");
+        div.append(line ? document.createTextNode(line) : document.createElement("br"));
+        this.editorDiv.append(div);
+      }
+
+      this.div.draggable = true;
+      this.editorDiv.contentEditable = false;
+    } else {
+      this.div.draggable = false;
+      this.editorDiv.contentEditable = true;
+    }
+
+    return this.div;
+  }
+
+  get contentDiv() {
+    return this.editorDiv;
+  }
+
+  static deserialize(data, parent) {
+    const editor = super.deserialize(data, parent);
+    editor.#fontSize = data.fontSize;
+    editor.#color = _util.Util.makeHexColor(...data.color);
+    editor.#content = data.value;
+    return editor;
+  }
+
+  serialize() {
+    if (this.isEmpty()) {
+      return null;
+    }
+
+    const padding = FreeTextEditor._internalPadding * this.parent.scaleFactor;
+    const rect = this.getRect(padding, padding);
+
+    const color = _editor.AnnotationEditor._colorManager.convert(getComputedStyle(this.editorDiv).color);
+
+    return {
+      annotationType: _util.AnnotationEditorType.FREETEXT,
+      color,
+      fontSize: this.#fontSize,
+      value: this.#content,
+      pageIndex: this.parent.pageIndex,
+      rect,
+      rotation: this.rotation
+    };
+  }
+
+}
+
+exports.FreeTextEditor = FreeTextEditor;
+
+/***/ }),
+/* 24 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.InkEditor = void 0;
+Object.defineProperty(exports, "fitCurve", ({
+  enumerable: true,
+  get: function () {
+    return _pdfjsFitCurve.fitCurve;
+  }
+}));
+
+var _util = __w_pdfjs_require__(1);
+
+var _editor = __w_pdfjs_require__(6);
+
+var _pdfjsFitCurve = __w_pdfjs_require__(25);
+
+var _tools = __w_pdfjs_require__(7);
+
+const RESIZER_SIZE = 16;
+
+class InkEditor extends _editor.AnnotationEditor {
+  #aspectRatio = 0;
+  #baseHeight = 0;
+  #baseWidth = 0;
+  #boundCanvasPointermove = this.canvasPointermove.bind(this);
+  #boundCanvasPointerleave = this.canvasPointerleave.bind(this);
+  #boundCanvasPointerup = this.canvasPointerup.bind(this);
+  #boundCanvasPointerdown = this.canvasPointerdown.bind(this);
+  #disableEditing = false;
+  #isCanvasInitialized = false;
+  #lastPoint = null;
+  #observer = null;
+  #realWidth = 0;
+  #realHeight = 0;
+  #requestFrameCallback = null;
+  static _defaultColor = null;
+  static _defaultOpacity = 1;
+  static _defaultThickness = 1;
+  static _l10nPromise;
+  static _type = "ink";
+
+  constructor(params) {
+    super({ ...params,
+      name: "inkEditor"
+    });
+    this.color = params.color || null;
+    this.thickness = params.thickness || null;
+    this.opacity = params.opacity || null;
+    this.paths = [];
+    this.bezierPath2D = [];
+    this.currentPath = [];
+    this.scaleFactor = 1;
+    this.translationX = this.translationY = 0;
+    this.x = 0;
+    this.y = 0;
+  }
+
+  static initialize(l10n) {
+    this._l10nPromise = new Map(["editor_ink_canvas_aria_label", "editor_ink_aria_label"].map(str => [str, l10n.get(str)]));
+  }
+
+  static updateDefaultParams(type, value) {
+    switch (type) {
+      case _util.AnnotationEditorParamsType.INK_THICKNESS:
+        InkEditor._defaultThickness = value;
+        break;
+
+      case _util.AnnotationEditorParamsType.INK_COLOR:
+        InkEditor._defaultColor = value;
+        break;
+
+      case _util.AnnotationEditorParamsType.INK_OPACITY:
+        InkEditor._defaultOpacity = value / 100;
+        break;
+    }
+  }
+
+  updateParams(type, value) {
+    switch (type) {
+      case _util.AnnotationEditorParamsType.INK_THICKNESS:
+        this.#updateThickness(value);
+        break;
+
+      case _util.AnnotationEditorParamsType.INK_COLOR:
+        this.#updateColor(value);
+        break;
+
+      case _util.AnnotationEditorParamsType.INK_OPACITY:
+        this.#updateOpacity(value);
+        break;
+    }
+  }
+
+  static get defaultPropertiesToUpdate() {
+    return [[_util.AnnotationEditorParamsType.INK_THICKNESS, InkEditor._defaultThickness], [_util.AnnotationEditorParamsType.INK_COLOR, InkEditor._defaultColor || _editor.AnnotationEditor._defaultLineColor], [_util.AnnotationEditorParamsType.INK_OPACITY, Math.round(InkEditor._defaultOpacity * 100)]];
+  }
+
+  get propertiesToUpdate() {
+    return [[_util.AnnotationEditorParamsType.INK_THICKNESS, this.thickness || InkEditor._defaultThickness], [_util.AnnotationEditorParamsType.INK_COLOR, this.color || InkEditor._defaultColor || _editor.AnnotationEditor._defaultLineColor], [_util.AnnotationEditorParamsType.INK_OPACITY, Math.round(100 * (this.opacity ?? InkEditor._defaultOpacity))]];
+  }
+
+  #updateThickness(thickness) {
+    const savedThickness = this.thickness;
+    this.parent.addCommands({
+      cmd: () => {
+        this.thickness = thickness;
+        this.#fitToContent();
+      },
+      undo: () => {
+        this.thickness = savedThickness;
+        this.#fitToContent();
+      },
+      mustExec: true,
+      type: _util.AnnotationEditorParamsType.INK_THICKNESS,
+      overwriteIfSameType: true,
+      keepUndo: true
+    });
+  }
+
+  #updateColor(color) {
+    const savedColor = this.color;
+    this.parent.addCommands({
+      cmd: () => {
+        this.color = color;
+        this.#redraw();
+      },
+      undo: () => {
+        this.color = savedColor;
+        this.#redraw();
+      },
+      mustExec: true,
+      type: _util.AnnotationEditorParamsType.INK_COLOR,
+      overwriteIfSameType: true,
+      keepUndo: true
+    });
+  }
+
+  #updateOpacity(opacity) {
+    opacity /= 100;
+    const savedOpacity = this.opacity;
+    this.parent.addCommands({
+      cmd: () => {
+        this.opacity = opacity;
+        this.#redraw();
+      },
+      undo: () => {
+        this.opacity = savedOpacity;
+        this.#redraw();
+      },
+      mustExec: true,
+      type: _util.AnnotationEditorParamsType.INK_OPACITY,
+      overwriteIfSameType: true,
+      keepUndo: true
+    });
+  }
+
+  rebuild() {
+    super.rebuild();
+
+    if (this.div === null) {
+      return;
+    }
+
+    if (!this.canvas) {
+      this.#createCanvas();
+      this.#createObserver();
+    }
+
+    if (!this.isAttachedToDOM) {
+      this.parent.add(this);
+      this.#setCanvasDims();
+    }
+
+    this.#fitToContent();
+  }
+
+  remove() {
+    if (this.canvas === null) {
+      return;
+    }
+
+    if (!this.isEmpty()) {
+      this.commit();
+    }
+
+    this.canvas.width = this.canvas.height = 0;
+    this.canvas.remove();
+    this.canvas = null;
+    this.#observer.disconnect();
+    this.#observer = null;
+    super.remove();
+  }
+
+  enableEditMode() {
+    if (this.#disableEditing || this.canvas === null) {
+      return;
+    }
+
+    super.enableEditMode();
+    this.div.draggable = false;
+    this.canvas.addEventListener("pointerdown", this.#boundCanvasPointerdown);
+    this.canvas.addEventListener("pointerup", this.#boundCanvasPointerup);
+  }
+
+  disableEditMode() {
+    if (!this.isInEditMode() || this.canvas === null) {
+      return;
+    }
+
+    super.disableEditMode();
+    this.div.draggable = !this.isEmpty();
+    this.div.classList.remove("editing");
+    this.canvas.removeEventListener("pointerdown", this.#boundCanvasPointerdown);
+    this.canvas.removeEventListener("pointerup", this.#boundCanvasPointerup);
+  }
+
+  onceAdded() {
+    this.div.draggable = !this.isEmpty();
+  }
+
+  isEmpty() {
+    return this.paths.length === 0 || this.paths.length === 1 && this.paths[0].length === 0;
+  }
+
+  #getInitialBBox() {
+    const {
+      width,
+      height,
+      rotation
+    } = this.parent.viewport;
+
+    switch (rotation) {
+      case 90:
+        return [0, width, width, height];
+
+      case 180:
+        return [width, height, width, height];
+
+      case 270:
+        return [height, 0, width, height];
+
+      default:
+        return [0, 0, width, height];
+    }
+  }
+
+  #setStroke() {
+    this.ctx.lineWidth = this.thickness * this.parent.scaleFactor / this.scaleFactor;
+    this.ctx.lineCap = "round";
+    this.ctx.lineJoin = "round";
+    this.ctx.miterLimit = 10;
+    this.ctx.strokeStyle = `${this.color}${(0, _tools.opacityToHex)(this.opacity)}`;
+  }
+
+  #startDrawing(x, y) {
+    this.isEditing = true;
+
+    if (!this.#isCanvasInitialized) {
+      this.#isCanvasInitialized = true;
+      this.#setCanvasDims();
+      this.thickness ||= InkEditor._defaultThickness;
+      this.color ||= InkEditor._defaultColor || _editor.AnnotationEditor._defaultLineColor;
+      this.opacity ??= InkEditor._defaultOpacity;
+    }
+
+    this.currentPath.push([x, y]);
+    this.#lastPoint = null;
+    this.#setStroke();
+    this.ctx.beginPath();
+    this.ctx.moveTo(x, y);
+
+    this.#requestFrameCallback = () => {
+      if (!this.#requestFrameCallback) {
+        return;
+      }
+
+      if (this.#lastPoint) {
+        if (this.isEmpty()) {
+          this.ctx.setTransform(1, 0, 0, 1, 0, 0);
+          this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+        } else {
+          this.#redraw();
+        }
+
+        this.ctx.lineTo(...this.#lastPoint);
+        this.#lastPoint = null;
+        this.ctx.stroke();
+      }
+
+      window.requestAnimationFrame(this.#requestFrameCallback);
+    };
+
+    window.requestAnimationFrame(this.#requestFrameCallback);
+  }
+
+  #draw(x, y) {
+    const [lastX, lastY] = this.currentPath.at(-1);
+
+    if (x === lastX && y === lastY) {
+      return;
+    }
+
+    this.currentPath.push([x, y]);
+    this.#lastPoint = [x, y];
+  }
+
+  #stopDrawing(x, y) {
+    this.ctx.closePath();
+    this.#requestFrameCallback = null;
+    x = Math.min(Math.max(x, 0), this.canvas.width);
+    y = Math.min(Math.max(y, 0), this.canvas.height);
+    const [lastX, lastY] = this.currentPath.at(-1);
+
+    if (x !== lastX || y !== lastY) {
+      this.currentPath.push([x, y]);
+    }
+
+    let bezier;
+
+    if (this.currentPath.length !== 1) {
+      bezier = (0, _pdfjsFitCurve.fitCurve)(this.currentPath, 30, null);
+    } else {
+      const xy = [x, y];
+      bezier = [[xy, xy.slice(), xy.slice(), xy]];
+    }
+
+    const path2D = InkEditor.#buildPath2D(bezier);
+    this.currentPath.length = 0;
+
+    const cmd = () => {
+      this.paths.push(bezier);
+      this.bezierPath2D.push(path2D);
+      this.rebuild();
+    };
+
+    const undo = () => {
+      this.paths.pop();
+      this.bezierPath2D.pop();
+
+      if (this.paths.length === 0) {
+        this.remove();
+      } else {
+        if (!this.canvas) {
+          this.#createCanvas();
+          this.#createObserver();
+        }
+
+        this.#fitToContent();
+      }
+    };
+
+    this.parent.addCommands({
+      cmd,
+      undo,
+      mustExec: true
+    });
+  }
+
+  #redraw() {
+    if (this.isEmpty()) {
+      this.#updateTransform();
+      return;
+    }
+
+    this.#setStroke();
+    const {
+      canvas,
+      ctx
+    } = this;
+    ctx.setTransform(1, 0, 0, 1, 0, 0);
+    ctx.clearRect(0, 0, canvas.width, canvas.height);
+    this.#updateTransform();
+
+    for (const path of this.bezierPath2D) {
+      ctx.stroke(path);
+    }
+  }
+
+  commit() {
+    if (this.#disableEditing) {
+      return;
+    }
+
+    super.commit();
+    this.isEditing = false;
+    this.disableEditMode();
+    this.setInForeground();
+    this.#disableEditing = true;
+    this.div.classList.add("disabled");
+    this.#fitToContent(true);
+    this.parent.addInkEditorIfNeeded(true);
+    this.parent.moveEditorInDOM(this);
+    this.div.focus();
+  }
+
+  focusin(event) {
+    super.focusin(event);
+    this.enableEditMode();
+  }
+
+  canvasPointerdown(event) {
+    if (event.button !== 0 || !this.isInEditMode() || this.#disableEditing) {
+      return;
+    }
+
+    this.setInForeground();
+
+    if (event.type !== "mouse") {
+      this.div.focus();
+    }
+
+    event.stopPropagation();
+    this.canvas.addEventListener("pointerleave", this.#boundCanvasPointerleave);
+    this.canvas.addEventListener("pointermove", this.#boundCanvasPointermove);
+    this.#startDrawing(event.offsetX, event.offsetY);
+  }
+
+  canvasPointermove(event) {
+    event.stopPropagation();
+    this.#draw(event.offsetX, event.offsetY);
+  }
+
+  canvasPointerup(event) {
+    if (event.button !== 0) {
+      return;
+    }
+
+    if (this.isInEditMode() && this.currentPath.length !== 0) {
+      event.stopPropagation();
+      this.#endDrawing(event);
+      this.setInBackground();
+    }
+  }
+
+  canvasPointerleave(event) {
+    this.#endDrawing(event);
+    this.setInBackground();
+  }
+
+  #endDrawing(event) {
+    this.#stopDrawing(event.offsetX, event.offsetY);
+    this.canvas.removeEventListener("pointerleave", this.#boundCanvasPointerleave);
+    this.canvas.removeEventListener("pointermove", this.#boundCanvasPointermove);
+    this.parent.addToAnnotationStorage(this);
+  }
+
+  #createCanvas() {
+    this.canvas = document.createElement("canvas");
+    this.canvas.width = this.canvas.height = 0;
+    this.canvas.className = "inkEditorCanvas";
+
+    InkEditor._l10nPromise.get("editor_ink_canvas_aria_label").then(msg => this.canvas?.setAttribute("aria-label", msg));
+
+    this.div.append(this.canvas);
+    this.ctx = this.canvas.getContext("2d");
+  }
+
+  #createObserver() {
+    this.#observer = new ResizeObserver(entries => {
+      const rect = entries[0].contentRect;
+
+      if (rect.width && rect.height) {
+        this.setDimensions(rect.width, rect.height);
+      }
+    });
+    this.#observer.observe(this.div);
+  }
+
+  render() {
+    if (this.div) {
+      return this.div;
+    }
+
+    let baseX, baseY;
+
+    if (this.width) {
+      baseX = this.x;
+      baseY = this.y;
+    }
+
+    super.render();
+
+    InkEditor._l10nPromise.get("editor_ink_aria_label").then(msg => this.div?.setAttribute("aria-label", msg));
+
+    const [x, y, w, h] = this.#getInitialBBox();
+    this.setAt(x, y, 0, 0);
+    this.setDims(w, h);
+    this.#createCanvas();
+
+    if (this.width) {
+      const [parentWidth, parentHeight] = this.parent.viewportBaseDimensions;
+      this.setAt(baseX * parentWidth, baseY * parentHeight, this.width * parentWidth, this.height * parentHeight);
+      this.#isCanvasInitialized = true;
+      this.#setCanvasDims();
+      this.setDims(this.width * parentWidth, this.height * parentHeight);
+      this.#redraw();
+      this.#setMinDims();
+      this.div.classList.add("disabled");
+    } else {
+      this.div.classList.add("editing");
+      this.enableEditMode();
+    }
+
+    this.#createObserver();
+    return this.div;
+  }
+
+  #setCanvasDims() {
+    if (!this.#isCanvasInitialized) {
+      return;
+    }
+
+    const [parentWidth, parentHeight] = this.parent.viewportBaseDimensions;
+    this.canvas.width = Math.ceil(this.width * parentWidth);
+    this.canvas.height = Math.ceil(this.height * parentHeight);
+    this.#updateTransform();
+  }
+
+  setDimensions(width, height) {
+    const roundedWidth = Math.round(width);
+    const roundedHeight = Math.round(height);
+
+    if (this.#realWidth === roundedWidth && this.#realHeight === roundedHeight) {
+      return;
+    }
+
+    this.#realWidth = roundedWidth;
+    this.#realHeight = roundedHeight;
+    this.canvas.style.visibility = "hidden";
+
+    if (this.#aspectRatio && Math.abs(this.#aspectRatio - width / height) > 1e-2) {
+      height = Math.ceil(width / this.#aspectRatio);
+      this.setDims(width, height);
+    }
+
+    const [parentWidth, parentHeight] = this.parent.viewportBaseDimensions;
+    this.width = width / parentWidth;
+    this.height = height / parentHeight;
+
+    if (this.#disableEditing) {
+      this.#setScaleFactor(width, height);
+    }
+
+    this.#setCanvasDims();
+    this.#redraw();
+    this.canvas.style.visibility = "visible";
+  }
+
+  #setScaleFactor(width, height) {
+    const padding = this.#getPadding();
+    const scaleFactorW = (width - padding) / this.#baseWidth;
+    const scaleFactorH = (height - padding) / this.#baseHeight;
+    this.scaleFactor = Math.min(scaleFactorW, scaleFactorH);
+  }
+
+  #updateTransform() {
+    const padding = this.#getPadding() / 2;
+    this.ctx.setTransform(this.scaleFactor, 0, 0, this.scaleFactor, this.translationX * this.scaleFactor + padding, this.translationY * this.scaleFactor + padding);
+  }
+
+  static #buildPath2D(bezier) {
+    const path2D = new Path2D();
+
+    for (let i = 0, ii = bezier.length; i < ii; i++) {
+      const [first, control1, control2, second] = bezier[i];
+
+      if (i === 0) {
+        path2D.moveTo(...first);
+      }
+
+      path2D.bezierCurveTo(control1[0], control1[1], control2[0], control2[1], second[0], second[1]);
+    }
+
+    return path2D;
+  }
+
+  #serializePaths(s, tx, ty, h) {
+    const NUMBER_OF_POINTS_ON_BEZIER_CURVE = 4;
+    const paths = [];
+    const padding = this.thickness / 2;
+    let buffer, points;
+
+    for (const bezier of this.paths) {
+      buffer = [];
+      points = [];
+
+      for (let i = 0, ii = bezier.length; i < ii; i++) {
+        const [first, control1, control2, second] = bezier[i];
+        const p10 = s * (first[0] + tx) + padding;
+        const p11 = h - s * (first[1] + ty) - padding;
+        const p20 = s * (control1[0] + tx) + padding;
+        const p21 = h - s * (control1[1] + ty) - padding;
+        const p30 = s * (control2[0] + tx) + padding;
+        const p31 = h - s * (control2[1] + ty) - padding;
+        const p40 = s * (second[0] + tx) + padding;
+        const p41 = h - s * (second[1] + ty) - padding;
+
+        if (i === 0) {
+          buffer.push(p10, p11);
+          points.push(p10, p11);
+        }
+
+        buffer.push(p20, p21, p30, p31, p40, p41);
+        this.#extractPointsOnBezier(p10, p11, p20, p21, p30, p31, p40, p41, NUMBER_OF_POINTS_ON_BEZIER_CURVE, points);
+      }
+
+      paths.push({
+        bezier: buffer,
+        points
+      });
+    }
+
+    return paths;
+  }
+
+  #extractPointsOnBezier(p10, p11, p20, p21, p30, p31, p40, p41, n, points) {
+    if (this.#isAlmostFlat(p10, p11, p20, p21, p30, p31, p40, p41)) {
+      points.push(p40, p41);
+      return;
+    }
+
+    for (let i = 1; i < n - 1; i++) {
+      const t = i / n;
+      const mt = 1 - t;
+      let q10 = t * p10 + mt * p20;
+      let q11 = t * p11 + mt * p21;
+      let q20 = t * p20 + mt * p30;
+      let q21 = t * p21 + mt * p31;
+      const q30 = t * p30 + mt * p40;
+      const q31 = t * p31 + mt * p41;
+      q10 = t * q10 + mt * q20;
+      q11 = t * q11 + mt * q21;
+      q20 = t * q20 + mt * q30;
+      q21 = t * q21 + mt * q31;
+      q10 = t * q10 + mt * q20;
+      q11 = t * q11 + mt * q21;
+      points.push(q10, q11);
+    }
+
+    points.push(p40, p41);
+  }
+
+  #isAlmostFlat(p10, p11, p20, p21, p30, p31, p40, p41) {
+    const tol = 10;
+    const ax = (3 * p20 - 2 * p10 - p40) ** 2;
+    const ay = (3 * p21 - 2 * p11 - p41) ** 2;
+    const bx = (3 * p30 - p10 - 2 * p40) ** 2;
+    const by = (3 * p31 - p11 - 2 * p41) ** 2;
+    return Math.max(ax, bx) + Math.max(ay, by) <= tol;
+  }
+
+  #getBbox() {
+    let xMin = Infinity;
+    let xMax = -Infinity;
+    let yMin = Infinity;
+    let yMax = -Infinity;
+
+    for (const path of this.paths) {
+      for (const [first, control1, control2, second] of path) {
+        const bbox = _util.Util.bezierBoundingBox(...first, ...control1, ...control2, ...second);
+
+        xMin = Math.min(xMin, bbox[0]);
+        yMin = Math.min(yMin, bbox[1]);
+        xMax = Math.max(xMax, bbox[2]);
+        yMax = Math.max(yMax, bbox[3]);
+      }
+    }
+
+    return [xMin, yMin, xMax, yMax];
+  }
+
+  #getPadding() {
+    return this.#disableEditing ? Math.ceil(this.thickness * this.parent.scaleFactor) : 0;
+  }
+
+  #fitToContent(firstTime = false) {
+    if (this.isEmpty()) {
+      return;
+    }
+
+    if (!this.#disableEditing) {
+      this.#redraw();
+      return;
+    }
+
+    const bbox = this.#getBbox();
+    const padding = this.#getPadding();
+    this.#baseWidth = Math.max(RESIZER_SIZE, bbox[2] - bbox[0]);
+    this.#baseHeight = Math.max(RESIZER_SIZE, bbox[3] - bbox[1]);
+    const width = Math.ceil(padding + this.#baseWidth * this.scaleFactor);
+    const height = Math.ceil(padding + this.#baseHeight * this.scaleFactor);
+    const [parentWidth, parentHeight] = this.parent.viewportBaseDimensions;
+    this.width = width / parentWidth;
+    this.height = height / parentHeight;
+    this.#aspectRatio = width / height;
+    this.#setMinDims();
+    const prevTranslationX = this.translationX;
+    const prevTranslationY = this.translationY;
+    this.translationX = -bbox[0];
+    this.translationY = -bbox[1];
+    this.#setCanvasDims();
+    this.#redraw();
+    this.#realWidth = width;
+    this.#realHeight = height;
+    this.setDims(width, height);
+    const unscaledPadding = firstTime ? padding / this.scaleFactor / 2 : 0;
+    this.translate(prevTranslationX - this.translationX - unscaledPadding, prevTranslationY - this.translationY - unscaledPadding);
+  }
+
+  #setMinDims() {
+    const {
+      style
+    } = this.div;
+
+    if (this.#aspectRatio >= 1) {
+      style.minHeight = `${RESIZER_SIZE}px`;
+      style.minWidth = `${Math.round(this.#aspectRatio * RESIZER_SIZE)}px`;
+    } else {
+      style.minWidth = `${RESIZER_SIZE}px`;
+      style.minHeight = `${Math.round(RESIZER_SIZE / this.#aspectRatio)}px`;
+    }
+  }
+
+  static deserialize(data, parent) {
+    const editor = super.deserialize(data, parent);
+    editor.thickness = data.thickness;
+    editor.color = _util.Util.makeHexColor(...data.color);
+    editor.opacity = data.opacity;
+    const [pageWidth, pageHeight] = parent.pageDimensions;
+    const width = editor.width * pageWidth;
+    const height = editor.height * pageHeight;
+    const scaleFactor = parent.scaleFactor;
+    const padding = data.thickness / 2;
+    editor.#aspectRatio = width / height;
+    editor.#disableEditing = true;
+    editor.#realWidth = Math.round(width);
+    editor.#realHeight = Math.round(height);
+
+    for (const {
+      bezier
+    } of data.paths) {
+      const path = [];
+      editor.paths.push(path);
+      let p0 = scaleFactor * (bezier[0] - padding);
+      let p1 = scaleFactor * (height - bezier[1] - padding);
+
+      for (let i = 2, ii = bezier.length; i < ii; i += 6) {
+        const p10 = scaleFactor * (bezier[i] - padding);
+        const p11 = scaleFactor * (height - bezier[i + 1] - padding);
+        const p20 = scaleFactor * (bezier[i + 2] - padding);
+        const p21 = scaleFactor * (height - bezier[i + 3] - padding);
+        const p30 = scaleFactor * (bezier[i + 4] - padding);
+        const p31 = scaleFactor * (height - bezier[i + 5] - padding);
+        path.push([[p0, p1], [p10, p11], [p20, p21], [p30, p31]]);
+        p0 = p30;
+        p1 = p31;
+      }
+
+      const path2D = this.#buildPath2D(path);
+      editor.bezierPath2D.push(path2D);
+    }
+
+    const bbox = editor.#getBbox();
+    editor.#baseWidth = Math.max(RESIZER_SIZE, bbox[2] - bbox[0]);
+    editor.#baseHeight = Math.max(RESIZER_SIZE, bbox[3] - bbox[1]);
+    editor.#setScaleFactor(width, height);
+    return editor;
+  }
+
+  serialize() {
+    if (this.isEmpty()) {
+      return null;
+    }
+
+    const rect = this.getRect(0, 0);
+    const height = this.rotation % 180 === 0 ? rect[3] - rect[1] : rect[2] - rect[0];
+
+    const color = _editor.AnnotationEditor._colorManager.convert(this.ctx.strokeStyle);
+
+    return {
+      annotationType: _util.AnnotationEditorType.INK,
+      color,
+      thickness: this.thickness,
+      opacity: this.opacity,
+      paths: this.#serializePaths(this.scaleFactor / this.parent.scaleFactor, this.translationX, this.translationY, height),
+      pageIndex: this.parent.pageIndex,
+      rect,
+      rotation: this.rotation
+    };
+  }
+
+}
+
+exports.InkEditor = InkEditor;
+
+/***/ }),
+/* 25 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.fitCurve = void 0;
+
+const fitCurve = __w_pdfjs_require__(26);
+
+exports.fitCurve = fitCurve;
+
+/***/ }),
+/* 26 */
+/***/ ((module) => {
+
+
+
+function fitCurve(points, maxError, progressCallback) {
+  if (!Array.isArray(points)) {
+    throw new TypeError("First argument should be an array");
+  }
+
+  points.forEach(point => {
+    if (!Array.isArray(point) || point.some(item => typeof item !== 'number') || point.length !== points[0].length) {
+      throw Error("Each point should be an array of numbers. Each point should have the same amount of numbers.");
+    }
+  });
+  points = points.filter((point, i) => i === 0 || !point.every((val, j) => val === points[i - 1][j]));
+
+  if (points.length < 2) {
+    return [];
+  }
+
+  const len = points.length;
+  const leftTangent = createTangent(points[1], points[0]);
+  const rightTangent = createTangent(points[len - 2], points[len - 1]);
+  return fitCubic(points, leftTangent, rightTangent, maxError, progressCallback);
+}
+
+function fitCubic(points, leftTangent, rightTangent, error, progressCallback) {
+  const MaxIterations = 20;
+  var bezCurve, u, uPrime, maxError, prevErr, splitPoint, prevSplit, centerVector, toCenterTangent, fromCenterTangent, beziers, dist, i;
+
+  if (points.length === 2) {
+    dist = maths.vectorLen(maths.subtract(points[0], points[1])) / 3.0;
+    bezCurve = [points[0], maths.addArrays(points[0], maths.mulItems(leftTangent, dist)), maths.addArrays(points[1], maths.mulItems(rightTangent, dist)), points[1]];
+    return [bezCurve];
+  }
+
+  u = chordLengthParameterize(points);
+  [bezCurve, maxError, splitPoint] = generateAndReport(points, u, u, leftTangent, rightTangent, progressCallback);
+
+  if (maxError === 0 || maxError < error) {
+    return [bezCurve];
+  }
+
+  if (maxError < error * error) {
+    uPrime = u;
+    prevErr = maxError;
+    prevSplit = splitPoint;
+
+    for (i = 0; i < MaxIterations; i++) {
+      uPrime = reparameterize(bezCurve, points, uPrime);
+      [bezCurve, maxError, splitPoint] = generateAndReport(points, u, uPrime, leftTangent, rightTangent, progressCallback);
+
+      if (maxError < error) {
+        return [bezCurve];
+      } else if (splitPoint === prevSplit) {
+        let errChange = maxError / prevErr;
+
+        if (errChange > .9999 && errChange < 1.0001) {
+          break;
+        }
+      }
+
+      prevErr = maxError;
+      prevSplit = splitPoint;
+    }
+  }
+
+  beziers = [];
+  centerVector = maths.subtract(points[splitPoint - 1], points[splitPoint + 1]);
+
+  if (centerVector.every(val => val === 0)) {
+    centerVector = maths.subtract(points[splitPoint - 1], points[splitPoint]);
+    [centerVector[0], centerVector[1]] = [-centerVector[1], centerVector[0]];
+  }
+
+  toCenterTangent = maths.normalize(centerVector);
+  fromCenterTangent = maths.mulItems(toCenterTangent, -1);
+  beziers = beziers.concat(fitCubic(points.slice(0, splitPoint + 1), leftTangent, toCenterTangent, error, progressCallback));
+  beziers = beziers.concat(fitCubic(points.slice(splitPoint), fromCenterTangent, rightTangent, error, progressCallback));
+  return beziers;
+}
+
+;
+
+function generateAndReport(points, paramsOrig, paramsPrime, leftTangent, rightTangent, progressCallback) {
+  var bezCurve, maxError, splitPoint;
+  bezCurve = generateBezier(points, paramsPrime, leftTangent, rightTangent, progressCallback);
+  [maxError, splitPoint] = computeMaxError(points, bezCurve, paramsOrig);
+
+  if (progressCallback) {
+    progressCallback({
+      bez: bezCurve,
+      points: points,
+      params: paramsOrig,
+      maxErr: maxError,
+      maxPoint: splitPoint
+    });
+  }
+
+  return [bezCurve, maxError, splitPoint];
+}
+
+function generateBezier(points, parameters, leftTangent, rightTangent) {
+  var bezCurve,
+      A,
+      a,
+      C,
+      X,
+      det_C0_C1,
+      det_C0_X,
+      det_X_C1,
+      alpha_l,
+      alpha_r,
+      epsilon,
+      segLength,
+      i,
+      len,
+      tmp,
+      u,
+      ux,
+      firstPoint = points[0],
+      lastPoint = points[points.length - 1];
+  bezCurve = [firstPoint, null, null, lastPoint];
+  A = maths.zeros_Xx2x2(parameters.length);
+
+  for (i = 0, len = parameters.length; i < len; i++) {
+    u = parameters[i];
+    ux = 1 - u;
+    a = A[i];
+    a[0] = maths.mulItems(leftTangent, 3 * u * (ux * ux));
+    a[1] = maths.mulItems(rightTangent, 3 * ux * (u * u));
+  }
+
+  C = [[0, 0], [0, 0]];
+  X = [0, 0];
+
+  for (i = 0, len = points.length; i < len; i++) {
+    u = parameters[i];
+    a = A[i];
+    C[0][0] += maths.dot(a[0], a[0]);
+    C[0][1] += maths.dot(a[0], a[1]);
+    C[1][0] += maths.dot(a[0], a[1]);
+    C[1][1] += maths.dot(a[1], a[1]);
+    tmp = maths.subtract(points[i], bezier.q([firstPoint, firstPoint, lastPoint, lastPoint], u));
+    X[0] += maths.dot(a[0], tmp);
+    X[1] += maths.dot(a[1], tmp);
+  }
+
+  det_C0_C1 = C[0][0] * C[1][1] - C[1][0] * C[0][1];
+  det_C0_X = C[0][0] * X[1] - C[1][0] * X[0];
+  det_X_C1 = X[0] * C[1][1] - X[1] * C[0][1];
+  alpha_l = det_C0_C1 === 0 ? 0 : det_X_C1 / det_C0_C1;
+  alpha_r = det_C0_C1 === 0 ? 0 : det_C0_X / det_C0_C1;
+  segLength = maths.vectorLen(maths.subtract(firstPoint, lastPoint));
+  epsilon = 1.0e-6 * segLength;
+
+  if (alpha_l < epsilon || alpha_r < epsilon) {
+    bezCurve[1] = maths.addArrays(firstPoint, maths.mulItems(leftTangent, segLength / 3.0));
+    bezCurve[2] = maths.addArrays(lastPoint, maths.mulItems(rightTangent, segLength / 3.0));
+  } else {
+    bezCurve[1] = maths.addArrays(firstPoint, maths.mulItems(leftTangent, alpha_l));
+    bezCurve[2] = maths.addArrays(lastPoint, maths.mulItems(rightTangent, alpha_r));
+  }
+
+  return bezCurve;
+}
+
+;
+
+function reparameterize(bezier, points, parameters) {
+  return parameters.map((p, i) => newtonRaphsonRootFind(bezier, points[i], p));
+}
+
+;
+
+function newtonRaphsonRootFind(bez, point, u) {
+  var d = maths.subtract(bezier.q(bez, u), point),
+      qprime = bezier.qprime(bez, u),
+      numerator = maths.mulMatrix(d, qprime),
+      denominator = maths.sum(maths.squareItems(qprime)) + 2 * maths.mulMatrix(d, bezier.qprimeprime(bez, u));
+
+  if (denominator === 0) {
+    return u;
+  } else {
+    return u - numerator / denominator;
+  }
+}
+
+;
+
+function chordLengthParameterize(points) {
+  var u = [],
+      currU,
+      prevU,
+      prevP;
+  points.forEach((p, i) => {
+    currU = i ? prevU + maths.vectorLen(maths.subtract(p, prevP)) : 0;
+    u.push(currU);
+    prevU = currU;
+    prevP = p;
+  });
+  u = u.map(x => x / prevU);
+  return u;
+}
+
+;
+
+function computeMaxError(points, bez, parameters) {
+  var dist, maxDist, splitPoint, v, i, count, point, t;
+  maxDist = 0;
+  splitPoint = Math.floor(points.length / 2);
+  const t_distMap = mapTtoRelativeDistances(bez, 10);
+
+  for (i = 0, count = points.length; i < count; i++) {
+    point = points[i];
+    t = find_t(bez, parameters[i], t_distMap, 10);
+    v = maths.subtract(bezier.q(bez, t), point);
+    dist = v[0] * v[0] + v[1] * v[1];
+
+    if (dist > maxDist) {
+      maxDist = dist;
+      splitPoint = i;
+    }
+  }
+
+  return [maxDist, splitPoint];
+}
+
+;
+
+var mapTtoRelativeDistances = function (bez, B_parts) {
+  var B_t_curr;
+  var B_t_dist = [0];
+  var B_t_prev = bez[0];
+  var sumLen = 0;
+
+  for (var i = 1; i <= B_parts; i++) {
+    B_t_curr = bezier.q(bez, i / B_parts);
+    sumLen += maths.vectorLen(maths.subtract(B_t_curr, B_t_prev));
+    B_t_dist.push(sumLen);
+    B_t_prev = B_t_curr;
+  }
+
+  B_t_dist = B_t_dist.map(x => x / sumLen);
+  return B_t_dist;
+};
+
+function find_t(bez, param, t_distMap, B_parts) {
+  if (param < 0) {
+    return 0;
+  }
+
+  if (param > 1) {
+    return 1;
+  }
+
+  var lenMax, lenMin, tMax, tMin, t;
+
+  for (var i = 1; i <= B_parts; i++) {
+    if (param <= t_distMap[i]) {
+      tMin = (i - 1) / B_parts;
+      tMax = i / B_parts;
+      lenMin = t_distMap[i - 1];
+      lenMax = t_distMap[i];
+      t = (param - lenMin) / (lenMax - lenMin) * (tMax - tMin) + tMin;
+      break;
+    }
+  }
+
+  return t;
+}
+
+function createTangent(pointA, pointB) {
+  return maths.normalize(maths.subtract(pointA, pointB));
+}
+
+class maths {
+  static zeros_Xx2x2(x) {
+    var zs = [];
+
+    while (x--) {
+      zs.push([0, 0]);
+    }
+
+    return zs;
+  }
+
+  static mulItems(items, multiplier) {
+    return items.map(x => x * multiplier);
+  }
+
+  static mulMatrix(m1, m2) {
+    return m1.reduce((sum, x1, i) => sum + x1 * m2[i], 0);
+  }
+
+  static subtract(arr1, arr2) {
+    return arr1.map((x1, i) => x1 - arr2[i]);
+  }
+
+  static addArrays(arr1, arr2) {
+    return arr1.map((x1, i) => x1 + arr2[i]);
+  }
+
+  static addItems(items, addition) {
+    return items.map(x => x + addition);
+  }
+
+  static sum(items) {
+    return items.reduce((sum, x) => sum + x);
+  }
+
+  static dot(m1, m2) {
+    return maths.mulMatrix(m1, m2);
+  }
+
+  static vectorLen(v) {
+    return Math.hypot(...v);
+  }
+
+  static divItems(items, divisor) {
+    return items.map(x => x / divisor);
+  }
+
+  static squareItems(items) {
+    return items.map(x => x * x);
+  }
+
+  static normalize(v) {
+    return this.divItems(v, this.vectorLen(v));
+  }
+
+}
+
+class bezier {
+  static q(ctrlPoly, t) {
+    var tx = 1.0 - t;
+    var pA = maths.mulItems(ctrlPoly[0], tx * tx * tx),
+        pB = maths.mulItems(ctrlPoly[1], 3 * tx * tx * t),
+        pC = maths.mulItems(ctrlPoly[2], 3 * tx * t * t),
+        pD = maths.mulItems(ctrlPoly[3], t * t * t);
+    return maths.addArrays(maths.addArrays(pA, pB), maths.addArrays(pC, pD));
+  }
+
+  static qprime(ctrlPoly, t) {
+    var tx = 1.0 - t;
+    var pA = maths.mulItems(maths.subtract(ctrlPoly[1], ctrlPoly[0]), 3 * tx * tx),
+        pB = maths.mulItems(maths.subtract(ctrlPoly[2], ctrlPoly[1]), 6 * tx * t),
+        pC = maths.mulItems(maths.subtract(ctrlPoly[3], ctrlPoly[2]), 3 * t * t);
+    return maths.addArrays(maths.addArrays(pA, pB), pC);
+  }
+
+  static qprimeprime(ctrlPoly, t) {
+    return maths.addArrays(maths.mulItems(maths.addArrays(maths.subtract(ctrlPoly[2], maths.mulItems(ctrlPoly[1], 2)), ctrlPoly[0]), 6 * (1.0 - t)), maths.mulItems(maths.addArrays(maths.subtract(ctrlPoly[3], maths.mulItems(ctrlPoly[2], 2)), ctrlPoly[1]), 6 * t));
+  }
+
+}
+
+module.exports = fitCurve;
+module.exports.fitCubic = fitCubic;
+module.exports.createTangent = createTangent;
+
+/***/ }),
+/* 27 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.AnnotationLayer = void 0;
 
-var _display_utils = __w_pdfjs_require__(1);
+var _util = __w_pdfjs_require__(1);
 
-var _util = __w_pdfjs_require__(2);
+var _display_utils = __w_pdfjs_require__(8);
 
-var _annotation_storage = __w_pdfjs_require__(8);
+var _annotation_storage = __w_pdfjs_require__(5);
+
+var _scripting_utils = __w_pdfjs_require__(28);
+
+var _xfa_layer = __w_pdfjs_require__(29);
+
+const DEFAULT_TAB_INDEX = 1000;
+const DEFAULT_FONT_SIZE = 9;
+const GetElementsByNameSet = new WeakSet();
+
+function getRectDims(rect) {
+  return {
+    width: rect[2] - rect[0],
+    height: rect[3] - rect[1]
+  };
+}
 
 class AnnotationElementFactory {
   static create(parameters) {
@@ -9351,7 +12907,11 @@ class AnnotationElementFactory {
 }
 
 class AnnotationElement {
-  constructor(parameters, isRenderable = false, ignoreBorder = false) {
+  constructor(parameters, {
+    isRenderable = false,
+    ignoreBorder = false,
+    createQuadrilaterals = false
+  } = {}) {
     this.isRenderable = isRenderable;
     this.data = parameters.data;
     this.layer = parameters.layer;
@@ -9360,13 +12920,21 @@ class AnnotationElement {
     this.linkService = parameters.linkService;
     this.downloadManager = parameters.downloadManager;
     this.imageResourcesPath = parameters.imageResourcesPath;
-    this.renderInteractiveForms = parameters.renderInteractiveForms;
+    this.renderForms = parameters.renderForms;
     this.svgFactory = parameters.svgFactory;
     this.annotationStorage = parameters.annotationStorage;
+    this.enableScripting = parameters.enableScripting;
+    this.hasJSActions = parameters.hasJSActions;
+    this._fieldObjects = parameters.fieldObjects;
+    this._mouseState = parameters.mouseState;
 
     if (isRenderable) {
       this.container = this._createContainer(ignoreBorder);
     }
+
+    if (createQuadrilaterals) {
+      this.quadrilaterals = this._createQuadrilaterals(ignoreBorder);
+    }
   }
 
   _createContainer(ignoreBorder = false) {
@@ -9374,28 +12942,27 @@ class AnnotationElement {
           page = this.page,
           viewport = this.viewport;
     const container = document.createElement("section");
-    let width = data.rect[2] - data.rect[0];
-    let height = data.rect[3] - data.rect[1];
+    const {
+      width,
+      height
+    } = getRectDims(data.rect);
+    const [pageLLx, pageLLy, pageURx, pageURy] = viewport.viewBox;
+    const pageWidth = pageURx - pageLLx;
+    const pageHeight = pageURy - pageLLy;
     container.setAttribute("data-annotation-id", data.id);
 
     const rect = _util.Util.normalizeRect([data.rect[0], page.view[3] - data.rect[1] + page.view[1], data.rect[2], page.view[3] - data.rect[3] + page.view[1]]);
 
-    container.style.transform = `matrix(${viewport.transform.join(",")})`;
-    container.style.transformOrigin = `-${rect[0]}px -${rect[1]}px`;
-
     if (!ignoreBorder && data.borderStyle.width > 0) {
       container.style.borderWidth = `${data.borderStyle.width}px`;
-
-      if (data.borderStyle.style !== _util.AnnotationBorderStyleType.UNDERLINE) {
-        width = width - 2 * data.borderStyle.width;
-        height = height - 2 * data.borderStyle.width;
-      }
-
       const horizontalRadius = data.borderStyle.horizontalCornerRadius;
       const verticalRadius = data.borderStyle.verticalCornerRadius;
 
       if (horizontalRadius > 0 || verticalRadius > 0) {
-        const radius = `${horizontalRadius}px / ${verticalRadius}px`;
+        const radius = `calc(${horizontalRadius}px * var(--scale-factor)) / calc(${verticalRadius}px * var(--scale-factor))`;
+        container.style.borderRadius = radius;
+      } else if (this instanceof RadioButtonWidgetAnnotationElement) {
+        const radius = `calc(${width}px * var(--scale-factor)) / calc(${height}px * var(--scale-factor))`;
         container.style.borderRadius = radius;
       }
 
@@ -9424,76 +12991,360 @@ class AnnotationElement {
           break;
       }
 
-      if (data.color) {
-        container.style.borderColor = _util.Util.makeCssRgb(data.color[0] | 0, data.color[1] | 0, data.color[2] | 0);
+      const borderColor = data.borderColor || null;
+
+      if (borderColor) {
+        container.style.borderColor = _util.Util.makeHexColor(borderColor[0] | 0, borderColor[1] | 0, borderColor[2] | 0);
       } else {
         container.style.borderWidth = 0;
       }
     }
 
-    container.style.left = `${rect[0]}px`;
-    container.style.top = `${rect[1]}px`;
-    container.style.width = `${width}px`;
-    container.style.height = `${height}px`;
+    container.style.left = `${100 * (rect[0] - pageLLx) / pageWidth}%`;
+    container.style.top = `${100 * (rect[1] - pageLLy) / pageHeight}%`;
+    const {
+      rotation
+    } = data;
+
+    if (data.hasOwnCanvas || rotation === 0) {
+      container.style.width = `${100 * width / pageWidth}%`;
+      container.style.height = `${100 * height / pageHeight}%`;
+    } else {
+      this.setRotation(rotation, container);
+    }
+
     return container;
   }
 
-  _createPopup(container, trigger, data) {
+  setRotation(angle, container = this.container) {
+    const [pageLLx, pageLLy, pageURx, pageURy] = this.viewport.viewBox;
+    const pageWidth = pageURx - pageLLx;
+    const pageHeight = pageURy - pageLLy;
+    const {
+      width,
+      height
+    } = getRectDims(this.data.rect);
+    let elementWidth, elementHeight;
+
+    if (angle % 180 === 0) {
+      elementWidth = 100 * width / pageWidth;
+      elementHeight = 100 * height / pageHeight;
+    } else {
+      elementWidth = 100 * height / pageWidth;
+      elementHeight = 100 * width / pageHeight;
+    }
+
+    container.style.width = `${elementWidth}%`;
+    container.style.height = `${elementHeight}%`;
+    container.setAttribute("data-main-rotation", (360 - angle) % 360);
+  }
+
+  get _commonActions() {
+    const setColor = (jsName, styleName, event) => {
+      const color = event.detail[jsName];
+      event.target.style[styleName] = _scripting_utils.ColorConverters[`${color[0]}_HTML`](color.slice(1));
+    };
+
+    return (0, _util.shadow)(this, "_commonActions", {
+      display: event => {
+        const hidden = event.detail.display % 2 === 1;
+        this.container.style.visibility = hidden ? "hidden" : "visible";
+        this.annotationStorage.setValue(this.data.id, {
+          hidden,
+          print: event.detail.display === 0 || event.detail.display === 3
+        });
+      },
+      print: event => {
+        this.annotationStorage.setValue(this.data.id, {
+          print: event.detail.print
+        });
+      },
+      hidden: event => {
+        this.container.style.visibility = event.detail.hidden ? "hidden" : "visible";
+        this.annotationStorage.setValue(this.data.id, {
+          hidden: event.detail.hidden
+        });
+      },
+      focus: event => {
+        setTimeout(() => event.target.focus({
+          preventScroll: false
+        }), 0);
+      },
+      userName: event => {
+        event.target.title = event.detail.userName;
+      },
+      readonly: event => {
+        if (event.detail.readonly) {
+          event.target.setAttribute("readonly", "");
+        } else {
+          event.target.removeAttribute("readonly");
+        }
+      },
+      required: event => {
+        this._setRequired(event.target, event.detail.required);
+      },
+      bgColor: event => {
+        setColor("bgColor", "backgroundColor", event);
+      },
+      fillColor: event => {
+        setColor("fillColor", "backgroundColor", event);
+      },
+      fgColor: event => {
+        setColor("fgColor", "color", event);
+      },
+      textColor: event => {
+        setColor("textColor", "color", event);
+      },
+      borderColor: event => {
+        setColor("borderColor", "borderColor", event);
+      },
+      strokeColor: event => {
+        setColor("strokeColor", "borderColor", event);
+      },
+      rotation: event => {
+        const angle = event.detail.rotation;
+        this.setRotation(angle);
+        this.annotationStorage.setValue(this.data.id, {
+          rotation: angle
+        });
+      }
+    });
+  }
+
+  _dispatchEventFromSandbox(actions, jsEvent) {
+    const commonActions = this._commonActions;
+
+    for (const name of Object.keys(jsEvent.detail)) {
+      const action = actions[name] || commonActions[name];
+
+      if (action) {
+        action(jsEvent);
+      }
+    }
+  }
+
+  _setDefaultPropertiesFromJS(element) {
+    if (!this.enableScripting) {
+      return;
+    }
+
+    const storedData = this.annotationStorage.getRawValue(this.data.id);
+
+    if (!storedData) {
+      return;
+    }
+
+    const commonActions = this._commonActions;
+
+    for (const [actionName, detail] of Object.entries(storedData)) {
+      const action = commonActions[actionName];
+
+      if (action) {
+        const eventProxy = {
+          detail: {
+            [actionName]: detail
+          },
+          target: element
+        };
+        action(eventProxy);
+        delete storedData[actionName];
+      }
+    }
+  }
+
+  _createQuadrilaterals(ignoreBorder = false) {
+    if (!this.data.quadPoints) {
+      return null;
+    }
+
+    const quadrilaterals = [];
+    const savedRect = this.data.rect;
+
+    for (const quadPoint of this.data.quadPoints) {
+      this.data.rect = [quadPoint[2].x, quadPoint[2].y, quadPoint[1].x, quadPoint[1].y];
+      quadrilaterals.push(this._createContainer(ignoreBorder));
+    }
+
+    this.data.rect = savedRect;
+    return quadrilaterals;
+  }
+
+  _createPopup(trigger, data) {
+    let container = this.container;
+
+    if (this.quadrilaterals) {
+      trigger = trigger || this.quadrilaterals;
+      container = this.quadrilaterals[0];
+    }
+
     if (!trigger) {
       trigger = document.createElement("div");
-      trigger.style.height = container.style.height;
-      trigger.style.width = container.style.width;
-      container.appendChild(trigger);
+      trigger.className = "popupTriggerArea";
+      container.append(trigger);
     }
 
     const popupElement = new PopupElement({
       container,
       trigger,
       color: data.color,
-      title: data.title,
+      titleObj: data.titleObj,
       modificationDate: data.modificationDate,
-      contents: data.contents,
+      contentsObj: data.contentsObj,
+      richText: data.richText,
       hideWrapper: true
     });
     const popup = popupElement.render();
-    popup.style.left = container.style.width;
-    container.appendChild(popup);
+    popup.style.left = "100%";
+    container.append(popup);
+  }
+
+  _renderQuadrilaterals(className) {
+    for (const quadrilateral of this.quadrilaterals) {
+      quadrilateral.className = className;
+    }
+
+    return this.quadrilaterals;
   }
 
   render() {
     (0, _util.unreachable)("Abstract method `AnnotationElement.render` called");
   }
 
+  _getElementsByName(name, skipId = null) {
+    const fields = [];
+
+    if (this._fieldObjects) {
+      const fieldObj = this._fieldObjects[name];
+
+      if (fieldObj) {
+        for (const {
+          page,
+          id,
+          exportValues
+        } of fieldObj) {
+          if (page === -1) {
+            continue;
+          }
+
+          if (id === skipId) {
+            continue;
+          }
+
+          const exportValue = typeof exportValues === "string" ? exportValues : null;
+          const domElement = document.querySelector(`[data-element-id="${id}"]`);
+
+          if (domElement && !GetElementsByNameSet.has(domElement)) {
+            (0, _util.warn)(`_getElementsByName - element not allowed: ${id}`);
+            continue;
+          }
+
+          fields.push({
+            id,
+            exportValue,
+            domElement
+          });
+        }
+      }
+
+      return fields;
+    }
+
+    for (const domElement of document.getElementsByName(name)) {
+      const {
+        id,
+        exportValue
+      } = domElement;
+
+      if (id === skipId) {
+        continue;
+      }
+
+      if (!GetElementsByNameSet.has(domElement)) {
+        continue;
+      }
+
+      fields.push({
+        id,
+        exportValue,
+        domElement
+      });
+    }
+
+    return fields;
+  }
+
+  static get platform() {
+    const platform = typeof navigator !== "undefined" ? navigator.platform : "";
+    return (0, _util.shadow)(this, "platform", {
+      isWin: platform.includes("Win"),
+      isMac: platform.includes("Mac")
+    });
+  }
+
 }
 
 class LinkAnnotationElement extends AnnotationElement {
-  constructor(parameters) {
-    const isRenderable = !!(parameters.data.url || parameters.data.dest || parameters.data.action);
-    super(parameters, isRenderable);
+  constructor(parameters, options = null) {
+    super(parameters, {
+      isRenderable: true,
+      ignoreBorder: !!options?.ignoreBorder,
+      createQuadrilaterals: true
+    });
+    this.isTooltipOnly = parameters.data.isTooltipOnly;
   }
 
   render() {
-    this.container.className = "linkAnnotation";
     const {
       data,
       linkService
     } = this;
     const link = document.createElement("a");
+    link.setAttribute("data-element-id", data.id);
+    let isBound = false;
 
     if (data.url) {
-      (0, _display_utils.addLinkAttributes)(link, {
-        url: data.url,
-        target: data.newWindow ? _display_utils.LinkTarget.BLANK : linkService.externalLinkTarget,
-        rel: linkService.externalLinkRel,
-        enabled: linkService.externalLinkEnabled
-      });
+      linkService.addLinkAttributes(link, data.url, data.newWindow);
+      isBound = true;
     } else if (data.action) {
       this._bindNamedAction(link, data.action);
-    } else {
+
+      isBound = true;
+    } else if (data.dest) {
       this._bindLink(link, data.dest);
+
+      isBound = true;
+    } else {
+      if (data.actions && (data.actions.Action || data.actions["Mouse Up"] || data.actions["Mouse Down"]) && this.enableScripting && this.hasJSActions) {
+        this._bindJSAction(link, data);
+
+        isBound = true;
+      }
+
+      if (data.resetForm) {
+        this._bindResetFormAction(link, data.resetForm);
+
+        isBound = true;
+      } else if (this.isTooltipOnly && !isBound) {
+        this._bindLink(link, "");
+
+        isBound = true;
+      }
+    }
+
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("linkAnnotation").map((quadrilateral, index) => {
+        const linkElement = index === 0 ? link : link.cloneNode();
+        quadrilateral.append(linkElement);
+        return quadrilateral;
+      });
+    }
+
+    this.container.className = "linkAnnotation";
+
+    if (isBound) {
+      this.container.append(link);
     }
 
-    this.container.appendChild(link);
     return this.container;
   }
 
@@ -9502,13 +13353,13 @@ class LinkAnnotationElement extends AnnotationElement {
 
     link.onclick = () => {
       if (destination) {
-        this.linkService.navigateTo(destination);
+        this.linkService.goToDestination(destination);
       }
 
       return false;
     };
 
-    if (destination) {
+    if (destination || destination === "") {
       link.className = "internalLink";
     }
   }
@@ -9524,19 +13375,176 @@ class LinkAnnotationElement extends AnnotationElement {
     link.className = "internalLink";
   }
 
+  _bindJSAction(link, data) {
+    link.href = this.linkService.getAnchorUrl("");
+    const map = new Map([["Action", "onclick"], ["Mouse Up", "onmouseup"], ["Mouse Down", "onmousedown"]]);
+
+    for (const name of Object.keys(data.actions)) {
+      const jsName = map.get(name);
+
+      if (!jsName) {
+        continue;
+      }
+
+      link[jsName] = () => {
+        this.linkService.eventBus?.dispatch("dispatcheventinsandbox", {
+          source: this,
+          detail: {
+            id: data.id,
+            name
+          }
+        });
+        return false;
+      };
+    }
+
+    if (!link.onclick) {
+      link.onclick = () => false;
+    }
+
+    link.className = "internalLink";
+  }
+
+  _bindResetFormAction(link, resetForm) {
+    const otherClickAction = link.onclick;
+
+    if (!otherClickAction) {
+      link.href = this.linkService.getAnchorUrl("");
+    }
+
+    link.className = "internalLink";
+
+    if (!this._fieldObjects) {
+      (0, _util.warn)(`_bindResetFormAction - "resetForm" action not supported, ` + "ensure that the `fieldObjects` parameter is provided.");
+
+      if (!otherClickAction) {
+        link.onclick = () => false;
+      }
+
+      return;
+    }
+
+    link.onclick = () => {
+      if (otherClickAction) {
+        otherClickAction();
+      }
+
+      const {
+        fields: resetFormFields,
+        refs: resetFormRefs,
+        include
+      } = resetForm;
+      const allFields = [];
+
+      if (resetFormFields.length !== 0 || resetFormRefs.length !== 0) {
+        const fieldIds = new Set(resetFormRefs);
+
+        for (const fieldName of resetFormFields) {
+          const fields = this._fieldObjects[fieldName] || [];
+
+          for (const {
+            id
+          } of fields) {
+            fieldIds.add(id);
+          }
+        }
+
+        for (const fields of Object.values(this._fieldObjects)) {
+          for (const field of fields) {
+            if (fieldIds.has(field.id) === include) {
+              allFields.push(field);
+            }
+          }
+        }
+      } else {
+        for (const fields of Object.values(this._fieldObjects)) {
+          allFields.push(...fields);
+        }
+      }
+
+      const storage = this.annotationStorage;
+      const allIds = [];
+
+      for (const field of allFields) {
+        const {
+          id
+        } = field;
+        allIds.push(id);
+
+        switch (field.type) {
+          case "text":
+            {
+              const value = field.defaultValue || "";
+              storage.setValue(id, {
+                value
+              });
+              break;
+            }
+
+          case "checkbox":
+          case "radiobutton":
+            {
+              const value = field.defaultValue === field.exportValues;
+              storage.setValue(id, {
+                value
+              });
+              break;
+            }
+
+          case "combobox":
+          case "listbox":
+            {
+              const value = field.defaultValue || "";
+              storage.setValue(id, {
+                value
+              });
+              break;
+            }
+
+          default:
+            continue;
+        }
+
+        const domElement = document.querySelector(`[data-element-id="${id}"]`);
+
+        if (!domElement) {
+          continue;
+        } else if (!GetElementsByNameSet.has(domElement)) {
+          (0, _util.warn)(`_bindResetFormAction - element not allowed: ${id}`);
+          continue;
+        }
+
+        domElement.dispatchEvent(new Event("resetform"));
+      }
+
+      if (this.enableScripting) {
+        this.linkService.eventBus?.dispatch("dispatcheventinsandbox", {
+          source: this,
+          detail: {
+            id: "app",
+            ids: allIds,
+            name: "ResetForm"
+          }
+        });
+      }
+
+      return false;
+    };
+  }
+
 }
 
 class TextAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable
+    });
   }
 
   render() {
     this.container.className = "textAnnotation";
     const image = document.createElement("img");
-    image.style.height = this.container.style.height;
-    image.style.width = this.container.style.width;
     image.src = this.imageResourcesPath + "annotation-" + this.data.name.toLowerCase() + ".svg";
     image.alt = "[{{type}} Annotation]";
     image.dataset.l10nId = "text_annotation_type";
@@ -9545,10 +13553,10 @@ class TextAnnotationElement extends AnnotationElement {
     });
 
     if (!this.data.hasPopup) {
-      this._createPopup(this.container, image, this.data);
+      this._createPopup(image, this.data);
     }
 
-    this.container.appendChild(image);
+    this.container.append(image);
     return this.container;
   }
 
@@ -9556,124 +13564,532 @@ class TextAnnotationElement extends AnnotationElement {
 
 class WidgetAnnotationElement extends AnnotationElement {
   render() {
+    if (this.data.alternativeText) {
+      this.container.title = this.data.alternativeText;
+    }
+
     return this.container;
   }
 
+  _getKeyModifier(event) {
+    const {
+      isWin,
+      isMac
+    } = AnnotationElement.platform;
+    return isWin && event.ctrlKey || isMac && event.metaKey;
+  }
+
+  _setEventListener(element, baseName, eventName, valueGetter) {
+    if (baseName.includes("mouse")) {
+      element.addEventListener(baseName, event => {
+        this.linkService.eventBus?.dispatch("dispatcheventinsandbox", {
+          source: this,
+          detail: {
+            id: this.data.id,
+            name: eventName,
+            value: valueGetter(event),
+            shift: event.shiftKey,
+            modifier: this._getKeyModifier(event)
+          }
+        });
+      });
+    } else {
+      element.addEventListener(baseName, event => {
+        this.linkService.eventBus?.dispatch("dispatcheventinsandbox", {
+          source: this,
+          detail: {
+            id: this.data.id,
+            name: eventName,
+            value: valueGetter(event)
+          }
+        });
+      });
+    }
+  }
+
+  _setEventListeners(element, names, getter) {
+    for (const [baseName, eventName] of names) {
+      if (eventName === "Action" || this.data.actions?.[eventName]) {
+        this._setEventListener(element, baseName, eventName, getter);
+      }
+    }
+  }
+
+  _setBackgroundColor(element) {
+    const color = this.data.backgroundColor || null;
+    element.style.backgroundColor = color === null ? "transparent" : _util.Util.makeHexColor(color[0], color[1], color[2]);
+  }
+
+  _setTextStyle(element) {
+    const TEXT_ALIGNMENT = ["left", "center", "right"];
+    const {
+      fontColor
+    } = this.data.defaultAppearanceData;
+    const fontSize = this.data.defaultAppearanceData.fontSize || DEFAULT_FONT_SIZE;
+    const style = element.style;
+    let computedFontSize;
+
+    if (this.data.multiLine) {
+      const height = Math.abs(this.data.rect[3] - this.data.rect[1]);
+      const numberOfLines = Math.round(height / (_util.LINE_FACTOR * fontSize)) || 1;
+      const lineHeight = height / numberOfLines;
+      computedFontSize = Math.min(fontSize, Math.round(lineHeight / _util.LINE_FACTOR));
+    } else {
+      const height = Math.abs(this.data.rect[3] - this.data.rect[1]);
+      computedFontSize = Math.min(fontSize, Math.round(height / _util.LINE_FACTOR));
+    }
+
+    style.fontSize = `calc(${computedFontSize}px * var(--scale-factor))`;
+    style.color = _util.Util.makeHexColor(fontColor[0], fontColor[1], fontColor[2]);
+
+    if (this.data.textAlignment !== null) {
+      style.textAlign = TEXT_ALIGNMENT[this.data.textAlignment];
+    }
+  }
+
+  _setRequired(element, isRequired) {
+    if (isRequired) {
+      element.setAttribute("required", true);
+    } else {
+      element.removeAttribute("required");
+    }
+
+    element.setAttribute("aria-required", isRequired);
+  }
+
 }
 
 class TextWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
-    const isRenderable = parameters.renderInteractiveForms || !parameters.data.hasAppearance && !!parameters.data.fieldValue;
-    super(parameters, isRenderable);
+    const isRenderable = parameters.renderForms || !parameters.data.hasAppearance && !!parameters.data.fieldValue;
+    super(parameters, {
+      isRenderable
+    });
+  }
+
+  setPropertyOnSiblings(base, key, value, keyInStorage) {
+    const storage = this.annotationStorage;
+
+    for (const element of this._getElementsByName(base.name, base.id)) {
+      if (element.domElement) {
+        element.domElement[key] = value;
+      }
+
+      storage.setValue(element.id, {
+        [keyInStorage]: value
+      });
+    }
   }
 
   render() {
-    const TEXT_ALIGNMENT = ["left", "center", "right"];
     const storage = this.annotationStorage;
     const id = this.data.id;
     this.container.className = "textWidgetAnnotation";
     let element = null;
 
-    if (this.renderInteractiveForms) {
-      const textContent = storage.getOrCreateValue(id, this.data.fieldValue);
+    if (this.renderForms) {
+      const storedData = storage.getValue(id, {
+        value: this.data.fieldValue
+      });
+      let textContent = storedData.formattedValue || storedData.value || "";
+      const maxLen = storage.getValue(id, {
+        charLimit: this.data.maxLen
+      }).charLimit;
+
+      if (maxLen && textContent.length > maxLen) {
+        textContent = textContent.slice(0, maxLen);
+      }
+
+      const elementData = {
+        userValue: textContent,
+        formattedValue: null,
+        valueOnFocus: ""
+      };
 
       if (this.data.multiLine) {
         element = document.createElement("textarea");
         element.textContent = textContent;
+
+        if (this.data.doNotScroll) {
+          element.style.overflowY = "hidden";
+        }
       } else {
         element = document.createElement("input");
         element.type = "text";
         element.setAttribute("value", textContent);
+
+        if (this.data.doNotScroll) {
+          element.style.overflowX = "hidden";
+        }
       }
 
-      element.addEventListener("input", function (event) {
-        storage.setValue(id, event.target.value);
-      });
+      GetElementsByNameSet.add(element);
+      element.setAttribute("data-element-id", id);
       element.disabled = this.data.readOnly;
       element.name = this.data.fieldName;
+      element.tabIndex = DEFAULT_TAB_INDEX;
 
-      if (this.data.maxLen !== null) {
-        element.maxLength = this.data.maxLen;
+      this._setRequired(element, this.data.required);
+
+      if (maxLen) {
+        element.maxLength = maxLen;
+      }
+
+      element.addEventListener("input", event => {
+        storage.setValue(id, {
+          value: event.target.value
+        });
+        this.setPropertyOnSiblings(element, "value", event.target.value, "value");
+      });
+      element.addEventListener("resetform", event => {
+        const defaultValue = this.data.defaultFieldValue ?? "";
+        element.value = elementData.userValue = defaultValue;
+        elementData.formattedValue = null;
+      });
+
+      let blurListener = event => {
+        const {
+          formattedValue
+        } = elementData;
+
+        if (formattedValue !== null && formattedValue !== undefined) {
+          event.target.value = formattedValue;
+        }
+
+        event.target.scrollLeft = 0;
+      };
+
+      if (this.enableScripting && this.hasJSActions) {
+        element.addEventListener("focus", event => {
+          if (elementData.userValue) {
+            event.target.value = elementData.userValue;
+          }
+
+          elementData.valueOnFocus = event.target.value;
+        });
+        element.addEventListener("updatefromsandbox", jsEvent => {
+          const actions = {
+            value(event) {
+              elementData.userValue = event.detail.value ?? "";
+              storage.setValue(id, {
+                value: elementData.userValue.toString()
+              });
+              event.target.value = elementData.userValue;
+            },
+
+            formattedValue(event) {
+              const {
+                formattedValue
+              } = event.detail;
+              elementData.formattedValue = formattedValue;
+
+              if (formattedValue !== null && formattedValue !== undefined && event.target !== document.activeElement) {
+                event.target.value = formattedValue;
+              }
+
+              storage.setValue(id, {
+                formattedValue
+              });
+            },
+
+            selRange(event) {
+              event.target.setSelectionRange(...event.detail.selRange);
+            },
+
+            charLimit: event => {
+              const {
+                charLimit
+              } = event.detail;
+              const {
+                target
+              } = event;
+
+              if (charLimit === 0) {
+                target.removeAttribute("maxLength");
+                return;
+              }
+
+              target.setAttribute("maxLength", charLimit);
+              let value = elementData.userValue;
+
+              if (!value || value.length <= charLimit) {
+                return;
+              }
+
+              value = value.slice(0, charLimit);
+              target.value = elementData.userValue = value;
+              storage.setValue(id, {
+                value
+              });
+              this.linkService.eventBus?.dispatch("dispatcheventinsandbox", {
+                source: this,
+                detail: {
+                  id,
+                  name: "Keystroke",
+                  value,
+                  willCommit: true,
+                  commitKey: 1,
+                  selStart: target.selectionStart,
+                  selEnd: target.selectionEnd
+                }
+              });
+            }
+          };
+
+          this._dispatchEventFromSandbox(actions, jsEvent);
+        });
+        element.addEventListener("keydown", event => {
+          let commitKey = -1;
+
+          if (event.key === "Escape") {
+            commitKey = 0;
+          } else if (event.key === "Enter") {
+            commitKey = 2;
+          } else if (event.key === "Tab") {
+            commitKey = 3;
+          }
+
+          if (commitKey === -1) {
+            return;
+          }
+
+          const {
+            value
+          } = event.target;
+
+          if (elementData.valueOnFocus === value) {
+            return;
+          }
+
+          elementData.userValue = value;
+          this.linkService.eventBus?.dispatch("dispatcheventinsandbox", {
+            source: this,
+            detail: {
+              id,
+              name: "Keystroke",
+              value,
+              willCommit: true,
+              commitKey,
+              selStart: event.target.selectionStart,
+              selEnd: event.target.selectionEnd
+            }
+          });
+        });
+        const _blurListener = blurListener;
+        blurListener = null;
+        element.addEventListener("blur", event => {
+          const {
+            value
+          } = event.target;
+          elementData.userValue = value;
+
+          if (this._mouseState.isDown && elementData.valueOnFocus !== value) {
+            this.linkService.eventBus?.dispatch("dispatcheventinsandbox", {
+              source: this,
+              detail: {
+                id,
+                name: "Keystroke",
+                value,
+                willCommit: true,
+                commitKey: 1,
+                selStart: event.target.selectionStart,
+                selEnd: event.target.selectionEnd
+              }
+            });
+          }
+
+          _blurListener(event);
+        });
+
+        if (this.data.actions?.Keystroke) {
+          element.addEventListener("beforeinput", event => {
+            const {
+              data,
+              target
+            } = event;
+            const {
+              value,
+              selectionStart,
+              selectionEnd
+            } = target;
+            let selStart = selectionStart,
+                selEnd = selectionEnd;
+
+            switch (event.inputType) {
+              case "deleteWordBackward":
+                {
+                  const match = value.substring(0, selectionStart).match(/\w*[^\w]*$/);
+
+                  if (match) {
+                    selStart -= match[0].length;
+                  }
+
+                  break;
+                }
+
+              case "deleteWordForward":
+                {
+                  const match = value.substring(selectionStart).match(/^[^\w]*\w*/);
+
+                  if (match) {
+                    selEnd += match[0].length;
+                  }
+
+                  break;
+                }
+
+              case "deleteContentBackward":
+                if (selectionStart === selectionEnd) {
+                  selStart -= 1;
+                }
+
+                break;
+
+              case "deleteContentForward":
+                if (selectionStart === selectionEnd) {
+                  selEnd += 1;
+                }
+
+                break;
+            }
+
+            event.preventDefault();
+            this.linkService.eventBus?.dispatch("dispatcheventinsandbox", {
+              source: this,
+              detail: {
+                id,
+                name: "Keystroke",
+                value,
+                change: data || "",
+                willCommit: false,
+                selStart,
+                selEnd
+              }
+            });
+          });
+        }
+
+        this._setEventListeners(element, [["focus", "Focus"], ["blur", "Blur"], ["mousedown", "Mouse Down"], ["mouseenter", "Mouse Enter"], ["mouseleave", "Mouse Exit"], ["mouseup", "Mouse Up"]], event => event.target.value);
+      }
+
+      if (blurListener) {
+        element.addEventListener("blur", blurListener);
       }
 
       if (this.data.comb) {
         const fieldWidth = this.data.rect[2] - this.data.rect[0];
-        const combWidth = fieldWidth / this.data.maxLen;
+        const combWidth = fieldWidth / maxLen;
         element.classList.add("comb");
-        element.style.letterSpacing = `calc(${combWidth}px - 1ch)`;
+        element.style.letterSpacing = `calc(${combWidth}px * var(--scale-factor) - 1ch)`;
       }
     } else {
       element = document.createElement("div");
       element.textContent = this.data.fieldValue;
       element.style.verticalAlign = "middle";
       element.style.display = "table-cell";
-      let font = null;
-
-      if (this.data.fontRefName && this.page.commonObjs.has(this.data.fontRefName)) {
-        font = this.page.commonObjs.get(this.data.fontRefName);
-      }
-
-      this._setTextStyle(element, font);
     }
 
-    if (this.data.textAlignment !== null) {
-      element.style.textAlign = TEXT_ALIGNMENT[this.data.textAlignment];
-    }
+    this._setTextStyle(element);
 
-    this.container.appendChild(element);
+    this._setBackgroundColor(element);
+
+    this._setDefaultPropertiesFromJS(element);
+
+    this.container.append(element);
     return this.container;
   }
 
-  _setTextStyle(element, font) {
-    const style = element.style;
-    style.fontSize = `${this.data.fontSize}px`;
-    style.direction = this.data.fontDirection < 0 ? "rtl" : "ltr";
-
-    if (!font) {
-      return;
-    }
-
-    let bold = "normal";
-
-    if (font.black) {
-      bold = "900";
-    } else if (font.bold) {
-      bold = "bold";
-    }
-
-    style.fontWeight = bold;
-    style.fontStyle = font.italic ? "italic" : "normal";
-    const fontFamily = font.loadedName ? `"${font.loadedName}", ` : "";
-    const fallbackName = font.fallbackName || "Helvetica, sans-serif";
-    style.fontFamily = fontFamily + fallbackName;
-  }
-
 }
 
 class CheckboxWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
-    super(parameters, parameters.renderInteractiveForms);
+    super(parameters, {
+      isRenderable: parameters.renderForms
+    });
   }
 
   render() {
     const storage = this.annotationStorage;
     const data = this.data;
     const id = data.id;
-    const value = storage.getOrCreateValue(id, data.fieldValue && data.fieldValue !== "Off");
+    let value = storage.getValue(id, {
+      value: data.exportValue === data.fieldValue
+    }).value;
+
+    if (typeof value === "string") {
+      value = value !== "Off";
+      storage.setValue(id, {
+        value
+      });
+    }
+
     this.container.className = "buttonWidgetAnnotation checkBox";
     const element = document.createElement("input");
+    GetElementsByNameSet.add(element);
+    element.setAttribute("data-element-id", id);
     element.disabled = data.readOnly;
+
+    this._setRequired(element, this.data.required);
+
     element.type = "checkbox";
-    element.name = this.data.fieldName;
+    element.name = data.fieldName;
 
     if (value) {
       element.setAttribute("checked", true);
     }
 
-    element.addEventListener("change", function (event) {
-      storage.setValue(id, event.target.checked);
+    element.setAttribute("exportValue", data.exportValue);
+    element.tabIndex = DEFAULT_TAB_INDEX;
+    element.addEventListener("change", event => {
+      const {
+        name,
+        checked
+      } = event.target;
+
+      for (const checkbox of this._getElementsByName(name, id)) {
+        const curChecked = checked && checkbox.exportValue === data.exportValue;
+
+        if (checkbox.domElement) {
+          checkbox.domElement.checked = curChecked;
+        }
+
+        storage.setValue(checkbox.id, {
+          value: curChecked
+        });
+      }
+
+      storage.setValue(id, {
+        value: checked
+      });
     });
-    this.container.appendChild(element);
+    element.addEventListener("resetform", event => {
+      const defaultValue = data.defaultFieldValue || "Off";
+      event.target.checked = defaultValue === data.exportValue;
+    });
+
+    if (this.enableScripting && this.hasJSActions) {
+      element.addEventListener("updatefromsandbox", jsEvent => {
+        const actions = {
+          value(event) {
+            event.target.checked = event.detail.value !== "Off";
+            storage.setValue(id, {
+              value: event.target.checked
+            });
+          }
+
+        };
+
+        this._dispatchEventFromSandbox(actions, jsEvent);
+      });
+
+      this._setEventListeners(element, [["change", "Validate"], ["change", "Action"], ["focus", "Focus"], ["blur", "Blur"], ["mousedown", "Mouse Down"], ["mouseenter", "Mouse Enter"], ["mouseleave", "Mouse Exit"], ["mouseup", "Mouse Up"]], event => event.target.checked);
+    }
+
+    this._setBackgroundColor(element);
+
+    this._setDefaultPropertiesFromJS(element);
+
+    this.container.append(element);
     return this.container;
   }
 
@@ -9681,7 +14097,9 @@ class CheckboxWidgetAnnotationElement extends WidgetAnnotationElement {
 
 class RadioButtonWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
-    super(parameters, parameters.renderInteractiveForms);
+    super(parameters, {
+      isRenderable: parameters.renderForms
+    });
   }
 
   render() {
@@ -9689,9 +14107,24 @@ class RadioButtonWidgetAnnotationElement extends WidgetAnnotationElement {
     const storage = this.annotationStorage;
     const data = this.data;
     const id = data.id;
-    const value = storage.getOrCreateValue(id, data.fieldValue === data.buttonValue);
+    let value = storage.getValue(id, {
+      value: data.fieldValue === data.buttonValue
+    }).value;
+
+    if (typeof value === "string") {
+      value = value !== data.buttonValue;
+      storage.setValue(id, {
+        value
+      });
+    }
+
     const element = document.createElement("input");
+    GetElementsByNameSet.add(element);
+    element.setAttribute("data-element-id", id);
     element.disabled = data.readOnly;
+
+    this._setRequired(element, this.data.required);
+
     element.type = "radio";
     element.name = data.fieldName;
 
@@ -9699,27 +14132,90 @@ class RadioButtonWidgetAnnotationElement extends WidgetAnnotationElement {
       element.setAttribute("checked", true);
     }
 
-    element.addEventListener("change", function (event) {
-      const name = event.target.name;
+    element.tabIndex = DEFAULT_TAB_INDEX;
+    element.addEventListener("change", event => {
+      const {
+        name,
+        checked
+      } = event.target;
 
-      for (const radio of document.getElementsByName(name)) {
-        if (radio !== event.target) {
-          storage.setValue(radio.parentNode.getAttribute("data-annotation-id"), false);
-        }
+      for (const radio of this._getElementsByName(name, id)) {
+        storage.setValue(radio.id, {
+          value: false
+        });
       }
 
-      storage.setValue(id, event.target.checked);
+      storage.setValue(id, {
+        value: checked
+      });
     });
-    this.container.appendChild(element);
+    element.addEventListener("resetform", event => {
+      const defaultValue = data.defaultFieldValue;
+      event.target.checked = defaultValue !== null && defaultValue !== undefined && defaultValue === data.buttonValue;
+    });
+
+    if (this.enableScripting && this.hasJSActions) {
+      const pdfButtonValue = data.buttonValue;
+      element.addEventListener("updatefromsandbox", jsEvent => {
+        const actions = {
+          value: event => {
+            const checked = pdfButtonValue === event.detail.value;
+
+            for (const radio of this._getElementsByName(event.target.name)) {
+              const curChecked = checked && radio.id === id;
+
+              if (radio.domElement) {
+                radio.domElement.checked = curChecked;
+              }
+
+              storage.setValue(radio.id, {
+                value: curChecked
+              });
+            }
+          }
+        };
+
+        this._dispatchEventFromSandbox(actions, jsEvent);
+      });
+
+      this._setEventListeners(element, [["change", "Validate"], ["change", "Action"], ["focus", "Focus"], ["blur", "Blur"], ["mousedown", "Mouse Down"], ["mouseenter", "Mouse Enter"], ["mouseleave", "Mouse Exit"], ["mouseup", "Mouse Up"]], event => event.target.checked);
+    }
+
+    this._setBackgroundColor(element);
+
+    this._setDefaultPropertiesFromJS(element);
+
+    this.container.append(element);
     return this.container;
   }
 
 }
 
 class PushButtonWidgetAnnotationElement extends LinkAnnotationElement {
+  constructor(parameters) {
+    super(parameters, {
+      ignoreBorder: parameters.data.hasAppearance
+    });
+  }
+
   render() {
     const container = super.render();
     container.className = "buttonWidgetAnnotation pushButton";
+
+    if (this.data.alternativeText) {
+      container.title = this.data.alternativeText;
+    }
+
+    const linkElement = container.lastChild;
+
+    if (this.enableScripting && this.hasJSActions && linkElement) {
+      this._setDefaultPropertiesFromJS(linkElement);
+
+      linkElement.addEventListener("updatefromsandbox", jsEvent => {
+        this._dispatchEventFromSandbox({}, jsEvent);
+      });
+    }
+
     return container;
   }
 
@@ -9727,17 +14223,28 @@ class PushButtonWidgetAnnotationElement extends LinkAnnotationElement {
 
 class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
-    super(parameters, parameters.renderInteractiveForms);
+    super(parameters, {
+      isRenderable: parameters.renderForms
+    });
   }
 
   render() {
     this.container.className = "choiceWidgetAnnotation";
     const storage = this.annotationStorage;
     const id = this.data.id;
-    storage.getOrCreateValue(id, this.data.fieldValue.length > 0 ? this.data.fieldValue[0] : null);
+    const storedData = storage.getValue(id, {
+      value: this.data.fieldValue
+    });
     const selectElement = document.createElement("select");
+    GetElementsByNameSet.add(selectElement);
+    selectElement.setAttribute("data-element-id", id);
     selectElement.disabled = this.data.readOnly;
+
+    this._setRequired(selectElement, this.data.required);
+
     selectElement.name = this.data.fieldName;
+    selectElement.tabIndex = DEFAULT_TAB_INDEX;
+    let addAnEmptyEntry = this.data.combo && this.data.options.length > 0;
 
     if (!this.data.combo) {
       selectElement.size = this.data.options.length;
@@ -9747,24 +14254,229 @@ class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
       }
     }
 
+    selectElement.addEventListener("resetform", event => {
+      const defaultValue = this.data.defaultFieldValue;
+
+      for (const option of selectElement.options) {
+        option.selected = option.value === defaultValue;
+      }
+    });
+
     for (const option of this.data.options) {
       const optionElement = document.createElement("option");
       optionElement.textContent = option.displayValue;
       optionElement.value = option.exportValue;
 
-      if (this.data.fieldValue.includes(option.exportValue)) {
+      if (storedData.value.includes(option.exportValue)) {
         optionElement.setAttribute("selected", true);
+        addAnEmptyEntry = false;
       }
 
-      selectElement.appendChild(optionElement);
+      selectElement.append(optionElement);
     }
 
-    selectElement.addEventListener("input", function (event) {
+    let removeEmptyEntry = null;
+
+    if (addAnEmptyEntry) {
+      const noneOptionElement = document.createElement("option");
+      noneOptionElement.value = " ";
+      noneOptionElement.setAttribute("hidden", true);
+      noneOptionElement.setAttribute("selected", true);
+      selectElement.prepend(noneOptionElement);
+
+      removeEmptyEntry = () => {
+        noneOptionElement.remove();
+        selectElement.removeEventListener("input", removeEmptyEntry);
+        removeEmptyEntry = null;
+      };
+
+      selectElement.addEventListener("input", removeEmptyEntry);
+    }
+
+    const getValue = (event, isExport) => {
+      const name = isExport ? "value" : "textContent";
       const options = event.target.options;
-      const value = options[options.selectedIndex].value;
-      storage.setValue(id, value);
-    });
-    this.container.appendChild(selectElement);
+
+      if (!event.target.multiple) {
+        return options.selectedIndex === -1 ? null : options[options.selectedIndex][name];
+      }
+
+      return Array.prototype.filter.call(options, option => option.selected).map(option => option[name]);
+    };
+
+    const getItems = event => {
+      const options = event.target.options;
+      return Array.prototype.map.call(options, option => {
+        return {
+          displayValue: option.textContent,
+          exportValue: option.value
+        };
+      });
+    };
+
+    if (this.enableScripting && this.hasJSActions) {
+      selectElement.addEventListener("updatefromsandbox", jsEvent => {
+        const actions = {
+          value(event) {
+            removeEmptyEntry?.();
+            const value = event.detail.value;
+            const values = new Set(Array.isArray(value) ? value : [value]);
+
+            for (const option of selectElement.options) {
+              option.selected = values.has(option.value);
+            }
+
+            storage.setValue(id, {
+              value: getValue(event, true)
+            });
+          },
+
+          multipleSelection(event) {
+            selectElement.multiple = true;
+          },
+
+          remove(event) {
+            const options = selectElement.options;
+            const index = event.detail.remove;
+            options[index].selected = false;
+            selectElement.remove(index);
+
+            if (options.length > 0) {
+              const i = Array.prototype.findIndex.call(options, option => option.selected);
+
+              if (i === -1) {
+                options[0].selected = true;
+              }
+            }
+
+            storage.setValue(id, {
+              value: getValue(event, true),
+              items: getItems(event)
+            });
+          },
+
+          clear(event) {
+            while (selectElement.length !== 0) {
+              selectElement.remove(0);
+            }
+
+            storage.setValue(id, {
+              value: null,
+              items: []
+            });
+          },
+
+          insert(event) {
+            const {
+              index,
+              displayValue,
+              exportValue
+            } = event.detail.insert;
+            const selectChild = selectElement.children[index];
+            const optionElement = document.createElement("option");
+            optionElement.textContent = displayValue;
+            optionElement.value = exportValue;
+
+            if (selectChild) {
+              selectChild.before(optionElement);
+            } else {
+              selectElement.append(optionElement);
+            }
+
+            storage.setValue(id, {
+              value: getValue(event, true),
+              items: getItems(event)
+            });
+          },
+
+          items(event) {
+            const {
+              items
+            } = event.detail;
+
+            while (selectElement.length !== 0) {
+              selectElement.remove(0);
+            }
+
+            for (const item of items) {
+              const {
+                displayValue,
+                exportValue
+              } = item;
+              const optionElement = document.createElement("option");
+              optionElement.textContent = displayValue;
+              optionElement.value = exportValue;
+              selectElement.append(optionElement);
+            }
+
+            if (selectElement.options.length > 0) {
+              selectElement.options[0].selected = true;
+            }
+
+            storage.setValue(id, {
+              value: getValue(event, true),
+              items: getItems(event)
+            });
+          },
+
+          indices(event) {
+            const indices = new Set(event.detail.indices);
+
+            for (const option of event.target.options) {
+              option.selected = indices.has(option.index);
+            }
+
+            storage.setValue(id, {
+              value: getValue(event, true)
+            });
+          },
+
+          editable(event) {
+            event.target.disabled = !event.detail.editable;
+          }
+
+        };
+
+        this._dispatchEventFromSandbox(actions, jsEvent);
+      });
+      selectElement.addEventListener("input", event => {
+        const exportValue = getValue(event, true);
+        const value = getValue(event, false);
+        storage.setValue(id, {
+          value: exportValue
+        });
+        this.linkService.eventBus?.dispatch("dispatcheventinsandbox", {
+          source: this,
+          detail: {
+            id,
+            name: "Keystroke",
+            value,
+            changeEx: exportValue,
+            willCommit: true,
+            commitKey: 1,
+            keyDown: false
+          }
+        });
+      });
+
+      this._setEventListeners(selectElement, [["focus", "Focus"], ["blur", "Blur"], ["mousedown", "Mouse Down"], ["mouseenter", "Mouse Enter"], ["mouseleave", "Mouse Exit"], ["mouseup", "Mouse Up"], ["input", "Action"]], event => event.target.checked);
+    } else {
+      selectElement.addEventListener("input", function (event) {
+        storage.setValue(id, {
+          value: getValue(event, true)
+        });
+      });
+    }
+
+    if (this.data.combo) {
+      this._setTextStyle(selectElement);
+    } else {}
+
+    this._setBackgroundColor(selectElement);
+
+    this._setDefaultPropertiesFromJS(selectElement);
+
+    this.container.append(selectElement);
     return this.container;
   }
 
@@ -9772,8 +14484,10 @@ class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
 
 class PopupAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable);
+    const isRenderable = !!(parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable
+    });
   }
 
   render() {
@@ -9785,25 +14499,33 @@ class PopupAnnotationElement extends AnnotationElement {
     }
 
     const selector = `[data-annotation-id="${this.data.parentId}"]`;
-    const parentElement = this.layer.querySelector(selector);
+    const parentElements = this.layer.querySelectorAll(selector);
 
-    if (!parentElement) {
+    if (parentElements.length === 0) {
       return this.container;
     }
 
     const popup = new PopupElement({
       container: this.container,
-      trigger: parentElement,
+      trigger: Array.from(parentElements),
       color: this.data.color,
-      title: this.data.title,
+      titleObj: this.data.titleObj,
       modificationDate: this.data.modificationDate,
-      contents: this.data.contents
+      contentsObj: this.data.contentsObj,
+      richText: this.data.richText
     });
-    const parentLeft = parseFloat(parentElement.style.left);
-    const parentWidth = parseFloat(parentElement.style.width);
-    this.container.style.transformOrigin = `-${parentLeft + parentWidth}px -${parentElement.style.top}`;
-    this.container.style.left = `${parentLeft + parentWidth}px`;
-    this.container.appendChild(popup.render());
+    const page = this.page;
+
+    const rect = _util.Util.normalizeRect([this.data.parentRect[0], page.view[3] - this.data.parentRect[1] + page.view[1], this.data.parentRect[2], page.view[3] - this.data.parentRect[3] + page.view[1]]);
+
+    const popupLeft = rect[0] + this.data.parentRect[2] - this.data.parentRect[0];
+    const popupTop = rect[1];
+    const [pageLLx, pageLLy, pageURx, pageURy] = this.viewport.viewBox;
+    const pageWidth = pageURx - pageLLx;
+    const pageHeight = pageURy - pageLLy;
+    this.container.style.left = `${100 * (popupLeft - pageLLx) / pageWidth}%`;
+    this.container.style.top = `${100 * (popupTop - pageLLy) / pageHeight}%`;
+    this.container.append(popup.render());
     return this.container;
   }
 
@@ -9814,9 +14536,10 @@ class PopupElement {
     this.container = parameters.container;
     this.trigger = parameters.trigger;
     this.color = parameters.color;
-    this.title = parameters.title;
+    this.titleObj = parameters.titleObj;
     this.modificationDate = parameters.modificationDate;
-    this.contents = parameters.contents;
+    this.contentsObj = parameters.contentsObj;
+    this.richText = parameters.richText;
     this.hideWrapper = parameters.hideWrapper || false;
     this.pinned = false;
   }
@@ -9826,7 +14549,7 @@ class PopupElement {
     const wrapper = document.createElement("div");
     wrapper.className = "popupWrapper";
     this.hideElement = this.hideWrapper ? wrapper : this.container;
-    this.hideElement.setAttribute("hidden", true);
+    this.hideElement.hidden = true;
     const popup = document.createElement("div");
     popup.className = "popup";
     const color = this.color;
@@ -9835,47 +14558,72 @@ class PopupElement {
       const r = BACKGROUND_ENLIGHT * (255 - color[0]) + color[0];
       const g = BACKGROUND_ENLIGHT * (255 - color[1]) + color[1];
       const b = BACKGROUND_ENLIGHT * (255 - color[2]) + color[2];
-      popup.style.backgroundColor = _util.Util.makeCssRgb(r | 0, g | 0, b | 0);
+      popup.style.backgroundColor = _util.Util.makeHexColor(r | 0, g | 0, b | 0);
     }
 
     const title = document.createElement("h1");
-    title.textContent = this.title;
-    popup.appendChild(title);
+    title.dir = this.titleObj.dir;
+    title.textContent = this.titleObj.str;
+    popup.append(title);
 
     const dateObject = _display_utils.PDFDateString.toDateObject(this.modificationDate);
 
     if (dateObject) {
       const modificationDate = document.createElement("span");
+      modificationDate.className = "popupDate";
       modificationDate.textContent = "{{date}}, {{time}}";
       modificationDate.dataset.l10nId = "annotation_date_string";
       modificationDate.dataset.l10nArgs = JSON.stringify({
         date: dateObject.toLocaleDateString(),
         time: dateObject.toLocaleTimeString()
       });
-      popup.appendChild(modificationDate);
+      popup.append(modificationDate);
     }
 
-    const contents = this._formatContents(this.contents);
+    if (this.richText?.str && (!this.contentsObj?.str || this.contentsObj.str === this.richText.str)) {
+      _xfa_layer.XfaLayer.render({
+        xfaHtml: this.richText.html,
+        intent: "richText",
+        div: popup
+      });
+
+      popup.lastChild.className = "richText popupContent";
+    } else {
+      const contents = this._formatContents(this.contentsObj);
+
+      popup.append(contents);
+    }
+
+    if (!Array.isArray(this.trigger)) {
+      this.trigger = [this.trigger];
+    }
+
+    for (const element of this.trigger) {
+      element.addEventListener("click", this._toggle.bind(this));
+      element.addEventListener("mouseover", this._show.bind(this, false));
+      element.addEventListener("mouseout", this._hide.bind(this, false));
+    }
 
-    popup.appendChild(contents);
-    this.trigger.addEventListener("click", this._toggle.bind(this));
-    this.trigger.addEventListener("mouseover", this._show.bind(this, false));
-    this.trigger.addEventListener("mouseout", this._hide.bind(this, false));
     popup.addEventListener("click", this._hide.bind(this, true));
-    wrapper.appendChild(popup);
+    wrapper.append(popup);
     return wrapper;
   }
 
-  _formatContents(contents) {
+  _formatContents({
+    str,
+    dir
+  }) {
     const p = document.createElement("p");
-    const lines = contents.split(/(?:\r\n?|\n)/);
+    p.className = "popupContent";
+    p.dir = dir;
+    const lines = str.split(/(?:\r\n?|\n)/);
 
     for (let i = 0, ii = lines.length; i < ii; ++i) {
       const line = lines[i];
-      p.appendChild(document.createTextNode(line));
+      p.append(document.createTextNode(line));
 
       if (i < ii - 1) {
-        p.appendChild(document.createElement("br"));
+        p.append(document.createElement("br"));
       }
     }
 
@@ -9895,9 +14643,9 @@ class PopupElement {
       this.pinned = true;
     }
 
-    if (this.hideElement.hasAttribute("hidden")) {
-      this.hideElement.removeAttribute("hidden");
-      this.container.style.zIndex += 1;
+    if (this.hideElement.hidden) {
+      this.hideElement.hidden = false;
+      this.container.style.zIndex = parseInt(this.container.style.zIndex) + 1000;
     }
   }
 
@@ -9906,9 +14654,9 @@ class PopupElement {
       this.pinned = false;
     }
 
-    if (!this.hideElement.hasAttribute("hidden") && !this.pinned) {
-      this.hideElement.setAttribute("hidden", true);
-      this.container.style.zIndex -= 1;
+    if (!this.hideElement.hidden && !this.pinned) {
+      this.hideElement.hidden = true;
+      this.container.style.zIndex = parseInt(this.container.style.zIndex) - 1000;
     }
   }
 
@@ -9916,15 +14664,33 @@ class PopupElement {
 
 class FreeTextAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
+    this.textContent = parameters.data.textContent;
   }
 
   render() {
     this.container.className = "freeTextAnnotation";
 
+    if (this.textContent) {
+      const content = document.createElement("div");
+      content.className = "annotationTextContent";
+      content.setAttribute("role", "comment");
+
+      for (const line of this.textContent) {
+        const lineSpan = document.createElement("span");
+        lineSpan.textContent = line;
+        content.append(lineSpan);
+      }
+
+      this.container.append(content);
+    }
+
     if (!this.data.hasPopup) {
-      this._createPopup(this.container, null, this.data);
+      this._createPopup(null, this.data);
     }
 
     return this.container;
@@ -9934,16 +14700,21 @@ class FreeTextAnnotationElement extends AnnotationElement {
 
 class LineAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
     this.container.className = "lineAnnotation";
     const data = this.data;
-    const width = data.rect[2] - data.rect[0];
-    const height = data.rect[3] - data.rect[1];
-    const svg = this.svgFactory.create(width, height);
+    const {
+      width,
+      height
+    } = getRectDims(data.rect);
+    const svg = this.svgFactory.create(width, height, true);
     const line = this.svgFactory.createElement("svg:line");
     line.setAttribute("x1", data.rect[2] - data.lineCoordinates[0]);
     line.setAttribute("y1", data.rect[3] - data.lineCoordinates[1]);
@@ -9951,10 +14722,11 @@ class LineAnnotationElement extends AnnotationElement {
     line.setAttribute("y2", data.rect[3] - data.lineCoordinates[3]);
     line.setAttribute("stroke-width", data.borderStyle.width || 1);
     line.setAttribute("stroke", "transparent");
-    svg.appendChild(line);
+    line.setAttribute("fill", "transparent");
+    svg.append(line);
     this.container.append(svg);
 
-    this._createPopup(this.container, line, data);
+    this._createPopup(line, data);
 
     return this.container;
   }
@@ -9963,16 +14735,21 @@ class LineAnnotationElement extends AnnotationElement {
 
 class SquareAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
     this.container.className = "squareAnnotation";
     const data = this.data;
-    const width = data.rect[2] - data.rect[0];
-    const height = data.rect[3] - data.rect[1];
-    const svg = this.svgFactory.create(width, height);
+    const {
+      width,
+      height
+    } = getRectDims(data.rect);
+    const svg = this.svgFactory.create(width, height, true);
     const borderWidth = data.borderStyle.width;
     const square = this.svgFactory.createElement("svg:rect");
     square.setAttribute("x", borderWidth / 2);
@@ -9981,11 +14758,11 @@ class SquareAnnotationElement extends AnnotationElement {
     square.setAttribute("height", height - borderWidth);
     square.setAttribute("stroke-width", borderWidth || 1);
     square.setAttribute("stroke", "transparent");
-    square.setAttribute("fill", "none");
-    svg.appendChild(square);
+    square.setAttribute("fill", "transparent");
+    svg.append(square);
     this.container.append(svg);
 
-    this._createPopup(this.container, square, data);
+    this._createPopup(square, data);
 
     return this.container;
   }
@@ -9994,16 +14771,21 @@ class SquareAnnotationElement extends AnnotationElement {
 
 class CircleAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
     this.container.className = "circleAnnotation";
     const data = this.data;
-    const width = data.rect[2] - data.rect[0];
-    const height = data.rect[3] - data.rect[1];
-    const svg = this.svgFactory.create(width, height);
+    const {
+      width,
+      height
+    } = getRectDims(data.rect);
+    const svg = this.svgFactory.create(width, height, true);
     const borderWidth = data.borderStyle.width;
     const circle = this.svgFactory.createElement("svg:ellipse");
     circle.setAttribute("cx", width / 2);
@@ -10012,11 +14794,11 @@ class CircleAnnotationElement extends AnnotationElement {
     circle.setAttribute("ry", height / 2 - borderWidth / 2);
     circle.setAttribute("stroke-width", borderWidth || 1);
     circle.setAttribute("stroke", "transparent");
-    circle.setAttribute("fill", "none");
-    svg.appendChild(circle);
+    circle.setAttribute("fill", "transparent");
+    svg.append(circle);
     this.container.append(svg);
 
-    this._createPopup(this.container, circle, data);
+    this._createPopup(circle, data);
 
     return this.container;
   }
@@ -10025,8 +14807,11 @@ class CircleAnnotationElement extends AnnotationElement {
 
 class PolylineAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
     this.containerClassName = "polylineAnnotation";
     this.svgElementName = "svg:polyline";
   }
@@ -10034,9 +14819,11 @@ class PolylineAnnotationElement extends AnnotationElement {
   render() {
     this.container.className = this.containerClassName;
     const data = this.data;
-    const width = data.rect[2] - data.rect[0];
-    const height = data.rect[3] - data.rect[1];
-    const svg = this.svgFactory.create(width, height);
+    const {
+      width,
+      height
+    } = getRectDims(data.rect);
+    const svg = this.svgFactory.create(width, height, true);
     let points = [];
 
     for (const coordinate of data.vertices) {
@@ -10050,11 +14837,11 @@ class PolylineAnnotationElement extends AnnotationElement {
     polyline.setAttribute("points", points);
     polyline.setAttribute("stroke-width", data.borderStyle.width || 1);
     polyline.setAttribute("stroke", "transparent");
-    polyline.setAttribute("fill", "none");
-    svg.appendChild(polyline);
+    polyline.setAttribute("fill", "transparent");
+    svg.append(polyline);
     this.container.append(svg);
 
-    this._createPopup(this.container, polyline, data);
+    this._createPopup(polyline, data);
 
     return this.container;
   }
@@ -10072,15 +14859,18 @@ class PolygonAnnotationElement extends PolylineAnnotationElement {
 
 class CaretAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
     this.container.className = "caretAnnotation";
 
     if (!this.data.hasPopup) {
-      this._createPopup(this.container, null, this.data);
+      this._createPopup(null, this.data);
     }
 
     return this.container;
@@ -10090,8 +14880,11 @@ class CaretAnnotationElement extends AnnotationElement {
 
 class InkAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
     this.containerClassName = "inkAnnotation";
     this.svgElementName = "svg:polyline";
   }
@@ -10099,9 +14892,11 @@ class InkAnnotationElement extends AnnotationElement {
   render() {
     this.container.className = this.containerClassName;
     const data = this.data;
-    const width = data.rect[2] - data.rect[0];
-    const height = data.rect[3] - data.rect[1];
-    const svg = this.svgFactory.create(width, height);
+    const {
+      width,
+      height
+    } = getRectDims(data.rect);
+    const svg = this.svgFactory.create(width, height, true);
 
     for (const inkList of data.inkLists) {
       let points = [];
@@ -10117,11 +14912,11 @@ class InkAnnotationElement extends AnnotationElement {
       polyline.setAttribute("points", points);
       polyline.setAttribute("stroke-width", data.borderStyle.width || 1);
       polyline.setAttribute("stroke", "transparent");
-      polyline.setAttribute("fill", "none");
+      polyline.setAttribute("fill", "transparent");
 
-      this._createPopup(this.container, polyline, data);
+      this._createPopup(polyline, data);
 
-      svg.appendChild(polyline);
+      svg.append(polyline);
     }
 
     this.container.append(svg);
@@ -10132,17 +14927,24 @@ class InkAnnotationElement extends AnnotationElement {
 
 class HighlightAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true,
+      createQuadrilaterals: true
+    });
   }
 
   render() {
-    this.container.className = "highlightAnnotation";
-
     if (!this.data.hasPopup) {
-      this._createPopup(this.container, null, this.data);
+      this._createPopup(null, this.data);
     }
 
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("highlightAnnotation");
+    }
+
+    this.container.className = "highlightAnnotation";
     return this.container;
   }
 
@@ -10150,17 +14952,24 @@ class HighlightAnnotationElement extends AnnotationElement {
 
 class UnderlineAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true,
+      createQuadrilaterals: true
+    });
   }
 
   render() {
-    this.container.className = "underlineAnnotation";
-
     if (!this.data.hasPopup) {
-      this._createPopup(this.container, null, this.data);
+      this._createPopup(null, this.data);
     }
 
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("underlineAnnotation");
+    }
+
+    this.container.className = "underlineAnnotation";
     return this.container;
   }
 
@@ -10168,17 +14977,24 @@ class UnderlineAnnotationElement extends AnnotationElement {
 
 class SquigglyAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true,
+      createQuadrilaterals: true
+    });
   }
 
   render() {
-    this.container.className = "squigglyAnnotation";
-
     if (!this.data.hasPopup) {
-      this._createPopup(this.container, null, this.data);
+      this._createPopup(null, this.data);
     }
 
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("squigglyAnnotation");
+    }
+
+    this.container.className = "squigglyAnnotation";
     return this.container;
   }
 
@@ -10186,17 +15002,24 @@ class SquigglyAnnotationElement extends AnnotationElement {
 
 class StrikeOutAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true,
+      createQuadrilaterals: true
+    });
   }
 
   render() {
-    this.container.className = "strikeoutAnnotation";
-
     if (!this.data.hasPopup) {
-      this._createPopup(this.container, null, this.data);
+      this._createPopup(null, this.data);
     }
 
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("strikeoutAnnotation");
+    }
+
+    this.container.className = "strikeoutAnnotation";
     return this.container;
   }
 
@@ -10204,15 +15027,18 @@ class StrikeOutAnnotationElement extends AnnotationElement {
 
 class StampAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    const isRenderable = !!(parameters.data.hasPopup || parameters.data.titleObj?.str || parameters.data.contentsObj?.str || parameters.data.richText?.str);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
     this.container.className = "stampAnnotation";
 
     if (!this.data.hasPopup) {
-      this._createPopup(this.container, null, this.data);
+      this._createPopup(null, this.data);
     }
 
     return this.container;
@@ -10222,102 +15048,171 @@ class StampAnnotationElement extends AnnotationElement {
 
 class FileAttachmentAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    super(parameters, true);
+    super(parameters, {
+      isRenderable: true
+    });
     const {
       filename,
       content
     } = this.data.file;
     this.filename = (0, _display_utils.getFilenameFromUrl)(filename);
     this.content = content;
-
-    if (this.linkService.eventBus) {
-      this.linkService.eventBus.dispatch("fileattachmentannotation", {
-        source: this,
-        id: (0, _util.stringToPDFString)(filename),
-        filename,
-        content
-      });
-    }
+    this.linkService.eventBus?.dispatch("fileattachmentannotation", {
+      source: this,
+      filename,
+      content
+    });
   }
 
   render() {
     this.container.className = "fileAttachmentAnnotation";
     const trigger = document.createElement("div");
-    trigger.style.height = this.container.style.height;
-    trigger.style.width = this.container.style.width;
+    trigger.className = "popupTriggerArea";
     trigger.addEventListener("dblclick", this._download.bind(this));
 
-    if (!this.data.hasPopup && (this.data.title || this.data.contents)) {
-      this._createPopup(this.container, trigger, this.data);
+    if (!this.data.hasPopup && (this.data.titleObj?.str || this.data.contentsObj?.str || this.data.richText)) {
+      this._createPopup(trigger, this.data);
     }
 
-    this.container.appendChild(trigger);
+    this.container.append(trigger);
     return this.container;
   }
 
   _download() {
-    if (!this.downloadManager) {
-      (0, _util.warn)("Download cannot be started due to unavailable download manager");
-      return;
-    }
-
-    this.downloadManager.downloadData(this.content, this.filename, "");
+    this.downloadManager?.openOrDownloadData(this.container, this.content, this.filename);
   }
 
 }
 
 class AnnotationLayer {
+  static #appendElement(element, id, div, accessibilityManager) {
+    const contentElement = element.firstChild || element;
+    contentElement.id = `${_display_utils.AnnotationPrefix}${id}`;
+    div.append(element);
+    accessibilityManager?.moveElementInDOM(div, element, contentElement, false);
+  }
+
   static render(parameters) {
-    const sortedAnnotations = [],
-          popupAnnotations = [];
+    const {
+      annotations,
+      div,
+      viewport,
+      accessibilityManager
+    } = parameters;
+    this.#setDimensions(div, viewport);
+    let zIndex = 0;
 
-    for (const data of parameters.annotations) {
-      if (!data) {
-        continue;
+    for (const data of annotations) {
+      if (data.annotationType !== _util.AnnotationType.POPUP) {
+        const {
+          width,
+          height
+        } = getRectDims(data.rect);
+
+        if (width <= 0 || height <= 0) {
+          continue;
+        }
       }
 
-      if (data.annotationType === _util.AnnotationType.POPUP) {
-        popupAnnotations.push(data);
-        continue;
-      }
-
-      sortedAnnotations.push(data);
-    }
-
-    if (popupAnnotations.length) {
-      sortedAnnotations.push(...popupAnnotations);
-    }
-
-    for (const data of sortedAnnotations) {
       const element = AnnotationElementFactory.create({
         data,
-        layer: parameters.div,
+        layer: div,
         page: parameters.page,
-        viewport: parameters.viewport,
+        viewport,
         linkService: parameters.linkService,
         downloadManager: parameters.downloadManager,
         imageResourcesPath: parameters.imageResourcesPath || "",
-        renderInteractiveForms: typeof parameters.renderInteractiveForms === "boolean" ? parameters.renderInteractiveForms : true,
+        renderForms: parameters.renderForms !== false,
         svgFactory: new _display_utils.DOMSVGFactory(),
-        annotationStorage: parameters.annotationStorage || new _annotation_storage.AnnotationStorage()
+        annotationStorage: parameters.annotationStorage || new _annotation_storage.AnnotationStorage(),
+        enableScripting: parameters.enableScripting,
+        hasJSActions: parameters.hasJSActions,
+        fieldObjects: parameters.fieldObjects,
+        mouseState: parameters.mouseState || {
+          isDown: false
+        }
       });
 
       if (element.isRenderable) {
-        parameters.div.appendChild(element.render());
+        const rendered = element.render();
+
+        if (data.hidden) {
+          rendered.style.visibility = "hidden";
+        }
+
+        if (Array.isArray(rendered)) {
+          for (const renderedElement of rendered) {
+            renderedElement.style.zIndex = zIndex++;
+            AnnotationLayer.#appendElement(renderedElement, data.id, div, accessibilityManager);
+          }
+        } else {
+          rendered.style.zIndex = zIndex++;
+
+          if (element instanceof PopupAnnotationElement) {
+            div.prepend(rendered);
+          } else {
+            AnnotationLayer.#appendElement(rendered, data.id, div, accessibilityManager);
+          }
+        }
       }
     }
+
+    this.#setAnnotationCanvasMap(div, parameters.annotationCanvasMap);
   }
 
   static update(parameters) {
-    for (const data of parameters.annotations) {
-      const element = parameters.div.querySelector(`[data-annotation-id="${data.id}"]`);
+    const {
+      annotationCanvasMap,
+      div,
+      viewport
+    } = parameters;
+    this.#setDimensions(div, viewport);
+    this.#setAnnotationCanvasMap(div, annotationCanvasMap);
+    div.hidden = false;
+  }
 
-      if (element) {
-        element.style.transform = `matrix(${parameters.viewport.transform.join(",")})`;
+  static #setDimensions(div, {
+    width,
+    height,
+    rotation
+  }) {
+    const {
+      style
+    } = div;
+    const flipOrientation = rotation % 180 !== 0,
+          widthStr = Math.floor(width) + "px",
+          heightStr = Math.floor(height) + "px";
+    style.width = flipOrientation ? heightStr : widthStr;
+    style.height = flipOrientation ? widthStr : heightStr;
+    div.setAttribute("data-main-rotation", rotation);
+  }
+
+  static #setAnnotationCanvasMap(div, annotationCanvasMap) {
+    if (!annotationCanvasMap) {
+      return;
+    }
+
+    for (const [id, canvas] of annotationCanvasMap) {
+      const element = div.querySelector(`[data-annotation-id="${id}"]`);
+
+      if (!element) {
+        continue;
+      }
+
+      const {
+        firstChild
+      } = element;
+
+      if (!firstChild) {
+        element.append(canvas);
+      } else if (firstChild.nodeName === "CANVAS") {
+        firstChild.replaceWith(canvas);
+      } else {
+        firstChild.before(canvas);
       }
     }
 
-    parameters.div.removeAttribute("hidden");
+    annotationCanvasMap.clear();
   }
 
 }
@@ -10325,442 +15220,833 @@ class AnnotationLayer {
 exports.AnnotationLayer = AnnotationLayer;
 
 /***/ }),
-/* 20 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 28 */
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.renderTextLayer = void 0;
+}));
+exports.ColorConverters = void 0;
 
-var _util = __w_pdfjs_require__(2);
+function makeColorComp(n) {
+  return Math.floor(Math.max(0, Math.min(1, n)) * 255).toString(16).padStart(2, "0");
+}
 
-var renderTextLayer = function renderTextLayerClosure() {
-  var MAX_TEXT_DIVS_TO_RENDER = 100000;
-  var NonWhitespaceRegexp = /\S/;
-
-  function isAllWhitespace(str) {
-    return !NonWhitespaceRegexp.test(str);
+class ColorConverters {
+  static CMYK_G([c, y, m, k]) {
+    return ["G", 1 - Math.min(1, 0.3 * c + 0.59 * m + 0.11 * y + k)];
   }
 
-  function appendText(task, geom, styles) {
-    var textDiv = document.createElement("span");
-    var textDivProperties = {
-      angle: 0,
-      canvasWidth: 0,
-      isWhitespace: false,
-      originalTransform: null,
-      paddingBottom: 0,
-      paddingLeft: 0,
-      paddingRight: 0,
-      paddingTop: 0,
-      scale: 1
-    };
+  static G_CMYK([g]) {
+    return ["CMYK", 0, 0, 0, 1 - g];
+  }
 
-    task._textDivs.push(textDiv);
+  static G_RGB([g]) {
+    return ["RGB", g, g, g];
+  }
 
-    if (isAllWhitespace(geom.str)) {
-      textDivProperties.isWhitespace = true;
+  static G_HTML([g]) {
+    const G = makeColorComp(g);
+    return `#${G}${G}${G}`;
+  }
 
-      task._textDivProperties.set(textDiv, textDivProperties);
+  static RGB_G([r, g, b]) {
+    return ["G", 0.3 * r + 0.59 * g + 0.11 * b];
+  }
 
-      return;
-    }
+  static RGB_HTML([r, g, b]) {
+    const R = makeColorComp(r);
+    const G = makeColorComp(g);
+    const B = makeColorComp(b);
+    return `#${R}${G}${B}`;
+  }
 
-    var tx = _util.Util.transform(task._viewport.transform, geom.transform);
+  static T_HTML() {
+    return "#00000000";
+  }
 
-    var angle = Math.atan2(tx[1], tx[0]);
-    var style = styles[geom.fontName];
+  static CMYK_RGB([c, y, m, k]) {
+    return ["RGB", 1 - Math.min(1, c + k), 1 - Math.min(1, m + k), 1 - Math.min(1, y + k)];
+  }
 
-    if (style.vertical) {
-      angle += Math.PI / 2;
-    }
+  static CMYK_HTML(components) {
+    const rgb = this.CMYK_RGB(components).slice(1);
+    return this.RGB_HTML(rgb);
+  }
 
-    var fontHeight = Math.sqrt(tx[2] * tx[2] + tx[3] * tx[3]);
-    var fontAscent = fontHeight;
+  static RGB_CMYK([r, g, b]) {
+    const c = 1 - r;
+    const m = 1 - g;
+    const y = 1 - b;
+    const k = Math.min(c, m, y);
+    return ["CMYK", c, m, y, k];
+  }
 
-    if (style.ascent) {
-      fontAscent = style.ascent * fontAscent;
-    } else if (style.descent) {
-      fontAscent = (1 + style.descent) * fontAscent;
-    }
+}
 
-    let left, top;
+exports.ColorConverters = ColorConverters;
 
-    if (angle === 0) {
-      left = tx[4];
-      top = tx[5] - fontAscent;
-    } else {
-      left = tx[4] + fontAscent * Math.sin(angle);
-      top = tx[5] - fontAscent * Math.cos(angle);
-    }
+/***/ }),
+/* 29 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
-    textDiv.style.left = `${left}px`;
-    textDiv.style.top = `${top}px`;
-    textDiv.style.fontSize = `${fontHeight}px`;
-    textDiv.style.fontFamily = style.fontFamily;
-    textDiv.textContent = geom.str;
 
-    if (task._fontInspectorEnabled) {
-      textDiv.dataset.fontName = geom.fontName;
-    }
 
-    if (angle !== 0) {
-      textDivProperties.angle = angle * (180 / Math.PI);
-    }
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XfaLayer = void 0;
 
-    let shouldScaleText = false;
+var _xfa_text = __w_pdfjs_require__(20);
 
-    if (geom.str.length > 1) {
-      shouldScaleText = true;
-    } else if (geom.transform[0] !== geom.transform[3]) {
-      const absScaleX = Math.abs(geom.transform[0]),
-            absScaleY = Math.abs(geom.transform[3]);
+class XfaLayer {
+  static setupStorage(html, id, element, storage, intent) {
+    const storedData = storage.getValue(id, {
+      value: null
+    });
 
-      if (absScaleX !== absScaleY && Math.max(absScaleX, absScaleY) / Math.min(absScaleX, absScaleY) > 1.5) {
-        shouldScaleText = true;
-      }
-    }
+    switch (element.name) {
+      case "textarea":
+        if (storedData.value !== null) {
+          html.textContent = storedData.value;
+        }
 
-    if (shouldScaleText) {
-      if (style.vertical) {
-        textDivProperties.canvasWidth = geom.height * task._viewport.scale;
-      } else {
-        textDivProperties.canvasWidth = geom.width * task._viewport.scale;
-      }
-    }
+        if (intent === "print") {
+          break;
+        }
 
-    task._textDivProperties.set(textDiv, textDivProperties);
+        html.addEventListener("input", event => {
+          storage.setValue(id, {
+            value: event.target.value
+          });
+        });
+        break;
 
-    if (task._textContentStream) {
-      task._layoutText(textDiv);
-    }
+      case "input":
+        if (element.attributes.type === "radio" || element.attributes.type === "checkbox") {
+          if (storedData.value === element.attributes.xfaOn) {
+            html.setAttribute("checked", true);
+          } else if (storedData.value === element.attributes.xfaOff) {
+            html.removeAttribute("checked");
+          }
 
-    if (task._enhanceTextSelection) {
-      var angleCos = 1,
-          angleSin = 0;
+          if (intent === "print") {
+            break;
+          }
 
-      if (angle !== 0) {
-        angleCos = Math.cos(angle);
-        angleSin = Math.sin(angle);
-      }
+          html.addEventListener("change", event => {
+            storage.setValue(id, {
+              value: event.target.checked ? event.target.getAttribute("xfaOn") : event.target.getAttribute("xfaOff")
+            });
+          });
+        } else {
+          if (storedData.value !== null) {
+            html.setAttribute("value", storedData.value);
+          }
 
-      var divWidth = (style.vertical ? geom.height : geom.width) * task._viewport.scale;
-      var divHeight = fontHeight;
-      var m, b;
+          if (intent === "print") {
+            break;
+          }
 
-      if (angle !== 0) {
-        m = [angleCos, angleSin, -angleSin, angleCos, left, top];
-        b = _util.Util.getAxialAlignedBoundingBox([0, 0, divWidth, divHeight], m);
-      } else {
-        b = [left, top, left + divWidth, top + divHeight];
-      }
+          html.addEventListener("input", event => {
+            storage.setValue(id, {
+              value: event.target.value
+            });
+          });
+        }
 
-      task._bounds.push({
-        left: b[0],
-        top: b[1],
-        right: b[2],
-        bottom: b[3],
-        div: textDiv,
-        size: [divWidth, divHeight],
-        m
-      });
+        break;
+
+      case "select":
+        if (storedData.value !== null) {
+          for (const option of element.children) {
+            if (option.attributes.value === storedData.value) {
+              option.attributes.selected = true;
+            }
+          }
+        }
+
+        html.addEventListener("input", event => {
+          const options = event.target.options;
+          const value = options.selectedIndex === -1 ? "" : options[options.selectedIndex].value;
+          storage.setValue(id, {
+            value
+          });
+        });
+        break;
     }
   }
 
-  function render(task) {
-    if (task._canceled) {
-      return;
+  static setAttributes({
+    html,
+    element,
+    storage = null,
+    intent,
+    linkService
+  }) {
+    const {
+      attributes
+    } = element;
+    const isHTMLAnchorElement = html instanceof HTMLAnchorElement;
+
+    if (attributes.type === "radio") {
+      attributes.name = `${attributes.name}-${intent}`;
     }
 
-    var textDivs = task._textDivs;
-    var capability = task._capability;
-    var textDivsLength = textDivs.length;
-
-    if (textDivsLength > MAX_TEXT_DIVS_TO_RENDER) {
-      task._renderingDone = true;
-      capability.resolve();
-      return;
-    }
-
-    if (!task._textContentStream) {
-      for (var i = 0; i < textDivsLength; i++) {
-        task._layoutText(textDivs[i]);
-      }
-    }
-
-    task._renderingDone = true;
-    capability.resolve();
-  }
-
-  function findPositiveMin(ts, offset, count) {
-    let result = 0;
-
-    for (let i = 0; i < count; i++) {
-      const t = ts[offset++];
-
-      if (t > 0) {
-        result = result ? Math.min(t, result) : t;
-      }
-    }
-
-    return result;
-  }
-
-  function expand(task) {
-    var bounds = task._bounds;
-    var viewport = task._viewport;
-    var expanded = expandBounds(viewport.width, viewport.height, bounds);
-
-    for (var i = 0; i < expanded.length; i++) {
-      var div = bounds[i].div;
-
-      var divProperties = task._textDivProperties.get(div);
-
-      if (divProperties.angle === 0) {
-        divProperties.paddingLeft = bounds[i].left - expanded[i].left;
-        divProperties.paddingTop = bounds[i].top - expanded[i].top;
-        divProperties.paddingRight = expanded[i].right - bounds[i].right;
-        divProperties.paddingBottom = expanded[i].bottom - bounds[i].bottom;
-
-        task._textDivProperties.set(div, divProperties);
-
+    for (const [key, value] of Object.entries(attributes)) {
+      if (value === null || value === undefined) {
         continue;
       }
 
-      var e = expanded[i],
-          b = bounds[i];
-      var m = b.m,
-          c = m[0],
-          s = m[1];
-      var points = [[0, 0], [0, b.size[1]], [b.size[0], 0], b.size];
-      var ts = new Float64Array(64);
-      points.forEach(function (p, j) {
-        var t = _util.Util.applyTransform(p, m);
+      switch (key) {
+        case "class":
+          if (value.length) {
+            html.setAttribute(key, value.join(" "));
+          }
 
-        ts[j + 0] = c && (e.left - t[0]) / c;
-        ts[j + 4] = s && (e.top - t[1]) / s;
-        ts[j + 8] = c && (e.right - t[0]) / c;
-        ts[j + 12] = s && (e.bottom - t[1]) / s;
-        ts[j + 16] = s && (e.left - t[0]) / -s;
-        ts[j + 20] = c && (e.top - t[1]) / c;
-        ts[j + 24] = s && (e.right - t[0]) / -s;
-        ts[j + 28] = c && (e.bottom - t[1]) / c;
-        ts[j + 32] = c && (e.left - t[0]) / -c;
-        ts[j + 36] = s && (e.top - t[1]) / -s;
-        ts[j + 40] = c && (e.right - t[0]) / -c;
-        ts[j + 44] = s && (e.bottom - t[1]) / -s;
-        ts[j + 48] = s && (e.left - t[0]) / s;
-        ts[j + 52] = c && (e.top - t[1]) / -c;
-        ts[j + 56] = s && (e.right - t[0]) / s;
-        ts[j + 60] = c && (e.bottom - t[1]) / -c;
-      });
-      var boxScale = 1 + Math.min(Math.abs(c), Math.abs(s));
-      divProperties.paddingLeft = findPositiveMin(ts, 32, 16) / boxScale;
-      divProperties.paddingTop = findPositiveMin(ts, 48, 16) / boxScale;
-      divProperties.paddingRight = findPositiveMin(ts, 0, 16) / boxScale;
-      divProperties.paddingBottom = findPositiveMin(ts, 16, 16) / boxScale;
+          break;
 
-      task._textDivProperties.set(div, divProperties);
+        case "dataId":
+          break;
+
+        case "id":
+          html.setAttribute("data-element-id", value);
+          break;
+
+        case "style":
+          Object.assign(html.style, value);
+          break;
+
+        case "textContent":
+          html.textContent = value;
+          break;
+
+        default:
+          if (!isHTMLAnchorElement || key !== "href" && key !== "newWindow") {
+            html.setAttribute(key, value);
+          }
+
+      }
+    }
+
+    if (isHTMLAnchorElement) {
+      linkService.addLinkAttributes(html, attributes.href, attributes.newWindow);
+    }
+
+    if (storage && attributes.dataId) {
+      this.setupStorage(html, attributes.dataId, element, storage);
     }
   }
 
-  function expandBounds(width, height, boxes) {
-    var bounds = boxes.map(function (box, i) {
-      return {
-        x1: box.left,
-        y1: box.top,
-        x2: box.right,
-        y2: box.bottom,
-        index: i,
-        x1New: undefined,
-        x2New: undefined
-      };
-    });
-    expandBoundsLTR(width, bounds);
-    var expanded = new Array(boxes.length);
-    bounds.forEach(function (b) {
-      var i = b.index;
-      expanded[i] = {
-        left: b.x1New,
-        top: 0,
-        right: b.x2New,
-        bottom: 0
-      };
-    });
-    boxes.map(function (box, i) {
-      var e = expanded[i],
-          b = bounds[i];
-      b.x1 = box.top;
-      b.y1 = width - e.right;
-      b.x2 = box.bottom;
-      b.y2 = width - e.left;
-      b.index = i;
-      b.x1New = undefined;
-      b.x2New = undefined;
-    });
-    expandBoundsLTR(height, bounds);
-    bounds.forEach(function (b) {
-      var i = b.index;
-      expanded[i].top = b.x1New;
-      expanded[i].bottom = b.x2New;
-    });
-    return expanded;
+  static render(parameters) {
+    const storage = parameters.annotationStorage;
+    const linkService = parameters.linkService;
+    const root = parameters.xfaHtml;
+    const intent = parameters.intent || "display";
+    const rootHtml = document.createElement(root.name);
+
+    if (root.attributes) {
+      this.setAttributes({
+        html: rootHtml,
+        element: root,
+        intent,
+        linkService
+      });
+    }
+
+    const stack = [[root, -1, rootHtml]];
+    const rootDiv = parameters.div;
+    rootDiv.append(rootHtml);
+
+    if (parameters.viewport) {
+      const transform = `matrix(${parameters.viewport.transform.join(",")})`;
+      rootDiv.style.transform = transform;
+    }
+
+    if (intent !== "richText") {
+      rootDiv.setAttribute("class", "xfaLayer xfaFont");
+    }
+
+    const textDivs = [];
+
+    while (stack.length > 0) {
+      const [parent, i, html] = stack.at(-1);
+
+      if (i + 1 === parent.children.length) {
+        stack.pop();
+        continue;
+      }
+
+      const child = parent.children[++stack.at(-1)[1]];
+
+      if (child === null) {
+        continue;
+      }
+
+      const {
+        name
+      } = child;
+
+      if (name === "#text") {
+        const node = document.createTextNode(child.value);
+        textDivs.push(node);
+        html.append(node);
+        continue;
+      }
+
+      let childHtml;
+
+      if (child?.attributes?.xmlns) {
+        childHtml = document.createElementNS(child.attributes.xmlns, name);
+      } else {
+        childHtml = document.createElement(name);
+      }
+
+      html.append(childHtml);
+
+      if (child.attributes) {
+        this.setAttributes({
+          html: childHtml,
+          element: child,
+          storage,
+          intent,
+          linkService
+        });
+      }
+
+      if (child.children && child.children.length > 0) {
+        stack.push([child, -1, childHtml]);
+      } else if (child.value) {
+        const node = document.createTextNode(child.value);
+
+        if (_xfa_text.XfaText.shouldBuildText(name)) {
+          textDivs.push(node);
+        }
+
+        childHtml.append(node);
+      }
+    }
+
+    for (const el of rootDiv.querySelectorAll(".xfaNonInteractive input, .xfaNonInteractive textarea")) {
+      el.setAttribute("readOnly", true);
+    }
+
+    return {
+      textDivs
+    };
   }
 
-  function expandBoundsLTR(width, bounds) {
-    bounds.sort(function (a, b) {
-      return a.x1 - b.x1 || a.index - b.index;
+  static update(parameters) {
+    const transform = `matrix(${parameters.viewport.transform.join(",")})`;
+    parameters.div.style.transform = transform;
+    parameters.div.hidden = false;
+  }
+
+}
+
+exports.XfaLayer = XfaLayer;
+
+/***/ }),
+/* 30 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.TextLayerRenderTask = void 0;
+exports.renderTextLayer = renderTextLayer;
+
+var _util = __w_pdfjs_require__(1);
+
+var _display_utils = __w_pdfjs_require__(8);
+
+const MAX_TEXT_DIVS_TO_RENDER = 100000;
+const DEFAULT_FONT_SIZE = 30;
+const DEFAULT_FONT_ASCENT = 0.8;
+const ascentCache = new Map();
+const AllWhitespaceRegexp = /^\s+$/g;
+
+function getAscent(fontFamily, ctx) {
+  const cachedAscent = ascentCache.get(fontFamily);
+
+  if (cachedAscent) {
+    return cachedAscent;
+  }
+
+  ctx.save();
+  ctx.font = `${DEFAULT_FONT_SIZE}px ${fontFamily}`;
+  const metrics = ctx.measureText("");
+  let ascent = metrics.fontBoundingBoxAscent;
+  let descent = Math.abs(metrics.fontBoundingBoxDescent);
+
+  if (ascent) {
+    ctx.restore();
+    const ratio = ascent / (ascent + descent);
+    ascentCache.set(fontFamily, ratio);
+    return ratio;
+  }
+
+  ctx.strokeStyle = "red";
+  ctx.clearRect(0, 0, DEFAULT_FONT_SIZE, DEFAULT_FONT_SIZE);
+  ctx.strokeText("g", 0, 0);
+  let pixels = ctx.getImageData(0, 0, DEFAULT_FONT_SIZE, DEFAULT_FONT_SIZE).data;
+  descent = 0;
+
+  for (let i = pixels.length - 1 - 3; i >= 0; i -= 4) {
+    if (pixels[i] > 0) {
+      descent = Math.ceil(i / 4 / DEFAULT_FONT_SIZE);
+      break;
+    }
+  }
+
+  ctx.clearRect(0, 0, DEFAULT_FONT_SIZE, DEFAULT_FONT_SIZE);
+  ctx.strokeText("A", 0, DEFAULT_FONT_SIZE);
+  pixels = ctx.getImageData(0, 0, DEFAULT_FONT_SIZE, DEFAULT_FONT_SIZE).data;
+  ascent = 0;
+
+  for (let i = 0, ii = pixels.length; i < ii; i += 4) {
+    if (pixels[i] > 0) {
+      ascent = DEFAULT_FONT_SIZE - Math.floor(i / 4 / DEFAULT_FONT_SIZE);
+      break;
+    }
+  }
+
+  ctx.restore();
+
+  if (ascent) {
+    const ratio = ascent / (ascent + descent);
+    ascentCache.set(fontFamily, ratio);
+    return ratio;
+  }
+
+  ascentCache.set(fontFamily, DEFAULT_FONT_ASCENT);
+  return DEFAULT_FONT_ASCENT;
+}
+
+function appendText(task, geom, styles, ctx) {
+  const textDiv = document.createElement("span");
+  const textDivProperties = task._enhanceTextSelection ? {
+    angle: 0,
+    canvasWidth: 0,
+    hasText: geom.str !== "",
+    hasEOL: geom.hasEOL,
+    originalTransform: null,
+    paddingBottom: 0,
+    paddingLeft: 0,
+    paddingRight: 0,
+    paddingTop: 0,
+    scale: 1,
+    fontSize: 0
+  } : {
+    angle: 0,
+    canvasWidth: 0,
+    hasText: geom.str !== "",
+    hasEOL: geom.hasEOL,
+    fontSize: 0
+  };
+
+  task._textDivs.push(textDiv);
+
+  const tx = _util.Util.transform(task._viewport.transform, geom.transform);
+
+  let angle = Math.atan2(tx[1], tx[0]);
+  const style = styles[geom.fontName];
+
+  if (style.vertical) {
+    angle += Math.PI / 2;
+  }
+
+  const fontHeight = Math.hypot(tx[2], tx[3]);
+  const fontAscent = fontHeight * getAscent(style.fontFamily, ctx);
+  let left, top;
+
+  if (angle === 0) {
+    left = tx[4];
+    top = tx[5] - fontAscent;
+  } else {
+    left = tx[4] + fontAscent * Math.sin(angle);
+    top = tx[5] - fontAscent * Math.cos(angle);
+  }
+
+  textDiv.style.left = `${left}px`;
+  textDiv.style.top = `${top}px`;
+  textDiv.style.fontSize = `${fontHeight}px`;
+  textDiv.style.fontFamily = style.fontFamily;
+  textDivProperties.fontSize = fontHeight;
+  textDiv.setAttribute("role", "presentation");
+  textDiv.textContent = geom.str;
+  textDiv.dir = geom.dir;
+
+  if (task._fontInspectorEnabled) {
+    textDiv.dataset.fontName = geom.fontName;
+  }
+
+  if (angle !== 0) {
+    textDivProperties.angle = angle * (180 / Math.PI);
+  }
+
+  let shouldScaleText = false;
+
+  if (geom.str.length > 1 || task._enhanceTextSelection && AllWhitespaceRegexp.test(geom.str)) {
+    shouldScaleText = true;
+  } else if (geom.str !== " " && geom.transform[0] !== geom.transform[3]) {
+    const absScaleX = Math.abs(geom.transform[0]),
+          absScaleY = Math.abs(geom.transform[3]);
+
+    if (absScaleX !== absScaleY && Math.max(absScaleX, absScaleY) / Math.min(absScaleX, absScaleY) > 1.5) {
+      shouldScaleText = true;
+    }
+  }
+
+  if (shouldScaleText) {
+    if (style.vertical) {
+      textDivProperties.canvasWidth = geom.height * task._viewport.scale;
+    } else {
+      textDivProperties.canvasWidth = geom.width * task._viewport.scale;
+    }
+  }
+
+  task._textDivProperties.set(textDiv, textDivProperties);
+
+  if (task._textContentStream) {
+    task._layoutText(textDiv);
+  }
+
+  if (task._enhanceTextSelection && textDivProperties.hasText) {
+    let angleCos = 1,
+        angleSin = 0;
+
+    if (angle !== 0) {
+      angleCos = Math.cos(angle);
+      angleSin = Math.sin(angle);
+    }
+
+    const divWidth = (style.vertical ? geom.height : geom.width) * task._viewport.scale;
+    const divHeight = fontHeight;
+    let m, b;
+
+    if (angle !== 0) {
+      m = [angleCos, angleSin, -angleSin, angleCos, left, top];
+      b = _util.Util.getAxialAlignedBoundingBox([0, 0, divWidth, divHeight], m);
+    } else {
+      b = [left, top, left + divWidth, top + divHeight];
+    }
+
+    task._bounds.push({
+      left: b[0],
+      top: b[1],
+      right: b[2],
+      bottom: b[3],
+      div: textDiv,
+      size: [divWidth, divHeight],
+      m
     });
-    var fakeBoundary = {
-      x1: -Infinity,
-      y1: -Infinity,
-      x2: 0,
-      y2: Infinity,
-      index: -1,
-      x1New: 0,
-      x2New: 0
+  }
+}
+
+function render(task) {
+  if (task._canceled) {
+    return;
+  }
+
+  const textDivs = task._textDivs;
+  const capability = task._capability;
+  const textDivsLength = textDivs.length;
+
+  if (textDivsLength > MAX_TEXT_DIVS_TO_RENDER) {
+    task._renderingDone = true;
+    capability.resolve();
+    return;
+  }
+
+  if (!task._textContentStream) {
+    for (let i = 0; i < textDivsLength; i++) {
+      task._layoutText(textDivs[i]);
+    }
+  }
+
+  task._renderingDone = true;
+  capability.resolve();
+}
+
+function findPositiveMin(ts, offset, count) {
+  let result = 0;
+
+  for (let i = 0; i < count; i++) {
+    const t = ts[offset++];
+
+    if (t > 0) {
+      result = result ? Math.min(t, result) : t;
+    }
+  }
+
+  return result;
+}
+
+function expand(task) {
+  const bounds = task._bounds;
+  const viewport = task._viewport;
+  const expanded = expandBounds(viewport.width, viewport.height, bounds);
+
+  for (let i = 0; i < expanded.length; i++) {
+    const div = bounds[i].div;
+
+    const divProperties = task._textDivProperties.get(div);
+
+    if (divProperties.angle === 0) {
+      divProperties.paddingLeft = bounds[i].left - expanded[i].left;
+      divProperties.paddingTop = bounds[i].top - expanded[i].top;
+      divProperties.paddingRight = expanded[i].right - bounds[i].right;
+      divProperties.paddingBottom = expanded[i].bottom - bounds[i].bottom;
+
+      task._textDivProperties.set(div, divProperties);
+
+      continue;
+    }
+
+    const e = expanded[i],
+          b = bounds[i];
+    const m = b.m,
+          c = m[0],
+          s = m[1];
+    const points = [[0, 0], [0, b.size[1]], [b.size[0], 0], b.size];
+    const ts = new Float64Array(64);
+
+    for (let j = 0, jj = points.length; j < jj; j++) {
+      const t = _util.Util.applyTransform(points[j], m);
+
+      ts[j + 0] = c && (e.left - t[0]) / c;
+      ts[j + 4] = s && (e.top - t[1]) / s;
+      ts[j + 8] = c && (e.right - t[0]) / c;
+      ts[j + 12] = s && (e.bottom - t[1]) / s;
+      ts[j + 16] = s && (e.left - t[0]) / -s;
+      ts[j + 20] = c && (e.top - t[1]) / c;
+      ts[j + 24] = s && (e.right - t[0]) / -s;
+      ts[j + 28] = c && (e.bottom - t[1]) / c;
+      ts[j + 32] = c && (e.left - t[0]) / -c;
+      ts[j + 36] = s && (e.top - t[1]) / -s;
+      ts[j + 40] = c && (e.right - t[0]) / -c;
+      ts[j + 44] = s && (e.bottom - t[1]) / -s;
+      ts[j + 48] = s && (e.left - t[0]) / s;
+      ts[j + 52] = c && (e.top - t[1]) / -c;
+      ts[j + 56] = s && (e.right - t[0]) / s;
+      ts[j + 60] = c && (e.bottom - t[1]) / -c;
+    }
+
+    const boxScale = 1 + Math.min(Math.abs(c), Math.abs(s));
+    divProperties.paddingLeft = findPositiveMin(ts, 32, 16) / boxScale;
+    divProperties.paddingTop = findPositiveMin(ts, 48, 16) / boxScale;
+    divProperties.paddingRight = findPositiveMin(ts, 0, 16) / boxScale;
+    divProperties.paddingBottom = findPositiveMin(ts, 16, 16) / boxScale;
+
+    task._textDivProperties.set(div, divProperties);
+  }
+}
+
+function expandBounds(width, height, boxes) {
+  const bounds = boxes.map(function (box, i) {
+    return {
+      x1: box.left,
+      y1: box.top,
+      x2: box.right,
+      y2: box.bottom,
+      index: i,
+      x1New: undefined,
+      x2New: undefined
     };
-    var horizon = [{
-      start: -Infinity,
-      end: Infinity,
-      boundary: fakeBoundary
-    }];
-    bounds.forEach(function (boundary) {
-      var i = 0;
+  });
+  expandBoundsLTR(width, bounds);
+  const expanded = new Array(boxes.length);
 
-      while (i < horizon.length && horizon[i].end <= boundary.y1) {
-        i++;
+  for (const b of bounds) {
+    const i = b.index;
+    expanded[i] = {
+      left: b.x1New,
+      top: 0,
+      right: b.x2New,
+      bottom: 0
+    };
+  }
+
+  boxes.map(function (box, i) {
+    const e = expanded[i],
+          b = bounds[i];
+    b.x1 = box.top;
+    b.y1 = width - e.right;
+    b.x2 = box.bottom;
+    b.y2 = width - e.left;
+    b.index = i;
+    b.x1New = undefined;
+    b.x2New = undefined;
+  });
+  expandBoundsLTR(height, bounds);
+
+  for (const b of bounds) {
+    const i = b.index;
+    expanded[i].top = b.x1New;
+    expanded[i].bottom = b.x2New;
+  }
+
+  return expanded;
+}
+
+function expandBoundsLTR(width, bounds) {
+  bounds.sort(function (a, b) {
+    return a.x1 - b.x1 || a.index - b.index;
+  });
+  const fakeBoundary = {
+    x1: -Infinity,
+    y1: -Infinity,
+    x2: 0,
+    y2: Infinity,
+    index: -1,
+    x1New: 0,
+    x2New: 0
+  };
+  const horizon = [{
+    start: -Infinity,
+    end: Infinity,
+    boundary: fakeBoundary
+  }];
+
+  for (const boundary of bounds) {
+    let i = 0;
+
+    while (i < horizon.length && horizon[i].end <= boundary.y1) {
+      i++;
+    }
+
+    let j = horizon.length - 1;
+
+    while (j >= 0 && horizon[j].start >= boundary.y2) {
+      j--;
+    }
+
+    let horizonPart, affectedBoundary;
+    let q,
+        k,
+        maxXNew = -Infinity;
+
+    for (q = i; q <= j; q++) {
+      horizonPart = horizon[q];
+      affectedBoundary = horizonPart.boundary;
+      let xNew;
+
+      if (affectedBoundary.x2 > boundary.x1) {
+        xNew = affectedBoundary.index > boundary.index ? affectedBoundary.x1New : boundary.x1;
+      } else if (affectedBoundary.x2New === undefined) {
+        xNew = (affectedBoundary.x2 + boundary.x1) / 2;
+      } else {
+        xNew = affectedBoundary.x2New;
       }
 
-      var j = horizon.length - 1;
-
-      while (j >= 0 && horizon[j].start >= boundary.y2) {
-        j--;
+      if (xNew > maxXNew) {
+        maxXNew = xNew;
       }
+    }
 
-      var horizonPart, affectedBoundary;
-      var q,
-          k,
-          maxXNew = -Infinity;
+    boundary.x1New = maxXNew;
 
-      for (q = i; q <= j; q++) {
-        horizonPart = horizon[q];
-        affectedBoundary = horizonPart.boundary;
-        var xNew;
-
-        if (affectedBoundary.x2 > boundary.x1) {
-          xNew = affectedBoundary.index > boundary.index ? affectedBoundary.x1New : boundary.x1;
-        } else if (affectedBoundary.x2New === undefined) {
-          xNew = (affectedBoundary.x2 + boundary.x1) / 2;
-        } else {
-          xNew = affectedBoundary.x2New;
-        }
-
-        if (xNew > maxXNew) {
-          maxXNew = xNew;
-        }
-      }
-
-      boundary.x1New = maxXNew;
-
-      for (q = i; q <= j; q++) {
-        horizonPart = horizon[q];
-        affectedBoundary = horizonPart.boundary;
-
-        if (affectedBoundary.x2New === undefined) {
-          if (affectedBoundary.x2 > boundary.x1) {
-            if (affectedBoundary.index > boundary.index) {
-              affectedBoundary.x2New = affectedBoundary.x2;
-            }
-          } else {
-            affectedBoundary.x2New = maxXNew;
-          }
-        } else if (affectedBoundary.x2New > maxXNew) {
-          affectedBoundary.x2New = Math.max(maxXNew, affectedBoundary.x2);
-        }
-      }
-
-      var changedHorizon = [],
-          lastBoundary = null;
-
-      for (q = i; q <= j; q++) {
-        horizonPart = horizon[q];
-        affectedBoundary = horizonPart.boundary;
-        var useBoundary = affectedBoundary.x2 > boundary.x2 ? affectedBoundary : boundary;
-
-        if (lastBoundary === useBoundary) {
-          changedHorizon[changedHorizon.length - 1].end = horizonPart.end;
-        } else {
-          changedHorizon.push({
-            start: horizonPart.start,
-            end: horizonPart.end,
-            boundary: useBoundary
-          });
-          lastBoundary = useBoundary;
-        }
-      }
-
-      if (horizon[i].start < boundary.y1) {
-        changedHorizon[0].start = boundary.y1;
-        changedHorizon.unshift({
-          start: horizon[i].start,
-          end: boundary.y1,
-          boundary: horizon[i].boundary
-        });
-      }
-
-      if (boundary.y2 < horizon[j].end) {
-        changedHorizon[changedHorizon.length - 1].end = boundary.y2;
-        changedHorizon.push({
-          start: boundary.y2,
-          end: horizon[j].end,
-          boundary: horizon[j].boundary
-        });
-      }
-
-      for (q = i; q <= j; q++) {
-        horizonPart = horizon[q];
-        affectedBoundary = horizonPart.boundary;
-
-        if (affectedBoundary.x2New !== undefined) {
-          continue;
-        }
-
-        var used = false;
-
-        for (k = i - 1; !used && k >= 0 && horizon[k].start >= affectedBoundary.y1; k--) {
-          used = horizon[k].boundary === affectedBoundary;
-        }
-
-        for (k = j + 1; !used && k < horizon.length && horizon[k].end <= affectedBoundary.y2; k++) {
-          used = horizon[k].boundary === affectedBoundary;
-        }
-
-        for (k = 0; !used && k < changedHorizon.length; k++) {
-          used = changedHorizon[k].boundary === affectedBoundary;
-        }
-
-        if (!used) {
-          affectedBoundary.x2New = maxXNew;
-        }
-      }
-
-      Array.prototype.splice.apply(horizon, [i, j - i + 1].concat(changedHorizon));
-    });
-    horizon.forEach(function (horizonPart) {
-      var affectedBoundary = horizonPart.boundary;
+    for (q = i; q <= j; q++) {
+      horizonPart = horizon[q];
+      affectedBoundary = horizonPart.boundary;
 
       if (affectedBoundary.x2New === undefined) {
-        affectedBoundary.x2New = Math.max(width, affectedBoundary.x2);
+        if (affectedBoundary.x2 > boundary.x1) {
+          if (affectedBoundary.index > boundary.index) {
+            affectedBoundary.x2New = affectedBoundary.x2;
+          }
+        } else {
+          affectedBoundary.x2New = maxXNew;
+        }
+      } else if (affectedBoundary.x2New > maxXNew) {
+        affectedBoundary.x2New = Math.max(maxXNew, affectedBoundary.x2);
       }
-    });
+    }
+
+    const changedHorizon = [];
+    let lastBoundary = null;
+
+    for (q = i; q <= j; q++) {
+      horizonPart = horizon[q];
+      affectedBoundary = horizonPart.boundary;
+      const useBoundary = affectedBoundary.x2 > boundary.x2 ? affectedBoundary : boundary;
+
+      if (lastBoundary === useBoundary) {
+        changedHorizon.at(-1).end = horizonPart.end;
+      } else {
+        changedHorizon.push({
+          start: horizonPart.start,
+          end: horizonPart.end,
+          boundary: useBoundary
+        });
+        lastBoundary = useBoundary;
+      }
+    }
+
+    if (horizon[i].start < boundary.y1) {
+      changedHorizon[0].start = boundary.y1;
+      changedHorizon.unshift({
+        start: horizon[i].start,
+        end: boundary.y1,
+        boundary: horizon[i].boundary
+      });
+    }
+
+    if (boundary.y2 < horizon[j].end) {
+      changedHorizon.at(-1).end = boundary.y2;
+      changedHorizon.push({
+        start: boundary.y2,
+        end: horizon[j].end,
+        boundary: horizon[j].boundary
+      });
+    }
+
+    for (q = i; q <= j; q++) {
+      horizonPart = horizon[q];
+      affectedBoundary = horizonPart.boundary;
+
+      if (affectedBoundary.x2New !== undefined) {
+        continue;
+      }
+
+      let used = false;
+
+      for (k = i - 1; !used && k >= 0 && horizon[k].start >= affectedBoundary.y1; k--) {
+        used = horizon[k].boundary === affectedBoundary;
+      }
+
+      for (k = j + 1; !used && k < horizon.length && horizon[k].end <= affectedBoundary.y2; k++) {
+        used = horizon[k].boundary === affectedBoundary;
+      }
+
+      for (k = 0; !used && k < changedHorizon.length; k++) {
+        used = changedHorizon[k].boundary === affectedBoundary;
+      }
+
+      if (!used) {
+        affectedBoundary.x2New = maxXNew;
+      }
+    }
+
+    Array.prototype.splice.apply(horizon, [i, j - i + 1, ...changedHorizon]);
   }
 
-  function TextLayerRenderTask({
+  for (const horizonPart of horizon) {
+    const affectedBoundary = horizonPart.boundary;
+
+    if (affectedBoundary.x2New === undefined) {
+      affectedBoundary.x2New = Math.max(width, affectedBoundary.x2);
+    }
+  }
+}
+
+class TextLayerRenderTask {
+  constructor({
     textContent,
     textContentStream,
     container,
@@ -10769,6 +16055,10 @@ var renderTextLayer = function renderTextLayerClosure() {
     textContentItemsStr,
     enhanceTextSelection
   }) {
+    if (enhanceTextSelection) {
+      (0, _display_utils.deprecated)("The `enhanceTextSelection` functionality will be removed in the future.");
+    }
+
     this._textContent = textContent;
     this._textContentStream = textContentStream;
     this._container = container;
@@ -10777,7 +16067,7 @@ var renderTextLayer = function renderTextLayerClosure() {
     this._textDivs = textDivs || [];
     this._textContentItemsStr = textContentItemsStr || [];
     this._enhanceTextSelection = !!enhanceTextSelection;
-    this._fontInspectorEnabled = !!(globalThis.FontInspector && globalThis.FontInspector.enabled);
+    this._fontInspectorEnabled = !!globalThis.FontInspector?.enabled;
     this._reader = null;
     this._layoutTextLastFontSize = null;
     this._layoutTextLastFontFamily = null;
@@ -10788,8 +16078,13 @@ var renderTextLayer = function renderTextLayerClosure() {
     this._capability = (0, _util.createPromiseCapability)();
     this._renderTimer = null;
     this._bounds = [];
+    this._devicePixelRatio = globalThis.devicePixelRatio || 1;
 
     this._capability.promise.finally(() => {
+      if (!this._enhanceTextSelection) {
+        this._textDivProperties = null;
+      }
+
       if (this._layoutTextCtx) {
         this._layoutTextCtx.canvas.width = 0;
         this._layoutTextCtx.canvas.height = 0;
@@ -10798,252 +16093,280 @@ var renderTextLayer = function renderTextLayerClosure() {
     }).catch(() => {});
   }
 
-  TextLayerRenderTask.prototype = {
-    get promise() {
-      return this._capability.promise;
-    },
-
-    cancel: function TextLayer_cancel() {
-      this._canceled = true;
-
-      if (this._reader) {
-        this._reader.cancel(new _util.AbortException("TextLayer task cancelled."));
-
-        this._reader = null;
-      }
-
-      if (this._renderTimer !== null) {
-        clearTimeout(this._renderTimer);
-        this._renderTimer = null;
-      }
-
-      this._capability.reject(new Error("TextLayer task cancelled."));
-    },
-
-    _processItems(items, styleCache) {
-      for (let i = 0, len = items.length; i < len; i++) {
-        this._textContentItemsStr.push(items[i].str);
-
-        appendText(this, items[i], styleCache);
-      }
-    },
-
-    _layoutText(textDiv) {
-      const textDivProperties = this._textDivProperties.get(textDiv);
-
-      if (textDivProperties.isWhitespace) {
-        return;
-      }
-
-      let transform = "";
-
-      if (textDivProperties.canvasWidth !== 0) {
-        const {
-          fontSize,
-          fontFamily
-        } = textDiv.style;
-
-        if (fontSize !== this._layoutTextLastFontSize || fontFamily !== this._layoutTextLastFontFamily) {
-          this._layoutTextCtx.font = `${fontSize} ${fontFamily}`;
-          this._layoutTextLastFontSize = fontSize;
-          this._layoutTextLastFontFamily = fontFamily;
-        }
-
-        const {
-          width
-        } = this._layoutTextCtx.measureText(textDiv.textContent);
-
-        if (width > 0) {
-          textDivProperties.scale = textDivProperties.canvasWidth / width;
-          transform = `scaleX(${textDivProperties.scale})`;
-        }
-      }
-
-      if (textDivProperties.angle !== 0) {
-        transform = `rotate(${textDivProperties.angle}deg) ${transform}`;
-      }
-
-      if (transform.length > 0) {
-        if (this._enhanceTextSelection) {
-          textDivProperties.originalTransform = transform;
-        }
-
-        textDiv.style.transform = transform;
-      }
-
-      this._textDivProperties.set(textDiv, textDivProperties);
-
-      this._container.appendChild(textDiv);
-    },
-
-    _render: function TextLayer_render(timeout) {
-      const capability = (0, _util.createPromiseCapability)();
-      let styleCache = Object.create(null);
-
-      const canvas = this._document.createElement("canvas");
-
-      canvas.mozOpaque = true;
-      this._layoutTextCtx = canvas.getContext("2d", {
-        alpha: false
-      });
-
-      if (this._textContent) {
-        const textItems = this._textContent.items;
-        const textStyles = this._textContent.styles;
-
-        this._processItems(textItems, textStyles);
-
-        capability.resolve();
-      } else if (this._textContentStream) {
-        const pump = () => {
-          this._reader.read().then(({
-            value,
-            done
-          }) => {
-            if (done) {
-              capability.resolve();
-              return;
-            }
-
-            Object.assign(styleCache, value.styles);
-
-            this._processItems(value.items, styleCache);
-
-            pump();
-          }, capability.reject);
-        };
-
-        this._reader = this._textContentStream.getReader();
-        pump();
-      } else {
-        throw new Error('Neither "textContent" nor "textContentStream"' + " parameters specified.");
-      }
-
-      capability.promise.then(() => {
-        styleCache = null;
-
-        if (!timeout) {
-          render(this);
-        } else {
-          this._renderTimer = setTimeout(() => {
-            render(this);
-            this._renderTimer = null;
-          }, timeout);
-        }
-      }, this._capability.reject);
-    },
-    expandTextDivs: function TextLayer_expandTextDivs(expandDivs) {
-      if (!this._enhanceTextSelection || !this._renderingDone) {
-        return;
-      }
-
-      if (this._bounds !== null) {
-        expand(this);
-        this._bounds = null;
-      }
-
-      const transformBuf = [],
-            paddingBuf = [];
-
-      for (var i = 0, ii = this._textDivs.length; i < ii; i++) {
-        const div = this._textDivs[i];
-
-        const divProps = this._textDivProperties.get(div);
-
-        if (divProps.isWhitespace) {
-          continue;
-        }
-
-        if (expandDivs) {
-          transformBuf.length = 0;
-          paddingBuf.length = 0;
-
-          if (divProps.originalTransform) {
-            transformBuf.push(divProps.originalTransform);
-          }
-
-          if (divProps.paddingTop > 0) {
-            paddingBuf.push(`${divProps.paddingTop}px`);
-            transformBuf.push(`translateY(${-divProps.paddingTop}px)`);
-          } else {
-            paddingBuf.push(0);
-          }
-
-          if (divProps.paddingRight > 0) {
-            paddingBuf.push(`${divProps.paddingRight / divProps.scale}px`);
-          } else {
-            paddingBuf.push(0);
-          }
-
-          if (divProps.paddingBottom > 0) {
-            paddingBuf.push(`${divProps.paddingBottom}px`);
-          } else {
-            paddingBuf.push(0);
-          }
-
-          if (divProps.paddingLeft > 0) {
-            paddingBuf.push(`${divProps.paddingLeft / divProps.scale}px`);
-            transformBuf.push(`translateX(${-divProps.paddingLeft / divProps.scale}px)`);
-          } else {
-            paddingBuf.push(0);
-          }
-
-          div.style.padding = paddingBuf.join(" ");
-
-          if (transformBuf.length) {
-            div.style.transform = transformBuf.join(" ");
-          }
-        } else {
-          div.style.padding = null;
-          div.style.transform = divProps.originalTransform;
-        }
-      }
-    }
-  };
-
-  function renderTextLayer(renderParameters) {
-    var task = new TextLayerRenderTask({
-      textContent: renderParameters.textContent,
-      textContentStream: renderParameters.textContentStream,
-      container: renderParameters.container,
-      viewport: renderParameters.viewport,
-      textDivs: renderParameters.textDivs,
-      textContentItemsStr: renderParameters.textContentItemsStr,
-      enhanceTextSelection: renderParameters.enhanceTextSelection
-    });
-
-    task._render(renderParameters.timeout);
-
-    return task;
+  get promise() {
+    return this._capability.promise;
   }
 
-  return renderTextLayer;
-}();
+  cancel() {
+    this._canceled = true;
 
-exports.renderTextLayer = renderTextLayer;
+    if (this._reader) {
+      this._reader.cancel(new _util.AbortException("TextLayer task cancelled.")).catch(() => {});
+
+      this._reader = null;
+    }
+
+    if (this._renderTimer !== null) {
+      clearTimeout(this._renderTimer);
+      this._renderTimer = null;
+    }
+
+    this._capability.reject(new Error("TextLayer task cancelled."));
+  }
+
+  _processItems(items, styleCache) {
+    for (let i = 0, len = items.length; i < len; i++) {
+      if (items[i].str === undefined) {
+        if (items[i].type === "beginMarkedContentProps" || items[i].type === "beginMarkedContent") {
+          const parent = this._container;
+          this._container = document.createElement("span");
+
+          this._container.classList.add("markedContent");
+
+          if (items[i].id !== null) {
+            this._container.setAttribute("id", `${items[i].id}`);
+          }
+
+          parent.append(this._container);
+        } else if (items[i].type === "endMarkedContent") {
+          this._container = this._container.parentNode;
+        }
+
+        continue;
+      }
+
+      this._textContentItemsStr.push(items[i].str);
+
+      appendText(this, items[i], styleCache, this._layoutTextCtx);
+    }
+  }
+
+  _layoutText(textDiv) {
+    const textDivProperties = this._textDivProperties.get(textDiv);
+
+    let transform = "";
+
+    if (textDivProperties.canvasWidth !== 0 && textDivProperties.hasText) {
+      const {
+        fontFamily
+      } = textDiv.style;
+      const {
+        fontSize
+      } = textDivProperties;
+
+      if (fontSize !== this._layoutTextLastFontSize || fontFamily !== this._layoutTextLastFontFamily) {
+        this._layoutTextCtx.font = `${fontSize * this._devicePixelRatio}px ${fontFamily}`;
+        this._layoutTextLastFontSize = fontSize;
+        this._layoutTextLastFontFamily = fontFamily;
+      }
+
+      const {
+        width
+      } = this._layoutTextCtx.measureText(textDiv.textContent);
+
+      if (width > 0) {
+        const scale = this._devicePixelRatio * textDivProperties.canvasWidth / width;
+
+        if (this._enhanceTextSelection) {
+          textDivProperties.scale = scale;
+        }
+
+        transform = `scaleX(${scale})`;
+      }
+    }
+
+    if (textDivProperties.angle !== 0) {
+      transform = `rotate(${textDivProperties.angle}deg) ${transform}`;
+    }
+
+    if (transform.length > 0) {
+      if (this._enhanceTextSelection) {
+        textDivProperties.originalTransform = transform;
+      }
+
+      textDiv.style.transform = transform;
+    }
+
+    if (textDivProperties.hasText) {
+      this._container.append(textDiv);
+    }
+
+    if (textDivProperties.hasEOL) {
+      const br = document.createElement("br");
+      br.setAttribute("role", "presentation");
+
+      this._container.append(br);
+    }
+  }
+
+  _render(timeout = 0) {
+    const capability = (0, _util.createPromiseCapability)();
+    let styleCache = Object.create(null);
+
+    const canvas = this._document.createElement("canvas");
+
+    canvas.height = canvas.width = DEFAULT_FONT_SIZE;
+    this._layoutTextCtx = canvas.getContext("2d", {
+      alpha: false
+    });
+
+    if (this._textContent) {
+      const textItems = this._textContent.items;
+      const textStyles = this._textContent.styles;
+
+      this._processItems(textItems, textStyles);
+
+      capability.resolve();
+    } else if (this._textContentStream) {
+      const pump = () => {
+        this._reader.read().then(({
+          value,
+          done
+        }) => {
+          if (done) {
+            capability.resolve();
+            return;
+          }
+
+          Object.assign(styleCache, value.styles);
+
+          this._processItems(value.items, styleCache);
+
+          pump();
+        }, capability.reject);
+      };
+
+      this._reader = this._textContentStream.getReader();
+      pump();
+    } else {
+      throw new Error('Neither "textContent" nor "textContentStream" parameters specified.');
+    }
+
+    capability.promise.then(() => {
+      styleCache = null;
+
+      if (!timeout) {
+        render(this);
+      } else {
+        this._renderTimer = setTimeout(() => {
+          render(this);
+          this._renderTimer = null;
+        }, timeout);
+      }
+    }, this._capability.reject);
+  }
+
+  expandTextDivs(expandDivs = false) {
+    if (!this._enhanceTextSelection || !this._renderingDone) {
+      return;
+    }
+
+    if (this._bounds !== null) {
+      expand(this);
+      this._bounds = null;
+    }
+
+    const transformBuf = [],
+          paddingBuf = [];
+
+    for (let i = 0, ii = this._textDivs.length; i < ii; i++) {
+      const div = this._textDivs[i];
+
+      const divProps = this._textDivProperties.get(div);
+
+      if (!divProps.hasText) {
+        continue;
+      }
+
+      if (expandDivs) {
+        transformBuf.length = 0;
+        paddingBuf.length = 0;
+
+        if (divProps.originalTransform) {
+          transformBuf.push(divProps.originalTransform);
+        }
+
+        if (divProps.paddingTop > 0) {
+          paddingBuf.push(`${divProps.paddingTop}px`);
+          transformBuf.push(`translateY(${-divProps.paddingTop}px)`);
+        } else {
+          paddingBuf.push(0);
+        }
+
+        if (divProps.paddingRight > 0) {
+          paddingBuf.push(`${divProps.paddingRight / divProps.scale}px`);
+        } else {
+          paddingBuf.push(0);
+        }
+
+        if (divProps.paddingBottom > 0) {
+          paddingBuf.push(`${divProps.paddingBottom}px`);
+        } else {
+          paddingBuf.push(0);
+        }
+
+        if (divProps.paddingLeft > 0) {
+          paddingBuf.push(`${divProps.paddingLeft / divProps.scale}px`);
+          transformBuf.push(`translateX(${-divProps.paddingLeft / divProps.scale}px)`);
+        } else {
+          paddingBuf.push(0);
+        }
+
+        div.style.padding = paddingBuf.join(" ");
+
+        if (transformBuf.length) {
+          div.style.transform = transformBuf.join(" ");
+        }
+      } else {
+        div.style.padding = null;
+        div.style.transform = divProps.originalTransform;
+      }
+    }
+  }
+
+}
+
+exports.TextLayerRenderTask = TextLayerRenderTask;
+
+function renderTextLayer(renderParameters) {
+  const task = new TextLayerRenderTask({
+    textContent: renderParameters.textContent,
+    textContentStream: renderParameters.textContentStream,
+    container: renderParameters.container,
+    viewport: renderParameters.viewport,
+    textDivs: renderParameters.textDivs,
+    textContentItemsStr: renderParameters.textContentItemsStr,
+    enhanceTextSelection: renderParameters.enhanceTextSelection
+  });
+
+  task._render(renderParameters.timeout);
+
+  return task;
+}
 
 /***/ }),
-/* 21 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 31 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.SVGGraphics = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _display_utils = __w_pdfjs_require__(8);
 
-var _display_utils = __w_pdfjs_require__(1);
+var _util = __w_pdfjs_require__(1);
 
-var _is_node = __w_pdfjs_require__(4);
+var _is_node = __w_pdfjs_require__(3);
+
+let SVGGraphics = class {
+  constructor() {
+    (0, _util.unreachable)("Not implemented: SVGGraphics");
+  }
 
-let SVGGraphics = function () {
-  throw new Error("Not implemented: SVGGraphics");
 };
-
 exports.SVGGraphics = SVGGraphics;
 {
   const SVG_DEFAULTS = {
@@ -11056,6 +16379,30 @@ exports.SVGGraphics = SVGGraphics;
   const LINE_CAP_STYLES = ["butt", "round", "square"];
   const LINE_JOIN_STYLES = ["miter", "round", "bevel"];
 
+  const createObjectURL = function (data, contentType = "", forceDataSchema = false) {
+    if (URL.createObjectURL && typeof Blob !== "undefined" && !forceDataSchema) {
+      return URL.createObjectURL(new Blob([data], {
+        type: contentType
+      }));
+    }
+
+    const digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+    let buffer = `data:${contentType};base64,`;
+
+    for (let i = 0, ii = data.length; i < ii; i += 3) {
+      const b1 = data[i] & 0xff;
+      const b2 = data[i + 1] & 0xff;
+      const b3 = data[i + 2] & 0xff;
+      const d1 = b1 >> 2,
+            d2 = (b1 & 3) << 4 | b2 >> 4;
+      const d3 = i + 1 < ii ? (b2 & 0xf) << 2 | b3 >> 6 : 64;
+      const d4 = i + 2 < ii ? b3 & 0x3f : 64;
+      buffer += digits[d1] + digits[d2] + digits[d3] + digits[d4];
+    }
+
+    return buffer;
+  };
+
   const convertImgDataToPng = function () {
     const PNG_HEADER = new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
     const CHUNK_WRAPPER_SIZE = 12;
@@ -11248,7 +16595,7 @@ exports.SVGGraphics = SVGGraphics;
       writePngChunk("IDATA", idat, data, offset);
       offset += CHUNK_WRAPPER_SIZE + idat.length;
       writePngChunk("IEND", new Uint8Array(0), data, offset);
-      return (0, _util.createObjectURL)(data, "image/png", forceDataSchema);
+      return createObjectURL(data, "image/png", forceDataSchema);
     }
 
     return function convertImgDataToPng(imgData, forceDataSchema, isMask) {
@@ -11314,7 +16661,7 @@ exports.SVGGraphics = SVGGraphics;
           items: []
         });
         tmp.push(opTree);
-        opTree = opTree[opTree.length - 1].items;
+        opTree = opTree.at(-1).items;
         continue;
       }
 
@@ -11373,8 +16720,9 @@ exports.SVGGraphics = SVGGraphics;
   let clipCount = 0;
   let maskCount = 0;
   let shadingCount = 0;
-  exports.SVGGraphics = SVGGraphics = class SVGGraphics {
+  exports.SVGGraphics = SVGGraphics = class {
     constructor(commonObjs, objs, forceDataSchema = false) {
+      (0, _display_utils.deprecated)("The SVG back-end is no longer maintained and *may* be removed in the future.");
       this.svgFactory = new _display_utils.DOMSVGFactory();
       this.current = new SVGExtraState();
       this.transformMatrix = _util.IDENTITY_MATRIX;
@@ -11700,7 +17048,7 @@ exports.SVGGraphics = SVGGraphics;
     setTextMatrix(a, b, c, d, e, f) {
       const current = this.current;
       current.textMatrix = current.lineMatrix = [a, b, c, d, e, f];
-      current.textMatrixScale = Math.sqrt(a * a + b * b);
+      current.textMatrixScale = Math.hypot(a, b);
       current.x = current.lineX = 0;
       current.y = current.lineY = 0;
       current.xcoords = [];
@@ -11710,7 +17058,7 @@ exports.SVGGraphics = SVGGraphics;
       current.tspan.setAttributeNS(null, "font-size", `${pf(current.fontSize)}px`);
       current.tspan.setAttributeNS(null, "y", pf(-current.y));
       current.txtElement = this.svgFactory.createElement("svg:text");
-      current.txtElement.appendChild(current.tspan);
+      current.txtElement.append(current.tspan);
     }
 
     beginText() {
@@ -11763,7 +17111,7 @@ exports.SVGGraphics = SVGGraphics;
         if (glyph === null) {
           x += fontDirection * wordSpacing;
           continue;
-        } else if ((0, _util.isNum)(glyph)) {
+        } else if (typeof glyph === "number") {
           x += spacingDir * glyph * fontSize / 1000;
           continue;
         }
@@ -11864,10 +17212,10 @@ exports.SVGGraphics = SVGGraphics;
 
       current.txtElement.setAttributeNS(null, "transform", `${pm(textMatrix)} scale(${pf(textHScale)}, -1)`);
       current.txtElement.setAttributeNS(XML_NS, "xml:space", "preserve");
-      current.txtElement.appendChild(current.tspan);
-      current.txtgrp.appendChild(current.txtElement);
+      current.txtElement.append(current.tspan);
+      current.txtgrp.append(current.txtElement);
 
-      this._ensureTransformGroup().appendChild(current.txtElement);
+      this._ensureTransformGroup().append(current.txtElement);
     }
 
     setLeadingMoveText(x, y) {
@@ -11883,10 +17231,10 @@ exports.SVGGraphics = SVGGraphics;
       if (!this.cssStyle) {
         this.cssStyle = this.svgFactory.createElement("svg:style");
         this.cssStyle.setAttributeNS(null, "type", "text/css");
-        this.defs.appendChild(this.cssStyle);
+        this.defs.append(this.cssStyle);
       }
 
-      const url = (0, _util.createObjectURL)(fontObj.data, fontObj.mimetype, this.forceDataSchema);
+      const url = createObjectURL(fontObj.data, fontObj.mimetype, this.forceDataSchema);
       this.cssStyle.textContent += `@font-face { font-family: "${fontObj.loadedName}";` + ` src: url(${url}); }\n`;
     }
 
@@ -11901,7 +17249,7 @@ exports.SVGGraphics = SVGGraphics;
         this.embeddedFonts[fontObj.loadedName] = fontObj;
       }
 
-      current.fontMatrix = fontObj.fontMatrix ? fontObj.fontMatrix : _util.FONT_IDENTITY_MATRIX;
+      current.fontMatrix = fontObj.fontMatrix || _util.FONT_IDENTITY_MATRIX;
       let bold = "normal";
 
       if (fontObj.black) {
@@ -11932,7 +17280,7 @@ exports.SVGGraphics = SVGGraphics;
     endText() {
       const current = this.current;
 
-      if (current.textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG && current.txtElement && current.txtElement.hasChildNodes()) {
+      if (current.textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG && current.txtElement?.hasChildNodes()) {
         current.element = current.txtElement;
         this.clip("nonzero");
         this.endPath();
@@ -11962,7 +17310,7 @@ exports.SVGGraphics = SVGGraphics;
     }
 
     setStrokeRGBColor(r, g, b) {
-      this.current.strokeColor = _util.Util.makeCssRgb(r, g, b);
+      this.current.strokeColor = _util.Util.makeHexColor(r, g, b);
     }
 
     setFillAlpha(fillAlpha) {
@@ -11970,7 +17318,7 @@ exports.SVGGraphics = SVGGraphics;
     }
 
     setFillRGBColor(r, g, b) {
-      this.current.fillColor = _util.Util.makeCssRgb(r, g, b);
+      this.current.fillColor = _util.Util.makeHexColor(r, g, b);
       this.current.tspan = this.svgFactory.createElement("svg:tspan");
       this.current.xcoords = [];
       this.current.ycoords = [];
@@ -12013,7 +17361,7 @@ exports.SVGGraphics = SVGGraphics;
         rect.setAttributeNS(null, "fill-opacity", this.current.fillAlpha);
       }
 
-      this._ensureTransformGroup().appendChild(rect);
+      this._ensureTransformGroup().append(rect);
     }
 
     _makeColorN_Pattern(args) {
@@ -12034,9 +17382,7 @@ exports.SVGGraphics = SVGGraphics;
       const paintType = args[7];
       const tilingId = `shading${shadingCount++}`;
 
-      const [tx0, ty0] = _util.Util.applyTransform([x0, y0], matrix);
-
-      const [tx1, ty1] = _util.Util.applyTransform([x1, y1], matrix);
+      const [tx0, ty0, tx1, ty1] = _util.Util.normalizeRect([..._util.Util.applyTransform([x0, y0], matrix), ..._util.Util.applyTransform([x1, y1], matrix)]);
 
       const [xscale, yscale] = _util.Util.singularValueDecompose2dScale(matrix);
 
@@ -12058,7 +17404,7 @@ exports.SVGGraphics = SVGGraphics;
       this.transformMatrix = matrix;
 
       if (paintType === 2) {
-        const cssColor = _util.Util.makeCssRgb(...color);
+        const cssColor = _util.Util.makeHexColor(...color);
 
         this.current.fillColor = cssColor;
         this.current.strokeColor = cssColor;
@@ -12069,12 +17415,16 @@ exports.SVGGraphics = SVGGraphics;
       this.transformMatrix = transformMatrix;
       this.current.fillColor = fillColor;
       this.current.strokeColor = strokeColor;
-      tiling.appendChild(bbox.childNodes[0]);
-      this.defs.appendChild(tiling);
+      tiling.append(bbox.childNodes[0]);
+      this.defs.append(tiling);
       return `url(#${tilingId})`;
     }
 
     _makeShadingPattern(args) {
+      if (typeof args === "string") {
+        args = this.objs.get(args);
+      }
+
       switch (args[0]) {
         case "RadialAxial":
           const shadingId = `shading${shadingCount++}`;
@@ -12118,10 +17468,10 @@ exports.SVGGraphics = SVGGraphics;
             const stop = this.svgFactory.createElement("svg:stop");
             stop.setAttributeNS(null, "offset", colorStop[0]);
             stop.setAttributeNS(null, "stop-color", colorStop[1]);
-            gradient.appendChild(stop);
+            gradient.append(stop);
           }
 
-          this.defs.appendChild(gradient);
+          this.defs.append(gradient);
           return `url(#${shadingId})`;
 
         case "Mesh":
@@ -12206,7 +17556,7 @@ exports.SVGGraphics = SVGGraphics;
       } else {
         current.path = this.svgFactory.createElement("svg:path");
 
-        this._ensureTransformGroup().appendChild(current.path);
+        this._ensureTransformGroup().append(current.path);
       }
 
       current.path.setAttributeNS(null, "d", d);
@@ -12241,14 +17591,16 @@ exports.SVGGraphics = SVGGraphics;
       }
 
       this.pendingClip = null;
-      clipPath.appendChild(clipElement);
-      this.defs.appendChild(clipPath);
+      clipPath.append(clipElement);
+      this.defs.append(clipPath);
 
       if (current.activeClipUrl) {
         current.clipGroup = null;
-        this.extraStack.forEach(function (prev) {
+
+        for (const prev of this.extraStack) {
           prev.clipGroup = null;
-        });
+        }
+
         clipPath.setAttributeNS(null, "clip-path", current.activeClipUrl);
       }
 
@@ -12424,7 +17776,7 @@ exports.SVGGraphics = SVGGraphics;
       rect.setAttributeNS(null, "height", "1px");
       rect.setAttributeNS(null, "fill", this.current.fillColor);
 
-      this._ensureTransformGroup().appendChild(rect);
+      this._ensureTransformGroup().append(rect);
     }
 
     paintImageXObject(objId) {
@@ -12458,9 +17810,9 @@ exports.SVGGraphics = SVGGraphics;
       imgEl.setAttributeNS(null, "transform", `scale(${pf(1 / width)} ${pf(-1 / height)})`);
 
       if (mask) {
-        mask.appendChild(imgEl);
+        mask.append(imgEl);
       } else {
-        this._ensureTransformGroup().appendChild(imgEl);
+        this._ensureTransformGroup().append(imgEl);
       }
     }
 
@@ -12479,9 +17831,9 @@ exports.SVGGraphics = SVGGraphics;
       rect.setAttributeNS(null, "height", pf(height));
       rect.setAttributeNS(null, "fill", fillColor);
       rect.setAttributeNS(null, "mask", `url(#${current.maskId})`);
-      this.defs.appendChild(mask);
+      this.defs.append(mask);
 
-      this._ensureTransformGroup().appendChild(rect);
+      this._ensureTransformGroup().append(rect);
 
       this.paintInlineImageXObject(imgData, mask);
     }
@@ -12510,11 +17862,11 @@ exports.SVGGraphics = SVGGraphics;
     _initialize(viewport) {
       const svg = this.svgFactory.create(viewport.width, viewport.height);
       const definitions = this.svgFactory.createElement("svg:defs");
-      svg.appendChild(definitions);
+      svg.append(definitions);
       this.defs = definitions;
       const rootGroup = this.svgFactory.createElement("svg:g");
       rootGroup.setAttributeNS(null, "transform", pm(viewport.transform));
-      svg.appendChild(rootGroup);
+      svg.append(rootGroup);
       this.svg = rootGroup;
       return svg;
     }
@@ -12523,7 +17875,7 @@ exports.SVGGraphics = SVGGraphics;
       if (!this.current.clipGroup) {
         const clipGroup = this.svgFactory.createElement("svg:g");
         clipGroup.setAttributeNS(null, "clip-path", this.current.activeClipUrl);
-        this.svg.appendChild(clipGroup);
+        this.svg.append(clipGroup);
         this.current.clipGroup = clipGroup;
       }
 
@@ -12536,9 +17888,9 @@ exports.SVGGraphics = SVGGraphics;
         this.tgrp.setAttributeNS(null, "transform", pm(this.transformMatrix));
 
         if (this.current.activeClipUrl) {
-          this._ensureClipGroup().appendChild(this.tgrp);
+          this._ensureClipGroup().append(this.tgrp);
         } else {
-          this.svg.appendChild(this.tgrp);
+          this.svg.append(this.tgrp);
         }
       }
 
@@ -12549,20 +17901,19 @@ exports.SVGGraphics = SVGGraphics;
 }
 
 /***/ }),
-/* 22 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 32 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFNodeStream = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
 
-var _network_utils = __w_pdfjs_require__(23);
+var _network_utils = __w_pdfjs_require__(33);
 
 ;
 
@@ -12606,7 +17957,7 @@ class PDFNodeStream {
   }
 
   get _progressiveDataLength() {
-    return this._fullRequestReader ? this._fullRequestReader._loaded : 0;
+    return this._fullRequestReader?._loaded ?? 0;
   }
 
   getFullReader() {
@@ -12632,11 +17983,9 @@ class PDFNodeStream {
       this._fullRequestReader.cancel(reason);
     }
 
-    const readers = this._rangeRequestReaders.slice(0);
-
-    readers.forEach(function (reader) {
+    for (const reader of this._rangeRequestReaders.slice(0)) {
       reader.cancel(reason);
-    });
+    }
   }
 
 }
@@ -13018,23 +18367,24 @@ class PDFNodeStreamFsRangeReader extends BaseRangeReader {
 }
 
 /***/ }),
-/* 23 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 33 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.createResponseStatusError = createResponseStatusError;
 exports.extractFilenameFromHeader = extractFilenameFromHeader;
 exports.validateRangeRequestCapabilities = validateRangeRequestCapabilities;
 exports.validateResponseStatus = validateResponseStatus;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
 
-var _content_disposition = __w_pdfjs_require__(24);
+var _content_disposition = __w_pdfjs_require__(34);
+
+var _display_utils = __w_pdfjs_require__(8);
 
 function validateRangeRequestCapabilities({
   getResponseHeader,
@@ -13042,7 +18392,6 @@ function validateRangeRequestCapabilities({
   rangeChunkSize,
   disableRange
 }) {
-  (0, _util.assert)(rangeChunkSize > 0, "Range chunk size must be larger than zero");
   const returnValues = {
     allowRangeRequests: false,
     suggestedLength: undefined
@@ -13089,7 +18438,7 @@ function extractFilenameFromHeader(getResponseHeader) {
       } catch (ex) {}
     }
 
-    if (/\.pdf$/i.test(filename)) {
+    if ((0, _display_utils.isPdfFile)(filename)) {
       return filename;
     }
   }
@@ -13102,7 +18451,7 @@ function createResponseStatusError(status, url) {
     return new _util.MissingPDFException('Missing PDF "' + url + '".');
   }
 
-  return new _util.UnexpectedResponseException("Unexpected server response (" + status + ') while retrieving PDF "' + url + '".', status);
+  return new _util.UnexpectedResponseException(`Unexpected server response (${status}) while retrieving PDF "${url}".`, status);
 }
 
 function validateResponseStatus(status) {
@@ -13110,17 +18459,18 @@ function validateResponseStatus(status) {
 }
 
 /***/ }),
-/* 24 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 34 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.getFilenameFromContentDispositionHeader = getFilenameFromContentDispositionHeader;
 
+var _util = __w_pdfjs_require__(1);
+
 function getFilenameFromContentDispositionHeader(contentDisposition) {
   let needsEncodingFixup = true;
   let tmp = toParamRegExp("filename\\*", "i").exec(contentDisposition);
@@ -13164,19 +18514,10 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
         const decoder = new TextDecoder(encoding, {
           fatal: true
         });
-        const bytes = Array.from(value, function (ch) {
-          return ch.charCodeAt(0) & 0xff;
-        });
-        value = decoder.decode(new Uint8Array(bytes));
+        const buffer = (0, _util.stringToBytes)(value);
+        value = decoder.decode(buffer);
         needsEncodingFixup = false;
-      } catch (e) {
-        if (/^utf-?8$/i.test(encoding)) {
-          try {
-            value = decodeURIComponent(escape(value));
-            needsEncodingFixup = false;
-          } catch (err) {}
-        }
-      }
+      } catch (e) {}
     }
 
     return value;
@@ -13298,20 +18639,19 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
 }
 
 /***/ }),
-/* 25 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 35 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFNetworkStream = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
 
-var _network_utils = __w_pdfjs_require__(23);
+var _network_utils = __w_pdfjs_require__(33);
 
 ;
 const OK_RESPONSE = 200;
@@ -13329,11 +18669,10 @@ function getArrayBuffer(xhr) {
 }
 
 class NetworkManager {
-  constructor(url, args) {
+  constructor(url, args = {}) {
     this.url = url;
-    args = args || {};
     this.isHttp = /^https?:/i.test(url);
-    this.httpHeaders = this.isHttp && args.httpHeaders || {};
+    this.httpHeaders = this.isHttp && args.httpHeaders || Object.create(null);
     this.withCredentials = args.withCredentials || false;
 
     this.getXhr = args.getXhr || function NetworkManager_getXhr() {
@@ -13412,9 +18751,7 @@ class NetworkManager {
       return;
     }
 
-    if (pendingRequest.onProgress) {
-      pendingRequest.onProgress(evt);
-    }
+    pendingRequest.onProgress?.(evt);
   }
 
   onStateChange(xhrId, evt) {
@@ -13442,10 +18779,7 @@ class NetworkManager {
     delete this.pendingRequests[xhrId];
 
     if (xhr.status === 0 && this.isHttp) {
-      if (pendingRequest.onError) {
-        pendingRequest.onError(xhr.status);
-      }
-
+      pendingRequest.onError?.(xhr.status);
       return;
     }
 
@@ -13453,10 +18787,7 @@ class NetworkManager {
     const ok_response_on_range_request = xhrStatus === OK_RESPONSE && pendingRequest.expectedStatus === PARTIAL_CONTENT_RESPONSE;
 
     if (!ok_response_on_range_request && xhrStatus !== pendingRequest.expectedStatus) {
-      if (pendingRequest.onError) {
-        pendingRequest.onError(xhr.status);
-      }
-
+      pendingRequest.onError?.(xhr.status);
       return;
     }
 
@@ -13474,8 +18805,8 @@ class NetworkManager {
         begin: 0,
         chunk
       });
-    } else if (pendingRequest.onError) {
-      pendingRequest.onError(xhr.status);
+    } else {
+      pendingRequest.onError?.(xhr.status);
     }
   }
 
@@ -13531,15 +18862,11 @@ class PDFNetworkStream {
   }
 
   cancelAllRequests(reason) {
-    if (this._fullRequestReader) {
-      this._fullRequestReader.cancel(reason);
-    }
+    this._fullRequestReader?.cancel(reason);
 
-    const readers = this._rangeRequestReaders.slice(0);
-
-    readers.forEach(function (reader) {
+    for (const reader of this._rangeRequestReaders.slice(0)) {
       reader.cancel(reason);
-    });
+    }
   }
 
 }
@@ -13609,17 +18936,17 @@ class PDFNetworkStreamFullRequestReader {
     this._headersReceivedCapability.resolve();
   }
 
-  _onDone(args) {
-    if (args) {
+  _onDone(data) {
+    if (data) {
       if (this._requests.length > 0) {
         const requestCapability = this._requests.shift();
 
         requestCapability.resolve({
-          value: args.chunk,
+          value: data.chunk,
           done: false
         });
       } else {
-        this._cachedChunks.push(args.chunk);
+        this._cachedChunks.push(data.chunk);
       }
     }
 
@@ -13629,38 +18956,34 @@ class PDFNetworkStreamFullRequestReader {
       return;
     }
 
-    this._requests.forEach(function (requestCapability) {
+    for (const requestCapability of this._requests) {
       requestCapability.resolve({
         value: undefined,
         done: true
       });
-    });
+    }
 
-    this._requests = [];
+    this._requests.length = 0;
   }
 
   _onError(status) {
-    const url = this._url;
-    const exception = (0, _network_utils.createResponseStatusError)(status, url);
-    this._storedError = exception;
+    this._storedError = (0, _network_utils.createResponseStatusError)(status, this._url);
 
-    this._headersReceivedCapability.reject(exception);
+    this._headersReceivedCapability.reject(this._storedError);
 
-    this._requests.forEach(function (requestCapability) {
-      requestCapability.reject(exception);
-    });
+    for (const requestCapability of this._requests) {
+      requestCapability.reject(this._storedError);
+    }
 
-    this._requests = [];
-    this._cachedChunks = [];
+    this._requests.length = 0;
+    this._cachedChunks.length = 0;
   }
 
-  _onProgress(data) {
-    if (this.onProgress) {
-      this.onProgress({
-        loaded: data.loaded,
-        total: data.lengthComputable ? data.total : this._contentLength
-      });
-    }
+  _onProgress(evt) {
+    this.onProgress?.({
+      loaded: evt.loaded,
+      total: evt.lengthComputable ? evt.total : this._contentLength
+    });
   }
 
   get filename() {
@@ -13716,14 +19039,14 @@ class PDFNetworkStreamFullRequestReader {
 
     this._headersReceivedCapability.reject(reason);
 
-    this._requests.forEach(function (requestCapability) {
+    for (const requestCapability of this._requests) {
       requestCapability.resolve({
         value: undefined,
         done: true
       });
-    });
+    }
 
-    this._requests = [];
+    this._requests.length = 0;
 
     if (this._manager.isPendingRequest(this._fullRequestId)) {
       this._manager.abortRequest(this._fullRequestId);
@@ -13739,20 +19062,21 @@ class PDFNetworkStreamRangeRequestReader {
     this._manager = manager;
     const args = {
       onDone: this._onDone.bind(this),
+      onError: this._onError.bind(this),
       onProgress: this._onProgress.bind(this)
     };
+    this._url = manager.url;
     this._requestId = manager.requestRange(begin, end, args);
     this._requests = [];
     this._queuedChunk = null;
     this._done = false;
+    this._storedError = undefined;
     this.onProgress = null;
     this.onClosed = null;
   }
 
   _close() {
-    if (this.onClosed) {
-      this.onClosed(this);
-    }
+    this.onClosed?.(this);
   }
 
   _onDone(data) {
@@ -13771,21 +19095,32 @@ class PDFNetworkStreamRangeRequestReader {
 
     this._done = true;
 
-    this._requests.forEach(function (requestCapability) {
+    for (const requestCapability of this._requests) {
       requestCapability.resolve({
         value: undefined,
         done: true
       });
-    });
+    }
 
-    this._requests = [];
+    this._requests.length = 0;
 
     this._close();
   }
 
+  _onError(status) {
+    this._storedError = (0, _network_utils.createResponseStatusError)(status, this._url);
+
+    for (const requestCapability of this._requests) {
+      requestCapability.reject(this._storedError);
+    }
+
+    this._requests.length = 0;
+    this._queuedChunk = null;
+  }
+
   _onProgress(evt) {
-    if (!this.isStreamingSupported && this.onProgress) {
-      this.onProgress({
+    if (!this.isStreamingSupported) {
+      this.onProgress?.({
         loaded: evt.loaded
       });
     }
@@ -13796,6 +19131,10 @@ class PDFNetworkStreamRangeRequestReader {
   }
 
   async read() {
+    if (this._storedError) {
+      throw this._storedError;
+    }
+
     if (this._queuedChunk !== null) {
       const chunk = this._queuedChunk;
       this._queuedChunk = null;
@@ -13822,14 +19161,14 @@ class PDFNetworkStreamRangeRequestReader {
   cancel(reason) {
     this._done = true;
 
-    this._requests.forEach(function (requestCapability) {
+    for (const requestCapability of this._requests) {
       requestCapability.resolve({
         value: undefined,
         done: true
       });
-    });
+    }
 
-    this._requests = [];
+    this._requests.length = 0;
 
     if (this._manager.isPendingRequest(this._requestId)) {
       this._manager.abortRequest(this._requestId);
@@ -13841,20 +19180,19 @@ class PDFNetworkStreamRangeRequestReader {
 }
 
 /***/ }),
-/* 26 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 36 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFFetchStream = void 0;
 
-var _util = __w_pdfjs_require__(2);
+var _util = __w_pdfjs_require__(1);
 
-var _network_utils = __w_pdfjs_require__(23);
+var _network_utils = __w_pdfjs_require__(33);
 
 ;
 
@@ -13862,7 +19200,7 @@ function createFetchOptions(headers, withCredentials, abortController) {
   return {
     method: "GET",
     headers,
-    signal: abortController && abortController.signal,
+    signal: abortController.signal,
     mode: "cors",
     credentials: withCredentials ? "include" : "same-origin",
     redirect: "follow"
@@ -13895,7 +19233,7 @@ class PDFFetchStream {
   }
 
   get _progressiveDataLength() {
-    return this._fullRequestReader ? this._fullRequestReader._loaded : 0;
+    return this._fullRequestReader?._loaded ?? 0;
   }
 
   getFullReader() {
@@ -13921,11 +19259,9 @@ class PDFFetchStream {
       this._fullRequestReader.cancel(reason);
     }
 
-    const readers = this._rangeRequestReaders.slice(0);
-
-    readers.forEach(function (reader) {
+    for (const reader of this._rangeRequestReaders.slice(0)) {
       reader.cancel(reason);
-    });
+    }
   }
 
 }
@@ -13949,10 +19285,7 @@ class PDFFetchStreamReader {
       this._disableRange = true;
     }
 
-    if (typeof AbortController !== "undefined") {
-      this._abortController = new AbortController();
-    }
-
+    this._abortController = new AbortController();
     this._isStreamingSupported = !source.disableStream;
     this._isRangeSupported = !source.disableRange;
     this._headers = createHeaders(this._stream.httpHeaders);
@@ -14045,9 +19378,7 @@ class PDFFetchStreamReader {
       this._reader.cancel(reason);
     }
 
-    if (this._abortController) {
-      this._abortController.abort();
-    }
+    this._abortController.abort();
   }
 
 }
@@ -14061,11 +19392,7 @@ class PDFFetchStreamRangeReader {
     this._withCredentials = source.withCredentials || false;
     this._readCapability = (0, _util.createPromiseCapability)();
     this._isStreamingSupported = !source.disableStream;
-
-    if (typeof AbortController !== "undefined") {
-      this._abortController = new AbortController();
-    }
-
+    this._abortController = new AbortController();
     this._headers = createHeaders(this._stream.httpHeaders);
 
     this._headers.append("Range", `bytes=${begin}-${end - 1}`);
@@ -14079,13 +19406,7 @@ class PDFFetchStreamRangeReader {
       this._readCapability.resolve();
 
       this._reader = response.body.getReader();
-    }).catch(reason => {
-      if (reason && reason.name === "AbortError") {
-        return;
-      }
-
-      throw reason;
-    });
+    }).catch(this._readCapability.reject);
     this.onProgress = null;
   }
 
@@ -14127,14 +19448,326 @@ class PDFFetchStreamRangeReader {
       this._reader.cancel(reason);
     }
 
-    if (this._abortController) {
-      this._abortController.abort();
-    }
+    this._abortController.abort();
   }
 
 }
 
 /***/ })
-/******/ ]);
+/******/ 	]);
+/************************************************************************/
+/******/ 	// The module cache
+/******/ 	var __webpack_module_cache__ = {};
+/******/ 	
+/******/ 	// The require function
+/******/ 	function __w_pdfjs_require__(moduleId) {
+/******/ 		// Check if module is in cache
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = __webpack_module_cache__[moduleId] = {
+/******/ 			// no module.id needed
+/******/ 			// no module.loaded needed
+/******/ 			exports: {}
+/******/ 		};
+/******/ 	
+/******/ 		// Execute the module function
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __w_pdfjs_require__);
+/******/ 	
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/ 	
+/************************************************************************/
+var __webpack_exports__ = {};
+// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
+(() => {
+var exports = __webpack_exports__;
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+Object.defineProperty(exports, "AnnotationEditorLayer", ({
+  enumerable: true,
+  get: function () {
+    return _annotation_editor_layer.AnnotationEditorLayer;
+  }
+}));
+Object.defineProperty(exports, "AnnotationEditorParamsType", ({
+  enumerable: true,
+  get: function () {
+    return _util.AnnotationEditorParamsType;
+  }
+}));
+Object.defineProperty(exports, "AnnotationEditorType", ({
+  enumerable: true,
+  get: function () {
+    return _util.AnnotationEditorType;
+  }
+}));
+Object.defineProperty(exports, "AnnotationEditorUIManager", ({
+  enumerable: true,
+  get: function () {
+    return _tools.AnnotationEditorUIManager;
+  }
+}));
+Object.defineProperty(exports, "AnnotationLayer", ({
+  enumerable: true,
+  get: function () {
+    return _annotation_layer.AnnotationLayer;
+  }
+}));
+Object.defineProperty(exports, "AnnotationMode", ({
+  enumerable: true,
+  get: function () {
+    return _util.AnnotationMode;
+  }
+}));
+Object.defineProperty(exports, "CMapCompressionType", ({
+  enumerable: true,
+  get: function () {
+    return _util.CMapCompressionType;
+  }
+}));
+Object.defineProperty(exports, "GlobalWorkerOptions", ({
+  enumerable: true,
+  get: function () {
+    return _worker_options.GlobalWorkerOptions;
+  }
+}));
+Object.defineProperty(exports, "InvalidPDFException", ({
+  enumerable: true,
+  get: function () {
+    return _util.InvalidPDFException;
+  }
+}));
+Object.defineProperty(exports, "LoopbackPort", ({
+  enumerable: true,
+  get: function () {
+    return _api.LoopbackPort;
+  }
+}));
+Object.defineProperty(exports, "MissingPDFException", ({
+  enumerable: true,
+  get: function () {
+    return _util.MissingPDFException;
+  }
+}));
+Object.defineProperty(exports, "OPS", ({
+  enumerable: true,
+  get: function () {
+    return _util.OPS;
+  }
+}));
+Object.defineProperty(exports, "PDFDataRangeTransport", ({
+  enumerable: true,
+  get: function () {
+    return _api.PDFDataRangeTransport;
+  }
+}));
+Object.defineProperty(exports, "PDFDateString", ({
+  enumerable: true,
+  get: function () {
+    return _display_utils.PDFDateString;
+  }
+}));
+Object.defineProperty(exports, "PDFWorker", ({
+  enumerable: true,
+  get: function () {
+    return _api.PDFWorker;
+  }
+}));
+Object.defineProperty(exports, "PasswordResponses", ({
+  enumerable: true,
+  get: function () {
+    return _util.PasswordResponses;
+  }
+}));
+Object.defineProperty(exports, "PermissionFlag", ({
+  enumerable: true,
+  get: function () {
+    return _util.PermissionFlag;
+  }
+}));
+Object.defineProperty(exports, "PixelsPerInch", ({
+  enumerable: true,
+  get: function () {
+    return _display_utils.PixelsPerInch;
+  }
+}));
+Object.defineProperty(exports, "RenderingCancelledException", ({
+  enumerable: true,
+  get: function () {
+    return _display_utils.RenderingCancelledException;
+  }
+}));
+Object.defineProperty(exports, "SVGGraphics", ({
+  enumerable: true,
+  get: function () {
+    return _svg.SVGGraphics;
+  }
+}));
+Object.defineProperty(exports, "UNSUPPORTED_FEATURES", ({
+  enumerable: true,
+  get: function () {
+    return _util.UNSUPPORTED_FEATURES;
+  }
+}));
+Object.defineProperty(exports, "UnexpectedResponseException", ({
+  enumerable: true,
+  get: function () {
+    return _util.UnexpectedResponseException;
+  }
+}));
+Object.defineProperty(exports, "Util", ({
+  enumerable: true,
+  get: function () {
+    return _util.Util;
+  }
+}));
+Object.defineProperty(exports, "VerbosityLevel", ({
+  enumerable: true,
+  get: function () {
+    return _util.VerbosityLevel;
+  }
+}));
+Object.defineProperty(exports, "XfaLayer", ({
+  enumerable: true,
+  get: function () {
+    return _xfa_layer.XfaLayer;
+  }
+}));
+Object.defineProperty(exports, "build", ({
+  enumerable: true,
+  get: function () {
+    return _api.build;
+  }
+}));
+Object.defineProperty(exports, "createPromiseCapability", ({
+  enumerable: true,
+  get: function () {
+    return _util.createPromiseCapability;
+  }
+}));
+Object.defineProperty(exports, "createValidAbsoluteUrl", ({
+  enumerable: true,
+  get: function () {
+    return _util.createValidAbsoluteUrl;
+  }
+}));
+Object.defineProperty(exports, "getDocument", ({
+  enumerable: true,
+  get: function () {
+    return _api.getDocument;
+  }
+}));
+Object.defineProperty(exports, "getFilenameFromUrl", ({
+  enumerable: true,
+  get: function () {
+    return _display_utils.getFilenameFromUrl;
+  }
+}));
+Object.defineProperty(exports, "getPdfFilenameFromUrl", ({
+  enumerable: true,
+  get: function () {
+    return _display_utils.getPdfFilenameFromUrl;
+  }
+}));
+Object.defineProperty(exports, "getXfaPageViewport", ({
+  enumerable: true,
+  get: function () {
+    return _display_utils.getXfaPageViewport;
+  }
+}));
+Object.defineProperty(exports, "isPdfFile", ({
+  enumerable: true,
+  get: function () {
+    return _display_utils.isPdfFile;
+  }
+}));
+Object.defineProperty(exports, "loadScript", ({
+  enumerable: true,
+  get: function () {
+    return _display_utils.loadScript;
+  }
+}));
+Object.defineProperty(exports, "renderTextLayer", ({
+  enumerable: true,
+  get: function () {
+    return _text_layer.renderTextLayer;
+  }
+}));
+Object.defineProperty(exports, "shadow", ({
+  enumerable: true,
+  get: function () {
+    return _util.shadow;
+  }
+}));
+Object.defineProperty(exports, "version", ({
+  enumerable: true,
+  get: function () {
+    return _api.version;
+  }
+}));
+
+var _util = __w_pdfjs_require__(1);
+
+var _api = __w_pdfjs_require__(4);
+
+var _display_utils = __w_pdfjs_require__(8);
+
+var _annotation_editor_layer = __w_pdfjs_require__(22);
+
+var _tools = __w_pdfjs_require__(7);
+
+var _annotation_layer = __w_pdfjs_require__(27);
+
+var _worker_options = __w_pdfjs_require__(15);
+
+var _is_node = __w_pdfjs_require__(3);
+
+var _text_layer = __w_pdfjs_require__(30);
+
+var _svg = __w_pdfjs_require__(31);
+
+var _xfa_layer = __w_pdfjs_require__(29);
+
+const pdfjsVersion = '2.16.105';
+const pdfjsBuild = '172ccdbe5';
+{
+  if (_is_node.isNodeJS) {
+    const {
+      PDFNodeStream
+    } = __w_pdfjs_require__(32);
+
+    (0, _api.setPDFNetworkStreamFactory)(params => {
+      return new PDFNodeStream(params);
+    });
+  } else {
+    const {
+      PDFNetworkStream
+    } = __w_pdfjs_require__(35);
+
+    const {
+      PDFFetchStream
+    } = __w_pdfjs_require__(36);
+
+    (0, _api.setPDFNetworkStreamFactory)(params => {
+      if ((0, _display_utils.isValidFetchUrl)(params.url)) {
+        return new PDFFetchStream(params);
+      }
+
+      return new PDFNetworkStream(params);
+    });
+  }
+}
+})();
+
+/******/ 	return __webpack_exports__;
+/******/ })()
+;
 });
 //# sourceMappingURL=pdf.js.map
\ No newline at end of file
diff --git a/cps/static/js/libs/pdf.worker.js b/cps/static/js/libs/pdf.worker.js
index 58bdf7c19..878da521a 100644
--- a/cps/static/js/libs/pdf.worker.js
+++ b/cps/static/js/libs/pdf.worker.js
@@ -1,8 +1,8 @@
 /**
  * @licstart The following is the entire license notice for the
- * Javascript code in this page
+ * JavaScript code in this page
  *
- * Copyright 2020 Mozilla Foundation
+ * Copyright 2022 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
  * limitations under the License.
  *
  * @licend The above is the entire license notice for the
- * Javascript code in this page
+ * JavaScript code in this page
  */
 
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -29,142 +29,38 @@
 		exports["pdfjs-dist/build/pdf.worker"] = factory();
 	else
 		root["pdfjs-dist/build/pdf.worker"] = root.pdfjsWorker = factory();
-})(this, function() {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __w_pdfjs_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __w_pdfjs_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__w_pdfjs_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__w_pdfjs_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__w_pdfjs_require__.d = function(exports, name, getter) {
-/******/ 		if(!__w_pdfjs_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__w_pdfjs_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__w_pdfjs_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __w_pdfjs_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__w_pdfjs_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __w_pdfjs_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__w_pdfjs_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__w_pdfjs_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__w_pdfjs_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__w_pdfjs_require__.p = "";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __w_pdfjs_require__(__w_pdfjs_require__.s = 0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "WorkerMessageHandler", {
-  enumerable: true,
-  get: function () {
-    return _worker.WorkerMessageHandler;
-  }
-});
-
-var _worker = __w_pdfjs_require__(1);
-
-const pdfjsVersion = '2.6.347';
-const pdfjsBuild = '3be9c65f';
-
-/***/ }),
+})(globalThis, () => {
+return /******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	var __webpack_modules__ = ([
+/* 0 */,
 /* 1 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.WorkerMessageHandler = exports.WorkerTask = void 0;
+}));
+exports.WorkerTask = exports.WorkerMessageHandler = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
 var _primitives = __w_pdfjs_require__(5);
 
-var _pdf_manager = __w_pdfjs_require__(6);
+var _core_utils = __w_pdfjs_require__(6);
 
-var _writer = __w_pdfjs_require__(27);
+var _pdf_manager = __w_pdfjs_require__(8);
+
+var _cleanup_helper = __w_pdfjs_require__(71);
+
+var _writer = __w_pdfjs_require__(65);
 
 var _is_node = __w_pdfjs_require__(4);
 
-var _message_handler = __w_pdfjs_require__(46);
+var _message_handler = __w_pdfjs_require__(102);
 
-var _worker_stream = __w_pdfjs_require__(47);
-
-var _core_utils = __w_pdfjs_require__(8);
+var _worker_stream = __w_pdfjs_require__(103);
 
 class WorkerTask {
   constructor(name) {
@@ -197,24 +93,14 @@ exports.WorkerTask = WorkerTask;
 
 class WorkerMessageHandler {
   static setup(handler, port) {
-    var testMessageProcessed = false;
+    let testMessageProcessed = false;
     handler.on("test", function wphSetupTest(data) {
       if (testMessageProcessed) {
         return;
       }
 
       testMessageProcessed = true;
-
-      if (!(data instanceof Uint8Array)) {
-        handler.send("test", null);
-        return;
-      }
-
-      const supportTransfers = data[0] === 255;
-      handler.postMessageTransfers = supportTransfers;
-      handler.send("test", {
-        supportTransfers
-      });
+      handler.send("test", data instanceof Uint8Array);
     });
     handler.on("configure", function wphConfigure(data) {
       (0, _util.setVerbosityLevel)(data.verbosity);
@@ -225,13 +111,13 @@ class WorkerMessageHandler {
   }
 
   static createDocumentHandler(docParams, port) {
-    var pdfManager;
-    var terminated = false;
-    var cancelXHRs = null;
-    var WorkerTasks = [];
+    let pdfManager;
+    let terminated = false;
+    let cancelXHRs = null;
+    const WorkerTasks = [];
     const verbosity = (0, _util.getVerbosityLevel)();
     const apiVersion = docParams.apiVersion;
-    const workerVersion = '2.6.347';
+    const workerVersion = '2.16.105';
 
     if (apiVersion !== workerVersion) {
       throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`);
@@ -247,15 +133,20 @@ class WorkerMessageHandler {
       throw new Error("The `Array.prototype` contains unexpected enumerable properties: " + enumerableProperties.join(", ") + "; thus breaking e.g. `for...in` iteration of `Array`s.");
     }
 
-    if (typeof ReadableStream === "undefined" || typeof Promise.allSettled === "undefined") {
-      throw new Error("The browser/environment lacks native support for critical " + "functionality used by the PDF.js library (e.g. " + "`ReadableStream` and/or `Promise.allSettled`); " + "please use an ES5-compatible build instead.");
+    if (typeof ReadableStream === "undefined") {
+      const partialMsg = "The browser/environment lacks native support for critical " + "functionality used by the PDF.js library (e.g. `ReadableStream`); ";
+
+      if (_is_node.isNodeJS) {
+        throw new Error(partialMsg + "please use a `legacy`-build instead.");
+      }
+
+      throw new Error(partialMsg + "please update to a supported browser.");
     }
 
-    var docId = docParams.docId;
-    var docBaseUrl = docParams.docBaseUrl;
-    var workerHandlerName = docParams.docId + "_worker";
-    var handler = new _message_handler.MessageHandler(workerHandlerName, docId, port);
-    handler.postMessageTransfers = docParams.postMessageTransfers;
+    const docId = docParams.docId;
+    const docBaseUrl = docParams.docBaseUrl;
+    const workerHandlerName = docParams.docId + "_worker";
+    let handler = new _message_handler.MessageHandler(workerHandlerName, docId, port);
 
     function ensureNotTerminated() {
       if (terminated) {
@@ -269,7 +160,7 @@ class WorkerMessageHandler {
 
     function finishWorkerTask(task) {
       task.finish();
-      var i = WorkerTasks.indexOf(task);
+      const i = WorkerTasks.indexOf(task);
       WorkerTasks.splice(i, 1);
     }
 
@@ -277,26 +168,33 @@ class WorkerMessageHandler {
       await pdfManager.ensureDoc("checkHeader");
       await pdfManager.ensureDoc("parseStartXRef");
       await pdfManager.ensureDoc("parse", [recoveryMode]);
+      await pdfManager.ensureDoc("checkFirstPage", [recoveryMode]);
+      await pdfManager.ensureDoc("checkLastPage", [recoveryMode]);
+      const isPureXfa = await pdfManager.ensureDoc("isPureXfa");
 
-      if (!recoveryMode) {
-        await pdfManager.ensureDoc("checkFirstPage");
+      if (isPureXfa) {
+        const task = new WorkerTask("loadXfaFonts");
+        startWorkerTask(task);
+        await Promise.all([pdfManager.loadXfaFonts(handler, task).catch(reason => {}).then(() => finishWorkerTask(task)), pdfManager.loadXfaImages()]);
       }
 
-      const [numPages, fingerprint] = await Promise.all([pdfManager.ensureDoc("numPages"), pdfManager.ensureDoc("fingerprint")]);
+      const [numPages, fingerprints] = await Promise.all([pdfManager.ensureDoc("numPages"), pdfManager.ensureDoc("fingerprints")]);
+      const htmlForXfa = isPureXfa ? await pdfManager.ensureDoc("htmlForXfa") : null;
       return {
         numPages,
-        fingerprint
+        fingerprints,
+        htmlForXfa
       };
     }
 
-    function getPdfManager(data, evaluatorOptions) {
-      var pdfManagerCapability = (0, _util.createPromiseCapability)();
+    function getPdfManager(data, evaluatorOptions, enableXfa) {
+      const pdfManagerCapability = (0, _util.createPromiseCapability)();
       let newPdfManager;
-      var source = data.source;
+      const source = data.source;
 
       if (source.data) {
         try {
-          newPdfManager = new _pdf_manager.LocalPdfManager(docId, source.data, source.password, evaluatorOptions, docBaseUrl);
+          newPdfManager = new _pdf_manager.LocalPdfManager(docId, source.data, source.password, handler, evaluatorOptions, enableXfa, docBaseUrl);
           pdfManagerCapability.resolve(newPdfManager);
         } catch (ex) {
           pdfManagerCapability.reject(ex);
@@ -305,7 +203,7 @@ class WorkerMessageHandler {
         return pdfManagerCapability.promise;
       }
 
-      var pdfStream,
+      let pdfStream,
           cachedChunks = [];
 
       try {
@@ -315,23 +213,23 @@ class WorkerMessageHandler {
         return pdfManagerCapability.promise;
       }
 
-      var fullRequest = pdfStream.getFullReader();
+      const fullRequest = pdfStream.getFullReader();
       fullRequest.headersReady.then(function () {
         if (!fullRequest.isRangeSupported) {
           return;
         }
 
-        var disableAutoFetch = source.disableAutoFetch || fullRequest.isStreamingSupported;
+        const disableAutoFetch = source.disableAutoFetch || fullRequest.isStreamingSupported;
         newPdfManager = new _pdf_manager.NetworkPdfManager(docId, pdfStream, {
           msgHandler: handler,
           password: source.password,
           length: fullRequest.contentLength,
           disableAutoFetch,
           rangeChunkSize: source.rangeChunkSize
-        }, evaluatorOptions, docBaseUrl);
+        }, evaluatorOptions, enableXfa, docBaseUrl);
 
-        for (let i = 0; i < cachedChunks.length; i++) {
-          newPdfManager.sendProgressiveData(cachedChunks[i]);
+        for (const chunk of cachedChunks) {
+          newPdfManager.sendProgressiveData(chunk);
         }
 
         cachedChunks = [];
@@ -341,17 +239,17 @@ class WorkerMessageHandler {
         pdfManagerCapability.reject(reason);
         cancelXHRs = null;
       });
-      var loaded = 0;
+      let loaded = 0;
 
-      var flushChunks = function () {
-        var pdfFile = (0, _util.arraysToBytes)(cachedChunks);
+      const flushChunks = function () {
+        const pdfFile = (0, _util.arraysToBytes)(cachedChunks);
 
         if (source.length && pdfFile.length !== source.length) {
           (0, _util.warn)("reported HTTP length is different from actual");
         }
 
         try {
-          newPdfManager = new _pdf_manager.LocalPdfManager(docId, pdfFile, source.password, evaluatorOptions, docBaseUrl);
+          newPdfManager = new _pdf_manager.LocalPdfManager(docId, pdfFile, source.password, handler, evaluatorOptions, enableXfa, docBaseUrl);
           pdfManagerCapability.resolve(newPdfManager);
         } catch (ex) {
           pdfManagerCapability.reject(ex);
@@ -360,8 +258,8 @@ class WorkerMessageHandler {
         cachedChunks = [];
       };
 
-      var readPromise = new Promise(function (resolve, reject) {
-        var readChunk = function ({
+      const readPromise = new Promise(function (resolve, reject) {
+        const readChunk = function ({
           value,
           done
         }) {
@@ -424,7 +322,7 @@ class WorkerMessageHandler {
         ensureNotTerminated();
 
         if (ex instanceof _util.PasswordException) {
-          var task = new WorkerTask(`PasswordException: response ${ex.code}`);
+          const task = new WorkerTask(`PasswordException: response ${ex.code}`);
           startWorkerTask(task);
           handler.sendWithPromise("PasswordRequest", ex).then(function ({
             password
@@ -462,14 +360,17 @@ class WorkerMessageHandler {
       }
 
       ensureNotTerminated();
-      var evaluatorOptions = {
+      const evaluatorOptions = {
         maxImageSize: data.maxImageSize,
         disableFontFace: data.disableFontFace,
         ignoreErrors: data.ignoreErrors,
         isEvalSupported: data.isEvalSupported,
-        fontExtraProperties: data.fontExtraProperties
+        fontExtraProperties: data.fontExtraProperties,
+        useSystemFonts: data.useSystemFonts,
+        cMapUrl: data.cMapUrl,
+        standardFontDataUrl: data.standardFontDataUrl
       };
-      getPdfManager(data, evaluatorOptions).then(function (newPdfManager) {
+      getPdfManager(data, evaluatorOptions, data.enableXfa).then(function (newPdfManager) {
         if (terminated) {
           newPdfManager.terminate(new _util.AbortException("Worker was terminated."));
           throw new Error("Worker was terminated");
@@ -496,10 +397,8 @@ class WorkerMessageHandler {
         });
       });
     });
-    handler.on("GetPageIndex", function wphSetupGetPageIndex({
-      ref
-    }) {
-      const pageRef = _primitives.Ref.get(ref.num, ref.gen);
+    handler.on("GetPageIndex", function wphSetupGetPageIndex(data) {
+      const pageRef = _primitives.Ref.get(data.num, data.gen);
 
       return pdfManager.ensureCatalog("getPageIndex", [pageRef]);
     });
@@ -530,6 +429,16 @@ class WorkerMessageHandler {
     handler.on("GetJavaScript", function wphSetupGetJavaScript(data) {
       return pdfManager.ensureCatalog("javaScript");
     });
+    handler.on("GetDocJSActions", function wphSetupGetDocJSActions(data) {
+      return pdfManager.ensureCatalog("jsActions");
+    });
+    handler.on("GetPageJSActions", function ({
+      pageIndex
+    }) {
+      return pdfManager.getPage(pageIndex).then(function (page) {
+        return pdfManager.ensure(page, "jsActions");
+      });
+    });
     handler.on("GetOutline", function wphSetupGetOutline(data) {
       return pdfManager.ensureCatalog("documentOutline");
     });
@@ -542,86 +451,157 @@ class WorkerMessageHandler {
     handler.on("GetMetadata", function wphSetupGetMetadata(data) {
       return Promise.all([pdfManager.ensureDoc("documentInfo"), pdfManager.ensureCatalog("metadata")]);
     });
+    handler.on("GetMarkInfo", function wphSetupGetMarkInfo(data) {
+      return pdfManager.ensureCatalog("markInfo");
+    });
     handler.on("GetData", function wphSetupGetData(data) {
       pdfManager.requestLoadedStream();
       return pdfManager.onLoadedStream().then(function (stream) {
         return stream.bytes;
       });
     });
-    handler.on("GetStats", function wphSetupGetStats(data) {
-      return pdfManager.ensureXRef("stats");
-    });
     handler.on("GetAnnotations", function ({
       pageIndex,
       intent
     }) {
       return pdfManager.getPage(pageIndex).then(function (page) {
-        return page.getAnnotationsData(intent);
+        const task = new WorkerTask(`GetAnnotations: page ${pageIndex}`);
+        startWorkerTask(task);
+        return page.getAnnotationsData(handler, task, intent).then(data => {
+          finishWorkerTask(task);
+          return data;
+        }, reason => {
+          finishWorkerTask(task);
+        });
       });
     });
+    handler.on("GetFieldObjects", function (data) {
+      return pdfManager.ensureDoc("fieldObjects");
+    });
+    handler.on("HasJSActions", function (data) {
+      return pdfManager.ensureDoc("hasJSActions");
+    });
+    handler.on("GetCalculationOrderIds", function (data) {
+      return pdfManager.ensureDoc("calculationOrderIds");
+    });
     handler.on("SaveDocument", function ({
+      isPureXfa,
       numPages,
       annotationStorage,
       filename
     }) {
       pdfManager.requestLoadedStream();
-      const promises = [pdfManager.onLoadedStream()];
-      const document = pdfManager.pdfDocument;
+      const newAnnotationsByPage = !isPureXfa ? (0, _core_utils.getNewAnnotationsMap)(annotationStorage) : null;
+      const promises = [pdfManager.onLoadedStream(), pdfManager.ensureCatalog("acroForm"), pdfManager.ensureCatalog("acroFormRef"), pdfManager.ensureDoc("xref"), pdfManager.ensureDoc("startXRef")];
 
-      for (let pageIndex = 0; pageIndex < numPages; pageIndex++) {
-        promises.push(pdfManager.getPage(pageIndex).then(function (page) {
-          const task = new WorkerTask(`Save: page ${pageIndex}`);
-          return page.save(handler, task, annotationStorage);
-        }));
+      if (newAnnotationsByPage) {
+        for (const [pageIndex, annotations] of newAnnotationsByPage) {
+          promises.push(pdfManager.getPage(pageIndex).then(page => {
+            const task = new WorkerTask(`Save (editor): page ${pageIndex}`);
+            return page.saveNewAnnotations(handler, task, annotations).finally(function () {
+              finishWorkerTask(task);
+            });
+          }));
+        }
       }
 
-      return Promise.all(promises).then(([stream, ...refs]) => {
+      if (isPureXfa) {
+        promises.push(pdfManager.serializeXfaData(annotationStorage));
+      } else {
+        for (let pageIndex = 0; pageIndex < numPages; pageIndex++) {
+          promises.push(pdfManager.getPage(pageIndex).then(function (page) {
+            const task = new WorkerTask(`Save: page ${pageIndex}`);
+            return page.save(handler, task, annotationStorage).finally(function () {
+              finishWorkerTask(task);
+            });
+          }));
+        }
+      }
+
+      return Promise.all(promises).then(function ([stream, acroForm, acroFormRef, xref, startXRef, ...refs]) {
         let newRefs = [];
+        let xfaData = null;
 
-        for (const ref of refs) {
-          newRefs = ref.filter(x => x !== null).reduce((a, b) => a.concat(b), newRefs);
+        if (isPureXfa) {
+          xfaData = refs[0];
+
+          if (!xfaData) {
+            return stream.bytes;
+          }
+        } else {
+          newRefs = refs.flat(2);
+
+          if (newRefs.length === 0) {
+            return stream.bytes;
+          }
         }
 
-        if (newRefs.length === 0) {
-          return stream.bytes;
+        const xfa = acroForm instanceof _primitives.Dict && acroForm.get("XFA") || null;
+        let xfaDatasetsRef = null;
+        let hasXfaDatasetsEntry = false;
+
+        if (Array.isArray(xfa)) {
+          for (let i = 0, ii = xfa.length; i < ii; i += 2) {
+            if (xfa[i] === "datasets") {
+              xfaDatasetsRef = xfa[i + 1];
+              acroFormRef = null;
+              hasXfaDatasetsEntry = true;
+            }
+          }
+
+          if (xfaDatasetsRef === null) {
+            xfaDatasetsRef = xref.getNewRef();
+          }
+        } else if (xfa) {
+          acroFormRef = null;
+          (0, _util.warn)("Unsupported XFA type.");
         }
 
-        const xref = document.xref;
         let newXrefInfo = Object.create(null);
 
         if (xref.trailer) {
-          const _info = Object.create(null);
-
+          const infoObj = Object.create(null);
           const xrefInfo = xref.trailer.get("Info") || null;
 
-          if (xrefInfo) {
+          if (xrefInfo instanceof _primitives.Dict) {
             xrefInfo.forEach((key, value) => {
-              if ((0, _util.isString)(key) && (0, _util.isString)(value)) {
-                _info[key] = (0, _util.stringToPDFString)(value);
+              if (typeof value === "string") {
+                infoObj[key] = (0, _util.stringToPDFString)(value);
               }
             });
           }
 
           newXrefInfo = {
             rootRef: xref.trailer.getRaw("Root") || null,
-            encrypt: xref.trailer.getRaw("Encrypt") || null,
+            encryptRef: xref.trailer.getRaw("Encrypt") || null,
             newRef: xref.getNewRef(),
             infoRef: xref.trailer.getRaw("Info") || null,
-            info: _info,
-            fileIds: xref.trailer.getRaw("ID") || null,
-            startXRef: document.startXRef,
+            info: infoObj,
+            fileIds: xref.trailer.get("ID") || null,
+            startXRef,
             filename
           };
         }
 
         xref.resetNewRef();
-        return (0, _writer.incrementalUpdate)(stream.bytes, newXrefInfo, newRefs);
+        return (0, _writer.incrementalUpdate)({
+          originalData: stream.bytes,
+          xrefInfo: newXrefInfo,
+          newRefs,
+          xref,
+          hasXfa: !!xfa,
+          xfaDatasetsRef,
+          hasXfaDatasetsEntry,
+          acroFormRef,
+          acroForm,
+          xfaData
+        });
       });
     });
     handler.on("GetOperatorList", function wphSetupRenderPage(data, sink) {
-      var pageIndex = data.pageIndex;
+      const pageIndex = data.pageIndex;
       pdfManager.getPage(pageIndex).then(function (page) {
-        var task = new WorkerTask(`GetOperatorList: page ${pageIndex}`);
+        const task = new WorkerTask(`GetOperatorList: page ${pageIndex}`);
         startWorkerTask(task);
         const start = verbosity >= _util.VerbosityLevel.INFOS ? Date.now() : 0;
         page.getOperatorList({
@@ -629,7 +609,7 @@ class WorkerMessageHandler {
           sink,
           task,
           intent: data.intent,
-          renderInteractiveForms: data.renderInteractiveForms,
+          cacheKey: data.cacheKey,
           annotationStorage: data.annotationStorage
         }).then(function (operatorListInfo) {
           finishWorkerTask(task);
@@ -652,23 +632,18 @@ class WorkerMessageHandler {
           sink.error(reason);
         });
       });
-    }, this);
+    });
     handler.on("GetTextContent", function wphExtractText(data, sink) {
-      var pageIndex = data.pageIndex;
-
-      sink.onPull = function (desiredSize) {};
-
-      sink.onCancel = function (reason) {};
-
+      const pageIndex = data.pageIndex;
       pdfManager.getPage(pageIndex).then(function (page) {
-        var task = new WorkerTask("GetTextContent: page " + pageIndex);
+        const task = new WorkerTask("GetTextContent: page " + pageIndex);
         startWorkerTask(task);
         const start = verbosity >= _util.VerbosityLevel.INFOS ? Date.now() : 0;
         page.extractTextContent({
           handler,
           task,
           sink,
-          normalizeWhitespace: data.normalizeWhitespace,
+          includeMarkedContent: data.includeMarkedContent,
           combineTextItems: data.combineTextItems
         }).then(function () {
           finishWorkerTask(task);
@@ -689,6 +664,11 @@ class WorkerMessageHandler {
         });
       });
     });
+    handler.on("GetStructTree", function wphGetStructTree(data) {
+      return pdfManager.getPage(data.pageIndex).then(function (page) {
+        return pdfManager.ensure(page, "getStructTree");
+      });
+    });
     handler.on("FontFallback", function (data) {
       return pdfManager.fontFallback(data.id, handler);
     });
@@ -705,17 +685,18 @@ class WorkerMessageHandler {
         waitOn.push(cleanupPromise);
         pdfManager = null;
       } else {
-        (0, _primitives.clearPrimitiveCaches)();
+        (0, _cleanup_helper.clearGlobalCaches)();
       }
 
       if (cancelXHRs) {
         cancelXHRs(new _util.AbortException("Worker was terminated."));
       }
 
-      WorkerTasks.forEach(function (task) {
+      for (const task of WorkerTasks) {
         waitOn.push(task.finished);
         task.terminate();
-      });
+      }
+
       return Promise.all(waitOn).then(function () {
         handler.destroy();
         handler = null;
@@ -729,7 +710,7 @@ class WorkerMessageHandler {
   }
 
   static initializeFromPort(port) {
-    var handler = new _message_handler.MessageHandler("worker", "main", port);
+    const handler = new _message_handler.MessageHandler("worker", "main", port);
     WorkerMessageHandler.setup(handler, port);
     handler.send("ready", null);
   }
@@ -748,41 +729,39 @@ if (typeof window === "undefined" && !_is_node.isNodeJS && typeof self !== "unde
 
 /***/ }),
 /* 2 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.VerbosityLevel = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.UNSUPPORTED_FEATURES = exports.TextRenderingMode = exports.StreamType = exports.RenderingIntentFlag = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.LINE_FACTOR = exports.LINE_DESCENT_FACTOR = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FontType = exports.FeatureTest = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.AnnotationType = exports.AnnotationStateModelType = exports.AnnotationReviewState = exports.AnnotationReplyType = exports.AnnotationMode = exports.AnnotationMarkedState = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationEditorType = exports.AnnotationEditorPrefix = exports.AnnotationEditorParamsType = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
 exports.arrayByteLength = arrayByteLength;
 exports.arraysToBytes = arraysToBytes;
 exports.assert = assert;
 exports.bytesToString = bytesToString;
 exports.createPromiseCapability = createPromiseCapability;
+exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
 exports.escapeString = escapeString;
 exports.getModificationDate = getModificationDate;
 exports.getVerbosityLevel = getVerbosityLevel;
 exports.info = info;
 exports.isArrayBuffer = isArrayBuffer;
 exports.isArrayEqual = isArrayEqual;
-exports.isBool = isBool;
-exports.isNum = isNum;
-exports.isString = isString;
-exports.isSameOrigin = isSameOrigin;
-exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
-exports.removeNullCharacters = removeNullCharacters;
+exports.isAscii = isAscii;
+exports.objectFromMap = objectFromMap;
+exports.objectSize = objectSize;
 exports.setVerbosityLevel = setVerbosityLevel;
 exports.shadow = shadow;
 exports.string32 = string32;
 exports.stringToBytes = stringToBytes;
 exports.stringToPDFString = stringToPDFString;
+exports.stringToUTF16BEString = stringToUTF16BEString;
 exports.stringToUTF8String = stringToUTF8String;
+exports.unreachable = unreachable;
 exports.utf8StringToString = utf8StringToString;
 exports.warn = warn;
-exports.unreachable = unreachable;
-exports.IsEvalSupportedCached = exports.IsLittleEndianCached = exports.createObjectURL = exports.FormatError = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.MissingPDFException = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationStateModelType = exports.AnnotationReviewState = exports.AnnotationReplyType = exports.AnnotationMarkedState = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VerbosityLevel = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = exports.BaseException = void 0;
 
 __w_pdfjs_require__(3);
 
@@ -790,6 +769,45 @@ const IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
 exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
 const FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0];
 exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
+const LINE_FACTOR = 1.35;
+exports.LINE_FACTOR = LINE_FACTOR;
+const LINE_DESCENT_FACTOR = 0.35;
+exports.LINE_DESCENT_FACTOR = LINE_DESCENT_FACTOR;
+const RenderingIntentFlag = {
+  ANY: 0x01,
+  DISPLAY: 0x02,
+  PRINT: 0x04,
+  ANNOTATIONS_FORMS: 0x10,
+  ANNOTATIONS_STORAGE: 0x20,
+  ANNOTATIONS_DISABLE: 0x40,
+  OPLIST: 0x100
+};
+exports.RenderingIntentFlag = RenderingIntentFlag;
+const AnnotationMode = {
+  DISABLE: 0,
+  ENABLE: 1,
+  ENABLE_FORMS: 2,
+  ENABLE_STORAGE: 3
+};
+exports.AnnotationMode = AnnotationMode;
+const AnnotationEditorPrefix = "pdfjs_internal_editor_";
+exports.AnnotationEditorPrefix = AnnotationEditorPrefix;
+const AnnotationEditorType = {
+  DISABLE: -1,
+  NONE: 0,
+  FREETEXT: 3,
+  INK: 15
+};
+exports.AnnotationEditorType = AnnotationEditorType;
+const AnnotationEditorParamsType = {
+  FREETEXT_SIZE: 1,
+  FREETEXT_COLOR: 2,
+  FREETEXT_OPACITY: 3,
+  INK_COLOR: 11,
+  INK_THICKNESS: 12,
+  INK_OPACITY: 13
+};
+exports.AnnotationEditorParamsType = AnnotationEditorParamsType;
 const PermissionFlag = {
   PRINT: 0x04,
   MODIFY_CONTENTS: 0x08,
@@ -915,6 +933,36 @@ const AnnotationBorderStyleType = {
   UNDERLINE: 5
 };
 exports.AnnotationBorderStyleType = AnnotationBorderStyleType;
+const AnnotationActionEventType = {
+  E: "Mouse Enter",
+  X: "Mouse Exit",
+  D: "Mouse Down",
+  U: "Mouse Up",
+  Fo: "Focus",
+  Bl: "Blur",
+  PO: "PageOpen",
+  PC: "PageClose",
+  PV: "PageVisible",
+  PI: "PageInvisible",
+  K: "Keystroke",
+  F: "Format",
+  V: "Validate",
+  C: "Calculate"
+};
+exports.AnnotationActionEventType = AnnotationActionEventType;
+const DocumentActionEventType = {
+  WC: "WillClose",
+  WS: "WillSave",
+  DS: "DidSave",
+  WP: "WillPrint",
+  DP: "DidPrint"
+};
+exports.DocumentActionEventType = DocumentActionEventType;
+const PageActionEventType = {
+  O: "PageOpen",
+  C: "PageClose"
+};
+exports.PageActionEventType = PageActionEventType;
 const StreamType = {
   UNKNOWN: "UNKNOWN",
   FLATE: "FLATE",
@@ -931,6 +979,7 @@ exports.StreamType = StreamType;
 const FontType = {
   UNKNOWN: "UNKNOWN",
   TYPE1: "TYPE1",
+  TYPE1STANDARD: "TYPE1STANDARD",
   TYPE1C: "TYPE1C",
   CIDFONTTYPE0: "CIDFONTTYPE0",
   CIDFONTTYPE0C: "CIDFONTTYPE0C",
@@ -1052,6 +1101,7 @@ const UNSUPPORTED_FEATURES = {
   unknown: "unknown",
   forms: "forms",
   javaScript: "javaScript",
+  signatures: "signatures",
   smask: "smask",
   shadingPattern: "shadingPattern",
   font: "font",
@@ -1066,8 +1116,10 @@ const UNSUPPORTED_FEATURES = {
   errorOperatorList: "errorOperatorList",
   errorFontToUnicode: "errorFontToUnicode",
   errorFontLoadNative: "errorFontLoadNative",
+  errorFontBuildPath: "errorFontBuildPath",
   errorFontGetPath: "errorFontGetPath",
-  errorMarkedContent: "errorMarkedContent"
+  errorMarkedContent: "errorMarkedContent",
+  errorContentSubStream: "errorContentSubStream"
 };
 exports.UNSUPPORTED_FEATURES = UNSUPPORTED_FEATURES;
 const PasswordResponses = {
@@ -1109,23 +1161,6 @@ function assert(cond, msg) {
   }
 }
 
-function isSameOrigin(baseUrl, otherUrl) {
-  let base;
-
-  try {
-    base = new URL(baseUrl);
-
-    if (!base.origin || base.origin === "null") {
-      return false;
-    }
-  } catch (e) {
-    return false;
-  }
-
-  const other = new URL(otherUrl, base);
-  return base.origin === other.origin;
-}
-
 function _isValidProtocol(url) {
   if (!url) {
     return false;
@@ -1144,12 +1179,28 @@ function _isValidProtocol(url) {
   }
 }
 
-function createValidAbsoluteUrl(url, baseUrl) {
+function createValidAbsoluteUrl(url, baseUrl = null, options = null) {
   if (!url) {
     return null;
   }
 
   try {
+    if (options && typeof url === "string") {
+      if (options.addDefaultProtocol && url.startsWith("www.")) {
+        const dots = url.match(/\./g);
+
+        if (dots && dots.length >= 2) {
+          url = `http://${url}`;
+        }
+      }
+
+      if (options.tryConvertEncoding) {
+        try {
+          url = stringToUTF8String(url);
+        } catch (ex) {}
+      }
+    }
+
     const absoluteUrl = baseUrl ? new URL(url, baseUrl) : new URL(url);
 
     if (_isValidProtocol(absoluteUrl)) {
@@ -1171,13 +1222,13 @@ function shadow(obj, prop, value) {
 }
 
 const BaseException = function BaseExceptionClosure() {
-  function BaseException(message) {
+  function BaseException(message, name) {
     if (this.constructor === BaseException) {
       unreachable("Cannot initialize BaseException.");
     }
 
     this.message = message;
-    this.name = this.constructor.name;
+    this.name = name;
   }
 
   BaseException.prototype = new Error();
@@ -1189,7 +1240,7 @@ exports.BaseException = BaseException;
 
 class PasswordException extends BaseException {
   constructor(msg, code) {
-    super(msg);
+    super(msg, "PasswordException");
     this.code = code;
   }
 
@@ -1199,7 +1250,7 @@ exports.PasswordException = PasswordException;
 
 class UnknownErrorException extends BaseException {
   constructor(msg, details) {
-    super(msg);
+    super(msg, "UnknownErrorException");
     this.details = details;
   }
 
@@ -1207,17 +1258,27 @@ class UnknownErrorException extends BaseException {
 
 exports.UnknownErrorException = UnknownErrorException;
 
-class InvalidPDFException extends BaseException {}
+class InvalidPDFException extends BaseException {
+  constructor(msg) {
+    super(msg, "InvalidPDFException");
+  }
+
+}
 
 exports.InvalidPDFException = InvalidPDFException;
 
-class MissingPDFException extends BaseException {}
+class MissingPDFException extends BaseException {
+  constructor(msg) {
+    super(msg, "MissingPDFException");
+  }
+
+}
 
 exports.MissingPDFException = MissingPDFException;
 
 class UnexpectedResponseException extends BaseException {
   constructor(msg, status) {
-    super(msg);
+    super(msg, "UnexpectedResponseException");
     this.status = status;
   }
 
@@ -1225,26 +1286,29 @@ class UnexpectedResponseException extends BaseException {
 
 exports.UnexpectedResponseException = UnexpectedResponseException;
 
-class FormatError extends BaseException {}
+class FormatError extends BaseException {
+  constructor(msg) {
+    super(msg, "FormatError");
+  }
+
+}
 
 exports.FormatError = FormatError;
 
-class AbortException extends BaseException {}
-
-exports.AbortException = AbortException;
-const NullCharactersRegExp = /\x00/g;
-
-function removeNullCharacters(str) {
-  if (typeof str !== "string") {
-    warn("The argument for removeNullCharacters must be a string.");
-    return str;
+class AbortException extends BaseException {
+  constructor(msg) {
+    super(msg, "AbortException");
   }
 
-  return str.replace(NullCharactersRegExp, "");
 }
 
+exports.AbortException = AbortException;
+
 function bytesToString(bytes) {
-  assert(bytes !== null && typeof bytes === "object" && bytes.length !== undefined, "Invalid argument for bytesToString");
+  if (typeof bytes !== "object" || bytes === null || bytes.length === undefined) {
+    unreachable("Invalid argument for bytesToString");
+  }
+
   const length = bytes.length;
   const MAX_ARGUMENT_COUNT = 8192;
 
@@ -1264,7 +1328,10 @@ function bytesToString(bytes) {
 }
 
 function stringToBytes(str) {
-  assert(typeof str === "string", "Invalid argument for stringToBytes");
+  if (typeof str !== "string") {
+    unreachable("Invalid argument for stringToBytes");
+  }
+
   const length = str.length;
   const bytes = new Uint8Array(length);
 
@@ -1280,8 +1347,11 @@ function arrayByteLength(arr) {
     return arr.length;
   }
 
-  assert(arr.byteLength !== undefined, "arrayByteLength - invalid argument.");
-  return arr.byteLength;
+  if (arr.byteLength !== undefined) {
+    return arr.byteLength;
+  }
+
+  unreachable("Invalid argument for arrayByteLength");
 }
 
 function arraysToBytes(arr) {
@@ -1323,6 +1393,20 @@ function string32(value) {
   return String.fromCharCode(value >> 24 & 0xff, value >> 16 & 0xff, value >> 8 & 0xff, value & 0xff);
 }
 
+function objectSize(obj) {
+  return Object.keys(obj).length;
+}
+
+function objectFromMap(map) {
+  const obj = Object.create(null);
+
+  for (const [key, value] of map) {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
 function isLittleEndian() {
   const buffer8 = new Uint8Array(4);
   buffer8[0] = 1;
@@ -1330,14 +1414,6 @@ function isLittleEndian() {
   return view32[0] === 1;
 }
 
-const IsLittleEndianCached = {
-  get value() {
-    return shadow(this, "value", isLittleEndian());
-  }
-
-};
-exports.IsLittleEndianCached = IsLittleEndianCached;
-
 function isEvalSupported() {
   try {
     new Function("");
@@ -1347,21 +1423,81 @@ function isEvalSupported() {
   }
 }
 
-const IsEvalSupportedCached = {
-  get value() {
-    return shadow(this, "value", isEvalSupported());
+class FeatureTest {
+  static get isLittleEndian() {
+    return shadow(this, "isLittleEndian", isLittleEndian());
   }
 
-};
-exports.IsEvalSupportedCached = IsEvalSupportedCached;
-const rgbBuf = ["rgb(", 0, ",", 0, ",", 0, ")"];
+  static get isEvalSupported() {
+    return shadow(this, "isEvalSupported", isEvalSupported());
+  }
+
+  static get isOffscreenCanvasSupported() {
+    return shadow(this, "isOffscreenCanvasSupported", typeof OffscreenCanvas !== "undefined");
+  }
+
+}
+
+exports.FeatureTest = FeatureTest;
+const hexNumbers = [...Array(256).keys()].map(n => n.toString(16).padStart(2, "0"));
 
 class Util {
-  static makeCssRgb(r, g, b) {
-    rgbBuf[1] = r;
-    rgbBuf[3] = g;
-    rgbBuf[5] = b;
-    return rgbBuf.join("");
+  static makeHexColor(r, g, b) {
+    return `#${hexNumbers[r]}${hexNumbers[g]}${hexNumbers[b]}`;
+  }
+
+  static scaleMinMax(transform, minMax) {
+    let temp;
+
+    if (transform[0]) {
+      if (transform[0] < 0) {
+        temp = minMax[0];
+        minMax[0] = minMax[1];
+        minMax[1] = temp;
+      }
+
+      minMax[0] *= transform[0];
+      minMax[1] *= transform[0];
+
+      if (transform[3] < 0) {
+        temp = minMax[2];
+        minMax[2] = minMax[3];
+        minMax[3] = temp;
+      }
+
+      minMax[2] *= transform[3];
+      minMax[3] *= transform[3];
+    } else {
+      temp = minMax[0];
+      minMax[0] = minMax[2];
+      minMax[2] = temp;
+      temp = minMax[1];
+      minMax[1] = minMax[3];
+      minMax[3] = temp;
+
+      if (transform[1] < 0) {
+        temp = minMax[2];
+        minMax[2] = minMax[3];
+        minMax[3] = temp;
+      }
+
+      minMax[2] *= transform[1];
+      minMax[3] *= transform[1];
+
+      if (transform[2] < 0) {
+        temp = minMax[0];
+        minMax[0] = minMax[1];
+        minMax[1] = temp;
+      }
+
+      minMax[0] *= transform[2];
+      minMax[1] *= transform[2];
+    }
+
+    minMax[0] += transform[4];
+    minMax[1] += transform[4];
+    minMax[2] += transform[5];
+    minMax[3] += transform[5];
   }
 
   static transform(m1, m2) {
@@ -1405,7 +1541,7 @@ class Util {
     const c = m[2] * transpose[0] + m[3] * transpose[2];
     const d = m[2] * transpose[1] + m[3] * transpose[3];
     const first = (a + d) / 2;
-    const second = Math.sqrt((a + d) * (a + d) - 4 * (a * d - c * b)) / 2;
+    const second = Math.sqrt((a + d) ** 2 - 4 * (a * d - c * b)) / 2;
     const sx = first + second || 1;
     const sy = first - second || 1;
     return [Math.sqrt(sx), Math.sqrt(sy)];
@@ -1428,62 +1564,157 @@ class Util {
   }
 
   static intersect(rect1, rect2) {
-    function compare(a, b) {
-      return a - b;
-    }
+    const xLow = Math.max(Math.min(rect1[0], rect1[2]), Math.min(rect2[0], rect2[2]));
+    const xHigh = Math.min(Math.max(rect1[0], rect1[2]), Math.max(rect2[0], rect2[2]));
 
-    const orderedX = [rect1[0], rect1[2], rect2[0], rect2[2]].sort(compare);
-    const orderedY = [rect1[1], rect1[3], rect2[1], rect2[3]].sort(compare);
-    const result = [];
-    rect1 = Util.normalizeRect(rect1);
-    rect2 = Util.normalizeRect(rect2);
-
-    if (orderedX[0] === rect1[0] && orderedX[1] === rect2[0] || orderedX[0] === rect2[0] && orderedX[1] === rect1[0]) {
-      result[0] = orderedX[1];
-      result[2] = orderedX[2];
-    } else {
+    if (xLow > xHigh) {
       return null;
     }
 
-    if (orderedY[0] === rect1[1] && orderedY[1] === rect2[1] || orderedY[0] === rect2[1] && orderedY[1] === rect1[1]) {
-      result[1] = orderedY[1];
-      result[3] = orderedY[2];
-    } else {
+    const yLow = Math.max(Math.min(rect1[1], rect1[3]), Math.min(rect2[1], rect2[3]));
+    const yHigh = Math.min(Math.max(rect1[1], rect1[3]), Math.max(rect2[1], rect2[3]));
+
+    if (yLow > yHigh) {
       return null;
     }
 
-    return result;
+    return [xLow, yLow, xHigh, yHigh];
+  }
+
+  static bezierBoundingBox(x0, y0, x1, y1, x2, y2, x3, y3) {
+    const tvalues = [],
+          bounds = [[], []];
+    let a, b, c, t, t1, t2, b2ac, sqrtb2ac;
+
+    for (let i = 0; i < 2; ++i) {
+      if (i === 0) {
+        b = 6 * x0 - 12 * x1 + 6 * x2;
+        a = -3 * x0 + 9 * x1 - 9 * x2 + 3 * x3;
+        c = 3 * x1 - 3 * x0;
+      } else {
+        b = 6 * y0 - 12 * y1 + 6 * y2;
+        a = -3 * y0 + 9 * y1 - 9 * y2 + 3 * y3;
+        c = 3 * y1 - 3 * y0;
+      }
+
+      if (Math.abs(a) < 1e-12) {
+        if (Math.abs(b) < 1e-12) {
+          continue;
+        }
+
+        t = -c / b;
+
+        if (0 < t && t < 1) {
+          tvalues.push(t);
+        }
+
+        continue;
+      }
+
+      b2ac = b * b - 4 * c * a;
+      sqrtb2ac = Math.sqrt(b2ac);
+
+      if (b2ac < 0) {
+        continue;
+      }
+
+      t1 = (-b + sqrtb2ac) / (2 * a);
+
+      if (0 < t1 && t1 < 1) {
+        tvalues.push(t1);
+      }
+
+      t2 = (-b - sqrtb2ac) / (2 * a);
+
+      if (0 < t2 && t2 < 1) {
+        tvalues.push(t2);
+      }
+    }
+
+    let j = tvalues.length,
+        mt;
+    const jlen = j;
+
+    while (j--) {
+      t = tvalues[j];
+      mt = 1 - t;
+      bounds[0][j] = mt * mt * mt * x0 + 3 * mt * mt * t * x1 + 3 * mt * t * t * x2 + t * t * t * x3;
+      bounds[1][j] = mt * mt * mt * y0 + 3 * mt * mt * t * y1 + 3 * mt * t * t * y2 + t * t * t * y3;
+    }
+
+    bounds[0][jlen] = x0;
+    bounds[1][jlen] = y0;
+    bounds[0][jlen + 1] = x3;
+    bounds[1][jlen + 1] = y3;
+    bounds[0].length = bounds[1].length = jlen + 2;
+    return [Math.min(...bounds[0]), Math.min(...bounds[1]), Math.max(...bounds[0]), Math.max(...bounds[1])];
   }
 
 }
 
 exports.Util = Util;
-const PDFStringTranslateTable = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014, 0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C, 0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160, 0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC];
+const PDFStringTranslateTable = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2d8, 0x2c7, 0x2c6, 0x2d9, 0x2dd, 0x2db, 0x2da, 0x2dc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014, 0x2013, 0x192, 0x2044, 0x2039, 0x203a, 0x2212, 0x2030, 0x201e, 0x201c, 0x201d, 0x2018, 0x2019, 0x201a, 0x2122, 0xfb01, 0xfb02, 0x141, 0x152, 0x160, 0x178, 0x17d, 0x131, 0x142, 0x153, 0x161, 0x17e, 0, 0x20ac];
 
 function stringToPDFString(str) {
-  const length = str.length,
-        strBuf = [];
+  if (str[0] >= "\xEF") {
+    let encoding;
 
-  if (str[0] === "\xFE" && str[1] === "\xFF") {
-    for (let i = 2; i < length; i += 2) {
-      strBuf.push(String.fromCharCode(str.charCodeAt(i) << 8 | str.charCodeAt(i + 1)));
+    if (str[0] === "\xFE" && str[1] === "\xFF") {
+      encoding = "utf-16be";
+    } else if (str[0] === "\xFF" && str[1] === "\xFE") {
+      encoding = "utf-16le";
+    } else if (str[0] === "\xEF" && str[1] === "\xBB" && str[2] === "\xBF") {
+      encoding = "utf-8";
     }
-  } else if (str[0] === "\xFF" && str[1] === "\xFE") {
-    for (let i = 2; i < length; i += 2) {
-      strBuf.push(String.fromCharCode(str.charCodeAt(i + 1) << 8 | str.charCodeAt(i)));
-    }
-  } else {
-    for (let i = 0; i < length; ++i) {
-      const code = PDFStringTranslateTable[str.charCodeAt(i)];
-      strBuf.push(code ? String.fromCharCode(code) : str.charAt(i));
+
+    if (encoding) {
+      try {
+        const decoder = new TextDecoder(encoding, {
+          fatal: true
+        });
+        const buffer = stringToBytes(str);
+        return decoder.decode(buffer);
+      } catch (ex) {
+        warn(`stringToPDFString: "${ex}".`);
+      }
     }
   }
 
+  const strBuf = [];
+
+  for (let i = 0, ii = str.length; i < ii; i++) {
+    const code = PDFStringTranslateTable[str.charCodeAt(i)];
+    strBuf.push(code ? String.fromCharCode(code) : str.charAt(i));
+  }
+
   return strBuf.join("");
 }
 
 function escapeString(str) {
-  return str.replace(/([\(\)\\])/g, "\\$1");
+  return str.replace(/([()\\\n\r])/g, match => {
+    if (match === "\n") {
+      return "\\n";
+    } else if (match === "\r") {
+      return "\\r";
+    }
+
+    return `\\${match}`;
+  });
+}
+
+function isAscii(str) {
+  return /^[\x00-\x7F]*$/.test(str);
+}
+
+function stringToUTF16BEString(str) {
+  const buf = ["\xFE\xFF"];
+
+  for (let i = 0, ii = str.length; i < ii; i++) {
+    const char = str.charCodeAt(i);
+    buf.push(String.fromCharCode(char >> 8 & 0xff), String.fromCharCode(char & 0xff));
+  }
+
+  return buf.join("");
 }
 
 function stringToUTF8String(str) {
@@ -1494,18 +1725,6 @@ function utf8StringToString(str) {
   return unescape(encodeURIComponent(str));
 }
 
-function isBool(v) {
-  return typeof v === "boolean";
-}
-
-function isNum(v) {
-  return typeof v === "number";
-}
-
-function isString(v) {
-  return typeof v === "string";
-}
-
 function isArrayBuffer(v) {
   return typeof v === "object" && v !== null && v.byteLength !== undefined;
 }
@@ -1515,13 +1734,17 @@ function isArrayEqual(arr1, arr2) {
     return false;
   }
 
-  return arr1.every(function (element, index) {
-    return element === arr2[index];
-  });
+  for (let i = 0, ii = arr1.length; i < ii; i++) {
+    if (arr1[i] !== arr2[i]) {
+      return false;
+    }
+  }
+
+  return true;
 }
 
-function getModificationDate(date = new Date(Date.now())) {
-  const buffer = [date.getUTCFullYear().toString(), (date.getUTCMonth() + 1).toString().padStart(2, "0"), (date.getUTCDate() + 1).toString().padStart(2, "0"), date.getUTCHours().toString().padStart(2, "0"), date.getUTCMinutes().toString().padStart(2, "0"), date.getUTCSeconds().toString().padStart(2, "0")];
+function getModificationDate(date = new Date()) {
+  const buffer = [date.getUTCFullYear().toString(), (date.getUTCMonth() + 1).toString().padStart(2, "0"), date.getUTCDate().toString().padStart(2, "0"), date.getUTCHours().toString().padStart(2, "0"), date.getUTCMinutes().toString().padStart(2, "0"), date.getUTCSeconds().toString().padStart(2, "0")];
   return buffer.join("");
 }
 
@@ -1548,40 +1771,10 @@ function createPromiseCapability() {
   return capability;
 }
 
-const createObjectURL = function createObjectURLClosure() {
-  const digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-  return function createObjectURL(data, contentType, forceDataSchema = false) {
-    if (!forceDataSchema && URL.createObjectURL) {
-      const blob = new Blob([data], {
-        type: contentType
-      });
-      return URL.createObjectURL(blob);
-    }
-
-    let buffer = `data:${contentType};base64,`;
-
-    for (let i = 0, ii = data.length; i < ii; i += 3) {
-      const b1 = data[i] & 0xff;
-      const b2 = data[i + 1] & 0xff;
-      const b3 = data[i + 2] & 0xff;
-      const d1 = b1 >> 2,
-            d2 = (b1 & 3) << 4 | b2 >> 4;
-      const d3 = i + 1 < ii ? (b2 & 0xf) << 2 | b3 >> 6 : 64;
-      const d4 = i + 2 < ii ? b3 & 0x3f : 64;
-      buffer += digits[d1] + digits[d2] + digits[d3] + digits[d4];
-    }
-
-    return buffer;
-  };
-}();
-
-exports.createObjectURL = createObjectURL;
-
 /***/ }),
 /* 3 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+/***/ ((__unused_webpack_module, __unused_webpack_exports, __w_pdfjs_require__) => {
 
-"use strict";
 
 
 var _is_node = __w_pdfjs_require__(4);
@@ -1590,95 +1783,92 @@ var _is_node = __w_pdfjs_require__(4);
 
 /***/ }),
 /* 4 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.isNodeJS = void 0;
 const isNodeJS = typeof process === "object" && process + "" === "[object process]" && !process.versions.nw && !(process.versions.electron && process.type && process.type !== "browser");
 exports.isNodeJS = isNodeJS;
 
 /***/ }),
 /* 5 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.RefSetCache = exports.RefSet = exports.Ref = exports.Name = exports.EOF = exports.Dict = exports.Cmd = exports.CIRCULAR_REF = void 0;
 exports.clearPrimitiveCaches = clearPrimitiveCaches;
-exports.isEOF = isEOF;
 exports.isCmd = isCmd;
 exports.isDict = isDict;
 exports.isName = isName;
-exports.isRef = isRef;
 exports.isRefsEqual = isRefsEqual;
-exports.isStream = isStream;
-exports.RefSetCache = exports.RefSet = exports.Ref = exports.Name = exports.Dict = exports.Cmd = exports.EOF = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
-var EOF = {};
+const CIRCULAR_REF = Symbol("CIRCULAR_REF");
+exports.CIRCULAR_REF = CIRCULAR_REF;
+const EOF = Symbol("EOF");
 exports.EOF = EOF;
 
-var Name = function NameClosure() {
+const Name = function NameClosure() {
   let nameCache = Object.create(null);
 
-  function Name(name) {
-    this.name = name;
+  class Name {
+    constructor(name) {
+      this.name = name;
+    }
+
+    static get(name) {
+      return nameCache[name] || (nameCache[name] = new Name(name));
+    }
+
+    static _clearCache() {
+      nameCache = Object.create(null);
+    }
+
   }
 
-  Name.prototype = {};
-
-  Name.get = function Name_get(name) {
-    var nameValue = nameCache[name];
-    return nameValue ? nameValue : nameCache[name] = new Name(name);
-  };
-
-  Name._clearCache = function () {
-    nameCache = Object.create(null);
-  };
-
   return Name;
 }();
 
 exports.Name = Name;
 
-var Cmd = function CmdClosure() {
+const Cmd = function CmdClosure() {
   let cmdCache = Object.create(null);
 
-  function Cmd(cmd) {
-    this.cmd = cmd;
+  class Cmd {
+    constructor(cmd) {
+      this.cmd = cmd;
+    }
+
+    static get(cmd) {
+      return cmdCache[cmd] || (cmdCache[cmd] = new Cmd(cmd));
+    }
+
+    static _clearCache() {
+      cmdCache = Object.create(null);
+    }
+
   }
 
-  Cmd.prototype = {};
-
-  Cmd.get = function Cmd_get(cmd) {
-    var cmdValue = cmdCache[cmd];
-    return cmdValue ? cmdValue : cmdCache[cmd] = new Cmd(cmd);
-  };
-
-  Cmd._clearCache = function () {
-    cmdCache = Object.create(null);
-  };
-
   return Cmd;
 }();
 
 exports.Cmd = Cmd;
 
-var Dict = function DictClosure() {
-  var nonSerializable = function nonSerializableClosure() {
-    return nonSerializable;
-  };
+const nonSerializable = function nonSerializableClosure() {
+  return nonSerializable;
+};
 
-  function Dict(xref) {
+class Dict {
+  constructor(xref = null) {
     this._map = Object.create(null);
     this.xref = xref;
     this.objId = null;
@@ -1686,118 +1876,121 @@ var Dict = function DictClosure() {
     this.__nonSerializable__ = nonSerializable;
   }
 
-  Dict.prototype = {
-    assignXref: function Dict_assignXref(newXref) {
-      this.xref = newXref;
-    },
+  assignXref(newXref) {
+    this.xref = newXref;
+  }
 
-    get size() {
-      return Object.keys(this._map).length;
-    },
+  get size() {
+    return Object.keys(this._map).length;
+  }
 
-    get(key1, key2, key3) {
-      let value = this._map[key1];
+  get(key1, key2, key3) {
+    let value = this._map[key1];
 
-      if (value === undefined && key2 !== undefined) {
-        value = this._map[key2];
+    if (value === undefined && key2 !== undefined) {
+      value = this._map[key2];
 
-        if (value === undefined && key3 !== undefined) {
-          value = this._map[key3];
-        }
+      if (value === undefined && key3 !== undefined) {
+        value = this._map[key3];
       }
+    }
 
-      if (value instanceof Ref && this.xref) {
-        return this.xref.fetch(value, this.suppressEncryption);
+    if (value instanceof Ref && this.xref) {
+      return this.xref.fetch(value, this.suppressEncryption);
+    }
+
+    return value;
+  }
+
+  async getAsync(key1, key2, key3) {
+    let value = this._map[key1];
+
+    if (value === undefined && key2 !== undefined) {
+      value = this._map[key2];
+
+      if (value === undefined && key3 !== undefined) {
+        value = this._map[key3];
       }
+    }
 
-      return value;
-    },
+    if (value instanceof Ref && this.xref) {
+      return this.xref.fetchAsync(value, this.suppressEncryption);
+    }
 
-    async getAsync(key1, key2, key3) {
-      let value = this._map[key1];
+    return value;
+  }
 
-      if (value === undefined && key2 !== undefined) {
-        value = this._map[key2];
+  getArray(key1, key2, key3) {
+    let value = this._map[key1];
 
-        if (value === undefined && key3 !== undefined) {
-          value = this._map[key3];
-        }
+    if (value === undefined && key2 !== undefined) {
+      value = this._map[key2];
+
+      if (value === undefined && key3 !== undefined) {
+        value = this._map[key3];
       }
+    }
 
-      if (value instanceof Ref && this.xref) {
-        return this.xref.fetchAsync(value, this.suppressEncryption);
-      }
-
-      return value;
-    },
-
-    getArray(key1, key2, key3) {
-      let value = this.get(key1, key2, key3);
-
-      if (!Array.isArray(value) || !this.xref) {
-        return value;
-      }
+    if (value instanceof Ref && this.xref) {
+      value = this.xref.fetch(value, this.suppressEncryption);
+    }
 
+    if (Array.isArray(value)) {
       value = value.slice();
 
       for (let i = 0, ii = value.length; i < ii; i++) {
-        if (!(value[i] instanceof Ref)) {
-          continue;
+        if (value[i] instanceof Ref && this.xref) {
+          value[i] = this.xref.fetch(value[i], this.suppressEncryption);
         }
-
-        value[i] = this.xref.fetch(value[i], this.suppressEncryption);
-      }
-
-      return value;
-    },
-
-    getRaw: function Dict_getRaw(key) {
-      return this._map[key];
-    },
-    getKeys: function Dict_getKeys() {
-      return Object.keys(this._map);
-    },
-    getRawValues: function Dict_getRawValues() {
-      return Object.values(this._map);
-    },
-    set: function Dict_set(key, value) {
-      this._map[key] = value;
-    },
-    has: function Dict_has(key) {
-      return this._map[key] !== undefined;
-    },
-    forEach: function Dict_forEach(callback) {
-      for (var key in this._map) {
-        callback(key, this.get(key));
       }
     }
-  };
-  Dict.empty = new Dict(null);
 
-  Dict.merge = function ({
+    return value;
+  }
+
+  getRaw(key) {
+    return this._map[key];
+  }
+
+  getKeys() {
+    return Object.keys(this._map);
+  }
+
+  getRawValues() {
+    return Object.values(this._map);
+  }
+
+  set(key, value) {
+    this._map[key] = value;
+  }
+
+  has(key) {
+    return this._map[key] !== undefined;
+  }
+
+  forEach(callback) {
+    for (const key in this._map) {
+      callback(key, this.get(key));
+    }
+  }
+
+  static get empty() {
+    const emptyDict = new Dict(null);
+
+    emptyDict.set = (key, value) => {
+      (0, _util.unreachable)("Should not call `set` on the empty dictionary.");
+    };
+
+    return (0, _util.shadow)(this, "empty", emptyDict);
+  }
+
+  static merge({
     xref,
     dictArray,
     mergeSubDicts = false
   }) {
-    const mergedDict = new Dict(xref);
-
-    if (!mergeSubDicts) {
-      for (const dict of dictArray) {
-        if (!(dict instanceof Dict)) {
-          continue;
-        }
-
-        for (const [key, value] of Object.entries(dict._map)) {
-          if (mergedDict._map[key] === undefined) {
-            mergedDict._map[key] = value;
-          }
-        }
-      }
-
-      return mergedDict.size > 0 ? mergedDict : Dict.empty;
-    }
-
-    const properties = new Map();
+    const mergedDict = new Dict(xref),
+          properties = new Map();
 
     for (const dict of dictArray) {
       if (!(dict instanceof Dict)) {
@@ -1810,6 +2003,8 @@ var Dict = function DictClosure() {
         if (property === undefined) {
           property = [];
           properties.set(key, property);
+        } else if (!mergeSubDicts || !(value instanceof Dict)) {
+          continue;
         }
 
         property.push(value);
@@ -1825,10 +2020,6 @@ var Dict = function DictClosure() {
       const subDict = new Dict(xref);
 
       for (const dict of values) {
-        if (!(dict instanceof Dict)) {
-          continue;
-        }
-
         for (const [key, value] of Object.entries(dict._map)) {
           if (subDict._map[key] === undefined) {
             subDict._map[key] = value;
@@ -1843,40 +2034,39 @@ var Dict = function DictClosure() {
 
     properties.clear();
     return mergedDict.size > 0 ? mergedDict : Dict.empty;
-  };
+  }
 
-  return Dict;
-}();
+}
 
 exports.Dict = Dict;
 
-var Ref = function RefClosure() {
+const Ref = function RefClosure() {
   let refCache = Object.create(null);
 
-  function Ref(num, gen) {
-    this.num = num;
-    this.gen = gen;
-  }
+  class Ref {
+    constructor(num, gen) {
+      this.num = num;
+      this.gen = gen;
+    }
 
-  Ref.prototype = {
-    toString: function Ref_toString() {
+    toString() {
       if (this.gen === 0) {
         return `${this.num}R`;
       }
 
       return `${this.num}R${this.gen}`;
     }
-  };
 
-  Ref.get = function (num, gen) {
-    const key = gen === 0 ? `${num}R` : `${num}R${gen}`;
-    const refValue = refCache[key];
-    return refValue ? refValue : refCache[key] = new Ref(num, gen);
-  };
+    static get(num, gen) {
+      const key = gen === 0 ? `${num}R` : `${num}R${gen}`;
+      return refCache[key] || (refCache[key] = new Ref(num, gen));
+    }
 
-  Ref._clearCache = function () {
-    refCache = Object.create(null);
-  };
+    static _clearCache() {
+      refCache = Object.create(null);
+    }
+
+  }
 
   return Ref;
 }();
@@ -1884,8 +2074,8 @@ var Ref = function RefClosure() {
 exports.Ref = Ref;
 
 class RefSet {
-  constructor() {
-    this._set = new Set();
+  constructor(parent = null) {
+    this._set = new Set(parent && parent._set);
   }
 
   has(ref) {
@@ -1900,6 +2090,14 @@ class RefSet {
     this._set.delete(ref.toString());
   }
 
+  [Symbol.iterator]() {
+    return this._set.values();
+  }
+
+  clear() {
+    this._set.clear();
+  }
+
 }
 
 exports.RefSet = RefSet;
@@ -1929,10 +2127,8 @@ class RefSetCache {
     this._map.set(ref.toString(), this.get(aliasRef));
   }
 
-  forEach(callback) {
-    for (const value of this._map.values()) {
-      callback(value);
-    }
+  [Symbol.iterator]() {
+    return this._map.values();
   }
 
   clear() {
@@ -1943,10 +2139,6 @@ class RefSetCache {
 
 exports.RefSetCache = RefSetCache;
 
-function isEOF(v) {
-  return v === EOF;
-}
-
 function isName(v, name) {
   return v instanceof Name && (name === undefined || v.name === name);
 }
@@ -1959,18 +2151,10 @@ function isDict(v, type) {
   return v instanceof Dict && (type === undefined || isName(v.get("Type"), type));
 }
 
-function isRef(v) {
-  return v instanceof Ref;
-}
-
 function isRefsEqual(v1, v2) {
   return v1.num === v2.num && v1.gen === v2.gen;
 }
 
-function isStream(v) {
-  return typeof v === "object" && v !== null && v.getBytes !== undefined;
-}
-
 function clearPrimitiveCaches() {
   Cmd._clearCache();
 
@@ -1981,25 +2165,677 @@ function clearPrimitiveCaches() {
 
 /***/ }),
 /* 6 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.XRefParseException = exports.XRefEntryException = exports.ParserEOFException = exports.MissingDataException = exports.DocStats = void 0;
+exports.collectActions = collectActions;
+exports.encodeToXmlString = encodeToXmlString;
+exports.escapePDFName = escapePDFName;
+exports.getArrayLookupTableFactory = getArrayLookupTableFactory;
+exports.getInheritableProperty = getInheritableProperty;
+exports.getLookupTableFactory = getLookupTableFactory;
+exports.getNewAnnotationsMap = getNewAnnotationsMap;
+exports.isWhiteSpace = isWhiteSpace;
+exports.log2 = log2;
+exports.numberToString = numberToString;
+exports.parseXFAPath = parseXFAPath;
+exports.readInt8 = readInt8;
+exports.readUint16 = readUint16;
+exports.readUint32 = readUint32;
+exports.recoverJsURL = recoverJsURL;
+exports.toRomanNumerals = toRomanNumerals;
+exports.validateCSSFont = validateCSSFont;
+
+var _util = __w_pdfjs_require__(2);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _base_stream = __w_pdfjs_require__(7);
+
+function getLookupTableFactory(initializer) {
+  let lookup;
+  return function () {
+    if (initializer) {
+      lookup = Object.create(null);
+      initializer(lookup);
+      initializer = null;
+    }
+
+    return lookup;
+  };
+}
+
+function getArrayLookupTableFactory(initializer) {
+  let lookup;
+  return function () {
+    if (initializer) {
+      let arr = initializer();
+      initializer = null;
+      lookup = Object.create(null);
+
+      for (let i = 0, ii = arr.length; i < ii; i += 2) {
+        lookup[arr[i]] = arr[i + 1];
+      }
+
+      arr = null;
+    }
+
+    return lookup;
+  };
+}
+
+class MissingDataException extends _util.BaseException {
+  constructor(begin, end) {
+    super(`Missing data [${begin}, ${end})`, "MissingDataException");
+    this.begin = begin;
+    this.end = end;
+  }
+
+}
+
+exports.MissingDataException = MissingDataException;
+
+class ParserEOFException extends _util.BaseException {
+  constructor(msg) {
+    super(msg, "ParserEOFException");
+  }
+
+}
+
+exports.ParserEOFException = ParserEOFException;
+
+class XRefEntryException extends _util.BaseException {
+  constructor(msg) {
+    super(msg, "XRefEntryException");
+  }
+
+}
+
+exports.XRefEntryException = XRefEntryException;
+
+class XRefParseException extends _util.BaseException {
+  constructor(msg) {
+    super(msg, "XRefParseException");
+  }
+
+}
+
+exports.XRefParseException = XRefParseException;
+
+class DocStats {
+  constructor(handler) {
+    this._handler = handler;
+    this._streamTypes = new Set();
+    this._fontTypes = new Set();
+  }
+
+  _send() {
+    const streamTypes = Object.create(null),
+          fontTypes = Object.create(null);
+
+    for (const type of this._streamTypes) {
+      streamTypes[type] = true;
+    }
+
+    for (const type of this._fontTypes) {
+      fontTypes[type] = true;
+    }
+
+    this._handler.send("DocStats", {
+      streamTypes,
+      fontTypes
+    });
+  }
+
+  addStreamType(type) {
+    if (this._streamTypes.has(type)) {
+      return;
+    }
+
+    this._streamTypes.add(type);
+
+    this._send();
+  }
+
+  addFontType(type) {
+    if (this._fontTypes.has(type)) {
+      return;
+    }
+
+    this._fontTypes.add(type);
+
+    this._send();
+  }
+
+}
+
+exports.DocStats = DocStats;
+
+function getInheritableProperty({
+  dict,
+  key,
+  getArray = false,
+  stopWhenFound = true
+}) {
+  let values;
+  const visited = new _primitives.RefSet();
+
+  while (dict instanceof _primitives.Dict && !(dict.objId && visited.has(dict.objId))) {
+    if (dict.objId) {
+      visited.put(dict.objId);
+    }
+
+    const value = getArray ? dict.getArray(key) : dict.get(key);
+
+    if (value !== undefined) {
+      if (stopWhenFound) {
+        return value;
+      }
+
+      if (!values) {
+        values = [];
+      }
+
+      values.push(value);
+    }
+
+    dict = dict.get("Parent");
+  }
+
+  return values;
+}
+
+const ROMAN_NUMBER_MAP = ["", "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM", "", "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC", "", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"];
+
+function toRomanNumerals(number, lowerCase = false) {
+  (0, _util.assert)(Number.isInteger(number) && number > 0, "The number should be a positive integer.");
+  const romanBuf = [];
+  let pos;
+
+  while (number >= 1000) {
+    number -= 1000;
+    romanBuf.push("M");
+  }
+
+  pos = number / 100 | 0;
+  number %= 100;
+  romanBuf.push(ROMAN_NUMBER_MAP[pos]);
+  pos = number / 10 | 0;
+  number %= 10;
+  romanBuf.push(ROMAN_NUMBER_MAP[10 + pos]);
+  romanBuf.push(ROMAN_NUMBER_MAP[20 + number]);
+  const romanStr = romanBuf.join("");
+  return lowerCase ? romanStr.toLowerCase() : romanStr;
+}
+
+function log2(x) {
+  if (x <= 0) {
+    return 0;
+  }
+
+  return Math.ceil(Math.log2(x));
+}
+
+function readInt8(data, offset) {
+  return data[offset] << 24 >> 24;
+}
+
+function readUint16(data, offset) {
+  return data[offset] << 8 | data[offset + 1];
+}
+
+function readUint32(data, offset) {
+  return (data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3]) >>> 0;
+}
+
+function isWhiteSpace(ch) {
+  return ch === 0x20 || ch === 0x09 || ch === 0x0d || ch === 0x0a;
+}
+
+function parseXFAPath(path) {
+  const positionPattern = /(.+)\[(\d+)\]$/;
+  return path.split(".").map(component => {
+    const m = component.match(positionPattern);
+
+    if (m) {
+      return {
+        name: m[1],
+        pos: parseInt(m[2], 10)
+      };
+    }
+
+    return {
+      name: component,
+      pos: 0
+    };
+  });
+}
+
+function escapePDFName(str) {
+  const buffer = [];
+  let start = 0;
+
+  for (let i = 0, ii = str.length; i < ii; i++) {
+    const char = str.charCodeAt(i);
+
+    if (char < 0x21 || char > 0x7e || char === 0x23 || char === 0x28 || char === 0x29 || char === 0x3c || char === 0x3e || char === 0x5b || char === 0x5d || char === 0x7b || char === 0x7d || char === 0x2f || char === 0x25) {
+      if (start < i) {
+        buffer.push(str.substring(start, i));
+      }
+
+      buffer.push(`#${char.toString(16)}`);
+      start = i + 1;
+    }
+  }
+
+  if (buffer.length === 0) {
+    return str;
+  }
+
+  if (start < str.length) {
+    buffer.push(str.substring(start, str.length));
+  }
+
+  return buffer.join("");
+}
+
+function _collectJS(entry, xref, list, parents) {
+  if (!entry) {
+    return;
+  }
+
+  let parent = null;
+
+  if (entry instanceof _primitives.Ref) {
+    if (parents.has(entry)) {
+      return;
+    }
+
+    parent = entry;
+    parents.put(parent);
+    entry = xref.fetch(entry);
+  }
+
+  if (Array.isArray(entry)) {
+    for (const element of entry) {
+      _collectJS(element, xref, list, parents);
+    }
+  } else if (entry instanceof _primitives.Dict) {
+    if ((0, _primitives.isName)(entry.get("S"), "JavaScript")) {
+      const js = entry.get("JS");
+      let code;
+
+      if (js instanceof _base_stream.BaseStream) {
+        code = js.getString();
+      } else if (typeof js === "string") {
+        code = js;
+      }
+
+      code = code && (0, _util.stringToPDFString)(code).replace(/\u0000/g, "");
+
+      if (code) {
+        list.push(code);
+      }
+    }
+
+    _collectJS(entry.getRaw("Next"), xref, list, parents);
+  }
+
+  if (parent) {
+    parents.remove(parent);
+  }
+}
+
+function collectActions(xref, dict, eventType) {
+  const actions = Object.create(null);
+  const additionalActionsDicts = getInheritableProperty({
+    dict,
+    key: "AA",
+    stopWhenFound: false
+  });
+
+  if (additionalActionsDicts) {
+    for (let i = additionalActionsDicts.length - 1; i >= 0; i--) {
+      const additionalActions = additionalActionsDicts[i];
+
+      if (!(additionalActions instanceof _primitives.Dict)) {
+        continue;
+      }
+
+      for (const key of additionalActions.getKeys()) {
+        const action = eventType[key];
+
+        if (!action) {
+          continue;
+        }
+
+        const actionDict = additionalActions.getRaw(key);
+        const parents = new _primitives.RefSet();
+        const list = [];
+
+        _collectJS(actionDict, xref, list, parents);
+
+        if (list.length > 0) {
+          actions[action] = list;
+        }
+      }
+    }
+  }
+
+  if (dict.has("A")) {
+    const actionDict = dict.get("A");
+    const parents = new _primitives.RefSet();
+    const list = [];
+
+    _collectJS(actionDict, xref, list, parents);
+
+    if (list.length > 0) {
+      actions.Action = list;
+    }
+  }
+
+  return (0, _util.objectSize)(actions) > 0 ? actions : null;
+}
+
+const XMLEntities = {
+  0x3c: "&lt;",
+  0x3e: "&gt;",
+  0x26: "&amp;",
+  0x22: "&quot;",
+  0x27: "&apos;"
+};
+
+function encodeToXmlString(str) {
+  const buffer = [];
+  let start = 0;
+
+  for (let i = 0, ii = str.length; i < ii; i++) {
+    const char = str.codePointAt(i);
+
+    if (0x20 <= char && char <= 0x7e) {
+      const entity = XMLEntities[char];
+
+      if (entity) {
+        if (start < i) {
+          buffer.push(str.substring(start, i));
+        }
+
+        buffer.push(entity);
+        start = i + 1;
+      }
+    } else {
+      if (start < i) {
+        buffer.push(str.substring(start, i));
+      }
+
+      buffer.push(`&#x${char.toString(16).toUpperCase()};`);
+
+      if (char > 0xd7ff && (char < 0xe000 || char > 0xfffd)) {
+        i++;
+      }
+
+      start = i + 1;
+    }
+  }
+
+  if (buffer.length === 0) {
+    return str;
+  }
+
+  if (start < str.length) {
+    buffer.push(str.substring(start, str.length));
+  }
+
+  return buffer.join("");
+}
+
+function validateCSSFont(cssFontInfo) {
+  const DEFAULT_CSS_FONT_OBLIQUE = "14";
+  const DEFAULT_CSS_FONT_WEIGHT = "400";
+  const CSS_FONT_WEIGHT_VALUES = new Set(["100", "200", "300", "400", "500", "600", "700", "800", "900", "1000", "normal", "bold", "bolder", "lighter"]);
+  const {
+    fontFamily,
+    fontWeight,
+    italicAngle
+  } = cssFontInfo;
+
+  if (/^".*"$/.test(fontFamily)) {
+    if (/[^\\]"/.test(fontFamily.slice(1, fontFamily.length - 1))) {
+      (0, _util.warn)(`XFA - FontFamily contains some unescaped ": ${fontFamily}.`);
+      return false;
+    }
+  } else if (/^'.*'$/.test(fontFamily)) {
+    if (/[^\\]'/.test(fontFamily.slice(1, fontFamily.length - 1))) {
+      (0, _util.warn)(`XFA - FontFamily contains some unescaped ': ${fontFamily}.`);
+      return false;
+    }
+  } else {
+    for (const ident of fontFamily.split(/[ \t]+/)) {
+      if (/^(\d|(-(\d|-)))/.test(ident) || !/^[\w-\\]+$/.test(ident)) {
+        (0, _util.warn)(`XFA - FontFamily contains some invalid <custom-ident>: ${fontFamily}.`);
+        return false;
+      }
+    }
+  }
+
+  const weight = fontWeight ? fontWeight.toString() : "";
+  cssFontInfo.fontWeight = CSS_FONT_WEIGHT_VALUES.has(weight) ? weight : DEFAULT_CSS_FONT_WEIGHT;
+  const angle = parseFloat(italicAngle);
+  cssFontInfo.italicAngle = isNaN(angle) || angle < -90 || angle > 90 ? DEFAULT_CSS_FONT_OBLIQUE : italicAngle.toString();
+  return true;
+}
+
+function recoverJsURL(str) {
+  const URL_OPEN_METHODS = ["app.launchURL", "window.open", "xfa.host.gotoURL"];
+  const regex = new RegExp("^\\s*(" + URL_OPEN_METHODS.join("|").split(".").join("\\.") + ")\\((?:'|\")([^'\"]*)(?:'|\")(?:,\\s*(\\w+)\\)|\\))", "i");
+  const jsUrl = regex.exec(str);
+
+  if (jsUrl && jsUrl[2]) {
+    const url = jsUrl[2];
+    let newWindow = false;
+
+    if (jsUrl[3] === "true" && jsUrl[1] === "app.launchURL") {
+      newWindow = true;
+    }
+
+    return {
+      url,
+      newWindow
+    };
+  }
+
+  return null;
+}
+
+function numberToString(value) {
+  if (Number.isInteger(value)) {
+    return value.toString();
+  }
+
+  const roundedValue = Math.round(value * 100);
+
+  if (roundedValue % 100 === 0) {
+    return (roundedValue / 100).toString();
+  }
+
+  if (roundedValue % 10 === 0) {
+    return value.toFixed(1);
+  }
+
+  return value.toFixed(2);
+}
+
+function getNewAnnotationsMap(annotationStorage) {
+  if (!annotationStorage) {
+    return null;
+  }
+
+  const newAnnotationsByPage = new Map();
+
+  for (const [key, value] of annotationStorage) {
+    if (!key.startsWith(_util.AnnotationEditorPrefix)) {
+      continue;
+    }
+
+    let annotations = newAnnotationsByPage.get(value.pageIndex);
+
+    if (!annotations) {
+      annotations = [];
+      newAnnotationsByPage.set(value.pageIndex, annotations);
+    }
+
+    annotations.push(value);
+  }
+
+  return newAnnotationsByPage.size > 0 ? newAnnotationsByPage : null;
+}
+
+/***/ }),
+/* 7 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.BaseStream = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+class BaseStream {
+  constructor() {
+    if (this.constructor === BaseStream) {
+      (0, _util.unreachable)("Cannot initialize BaseStream.");
+    }
+  }
+
+  get length() {
+    (0, _util.unreachable)("Abstract getter `length` accessed");
+  }
+
+  get isEmpty() {
+    (0, _util.unreachable)("Abstract getter `isEmpty` accessed");
+  }
+
+  get isDataLoaded() {
+    return (0, _util.shadow)(this, "isDataLoaded", true);
+  }
+
+  getByte() {
+    (0, _util.unreachable)("Abstract method `getByte` called");
+  }
+
+  getBytes(length) {
+    (0, _util.unreachable)("Abstract method `getBytes` called");
+  }
+
+  peekByte() {
+    const peekedByte = this.getByte();
+
+    if (peekedByte !== -1) {
+      this.pos--;
+    }
+
+    return peekedByte;
+  }
+
+  peekBytes(length) {
+    const bytes = this.getBytes(length);
+    this.pos -= bytes.length;
+    return bytes;
+  }
+
+  getUint16() {
+    const b0 = this.getByte();
+    const b1 = this.getByte();
+
+    if (b0 === -1 || b1 === -1) {
+      return -1;
+    }
+
+    return (b0 << 8) + b1;
+  }
+
+  getInt32() {
+    const b0 = this.getByte();
+    const b1 = this.getByte();
+    const b2 = this.getByte();
+    const b3 = this.getByte();
+    return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
+  }
+
+  getByteRange(begin, end) {
+    (0, _util.unreachable)("Abstract method `getByteRange` called");
+  }
+
+  getString(length) {
+    return (0, _util.bytesToString)(this.getBytes(length));
+  }
+
+  skip(n) {
+    this.pos += n || 1;
+  }
+
+  reset() {
+    (0, _util.unreachable)("Abstract method `reset` called");
+  }
+
+  moveStart() {
+    (0, _util.unreachable)("Abstract method `moveStart` called");
+  }
+
+  makeSubStream(start, length, dict = null) {
+    (0, _util.unreachable)("Abstract method `makeSubStream` called");
+  }
+
+  getBaseStreams() {
+    return null;
+  }
+
+}
+
+exports.BaseStream = BaseStream;
+
+/***/ }),
+/* 8 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.NetworkPdfManager = exports.LocalPdfManager = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
-var _chunked_stream = __w_pdfjs_require__(7);
+var _chunked_stream = __w_pdfjs_require__(9);
 
-var _core_utils = __w_pdfjs_require__(8);
+var _core_utils = __w_pdfjs_require__(6);
 
-var _document = __w_pdfjs_require__(9);
+var _document = __w_pdfjs_require__(11);
 
-var _stream = __w_pdfjs_require__(12);
+var _stream = __w_pdfjs_require__(10);
+
+function parseDocBaseUrl(url) {
+  if (url) {
+    const absoluteUrl = (0, _util.createValidAbsoluteUrl)(url);
+
+    if (absoluteUrl) {
+      return absoluteUrl.href;
+    }
+
+    (0, _util.warn)(`Invalid absolute docBaseUrl: "${url}".`);
+  }
+
+  return null;
+}
 
 class BasePdfManager {
   constructor() {
@@ -2017,19 +2853,8 @@ class BasePdfManager {
   }
 
   get docBaseUrl() {
-    let docBaseUrl = null;
-
-    if (this._docBaseUrl) {
-      const absoluteUrl = (0, _util.createValidAbsoluteUrl)(this._docBaseUrl);
-
-      if (absoluteUrl) {
-        docBaseUrl = absoluteUrl.href;
-      } else {
-        (0, _util.warn)(`Invalid absolute docBaseUrl: "${this._docBaseUrl}".`);
-      }
-    }
-
-    return (0, _util.shadow)(this, "docBaseUrl", docBaseUrl);
+    const catalog = this.pdfDocument.catalog;
+    return (0, _util.shadow)(this, "docBaseUrl", catalog.baseUrl || this._docBaseUrl);
   }
 
   onLoadedStream() {
@@ -2056,6 +2881,18 @@ class BasePdfManager {
     return this.pdfDocument.fontFallback(id, handler);
   }
 
+  loadXfaFonts(handler, task) {
+    return this.pdfDocument.loadXfaFonts(handler, task);
+  }
+
+  loadXfaImages() {
+    return this.pdfDocument.loadXfaImages();
+  }
+
+  serializeXfaData(annotationStorage) {
+    return this.pdfDocument.serializeXfaData(annotationStorage);
+  }
+
   cleanup(manuallyTriggered = false) {
     return this.pdfDocument.cleanup(manuallyTriggered);
   }
@@ -2087,12 +2924,14 @@ class BasePdfManager {
 }
 
 class LocalPdfManager extends BasePdfManager {
-  constructor(docId, data, password, evaluatorOptions, docBaseUrl) {
+  constructor(docId, data, password, msgHandler, evaluatorOptions, enableXfa, docBaseUrl) {
     super();
     this._docId = docId;
     this._password = password;
-    this._docBaseUrl = docBaseUrl;
+    this._docBaseUrl = parseDocBaseUrl(docBaseUrl);
+    this.msgHandler = msgHandler;
     this.evaluatorOptions = evaluatorOptions;
+    this.enableXfa = enableXfa;
     const stream = new _stream.Stream(data);
     this.pdfDocument = new _document.PDFDocument(this, stream);
     this._loadedStreamPromise = Promise.resolve(stream);
@@ -2125,13 +2964,14 @@ class LocalPdfManager extends BasePdfManager {
 exports.LocalPdfManager = LocalPdfManager;
 
 class NetworkPdfManager extends BasePdfManager {
-  constructor(docId, pdfNetworkStream, args, evaluatorOptions, docBaseUrl) {
+  constructor(docId, pdfNetworkStream, args, evaluatorOptions, enableXfa, docBaseUrl) {
     super();
     this._docId = docId;
     this._password = args.password;
-    this._docBaseUrl = docBaseUrl;
+    this._docBaseUrl = parseDocBaseUrl(docBaseUrl);
     this.msgHandler = args.msgHandler;
     this.evaluatorOptions = evaluatorOptions;
+    this.enableXfa = enableXfa;
     this.streamManager = new _chunked_stream.ChunkedStreamManager(pdfNetworkStream, {
       msgHandler: args.msgHandler,
       length: args.length,
@@ -2187,27 +3027,25 @@ class NetworkPdfManager extends BasePdfManager {
 exports.NetworkPdfManager = NetworkPdfManager;
 
 /***/ }),
-/* 7 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 9 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.ChunkedStreamManager = exports.ChunkedStream = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
-var _core_utils = __w_pdfjs_require__(8);
+var _core_utils = __w_pdfjs_require__(6);
 
-class ChunkedStream {
+var _stream = __w_pdfjs_require__(10);
+
+class ChunkedStream extends _stream.Stream {
   constructor(length, chunkSize, manager) {
-    this.bytes = new Uint8Array(length);
-    this.start = 0;
-    this.pos = 0;
-    this.end = length;
+    super(new Uint8Array(length), 0, length, null);
     this.chunkSize = chunkSize;
     this._loadedChunks = new Set();
     this.numChunks = Math.ceil(length / chunkSize);
@@ -2228,15 +3066,11 @@ class ChunkedStream {
     return chunks;
   }
 
-  getBaseStreams() {
-    return [this];
-  }
-
   get numChunksLoaded() {
     return this._loadedChunks.size;
   }
 
-  allChunksLoaded() {
+  get isDataLoaded() {
     return this.numChunksLoaded === this.numChunks;
   }
 
@@ -2282,6 +3116,10 @@ class ChunkedStream {
 
     const chunk = Math.floor(pos / this.chunkSize);
 
+    if (chunk > this.numChunks) {
+      return;
+    }
+
     if (chunk === this.lastSuccessfulEnsureByteChunk) {
       return;
     }
@@ -2302,9 +3140,13 @@ class ChunkedStream {
       return;
     }
 
-    const chunkSize = this.chunkSize;
-    const beginChunk = Math.floor(begin / chunkSize);
-    const endChunk = Math.floor((end - 1) / chunkSize) + 1;
+    const beginChunk = Math.floor(begin / this.chunkSize);
+
+    if (beginChunk > this.numChunks) {
+      return;
+    }
+
+    const endChunk = Math.min(Math.floor((end - 1) / this.chunkSize) + 1, this.numChunks);
 
     for (let chunk = beginChunk; chunk < endChunk; ++chunk) {
       if (!this._loadedChunks.has(chunk)) {
@@ -2331,14 +3173,6 @@ class ChunkedStream {
     return this._loadedChunks.has(chunk);
   }
 
-  get length() {
-    return this.end - this.start;
-  }
-
-  get isEmpty() {
-    return this.length === 0;
-  }
-
   getByte() {
     const pos = this.pos;
 
@@ -2353,26 +3187,7 @@ class ChunkedStream {
     return this.bytes[this.pos++];
   }
 
-  getUint16() {
-    const b0 = this.getByte();
-    const b1 = this.getByte();
-
-    if (b0 === -1 || b1 === -1) {
-      return -1;
-    }
-
-    return (b0 << 8) + b1;
-  }
-
-  getInt32() {
-    const b0 = this.getByte();
-    const b1 = this.getByte();
-    const b2 = this.getByte();
-    const b3 = this.getByte();
-    return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
-  }
-
-  getBytes(length, forceClamped = false) {
+  getBytes(length) {
     const bytes = this.bytes;
     const pos = this.pos;
     const strEnd = this.end;
@@ -2382,8 +3197,7 @@ class ChunkedStream {
         this.ensureRange(pos, strEnd);
       }
 
-      const subarray = bytes.subarray(pos, strEnd);
-      return forceClamped ? new Uint8ClampedArray(subarray) : subarray;
+      return bytes.subarray(pos, strEnd);
     }
 
     let end = pos + length;
@@ -2397,24 +3211,7 @@ class ChunkedStream {
     }
 
     this.pos = end;
-    const subarray = bytes.subarray(pos, end);
-    return forceClamped ? new Uint8ClampedArray(subarray) : subarray;
-  }
-
-  peekByte() {
-    const peekedByte = this.getByte();
-
-    if (peekedByte !== -1) {
-      this.pos--;
-    }
-
-    return peekedByte;
-  }
-
-  peekBytes(length, forceClamped = false) {
-    const bytes = this.getBytes(length, forceClamped);
-    this.pos -= bytes.length;
-    return bytes;
+    return bytes.subarray(pos, end);
   }
 
   getByteRange(begin, end) {
@@ -2433,23 +3230,7 @@ class ChunkedStream {
     return this.bytes.subarray(begin, end);
   }
 
-  skip(n) {
-    if (!n) {
-      n = 1;
-    }
-
-    this.pos += n;
-  }
-
-  reset() {
-    this.pos = this.start;
-  }
-
-  moveStart() {
-    this.start = this.pos;
-  }
-
-  makeSubStream(start, length, dict) {
+  makeSubStream(start, length, dict = null) {
     if (length) {
       if (start + length > this.progressiveDataLength) {
         this.ensureRange(start, start + length);
@@ -2479,14 +3260,17 @@ class ChunkedStream {
       return missingChunks;
     };
 
-    ChunkedStreamSubstream.prototype.allChunksLoaded = function () {
-      if (this.numChunksLoaded === this.numChunks) {
-        return true;
-      }
+    Object.defineProperty(ChunkedStreamSubstream.prototype, "isDataLoaded", {
+      get() {
+        if (this.numChunksLoaded === this.numChunks) {
+          return true;
+        }
 
-      return this.getMissingChunks().length === 0;
-    };
+        return this.getMissingChunks().length === 0;
+      },
 
+      configurable: true
+    });
     const subStream = new ChunkedStreamSubstream();
     subStream.pos = subStream.start = start;
     subStream.end = start + length || this.end;
@@ -2494,6 +3278,10 @@ class ChunkedStream {
     return subStream;
   }
 
+  getBaseStreams() {
+    return [this];
+  }
+
 }
 
 exports.ChunkedStream = ChunkedStream;
@@ -2528,7 +3316,7 @@ class ChunkedStreamManager {
 
     let chunks = [],
         loaded = 0;
-    const promise = new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       const readChunk = chunk => {
         try {
           if (!chunk.done) {
@@ -2555,8 +3343,7 @@ class ChunkedStreamManager {
       };
 
       rangeReader.read().then(readChunk, reject);
-    });
-    promise.then(data => {
+    }).then(data => {
       if (this.aborted) {
         return;
       }
@@ -2618,7 +3405,7 @@ class ChunkedStreamManager {
       for (const groupedChunk of groupedChunksToRequest) {
         const begin = groupedChunk.beginChunk * this.chunkSize;
         const end = Math.min(groupedChunk.endChunk * this.chunkSize, this.length);
-        this.sendRequest(begin, end);
+        this.sendRequest(begin, end).catch(capability.reject);
       }
     }
 
@@ -2723,7 +3510,7 @@ class ChunkedStreamManager {
       this.stream.onReceiveData(begin, chunk);
     }
 
-    if (this.stream.allChunksLoaded()) {
+    if (this.stream.isDataLoaded) {
       this._loadedStreamCapability.resolve(this.stream);
     }
 
@@ -2814,181 +3601,165 @@ class ChunkedStreamManager {
 exports.ChunkedStreamManager = ChunkedStreamManager;
 
 /***/ }),
-/* 8 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 10 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.getLookupTableFactory = getLookupTableFactory;
-exports.getInheritableProperty = getInheritableProperty;
-exports.toRomanNumerals = toRomanNumerals;
-exports.log2 = log2;
-exports.readInt8 = readInt8;
-exports.readUint16 = readUint16;
-exports.readUint32 = readUint32;
-exports.isWhiteSpace = isWhiteSpace;
-exports.XRefParseException = exports.XRefEntryException = exports.MissingDataException = void 0;
+}));
+exports.StringStream = exports.Stream = exports.NullStream = void 0;
+
+var _base_stream = __w_pdfjs_require__(7);
 
 var _util = __w_pdfjs_require__(2);
 
-function getLookupTableFactory(initializer) {
-  let lookup;
-  return function () {
-    if (initializer) {
-      lookup = Object.create(null);
-      initializer(lookup);
-      initializer = null;
+class Stream extends _base_stream.BaseStream {
+  constructor(arrayBuffer, start, length, dict) {
+    super();
+    this.bytes = arrayBuffer instanceof Uint8Array ? arrayBuffer : new Uint8Array(arrayBuffer);
+    this.start = start || 0;
+    this.pos = this.start;
+    this.end = start + length || this.bytes.length;
+    this.dict = dict;
+  }
+
+  get length() {
+    return this.end - this.start;
+  }
+
+  get isEmpty() {
+    return this.length === 0;
+  }
+
+  getByte() {
+    if (this.pos >= this.end) {
+      return -1;
     }
 
-    return lookup;
-  };
-}
-
-class MissingDataException extends _util.BaseException {
-  constructor(begin, end) {
-    super(`Missing data [${begin}, ${end})`);
-    this.begin = begin;
-    this.end = end;
+    return this.bytes[this.pos++];
   }
 
-}
+  getBytes(length) {
+    const bytes = this.bytes;
+    const pos = this.pos;
+    const strEnd = this.end;
 
-exports.MissingDataException = MissingDataException;
-
-class XRefEntryException extends _util.BaseException {}
-
-exports.XRefEntryException = XRefEntryException;
-
-class XRefParseException extends _util.BaseException {}
-
-exports.XRefParseException = XRefParseException;
-
-function getInheritableProperty({
-  dict,
-  key,
-  getArray = false,
-  stopWhenFound = true
-}) {
-  const LOOP_LIMIT = 100;
-  let loopCount = 0;
-  let values;
-
-  while (dict) {
-    const value = getArray ? dict.getArray(key) : dict.get(key);
-
-    if (value !== undefined) {
-      if (stopWhenFound) {
-        return value;
-      }
-
-      if (!values) {
-        values = [];
-      }
-
-      values.push(value);
+    if (!length) {
+      return bytes.subarray(pos, strEnd);
     }
 
-    if (++loopCount > LOOP_LIMIT) {
-      (0, _util.warn)(`getInheritableProperty: maximum loop count exceeded for "${key}"`);
-      break;
+    let end = pos + length;
+
+    if (end > strEnd) {
+      end = strEnd;
     }
 
-    dict = dict.get("Parent");
+    this.pos = end;
+    return bytes.subarray(pos, end);
   }
 
-  return values;
-}
+  getByteRange(begin, end) {
+    if (begin < 0) {
+      begin = 0;
+    }
 
-const ROMAN_NUMBER_MAP = ["", "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM", "", "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC", "", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"];
+    if (end > this.end) {
+      end = this.end;
+    }
 
-function toRomanNumerals(number, lowerCase = false) {
-  (0, _util.assert)(Number.isInteger(number) && number > 0, "The number should be a positive integer.");
-  const romanBuf = [];
-  let pos;
-
-  while (number >= 1000) {
-    number -= 1000;
-    romanBuf.push("M");
+    return this.bytes.subarray(begin, end);
   }
 
-  pos = number / 100 | 0;
-  number %= 100;
-  romanBuf.push(ROMAN_NUMBER_MAP[pos]);
-  pos = number / 10 | 0;
-  number %= 10;
-  romanBuf.push(ROMAN_NUMBER_MAP[10 + pos]);
-  romanBuf.push(ROMAN_NUMBER_MAP[20 + number]);
-  const romanStr = romanBuf.join("");
-  return lowerCase ? romanStr.toLowerCase() : romanStr;
-}
-
-function log2(x) {
-  if (x <= 0) {
-    return 0;
+  reset() {
+    this.pos = this.start;
+  }
+
+  moveStart() {
+    this.start = this.pos;
+  }
+
+  makeSubStream(start, length, dict = null) {
+    return new Stream(this.bytes.buffer, start, length, dict);
   }
 
-  return Math.ceil(Math.log2(x));
 }
 
-function readInt8(data, offset) {
-  return data[offset] << 24 >> 24;
+exports.Stream = Stream;
+
+class StringStream extends Stream {
+  constructor(str) {
+    super((0, _util.stringToBytes)(str));
+  }
+
 }
 
-function readUint16(data, offset) {
-  return data[offset] << 8 | data[offset + 1];
+exports.StringStream = StringStream;
+
+class NullStream extends Stream {
+  constructor() {
+    super(new Uint8Array(0));
+  }
+
 }
 
-function readUint32(data, offset) {
-  return (data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3]) >>> 0;
-}
-
-function isWhiteSpace(ch) {
-  return ch === 0x20 || ch === 0x09 || ch === 0x0d || ch === 0x0a;
-}
+exports.NullStream = NullStream;
 
 /***/ }),
-/* 9 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 11 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.PDFDocument = exports.Page = void 0;
+}));
+exports.Page = exports.PDFDocument = void 0;
+
+var _annotation = __w_pdfjs_require__(12);
 
 var _util = __w_pdfjs_require__(2);
 
-var _obj = __w_pdfjs_require__(10);
+var _core_utils = __w_pdfjs_require__(6);
 
 var _primitives = __w_pdfjs_require__(5);
 
-var _core_utils = __w_pdfjs_require__(8);
+var _xfa_fonts = __w_pdfjs_require__(51);
 
-var _stream = __w_pdfjs_require__(12);
+var _base_stream = __w_pdfjs_require__(7);
 
-var _annotation = __w_pdfjs_require__(25);
+var _crypto = __w_pdfjs_require__(67);
 
-var _crypto = __w_pdfjs_require__(22);
+var _catalog = __w_pdfjs_require__(69);
 
-var _parser = __w_pdfjs_require__(11);
+var _cleanup_helper = __w_pdfjs_require__(71);
 
-var _operator_list = __w_pdfjs_require__(26);
+var _dataset_reader = __w_pdfjs_require__(100);
 
-var _evaluator = __w_pdfjs_require__(28);
+var _parser = __w_pdfjs_require__(17);
+
+var _stream = __w_pdfjs_require__(10);
+
+var _object_loader = __w_pdfjs_require__(75);
+
+var _operator_list = __w_pdfjs_require__(62);
+
+var _evaluator = __w_pdfjs_require__(15);
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+var _struct_tree = __w_pdfjs_require__(74);
+
+var _writer = __w_pdfjs_require__(65);
+
+var _factory = __w_pdfjs_require__(76);
+
+var _xref = __w_pdfjs_require__(101);
 
 const DEFAULT_USER_UNIT = 1.0;
 const LETTER_SIZE_MEDIABOX = [0, 0, 612, 792];
 
-function isAnnotationRenderable(annotation, intent) {
-  return intent === "display" && annotation.viewable || intent === "print" && annotation.printable;
-}
-
 class Page {
   constructor({
     pdfManager,
@@ -2999,7 +3770,10 @@ class Page {
     globalIdFactory,
     fontCache,
     builtInCMapCache,
-    globalImageCache
+    standardFontDataCache,
+    globalImageCache,
+    nonBlendModesSet,
+    xfaFactory
   }) {
     this.pdfManager = pdfManager;
     this.pageIndex = pageIndex;
@@ -3008,9 +3782,12 @@ class Page {
     this.ref = ref;
     this.fontCache = fontCache;
     this.builtInCMapCache = builtInCMapCache;
+    this.standardFontDataCache = standardFontDataCache;
     this.globalImageCache = globalImageCache;
+    this.nonBlendModesSet = nonBlendModesSet;
     this.evaluatorOptions = pdfManager.evaluatorOptions;
     this.resourcesPromise = null;
+    this.xfaFactory = xfaFactory;
     const idCounters = {
       obj: 0
     };
@@ -3019,6 +3796,10 @@ class Page {
         return `p${pageIndex}_${++idCounters.obj}`;
       }
 
+      static getPageObjId() {
+        return `page${ref.toString()}`;
+      }
+
     };
   }
 
@@ -3034,7 +3815,7 @@ class Page {
       return value;
     }
 
-    if (value.length === 1 || !(0, _primitives.isDict)(value[0])) {
+    if (value.length === 1 || !(value[0] instanceof _primitives.Dict)) {
       return value[0];
     }
 
@@ -3045,14 +3826,20 @@ class Page {
   }
 
   get content() {
-    return this.pageDict.get("Contents");
+    return this.pageDict.getArray("Contents");
   }
 
   get resources() {
-    return (0, _util.shadow)(this, "resources", this._getInheritableProperty("Resources") || _primitives.Dict.empty);
+    const resources = this._getInheritableProperty("Resources");
+
+    return (0, _util.shadow)(this, "resources", resources instanceof _primitives.Dict ? resources : _primitives.Dict.empty);
   }
 
   _getBoundingBox(name) {
+    if (this.xfaData) {
+      return this.xfaData.bbox;
+    }
+
     const box = this._getInheritableProperty(name, true);
 
     if (Array.isArray(box) && box.length === 4) {
@@ -3077,7 +3864,7 @@ class Page {
   get userUnit() {
     let obj = this.pageDict.get("UserUnit");
 
-    if (!(0, _util.isNum)(obj) || obj <= 0) {
+    if (typeof obj !== "number" || obj <= 0) {
       obj = DEFAULT_USER_UNIT;
     }
 
@@ -3112,7 +3899,7 @@ class Page {
     if (rotate % 90 !== 0) {
       rotate = 0;
     } else if (rotate >= 360) {
-      rotate = rotate % 360;
+      rotate %= 360;
     } else if (rotate < 0) {
       rotate = (rotate % 360 + 360) % 360;
     }
@@ -3120,26 +3907,85 @@ class Page {
     return (0, _util.shadow)(this, "rotate", rotate);
   }
 
-  getContentStream() {
-    const content = this.content;
-    let stream;
-
-    if (Array.isArray(content)) {
-      const xref = this.xref;
-      const streams = [];
-
-      for (const subStream of content) {
-        streams.push(xref.fetchIfRef(subStream));
-      }
-
-      stream = new _stream.StreamsSequenceStream(streams);
-    } else if ((0, _primitives.isStream)(content)) {
-      stream = content;
-    } else {
-      stream = new _stream.NullStream();
+  _onSubStreamError(handler, reason, objId) {
+    if (this.evaluatorOptions.ignoreErrors) {
+      handler.send("UnsupportedFeature", {
+        featureId: _util.UNSUPPORTED_FEATURES.errorContentSubStream
+      });
+      (0, _util.warn)(`getContentStream - ignoring sub-stream (${objId}): "${reason}".`);
+      return;
     }
 
-    return stream;
+    throw reason;
+  }
+
+  getContentStream(handler) {
+    return this.pdfManager.ensure(this, "content").then(content => {
+      if (content instanceof _base_stream.BaseStream) {
+        return content;
+      }
+
+      if (Array.isArray(content)) {
+        return new _decode_stream.StreamsSequenceStream(content, this._onSubStreamError.bind(this, handler));
+      }
+
+      return new _stream.NullStream();
+    });
+  }
+
+  get xfaData() {
+    return (0, _util.shadow)(this, "xfaData", this.xfaFactory ? {
+      bbox: this.xfaFactory.getBoundingBox(this.pageIndex)
+    } : null);
+  }
+
+  async saveNewAnnotations(handler, task, annotations) {
+    if (this.xfaFactory) {
+      throw new Error("XFA: Cannot save new annotations.");
+    }
+
+    const partialEvaluator = new _evaluator.PartialEvaluator({
+      xref: this.xref,
+      handler,
+      pageIndex: this.pageIndex,
+      idFactory: this._localIdFactory,
+      fontCache: this.fontCache,
+      builtInCMapCache: this.builtInCMapCache,
+      standardFontDataCache: this.standardFontDataCache,
+      globalImageCache: this.globalImageCache,
+      options: this.evaluatorOptions
+    });
+    const pageDict = this.pageDict;
+    const annotationsArray = this.annotations.slice();
+    const newData = await _annotation.AnnotationFactory.saveNewAnnotations(partialEvaluator, task, annotations);
+
+    for (const {
+      ref
+    } of newData.annotations) {
+      annotationsArray.push(ref);
+    }
+
+    const savedDict = pageDict.get("Annots");
+    pageDict.set("Annots", annotationsArray);
+    const buffer = [];
+    let transform = null;
+
+    if (this.xref.encrypt) {
+      transform = this.xref.encrypt.createCipherTransform(this.ref.num, this.ref.gen);
+    }
+
+    (0, _writer.writeObject)(this.ref, pageDict, buffer, transform);
+
+    if (savedDict) {
+      pageDict.set("Annots", savedDict);
+    }
+
+    const objects = newData.dependencies;
+    objects.push({
+      ref: this.ref,
+      data: buffer.join("")
+    }, ...newData.annotations);
+    return objects;
   }
 
   save(handler, task, annotationStorage) {
@@ -3150,6 +3996,7 @@ class Page {
       idFactory: this._localIdFactory,
       fontCache: this.fontCache,
       builtInCMapCache: this.builtInCMapCache,
+      standardFontDataCache: this.standardFontDataCache,
       globalImageCache: this.globalImageCache,
       options: this.evaluatorOptions
     });
@@ -3157,7 +4004,7 @@ class Page {
       const newRefsPromises = [];
 
       for (const annotation of annotations) {
-        if (!isAnnotationRenderable(annotation, "print")) {
+        if (!annotation.mustBePrinted(annotationStorage)) {
           continue;
         }
 
@@ -3167,7 +4014,9 @@ class Page {
         }));
       }
 
-      return Promise.all(newRefsPromises);
+      return Promise.all(newRefsPromises).then(function (newRefs) {
+        return newRefs.filter(newRef => !!newRef);
+      });
     });
   }
 
@@ -3177,7 +4026,7 @@ class Page {
     }
 
     return this.resourcesPromise.then(() => {
-      const objectLoader = new _obj.ObjectLoader(this.resources, keys, this.xref);
+      const objectLoader = new _object_loader.ObjectLoader(this.resources, keys, this.xref);
       return objectLoader.load();
     });
   }
@@ -3187,11 +4036,11 @@ class Page {
     sink,
     task,
     intent,
-    renderInteractiveForms,
-    annotationStorage
+    cacheKey,
+    annotationStorage = null
   }) {
-    const contentStreamPromise = this.pdfManager.ensure(this, "getContentStream");
-    const resourcesPromise = this.loadResources(["ExtGState", "ColorSpace", "Pattern", "Shading", "XObject", "Font"]);
+    const contentStreamPromise = this.getContentStream(handler);
+    const resourcesPromise = this.loadResources(["ColorSpace", "ExtGState", "Font", "Pattern", "Properties", "Shading", "XObject"]);
     const partialEvaluator = new _evaluator.PartialEvaluator({
       xref: this.xref,
       handler,
@@ -3199,16 +4048,28 @@ class Page {
       idFactory: this._localIdFactory,
       fontCache: this.fontCache,
       builtInCMapCache: this.builtInCMapCache,
+      standardFontDataCache: this.standardFontDataCache,
       globalImageCache: this.globalImageCache,
       options: this.evaluatorOptions
     });
+    const newAnnotationsByPage = !this.xfaFactory ? (0, _core_utils.getNewAnnotationsMap)(annotationStorage) : null;
+    let newAnnotationsPromise = Promise.resolve(null);
+
+    if (newAnnotationsByPage) {
+      const newAnnotations = newAnnotationsByPage.get(this.pageIndex);
+
+      if (newAnnotations) {
+        newAnnotationsPromise = _annotation.AnnotationFactory.printNewAnnotations(partialEvaluator, task, newAnnotations);
+      }
+    }
+
     const dataPromises = Promise.all([contentStreamPromise, resourcesPromise]);
     const pageListPromise = dataPromises.then(([contentStream]) => {
       const opList = new _operator_list.OperatorList(intent, sink);
       handler.send("StartRenderPage", {
-        transparency: partialEvaluator.hasBlendModes(this.resources),
+        transparency: partialEvaluator.hasBlendModes(this.resources, this.nonBlendModesSet),
         pageIndex: this.pageIndex,
-        intent
+        cacheKey
       });
       return partialEvaluator.getOperatorList({
         stream: contentStream,
@@ -3219,19 +4080,27 @@ class Page {
         return opList;
       });
     });
-    return Promise.all([pageListPromise, this._parsedAnnotations]).then(function ([pageOpList, annotations]) {
-      if (annotations.length === 0) {
+    return Promise.all([pageListPromise, this._parsedAnnotations, newAnnotationsPromise]).then(function ([pageOpList, annotations, newAnnotations]) {
+      if (newAnnotations) {
+        annotations = annotations.concat(newAnnotations);
+      }
+
+      if (annotations.length === 0 || intent & _util.RenderingIntentFlag.ANNOTATIONS_DISABLE) {
         pageOpList.flush(true);
         return {
           length: pageOpList.totalLength
         };
       }
 
+      const renderForms = !!(intent & _util.RenderingIntentFlag.ANNOTATIONS_FORMS),
+            intentAny = !!(intent & _util.RenderingIntentFlag.ANY),
+            intentDisplay = !!(intent & _util.RenderingIntentFlag.DISPLAY),
+            intentPrint = !!(intent & _util.RenderingIntentFlag.PRINT);
       const opListPromises = [];
 
       for (const annotation of annotations) {
-        if (isAnnotationRenderable(annotation, intent)) {
-          opListPromises.push(annotation.getOperatorList(partialEvaluator, task, renderInteractiveForms, annotationStorage).catch(function (reason) {
+        if (intentAny || intentDisplay && annotation.mustBeViewed(annotationStorage) || intentPrint && annotation.mustBePrinted(annotationStorage)) {
+          opListPromises.push(annotation.getOperatorList(partialEvaluator, task, intent, renderForms, annotationStorage).catch(function (reason) {
             (0, _util.warn)("getOperatorList - ignoring annotation data during " + `"${task.name}" task: "${reason}".`);
             return null;
           }));
@@ -3239,14 +4108,29 @@ class Page {
       }
 
       return Promise.all(opListPromises).then(function (opLists) {
-        pageOpList.addOp(_util.OPS.beginAnnotations, []);
+        let form = false,
+            canvas = false;
 
-        for (const opList of opLists) {
+        for (const {
+          opList,
+          separateForm,
+          separateCanvas
+        } of opLists) {
           pageOpList.addOpList(opList);
+
+          if (separateForm) {
+            form = separateForm;
+          }
+
+          if (separateCanvas) {
+            canvas = separateCanvas;
+          }
         }
 
-        pageOpList.addOp(_util.OPS.endAnnotations, []);
-        pageOpList.flush(true);
+        pageOpList.flush(true, {
+          form,
+          canvas
+        });
         return {
           length: pageOpList.totalLength
         };
@@ -3257,12 +4141,12 @@ class Page {
   extractTextContent({
     handler,
     task,
-    normalizeWhitespace,
+    includeMarkedContent,
     sink,
     combineTextItems
   }) {
-    const contentStreamPromise = this.pdfManager.ensure(this, "getContentStream");
-    const resourcesPromise = this.loadResources(["ExtGState", "XObject", "Font"]);
+    const contentStreamPromise = this.getContentStream(handler);
+    const resourcesPromise = this.loadResources(["ExtGState", "Font", "Properties", "XObject"]);
     const dataPromises = Promise.all([contentStreamPromise, resourcesPromise]);
     return dataPromises.then(([contentStream]) => {
       const partialEvaluator = new _evaluator.PartialEvaluator({
@@ -3272,6 +4156,7 @@ class Page {
         idFactory: this._localIdFactory,
         fontCache: this.fontCache,
         builtInCMapCache: this.builtInCMapCache,
+        standardFontDataCache: this.standardFontDataCache,
         globalImageCache: this.globalImageCache,
         options: this.evaluatorOptions
       });
@@ -3279,29 +4164,81 @@ class Page {
         stream: contentStream,
         task,
         resources: this.resources,
-        normalizeWhitespace,
+        includeMarkedContent,
         combineTextItems,
-        sink
+        sink,
+        viewBox: this.view
       });
     });
   }
 
-  getAnnotationsData(intent) {
-    return this._parsedAnnotations.then(function (annotations) {
-      const annotationsData = [];
+  async getStructTree() {
+    const structTreeRoot = await this.pdfManager.ensureCatalog("structTreeRoot");
 
-      for (let i = 0, ii = annotations.length; i < ii; i++) {
-        if (!intent || isAnnotationRenderable(annotations[i], intent)) {
-          annotationsData.push(annotations[i].data);
-        }
+    if (!structTreeRoot) {
+      return null;
+    }
+
+    const structTree = await this.pdfManager.ensure(this, "_parseStructTree", [structTreeRoot]);
+    return structTree.serializable;
+  }
+
+  _parseStructTree(structTreeRoot) {
+    const tree = new _struct_tree.StructTreePage(structTreeRoot, this.pageDict);
+    tree.parse();
+    return tree;
+  }
+
+  async getAnnotationsData(handler, task, intent) {
+    const annotations = await this._parsedAnnotations;
+
+    if (annotations.length === 0) {
+      return [];
+    }
+
+    const textContentPromises = [];
+    const annotationsData = [];
+    let partialEvaluator;
+    const intentAny = !!(intent & _util.RenderingIntentFlag.ANY),
+          intentDisplay = !!(intent & _util.RenderingIntentFlag.DISPLAY),
+          intentPrint = !!(intent & _util.RenderingIntentFlag.PRINT);
+
+    for (const annotation of annotations) {
+      const isVisible = intentAny || intentDisplay && annotation.viewable;
+
+      if (isVisible || intentPrint && annotation.printable) {
+        annotationsData.push(annotation.data);
       }
 
-      return annotationsData;
-    });
+      if (annotation.hasTextContent && isVisible) {
+        if (!partialEvaluator) {
+          partialEvaluator = new _evaluator.PartialEvaluator({
+            xref: this.xref,
+            handler,
+            pageIndex: this.pageIndex,
+            idFactory: this._localIdFactory,
+            fontCache: this.fontCache,
+            builtInCMapCache: this.builtInCMapCache,
+            standardFontDataCache: this.standardFontDataCache,
+            globalImageCache: this.globalImageCache,
+            options: this.evaluatorOptions
+          });
+        }
+
+        textContentPromises.push(annotation.extractTextContent(partialEvaluator, task, this.view).catch(function (reason) {
+          (0, _util.warn)(`getAnnotationsData - ignoring textContent during "${task.name}" task: "${reason}".`);
+        }));
+      }
+    }
+
+    await Promise.all(textContentPromises);
+    return annotationsData;
   }
 
   get annotations() {
-    return (0, _util.shadow)(this, "annotations", this._getInheritableProperty("Annots") || []);
+    const annots = this._getInheritableProperty("Annots");
+
+    return (0, _util.shadow)(this, "annotations", Array.isArray(annots) ? annots : []);
   }
 
   get _parsedAnnotations() {
@@ -3309,19 +4246,52 @@ class Page {
       const annotationPromises = [];
 
       for (const annotationRef of this.annotations) {
-        annotationPromises.push(_annotation.AnnotationFactory.create(this.xref, annotationRef, this.pdfManager, this._localIdFactory).catch(function (reason) {
+        annotationPromises.push(_annotation.AnnotationFactory.create(this.xref, annotationRef, this.pdfManager, this._localIdFactory, false).catch(function (reason) {
           (0, _util.warn)(`_parsedAnnotations: "${reason}".`);
           return null;
         }));
       }
 
       return Promise.all(annotationPromises).then(function (annotations) {
-        return annotations.filter(annotation => !!annotation);
+        if (annotations.length === 0) {
+          return annotations;
+        }
+
+        const sortedAnnotations = [];
+        let popupAnnotations;
+
+        for (const annotation of annotations) {
+          if (!annotation) {
+            continue;
+          }
+
+          if (annotation instanceof _annotation.PopupAnnotation) {
+            if (!popupAnnotations) {
+              popupAnnotations = [];
+            }
+
+            popupAnnotations.push(annotation);
+            continue;
+          }
+
+          sortedAnnotations.push(annotation);
+        }
+
+        if (popupAnnotations) {
+          sortedAnnotations.push(...popupAnnotations);
+        }
+
+        return sortedAnnotations;
       });
     });
     return (0, _util.shadow)(this, "_parsedAnnotations", parsedAnnotations);
   }
 
+  get jsActions() {
+    const actions = (0, _core_utils.collectActions)(this.xref, this.pageDict, _util.PageActionEventType);
+    return (0, _util.shadow)(this, "jsActions", actions);
+  }
+
 }
 
 exports.Page = Page;
@@ -3330,7 +4300,7 @@ const STARTXREF_SIGNATURE = new Uint8Array([0x73, 0x74, 0x61, 0x72, 0x74, 0x78,
 const ENDOBJ_SIGNATURE = new Uint8Array([0x65, 0x6e, 0x64, 0x6f, 0x62, 0x6a]);
 const FINGERPRINT_FIRST_BYTES = 1024;
 const EMPTY_FINGERPRINT = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
-const PDF_HEADER_VERSION_REGEXP = /^[1-9]\.[0-9]$/;
+const PDF_HEADER_VERSION_REGEXP = /^[1-9]\.\d$/;
 
 function find(stream, signature, limit = 1024, backwards = false) {
   const signatureLength = signature.length;
@@ -3382,25 +4352,15 @@ function find(stream, signature, limit = 1024, backwards = false) {
 }
 
 class PDFDocument {
-  constructor(pdfManager, arg) {
-    let stream;
-
-    if ((0, _primitives.isStream)(arg)) {
-      stream = arg;
-    } else if ((0, _util.isArrayBuffer)(arg)) {
-      stream = new _stream.Stream(arg);
-    } else {
-      throw new Error("PDFDocument: Unknown argument type");
-    }
-
+  constructor(pdfManager, stream) {
     if (stream.length <= 0) {
       throw new _util.InvalidPDFException("The PDF file is empty, i.e. its size is zero bytes.");
     }
 
     this.pdfManager = pdfManager;
     this.stream = stream;
-    this.xref = new _obj.XRef(stream, pdfManager);
-    this._pagePromises = [];
+    this.xref = new _xref.XRef(stream, pdfManager);
+    this._pagePromises = new Map();
     this._version = null;
     const idCounters = {
       font: 0
@@ -3418,12 +4378,16 @@ class PDFDocument {
         (0, _util.unreachable)("Abstract method `createObjId` called.");
       }
 
+      static getPageObjId() {
+        (0, _util.unreachable)("Abstract method `getPageObjId` called.");
+      }
+
     };
   }
 
   parse(recoveryMode) {
     this.xref.parse(recoveryMode);
-    this.catalog = new _obj.Catalog(this.pdfManager, this.xref);
+    this.catalog = new _catalog.Catalog(this.pdfManager, this.xref);
 
     if (this.catalog.version) {
       this._version = this.catalog.version;
@@ -3530,16 +4494,35 @@ class PDFDocument {
   }
 
   get numPages() {
-    const linearization = this.linearization;
-    const num = linearization ? linearization.numPages : this.catalog.numPages;
+    let num = 0;
+
+    if (this.catalog.hasActualNumPages) {
+      num = this.catalog.numPages;
+    } else if (this.xfaFactory) {
+      num = this.xfaFactory.getNumPages();
+    } else if (this.linearization) {
+      num = this.linearization.numPages;
+    } else {
+      num = this.catalog.numPages;
+    }
+
     return (0, _util.shadow)(this, "numPages", num);
   }
 
   _hasOnlyDocumentSignatures(fields, recursionDepth = 0) {
     const RECURSION_LIMIT = 10;
+
+    if (!Array.isArray(fields)) {
+      return false;
+    }
+
     return fields.every(field => {
       field = this.xref.fetchIfRef(field);
 
+      if (!(field instanceof _primitives.Dict)) {
+        return false;
+      }
+
       if (field.has("Kids")) {
         if (++recursionDepth > RECURSION_LIMIT) {
           (0, _util.warn)("_hasOnlyDocumentSignatures: maximum recursion depth reached");
@@ -3556,10 +4539,309 @@ class PDFDocument {
     });
   }
 
+  get _xfaStreams() {
+    const acroForm = this.catalog.acroForm;
+
+    if (!acroForm) {
+      return null;
+    }
+
+    const xfa = acroForm.get("XFA");
+    const entries = {
+      "xdp:xdp": "",
+      template: "",
+      datasets: "",
+      config: "",
+      connectionSet: "",
+      localeSet: "",
+      stylesheet: "",
+      "/xdp:xdp": ""
+    };
+
+    if (xfa instanceof _base_stream.BaseStream && !xfa.isEmpty) {
+      entries["xdp:xdp"] = xfa;
+      return entries;
+    }
+
+    if (!Array.isArray(xfa) || xfa.length === 0) {
+      return null;
+    }
+
+    for (let i = 0, ii = xfa.length; i < ii; i += 2) {
+      let name;
+
+      if (i === 0) {
+        name = "xdp:xdp";
+      } else if (i === ii - 2) {
+        name = "/xdp:xdp";
+      } else {
+        name = xfa[i];
+      }
+
+      if (!entries.hasOwnProperty(name)) {
+        continue;
+      }
+
+      const data = this.xref.fetchIfRef(xfa[i + 1]);
+
+      if (!(data instanceof _base_stream.BaseStream) || data.isEmpty) {
+        continue;
+      }
+
+      entries[name] = data;
+    }
+
+    return entries;
+  }
+
+  get xfaDatasets() {
+    const streams = this._xfaStreams;
+
+    if (!streams) {
+      return (0, _util.shadow)(this, "xfaDatasets", null);
+    }
+
+    for (const key of ["datasets", "xdp:xdp"]) {
+      const stream = streams[key];
+
+      if (!stream) {
+        continue;
+      }
+
+      try {
+        const str = (0, _util.stringToUTF8String)(stream.getString());
+        const data = {
+          [key]: str
+        };
+        return (0, _util.shadow)(this, "xfaDatasets", new _dataset_reader.DatasetReader(data));
+      } catch (_) {
+        (0, _util.warn)("XFA - Invalid utf-8 string.");
+        break;
+      }
+    }
+
+    return (0, _util.shadow)(this, "xfaDatasets", null);
+  }
+
+  get xfaData() {
+    const streams = this._xfaStreams;
+
+    if (!streams) {
+      return null;
+    }
+
+    const data = Object.create(null);
+
+    for (const [key, stream] of Object.entries(streams)) {
+      if (!stream) {
+        continue;
+      }
+
+      try {
+        data[key] = (0, _util.stringToUTF8String)(stream.getString());
+      } catch (_) {
+        (0, _util.warn)("XFA - Invalid utf-8 string.");
+        return null;
+      }
+    }
+
+    return data;
+  }
+
+  get xfaFactory() {
+    let data;
+
+    if (this.pdfManager.enableXfa && this.catalog.needsRendering && this.formInfo.hasXfa && !this.formInfo.hasAcroForm) {
+      data = this.xfaData;
+    }
+
+    return (0, _util.shadow)(this, "xfaFactory", data ? new _factory.XFAFactory(data) : null);
+  }
+
+  get isPureXfa() {
+    return this.xfaFactory ? this.xfaFactory.isValid() : false;
+  }
+
+  get htmlForXfa() {
+    return this.xfaFactory ? this.xfaFactory.getPages() : null;
+  }
+
+  async loadXfaImages() {
+    const xfaImagesDict = await this.pdfManager.ensureCatalog("xfaImages");
+
+    if (!xfaImagesDict) {
+      return;
+    }
+
+    const keys = xfaImagesDict.getKeys();
+    const objectLoader = new _object_loader.ObjectLoader(xfaImagesDict, keys, this.xref);
+    await objectLoader.load();
+    const xfaImages = new Map();
+
+    for (const key of keys) {
+      const stream = xfaImagesDict.get(key);
+
+      if (stream instanceof _base_stream.BaseStream) {
+        xfaImages.set(key, stream.getBytes());
+      }
+    }
+
+    this.xfaFactory.setImages(xfaImages);
+  }
+
+  async loadXfaFonts(handler, task) {
+    const acroForm = await this.pdfManager.ensureCatalog("acroForm");
+
+    if (!acroForm) {
+      return;
+    }
+
+    const resources = await acroForm.getAsync("DR");
+
+    if (!(resources instanceof _primitives.Dict)) {
+      return;
+    }
+
+    const objectLoader = new _object_loader.ObjectLoader(resources, ["Font"], this.xref);
+    await objectLoader.load();
+    const fontRes = resources.get("Font");
+
+    if (!(fontRes instanceof _primitives.Dict)) {
+      return;
+    }
+
+    const options = Object.assign(Object.create(null), this.pdfManager.evaluatorOptions);
+    options.useSystemFonts = false;
+    const partialEvaluator = new _evaluator.PartialEvaluator({
+      xref: this.xref,
+      handler,
+      pageIndex: -1,
+      idFactory: this._globalIdFactory,
+      fontCache: this.catalog.fontCache,
+      builtInCMapCache: this.catalog.builtInCMapCache,
+      standardFontDataCache: this.catalog.standardFontDataCache,
+      options
+    });
+    const operatorList = new _operator_list.OperatorList();
+    const pdfFonts = [];
+    const initialState = {
+      get font() {
+        return pdfFonts.at(-1);
+      },
+
+      set font(font) {
+        pdfFonts.push(font);
+      },
+
+      clone() {
+        return this;
+      }
+
+    };
+    const fonts = new Map();
+    fontRes.forEach((fontName, font) => {
+      fonts.set(fontName, font);
+    });
+    const promises = [];
+
+    for (const [fontName, font] of fonts) {
+      const descriptor = font.get("FontDescriptor");
+
+      if (!(descriptor instanceof _primitives.Dict)) {
+        continue;
+      }
+
+      let fontFamily = descriptor.get("FontFamily");
+      fontFamily = fontFamily.replace(/[ ]+(\d)/g, "$1");
+      const fontWeight = descriptor.get("FontWeight");
+      const italicAngle = -descriptor.get("ItalicAngle");
+      const cssFontInfo = {
+        fontFamily,
+        fontWeight,
+        italicAngle
+      };
+
+      if (!(0, _core_utils.validateCSSFont)(cssFontInfo)) {
+        continue;
+      }
+
+      promises.push(partialEvaluator.handleSetFont(resources, [_primitives.Name.get(fontName), 1], null, operatorList, task, initialState, null, cssFontInfo).catch(function (reason) {
+        (0, _util.warn)(`loadXfaFonts: "${reason}".`);
+        return null;
+      }));
+    }
+
+    await Promise.all(promises);
+    const missingFonts = this.xfaFactory.setFonts(pdfFonts);
+
+    if (!missingFonts) {
+      return;
+    }
+
+    options.ignoreErrors = true;
+    promises.length = 0;
+    pdfFonts.length = 0;
+    const reallyMissingFonts = new Set();
+
+    for (const missing of missingFonts) {
+      if (!(0, _xfa_fonts.getXfaFontName)(`${missing}-Regular`)) {
+        reallyMissingFonts.add(missing);
+      }
+    }
+
+    if (reallyMissingFonts.size) {
+      missingFonts.push("PdfJS-Fallback");
+    }
+
+    for (const missing of missingFonts) {
+      if (reallyMissingFonts.has(missing)) {
+        continue;
+      }
+
+      for (const fontInfo of [{
+        name: "Regular",
+        fontWeight: 400,
+        italicAngle: 0
+      }, {
+        name: "Bold",
+        fontWeight: 700,
+        italicAngle: 0
+      }, {
+        name: "Italic",
+        fontWeight: 400,
+        italicAngle: 12
+      }, {
+        name: "BoldItalic",
+        fontWeight: 700,
+        italicAngle: 12
+      }]) {
+        const name = `${missing}-${fontInfo.name}`;
+        const dict = (0, _xfa_fonts.getXfaFontDict)(name);
+        promises.push(partialEvaluator.handleSetFont(resources, [_primitives.Name.get(name), 1], null, operatorList, task, initialState, dict, {
+          fontFamily: missing,
+          fontWeight: fontInfo.fontWeight,
+          italicAngle: fontInfo.italicAngle
+        }).catch(function (reason) {
+          (0, _util.warn)(`loadXfaFonts: "${reason}".`);
+          return null;
+        }));
+      }
+    }
+
+    await Promise.all(promises);
+    this.xfaFactory.appendFonts(pdfFonts, reallyMissingFonts);
+  }
+
+  async serializeXfaData(annotationStorage) {
+    return this.xfaFactory ? this.xfaFactory.serializeData(annotationStorage) : null;
+  }
+
   get formInfo() {
     const formInfo = {
+      hasFields: false,
       hasAcroForm: false,
-      hasXfa: false
+      hasXfa: false,
+      hasSignatures: false
     };
     const acroForm = this.catalog.acroForm;
 
@@ -3568,39 +4850,30 @@ class PDFDocument {
     }
 
     try {
-      const xfa = acroForm.get("XFA");
-      const hasXfa = Array.isArray(xfa) && xfa.length > 0 || (0, _primitives.isStream)(xfa) && !xfa.isEmpty;
-      formInfo.hasXfa = hasXfa;
       const fields = acroForm.get("Fields");
       const hasFields = Array.isArray(fields) && fields.length > 0;
+      formInfo.hasFields = hasFields;
+      const xfa = acroForm.get("XFA");
+      formInfo.hasXfa = Array.isArray(xfa) && xfa.length > 0 || xfa instanceof _base_stream.BaseStream && !xfa.isEmpty;
       const sigFlags = acroForm.get("SigFlags");
+      const hasSignatures = !!(sigFlags & 0x1);
 
-      const hasOnlyDocumentSignatures = !!(sigFlags & 0x1) && this._hasOnlyDocumentSignatures(fields);
+      const hasOnlyDocumentSignatures = hasSignatures && this._hasOnlyDocumentSignatures(fields);
 
       formInfo.hasAcroForm = hasFields && !hasOnlyDocumentSignatures;
+      formInfo.hasSignatures = hasSignatures;
     } catch (ex) {
       if (ex instanceof _core_utils.MissingDataException) {
         throw ex;
       }
 
-      (0, _util.info)("Cannot fetch form information.");
+      (0, _util.warn)(`Cannot fetch form information: "${ex}".`);
     }
 
     return (0, _util.shadow)(this, "formInfo", formInfo);
   }
 
   get documentInfo() {
-    const DocumentInfoValidators = {
-      Title: _util.isString,
-      Author: _util.isString,
-      Subject: _util.isString,
-      Keywords: _util.isString,
-      Creator: _util.isString,
-      Producer: _util.isString,
-      CreationDate: _util.isString,
-      ModDate: _util.isString,
-      Trapped: _primitives.isName
-    };
     let version = this._version;
 
     if (typeof version !== "string" || !PDF_HEADER_VERSION_REGEXP.test(version)) {
@@ -3610,10 +4883,13 @@ class PDFDocument {
 
     const docInfo = {
       PDFFormatVersion: version,
+      Language: this.catalog.lang,
+      EncryptFilterName: this.xref.encrypt ? this.xref.encrypt.filterName : null,
       IsLinearized: !!this.linearization,
       IsAcroFormPresent: this.formInfo.hasAcroForm,
       IsXFAPresent: this.formInfo.hasXfa,
-      IsCollectionPresent: !!this.catalog.collection
+      IsCollectionPresent: !!this.catalog.collection,
+      IsSignaturesPresent: this.formInfo.hasSignatures
     };
     let infoDict;
 
@@ -3627,25 +4903,60 @@ class PDFDocument {
       (0, _util.info)("The document information dictionary is invalid.");
     }
 
-    if ((0, _primitives.isDict)(infoDict)) {
-      for (const key of infoDict.getKeys()) {
-        const value = infoDict.get(key);
+    if (!(infoDict instanceof _primitives.Dict)) {
+      return (0, _util.shadow)(this, "documentInfo", docInfo);
+    }
 
-        if (DocumentInfoValidators[key]) {
-          if (DocumentInfoValidators[key](value)) {
-            docInfo[key] = typeof value !== "string" ? value : (0, _util.stringToPDFString)(value);
-          } else {
-            (0, _util.info)(`Bad value in document info for "${key}".`);
+    for (const key of infoDict.getKeys()) {
+      const value = infoDict.get(key);
+
+      switch (key) {
+        case "Title":
+        case "Author":
+        case "Subject":
+        case "Keywords":
+        case "Creator":
+        case "Producer":
+        case "CreationDate":
+        case "ModDate":
+          if (typeof value === "string") {
+            docInfo[key] = (0, _util.stringToPDFString)(value);
+            continue;
           }
-        } else if (typeof key === "string") {
+
+          break;
+
+        case "Trapped":
+          if (value instanceof _primitives.Name) {
+            docInfo[key] = value;
+            continue;
+          }
+
+          break;
+
+        default:
           let customValue;
 
-          if ((0, _util.isString)(value)) {
-            customValue = (0, _util.stringToPDFString)(value);
-          } else if ((0, _primitives.isName)(value) || (0, _util.isNum)(value) || (0, _util.isBool)(value)) {
-            customValue = value;
-          } else {
-            (0, _util.info)(`Unsupported value in document info for (custom) "${key}".`);
+          switch (typeof value) {
+            case "string":
+              customValue = (0, _util.stringToPDFString)(value);
+              break;
+
+            case "number":
+            case "boolean":
+              customValue = value;
+              break;
+
+            default:
+              if (value instanceof _primitives.Name) {
+                customValue = value;
+              }
+
+              break;
+          }
+
+          if (customValue === undefined) {
+            (0, _util.warn)(`Bad value, for custom key "${key}", in Info: ${value}.`);
             continue;
           }
 
@@ -3654,68 +4965,109 @@ class PDFDocument {
           }
 
           docInfo.Custom[key] = customValue;
-        }
+          continue;
       }
+
+      (0, _util.warn)(`Bad value, for key "${key}", in Info: ${value}.`);
     }
 
     return (0, _util.shadow)(this, "documentInfo", docInfo);
   }
 
-  get fingerprint() {
-    let hash;
+  get fingerprints() {
+    function validate(data) {
+      return typeof data === "string" && data.length > 0 && data !== EMPTY_FINGERPRINT;
+    }
+
+    function hexString(hash) {
+      const buf = [];
+
+      for (let i = 0, ii = hash.length; i < ii; i++) {
+        const hex = hash[i].toString(16);
+        buf.push(hex.padStart(2, "0"));
+      }
+
+      return buf.join("");
+    }
+
     const idArray = this.xref.trailer.get("ID");
+    let hashOriginal, hashModified;
 
-    if (Array.isArray(idArray) && idArray[0] && (0, _util.isString)(idArray[0]) && idArray[0] !== EMPTY_FINGERPRINT) {
-      hash = (0, _util.stringToBytes)(idArray[0]);
+    if (Array.isArray(idArray) && validate(idArray[0])) {
+      hashOriginal = (0, _util.stringToBytes)(idArray[0]);
+
+      if (idArray[1] !== idArray[0] && validate(idArray[1])) {
+        hashModified = (0, _util.stringToBytes)(idArray[1]);
+      }
     } else {
-      hash = (0, _crypto.calculateMD5)(this.stream.getByteRange(0, FINGERPRINT_FIRST_BYTES), 0, FINGERPRINT_FIRST_BYTES);
+      hashOriginal = (0, _crypto.calculateMD5)(this.stream.getByteRange(0, FINGERPRINT_FIRST_BYTES), 0, FINGERPRINT_FIRST_BYTES);
     }
 
-    const fingerprintBuf = [];
-
-    for (let i = 0, ii = hash.length; i < ii; i++) {
-      const hex = hash[i].toString(16);
-      fingerprintBuf.push(hex.padStart(2, "0"));
-    }
-
-    return (0, _util.shadow)(this, "fingerprint", fingerprintBuf.join(""));
+    return (0, _util.shadow)(this, "fingerprints", [hexString(hashOriginal), hashModified ? hexString(hashModified) : null]);
   }
 
-  _getLinearizationPage(pageIndex) {
+  async _getLinearizationPage(pageIndex) {
     const {
       catalog,
-      linearization
+      linearization,
+      xref
     } = this;
 
     const ref = _primitives.Ref.get(linearization.objectNumberFirst, 0);
 
-    return this.xref.fetchAsync(ref).then(obj => {
-      if ((0, _primitives.isDict)(obj, "Page") || (0, _primitives.isDict)(obj) && !obj.has("Type") && obj.has("Contents")) {
-        if (ref && !catalog.pageKidsCountCache.has(ref)) {
-          catalog.pageKidsCountCache.put(ref, 1);
+    try {
+      const obj = await xref.fetchAsync(ref);
+
+      if (obj instanceof _primitives.Dict) {
+        let type = obj.getRaw("Type");
+
+        if (type instanceof _primitives.Ref) {
+          type = await xref.fetchAsync(type);
         }
 
-        return [obj, ref];
+        if ((0, _primitives.isName)(type, "Page") || !obj.has("Type") && !obj.has("Kids")) {
+          if (!catalog.pageKidsCountCache.has(ref)) {
+            catalog.pageKidsCountCache.put(ref, 1);
+          }
+
+          if (!catalog.pageIndexCache.has(ref)) {
+            catalog.pageIndexCache.put(ref, 0);
+          }
+
+          return [obj, ref];
+        }
       }
 
-      throw new _util.FormatError("The Linearization dictionary doesn't point " + "to a valid Page dictionary.");
-    }).catch(reason => {
-      (0, _util.info)(reason);
+      throw new _util.FormatError("The Linearization dictionary doesn't point to a valid Page dictionary.");
+    } catch (reason) {
+      (0, _util.warn)(`_getLinearizationPage: "${reason.message}".`);
       return catalog.getPageDict(pageIndex);
-    });
+    }
   }
 
   getPage(pageIndex) {
-    if (this._pagePromises[pageIndex] !== undefined) {
-      return this._pagePromises[pageIndex];
+    const cachedPromise = this._pagePromises.get(pageIndex);
+
+    if (cachedPromise) {
+      return cachedPromise;
     }
 
     const {
       catalog,
-      linearization
+      linearization,
+      xfaFactory
     } = this;
-    const promise = linearization && linearization.pageFirst === pageIndex ? this._getLinearizationPage(pageIndex) : catalog.getPageDict(pageIndex);
-    return this._pagePromises[pageIndex] = promise.then(([pageDict, ref]) => {
+    let promise;
+
+    if (xfaFactory) {
+      promise = Promise.resolve([_primitives.Dict.empty, null]);
+    } else if (linearization && linearization.pageFirst === pageIndex) {
+      promise = this._getLinearizationPage(pageIndex);
+    } else {
+      promise = catalog.getPageDict(pageIndex);
+    }
+
+    promise = promise.then(([pageDict, ref]) => {
       return new Page({
         pdfManager: this.pdfManager,
         xref: this.xref,
@@ -3725,19 +5077,112 @@ class PDFDocument {
         globalIdFactory: this._globalIdFactory,
         fontCache: catalog.fontCache,
         builtInCMapCache: catalog.builtInCMapCache,
-        globalImageCache: catalog.globalImageCache
+        standardFontDataCache: catalog.standardFontDataCache,
+        globalImageCache: catalog.globalImageCache,
+        nonBlendModesSet: catalog.nonBlendModesSet,
+        xfaFactory
       });
     });
+
+    this._pagePromises.set(pageIndex, promise);
+
+    return promise;
   }
 
-  checkFirstPage() {
-    return this.getPage(0).catch(async reason => {
+  async checkFirstPage(recoveryMode = false) {
+    if (recoveryMode) {
+      return;
+    }
+
+    try {
+      await this.getPage(0);
+    } catch (reason) {
       if (reason instanceof _core_utils.XRefEntryException) {
-        this._pagePromises.length = 0;
+        this._pagePromises.delete(0);
+
         await this.cleanup();
         throw new _core_utils.XRefParseException();
       }
-    });
+    }
+  }
+
+  async checkLastPage(recoveryMode = false) {
+    const {
+      catalog,
+      pdfManager
+    } = this;
+    catalog.setActualNumPages();
+    let numPages;
+
+    try {
+      await Promise.all([pdfManager.ensureDoc("xfaFactory"), pdfManager.ensureDoc("linearization"), pdfManager.ensureCatalog("numPages")]);
+
+      if (this.xfaFactory) {
+        return;
+      } else if (this.linearization) {
+        numPages = this.linearization.numPages;
+      } else {
+        numPages = catalog.numPages;
+      }
+
+      if (!Number.isInteger(numPages)) {
+        throw new _util.FormatError("Page count is not an integer.");
+      } else if (numPages <= 1) {
+        return;
+      }
+
+      await this.getPage(numPages - 1);
+    } catch (reason) {
+      this._pagePromises.delete(numPages - 1);
+
+      await this.cleanup();
+
+      if (reason instanceof _core_utils.XRefEntryException && !recoveryMode) {
+        throw new _core_utils.XRefParseException();
+      }
+
+      (0, _util.warn)(`checkLastPage - invalid /Pages tree /Count: ${numPages}.`);
+      let pagesTree;
+
+      try {
+        pagesTree = await catalog.getAllPageDicts(recoveryMode);
+      } catch (reasonAll) {
+        if (reasonAll instanceof _core_utils.XRefEntryException && !recoveryMode) {
+          throw new _core_utils.XRefParseException();
+        }
+
+        catalog.setActualNumPages(1);
+        return;
+      }
+
+      for (const [pageIndex, [pageDict, ref]] of pagesTree) {
+        let promise;
+
+        if (pageDict instanceof Error) {
+          promise = Promise.reject(pageDict);
+          promise.catch(() => {});
+        } else {
+          promise = Promise.resolve(new Page({
+            pdfManager,
+            xref: this.xref,
+            pageIndex,
+            pageDict,
+            ref,
+            globalIdFactory: this._globalIdFactory,
+            fontCache: catalog.fontCache,
+            builtInCMapCache: catalog.builtInCMapCache,
+            standardFontDataCache: catalog.standardFontDataCache,
+            globalImageCache: catalog.globalImageCache,
+            nonBlendModesSet: catalog.nonBlendModesSet,
+            xfaFactory: null
+          }));
+        }
+
+        this._pagePromises.set(pageIndex, promise);
+      }
+
+      catalog.setActualNumPages(pagesTree.size);
+    }
   }
 
   fontFallback(id, handler) {
@@ -3745,7 +5190,112 @@ class PDFDocument {
   }
 
   async cleanup(manuallyTriggered = false) {
-    return this.catalog ? this.catalog.cleanup(manuallyTriggered) : (0, _primitives.clearPrimitiveCaches)();
+    return this.catalog ? this.catalog.cleanup(manuallyTriggered) : (0, _cleanup_helper.clearGlobalCaches)();
+  }
+
+  _collectFieldObjects(name, fieldRef, promises) {
+    const field = this.xref.fetchIfRef(fieldRef);
+
+    if (field.has("T")) {
+      const partName = (0, _util.stringToPDFString)(field.get("T"));
+
+      if (name === "") {
+        name = partName;
+      } else {
+        name = `${name}.${partName}`;
+      }
+    }
+
+    if (!promises.has(name)) {
+      promises.set(name, []);
+    }
+
+    promises.get(name).push(_annotation.AnnotationFactory.create(this.xref, fieldRef, this.pdfManager, this._localIdFactory, true).then(annotation => annotation && annotation.getFieldObject()).catch(function (reason) {
+      (0, _util.warn)(`_collectFieldObjects: "${reason}".`);
+      return null;
+    }));
+
+    if (field.has("Kids")) {
+      const kids = field.get("Kids");
+
+      for (const kid of kids) {
+        this._collectFieldObjects(name, kid, promises);
+      }
+    }
+  }
+
+  get fieldObjects() {
+    if (!this.formInfo.hasFields) {
+      return (0, _util.shadow)(this, "fieldObjects", Promise.resolve(null));
+    }
+
+    const allFields = Object.create(null);
+    const fieldPromises = new Map();
+
+    for (const fieldRef of this.catalog.acroForm.get("Fields")) {
+      this._collectFieldObjects("", fieldRef, fieldPromises);
+    }
+
+    const allPromises = [];
+
+    for (const [name, promises] of fieldPromises) {
+      allPromises.push(Promise.all(promises).then(fields => {
+        fields = fields.filter(field => !!field);
+
+        if (fields.length > 0) {
+          allFields[name] = fields;
+        }
+      }));
+    }
+
+    return (0, _util.shadow)(this, "fieldObjects", Promise.all(allPromises).then(() => allFields));
+  }
+
+  get hasJSActions() {
+    const promise = this.pdfManager.ensureDoc("_parseHasJSActions");
+    return (0, _util.shadow)(this, "hasJSActions", promise);
+  }
+
+  async _parseHasJSActions() {
+    const [catalogJsActions, fieldObjects] = await Promise.all([this.pdfManager.ensureCatalog("jsActions"), this.pdfManager.ensureDoc("fieldObjects")]);
+
+    if (catalogJsActions) {
+      return true;
+    }
+
+    if (fieldObjects) {
+      return Object.values(fieldObjects).some(fieldObject => fieldObject.some(object => object.actions !== null));
+    }
+
+    return false;
+  }
+
+  get calculationOrderIds() {
+    const acroForm = this.catalog.acroForm;
+
+    if (!acroForm || !acroForm.has("CO")) {
+      return (0, _util.shadow)(this, "calculationOrderIds", null);
+    }
+
+    const calculationOrder = acroForm.get("CO");
+
+    if (!Array.isArray(calculationOrder) || calculationOrder.length === 0) {
+      return (0, _util.shadow)(this, "calculationOrderIds", null);
+    }
+
+    const ids = [];
+
+    for (const id of calculationOrder) {
+      if (id instanceof _primitives.Ref) {
+        ids.push(id.toString());
+      }
+    }
+
+    if (ids.length === 0) {
+      return (0, _util.shadow)(this, "calculationOrderIds", null);
+    }
+
+    return (0, _util.shadow)(this, "calculationOrderIds", ids);
   }
 
 }
@@ -3753,13968 +5303,3494 @@ class PDFDocument {
 exports.PDFDocument = PDFDocument;
 
 /***/ }),
-/* 10 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 12 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.FileSpec = exports.XRef = exports.ObjectLoader = exports.Catalog = void 0;
+}));
+exports.PopupAnnotation = exports.MarkupAnnotation = exports.AnnotationFactory = exports.AnnotationBorderStyle = exports.Annotation = void 0;
+exports.getQuadPoints = getQuadPoints;
 
 var _util = __w_pdfjs_require__(2);
 
+var _core_utils = __w_pdfjs_require__(6);
+
+var _default_appearance = __w_pdfjs_require__(13);
+
 var _primitives = __w_pdfjs_require__(5);
 
-var _parser = __w_pdfjs_require__(11);
+var _writer = __w_pdfjs_require__(65);
 
-var _core_utils = __w_pdfjs_require__(8);
+var _base_stream = __w_pdfjs_require__(7);
 
-var _crypto = __w_pdfjs_require__(22);
+var _bidi = __w_pdfjs_require__(60);
 
-var _colorspace = __w_pdfjs_require__(23);
+var _catalog = __w_pdfjs_require__(69);
 
-var _image_utils = __w_pdfjs_require__(24);
+var _colorspace = __w_pdfjs_require__(14);
 
-function fetchDestination(dest) {
-  return (0, _primitives.isDict)(dest) ? dest.get("D") : dest;
-}
+var _file_spec = __w_pdfjs_require__(72);
 
-class Catalog {
-  constructor(pdfManager, xref) {
-    this.pdfManager = pdfManager;
-    this.xref = xref;
-    this._catDict = xref.getCatalogObj();
+var _object_loader = __w_pdfjs_require__(75);
 
-    if (!(0, _primitives.isDict)(this._catDict)) {
-      throw new _util.FormatError("Catalog object is not a dictionary.");
-    }
+var _operator_list = __w_pdfjs_require__(62);
 
-    this.fontCache = new _primitives.RefSetCache();
-    this.builtInCMapCache = new Map();
-    this.globalImageCache = new _image_utils.GlobalImageCache();
-    this.pageKidsCountCache = new _primitives.RefSetCache();
+var _stream = __w_pdfjs_require__(10);
+
+var _factory = __w_pdfjs_require__(76);
+
+class AnnotationFactory {
+  static create(xref, ref, pdfManager, idFactory, collectFields) {
+    return Promise.all([pdfManager.ensureCatalog("acroForm"), pdfManager.ensureCatalog("baseUrl"), pdfManager.ensureDoc("xfaDatasets"), collectFields ? this._getPageIndex(xref, ref, pdfManager) : -1]).then(([acroForm, baseUrl, xfaDatasets, pageIndex]) => pdfManager.ensure(this, "_create", [xref, ref, pdfManager, idFactory, acroForm, xfaDatasets, collectFields, pageIndex]));
   }
 
-  get version() {
-    const version = this._catDict.get("Version");
+  static _create(xref, ref, pdfManager, idFactory, acroForm, xfaDatasets, collectFields, pageIndex = -1) {
+    const dict = xref.fetchIfRef(ref);
 
-    if (!(0, _primitives.isName)(version)) {
-      return (0, _util.shadow)(this, "version", null);
-    }
-
-    return (0, _util.shadow)(this, "version", version.name);
-  }
-
-  get collection() {
-    let collection = null;
-
-    try {
-      const obj = this._catDict.get("Collection");
-
-      if ((0, _primitives.isDict)(obj) && obj.size > 0) {
-        collection = obj;
-      }
-    } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-
-      (0, _util.info)("Cannot fetch Collection entry; assuming no collection is present.");
-    }
-
-    return (0, _util.shadow)(this, "collection", collection);
-  }
-
-  get acroForm() {
-    let acroForm = null;
-
-    try {
-      const obj = this._catDict.get("AcroForm");
-
-      if ((0, _primitives.isDict)(obj) && obj.size > 0) {
-        acroForm = obj;
-      }
-    } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-
-      (0, _util.info)("Cannot fetch AcroForm entry; assuming no forms are present.");
-    }
-
-    return (0, _util.shadow)(this, "acroForm", acroForm);
-  }
-
-  get metadata() {
-    const streamRef = this._catDict.getRaw("Metadata");
-
-    if (!(0, _primitives.isRef)(streamRef)) {
-      return (0, _util.shadow)(this, "metadata", null);
-    }
-
-    const suppressEncryption = !(this.xref.encrypt && this.xref.encrypt.encryptMetadata);
-    const stream = this.xref.fetch(streamRef, suppressEncryption);
-    let metadata;
-
-    if (stream && (0, _primitives.isDict)(stream.dict)) {
-      const type = stream.dict.get("Type");
-      const subtype = stream.dict.get("Subtype");
-
-      if ((0, _primitives.isName)(type, "Metadata") && (0, _primitives.isName)(subtype, "XML")) {
-        try {
-          metadata = (0, _util.stringToUTF8String)((0, _util.bytesToString)(stream.getBytes()));
-        } catch (e) {
-          if (e instanceof _core_utils.MissingDataException) {
-            throw e;
-          }
-
-          (0, _util.info)("Skipping invalid metadata.");
-        }
-      }
-    }
-
-    return (0, _util.shadow)(this, "metadata", metadata);
-  }
-
-  get toplevelPagesDict() {
-    const pagesObj = this._catDict.get("Pages");
-
-    if (!(0, _primitives.isDict)(pagesObj)) {
-      throw new _util.FormatError("Invalid top-level pages dictionary.");
-    }
-
-    return (0, _util.shadow)(this, "toplevelPagesDict", pagesObj);
-  }
-
-  get documentOutline() {
-    let obj = null;
-
-    try {
-      obj = this._readDocumentOutline();
-    } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-
-      (0, _util.warn)("Unable to read document outline.");
-    }
-
-    return (0, _util.shadow)(this, "documentOutline", obj);
-  }
-
-  _readDocumentOutline() {
-    let obj = this._catDict.get("Outlines");
-
-    if (!(0, _primitives.isDict)(obj)) {
-      return null;
-    }
-
-    obj = obj.getRaw("First");
-
-    if (!(0, _primitives.isRef)(obj)) {
-      return null;
-    }
-
-    const root = {
-      items: []
-    };
-    const queue = [{
-      obj,
-      parent: root
-    }];
-    const processed = new _primitives.RefSet();
-    processed.put(obj);
-    const xref = this.xref,
-          blackColor = new Uint8ClampedArray(3);
-
-    while (queue.length > 0) {
-      const i = queue.shift();
-      const outlineDict = xref.fetchIfRef(i.obj);
-
-      if (outlineDict === null) {
-        continue;
-      }
-
-      if (!outlineDict.has("Title")) {
-        throw new _util.FormatError("Invalid outline item encountered.");
-      }
-
-      const data = {
-        url: null,
-        dest: null
-      };
-      Catalog.parseDestDictionary({
-        destDict: outlineDict,
-        resultObj: data,
-        docBaseUrl: this.pdfManager.docBaseUrl
-      });
-      const title = outlineDict.get("Title");
-      const flags = outlineDict.get("F") || 0;
-      const color = outlineDict.getArray("C");
-      const count = outlineDict.get("Count");
-      let rgbColor = blackColor;
-
-      if (Array.isArray(color) && color.length === 3 && (color[0] !== 0 || color[1] !== 0 || color[2] !== 0)) {
-        rgbColor = _colorspace.ColorSpace.singletons.rgb.getRgb(color, 0);
-      }
-
-      const outlineItem = {
-        dest: data.dest,
-        url: data.url,
-        unsafeUrl: data.unsafeUrl,
-        newWindow: data.newWindow,
-        title: (0, _util.stringToPDFString)(title),
-        color: rgbColor,
-        count: Number.isInteger(count) ? count : undefined,
-        bold: !!(flags & 2),
-        italic: !!(flags & 1),
-        items: []
-      };
-      i.parent.items.push(outlineItem);
-      obj = outlineDict.getRaw("First");
-
-      if ((0, _primitives.isRef)(obj) && !processed.has(obj)) {
-        queue.push({
-          obj,
-          parent: outlineItem
-        });
-        processed.put(obj);
-      }
-
-      obj = outlineDict.getRaw("Next");
-
-      if ((0, _primitives.isRef)(obj) && !processed.has(obj)) {
-        queue.push({
-          obj,
-          parent: i.parent
-        });
-        processed.put(obj);
-      }
-    }
-
-    return root.items.length > 0 ? root.items : null;
-  }
-
-  get permissions() {
-    let permissions = null;
-
-    try {
-      permissions = this._readPermissions();
-    } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-
-      (0, _util.warn)("Unable to read permissions.");
-    }
-
-    return (0, _util.shadow)(this, "permissions", permissions);
-  }
-
-  _readPermissions() {
-    const encrypt = this.xref.trailer.get("Encrypt");
-
-    if (!(0, _primitives.isDict)(encrypt)) {
-      return null;
-    }
-
-    let flags = encrypt.get("P");
-
-    if (!(0, _util.isNum)(flags)) {
-      return null;
-    }
-
-    flags += 2 ** 32;
-    const permissions = [];
-
-    for (const key in _util.PermissionFlag) {
-      const value = _util.PermissionFlag[key];
-
-      if (flags & value) {
-        permissions.push(value);
-      }
-    }
-
-    return permissions;
-  }
-
-  get optionalContentConfig() {
-    let config = null;
-
-    try {
-      const properties = this._catDict.get("OCProperties");
-
-      if (!properties) {
-        return (0, _util.shadow)(this, "optionalContentConfig", null);
-      }
-
-      const defaultConfig = properties.get("D");
-
-      if (!defaultConfig) {
-        return (0, _util.shadow)(this, "optionalContentConfig", null);
-      }
-
-      const groupsData = properties.get("OCGs");
-
-      if (!Array.isArray(groupsData)) {
-        return (0, _util.shadow)(this, "optionalContentConfig", null);
-      }
-
-      const groups = [];
-      const groupRefs = [];
-
-      for (const groupRef of groupsData) {
-        if (!(0, _primitives.isRef)(groupRef)) {
-          continue;
-        }
-
-        groupRefs.push(groupRef);
-        const group = this.xref.fetchIfRef(groupRef);
-        groups.push({
-          id: groupRef.toString(),
-          name: (0, _util.isString)(group.get("Name")) ? (0, _util.stringToPDFString)(group.get("Name")) : null,
-          intent: (0, _util.isString)(group.get("Intent")) ? (0, _util.stringToPDFString)(group.get("Intent")) : null
-        });
-      }
-
-      config = this._readOptionalContentConfig(defaultConfig, groupRefs);
-      config.groups = groups;
-    } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-
-      (0, _util.warn)(`Unable to read optional content config: ${ex}`);
-    }
-
-    return (0, _util.shadow)(this, "optionalContentConfig", config);
-  }
-
-  _readOptionalContentConfig(config, contentGroupRefs) {
-    function parseOnOff(refs) {
-      const onParsed = [];
-
-      if (Array.isArray(refs)) {
-        for (const value of refs) {
-          if (!(0, _primitives.isRef)(value)) {
-            continue;
-          }
-
-          if (contentGroupRefs.includes(value)) {
-            onParsed.push(value.toString());
-          }
-        }
-      }
-
-      return onParsed;
-    }
-
-    function parseOrder(refs, nestedLevels = 0) {
-      if (!Array.isArray(refs)) {
-        return null;
-      }
-
-      const order = [];
-
-      for (const value of refs) {
-        if ((0, _primitives.isRef)(value) && contentGroupRefs.includes(value)) {
-          parsedOrderRefs.put(value);
-          order.push(value.toString());
-          continue;
-        }
-
-        const nestedOrder = parseNestedOrder(value, nestedLevels);
-
-        if (nestedOrder) {
-          order.push(nestedOrder);
-        }
-      }
-
-      if (nestedLevels > 0) {
-        return order;
-      }
-
-      const hiddenGroups = [];
-
-      for (const groupRef of contentGroupRefs) {
-        if (parsedOrderRefs.has(groupRef)) {
-          continue;
-        }
-
-        hiddenGroups.push(groupRef.toString());
-      }
-
-      if (hiddenGroups.length) {
-        order.push({
-          name: null,
-          order: hiddenGroups
-        });
-      }
-
-      return order;
-    }
-
-    function parseNestedOrder(ref, nestedLevels) {
-      if (++nestedLevels > MAX_NESTED_LEVELS) {
-        (0, _util.warn)("parseNestedOrder - reached MAX_NESTED_LEVELS.");
-        return null;
-      }
-
-      const value = xref.fetchIfRef(ref);
-
-      if (!Array.isArray(value)) {
-        return null;
-      }
-
-      const nestedName = xref.fetchIfRef(value[0]);
-
-      if (typeof nestedName !== "string") {
-        return null;
-      }
-
-      const nestedOrder = parseOrder(value.slice(1), nestedLevels);
-
-      if (!nestedOrder || !nestedOrder.length) {
-        return null;
-      }
-
-      return {
-        name: (0, _util.stringToPDFString)(nestedName),
-        order: nestedOrder
-      };
-    }
-
-    const xref = this.xref,
-          parsedOrderRefs = new _primitives.RefSet(),
-          MAX_NESTED_LEVELS = 10;
-    return {
-      name: (0, _util.isString)(config.get("Name")) ? (0, _util.stringToPDFString)(config.get("Name")) : null,
-      creator: (0, _util.isString)(config.get("Creator")) ? (0, _util.stringToPDFString)(config.get("Creator")) : null,
-      baseState: (0, _primitives.isName)(config.get("BaseState")) ? config.get("BaseState").name : null,
-      on: parseOnOff(config.get("ON")),
-      off: parseOnOff(config.get("OFF")),
-      order: parseOrder(config.get("Order")),
-      groups: null
-    };
-  }
-
-  get numPages() {
-    const obj = this.toplevelPagesDict.get("Count");
-
-    if (!Number.isInteger(obj)) {
-      throw new _util.FormatError("Page count in top-level pages dictionary is not an integer.");
-    }
-
-    return (0, _util.shadow)(this, "numPages", obj);
-  }
-
-  get destinations() {
-    const obj = this._readDests(),
-          dests = Object.create(null);
-
-    if (obj instanceof NameTree) {
-      const names = obj.getAll();
-
-      for (const name in names) {
-        dests[name] = fetchDestination(names[name]);
-      }
-    } else if (obj instanceof _primitives.Dict) {
-      obj.forEach(function (key, value) {
-        if (value) {
-          dests[key] = fetchDestination(value);
-        }
-      });
-    }
-
-    return (0, _util.shadow)(this, "destinations", dests);
-  }
-
-  getDestination(destinationId) {
-    const obj = this._readDests();
-
-    if (obj instanceof NameTree || obj instanceof _primitives.Dict) {
-      return fetchDestination(obj.get(destinationId) || null);
-    }
-
-    return null;
-  }
-
-  _readDests() {
-    const obj = this._catDict.get("Names");
-
-    if (obj && obj.has("Dests")) {
-      return new NameTree(obj.getRaw("Dests"), this.xref);
-    } else if (this._catDict.has("Dests")) {
-      return this._catDict.get("Dests");
-    }
-
-    return undefined;
-  }
-
-  get pageLabels() {
-    let obj = null;
-
-    try {
-      obj = this._readPageLabels();
-    } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-
-      (0, _util.warn)("Unable to read page labels.");
-    }
-
-    return (0, _util.shadow)(this, "pageLabels", obj);
-  }
-
-  _readPageLabels() {
-    const obj = this._catDict.getRaw("PageLabels");
-
-    if (!obj) {
-      return null;
-    }
-
-    const pageLabels = new Array(this.numPages);
-    let style = null,
-        prefix = "";
-    const numberTree = new NumberTree(obj, this.xref);
-    const nums = numberTree.getAll();
-    let currentLabel = "",
-        currentIndex = 1;
-
-    for (let i = 0, ii = this.numPages; i < ii; i++) {
-      if (i in nums) {
-        const labelDict = nums[i];
-
-        if (!(0, _primitives.isDict)(labelDict)) {
-          throw new _util.FormatError("PageLabel is not a dictionary.");
-        }
-
-        if (labelDict.has("Type") && !(0, _primitives.isName)(labelDict.get("Type"), "PageLabel")) {
-          throw new _util.FormatError("Invalid type in PageLabel dictionary.");
-        }
-
-        if (labelDict.has("S")) {
-          const s = labelDict.get("S");
-
-          if (!(0, _primitives.isName)(s)) {
-            throw new _util.FormatError("Invalid style in PageLabel dictionary.");
-          }
-
-          style = s.name;
-        } else {
-          style = null;
-        }
-
-        if (labelDict.has("P")) {
-          const p = labelDict.get("P");
-
-          if (!(0, _util.isString)(p)) {
-            throw new _util.FormatError("Invalid prefix in PageLabel dictionary.");
-          }
-
-          prefix = (0, _util.stringToPDFString)(p);
-        } else {
-          prefix = "";
-        }
-
-        if (labelDict.has("St")) {
-          const st = labelDict.get("St");
-
-          if (!(Number.isInteger(st) && st >= 1)) {
-            throw new _util.FormatError("Invalid start in PageLabel dictionary.");
-          }
-
-          currentIndex = st;
-        } else {
-          currentIndex = 1;
-        }
-      }
-
-      switch (style) {
-        case "D":
-          currentLabel = currentIndex;
-          break;
-
-        case "R":
-        case "r":
-          currentLabel = (0, _core_utils.toRomanNumerals)(currentIndex, style === "r");
-          break;
-
-        case "A":
-        case "a":
-          const LIMIT = 26;
-          const A_UPPER_CASE = 0x41,
-                A_LOWER_CASE = 0x61;
-          const baseCharCode = style === "a" ? A_LOWER_CASE : A_UPPER_CASE;
-          const letterIndex = currentIndex - 1;
-          const character = String.fromCharCode(baseCharCode + letterIndex % LIMIT);
-          const charBuf = [];
-
-          for (let j = 0, jj = letterIndex / LIMIT | 0; j <= jj; j++) {
-            charBuf.push(character);
-          }
-
-          currentLabel = charBuf.join("");
-          break;
-
-        default:
-          if (style) {
-            throw new _util.FormatError(`Invalid style "${style}" in PageLabel dictionary.`);
-          }
-
-          currentLabel = "";
-      }
-
-      pageLabels[i] = prefix + currentLabel;
-      currentIndex++;
-    }
-
-    return pageLabels;
-  }
-
-  get pageLayout() {
-    const obj = this._catDict.get("PageLayout");
-
-    let pageLayout = "";
-
-    if ((0, _primitives.isName)(obj)) {
-      switch (obj.name) {
-        case "SinglePage":
-        case "OneColumn":
-        case "TwoColumnLeft":
-        case "TwoColumnRight":
-        case "TwoPageLeft":
-        case "TwoPageRight":
-          pageLayout = obj.name;
-      }
-    }
-
-    return (0, _util.shadow)(this, "pageLayout", pageLayout);
-  }
-
-  get pageMode() {
-    const obj = this._catDict.get("PageMode");
-
-    let pageMode = "UseNone";
-
-    if ((0, _primitives.isName)(obj)) {
-      switch (obj.name) {
-        case "UseNone":
-        case "UseOutlines":
-        case "UseThumbs":
-        case "FullScreen":
-        case "UseOC":
-        case "UseAttachments":
-          pageMode = obj.name;
-      }
-    }
-
-    return (0, _util.shadow)(this, "pageMode", pageMode);
-  }
-
-  get viewerPreferences() {
-    const ViewerPreferencesValidators = {
-      HideToolbar: _util.isBool,
-      HideMenubar: _util.isBool,
-      HideWindowUI: _util.isBool,
-      FitWindow: _util.isBool,
-      CenterWindow: _util.isBool,
-      DisplayDocTitle: _util.isBool,
-      NonFullScreenPageMode: _primitives.isName,
-      Direction: _primitives.isName,
-      ViewArea: _primitives.isName,
-      ViewClip: _primitives.isName,
-      PrintArea: _primitives.isName,
-      PrintClip: _primitives.isName,
-      PrintScaling: _primitives.isName,
-      Duplex: _primitives.isName,
-      PickTrayByPDFSize: _util.isBool,
-      PrintPageRange: Array.isArray,
-      NumCopies: Number.isInteger
-    };
-
-    const obj = this._catDict.get("ViewerPreferences");
-
-    let prefs = null;
-
-    if ((0, _primitives.isDict)(obj)) {
-      for (const key in ViewerPreferencesValidators) {
-        if (!obj.has(key)) {
-          continue;
-        }
-
-        const value = obj.get(key);
-
-        if (!ViewerPreferencesValidators[key](value)) {
-          (0, _util.info)(`Bad value in ViewerPreferences for "${key}".`);
-          continue;
-        }
-
-        let prefValue;
-
-        switch (key) {
-          case "NonFullScreenPageMode":
-            switch (value.name) {
-              case "UseNone":
-              case "UseOutlines":
-              case "UseThumbs":
-              case "UseOC":
-                prefValue = value.name;
-                break;
-
-              default:
-                prefValue = "UseNone";
-            }
-
-            break;
-
-          case "Direction":
-            switch (value.name) {
-              case "L2R":
-              case "R2L":
-                prefValue = value.name;
-                break;
-
-              default:
-                prefValue = "L2R";
-            }
-
-            break;
-
-          case "ViewArea":
-          case "ViewClip":
-          case "PrintArea":
-          case "PrintClip":
-            switch (value.name) {
-              case "MediaBox":
-              case "CropBox":
-              case "BleedBox":
-              case "TrimBox":
-              case "ArtBox":
-                prefValue = value.name;
-                break;
-
-              default:
-                prefValue = "CropBox";
-            }
-
-            break;
-
-          case "PrintScaling":
-            switch (value.name) {
-              case "None":
-              case "AppDefault":
-                prefValue = value.name;
-                break;
-
-              default:
-                prefValue = "AppDefault";
-            }
-
-            break;
-
-          case "Duplex":
-            switch (value.name) {
-              case "Simplex":
-              case "DuplexFlipShortEdge":
-              case "DuplexFlipLongEdge":
-                prefValue = value.name;
-                break;
-
-              default:
-                prefValue = "None";
-            }
-
-            break;
-
-          case "PrintPageRange":
-            const length = value.length;
-
-            if (length % 2 !== 0) {
-              break;
-            }
-
-            const isValid = value.every((page, i, arr) => {
-              return Number.isInteger(page) && page > 0 && (i === 0 || page >= arr[i - 1]) && page <= this.numPages;
-            });
-
-            if (isValid) {
-              prefValue = value;
-            }
-
-            break;
-
-          case "NumCopies":
-            if (value > 0) {
-              prefValue = value;
-            }
-
-            break;
-
-          default:
-            if (typeof value !== "boolean") {
-              throw new _util.FormatError(`viewerPreferences - expected a boolean value for: ${key}`);
-            }
-
-            prefValue = value;
-        }
-
-        if (prefValue !== undefined) {
-          if (!prefs) {
-            prefs = Object.create(null);
-          }
-
-          prefs[key] = prefValue;
-        } else {
-          (0, _util.info)(`Bad value in ViewerPreferences for "${key}".`);
-        }
-      }
-    }
-
-    return (0, _util.shadow)(this, "viewerPreferences", prefs);
-  }
-
-  get openAction() {
-    const obj = this._catDict.get("OpenAction");
-
-    let openAction = null;
-
-    if ((0, _primitives.isDict)(obj)) {
-      const destDict = new _primitives.Dict(this.xref);
-      destDict.set("A", obj);
-      const resultObj = {
-        url: null,
-        dest: null,
-        action: null
-      };
-      Catalog.parseDestDictionary({
-        destDict,
-        resultObj
-      });
-
-      if (Array.isArray(resultObj.dest)) {
-        if (!openAction) {
-          openAction = Object.create(null);
-        }
-
-        openAction.dest = resultObj.dest;
-      } else if (resultObj.action) {
-        if (!openAction) {
-          openAction = Object.create(null);
-        }
-
-        openAction.action = resultObj.action;
-      }
-    } else if (Array.isArray(obj)) {
-      if (!openAction) {
-        openAction = Object.create(null);
-      }
-
-      openAction.dest = obj;
-    }
-
-    return (0, _util.shadow)(this, "openAction", openAction);
-  }
-
-  get attachments() {
-    const obj = this._catDict.get("Names");
-
-    let attachments = null;
-
-    if (obj && obj.has("EmbeddedFiles")) {
-      const nameTree = new NameTree(obj.getRaw("EmbeddedFiles"), this.xref);
-      const names = nameTree.getAll();
-
-      for (const name in names) {
-        const fs = new FileSpec(names[name], this.xref);
-
-        if (!attachments) {
-          attachments = Object.create(null);
-        }
-
-        attachments[(0, _util.stringToPDFString)(name)] = fs.serializable;
-      }
-    }
-
-    return (0, _util.shadow)(this, "attachments", attachments);
-  }
-
-  get javaScript() {
-    const obj = this._catDict.get("Names");
-
-    let javaScript = null;
-
-    function appendIfJavaScriptDict(jsDict) {
-      const type = jsDict.get("S");
-
-      if (!(0, _primitives.isName)(type, "JavaScript")) {
-        return;
-      }
-
-      let js = jsDict.get("JS");
-
-      if ((0, _primitives.isStream)(js)) {
-        js = (0, _util.bytesToString)(js.getBytes());
-      } else if (!(0, _util.isString)(js)) {
-        return;
-      }
-
-      if (!javaScript) {
-        javaScript = [];
-      }
-
-      javaScript.push((0, _util.stringToPDFString)(js));
-    }
-
-    if (obj && obj.has("JavaScript")) {
-      const nameTree = new NameTree(obj.getRaw("JavaScript"), this.xref);
-      const names = nameTree.getAll();
-
-      for (const name in names) {
-        const jsDict = names[name];
-
-        if ((0, _primitives.isDict)(jsDict)) {
-          appendIfJavaScriptDict(jsDict);
-        }
-      }
-    }
-
-    const openAction = this._catDict.get("OpenAction");
-
-    if ((0, _primitives.isDict)(openAction) && (0, _primitives.isName)(openAction.get("S"), "JavaScript")) {
-      appendIfJavaScriptDict(openAction);
-    }
-
-    return (0, _util.shadow)(this, "javaScript", javaScript);
-  }
-
-  fontFallback(id, handler) {
-    const promises = [];
-    this.fontCache.forEach(function (promise) {
-      promises.push(promise);
-    });
-    return Promise.all(promises).then(translatedFonts => {
-      for (const translatedFont of translatedFonts) {
-        if (translatedFont.loadedName === id) {
-          translatedFont.fallback(handler);
-          return;
-        }
-      }
-    });
-  }
-
-  cleanup(manuallyTriggered = false) {
-    (0, _primitives.clearPrimitiveCaches)();
-    this.globalImageCache.clear(manuallyTriggered);
-    this.pageKidsCountCache.clear();
-    const promises = [];
-    this.fontCache.forEach(function (promise) {
-      promises.push(promise);
-    });
-    return Promise.all(promises).then(translatedFonts => {
-      for (const {
-        dict
-      } of translatedFonts) {
-        delete dict.translated;
-      }
-
-      this.fontCache.clear();
-      this.builtInCMapCache.clear();
-    });
-  }
-
-  getPageDict(pageIndex) {
-    const capability = (0, _util.createPromiseCapability)();
-    const nodesToVisit = [this._catDict.getRaw("Pages")];
-    const visitedNodes = new _primitives.RefSet();
-    const xref = this.xref,
-          pageKidsCountCache = this.pageKidsCountCache;
-    let count,
-        currentPageIndex = 0;
-
-    function next() {
-      while (nodesToVisit.length) {
-        const currentNode = nodesToVisit.pop();
-
-        if ((0, _primitives.isRef)(currentNode)) {
-          count = pageKidsCountCache.get(currentNode);
-
-          if (count > 0 && currentPageIndex + count < pageIndex) {
-            currentPageIndex += count;
-            continue;
-          }
-
-          if (visitedNodes.has(currentNode)) {
-            capability.reject(new _util.FormatError("Pages tree contains circular reference."));
-            return;
-          }
-
-          visitedNodes.put(currentNode);
-          xref.fetchAsync(currentNode).then(function (obj) {
-            if ((0, _primitives.isDict)(obj, "Page") || (0, _primitives.isDict)(obj) && !obj.has("Kids")) {
-              if (pageIndex === currentPageIndex) {
-                if (currentNode && !pageKidsCountCache.has(currentNode)) {
-                  pageKidsCountCache.put(currentNode, 1);
-                }
-
-                capability.resolve([obj, currentNode]);
-              } else {
-                currentPageIndex++;
-                next();
-              }
-
-              return;
-            }
-
-            nodesToVisit.push(obj);
-            next();
-          }, capability.reject);
-          return;
-        }
-
-        if (!(0, _primitives.isDict)(currentNode)) {
-          capability.reject(new _util.FormatError("Page dictionary kid reference points to wrong type of object."));
-          return;
-        }
-
-        count = currentNode.get("Count");
-
-        if (Number.isInteger(count) && count >= 0) {
-          const objId = currentNode.objId;
-
-          if (objId && !pageKidsCountCache.has(objId)) {
-            pageKidsCountCache.put(objId, count);
-          }
-
-          if (currentPageIndex + count <= pageIndex) {
-            currentPageIndex += count;
-            continue;
-          }
-        }
-
-        const kids = currentNode.get("Kids");
-
-        if (!Array.isArray(kids)) {
-          if ((0, _primitives.isName)(currentNode.get("Type"), "Page") || !currentNode.has("Type") && currentNode.has("Contents")) {
-            if (currentPageIndex === pageIndex) {
-              capability.resolve([currentNode, null]);
-              return;
-            }
-
-            currentPageIndex++;
-            continue;
-          }
-
-          capability.reject(new _util.FormatError("Page dictionary kids object is not an array."));
-          return;
-        }
-
-        for (let last = kids.length - 1; last >= 0; last--) {
-          nodesToVisit.push(kids[last]);
-        }
-      }
-
-      capability.reject(new Error(`Page index ${pageIndex} not found.`));
-    }
-
-    next();
-    return capability.promise;
-  }
-
-  getPageIndex(pageRef) {
-    const xref = this.xref;
-
-    function pagesBeforeRef(kidRef) {
-      let total = 0,
-          parentRef;
-      return xref.fetchAsync(kidRef).then(function (node) {
-        if ((0, _primitives.isRefsEqual)(kidRef, pageRef) && !(0, _primitives.isDict)(node, "Page") && !((0, _primitives.isDict)(node) && !node.has("Type") && node.has("Contents"))) {
-          throw new _util.FormatError("The reference does not point to a /Page dictionary.");
-        }
-
-        if (!node) {
-          return null;
-        }
-
-        if (!(0, _primitives.isDict)(node)) {
-          throw new _util.FormatError("Node must be a dictionary.");
-        }
-
-        parentRef = node.getRaw("Parent");
-        return node.getAsync("Parent");
-      }).then(function (parent) {
-        if (!parent) {
-          return null;
-        }
-
-        if (!(0, _primitives.isDict)(parent)) {
-          throw new _util.FormatError("Parent must be a dictionary.");
-        }
-
-        return parent.getAsync("Kids");
-      }).then(function (kids) {
-        if (!kids) {
-          return null;
-        }
-
-        const kidPromises = [];
-        let found = false;
-
-        for (let i = 0, ii = kids.length; i < ii; i++) {
-          const kid = kids[i];
-
-          if (!(0, _primitives.isRef)(kid)) {
-            throw new _util.FormatError("Kid must be a reference.");
-          }
-
-          if ((0, _primitives.isRefsEqual)(kid, kidRef)) {
-            found = true;
-            break;
-          }
-
-          kidPromises.push(xref.fetchAsync(kid).then(function (obj) {
-            if (!(0, _primitives.isDict)(obj)) {
-              throw new _util.FormatError("Kid node must be a dictionary.");
-            }
-
-            if (obj.has("Count")) {
-              total += obj.get("Count");
-            } else {
-              total++;
-            }
-          }));
-        }
-
-        if (!found) {
-          throw new _util.FormatError("Kid reference not found in parent's kids.");
-        }
-
-        return Promise.all(kidPromises).then(function () {
-          return [total, parentRef];
-        });
-      });
-    }
-
-    let total = 0;
-
-    function next(ref) {
-      return pagesBeforeRef(ref).then(function (args) {
-        if (!args) {
-          return total;
-        }
-
-        const [count, parentRef] = args;
-        total += count;
-        return next(parentRef);
-      });
-    }
-
-    return next(pageRef);
-  }
-
-  static parseDestDictionary(params) {
-    function addDefaultProtocolToUrl(url) {
-      return url.startsWith("www.") ? `http://${url}` : url;
-    }
-
-    function tryConvertUrlEncoding(url) {
-      try {
-        return (0, _util.stringToUTF8String)(url);
-      } catch (e) {
-        return url;
-      }
-    }
-
-    const destDict = params.destDict;
-
-    if (!(0, _primitives.isDict)(destDict)) {
-      (0, _util.warn)("parseDestDictionary: `destDict` must be a dictionary.");
-      return;
-    }
-
-    const resultObj = params.resultObj;
-
-    if (typeof resultObj !== "object") {
-      (0, _util.warn)("parseDestDictionary: `resultObj` must be an object.");
-      return;
-    }
-
-    const docBaseUrl = params.docBaseUrl || null;
-    let action = destDict.get("A"),
-        url,
-        dest;
-
-    if (!(0, _primitives.isDict)(action) && destDict.has("Dest")) {
-      action = destDict.get("Dest");
-    }
-
-    if ((0, _primitives.isDict)(action)) {
-      const actionType = action.get("S");
-
-      if (!(0, _primitives.isName)(actionType)) {
-        (0, _util.warn)("parseDestDictionary: Invalid type in Action dictionary.");
-        return;
-      }
-
-      const actionName = actionType.name;
-
-      switch (actionName) {
-        case "URI":
-          url = action.get("URI");
-
-          if ((0, _primitives.isName)(url)) {
-            url = "/" + url.name;
-          } else if ((0, _util.isString)(url)) {
-            url = addDefaultProtocolToUrl(url);
-          }
-
-          break;
-
-        case "GoTo":
-          dest = action.get("D");
-          break;
-
-        case "Launch":
-        case "GoToR":
-          const urlDict = action.get("F");
-
-          if ((0, _primitives.isDict)(urlDict)) {
-            url = urlDict.get("F") || null;
-          } else if ((0, _util.isString)(urlDict)) {
-            url = urlDict;
-          }
-
-          let remoteDest = action.get("D");
-
-          if (remoteDest) {
-            if ((0, _primitives.isName)(remoteDest)) {
-              remoteDest = remoteDest.name;
-            }
-
-            if ((0, _util.isString)(url)) {
-              const baseUrl = url.split("#")[0];
-
-              if ((0, _util.isString)(remoteDest)) {
-                url = baseUrl + "#" + remoteDest;
-              } else if (Array.isArray(remoteDest)) {
-                url = baseUrl + "#" + JSON.stringify(remoteDest);
-              }
-            }
-          }
-
-          const newWindow = action.get("NewWindow");
-
-          if ((0, _util.isBool)(newWindow)) {
-            resultObj.newWindow = newWindow;
-          }
-
-          break;
-
-        case "Named":
-          const namedAction = action.get("N");
-
-          if ((0, _primitives.isName)(namedAction)) {
-            resultObj.action = namedAction.name;
-          }
-
-          break;
-
-        case "JavaScript":
-          const jsAction = action.get("JS");
-          let js;
-
-          if ((0, _primitives.isStream)(jsAction)) {
-            js = (0, _util.bytesToString)(jsAction.getBytes());
-          } else if ((0, _util.isString)(jsAction)) {
-            js = jsAction;
-          }
-
-          if (js) {
-            const URL_OPEN_METHODS = ["app.launchURL", "window.open"];
-            const regex = new RegExp("^\\s*(" + URL_OPEN_METHODS.join("|").split(".").join("\\.") + ")\\((?:'|\")([^'\"]*)(?:'|\")(?:,\\s*(\\w+)\\)|\\))", "i");
-            const jsUrl = regex.exec((0, _util.stringToPDFString)(js));
-
-            if (jsUrl && jsUrl[2]) {
-              url = jsUrl[2];
-
-              if (jsUrl[3] === "true" && jsUrl[1] === "app.launchURL") {
-                resultObj.newWindow = true;
-              }
-
-              break;
-            }
-          }
-
-        default:
-          (0, _util.warn)(`parseDestDictionary: unsupported action type "${actionName}".`);
-          break;
-      }
-    } else if (destDict.has("Dest")) {
-      dest = destDict.get("Dest");
-    }
-
-    if ((0, _util.isString)(url)) {
-      url = tryConvertUrlEncoding(url);
-      const absoluteUrl = (0, _util.createValidAbsoluteUrl)(url, docBaseUrl);
-
-      if (absoluteUrl) {
-        resultObj.url = absoluteUrl.href;
-      }
-
-      resultObj.unsafeUrl = url;
-    }
-
-    if (dest) {
-      if ((0, _primitives.isName)(dest)) {
-        dest = dest.name;
-      }
-
-      if ((0, _util.isString)(dest) || Array.isArray(dest)) {
-        resultObj.dest = dest;
-      }
-    }
-  }
-
-}
-
-exports.Catalog = Catalog;
-
-var XRef = function XRefClosure() {
-  function XRef(stream, pdfManager) {
-    this.stream = stream;
-    this.pdfManager = pdfManager;
-    this.entries = [];
-    this.xrefstms = Object.create(null);
-    this._cacheMap = new Map();
-    this.stats = {
-      streamTypes: Object.create(null),
-      fontTypes: Object.create(null)
-    };
-    this._newRefNum = null;
-  }
-
-  XRef.prototype = {
-    getNewRef: function XRef_getNewRef() {
-      if (this._newRefNum === null) {
-        this._newRefNum = this.entries.length;
-      }
-
-      return _primitives.Ref.get(this._newRefNum++, 0);
-    },
-    resetNewRef: function XRef_resetNewRef() {
-      this._newRefNum = null;
-    },
-    setStartXRef: function XRef_setStartXRef(startXRef) {
-      this.startXRefQueue = [startXRef];
-    },
-    parse: function XRef_parse(recoveryMode) {
-      var trailerDict;
-
-      if (!recoveryMode) {
-        trailerDict = this.readXRef();
-      } else {
-        (0, _util.warn)("Indexing all PDF objects");
-        trailerDict = this.indexObjects();
-      }
-
-      trailerDict.assignXref(this);
-      this.trailer = trailerDict;
-      let encrypt;
-
-      try {
-        encrypt = trailerDict.get("Encrypt");
-      } catch (ex) {
-        if (ex instanceof _core_utils.MissingDataException) {
-          throw ex;
-        }
-
-        (0, _util.warn)(`XRef.parse - Invalid "Encrypt" reference: "${ex}".`);
-      }
-
-      if ((0, _primitives.isDict)(encrypt)) {
-        var ids = trailerDict.get("ID");
-        var fileId = ids && ids.length ? ids[0] : "";
-        encrypt.suppressEncryption = true;
-        this.encrypt = new _crypto.CipherTransformFactory(encrypt, fileId, this.pdfManager.password);
-      }
-
-      let root;
-
-      try {
-        root = trailerDict.get("Root");
-      } catch (ex) {
-        if (ex instanceof _core_utils.MissingDataException) {
-          throw ex;
-        }
-
-        (0, _util.warn)(`XRef.parse - Invalid "Root" reference: "${ex}".`);
-      }
-
-      if ((0, _primitives.isDict)(root) && root.has("Pages")) {
-        this.root = root;
-      } else {
-        if (!recoveryMode) {
-          throw new _core_utils.XRefParseException();
-        }
-
-        throw new _util.FormatError("Invalid root reference");
-      }
-    },
-    processXRefTable: function XRef_processXRefTable(parser) {
-      if (!("tableState" in this)) {
-        this.tableState = {
-          entryNum: 0,
-          streamPos: parser.lexer.stream.pos,
-          parserBuf1: parser.buf1,
-          parserBuf2: parser.buf2
-        };
-      }
-
-      var obj = this.readXRefTable(parser);
-
-      if (!(0, _primitives.isCmd)(obj, "trailer")) {
-        throw new _util.FormatError("Invalid XRef table: could not find trailer dictionary");
-      }
-
-      var dict = parser.getObj();
-
-      if (!(0, _primitives.isDict)(dict) && dict.dict) {
-        dict = dict.dict;
-      }
-
-      if (!(0, _primitives.isDict)(dict)) {
-        throw new _util.FormatError("Invalid XRef table: could not parse trailer dictionary");
-      }
-
-      delete this.tableState;
-      return dict;
-    },
-    readXRefTable: function XRef_readXRefTable(parser) {
-      var stream = parser.lexer.stream;
-      var tableState = this.tableState;
-      stream.pos = tableState.streamPos;
-      parser.buf1 = tableState.parserBuf1;
-      parser.buf2 = tableState.parserBuf2;
-      var obj;
-
-      while (true) {
-        if (!("firstEntryNum" in tableState) || !("entryCount" in tableState)) {
-          if ((0, _primitives.isCmd)(obj = parser.getObj(), "trailer")) {
-            break;
-          }
-
-          tableState.firstEntryNum = obj;
-          tableState.entryCount = parser.getObj();
-        }
-
-        var first = tableState.firstEntryNum;
-        var count = tableState.entryCount;
-
-        if (!Number.isInteger(first) || !Number.isInteger(count)) {
-          throw new _util.FormatError("Invalid XRef table: wrong types in subsection header");
-        }
-
-        for (var i = tableState.entryNum; i < count; i++) {
-          tableState.streamPos = stream.pos;
-          tableState.entryNum = i;
-          tableState.parserBuf1 = parser.buf1;
-          tableState.parserBuf2 = parser.buf2;
-          var entry = {};
-          entry.offset = parser.getObj();
-          entry.gen = parser.getObj();
-          var type = parser.getObj();
-
-          if (type instanceof _primitives.Cmd) {
-            switch (type.cmd) {
-              case "f":
-                entry.free = true;
-                break;
-
-              case "n":
-                entry.uncompressed = true;
-                break;
-            }
-          }
-
-          if (!Number.isInteger(entry.offset) || !Number.isInteger(entry.gen) || !(entry.free || entry.uncompressed)) {
-            throw new _util.FormatError(`Invalid entry in XRef subsection: ${first}, ${count}`);
-          }
-
-          if (i === 0 && entry.free && first === 1) {
-            first = 0;
-          }
-
-          if (!this.entries[i + first]) {
-            this.entries[i + first] = entry;
-          }
-        }
-
-        tableState.entryNum = 0;
-        tableState.streamPos = stream.pos;
-        tableState.parserBuf1 = parser.buf1;
-        tableState.parserBuf2 = parser.buf2;
-        delete tableState.firstEntryNum;
-        delete tableState.entryCount;
-      }
-
-      if (this.entries[0] && !this.entries[0].free) {
-        throw new _util.FormatError("Invalid XRef table: unexpected first object");
-      }
-
-      return obj;
-    },
-    processXRefStream: function XRef_processXRefStream(stream) {
-      if (!("streamState" in this)) {
-        var streamParameters = stream.dict;
-        var byteWidths = streamParameters.get("W");
-        var range = streamParameters.get("Index");
-
-        if (!range) {
-          range = [0, streamParameters.get("Size")];
-        }
-
-        this.streamState = {
-          entryRanges: range,
-          byteWidths,
-          entryNum: 0,
-          streamPos: stream.pos
-        };
-      }
-
-      this.readXRefStream(stream);
-      delete this.streamState;
-      return stream.dict;
-    },
-    readXRefStream: function XRef_readXRefStream(stream) {
-      var i, j;
-      var streamState = this.streamState;
-      stream.pos = streamState.streamPos;
-      var byteWidths = streamState.byteWidths;
-      var typeFieldWidth = byteWidths[0];
-      var offsetFieldWidth = byteWidths[1];
-      var generationFieldWidth = byteWidths[2];
-      var entryRanges = streamState.entryRanges;
-
-      while (entryRanges.length > 0) {
-        var first = entryRanges[0];
-        var n = entryRanges[1];
-
-        if (!Number.isInteger(first) || !Number.isInteger(n)) {
-          throw new _util.FormatError(`Invalid XRef range fields: ${first}, ${n}`);
-        }
-
-        if (!Number.isInteger(typeFieldWidth) || !Number.isInteger(offsetFieldWidth) || !Number.isInteger(generationFieldWidth)) {
-          throw new _util.FormatError(`Invalid XRef entry fields length: ${first}, ${n}`);
-        }
-
-        for (i = streamState.entryNum; i < n; ++i) {
-          streamState.entryNum = i;
-          streamState.streamPos = stream.pos;
-          var type = 0,
-              offset = 0,
-              generation = 0;
-
-          for (j = 0; j < typeFieldWidth; ++j) {
-            type = type << 8 | stream.getByte();
-          }
-
-          if (typeFieldWidth === 0) {
-            type = 1;
-          }
-
-          for (j = 0; j < offsetFieldWidth; ++j) {
-            offset = offset << 8 | stream.getByte();
-          }
-
-          for (j = 0; j < generationFieldWidth; ++j) {
-            generation = generation << 8 | stream.getByte();
-          }
-
-          var entry = {};
-          entry.offset = offset;
-          entry.gen = generation;
-
-          switch (type) {
-            case 0:
-              entry.free = true;
-              break;
-
-            case 1:
-              entry.uncompressed = true;
-              break;
-
-            case 2:
-              break;
-
-            default:
-              throw new _util.FormatError(`Invalid XRef entry type: ${type}`);
-          }
-
-          if (!this.entries[first + i]) {
-            this.entries[first + i] = entry;
-          }
-        }
-
-        streamState.entryNum = 0;
-        streamState.streamPos = stream.pos;
-        entryRanges.splice(0, 2);
-      }
-    },
-    indexObjects: function XRef_indexObjects() {
-      var TAB = 0x9,
-          LF = 0xa,
-          CR = 0xd,
-          SPACE = 0x20;
-      var PERCENT = 0x25,
-          LT = 0x3c;
-
-      function readToken(data, offset) {
-        var token = "",
-            ch = data[offset];
-
-        while (ch !== LF && ch !== CR && ch !== LT) {
-          if (++offset >= data.length) {
-            break;
-          }
-
-          token += String.fromCharCode(ch);
-          ch = data[offset];
-        }
-
-        return token;
-      }
-
-      function skipUntil(data, offset, what) {
-        var length = what.length,
-            dataLength = data.length;
-        var skipped = 0;
-
-        while (offset < dataLength) {
-          var i = 0;
-
-          while (i < length && data[offset + i] === what[i]) {
-            ++i;
-          }
-
-          if (i >= length) {
-            break;
-          }
-
-          offset++;
-          skipped++;
-        }
-
-        return skipped;
-      }
-
-      var objRegExp = /^(\d+)\s+(\d+)\s+obj\b/;
-      const endobjRegExp = /\bendobj[\b\s]$/;
-      const nestedObjRegExp = /\s+(\d+\s+\d+\s+obj[\b\s<])$/;
-      const CHECK_CONTENT_LENGTH = 25;
-      var trailerBytes = new Uint8Array([116, 114, 97, 105, 108, 101, 114]);
-      var startxrefBytes = new Uint8Array([115, 116, 97, 114, 116, 120, 114, 101, 102]);
-      const objBytes = new Uint8Array([111, 98, 106]);
-      var xrefBytes = new Uint8Array([47, 88, 82, 101, 102]);
-      this.entries.length = 0;
-      var stream = this.stream;
-      stream.pos = 0;
-      var buffer = stream.getBytes();
-      var position = stream.start,
-          length = buffer.length;
-      var trailers = [],
-          xrefStms = [];
-
-      while (position < length) {
-        var ch = buffer[position];
-
-        if (ch === TAB || ch === LF || ch === CR || ch === SPACE) {
-          ++position;
-          continue;
-        }
-
-        if (ch === PERCENT) {
-          do {
-            ++position;
-
-            if (position >= length) {
-              break;
-            }
-
-            ch = buffer[position];
-          } while (ch !== LF && ch !== CR);
-
-          continue;
-        }
-
-        var token = readToken(buffer, position);
-        var m;
-
-        if (token.startsWith("xref") && (token.length === 4 || /\s/.test(token[4]))) {
-          position += skipUntil(buffer, position, trailerBytes);
-          trailers.push(position);
-          position += skipUntil(buffer, position, startxrefBytes);
-        } else if (m = objRegExp.exec(token)) {
-          const num = m[1] | 0,
-                gen = m[2] | 0;
-
-          if (!this.entries[num] || this.entries[num].gen === gen) {
-            this.entries[num] = {
-              offset: position - stream.start,
-              gen,
-              uncompressed: true
-            };
-          }
-
-          let contentLength,
-              startPos = position + token.length;
-
-          while (startPos < buffer.length) {
-            const endPos = startPos + skipUntil(buffer, startPos, objBytes) + 4;
-            contentLength = endPos - position;
-            const checkPos = Math.max(endPos - CHECK_CONTENT_LENGTH, startPos);
-            const tokenStr = (0, _util.bytesToString)(buffer.subarray(checkPos, endPos));
-
-            if (endobjRegExp.test(tokenStr)) {
-              break;
-            } else {
-              const objToken = nestedObjRegExp.exec(tokenStr);
-
-              if (objToken && objToken[1]) {
-                (0, _util.warn)('indexObjects: Found new "obj" inside of another "obj", ' + 'caused by missing "endobj" -- trying to recover.');
-                contentLength -= objToken[1].length;
-                break;
-              }
-            }
-
-            startPos = endPos;
-          }
-
-          const content = buffer.subarray(position, position + contentLength);
-          var xrefTagOffset = skipUntil(content, 0, xrefBytes);
-
-          if (xrefTagOffset < contentLength && content[xrefTagOffset + 5] < 64) {
-            xrefStms.push(position - stream.start);
-            this.xrefstms[position - stream.start] = 1;
-          }
-
-          position += contentLength;
-        } else if (token.startsWith("trailer") && (token.length === 7 || /\s/.test(token[7]))) {
-          trailers.push(position);
-          position += skipUntil(buffer, position, startxrefBytes);
-        } else {
-          position += token.length + 1;
-        }
-      }
-
-      var i, ii;
-
-      for (i = 0, ii = xrefStms.length; i < ii; ++i) {
-        this.startXRefQueue.push(xrefStms[i]);
-        this.readXRef(true);
-      }
-
-      let trailerDict;
-
-      for (i = 0, ii = trailers.length; i < ii; ++i) {
-        stream.pos = trailers[i];
-        const parser = new _parser.Parser({
-          lexer: new _parser.Lexer(stream),
-          xref: this,
-          allowStreams: true,
-          recoveryMode: true
-        });
-        var obj = parser.getObj();
-
-        if (!(0, _primitives.isCmd)(obj, "trailer")) {
-          continue;
-        }
-
-        const dict = parser.getObj();
-
-        if (!(0, _primitives.isDict)(dict)) {
-          continue;
-        }
-
-        let rootDict;
-
-        try {
-          rootDict = dict.get("Root");
-        } catch (ex) {
-          if (ex instanceof _core_utils.MissingDataException) {
-            throw ex;
-          }
-
-          continue;
-        }
-
-        if (!(0, _primitives.isDict)(rootDict) || !rootDict.has("Pages")) {
-          continue;
-        }
-
-        if (dict.has("ID")) {
-          return dict;
-        }
-
-        trailerDict = dict;
-      }
-
-      if (trailerDict) {
-        return trailerDict;
-      }
-
-      throw new _util.InvalidPDFException("Invalid PDF structure.");
-    },
-    readXRef: function XRef_readXRef(recoveryMode) {
-      var stream = this.stream;
-      const startXRefParsedCache = Object.create(null);
-
-      try {
-        while (this.startXRefQueue.length) {
-          var startXRef = this.startXRefQueue[0];
-
-          if (startXRefParsedCache[startXRef]) {
-            (0, _util.warn)("readXRef - skipping XRef table since it was already parsed.");
-            this.startXRefQueue.shift();
-            continue;
-          }
-
-          startXRefParsedCache[startXRef] = true;
-          stream.pos = startXRef + stream.start;
-          const parser = new _parser.Parser({
-            lexer: new _parser.Lexer(stream),
-            xref: this,
-            allowStreams: true
-          });
-          var obj = parser.getObj();
-          var dict;
-
-          if ((0, _primitives.isCmd)(obj, "xref")) {
-            dict = this.processXRefTable(parser);
-
-            if (!this.topDict) {
-              this.topDict = dict;
-            }
-
-            obj = dict.get("XRefStm");
-
-            if (Number.isInteger(obj)) {
-              var pos = obj;
-
-              if (!(pos in this.xrefstms)) {
-                this.xrefstms[pos] = 1;
-                this.startXRefQueue.push(pos);
-              }
-            }
-          } else if (Number.isInteger(obj)) {
-            if (!Number.isInteger(parser.getObj()) || !(0, _primitives.isCmd)(parser.getObj(), "obj") || !(0, _primitives.isStream)(obj = parser.getObj())) {
-              throw new _util.FormatError("Invalid XRef stream");
-            }
-
-            dict = this.processXRefStream(obj);
-
-            if (!this.topDict) {
-              this.topDict = dict;
-            }
-
-            if (!dict) {
-              throw new _util.FormatError("Failed to read XRef stream");
-            }
-          } else {
-            throw new _util.FormatError("Invalid XRef stream header");
-          }
-
-          obj = dict.get("Prev");
-
-          if (Number.isInteger(obj)) {
-            this.startXRefQueue.push(obj);
-          } else if ((0, _primitives.isRef)(obj)) {
-            this.startXRefQueue.push(obj.num);
-          }
-
-          this.startXRefQueue.shift();
-        }
-
-        return this.topDict;
-      } catch (e) {
-        if (e instanceof _core_utils.MissingDataException) {
-          throw e;
-        }
-
-        (0, _util.info)("(while reading XRef): " + e);
-      }
-
-      if (recoveryMode) {
-        return undefined;
-      }
-
-      throw new _core_utils.XRefParseException();
-    },
-    getEntry: function XRef_getEntry(i) {
-      var xrefEntry = this.entries[i];
-
-      if (xrefEntry && !xrefEntry.free && xrefEntry.offset) {
-        return xrefEntry;
-      }
-
-      return null;
-    },
-    fetchIfRef: function XRef_fetchIfRef(obj, suppressEncryption) {
-      if (obj instanceof _primitives.Ref) {
-        return this.fetch(obj, suppressEncryption);
-      }
-
-      return obj;
-    },
-    fetch: function XRef_fetch(ref, suppressEncryption) {
-      if (!(ref instanceof _primitives.Ref)) {
-        throw new Error("ref object is not a reference");
-      }
-
-      const num = ref.num;
-
-      const cacheEntry = this._cacheMap.get(num);
-
-      if (cacheEntry !== undefined) {
-        if (cacheEntry instanceof _primitives.Dict && !cacheEntry.objId) {
-          cacheEntry.objId = ref.toString();
-        }
-
-        return cacheEntry;
-      }
-
-      let xrefEntry = this.getEntry(num);
-
-      if (xrefEntry === null) {
-        this._cacheMap.set(num, xrefEntry);
-
-        return xrefEntry;
-      }
-
-      if (xrefEntry.uncompressed) {
-        xrefEntry = this.fetchUncompressed(ref, xrefEntry, suppressEncryption);
-      } else {
-        xrefEntry = this.fetchCompressed(ref, xrefEntry, suppressEncryption);
-      }
-
-      if ((0, _primitives.isDict)(xrefEntry)) {
-        xrefEntry.objId = ref.toString();
-      } else if ((0, _primitives.isStream)(xrefEntry)) {
-        xrefEntry.dict.objId = ref.toString();
-      }
-
-      return xrefEntry;
-    },
-
-    fetchUncompressed(ref, xrefEntry, suppressEncryption = false) {
-      var gen = ref.gen;
-      var num = ref.num;
-
-      if (xrefEntry.gen !== gen) {
-        throw new _core_utils.XRefEntryException(`Inconsistent generation in XRef: ${ref}`);
-      }
-
-      var stream = this.stream.makeSubStream(xrefEntry.offset + this.stream.start);
-      const parser = new _parser.Parser({
-        lexer: new _parser.Lexer(stream),
-        xref: this,
-        allowStreams: true
-      });
-      var obj1 = parser.getObj();
-      var obj2 = parser.getObj();
-      var obj3 = parser.getObj();
-
-      if (obj1 !== num || obj2 !== gen || !(obj3 instanceof _primitives.Cmd)) {
-        throw new _core_utils.XRefEntryException(`Bad (uncompressed) XRef entry: ${ref}`);
-      }
-
-      if (obj3.cmd !== "obj") {
-        if (obj3.cmd.startsWith("obj")) {
-          num = parseInt(obj3.cmd.substring(3), 10);
-
-          if (!Number.isNaN(num)) {
-            return num;
-          }
-        }
-
-        throw new _core_utils.XRefEntryException(`Bad (uncompressed) XRef entry: ${ref}`);
-      }
-
-      if (this.encrypt && !suppressEncryption) {
-        xrefEntry = parser.getObj(this.encrypt.createCipherTransform(num, gen));
-      } else {
-        xrefEntry = parser.getObj();
-      }
-
-      if (!(0, _primitives.isStream)(xrefEntry)) {
-        this._cacheMap.set(num, xrefEntry);
-      }
-
-      return xrefEntry;
-    },
-
-    fetchCompressed(ref, xrefEntry, suppressEncryption = false) {
-      const tableOffset = xrefEntry.offset;
-      const stream = this.fetch(_primitives.Ref.get(tableOffset, 0));
-
-      if (!(0, _primitives.isStream)(stream)) {
-        throw new _util.FormatError("bad ObjStm stream");
-      }
-
-      const first = stream.dict.get("First");
-      const n = stream.dict.get("N");
-
-      if (!Number.isInteger(first) || !Number.isInteger(n)) {
-        throw new _util.FormatError("invalid first and n parameters for ObjStm stream");
-      }
-
-      const parser = new _parser.Parser({
-        lexer: new _parser.Lexer(stream),
-        xref: this,
-        allowStreams: true
-      });
-      const nums = new Array(n);
-
-      for (let i = 0; i < n; ++i) {
-        const num = parser.getObj();
-
-        if (!Number.isInteger(num)) {
-          throw new _util.FormatError(`invalid object number in the ObjStm stream: ${num}`);
-        }
-
-        const offset = parser.getObj();
-
-        if (!Number.isInteger(offset)) {
-          throw new _util.FormatError(`invalid object offset in the ObjStm stream: ${offset}`);
-        }
-
-        nums[i] = num;
-      }
-
-      const entries = new Array(n);
-
-      for (let i = 0; i < n; ++i) {
-        const obj = parser.getObj();
-        entries[i] = obj;
-
-        if (parser.buf1 instanceof _primitives.Cmd && parser.buf1.cmd === "endobj") {
-          parser.shift();
-        }
-
-        if ((0, _primitives.isStream)(obj)) {
-          continue;
-        }
-
-        const num = nums[i],
-              entry = this.entries[num];
-
-        if (entry && entry.offset === tableOffset && entry.gen === i) {
-          this._cacheMap.set(num, obj);
-        }
-      }
-
-      xrefEntry = entries[xrefEntry.gen];
-
-      if (xrefEntry === undefined) {
-        throw new _core_utils.XRefEntryException(`Bad (compressed) XRef entry: ${ref}`);
-      }
-
-      return xrefEntry;
-    },
-
-    async fetchIfRefAsync(obj, suppressEncryption) {
-      if (obj instanceof _primitives.Ref) {
-        return this.fetchAsync(obj, suppressEncryption);
-      }
-
-      return obj;
-    },
-
-    async fetchAsync(ref, suppressEncryption) {
-      try {
-        return this.fetch(ref, suppressEncryption);
-      } catch (ex) {
-        if (!(ex instanceof _core_utils.MissingDataException)) {
-          throw ex;
-        }
-
-        await this.pdfManager.requestRange(ex.begin, ex.end);
-        return this.fetchAsync(ref, suppressEncryption);
-      }
-    },
-
-    getCatalogObj: function XRef_getCatalogObj() {
-      return this.root;
-    }
-  };
-  return XRef;
-}();
-
-exports.XRef = XRef;
-
-class NameOrNumberTree {
-  constructor(root, xref, type) {
-    if (this.constructor === NameOrNumberTree) {
-      (0, _util.unreachable)("Cannot initialize NameOrNumberTree.");
-    }
-
-    this.root = root;
-    this.xref = xref;
-    this._type = type;
-  }
-
-  getAll() {
-    const dict = Object.create(null);
-
-    if (!this.root) {
-      return dict;
-    }
-
-    const xref = this.xref;
-    const processed = new _primitives.RefSet();
-    processed.put(this.root);
-    const queue = [this.root];
-
-    while (queue.length > 0) {
-      const obj = xref.fetchIfRef(queue.shift());
-
-      if (!(0, _primitives.isDict)(obj)) {
-        continue;
-      }
-
-      if (obj.has("Kids")) {
-        const kids = obj.get("Kids");
-
-        for (let i = 0, ii = kids.length; i < ii; i++) {
-          const kid = kids[i];
-
-          if (processed.has(kid)) {
-            throw new _util.FormatError(`Duplicate entry in "${this._type}" tree.`);
-          }
-
-          queue.push(kid);
-          processed.put(kid);
-        }
-
-        continue;
-      }
-
-      const entries = obj.get(this._type);
-
-      if (Array.isArray(entries)) {
-        for (let i = 0, ii = entries.length; i < ii; i += 2) {
-          dict[xref.fetchIfRef(entries[i])] = xref.fetchIfRef(entries[i + 1]);
-        }
-      }
-    }
-
-    return dict;
-  }
-
-  get(key) {
-    if (!this.root) {
-      return null;
-    }
-
-    const xref = this.xref;
-    let kidsOrEntries = xref.fetchIfRef(this.root);
-    let loopCount = 0;
-    const MAX_LEVELS = 10;
-
-    while (kidsOrEntries.has("Kids")) {
-      if (++loopCount > MAX_LEVELS) {
-        (0, _util.warn)(`Search depth limit reached for "${this._type}" tree.`);
-        return null;
-      }
-
-      const kids = kidsOrEntries.get("Kids");
-
-      if (!Array.isArray(kids)) {
-        return null;
-      }
-
-      let l = 0,
-          r = kids.length - 1;
-
-      while (l <= r) {
-        const m = l + r >> 1;
-        const kid = xref.fetchIfRef(kids[m]);
-        const limits = kid.get("Limits");
-
-        if (key < xref.fetchIfRef(limits[0])) {
-          r = m - 1;
-        } else if (key > xref.fetchIfRef(limits[1])) {
-          l = m + 1;
-        } else {
-          kidsOrEntries = xref.fetchIfRef(kids[m]);
-          break;
-        }
-      }
-
-      if (l > r) {
-        return null;
-      }
-    }
-
-    const entries = kidsOrEntries.get(this._type);
-
-    if (Array.isArray(entries)) {
-      let l = 0,
-          r = entries.length - 2;
-
-      while (l <= r) {
-        const tmp = l + r >> 1,
-              m = tmp + (tmp & 1);
-        const currentKey = xref.fetchIfRef(entries[m]);
-
-        if (key < currentKey) {
-          r = m - 2;
-        } else if (key > currentKey) {
-          l = m + 2;
-        } else {
-          return xref.fetchIfRef(entries[m + 1]);
-        }
-      }
-
-      (0, _util.info)(`Falling back to an exhaustive search, for key "${key}", ` + `in "${this._type}" tree.`);
-
-      for (let m = 0, mm = entries.length; m < mm; m += 2) {
-        const currentKey = xref.fetchIfRef(entries[m]);
-
-        if (currentKey === key) {
-          (0, _util.warn)(`The "${key}" key was found at an incorrect, ` + `i.e. out-of-order, position in "${this._type}" tree.`);
-          return xref.fetchIfRef(entries[m + 1]);
-        }
-      }
-    }
-
-    return null;
-  }
-
-}
-
-class NameTree extends NameOrNumberTree {
-  constructor(root, xref) {
-    super(root, xref, "Names");
-  }
-
-}
-
-class NumberTree extends NameOrNumberTree {
-  constructor(root, xref) {
-    super(root, xref, "Nums");
-  }
-
-}
-
-var FileSpec = function FileSpecClosure() {
-  function FileSpec(root, xref) {
-    if (!root || !(0, _primitives.isDict)(root)) {
-      return;
-    }
-
-    this.xref = xref;
-    this.root = root;
-
-    if (root.has("FS")) {
-      this.fs = root.get("FS");
-    }
-
-    this.description = root.has("Desc") ? (0, _util.stringToPDFString)(root.get("Desc")) : "";
-
-    if (root.has("RF")) {
-      (0, _util.warn)("Related file specifications are not supported");
-    }
-
-    this.contentAvailable = true;
-
-    if (!root.has("EF")) {
-      this.contentAvailable = false;
-      (0, _util.warn)("Non-embedded file specifications are not supported");
-    }
-  }
-
-  function pickPlatformItem(dict) {
-    if (dict.has("UF")) {
-      return dict.get("UF");
-    } else if (dict.has("F")) {
-      return dict.get("F");
-    } else if (dict.has("Unix")) {
-      return dict.get("Unix");
-    } else if (dict.has("Mac")) {
-      return dict.get("Mac");
-    } else if (dict.has("DOS")) {
-      return dict.get("DOS");
-    }
-
-    return null;
-  }
-
-  FileSpec.prototype = {
-    get filename() {
-      if (!this._filename && this.root) {
-        var filename = pickPlatformItem(this.root) || "unnamed";
-        this._filename = (0, _util.stringToPDFString)(filename).replace(/\\\\/g, "\\").replace(/\\\//g, "/").replace(/\\/g, "/");
-      }
-
-      return this._filename;
-    },
-
-    get content() {
-      if (!this.contentAvailable) {
-        return null;
-      }
-
-      if (!this.contentRef && this.root) {
-        this.contentRef = pickPlatformItem(this.root.get("EF"));
-      }
-
-      var content = null;
-
-      if (this.contentRef) {
-        var xref = this.xref;
-        var fileObj = xref.fetchIfRef(this.contentRef);
-
-        if (fileObj && (0, _primitives.isStream)(fileObj)) {
-          content = fileObj.getBytes();
-        } else {
-          (0, _util.warn)("Embedded file specification points to non-existing/invalid " + "content");
-        }
-      } else {
-        (0, _util.warn)("Embedded file specification does not have a content");
-      }
-
-      return content;
-    },
-
-    get serializable() {
-      return {
-        filename: this.filename,
-        content: this.content
-      };
-    }
-
-  };
-  return FileSpec;
-}();
-
-exports.FileSpec = FileSpec;
-
-const ObjectLoader = function () {
-  function mayHaveChildren(value) {
-    return value instanceof _primitives.Ref || value instanceof _primitives.Dict || Array.isArray(value) || (0, _primitives.isStream)(value);
-  }
-
-  function addChildren(node, nodesToVisit) {
-    if (node instanceof _primitives.Dict) {
-      node = node.getRawValues();
-    } else if ((0, _primitives.isStream)(node)) {
-      node = node.dict.getRawValues();
-    } else if (!Array.isArray(node)) {
-      return;
-    }
-
-    for (const rawValue of node) {
-      if (mayHaveChildren(rawValue)) {
-        nodesToVisit.push(rawValue);
-      }
-    }
-  }
-
-  function ObjectLoader(dict, keys, xref) {
-    this.dict = dict;
-    this.keys = keys;
-    this.xref = xref;
-    this.refSet = null;
-  }
-
-  ObjectLoader.prototype = {
-    async load() {
-      if (!this.xref.stream.allChunksLoaded || this.xref.stream.allChunksLoaded()) {
-        return undefined;
-      }
-
-      const {
-        keys,
-        dict
-      } = this;
-      this.refSet = new _primitives.RefSet();
-      const nodesToVisit = [];
-
-      for (let i = 0, ii = keys.length; i < ii; i++) {
-        const rawValue = dict.getRaw(keys[i]);
-
-        if (rawValue !== undefined) {
-          nodesToVisit.push(rawValue);
-        }
-      }
-
-      return this._walk(nodesToVisit);
-    },
-
-    async _walk(nodesToVisit) {
-      const nodesToRevisit = [];
-      const pendingRequests = [];
-
-      while (nodesToVisit.length) {
-        let currentNode = nodesToVisit.pop();
-
-        if (currentNode instanceof _primitives.Ref) {
-          if (this.refSet.has(currentNode)) {
-            continue;
-          }
-
-          try {
-            this.refSet.put(currentNode);
-            currentNode = this.xref.fetch(currentNode);
-          } catch (ex) {
-            if (!(ex instanceof _core_utils.MissingDataException)) {
-              throw ex;
-            }
-
-            nodesToRevisit.push(currentNode);
-            pendingRequests.push({
-              begin: ex.begin,
-              end: ex.end
-            });
-          }
-        }
-
-        if (currentNode && currentNode.getBaseStreams) {
-          const baseStreams = currentNode.getBaseStreams();
-          let foundMissingData = false;
-
-          for (let i = 0, ii = baseStreams.length; i < ii; i++) {
-            const stream = baseStreams[i];
-
-            if (stream.allChunksLoaded && !stream.allChunksLoaded()) {
-              foundMissingData = true;
-              pendingRequests.push({
-                begin: stream.start,
-                end: stream.end
-              });
-            }
-          }
-
-          if (foundMissingData) {
-            nodesToRevisit.push(currentNode);
-          }
-        }
-
-        addChildren(currentNode, nodesToVisit);
-      }
-
-      if (pendingRequests.length) {
-        await this.xref.stream.manager.requestRanges(pendingRequests);
-
-        for (let i = 0, ii = nodesToRevisit.length; i < ii; i++) {
-          const node = nodesToRevisit[i];
-
-          if (node instanceof _primitives.Ref) {
-            this.refSet.remove(node);
-          }
-        }
-
-        return this._walk(nodesToRevisit);
-      }
-
-      this.refSet = null;
+    if (!(dict instanceof _primitives.Dict)) {
       return undefined;
     }
 
-  };
-  return ObjectLoader;
-}();
+    const id = ref instanceof _primitives.Ref ? ref.toString() : `annot_${idFactory.createObjId()}`;
+    let subtype = dict.get("Subtype");
+    subtype = subtype instanceof _primitives.Name ? subtype.name : null;
+    const parameters = {
+      xref,
+      ref,
+      dict,
+      subtype,
+      id,
+      pdfManager,
+      acroForm: acroForm instanceof _primitives.Dict ? acroForm : _primitives.Dict.empty,
+      xfaDatasets,
+      collectFields,
+      pageIndex
+    };
 
-exports.ObjectLoader = ObjectLoader;
+    switch (subtype) {
+      case "Link":
+        return new LinkAnnotation(parameters);
 
-/***/ }),
-/* 11 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+      case "Text":
+        return new TextAnnotation(parameters);
 
-"use strict";
+      case "Widget":
+        let fieldType = (0, _core_utils.getInheritableProperty)({
+          dict,
+          key: "FT"
+        });
+        fieldType = fieldType instanceof _primitives.Name ? fieldType.name : null;
 
+        switch (fieldType) {
+          case "Tx":
+            return new TextWidgetAnnotation(parameters);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Parser = exports.Linearization = exports.Lexer = void 0;
+          case "Btn":
+            return new ButtonWidgetAnnotation(parameters);
 
-var _stream = __w_pdfjs_require__(12);
+          case "Ch":
+            return new ChoiceWidgetAnnotation(parameters);
 
-var _util = __w_pdfjs_require__(2);
+          case "Sig":
+            return new SignatureWidgetAnnotation(parameters);
+        }
 
-var _primitives = __w_pdfjs_require__(5);
+        (0, _util.warn)(`Unimplemented widget field type "${fieldType}", ` + "falling back to base field type.");
+        return new WidgetAnnotation(parameters);
 
-var _core_utils = __w_pdfjs_require__(8);
+      case "Popup":
+        return new PopupAnnotation(parameters);
 
-var _ccitt_stream = __w_pdfjs_require__(13);
+      case "FreeText":
+        return new FreeTextAnnotation(parameters);
 
-var _jbig2_stream = __w_pdfjs_require__(15);
+      case "Line":
+        return new LineAnnotation(parameters);
 
-var _jpeg_stream = __w_pdfjs_require__(18);
+      case "Square":
+        return new SquareAnnotation(parameters);
 
-var _jpx_stream = __w_pdfjs_require__(20);
+      case "Circle":
+        return new CircleAnnotation(parameters);
 
-const MAX_LENGTH_TO_CACHE = 1000;
-const MAX_ADLER32_LENGTH = 5552;
+      case "PolyLine":
+        return new PolylineAnnotation(parameters);
 
-function computeAdler32(bytes) {
-  const bytesLength = bytes.length;
-  let a = 1,
-      b = 0;
+      case "Polygon":
+        return new PolygonAnnotation(parameters);
 
-  for (let i = 0; i < bytesLength; ++i) {
-    a += bytes[i] & 0xff;
-    b += a;
-  }
+      case "Caret":
+        return new CaretAnnotation(parameters);
 
-  return b % 65521 << 16 | a % 65521;
-}
+      case "Ink":
+        return new InkAnnotation(parameters);
 
-class Parser {
-  constructor({
-    lexer,
-    xref,
-    allowStreams = false,
-    recoveryMode = false
-  }) {
-    this.lexer = lexer;
-    this.xref = xref;
-    this.allowStreams = allowStreams;
-    this.recoveryMode = recoveryMode;
-    this.imageCache = Object.create(null);
-    this.refill();
-  }
+      case "Highlight":
+        return new HighlightAnnotation(parameters);
 
-  refill() {
-    this.buf1 = this.lexer.getObj();
-    this.buf2 = this.lexer.getObj();
-  }
+      case "Underline":
+        return new UnderlineAnnotation(parameters);
 
-  shift() {
-    if (this.buf2 instanceof _primitives.Cmd && this.buf2.cmd === "ID") {
-      this.buf1 = this.buf2;
-      this.buf2 = null;
-    } else {
-      this.buf1 = this.buf2;
-      this.buf2 = this.lexer.getObj();
-    }
-  }
+      case "Squiggly":
+        return new SquigglyAnnotation(parameters);
 
-  tryShift() {
-    try {
-      this.shift();
-      return true;
-    } catch (e) {
-      if (e instanceof _core_utils.MissingDataException) {
-        throw e;
-      }
+      case "StrikeOut":
+        return new StrikeOutAnnotation(parameters);
 
-      return false;
-    }
-  }
+      case "Stamp":
+        return new StampAnnotation(parameters);
 
-  getObj(cipherTransform = null) {
-    const buf1 = this.buf1;
-    this.shift();
+      case "FileAttachment":
+        return new FileAttachmentAnnotation(parameters);
 
-    if (buf1 instanceof _primitives.Cmd) {
-      switch (buf1.cmd) {
-        case "BI":
-          return this.makeInlineImage(cipherTransform);
-
-        case "[":
-          const array = [];
-
-          while (!(0, _primitives.isCmd)(this.buf1, "]") && !(0, _primitives.isEOF)(this.buf1)) {
-            array.push(this.getObj(cipherTransform));
-          }
-
-          if ((0, _primitives.isEOF)(this.buf1)) {
-            if (!this.recoveryMode) {
-              throw new _util.FormatError("End of file inside array");
-            }
-
-            return array;
-          }
-
-          this.shift();
-          return array;
-
-        case "<<":
-          const dict = new _primitives.Dict(this.xref);
-
-          while (!(0, _primitives.isCmd)(this.buf1, ">>") && !(0, _primitives.isEOF)(this.buf1)) {
-            if (!(0, _primitives.isName)(this.buf1)) {
-              (0, _util.info)("Malformed dictionary: key must be a name object");
-              this.shift();
-              continue;
-            }
-
-            const key = this.buf1.name;
-            this.shift();
-
-            if ((0, _primitives.isEOF)(this.buf1)) {
-              break;
-            }
-
-            dict.set(key, this.getObj(cipherTransform));
-          }
-
-          if ((0, _primitives.isEOF)(this.buf1)) {
-            if (!this.recoveryMode) {
-              throw new _util.FormatError("End of file inside dictionary");
-            }
-
-            return dict;
-          }
-
-          if ((0, _primitives.isCmd)(this.buf2, "stream")) {
-            return this.allowStreams ? this.makeStream(dict, cipherTransform) : dict;
-          }
-
-          this.shift();
-          return dict;
-
-        default:
-          return buf1;
-      }
-    }
-
-    if (Number.isInteger(buf1)) {
-      if (Number.isInteger(this.buf1) && (0, _primitives.isCmd)(this.buf2, "R")) {
-        const ref = _primitives.Ref.get(buf1, this.buf1);
-
-        this.shift();
-        this.shift();
-        return ref;
-      }
-
-      return buf1;
-    }
-
-    if (typeof buf1 === "string") {
-      if (cipherTransform) {
-        return cipherTransform.decryptString(buf1);
-      }
-
-      return buf1;
-    }
-
-    return buf1;
-  }
-
-  findDefaultInlineStreamEnd(stream) {
-    const E = 0x45,
-          I = 0x49,
-          SPACE = 0x20,
-          LF = 0xa,
-          CR = 0xd,
-          NUL = 0x0;
-    const lexer = this.lexer,
-          startPos = stream.pos,
-          n = 10;
-    let state = 0,
-        ch,
-        maybeEIPos;
-
-    while ((ch = stream.getByte()) !== -1) {
-      if (state === 0) {
-        state = ch === E ? 1 : 0;
-      } else if (state === 1) {
-        state = ch === I ? 2 : 0;
-      } else {
-        (0, _util.assert)(state === 2, "findDefaultInlineStreamEnd - invalid state.");
-
-        if (ch === SPACE || ch === LF || ch === CR) {
-          maybeEIPos = stream.pos;
-          const followingBytes = stream.peekBytes(n);
-
-          for (let i = 0, ii = followingBytes.length; i < ii; i++) {
-            ch = followingBytes[i];
-
-            if (ch === NUL && followingBytes[i + 1] !== NUL) {
-              continue;
-            }
-
-            if (ch !== LF && ch !== CR && (ch < SPACE || ch > 0x7f)) {
-              state = 0;
-              break;
-            }
-          }
-
-          if (state !== 2) {
-            continue;
-          }
-
-          if (lexer.knownCommands) {
-            const nextObj = lexer.peekObj();
-
-            if (nextObj instanceof _primitives.Cmd && !lexer.knownCommands[nextObj.cmd]) {
-              state = 0;
-            }
+      default:
+        if (!collectFields) {
+          if (!subtype) {
+            (0, _util.warn)("Annotation is missing the required /Subtype.");
           } else {
-            (0, _util.warn)("findDefaultInlineStreamEnd - `lexer.knownCommands` is undefined.");
-          }
-
-          if (state === 2) {
-            break;
-          }
-        } else {
-          state = 0;
-        }
-      }
-    }
-
-    if (ch === -1) {
-      (0, _util.warn)("findDefaultInlineStreamEnd: " + "Reached the end of the stream without finding a valid EI marker");
-
-      if (maybeEIPos) {
-        (0, _util.warn)('... trying to recover by using the last "EI" occurrence.');
-        stream.skip(-(stream.pos - maybeEIPos));
-      }
-    }
-
-    let endOffset = 4;
-    stream.skip(-endOffset);
-    ch = stream.peekByte();
-    stream.skip(endOffset);
-
-    if (!(0, _core_utils.isWhiteSpace)(ch)) {
-      endOffset--;
-    }
-
-    return stream.pos - endOffset - startPos;
-  }
-
-  findDCTDecodeInlineStreamEnd(stream) {
-    const startPos = stream.pos;
-    let foundEOI = false,
-        b,
-        markerLength;
-
-    while ((b = stream.getByte()) !== -1) {
-      if (b !== 0xff) {
-        continue;
-      }
-
-      switch (stream.getByte()) {
-        case 0x00:
-          break;
-
-        case 0xff:
-          stream.skip(-1);
-          break;
-
-        case 0xd9:
-          foundEOI = true;
-          break;
-
-        case 0xc0:
-        case 0xc1:
-        case 0xc2:
-        case 0xc3:
-        case 0xc5:
-        case 0xc6:
-        case 0xc7:
-        case 0xc9:
-        case 0xca:
-        case 0xcb:
-        case 0xcd:
-        case 0xce:
-        case 0xcf:
-        case 0xc4:
-        case 0xcc:
-        case 0xda:
-        case 0xdb:
-        case 0xdc:
-        case 0xdd:
-        case 0xde:
-        case 0xdf:
-        case 0xe0:
-        case 0xe1:
-        case 0xe2:
-        case 0xe3:
-        case 0xe4:
-        case 0xe5:
-        case 0xe6:
-        case 0xe7:
-        case 0xe8:
-        case 0xe9:
-        case 0xea:
-        case 0xeb:
-        case 0xec:
-        case 0xed:
-        case 0xee:
-        case 0xef:
-        case 0xfe:
-          markerLength = stream.getUint16();
-
-          if (markerLength > 2) {
-            stream.skip(markerLength - 2);
-          } else {
-            stream.skip(-2);
-          }
-
-          break;
-      }
-
-      if (foundEOI) {
-        break;
-      }
-    }
-
-    const length = stream.pos - startPos;
-
-    if (b === -1) {
-      (0, _util.warn)("Inline DCTDecode image stream: " + "EOI marker not found, searching for /EI/ instead.");
-      stream.skip(-length);
-      return this.findDefaultInlineStreamEnd(stream);
-    }
-
-    this.inlineStreamSkipEI(stream);
-    return length;
-  }
-
-  findASCII85DecodeInlineStreamEnd(stream) {
-    const TILDE = 0x7e,
-          GT = 0x3e;
-    const startPos = stream.pos;
-    let ch;
-
-    while ((ch = stream.getByte()) !== -1) {
-      if (ch === TILDE) {
-        const tildePos = stream.pos;
-        ch = stream.peekByte();
-
-        while ((0, _core_utils.isWhiteSpace)(ch)) {
-          stream.skip();
-          ch = stream.peekByte();
-        }
-
-        if (ch === GT) {
-          stream.skip();
-          break;
-        }
-
-        if (stream.pos > tildePos) {
-          const maybeEI = stream.peekBytes(2);
-
-          if (maybeEI[0] === 0x45 && maybeEI[1] === 0x49) {
-            break;
-          }
-        }
-      }
-    }
-
-    const length = stream.pos - startPos;
-
-    if (ch === -1) {
-      (0, _util.warn)("Inline ASCII85Decode image stream: " + "EOD marker not found, searching for /EI/ instead.");
-      stream.skip(-length);
-      return this.findDefaultInlineStreamEnd(stream);
-    }
-
-    this.inlineStreamSkipEI(stream);
-    return length;
-  }
-
-  findASCIIHexDecodeInlineStreamEnd(stream) {
-    const GT = 0x3e;
-    const startPos = stream.pos;
-    let ch;
-
-    while ((ch = stream.getByte()) !== -1) {
-      if (ch === GT) {
-        break;
-      }
-    }
-
-    const length = stream.pos - startPos;
-
-    if (ch === -1) {
-      (0, _util.warn)("Inline ASCIIHexDecode image stream: " + "EOD marker not found, searching for /EI/ instead.");
-      stream.skip(-length);
-      return this.findDefaultInlineStreamEnd(stream);
-    }
-
-    this.inlineStreamSkipEI(stream);
-    return length;
-  }
-
-  inlineStreamSkipEI(stream) {
-    const E = 0x45,
-          I = 0x49;
-    let state = 0,
-        ch;
-
-    while ((ch = stream.getByte()) !== -1) {
-      if (state === 0) {
-        state = ch === E ? 1 : 0;
-      } else if (state === 1) {
-        state = ch === I ? 2 : 0;
-      } else if (state === 2) {
-        break;
-      }
-    }
-  }
-
-  makeInlineImage(cipherTransform) {
-    const lexer = this.lexer;
-    const stream = lexer.stream;
-    const dict = new _primitives.Dict(this.xref);
-    let dictLength;
-
-    while (!(0, _primitives.isCmd)(this.buf1, "ID") && !(0, _primitives.isEOF)(this.buf1)) {
-      if (!(0, _primitives.isName)(this.buf1)) {
-        throw new _util.FormatError("Dictionary key must be a name object");
-      }
-
-      const key = this.buf1.name;
-      this.shift();
-
-      if ((0, _primitives.isEOF)(this.buf1)) {
-        break;
-      }
-
-      dict.set(key, this.getObj(cipherTransform));
-    }
-
-    if (lexer.beginInlineImagePos !== -1) {
-      dictLength = stream.pos - lexer.beginInlineImagePos;
-    }
-
-    const filter = dict.get("Filter", "F");
-    let filterName;
-
-    if ((0, _primitives.isName)(filter)) {
-      filterName = filter.name;
-    } else if (Array.isArray(filter)) {
-      const filterZero = this.xref.fetchIfRef(filter[0]);
-
-      if ((0, _primitives.isName)(filterZero)) {
-        filterName = filterZero.name;
-      }
-    }
-
-    const startPos = stream.pos;
-    let length;
-
-    if (filterName === "DCTDecode" || filterName === "DCT") {
-      length = this.findDCTDecodeInlineStreamEnd(stream);
-    } else if (filterName === "ASCII85Decode" || filterName === "A85") {
-      length = this.findASCII85DecodeInlineStreamEnd(stream);
-    } else if (filterName === "ASCIIHexDecode" || filterName === "AHx") {
-      length = this.findASCIIHexDecodeInlineStreamEnd(stream);
-    } else {
-      length = this.findDefaultInlineStreamEnd(stream);
-    }
-
-    let imageStream = stream.makeSubStream(startPos, length, dict);
-    let cacheKey;
-
-    if (length < MAX_LENGTH_TO_CACHE && dictLength < MAX_ADLER32_LENGTH) {
-      const imageBytes = imageStream.getBytes();
-      imageStream.reset();
-      const initialStreamPos = stream.pos;
-      stream.pos = lexer.beginInlineImagePos;
-      const dictBytes = stream.getBytes(dictLength);
-      stream.pos = initialStreamPos;
-      cacheKey = computeAdler32(imageBytes) + "_" + computeAdler32(dictBytes);
-      const cacheEntry = this.imageCache[cacheKey];
-
-      if (cacheEntry !== undefined) {
-        this.buf2 = _primitives.Cmd.get("EI");
-        this.shift();
-        cacheEntry.reset();
-        return cacheEntry;
-      }
-    }
-
-    if (cipherTransform) {
-      imageStream = cipherTransform.createStream(imageStream, length);
-    }
-
-    imageStream = this.filter(imageStream, dict, length);
-    imageStream.dict = dict;
-
-    if (cacheKey !== undefined) {
-      imageStream.cacheKey = `inline_${length}_${cacheKey}`;
-      this.imageCache[cacheKey] = imageStream;
-    }
-
-    this.buf2 = _primitives.Cmd.get("EI");
-    this.shift();
-    return imageStream;
-  }
-
-  _findStreamLength(startPos, signature) {
-    const {
-      stream
-    } = this.lexer;
-    stream.pos = startPos;
-    const SCAN_BLOCK_LENGTH = 2048;
-    const signatureLength = signature.length;
-
-    while (stream.pos < stream.end) {
-      const scanBytes = stream.peekBytes(SCAN_BLOCK_LENGTH);
-      const scanLength = scanBytes.length - signatureLength;
-
-      if (scanLength <= 0) {
-        break;
-      }
-
-      let pos = 0;
-
-      while (pos < scanLength) {
-        let j = 0;
-
-        while (j < signatureLength && scanBytes[pos + j] === signature[j]) {
-          j++;
-        }
-
-        if (j >= signatureLength) {
-          stream.pos += pos;
-          return stream.pos - startPos;
-        }
-
-        pos++;
-      }
-
-      stream.pos += scanLength;
-    }
-
-    return -1;
-  }
-
-  makeStream(dict, cipherTransform) {
-    const lexer = this.lexer;
-    let stream = lexer.stream;
-    lexer.skipToNextLine();
-    const startPos = stream.pos - 1;
-    let length = dict.get("Length");
-
-    if (!Number.isInteger(length)) {
-      (0, _util.info)(`Bad length "${length}" in stream`);
-      length = 0;
-    }
-
-    stream.pos = startPos + length;
-    lexer.nextChar();
-
-    if (this.tryShift() && (0, _primitives.isCmd)(this.buf2, "endstream")) {
-      this.shift();
-    } else {
-      const ENDSTREAM_SIGNATURE = new Uint8Array([0x65, 0x6E, 0x64, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6D]);
-
-      let actualLength = this._findStreamLength(startPos, ENDSTREAM_SIGNATURE);
-
-      if (actualLength < 0) {
-        const MAX_TRUNCATION = 1;
-
-        for (let i = 1; i <= MAX_TRUNCATION; i++) {
-          const end = ENDSTREAM_SIGNATURE.length - i;
-          const TRUNCATED_SIGNATURE = ENDSTREAM_SIGNATURE.slice(0, end);
-
-          const maybeLength = this._findStreamLength(startPos, TRUNCATED_SIGNATURE);
-
-          if (maybeLength >= 0) {
-            const lastByte = stream.peekBytes(end + 1)[end];
-
-            if (!(0, _core_utils.isWhiteSpace)(lastByte)) {
-              break;
-            }
-
-            (0, _util.info)(`Found "${(0, _util.bytesToString)(TRUNCATED_SIGNATURE)}" when ` + "searching for endstream command.");
-            actualLength = maybeLength;
-            break;
+            (0, _util.warn)(`Unimplemented annotation type "${subtype}", ` + "falling back to base annotation.");
           }
         }
 
-        if (actualLength < 0) {
-          throw new _util.FormatError("Missing endstream command.");
-        }
-      }
-
-      length = actualLength;
-      lexer.nextChar();
-      this.shift();
-      this.shift();
+        return new Annotation(parameters);
     }
-
-    this.shift();
-    stream = stream.makeSubStream(startPos, length, dict);
-
-    if (cipherTransform) {
-      stream = cipherTransform.createStream(stream, length);
-    }
-
-    stream = this.filter(stream, dict, length);
-    stream.dict = dict;
-    return stream;
   }
 
-  filter(stream, dict, length) {
-    let filter = dict.get("Filter", "F");
-    let params = dict.get("DecodeParms", "DP");
-
-    if ((0, _primitives.isName)(filter)) {
-      if (Array.isArray(params)) {
-        (0, _util.warn)("/DecodeParms should not contain an Array, " + "when /Filter contains a Name.");
-      }
-
-      return this.makeFilter(stream, filter.name, length, params);
-    }
-
-    let maybeLength = length;
-
-    if (Array.isArray(filter)) {
-      const filterArray = filter;
-      const paramsArray = params;
-
-      for (let i = 0, ii = filterArray.length; i < ii; ++i) {
-        filter = this.xref.fetchIfRef(filterArray[i]);
-
-        if (!(0, _primitives.isName)(filter)) {
-          throw new _util.FormatError(`Bad filter name "${filter}"`);
-        }
-
-        params = null;
-
-        if (Array.isArray(paramsArray) && i in paramsArray) {
-          params = this.xref.fetchIfRef(paramsArray[i]);
-        }
-
-        stream = this.makeFilter(stream, filter.name, maybeLength, params);
-        maybeLength = null;
-      }
-    }
-
-    return stream;
-  }
-
-  makeFilter(stream, name, maybeLength, params) {
-    if (maybeLength === 0) {
-      (0, _util.warn)(`Empty "${name}" stream.`);
-      return new _stream.NullStream();
-    }
-
+  static async _getPageIndex(xref, ref, pdfManager) {
     try {
-      const xrefStreamStats = this.xref.stats.streamTypes;
+      const annotDict = await xref.fetchIfRefAsync(ref);
 
-      if (name === "FlateDecode" || name === "Fl") {
-        xrefStreamStats[_util.StreamType.FLATE] = true;
-
-        if (params) {
-          return new _stream.PredictorStream(new _stream.FlateStream(stream, maybeLength), maybeLength, params);
-        }
-
-        return new _stream.FlateStream(stream, maybeLength);
+      if (!(annotDict instanceof _primitives.Dict)) {
+        return -1;
       }
 
-      if (name === "LZWDecode" || name === "LZW") {
-        xrefStreamStats[_util.StreamType.LZW] = true;
-        let earlyChange = 1;
+      const pageRef = annotDict.getRaw("P");
 
-        if (params) {
-          if (params.has("EarlyChange")) {
-            earlyChange = params.get("EarlyChange");
-          }
-
-          return new _stream.PredictorStream(new _stream.LZWStream(stream, maybeLength, earlyChange), maybeLength, params);
-        }
-
-        return new _stream.LZWStream(stream, maybeLength, earlyChange);
+      if (!(pageRef instanceof _primitives.Ref)) {
+        return -1;
       }
 
-      if (name === "DCTDecode" || name === "DCT") {
-        xrefStreamStats[_util.StreamType.DCT] = true;
-        return new _jpeg_stream.JpegStream(stream, maybeLength, stream.dict, params);
-      }
-
-      if (name === "JPXDecode" || name === "JPX") {
-        xrefStreamStats[_util.StreamType.JPX] = true;
-        return new _jpx_stream.JpxStream(stream, maybeLength, stream.dict, params);
-      }
-
-      if (name === "ASCII85Decode" || name === "A85") {
-        xrefStreamStats[_util.StreamType.A85] = true;
-        return new _stream.Ascii85Stream(stream, maybeLength);
-      }
-
-      if (name === "ASCIIHexDecode" || name === "AHx") {
-        xrefStreamStats[_util.StreamType.AHX] = true;
-        return new _stream.AsciiHexStream(stream, maybeLength);
-      }
-
-      if (name === "CCITTFaxDecode" || name === "CCF") {
-        xrefStreamStats[_util.StreamType.CCF] = true;
-        return new _ccitt_stream.CCITTFaxStream(stream, maybeLength, params);
-      }
-
-      if (name === "RunLengthDecode" || name === "RL") {
-        xrefStreamStats[_util.StreamType.RLX] = true;
-        return new _stream.RunLengthStream(stream, maybeLength);
-      }
-
-      if (name === "JBIG2Decode") {
-        xrefStreamStats[_util.StreamType.JBIG] = true;
-        return new _jbig2_stream.Jbig2Stream(stream, maybeLength, stream.dict, params);
-      }
-
-      (0, _util.warn)(`Filter "${name}" is not supported.`);
-      return stream;
+      const pageIndex = await pdfManager.ensureCatalog("getPageIndex", [pageRef]);
+      return pageIndex;
     } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-
-      (0, _util.warn)(`Invalid stream: "${ex}"`);
-      return new _stream.NullStream();
+      (0, _util.warn)(`_getPageIndex: "${ex}".`);
+      return -1;
     }
   }
 
-}
+  static async saveNewAnnotations(evaluator, task, annotations) {
+    const xref = evaluator.xref;
+    let baseFontRef;
+    const dependencies = [];
+    const promises = [];
 
-exports.Parser = Parser;
-const specialChars = [1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-function toHexDigit(ch) {
-  if (ch >= 0x30 && ch <= 0x39) {
-    return ch & 0x0f;
-  }
-
-  if (ch >= 0x41 && ch <= 0x46 || ch >= 0x61 && ch <= 0x66) {
-    return (ch & 0x0f) + 9;
-  }
-
-  return -1;
-}
-
-class Lexer {
-  constructor(stream, knownCommands = null) {
-    this.stream = stream;
-    this.nextChar();
-    this.strBuf = [];
-    this.knownCommands = knownCommands;
-    this._hexStringNumWarn = 0;
-    this.beginInlineImagePos = -1;
-  }
-
-  nextChar() {
-    return this.currentChar = this.stream.getByte();
-  }
-
-  peekChar() {
-    return this.stream.peekByte();
-  }
-
-  getNumber() {
-    let ch = this.currentChar;
-    let eNotation = false;
-    let divideBy = 0;
-    let sign = 0;
-
-    if (ch === 0x2d) {
-      sign = -1;
-      ch = this.nextChar();
-
-      if (ch === 0x2d) {
-        ch = this.nextChar();
-      }
-    } else if (ch === 0x2b) {
-      sign = 1;
-      ch = this.nextChar();
-    }
-
-    if (ch === 0x0a || ch === 0x0d) {
-      do {
-        ch = this.nextChar();
-      } while (ch === 0x0a || ch === 0x0d);
-    }
-
-    if (ch === 0x2e) {
-      divideBy = 10;
-      ch = this.nextChar();
-    }
-
-    if (ch < 0x30 || ch > 0x39) {
-      if (divideBy === 10 && sign === 0 && ((0, _core_utils.isWhiteSpace)(ch) || ch === -1)) {
-        (0, _util.warn)("Lexer.getNumber - treating a single decimal point as zero.");
-        return 0;
-      }
-
-      throw new _util.FormatError(`Invalid number: ${String.fromCharCode(ch)} (charCode ${ch})`);
-    }
-
-    sign = sign || 1;
-    let baseValue = ch - 0x30;
-    let powerValue = 0;
-    let powerValueSign = 1;
-
-    while ((ch = this.nextChar()) >= 0) {
-      if (ch >= 0x30 && ch <= 0x39) {
-        const currentDigit = ch - 0x30;
-
-        if (eNotation) {
-          powerValue = powerValue * 10 + currentDigit;
-        } else {
-          if (divideBy !== 0) {
-            divideBy *= 10;
+    for (const annotation of annotations) {
+      switch (annotation.annotationType) {
+        case _util.AnnotationEditorType.FREETEXT:
+          if (!baseFontRef) {
+            const baseFont = new _primitives.Dict(xref);
+            baseFont.set("BaseFont", _primitives.Name.get("Helvetica"));
+            baseFont.set("Type", _primitives.Name.get("Font"));
+            baseFont.set("Subtype", _primitives.Name.get("Type1"));
+            baseFont.set("Encoding", _primitives.Name.get("WinAnsiEncoding"));
+            const buffer = [];
+            baseFontRef = xref.getNewRef();
+            (0, _writer.writeObject)(baseFontRef, baseFont, buffer, null);
+            dependencies.push({
+              ref: baseFontRef,
+              data: buffer.join("")
+            });
           }
 
-          baseValue = baseValue * 10 + currentDigit;
-        }
-      } else if (ch === 0x2e) {
-        if (divideBy === 0) {
-          divideBy = 1;
-        } else {
-          break;
-        }
-      } else if (ch === 0x2d) {
-        (0, _util.warn)("Badly formatted number: minus sign in the middle");
-      } else if (ch === 0x45 || ch === 0x65) {
-        ch = this.peekChar();
-
-        if (ch === 0x2b || ch === 0x2d) {
-          powerValueSign = ch === 0x2d ? -1 : 1;
-          this.nextChar();
-        } else if (ch < 0x30 || ch > 0x39) {
-          break;
-        }
-
-        eNotation = true;
-      } else {
-        break;
-      }
-    }
-
-    if (divideBy !== 0) {
-      baseValue /= divideBy;
-    }
-
-    if (eNotation) {
-      baseValue *= 10 ** (powerValueSign * powerValue);
-    }
-
-    return sign * baseValue;
-  }
-
-  getString() {
-    let numParen = 1;
-    let done = false;
-    const strBuf = this.strBuf;
-    strBuf.length = 0;
-    let ch = this.nextChar();
-
-    while (true) {
-      let charBuffered = false;
-
-      switch (ch | 0) {
-        case -1:
-          (0, _util.warn)("Unterminated string");
-          done = true;
+          promises.push(FreeTextAnnotation.createNewAnnotation(xref, annotation, dependencies, {
+            evaluator,
+            task,
+            baseFontRef
+          }));
           break;
 
-        case 0x28:
-          ++numParen;
-          strBuf.push("(");
-          break;
-
-        case 0x29:
-          if (--numParen === 0) {
-            this.nextChar();
-            done = true;
-          } else {
-            strBuf.push(")");
-          }
-
-          break;
-
-        case 0x5c:
-          ch = this.nextChar();
-
-          switch (ch) {
-            case -1:
-              (0, _util.warn)("Unterminated string");
-              done = true;
-              break;
-
-            case 0x6e:
-              strBuf.push("\n");
-              break;
-
-            case 0x72:
-              strBuf.push("\r");
-              break;
-
-            case 0x74:
-              strBuf.push("\t");
-              break;
-
-            case 0x62:
-              strBuf.push("\b");
-              break;
-
-            case 0x66:
-              strBuf.push("\f");
-              break;
-
-            case 0x5c:
-            case 0x28:
-            case 0x29:
-              strBuf.push(String.fromCharCode(ch));
-              break;
-
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-              let x = ch & 0x0f;
-              ch = this.nextChar();
-              charBuffered = true;
-
-              if (ch >= 0x30 && ch <= 0x37) {
-                x = (x << 3) + (ch & 0x0f);
-                ch = this.nextChar();
-
-                if (ch >= 0x30 && ch <= 0x37) {
-                  charBuffered = false;
-                  x = (x << 3) + (ch & 0x0f);
-                }
-              }
-
-              strBuf.push(String.fromCharCode(x));
-              break;
-
-            case 0x0d:
-              if (this.peekChar() === 0x0a) {
-                this.nextChar();
-              }
-
-              break;
-
-            case 0x0a:
-              break;
-
-            default:
-              strBuf.push(String.fromCharCode(ch));
-              break;
-          }
-
-          break;
-
-        default:
-          strBuf.push(String.fromCharCode(ch));
-          break;
+        case _util.AnnotationEditorType.INK:
+          promises.push(InkAnnotation.createNewAnnotation(xref, annotation, dependencies));
       }
-
-      if (done) {
-        break;
-      }
-
-      if (!charBuffered) {
-        ch = this.nextChar();
-      }
-    }
-
-    return strBuf.join("");
-  }
-
-  getName() {
-    let ch, previousCh;
-    const strBuf = this.strBuf;
-    strBuf.length = 0;
-
-    while ((ch = this.nextChar()) >= 0 && !specialChars[ch]) {
-      if (ch === 0x23) {
-        ch = this.nextChar();
-
-        if (specialChars[ch]) {
-          (0, _util.warn)("Lexer_getName: " + "NUMBER SIGN (#) should be followed by a hexadecimal number.");
-          strBuf.push("#");
-          break;
-        }
-
-        const x = toHexDigit(ch);
-
-        if (x !== -1) {
-          previousCh = ch;
-          ch = this.nextChar();
-          const x2 = toHexDigit(ch);
-
-          if (x2 === -1) {
-            (0, _util.warn)(`Lexer_getName: Illegal digit (${String.fromCharCode(ch)}) ` + "in hexadecimal number.");
-            strBuf.push("#", String.fromCharCode(previousCh));
-
-            if (specialChars[ch]) {
-              break;
-            }
-
-            strBuf.push(String.fromCharCode(ch));
-            continue;
-          }
-
-          strBuf.push(String.fromCharCode(x << 4 | x2));
-        } else {
-          strBuf.push("#", String.fromCharCode(ch));
-        }
-      } else {
-        strBuf.push(String.fromCharCode(ch));
-      }
-    }
-
-    if (strBuf.length > 127) {
-      (0, _util.warn)(`Name token is longer than allowed by the spec: ${strBuf.length}`);
-    }
-
-    return _primitives.Name.get(strBuf.join(""));
-  }
-
-  _hexStringWarn(ch) {
-    const MAX_HEX_STRING_NUM_WARN = 5;
-
-    if (this._hexStringNumWarn++ === MAX_HEX_STRING_NUM_WARN) {
-      (0, _util.warn)("getHexString - ignoring additional invalid characters.");
-      return;
-    }
-
-    if (this._hexStringNumWarn > MAX_HEX_STRING_NUM_WARN) {
-      return;
-    }
-
-    (0, _util.warn)(`getHexString - ignoring invalid character: ${ch}`);
-  }
-
-  getHexString() {
-    const strBuf = this.strBuf;
-    strBuf.length = 0;
-    let ch = this.currentChar;
-    let isFirstHex = true;
-    let firstDigit, secondDigit;
-    this._hexStringNumWarn = 0;
-
-    while (true) {
-      if (ch < 0) {
-        (0, _util.warn)("Unterminated hex string");
-        break;
-      } else if (ch === 0x3e) {
-        this.nextChar();
-        break;
-      } else if (specialChars[ch] === 1) {
-        ch = this.nextChar();
-        continue;
-      } else {
-        if (isFirstHex) {
-          firstDigit = toHexDigit(ch);
-
-          if (firstDigit === -1) {
-            this._hexStringWarn(ch);
-
-            ch = this.nextChar();
-            continue;
-          }
-        } else {
-          secondDigit = toHexDigit(ch);
-
-          if (secondDigit === -1) {
-            this._hexStringWarn(ch);
-
-            ch = this.nextChar();
-            continue;
-          }
-
-          strBuf.push(String.fromCharCode(firstDigit << 4 | secondDigit));
-        }
-
-        isFirstHex = !isFirstHex;
-        ch = this.nextChar();
-      }
-    }
-
-    return strBuf.join("");
-  }
-
-  getObj() {
-    let comment = false;
-    let ch = this.currentChar;
-
-    while (true) {
-      if (ch < 0) {
-        return _primitives.EOF;
-      }
-
-      if (comment) {
-        if (ch === 0x0a || ch === 0x0d) {
-          comment = false;
-        }
-      } else if (ch === 0x25) {
-        comment = true;
-      } else if (specialChars[ch] !== 1) {
-        break;
-      }
-
-      ch = this.nextChar();
-    }
-
-    switch (ch | 0) {
-      case 0x30:
-      case 0x31:
-      case 0x32:
-      case 0x33:
-      case 0x34:
-      case 0x35:
-      case 0x36:
-      case 0x37:
-      case 0x38:
-      case 0x39:
-      case 0x2b:
-      case 0x2d:
-      case 0x2e:
-        return this.getNumber();
-
-      case 0x28:
-        return this.getString();
-
-      case 0x2f:
-        return this.getName();
-
-      case 0x5b:
-        this.nextChar();
-        return _primitives.Cmd.get("[");
-
-      case 0x5d:
-        this.nextChar();
-        return _primitives.Cmd.get("]");
-
-      case 0x3c:
-        ch = this.nextChar();
-
-        if (ch === 0x3c) {
-          this.nextChar();
-          return _primitives.Cmd.get("<<");
-        }
-
-        return this.getHexString();
-
-      case 0x3e:
-        ch = this.nextChar();
-
-        if (ch === 0x3e) {
-          this.nextChar();
-          return _primitives.Cmd.get(">>");
-        }
-
-        return _primitives.Cmd.get(">");
-
-      case 0x7b:
-        this.nextChar();
-        return _primitives.Cmd.get("{");
-
-      case 0x7d:
-        this.nextChar();
-        return _primitives.Cmd.get("}");
-
-      case 0x29:
-        this.nextChar();
-        throw new _util.FormatError(`Illegal character: ${ch}`);
-    }
-
-    let str = String.fromCharCode(ch);
-    const knownCommands = this.knownCommands;
-    let knownCommandFound = knownCommands && knownCommands[str] !== undefined;
-
-    while ((ch = this.nextChar()) >= 0 && !specialChars[ch]) {
-      const possibleCommand = str + String.fromCharCode(ch);
-
-      if (knownCommandFound && knownCommands[possibleCommand] === undefined) {
-        break;
-      }
-
-      if (str.length === 128) {
-        throw new _util.FormatError(`Command token too long: ${str.length}`);
-      }
-
-      str = possibleCommand;
-      knownCommandFound = knownCommands && knownCommands[str] !== undefined;
-    }
-
-    if (str === "true") {
-      return true;
-    }
-
-    if (str === "false") {
-      return false;
-    }
-
-    if (str === "null") {
-      return null;
-    }
-
-    if (str === "BI") {
-      this.beginInlineImagePos = this.stream.pos;
-    }
-
-    return _primitives.Cmd.get(str);
-  }
-
-  peekObj() {
-    const streamPos = this.stream.pos,
-          currentChar = this.currentChar,
-          beginInlineImagePos = this.beginInlineImagePos;
-    let nextObj;
-
-    try {
-      nextObj = this.getObj();
-    } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-
-      (0, _util.warn)(`peekObj: ${ex}`);
-    }
-
-    this.stream.pos = streamPos;
-    this.currentChar = currentChar;
-    this.beginInlineImagePos = beginInlineImagePos;
-    return nextObj;
-  }
-
-  skipToNextLine() {
-    let ch = this.currentChar;
-
-    while (ch >= 0) {
-      if (ch === 0x0d) {
-        ch = this.nextChar();
-
-        if (ch === 0x0a) {
-          this.nextChar();
-        }
-
-        break;
-      } else if (ch === 0x0a) {
-        this.nextChar();
-        break;
-      }
-
-      ch = this.nextChar();
-    }
-  }
-
-}
-
-exports.Lexer = Lexer;
-
-class Linearization {
-  static create(stream) {
-    function getInt(linDict, name, allowZeroValue = false) {
-      const obj = linDict.get(name);
-
-      if (Number.isInteger(obj) && (allowZeroValue ? obj >= 0 : obj > 0)) {
-        return obj;
-      }
-
-      throw new Error(`The "${name}" parameter in the linearization ` + "dictionary is invalid.");
-    }
-
-    function getHints(linDict) {
-      const hints = linDict.get("H");
-      let hintsLength;
-
-      if (Array.isArray(hints) && ((hintsLength = hints.length) === 2 || hintsLength === 4)) {
-        for (let index = 0; index < hintsLength; index++) {
-          const hint = hints[index];
-
-          if (!(Number.isInteger(hint) && hint > 0)) {
-            throw new Error(`Hint (${index}) in the linearization dictionary is invalid.`);
-          }
-        }
-
-        return hints;
-      }
-
-      throw new Error("Hint array in the linearization dictionary is invalid.");
-    }
-
-    const parser = new Parser({
-      lexer: new Lexer(stream),
-      xref: null
-    });
-    const obj1 = parser.getObj();
-    const obj2 = parser.getObj();
-    const obj3 = parser.getObj();
-    const linDict = parser.getObj();
-    let obj, length;
-
-    if (!(Number.isInteger(obj1) && Number.isInteger(obj2) && (0, _primitives.isCmd)(obj3, "obj") && (0, _primitives.isDict)(linDict) && (0, _util.isNum)(obj = linDict.get("Linearized")) && obj > 0)) {
-      return null;
-    } else if ((length = getInt(linDict, "L")) !== stream.length) {
-      throw new Error('The "L" parameter in the linearization dictionary ' + "does not equal the stream length.");
     }
 
     return {
-      length,
-      hints: getHints(linDict),
-      objectNumberFirst: getInt(linDict, "O"),
-      endFirst: getInt(linDict, "E"),
-      numPages: getInt(linDict, "N"),
-      mainXRefEntriesOffset: getInt(linDict, "T"),
-      pageFirst: linDict.has("P") ? getInt(linDict, "P", true) : 0
+      annotations: await Promise.all(promises),
+      dependencies
+    };
+  }
+
+  static async printNewAnnotations(evaluator, task, annotations) {
+    if (!annotations) {
+      return null;
+    }
+
+    const xref = evaluator.xref;
+    const promises = [];
+
+    for (const annotation of annotations) {
+      switch (annotation.annotationType) {
+        case _util.AnnotationEditorType.FREETEXT:
+          promises.push(FreeTextAnnotation.createNewPrintAnnotation(xref, annotation, {
+            evaluator,
+            task
+          }));
+          break;
+
+        case _util.AnnotationEditorType.INK:
+          promises.push(InkAnnotation.createNewPrintAnnotation(xref, annotation));
+          break;
+      }
+    }
+
+    return Promise.all(promises);
+  }
+
+}
+
+exports.AnnotationFactory = AnnotationFactory;
+
+function getRgbColor(color, defaultColor = new Uint8ClampedArray(3)) {
+  if (!Array.isArray(color)) {
+    return defaultColor;
+  }
+
+  const rgbColor = defaultColor || new Uint8ClampedArray(3);
+
+  switch (color.length) {
+    case 0:
+      return null;
+
+    case 1:
+      _colorspace.ColorSpace.singletons.gray.getRgbItem(color, 0, rgbColor, 0);
+
+      return rgbColor;
+
+    case 3:
+      _colorspace.ColorSpace.singletons.rgb.getRgbItem(color, 0, rgbColor, 0);
+
+      return rgbColor;
+
+    case 4:
+      _colorspace.ColorSpace.singletons.cmyk.getRgbItem(color, 0, rgbColor, 0);
+
+      return rgbColor;
+
+    default:
+      return defaultColor;
+  }
+}
+
+function getQuadPoints(dict, rect) {
+  if (!dict.has("QuadPoints")) {
+    return null;
+  }
+
+  const quadPoints = dict.getArray("QuadPoints");
+
+  if (!Array.isArray(quadPoints) || quadPoints.length === 0 || quadPoints.length % 8 > 0) {
+    return null;
+  }
+
+  const quadPointsLists = [];
+
+  for (let i = 0, ii = quadPoints.length / 8; i < ii; i++) {
+    quadPointsLists.push([]);
+
+    for (let j = i * 8, jj = i * 8 + 8; j < jj; j += 2) {
+      const x = quadPoints[j];
+      const y = quadPoints[j + 1];
+
+      if (rect !== null && (x < rect[0] || x > rect[2] || y < rect[1] || y > rect[3])) {
+        return null;
+      }
+
+      quadPointsLists[i].push({
+        x,
+        y
+      });
+    }
+  }
+
+  return quadPointsLists.map(quadPointsList => {
+    const [minX, maxX, minY, maxY] = quadPointsList.reduce(([mX, MX, mY, MY], quadPoint) => [Math.min(mX, quadPoint.x), Math.max(MX, quadPoint.x), Math.min(mY, quadPoint.y), Math.max(MY, quadPoint.y)], [Number.MAX_VALUE, Number.MIN_VALUE, Number.MAX_VALUE, Number.MIN_VALUE]);
+    return [{
+      x: minX,
+      y: maxY
+    }, {
+      x: maxX,
+      y: maxY
+    }, {
+      x: minX,
+      y: minY
+    }, {
+      x: maxX,
+      y: minY
+    }];
+  });
+}
+
+function getTransformMatrix(rect, bbox, matrix) {
+  const [minX, minY, maxX, maxY] = _util.Util.getAxialAlignedBoundingBox(bbox, matrix);
+
+  if (minX === maxX || minY === maxY) {
+    return [1, 0, 0, 1, rect[0], rect[1]];
+  }
+
+  const xRatio = (rect[2] - rect[0]) / (maxX - minX);
+  const yRatio = (rect[3] - rect[1]) / (maxY - minY);
+  return [xRatio, 0, 0, yRatio, rect[0] - minX * xRatio, rect[1] - minY * yRatio];
+}
+
+class Annotation {
+  constructor(params) {
+    const dict = params.dict;
+    this.setTitle(dict.get("T"));
+    this.setContents(dict.get("Contents"));
+    this.setModificationDate(dict.get("M"));
+    this.setFlags(dict.get("F"));
+    this.setRectangle(dict.getArray("Rect"));
+    this.setColor(dict.getArray("C"));
+    this.setBorderStyle(dict);
+    this.setAppearance(dict);
+    this.setOptionalContent(dict);
+    const MK = dict.get("MK");
+    this.setBorderAndBackgroundColors(MK);
+    this.setRotation(MK);
+    this._streams = [];
+
+    if (this.appearance) {
+      this._streams.push(this.appearance);
+    }
+
+    this.data = {
+      annotationFlags: this.flags,
+      borderStyle: this.borderStyle,
+      color: this.color,
+      backgroundColor: this.backgroundColor,
+      borderColor: this.borderColor,
+      rotation: this.rotation,
+      contentsObj: this._contents,
+      hasAppearance: !!this.appearance,
+      id: params.id,
+      modificationDate: this.modificationDate,
+      rect: this.rectangle,
+      subtype: params.subtype,
+      hasOwnCanvas: false
+    };
+
+    if (params.collectFields) {
+      const kids = dict.get("Kids");
+
+      if (Array.isArray(kids)) {
+        const kidIds = [];
+
+        for (const kid of kids) {
+          if (kid instanceof _primitives.Ref) {
+            kidIds.push(kid.toString());
+          }
+        }
+
+        if (kidIds.length !== 0) {
+          this.data.kidIds = kidIds;
+        }
+      }
+
+      this.data.actions = (0, _core_utils.collectActions)(params.xref, dict, _util.AnnotationActionEventType);
+      this.data.fieldName = this._constructFieldName(dict);
+      this.data.pageIndex = params.pageIndex;
+    }
+
+    this._fallbackFontDict = null;
+  }
+
+  _hasFlag(flags, flag) {
+    return !!(flags & flag);
+  }
+
+  _isViewable(flags) {
+    return !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.NOVIEW);
+  }
+
+  _isPrintable(flags) {
+    return this._hasFlag(flags, _util.AnnotationFlag.PRINT) && !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE);
+  }
+
+  mustBeViewed(annotationStorage) {
+    const storageEntry = annotationStorage && annotationStorage.get(this.data.id);
+
+    if (storageEntry && storageEntry.hidden !== undefined) {
+      return !storageEntry.hidden;
+    }
+
+    return this.viewable && !this._hasFlag(this.flags, _util.AnnotationFlag.HIDDEN);
+  }
+
+  mustBePrinted(annotationStorage) {
+    const storageEntry = annotationStorage && annotationStorage.get(this.data.id);
+
+    if (storageEntry && storageEntry.print !== undefined) {
+      return storageEntry.print;
+    }
+
+    return this.printable;
+  }
+
+  get viewable() {
+    if (this.data.quadPoints === null) {
+      return false;
+    }
+
+    if (this.flags === 0) {
+      return true;
+    }
+
+    return this._isViewable(this.flags);
+  }
+
+  get printable() {
+    if (this.data.quadPoints === null) {
+      return false;
+    }
+
+    if (this.flags === 0) {
+      return false;
+    }
+
+    return this._isPrintable(this.flags);
+  }
+
+  _parseStringHelper(data) {
+    const str = typeof data === "string" ? (0, _util.stringToPDFString)(data) : "";
+    const dir = str && (0, _bidi.bidi)(str).dir === "rtl" ? "rtl" : "ltr";
+    return {
+      str,
+      dir
+    };
+  }
+
+  setTitle(title) {
+    this._title = this._parseStringHelper(title);
+  }
+
+  setContents(contents) {
+    this._contents = this._parseStringHelper(contents);
+  }
+
+  setModificationDate(modificationDate) {
+    this.modificationDate = typeof modificationDate === "string" ? modificationDate : null;
+  }
+
+  setFlags(flags) {
+    this.flags = Number.isInteger(flags) && flags > 0 ? flags : 0;
+  }
+
+  hasFlag(flag) {
+    return this._hasFlag(this.flags, flag);
+  }
+
+  setRectangle(rectangle) {
+    if (Array.isArray(rectangle) && rectangle.length === 4) {
+      this.rectangle = _util.Util.normalizeRect(rectangle);
+    } else {
+      this.rectangle = [0, 0, 0, 0];
+    }
+  }
+
+  setColor(color) {
+    this.color = getRgbColor(color);
+  }
+
+  setLineEndings(lineEndings) {
+    this.lineEndings = ["None", "None"];
+
+    if (Array.isArray(lineEndings) && lineEndings.length === 2) {
+      for (let i = 0; i < 2; i++) {
+        const obj = lineEndings[i];
+
+        if (obj instanceof _primitives.Name) {
+          switch (obj.name) {
+            case "None":
+              continue;
+
+            case "Square":
+            case "Circle":
+            case "Diamond":
+            case "OpenArrow":
+            case "ClosedArrow":
+            case "Butt":
+            case "ROpenArrow":
+            case "RClosedArrow":
+            case "Slash":
+              this.lineEndings[i] = obj.name;
+              continue;
+          }
+        }
+
+        (0, _util.warn)(`Ignoring invalid lineEnding: ${obj}`);
+      }
+    }
+  }
+
+  setRotation(mk) {
+    this.rotation = 0;
+
+    if (mk instanceof _primitives.Dict) {
+      let angle = mk.get("R") || 0;
+
+      if (Number.isInteger(angle) && angle !== 0) {
+        angle %= 360;
+
+        if (angle < 0) {
+          angle += 360;
+        }
+
+        if (angle % 90 === 0) {
+          this.rotation = angle;
+        }
+      }
+    }
+  }
+
+  setBorderAndBackgroundColors(mk) {
+    if (mk instanceof _primitives.Dict) {
+      this.borderColor = getRgbColor(mk.getArray("BC"), null);
+      this.backgroundColor = getRgbColor(mk.getArray("BG"), null);
+    } else {
+      this.borderColor = this.backgroundColor = null;
+    }
+  }
+
+  setBorderStyle(borderStyle) {
+    this.borderStyle = new AnnotationBorderStyle();
+
+    if (!(borderStyle instanceof _primitives.Dict)) {
+      return;
+    }
+
+    if (borderStyle.has("BS")) {
+      const dict = borderStyle.get("BS");
+      const dictType = dict.get("Type");
+
+      if (!dictType || (0, _primitives.isName)(dictType, "Border")) {
+        this.borderStyle.setWidth(dict.get("W"), this.rectangle);
+        this.borderStyle.setStyle(dict.get("S"));
+        this.borderStyle.setDashArray(dict.getArray("D"));
+      }
+    } else if (borderStyle.has("Border")) {
+      const array = borderStyle.getArray("Border");
+
+      if (Array.isArray(array) && array.length >= 3) {
+        this.borderStyle.setHorizontalCornerRadius(array[0]);
+        this.borderStyle.setVerticalCornerRadius(array[1]);
+        this.borderStyle.setWidth(array[2], this.rectangle);
+
+        if (array.length === 4) {
+          this.borderStyle.setDashArray(array[3], true);
+        }
+      }
+    } else {
+      this.borderStyle.setWidth(0);
+    }
+  }
+
+  setAppearance(dict) {
+    this.appearance = null;
+    const appearanceStates = dict.get("AP");
+
+    if (!(appearanceStates instanceof _primitives.Dict)) {
+      return;
+    }
+
+    const normalAppearanceState = appearanceStates.get("N");
+
+    if (normalAppearanceState instanceof _base_stream.BaseStream) {
+      this.appearance = normalAppearanceState;
+      return;
+    }
+
+    if (!(normalAppearanceState instanceof _primitives.Dict)) {
+      return;
+    }
+
+    const as = dict.get("AS");
+
+    if (!(as instanceof _primitives.Name) || !normalAppearanceState.has(as.name)) {
+      return;
+    }
+
+    this.appearance = normalAppearanceState.get(as.name);
+  }
+
+  setOptionalContent(dict) {
+    this.oc = null;
+    const oc = dict.get("OC");
+
+    if (oc instanceof _primitives.Name) {
+      (0, _util.warn)("setOptionalContent: Support for /Name-entry is not implemented.");
+    } else if (oc instanceof _primitives.Dict) {
+      this.oc = oc;
+    }
+  }
+
+  loadResources(keys, appearance) {
+    return appearance.dict.getAsync("Resources").then(resources => {
+      if (!resources) {
+        return undefined;
+      }
+
+      const objectLoader = new _object_loader.ObjectLoader(resources, keys, resources.xref);
+      return objectLoader.load().then(function () {
+        return resources;
+      });
+    });
+  }
+
+  async getOperatorList(evaluator, task, intent, renderForms, annotationStorage) {
+    const data = this.data;
+    let appearance = this.appearance;
+    const isUsingOwnCanvas = !!(this.data.hasOwnCanvas && intent & _util.RenderingIntentFlag.DISPLAY);
+
+    if (!appearance) {
+      if (!isUsingOwnCanvas) {
+        return {
+          opList: new _operator_list.OperatorList(),
+          separateForm: false,
+          separateCanvas: false
+        };
+      }
+
+      appearance = new _stream.StringStream("");
+      appearance.dict = new _primitives.Dict();
+    }
+
+    const appearanceDict = appearance.dict;
+    const resources = await this.loadResources(["ExtGState", "ColorSpace", "Pattern", "Shading", "XObject", "Font"], appearance);
+    const bbox = appearanceDict.getArray("BBox") || [0, 0, 1, 1];
+    const matrix = appearanceDict.getArray("Matrix") || [1, 0, 0, 1, 0, 0];
+    const transform = getTransformMatrix(data.rect, bbox, matrix);
+    const opList = new _operator_list.OperatorList();
+    let optionalContent;
+
+    if (this.oc) {
+      optionalContent = await evaluator.parseMarkedContentProps(this.oc, null);
+    }
+
+    if (optionalContent !== undefined) {
+      opList.addOp(_util.OPS.beginMarkedContentProps, ["OC", optionalContent]);
+    }
+
+    opList.addOp(_util.OPS.beginAnnotation, [data.id, data.rect, transform, matrix, isUsingOwnCanvas]);
+    await evaluator.getOperatorList({
+      stream: appearance,
+      task,
+      resources,
+      operatorList: opList,
+      fallbackFontDict: this._fallbackFontDict
+    });
+    opList.addOp(_util.OPS.endAnnotation, []);
+
+    if (optionalContent !== undefined) {
+      opList.addOp(_util.OPS.endMarkedContent, []);
+    }
+
+    this.reset();
+    return {
+      opList,
+      separateForm: false,
+      separateCanvas: isUsingOwnCanvas
+    };
+  }
+
+  async save(evaluator, task, annotationStorage) {
+    return null;
+  }
+
+  get hasTextContent() {
+    return false;
+  }
+
+  async extractTextContent(evaluator, task, viewBox) {
+    if (!this.appearance) {
+      return;
+    }
+
+    const resources = await this.loadResources(["ExtGState", "Font", "Properties", "XObject"], this.appearance);
+    const text = [];
+    const buffer = [];
+    const sink = {
+      desiredSize: Math.Infinity,
+      ready: true,
+
+      enqueue(chunk, size) {
+        for (const item of chunk.items) {
+          buffer.push(item.str);
+
+          if (item.hasEOL) {
+            text.push(buffer.join(""));
+            buffer.length = 0;
+          }
+        }
+      }
+
+    };
+    await evaluator.getTextContent({
+      stream: this.appearance,
+      task,
+      resources,
+      includeMarkedContent: true,
+      combineTextItems: true,
+      sink,
+      viewBox
+    });
+    this.reset();
+
+    if (buffer.length) {
+      text.push(buffer.join(""));
+    }
+
+    if (text.length > 0) {
+      this.data.textContent = text;
+    }
+  }
+
+  getFieldObject() {
+    if (this.data.kidIds) {
+      return {
+        id: this.data.id,
+        actions: this.data.actions,
+        name: this.data.fieldName,
+        strokeColor: this.data.borderColor,
+        fillColor: this.data.backgroundColor,
+        type: "",
+        kidIds: this.data.kidIds,
+        page: this.data.pageIndex,
+        rotation: this.rotation
+      };
+    }
+
+    return null;
+  }
+
+  reset() {
+    for (const stream of this._streams) {
+      stream.reset();
+    }
+  }
+
+  _constructFieldName(dict) {
+    if (!dict.has("T") && !dict.has("Parent")) {
+      (0, _util.warn)("Unknown field name, falling back to empty field name.");
+      return "";
+    }
+
+    if (!dict.has("Parent")) {
+      return (0, _util.stringToPDFString)(dict.get("T"));
+    }
+
+    const fieldName = [];
+
+    if (dict.has("T")) {
+      fieldName.unshift((0, _util.stringToPDFString)(dict.get("T")));
+    }
+
+    let loopDict = dict;
+    const visited = new _primitives.RefSet();
+
+    if (dict.objId) {
+      visited.put(dict.objId);
+    }
+
+    while (loopDict.has("Parent")) {
+      loopDict = loopDict.get("Parent");
+
+      if (!(loopDict instanceof _primitives.Dict) || loopDict.objId && visited.has(loopDict.objId)) {
+        break;
+      }
+
+      if (loopDict.objId) {
+        visited.put(loopDict.objId);
+      }
+
+      if (loopDict.has("T")) {
+        fieldName.unshift((0, _util.stringToPDFString)(loopDict.get("T")));
+      }
+    }
+
+    return fieldName.join(".");
+  }
+
+}
+
+exports.Annotation = Annotation;
+
+class AnnotationBorderStyle {
+  constructor() {
+    this.width = 1;
+    this.style = _util.AnnotationBorderStyleType.SOLID;
+    this.dashArray = [3];
+    this.horizontalCornerRadius = 0;
+    this.verticalCornerRadius = 0;
+  }
+
+  setWidth(width, rect = [0, 0, 0, 0]) {
+    if (width instanceof _primitives.Name) {
+      this.width = 0;
+      return;
+    }
+
+    if (typeof width === "number") {
+      if (width > 0) {
+        const maxWidth = (rect[2] - rect[0]) / 2;
+        const maxHeight = (rect[3] - rect[1]) / 2;
+
+        if (maxWidth > 0 && maxHeight > 0 && (width > maxWidth || width > maxHeight)) {
+          (0, _util.warn)(`AnnotationBorderStyle.setWidth - ignoring width: ${width}`);
+          width = 1;
+        }
+      }
+
+      this.width = width;
+    }
+  }
+
+  setStyle(style) {
+    if (!(style instanceof _primitives.Name)) {
+      return;
+    }
+
+    switch (style.name) {
+      case "S":
+        this.style = _util.AnnotationBorderStyleType.SOLID;
+        break;
+
+      case "D":
+        this.style = _util.AnnotationBorderStyleType.DASHED;
+        break;
+
+      case "B":
+        this.style = _util.AnnotationBorderStyleType.BEVELED;
+        break;
+
+      case "I":
+        this.style = _util.AnnotationBorderStyleType.INSET;
+        break;
+
+      case "U":
+        this.style = _util.AnnotationBorderStyleType.UNDERLINE;
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  setDashArray(dashArray, forceStyle = false) {
+    if (Array.isArray(dashArray) && dashArray.length > 0) {
+      let isValid = true;
+      let allZeros = true;
+
+      for (const element of dashArray) {
+        const validNumber = +element >= 0;
+
+        if (!validNumber) {
+          isValid = false;
+          break;
+        } else if (element > 0) {
+          allZeros = false;
+        }
+      }
+
+      if (isValid && !allZeros) {
+        this.dashArray = dashArray;
+
+        if (forceStyle) {
+          this.setStyle(_primitives.Name.get("D"));
+        }
+      } else {
+        this.width = 0;
+      }
+    } else if (dashArray) {
+      this.width = 0;
+    }
+  }
+
+  setHorizontalCornerRadius(radius) {
+    if (Number.isInteger(radius)) {
+      this.horizontalCornerRadius = radius;
+    }
+  }
+
+  setVerticalCornerRadius(radius) {
+    if (Number.isInteger(radius)) {
+      this.verticalCornerRadius = radius;
+    }
+  }
+
+}
+
+exports.AnnotationBorderStyle = AnnotationBorderStyle;
+
+class MarkupAnnotation extends Annotation {
+  constructor(parameters) {
+    super(parameters);
+    const dict = parameters.dict;
+
+    if (dict.has("IRT")) {
+      const rawIRT = dict.getRaw("IRT");
+      this.data.inReplyTo = rawIRT instanceof _primitives.Ref ? rawIRT.toString() : null;
+      const rt = dict.get("RT");
+      this.data.replyType = rt instanceof _primitives.Name ? rt.name : _util.AnnotationReplyType.REPLY;
+    }
+
+    if (this.data.replyType === _util.AnnotationReplyType.GROUP) {
+      const parent = dict.get("IRT");
+      this.setTitle(parent.get("T"));
+      this.data.titleObj = this._title;
+      this.setContents(parent.get("Contents"));
+      this.data.contentsObj = this._contents;
+
+      if (!parent.has("CreationDate")) {
+        this.data.creationDate = null;
+      } else {
+        this.setCreationDate(parent.get("CreationDate"));
+        this.data.creationDate = this.creationDate;
+      }
+
+      if (!parent.has("M")) {
+        this.data.modificationDate = null;
+      } else {
+        this.setModificationDate(parent.get("M"));
+        this.data.modificationDate = this.modificationDate;
+      }
+
+      this.data.hasPopup = parent.has("Popup");
+
+      if (!parent.has("C")) {
+        this.data.color = null;
+      } else {
+        this.setColor(parent.getArray("C"));
+        this.data.color = this.color;
+      }
+    } else {
+      this.data.titleObj = this._title;
+      this.setCreationDate(dict.get("CreationDate"));
+      this.data.creationDate = this.creationDate;
+      this.data.hasPopup = dict.has("Popup");
+
+      if (!dict.has("C")) {
+        this.data.color = null;
+      }
+    }
+
+    if (dict.has("RC")) {
+      this.data.richText = _factory.XFAFactory.getRichTextAsHtml(dict.get("RC"));
+    }
+  }
+
+  setCreationDate(creationDate) {
+    this.creationDate = typeof creationDate === "string" ? creationDate : null;
+  }
+
+  _setDefaultAppearance({
+    xref,
+    extra,
+    strokeColor,
+    fillColor,
+    blendMode,
+    strokeAlpha,
+    fillAlpha,
+    pointsCallback
+  }) {
+    let minX = Number.MAX_VALUE;
+    let minY = Number.MAX_VALUE;
+    let maxX = Number.MIN_VALUE;
+    let maxY = Number.MIN_VALUE;
+    const buffer = ["q"];
+
+    if (extra) {
+      buffer.push(extra);
+    }
+
+    if (strokeColor) {
+      buffer.push(`${strokeColor[0]} ${strokeColor[1]} ${strokeColor[2]} RG`);
+    }
+
+    if (fillColor) {
+      buffer.push(`${fillColor[0]} ${fillColor[1]} ${fillColor[2]} rg`);
+    }
+
+    let pointsArray = this.data.quadPoints;
+
+    if (!pointsArray) {
+      pointsArray = [[{
+        x: this.rectangle[0],
+        y: this.rectangle[3]
+      }, {
+        x: this.rectangle[2],
+        y: this.rectangle[3]
+      }, {
+        x: this.rectangle[0],
+        y: this.rectangle[1]
+      }, {
+        x: this.rectangle[2],
+        y: this.rectangle[1]
+      }]];
+    }
+
+    for (const points of pointsArray) {
+      const [mX, MX, mY, MY] = pointsCallback(buffer, points);
+      minX = Math.min(minX, mX);
+      maxX = Math.max(maxX, MX);
+      minY = Math.min(minY, mY);
+      maxY = Math.max(maxY, MY);
+    }
+
+    buffer.push("Q");
+    const formDict = new _primitives.Dict(xref);
+    const appearanceStreamDict = new _primitives.Dict(xref);
+    appearanceStreamDict.set("Subtype", _primitives.Name.get("Form"));
+    const appearanceStream = new _stream.StringStream(buffer.join(" "));
+    appearanceStream.dict = appearanceStreamDict;
+    formDict.set("Fm0", appearanceStream);
+    const gsDict = new _primitives.Dict(xref);
+
+    if (blendMode) {
+      gsDict.set("BM", _primitives.Name.get(blendMode));
+    }
+
+    if (typeof strokeAlpha === "number") {
+      gsDict.set("CA", strokeAlpha);
+    }
+
+    if (typeof fillAlpha === "number") {
+      gsDict.set("ca", fillAlpha);
+    }
+
+    const stateDict = new _primitives.Dict(xref);
+    stateDict.set("GS0", gsDict);
+    const resources = new _primitives.Dict(xref);
+    resources.set("ExtGState", stateDict);
+    resources.set("XObject", formDict);
+    const appearanceDict = new _primitives.Dict(xref);
+    appearanceDict.set("Resources", resources);
+    const bbox = this.data.rect = [minX, minY, maxX, maxY];
+    appearanceDict.set("BBox", bbox);
+    this.appearance = new _stream.StringStream("/GS0 gs /Fm0 Do");
+    this.appearance.dict = appearanceDict;
+
+    this._streams.push(this.appearance, appearanceStream);
+  }
+
+  static async createNewAnnotation(xref, annotation, dependencies, params) {
+    const annotationRef = xref.getNewRef();
+    const apRef = xref.getNewRef();
+    const annotationDict = this.createNewDict(annotation, xref, {
+      apRef
+    });
+    const ap = await this.createNewAppearanceStream(annotation, xref, params);
+    const buffer = [];
+    let transform = xref.encrypt ? xref.encrypt.createCipherTransform(apRef.num, apRef.gen) : null;
+    (0, _writer.writeObject)(apRef, ap, buffer, transform);
+    dependencies.push({
+      ref: apRef,
+      data: buffer.join("")
+    });
+    buffer.length = 0;
+    transform = xref.encrypt ? xref.encrypt.createCipherTransform(annotationRef.num, annotationRef.gen) : null;
+    (0, _writer.writeObject)(annotationRef, annotationDict, buffer, transform);
+    return {
+      ref: annotationRef,
+      data: buffer.join("")
+    };
+  }
+
+  static async createNewPrintAnnotation(xref, annotation, params) {
+    const ap = await this.createNewAppearanceStream(annotation, xref, params);
+    const annotationDict = this.createNewDict(annotation, xref, {
+      ap
+    });
+    return new this.prototype.constructor({
+      dict: annotationDict,
+      xref
+    });
+  }
+
+}
+
+exports.MarkupAnnotation = MarkupAnnotation;
+
+class WidgetAnnotation extends Annotation {
+  constructor(params) {
+    super(params);
+    const dict = params.dict;
+    const data = this.data;
+    this.ref = params.ref;
+    data.annotationType = _util.AnnotationType.WIDGET;
+
+    if (data.fieldName === undefined) {
+      data.fieldName = this._constructFieldName(dict);
+    }
+
+    if (data.actions === undefined) {
+      data.actions = (0, _core_utils.collectActions)(params.xref, dict, _util.AnnotationActionEventType);
+    }
+
+    let fieldValue = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "V",
+      getArray: true
+    });
+    data.fieldValue = this._decodeFormValue(fieldValue);
+    const defaultFieldValue = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "DV",
+      getArray: true
+    });
+    data.defaultFieldValue = this._decodeFormValue(defaultFieldValue);
+
+    if (fieldValue === undefined && params.xfaDatasets) {
+      const path = this._title.str;
+
+      if (path) {
+        this._hasValueFromXFA = true;
+        data.fieldValue = fieldValue = params.xfaDatasets.getValue(path);
+      }
+    }
+
+    if (fieldValue === undefined && data.defaultFieldValue !== null) {
+      data.fieldValue = data.defaultFieldValue;
+    }
+
+    data.alternativeText = (0, _util.stringToPDFString)(dict.get("TU") || "");
+    const defaultAppearance = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "DA"
+    }) || params.acroForm.get("DA");
+    this._defaultAppearance = typeof defaultAppearance === "string" ? defaultAppearance : "";
+    data.defaultAppearanceData = (0, _default_appearance.parseDefaultAppearance)(this._defaultAppearance);
+    const fieldType = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "FT"
+    });
+    data.fieldType = fieldType instanceof _primitives.Name ? fieldType.name : null;
+    const localResources = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "DR"
+    });
+    const acroFormResources = params.acroForm.get("DR");
+    const appearanceResources = this.appearance && this.appearance.dict.get("Resources");
+    this._fieldResources = {
+      localResources,
+      acroFormResources,
+      appearanceResources,
+      mergedResources: _primitives.Dict.merge({
+        xref: params.xref,
+        dictArray: [localResources, appearanceResources, acroFormResources],
+        mergeSubDicts: true
+      })
+    };
+    data.fieldFlags = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "Ff"
+    });
+
+    if (!Number.isInteger(data.fieldFlags) || data.fieldFlags < 0) {
+      data.fieldFlags = 0;
+    }
+
+    data.readOnly = this.hasFieldFlag(_util.AnnotationFieldFlag.READONLY);
+    data.required = this.hasFieldFlag(_util.AnnotationFieldFlag.REQUIRED);
+    data.hidden = this._hasFlag(data.annotationFlags, _util.AnnotationFlag.HIDDEN);
+  }
+
+  _decodeFormValue(formValue) {
+    if (Array.isArray(formValue)) {
+      return formValue.filter(item => typeof item === "string").map(item => (0, _util.stringToPDFString)(item));
+    } else if (formValue instanceof _primitives.Name) {
+      return (0, _util.stringToPDFString)(formValue.name);
+    } else if (typeof formValue === "string") {
+      return (0, _util.stringToPDFString)(formValue);
+    }
+
+    return null;
+  }
+
+  hasFieldFlag(flag) {
+    return !!(this.data.fieldFlags & flag);
+  }
+
+  static _getRotationMatrix(rotation, width, height) {
+    switch (rotation) {
+      case 90:
+        return [0, 1, -1, 0, width, 0];
+
+      case 180:
+        return [-1, 0, 0, -1, width, height];
+
+      case 270:
+        return [0, -1, 1, 0, 0, height];
+
+      default:
+        throw new Error("Invalid rotation");
+    }
+  }
+
+  getRotationMatrix(annotationStorage) {
+    const storageEntry = annotationStorage ? annotationStorage.get(this.data.id) : undefined;
+    let rotation = storageEntry && storageEntry.rotation;
+
+    if (rotation === undefined) {
+      rotation = this.rotation;
+    }
+
+    if (rotation === 0) {
+      return _util.IDENTITY_MATRIX;
+    }
+
+    const width = this.data.rect[2] - this.data.rect[0];
+    const height = this.data.rect[3] - this.data.rect[1];
+    return WidgetAnnotation._getRotationMatrix(rotation, width, height);
+  }
+
+  getBorderAndBackgroundAppearances(annotationStorage) {
+    const storageEntry = annotationStorage ? annotationStorage.get(this.data.id) : undefined;
+    let rotation = storageEntry && storageEntry.rotation;
+
+    if (rotation === undefined) {
+      rotation = this.rotation;
+    }
+
+    if (!this.backgroundColor && !this.borderColor) {
+      return "";
+    }
+
+    const width = this.data.rect[2] - this.data.rect[0];
+    const height = this.data.rect[3] - this.data.rect[1];
+    const rect = rotation === 0 || rotation === 180 ? `0 0 ${width} ${height} re` : `0 0 ${height} ${width} re`;
+    let str = "";
+
+    if (this.backgroundColor) {
+      str = `${(0, _default_appearance.getPdfColor)(this.backgroundColor, true)} ${rect} f `;
+    }
+
+    if (this.borderColor) {
+      const borderWidth = this.borderStyle.width || 1;
+      str += `${borderWidth} w ${(0, _default_appearance.getPdfColor)(this.borderColor, false)} ${rect} S `;
+    }
+
+    return str;
+  }
+
+  async getOperatorList(evaluator, task, intent, renderForms, annotationStorage) {
+    if (renderForms && !(this instanceof SignatureWidgetAnnotation)) {
+      return {
+        opList: new _operator_list.OperatorList(),
+        separateForm: true,
+        separateCanvas: false
+      };
+    }
+
+    if (!this._hasText) {
+      return super.getOperatorList(evaluator, task, intent, renderForms, annotationStorage);
+    }
+
+    const content = await this._getAppearance(evaluator, task, annotationStorage);
+
+    if (this.appearance && content === null) {
+      return super.getOperatorList(evaluator, task, intent, renderForms, annotationStorage);
+    }
+
+    const opList = new _operator_list.OperatorList();
+
+    if (!this._defaultAppearance || content === null) {
+      return {
+        opList,
+        separateForm: false,
+        separateCanvas: false
+      };
+    }
+
+    const matrix = [1, 0, 0, 1, 0, 0];
+    const bbox = [0, 0, this.data.rect[2] - this.data.rect[0], this.data.rect[3] - this.data.rect[1]];
+    const transform = getTransformMatrix(this.data.rect, bbox, matrix);
+    let optionalContent;
+
+    if (this.oc) {
+      optionalContent = await evaluator.parseMarkedContentProps(this.oc, null);
+    }
+
+    if (optionalContent !== undefined) {
+      opList.addOp(_util.OPS.beginMarkedContentProps, ["OC", optionalContent]);
+    }
+
+    opList.addOp(_util.OPS.beginAnnotation, [this.data.id, this.data.rect, transform, this.getRotationMatrix(annotationStorage), false]);
+    const stream = new _stream.StringStream(content);
+    await evaluator.getOperatorList({
+      stream,
+      task,
+      resources: this._fieldResources.mergedResources,
+      operatorList: opList
+    });
+    opList.addOp(_util.OPS.endAnnotation, []);
+
+    if (optionalContent !== undefined) {
+      opList.addOp(_util.OPS.endMarkedContent, []);
+    }
+
+    return {
+      opList,
+      separateForm: false,
+      separateCanvas: false
+    };
+  }
+
+  _getMKDict(rotation) {
+    const mk = new _primitives.Dict(null);
+
+    if (rotation) {
+      mk.set("R", rotation);
+    }
+
+    if (this.borderColor) {
+      mk.set("BC", Array.from(this.borderColor).map(c => c / 255));
+    }
+
+    if (this.backgroundColor) {
+      mk.set("BG", Array.from(this.backgroundColor).map(c => c / 255));
+    }
+
+    return mk.size > 0 ? mk : null;
+  }
+
+  async save(evaluator, task, annotationStorage) {
+    const storageEntry = annotationStorage ? annotationStorage.get(this.data.id) : undefined;
+    let value = storageEntry && storageEntry.value;
+    let rotation = storageEntry && storageEntry.rotation;
+
+    if (value === this.data.fieldValue || value === undefined) {
+      if (!this._hasValueFromXFA && rotation === undefined) {
+        return null;
+      }
+
+      value = value || this.data.fieldValue;
+    }
+
+    if (rotation === undefined && !this._hasValueFromXFA && Array.isArray(value) && Array.isArray(this.data.fieldValue) && value.length === this.data.fieldValue.length && value.every((x, i) => x === this.data.fieldValue[i])) {
+      return null;
+    }
+
+    if (rotation === undefined) {
+      rotation = this.rotation;
+    }
+
+    let appearance = await this._getAppearance(evaluator, task, annotationStorage);
+
+    if (appearance === null) {
+      return null;
+    }
+
+    const {
+      xref
+    } = evaluator;
+    const dict = xref.fetchIfRef(this.ref);
+
+    if (!(dict instanceof _primitives.Dict)) {
+      return null;
+    }
+
+    const bbox = [0, 0, this.data.rect[2] - this.data.rect[0], this.data.rect[3] - this.data.rect[1]];
+    const xfa = {
+      path: (0, _util.stringToPDFString)(dict.get("T") || ""),
+      value
+    };
+    const newRef = xref.getNewRef();
+    const AP = new _primitives.Dict(xref);
+    AP.set("N", newRef);
+    const encrypt = xref.encrypt;
+    let originalTransform = null;
+    let newTransform = null;
+
+    if (encrypt) {
+      originalTransform = encrypt.createCipherTransform(this.ref.num, this.ref.gen);
+      newTransform = encrypt.createCipherTransform(newRef.num, newRef.gen);
+      appearance = newTransform.encryptString(appearance);
+    }
+
+    const encoder = val => (0, _util.isAscii)(val) ? val : (0, _util.stringToUTF16BEString)(val);
+
+    dict.set("V", Array.isArray(value) ? value.map(encoder) : encoder(value));
+    dict.set("AP", AP);
+    dict.set("M", `D:${(0, _util.getModificationDate)()}`);
+
+    const maybeMK = this._getMKDict(rotation);
+
+    if (maybeMK) {
+      dict.set("MK", maybeMK);
+    }
+
+    const appearanceDict = new _primitives.Dict(xref);
+    appearanceDict.set("Length", appearance.length);
+    appearanceDict.set("Subtype", _primitives.Name.get("Form"));
+    appearanceDict.set("Resources", this._getSaveFieldResources(xref));
+    appearanceDict.set("BBox", bbox);
+    const rotationMatrix = this.getRotationMatrix(annotationStorage);
+
+    if (rotationMatrix !== _util.IDENTITY_MATRIX) {
+      appearanceDict.set("Matrix", rotationMatrix);
+    }
+
+    const bufferOriginal = [`${this.ref.num} ${this.ref.gen} obj\n`];
+    (0, _writer.writeDict)(dict, bufferOriginal, originalTransform);
+    bufferOriginal.push("\nendobj\n");
+    const bufferNew = [`${newRef.num} ${newRef.gen} obj\n`];
+    (0, _writer.writeDict)(appearanceDict, bufferNew, newTransform);
+    bufferNew.push(" stream\n", appearance, "\nendstream\nendobj\n");
+    return [{
+      ref: this.ref,
+      data: bufferOriginal.join(""),
+      xfa
+    }, {
+      ref: newRef,
+      data: bufferNew.join(""),
+      xfa: null
+    }];
+  }
+
+  async _getAppearance(evaluator, task, annotationStorage) {
+    const isPassword = this.hasFieldFlag(_util.AnnotationFieldFlag.PASSWORD);
+
+    if (isPassword) {
+      return null;
+    }
+
+    const storageEntry = annotationStorage ? annotationStorage.get(this.data.id) : undefined;
+    let value, rotation;
+
+    if (storageEntry) {
+      value = storageEntry.formattedValue || storageEntry.value;
+      rotation = storageEntry.rotation;
+    }
+
+    if (rotation === undefined && value === undefined) {
+      if (!this._hasValueFromXFA || this.appearance) {
+        return null;
+      }
+    }
+
+    if (value === undefined) {
+      value = this.data.fieldValue;
+
+      if (!value) {
+        return "";
+      }
+    }
+
+    if (Array.isArray(value) && value.length === 1) {
+      value = value[0];
+    }
+
+    (0, _util.assert)(typeof value === "string", "Expected `value` to be a string.");
+    value = value.trim();
+
+    if (value === "") {
+      return "";
+    }
+
+    if (rotation === undefined) {
+      rotation = this.rotation;
+    }
+
+    let lineCount = -1;
+
+    if (this.data.multiLine) {
+      lineCount = value.split(/\r\n|\r|\n/).length;
+    }
+
+    const defaultPadding = 2;
+    const hPadding = defaultPadding;
+    let totalHeight = this.data.rect[3] - this.data.rect[1];
+    let totalWidth = this.data.rect[2] - this.data.rect[0];
+
+    if (rotation === 90 || rotation === 270) {
+      [totalWidth, totalHeight] = [totalHeight, totalWidth];
+    }
+
+    if (!this._defaultAppearance) {
+      this.data.defaultAppearanceData = (0, _default_appearance.parseDefaultAppearance)(this._defaultAppearance = "/Helvetica 0 Tf 0 g");
+    }
+
+    const font = await WidgetAnnotation._getFontData(evaluator, task, this.data.defaultAppearanceData, this._fieldResources.mergedResources);
+
+    const [defaultAppearance, fontSize] = this._computeFontSize(totalHeight - defaultPadding, totalWidth - 2 * hPadding, value, font, lineCount);
+
+    let descent = font.descent;
+
+    if (isNaN(descent)) {
+      descent = 0;
+    }
+
+    const defaultVPadding = Math.min(Math.floor((totalHeight - fontSize) / 2), defaultPadding);
+    const vPadding = defaultVPadding + Math.abs(descent) * fontSize;
+    const alignment = this.data.textAlignment;
+
+    if (this.data.multiLine) {
+      return this._getMultilineAppearance(defaultAppearance, value, font, fontSize, totalWidth, totalHeight, alignment, hPadding, vPadding, annotationStorage);
+    }
+
+    const encodedString = font.encodeString(value).join("");
+
+    if (this.data.comb) {
+      return this._getCombAppearance(defaultAppearance, font, encodedString, totalWidth, hPadding, vPadding, annotationStorage);
+    }
+
+    const colors = this.getBorderAndBackgroundAppearances(annotationStorage);
+
+    if (alignment === 0 || alignment > 2) {
+      return `/Tx BMC q ${colors}BT ` + defaultAppearance + ` 1 0 0 1 ${hPadding} ${vPadding} Tm (${(0, _util.escapeString)(encodedString)}) Tj` + " ET Q EMC";
+    }
+
+    const renderedText = this._renderText(encodedString, font, fontSize, totalWidth, alignment, hPadding, vPadding);
+
+    return `/Tx BMC q ${colors}BT ` + defaultAppearance + ` 1 0 0 1 0 0 Tm ${renderedText}` + " ET Q EMC";
+  }
+
+  static async _getFontData(evaluator, task, appearanceData, resources) {
+    const operatorList = new _operator_list.OperatorList();
+    const initialState = {
+      font: null,
+
+      clone() {
+        return this;
+      }
+
+    };
+    const {
+      fontName,
+      fontSize
+    } = appearanceData;
+    await evaluator.handleSetFont(resources, [fontName && _primitives.Name.get(fontName), fontSize], null, operatorList, task, initialState, null);
+    return initialState.font;
+  }
+
+  _getTextWidth(text, font) {
+    return font.charsToGlyphs(text).reduce((width, glyph) => width + glyph.width, 0) / 1000;
+  }
+
+  _computeFontSize(height, width, text, font, lineCount) {
+    let {
+      fontSize
+    } = this.data.defaultAppearanceData;
+
+    if (!fontSize) {
+      const roundWithTwoDigits = x => Math.floor(x * 100) / 100;
+
+      if (lineCount === -1) {
+        const textWidth = this._getTextWidth(text, font);
+
+        fontSize = roundWithTwoDigits(Math.min(height / _util.LINE_FACTOR, width / textWidth));
+      } else {
+        const lines = text.split(/\r\n?|\n/);
+        const cachedLines = [];
+
+        for (const line of lines) {
+          const encoded = font.encodeString(line).join("");
+          const glyphs = font.charsToGlyphs(encoded);
+          const positions = font.getCharPositions(encoded);
+          cachedLines.push({
+            line: encoded,
+            glyphs,
+            positions
+          });
+        }
+
+        const isTooBig = fsize => {
+          let totalHeight = 0;
+
+          for (const cache of cachedLines) {
+            const chunks = this._splitLine(null, font, fsize, width, cache);
+
+            totalHeight += chunks.length * fsize;
+
+            if (totalHeight > height) {
+              return true;
+            }
+          }
+
+          return false;
+        };
+
+        fontSize = 12;
+        let lineHeight = fontSize * _util.LINE_FACTOR;
+        let numberOfLines = Math.round(height / lineHeight);
+        numberOfLines = Math.max(numberOfLines, lineCount);
+
+        while (true) {
+          lineHeight = height / numberOfLines;
+          fontSize = roundWithTwoDigits(lineHeight / _util.LINE_FACTOR);
+
+          if (isTooBig(fontSize)) {
+            numberOfLines++;
+            continue;
+          }
+
+          break;
+        }
+      }
+
+      const {
+        fontName,
+        fontColor
+      } = this.data.defaultAppearanceData;
+      this._defaultAppearance = (0, _default_appearance.createDefaultAppearance)({
+        fontSize,
+        fontName,
+        fontColor
+      });
+    }
+
+    return [this._defaultAppearance, fontSize];
+  }
+
+  _renderText(text, font, fontSize, totalWidth, alignment, hPadding, vPadding) {
+    let shift;
+
+    if (alignment === 1) {
+      const width = this._getTextWidth(text, font) * fontSize;
+      shift = (totalWidth - width) / 2;
+    } else if (alignment === 2) {
+      const width = this._getTextWidth(text, font) * fontSize;
+      shift = totalWidth - width - hPadding;
+    } else {
+      shift = hPadding;
+    }
+
+    shift = (0, _core_utils.numberToString)(shift);
+    vPadding = (0, _core_utils.numberToString)(vPadding);
+    return `${shift} ${vPadding} Td (${(0, _util.escapeString)(text)}) Tj`;
+  }
+
+  _getSaveFieldResources(xref) {
+    const {
+      localResources,
+      appearanceResources,
+      acroFormResources
+    } = this._fieldResources;
+    const fontName = this.data.defaultAppearanceData && this.data.defaultAppearanceData.fontName;
+
+    if (!fontName) {
+      return localResources || _primitives.Dict.empty;
+    }
+
+    for (const resources of [localResources, appearanceResources]) {
+      if (resources instanceof _primitives.Dict) {
+        const localFont = resources.get("Font");
+
+        if (localFont instanceof _primitives.Dict && localFont.has(fontName)) {
+          return resources;
+        }
+      }
+    }
+
+    if (acroFormResources instanceof _primitives.Dict) {
+      const acroFormFont = acroFormResources.get("Font");
+
+      if (acroFormFont instanceof _primitives.Dict && acroFormFont.has(fontName)) {
+        const subFontDict = new _primitives.Dict(xref);
+        subFontDict.set(fontName, acroFormFont.getRaw(fontName));
+        const subResourcesDict = new _primitives.Dict(xref);
+        subResourcesDict.set("Font", subFontDict);
+        return _primitives.Dict.merge({
+          xref,
+          dictArray: [subResourcesDict, localResources],
+          mergeSubDicts: true
+        });
+      }
+    }
+
+    return localResources || _primitives.Dict.empty;
+  }
+
+  getFieldObject() {
+    return null;
+  }
+
+}
+
+class TextWidgetAnnotation extends WidgetAnnotation {
+  constructor(params) {
+    super(params);
+    this._hasText = true;
+    const dict = params.dict;
+
+    if (typeof this.data.fieldValue !== "string") {
+      this.data.fieldValue = "";
+    }
+
+    let alignment = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "Q"
+    });
+
+    if (!Number.isInteger(alignment) || alignment < 0 || alignment > 2) {
+      alignment = null;
+    }
+
+    this.data.textAlignment = alignment;
+    let maximumLength = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "MaxLen"
+    });
+
+    if (!Number.isInteger(maximumLength) || maximumLength < 0) {
+      maximumLength = 0;
+    }
+
+    this.data.maxLen = maximumLength;
+    this.data.multiLine = this.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE);
+    this.data.comb = this.hasFieldFlag(_util.AnnotationFieldFlag.COMB) && !this.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE) && !this.hasFieldFlag(_util.AnnotationFieldFlag.PASSWORD) && !this.hasFieldFlag(_util.AnnotationFieldFlag.FILESELECT) && this.data.maxLen !== 0;
+    this.data.doNotScroll = this.hasFieldFlag(_util.AnnotationFieldFlag.DONOTSCROLL);
+  }
+
+  _getCombAppearance(defaultAppearance, font, text, width, hPadding, vPadding, annotationStorage) {
+    const combWidth = (0, _core_utils.numberToString)(width / this.data.maxLen);
+    const buf = [];
+    const positions = font.getCharPositions(text);
+
+    for (const [start, end] of positions) {
+      buf.push(`(${(0, _util.escapeString)(text.substring(start, end))}) Tj`);
+    }
+
+    const colors = this.getBorderAndBackgroundAppearances(annotationStorage);
+    const renderedComb = buf.join(` ${combWidth} 0 Td `);
+    return `/Tx BMC q ${colors}BT ` + defaultAppearance + ` 1 0 0 1 ${hPadding} ${vPadding} Tm ${renderedComb}` + " ET Q EMC";
+  }
+
+  _getMultilineAppearance(defaultAppearance, text, font, fontSize, width, height, alignment, hPadding, vPadding, annotationStorage) {
+    const lines = text.split(/\r\n?|\n/);
+    const buf = [];
+    const totalWidth = width - 2 * hPadding;
+
+    for (const line of lines) {
+      const chunks = this._splitLine(line, font, fontSize, totalWidth);
+
+      for (const chunk of chunks) {
+        const padding = buf.length === 0 ? hPadding : 0;
+        buf.push(this._renderText(chunk, font, fontSize, width, alignment, padding, -fontSize));
+      }
+    }
+
+    const renderedText = buf.join("\n");
+    const colors = this.getBorderAndBackgroundAppearances(annotationStorage);
+    return `/Tx BMC q ${colors}BT ` + defaultAppearance + ` 1 0 0 1 0 ${height} Tm ${renderedText}` + " ET Q EMC";
+  }
+
+  _splitLine(line, font, fontSize, width, cache = {}) {
+    line = cache.line || font.encodeString(line).join("");
+    const glyphs = cache.glyphs || font.charsToGlyphs(line);
+
+    if (glyphs.length <= 1) {
+      return [line];
+    }
+
+    const positions = cache.positions || font.getCharPositions(line);
+    const scale = fontSize / 1000;
+    const chunks = [];
+    let lastSpacePosInStringStart = -1,
+        lastSpacePosInStringEnd = -1,
+        lastSpacePos = -1,
+        startChunk = 0,
+        currentWidth = 0;
+
+    for (let i = 0, ii = glyphs.length; i < ii; i++) {
+      const [start, end] = positions[i];
+      const glyph = glyphs[i];
+      const glyphWidth = glyph.width * scale;
+
+      if (glyph.unicode === " ") {
+        if (currentWidth + glyphWidth > width) {
+          chunks.push(line.substring(startChunk, start));
+          startChunk = start;
+          currentWidth = glyphWidth;
+          lastSpacePosInStringStart = -1;
+          lastSpacePos = -1;
+        } else {
+          currentWidth += glyphWidth;
+          lastSpacePosInStringStart = start;
+          lastSpacePosInStringEnd = end;
+          lastSpacePos = i;
+        }
+      } else {
+        if (currentWidth + glyphWidth > width) {
+          if (lastSpacePosInStringStart !== -1) {
+            chunks.push(line.substring(startChunk, lastSpacePosInStringEnd));
+            startChunk = lastSpacePosInStringEnd;
+            i = lastSpacePos + 1;
+            lastSpacePosInStringStart = -1;
+            currentWidth = 0;
+          } else {
+            chunks.push(line.substring(startChunk, start));
+            startChunk = start;
+            currentWidth = glyphWidth;
+          }
+        } else {
+          currentWidth += glyphWidth;
+        }
+      }
+    }
+
+    if (startChunk < line.length) {
+      chunks.push(line.substring(startChunk, line.length));
+    }
+
+    return chunks;
+  }
+
+  getFieldObject() {
+    return {
+      id: this.data.id,
+      value: this.data.fieldValue,
+      defaultValue: this.data.defaultFieldValue || "",
+      multiline: this.data.multiLine,
+      password: this.hasFieldFlag(_util.AnnotationFieldFlag.PASSWORD),
+      charLimit: this.data.maxLen,
+      comb: this.data.comb,
+      editable: !this.data.readOnly,
+      hidden: this.data.hidden,
+      name: this.data.fieldName,
+      rect: this.data.rect,
+      actions: this.data.actions,
+      page: this.data.pageIndex,
+      strokeColor: this.data.borderColor,
+      fillColor: this.data.backgroundColor,
+      rotation: this.rotation,
+      type: "text"
     };
   }
 
 }
 
-exports.Linearization = Linearization;
+class ButtonWidgetAnnotation extends WidgetAnnotation {
+  constructor(params) {
+    super(params);
+    this.checkedAppearance = null;
+    this.uncheckedAppearance = null;
+    this.data.checkBox = !this.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !this.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+    this.data.radioButton = this.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !this.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+    this.data.pushButton = this.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+    this.data.isTooltipOnly = false;
 
-/***/ }),
-/* 12 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+    if (this.data.checkBox) {
+      this._processCheckBox(params);
+    } else if (this.data.radioButton) {
+      this._processRadioButton(params);
+    } else if (this.data.pushButton) {
+      this.data.hasOwnCanvas = true;
 
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.LZWStream = exports.StringStream = exports.StreamsSequenceStream = exports.Stream = exports.RunLengthStream = exports.PredictorStream = exports.NullStream = exports.FlateStream = exports.DecodeStream = exports.DecryptStream = exports.AsciiHexStream = exports.Ascii85Stream = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _core_utils = __w_pdfjs_require__(8);
-
-var Stream = function StreamClosure() {
-  function Stream(arrayBuffer, start, length, dict) {
-    this.bytes = arrayBuffer instanceof Uint8Array ? arrayBuffer : new Uint8Array(arrayBuffer);
-    this.start = start || 0;
-    this.pos = this.start;
-    this.end = start + length || this.bytes.length;
-    this.dict = dict;
-  }
-
-  Stream.prototype = {
-    get length() {
-      return this.end - this.start;
-    },
-
-    get isEmpty() {
-      return this.length === 0;
-    },
-
-    getByte: function Stream_getByte() {
-      if (this.pos >= this.end) {
-        return -1;
-      }
-
-      return this.bytes[this.pos++];
-    },
-    getUint16: function Stream_getUint16() {
-      var b0 = this.getByte();
-      var b1 = this.getByte();
-
-      if (b0 === -1 || b1 === -1) {
-        return -1;
-      }
-
-      return (b0 << 8) + b1;
-    },
-    getInt32: function Stream_getInt32() {
-      var b0 = this.getByte();
-      var b1 = this.getByte();
-      var b2 = this.getByte();
-      var b3 = this.getByte();
-      return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
-    },
-
-    getBytes(length, forceClamped = false) {
-      var bytes = this.bytes;
-      var pos = this.pos;
-      var strEnd = this.end;
-
-      if (!length) {
-        const subarray = bytes.subarray(pos, strEnd);
-        return forceClamped ? new Uint8ClampedArray(subarray) : subarray;
-      }
-
-      var end = pos + length;
-
-      if (end > strEnd) {
-        end = strEnd;
-      }
-
-      this.pos = end;
-      const subarray = bytes.subarray(pos, end);
-      return forceClamped ? new Uint8ClampedArray(subarray) : subarray;
-    },
-
-    peekByte: function Stream_peekByte() {
-      var peekedByte = this.getByte();
-
-      if (peekedByte !== -1) {
-        this.pos--;
-      }
-
-      return peekedByte;
-    },
-
-    peekBytes(length, forceClamped = false) {
-      var bytes = this.getBytes(length, forceClamped);
-      this.pos -= bytes.length;
-      return bytes;
-    },
-
-    getByteRange(begin, end) {
-      if (begin < 0) {
-        begin = 0;
-      }
-
-      if (end > this.end) {
-        end = this.end;
-      }
-
-      return this.bytes.subarray(begin, end);
-    },
-
-    skip: function Stream_skip(n) {
-      if (!n) {
-        n = 1;
-      }
-
-      this.pos += n;
-    },
-    reset: function Stream_reset() {
-      this.pos = this.start;
-    },
-    moveStart: function Stream_moveStart() {
-      this.start = this.pos;
-    },
-    makeSubStream: function Stream_makeSubStream(start, length, dict) {
-      return new Stream(this.bytes.buffer, start, length, dict);
-    }
-  };
-  return Stream;
-}();
-
-exports.Stream = Stream;
-
-var StringStream = function StringStreamClosure() {
-  function StringStream(str) {
-    const bytes = (0, _util.stringToBytes)(str);
-    Stream.call(this, bytes);
-  }
-
-  StringStream.prototype = Stream.prototype;
-  return StringStream;
-}();
-
-exports.StringStream = StringStream;
-
-var DecodeStream = function DecodeStreamClosure() {
-  var emptyBuffer = new Uint8Array(0);
-
-  function DecodeStream(maybeMinBufferLength) {
-    this._rawMinBufferLength = maybeMinBufferLength || 0;
-    this.pos = 0;
-    this.bufferLength = 0;
-    this.eof = false;
-    this.buffer = emptyBuffer;
-    this.minBufferLength = 512;
-
-    if (maybeMinBufferLength) {
-      while (this.minBufferLength < maybeMinBufferLength) {
-        this.minBufferLength *= 2;
-      }
+      this._processPushButton(params);
+    } else {
+      (0, _util.warn)("Invalid field flags for button widget annotation");
     }
   }
 
-  DecodeStream.prototype = {
-    get isEmpty() {
-      while (!this.eof && this.bufferLength === 0) {
-        this.readBlock();
-      }
+  async getOperatorList(evaluator, task, intent, renderForms, annotationStorage) {
+    if (this.data.pushButton) {
+      return super.getOperatorList(evaluator, task, intent, false, annotationStorage);
+    }
 
-      return this.bufferLength === 0;
-    },
+    let value = null;
+    let rotation = null;
 
-    ensureBuffer: function DecodeStream_ensureBuffer(requested) {
-      var buffer = this.buffer;
+    if (annotationStorage) {
+      const storageEntry = annotationStorage.get(this.data.id);
+      value = storageEntry ? storageEntry.value : null;
+      rotation = storageEntry ? storageEntry.rotation : null;
+    }
 
-      if (requested <= buffer.byteLength) {
-        return buffer;
-      }
+    if (value === null && this.appearance) {
+      return super.getOperatorList(evaluator, task, intent, renderForms, annotationStorage);
+    }
 
-      var size = this.minBufferLength;
-
-      while (size < requested) {
-        size *= 2;
-      }
-
-      var buffer2 = new Uint8Array(size);
-      buffer2.set(buffer);
-      return this.buffer = buffer2;
-    },
-    getByte: function DecodeStream_getByte() {
-      var pos = this.pos;
-
-      while (this.bufferLength <= pos) {
-        if (this.eof) {
-          return -1;
-        }
-
-        this.readBlock();
-      }
-
-      return this.buffer[this.pos++];
-    },
-    getUint16: function DecodeStream_getUint16() {
-      var b0 = this.getByte();
-      var b1 = this.getByte();
-
-      if (b0 === -1 || b1 === -1) {
-        return -1;
-      }
-
-      return (b0 << 8) + b1;
-    },
-    getInt32: function DecodeStream_getInt32() {
-      var b0 = this.getByte();
-      var b1 = this.getByte();
-      var b2 = this.getByte();
-      var b3 = this.getByte();
-      return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
-    },
-
-    getBytes(length, forceClamped = false) {
-      var end,
-          pos = this.pos;
-
-      if (length) {
-        this.ensureBuffer(pos + length);
-        end = pos + length;
-
-        while (!this.eof && this.bufferLength < end) {
-          this.readBlock();
-        }
-
-        var bufEnd = this.bufferLength;
-
-        if (end > bufEnd) {
-          end = bufEnd;
-        }
+    if (value === null || value === undefined) {
+      if (this.data.checkBox) {
+        value = this.data.fieldValue === this.data.exportValue;
       } else {
-        while (!this.eof) {
-          this.readBlock();
-        }
-
-        end = this.bufferLength;
-      }
-
-      this.pos = end;
-      const subarray = this.buffer.subarray(pos, end);
-      return forceClamped && !(subarray instanceof Uint8ClampedArray) ? new Uint8ClampedArray(subarray) : subarray;
-    },
-
-    peekByte: function DecodeStream_peekByte() {
-      var peekedByte = this.getByte();
-
-      if (peekedByte !== -1) {
-        this.pos--;
-      }
-
-      return peekedByte;
-    },
-
-    peekBytes(length, forceClamped = false) {
-      var bytes = this.getBytes(length, forceClamped);
-      this.pos -= bytes.length;
-      return bytes;
-    },
-
-    makeSubStream: function DecodeStream_makeSubStream(start, length, dict) {
-      var end = start + length;
-
-      while (this.bufferLength <= end && !this.eof) {
-        this.readBlock();
-      }
-
-      return new Stream(this.buffer, start, length, dict);
-    },
-
-    getByteRange(begin, end) {
-      (0, _util.unreachable)("Should not call DecodeStream.getByteRange");
-    },
-
-    skip: function DecodeStream_skip(n) {
-      if (!n) {
-        n = 1;
-      }
-
-      this.pos += n;
-    },
-    reset: function DecodeStream_reset() {
-      this.pos = 0;
-    },
-    getBaseStreams: function DecodeStream_getBaseStreams() {
-      if (this.str && this.str.getBaseStreams) {
-        return this.str.getBaseStreams();
-      }
-
-      return [];
-    }
-  };
-  return DecodeStream;
-}();
-
-exports.DecodeStream = DecodeStream;
-
-var StreamsSequenceStream = function StreamsSequenceStreamClosure() {
-  function StreamsSequenceStream(streams) {
-    this.streams = streams;
-    let maybeLength = 0;
-
-    for (let i = 0, ii = streams.length; i < ii; i++) {
-      const stream = streams[i];
-
-      if (stream instanceof DecodeStream) {
-        maybeLength += stream._rawMinBufferLength;
-      } else {
-        maybeLength += stream.length;
+        value = this.data.fieldValue === this.data.buttonValue;
       }
     }
 
-    DecodeStream.call(this, maybeLength);
-  }
+    const appearance = value ? this.checkedAppearance : this.uncheckedAppearance;
 
-  StreamsSequenceStream.prototype = Object.create(DecodeStream.prototype);
+    if (appearance) {
+      const savedAppearance = this.appearance;
 
-  StreamsSequenceStream.prototype.readBlock = function streamSequenceStreamReadBlock() {
-    var streams = this.streams;
+      const savedMatrix = appearance.dict.getArray("Matrix") || _util.IDENTITY_MATRIX;
 
-    if (streams.length === 0) {
-      this.eof = true;
-      return;
-    }
-
-    var stream = streams.shift();
-    var chunk = stream.getBytes();
-    var bufferLength = this.bufferLength;
-    var newLength = bufferLength + chunk.length;
-    var buffer = this.ensureBuffer(newLength);
-    buffer.set(chunk, bufferLength);
-    this.bufferLength = newLength;
-  };
-
-  StreamsSequenceStream.prototype.getBaseStreams = function StreamsSequenceStream_getBaseStreams() {
-    var baseStreams = [];
-
-    for (var i = 0, ii = this.streams.length; i < ii; i++) {
-      var stream = this.streams[i];
-
-      if (stream.getBaseStreams) {
-        baseStreams.push(...stream.getBaseStreams());
-      }
-    }
-
-    return baseStreams;
-  };
-
-  return StreamsSequenceStream;
-}();
-
-exports.StreamsSequenceStream = StreamsSequenceStream;
-
-var FlateStream = function FlateStreamClosure() {
-  var codeLenCodeMap = new Int32Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]);
-  var lengthDecode = new Int32Array([0x00003, 0x00004, 0x00005, 0x00006, 0x00007, 0x00008, 0x00009, 0x0000a, 0x1000b, 0x1000d, 0x1000f, 0x10011, 0x20013, 0x20017, 0x2001b, 0x2001f, 0x30023, 0x3002b, 0x30033, 0x3003b, 0x40043, 0x40053, 0x40063, 0x40073, 0x50083, 0x500a3, 0x500c3, 0x500e3, 0x00102, 0x00102, 0x00102]);
-  var distDecode = new Int32Array([0x00001, 0x00002, 0x00003, 0x00004, 0x10005, 0x10007, 0x20009, 0x2000d, 0x30011, 0x30019, 0x40021, 0x40031, 0x50041, 0x50061, 0x60081, 0x600c1, 0x70101, 0x70181, 0x80201, 0x80301, 0x90401, 0x90601, 0xa0801, 0xa0c01, 0xb1001, 0xb1801, 0xc2001, 0xc3001, 0xd4001, 0xd6001]);
-  var fixedLitCodeTab = [new Int32Array([0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0, 0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0, 0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0, 0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0, 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8, 0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8, 0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8, 0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8, 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4, 0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4, 0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4, 0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4, 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc, 0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec, 0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc, 0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc, 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2, 0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2, 0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2, 0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2, 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca, 0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea, 0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da, 0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa, 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6, 0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6, 0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6, 0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6, 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce, 0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee, 0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de, 0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe, 0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1, 0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1, 0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1, 0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1, 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9, 0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9, 0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9, 0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9, 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5, 0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5, 0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5, 0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5, 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd, 0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed, 0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd, 0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd, 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3, 0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3, 0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3, 0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3, 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb, 0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb, 0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db, 0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb, 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7, 0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7, 0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7, 0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7, 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf, 0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef, 0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df, 0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff]), 9];
-  var fixedDistCodeTab = [new Int32Array([0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c, 0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000, 0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d, 0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000]), 5];
-
-  function FlateStream(str, maybeLength) {
-    this.str = str;
-    this.dict = str.dict;
-    var cmf = str.getByte();
-    var flg = str.getByte();
-
-    if (cmf === -1 || flg === -1) {
-      throw new _util.FormatError(`Invalid header in flate stream: ${cmf}, ${flg}`);
-    }
-
-    if ((cmf & 0x0f) !== 0x08) {
-      throw new _util.FormatError(`Unknown compression method in flate stream: ${cmf}, ${flg}`);
-    }
-
-    if (((cmf << 8) + flg) % 31 !== 0) {
-      throw new _util.FormatError(`Bad FCHECK in flate stream: ${cmf}, ${flg}`);
-    }
-
-    if (flg & 0x20) {
-      throw new _util.FormatError(`FDICT bit set in flate stream: ${cmf}, ${flg}`);
-    }
-
-    this.codeSize = 0;
-    this.codeBuf = 0;
-    DecodeStream.call(this, maybeLength);
-  }
-
-  FlateStream.prototype = Object.create(DecodeStream.prototype);
-
-  FlateStream.prototype.getBits = function FlateStream_getBits(bits) {
-    var str = this.str;
-    var codeSize = this.codeSize;
-    var codeBuf = this.codeBuf;
-    var b;
-
-    while (codeSize < bits) {
-      if ((b = str.getByte()) === -1) {
-        throw new _util.FormatError("Bad encoding in flate stream");
+      if (rotation) {
+        appearance.dict.set("Matrix", this.getRotationMatrix(annotationStorage));
       }
 
-      codeBuf |= b << codeSize;
-      codeSize += 8;
+      this.appearance = appearance;
+      const operatorList = super.getOperatorList(evaluator, task, intent, renderForms, annotationStorage);
+      this.appearance = savedAppearance;
+      appearance.dict.set("Matrix", savedMatrix);
+      return operatorList;
     }
 
-    b = codeBuf & (1 << bits) - 1;
-    this.codeBuf = codeBuf >> bits;
-    this.codeSize = codeSize -= bits;
-    return b;
-  };
-
-  FlateStream.prototype.getCode = function FlateStream_getCode(table) {
-    var str = this.str;
-    var codes = table[0];
-    var maxLen = table[1];
-    var codeSize = this.codeSize;
-    var codeBuf = this.codeBuf;
-    var b;
-
-    while (codeSize < maxLen) {
-      if ((b = str.getByte()) === -1) {
-        break;
-      }
-
-      codeBuf |= b << codeSize;
-      codeSize += 8;
-    }
-
-    var code = codes[codeBuf & (1 << maxLen) - 1];
-    var codeLen = code >> 16;
-    var codeVal = code & 0xffff;
-
-    if (codeLen < 1 || codeSize < codeLen) {
-      throw new _util.FormatError("Bad encoding in flate stream");
-    }
-
-    this.codeBuf = codeBuf >> codeLen;
-    this.codeSize = codeSize - codeLen;
-    return codeVal;
-  };
-
-  FlateStream.prototype.generateHuffmanTable = function flateStreamGenerateHuffmanTable(lengths) {
-    var n = lengths.length;
-    var maxLen = 0;
-    var i;
-
-    for (i = 0; i < n; ++i) {
-      if (lengths[i] > maxLen) {
-        maxLen = lengths[i];
-      }
-    }
-
-    var size = 1 << maxLen;
-    var codes = new Int32Array(size);
-
-    for (var len = 1, code = 0, skip = 2; len <= maxLen; ++len, code <<= 1, skip <<= 1) {
-      for (var val = 0; val < n; ++val) {
-        if (lengths[val] === len) {
-          var code2 = 0;
-          var t = code;
-
-          for (i = 0; i < len; ++i) {
-            code2 = code2 << 1 | t & 1;
-            t >>= 1;
-          }
-
-          for (i = code2; i < size; i += skip) {
-            codes[i] = len << 16 | val;
-          }
-
-          ++code;
-        }
-      }
-    }
-
-    return [codes, maxLen];
-  };
-
-  FlateStream.prototype.readBlock = function FlateStream_readBlock() {
-    var buffer, len;
-    var str = this.str;
-    var hdr = this.getBits(3);
-
-    if (hdr & 1) {
-      this.eof = true;
-    }
-
-    hdr >>= 1;
-
-    if (hdr === 0) {
-      var b;
-
-      if ((b = str.getByte()) === -1) {
-        throw new _util.FormatError("Bad block header in flate stream");
-      }
-
-      var blockLen = b;
-
-      if ((b = str.getByte()) === -1) {
-        throw new _util.FormatError("Bad block header in flate stream");
-      }
-
-      blockLen |= b << 8;
-
-      if ((b = str.getByte()) === -1) {
-        throw new _util.FormatError("Bad block header in flate stream");
-      }
-
-      var check = b;
-
-      if ((b = str.getByte()) === -1) {
-        throw new _util.FormatError("Bad block header in flate stream");
-      }
-
-      check |= b << 8;
-
-      if (check !== (~blockLen & 0xffff) && (blockLen !== 0 || check !== 0)) {
-        throw new _util.FormatError("Bad uncompressed block length in flate stream");
-      }
-
-      this.codeBuf = 0;
-      this.codeSize = 0;
-      const bufferLength = this.bufferLength,
-            end = bufferLength + blockLen;
-      buffer = this.ensureBuffer(end);
-      this.bufferLength = end;
-
-      if (blockLen === 0) {
-        if (str.peekByte() === -1) {
-          this.eof = true;
-        }
-      } else {
-        const block = str.getBytes(blockLen);
-        buffer.set(block, bufferLength);
-
-        if (block.length < blockLen) {
-          this.eof = true;
-        }
-      }
-
-      return;
-    }
-
-    var litCodeTable;
-    var distCodeTable;
-
-    if (hdr === 1) {
-      litCodeTable = fixedLitCodeTab;
-      distCodeTable = fixedDistCodeTab;
-    } else if (hdr === 2) {
-      var numLitCodes = this.getBits(5) + 257;
-      var numDistCodes = this.getBits(5) + 1;
-      var numCodeLenCodes = this.getBits(4) + 4;
-      var codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
-      var i;
-
-      for (i = 0; i < numCodeLenCodes; ++i) {
-        codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
-      }
-
-      var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
-      len = 0;
-      i = 0;
-      var codes = numLitCodes + numDistCodes;
-      var codeLengths = new Uint8Array(codes);
-      var bitsLength, bitsOffset, what;
-
-      while (i < codes) {
-        var code = this.getCode(codeLenCodeTab);
-
-        if (code === 16) {
-          bitsLength = 2;
-          bitsOffset = 3;
-          what = len;
-        } else if (code === 17) {
-          bitsLength = 3;
-          bitsOffset = 3;
-          what = len = 0;
-        } else if (code === 18) {
-          bitsLength = 7;
-          bitsOffset = 11;
-          what = len = 0;
-        } else {
-          codeLengths[i++] = len = code;
-          continue;
-        }
-
-        var repeatLength = this.getBits(bitsLength) + bitsOffset;
-
-        while (repeatLength-- > 0) {
-          codeLengths[i++] = what;
-        }
-      }
-
-      litCodeTable = this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
-      distCodeTable = this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
-    } else {
-      throw new _util.FormatError("Unknown block type in flate stream");
-    }
-
-    buffer = this.buffer;
-    var limit = buffer ? buffer.length : 0;
-    var pos = this.bufferLength;
-
-    while (true) {
-      var code1 = this.getCode(litCodeTable);
-
-      if (code1 < 256) {
-        if (pos + 1 >= limit) {
-          buffer = this.ensureBuffer(pos + 1);
-          limit = buffer.length;
-        }
-
-        buffer[pos++] = code1;
-        continue;
-      }
-
-      if (code1 === 256) {
-        this.bufferLength = pos;
-        return;
-      }
-
-      code1 -= 257;
-      code1 = lengthDecode[code1];
-      var code2 = code1 >> 16;
-
-      if (code2 > 0) {
-        code2 = this.getBits(code2);
-      }
-
-      len = (code1 & 0xffff) + code2;
-      code1 = this.getCode(distCodeTable);
-      code1 = distDecode[code1];
-      code2 = code1 >> 16;
-
-      if (code2 > 0) {
-        code2 = this.getBits(code2);
-      }
-
-      var dist = (code1 & 0xffff) + code2;
-
-      if (pos + len >= limit) {
-        buffer = this.ensureBuffer(pos + len);
-        limit = buffer.length;
-      }
-
-      for (var k = 0; k < len; ++k, ++pos) {
-        buffer[pos] = buffer[pos - dist];
-      }
-    }
-  };
-
-  return FlateStream;
-}();
-
-exports.FlateStream = FlateStream;
-
-var PredictorStream = function PredictorStreamClosure() {
-  function PredictorStream(str, maybeLength, params) {
-    if (!(0, _primitives.isDict)(params)) {
-      return str;
-    }
-
-    var predictor = this.predictor = params.get("Predictor") || 1;
-
-    if (predictor <= 1) {
-      return str;
-    }
-
-    if (predictor !== 2 && (predictor < 10 || predictor > 15)) {
-      throw new _util.FormatError(`Unsupported predictor: ${predictor}`);
-    }
-
-    if (predictor === 2) {
-      this.readBlock = this.readBlockTiff;
-    } else {
-      this.readBlock = this.readBlockPng;
-    }
-
-    this.str = str;
-    this.dict = str.dict;
-    var colors = this.colors = params.get("Colors") || 1;
-    var bits = this.bits = params.get("BitsPerComponent") || 8;
-    var columns = this.columns = params.get("Columns") || 1;
-    this.pixBytes = colors * bits + 7 >> 3;
-    this.rowBytes = columns * colors * bits + 7 >> 3;
-    DecodeStream.call(this, maybeLength);
-    return this;
-  }
-
-  PredictorStream.prototype = Object.create(DecodeStream.prototype);
-
-  PredictorStream.prototype.readBlockTiff = function predictorStreamReadBlockTiff() {
-    var rowBytes = this.rowBytes;
-    var bufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(bufferLength + rowBytes);
-    var bits = this.bits;
-    var colors = this.colors;
-    var rawBytes = this.str.getBytes(rowBytes);
-    this.eof = !rawBytes.length;
-
-    if (this.eof) {
-      return;
-    }
-
-    var inbuf = 0,
-        outbuf = 0;
-    var inbits = 0,
-        outbits = 0;
-    var pos = bufferLength;
-    var i;
-
-    if (bits === 1 && colors === 1) {
-      for (i = 0; i < rowBytes; ++i) {
-        var c = rawBytes[i] ^ inbuf;
-        c ^= c >> 1;
-        c ^= c >> 2;
-        c ^= c >> 4;
-        inbuf = (c & 1) << 7;
-        buffer[pos++] = c;
-      }
-    } else if (bits === 8) {
-      for (i = 0; i < colors; ++i) {
-        buffer[pos++] = rawBytes[i];
-      }
-
-      for (; i < rowBytes; ++i) {
-        buffer[pos] = buffer[pos - colors] + rawBytes[i];
-        pos++;
-      }
-    } else if (bits === 16) {
-      var bytesPerPixel = colors * 2;
-
-      for (i = 0; i < bytesPerPixel; ++i) {
-        buffer[pos++] = rawBytes[i];
-      }
-
-      for (; i < rowBytes; i += 2) {
-        var sum = ((rawBytes[i] & 0xff) << 8) + (rawBytes[i + 1] & 0xff) + ((buffer[pos - bytesPerPixel] & 0xff) << 8) + (buffer[pos - bytesPerPixel + 1] & 0xff);
-        buffer[pos++] = sum >> 8 & 0xff;
-        buffer[pos++] = sum & 0xff;
-      }
-    } else {
-      var compArray = new Uint8Array(colors + 1);
-      var bitMask = (1 << bits) - 1;
-      var j = 0,
-          k = bufferLength;
-      var columns = this.columns;
-
-      for (i = 0; i < columns; ++i) {
-        for (var kk = 0; kk < colors; ++kk) {
-          if (inbits < bits) {
-            inbuf = inbuf << 8 | rawBytes[j++] & 0xff;
-            inbits += 8;
-          }
-
-          compArray[kk] = compArray[kk] + (inbuf >> inbits - bits) & bitMask;
-          inbits -= bits;
-          outbuf = outbuf << bits | compArray[kk];
-          outbits += bits;
-
-          if (outbits >= 8) {
-            buffer[k++] = outbuf >> outbits - 8 & 0xff;
-            outbits -= 8;
-          }
-        }
-      }
-
-      if (outbits > 0) {
-        buffer[k++] = (outbuf << 8 - outbits) + (inbuf & (1 << 8 - outbits) - 1);
-      }
-    }
-
-    this.bufferLength += rowBytes;
-  };
-
-  PredictorStream.prototype.readBlockPng = function predictorStreamReadBlockPng() {
-    var rowBytes = this.rowBytes;
-    var pixBytes = this.pixBytes;
-    var predictor = this.str.getByte();
-    var rawBytes = this.str.getBytes(rowBytes);
-    this.eof = !rawBytes.length;
-
-    if (this.eof) {
-      return;
-    }
-
-    var bufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(bufferLength + rowBytes);
-    var prevRow = buffer.subarray(bufferLength - rowBytes, bufferLength);
-
-    if (prevRow.length === 0) {
-      prevRow = new Uint8Array(rowBytes);
-    }
-
-    var i,
-        j = bufferLength,
-        up,
-        c;
-
-    switch (predictor) {
-      case 0:
-        for (i = 0; i < rowBytes; ++i) {
-          buffer[j++] = rawBytes[i];
-        }
-
-        break;
-
-      case 1:
-        for (i = 0; i < pixBytes; ++i) {
-          buffer[j++] = rawBytes[i];
-        }
-
-        for (; i < rowBytes; ++i) {
-          buffer[j] = buffer[j - pixBytes] + rawBytes[i] & 0xff;
-          j++;
-        }
-
-        break;
-
-      case 2:
-        for (i = 0; i < rowBytes; ++i) {
-          buffer[j++] = prevRow[i] + rawBytes[i] & 0xff;
-        }
-
-        break;
-
-      case 3:
-        for (i = 0; i < pixBytes; ++i) {
-          buffer[j++] = (prevRow[i] >> 1) + rawBytes[i];
-        }
-
-        for (; i < rowBytes; ++i) {
-          buffer[j] = (prevRow[i] + buffer[j - pixBytes] >> 1) + rawBytes[i] & 0xff;
-          j++;
-        }
-
-        break;
-
-      case 4:
-        for (i = 0; i < pixBytes; ++i) {
-          up = prevRow[i];
-          c = rawBytes[i];
-          buffer[j++] = up + c;
-        }
-
-        for (; i < rowBytes; ++i) {
-          up = prevRow[i];
-          var upLeft = prevRow[i - pixBytes];
-          var left = buffer[j - pixBytes];
-          var p = left + up - upLeft;
-          var pa = p - left;
-
-          if (pa < 0) {
-            pa = -pa;
-          }
-
-          var pb = p - up;
-
-          if (pb < 0) {
-            pb = -pb;
-          }
-
-          var pc = p - upLeft;
-
-          if (pc < 0) {
-            pc = -pc;
-          }
-
-          c = rawBytes[i];
-
-          if (pa <= pb && pa <= pc) {
-            buffer[j++] = left + c;
-          } else if (pb <= pc) {
-            buffer[j++] = up + c;
-          } else {
-            buffer[j++] = upLeft + c;
-          }
-        }
-
-        break;
-
-      default:
-        throw new _util.FormatError(`Unsupported predictor: ${predictor}`);
-    }
-
-    this.bufferLength += rowBytes;
-  };
-
-  return PredictorStream;
-}();
-
-exports.PredictorStream = PredictorStream;
-
-var DecryptStream = function DecryptStreamClosure() {
-  function DecryptStream(str, maybeLength, decrypt) {
-    this.str = str;
-    this.dict = str.dict;
-    this.decrypt = decrypt;
-    this.nextChunk = null;
-    this.initialized = false;
-    DecodeStream.call(this, maybeLength);
-  }
-
-  var chunkSize = 512;
-  DecryptStream.prototype = Object.create(DecodeStream.prototype);
-
-  DecryptStream.prototype.readBlock = function DecryptStream_readBlock() {
-    var chunk;
-
-    if (this.initialized) {
-      chunk = this.nextChunk;
-    } else {
-      chunk = this.str.getBytes(chunkSize);
-      this.initialized = true;
-    }
-
-    if (!chunk || chunk.length === 0) {
-      this.eof = true;
-      return;
-    }
-
-    this.nextChunk = this.str.getBytes(chunkSize);
-    var hasMoreData = this.nextChunk && this.nextChunk.length > 0;
-    var decrypt = this.decrypt;
-    chunk = decrypt(chunk, !hasMoreData);
-    var bufferLength = this.bufferLength;
-    var i,
-        n = chunk.length;
-    var buffer = this.ensureBuffer(bufferLength + n);
-
-    for (i = 0; i < n; i++) {
-      buffer[bufferLength++] = chunk[i];
-    }
-
-    this.bufferLength = bufferLength;
-  };
-
-  return DecryptStream;
-}();
-
-exports.DecryptStream = DecryptStream;
-
-var Ascii85Stream = function Ascii85StreamClosure() {
-  function Ascii85Stream(str, maybeLength) {
-    this.str = str;
-    this.dict = str.dict;
-    this.input = new Uint8Array(5);
-
-    if (maybeLength) {
-      maybeLength = 0.8 * maybeLength;
-    }
-
-    DecodeStream.call(this, maybeLength);
-  }
-
-  Ascii85Stream.prototype = Object.create(DecodeStream.prototype);
-
-  Ascii85Stream.prototype.readBlock = function Ascii85Stream_readBlock() {
-    var TILDA_CHAR = 0x7e;
-    var Z_LOWER_CHAR = 0x7a;
-    var EOF = -1;
-    var str = this.str;
-    var c = str.getByte();
-
-    while ((0, _core_utils.isWhiteSpace)(c)) {
-      c = str.getByte();
-    }
-
-    if (c === EOF || c === TILDA_CHAR) {
-      this.eof = true;
-      return;
-    }
-
-    var bufferLength = this.bufferLength,
-        buffer;
-    var i;
-
-    if (c === Z_LOWER_CHAR) {
-      buffer = this.ensureBuffer(bufferLength + 4);
-
-      for (i = 0; i < 4; ++i) {
-        buffer[bufferLength + i] = 0;
-      }
-
-      this.bufferLength += 4;
-    } else {
-      var input = this.input;
-      input[0] = c;
-
-      for (i = 1; i < 5; ++i) {
-        c = str.getByte();
-
-        while ((0, _core_utils.isWhiteSpace)(c)) {
-          c = str.getByte();
-        }
-
-        input[i] = c;
-
-        if (c === EOF || c === TILDA_CHAR) {
-          break;
-        }
-      }
-
-      buffer = this.ensureBuffer(bufferLength + i - 1);
-      this.bufferLength += i - 1;
-
-      if (i < 5) {
-        for (; i < 5; ++i) {
-          input[i] = 0x21 + 84;
-        }
-
-        this.eof = true;
-      }
-
-      var t = 0;
-
-      for (i = 0; i < 5; ++i) {
-        t = t * 85 + (input[i] - 0x21);
-      }
-
-      for (i = 3; i >= 0; --i) {
-        buffer[bufferLength + i] = t & 0xff;
-        t >>= 8;
-      }
-    }
-  };
-
-  return Ascii85Stream;
-}();
-
-exports.Ascii85Stream = Ascii85Stream;
-
-var AsciiHexStream = function AsciiHexStreamClosure() {
-  function AsciiHexStream(str, maybeLength) {
-    this.str = str;
-    this.dict = str.dict;
-    this.firstDigit = -1;
-
-    if (maybeLength) {
-      maybeLength = 0.5 * maybeLength;
-    }
-
-    DecodeStream.call(this, maybeLength);
-  }
-
-  AsciiHexStream.prototype = Object.create(DecodeStream.prototype);
-
-  AsciiHexStream.prototype.readBlock = function AsciiHexStream_readBlock() {
-    var UPSTREAM_BLOCK_SIZE = 8000;
-    var bytes = this.str.getBytes(UPSTREAM_BLOCK_SIZE);
-
-    if (!bytes.length) {
-      this.eof = true;
-      return;
-    }
-
-    var maxDecodeLength = bytes.length + 1 >> 1;
-    var buffer = this.ensureBuffer(this.bufferLength + maxDecodeLength);
-    var bufferLength = this.bufferLength;
-    var firstDigit = this.firstDigit;
-
-    for (var i = 0, ii = bytes.length; i < ii; i++) {
-      var ch = bytes[i],
-          digit;
-
-      if (ch >= 0x30 && ch <= 0x39) {
-        digit = ch & 0x0f;
-      } else if (ch >= 0x41 && ch <= 0x46 || ch >= 0x61 && ch <= 0x66) {
-        digit = (ch & 0x0f) + 9;
-      } else if (ch === 0x3e) {
-        this.eof = true;
-        break;
-      } else {
-        continue;
-      }
-
-      if (firstDigit < 0) {
-        firstDigit = digit;
-      } else {
-        buffer[bufferLength++] = firstDigit << 4 | digit;
-        firstDigit = -1;
-      }
-    }
-
-    if (firstDigit >= 0 && this.eof) {
-      buffer[bufferLength++] = firstDigit << 4;
-      firstDigit = -1;
-    }
-
-    this.firstDigit = firstDigit;
-    this.bufferLength = bufferLength;
-  };
-
-  return AsciiHexStream;
-}();
-
-exports.AsciiHexStream = AsciiHexStream;
-
-var RunLengthStream = function RunLengthStreamClosure() {
-  function RunLengthStream(str, maybeLength) {
-    this.str = str;
-    this.dict = str.dict;
-    DecodeStream.call(this, maybeLength);
-  }
-
-  RunLengthStream.prototype = Object.create(DecodeStream.prototype);
-
-  RunLengthStream.prototype.readBlock = function RunLengthStream_readBlock() {
-    var repeatHeader = this.str.getBytes(2);
-
-    if (!repeatHeader || repeatHeader.length < 2 || repeatHeader[0] === 128) {
-      this.eof = true;
-      return;
-    }
-
-    var buffer;
-    var bufferLength = this.bufferLength;
-    var n = repeatHeader[0];
-
-    if (n < 128) {
-      buffer = this.ensureBuffer(bufferLength + n + 1);
-      buffer[bufferLength++] = repeatHeader[1];
-
-      if (n > 0) {
-        var source = this.str.getBytes(n);
-        buffer.set(source, bufferLength);
-        bufferLength += n;
-      }
-    } else {
-      n = 257 - n;
-      var b = repeatHeader[1];
-      buffer = this.ensureBuffer(bufferLength + n + 1);
-
-      for (var i = 0; i < n; i++) {
-        buffer[bufferLength++] = b;
-      }
-    }
-
-    this.bufferLength = bufferLength;
-  };
-
-  return RunLengthStream;
-}();
-
-exports.RunLengthStream = RunLengthStream;
-
-var LZWStream = function LZWStreamClosure() {
-  function LZWStream(str, maybeLength, earlyChange) {
-    this.str = str;
-    this.dict = str.dict;
-    this.cachedData = 0;
-    this.bitsCached = 0;
-    var maxLzwDictionarySize = 4096;
-    var lzwState = {
-      earlyChange,
-      codeLength: 9,
-      nextCode: 258,
-      dictionaryValues: new Uint8Array(maxLzwDictionarySize),
-      dictionaryLengths: new Uint16Array(maxLzwDictionarySize),
-      dictionaryPrevCodes: new Uint16Array(maxLzwDictionarySize),
-      currentSequence: new Uint8Array(maxLzwDictionarySize),
-      currentSequenceLength: 0
+    return {
+      opList: new _operator_list.OperatorList(),
+      separateForm: false,
+      separateCanvas: false
     };
-
-    for (var i = 0; i < 256; ++i) {
-      lzwState.dictionaryValues[i] = i;
-      lzwState.dictionaryLengths[i] = 1;
-    }
-
-    this.lzwState = lzwState;
-    DecodeStream.call(this, maybeLength);
   }
 
-  LZWStream.prototype = Object.create(DecodeStream.prototype);
+  async save(evaluator, task, annotationStorage) {
+    if (this.data.checkBox) {
+      return this._saveCheckbox(evaluator, task, annotationStorage);
+    }
 
-  LZWStream.prototype.readBits = function LZWStream_readBits(n) {
-    var bitsCached = this.bitsCached;
-    var cachedData = this.cachedData;
+    if (this.data.radioButton) {
+      return this._saveRadioButton(evaluator, task, annotationStorage);
+    }
 
-    while (bitsCached < n) {
-      var c = this.str.getByte();
+    return null;
+  }
 
-      if (c === -1) {
-        this.eof = true;
+  async _saveCheckbox(evaluator, task, annotationStorage) {
+    if (!annotationStorage) {
+      return null;
+    }
+
+    const storageEntry = annotationStorage.get(this.data.id);
+    let rotation = storageEntry && storageEntry.rotation;
+    let value = storageEntry && storageEntry.value;
+
+    if (rotation === undefined) {
+      if (value === undefined) {
         return null;
       }
 
-      cachedData = cachedData << 8 | c;
-      bitsCached += 8;
+      const defaultValue = this.data.fieldValue === this.data.exportValue;
+
+      if (defaultValue === value) {
+        return null;
+      }
     }
 
-    this.bitsCached = bitsCached -= n;
-    this.cachedData = cachedData;
-    this.lastCode = null;
-    return cachedData >>> bitsCached & (1 << n) - 1;
-  };
+    const dict = evaluator.xref.fetchIfRef(this.ref);
 
-  LZWStream.prototype.readBlock = function LZWStream_readBlock() {
-    var blockSize = 512;
-    var estimatedDecodedSize = blockSize * 2,
-        decodedSizeDelta = blockSize;
-    var i, j, q;
-    var lzwState = this.lzwState;
+    if (!(dict instanceof _primitives.Dict)) {
+      return null;
+    }
 
-    if (!lzwState) {
+    if (rotation === undefined) {
+      rotation = this.rotation;
+    }
+
+    if (value === undefined) {
+      value = this.data.fieldValue === this.data.exportValue;
+    }
+
+    const xfa = {
+      path: (0, _util.stringToPDFString)(dict.get("T") || ""),
+      value: value ? this.data.exportValue : ""
+    };
+
+    const name = _primitives.Name.get(value ? this.data.exportValue : "Off");
+
+    dict.set("V", name);
+    dict.set("AS", name);
+    dict.set("M", `D:${(0, _util.getModificationDate)()}`);
+
+    const maybeMK = this._getMKDict(rotation);
+
+    if (maybeMK) {
+      dict.set("MK", maybeMK);
+    }
+
+    const encrypt = evaluator.xref.encrypt;
+    let originalTransform = null;
+
+    if (encrypt) {
+      originalTransform = encrypt.createCipherTransform(this.ref.num, this.ref.gen);
+    }
+
+    const buffer = [`${this.ref.num} ${this.ref.gen} obj\n`];
+    (0, _writer.writeDict)(dict, buffer, originalTransform);
+    buffer.push("\nendobj\n");
+    return [{
+      ref: this.ref,
+      data: buffer.join(""),
+      xfa
+    }];
+  }
+
+  async _saveRadioButton(evaluator, task, annotationStorage) {
+    if (!annotationStorage) {
+      return null;
+    }
+
+    const storageEntry = annotationStorage.get(this.data.id);
+    let rotation = storageEntry && storageEntry.rotation;
+    let value = storageEntry && storageEntry.value;
+
+    if (rotation === undefined) {
+      if (value === undefined) {
+        return null;
+      }
+
+      const defaultValue = this.data.fieldValue === this.data.buttonValue;
+
+      if (defaultValue === value) {
+        return null;
+      }
+    }
+
+    const dict = evaluator.xref.fetchIfRef(this.ref);
+
+    if (!(dict instanceof _primitives.Dict)) {
+      return null;
+    }
+
+    if (value === undefined) {
+      value = this.data.fieldValue === this.data.buttonValue;
+    }
+
+    if (rotation === undefined) {
+      rotation = this.rotation;
+    }
+
+    const xfa = {
+      path: (0, _util.stringToPDFString)(dict.get("T") || ""),
+      value: value ? this.data.buttonValue : ""
+    };
+
+    const name = _primitives.Name.get(value ? this.data.buttonValue : "Off");
+
+    let parentBuffer = null;
+    const encrypt = evaluator.xref.encrypt;
+
+    if (value) {
+      if (this.parent instanceof _primitives.Ref) {
+        const parent = evaluator.xref.fetch(this.parent);
+        let parentTransform = null;
+
+        if (encrypt) {
+          parentTransform = encrypt.createCipherTransform(this.parent.num, this.parent.gen);
+        }
+
+        parent.set("V", name);
+        parentBuffer = [`${this.parent.num} ${this.parent.gen} obj\n`];
+        (0, _writer.writeDict)(parent, parentBuffer, parentTransform);
+        parentBuffer.push("\nendobj\n");
+      } else if (this.parent instanceof _primitives.Dict) {
+        this.parent.set("V", name);
+      }
+    }
+
+    dict.set("AS", name);
+    dict.set("M", `D:${(0, _util.getModificationDate)()}`);
+
+    const maybeMK = this._getMKDict(rotation);
+
+    if (maybeMK) {
+      dict.set("MK", maybeMK);
+    }
+
+    let originalTransform = null;
+
+    if (encrypt) {
+      originalTransform = encrypt.createCipherTransform(this.ref.num, this.ref.gen);
+    }
+
+    const buffer = [`${this.ref.num} ${this.ref.gen} obj\n`];
+    (0, _writer.writeDict)(dict, buffer, originalTransform);
+    buffer.push("\nendobj\n");
+    const newRefs = [{
+      ref: this.ref,
+      data: buffer.join(""),
+      xfa
+    }];
+
+    if (parentBuffer !== null) {
+      newRefs.push({
+        ref: this.parent,
+        data: parentBuffer.join(""),
+        xfa: null
+      });
+    }
+
+    return newRefs;
+  }
+
+  _getDefaultCheckedAppearance(params, type) {
+    const width = this.data.rect[2] - this.data.rect[0];
+    const height = this.data.rect[3] - this.data.rect[1];
+    const bbox = [0, 0, width, height];
+    const FONT_RATIO = 0.8;
+    const fontSize = Math.min(width, height) * FONT_RATIO;
+    let metrics, char;
+
+    if (type === "check") {
+      metrics = {
+        width: 0.755 * fontSize,
+        height: 0.705 * fontSize
+      };
+      char = "\x33";
+    } else if (type === "disc") {
+      metrics = {
+        width: 0.791 * fontSize,
+        height: 0.705 * fontSize
+      };
+      char = "\x6C";
+    } else {
+      (0, _util.unreachable)(`_getDefaultCheckedAppearance - unsupported type: ${type}`);
+    }
+
+    const xShift = (0, _core_utils.numberToString)((width - metrics.width) / 2);
+    const yShift = (0, _core_utils.numberToString)((height - metrics.height) / 2);
+    const appearance = `q BT /PdfJsZaDb ${fontSize} Tf 0 g ${xShift} ${yShift} Td (${char}) Tj ET Q`;
+    const appearanceStreamDict = new _primitives.Dict(params.xref);
+    appearanceStreamDict.set("FormType", 1);
+    appearanceStreamDict.set("Subtype", _primitives.Name.get("Form"));
+    appearanceStreamDict.set("Type", _primitives.Name.get("XObject"));
+    appearanceStreamDict.set("BBox", bbox);
+    appearanceStreamDict.set("Matrix", [1, 0, 0, 1, 0, 0]);
+    appearanceStreamDict.set("Length", appearance.length);
+    const resources = new _primitives.Dict(params.xref);
+    const font = new _primitives.Dict(params.xref);
+    font.set("PdfJsZaDb", this.fallbackFontDict);
+    resources.set("Font", font);
+    appearanceStreamDict.set("Resources", resources);
+    this.checkedAppearance = new _stream.StringStream(appearance);
+    this.checkedAppearance.dict = appearanceStreamDict;
+
+    this._streams.push(this.checkedAppearance);
+  }
+
+  _processCheckBox(params) {
+    const customAppearance = params.dict.get("AP");
+
+    if (!(customAppearance instanceof _primitives.Dict)) {
       return;
     }
 
-    var earlyChange = lzwState.earlyChange;
-    var nextCode = lzwState.nextCode;
-    var dictionaryValues = lzwState.dictionaryValues;
-    var dictionaryLengths = lzwState.dictionaryLengths;
-    var dictionaryPrevCodes = lzwState.dictionaryPrevCodes;
-    var codeLength = lzwState.codeLength;
-    var prevCode = lzwState.prevCode;
-    var currentSequence = lzwState.currentSequence;
-    var currentSequenceLength = lzwState.currentSequenceLength;
-    var decodedLength = 0;
-    var currentBufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+    const normalAppearance = customAppearance.get("N");
 
-    for (i = 0; i < blockSize; i++) {
-      var code = this.readBits(codeLength);
-      var hasPrev = currentSequenceLength > 0;
+    if (!(normalAppearance instanceof _primitives.Dict)) {
+      return;
+    }
 
-      if (code < 256) {
-        currentSequence[0] = code;
-        currentSequenceLength = 1;
-      } else if (code >= 258) {
-        if (code < nextCode) {
-          currentSequenceLength = dictionaryLengths[code];
+    const asValue = this._decodeFormValue(params.dict.get("AS"));
 
-          for (j = currentSequenceLength - 1, q = code; j >= 0; j--) {
-            currentSequence[j] = dictionaryValues[q];
-            q = dictionaryPrevCodes[q];
-          }
-        } else {
-          currentSequence[currentSequenceLength++] = currentSequence[0];
-        }
-      } else if (code === 256) {
-        codeLength = 9;
-        nextCode = 258;
-        currentSequenceLength = 0;
-        continue;
+    if (typeof asValue === "string") {
+      this.data.fieldValue = asValue;
+    }
+
+    const yes = this.data.fieldValue !== null && this.data.fieldValue !== "Off" ? this.data.fieldValue : "Yes";
+    const exportValues = normalAppearance.getKeys();
+
+    if (exportValues.length === 0) {
+      exportValues.push("Off", yes);
+    } else if (exportValues.length === 1) {
+      if (exportValues[0] === "Off") {
+        exportValues.push(yes);
       } else {
-        this.eof = true;
-        delete this.lzwState;
-        break;
+        exportValues.unshift("Off");
       }
+    } else if (exportValues.includes(yes)) {
+      exportValues.length = 0;
+      exportValues.push("Off", yes);
+    } else {
+      const otherYes = exportValues.find(v => v !== "Off");
+      exportValues.length = 0;
+      exportValues.push("Off", otherYes);
+    }
 
-      if (hasPrev) {
-        dictionaryPrevCodes[nextCode] = prevCode;
-        dictionaryLengths[nextCode] = dictionaryLengths[prevCode] + 1;
-        dictionaryValues[nextCode] = currentSequence[0];
-        nextCode++;
-        codeLength = nextCode + earlyChange & nextCode + earlyChange - 1 ? codeLength : Math.min(Math.log(nextCode + earlyChange) / 0.6931471805599453 + 1, 12) | 0;
-      }
+    if (!exportValues.includes(this.data.fieldValue)) {
+      this.data.fieldValue = "Off";
+    }
 
-      prevCode = code;
-      decodedLength += currentSequenceLength;
+    this.data.exportValue = exportValues[1];
+    this.checkedAppearance = normalAppearance.get(this.data.exportValue) || null;
+    this.uncheckedAppearance = normalAppearance.get("Off") || null;
 
-      if (estimatedDecodedSize < decodedLength) {
-        do {
-          estimatedDecodedSize += decodedSizeDelta;
-        } while (estimatedDecodedSize < decodedLength);
+    if (this.checkedAppearance) {
+      this._streams.push(this.checkedAppearance);
+    } else {
+      this._getDefaultCheckedAppearance(params, "check");
+    }
 
-        buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
-      }
+    if (this.uncheckedAppearance) {
+      this._streams.push(this.uncheckedAppearance);
+    }
 
-      for (j = 0; j < currentSequenceLength; j++) {
-        buffer[currentBufferLength++] = currentSequence[j];
+    this._fallbackFontDict = this.fallbackFontDict;
+  }
+
+  _processRadioButton(params) {
+    this.data.fieldValue = this.data.buttonValue = null;
+    const fieldParent = params.dict.get("Parent");
+
+    if (fieldParent instanceof _primitives.Dict) {
+      this.parent = params.dict.getRaw("Parent");
+      const fieldParentValue = fieldParent.get("V");
+
+      if (fieldParentValue instanceof _primitives.Name) {
+        this.data.fieldValue = this._decodeFormValue(fieldParentValue);
       }
     }
 
-    lzwState.nextCode = nextCode;
-    lzwState.codeLength = codeLength;
-    lzwState.prevCode = prevCode;
-    lzwState.currentSequenceLength = currentSequenceLength;
-    this.bufferLength = currentBufferLength;
-  };
+    const appearanceStates = params.dict.get("AP");
 
-  return LZWStream;
-}();
+    if (!(appearanceStates instanceof _primitives.Dict)) {
+      return;
+    }
 
-exports.LZWStream = LZWStream;
+    const normalAppearance = appearanceStates.get("N");
 
-var NullStream = function NullStreamClosure() {
-  function NullStream() {
-    Stream.call(this, new Uint8Array(0));
+    if (!(normalAppearance instanceof _primitives.Dict)) {
+      return;
+    }
+
+    for (const key of normalAppearance.getKeys()) {
+      if (key !== "Off") {
+        this.data.buttonValue = this._decodeFormValue(key);
+        break;
+      }
+    }
+
+    this.checkedAppearance = normalAppearance.get(this.data.buttonValue) || null;
+    this.uncheckedAppearance = normalAppearance.get("Off") || null;
+
+    if (this.checkedAppearance) {
+      this._streams.push(this.checkedAppearance);
+    } else {
+      this._getDefaultCheckedAppearance(params, "disc");
+    }
+
+    if (this.uncheckedAppearance) {
+      this._streams.push(this.uncheckedAppearance);
+    }
+
+    this._fallbackFontDict = this.fallbackFontDict;
   }
 
-  NullStream.prototype = Stream.prototype;
-  return NullStream;
-}();
+  _processPushButton(params) {
+    if (!params.dict.has("A") && !params.dict.has("AA") && !this.data.alternativeText) {
+      (0, _util.warn)("Push buttons without action dictionaries are not supported");
+      return;
+    }
 
-exports.NullStream = NullStream;
+    this.data.isTooltipOnly = !params.dict.has("A") && !params.dict.has("AA");
+
+    _catalog.Catalog.parseDestDictionary({
+      destDict: params.dict,
+      resultObj: this.data,
+      docBaseUrl: params.pdfManager.docBaseUrl
+    });
+  }
+
+  getFieldObject() {
+    let type = "button";
+    let exportValues;
+
+    if (this.data.checkBox) {
+      type = "checkbox";
+      exportValues = this.data.exportValue;
+    } else if (this.data.radioButton) {
+      type = "radiobutton";
+      exportValues = this.data.buttonValue;
+    }
+
+    return {
+      id: this.data.id,
+      value: this.data.fieldValue || "Off",
+      defaultValue: this.data.defaultFieldValue,
+      exportValues,
+      editable: !this.data.readOnly,
+      name: this.data.fieldName,
+      rect: this.data.rect,
+      hidden: this.data.hidden,
+      actions: this.data.actions,
+      page: this.data.pageIndex,
+      strokeColor: this.data.borderColor,
+      fillColor: this.data.backgroundColor,
+      rotation: this.rotation,
+      type
+    };
+  }
+
+  get fallbackFontDict() {
+    const dict = new _primitives.Dict();
+    dict.set("BaseFont", _primitives.Name.get("ZapfDingbats"));
+    dict.set("Type", _primitives.Name.get("FallbackType"));
+    dict.set("Subtype", _primitives.Name.get("FallbackType"));
+    dict.set("Encoding", _primitives.Name.get("ZapfDingbatsEncoding"));
+    return (0, _util.shadow)(this, "fallbackFontDict", dict);
+  }
+
+}
+
+class ChoiceWidgetAnnotation extends WidgetAnnotation {
+  constructor(params) {
+    super(params);
+    this.data.options = [];
+    const options = (0, _core_utils.getInheritableProperty)({
+      dict: params.dict,
+      key: "Opt"
+    });
+
+    if (Array.isArray(options)) {
+      const xref = params.xref;
+
+      for (let i = 0, ii = options.length; i < ii; i++) {
+        const option = xref.fetchIfRef(options[i]);
+        const isOptionArray = Array.isArray(option);
+        this.data.options[i] = {
+          exportValue: this._decodeFormValue(isOptionArray ? xref.fetchIfRef(option[0]) : option),
+          displayValue: this._decodeFormValue(isOptionArray ? xref.fetchIfRef(option[1]) : option)
+        };
+      }
+    }
+
+    if (typeof this.data.fieldValue === "string") {
+      this.data.fieldValue = [this.data.fieldValue];
+    } else if (!this.data.fieldValue) {
+      this.data.fieldValue = [];
+    }
+
+    this.data.combo = this.hasFieldFlag(_util.AnnotationFieldFlag.COMBO);
+    this.data.multiSelect = this.hasFieldFlag(_util.AnnotationFieldFlag.MULTISELECT);
+    this._hasText = true;
+  }
+
+  getFieldObject() {
+    const type = this.data.combo ? "combobox" : "listbox";
+    const value = this.data.fieldValue.length > 0 ? this.data.fieldValue[0] : null;
+    return {
+      id: this.data.id,
+      value,
+      defaultValue: this.data.defaultFieldValue,
+      editable: !this.data.readOnly,
+      name: this.data.fieldName,
+      rect: this.data.rect,
+      numItems: this.data.fieldValue.length,
+      multipleSelection: this.data.multiSelect,
+      hidden: this.data.hidden,
+      actions: this.data.actions,
+      items: this.data.options,
+      page: this.data.pageIndex,
+      strokeColor: this.data.borderColor,
+      fillColor: this.data.backgroundColor,
+      rotation: this.rotation,
+      type
+    };
+  }
+
+  async _getAppearance(evaluator, task, annotationStorage) {
+    if (this.data.combo) {
+      return super._getAppearance(evaluator, task, annotationStorage);
+    }
+
+    if (!annotationStorage) {
+      return null;
+    }
+
+    const storageEntry = annotationStorage.get(this.data.id);
+
+    if (!storageEntry) {
+      return null;
+    }
+
+    const rotation = storageEntry.rotation;
+    let exportedValue = storageEntry.value;
+
+    if (rotation === undefined && exportedValue === undefined) {
+      return null;
+    }
+
+    if (exportedValue === undefined) {
+      exportedValue = this.data.fieldValue;
+    } else if (!Array.isArray(exportedValue)) {
+      exportedValue = [exportedValue];
+    }
+
+    const defaultPadding = 2;
+    const hPadding = defaultPadding;
+    let totalHeight = this.data.rect[3] - this.data.rect[1];
+    let totalWidth = this.data.rect[2] - this.data.rect[0];
+
+    if (rotation === 90 || rotation === 270) {
+      [totalWidth, totalHeight] = [totalHeight, totalWidth];
+    }
+
+    const lineCount = this.data.options.length;
+    const valueIndices = [];
+
+    for (let i = 0; i < lineCount; i++) {
+      const {
+        exportValue
+      } = this.data.options[i];
+
+      if (exportedValue.includes(exportValue)) {
+        valueIndices.push(i);
+      }
+    }
+
+    if (!this._defaultAppearance) {
+      this.data.defaultAppearanceData = (0, _default_appearance.parseDefaultAppearance)(this._defaultAppearance = "/Helvetica 0 Tf 0 g");
+    }
+
+    const font = await WidgetAnnotation._getFontData(evaluator, task, this.data.defaultAppearanceData, this._fieldResources.mergedResources);
+    let defaultAppearance;
+    let {
+      fontSize
+    } = this.data.defaultAppearanceData;
+
+    if (!fontSize) {
+      const lineHeight = (totalHeight - defaultPadding) / lineCount;
+      let lineWidth = -1;
+      let value;
+
+      for (const {
+        displayValue
+      } of this.data.options) {
+        const width = this._getTextWidth(displayValue, font);
+
+        if (width > lineWidth) {
+          lineWidth = width;
+          value = displayValue;
+        }
+      }
+
+      [defaultAppearance, fontSize] = this._computeFontSize(lineHeight, totalWidth - 2 * hPadding, value, font, -1);
+    } else {
+      defaultAppearance = this._defaultAppearance;
+    }
+
+    const lineHeight = fontSize * _util.LINE_FACTOR;
+    const vPadding = (lineHeight - fontSize) / 2;
+    const numberOfVisibleLines = Math.floor(totalHeight / lineHeight);
+    let firstIndex;
+
+    if (valueIndices.length === 1) {
+      const valuePosition = valueIndices[0];
+      const indexInPage = valuePosition % numberOfVisibleLines;
+      firstIndex = valuePosition - indexInPage;
+    } else {
+      firstIndex = valueIndices.length ? valueIndices[0] : 0;
+    }
+
+    const end = Math.min(firstIndex + numberOfVisibleLines + 1, lineCount);
+    const buf = ["/Tx BMC q", `1 1 ${totalWidth} ${totalHeight} re W n`];
+
+    if (valueIndices.length) {
+      buf.push("0.600006 0.756866 0.854904 rg");
+
+      for (const index of valueIndices) {
+        if (firstIndex <= index && index < end) {
+          buf.push(`1 ${totalHeight - (index - firstIndex + 1) * lineHeight} ${totalWidth} ${lineHeight} re f`);
+        }
+      }
+    }
+
+    buf.push("BT", defaultAppearance, `1 0 0 1 0 ${totalHeight} Tm`);
+
+    for (let i = firstIndex; i < end; i++) {
+      const {
+        displayValue
+      } = this.data.options[i];
+      const hpadding = i === firstIndex ? hPadding : 0;
+      const vpadding = i === firstIndex ? vPadding : 0;
+      buf.push(this._renderText(displayValue, font, fontSize, totalWidth, 0, hpadding, -lineHeight + vpadding));
+    }
+
+    buf.push("ET Q EMC");
+    return buf.join("\n");
+  }
+
+}
+
+class SignatureWidgetAnnotation extends WidgetAnnotation {
+  constructor(params) {
+    super(params);
+    this.data.fieldValue = null;
+  }
+
+  getFieldObject() {
+    return {
+      id: this.data.id,
+      value: null,
+      page: this.data.pageIndex,
+      type: "signature"
+    };
+  }
+
+}
+
+class TextAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    const DEFAULT_ICON_SIZE = 22;
+    super(parameters);
+    const dict = parameters.dict;
+    this.data.annotationType = _util.AnnotationType.TEXT;
+
+    if (this.data.hasAppearance) {
+      this.data.name = "NoIcon";
+    } else {
+      this.data.rect[1] = this.data.rect[3] - DEFAULT_ICON_SIZE;
+      this.data.rect[2] = this.data.rect[0] + DEFAULT_ICON_SIZE;
+      this.data.name = dict.has("Name") ? dict.get("Name").name : "Note";
+    }
+
+    if (dict.has("State")) {
+      this.data.state = dict.get("State") || null;
+      this.data.stateModel = dict.get("StateModel") || null;
+    } else {
+      this.data.state = null;
+      this.data.stateModel = null;
+    }
+  }
+
+}
+
+class LinkAnnotation extends Annotation {
+  constructor(params) {
+    super(params);
+    this.data.annotationType = _util.AnnotationType.LINK;
+    const quadPoints = getQuadPoints(params.dict, this.rectangle);
+
+    if (quadPoints) {
+      this.data.quadPoints = quadPoints;
+    }
+
+    this.data.borderColor = this.data.borderColor || this.data.color;
+
+    _catalog.Catalog.parseDestDictionary({
+      destDict: params.dict,
+      resultObj: this.data,
+      docBaseUrl: params.pdfManager.docBaseUrl
+    });
+  }
+
+}
+
+class PopupAnnotation extends Annotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.POPUP;
+    let parentItem = parameters.dict.get("Parent");
+
+    if (!parentItem) {
+      (0, _util.warn)("Popup annotation has a missing or invalid parent annotation.");
+      return;
+    }
+
+    const parentSubtype = parentItem.get("Subtype");
+    this.data.parentType = parentSubtype instanceof _primitives.Name ? parentSubtype.name : null;
+    const rawParent = parameters.dict.getRaw("Parent");
+    this.data.parentId = rawParent instanceof _primitives.Ref ? rawParent.toString() : null;
+    const parentRect = parentItem.getArray("Rect");
+
+    if (Array.isArray(parentRect) && parentRect.length === 4) {
+      this.data.parentRect = _util.Util.normalizeRect(parentRect);
+    } else {
+      this.data.parentRect = [0, 0, 0, 0];
+    }
+
+    const rt = parentItem.get("RT");
+
+    if ((0, _primitives.isName)(rt, _util.AnnotationReplyType.GROUP)) {
+      parentItem = parentItem.get("IRT");
+    }
+
+    if (!parentItem.has("M")) {
+      this.data.modificationDate = null;
+    } else {
+      this.setModificationDate(parentItem.get("M"));
+      this.data.modificationDate = this.modificationDate;
+    }
+
+    if (!parentItem.has("C")) {
+      this.data.color = null;
+    } else {
+      this.setColor(parentItem.getArray("C"));
+      this.data.color = this.color;
+    }
+
+    if (!this.viewable) {
+      const parentFlags = parentItem.get("F");
+
+      if (this._isViewable(parentFlags)) {
+        this.setFlags(parentFlags);
+      }
+    }
+
+    this.setTitle(parentItem.get("T"));
+    this.data.titleObj = this._title;
+    this.setContents(parentItem.get("Contents"));
+    this.data.contentsObj = this._contents;
+
+    if (parentItem.has("RC")) {
+      this.data.richText = _factory.XFAFactory.getRichTextAsHtml(parentItem.get("RC"));
+    }
+  }
+
+}
+
+exports.PopupAnnotation = PopupAnnotation;
+
+class FreeTextAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.FREETEXT;
+  }
+
+  get hasTextContent() {
+    return !!this.appearance;
+  }
+
+  static createNewDict(annotation, xref, {
+    apRef,
+    ap
+  }) {
+    const {
+      color,
+      fontSize,
+      rect,
+      rotation,
+      user,
+      value
+    } = annotation;
+    const freetext = new _primitives.Dict(xref);
+    freetext.set("Type", _primitives.Name.get("Annot"));
+    freetext.set("Subtype", _primitives.Name.get("FreeText"));
+    freetext.set("CreationDate", `D:${(0, _util.getModificationDate)()}`);
+    freetext.set("Rect", rect);
+    const da = `/Helv ${fontSize} Tf ${(0, _default_appearance.getPdfColor)(color, true)}`;
+    freetext.set("DA", da);
+    freetext.set("Contents", value);
+    freetext.set("F", 4);
+    freetext.set("Border", [0, 0, 0]);
+    freetext.set("Rotate", rotation);
+
+    if (user) {
+      freetext.set("T", (0, _util.stringToUTF8String)(user));
+    }
+
+    const n = new _primitives.Dict(xref);
+    freetext.set("AP", n);
+
+    if (apRef) {
+      n.set("N", apRef);
+    } else {
+      n.set("N", ap);
+    }
+
+    return freetext;
+  }
+
+  static async createNewAppearanceStream(annotation, xref, params) {
+    const {
+      baseFontRef,
+      evaluator,
+      task
+    } = params;
+    const {
+      color,
+      fontSize,
+      rect,
+      rotation,
+      value
+    } = annotation;
+    const resources = new _primitives.Dict(xref);
+    const font = new _primitives.Dict(xref);
+
+    if (baseFontRef) {
+      font.set("Helv", baseFontRef);
+    } else {
+      const baseFont = new _primitives.Dict(xref);
+      baseFont.set("BaseFont", _primitives.Name.get("Helvetica"));
+      baseFont.set("Type", _primitives.Name.get("Font"));
+      baseFont.set("Subtype", _primitives.Name.get("Type1"));
+      baseFont.set("Encoding", _primitives.Name.get("WinAnsiEncoding"));
+      font.set("Helv", baseFont);
+    }
+
+    resources.set("Font", font);
+    const helv = await WidgetAnnotation._getFontData(evaluator, task, {
+      fontName: "Helvetica",
+      fontSize
+    }, resources);
+    const [x1, y1, x2, y2] = rect;
+    let w = x2 - x1;
+    let h = y2 - y1;
+
+    if (rotation % 180 !== 0) {
+      [w, h] = [h, w];
+    }
+
+    const lines = value.split("\n");
+    const scale = fontSize / 1000;
+    let totalWidth = -Infinity;
+    const encodedLines = [];
+
+    for (let line of lines) {
+      line = helv.encodeString(line).join("");
+      encodedLines.push(line);
+      let lineWidth = 0;
+      const glyphs = helv.charsToGlyphs(line);
+
+      for (const glyph of glyphs) {
+        lineWidth += glyph.width * scale;
+      }
+
+      totalWidth = Math.max(totalWidth, lineWidth);
+    }
+
+    let hscale = 1;
+
+    if (totalWidth > w) {
+      hscale = w / totalWidth;
+    }
+
+    let vscale = 1;
+    const lineHeight = _util.LINE_FACTOR * fontSize;
+    const lineDescent = _util.LINE_DESCENT_FACTOR * fontSize;
+    const totalHeight = lineHeight * lines.length;
+
+    if (totalHeight > h) {
+      vscale = h / totalHeight;
+    }
+
+    const fscale = Math.min(hscale, vscale);
+    const newFontSize = fontSize * fscale;
+    const buffer = ["q", `0 0 ${(0, _core_utils.numberToString)(w)} ${(0, _core_utils.numberToString)(h)} re W n`, `BT`, `1 0 0 1 0 ${(0, _core_utils.numberToString)(h + lineDescent)} Tm 0 Tc ${(0, _default_appearance.getPdfColor)(color, true)}`, `/Helv ${(0, _core_utils.numberToString)(newFontSize)} Tf`];
+    const vShift = (0, _core_utils.numberToString)(lineHeight);
+
+    for (const line of encodedLines) {
+      buffer.push(`0 -${vShift} Td (${(0, _util.escapeString)(line)}) Tj`);
+    }
+
+    buffer.push("ET", "Q");
+    const appearance = buffer.join("\n");
+    const appearanceStreamDict = new _primitives.Dict(xref);
+    appearanceStreamDict.set("FormType", 1);
+    appearanceStreamDict.set("Subtype", _primitives.Name.get("Form"));
+    appearanceStreamDict.set("Type", _primitives.Name.get("XObject"));
+    appearanceStreamDict.set("BBox", [0, 0, w, h]);
+    appearanceStreamDict.set("Length", appearance.length);
+    appearanceStreamDict.set("Resources", resources);
+
+    if (rotation) {
+      const matrix = WidgetAnnotation._getRotationMatrix(rotation, w, h);
+
+      appearanceStreamDict.set("Matrix", matrix);
+    }
+
+    const ap = new _stream.StringStream(appearance);
+    ap.dict = appearanceStreamDict;
+    return ap;
+  }
+
+}
+
+class LineAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    const {
+      dict
+    } = parameters;
+    this.data.annotationType = _util.AnnotationType.LINE;
+    const lineCoordinates = dict.getArray("L");
+    this.data.lineCoordinates = _util.Util.normalizeRect(lineCoordinates);
+    this.setLineEndings(dict.getArray("LE"));
+    this.data.lineEndings = this.lineEndings;
+
+    if (!this.appearance) {
+      const strokeColor = this.color ? Array.from(this.color).map(c => c / 255) : [0, 0, 0];
+      const strokeAlpha = dict.get("CA");
+      let fillColor = null,
+          interiorColor = dict.getArray("IC");
+
+      if (interiorColor) {
+        interiorColor = getRgbColor(interiorColor, null);
+        fillColor = interiorColor ? Array.from(interiorColor).map(c => c / 255) : null;
+      }
+
+      const fillAlpha = fillColor ? strokeAlpha : null;
+      const borderWidth = this.borderStyle.width || 1,
+            borderAdjust = 2 * borderWidth;
+      const bbox = [this.data.lineCoordinates[0] - borderAdjust, this.data.lineCoordinates[1] - borderAdjust, this.data.lineCoordinates[2] + borderAdjust, this.data.lineCoordinates[3] + borderAdjust];
+
+      if (!_util.Util.intersect(this.rectangle, bbox)) {
+        this.rectangle = bbox;
+      }
+
+      this._setDefaultAppearance({
+        xref: parameters.xref,
+        extra: `${borderWidth} w`,
+        strokeColor,
+        fillColor,
+        strokeAlpha,
+        fillAlpha,
+        pointsCallback: (buffer, points) => {
+          buffer.push(`${lineCoordinates[0]} ${lineCoordinates[1]} m`, `${lineCoordinates[2]} ${lineCoordinates[3]} l`, "S");
+          return [points[0].x - borderWidth, points[1].x + borderWidth, points[3].y - borderWidth, points[1].y + borderWidth];
+        }
+      });
+    }
+  }
+
+}
+
+class SquareAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.SQUARE;
+
+    if (!this.appearance) {
+      const strokeColor = this.color ? Array.from(this.color).map(c => c / 255) : [0, 0, 0];
+      const strokeAlpha = parameters.dict.get("CA");
+      let fillColor = null,
+          interiorColor = parameters.dict.getArray("IC");
+
+      if (interiorColor) {
+        interiorColor = getRgbColor(interiorColor, null);
+        fillColor = interiorColor ? Array.from(interiorColor).map(c => c / 255) : null;
+      }
+
+      const fillAlpha = fillColor ? strokeAlpha : null;
+
+      if (this.borderStyle.width === 0 && !fillColor) {
+        return;
+      }
+
+      this._setDefaultAppearance({
+        xref: parameters.xref,
+        extra: `${this.borderStyle.width} w`,
+        strokeColor,
+        fillColor,
+        strokeAlpha,
+        fillAlpha,
+        pointsCallback: (buffer, points) => {
+          const x = points[2].x + this.borderStyle.width / 2;
+          const y = points[2].y + this.borderStyle.width / 2;
+          const width = points[3].x - points[2].x - this.borderStyle.width;
+          const height = points[1].y - points[3].y - this.borderStyle.width;
+          buffer.push(`${x} ${y} ${width} ${height} re`);
+
+          if (fillColor) {
+            buffer.push("B");
+          } else {
+            buffer.push("S");
+          }
+
+          return [points[0].x, points[1].x, points[3].y, points[1].y];
+        }
+      });
+    }
+  }
+
+}
+
+class CircleAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.CIRCLE;
+
+    if (!this.appearance) {
+      const strokeColor = this.color ? Array.from(this.color).map(c => c / 255) : [0, 0, 0];
+      const strokeAlpha = parameters.dict.get("CA");
+      let fillColor = null;
+      let interiorColor = parameters.dict.getArray("IC");
+
+      if (interiorColor) {
+        interiorColor = getRgbColor(interiorColor, null);
+        fillColor = interiorColor ? Array.from(interiorColor).map(c => c / 255) : null;
+      }
+
+      const fillAlpha = fillColor ? strokeAlpha : null;
+
+      if (this.borderStyle.width === 0 && !fillColor) {
+        return;
+      }
+
+      const controlPointsDistance = 4 / 3 * Math.tan(Math.PI / (2 * 4));
+
+      this._setDefaultAppearance({
+        xref: parameters.xref,
+        extra: `${this.borderStyle.width} w`,
+        strokeColor,
+        fillColor,
+        strokeAlpha,
+        fillAlpha,
+        pointsCallback: (buffer, points) => {
+          const x0 = points[0].x + this.borderStyle.width / 2;
+          const y0 = points[0].y - this.borderStyle.width / 2;
+          const x1 = points[3].x - this.borderStyle.width / 2;
+          const y1 = points[3].y + this.borderStyle.width / 2;
+          const xMid = x0 + (x1 - x0) / 2;
+          const yMid = y0 + (y1 - y0) / 2;
+          const xOffset = (x1 - x0) / 2 * controlPointsDistance;
+          const yOffset = (y1 - y0) / 2 * controlPointsDistance;
+          buffer.push(`${xMid} ${y1} m`, `${xMid + xOffset} ${y1} ${x1} ${yMid + yOffset} ${x1} ${yMid} c`, `${x1} ${yMid - yOffset} ${xMid + xOffset} ${y0} ${xMid} ${y0} c`, `${xMid - xOffset} ${y0} ${x0} ${yMid - yOffset} ${x0} ${yMid} c`, `${x0} ${yMid + yOffset} ${xMid - xOffset} ${y1} ${xMid} ${y1} c`, "h");
+
+          if (fillColor) {
+            buffer.push("B");
+          } else {
+            buffer.push("S");
+          }
+
+          return [points[0].x, points[1].x, points[3].y, points[1].y];
+        }
+      });
+    }
+  }
+
+}
+
+class PolylineAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    const {
+      dict
+    } = parameters;
+    this.data.annotationType = _util.AnnotationType.POLYLINE;
+    this.data.vertices = [];
+
+    if (!(this instanceof PolygonAnnotation)) {
+      this.setLineEndings(dict.getArray("LE"));
+      this.data.lineEndings = this.lineEndings;
+    }
+
+    const rawVertices = dict.getArray("Vertices");
+
+    if (!Array.isArray(rawVertices)) {
+      return;
+    }
+
+    for (let i = 0, ii = rawVertices.length; i < ii; i += 2) {
+      this.data.vertices.push({
+        x: rawVertices[i],
+        y: rawVertices[i + 1]
+      });
+    }
+
+    if (!this.appearance) {
+      const strokeColor = this.color ? Array.from(this.color).map(c => c / 255) : [0, 0, 0];
+      const strokeAlpha = dict.get("CA");
+      const borderWidth = this.borderStyle.width || 1,
+            borderAdjust = 2 * borderWidth;
+      const bbox = [Infinity, Infinity, -Infinity, -Infinity];
+
+      for (const vertex of this.data.vertices) {
+        bbox[0] = Math.min(bbox[0], vertex.x - borderAdjust);
+        bbox[1] = Math.min(bbox[1], vertex.y - borderAdjust);
+        bbox[2] = Math.max(bbox[2], vertex.x + borderAdjust);
+        bbox[3] = Math.max(bbox[3], vertex.y + borderAdjust);
+      }
+
+      if (!_util.Util.intersect(this.rectangle, bbox)) {
+        this.rectangle = bbox;
+      }
+
+      this._setDefaultAppearance({
+        xref: parameters.xref,
+        extra: `${borderWidth} w`,
+        strokeColor,
+        strokeAlpha,
+        pointsCallback: (buffer, points) => {
+          const vertices = this.data.vertices;
+
+          for (let i = 0, ii = vertices.length; i < ii; i++) {
+            buffer.push(`${vertices[i].x} ${vertices[i].y} ${i === 0 ? "m" : "l"}`);
+          }
+
+          buffer.push("S");
+          return [points[0].x, points[1].x, points[3].y, points[1].y];
+        }
+      });
+    }
+  }
+
+}
+
+class PolygonAnnotation extends PolylineAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.POLYGON;
+  }
+
+}
+
+class CaretAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.CARET;
+  }
+
+}
+
+class InkAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.INK;
+    this.data.inkLists = [];
+    const rawInkLists = parameters.dict.getArray("InkList");
+
+    if (!Array.isArray(rawInkLists)) {
+      return;
+    }
+
+    const xref = parameters.xref;
+
+    for (let i = 0, ii = rawInkLists.length; i < ii; ++i) {
+      this.data.inkLists.push([]);
+
+      for (let j = 0, jj = rawInkLists[i].length; j < jj; j += 2) {
+        this.data.inkLists[i].push({
+          x: xref.fetchIfRef(rawInkLists[i][j]),
+          y: xref.fetchIfRef(rawInkLists[i][j + 1])
+        });
+      }
+    }
+
+    if (!this.appearance) {
+      const strokeColor = this.color ? Array.from(this.color).map(c => c / 255) : [0, 0, 0];
+      const strokeAlpha = parameters.dict.get("CA");
+      const borderWidth = this.borderStyle.width || 1,
+            borderAdjust = 2 * borderWidth;
+      const bbox = [Infinity, Infinity, -Infinity, -Infinity];
+
+      for (const inkLists of this.data.inkLists) {
+        for (const vertex of inkLists) {
+          bbox[0] = Math.min(bbox[0], vertex.x - borderAdjust);
+          bbox[1] = Math.min(bbox[1], vertex.y - borderAdjust);
+          bbox[2] = Math.max(bbox[2], vertex.x + borderAdjust);
+          bbox[3] = Math.max(bbox[3], vertex.y + borderAdjust);
+        }
+      }
+
+      if (!_util.Util.intersect(this.rectangle, bbox)) {
+        this.rectangle = bbox;
+      }
+
+      this._setDefaultAppearance({
+        xref: parameters.xref,
+        extra: `${borderWidth} w`,
+        strokeColor,
+        strokeAlpha,
+        pointsCallback: (buffer, points) => {
+          for (const inkList of this.data.inkLists) {
+            for (let i = 0, ii = inkList.length; i < ii; i++) {
+              buffer.push(`${inkList[i].x} ${inkList[i].y} ${i === 0 ? "m" : "l"}`);
+            }
+
+            buffer.push("S");
+          }
+
+          return [points[0].x, points[1].x, points[3].y, points[1].y];
+        }
+      });
+    }
+  }
+
+  static createNewDict(annotation, xref, {
+    apRef,
+    ap
+  }) {
+    const {
+      paths,
+      rect,
+      rotation
+    } = annotation;
+    const ink = new _primitives.Dict(xref);
+    ink.set("Type", _primitives.Name.get("Annot"));
+    ink.set("Subtype", _primitives.Name.get("Ink"));
+    ink.set("CreationDate", `D:${(0, _util.getModificationDate)()}`);
+    ink.set("Rect", rect);
+    ink.set("InkList", paths.map(p => p.points));
+    ink.set("F", 4);
+    ink.set("Border", [0, 0, 0]);
+    ink.set("Rotate", rotation);
+    const n = new _primitives.Dict(xref);
+    ink.set("AP", n);
+
+    if (apRef) {
+      n.set("N", apRef);
+    } else {
+      n.set("N", ap);
+    }
+
+    return ink;
+  }
+
+  static async createNewAppearanceStream(annotation, xref, params) {
+    const {
+      color,
+      rect,
+      rotation,
+      paths,
+      thickness,
+      opacity
+    } = annotation;
+    const [x1, y1, x2, y2] = rect;
+    let w = x2 - x1;
+    let h = y2 - y1;
+
+    if (rotation % 180 !== 0) {
+      [w, h] = [h, w];
+    }
+
+    const appearanceBuffer = [`${thickness} w 1 J 1 j`, `${(0, _default_appearance.getPdfColor)(color, false)}`];
+
+    if (opacity !== 1) {
+      appearanceBuffer.push("/R0 gs");
+    }
+
+    const buffer = [];
+
+    for (const {
+      bezier
+    } of paths) {
+      buffer.length = 0;
+      buffer.push(`${(0, _core_utils.numberToString)(bezier[0])} ${(0, _core_utils.numberToString)(bezier[1])} m`);
+
+      for (let i = 2, ii = bezier.length; i < ii; i += 6) {
+        const curve = bezier.slice(i, i + 6).map(_core_utils.numberToString).join(" ");
+        buffer.push(`${curve} c`);
+      }
+
+      buffer.push("S");
+      appearanceBuffer.push(buffer.join("\n"));
+    }
+
+    const appearance = appearanceBuffer.join("\n");
+    const appearanceStreamDict = new _primitives.Dict(xref);
+    appearanceStreamDict.set("FormType", 1);
+    appearanceStreamDict.set("Subtype", _primitives.Name.get("Form"));
+    appearanceStreamDict.set("Type", _primitives.Name.get("XObject"));
+    appearanceStreamDict.set("BBox", [0, 0, w, h]);
+    appearanceStreamDict.set("Length", appearance.length);
+
+    if (rotation) {
+      const matrix = WidgetAnnotation._getRotationMatrix(rotation, w, h);
+
+      appearanceStreamDict.set("Matrix", matrix);
+    }
+
+    if (opacity !== 1) {
+      const resources = new _primitives.Dict(xref);
+      const extGState = new _primitives.Dict(xref);
+      const r0 = new _primitives.Dict(xref);
+      r0.set("CA", opacity);
+      r0.set("Type", _primitives.Name.get("ExtGState"));
+      extGState.set("R0", r0);
+      resources.set("ExtGState", extGState);
+      appearanceStreamDict.set("Resources", resources);
+    }
+
+    const ap = new _stream.StringStream(appearance);
+    ap.dict = appearanceStreamDict;
+    return ap;
+  }
+
+}
+
+class HighlightAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.HIGHLIGHT;
+    const quadPoints = this.data.quadPoints = getQuadPoints(parameters.dict, null);
+
+    if (quadPoints) {
+      const resources = this.appearance && this.appearance.dict.get("Resources");
+
+      if (!this.appearance || !(resources && resources.has("ExtGState"))) {
+        if (this.appearance) {
+          (0, _util.warn)("HighlightAnnotation - ignoring built-in appearance stream.");
+        }
+
+        const fillColor = this.color ? Array.from(this.color).map(c => c / 255) : [1, 1, 0];
+        const fillAlpha = parameters.dict.get("CA");
+
+        this._setDefaultAppearance({
+          xref: parameters.xref,
+          fillColor,
+          blendMode: "Multiply",
+          fillAlpha,
+          pointsCallback: (buffer, points) => {
+            buffer.push(`${points[0].x} ${points[0].y} m`, `${points[1].x} ${points[1].y} l`, `${points[3].x} ${points[3].y} l`, `${points[2].x} ${points[2].y} l`, "f");
+            return [points[0].x, points[1].x, points[3].y, points[1].y];
+          }
+        });
+      }
+    } else {
+      this.data.hasPopup = false;
+    }
+  }
+
+}
+
+class UnderlineAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.UNDERLINE;
+    const quadPoints = this.data.quadPoints = getQuadPoints(parameters.dict, null);
+
+    if (quadPoints) {
+      if (!this.appearance) {
+        const strokeColor = this.color ? Array.from(this.color).map(c => c / 255) : [0, 0, 0];
+        const strokeAlpha = parameters.dict.get("CA");
+
+        this._setDefaultAppearance({
+          xref: parameters.xref,
+          extra: "[] 0 d 1 w",
+          strokeColor,
+          strokeAlpha,
+          pointsCallback: (buffer, points) => {
+            buffer.push(`${points[2].x} ${points[2].y} m`, `${points[3].x} ${points[3].y} l`, "S");
+            return [points[0].x, points[1].x, points[3].y, points[1].y];
+          }
+        });
+      }
+    } else {
+      this.data.hasPopup = false;
+    }
+  }
+
+}
+
+class SquigglyAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.SQUIGGLY;
+    const quadPoints = this.data.quadPoints = getQuadPoints(parameters.dict, null);
+
+    if (quadPoints) {
+      if (!this.appearance) {
+        const strokeColor = this.color ? Array.from(this.color).map(c => c / 255) : [0, 0, 0];
+        const strokeAlpha = parameters.dict.get("CA");
+
+        this._setDefaultAppearance({
+          xref: parameters.xref,
+          extra: "[] 0 d 1 w",
+          strokeColor,
+          strokeAlpha,
+          pointsCallback: (buffer, points) => {
+            const dy = (points[0].y - points[2].y) / 6;
+            let shift = dy;
+            let x = points[2].x;
+            const y = points[2].y;
+            const xEnd = points[3].x;
+            buffer.push(`${x} ${y + shift} m`);
+
+            do {
+              x += 2;
+              shift = shift === 0 ? dy : 0;
+              buffer.push(`${x} ${y + shift} l`);
+            } while (x < xEnd);
+
+            buffer.push("S");
+            return [points[2].x, xEnd, y - 2 * dy, y + 2 * dy];
+          }
+        });
+      }
+    } else {
+      this.data.hasPopup = false;
+    }
+  }
+
+}
+
+class StrikeOutAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.STRIKEOUT;
+    const quadPoints = this.data.quadPoints = getQuadPoints(parameters.dict, null);
+
+    if (quadPoints) {
+      if (!this.appearance) {
+        const strokeColor = this.color ? Array.from(this.color).map(c => c / 255) : [0, 0, 0];
+        const strokeAlpha = parameters.dict.get("CA");
+
+        this._setDefaultAppearance({
+          xref: parameters.xref,
+          extra: "[] 0 d 1 w",
+          strokeColor,
+          strokeAlpha,
+          pointsCallback: (buffer, points) => {
+            buffer.push(`${(points[0].x + points[2].x) / 2} ` + `${(points[0].y + points[2].y) / 2} m`, `${(points[1].x + points[3].x) / 2} ` + `${(points[1].y + points[3].y) / 2} l`, "S");
+            return [points[0].x, points[1].x, points[3].y, points[1].y];
+          }
+        });
+      }
+    } else {
+      this.data.hasPopup = false;
+    }
+  }
+
+}
+
+class StampAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.STAMP;
+  }
+
+}
+
+class FileAttachmentAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    const file = new _file_spec.FileSpec(parameters.dict.get("FS"), parameters.xref);
+    this.data.annotationType = _util.AnnotationType.FILEATTACHMENT;
+    this.data.file = file.serializable;
+  }
+
+}
 
 /***/ }),
 /* 13 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.CCITTFaxStream = void 0;
+}));
+exports.createDefaultAppearance = createDefaultAppearance;
+exports.getPdfColor = getPdfColor;
+exports.parseDefaultAppearance = parseDefaultAppearance;
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _util = __w_pdfjs_require__(2);
+
+var _colorspace = __w_pdfjs_require__(14);
+
+var _evaluator = __w_pdfjs_require__(15);
 
 var _primitives = __w_pdfjs_require__(5);
 
-var _ccitt = __w_pdfjs_require__(14);
+var _stream = __w_pdfjs_require__(10);
 
-var _stream = __w_pdfjs_require__(12);
-
-var CCITTFaxStream = function CCITTFaxStreamClosure() {
-  function CCITTFaxStream(str, maybeLength, params) {
-    this.str = str;
-    this.dict = str.dict;
-
-    if (!(0, _primitives.isDict)(params)) {
-      params = _primitives.Dict.empty;
-    }
-
-    const source = {
-      next() {
-        return str.getByte();
-      }
-
-    };
-    this.ccittFaxDecoder = new _ccitt.CCITTFaxDecoder(source, {
-      K: params.get("K"),
-      EndOfLine: params.get("EndOfLine"),
-      EncodedByteAlign: params.get("EncodedByteAlign"),
-      Columns: params.get("Columns"),
-      Rows: params.get("Rows"),
-      EndOfBlock: params.get("EndOfBlock"),
-      BlackIs1: params.get("BlackIs1")
-    });
-
-    _stream.DecodeStream.call(this, maybeLength);
+class DefaultAppearanceEvaluator extends _evaluator.EvaluatorPreprocessor {
+  constructor(str) {
+    super(new _stream.StringStream(str));
   }
 
-  CCITTFaxStream.prototype = Object.create(_stream.DecodeStream.prototype);
+  parse() {
+    const operation = {
+      fn: 0,
+      args: []
+    };
+    const result = {
+      fontSize: 0,
+      fontName: "",
+      fontColor: new Uint8ClampedArray(3)
+    };
 
-  CCITTFaxStream.prototype.readBlock = function () {
-    while (!this.eof) {
-      const c = this.ccittFaxDecoder.readNextChar();
+    try {
+      while (true) {
+        operation.args.length = 0;
 
-      if (c === -1) {
-        this.eof = true;
-        return;
+        if (!this.read(operation)) {
+          break;
+        }
+
+        if (this.savedStatesDepth !== 0) {
+          continue;
+        }
+
+        const {
+          fn,
+          args
+        } = operation;
+
+        switch (fn | 0) {
+          case _util.OPS.setFont:
+            const [fontName, fontSize] = args;
+
+            if (fontName instanceof _primitives.Name) {
+              result.fontName = fontName.name;
+            }
+
+            if (typeof fontSize === "number" && fontSize > 0) {
+              result.fontSize = fontSize;
+            }
+
+            break;
+
+          case _util.OPS.setFillRGBColor:
+            _colorspace.ColorSpace.singletons.rgb.getRgbItem(args, 0, result.fontColor, 0);
+
+            break;
+
+          case _util.OPS.setFillGray:
+            _colorspace.ColorSpace.singletons.gray.getRgbItem(args, 0, result.fontColor, 0);
+
+            break;
+
+          case _util.OPS.setFillColorSpace:
+            _colorspace.ColorSpace.singletons.cmyk.getRgbItem(args, 0, result.fontColor, 0);
+
+            break;
+        }
       }
-
-      this.ensureBuffer(this.bufferLength + 1);
-      this.buffer[this.bufferLength++] = c;
+    } catch (reason) {
+      (0, _util.warn)(`parseDefaultAppearance - ignoring errors: "${reason}".`);
     }
-  };
 
-  return CCITTFaxStream;
-}();
+    return result;
+  }
 
-exports.CCITTFaxStream = CCITTFaxStream;
+}
+
+function parseDefaultAppearance(str) {
+  return new DefaultAppearanceEvaluator(str).parse();
+}
+
+function getPdfColor(color, isFill) {
+  if (color[0] === color[1] && color[1] === color[2]) {
+    const gray = color[0] / 255;
+    return `${(0, _core_utils.numberToString)(gray)} ${isFill ? "g" : "G"}`;
+  }
+
+  return Array.from(color).map(c => (0, _core_utils.numberToString)(c / 255)).join(" ") + ` ${isFill ? "rg" : "RG"}`;
+}
+
+function createDefaultAppearance({
+  fontSize,
+  fontName,
+  fontColor
+}) {
+  return `/${(0, _core_utils.escapePDFName)(fontName)} ${fontSize} Tf ${getPdfColor(fontColor, true)}`;
+}
 
 /***/ }),
 /* 14 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.CCITTFaxDecoder = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-const CCITTFaxDecoder = function CCITTFaxDecoder() {
-  const ccittEOL = -2;
-  const ccittEOF = -1;
-  const twoDimPass = 0;
-  const twoDimHoriz = 1;
-  const twoDimVert0 = 2;
-  const twoDimVertR1 = 3;
-  const twoDimVertL1 = 4;
-  const twoDimVertR2 = 5;
-  const twoDimVertL2 = 6;
-  const twoDimVertR3 = 7;
-  const twoDimVertL3 = 8;
-  const twoDimTable = [[-1, -1], [-1, -1], [7, twoDimVertL3], [7, twoDimVertR3], [6, twoDimVertL2], [6, twoDimVertL2], [6, twoDimVertR2], [6, twoDimVertR2], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0]];
-  const whiteTable1 = [[-1, -1], [12, ccittEOL], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [11, 1792], [11, 1792], [12, 1984], [12, 2048], [12, 2112], [12, 2176], [12, 2240], [12, 2304], [11, 1856], [11, 1856], [11, 1920], [11, 1920], [12, 2368], [12, 2432], [12, 2496], [12, 2560]];
-  const whiteTable2 = [[-1, -1], [-1, -1], [-1, -1], [-1, -1], [8, 29], [8, 29], [8, 30], [8, 30], [8, 45], [8, 45], [8, 46], [8, 46], [7, 22], [7, 22], [7, 22], [7, 22], [7, 23], [7, 23], [7, 23], [7, 23], [8, 47], [8, 47], [8, 48], [8, 48], [6, 13], [6, 13], [6, 13], [6, 13], [6, 13], [6, 13], [6, 13], [6, 13], [7, 20], [7, 20], [7, 20], [7, 20], [8, 33], [8, 33], [8, 34], [8, 34], [8, 35], [8, 35], [8, 36], [8, 36], [8, 37], [8, 37], [8, 38], [8, 38], [7, 19], [7, 19], [7, 19], [7, 19], [8, 31], [8, 31], [8, 32], [8, 32], [6, 1], [6, 1], [6, 1], [6, 1], [6, 1], [6, 1], [6, 1], [6, 1], [6, 12], [6, 12], [6, 12], [6, 12], [6, 12], [6, 12], [6, 12], [6, 12], [8, 53], [8, 53], [8, 54], [8, 54], [7, 26], [7, 26], [7, 26], [7, 26], [8, 39], [8, 39], [8, 40], [8, 40], [8, 41], [8, 41], [8, 42], [8, 42], [8, 43], [8, 43], [8, 44], [8, 44], [7, 21], [7, 21], [7, 21], [7, 21], [7, 28], [7, 28], [7, 28], [7, 28], [8, 61], [8, 61], [8, 62], [8, 62], [8, 63], [8, 63], [8, 0], [8, 0], [8, 320], [8, 320], [8, 384], [8, 384], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [7, 27], [7, 27], [7, 27], [7, 27], [8, 59], [8, 59], [8, 60], [8, 60], [9, 1472], [9, 1536], [9, 1600], [9, 1728], [7, 18], [7, 18], [7, 18], [7, 18], [7, 24], [7, 24], [7, 24], [7, 24], [8, 49], [8, 49], [8, 50], [8, 50], [8, 51], [8, 51], [8, 52], [8, 52], [7, 25], [7, 25], [7, 25], [7, 25], [8, 55], [8, 55], [8, 56], [8, 56], [8, 57], [8, 57], [8, 58], [8, 58], [6, 192], [6, 192], [6, 192], [6, 192], [6, 192], [6, 192], [6, 192], [6, 192], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [8, 448], [8, 448], [8, 512], [8, 512], [9, 704], [9, 768], [8, 640], [8, 640], [8, 576], [8, 576], [9, 832], [9, 896], [9, 960], [9, 1024], [9, 1088], [9, 1152], [9, 1216], [9, 1280], [9, 1344], [9, 1408], [7, 256], [7, 256], [7, 256], [7, 256], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [6, 16], [6, 16], [6, 16], [6, 16], [6, 16], [6, 16], [6, 16], [6, 16], [6, 17], [6, 17], [6, 17], [6, 17], [6, 17], [6, 17], [6, 17], [6, 17], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [6, 14], [6, 14], [6, 14], [6, 14], [6, 14], [6, 14], [6, 14], [6, 14], [6, 15], [6, 15], [6, 15], [6, 15], [6, 15], [6, 15], [6, 15], [6, 15], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7]];
-  const blackTable1 = [[-1, -1], [-1, -1], [12, ccittEOL], [12, ccittEOL], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [11, 1792], [11, 1792], [11, 1792], [11, 1792], [12, 1984], [12, 1984], [12, 2048], [12, 2048], [12, 2112], [12, 2112], [12, 2176], [12, 2176], [12, 2240], [12, 2240], [12, 2304], [12, 2304], [11, 1856], [11, 1856], [11, 1856], [11, 1856], [11, 1920], [11, 1920], [11, 1920], [11, 1920], [12, 2368], [12, 2368], [12, 2432], [12, 2432], [12, 2496], [12, 2496], [12, 2560], [12, 2560], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [12, 52], [12, 52], [13, 640], [13, 704], [13, 768], [13, 832], [12, 55], [12, 55], [12, 56], [12, 56], [13, 1280], [13, 1344], [13, 1408], [13, 1472], [12, 59], [12, 59], [12, 60], [12, 60], [13, 1536], [13, 1600], [11, 24], [11, 24], [11, 24], [11, 24], [11, 25], [11, 25], [11, 25], [11, 25], [13, 1664], [13, 1728], [12, 320], [12, 320], [12, 384], [12, 384], [12, 448], [12, 448], [13, 512], [13, 576], [12, 53], [12, 53], [12, 54], [12, 54], [13, 896], [13, 960], [13, 1024], [13, 1088], [13, 1152], [13, 1216], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64]];
-  const blackTable2 = [[8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [11, 23], [11, 23], [12, 50], [12, 51], [12, 44], [12, 45], [12, 46], [12, 47], [12, 57], [12, 58], [12, 61], [12, 256], [10, 16], [10, 16], [10, 16], [10, 16], [10, 17], [10, 17], [10, 17], [10, 17], [12, 48], [12, 49], [12, 62], [12, 63], [12, 30], [12, 31], [12, 32], [12, 33], [12, 40], [12, 41], [11, 22], [11, 22], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [12, 128], [12, 192], [12, 26], [12, 27], [12, 28], [12, 29], [11, 19], [11, 19], [11, 20], [11, 20], [12, 34], [12, 35], [12, 36], [12, 37], [12, 38], [12, 39], [11, 21], [11, 21], [12, 42], [12, 43], [10, 0], [10, 0], [10, 0], [10, 0], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12]];
-  const blackTable3 = [[-1, -1], [-1, -1], [-1, -1], [-1, -1], [6, 9], [6, 8], [5, 7], [5, 7], [4, 6], [4, 6], [4, 6], [4, 6], [4, 5], [4, 5], [4, 5], [4, 5], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2]];
-
-  function CCITTFaxDecoder(source, options = {}) {
-    if (!source || typeof source.next !== "function") {
-      throw new Error('CCITTFaxDecoder - invalid "source" parameter.');
-    }
-
-    this.source = source;
-    this.eof = false;
-    this.encoding = options.K || 0;
-    this.eoline = options.EndOfLine || false;
-    this.byteAlign = options.EncodedByteAlign || false;
-    this.columns = options.Columns || 1728;
-    this.rows = options.Rows || 0;
-    let eoblock = options.EndOfBlock;
-
-    if (eoblock === null || eoblock === undefined) {
-      eoblock = true;
-    }
-
-    this.eoblock = eoblock;
-    this.black = options.BlackIs1 || false;
-    this.codingLine = new Uint32Array(this.columns + 1);
-    this.refLine = new Uint32Array(this.columns + 2);
-    this.codingLine[0] = this.columns;
-    this.codingPos = 0;
-    this.row = 0;
-    this.nextLine2D = this.encoding < 0;
-    this.inputBits = 0;
-    this.inputBuf = 0;
-    this.outputBits = 0;
-    this.rowsDone = false;
-    let code1;
-
-    while ((code1 = this._lookBits(12)) === 0) {
-      this._eatBits(1);
-    }
-
-    if (code1 === 1) {
-      this._eatBits(12);
-    }
-
-    if (this.encoding > 0) {
-      this.nextLine2D = !this._lookBits(1);
-
-      this._eatBits(1);
-    }
-  }
-
-  CCITTFaxDecoder.prototype = {
-    readNextChar() {
-      if (this.eof) {
-        return -1;
-      }
-
-      const refLine = this.refLine;
-      const codingLine = this.codingLine;
-      const columns = this.columns;
-      let refPos, blackPixels, bits, i;
-
-      if (this.outputBits === 0) {
-        if (this.rowsDone) {
-          this.eof = true;
-        }
-
-        if (this.eof) {
-          return -1;
-        }
-
-        this.err = false;
-        let code1, code2, code3;
-
-        if (this.nextLine2D) {
-          for (i = 0; codingLine[i] < columns; ++i) {
-            refLine[i] = codingLine[i];
-          }
-
-          refLine[i++] = columns;
-          refLine[i] = columns;
-          codingLine[0] = 0;
-          this.codingPos = 0;
-          refPos = 0;
-          blackPixels = 0;
-
-          while (codingLine[this.codingPos] < columns) {
-            code1 = this._getTwoDimCode();
-
-            switch (code1) {
-              case twoDimPass:
-                this._addPixels(refLine[refPos + 1], blackPixels);
-
-                if (refLine[refPos + 1] < columns) {
-                  refPos += 2;
-                }
-
-                break;
-
-              case twoDimHoriz:
-                code1 = code2 = 0;
-
-                if (blackPixels) {
-                  do {
-                    code1 += code3 = this._getBlackCode();
-                  } while (code3 >= 64);
-
-                  do {
-                    code2 += code3 = this._getWhiteCode();
-                  } while (code3 >= 64);
-                } else {
-                  do {
-                    code1 += code3 = this._getWhiteCode();
-                  } while (code3 >= 64);
-
-                  do {
-                    code2 += code3 = this._getBlackCode();
-                  } while (code3 >= 64);
-                }
-
-                this._addPixels(codingLine[this.codingPos] + code1, blackPixels);
-
-                if (codingLine[this.codingPos] < columns) {
-                  this._addPixels(codingLine[this.codingPos] + code2, blackPixels ^ 1);
-                }
-
-                while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
-                  refPos += 2;
-                }
-
-                break;
-
-              case twoDimVertR3:
-                this._addPixels(refLine[refPos] + 3, blackPixels);
-
-                blackPixels ^= 1;
-
-                if (codingLine[this.codingPos] < columns) {
-                  ++refPos;
-
-                  while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
-                    refPos += 2;
-                  }
-                }
-
-                break;
-
-              case twoDimVertR2:
-                this._addPixels(refLine[refPos] + 2, blackPixels);
-
-                blackPixels ^= 1;
-
-                if (codingLine[this.codingPos] < columns) {
-                  ++refPos;
-
-                  while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
-                    refPos += 2;
-                  }
-                }
-
-                break;
-
-              case twoDimVertR1:
-                this._addPixels(refLine[refPos] + 1, blackPixels);
-
-                blackPixels ^= 1;
-
-                if (codingLine[this.codingPos] < columns) {
-                  ++refPos;
-
-                  while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
-                    refPos += 2;
-                  }
-                }
-
-                break;
-
-              case twoDimVert0:
-                this._addPixels(refLine[refPos], blackPixels);
-
-                blackPixels ^= 1;
-
-                if (codingLine[this.codingPos] < columns) {
-                  ++refPos;
-
-                  while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
-                    refPos += 2;
-                  }
-                }
-
-                break;
-
-              case twoDimVertL3:
-                this._addPixelsNeg(refLine[refPos] - 3, blackPixels);
-
-                blackPixels ^= 1;
-
-                if (codingLine[this.codingPos] < columns) {
-                  if (refPos > 0) {
-                    --refPos;
-                  } else {
-                    ++refPos;
-                  }
-
-                  while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
-                    refPos += 2;
-                  }
-                }
-
-                break;
-
-              case twoDimVertL2:
-                this._addPixelsNeg(refLine[refPos] - 2, blackPixels);
-
-                blackPixels ^= 1;
-
-                if (codingLine[this.codingPos] < columns) {
-                  if (refPos > 0) {
-                    --refPos;
-                  } else {
-                    ++refPos;
-                  }
-
-                  while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
-                    refPos += 2;
-                  }
-                }
-
-                break;
-
-              case twoDimVertL1:
-                this._addPixelsNeg(refLine[refPos] - 1, blackPixels);
-
-                blackPixels ^= 1;
-
-                if (codingLine[this.codingPos] < columns) {
-                  if (refPos > 0) {
-                    --refPos;
-                  } else {
-                    ++refPos;
-                  }
-
-                  while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
-                    refPos += 2;
-                  }
-                }
-
-                break;
-
-              case ccittEOF:
-                this._addPixels(columns, 0);
-
-                this.eof = true;
-                break;
-
-              default:
-                (0, _util.info)("bad 2d code");
-
-                this._addPixels(columns, 0);
-
-                this.err = true;
-            }
-          }
-        } else {
-          codingLine[0] = 0;
-          this.codingPos = 0;
-          blackPixels = 0;
-
-          while (codingLine[this.codingPos] < columns) {
-            code1 = 0;
-
-            if (blackPixels) {
-              do {
-                code1 += code3 = this._getBlackCode();
-              } while (code3 >= 64);
-            } else {
-              do {
-                code1 += code3 = this._getWhiteCode();
-              } while (code3 >= 64);
-            }
-
-            this._addPixels(codingLine[this.codingPos] + code1, blackPixels);
-
-            blackPixels ^= 1;
-          }
-        }
-
-        let gotEOL = false;
-
-        if (this.byteAlign) {
-          this.inputBits &= ~7;
-        }
-
-        if (!this.eoblock && this.row === this.rows - 1) {
-          this.rowsDone = true;
-        } else {
-          code1 = this._lookBits(12);
-
-          if (this.eoline) {
-            while (code1 !== ccittEOF && code1 !== 1) {
-              this._eatBits(1);
-
-              code1 = this._lookBits(12);
-            }
-          } else {
-            while (code1 === 0) {
-              this._eatBits(1);
-
-              code1 = this._lookBits(12);
-            }
-          }
-
-          if (code1 === 1) {
-            this._eatBits(12);
-
-            gotEOL = true;
-          } else if (code1 === ccittEOF) {
-            this.eof = true;
-          }
-        }
-
-        if (!this.eof && this.encoding > 0 && !this.rowsDone) {
-          this.nextLine2D = !this._lookBits(1);
-
-          this._eatBits(1);
-        }
-
-        if (this.eoblock && gotEOL && this.byteAlign) {
-          code1 = this._lookBits(12);
-
-          if (code1 === 1) {
-            this._eatBits(12);
-
-            if (this.encoding > 0) {
-              this._lookBits(1);
-
-              this._eatBits(1);
-            }
-
-            if (this.encoding >= 0) {
-              for (i = 0; i < 4; ++i) {
-                code1 = this._lookBits(12);
-
-                if (code1 !== 1) {
-                  (0, _util.info)("bad rtc code: " + code1);
-                }
-
-                this._eatBits(12);
-
-                if (this.encoding > 0) {
-                  this._lookBits(1);
-
-                  this._eatBits(1);
-                }
-              }
-            }
-
-            this.eof = true;
-          }
-        } else if (this.err && this.eoline) {
-          while (true) {
-            code1 = this._lookBits(13);
-
-            if (code1 === ccittEOF) {
-              this.eof = true;
-              return -1;
-            }
-
-            if (code1 >> 1 === 1) {
-              break;
-            }
-
-            this._eatBits(1);
-          }
-
-          this._eatBits(12);
-
-          if (this.encoding > 0) {
-            this._eatBits(1);
-
-            this.nextLine2D = !(code1 & 1);
-          }
-        }
-
-        if (codingLine[0] > 0) {
-          this.outputBits = codingLine[this.codingPos = 0];
-        } else {
-          this.outputBits = codingLine[this.codingPos = 1];
-        }
-
-        this.row++;
-      }
-
-      let c;
-
-      if (this.outputBits >= 8) {
-        c = this.codingPos & 1 ? 0 : 0xff;
-        this.outputBits -= 8;
-
-        if (this.outputBits === 0 && codingLine[this.codingPos] < columns) {
-          this.codingPos++;
-          this.outputBits = codingLine[this.codingPos] - codingLine[this.codingPos - 1];
-        }
-      } else {
-        bits = 8;
-        c = 0;
-
-        do {
-          if (this.outputBits > bits) {
-            c <<= bits;
-
-            if (!(this.codingPos & 1)) {
-              c |= 0xff >> 8 - bits;
-            }
-
-            this.outputBits -= bits;
-            bits = 0;
-          } else {
-            c <<= this.outputBits;
-
-            if (!(this.codingPos & 1)) {
-              c |= 0xff >> 8 - this.outputBits;
-            }
-
-            bits -= this.outputBits;
-            this.outputBits = 0;
-
-            if (codingLine[this.codingPos] < columns) {
-              this.codingPos++;
-              this.outputBits = codingLine[this.codingPos] - codingLine[this.codingPos - 1];
-            } else if (bits > 0) {
-              c <<= bits;
-              bits = 0;
-            }
-          }
-        } while (bits);
-      }
-
-      if (this.black) {
-        c ^= 0xff;
-      }
-
-      return c;
-    },
-
-    _addPixels(a1, blackPixels) {
-      const codingLine = this.codingLine;
-      let codingPos = this.codingPos;
-
-      if (a1 > codingLine[codingPos]) {
-        if (a1 > this.columns) {
-          (0, _util.info)("row is wrong length");
-          this.err = true;
-          a1 = this.columns;
-        }
-
-        if (codingPos & 1 ^ blackPixels) {
-          ++codingPos;
-        }
-
-        codingLine[codingPos] = a1;
-      }
-
-      this.codingPos = codingPos;
-    },
-
-    _addPixelsNeg(a1, blackPixels) {
-      const codingLine = this.codingLine;
-      let codingPos = this.codingPos;
-
-      if (a1 > codingLine[codingPos]) {
-        if (a1 > this.columns) {
-          (0, _util.info)("row is wrong length");
-          this.err = true;
-          a1 = this.columns;
-        }
-
-        if (codingPos & 1 ^ blackPixels) {
-          ++codingPos;
-        }
-
-        codingLine[codingPos] = a1;
-      } else if (a1 < codingLine[codingPos]) {
-        if (a1 < 0) {
-          (0, _util.info)("invalid code");
-          this.err = true;
-          a1 = 0;
-        }
-
-        while (codingPos > 0 && a1 < codingLine[codingPos - 1]) {
-          --codingPos;
-        }
-
-        codingLine[codingPos] = a1;
-      }
-
-      this.codingPos = codingPos;
-    },
-
-    _findTableCode(start, end, table, limit) {
-      const limitValue = limit || 0;
-
-      for (let i = start; i <= end; ++i) {
-        let code = this._lookBits(i);
-
-        if (code === ccittEOF) {
-          return [true, 1, false];
-        }
-
-        if (i < end) {
-          code <<= end - i;
-        }
-
-        if (!limitValue || code >= limitValue) {
-          const p = table[code - limitValue];
-
-          if (p[0] === i) {
-            this._eatBits(i);
-
-            return [true, p[1], true];
-          }
-        }
-      }
-
-      return [false, 0, false];
-    },
-
-    _getTwoDimCode() {
-      let code = 0;
-      let p;
-
-      if (this.eoblock) {
-        code = this._lookBits(7);
-        p = twoDimTable[code];
-
-        if (p && p[0] > 0) {
-          this._eatBits(p[0]);
-
-          return p[1];
-        }
-      } else {
-        const result = this._findTableCode(1, 7, twoDimTable);
-
-        if (result[0] && result[2]) {
-          return result[1];
-        }
-      }
-
-      (0, _util.info)("Bad two dim code");
-      return ccittEOF;
-    },
-
-    _getWhiteCode() {
-      let code = 0;
-      let p;
-
-      if (this.eoblock) {
-        code = this._lookBits(12);
-
-        if (code === ccittEOF) {
-          return 1;
-        }
-
-        if (code >> 5 === 0) {
-          p = whiteTable1[code];
-        } else {
-          p = whiteTable2[code >> 3];
-        }
-
-        if (p[0] > 0) {
-          this._eatBits(p[0]);
-
-          return p[1];
-        }
-      } else {
-        let result = this._findTableCode(1, 9, whiteTable2);
-
-        if (result[0]) {
-          return result[1];
-        }
-
-        result = this._findTableCode(11, 12, whiteTable1);
-
-        if (result[0]) {
-          return result[1];
-        }
-      }
-
-      (0, _util.info)("bad white code");
-
-      this._eatBits(1);
-
-      return 1;
-    },
-
-    _getBlackCode() {
-      let code, p;
-
-      if (this.eoblock) {
-        code = this._lookBits(13);
-
-        if (code === ccittEOF) {
-          return 1;
-        }
-
-        if (code >> 7 === 0) {
-          p = blackTable1[code];
-        } else if (code >> 9 === 0 && code >> 7 !== 0) {
-          p = blackTable2[(code >> 1) - 64];
-        } else {
-          p = blackTable3[code >> 7];
-        }
-
-        if (p[0] > 0) {
-          this._eatBits(p[0]);
-
-          return p[1];
-        }
-      } else {
-        let result = this._findTableCode(2, 6, blackTable3);
-
-        if (result[0]) {
-          return result[1];
-        }
-
-        result = this._findTableCode(7, 12, blackTable2, 64);
-
-        if (result[0]) {
-          return result[1];
-        }
-
-        result = this._findTableCode(10, 13, blackTable1);
-
-        if (result[0]) {
-          return result[1];
-        }
-      }
-
-      (0, _util.info)("bad black code");
-
-      this._eatBits(1);
-
-      return 1;
-    },
-
-    _lookBits(n) {
-      let c;
-
-      while (this.inputBits < n) {
-        if ((c = this.source.next()) === -1) {
-          if (this.inputBits === 0) {
-            return ccittEOF;
-          }
-
-          return this.inputBuf << n - this.inputBits & 0xffff >> 16 - n;
-        }
-
-        this.inputBuf = this.inputBuf << 8 | c;
-        this.inputBits += 8;
-      }
-
-      return this.inputBuf >> this.inputBits - n & 0xffff >> 16 - n;
-    },
-
-    _eatBits(n) {
-      if ((this.inputBits -= n) < 0) {
-        this.inputBits = 0;
-      }
-    }
-
-  };
-  return CCITTFaxDecoder;
-}();
-
-exports.CCITTFaxDecoder = CCITTFaxDecoder;
-
-/***/ }),
-/* 15 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Jbig2Stream = void 0;
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _stream = __w_pdfjs_require__(12);
-
-var _jbig = __w_pdfjs_require__(16);
-
-var _util = __w_pdfjs_require__(2);
-
-const Jbig2Stream = function Jbig2StreamClosure() {
-  function Jbig2Stream(stream, maybeLength, dict, params) {
-    this.stream = stream;
-    this.maybeLength = maybeLength;
-    this.dict = dict;
-    this.params = params;
-
-    _stream.DecodeStream.call(this, maybeLength);
-  }
-
-  Jbig2Stream.prototype = Object.create(_stream.DecodeStream.prototype);
-  Object.defineProperty(Jbig2Stream.prototype, "bytes", {
-    get() {
-      return (0, _util.shadow)(this, "bytes", this.stream.getBytes(this.maybeLength));
-    },
-
-    configurable: true
-  });
-
-  Jbig2Stream.prototype.ensureBuffer = function (requested) {};
-
-  Jbig2Stream.prototype.readBlock = function () {
-    if (this.eof) {
-      return;
-    }
-
-    const jbig2Image = new _jbig.Jbig2Image();
-    const chunks = [];
-
-    if ((0, _primitives.isDict)(this.params)) {
-      const globalsStream = this.params.get("JBIG2Globals");
-
-      if ((0, _primitives.isStream)(globalsStream)) {
-        const globals = globalsStream.getBytes();
-        chunks.push({
-          data: globals,
-          start: 0,
-          end: globals.length
-        });
-      }
-    }
-
-    chunks.push({
-      data: this.bytes,
-      start: 0,
-      end: this.bytes.length
-    });
-    const data = jbig2Image.parseChunks(chunks);
-    const dataLength = data.length;
-
-    for (let i = 0; i < dataLength; i++) {
-      data[i] ^= 0xff;
-    }
-
-    this.buffer = data;
-    this.bufferLength = dataLength;
-    this.eof = true;
-  };
-
-  return Jbig2Stream;
-}();
-
-exports.Jbig2Stream = Jbig2Stream;
-
-/***/ }),
-/* 16 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Jbig2Image = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var _core_utils = __w_pdfjs_require__(8);
-
-var _arithmetic_decoder = __w_pdfjs_require__(17);
-
-var _ccitt = __w_pdfjs_require__(14);
-
-class Jbig2Error extends _util.BaseException {
-  constructor(msg) {
-    super(`JBIG2 error: ${msg}`);
-  }
-
-}
-
-var Jbig2Image = function Jbig2ImageClosure() {
-  function ContextCache() {}
-
-  ContextCache.prototype = {
-    getContexts(id) {
-      if (id in this) {
-        return this[id];
-      }
-
-      return this[id] = new Int8Array(1 << 16);
-    }
-
-  };
-
-  function DecodingContext(data, start, end) {
-    this.data = data;
-    this.start = start;
-    this.end = end;
-  }
-
-  DecodingContext.prototype = {
-    get decoder() {
-      var decoder = new _arithmetic_decoder.ArithmeticDecoder(this.data, this.start, this.end);
-      return (0, _util.shadow)(this, "decoder", decoder);
-    },
-
-    get contextCache() {
-      var cache = new ContextCache();
-      return (0, _util.shadow)(this, "contextCache", cache);
-    }
-
-  };
-
-  function decodeInteger(contextCache, procedure, decoder) {
-    var contexts = contextCache.getContexts(procedure);
-    var prev = 1;
-
-    function readBits(length) {
-      var v = 0;
-
-      for (var i = 0; i < length; i++) {
-        var bit = decoder.readBit(contexts, prev);
-        prev = prev < 256 ? prev << 1 | bit : (prev << 1 | bit) & 511 | 256;
-        v = v << 1 | bit;
-      }
-
-      return v >>> 0;
-    }
-
-    var sign = readBits(1);
-    var value = readBits(1) ? readBits(1) ? readBits(1) ? readBits(1) ? readBits(1) ? readBits(32) + 4436 : readBits(12) + 340 : readBits(8) + 84 : readBits(6) + 20 : readBits(4) + 4 : readBits(2);
-
-    if (sign === 0) {
-      return value;
-    } else if (value > 0) {
-      return -value;
-    }
-
-    return null;
-  }
-
-  function decodeIAID(contextCache, decoder, codeLength) {
-    var contexts = contextCache.getContexts("IAID");
-    var prev = 1;
-
-    for (var i = 0; i < codeLength; i++) {
-      var bit = decoder.readBit(contexts, prev);
-      prev = prev << 1 | bit;
-    }
-
-    if (codeLength < 31) {
-      return prev & (1 << codeLength) - 1;
-    }
-
-    return prev & 0x7fffffff;
-  }
-
-  var SegmentTypes = ["SymbolDictionary", null, null, null, "IntermediateTextRegion", null, "ImmediateTextRegion", "ImmediateLosslessTextRegion", null, null, null, null, null, null, null, null, "PatternDictionary", null, null, null, "IntermediateHalftoneRegion", null, "ImmediateHalftoneRegion", "ImmediateLosslessHalftoneRegion", null, null, null, null, null, null, null, null, null, null, null, null, "IntermediateGenericRegion", null, "ImmediateGenericRegion", "ImmediateLosslessGenericRegion", "IntermediateGenericRefinementRegion", null, "ImmediateGenericRefinementRegion", "ImmediateLosslessGenericRefinementRegion", null, null, null, null, "PageInformation", "EndOfPage", "EndOfStripe", "EndOfFile", "Profiles", "Tables", null, null, null, null, null, null, null, null, "Extension"];
-  var CodingTemplates = [[{
-    x: -1,
-    y: -2
-  }, {
-    x: 0,
-    y: -2
-  }, {
-    x: 1,
-    y: -2
-  }, {
-    x: -2,
-    y: -1
-  }, {
-    x: -1,
-    y: -1
-  }, {
-    x: 0,
-    y: -1
-  }, {
-    x: 1,
-    y: -1
-  }, {
-    x: 2,
-    y: -1
-  }, {
-    x: -4,
-    y: 0
-  }, {
-    x: -3,
-    y: 0
-  }, {
-    x: -2,
-    y: 0
-  }, {
-    x: -1,
-    y: 0
-  }], [{
-    x: -1,
-    y: -2
-  }, {
-    x: 0,
-    y: -2
-  }, {
-    x: 1,
-    y: -2
-  }, {
-    x: 2,
-    y: -2
-  }, {
-    x: -2,
-    y: -1
-  }, {
-    x: -1,
-    y: -1
-  }, {
-    x: 0,
-    y: -1
-  }, {
-    x: 1,
-    y: -1
-  }, {
-    x: 2,
-    y: -1
-  }, {
-    x: -3,
-    y: 0
-  }, {
-    x: -2,
-    y: 0
-  }, {
-    x: -1,
-    y: 0
-  }], [{
-    x: -1,
-    y: -2
-  }, {
-    x: 0,
-    y: -2
-  }, {
-    x: 1,
-    y: -2
-  }, {
-    x: -2,
-    y: -1
-  }, {
-    x: -1,
-    y: -1
-  }, {
-    x: 0,
-    y: -1
-  }, {
-    x: 1,
-    y: -1
-  }, {
-    x: -2,
-    y: 0
-  }, {
-    x: -1,
-    y: 0
-  }], [{
-    x: -3,
-    y: -1
-  }, {
-    x: -2,
-    y: -1
-  }, {
-    x: -1,
-    y: -1
-  }, {
-    x: 0,
-    y: -1
-  }, {
-    x: 1,
-    y: -1
-  }, {
-    x: -4,
-    y: 0
-  }, {
-    x: -3,
-    y: 0
-  }, {
-    x: -2,
-    y: 0
-  }, {
-    x: -1,
-    y: 0
-  }]];
-  var RefinementTemplates = [{
-    coding: [{
-      x: 0,
-      y: -1
-    }, {
-      x: 1,
-      y: -1
-    }, {
-      x: -1,
-      y: 0
-    }],
-    reference: [{
-      x: 0,
-      y: -1
-    }, {
-      x: 1,
-      y: -1
-    }, {
-      x: -1,
-      y: 0
-    }, {
-      x: 0,
-      y: 0
-    }, {
-      x: 1,
-      y: 0
-    }, {
-      x: -1,
-      y: 1
-    }, {
-      x: 0,
-      y: 1
-    }, {
-      x: 1,
-      y: 1
-    }]
-  }, {
-    coding: [{
-      x: -1,
-      y: -1
-    }, {
-      x: 0,
-      y: -1
-    }, {
-      x: 1,
-      y: -1
-    }, {
-      x: -1,
-      y: 0
-    }],
-    reference: [{
-      x: 0,
-      y: -1
-    }, {
-      x: -1,
-      y: 0
-    }, {
-      x: 0,
-      y: 0
-    }, {
-      x: 1,
-      y: 0
-    }, {
-      x: 0,
-      y: 1
-    }, {
-      x: 1,
-      y: 1
-    }]
-  }];
-  var ReusedContexts = [0x9b25, 0x0795, 0x00e5, 0x0195];
-  var RefinementReusedContexts = [0x0020, 0x0008];
-
-  function decodeBitmapTemplate0(width, height, decodingContext) {
-    var decoder = decodingContext.decoder;
-    var contexts = decodingContext.contextCache.getContexts("GB");
-    var contextLabel,
-        i,
-        j,
-        pixel,
-        row,
-        row1,
-        row2,
-        bitmap = [];
-    var OLD_PIXEL_MASK = 0x7bf7;
-
-    for (i = 0; i < height; i++) {
-      row = bitmap[i] = new Uint8Array(width);
-      row1 = i < 1 ? row : bitmap[i - 1];
-      row2 = i < 2 ? row : bitmap[i - 2];
-      contextLabel = row2[0] << 13 | row2[1] << 12 | row2[2] << 11 | row1[0] << 7 | row1[1] << 6 | row1[2] << 5 | row1[3] << 4;
-
-      for (j = 0; j < width; j++) {
-        row[j] = pixel = decoder.readBit(contexts, contextLabel);
-        contextLabel = (contextLabel & OLD_PIXEL_MASK) << 1 | (j + 3 < width ? row2[j + 3] << 11 : 0) | (j + 4 < width ? row1[j + 4] << 4 : 0) | pixel;
-      }
-    }
-
-    return bitmap;
-  }
-
-  function decodeBitmap(mmr, width, height, templateIndex, prediction, skip, at, decodingContext) {
-    if (mmr) {
-      const input = new Reader(decodingContext.data, decodingContext.start, decodingContext.end);
-      return decodeMMRBitmap(input, width, height, false);
-    }
-
-    if (templateIndex === 0 && !skip && !prediction && at.length === 4 && at[0].x === 3 && at[0].y === -1 && at[1].x === -3 && at[1].y === -1 && at[2].x === 2 && at[2].y === -2 && at[3].x === -2 && at[3].y === -2) {
-      return decodeBitmapTemplate0(width, height, decodingContext);
-    }
-
-    var useskip = !!skip;
-    var template = CodingTemplates[templateIndex].concat(at);
-    template.sort(function (a, b) {
-      return a.y - b.y || a.x - b.x;
-    });
-    var templateLength = template.length;
-    var templateX = new Int8Array(templateLength);
-    var templateY = new Int8Array(templateLength);
-    var changingTemplateEntries = [];
-    var reuseMask = 0,
-        minX = 0,
-        maxX = 0,
-        minY = 0;
-    var c, k;
-
-    for (k = 0; k < templateLength; k++) {
-      templateX[k] = template[k].x;
-      templateY[k] = template[k].y;
-      minX = Math.min(minX, template[k].x);
-      maxX = Math.max(maxX, template[k].x);
-      minY = Math.min(minY, template[k].y);
-
-      if (k < templateLength - 1 && template[k].y === template[k + 1].y && template[k].x === template[k + 1].x - 1) {
-        reuseMask |= 1 << templateLength - 1 - k;
-      } else {
-        changingTemplateEntries.push(k);
-      }
-    }
-
-    var changingEntriesLength = changingTemplateEntries.length;
-    var changingTemplateX = new Int8Array(changingEntriesLength);
-    var changingTemplateY = new Int8Array(changingEntriesLength);
-    var changingTemplateBit = new Uint16Array(changingEntriesLength);
-
-    for (c = 0; c < changingEntriesLength; c++) {
-      k = changingTemplateEntries[c];
-      changingTemplateX[c] = template[k].x;
-      changingTemplateY[c] = template[k].y;
-      changingTemplateBit[c] = 1 << templateLength - 1 - k;
-    }
-
-    var sbb_left = -minX;
-    var sbb_top = -minY;
-    var sbb_right = width - maxX;
-    var pseudoPixelContext = ReusedContexts[templateIndex];
-    var row = new Uint8Array(width);
-    var bitmap = [];
-    var decoder = decodingContext.decoder;
-    var contexts = decodingContext.contextCache.getContexts("GB");
-    var ltp = 0,
-        j,
-        i0,
-        j0,
-        contextLabel = 0,
-        bit,
-        shift;
-
-    for (var i = 0; i < height; i++) {
-      if (prediction) {
-        var sltp = decoder.readBit(contexts, pseudoPixelContext);
-        ltp ^= sltp;
-
-        if (ltp) {
-          bitmap.push(row);
-          continue;
-        }
-      }
-
-      row = new Uint8Array(row);
-      bitmap.push(row);
-
-      for (j = 0; j < width; j++) {
-        if (useskip && skip[i][j]) {
-          row[j] = 0;
-          continue;
-        }
-
-        if (j >= sbb_left && j < sbb_right && i >= sbb_top) {
-          contextLabel = contextLabel << 1 & reuseMask;
-
-          for (k = 0; k < changingEntriesLength; k++) {
-            i0 = i + changingTemplateY[k];
-            j0 = j + changingTemplateX[k];
-            bit = bitmap[i0][j0];
-
-            if (bit) {
-              bit = changingTemplateBit[k];
-              contextLabel |= bit;
-            }
-          }
-        } else {
-          contextLabel = 0;
-          shift = templateLength - 1;
-
-          for (k = 0; k < templateLength; k++, shift--) {
-            j0 = j + templateX[k];
-
-            if (j0 >= 0 && j0 < width) {
-              i0 = i + templateY[k];
-
-              if (i0 >= 0) {
-                bit = bitmap[i0][j0];
-
-                if (bit) {
-                  contextLabel |= bit << shift;
-                }
-              }
-            }
-          }
-        }
-
-        var pixel = decoder.readBit(contexts, contextLabel);
-        row[j] = pixel;
-      }
-    }
-
-    return bitmap;
-  }
-
-  function decodeRefinement(width, height, templateIndex, referenceBitmap, offsetX, offsetY, prediction, at, decodingContext) {
-    var codingTemplate = RefinementTemplates[templateIndex].coding;
-
-    if (templateIndex === 0) {
-      codingTemplate = codingTemplate.concat([at[0]]);
-    }
-
-    var codingTemplateLength = codingTemplate.length;
-    var codingTemplateX = new Int32Array(codingTemplateLength);
-    var codingTemplateY = new Int32Array(codingTemplateLength);
-    var k;
-
-    for (k = 0; k < codingTemplateLength; k++) {
-      codingTemplateX[k] = codingTemplate[k].x;
-      codingTemplateY[k] = codingTemplate[k].y;
-    }
-
-    var referenceTemplate = RefinementTemplates[templateIndex].reference;
-
-    if (templateIndex === 0) {
-      referenceTemplate = referenceTemplate.concat([at[1]]);
-    }
-
-    var referenceTemplateLength = referenceTemplate.length;
-    var referenceTemplateX = new Int32Array(referenceTemplateLength);
-    var referenceTemplateY = new Int32Array(referenceTemplateLength);
-
-    for (k = 0; k < referenceTemplateLength; k++) {
-      referenceTemplateX[k] = referenceTemplate[k].x;
-      referenceTemplateY[k] = referenceTemplate[k].y;
-    }
-
-    var referenceWidth = referenceBitmap[0].length;
-    var referenceHeight = referenceBitmap.length;
-    var pseudoPixelContext = RefinementReusedContexts[templateIndex];
-    var bitmap = [];
-    var decoder = decodingContext.decoder;
-    var contexts = decodingContext.contextCache.getContexts("GR");
-    var ltp = 0;
-
-    for (var i = 0; i < height; i++) {
-      if (prediction) {
-        var sltp = decoder.readBit(contexts, pseudoPixelContext);
-        ltp ^= sltp;
-
-        if (ltp) {
-          throw new Jbig2Error("prediction is not supported");
-        }
-      }
-
-      var row = new Uint8Array(width);
-      bitmap.push(row);
-
-      for (var j = 0; j < width; j++) {
-        var i0, j0;
-        var contextLabel = 0;
-
-        for (k = 0; k < codingTemplateLength; k++) {
-          i0 = i + codingTemplateY[k];
-          j0 = j + codingTemplateX[k];
-
-          if (i0 < 0 || j0 < 0 || j0 >= width) {
-            contextLabel <<= 1;
-          } else {
-            contextLabel = contextLabel << 1 | bitmap[i0][j0];
-          }
-        }
-
-        for (k = 0; k < referenceTemplateLength; k++) {
-          i0 = i + referenceTemplateY[k] - offsetY;
-          j0 = j + referenceTemplateX[k] - offsetX;
-
-          if (i0 < 0 || i0 >= referenceHeight || j0 < 0 || j0 >= referenceWidth) {
-            contextLabel <<= 1;
-          } else {
-            contextLabel = contextLabel << 1 | referenceBitmap[i0][j0];
-          }
-        }
-
-        var pixel = decoder.readBit(contexts, contextLabel);
-        row[j] = pixel;
-      }
-    }
-
-    return bitmap;
-  }
-
-  function decodeSymbolDictionary(huffman, refinement, symbols, numberOfNewSymbols, numberOfExportedSymbols, huffmanTables, templateIndex, at, refinementTemplateIndex, refinementAt, decodingContext, huffmanInput) {
-    if (huffman && refinement) {
-      throw new Jbig2Error("symbol refinement with Huffman is not supported");
-    }
-
-    var newSymbols = [];
-    var currentHeight = 0;
-    var symbolCodeLength = (0, _core_utils.log2)(symbols.length + numberOfNewSymbols);
-    var decoder = decodingContext.decoder;
-    var contextCache = decodingContext.contextCache;
-    let tableB1, symbolWidths;
-
-    if (huffman) {
-      tableB1 = getStandardTable(1);
-      symbolWidths = [];
-      symbolCodeLength = Math.max(symbolCodeLength, 1);
-    }
-
-    while (newSymbols.length < numberOfNewSymbols) {
-      var deltaHeight = huffman ? huffmanTables.tableDeltaHeight.decode(huffmanInput) : decodeInteger(contextCache, "IADH", decoder);
-      currentHeight += deltaHeight;
-      let currentWidth = 0,
-          totalWidth = 0;
-      const firstSymbol = huffman ? symbolWidths.length : 0;
-
-      while (true) {
-        var deltaWidth = huffman ? huffmanTables.tableDeltaWidth.decode(huffmanInput) : decodeInteger(contextCache, "IADW", decoder);
-
-        if (deltaWidth === null) {
-          break;
-        }
-
-        currentWidth += deltaWidth;
-        totalWidth += currentWidth;
-        var bitmap;
-
-        if (refinement) {
-          var numberOfInstances = decodeInteger(contextCache, "IAAI", decoder);
-
-          if (numberOfInstances > 1) {
-            bitmap = decodeTextRegion(huffman, refinement, currentWidth, currentHeight, 0, numberOfInstances, 1, symbols.concat(newSymbols), symbolCodeLength, 0, 0, 1, 0, huffmanTables, refinementTemplateIndex, refinementAt, decodingContext, 0, huffmanInput);
-          } else {
-            var symbolId = decodeIAID(contextCache, decoder, symbolCodeLength);
-            var rdx = decodeInteger(contextCache, "IARDX", decoder);
-            var rdy = decodeInteger(contextCache, "IARDY", decoder);
-            var symbol = symbolId < symbols.length ? symbols[symbolId] : newSymbols[symbolId - symbols.length];
-            bitmap = decodeRefinement(currentWidth, currentHeight, refinementTemplateIndex, symbol, rdx, rdy, false, refinementAt, decodingContext);
-          }
-
-          newSymbols.push(bitmap);
-        } else if (huffman) {
-          symbolWidths.push(currentWidth);
-        } else {
-          bitmap = decodeBitmap(false, currentWidth, currentHeight, templateIndex, false, null, at, decodingContext);
-          newSymbols.push(bitmap);
-        }
-      }
-
-      if (huffman && !refinement) {
-        const bitmapSize = huffmanTables.tableBitmapSize.decode(huffmanInput);
-        huffmanInput.byteAlign();
-        let collectiveBitmap;
-
-        if (bitmapSize === 0) {
-          collectiveBitmap = readUncompressedBitmap(huffmanInput, totalWidth, currentHeight);
-        } else {
-          const originalEnd = huffmanInput.end;
-          const bitmapEnd = huffmanInput.position + bitmapSize;
-          huffmanInput.end = bitmapEnd;
-          collectiveBitmap = decodeMMRBitmap(huffmanInput, totalWidth, currentHeight, false);
-          huffmanInput.end = originalEnd;
-          huffmanInput.position = bitmapEnd;
-        }
-
-        const numberOfSymbolsDecoded = symbolWidths.length;
-
-        if (firstSymbol === numberOfSymbolsDecoded - 1) {
-          newSymbols.push(collectiveBitmap);
-        } else {
-          let i,
-              y,
-              xMin = 0,
-              xMax,
-              bitmapWidth,
-              symbolBitmap;
-
-          for (i = firstSymbol; i < numberOfSymbolsDecoded; i++) {
-            bitmapWidth = symbolWidths[i];
-            xMax = xMin + bitmapWidth;
-            symbolBitmap = [];
-
-            for (y = 0; y < currentHeight; y++) {
-              symbolBitmap.push(collectiveBitmap[y].subarray(xMin, xMax));
-            }
-
-            newSymbols.push(symbolBitmap);
-            xMin = xMax;
-          }
-        }
-      }
-    }
-
-    var exportedSymbols = [];
-    var flags = [],
-        currentFlag = false;
-    var totalSymbolsLength = symbols.length + numberOfNewSymbols;
-
-    while (flags.length < totalSymbolsLength) {
-      var runLength = huffman ? tableB1.decode(huffmanInput) : decodeInteger(contextCache, "IAEX", decoder);
-
-      while (runLength--) {
-        flags.push(currentFlag);
-      }
-
-      currentFlag = !currentFlag;
-    }
-
-    for (var i = 0, ii = symbols.length; i < ii; i++) {
-      if (flags[i]) {
-        exportedSymbols.push(symbols[i]);
-      }
-    }
-
-    for (var j = 0; j < numberOfNewSymbols; i++, j++) {
-      if (flags[i]) {
-        exportedSymbols.push(newSymbols[j]);
-      }
-    }
-
-    return exportedSymbols;
-  }
-
-  function decodeTextRegion(huffman, refinement, width, height, defaultPixelValue, numberOfSymbolInstances, stripSize, inputSymbols, symbolCodeLength, transposed, dsOffset, referenceCorner, combinationOperator, huffmanTables, refinementTemplateIndex, refinementAt, decodingContext, logStripSize, huffmanInput) {
-    if (huffman && refinement) {
-      throw new Jbig2Error("refinement with Huffman is not supported");
-    }
-
-    var bitmap = [];
-    var i, row;
-
-    for (i = 0; i < height; i++) {
-      row = new Uint8Array(width);
-
-      if (defaultPixelValue) {
-        for (var j = 0; j < width; j++) {
-          row[j] = defaultPixelValue;
-        }
-      }
-
-      bitmap.push(row);
-    }
-
-    var decoder = decodingContext.decoder;
-    var contextCache = decodingContext.contextCache;
-    var stripT = huffman ? -huffmanTables.tableDeltaT.decode(huffmanInput) : -decodeInteger(contextCache, "IADT", decoder);
-    var firstS = 0;
-    i = 0;
-
-    while (i < numberOfSymbolInstances) {
-      var deltaT = huffman ? huffmanTables.tableDeltaT.decode(huffmanInput) : decodeInteger(contextCache, "IADT", decoder);
-      stripT += deltaT;
-      var deltaFirstS = huffman ? huffmanTables.tableFirstS.decode(huffmanInput) : decodeInteger(contextCache, "IAFS", decoder);
-      firstS += deltaFirstS;
-      var currentS = firstS;
-
-      do {
-        let currentT = 0;
-
-        if (stripSize > 1) {
-          currentT = huffman ? huffmanInput.readBits(logStripSize) : decodeInteger(contextCache, "IAIT", decoder);
-        }
-
-        var t = stripSize * stripT + currentT;
-        var symbolId = huffman ? huffmanTables.symbolIDTable.decode(huffmanInput) : decodeIAID(contextCache, decoder, symbolCodeLength);
-        var applyRefinement = refinement && (huffman ? huffmanInput.readBit() : decodeInteger(contextCache, "IARI", decoder));
-        var symbolBitmap = inputSymbols[symbolId];
-        var symbolWidth = symbolBitmap[0].length;
-        var symbolHeight = symbolBitmap.length;
-
-        if (applyRefinement) {
-          var rdw = decodeInteger(contextCache, "IARDW", decoder);
-          var rdh = decodeInteger(contextCache, "IARDH", decoder);
-          var rdx = decodeInteger(contextCache, "IARDX", decoder);
-          var rdy = decodeInteger(contextCache, "IARDY", decoder);
-          symbolWidth += rdw;
-          symbolHeight += rdh;
-          symbolBitmap = decodeRefinement(symbolWidth, symbolHeight, refinementTemplateIndex, symbolBitmap, (rdw >> 1) + rdx, (rdh >> 1) + rdy, false, refinementAt, decodingContext);
-        }
-
-        var offsetT = t - (referenceCorner & 1 ? 0 : symbolHeight - 1);
-        var offsetS = currentS - (referenceCorner & 2 ? symbolWidth - 1 : 0);
-        var s2, t2, symbolRow;
-
-        if (transposed) {
-          for (s2 = 0; s2 < symbolHeight; s2++) {
-            row = bitmap[offsetS + s2];
-
-            if (!row) {
-              continue;
-            }
-
-            symbolRow = symbolBitmap[s2];
-            var maxWidth = Math.min(width - offsetT, symbolWidth);
-
-            switch (combinationOperator) {
-              case 0:
-                for (t2 = 0; t2 < maxWidth; t2++) {
-                  row[offsetT + t2] |= symbolRow[t2];
-                }
-
-                break;
-
-              case 2:
-                for (t2 = 0; t2 < maxWidth; t2++) {
-                  row[offsetT + t2] ^= symbolRow[t2];
-                }
-
-                break;
-
-              default:
-                throw new Jbig2Error(`operator ${combinationOperator} is not supported`);
-            }
-          }
-
-          currentS += symbolHeight - 1;
-        } else {
-          for (t2 = 0; t2 < symbolHeight; t2++) {
-            row = bitmap[offsetT + t2];
-
-            if (!row) {
-              continue;
-            }
-
-            symbolRow = symbolBitmap[t2];
-
-            switch (combinationOperator) {
-              case 0:
-                for (s2 = 0; s2 < symbolWidth; s2++) {
-                  row[offsetS + s2] |= symbolRow[s2];
-                }
-
-                break;
-
-              case 2:
-                for (s2 = 0; s2 < symbolWidth; s2++) {
-                  row[offsetS + s2] ^= symbolRow[s2];
-                }
-
-                break;
-
-              default:
-                throw new Jbig2Error(`operator ${combinationOperator} is not supported`);
-            }
-          }
-
-          currentS += symbolWidth - 1;
-        }
-
-        i++;
-        var deltaS = huffman ? huffmanTables.tableDeltaS.decode(huffmanInput) : decodeInteger(contextCache, "IADS", decoder);
-
-        if (deltaS === null) {
-          break;
-        }
-
-        currentS += deltaS + dsOffset;
-      } while (true);
-    }
-
-    return bitmap;
-  }
-
-  function decodePatternDictionary(mmr, patternWidth, patternHeight, maxPatternIndex, template, decodingContext) {
-    const at = [];
-
-    if (!mmr) {
-      at.push({
-        x: -patternWidth,
-        y: 0
-      });
-
-      if (template === 0) {
-        at.push({
-          x: -3,
-          y: -1
-        });
-        at.push({
-          x: 2,
-          y: -2
-        });
-        at.push({
-          x: -2,
-          y: -2
-        });
-      }
-    }
-
-    const collectiveWidth = (maxPatternIndex + 1) * patternWidth;
-    const collectiveBitmap = decodeBitmap(mmr, collectiveWidth, patternHeight, template, false, null, at, decodingContext);
-    const patterns = [];
-
-    for (let i = 0; i <= maxPatternIndex; i++) {
-      const patternBitmap = [];
-      const xMin = patternWidth * i;
-      const xMax = xMin + patternWidth;
-
-      for (let y = 0; y < patternHeight; y++) {
-        patternBitmap.push(collectiveBitmap[y].subarray(xMin, xMax));
-      }
-
-      patterns.push(patternBitmap);
-    }
-
-    return patterns;
-  }
-
-  function decodeHalftoneRegion(mmr, patterns, template, regionWidth, regionHeight, defaultPixelValue, enableSkip, combinationOperator, gridWidth, gridHeight, gridOffsetX, gridOffsetY, gridVectorX, gridVectorY, decodingContext) {
-    const skip = null;
-
-    if (enableSkip) {
-      throw new Jbig2Error("skip is not supported");
-    }
-
-    if (combinationOperator !== 0) {
-      throw new Jbig2Error("operator " + combinationOperator + " is not supported in halftone region");
-    }
-
-    const regionBitmap = [];
-    let i, j, row;
-
-    for (i = 0; i < regionHeight; i++) {
-      row = new Uint8Array(regionWidth);
-
-      if (defaultPixelValue) {
-        for (j = 0; j < regionWidth; j++) {
-          row[j] = defaultPixelValue;
-        }
-      }
-
-      regionBitmap.push(row);
-    }
-
-    const numberOfPatterns = patterns.length;
-    const pattern0 = patterns[0];
-    const patternWidth = pattern0[0].length,
-          patternHeight = pattern0.length;
-    const bitsPerValue = (0, _core_utils.log2)(numberOfPatterns);
-    const at = [];
-
-    if (!mmr) {
-      at.push({
-        x: template <= 1 ? 3 : 2,
-        y: -1
-      });
-
-      if (template === 0) {
-        at.push({
-          x: -3,
-          y: -1
-        });
-        at.push({
-          x: 2,
-          y: -2
-        });
-        at.push({
-          x: -2,
-          y: -2
-        });
-      }
-    }
-
-    const grayScaleBitPlanes = [];
-    let mmrInput, bitmap;
-
-    if (mmr) {
-      mmrInput = new Reader(decodingContext.data, decodingContext.start, decodingContext.end);
-    }
-
-    for (i = bitsPerValue - 1; i >= 0; i--) {
-      if (mmr) {
-        bitmap = decodeMMRBitmap(mmrInput, gridWidth, gridHeight, true);
-      } else {
-        bitmap = decodeBitmap(false, gridWidth, gridHeight, template, false, skip, at, decodingContext);
-      }
-
-      grayScaleBitPlanes[i] = bitmap;
-    }
-
-    let mg, ng, bit, patternIndex, patternBitmap, x, y, patternRow, regionRow;
-
-    for (mg = 0; mg < gridHeight; mg++) {
-      for (ng = 0; ng < gridWidth; ng++) {
-        bit = 0;
-        patternIndex = 0;
-
-        for (j = bitsPerValue - 1; j >= 0; j--) {
-          bit = grayScaleBitPlanes[j][mg][ng] ^ bit;
-          patternIndex |= bit << j;
-        }
-
-        patternBitmap = patterns[patternIndex];
-        x = gridOffsetX + mg * gridVectorY + ng * gridVectorX >> 8;
-        y = gridOffsetY + mg * gridVectorX - ng * gridVectorY >> 8;
-
-        if (x >= 0 && x + patternWidth <= regionWidth && y >= 0 && y + patternHeight <= regionHeight) {
-          for (i = 0; i < patternHeight; i++) {
-            regionRow = regionBitmap[y + i];
-            patternRow = patternBitmap[i];
-
-            for (j = 0; j < patternWidth; j++) {
-              regionRow[x + j] |= patternRow[j];
-            }
-          }
-        } else {
-          let regionX, regionY;
-
-          for (i = 0; i < patternHeight; i++) {
-            regionY = y + i;
-
-            if (regionY < 0 || regionY >= regionHeight) {
-              continue;
-            }
-
-            regionRow = regionBitmap[regionY];
-            patternRow = patternBitmap[i];
-
-            for (j = 0; j < patternWidth; j++) {
-              regionX = x + j;
-
-              if (regionX >= 0 && regionX < regionWidth) {
-                regionRow[regionX] |= patternRow[j];
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return regionBitmap;
-  }
-
-  function readSegmentHeader(data, start) {
-    var segmentHeader = {};
-    segmentHeader.number = (0, _core_utils.readUint32)(data, start);
-    var flags = data[start + 4];
-    var segmentType = flags & 0x3f;
-
-    if (!SegmentTypes[segmentType]) {
-      throw new Jbig2Error("invalid segment type: " + segmentType);
-    }
-
-    segmentHeader.type = segmentType;
-    segmentHeader.typeName = SegmentTypes[segmentType];
-    segmentHeader.deferredNonRetain = !!(flags & 0x80);
-    var pageAssociationFieldSize = !!(flags & 0x40);
-    var referredFlags = data[start + 5];
-    var referredToCount = referredFlags >> 5 & 7;
-    var retainBits = [referredFlags & 31];
-    var position = start + 6;
-
-    if (referredFlags === 7) {
-      referredToCount = (0, _core_utils.readUint32)(data, position - 1) & 0x1fffffff;
-      position += 3;
-      var bytes = referredToCount + 7 >> 3;
-      retainBits[0] = data[position++];
-
-      while (--bytes > 0) {
-        retainBits.push(data[position++]);
-      }
-    } else if (referredFlags === 5 || referredFlags === 6) {
-      throw new Jbig2Error("invalid referred-to flags");
-    }
-
-    segmentHeader.retainBits = retainBits;
-    let referredToSegmentNumberSize = 4;
-
-    if (segmentHeader.number <= 256) {
-      referredToSegmentNumberSize = 1;
-    } else if (segmentHeader.number <= 65536) {
-      referredToSegmentNumberSize = 2;
-    }
-
-    var referredTo = [];
-    var i, ii;
-
-    for (i = 0; i < referredToCount; i++) {
-      let number;
-
-      if (referredToSegmentNumberSize === 1) {
-        number = data[position];
-      } else if (referredToSegmentNumberSize === 2) {
-        number = (0, _core_utils.readUint16)(data, position);
-      } else {
-        number = (0, _core_utils.readUint32)(data, position);
-      }
-
-      referredTo.push(number);
-      position += referredToSegmentNumberSize;
-    }
-
-    segmentHeader.referredTo = referredTo;
-
-    if (!pageAssociationFieldSize) {
-      segmentHeader.pageAssociation = data[position++];
-    } else {
-      segmentHeader.pageAssociation = (0, _core_utils.readUint32)(data, position);
-      position += 4;
-    }
-
-    segmentHeader.length = (0, _core_utils.readUint32)(data, position);
-    position += 4;
-
-    if (segmentHeader.length === 0xffffffff) {
-      if (segmentType === 38) {
-        var genericRegionInfo = readRegionSegmentInformation(data, position);
-        var genericRegionSegmentFlags = data[position + RegionSegmentInformationFieldLength];
-        var genericRegionMmr = !!(genericRegionSegmentFlags & 1);
-        var searchPatternLength = 6;
-        var searchPattern = new Uint8Array(searchPatternLength);
-
-        if (!genericRegionMmr) {
-          searchPattern[0] = 0xff;
-          searchPattern[1] = 0xac;
-        }
-
-        searchPattern[2] = genericRegionInfo.height >>> 24 & 0xff;
-        searchPattern[3] = genericRegionInfo.height >> 16 & 0xff;
-        searchPattern[4] = genericRegionInfo.height >> 8 & 0xff;
-        searchPattern[5] = genericRegionInfo.height & 0xff;
-
-        for (i = position, ii = data.length; i < ii; i++) {
-          var j = 0;
-
-          while (j < searchPatternLength && searchPattern[j] === data[i + j]) {
-            j++;
-          }
-
-          if (j === searchPatternLength) {
-            segmentHeader.length = i + searchPatternLength;
-            break;
-          }
-        }
-
-        if (segmentHeader.length === 0xffffffff) {
-          throw new Jbig2Error("segment end was not found");
-        }
-      } else {
-        throw new Jbig2Error("invalid unknown segment length");
-      }
-    }
-
-    segmentHeader.headerEnd = position;
-    return segmentHeader;
-  }
-
-  function readSegments(header, data, start, end) {
-    var segments = [];
-    var position = start;
-
-    while (position < end) {
-      var segmentHeader = readSegmentHeader(data, position);
-      position = segmentHeader.headerEnd;
-      var segment = {
-        header: segmentHeader,
-        data
-      };
-
-      if (!header.randomAccess) {
-        segment.start = position;
-        position += segmentHeader.length;
-        segment.end = position;
-      }
-
-      segments.push(segment);
-
-      if (segmentHeader.type === 51) {
-        break;
-      }
-    }
-
-    if (header.randomAccess) {
-      for (var i = 0, ii = segments.length; i < ii; i++) {
-        segments[i].start = position;
-        position += segments[i].header.length;
-        segments[i].end = position;
-      }
-    }
-
-    return segments;
-  }
-
-  function readRegionSegmentInformation(data, start) {
-    return {
-      width: (0, _core_utils.readUint32)(data, start),
-      height: (0, _core_utils.readUint32)(data, start + 4),
-      x: (0, _core_utils.readUint32)(data, start + 8),
-      y: (0, _core_utils.readUint32)(data, start + 12),
-      combinationOperator: data[start + 16] & 7
-    };
-  }
-
-  var RegionSegmentInformationFieldLength = 17;
-
-  function processSegment(segment, visitor) {
-    var header = segment.header;
-    var data = segment.data,
-        position = segment.start,
-        end = segment.end;
-    var args, at, i, atLength;
-
-    switch (header.type) {
-      case 0:
-        var dictionary = {};
-        var dictionaryFlags = (0, _core_utils.readUint16)(data, position);
-        dictionary.huffman = !!(dictionaryFlags & 1);
-        dictionary.refinement = !!(dictionaryFlags & 2);
-        dictionary.huffmanDHSelector = dictionaryFlags >> 2 & 3;
-        dictionary.huffmanDWSelector = dictionaryFlags >> 4 & 3;
-        dictionary.bitmapSizeSelector = dictionaryFlags >> 6 & 1;
-        dictionary.aggregationInstancesSelector = dictionaryFlags >> 7 & 1;
-        dictionary.bitmapCodingContextUsed = !!(dictionaryFlags & 256);
-        dictionary.bitmapCodingContextRetained = !!(dictionaryFlags & 512);
-        dictionary.template = dictionaryFlags >> 10 & 3;
-        dictionary.refinementTemplate = dictionaryFlags >> 12 & 1;
-        position += 2;
-
-        if (!dictionary.huffman) {
-          atLength = dictionary.template === 0 ? 4 : 1;
-          at = [];
-
-          for (i = 0; i < atLength; i++) {
-            at.push({
-              x: (0, _core_utils.readInt8)(data, position),
-              y: (0, _core_utils.readInt8)(data, position + 1)
-            });
-            position += 2;
-          }
-
-          dictionary.at = at;
-        }
-
-        if (dictionary.refinement && !dictionary.refinementTemplate) {
-          at = [];
-
-          for (i = 0; i < 2; i++) {
-            at.push({
-              x: (0, _core_utils.readInt8)(data, position),
-              y: (0, _core_utils.readInt8)(data, position + 1)
-            });
-            position += 2;
-          }
-
-          dictionary.refinementAt = at;
-        }
-
-        dictionary.numberOfExportedSymbols = (0, _core_utils.readUint32)(data, position);
-        position += 4;
-        dictionary.numberOfNewSymbols = (0, _core_utils.readUint32)(data, position);
-        position += 4;
-        args = [dictionary, header.number, header.referredTo, data, position, end];
-        break;
-
-      case 6:
-      case 7:
-        var textRegion = {};
-        textRegion.info = readRegionSegmentInformation(data, position);
-        position += RegionSegmentInformationFieldLength;
-        var textRegionSegmentFlags = (0, _core_utils.readUint16)(data, position);
-        position += 2;
-        textRegion.huffman = !!(textRegionSegmentFlags & 1);
-        textRegion.refinement = !!(textRegionSegmentFlags & 2);
-        textRegion.logStripSize = textRegionSegmentFlags >> 2 & 3;
-        textRegion.stripSize = 1 << textRegion.logStripSize;
-        textRegion.referenceCorner = textRegionSegmentFlags >> 4 & 3;
-        textRegion.transposed = !!(textRegionSegmentFlags & 64);
-        textRegion.combinationOperator = textRegionSegmentFlags >> 7 & 3;
-        textRegion.defaultPixelValue = textRegionSegmentFlags >> 9 & 1;
-        textRegion.dsOffset = textRegionSegmentFlags << 17 >> 27;
-        textRegion.refinementTemplate = textRegionSegmentFlags >> 15 & 1;
-
-        if (textRegion.huffman) {
-          var textRegionHuffmanFlags = (0, _core_utils.readUint16)(data, position);
-          position += 2;
-          textRegion.huffmanFS = textRegionHuffmanFlags & 3;
-          textRegion.huffmanDS = textRegionHuffmanFlags >> 2 & 3;
-          textRegion.huffmanDT = textRegionHuffmanFlags >> 4 & 3;
-          textRegion.huffmanRefinementDW = textRegionHuffmanFlags >> 6 & 3;
-          textRegion.huffmanRefinementDH = textRegionHuffmanFlags >> 8 & 3;
-          textRegion.huffmanRefinementDX = textRegionHuffmanFlags >> 10 & 3;
-          textRegion.huffmanRefinementDY = textRegionHuffmanFlags >> 12 & 3;
-          textRegion.huffmanRefinementSizeSelector = !!(textRegionHuffmanFlags & 0x4000);
-        }
-
-        if (textRegion.refinement && !textRegion.refinementTemplate) {
-          at = [];
-
-          for (i = 0; i < 2; i++) {
-            at.push({
-              x: (0, _core_utils.readInt8)(data, position),
-              y: (0, _core_utils.readInt8)(data, position + 1)
-            });
-            position += 2;
-          }
-
-          textRegion.refinementAt = at;
-        }
-
-        textRegion.numberOfSymbolInstances = (0, _core_utils.readUint32)(data, position);
-        position += 4;
-        args = [textRegion, header.referredTo, data, position, end];
-        break;
-
-      case 16:
-        const patternDictionary = {};
-        const patternDictionaryFlags = data[position++];
-        patternDictionary.mmr = !!(patternDictionaryFlags & 1);
-        patternDictionary.template = patternDictionaryFlags >> 1 & 3;
-        patternDictionary.patternWidth = data[position++];
-        patternDictionary.patternHeight = data[position++];
-        patternDictionary.maxPatternIndex = (0, _core_utils.readUint32)(data, position);
-        position += 4;
-        args = [patternDictionary, header.number, data, position, end];
-        break;
-
-      case 22:
-      case 23:
-        const halftoneRegion = {};
-        halftoneRegion.info = readRegionSegmentInformation(data, position);
-        position += RegionSegmentInformationFieldLength;
-        const halftoneRegionFlags = data[position++];
-        halftoneRegion.mmr = !!(halftoneRegionFlags & 1);
-        halftoneRegion.template = halftoneRegionFlags >> 1 & 3;
-        halftoneRegion.enableSkip = !!(halftoneRegionFlags & 8);
-        halftoneRegion.combinationOperator = halftoneRegionFlags >> 4 & 7;
-        halftoneRegion.defaultPixelValue = halftoneRegionFlags >> 7 & 1;
-        halftoneRegion.gridWidth = (0, _core_utils.readUint32)(data, position);
-        position += 4;
-        halftoneRegion.gridHeight = (0, _core_utils.readUint32)(data, position);
-        position += 4;
-        halftoneRegion.gridOffsetX = (0, _core_utils.readUint32)(data, position) & 0xffffffff;
-        position += 4;
-        halftoneRegion.gridOffsetY = (0, _core_utils.readUint32)(data, position) & 0xffffffff;
-        position += 4;
-        halftoneRegion.gridVectorX = (0, _core_utils.readUint16)(data, position);
-        position += 2;
-        halftoneRegion.gridVectorY = (0, _core_utils.readUint16)(data, position);
-        position += 2;
-        args = [halftoneRegion, header.referredTo, data, position, end];
-        break;
-
-      case 38:
-      case 39:
-        var genericRegion = {};
-        genericRegion.info = readRegionSegmentInformation(data, position);
-        position += RegionSegmentInformationFieldLength;
-        var genericRegionSegmentFlags = data[position++];
-        genericRegion.mmr = !!(genericRegionSegmentFlags & 1);
-        genericRegion.template = genericRegionSegmentFlags >> 1 & 3;
-        genericRegion.prediction = !!(genericRegionSegmentFlags & 8);
-
-        if (!genericRegion.mmr) {
-          atLength = genericRegion.template === 0 ? 4 : 1;
-          at = [];
-
-          for (i = 0; i < atLength; i++) {
-            at.push({
-              x: (0, _core_utils.readInt8)(data, position),
-              y: (0, _core_utils.readInt8)(data, position + 1)
-            });
-            position += 2;
-          }
-
-          genericRegion.at = at;
-        }
-
-        args = [genericRegion, data, position, end];
-        break;
-
-      case 48:
-        var pageInfo = {
-          width: (0, _core_utils.readUint32)(data, position),
-          height: (0, _core_utils.readUint32)(data, position + 4),
-          resolutionX: (0, _core_utils.readUint32)(data, position + 8),
-          resolutionY: (0, _core_utils.readUint32)(data, position + 12)
-        };
-
-        if (pageInfo.height === 0xffffffff) {
-          delete pageInfo.height;
-        }
-
-        var pageSegmentFlags = data[position + 16];
-        (0, _core_utils.readUint16)(data, position + 17);
-        pageInfo.lossless = !!(pageSegmentFlags & 1);
-        pageInfo.refinement = !!(pageSegmentFlags & 2);
-        pageInfo.defaultPixelValue = pageSegmentFlags >> 2 & 1;
-        pageInfo.combinationOperator = pageSegmentFlags >> 3 & 3;
-        pageInfo.requiresBuffer = !!(pageSegmentFlags & 32);
-        pageInfo.combinationOperatorOverride = !!(pageSegmentFlags & 64);
-        args = [pageInfo];
-        break;
-
-      case 49:
-        break;
-
-      case 50:
-        break;
-
-      case 51:
-        break;
-
-      case 53:
-        args = [header.number, data, position, end];
-        break;
-
-      case 62:
-        break;
-
-      default:
-        throw new Jbig2Error(`segment type ${header.typeName}(${header.type})` + " is not implemented");
-    }
-
-    var callbackName = "on" + header.typeName;
-
-    if (callbackName in visitor) {
-      visitor[callbackName].apply(visitor, args);
-    }
-  }
-
-  function processSegments(segments, visitor) {
-    for (var i = 0, ii = segments.length; i < ii; i++) {
-      processSegment(segments[i], visitor);
-    }
-  }
-
-  function parseJbig2Chunks(chunks) {
-    var visitor = new SimpleSegmentVisitor();
-
-    for (var i = 0, ii = chunks.length; i < ii; i++) {
-      var chunk = chunks[i];
-      var segments = readSegments({}, chunk.data, chunk.start, chunk.end);
-      processSegments(segments, visitor);
-    }
-
-    return visitor.buffer;
-  }
-
-  function parseJbig2(data) {
-    const end = data.length;
-    let position = 0;
-
-    if (data[position] !== 0x97 || data[position + 1] !== 0x4a || data[position + 2] !== 0x42 || data[position + 3] !== 0x32 || data[position + 4] !== 0x0d || data[position + 5] !== 0x0a || data[position + 6] !== 0x1a || data[position + 7] !== 0x0a) {
-      throw new Jbig2Error("parseJbig2 - invalid header.");
-    }
-
-    const header = Object.create(null);
-    position += 8;
-    const flags = data[position++];
-    header.randomAccess = !(flags & 1);
-
-    if (!(flags & 2)) {
-      header.numberOfPages = (0, _core_utils.readUint32)(data, position);
-      position += 4;
-    }
-
-    const segments = readSegments(header, data, position, end);
-    const visitor = new SimpleSegmentVisitor();
-    processSegments(segments, visitor);
-    const {
-      width,
-      height
-    } = visitor.currentPageInfo;
-    const bitPacked = visitor.buffer;
-    const imgData = new Uint8ClampedArray(width * height);
-    let q = 0,
-        k = 0;
-
-    for (let i = 0; i < height; i++) {
-      let mask = 0,
-          buffer;
-
-      for (let j = 0; j < width; j++) {
-        if (!mask) {
-          mask = 128;
-          buffer = bitPacked[k++];
-        }
-
-        imgData[q++] = buffer & mask ? 0 : 255;
-        mask >>= 1;
-      }
-    }
-
-    return {
-      imgData,
-      width,
-      height
-    };
-  }
-
-  function SimpleSegmentVisitor() {}
-
-  SimpleSegmentVisitor.prototype = {
-    onPageInformation: function SimpleSegmentVisitor_onPageInformation(info) {
-      this.currentPageInfo = info;
-      var rowSize = info.width + 7 >> 3;
-      var buffer = new Uint8ClampedArray(rowSize * info.height);
-
-      if (info.defaultPixelValue) {
-        for (var i = 0, ii = buffer.length; i < ii; i++) {
-          buffer[i] = 0xff;
-        }
-      }
-
-      this.buffer = buffer;
-    },
-    drawBitmap: function SimpleSegmentVisitor_drawBitmap(regionInfo, bitmap) {
-      var pageInfo = this.currentPageInfo;
-      var width = regionInfo.width,
-          height = regionInfo.height;
-      var rowSize = pageInfo.width + 7 >> 3;
-      var combinationOperator = pageInfo.combinationOperatorOverride ? regionInfo.combinationOperator : pageInfo.combinationOperator;
-      var buffer = this.buffer;
-      var mask0 = 128 >> (regionInfo.x & 7);
-      var offset0 = regionInfo.y * rowSize + (regionInfo.x >> 3);
-      var i, j, mask, offset;
-
-      switch (combinationOperator) {
-        case 0:
-          for (i = 0; i < height; i++) {
-            mask = mask0;
-            offset = offset0;
-
-            for (j = 0; j < width; j++) {
-              if (bitmap[i][j]) {
-                buffer[offset] |= mask;
-              }
-
-              mask >>= 1;
-
-              if (!mask) {
-                mask = 128;
-                offset++;
-              }
-            }
-
-            offset0 += rowSize;
-          }
-
-          break;
-
-        case 2:
-          for (i = 0; i < height; i++) {
-            mask = mask0;
-            offset = offset0;
-
-            for (j = 0; j < width; j++) {
-              if (bitmap[i][j]) {
-                buffer[offset] ^= mask;
-              }
-
-              mask >>= 1;
-
-              if (!mask) {
-                mask = 128;
-                offset++;
-              }
-            }
-
-            offset0 += rowSize;
-          }
-
-          break;
-
-        default:
-          throw new Jbig2Error(`operator ${combinationOperator} is not supported`);
-      }
-    },
-    onImmediateGenericRegion: function SimpleSegmentVisitor_onImmediateGenericRegion(region, data, start, end) {
-      var regionInfo = region.info;
-      var decodingContext = new DecodingContext(data, start, end);
-      var bitmap = decodeBitmap(region.mmr, regionInfo.width, regionInfo.height, region.template, region.prediction, null, region.at, decodingContext);
-      this.drawBitmap(regionInfo, bitmap);
-    },
-    onImmediateLosslessGenericRegion: function SimpleSegmentVisitor_onImmediateLosslessGenericRegion() {
-      this.onImmediateGenericRegion.apply(this, arguments);
-    },
-    onSymbolDictionary: function SimpleSegmentVisitor_onSymbolDictionary(dictionary, currentSegment, referredSegments, data, start, end) {
-      let huffmanTables, huffmanInput;
-
-      if (dictionary.huffman) {
-        huffmanTables = getSymbolDictionaryHuffmanTables(dictionary, referredSegments, this.customTables);
-        huffmanInput = new Reader(data, start, end);
-      }
-
-      var symbols = this.symbols;
-
-      if (!symbols) {
-        this.symbols = symbols = {};
-      }
-
-      var inputSymbols = [];
-
-      for (var i = 0, ii = referredSegments.length; i < ii; i++) {
-        const referredSymbols = symbols[referredSegments[i]];
-
-        if (referredSymbols) {
-          inputSymbols = inputSymbols.concat(referredSymbols);
-        }
-      }
-
-      var decodingContext = new DecodingContext(data, start, end);
-      symbols[currentSegment] = decodeSymbolDictionary(dictionary.huffman, dictionary.refinement, inputSymbols, dictionary.numberOfNewSymbols, dictionary.numberOfExportedSymbols, huffmanTables, dictionary.template, dictionary.at, dictionary.refinementTemplate, dictionary.refinementAt, decodingContext, huffmanInput);
-    },
-    onImmediateTextRegion: function SimpleSegmentVisitor_onImmediateTextRegion(region, referredSegments, data, start, end) {
-      var regionInfo = region.info;
-      let huffmanTables, huffmanInput;
-      var symbols = this.symbols;
-      var inputSymbols = [];
-
-      for (var i = 0, ii = referredSegments.length; i < ii; i++) {
-        const referredSymbols = symbols[referredSegments[i]];
-
-        if (referredSymbols) {
-          inputSymbols = inputSymbols.concat(referredSymbols);
-        }
-      }
-
-      var symbolCodeLength = (0, _core_utils.log2)(inputSymbols.length);
-
-      if (region.huffman) {
-        huffmanInput = new Reader(data, start, end);
-        huffmanTables = getTextRegionHuffmanTables(region, referredSegments, this.customTables, inputSymbols.length, huffmanInput);
-      }
-
-      var decodingContext = new DecodingContext(data, start, end);
-      var bitmap = decodeTextRegion(region.huffman, region.refinement, regionInfo.width, regionInfo.height, region.defaultPixelValue, region.numberOfSymbolInstances, region.stripSize, inputSymbols, symbolCodeLength, region.transposed, region.dsOffset, region.referenceCorner, region.combinationOperator, huffmanTables, region.refinementTemplate, region.refinementAt, decodingContext, region.logStripSize, huffmanInput);
-      this.drawBitmap(regionInfo, bitmap);
-    },
-    onImmediateLosslessTextRegion: function SimpleSegmentVisitor_onImmediateLosslessTextRegion() {
-      this.onImmediateTextRegion.apply(this, arguments);
-    },
-
-    onPatternDictionary(dictionary, currentSegment, data, start, end) {
-      let patterns = this.patterns;
-
-      if (!patterns) {
-        this.patterns = patterns = {};
-      }
-
-      const decodingContext = new DecodingContext(data, start, end);
-      patterns[currentSegment] = decodePatternDictionary(dictionary.mmr, dictionary.patternWidth, dictionary.patternHeight, dictionary.maxPatternIndex, dictionary.template, decodingContext);
-    },
-
-    onImmediateHalftoneRegion(region, referredSegments, data, start, end) {
-      const patterns = this.patterns[referredSegments[0]];
-      const regionInfo = region.info;
-      const decodingContext = new DecodingContext(data, start, end);
-      const bitmap = decodeHalftoneRegion(region.mmr, patterns, region.template, regionInfo.width, regionInfo.height, region.defaultPixelValue, region.enableSkip, region.combinationOperator, region.gridWidth, region.gridHeight, region.gridOffsetX, region.gridOffsetY, region.gridVectorX, region.gridVectorY, decodingContext);
-      this.drawBitmap(regionInfo, bitmap);
-    },
-
-    onImmediateLosslessHalftoneRegion() {
-      this.onImmediateHalftoneRegion.apply(this, arguments);
-    },
-
-    onTables(currentSegment, data, start, end) {
-      let customTables = this.customTables;
-
-      if (!customTables) {
-        this.customTables = customTables = {};
-      }
-
-      customTables[currentSegment] = decodeTablesSegment(data, start, end);
-    }
-
-  };
-
-  function HuffmanLine(lineData) {
-    if (lineData.length === 2) {
-      this.isOOB = true;
-      this.rangeLow = 0;
-      this.prefixLength = lineData[0];
-      this.rangeLength = 0;
-      this.prefixCode = lineData[1];
-      this.isLowerRange = false;
-    } else {
-      this.isOOB = false;
-      this.rangeLow = lineData[0];
-      this.prefixLength = lineData[1];
-      this.rangeLength = lineData[2];
-      this.prefixCode = lineData[3];
-      this.isLowerRange = lineData[4] === "lower";
-    }
-  }
-
-  function HuffmanTreeNode(line) {
-    this.children = [];
-
-    if (line) {
-      this.isLeaf = true;
-      this.rangeLength = line.rangeLength;
-      this.rangeLow = line.rangeLow;
-      this.isLowerRange = line.isLowerRange;
-      this.isOOB = line.isOOB;
-    } else {
-      this.isLeaf = false;
-    }
-  }
-
-  HuffmanTreeNode.prototype = {
-    buildTree(line, shift) {
-      const bit = line.prefixCode >> shift & 1;
-
-      if (shift <= 0) {
-        this.children[bit] = new HuffmanTreeNode(line);
-      } else {
-        let node = this.children[bit];
-
-        if (!node) {
-          this.children[bit] = node = new HuffmanTreeNode(null);
-        }
-
-        node.buildTree(line, shift - 1);
-      }
-    },
-
-    decodeNode(reader) {
-      if (this.isLeaf) {
-        if (this.isOOB) {
-          return null;
-        }
-
-        const htOffset = reader.readBits(this.rangeLength);
-        return this.rangeLow + (this.isLowerRange ? -htOffset : htOffset);
-      }
-
-      const node = this.children[reader.readBit()];
-
-      if (!node) {
-        throw new Jbig2Error("invalid Huffman data");
-      }
-
-      return node.decodeNode(reader);
-    }
-
-  };
-
-  function HuffmanTable(lines, prefixCodesDone) {
-    if (!prefixCodesDone) {
-      this.assignPrefixCodes(lines);
-    }
-
-    this.rootNode = new HuffmanTreeNode(null);
-
-    for (let i = 0, ii = lines.length; i < ii; i++) {
-      const line = lines[i];
-
-      if (line.prefixLength > 0) {
-        this.rootNode.buildTree(line, line.prefixLength - 1);
-      }
-    }
-  }
-
-  HuffmanTable.prototype = {
-    decode(reader) {
-      return this.rootNode.decodeNode(reader);
-    },
-
-    assignPrefixCodes(lines) {
-      const linesLength = lines.length;
-      let prefixLengthMax = 0;
-
-      for (let i = 0; i < linesLength; i++) {
-        prefixLengthMax = Math.max(prefixLengthMax, lines[i].prefixLength);
-      }
-
-      const histogram = new Uint32Array(prefixLengthMax + 1);
-
-      for (let i = 0; i < linesLength; i++) {
-        histogram[lines[i].prefixLength]++;
-      }
-
-      let currentLength = 1,
-          firstCode = 0,
-          currentCode,
-          currentTemp,
-          line;
-      histogram[0] = 0;
-
-      while (currentLength <= prefixLengthMax) {
-        firstCode = firstCode + histogram[currentLength - 1] << 1;
-        currentCode = firstCode;
-        currentTemp = 0;
-
-        while (currentTemp < linesLength) {
-          line = lines[currentTemp];
-
-          if (line.prefixLength === currentLength) {
-            line.prefixCode = currentCode;
-            currentCode++;
-          }
-
-          currentTemp++;
-        }
-
-        currentLength++;
-      }
-    }
-
-  };
-
-  function decodeTablesSegment(data, start, end) {
-    const flags = data[start];
-    const lowestValue = (0, _core_utils.readUint32)(data, start + 1) & 0xffffffff;
-    const highestValue = (0, _core_utils.readUint32)(data, start + 5) & 0xffffffff;
-    const reader = new Reader(data, start + 9, end);
-    const prefixSizeBits = (flags >> 1 & 7) + 1;
-    const rangeSizeBits = (flags >> 4 & 7) + 1;
-    const lines = [];
-    let prefixLength,
-        rangeLength,
-        currentRangeLow = lowestValue;
-
-    do {
-      prefixLength = reader.readBits(prefixSizeBits);
-      rangeLength = reader.readBits(rangeSizeBits);
-      lines.push(new HuffmanLine([currentRangeLow, prefixLength, rangeLength, 0]));
-      currentRangeLow += 1 << rangeLength;
-    } while (currentRangeLow < highestValue);
-
-    prefixLength = reader.readBits(prefixSizeBits);
-    lines.push(new HuffmanLine([lowestValue - 1, prefixLength, 32, 0, "lower"]));
-    prefixLength = reader.readBits(prefixSizeBits);
-    lines.push(new HuffmanLine([highestValue, prefixLength, 32, 0]));
-
-    if (flags & 1) {
-      prefixLength = reader.readBits(prefixSizeBits);
-      lines.push(new HuffmanLine([prefixLength, 0]));
-    }
-
-    return new HuffmanTable(lines, false);
-  }
-
-  const standardTablesCache = {};
-
-  function getStandardTable(number) {
-    let table = standardTablesCache[number];
-
-    if (table) {
-      return table;
-    }
-
-    let lines;
-
-    switch (number) {
-      case 1:
-        lines = [[0, 1, 4, 0x0], [16, 2, 8, 0x2], [272, 3, 16, 0x6], [65808, 3, 32, 0x7]];
-        break;
-
-      case 2:
-        lines = [[0, 1, 0, 0x0], [1, 2, 0, 0x2], [2, 3, 0, 0x6], [3, 4, 3, 0xe], [11, 5, 6, 0x1e], [75, 6, 32, 0x3e], [6, 0x3f]];
-        break;
-
-      case 3:
-        lines = [[-256, 8, 8, 0xfe], [0, 1, 0, 0x0], [1, 2, 0, 0x2], [2, 3, 0, 0x6], [3, 4, 3, 0xe], [11, 5, 6, 0x1e], [-257, 8, 32, 0xff, "lower"], [75, 7, 32, 0x7e], [6, 0x3e]];
-        break;
-
-      case 4:
-        lines = [[1, 1, 0, 0x0], [2, 2, 0, 0x2], [3, 3, 0, 0x6], [4, 4, 3, 0xe], [12, 5, 6, 0x1e], [76, 5, 32, 0x1f]];
-        break;
-
-      case 5:
-        lines = [[-255, 7, 8, 0x7e], [1, 1, 0, 0x0], [2, 2, 0, 0x2], [3, 3, 0, 0x6], [4, 4, 3, 0xe], [12, 5, 6, 0x1e], [-256, 7, 32, 0x7f, "lower"], [76, 6, 32, 0x3e]];
-        break;
-
-      case 6:
-        lines = [[-2048, 5, 10, 0x1c], [-1024, 4, 9, 0x8], [-512, 4, 8, 0x9], [-256, 4, 7, 0xa], [-128, 5, 6, 0x1d], [-64, 5, 5, 0x1e], [-32, 4, 5, 0xb], [0, 2, 7, 0x0], [128, 3, 7, 0x2], [256, 3, 8, 0x3], [512, 4, 9, 0xc], [1024, 4, 10, 0xd], [-2049, 6, 32, 0x3e, "lower"], [2048, 6, 32, 0x3f]];
-        break;
-
-      case 7:
-        lines = [[-1024, 4, 9, 0x8], [-512, 3, 8, 0x0], [-256, 4, 7, 0x9], [-128, 5, 6, 0x1a], [-64, 5, 5, 0x1b], [-32, 4, 5, 0xa], [0, 4, 5, 0xb], [32, 5, 5, 0x1c], [64, 5, 6, 0x1d], [128, 4, 7, 0xc], [256, 3, 8, 0x1], [512, 3, 9, 0x2], [1024, 3, 10, 0x3], [-1025, 5, 32, 0x1e, "lower"], [2048, 5, 32, 0x1f]];
-        break;
-
-      case 8:
-        lines = [[-15, 8, 3, 0xfc], [-7, 9, 1, 0x1fc], [-5, 8, 1, 0xfd], [-3, 9, 0, 0x1fd], [-2, 7, 0, 0x7c], [-1, 4, 0, 0xa], [0, 2, 1, 0x0], [2, 5, 0, 0x1a], [3, 6, 0, 0x3a], [4, 3, 4, 0x4], [20, 6, 1, 0x3b], [22, 4, 4, 0xb], [38, 4, 5, 0xc], [70, 5, 6, 0x1b], [134, 5, 7, 0x1c], [262, 6, 7, 0x3c], [390, 7, 8, 0x7d], [646, 6, 10, 0x3d], [-16, 9, 32, 0x1fe, "lower"], [1670, 9, 32, 0x1ff], [2, 0x1]];
-        break;
-
-      case 9:
-        lines = [[-31, 8, 4, 0xfc], [-15, 9, 2, 0x1fc], [-11, 8, 2, 0xfd], [-7, 9, 1, 0x1fd], [-5, 7, 1, 0x7c], [-3, 4, 1, 0xa], [-1, 3, 1, 0x2], [1, 3, 1, 0x3], [3, 5, 1, 0x1a], [5, 6, 1, 0x3a], [7, 3, 5, 0x4], [39, 6, 2, 0x3b], [43, 4, 5, 0xb], [75, 4, 6, 0xc], [139, 5, 7, 0x1b], [267, 5, 8, 0x1c], [523, 6, 8, 0x3c], [779, 7, 9, 0x7d], [1291, 6, 11, 0x3d], [-32, 9, 32, 0x1fe, "lower"], [3339, 9, 32, 0x1ff], [2, 0x0]];
-        break;
-
-      case 10:
-        lines = [[-21, 7, 4, 0x7a], [-5, 8, 0, 0xfc], [-4, 7, 0, 0x7b], [-3, 5, 0, 0x18], [-2, 2, 2, 0x0], [2, 5, 0, 0x19], [3, 6, 0, 0x36], [4, 7, 0, 0x7c], [5, 8, 0, 0xfd], [6, 2, 6, 0x1], [70, 5, 5, 0x1a], [102, 6, 5, 0x37], [134, 6, 6, 0x38], [198, 6, 7, 0x39], [326, 6, 8, 0x3a], [582, 6, 9, 0x3b], [1094, 6, 10, 0x3c], [2118, 7, 11, 0x7d], [-22, 8, 32, 0xfe, "lower"], [4166, 8, 32, 0xff], [2, 0x2]];
-        break;
-
-      case 11:
-        lines = [[1, 1, 0, 0x0], [2, 2, 1, 0x2], [4, 4, 0, 0xc], [5, 4, 1, 0xd], [7, 5, 1, 0x1c], [9, 5, 2, 0x1d], [13, 6, 2, 0x3c], [17, 7, 2, 0x7a], [21, 7, 3, 0x7b], [29, 7, 4, 0x7c], [45, 7, 5, 0x7d], [77, 7, 6, 0x7e], [141, 7, 32, 0x7f]];
-        break;
-
-      case 12:
-        lines = [[1, 1, 0, 0x0], [2, 2, 0, 0x2], [3, 3, 1, 0x6], [5, 5, 0, 0x1c], [6, 5, 1, 0x1d], [8, 6, 1, 0x3c], [10, 7, 0, 0x7a], [11, 7, 1, 0x7b], [13, 7, 2, 0x7c], [17, 7, 3, 0x7d], [25, 7, 4, 0x7e], [41, 8, 5, 0xfe], [73, 8, 32, 0xff]];
-        break;
-
-      case 13:
-        lines = [[1, 1, 0, 0x0], [2, 3, 0, 0x4], [3, 4, 0, 0xc], [4, 5, 0, 0x1c], [5, 4, 1, 0xd], [7, 3, 3, 0x5], [15, 6, 1, 0x3a], [17, 6, 2, 0x3b], [21, 6, 3, 0x3c], [29, 6, 4, 0x3d], [45, 6, 5, 0x3e], [77, 7, 6, 0x7e], [141, 7, 32, 0x7f]];
-        break;
-
-      case 14:
-        lines = [[-2, 3, 0, 0x4], [-1, 3, 0, 0x5], [0, 1, 0, 0x0], [1, 3, 0, 0x6], [2, 3, 0, 0x7]];
-        break;
-
-      case 15:
-        lines = [[-24, 7, 4, 0x7c], [-8, 6, 2, 0x3c], [-4, 5, 1, 0x1c], [-2, 4, 0, 0xc], [-1, 3, 0, 0x4], [0, 1, 0, 0x0], [1, 3, 0, 0x5], [2, 4, 0, 0xd], [3, 5, 1, 0x1d], [5, 6, 2, 0x3d], [9, 7, 4, 0x7d], [-25, 7, 32, 0x7e, "lower"], [25, 7, 32, 0x7f]];
-        break;
-
-      default:
-        throw new Jbig2Error(`standard table B.${number} does not exist`);
-    }
-
-    for (let i = 0, ii = lines.length; i < ii; i++) {
-      lines[i] = new HuffmanLine(lines[i]);
-    }
-
-    table = new HuffmanTable(lines, true);
-    standardTablesCache[number] = table;
-    return table;
-  }
-
-  function Reader(data, start, end) {
-    this.data = data;
-    this.start = start;
-    this.end = end;
-    this.position = start;
-    this.shift = -1;
-    this.currentByte = 0;
-  }
-
-  Reader.prototype = {
-    readBit() {
-      if (this.shift < 0) {
-        if (this.position >= this.end) {
-          throw new Jbig2Error("end of data while reading bit");
-        }
-
-        this.currentByte = this.data[this.position++];
-        this.shift = 7;
-      }
-
-      const bit = this.currentByte >> this.shift & 1;
-      this.shift--;
-      return bit;
-    },
-
-    readBits(numBits) {
-      let result = 0,
-          i;
-
-      for (i = numBits - 1; i >= 0; i--) {
-        result |= this.readBit() << i;
-      }
-
-      return result;
-    },
-
-    byteAlign() {
-      this.shift = -1;
-    },
-
-    next() {
-      if (this.position >= this.end) {
-        return -1;
-      }
-
-      return this.data[this.position++];
-    }
-
-  };
-
-  function getCustomHuffmanTable(index, referredTo, customTables) {
-    let currentIndex = 0;
-
-    for (let i = 0, ii = referredTo.length; i < ii; i++) {
-      const table = customTables[referredTo[i]];
-
-      if (table) {
-        if (index === currentIndex) {
-          return table;
-        }
-
-        currentIndex++;
-      }
-    }
-
-    throw new Jbig2Error("can't find custom Huffman table");
-  }
-
-  function getTextRegionHuffmanTables(textRegion, referredTo, customTables, numberOfSymbols, reader) {
-    const codes = [];
-
-    for (let i = 0; i <= 34; i++) {
-      const codeLength = reader.readBits(4);
-      codes.push(new HuffmanLine([i, codeLength, 0, 0]));
-    }
-
-    const runCodesTable = new HuffmanTable(codes, false);
-    codes.length = 0;
-
-    for (let i = 0; i < numberOfSymbols;) {
-      const codeLength = runCodesTable.decode(reader);
-
-      if (codeLength >= 32) {
-        let repeatedLength, numberOfRepeats, j;
-
-        switch (codeLength) {
-          case 32:
-            if (i === 0) {
-              throw new Jbig2Error("no previous value in symbol ID table");
-            }
-
-            numberOfRepeats = reader.readBits(2) + 3;
-            repeatedLength = codes[i - 1].prefixLength;
-            break;
-
-          case 33:
-            numberOfRepeats = reader.readBits(3) + 3;
-            repeatedLength = 0;
-            break;
-
-          case 34:
-            numberOfRepeats = reader.readBits(7) + 11;
-            repeatedLength = 0;
-            break;
-
-          default:
-            throw new Jbig2Error("invalid code length in symbol ID table");
-        }
-
-        for (j = 0; j < numberOfRepeats; j++) {
-          codes.push(new HuffmanLine([i, repeatedLength, 0, 0]));
-          i++;
-        }
-      } else {
-        codes.push(new HuffmanLine([i, codeLength, 0, 0]));
-        i++;
-      }
-    }
-
-    reader.byteAlign();
-    const symbolIDTable = new HuffmanTable(codes, false);
-    let customIndex = 0,
-        tableFirstS,
-        tableDeltaS,
-        tableDeltaT;
-
-    switch (textRegion.huffmanFS) {
-      case 0:
-      case 1:
-        tableFirstS = getStandardTable(textRegion.huffmanFS + 6);
-        break;
-
-      case 3:
-        tableFirstS = getCustomHuffmanTable(customIndex, referredTo, customTables);
-        customIndex++;
-        break;
-
-      default:
-        throw new Jbig2Error("invalid Huffman FS selector");
-    }
-
-    switch (textRegion.huffmanDS) {
-      case 0:
-      case 1:
-      case 2:
-        tableDeltaS = getStandardTable(textRegion.huffmanDS + 8);
-        break;
-
-      case 3:
-        tableDeltaS = getCustomHuffmanTable(customIndex, referredTo, customTables);
-        customIndex++;
-        break;
-
-      default:
-        throw new Jbig2Error("invalid Huffman DS selector");
-    }
-
-    switch (textRegion.huffmanDT) {
-      case 0:
-      case 1:
-      case 2:
-        tableDeltaT = getStandardTable(textRegion.huffmanDT + 11);
-        break;
-
-      case 3:
-        tableDeltaT = getCustomHuffmanTable(customIndex, referredTo, customTables);
-        customIndex++;
-        break;
-
-      default:
-        throw new Jbig2Error("invalid Huffman DT selector");
-    }
-
-    if (textRegion.refinement) {
-      throw new Jbig2Error("refinement with Huffman is not supported");
-    }
-
-    return {
-      symbolIDTable,
-      tableFirstS,
-      tableDeltaS,
-      tableDeltaT
-    };
-  }
-
-  function getSymbolDictionaryHuffmanTables(dictionary, referredTo, customTables) {
-    let customIndex = 0,
-        tableDeltaHeight,
-        tableDeltaWidth;
-
-    switch (dictionary.huffmanDHSelector) {
-      case 0:
-      case 1:
-        tableDeltaHeight = getStandardTable(dictionary.huffmanDHSelector + 4);
-        break;
-
-      case 3:
-        tableDeltaHeight = getCustomHuffmanTable(customIndex, referredTo, customTables);
-        customIndex++;
-        break;
-
-      default:
-        throw new Jbig2Error("invalid Huffman DH selector");
-    }
-
-    switch (dictionary.huffmanDWSelector) {
-      case 0:
-      case 1:
-        tableDeltaWidth = getStandardTable(dictionary.huffmanDWSelector + 2);
-        break;
-
-      case 3:
-        tableDeltaWidth = getCustomHuffmanTable(customIndex, referredTo, customTables);
-        customIndex++;
-        break;
-
-      default:
-        throw new Jbig2Error("invalid Huffman DW selector");
-    }
-
-    let tableBitmapSize, tableAggregateInstances;
-
-    if (dictionary.bitmapSizeSelector) {
-      tableBitmapSize = getCustomHuffmanTable(customIndex, referredTo, customTables);
-      customIndex++;
-    } else {
-      tableBitmapSize = getStandardTable(1);
-    }
-
-    if (dictionary.aggregationInstancesSelector) {
-      tableAggregateInstances = getCustomHuffmanTable(customIndex, referredTo, customTables);
-    } else {
-      tableAggregateInstances = getStandardTable(1);
-    }
-
-    return {
-      tableDeltaHeight,
-      tableDeltaWidth,
-      tableBitmapSize,
-      tableAggregateInstances
-    };
-  }
-
-  function readUncompressedBitmap(reader, width, height) {
-    const bitmap = [];
-
-    for (let y = 0; y < height; y++) {
-      const row = new Uint8Array(width);
-      bitmap.push(row);
-
-      for (let x = 0; x < width; x++) {
-        row[x] = reader.readBit();
-      }
-
-      reader.byteAlign();
-    }
-
-    return bitmap;
-  }
-
-  function decodeMMRBitmap(input, width, height, endOfBlock) {
-    const params = {
-      K: -1,
-      Columns: width,
-      Rows: height,
-      BlackIs1: true,
-      EndOfBlock: endOfBlock
-    };
-    const decoder = new _ccitt.CCITTFaxDecoder(input, params);
-    const bitmap = [];
-    let currentByte,
-        eof = false;
-
-    for (let y = 0; y < height; y++) {
-      const row = new Uint8Array(width);
-      bitmap.push(row);
-      let shift = -1;
-
-      for (let x = 0; x < width; x++) {
-        if (shift < 0) {
-          currentByte = decoder.readNextChar();
-
-          if (currentByte === -1) {
-            currentByte = 0;
-            eof = true;
-          }
-
-          shift = 7;
-        }
-
-        row[x] = currentByte >> shift & 1;
-        shift--;
-      }
-    }
-
-    if (endOfBlock && !eof) {
-      const lookForEOFLimit = 5;
-
-      for (let i = 0; i < lookForEOFLimit; i++) {
-        if (decoder.readNextChar() === -1) {
-          break;
-        }
-      }
-    }
-
-    return bitmap;
-  }
-
-  function Jbig2Image() {}
-
-  Jbig2Image.prototype = {
-    parseChunks(chunks) {
-      return parseJbig2Chunks(chunks);
-    },
-
-    parse(data) {
-      const {
-        imgData,
-        width,
-        height
-      } = parseJbig2(data);
-      this.width = width;
-      this.height = height;
-      return imgData;
-    }
-
-  };
-  return Jbig2Image;
-}();
-
-exports.Jbig2Image = Jbig2Image;
-
-/***/ }),
-/* 17 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ArithmeticDecoder = void 0;
-const QeTable = [{
-  qe: 0x5601,
-  nmps: 1,
-  nlps: 1,
-  switchFlag: 1
-}, {
-  qe: 0x3401,
-  nmps: 2,
-  nlps: 6,
-  switchFlag: 0
-}, {
-  qe: 0x1801,
-  nmps: 3,
-  nlps: 9,
-  switchFlag: 0
-}, {
-  qe: 0x0ac1,
-  nmps: 4,
-  nlps: 12,
-  switchFlag: 0
-}, {
-  qe: 0x0521,
-  nmps: 5,
-  nlps: 29,
-  switchFlag: 0
-}, {
-  qe: 0x0221,
-  nmps: 38,
-  nlps: 33,
-  switchFlag: 0
-}, {
-  qe: 0x5601,
-  nmps: 7,
-  nlps: 6,
-  switchFlag: 1
-}, {
-  qe: 0x5401,
-  nmps: 8,
-  nlps: 14,
-  switchFlag: 0
-}, {
-  qe: 0x4801,
-  nmps: 9,
-  nlps: 14,
-  switchFlag: 0
-}, {
-  qe: 0x3801,
-  nmps: 10,
-  nlps: 14,
-  switchFlag: 0
-}, {
-  qe: 0x3001,
-  nmps: 11,
-  nlps: 17,
-  switchFlag: 0
-}, {
-  qe: 0x2401,
-  nmps: 12,
-  nlps: 18,
-  switchFlag: 0
-}, {
-  qe: 0x1c01,
-  nmps: 13,
-  nlps: 20,
-  switchFlag: 0
-}, {
-  qe: 0x1601,
-  nmps: 29,
-  nlps: 21,
-  switchFlag: 0
-}, {
-  qe: 0x5601,
-  nmps: 15,
-  nlps: 14,
-  switchFlag: 1
-}, {
-  qe: 0x5401,
-  nmps: 16,
-  nlps: 14,
-  switchFlag: 0
-}, {
-  qe: 0x5101,
-  nmps: 17,
-  nlps: 15,
-  switchFlag: 0
-}, {
-  qe: 0x4801,
-  nmps: 18,
-  nlps: 16,
-  switchFlag: 0
-}, {
-  qe: 0x3801,
-  nmps: 19,
-  nlps: 17,
-  switchFlag: 0
-}, {
-  qe: 0x3401,
-  nmps: 20,
-  nlps: 18,
-  switchFlag: 0
-}, {
-  qe: 0x3001,
-  nmps: 21,
-  nlps: 19,
-  switchFlag: 0
-}, {
-  qe: 0x2801,
-  nmps: 22,
-  nlps: 19,
-  switchFlag: 0
-}, {
-  qe: 0x2401,
-  nmps: 23,
-  nlps: 20,
-  switchFlag: 0
-}, {
-  qe: 0x2201,
-  nmps: 24,
-  nlps: 21,
-  switchFlag: 0
-}, {
-  qe: 0x1c01,
-  nmps: 25,
-  nlps: 22,
-  switchFlag: 0
-}, {
-  qe: 0x1801,
-  nmps: 26,
-  nlps: 23,
-  switchFlag: 0
-}, {
-  qe: 0x1601,
-  nmps: 27,
-  nlps: 24,
-  switchFlag: 0
-}, {
-  qe: 0x1401,
-  nmps: 28,
-  nlps: 25,
-  switchFlag: 0
-}, {
-  qe: 0x1201,
-  nmps: 29,
-  nlps: 26,
-  switchFlag: 0
-}, {
-  qe: 0x1101,
-  nmps: 30,
-  nlps: 27,
-  switchFlag: 0
-}, {
-  qe: 0x0ac1,
-  nmps: 31,
-  nlps: 28,
-  switchFlag: 0
-}, {
-  qe: 0x09c1,
-  nmps: 32,
-  nlps: 29,
-  switchFlag: 0
-}, {
-  qe: 0x08a1,
-  nmps: 33,
-  nlps: 30,
-  switchFlag: 0
-}, {
-  qe: 0x0521,
-  nmps: 34,
-  nlps: 31,
-  switchFlag: 0
-}, {
-  qe: 0x0441,
-  nmps: 35,
-  nlps: 32,
-  switchFlag: 0
-}, {
-  qe: 0x02a1,
-  nmps: 36,
-  nlps: 33,
-  switchFlag: 0
-}, {
-  qe: 0x0221,
-  nmps: 37,
-  nlps: 34,
-  switchFlag: 0
-}, {
-  qe: 0x0141,
-  nmps: 38,
-  nlps: 35,
-  switchFlag: 0
-}, {
-  qe: 0x0111,
-  nmps: 39,
-  nlps: 36,
-  switchFlag: 0
-}, {
-  qe: 0x0085,
-  nmps: 40,
-  nlps: 37,
-  switchFlag: 0
-}, {
-  qe: 0x0049,
-  nmps: 41,
-  nlps: 38,
-  switchFlag: 0
-}, {
-  qe: 0x0025,
-  nmps: 42,
-  nlps: 39,
-  switchFlag: 0
-}, {
-  qe: 0x0015,
-  nmps: 43,
-  nlps: 40,
-  switchFlag: 0
-}, {
-  qe: 0x0009,
-  nmps: 44,
-  nlps: 41,
-  switchFlag: 0
-}, {
-  qe: 0x0005,
-  nmps: 45,
-  nlps: 42,
-  switchFlag: 0
-}, {
-  qe: 0x0001,
-  nmps: 45,
-  nlps: 43,
-  switchFlag: 0
-}, {
-  qe: 0x5601,
-  nmps: 46,
-  nlps: 46,
-  switchFlag: 0
-}];
-
-class ArithmeticDecoder {
-  constructor(data, start, end) {
-    this.data = data;
-    this.bp = start;
-    this.dataEnd = end;
-    this.chigh = data[start];
-    this.clow = 0;
-    this.byteIn();
-    this.chigh = this.chigh << 7 & 0xffff | this.clow >> 9 & 0x7f;
-    this.clow = this.clow << 7 & 0xffff;
-    this.ct -= 7;
-    this.a = 0x8000;
-  }
-
-  byteIn() {
-    const data = this.data;
-    let bp = this.bp;
-
-    if (data[bp] === 0xff) {
-      if (data[bp + 1] > 0x8f) {
-        this.clow += 0xff00;
-        this.ct = 8;
-      } else {
-        bp++;
-        this.clow += data[bp] << 9;
-        this.ct = 7;
-        this.bp = bp;
-      }
-    } else {
-      bp++;
-      this.clow += bp < this.dataEnd ? data[bp] << 8 : 0xff00;
-      this.ct = 8;
-      this.bp = bp;
-    }
-
-    if (this.clow > 0xffff) {
-      this.chigh += this.clow >> 16;
-      this.clow &= 0xffff;
-    }
-  }
-
-  readBit(contexts, pos) {
-    let cx_index = contexts[pos] >> 1,
-        cx_mps = contexts[pos] & 1;
-    const qeTableIcx = QeTable[cx_index];
-    const qeIcx = qeTableIcx.qe;
-    let d;
-    let a = this.a - qeIcx;
-
-    if (this.chigh < qeIcx) {
-      if (a < qeIcx) {
-        a = qeIcx;
-        d = cx_mps;
-        cx_index = qeTableIcx.nmps;
-      } else {
-        a = qeIcx;
-        d = 1 ^ cx_mps;
-
-        if (qeTableIcx.switchFlag === 1) {
-          cx_mps = d;
-        }
-
-        cx_index = qeTableIcx.nlps;
-      }
-    } else {
-      this.chigh -= qeIcx;
-
-      if ((a & 0x8000) !== 0) {
-        this.a = a;
-        return cx_mps;
-      }
-
-      if (a < qeIcx) {
-        d = 1 ^ cx_mps;
-
-        if (qeTableIcx.switchFlag === 1) {
-          cx_mps = d;
-        }
-
-        cx_index = qeTableIcx.nlps;
-      } else {
-        d = cx_mps;
-        cx_index = qeTableIcx.nmps;
-      }
-    }
-
-    do {
-      if (this.ct === 0) {
-        this.byteIn();
-      }
-
-      a <<= 1;
-      this.chigh = this.chigh << 1 & 0xffff | this.clow >> 15 & 1;
-      this.clow = this.clow << 1 & 0xffff;
-      this.ct--;
-    } while ((a & 0x8000) === 0);
-
-    this.a = a;
-    contexts[pos] = cx_index << 1 | cx_mps;
-    return d;
-  }
-
-}
-
-exports.ArithmeticDecoder = ArithmeticDecoder;
-
-/***/ }),
-/* 18 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.JpegStream = void 0;
-
-var _stream = __w_pdfjs_require__(12);
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _jpg = __w_pdfjs_require__(19);
-
-var _util = __w_pdfjs_require__(2);
-
-const JpegStream = function JpegStreamClosure() {
-  function JpegStream(stream, maybeLength, dict, params) {
-    let ch;
-
-    while ((ch = stream.getByte()) !== -1) {
-      if (ch === 0xff) {
-        stream.skip(-1);
-        break;
-      }
-    }
-
-    this.stream = stream;
-    this.maybeLength = maybeLength;
-    this.dict = dict;
-    this.params = params;
-
-    _stream.DecodeStream.call(this, maybeLength);
-  }
-
-  JpegStream.prototype = Object.create(_stream.DecodeStream.prototype);
-  Object.defineProperty(JpegStream.prototype, "bytes", {
-    get: function JpegStream_bytes() {
-      return (0, _util.shadow)(this, "bytes", this.stream.getBytes(this.maybeLength));
-    },
-    configurable: true
-  });
-
-  JpegStream.prototype.ensureBuffer = function (requested) {};
-
-  JpegStream.prototype.readBlock = function () {
-    if (this.eof) {
-      return;
-    }
-
-    const jpegOptions = {
-      decodeTransform: undefined,
-      colorTransform: undefined
-    };
-    const decodeArr = this.dict.getArray("Decode", "D");
-
-    if (this.forceRGB && Array.isArray(decodeArr)) {
-      const bitsPerComponent = this.dict.get("BitsPerComponent") || 8;
-      const decodeArrLength = decodeArr.length;
-      const transform = new Int32Array(decodeArrLength);
-      let transformNeeded = false;
-      const maxValue = (1 << bitsPerComponent) - 1;
-
-      for (let i = 0; i < decodeArrLength; i += 2) {
-        transform[i] = (decodeArr[i + 1] - decodeArr[i]) * 256 | 0;
-        transform[i + 1] = decodeArr[i] * maxValue | 0;
-
-        if (transform[i] !== 256 || transform[i + 1] !== 0) {
-          transformNeeded = true;
-        }
-      }
-
-      if (transformNeeded) {
-        jpegOptions.decodeTransform = transform;
-      }
-    }
-
-    if ((0, _primitives.isDict)(this.params)) {
-      const colorTransform = this.params.get("ColorTransform");
-
-      if (Number.isInteger(colorTransform)) {
-        jpegOptions.colorTransform = colorTransform;
-      }
-    }
-
-    const jpegImage = new _jpg.JpegImage(jpegOptions);
-    jpegImage.parse(this.bytes);
-    const data = jpegImage.getData({
-      width: this.drawWidth,
-      height: this.drawHeight,
-      forceRGB: this.forceRGB,
-      isSourcePDF: true
-    });
-    this.buffer = data;
-    this.bufferLength = data.length;
-    this.eof = true;
-  };
-
-  return JpegStream;
-}();
-
-exports.JpegStream = JpegStream;
-
-/***/ }),
-/* 19 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.JpegImage = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var _core_utils = __w_pdfjs_require__(8);
-
-class JpegError extends _util.BaseException {
-  constructor(msg) {
-    super(`JPEG error: ${msg}`);
-  }
-
-}
-
-class DNLMarkerError extends _util.BaseException {
-  constructor(message, scanLines) {
-    super(message);
-    this.scanLines = scanLines;
-  }
-
-}
-
-class EOIMarkerError extends _util.BaseException {}
-
-var JpegImage = function JpegImageClosure() {
-  var dctZigZag = new Uint8Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]);
-  var dctCos1 = 4017;
-  var dctSin1 = 799;
-  var dctCos3 = 3406;
-  var dctSin3 = 2276;
-  var dctCos6 = 1567;
-  var dctSin6 = 3784;
-  var dctSqrt2 = 5793;
-  var dctSqrt1d2 = 2896;
-
-  function JpegImage({
-    decodeTransform = null,
-    colorTransform = -1
-  } = {}) {
-    this._decodeTransform = decodeTransform;
-    this._colorTransform = colorTransform;
-  }
-
-  function buildHuffmanTable(codeLengths, values) {
-    var k = 0,
-        code = [],
-        i,
-        j,
-        length = 16;
-
-    while (length > 0 && !codeLengths[length - 1]) {
-      length--;
-    }
-
-    code.push({
-      children: [],
-      index: 0
-    });
-    var p = code[0],
-        q;
-
-    for (i = 0; i < length; i++) {
-      for (j = 0; j < codeLengths[i]; j++) {
-        p = code.pop();
-        p.children[p.index] = values[k];
-
-        while (p.index > 0) {
-          p = code.pop();
-        }
-
-        p.index++;
-        code.push(p);
-
-        while (code.length <= i) {
-          code.push(q = {
-            children: [],
-            index: 0
-          });
-          p.children[p.index] = q.children;
-          p = q;
-        }
-
-        k++;
-      }
-
-      if (i + 1 < length) {
-        code.push(q = {
-          children: [],
-          index: 0
-        });
-        p.children[p.index] = q.children;
-        p = q;
-      }
-    }
-
-    return code[0].children;
-  }
-
-  function getBlockBufferOffset(component, row, col) {
-    return 64 * ((component.blocksPerLine + 1) * row + col);
-  }
-
-  function decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successivePrev, successive, parseDNLMarker = false) {
-    var mcusPerLine = frame.mcusPerLine;
-    var progressive = frame.progressive;
-    const startOffset = offset;
-    let bitsData = 0,
-        bitsCount = 0;
-
-    function readBit() {
-      if (bitsCount > 0) {
-        bitsCount--;
-        return bitsData >> bitsCount & 1;
-      }
-
-      bitsData = data[offset++];
-
-      if (bitsData === 0xff) {
-        var nextByte = data[offset++];
-
-        if (nextByte) {
-          if (nextByte === 0xdc && parseDNLMarker) {
-            offset += 2;
-            const scanLines = (0, _core_utils.readUint16)(data, offset);
-            offset += 2;
-
-            if (scanLines > 0 && scanLines !== frame.scanLines) {
-              throw new DNLMarkerError("Found DNL marker (0xFFDC) while parsing scan data", scanLines);
-            }
-          } else if (nextByte === 0xd9) {
-            if (parseDNLMarker) {
-              const maybeScanLines = blockRow * (frame.precision === 8 ? 8 : 0);
-
-              if (maybeScanLines > 0 && Math.round(frame.scanLines / maybeScanLines) >= 10) {
-                throw new DNLMarkerError("Found EOI marker (0xFFD9) while parsing scan data, " + "possibly caused by incorrect `scanLines` parameter", maybeScanLines);
-              }
-            }
-
-            throw new EOIMarkerError("Found EOI marker (0xFFD9) while parsing scan data");
-          }
-
-          throw new JpegError(`unexpected marker ${(bitsData << 8 | nextByte).toString(16)}`);
-        }
-      }
-
-      bitsCount = 7;
-      return bitsData >>> 7;
-    }
-
-    function decodeHuffman(tree) {
-      var node = tree;
-
-      while (true) {
-        node = node[readBit()];
-
-        switch (typeof node) {
-          case "number":
-            return node;
-
-          case "object":
-            continue;
-        }
-
-        throw new JpegError("invalid huffman sequence");
-      }
-    }
-
-    function receive(length) {
-      var n = 0;
-
-      while (length > 0) {
-        n = n << 1 | readBit();
-        length--;
-      }
-
-      return n;
-    }
-
-    function receiveAndExtend(length) {
-      if (length === 1) {
-        return readBit() === 1 ? 1 : -1;
-      }
-
-      var n = receive(length);
-
-      if (n >= 1 << length - 1) {
-        return n;
-      }
-
-      return n + (-1 << length) + 1;
-    }
-
-    function decodeBaseline(component, blockOffset) {
-      var t = decodeHuffman(component.huffmanTableDC);
-      var diff = t === 0 ? 0 : receiveAndExtend(t);
-      component.blockData[blockOffset] = component.pred += diff;
-      var k = 1;
-
-      while (k < 64) {
-        var rs = decodeHuffman(component.huffmanTableAC);
-        var s = rs & 15,
-            r = rs >> 4;
-
-        if (s === 0) {
-          if (r < 15) {
-            break;
-          }
-
-          k += 16;
-          continue;
-        }
-
-        k += r;
-        var z = dctZigZag[k];
-        component.blockData[blockOffset + z] = receiveAndExtend(s);
-        k++;
-      }
-    }
-
-    function decodeDCFirst(component, blockOffset) {
-      var t = decodeHuffman(component.huffmanTableDC);
-      var diff = t === 0 ? 0 : receiveAndExtend(t) << successive;
-      component.blockData[blockOffset] = component.pred += diff;
-    }
-
-    function decodeDCSuccessive(component, blockOffset) {
-      component.blockData[blockOffset] |= readBit() << successive;
-    }
-
-    var eobrun = 0;
-
-    function decodeACFirst(component, blockOffset) {
-      if (eobrun > 0) {
-        eobrun--;
-        return;
-      }
-
-      var k = spectralStart,
-          e = spectralEnd;
-
-      while (k <= e) {
-        var rs = decodeHuffman(component.huffmanTableAC);
-        var s = rs & 15,
-            r = rs >> 4;
-
-        if (s === 0) {
-          if (r < 15) {
-            eobrun = receive(r) + (1 << r) - 1;
-            break;
-          }
-
-          k += 16;
-          continue;
-        }
-
-        k += r;
-        var z = dctZigZag[k];
-        component.blockData[blockOffset + z] = receiveAndExtend(s) * (1 << successive);
-        k++;
-      }
-    }
-
-    var successiveACState = 0,
-        successiveACNextValue;
-
-    function decodeACSuccessive(component, blockOffset) {
-      var k = spectralStart;
-      var e = spectralEnd;
-      var r = 0;
-      var s;
-      var rs;
-
-      while (k <= e) {
-        const offsetZ = blockOffset + dctZigZag[k];
-        const sign = component.blockData[offsetZ] < 0 ? -1 : 1;
-
-        switch (successiveACState) {
-          case 0:
-            rs = decodeHuffman(component.huffmanTableAC);
-            s = rs & 15;
-            r = rs >> 4;
-
-            if (s === 0) {
-              if (r < 15) {
-                eobrun = receive(r) + (1 << r);
-                successiveACState = 4;
-              } else {
-                r = 16;
-                successiveACState = 1;
-              }
-            } else {
-              if (s !== 1) {
-                throw new JpegError("invalid ACn encoding");
-              }
-
-              successiveACNextValue = receiveAndExtend(s);
-              successiveACState = r ? 2 : 3;
-            }
-
-            continue;
-
-          case 1:
-          case 2:
-            if (component.blockData[offsetZ]) {
-              component.blockData[offsetZ] += sign * (readBit() << successive);
-            } else {
-              r--;
-
-              if (r === 0) {
-                successiveACState = successiveACState === 2 ? 3 : 0;
-              }
-            }
-
-            break;
-
-          case 3:
-            if (component.blockData[offsetZ]) {
-              component.blockData[offsetZ] += sign * (readBit() << successive);
-            } else {
-              component.blockData[offsetZ] = successiveACNextValue << successive;
-              successiveACState = 0;
-            }
-
-            break;
-
-          case 4:
-            if (component.blockData[offsetZ]) {
-              component.blockData[offsetZ] += sign * (readBit() << successive);
-            }
-
-            break;
-        }
-
-        k++;
-      }
-
-      if (successiveACState === 4) {
-        eobrun--;
-
-        if (eobrun === 0) {
-          successiveACState = 0;
-        }
-      }
-    }
-
-    let blockRow = 0;
-
-    function decodeMcu(component, decode, mcu, row, col) {
-      var mcuRow = mcu / mcusPerLine | 0;
-      var mcuCol = mcu % mcusPerLine;
-      blockRow = mcuRow * component.v + row;
-      var blockCol = mcuCol * component.h + col;
-      const blockOffset = getBlockBufferOffset(component, blockRow, blockCol);
-      decode(component, blockOffset);
-    }
-
-    function decodeBlock(component, decode, mcu) {
-      blockRow = mcu / component.blocksPerLine | 0;
-      var blockCol = mcu % component.blocksPerLine;
-      const blockOffset = getBlockBufferOffset(component, blockRow, blockCol);
-      decode(component, blockOffset);
-    }
-
-    var componentsLength = components.length;
-    var component, i, j, k, n;
-    var decodeFn;
-
-    if (progressive) {
-      if (spectralStart === 0) {
-        decodeFn = successivePrev === 0 ? decodeDCFirst : decodeDCSuccessive;
-      } else {
-        decodeFn = successivePrev === 0 ? decodeACFirst : decodeACSuccessive;
-      }
-    } else {
-      decodeFn = decodeBaseline;
-    }
-
-    var mcu = 0,
-        fileMarker;
-    var mcuExpected;
-
-    if (componentsLength === 1) {
-      mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
-    } else {
-      mcuExpected = mcusPerLine * frame.mcusPerColumn;
-    }
-
-    var h, v;
-
-    while (mcu <= mcuExpected) {
-      var mcuToRead = resetInterval ? Math.min(mcuExpected - mcu, resetInterval) : mcuExpected;
-
-      if (mcuToRead > 0) {
-        for (i = 0; i < componentsLength; i++) {
-          components[i].pred = 0;
-        }
-
-        eobrun = 0;
-
-        if (componentsLength === 1) {
-          component = components[0];
-
-          for (n = 0; n < mcuToRead; n++) {
-            decodeBlock(component, decodeFn, mcu);
-            mcu++;
-          }
-        } else {
-          for (n = 0; n < mcuToRead; n++) {
-            for (i = 0; i < componentsLength; i++) {
-              component = components[i];
-              h = component.h;
-              v = component.v;
-
-              for (j = 0; j < v; j++) {
-                for (k = 0; k < h; k++) {
-                  decodeMcu(component, decodeFn, mcu, j, k);
-                }
-              }
-            }
-
-            mcu++;
-          }
-        }
-      }
-
-      bitsCount = 0;
-      fileMarker = findNextFileMarker(data, offset);
-
-      if (!fileMarker) {
-        break;
-      }
-
-      if (fileMarker.invalid) {
-        const partialMsg = mcuToRead > 0 ? "unexpected" : "excessive";
-        (0, _util.warn)(`decodeScan - ${partialMsg} MCU data, current marker is: ${fileMarker.invalid}`);
-        offset = fileMarker.offset;
-      }
-
-      if (fileMarker.marker >= 0xffd0 && fileMarker.marker <= 0xffd7) {
-        offset += 2;
-      } else {
-        break;
-      }
-    }
-
-    return offset - startOffset;
-  }
-
-  function quantizeAndInverse(component, blockBufferOffset, p) {
-    var qt = component.quantizationTable,
-        blockData = component.blockData;
-    var v0, v1, v2, v3, v4, v5, v6, v7;
-    var p0, p1, p2, p3, p4, p5, p6, p7;
-    var t;
-
-    if (!qt) {
-      throw new JpegError("missing required Quantization Table.");
-    }
-
-    for (var row = 0; row < 64; row += 8) {
-      p0 = blockData[blockBufferOffset + row];
-      p1 = blockData[blockBufferOffset + row + 1];
-      p2 = blockData[blockBufferOffset + row + 2];
-      p3 = blockData[blockBufferOffset + row + 3];
-      p4 = blockData[blockBufferOffset + row + 4];
-      p5 = blockData[blockBufferOffset + row + 5];
-      p6 = blockData[blockBufferOffset + row + 6];
-      p7 = blockData[blockBufferOffset + row + 7];
-      p0 *= qt[row];
-
-      if ((p1 | p2 | p3 | p4 | p5 | p6 | p7) === 0) {
-        t = dctSqrt2 * p0 + 512 >> 10;
-        p[row] = t;
-        p[row + 1] = t;
-        p[row + 2] = t;
-        p[row + 3] = t;
-        p[row + 4] = t;
-        p[row + 5] = t;
-        p[row + 6] = t;
-        p[row + 7] = t;
-        continue;
-      }
-
-      p1 *= qt[row + 1];
-      p2 *= qt[row + 2];
-      p3 *= qt[row + 3];
-      p4 *= qt[row + 4];
-      p5 *= qt[row + 5];
-      p6 *= qt[row + 6];
-      p7 *= qt[row + 7];
-      v0 = dctSqrt2 * p0 + 128 >> 8;
-      v1 = dctSqrt2 * p4 + 128 >> 8;
-      v2 = p2;
-      v3 = p6;
-      v4 = dctSqrt1d2 * (p1 - p7) + 128 >> 8;
-      v7 = dctSqrt1d2 * (p1 + p7) + 128 >> 8;
-      v5 = p3 << 4;
-      v6 = p5 << 4;
-      v0 = v0 + v1 + 1 >> 1;
-      v1 = v0 - v1;
-      t = v2 * dctSin6 + v3 * dctCos6 + 128 >> 8;
-      v2 = v2 * dctCos6 - v3 * dctSin6 + 128 >> 8;
-      v3 = t;
-      v4 = v4 + v6 + 1 >> 1;
-      v6 = v4 - v6;
-      v7 = v7 + v5 + 1 >> 1;
-      v5 = v7 - v5;
-      v0 = v0 + v3 + 1 >> 1;
-      v3 = v0 - v3;
-      v1 = v1 + v2 + 1 >> 1;
-      v2 = v1 - v2;
-      t = v4 * dctSin3 + v7 * dctCos3 + 2048 >> 12;
-      v4 = v4 * dctCos3 - v7 * dctSin3 + 2048 >> 12;
-      v7 = t;
-      t = v5 * dctSin1 + v6 * dctCos1 + 2048 >> 12;
-      v5 = v5 * dctCos1 - v6 * dctSin1 + 2048 >> 12;
-      v6 = t;
-      p[row] = v0 + v7;
-      p[row + 7] = v0 - v7;
-      p[row + 1] = v1 + v6;
-      p[row + 6] = v1 - v6;
-      p[row + 2] = v2 + v5;
-      p[row + 5] = v2 - v5;
-      p[row + 3] = v3 + v4;
-      p[row + 4] = v3 - v4;
-    }
-
-    for (var col = 0; col < 8; ++col) {
-      p0 = p[col];
-      p1 = p[col + 8];
-      p2 = p[col + 16];
-      p3 = p[col + 24];
-      p4 = p[col + 32];
-      p5 = p[col + 40];
-      p6 = p[col + 48];
-      p7 = p[col + 56];
-
-      if ((p1 | p2 | p3 | p4 | p5 | p6 | p7) === 0) {
-        t = dctSqrt2 * p0 + 8192 >> 14;
-
-        if (t < -2040) {
-          t = 0;
-        } else if (t >= 2024) {
-          t = 255;
-        } else {
-          t = t + 2056 >> 4;
-        }
-
-        blockData[blockBufferOffset + col] = t;
-        blockData[blockBufferOffset + col + 8] = t;
-        blockData[blockBufferOffset + col + 16] = t;
-        blockData[blockBufferOffset + col + 24] = t;
-        blockData[blockBufferOffset + col + 32] = t;
-        blockData[blockBufferOffset + col + 40] = t;
-        blockData[blockBufferOffset + col + 48] = t;
-        blockData[blockBufferOffset + col + 56] = t;
-        continue;
-      }
-
-      v0 = dctSqrt2 * p0 + 2048 >> 12;
-      v1 = dctSqrt2 * p4 + 2048 >> 12;
-      v2 = p2;
-      v3 = p6;
-      v4 = dctSqrt1d2 * (p1 - p7) + 2048 >> 12;
-      v7 = dctSqrt1d2 * (p1 + p7) + 2048 >> 12;
-      v5 = p3;
-      v6 = p5;
-      v0 = (v0 + v1 + 1 >> 1) + 4112;
-      v1 = v0 - v1;
-      t = v2 * dctSin6 + v3 * dctCos6 + 2048 >> 12;
-      v2 = v2 * dctCos6 - v3 * dctSin6 + 2048 >> 12;
-      v3 = t;
-      v4 = v4 + v6 + 1 >> 1;
-      v6 = v4 - v6;
-      v7 = v7 + v5 + 1 >> 1;
-      v5 = v7 - v5;
-      v0 = v0 + v3 + 1 >> 1;
-      v3 = v0 - v3;
-      v1 = v1 + v2 + 1 >> 1;
-      v2 = v1 - v2;
-      t = v4 * dctSin3 + v7 * dctCos3 + 2048 >> 12;
-      v4 = v4 * dctCos3 - v7 * dctSin3 + 2048 >> 12;
-      v7 = t;
-      t = v5 * dctSin1 + v6 * dctCos1 + 2048 >> 12;
-      v5 = v5 * dctCos1 - v6 * dctSin1 + 2048 >> 12;
-      v6 = t;
-      p0 = v0 + v7;
-      p7 = v0 - v7;
-      p1 = v1 + v6;
-      p6 = v1 - v6;
-      p2 = v2 + v5;
-      p5 = v2 - v5;
-      p3 = v3 + v4;
-      p4 = v3 - v4;
-
-      if (p0 < 16) {
-        p0 = 0;
-      } else if (p0 >= 4080) {
-        p0 = 255;
-      } else {
-        p0 >>= 4;
-      }
-
-      if (p1 < 16) {
-        p1 = 0;
-      } else if (p1 >= 4080) {
-        p1 = 255;
-      } else {
-        p1 >>= 4;
-      }
-
-      if (p2 < 16) {
-        p2 = 0;
-      } else if (p2 >= 4080) {
-        p2 = 255;
-      } else {
-        p2 >>= 4;
-      }
-
-      if (p3 < 16) {
-        p3 = 0;
-      } else if (p3 >= 4080) {
-        p3 = 255;
-      } else {
-        p3 >>= 4;
-      }
-
-      if (p4 < 16) {
-        p4 = 0;
-      } else if (p4 >= 4080) {
-        p4 = 255;
-      } else {
-        p4 >>= 4;
-      }
-
-      if (p5 < 16) {
-        p5 = 0;
-      } else if (p5 >= 4080) {
-        p5 = 255;
-      } else {
-        p5 >>= 4;
-      }
-
-      if (p6 < 16) {
-        p6 = 0;
-      } else if (p6 >= 4080) {
-        p6 = 255;
-      } else {
-        p6 >>= 4;
-      }
-
-      if (p7 < 16) {
-        p7 = 0;
-      } else if (p7 >= 4080) {
-        p7 = 255;
-      } else {
-        p7 >>= 4;
-      }
-
-      blockData[blockBufferOffset + col] = p0;
-      blockData[blockBufferOffset + col + 8] = p1;
-      blockData[blockBufferOffset + col + 16] = p2;
-      blockData[blockBufferOffset + col + 24] = p3;
-      blockData[blockBufferOffset + col + 32] = p4;
-      blockData[blockBufferOffset + col + 40] = p5;
-      blockData[blockBufferOffset + col + 48] = p6;
-      blockData[blockBufferOffset + col + 56] = p7;
-    }
-  }
-
-  function buildComponentData(frame, component) {
-    var blocksPerLine = component.blocksPerLine;
-    var blocksPerColumn = component.blocksPerColumn;
-    var computationBuffer = new Int16Array(64);
-
-    for (var blockRow = 0; blockRow < blocksPerColumn; blockRow++) {
-      for (var blockCol = 0; blockCol < blocksPerLine; blockCol++) {
-        var offset = getBlockBufferOffset(component, blockRow, blockCol);
-        quantizeAndInverse(component, offset, computationBuffer);
-      }
-    }
-
-    return component.blockData;
-  }
-
-  function findNextFileMarker(data, currentPos, startPos = currentPos) {
-    const maxPos = data.length - 1;
-    var newPos = startPos < currentPos ? startPos : currentPos;
-
-    if (currentPos >= maxPos) {
-      return null;
-    }
-
-    var currentMarker = (0, _core_utils.readUint16)(data, currentPos);
-
-    if (currentMarker >= 0xffc0 && currentMarker <= 0xfffe) {
-      return {
-        invalid: null,
-        marker: currentMarker,
-        offset: currentPos
-      };
-    }
-
-    var newMarker = (0, _core_utils.readUint16)(data, newPos);
-
-    while (!(newMarker >= 0xffc0 && newMarker <= 0xfffe)) {
-      if (++newPos >= maxPos) {
-        return null;
-      }
-
-      newMarker = (0, _core_utils.readUint16)(data, newPos);
-    }
-
-    return {
-      invalid: currentMarker.toString(16),
-      marker: newMarker,
-      offset: newPos
-    };
-  }
-
-  JpegImage.prototype = {
-    parse(data, {
-      dnlScanLines = null
-    } = {}) {
-      function readDataBlock() {
-        const length = (0, _core_utils.readUint16)(data, offset);
-        offset += 2;
-        let endOffset = offset + length - 2;
-        var fileMarker = findNextFileMarker(data, endOffset, offset);
-
-        if (fileMarker && fileMarker.invalid) {
-          (0, _util.warn)("readDataBlock - incorrect length, current marker is: " + fileMarker.invalid);
-          endOffset = fileMarker.offset;
-        }
-
-        var array = data.subarray(offset, endOffset);
-        offset += array.length;
-        return array;
-      }
-
-      function prepareComponents(frame) {
-        var mcusPerLine = Math.ceil(frame.samplesPerLine / 8 / frame.maxH);
-        var mcusPerColumn = Math.ceil(frame.scanLines / 8 / frame.maxV);
-
-        for (var i = 0; i < frame.components.length; i++) {
-          component = frame.components[i];
-          var blocksPerLine = Math.ceil(Math.ceil(frame.samplesPerLine / 8) * component.h / frame.maxH);
-          var blocksPerColumn = Math.ceil(Math.ceil(frame.scanLines / 8) * component.v / frame.maxV);
-          var blocksPerLineForMcu = mcusPerLine * component.h;
-          var blocksPerColumnForMcu = mcusPerColumn * component.v;
-          var blocksBufferSize = 64 * blocksPerColumnForMcu * (blocksPerLineForMcu + 1);
-          component.blockData = new Int16Array(blocksBufferSize);
-          component.blocksPerLine = blocksPerLine;
-          component.blocksPerColumn = blocksPerColumn;
-        }
-
-        frame.mcusPerLine = mcusPerLine;
-        frame.mcusPerColumn = mcusPerColumn;
-      }
-
-      var offset = 0;
-      var jfif = null;
-      var adobe = null;
-      var frame, resetInterval;
-      let numSOSMarkers = 0;
-      var quantizationTables = [];
-      var huffmanTablesAC = [],
-          huffmanTablesDC = [];
-      let fileMarker = (0, _core_utils.readUint16)(data, offset);
-      offset += 2;
-
-      if (fileMarker !== 0xffd8) {
-        throw new JpegError("SOI not found");
-      }
-
-      fileMarker = (0, _core_utils.readUint16)(data, offset);
-      offset += 2;
-
-      markerLoop: while (fileMarker !== 0xffd9) {
-        var i, j, l;
-
-        switch (fileMarker) {
-          case 0xffe0:
-          case 0xffe1:
-          case 0xffe2:
-          case 0xffe3:
-          case 0xffe4:
-          case 0xffe5:
-          case 0xffe6:
-          case 0xffe7:
-          case 0xffe8:
-          case 0xffe9:
-          case 0xffea:
-          case 0xffeb:
-          case 0xffec:
-          case 0xffed:
-          case 0xffee:
-          case 0xffef:
-          case 0xfffe:
-            var appData = readDataBlock();
-
-            if (fileMarker === 0xffe0) {
-              if (appData[0] === 0x4a && appData[1] === 0x46 && appData[2] === 0x49 && appData[3] === 0x46 && appData[4] === 0) {
-                jfif = {
-                  version: {
-                    major: appData[5],
-                    minor: appData[6]
-                  },
-                  densityUnits: appData[7],
-                  xDensity: appData[8] << 8 | appData[9],
-                  yDensity: appData[10] << 8 | appData[11],
-                  thumbWidth: appData[12],
-                  thumbHeight: appData[13],
-                  thumbData: appData.subarray(14, 14 + 3 * appData[12] * appData[13])
-                };
-              }
-            }
-
-            if (fileMarker === 0xffee) {
-              if (appData[0] === 0x41 && appData[1] === 0x64 && appData[2] === 0x6f && appData[3] === 0x62 && appData[4] === 0x65) {
-                adobe = {
-                  version: appData[5] << 8 | appData[6],
-                  flags0: appData[7] << 8 | appData[8],
-                  flags1: appData[9] << 8 | appData[10],
-                  transformCode: appData[11]
-                };
-              }
-            }
-
-            break;
-
-          case 0xffdb:
-            const quantizationTablesLength = (0, _core_utils.readUint16)(data, offset);
-            offset += 2;
-            var quantizationTablesEnd = quantizationTablesLength + offset - 2;
-            var z;
-
-            while (offset < quantizationTablesEnd) {
-              var quantizationTableSpec = data[offset++];
-              var tableData = new Uint16Array(64);
-
-              if (quantizationTableSpec >> 4 === 0) {
-                for (j = 0; j < 64; j++) {
-                  z = dctZigZag[j];
-                  tableData[z] = data[offset++];
-                }
-              } else if (quantizationTableSpec >> 4 === 1) {
-                for (j = 0; j < 64; j++) {
-                  z = dctZigZag[j];
-                  tableData[z] = (0, _core_utils.readUint16)(data, offset);
-                  offset += 2;
-                }
-              } else {
-                throw new JpegError("DQT - invalid table spec");
-              }
-
-              quantizationTables[quantizationTableSpec & 15] = tableData;
-            }
-
-            break;
-
-          case 0xffc0:
-          case 0xffc1:
-          case 0xffc2:
-            if (frame) {
-              throw new JpegError("Only single frame JPEGs supported");
-            }
-
-            offset += 2;
-            frame = {};
-            frame.extended = fileMarker === 0xffc1;
-            frame.progressive = fileMarker === 0xffc2;
-            frame.precision = data[offset++];
-            const sofScanLines = (0, _core_utils.readUint16)(data, offset);
-            offset += 2;
-            frame.scanLines = dnlScanLines || sofScanLines;
-            frame.samplesPerLine = (0, _core_utils.readUint16)(data, offset);
-            offset += 2;
-            frame.components = [];
-            frame.componentIds = {};
-            var componentsCount = data[offset++],
-                componentId;
-            var maxH = 0,
-                maxV = 0;
-
-            for (i = 0; i < componentsCount; i++) {
-              componentId = data[offset];
-              var h = data[offset + 1] >> 4;
-              var v = data[offset + 1] & 15;
-
-              if (maxH < h) {
-                maxH = h;
-              }
-
-              if (maxV < v) {
-                maxV = v;
-              }
-
-              var qId = data[offset + 2];
-              l = frame.components.push({
-                h,
-                v,
-                quantizationId: qId,
-                quantizationTable: null
-              });
-              frame.componentIds[componentId] = l - 1;
-              offset += 3;
-            }
-
-            frame.maxH = maxH;
-            frame.maxV = maxV;
-            prepareComponents(frame);
-            break;
-
-          case 0xffc4:
-            const huffmanLength = (0, _core_utils.readUint16)(data, offset);
-            offset += 2;
-
-            for (i = 2; i < huffmanLength;) {
-              var huffmanTableSpec = data[offset++];
-              var codeLengths = new Uint8Array(16);
-              var codeLengthSum = 0;
-
-              for (j = 0; j < 16; j++, offset++) {
-                codeLengthSum += codeLengths[j] = data[offset];
-              }
-
-              var huffmanValues = new Uint8Array(codeLengthSum);
-
-              for (j = 0; j < codeLengthSum; j++, offset++) {
-                huffmanValues[j] = data[offset];
-              }
-
-              i += 17 + codeLengthSum;
-              (huffmanTableSpec >> 4 === 0 ? huffmanTablesDC : huffmanTablesAC)[huffmanTableSpec & 15] = buildHuffmanTable(codeLengths, huffmanValues);
-            }
-
-            break;
-
-          case 0xffdd:
-            offset += 2;
-            resetInterval = (0, _core_utils.readUint16)(data, offset);
-            offset += 2;
-            break;
-
-          case 0xffda:
-            const parseDNLMarker = ++numSOSMarkers === 1 && !dnlScanLines;
-            offset += 2;
-            var selectorsCount = data[offset++];
-            var components = [],
-                component;
-
-            for (i = 0; i < selectorsCount; i++) {
-              const index = data[offset++];
-              var componentIndex = frame.componentIds[index];
-              component = frame.components[componentIndex];
-              component.index = index;
-              var tableSpec = data[offset++];
-              component.huffmanTableDC = huffmanTablesDC[tableSpec >> 4];
-              component.huffmanTableAC = huffmanTablesAC[tableSpec & 15];
-              components.push(component);
-            }
-
-            var spectralStart = data[offset++];
-            var spectralEnd = data[offset++];
-            var successiveApproximation = data[offset++];
-
-            try {
-              var processed = decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successiveApproximation >> 4, successiveApproximation & 15, parseDNLMarker);
-              offset += processed;
-            } catch (ex) {
-              if (ex instanceof DNLMarkerError) {
-                (0, _util.warn)(`${ex.message} -- attempting to re-parse the JPEG image.`);
-                return this.parse(data, {
-                  dnlScanLines: ex.scanLines
-                });
-              } else if (ex instanceof EOIMarkerError) {
-                (0, _util.warn)(`${ex.message} -- ignoring the rest of the image data.`);
-                break markerLoop;
-              }
-
-              throw ex;
-            }
-
-            break;
-
-          case 0xffdc:
-            offset += 4;
-            break;
-
-          case 0xffff:
-            if (data[offset] !== 0xff) {
-              offset--;
-            }
-
-            break;
-
-          default:
-            const nextFileMarker = findNextFileMarker(data, offset - 2, offset - 3);
-
-            if (nextFileMarker && nextFileMarker.invalid) {
-              (0, _util.warn)("JpegImage.parse - unexpected data, current marker is: " + nextFileMarker.invalid);
-              offset = nextFileMarker.offset;
-              break;
-            }
-
-            if (offset >= data.length - 1) {
-              (0, _util.warn)("JpegImage.parse - reached the end of the image data " + "without finding an EOI marker (0xFFD9).");
-              break markerLoop;
-            }
-
-            throw new JpegError("JpegImage.parse - unknown marker: " + fileMarker.toString(16));
-        }
-
-        fileMarker = (0, _core_utils.readUint16)(data, offset);
-        offset += 2;
-      }
-
-      this.width = frame.samplesPerLine;
-      this.height = frame.scanLines;
-      this.jfif = jfif;
-      this.adobe = adobe;
-      this.components = [];
-
-      for (i = 0; i < frame.components.length; i++) {
-        component = frame.components[i];
-        var quantizationTable = quantizationTables[component.quantizationId];
-
-        if (quantizationTable) {
-          component.quantizationTable = quantizationTable;
-        }
-
-        this.components.push({
-          index: component.index,
-          output: buildComponentData(frame, component),
-          scaleX: component.h / frame.maxH,
-          scaleY: component.v / frame.maxV,
-          blocksPerLine: component.blocksPerLine,
-          blocksPerColumn: component.blocksPerColumn
-        });
-      }
-
-      this.numComponents = this.components.length;
-      return undefined;
-    },
-
-    _getLinearizedBlockData(width, height, isSourcePDF = false) {
-      var scaleX = this.width / width,
-          scaleY = this.height / height;
-      var component, componentScaleX, componentScaleY, blocksPerScanline;
-      var x, y, i, j, k;
-      var index;
-      var offset = 0;
-      var output;
-      var numComponents = this.components.length;
-      var dataLength = width * height * numComponents;
-      var data = new Uint8ClampedArray(dataLength);
-      var xScaleBlockOffset = new Uint32Array(width);
-      var mask3LSB = 0xfffffff8;
-      let lastComponentScaleX;
-
-      for (i = 0; i < numComponents; i++) {
-        component = this.components[i];
-        componentScaleX = component.scaleX * scaleX;
-        componentScaleY = component.scaleY * scaleY;
-        offset = i;
-        output = component.output;
-        blocksPerScanline = component.blocksPerLine + 1 << 3;
-
-        if (componentScaleX !== lastComponentScaleX) {
-          for (x = 0; x < width; x++) {
-            j = 0 | x * componentScaleX;
-            xScaleBlockOffset[x] = (j & mask3LSB) << 3 | j & 7;
-          }
-
-          lastComponentScaleX = componentScaleX;
-        }
-
-        for (y = 0; y < height; y++) {
-          j = 0 | y * componentScaleY;
-          index = blocksPerScanline * (j & mask3LSB) | (j & 7) << 3;
-
-          for (x = 0; x < width; x++) {
-            data[offset] = output[index + xScaleBlockOffset[x]];
-            offset += numComponents;
-          }
-        }
-      }
-
-      let transform = this._decodeTransform;
-
-      if (!isSourcePDF && numComponents === 4 && !transform) {
-        transform = new Int32Array([-256, 255, -256, 255, -256, 255, -256, 255]);
-      }
-
-      if (transform) {
-        for (i = 0; i < dataLength;) {
-          for (j = 0, k = 0; j < numComponents; j++, i++, k += 2) {
-            data[i] = (data[i] * transform[k] >> 8) + transform[k + 1];
-          }
-        }
-      }
-
-      return data;
-    },
-
-    get _isColorConversionNeeded() {
-      if (this.adobe) {
-        return !!this.adobe.transformCode;
-      }
-
-      if (this.numComponents === 3) {
-        if (this._colorTransform === 0) {
-          return false;
-        } else if (this.components[0].index === 0x52 && this.components[1].index === 0x47 && this.components[2].index === 0x42) {
-          return false;
-        }
-
-        return true;
-      }
-
-      if (this._colorTransform === 1) {
-        return true;
-      }
-
-      return false;
-    },
-
-    _convertYccToRgb: function convertYccToRgb(data) {
-      var Y, Cb, Cr;
-
-      for (var i = 0, length = data.length; i < length; i += 3) {
-        Y = data[i];
-        Cb = data[i + 1];
-        Cr = data[i + 2];
-        data[i] = Y - 179.456 + 1.402 * Cr;
-        data[i + 1] = Y + 135.459 - 0.344 * Cb - 0.714 * Cr;
-        data[i + 2] = Y - 226.816 + 1.772 * Cb;
-      }
-
-      return data;
-    },
-    _convertYcckToRgb: function convertYcckToRgb(data) {
-      var Y, Cb, Cr, k;
-      var offset = 0;
-
-      for (var i = 0, length = data.length; i < length; i += 4) {
-        Y = data[i];
-        Cb = data[i + 1];
-        Cr = data[i + 2];
-        k = data[i + 3];
-        data[offset++] = -122.67195406894 + Cb * (-6.60635669420364e-5 * Cb + 0.000437130475926232 * Cr - 5.4080610064599e-5 * Y + 0.00048449797120281 * k - 0.154362151871126) + Cr * (-0.000957964378445773 * Cr + 0.000817076911346625 * Y - 0.00477271405408747 * k + 1.53380253221734) + Y * (0.000961250184130688 * Y - 0.00266257332283933 * k + 0.48357088451265) + k * (-0.000336197177618394 * k + 0.484791561490776);
-        data[offset++] = 107.268039397724 + Cb * (2.19927104525741e-5 * Cb - 0.000640992018297945 * Cr + 0.000659397001245577 * Y + 0.000426105652938837 * k - 0.176491792462875) + Cr * (-0.000778269941513683 * Cr + 0.00130872261408275 * Y + 0.000770482631801132 * k - 0.151051492775562) + Y * (0.00126935368114843 * Y - 0.00265090189010898 * k + 0.25802910206845) + k * (-0.000318913117588328 * k - 0.213742400323665);
-        data[offset++] = -20.810012546947 + Cb * (-0.000570115196973677 * Cb - 2.63409051004589e-5 * Cr + 0.0020741088115012 * Y - 0.00288260236853442 * k + 0.814272968359295) + Cr * (-1.53496057440975e-5 * Cr - 0.000132689043961446 * Y + 0.000560833691242812 * k - 0.195152027534049) + Y * (0.00174418132927582 * Y - 0.00255243321439347 * k + 0.116935020465145) + k * (-0.000343531996510555 * k + 0.24165260232407);
-      }
-
-      return data.subarray(0, offset);
-    },
-    _convertYcckToCmyk: function convertYcckToCmyk(data) {
-      var Y, Cb, Cr;
-
-      for (var i = 0, length = data.length; i < length; i += 4) {
-        Y = data[i];
-        Cb = data[i + 1];
-        Cr = data[i + 2];
-        data[i] = 434.456 - Y - 1.402 * Cr;
-        data[i + 1] = 119.541 - Y + 0.344 * Cb + 0.714 * Cr;
-        data[i + 2] = 481.816 - Y - 1.772 * Cb;
-      }
-
-      return data;
-    },
-    _convertCmykToRgb: function convertCmykToRgb(data) {
-      var c, m, y, k;
-      var offset = 0;
-
-      for (var i = 0, length = data.length; i < length; i += 4) {
-        c = data[i];
-        m = data[i + 1];
-        y = data[i + 2];
-        k = data[i + 3];
-        data[offset++] = 255 + c * (-0.00006747147073602441 * c + 0.0008379262121013727 * m + 0.0002894718188643294 * y + 0.003264231057537806 * k - 1.1185611867203937) + m * (0.000026374107616089405 * m - 0.00008626949158638572 * y - 0.0002748769067499491 * k - 0.02155688794978967) + y * (-0.00003878099212869363 * y - 0.0003267808279485286 * k + 0.0686742238595345) - k * (0.0003361971776183937 * k + 0.7430659151342254);
-        data[offset++] = 255 + c * (0.00013596372813588848 * c + 0.000924537132573585 * m + 0.00010567359618683593 * y + 0.0004791864687436512 * k - 0.3109689587515875) + m * (-0.00023545346108370344 * m + 0.0002702845253534714 * y + 0.0020200308977307156 * k - 0.7488052167015494) + y * (0.00006834815998235662 * y + 0.00015168452363460973 * k - 0.09751927774728933) - k * (0.00031891311758832814 * k + 0.7364883807733168);
-        data[offset++] = 255 + c * (0.000013598650411385307 * c + 0.00012423956175490851 * m + 0.0004751985097583589 * y - 0.0000036729317476630422 * k - 0.05562186980264034) + m * (0.00016141380598724676 * m + 0.0009692239130725186 * y + 0.0007782692450036253 * k - 0.44015232367526463) + y * (5.068882914068769e-7 * y + 0.0017778369011375071 * k - 0.7591454649749609) - k * (0.0003435319965105553 * k + 0.7063770186160144);
-      }
-
-      return data.subarray(0, offset);
-    },
-
-    getData({
-      width,
-      height,
-      forceRGB = false,
-      isSourcePDF = false
-    }) {
-      if (this.numComponents > 4) {
-        throw new JpegError("Unsupported color mode");
-      }
-
-      var data = this._getLinearizedBlockData(width, height, isSourcePDF);
-
-      if (this.numComponents === 1 && forceRGB) {
-        var dataLength = data.length;
-        var rgbData = new Uint8ClampedArray(dataLength * 3);
-        var offset = 0;
-
-        for (var i = 0; i < dataLength; i++) {
-          var grayColor = data[i];
-          rgbData[offset++] = grayColor;
-          rgbData[offset++] = grayColor;
-          rgbData[offset++] = grayColor;
-        }
-
-        return rgbData;
-      } else if (this.numComponents === 3 && this._isColorConversionNeeded) {
-        return this._convertYccToRgb(data);
-      } else if (this.numComponents === 4) {
-        if (this._isColorConversionNeeded) {
-          if (forceRGB) {
-            return this._convertYcckToRgb(data);
-          }
-
-          return this._convertYcckToCmyk(data);
-        } else if (forceRGB) {
-          return this._convertCmykToRgb(data);
-        }
-      }
-
-      return data;
-    }
-
-  };
-  return JpegImage;
-}();
-
-exports.JpegImage = JpegImage;
-
-/***/ }),
-/* 20 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.JpxStream = void 0;
-
-var _stream = __w_pdfjs_require__(12);
-
-var _jpx = __w_pdfjs_require__(21);
-
-var _util = __w_pdfjs_require__(2);
-
-const JpxStream = function JpxStreamClosure() {
-  function JpxStream(stream, maybeLength, dict, params) {
-    this.stream = stream;
-    this.maybeLength = maybeLength;
-    this.dict = dict;
-    this.params = params;
-
-    _stream.DecodeStream.call(this, maybeLength);
-  }
-
-  JpxStream.prototype = Object.create(_stream.DecodeStream.prototype);
-  Object.defineProperty(JpxStream.prototype, "bytes", {
-    get: function JpxStream_bytes() {
-      return (0, _util.shadow)(this, "bytes", this.stream.getBytes(this.maybeLength));
-    },
-    configurable: true
-  });
-
-  JpxStream.prototype.ensureBuffer = function (requested) {};
-
-  JpxStream.prototype.readBlock = function () {
-    if (this.eof) {
-      return;
-    }
-
-    const jpxImage = new _jpx.JpxImage();
-    jpxImage.parse(this.bytes);
-    const width = jpxImage.width;
-    const height = jpxImage.height;
-    const componentsCount = jpxImage.componentsCount;
-    const tileCount = jpxImage.tiles.length;
-
-    if (tileCount === 1) {
-      this.buffer = jpxImage.tiles[0].items;
-    } else {
-      const data = new Uint8ClampedArray(width * height * componentsCount);
-
-      for (let k = 0; k < tileCount; k++) {
-        const tileComponents = jpxImage.tiles[k];
-        const tileWidth = tileComponents.width;
-        const tileHeight = tileComponents.height;
-        const tileLeft = tileComponents.left;
-        const tileTop = tileComponents.top;
-        const src = tileComponents.items;
-        let srcPosition = 0;
-        let dataPosition = (width * tileTop + tileLeft) * componentsCount;
-        const imgRowSize = width * componentsCount;
-        const tileRowSize = tileWidth * componentsCount;
-
-        for (let j = 0; j < tileHeight; j++) {
-          const rowBytes = src.subarray(srcPosition, srcPosition + tileRowSize);
-          data.set(rowBytes, dataPosition);
-          srcPosition += tileRowSize;
-          dataPosition += imgRowSize;
-        }
-      }
-
-      this.buffer = data;
-    }
-
-    this.bufferLength = this.buffer.length;
-    this.eof = true;
-  };
-
-  return JpxStream;
-}();
-
-exports.JpxStream = JpxStream;
-
-/***/ }),
-/* 21 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.JpxImage = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var _core_utils = __w_pdfjs_require__(8);
-
-var _arithmetic_decoder = __w_pdfjs_require__(17);
-
-class JpxError extends _util.BaseException {
-  constructor(msg) {
-    super(`JPX error: ${msg}`);
-  }
-
-}
-
-var JpxImage = function JpxImageClosure() {
-  var SubbandsGainLog2 = {
-    LL: 0,
-    LH: 1,
-    HL: 1,
-    HH: 2
-  };
-
-  function JpxImage() {
-    this.failOnCorruptedImage = false;
-  }
-
-  JpxImage.prototype = {
-    parse: function JpxImage_parse(data) {
-      var head = (0, _core_utils.readUint16)(data, 0);
-
-      if (head === 0xff4f) {
-        this.parseCodestream(data, 0, data.length);
-        return;
-      }
-
-      var position = 0,
-          length = data.length;
-
-      while (position < length) {
-        var headerSize = 8;
-        var lbox = (0, _core_utils.readUint32)(data, position);
-        var tbox = (0, _core_utils.readUint32)(data, position + 4);
-        position += headerSize;
-
-        if (lbox === 1) {
-          lbox = (0, _core_utils.readUint32)(data, position) * 4294967296 + (0, _core_utils.readUint32)(data, position + 4);
-          position += 8;
-          headerSize += 8;
-        }
-
-        if (lbox === 0) {
-          lbox = length - position + headerSize;
-        }
-
-        if (lbox < headerSize) {
-          throw new JpxError("Invalid box field size");
-        }
-
-        var dataLength = lbox - headerSize;
-        var jumpDataLength = true;
-
-        switch (tbox) {
-          case 0x6a703268:
-            jumpDataLength = false;
-            break;
-
-          case 0x636f6c72:
-            var method = data[position];
-
-            if (method === 1) {
-              var colorspace = (0, _core_utils.readUint32)(data, position + 3);
-
-              switch (colorspace) {
-                case 16:
-                case 17:
-                case 18:
-                  break;
-
-                default:
-                  (0, _util.warn)("Unknown colorspace " + colorspace);
-                  break;
-              }
-            } else if (method === 2) {
-              (0, _util.info)("ICC profile not supported");
-            }
-
-            break;
-
-          case 0x6a703263:
-            this.parseCodestream(data, position, position + dataLength);
-            break;
-
-          case 0x6a502020:
-            if ((0, _core_utils.readUint32)(data, position) !== 0x0d0a870a) {
-              (0, _util.warn)("Invalid JP2 signature");
-            }
-
-            break;
-
-          case 0x6a501a1a:
-          case 0x66747970:
-          case 0x72726571:
-          case 0x72657320:
-          case 0x69686472:
-            break;
-
-          default:
-            var headerType = String.fromCharCode(tbox >> 24 & 0xff, tbox >> 16 & 0xff, tbox >> 8 & 0xff, tbox & 0xff);
-            (0, _util.warn)("Unsupported header type " + tbox + " (" + headerType + ")");
-            break;
-        }
-
-        if (jumpDataLength) {
-          position += dataLength;
-        }
-      }
-    },
-    parseImageProperties: function JpxImage_parseImageProperties(stream) {
-      var newByte = stream.getByte();
-
-      while (newByte >= 0) {
-        var oldByte = newByte;
-        newByte = stream.getByte();
-        var code = oldByte << 8 | newByte;
-
-        if (code === 0xff51) {
-          stream.skip(4);
-          var Xsiz = stream.getInt32() >>> 0;
-          var Ysiz = stream.getInt32() >>> 0;
-          var XOsiz = stream.getInt32() >>> 0;
-          var YOsiz = stream.getInt32() >>> 0;
-          stream.skip(16);
-          var Csiz = stream.getUint16();
-          this.width = Xsiz - XOsiz;
-          this.height = Ysiz - YOsiz;
-          this.componentsCount = Csiz;
-          this.bitsPerComponent = 8;
-          return;
-        }
-      }
-
-      throw new JpxError("No size marker found in JPX stream");
-    },
-    parseCodestream: function JpxImage_parseCodestream(data, start, end) {
-      var context = {};
-      var doNotRecover = false;
-
-      try {
-        var position = start;
-
-        while (position + 1 < end) {
-          var code = (0, _core_utils.readUint16)(data, position);
-          position += 2;
-          var length = 0,
-              j,
-              sqcd,
-              spqcds,
-              spqcdSize,
-              scalarExpounded,
-              tile;
-
-          switch (code) {
-            case 0xff4f:
-              context.mainHeader = true;
-              break;
-
-            case 0xffd9:
-              break;
-
-            case 0xff51:
-              length = (0, _core_utils.readUint16)(data, position);
-              var siz = {};
-              siz.Xsiz = (0, _core_utils.readUint32)(data, position + 4);
-              siz.Ysiz = (0, _core_utils.readUint32)(data, position + 8);
-              siz.XOsiz = (0, _core_utils.readUint32)(data, position + 12);
-              siz.YOsiz = (0, _core_utils.readUint32)(data, position + 16);
-              siz.XTsiz = (0, _core_utils.readUint32)(data, position + 20);
-              siz.YTsiz = (0, _core_utils.readUint32)(data, position + 24);
-              siz.XTOsiz = (0, _core_utils.readUint32)(data, position + 28);
-              siz.YTOsiz = (0, _core_utils.readUint32)(data, position + 32);
-              var componentsCount = (0, _core_utils.readUint16)(data, position + 36);
-              siz.Csiz = componentsCount;
-              var components = [];
-              j = position + 38;
-
-              for (var i = 0; i < componentsCount; i++) {
-                var component = {
-                  precision: (data[j] & 0x7f) + 1,
-                  isSigned: !!(data[j] & 0x80),
-                  XRsiz: data[j + 1],
-                  YRsiz: data[j + 2]
-                };
-                j += 3;
-                calculateComponentDimensions(component, siz);
-                components.push(component);
-              }
-
-              context.SIZ = siz;
-              context.components = components;
-              calculateTileGrids(context, components);
-              context.QCC = [];
-              context.COC = [];
-              break;
-
-            case 0xff5c:
-              length = (0, _core_utils.readUint16)(data, position);
-              var qcd = {};
-              j = position + 2;
-              sqcd = data[j++];
-
-              switch (sqcd & 0x1f) {
-                case 0:
-                  spqcdSize = 8;
-                  scalarExpounded = true;
-                  break;
-
-                case 1:
-                  spqcdSize = 16;
-                  scalarExpounded = false;
-                  break;
-
-                case 2:
-                  spqcdSize = 16;
-                  scalarExpounded = true;
-                  break;
-
-                default:
-                  throw new Error("Invalid SQcd value " + sqcd);
-              }
-
-              qcd.noQuantization = spqcdSize === 8;
-              qcd.scalarExpounded = scalarExpounded;
-              qcd.guardBits = sqcd >> 5;
-              spqcds = [];
-
-              while (j < length + position) {
-                var spqcd = {};
-
-                if (spqcdSize === 8) {
-                  spqcd.epsilon = data[j++] >> 3;
-                  spqcd.mu = 0;
-                } else {
-                  spqcd.epsilon = data[j] >> 3;
-                  spqcd.mu = (data[j] & 0x7) << 8 | data[j + 1];
-                  j += 2;
-                }
-
-                spqcds.push(spqcd);
-              }
-
-              qcd.SPqcds = spqcds;
-
-              if (context.mainHeader) {
-                context.QCD = qcd;
-              } else {
-                context.currentTile.QCD = qcd;
-                context.currentTile.QCC = [];
-              }
-
-              break;
-
-            case 0xff5d:
-              length = (0, _core_utils.readUint16)(data, position);
-              var qcc = {};
-              j = position + 2;
-              var cqcc;
-
-              if (context.SIZ.Csiz < 257) {
-                cqcc = data[j++];
-              } else {
-                cqcc = (0, _core_utils.readUint16)(data, j);
-                j += 2;
-              }
-
-              sqcd = data[j++];
-
-              switch (sqcd & 0x1f) {
-                case 0:
-                  spqcdSize = 8;
-                  scalarExpounded = true;
-                  break;
-
-                case 1:
-                  spqcdSize = 16;
-                  scalarExpounded = false;
-                  break;
-
-                case 2:
-                  spqcdSize = 16;
-                  scalarExpounded = true;
-                  break;
-
-                default:
-                  throw new Error("Invalid SQcd value " + sqcd);
-              }
-
-              qcc.noQuantization = spqcdSize === 8;
-              qcc.scalarExpounded = scalarExpounded;
-              qcc.guardBits = sqcd >> 5;
-              spqcds = [];
-
-              while (j < length + position) {
-                spqcd = {};
-
-                if (spqcdSize === 8) {
-                  spqcd.epsilon = data[j++] >> 3;
-                  spqcd.mu = 0;
-                } else {
-                  spqcd.epsilon = data[j] >> 3;
-                  spqcd.mu = (data[j] & 0x7) << 8 | data[j + 1];
-                  j += 2;
-                }
-
-                spqcds.push(spqcd);
-              }
-
-              qcc.SPqcds = spqcds;
-
-              if (context.mainHeader) {
-                context.QCC[cqcc] = qcc;
-              } else {
-                context.currentTile.QCC[cqcc] = qcc;
-              }
-
-              break;
-
-            case 0xff52:
-              length = (0, _core_utils.readUint16)(data, position);
-              var cod = {};
-              j = position + 2;
-              var scod = data[j++];
-              cod.entropyCoderWithCustomPrecincts = !!(scod & 1);
-              cod.sopMarkerUsed = !!(scod & 2);
-              cod.ephMarkerUsed = !!(scod & 4);
-              cod.progressionOrder = data[j++];
-              cod.layersCount = (0, _core_utils.readUint16)(data, j);
-              j += 2;
-              cod.multipleComponentTransform = data[j++];
-              cod.decompositionLevelsCount = data[j++];
-              cod.xcb = (data[j++] & 0xf) + 2;
-              cod.ycb = (data[j++] & 0xf) + 2;
-              var blockStyle = data[j++];
-              cod.selectiveArithmeticCodingBypass = !!(blockStyle & 1);
-              cod.resetContextProbabilities = !!(blockStyle & 2);
-              cod.terminationOnEachCodingPass = !!(blockStyle & 4);
-              cod.verticallyStripe = !!(blockStyle & 8);
-              cod.predictableTermination = !!(blockStyle & 16);
-              cod.segmentationSymbolUsed = !!(blockStyle & 32);
-              cod.reversibleTransformation = data[j++];
-
-              if (cod.entropyCoderWithCustomPrecincts) {
-                var precinctsSizes = [];
-
-                while (j < length + position) {
-                  var precinctsSize = data[j++];
-                  precinctsSizes.push({
-                    PPx: precinctsSize & 0xf,
-                    PPy: precinctsSize >> 4
-                  });
-                }
-
-                cod.precinctsSizes = precinctsSizes;
-              }
-
-              var unsupported = [];
-
-              if (cod.selectiveArithmeticCodingBypass) {
-                unsupported.push("selectiveArithmeticCodingBypass");
-              }
-
-              if (cod.resetContextProbabilities) {
-                unsupported.push("resetContextProbabilities");
-              }
-
-              if (cod.terminationOnEachCodingPass) {
-                unsupported.push("terminationOnEachCodingPass");
-              }
-
-              if (cod.verticallyStripe) {
-                unsupported.push("verticallyStripe");
-              }
-
-              if (cod.predictableTermination) {
-                unsupported.push("predictableTermination");
-              }
-
-              if (unsupported.length > 0) {
-                doNotRecover = true;
-                throw new Error("Unsupported COD options (" + unsupported.join(", ") + ")");
-              }
-
-              if (context.mainHeader) {
-                context.COD = cod;
-              } else {
-                context.currentTile.COD = cod;
-                context.currentTile.COC = [];
-              }
-
-              break;
-
-            case 0xff90:
-              length = (0, _core_utils.readUint16)(data, position);
-              tile = {};
-              tile.index = (0, _core_utils.readUint16)(data, position + 2);
-              tile.length = (0, _core_utils.readUint32)(data, position + 4);
-              tile.dataEnd = tile.length + position - 2;
-              tile.partIndex = data[position + 8];
-              tile.partsCount = data[position + 9];
-              context.mainHeader = false;
-
-              if (tile.partIndex === 0) {
-                tile.COD = context.COD;
-                tile.COC = context.COC.slice(0);
-                tile.QCD = context.QCD;
-                tile.QCC = context.QCC.slice(0);
-              }
-
-              context.currentTile = tile;
-              break;
-
-            case 0xff93:
-              tile = context.currentTile;
-
-              if (tile.partIndex === 0) {
-                initializeTile(context, tile.index);
-                buildPackets(context);
-              }
-
-              length = tile.dataEnd - position;
-              parseTilePackets(context, data, position, length);
-              break;
-
-            case 0xff55:
-            case 0xff57:
-            case 0xff58:
-            case 0xff64:
-              length = (0, _core_utils.readUint16)(data, position);
-              break;
-
-            case 0xff53:
-              throw new Error("Codestream code 0xFF53 (COC) is not implemented");
-
-            default:
-              throw new Error("Unknown codestream code: " + code.toString(16));
-          }
-
-          position += length;
-        }
-      } catch (e) {
-        if (doNotRecover || this.failOnCorruptedImage) {
-          throw new JpxError(e.message);
-        } else {
-          (0, _util.warn)("JPX: Trying to recover from: " + e.message);
-        }
-      }
-
-      this.tiles = transformComponents(context);
-      this.width = context.SIZ.Xsiz - context.SIZ.XOsiz;
-      this.height = context.SIZ.Ysiz - context.SIZ.YOsiz;
-      this.componentsCount = context.SIZ.Csiz;
-    }
-  };
-
-  function calculateComponentDimensions(component, siz) {
-    component.x0 = Math.ceil(siz.XOsiz / component.XRsiz);
-    component.x1 = Math.ceil(siz.Xsiz / component.XRsiz);
-    component.y0 = Math.ceil(siz.YOsiz / component.YRsiz);
-    component.y1 = Math.ceil(siz.Ysiz / component.YRsiz);
-    component.width = component.x1 - component.x0;
-    component.height = component.y1 - component.y0;
-  }
-
-  function calculateTileGrids(context, components) {
-    var siz = context.SIZ;
-    var tile,
-        tiles = [];
-    var numXtiles = Math.ceil((siz.Xsiz - siz.XTOsiz) / siz.XTsiz);
-    var numYtiles = Math.ceil((siz.Ysiz - siz.YTOsiz) / siz.YTsiz);
-
-    for (var q = 0; q < numYtiles; q++) {
-      for (var p = 0; p < numXtiles; p++) {
-        tile = {};
-        tile.tx0 = Math.max(siz.XTOsiz + p * siz.XTsiz, siz.XOsiz);
-        tile.ty0 = Math.max(siz.YTOsiz + q * siz.YTsiz, siz.YOsiz);
-        tile.tx1 = Math.min(siz.XTOsiz + (p + 1) * siz.XTsiz, siz.Xsiz);
-        tile.ty1 = Math.min(siz.YTOsiz + (q + 1) * siz.YTsiz, siz.Ysiz);
-        tile.width = tile.tx1 - tile.tx0;
-        tile.height = tile.ty1 - tile.ty0;
-        tile.components = [];
-        tiles.push(tile);
-      }
-    }
-
-    context.tiles = tiles;
-    var componentsCount = siz.Csiz;
-
-    for (var i = 0, ii = componentsCount; i < ii; i++) {
-      var component = components[i];
-
-      for (var j = 0, jj = tiles.length; j < jj; j++) {
-        var tileComponent = {};
-        tile = tiles[j];
-        tileComponent.tcx0 = Math.ceil(tile.tx0 / component.XRsiz);
-        tileComponent.tcy0 = Math.ceil(tile.ty0 / component.YRsiz);
-        tileComponent.tcx1 = Math.ceil(tile.tx1 / component.XRsiz);
-        tileComponent.tcy1 = Math.ceil(tile.ty1 / component.YRsiz);
-        tileComponent.width = tileComponent.tcx1 - tileComponent.tcx0;
-        tileComponent.height = tileComponent.tcy1 - tileComponent.tcy0;
-        tile.components[i] = tileComponent;
-      }
-    }
-  }
-
-  function getBlocksDimensions(context, component, r) {
-    var codOrCoc = component.codingStyleParameters;
-    var result = {};
-
-    if (!codOrCoc.entropyCoderWithCustomPrecincts) {
-      result.PPx = 15;
-      result.PPy = 15;
-    } else {
-      result.PPx = codOrCoc.precinctsSizes[r].PPx;
-      result.PPy = codOrCoc.precinctsSizes[r].PPy;
-    }
-
-    result.xcb_ = r > 0 ? Math.min(codOrCoc.xcb, result.PPx - 1) : Math.min(codOrCoc.xcb, result.PPx);
-    result.ycb_ = r > 0 ? Math.min(codOrCoc.ycb, result.PPy - 1) : Math.min(codOrCoc.ycb, result.PPy);
-    return result;
-  }
-
-  function buildPrecincts(context, resolution, dimensions) {
-    var precinctWidth = 1 << dimensions.PPx;
-    var precinctHeight = 1 << dimensions.PPy;
-    var isZeroRes = resolution.resLevel === 0;
-    var precinctWidthInSubband = 1 << dimensions.PPx + (isZeroRes ? 0 : -1);
-    var precinctHeightInSubband = 1 << dimensions.PPy + (isZeroRes ? 0 : -1);
-    var numprecinctswide = resolution.trx1 > resolution.trx0 ? Math.ceil(resolution.trx1 / precinctWidth) - Math.floor(resolution.trx0 / precinctWidth) : 0;
-    var numprecinctshigh = resolution.try1 > resolution.try0 ? Math.ceil(resolution.try1 / precinctHeight) - Math.floor(resolution.try0 / precinctHeight) : 0;
-    var numprecincts = numprecinctswide * numprecinctshigh;
-    resolution.precinctParameters = {
-      precinctWidth,
-      precinctHeight,
-      numprecinctswide,
-      numprecinctshigh,
-      numprecincts,
-      precinctWidthInSubband,
-      precinctHeightInSubband
-    };
-  }
-
-  function buildCodeblocks(context, subband, dimensions) {
-    var xcb_ = dimensions.xcb_;
-    var ycb_ = dimensions.ycb_;
-    var codeblockWidth = 1 << xcb_;
-    var codeblockHeight = 1 << ycb_;
-    var cbx0 = subband.tbx0 >> xcb_;
-    var cby0 = subband.tby0 >> ycb_;
-    var cbx1 = subband.tbx1 + codeblockWidth - 1 >> xcb_;
-    var cby1 = subband.tby1 + codeblockHeight - 1 >> ycb_;
-    var precinctParameters = subband.resolution.precinctParameters;
-    var codeblocks = [];
-    var precincts = [];
-    var i, j, codeblock, precinctNumber;
-
-    for (j = cby0; j < cby1; j++) {
-      for (i = cbx0; i < cbx1; i++) {
-        codeblock = {
-          cbx: i,
-          cby: j,
-          tbx0: codeblockWidth * i,
-          tby0: codeblockHeight * j,
-          tbx1: codeblockWidth * (i + 1),
-          tby1: codeblockHeight * (j + 1)
-        };
-        codeblock.tbx0_ = Math.max(subband.tbx0, codeblock.tbx0);
-        codeblock.tby0_ = Math.max(subband.tby0, codeblock.tby0);
-        codeblock.tbx1_ = Math.min(subband.tbx1, codeblock.tbx1);
-        codeblock.tby1_ = Math.min(subband.tby1, codeblock.tby1);
-        var pi = Math.floor((codeblock.tbx0_ - subband.tbx0) / precinctParameters.precinctWidthInSubband);
-        var pj = Math.floor((codeblock.tby0_ - subband.tby0) / precinctParameters.precinctHeightInSubband);
-        precinctNumber = pi + pj * precinctParameters.numprecinctswide;
-        codeblock.precinctNumber = precinctNumber;
-        codeblock.subbandType = subband.type;
-        codeblock.Lblock = 3;
-
-        if (codeblock.tbx1_ <= codeblock.tbx0_ || codeblock.tby1_ <= codeblock.tby0_) {
-          continue;
-        }
-
-        codeblocks.push(codeblock);
-        var precinct = precincts[precinctNumber];
-
-        if (precinct !== undefined) {
-          if (i < precinct.cbxMin) {
-            precinct.cbxMin = i;
-          } else if (i > precinct.cbxMax) {
-            precinct.cbxMax = i;
-          }
-
-          if (j < precinct.cbyMin) {
-            precinct.cbxMin = j;
-          } else if (j > precinct.cbyMax) {
-            precinct.cbyMax = j;
-          }
-        } else {
-          precincts[precinctNumber] = precinct = {
-            cbxMin: i,
-            cbyMin: j,
-            cbxMax: i,
-            cbyMax: j
-          };
-        }
-
-        codeblock.precinct = precinct;
-      }
-    }
-
-    subband.codeblockParameters = {
-      codeblockWidth: xcb_,
-      codeblockHeight: ycb_,
-      numcodeblockwide: cbx1 - cbx0 + 1,
-      numcodeblockhigh: cby1 - cby0 + 1
-    };
-    subband.codeblocks = codeblocks;
-    subband.precincts = precincts;
-  }
-
-  function createPacket(resolution, precinctNumber, layerNumber) {
-    var precinctCodeblocks = [];
-    var subbands = resolution.subbands;
-
-    for (var i = 0, ii = subbands.length; i < ii; i++) {
-      var subband = subbands[i];
-      var codeblocks = subband.codeblocks;
-
-      for (var j = 0, jj = codeblocks.length; j < jj; j++) {
-        var codeblock = codeblocks[j];
-
-        if (codeblock.precinctNumber !== precinctNumber) {
-          continue;
-        }
-
-        precinctCodeblocks.push(codeblock);
-      }
-    }
-
-    return {
-      layerNumber,
-      codeblocks: precinctCodeblocks
-    };
-  }
-
-  function LayerResolutionComponentPositionIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var maxDecompositionLevelsCount = 0;
-
-    for (var q = 0; q < componentsCount; q++) {
-      maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount, tile.components[q].codingStyleParameters.decompositionLevelsCount);
-    }
-
-    var l = 0,
-        r = 0,
-        i = 0,
-        k = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      for (; l < layersCount; l++) {
-        for (; r <= maxDecompositionLevelsCount; r++) {
-          for (; i < componentsCount; i++) {
-            var component = tile.components[i];
-
-            if (r > component.codingStyleParameters.decompositionLevelsCount) {
-              continue;
-            }
-
-            var resolution = component.resolutions[r];
-            var numprecincts = resolution.precinctParameters.numprecincts;
-
-            for (; k < numprecincts;) {
-              var packet = createPacket(resolution, k, l);
-              k++;
-              return packet;
-            }
-
-            k = 0;
-          }
-
-          i = 0;
-        }
-
-        r = 0;
-      }
-
-      throw new JpxError("Out of packets");
-    };
-  }
-
-  function ResolutionLayerComponentPositionIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var maxDecompositionLevelsCount = 0;
-
-    for (var q = 0; q < componentsCount; q++) {
-      maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount, tile.components[q].codingStyleParameters.decompositionLevelsCount);
-    }
-
-    var r = 0,
-        l = 0,
-        i = 0,
-        k = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      for (; r <= maxDecompositionLevelsCount; r++) {
-        for (; l < layersCount; l++) {
-          for (; i < componentsCount; i++) {
-            var component = tile.components[i];
-
-            if (r > component.codingStyleParameters.decompositionLevelsCount) {
-              continue;
-            }
-
-            var resolution = component.resolutions[r];
-            var numprecincts = resolution.precinctParameters.numprecincts;
-
-            for (; k < numprecincts;) {
-              var packet = createPacket(resolution, k, l);
-              k++;
-              return packet;
-            }
-
-            k = 0;
-          }
-
-          i = 0;
-        }
-
-        l = 0;
-      }
-
-      throw new JpxError("Out of packets");
-    };
-  }
-
-  function ResolutionPositionComponentLayerIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var l, r, c, p;
-    var maxDecompositionLevelsCount = 0;
-
-    for (c = 0; c < componentsCount; c++) {
-      const component = tile.components[c];
-      maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount, component.codingStyleParameters.decompositionLevelsCount);
-    }
-
-    var maxNumPrecinctsInLevel = new Int32Array(maxDecompositionLevelsCount + 1);
-
-    for (r = 0; r <= maxDecompositionLevelsCount; ++r) {
-      var maxNumPrecincts = 0;
-
-      for (c = 0; c < componentsCount; ++c) {
-        var resolutions = tile.components[c].resolutions;
-
-        if (r < resolutions.length) {
-          maxNumPrecincts = Math.max(maxNumPrecincts, resolutions[r].precinctParameters.numprecincts);
-        }
-      }
-
-      maxNumPrecinctsInLevel[r] = maxNumPrecincts;
-    }
-
-    l = 0;
-    r = 0;
-    c = 0;
-    p = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      for (; r <= maxDecompositionLevelsCount; r++) {
-        for (; p < maxNumPrecinctsInLevel[r]; p++) {
-          for (; c < componentsCount; c++) {
-            const component = tile.components[c];
-
-            if (r > component.codingStyleParameters.decompositionLevelsCount) {
-              continue;
-            }
-
-            var resolution = component.resolutions[r];
-            var numprecincts = resolution.precinctParameters.numprecincts;
-
-            if (p >= numprecincts) {
-              continue;
-            }
-
-            for (; l < layersCount;) {
-              var packet = createPacket(resolution, p, l);
-              l++;
-              return packet;
-            }
-
-            l = 0;
-          }
-
-          c = 0;
-        }
-
-        p = 0;
-      }
-
-      throw new JpxError("Out of packets");
-    };
-  }
-
-  function PositionComponentResolutionLayerIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var precinctsSizes = getPrecinctSizesInImageScale(tile);
-    var precinctsIterationSizes = precinctsSizes;
-    var l = 0,
-        r = 0,
-        c = 0,
-        px = 0,
-        py = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      for (; py < precinctsIterationSizes.maxNumHigh; py++) {
-        for (; px < precinctsIterationSizes.maxNumWide; px++) {
-          for (; c < componentsCount; c++) {
-            var component = tile.components[c];
-            var decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
-
-            for (; r <= decompositionLevelsCount; r++) {
-              var resolution = component.resolutions[r];
-              var sizeInImageScale = precinctsSizes.components[c].resolutions[r];
-              var k = getPrecinctIndexIfExist(px, py, sizeInImageScale, precinctsIterationSizes, resolution);
-
-              if (k === null) {
-                continue;
-              }
-
-              for (; l < layersCount;) {
-                var packet = createPacket(resolution, k, l);
-                l++;
-                return packet;
-              }
-
-              l = 0;
-            }
-
-            r = 0;
-          }
-
-          c = 0;
-        }
-
-        px = 0;
-      }
-
-      throw new JpxError("Out of packets");
-    };
-  }
-
-  function ComponentPositionResolutionLayerIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var precinctsSizes = getPrecinctSizesInImageScale(tile);
-    var l = 0,
-        r = 0,
-        c = 0,
-        px = 0,
-        py = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      for (; c < componentsCount; ++c) {
-        var component = tile.components[c];
-        var precinctsIterationSizes = precinctsSizes.components[c];
-        var decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
-
-        for (; py < precinctsIterationSizes.maxNumHigh; py++) {
-          for (; px < precinctsIterationSizes.maxNumWide; px++) {
-            for (; r <= decompositionLevelsCount; r++) {
-              var resolution = component.resolutions[r];
-              var sizeInImageScale = precinctsIterationSizes.resolutions[r];
-              var k = getPrecinctIndexIfExist(px, py, sizeInImageScale, precinctsIterationSizes, resolution);
-
-              if (k === null) {
-                continue;
-              }
-
-              for (; l < layersCount;) {
-                var packet = createPacket(resolution, k, l);
-                l++;
-                return packet;
-              }
-
-              l = 0;
-            }
-
-            r = 0;
-          }
-
-          px = 0;
-        }
-
-        py = 0;
-      }
-
-      throw new JpxError("Out of packets");
-    };
-  }
-
-  function getPrecinctIndexIfExist(pxIndex, pyIndex, sizeInImageScale, precinctIterationSizes, resolution) {
-    var posX = pxIndex * precinctIterationSizes.minWidth;
-    var posY = pyIndex * precinctIterationSizes.minHeight;
-
-    if (posX % sizeInImageScale.width !== 0 || posY % sizeInImageScale.height !== 0) {
-      return null;
-    }
-
-    var startPrecinctRowIndex = posY / sizeInImageScale.width * resolution.precinctParameters.numprecinctswide;
-    return posX / sizeInImageScale.height + startPrecinctRowIndex;
-  }
-
-  function getPrecinctSizesInImageScale(tile) {
-    var componentsCount = tile.components.length;
-    var minWidth = Number.MAX_VALUE;
-    var minHeight = Number.MAX_VALUE;
-    var maxNumWide = 0;
-    var maxNumHigh = 0;
-    var sizePerComponent = new Array(componentsCount);
-
-    for (var c = 0; c < componentsCount; c++) {
-      var component = tile.components[c];
-      var decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
-      var sizePerResolution = new Array(decompositionLevelsCount + 1);
-      var minWidthCurrentComponent = Number.MAX_VALUE;
-      var minHeightCurrentComponent = Number.MAX_VALUE;
-      var maxNumWideCurrentComponent = 0;
-      var maxNumHighCurrentComponent = 0;
-      var scale = 1;
-
-      for (var r = decompositionLevelsCount; r >= 0; --r) {
-        var resolution = component.resolutions[r];
-        var widthCurrentResolution = scale * resolution.precinctParameters.precinctWidth;
-        var heightCurrentResolution = scale * resolution.precinctParameters.precinctHeight;
-        minWidthCurrentComponent = Math.min(minWidthCurrentComponent, widthCurrentResolution);
-        minHeightCurrentComponent = Math.min(minHeightCurrentComponent, heightCurrentResolution);
-        maxNumWideCurrentComponent = Math.max(maxNumWideCurrentComponent, resolution.precinctParameters.numprecinctswide);
-        maxNumHighCurrentComponent = Math.max(maxNumHighCurrentComponent, resolution.precinctParameters.numprecinctshigh);
-        sizePerResolution[r] = {
-          width: widthCurrentResolution,
-          height: heightCurrentResolution
-        };
-        scale <<= 1;
-      }
-
-      minWidth = Math.min(minWidth, minWidthCurrentComponent);
-      minHeight = Math.min(minHeight, minHeightCurrentComponent);
-      maxNumWide = Math.max(maxNumWide, maxNumWideCurrentComponent);
-      maxNumHigh = Math.max(maxNumHigh, maxNumHighCurrentComponent);
-      sizePerComponent[c] = {
-        resolutions: sizePerResolution,
-        minWidth: minWidthCurrentComponent,
-        minHeight: minHeightCurrentComponent,
-        maxNumWide: maxNumWideCurrentComponent,
-        maxNumHigh: maxNumHighCurrentComponent
-      };
-    }
-
-    return {
-      components: sizePerComponent,
-      minWidth,
-      minHeight,
-      maxNumWide,
-      maxNumHigh
-    };
-  }
-
-  function buildPackets(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var componentsCount = siz.Csiz;
-
-    for (var c = 0; c < componentsCount; c++) {
-      var component = tile.components[c];
-      var decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
-      var resolutions = [];
-      var subbands = [];
-
-      for (var r = 0; r <= decompositionLevelsCount; r++) {
-        var blocksDimensions = getBlocksDimensions(context, component, r);
-        var resolution = {};
-        var scale = 1 << decompositionLevelsCount - r;
-        resolution.trx0 = Math.ceil(component.tcx0 / scale);
-        resolution.try0 = Math.ceil(component.tcy0 / scale);
-        resolution.trx1 = Math.ceil(component.tcx1 / scale);
-        resolution.try1 = Math.ceil(component.tcy1 / scale);
-        resolution.resLevel = r;
-        buildPrecincts(context, resolution, blocksDimensions);
-        resolutions.push(resolution);
-        var subband;
-
-        if (r === 0) {
-          subband = {};
-          subband.type = "LL";
-          subband.tbx0 = Math.ceil(component.tcx0 / scale);
-          subband.tby0 = Math.ceil(component.tcy0 / scale);
-          subband.tbx1 = Math.ceil(component.tcx1 / scale);
-          subband.tby1 = Math.ceil(component.tcy1 / scale);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolution.subbands = [subband];
-        } else {
-          var bscale = 1 << decompositionLevelsCount - r + 1;
-          var resolutionSubbands = [];
-          subband = {};
-          subband.type = "HL";
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-          subband = {};
-          subband.type = "LH";
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-          subband = {};
-          subband.type = "HH";
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-          resolution.subbands = resolutionSubbands;
-        }
-      }
-
-      component.resolutions = resolutions;
-      component.subbands = subbands;
-    }
-
-    var progressionOrder = tile.codingStyleDefaultParameters.progressionOrder;
-
-    switch (progressionOrder) {
-      case 0:
-        tile.packetsIterator = new LayerResolutionComponentPositionIterator(context);
-        break;
-
-      case 1:
-        tile.packetsIterator = new ResolutionLayerComponentPositionIterator(context);
-        break;
-
-      case 2:
-        tile.packetsIterator = new ResolutionPositionComponentLayerIterator(context);
-        break;
-
-      case 3:
-        tile.packetsIterator = new PositionComponentResolutionLayerIterator(context);
-        break;
-
-      case 4:
-        tile.packetsIterator = new ComponentPositionResolutionLayerIterator(context);
-        break;
-
-      default:
-        throw new JpxError(`Unsupported progression order ${progressionOrder}`);
-    }
-  }
-
-  function parseTilePackets(context, data, offset, dataLength) {
-    var position = 0;
-    var buffer,
-        bufferSize = 0,
-        skipNextBit = false;
-
-    function readBits(count) {
-      while (bufferSize < count) {
-        var b = data[offset + position];
-        position++;
-
-        if (skipNextBit) {
-          buffer = buffer << 7 | b;
-          bufferSize += 7;
-          skipNextBit = false;
-        } else {
-          buffer = buffer << 8 | b;
-          bufferSize += 8;
-        }
-
-        if (b === 0xff) {
-          skipNextBit = true;
-        }
-      }
-
-      bufferSize -= count;
-      return buffer >>> bufferSize & (1 << count) - 1;
-    }
-
-    function skipMarkerIfEqual(value) {
-      if (data[offset + position - 1] === 0xff && data[offset + position] === value) {
-        skipBytes(1);
-        return true;
-      } else if (data[offset + position] === 0xff && data[offset + position + 1] === value) {
-        skipBytes(2);
-        return true;
-      }
-
-      return false;
-    }
-
-    function skipBytes(count) {
-      position += count;
-    }
-
-    function alignToByte() {
-      bufferSize = 0;
-
-      if (skipNextBit) {
-        position++;
-        skipNextBit = false;
-      }
-    }
-
-    function readCodingpasses() {
-      if (readBits(1) === 0) {
-        return 1;
-      }
-
-      if (readBits(1) === 0) {
-        return 2;
-      }
-
-      var value = readBits(2);
-
-      if (value < 3) {
-        return value + 3;
-      }
-
-      value = readBits(5);
-
-      if (value < 31) {
-        return value + 6;
-      }
-
-      value = readBits(7);
-      return value + 37;
-    }
-
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var sopMarkerUsed = context.COD.sopMarkerUsed;
-    var ephMarkerUsed = context.COD.ephMarkerUsed;
-    var packetsIterator = tile.packetsIterator;
-
-    while (position < dataLength) {
-      alignToByte();
-
-      if (sopMarkerUsed && skipMarkerIfEqual(0x91)) {
-        skipBytes(4);
-      }
-
-      var packet = packetsIterator.nextPacket();
-
-      if (!readBits(1)) {
-        continue;
-      }
-
-      var layerNumber = packet.layerNumber;
-      var queue = [],
-          codeblock;
-
-      for (var i = 0, ii = packet.codeblocks.length; i < ii; i++) {
-        codeblock = packet.codeblocks[i];
-        var precinct = codeblock.precinct;
-        var codeblockColumn = codeblock.cbx - precinct.cbxMin;
-        var codeblockRow = codeblock.cby - precinct.cbyMin;
-        var codeblockIncluded = false;
-        var firstTimeInclusion = false;
-        var valueReady;
-
-        if (codeblock.included !== undefined) {
-          codeblockIncluded = !!readBits(1);
-        } else {
-          precinct = codeblock.precinct;
-          var inclusionTree, zeroBitPlanesTree;
-
-          if (precinct.inclusionTree !== undefined) {
-            inclusionTree = precinct.inclusionTree;
-          } else {
-            var width = precinct.cbxMax - precinct.cbxMin + 1;
-            var height = precinct.cbyMax - precinct.cbyMin + 1;
-            inclusionTree = new InclusionTree(width, height, layerNumber);
-            zeroBitPlanesTree = new TagTree(width, height);
-            precinct.inclusionTree = inclusionTree;
-            precinct.zeroBitPlanesTree = zeroBitPlanesTree;
-          }
-
-          if (inclusionTree.reset(codeblockColumn, codeblockRow, layerNumber)) {
-            while (true) {
-              if (readBits(1)) {
-                valueReady = !inclusionTree.nextLevel();
-
-                if (valueReady) {
-                  codeblock.included = true;
-                  codeblockIncluded = firstTimeInclusion = true;
-                  break;
-                }
-              } else {
-                inclusionTree.incrementValue(layerNumber);
-                break;
-              }
-            }
-          }
-        }
-
-        if (!codeblockIncluded) {
-          continue;
-        }
-
-        if (firstTimeInclusion) {
-          zeroBitPlanesTree = precinct.zeroBitPlanesTree;
-          zeroBitPlanesTree.reset(codeblockColumn, codeblockRow);
-
-          while (true) {
-            if (readBits(1)) {
-              valueReady = !zeroBitPlanesTree.nextLevel();
-
-              if (valueReady) {
-                break;
-              }
-            } else {
-              zeroBitPlanesTree.incrementValue();
-            }
-          }
-
-          codeblock.zeroBitPlanes = zeroBitPlanesTree.value;
-        }
-
-        var codingpasses = readCodingpasses();
-
-        while (readBits(1)) {
-          codeblock.Lblock++;
-        }
-
-        var codingpassesLog2 = (0, _core_utils.log2)(codingpasses);
-        var bits = (codingpasses < 1 << codingpassesLog2 ? codingpassesLog2 - 1 : codingpassesLog2) + codeblock.Lblock;
-        var codedDataLength = readBits(bits);
-        queue.push({
-          codeblock,
-          codingpasses,
-          dataLength: codedDataLength
-        });
-      }
-
-      alignToByte();
-
-      if (ephMarkerUsed) {
-        skipMarkerIfEqual(0x92);
-      }
-
-      while (queue.length > 0) {
-        var packetItem = queue.shift();
-        codeblock = packetItem.codeblock;
-
-        if (codeblock.data === undefined) {
-          codeblock.data = [];
-        }
-
-        codeblock.data.push({
-          data,
-          start: offset + position,
-          end: offset + position + packetItem.dataLength,
-          codingpasses: packetItem.codingpasses
-        });
-        position += packetItem.dataLength;
-      }
-    }
-
-    return position;
-  }
-
-  function copyCoefficients(coefficients, levelWidth, levelHeight, subband, delta, mb, reversible, segmentationSymbolUsed) {
-    var x0 = subband.tbx0;
-    var y0 = subband.tby0;
-    var width = subband.tbx1 - subband.tbx0;
-    var codeblocks = subband.codeblocks;
-    var right = subband.type.charAt(0) === "H" ? 1 : 0;
-    var bottom = subband.type.charAt(1) === "H" ? levelWidth : 0;
-
-    for (var i = 0, ii = codeblocks.length; i < ii; ++i) {
-      var codeblock = codeblocks[i];
-      var blockWidth = codeblock.tbx1_ - codeblock.tbx0_;
-      var blockHeight = codeblock.tby1_ - codeblock.tby0_;
-
-      if (blockWidth === 0 || blockHeight === 0) {
-        continue;
-      }
-
-      if (codeblock.data === undefined) {
-        continue;
-      }
-
-      var bitModel, currentCodingpassType;
-      bitModel = new BitModel(blockWidth, blockHeight, codeblock.subbandType, codeblock.zeroBitPlanes, mb);
-      currentCodingpassType = 2;
-      var data = codeblock.data,
-          totalLength = 0,
-          codingpasses = 0;
-      var j, jj, dataItem;
-
-      for (j = 0, jj = data.length; j < jj; j++) {
-        dataItem = data[j];
-        totalLength += dataItem.end - dataItem.start;
-        codingpasses += dataItem.codingpasses;
-      }
-
-      var encodedData = new Uint8Array(totalLength);
-      var position = 0;
-
-      for (j = 0, jj = data.length; j < jj; j++) {
-        dataItem = data[j];
-        var chunk = dataItem.data.subarray(dataItem.start, dataItem.end);
-        encodedData.set(chunk, position);
-        position += chunk.length;
-      }
-
-      var decoder = new _arithmetic_decoder.ArithmeticDecoder(encodedData, 0, totalLength);
-      bitModel.setDecoder(decoder);
-
-      for (j = 0; j < codingpasses; j++) {
-        switch (currentCodingpassType) {
-          case 0:
-            bitModel.runSignificancePropagationPass();
-            break;
-
-          case 1:
-            bitModel.runMagnitudeRefinementPass();
-            break;
-
-          case 2:
-            bitModel.runCleanupPass();
-
-            if (segmentationSymbolUsed) {
-              bitModel.checkSegmentationSymbol();
-            }
-
-            break;
-        }
-
-        currentCodingpassType = (currentCodingpassType + 1) % 3;
-      }
-
-      var offset = codeblock.tbx0_ - x0 + (codeblock.tby0_ - y0) * width;
-      var sign = bitModel.coefficentsSign;
-      var magnitude = bitModel.coefficentsMagnitude;
-      var bitsDecoded = bitModel.bitsDecoded;
-      var magnitudeCorrection = reversible ? 0 : 0.5;
-      var k, n, nb;
-      position = 0;
-      var interleave = subband.type !== "LL";
-
-      for (j = 0; j < blockHeight; j++) {
-        var row = offset / width | 0;
-        var levelOffset = 2 * row * (levelWidth - width) + right + bottom;
-
-        for (k = 0; k < blockWidth; k++) {
-          n = magnitude[position];
-
-          if (n !== 0) {
-            n = (n + magnitudeCorrection) * delta;
-
-            if (sign[position] !== 0) {
-              n = -n;
-            }
-
-            nb = bitsDecoded[position];
-            var pos = interleave ? levelOffset + (offset << 1) : offset;
-
-            if (reversible && nb >= mb) {
-              coefficients[pos] = n;
-            } else {
-              coefficients[pos] = n * (1 << mb - nb);
-            }
-          }
-
-          offset++;
-          position++;
-        }
-
-        offset += width - blockWidth;
-      }
-    }
-  }
-
-  function transformTile(context, tile, c) {
-    var component = tile.components[c];
-    var codingStyleParameters = component.codingStyleParameters;
-    var quantizationParameters = component.quantizationParameters;
-    var decompositionLevelsCount = codingStyleParameters.decompositionLevelsCount;
-    var spqcds = quantizationParameters.SPqcds;
-    var scalarExpounded = quantizationParameters.scalarExpounded;
-    var guardBits = quantizationParameters.guardBits;
-    var segmentationSymbolUsed = codingStyleParameters.segmentationSymbolUsed;
-    var precision = context.components[c].precision;
-    var reversible = codingStyleParameters.reversibleTransformation;
-    var transform = reversible ? new ReversibleTransform() : new IrreversibleTransform();
-    var subbandCoefficients = [];
-    var b = 0;
-
-    for (var i = 0; i <= decompositionLevelsCount; i++) {
-      var resolution = component.resolutions[i];
-      var width = resolution.trx1 - resolution.trx0;
-      var height = resolution.try1 - resolution.try0;
-      var coefficients = new Float32Array(width * height);
-
-      for (var j = 0, jj = resolution.subbands.length; j < jj; j++) {
-        var mu, epsilon;
-
-        if (!scalarExpounded) {
-          mu = spqcds[0].mu;
-          epsilon = spqcds[0].epsilon + (i > 0 ? 1 - i : 0);
-        } else {
-          mu = spqcds[b].mu;
-          epsilon = spqcds[b].epsilon;
-          b++;
-        }
-
-        var subband = resolution.subbands[j];
-        var gainLog2 = SubbandsGainLog2[subband.type];
-        var delta = reversible ? 1 : 2 ** (precision + gainLog2 - epsilon) * (1 + mu / 2048);
-        var mb = guardBits + epsilon - 1;
-        copyCoefficients(coefficients, width, height, subband, delta, mb, reversible, segmentationSymbolUsed);
-      }
-
-      subbandCoefficients.push({
-        width,
-        height,
-        items: coefficients
-      });
-    }
-
-    var result = transform.calculate(subbandCoefficients, component.tcx0, component.tcy0);
-    return {
-      left: component.tcx0,
-      top: component.tcy0,
-      width: result.width,
-      height: result.height,
-      items: result.items
-    };
-  }
-
-  function transformComponents(context) {
-    var siz = context.SIZ;
-    var components = context.components;
-    var componentsCount = siz.Csiz;
-    var resultImages = [];
-
-    for (var i = 0, ii = context.tiles.length; i < ii; i++) {
-      var tile = context.tiles[i];
-      var transformedTiles = [];
-      var c;
-
-      for (c = 0; c < componentsCount; c++) {
-        transformedTiles[c] = transformTile(context, tile, c);
-      }
-
-      var tile0 = transformedTiles[0];
-      var out = new Uint8ClampedArray(tile0.items.length * componentsCount);
-      var result = {
-        left: tile0.left,
-        top: tile0.top,
-        width: tile0.width,
-        height: tile0.height,
-        items: out
-      };
-      var shift, offset;
-      var pos = 0,
-          j,
-          jj,
-          y0,
-          y1,
-          y2;
-
-      if (tile.codingStyleDefaultParameters.multipleComponentTransform) {
-        var fourComponents = componentsCount === 4;
-        var y0items = transformedTiles[0].items;
-        var y1items = transformedTiles[1].items;
-        var y2items = transformedTiles[2].items;
-        var y3items = fourComponents ? transformedTiles[3].items : null;
-        shift = components[0].precision - 8;
-        offset = (128 << shift) + 0.5;
-        var component0 = tile.components[0];
-        var alpha01 = componentsCount - 3;
-        jj = y0items.length;
-
-        if (!component0.codingStyleParameters.reversibleTransformation) {
-          for (j = 0; j < jj; j++, pos += alpha01) {
-            y0 = y0items[j] + offset;
-            y1 = y1items[j];
-            y2 = y2items[j];
-            out[pos++] = y0 + 1.402 * y2 >> shift;
-            out[pos++] = y0 - 0.34413 * y1 - 0.71414 * y2 >> shift;
-            out[pos++] = y0 + 1.772 * y1 >> shift;
-          }
-        } else {
-          for (j = 0; j < jj; j++, pos += alpha01) {
-            y0 = y0items[j] + offset;
-            y1 = y1items[j];
-            y2 = y2items[j];
-            const g = y0 - (y2 + y1 >> 2);
-            out[pos++] = g + y2 >> shift;
-            out[pos++] = g >> shift;
-            out[pos++] = g + y1 >> shift;
-          }
-        }
-
-        if (fourComponents) {
-          for (j = 0, pos = 3; j < jj; j++, pos += 4) {
-            out[pos] = y3items[j] + offset >> shift;
-          }
-        }
-      } else {
-        for (c = 0; c < componentsCount; c++) {
-          var items = transformedTiles[c].items;
-          shift = components[c].precision - 8;
-          offset = (128 << shift) + 0.5;
-
-          for (pos = c, j = 0, jj = items.length; j < jj; j++) {
-            out[pos] = items[j] + offset >> shift;
-            pos += componentsCount;
-          }
-        }
-      }
-
-      resultImages.push(result);
-    }
-
-    return resultImages;
-  }
-
-  function initializeTile(context, tileIndex) {
-    var siz = context.SIZ;
-    var componentsCount = siz.Csiz;
-    var tile = context.tiles[tileIndex];
-
-    for (var c = 0; c < componentsCount; c++) {
-      var component = tile.components[c];
-      var qcdOrQcc = context.currentTile.QCC[c] !== undefined ? context.currentTile.QCC[c] : context.currentTile.QCD;
-      component.quantizationParameters = qcdOrQcc;
-      var codOrCoc = context.currentTile.COC[c] !== undefined ? context.currentTile.COC[c] : context.currentTile.COD;
-      component.codingStyleParameters = codOrCoc;
-    }
-
-    tile.codingStyleDefaultParameters = context.currentTile.COD;
-  }
-
-  var TagTree = function TagTreeClosure() {
-    function TagTree(width, height) {
-      var levelsLength = (0, _core_utils.log2)(Math.max(width, height)) + 1;
-      this.levels = [];
-
-      for (var i = 0; i < levelsLength; i++) {
-        var level = {
-          width,
-          height,
-          items: []
-        };
-        this.levels.push(level);
-        width = Math.ceil(width / 2);
-        height = Math.ceil(height / 2);
-      }
-    }
-
-    TagTree.prototype = {
-      reset: function TagTree_reset(i, j) {
-        var currentLevel = 0,
-            value = 0,
-            level;
-
-        while (currentLevel < this.levels.length) {
-          level = this.levels[currentLevel];
-          var index = i + j * level.width;
-
-          if (level.items[index] !== undefined) {
-            value = level.items[index];
-            break;
-          }
-
-          level.index = index;
-          i >>= 1;
-          j >>= 1;
-          currentLevel++;
-        }
-
-        currentLevel--;
-        level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        this.currentLevel = currentLevel;
-        delete this.value;
-      },
-      incrementValue: function TagTree_incrementValue() {
-        var level = this.levels[this.currentLevel];
-        level.items[level.index]++;
-      },
-      nextLevel: function TagTree_nextLevel() {
-        var currentLevel = this.currentLevel;
-        var level = this.levels[currentLevel];
-        var value = level.items[level.index];
-        currentLevel--;
-
-        if (currentLevel < 0) {
-          this.value = value;
-          return false;
-        }
-
-        this.currentLevel = currentLevel;
-        level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        return true;
-      }
-    };
-    return TagTree;
-  }();
-
-  var InclusionTree = function InclusionTreeClosure() {
-    function InclusionTree(width, height, defaultValue) {
-      var levelsLength = (0, _core_utils.log2)(Math.max(width, height)) + 1;
-      this.levels = [];
-
-      for (var i = 0; i < levelsLength; i++) {
-        var items = new Uint8Array(width * height);
-
-        for (var j = 0, jj = items.length; j < jj; j++) {
-          items[j] = defaultValue;
-        }
-
-        var level = {
-          width,
-          height,
-          items
-        };
-        this.levels.push(level);
-        width = Math.ceil(width / 2);
-        height = Math.ceil(height / 2);
-      }
-    }
-
-    InclusionTree.prototype = {
-      reset: function InclusionTree_reset(i, j, stopValue) {
-        var currentLevel = 0;
-
-        while (currentLevel < this.levels.length) {
-          var level = this.levels[currentLevel];
-          var index = i + j * level.width;
-          level.index = index;
-          var value = level.items[index];
-
-          if (value === 0xff) {
-            break;
-          }
-
-          if (value > stopValue) {
-            this.currentLevel = currentLevel;
-            this.propagateValues();
-            return false;
-          }
-
-          i >>= 1;
-          j >>= 1;
-          currentLevel++;
-        }
-
-        this.currentLevel = currentLevel - 1;
-        return true;
-      },
-      incrementValue: function InclusionTree_incrementValue(stopValue) {
-        var level = this.levels[this.currentLevel];
-        level.items[level.index] = stopValue + 1;
-        this.propagateValues();
-      },
-      propagateValues: function InclusionTree_propagateValues() {
-        var levelIndex = this.currentLevel;
-        var level = this.levels[levelIndex];
-        var currentValue = level.items[level.index];
-
-        while (--levelIndex >= 0) {
-          level = this.levels[levelIndex];
-          level.items[level.index] = currentValue;
-        }
-      },
-      nextLevel: function InclusionTree_nextLevel() {
-        var currentLevel = this.currentLevel;
-        var level = this.levels[currentLevel];
-        var value = level.items[level.index];
-        level.items[level.index] = 0xff;
-        currentLevel--;
-
-        if (currentLevel < 0) {
-          return false;
-        }
-
-        this.currentLevel = currentLevel;
-        level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        return true;
-      }
-    };
-    return InclusionTree;
-  }();
-
-  var BitModel = function BitModelClosure() {
-    var UNIFORM_CONTEXT = 17;
-    var RUNLENGTH_CONTEXT = 18;
-    var LLAndLHContextsLabel = new Uint8Array([0, 5, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 1, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8]);
-    var HLContextLabel = new Uint8Array([0, 3, 4, 0, 5, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 1, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8]);
-    var HHContextLabel = new Uint8Array([0, 1, 2, 0, 1, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 3, 4, 5, 0, 4, 5, 5, 0, 5, 5, 5, 0, 0, 0, 0, 0, 6, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8]);
-
-    function BitModel(width, height, subband, zeroBitPlanes, mb) {
-      this.width = width;
-      this.height = height;
-      let contextLabelTable;
-
-      if (subband === "HH") {
-        contextLabelTable = HHContextLabel;
-      } else if (subband === "HL") {
-        contextLabelTable = HLContextLabel;
-      } else {
-        contextLabelTable = LLAndLHContextsLabel;
-      }
-
-      this.contextLabelTable = contextLabelTable;
-      var coefficientCount = width * height;
-      this.neighborsSignificance = new Uint8Array(coefficientCount);
-      this.coefficentsSign = new Uint8Array(coefficientCount);
-      let coefficentsMagnitude;
-
-      if (mb > 14) {
-        coefficentsMagnitude = new Uint32Array(coefficientCount);
-      } else if (mb > 6) {
-        coefficentsMagnitude = new Uint16Array(coefficientCount);
-      } else {
-        coefficentsMagnitude = new Uint8Array(coefficientCount);
-      }
-
-      this.coefficentsMagnitude = coefficentsMagnitude;
-      this.processingFlags = new Uint8Array(coefficientCount);
-      var bitsDecoded = new Uint8Array(coefficientCount);
-
-      if (zeroBitPlanes !== 0) {
-        for (var i = 0; i < coefficientCount; i++) {
-          bitsDecoded[i] = zeroBitPlanes;
-        }
-      }
-
-      this.bitsDecoded = bitsDecoded;
-      this.reset();
-    }
-
-    BitModel.prototype = {
-      setDecoder: function BitModel_setDecoder(decoder) {
-        this.decoder = decoder;
-      },
-      reset: function BitModel_reset() {
-        this.contexts = new Int8Array(19);
-        this.contexts[0] = 4 << 1 | 0;
-        this.contexts[UNIFORM_CONTEXT] = 46 << 1 | 0;
-        this.contexts[RUNLENGTH_CONTEXT] = 3 << 1 | 0;
-      },
-      setNeighborsSignificance: function BitModel_setNeighborsSignificance(row, column, index) {
-        var neighborsSignificance = this.neighborsSignificance;
-        var width = this.width,
-            height = this.height;
-        var left = column > 0;
-        var right = column + 1 < width;
-        var i;
-
-        if (row > 0) {
-          i = index - width;
-
-          if (left) {
-            neighborsSignificance[i - 1] += 0x10;
-          }
-
-          if (right) {
-            neighborsSignificance[i + 1] += 0x10;
-          }
-
-          neighborsSignificance[i] += 0x04;
-        }
-
-        if (row + 1 < height) {
-          i = index + width;
-
-          if (left) {
-            neighborsSignificance[i - 1] += 0x10;
-          }
-
-          if (right) {
-            neighborsSignificance[i + 1] += 0x10;
-          }
-
-          neighborsSignificance[i] += 0x04;
-        }
-
-        if (left) {
-          neighborsSignificance[index - 1] += 0x01;
-        }
-
-        if (right) {
-          neighborsSignificance[index + 1] += 0x01;
-        }
-
-        neighborsSignificance[index] |= 0x80;
-      },
-      runSignificancePropagationPass: function BitModel_runSignificancePropagationPass() {
-        var decoder = this.decoder;
-        var width = this.width,
-            height = this.height;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var neighborsSignificance = this.neighborsSignificance;
-        var processingFlags = this.processingFlags;
-        var contexts = this.contexts;
-        var labels = this.contextLabelTable;
-        var bitsDecoded = this.bitsDecoded;
-        var processedInverseMask = ~1;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            var index = i0 * width + j;
-
-            for (var i1 = 0; i1 < 4; i1++, index += width) {
-              var i = i0 + i1;
-
-              if (i >= height) {
-                break;
-              }
-
-              processingFlags[index] &= processedInverseMask;
-
-              if (coefficentsMagnitude[index] || !neighborsSignificance[index]) {
-                continue;
-              }
-
-              var contextLabel = labels[neighborsSignificance[index]];
-              var decision = decoder.readBit(contexts, contextLabel);
-
-              if (decision) {
-                var sign = this.decodeSignBit(i, j, index);
-                coefficentsSign[index] = sign;
-                coefficentsMagnitude[index] = 1;
-                this.setNeighborsSignificance(i, j, index);
-                processingFlags[index] |= firstMagnitudeBitMask;
-              }
-
-              bitsDecoded[index]++;
-              processingFlags[index] |= processedMask;
-            }
-          }
-        }
-      },
-      decodeSignBit: function BitModel_decodeSignBit(row, column, index) {
-        var width = this.width,
-            height = this.height;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var contribution, sign0, sign1, significance1;
-        var contextLabel, decoded;
-        significance1 = column > 0 && coefficentsMagnitude[index - 1] !== 0;
-
-        if (column + 1 < width && coefficentsMagnitude[index + 1] !== 0) {
-          sign1 = coefficentsSign[index + 1];
-
-          if (significance1) {
-            sign0 = coefficentsSign[index - 1];
-            contribution = 1 - sign1 - sign0;
-          } else {
-            contribution = 1 - sign1 - sign1;
-          }
-        } else if (significance1) {
-          sign0 = coefficentsSign[index - 1];
-          contribution = 1 - sign0 - sign0;
-        } else {
-          contribution = 0;
-        }
-
-        var horizontalContribution = 3 * contribution;
-        significance1 = row > 0 && coefficentsMagnitude[index - width] !== 0;
-
-        if (row + 1 < height && coefficentsMagnitude[index + width] !== 0) {
-          sign1 = coefficentsSign[index + width];
-
-          if (significance1) {
-            sign0 = coefficentsSign[index - width];
-            contribution = 1 - sign1 - sign0 + horizontalContribution;
-          } else {
-            contribution = 1 - sign1 - sign1 + horizontalContribution;
-          }
-        } else if (significance1) {
-          sign0 = coefficentsSign[index - width];
-          contribution = 1 - sign0 - sign0 + horizontalContribution;
-        } else {
-          contribution = horizontalContribution;
-        }
-
-        if (contribution >= 0) {
-          contextLabel = 9 + contribution;
-          decoded = this.decoder.readBit(this.contexts, contextLabel);
-        } else {
-          contextLabel = 9 - contribution;
-          decoded = this.decoder.readBit(this.contexts, contextLabel) ^ 1;
-        }
-
-        return decoded;
-      },
-      runMagnitudeRefinementPass: function BitModel_runMagnitudeRefinementPass() {
-        var decoder = this.decoder;
-        var width = this.width,
-            height = this.height;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var neighborsSignificance = this.neighborsSignificance;
-        var contexts = this.contexts;
-        var bitsDecoded = this.bitsDecoded;
-        var processingFlags = this.processingFlags;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        var length = width * height;
-        var width4 = width * 4;
-
-        for (var index0 = 0, indexNext; index0 < length; index0 = indexNext) {
-          indexNext = Math.min(length, index0 + width4);
-
-          for (var j = 0; j < width; j++) {
-            for (var index = index0 + j; index < indexNext; index += width) {
-              if (!coefficentsMagnitude[index] || (processingFlags[index] & processedMask) !== 0) {
-                continue;
-              }
-
-              var contextLabel = 16;
-
-              if ((processingFlags[index] & firstMagnitudeBitMask) !== 0) {
-                processingFlags[index] ^= firstMagnitudeBitMask;
-                var significance = neighborsSignificance[index] & 127;
-                contextLabel = significance === 0 ? 15 : 14;
-              }
-
-              var bit = decoder.readBit(contexts, contextLabel);
-              coefficentsMagnitude[index] = coefficentsMagnitude[index] << 1 | bit;
-              bitsDecoded[index]++;
-              processingFlags[index] |= processedMask;
-            }
-          }
-        }
-      },
-      runCleanupPass: function BitModel_runCleanupPass() {
-        var decoder = this.decoder;
-        var width = this.width,
-            height = this.height;
-        var neighborsSignificance = this.neighborsSignificance;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var contexts = this.contexts;
-        var labels = this.contextLabelTable;
-        var bitsDecoded = this.bitsDecoded;
-        var processingFlags = this.processingFlags;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        var oneRowDown = width;
-        var twoRowsDown = width * 2;
-        var threeRowsDown = width * 3;
-        var iNext;
-
-        for (var i0 = 0; i0 < height; i0 = iNext) {
-          iNext = Math.min(i0 + 4, height);
-          var indexBase = i0 * width;
-          var checkAllEmpty = i0 + 3 < height;
-
-          for (var j = 0; j < width; j++) {
-            var index0 = indexBase + j;
-            var allEmpty = checkAllEmpty && processingFlags[index0] === 0 && processingFlags[index0 + oneRowDown] === 0 && processingFlags[index0 + twoRowsDown] === 0 && processingFlags[index0 + threeRowsDown] === 0 && neighborsSignificance[index0] === 0 && neighborsSignificance[index0 + oneRowDown] === 0 && neighborsSignificance[index0 + twoRowsDown] === 0 && neighborsSignificance[index0 + threeRowsDown] === 0;
-            var i1 = 0,
-                index = index0;
-            var i = i0,
-                sign;
-
-            if (allEmpty) {
-              var hasSignificantCoefficent = decoder.readBit(contexts, RUNLENGTH_CONTEXT);
-
-              if (!hasSignificantCoefficent) {
-                bitsDecoded[index0]++;
-                bitsDecoded[index0 + oneRowDown]++;
-                bitsDecoded[index0 + twoRowsDown]++;
-                bitsDecoded[index0 + threeRowsDown]++;
-                continue;
-              }
-
-              i1 = decoder.readBit(contexts, UNIFORM_CONTEXT) << 1 | decoder.readBit(contexts, UNIFORM_CONTEXT);
-
-              if (i1 !== 0) {
-                i = i0 + i1;
-                index += i1 * width;
-              }
-
-              sign = this.decodeSignBit(i, j, index);
-              coefficentsSign[index] = sign;
-              coefficentsMagnitude[index] = 1;
-              this.setNeighborsSignificance(i, j, index);
-              processingFlags[index] |= firstMagnitudeBitMask;
-              index = index0;
-
-              for (var i2 = i0; i2 <= i; i2++, index += width) {
-                bitsDecoded[index]++;
-              }
-
-              i1++;
-            }
-
-            for (i = i0 + i1; i < iNext; i++, index += width) {
-              if (coefficentsMagnitude[index] || (processingFlags[index] & processedMask) !== 0) {
-                continue;
-              }
-
-              var contextLabel = labels[neighborsSignificance[index]];
-              var decision = decoder.readBit(contexts, contextLabel);
-
-              if (decision === 1) {
-                sign = this.decodeSignBit(i, j, index);
-                coefficentsSign[index] = sign;
-                coefficentsMagnitude[index] = 1;
-                this.setNeighborsSignificance(i, j, index);
-                processingFlags[index] |= firstMagnitudeBitMask;
-              }
-
-              bitsDecoded[index]++;
-            }
-          }
-        }
-      },
-      checkSegmentationSymbol: function BitModel_checkSegmentationSymbol() {
-        var decoder = this.decoder;
-        var contexts = this.contexts;
-        var symbol = decoder.readBit(contexts, UNIFORM_CONTEXT) << 3 | decoder.readBit(contexts, UNIFORM_CONTEXT) << 2 | decoder.readBit(contexts, UNIFORM_CONTEXT) << 1 | decoder.readBit(contexts, UNIFORM_CONTEXT);
-
-        if (symbol !== 0xa) {
-          throw new JpxError("Invalid segmentation symbol");
-        }
-      }
-    };
-    return BitModel;
-  }();
-
-  var Transform = function TransformClosure() {
-    function Transform() {}
-
-    Transform.prototype.calculate = function transformCalculate(subbands, u0, v0) {
-      var ll = subbands[0];
-
-      for (var i = 1, ii = subbands.length; i < ii; i++) {
-        ll = this.iterate(ll, subbands[i], u0, v0);
-      }
-
-      return ll;
-    };
-
-    Transform.prototype.extend = function extend(buffer, offset, size) {
-      var i1 = offset - 1,
-          j1 = offset + 1;
-      var i2 = offset + size - 2,
-          j2 = offset + size;
-      buffer[i1--] = buffer[j1++];
-      buffer[j2++] = buffer[i2--];
-      buffer[i1--] = buffer[j1++];
-      buffer[j2++] = buffer[i2--];
-      buffer[i1--] = buffer[j1++];
-      buffer[j2++] = buffer[i2--];
-      buffer[i1] = buffer[j1];
-      buffer[j2] = buffer[i2];
-    };
-
-    Transform.prototype.iterate = function Transform_iterate(ll, hl_lh_hh, u0, v0) {
-      var llWidth = ll.width,
-          llHeight = ll.height,
-          llItems = ll.items;
-      var width = hl_lh_hh.width;
-      var height = hl_lh_hh.height;
-      var items = hl_lh_hh.items;
-      var i, j, k, l, u, v;
-
-      for (k = 0, i = 0; i < llHeight; i++) {
-        l = i * 2 * width;
-
-        for (j = 0; j < llWidth; j++, k++, l += 2) {
-          items[l] = llItems[k];
-        }
-      }
-
-      llItems = ll.items = null;
-      var bufferPadding = 4;
-      var rowBuffer = new Float32Array(width + 2 * bufferPadding);
-
-      if (width === 1) {
-        if ((u0 & 1) !== 0) {
-          for (v = 0, k = 0; v < height; v++, k += width) {
-            items[k] *= 0.5;
-          }
-        }
-      } else {
-        for (v = 0, k = 0; v < height; v++, k += width) {
-          rowBuffer.set(items.subarray(k, k + width), bufferPadding);
-          this.extend(rowBuffer, bufferPadding, width);
-          this.filter(rowBuffer, bufferPadding, width);
-          items.set(rowBuffer.subarray(bufferPadding, bufferPadding + width), k);
-        }
-      }
-
-      var numBuffers = 16;
-      var colBuffers = [];
-
-      for (i = 0; i < numBuffers; i++) {
-        colBuffers.push(new Float32Array(height + 2 * bufferPadding));
-      }
-
-      var b,
-          currentBuffer = 0;
-      ll = bufferPadding + height;
-
-      if (height === 1) {
-        if ((v0 & 1) !== 0) {
-          for (u = 0; u < width; u++) {
-            items[u] *= 0.5;
-          }
-        }
-      } else {
-        for (u = 0; u < width; u++) {
-          if (currentBuffer === 0) {
-            numBuffers = Math.min(width - u, numBuffers);
-
-            for (k = u, l = bufferPadding; l < ll; k += width, l++) {
-              for (b = 0; b < numBuffers; b++) {
-                colBuffers[b][l] = items[k + b];
-              }
-            }
-
-            currentBuffer = numBuffers;
-          }
-
-          currentBuffer--;
-          var buffer = colBuffers[currentBuffer];
-          this.extend(buffer, bufferPadding, height);
-          this.filter(buffer, bufferPadding, height);
-
-          if (currentBuffer === 0) {
-            k = u - numBuffers + 1;
-
-            for (l = bufferPadding; l < ll; k += width, l++) {
-              for (b = 0; b < numBuffers; b++) {
-                items[k + b] = colBuffers[b][l];
-              }
-            }
-          }
-        }
-      }
-
-      return {
-        width,
-        height,
-        items
-      };
-    };
-
-    return Transform;
-  }();
-
-  var IrreversibleTransform = function IrreversibleTransformClosure() {
-    function IrreversibleTransform() {
-      Transform.call(this);
-    }
-
-    IrreversibleTransform.prototype = Object.create(Transform.prototype);
-
-    IrreversibleTransform.prototype.filter = function irreversibleTransformFilter(x, offset, length) {
-      var len = length >> 1;
-      offset = offset | 0;
-      var j, n, current, next;
-      var alpha = -1.586134342059924;
-      var beta = -0.052980118572961;
-      var gamma = 0.882911075530934;
-      var delta = 0.443506852043971;
-      var K = 1.230174104914001;
-      var K_ = 1 / K;
-      j = offset - 3;
-
-      for (n = len + 4; n--; j += 2) {
-        x[j] *= K_;
-      }
-
-      j = offset - 2;
-      current = delta * x[j - 1];
-
-      for (n = len + 3; n--; j += 2) {
-        next = delta * x[j + 1];
-        x[j] = K * x[j] - current - next;
-
-        if (n--) {
-          j += 2;
-          current = delta * x[j + 1];
-          x[j] = K * x[j] - current - next;
-        } else {
-          break;
-        }
-      }
-
-      j = offset - 1;
-      current = gamma * x[j - 1];
-
-      for (n = len + 2; n--; j += 2) {
-        next = gamma * x[j + 1];
-        x[j] -= current + next;
-
-        if (n--) {
-          j += 2;
-          current = gamma * x[j + 1];
-          x[j] -= current + next;
-        } else {
-          break;
-        }
-      }
-
-      j = offset;
-      current = beta * x[j - 1];
-
-      for (n = len + 1; n--; j += 2) {
-        next = beta * x[j + 1];
-        x[j] -= current + next;
-
-        if (n--) {
-          j += 2;
-          current = beta * x[j + 1];
-          x[j] -= current + next;
-        } else {
-          break;
-        }
-      }
-
-      if (len !== 0) {
-        j = offset + 1;
-        current = alpha * x[j - 1];
-
-        for (n = len; n--; j += 2) {
-          next = alpha * x[j + 1];
-          x[j] -= current + next;
-
-          if (n--) {
-            j += 2;
-            current = alpha * x[j + 1];
-            x[j] -= current + next;
-          } else {
-            break;
-          }
-        }
-      }
-    };
-
-    return IrreversibleTransform;
-  }();
-
-  var ReversibleTransform = function ReversibleTransformClosure() {
-    function ReversibleTransform() {
-      Transform.call(this);
-    }
-
-    ReversibleTransform.prototype = Object.create(Transform.prototype);
-
-    ReversibleTransform.prototype.filter = function reversibleTransformFilter(x, offset, length) {
-      var len = length >> 1;
-      offset = offset | 0;
-      var j, n;
-
-      for (j = offset, n = len + 1; n--; j += 2) {
-        x[j] -= x[j - 1] + x[j + 1] + 2 >> 2;
-      }
-
-      for (j = offset + 1, n = len; n--; j += 2) {
-        x[j] += x[j - 1] + x[j + 1] >> 1;
-      }
-    };
-
-    return ReversibleTransform;
-  }();
-
-  return JpxImage;
-}();
-
-exports.JpxImage = JpxImage;
-
-/***/ }),
-/* 22 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.calculateSHA512 = exports.calculateSHA384 = exports.calculateSHA256 = exports.calculateMD5 = exports.PDF20 = exports.PDF17 = exports.CipherTransformFactory = exports.ARCFourCipher = exports.AES256Cipher = exports.AES128Cipher = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _stream = __w_pdfjs_require__(12);
-
-var ARCFourCipher = function ARCFourCipherClosure() {
-  function ARCFourCipher(key) {
-    this.a = 0;
-    this.b = 0;
-    var s = new Uint8Array(256);
-    var i,
-        j = 0,
-        tmp,
-        keyLength = key.length;
-
-    for (i = 0; i < 256; ++i) {
-      s[i] = i;
-    }
-
-    for (i = 0; i < 256; ++i) {
-      tmp = s[i];
-      j = j + tmp + key[i % keyLength] & 0xff;
-      s[i] = s[j];
-      s[j] = tmp;
-    }
-
-    this.s = s;
-  }
-
-  ARCFourCipher.prototype = {
-    encryptBlock: function ARCFourCipher_encryptBlock(data) {
-      var i,
-          n = data.length,
-          tmp,
-          tmp2;
-      var a = this.a,
-          b = this.b,
-          s = this.s;
-      var output = new Uint8Array(n);
-
-      for (i = 0; i < n; ++i) {
-        a = a + 1 & 0xff;
-        tmp = s[a];
-        b = b + tmp & 0xff;
-        tmp2 = s[b];
-        s[a] = tmp2;
-        s[b] = tmp;
-        output[i] = data[i] ^ s[tmp + tmp2 & 0xff];
-      }
-
-      this.a = a;
-      this.b = b;
-      return output;
-    }
-  };
-  ARCFourCipher.prototype.decryptBlock = ARCFourCipher.prototype.encryptBlock;
-  ARCFourCipher.prototype.encrypt = ARCFourCipher.prototype.encryptBlock;
-  return ARCFourCipher;
-}();
-
-exports.ARCFourCipher = ARCFourCipher;
-
-var calculateMD5 = function calculateMD5Closure() {
-  var r = new Uint8Array([7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
-  var k = new Int32Array([-680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426, -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162, 1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632, 643717713, -373897302, -701558691, 38016083, -660478335, -405537848, 568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784, 1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556, -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222, -722521979, 76029189, -640364487, -421815835, 530742520, -995338651, -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606, -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649, -145523070, -1120210379, 718787259, -343485551]);
-
-  function hash(data, offset, length) {
-    var h0 = 1732584193,
-        h1 = -271733879,
-        h2 = -1732584194,
-        h3 = 271733878;
-    var paddedLength = length + 72 & ~63;
-    var padded = new Uint8Array(paddedLength);
-    var i, j, n;
-
-    for (i = 0; i < length; ++i) {
-      padded[i] = data[offset++];
-    }
-
-    padded[i++] = 0x80;
-    n = paddedLength - 8;
-
-    while (i < n) {
-      padded[i++] = 0;
-    }
-
-    padded[i++] = length << 3 & 0xff;
-    padded[i++] = length >> 5 & 0xff;
-    padded[i++] = length >> 13 & 0xff;
-    padded[i++] = length >> 21 & 0xff;
-    padded[i++] = length >>> 29 & 0xff;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    var w = new Int32Array(16);
-
-    for (i = 0; i < paddedLength;) {
-      for (j = 0; j < 16; ++j, i += 4) {
-        w[j] = padded[i] | padded[i + 1] << 8 | padded[i + 2] << 16 | padded[i + 3] << 24;
-      }
-
-      var a = h0,
-          b = h1,
-          c = h2,
-          d = h3,
-          f,
-          g;
-
-      for (j = 0; j < 64; ++j) {
-        if (j < 16) {
-          f = b & c | ~b & d;
-          g = j;
-        } else if (j < 32) {
-          f = d & b | ~d & c;
-          g = 5 * j + 1 & 15;
-        } else if (j < 48) {
-          f = b ^ c ^ d;
-          g = 3 * j + 5 & 15;
-        } else {
-          f = c ^ (b | ~d);
-          g = 7 * j & 15;
-        }
-
-        var tmp = d,
-            rotateArg = a + f + k[j] + w[g] | 0,
-            rotate = r[j];
-        d = c;
-        c = b;
-        b = b + (rotateArg << rotate | rotateArg >>> 32 - rotate) | 0;
-        a = tmp;
-      }
-
-      h0 = h0 + a | 0;
-      h1 = h1 + b | 0;
-      h2 = h2 + c | 0;
-      h3 = h3 + d | 0;
-    }
-
-    return new Uint8Array([h0 & 0xFF, h0 >> 8 & 0xFF, h0 >> 16 & 0xFF, h0 >>> 24 & 0xFF, h1 & 0xFF, h1 >> 8 & 0xFF, h1 >> 16 & 0xFF, h1 >>> 24 & 0xFF, h2 & 0xFF, h2 >> 8 & 0xFF, h2 >> 16 & 0xFF, h2 >>> 24 & 0xFF, h3 & 0xFF, h3 >> 8 & 0xFF, h3 >> 16 & 0xFF, h3 >>> 24 & 0xFF]);
-  }
-
-  return hash;
-}();
-
-exports.calculateMD5 = calculateMD5;
-
-var Word64 = function Word64Closure() {
-  function Word64(highInteger, lowInteger) {
-    this.high = highInteger | 0;
-    this.low = lowInteger | 0;
-  }
-
-  Word64.prototype = {
-    and: function Word64_and(word) {
-      this.high &= word.high;
-      this.low &= word.low;
-    },
-    xor: function Word64_xor(word) {
-      this.high ^= word.high;
-      this.low ^= word.low;
-    },
-    or: function Word64_or(word) {
-      this.high |= word.high;
-      this.low |= word.low;
-    },
-    shiftRight: function Word64_shiftRight(places) {
-      if (places >= 32) {
-        this.low = this.high >>> places - 32 | 0;
-        this.high = 0;
-      } else {
-        this.low = this.low >>> places | this.high << 32 - places;
-        this.high = this.high >>> places | 0;
-      }
-    },
-    shiftLeft: function Word64_shiftLeft(places) {
-      if (places >= 32) {
-        this.high = this.low << places - 32;
-        this.low = 0;
-      } else {
-        this.high = this.high << places | this.low >>> 32 - places;
-        this.low = this.low << places;
-      }
-    },
-    rotateRight: function Word64_rotateRight(places) {
-      var low, high;
-
-      if (places & 32) {
-        high = this.low;
-        low = this.high;
-      } else {
-        low = this.low;
-        high = this.high;
-      }
-
-      places &= 31;
-      this.low = low >>> places | high << 32 - places;
-      this.high = high >>> places | low << 32 - places;
-    },
-    not: function Word64_not() {
-      this.high = ~this.high;
-      this.low = ~this.low;
-    },
-    add: function Word64_add(word) {
-      var lowAdd = (this.low >>> 0) + (word.low >>> 0);
-      var highAdd = (this.high >>> 0) + (word.high >>> 0);
-
-      if (lowAdd > 0xffffffff) {
-        highAdd += 1;
-      }
-
-      this.low = lowAdd | 0;
-      this.high = highAdd | 0;
-    },
-    copyTo: function Word64_copyTo(bytes, offset) {
-      bytes[offset] = this.high >>> 24 & 0xff;
-      bytes[offset + 1] = this.high >> 16 & 0xff;
-      bytes[offset + 2] = this.high >> 8 & 0xff;
-      bytes[offset + 3] = this.high & 0xff;
-      bytes[offset + 4] = this.low >>> 24 & 0xff;
-      bytes[offset + 5] = this.low >> 16 & 0xff;
-      bytes[offset + 6] = this.low >> 8 & 0xff;
-      bytes[offset + 7] = this.low & 0xff;
-    },
-    assign: function Word64_assign(word) {
-      this.high = word.high;
-      this.low = word.low;
-    }
-  };
-  return Word64;
-}();
-
-var calculateSHA256 = function calculateSHA256Closure() {
-  function rotr(x, n) {
-    return x >>> n | x << 32 - n;
-  }
-
-  function ch(x, y, z) {
-    return x & y ^ ~x & z;
-  }
-
-  function maj(x, y, z) {
-    return x & y ^ x & z ^ y & z;
-  }
-
-  function sigma(x) {
-    return rotr(x, 2) ^ rotr(x, 13) ^ rotr(x, 22);
-  }
-
-  function sigmaPrime(x) {
-    return rotr(x, 6) ^ rotr(x, 11) ^ rotr(x, 25);
-  }
-
-  function littleSigma(x) {
-    return rotr(x, 7) ^ rotr(x, 18) ^ x >>> 3;
-  }
-
-  function littleSigmaPrime(x) {
-    return rotr(x, 17) ^ rotr(x, 19) ^ x >>> 10;
-  }
-
-  var k = [0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2];
-
-  function hash(data, offset, length) {
-    var h0 = 0x6a09e667,
-        h1 = 0xbb67ae85,
-        h2 = 0x3c6ef372,
-        h3 = 0xa54ff53a,
-        h4 = 0x510e527f,
-        h5 = 0x9b05688c,
-        h6 = 0x1f83d9ab,
-        h7 = 0x5be0cd19;
-    var paddedLength = Math.ceil((length + 9) / 64) * 64;
-    var padded = new Uint8Array(paddedLength);
-    var i, j, n;
-
-    for (i = 0; i < length; ++i) {
-      padded[i] = data[offset++];
-    }
-
-    padded[i++] = 0x80;
-    n = paddedLength - 8;
-
-    while (i < n) {
-      padded[i++] = 0;
-    }
-
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = length >>> 29 & 0xff;
-    padded[i++] = length >> 21 & 0xff;
-    padded[i++] = length >> 13 & 0xff;
-    padded[i++] = length >> 5 & 0xff;
-    padded[i++] = length << 3 & 0xff;
-    var w = new Uint32Array(64);
-
-    for (i = 0; i < paddedLength;) {
-      for (j = 0; j < 16; ++j) {
-        w[j] = padded[i] << 24 | padded[i + 1] << 16 | padded[i + 2] << 8 | padded[i + 3];
-        i += 4;
-      }
-
-      for (j = 16; j < 64; ++j) {
-        w[j] = littleSigmaPrime(w[j - 2]) + w[j - 7] + littleSigma(w[j - 15]) + w[j - 16] | 0;
-      }
-
-      var a = h0,
-          b = h1,
-          c = h2,
-          d = h3,
-          e = h4,
-          f = h5,
-          g = h6,
-          h = h7,
-          t1,
-          t2;
-
-      for (j = 0; j < 64; ++j) {
-        t1 = h + sigmaPrime(e) + ch(e, f, g) + k[j] + w[j];
-        t2 = sigma(a) + maj(a, b, c);
-        h = g;
-        g = f;
-        f = e;
-        e = d + t1 | 0;
-        d = c;
-        c = b;
-        b = a;
-        a = t1 + t2 | 0;
-      }
-
-      h0 = h0 + a | 0;
-      h1 = h1 + b | 0;
-      h2 = h2 + c | 0;
-      h3 = h3 + d | 0;
-      h4 = h4 + e | 0;
-      h5 = h5 + f | 0;
-      h6 = h6 + g | 0;
-      h7 = h7 + h | 0;
-    }
-
-    return new Uint8Array([h0 >> 24 & 0xFF, h0 >> 16 & 0xFF, h0 >> 8 & 0xFF, h0 & 0xFF, h1 >> 24 & 0xFF, h1 >> 16 & 0xFF, h1 >> 8 & 0xFF, h1 & 0xFF, h2 >> 24 & 0xFF, h2 >> 16 & 0xFF, h2 >> 8 & 0xFF, h2 & 0xFF, h3 >> 24 & 0xFF, h3 >> 16 & 0xFF, h3 >> 8 & 0xFF, h3 & 0xFF, h4 >> 24 & 0xFF, h4 >> 16 & 0xFF, h4 >> 8 & 0xFF, h4 & 0xFF, h5 >> 24 & 0xFF, h5 >> 16 & 0xFF, h5 >> 8 & 0xFF, h5 & 0xFF, h6 >> 24 & 0xFF, h6 >> 16 & 0xFF, h6 >> 8 & 0xFF, h6 & 0xFF, h7 >> 24 & 0xFF, h7 >> 16 & 0xFF, h7 >> 8 & 0xFF, h7 & 0xFF]);
-  }
-
-  return hash;
-}();
-
-exports.calculateSHA256 = calculateSHA256;
-
-var calculateSHA512 = function calculateSHA512Closure() {
-  function ch(result, x, y, z, tmp) {
-    result.assign(x);
-    result.and(y);
-    tmp.assign(x);
-    tmp.not();
-    tmp.and(z);
-    result.xor(tmp);
-  }
-
-  function maj(result, x, y, z, tmp) {
-    result.assign(x);
-    result.and(y);
-    tmp.assign(x);
-    tmp.and(z);
-    result.xor(tmp);
-    tmp.assign(y);
-    tmp.and(z);
-    result.xor(tmp);
-  }
-
-  function sigma(result, x, tmp) {
-    result.assign(x);
-    result.rotateRight(28);
-    tmp.assign(x);
-    tmp.rotateRight(34);
-    result.xor(tmp);
-    tmp.assign(x);
-    tmp.rotateRight(39);
-    result.xor(tmp);
-  }
-
-  function sigmaPrime(result, x, tmp) {
-    result.assign(x);
-    result.rotateRight(14);
-    tmp.assign(x);
-    tmp.rotateRight(18);
-    result.xor(tmp);
-    tmp.assign(x);
-    tmp.rotateRight(41);
-    result.xor(tmp);
-  }
-
-  function littleSigma(result, x, tmp) {
-    result.assign(x);
-    result.rotateRight(1);
-    tmp.assign(x);
-    tmp.rotateRight(8);
-    result.xor(tmp);
-    tmp.assign(x);
-    tmp.shiftRight(7);
-    result.xor(tmp);
-  }
-
-  function littleSigmaPrime(result, x, tmp) {
-    result.assign(x);
-    result.rotateRight(19);
-    tmp.assign(x);
-    tmp.rotateRight(61);
-    result.xor(tmp);
-    tmp.assign(x);
-    tmp.shiftRight(6);
-    result.xor(tmp);
-  }
-
-  var k = [new Word64(0x428a2f98, 0xd728ae22), new Word64(0x71374491, 0x23ef65cd), new Word64(0xb5c0fbcf, 0xec4d3b2f), new Word64(0xe9b5dba5, 0x8189dbbc), new Word64(0x3956c25b, 0xf348b538), new Word64(0x59f111f1, 0xb605d019), new Word64(0x923f82a4, 0xaf194f9b), new Word64(0xab1c5ed5, 0xda6d8118), new Word64(0xd807aa98, 0xa3030242), new Word64(0x12835b01, 0x45706fbe), new Word64(0x243185be, 0x4ee4b28c), new Word64(0x550c7dc3, 0xd5ffb4e2), new Word64(0x72be5d74, 0xf27b896f), new Word64(0x80deb1fe, 0x3b1696b1), new Word64(0x9bdc06a7, 0x25c71235), new Word64(0xc19bf174, 0xcf692694), new Word64(0xe49b69c1, 0x9ef14ad2), new Word64(0xefbe4786, 0x384f25e3), new Word64(0x0fc19dc6, 0x8b8cd5b5), new Word64(0x240ca1cc, 0x77ac9c65), new Word64(0x2de92c6f, 0x592b0275), new Word64(0x4a7484aa, 0x6ea6e483), new Word64(0x5cb0a9dc, 0xbd41fbd4), new Word64(0x76f988da, 0x831153b5), new Word64(0x983e5152, 0xee66dfab), new Word64(0xa831c66d, 0x2db43210), new Word64(0xb00327c8, 0x98fb213f), new Word64(0xbf597fc7, 0xbeef0ee4), new Word64(0xc6e00bf3, 0x3da88fc2), new Word64(0xd5a79147, 0x930aa725), new Word64(0x06ca6351, 0xe003826f), new Word64(0x14292967, 0x0a0e6e70), new Word64(0x27b70a85, 0x46d22ffc), new Word64(0x2e1b2138, 0x5c26c926), new Word64(0x4d2c6dfc, 0x5ac42aed), new Word64(0x53380d13, 0x9d95b3df), new Word64(0x650a7354, 0x8baf63de), new Word64(0x766a0abb, 0x3c77b2a8), new Word64(0x81c2c92e, 0x47edaee6), new Word64(0x92722c85, 0x1482353b), new Word64(0xa2bfe8a1, 0x4cf10364), new Word64(0xa81a664b, 0xbc423001), new Word64(0xc24b8b70, 0xd0f89791), new Word64(0xc76c51a3, 0x0654be30), new Word64(0xd192e819, 0xd6ef5218), new Word64(0xd6990624, 0x5565a910), new Word64(0xf40e3585, 0x5771202a), new Word64(0x106aa070, 0x32bbd1b8), new Word64(0x19a4c116, 0xb8d2d0c8), new Word64(0x1e376c08, 0x5141ab53), new Word64(0x2748774c, 0xdf8eeb99), new Word64(0x34b0bcb5, 0xe19b48a8), new Word64(0x391c0cb3, 0xc5c95a63), new Word64(0x4ed8aa4a, 0xe3418acb), new Word64(0x5b9cca4f, 0x7763e373), new Word64(0x682e6ff3, 0xd6b2b8a3), new Word64(0x748f82ee, 0x5defb2fc), new Word64(0x78a5636f, 0x43172f60), new Word64(0x84c87814, 0xa1f0ab72), new Word64(0x8cc70208, 0x1a6439ec), new Word64(0x90befffa, 0x23631e28), new Word64(0xa4506ceb, 0xde82bde9), new Word64(0xbef9a3f7, 0xb2c67915), new Word64(0xc67178f2, 0xe372532b), new Word64(0xca273ece, 0xea26619c), new Word64(0xd186b8c7, 0x21c0c207), new Word64(0xeada7dd6, 0xcde0eb1e), new Word64(0xf57d4f7f, 0xee6ed178), new Word64(0x06f067aa, 0x72176fba), new Word64(0x0a637dc5, 0xa2c898a6), new Word64(0x113f9804, 0xbef90dae), new Word64(0x1b710b35, 0x131c471b), new Word64(0x28db77f5, 0x23047d84), new Word64(0x32caab7b, 0x40c72493), new Word64(0x3c9ebe0a, 0x15c9bebc), new Word64(0x431d67c4, 0x9c100d4c), new Word64(0x4cc5d4be, 0xcb3e42b6), new Word64(0x597f299c, 0xfc657e2a), new Word64(0x5fcb6fab, 0x3ad6faec), new Word64(0x6c44198c, 0x4a475817)];
-
-  function hash(data, offset, length, mode384) {
-    mode384 = !!mode384;
-    var h0, h1, h2, h3, h4, h5, h6, h7;
-
-    if (!mode384) {
-      h0 = new Word64(0x6a09e667, 0xf3bcc908);
-      h1 = new Word64(0xbb67ae85, 0x84caa73b);
-      h2 = new Word64(0x3c6ef372, 0xfe94f82b);
-      h3 = new Word64(0xa54ff53a, 0x5f1d36f1);
-      h4 = new Word64(0x510e527f, 0xade682d1);
-      h5 = new Word64(0x9b05688c, 0x2b3e6c1f);
-      h6 = new Word64(0x1f83d9ab, 0xfb41bd6b);
-      h7 = new Word64(0x5be0cd19, 0x137e2179);
-    } else {
-      h0 = new Word64(0xcbbb9d5d, 0xc1059ed8);
-      h1 = new Word64(0x629a292a, 0x367cd507);
-      h2 = new Word64(0x9159015a, 0x3070dd17);
-      h3 = new Word64(0x152fecd8, 0xf70e5939);
-      h4 = new Word64(0x67332667, 0xffc00b31);
-      h5 = new Word64(0x8eb44a87, 0x68581511);
-      h6 = new Word64(0xdb0c2e0d, 0x64f98fa7);
-      h7 = new Word64(0x47b5481d, 0xbefa4fa4);
-    }
-
-    var paddedLength = Math.ceil((length + 17) / 128) * 128;
-    var padded = new Uint8Array(paddedLength);
-    var i, j, n;
-
-    for (i = 0; i < length; ++i) {
-      padded[i] = data[offset++];
-    }
-
-    padded[i++] = 0x80;
-    n = paddedLength - 16;
-
-    while (i < n) {
-      padded[i++] = 0;
-    }
-
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = length >>> 29 & 0xff;
-    padded[i++] = length >> 21 & 0xff;
-    padded[i++] = length >> 13 & 0xff;
-    padded[i++] = length >> 5 & 0xff;
-    padded[i++] = length << 3 & 0xff;
-    var w = new Array(80);
-
-    for (i = 0; i < 80; i++) {
-      w[i] = new Word64(0, 0);
-    }
-
-    var a = new Word64(0, 0),
-        b = new Word64(0, 0),
-        c = new Word64(0, 0);
-    var d = new Word64(0, 0),
-        e = new Word64(0, 0),
-        f = new Word64(0, 0);
-    var g = new Word64(0, 0),
-        h = new Word64(0, 0);
-    var t1 = new Word64(0, 0),
-        t2 = new Word64(0, 0);
-    var tmp1 = new Word64(0, 0),
-        tmp2 = new Word64(0, 0),
-        tmp3;
-
-    for (i = 0; i < paddedLength;) {
-      for (j = 0; j < 16; ++j) {
-        w[j].high = padded[i] << 24 | padded[i + 1] << 16 | padded[i + 2] << 8 | padded[i + 3];
-        w[j].low = padded[i + 4] << 24 | padded[i + 5] << 16 | padded[i + 6] << 8 | padded[i + 7];
-        i += 8;
-      }
-
-      for (j = 16; j < 80; ++j) {
-        tmp3 = w[j];
-        littleSigmaPrime(tmp3, w[j - 2], tmp2);
-        tmp3.add(w[j - 7]);
-        littleSigma(tmp1, w[j - 15], tmp2);
-        tmp3.add(tmp1);
-        tmp3.add(w[j - 16]);
-      }
-
-      a.assign(h0);
-      b.assign(h1);
-      c.assign(h2);
-      d.assign(h3);
-      e.assign(h4);
-      f.assign(h5);
-      g.assign(h6);
-      h.assign(h7);
-
-      for (j = 0; j < 80; ++j) {
-        t1.assign(h);
-        sigmaPrime(tmp1, e, tmp2);
-        t1.add(tmp1);
-        ch(tmp1, e, f, g, tmp2);
-        t1.add(tmp1);
-        t1.add(k[j]);
-        t1.add(w[j]);
-        sigma(t2, a, tmp2);
-        maj(tmp1, a, b, c, tmp2);
-        t2.add(tmp1);
-        tmp3 = h;
-        h = g;
-        g = f;
-        f = e;
-        d.add(t1);
-        e = d;
-        d = c;
-        c = b;
-        b = a;
-        tmp3.assign(t1);
-        tmp3.add(t2);
-        a = tmp3;
-      }
-
-      h0.add(a);
-      h1.add(b);
-      h2.add(c);
-      h3.add(d);
-      h4.add(e);
-      h5.add(f);
-      h6.add(g);
-      h7.add(h);
-    }
-
-    var result;
-
-    if (!mode384) {
-      result = new Uint8Array(64);
-      h0.copyTo(result, 0);
-      h1.copyTo(result, 8);
-      h2.copyTo(result, 16);
-      h3.copyTo(result, 24);
-      h4.copyTo(result, 32);
-      h5.copyTo(result, 40);
-      h6.copyTo(result, 48);
-      h7.copyTo(result, 56);
-    } else {
-      result = new Uint8Array(48);
-      h0.copyTo(result, 0);
-      h1.copyTo(result, 8);
-      h2.copyTo(result, 16);
-      h3.copyTo(result, 24);
-      h4.copyTo(result, 32);
-      h5.copyTo(result, 40);
-    }
-
-    return result;
-  }
-
-  return hash;
-}();
-
-exports.calculateSHA512 = calculateSHA512;
-
-var calculateSHA384 = function calculateSHA384Closure() {
-  function hash(data, offset, length) {
-    return calculateSHA512(data, offset, length, true);
-  }
-
-  return hash;
-}();
-
-exports.calculateSHA384 = calculateSHA384;
-
-var NullCipher = function NullCipherClosure() {
-  function NullCipher() {}
-
-  NullCipher.prototype = {
-    decryptBlock: function NullCipher_decryptBlock(data) {
-      return data;
-    },
-    encrypt: function NullCipher_encrypt(data) {
-      return data;
-    }
-  };
-  return NullCipher;
-}();
-
-class AESBaseCipher {
-  constructor() {
-    if (this.constructor === AESBaseCipher) {
-      (0, _util.unreachable)("Cannot initialize AESBaseCipher.");
-    }
-
-    this._s = new Uint8Array([0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16]);
-    this._inv_s = new Uint8Array([0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e, 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84, 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73, 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4, 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61, 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d]);
-    this._mix = new Uint32Array([0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927, 0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45, 0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb, 0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381, 0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf, 0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66, 0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28, 0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012, 0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec, 0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e, 0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd, 0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7, 0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89, 0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b, 0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815, 0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f, 0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa, 0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8, 0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36, 0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c, 0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742, 0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea, 0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4, 0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e, 0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360, 0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502, 0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87, 0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd, 0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3, 0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621, 0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f, 0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55, 0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26, 0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844, 0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba, 0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480, 0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce, 0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67, 0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929, 0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713, 0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed, 0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f, 0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
-    this._mixCol = new Uint8Array(256);
-
-    for (let i = 0; i < 256; i++) {
-      if (i < 128) {
-        this._mixCol[i] = i << 1;
-      } else {
-        this._mixCol[i] = i << 1 ^ 0x1b;
-      }
-    }
-
-    this.buffer = new Uint8Array(16);
-    this.bufferPosition = 0;
-  }
-
-  _expandKey(cipherKey) {
-    (0, _util.unreachable)("Cannot call `_expandKey` on the base class");
-  }
-
-  _decrypt(input, key) {
-    let t, u, v;
-    const state = new Uint8Array(16);
-    state.set(input);
-
-    for (let j = 0, k = this._keySize; j < 16; ++j, ++k) {
-      state[j] ^= key[k];
-    }
-
-    for (let i = this._cyclesOfRepetition - 1; i >= 1; --i) {
-      t = state[13];
-      state[13] = state[9];
-      state[9] = state[5];
-      state[5] = state[1];
-      state[1] = t;
-      t = state[14];
-      u = state[10];
-      state[14] = state[6];
-      state[10] = state[2];
-      state[6] = t;
-      state[2] = u;
-      t = state[15];
-      u = state[11];
-      v = state[7];
-      state[15] = state[3];
-      state[11] = t;
-      state[7] = u;
-      state[3] = v;
-
-      for (let j = 0; j < 16; ++j) {
-        state[j] = this._inv_s[state[j]];
-      }
-
-      for (let j = 0, k = i * 16; j < 16; ++j, ++k) {
-        state[j] ^= key[k];
-      }
-
-      for (let j = 0; j < 16; j += 4) {
-        const s0 = this._mix[state[j]];
-        const s1 = this._mix[state[j + 1]];
-        const s2 = this._mix[state[j + 2]];
-        const s3 = this._mix[state[j + 3]];
-        t = s0 ^ s1 >>> 8 ^ s1 << 24 ^ s2 >>> 16 ^ s2 << 16 ^ s3 >>> 24 ^ s3 << 8;
-        state[j] = t >>> 24 & 0xff;
-        state[j + 1] = t >> 16 & 0xff;
-        state[j + 2] = t >> 8 & 0xff;
-        state[j + 3] = t & 0xff;
-      }
-    }
-
-    t = state[13];
-    state[13] = state[9];
-    state[9] = state[5];
-    state[5] = state[1];
-    state[1] = t;
-    t = state[14];
-    u = state[10];
-    state[14] = state[6];
-    state[10] = state[2];
-    state[6] = t;
-    state[2] = u;
-    t = state[15];
-    u = state[11];
-    v = state[7];
-    state[15] = state[3];
-    state[11] = t;
-    state[7] = u;
-    state[3] = v;
-
-    for (let j = 0; j < 16; ++j) {
-      state[j] = this._inv_s[state[j]];
-      state[j] ^= key[j];
-    }
-
-    return state;
-  }
-
-  _encrypt(input, key) {
-    const s = this._s;
-    let t, u, v;
-    const state = new Uint8Array(16);
-    state.set(input);
-
-    for (let j = 0; j < 16; ++j) {
-      state[j] ^= key[j];
-    }
-
-    for (let i = 1; i < this._cyclesOfRepetition; i++) {
-      for (let j = 0; j < 16; ++j) {
-        state[j] = s[state[j]];
-      }
-
-      v = state[1];
-      state[1] = state[5];
-      state[5] = state[9];
-      state[9] = state[13];
-      state[13] = v;
-      v = state[2];
-      u = state[6];
-      state[2] = state[10];
-      state[6] = state[14];
-      state[10] = v;
-      state[14] = u;
-      v = state[3];
-      u = state[7];
-      t = state[11];
-      state[3] = state[15];
-      state[7] = v;
-      state[11] = u;
-      state[15] = t;
-
-      for (let j = 0; j < 16; j += 4) {
-        const s0 = state[j + 0];
-        const s1 = state[j + 1];
-        const s2 = state[j + 2];
-        const s3 = state[j + 3];
-        t = s0 ^ s1 ^ s2 ^ s3;
-        state[j + 0] ^= t ^ this._mixCol[s0 ^ s1];
-        state[j + 1] ^= t ^ this._mixCol[s1 ^ s2];
-        state[j + 2] ^= t ^ this._mixCol[s2 ^ s3];
-        state[j + 3] ^= t ^ this._mixCol[s3 ^ s0];
-      }
-
-      for (let j = 0, k = i * 16; j < 16; ++j, ++k) {
-        state[j] ^= key[k];
-      }
-    }
-
-    for (let j = 0; j < 16; ++j) {
-      state[j] = s[state[j]];
-    }
-
-    v = state[1];
-    state[1] = state[5];
-    state[5] = state[9];
-    state[9] = state[13];
-    state[13] = v;
-    v = state[2];
-    u = state[6];
-    state[2] = state[10];
-    state[6] = state[14];
-    state[10] = v;
-    state[14] = u;
-    v = state[3];
-    u = state[7];
-    t = state[11];
-    state[3] = state[15];
-    state[7] = v;
-    state[11] = u;
-    state[15] = t;
-
-    for (let j = 0, k = this._keySize; j < 16; ++j, ++k) {
-      state[j] ^= key[k];
-    }
-
-    return state;
-  }
-
-  _decryptBlock2(data, finalize) {
-    const sourceLength = data.length;
-    let buffer = this.buffer,
-        bufferLength = this.bufferPosition;
-    const result = [];
-    let iv = this.iv;
-
-    for (let i = 0; i < sourceLength; ++i) {
-      buffer[bufferLength] = data[i];
-      ++bufferLength;
-
-      if (bufferLength < 16) {
-        continue;
-      }
-
-      const plain = this._decrypt(buffer, this._key);
-
-      for (let j = 0; j < 16; ++j) {
-        plain[j] ^= iv[j];
-      }
-
-      iv = buffer;
-      result.push(plain);
-      buffer = new Uint8Array(16);
-      bufferLength = 0;
-    }
-
-    this.buffer = buffer;
-    this.bufferLength = bufferLength;
-    this.iv = iv;
-
-    if (result.length === 0) {
-      return new Uint8Array(0);
-    }
-
-    let outputLength = 16 * result.length;
-
-    if (finalize) {
-      const lastBlock = result[result.length - 1];
-      let psLen = lastBlock[15];
-
-      if (psLen <= 16) {
-        for (let i = 15, ii = 16 - psLen; i >= ii; --i) {
-          if (lastBlock[i] !== psLen) {
-            psLen = 0;
-            break;
-          }
-        }
-
-        outputLength -= psLen;
-        result[result.length - 1] = lastBlock.subarray(0, 16 - psLen);
-      }
-    }
-
-    const output = new Uint8Array(outputLength);
-
-    for (let i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16) {
-      output.set(result[i], j);
-    }
-
-    return output;
-  }
-
-  decryptBlock(data, finalize, iv = null) {
-    const sourceLength = data.length;
-    const buffer = this.buffer;
-    let bufferLength = this.bufferPosition;
-
-    if (iv) {
-      this.iv = iv;
-    } else {
-      for (let i = 0; bufferLength < 16 && i < sourceLength; ++i, ++bufferLength) {
-        buffer[bufferLength] = data[i];
-      }
-
-      if (bufferLength < 16) {
-        this.bufferLength = bufferLength;
-        return new Uint8Array(0);
-      }
-
-      this.iv = buffer;
-      data = data.subarray(16);
-    }
-
-    this.buffer = new Uint8Array(16);
-    this.bufferLength = 0;
-    this.decryptBlock = this._decryptBlock2;
-    return this.decryptBlock(data, finalize);
-  }
-
-  encrypt(data, iv) {
-    const sourceLength = data.length;
-    let buffer = this.buffer,
-        bufferLength = this.bufferPosition;
-    const result = [];
-
-    if (!iv) {
-      iv = new Uint8Array(16);
-    }
-
-    for (let i = 0; i < sourceLength; ++i) {
-      buffer[bufferLength] = data[i];
-      ++bufferLength;
-
-      if (bufferLength < 16) {
-        continue;
-      }
-
-      for (let j = 0; j < 16; ++j) {
-        buffer[j] ^= iv[j];
-      }
-
-      const cipher = this._encrypt(buffer, this._key);
-
-      iv = cipher;
-      result.push(cipher);
-      buffer = new Uint8Array(16);
-      bufferLength = 0;
-    }
-
-    this.buffer = buffer;
-    this.bufferLength = bufferLength;
-    this.iv = iv;
-
-    if (result.length === 0) {
-      return new Uint8Array(0);
-    }
-
-    const outputLength = 16 * result.length;
-    const output = new Uint8Array(outputLength);
-
-    for (let i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16) {
-      output.set(result[i], j);
-    }
-
-    return output;
-  }
-
-}
-
-class AES128Cipher extends AESBaseCipher {
-  constructor(key) {
-    super();
-    this._cyclesOfRepetition = 10;
-    this._keySize = 160;
-    this._rcon = new Uint8Array([0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d]);
-    this._key = this._expandKey(key);
-  }
-
-  _expandKey(cipherKey) {
-    const b = 176;
-    const s = this._s;
-    const rcon = this._rcon;
-    const result = new Uint8Array(b);
-    result.set(cipherKey);
-
-    for (let j = 16, i = 1; j < b; ++i) {
-      let t1 = result[j - 3];
-      let t2 = result[j - 2];
-      let t3 = result[j - 1];
-      let t4 = result[j - 4];
-      t1 = s[t1];
-      t2 = s[t2];
-      t3 = s[t3];
-      t4 = s[t4];
-      t1 = t1 ^ rcon[i];
-
-      for (let n = 0; n < 4; ++n) {
-        result[j] = t1 ^= result[j - 16];
-        j++;
-        result[j] = t2 ^= result[j - 16];
-        j++;
-        result[j] = t3 ^= result[j - 16];
-        j++;
-        result[j] = t4 ^= result[j - 16];
-        j++;
-      }
-    }
-
-    return result;
-  }
-
-}
-
-exports.AES128Cipher = AES128Cipher;
-
-class AES256Cipher extends AESBaseCipher {
-  constructor(key) {
-    super();
-    this._cyclesOfRepetition = 14;
-    this._keySize = 224;
-    this._key = this._expandKey(key);
-  }
-
-  _expandKey(cipherKey) {
-    const b = 240;
-    const s = this._s;
-    const result = new Uint8Array(b);
-    result.set(cipherKey);
-    let r = 1;
-    let t1, t2, t3, t4;
-
-    for (let j = 32, i = 1; j < b; ++i) {
-      if (j % 32 === 16) {
-        t1 = s[t1];
-        t2 = s[t2];
-        t3 = s[t3];
-        t4 = s[t4];
-      } else if (j % 32 === 0) {
-        t1 = result[j - 3];
-        t2 = result[j - 2];
-        t3 = result[j - 1];
-        t4 = result[j - 4];
-        t1 = s[t1];
-        t2 = s[t2];
-        t3 = s[t3];
-        t4 = s[t4];
-        t1 = t1 ^ r;
-
-        if ((r <<= 1) >= 256) {
-          r = (r ^ 0x1b) & 0xff;
-        }
-      }
-
-      for (let n = 0; n < 4; ++n) {
-        result[j] = t1 ^= result[j - 32];
-        j++;
-        result[j] = t2 ^= result[j - 32];
-        j++;
-        result[j] = t3 ^= result[j - 32];
-        j++;
-        result[j] = t4 ^= result[j - 32];
-        j++;
-      }
-    }
-
-    return result;
-  }
-
-}
-
-exports.AES256Cipher = AES256Cipher;
-
-var PDF17 = function PDF17Closure() {
-  function compareByteArrays(array1, array2) {
-    if (array1.length !== array2.length) {
-      return false;
-    }
-
-    for (var i = 0; i < array1.length; i++) {
-      if (array1[i] !== array2[i]) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  function PDF17() {}
-
-  PDF17.prototype = {
-    checkOwnerPassword: function PDF17_checkOwnerPassword(password, ownerValidationSalt, userBytes, ownerPassword) {
-      var hashData = new Uint8Array(password.length + 56);
-      hashData.set(password, 0);
-      hashData.set(ownerValidationSalt, password.length);
-      hashData.set(userBytes, password.length + ownerValidationSalt.length);
-      var result = calculateSHA256(hashData, 0, hashData.length);
-      return compareByteArrays(result, ownerPassword);
-    },
-    checkUserPassword: function PDF17_checkUserPassword(password, userValidationSalt, userPassword) {
-      var hashData = new Uint8Array(password.length + 8);
-      hashData.set(password, 0);
-      hashData.set(userValidationSalt, password.length);
-      var result = calculateSHA256(hashData, 0, hashData.length);
-      return compareByteArrays(result, userPassword);
-    },
-    getOwnerKey: function PDF17_getOwnerKey(password, ownerKeySalt, userBytes, ownerEncryption) {
-      var hashData = new Uint8Array(password.length + 56);
-      hashData.set(password, 0);
-      hashData.set(ownerKeySalt, password.length);
-      hashData.set(userBytes, password.length + ownerKeySalt.length);
-      var key = calculateSHA256(hashData, 0, hashData.length);
-      var cipher = new AES256Cipher(key);
-      return cipher.decryptBlock(ownerEncryption, false, new Uint8Array(16));
-    },
-    getUserKey: function PDF17_getUserKey(password, userKeySalt, userEncryption) {
-      var hashData = new Uint8Array(password.length + 8);
-      hashData.set(password, 0);
-      hashData.set(userKeySalt, password.length);
-      var key = calculateSHA256(hashData, 0, hashData.length);
-      var cipher = new AES256Cipher(key);
-      return cipher.decryptBlock(userEncryption, false, new Uint8Array(16));
-    }
-  };
-  return PDF17;
-}();
-
-exports.PDF17 = PDF17;
-
-var PDF20 = function PDF20Closure() {
-  function concatArrays(array1, array2) {
-    var t = new Uint8Array(array1.length + array2.length);
-    t.set(array1, 0);
-    t.set(array2, array1.length);
-    return t;
-  }
-
-  function calculatePDF20Hash(password, input, userBytes) {
-    var k = calculateSHA256(input, 0, input.length).subarray(0, 32);
-    var e = [0];
-    var i = 0;
-
-    while (i < 64 || e[e.length - 1] > i - 32) {
-      var arrayLength = password.length + k.length + userBytes.length;
-      var k1 = new Uint8Array(arrayLength * 64);
-      var array = concatArrays(password, k);
-      array = concatArrays(array, userBytes);
-
-      for (var j = 0, pos = 0; j < 64; j++, pos += arrayLength) {
-        k1.set(array, pos);
-      }
-
-      var cipher = new AES128Cipher(k.subarray(0, 16));
-      e = cipher.encrypt(k1, k.subarray(16, 32));
-      var remainder = 0;
-
-      for (var z = 0; z < 16; z++) {
-        remainder *= 256 % 3;
-        remainder %= 3;
-        remainder += (e[z] >>> 0) % 3;
-        remainder %= 3;
-      }
-
-      if (remainder === 0) {
-        k = calculateSHA256(e, 0, e.length);
-      } else if (remainder === 1) {
-        k = calculateSHA384(e, 0, e.length);
-      } else if (remainder === 2) {
-        k = calculateSHA512(e, 0, e.length);
-      }
-
-      i++;
-    }
-
-    return k.subarray(0, 32);
-  }
-
-  function PDF20() {}
-
-  function compareByteArrays(array1, array2) {
-    if (array1.length !== array2.length) {
-      return false;
-    }
-
-    for (var i = 0; i < array1.length; i++) {
-      if (array1[i] !== array2[i]) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  PDF20.prototype = {
-    hash: function PDF20_hash(password, concatBytes, userBytes) {
-      return calculatePDF20Hash(password, concatBytes, userBytes);
-    },
-    checkOwnerPassword: function PDF20_checkOwnerPassword(password, ownerValidationSalt, userBytes, ownerPassword) {
-      var hashData = new Uint8Array(password.length + 56);
-      hashData.set(password, 0);
-      hashData.set(ownerValidationSalt, password.length);
-      hashData.set(userBytes, password.length + ownerValidationSalt.length);
-      var result = calculatePDF20Hash(password, hashData, userBytes);
-      return compareByteArrays(result, ownerPassword);
-    },
-    checkUserPassword: function PDF20_checkUserPassword(password, userValidationSalt, userPassword) {
-      var hashData = new Uint8Array(password.length + 8);
-      hashData.set(password, 0);
-      hashData.set(userValidationSalt, password.length);
-      var result = calculatePDF20Hash(password, hashData, []);
-      return compareByteArrays(result, userPassword);
-    },
-    getOwnerKey: function PDF20_getOwnerKey(password, ownerKeySalt, userBytes, ownerEncryption) {
-      var hashData = new Uint8Array(password.length + 56);
-      hashData.set(password, 0);
-      hashData.set(ownerKeySalt, password.length);
-      hashData.set(userBytes, password.length + ownerKeySalt.length);
-      var key = calculatePDF20Hash(password, hashData, userBytes);
-      var cipher = new AES256Cipher(key);
-      return cipher.decryptBlock(ownerEncryption, false, new Uint8Array(16));
-    },
-    getUserKey: function PDF20_getUserKey(password, userKeySalt, userEncryption) {
-      var hashData = new Uint8Array(password.length + 8);
-      hashData.set(password, 0);
-      hashData.set(userKeySalt, password.length);
-      var key = calculatePDF20Hash(password, hashData, []);
-      var cipher = new AES256Cipher(key);
-      return cipher.decryptBlock(userEncryption, false, new Uint8Array(16));
-    }
-  };
-  return PDF20;
-}();
-
-exports.PDF20 = PDF20;
-
-var CipherTransform = function CipherTransformClosure() {
-  function CipherTransform(stringCipherConstructor, streamCipherConstructor) {
-    this.StringCipherConstructor = stringCipherConstructor;
-    this.StreamCipherConstructor = streamCipherConstructor;
-  }
-
-  CipherTransform.prototype = {
-    createStream: function CipherTransform_createStream(stream, length) {
-      var cipher = new this.StreamCipherConstructor();
-      return new _stream.DecryptStream(stream, length, function cipherTransformDecryptStream(data, finalize) {
-        return cipher.decryptBlock(data, finalize);
-      });
-    },
-    decryptString: function CipherTransform_decryptString(s) {
-      var cipher = new this.StringCipherConstructor();
-      var data = (0, _util.stringToBytes)(s);
-      data = cipher.decryptBlock(data, true);
-      return (0, _util.bytesToString)(data);
-    },
-    encryptString: function CipherTransform_encryptString(s) {
-      const cipher = new this.StringCipherConstructor();
-
-      if (cipher instanceof AESBaseCipher) {
-        const strLen = s.length;
-        const pad = 16 - strLen % 16;
-
-        if (pad !== 16) {
-          s = s.padEnd(16 * Math.ceil(strLen / 16), String.fromCharCode(pad));
-        }
-
-        const iv = new Uint8Array(16);
-
-        if (typeof crypto !== "undefined") {
-          crypto.getRandomValues(iv);
-        } else {
-          for (let i = 0; i < 16; i++) {
-            iv[i] = Math.floor(256 * Math.random());
-          }
-        }
-
-        let data = (0, _util.stringToBytes)(s);
-        data = cipher.encrypt(data, iv);
-        const buf = new Uint8Array(16 + data.length);
-        buf.set(iv);
-        buf.set(data, 16);
-        return (0, _util.bytesToString)(buf);
-      }
-
-      let data = (0, _util.stringToBytes)(s);
-      data = cipher.encrypt(data);
-      return (0, _util.bytesToString)(data);
-    }
-  };
-  return CipherTransform;
-}();
-
-var CipherTransformFactory = function CipherTransformFactoryClosure() {
-  var defaultPasswordBytes = new Uint8Array([0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08, 0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
-
-  function createEncryptionKey20(revision, password, ownerPassword, ownerValidationSalt, ownerKeySalt, uBytes, userPassword, userValidationSalt, userKeySalt, ownerEncryption, userEncryption, perms) {
-    if (password) {
-      var passwordLength = Math.min(127, password.length);
-      password = password.subarray(0, passwordLength);
-    } else {
-      password = [];
-    }
-
-    var pdfAlgorithm;
-
-    if (revision === 6) {
-      pdfAlgorithm = new PDF20();
-    } else {
-      pdfAlgorithm = new PDF17();
-    }
-
-    if (pdfAlgorithm.checkUserPassword(password, userValidationSalt, userPassword)) {
-      return pdfAlgorithm.getUserKey(password, userKeySalt, userEncryption);
-    } else if (password.length && pdfAlgorithm.checkOwnerPassword(password, ownerValidationSalt, uBytes, ownerPassword)) {
-      return pdfAlgorithm.getOwnerKey(password, ownerKeySalt, uBytes, ownerEncryption);
-    }
-
-    return null;
-  }
-
-  function prepareKeyData(fileId, password, ownerPassword, userPassword, flags, revision, keyLength, encryptMetadata) {
-    var hashDataSize = 40 + ownerPassword.length + fileId.length;
-    var hashData = new Uint8Array(hashDataSize),
-        i = 0,
-        j,
-        n;
-
-    if (password) {
-      n = Math.min(32, password.length);
-
-      for (; i < n; ++i) {
-        hashData[i] = password[i];
-      }
-    }
-
-    j = 0;
-
-    while (i < 32) {
-      hashData[i++] = defaultPasswordBytes[j++];
-    }
-
-    for (j = 0, n = ownerPassword.length; j < n; ++j) {
-      hashData[i++] = ownerPassword[j];
-    }
-
-    hashData[i++] = flags & 0xff;
-    hashData[i++] = flags >> 8 & 0xff;
-    hashData[i++] = flags >> 16 & 0xff;
-    hashData[i++] = flags >>> 24 & 0xff;
-
-    for (j = 0, n = fileId.length; j < n; ++j) {
-      hashData[i++] = fileId[j];
-    }
-
-    if (revision >= 4 && !encryptMetadata) {
-      hashData[i++] = 0xff;
-      hashData[i++] = 0xff;
-      hashData[i++] = 0xff;
-      hashData[i++] = 0xff;
-    }
-
-    var hash = calculateMD5(hashData, 0, i);
-    var keyLengthInBytes = keyLength >> 3;
-
-    if (revision >= 3) {
-      for (j = 0; j < 50; ++j) {
-        hash = calculateMD5(hash, 0, keyLengthInBytes);
-      }
-    }
-
-    var encryptionKey = hash.subarray(0, keyLengthInBytes);
-    var cipher, checkData;
-
-    if (revision >= 3) {
-      for (i = 0; i < 32; ++i) {
-        hashData[i] = defaultPasswordBytes[i];
-      }
-
-      for (j = 0, n = fileId.length; j < n; ++j) {
-        hashData[i++] = fileId[j];
-      }
-
-      cipher = new ARCFourCipher(encryptionKey);
-      checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
-      n = encryptionKey.length;
-      var derivedKey = new Uint8Array(n),
-          k;
-
-      for (j = 1; j <= 19; ++j) {
-        for (k = 0; k < n; ++k) {
-          derivedKey[k] = encryptionKey[k] ^ j;
-        }
-
-        cipher = new ARCFourCipher(derivedKey);
-        checkData = cipher.encryptBlock(checkData);
-      }
-
-      for (j = 0, n = checkData.length; j < n; ++j) {
-        if (userPassword[j] !== checkData[j]) {
-          return null;
-        }
-      }
-    } else {
-      cipher = new ARCFourCipher(encryptionKey);
-      checkData = cipher.encryptBlock(defaultPasswordBytes);
-
-      for (j = 0, n = checkData.length; j < n; ++j) {
-        if (userPassword[j] !== checkData[j]) {
-          return null;
-        }
-      }
-    }
-
-    return encryptionKey;
-  }
-
-  function decodeUserPassword(password, ownerPassword, revision, keyLength) {
-    var hashData = new Uint8Array(32),
-        i = 0,
-        j,
-        n;
-    n = Math.min(32, password.length);
-
-    for (; i < n; ++i) {
-      hashData[i] = password[i];
-    }
-
-    j = 0;
-
-    while (i < 32) {
-      hashData[i++] = defaultPasswordBytes[j++];
-    }
-
-    var hash = calculateMD5(hashData, 0, i);
-    var keyLengthInBytes = keyLength >> 3;
-
-    if (revision >= 3) {
-      for (j = 0; j < 50; ++j) {
-        hash = calculateMD5(hash, 0, hash.length);
-      }
-    }
-
-    var cipher, userPassword;
-
-    if (revision >= 3) {
-      userPassword = ownerPassword;
-      var derivedKey = new Uint8Array(keyLengthInBytes),
-          k;
-
-      for (j = 19; j >= 0; j--) {
-        for (k = 0; k < keyLengthInBytes; ++k) {
-          derivedKey[k] = hash[k] ^ j;
-        }
-
-        cipher = new ARCFourCipher(derivedKey);
-        userPassword = cipher.encryptBlock(userPassword);
-      }
-    } else {
-      cipher = new ARCFourCipher(hash.subarray(0, keyLengthInBytes));
-      userPassword = cipher.encryptBlock(ownerPassword);
-    }
-
-    return userPassword;
-  }
-
-  var identityName = _primitives.Name.get("Identity");
-
-  function CipherTransformFactory(dict, fileId, password) {
-    var filter = dict.get("Filter");
-
-    if (!(0, _primitives.isName)(filter, "Standard")) {
-      throw new _util.FormatError("unknown encryption method");
-    }
-
-    this.dict = dict;
-    var algorithm = dict.get("V");
-
-    if (!Number.isInteger(algorithm) || algorithm !== 1 && algorithm !== 2 && algorithm !== 4 && algorithm !== 5) {
-      throw new _util.FormatError("unsupported encryption algorithm");
-    }
-
-    this.algorithm = algorithm;
-    var keyLength = dict.get("Length");
-
-    if (!keyLength) {
-      if (algorithm <= 3) {
-        keyLength = 40;
-      } else {
-        var cfDict = dict.get("CF");
-        var streamCryptoName = dict.get("StmF");
-
-        if ((0, _primitives.isDict)(cfDict) && (0, _primitives.isName)(streamCryptoName)) {
-          cfDict.suppressEncryption = true;
-          var handlerDict = cfDict.get(streamCryptoName.name);
-          keyLength = handlerDict && handlerDict.get("Length") || 128;
-
-          if (keyLength < 40) {
-            keyLength <<= 3;
-          }
-        }
-      }
-    }
-
-    if (!Number.isInteger(keyLength) || keyLength < 40 || keyLength % 8 !== 0) {
-      throw new _util.FormatError("invalid key length");
-    }
-
-    var ownerPassword = (0, _util.stringToBytes)(dict.get("O")).subarray(0, 32);
-    var userPassword = (0, _util.stringToBytes)(dict.get("U")).subarray(0, 32);
-    var flags = dict.get("P");
-    var revision = dict.get("R");
-    var encryptMetadata = (algorithm === 4 || algorithm === 5) && dict.get("EncryptMetadata") !== false;
-    this.encryptMetadata = encryptMetadata;
-    var fileIdBytes = (0, _util.stringToBytes)(fileId);
-    var passwordBytes;
-
-    if (password) {
-      if (revision === 6) {
-        try {
-          password = (0, _util.utf8StringToString)(password);
-        } catch (ex) {
-          (0, _util.warn)("CipherTransformFactory: " + "Unable to convert UTF8 encoded password.");
-        }
-      }
-
-      passwordBytes = (0, _util.stringToBytes)(password);
-    }
-
-    var encryptionKey;
-
-    if (algorithm !== 5) {
-      encryptionKey = prepareKeyData(fileIdBytes, passwordBytes, ownerPassword, userPassword, flags, revision, keyLength, encryptMetadata);
-    } else {
-      var ownerValidationSalt = (0, _util.stringToBytes)(dict.get("O")).subarray(32, 40);
-      var ownerKeySalt = (0, _util.stringToBytes)(dict.get("O")).subarray(40, 48);
-      var uBytes = (0, _util.stringToBytes)(dict.get("U")).subarray(0, 48);
-      var userValidationSalt = (0, _util.stringToBytes)(dict.get("U")).subarray(32, 40);
-      var userKeySalt = (0, _util.stringToBytes)(dict.get("U")).subarray(40, 48);
-      var ownerEncryption = (0, _util.stringToBytes)(dict.get("OE"));
-      var userEncryption = (0, _util.stringToBytes)(dict.get("UE"));
-      var perms = (0, _util.stringToBytes)(dict.get("Perms"));
-      encryptionKey = createEncryptionKey20(revision, passwordBytes, ownerPassword, ownerValidationSalt, ownerKeySalt, uBytes, userPassword, userValidationSalt, userKeySalt, ownerEncryption, userEncryption, perms);
-    }
-
-    if (!encryptionKey && !password) {
-      throw new _util.PasswordException("No password given", _util.PasswordResponses.NEED_PASSWORD);
-    } else if (!encryptionKey && password) {
-      var decodedPassword = decodeUserPassword(passwordBytes, ownerPassword, revision, keyLength);
-      encryptionKey = prepareKeyData(fileIdBytes, decodedPassword, ownerPassword, userPassword, flags, revision, keyLength, encryptMetadata);
-    }
-
-    if (!encryptionKey) {
-      throw new _util.PasswordException("Incorrect Password", _util.PasswordResponses.INCORRECT_PASSWORD);
-    }
-
-    this.encryptionKey = encryptionKey;
-
-    if (algorithm >= 4) {
-      var cf = dict.get("CF");
-
-      if ((0, _primitives.isDict)(cf)) {
-        cf.suppressEncryption = true;
-      }
-
-      this.cf = cf;
-      this.stmf = dict.get("StmF") || identityName;
-      this.strf = dict.get("StrF") || identityName;
-      this.eff = dict.get("EFF") || this.stmf;
-    }
-  }
-
-  function buildObjectKey(num, gen, encryptionKey, isAes) {
-    var key = new Uint8Array(encryptionKey.length + 9),
-        i,
-        n;
-
-    for (i = 0, n = encryptionKey.length; i < n; ++i) {
-      key[i] = encryptionKey[i];
-    }
-
-    key[i++] = num & 0xff;
-    key[i++] = num >> 8 & 0xff;
-    key[i++] = num >> 16 & 0xff;
-    key[i++] = gen & 0xff;
-    key[i++] = gen >> 8 & 0xff;
-
-    if (isAes) {
-      key[i++] = 0x73;
-      key[i++] = 0x41;
-      key[i++] = 0x6c;
-      key[i++] = 0x54;
-    }
-
-    var hash = calculateMD5(key, 0, i);
-    return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
-  }
-
-  function buildCipherConstructor(cf, name, num, gen, key) {
-    if (!(0, _primitives.isName)(name)) {
-      throw new _util.FormatError("Invalid crypt filter name.");
-    }
-
-    var cryptFilter = cf.get(name.name);
-    var cfm;
-
-    if (cryptFilter !== null && cryptFilter !== undefined) {
-      cfm = cryptFilter.get("CFM");
-    }
-
-    if (!cfm || cfm.name === "None") {
-      return function cipherTransformFactoryBuildCipherConstructorNone() {
-        return new NullCipher();
-      };
-    }
-
-    if (cfm.name === "V2") {
-      return function cipherTransformFactoryBuildCipherConstructorV2() {
-        return new ARCFourCipher(buildObjectKey(num, gen, key, false));
-      };
-    }
-
-    if (cfm.name === "AESV2") {
-      return function cipherTransformFactoryBuildCipherConstructorAESV2() {
-        return new AES128Cipher(buildObjectKey(num, gen, key, true));
-      };
-    }
-
-    if (cfm.name === "AESV3") {
-      return function cipherTransformFactoryBuildCipherConstructorAESV3() {
-        return new AES256Cipher(key);
-      };
-    }
-
-    throw new _util.FormatError("Unknown crypto method");
-  }
-
-  CipherTransformFactory.prototype = {
-    createCipherTransform: function CipherTransformFactory_createCipherTransform(num, gen) {
-      if (this.algorithm === 4 || this.algorithm === 5) {
-        return new CipherTransform(buildCipherConstructor(this.cf, this.stmf, num, gen, this.encryptionKey), buildCipherConstructor(this.cf, this.strf, num, gen, this.encryptionKey));
-      }
-
-      var key = buildObjectKey(num, gen, this.encryptionKey, false);
-
-      var cipherConstructor = function buildCipherCipherConstructor() {
-        return new ARCFourCipher(key);
-      };
-
-      return new CipherTransform(cipherConstructor, cipherConstructor);
-    }
-  };
-  return CipherTransformFactory;
-}();
-
-exports.CipherTransformFactory = CipherTransformFactory;
-
-/***/ }),
-/* 23 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+}));
 exports.ColorSpace = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
 var _primitives = __w_pdfjs_require__(5);
 
-var _core_utils = __w_pdfjs_require__(8);
+var _base_stream = __w_pdfjs_require__(7);
+
+var _core_utils = __w_pdfjs_require__(6);
 
 function resizeRgbImage(src, dest, w1, h1, w2, h2, alpha01) {
   const COMPONENTS = 3;
@@ -17942,32 +9018,32 @@ class ColorSpace {
   static _parse(cs, xref, resources = null, pdfFunctionFactory) {
     cs = xref.fetchIfRef(cs);
 
-    if ((0, _primitives.isName)(cs)) {
+    if (cs instanceof _primitives.Name) {
       switch (cs.name) {
-        case "DeviceGray":
         case "G":
+        case "DeviceGray":
           return this.singletons.gray;
 
-        case "DeviceRGB":
         case "RGB":
+        case "DeviceRGB":
           return this.singletons.rgb;
 
-        case "DeviceCMYK":
         case "CMYK":
+        case "DeviceCMYK":
           return this.singletons.cmyk;
 
         case "Pattern":
           return new PatternCS(null);
 
         default:
-          if ((0, _primitives.isDict)(resources)) {
+          if (resources instanceof _primitives.Dict) {
             const colorSpaces = resources.get("ColorSpace");
 
-            if ((0, _primitives.isDict)(colorSpaces)) {
+            if (colorSpaces instanceof _primitives.Dict) {
               const resourcesCS = colorSpaces.get(cs.name);
 
               if (resourcesCS) {
-                if ((0, _primitives.isName)(resourcesCS)) {
+                if (resourcesCS instanceof _primitives.Name) {
                   return this._parse(resourcesCS, xref, resources, pdfFunctionFactory);
                 }
 
@@ -17986,16 +9062,16 @@ class ColorSpace {
       let params, numComps, baseCS, whitePoint, blackPoint, gamma;
 
       switch (mode) {
-        case "DeviceGray":
         case "G":
+        case "DeviceGray":
           return this.singletons.gray;
 
-        case "DeviceRGB":
         case "RGB":
+        case "DeviceRGB":
           return this.singletons.rgb;
 
-        case "DeviceCMYK":
         case "CMYK":
+        case "DeviceCMYK":
           return this.singletons.cmyk;
 
         case "CalGray":
@@ -18048,8 +9124,8 @@ class ColorSpace {
 
           return new PatternCS(baseCS);
 
-        case "Indexed":
         case "I":
+        case "Indexed":
           baseCS = this._parse(cs[1], xref, resources, pdfFunctionFactory);
           const hiVal = xref.fetchIfRef(cs[2]) + 1;
           const lookup = xref.fetchIfRef(cs[3]);
@@ -18194,7 +9270,7 @@ class IndexedCS extends ColorSpace {
     const length = base.numComps * highVal;
     this.lookup = new Uint8Array(length);
 
-    if ((0, _primitives.isStream)(lookup)) {
+    if (lookup instanceof _base_stream.BaseStream) {
       const bytes = lookup.getBytes(length);
       this.lookup.set(bytes);
     } else if (typeof lookup === "string") {
@@ -18362,7 +9438,7 @@ const CalGrayCS = function CalGrayCSClosure() {
     const A = src[srcOffset] * scale;
     const AG = A ** cs.G;
     const L = cs.YW * AG;
-    const val = Math.max(295.8 * L ** 0.333333333333333333 - 40.8, 0);
+    const val = Math.max(295.8 * L ** 0.3333333333333333 - 40.8, 0);
     dest[destOffset] = val;
     dest[destOffset + 1] = val;
     dest[destOffset + 2] = val;
@@ -18638,7 +9714,7 @@ const LabCS = function LabCSClosure() {
     let result;
 
     if (x >= 6 / 29) {
-      result = x * x * x;
+      result = x ** 3;
     } else {
       result = 108 / 841 * (x - 4 / 29);
     }
@@ -18767,2734 +9843,81 @@ const LabCS = function LabCSClosure() {
 }();
 
 /***/ }),
-/* 24 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 15 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.GlobalImageCache = exports.LocalGStateCache = exports.LocalFunctionCache = exports.LocalColorSpaceCache = exports.LocalImageCache = void 0;
+}));
+exports.PartialEvaluator = exports.EvaluatorPreprocessor = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
+var _cmap = __w_pdfjs_require__(16);
+
 var _primitives = __w_pdfjs_require__(5);
 
-class BaseLocalCache {
-  constructor(options) {
-    if (this.constructor === BaseLocalCache) {
-      (0, _util.unreachable)("Cannot initialize BaseLocalCache.");
-    }
+var _fonts = __w_pdfjs_require__(34);
 
-    if (!options || !options.onlyRefs) {
-      this._nameRefMap = new Map();
-      this._imageMap = new Map();
-    }
+var _fonts_utils = __w_pdfjs_require__(38);
 
-    this._imageCache = new _primitives.RefSetCache();
-  }
+var _encodings = __w_pdfjs_require__(37);
 
-  getByName(name) {
-    const ref = this._nameRefMap.get(name);
+var _standard_fonts = __w_pdfjs_require__(41);
 
-    if (ref) {
-      return this.getByRef(ref);
-    }
+var _unicode = __w_pdfjs_require__(40);
 
-    return this._imageMap.get(name) || null;
-  }
+var _pattern = __w_pdfjs_require__(50);
 
-  getByRef(ref) {
-    return this._imageCache.get(ref) || null;
-  }
+var _xfa_fonts = __w_pdfjs_require__(51);
 
-  set(name, ref, data) {
-    (0, _util.unreachable)("Abstract method `set` called.");
-  }
+var _to_unicode_map = __w_pdfjs_require__(42);
 
-}
+var _function = __w_pdfjs_require__(57);
 
-class LocalImageCache extends BaseLocalCache {
-  set(name, ref = null, data) {
-    if (!name) {
-      throw new Error('LocalImageCache.set - expected "name" argument.');
-    }
+var _parser = __w_pdfjs_require__(17);
 
-    if (ref) {
-      if (this._imageCache.has(ref)) {
-        return;
-      }
+var _image_utils = __w_pdfjs_require__(59);
 
-      this._nameRefMap.set(name, ref);
+var _stream = __w_pdfjs_require__(10);
 
-      this._imageCache.put(ref, data);
+var _base_stream = __w_pdfjs_require__(7);
 
-      return;
-    }
+var _bidi = __w_pdfjs_require__(60);
 
-    if (this._imageMap.has(name)) {
-      return;
-    }
+var _colorspace = __w_pdfjs_require__(14);
 
-    this._imageMap.set(name, data);
-  }
+var _decode_stream = __w_pdfjs_require__(19);
 
-}
+var _glyphlist = __w_pdfjs_require__(39);
 
-exports.LocalImageCache = LocalImageCache;
+var _core_utils = __w_pdfjs_require__(6);
 
-class LocalColorSpaceCache extends BaseLocalCache {
-  set(name = null, ref = null, data) {
-    if (!name && !ref) {
-      throw new Error('LocalColorSpaceCache.set - expected "name" and/or "ref" argument.');
-    }
+var _metrics = __w_pdfjs_require__(45);
 
-    if (ref) {
-      if (this._imageCache.has(ref)) {
-        return;
-      }
+var _murmurhash = __w_pdfjs_require__(61);
 
-      if (name) {
-        this._nameRefMap.set(name, ref);
-      }
+var _operator_list = __w_pdfjs_require__(62);
 
-      this._imageCache.put(ref, data);
-
-      return;
-    }
-
-    if (this._imageMap.has(name)) {
-      return;
-    }
-
-    this._imageMap.set(name, data);
-  }
-
-}
-
-exports.LocalColorSpaceCache = LocalColorSpaceCache;
-
-class LocalFunctionCache extends BaseLocalCache {
-  constructor(options) {
-    super({
-      onlyRefs: true
-    });
-  }
-
-  getByName(name) {
-    (0, _util.unreachable)("Should not call `getByName` method.");
-  }
-
-  set(name = null, ref, data) {
-    if (!ref) {
-      throw new Error('LocalFunctionCache.set - expected "ref" argument.');
-    }
-
-    if (this._imageCache.has(ref)) {
-      return;
-    }
-
-    this._imageCache.put(ref, data);
-  }
-
-}
-
-exports.LocalFunctionCache = LocalFunctionCache;
-
-class LocalGStateCache extends BaseLocalCache {
-  set(name, ref = null, data) {
-    if (!name) {
-      throw new Error('LocalGStateCache.set - expected "name" argument.');
-    }
-
-    if (ref) {
-      if (this._imageCache.has(ref)) {
-        return;
-      }
-
-      this._nameRefMap.set(name, ref);
-
-      this._imageCache.put(ref, data);
-
-      return;
-    }
-
-    if (this._imageMap.has(name)) {
-      return;
-    }
-
-    this._imageMap.set(name, data);
-  }
-
-}
-
-exports.LocalGStateCache = LocalGStateCache;
-
-class GlobalImageCache {
-  static get NUM_PAGES_THRESHOLD() {
-    return (0, _util.shadow)(this, "NUM_PAGES_THRESHOLD", 2);
-  }
-
-  static get MAX_IMAGES_TO_CACHE() {
-    return (0, _util.shadow)(this, "MAX_IMAGES_TO_CACHE", 10);
-  }
-
-  constructor() {
-    this._refCache = new _primitives.RefSetCache();
-    this._imageCache = new _primitives.RefSetCache();
-  }
-
-  shouldCache(ref, pageIndex) {
-    const pageIndexSet = this._refCache.get(ref);
-
-    const numPages = pageIndexSet ? pageIndexSet.size + (pageIndexSet.has(pageIndex) ? 0 : 1) : 1;
-
-    if (numPages < GlobalImageCache.NUM_PAGES_THRESHOLD) {
-      return false;
-    }
-
-    if (!this._imageCache.has(ref) && this._imageCache.size >= GlobalImageCache.MAX_IMAGES_TO_CACHE) {
-      return false;
-    }
-
-    return true;
-  }
-
-  addPageIndex(ref, pageIndex) {
-    let pageIndexSet = this._refCache.get(ref);
-
-    if (!pageIndexSet) {
-      pageIndexSet = new Set();
-
-      this._refCache.put(ref, pageIndexSet);
-    }
-
-    pageIndexSet.add(pageIndex);
-  }
-
-  getData(ref, pageIndex) {
-    const pageIndexSet = this._refCache.get(ref);
-
-    if (!pageIndexSet) {
-      return null;
-    }
-
-    if (pageIndexSet.size < GlobalImageCache.NUM_PAGES_THRESHOLD) {
-      return null;
-    }
-
-    if (!this._imageCache.has(ref)) {
-      return null;
-    }
-
-    pageIndexSet.add(pageIndex);
-    return this._imageCache.get(ref);
-  }
-
-  setData(ref, data) {
-    if (!this._refCache.has(ref)) {
-      throw new Error('GlobalImageCache.setData - expected "addPageIndex" to have been called.');
-    }
-
-    if (this._imageCache.has(ref)) {
-      return;
-    }
-
-    if (this._imageCache.size >= GlobalImageCache.MAX_IMAGES_TO_CACHE) {
-      (0, _util.info)("GlobalImageCache.setData - ignoring image above MAX_IMAGES_TO_CACHE.");
-      return;
-    }
-
-    this._imageCache.put(ref, data);
-  }
-
-  clear(onlyData = false) {
-    if (!onlyData) {
-      this._refCache.clear();
-    }
-
-    this._imageCache.clear();
-  }
-
-}
-
-exports.GlobalImageCache = GlobalImageCache;
-
-/***/ }),
-/* 25 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getQuadPoints = getQuadPoints;
-exports.MarkupAnnotation = exports.AnnotationFactory = exports.AnnotationBorderStyle = exports.Annotation = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var _obj = __w_pdfjs_require__(10);
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _colorspace = __w_pdfjs_require__(23);
-
-var _core_utils = __w_pdfjs_require__(8);
-
-var _operator_list = __w_pdfjs_require__(26);
-
-var _stream = __w_pdfjs_require__(12);
-
-var _writer = __w_pdfjs_require__(27);
-
-class AnnotationFactory {
-  static create(xref, ref, pdfManager, idFactory) {
-    return pdfManager.ensureCatalog("acroForm").then(acroForm => {
-      return pdfManager.ensure(this, "_create", [xref, ref, pdfManager, idFactory, acroForm]);
-    });
-  }
-
-  static _create(xref, ref, pdfManager, idFactory, acroForm) {
-    const dict = xref.fetchIfRef(ref);
-
-    if (!(0, _primitives.isDict)(dict)) {
-      return undefined;
-    }
-
-    const id = (0, _primitives.isRef)(ref) ? ref.toString() : `annot_${idFactory.createObjId()}`;
-    let subtype = dict.get("Subtype");
-    subtype = (0, _primitives.isName)(subtype) ? subtype.name : null;
-    const parameters = {
-      xref,
-      ref,
-      dict,
-      subtype,
-      id,
-      pdfManager,
-      acroForm: acroForm instanceof _primitives.Dict ? acroForm : _primitives.Dict.empty
-    };
-
-    switch (subtype) {
-      case "Link":
-        return new LinkAnnotation(parameters);
-
-      case "Text":
-        return new TextAnnotation(parameters);
-
-      case "Widget":
-        let fieldType = (0, _core_utils.getInheritableProperty)({
-          dict,
-          key: "FT"
-        });
-        fieldType = (0, _primitives.isName)(fieldType) ? fieldType.name : null;
-
-        switch (fieldType) {
-          case "Tx":
-            return new TextWidgetAnnotation(parameters);
-
-          case "Btn":
-            return new ButtonWidgetAnnotation(parameters);
-
-          case "Ch":
-            return new ChoiceWidgetAnnotation(parameters);
-        }
-
-        (0, _util.warn)('Unimplemented widget field type "' + fieldType + '", ' + "falling back to base field type.");
-        return new WidgetAnnotation(parameters);
-
-      case "Popup":
-        return new PopupAnnotation(parameters);
-
-      case "FreeText":
-        return new FreeTextAnnotation(parameters);
-
-      case "Line":
-        return new LineAnnotation(parameters);
-
-      case "Square":
-        return new SquareAnnotation(parameters);
-
-      case "Circle":
-        return new CircleAnnotation(parameters);
-
-      case "PolyLine":
-        return new PolylineAnnotation(parameters);
-
-      case "Polygon":
-        return new PolygonAnnotation(parameters);
-
-      case "Caret":
-        return new CaretAnnotation(parameters);
-
-      case "Ink":
-        return new InkAnnotation(parameters);
-
-      case "Highlight":
-        return new HighlightAnnotation(parameters);
-
-      case "Underline":
-        return new UnderlineAnnotation(parameters);
-
-      case "Squiggly":
-        return new SquigglyAnnotation(parameters);
-
-      case "StrikeOut":
-        return new StrikeOutAnnotation(parameters);
-
-      case "Stamp":
-        return new StampAnnotation(parameters);
-
-      case "FileAttachment":
-        return new FileAttachmentAnnotation(parameters);
-
-      default:
-        if (!subtype) {
-          (0, _util.warn)("Annotation is missing the required /Subtype.");
-        } else {
-          (0, _util.warn)('Unimplemented annotation type "' + subtype + '", ' + "falling back to base annotation.");
-        }
-
-        return new Annotation(parameters);
-    }
-  }
-
-}
-
-exports.AnnotationFactory = AnnotationFactory;
-
-function getQuadPoints(dict, rect) {
-  if (!dict.has("QuadPoints")) {
-    return null;
-  }
-
-  const quadPoints = dict.getArray("QuadPoints");
-
-  if (!Array.isArray(quadPoints) || quadPoints.length % 8 > 0) {
-    return null;
-  }
-
-  const quadPointsLists = [];
-
-  for (let i = 0, ii = quadPoints.length / 8; i < ii; i++) {
-    quadPointsLists.push([]);
-
-    for (let j = i * 8, jj = i * 8 + 8; j < jj; j += 2) {
-      const x = quadPoints[j];
-      const y = quadPoints[j + 1];
-
-      if (x < rect[0] || x > rect[2] || y < rect[1] || y > rect[3]) {
-        return null;
-      }
-
-      quadPointsLists[i].push({
-        x,
-        y
-      });
-    }
-  }
-
-  return quadPointsLists;
-}
-
-function getTransformMatrix(rect, bbox, matrix) {
-  const [minX, minY, maxX, maxY] = _util.Util.getAxialAlignedBoundingBox(bbox, matrix);
-
-  if (minX === maxX || minY === maxY) {
-    return [1, 0, 0, 1, rect[0], rect[1]];
-  }
-
-  const xRatio = (rect[2] - rect[0]) / (maxX - minX);
-  const yRatio = (rect[3] - rect[1]) / (maxY - minY);
-  return [xRatio, 0, 0, yRatio, rect[0] - minX * xRatio, rect[1] - minY * yRatio];
-}
-
-class Annotation {
-  constructor(params) {
-    const dict = params.dict;
-    this.setContents(dict.get("Contents"));
-    this.setModificationDate(dict.get("M"));
-    this.setFlags(dict.get("F"));
-    this.setRectangle(dict.getArray("Rect"));
-    this.setColor(dict.getArray("C"));
-    this.setBorderStyle(dict);
-    this.setAppearance(dict);
-    this.data = {
-      annotationFlags: this.flags,
-      borderStyle: this.borderStyle,
-      color: this.color,
-      contents: this.contents,
-      hasAppearance: !!this.appearance,
-      id: params.id,
-      modificationDate: this.modificationDate,
-      rect: this.rectangle,
-      subtype: params.subtype
-    };
-  }
-
-  _hasFlag(flags, flag) {
-    return !!(flags & flag);
-  }
-
-  _isViewable(flags) {
-    return !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN) && !this._hasFlag(flags, _util.AnnotationFlag.NOVIEW);
-  }
-
-  _isPrintable(flags) {
-    return this._hasFlag(flags, _util.AnnotationFlag.PRINT) && !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN);
-  }
-
-  get viewable() {
-    if (this.flags === 0) {
-      return true;
-    }
-
-    return this._isViewable(this.flags);
-  }
-
-  get printable() {
-    if (this.flags === 0) {
-      return false;
-    }
-
-    return this._isPrintable(this.flags);
-  }
-
-  setContents(contents) {
-    this.contents = (0, _util.stringToPDFString)(contents || "");
-  }
-
-  setModificationDate(modificationDate) {
-    this.modificationDate = (0, _util.isString)(modificationDate) ? modificationDate : null;
-  }
-
-  setFlags(flags) {
-    this.flags = Number.isInteger(flags) && flags > 0 ? flags : 0;
-  }
-
-  hasFlag(flag) {
-    return this._hasFlag(this.flags, flag);
-  }
-
-  setRectangle(rectangle) {
-    if (Array.isArray(rectangle) && rectangle.length === 4) {
-      this.rectangle = _util.Util.normalizeRect(rectangle);
-    } else {
-      this.rectangle = [0, 0, 0, 0];
-    }
-  }
-
-  setColor(color) {
-    const rgbColor = new Uint8ClampedArray(3);
-
-    if (!Array.isArray(color)) {
-      this.color = rgbColor;
-      return;
-    }
-
-    switch (color.length) {
-      case 0:
-        this.color = null;
-        break;
-
-      case 1:
-        _colorspace.ColorSpace.singletons.gray.getRgbItem(color, 0, rgbColor, 0);
-
-        this.color = rgbColor;
-        break;
-
-      case 3:
-        _colorspace.ColorSpace.singletons.rgb.getRgbItem(color, 0, rgbColor, 0);
-
-        this.color = rgbColor;
-        break;
-
-      case 4:
-        _colorspace.ColorSpace.singletons.cmyk.getRgbItem(color, 0, rgbColor, 0);
-
-        this.color = rgbColor;
-        break;
-
-      default:
-        this.color = rgbColor;
-        break;
-    }
-  }
-
-  setBorderStyle(borderStyle) {
-    this.borderStyle = new AnnotationBorderStyle();
-
-    if (!(0, _primitives.isDict)(borderStyle)) {
-      return;
-    }
-
-    if (borderStyle.has("BS")) {
-      const dict = borderStyle.get("BS");
-      const dictType = dict.get("Type");
-
-      if (!dictType || (0, _primitives.isName)(dictType, "Border")) {
-        this.borderStyle.setWidth(dict.get("W"), this.rectangle);
-        this.borderStyle.setStyle(dict.get("S"));
-        this.borderStyle.setDashArray(dict.getArray("D"));
-      }
-    } else if (borderStyle.has("Border")) {
-      const array = borderStyle.getArray("Border");
-
-      if (Array.isArray(array) && array.length >= 3) {
-        this.borderStyle.setHorizontalCornerRadius(array[0]);
-        this.borderStyle.setVerticalCornerRadius(array[1]);
-        this.borderStyle.setWidth(array[2], this.rectangle);
-
-        if (array.length === 4) {
-          this.borderStyle.setDashArray(array[3]);
-        }
-      }
-    } else {
-      this.borderStyle.setWidth(0);
-    }
-  }
-
-  setAppearance(dict) {
-    this.appearance = null;
-    const appearanceStates = dict.get("AP");
-
-    if (!(0, _primitives.isDict)(appearanceStates)) {
-      return;
-    }
-
-    const normalAppearanceState = appearanceStates.get("N");
-
-    if ((0, _primitives.isStream)(normalAppearanceState)) {
-      this.appearance = normalAppearanceState;
-      return;
-    }
-
-    if (!(0, _primitives.isDict)(normalAppearanceState)) {
-      return;
-    }
-
-    const as = dict.get("AS");
-
-    if (!(0, _primitives.isName)(as) || !normalAppearanceState.has(as.name)) {
-      return;
-    }
-
-    this.appearance = normalAppearanceState.get(as.name);
-  }
-
-  loadResources(keys) {
-    return this.appearance.dict.getAsync("Resources").then(resources => {
-      if (!resources) {
-        return undefined;
-      }
-
-      const objectLoader = new _obj.ObjectLoader(resources, keys, resources.xref);
-      return objectLoader.load().then(function () {
-        return resources;
-      });
-    });
-  }
-
-  getOperatorList(evaluator, task, renderForms, annotationStorage) {
-    if (!this.appearance) {
-      return Promise.resolve(new _operator_list.OperatorList());
-    }
-
-    const appearance = this.appearance;
-    const data = this.data;
-    const appearanceDict = appearance.dict;
-    const resourcesPromise = this.loadResources(["ExtGState", "ColorSpace", "Pattern", "Shading", "XObject", "Font"]);
-    const bbox = appearanceDict.getArray("BBox") || [0, 0, 1, 1];
-    const matrix = appearanceDict.getArray("Matrix") || [1, 0, 0, 1, 0, 0];
-    const transform = getTransformMatrix(data.rect, bbox, matrix);
-    return resourcesPromise.then(resources => {
-      const opList = new _operator_list.OperatorList();
-      opList.addOp(_util.OPS.beginAnnotation, [data.rect, transform, matrix]);
-      return evaluator.getOperatorList({
-        stream: appearance,
-        task,
-        resources,
-        operatorList: opList
-      }).then(() => {
-        opList.addOp(_util.OPS.endAnnotation, []);
-        appearance.reset();
-        return opList;
-      });
-    });
-  }
-
-  async save(evaluator, task, annotationStorage) {
-    return null;
-  }
-
-}
-
-exports.Annotation = Annotation;
-
-class AnnotationBorderStyle {
-  constructor() {
-    this.width = 1;
-    this.style = _util.AnnotationBorderStyleType.SOLID;
-    this.dashArray = [3];
-    this.horizontalCornerRadius = 0;
-    this.verticalCornerRadius = 0;
-  }
-
-  setWidth(width, rect = [0, 0, 0, 0]) {
-    if ((0, _primitives.isName)(width)) {
-      this.width = 0;
-      return;
-    }
-
-    if (Number.isInteger(width)) {
-      if (width > 0) {
-        const maxWidth = (rect[2] - rect[0]) / 2;
-        const maxHeight = (rect[3] - rect[1]) / 2;
-
-        if (maxWidth > 0 && maxHeight > 0 && (width > maxWidth || width > maxHeight)) {
-          (0, _util.warn)(`AnnotationBorderStyle.setWidth - ignoring width: ${width}`);
-          width = 1;
-        }
-      }
-
-      this.width = width;
-    }
-  }
-
-  setStyle(style) {
-    if (!(0, _primitives.isName)(style)) {
-      return;
-    }
-
-    switch (style.name) {
-      case "S":
-        this.style = _util.AnnotationBorderStyleType.SOLID;
-        break;
-
-      case "D":
-        this.style = _util.AnnotationBorderStyleType.DASHED;
-        break;
-
-      case "B":
-        this.style = _util.AnnotationBorderStyleType.BEVELED;
-        break;
-
-      case "I":
-        this.style = _util.AnnotationBorderStyleType.INSET;
-        break;
-
-      case "U":
-        this.style = _util.AnnotationBorderStyleType.UNDERLINE;
-        break;
-
-      default:
-        break;
-    }
-  }
-
-  setDashArray(dashArray) {
-    if (Array.isArray(dashArray) && dashArray.length > 0) {
-      let isValid = true;
-      let allZeros = true;
-
-      for (const element of dashArray) {
-        const validNumber = +element >= 0;
-
-        if (!validNumber) {
-          isValid = false;
-          break;
-        } else if (element > 0) {
-          allZeros = false;
-        }
-      }
-
-      if (isValid && !allZeros) {
-        this.dashArray = dashArray;
-      } else {
-        this.width = 0;
-      }
-    } else if (dashArray) {
-      this.width = 0;
-    }
-  }
-
-  setHorizontalCornerRadius(radius) {
-    if (Number.isInteger(radius)) {
-      this.horizontalCornerRadius = radius;
-    }
-  }
-
-  setVerticalCornerRadius(radius) {
-    if (Number.isInteger(radius)) {
-      this.verticalCornerRadius = radius;
-    }
-  }
-
-}
-
-exports.AnnotationBorderStyle = AnnotationBorderStyle;
-
-class MarkupAnnotation extends Annotation {
-  constructor(parameters) {
-    super(parameters);
-    const dict = parameters.dict;
-
-    if (dict.has("IRT")) {
-      const rawIRT = dict.getRaw("IRT");
-      this.data.inReplyTo = (0, _primitives.isRef)(rawIRT) ? rawIRT.toString() : null;
-      const rt = dict.get("RT");
-      this.data.replyType = (0, _primitives.isName)(rt) ? rt.name : _util.AnnotationReplyType.REPLY;
-    }
-
-    if (this.data.replyType === _util.AnnotationReplyType.GROUP) {
-      const parent = dict.get("IRT");
-      this.data.title = (0, _util.stringToPDFString)(parent.get("T") || "");
-      this.setContents(parent.get("Contents"));
-      this.data.contents = this.contents;
-
-      if (!parent.has("CreationDate")) {
-        this.data.creationDate = null;
-      } else {
-        this.setCreationDate(parent.get("CreationDate"));
-        this.data.creationDate = this.creationDate;
-      }
-
-      if (!parent.has("M")) {
-        this.data.modificationDate = null;
-      } else {
-        this.setModificationDate(parent.get("M"));
-        this.data.modificationDate = this.modificationDate;
-      }
-
-      this.data.hasPopup = parent.has("Popup");
-
-      if (!parent.has("C")) {
-        this.data.color = null;
-      } else {
-        this.setColor(parent.getArray("C"));
-        this.data.color = this.color;
-      }
-    } else {
-      this.data.title = (0, _util.stringToPDFString)(dict.get("T") || "");
-      this.setCreationDate(dict.get("CreationDate"));
-      this.data.creationDate = this.creationDate;
-      this.data.hasPopup = dict.has("Popup");
-
-      if (!dict.has("C")) {
-        this.data.color = null;
-      }
-    }
-  }
-
-  setCreationDate(creationDate) {
-    this.creationDate = (0, _util.isString)(creationDate) ? creationDate : null;
-  }
-
-}
-
-exports.MarkupAnnotation = MarkupAnnotation;
-
-class WidgetAnnotation extends Annotation {
-  constructor(params) {
-    super(params);
-    const dict = params.dict;
-    const data = this.data;
-    this.ref = params.ref;
-    data.annotationType = _util.AnnotationType.WIDGET;
-    data.fieldName = this._constructFieldName(dict);
-    const fieldValue = (0, _core_utils.getInheritableProperty)({
-      dict,
-      key: "V",
-      getArray: true
-    });
-    data.fieldValue = this._decodeFormValue(fieldValue);
-    data.alternativeText = (0, _util.stringToPDFString)(dict.get("TU") || "");
-    data.defaultAppearance = (0, _core_utils.getInheritableProperty)({
-      dict,
-      key: "DA"
-    }) || params.acroForm.get("DA") || "";
-    const fieldType = (0, _core_utils.getInheritableProperty)({
-      dict,
-      key: "FT"
-    });
-    data.fieldType = (0, _primitives.isName)(fieldType) ? fieldType.name : null;
-    this.fieldResources = (0, _core_utils.getInheritableProperty)({
-      dict,
-      key: "DR"
-    }) || params.acroForm.get("DR") || _primitives.Dict.empty;
-    data.fieldFlags = (0, _core_utils.getInheritableProperty)({
-      dict,
-      key: "Ff"
-    });
-
-    if (!Number.isInteger(data.fieldFlags) || data.fieldFlags < 0) {
-      data.fieldFlags = 0;
-    }
-
-    data.readOnly = this.hasFieldFlag(_util.AnnotationFieldFlag.READONLY);
-
-    if (data.fieldType === "Sig") {
-      data.fieldValue = null;
-      this.setFlags(_util.AnnotationFlag.HIDDEN);
-    }
-  }
-
-  _constructFieldName(dict) {
-    if (!dict.has("T") && !dict.has("Parent")) {
-      (0, _util.warn)("Unknown field name, falling back to empty field name.");
-      return "";
-    }
-
-    if (!dict.has("Parent")) {
-      return (0, _util.stringToPDFString)(dict.get("T"));
-    }
-
-    const fieldName = [];
-
-    if (dict.has("T")) {
-      fieldName.unshift((0, _util.stringToPDFString)(dict.get("T")));
-    }
-
-    let loopDict = dict;
-
-    while (loopDict.has("Parent")) {
-      loopDict = loopDict.get("Parent");
-
-      if (!(0, _primitives.isDict)(loopDict)) {
-        break;
-      }
-
-      if (loopDict.has("T")) {
-        fieldName.unshift((0, _util.stringToPDFString)(loopDict.get("T")));
-      }
-    }
-
-    return fieldName.join(".");
-  }
-
-  _decodeFormValue(formValue) {
-    if (Array.isArray(formValue)) {
-      return formValue.filter(item => (0, _util.isString)(item)).map(item => (0, _util.stringToPDFString)(item));
-    } else if ((0, _primitives.isName)(formValue)) {
-      return (0, _util.stringToPDFString)(formValue.name);
-    } else if ((0, _util.isString)(formValue)) {
-      return (0, _util.stringToPDFString)(formValue);
-    }
-
-    return null;
-  }
-
-  hasFieldFlag(flag) {
-    return !!(this.data.fieldFlags & flag);
-  }
-
-  getOperatorList(evaluator, task, renderForms, annotationStorage) {
-    if (renderForms) {
-      return Promise.resolve(new _operator_list.OperatorList());
-    }
-
-    if (!this._hasText) {
-      return super.getOperatorList(evaluator, task, renderForms, annotationStorage);
-    }
-
-    return this._getAppearance(evaluator, task, annotationStorage).then(content => {
-      if (this.appearance && content === null) {
-        return super.getOperatorList(evaluator, task, renderForms, annotationStorage);
-      }
-
-      const operatorList = new _operator_list.OperatorList();
-
-      if (!this.data.defaultAppearance || content === null) {
-        return operatorList;
-      }
-
-      const matrix = [1, 0, 0, 1, 0, 0];
-      const bbox = [0, 0, this.data.rect[2] - this.data.rect[0], this.data.rect[3] - this.data.rect[1]];
-      const transform = getTransformMatrix(this.data.rect, bbox, matrix);
-      operatorList.addOp(_util.OPS.beginAnnotation, [this.data.rect, transform, matrix]);
-      const stream = new _stream.StringStream(content);
-      return evaluator.getOperatorList({
-        stream,
-        task,
-        resources: this.fieldResources,
-        operatorList
-      }).then(function () {
-        operatorList.addOp(_util.OPS.endAnnotation, []);
-        return operatorList;
-      });
-    });
-  }
-
-  async save(evaluator, task, annotationStorage) {
-    if (this.data.fieldValue === annotationStorage[this.data.id]) {
-      return null;
-    }
-
-    let appearance = await this._getAppearance(evaluator, task, annotationStorage);
-
-    if (appearance === null) {
-      return null;
-    }
-
-    const dict = evaluator.xref.fetchIfRef(this.ref);
-
-    if (!(0, _primitives.isDict)(dict)) {
-      return null;
-    }
-
-    const bbox = [0, 0, this.data.rect[2] - this.data.rect[0], this.data.rect[3] - this.data.rect[1]];
-    const newRef = evaluator.xref.getNewRef();
-    const AP = new _primitives.Dict(evaluator.xref);
-    AP.set("N", newRef);
-    const value = annotationStorage[this.data.id];
-    const encrypt = evaluator.xref.encrypt;
-    let originalTransform = null;
-    let newTransform = null;
-
-    if (encrypt) {
-      originalTransform = encrypt.createCipherTransform(this.ref.num, this.ref.gen);
-      newTransform = encrypt.createCipherTransform(newRef.num, newRef.gen);
-      appearance = newTransform.encryptString(appearance);
-    }
-
-    dict.set("V", value);
-    dict.set("AP", AP);
-    dict.set("M", `D:${(0, _util.getModificationDate)()}`);
-    const appearanceDict = new _primitives.Dict(evaluator.xref);
-    appearanceDict.set("Length", appearance.length);
-    appearanceDict.set("Subtype", _primitives.Name.get("Form"));
-    appearanceDict.set("Resources", this.fieldResources);
-    appearanceDict.set("BBox", bbox);
-    const bufferOriginal = [`${this.ref.num} ${this.ref.gen} obj\n`];
-    (0, _writer.writeDict)(dict, bufferOriginal, originalTransform);
-    bufferOriginal.push("\nendobj\n");
-    const bufferNew = [`${newRef.num} ${newRef.gen} obj\n`];
-    (0, _writer.writeDict)(appearanceDict, bufferNew, newTransform);
-    bufferNew.push(" stream\n");
-    bufferNew.push(appearance);
-    bufferNew.push("\nendstream\nendobj\n");
-    return [{
-      ref: this.ref,
-      data: bufferOriginal.join("")
-    }, {
-      ref: newRef,
-      data: bufferNew.join("")
-    }];
-  }
-
-  async _getAppearance(evaluator, task, annotationStorage) {
-    const isPassword = this.hasFieldFlag(_util.AnnotationFieldFlag.PASSWORD);
-
-    if (!annotationStorage || isPassword) {
-      return null;
-    }
-
-    const value = annotationStorage[this.data.id];
-
-    if (value === "") {
-      return "";
-    }
-
-    const defaultPadding = 2;
-    const hPadding = defaultPadding;
-    const totalHeight = this.data.rect[3] - this.data.rect[1];
-    const totalWidth = this.data.rect[2] - this.data.rect[0];
-    const fontInfo = await this._getFontData(evaluator, task);
-    const [font, fontName] = fontInfo;
-    let fontSize = fontInfo[2];
-    fontSize = this._computeFontSize(font, fontName, fontSize, totalHeight);
-    let descent = font.descent;
-
-    if (isNaN(descent)) {
-      descent = 0;
-    }
-
-    const vPadding = defaultPadding + Math.abs(descent) * fontSize;
-    const defaultAppearance = this.data.defaultAppearance;
-    const alignment = this.data.textAlignment;
-
-    if (this.data.comb) {
-      return this._getCombAppearance(defaultAppearance, value, totalWidth, hPadding, vPadding);
-    }
-
-    if (this.data.multiLine) {
-      return this._getMultilineAppearance(defaultAppearance, value, font, fontSize, totalWidth, totalHeight, alignment, hPadding, vPadding);
-    }
-
-    if (alignment === 0 || alignment > 2) {
-      return "/Tx BMC q BT " + defaultAppearance + ` 1 0 0 1 ${hPadding} ${vPadding} Tm (${(0, _util.escapeString)(value)}) Tj` + " ET Q EMC";
-    }
-
-    const renderedText = this._renderText(value, font, fontSize, totalWidth, alignment, hPadding, vPadding);
-
-    return "/Tx BMC q BT " + defaultAppearance + ` 1 0 0 1 0 0 Tm ${renderedText}` + " ET Q EMC";
-  }
-
-  async _getFontData(evaluator, task) {
-    const operatorList = new _operator_list.OperatorList();
-    const initialState = {
-      fontSize: 0,
-      font: null,
-      fontName: null,
-
-      clone() {
-        return this;
-      }
-
-    };
-    await evaluator.getOperatorList({
-      stream: new _stream.StringStream(this.data.defaultAppearance),
-      task,
-      resources: this.fieldResources,
-      operatorList,
-      initialState
-    });
-    return [initialState.font, initialState.fontName, initialState.fontSize];
-  }
-
-  _computeFontSize(font, fontName, fontSize, height) {
-    if (fontSize === null || fontSize === 0) {
-      const em = font.charsToGlyphs("M", true)[0].width / 1000;
-      const capHeight = 0.7 * em;
-      fontSize = Math.max(1, Math.floor(height / (1.5 * capHeight)));
-      let fontRegex = new RegExp(`/${fontName}\\s+[0-9\.]+\\s+Tf`);
-
-      if (this.data.defaultAppearance.search(fontRegex) === -1) {
-        fontRegex = new RegExp(`/${fontName}\\s+Tf`);
-      }
-
-      this.data.defaultAppearance = this.data.defaultAppearance.replace(fontRegex, `/${fontName} ${fontSize} Tf`);
-    }
-
-    return fontSize;
-  }
-
-  _renderText(text, font, fontSize, totalWidth, alignment, hPadding, vPadding) {
-    const glyphs = font.charsToGlyphs(text);
-    const scale = fontSize / 1000;
-    let width = 0;
-
-    for (const glyph of glyphs) {
-      width += glyph.width * scale;
-    }
-
-    let shift;
-
-    if (alignment === 1) {
-      shift = (totalWidth - width) / 2;
-    } else if (alignment === 2) {
-      shift = totalWidth - width - hPadding;
-    } else {
-      shift = hPadding;
-    }
-
-    shift = shift.toFixed(2);
-    vPadding = vPadding.toFixed(2);
-    return `${shift} ${vPadding} Td (${(0, _util.escapeString)(text)}) Tj`;
-  }
-
-}
-
-class TextWidgetAnnotation extends WidgetAnnotation {
-  constructor(params) {
-    super(params);
-    this._hasText = true;
-    const dict = params.dict;
-
-    if (!(0, _util.isString)(this.data.fieldValue)) {
-      this.data.fieldValue = "";
-    }
-
-    let alignment = (0, _core_utils.getInheritableProperty)({
-      dict,
-      key: "Q"
-    });
-
-    if (!Number.isInteger(alignment) || alignment < 0 || alignment > 2) {
-      alignment = null;
-    }
-
-    this.data.textAlignment = alignment;
-    let maximumLength = (0, _core_utils.getInheritableProperty)({
-      dict,
-      key: "MaxLen"
-    });
-
-    if (!Number.isInteger(maximumLength) || maximumLength < 0) {
-      maximumLength = null;
-    }
-
-    this.data.maxLen = maximumLength;
-    this.data.multiLine = this.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE);
-    this.data.comb = this.hasFieldFlag(_util.AnnotationFieldFlag.COMB) && !this.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE) && !this.hasFieldFlag(_util.AnnotationFieldFlag.PASSWORD) && !this.hasFieldFlag(_util.AnnotationFieldFlag.FILESELECT) && this.data.maxLen !== null;
-  }
-
-  _getCombAppearance(defaultAppearance, text, width, hPadding, vPadding) {
-    const combWidth = (width / this.data.maxLen).toFixed(2);
-    const buf = [];
-
-    for (const character of text) {
-      buf.push(`(${(0, _util.escapeString)(character)}) Tj`);
-    }
-
-    const renderedComb = buf.join(` ${combWidth} 0 Td `);
-    return "/Tx BMC q BT " + defaultAppearance + ` 1 0 0 1 ${hPadding} ${vPadding} Tm ${renderedComb}` + " ET Q EMC";
-  }
-
-  _getMultilineAppearance(defaultAppearance, text, font, fontSize, width, height, alignment, hPadding, vPadding) {
-    const lines = text.split(/\r\n|\r|\n/);
-    const buf = [];
-    const totalWidth = width - 2 * hPadding;
-
-    for (const line of lines) {
-      const chunks = this._splitLine(line, font, fontSize, totalWidth);
-
-      for (const chunk of chunks) {
-        const padding = buf.length === 0 ? hPadding : 0;
-        buf.push(this._renderText(chunk, font, fontSize, width, alignment, padding, -fontSize));
-      }
-    }
-
-    const renderedText = buf.join("\n");
-    return "/Tx BMC q BT " + defaultAppearance + ` 1 0 0 1 0 ${height} Tm ${renderedText}` + " ET Q EMC";
-  }
-
-  _splitLine(line, font, fontSize, width) {
-    if (line.length <= 1) {
-      return [line];
-    }
-
-    const scale = fontSize / 1000;
-    const whitespace = font.charsToGlyphs(" ", true)[0].width * scale;
-    const chunks = [];
-    let lastSpacePos = -1,
-        startChunk = 0,
-        currentWidth = 0;
-
-    for (let i = 0, ii = line.length; i < ii; i++) {
-      const character = line.charAt(i);
-
-      if (character === " ") {
-        if (currentWidth + whitespace > width) {
-          chunks.push(line.substring(startChunk, i));
-          startChunk = i;
-          currentWidth = whitespace;
-          lastSpacePos = -1;
-        } else {
-          currentWidth += whitespace;
-          lastSpacePos = i;
-        }
-      } else {
-        const charWidth = font.charsToGlyphs(character, false)[0].width * scale;
-
-        if (currentWidth + charWidth > width) {
-          if (lastSpacePos !== -1) {
-            chunks.push(line.substring(startChunk, lastSpacePos + 1));
-            startChunk = i = lastSpacePos + 1;
-            lastSpacePos = -1;
-            currentWidth = 0;
-          } else {
-            chunks.push(line.substring(startChunk, i));
-            startChunk = i;
-            currentWidth = charWidth;
-          }
-        } else {
-          currentWidth += charWidth;
-        }
-      }
-    }
-
-    if (startChunk < line.length) {
-      chunks.push(line.substring(startChunk, line.length));
-    }
-
-    return chunks;
-  }
-
-}
-
-class ButtonWidgetAnnotation extends WidgetAnnotation {
-  constructor(params) {
-    super(params);
-    this.checkedAppearance = null;
-    this.uncheckedAppearance = null;
-    this.data.checkBox = !this.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !this.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
-    this.data.radioButton = this.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !this.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
-    this.data.pushButton = this.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
-
-    if (this.data.checkBox) {
-      this._processCheckBox(params);
-    } else if (this.data.radioButton) {
-      this._processRadioButton(params);
-    } else if (this.data.pushButton) {
-      this._processPushButton(params);
-    } else {
-      (0, _util.warn)("Invalid field flags for button widget annotation");
-    }
-  }
-
-  getOperatorList(evaluator, task, renderForms, annotationStorage) {
-    if (this.data.pushButton) {
-      return super.getOperatorList(evaluator, task, false, annotationStorage);
-    }
-
-    if (annotationStorage) {
-      const value = annotationStorage[this.data.id] || false;
-      let appearance;
-
-      if (value) {
-        appearance = this.checkedAppearance;
-      } else {
-        appearance = this.uncheckedAppearance;
-      }
-
-      if (appearance) {
-        const savedAppearance = this.appearance;
-        this.appearance = appearance;
-        const operatorList = super.getOperatorList(evaluator, task, renderForms, annotationStorage);
-        this.appearance = savedAppearance;
-        return operatorList;
-      }
-
-      return Promise.resolve(new _operator_list.OperatorList());
-    }
-
-    return super.getOperatorList(evaluator, task, renderForms, annotationStorage);
-  }
-
-  async save(evaluator, task, annotationStorage) {
-    if (this.data.checkBox) {
-      return this._saveCheckbox(evaluator, task, annotationStorage);
-    }
-
-    if (this.data.radioButton) {
-      return this._saveRadioButton(evaluator, task, annotationStorage);
-    }
-
-    return super.save(evaluator, task, annotationStorage);
-  }
-
-  async _saveCheckbox(evaluator, task, annotationStorage) {
-    const defaultValue = this.data.fieldValue && this.data.fieldValue !== "Off";
-    const value = annotationStorage[this.data.id];
-
-    if (defaultValue === value) {
-      return null;
-    }
-
-    const dict = evaluator.xref.fetchIfRef(this.ref);
-
-    if (!(0, _primitives.isDict)(dict)) {
-      return null;
-    }
-
-    const name = _primitives.Name.get(value ? this.data.exportValue : "Off");
-
-    dict.set("V", name);
-    dict.set("AS", name);
-    dict.set("M", `D:${(0, _util.getModificationDate)()}`);
-    const encrypt = evaluator.xref.encrypt;
-    let originalTransform = null;
-
-    if (encrypt) {
-      originalTransform = encrypt.createCipherTransform(this.ref.num, this.ref.gen);
-    }
-
-    const buffer = [`${this.ref.num} ${this.ref.gen} obj\n`];
-    (0, _writer.writeDict)(dict, buffer, originalTransform);
-    buffer.push("\nendobj\n");
-    return [{
-      ref: this.ref,
-      data: buffer.join("")
-    }];
-  }
-
-  async _saveRadioButton(evaluator, task, annotationStorage) {
-    const defaultValue = this.data.fieldValue === this.data.buttonValue;
-    const value = annotationStorage[this.data.id];
-
-    if (defaultValue === value) {
-      return null;
-    }
-
-    const dict = evaluator.xref.fetchIfRef(this.ref);
-
-    if (!(0, _primitives.isDict)(dict)) {
-      return null;
-    }
-
-    const name = _primitives.Name.get(value ? this.data.buttonValue : "Off");
-
-    let parentBuffer = null;
-    const encrypt = evaluator.xref.encrypt;
-
-    if (value) {
-      if ((0, _primitives.isRef)(this.parent)) {
-        const parent = evaluator.xref.fetch(this.parent);
-        let parentTransform = null;
-
-        if (encrypt) {
-          parentTransform = encrypt.createCipherTransform(this.parent.num, this.parent.gen);
-        }
-
-        parent.set("V", name);
-        parentBuffer = [`${this.parent.num} ${this.parent.gen} obj\n`];
-        (0, _writer.writeDict)(parent, parentBuffer, parentTransform);
-        parentBuffer.push("\nendobj\n");
-      } else if ((0, _primitives.isDict)(this.parent)) {
-        this.parent.set("V", name);
-      }
-    }
-
-    dict.set("AS", name);
-    dict.set("M", `D:${(0, _util.getModificationDate)()}`);
-    let originalTransform = null;
-
-    if (encrypt) {
-      originalTransform = encrypt.createCipherTransform(this.ref.num, this.ref.gen);
-    }
-
-    const buffer = [`${this.ref.num} ${this.ref.gen} obj\n`];
-    (0, _writer.writeDict)(dict, buffer, originalTransform);
-    buffer.push("\nendobj\n");
-    const newRefs = [{
-      ref: this.ref,
-      data: buffer.join("")
-    }];
-
-    if (parentBuffer !== null) {
-      newRefs.push({
-        ref: this.parent,
-        data: parentBuffer.join("")
-      });
-    }
-
-    return newRefs;
-  }
-
-  _processCheckBox(params) {
-    const customAppearance = params.dict.get("AP");
-
-    if (!(0, _primitives.isDict)(customAppearance)) {
-      return;
-    }
-
-    const normalAppearance = customAppearance.get("N");
-
-    if (!(0, _primitives.isDict)(normalAppearance)) {
-      return;
-    }
-
-    const exportValues = normalAppearance.getKeys();
-
-    if (!exportValues.includes("Off")) {
-      exportValues.push("Off");
-    }
-
-    if (exportValues.length !== 2) {
-      return;
-    }
-
-    this.data.exportValue = exportValues[0] === "Off" ? exportValues[1] : exportValues[0];
-    this.checkedAppearance = normalAppearance.get(this.data.exportValue);
-    this.uncheckedAppearance = normalAppearance.get("Off") || null;
-  }
-
-  _processRadioButton(params) {
-    this.data.fieldValue = this.data.buttonValue = null;
-    const fieldParent = params.dict.get("Parent");
-
-    if ((0, _primitives.isDict)(fieldParent) && fieldParent.has("V")) {
-      const fieldParentValue = fieldParent.get("V");
-
-      if ((0, _primitives.isName)(fieldParentValue)) {
-        this.parent = params.dict.getRaw("Parent");
-        this.data.fieldValue = this._decodeFormValue(fieldParentValue);
-      }
-    }
-
-    const appearanceStates = params.dict.get("AP");
-
-    if (!(0, _primitives.isDict)(appearanceStates)) {
-      return;
-    }
-
-    const normalAppearance = appearanceStates.get("N");
-
-    if (!(0, _primitives.isDict)(normalAppearance)) {
-      return;
-    }
-
-    for (const key of normalAppearance.getKeys()) {
-      if (key !== "Off") {
-        this.data.buttonValue = key;
-        break;
-      }
-    }
-
-    this.checkedAppearance = normalAppearance.get(this.data.buttonValue);
-    this.uncheckedAppearance = normalAppearance.get("Off") || null;
-  }
-
-  _processPushButton(params) {
-    if (!params.dict.has("A")) {
-      (0, _util.warn)("Push buttons without action dictionaries are not supported");
-      return;
-    }
-
-    _obj.Catalog.parseDestDictionary({
-      destDict: params.dict,
-      resultObj: this.data,
-      docBaseUrl: params.pdfManager.docBaseUrl
-    });
-  }
-
-}
-
-class ChoiceWidgetAnnotation extends WidgetAnnotation {
-  constructor(params) {
-    super(params);
-    this.data.options = [];
-    const options = (0, _core_utils.getInheritableProperty)({
-      dict: params.dict,
-      key: "Opt"
-    });
-
-    if (Array.isArray(options)) {
-      const xref = params.xref;
-
-      for (let i = 0, ii = options.length; i < ii; i++) {
-        const option = xref.fetchIfRef(options[i]);
-        const isOptionArray = Array.isArray(option);
-        this.data.options[i] = {
-          exportValue: this._decodeFormValue(isOptionArray ? xref.fetchIfRef(option[0]) : option),
-          displayValue: this._decodeFormValue(isOptionArray ? xref.fetchIfRef(option[1]) : option)
-        };
-      }
-    }
-
-    if ((0, _util.isString)(this.data.fieldValue)) {
-      this.data.fieldValue = [this.data.fieldValue];
-    } else if (!this.data.fieldValue) {
-      this.data.fieldValue = [];
-    }
-
-    this.data.combo = this.hasFieldFlag(_util.AnnotationFieldFlag.COMBO);
-    this.data.multiSelect = this.hasFieldFlag(_util.AnnotationFieldFlag.MULTISELECT);
-    this._hasText = true;
-  }
-
-}
-
-class TextAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    const DEFAULT_ICON_SIZE = 22;
-    super(parameters);
-    const dict = parameters.dict;
-    this.data.annotationType = _util.AnnotationType.TEXT;
-
-    if (this.data.hasAppearance) {
-      this.data.name = "NoIcon";
-    } else {
-      this.data.rect[1] = this.data.rect[3] - DEFAULT_ICON_SIZE;
-      this.data.rect[2] = this.data.rect[0] + DEFAULT_ICON_SIZE;
-      this.data.name = dict.has("Name") ? dict.get("Name").name : "Note";
-    }
-
-    if (dict.has("State")) {
-      this.data.state = dict.get("State") || null;
-      this.data.stateModel = dict.get("StateModel") || null;
-    } else {
-      this.data.state = null;
-      this.data.stateModel = null;
-    }
-  }
-
-}
-
-class LinkAnnotation extends Annotation {
-  constructor(params) {
-    super(params);
-    this.data.annotationType = _util.AnnotationType.LINK;
-    const quadPoints = getQuadPoints(params.dict, this.rectangle);
-
-    if (quadPoints) {
-      this.data.quadPoints = quadPoints;
-    }
-
-    _obj.Catalog.parseDestDictionary({
-      destDict: params.dict,
-      resultObj: this.data,
-      docBaseUrl: params.pdfManager.docBaseUrl
-    });
-  }
-
-}
-
-class PopupAnnotation extends Annotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.POPUP;
-    let parentItem = parameters.dict.get("Parent");
-
-    if (!parentItem) {
-      (0, _util.warn)("Popup annotation has a missing or invalid parent annotation.");
-      return;
-    }
-
-    const parentSubtype = parentItem.get("Subtype");
-    this.data.parentType = (0, _primitives.isName)(parentSubtype) ? parentSubtype.name : null;
-    const rawParent = parameters.dict.getRaw("Parent");
-    this.data.parentId = (0, _primitives.isRef)(rawParent) ? rawParent.toString() : null;
-    const rt = parentItem.get("RT");
-
-    if ((0, _primitives.isName)(rt, _util.AnnotationReplyType.GROUP)) {
-      parentItem = parentItem.get("IRT");
-    }
-
-    if (!parentItem.has("M")) {
-      this.data.modificationDate = null;
-    } else {
-      this.setModificationDate(parentItem.get("M"));
-      this.data.modificationDate = this.modificationDate;
-    }
-
-    if (!parentItem.has("C")) {
-      this.data.color = null;
-    } else {
-      this.setColor(parentItem.getArray("C"));
-      this.data.color = this.color;
-    }
-
-    if (!this.viewable) {
-      const parentFlags = parentItem.get("F");
-
-      if (this._isViewable(parentFlags)) {
-        this.setFlags(parentFlags);
-      }
-    }
-
-    this.data.title = (0, _util.stringToPDFString)(parentItem.get("T") || "");
-    this.data.contents = (0, _util.stringToPDFString)(parentItem.get("Contents") || "");
-  }
-
-}
-
-class FreeTextAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.FREETEXT;
-  }
-
-}
-
-class LineAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.LINE;
-    this.data.lineCoordinates = _util.Util.normalizeRect(parameters.dict.getArray("L"));
-  }
-
-}
-
-class SquareAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.SQUARE;
-  }
-
-}
-
-class CircleAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.CIRCLE;
-  }
-
-}
-
-class PolylineAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.POLYLINE;
-    const rawVertices = parameters.dict.getArray("Vertices");
-    this.data.vertices = [];
-
-    for (let i = 0, ii = rawVertices.length; i < ii; i += 2) {
-      this.data.vertices.push({
-        x: rawVertices[i],
-        y: rawVertices[i + 1]
-      });
-    }
-  }
-
-}
-
-class PolygonAnnotation extends PolylineAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.POLYGON;
-  }
-
-}
-
-class CaretAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.CARET;
-  }
-
-}
-
-class InkAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.INK;
-    const xref = parameters.xref;
-    const originalInkLists = parameters.dict.getArray("InkList");
-    this.data.inkLists = [];
-
-    for (let i = 0, ii = originalInkLists.length; i < ii; ++i) {
-      this.data.inkLists.push([]);
-
-      for (let j = 0, jj = originalInkLists[i].length; j < jj; j += 2) {
-        this.data.inkLists[i].push({
-          x: xref.fetchIfRef(originalInkLists[i][j]),
-          y: xref.fetchIfRef(originalInkLists[i][j + 1])
-        });
-      }
-    }
-  }
-
-}
-
-class HighlightAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.HIGHLIGHT;
-    const quadPoints = getQuadPoints(parameters.dict, this.rectangle);
-
-    if (quadPoints) {
-      this.data.quadPoints = quadPoints;
-    }
-  }
-
-}
-
-class UnderlineAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.UNDERLINE;
-    const quadPoints = getQuadPoints(parameters.dict, this.rectangle);
-
-    if (quadPoints) {
-      this.data.quadPoints = quadPoints;
-    }
-  }
-
-}
-
-class SquigglyAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.SQUIGGLY;
-    const quadPoints = getQuadPoints(parameters.dict, this.rectangle);
-
-    if (quadPoints) {
-      this.data.quadPoints = quadPoints;
-    }
-  }
-
-}
-
-class StrikeOutAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.STRIKEOUT;
-    const quadPoints = getQuadPoints(parameters.dict, this.rectangle);
-
-    if (quadPoints) {
-      this.data.quadPoints = quadPoints;
-    }
-  }
-
-}
-
-class StampAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    this.data.annotationType = _util.AnnotationType.STAMP;
-  }
-
-}
-
-class FileAttachmentAnnotation extends MarkupAnnotation {
-  constructor(parameters) {
-    super(parameters);
-    const file = new _obj.FileSpec(parameters.dict.get("FS"), parameters.xref);
-    this.data.annotationType = _util.AnnotationType.FILEATTACHMENT;
-    this.data.file = file.serializable;
-  }
-
-}
-
-/***/ }),
-/* 26 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.OperatorList = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var QueueOptimizer = function QueueOptimizerClosure() {
-  function addState(parentState, pattern, checkFn, iterateFn, processFn) {
-    var state = parentState;
-
-    for (var i = 0, ii = pattern.length - 1; i < ii; i++) {
-      var item = pattern[i];
-      state = state[item] || (state[item] = []);
-    }
-
-    state[pattern[pattern.length - 1]] = {
-      checkFn,
-      iterateFn,
-      processFn
-    };
-  }
-
-  function handlePaintSolidColorImageMask(iFirstSave, count, fnArray, argsArray) {
-    var iFirstPIMXO = iFirstSave + 2;
-
-    for (var i = 0; i < count; i++) {
-      var arg = argsArray[iFirstPIMXO + 4 * i];
-      var imageMask = arg.length === 1 && arg[0];
-
-      if (imageMask && imageMask.width === 1 && imageMask.height === 1 && (!imageMask.data.length || imageMask.data.length === 1 && imageMask.data[0] === 0)) {
-        fnArray[iFirstPIMXO + 4 * i] = _util.OPS.paintSolidColorImageMask;
-        continue;
-      }
-
-      break;
-    }
-
-    return count - i;
-  }
-
-  var InitialState = [];
-  addState(InitialState, [_util.OPS.save, _util.OPS.transform, _util.OPS.paintInlineImageXObject, _util.OPS.restore], null, function iterateInlineImageGroup(context, i) {
-    var fnArray = context.fnArray;
-    var iFirstSave = context.iCurr - 3;
-    var pos = (i - iFirstSave) % 4;
-
-    switch (pos) {
-      case 0:
-        return fnArray[i] === _util.OPS.save;
-
-      case 1:
-        return fnArray[i] === _util.OPS.transform;
-
-      case 2:
-        return fnArray[i] === _util.OPS.paintInlineImageXObject;
-
-      case 3:
-        return fnArray[i] === _util.OPS.restore;
-    }
-
-    throw new Error(`iterateInlineImageGroup - invalid pos: ${pos}`);
-  }, function foundInlineImageGroup(context, i) {
-    var MIN_IMAGES_IN_INLINE_IMAGES_BLOCK = 10;
-    var MAX_IMAGES_IN_INLINE_IMAGES_BLOCK = 200;
-    var MAX_WIDTH = 1000;
-    var IMAGE_PADDING = 1;
-    var fnArray = context.fnArray,
-        argsArray = context.argsArray;
-    var curr = context.iCurr;
-    var iFirstSave = curr - 3;
-    var iFirstTransform = curr - 2;
-    var iFirstPIIXO = curr - 1;
-    var count = Math.min(Math.floor((i - iFirstSave) / 4), MAX_IMAGES_IN_INLINE_IMAGES_BLOCK);
-
-    if (count < MIN_IMAGES_IN_INLINE_IMAGES_BLOCK) {
-      return i - (i - iFirstSave) % 4;
-    }
-
-    var maxX = 0;
-    var map = [],
-        maxLineHeight = 0;
-    var currentX = IMAGE_PADDING,
-        currentY = IMAGE_PADDING;
-    var q;
-
-    for (q = 0; q < count; q++) {
-      var transform = argsArray[iFirstTransform + (q << 2)];
-      var img = argsArray[iFirstPIIXO + (q << 2)][0];
-
-      if (currentX + img.width > MAX_WIDTH) {
-        maxX = Math.max(maxX, currentX);
-        currentY += maxLineHeight + 2 * IMAGE_PADDING;
-        currentX = 0;
-        maxLineHeight = 0;
-      }
-
-      map.push({
-        transform,
-        x: currentX,
-        y: currentY,
-        w: img.width,
-        h: img.height
-      });
-      currentX += img.width + 2 * IMAGE_PADDING;
-      maxLineHeight = Math.max(maxLineHeight, img.height);
-    }
-
-    var imgWidth = Math.max(maxX, currentX) + IMAGE_PADDING;
-    var imgHeight = currentY + maxLineHeight + IMAGE_PADDING;
-    var imgData = new Uint8ClampedArray(imgWidth * imgHeight * 4);
-    var imgRowSize = imgWidth << 2;
-
-    for (q = 0; q < count; q++) {
-      var data = argsArray[iFirstPIIXO + (q << 2)][0].data;
-      var rowSize = map[q].w << 2;
-      var dataOffset = 0;
-      var offset = map[q].x + map[q].y * imgWidth << 2;
-      imgData.set(data.subarray(0, rowSize), offset - imgRowSize);
-
-      for (var k = 0, kk = map[q].h; k < kk; k++) {
-        imgData.set(data.subarray(dataOffset, dataOffset + rowSize), offset);
-        dataOffset += rowSize;
-        offset += imgRowSize;
-      }
-
-      imgData.set(data.subarray(dataOffset - rowSize, dataOffset), offset);
-
-      while (offset >= 0) {
-        data[offset - 4] = data[offset];
-        data[offset - 3] = data[offset + 1];
-        data[offset - 2] = data[offset + 2];
-        data[offset - 1] = data[offset + 3];
-        data[offset + rowSize] = data[offset + rowSize - 4];
-        data[offset + rowSize + 1] = data[offset + rowSize - 3];
-        data[offset + rowSize + 2] = data[offset + rowSize - 2];
-        data[offset + rowSize + 3] = data[offset + rowSize - 1];
-        offset -= imgRowSize;
-      }
-    }
-
-    fnArray.splice(iFirstSave, count * 4, _util.OPS.paintInlineImageXObjectGroup);
-    argsArray.splice(iFirstSave, count * 4, [{
-      width: imgWidth,
-      height: imgHeight,
-      kind: _util.ImageKind.RGBA_32BPP,
-      data: imgData
-    }, map]);
-    return iFirstSave + 1;
-  });
-  addState(InitialState, [_util.OPS.save, _util.OPS.transform, _util.OPS.paintImageMaskXObject, _util.OPS.restore], null, function iterateImageMaskGroup(context, i) {
-    var fnArray = context.fnArray;
-    var iFirstSave = context.iCurr - 3;
-    var pos = (i - iFirstSave) % 4;
-
-    switch (pos) {
-      case 0:
-        return fnArray[i] === _util.OPS.save;
-
-      case 1:
-        return fnArray[i] === _util.OPS.transform;
-
-      case 2:
-        return fnArray[i] === _util.OPS.paintImageMaskXObject;
-
-      case 3:
-        return fnArray[i] === _util.OPS.restore;
-    }
-
-    throw new Error(`iterateImageMaskGroup - invalid pos: ${pos}`);
-  }, function foundImageMaskGroup(context, i) {
-    var MIN_IMAGES_IN_MASKS_BLOCK = 10;
-    var MAX_IMAGES_IN_MASKS_BLOCK = 100;
-    var MAX_SAME_IMAGES_IN_MASKS_BLOCK = 1000;
-    var fnArray = context.fnArray,
-        argsArray = context.argsArray;
-    var curr = context.iCurr;
-    var iFirstSave = curr - 3;
-    var iFirstTransform = curr - 2;
-    var iFirstPIMXO = curr - 1;
-    var count = Math.floor((i - iFirstSave) / 4);
-    count = handlePaintSolidColorImageMask(iFirstSave, count, fnArray, argsArray);
-
-    if (count < MIN_IMAGES_IN_MASKS_BLOCK) {
-      return i - (i - iFirstSave) % 4;
-    }
-
-    var q;
-    var isSameImage = false;
-    var iTransform, transformArgs;
-    var firstPIMXOArg0 = argsArray[iFirstPIMXO][0];
-    const firstTransformArg0 = argsArray[iFirstTransform][0],
-          firstTransformArg1 = argsArray[iFirstTransform][1],
-          firstTransformArg2 = argsArray[iFirstTransform][2],
-          firstTransformArg3 = argsArray[iFirstTransform][3];
-
-    if (firstTransformArg1 === firstTransformArg2) {
-      isSameImage = true;
-      iTransform = iFirstTransform + 4;
-      var iPIMXO = iFirstPIMXO + 4;
-
-      for (q = 1; q < count; q++, iTransform += 4, iPIMXO += 4) {
-        transformArgs = argsArray[iTransform];
-
-        if (argsArray[iPIMXO][0] !== firstPIMXOArg0 || transformArgs[0] !== firstTransformArg0 || transformArgs[1] !== firstTransformArg1 || transformArgs[2] !== firstTransformArg2 || transformArgs[3] !== firstTransformArg3) {
-          if (q < MIN_IMAGES_IN_MASKS_BLOCK) {
-            isSameImage = false;
-          } else {
-            count = q;
-          }
-
-          break;
-        }
-      }
-    }
-
-    if (isSameImage) {
-      count = Math.min(count, MAX_SAME_IMAGES_IN_MASKS_BLOCK);
-      var positions = new Float32Array(count * 2);
-      iTransform = iFirstTransform;
-
-      for (q = 0; q < count; q++, iTransform += 4) {
-        transformArgs = argsArray[iTransform];
-        positions[q << 1] = transformArgs[4];
-        positions[(q << 1) + 1] = transformArgs[5];
-      }
-
-      fnArray.splice(iFirstSave, count * 4, _util.OPS.paintImageMaskXObjectRepeat);
-      argsArray.splice(iFirstSave, count * 4, [firstPIMXOArg0, firstTransformArg0, firstTransformArg1, firstTransformArg2, firstTransformArg3, positions]);
-    } else {
-      count = Math.min(count, MAX_IMAGES_IN_MASKS_BLOCK);
-      var images = [];
-
-      for (q = 0; q < count; q++) {
-        transformArgs = argsArray[iFirstTransform + (q << 2)];
-        var maskParams = argsArray[iFirstPIMXO + (q << 2)][0];
-        images.push({
-          data: maskParams.data,
-          width: maskParams.width,
-          height: maskParams.height,
-          transform: transformArgs
-        });
-      }
-
-      fnArray.splice(iFirstSave, count * 4, _util.OPS.paintImageMaskXObjectGroup);
-      argsArray.splice(iFirstSave, count * 4, [images]);
-    }
-
-    return iFirstSave + 1;
-  });
-  addState(InitialState, [_util.OPS.save, _util.OPS.transform, _util.OPS.paintImageXObject, _util.OPS.restore], function (context) {
-    var argsArray = context.argsArray;
-    var iFirstTransform = context.iCurr - 2;
-    return argsArray[iFirstTransform][1] === 0 && argsArray[iFirstTransform][2] === 0;
-  }, function iterateImageGroup(context, i) {
-    var fnArray = context.fnArray,
-        argsArray = context.argsArray;
-    var iFirstSave = context.iCurr - 3;
-    var pos = (i - iFirstSave) % 4;
-
-    switch (pos) {
-      case 0:
-        return fnArray[i] === _util.OPS.save;
-
-      case 1:
-        if (fnArray[i] !== _util.OPS.transform) {
-          return false;
-        }
-
-        var iFirstTransform = context.iCurr - 2;
-        var firstTransformArg0 = argsArray[iFirstTransform][0];
-        var firstTransformArg3 = argsArray[iFirstTransform][3];
-
-        if (argsArray[i][0] !== firstTransformArg0 || argsArray[i][1] !== 0 || argsArray[i][2] !== 0 || argsArray[i][3] !== firstTransformArg3) {
-          return false;
-        }
-
-        return true;
-
-      case 2:
-        if (fnArray[i] !== _util.OPS.paintImageXObject) {
-          return false;
-        }
-
-        var iFirstPIXO = context.iCurr - 1;
-        var firstPIXOArg0 = argsArray[iFirstPIXO][0];
-
-        if (argsArray[i][0] !== firstPIXOArg0) {
-          return false;
-        }
-
-        return true;
-
-      case 3:
-        return fnArray[i] === _util.OPS.restore;
-    }
-
-    throw new Error(`iterateImageGroup - invalid pos: ${pos}`);
-  }, function (context, i) {
-    var MIN_IMAGES_IN_BLOCK = 3;
-    var MAX_IMAGES_IN_BLOCK = 1000;
-    var fnArray = context.fnArray,
-        argsArray = context.argsArray;
-    var curr = context.iCurr;
-    var iFirstSave = curr - 3;
-    var iFirstTransform = curr - 2;
-    var iFirstPIXO = curr - 1;
-    var firstPIXOArg0 = argsArray[iFirstPIXO][0];
-    var firstTransformArg0 = argsArray[iFirstTransform][0];
-    var firstTransformArg3 = argsArray[iFirstTransform][3];
-    var count = Math.min(Math.floor((i - iFirstSave) / 4), MAX_IMAGES_IN_BLOCK);
-
-    if (count < MIN_IMAGES_IN_BLOCK) {
-      return i - (i - iFirstSave) % 4;
-    }
-
-    var positions = new Float32Array(count * 2);
-    var iTransform = iFirstTransform;
-
-    for (var q = 0; q < count; q++, iTransform += 4) {
-      var transformArgs = argsArray[iTransform];
-      positions[q << 1] = transformArgs[4];
-      positions[(q << 1) + 1] = transformArgs[5];
-    }
-
-    var args = [firstPIXOArg0, firstTransformArg0, firstTransformArg3, positions];
-    fnArray.splice(iFirstSave, count * 4, _util.OPS.paintImageXObjectRepeat);
-    argsArray.splice(iFirstSave, count * 4, args);
-    return iFirstSave + 1;
-  });
-  addState(InitialState, [_util.OPS.beginText, _util.OPS.setFont, _util.OPS.setTextMatrix, _util.OPS.showText, _util.OPS.endText], null, function iterateShowTextGroup(context, i) {
-    var fnArray = context.fnArray,
-        argsArray = context.argsArray;
-    var iFirstSave = context.iCurr - 4;
-    var pos = (i - iFirstSave) % 5;
-
-    switch (pos) {
-      case 0:
-        return fnArray[i] === _util.OPS.beginText;
-
-      case 1:
-        return fnArray[i] === _util.OPS.setFont;
-
-      case 2:
-        return fnArray[i] === _util.OPS.setTextMatrix;
-
-      case 3:
-        if (fnArray[i] !== _util.OPS.showText) {
-          return false;
-        }
-
-        var iFirstSetFont = context.iCurr - 3;
-        var firstSetFontArg0 = argsArray[iFirstSetFont][0];
-        var firstSetFontArg1 = argsArray[iFirstSetFont][1];
-
-        if (argsArray[i][0] !== firstSetFontArg0 || argsArray[i][1] !== firstSetFontArg1) {
-          return false;
-        }
-
-        return true;
-
-      case 4:
-        return fnArray[i] === _util.OPS.endText;
-    }
-
-    throw new Error(`iterateShowTextGroup - invalid pos: ${pos}`);
-  }, function (context, i) {
-    var MIN_CHARS_IN_BLOCK = 3;
-    var MAX_CHARS_IN_BLOCK = 1000;
-    var fnArray = context.fnArray,
-        argsArray = context.argsArray;
-    var curr = context.iCurr;
-    var iFirstBeginText = curr - 4;
-    var iFirstSetFont = curr - 3;
-    var iFirstSetTextMatrix = curr - 2;
-    var iFirstShowText = curr - 1;
-    var iFirstEndText = curr;
-    var firstSetFontArg0 = argsArray[iFirstSetFont][0];
-    var firstSetFontArg1 = argsArray[iFirstSetFont][1];
-    var count = Math.min(Math.floor((i - iFirstBeginText) / 5), MAX_CHARS_IN_BLOCK);
-
-    if (count < MIN_CHARS_IN_BLOCK) {
-      return i - (i - iFirstBeginText) % 5;
-    }
-
-    var iFirst = iFirstBeginText;
-
-    if (iFirstBeginText >= 4 && fnArray[iFirstBeginText - 4] === fnArray[iFirstSetFont] && fnArray[iFirstBeginText - 3] === fnArray[iFirstSetTextMatrix] && fnArray[iFirstBeginText - 2] === fnArray[iFirstShowText] && fnArray[iFirstBeginText - 1] === fnArray[iFirstEndText] && argsArray[iFirstBeginText - 4][0] === firstSetFontArg0 && argsArray[iFirstBeginText - 4][1] === firstSetFontArg1) {
-      count++;
-      iFirst -= 5;
-    }
-
-    var iEndText = iFirst + 4;
-
-    for (var q = 1; q < count; q++) {
-      fnArray.splice(iEndText, 3);
-      argsArray.splice(iEndText, 3);
-      iEndText += 2;
-    }
-
-    return iEndText + 1;
-  });
-
-  function QueueOptimizer(queue) {
-    this.queue = queue;
-    this.state = null;
-    this.context = {
-      iCurr: 0,
-      fnArray: queue.fnArray,
-      argsArray: queue.argsArray
-    };
-    this.match = null;
-    this.lastProcessed = 0;
-  }
-
-  QueueOptimizer.prototype = {
-    _optimize() {
-      const fnArray = this.queue.fnArray;
-      let i = this.lastProcessed,
-          ii = fnArray.length;
-      let state = this.state;
-      let match = this.match;
-
-      if (!state && !match && i + 1 === ii && !InitialState[fnArray[i]]) {
-        this.lastProcessed = ii;
-        return;
-      }
-
-      const context = this.context;
-
-      while (i < ii) {
-        if (match) {
-          const iterate = (0, match.iterateFn)(context, i);
-
-          if (iterate) {
-            i++;
-            continue;
-          }
-
-          i = (0, match.processFn)(context, i + 1);
-          ii = fnArray.length;
-          match = null;
-          state = null;
-
-          if (i >= ii) {
-            break;
-          }
-        }
-
-        state = (state || InitialState)[fnArray[i]];
-
-        if (!state || Array.isArray(state)) {
-          i++;
-          continue;
-        }
-
-        context.iCurr = i;
-        i++;
-
-        if (state.checkFn && !(0, state.checkFn)(context)) {
-          state = null;
-          continue;
-        }
-
-        match = state;
-        state = null;
-      }
-
-      this.state = state;
-      this.match = match;
-      this.lastProcessed = i;
-    },
-
-    push(fn, args) {
-      this.queue.fnArray.push(fn);
-      this.queue.argsArray.push(args);
-
-      this._optimize();
-    },
-
-    flush() {
-      while (this.match) {
-        const length = this.queue.fnArray.length;
-        this.lastProcessed = (0, this.match.processFn)(this.context, length);
-        this.match = null;
-        this.state = null;
-
-        this._optimize();
-      }
-    },
-
-    reset() {
-      this.state = null;
-      this.match = null;
-      this.lastProcessed = 0;
-    }
-
-  };
-  return QueueOptimizer;
-}();
-
-var NullOptimizer = function NullOptimizerClosure() {
-  function NullOptimizer(queue) {
-    this.queue = queue;
-  }
-
-  NullOptimizer.prototype = {
-    push(fn, args) {
-      this.queue.fnArray.push(fn);
-      this.queue.argsArray.push(args);
-    },
-
-    flush() {},
-
-    reset() {}
-
-  };
-  return NullOptimizer;
-}();
-
-var OperatorList = function OperatorListClosure() {
-  var CHUNK_SIZE = 1000;
-  var CHUNK_SIZE_ABOUT = CHUNK_SIZE - 5;
-
-  function OperatorList(intent, streamSink) {
-    this._streamSink = streamSink;
-    this.fnArray = [];
-    this.argsArray = [];
-
-    if (streamSink && intent !== "oplist") {
-      this.optimizer = new QueueOptimizer(this);
-    } else {
-      this.optimizer = new NullOptimizer(this);
-    }
-
-    this.dependencies = new Set();
-    this._totalLength = 0;
-    this.weight = 0;
-    this._resolved = streamSink ? null : Promise.resolve();
-  }
-
-  OperatorList.prototype = {
-    get length() {
-      return this.argsArray.length;
-    },
-
-    get ready() {
-      return this._resolved || this._streamSink.ready;
-    },
-
-    get totalLength() {
-      return this._totalLength + this.length;
-    },
-
-    addOp(fn, args) {
-      this.optimizer.push(fn, args);
-      this.weight++;
-
-      if (this._streamSink) {
-        if (this.weight >= CHUNK_SIZE) {
-          this.flush();
-        } else if (this.weight >= CHUNK_SIZE_ABOUT && (fn === _util.OPS.restore || fn === _util.OPS.endText)) {
-          this.flush();
-        }
-      }
-    },
-
-    addDependency(dependency) {
-      if (this.dependencies.has(dependency)) {
-        return;
-      }
-
-      this.dependencies.add(dependency);
-      this.addOp(_util.OPS.dependency, [dependency]);
-    },
-
-    addDependencies(dependencies) {
-      for (const dependency of dependencies) {
-        this.addDependency(dependency);
-      }
-    },
-
-    addOpList(opList) {
-      if (!(opList instanceof OperatorList)) {
-        (0, _util.warn)('addOpList - ignoring invalid "opList" parameter.');
-        return;
-      }
-
-      for (const dependency of opList.dependencies) {
-        this.dependencies.add(dependency);
-      }
-
-      for (var i = 0, ii = opList.length; i < ii; i++) {
-        this.addOp(opList.fnArray[i], opList.argsArray[i]);
-      }
-    },
-
-    getIR() {
-      return {
-        fnArray: this.fnArray,
-        argsArray: this.argsArray,
-        length: this.length
-      };
-    },
-
-    get _transfers() {
-      const transfers = [];
-      const {
-        fnArray,
-        argsArray,
-        length
-      } = this;
-
-      for (let i = 0; i < length; i++) {
-        switch (fnArray[i]) {
-          case _util.OPS.paintInlineImageXObject:
-          case _util.OPS.paintInlineImageXObjectGroup:
-          case _util.OPS.paintImageMaskXObject:
-            const arg = argsArray[i][0];
-            ;
-
-            if (!arg.cached) {
-              transfers.push(arg.data.buffer);
-            }
-
-            break;
-        }
-      }
-
-      return transfers;
-    },
-
-    flush(lastChunk = false) {
-      this.optimizer.flush();
-      const length = this.length;
-      this._totalLength += length;
-
-      this._streamSink.enqueue({
-        fnArray: this.fnArray,
-        argsArray: this.argsArray,
-        lastChunk,
-        length
-      }, 1, this._transfers);
-
-      this.dependencies.clear();
-      this.fnArray.length = 0;
-      this.argsArray.length = 0;
-      this.weight = 0;
-      this.optimizer.reset();
-    }
-
-  };
-  return OperatorList;
-}();
-
-exports.OperatorList = OperatorList;
-
-/***/ }),
-/* 27 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.writeDict = writeDict;
-exports.incrementalUpdate = incrementalUpdate;
-
-var _util = __w_pdfjs_require__(2);
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _crypto = __w_pdfjs_require__(22);
-
-function writeDict(dict, buffer, transform) {
-  buffer.push("<<");
-
-  for (const key of dict.getKeys()) {
-    buffer.push(` /${key} `);
-    writeValue(dict.getRaw(key), buffer, transform);
-  }
-
-  buffer.push(">>");
-}
-
-function writeStream(stream, buffer, transform) {
-  writeDict(stream.dict, buffer, transform);
-  buffer.push(" stream\n");
-  let string = (0, _util.bytesToString)(stream.getBytes());
-
-  if (transform !== null) {
-    string = transform.encryptString(string);
-  }
-
-  buffer.push(string);
-  buffer.push("\nendstream\n");
-}
-
-function writeArray(array, buffer, transform) {
-  buffer.push("[");
-  let first = true;
-
-  for (const val of array) {
-    if (!first) {
-      buffer.push(" ");
-    } else {
-      first = false;
-    }
-
-    writeValue(val, buffer, transform);
-  }
-
-  buffer.push("]");
-}
-
-function numberToString(value) {
-  if (Number.isInteger(value)) {
-    return value.toString();
-  }
-
-  const roundedValue = Math.round(value * 100);
-
-  if (roundedValue % 100 === 0) {
-    return (roundedValue / 100).toString();
-  }
-
-  if (roundedValue % 10 === 0) {
-    return value.toFixed(1);
-  }
-
-  return value.toFixed(2);
-}
-
-function writeValue(value, buffer, transform) {
-  if ((0, _primitives.isName)(value)) {
-    buffer.push(`/${value.name}`);
-  } else if ((0, _primitives.isRef)(value)) {
-    buffer.push(`${value.num} ${value.gen} R`);
-  } else if (Array.isArray(value)) {
-    writeArray(value, buffer, transform);
-  } else if (typeof value === "string") {
-    if (transform !== null) {
-      value = transform.encryptString(value);
-    }
-
-    buffer.push(`(${(0, _util.escapeString)(value)})`);
-  } else if (typeof value === "number") {
-    buffer.push(numberToString(value));
-  } else if ((0, _primitives.isDict)(value)) {
-    writeDict(value, buffer, transform);
-  } else if ((0, _primitives.isStream)(value)) {
-    writeStream(value, buffer, transform);
-  }
-}
-
-function writeInt(number, size, offset, buffer) {
-  for (let i = size + offset - 1; i > offset - 1; i--) {
-    buffer[i] = number & 0xff;
-    number >>= 8;
-  }
-
-  return offset + size;
-}
-
-function writeString(string, offset, buffer) {
-  for (let i = 0, len = string.length; i < len; i++) {
-    buffer[offset + i] = string.charCodeAt(i) & 0xff;
-  }
-}
-
-function computeMD5(filesize, xrefInfo) {
-  const time = Math.floor(Date.now() / 1000);
-  const filename = xrefInfo.filename || "";
-  const md5Buffer = [time.toString(), filename, filesize.toString()];
-  let md5BufferLen = md5Buffer.reduce((a, str) => a + str.length, 0);
-
-  for (const value of Object.values(xrefInfo.info)) {
-    md5Buffer.push(value);
-    md5BufferLen += value.length;
-  }
-
-  const array = new Uint8Array(md5BufferLen);
-  let offset = 0;
-
-  for (const str of md5Buffer) {
-    writeString(str, offset, array);
-    offset += str.length;
-  }
-
-  return (0, _util.bytesToString)((0, _crypto.calculateMD5)(array));
-}
-
-function incrementalUpdate(originalData, xrefInfo, newRefs) {
-  const newXref = new _primitives.Dict(null);
-  const refForXrefTable = xrefInfo.newRef;
-  let buffer, baseOffset;
-  const lastByte = originalData[originalData.length - 1];
-
-  if (lastByte === 0x0a || lastByte === 0x0d) {
-    buffer = [];
-    baseOffset = originalData.length;
-  } else {
-    buffer = ["\n"];
-    baseOffset = originalData.length + 1;
-  }
-
-  newXref.set("Size", refForXrefTable.num + 1);
-  newXref.set("Prev", xrefInfo.startXRef);
-  newXref.set("Type", _primitives.Name.get("XRef"));
-
-  if (xrefInfo.rootRef !== null) {
-    newXref.set("Root", xrefInfo.rootRef);
-  }
-
-  if (xrefInfo.infoRef !== null) {
-    newXref.set("Info", xrefInfo.infoRef);
-  }
-
-  if (xrefInfo.encrypt !== null) {
-    newXref.set("Encrypt", xrefInfo.encrypt);
-  }
-
-  newRefs.push({
-    ref: refForXrefTable,
-    data: ""
-  });
-  newRefs = newRefs.sort((a, b) => {
-    return a.ref.num - b.ref.num;
-  });
-  const xrefTableData = [[0, 1, 0xffff]];
-  const indexes = [0, 1];
-  let maxOffset = 0;
-
-  for (const {
-    ref,
-    data
-  } of newRefs) {
-    maxOffset = Math.max(maxOffset, baseOffset);
-    xrefTableData.push([1, baseOffset, Math.min(ref.gen, 0xffff)]);
-    baseOffset += data.length;
-    indexes.push(ref.num);
-    indexes.push(1);
-    buffer.push(data);
-  }
-
-  newXref.set("Index", indexes);
-
-  if (xrefInfo.fileIds.length !== 0) {
-    const md5 = computeMD5(baseOffset, xrefInfo);
-    newXref.set("ID", [xrefInfo.fileIds[0], md5]);
-  }
-
-  const offsetSize = Math.ceil(Math.log2(maxOffset) / 8);
-  const sizes = [1, offsetSize, 2];
-  const structSize = sizes[0] + sizes[1] + sizes[2];
-  const tableLength = structSize * xrefTableData.length;
-  newXref.set("W", sizes);
-  newXref.set("Length", tableLength);
-  buffer.push(`${refForXrefTable.num} ${refForXrefTable.gen} obj\n`);
-  writeDict(newXref, buffer, null);
-  buffer.push(" stream\n");
-  const bufferLen = buffer.reduce((a, str) => a + str.length, 0);
-  const footer = `\nendstream\nendobj\nstartxref\n${baseOffset}\n%%EOF\n`;
-  const array = new Uint8Array(originalData.length + bufferLen + tableLength + footer.length);
-  array.set(originalData);
-  let offset = originalData.length;
-
-  for (const str of buffer) {
-    writeString(str, offset, array);
-    offset += str.length;
-  }
-
-  for (const [type, objOffset, gen] of xrefTableData) {
-    offset = writeInt(type, sizes[0], offset, array);
-    offset = writeInt(objOffset, sizes[1], offset, array);
-    offset = writeInt(gen, sizes[2], offset, array);
-  }
-
-  writeString(footer, offset, array);
-  return array;
-}
-
-/***/ }),
-/* 28 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.PartialEvaluator = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var _cmap = __w_pdfjs_require__(29);
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _fonts = __w_pdfjs_require__(30);
-
-var _encodings = __w_pdfjs_require__(33);
-
-var _core_utils = __w_pdfjs_require__(8);
-
-var _unicode = __w_pdfjs_require__(36);
-
-var _standard_fonts = __w_pdfjs_require__(35);
-
-var _pattern = __w_pdfjs_require__(39);
-
-var _function = __w_pdfjs_require__(40);
-
-var _parser = __w_pdfjs_require__(11);
-
-var _image_utils = __w_pdfjs_require__(24);
-
-var _bidi = __w_pdfjs_require__(42);
-
-var _colorspace = __w_pdfjs_require__(23);
-
-var _stream = __w_pdfjs_require__(12);
-
-var _glyphlist = __w_pdfjs_require__(34);
-
-var _metrics = __w_pdfjs_require__(43);
-
-var _murmurhash = __w_pdfjs_require__(44);
-
-var _operator_list = __w_pdfjs_require__(26);
-
-var _image = __w_pdfjs_require__(45);
+var _image = __w_pdfjs_require__(63);
 
 const DefaultPartialEvaluatorOptions = Object.freeze({
   maxImageSize: -1,
   disableFontFace: false,
   ignoreErrors: false,
   isEvalSupported: true,
-  fontExtraProperties: false
+  fontExtraProperties: false,
+  useSystemFonts: true,
+  cMapUrl: null,
+  standardFontDataUrl: null
 });
 const PatternType = {
   TILING: 1,
   SHADING: 2
 };
+const TEXT_CHUNK_BATCH_SIZE = 10;
 const deferred = Promise.resolve();
 
 function normalizeBlendMode(value, parsingArray = false) {
@@ -21511,7 +9934,7 @@ function normalizeBlendMode(value, parsingArray = false) {
     return "source-over";
   }
 
-  if (!(0, _primitives.isName)(value)) {
+  if (!(value instanceof _primitives.Name)) {
     if (parsingArray) {
       return null;
     }
@@ -21578,6 +10001,12 @@ function normalizeBlendMode(value, parsingArray = false) {
   return "source-over";
 }
 
+function incrementCachedImageMaskCount(data) {
+  if (data.fn === _util.OPS.paintImageMaskXObject && data.args[0] && data.args[0].count > 0) {
+    data.args[0].count++;
+  }
+}
+
 class TimeSlotManager {
   static get TIME_SLOT_DURATION_MS() {
     return (0, _util.shadow)(this, "TIME_SLOT_DURATION_MS", 20);
@@ -21615,6 +10044,7 @@ class PartialEvaluator {
     idFactory,
     fontCache,
     builtInCMapCache,
+    standardFontDataCache,
     globalImageCache,
     options = null
   }) {
@@ -21624,6 +10054,7 @@ class PartialEvaluator {
     this.idFactory = idFactory;
     this.fontCache = fontCache;
     this.builtInCMapCache = builtInCMapCache;
+    this.standardFontDataCache = standardFontDataCache;
     this.globalImageCache = globalImageCache;
     this.options = options || DefaultPartialEvaluatorOptions;
     this.parsingType3Font = false;
@@ -21638,29 +10069,33 @@ class PartialEvaluator {
     return (0, _util.shadow)(this, "_pdfFunctionFactory", pdfFunctionFactory);
   }
 
-  clone(newOptions = DefaultPartialEvaluatorOptions) {
-    var newEvaluator = Object.create(this);
-    newEvaluator.options = newOptions;
+  clone(newOptions = null) {
+    const newEvaluator = Object.create(this);
+    newEvaluator.options = Object.assign(Object.create(null), this.options, newOptions);
     return newEvaluator;
   }
 
-  hasBlendModes(resources) {
+  hasBlendModes(resources, nonBlendModesSet) {
     if (!(resources instanceof _primitives.Dict)) {
       return false;
     }
 
-    const processed = new _primitives.RefSet();
+    if (resources.objId && nonBlendModesSet.has(resources.objId)) {
+      return false;
+    }
+
+    const processed = new _primitives.RefSet(nonBlendModesSet);
 
     if (resources.objId) {
       processed.put(resources.objId);
     }
 
-    var nodes = [resources],
-        xref = this.xref;
+    const nodes = [resources],
+          xref = this.xref;
 
     while (nodes.length) {
-      var node = nodes.shift();
-      var graphicStates = node.get("ExtGState");
+      const node = nodes.shift();
+      const graphicStates = node.get("ExtGState");
 
       if (graphicStates instanceof _primitives.Dict) {
         for (let graphicState of graphicStates.getRawValues()) {
@@ -21672,10 +10107,6 @@ class PartialEvaluator {
             try {
               graphicState = xref.fetch(graphicState);
             } catch (ex) {
-              if (ex instanceof _core_utils.MissingDataException) {
-                throw ex;
-              }
-
               processed.put(graphicState);
               (0, _util.info)(`hasBlendModes - ignoring ExtGState: "${ex}".`);
               continue;
@@ -21710,7 +10141,7 @@ class PartialEvaluator {
         }
       }
 
-      var xObjects = node.get("XObject");
+      const xObjects = node.get("XObject");
 
       if (!(xObjects instanceof _primitives.Dict)) {
         continue;
@@ -21725,17 +10156,13 @@ class PartialEvaluator {
           try {
             xObject = xref.fetch(xObject);
           } catch (ex) {
-            if (ex instanceof _core_utils.MissingDataException) {
-              throw ex;
-            }
-
             processed.put(xObject);
             (0, _util.info)(`hasBlendModes - ignoring XObject: "${ex}".`);
             continue;
           }
         }
 
-        if (!(0, _primitives.isStream)(xObject)) {
+        if (!(xObject instanceof _base_stream.BaseStream)) {
           continue;
         }
 
@@ -21743,7 +10170,7 @@ class PartialEvaluator {
           processed.put(xObject.dict.objId);
         }
 
-        var xResources = xObject.dict.get("Resources");
+        const xResources = xObject.dict.get("Resources");
 
         if (!(xResources instanceof _primitives.Dict)) {
           continue;
@@ -21761,6 +10188,10 @@ class PartialEvaluator {
       }
     }
 
+    for (const ref of processed) {
+      nonBlendModesSet.put(ref);
+    }
+
     return false;
   }
 
@@ -21771,27 +10202,25 @@ class PartialEvaluator {
       return cachedData;
     }
 
-    const readableStream = this.handler.sendWithStream("FetchBuiltInCMap", {
-      name
-    });
-    const reader = readableStream.getReader();
-    const data = await new Promise(function (resolve, reject) {
-      function pump() {
-        reader.read().then(function ({
-          value,
-          done
-        }) {
-          if (done) {
-            return;
-          }
+    let data;
 
-          resolve(value);
-          pump();
-        }, reject);
+    if (this.options.cMapUrl !== null) {
+      const url = `${this.options.cMapUrl}${name}.bcmap`;
+      const response = await fetch(url);
+
+      if (!response.ok) {
+        throw new Error(`fetchBuiltInCMap: failed to fetch file "${url}" with "${response.statusText}".`);
       }
 
-      pump();
-    });
+      data = {
+        cMapData: new Uint8Array(await response.arrayBuffer()),
+        compressionType: _util.CMapCompressionType.BINARY
+      };
+    } else {
+      data = await this.handler.sendWithPromise("FetchBuiltInCMap", {
+        name
+      });
+    }
 
     if (data.compressionType !== _util.CMapCompressionType.NONE) {
       this.builtInCMapCache.set(name, data);
@@ -21800,10 +10229,52 @@ class PartialEvaluator {
     return data;
   }
 
+  async fetchStandardFontData(name) {
+    const cachedData = this.standardFontDataCache.get(name);
+
+    if (cachedData) {
+      return new _stream.Stream(cachedData);
+    }
+
+    if (this.options.useSystemFonts && name !== "Symbol" && name !== "ZapfDingbats") {
+      return null;
+    }
+
+    const standardFontNameToFileName = (0, _standard_fonts.getFontNameToFileMap)(),
+          filename = standardFontNameToFileName[name];
+    let data;
+
+    if (this.options.standardFontDataUrl !== null) {
+      const url = `${this.options.standardFontDataUrl}${filename}`;
+      const response = await fetch(url);
+
+      if (!response.ok) {
+        (0, _util.warn)(`fetchStandardFontData: failed to fetch file "${url}" with "${response.statusText}".`);
+      } else {
+        data = await response.arrayBuffer();
+      }
+    } else {
+      try {
+        data = await this.handler.sendWithPromise("FetchStandardFontData", {
+          filename
+        });
+      } catch (e) {
+        (0, _util.warn)(`fetchStandardFontData: failed to fetch file "${filename}" with "${e}".`);
+      }
+    }
+
+    if (!data) {
+      return null;
+    }
+
+    this.standardFontDataCache.set(name, data);
+    return new _stream.Stream(data);
+  }
+
   async buildFormXObject(resources, xobj, smask, operatorList, task, initialState, localColorSpaceCache) {
-    var dict = xobj.dict;
-    var matrix = dict.getArray("Matrix");
-    var bbox = dict.getArray("BBox");
+    const dict = xobj.dict;
+    const matrix = dict.getArray("Matrix");
+    let bbox = dict.getArray("BBox");
 
     if (Array.isArray(bbox) && bbox.length === 4) {
       bbox = _util.Util.normalizeRect(bbox);
@@ -21811,25 +10282,28 @@ class PartialEvaluator {
       bbox = null;
     }
 
-    let optionalContent = null;
+    let optionalContent, groupOptions;
 
     if (dict.has("OC")) {
       optionalContent = await this.parseMarkedContentProps(dict.get("OC"), resources);
+    }
+
+    if (optionalContent !== undefined) {
       operatorList.addOp(_util.OPS.beginMarkedContentProps, ["OC", optionalContent]);
     }
 
-    var group = dict.get("Group");
+    const group = dict.get("Group");
 
     if (group) {
-      var groupOptions = {
+      groupOptions = {
         matrix,
         bbox,
         smask,
         isolated: false,
         knockout: false
       };
-      var groupSubtype = group.get("S");
-      var colorSpace = null;
+      const groupSubtype = group.get("S");
+      let colorSpace = null;
 
       if ((0, _primitives.isName)(groupSubtype, "Transparency")) {
         groupOptions.isolated = group.get("I") || false;
@@ -21860,7 +10334,8 @@ class PartialEvaluator {
       operatorList.addOp(_util.OPS.beginGroup, [groupOptions]);
     }
 
-    operatorList.addOp(_util.OPS.paintFormXObjectBegin, [matrix, bbox]);
+    const args = group ? [matrix, null] : [matrix, bbox];
+    operatorList.addOp(_util.OPS.paintFormXObjectBegin, args);
     return this.getOperatorList({
       stream: xobj,
       task,
@@ -21874,14 +10349,14 @@ class PartialEvaluator {
         operatorList.addOp(_util.OPS.endGroup, [groupOptions]);
       }
 
-      if (optionalContent) {
+      if (optionalContent !== undefined) {
         operatorList.addOp(_util.OPS.endMarkedContent, []);
       }
     });
   }
 
   _sendImgData(objId, imgData, cacheGlobally = false) {
-    const transfers = imgData ? [imgData.data.buffer] : null;
+    const transfers = imgData ? [imgData.bitmap || imgData.data.buffer] : null;
 
     if (this.parsingType3Font || cacheGlobally) {
       return this.handler.send("commonobj", [objId, "Image", imgData], transfers);
@@ -21899,56 +10374,119 @@ class PartialEvaluator {
     localImageCache,
     localColorSpaceCache
   }) {
-    var dict = image.dict;
+    const dict = image.dict;
     const imageRef = dict.objId;
-    var w = dict.get("Width", "W");
-    var h = dict.get("Height", "H");
+    const w = dict.get("W", "Width");
+    const h = dict.get("H", "Height");
 
-    if (!(w && (0, _util.isNum)(w)) || !(h && (0, _util.isNum)(h))) {
+    if (!(w && typeof w === "number") || !(h && typeof h === "number")) {
       (0, _util.warn)("Image dimensions are missing, or not numbers.");
-      return undefined;
+      return;
     }
 
-    var maxImageSize = this.options.maxImageSize;
+    const maxImageSize = this.options.maxImageSize;
 
     if (maxImageSize !== -1 && w * h > maxImageSize) {
-      (0, _util.warn)("Image exceeded maximum allowed size and was removed.");
-      return undefined;
+      const msg = "Image exceeded maximum allowed size and was removed.";
+
+      if (this.options.ignoreErrors) {
+        (0, _util.warn)(msg);
+        return;
+      }
+
+      throw new Error(msg);
     }
 
-    var imageMask = dict.get("ImageMask", "IM") || false;
-    var imgData, args;
+    let optionalContent;
+
+    if (dict.has("OC")) {
+      optionalContent = await this.parseMarkedContentProps(dict.get("OC"), resources);
+    }
+
+    const imageMask = dict.get("IM", "ImageMask") || false;
+    let imgData, args;
 
     if (imageMask) {
-      var width = dict.get("Width", "W");
-      var height = dict.get("Height", "H");
-      var bitStrideLength = width + 7 >> 3;
-      var imgArray = image.getBytes(bitStrideLength * height, true);
-      var decode = dict.getArray("Decode", "D");
+      const interpolate = dict.get("I", "Interpolate");
+      const bitStrideLength = w + 7 >> 3;
+      const imgArray = image.getBytes(bitStrideLength * h);
+      const decode = dict.getArray("D", "Decode");
+
+      if (this.parsingType3Font) {
+        imgData = _image.PDFImage.createRawMask({
+          imgArray,
+          width: w,
+          height: h,
+          imageIsFromDecodeStream: image instanceof _decode_stream.DecodeStream,
+          inverseDecode: !!decode && decode[0] > 0,
+          interpolate
+        });
+        imgData.cached = !!cacheKey;
+        args = [imgData];
+        operatorList.addImageOps(_util.OPS.paintImageMaskXObject, args, optionalContent);
+
+        if (cacheKey) {
+          localImageCache.set(cacheKey, imageRef, {
+            fn: _util.OPS.paintImageMaskXObject,
+            args,
+            optionalContent
+          });
+        }
+
+        return;
+      }
+
       imgData = _image.PDFImage.createMask({
         imgArray,
-        width,
-        height,
-        imageIsFromDecodeStream: image instanceof _stream.DecodeStream,
-        inverseDecode: !!decode && decode[0] > 0
+        width: w,
+        height: h,
+        imageIsFromDecodeStream: image instanceof _decode_stream.DecodeStream,
+        inverseDecode: !!decode && decode[0] > 0,
+        interpolate
       });
-      imgData.cached = !!cacheKey;
-      args = [imgData];
-      operatorList.addOp(_util.OPS.paintImageMaskXObject, args);
+
+      if (imgData.isSingleOpaquePixel) {
+        operatorList.addImageOps(_util.OPS.paintSolidColorImageMask, [], optionalContent);
+
+        if (cacheKey) {
+          localImageCache.set(cacheKey, imageRef, {
+            fn: _util.OPS.paintSolidColorImageMask,
+            args: [],
+            optionalContent
+          });
+        }
+
+        return;
+      }
+
+      const objId = `mask_${this.idFactory.createObjId()}`;
+      operatorList.addDependency(objId);
+
+      this._sendImgData(objId, imgData);
+
+      args = [{
+        data: objId,
+        width: imgData.width,
+        height: imgData.height,
+        interpolate: imgData.interpolate,
+        count: 1
+      }];
+      operatorList.addImageOps(_util.OPS.paintImageMaskXObject, args, optionalContent);
 
       if (cacheKey) {
         localImageCache.set(cacheKey, imageRef, {
           fn: _util.OPS.paintImageMaskXObject,
-          args
+          args,
+          optionalContent
         });
       }
 
-      return undefined;
+      return;
     }
 
-    var softMask = dict.get("SMask", "SM") || false;
-    var mask = dict.get("Mask") || false;
-    var SMALL_IMAGE_DIMENSIONS = 200;
+    const softMask = dict.get("SM", "SMask") || false;
+    const mask = dict.get("Mask") || false;
+    const SMALL_IMAGE_DIMENSIONS = 200;
 
     if (isInline && !softMask && !mask && w + h < SMALL_IMAGE_DIMENSIONS) {
       const imageObj = new _image.PDFImage({
@@ -21960,8 +10498,8 @@ class PartialEvaluator {
         localColorSpaceCache
       });
       imgData = imageObj.createImageData(true);
-      operatorList.addOp(_util.OPS.paintInlineImageXObject, [imgData]);
-      return undefined;
+      operatorList.addImageOps(_util.OPS.paintInlineImageXObject, [imgData], optionalContent);
+      return;
     }
 
     let objId = `img_${this.idFactory.createObjId()}`,
@@ -21989,18 +10527,24 @@ class PartialEvaluator {
       localColorSpaceCache
     }).then(imageObj => {
       imgData = imageObj.createImageData(false);
+
+      if (cacheKey && imageRef && cacheGlobally) {
+        this.globalImageCache.addByteSize(imageRef, imgData.data.length);
+      }
+
       return this._sendImgData(objId, imgData, cacheGlobally);
     }).catch(reason => {
       (0, _util.warn)(`Unable to decode image "${objId}": "${reason}".`);
       return this._sendImgData(objId, null, cacheGlobally);
     });
 
-    operatorList.addOp(_util.OPS.paintImageXObject, args);
+    operatorList.addImageOps(_util.OPS.paintImageXObject, args, optionalContent);
 
     if (cacheKey) {
       localImageCache.set(cacheKey, imageRef, {
         fn: _util.OPS.paintImageXObject,
-        args
+        args,
+        optionalContent
       });
 
       if (imageRef) {
@@ -22011,30 +10555,30 @@ class PartialEvaluator {
           this.globalImageCache.setData(imageRef, {
             objId,
             fn: _util.OPS.paintImageXObject,
-            args
+            args,
+            optionalContent,
+            byteSize: 0
           });
         }
       }
     }
-
-    return undefined;
   }
 
   handleSMask(smask, resources, operatorList, task, stateManager, localColorSpaceCache) {
-    var smaskContent = smask.get("G");
-    var smaskOptions = {
+    const smaskContent = smask.get("G");
+    const smaskOptions = {
       subtype: smask.get("S").name,
       backdrop: smask.get("BC")
     };
-    var transferObj = smask.get("TR");
+    const transferObj = smask.get("TR");
 
     if ((0, _function.isPDFFunction)(transferObj)) {
       const transferFn = this._pdfFunctionFactory.create(transferObj);
 
-      var transferMap = new Uint8Array(256);
-      var tmp = new Float32Array(1);
+      const transferMap = new Uint8Array(256);
+      const tmp = new Float32Array(1);
 
-      for (var i = 0; i < 256; i++) {
+      for (let i = 0; i < 256; i++) {
         tmp[0] = i / 255;
         transferFn(tmp, 0, tmp, 0);
         transferMap[i] = tmp[0] * 255 | 0;
@@ -22098,7 +10642,7 @@ class PartialEvaluator {
     return transferMaps;
   }
 
-  handleTilingType(fn, args, resources, pattern, patternDict, operatorList, task) {
+  handleTilingType(fn, color, resources, pattern, patternDict, operatorList, task, localTilingPatternCache) {
     const tilingOpList = new _operator_list.OperatorList();
 
     const patternResources = _primitives.Dict.merge({
@@ -22112,14 +10656,18 @@ class PartialEvaluator {
       resources: patternResources,
       operatorList: tilingOpList
     }).then(function () {
-      return (0, _pattern.getTilingPatternIR)({
-        fnArray: tilingOpList.fnArray,
-        argsArray: tilingOpList.argsArray
-      }, patternDict, args);
-    }).then(function (tilingPatternIR) {
+      const operatorListIR = tilingOpList.getIR();
+      const tilingPatternIR = (0, _pattern.getTilingPatternIR)(operatorListIR, patternDict, color);
       operatorList.addDependencies(tilingOpList.dependencies);
       operatorList.addOp(fn, tilingPatternIR);
-    }, reason => {
+
+      if (patternDict.objId) {
+        localTilingPatternCache.set(null, patternDict.objId, {
+          operatorListIR,
+          dict: patternDict
+        });
+      }
+    }).catch(reason => {
       if (reason instanceof _util.AbortException) {
         return;
       }
@@ -22136,17 +10684,9 @@ class PartialEvaluator {
     });
   }
 
-  handleSetFont(resources, fontArgs, fontRef, operatorList, task, state) {
-    var fontName,
-        fontSize = 0;
-
-    if (fontArgs) {
-      fontArgs = fontArgs.slice();
-      fontName = fontArgs[0].name;
-      fontSize = fontArgs[1];
-    }
-
-    return this.loadFont(fontName, fontRef, resources).then(translated => {
+  handleSetFont(resources, fontArgs, fontRef, operatorList, task, state, fallbackFontDict = null, cssFontInfo = null) {
+    const fontName = fontArgs && fontArgs[0] instanceof _primitives.Name ? fontArgs[0].name : null;
+    return this.loadFont(fontName, fontRef, resources, fallbackFontDict, cssFontInfo).then(translated => {
       if (!translated.font.isType3Font) {
         return translated;
       }
@@ -22162,13 +10702,11 @@ class PartialEvaluator {
           loadedName: "g_font_error",
           font: new _fonts.ErrorFont(`Type3 font load error: ${reason}`),
           dict: translated.font,
-          extraProperties: this.options.fontExtraProperties
+          evaluatorOptions: this.options
         });
       });
     }).then(translated => {
       state.font = translated.font;
-      state.fontSize = fontSize;
-      state.fontName = fontName;
       translated.send(this.handler);
       return translated.loadedName;
     });
@@ -22182,7 +10720,7 @@ class PartialEvaluator {
       const isAddToPathSet = !!(state.textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG);
 
       if (isAddToPathSet || state.fillColorSpace.name === "Pattern" || font.disableFontFace || this.options.disableFontFace) {
-        PartialEvaluator.buildFontPaths(font, glyphs, this.handler);
+        PartialEvaluator.buildFontPaths(font, glyphs, this.handler, this.options);
       }
     }
 
@@ -22219,11 +10757,11 @@ class PartialEvaluator {
   }) {
     const gStateRef = gState.objId;
     let isSimpleGState = true;
-    var gStateObj = [];
-    var gStateKeys = gState.getKeys();
-    var promise = Promise.resolve();
+    const gStateObj = [];
+    const gStateKeys = gState.getKeys();
+    let promise = Promise.resolve();
 
-    for (var i = 0, ii = gStateKeys.length; i < ii; i++) {
+    for (let i = 0, ii = gStateKeys.length; i < ii; i++) {
       const key = gStateKeys[i];
       const value = gState.get(key);
 
@@ -22263,7 +10801,7 @@ class PartialEvaluator {
             break;
           }
 
-          if ((0, _primitives.isDict)(value)) {
+          if (value instanceof _primitives.Dict) {
             isSimpleGState = false;
             promise = promise.then(() => {
               return this.handleSMask(value, resources, operatorList, task, stateManager, localColorSpaceCache);
@@ -22313,27 +10851,25 @@ class PartialEvaluator {
     });
   }
 
-  loadFont(fontName, font, resources) {
-    const errorFont = () => {
-      return Promise.resolve(new TranslatedFont({
+  loadFont(fontName, font, resources, fallbackFontDict = null, cssFontInfo = null) {
+    const errorFont = async () => {
+      return new TranslatedFont({
         loadedName: "g_font_error",
         font: new _fonts.ErrorFont(`Font "${fontName}" is not available.`),
         dict: font,
-        extraProperties: this.options.fontExtraProperties
-      }));
+        evaluatorOptions: this.options
+      });
     };
 
-    var fontRef,
-        xref = this.xref;
+    const xref = this.xref;
+    let fontRef;
 
     if (font) {
-      if (!(0, _primitives.isRef)(font)) {
-        throw new _util.FormatError('The "font" object should be a reference.');
+      if (font instanceof _primitives.Ref) {
+        fontRef = font;
       }
-
-      fontRef = font;
     } else {
-      var fontRes = resources.get("Font");
+      const fontRes = resources.get("Font");
 
       if (fontRes) {
         fontRef = fontRes.getRaw(fontName);
@@ -22352,7 +10888,16 @@ class PartialEvaluator {
         featureId: _util.UNSUPPORTED_FEATURES.errorFontMissing
       });
       (0, _util.warn)(`${partialMsg} -- attempting to fallback to a default font.`);
-      fontRef = PartialEvaluator.fallbackFontDict;
+
+      if (fallbackFontDict) {
+        fontRef = fallbackFontDict;
+      } else {
+        fontRef = PartialEvaluator.fallbackFontDict;
+      }
+    }
+
+    if (this.parsingType3Font && this.type3FontRefs.has(fontRef)) {
+      return errorFont();
     }
 
     if (this.fontCache.has(fontRef)) {
@@ -22361,36 +10906,45 @@ class PartialEvaluator {
 
     font = xref.fetchIfRef(fontRef);
 
-    if (!(0, _primitives.isDict)(font)) {
+    if (!(font instanceof _primitives.Dict)) {
       return errorFont();
     }
 
-    if (font.translated) {
-      return font.translated;
+    if (font.cacheKey && this.fontCache.has(font.cacheKey)) {
+      return this.fontCache.get(font.cacheKey);
+    }
+
+    const fontCapability = (0, _util.createPromiseCapability)();
+    let preEvaluatedFont;
+
+    try {
+      preEvaluatedFont = this.preEvaluateFont(font);
+      preEvaluatedFont.cssFontInfo = cssFontInfo;
+    } catch (reason) {
+      (0, _util.warn)(`loadFont - preEvaluateFont failed: "${reason}".`);
+      return errorFont();
     }
 
-    var fontCapability = (0, _util.createPromiseCapability)();
-    var preEvaluatedFont = this.preEvaluateFont(font);
     const {
       descriptor,
       hash
     } = preEvaluatedFont;
-    var fontRefIsRef = (0, _primitives.isRef)(fontRef),
-        fontID;
+    const fontRefIsRef = fontRef instanceof _primitives.Ref;
+    let fontID;
 
     if (fontRefIsRef) {
       fontID = `f${fontRef.toString()}`;
     }
 
-    if (hash && (0, _primitives.isDict)(descriptor)) {
+    if (hash && descriptor instanceof _primitives.Dict) {
       if (!descriptor.fontAliases) {
         descriptor.fontAliases = Object.create(null);
       }
 
-      var fontAliases = descriptor.fontAliases;
+      const fontAliases = descriptor.fontAliases;
 
       if (fontAliases[hash]) {
-        var aliasFontRef = fontAliases[hash].aliasRef;
+        const aliasFontRef = fontAliases[hash].aliasRef;
 
         if (fontRefIsRef && aliasFontRef && this.fontCache.has(aliasFontRef)) {
           this.fontCache.putAlias(fontRef, aliasFontRef);
@@ -22416,77 +10970,92 @@ class PartialEvaluator {
         fontID = this.idFactory.createFontId();
       }
 
-      this.fontCache.put(`id_${fontID}`, fontCapability.promise);
+      font.cacheKey = `cacheKey_${fontID}`;
+      this.fontCache.put(font.cacheKey, fontCapability.promise);
     }
 
     (0, _util.assert)(fontID && fontID.startsWith("f"), 'The "fontID" must be (correctly) defined.');
     font.loadedName = `${this.idFactory.getDocId()}_${fontID}`;
-    font.translated = fontCapability.promise;
-    var translatedPromise;
-
-    try {
-      translatedPromise = this.translateFont(preEvaluatedFont);
-    } catch (e) {
-      translatedPromise = Promise.reject(e);
-    }
-
-    translatedPromise.then(translatedFont => {
+    this.translateFont(preEvaluatedFont).then(translatedFont => {
       if (translatedFont.fontType !== undefined) {
-        var xrefFontStats = xref.stats.fontTypes;
-        xrefFontStats[translatedFont.fontType] = true;
+        xref.stats.addFontType(translatedFont.fontType);
       }
 
       fontCapability.resolve(new TranslatedFont({
         loadedName: font.loadedName,
         font: translatedFont,
         dict: font,
-        extraProperties: this.options.fontExtraProperties
+        evaluatorOptions: this.options
       }));
     }).catch(reason => {
       this.handler.send("UnsupportedFeature", {
         featureId: _util.UNSUPPORTED_FEATURES.errorFontTranslate
       });
+      (0, _util.warn)(`loadFont - translateFont failed: "${reason}".`);
 
       try {
-        var fontFile3 = descriptor && descriptor.get("FontFile3");
-        var subtype = fontFile3 && fontFile3.get("Subtype");
-        var fontType = (0, _fonts.getFontType)(preEvaluatedFont.type, subtype && subtype.name);
-        var xrefFontStats = xref.stats.fontTypes;
-        xrefFontStats[fontType] = true;
+        const fontFile3 = descriptor && descriptor.get("FontFile3");
+        const subtype = fontFile3 && fontFile3.get("Subtype");
+        const fontType = (0, _fonts_utils.getFontType)(preEvaluatedFont.type, subtype && subtype.name);
+
+        if (fontType !== undefined) {
+          xref.stats.addFontType(fontType);
+        }
       } catch (ex) {}
 
       fontCapability.resolve(new TranslatedFont({
         loadedName: font.loadedName,
         font: new _fonts.ErrorFont(reason instanceof Error ? reason.message : reason),
         dict: font,
-        extraProperties: this.options.fontExtraProperties
+        evaluatorOptions: this.options
       }));
     });
     return fontCapability.promise;
   }
 
   buildPath(operatorList, fn, args, parsingText = false) {
-    var lastIndex = operatorList.length - 1;
+    const lastIndex = operatorList.length - 1;
 
     if (!args) {
       args = [];
     }
 
+    let minMax;
+
     if (lastIndex < 0 || operatorList.fnArray[lastIndex] !== _util.OPS.constructPath) {
       if (parsingText) {
         (0, _util.warn)(`Encountered path operator "${fn}" inside of a text object.`);
         operatorList.addOp(_util.OPS.save, null);
       }
 
-      operatorList.addOp(_util.OPS.constructPath, [[fn], args]);
+      minMax = [Infinity, -Infinity, Infinity, -Infinity];
+      operatorList.addOp(_util.OPS.constructPath, [[fn], args, minMax]);
 
       if (parsingText) {
         operatorList.addOp(_util.OPS.restore, null);
       }
     } else {
-      var opArgs = operatorList.argsArray[lastIndex];
+      const opArgs = operatorList.argsArray[lastIndex];
       opArgs[0].push(fn);
       Array.prototype.push.apply(opArgs[1], args);
+      minMax = opArgs[2];
+    }
+
+    switch (fn) {
+      case _util.OPS.rectangle:
+        minMax[0] = Math.min(minMax[0], args[0], args[0] + args[2]);
+        minMax[1] = Math.max(minMax[1], args[0], args[0] + args[2]);
+        minMax[2] = Math.min(minMax[2], args[1], args[1] + args[3]);
+        minMax[3] = Math.max(minMax[3], args[1], args[1] + args[3]);
+        break;
+
+      case _util.OPS.moveTo:
+      case _util.OPS.lineTo:
+        minMax[0] = Math.min(minMax[0], args[0]);
+        minMax[1] = Math.max(minMax[1], args[0]);
+        minMax[2] = Math.min(minMax[2], args[1]);
+        minMax[3] = Math.max(minMax[3], args[1]);
+        break;
     }
   }
 
@@ -22518,38 +11087,121 @@ class PartialEvaluator {
     });
   }
 
-  async handleColorN(operatorList, fn, args, cs, patterns, resources, task, localColorSpaceCache) {
-    var patternName = args[args.length - 1];
-    var pattern;
+  parseShading({
+    shading,
+    resources,
+    localColorSpaceCache,
+    localShadingPatternCache
+  }) {
+    let id = localShadingPatternCache.get(shading);
 
-    if ((0, _primitives.isName)(patternName) && (pattern = patterns.get(patternName.name))) {
-      var dict = (0, _primitives.isStream)(pattern) ? pattern.dict : pattern;
-      var typeNum = dict.get("PatternType");
+    if (!id) {
+      var shadingFill = _pattern.Pattern.parseShading(shading, this.xref, resources, this.handler, this._pdfFunctionFactory, localColorSpaceCache);
 
-      if (typeNum === PatternType.TILING) {
-        var color = cs.base ? cs.base.getRgb(args, 0) : null;
-        return this.handleTilingType(fn, color, resources, pattern, dict, operatorList, task);
-      } else if (typeNum === PatternType.SHADING) {
-        var shading = dict.get("Shading");
-        var matrix = dict.getArray("Matrix");
-        pattern = _pattern.Pattern.parseShading(shading, matrix, this.xref, resources, this.handler, this._pdfFunctionFactory, localColorSpaceCache);
-        operatorList.addOp(fn, pattern.getIR());
-        return undefined;
+      const patternIR = shadingFill.getIR();
+      id = `pattern_${this.idFactory.createObjId()}`;
+      localShadingPatternCache.set(shading, id);
+      this.handler.send("obj", [id, this.pageIndex, "Pattern", patternIR]);
+    }
+
+    return id;
+  }
+
+  handleColorN(operatorList, fn, args, cs, patterns, resources, task, localColorSpaceCache, localTilingPatternCache, localShadingPatternCache) {
+    const patternName = args.pop();
+
+    if (patternName instanceof _primitives.Name) {
+      const rawPattern = patterns.getRaw(patternName.name);
+      const localTilingPattern = rawPattern instanceof _primitives.Ref && localTilingPatternCache.getByRef(rawPattern);
+
+      if (localTilingPattern) {
+        try {
+          const color = cs.base ? cs.base.getRgb(args, 0) : null;
+          const tilingPatternIR = (0, _pattern.getTilingPatternIR)(localTilingPattern.operatorListIR, localTilingPattern.dict, color);
+          operatorList.addOp(fn, tilingPatternIR);
+          return undefined;
+        } catch (ex) {}
       }
 
-      throw new _util.FormatError(`Unknown PatternType: ${typeNum}`);
+      const pattern = this.xref.fetchIfRef(rawPattern);
+
+      if (pattern) {
+        const dict = pattern instanceof _base_stream.BaseStream ? pattern.dict : pattern;
+        const typeNum = dict.get("PatternType");
+
+        if (typeNum === PatternType.TILING) {
+          const color = cs.base ? cs.base.getRgb(args, 0) : null;
+          return this.handleTilingType(fn, color, resources, pattern, dict, operatorList, task, localTilingPatternCache);
+        } else if (typeNum === PatternType.SHADING) {
+          const shading = dict.get("Shading");
+          const matrix = dict.getArray("Matrix");
+          const objId = this.parseShading({
+            shading,
+            resources,
+            localColorSpaceCache,
+            localShadingPatternCache
+          });
+          operatorList.addOp(fn, ["Shading", objId, matrix]);
+          return undefined;
+        }
+
+        throw new _util.FormatError(`Unknown PatternType: ${typeNum}`);
+      }
     }
 
     throw new _util.FormatError(`Unknown PatternName: ${patternName}`);
   }
 
+  _parseVisibilityExpression(array, nestingCounter, currentResult) {
+    const MAX_NESTING = 10;
+
+    if (++nestingCounter > MAX_NESTING) {
+      (0, _util.warn)("Visibility expression is too deeply nested");
+      return;
+    }
+
+    const length = array.length;
+    const operator = this.xref.fetchIfRef(array[0]);
+
+    if (length < 2 || !(operator instanceof _primitives.Name)) {
+      (0, _util.warn)("Invalid visibility expression");
+      return;
+    }
+
+    switch (operator.name) {
+      case "And":
+      case "Or":
+      case "Not":
+        currentResult.push(operator.name);
+        break;
+
+      default:
+        (0, _util.warn)(`Invalid operator ${operator.name} in visibility expression`);
+        return;
+    }
+
+    for (let i = 1; i < length; i++) {
+      const raw = array[i];
+      const object = this.xref.fetchIfRef(raw);
+
+      if (Array.isArray(object)) {
+        const nestedResult = [];
+        currentResult.push(nestedResult);
+
+        this._parseVisibilityExpression(object, nestingCounter, nestedResult);
+      } else if (raw instanceof _primitives.Ref) {
+        currentResult.push(raw.toString());
+      }
+    }
+  }
+
   async parseMarkedContentProps(contentProperties, resources) {
     let optionalContent;
 
-    if ((0, _primitives.isName)(contentProperties)) {
+    if (contentProperties instanceof _primitives.Name) {
       const properties = resources.get("Properties");
       optionalContent = properties.get(contentProperties.name);
-    } else if ((0, _primitives.isDict)(contentProperties)) {
+    } else if (contentProperties instanceof _primitives.Dict) {
       optionalContent = contentProperties;
     } else {
       throw new _util.FormatError("Optional content properties malformed.");
@@ -22563,32 +11215,41 @@ class PartialEvaluator {
         id: optionalContent.objId
       };
     } else if (optionalContentType === "OCMD") {
+      const expression = optionalContent.get("VE");
+
+      if (Array.isArray(expression)) {
+        const result = [];
+
+        this._parseVisibilityExpression(expression, 0, result);
+
+        if (result.length > 0) {
+          return {
+            type: "OCMD",
+            expression: result
+          };
+        }
+      }
+
       const optionalContentGroups = optionalContent.get("OCGs");
 
-      if (Array.isArray(optionalContentGroups) || (0, _primitives.isDict)(optionalContentGroups)) {
+      if (Array.isArray(optionalContentGroups) || optionalContentGroups instanceof _primitives.Dict) {
         const groupIds = [];
 
         if (Array.isArray(optionalContentGroups)) {
-          optionalContent.get("OCGs").forEach(ocg => {
+          for (const ocg of optionalContentGroups) {
             groupIds.push(ocg.toString());
-          });
+          }
         } else {
           groupIds.push(optionalContentGroups.objId);
         }
 
-        let expression = null;
-
-        if (optionalContent.get("VE")) {
-          expression = true;
-        }
-
         return {
           type: optionalContentType,
           ids: groupIds,
-          policy: (0, _primitives.isName)(optionalContent.get("P")) ? optionalContent.get("P").name : null,
-          expression
+          policy: optionalContent.get("P") instanceof _primitives.Name ? optionalContent.get("P").name : null,
+          expression: null
         };
-      } else if ((0, _primitives.isRef)(optionalContentGroups)) {
+      } else if (optionalContentGroups instanceof _primitives.Ref) {
         return {
           type: optionalContentType,
           id: optionalContentGroups.toString()
@@ -22604,7 +11265,8 @@ class PartialEvaluator {
     task,
     resources,
     operatorList,
-    initialState = null
+    initialState = null,
+    fallbackFontDict = null
   }) {
     resources = resources || _primitives.Dict.empty;
     initialState = initialState || new EvalState();
@@ -22613,23 +11275,25 @@ class PartialEvaluator {
       throw new Error('getOperatorList: missing "operatorList" parameter');
     }
 
-    var self = this;
-    var xref = this.xref;
+    const self = this;
+    const xref = this.xref;
     let parsingText = false;
     const localImageCache = new _image_utils.LocalImageCache();
     const localColorSpaceCache = new _image_utils.LocalColorSpaceCache();
     const localGStateCache = new _image_utils.LocalGStateCache();
+    const localTilingPatternCache = new _image_utils.LocalTilingPatternCache();
+    const localShadingPatternCache = new Map();
 
-    var xobjs = resources.get("XObject") || _primitives.Dict.empty;
+    const xobjs = resources.get("XObject") || _primitives.Dict.empty;
 
-    var patterns = resources.get("Pattern") || _primitives.Dict.empty;
+    const patterns = resources.get("Pattern") || _primitives.Dict.empty;
 
-    var stateManager = new StateManager(initialState);
-    var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
-    var timeSlotManager = new TimeSlotManager();
+    const stateManager = new StateManager(initialState);
+    const preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
+    const timeSlotManager = new TimeSlotManager();
 
     function closePendingRestoreOPS(argument) {
-      for (var i = 0, ii = preprocessor.savedStatesDepth; i < ii; i++) {
+      for (let i = 0, ii = preprocessor.savedStatesDepth; i < ii; i++) {
         operatorList.addOp(_util.OPS.restore, []);
       }
     }
@@ -22647,12 +11311,8 @@ class PartialEvaluator {
 
       task.ensureNotTerminated();
       timeSlotManager.reset();
-      var stop,
-          operation = {},
-          i,
-          ii,
-          cs,
-          name;
+      const operation = {};
+      let stop, i, ii, cs, name, isValidName;
 
       while (!(stop = timeSlotManager.check())) {
         operation.args = null;
@@ -22661,25 +11321,27 @@ class PartialEvaluator {
           break;
         }
 
-        var args = operation.args;
-        var fn = operation.fn;
+        let args = operation.args;
+        let fn = operation.fn;
 
         switch (fn | 0) {
           case _util.OPS.paintXObject:
+            isValidName = args[0] instanceof _primitives.Name;
             name = args[0].name;
 
-            if (name) {
+            if (isValidName) {
               const localImage = localImageCache.getByName(name);
 
               if (localImage) {
-                operatorList.addOp(localImage.fn, localImage.args);
+                operatorList.addImageOps(localImage.fn, localImage.args, localImage.optionalContent);
+                incrementCachedImageMaskCount(localImage);
                 args = null;
                 continue;
               }
             }
 
             next(new Promise(function (resolveXObject, rejectXObject) {
-              if (!name) {
+              if (!isValidName) {
                 throw new _util.FormatError("XObject must be referred to by name.");
               }
 
@@ -22689,7 +11351,8 @@ class PartialEvaluator {
                 const localImage = localImageCache.getByRef(xobj);
 
                 if (localImage) {
-                  operatorList.addOp(localImage.fn, localImage.args);
+                  operatorList.addImageOps(localImage.fn, localImage.args, localImage.optionalContent);
+                  incrementCachedImageMaskCount(localImage);
                   resolveXObject();
                   return;
                 }
@@ -22698,7 +11361,7 @@ class PartialEvaluator {
 
                 if (globalImage) {
                   operatorList.addDependency(globalImage.objId);
-                  operatorList.addOp(globalImage.fn, globalImage.args);
+                  operatorList.addImageOps(globalImage.fn, globalImage.args, globalImage.optionalContent);
                   resolveXObject();
                   return;
                 }
@@ -22706,13 +11369,13 @@ class PartialEvaluator {
                 xobj = xref.fetch(xobj);
               }
 
-              if (!(0, _primitives.isStream)(xobj)) {
+              if (!(xobj instanceof _base_stream.BaseStream)) {
                 throw new _util.FormatError("XObject should be a stream");
               }
 
               const type = xobj.dict.get("Subtype");
 
-              if (!(0, _primitives.isName)(type)) {
+              if (!(type instanceof _primitives.Name)) {
                 throw new _util.FormatError("XObject should have a Name subtype");
               }
 
@@ -22759,7 +11422,7 @@ class PartialEvaluator {
 
           case _util.OPS.setFont:
             var fontSize = args[1];
-            next(self.handleSetFont(resources, args, null, operatorList, task, stateManager.state).then(function (loadedName) {
+            next(self.handleSetFont(resources, args, null, operatorList, task, stateManager.state, fallbackFontDict).then(function (loadedName) {
               operatorList.addDependency(loadedName);
               operatorList.addOp(_util.OPS.setFont, [loadedName, fontSize]);
             }));
@@ -22780,7 +11443,8 @@ class PartialEvaluator {
               const localImage = localImageCache.getByName(cacheKey);
 
               if (localImage) {
-                operatorList.addOp(localImage.fn, localImage.args);
+                operatorList.addImageOps(localImage.fn, localImage.args, localImage.optionalContent);
+                incrementCachedImageMaskCount(localImage);
                 args = null;
                 continue;
               }
@@ -22818,11 +11482,11 @@ class PartialEvaluator {
             var state = stateManager.state;
 
             for (i = 0; i < arrLength; ++i) {
-              var arrItem = arr[i];
+              const arrItem = arr[i];
 
-              if ((0, _util.isString)(arrItem)) {
+              if (typeof arrItem === "string") {
                 Array.prototype.push.apply(combinedGlyphs, self.handleText(arrItem, state));
-              } else if ((0, _util.isNum)(arrItem)) {
+              } else if (typeof arrItem === "number") {
                 combinedGlyphs.push(arrItem);
               }
             }
@@ -22951,7 +11615,7 @@ class PartialEvaluator {
             cs = stateManager.state.fillColorSpace;
 
             if (cs.name === "Pattern") {
-              next(self.handleColorN(operatorList, _util.OPS.setFillColorN, args, cs, patterns, resources, task, localColorSpaceCache));
+              next(self.handleColorN(operatorList, _util.OPS.setFillColorN, args, cs, patterns, resources, task, localColorSpaceCache, localTilingPatternCache, localShadingPatternCache));
               return;
             }
 
@@ -22963,7 +11627,7 @@ class PartialEvaluator {
             cs = stateManager.state.strokeColorSpace;
 
             if (cs.name === "Pattern") {
-              next(self.handleColorN(operatorList, _util.OPS.setStrokeColorN, args, cs, patterns, resources, task, localColorSpaceCache));
+              next(self.handleColorN(operatorList, _util.OPS.setStrokeColorN, args, cs, patterns, resources, task, localColorSpaceCache, localTilingPatternCache, localShadingPatternCache));
               return;
             }
 
@@ -22984,17 +11648,21 @@ class PartialEvaluator {
               throw new _util.FormatError("No shading object found");
             }
 
-            var shadingFill = _pattern.Pattern.parseShading(shading, null, xref, resources, self.handler, self._pdfFunctionFactory, localColorSpaceCache);
-
-            var patternIR = shadingFill.getIR();
-            args = [patternIR];
+            const patternId = self.parseShading({
+              shading,
+              resources,
+              localColorSpaceCache,
+              localShadingPatternCache
+            });
+            args = [patternId];
             fn = _util.OPS.shadingFill;
             break;
 
           case _util.OPS.setGState:
+            isValidName = args[0] instanceof _primitives.Name;
             name = args[0].name;
 
-            if (name) {
+            if (isValidName) {
               const localGStateObj = localGStateCache.getByName(name);
 
               if (localGStateObj) {
@@ -23008,7 +11676,7 @@ class PartialEvaluator {
             }
 
             next(new Promise(function (resolveGState, rejectGState) {
-              if (!name) {
+              if (!isValidName) {
                 throw new _util.FormatError("GState must be referred to by name.");
               }
 
@@ -23068,7 +11736,7 @@ class PartialEvaluator {
             continue;
 
           case _util.OPS.beginMarkedContentProps:
-            if (!(0, _primitives.isName)(args[0])) {
+            if (!(args[0] instanceof _primitives.Name)) {
               (0, _util.warn)(`Expected name for beginMarkedContentProps arg0=${args[0]}`);
               continue;
             }
@@ -23094,7 +11762,7 @@ class PartialEvaluator {
               return;
             }
 
-            args = [args[0].name];
+            args = [args[0].name, args[1] instanceof _primitives.Dict ? args[1].get("MCID") : null];
             break;
 
           case _util.OPS.beginMarkedContent:
@@ -23148,67 +11816,73 @@ class PartialEvaluator {
     task,
     resources,
     stateManager = null,
-    normalizeWhitespace = false,
     combineTextItems = false,
+    includeMarkedContent = false,
     sink,
-    seenStyles = Object.create(null)
+    seenStyles = new Set(),
+    viewBox
   }) {
     resources = resources || _primitives.Dict.empty;
     stateManager = stateManager || new StateManager(new TextState());
-    var WhitespaceRegexp = /\s/g;
-    var textContent = {
+    const NormalizedUnicodes = (0, _unicode.getNormalizedUnicodes)();
+    const textContent = {
       items: [],
       styles: Object.create(null)
     };
-    var textContentItem = {
+    const textContentItem = {
       initialized: false,
       str: [],
+      totalWidth: 0,
+      totalHeight: 0,
       width: 0,
       height: 0,
       vertical: false,
-      lastAdvanceWidth: 0,
-      lastAdvanceHeight: 0,
+      prevTransform: null,
       textAdvanceScale: 0,
-      spaceWidth: 0,
-      fakeSpaceMin: Infinity,
-      fakeMultiSpaceMin: Infinity,
-      fakeMultiSpaceMax: -0,
-      textRunBreakAllowed: false,
+      spaceInFlowMin: 0,
+      spaceInFlowMax: 0,
+      trackingSpaceMin: Infinity,
+      negativeSpaceMax: -Infinity,
+      notASpace: -Infinity,
       transform: null,
-      fontName: null
+      fontName: null,
+      hasEOL: false
     };
-    var SPACE_FACTOR = 0.3;
-    var MULTI_SPACE_FACTOR = 1.5;
-    var MULTI_SPACE_FACTOR_MAX = 4;
-    var self = this;
-    var xref = this.xref;
-    var xobjs = null;
+    const twoLastChars = [" ", " "];
+    let twoLastCharsPos = 0;
+
+    function saveLastChar(char) {
+      const nextPos = (twoLastCharsPos + 1) % 2;
+      const ret = twoLastChars[twoLastCharsPos] !== " " && twoLastChars[nextPos] === " ";
+      twoLastChars[twoLastCharsPos] = char;
+      twoLastCharsPos = nextPos;
+      return ret;
+    }
+
+    function resetLastChars() {
+      twoLastChars[0] = twoLastChars[1] = " ";
+      twoLastCharsPos = 0;
+    }
+
+    const TRACKING_SPACE_FACTOR = 0.1;
+    const NOT_A_SPACE_FACTOR = 0.03;
+    const NEGATIVE_SPACE_FACTOR = -0.2;
+    const SPACE_IN_FLOW_MIN_FACTOR = 0.1;
+    const SPACE_IN_FLOW_MAX_FACTOR = 0.6;
+    const self = this;
+    const xref = this.xref;
+    const showSpacedTextBuffer = [];
+    let xobjs = null;
     const emptyXObjectCache = new _image_utils.LocalImageCache();
     const emptyGStateCache = new _image_utils.LocalGStateCache();
-    var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
-    var textState;
+    const preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
+    let textState;
 
-    function ensureTextContentItem() {
-      if (textContentItem.initialized) {
-        return textContentItem;
-      }
+    function getCurrentTextTransform() {
+      const font = textState.font;
+      const tsm = [textState.fontSize * textState.textHScale, 0, 0, textState.fontSize, 0, textState.textRise];
 
-      var font = textState.font;
-
-      if (!(font.loadedName in seenStyles)) {
-        seenStyles[font.loadedName] = true;
-        textContent.styles[font.loadedName] = {
-          fontFamily: font.fallbackName,
-          ascent: font.ascent,
-          descent: font.descent,
-          vertical: font.vertical
-        };
-      }
-
-      textContentItem.fontName = font.loadedName;
-      var tsm = [textState.fontSize * textState.textHScale, 0, 0, textState.fontSize, 0, textState.textRise];
-
-      if (font.isType3Font && textState.fontSize <= 1 && !(0, _util.isArrayEqual)(textState.fontMatrix, _util.FONT_IDENTITY_MATRIX)) {
+      if (font.isType3Font && (textState.fontSize <= 1 || font.isCharBBox) && !(0, _util.isArrayEqual)(textState.fontMatrix, _util.FONT_IDENTITY_MATRIX)) {
         const glyphHeight = font.bbox[3] - font.bbox[1];
 
         if (glyphHeight > 0) {
@@ -23216,171 +11890,413 @@ class PartialEvaluator {
         }
       }
 
-      var trm = _util.Util.transform(textState.ctm, _util.Util.transform(textState.textMatrix, tsm));
+      return _util.Util.transform(textState.ctm, _util.Util.transform(textState.textMatrix, tsm));
+    }
 
-      textContentItem.transform = trm;
+    function ensureTextContentItem() {
+      if (textContentItem.initialized) {
+        return textContentItem;
+      }
+
+      const font = textState.font,
+            loadedName = font.loadedName;
+
+      if (!seenStyles.has(loadedName)) {
+        seenStyles.add(loadedName);
+        textContent.styles[loadedName] = {
+          fontFamily: font.fallbackName,
+          ascent: font.ascent,
+          descent: font.descent,
+          vertical: font.vertical
+        };
+      }
+
+      textContentItem.fontName = loadedName;
+      const trm = textContentItem.transform = getCurrentTextTransform();
 
       if (!font.vertical) {
-        textContentItem.width = 0;
-        textContentItem.height = Math.sqrt(trm[2] * trm[2] + trm[3] * trm[3]);
+        textContentItem.width = textContentItem.totalWidth = 0;
+        textContentItem.height = textContentItem.totalHeight = Math.hypot(trm[2], trm[3]);
         textContentItem.vertical = false;
       } else {
-        textContentItem.width = Math.sqrt(trm[0] * trm[0] + trm[1] * trm[1]);
-        textContentItem.height = 0;
+        textContentItem.width = textContentItem.totalWidth = Math.hypot(trm[0], trm[1]);
+        textContentItem.height = textContentItem.totalHeight = 0;
         textContentItem.vertical = true;
       }
 
-      var a = textState.textLineMatrix[0];
-      var b = textState.textLineMatrix[1];
-      var scaleLineX = Math.sqrt(a * a + b * b);
-      a = textState.ctm[0];
-      b = textState.ctm[1];
-      var scaleCtmX = Math.sqrt(a * a + b * b);
+      const scaleLineX = Math.hypot(textState.textLineMatrix[0], textState.textLineMatrix[1]);
+      const scaleCtmX = Math.hypot(textState.ctm[0], textState.ctm[1]);
       textContentItem.textAdvanceScale = scaleCtmX * scaleLineX;
-      textContentItem.lastAdvanceWidth = 0;
-      textContentItem.lastAdvanceHeight = 0;
-      var spaceWidth = font.spaceWidth / 1000 * textState.fontSize;
-
-      if (spaceWidth) {
-        textContentItem.spaceWidth = spaceWidth;
-        textContentItem.fakeSpaceMin = spaceWidth * SPACE_FACTOR;
-        textContentItem.fakeMultiSpaceMin = spaceWidth * MULTI_SPACE_FACTOR;
-        textContentItem.fakeMultiSpaceMax = spaceWidth * MULTI_SPACE_FACTOR_MAX;
-        textContentItem.textRunBreakAllowed = !font.isMonospace;
-      } else {
-        textContentItem.spaceWidth = 0;
-        textContentItem.fakeSpaceMin = Infinity;
-        textContentItem.fakeMultiSpaceMin = Infinity;
-        textContentItem.fakeMultiSpaceMax = 0;
-        textContentItem.textRunBreakAllowed = false;
-      }
-
+      textContentItem.trackingSpaceMin = textState.fontSize * TRACKING_SPACE_FACTOR;
+      textContentItem.notASpace = textState.fontSize * NOT_A_SPACE_FACTOR;
+      textContentItem.negativeSpaceMax = textState.fontSize * NEGATIVE_SPACE_FACTOR;
+      textContentItem.spaceInFlowMin = textState.fontSize * SPACE_IN_FLOW_MIN_FACTOR;
+      textContentItem.spaceInFlowMax = textState.fontSize * SPACE_IN_FLOW_MAX_FACTOR;
+      textContentItem.hasEOL = false;
       textContentItem.initialized = true;
       return textContentItem;
     }
 
-    function replaceWhitespace(str) {
-      var i = 0,
-          ii = str.length,
-          code;
-
-      while (i < ii && (code = str.charCodeAt(i)) >= 0x20 && code <= 0x7f) {
-        i++;
+    function updateAdvanceScale() {
+      if (!textContentItem.initialized) {
+        return;
       }
 
-      return i < ii ? str.replace(WhitespaceRegexp, " ") : str;
+      const scaleLineX = Math.hypot(textState.textLineMatrix[0], textState.textLineMatrix[1]);
+      const scaleCtmX = Math.hypot(textState.ctm[0], textState.ctm[1]);
+      const scaleFactor = scaleCtmX * scaleLineX;
+
+      if (scaleFactor === textContentItem.textAdvanceScale) {
+        return;
+      }
+
+      if (!textContentItem.vertical) {
+        textContentItem.totalWidth += textContentItem.width * textContentItem.textAdvanceScale;
+        textContentItem.width = 0;
+      } else {
+        textContentItem.totalHeight += textContentItem.height * textContentItem.textAdvanceScale;
+        textContentItem.height = 0;
+      }
+
+      textContentItem.textAdvanceScale = scaleFactor;
     }
 
     function runBidiTransform(textChunk) {
-      var str = textChunk.str.join("");
-      var bidiResult = (0, _bidi.bidi)(str, -1, textChunk.vertical);
+      const text = textChunk.str.join("");
+      const bidiResult = (0, _bidi.bidi)(text, -1, textChunk.vertical);
       return {
-        str: normalizeWhitespace ? replaceWhitespace(bidiResult.str) : bidiResult.str,
+        str: bidiResult.str,
         dir: bidiResult.dir,
-        width: textChunk.width,
-        height: textChunk.height,
+        width: Math.abs(textChunk.totalWidth),
+        height: Math.abs(textChunk.totalHeight),
         transform: textChunk.transform,
-        fontName: textChunk.fontName
+        fontName: textChunk.fontName,
+        hasEOL: textChunk.hasEOL
       };
     }
 
     function handleSetFont(fontName, fontRef) {
       return self.loadFont(fontName, fontRef, resources).then(function (translated) {
+        if (!translated.font.isType3Font) {
+          return translated;
+        }
+
+        return translated.loadType3Data(self, resources, task).catch(function () {}).then(function () {
+          return translated;
+        });
+      }).then(function (translated) {
         textState.font = translated.font;
         textState.fontMatrix = translated.font.fontMatrix || _util.FONT_IDENTITY_MATRIX;
       });
     }
 
-    function buildTextContentItem(chars) {
-      var font = textState.font;
-      var textChunk = ensureTextContentItem();
-      var width = 0;
-      var height = 0;
-      var glyphs = font.charsToGlyphs(chars);
+    function applyInverseRotation(x, y, matrix) {
+      const scale = Math.hypot(matrix[0], matrix[1]);
+      return [(matrix[0] * x + matrix[1] * y) / scale, (matrix[2] * x + matrix[3] * y) / scale];
+    }
 
-      for (var i = 0; i < glyphs.length; i++) {
-        var glyph = glyphs[i];
-        var glyphWidth = null;
+    function compareWithLastPosition() {
+      const currentTransform = getCurrentTextTransform();
+      let posX = currentTransform[4];
+      let posY = currentTransform[5];
+      const shiftedX = posX - viewBox[0];
+      const shiftedY = posY - viewBox[1];
 
-        if (font.vertical && glyph.vmetric) {
-          glyphWidth = glyph.vmetric[0];
-        } else {
-          glyphWidth = glyph.width;
+      if (shiftedX < 0 || shiftedX > viewBox[2] || shiftedY < 0 || shiftedY > viewBox[3]) {
+        return false;
+      }
+
+      if (!combineTextItems || !textState.font || !textContentItem.prevTransform) {
+        return true;
+      }
+
+      let lastPosX = textContentItem.prevTransform[4];
+      let lastPosY = textContentItem.prevTransform[5];
+
+      if (lastPosX === posX && lastPosY === posY) {
+        return true;
+      }
+
+      let rotate = -1;
+
+      if (currentTransform[0] && currentTransform[1] === 0 && currentTransform[2] === 0) {
+        rotate = currentTransform[0] > 0 ? 0 : 180;
+      } else if (currentTransform[1] && currentTransform[0] === 0 && currentTransform[3] === 0) {
+        rotate = currentTransform[1] > 0 ? 90 : 270;
+      }
+
+      switch (rotate) {
+        case 0:
+          break;
+
+        case 90:
+          [posX, posY] = [posY, posX];
+          [lastPosX, lastPosY] = [lastPosY, lastPosX];
+          break;
+
+        case 180:
+          [posX, posY, lastPosX, lastPosY] = [-posX, -posY, -lastPosX, -lastPosY];
+          break;
+
+        case 270:
+          [posX, posY] = [-posY, -posX];
+          [lastPosX, lastPosY] = [-lastPosY, -lastPosX];
+          break;
+
+        default:
+          [posX, posY] = applyInverseRotation(posX, posY, currentTransform);
+          [lastPosX, lastPosY] = applyInverseRotation(lastPosX, lastPosY, textContentItem.prevTransform);
+      }
+
+      if (textState.font.vertical) {
+        const advanceY = (lastPosY - posY) / textContentItem.textAdvanceScale;
+        const advanceX = posX - lastPosX;
+        const textOrientation = Math.sign(textContentItem.height);
+
+        if (advanceY < textOrientation * textContentItem.negativeSpaceMax) {
+          if (Math.abs(advanceX) > 0.5 * textContentItem.width) {
+            appendEOL();
+            return true;
+          }
+
+          resetLastChars();
+          flushTextContentItem();
+          return true;
         }
 
-        var glyphUnicode = glyph.unicode;
-        var NormalizedUnicodes = (0, _unicode.getNormalizedUnicodes)();
-
-        if (NormalizedUnicodes[glyphUnicode] !== undefined) {
-          glyphUnicode = NormalizedUnicodes[glyphUnicode];
+        if (Math.abs(advanceX) > textContentItem.width) {
+          appendEOL();
+          return true;
         }
 
-        glyphUnicode = (0, _unicode.reverseIfRtl)(glyphUnicode);
-        var charSpacing = textState.charSpacing;
+        if (advanceY <= textOrientation * textContentItem.notASpace) {
+          resetLastChars();
+        }
 
-        if (glyph.isSpace) {
-          var wordSpacing = textState.wordSpacing;
-          charSpacing += wordSpacing;
-
-          if (wordSpacing > 0) {
-            addFakeSpaces(wordSpacing, textChunk.str);
+        if (advanceY <= textOrientation * textContentItem.trackingSpaceMin) {
+          textContentItem.height += advanceY;
+        } else if (!addFakeSpaces(advanceY, textContentItem.prevTransform, textOrientation)) {
+          if (textContentItem.str.length === 0) {
+            resetLastChars();
+            textContent.items.push({
+              str: " ",
+              dir: "ltr",
+              width: 0,
+              height: Math.abs(advanceY),
+              transform: textContentItem.prevTransform,
+              fontName: textContentItem.fontName,
+              hasEOL: false
+            });
+          } else {
+            textContentItem.height += advanceY;
           }
         }
 
-        var tx = 0;
-        var ty = 0;
+        return true;
+      }
 
-        if (!font.vertical) {
-          var w0 = glyphWidth * textState.fontMatrix[0];
-          tx = (w0 * textState.fontSize + charSpacing) * textState.textHScale;
-          width += tx;
-        } else {
-          var w1 = glyphWidth * textState.fontMatrix[0];
-          ty = w1 * textState.fontSize + charSpacing;
-          height += ty;
+      const advanceX = (posX - lastPosX) / textContentItem.textAdvanceScale;
+      const advanceY = posY - lastPosY;
+      const textOrientation = Math.sign(textContentItem.width);
+
+      if (advanceX < textOrientation * textContentItem.negativeSpaceMax) {
+        if (Math.abs(advanceY) > 0.5 * textContentItem.height) {
+          appendEOL();
+          return true;
         }
 
-        textState.translateTextMatrix(tx, ty);
-        textChunk.str.push(glyphUnicode);
+        resetLastChars();
+        flushTextContentItem();
+        return true;
       }
 
-      if (!font.vertical) {
-        textChunk.lastAdvanceWidth = width;
-        textChunk.width += width;
-      } else {
-        textChunk.lastAdvanceHeight = height;
-        textChunk.height += Math.abs(height);
+      if (Math.abs(advanceY) > textContentItem.height) {
+        appendEOL();
+        return true;
       }
 
-      return textChunk;
+      if (advanceX <= textOrientation * textContentItem.notASpace) {
+        resetLastChars();
+      }
+
+      if (advanceX <= textOrientation * textContentItem.trackingSpaceMin) {
+        textContentItem.width += advanceX;
+      } else if (!addFakeSpaces(advanceX, textContentItem.prevTransform, textOrientation)) {
+        if (textContentItem.str.length === 0) {
+          resetLastChars();
+          textContent.items.push({
+            str: " ",
+            dir: "ltr",
+            width: Math.abs(advanceX),
+            height: 0,
+            transform: textContentItem.prevTransform,
+            fontName: textContentItem.fontName,
+            hasEOL: false
+          });
+        } else {
+          textContentItem.width += advanceX;
+        }
+      }
+
+      return true;
     }
 
-    function addFakeSpaces(width, strBuf) {
-      if (width < textContentItem.fakeSpaceMin) {
+    function buildTextContentItem({
+      chars,
+      extraSpacing
+    }) {
+      const font = textState.font;
+
+      if (!chars) {
+        const charSpacing = textState.charSpacing + extraSpacing;
+
+        if (charSpacing) {
+          if (!font.vertical) {
+            textState.translateTextMatrix(charSpacing * textState.textHScale, 0);
+          } else {
+            textState.translateTextMatrix(0, -charSpacing);
+          }
+        }
+
         return;
       }
 
-      if (width < textContentItem.fakeMultiSpaceMin) {
-        strBuf.push(" ");
-        return;
+      const glyphs = font.charsToGlyphs(chars);
+      const scale = textState.fontMatrix[0] * textState.fontSize;
+
+      for (let i = 0, ii = glyphs.length; i < ii; i++) {
+        const glyph = glyphs[i];
+
+        if (glyph.isInvisibleFormatMark) {
+          continue;
+        }
+
+        let charSpacing = textState.charSpacing + (i + 1 === ii ? extraSpacing : 0);
+        let glyphWidth = glyph.width;
+
+        if (font.vertical) {
+          glyphWidth = glyph.vmetric ? glyph.vmetric[0] : -glyphWidth;
+        }
+
+        let scaledDim = glyphWidth * scale;
+
+        if (glyph.isWhitespace) {
+          if (!font.vertical) {
+            charSpacing += scaledDim + textState.wordSpacing;
+            textState.translateTextMatrix(charSpacing * textState.textHScale, 0);
+          } else {
+            charSpacing += -scaledDim + textState.wordSpacing;
+            textState.translateTextMatrix(0, -charSpacing);
+          }
+
+          saveLastChar(" ");
+          continue;
+        }
+
+        if (!compareWithLastPosition()) {
+          continue;
+        }
+
+        const textChunk = ensureTextContentItem();
+
+        if (glyph.isZeroWidthDiacritic) {
+          scaledDim = 0;
+        }
+
+        if (!font.vertical) {
+          scaledDim *= textState.textHScale;
+          textState.translateTextMatrix(scaledDim, 0);
+          textChunk.width += scaledDim;
+        } else {
+          textState.translateTextMatrix(0, scaledDim);
+          scaledDim = Math.abs(scaledDim);
+          textChunk.height += scaledDim;
+        }
+
+        if (scaledDim) {
+          textChunk.prevTransform = getCurrentTextTransform();
+        }
+
+        let glyphUnicode = glyph.unicode;
+        glyphUnicode = NormalizedUnicodes[glyphUnicode] || glyphUnicode;
+        glyphUnicode = (0, _unicode.reverseIfRtl)(glyphUnicode);
+
+        if (saveLastChar(glyphUnicode)) {
+          textChunk.str.push(" ");
+        }
+
+        textChunk.str.push(glyphUnicode);
+
+        if (charSpacing) {
+          if (!font.vertical) {
+            textState.translateTextMatrix(charSpacing * textState.textHScale, 0);
+          } else {
+            textState.translateTextMatrix(0, -charSpacing);
+          }
+        }
+      }
+    }
+
+    function appendEOL() {
+      resetLastChars();
+
+      if (textContentItem.initialized) {
+        textContentItem.hasEOL = true;
+        flushTextContentItem();
+      } else {
+        textContent.items.push({
+          str: "",
+          dir: "ltr",
+          width: 0,
+          height: 0,
+          transform: getCurrentTextTransform(),
+          fontName: textState.font.loadedName,
+          hasEOL: true
+        });
+      }
+    }
+
+    function addFakeSpaces(width, transf, textOrientation) {
+      if (textOrientation * textContentItem.spaceInFlowMin <= width && width <= textOrientation * textContentItem.spaceInFlowMax) {
+        if (textContentItem.initialized) {
+          resetLastChars();
+          textContentItem.str.push(" ");
+        }
+
+        return false;
       }
 
-      var fakeSpaces = Math.round(width / textContentItem.spaceWidth);
+      const fontName = textContentItem.fontName;
+      let height = 0;
 
-      while (fakeSpaces-- > 0) {
-        strBuf.push(" ");
+      if (textContentItem.vertical) {
+        height = width;
+        width = 0;
       }
+
+      flushTextContentItem();
+      resetLastChars();
+      textContent.items.push({
+        str: " ",
+        dir: "ltr",
+        width: Math.abs(width),
+        height: Math.abs(height),
+        transform: transf || getCurrentTextTransform(),
+        fontName,
+        hasEOL: false
+      });
+      return true;
     }
 
     function flushTextContentItem() {
-      if (!textContentItem.initialized) {
+      if (!textContentItem.initialized || !textContentItem.str) {
         return;
       }
 
       if (!textContentItem.vertical) {
-        textContentItem.width *= textContentItem.textAdvanceScale;
+        textContentItem.totalWidth += textContentItem.width * textContentItem.textAdvanceScale;
       } else {
-        textContentItem.height *= textContentItem.textAdvanceScale;
+        textContentItem.totalHeight += textContentItem.height * textContentItem.textAdvanceScale;
       }
 
       textContent.items.push(runBidiTransform(textContentItem));
@@ -23388,20 +12304,26 @@ class PartialEvaluator {
       textContentItem.str.length = 0;
     }
 
-    function enqueueChunk() {
+    function enqueueChunk(batch = false) {
       const length = textContent.items.length;
 
-      if (length > 0) {
-        sink.enqueue(textContent, length);
-        textContent.items = [];
-        textContent.styles = Object.create(null);
+      if (length === 0) {
+        return;
       }
+
+      if (batch && length < TEXT_CHUNK_BATCH_SIZE) {
+        return;
+      }
+
+      sink.enqueue(textContent, length);
+      textContent.items = [];
+      textContent.styles = Object.create(null);
     }
 
-    var timeSlotManager = new TimeSlotManager();
+    const timeSlotManager = new TimeSlotManager();
     return new Promise(function promiseBody(resolve, reject) {
       const next = function (promise) {
-        enqueueChunk();
+        enqueueChunk(true);
         Promise.all([promise, sink.ready]).then(function () {
           try {
             promiseBody(resolve, reject);
@@ -23413,8 +12335,8 @@ class PartialEvaluator {
 
       task.ensureNotTerminated();
       timeSlotManager.reset();
-      var stop,
-          operation = {},
+      const operation = {};
+      let stop,
           args = [];
 
       while (!(stop = timeSlotManager.check())) {
@@ -23426,9 +12348,8 @@ class PartialEvaluator {
         }
 
         textState = stateManager.state;
-        var fn = operation.fn;
+        const fn = operation.fn;
         args = operation.args;
-        var advance, diff;
 
         switch (fn | 0) {
           case _util.OPS.setFont:
@@ -23446,65 +12367,36 @@ class PartialEvaluator {
             return;
 
           case _util.OPS.setTextRise:
-            flushTextContentItem();
             textState.textRise = args[0];
             break;
 
           case _util.OPS.setHScale:
-            flushTextContentItem();
             textState.textHScale = args[0] / 100;
             break;
 
           case _util.OPS.setLeading:
-            flushTextContentItem();
             textState.leading = args[0];
             break;
 
           case _util.OPS.moveText:
-            var isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
-            advance = args[0] - args[1];
-
-            if (combineTextItems && isSameTextLine && textContentItem.initialized && advance > 0 && advance <= textContentItem.fakeMultiSpaceMax) {
-              textState.translateTextLineMatrix(args[0], args[1]);
-              textContentItem.width += args[0] - textContentItem.lastAdvanceWidth;
-              textContentItem.height += args[1] - textContentItem.lastAdvanceHeight;
-              diff = args[0] - textContentItem.lastAdvanceWidth - (args[1] - textContentItem.lastAdvanceHeight);
-              addFakeSpaces(diff, textContentItem.str);
-              break;
-            }
-
-            flushTextContentItem();
             textState.translateTextLineMatrix(args[0], args[1]);
             textState.textMatrix = textState.textLineMatrix.slice();
             break;
 
           case _util.OPS.setLeadingMoveText:
-            flushTextContentItem();
             textState.leading = -args[1];
             textState.translateTextLineMatrix(args[0], args[1]);
             textState.textMatrix = textState.textLineMatrix.slice();
             break;
 
           case _util.OPS.nextLine:
-            flushTextContentItem();
             textState.carriageReturn();
             break;
 
           case _util.OPS.setTextMatrix:
-            advance = textState.calcTextLineMatrixAdvance(args[0], args[1], args[2], args[3], args[4], args[5]);
-
-            if (combineTextItems && advance !== null && textContentItem.initialized && advance.value > 0 && advance.value <= textContentItem.fakeMultiSpaceMax) {
-              textState.translateTextLineMatrix(advance.width, advance.height);
-              textContentItem.width += advance.width - textContentItem.lastAdvanceWidth;
-              textContentItem.height += advance.height - textContentItem.lastAdvanceHeight;
-              diff = advance.width - textContentItem.lastAdvanceWidth - (advance.height - textContentItem.lastAdvanceHeight);
-              addFakeSpaces(diff, textContentItem.str);
-              break;
-            }
-
-            flushTextContentItem();
             textState.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
             textState.setTextLineMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
+            updateAdvanceScale();
             break;
 
           case _util.OPS.setCharSpacing:
@@ -23516,7 +12408,6 @@ class PartialEvaluator {
             break;
 
           case _util.OPS.beginText:
-            flushTextContentItem();
             textState.textMatrix = _util.IDENTITY_MATRIX.slice();
             textState.textLineMatrix = _util.IDENTITY_MATRIX.slice();
             break;
@@ -23527,44 +12418,39 @@ class PartialEvaluator {
               continue;
             }
 
-            var items = args[0];
-            var offset;
+            const spaceFactor = (textState.font.vertical ? 1 : -1) * textState.fontSize / 1000;
+            const elements = args[0];
 
-            for (var j = 0, jj = items.length; j < jj; j++) {
-              if (typeof items[j] === "string") {
-                buildTextContentItem(items[j]);
-              } else if ((0, _util.isNum)(items[j])) {
-                ensureTextContentItem();
-                advance = items[j] * textState.fontSize / 1000;
-                var breakTextRun = false;
+            for (let i = 0, ii = elements.length; i < ii - 1; i++) {
+              const item = elements[i];
 
-                if (textState.font.vertical) {
-                  offset = advance;
-                  textState.translateTextMatrix(0, offset);
-                  breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
-
-                  if (!breakTextRun) {
-                    textContentItem.height += offset;
-                  }
-                } else {
-                  advance = -advance;
-                  offset = advance * textState.textHScale;
-                  textState.translateTextMatrix(offset, 0);
-                  breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
-
-                  if (!breakTextRun) {
-                    textContentItem.width += offset;
-                  }
-                }
-
-                if (breakTextRun) {
-                  flushTextContentItem();
-                } else if (advance > 0) {
-                  addFakeSpaces(advance, textContentItem.str);
-                }
+              if (typeof item === "string") {
+                showSpacedTextBuffer.push(item);
+              } else if (typeof item === "number" && item !== 0) {
+                const str = showSpacedTextBuffer.join("");
+                showSpacedTextBuffer.length = 0;
+                buildTextContentItem({
+                  chars: str,
+                  extraSpacing: item * spaceFactor
+                });
               }
             }
 
+            const item = elements.at(-1);
+
+            if (typeof item === "string") {
+              showSpacedTextBuffer.push(item);
+            }
+
+            if (showSpacedTextBuffer.length > 0) {
+              const str = showSpacedTextBuffer.join("");
+              showSpacedTextBuffer.length = 0;
+              buildTextContentItem({
+                chars: str,
+                extraSpacing: 0
+              });
+            }
+
             break;
 
           case _util.OPS.showText:
@@ -23573,7 +12459,10 @@ class PartialEvaluator {
               continue;
             }
 
-            buildTextContentItem(args[0]);
+            buildTextContentItem({
+              chars: args[0],
+              extraSpacing: 0
+            });
             break;
 
           case _util.OPS.nextLineShowText:
@@ -23582,9 +12471,11 @@ class PartialEvaluator {
               continue;
             }
 
-            flushTextContentItem();
             textState.carriageReturn();
-            buildTextContentItem(args[0]);
+            buildTextContentItem({
+              chars: args[0],
+              extraSpacing: 0
+            });
             break;
 
           case _util.OPS.nextLineSetSpacingShowText:
@@ -23593,11 +12484,13 @@ class PartialEvaluator {
               continue;
             }
 
-            flushTextContentItem();
             textState.wordSpacing = args[0];
             textState.charSpacing = args[1];
             textState.carriageReturn();
-            buildTextContentItem(args[2]);
+            buildTextContentItem({
+              chars: args[2],
+              extraSpacing: 0
+            });
             break;
 
           case _util.OPS.paintXObject:
@@ -23607,14 +12500,15 @@ class PartialEvaluator {
               xobjs = resources.get("XObject") || _primitives.Dict.empty;
             }
 
+            var isValidName = args[0] instanceof _primitives.Name;
             var name = args[0].name;
 
-            if (name && emptyXObjectCache.getByName(name)) {
+            if (isValidName && emptyXObjectCache.getByName(name)) {
               break;
             }
 
             next(new Promise(function (resolveXObject, rejectXObject) {
-              if (!name) {
+              if (!isValidName) {
                 throw new _util.FormatError("XObject must be referred to by name.");
               }
 
@@ -23626,16 +12520,23 @@ class PartialEvaluator {
                   return;
                 }
 
+                const globalImage = self.globalImageCache.getData(xobj, self.pageIndex);
+
+                if (globalImage) {
+                  resolveXObject();
+                  return;
+                }
+
                 xobj = xref.fetch(xobj);
               }
 
-              if (!(0, _primitives.isStream)(xobj)) {
+              if (!(xobj instanceof _base_stream.BaseStream)) {
                 throw new _util.FormatError("XObject should be a stream");
               }
 
               const type = xobj.dict.get("Subtype");
 
-              if (!(0, _primitives.isName)(type)) {
+              if (!(type instanceof _primitives.Name)) {
                 throw new _util.FormatError("XObject should have a Name subtype");
               }
 
@@ -23676,10 +12577,11 @@ class PartialEvaluator {
                 task,
                 resources: xobj.dict.get("Resources") || resources,
                 stateManager: xObjStateManager,
-                normalizeWhitespace,
                 combineTextItems,
+                includeMarkedContent,
                 sink: sinkWrapper,
-                seenStyles
+                seenStyles,
+                viewBox
               }).then(function () {
                 if (!sinkWrapper.enqueueInvoked) {
                   emptyXObjectCache.set(name, xobj.dict.objId, true);
@@ -23702,14 +12604,15 @@ class PartialEvaluator {
             return;
 
           case _util.OPS.setGState:
+            isValidName = args[0] instanceof _primitives.Name;
             name = args[0].name;
 
-            if (name && emptyGStateCache.getByName(name)) {
+            if (isValidName && emptyGStateCache.getByName(name)) {
               break;
             }
 
             next(new Promise(function (resolveGState, rejectGState) {
-              if (!name) {
+              if (!isValidName) {
                 throw new _util.FormatError("GState must be referred to by name.");
               }
 
@@ -23750,6 +12653,48 @@ class PartialEvaluator {
               throw reason;
             }));
             return;
+
+          case _util.OPS.beginMarkedContent:
+            flushTextContentItem();
+
+            if (includeMarkedContent) {
+              textContent.items.push({
+                type: "beginMarkedContent",
+                tag: args[0] instanceof _primitives.Name ? args[0].name : null
+              });
+            }
+
+            break;
+
+          case _util.OPS.beginMarkedContentProps:
+            flushTextContentItem();
+
+            if (includeMarkedContent) {
+              let mcid = null;
+
+              if (args[1] instanceof _primitives.Dict) {
+                mcid = args[1].get("MCID");
+              }
+
+              textContent.items.push({
+                type: "beginMarkedContentProps",
+                id: Number.isInteger(mcid) ? `${self.idFactory.getPageObjId()}_mcid${mcid}` : null,
+                tag: args[0] instanceof _primitives.Name ? args[0].name : null
+              });
+            }
+
+            break;
+
+          case _util.OPS.endMarkedContent:
+            flushTextContentItem();
+
+            if (includeMarkedContent) {
+              textContent.items.push({
+                type: "endMarkedContent"
+              });
+            }
+
+            break;
         }
 
         if (textContent.items.length >= sink.desiredSize) {
@@ -23785,13 +12730,12 @@ class PartialEvaluator {
   extractDataStructures(dict, baseDict, properties) {
     const xref = this.xref;
     let cidToGidBytes;
-    var toUnicode = dict.get("ToUnicode") || baseDict.get("ToUnicode");
-    var toUnicodePromise = toUnicode ? this.readToUnicode(toUnicode) : Promise.resolve(undefined);
+    const toUnicodePromise = this.readToUnicode(properties.toUnicode || dict.get("ToUnicode") || baseDict.get("ToUnicode"));
 
     if (properties.composite) {
-      var cidSystemInfo = dict.get("CIDSystemInfo");
+      const cidSystemInfo = dict.get("CIDSystemInfo");
 
-      if ((0, _primitives.isDict)(cidSystemInfo)) {
+      if (cidSystemInfo instanceof _primitives.Dict) {
         properties.cidSystemInfo = {
           registry: (0, _util.stringToPDFString)(cidSystemInfo.get("Registry")),
           ordering: (0, _util.stringToPDFString)(cidSystemInfo.get("Ordering")),
@@ -23799,44 +12743,58 @@ class PartialEvaluator {
         };
       }
 
-      var cidToGidMap = dict.get("CIDToGIDMap");
+      try {
+        const cidToGidMap = dict.get("CIDToGIDMap");
 
-      if ((0, _primitives.isStream)(cidToGidMap)) {
-        cidToGidBytes = cidToGidMap.getBytes();
+        if (cidToGidMap instanceof _base_stream.BaseStream) {
+          cidToGidBytes = cidToGidMap.getBytes();
+        }
+      } catch (ex) {
+        if (!this.options.ignoreErrors) {
+          throw ex;
+        }
+
+        (0, _util.warn)(`extractDataStructures - ignoring CIDToGIDMap data: "${ex}".`);
       }
     }
 
-    var differences = [];
-    var baseEncodingName = null;
-    var encoding;
+    const differences = [];
+    let baseEncodingName = null;
+    let encoding;
 
     if (dict.has("Encoding")) {
       encoding = dict.get("Encoding");
 
-      if ((0, _primitives.isDict)(encoding)) {
+      if (encoding instanceof _primitives.Dict) {
         baseEncodingName = encoding.get("BaseEncoding");
-        baseEncodingName = (0, _primitives.isName)(baseEncodingName) ? baseEncodingName.name : null;
+        baseEncodingName = baseEncodingName instanceof _primitives.Name ? baseEncodingName.name : null;
 
         if (encoding.has("Differences")) {
-          var diffEncoding = encoding.get("Differences");
-          var index = 0;
+          const diffEncoding = encoding.get("Differences");
+          let index = 0;
 
-          for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
-            var data = xref.fetchIfRef(diffEncoding[j]);
+          for (let j = 0, jj = diffEncoding.length; j < jj; j++) {
+            const data = xref.fetchIfRef(diffEncoding[j]);
 
-            if ((0, _util.isNum)(data)) {
+            if (typeof data === "number") {
               index = data;
-            } else if ((0, _primitives.isName)(data)) {
+            } else if (data instanceof _primitives.Name) {
               differences[index++] = data.name;
             } else {
               throw new _util.FormatError(`Invalid entry in 'Differences' array: ${data}`);
             }
           }
         }
-      } else if ((0, _primitives.isName)(encoding)) {
+      } else if (encoding instanceof _primitives.Name) {
         baseEncodingName = encoding.name;
       } else {
-        throw new _util.FormatError("Encoding is not a Name nor a Dict");
+        const msg = "Encoding is not a Name nor a Dict";
+
+        if (!this.options.ignoreErrors) {
+          throw new _util.FormatError(msg);
+        }
+
+        (0, _util.warn)(msg);
       }
 
       if (baseEncodingName !== "MacRomanEncoding" && baseEncodingName !== "MacExpertEncoding" && baseEncodingName !== "WinAnsiEncoding") {
@@ -23845,10 +12803,10 @@ class PartialEvaluator {
     }
 
     if (baseEncodingName) {
-      properties.defaultEncoding = (0, _encodings.getEncoding)(baseEncodingName).slice();
+      properties.defaultEncoding = (0, _encodings.getEncoding)(baseEncodingName);
     } else {
-      var isSymbolicFont = !!(properties.flags & _fonts.FontFlags.Symbolic);
-      var isNonsymbolicFont = !!(properties.flags & _fonts.FontFlags.Nonsymbolic);
+      const isSymbolicFont = !!(properties.flags & _fonts_utils.FontFlags.Symbolic);
+      const isNonsymbolicFont = !!(properties.flags & _fonts_utils.FontFlags.Nonsymbolic);
       encoding = _encodings.StandardEncoding;
 
       if (properties.type === "TrueType" && !isNonsymbolicFont) {
@@ -23858,7 +12816,7 @@ class PartialEvaluator {
       if (isSymbolicFont) {
         encoding = _encodings.MacRomanEncoding;
 
-        if (!properties.file) {
+        if (!properties.file || properties.isInternalFont) {
           if (/Symbol/i.test(properties.name)) {
             encoding = _encodings.SymbolSetEncoding;
           } else if (/Dingbats|Wingdings/i.test(properties.name)) {
@@ -23888,7 +12846,7 @@ class PartialEvaluator {
     });
   }
 
-  _buildSimpleFontToUnicode(properties, forceGlyphs = false) {
+  _simpleFontToUnicode(properties, forceGlyphs = false) {
     (0, _util.assert)(!properties.composite, "Must be a simple font.");
     const toUnicode = [];
     const encoding = properties.defaultEncoding.slice();
@@ -23943,7 +12901,7 @@ class PartialEvaluator {
               code = +codeStr;
 
               if (Number.isNaN(code) && Number.isInteger(parseInt(codeStr, 16))) {
-                return this._buildSimpleFontToUnicode(properties, true);
+                return this._simpleFontToUnicode(properties, true);
               }
             }
 
@@ -23977,86 +12935,93 @@ class PartialEvaluator {
       toUnicode[charcode] = String.fromCharCode(glyphsUnicodeMap[glyphName]);
     }
 
-    return new _fonts.ToUnicodeMap(toUnicode);
+    return toUnicode;
   }
 
-  buildToUnicode(properties) {
+  async buildToUnicode(properties) {
     properties.hasIncludedToUnicodeMap = !!properties.toUnicode && properties.toUnicode.length > 0;
 
     if (properties.hasIncludedToUnicodeMap) {
       if (!properties.composite && properties.hasEncoding) {
-        properties.fallbackToUnicode = this._buildSimpleFontToUnicode(properties);
+        properties.fallbackToUnicode = this._simpleFontToUnicode(properties);
       }
 
-      return Promise.resolve(properties.toUnicode);
+      return properties.toUnicode;
     }
 
     if (!properties.composite) {
-      return Promise.resolve(this._buildSimpleFontToUnicode(properties));
+      return new _to_unicode_map.ToUnicodeMap(this._simpleFontToUnicode(properties));
     }
 
     if (properties.composite && (properties.cMap.builtInCMap && !(properties.cMap instanceof _cmap.IdentityCMap) || properties.cidSystemInfo.registry === "Adobe" && (properties.cidSystemInfo.ordering === "GB1" || properties.cidSystemInfo.ordering === "CNS1" || properties.cidSystemInfo.ordering === "Japan1" || properties.cidSystemInfo.ordering === "Korea1"))) {
-      const registry = properties.cidSystemInfo.registry;
-      const ordering = properties.cidSystemInfo.ordering;
+      const {
+        registry,
+        ordering
+      } = properties.cidSystemInfo;
 
-      const ucs2CMapName = _primitives.Name.get(registry + "-" + ordering + "-UCS2");
+      const ucs2CMapName = _primitives.Name.get(`${registry}-${ordering}-UCS2`);
 
-      return _cmap.CMapFactory.create({
+      const ucs2CMap = await _cmap.CMapFactory.create({
         encoding: ucs2CMapName,
         fetchBuiltInCMap: this._fetchBuiltInCMapBound,
         useCMap: null
-      }).then(function (ucs2CMap) {
-        const cMap = properties.cMap;
-        const toUnicode = [];
-        cMap.forEach(function (charcode, cid) {
-          if (cid > 0xffff) {
-            throw new _util.FormatError("Max size of CID is 65,535");
-          }
-
-          const ucs2 = ucs2CMap.lookup(cid);
-
-          if (ucs2) {
-            toUnicode[charcode] = String.fromCharCode((ucs2.charCodeAt(0) << 8) + ucs2.charCodeAt(1));
-          }
-        });
-        return new _fonts.ToUnicodeMap(toUnicode);
       });
+      const toUnicode = [];
+      properties.cMap.forEach(function (charcode, cid) {
+        if (cid > 0xffff) {
+          throw new _util.FormatError("Max size of CID is 65,535");
+        }
+
+        const ucs2 = ucs2CMap.lookup(cid);
+
+        if (ucs2) {
+          toUnicode[charcode] = String.fromCharCode((ucs2.charCodeAt(0) << 8) + ucs2.charCodeAt(1));
+        }
+      });
+      return new _to_unicode_map.ToUnicodeMap(toUnicode);
     }
 
-    return Promise.resolve(new _fonts.IdentityToUnicodeMap(properties.firstChar, properties.lastChar));
+    return new _to_unicode_map.IdentityToUnicodeMap(properties.firstChar, properties.lastChar);
   }
 
-  readToUnicode(toUnicode) {
-    var cmapObj = toUnicode;
+  readToUnicode(cmapObj) {
+    if (!cmapObj) {
+      return Promise.resolve(null);
+    }
 
-    if ((0, _primitives.isName)(cmapObj)) {
+    if (cmapObj instanceof _primitives.Name) {
       return _cmap.CMapFactory.create({
         encoding: cmapObj,
         fetchBuiltInCMap: this._fetchBuiltInCMapBound,
         useCMap: null
       }).then(function (cmap) {
         if (cmap instanceof _cmap.IdentityCMap) {
-          return new _fonts.IdentityToUnicodeMap(0, 0xffff);
+          return new _to_unicode_map.IdentityToUnicodeMap(0, 0xffff);
         }
 
-        return new _fonts.ToUnicodeMap(cmap.getMap());
+        return new _to_unicode_map.ToUnicodeMap(cmap.getMap());
       });
-    } else if ((0, _primitives.isStream)(cmapObj)) {
+    } else if (cmapObj instanceof _base_stream.BaseStream) {
       return _cmap.CMapFactory.create({
         encoding: cmapObj,
         fetchBuiltInCMap: this._fetchBuiltInCMapBound,
         useCMap: null
       }).then(function (cmap) {
         if (cmap instanceof _cmap.IdentityCMap) {
-          return new _fonts.IdentityToUnicodeMap(0, 0xffff);
+          return new _to_unicode_map.IdentityToUnicodeMap(0, 0xffff);
         }
 
-        var map = new Array(cmap.length);
+        const map = new Array(cmap.length);
         cmap.forEach(function (charCode, token) {
-          var str = [];
+          if (typeof token === "number") {
+            map[charCode] = String.fromCodePoint(token);
+            return;
+          }
 
-          for (var k = 0; k < token.length; k += 2) {
-            var w1 = token.charCodeAt(k) << 8 | token.charCodeAt(k + 1);
+          const str = [];
+
+          for (let k = 0; k < token.length; k += 2) {
+            const w1 = token.charCodeAt(k) << 8 | token.charCodeAt(k + 1);
 
             if ((w1 & 0xf800) !== 0xd800) {
               str.push(w1);
@@ -24064,13 +13029,13 @@ class PartialEvaluator {
             }
 
             k += 2;
-            var w2 = token.charCodeAt(k) << 8 | token.charCodeAt(k + 1);
+            const w2 = token.charCodeAt(k) << 8 | token.charCodeAt(k + 1);
             str.push(((w1 & 0x3ff) << 10) + (w2 & 0x3ff) + 0x10000);
           }
 
-          map[charCode] = String.fromCodePoint.apply(String, str);
+          map[charCode] = String.fromCodePoint(...str);
         });
-        return new _fonts.ToUnicodeMap(map);
+        return new _to_unicode_map.ToUnicodeMap(map);
       }, reason => {
         if (reason instanceof _util.AbortException) {
           return null;
@@ -24092,10 +13057,10 @@ class PartialEvaluator {
   }
 
   readCidToGidMap(glyphsData, toUnicode) {
-    var result = [];
+    const result = [];
 
-    for (var j = 0, jj = glyphsData.length; j < jj; j++) {
-      var glyphID = glyphsData[j++] << 8 | glyphsData[j];
+    for (let j = 0, jj = glyphsData.length; j < jj; j++) {
+      const glyphID = glyphsData[j++] << 8 | glyphsData[j];
       const code = j >> 1;
 
       if (glyphID === 0 && !toUnicode.has(code)) {
@@ -24109,12 +13074,12 @@ class PartialEvaluator {
   }
 
   extractWidths(dict, descriptor, properties) {
-    var xref = this.xref;
-    var glyphsWidths = [];
-    var defaultWidth = 0;
-    var glyphsVMetrics = [];
-    var defaultVMetrics;
-    var i, ii, j, jj, start, code, widths;
+    const xref = this.xref;
+    let glyphsWidths = [];
+    let defaultWidth = 0;
+    const glyphsVMetrics = [];
+    let defaultVMetrics;
+    let i, ii, j, jj, start, code, widths;
 
     if (properties.composite) {
       defaultWidth = dict.has("DW") ? dict.get("DW") : 1000;
@@ -24130,7 +13095,7 @@ class PartialEvaluator {
               glyphsWidths[start++] = xref.fetchIfRef(code[j]);
             }
           } else {
-            var width = xref.fetchIfRef(widths[++i]);
+            const width = xref.fetchIfRef(widths[++i]);
 
             for (j = start; j <= code; j++) {
               glyphsWidths[j] = width;
@@ -24140,7 +13105,7 @@ class PartialEvaluator {
       }
 
       if (properties.vertical) {
-        var vmetrics = dict.getArray("DW2") || [880, -1000];
+        let vmetrics = dict.getArray("DW2") || [880, -1000];
         defaultVMetrics = [vmetrics[1], defaultWidth * 0.5, vmetrics[0]];
         vmetrics = dict.get("W2");
 
@@ -24154,7 +13119,7 @@ class PartialEvaluator {
                 glyphsVMetrics[start++] = [xref.fetchIfRef(code[j++]), xref.fetchIfRef(code[j++]), xref.fetchIfRef(code[j])];
               }
             } else {
-              var vmetric = [xref.fetchIfRef(vmetrics[++i]), xref.fetchIfRef(vmetrics[++i]), xref.fetchIfRef(vmetrics[++i])];
+              const vmetric = [xref.fetchIfRef(vmetrics[++i]), xref.fetchIfRef(vmetrics[++i]), xref.fetchIfRef(vmetrics[++i])];
 
               for (j = start; j <= code; j++) {
                 glyphsVMetrics[j] = vmetric;
@@ -24164,7 +13129,7 @@ class PartialEvaluator {
         }
       }
     } else {
-      var firstChar = properties.firstChar;
+      const firstChar = properties.firstChar;
       widths = dict.get("Widths");
 
       if (widths) {
@@ -24176,21 +13141,21 @@ class PartialEvaluator {
 
         defaultWidth = parseFloat(descriptor.get("MissingWidth")) || 0;
       } else {
-        var baseFontName = dict.get("BaseFont");
+        const baseFontName = dict.get("BaseFont");
 
-        if ((0, _primitives.isName)(baseFontName)) {
-          var metrics = this.getBaseFontMetrics(baseFontName.name);
+        if (baseFontName instanceof _primitives.Name) {
+          const metrics = this.getBaseFontMetrics(baseFontName.name);
           glyphsWidths = this.buildCharCodeToWidth(metrics.widths, properties);
           defaultWidth = metrics.defaultWidth;
         }
       }
     }
 
-    var isMonospace = true;
-    var firstWidth = defaultWidth;
+    let isMonospace = true;
+    let firstWidth = defaultWidth;
 
-    for (var glyph in glyphsWidths) {
-      var glyphWidth = glyphsWidths[glyph];
+    for (const glyph in glyphsWidths) {
+      const glyphWidth = glyphsWidths[glyph];
 
       if (!glyphWidth) {
         continue;
@@ -24208,7 +13173,7 @@ class PartialEvaluator {
     }
 
     if (isMonospace) {
-      properties.flags |= _fonts.FontFlags.FixedPitch;
+      properties.flags |= _fonts_utils.FontFlags.FixedPitch;
     }
 
     properties.defaultWidth = defaultWidth;
@@ -24218,17 +13183,17 @@ class PartialEvaluator {
   }
 
   isSerifFont(baseFontName) {
-    var fontNameWoStyle = baseFontName.split("-")[0];
+    const fontNameWoStyle = baseFontName.split("-")[0];
     return fontNameWoStyle in (0, _standard_fonts.getSerifFonts)() || fontNameWoStyle.search(/serif/gi) !== -1;
   }
 
   getBaseFontMetrics(name) {
-    var defaultWidth = 0;
-    var widths = [];
-    var monospace = false;
-    var stdFontMap = (0, _standard_fonts.getStdFontMap)();
-    var lookupName = stdFontMap[name] || name;
-    var Metrics = (0, _metrics.getMetrics)();
+    let defaultWidth = 0;
+    let widths = Object.create(null);
+    let monospace = false;
+    const stdFontMap = (0, _standard_fonts.getStdFontMap)();
+    let lookupName = stdFontMap[name] || name;
+    const Metrics = (0, _metrics.getMetrics)();
 
     if (!(lookupName in Metrics)) {
       if (this.isSerifFont(name)) {
@@ -24238,9 +13203,9 @@ class PartialEvaluator {
       }
     }
 
-    var glyphWidths = Metrics[lookupName];
+    const glyphWidths = Metrics[lookupName];
 
-    if ((0, _util.isNum)(glyphWidths)) {
+    if (typeof glyphWidths === "number") {
       defaultWidth = glyphWidths;
       monospace = true;
     } else {
@@ -24255,11 +13220,11 @@ class PartialEvaluator {
   }
 
   buildCharCodeToWidth(widthsByGlyphName, properties) {
-    var widths = Object.create(null);
-    var differences = properties.differences;
-    var encoding = properties.defaultEncoding;
+    const widths = Object.create(null);
+    const differences = properties.differences;
+    const encoding = properties.defaultEncoding;
 
-    for (var charCode = 0; charCode < 256; charCode++) {
+    for (let charCode = 0; charCode < 256; charCode++) {
       if (charCode in differences && widthsByGlyphName[differences[charCode]]) {
         widths[charCode] = widthsByGlyphName[differences[charCode]];
         continue;
@@ -24275,59 +13240,66 @@ class PartialEvaluator {
   }
 
   preEvaluateFont(dict) {
-    var baseDict = dict;
-    var type = dict.get("Subtype");
+    const baseDict = dict;
+    let type = dict.get("Subtype");
 
-    if (!(0, _primitives.isName)(type)) {
+    if (!(type instanceof _primitives.Name)) {
       throw new _util.FormatError("invalid font Subtype");
     }
 
-    var composite = false;
-    var uint8array;
+    let composite = false;
+    let hash, toUnicode;
 
     if (type.name === "Type0") {
-      var df = dict.get("DescendantFonts");
+      const df = dict.get("DescendantFonts");
 
       if (!df) {
         throw new _util.FormatError("Descendant fonts are not specified");
       }
 
       dict = Array.isArray(df) ? this.xref.fetchIfRef(df[0]) : df;
+
+      if (!(dict instanceof _primitives.Dict)) {
+        throw new _util.FormatError("Descendant font is not a dictionary.");
+      }
+
       type = dict.get("Subtype");
 
-      if (!(0, _primitives.isName)(type)) {
+      if (!(type instanceof _primitives.Name)) {
         throw new _util.FormatError("invalid font Subtype");
       }
 
       composite = true;
     }
 
-    var descriptor = dict.get("FontDescriptor");
+    const firstChar = dict.get("FirstChar") || 0,
+          lastChar = dict.get("LastChar") || (composite ? 0xffff : 0xff);
+    const descriptor = dict.get("FontDescriptor");
 
     if (descriptor) {
-      var hash = new _murmurhash.MurmurHash3_64();
-      var encoding = baseDict.getRaw("Encoding");
+      hash = new _murmurhash.MurmurHash3_64();
+      const encoding = baseDict.getRaw("Encoding");
 
-      if ((0, _primitives.isName)(encoding)) {
+      if (encoding instanceof _primitives.Name) {
         hash.update(encoding.name);
-      } else if ((0, _primitives.isRef)(encoding)) {
+      } else if (encoding instanceof _primitives.Ref) {
         hash.update(encoding.toString());
-      } else if ((0, _primitives.isDict)(encoding)) {
+      } else if (encoding instanceof _primitives.Dict) {
         for (const entry of encoding.getRawValues()) {
-          if ((0, _primitives.isName)(entry)) {
+          if (entry instanceof _primitives.Name) {
             hash.update(entry.name);
-          } else if ((0, _primitives.isRef)(entry)) {
+          } else if (entry instanceof _primitives.Ref) {
             hash.update(entry.toString());
           } else if (Array.isArray(entry)) {
-            var diffLength = entry.length,
-                diffBuf = new Array(diffLength);
+            const diffLength = entry.length,
+                  diffBuf = new Array(diffLength);
 
-            for (var j = 0; j < diffLength; j++) {
-              var diffEntry = entry[j];
+            for (let j = 0; j < diffLength; j++) {
+              const diffEntry = entry[j];
 
-              if ((0, _primitives.isName)(diffEntry)) {
+              if (diffEntry instanceof _primitives.Name) {
                 diffBuf[j] = diffEntry.name;
-              } else if ((0, _util.isNum)(diffEntry) || (0, _primitives.isRef)(diffEntry)) {
+              } else if (typeof diffEntry === "number" || diffEntry instanceof _primitives.Ref) {
                 diffBuf[j] = diffEntry.toString();
               }
             }
@@ -24337,24 +13309,66 @@ class PartialEvaluator {
         }
       }
 
-      const firstChar = dict.get("FirstChar") || 0;
-      const lastChar = dict.get("LastChar") || (composite ? 0xffff : 0xff);
       hash.update(`${firstChar}-${lastChar}`);
-      var toUnicode = dict.get("ToUnicode") || baseDict.get("ToUnicode");
+      toUnicode = dict.get("ToUnicode") || baseDict.get("ToUnicode");
 
-      if ((0, _primitives.isStream)(toUnicode)) {
-        var stream = toUnicode.str || toUnicode;
-        uint8array = stream.buffer ? new Uint8Array(stream.buffer.buffer, 0, stream.bufferLength) : new Uint8Array(stream.bytes.buffer, stream.start, stream.end - stream.start);
+      if (toUnicode instanceof _base_stream.BaseStream) {
+        const stream = toUnicode.str || toUnicode;
+        const uint8array = stream.buffer ? new Uint8Array(stream.buffer.buffer, 0, stream.bufferLength) : new Uint8Array(stream.bytes.buffer, stream.start, stream.end - stream.start);
         hash.update(uint8array);
-      } else if ((0, _primitives.isName)(toUnicode)) {
+      } else if (toUnicode instanceof _primitives.Name) {
         hash.update(toUnicode.name);
       }
 
-      var widths = dict.get("Widths") || baseDict.get("Widths");
+      const widths = dict.get("Widths") || baseDict.get("Widths");
 
-      if (widths) {
-        uint8array = new Uint8Array(new Uint32Array(widths).buffer);
-        hash.update(uint8array);
+      if (Array.isArray(widths)) {
+        const widthsBuf = [];
+
+        for (const entry of widths) {
+          if (typeof entry === "number" || entry instanceof _primitives.Ref) {
+            widthsBuf.push(entry.toString());
+          }
+        }
+
+        hash.update(widthsBuf.join());
+      }
+
+      if (composite) {
+        hash.update("compositeFont");
+        const compositeWidths = dict.get("W") || baseDict.get("W");
+
+        if (Array.isArray(compositeWidths)) {
+          const widthsBuf = [];
+
+          for (const entry of compositeWidths) {
+            if (typeof entry === "number" || entry instanceof _primitives.Ref) {
+              widthsBuf.push(entry.toString());
+            } else if (Array.isArray(entry)) {
+              const subWidthsBuf = [];
+
+              for (const element of entry) {
+                if (typeof element === "number" || element instanceof _primitives.Ref) {
+                  subWidthsBuf.push(element.toString());
+                }
+              }
+
+              widthsBuf.push(`[${subWidthsBuf.join()}]`);
+            }
+          }
+
+          hash.update(widthsBuf.join());
+        }
+
+        const cidToGidMap = dict.getRaw("CIDToGIDMap") || baseDict.getRaw("CIDToGIDMap");
+
+        if (cidToGidMap instanceof _primitives.Name) {
+          hash.update(cidToGidMap.name);
+        } else if (cidToGidMap instanceof _primitives.Ref) {
+          hash.update(cidToGidMap.toString());
+        } else if (cidToGidMap instanceof _base_stream.BaseStream) {
+          hash.update(cidToGidMap.peekBytes());
+        }
       }
     }
 
@@ -24364,47 +13378,69 @@ class PartialEvaluator {
       baseDict,
       composite,
       type: type.name,
+      firstChar,
+      lastChar,
+      toUnicode,
       hash: hash ? hash.hexdigest() : ""
     };
   }
 
-  translateFont(preEvaluatedFont) {
-    var baseDict = preEvaluatedFont.baseDict;
-    var dict = preEvaluatedFont.dict;
-    var composite = preEvaluatedFont.composite;
-    var descriptor = preEvaluatedFont.descriptor;
-    var type = preEvaluatedFont.type;
-    var maxCharIndex = composite ? 0xffff : 0xff;
-    var properties;
-    const firstChar = dict.get("FirstChar") || 0;
-    const lastChar = dict.get("LastChar") || maxCharIndex;
+  async translateFont({
+    descriptor,
+    dict,
+    baseDict,
+    composite,
+    type,
+    firstChar,
+    lastChar,
+    toUnicode,
+    cssFontInfo
+  }) {
+    const isType3Font = type === "Type3";
+    let properties;
 
     if (!descriptor) {
-      if (type === "Type3") {
+      if (isType3Font) {
         descriptor = new _primitives.Dict(null);
         descriptor.set("FontName", _primitives.Name.get(type));
         descriptor.set("FontBBox", dict.getArray("FontBBox") || [0, 0, 0, 0]);
       } else {
-        var baseFontName = dict.get("BaseFont");
+        let baseFontName = dict.get("BaseFont");
 
-        if (!(0, _primitives.isName)(baseFontName)) {
+        if (!(baseFontName instanceof _primitives.Name)) {
           throw new _util.FormatError("Base font is not specified");
         }
 
         baseFontName = baseFontName.name.replace(/[,_]/g, "-");
-        var metrics = this.getBaseFontMetrics(baseFontName);
-        var fontNameWoStyle = baseFontName.split("-")[0];
-        var flags = (this.isSerifFont(fontNameWoStyle) ? _fonts.FontFlags.Serif : 0) | (metrics.monospace ? _fonts.FontFlags.FixedPitch : 0) | ((0, _standard_fonts.getSymbolsFonts)()[fontNameWoStyle] ? _fonts.FontFlags.Symbolic : _fonts.FontFlags.Nonsymbolic);
+        const metrics = this.getBaseFontMetrics(baseFontName);
+        const fontNameWoStyle = baseFontName.split("-")[0];
+        const flags = (this.isSerifFont(fontNameWoStyle) ? _fonts_utils.FontFlags.Serif : 0) | (metrics.monospace ? _fonts_utils.FontFlags.FixedPitch : 0) | ((0, _standard_fonts.getSymbolsFonts)()[fontNameWoStyle] ? _fonts_utils.FontFlags.Symbolic : _fonts_utils.FontFlags.Nonsymbolic);
         properties = {
           type,
           name: baseFontName,
+          loadedName: baseDict.loadedName,
           widths: metrics.widths,
           defaultWidth: metrics.defaultWidth,
+          isSimulatedFlags: true,
           flags,
           firstChar,
-          lastChar
+          lastChar,
+          toUnicode,
+          xHeight: 0,
+          capHeight: 0,
+          italicAngle: 0,
+          isType3Font
         };
         const widths = dict.get("Widths");
+        const standardFontName = (0, _standard_fonts.getStandardFontName)(baseFontName);
+        let file = null;
+
+        if (standardFontName) {
+          properties.isStandardFont = true;
+          file = await this.fetchStandardFontData(standardFontName);
+          properties.isInternalFont = !!file;
+        }
+
         return this.extractDataStructures(dict, dict, properties).then(newProperties => {
           if (widths) {
             const glyphWidths = [];
@@ -24419,28 +13455,28 @@ class PartialEvaluator {
             newProperties.widths = this.buildCharCodeToWidth(metrics.widths, newProperties);
           }
 
-          return new _fonts.Font(baseFontName, null, newProperties);
+          return new _fonts.Font(baseFontName, file, newProperties);
         });
       }
     }
 
-    var fontName = descriptor.get("FontName");
-    var baseFont = dict.get("BaseFont");
+    let fontName = descriptor.get("FontName");
+    let baseFont = dict.get("BaseFont");
 
-    if ((0, _util.isString)(fontName)) {
+    if (typeof fontName === "string") {
       fontName = _primitives.Name.get(fontName);
     }
 
-    if ((0, _util.isString)(baseFont)) {
+    if (typeof baseFont === "string") {
       baseFont = _primitives.Name.get(baseFont);
     }
 
-    if (type !== "Type3") {
-      var fontNameStr = fontName && fontName.name;
-      var baseFontStr = baseFont && baseFont.name;
+    if (!isType3Font) {
+      const fontNameStr = fontName && fontName.name;
+      const baseFontStr = baseFont && baseFont.name;
 
       if (fontNameStr !== baseFontStr) {
-        (0, _util.info)(`The FontDescriptor\'s FontName is "${fontNameStr}" but ` + `should be the same as the Font\'s BaseFont "${baseFontStr}".`);
+        (0, _util.info)(`The FontDescriptor's FontName is "${fontNameStr}" but ` + `should be the same as the Font's BaseFont "${baseFontStr}".`);
 
         if (fontNameStr && baseFontStr && baseFontStr.startsWith(fontNameStr)) {
           fontName = baseFont;
@@ -24450,23 +13486,58 @@ class PartialEvaluator {
 
     fontName = fontName || baseFont;
 
-    if (!(0, _primitives.isName)(fontName)) {
+    if (!(fontName instanceof _primitives.Name)) {
       throw new _util.FormatError("invalid font name");
     }
 
-    var fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3");
+    let fontFile, subtype, length1, length2, length3;
+
+    try {
+      fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3");
+    } catch (ex) {
+      if (!this.options.ignoreErrors) {
+        throw ex;
+      }
+
+      (0, _util.warn)(`translateFont - fetching "${fontName.name}" font file: "${ex}".`);
+      fontFile = new _stream.NullStream();
+    }
+
+    let isStandardFont = false;
+    let isInternalFont = false;
+    let glyphScaleFactors = null;
 
     if (fontFile) {
       if (fontFile.dict) {
-        var subtype = fontFile.dict.get("Subtype");
+        const subtypeEntry = fontFile.dict.get("Subtype");
 
-        if (subtype) {
-          subtype = subtype.name;
+        if (subtypeEntry instanceof _primitives.Name) {
+          subtype = subtypeEntry.name;
         }
 
-        var length1 = fontFile.dict.get("Length1");
-        var length2 = fontFile.dict.get("Length2");
-        var length3 = fontFile.dict.get("Length3");
+        length1 = fontFile.dict.get("Length1");
+        length2 = fontFile.dict.get("Length2");
+        length3 = fontFile.dict.get("Length3");
+      }
+    } else if (cssFontInfo) {
+      const standardFontName = (0, _xfa_fonts.getXfaFontName)(fontName.name);
+
+      if (standardFontName) {
+        cssFontInfo.fontFamily = `${cssFontInfo.fontFamily}-PdfJS-XFA`;
+        cssFontInfo.metrics = standardFontName.metrics || null;
+        glyphScaleFactors = standardFontName.factors || null;
+        fontFile = await this.fetchStandardFontData(standardFontName.name);
+        isInternalFont = !!fontFile;
+        baseDict = dict = (0, _xfa_fonts.getXfaFontDict)(fontName.name);
+        composite = true;
+      }
+    } else if (!isType3Font) {
+      const standardFontName = (0, _standard_fonts.getStandardFontName)(fontName.name);
+
+      if (standardFontName) {
+        isStandardFont = true;
+        fontFile = await this.fetchStandardFontData(standardFontName);
+        isInternalFont = !!fontFile;
       }
     }
 
@@ -24478,62 +13549,70 @@ class PartialEvaluator {
       length1,
       length2,
       length3,
+      isStandardFont,
+      isInternalFont,
       loadedName: baseDict.loadedName,
       composite,
       fixedPitch: false,
       fontMatrix: dict.getArray("FontMatrix") || _util.FONT_IDENTITY_MATRIX,
-      firstChar: firstChar || 0,
-      lastChar: lastChar || maxCharIndex,
-      bbox: descriptor.getArray("FontBBox"),
+      firstChar,
+      lastChar,
+      toUnicode,
+      bbox: descriptor.getArray("FontBBox") || dict.getArray("FontBBox"),
       ascent: descriptor.get("Ascent"),
       descent: descriptor.get("Descent"),
-      xHeight: descriptor.get("XHeight"),
-      capHeight: descriptor.get("CapHeight"),
+      xHeight: descriptor.get("XHeight") || 0,
+      capHeight: descriptor.get("CapHeight") || 0,
       flags: descriptor.get("Flags"),
-      italicAngle: descriptor.get("ItalicAngle"),
-      isType3Font: false
+      italicAngle: descriptor.get("ItalicAngle") || 0,
+      isType3Font,
+      cssFontInfo,
+      scaleFactors: glyphScaleFactors
     };
-    var cMapPromise;
 
     if (composite) {
-      var cidEncoding = baseDict.get("Encoding");
+      const cidEncoding = baseDict.get("Encoding");
 
-      if ((0, _primitives.isName)(cidEncoding)) {
+      if (cidEncoding instanceof _primitives.Name) {
         properties.cidEncoding = cidEncoding.name;
       }
 
-      cMapPromise = _cmap.CMapFactory.create({
+      const cMap = await _cmap.CMapFactory.create({
         encoding: cidEncoding,
         fetchBuiltInCMap: this._fetchBuiltInCMapBound,
         useCMap: null
-      }).then(function (cMap) {
-        properties.cMap = cMap;
-        properties.vertical = properties.cMap.vertical;
       });
-    } else {
-      cMapPromise = Promise.resolve(undefined);
+      properties.cMap = cMap;
+      properties.vertical = properties.cMap.vertical;
     }
 
-    return cMapPromise.then(() => {
-      return this.extractDataStructures(dict, baseDict, properties);
-    }).then(newProperties => {
+    return this.extractDataStructures(dict, baseDict, properties).then(newProperties => {
       this.extractWidths(dict, descriptor, newProperties);
-
-      if (type === "Type3") {
-        newProperties.isType3Font = true;
-      }
-
       return new _fonts.Font(fontName.name, fontFile, newProperties);
     });
   }
 
-  static buildFontPaths(font, glyphs, handler) {
+  static buildFontPaths(font, glyphs, handler, evaluatorOptions) {
     function buildPath(fontChar) {
-      if (font.renderer.hasBuiltPath(fontChar)) {
-        return;
-      }
+      const glyphName = `${font.loadedName}_path_${fontChar}`;
 
-      handler.send("commonobj", [`${font.loadedName}_path_${fontChar}`, "FontPath", font.renderer.getPathJs(fontChar)]);
+      try {
+        if (font.renderer.hasBuiltPath(fontChar)) {
+          return;
+        }
+
+        handler.send("commonobj", [glyphName, "FontPath", font.renderer.getPathJs(fontChar)]);
+      } catch (reason) {
+        if (evaluatorOptions.ignoreErrors) {
+          handler.send("UnsupportedFeature", {
+            featureId: _util.UNSUPPORTED_FEATURES.errorFontBuildPath
+          });
+          (0, _util.warn)(`buildFontPaths - ignoring ${glyphName} glyph: "${reason}".`);
+          return;
+        }
+
+        throw reason;
+      }
     }
 
     for (const glyph of glyphs) {
@@ -24564,12 +13643,12 @@ class TranslatedFont {
     loadedName,
     font,
     dict,
-    extraProperties = false
+    evaluatorOptions
   }) {
     this.loadedName = loadedName;
     this.font = font;
     this.dict = dict;
-    this._extraProperties = extraProperties;
+    this._evaluatorOptions = evaluatorOptions || DefaultPartialEvaluatorOptions;
     this.type3Loaded = null;
     this.type3Dependencies = font.isType3Font ? new Set() : null;
     this.sent = false;
@@ -24581,7 +13660,7 @@ class TranslatedFont {
     }
 
     this.sent = true;
-    handler.send("commonobj", [this.loadedName, "Font", this.font.exportData(this._extraProperties)]);
+    handler.send("commonobj", [this.loadedName, "Font", this.font.exportData(this._evaluatorOptions.fontExtraProperties)]);
   }
 
   fallback(handler) {
@@ -24590,8 +13669,7 @@ class TranslatedFont {
     }
 
     this.font.disableFontFace = true;
-    const glyphs = this.font.glyphCacheValues;
-    PartialEvaluator.buildFontPaths(this.font, glyphs, handler);
+    PartialEvaluator.buildFontPaths(this.font, this.font.glyphCacheValues, handler, this._evaluatorOptions);
   }
 
   loadType3Data(evaluator, resources, task) {
@@ -24603,27 +13681,44 @@ class TranslatedFont {
       throw new Error("Must be a Type3 font.");
     }
 
-    var type3Options = Object.create(evaluator.options);
-    type3Options.ignoreErrors = false;
-    var type3Evaluator = evaluator.clone(type3Options);
+    const type3Evaluator = evaluator.clone({
+      ignoreErrors: false
+    });
     type3Evaluator.parsingType3Font = true;
+    const type3FontRefs = new _primitives.RefSet(evaluator.type3FontRefs);
+
+    if (this.dict.objId && !type3FontRefs.has(this.dict.objId)) {
+      type3FontRefs.put(this.dict.objId);
+    }
+
+    type3Evaluator.type3FontRefs = type3FontRefs;
     const translatedFont = this.font,
           type3Dependencies = this.type3Dependencies;
-    var loadCharProcsPromise = Promise.resolve();
-    var charProcs = this.dict.get("CharProcs");
-    var fontResources = this.dict.get("Resources") || resources;
-    var charProcOperatorList = Object.create(null);
+    let loadCharProcsPromise = Promise.resolve();
+    const charProcs = this.dict.get("CharProcs");
+    const fontResources = this.dict.get("Resources") || resources;
+    const charProcOperatorList = Object.create(null);
+
+    const fontBBox = _util.Util.normalizeRect(translatedFont.bbox || [0, 0, 0, 0]),
+          width = fontBBox[2] - fontBBox[0],
+          height = fontBBox[3] - fontBBox[1];
+
+    const fontBBoxSize = Math.hypot(width, height);
 
     for (const key of charProcs.getKeys()) {
-      loadCharProcsPromise = loadCharProcsPromise.then(function () {
-        var glyphStream = charProcs.get(key);
-        var operatorList = new _operator_list.OperatorList();
+      loadCharProcsPromise = loadCharProcsPromise.then(() => {
+        const glyphStream = charProcs.get(key);
+        const operatorList = new _operator_list.OperatorList();
         return type3Evaluator.getOperatorList({
           stream: glyphStream,
           task,
           resources: fontResources,
           operatorList
-        }).then(function () {
+        }).then(() => {
+          if (operatorList.fnArray[0] === _util.OPS.setCharWidthAndBounds) {
+            this._removeType3ColorOperators(operatorList, fontBBoxSize);
+          }
+
           charProcOperatorList[key] = operatorList.getIR();
 
           for (const dependency of operatorList.dependencies) {
@@ -24637,28 +13732,112 @@ class TranslatedFont {
       });
     }
 
-    this.type3Loaded = loadCharProcsPromise.then(function () {
+    this.type3Loaded = loadCharProcsPromise.then(() => {
       translatedFont.charProcOperatorList = charProcOperatorList;
+
+      if (this._bbox) {
+        translatedFont.isCharBBox = true;
+        translatedFont.bbox = this._bbox;
+      }
     });
     return this.type3Loaded;
   }
 
+  _removeType3ColorOperators(operatorList, fontBBoxSize = NaN) {
+    const charBBox = _util.Util.normalizeRect(operatorList.argsArray[0].slice(2)),
+          width = charBBox[2] - charBBox[0],
+          height = charBBox[3] - charBBox[1];
+
+    const charBBoxSize = Math.hypot(width, height);
+
+    if (width === 0 || height === 0) {
+      operatorList.fnArray.splice(0, 1);
+      operatorList.argsArray.splice(0, 1);
+    } else if (fontBBoxSize === 0 || Math.round(charBBoxSize / fontBBoxSize) >= 10) {
+      if (!this._bbox) {
+        this._bbox = [Infinity, Infinity, -Infinity, -Infinity];
+      }
+
+      this._bbox[0] = Math.min(this._bbox[0], charBBox[0]);
+      this._bbox[1] = Math.min(this._bbox[1], charBBox[1]);
+      this._bbox[2] = Math.max(this._bbox[2], charBBox[2]);
+      this._bbox[3] = Math.max(this._bbox[3], charBBox[3]);
+    }
+
+    let i = 0,
+        ii = operatorList.length;
+
+    while (i < ii) {
+      switch (operatorList.fnArray[i]) {
+        case _util.OPS.setCharWidthAndBounds:
+          break;
+
+        case _util.OPS.setStrokeColorSpace:
+        case _util.OPS.setFillColorSpace:
+        case _util.OPS.setStrokeColor:
+        case _util.OPS.setStrokeColorN:
+        case _util.OPS.setFillColor:
+        case _util.OPS.setFillColorN:
+        case _util.OPS.setStrokeGray:
+        case _util.OPS.setFillGray:
+        case _util.OPS.setStrokeRGBColor:
+        case _util.OPS.setFillRGBColor:
+        case _util.OPS.setStrokeCMYKColor:
+        case _util.OPS.setFillCMYKColor:
+        case _util.OPS.shadingFill:
+        case _util.OPS.setRenderingIntent:
+          operatorList.fnArray.splice(i, 1);
+          operatorList.argsArray.splice(i, 1);
+          ii--;
+          continue;
+
+        case _util.OPS.setGState:
+          const [gStateObj] = operatorList.argsArray[i];
+          let j = 0,
+              jj = gStateObj.length;
+
+          while (j < jj) {
+            const [gStateKey] = gStateObj[j];
+
+            switch (gStateKey) {
+              case "TR":
+              case "TR2":
+              case "HT":
+              case "BG":
+              case "BG2":
+              case "UCR":
+              case "UCR2":
+                gStateObj.splice(j, 1);
+                jj--;
+                continue;
+            }
+
+            j++;
+          }
+
+          break;
+      }
+
+      i++;
+    }
+  }
+
 }
 
 class StateManager {
-  constructor(initialState) {
+  constructor(initialState = new EvalState()) {
     this.state = initialState;
     this.stateStack = [];
   }
 
   save() {
-    var old = this.state;
+    const old = this.state;
     this.stateStack.push(this.state);
     this.state = old.clone();
   }
 
   restore() {
-    var prev = this.stateStack.pop();
+    const prev = this.stateStack.pop();
 
     if (prev) {
       this.state = prev;
@@ -24688,7 +13867,7 @@ class TextState {
   }
 
   setTextMatrix(a, b, c, d, e, f) {
-    var m = this.textMatrix;
+    const m = this.textMatrix;
     m[0] = a;
     m[1] = b;
     m[2] = c;
@@ -24698,7 +13877,7 @@ class TextState {
   }
 
   setTextLineMatrix(a, b, c, d, e, f) {
-    var m = this.textLineMatrix;
+    const m = this.textLineMatrix;
     m[0] = a;
     m[1] = b;
     m[2] = c;
@@ -24708,68 +13887,24 @@ class TextState {
   }
 
   translateTextMatrix(x, y) {
-    var m = this.textMatrix;
+    const m = this.textMatrix;
     m[4] = m[0] * x + m[2] * y + m[4];
     m[5] = m[1] * x + m[3] * y + m[5];
   }
 
   translateTextLineMatrix(x, y) {
-    var m = this.textLineMatrix;
+    const m = this.textLineMatrix;
     m[4] = m[0] * x + m[2] * y + m[4];
     m[5] = m[1] * x + m[3] * y + m[5];
   }
 
-  calcTextLineMatrixAdvance(a, b, c, d, e, f) {
-    var font = this.font;
-
-    if (!font) {
-      return null;
-    }
-
-    var m = this.textLineMatrix;
-
-    if (!(a === m[0] && b === m[1] && c === m[2] && d === m[3])) {
-      return null;
-    }
-
-    var txDiff = e - m[4],
-        tyDiff = f - m[5];
-
-    if (font.vertical && txDiff !== 0 || !font.vertical && tyDiff !== 0) {
-      return null;
-    }
-
-    var tx,
-        ty,
-        denominator = a * d - b * c;
-
-    if (font.vertical) {
-      tx = -tyDiff * c / denominator;
-      ty = tyDiff * a / denominator;
-    } else {
-      tx = txDiff * d / denominator;
-      ty = -txDiff * b / denominator;
-    }
-
-    return {
-      width: tx,
-      height: ty,
-      value: font.vertical ? ty : tx
-    };
-  }
-
-  calcRenderMatrix(ctm) {
-    var tsm = [this.fontSize * this.textHScale, 0, 0, this.fontSize, 0, this.textRise];
-    return _util.Util.transform(ctm, _util.Util.transform(this.textMatrix, tsm));
-  }
-
   carriageReturn() {
     this.translateTextLineMatrix(0, -this.leading);
     this.textMatrix = this.textLineMatrix.slice();
   }
 
   clone() {
-    var clone = Object.create(this);
+    const clone = Object.create(this);
     clone.textMatrix = this.textMatrix.slice();
     clone.textLineMatrix = this.textLineMatrix.slice();
     clone.fontMatrix = this.fontMatrix.slice();
@@ -25176,16 +14311,17 @@ class EvaluatorPreprocessor {
   }
 
   static get MAX_INVALID_PATH_OPS() {
-    return (0, _util.shadow)(this, "MAX_INVALID_PATH_OPS", 20);
+    return (0, _util.shadow)(this, "MAX_INVALID_PATH_OPS", 10);
   }
 
-  constructor(stream, xref, stateManager) {
+  constructor(stream, xref, stateManager = new StateManager()) {
     this.parser = new _parser.Parser({
       lexer: new _parser.Lexer(stream, EvaluatorPreprocessor.opMap),
       xref
     });
     this.stateManager = stateManager;
     this.nonProcessedArgs = [];
+    this._isPathOp = false;
     this._numInvalidPathOPS = 0;
   }
 
@@ -25194,27 +14330,33 @@ class EvaluatorPreprocessor {
   }
 
   read(operation) {
-    var args = operation.args;
+    let args = operation.args;
 
     while (true) {
-      var obj = this.parser.getObj();
+      const obj = this.parser.getObj();
 
       if (obj instanceof _primitives.Cmd) {
-        var cmd = obj.cmd;
-        var opSpec = EvaluatorPreprocessor.opMap[cmd];
+        const cmd = obj.cmd;
+        const opSpec = EvaluatorPreprocessor.opMap[cmd];
 
         if (!opSpec) {
           (0, _util.warn)(`Unknown command "${cmd}".`);
           continue;
         }
 
-        var fn = opSpec.id;
-        var numArgs = opSpec.numArgs;
-        var argsLength = args !== null ? args.length : 0;
+        const fn = opSpec.id;
+        const numArgs = opSpec.numArgs;
+        let argsLength = args !== null ? args.length : 0;
+
+        if (!this._isPathOp) {
+          this._numInvalidPathOPS = 0;
+        }
+
+        this._isPathOp = fn >= _util.OPS.moveTo && fn <= _util.OPS.endPath;
 
         if (!opSpec.variableArgs) {
           if (argsLength !== numArgs) {
-            var nonProcessedArgs = this.nonProcessedArgs;
+            const nonProcessedArgs = this.nonProcessedArgs;
 
             while (argsLength > numArgs) {
               nonProcessedArgs.push(args.shift());
@@ -25234,7 +14376,7 @@ class EvaluatorPreprocessor {
           if (argsLength < numArgs) {
             const partialMsg = `command ${cmd}: expected ${numArgs} args, ` + `but received ${argsLength} args.`;
 
-            if (fn >= _util.OPS.moveTo && fn <= _util.OPS.endPath && ++this._numInvalidPathOPS > EvaluatorPreprocessor.MAX_INVALID_PATH_OPS) {
+            if (this._isPathOp && ++this._numInvalidPathOPS > EvaluatorPreprocessor.MAX_INVALID_PATH_OPS) {
               throw new _util.FormatError(`Invalid ${partialMsg}`);
             }
 
@@ -25292,29 +14434,32 @@ class EvaluatorPreprocessor {
 
 }
 
+exports.EvaluatorPreprocessor = EvaluatorPreprocessor;
+
 /***/ }),
-/* 29 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 16 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.CMapFactory = exports.IdentityCMap = exports.CMap = void 0;
+}));
+exports.IdentityCMap = exports.CMapFactory = exports.CMap = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
 var _primitives = __w_pdfjs_require__(5);
 
-var _parser = __w_pdfjs_require__(11);
+var _base_stream = __w_pdfjs_require__(7);
 
-var _core_utils = __w_pdfjs_require__(8);
+var _parser = __w_pdfjs_require__(17);
 
-var _stream = __w_pdfjs_require__(12);
+var _core_utils = __w_pdfjs_require__(6);
 
-var BUILT_IN_CMAPS = ["Adobe-GB1-UCS2", "Adobe-CNS1-UCS2", "Adobe-Japan1-UCS2", "Adobe-Korea1-UCS2", "78-EUC-H", "78-EUC-V", "78-H", "78-RKSJ-H", "78-RKSJ-V", "78-V", "78ms-RKSJ-H", "78ms-RKSJ-V", "83pv-RKSJ-H", "90ms-RKSJ-H", "90ms-RKSJ-V", "90msp-RKSJ-H", "90msp-RKSJ-V", "90pv-RKSJ-H", "90pv-RKSJ-V", "Add-H", "Add-RKSJ-H", "Add-RKSJ-V", "Add-V", "Adobe-CNS1-0", "Adobe-CNS1-1", "Adobe-CNS1-2", "Adobe-CNS1-3", "Adobe-CNS1-4", "Adobe-CNS1-5", "Adobe-CNS1-6", "Adobe-GB1-0", "Adobe-GB1-1", "Adobe-GB1-2", "Adobe-GB1-3", "Adobe-GB1-4", "Adobe-GB1-5", "Adobe-Japan1-0", "Adobe-Japan1-1", "Adobe-Japan1-2", "Adobe-Japan1-3", "Adobe-Japan1-4", "Adobe-Japan1-5", "Adobe-Japan1-6", "Adobe-Korea1-0", "Adobe-Korea1-1", "Adobe-Korea1-2", "B5-H", "B5-V", "B5pc-H", "B5pc-V", "CNS-EUC-H", "CNS-EUC-V", "CNS1-H", "CNS1-V", "CNS2-H", "CNS2-V", "ETHK-B5-H", "ETHK-B5-V", "ETen-B5-H", "ETen-B5-V", "ETenms-B5-H", "ETenms-B5-V", "EUC-H", "EUC-V", "Ext-H", "Ext-RKSJ-H", "Ext-RKSJ-V", "Ext-V", "GB-EUC-H", "GB-EUC-V", "GB-H", "GB-V", "GBK-EUC-H", "GBK-EUC-V", "GBK2K-H", "GBK2K-V", "GBKp-EUC-H", "GBKp-EUC-V", "GBT-EUC-H", "GBT-EUC-V", "GBT-H", "GBT-V", "GBTpc-EUC-H", "GBTpc-EUC-V", "GBpc-EUC-H", "GBpc-EUC-V", "H", "HKdla-B5-H", "HKdla-B5-V", "HKdlb-B5-H", "HKdlb-B5-V", "HKgccs-B5-H", "HKgccs-B5-V", "HKm314-B5-H", "HKm314-B5-V", "HKm471-B5-H", "HKm471-B5-V", "HKscs-B5-H", "HKscs-B5-V", "Hankaku", "Hiragana", "KSC-EUC-H", "KSC-EUC-V", "KSC-H", "KSC-Johab-H", "KSC-Johab-V", "KSC-V", "KSCms-UHC-H", "KSCms-UHC-HW-H", "KSCms-UHC-HW-V", "KSCms-UHC-V", "KSCpc-EUC-H", "KSCpc-EUC-V", "Katakana", "NWP-H", "NWP-V", "RKSJ-H", "RKSJ-V", "Roman", "UniCNS-UCS2-H", "UniCNS-UCS2-V", "UniCNS-UTF16-H", "UniCNS-UTF16-V", "UniCNS-UTF32-H", "UniCNS-UTF32-V", "UniCNS-UTF8-H", "UniCNS-UTF8-V", "UniGB-UCS2-H", "UniGB-UCS2-V", "UniGB-UTF16-H", "UniGB-UTF16-V", "UniGB-UTF32-H", "UniGB-UTF32-V", "UniGB-UTF8-H", "UniGB-UTF8-V", "UniJIS-UCS2-H", "UniJIS-UCS2-HW-H", "UniJIS-UCS2-HW-V", "UniJIS-UCS2-V", "UniJIS-UTF16-H", "UniJIS-UTF16-V", "UniJIS-UTF32-H", "UniJIS-UTF32-V", "UniJIS-UTF8-H", "UniJIS-UTF8-V", "UniJIS2004-UTF16-H", "UniJIS2004-UTF16-V", "UniJIS2004-UTF32-H", "UniJIS2004-UTF32-V", "UniJIS2004-UTF8-H", "UniJIS2004-UTF8-V", "UniJISPro-UCS2-HW-V", "UniJISPro-UCS2-V", "UniJISPro-UTF8-V", "UniJISX0213-UTF32-H", "UniJISX0213-UTF32-V", "UniJISX02132004-UTF32-H", "UniJISX02132004-UTF32-V", "UniKS-UCS2-H", "UniKS-UCS2-V", "UniKS-UTF16-H", "UniKS-UTF16-V", "UniKS-UTF32-H", "UniKS-UTF32-V", "UniKS-UTF8-H", "UniKS-UTF8-V", "V", "WP-Symbol"];
+var _stream = __w_pdfjs_require__(10);
+
+const BUILT_IN_CMAPS = ["Adobe-GB1-UCS2", "Adobe-CNS1-UCS2", "Adobe-Japan1-UCS2", "Adobe-Korea1-UCS2", "78-EUC-H", "78-EUC-V", "78-H", "78-RKSJ-H", "78-RKSJ-V", "78-V", "78ms-RKSJ-H", "78ms-RKSJ-V", "83pv-RKSJ-H", "90ms-RKSJ-H", "90ms-RKSJ-V", "90msp-RKSJ-H", "90msp-RKSJ-V", "90pv-RKSJ-H", "90pv-RKSJ-V", "Add-H", "Add-RKSJ-H", "Add-RKSJ-V", "Add-V", "Adobe-CNS1-0", "Adobe-CNS1-1", "Adobe-CNS1-2", "Adobe-CNS1-3", "Adobe-CNS1-4", "Adobe-CNS1-5", "Adobe-CNS1-6", "Adobe-GB1-0", "Adobe-GB1-1", "Adobe-GB1-2", "Adobe-GB1-3", "Adobe-GB1-4", "Adobe-GB1-5", "Adobe-Japan1-0", "Adobe-Japan1-1", "Adobe-Japan1-2", "Adobe-Japan1-3", "Adobe-Japan1-4", "Adobe-Japan1-5", "Adobe-Japan1-6", "Adobe-Korea1-0", "Adobe-Korea1-1", "Adobe-Korea1-2", "B5-H", "B5-V", "B5pc-H", "B5pc-V", "CNS-EUC-H", "CNS-EUC-V", "CNS1-H", "CNS1-V", "CNS2-H", "CNS2-V", "ETHK-B5-H", "ETHK-B5-V", "ETen-B5-H", "ETen-B5-V", "ETenms-B5-H", "ETenms-B5-V", "EUC-H", "EUC-V", "Ext-H", "Ext-RKSJ-H", "Ext-RKSJ-V", "Ext-V", "GB-EUC-H", "GB-EUC-V", "GB-H", "GB-V", "GBK-EUC-H", "GBK-EUC-V", "GBK2K-H", "GBK2K-V", "GBKp-EUC-H", "GBKp-EUC-V", "GBT-EUC-H", "GBT-EUC-V", "GBT-H", "GBT-V", "GBTpc-EUC-H", "GBTpc-EUC-V", "GBpc-EUC-H", "GBpc-EUC-V", "H", "HKdla-B5-H", "HKdla-B5-V", "HKdlb-B5-H", "HKdlb-B5-V", "HKgccs-B5-H", "HKgccs-B5-V", "HKm314-B5-H", "HKm314-B5-V", "HKm471-B5-H", "HKm471-B5-V", "HKscs-B5-H", "HKscs-B5-V", "Hankaku", "Hiragana", "KSC-EUC-H", "KSC-EUC-V", "KSC-H", "KSC-Johab-H", "KSC-Johab-V", "KSC-V", "KSCms-UHC-H", "KSCms-UHC-HW-H", "KSCms-UHC-HW-V", "KSCms-UHC-V", "KSCpc-EUC-H", "KSCpc-EUC-V", "Katakana", "NWP-H", "NWP-V", "RKSJ-H", "RKSJ-V", "Roman", "UniCNS-UCS2-H", "UniCNS-UCS2-V", "UniCNS-UTF16-H", "UniCNS-UTF16-V", "UniCNS-UTF32-H", "UniCNS-UTF32-V", "UniCNS-UTF8-H", "UniCNS-UTF8-V", "UniGB-UCS2-H", "UniGB-UCS2-V", "UniGB-UTF16-H", "UniGB-UTF16-V", "UniGB-UTF32-H", "UniGB-UTF32-V", "UniGB-UTF8-H", "UniGB-UTF8-V", "UniJIS-UCS2-H", "UniJIS-UCS2-HW-H", "UniJIS-UCS2-HW-V", "UniJIS-UCS2-V", "UniJIS-UTF16-H", "UniJIS-UTF16-V", "UniJIS-UTF32-H", "UniJIS-UTF32-V", "UniJIS-UTF8-H", "UniJIS-UTF8-V", "UniJIS2004-UTF16-H", "UniJIS2004-UTF16-V", "UniJIS2004-UTF32-H", "UniJIS2004-UTF32-V", "UniJIS2004-UTF8-H", "UniJIS2004-UTF8-V", "UniJISPro-UCS2-HW-V", "UniJISPro-UCS2-V", "UniJISPro-UTF8-V", "UniJISX0213-UTF32-H", "UniJISX0213-UTF32-V", "UniJISX02132004-UTF32-H", "UniJISX02132004-UTF32-V", "UniKS-UCS2-H", "UniKS-UCS2-V", "UniKS-UTF16-H", "UniKS-UTF16-V", "UniKS-UTF32-H", "UniKS-UTF32-V", "UniKS-UTF8-H", "UniKS-UTF8-V", "V", "WP-Symbol"];
 const MAX_MAP_RANGE = 2 ** 24 - 1;
 
 class CMap {
@@ -25348,11 +14493,18 @@ class CMap {
       throw new Error("mapBfRange - ignoring data above MAX_MAP_RANGE.");
     }
 
-    var lastByte = dstLow.length - 1;
+    const lastByte = dstLow.length - 1;
 
     while (low <= high) {
       this._map[low++] = dstLow;
-      dstLow = dstLow.substring(0, lastByte) + String.fromCharCode(dstLow.charCodeAt(lastByte) + 1);
+      const nextCharCode = dstLow.charCodeAt(lastByte) + 1;
+
+      if (nextCharCode > 0xff) {
+        dstLow = dstLow.substring(0, lastByte - 1) + String.fromCharCode(dstLow.charCodeAt(lastByte - 1) + 1) + "\x00";
+        continue;
+      }
+
+      dstLow = dstLow.substring(0, lastByte) + String.fromCharCode(nextCharCode);
     }
   }
 
@@ -25443,6 +14595,25 @@ class CMap {
     out.length = 1;
   }
 
+  getCharCodeLength(charCode) {
+    const codespaceRanges = this.codespaceRanges;
+
+    for (let n = 0, nn = codespaceRanges.length; n < nn; n++) {
+      const codespaceRange = codespaceRanges[n];
+
+      for (let k = 0, kk = codespaceRange.length; k < kk;) {
+        const low = codespaceRange[k++];
+        const high = codespaceRange[k++];
+
+        if (charCode >= low && charCode <= high) {
+          return n + 1;
+        }
+      }
+    }
+
+    return 1;
+  }
+
   get length() {
     return this._map.length;
   }
@@ -25532,11 +14703,11 @@ class IdentityCMap extends CMap {
 
 exports.IdentityCMap = IdentityCMap;
 
-var BinaryCMapReader = function BinaryCMapReaderClosure() {
+const BinaryCMapReader = function BinaryCMapReaderClosure() {
   function hexToInt(a, size) {
-    var n = 0;
+    let n = 0;
 
-    for (var i = 0; i <= size; i++) {
+    for (let i = 0; i <= size; i++) {
       n = n << 8 | a[i];
     }
 
@@ -25556,9 +14727,9 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
   }
 
   function addHex(a, b, size) {
-    var c = 0;
+    let c = 0;
 
-    for (var i = size; i >= 0; i--) {
+    for (let i = size; i >= 0; i--) {
       c += a[i] + b[i];
       a[i] = c & 255;
       c >>= 8;
@@ -25566,40 +14737,40 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
   }
 
   function incHex(a, size) {
-    var c = 1;
+    let c = 1;
 
-    for (var i = size; i >= 0 && c > 0; i--) {
+    for (let i = size; i >= 0 && c > 0; i--) {
       c += a[i];
       a[i] = c & 255;
       c >>= 8;
     }
   }
 
-  var MAX_NUM_SIZE = 16;
-  var MAX_ENCODED_NUM_SIZE = 19;
+  const MAX_NUM_SIZE = 16;
+  const MAX_ENCODED_NUM_SIZE = 19;
 
-  function BinaryCMapStream(data) {
-    this.buffer = data;
-    this.pos = 0;
-    this.end = data.length;
-    this.tmpBuf = new Uint8Array(MAX_ENCODED_NUM_SIZE);
-  }
+  class BinaryCMapStream {
+    constructor(data) {
+      this.buffer = data;
+      this.pos = 0;
+      this.end = data.length;
+      this.tmpBuf = new Uint8Array(MAX_ENCODED_NUM_SIZE);
+    }
 
-  BinaryCMapStream.prototype = {
     readByte() {
       if (this.pos >= this.end) {
         return -1;
       }
 
       return this.buffer[this.pos++];
-    },
+    }
 
     readNumber() {
-      var n = 0;
-      var last;
+      let n = 0;
+      let last;
 
       do {
-        var b = this.readByte();
+        const b = this.readByte();
 
         if (b < 0) {
           throw new _util.FormatError("unexpected EOF in bcmap");
@@ -25610,25 +14781,25 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
       } while (!last);
 
       return n;
-    },
+    }
 
     readSigned() {
-      var n = this.readNumber();
+      const n = this.readNumber();
       return n & 1 ? ~(n >>> 1) : n >>> 1;
-    },
+    }
 
     readHex(num, size) {
       num.set(this.buffer.subarray(this.pos, this.pos + size + 1));
       this.pos += size + 1;
-    },
+    }
 
     readHexNumber(num, size) {
-      var last;
-      var stack = this.tmpBuf,
-          sp = 0;
+      let last;
+      const stack = this.tmpBuf;
+      let sp = 0;
 
       do {
-        var b = this.readByte();
+        const b = this.readByte();
 
         if (b < 0) {
           throw new _util.FormatError("unexpected EOF in bcmap");
@@ -25638,13 +14809,13 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
         stack[sp++] = b & 0x7f;
       } while (!last);
 
-      var i = size,
+      let i = size,
           buffer = 0,
           bufferSize = 0;
 
       while (i >= 0) {
         while (bufferSize < 8 && stack.length > 0) {
-          buffer = stack[--sp] << bufferSize | buffer;
+          buffer |= stack[--sp] << bufferSize;
           bufferSize += 7;
         }
 
@@ -25653,48 +14824,48 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
         buffer >>= 8;
         bufferSize -= 8;
       }
-    },
+    }
 
     readHexSigned(num, size) {
       this.readHexNumber(num, size);
-      var sign = num[size] & 1 ? 255 : 0;
-      var c = 0;
+      const sign = num[size] & 1 ? 255 : 0;
+      let c = 0;
 
-      for (var i = 0; i <= size; i++) {
+      for (let i = 0; i <= size; i++) {
         c = (c & 1) << 8 | num[i];
         num[i] = c >> 1 ^ sign;
       }
-    },
+    }
 
     readString() {
-      var len = this.readNumber();
-      var s = "";
+      const len = this.readNumber();
+      let s = "";
 
-      for (var i = 0; i < len; i++) {
+      for (let i = 0; i < len; i++) {
         s += String.fromCharCode(this.readNumber());
       }
 
       return s;
     }
 
-  };
+  }
 
-  function processBinaryCMap(data, cMap, extend) {
-    return new Promise(function (resolve, reject) {
-      var stream = new BinaryCMapStream(data);
-      var header = stream.readByte();
+  class BinaryCMapReader {
+    async process(data, cMap, extend) {
+      const stream = new BinaryCMapStream(data);
+      const header = stream.readByte();
       cMap.vertical = !!(header & 1);
-      var useCMap = null;
-      var start = new Uint8Array(MAX_NUM_SIZE);
-      var end = new Uint8Array(MAX_NUM_SIZE);
-      var char = new Uint8Array(MAX_NUM_SIZE);
-      var charCode = new Uint8Array(MAX_NUM_SIZE);
-      var tmp = new Uint8Array(MAX_NUM_SIZE);
-      var code;
-      var b;
+      let useCMap = null;
+      const start = new Uint8Array(MAX_NUM_SIZE);
+      const end = new Uint8Array(MAX_NUM_SIZE);
+      const char = new Uint8Array(MAX_NUM_SIZE);
+      const charCode = new Uint8Array(MAX_NUM_SIZE);
+      const tmp = new Uint8Array(MAX_NUM_SIZE);
+      let code;
+      let b;
 
       while ((b = stream.readByte()) >= 0) {
-        var type = b >> 5;
+        const type = b >> 5;
 
         if (type === 7) {
           switch (b & 0x1f) {
@@ -25710,16 +14881,15 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
           continue;
         }
 
-        var sequence = !!(b & 0x10);
-        var dataSize = b & 15;
+        const sequence = !!(b & 0x10);
+        const dataSize = b & 15;
 
         if (dataSize + 1 > MAX_NUM_SIZE) {
-          throw new Error("processBinaryCMap: Invalid dataSize.");
+          throw new Error("BinaryCMapReader.process: Invalid dataSize.");
         }
 
-        var ucs2DataSize = 1;
-        var subitemsCount = stream.readNumber();
-        var i;
+        const ucs2DataSize = 1;
+        const subitemsCount = stream.readNumber();
 
         switch (type) {
           case 0:
@@ -25728,7 +14898,7 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
             addHex(end, start, dataSize);
             cMap.addCodespaceRange(dataSize + 1, hexToInt(start, dataSize), hexToInt(end, dataSize));
 
-            for (i = 1; i < subitemsCount; i++) {
+            for (let i = 1; i < subitemsCount; i++) {
               incHex(end, dataSize);
               stream.readHexNumber(start, dataSize);
               addHex(start, end, dataSize);
@@ -25745,7 +14915,7 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
             addHex(end, start, dataSize);
             stream.readNumber();
 
-            for (i = 1; i < subitemsCount; i++) {
+            for (let i = 1; i < subitemsCount; i++) {
               incHex(end, dataSize);
               stream.readHexNumber(start, dataSize);
               addHex(start, end, dataSize);
@@ -25761,7 +14931,7 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
             code = stream.readNumber();
             cMap.mapOne(hexToInt(char, dataSize), code);
 
-            for (i = 1; i < subitemsCount; i++) {
+            for (let i = 1; i < subitemsCount; i++) {
               incHex(char, dataSize);
 
               if (!sequence) {
@@ -25782,7 +14952,7 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
             code = stream.readNumber();
             cMap.mapCidRange(hexToInt(start, dataSize), hexToInt(end, dataSize), code);
 
-            for (i = 1; i < subitemsCount; i++) {
+            for (let i = 1; i < subitemsCount; i++) {
               incHex(end, dataSize);
 
               if (!sequence) {
@@ -25805,7 +14975,7 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
             stream.readHex(charCode, dataSize);
             cMap.mapOne(hexToInt(char, ucs2DataSize), hexToStr(charCode, dataSize));
 
-            for (i = 1; i < subitemsCount; i++) {
+            for (let i = 1; i < subitemsCount; i++) {
               incHex(char, ucs2DataSize);
 
               if (!sequence) {
@@ -25828,7 +14998,7 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
             stream.readHex(charCode, dataSize);
             cMap.mapBfRange(hexToInt(start, ucs2DataSize), hexToInt(end, ucs2DataSize), hexToStr(charCode, dataSize));
 
-            for (i = 1; i < subitemsCount; i++) {
+            for (let i = 1; i < subitemsCount; i++) {
               incHex(end, ucs2DataSize);
 
               if (!sequence) {
@@ -25847,33 +15017,27 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
             break;
 
           default:
-            reject(new Error("processBinaryCMap: Unknown type: " + type));
-            return;
+            throw new Error(`BinaryCMapReader.process - unknown type: ${type}`);
         }
       }
 
       if (useCMap) {
-        resolve(extend(useCMap));
-        return;
+        return extend(useCMap);
       }
 
-      resolve(cMap);
-    });
+      return cMap;
+    }
+
   }
 
-  function BinaryCMapReader() {}
-
-  BinaryCMapReader.prototype = {
-    process: processBinaryCMap
-  };
   return BinaryCMapReader;
 }();
 
-var CMapFactory = function CMapFactoryClosure() {
+const CMapFactory = function CMapFactoryClosure() {
   function strToInt(str) {
-    var a = 0;
+    let a = 0;
 
-    for (var i = 0; i < str.length; i++) {
+    for (let i = 0; i < str.length; i++) {
       a = a << 8 | str.charCodeAt(i);
     }
 
@@ -25881,7 +15045,7 @@ var CMapFactory = function CMapFactoryClosure() {
   }
 
   function expectString(obj) {
-    if (!(0, _util.isString)(obj)) {
+    if (typeof obj !== "string") {
       throw new _util.FormatError("Malformed CMap: expected string.");
     }
   }
@@ -25894,9 +15058,9 @@ var CMapFactory = function CMapFactoryClosure() {
 
   function parseBfChar(cMap, lexer) {
     while (true) {
-      var obj = lexer.getObj();
+      let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -25905,19 +15069,19 @@ var CMapFactory = function CMapFactoryClosure() {
       }
 
       expectString(obj);
-      var src = strToInt(obj);
+      const src = strToInt(obj);
       obj = lexer.getObj();
       expectString(obj);
-      var dst = obj;
+      const dst = obj;
       cMap.mapOne(src, dst);
     }
   }
 
   function parseBfRange(cMap, lexer) {
     while (true) {
-      var obj = lexer.getObj();
+      let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -25926,20 +15090,20 @@ var CMapFactory = function CMapFactoryClosure() {
       }
 
       expectString(obj);
-      var low = strToInt(obj);
+      const low = strToInt(obj);
       obj = lexer.getObj();
       expectString(obj);
-      var high = strToInt(obj);
+      const high = strToInt(obj);
       obj = lexer.getObj();
 
-      if (Number.isInteger(obj) || (0, _util.isString)(obj)) {
-        var dstLow = Number.isInteger(obj) ? String.fromCharCode(obj) : obj;
+      if (Number.isInteger(obj) || typeof obj === "string") {
+        const dstLow = Number.isInteger(obj) ? String.fromCharCode(obj) : obj;
         cMap.mapBfRange(low, high, dstLow);
       } else if ((0, _primitives.isCmd)(obj, "[")) {
         obj = lexer.getObj();
-        var array = [];
+        const array = [];
 
-        while (!(0, _primitives.isCmd)(obj, "]") && !(0, _primitives.isEOF)(obj)) {
+        while (!(0, _primitives.isCmd)(obj, "]") && obj !== _primitives.EOF) {
           array.push(obj);
           obj = lexer.getObj();
         }
@@ -25955,9 +15119,9 @@ var CMapFactory = function CMapFactoryClosure() {
 
   function parseCidChar(cMap, lexer) {
     while (true) {
-      var obj = lexer.getObj();
+      let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -25966,19 +15130,19 @@ var CMapFactory = function CMapFactoryClosure() {
       }
 
       expectString(obj);
-      var src = strToInt(obj);
+      const src = strToInt(obj);
       obj = lexer.getObj();
       expectInt(obj);
-      var dst = obj;
+      const dst = obj;
       cMap.mapOne(src, dst);
     }
   }
 
   function parseCidRange(cMap, lexer) {
     while (true) {
-      var obj = lexer.getObj();
+      let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -25987,22 +15151,22 @@ var CMapFactory = function CMapFactoryClosure() {
       }
 
       expectString(obj);
-      var low = strToInt(obj);
+      const low = strToInt(obj);
       obj = lexer.getObj();
       expectString(obj);
-      var high = strToInt(obj);
+      const high = strToInt(obj);
       obj = lexer.getObj();
       expectInt(obj);
-      var dstLow = obj;
+      const dstLow = obj;
       cMap.mapCidRange(low, high, dstLow);
     }
   }
 
   function parseCodespaceRange(cMap, lexer) {
     while (true) {
-      var obj = lexer.getObj();
+      let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -26010,18 +15174,18 @@ var CMapFactory = function CMapFactoryClosure() {
         return;
       }
 
-      if (!(0, _util.isString)(obj)) {
+      if (typeof obj !== "string") {
         break;
       }
 
-      var low = strToInt(obj);
+      const low = strToInt(obj);
       obj = lexer.getObj();
 
-      if (!(0, _util.isString)(obj)) {
+      if (typeof obj !== "string") {
         break;
       }
 
-      var high = strToInt(obj);
+      const high = strToInt(obj);
       cMap.addCodespaceRange(obj.length, low, high);
     }
 
@@ -26029,7 +15193,7 @@ var CMapFactory = function CMapFactoryClosure() {
   }
 
   function parseWMode(cMap, lexer) {
-    var obj = lexer.getObj();
+    const obj = lexer.getObj();
 
     if (Number.isInteger(obj)) {
       cMap.vertical = !!obj;
@@ -26037,24 +15201,23 @@ var CMapFactory = function CMapFactoryClosure() {
   }
 
   function parseCMapName(cMap, lexer) {
-    var obj = lexer.getObj();
+    const obj = lexer.getObj();
 
-    if ((0, _primitives.isName)(obj) && (0, _util.isString)(obj.name)) {
+    if (obj instanceof _primitives.Name) {
       cMap.name = obj.name;
     }
   }
 
-  function parseCMap(cMap, lexer, fetchBuiltInCMap, useCMap) {
-    var previous;
-    var embeddedUseCMap;
+  async function parseCMap(cMap, lexer, fetchBuiltInCMap, useCMap) {
+    let previous, embeddedUseCMap;
 
     objLoop: while (true) {
       try {
-        var obj = lexer.getObj();
+        const obj = lexer.getObj();
 
-        if ((0, _primitives.isEOF)(obj)) {
+        if (obj === _primitives.EOF) {
           break;
-        } else if ((0, _primitives.isName)(obj)) {
+        } else if (obj instanceof _primitives.Name) {
           if (obj.name === "WMode") {
             parseWMode(cMap, lexer);
           } else if (obj.name === "CMapName") {
@@ -26062,13 +15225,13 @@ var CMapFactory = function CMapFactoryClosure() {
           }
 
           previous = obj;
-        } else if ((0, _primitives.isCmd)(obj)) {
+        } else if (obj instanceof _primitives.Cmd) {
           switch (obj.cmd) {
             case "endcmap":
               break objLoop;
 
             case "usecmap":
-              if ((0, _primitives.isName)(previous)) {
+              if (previous instanceof _primitives.Name) {
                 embeddedUseCMap = previous.name;
               }
 
@@ -26113,85 +15276,81 @@ var CMapFactory = function CMapFactoryClosure() {
       return extendCMap(cMap, fetchBuiltInCMap, useCMap);
     }
 
-    return Promise.resolve(cMap);
+    return cMap;
   }
 
-  function extendCMap(cMap, fetchBuiltInCMap, useCMap) {
-    return createBuiltInCMap(useCMap, fetchBuiltInCMap).then(function (newCMap) {
-      cMap.useCMap = newCMap;
+  async function extendCMap(cMap, fetchBuiltInCMap, useCMap) {
+    cMap.useCMap = await createBuiltInCMap(useCMap, fetchBuiltInCMap);
 
-      if (cMap.numCodespaceRanges === 0) {
-        var useCodespaceRanges = cMap.useCMap.codespaceRanges;
+    if (cMap.numCodespaceRanges === 0) {
+      const useCodespaceRanges = cMap.useCMap.codespaceRanges;
 
-        for (var i = 0; i < useCodespaceRanges.length; i++) {
-          cMap.codespaceRanges[i] = useCodespaceRanges[i].slice();
-        }
-
-        cMap.numCodespaceRanges = cMap.useCMap.numCodespaceRanges;
+      for (let i = 0; i < useCodespaceRanges.length; i++) {
+        cMap.codespaceRanges[i] = useCodespaceRanges[i].slice();
       }
 
-      cMap.useCMap.forEach(function (key, value) {
-        if (!cMap.contains(key)) {
-          cMap.mapOne(key, cMap.useCMap.lookup(key));
-        }
-      });
-      return cMap;
+      cMap.numCodespaceRanges = cMap.useCMap.numCodespaceRanges;
+    }
+
+    cMap.useCMap.forEach(function (key, value) {
+      if (!cMap.contains(key)) {
+        cMap.mapOne(key, cMap.useCMap.lookup(key));
+      }
     });
+    return cMap;
   }
 
-  function createBuiltInCMap(name, fetchBuiltInCMap) {
+  async function createBuiltInCMap(name, fetchBuiltInCMap) {
     if (name === "Identity-H") {
-      return Promise.resolve(new IdentityCMap(false, 2));
+      return new IdentityCMap(false, 2);
     } else if (name === "Identity-V") {
-      return Promise.resolve(new IdentityCMap(true, 2));
+      return new IdentityCMap(true, 2);
     }
 
     if (!BUILT_IN_CMAPS.includes(name)) {
-      return Promise.reject(new Error("Unknown CMap name: " + name));
+      throw new Error("Unknown CMap name: " + name);
     }
 
     if (!fetchBuiltInCMap) {
-      return Promise.reject(new Error("Built-in CMap parameters are not provided."));
+      throw new Error("Built-in CMap parameters are not provided.");
     }
 
-    return fetchBuiltInCMap(name).then(function (data) {
-      var cMapData = data.cMapData,
-          compressionType = data.compressionType;
-      var cMap = new CMap(true);
+    const {
+      cMapData,
+      compressionType
+    } = await fetchBuiltInCMap(name);
+    const cMap = new CMap(true);
 
-      if (compressionType === _util.CMapCompressionType.BINARY) {
-        return new BinaryCMapReader().process(cMapData, cMap, function (useCMap) {
-          return extendCMap(cMap, fetchBuiltInCMap, useCMap);
-        });
-      }
+    if (compressionType === _util.CMapCompressionType.BINARY) {
+      return new BinaryCMapReader().process(cMapData, cMap, useCMap => {
+        return extendCMap(cMap, fetchBuiltInCMap, useCMap);
+      });
+    }
 
-      if (compressionType === _util.CMapCompressionType.NONE) {
-        var lexer = new _parser.Lexer(new _stream.Stream(cMapData));
-        return parseCMap(cMap, lexer, fetchBuiltInCMap, null);
-      }
+    if (compressionType === _util.CMapCompressionType.NONE) {
+      const lexer = new _parser.Lexer(new _stream.Stream(cMapData));
+      return parseCMap(cMap, lexer, fetchBuiltInCMap, null);
+    }
 
-      return Promise.reject(new Error("TODO: Only BINARY/NONE CMap compression is currently supported."));
-    });
+    throw new Error("TODO: Only BINARY/NONE CMap compression is currently supported.");
   }
 
   return {
     async create(params) {
-      var encoding = params.encoding;
-      var fetchBuiltInCMap = params.fetchBuiltInCMap;
-      var useCMap = params.useCMap;
+      const encoding = params.encoding;
+      const fetchBuiltInCMap = params.fetchBuiltInCMap;
+      const useCMap = params.useCMap;
 
-      if ((0, _primitives.isName)(encoding)) {
+      if (encoding instanceof _primitives.Name) {
         return createBuiltInCMap(encoding.name, fetchBuiltInCMap);
-      } else if ((0, _primitives.isStream)(encoding)) {
-        var cMap = new CMap();
-        var lexer = new _parser.Lexer(encoding);
-        return parseCMap(cMap, lexer, fetchBuiltInCMap, useCMap).then(function (parsedCMap) {
-          if (parsedCMap.isIdentityCMap) {
-            return createBuiltInCMap(parsedCMap.name, fetchBuiltInCMap);
-          }
+      } else if (encoding instanceof _base_stream.BaseStream) {
+        const parsedCMap = await parseCMap(new CMap(), new _parser.Lexer(encoding), fetchBuiltInCMap, useCMap);
 
-          return parsedCMap;
-        });
+        if (parsedCMap.isIdentityCMap) {
+          return createBuiltInCMap(parsedCMap.name, fetchBuiltInCMap);
+        }
+
+        return parsedCMap;
       }
 
       throw new Error("Encoding required.");
@@ -26203,59 +15362,9687 @@ var CMapFactory = function CMapFactoryClosure() {
 exports.CMapFactory = CMapFactory;
 
 /***/ }),
-/* 30 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 17 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.getFontType = getFontType;
-exports.IdentityToUnicodeMap = exports.ToUnicodeMap = exports.FontFlags = exports.Font = exports.ErrorFont = exports.SEAC_ANALYSIS_ENABLED = void 0;
+}));
+exports.Parser = exports.Linearization = exports.Lexer = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
-var _cff_parser = __w_pdfjs_require__(31);
+var _primitives = __w_pdfjs_require__(5);
 
-var _glyphlist = __w_pdfjs_require__(34);
+var _core_utils = __w_pdfjs_require__(6);
 
-var _encodings = __w_pdfjs_require__(33);
+var _ascii_85_stream = __w_pdfjs_require__(18);
 
-var _standard_fonts = __w_pdfjs_require__(35);
+var _ascii_hex_stream = __w_pdfjs_require__(20);
 
-var _unicode = __w_pdfjs_require__(36);
+var _ccitt_stream = __w_pdfjs_require__(21);
 
-var _core_utils = __w_pdfjs_require__(8);
+var _flate_stream = __w_pdfjs_require__(23);
 
-var _font_renderer = __w_pdfjs_require__(37);
+var _jbig2_stream = __w_pdfjs_require__(24);
 
-var _cmap = __w_pdfjs_require__(29);
+var _jpeg_stream = __w_pdfjs_require__(27);
 
-var _stream = __w_pdfjs_require__(12);
+var _jpx_stream = __w_pdfjs_require__(29);
 
-var _type1_parser = __w_pdfjs_require__(38);
+var _lzw_stream = __w_pdfjs_require__(31);
+
+var _stream = __w_pdfjs_require__(10);
+
+var _predictor_stream = __w_pdfjs_require__(32);
+
+var _run_length_stream = __w_pdfjs_require__(33);
+
+const MAX_LENGTH_TO_CACHE = 1000;
+const MAX_ADLER32_LENGTH = 5552;
+
+function computeAdler32(bytes) {
+  const bytesLength = bytes.length;
+  let a = 1,
+      b = 0;
+
+  for (let i = 0; i < bytesLength; ++i) {
+    a += bytes[i] & 0xff;
+    b += a;
+  }
+
+  return b % 65521 << 16 | a % 65521;
+}
+
+class Parser {
+  constructor({
+    lexer,
+    xref,
+    allowStreams = false,
+    recoveryMode = false
+  }) {
+    this.lexer = lexer;
+    this.xref = xref;
+    this.allowStreams = allowStreams;
+    this.recoveryMode = recoveryMode;
+    this.imageCache = Object.create(null);
+    this.refill();
+  }
+
+  refill() {
+    this.buf1 = this.lexer.getObj();
+    this.buf2 = this.lexer.getObj();
+  }
+
+  shift() {
+    if (this.buf2 instanceof _primitives.Cmd && this.buf2.cmd === "ID") {
+      this.buf1 = this.buf2;
+      this.buf2 = null;
+    } else {
+      this.buf1 = this.buf2;
+      this.buf2 = this.lexer.getObj();
+    }
+  }
+
+  tryShift() {
+    try {
+      this.shift();
+      return true;
+    } catch (e) {
+      if (e instanceof _core_utils.MissingDataException) {
+        throw e;
+      }
+
+      return false;
+    }
+  }
+
+  getObj(cipherTransform = null) {
+    const buf1 = this.buf1;
+    this.shift();
+
+    if (buf1 instanceof _primitives.Cmd) {
+      switch (buf1.cmd) {
+        case "BI":
+          return this.makeInlineImage(cipherTransform);
+
+        case "[":
+          const array = [];
+
+          while (!(0, _primitives.isCmd)(this.buf1, "]") && this.buf1 !== _primitives.EOF) {
+            array.push(this.getObj(cipherTransform));
+          }
+
+          if (this.buf1 === _primitives.EOF) {
+            if (this.recoveryMode) {
+              return array;
+            }
+
+            throw new _core_utils.ParserEOFException("End of file inside array.");
+          }
+
+          this.shift();
+          return array;
+
+        case "<<":
+          const dict = new _primitives.Dict(this.xref);
+
+          while (!(0, _primitives.isCmd)(this.buf1, ">>") && this.buf1 !== _primitives.EOF) {
+            if (!(this.buf1 instanceof _primitives.Name)) {
+              (0, _util.info)("Malformed dictionary: key must be a name object");
+              this.shift();
+              continue;
+            }
+
+            const key = this.buf1.name;
+            this.shift();
+
+            if (this.buf1 === _primitives.EOF) {
+              break;
+            }
+
+            dict.set(key, this.getObj(cipherTransform));
+          }
+
+          if (this.buf1 === _primitives.EOF) {
+            if (this.recoveryMode) {
+              return dict;
+            }
+
+            throw new _core_utils.ParserEOFException("End of file inside dictionary.");
+          }
+
+          if ((0, _primitives.isCmd)(this.buf2, "stream")) {
+            return this.allowStreams ? this.makeStream(dict, cipherTransform) : dict;
+          }
+
+          this.shift();
+          return dict;
+
+        default:
+          return buf1;
+      }
+    }
+
+    if (Number.isInteger(buf1)) {
+      if (Number.isInteger(this.buf1) && (0, _primitives.isCmd)(this.buf2, "R")) {
+        const ref = _primitives.Ref.get(buf1, this.buf1);
+
+        this.shift();
+        this.shift();
+        return ref;
+      }
+
+      return buf1;
+    }
+
+    if (typeof buf1 === "string") {
+      if (cipherTransform) {
+        return cipherTransform.decryptString(buf1);
+      }
+
+      return buf1;
+    }
+
+    return buf1;
+  }
+
+  findDefaultInlineStreamEnd(stream) {
+    const E = 0x45,
+          I = 0x49,
+          SPACE = 0x20,
+          LF = 0xa,
+          CR = 0xd,
+          NUL = 0x0;
+    const lexer = this.lexer,
+          startPos = stream.pos,
+          n = 10;
+    let state = 0,
+        ch,
+        maybeEIPos;
+
+    while ((ch = stream.getByte()) !== -1) {
+      if (state === 0) {
+        state = ch === E ? 1 : 0;
+      } else if (state === 1) {
+        state = ch === I ? 2 : 0;
+      } else {
+        (0, _util.assert)(state === 2, "findDefaultInlineStreamEnd - invalid state.");
+
+        if (ch === SPACE || ch === LF || ch === CR) {
+          maybeEIPos = stream.pos;
+          const followingBytes = stream.peekBytes(n);
+
+          for (let i = 0, ii = followingBytes.length; i < ii; i++) {
+            ch = followingBytes[i];
+
+            if (ch === NUL && followingBytes[i + 1] !== NUL) {
+              continue;
+            }
+
+            if (ch !== LF && ch !== CR && (ch < SPACE || ch > 0x7f)) {
+              state = 0;
+              break;
+            }
+          }
+
+          if (state !== 2) {
+            continue;
+          }
+
+          if (lexer.knownCommands) {
+            const nextObj = lexer.peekObj();
+
+            if (nextObj instanceof _primitives.Cmd && !lexer.knownCommands[nextObj.cmd]) {
+              state = 0;
+            }
+          } else {
+            (0, _util.warn)("findDefaultInlineStreamEnd - `lexer.knownCommands` is undefined.");
+          }
+
+          if (state === 2) {
+            break;
+          }
+        } else {
+          state = 0;
+        }
+      }
+    }
+
+    if (ch === -1) {
+      (0, _util.warn)("findDefaultInlineStreamEnd: " + "Reached the end of the stream without finding a valid EI marker");
+
+      if (maybeEIPos) {
+        (0, _util.warn)('... trying to recover by using the last "EI" occurrence.');
+        stream.skip(-(stream.pos - maybeEIPos));
+      }
+    }
+
+    let endOffset = 4;
+    stream.skip(-endOffset);
+    ch = stream.peekByte();
+    stream.skip(endOffset);
+
+    if (!(0, _core_utils.isWhiteSpace)(ch)) {
+      endOffset--;
+    }
+
+    return stream.pos - endOffset - startPos;
+  }
+
+  findDCTDecodeInlineStreamEnd(stream) {
+    const startPos = stream.pos;
+    let foundEOI = false,
+        b,
+        markerLength;
+
+    while ((b = stream.getByte()) !== -1) {
+      if (b !== 0xff) {
+        continue;
+      }
+
+      switch (stream.getByte()) {
+        case 0x00:
+          break;
+
+        case 0xff:
+          stream.skip(-1);
+          break;
+
+        case 0xd9:
+          foundEOI = true;
+          break;
+
+        case 0xc0:
+        case 0xc1:
+        case 0xc2:
+        case 0xc3:
+        case 0xc5:
+        case 0xc6:
+        case 0xc7:
+        case 0xc9:
+        case 0xca:
+        case 0xcb:
+        case 0xcd:
+        case 0xce:
+        case 0xcf:
+        case 0xc4:
+        case 0xcc:
+        case 0xda:
+        case 0xdb:
+        case 0xdc:
+        case 0xdd:
+        case 0xde:
+        case 0xdf:
+        case 0xe0:
+        case 0xe1:
+        case 0xe2:
+        case 0xe3:
+        case 0xe4:
+        case 0xe5:
+        case 0xe6:
+        case 0xe7:
+        case 0xe8:
+        case 0xe9:
+        case 0xea:
+        case 0xeb:
+        case 0xec:
+        case 0xed:
+        case 0xee:
+        case 0xef:
+        case 0xfe:
+          markerLength = stream.getUint16();
+
+          if (markerLength > 2) {
+            stream.skip(markerLength - 2);
+          } else {
+            stream.skip(-2);
+          }
+
+          break;
+      }
+
+      if (foundEOI) {
+        break;
+      }
+    }
+
+    const length = stream.pos - startPos;
+
+    if (b === -1) {
+      (0, _util.warn)("Inline DCTDecode image stream: " + "EOI marker not found, searching for /EI/ instead.");
+      stream.skip(-length);
+      return this.findDefaultInlineStreamEnd(stream);
+    }
+
+    this.inlineStreamSkipEI(stream);
+    return length;
+  }
+
+  findASCII85DecodeInlineStreamEnd(stream) {
+    const TILDE = 0x7e,
+          GT = 0x3e;
+    const startPos = stream.pos;
+    let ch;
+
+    while ((ch = stream.getByte()) !== -1) {
+      if (ch === TILDE) {
+        const tildePos = stream.pos;
+        ch = stream.peekByte();
+
+        while ((0, _core_utils.isWhiteSpace)(ch)) {
+          stream.skip();
+          ch = stream.peekByte();
+        }
+
+        if (ch === GT) {
+          stream.skip();
+          break;
+        }
+
+        if (stream.pos > tildePos) {
+          const maybeEI = stream.peekBytes(2);
+
+          if (maybeEI[0] === 0x45 && maybeEI[1] === 0x49) {
+            break;
+          }
+        }
+      }
+    }
+
+    const length = stream.pos - startPos;
+
+    if (ch === -1) {
+      (0, _util.warn)("Inline ASCII85Decode image stream: " + "EOD marker not found, searching for /EI/ instead.");
+      stream.skip(-length);
+      return this.findDefaultInlineStreamEnd(stream);
+    }
+
+    this.inlineStreamSkipEI(stream);
+    return length;
+  }
+
+  findASCIIHexDecodeInlineStreamEnd(stream) {
+    const GT = 0x3e;
+    const startPos = stream.pos;
+    let ch;
+
+    while ((ch = stream.getByte()) !== -1) {
+      if (ch === GT) {
+        break;
+      }
+    }
+
+    const length = stream.pos - startPos;
+
+    if (ch === -1) {
+      (0, _util.warn)("Inline ASCIIHexDecode image stream: " + "EOD marker not found, searching for /EI/ instead.");
+      stream.skip(-length);
+      return this.findDefaultInlineStreamEnd(stream);
+    }
+
+    this.inlineStreamSkipEI(stream);
+    return length;
+  }
+
+  inlineStreamSkipEI(stream) {
+    const E = 0x45,
+          I = 0x49;
+    let state = 0,
+        ch;
+
+    while ((ch = stream.getByte()) !== -1) {
+      if (state === 0) {
+        state = ch === E ? 1 : 0;
+      } else if (state === 1) {
+        state = ch === I ? 2 : 0;
+      } else if (state === 2) {
+        break;
+      }
+    }
+  }
+
+  makeInlineImage(cipherTransform) {
+    const lexer = this.lexer;
+    const stream = lexer.stream;
+    const dict = new _primitives.Dict(this.xref);
+    let dictLength;
+
+    while (!(0, _primitives.isCmd)(this.buf1, "ID") && this.buf1 !== _primitives.EOF) {
+      if (!(this.buf1 instanceof _primitives.Name)) {
+        throw new _util.FormatError("Dictionary key must be a name object");
+      }
+
+      const key = this.buf1.name;
+      this.shift();
+
+      if (this.buf1 === _primitives.EOF) {
+        break;
+      }
+
+      dict.set(key, this.getObj(cipherTransform));
+    }
+
+    if (lexer.beginInlineImagePos !== -1) {
+      dictLength = stream.pos - lexer.beginInlineImagePos;
+    }
+
+    const filter = dict.get("F", "Filter");
+    let filterName;
+
+    if (filter instanceof _primitives.Name) {
+      filterName = filter.name;
+    } else if (Array.isArray(filter)) {
+      const filterZero = this.xref.fetchIfRef(filter[0]);
+
+      if (filterZero instanceof _primitives.Name) {
+        filterName = filterZero.name;
+      }
+    }
+
+    const startPos = stream.pos;
+    let length;
+
+    switch (filterName) {
+      case "DCT":
+      case "DCTDecode":
+        length = this.findDCTDecodeInlineStreamEnd(stream);
+        break;
+
+      case "A85":
+      case "ASCII85Decode":
+        length = this.findASCII85DecodeInlineStreamEnd(stream);
+        break;
+
+      case "AHx":
+      case "ASCIIHexDecode":
+        length = this.findASCIIHexDecodeInlineStreamEnd(stream);
+        break;
+
+      default:
+        length = this.findDefaultInlineStreamEnd(stream);
+    }
+
+    let imageStream = stream.makeSubStream(startPos, length, dict);
+    let cacheKey;
+
+    if (length < MAX_LENGTH_TO_CACHE && dictLength < MAX_ADLER32_LENGTH) {
+      const imageBytes = imageStream.getBytes();
+      imageStream.reset();
+      const initialStreamPos = stream.pos;
+      stream.pos = lexer.beginInlineImagePos;
+      const dictBytes = stream.getBytes(dictLength);
+      stream.pos = initialStreamPos;
+      cacheKey = computeAdler32(imageBytes) + "_" + computeAdler32(dictBytes);
+      const cacheEntry = this.imageCache[cacheKey];
+
+      if (cacheEntry !== undefined) {
+        this.buf2 = _primitives.Cmd.get("EI");
+        this.shift();
+        cacheEntry.reset();
+        return cacheEntry;
+      }
+    }
+
+    if (cipherTransform) {
+      imageStream = cipherTransform.createStream(imageStream, length);
+    }
+
+    imageStream = this.filter(imageStream, dict, length);
+    imageStream.dict = dict;
+
+    if (cacheKey !== undefined) {
+      imageStream.cacheKey = `inline_${length}_${cacheKey}`;
+      this.imageCache[cacheKey] = imageStream;
+    }
+
+    this.buf2 = _primitives.Cmd.get("EI");
+    this.shift();
+    return imageStream;
+  }
+
+  _findStreamLength(startPos, signature) {
+    const {
+      stream
+    } = this.lexer;
+    stream.pos = startPos;
+    const SCAN_BLOCK_LENGTH = 2048;
+    const signatureLength = signature.length;
+
+    while (stream.pos < stream.end) {
+      const scanBytes = stream.peekBytes(SCAN_BLOCK_LENGTH);
+      const scanLength = scanBytes.length - signatureLength;
+
+      if (scanLength <= 0) {
+        break;
+      }
+
+      let pos = 0;
+
+      while (pos < scanLength) {
+        let j = 0;
+
+        while (j < signatureLength && scanBytes[pos + j] === signature[j]) {
+          j++;
+        }
+
+        if (j >= signatureLength) {
+          stream.pos += pos;
+          return stream.pos - startPos;
+        }
+
+        pos++;
+      }
+
+      stream.pos += scanLength;
+    }
+
+    return -1;
+  }
+
+  makeStream(dict, cipherTransform) {
+    const lexer = this.lexer;
+    let stream = lexer.stream;
+    lexer.skipToNextLine();
+    const startPos = stream.pos - 1;
+    let length = dict.get("Length");
+
+    if (!Number.isInteger(length)) {
+      (0, _util.info)(`Bad length "${length && length.toString()}" in stream.`);
+      length = 0;
+    }
+
+    stream.pos = startPos + length;
+    lexer.nextChar();
+
+    if (this.tryShift() && (0, _primitives.isCmd)(this.buf2, "endstream")) {
+      this.shift();
+    } else {
+      const ENDSTREAM_SIGNATURE = new Uint8Array([0x65, 0x6e, 0x64, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d]);
+
+      let actualLength = this._findStreamLength(startPos, ENDSTREAM_SIGNATURE);
+
+      if (actualLength < 0) {
+        const MAX_TRUNCATION = 1;
+
+        for (let i = 1; i <= MAX_TRUNCATION; i++) {
+          const end = ENDSTREAM_SIGNATURE.length - i;
+          const TRUNCATED_SIGNATURE = ENDSTREAM_SIGNATURE.slice(0, end);
+
+          const maybeLength = this._findStreamLength(startPos, TRUNCATED_SIGNATURE);
+
+          if (maybeLength >= 0) {
+            const lastByte = stream.peekBytes(end + 1)[end];
+
+            if (!(0, _core_utils.isWhiteSpace)(lastByte)) {
+              break;
+            }
+
+            (0, _util.info)(`Found "${(0, _util.bytesToString)(TRUNCATED_SIGNATURE)}" when ` + "searching for endstream command.");
+            actualLength = maybeLength;
+            break;
+          }
+        }
+
+        if (actualLength < 0) {
+          throw new _util.FormatError("Missing endstream command.");
+        }
+      }
+
+      length = actualLength;
+      lexer.nextChar();
+      this.shift();
+      this.shift();
+    }
+
+    this.shift();
+    stream = stream.makeSubStream(startPos, length, dict);
+
+    if (cipherTransform) {
+      stream = cipherTransform.createStream(stream, length);
+    }
+
+    stream = this.filter(stream, dict, length);
+    stream.dict = dict;
+    return stream;
+  }
+
+  filter(stream, dict, length) {
+    let filter = dict.get("F", "Filter");
+    let params = dict.get("DP", "DecodeParms");
+
+    if (filter instanceof _primitives.Name) {
+      if (Array.isArray(params)) {
+        (0, _util.warn)("/DecodeParms should not be an Array, when /Filter is a Name.");
+      }
+
+      return this.makeFilter(stream, filter.name, length, params);
+    }
+
+    let maybeLength = length;
+
+    if (Array.isArray(filter)) {
+      const filterArray = filter;
+      const paramsArray = params;
+
+      for (let i = 0, ii = filterArray.length; i < ii; ++i) {
+        filter = this.xref.fetchIfRef(filterArray[i]);
+
+        if (!(filter instanceof _primitives.Name)) {
+          throw new _util.FormatError(`Bad filter name "${filter}"`);
+        }
+
+        params = null;
+
+        if (Array.isArray(paramsArray) && i in paramsArray) {
+          params = this.xref.fetchIfRef(paramsArray[i]);
+        }
+
+        stream = this.makeFilter(stream, filter.name, maybeLength, params);
+        maybeLength = null;
+      }
+    }
+
+    return stream;
+  }
+
+  makeFilter(stream, name, maybeLength, params) {
+    if (maybeLength === 0) {
+      (0, _util.warn)(`Empty "${name}" stream.`);
+      return new _stream.NullStream();
+    }
+
+    const xrefStats = this.xref.stats;
+
+    try {
+      switch (name) {
+        case "Fl":
+        case "FlateDecode":
+          xrefStats.addStreamType(_util.StreamType.FLATE);
+
+          if (params) {
+            return new _predictor_stream.PredictorStream(new _flate_stream.FlateStream(stream, maybeLength), maybeLength, params);
+          }
+
+          return new _flate_stream.FlateStream(stream, maybeLength);
+
+        case "LZW":
+        case "LZWDecode":
+          xrefStats.addStreamType(_util.StreamType.LZW);
+          let earlyChange = 1;
+
+          if (params) {
+            if (params.has("EarlyChange")) {
+              earlyChange = params.get("EarlyChange");
+            }
+
+            return new _predictor_stream.PredictorStream(new _lzw_stream.LZWStream(stream, maybeLength, earlyChange), maybeLength, params);
+          }
+
+          return new _lzw_stream.LZWStream(stream, maybeLength, earlyChange);
+
+        case "DCT":
+        case "DCTDecode":
+          xrefStats.addStreamType(_util.StreamType.DCT);
+          return new _jpeg_stream.JpegStream(stream, maybeLength, params);
+
+        case "JPX":
+        case "JPXDecode":
+          xrefStats.addStreamType(_util.StreamType.JPX);
+          return new _jpx_stream.JpxStream(stream, maybeLength, params);
+
+        case "A85":
+        case "ASCII85Decode":
+          xrefStats.addStreamType(_util.StreamType.A85);
+          return new _ascii_85_stream.Ascii85Stream(stream, maybeLength);
+
+        case "AHx":
+        case "ASCIIHexDecode":
+          xrefStats.addStreamType(_util.StreamType.AHX);
+          return new _ascii_hex_stream.AsciiHexStream(stream, maybeLength);
+
+        case "CCF":
+        case "CCITTFaxDecode":
+          xrefStats.addStreamType(_util.StreamType.CCF);
+          return new _ccitt_stream.CCITTFaxStream(stream, maybeLength, params);
+
+        case "RL":
+        case "RunLengthDecode":
+          xrefStats.addStreamType(_util.StreamType.RLX);
+          return new _run_length_stream.RunLengthStream(stream, maybeLength);
+
+        case "JBIG2Decode":
+          xrefStats.addStreamType(_util.StreamType.JBIG);
+          return new _jbig2_stream.Jbig2Stream(stream, maybeLength, params);
+      }
+
+      (0, _util.warn)(`Filter "${name}" is not supported.`);
+      return stream;
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)(`Invalid stream: "${ex}"`);
+      return new _stream.NullStream();
+    }
+  }
+
+}
+
+exports.Parser = Parser;
+const specialChars = [1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+function toHexDigit(ch) {
+  if (ch >= 0x30 && ch <= 0x39) {
+    return ch & 0x0f;
+  }
+
+  if (ch >= 0x41 && ch <= 0x46 || ch >= 0x61 && ch <= 0x66) {
+    return (ch & 0x0f) + 9;
+  }
+
+  return -1;
+}
+
+class Lexer {
+  constructor(stream, knownCommands = null) {
+    this.stream = stream;
+    this.nextChar();
+    this.strBuf = [];
+    this.knownCommands = knownCommands;
+    this._hexStringNumWarn = 0;
+    this.beginInlineImagePos = -1;
+  }
+
+  nextChar() {
+    return this.currentChar = this.stream.getByte();
+  }
+
+  peekChar() {
+    return this.stream.peekByte();
+  }
+
+  getNumber() {
+    let ch = this.currentChar;
+    let eNotation = false;
+    let divideBy = 0;
+    let sign = 0;
+
+    if (ch === 0x2d) {
+      sign = -1;
+      ch = this.nextChar();
+
+      if (ch === 0x2d) {
+        ch = this.nextChar();
+      }
+    } else if (ch === 0x2b) {
+      sign = 1;
+      ch = this.nextChar();
+    }
+
+    if (ch === 0x0a || ch === 0x0d) {
+      do {
+        ch = this.nextChar();
+      } while (ch === 0x0a || ch === 0x0d);
+    }
+
+    if (ch === 0x2e) {
+      divideBy = 10;
+      ch = this.nextChar();
+    }
+
+    if (ch < 0x30 || ch > 0x39) {
+      if ((0, _core_utils.isWhiteSpace)(ch) || ch === -1) {
+        if (divideBy === 10 && sign === 0) {
+          (0, _util.warn)("Lexer.getNumber - treating a single decimal point as zero.");
+          return 0;
+        }
+
+        if (divideBy === 0 && sign === -1) {
+          (0, _util.warn)("Lexer.getNumber - treating a single minus sign as zero.");
+          return 0;
+        }
+      }
+
+      throw new _util.FormatError(`Invalid number: ${String.fromCharCode(ch)} (charCode ${ch})`);
+    }
+
+    sign = sign || 1;
+    let baseValue = ch - 0x30;
+    let powerValue = 0;
+    let powerValueSign = 1;
+
+    while ((ch = this.nextChar()) >= 0) {
+      if (ch >= 0x30 && ch <= 0x39) {
+        const currentDigit = ch - 0x30;
+
+        if (eNotation) {
+          powerValue = powerValue * 10 + currentDigit;
+        } else {
+          if (divideBy !== 0) {
+            divideBy *= 10;
+          }
+
+          baseValue = baseValue * 10 + currentDigit;
+        }
+      } else if (ch === 0x2e) {
+        if (divideBy === 0) {
+          divideBy = 1;
+        } else {
+          break;
+        }
+      } else if (ch === 0x2d) {
+        (0, _util.warn)("Badly formatted number: minus sign in the middle");
+      } else if (ch === 0x45 || ch === 0x65) {
+        ch = this.peekChar();
+
+        if (ch === 0x2b || ch === 0x2d) {
+          powerValueSign = ch === 0x2d ? -1 : 1;
+          this.nextChar();
+        } else if (ch < 0x30 || ch > 0x39) {
+          break;
+        }
+
+        eNotation = true;
+      } else {
+        break;
+      }
+    }
+
+    if (divideBy !== 0) {
+      baseValue /= divideBy;
+    }
+
+    if (eNotation) {
+      baseValue *= 10 ** (powerValueSign * powerValue);
+    }
+
+    return sign * baseValue;
+  }
+
+  getString() {
+    let numParen = 1;
+    let done = false;
+    const strBuf = this.strBuf;
+    strBuf.length = 0;
+    let ch = this.nextChar();
+
+    while (true) {
+      let charBuffered = false;
+
+      switch (ch | 0) {
+        case -1:
+          (0, _util.warn)("Unterminated string");
+          done = true;
+          break;
+
+        case 0x28:
+          ++numParen;
+          strBuf.push("(");
+          break;
+
+        case 0x29:
+          if (--numParen === 0) {
+            this.nextChar();
+            done = true;
+          } else {
+            strBuf.push(")");
+          }
+
+          break;
+
+        case 0x5c:
+          ch = this.nextChar();
+
+          switch (ch) {
+            case -1:
+              (0, _util.warn)("Unterminated string");
+              done = true;
+              break;
+
+            case 0x6e:
+              strBuf.push("\n");
+              break;
+
+            case 0x72:
+              strBuf.push("\r");
+              break;
+
+            case 0x74:
+              strBuf.push("\t");
+              break;
+
+            case 0x62:
+              strBuf.push("\b");
+              break;
+
+            case 0x66:
+              strBuf.push("\f");
+              break;
+
+            case 0x5c:
+            case 0x28:
+            case 0x29:
+              strBuf.push(String.fromCharCode(ch));
+              break;
+
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+              let x = ch & 0x0f;
+              ch = this.nextChar();
+              charBuffered = true;
+
+              if (ch >= 0x30 && ch <= 0x37) {
+                x = (x << 3) + (ch & 0x0f);
+                ch = this.nextChar();
+
+                if (ch >= 0x30 && ch <= 0x37) {
+                  charBuffered = false;
+                  x = (x << 3) + (ch & 0x0f);
+                }
+              }
+
+              strBuf.push(String.fromCharCode(x));
+              break;
+
+            case 0x0d:
+              if (this.peekChar() === 0x0a) {
+                this.nextChar();
+              }
+
+              break;
+
+            case 0x0a:
+              break;
+
+            default:
+              strBuf.push(String.fromCharCode(ch));
+              break;
+          }
+
+          break;
+
+        default:
+          strBuf.push(String.fromCharCode(ch));
+          break;
+      }
+
+      if (done) {
+        break;
+      }
+
+      if (!charBuffered) {
+        ch = this.nextChar();
+      }
+    }
+
+    return strBuf.join("");
+  }
+
+  getName() {
+    let ch, previousCh;
+    const strBuf = this.strBuf;
+    strBuf.length = 0;
+
+    while ((ch = this.nextChar()) >= 0 && !specialChars[ch]) {
+      if (ch === 0x23) {
+        ch = this.nextChar();
+
+        if (specialChars[ch]) {
+          (0, _util.warn)("Lexer_getName: " + "NUMBER SIGN (#) should be followed by a hexadecimal number.");
+          strBuf.push("#");
+          break;
+        }
+
+        const x = toHexDigit(ch);
+
+        if (x !== -1) {
+          previousCh = ch;
+          ch = this.nextChar();
+          const x2 = toHexDigit(ch);
+
+          if (x2 === -1) {
+            (0, _util.warn)(`Lexer_getName: Illegal digit (${String.fromCharCode(ch)}) ` + "in hexadecimal number.");
+            strBuf.push("#", String.fromCharCode(previousCh));
+
+            if (specialChars[ch]) {
+              break;
+            }
+
+            strBuf.push(String.fromCharCode(ch));
+            continue;
+          }
+
+          strBuf.push(String.fromCharCode(x << 4 | x2));
+        } else {
+          strBuf.push("#", String.fromCharCode(ch));
+        }
+      } else {
+        strBuf.push(String.fromCharCode(ch));
+      }
+    }
+
+    if (strBuf.length > 127) {
+      (0, _util.warn)(`Name token is longer than allowed by the spec: ${strBuf.length}`);
+    }
+
+    return _primitives.Name.get(strBuf.join(""));
+  }
+
+  _hexStringWarn(ch) {
+    const MAX_HEX_STRING_NUM_WARN = 5;
+
+    if (this._hexStringNumWarn++ === MAX_HEX_STRING_NUM_WARN) {
+      (0, _util.warn)("getHexString - ignoring additional invalid characters.");
+      return;
+    }
+
+    if (this._hexStringNumWarn > MAX_HEX_STRING_NUM_WARN) {
+      return;
+    }
+
+    (0, _util.warn)(`getHexString - ignoring invalid character: ${ch}`);
+  }
+
+  getHexString() {
+    const strBuf = this.strBuf;
+    strBuf.length = 0;
+    let ch = this.currentChar;
+    let isFirstHex = true;
+    let firstDigit, secondDigit;
+    this._hexStringNumWarn = 0;
+
+    while (true) {
+      if (ch < 0) {
+        (0, _util.warn)("Unterminated hex string");
+        break;
+      } else if (ch === 0x3e) {
+        this.nextChar();
+        break;
+      } else if (specialChars[ch] === 1) {
+        ch = this.nextChar();
+        continue;
+      } else {
+        if (isFirstHex) {
+          firstDigit = toHexDigit(ch);
+
+          if (firstDigit === -1) {
+            this._hexStringWarn(ch);
+
+            ch = this.nextChar();
+            continue;
+          }
+        } else {
+          secondDigit = toHexDigit(ch);
+
+          if (secondDigit === -1) {
+            this._hexStringWarn(ch);
+
+            ch = this.nextChar();
+            continue;
+          }
+
+          strBuf.push(String.fromCharCode(firstDigit << 4 | secondDigit));
+        }
+
+        isFirstHex = !isFirstHex;
+        ch = this.nextChar();
+      }
+    }
+
+    return strBuf.join("");
+  }
+
+  getObj() {
+    let comment = false;
+    let ch = this.currentChar;
+
+    while (true) {
+      if (ch < 0) {
+        return _primitives.EOF;
+      }
+
+      if (comment) {
+        if (ch === 0x0a || ch === 0x0d) {
+          comment = false;
+        }
+      } else if (ch === 0x25) {
+        comment = true;
+      } else if (specialChars[ch] !== 1) {
+        break;
+      }
+
+      ch = this.nextChar();
+    }
+
+    switch (ch | 0) {
+      case 0x30:
+      case 0x31:
+      case 0x32:
+      case 0x33:
+      case 0x34:
+      case 0x35:
+      case 0x36:
+      case 0x37:
+      case 0x38:
+      case 0x39:
+      case 0x2b:
+      case 0x2d:
+      case 0x2e:
+        return this.getNumber();
+
+      case 0x28:
+        return this.getString();
+
+      case 0x2f:
+        return this.getName();
+
+      case 0x5b:
+        this.nextChar();
+        return _primitives.Cmd.get("[");
+
+      case 0x5d:
+        this.nextChar();
+        return _primitives.Cmd.get("]");
+
+      case 0x3c:
+        ch = this.nextChar();
+
+        if (ch === 0x3c) {
+          this.nextChar();
+          return _primitives.Cmd.get("<<");
+        }
+
+        return this.getHexString();
+
+      case 0x3e:
+        ch = this.nextChar();
+
+        if (ch === 0x3e) {
+          this.nextChar();
+          return _primitives.Cmd.get(">>");
+        }
+
+        return _primitives.Cmd.get(">");
+
+      case 0x7b:
+        this.nextChar();
+        return _primitives.Cmd.get("{");
+
+      case 0x7d:
+        this.nextChar();
+        return _primitives.Cmd.get("}");
+
+      case 0x29:
+        this.nextChar();
+        throw new _util.FormatError(`Illegal character: ${ch}`);
+    }
+
+    let str = String.fromCharCode(ch);
+
+    if (ch < 0x20 || ch > 0x7f) {
+      const nextCh = this.peekChar();
+
+      if (nextCh >= 0x20 && nextCh <= 0x7f) {
+        this.nextChar();
+        return _primitives.Cmd.get(str);
+      }
+    }
+
+    const knownCommands = this.knownCommands;
+    let knownCommandFound = knownCommands && knownCommands[str] !== undefined;
+
+    while ((ch = this.nextChar()) >= 0 && !specialChars[ch]) {
+      const possibleCommand = str + String.fromCharCode(ch);
+
+      if (knownCommandFound && knownCommands[possibleCommand] === undefined) {
+        break;
+      }
+
+      if (str.length === 128) {
+        throw new _util.FormatError(`Command token too long: ${str.length}`);
+      }
+
+      str = possibleCommand;
+      knownCommandFound = knownCommands && knownCommands[str] !== undefined;
+    }
+
+    if (str === "true") {
+      return true;
+    }
+
+    if (str === "false") {
+      return false;
+    }
+
+    if (str === "null") {
+      return null;
+    }
+
+    if (str === "BI") {
+      this.beginInlineImagePos = this.stream.pos;
+    }
+
+    return _primitives.Cmd.get(str);
+  }
+
+  peekObj() {
+    const streamPos = this.stream.pos,
+          currentChar = this.currentChar,
+          beginInlineImagePos = this.beginInlineImagePos;
+    let nextObj;
+
+    try {
+      nextObj = this.getObj();
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)(`peekObj: ${ex}`);
+    }
+
+    this.stream.pos = streamPos;
+    this.currentChar = currentChar;
+    this.beginInlineImagePos = beginInlineImagePos;
+    return nextObj;
+  }
+
+  skipToNextLine() {
+    let ch = this.currentChar;
+
+    while (ch >= 0) {
+      if (ch === 0x0d) {
+        ch = this.nextChar();
+
+        if (ch === 0x0a) {
+          this.nextChar();
+        }
+
+        break;
+      } else if (ch === 0x0a) {
+        this.nextChar();
+        break;
+      }
+
+      ch = this.nextChar();
+    }
+  }
+
+}
+
+exports.Lexer = Lexer;
+
+class Linearization {
+  static create(stream) {
+    function getInt(linDict, name, allowZeroValue = false) {
+      const obj = linDict.get(name);
+
+      if (Number.isInteger(obj) && (allowZeroValue ? obj >= 0 : obj > 0)) {
+        return obj;
+      }
+
+      throw new Error(`The "${name}" parameter in the linearization ` + "dictionary is invalid.");
+    }
+
+    function getHints(linDict) {
+      const hints = linDict.get("H");
+      let hintsLength;
+
+      if (Array.isArray(hints) && ((hintsLength = hints.length) === 2 || hintsLength === 4)) {
+        for (let index = 0; index < hintsLength; index++) {
+          const hint = hints[index];
+
+          if (!(Number.isInteger(hint) && hint > 0)) {
+            throw new Error(`Hint (${index}) in the linearization dictionary is invalid.`);
+          }
+        }
+
+        return hints;
+      }
+
+      throw new Error("Hint array in the linearization dictionary is invalid.");
+    }
+
+    const parser = new Parser({
+      lexer: new Lexer(stream),
+      xref: null
+    });
+    const obj1 = parser.getObj();
+    const obj2 = parser.getObj();
+    const obj3 = parser.getObj();
+    const linDict = parser.getObj();
+    let obj, length;
+
+    if (!(Number.isInteger(obj1) && Number.isInteger(obj2) && (0, _primitives.isCmd)(obj3, "obj") && linDict instanceof _primitives.Dict && typeof (obj = linDict.get("Linearized")) === "number" && obj > 0)) {
+      return null;
+    } else if ((length = getInt(linDict, "L")) !== stream.length) {
+      throw new Error('The "L" parameter in the linearization dictionary ' + "does not equal the stream length.");
+    }
+
+    return {
+      length,
+      hints: getHints(linDict),
+      objectNumberFirst: getInt(linDict, "O"),
+      endFirst: getInt(linDict, "E"),
+      numPages: getInt(linDict, "N"),
+      mainXRefEntriesOffset: getInt(linDict, "T"),
+      pageFirst: linDict.has("P") ? getInt(linDict, "P", true) : 0
+    };
+  }
+
+}
+
+exports.Linearization = Linearization;
+
+/***/ }),
+/* 18 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Ascii85Stream = void 0;
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+class Ascii85Stream extends _decode_stream.DecodeStream {
+  constructor(str, maybeLength) {
+    if (maybeLength) {
+      maybeLength *= 0.8;
+    }
+
+    super(maybeLength);
+    this.str = str;
+    this.dict = str.dict;
+    this.input = new Uint8Array(5);
+  }
+
+  readBlock() {
+    const TILDA_CHAR = 0x7e;
+    const Z_LOWER_CHAR = 0x7a;
+    const EOF = -1;
+    const str = this.str;
+    let c = str.getByte();
+
+    while ((0, _core_utils.isWhiteSpace)(c)) {
+      c = str.getByte();
+    }
+
+    if (c === EOF || c === TILDA_CHAR) {
+      this.eof = true;
+      return;
+    }
+
+    const bufferLength = this.bufferLength;
+    let buffer, i;
+
+    if (c === Z_LOWER_CHAR) {
+      buffer = this.ensureBuffer(bufferLength + 4);
+
+      for (i = 0; i < 4; ++i) {
+        buffer[bufferLength + i] = 0;
+      }
+
+      this.bufferLength += 4;
+    } else {
+      const input = this.input;
+      input[0] = c;
+
+      for (i = 1; i < 5; ++i) {
+        c = str.getByte();
+
+        while ((0, _core_utils.isWhiteSpace)(c)) {
+          c = str.getByte();
+        }
+
+        input[i] = c;
+
+        if (c === EOF || c === TILDA_CHAR) {
+          break;
+        }
+      }
+
+      buffer = this.ensureBuffer(bufferLength + i - 1);
+      this.bufferLength += i - 1;
+
+      if (i < 5) {
+        for (; i < 5; ++i) {
+          input[i] = 0x21 + 84;
+        }
+
+        this.eof = true;
+      }
+
+      let t = 0;
+
+      for (i = 0; i < 5; ++i) {
+        t = t * 85 + (input[i] - 0x21);
+      }
+
+      for (i = 3; i >= 0; --i) {
+        buffer[bufferLength + i] = t & 0xff;
+        t >>= 8;
+      }
+    }
+  }
+
+}
+
+exports.Ascii85Stream = Ascii85Stream;
+
+/***/ }),
+/* 19 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.StreamsSequenceStream = exports.DecodeStream = void 0;
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _stream = __w_pdfjs_require__(10);
+
+const emptyBuffer = new Uint8Array(0);
+
+class DecodeStream extends _base_stream.BaseStream {
+  constructor(maybeMinBufferLength) {
+    super();
+    this._rawMinBufferLength = maybeMinBufferLength || 0;
+    this.pos = 0;
+    this.bufferLength = 0;
+    this.eof = false;
+    this.buffer = emptyBuffer;
+    this.minBufferLength = 512;
+
+    if (maybeMinBufferLength) {
+      while (this.minBufferLength < maybeMinBufferLength) {
+        this.minBufferLength *= 2;
+      }
+    }
+  }
+
+  get isEmpty() {
+    while (!this.eof && this.bufferLength === 0) {
+      this.readBlock();
+    }
+
+    return this.bufferLength === 0;
+  }
+
+  ensureBuffer(requested) {
+    const buffer = this.buffer;
+
+    if (requested <= buffer.byteLength) {
+      return buffer;
+    }
+
+    let size = this.minBufferLength;
+
+    while (size < requested) {
+      size *= 2;
+    }
+
+    const buffer2 = new Uint8Array(size);
+    buffer2.set(buffer);
+    return this.buffer = buffer2;
+  }
+
+  getByte() {
+    const pos = this.pos;
+
+    while (this.bufferLength <= pos) {
+      if (this.eof) {
+        return -1;
+      }
+
+      this.readBlock();
+    }
+
+    return this.buffer[this.pos++];
+  }
+
+  getBytes(length) {
+    const pos = this.pos;
+    let end;
+
+    if (length) {
+      this.ensureBuffer(pos + length);
+      end = pos + length;
+
+      while (!this.eof && this.bufferLength < end) {
+        this.readBlock();
+      }
+
+      const bufEnd = this.bufferLength;
+
+      if (end > bufEnd) {
+        end = bufEnd;
+      }
+    } else {
+      while (!this.eof) {
+        this.readBlock();
+      }
+
+      end = this.bufferLength;
+    }
+
+    this.pos = end;
+    return this.buffer.subarray(pos, end);
+  }
+
+  reset() {
+    this.pos = 0;
+  }
+
+  makeSubStream(start, length, dict = null) {
+    if (length === undefined) {
+      while (!this.eof) {
+        this.readBlock();
+      }
+    } else {
+      const end = start + length;
+
+      while (this.bufferLength <= end && !this.eof) {
+        this.readBlock();
+      }
+    }
+
+    return new _stream.Stream(this.buffer, start, length, dict);
+  }
+
+  getBaseStreams() {
+    return this.str ? this.str.getBaseStreams() : null;
+  }
+
+}
+
+exports.DecodeStream = DecodeStream;
+
+class StreamsSequenceStream extends DecodeStream {
+  constructor(streams, onError = null) {
+    let maybeLength = 0;
+
+    for (const stream of streams) {
+      maybeLength += stream instanceof DecodeStream ? stream._rawMinBufferLength : stream.length;
+    }
+
+    super(maybeLength);
+    this.streams = streams;
+    this._onError = onError;
+  }
+
+  readBlock() {
+    const streams = this.streams;
+
+    if (streams.length === 0) {
+      this.eof = true;
+      return;
+    }
+
+    const stream = streams.shift();
+    let chunk;
+
+    try {
+      chunk = stream.getBytes();
+    } catch (reason) {
+      if (this._onError) {
+        this._onError(reason, stream.dict && stream.dict.objId);
+
+        return;
+      }
+
+      throw reason;
+    }
+
+    const bufferLength = this.bufferLength;
+    const newLength = bufferLength + chunk.length;
+    const buffer = this.ensureBuffer(newLength);
+    buffer.set(chunk, bufferLength);
+    this.bufferLength = newLength;
+  }
+
+  getBaseStreams() {
+    const baseStreamsBuf = [];
+
+    for (const stream of this.streams) {
+      const baseStreams = stream.getBaseStreams();
+
+      if (baseStreams) {
+        baseStreamsBuf.push(...baseStreams);
+      }
+    }
+
+    return baseStreamsBuf.length > 0 ? baseStreamsBuf : null;
+  }
+
+}
+
+exports.StreamsSequenceStream = StreamsSequenceStream;
+
+/***/ }),
+/* 20 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.AsciiHexStream = void 0;
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+class AsciiHexStream extends _decode_stream.DecodeStream {
+  constructor(str, maybeLength) {
+    if (maybeLength) {
+      maybeLength *= 0.5;
+    }
+
+    super(maybeLength);
+    this.str = str;
+    this.dict = str.dict;
+    this.firstDigit = -1;
+  }
+
+  readBlock() {
+    const UPSTREAM_BLOCK_SIZE = 8000;
+    const bytes = this.str.getBytes(UPSTREAM_BLOCK_SIZE);
+
+    if (!bytes.length) {
+      this.eof = true;
+      return;
+    }
+
+    const maxDecodeLength = bytes.length + 1 >> 1;
+    const buffer = this.ensureBuffer(this.bufferLength + maxDecodeLength);
+    let bufferLength = this.bufferLength;
+    let firstDigit = this.firstDigit;
+
+    for (const ch of bytes) {
+      let digit;
+
+      if (ch >= 0x30 && ch <= 0x39) {
+        digit = ch & 0x0f;
+      } else if (ch >= 0x41 && ch <= 0x46 || ch >= 0x61 && ch <= 0x66) {
+        digit = (ch & 0x0f) + 9;
+      } else if (ch === 0x3e) {
+        this.eof = true;
+        break;
+      } else {
+        continue;
+      }
+
+      if (firstDigit < 0) {
+        firstDigit = digit;
+      } else {
+        buffer[bufferLength++] = firstDigit << 4 | digit;
+        firstDigit = -1;
+      }
+    }
+
+    if (firstDigit >= 0 && this.eof) {
+      buffer[bufferLength++] = firstDigit << 4;
+      firstDigit = -1;
+    }
+
+    this.firstDigit = firstDigit;
+    this.bufferLength = bufferLength;
+  }
+
+}
+
+exports.AsciiHexStream = AsciiHexStream;
+
+/***/ }),
+/* 21 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.CCITTFaxStream = void 0;
+
+var _ccitt = __w_pdfjs_require__(22);
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+var _primitives = __w_pdfjs_require__(5);
+
+class CCITTFaxStream extends _decode_stream.DecodeStream {
+  constructor(str, maybeLength, params) {
+    super(maybeLength);
+    this.str = str;
+    this.dict = str.dict;
+
+    if (!(params instanceof _primitives.Dict)) {
+      params = _primitives.Dict.empty;
+    }
+
+    const source = {
+      next() {
+        return str.getByte();
+      }
+
+    };
+    this.ccittFaxDecoder = new _ccitt.CCITTFaxDecoder(source, {
+      K: params.get("K"),
+      EndOfLine: params.get("EndOfLine"),
+      EncodedByteAlign: params.get("EncodedByteAlign"),
+      Columns: params.get("Columns"),
+      Rows: params.get("Rows"),
+      EndOfBlock: params.get("EndOfBlock"),
+      BlackIs1: params.get("BlackIs1")
+    });
+  }
+
+  readBlock() {
+    while (!this.eof) {
+      const c = this.ccittFaxDecoder.readNextChar();
+
+      if (c === -1) {
+        this.eof = true;
+        return;
+      }
+
+      this.ensureBuffer(this.bufferLength + 1);
+      this.buffer[this.bufferLength++] = c;
+    }
+  }
+
+}
+
+exports.CCITTFaxStream = CCITTFaxStream;
+
+/***/ }),
+/* 22 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.CCITTFaxDecoder = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+const ccittEOL = -2;
+const ccittEOF = -1;
+const twoDimPass = 0;
+const twoDimHoriz = 1;
+const twoDimVert0 = 2;
+const twoDimVertR1 = 3;
+const twoDimVertL1 = 4;
+const twoDimVertR2 = 5;
+const twoDimVertL2 = 6;
+const twoDimVertR3 = 7;
+const twoDimVertL3 = 8;
+const twoDimTable = [[-1, -1], [-1, -1], [7, twoDimVertL3], [7, twoDimVertR3], [6, twoDimVertL2], [6, twoDimVertL2], [6, twoDimVertR2], [6, twoDimVertR2], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [4, twoDimPass], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimHoriz], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertL1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [3, twoDimVertR1], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0], [1, twoDimVert0]];
+const whiteTable1 = [[-1, -1], [12, ccittEOL], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [11, 1792], [11, 1792], [12, 1984], [12, 2048], [12, 2112], [12, 2176], [12, 2240], [12, 2304], [11, 1856], [11, 1856], [11, 1920], [11, 1920], [12, 2368], [12, 2432], [12, 2496], [12, 2560]];
+const whiteTable2 = [[-1, -1], [-1, -1], [-1, -1], [-1, -1], [8, 29], [8, 29], [8, 30], [8, 30], [8, 45], [8, 45], [8, 46], [8, 46], [7, 22], [7, 22], [7, 22], [7, 22], [7, 23], [7, 23], [7, 23], [7, 23], [8, 47], [8, 47], [8, 48], [8, 48], [6, 13], [6, 13], [6, 13], [6, 13], [6, 13], [6, 13], [6, 13], [6, 13], [7, 20], [7, 20], [7, 20], [7, 20], [8, 33], [8, 33], [8, 34], [8, 34], [8, 35], [8, 35], [8, 36], [8, 36], [8, 37], [8, 37], [8, 38], [8, 38], [7, 19], [7, 19], [7, 19], [7, 19], [8, 31], [8, 31], [8, 32], [8, 32], [6, 1], [6, 1], [6, 1], [6, 1], [6, 1], [6, 1], [6, 1], [6, 1], [6, 12], [6, 12], [6, 12], [6, 12], [6, 12], [6, 12], [6, 12], [6, 12], [8, 53], [8, 53], [8, 54], [8, 54], [7, 26], [7, 26], [7, 26], [7, 26], [8, 39], [8, 39], [8, 40], [8, 40], [8, 41], [8, 41], [8, 42], [8, 42], [8, 43], [8, 43], [8, 44], [8, 44], [7, 21], [7, 21], [7, 21], [7, 21], [7, 28], [7, 28], [7, 28], [7, 28], [8, 61], [8, 61], [8, 62], [8, 62], [8, 63], [8, 63], [8, 0], [8, 0], [8, 320], [8, 320], [8, 384], [8, 384], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 10], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [5, 11], [7, 27], [7, 27], [7, 27], [7, 27], [8, 59], [8, 59], [8, 60], [8, 60], [9, 1472], [9, 1536], [9, 1600], [9, 1728], [7, 18], [7, 18], [7, 18], [7, 18], [7, 24], [7, 24], [7, 24], [7, 24], [8, 49], [8, 49], [8, 50], [8, 50], [8, 51], [8, 51], [8, 52], [8, 52], [7, 25], [7, 25], [7, 25], [7, 25], [8, 55], [8, 55], [8, 56], [8, 56], [8, 57], [8, 57], [8, 58], [8, 58], [6, 192], [6, 192], [6, 192], [6, 192], [6, 192], [6, 192], [6, 192], [6, 192], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [6, 1664], [8, 448], [8, 448], [8, 512], [8, 512], [9, 704], [9, 768], [8, 640], [8, 640], [8, 576], [8, 576], [9, 832], [9, 896], [9, 960], [9, 1024], [9, 1088], [9, 1152], [9, 1216], [9, 1280], [9, 1344], [9, 1408], [7, 256], [7, 256], [7, 256], [7, 256], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 2], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 128], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 8], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [5, 9], [6, 16], [6, 16], [6, 16], [6, 16], [6, 16], [6, 16], [6, 16], [6, 16], [6, 17], [6, 17], [6, 17], [6, 17], [6, 17], [6, 17], [6, 17], [6, 17], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 4], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [4, 5], [6, 14], [6, 14], [6, 14], [6, 14], [6, 14], [6, 14], [6, 14], [6, 14], [6, 15], [6, 15], [6, 15], [6, 15], [6, 15], [6, 15], [6, 15], [6, 15], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [5, 64], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 6], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7], [4, 7]];
+const blackTable1 = [[-1, -1], [-1, -1], [12, ccittEOL], [12, ccittEOL], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [11, 1792], [11, 1792], [11, 1792], [11, 1792], [12, 1984], [12, 1984], [12, 2048], [12, 2048], [12, 2112], [12, 2112], [12, 2176], [12, 2176], [12, 2240], [12, 2240], [12, 2304], [12, 2304], [11, 1856], [11, 1856], [11, 1856], [11, 1856], [11, 1920], [11, 1920], [11, 1920], [11, 1920], [12, 2368], [12, 2368], [12, 2432], [12, 2432], [12, 2496], [12, 2496], [12, 2560], [12, 2560], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [12, 52], [12, 52], [13, 640], [13, 704], [13, 768], [13, 832], [12, 55], [12, 55], [12, 56], [12, 56], [13, 1280], [13, 1344], [13, 1408], [13, 1472], [12, 59], [12, 59], [12, 60], [12, 60], [13, 1536], [13, 1600], [11, 24], [11, 24], [11, 24], [11, 24], [11, 25], [11, 25], [11, 25], [11, 25], [13, 1664], [13, 1728], [12, 320], [12, 320], [12, 384], [12, 384], [12, 448], [12, 448], [13, 512], [13, 576], [12, 53], [12, 53], [12, 54], [12, 54], [13, 896], [13, 960], [13, 1024], [13, 1088], [13, 1152], [13, 1216], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64]];
+const blackTable2 = [[8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [11, 23], [11, 23], [12, 50], [12, 51], [12, 44], [12, 45], [12, 46], [12, 47], [12, 57], [12, 58], [12, 61], [12, 256], [10, 16], [10, 16], [10, 16], [10, 16], [10, 17], [10, 17], [10, 17], [10, 17], [12, 48], [12, 49], [12, 62], [12, 63], [12, 30], [12, 31], [12, 32], [12, 33], [12, 40], [12, 41], [11, 22], [11, 22], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [12, 128], [12, 192], [12, 26], [12, 27], [12, 28], [12, 29], [11, 19], [11, 19], [11, 20], [11, 20], [12, 34], [12, 35], [12, 36], [12, 37], [12, 38], [12, 39], [11, 21], [11, 21], [12, 42], [12, 43], [10, 0], [10, 0], [10, 0], [10, 0], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12]];
+const blackTable3 = [[-1, -1], [-1, -1], [-1, -1], [-1, -1], [6, 9], [6, 8], [5, 7], [5, 7], [4, 6], [4, 6], [4, 6], [4, 6], [4, 5], [4, 5], [4, 5], [4, 5], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2]];
+
+class CCITTFaxDecoder {
+  constructor(source, options = {}) {
+    if (!source || typeof source.next !== "function") {
+      throw new Error('CCITTFaxDecoder - invalid "source" parameter.');
+    }
+
+    this.source = source;
+    this.eof = false;
+    this.encoding = options.K || 0;
+    this.eoline = options.EndOfLine || false;
+    this.byteAlign = options.EncodedByteAlign || false;
+    this.columns = options.Columns || 1728;
+    this.rows = options.Rows || 0;
+    let eoblock = options.EndOfBlock;
+
+    if (eoblock === null || eoblock === undefined) {
+      eoblock = true;
+    }
+
+    this.eoblock = eoblock;
+    this.black = options.BlackIs1 || false;
+    this.codingLine = new Uint32Array(this.columns + 1);
+    this.refLine = new Uint32Array(this.columns + 2);
+    this.codingLine[0] = this.columns;
+    this.codingPos = 0;
+    this.row = 0;
+    this.nextLine2D = this.encoding < 0;
+    this.inputBits = 0;
+    this.inputBuf = 0;
+    this.outputBits = 0;
+    this.rowsDone = false;
+    let code1;
+
+    while ((code1 = this._lookBits(12)) === 0) {
+      this._eatBits(1);
+    }
+
+    if (code1 === 1) {
+      this._eatBits(12);
+    }
+
+    if (this.encoding > 0) {
+      this.nextLine2D = !this._lookBits(1);
+
+      this._eatBits(1);
+    }
+  }
+
+  readNextChar() {
+    if (this.eof) {
+      return -1;
+    }
+
+    const refLine = this.refLine;
+    const codingLine = this.codingLine;
+    const columns = this.columns;
+    let refPos, blackPixels, bits, i;
+
+    if (this.outputBits === 0) {
+      if (this.rowsDone) {
+        this.eof = true;
+      }
+
+      if (this.eof) {
+        return -1;
+      }
+
+      this.err = false;
+      let code1, code2, code3;
+
+      if (this.nextLine2D) {
+        for (i = 0; codingLine[i] < columns; ++i) {
+          refLine[i] = codingLine[i];
+        }
+
+        refLine[i++] = columns;
+        refLine[i] = columns;
+        codingLine[0] = 0;
+        this.codingPos = 0;
+        refPos = 0;
+        blackPixels = 0;
+
+        while (codingLine[this.codingPos] < columns) {
+          code1 = this._getTwoDimCode();
+
+          switch (code1) {
+            case twoDimPass:
+              this._addPixels(refLine[refPos + 1], blackPixels);
+
+              if (refLine[refPos + 1] < columns) {
+                refPos += 2;
+              }
+
+              break;
+
+            case twoDimHoriz:
+              code1 = code2 = 0;
+
+              if (blackPixels) {
+                do {
+                  code1 += code3 = this._getBlackCode();
+                } while (code3 >= 64);
+
+                do {
+                  code2 += code3 = this._getWhiteCode();
+                } while (code3 >= 64);
+              } else {
+                do {
+                  code1 += code3 = this._getWhiteCode();
+                } while (code3 >= 64);
+
+                do {
+                  code2 += code3 = this._getBlackCode();
+                } while (code3 >= 64);
+              }
+
+              this._addPixels(codingLine[this.codingPos] + code1, blackPixels);
+
+              if (codingLine[this.codingPos] < columns) {
+                this._addPixels(codingLine[this.codingPos] + code2, blackPixels ^ 1);
+              }
+
+              while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
+                refPos += 2;
+              }
+
+              break;
+
+            case twoDimVertR3:
+              this._addPixels(refLine[refPos] + 3, blackPixels);
+
+              blackPixels ^= 1;
+
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+
+                while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
+                  refPos += 2;
+                }
+              }
+
+              break;
+
+            case twoDimVertR2:
+              this._addPixels(refLine[refPos] + 2, blackPixels);
+
+              blackPixels ^= 1;
+
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+
+                while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
+                  refPos += 2;
+                }
+              }
+
+              break;
+
+            case twoDimVertR1:
+              this._addPixels(refLine[refPos] + 1, blackPixels);
+
+              blackPixels ^= 1;
+
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+
+                while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
+                  refPos += 2;
+                }
+              }
+
+              break;
+
+            case twoDimVert0:
+              this._addPixels(refLine[refPos], blackPixels);
+
+              blackPixels ^= 1;
+
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+
+                while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
+                  refPos += 2;
+                }
+              }
+
+              break;
+
+            case twoDimVertL3:
+              this._addPixelsNeg(refLine[refPos] - 3, blackPixels);
+
+              blackPixels ^= 1;
+
+              if (codingLine[this.codingPos] < columns) {
+                if (refPos > 0) {
+                  --refPos;
+                } else {
+                  ++refPos;
+                }
+
+                while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
+                  refPos += 2;
+                }
+              }
+
+              break;
+
+            case twoDimVertL2:
+              this._addPixelsNeg(refLine[refPos] - 2, blackPixels);
+
+              blackPixels ^= 1;
+
+              if (codingLine[this.codingPos] < columns) {
+                if (refPos > 0) {
+                  --refPos;
+                } else {
+                  ++refPos;
+                }
+
+                while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
+                  refPos += 2;
+                }
+              }
+
+              break;
+
+            case twoDimVertL1:
+              this._addPixelsNeg(refLine[refPos] - 1, blackPixels);
+
+              blackPixels ^= 1;
+
+              if (codingLine[this.codingPos] < columns) {
+                if (refPos > 0) {
+                  --refPos;
+                } else {
+                  ++refPos;
+                }
+
+                while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
+                  refPos += 2;
+                }
+              }
+
+              break;
+
+            case ccittEOF:
+              this._addPixels(columns, 0);
+
+              this.eof = true;
+              break;
+
+            default:
+              (0, _util.info)("bad 2d code");
+
+              this._addPixels(columns, 0);
+
+              this.err = true;
+          }
+        }
+      } else {
+        codingLine[0] = 0;
+        this.codingPos = 0;
+        blackPixels = 0;
+
+        while (codingLine[this.codingPos] < columns) {
+          code1 = 0;
+
+          if (blackPixels) {
+            do {
+              code1 += code3 = this._getBlackCode();
+            } while (code3 >= 64);
+          } else {
+            do {
+              code1 += code3 = this._getWhiteCode();
+            } while (code3 >= 64);
+          }
+
+          this._addPixels(codingLine[this.codingPos] + code1, blackPixels);
+
+          blackPixels ^= 1;
+        }
+      }
+
+      let gotEOL = false;
+
+      if (this.byteAlign) {
+        this.inputBits &= ~7;
+      }
+
+      if (!this.eoblock && this.row === this.rows - 1) {
+        this.rowsDone = true;
+      } else {
+        code1 = this._lookBits(12);
+
+        if (this.eoline) {
+          while (code1 !== ccittEOF && code1 !== 1) {
+            this._eatBits(1);
+
+            code1 = this._lookBits(12);
+          }
+        } else {
+          while (code1 === 0) {
+            this._eatBits(1);
+
+            code1 = this._lookBits(12);
+          }
+        }
+
+        if (code1 === 1) {
+          this._eatBits(12);
+
+          gotEOL = true;
+        } else if (code1 === ccittEOF) {
+          this.eof = true;
+        }
+      }
+
+      if (!this.eof && this.encoding > 0 && !this.rowsDone) {
+        this.nextLine2D = !this._lookBits(1);
+
+        this._eatBits(1);
+      }
+
+      if (this.eoblock && gotEOL && this.byteAlign) {
+        code1 = this._lookBits(12);
+
+        if (code1 === 1) {
+          this._eatBits(12);
+
+          if (this.encoding > 0) {
+            this._lookBits(1);
+
+            this._eatBits(1);
+          }
+
+          if (this.encoding >= 0) {
+            for (i = 0; i < 4; ++i) {
+              code1 = this._lookBits(12);
+
+              if (code1 !== 1) {
+                (0, _util.info)("bad rtc code: " + code1);
+              }
+
+              this._eatBits(12);
+
+              if (this.encoding > 0) {
+                this._lookBits(1);
+
+                this._eatBits(1);
+              }
+            }
+          }
+
+          this.eof = true;
+        }
+      } else if (this.err && this.eoline) {
+        while (true) {
+          code1 = this._lookBits(13);
+
+          if (code1 === ccittEOF) {
+            this.eof = true;
+            return -1;
+          }
+
+          if (code1 >> 1 === 1) {
+            break;
+          }
+
+          this._eatBits(1);
+        }
+
+        this._eatBits(12);
+
+        if (this.encoding > 0) {
+          this._eatBits(1);
+
+          this.nextLine2D = !(code1 & 1);
+        }
+      }
+
+      if (codingLine[0] > 0) {
+        this.outputBits = codingLine[this.codingPos = 0];
+      } else {
+        this.outputBits = codingLine[this.codingPos = 1];
+      }
+
+      this.row++;
+    }
+
+    let c;
+
+    if (this.outputBits >= 8) {
+      c = this.codingPos & 1 ? 0 : 0xff;
+      this.outputBits -= 8;
+
+      if (this.outputBits === 0 && codingLine[this.codingPos] < columns) {
+        this.codingPos++;
+        this.outputBits = codingLine[this.codingPos] - codingLine[this.codingPos - 1];
+      }
+    } else {
+      bits = 8;
+      c = 0;
+
+      do {
+        if (typeof this.outputBits !== "number") {
+          throw new _util.FormatError('Invalid /CCITTFaxDecode data, "outputBits" must be a number.');
+        }
+
+        if (this.outputBits > bits) {
+          c <<= bits;
+
+          if (!(this.codingPos & 1)) {
+            c |= 0xff >> 8 - bits;
+          }
+
+          this.outputBits -= bits;
+          bits = 0;
+        } else {
+          c <<= this.outputBits;
+
+          if (!(this.codingPos & 1)) {
+            c |= 0xff >> 8 - this.outputBits;
+          }
+
+          bits -= this.outputBits;
+          this.outputBits = 0;
+
+          if (codingLine[this.codingPos] < columns) {
+            this.codingPos++;
+            this.outputBits = codingLine[this.codingPos] - codingLine[this.codingPos - 1];
+          } else if (bits > 0) {
+            c <<= bits;
+            bits = 0;
+          }
+        }
+      } while (bits);
+    }
+
+    if (this.black) {
+      c ^= 0xff;
+    }
+
+    return c;
+  }
+
+  _addPixels(a1, blackPixels) {
+    const codingLine = this.codingLine;
+    let codingPos = this.codingPos;
+
+    if (a1 > codingLine[codingPos]) {
+      if (a1 > this.columns) {
+        (0, _util.info)("row is wrong length");
+        this.err = true;
+        a1 = this.columns;
+      }
+
+      if (codingPos & 1 ^ blackPixels) {
+        ++codingPos;
+      }
+
+      codingLine[codingPos] = a1;
+    }
+
+    this.codingPos = codingPos;
+  }
+
+  _addPixelsNeg(a1, blackPixels) {
+    const codingLine = this.codingLine;
+    let codingPos = this.codingPos;
+
+    if (a1 > codingLine[codingPos]) {
+      if (a1 > this.columns) {
+        (0, _util.info)("row is wrong length");
+        this.err = true;
+        a1 = this.columns;
+      }
+
+      if (codingPos & 1 ^ blackPixels) {
+        ++codingPos;
+      }
+
+      codingLine[codingPos] = a1;
+    } else if (a1 < codingLine[codingPos]) {
+      if (a1 < 0) {
+        (0, _util.info)("invalid code");
+        this.err = true;
+        a1 = 0;
+      }
+
+      while (codingPos > 0 && a1 < codingLine[codingPos - 1]) {
+        --codingPos;
+      }
+
+      codingLine[codingPos] = a1;
+    }
+
+    this.codingPos = codingPos;
+  }
+
+  _findTableCode(start, end, table, limit) {
+    const limitValue = limit || 0;
+
+    for (let i = start; i <= end; ++i) {
+      let code = this._lookBits(i);
+
+      if (code === ccittEOF) {
+        return [true, 1, false];
+      }
+
+      if (i < end) {
+        code <<= end - i;
+      }
+
+      if (!limitValue || code >= limitValue) {
+        const p = table[code - limitValue];
+
+        if (p[0] === i) {
+          this._eatBits(i);
+
+          return [true, p[1], true];
+        }
+      }
+    }
+
+    return [false, 0, false];
+  }
+
+  _getTwoDimCode() {
+    let code = 0;
+    let p;
+
+    if (this.eoblock) {
+      code = this._lookBits(7);
+      p = twoDimTable[code];
+
+      if (p && p[0] > 0) {
+        this._eatBits(p[0]);
+
+        return p[1];
+      }
+    } else {
+      const result = this._findTableCode(1, 7, twoDimTable);
+
+      if (result[0] && result[2]) {
+        return result[1];
+      }
+    }
+
+    (0, _util.info)("Bad two dim code");
+    return ccittEOF;
+  }
+
+  _getWhiteCode() {
+    let code = 0;
+    let p;
+
+    if (this.eoblock) {
+      code = this._lookBits(12);
+
+      if (code === ccittEOF) {
+        return 1;
+      }
+
+      if (code >> 5 === 0) {
+        p = whiteTable1[code];
+      } else {
+        p = whiteTable2[code >> 3];
+      }
+
+      if (p[0] > 0) {
+        this._eatBits(p[0]);
+
+        return p[1];
+      }
+    } else {
+      let result = this._findTableCode(1, 9, whiteTable2);
+
+      if (result[0]) {
+        return result[1];
+      }
+
+      result = this._findTableCode(11, 12, whiteTable1);
+
+      if (result[0]) {
+        return result[1];
+      }
+    }
+
+    (0, _util.info)("bad white code");
+
+    this._eatBits(1);
+
+    return 1;
+  }
+
+  _getBlackCode() {
+    let code, p;
+
+    if (this.eoblock) {
+      code = this._lookBits(13);
+
+      if (code === ccittEOF) {
+        return 1;
+      }
+
+      if (code >> 7 === 0) {
+        p = blackTable1[code];
+      } else if (code >> 9 === 0 && code >> 7 !== 0) {
+        p = blackTable2[(code >> 1) - 64];
+      } else {
+        p = blackTable3[code >> 7];
+      }
+
+      if (p[0] > 0) {
+        this._eatBits(p[0]);
+
+        return p[1];
+      }
+    } else {
+      let result = this._findTableCode(2, 6, blackTable3);
+
+      if (result[0]) {
+        return result[1];
+      }
+
+      result = this._findTableCode(7, 12, blackTable2, 64);
+
+      if (result[0]) {
+        return result[1];
+      }
+
+      result = this._findTableCode(10, 13, blackTable1);
+
+      if (result[0]) {
+        return result[1];
+      }
+    }
+
+    (0, _util.info)("bad black code");
+
+    this._eatBits(1);
+
+    return 1;
+  }
+
+  _lookBits(n) {
+    let c;
+
+    while (this.inputBits < n) {
+      if ((c = this.source.next()) === -1) {
+        if (this.inputBits === 0) {
+          return ccittEOF;
+        }
+
+        return this.inputBuf << n - this.inputBits & 0xffff >> 16 - n;
+      }
+
+      this.inputBuf = this.inputBuf << 8 | c;
+      this.inputBits += 8;
+    }
+
+    return this.inputBuf >> this.inputBits - n & 0xffff >> 16 - n;
+  }
+
+  _eatBits(n) {
+    if ((this.inputBits -= n) < 0) {
+      this.inputBits = 0;
+    }
+  }
+
+}
+
+exports.CCITTFaxDecoder = CCITTFaxDecoder;
+
+/***/ }),
+/* 23 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.FlateStream = void 0;
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+var _util = __w_pdfjs_require__(2);
+
+const codeLenCodeMap = new Int32Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]);
+const lengthDecode = new Int32Array([0x00003, 0x00004, 0x00005, 0x00006, 0x00007, 0x00008, 0x00009, 0x0000a, 0x1000b, 0x1000d, 0x1000f, 0x10011, 0x20013, 0x20017, 0x2001b, 0x2001f, 0x30023, 0x3002b, 0x30033, 0x3003b, 0x40043, 0x40053, 0x40063, 0x40073, 0x50083, 0x500a3, 0x500c3, 0x500e3, 0x00102, 0x00102, 0x00102]);
+const distDecode = new Int32Array([0x00001, 0x00002, 0x00003, 0x00004, 0x10005, 0x10007, 0x20009, 0x2000d, 0x30011, 0x30019, 0x40021, 0x40031, 0x50041, 0x50061, 0x60081, 0x600c1, 0x70101, 0x70181, 0x80201, 0x80301, 0x90401, 0x90601, 0xa0801, 0xa0c01, 0xb1001, 0xb1801, 0xc2001, 0xc3001, 0xd4001, 0xd6001]);
+const fixedLitCodeTab = [new Int32Array([0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0, 0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0, 0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0, 0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0, 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8, 0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8, 0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8, 0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8, 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4, 0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4, 0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4, 0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4, 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc, 0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec, 0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc, 0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc, 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2, 0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2, 0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2, 0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2, 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca, 0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea, 0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da, 0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa, 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6, 0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6, 0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6, 0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6, 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce, 0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee, 0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de, 0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe, 0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1, 0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1, 0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1, 0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1, 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9, 0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9, 0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9, 0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9, 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5, 0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5, 0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5, 0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5, 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd, 0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed, 0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd, 0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd, 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3, 0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3, 0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3, 0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3, 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb, 0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb, 0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db, 0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb, 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7, 0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7, 0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7, 0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7, 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf, 0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef, 0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df, 0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff]), 9];
+const fixedDistCodeTab = [new Int32Array([0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c, 0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000, 0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d, 0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000]), 5];
+
+class FlateStream extends _decode_stream.DecodeStream {
+  constructor(str, maybeLength) {
+    super(maybeLength);
+    this.str = str;
+    this.dict = str.dict;
+    const cmf = str.getByte();
+    const flg = str.getByte();
+
+    if (cmf === -1 || flg === -1) {
+      throw new _util.FormatError(`Invalid header in flate stream: ${cmf}, ${flg}`);
+    }
+
+    if ((cmf & 0x0f) !== 0x08) {
+      throw new _util.FormatError(`Unknown compression method in flate stream: ${cmf}, ${flg}`);
+    }
+
+    if (((cmf << 8) + flg) % 31 !== 0) {
+      throw new _util.FormatError(`Bad FCHECK in flate stream: ${cmf}, ${flg}`);
+    }
+
+    if (flg & 0x20) {
+      throw new _util.FormatError(`FDICT bit set in flate stream: ${cmf}, ${flg}`);
+    }
+
+    this.codeSize = 0;
+    this.codeBuf = 0;
+  }
+
+  getBits(bits) {
+    const str = this.str;
+    let codeSize = this.codeSize;
+    let codeBuf = this.codeBuf;
+    let b;
+
+    while (codeSize < bits) {
+      if ((b = str.getByte()) === -1) {
+        throw new _util.FormatError("Bad encoding in flate stream");
+      }
+
+      codeBuf |= b << codeSize;
+      codeSize += 8;
+    }
+
+    b = codeBuf & (1 << bits) - 1;
+    this.codeBuf = codeBuf >> bits;
+    this.codeSize = codeSize -= bits;
+    return b;
+  }
+
+  getCode(table) {
+    const str = this.str;
+    const codes = table[0];
+    const maxLen = table[1];
+    let codeSize = this.codeSize;
+    let codeBuf = this.codeBuf;
+    let b;
+
+    while (codeSize < maxLen) {
+      if ((b = str.getByte()) === -1) {
+        break;
+      }
+
+      codeBuf |= b << codeSize;
+      codeSize += 8;
+    }
+
+    const code = codes[codeBuf & (1 << maxLen) - 1];
+    const codeLen = code >> 16;
+    const codeVal = code & 0xffff;
+
+    if (codeLen < 1 || codeSize < codeLen) {
+      throw new _util.FormatError("Bad encoding in flate stream");
+    }
+
+    this.codeBuf = codeBuf >> codeLen;
+    this.codeSize = codeSize - codeLen;
+    return codeVal;
+  }
+
+  generateHuffmanTable(lengths) {
+    const n = lengths.length;
+    let maxLen = 0;
+    let i;
+
+    for (i = 0; i < n; ++i) {
+      if (lengths[i] > maxLen) {
+        maxLen = lengths[i];
+      }
+    }
+
+    const size = 1 << maxLen;
+    const codes = new Int32Array(size);
+
+    for (let len = 1, code = 0, skip = 2; len <= maxLen; ++len, code <<= 1, skip <<= 1) {
+      for (let val = 0; val < n; ++val) {
+        if (lengths[val] === len) {
+          let code2 = 0;
+          let t = code;
+
+          for (i = 0; i < len; ++i) {
+            code2 = code2 << 1 | t & 1;
+            t >>= 1;
+          }
+
+          for (i = code2; i < size; i += skip) {
+            codes[i] = len << 16 | val;
+          }
+
+          ++code;
+        }
+      }
+    }
+
+    return [codes, maxLen];
+  }
+
+  readBlock() {
+    let buffer, len;
+    const str = this.str;
+    let hdr = this.getBits(3);
+
+    if (hdr & 1) {
+      this.eof = true;
+    }
+
+    hdr >>= 1;
+
+    if (hdr === 0) {
+      let b;
+
+      if ((b = str.getByte()) === -1) {
+        throw new _util.FormatError("Bad block header in flate stream");
+      }
+
+      let blockLen = b;
+
+      if ((b = str.getByte()) === -1) {
+        throw new _util.FormatError("Bad block header in flate stream");
+      }
+
+      blockLen |= b << 8;
+
+      if ((b = str.getByte()) === -1) {
+        throw new _util.FormatError("Bad block header in flate stream");
+      }
+
+      let check = b;
+
+      if ((b = str.getByte()) === -1) {
+        throw new _util.FormatError("Bad block header in flate stream");
+      }
+
+      check |= b << 8;
+
+      if (check !== (~blockLen & 0xffff) && (blockLen !== 0 || check !== 0)) {
+        throw new _util.FormatError("Bad uncompressed block length in flate stream");
+      }
+
+      this.codeBuf = 0;
+      this.codeSize = 0;
+      const bufferLength = this.bufferLength,
+            end = bufferLength + blockLen;
+      buffer = this.ensureBuffer(end);
+      this.bufferLength = end;
+
+      if (blockLen === 0) {
+        if (str.peekByte() === -1) {
+          this.eof = true;
+        }
+      } else {
+        const block = str.getBytes(blockLen);
+        buffer.set(block, bufferLength);
+
+        if (block.length < blockLen) {
+          this.eof = true;
+        }
+      }
+
+      return;
+    }
+
+    let litCodeTable;
+    let distCodeTable;
+
+    if (hdr === 1) {
+      litCodeTable = fixedLitCodeTab;
+      distCodeTable = fixedDistCodeTab;
+    } else if (hdr === 2) {
+      const numLitCodes = this.getBits(5) + 257;
+      const numDistCodes = this.getBits(5) + 1;
+      const numCodeLenCodes = this.getBits(4) + 4;
+      const codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
+      let i;
+
+      for (i = 0; i < numCodeLenCodes; ++i) {
+        codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
+      }
+
+      const codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
+      len = 0;
+      i = 0;
+      const codes = numLitCodes + numDistCodes;
+      const codeLengths = new Uint8Array(codes);
+      let bitsLength, bitsOffset, what;
+
+      while (i < codes) {
+        const code = this.getCode(codeLenCodeTab);
+
+        if (code === 16) {
+          bitsLength = 2;
+          bitsOffset = 3;
+          what = len;
+        } else if (code === 17) {
+          bitsLength = 3;
+          bitsOffset = 3;
+          what = len = 0;
+        } else if (code === 18) {
+          bitsLength = 7;
+          bitsOffset = 11;
+          what = len = 0;
+        } else {
+          codeLengths[i++] = len = code;
+          continue;
+        }
+
+        let repeatLength = this.getBits(bitsLength) + bitsOffset;
+
+        while (repeatLength-- > 0) {
+          codeLengths[i++] = what;
+        }
+      }
+
+      litCodeTable = this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
+      distCodeTable = this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
+    } else {
+      throw new _util.FormatError("Unknown block type in flate stream");
+    }
+
+    buffer = this.buffer;
+    let limit = buffer ? buffer.length : 0;
+    let pos = this.bufferLength;
+
+    while (true) {
+      let code1 = this.getCode(litCodeTable);
+
+      if (code1 < 256) {
+        if (pos + 1 >= limit) {
+          buffer = this.ensureBuffer(pos + 1);
+          limit = buffer.length;
+        }
+
+        buffer[pos++] = code1;
+        continue;
+      }
+
+      if (code1 === 256) {
+        this.bufferLength = pos;
+        return;
+      }
+
+      code1 -= 257;
+      code1 = lengthDecode[code1];
+      let code2 = code1 >> 16;
+
+      if (code2 > 0) {
+        code2 = this.getBits(code2);
+      }
+
+      len = (code1 & 0xffff) + code2;
+      code1 = this.getCode(distCodeTable);
+      code1 = distDecode[code1];
+      code2 = code1 >> 16;
+
+      if (code2 > 0) {
+        code2 = this.getBits(code2);
+      }
+
+      const dist = (code1 & 0xffff) + code2;
+
+      if (pos + len >= limit) {
+        buffer = this.ensureBuffer(pos + len);
+        limit = buffer.length;
+      }
+
+      for (let k = 0; k < len; ++k, ++pos) {
+        buffer[pos] = buffer[pos - dist];
+      }
+    }
+  }
+
+}
+
+exports.FlateStream = FlateStream;
+
+/***/ }),
+/* 24 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Jbig2Stream = void 0;
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _jbig = __w_pdfjs_require__(25);
+
+var _util = __w_pdfjs_require__(2);
+
+class Jbig2Stream extends _decode_stream.DecodeStream {
+  constructor(stream, maybeLength, params) {
+    super(maybeLength);
+    this.stream = stream;
+    this.dict = stream.dict;
+    this.maybeLength = maybeLength;
+    this.params = params;
+  }
+
+  get bytes() {
+    return (0, _util.shadow)(this, "bytes", this.stream.getBytes(this.maybeLength));
+  }
+
+  ensureBuffer(requested) {}
+
+  readBlock() {
+    if (this.eof) {
+      return;
+    }
+
+    const jbig2Image = new _jbig.Jbig2Image();
+    const chunks = [];
+
+    if (this.params instanceof _primitives.Dict) {
+      const globalsStream = this.params.get("JBIG2Globals");
+
+      if (globalsStream instanceof _base_stream.BaseStream) {
+        const globals = globalsStream.getBytes();
+        chunks.push({
+          data: globals,
+          start: 0,
+          end: globals.length
+        });
+      }
+    }
+
+    chunks.push({
+      data: this.bytes,
+      start: 0,
+      end: this.bytes.length
+    });
+    const data = jbig2Image.parseChunks(chunks);
+    const dataLength = data.length;
+
+    for (let i = 0; i < dataLength; i++) {
+      data[i] ^= 0xff;
+    }
+
+    this.buffer = data;
+    this.bufferLength = dataLength;
+    this.eof = true;
+  }
+
+}
+
+exports.Jbig2Stream = Jbig2Stream;
+
+/***/ }),
+/* 25 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Jbig2Image = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _arithmetic_decoder = __w_pdfjs_require__(26);
+
+var _ccitt = __w_pdfjs_require__(22);
+
+class Jbig2Error extends _util.BaseException {
+  constructor(msg) {
+    super(`JBIG2 error: ${msg}`, "Jbig2Error");
+  }
+
+}
+
+class ContextCache {
+  getContexts(id) {
+    if (id in this) {
+      return this[id];
+    }
+
+    return this[id] = new Int8Array(1 << 16);
+  }
+
+}
+
+class DecodingContext {
+  constructor(data, start, end) {
+    this.data = data;
+    this.start = start;
+    this.end = end;
+  }
+
+  get decoder() {
+    const decoder = new _arithmetic_decoder.ArithmeticDecoder(this.data, this.start, this.end);
+    return (0, _util.shadow)(this, "decoder", decoder);
+  }
+
+  get contextCache() {
+    const cache = new ContextCache();
+    return (0, _util.shadow)(this, "contextCache", cache);
+  }
+
+}
+
+function decodeInteger(contextCache, procedure, decoder) {
+  const contexts = contextCache.getContexts(procedure);
+  let prev = 1;
+
+  function readBits(length) {
+    let v = 0;
+
+    for (let i = 0; i < length; i++) {
+      const bit = decoder.readBit(contexts, prev);
+      prev = prev < 256 ? prev << 1 | bit : (prev << 1 | bit) & 511 | 256;
+      v = v << 1 | bit;
+    }
+
+    return v >>> 0;
+  }
+
+  const sign = readBits(1);
+  const value = readBits(1) ? readBits(1) ? readBits(1) ? readBits(1) ? readBits(1) ? readBits(32) + 4436 : readBits(12) + 340 : readBits(8) + 84 : readBits(6) + 20 : readBits(4) + 4 : readBits(2);
+
+  if (sign === 0) {
+    return value;
+  } else if (value > 0) {
+    return -value;
+  }
+
+  return null;
+}
+
+function decodeIAID(contextCache, decoder, codeLength) {
+  const contexts = contextCache.getContexts("IAID");
+  let prev = 1;
+
+  for (let i = 0; i < codeLength; i++) {
+    const bit = decoder.readBit(contexts, prev);
+    prev = prev << 1 | bit;
+  }
+
+  if (codeLength < 31) {
+    return prev & (1 << codeLength) - 1;
+  }
+
+  return prev & 0x7fffffff;
+}
+
+const SegmentTypes = ["SymbolDictionary", null, null, null, "IntermediateTextRegion", null, "ImmediateTextRegion", "ImmediateLosslessTextRegion", null, null, null, null, null, null, null, null, "PatternDictionary", null, null, null, "IntermediateHalftoneRegion", null, "ImmediateHalftoneRegion", "ImmediateLosslessHalftoneRegion", null, null, null, null, null, null, null, null, null, null, null, null, "IntermediateGenericRegion", null, "ImmediateGenericRegion", "ImmediateLosslessGenericRegion", "IntermediateGenericRefinementRegion", null, "ImmediateGenericRefinementRegion", "ImmediateLosslessGenericRefinementRegion", null, null, null, null, "PageInformation", "EndOfPage", "EndOfStripe", "EndOfFile", "Profiles", "Tables", null, null, null, null, null, null, null, null, "Extension"];
+const CodingTemplates = [[{
+  x: -1,
+  y: -2
+}, {
+  x: 0,
+  y: -2
+}, {
+  x: 1,
+  y: -2
+}, {
+  x: -2,
+  y: -1
+}, {
+  x: -1,
+  y: -1
+}, {
+  x: 0,
+  y: -1
+}, {
+  x: 1,
+  y: -1
+}, {
+  x: 2,
+  y: -1
+}, {
+  x: -4,
+  y: 0
+}, {
+  x: -3,
+  y: 0
+}, {
+  x: -2,
+  y: 0
+}, {
+  x: -1,
+  y: 0
+}], [{
+  x: -1,
+  y: -2
+}, {
+  x: 0,
+  y: -2
+}, {
+  x: 1,
+  y: -2
+}, {
+  x: 2,
+  y: -2
+}, {
+  x: -2,
+  y: -1
+}, {
+  x: -1,
+  y: -1
+}, {
+  x: 0,
+  y: -1
+}, {
+  x: 1,
+  y: -1
+}, {
+  x: 2,
+  y: -1
+}, {
+  x: -3,
+  y: 0
+}, {
+  x: -2,
+  y: 0
+}, {
+  x: -1,
+  y: 0
+}], [{
+  x: -1,
+  y: -2
+}, {
+  x: 0,
+  y: -2
+}, {
+  x: 1,
+  y: -2
+}, {
+  x: -2,
+  y: -1
+}, {
+  x: -1,
+  y: -1
+}, {
+  x: 0,
+  y: -1
+}, {
+  x: 1,
+  y: -1
+}, {
+  x: -2,
+  y: 0
+}, {
+  x: -1,
+  y: 0
+}], [{
+  x: -3,
+  y: -1
+}, {
+  x: -2,
+  y: -1
+}, {
+  x: -1,
+  y: -1
+}, {
+  x: 0,
+  y: -1
+}, {
+  x: 1,
+  y: -1
+}, {
+  x: -4,
+  y: 0
+}, {
+  x: -3,
+  y: 0
+}, {
+  x: -2,
+  y: 0
+}, {
+  x: -1,
+  y: 0
+}]];
+const RefinementTemplates = [{
+  coding: [{
+    x: 0,
+    y: -1
+  }, {
+    x: 1,
+    y: -1
+  }, {
+    x: -1,
+    y: 0
+  }],
+  reference: [{
+    x: 0,
+    y: -1
+  }, {
+    x: 1,
+    y: -1
+  }, {
+    x: -1,
+    y: 0
+  }, {
+    x: 0,
+    y: 0
+  }, {
+    x: 1,
+    y: 0
+  }, {
+    x: -1,
+    y: 1
+  }, {
+    x: 0,
+    y: 1
+  }, {
+    x: 1,
+    y: 1
+  }]
+}, {
+  coding: [{
+    x: -1,
+    y: -1
+  }, {
+    x: 0,
+    y: -1
+  }, {
+    x: 1,
+    y: -1
+  }, {
+    x: -1,
+    y: 0
+  }],
+  reference: [{
+    x: 0,
+    y: -1
+  }, {
+    x: -1,
+    y: 0
+  }, {
+    x: 0,
+    y: 0
+  }, {
+    x: 1,
+    y: 0
+  }, {
+    x: 0,
+    y: 1
+  }, {
+    x: 1,
+    y: 1
+  }]
+}];
+const ReusedContexts = [0x9b25, 0x0795, 0x00e5, 0x0195];
+const RefinementReusedContexts = [0x0020, 0x0008];
+
+function decodeBitmapTemplate0(width, height, decodingContext) {
+  const decoder = decodingContext.decoder;
+  const contexts = decodingContext.contextCache.getContexts("GB");
+  const bitmap = [];
+  let contextLabel, i, j, pixel, row, row1, row2;
+  const OLD_PIXEL_MASK = 0x7bf7;
+
+  for (i = 0; i < height; i++) {
+    row = bitmap[i] = new Uint8Array(width);
+    row1 = i < 1 ? row : bitmap[i - 1];
+    row2 = i < 2 ? row : bitmap[i - 2];
+    contextLabel = row2[0] << 13 | row2[1] << 12 | row2[2] << 11 | row1[0] << 7 | row1[1] << 6 | row1[2] << 5 | row1[3] << 4;
+
+    for (j = 0; j < width; j++) {
+      row[j] = pixel = decoder.readBit(contexts, contextLabel);
+      contextLabel = (contextLabel & OLD_PIXEL_MASK) << 1 | (j + 3 < width ? row2[j + 3] << 11 : 0) | (j + 4 < width ? row1[j + 4] << 4 : 0) | pixel;
+    }
+  }
+
+  return bitmap;
+}
+
+function decodeBitmap(mmr, width, height, templateIndex, prediction, skip, at, decodingContext) {
+  if (mmr) {
+    const input = new Reader(decodingContext.data, decodingContext.start, decodingContext.end);
+    return decodeMMRBitmap(input, width, height, false);
+  }
+
+  if (templateIndex === 0 && !skip && !prediction && at.length === 4 && at[0].x === 3 && at[0].y === -1 && at[1].x === -3 && at[1].y === -1 && at[2].x === 2 && at[2].y === -2 && at[3].x === -2 && at[3].y === -2) {
+    return decodeBitmapTemplate0(width, height, decodingContext);
+  }
+
+  const useskip = !!skip;
+  const template = CodingTemplates[templateIndex].concat(at);
+  template.sort(function (a, b) {
+    return a.y - b.y || a.x - b.x;
+  });
+  const templateLength = template.length;
+  const templateX = new Int8Array(templateLength);
+  const templateY = new Int8Array(templateLength);
+  const changingTemplateEntries = [];
+  let reuseMask = 0,
+      minX = 0,
+      maxX = 0,
+      minY = 0;
+  let c, k;
+
+  for (k = 0; k < templateLength; k++) {
+    templateX[k] = template[k].x;
+    templateY[k] = template[k].y;
+    minX = Math.min(minX, template[k].x);
+    maxX = Math.max(maxX, template[k].x);
+    minY = Math.min(minY, template[k].y);
+
+    if (k < templateLength - 1 && template[k].y === template[k + 1].y && template[k].x === template[k + 1].x - 1) {
+      reuseMask |= 1 << templateLength - 1 - k;
+    } else {
+      changingTemplateEntries.push(k);
+    }
+  }
+
+  const changingEntriesLength = changingTemplateEntries.length;
+  const changingTemplateX = new Int8Array(changingEntriesLength);
+  const changingTemplateY = new Int8Array(changingEntriesLength);
+  const changingTemplateBit = new Uint16Array(changingEntriesLength);
+
+  for (c = 0; c < changingEntriesLength; c++) {
+    k = changingTemplateEntries[c];
+    changingTemplateX[c] = template[k].x;
+    changingTemplateY[c] = template[k].y;
+    changingTemplateBit[c] = 1 << templateLength - 1 - k;
+  }
+
+  const sbb_left = -minX;
+  const sbb_top = -minY;
+  const sbb_right = width - maxX;
+  const pseudoPixelContext = ReusedContexts[templateIndex];
+  let row = new Uint8Array(width);
+  const bitmap = [];
+  const decoder = decodingContext.decoder;
+  const contexts = decodingContext.contextCache.getContexts("GB");
+  let ltp = 0,
+      j,
+      i0,
+      j0,
+      contextLabel = 0,
+      bit,
+      shift;
+
+  for (let i = 0; i < height; i++) {
+    if (prediction) {
+      const sltp = decoder.readBit(contexts, pseudoPixelContext);
+      ltp ^= sltp;
+
+      if (ltp) {
+        bitmap.push(row);
+        continue;
+      }
+    }
+
+    row = new Uint8Array(row);
+    bitmap.push(row);
+
+    for (j = 0; j < width; j++) {
+      if (useskip && skip[i][j]) {
+        row[j] = 0;
+        continue;
+      }
+
+      if (j >= sbb_left && j < sbb_right && i >= sbb_top) {
+        contextLabel = contextLabel << 1 & reuseMask;
+
+        for (k = 0; k < changingEntriesLength; k++) {
+          i0 = i + changingTemplateY[k];
+          j0 = j + changingTemplateX[k];
+          bit = bitmap[i0][j0];
+
+          if (bit) {
+            bit = changingTemplateBit[k];
+            contextLabel |= bit;
+          }
+        }
+      } else {
+        contextLabel = 0;
+        shift = templateLength - 1;
+
+        for (k = 0; k < templateLength; k++, shift--) {
+          j0 = j + templateX[k];
+
+          if (j0 >= 0 && j0 < width) {
+            i0 = i + templateY[k];
+
+            if (i0 >= 0) {
+              bit = bitmap[i0][j0];
+
+              if (bit) {
+                contextLabel |= bit << shift;
+              }
+            }
+          }
+        }
+      }
+
+      const pixel = decoder.readBit(contexts, contextLabel);
+      row[j] = pixel;
+    }
+  }
+
+  return bitmap;
+}
+
+function decodeRefinement(width, height, templateIndex, referenceBitmap, offsetX, offsetY, prediction, at, decodingContext) {
+  let codingTemplate = RefinementTemplates[templateIndex].coding;
+
+  if (templateIndex === 0) {
+    codingTemplate = codingTemplate.concat([at[0]]);
+  }
+
+  const codingTemplateLength = codingTemplate.length;
+  const codingTemplateX = new Int32Array(codingTemplateLength);
+  const codingTemplateY = new Int32Array(codingTemplateLength);
+  let k;
+
+  for (k = 0; k < codingTemplateLength; k++) {
+    codingTemplateX[k] = codingTemplate[k].x;
+    codingTemplateY[k] = codingTemplate[k].y;
+  }
+
+  let referenceTemplate = RefinementTemplates[templateIndex].reference;
+
+  if (templateIndex === 0) {
+    referenceTemplate = referenceTemplate.concat([at[1]]);
+  }
+
+  const referenceTemplateLength = referenceTemplate.length;
+  const referenceTemplateX = new Int32Array(referenceTemplateLength);
+  const referenceTemplateY = new Int32Array(referenceTemplateLength);
+
+  for (k = 0; k < referenceTemplateLength; k++) {
+    referenceTemplateX[k] = referenceTemplate[k].x;
+    referenceTemplateY[k] = referenceTemplate[k].y;
+  }
+
+  const referenceWidth = referenceBitmap[0].length;
+  const referenceHeight = referenceBitmap.length;
+  const pseudoPixelContext = RefinementReusedContexts[templateIndex];
+  const bitmap = [];
+  const decoder = decodingContext.decoder;
+  const contexts = decodingContext.contextCache.getContexts("GR");
+  let ltp = 0;
+
+  for (let i = 0; i < height; i++) {
+    if (prediction) {
+      const sltp = decoder.readBit(contexts, pseudoPixelContext);
+      ltp ^= sltp;
+
+      if (ltp) {
+        throw new Jbig2Error("prediction is not supported");
+      }
+    }
+
+    const row = new Uint8Array(width);
+    bitmap.push(row);
+
+    for (let j = 0; j < width; j++) {
+      let i0, j0;
+      let contextLabel = 0;
+
+      for (k = 0; k < codingTemplateLength; k++) {
+        i0 = i + codingTemplateY[k];
+        j0 = j + codingTemplateX[k];
+
+        if (i0 < 0 || j0 < 0 || j0 >= width) {
+          contextLabel <<= 1;
+        } else {
+          contextLabel = contextLabel << 1 | bitmap[i0][j0];
+        }
+      }
+
+      for (k = 0; k < referenceTemplateLength; k++) {
+        i0 = i + referenceTemplateY[k] - offsetY;
+        j0 = j + referenceTemplateX[k] - offsetX;
+
+        if (i0 < 0 || i0 >= referenceHeight || j0 < 0 || j0 >= referenceWidth) {
+          contextLabel <<= 1;
+        } else {
+          contextLabel = contextLabel << 1 | referenceBitmap[i0][j0];
+        }
+      }
+
+      const pixel = decoder.readBit(contexts, contextLabel);
+      row[j] = pixel;
+    }
+  }
+
+  return bitmap;
+}
+
+function decodeSymbolDictionary(huffman, refinement, symbols, numberOfNewSymbols, numberOfExportedSymbols, huffmanTables, templateIndex, at, refinementTemplateIndex, refinementAt, decodingContext, huffmanInput) {
+  if (huffman && refinement) {
+    throw new Jbig2Error("symbol refinement with Huffman is not supported");
+  }
+
+  const newSymbols = [];
+  let currentHeight = 0;
+  let symbolCodeLength = (0, _core_utils.log2)(symbols.length + numberOfNewSymbols);
+  const decoder = decodingContext.decoder;
+  const contextCache = decodingContext.contextCache;
+  let tableB1, symbolWidths;
+
+  if (huffman) {
+    tableB1 = getStandardTable(1);
+    symbolWidths = [];
+    symbolCodeLength = Math.max(symbolCodeLength, 1);
+  }
+
+  while (newSymbols.length < numberOfNewSymbols) {
+    const deltaHeight = huffman ? huffmanTables.tableDeltaHeight.decode(huffmanInput) : decodeInteger(contextCache, "IADH", decoder);
+    currentHeight += deltaHeight;
+    let currentWidth = 0,
+        totalWidth = 0;
+    const firstSymbol = huffman ? symbolWidths.length : 0;
+
+    while (true) {
+      const deltaWidth = huffman ? huffmanTables.tableDeltaWidth.decode(huffmanInput) : decodeInteger(contextCache, "IADW", decoder);
+
+      if (deltaWidth === null) {
+        break;
+      }
+
+      currentWidth += deltaWidth;
+      totalWidth += currentWidth;
+      let bitmap;
+
+      if (refinement) {
+        const numberOfInstances = decodeInteger(contextCache, "IAAI", decoder);
+
+        if (numberOfInstances > 1) {
+          bitmap = decodeTextRegion(huffman, refinement, currentWidth, currentHeight, 0, numberOfInstances, 1, symbols.concat(newSymbols), symbolCodeLength, 0, 0, 1, 0, huffmanTables, refinementTemplateIndex, refinementAt, decodingContext, 0, huffmanInput);
+        } else {
+          const symbolId = decodeIAID(contextCache, decoder, symbolCodeLength);
+          const rdx = decodeInteger(contextCache, "IARDX", decoder);
+          const rdy = decodeInteger(contextCache, "IARDY", decoder);
+          const symbol = symbolId < symbols.length ? symbols[symbolId] : newSymbols[symbolId - symbols.length];
+          bitmap = decodeRefinement(currentWidth, currentHeight, refinementTemplateIndex, symbol, rdx, rdy, false, refinementAt, decodingContext);
+        }
+
+        newSymbols.push(bitmap);
+      } else if (huffman) {
+        symbolWidths.push(currentWidth);
+      } else {
+        bitmap = decodeBitmap(false, currentWidth, currentHeight, templateIndex, false, null, at, decodingContext);
+        newSymbols.push(bitmap);
+      }
+    }
+
+    if (huffman && !refinement) {
+      const bitmapSize = huffmanTables.tableBitmapSize.decode(huffmanInput);
+      huffmanInput.byteAlign();
+      let collectiveBitmap;
+
+      if (bitmapSize === 0) {
+        collectiveBitmap = readUncompressedBitmap(huffmanInput, totalWidth, currentHeight);
+      } else {
+        const originalEnd = huffmanInput.end;
+        const bitmapEnd = huffmanInput.position + bitmapSize;
+        huffmanInput.end = bitmapEnd;
+        collectiveBitmap = decodeMMRBitmap(huffmanInput, totalWidth, currentHeight, false);
+        huffmanInput.end = originalEnd;
+        huffmanInput.position = bitmapEnd;
+      }
+
+      const numberOfSymbolsDecoded = symbolWidths.length;
+
+      if (firstSymbol === numberOfSymbolsDecoded - 1) {
+        newSymbols.push(collectiveBitmap);
+      } else {
+        let i,
+            y,
+            xMin = 0,
+            xMax,
+            bitmapWidth,
+            symbolBitmap;
+
+        for (i = firstSymbol; i < numberOfSymbolsDecoded; i++) {
+          bitmapWidth = symbolWidths[i];
+          xMax = xMin + bitmapWidth;
+          symbolBitmap = [];
+
+          for (y = 0; y < currentHeight; y++) {
+            symbolBitmap.push(collectiveBitmap[y].subarray(xMin, xMax));
+          }
+
+          newSymbols.push(symbolBitmap);
+          xMin = xMax;
+        }
+      }
+    }
+  }
+
+  const exportedSymbols = [],
+        flags = [];
+  let currentFlag = false,
+      i,
+      ii;
+  const totalSymbolsLength = symbols.length + numberOfNewSymbols;
+
+  while (flags.length < totalSymbolsLength) {
+    let runLength = huffman ? tableB1.decode(huffmanInput) : decodeInteger(contextCache, "IAEX", decoder);
+
+    while (runLength--) {
+      flags.push(currentFlag);
+    }
+
+    currentFlag = !currentFlag;
+  }
+
+  for (i = 0, ii = symbols.length; i < ii; i++) {
+    if (flags[i]) {
+      exportedSymbols.push(symbols[i]);
+    }
+  }
+
+  for (let j = 0; j < numberOfNewSymbols; i++, j++) {
+    if (flags[i]) {
+      exportedSymbols.push(newSymbols[j]);
+    }
+  }
+
+  return exportedSymbols;
+}
+
+function decodeTextRegion(huffman, refinement, width, height, defaultPixelValue, numberOfSymbolInstances, stripSize, inputSymbols, symbolCodeLength, transposed, dsOffset, referenceCorner, combinationOperator, huffmanTables, refinementTemplateIndex, refinementAt, decodingContext, logStripSize, huffmanInput) {
+  if (huffman && refinement) {
+    throw new Jbig2Error("refinement with Huffman is not supported");
+  }
+
+  const bitmap = [];
+  let i, row;
+
+  for (i = 0; i < height; i++) {
+    row = new Uint8Array(width);
+
+    if (defaultPixelValue) {
+      for (let j = 0; j < width; j++) {
+        row[j] = defaultPixelValue;
+      }
+    }
+
+    bitmap.push(row);
+  }
+
+  const decoder = decodingContext.decoder;
+  const contextCache = decodingContext.contextCache;
+  let stripT = huffman ? -huffmanTables.tableDeltaT.decode(huffmanInput) : -decodeInteger(contextCache, "IADT", decoder);
+  let firstS = 0;
+  i = 0;
+
+  while (i < numberOfSymbolInstances) {
+    const deltaT = huffman ? huffmanTables.tableDeltaT.decode(huffmanInput) : decodeInteger(contextCache, "IADT", decoder);
+    stripT += deltaT;
+    const deltaFirstS = huffman ? huffmanTables.tableFirstS.decode(huffmanInput) : decodeInteger(contextCache, "IAFS", decoder);
+    firstS += deltaFirstS;
+    let currentS = firstS;
+
+    do {
+      let currentT = 0;
+
+      if (stripSize > 1) {
+        currentT = huffman ? huffmanInput.readBits(logStripSize) : decodeInteger(contextCache, "IAIT", decoder);
+      }
+
+      const t = stripSize * stripT + currentT;
+      const symbolId = huffman ? huffmanTables.symbolIDTable.decode(huffmanInput) : decodeIAID(contextCache, decoder, symbolCodeLength);
+      const applyRefinement = refinement && (huffman ? huffmanInput.readBit() : decodeInteger(contextCache, "IARI", decoder));
+      let symbolBitmap = inputSymbols[symbolId];
+      let symbolWidth = symbolBitmap[0].length;
+      let symbolHeight = symbolBitmap.length;
+
+      if (applyRefinement) {
+        const rdw = decodeInteger(contextCache, "IARDW", decoder);
+        const rdh = decodeInteger(contextCache, "IARDH", decoder);
+        const rdx = decodeInteger(contextCache, "IARDX", decoder);
+        const rdy = decodeInteger(contextCache, "IARDY", decoder);
+        symbolWidth += rdw;
+        symbolHeight += rdh;
+        symbolBitmap = decodeRefinement(symbolWidth, symbolHeight, refinementTemplateIndex, symbolBitmap, (rdw >> 1) + rdx, (rdh >> 1) + rdy, false, refinementAt, decodingContext);
+      }
+
+      const offsetT = t - (referenceCorner & 1 ? 0 : symbolHeight - 1);
+      const offsetS = currentS - (referenceCorner & 2 ? symbolWidth - 1 : 0);
+      let s2, t2, symbolRow;
+
+      if (transposed) {
+        for (s2 = 0; s2 < symbolHeight; s2++) {
+          row = bitmap[offsetS + s2];
+
+          if (!row) {
+            continue;
+          }
+
+          symbolRow = symbolBitmap[s2];
+          const maxWidth = Math.min(width - offsetT, symbolWidth);
+
+          switch (combinationOperator) {
+            case 0:
+              for (t2 = 0; t2 < maxWidth; t2++) {
+                row[offsetT + t2] |= symbolRow[t2];
+              }
+
+              break;
+
+            case 2:
+              for (t2 = 0; t2 < maxWidth; t2++) {
+                row[offsetT + t2] ^= symbolRow[t2];
+              }
+
+              break;
+
+            default:
+              throw new Jbig2Error(`operator ${combinationOperator} is not supported`);
+          }
+        }
+
+        currentS += symbolHeight - 1;
+      } else {
+        for (t2 = 0; t2 < symbolHeight; t2++) {
+          row = bitmap[offsetT + t2];
+
+          if (!row) {
+            continue;
+          }
+
+          symbolRow = symbolBitmap[t2];
+
+          switch (combinationOperator) {
+            case 0:
+              for (s2 = 0; s2 < symbolWidth; s2++) {
+                row[offsetS + s2] |= symbolRow[s2];
+              }
+
+              break;
+
+            case 2:
+              for (s2 = 0; s2 < symbolWidth; s2++) {
+                row[offsetS + s2] ^= symbolRow[s2];
+              }
+
+              break;
+
+            default:
+              throw new Jbig2Error(`operator ${combinationOperator} is not supported`);
+          }
+        }
+
+        currentS += symbolWidth - 1;
+      }
+
+      i++;
+      const deltaS = huffman ? huffmanTables.tableDeltaS.decode(huffmanInput) : decodeInteger(contextCache, "IADS", decoder);
+
+      if (deltaS === null) {
+        break;
+      }
+
+      currentS += deltaS + dsOffset;
+    } while (true);
+  }
+
+  return bitmap;
+}
+
+function decodePatternDictionary(mmr, patternWidth, patternHeight, maxPatternIndex, template, decodingContext) {
+  const at = [];
+
+  if (!mmr) {
+    at.push({
+      x: -patternWidth,
+      y: 0
+    });
+
+    if (template === 0) {
+      at.push({
+        x: -3,
+        y: -1
+      }, {
+        x: 2,
+        y: -2
+      }, {
+        x: -2,
+        y: -2
+      });
+    }
+  }
+
+  const collectiveWidth = (maxPatternIndex + 1) * patternWidth;
+  const collectiveBitmap = decodeBitmap(mmr, collectiveWidth, patternHeight, template, false, null, at, decodingContext);
+  const patterns = [];
+
+  for (let i = 0; i <= maxPatternIndex; i++) {
+    const patternBitmap = [];
+    const xMin = patternWidth * i;
+    const xMax = xMin + patternWidth;
+
+    for (let y = 0; y < patternHeight; y++) {
+      patternBitmap.push(collectiveBitmap[y].subarray(xMin, xMax));
+    }
+
+    patterns.push(patternBitmap);
+  }
+
+  return patterns;
+}
+
+function decodeHalftoneRegion(mmr, patterns, template, regionWidth, regionHeight, defaultPixelValue, enableSkip, combinationOperator, gridWidth, gridHeight, gridOffsetX, gridOffsetY, gridVectorX, gridVectorY, decodingContext) {
+  const skip = null;
+
+  if (enableSkip) {
+    throw new Jbig2Error("skip is not supported");
+  }
+
+  if (combinationOperator !== 0) {
+    throw new Jbig2Error(`operator "${combinationOperator}" is not supported in halftone region`);
+  }
+
+  const regionBitmap = [];
+  let i, j, row;
+
+  for (i = 0; i < regionHeight; i++) {
+    row = new Uint8Array(regionWidth);
+
+    if (defaultPixelValue) {
+      for (j = 0; j < regionWidth; j++) {
+        row[j] = defaultPixelValue;
+      }
+    }
+
+    regionBitmap.push(row);
+  }
+
+  const numberOfPatterns = patterns.length;
+  const pattern0 = patterns[0];
+  const patternWidth = pattern0[0].length,
+        patternHeight = pattern0.length;
+  const bitsPerValue = (0, _core_utils.log2)(numberOfPatterns);
+  const at = [];
+
+  if (!mmr) {
+    at.push({
+      x: template <= 1 ? 3 : 2,
+      y: -1
+    });
+
+    if (template === 0) {
+      at.push({
+        x: -3,
+        y: -1
+      }, {
+        x: 2,
+        y: -2
+      }, {
+        x: -2,
+        y: -2
+      });
+    }
+  }
+
+  const grayScaleBitPlanes = [];
+  let mmrInput, bitmap;
+
+  if (mmr) {
+    mmrInput = new Reader(decodingContext.data, decodingContext.start, decodingContext.end);
+  }
+
+  for (i = bitsPerValue - 1; i >= 0; i--) {
+    if (mmr) {
+      bitmap = decodeMMRBitmap(mmrInput, gridWidth, gridHeight, true);
+    } else {
+      bitmap = decodeBitmap(false, gridWidth, gridHeight, template, false, skip, at, decodingContext);
+    }
+
+    grayScaleBitPlanes[i] = bitmap;
+  }
+
+  let mg, ng, bit, patternIndex, patternBitmap, x, y, patternRow, regionRow;
+
+  for (mg = 0; mg < gridHeight; mg++) {
+    for (ng = 0; ng < gridWidth; ng++) {
+      bit = 0;
+      patternIndex = 0;
+
+      for (j = bitsPerValue - 1; j >= 0; j--) {
+        bit ^= grayScaleBitPlanes[j][mg][ng];
+        patternIndex |= bit << j;
+      }
+
+      patternBitmap = patterns[patternIndex];
+      x = gridOffsetX + mg * gridVectorY + ng * gridVectorX >> 8;
+      y = gridOffsetY + mg * gridVectorX - ng * gridVectorY >> 8;
+
+      if (x >= 0 && x + patternWidth <= regionWidth && y >= 0 && y + patternHeight <= regionHeight) {
+        for (i = 0; i < patternHeight; i++) {
+          regionRow = regionBitmap[y + i];
+          patternRow = patternBitmap[i];
+
+          for (j = 0; j < patternWidth; j++) {
+            regionRow[x + j] |= patternRow[j];
+          }
+        }
+      } else {
+        let regionX, regionY;
+
+        for (i = 0; i < patternHeight; i++) {
+          regionY = y + i;
+
+          if (regionY < 0 || regionY >= regionHeight) {
+            continue;
+          }
+
+          regionRow = regionBitmap[regionY];
+          patternRow = patternBitmap[i];
+
+          for (j = 0; j < patternWidth; j++) {
+            regionX = x + j;
+
+            if (regionX >= 0 && regionX < regionWidth) {
+              regionRow[regionX] |= patternRow[j];
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return regionBitmap;
+}
+
+function readSegmentHeader(data, start) {
+  const segmentHeader = {};
+  segmentHeader.number = (0, _core_utils.readUint32)(data, start);
+  const flags = data[start + 4];
+  const segmentType = flags & 0x3f;
+
+  if (!SegmentTypes[segmentType]) {
+    throw new Jbig2Error("invalid segment type: " + segmentType);
+  }
+
+  segmentHeader.type = segmentType;
+  segmentHeader.typeName = SegmentTypes[segmentType];
+  segmentHeader.deferredNonRetain = !!(flags & 0x80);
+  const pageAssociationFieldSize = !!(flags & 0x40);
+  const referredFlags = data[start + 5];
+  let referredToCount = referredFlags >> 5 & 7;
+  const retainBits = [referredFlags & 31];
+  let position = start + 6;
+
+  if (referredFlags === 7) {
+    referredToCount = (0, _core_utils.readUint32)(data, position - 1) & 0x1fffffff;
+    position += 3;
+    let bytes = referredToCount + 7 >> 3;
+    retainBits[0] = data[position++];
+
+    while (--bytes > 0) {
+      retainBits.push(data[position++]);
+    }
+  } else if (referredFlags === 5 || referredFlags === 6) {
+    throw new Jbig2Error("invalid referred-to flags");
+  }
+
+  segmentHeader.retainBits = retainBits;
+  let referredToSegmentNumberSize = 4;
+
+  if (segmentHeader.number <= 256) {
+    referredToSegmentNumberSize = 1;
+  } else if (segmentHeader.number <= 65536) {
+    referredToSegmentNumberSize = 2;
+  }
+
+  const referredTo = [];
+  let i, ii;
+
+  for (i = 0; i < referredToCount; i++) {
+    let number;
+
+    if (referredToSegmentNumberSize === 1) {
+      number = data[position];
+    } else if (referredToSegmentNumberSize === 2) {
+      number = (0, _core_utils.readUint16)(data, position);
+    } else {
+      number = (0, _core_utils.readUint32)(data, position);
+    }
+
+    referredTo.push(number);
+    position += referredToSegmentNumberSize;
+  }
+
+  segmentHeader.referredTo = referredTo;
+
+  if (!pageAssociationFieldSize) {
+    segmentHeader.pageAssociation = data[position++];
+  } else {
+    segmentHeader.pageAssociation = (0, _core_utils.readUint32)(data, position);
+    position += 4;
+  }
+
+  segmentHeader.length = (0, _core_utils.readUint32)(data, position);
+  position += 4;
+
+  if (segmentHeader.length === 0xffffffff) {
+    if (segmentType === 38) {
+      const genericRegionInfo = readRegionSegmentInformation(data, position);
+      const genericRegionSegmentFlags = data[position + RegionSegmentInformationFieldLength];
+      const genericRegionMmr = !!(genericRegionSegmentFlags & 1);
+      const searchPatternLength = 6;
+      const searchPattern = new Uint8Array(searchPatternLength);
+
+      if (!genericRegionMmr) {
+        searchPattern[0] = 0xff;
+        searchPattern[1] = 0xac;
+      }
+
+      searchPattern[2] = genericRegionInfo.height >>> 24 & 0xff;
+      searchPattern[3] = genericRegionInfo.height >> 16 & 0xff;
+      searchPattern[4] = genericRegionInfo.height >> 8 & 0xff;
+      searchPattern[5] = genericRegionInfo.height & 0xff;
+
+      for (i = position, ii = data.length; i < ii; i++) {
+        let j = 0;
+
+        while (j < searchPatternLength && searchPattern[j] === data[i + j]) {
+          j++;
+        }
+
+        if (j === searchPatternLength) {
+          segmentHeader.length = i + searchPatternLength;
+          break;
+        }
+      }
+
+      if (segmentHeader.length === 0xffffffff) {
+        throw new Jbig2Error("segment end was not found");
+      }
+    } else {
+      throw new Jbig2Error("invalid unknown segment length");
+    }
+  }
+
+  segmentHeader.headerEnd = position;
+  return segmentHeader;
+}
+
+function readSegments(header, data, start, end) {
+  const segments = [];
+  let position = start;
+
+  while (position < end) {
+    const segmentHeader = readSegmentHeader(data, position);
+    position = segmentHeader.headerEnd;
+    const segment = {
+      header: segmentHeader,
+      data
+    };
+
+    if (!header.randomAccess) {
+      segment.start = position;
+      position += segmentHeader.length;
+      segment.end = position;
+    }
+
+    segments.push(segment);
+
+    if (segmentHeader.type === 51) {
+      break;
+    }
+  }
+
+  if (header.randomAccess) {
+    for (let i = 0, ii = segments.length; i < ii; i++) {
+      segments[i].start = position;
+      position += segments[i].header.length;
+      segments[i].end = position;
+    }
+  }
+
+  return segments;
+}
+
+function readRegionSegmentInformation(data, start) {
+  return {
+    width: (0, _core_utils.readUint32)(data, start),
+    height: (0, _core_utils.readUint32)(data, start + 4),
+    x: (0, _core_utils.readUint32)(data, start + 8),
+    y: (0, _core_utils.readUint32)(data, start + 12),
+    combinationOperator: data[start + 16] & 7
+  };
+}
+
+const RegionSegmentInformationFieldLength = 17;
+
+function processSegment(segment, visitor) {
+  const header = segment.header;
+  const data = segment.data,
+        end = segment.end;
+  let position = segment.start;
+  let args, at, i, atLength;
+
+  switch (header.type) {
+    case 0:
+      const dictionary = {};
+      const dictionaryFlags = (0, _core_utils.readUint16)(data, position);
+      dictionary.huffman = !!(dictionaryFlags & 1);
+      dictionary.refinement = !!(dictionaryFlags & 2);
+      dictionary.huffmanDHSelector = dictionaryFlags >> 2 & 3;
+      dictionary.huffmanDWSelector = dictionaryFlags >> 4 & 3;
+      dictionary.bitmapSizeSelector = dictionaryFlags >> 6 & 1;
+      dictionary.aggregationInstancesSelector = dictionaryFlags >> 7 & 1;
+      dictionary.bitmapCodingContextUsed = !!(dictionaryFlags & 256);
+      dictionary.bitmapCodingContextRetained = !!(dictionaryFlags & 512);
+      dictionary.template = dictionaryFlags >> 10 & 3;
+      dictionary.refinementTemplate = dictionaryFlags >> 12 & 1;
+      position += 2;
+
+      if (!dictionary.huffman) {
+        atLength = dictionary.template === 0 ? 4 : 1;
+        at = [];
+
+        for (i = 0; i < atLength; i++) {
+          at.push({
+            x: (0, _core_utils.readInt8)(data, position),
+            y: (0, _core_utils.readInt8)(data, position + 1)
+          });
+          position += 2;
+        }
+
+        dictionary.at = at;
+      }
+
+      if (dictionary.refinement && !dictionary.refinementTemplate) {
+        at = [];
+
+        for (i = 0; i < 2; i++) {
+          at.push({
+            x: (0, _core_utils.readInt8)(data, position),
+            y: (0, _core_utils.readInt8)(data, position + 1)
+          });
+          position += 2;
+        }
+
+        dictionary.refinementAt = at;
+      }
+
+      dictionary.numberOfExportedSymbols = (0, _core_utils.readUint32)(data, position);
+      position += 4;
+      dictionary.numberOfNewSymbols = (0, _core_utils.readUint32)(data, position);
+      position += 4;
+      args = [dictionary, header.number, header.referredTo, data, position, end];
+      break;
+
+    case 6:
+    case 7:
+      const textRegion = {};
+      textRegion.info = readRegionSegmentInformation(data, position);
+      position += RegionSegmentInformationFieldLength;
+      const textRegionSegmentFlags = (0, _core_utils.readUint16)(data, position);
+      position += 2;
+      textRegion.huffman = !!(textRegionSegmentFlags & 1);
+      textRegion.refinement = !!(textRegionSegmentFlags & 2);
+      textRegion.logStripSize = textRegionSegmentFlags >> 2 & 3;
+      textRegion.stripSize = 1 << textRegion.logStripSize;
+      textRegion.referenceCorner = textRegionSegmentFlags >> 4 & 3;
+      textRegion.transposed = !!(textRegionSegmentFlags & 64);
+      textRegion.combinationOperator = textRegionSegmentFlags >> 7 & 3;
+      textRegion.defaultPixelValue = textRegionSegmentFlags >> 9 & 1;
+      textRegion.dsOffset = textRegionSegmentFlags << 17 >> 27;
+      textRegion.refinementTemplate = textRegionSegmentFlags >> 15 & 1;
+
+      if (textRegion.huffman) {
+        const textRegionHuffmanFlags = (0, _core_utils.readUint16)(data, position);
+        position += 2;
+        textRegion.huffmanFS = textRegionHuffmanFlags & 3;
+        textRegion.huffmanDS = textRegionHuffmanFlags >> 2 & 3;
+        textRegion.huffmanDT = textRegionHuffmanFlags >> 4 & 3;
+        textRegion.huffmanRefinementDW = textRegionHuffmanFlags >> 6 & 3;
+        textRegion.huffmanRefinementDH = textRegionHuffmanFlags >> 8 & 3;
+        textRegion.huffmanRefinementDX = textRegionHuffmanFlags >> 10 & 3;
+        textRegion.huffmanRefinementDY = textRegionHuffmanFlags >> 12 & 3;
+        textRegion.huffmanRefinementSizeSelector = !!(textRegionHuffmanFlags & 0x4000);
+      }
+
+      if (textRegion.refinement && !textRegion.refinementTemplate) {
+        at = [];
+
+        for (i = 0; i < 2; i++) {
+          at.push({
+            x: (0, _core_utils.readInt8)(data, position),
+            y: (0, _core_utils.readInt8)(data, position + 1)
+          });
+          position += 2;
+        }
+
+        textRegion.refinementAt = at;
+      }
+
+      textRegion.numberOfSymbolInstances = (0, _core_utils.readUint32)(data, position);
+      position += 4;
+      args = [textRegion, header.referredTo, data, position, end];
+      break;
+
+    case 16:
+      const patternDictionary = {};
+      const patternDictionaryFlags = data[position++];
+      patternDictionary.mmr = !!(patternDictionaryFlags & 1);
+      patternDictionary.template = patternDictionaryFlags >> 1 & 3;
+      patternDictionary.patternWidth = data[position++];
+      patternDictionary.patternHeight = data[position++];
+      patternDictionary.maxPatternIndex = (0, _core_utils.readUint32)(data, position);
+      position += 4;
+      args = [patternDictionary, header.number, data, position, end];
+      break;
+
+    case 22:
+    case 23:
+      const halftoneRegion = {};
+      halftoneRegion.info = readRegionSegmentInformation(data, position);
+      position += RegionSegmentInformationFieldLength;
+      const halftoneRegionFlags = data[position++];
+      halftoneRegion.mmr = !!(halftoneRegionFlags & 1);
+      halftoneRegion.template = halftoneRegionFlags >> 1 & 3;
+      halftoneRegion.enableSkip = !!(halftoneRegionFlags & 8);
+      halftoneRegion.combinationOperator = halftoneRegionFlags >> 4 & 7;
+      halftoneRegion.defaultPixelValue = halftoneRegionFlags >> 7 & 1;
+      halftoneRegion.gridWidth = (0, _core_utils.readUint32)(data, position);
+      position += 4;
+      halftoneRegion.gridHeight = (0, _core_utils.readUint32)(data, position);
+      position += 4;
+      halftoneRegion.gridOffsetX = (0, _core_utils.readUint32)(data, position) & 0xffffffff;
+      position += 4;
+      halftoneRegion.gridOffsetY = (0, _core_utils.readUint32)(data, position) & 0xffffffff;
+      position += 4;
+      halftoneRegion.gridVectorX = (0, _core_utils.readUint16)(data, position);
+      position += 2;
+      halftoneRegion.gridVectorY = (0, _core_utils.readUint16)(data, position);
+      position += 2;
+      args = [halftoneRegion, header.referredTo, data, position, end];
+      break;
+
+    case 38:
+    case 39:
+      const genericRegion = {};
+      genericRegion.info = readRegionSegmentInformation(data, position);
+      position += RegionSegmentInformationFieldLength;
+      const genericRegionSegmentFlags = data[position++];
+      genericRegion.mmr = !!(genericRegionSegmentFlags & 1);
+      genericRegion.template = genericRegionSegmentFlags >> 1 & 3;
+      genericRegion.prediction = !!(genericRegionSegmentFlags & 8);
+
+      if (!genericRegion.mmr) {
+        atLength = genericRegion.template === 0 ? 4 : 1;
+        at = [];
+
+        for (i = 0; i < atLength; i++) {
+          at.push({
+            x: (0, _core_utils.readInt8)(data, position),
+            y: (0, _core_utils.readInt8)(data, position + 1)
+          });
+          position += 2;
+        }
+
+        genericRegion.at = at;
+      }
+
+      args = [genericRegion, data, position, end];
+      break;
+
+    case 48:
+      const pageInfo = {
+        width: (0, _core_utils.readUint32)(data, position),
+        height: (0, _core_utils.readUint32)(data, position + 4),
+        resolutionX: (0, _core_utils.readUint32)(data, position + 8),
+        resolutionY: (0, _core_utils.readUint32)(data, position + 12)
+      };
+
+      if (pageInfo.height === 0xffffffff) {
+        delete pageInfo.height;
+      }
+
+      const pageSegmentFlags = data[position + 16];
+      (0, _core_utils.readUint16)(data, position + 17);
+      pageInfo.lossless = !!(pageSegmentFlags & 1);
+      pageInfo.refinement = !!(pageSegmentFlags & 2);
+      pageInfo.defaultPixelValue = pageSegmentFlags >> 2 & 1;
+      pageInfo.combinationOperator = pageSegmentFlags >> 3 & 3;
+      pageInfo.requiresBuffer = !!(pageSegmentFlags & 32);
+      pageInfo.combinationOperatorOverride = !!(pageSegmentFlags & 64);
+      args = [pageInfo];
+      break;
+
+    case 49:
+      break;
+
+    case 50:
+      break;
+
+    case 51:
+      break;
+
+    case 53:
+      args = [header.number, data, position, end];
+      break;
+
+    case 62:
+      break;
+
+    default:
+      throw new Jbig2Error(`segment type ${header.typeName}(${header.type}) is not implemented`);
+  }
+
+  const callbackName = "on" + header.typeName;
+
+  if (callbackName in visitor) {
+    visitor[callbackName].apply(visitor, args);
+  }
+}
+
+function processSegments(segments, visitor) {
+  for (let i = 0, ii = segments.length; i < ii; i++) {
+    processSegment(segments[i], visitor);
+  }
+}
+
+function parseJbig2Chunks(chunks) {
+  const visitor = new SimpleSegmentVisitor();
+
+  for (let i = 0, ii = chunks.length; i < ii; i++) {
+    const chunk = chunks[i];
+    const segments = readSegments({}, chunk.data, chunk.start, chunk.end);
+    processSegments(segments, visitor);
+  }
+
+  return visitor.buffer;
+}
+
+function parseJbig2(data) {
+  throw new Error("Not implemented: parseJbig2");
+}
+
+class SimpleSegmentVisitor {
+  onPageInformation(info) {
+    this.currentPageInfo = info;
+    const rowSize = info.width + 7 >> 3;
+    const buffer = new Uint8ClampedArray(rowSize * info.height);
+
+    if (info.defaultPixelValue) {
+      buffer.fill(0xff);
+    }
+
+    this.buffer = buffer;
+  }
+
+  drawBitmap(regionInfo, bitmap) {
+    const pageInfo = this.currentPageInfo;
+    const width = regionInfo.width,
+          height = regionInfo.height;
+    const rowSize = pageInfo.width + 7 >> 3;
+    const combinationOperator = pageInfo.combinationOperatorOverride ? regionInfo.combinationOperator : pageInfo.combinationOperator;
+    const buffer = this.buffer;
+    const mask0 = 128 >> (regionInfo.x & 7);
+    let offset0 = regionInfo.y * rowSize + (regionInfo.x >> 3);
+    let i, j, mask, offset;
+
+    switch (combinationOperator) {
+      case 0:
+        for (i = 0; i < height; i++) {
+          mask = mask0;
+          offset = offset0;
+
+          for (j = 0; j < width; j++) {
+            if (bitmap[i][j]) {
+              buffer[offset] |= mask;
+            }
+
+            mask >>= 1;
+
+            if (!mask) {
+              mask = 128;
+              offset++;
+            }
+          }
+
+          offset0 += rowSize;
+        }
+
+        break;
+
+      case 2:
+        for (i = 0; i < height; i++) {
+          mask = mask0;
+          offset = offset0;
+
+          for (j = 0; j < width; j++) {
+            if (bitmap[i][j]) {
+              buffer[offset] ^= mask;
+            }
+
+            mask >>= 1;
+
+            if (!mask) {
+              mask = 128;
+              offset++;
+            }
+          }
+
+          offset0 += rowSize;
+        }
+
+        break;
+
+      default:
+        throw new Jbig2Error(`operator ${combinationOperator} is not supported`);
+    }
+  }
+
+  onImmediateGenericRegion(region, data, start, end) {
+    const regionInfo = region.info;
+    const decodingContext = new DecodingContext(data, start, end);
+    const bitmap = decodeBitmap(region.mmr, regionInfo.width, regionInfo.height, region.template, region.prediction, null, region.at, decodingContext);
+    this.drawBitmap(regionInfo, bitmap);
+  }
+
+  onImmediateLosslessGenericRegion() {
+    this.onImmediateGenericRegion(...arguments);
+  }
+
+  onSymbolDictionary(dictionary, currentSegment, referredSegments, data, start, end) {
+    let huffmanTables, huffmanInput;
+
+    if (dictionary.huffman) {
+      huffmanTables = getSymbolDictionaryHuffmanTables(dictionary, referredSegments, this.customTables);
+      huffmanInput = new Reader(data, start, end);
+    }
+
+    let symbols = this.symbols;
+
+    if (!symbols) {
+      this.symbols = symbols = {};
+    }
+
+    const inputSymbols = [];
+
+    for (const referredSegment of referredSegments) {
+      const referredSymbols = symbols[referredSegment];
+
+      if (referredSymbols) {
+        inputSymbols.push(...referredSymbols);
+      }
+    }
+
+    const decodingContext = new DecodingContext(data, start, end);
+    symbols[currentSegment] = decodeSymbolDictionary(dictionary.huffman, dictionary.refinement, inputSymbols, dictionary.numberOfNewSymbols, dictionary.numberOfExportedSymbols, huffmanTables, dictionary.template, dictionary.at, dictionary.refinementTemplate, dictionary.refinementAt, decodingContext, huffmanInput);
+  }
+
+  onImmediateTextRegion(region, referredSegments, data, start, end) {
+    const regionInfo = region.info;
+    let huffmanTables, huffmanInput;
+    const symbols = this.symbols;
+    const inputSymbols = [];
+
+    for (const referredSegment of referredSegments) {
+      const referredSymbols = symbols[referredSegment];
+
+      if (referredSymbols) {
+        inputSymbols.push(...referredSymbols);
+      }
+    }
+
+    const symbolCodeLength = (0, _core_utils.log2)(inputSymbols.length);
+
+    if (region.huffman) {
+      huffmanInput = new Reader(data, start, end);
+      huffmanTables = getTextRegionHuffmanTables(region, referredSegments, this.customTables, inputSymbols.length, huffmanInput);
+    }
+
+    const decodingContext = new DecodingContext(data, start, end);
+    const bitmap = decodeTextRegion(region.huffman, region.refinement, regionInfo.width, regionInfo.height, region.defaultPixelValue, region.numberOfSymbolInstances, region.stripSize, inputSymbols, symbolCodeLength, region.transposed, region.dsOffset, region.referenceCorner, region.combinationOperator, huffmanTables, region.refinementTemplate, region.refinementAt, decodingContext, region.logStripSize, huffmanInput);
+    this.drawBitmap(regionInfo, bitmap);
+  }
+
+  onImmediateLosslessTextRegion() {
+    this.onImmediateTextRegion(...arguments);
+  }
+
+  onPatternDictionary(dictionary, currentSegment, data, start, end) {
+    let patterns = this.patterns;
+
+    if (!patterns) {
+      this.patterns = patterns = {};
+    }
+
+    const decodingContext = new DecodingContext(data, start, end);
+    patterns[currentSegment] = decodePatternDictionary(dictionary.mmr, dictionary.patternWidth, dictionary.patternHeight, dictionary.maxPatternIndex, dictionary.template, decodingContext);
+  }
+
+  onImmediateHalftoneRegion(region, referredSegments, data, start, end) {
+    const patterns = this.patterns[referredSegments[0]];
+    const regionInfo = region.info;
+    const decodingContext = new DecodingContext(data, start, end);
+    const bitmap = decodeHalftoneRegion(region.mmr, patterns, region.template, regionInfo.width, regionInfo.height, region.defaultPixelValue, region.enableSkip, region.combinationOperator, region.gridWidth, region.gridHeight, region.gridOffsetX, region.gridOffsetY, region.gridVectorX, region.gridVectorY, decodingContext);
+    this.drawBitmap(regionInfo, bitmap);
+  }
+
+  onImmediateLosslessHalftoneRegion() {
+    this.onImmediateHalftoneRegion(...arguments);
+  }
+
+  onTables(currentSegment, data, start, end) {
+    let customTables = this.customTables;
+
+    if (!customTables) {
+      this.customTables = customTables = {};
+    }
+
+    customTables[currentSegment] = decodeTablesSegment(data, start, end);
+  }
+
+}
+
+class HuffmanLine {
+  constructor(lineData) {
+    if (lineData.length === 2) {
+      this.isOOB = true;
+      this.rangeLow = 0;
+      this.prefixLength = lineData[0];
+      this.rangeLength = 0;
+      this.prefixCode = lineData[1];
+      this.isLowerRange = false;
+    } else {
+      this.isOOB = false;
+      this.rangeLow = lineData[0];
+      this.prefixLength = lineData[1];
+      this.rangeLength = lineData[2];
+      this.prefixCode = lineData[3];
+      this.isLowerRange = lineData[4] === "lower";
+    }
+  }
+
+}
+
+class HuffmanTreeNode {
+  constructor(line) {
+    this.children = [];
+
+    if (line) {
+      this.isLeaf = true;
+      this.rangeLength = line.rangeLength;
+      this.rangeLow = line.rangeLow;
+      this.isLowerRange = line.isLowerRange;
+      this.isOOB = line.isOOB;
+    } else {
+      this.isLeaf = false;
+    }
+  }
+
+  buildTree(line, shift) {
+    const bit = line.prefixCode >> shift & 1;
+
+    if (shift <= 0) {
+      this.children[bit] = new HuffmanTreeNode(line);
+    } else {
+      let node = this.children[bit];
+
+      if (!node) {
+        this.children[bit] = node = new HuffmanTreeNode(null);
+      }
+
+      node.buildTree(line, shift - 1);
+    }
+  }
+
+  decodeNode(reader) {
+    if (this.isLeaf) {
+      if (this.isOOB) {
+        return null;
+      }
+
+      const htOffset = reader.readBits(this.rangeLength);
+      return this.rangeLow + (this.isLowerRange ? -htOffset : htOffset);
+    }
+
+    const node = this.children[reader.readBit()];
+
+    if (!node) {
+      throw new Jbig2Error("invalid Huffman data");
+    }
+
+    return node.decodeNode(reader);
+  }
+
+}
+
+class HuffmanTable {
+  constructor(lines, prefixCodesDone) {
+    if (!prefixCodesDone) {
+      this.assignPrefixCodes(lines);
+    }
+
+    this.rootNode = new HuffmanTreeNode(null);
+
+    for (let i = 0, ii = lines.length; i < ii; i++) {
+      const line = lines[i];
+
+      if (line.prefixLength > 0) {
+        this.rootNode.buildTree(line, line.prefixLength - 1);
+      }
+    }
+  }
+
+  decode(reader) {
+    return this.rootNode.decodeNode(reader);
+  }
+
+  assignPrefixCodes(lines) {
+    const linesLength = lines.length;
+    let prefixLengthMax = 0;
+
+    for (let i = 0; i < linesLength; i++) {
+      prefixLengthMax = Math.max(prefixLengthMax, lines[i].prefixLength);
+    }
+
+    const histogram = new Uint32Array(prefixLengthMax + 1);
+
+    for (let i = 0; i < linesLength; i++) {
+      histogram[lines[i].prefixLength]++;
+    }
+
+    let currentLength = 1,
+        firstCode = 0,
+        currentCode,
+        currentTemp,
+        line;
+    histogram[0] = 0;
+
+    while (currentLength <= prefixLengthMax) {
+      firstCode = firstCode + histogram[currentLength - 1] << 1;
+      currentCode = firstCode;
+      currentTemp = 0;
+
+      while (currentTemp < linesLength) {
+        line = lines[currentTemp];
+
+        if (line.prefixLength === currentLength) {
+          line.prefixCode = currentCode;
+          currentCode++;
+        }
+
+        currentTemp++;
+      }
+
+      currentLength++;
+    }
+  }
+
+}
+
+function decodeTablesSegment(data, start, end) {
+  const flags = data[start];
+  const lowestValue = (0, _core_utils.readUint32)(data, start + 1) & 0xffffffff;
+  const highestValue = (0, _core_utils.readUint32)(data, start + 5) & 0xffffffff;
+  const reader = new Reader(data, start + 9, end);
+  const prefixSizeBits = (flags >> 1 & 7) + 1;
+  const rangeSizeBits = (flags >> 4 & 7) + 1;
+  const lines = [];
+  let prefixLength,
+      rangeLength,
+      currentRangeLow = lowestValue;
+
+  do {
+    prefixLength = reader.readBits(prefixSizeBits);
+    rangeLength = reader.readBits(rangeSizeBits);
+    lines.push(new HuffmanLine([currentRangeLow, prefixLength, rangeLength, 0]));
+    currentRangeLow += 1 << rangeLength;
+  } while (currentRangeLow < highestValue);
+
+  prefixLength = reader.readBits(prefixSizeBits);
+  lines.push(new HuffmanLine([lowestValue - 1, prefixLength, 32, 0, "lower"]));
+  prefixLength = reader.readBits(prefixSizeBits);
+  lines.push(new HuffmanLine([highestValue, prefixLength, 32, 0]));
+
+  if (flags & 1) {
+    prefixLength = reader.readBits(prefixSizeBits);
+    lines.push(new HuffmanLine([prefixLength, 0]));
+  }
+
+  return new HuffmanTable(lines, false);
+}
+
+const standardTablesCache = {};
+
+function getStandardTable(number) {
+  let table = standardTablesCache[number];
+
+  if (table) {
+    return table;
+  }
+
+  let lines;
+
+  switch (number) {
+    case 1:
+      lines = [[0, 1, 4, 0x0], [16, 2, 8, 0x2], [272, 3, 16, 0x6], [65808, 3, 32, 0x7]];
+      break;
+
+    case 2:
+      lines = [[0, 1, 0, 0x0], [1, 2, 0, 0x2], [2, 3, 0, 0x6], [3, 4, 3, 0xe], [11, 5, 6, 0x1e], [75, 6, 32, 0x3e], [6, 0x3f]];
+      break;
+
+    case 3:
+      lines = [[-256, 8, 8, 0xfe], [0, 1, 0, 0x0], [1, 2, 0, 0x2], [2, 3, 0, 0x6], [3, 4, 3, 0xe], [11, 5, 6, 0x1e], [-257, 8, 32, 0xff, "lower"], [75, 7, 32, 0x7e], [6, 0x3e]];
+      break;
+
+    case 4:
+      lines = [[1, 1, 0, 0x0], [2, 2, 0, 0x2], [3, 3, 0, 0x6], [4, 4, 3, 0xe], [12, 5, 6, 0x1e], [76, 5, 32, 0x1f]];
+      break;
+
+    case 5:
+      lines = [[-255, 7, 8, 0x7e], [1, 1, 0, 0x0], [2, 2, 0, 0x2], [3, 3, 0, 0x6], [4, 4, 3, 0xe], [12, 5, 6, 0x1e], [-256, 7, 32, 0x7f, "lower"], [76, 6, 32, 0x3e]];
+      break;
+
+    case 6:
+      lines = [[-2048, 5, 10, 0x1c], [-1024, 4, 9, 0x8], [-512, 4, 8, 0x9], [-256, 4, 7, 0xa], [-128, 5, 6, 0x1d], [-64, 5, 5, 0x1e], [-32, 4, 5, 0xb], [0, 2, 7, 0x0], [128, 3, 7, 0x2], [256, 3, 8, 0x3], [512, 4, 9, 0xc], [1024, 4, 10, 0xd], [-2049, 6, 32, 0x3e, "lower"], [2048, 6, 32, 0x3f]];
+      break;
+
+    case 7:
+      lines = [[-1024, 4, 9, 0x8], [-512, 3, 8, 0x0], [-256, 4, 7, 0x9], [-128, 5, 6, 0x1a], [-64, 5, 5, 0x1b], [-32, 4, 5, 0xa], [0, 4, 5, 0xb], [32, 5, 5, 0x1c], [64, 5, 6, 0x1d], [128, 4, 7, 0xc], [256, 3, 8, 0x1], [512, 3, 9, 0x2], [1024, 3, 10, 0x3], [-1025, 5, 32, 0x1e, "lower"], [2048, 5, 32, 0x1f]];
+      break;
+
+    case 8:
+      lines = [[-15, 8, 3, 0xfc], [-7, 9, 1, 0x1fc], [-5, 8, 1, 0xfd], [-3, 9, 0, 0x1fd], [-2, 7, 0, 0x7c], [-1, 4, 0, 0xa], [0, 2, 1, 0x0], [2, 5, 0, 0x1a], [3, 6, 0, 0x3a], [4, 3, 4, 0x4], [20, 6, 1, 0x3b], [22, 4, 4, 0xb], [38, 4, 5, 0xc], [70, 5, 6, 0x1b], [134, 5, 7, 0x1c], [262, 6, 7, 0x3c], [390, 7, 8, 0x7d], [646, 6, 10, 0x3d], [-16, 9, 32, 0x1fe, "lower"], [1670, 9, 32, 0x1ff], [2, 0x1]];
+      break;
+
+    case 9:
+      lines = [[-31, 8, 4, 0xfc], [-15, 9, 2, 0x1fc], [-11, 8, 2, 0xfd], [-7, 9, 1, 0x1fd], [-5, 7, 1, 0x7c], [-3, 4, 1, 0xa], [-1, 3, 1, 0x2], [1, 3, 1, 0x3], [3, 5, 1, 0x1a], [5, 6, 1, 0x3a], [7, 3, 5, 0x4], [39, 6, 2, 0x3b], [43, 4, 5, 0xb], [75, 4, 6, 0xc], [139, 5, 7, 0x1b], [267, 5, 8, 0x1c], [523, 6, 8, 0x3c], [779, 7, 9, 0x7d], [1291, 6, 11, 0x3d], [-32, 9, 32, 0x1fe, "lower"], [3339, 9, 32, 0x1ff], [2, 0x0]];
+      break;
+
+    case 10:
+      lines = [[-21, 7, 4, 0x7a], [-5, 8, 0, 0xfc], [-4, 7, 0, 0x7b], [-3, 5, 0, 0x18], [-2, 2, 2, 0x0], [2, 5, 0, 0x19], [3, 6, 0, 0x36], [4, 7, 0, 0x7c], [5, 8, 0, 0xfd], [6, 2, 6, 0x1], [70, 5, 5, 0x1a], [102, 6, 5, 0x37], [134, 6, 6, 0x38], [198, 6, 7, 0x39], [326, 6, 8, 0x3a], [582, 6, 9, 0x3b], [1094, 6, 10, 0x3c], [2118, 7, 11, 0x7d], [-22, 8, 32, 0xfe, "lower"], [4166, 8, 32, 0xff], [2, 0x2]];
+      break;
+
+    case 11:
+      lines = [[1, 1, 0, 0x0], [2, 2, 1, 0x2], [4, 4, 0, 0xc], [5, 4, 1, 0xd], [7, 5, 1, 0x1c], [9, 5, 2, 0x1d], [13, 6, 2, 0x3c], [17, 7, 2, 0x7a], [21, 7, 3, 0x7b], [29, 7, 4, 0x7c], [45, 7, 5, 0x7d], [77, 7, 6, 0x7e], [141, 7, 32, 0x7f]];
+      break;
+
+    case 12:
+      lines = [[1, 1, 0, 0x0], [2, 2, 0, 0x2], [3, 3, 1, 0x6], [5, 5, 0, 0x1c], [6, 5, 1, 0x1d], [8, 6, 1, 0x3c], [10, 7, 0, 0x7a], [11, 7, 1, 0x7b], [13, 7, 2, 0x7c], [17, 7, 3, 0x7d], [25, 7, 4, 0x7e], [41, 8, 5, 0xfe], [73, 8, 32, 0xff]];
+      break;
+
+    case 13:
+      lines = [[1, 1, 0, 0x0], [2, 3, 0, 0x4], [3, 4, 0, 0xc], [4, 5, 0, 0x1c], [5, 4, 1, 0xd], [7, 3, 3, 0x5], [15, 6, 1, 0x3a], [17, 6, 2, 0x3b], [21, 6, 3, 0x3c], [29, 6, 4, 0x3d], [45, 6, 5, 0x3e], [77, 7, 6, 0x7e], [141, 7, 32, 0x7f]];
+      break;
+
+    case 14:
+      lines = [[-2, 3, 0, 0x4], [-1, 3, 0, 0x5], [0, 1, 0, 0x0], [1, 3, 0, 0x6], [2, 3, 0, 0x7]];
+      break;
+
+    case 15:
+      lines = [[-24, 7, 4, 0x7c], [-8, 6, 2, 0x3c], [-4, 5, 1, 0x1c], [-2, 4, 0, 0xc], [-1, 3, 0, 0x4], [0, 1, 0, 0x0], [1, 3, 0, 0x5], [2, 4, 0, 0xd], [3, 5, 1, 0x1d], [5, 6, 2, 0x3d], [9, 7, 4, 0x7d], [-25, 7, 32, 0x7e, "lower"], [25, 7, 32, 0x7f]];
+      break;
+
+    default:
+      throw new Jbig2Error(`standard table B.${number} does not exist`);
+  }
+
+  for (let i = 0, ii = lines.length; i < ii; i++) {
+    lines[i] = new HuffmanLine(lines[i]);
+  }
+
+  table = new HuffmanTable(lines, true);
+  standardTablesCache[number] = table;
+  return table;
+}
+
+class Reader {
+  constructor(data, start, end) {
+    this.data = data;
+    this.start = start;
+    this.end = end;
+    this.position = start;
+    this.shift = -1;
+    this.currentByte = 0;
+  }
+
+  readBit() {
+    if (this.shift < 0) {
+      if (this.position >= this.end) {
+        throw new Jbig2Error("end of data while reading bit");
+      }
+
+      this.currentByte = this.data[this.position++];
+      this.shift = 7;
+    }
+
+    const bit = this.currentByte >> this.shift & 1;
+    this.shift--;
+    return bit;
+  }
+
+  readBits(numBits) {
+    let result = 0,
+        i;
+
+    for (i = numBits - 1; i >= 0; i--) {
+      result |= this.readBit() << i;
+    }
+
+    return result;
+  }
+
+  byteAlign() {
+    this.shift = -1;
+  }
+
+  next() {
+    if (this.position >= this.end) {
+      return -1;
+    }
+
+    return this.data[this.position++];
+  }
+
+}
+
+function getCustomHuffmanTable(index, referredTo, customTables) {
+  let currentIndex = 0;
+
+  for (let i = 0, ii = referredTo.length; i < ii; i++) {
+    const table = customTables[referredTo[i]];
+
+    if (table) {
+      if (index === currentIndex) {
+        return table;
+      }
+
+      currentIndex++;
+    }
+  }
+
+  throw new Jbig2Error("can't find custom Huffman table");
+}
+
+function getTextRegionHuffmanTables(textRegion, referredTo, customTables, numberOfSymbols, reader) {
+  const codes = [];
+
+  for (let i = 0; i <= 34; i++) {
+    const codeLength = reader.readBits(4);
+    codes.push(new HuffmanLine([i, codeLength, 0, 0]));
+  }
+
+  const runCodesTable = new HuffmanTable(codes, false);
+  codes.length = 0;
+
+  for (let i = 0; i < numberOfSymbols;) {
+    const codeLength = runCodesTable.decode(reader);
+
+    if (codeLength >= 32) {
+      let repeatedLength, numberOfRepeats, j;
+
+      switch (codeLength) {
+        case 32:
+          if (i === 0) {
+            throw new Jbig2Error("no previous value in symbol ID table");
+          }
+
+          numberOfRepeats = reader.readBits(2) + 3;
+          repeatedLength = codes[i - 1].prefixLength;
+          break;
+
+        case 33:
+          numberOfRepeats = reader.readBits(3) + 3;
+          repeatedLength = 0;
+          break;
+
+        case 34:
+          numberOfRepeats = reader.readBits(7) + 11;
+          repeatedLength = 0;
+          break;
+
+        default:
+          throw new Jbig2Error("invalid code length in symbol ID table");
+      }
+
+      for (j = 0; j < numberOfRepeats; j++) {
+        codes.push(new HuffmanLine([i, repeatedLength, 0, 0]));
+        i++;
+      }
+    } else {
+      codes.push(new HuffmanLine([i, codeLength, 0, 0]));
+      i++;
+    }
+  }
+
+  reader.byteAlign();
+  const symbolIDTable = new HuffmanTable(codes, false);
+  let customIndex = 0,
+      tableFirstS,
+      tableDeltaS,
+      tableDeltaT;
+
+  switch (textRegion.huffmanFS) {
+    case 0:
+    case 1:
+      tableFirstS = getStandardTable(textRegion.huffmanFS + 6);
+      break;
+
+    case 3:
+      tableFirstS = getCustomHuffmanTable(customIndex, referredTo, customTables);
+      customIndex++;
+      break;
+
+    default:
+      throw new Jbig2Error("invalid Huffman FS selector");
+  }
+
+  switch (textRegion.huffmanDS) {
+    case 0:
+    case 1:
+    case 2:
+      tableDeltaS = getStandardTable(textRegion.huffmanDS + 8);
+      break;
+
+    case 3:
+      tableDeltaS = getCustomHuffmanTable(customIndex, referredTo, customTables);
+      customIndex++;
+      break;
+
+    default:
+      throw new Jbig2Error("invalid Huffman DS selector");
+  }
+
+  switch (textRegion.huffmanDT) {
+    case 0:
+    case 1:
+    case 2:
+      tableDeltaT = getStandardTable(textRegion.huffmanDT + 11);
+      break;
+
+    case 3:
+      tableDeltaT = getCustomHuffmanTable(customIndex, referredTo, customTables);
+      customIndex++;
+      break;
+
+    default:
+      throw new Jbig2Error("invalid Huffman DT selector");
+  }
+
+  if (textRegion.refinement) {
+    throw new Jbig2Error("refinement with Huffman is not supported");
+  }
+
+  return {
+    symbolIDTable,
+    tableFirstS,
+    tableDeltaS,
+    tableDeltaT
+  };
+}
+
+function getSymbolDictionaryHuffmanTables(dictionary, referredTo, customTables) {
+  let customIndex = 0,
+      tableDeltaHeight,
+      tableDeltaWidth;
+
+  switch (dictionary.huffmanDHSelector) {
+    case 0:
+    case 1:
+      tableDeltaHeight = getStandardTable(dictionary.huffmanDHSelector + 4);
+      break;
+
+    case 3:
+      tableDeltaHeight = getCustomHuffmanTable(customIndex, referredTo, customTables);
+      customIndex++;
+      break;
+
+    default:
+      throw new Jbig2Error("invalid Huffman DH selector");
+  }
+
+  switch (dictionary.huffmanDWSelector) {
+    case 0:
+    case 1:
+      tableDeltaWidth = getStandardTable(dictionary.huffmanDWSelector + 2);
+      break;
+
+    case 3:
+      tableDeltaWidth = getCustomHuffmanTable(customIndex, referredTo, customTables);
+      customIndex++;
+      break;
+
+    default:
+      throw new Jbig2Error("invalid Huffman DW selector");
+  }
+
+  let tableBitmapSize, tableAggregateInstances;
+
+  if (dictionary.bitmapSizeSelector) {
+    tableBitmapSize = getCustomHuffmanTable(customIndex, referredTo, customTables);
+    customIndex++;
+  } else {
+    tableBitmapSize = getStandardTable(1);
+  }
+
+  if (dictionary.aggregationInstancesSelector) {
+    tableAggregateInstances = getCustomHuffmanTable(customIndex, referredTo, customTables);
+  } else {
+    tableAggregateInstances = getStandardTable(1);
+  }
+
+  return {
+    tableDeltaHeight,
+    tableDeltaWidth,
+    tableBitmapSize,
+    tableAggregateInstances
+  };
+}
+
+function readUncompressedBitmap(reader, width, height) {
+  const bitmap = [];
+
+  for (let y = 0; y < height; y++) {
+    const row = new Uint8Array(width);
+    bitmap.push(row);
+
+    for (let x = 0; x < width; x++) {
+      row[x] = reader.readBit();
+    }
+
+    reader.byteAlign();
+  }
+
+  return bitmap;
+}
+
+function decodeMMRBitmap(input, width, height, endOfBlock) {
+  const params = {
+    K: -1,
+    Columns: width,
+    Rows: height,
+    BlackIs1: true,
+    EndOfBlock: endOfBlock
+  };
+  const decoder = new _ccitt.CCITTFaxDecoder(input, params);
+  const bitmap = [];
+  let currentByte,
+      eof = false;
+
+  for (let y = 0; y < height; y++) {
+    const row = new Uint8Array(width);
+    bitmap.push(row);
+    let shift = -1;
+
+    for (let x = 0; x < width; x++) {
+      if (shift < 0) {
+        currentByte = decoder.readNextChar();
+
+        if (currentByte === -1) {
+          currentByte = 0;
+          eof = true;
+        }
+
+        shift = 7;
+      }
+
+      row[x] = currentByte >> shift & 1;
+      shift--;
+    }
+  }
+
+  if (endOfBlock && !eof) {
+    const lookForEOFLimit = 5;
+
+    for (let i = 0; i < lookForEOFLimit; i++) {
+      if (decoder.readNextChar() === -1) {
+        break;
+      }
+    }
+  }
+
+  return bitmap;
+}
+
+class Jbig2Image {
+  parseChunks(chunks) {
+    return parseJbig2Chunks(chunks);
+  }
+
+  parse(data) {
+    throw new Error("Not implemented: Jbig2Image.parse");
+  }
+
+}
+
+exports.Jbig2Image = Jbig2Image;
+
+/***/ }),
+/* 26 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.ArithmeticDecoder = void 0;
+const QeTable = [{
+  qe: 0x5601,
+  nmps: 1,
+  nlps: 1,
+  switchFlag: 1
+}, {
+  qe: 0x3401,
+  nmps: 2,
+  nlps: 6,
+  switchFlag: 0
+}, {
+  qe: 0x1801,
+  nmps: 3,
+  nlps: 9,
+  switchFlag: 0
+}, {
+  qe: 0x0ac1,
+  nmps: 4,
+  nlps: 12,
+  switchFlag: 0
+}, {
+  qe: 0x0521,
+  nmps: 5,
+  nlps: 29,
+  switchFlag: 0
+}, {
+  qe: 0x0221,
+  nmps: 38,
+  nlps: 33,
+  switchFlag: 0
+}, {
+  qe: 0x5601,
+  nmps: 7,
+  nlps: 6,
+  switchFlag: 1
+}, {
+  qe: 0x5401,
+  nmps: 8,
+  nlps: 14,
+  switchFlag: 0
+}, {
+  qe: 0x4801,
+  nmps: 9,
+  nlps: 14,
+  switchFlag: 0
+}, {
+  qe: 0x3801,
+  nmps: 10,
+  nlps: 14,
+  switchFlag: 0
+}, {
+  qe: 0x3001,
+  nmps: 11,
+  nlps: 17,
+  switchFlag: 0
+}, {
+  qe: 0x2401,
+  nmps: 12,
+  nlps: 18,
+  switchFlag: 0
+}, {
+  qe: 0x1c01,
+  nmps: 13,
+  nlps: 20,
+  switchFlag: 0
+}, {
+  qe: 0x1601,
+  nmps: 29,
+  nlps: 21,
+  switchFlag: 0
+}, {
+  qe: 0x5601,
+  nmps: 15,
+  nlps: 14,
+  switchFlag: 1
+}, {
+  qe: 0x5401,
+  nmps: 16,
+  nlps: 14,
+  switchFlag: 0
+}, {
+  qe: 0x5101,
+  nmps: 17,
+  nlps: 15,
+  switchFlag: 0
+}, {
+  qe: 0x4801,
+  nmps: 18,
+  nlps: 16,
+  switchFlag: 0
+}, {
+  qe: 0x3801,
+  nmps: 19,
+  nlps: 17,
+  switchFlag: 0
+}, {
+  qe: 0x3401,
+  nmps: 20,
+  nlps: 18,
+  switchFlag: 0
+}, {
+  qe: 0x3001,
+  nmps: 21,
+  nlps: 19,
+  switchFlag: 0
+}, {
+  qe: 0x2801,
+  nmps: 22,
+  nlps: 19,
+  switchFlag: 0
+}, {
+  qe: 0x2401,
+  nmps: 23,
+  nlps: 20,
+  switchFlag: 0
+}, {
+  qe: 0x2201,
+  nmps: 24,
+  nlps: 21,
+  switchFlag: 0
+}, {
+  qe: 0x1c01,
+  nmps: 25,
+  nlps: 22,
+  switchFlag: 0
+}, {
+  qe: 0x1801,
+  nmps: 26,
+  nlps: 23,
+  switchFlag: 0
+}, {
+  qe: 0x1601,
+  nmps: 27,
+  nlps: 24,
+  switchFlag: 0
+}, {
+  qe: 0x1401,
+  nmps: 28,
+  nlps: 25,
+  switchFlag: 0
+}, {
+  qe: 0x1201,
+  nmps: 29,
+  nlps: 26,
+  switchFlag: 0
+}, {
+  qe: 0x1101,
+  nmps: 30,
+  nlps: 27,
+  switchFlag: 0
+}, {
+  qe: 0x0ac1,
+  nmps: 31,
+  nlps: 28,
+  switchFlag: 0
+}, {
+  qe: 0x09c1,
+  nmps: 32,
+  nlps: 29,
+  switchFlag: 0
+}, {
+  qe: 0x08a1,
+  nmps: 33,
+  nlps: 30,
+  switchFlag: 0
+}, {
+  qe: 0x0521,
+  nmps: 34,
+  nlps: 31,
+  switchFlag: 0
+}, {
+  qe: 0x0441,
+  nmps: 35,
+  nlps: 32,
+  switchFlag: 0
+}, {
+  qe: 0x02a1,
+  nmps: 36,
+  nlps: 33,
+  switchFlag: 0
+}, {
+  qe: 0x0221,
+  nmps: 37,
+  nlps: 34,
+  switchFlag: 0
+}, {
+  qe: 0x0141,
+  nmps: 38,
+  nlps: 35,
+  switchFlag: 0
+}, {
+  qe: 0x0111,
+  nmps: 39,
+  nlps: 36,
+  switchFlag: 0
+}, {
+  qe: 0x0085,
+  nmps: 40,
+  nlps: 37,
+  switchFlag: 0
+}, {
+  qe: 0x0049,
+  nmps: 41,
+  nlps: 38,
+  switchFlag: 0
+}, {
+  qe: 0x0025,
+  nmps: 42,
+  nlps: 39,
+  switchFlag: 0
+}, {
+  qe: 0x0015,
+  nmps: 43,
+  nlps: 40,
+  switchFlag: 0
+}, {
+  qe: 0x0009,
+  nmps: 44,
+  nlps: 41,
+  switchFlag: 0
+}, {
+  qe: 0x0005,
+  nmps: 45,
+  nlps: 42,
+  switchFlag: 0
+}, {
+  qe: 0x0001,
+  nmps: 45,
+  nlps: 43,
+  switchFlag: 0
+}, {
+  qe: 0x5601,
+  nmps: 46,
+  nlps: 46,
+  switchFlag: 0
+}];
+
+class ArithmeticDecoder {
+  constructor(data, start, end) {
+    this.data = data;
+    this.bp = start;
+    this.dataEnd = end;
+    this.chigh = data[start];
+    this.clow = 0;
+    this.byteIn();
+    this.chigh = this.chigh << 7 & 0xffff | this.clow >> 9 & 0x7f;
+    this.clow = this.clow << 7 & 0xffff;
+    this.ct -= 7;
+    this.a = 0x8000;
+  }
+
+  byteIn() {
+    const data = this.data;
+    let bp = this.bp;
+
+    if (data[bp] === 0xff) {
+      if (data[bp + 1] > 0x8f) {
+        this.clow += 0xff00;
+        this.ct = 8;
+      } else {
+        bp++;
+        this.clow += data[bp] << 9;
+        this.ct = 7;
+        this.bp = bp;
+      }
+    } else {
+      bp++;
+      this.clow += bp < this.dataEnd ? data[bp] << 8 : 0xff00;
+      this.ct = 8;
+      this.bp = bp;
+    }
+
+    if (this.clow > 0xffff) {
+      this.chigh += this.clow >> 16;
+      this.clow &= 0xffff;
+    }
+  }
+
+  readBit(contexts, pos) {
+    let cx_index = contexts[pos] >> 1,
+        cx_mps = contexts[pos] & 1;
+    const qeTableIcx = QeTable[cx_index];
+    const qeIcx = qeTableIcx.qe;
+    let d;
+    let a = this.a - qeIcx;
+
+    if (this.chigh < qeIcx) {
+      if (a < qeIcx) {
+        a = qeIcx;
+        d = cx_mps;
+        cx_index = qeTableIcx.nmps;
+      } else {
+        a = qeIcx;
+        d = 1 ^ cx_mps;
+
+        if (qeTableIcx.switchFlag === 1) {
+          cx_mps = d;
+        }
+
+        cx_index = qeTableIcx.nlps;
+      }
+    } else {
+      this.chigh -= qeIcx;
+
+      if ((a & 0x8000) !== 0) {
+        this.a = a;
+        return cx_mps;
+      }
+
+      if (a < qeIcx) {
+        d = 1 ^ cx_mps;
+
+        if (qeTableIcx.switchFlag === 1) {
+          cx_mps = d;
+        }
+
+        cx_index = qeTableIcx.nlps;
+      } else {
+        d = cx_mps;
+        cx_index = qeTableIcx.nmps;
+      }
+    }
+
+    do {
+      if (this.ct === 0) {
+        this.byteIn();
+      }
+
+      a <<= 1;
+      this.chigh = this.chigh << 1 & 0xffff | this.clow >> 15 & 1;
+      this.clow = this.clow << 1 & 0xffff;
+      this.ct--;
+    } while ((a & 0x8000) === 0);
+
+    this.a = a;
+    contexts[pos] = cx_index << 1 | cx_mps;
+    return d;
+  }
+
+}
+
+exports.ArithmeticDecoder = ArithmeticDecoder;
+
+/***/ }),
+/* 27 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.JpegStream = void 0;
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _jpg = __w_pdfjs_require__(28);
+
+var _util = __w_pdfjs_require__(2);
+
+class JpegStream extends _decode_stream.DecodeStream {
+  constructor(stream, maybeLength, params) {
+    let ch;
+
+    while ((ch = stream.getByte()) !== -1) {
+      if (ch === 0xff) {
+        stream.skip(-1);
+        break;
+      }
+    }
+
+    super(maybeLength);
+    this.stream = stream;
+    this.dict = stream.dict;
+    this.maybeLength = maybeLength;
+    this.params = params;
+  }
+
+  get bytes() {
+    return (0, _util.shadow)(this, "bytes", this.stream.getBytes(this.maybeLength));
+  }
+
+  ensureBuffer(requested) {}
+
+  readBlock() {
+    if (this.eof) {
+      return;
+    }
+
+    const jpegOptions = {
+      decodeTransform: undefined,
+      colorTransform: undefined
+    };
+    const decodeArr = this.dict.getArray("D", "Decode");
+
+    if (this.forceRGB && Array.isArray(decodeArr)) {
+      const bitsPerComponent = this.dict.get("BPC", "BitsPerComponent") || 8;
+      const decodeArrLength = decodeArr.length;
+      const transform = new Int32Array(decodeArrLength);
+      let transformNeeded = false;
+      const maxValue = (1 << bitsPerComponent) - 1;
+
+      for (let i = 0; i < decodeArrLength; i += 2) {
+        transform[i] = (decodeArr[i + 1] - decodeArr[i]) * 256 | 0;
+        transform[i + 1] = decodeArr[i] * maxValue | 0;
+
+        if (transform[i] !== 256 || transform[i + 1] !== 0) {
+          transformNeeded = true;
+        }
+      }
+
+      if (transformNeeded) {
+        jpegOptions.decodeTransform = transform;
+      }
+    }
+
+    if (this.params instanceof _primitives.Dict) {
+      const colorTransform = this.params.get("ColorTransform");
+
+      if (Number.isInteger(colorTransform)) {
+        jpegOptions.colorTransform = colorTransform;
+      }
+    }
+
+    const jpegImage = new _jpg.JpegImage(jpegOptions);
+    jpegImage.parse(this.bytes);
+    const data = jpegImage.getData({
+      width: this.drawWidth,
+      height: this.drawHeight,
+      forceRGB: this.forceRGB,
+      isSourcePDF: true
+    });
+    this.buffer = data;
+    this.bufferLength = data.length;
+    this.eof = true;
+  }
+
+}
+
+exports.JpegStream = JpegStream;
+
+/***/ }),
+/* 28 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.JpegImage = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+class JpegError extends _util.BaseException {
+  constructor(msg) {
+    super(`JPEG error: ${msg}`, "JpegError");
+  }
+
+}
+
+class DNLMarkerError extends _util.BaseException {
+  constructor(message, scanLines) {
+    super(message, "DNLMarkerError");
+    this.scanLines = scanLines;
+  }
+
+}
+
+class EOIMarkerError extends _util.BaseException {
+  constructor(msg) {
+    super(msg, "EOIMarkerError");
+  }
+
+}
+
+const dctZigZag = new Uint8Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]);
+const dctCos1 = 4017;
+const dctSin1 = 799;
+const dctCos3 = 3406;
+const dctSin3 = 2276;
+const dctCos6 = 1567;
+const dctSin6 = 3784;
+const dctSqrt2 = 5793;
+const dctSqrt1d2 = 2896;
+
+function buildHuffmanTable(codeLengths, values) {
+  let k = 0,
+      i,
+      j,
+      length = 16;
+
+  while (length > 0 && !codeLengths[length - 1]) {
+    length--;
+  }
+
+  const code = [{
+    children: [],
+    index: 0
+  }];
+  let p = code[0],
+      q;
+
+  for (i = 0; i < length; i++) {
+    for (j = 0; j < codeLengths[i]; j++) {
+      p = code.pop();
+      p.children[p.index] = values[k];
+
+      while (p.index > 0) {
+        p = code.pop();
+      }
+
+      p.index++;
+      code.push(p);
+
+      while (code.length <= i) {
+        code.push(q = {
+          children: [],
+          index: 0
+        });
+        p.children[p.index] = q.children;
+        p = q;
+      }
+
+      k++;
+    }
+
+    if (i + 1 < length) {
+      code.push(q = {
+        children: [],
+        index: 0
+      });
+      p.children[p.index] = q.children;
+      p = q;
+    }
+  }
+
+  return code[0].children;
+}
+
+function getBlockBufferOffset(component, row, col) {
+  return 64 * ((component.blocksPerLine + 1) * row + col);
+}
+
+function decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successivePrev, successive, parseDNLMarker = false) {
+  const mcusPerLine = frame.mcusPerLine;
+  const progressive = frame.progressive;
+  const startOffset = offset;
+  let bitsData = 0,
+      bitsCount = 0;
+
+  function readBit() {
+    if (bitsCount > 0) {
+      bitsCount--;
+      return bitsData >> bitsCount & 1;
+    }
+
+    bitsData = data[offset++];
+
+    if (bitsData === 0xff) {
+      const nextByte = data[offset++];
+
+      if (nextByte) {
+        if (nextByte === 0xdc && parseDNLMarker) {
+          offset += 2;
+          const scanLines = (0, _core_utils.readUint16)(data, offset);
+          offset += 2;
+
+          if (scanLines > 0 && scanLines !== frame.scanLines) {
+            throw new DNLMarkerError("Found DNL marker (0xFFDC) while parsing scan data", scanLines);
+          }
+        } else if (nextByte === 0xd9) {
+          if (parseDNLMarker) {
+            const maybeScanLines = blockRow * (frame.precision === 8 ? 8 : 0);
+
+            if (maybeScanLines > 0 && Math.round(frame.scanLines / maybeScanLines) >= 10) {
+              throw new DNLMarkerError("Found EOI marker (0xFFD9) while parsing scan data, " + "possibly caused by incorrect `scanLines` parameter", maybeScanLines);
+            }
+          }
+
+          throw new EOIMarkerError("Found EOI marker (0xFFD9) while parsing scan data");
+        }
+
+        throw new JpegError(`unexpected marker ${(bitsData << 8 | nextByte).toString(16)}`);
+      }
+    }
+
+    bitsCount = 7;
+    return bitsData >>> 7;
+  }
+
+  function decodeHuffman(tree) {
+    let node = tree;
+
+    while (true) {
+      node = node[readBit()];
+
+      switch (typeof node) {
+        case "number":
+          return node;
+
+        case "object":
+          continue;
+      }
+
+      throw new JpegError("invalid huffman sequence");
+    }
+  }
+
+  function receive(length) {
+    let n = 0;
+
+    while (length > 0) {
+      n = n << 1 | readBit();
+      length--;
+    }
+
+    return n;
+  }
+
+  function receiveAndExtend(length) {
+    if (length === 1) {
+      return readBit() === 1 ? 1 : -1;
+    }
+
+    const n = receive(length);
+
+    if (n >= 1 << length - 1) {
+      return n;
+    }
+
+    return n + (-1 << length) + 1;
+  }
+
+  function decodeBaseline(component, blockOffset) {
+    const t = decodeHuffman(component.huffmanTableDC);
+    const diff = t === 0 ? 0 : receiveAndExtend(t);
+    component.blockData[blockOffset] = component.pred += diff;
+    let k = 1;
+
+    while (k < 64) {
+      const rs = decodeHuffman(component.huffmanTableAC);
+      const s = rs & 15,
+            r = rs >> 4;
+
+      if (s === 0) {
+        if (r < 15) {
+          break;
+        }
+
+        k += 16;
+        continue;
+      }
+
+      k += r;
+      const z = dctZigZag[k];
+      component.blockData[blockOffset + z] = receiveAndExtend(s);
+      k++;
+    }
+  }
+
+  function decodeDCFirst(component, blockOffset) {
+    const t = decodeHuffman(component.huffmanTableDC);
+    const diff = t === 0 ? 0 : receiveAndExtend(t) << successive;
+    component.blockData[blockOffset] = component.pred += diff;
+  }
+
+  function decodeDCSuccessive(component, blockOffset) {
+    component.blockData[blockOffset] |= readBit() << successive;
+  }
+
+  let eobrun = 0;
+
+  function decodeACFirst(component, blockOffset) {
+    if (eobrun > 0) {
+      eobrun--;
+      return;
+    }
+
+    let k = spectralStart;
+    const e = spectralEnd;
+
+    while (k <= e) {
+      const rs = decodeHuffman(component.huffmanTableAC);
+      const s = rs & 15,
+            r = rs >> 4;
+
+      if (s === 0) {
+        if (r < 15) {
+          eobrun = receive(r) + (1 << r) - 1;
+          break;
+        }
+
+        k += 16;
+        continue;
+      }
+
+      k += r;
+      const z = dctZigZag[k];
+      component.blockData[blockOffset + z] = receiveAndExtend(s) * (1 << successive);
+      k++;
+    }
+  }
+
+  let successiveACState = 0,
+      successiveACNextValue;
+
+  function decodeACSuccessive(component, blockOffset) {
+    let k = spectralStart;
+    const e = spectralEnd;
+    let r = 0;
+    let s;
+    let rs;
+
+    while (k <= e) {
+      const offsetZ = blockOffset + dctZigZag[k];
+      const sign = component.blockData[offsetZ] < 0 ? -1 : 1;
+
+      switch (successiveACState) {
+        case 0:
+          rs = decodeHuffman(component.huffmanTableAC);
+          s = rs & 15;
+          r = rs >> 4;
+
+          if (s === 0) {
+            if (r < 15) {
+              eobrun = receive(r) + (1 << r);
+              successiveACState = 4;
+            } else {
+              r = 16;
+              successiveACState = 1;
+            }
+          } else {
+            if (s !== 1) {
+              throw new JpegError("invalid ACn encoding");
+            }
+
+            successiveACNextValue = receiveAndExtend(s);
+            successiveACState = r ? 2 : 3;
+          }
+
+          continue;
+
+        case 1:
+        case 2:
+          if (component.blockData[offsetZ]) {
+            component.blockData[offsetZ] += sign * (readBit() << successive);
+          } else {
+            r--;
+
+            if (r === 0) {
+              successiveACState = successiveACState === 2 ? 3 : 0;
+            }
+          }
+
+          break;
+
+        case 3:
+          if (component.blockData[offsetZ]) {
+            component.blockData[offsetZ] += sign * (readBit() << successive);
+          } else {
+            component.blockData[offsetZ] = successiveACNextValue << successive;
+            successiveACState = 0;
+          }
+
+          break;
+
+        case 4:
+          if (component.blockData[offsetZ]) {
+            component.blockData[offsetZ] += sign * (readBit() << successive);
+          }
+
+          break;
+      }
+
+      k++;
+    }
+
+    if (successiveACState === 4) {
+      eobrun--;
+
+      if (eobrun === 0) {
+        successiveACState = 0;
+      }
+    }
+  }
+
+  let blockRow = 0;
+
+  function decodeMcu(component, decode, mcu, row, col) {
+    const mcuRow = mcu / mcusPerLine | 0;
+    const mcuCol = mcu % mcusPerLine;
+    blockRow = mcuRow * component.v + row;
+    const blockCol = mcuCol * component.h + col;
+    const blockOffset = getBlockBufferOffset(component, blockRow, blockCol);
+    decode(component, blockOffset);
+  }
+
+  function decodeBlock(component, decode, mcu) {
+    blockRow = mcu / component.blocksPerLine | 0;
+    const blockCol = mcu % component.blocksPerLine;
+    const blockOffset = getBlockBufferOffset(component, blockRow, blockCol);
+    decode(component, blockOffset);
+  }
+
+  const componentsLength = components.length;
+  let component, i, j, k, n;
+  let decodeFn;
+
+  if (progressive) {
+    if (spectralStart === 0) {
+      decodeFn = successivePrev === 0 ? decodeDCFirst : decodeDCSuccessive;
+    } else {
+      decodeFn = successivePrev === 0 ? decodeACFirst : decodeACSuccessive;
+    }
+  } else {
+    decodeFn = decodeBaseline;
+  }
+
+  let mcu = 0,
+      fileMarker;
+  let mcuExpected;
+
+  if (componentsLength === 1) {
+    mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
+  } else {
+    mcuExpected = mcusPerLine * frame.mcusPerColumn;
+  }
+
+  let h, v;
+
+  while (mcu <= mcuExpected) {
+    const mcuToRead = resetInterval ? Math.min(mcuExpected - mcu, resetInterval) : mcuExpected;
+
+    if (mcuToRead > 0) {
+      for (i = 0; i < componentsLength; i++) {
+        components[i].pred = 0;
+      }
+
+      eobrun = 0;
+
+      if (componentsLength === 1) {
+        component = components[0];
+
+        for (n = 0; n < mcuToRead; n++) {
+          decodeBlock(component, decodeFn, mcu);
+          mcu++;
+        }
+      } else {
+        for (n = 0; n < mcuToRead; n++) {
+          for (i = 0; i < componentsLength; i++) {
+            component = components[i];
+            h = component.h;
+            v = component.v;
+
+            for (j = 0; j < v; j++) {
+              for (k = 0; k < h; k++) {
+                decodeMcu(component, decodeFn, mcu, j, k);
+              }
+            }
+          }
+
+          mcu++;
+        }
+      }
+    }
+
+    bitsCount = 0;
+    fileMarker = findNextFileMarker(data, offset);
+
+    if (!fileMarker) {
+      break;
+    }
+
+    if (fileMarker.invalid) {
+      const partialMsg = mcuToRead > 0 ? "unexpected" : "excessive";
+      (0, _util.warn)(`decodeScan - ${partialMsg} MCU data, current marker is: ${fileMarker.invalid}`);
+      offset = fileMarker.offset;
+    }
+
+    if (fileMarker.marker >= 0xffd0 && fileMarker.marker <= 0xffd7) {
+      offset += 2;
+    } else {
+      break;
+    }
+  }
+
+  return offset - startOffset;
+}
+
+function quantizeAndInverse(component, blockBufferOffset, p) {
+  const qt = component.quantizationTable,
+        blockData = component.blockData;
+  let v0, v1, v2, v3, v4, v5, v6, v7;
+  let p0, p1, p2, p3, p4, p5, p6, p7;
+  let t;
+
+  if (!qt) {
+    throw new JpegError("missing required Quantization Table.");
+  }
+
+  for (let row = 0; row < 64; row += 8) {
+    p0 = blockData[blockBufferOffset + row];
+    p1 = blockData[blockBufferOffset + row + 1];
+    p2 = blockData[blockBufferOffset + row + 2];
+    p3 = blockData[blockBufferOffset + row + 3];
+    p4 = blockData[blockBufferOffset + row + 4];
+    p5 = blockData[blockBufferOffset + row + 5];
+    p6 = blockData[blockBufferOffset + row + 6];
+    p7 = blockData[blockBufferOffset + row + 7];
+    p0 *= qt[row];
+
+    if ((p1 | p2 | p3 | p4 | p5 | p6 | p7) === 0) {
+      t = dctSqrt2 * p0 + 512 >> 10;
+      p[row] = t;
+      p[row + 1] = t;
+      p[row + 2] = t;
+      p[row + 3] = t;
+      p[row + 4] = t;
+      p[row + 5] = t;
+      p[row + 6] = t;
+      p[row + 7] = t;
+      continue;
+    }
+
+    p1 *= qt[row + 1];
+    p2 *= qt[row + 2];
+    p3 *= qt[row + 3];
+    p4 *= qt[row + 4];
+    p5 *= qt[row + 5];
+    p6 *= qt[row + 6];
+    p7 *= qt[row + 7];
+    v0 = dctSqrt2 * p0 + 128 >> 8;
+    v1 = dctSqrt2 * p4 + 128 >> 8;
+    v2 = p2;
+    v3 = p6;
+    v4 = dctSqrt1d2 * (p1 - p7) + 128 >> 8;
+    v7 = dctSqrt1d2 * (p1 + p7) + 128 >> 8;
+    v5 = p3 << 4;
+    v6 = p5 << 4;
+    v0 = v0 + v1 + 1 >> 1;
+    v1 = v0 - v1;
+    t = v2 * dctSin6 + v3 * dctCos6 + 128 >> 8;
+    v2 = v2 * dctCos6 - v3 * dctSin6 + 128 >> 8;
+    v3 = t;
+    v4 = v4 + v6 + 1 >> 1;
+    v6 = v4 - v6;
+    v7 = v7 + v5 + 1 >> 1;
+    v5 = v7 - v5;
+    v0 = v0 + v3 + 1 >> 1;
+    v3 = v0 - v3;
+    v1 = v1 + v2 + 1 >> 1;
+    v2 = v1 - v2;
+    t = v4 * dctSin3 + v7 * dctCos3 + 2048 >> 12;
+    v4 = v4 * dctCos3 - v7 * dctSin3 + 2048 >> 12;
+    v7 = t;
+    t = v5 * dctSin1 + v6 * dctCos1 + 2048 >> 12;
+    v5 = v5 * dctCos1 - v6 * dctSin1 + 2048 >> 12;
+    v6 = t;
+    p[row] = v0 + v7;
+    p[row + 7] = v0 - v7;
+    p[row + 1] = v1 + v6;
+    p[row + 6] = v1 - v6;
+    p[row + 2] = v2 + v5;
+    p[row + 5] = v2 - v5;
+    p[row + 3] = v3 + v4;
+    p[row + 4] = v3 - v4;
+  }
+
+  for (let col = 0; col < 8; ++col) {
+    p0 = p[col];
+    p1 = p[col + 8];
+    p2 = p[col + 16];
+    p3 = p[col + 24];
+    p4 = p[col + 32];
+    p5 = p[col + 40];
+    p6 = p[col + 48];
+    p7 = p[col + 56];
+
+    if ((p1 | p2 | p3 | p4 | p5 | p6 | p7) === 0) {
+      t = dctSqrt2 * p0 + 8192 >> 14;
+
+      if (t < -2040) {
+        t = 0;
+      } else if (t >= 2024) {
+        t = 255;
+      } else {
+        t = t + 2056 >> 4;
+      }
+
+      blockData[blockBufferOffset + col] = t;
+      blockData[blockBufferOffset + col + 8] = t;
+      blockData[blockBufferOffset + col + 16] = t;
+      blockData[blockBufferOffset + col + 24] = t;
+      blockData[blockBufferOffset + col + 32] = t;
+      blockData[blockBufferOffset + col + 40] = t;
+      blockData[blockBufferOffset + col + 48] = t;
+      blockData[blockBufferOffset + col + 56] = t;
+      continue;
+    }
+
+    v0 = dctSqrt2 * p0 + 2048 >> 12;
+    v1 = dctSqrt2 * p4 + 2048 >> 12;
+    v2 = p2;
+    v3 = p6;
+    v4 = dctSqrt1d2 * (p1 - p7) + 2048 >> 12;
+    v7 = dctSqrt1d2 * (p1 + p7) + 2048 >> 12;
+    v5 = p3;
+    v6 = p5;
+    v0 = (v0 + v1 + 1 >> 1) + 4112;
+    v1 = v0 - v1;
+    t = v2 * dctSin6 + v3 * dctCos6 + 2048 >> 12;
+    v2 = v2 * dctCos6 - v3 * dctSin6 + 2048 >> 12;
+    v3 = t;
+    v4 = v4 + v6 + 1 >> 1;
+    v6 = v4 - v6;
+    v7 = v7 + v5 + 1 >> 1;
+    v5 = v7 - v5;
+    v0 = v0 + v3 + 1 >> 1;
+    v3 = v0 - v3;
+    v1 = v1 + v2 + 1 >> 1;
+    v2 = v1 - v2;
+    t = v4 * dctSin3 + v7 * dctCos3 + 2048 >> 12;
+    v4 = v4 * dctCos3 - v7 * dctSin3 + 2048 >> 12;
+    v7 = t;
+    t = v5 * dctSin1 + v6 * dctCos1 + 2048 >> 12;
+    v5 = v5 * dctCos1 - v6 * dctSin1 + 2048 >> 12;
+    v6 = t;
+    p0 = v0 + v7;
+    p7 = v0 - v7;
+    p1 = v1 + v6;
+    p6 = v1 - v6;
+    p2 = v2 + v5;
+    p5 = v2 - v5;
+    p3 = v3 + v4;
+    p4 = v3 - v4;
+
+    if (p0 < 16) {
+      p0 = 0;
+    } else if (p0 >= 4080) {
+      p0 = 255;
+    } else {
+      p0 >>= 4;
+    }
+
+    if (p1 < 16) {
+      p1 = 0;
+    } else if (p1 >= 4080) {
+      p1 = 255;
+    } else {
+      p1 >>= 4;
+    }
+
+    if (p2 < 16) {
+      p2 = 0;
+    } else if (p2 >= 4080) {
+      p2 = 255;
+    } else {
+      p2 >>= 4;
+    }
+
+    if (p3 < 16) {
+      p3 = 0;
+    } else if (p3 >= 4080) {
+      p3 = 255;
+    } else {
+      p3 >>= 4;
+    }
+
+    if (p4 < 16) {
+      p4 = 0;
+    } else if (p4 >= 4080) {
+      p4 = 255;
+    } else {
+      p4 >>= 4;
+    }
+
+    if (p5 < 16) {
+      p5 = 0;
+    } else if (p5 >= 4080) {
+      p5 = 255;
+    } else {
+      p5 >>= 4;
+    }
+
+    if (p6 < 16) {
+      p6 = 0;
+    } else if (p6 >= 4080) {
+      p6 = 255;
+    } else {
+      p6 >>= 4;
+    }
+
+    if (p7 < 16) {
+      p7 = 0;
+    } else if (p7 >= 4080) {
+      p7 = 255;
+    } else {
+      p7 >>= 4;
+    }
+
+    blockData[blockBufferOffset + col] = p0;
+    blockData[blockBufferOffset + col + 8] = p1;
+    blockData[blockBufferOffset + col + 16] = p2;
+    blockData[blockBufferOffset + col + 24] = p3;
+    blockData[blockBufferOffset + col + 32] = p4;
+    blockData[blockBufferOffset + col + 40] = p5;
+    blockData[blockBufferOffset + col + 48] = p6;
+    blockData[blockBufferOffset + col + 56] = p7;
+  }
+}
+
+function buildComponentData(frame, component) {
+  const blocksPerLine = component.blocksPerLine;
+  const blocksPerColumn = component.blocksPerColumn;
+  const computationBuffer = new Int16Array(64);
+
+  for (let blockRow = 0; blockRow < blocksPerColumn; blockRow++) {
+    for (let blockCol = 0; blockCol < blocksPerLine; blockCol++) {
+      const offset = getBlockBufferOffset(component, blockRow, blockCol);
+      quantizeAndInverse(component, offset, computationBuffer);
+    }
+  }
+
+  return component.blockData;
+}
+
+function findNextFileMarker(data, currentPos, startPos = currentPos) {
+  const maxPos = data.length - 1;
+  let newPos = startPos < currentPos ? startPos : currentPos;
+
+  if (currentPos >= maxPos) {
+    return null;
+  }
+
+  const currentMarker = (0, _core_utils.readUint16)(data, currentPos);
+
+  if (currentMarker >= 0xffc0 && currentMarker <= 0xfffe) {
+    return {
+      invalid: null,
+      marker: currentMarker,
+      offset: currentPos
+    };
+  }
+
+  let newMarker = (0, _core_utils.readUint16)(data, newPos);
+
+  while (!(newMarker >= 0xffc0 && newMarker <= 0xfffe)) {
+    if (++newPos >= maxPos) {
+      return null;
+    }
+
+    newMarker = (0, _core_utils.readUint16)(data, newPos);
+  }
+
+  return {
+    invalid: currentMarker.toString(16),
+    marker: newMarker,
+    offset: newPos
+  };
+}
+
+class JpegImage {
+  constructor({
+    decodeTransform = null,
+    colorTransform = -1
+  } = {}) {
+    this._decodeTransform = decodeTransform;
+    this._colorTransform = colorTransform;
+  }
+
+  parse(data, {
+    dnlScanLines = null
+  } = {}) {
+    function readDataBlock() {
+      const length = (0, _core_utils.readUint16)(data, offset);
+      offset += 2;
+      let endOffset = offset + length - 2;
+      const fileMarker = findNextFileMarker(data, endOffset, offset);
+
+      if (fileMarker && fileMarker.invalid) {
+        (0, _util.warn)("readDataBlock - incorrect length, current marker is: " + fileMarker.invalid);
+        endOffset = fileMarker.offset;
+      }
+
+      const array = data.subarray(offset, endOffset);
+      offset += array.length;
+      return array;
+    }
+
+    function prepareComponents(frame) {
+      const mcusPerLine = Math.ceil(frame.samplesPerLine / 8 / frame.maxH);
+      const mcusPerColumn = Math.ceil(frame.scanLines / 8 / frame.maxV);
+
+      for (let i = 0, ii = frame.components.length; i < ii; i++) {
+        const component = frame.components[i];
+        const blocksPerLine = Math.ceil(Math.ceil(frame.samplesPerLine / 8) * component.h / frame.maxH);
+        const blocksPerColumn = Math.ceil(Math.ceil(frame.scanLines / 8) * component.v / frame.maxV);
+        const blocksPerLineForMcu = mcusPerLine * component.h;
+        const blocksPerColumnForMcu = mcusPerColumn * component.v;
+        const blocksBufferSize = 64 * blocksPerColumnForMcu * (blocksPerLineForMcu + 1);
+        component.blockData = new Int16Array(blocksBufferSize);
+        component.blocksPerLine = blocksPerLine;
+        component.blocksPerColumn = blocksPerColumn;
+      }
+
+      frame.mcusPerLine = mcusPerLine;
+      frame.mcusPerColumn = mcusPerColumn;
+    }
+
+    let offset = 0;
+    let jfif = null;
+    let adobe = null;
+    let frame, resetInterval;
+    let numSOSMarkers = 0;
+    const quantizationTables = [];
+    const huffmanTablesAC = [],
+          huffmanTablesDC = [];
+    let fileMarker = (0, _core_utils.readUint16)(data, offset);
+    offset += 2;
+
+    if (fileMarker !== 0xffd8) {
+      throw new JpegError("SOI not found");
+    }
+
+    fileMarker = (0, _core_utils.readUint16)(data, offset);
+    offset += 2;
+
+    markerLoop: while (fileMarker !== 0xffd9) {
+      let i, j, l;
+
+      switch (fileMarker) {
+        case 0xffe0:
+        case 0xffe1:
+        case 0xffe2:
+        case 0xffe3:
+        case 0xffe4:
+        case 0xffe5:
+        case 0xffe6:
+        case 0xffe7:
+        case 0xffe8:
+        case 0xffe9:
+        case 0xffea:
+        case 0xffeb:
+        case 0xffec:
+        case 0xffed:
+        case 0xffee:
+        case 0xffef:
+        case 0xfffe:
+          const appData = readDataBlock();
+
+          if (fileMarker === 0xffe0) {
+            if (appData[0] === 0x4a && appData[1] === 0x46 && appData[2] === 0x49 && appData[3] === 0x46 && appData[4] === 0) {
+              jfif = {
+                version: {
+                  major: appData[5],
+                  minor: appData[6]
+                },
+                densityUnits: appData[7],
+                xDensity: appData[8] << 8 | appData[9],
+                yDensity: appData[10] << 8 | appData[11],
+                thumbWidth: appData[12],
+                thumbHeight: appData[13],
+                thumbData: appData.subarray(14, 14 + 3 * appData[12] * appData[13])
+              };
+            }
+          }
+
+          if (fileMarker === 0xffee) {
+            if (appData[0] === 0x41 && appData[1] === 0x64 && appData[2] === 0x6f && appData[3] === 0x62 && appData[4] === 0x65) {
+              adobe = {
+                version: appData[5] << 8 | appData[6],
+                flags0: appData[7] << 8 | appData[8],
+                flags1: appData[9] << 8 | appData[10],
+                transformCode: appData[11]
+              };
+            }
+          }
+
+          break;
+
+        case 0xffdb:
+          const quantizationTablesLength = (0, _core_utils.readUint16)(data, offset);
+          offset += 2;
+          const quantizationTablesEnd = quantizationTablesLength + offset - 2;
+          let z;
+
+          while (offset < quantizationTablesEnd) {
+            const quantizationTableSpec = data[offset++];
+            const tableData = new Uint16Array(64);
+
+            if (quantizationTableSpec >> 4 === 0) {
+              for (j = 0; j < 64; j++) {
+                z = dctZigZag[j];
+                tableData[z] = data[offset++];
+              }
+            } else if (quantizationTableSpec >> 4 === 1) {
+              for (j = 0; j < 64; j++) {
+                z = dctZigZag[j];
+                tableData[z] = (0, _core_utils.readUint16)(data, offset);
+                offset += 2;
+              }
+            } else {
+              throw new JpegError("DQT - invalid table spec");
+            }
+
+            quantizationTables[quantizationTableSpec & 15] = tableData;
+          }
+
+          break;
+
+        case 0xffc0:
+        case 0xffc1:
+        case 0xffc2:
+          if (frame) {
+            throw new JpegError("Only single frame JPEGs supported");
+          }
+
+          offset += 2;
+          frame = {};
+          frame.extended = fileMarker === 0xffc1;
+          frame.progressive = fileMarker === 0xffc2;
+          frame.precision = data[offset++];
+          const sofScanLines = (0, _core_utils.readUint16)(data, offset);
+          offset += 2;
+          frame.scanLines = dnlScanLines || sofScanLines;
+          frame.samplesPerLine = (0, _core_utils.readUint16)(data, offset);
+          offset += 2;
+          frame.components = [];
+          frame.componentIds = {};
+          const componentsCount = data[offset++];
+          let maxH = 0,
+              maxV = 0;
+
+          for (i = 0; i < componentsCount; i++) {
+            const componentId = data[offset];
+            const h = data[offset + 1] >> 4;
+            const v = data[offset + 1] & 15;
+
+            if (maxH < h) {
+              maxH = h;
+            }
+
+            if (maxV < v) {
+              maxV = v;
+            }
+
+            const qId = data[offset + 2];
+            l = frame.components.push({
+              h,
+              v,
+              quantizationId: qId,
+              quantizationTable: null
+            });
+            frame.componentIds[componentId] = l - 1;
+            offset += 3;
+          }
+
+          frame.maxH = maxH;
+          frame.maxV = maxV;
+          prepareComponents(frame);
+          break;
+
+        case 0xffc4:
+          const huffmanLength = (0, _core_utils.readUint16)(data, offset);
+          offset += 2;
+
+          for (i = 2; i < huffmanLength;) {
+            const huffmanTableSpec = data[offset++];
+            const codeLengths = new Uint8Array(16);
+            let codeLengthSum = 0;
+
+            for (j = 0; j < 16; j++, offset++) {
+              codeLengthSum += codeLengths[j] = data[offset];
+            }
+
+            const huffmanValues = new Uint8Array(codeLengthSum);
+
+            for (j = 0; j < codeLengthSum; j++, offset++) {
+              huffmanValues[j] = data[offset];
+            }
+
+            i += 17 + codeLengthSum;
+            (huffmanTableSpec >> 4 === 0 ? huffmanTablesDC : huffmanTablesAC)[huffmanTableSpec & 15] = buildHuffmanTable(codeLengths, huffmanValues);
+          }
+
+          break;
+
+        case 0xffdd:
+          offset += 2;
+          resetInterval = (0, _core_utils.readUint16)(data, offset);
+          offset += 2;
+          break;
+
+        case 0xffda:
+          const parseDNLMarker = ++numSOSMarkers === 1 && !dnlScanLines;
+          offset += 2;
+          const selectorsCount = data[offset++],
+                components = [];
+
+          for (i = 0; i < selectorsCount; i++) {
+            const index = data[offset++];
+            const componentIndex = frame.componentIds[index];
+            const component = frame.components[componentIndex];
+            component.index = index;
+            const tableSpec = data[offset++];
+            component.huffmanTableDC = huffmanTablesDC[tableSpec >> 4];
+            component.huffmanTableAC = huffmanTablesAC[tableSpec & 15];
+            components.push(component);
+          }
+
+          const spectralStart = data[offset++],
+                spectralEnd = data[offset++],
+                successiveApproximation = data[offset++];
+
+          try {
+            const processed = decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successiveApproximation >> 4, successiveApproximation & 15, parseDNLMarker);
+            offset += processed;
+          } catch (ex) {
+            if (ex instanceof DNLMarkerError) {
+              (0, _util.warn)(`${ex.message} -- attempting to re-parse the JPEG image.`);
+              return this.parse(data, {
+                dnlScanLines: ex.scanLines
+              });
+            } else if (ex instanceof EOIMarkerError) {
+              (0, _util.warn)(`${ex.message} -- ignoring the rest of the image data.`);
+              break markerLoop;
+            }
+
+            throw ex;
+          }
+
+          break;
+
+        case 0xffdc:
+          offset += 4;
+          break;
+
+        case 0xffff:
+          if (data[offset] !== 0xff) {
+            offset--;
+          }
+
+          break;
+
+        default:
+          const nextFileMarker = findNextFileMarker(data, offset - 2, offset - 3);
+
+          if (nextFileMarker && nextFileMarker.invalid) {
+            (0, _util.warn)("JpegImage.parse - unexpected data, current marker is: " + nextFileMarker.invalid);
+            offset = nextFileMarker.offset;
+            break;
+          }
+
+          if (!nextFileMarker || offset >= data.length - 1) {
+            (0, _util.warn)("JpegImage.parse - reached the end of the image data " + "without finding an EOI marker (0xFFD9).");
+            break markerLoop;
+          }
+
+          throw new JpegError("JpegImage.parse - unknown marker: " + fileMarker.toString(16));
+      }
+
+      fileMarker = (0, _core_utils.readUint16)(data, offset);
+      offset += 2;
+    }
+
+    this.width = frame.samplesPerLine;
+    this.height = frame.scanLines;
+    this.jfif = jfif;
+    this.adobe = adobe;
+    this.components = [];
+
+    for (let i = 0, ii = frame.components.length; i < ii; i++) {
+      const component = frame.components[i];
+      const quantizationTable = quantizationTables[component.quantizationId];
+
+      if (quantizationTable) {
+        component.quantizationTable = quantizationTable;
+      }
+
+      this.components.push({
+        index: component.index,
+        output: buildComponentData(frame, component),
+        scaleX: component.h / frame.maxH,
+        scaleY: component.v / frame.maxV,
+        blocksPerLine: component.blocksPerLine,
+        blocksPerColumn: component.blocksPerColumn
+      });
+    }
+
+    this.numComponents = this.components.length;
+    return undefined;
+  }
+
+  _getLinearizedBlockData(width, height, isSourcePDF = false) {
+    const scaleX = this.width / width,
+          scaleY = this.height / height;
+    let component, componentScaleX, componentScaleY, blocksPerScanline;
+    let x, y, i, j, k;
+    let index;
+    let offset = 0;
+    let output;
+    const numComponents = this.components.length;
+    const dataLength = width * height * numComponents;
+    const data = new Uint8ClampedArray(dataLength);
+    const xScaleBlockOffset = new Uint32Array(width);
+    const mask3LSB = 0xfffffff8;
+    let lastComponentScaleX;
+
+    for (i = 0; i < numComponents; i++) {
+      component = this.components[i];
+      componentScaleX = component.scaleX * scaleX;
+      componentScaleY = component.scaleY * scaleY;
+      offset = i;
+      output = component.output;
+      blocksPerScanline = component.blocksPerLine + 1 << 3;
+
+      if (componentScaleX !== lastComponentScaleX) {
+        for (x = 0; x < width; x++) {
+          j = 0 | x * componentScaleX;
+          xScaleBlockOffset[x] = (j & mask3LSB) << 3 | j & 7;
+        }
+
+        lastComponentScaleX = componentScaleX;
+      }
+
+      for (y = 0; y < height; y++) {
+        j = 0 | y * componentScaleY;
+        index = blocksPerScanline * (j & mask3LSB) | (j & 7) << 3;
+
+        for (x = 0; x < width; x++) {
+          data[offset] = output[index + xScaleBlockOffset[x]];
+          offset += numComponents;
+        }
+      }
+    }
+
+    let transform = this._decodeTransform;
+
+    if (!isSourcePDF && numComponents === 4 && !transform) {
+      transform = new Int32Array([-256, 255, -256, 255, -256, 255, -256, 255]);
+    }
+
+    if (transform) {
+      for (i = 0; i < dataLength;) {
+        for (j = 0, k = 0; j < numComponents; j++, i++, k += 2) {
+          data[i] = (data[i] * transform[k] >> 8) + transform[k + 1];
+        }
+      }
+    }
+
+    return data;
+  }
+
+  get _isColorConversionNeeded() {
+    if (this.adobe) {
+      return !!this.adobe.transformCode;
+    }
+
+    if (this.numComponents === 3) {
+      if (this._colorTransform === 0) {
+        return false;
+      } else if (this.components[0].index === 0x52 && this.components[1].index === 0x47 && this.components[2].index === 0x42) {
+        return false;
+      }
+
+      return true;
+    }
+
+    if (this._colorTransform === 1) {
+      return true;
+    }
+
+    return false;
+  }
+
+  _convertYccToRgb(data) {
+    let Y, Cb, Cr;
+
+    for (let i = 0, length = data.length; i < length; i += 3) {
+      Y = data[i];
+      Cb = data[i + 1];
+      Cr = data[i + 2];
+      data[i] = Y - 179.456 + 1.402 * Cr;
+      data[i + 1] = Y + 135.459 - 0.344 * Cb - 0.714 * Cr;
+      data[i + 2] = Y - 226.816 + 1.772 * Cb;
+    }
+
+    return data;
+  }
+
+  _convertYcckToRgb(data) {
+    let Y, Cb, Cr, k;
+    let offset = 0;
+
+    for (let i = 0, length = data.length; i < length; i += 4) {
+      Y = data[i];
+      Cb = data[i + 1];
+      Cr = data[i + 2];
+      k = data[i + 3];
+      data[offset++] = -122.67195406894 + Cb * (-6.60635669420364e-5 * Cb + 0.000437130475926232 * Cr - 5.4080610064599e-5 * Y + 0.00048449797120281 * k - 0.154362151871126) + Cr * (-0.000957964378445773 * Cr + 0.000817076911346625 * Y - 0.00477271405408747 * k + 1.53380253221734) + Y * (0.000961250184130688 * Y - 0.00266257332283933 * k + 0.48357088451265) + k * (-0.000336197177618394 * k + 0.484791561490776);
+      data[offset++] = 107.268039397724 + Cb * (2.19927104525741e-5 * Cb - 0.000640992018297945 * Cr + 0.000659397001245577 * Y + 0.000426105652938837 * k - 0.176491792462875) + Cr * (-0.000778269941513683 * Cr + 0.00130872261408275 * Y + 0.000770482631801132 * k - 0.151051492775562) + Y * (0.00126935368114843 * Y - 0.00265090189010898 * k + 0.25802910206845) + k * (-0.000318913117588328 * k - 0.213742400323665);
+      data[offset++] = -20.810012546947 + Cb * (-0.000570115196973677 * Cb - 2.63409051004589e-5 * Cr + 0.0020741088115012 * Y - 0.00288260236853442 * k + 0.814272968359295) + Cr * (-1.53496057440975e-5 * Cr - 0.000132689043961446 * Y + 0.000560833691242812 * k - 0.195152027534049) + Y * (0.00174418132927582 * Y - 0.00255243321439347 * k + 0.116935020465145) + k * (-0.000343531996510555 * k + 0.24165260232407);
+    }
+
+    return data.subarray(0, offset);
+  }
+
+  _convertYcckToCmyk(data) {
+    let Y, Cb, Cr;
+
+    for (let i = 0, length = data.length; i < length; i += 4) {
+      Y = data[i];
+      Cb = data[i + 1];
+      Cr = data[i + 2];
+      data[i] = 434.456 - Y - 1.402 * Cr;
+      data[i + 1] = 119.541 - Y + 0.344 * Cb + 0.714 * Cr;
+      data[i + 2] = 481.816 - Y - 1.772 * Cb;
+    }
+
+    return data;
+  }
+
+  _convertCmykToRgb(data) {
+    let c, m, y, k;
+    let offset = 0;
+
+    for (let i = 0, length = data.length; i < length; i += 4) {
+      c = data[i];
+      m = data[i + 1];
+      y = data[i + 2];
+      k = data[i + 3];
+      data[offset++] = 255 + c * (-0.00006747147073602441 * c + 0.0008379262121013727 * m + 0.0002894718188643294 * y + 0.003264231057537806 * k - 1.1185611867203937) + m * (0.000026374107616089405 * m - 0.00008626949158638572 * y - 0.0002748769067499491 * k - 0.02155688794978967) + y * (-0.00003878099212869363 * y - 0.0003267808279485286 * k + 0.0686742238595345) - k * (0.0003361971776183937 * k + 0.7430659151342254);
+      data[offset++] = 255 + c * (0.00013596372813588848 * c + 0.000924537132573585 * m + 0.00010567359618683593 * y + 0.0004791864687436512 * k - 0.3109689587515875) + m * (-0.00023545346108370344 * m + 0.0002702845253534714 * y + 0.0020200308977307156 * k - 0.7488052167015494) + y * (0.00006834815998235662 * y + 0.00015168452363460973 * k - 0.09751927774728933) - k * (0.0003189131175883281 * k + 0.7364883807733168);
+      data[offset++] = 255 + c * (0.000013598650411385307 * c + 0.00012423956175490851 * m + 0.0004751985097583589 * y - 0.0000036729317476630422 * k - 0.05562186980264034) + m * (0.00016141380598724676 * m + 0.0009692239130725186 * y + 0.0007782692450036253 * k - 0.44015232367526463) + y * (5.068882914068769e-7 * y + 0.0017778369011375071 * k - 0.7591454649749609) - k * (0.0003435319965105553 * k + 0.7063770186160144);
+    }
+
+    return data.subarray(0, offset);
+  }
+
+  getData({
+    width,
+    height,
+    forceRGB = false,
+    isSourcePDF = false
+  }) {
+    if (this.numComponents > 4) {
+      throw new JpegError("Unsupported color mode");
+    }
+
+    const data = this._getLinearizedBlockData(width, height, isSourcePDF);
+
+    if (this.numComponents === 1 && forceRGB) {
+      const dataLength = data.length;
+      const rgbData = new Uint8ClampedArray(dataLength * 3);
+      let offset = 0;
+
+      for (let i = 0; i < dataLength; i++) {
+        const grayColor = data[i];
+        rgbData[offset++] = grayColor;
+        rgbData[offset++] = grayColor;
+        rgbData[offset++] = grayColor;
+      }
+
+      return rgbData;
+    } else if (this.numComponents === 3 && this._isColorConversionNeeded) {
+      return this._convertYccToRgb(data);
+    } else if (this.numComponents === 4) {
+      if (this._isColorConversionNeeded) {
+        if (forceRGB) {
+          return this._convertYcckToRgb(data);
+        }
+
+        return this._convertYcckToCmyk(data);
+      } else if (forceRGB) {
+        return this._convertCmykToRgb(data);
+      }
+    }
+
+    return data;
+  }
+
+}
+
+exports.JpegImage = JpegImage;
+
+/***/ }),
+/* 29 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.JpxStream = void 0;
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+var _jpx = __w_pdfjs_require__(30);
+
+var _util = __w_pdfjs_require__(2);
+
+class JpxStream extends _decode_stream.DecodeStream {
+  constructor(stream, maybeLength, params) {
+    super(maybeLength);
+    this.stream = stream;
+    this.dict = stream.dict;
+    this.maybeLength = maybeLength;
+    this.params = params;
+  }
+
+  get bytes() {
+    return (0, _util.shadow)(this, "bytes", this.stream.getBytes(this.maybeLength));
+  }
+
+  ensureBuffer(requested) {}
+
+  readBlock() {
+    if (this.eof) {
+      return;
+    }
+
+    const jpxImage = new _jpx.JpxImage();
+    jpxImage.parse(this.bytes);
+    const width = jpxImage.width;
+    const height = jpxImage.height;
+    const componentsCount = jpxImage.componentsCount;
+    const tileCount = jpxImage.tiles.length;
+
+    if (tileCount === 1) {
+      this.buffer = jpxImage.tiles[0].items;
+    } else {
+      const data = new Uint8ClampedArray(width * height * componentsCount);
+
+      for (let k = 0; k < tileCount; k++) {
+        const tileComponents = jpxImage.tiles[k];
+        const tileWidth = tileComponents.width;
+        const tileHeight = tileComponents.height;
+        const tileLeft = tileComponents.left;
+        const tileTop = tileComponents.top;
+        const src = tileComponents.items;
+        let srcPosition = 0;
+        let dataPosition = (width * tileTop + tileLeft) * componentsCount;
+        const imgRowSize = width * componentsCount;
+        const tileRowSize = tileWidth * componentsCount;
+
+        for (let j = 0; j < tileHeight; j++) {
+          const rowBytes = src.subarray(srcPosition, srcPosition + tileRowSize);
+          data.set(rowBytes, dataPosition);
+          srcPosition += tileRowSize;
+          dataPosition += imgRowSize;
+        }
+      }
+
+      this.buffer = data;
+    }
+
+    this.bufferLength = this.buffer.length;
+    this.eof = true;
+  }
+
+}
+
+exports.JpxStream = JpxStream;
+
+/***/ }),
+/* 30 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.JpxImage = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _arithmetic_decoder = __w_pdfjs_require__(26);
+
+class JpxError extends _util.BaseException {
+  constructor(msg) {
+    super(`JPX error: ${msg}`, "JpxError");
+  }
+
+}
+
+const SubbandsGainLog2 = {
+  LL: 0,
+  LH: 1,
+  HL: 1,
+  HH: 2
+};
+
+class JpxImage {
+  constructor() {
+    this.failOnCorruptedImage = false;
+  }
+
+  parse(data) {
+    const head = (0, _core_utils.readUint16)(data, 0);
+
+    if (head === 0xff4f) {
+      this.parseCodestream(data, 0, data.length);
+      return;
+    }
+
+    const length = data.length;
+    let position = 0;
+
+    while (position < length) {
+      let headerSize = 8;
+      let lbox = (0, _core_utils.readUint32)(data, position);
+      const tbox = (0, _core_utils.readUint32)(data, position + 4);
+      position += headerSize;
+
+      if (lbox === 1) {
+        lbox = (0, _core_utils.readUint32)(data, position) * 4294967296 + (0, _core_utils.readUint32)(data, position + 4);
+        position += 8;
+        headerSize += 8;
+      }
+
+      if (lbox === 0) {
+        lbox = length - position + headerSize;
+      }
+
+      if (lbox < headerSize) {
+        throw new JpxError("Invalid box field size");
+      }
+
+      const dataLength = lbox - headerSize;
+      let jumpDataLength = true;
+
+      switch (tbox) {
+        case 0x6a703268:
+          jumpDataLength = false;
+          break;
+
+        case 0x636f6c72:
+          const method = data[position];
+
+          if (method === 1) {
+            const colorspace = (0, _core_utils.readUint32)(data, position + 3);
+
+            switch (colorspace) {
+              case 16:
+              case 17:
+              case 18:
+                break;
+
+              default:
+                (0, _util.warn)("Unknown colorspace " + colorspace);
+                break;
+            }
+          } else if (method === 2) {
+            (0, _util.info)("ICC profile not supported");
+          }
+
+          break;
+
+        case 0x6a703263:
+          this.parseCodestream(data, position, position + dataLength);
+          break;
+
+        case 0x6a502020:
+          if ((0, _core_utils.readUint32)(data, position) !== 0x0d0a870a) {
+            (0, _util.warn)("Invalid JP2 signature");
+          }
+
+          break;
+
+        case 0x6a501a1a:
+        case 0x66747970:
+        case 0x72726571:
+        case 0x72657320:
+        case 0x69686472:
+          break;
+
+        default:
+          const headerType = String.fromCharCode(tbox >> 24 & 0xff, tbox >> 16 & 0xff, tbox >> 8 & 0xff, tbox & 0xff);
+          (0, _util.warn)(`Unsupported header type ${tbox} (${headerType}).`);
+          break;
+      }
+
+      if (jumpDataLength) {
+        position += dataLength;
+      }
+    }
+  }
+
+  parseImageProperties(stream) {
+    let newByte = stream.getByte();
+
+    while (newByte >= 0) {
+      const oldByte = newByte;
+      newByte = stream.getByte();
+      const code = oldByte << 8 | newByte;
+
+      if (code === 0xff51) {
+        stream.skip(4);
+        const Xsiz = stream.getInt32() >>> 0;
+        const Ysiz = stream.getInt32() >>> 0;
+        const XOsiz = stream.getInt32() >>> 0;
+        const YOsiz = stream.getInt32() >>> 0;
+        stream.skip(16);
+        const Csiz = stream.getUint16();
+        this.width = Xsiz - XOsiz;
+        this.height = Ysiz - YOsiz;
+        this.componentsCount = Csiz;
+        this.bitsPerComponent = 8;
+        return;
+      }
+    }
+
+    throw new JpxError("No size marker found in JPX stream");
+  }
+
+  parseCodestream(data, start, end) {
+    const context = {};
+    let doNotRecover = false;
+
+    try {
+      let position = start;
+
+      while (position + 1 < end) {
+        const code = (0, _core_utils.readUint16)(data, position);
+        position += 2;
+        let length = 0,
+            j,
+            sqcd,
+            spqcds,
+            spqcdSize,
+            scalarExpounded,
+            tile;
+
+        switch (code) {
+          case 0xff4f:
+            context.mainHeader = true;
+            break;
+
+          case 0xffd9:
+            break;
+
+          case 0xff51:
+            length = (0, _core_utils.readUint16)(data, position);
+            const siz = {};
+            siz.Xsiz = (0, _core_utils.readUint32)(data, position + 4);
+            siz.Ysiz = (0, _core_utils.readUint32)(data, position + 8);
+            siz.XOsiz = (0, _core_utils.readUint32)(data, position + 12);
+            siz.YOsiz = (0, _core_utils.readUint32)(data, position + 16);
+            siz.XTsiz = (0, _core_utils.readUint32)(data, position + 20);
+            siz.YTsiz = (0, _core_utils.readUint32)(data, position + 24);
+            siz.XTOsiz = (0, _core_utils.readUint32)(data, position + 28);
+            siz.YTOsiz = (0, _core_utils.readUint32)(data, position + 32);
+            const componentsCount = (0, _core_utils.readUint16)(data, position + 36);
+            siz.Csiz = componentsCount;
+            const components = [];
+            j = position + 38;
+
+            for (let i = 0; i < componentsCount; i++) {
+              const component = {
+                precision: (data[j] & 0x7f) + 1,
+                isSigned: !!(data[j] & 0x80),
+                XRsiz: data[j + 1],
+                YRsiz: data[j + 2]
+              };
+              j += 3;
+              calculateComponentDimensions(component, siz);
+              components.push(component);
+            }
+
+            context.SIZ = siz;
+            context.components = components;
+            calculateTileGrids(context, components);
+            context.QCC = [];
+            context.COC = [];
+            break;
+
+          case 0xff5c:
+            length = (0, _core_utils.readUint16)(data, position);
+            const qcd = {};
+            j = position + 2;
+            sqcd = data[j++];
+
+            switch (sqcd & 0x1f) {
+              case 0:
+                spqcdSize = 8;
+                scalarExpounded = true;
+                break;
+
+              case 1:
+                spqcdSize = 16;
+                scalarExpounded = false;
+                break;
+
+              case 2:
+                spqcdSize = 16;
+                scalarExpounded = true;
+                break;
+
+              default:
+                throw new Error("Invalid SQcd value " + sqcd);
+            }
+
+            qcd.noQuantization = spqcdSize === 8;
+            qcd.scalarExpounded = scalarExpounded;
+            qcd.guardBits = sqcd >> 5;
+            spqcds = [];
+
+            while (j < length + position) {
+              const spqcd = {};
+
+              if (spqcdSize === 8) {
+                spqcd.epsilon = data[j++] >> 3;
+                spqcd.mu = 0;
+              } else {
+                spqcd.epsilon = data[j] >> 3;
+                spqcd.mu = (data[j] & 0x7) << 8 | data[j + 1];
+                j += 2;
+              }
+
+              spqcds.push(spqcd);
+            }
+
+            qcd.SPqcds = spqcds;
+
+            if (context.mainHeader) {
+              context.QCD = qcd;
+            } else {
+              context.currentTile.QCD = qcd;
+              context.currentTile.QCC = [];
+            }
+
+            break;
+
+          case 0xff5d:
+            length = (0, _core_utils.readUint16)(data, position);
+            const qcc = {};
+            j = position + 2;
+            let cqcc;
+
+            if (context.SIZ.Csiz < 257) {
+              cqcc = data[j++];
+            } else {
+              cqcc = (0, _core_utils.readUint16)(data, j);
+              j += 2;
+            }
+
+            sqcd = data[j++];
+
+            switch (sqcd & 0x1f) {
+              case 0:
+                spqcdSize = 8;
+                scalarExpounded = true;
+                break;
+
+              case 1:
+                spqcdSize = 16;
+                scalarExpounded = false;
+                break;
+
+              case 2:
+                spqcdSize = 16;
+                scalarExpounded = true;
+                break;
+
+              default:
+                throw new Error("Invalid SQcd value " + sqcd);
+            }
+
+            qcc.noQuantization = spqcdSize === 8;
+            qcc.scalarExpounded = scalarExpounded;
+            qcc.guardBits = sqcd >> 5;
+            spqcds = [];
+
+            while (j < length + position) {
+              const spqcd = {};
+
+              if (spqcdSize === 8) {
+                spqcd.epsilon = data[j++] >> 3;
+                spqcd.mu = 0;
+              } else {
+                spqcd.epsilon = data[j] >> 3;
+                spqcd.mu = (data[j] & 0x7) << 8 | data[j + 1];
+                j += 2;
+              }
+
+              spqcds.push(spqcd);
+            }
+
+            qcc.SPqcds = spqcds;
+
+            if (context.mainHeader) {
+              context.QCC[cqcc] = qcc;
+            } else {
+              context.currentTile.QCC[cqcc] = qcc;
+            }
+
+            break;
+
+          case 0xff52:
+            length = (0, _core_utils.readUint16)(data, position);
+            const cod = {};
+            j = position + 2;
+            const scod = data[j++];
+            cod.entropyCoderWithCustomPrecincts = !!(scod & 1);
+            cod.sopMarkerUsed = !!(scod & 2);
+            cod.ephMarkerUsed = !!(scod & 4);
+            cod.progressionOrder = data[j++];
+            cod.layersCount = (0, _core_utils.readUint16)(data, j);
+            j += 2;
+            cod.multipleComponentTransform = data[j++];
+            cod.decompositionLevelsCount = data[j++];
+            cod.xcb = (data[j++] & 0xf) + 2;
+            cod.ycb = (data[j++] & 0xf) + 2;
+            const blockStyle = data[j++];
+            cod.selectiveArithmeticCodingBypass = !!(blockStyle & 1);
+            cod.resetContextProbabilities = !!(blockStyle & 2);
+            cod.terminationOnEachCodingPass = !!(blockStyle & 4);
+            cod.verticallyStripe = !!(blockStyle & 8);
+            cod.predictableTermination = !!(blockStyle & 16);
+            cod.segmentationSymbolUsed = !!(blockStyle & 32);
+            cod.reversibleTransformation = data[j++];
+
+            if (cod.entropyCoderWithCustomPrecincts) {
+              const precinctsSizes = [];
+
+              while (j < length + position) {
+                const precinctsSize = data[j++];
+                precinctsSizes.push({
+                  PPx: precinctsSize & 0xf,
+                  PPy: precinctsSize >> 4
+                });
+              }
+
+              cod.precinctsSizes = precinctsSizes;
+            }
+
+            const unsupported = [];
+
+            if (cod.selectiveArithmeticCodingBypass) {
+              unsupported.push("selectiveArithmeticCodingBypass");
+            }
+
+            if (cod.terminationOnEachCodingPass) {
+              unsupported.push("terminationOnEachCodingPass");
+            }
+
+            if (cod.verticallyStripe) {
+              unsupported.push("verticallyStripe");
+            }
+
+            if (cod.predictableTermination) {
+              unsupported.push("predictableTermination");
+            }
+
+            if (unsupported.length > 0) {
+              doNotRecover = true;
+              (0, _util.warn)(`JPX: Unsupported COD options (${unsupported.join(", ")}).`);
+            }
+
+            if (context.mainHeader) {
+              context.COD = cod;
+            } else {
+              context.currentTile.COD = cod;
+              context.currentTile.COC = [];
+            }
+
+            break;
+
+          case 0xff90:
+            length = (0, _core_utils.readUint16)(data, position);
+            tile = {};
+            tile.index = (0, _core_utils.readUint16)(data, position + 2);
+            tile.length = (0, _core_utils.readUint32)(data, position + 4);
+            tile.dataEnd = tile.length + position - 2;
+            tile.partIndex = data[position + 8];
+            tile.partsCount = data[position + 9];
+            context.mainHeader = false;
+
+            if (tile.partIndex === 0) {
+              tile.COD = context.COD;
+              tile.COC = context.COC.slice(0);
+              tile.QCD = context.QCD;
+              tile.QCC = context.QCC.slice(0);
+            }
+
+            context.currentTile = tile;
+            break;
+
+          case 0xff93:
+            tile = context.currentTile;
+
+            if (tile.partIndex === 0) {
+              initializeTile(context, tile.index);
+              buildPackets(context);
+            }
+
+            length = tile.dataEnd - position;
+            parseTilePackets(context, data, position, length);
+            break;
+
+          case 0xff53:
+            (0, _util.warn)("JPX: Codestream code 0xFF53 (COC) is not implemented.");
+
+          case 0xff55:
+          case 0xff57:
+          case 0xff58:
+          case 0xff64:
+            length = (0, _core_utils.readUint16)(data, position);
+            break;
+
+          default:
+            throw new Error("Unknown codestream code: " + code.toString(16));
+        }
+
+        position += length;
+      }
+    } catch (e) {
+      if (doNotRecover || this.failOnCorruptedImage) {
+        throw new JpxError(e.message);
+      } else {
+        (0, _util.warn)(`JPX: Trying to recover from: "${e.message}".`);
+      }
+    }
+
+    this.tiles = transformComponents(context);
+    this.width = context.SIZ.Xsiz - context.SIZ.XOsiz;
+    this.height = context.SIZ.Ysiz - context.SIZ.YOsiz;
+    this.componentsCount = context.SIZ.Csiz;
+  }
+
+}
+
+exports.JpxImage = JpxImage;
+
+function calculateComponentDimensions(component, siz) {
+  component.x0 = Math.ceil(siz.XOsiz / component.XRsiz);
+  component.x1 = Math.ceil(siz.Xsiz / component.XRsiz);
+  component.y0 = Math.ceil(siz.YOsiz / component.YRsiz);
+  component.y1 = Math.ceil(siz.Ysiz / component.YRsiz);
+  component.width = component.x1 - component.x0;
+  component.height = component.y1 - component.y0;
+}
+
+function calculateTileGrids(context, components) {
+  const siz = context.SIZ;
+  const tiles = [];
+  let tile;
+  const numXtiles = Math.ceil((siz.Xsiz - siz.XTOsiz) / siz.XTsiz);
+  const numYtiles = Math.ceil((siz.Ysiz - siz.YTOsiz) / siz.YTsiz);
+
+  for (let q = 0; q < numYtiles; q++) {
+    for (let p = 0; p < numXtiles; p++) {
+      tile = {};
+      tile.tx0 = Math.max(siz.XTOsiz + p * siz.XTsiz, siz.XOsiz);
+      tile.ty0 = Math.max(siz.YTOsiz + q * siz.YTsiz, siz.YOsiz);
+      tile.tx1 = Math.min(siz.XTOsiz + (p + 1) * siz.XTsiz, siz.Xsiz);
+      tile.ty1 = Math.min(siz.YTOsiz + (q + 1) * siz.YTsiz, siz.Ysiz);
+      tile.width = tile.tx1 - tile.tx0;
+      tile.height = tile.ty1 - tile.ty0;
+      tile.components = [];
+      tiles.push(tile);
+    }
+  }
+
+  context.tiles = tiles;
+  const componentsCount = siz.Csiz;
+
+  for (let i = 0, ii = componentsCount; i < ii; i++) {
+    const component = components[i];
+
+    for (let j = 0, jj = tiles.length; j < jj; j++) {
+      const tileComponent = {};
+      tile = tiles[j];
+      tileComponent.tcx0 = Math.ceil(tile.tx0 / component.XRsiz);
+      tileComponent.tcy0 = Math.ceil(tile.ty0 / component.YRsiz);
+      tileComponent.tcx1 = Math.ceil(tile.tx1 / component.XRsiz);
+      tileComponent.tcy1 = Math.ceil(tile.ty1 / component.YRsiz);
+      tileComponent.width = tileComponent.tcx1 - tileComponent.tcx0;
+      tileComponent.height = tileComponent.tcy1 - tileComponent.tcy0;
+      tile.components[i] = tileComponent;
+    }
+  }
+}
+
+function getBlocksDimensions(context, component, r) {
+  const codOrCoc = component.codingStyleParameters;
+  const result = {};
+
+  if (!codOrCoc.entropyCoderWithCustomPrecincts) {
+    result.PPx = 15;
+    result.PPy = 15;
+  } else {
+    result.PPx = codOrCoc.precinctsSizes[r].PPx;
+    result.PPy = codOrCoc.precinctsSizes[r].PPy;
+  }
+
+  result.xcb_ = r > 0 ? Math.min(codOrCoc.xcb, result.PPx - 1) : Math.min(codOrCoc.xcb, result.PPx);
+  result.ycb_ = r > 0 ? Math.min(codOrCoc.ycb, result.PPy - 1) : Math.min(codOrCoc.ycb, result.PPy);
+  return result;
+}
+
+function buildPrecincts(context, resolution, dimensions) {
+  const precinctWidth = 1 << dimensions.PPx;
+  const precinctHeight = 1 << dimensions.PPy;
+  const isZeroRes = resolution.resLevel === 0;
+  const precinctWidthInSubband = 1 << dimensions.PPx + (isZeroRes ? 0 : -1);
+  const precinctHeightInSubband = 1 << dimensions.PPy + (isZeroRes ? 0 : -1);
+  const numprecinctswide = resolution.trx1 > resolution.trx0 ? Math.ceil(resolution.trx1 / precinctWidth) - Math.floor(resolution.trx0 / precinctWidth) : 0;
+  const numprecinctshigh = resolution.try1 > resolution.try0 ? Math.ceil(resolution.try1 / precinctHeight) - Math.floor(resolution.try0 / precinctHeight) : 0;
+  const numprecincts = numprecinctswide * numprecinctshigh;
+  resolution.precinctParameters = {
+    precinctWidth,
+    precinctHeight,
+    numprecinctswide,
+    numprecinctshigh,
+    numprecincts,
+    precinctWidthInSubband,
+    precinctHeightInSubband
+  };
+}
+
+function buildCodeblocks(context, subband, dimensions) {
+  const xcb_ = dimensions.xcb_;
+  const ycb_ = dimensions.ycb_;
+  const codeblockWidth = 1 << xcb_;
+  const codeblockHeight = 1 << ycb_;
+  const cbx0 = subband.tbx0 >> xcb_;
+  const cby0 = subband.tby0 >> ycb_;
+  const cbx1 = subband.tbx1 + codeblockWidth - 1 >> xcb_;
+  const cby1 = subband.tby1 + codeblockHeight - 1 >> ycb_;
+  const precinctParameters = subband.resolution.precinctParameters;
+  const codeblocks = [];
+  const precincts = [];
+  let i, j, codeblock, precinctNumber;
+
+  for (j = cby0; j < cby1; j++) {
+    for (i = cbx0; i < cbx1; i++) {
+      codeblock = {
+        cbx: i,
+        cby: j,
+        tbx0: codeblockWidth * i,
+        tby0: codeblockHeight * j,
+        tbx1: codeblockWidth * (i + 1),
+        tby1: codeblockHeight * (j + 1)
+      };
+      codeblock.tbx0_ = Math.max(subband.tbx0, codeblock.tbx0);
+      codeblock.tby0_ = Math.max(subband.tby0, codeblock.tby0);
+      codeblock.tbx1_ = Math.min(subband.tbx1, codeblock.tbx1);
+      codeblock.tby1_ = Math.min(subband.tby1, codeblock.tby1);
+      const pi = Math.floor((codeblock.tbx0_ - subband.tbx0) / precinctParameters.precinctWidthInSubband);
+      const pj = Math.floor((codeblock.tby0_ - subband.tby0) / precinctParameters.precinctHeightInSubband);
+      precinctNumber = pi + pj * precinctParameters.numprecinctswide;
+      codeblock.precinctNumber = precinctNumber;
+      codeblock.subbandType = subband.type;
+      codeblock.Lblock = 3;
+
+      if (codeblock.tbx1_ <= codeblock.tbx0_ || codeblock.tby1_ <= codeblock.tby0_) {
+        continue;
+      }
+
+      codeblocks.push(codeblock);
+      let precinct = precincts[precinctNumber];
+
+      if (precinct !== undefined) {
+        if (i < precinct.cbxMin) {
+          precinct.cbxMin = i;
+        } else if (i > precinct.cbxMax) {
+          precinct.cbxMax = i;
+        }
+
+        if (j < precinct.cbyMin) {
+          precinct.cbxMin = j;
+        } else if (j > precinct.cbyMax) {
+          precinct.cbyMax = j;
+        }
+      } else {
+        precincts[precinctNumber] = precinct = {
+          cbxMin: i,
+          cbyMin: j,
+          cbxMax: i,
+          cbyMax: j
+        };
+      }
+
+      codeblock.precinct = precinct;
+    }
+  }
+
+  subband.codeblockParameters = {
+    codeblockWidth: xcb_,
+    codeblockHeight: ycb_,
+    numcodeblockwide: cbx1 - cbx0 + 1,
+    numcodeblockhigh: cby1 - cby0 + 1
+  };
+  subband.codeblocks = codeblocks;
+  subband.precincts = precincts;
+}
+
+function createPacket(resolution, precinctNumber, layerNumber) {
+  const precinctCodeblocks = [];
+  const subbands = resolution.subbands;
+
+  for (let i = 0, ii = subbands.length; i < ii; i++) {
+    const subband = subbands[i];
+    const codeblocks = subband.codeblocks;
+
+    for (let j = 0, jj = codeblocks.length; j < jj; j++) {
+      const codeblock = codeblocks[j];
+
+      if (codeblock.precinctNumber !== precinctNumber) {
+        continue;
+      }
+
+      precinctCodeblocks.push(codeblock);
+    }
+  }
+
+  return {
+    layerNumber,
+    codeblocks: precinctCodeblocks
+  };
+}
+
+function LayerResolutionComponentPositionIterator(context) {
+  const siz = context.SIZ;
+  const tileIndex = context.currentTile.index;
+  const tile = context.tiles[tileIndex];
+  const layersCount = tile.codingStyleDefaultParameters.layersCount;
+  const componentsCount = siz.Csiz;
+  let maxDecompositionLevelsCount = 0;
+
+  for (let q = 0; q < componentsCount; q++) {
+    maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount, tile.components[q].codingStyleParameters.decompositionLevelsCount);
+  }
+
+  let l = 0,
+      r = 0,
+      i = 0,
+      k = 0;
+
+  this.nextPacket = function JpxImage_nextPacket() {
+    for (; l < layersCount; l++) {
+      for (; r <= maxDecompositionLevelsCount; r++) {
+        for (; i < componentsCount; i++) {
+          const component = tile.components[i];
+
+          if (r > component.codingStyleParameters.decompositionLevelsCount) {
+            continue;
+          }
+
+          const resolution = component.resolutions[r];
+          const numprecincts = resolution.precinctParameters.numprecincts;
+
+          for (; k < numprecincts;) {
+            const packet = createPacket(resolution, k, l);
+            k++;
+            return packet;
+          }
+
+          k = 0;
+        }
+
+        i = 0;
+      }
+
+      r = 0;
+    }
+
+    throw new JpxError("Out of packets");
+  };
+}
+
+function ResolutionLayerComponentPositionIterator(context) {
+  const siz = context.SIZ;
+  const tileIndex = context.currentTile.index;
+  const tile = context.tiles[tileIndex];
+  const layersCount = tile.codingStyleDefaultParameters.layersCount;
+  const componentsCount = siz.Csiz;
+  let maxDecompositionLevelsCount = 0;
+
+  for (let q = 0; q < componentsCount; q++) {
+    maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount, tile.components[q].codingStyleParameters.decompositionLevelsCount);
+  }
+
+  let r = 0,
+      l = 0,
+      i = 0,
+      k = 0;
+
+  this.nextPacket = function JpxImage_nextPacket() {
+    for (; r <= maxDecompositionLevelsCount; r++) {
+      for (; l < layersCount; l++) {
+        for (; i < componentsCount; i++) {
+          const component = tile.components[i];
+
+          if (r > component.codingStyleParameters.decompositionLevelsCount) {
+            continue;
+          }
+
+          const resolution = component.resolutions[r];
+          const numprecincts = resolution.precinctParameters.numprecincts;
+
+          for (; k < numprecincts;) {
+            const packet = createPacket(resolution, k, l);
+            k++;
+            return packet;
+          }
+
+          k = 0;
+        }
+
+        i = 0;
+      }
+
+      l = 0;
+    }
+
+    throw new JpxError("Out of packets");
+  };
+}
+
+function ResolutionPositionComponentLayerIterator(context) {
+  const siz = context.SIZ;
+  const tileIndex = context.currentTile.index;
+  const tile = context.tiles[tileIndex];
+  const layersCount = tile.codingStyleDefaultParameters.layersCount;
+  const componentsCount = siz.Csiz;
+  let l, r, c, p;
+  let maxDecompositionLevelsCount = 0;
+
+  for (c = 0; c < componentsCount; c++) {
+    const component = tile.components[c];
+    maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount, component.codingStyleParameters.decompositionLevelsCount);
+  }
+
+  const maxNumPrecinctsInLevel = new Int32Array(maxDecompositionLevelsCount + 1);
+
+  for (r = 0; r <= maxDecompositionLevelsCount; ++r) {
+    let maxNumPrecincts = 0;
+
+    for (c = 0; c < componentsCount; ++c) {
+      const resolutions = tile.components[c].resolutions;
+
+      if (r < resolutions.length) {
+        maxNumPrecincts = Math.max(maxNumPrecincts, resolutions[r].precinctParameters.numprecincts);
+      }
+    }
+
+    maxNumPrecinctsInLevel[r] = maxNumPrecincts;
+  }
+
+  l = 0;
+  r = 0;
+  c = 0;
+  p = 0;
+
+  this.nextPacket = function JpxImage_nextPacket() {
+    for (; r <= maxDecompositionLevelsCount; r++) {
+      for (; p < maxNumPrecinctsInLevel[r]; p++) {
+        for (; c < componentsCount; c++) {
+          const component = tile.components[c];
+
+          if (r > component.codingStyleParameters.decompositionLevelsCount) {
+            continue;
+          }
+
+          const resolution = component.resolutions[r];
+          const numprecincts = resolution.precinctParameters.numprecincts;
+
+          if (p >= numprecincts) {
+            continue;
+          }
+
+          for (; l < layersCount;) {
+            const packet = createPacket(resolution, p, l);
+            l++;
+            return packet;
+          }
+
+          l = 0;
+        }
+
+        c = 0;
+      }
+
+      p = 0;
+    }
+
+    throw new JpxError("Out of packets");
+  };
+}
+
+function PositionComponentResolutionLayerIterator(context) {
+  const siz = context.SIZ;
+  const tileIndex = context.currentTile.index;
+  const tile = context.tiles[tileIndex];
+  const layersCount = tile.codingStyleDefaultParameters.layersCount;
+  const componentsCount = siz.Csiz;
+  const precinctsSizes = getPrecinctSizesInImageScale(tile);
+  const precinctsIterationSizes = precinctsSizes;
+  let l = 0,
+      r = 0,
+      c = 0,
+      px = 0,
+      py = 0;
+
+  this.nextPacket = function JpxImage_nextPacket() {
+    for (; py < precinctsIterationSizes.maxNumHigh; py++) {
+      for (; px < precinctsIterationSizes.maxNumWide; px++) {
+        for (; c < componentsCount; c++) {
+          const component = tile.components[c];
+          const decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
+
+          for (; r <= decompositionLevelsCount; r++) {
+            const resolution = component.resolutions[r];
+            const sizeInImageScale = precinctsSizes.components[c].resolutions[r];
+            const k = getPrecinctIndexIfExist(px, py, sizeInImageScale, precinctsIterationSizes, resolution);
+
+            if (k === null) {
+              continue;
+            }
+
+            for (; l < layersCount;) {
+              const packet = createPacket(resolution, k, l);
+              l++;
+              return packet;
+            }
+
+            l = 0;
+          }
+
+          r = 0;
+        }
+
+        c = 0;
+      }
+
+      px = 0;
+    }
+
+    throw new JpxError("Out of packets");
+  };
+}
+
+function ComponentPositionResolutionLayerIterator(context) {
+  const siz = context.SIZ;
+  const tileIndex = context.currentTile.index;
+  const tile = context.tiles[tileIndex];
+  const layersCount = tile.codingStyleDefaultParameters.layersCount;
+  const componentsCount = siz.Csiz;
+  const precinctsSizes = getPrecinctSizesInImageScale(tile);
+  let l = 0,
+      r = 0,
+      c = 0,
+      px = 0,
+      py = 0;
+
+  this.nextPacket = function JpxImage_nextPacket() {
+    for (; c < componentsCount; ++c) {
+      const component = tile.components[c];
+      const precinctsIterationSizes = precinctsSizes.components[c];
+      const decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
+
+      for (; py < precinctsIterationSizes.maxNumHigh; py++) {
+        for (; px < precinctsIterationSizes.maxNumWide; px++) {
+          for (; r <= decompositionLevelsCount; r++) {
+            const resolution = component.resolutions[r];
+            const sizeInImageScale = precinctsIterationSizes.resolutions[r];
+            const k = getPrecinctIndexIfExist(px, py, sizeInImageScale, precinctsIterationSizes, resolution);
+
+            if (k === null) {
+              continue;
+            }
+
+            for (; l < layersCount;) {
+              const packet = createPacket(resolution, k, l);
+              l++;
+              return packet;
+            }
+
+            l = 0;
+          }
+
+          r = 0;
+        }
+
+        px = 0;
+      }
+
+      py = 0;
+    }
+
+    throw new JpxError("Out of packets");
+  };
+}
+
+function getPrecinctIndexIfExist(pxIndex, pyIndex, sizeInImageScale, precinctIterationSizes, resolution) {
+  const posX = pxIndex * precinctIterationSizes.minWidth;
+  const posY = pyIndex * precinctIterationSizes.minHeight;
+
+  if (posX % sizeInImageScale.width !== 0 || posY % sizeInImageScale.height !== 0) {
+    return null;
+  }
+
+  const startPrecinctRowIndex = posY / sizeInImageScale.width * resolution.precinctParameters.numprecinctswide;
+  return posX / sizeInImageScale.height + startPrecinctRowIndex;
+}
+
+function getPrecinctSizesInImageScale(tile) {
+  const componentsCount = tile.components.length;
+  let minWidth = Number.MAX_VALUE;
+  let minHeight = Number.MAX_VALUE;
+  let maxNumWide = 0;
+  let maxNumHigh = 0;
+  const sizePerComponent = new Array(componentsCount);
+
+  for (let c = 0; c < componentsCount; c++) {
+    const component = tile.components[c];
+    const decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
+    const sizePerResolution = new Array(decompositionLevelsCount + 1);
+    let minWidthCurrentComponent = Number.MAX_VALUE;
+    let minHeightCurrentComponent = Number.MAX_VALUE;
+    let maxNumWideCurrentComponent = 0;
+    let maxNumHighCurrentComponent = 0;
+    let scale = 1;
+
+    for (let r = decompositionLevelsCount; r >= 0; --r) {
+      const resolution = component.resolutions[r];
+      const widthCurrentResolution = scale * resolution.precinctParameters.precinctWidth;
+      const heightCurrentResolution = scale * resolution.precinctParameters.precinctHeight;
+      minWidthCurrentComponent = Math.min(minWidthCurrentComponent, widthCurrentResolution);
+      minHeightCurrentComponent = Math.min(minHeightCurrentComponent, heightCurrentResolution);
+      maxNumWideCurrentComponent = Math.max(maxNumWideCurrentComponent, resolution.precinctParameters.numprecinctswide);
+      maxNumHighCurrentComponent = Math.max(maxNumHighCurrentComponent, resolution.precinctParameters.numprecinctshigh);
+      sizePerResolution[r] = {
+        width: widthCurrentResolution,
+        height: heightCurrentResolution
+      };
+      scale <<= 1;
+    }
+
+    minWidth = Math.min(minWidth, minWidthCurrentComponent);
+    minHeight = Math.min(minHeight, minHeightCurrentComponent);
+    maxNumWide = Math.max(maxNumWide, maxNumWideCurrentComponent);
+    maxNumHigh = Math.max(maxNumHigh, maxNumHighCurrentComponent);
+    sizePerComponent[c] = {
+      resolutions: sizePerResolution,
+      minWidth: minWidthCurrentComponent,
+      minHeight: minHeightCurrentComponent,
+      maxNumWide: maxNumWideCurrentComponent,
+      maxNumHigh: maxNumHighCurrentComponent
+    };
+  }
+
+  return {
+    components: sizePerComponent,
+    minWidth,
+    minHeight,
+    maxNumWide,
+    maxNumHigh
+  };
+}
+
+function buildPackets(context) {
+  const siz = context.SIZ;
+  const tileIndex = context.currentTile.index;
+  const tile = context.tiles[tileIndex];
+  const componentsCount = siz.Csiz;
+
+  for (let c = 0; c < componentsCount; c++) {
+    const component = tile.components[c];
+    const decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
+    const resolutions = [];
+    const subbands = [];
+
+    for (let r = 0; r <= decompositionLevelsCount; r++) {
+      const blocksDimensions = getBlocksDimensions(context, component, r);
+      const resolution = {};
+      const scale = 1 << decompositionLevelsCount - r;
+      resolution.trx0 = Math.ceil(component.tcx0 / scale);
+      resolution.try0 = Math.ceil(component.tcy0 / scale);
+      resolution.trx1 = Math.ceil(component.tcx1 / scale);
+      resolution.try1 = Math.ceil(component.tcy1 / scale);
+      resolution.resLevel = r;
+      buildPrecincts(context, resolution, blocksDimensions);
+      resolutions.push(resolution);
+      let subband;
+
+      if (r === 0) {
+        subband = {};
+        subband.type = "LL";
+        subband.tbx0 = Math.ceil(component.tcx0 / scale);
+        subband.tby0 = Math.ceil(component.tcy0 / scale);
+        subband.tbx1 = Math.ceil(component.tcx1 / scale);
+        subband.tby1 = Math.ceil(component.tcy1 / scale);
+        subband.resolution = resolution;
+        buildCodeblocks(context, subband, blocksDimensions);
+        subbands.push(subband);
+        resolution.subbands = [subband];
+      } else {
+        const bscale = 1 << decompositionLevelsCount - r + 1;
+        const resolutionSubbands = [];
+        subband = {};
+        subband.type = "HL";
+        subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
+        subband.tby0 = Math.ceil(component.tcy0 / bscale);
+        subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
+        subband.tby1 = Math.ceil(component.tcy1 / bscale);
+        subband.resolution = resolution;
+        buildCodeblocks(context, subband, blocksDimensions);
+        subbands.push(subband);
+        resolutionSubbands.push(subband);
+        subband = {};
+        subband.type = "LH";
+        subband.tbx0 = Math.ceil(component.tcx0 / bscale);
+        subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
+        subband.tbx1 = Math.ceil(component.tcx1 / bscale);
+        subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
+        subband.resolution = resolution;
+        buildCodeblocks(context, subband, blocksDimensions);
+        subbands.push(subband);
+        resolutionSubbands.push(subband);
+        subband = {};
+        subband.type = "HH";
+        subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
+        subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
+        subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
+        subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
+        subband.resolution = resolution;
+        buildCodeblocks(context, subband, blocksDimensions);
+        subbands.push(subband);
+        resolutionSubbands.push(subband);
+        resolution.subbands = resolutionSubbands;
+      }
+    }
+
+    component.resolutions = resolutions;
+    component.subbands = subbands;
+  }
+
+  const progressionOrder = tile.codingStyleDefaultParameters.progressionOrder;
+
+  switch (progressionOrder) {
+    case 0:
+      tile.packetsIterator = new LayerResolutionComponentPositionIterator(context);
+      break;
+
+    case 1:
+      tile.packetsIterator = new ResolutionLayerComponentPositionIterator(context);
+      break;
+
+    case 2:
+      tile.packetsIterator = new ResolutionPositionComponentLayerIterator(context);
+      break;
+
+    case 3:
+      tile.packetsIterator = new PositionComponentResolutionLayerIterator(context);
+      break;
+
+    case 4:
+      tile.packetsIterator = new ComponentPositionResolutionLayerIterator(context);
+      break;
+
+    default:
+      throw new JpxError(`Unsupported progression order ${progressionOrder}`);
+  }
+}
+
+function parseTilePackets(context, data, offset, dataLength) {
+  let position = 0;
+  let buffer,
+      bufferSize = 0,
+      skipNextBit = false;
+
+  function readBits(count) {
+    while (bufferSize < count) {
+      const b = data[offset + position];
+      position++;
+
+      if (skipNextBit) {
+        buffer = buffer << 7 | b;
+        bufferSize += 7;
+        skipNextBit = false;
+      } else {
+        buffer = buffer << 8 | b;
+        bufferSize += 8;
+      }
+
+      if (b === 0xff) {
+        skipNextBit = true;
+      }
+    }
+
+    bufferSize -= count;
+    return buffer >>> bufferSize & (1 << count) - 1;
+  }
+
+  function skipMarkerIfEqual(value) {
+    if (data[offset + position - 1] === 0xff && data[offset + position] === value) {
+      skipBytes(1);
+      return true;
+    } else if (data[offset + position] === 0xff && data[offset + position + 1] === value) {
+      skipBytes(2);
+      return true;
+    }
+
+    return false;
+  }
+
+  function skipBytes(count) {
+    position += count;
+  }
+
+  function alignToByte() {
+    bufferSize = 0;
+
+    if (skipNextBit) {
+      position++;
+      skipNextBit = false;
+    }
+  }
+
+  function readCodingpasses() {
+    if (readBits(1) === 0) {
+      return 1;
+    }
+
+    if (readBits(1) === 0) {
+      return 2;
+    }
+
+    let value = readBits(2);
+
+    if (value < 3) {
+      return value + 3;
+    }
+
+    value = readBits(5);
+
+    if (value < 31) {
+      return value + 6;
+    }
+
+    value = readBits(7);
+    return value + 37;
+  }
+
+  const tileIndex = context.currentTile.index;
+  const tile = context.tiles[tileIndex];
+  const sopMarkerUsed = context.COD.sopMarkerUsed;
+  const ephMarkerUsed = context.COD.ephMarkerUsed;
+  const packetsIterator = tile.packetsIterator;
+
+  while (position < dataLength) {
+    alignToByte();
+
+    if (sopMarkerUsed && skipMarkerIfEqual(0x91)) {
+      skipBytes(4);
+    }
+
+    const packet = packetsIterator.nextPacket();
+
+    if (!readBits(1)) {
+      continue;
+    }
+
+    const layerNumber = packet.layerNumber,
+          queue = [];
+    let codeblock;
+
+    for (let i = 0, ii = packet.codeblocks.length; i < ii; i++) {
+      codeblock = packet.codeblocks[i];
+      let precinct = codeblock.precinct;
+      const codeblockColumn = codeblock.cbx - precinct.cbxMin;
+      const codeblockRow = codeblock.cby - precinct.cbyMin;
+      let codeblockIncluded = false;
+      let firstTimeInclusion = false;
+      let valueReady, zeroBitPlanesTree;
+
+      if (codeblock.included !== undefined) {
+        codeblockIncluded = !!readBits(1);
+      } else {
+        precinct = codeblock.precinct;
+        let inclusionTree;
+
+        if (precinct.inclusionTree !== undefined) {
+          inclusionTree = precinct.inclusionTree;
+        } else {
+          const width = precinct.cbxMax - precinct.cbxMin + 1;
+          const height = precinct.cbyMax - precinct.cbyMin + 1;
+          inclusionTree = new InclusionTree(width, height, layerNumber);
+          zeroBitPlanesTree = new TagTree(width, height);
+          precinct.inclusionTree = inclusionTree;
+          precinct.zeroBitPlanesTree = zeroBitPlanesTree;
+
+          for (let l = 0; l < layerNumber; l++) {
+            if (readBits(1) !== 0) {
+              throw new JpxError("Invalid tag tree");
+            }
+          }
+        }
+
+        if (inclusionTree.reset(codeblockColumn, codeblockRow, layerNumber)) {
+          while (true) {
+            if (readBits(1)) {
+              valueReady = !inclusionTree.nextLevel();
+
+              if (valueReady) {
+                codeblock.included = true;
+                codeblockIncluded = firstTimeInclusion = true;
+                break;
+              }
+            } else {
+              inclusionTree.incrementValue(layerNumber);
+              break;
+            }
+          }
+        }
+      }
+
+      if (!codeblockIncluded) {
+        continue;
+      }
+
+      if (firstTimeInclusion) {
+        zeroBitPlanesTree = precinct.zeroBitPlanesTree;
+        zeroBitPlanesTree.reset(codeblockColumn, codeblockRow);
+
+        while (true) {
+          if (readBits(1)) {
+            valueReady = !zeroBitPlanesTree.nextLevel();
+
+            if (valueReady) {
+              break;
+            }
+          } else {
+            zeroBitPlanesTree.incrementValue();
+          }
+        }
+
+        codeblock.zeroBitPlanes = zeroBitPlanesTree.value;
+      }
+
+      const codingpasses = readCodingpasses();
+
+      while (readBits(1)) {
+        codeblock.Lblock++;
+      }
+
+      const codingpassesLog2 = (0, _core_utils.log2)(codingpasses);
+      const bits = (codingpasses < 1 << codingpassesLog2 ? codingpassesLog2 - 1 : codingpassesLog2) + codeblock.Lblock;
+      const codedDataLength = readBits(bits);
+      queue.push({
+        codeblock,
+        codingpasses,
+        dataLength: codedDataLength
+      });
+    }
+
+    alignToByte();
+
+    if (ephMarkerUsed) {
+      skipMarkerIfEqual(0x92);
+    }
+
+    while (queue.length > 0) {
+      const packetItem = queue.shift();
+      codeblock = packetItem.codeblock;
+
+      if (codeblock.data === undefined) {
+        codeblock.data = [];
+      }
+
+      codeblock.data.push({
+        data,
+        start: offset + position,
+        end: offset + position + packetItem.dataLength,
+        codingpasses: packetItem.codingpasses
+      });
+      position += packetItem.dataLength;
+    }
+  }
+
+  return position;
+}
+
+function copyCoefficients(coefficients, levelWidth, levelHeight, subband, delta, mb, reversible, segmentationSymbolUsed, resetContextProbabilities) {
+  const x0 = subband.tbx0;
+  const y0 = subband.tby0;
+  const width = subband.tbx1 - subband.tbx0;
+  const codeblocks = subband.codeblocks;
+  const right = subband.type.charAt(0) === "H" ? 1 : 0;
+  const bottom = subband.type.charAt(1) === "H" ? levelWidth : 0;
+
+  for (let i = 0, ii = codeblocks.length; i < ii; ++i) {
+    const codeblock = codeblocks[i];
+    const blockWidth = codeblock.tbx1_ - codeblock.tbx0_;
+    const blockHeight = codeblock.tby1_ - codeblock.tby0_;
+
+    if (blockWidth === 0 || blockHeight === 0) {
+      continue;
+    }
+
+    if (codeblock.data === undefined) {
+      continue;
+    }
+
+    const bitModel = new BitModel(blockWidth, blockHeight, codeblock.subbandType, codeblock.zeroBitPlanes, mb);
+    let currentCodingpassType = 2;
+    const data = codeblock.data;
+    let totalLength = 0,
+        codingpasses = 0;
+    let j, jj, dataItem;
+
+    for (j = 0, jj = data.length; j < jj; j++) {
+      dataItem = data[j];
+      totalLength += dataItem.end - dataItem.start;
+      codingpasses += dataItem.codingpasses;
+    }
+
+    const encodedData = new Uint8Array(totalLength);
+    let position = 0;
+
+    for (j = 0, jj = data.length; j < jj; j++) {
+      dataItem = data[j];
+      const chunk = dataItem.data.subarray(dataItem.start, dataItem.end);
+      encodedData.set(chunk, position);
+      position += chunk.length;
+    }
+
+    const decoder = new _arithmetic_decoder.ArithmeticDecoder(encodedData, 0, totalLength);
+    bitModel.setDecoder(decoder);
+
+    for (j = 0; j < codingpasses; j++) {
+      switch (currentCodingpassType) {
+        case 0:
+          bitModel.runSignificancePropagationPass();
+          break;
+
+        case 1:
+          bitModel.runMagnitudeRefinementPass();
+          break;
+
+        case 2:
+          bitModel.runCleanupPass();
+
+          if (segmentationSymbolUsed) {
+            bitModel.checkSegmentationSymbol();
+          }
+
+          break;
+      }
+
+      if (resetContextProbabilities) {
+        bitModel.reset();
+      }
+
+      currentCodingpassType = (currentCodingpassType + 1) % 3;
+    }
+
+    let offset = codeblock.tbx0_ - x0 + (codeblock.tby0_ - y0) * width;
+    const sign = bitModel.coefficentsSign;
+    const magnitude = bitModel.coefficentsMagnitude;
+    const bitsDecoded = bitModel.bitsDecoded;
+    const magnitudeCorrection = reversible ? 0 : 0.5;
+    let k, n, nb;
+    position = 0;
+    const interleave = subband.type !== "LL";
+
+    for (j = 0; j < blockHeight; j++) {
+      const row = offset / width | 0;
+      const levelOffset = 2 * row * (levelWidth - width) + right + bottom;
+
+      for (k = 0; k < blockWidth; k++) {
+        n = magnitude[position];
+
+        if (n !== 0) {
+          n = (n + magnitudeCorrection) * delta;
+
+          if (sign[position] !== 0) {
+            n = -n;
+          }
+
+          nb = bitsDecoded[position];
+          const pos = interleave ? levelOffset + (offset << 1) : offset;
+
+          if (reversible && nb >= mb) {
+            coefficients[pos] = n;
+          } else {
+            coefficients[pos] = n * (1 << mb - nb);
+          }
+        }
+
+        offset++;
+        position++;
+      }
+
+      offset += width - blockWidth;
+    }
+  }
+}
+
+function transformTile(context, tile, c) {
+  const component = tile.components[c];
+  const codingStyleParameters = component.codingStyleParameters;
+  const quantizationParameters = component.quantizationParameters;
+  const decompositionLevelsCount = codingStyleParameters.decompositionLevelsCount;
+  const spqcds = quantizationParameters.SPqcds;
+  const scalarExpounded = quantizationParameters.scalarExpounded;
+  const guardBits = quantizationParameters.guardBits;
+  const segmentationSymbolUsed = codingStyleParameters.segmentationSymbolUsed;
+  const resetContextProbabilities = codingStyleParameters.resetContextProbabilities;
+  const precision = context.components[c].precision;
+  const reversible = codingStyleParameters.reversibleTransformation;
+  const transform = reversible ? new ReversibleTransform() : new IrreversibleTransform();
+  const subbandCoefficients = [];
+  let b = 0;
+
+  for (let i = 0; i <= decompositionLevelsCount; i++) {
+    const resolution = component.resolutions[i];
+    const width = resolution.trx1 - resolution.trx0;
+    const height = resolution.try1 - resolution.try0;
+    const coefficients = new Float32Array(width * height);
+
+    for (let j = 0, jj = resolution.subbands.length; j < jj; j++) {
+      let mu, epsilon;
+
+      if (!scalarExpounded) {
+        mu = spqcds[0].mu;
+        epsilon = spqcds[0].epsilon + (i > 0 ? 1 - i : 0);
+      } else {
+        mu = spqcds[b].mu;
+        epsilon = spqcds[b].epsilon;
+        b++;
+      }
+
+      const subband = resolution.subbands[j];
+      const gainLog2 = SubbandsGainLog2[subband.type];
+      const delta = reversible ? 1 : 2 ** (precision + gainLog2 - epsilon) * (1 + mu / 2048);
+      const mb = guardBits + epsilon - 1;
+      copyCoefficients(coefficients, width, height, subband, delta, mb, reversible, segmentationSymbolUsed, resetContextProbabilities);
+    }
+
+    subbandCoefficients.push({
+      width,
+      height,
+      items: coefficients
+    });
+  }
+
+  const result = transform.calculate(subbandCoefficients, component.tcx0, component.tcy0);
+  return {
+    left: component.tcx0,
+    top: component.tcy0,
+    width: result.width,
+    height: result.height,
+    items: result.items
+  };
+}
+
+function transformComponents(context) {
+  const siz = context.SIZ;
+  const components = context.components;
+  const componentsCount = siz.Csiz;
+  const resultImages = [];
+
+  for (let i = 0, ii = context.tiles.length; i < ii; i++) {
+    const tile = context.tiles[i];
+    const transformedTiles = [];
+
+    for (let c = 0; c < componentsCount; c++) {
+      transformedTiles[c] = transformTile(context, tile, c);
+    }
+
+    const tile0 = transformedTiles[0];
+    const out = new Uint8ClampedArray(tile0.items.length * componentsCount);
+    const result = {
+      left: tile0.left,
+      top: tile0.top,
+      width: tile0.width,
+      height: tile0.height,
+      items: out
+    };
+    let shift, offset;
+    let pos = 0,
+        j,
+        jj,
+        y0,
+        y1,
+        y2;
+
+    if (tile.codingStyleDefaultParameters.multipleComponentTransform) {
+      const fourComponents = componentsCount === 4;
+      const y0items = transformedTiles[0].items;
+      const y1items = transformedTiles[1].items;
+      const y2items = transformedTiles[2].items;
+      const y3items = fourComponents ? transformedTiles[3].items : null;
+      shift = components[0].precision - 8;
+      offset = (128 << shift) + 0.5;
+      const component0 = tile.components[0];
+      const alpha01 = componentsCount - 3;
+      jj = y0items.length;
+
+      if (!component0.codingStyleParameters.reversibleTransformation) {
+        for (j = 0; j < jj; j++, pos += alpha01) {
+          y0 = y0items[j] + offset;
+          y1 = y1items[j];
+          y2 = y2items[j];
+          out[pos++] = y0 + 1.402 * y2 >> shift;
+          out[pos++] = y0 - 0.34413 * y1 - 0.71414 * y2 >> shift;
+          out[pos++] = y0 + 1.772 * y1 >> shift;
+        }
+      } else {
+        for (j = 0; j < jj; j++, pos += alpha01) {
+          y0 = y0items[j] + offset;
+          y1 = y1items[j];
+          y2 = y2items[j];
+          const g = y0 - (y2 + y1 >> 2);
+          out[pos++] = g + y2 >> shift;
+          out[pos++] = g >> shift;
+          out[pos++] = g + y1 >> shift;
+        }
+      }
+
+      if (fourComponents) {
+        for (j = 0, pos = 3; j < jj; j++, pos += 4) {
+          out[pos] = y3items[j] + offset >> shift;
+        }
+      }
+    } else {
+      for (let c = 0; c < componentsCount; c++) {
+        const items = transformedTiles[c].items;
+        shift = components[c].precision - 8;
+        offset = (128 << shift) + 0.5;
+
+        for (pos = c, j = 0, jj = items.length; j < jj; j++) {
+          out[pos] = items[j] + offset >> shift;
+          pos += componentsCount;
+        }
+      }
+    }
+
+    resultImages.push(result);
+  }
+
+  return resultImages;
+}
+
+function initializeTile(context, tileIndex) {
+  const siz = context.SIZ;
+  const componentsCount = siz.Csiz;
+  const tile = context.tiles[tileIndex];
+
+  for (let c = 0; c < componentsCount; c++) {
+    const component = tile.components[c];
+    const qcdOrQcc = context.currentTile.QCC[c] !== undefined ? context.currentTile.QCC[c] : context.currentTile.QCD;
+    component.quantizationParameters = qcdOrQcc;
+    const codOrCoc = context.currentTile.COC[c] !== undefined ? context.currentTile.COC[c] : context.currentTile.COD;
+    component.codingStyleParameters = codOrCoc;
+  }
+
+  tile.codingStyleDefaultParameters = context.currentTile.COD;
+}
+
+class TagTree {
+  constructor(width, height) {
+    const levelsLength = (0, _core_utils.log2)(Math.max(width, height)) + 1;
+    this.levels = [];
+
+    for (let i = 0; i < levelsLength; i++) {
+      const level = {
+        width,
+        height,
+        items: []
+      };
+      this.levels.push(level);
+      width = Math.ceil(width / 2);
+      height = Math.ceil(height / 2);
+    }
+  }
+
+  reset(i, j) {
+    let currentLevel = 0,
+        value = 0,
+        level;
+
+    while (currentLevel < this.levels.length) {
+      level = this.levels[currentLevel];
+      const index = i + j * level.width;
+
+      if (level.items[index] !== undefined) {
+        value = level.items[index];
+        break;
+      }
+
+      level.index = index;
+      i >>= 1;
+      j >>= 1;
+      currentLevel++;
+    }
+
+    currentLevel--;
+    level = this.levels[currentLevel];
+    level.items[level.index] = value;
+    this.currentLevel = currentLevel;
+    delete this.value;
+  }
+
+  incrementValue() {
+    const level = this.levels[this.currentLevel];
+    level.items[level.index]++;
+  }
+
+  nextLevel() {
+    let currentLevel = this.currentLevel;
+    let level = this.levels[currentLevel];
+    const value = level.items[level.index];
+    currentLevel--;
+
+    if (currentLevel < 0) {
+      this.value = value;
+      return false;
+    }
+
+    this.currentLevel = currentLevel;
+    level = this.levels[currentLevel];
+    level.items[level.index] = value;
+    return true;
+  }
+
+}
+
+class InclusionTree {
+  constructor(width, height, defaultValue) {
+    const levelsLength = (0, _core_utils.log2)(Math.max(width, height)) + 1;
+    this.levels = [];
+
+    for (let i = 0; i < levelsLength; i++) {
+      const items = new Uint8Array(width * height);
+
+      for (let j = 0, jj = items.length; j < jj; j++) {
+        items[j] = defaultValue;
+      }
+
+      const level = {
+        width,
+        height,
+        items
+      };
+      this.levels.push(level);
+      width = Math.ceil(width / 2);
+      height = Math.ceil(height / 2);
+    }
+  }
+
+  reset(i, j, stopValue) {
+    let currentLevel = 0;
+
+    while (currentLevel < this.levels.length) {
+      const level = this.levels[currentLevel];
+      const index = i + j * level.width;
+      level.index = index;
+      const value = level.items[index];
+
+      if (value === 0xff) {
+        break;
+      }
+
+      if (value > stopValue) {
+        this.currentLevel = currentLevel;
+        this.propagateValues();
+        return false;
+      }
+
+      i >>= 1;
+      j >>= 1;
+      currentLevel++;
+    }
+
+    this.currentLevel = currentLevel - 1;
+    return true;
+  }
+
+  incrementValue(stopValue) {
+    const level = this.levels[this.currentLevel];
+    level.items[level.index] = stopValue + 1;
+    this.propagateValues();
+  }
+
+  propagateValues() {
+    let levelIndex = this.currentLevel;
+    let level = this.levels[levelIndex];
+    const currentValue = level.items[level.index];
+
+    while (--levelIndex >= 0) {
+      level = this.levels[levelIndex];
+      level.items[level.index] = currentValue;
+    }
+  }
+
+  nextLevel() {
+    let currentLevel = this.currentLevel;
+    let level = this.levels[currentLevel];
+    const value = level.items[level.index];
+    level.items[level.index] = 0xff;
+    currentLevel--;
+
+    if (currentLevel < 0) {
+      return false;
+    }
+
+    this.currentLevel = currentLevel;
+    level = this.levels[currentLevel];
+    level.items[level.index] = value;
+    return true;
+  }
+
+}
+
+const BitModel = function BitModelClosure() {
+  const UNIFORM_CONTEXT = 17;
+  const RUNLENGTH_CONTEXT = 18;
+  const LLAndLHContextsLabel = new Uint8Array([0, 5, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 1, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8]);
+  const HLContextLabel = new Uint8Array([0, 3, 4, 0, 5, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 1, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8]);
+  const HHContextLabel = new Uint8Array([0, 1, 2, 0, 1, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 3, 4, 5, 0, 4, 5, 5, 0, 5, 5, 5, 0, 0, 0, 0, 0, 6, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8]);
+
+  class BitModel {
+    constructor(width, height, subband, zeroBitPlanes, mb) {
+      this.width = width;
+      this.height = height;
+      let contextLabelTable;
+
+      if (subband === "HH") {
+        contextLabelTable = HHContextLabel;
+      } else if (subband === "HL") {
+        contextLabelTable = HLContextLabel;
+      } else {
+        contextLabelTable = LLAndLHContextsLabel;
+      }
+
+      this.contextLabelTable = contextLabelTable;
+      const coefficientCount = width * height;
+      this.neighborsSignificance = new Uint8Array(coefficientCount);
+      this.coefficentsSign = new Uint8Array(coefficientCount);
+      let coefficentsMagnitude;
+
+      if (mb > 14) {
+        coefficentsMagnitude = new Uint32Array(coefficientCount);
+      } else if (mb > 6) {
+        coefficentsMagnitude = new Uint16Array(coefficientCount);
+      } else {
+        coefficentsMagnitude = new Uint8Array(coefficientCount);
+      }
+
+      this.coefficentsMagnitude = coefficentsMagnitude;
+      this.processingFlags = new Uint8Array(coefficientCount);
+      const bitsDecoded = new Uint8Array(coefficientCount);
+
+      if (zeroBitPlanes !== 0) {
+        for (let i = 0; i < coefficientCount; i++) {
+          bitsDecoded[i] = zeroBitPlanes;
+        }
+      }
+
+      this.bitsDecoded = bitsDecoded;
+      this.reset();
+    }
+
+    setDecoder(decoder) {
+      this.decoder = decoder;
+    }
+
+    reset() {
+      this.contexts = new Int8Array(19);
+      this.contexts[0] = 4 << 1 | 0;
+      this.contexts[UNIFORM_CONTEXT] = 46 << 1 | 0;
+      this.contexts[RUNLENGTH_CONTEXT] = 3 << 1 | 0;
+    }
+
+    setNeighborsSignificance(row, column, index) {
+      const neighborsSignificance = this.neighborsSignificance;
+      const width = this.width,
+            height = this.height;
+      const left = column > 0;
+      const right = column + 1 < width;
+      let i;
+
+      if (row > 0) {
+        i = index - width;
+
+        if (left) {
+          neighborsSignificance[i - 1] += 0x10;
+        }
+
+        if (right) {
+          neighborsSignificance[i + 1] += 0x10;
+        }
+
+        neighborsSignificance[i] += 0x04;
+      }
+
+      if (row + 1 < height) {
+        i = index + width;
+
+        if (left) {
+          neighborsSignificance[i - 1] += 0x10;
+        }
+
+        if (right) {
+          neighborsSignificance[i + 1] += 0x10;
+        }
+
+        neighborsSignificance[i] += 0x04;
+      }
+
+      if (left) {
+        neighborsSignificance[index - 1] += 0x01;
+      }
+
+      if (right) {
+        neighborsSignificance[index + 1] += 0x01;
+      }
+
+      neighborsSignificance[index] |= 0x80;
+    }
+
+    runSignificancePropagationPass() {
+      const decoder = this.decoder;
+      const width = this.width,
+            height = this.height;
+      const coefficentsMagnitude = this.coefficentsMagnitude;
+      const coefficentsSign = this.coefficentsSign;
+      const neighborsSignificance = this.neighborsSignificance;
+      const processingFlags = this.processingFlags;
+      const contexts = this.contexts;
+      const labels = this.contextLabelTable;
+      const bitsDecoded = this.bitsDecoded;
+      const processedInverseMask = ~1;
+      const processedMask = 1;
+      const firstMagnitudeBitMask = 2;
+
+      for (let i0 = 0; i0 < height; i0 += 4) {
+        for (let j = 0; j < width; j++) {
+          let index = i0 * width + j;
+
+          for (let i1 = 0; i1 < 4; i1++, index += width) {
+            const i = i0 + i1;
+
+            if (i >= height) {
+              break;
+            }
+
+            processingFlags[index] &= processedInverseMask;
+
+            if (coefficentsMagnitude[index] || !neighborsSignificance[index]) {
+              continue;
+            }
+
+            const contextLabel = labels[neighborsSignificance[index]];
+            const decision = decoder.readBit(contexts, contextLabel);
+
+            if (decision) {
+              const sign = this.decodeSignBit(i, j, index);
+              coefficentsSign[index] = sign;
+              coefficentsMagnitude[index] = 1;
+              this.setNeighborsSignificance(i, j, index);
+              processingFlags[index] |= firstMagnitudeBitMask;
+            }
+
+            bitsDecoded[index]++;
+            processingFlags[index] |= processedMask;
+          }
+        }
+      }
+    }
+
+    decodeSignBit(row, column, index) {
+      const width = this.width,
+            height = this.height;
+      const coefficentsMagnitude = this.coefficentsMagnitude;
+      const coefficentsSign = this.coefficentsSign;
+      let contribution, sign0, sign1, significance1;
+      let contextLabel, decoded;
+      significance1 = column > 0 && coefficentsMagnitude[index - 1] !== 0;
+
+      if (column + 1 < width && coefficentsMagnitude[index + 1] !== 0) {
+        sign1 = coefficentsSign[index + 1];
+
+        if (significance1) {
+          sign0 = coefficentsSign[index - 1];
+          contribution = 1 - sign1 - sign0;
+        } else {
+          contribution = 1 - sign1 - sign1;
+        }
+      } else if (significance1) {
+        sign0 = coefficentsSign[index - 1];
+        contribution = 1 - sign0 - sign0;
+      } else {
+        contribution = 0;
+      }
+
+      const horizontalContribution = 3 * contribution;
+      significance1 = row > 0 && coefficentsMagnitude[index - width] !== 0;
+
+      if (row + 1 < height && coefficentsMagnitude[index + width] !== 0) {
+        sign1 = coefficentsSign[index + width];
+
+        if (significance1) {
+          sign0 = coefficentsSign[index - width];
+          contribution = 1 - sign1 - sign0 + horizontalContribution;
+        } else {
+          contribution = 1 - sign1 - sign1 + horizontalContribution;
+        }
+      } else if (significance1) {
+        sign0 = coefficentsSign[index - width];
+        contribution = 1 - sign0 - sign0 + horizontalContribution;
+      } else {
+        contribution = horizontalContribution;
+      }
+
+      if (contribution >= 0) {
+        contextLabel = 9 + contribution;
+        decoded = this.decoder.readBit(this.contexts, contextLabel);
+      } else {
+        contextLabel = 9 - contribution;
+        decoded = this.decoder.readBit(this.contexts, contextLabel) ^ 1;
+      }
+
+      return decoded;
+    }
+
+    runMagnitudeRefinementPass() {
+      const decoder = this.decoder;
+      const width = this.width,
+            height = this.height;
+      const coefficentsMagnitude = this.coefficentsMagnitude;
+      const neighborsSignificance = this.neighborsSignificance;
+      const contexts = this.contexts;
+      const bitsDecoded = this.bitsDecoded;
+      const processingFlags = this.processingFlags;
+      const processedMask = 1;
+      const firstMagnitudeBitMask = 2;
+      const length = width * height;
+      const width4 = width * 4;
+
+      for (let index0 = 0, indexNext; index0 < length; index0 = indexNext) {
+        indexNext = Math.min(length, index0 + width4);
+
+        for (let j = 0; j < width; j++) {
+          for (let index = index0 + j; index < indexNext; index += width) {
+            if (!coefficentsMagnitude[index] || (processingFlags[index] & processedMask) !== 0) {
+              continue;
+            }
+
+            let contextLabel = 16;
+
+            if ((processingFlags[index] & firstMagnitudeBitMask) !== 0) {
+              processingFlags[index] ^= firstMagnitudeBitMask;
+              const significance = neighborsSignificance[index] & 127;
+              contextLabel = significance === 0 ? 15 : 14;
+            }
+
+            const bit = decoder.readBit(contexts, contextLabel);
+            coefficentsMagnitude[index] = coefficentsMagnitude[index] << 1 | bit;
+            bitsDecoded[index]++;
+            processingFlags[index] |= processedMask;
+          }
+        }
+      }
+    }
+
+    runCleanupPass() {
+      const decoder = this.decoder;
+      const width = this.width,
+            height = this.height;
+      const neighborsSignificance = this.neighborsSignificance;
+      const coefficentsMagnitude = this.coefficentsMagnitude;
+      const coefficentsSign = this.coefficentsSign;
+      const contexts = this.contexts;
+      const labels = this.contextLabelTable;
+      const bitsDecoded = this.bitsDecoded;
+      const processingFlags = this.processingFlags;
+      const processedMask = 1;
+      const firstMagnitudeBitMask = 2;
+      const oneRowDown = width;
+      const twoRowsDown = width * 2;
+      const threeRowsDown = width * 3;
+      let iNext;
+
+      for (let i0 = 0; i0 < height; i0 = iNext) {
+        iNext = Math.min(i0 + 4, height);
+        const indexBase = i0 * width;
+        const checkAllEmpty = i0 + 3 < height;
+
+        for (let j = 0; j < width; j++) {
+          const index0 = indexBase + j;
+          const allEmpty = checkAllEmpty && processingFlags[index0] === 0 && processingFlags[index0 + oneRowDown] === 0 && processingFlags[index0 + twoRowsDown] === 0 && processingFlags[index0 + threeRowsDown] === 0 && neighborsSignificance[index0] === 0 && neighborsSignificance[index0 + oneRowDown] === 0 && neighborsSignificance[index0 + twoRowsDown] === 0 && neighborsSignificance[index0 + threeRowsDown] === 0;
+          let i1 = 0,
+              index = index0;
+          let i = i0,
+              sign;
+
+          if (allEmpty) {
+            const hasSignificantCoefficent = decoder.readBit(contexts, RUNLENGTH_CONTEXT);
+
+            if (!hasSignificantCoefficent) {
+              bitsDecoded[index0]++;
+              bitsDecoded[index0 + oneRowDown]++;
+              bitsDecoded[index0 + twoRowsDown]++;
+              bitsDecoded[index0 + threeRowsDown]++;
+              continue;
+            }
+
+            i1 = decoder.readBit(contexts, UNIFORM_CONTEXT) << 1 | decoder.readBit(contexts, UNIFORM_CONTEXT);
+
+            if (i1 !== 0) {
+              i = i0 + i1;
+              index += i1 * width;
+            }
+
+            sign = this.decodeSignBit(i, j, index);
+            coefficentsSign[index] = sign;
+            coefficentsMagnitude[index] = 1;
+            this.setNeighborsSignificance(i, j, index);
+            processingFlags[index] |= firstMagnitudeBitMask;
+            index = index0;
+
+            for (let i2 = i0; i2 <= i; i2++, index += width) {
+              bitsDecoded[index]++;
+            }
+
+            i1++;
+          }
+
+          for (i = i0 + i1; i < iNext; i++, index += width) {
+            if (coefficentsMagnitude[index] || (processingFlags[index] & processedMask) !== 0) {
+              continue;
+            }
+
+            const contextLabel = labels[neighborsSignificance[index]];
+            const decision = decoder.readBit(contexts, contextLabel);
+
+            if (decision === 1) {
+              sign = this.decodeSignBit(i, j, index);
+              coefficentsSign[index] = sign;
+              coefficentsMagnitude[index] = 1;
+              this.setNeighborsSignificance(i, j, index);
+              processingFlags[index] |= firstMagnitudeBitMask;
+            }
+
+            bitsDecoded[index]++;
+          }
+        }
+      }
+    }
+
+    checkSegmentationSymbol() {
+      const decoder = this.decoder;
+      const contexts = this.contexts;
+      const symbol = decoder.readBit(contexts, UNIFORM_CONTEXT) << 3 | decoder.readBit(contexts, UNIFORM_CONTEXT) << 2 | decoder.readBit(contexts, UNIFORM_CONTEXT) << 1 | decoder.readBit(contexts, UNIFORM_CONTEXT);
+
+      if (symbol !== 0xa) {
+        throw new JpxError("Invalid segmentation symbol");
+      }
+    }
+
+  }
+
+  return BitModel;
+}();
+
+class Transform {
+  constructor() {
+    if (this.constructor === Transform) {
+      (0, _util.unreachable)("Cannot initialize Transform.");
+    }
+  }
+
+  calculate(subbands, u0, v0) {
+    let ll = subbands[0];
+
+    for (let i = 1, ii = subbands.length; i < ii; i++) {
+      ll = this.iterate(ll, subbands[i], u0, v0);
+    }
+
+    return ll;
+  }
+
+  extend(buffer, offset, size) {
+    let i1 = offset - 1,
+        j1 = offset + 1;
+    let i2 = offset + size - 2,
+        j2 = offset + size;
+    buffer[i1--] = buffer[j1++];
+    buffer[j2++] = buffer[i2--];
+    buffer[i1--] = buffer[j1++];
+    buffer[j2++] = buffer[i2--];
+    buffer[i1--] = buffer[j1++];
+    buffer[j2++] = buffer[i2--];
+    buffer[i1] = buffer[j1];
+    buffer[j2] = buffer[i2];
+  }
+
+  filter(x, offset, length) {
+    (0, _util.unreachable)("Abstract method `filter` called");
+  }
+
+  iterate(ll, hl_lh_hh, u0, v0) {
+    const llWidth = ll.width,
+          llHeight = ll.height;
+    let llItems = ll.items;
+    const width = hl_lh_hh.width;
+    const height = hl_lh_hh.height;
+    const items = hl_lh_hh.items;
+    let i, j, k, l, u, v;
+
+    for (k = 0, i = 0; i < llHeight; i++) {
+      l = i * 2 * width;
+
+      for (j = 0; j < llWidth; j++, k++, l += 2) {
+        items[l] = llItems[k];
+      }
+    }
+
+    llItems = ll.items = null;
+    const bufferPadding = 4;
+    const rowBuffer = new Float32Array(width + 2 * bufferPadding);
+
+    if (width === 1) {
+      if ((u0 & 1) !== 0) {
+        for (v = 0, k = 0; v < height; v++, k += width) {
+          items[k] *= 0.5;
+        }
+      }
+    } else {
+      for (v = 0, k = 0; v < height; v++, k += width) {
+        rowBuffer.set(items.subarray(k, k + width), bufferPadding);
+        this.extend(rowBuffer, bufferPadding, width);
+        this.filter(rowBuffer, bufferPadding, width);
+        items.set(rowBuffer.subarray(bufferPadding, bufferPadding + width), k);
+      }
+    }
+
+    let numBuffers = 16;
+    const colBuffers = [];
+
+    for (i = 0; i < numBuffers; i++) {
+      colBuffers.push(new Float32Array(height + 2 * bufferPadding));
+    }
+
+    let b,
+        currentBuffer = 0;
+    ll = bufferPadding + height;
+
+    if (height === 1) {
+      if ((v0 & 1) !== 0) {
+        for (u = 0; u < width; u++) {
+          items[u] *= 0.5;
+        }
+      }
+    } else {
+      for (u = 0; u < width; u++) {
+        if (currentBuffer === 0) {
+          numBuffers = Math.min(width - u, numBuffers);
+
+          for (k = u, l = bufferPadding; l < ll; k += width, l++) {
+            for (b = 0; b < numBuffers; b++) {
+              colBuffers[b][l] = items[k + b];
+            }
+          }
+
+          currentBuffer = numBuffers;
+        }
+
+        currentBuffer--;
+        const buffer = colBuffers[currentBuffer];
+        this.extend(buffer, bufferPadding, height);
+        this.filter(buffer, bufferPadding, height);
+
+        if (currentBuffer === 0) {
+          k = u - numBuffers + 1;
+
+          for (l = bufferPadding; l < ll; k += width, l++) {
+            for (b = 0; b < numBuffers; b++) {
+              items[k + b] = colBuffers[b][l];
+            }
+          }
+        }
+      }
+    }
+
+    return {
+      width,
+      height,
+      items
+    };
+  }
+
+}
+
+class IrreversibleTransform extends Transform {
+  filter(x, offset, length) {
+    const len = length >> 1;
+    offset |= 0;
+    let j, n, current, next;
+    const alpha = -1.586134342059924;
+    const beta = -0.052980118572961;
+    const gamma = 0.882911075530934;
+    const delta = 0.443506852043971;
+    const K = 1.230174104914001;
+    const K_ = 1 / K;
+    j = offset - 3;
+
+    for (n = len + 4; n--; j += 2) {
+      x[j] *= K_;
+    }
+
+    j = offset - 2;
+    current = delta * x[j - 1];
+
+    for (n = len + 3; n--; j += 2) {
+      next = delta * x[j + 1];
+      x[j] = K * x[j] - current - next;
+
+      if (n--) {
+        j += 2;
+        current = delta * x[j + 1];
+        x[j] = K * x[j] - current - next;
+      } else {
+        break;
+      }
+    }
+
+    j = offset - 1;
+    current = gamma * x[j - 1];
+
+    for (n = len + 2; n--; j += 2) {
+      next = gamma * x[j + 1];
+      x[j] -= current + next;
+
+      if (n--) {
+        j += 2;
+        current = gamma * x[j + 1];
+        x[j] -= current + next;
+      } else {
+        break;
+      }
+    }
+
+    j = offset;
+    current = beta * x[j - 1];
+
+    for (n = len + 1; n--; j += 2) {
+      next = beta * x[j + 1];
+      x[j] -= current + next;
+
+      if (n--) {
+        j += 2;
+        current = beta * x[j + 1];
+        x[j] -= current + next;
+      } else {
+        break;
+      }
+    }
+
+    if (len !== 0) {
+      j = offset + 1;
+      current = alpha * x[j - 1];
+
+      for (n = len; n--; j += 2) {
+        next = alpha * x[j + 1];
+        x[j] -= current + next;
+
+        if (n--) {
+          j += 2;
+          current = alpha * x[j + 1];
+          x[j] -= current + next;
+        } else {
+          break;
+        }
+      }
+    }
+  }
+
+}
+
+class ReversibleTransform extends Transform {
+  filter(x, offset, length) {
+    const len = length >> 1;
+    offset |= 0;
+    let j, n;
+
+    for (j = offset, n = len + 1; n--; j += 2) {
+      x[j] -= x[j - 1] + x[j + 1] + 2 >> 2;
+    }
+
+    for (j = offset + 1, n = len; n--; j += 2) {
+      x[j] += x[j - 1] + x[j + 1] >> 1;
+    }
+  }
+
+}
+
+/***/ }),
+/* 31 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.LZWStream = void 0;
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+class LZWStream extends _decode_stream.DecodeStream {
+  constructor(str, maybeLength, earlyChange) {
+    super(maybeLength);
+    this.str = str;
+    this.dict = str.dict;
+    this.cachedData = 0;
+    this.bitsCached = 0;
+    const maxLzwDictionarySize = 4096;
+    const lzwState = {
+      earlyChange,
+      codeLength: 9,
+      nextCode: 258,
+      dictionaryValues: new Uint8Array(maxLzwDictionarySize),
+      dictionaryLengths: new Uint16Array(maxLzwDictionarySize),
+      dictionaryPrevCodes: new Uint16Array(maxLzwDictionarySize),
+      currentSequence: new Uint8Array(maxLzwDictionarySize),
+      currentSequenceLength: 0
+    };
+
+    for (let i = 0; i < 256; ++i) {
+      lzwState.dictionaryValues[i] = i;
+      lzwState.dictionaryLengths[i] = 1;
+    }
+
+    this.lzwState = lzwState;
+  }
+
+  readBits(n) {
+    let bitsCached = this.bitsCached;
+    let cachedData = this.cachedData;
+
+    while (bitsCached < n) {
+      const c = this.str.getByte();
+
+      if (c === -1) {
+        this.eof = true;
+        return null;
+      }
+
+      cachedData = cachedData << 8 | c;
+      bitsCached += 8;
+    }
+
+    this.bitsCached = bitsCached -= n;
+    this.cachedData = cachedData;
+    this.lastCode = null;
+    return cachedData >>> bitsCached & (1 << n) - 1;
+  }
+
+  readBlock() {
+    const blockSize = 512,
+          decodedSizeDelta = blockSize;
+    let estimatedDecodedSize = blockSize * 2;
+    let i, j, q;
+    const lzwState = this.lzwState;
+
+    if (!lzwState) {
+      return;
+    }
+
+    const earlyChange = lzwState.earlyChange;
+    let nextCode = lzwState.nextCode;
+    const dictionaryValues = lzwState.dictionaryValues;
+    const dictionaryLengths = lzwState.dictionaryLengths;
+    const dictionaryPrevCodes = lzwState.dictionaryPrevCodes;
+    let codeLength = lzwState.codeLength;
+    let prevCode = lzwState.prevCode;
+    const currentSequence = lzwState.currentSequence;
+    let currentSequenceLength = lzwState.currentSequenceLength;
+    let decodedLength = 0;
+    let currentBufferLength = this.bufferLength;
+    let buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+
+    for (i = 0; i < blockSize; i++) {
+      const code = this.readBits(codeLength);
+      const hasPrev = currentSequenceLength > 0;
+
+      if (code < 256) {
+        currentSequence[0] = code;
+        currentSequenceLength = 1;
+      } else if (code >= 258) {
+        if (code < nextCode) {
+          currentSequenceLength = dictionaryLengths[code];
+
+          for (j = currentSequenceLength - 1, q = code; j >= 0; j--) {
+            currentSequence[j] = dictionaryValues[q];
+            q = dictionaryPrevCodes[q];
+          }
+        } else {
+          currentSequence[currentSequenceLength++] = currentSequence[0];
+        }
+      } else if (code === 256) {
+        codeLength = 9;
+        nextCode = 258;
+        currentSequenceLength = 0;
+        continue;
+      } else {
+        this.eof = true;
+        delete this.lzwState;
+        break;
+      }
+
+      if (hasPrev) {
+        dictionaryPrevCodes[nextCode] = prevCode;
+        dictionaryLengths[nextCode] = dictionaryLengths[prevCode] + 1;
+        dictionaryValues[nextCode] = currentSequence[0];
+        nextCode++;
+        codeLength = nextCode + earlyChange & nextCode + earlyChange - 1 ? codeLength : Math.min(Math.log(nextCode + earlyChange) / 0.6931471805599453 + 1, 12) | 0;
+      }
+
+      prevCode = code;
+      decodedLength += currentSequenceLength;
+
+      if (estimatedDecodedSize < decodedLength) {
+        do {
+          estimatedDecodedSize += decodedSizeDelta;
+        } while (estimatedDecodedSize < decodedLength);
+
+        buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+      }
+
+      for (j = 0; j < currentSequenceLength; j++) {
+        buffer[currentBufferLength++] = currentSequence[j];
+      }
+    }
+
+    lzwState.nextCode = nextCode;
+    lzwState.codeLength = codeLength;
+    lzwState.prevCode = prevCode;
+    lzwState.currentSequenceLength = currentSequenceLength;
+    this.bufferLength = currentBufferLength;
+  }
+
+}
+
+exports.LZWStream = LZWStream;
+
+/***/ }),
+/* 32 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.PredictorStream = void 0;
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _util = __w_pdfjs_require__(2);
+
+class PredictorStream extends _decode_stream.DecodeStream {
+  constructor(str, maybeLength, params) {
+    super(maybeLength);
+
+    if (!(params instanceof _primitives.Dict)) {
+      return str;
+    }
+
+    const predictor = this.predictor = params.get("Predictor") || 1;
+
+    if (predictor <= 1) {
+      return str;
+    }
+
+    if (predictor !== 2 && (predictor < 10 || predictor > 15)) {
+      throw new _util.FormatError(`Unsupported predictor: ${predictor}`);
+    }
+
+    if (predictor === 2) {
+      this.readBlock = this.readBlockTiff;
+    } else {
+      this.readBlock = this.readBlockPng;
+    }
+
+    this.str = str;
+    this.dict = str.dict;
+    const colors = this.colors = params.get("Colors") || 1;
+    const bits = this.bits = params.get("BPC", "BitsPerComponent") || 8;
+    const columns = this.columns = params.get("Columns") || 1;
+    this.pixBytes = colors * bits + 7 >> 3;
+    this.rowBytes = columns * colors * bits + 7 >> 3;
+    return this;
+  }
+
+  readBlockTiff() {
+    const rowBytes = this.rowBytes;
+    const bufferLength = this.bufferLength;
+    const buffer = this.ensureBuffer(bufferLength + rowBytes);
+    const bits = this.bits;
+    const colors = this.colors;
+    const rawBytes = this.str.getBytes(rowBytes);
+    this.eof = !rawBytes.length;
+
+    if (this.eof) {
+      return;
+    }
+
+    let inbuf = 0,
+        outbuf = 0;
+    let inbits = 0,
+        outbits = 0;
+    let pos = bufferLength;
+    let i;
+
+    if (bits === 1 && colors === 1) {
+      for (i = 0; i < rowBytes; ++i) {
+        let c = rawBytes[i] ^ inbuf;
+        c ^= c >> 1;
+        c ^= c >> 2;
+        c ^= c >> 4;
+        inbuf = (c & 1) << 7;
+        buffer[pos++] = c;
+      }
+    } else if (bits === 8) {
+      for (i = 0; i < colors; ++i) {
+        buffer[pos++] = rawBytes[i];
+      }
+
+      for (; i < rowBytes; ++i) {
+        buffer[pos] = buffer[pos - colors] + rawBytes[i];
+        pos++;
+      }
+    } else if (bits === 16) {
+      const bytesPerPixel = colors * 2;
+
+      for (i = 0; i < bytesPerPixel; ++i) {
+        buffer[pos++] = rawBytes[i];
+      }
+
+      for (; i < rowBytes; i += 2) {
+        const sum = ((rawBytes[i] & 0xff) << 8) + (rawBytes[i + 1] & 0xff) + ((buffer[pos - bytesPerPixel] & 0xff) << 8) + (buffer[pos - bytesPerPixel + 1] & 0xff);
+        buffer[pos++] = sum >> 8 & 0xff;
+        buffer[pos++] = sum & 0xff;
+      }
+    } else {
+      const compArray = new Uint8Array(colors + 1);
+      const bitMask = (1 << bits) - 1;
+      let j = 0,
+          k = bufferLength;
+      const columns = this.columns;
+
+      for (i = 0; i < columns; ++i) {
+        for (let kk = 0; kk < colors; ++kk) {
+          if (inbits < bits) {
+            inbuf = inbuf << 8 | rawBytes[j++] & 0xff;
+            inbits += 8;
+          }
+
+          compArray[kk] = compArray[kk] + (inbuf >> inbits - bits) & bitMask;
+          inbits -= bits;
+          outbuf = outbuf << bits | compArray[kk];
+          outbits += bits;
+
+          if (outbits >= 8) {
+            buffer[k++] = outbuf >> outbits - 8 & 0xff;
+            outbits -= 8;
+          }
+        }
+      }
+
+      if (outbits > 0) {
+        buffer[k++] = (outbuf << 8 - outbits) + (inbuf & (1 << 8 - outbits) - 1);
+      }
+    }
+
+    this.bufferLength += rowBytes;
+  }
+
+  readBlockPng() {
+    const rowBytes = this.rowBytes;
+    const pixBytes = this.pixBytes;
+    const predictor = this.str.getByte();
+    const rawBytes = this.str.getBytes(rowBytes);
+    this.eof = !rawBytes.length;
+
+    if (this.eof) {
+      return;
+    }
+
+    const bufferLength = this.bufferLength;
+    const buffer = this.ensureBuffer(bufferLength + rowBytes);
+    let prevRow = buffer.subarray(bufferLength - rowBytes, bufferLength);
+
+    if (prevRow.length === 0) {
+      prevRow = new Uint8Array(rowBytes);
+    }
+
+    let i,
+        j = bufferLength,
+        up,
+        c;
+
+    switch (predictor) {
+      case 0:
+        for (i = 0; i < rowBytes; ++i) {
+          buffer[j++] = rawBytes[i];
+        }
+
+        break;
+
+      case 1:
+        for (i = 0; i < pixBytes; ++i) {
+          buffer[j++] = rawBytes[i];
+        }
+
+        for (; i < rowBytes; ++i) {
+          buffer[j] = buffer[j - pixBytes] + rawBytes[i] & 0xff;
+          j++;
+        }
+
+        break;
+
+      case 2:
+        for (i = 0; i < rowBytes; ++i) {
+          buffer[j++] = prevRow[i] + rawBytes[i] & 0xff;
+        }
+
+        break;
+
+      case 3:
+        for (i = 0; i < pixBytes; ++i) {
+          buffer[j++] = (prevRow[i] >> 1) + rawBytes[i];
+        }
+
+        for (; i < rowBytes; ++i) {
+          buffer[j] = (prevRow[i] + buffer[j - pixBytes] >> 1) + rawBytes[i] & 0xff;
+          j++;
+        }
+
+        break;
+
+      case 4:
+        for (i = 0; i < pixBytes; ++i) {
+          up = prevRow[i];
+          c = rawBytes[i];
+          buffer[j++] = up + c;
+        }
+
+        for (; i < rowBytes; ++i) {
+          up = prevRow[i];
+          const upLeft = prevRow[i - pixBytes];
+          const left = buffer[j - pixBytes];
+          const p = left + up - upLeft;
+          let pa = p - left;
+
+          if (pa < 0) {
+            pa = -pa;
+          }
+
+          let pb = p - up;
+
+          if (pb < 0) {
+            pb = -pb;
+          }
+
+          let pc = p - upLeft;
+
+          if (pc < 0) {
+            pc = -pc;
+          }
+
+          c = rawBytes[i];
+
+          if (pa <= pb && pa <= pc) {
+            buffer[j++] = left + c;
+          } else if (pb <= pc) {
+            buffer[j++] = up + c;
+          } else {
+            buffer[j++] = upLeft + c;
+          }
+        }
+
+        break;
+
+      default:
+        throw new _util.FormatError(`Unsupported predictor: ${predictor}`);
+    }
+
+    this.bufferLength += rowBytes;
+  }
+
+}
+
+exports.PredictorStream = PredictorStream;
+
+/***/ }),
+/* 33 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.RunLengthStream = void 0;
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+class RunLengthStream extends _decode_stream.DecodeStream {
+  constructor(str, maybeLength) {
+    super(maybeLength);
+    this.str = str;
+    this.dict = str.dict;
+  }
+
+  readBlock() {
+    const repeatHeader = this.str.getBytes(2);
+
+    if (!repeatHeader || repeatHeader.length < 2 || repeatHeader[0] === 128) {
+      this.eof = true;
+      return;
+    }
+
+    let buffer;
+    let bufferLength = this.bufferLength;
+    let n = repeatHeader[0];
+
+    if (n < 128) {
+      buffer = this.ensureBuffer(bufferLength + n + 1);
+      buffer[bufferLength++] = repeatHeader[1];
+
+      if (n > 0) {
+        const source = this.str.getBytes(n);
+        buffer.set(source, bufferLength);
+        bufferLength += n;
+      }
+    } else {
+      n = 257 - n;
+      const b = repeatHeader[1];
+      buffer = this.ensureBuffer(bufferLength + n + 1);
+
+      for (let i = 0; i < n; i++) {
+        buffer[bufferLength++] = b;
+      }
+    }
+
+    this.bufferLength = bufferLength;
+  }
+
+}
+
+exports.RunLengthStream = RunLengthStream;
+
+/***/ }),
+/* 34 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Font = exports.ErrorFont = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _cff_parser = __w_pdfjs_require__(35);
+
+var _fonts_utils = __w_pdfjs_require__(38);
+
+var _unicode = __w_pdfjs_require__(40);
+
+var _glyphlist = __w_pdfjs_require__(39);
+
+var _encodings = __w_pdfjs_require__(37);
+
+var _standard_fonts = __w_pdfjs_require__(41);
+
+var _to_unicode_map = __w_pdfjs_require__(42);
+
+var _cff_font = __w_pdfjs_require__(43);
+
+var _font_renderer = __w_pdfjs_require__(44);
+
+var _metrics = __w_pdfjs_require__(45);
+
+var _glyf = __w_pdfjs_require__(46);
+
+var _cmap = __w_pdfjs_require__(16);
+
+var _opentype_file_builder = __w_pdfjs_require__(47);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _stream = __w_pdfjs_require__(10);
+
+var _type1_font = __w_pdfjs_require__(48);
 
 const PRIVATE_USE_AREAS = [[0xe000, 0xf8ff], [0x100000, 0x10fffd]];
-var PDF_GLYPH_SPACE_UNITS = 1000;
-var SEAC_ANALYSIS_ENABLED = true;
-exports.SEAC_ANALYSIS_ENABLED = SEAC_ANALYSIS_ENABLED;
-const EXPORT_DATA_PROPERTIES = ["ascent", "bbox", "black", "bold", "charProcOperatorList", "composite", "data", "defaultVMetrics", "defaultWidth", "descent", "fallbackName", "fontMatrix", "fontType", "isMonospace", "isSerifFont", "isType3Font", "italic", "loadedName", "mimetype", "missingFile", "name", "remeasure", "subtype", "type", "vertical"];
-const EXPORT_DATA_EXTRA_PROPERTIES = ["cMap", "defaultEncoding", "differences", "isSymbolicFont", "seacMap", "toFontChar", "toUnicode", "vmetrics", "widths"];
-var FontFlags = {
-  FixedPitch: 1,
-  Serif: 2,
-  Symbolic: 4,
-  Script: 8,
-  Nonsymbolic: 32,
-  Italic: 64,
-  AllCap: 65536,
-  SmallCap: 131072,
-  ForceBold: 262144
-};
-exports.FontFlags = FontFlags;
-var MacStandardGlyphOrdering = [".notdef", ".null", "nonmarkingreturn", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quotesingle", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "grave", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "Adieresis", "Aring", "Ccedilla", "Eacute", "Ntilde", "Odieresis", "Udieresis", "aacute", "agrave", "acircumflex", "adieresis", "atilde", "aring", "ccedilla", "eacute", "egrave", "ecircumflex", "edieresis", "iacute", "igrave", "icircumflex", "idieresis", "ntilde", "oacute", "ograve", "ocircumflex", "odieresis", "otilde", "uacute", "ugrave", "ucircumflex", "udieresis", "dagger", "degree", "cent", "sterling", "section", "bullet", "paragraph", "germandbls", "registered", "copyright", "trademark", "acute", "dieresis", "notequal", "AE", "Oslash", "infinity", "plusminus", "lessequal", "greaterequal", "yen", "mu", "partialdiff", "summation", "product", "pi", "integral", "ordfeminine", "ordmasculine", "Omega", "ae", "oslash", "questiondown", "exclamdown", "logicalnot", "radical", "florin", "approxequal", "Delta", "guillemotleft", "guillemotright", "ellipsis", "nonbreakingspace", "Agrave", "Atilde", "Otilde", "OE", "oe", "endash", "emdash", "quotedblleft", "quotedblright", "quoteleft", "quoteright", "divide", "lozenge", "ydieresis", "Ydieresis", "fraction", "currency", "guilsinglleft", "guilsinglright", "fi", "fl", "daggerdbl", "periodcentered", "quotesinglbase", "quotedblbase", "perthousand", "Acircumflex", "Ecircumflex", "Aacute", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Oacute", "Ocircumflex", "apple", "Ograve", "Uacute", "Ucircumflex", "Ugrave", "dotlessi", "circumflex", "tilde", "macron", "breve", "dotaccent", "ring", "cedilla", "hungarumlaut", "ogonek", "caron", "Lslash", "lslash", "Scaron", "scaron", "Zcaron", "zcaron", "brokenbar", "Eth", "eth", "Yacute", "yacute", "Thorn", "thorn", "minus", "multiply", "onesuperior", "twosuperior", "threesuperior", "onehalf", "onequarter", "threequarters", "franc", "Gbreve", "gbreve", "Idotaccent", "Scedilla", "scedilla", "Cacute", "cacute", "Ccaron", "ccaron", "dcroat"];
+const PDF_GLYPH_SPACE_UNITS = 1000;
+const EXPORT_DATA_PROPERTIES = ["ascent", "bbox", "black", "bold", "charProcOperatorList", "composite", "cssFontInfo", "data", "defaultVMetrics", "defaultWidth", "descent", "fallbackName", "fontMatrix", "fontType", "isType3Font", "italic", "loadedName", "mimetype", "missingFile", "name", "remeasure", "subtype", "type", "vertical"];
+const EXPORT_DATA_EXTRA_PROPERTIES = ["cMap", "defaultEncoding", "differences", "isMonospace", "isSerifFont", "isSymbolicFont", "seacMap", "toFontChar", "toUnicode", "vmetrics", "widths"];
 
 function adjustWidths(properties) {
   if (!properties.fontMatrix) {
@@ -26266,10 +25053,10 @@ function adjustWidths(properties) {
     return;
   }
 
-  var scale = 0.001 / properties.fontMatrix[0];
-  var glyphsWidths = properties.widths;
+  const scale = 0.001 / properties.fontMatrix[0];
+  const glyphsWidths = properties.widths;
 
-  for (var glyph in glyphsWidths) {
+  for (const glyph in glyphsWidths) {
     glyphsWidths[glyph] *= scale;
   }
 
@@ -26277,11 +25064,7 @@ function adjustWidths(properties) {
 }
 
 function adjustToUnicode(properties, builtInEncoding) {
-  if (properties.hasIncludedToUnicodeMap) {
-    return;
-  }
-
-  if (properties.hasEncoding) {
+  if (properties.isInternalFont) {
     return;
   }
 
@@ -26289,74 +25072,64 @@ function adjustToUnicode(properties, builtInEncoding) {
     return;
   }
 
-  if (properties.toUnicode instanceof IdentityToUnicodeMap) {
+  if (properties.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap) {
     return;
   }
 
-  var toUnicode = [],
-      glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+  const toUnicode = [],
+        glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
 
-  for (var charCode in builtInEncoding) {
-    var glyphName = builtInEncoding[charCode];
-    var unicode = (0, _unicode.getUnicodeForGlyph)(glyphName, glyphsUnicodeMap);
+  for (const charCode in builtInEncoding) {
+    if (properties.hasIncludedToUnicodeMap) {
+      if (properties.toUnicode.has(charCode)) {
+        continue;
+      }
+    } else if (properties.hasEncoding) {
+      if (properties.differences.length === 0 || properties.differences[charCode] !== undefined) {
+        continue;
+      }
+    }
+
+    const glyphName = builtInEncoding[charCode];
+    const unicode = (0, _unicode.getUnicodeForGlyph)(glyphName, glyphsUnicodeMap);
 
     if (unicode !== -1) {
       toUnicode[charCode] = String.fromCharCode(unicode);
     }
   }
 
-  properties.toUnicode.amend(toUnicode);
-}
-
-function getFontType(type, subtype) {
-  switch (type) {
-    case "Type1":
-      return subtype === "Type1C" ? _util.FontType.TYPE1C : _util.FontType.TYPE1;
-
-    case "CIDFontType0":
-      return subtype === "CIDFontType0C" ? _util.FontType.CIDFONTTYPE0C : _util.FontType.CIDFONTTYPE0;
-
-    case "OpenType":
-      return _util.FontType.OPENTYPE;
-
-    case "TrueType":
-      return _util.FontType.TRUETYPE;
-
-    case "CIDFontType2":
-      return _util.FontType.CIDFONTTYPE2;
-
-    case "MMType1":
-      return _util.FontType.MMTYPE1;
-
-    case "Type0":
-      return _util.FontType.TYPE0;
-
-    default:
-      return _util.FontType.UNKNOWN;
+  if (toUnicode.length > 0) {
+    properties.toUnicode.amend(toUnicode);
   }
 }
 
-function recoverGlyphName(name, glyphsUnicodeMap) {
-  if (glyphsUnicodeMap[name] !== undefined) {
-    return name;
+function amendFallbackToUnicode(properties) {
+  if (!properties.fallbackToUnicode) {
+    return;
   }
 
-  var unicode = (0, _unicode.getUnicodeForGlyph)(name, glyphsUnicodeMap);
+  if (properties.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap) {
+    return;
+  }
 
-  if (unicode !== -1) {
-    for (var key in glyphsUnicodeMap) {
-      if (glyphsUnicodeMap[key] === unicode) {
-        return key;
-      }
+  const toUnicode = [];
+
+  for (const charCode in properties.fallbackToUnicode) {
+    if (properties.toUnicode.has(charCode)) {
+      continue;
     }
+
+    toUnicode[charCode] = properties.fallbackToUnicode[charCode];
   }
 
-  (0, _util.info)("Unable to recover a standard glyph name for: " + name);
-  return name;
+  if (toUnicode.length > 0) {
+    properties.toUnicode.amend(toUnicode);
+  }
 }
 
-var Glyph = function GlyphClosure() {
-  function Glyph(fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont) {
+class Glyph {
+  constructor(originalCharCode, fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont) {
+    this.originalCharCode = originalCharCode;
     this.fontChar = fontChar;
     this.unicode = unicode;
     this.accent = accent;
@@ -26365,248 +25138,578 @@ var Glyph = function GlyphClosure() {
     this.operatorListId = operatorListId;
     this.isSpace = isSpace;
     this.isInFont = isInFont;
+    const category = (0, _unicode.getCharUnicodeCategory)(unicode);
+    this.isWhitespace = category.isWhitespace;
+    this.isZeroWidthDiacritic = category.isZeroWidthDiacritic;
+    this.isInvisibleFormatMark = category.isInvisibleFormatMark;
   }
 
-  Glyph.prototype.matchesForCache = function (fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont) {
-    return this.fontChar === fontChar && this.unicode === unicode && this.accent === accent && this.width === width && this.vmetric === vmetric && this.operatorListId === operatorListId && this.isSpace === isSpace && this.isInFont === isInFont;
+  matchesForCache(originalCharCode, fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont) {
+    return this.originalCharCode === originalCharCode && this.fontChar === fontChar && this.unicode === unicode && this.accent === accent && this.width === width && this.vmetric === vmetric && this.operatorListId === operatorListId && this.isSpace === isSpace && this.isInFont === isInFont;
+  }
+
+}
+
+function int16(b0, b1) {
+  return (b0 << 8) + b1;
+}
+
+function writeSignedInt16(bytes, index, value) {
+  bytes[index + 1] = value;
+  bytes[index] = value >>> 8;
+}
+
+function signedInt16(b0, b1) {
+  const value = (b0 << 8) + b1;
+  return value & 1 << 15 ? value - 0x10000 : value;
+}
+
+function int32(b0, b1, b2, b3) {
+  return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
+}
+
+function string16(value) {
+  return String.fromCharCode(value >> 8 & 0xff, value & 0xff);
+}
+
+function safeString16(value) {
+  if (value > 0x7fff) {
+    value = 0x7fff;
+  } else if (value < -0x8000) {
+    value = -0x8000;
+  }
+
+  return String.fromCharCode(value >> 8 & 0xff, value & 0xff);
+}
+
+function isTrueTypeFile(file) {
+  const header = file.peekBytes(4);
+  return (0, _core_utils.readUint32)(header, 0) === 0x00010000 || (0, _util.bytesToString)(header) === "true";
+}
+
+function isTrueTypeCollectionFile(file) {
+  const header = file.peekBytes(4);
+  return (0, _util.bytesToString)(header) === "ttcf";
+}
+
+function isOpenTypeFile(file) {
+  const header = file.peekBytes(4);
+  return (0, _util.bytesToString)(header) === "OTTO";
+}
+
+function isType1File(file) {
+  const header = file.peekBytes(2);
+
+  if (header[0] === 0x25 && header[1] === 0x21) {
+    return true;
+  }
+
+  if (header[0] === 0x80 && header[1] === 0x01) {
+    return true;
+  }
+
+  return false;
+}
+
+function isCFFFile(file) {
+  const header = file.peekBytes(4);
+
+  if (header[0] >= 1 && header[3] >= 1 && header[3] <= 4) {
+    return true;
+  }
+
+  return false;
+}
+
+function getFontFileType(file, {
+  type,
+  subtype,
+  composite
+}) {
+  let fileType, fileSubtype;
+
+  if (isTrueTypeFile(file) || isTrueTypeCollectionFile(file)) {
+    if (composite) {
+      fileType = "CIDFontType2";
+    } else {
+      fileType = "TrueType";
+    }
+  } else if (isOpenTypeFile(file)) {
+    if (composite) {
+      fileType = "CIDFontType2";
+    } else {
+      fileType = "OpenType";
+    }
+  } else if (isType1File(file)) {
+    if (composite) {
+      fileType = "CIDFontType0";
+    } else {
+      fileType = type === "MMType1" ? "MMType1" : "Type1";
+    }
+  } else if (isCFFFile(file)) {
+    if (composite) {
+      fileType = "CIDFontType0";
+      fileSubtype = "CIDFontType0C";
+    } else {
+      fileType = type === "MMType1" ? "MMType1" : "Type1";
+      fileSubtype = "Type1C";
+    }
+  } else {
+    (0, _util.warn)("getFontFileType: Unable to detect correct font file Type/Subtype.");
+    fileType = type;
+    fileSubtype = subtype;
+  }
+
+  return [fileType, fileSubtype];
+}
+
+function applyStandardFontGlyphMap(map, glyphMap) {
+  for (const charCode in glyphMap) {
+    map[+charCode] = glyphMap[charCode];
+  }
+}
+
+function buildToFontChar(encoding, glyphsUnicodeMap, differences) {
+  const toFontChar = [];
+  let unicode;
+
+  for (let i = 0, ii = encoding.length; i < ii; i++) {
+    unicode = (0, _unicode.getUnicodeForGlyph)(encoding[i], glyphsUnicodeMap);
+
+    if (unicode !== -1) {
+      toFontChar[i] = unicode;
+    }
+  }
+
+  for (const charCode in differences) {
+    unicode = (0, _unicode.getUnicodeForGlyph)(differences[charCode], glyphsUnicodeMap);
+
+    if (unicode !== -1) {
+      toFontChar[+charCode] = unicode;
+    }
+  }
+
+  return toFontChar;
+}
+
+function convertCidString(charCode, cid, shouldThrow = false) {
+  switch (cid.length) {
+    case 1:
+      return cid.charCodeAt(0);
+
+    case 2:
+      return cid.charCodeAt(0) << 8 | cid.charCodeAt(1);
+  }
+
+  const msg = `Unsupported CID string (charCode ${charCode}): "${cid}".`;
+
+  if (shouldThrow) {
+    throw new _util.FormatError(msg);
+  }
+
+  (0, _util.warn)(msg);
+  return cid;
+}
+
+function adjustMapping(charCodeToGlyphId, hasGlyph, newGlyphZeroId, toUnicode) {
+  const newMap = Object.create(null);
+  const toUnicodeExtraMap = new Map();
+  const toFontChar = [];
+  const usedGlyphIds = new Set();
+  let privateUseAreaIndex = 0;
+  const privateUseOffetStart = PRIVATE_USE_AREAS[privateUseAreaIndex][0];
+  let nextAvailableFontCharCode = privateUseOffetStart;
+  let privateUseOffetEnd = PRIVATE_USE_AREAS[privateUseAreaIndex][1];
+
+  for (let originalCharCode in charCodeToGlyphId) {
+    originalCharCode |= 0;
+    let glyphId = charCodeToGlyphId[originalCharCode];
+
+    if (!hasGlyph(glyphId)) {
+      continue;
+    }
+
+    if (nextAvailableFontCharCode > privateUseOffetEnd) {
+      privateUseAreaIndex++;
+
+      if (privateUseAreaIndex >= PRIVATE_USE_AREAS.length) {
+        (0, _util.warn)("Ran out of space in font private use area.");
+        break;
+      }
+
+      nextAvailableFontCharCode = PRIVATE_USE_AREAS[privateUseAreaIndex][0];
+      privateUseOffetEnd = PRIVATE_USE_AREAS[privateUseAreaIndex][1];
+    }
+
+    const fontCharCode = nextAvailableFontCharCode++;
+
+    if (glyphId === 0) {
+      glyphId = newGlyphZeroId;
+    }
+
+    let unicode = toUnicode.get(originalCharCode);
+
+    if (typeof unicode === "string") {
+      unicode = unicode.codePointAt(0);
+    }
+
+    if (unicode && unicode < privateUseOffetStart && !usedGlyphIds.has(glyphId)) {
+      toUnicodeExtraMap.set(unicode, glyphId);
+      usedGlyphIds.add(glyphId);
+    }
+
+    newMap[fontCharCode] = glyphId;
+    toFontChar[originalCharCode] = fontCharCode;
+  }
+
+  return {
+    toFontChar,
+    charCodeToGlyphId: newMap,
+    toUnicodeExtraMap,
+    nextAvailableFontCharCode
   };
+}
 
-  return Glyph;
-}();
+function getRanges(glyphs, toUnicodeExtraMap, numGlyphs) {
+  const codes = [];
 
-var ToUnicodeMap = function ToUnicodeMapClosure() {
-  function ToUnicodeMap(cmap = []) {
-    this._map = cmap;
+  for (const charCode in glyphs) {
+    if (glyphs[charCode] >= numGlyphs) {
+      continue;
+    }
+
+    codes.push({
+      fontCharCode: charCode | 0,
+      glyphId: glyphs[charCode]
+    });
   }
 
-  ToUnicodeMap.prototype = {
-    get length() {
-      return this._map.length;
-    },
-
-    forEach(callback) {
-      for (var charCode in this._map) {
-        callback(charCode, this._map[charCode].charCodeAt(0));
-      }
-    },
-
-    has(i) {
-      return this._map[i] !== undefined;
-    },
-
-    get(i) {
-      return this._map[i];
-    },
-
-    charCodeOf(value) {
-      const map = this._map;
-
-      if (map.length <= 0x10000) {
-        return map.indexOf(value);
+  if (toUnicodeExtraMap) {
+    for (const [unicode, glyphId] of toUnicodeExtraMap) {
+      if (glyphId >= numGlyphs) {
+        continue;
       }
 
-      for (const charCode in map) {
-        if (map[charCode] === value) {
-          return charCode | 0;
-        }
-      }
+      codes.push({
+        fontCharCode: unicode,
+        glyphId
+      });
+    }
+  }
 
-      return -1;
-    },
+  if (codes.length === 0) {
+    codes.push({
+      fontCharCode: 0,
+      glyphId: 0
+    });
+  }
 
-    amend(map) {
-      for (var charCode in map) {
-        this._map[charCode] = map[charCode];
+  codes.sort(function fontGetRangesSort(a, b) {
+    return a.fontCharCode - b.fontCharCode;
+  });
+  const ranges = [];
+  const length = codes.length;
+
+  for (let n = 0; n < length;) {
+    const start = codes[n].fontCharCode;
+    const codeIndices = [codes[n].glyphId];
+    ++n;
+    let end = start;
+
+    while (n < length && end + 1 === codes[n].fontCharCode) {
+      codeIndices.push(codes[n].glyphId);
+      ++end;
+      ++n;
+
+      if (end === 0xffff) {
+        break;
       }
     }
 
-  };
-  return ToUnicodeMap;
-}();
-
-exports.ToUnicodeMap = ToUnicodeMap;
-
-var IdentityToUnicodeMap = function IdentityToUnicodeMapClosure() {
-  function IdentityToUnicodeMap(firstChar, lastChar) {
-    this.firstChar = firstChar;
-    this.lastChar = lastChar;
+    ranges.push([start, end, codeIndices]);
   }
 
-  IdentityToUnicodeMap.prototype = {
-    get length() {
-      return this.lastChar + 1 - this.firstChar;
-    },
+  return ranges;
+}
 
-    forEach(callback) {
-      for (var i = this.firstChar, ii = this.lastChar; i <= ii; i++) {
-        callback(i, i);
+function createCmapTable(glyphs, toUnicodeExtraMap, numGlyphs) {
+  const ranges = getRanges(glyphs, toUnicodeExtraMap, numGlyphs);
+  const numTables = ranges.at(-1)[1] > 0xffff ? 2 : 1;
+  let cmap = "\x00\x00" + string16(numTables) + "\x00\x03" + "\x00\x01" + (0, _util.string32)(4 + numTables * 8);
+  let i, ii, j, jj;
+
+  for (i = ranges.length - 1; i >= 0; --i) {
+    if (ranges[i][0] <= 0xffff) {
+      break;
+    }
+  }
+
+  const bmpLength = i + 1;
+
+  if (ranges[i][0] < 0xffff && ranges[i][1] === 0xffff) {
+    ranges[i][1] = 0xfffe;
+  }
+
+  const trailingRangesCount = ranges[i][1] < 0xffff ? 1 : 0;
+  const segCount = bmpLength + trailingRangesCount;
+
+  const searchParams = _opentype_file_builder.OpenTypeFileBuilder.getSearchParams(segCount, 2);
+
+  let startCount = "";
+  let endCount = "";
+  let idDeltas = "";
+  let idRangeOffsets = "";
+  let glyphsIds = "";
+  let bias = 0;
+  let range, start, end, codes;
+
+  for (i = 0, ii = bmpLength; i < ii; i++) {
+    range = ranges[i];
+    start = range[0];
+    end = range[1];
+    startCount += string16(start);
+    endCount += string16(end);
+    codes = range[2];
+    let contiguous = true;
+
+    for (j = 1, jj = codes.length; j < jj; ++j) {
+      if (codes[j] !== codes[j - 1] + 1) {
+        contiguous = false;
+        break;
       }
-    },
-
-    has(i) {
-      return this.firstChar <= i && i <= this.lastChar;
-    },
-
-    get(i) {
-      if (this.firstChar <= i && i <= this.lastChar) {
-        return String.fromCharCode(i);
-      }
-
-      return undefined;
-    },
-
-    charCodeOf(v) {
-      return Number.isInteger(v) && v >= this.firstChar && v <= this.lastChar ? v : -1;
-    },
-
-    amend(map) {
-      (0, _util.unreachable)("Should not call amend()");
     }
 
-  };
-  return IdentityToUnicodeMap;
-}();
+    if (!contiguous) {
+      const offset = (segCount - i) * 2 + bias * 2;
+      bias += end - start + 1;
+      idDeltas += string16(0);
+      idRangeOffsets += string16(offset);
 
-exports.IdentityToUnicodeMap = IdentityToUnicodeMap;
-
-var OpenTypeFileBuilder = function OpenTypeFileBuilderClosure() {
-  function writeInt16(dest, offset, num) {
-    dest[offset] = num >> 8 & 0xff;
-    dest[offset + 1] = num & 0xff;
-  }
-
-  function writeInt32(dest, offset, num) {
-    dest[offset] = num >> 24 & 0xff;
-    dest[offset + 1] = num >> 16 & 0xff;
-    dest[offset + 2] = num >> 8 & 0xff;
-    dest[offset + 3] = num & 0xff;
-  }
-
-  function writeData(dest, offset, data) {
-    var i, ii;
-
-    if (data instanceof Uint8Array) {
-      dest.set(data, offset);
-    } else if (typeof data === "string") {
-      for (i = 0, ii = data.length; i < ii; i++) {
-        dest[offset++] = data.charCodeAt(i) & 0xff;
+      for (j = 0, jj = codes.length; j < jj; ++j) {
+        glyphsIds += string16(codes[j]);
       }
     } else {
-      for (i = 0, ii = data.length; i < ii; i++) {
-        dest[offset++] = data[i] & 0xff;
-      }
+      const startCode = codes[0];
+      idDeltas += string16(startCode - start & 0xffff);
+      idRangeOffsets += string16(0);
     }
   }
 
-  function OpenTypeFileBuilder(sfnt) {
-    this.sfnt = sfnt;
-    this.tables = Object.create(null);
+  if (trailingRangesCount > 0) {
+    endCount += "\xFF\xFF";
+    startCount += "\xFF\xFF";
+    idDeltas += "\x00\x01";
+    idRangeOffsets += "\x00\x00";
   }
 
-  OpenTypeFileBuilder.getSearchParams = function OpenTypeFileBuilder_getSearchParams(entriesCount, entrySize) {
-    var maxPower2 = 1,
-        log2 = 0;
+  const format314 = "\x00\x00" + string16(2 * segCount) + string16(searchParams.range) + string16(searchParams.entry) + string16(searchParams.rangeShift) + endCount + "\x00\x00" + startCount + idDeltas + idRangeOffsets + glyphsIds;
+  let format31012 = "";
+  let header31012 = "";
 
-    while ((maxPower2 ^ entriesCount) > maxPower2) {
-      maxPower2 <<= 1;
-      log2++;
-    }
+  if (numTables > 1) {
+    cmap += "\x00\x03" + "\x00\x0A" + (0, _util.string32)(4 + numTables * 8 + 4 + format314.length);
+    format31012 = "";
 
-    var searchRange = maxPower2 * entrySize;
-    return {
-      range: searchRange,
-      entry: log2,
-      rangeShift: entrySize * entriesCount - searchRange
-    };
-  };
+    for (i = 0, ii = ranges.length; i < ii; i++) {
+      range = ranges[i];
+      start = range[0];
+      codes = range[2];
+      let code = codes[0];
 
-  var OTF_HEADER_SIZE = 12;
-  var OTF_TABLE_ENTRY_SIZE = 16;
-  OpenTypeFileBuilder.prototype = {
-    toArray: function OpenTypeFileBuilder_toArray() {
-      var sfnt = this.sfnt;
-      var tables = this.tables;
-      var tablesNames = Object.keys(tables);
-      tablesNames.sort();
-      var numTables = tablesNames.length;
-      var i, j, jj, table, tableName;
-      var offset = OTF_HEADER_SIZE + numTables * OTF_TABLE_ENTRY_SIZE;
-      var tableOffsets = [offset];
-
-      for (i = 0; i < numTables; i++) {
-        table = tables[tablesNames[i]];
-        var paddedLength = (table.length + 3 & ~3) >>> 0;
-        offset += paddedLength;
-        tableOffsets.push(offset);
-      }
-
-      var file = new Uint8Array(offset);
-
-      for (i = 0; i < numTables; i++) {
-        table = tables[tablesNames[i]];
-        writeData(file, tableOffsets[i], table);
-      }
-
-      if (sfnt === "true") {
-        sfnt = (0, _util.string32)(0x00010000);
-      }
-
-      file[0] = sfnt.charCodeAt(0) & 0xff;
-      file[1] = sfnt.charCodeAt(1) & 0xff;
-      file[2] = sfnt.charCodeAt(2) & 0xff;
-      file[3] = sfnt.charCodeAt(3) & 0xff;
-      writeInt16(file, 4, numTables);
-      var searchParams = OpenTypeFileBuilder.getSearchParams(numTables, 16);
-      writeInt16(file, 6, searchParams.range);
-      writeInt16(file, 8, searchParams.entry);
-      writeInt16(file, 10, searchParams.rangeShift);
-      offset = OTF_HEADER_SIZE;
-
-      for (i = 0; i < numTables; i++) {
-        tableName = tablesNames[i];
-        file[offset] = tableName.charCodeAt(0) & 0xff;
-        file[offset + 1] = tableName.charCodeAt(1) & 0xff;
-        file[offset + 2] = tableName.charCodeAt(2) & 0xff;
-        file[offset + 3] = tableName.charCodeAt(3) & 0xff;
-        var checksum = 0;
-
-        for (j = tableOffsets[i], jj = tableOffsets[i + 1]; j < jj; j += 4) {
-          var quad = (0, _core_utils.readUint32)(file, j);
-          checksum = checksum + quad >>> 0;
+      for (j = 1, jj = codes.length; j < jj; ++j) {
+        if (codes[j] !== codes[j - 1] + 1) {
+          end = range[0] + j - 1;
+          format31012 += (0, _util.string32)(start) + (0, _util.string32)(end) + (0, _util.string32)(code);
+          start = end + 1;
+          code = codes[j];
         }
-
-        writeInt32(file, offset + 4, checksum);
-        writeInt32(file, offset + 8, tableOffsets[i]);
-        writeInt32(file, offset + 12, tables[tableName].length);
-        offset += OTF_TABLE_ENTRY_SIZE;
       }
 
-      return file;
-    },
-    addTable: function OpenTypeFileBuilder_addTable(tag, data) {
-      if (tag in this.tables) {
-        throw new Error("Table " + tag + " already exists");
-      }
-
-      this.tables[tag] = data;
+      format31012 += (0, _util.string32)(start) + (0, _util.string32)(range[1]) + (0, _util.string32)(code);
     }
-  };
-  return OpenTypeFileBuilder;
-}();
 
-var Font = function FontClosure() {
-  function Font(name, file, properties) {
-    var charCode;
+    header31012 = "\x00\x0C" + "\x00\x00" + (0, _util.string32)(format31012.length + 16) + "\x00\x00\x00\x00" + (0, _util.string32)(format31012.length / 12);
+  }
+
+  return cmap + "\x00\x04" + string16(format314.length + 4) + format314 + header31012 + format31012;
+}
+
+function validateOS2Table(os2, file) {
+  file.pos = (file.start || 0) + os2.offset;
+  const version = file.getUint16();
+  file.skip(60);
+  const selection = file.getUint16();
+
+  if (version < 4 && selection & 0x0300) {
+    return false;
+  }
+
+  const firstChar = file.getUint16();
+  const lastChar = file.getUint16();
+
+  if (firstChar > lastChar) {
+    return false;
+  }
+
+  file.skip(6);
+  const usWinAscent = file.getUint16();
+
+  if (usWinAscent === 0) {
+    return false;
+  }
+
+  os2.data[8] = os2.data[9] = 0;
+  return true;
+}
+
+function createOS2Table(properties, charstrings, override) {
+  override = override || {
+    unitsPerEm: 0,
+    yMax: 0,
+    yMin: 0,
+    ascent: 0,
+    descent: 0
+  };
+  let ulUnicodeRange1 = 0;
+  let ulUnicodeRange2 = 0;
+  let ulUnicodeRange3 = 0;
+  let ulUnicodeRange4 = 0;
+  let firstCharIndex = null;
+  let lastCharIndex = 0;
+
+  if (charstrings) {
+    for (let code in charstrings) {
+      code |= 0;
+
+      if (firstCharIndex > code || !firstCharIndex) {
+        firstCharIndex = code;
+      }
+
+      if (lastCharIndex < code) {
+        lastCharIndex = code;
+      }
+
+      const position = (0, _unicode.getUnicodeRangeFor)(code);
+
+      if (position < 32) {
+        ulUnicodeRange1 |= 1 << position;
+      } else if (position < 64) {
+        ulUnicodeRange2 |= 1 << position - 32;
+      } else if (position < 96) {
+        ulUnicodeRange3 |= 1 << position - 64;
+      } else if (position < 123) {
+        ulUnicodeRange4 |= 1 << position - 96;
+      } else {
+        throw new _util.FormatError("Unicode ranges Bits > 123 are reserved for internal usage");
+      }
+    }
+
+    if (lastCharIndex > 0xffff) {
+      lastCharIndex = 0xffff;
+    }
+  } else {
+    firstCharIndex = 0;
+    lastCharIndex = 255;
+  }
+
+  const bbox = properties.bbox || [0, 0, 0, 0];
+  const unitsPerEm = override.unitsPerEm || 1 / (properties.fontMatrix || _util.FONT_IDENTITY_MATRIX)[0];
+  const scale = properties.ascentScaled ? 1.0 : unitsPerEm / PDF_GLYPH_SPACE_UNITS;
+  const typoAscent = override.ascent || Math.round(scale * (properties.ascent || bbox[3]));
+  let typoDescent = override.descent || Math.round(scale * (properties.descent || bbox[1]));
+
+  if (typoDescent > 0 && properties.descent > 0 && bbox[1] < 0) {
+    typoDescent = -typoDescent;
+  }
+
+  const winAscent = override.yMax || typoAscent;
+  const winDescent = -override.yMin || -typoDescent;
+  return "\x00\x03" + "\x02\x24" + "\x01\xF4" + "\x00\x05" + "\x00\x00" + "\x02\x8A" + "\x02\xBB" + "\x00\x00" + "\x00\x8C" + "\x02\x8A" + "\x02\xBB" + "\x00\x00" + "\x01\xDF" + "\x00\x31" + "\x01\x02" + "\x00\x00" + "\x00\x00\x06" + String.fromCharCode(properties.fixedPitch ? 0x09 : 0x00) + "\x00\x00\x00\x00\x00\x00" + (0, _util.string32)(ulUnicodeRange1) + (0, _util.string32)(ulUnicodeRange2) + (0, _util.string32)(ulUnicodeRange3) + (0, _util.string32)(ulUnicodeRange4) + "\x2A\x32\x31\x2A" + string16(properties.italicAngle ? 1 : 0) + string16(firstCharIndex || properties.firstChar) + string16(lastCharIndex || properties.lastChar) + string16(typoAscent) + string16(typoDescent) + "\x00\x64" + string16(winAscent) + string16(winDescent) + "\x00\x00\x00\x00" + "\x00\x00\x00\x00" + string16(properties.xHeight) + string16(properties.capHeight) + string16(0) + string16(firstCharIndex || properties.firstChar) + "\x00\x03";
+}
+
+function createPostTable(properties) {
+  const angle = Math.floor(properties.italicAngle * 2 ** 16);
+  return "\x00\x03\x00\x00" + (0, _util.string32)(angle) + "\x00\x00" + "\x00\x00" + (0, _util.string32)(properties.fixedPitch ? 1 : 0) + "\x00\x00\x00\x00" + "\x00\x00\x00\x00" + "\x00\x00\x00\x00" + "\x00\x00\x00\x00";
+}
+
+function createPostscriptName(name) {
+  return name.replace(/[^\x21-\x7E]|[[\](){}<>/%]/g, "").slice(0, 63);
+}
+
+function createNameTable(name, proto) {
+  if (!proto) {
+    proto = [[], []];
+  }
+
+  const strings = [proto[0][0] || "Original licence", proto[0][1] || name, proto[0][2] || "Unknown", proto[0][3] || "uniqueID", proto[0][4] || name, proto[0][5] || "Version 0.11", proto[0][6] || createPostscriptName(name), proto[0][7] || "Unknown", proto[0][8] || "Unknown", proto[0][9] || "Unknown"];
+  const stringsUnicode = [];
+  let i, ii, j, jj, str;
+
+  for (i = 0, ii = strings.length; i < ii; i++) {
+    str = proto[1][i] || strings[i];
+    const strBufUnicode = [];
+
+    for (j = 0, jj = str.length; j < jj; j++) {
+      strBufUnicode.push(string16(str.charCodeAt(j)));
+    }
+
+    stringsUnicode.push(strBufUnicode.join(""));
+  }
+
+  const names = [strings, stringsUnicode];
+  const platforms = ["\x00\x01", "\x00\x03"];
+  const encodings = ["\x00\x00", "\x00\x01"];
+  const languages = ["\x00\x00", "\x04\x09"];
+  const namesRecordCount = strings.length * platforms.length;
+  let nameTable = "\x00\x00" + string16(namesRecordCount) + string16(namesRecordCount * 12 + 6);
+  let strOffset = 0;
+
+  for (i = 0, ii = platforms.length; i < ii; i++) {
+    const strs = names[i];
+
+    for (j = 0, jj = strs.length; j < jj; j++) {
+      str = strs[j];
+      const nameRecord = platforms[i] + encodings[i] + languages[i] + string16(j) + string16(str.length) + string16(strOffset);
+      nameTable += nameRecord;
+      strOffset += str.length;
+    }
+  }
+
+  nameTable += strings.join("") + stringsUnicode.join("");
+  return nameTable;
+}
+
+class Font {
+  constructor(name, file, properties) {
     this.name = name;
+    this.psName = null;
+    this.mimetype = null;
+    this.disableFontFace = false;
     this.loadedName = properties.loadedName;
     this.isType3Font = properties.isType3Font;
     this.missingFile = false;
-    this.glyphCache = Object.create(null);
-    this.isSerifFont = !!(properties.flags & FontFlags.Serif);
-    this.isSymbolicFont = !!(properties.flags & FontFlags.Symbolic);
-    this.isMonospace = !!(properties.flags & FontFlags.FixedPitch);
-    var type = properties.type;
-    var subtype = properties.subtype;
+    this.cssFontInfo = properties.cssFontInfo;
+    this._charsCache = Object.create(null);
+    this._glyphCache = Object.create(null);
+    let isSerifFont = !!(properties.flags & _fonts_utils.FontFlags.Serif);
+
+    if (!isSerifFont && !properties.isSimulatedFlags) {
+      const baseName = name.replace(/[,_]/g, "-").split("-")[0],
+            serifFonts = (0, _standard_fonts.getSerifFonts)();
+
+      for (const namePart of baseName.split("+")) {
+        if (serifFonts[namePart]) {
+          isSerifFont = true;
+          break;
+        }
+      }
+    }
+
+    this.isSerifFont = isSerifFont;
+    this.isSymbolicFont = !!(properties.flags & _fonts_utils.FontFlags.Symbolic);
+    this.isMonospace = !!(properties.flags & _fonts_utils.FontFlags.FixedPitch);
+    let type = properties.type;
+    let subtype = properties.subtype;
     this.type = type;
     this.subtype = subtype;
     let fallbackName = "sans-serif";
@@ -26623,17 +25726,18 @@ var Font = function FontClosure() {
     this.defaultWidth = properties.defaultWidth;
     this.composite = properties.composite;
     this.cMap = properties.cMap;
+    this.capHeight = properties.capHeight / PDF_GLYPH_SPACE_UNITS;
     this.ascent = properties.ascent / PDF_GLYPH_SPACE_UNITS;
     this.descent = properties.descent / PDF_GLYPH_SPACE_UNITS;
+    this.lineHeight = this.ascent - this.descent;
     this.fontMatrix = properties.fontMatrix;
     this.bbox = properties.bbox;
     this.defaultEncoding = properties.defaultEncoding;
     this.toUnicode = properties.toUnicode;
-    this.fallbackToUnicode = properties.fallbackToUnicode || new ToUnicodeMap();
     this.toFontChar = [];
 
     if (properties.type === "Type3") {
-      for (charCode = 0; charCode < 256; charCode++) {
+      for (let charCode = 0; charCode < 256; charCode++) {
         this.toFontChar[charCode] = this.differences[charCode] || properties.defaultEncoding[charCode];
       }
 
@@ -26641,7 +25745,7 @@ var Font = function FontClosure() {
       return;
     }
 
-    this.cidEncoding = properties.cidEncoding;
+    this.cidEncoding = properties.cidEncoding || "";
     this.vertical = !!properties.vertical;
 
     if (this.vertical) {
@@ -26654,7 +25758,7 @@ var Font = function FontClosure() {
         (0, _util.warn)('Font file is empty in "' + name + '" (' + this.loadedName + ")");
       }
 
-      this.fallbackToSystemFont();
+      this.fallbackToSystemFont(properties);
       return;
     }
 
@@ -26664,9 +25768,9 @@ var Font = function FontClosure() {
       (0, _util.info)("Inconsistent font file Type/SubType, expected: " + `${this.type}/${this.subtype} but found: ${type}/${subtype}.`);
     }
 
-    try {
-      var data;
+    let data;
 
+    try {
       switch (type) {
         case "MMType1":
           (0, _util.info)("MMType1 font (" + name + "), falling back to Type1.");
@@ -26674,7 +25778,7 @@ var Font = function FontClosure() {
         case "Type1":
         case "CIDFontType0":
           this.mimetype = "font/opentype";
-          var cff = subtype === "Type1C" || subtype === "CIDFontType0C" ? new CFFFont(file, properties) : new Type1Font(name, file, properties);
+          const cff = subtype === "Type1C" || subtype === "CIDFontType0C" ? new _cff_font.CFFFont(file, properties) : new _type1_font.Type1Font(name, file, properties);
           adjustWidths(properties);
           data = this.convert(name, cff, properties);
           break;
@@ -26697,12 +25801,13 @@ var Font = function FontClosure() {
       }
     } catch (e) {
       (0, _util.warn)(e);
-      this.fallbackToSystemFont();
+      this.fallbackToSystemFont(properties);
       return;
     }
 
+    amendFallbackToUnicode(properties);
     this.data = data;
-    this.fontType = getFontType(type, subtype);
+    this.fontType = (0, _fonts_utils.getFontType)(type, subtype, properties.isStandardFont);
     this.fontMatrix = properties.fontMatrix;
     this.widths = properties.widths;
     this.defaultWidth = properties.defaultWidth;
@@ -26710,716 +25815,291 @@ var Font = function FontClosure() {
     this.seacMap = properties.seacMap;
   }
 
-  function int16(b0, b1) {
-    return (b0 << 8) + b1;
+  get renderer() {
+    const renderer = _font_renderer.FontRendererFactory.create(this, _fonts_utils.SEAC_ANALYSIS_ENABLED);
+
+    return (0, _util.shadow)(this, "renderer", renderer);
   }
 
-  function writeSignedInt16(bytes, index, value) {
-    bytes[index + 1] = value;
-    bytes[index] = value >>> 8;
-  }
+  exportData(extraProperties = false) {
+    const exportDataProperties = extraProperties ? [...EXPORT_DATA_PROPERTIES, ...EXPORT_DATA_EXTRA_PROPERTIES] : EXPORT_DATA_PROPERTIES;
+    const data = Object.create(null);
+    let property, value;
 
-  function signedInt16(b0, b1) {
-    var value = (b0 << 8) + b1;
-    return value & 1 << 15 ? value - 0x10000 : value;
-  }
+    for (property of exportDataProperties) {
+      value = this[property];
 
-  function int32(b0, b1, b2, b3) {
-    return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
-  }
-
-  function string16(value) {
-    return String.fromCharCode(value >> 8 & 0xff, value & 0xff);
-  }
-
-  function safeString16(value) {
-    if (value > 0x7fff) {
-      value = 0x7fff;
-    } else if (value < -0x8000) {
-      value = -0x8000;
-    }
-
-    return String.fromCharCode(value >> 8 & 0xff, value & 0xff);
-  }
-
-  function isTrueTypeFile(file) {
-    var header = file.peekBytes(4);
-    return (0, _core_utils.readUint32)(header, 0) === 0x00010000 || (0, _util.bytesToString)(header) === "true";
-  }
-
-  function isTrueTypeCollectionFile(file) {
-    const header = file.peekBytes(4);
-    return (0, _util.bytesToString)(header) === "ttcf";
-  }
-
-  function isOpenTypeFile(file) {
-    var header = file.peekBytes(4);
-    return (0, _util.bytesToString)(header) === "OTTO";
-  }
-
-  function isType1File(file) {
-    var header = file.peekBytes(2);
-
-    if (header[0] === 0x25 && header[1] === 0x21) {
-      return true;
-    }
-
-    if (header[0] === 0x80 && header[1] === 0x01) {
-      return true;
-    }
-
-    return false;
-  }
-
-  function isCFFFile(file) {
-    const header = file.peekBytes(4);
-
-    if (header[0] >= 1 && header[3] >= 1 && header[3] <= 4) {
-      return true;
-    }
-
-    return false;
-  }
-
-  function getFontFileType(file, {
-    type,
-    subtype,
-    composite
-  }) {
-    let fileType, fileSubtype;
-
-    if (isTrueTypeFile(file) || isTrueTypeCollectionFile(file)) {
-      if (composite) {
-        fileType = "CIDFontType2";
-      } else {
-        fileType = "TrueType";
-      }
-    } else if (isOpenTypeFile(file)) {
-      if (composite) {
-        fileType = "CIDFontType2";
-      } else {
-        fileType = "OpenType";
-      }
-    } else if (isType1File(file)) {
-      if (composite) {
-        fileType = "CIDFontType0";
-      } else {
-        fileType = type === "MMType1" ? "MMType1" : "Type1";
-      }
-    } else if (isCFFFile(file)) {
-      if (composite) {
-        fileType = "CIDFontType0";
-        fileSubtype = "CIDFontType0C";
-      } else {
-        fileType = type === "MMType1" ? "MMType1" : "Type1";
-        fileSubtype = "Type1C";
-      }
-    } else {
-      (0, _util.warn)("getFontFileType: Unable to detect correct font file Type/Subtype.");
-      fileType = type;
-      fileSubtype = subtype;
-    }
-
-    return [fileType, fileSubtype];
-  }
-
-  function buildToFontChar(encoding, glyphsUnicodeMap, differences) {
-    var toFontChar = [],
-        unicode;
-
-    for (var i = 0, ii = encoding.length; i < ii; i++) {
-      unicode = (0, _unicode.getUnicodeForGlyph)(encoding[i], glyphsUnicodeMap);
-
-      if (unicode !== -1) {
-        toFontChar[i] = unicode;
+      if (value !== undefined) {
+        data[property] = value;
       }
     }
 
-    for (var charCode in differences) {
-      unicode = (0, _unicode.getUnicodeForGlyph)(differences[charCode], glyphsUnicodeMap);
-
-      if (unicode !== -1) {
-        toFontChar[+charCode] = unicode;
-      }
-    }
-
-    return toFontChar;
+    return data;
   }
 
-  function adjustMapping(charCodeToGlyphId, hasGlyph, newGlyphZeroId) {
-    var newMap = Object.create(null);
-    var toFontChar = [];
-    var privateUseAreaIndex = 0;
-    var nextAvailableFontCharCode = PRIVATE_USE_AREAS[privateUseAreaIndex][0];
-    var privateUseOffetEnd = PRIVATE_USE_AREAS[privateUseAreaIndex][1];
-
-    for (var originalCharCode in charCodeToGlyphId) {
-      originalCharCode |= 0;
-      var glyphId = charCodeToGlyphId[originalCharCode];
-
-      if (!hasGlyph(glyphId)) {
-        continue;
-      }
-
-      if (nextAvailableFontCharCode > privateUseOffetEnd) {
-        privateUseAreaIndex++;
-
-        if (privateUseAreaIndex >= PRIVATE_USE_AREAS.length) {
-          (0, _util.warn)("Ran out of space in font private use area.");
-          break;
-        }
-
-        nextAvailableFontCharCode = PRIVATE_USE_AREAS[privateUseAreaIndex][0];
-        privateUseOffetEnd = PRIVATE_USE_AREAS[privateUseAreaIndex][1];
-      }
-
-      var fontCharCode = nextAvailableFontCharCode++;
-
-      if (glyphId === 0) {
-        glyphId = newGlyphZeroId;
-      }
-
-      newMap[fontCharCode] = glyphId;
-      toFontChar[originalCharCode] = fontCharCode;
-    }
-
-    return {
-      toFontChar,
-      charCodeToGlyphId: newMap,
-      nextAvailableFontCharCode
-    };
-  }
-
-  function getRanges(glyphs, numGlyphs) {
-    var codes = [];
-
-    for (var charCode in glyphs) {
-      if (glyphs[charCode] >= numGlyphs) {
-        continue;
-      }
-
-      codes.push({
-        fontCharCode: charCode | 0,
-        glyphId: glyphs[charCode]
-      });
-    }
-
-    if (codes.length === 0) {
-      codes.push({
-        fontCharCode: 0,
-        glyphId: 0
-      });
-    }
-
-    codes.sort(function fontGetRangesSort(a, b) {
-      return a.fontCharCode - b.fontCharCode;
-    });
-    var ranges = [];
-    var length = codes.length;
-
-    for (var n = 0; n < length;) {
-      var start = codes[n].fontCharCode;
-      var codeIndices = [codes[n].glyphId];
-      ++n;
-      var end = start;
-
-      while (n < length && end + 1 === codes[n].fontCharCode) {
-        codeIndices.push(codes[n].glyphId);
-        ++end;
-        ++n;
-
-        if (end === 0xffff) {
-          break;
-        }
-      }
-
-      ranges.push([start, end, codeIndices]);
-    }
-
-    return ranges;
-  }
-
-  function createCmapTable(glyphs, numGlyphs) {
-    var ranges = getRanges(glyphs, numGlyphs);
-    var numTables = ranges[ranges.length - 1][1] > 0xffff ? 2 : 1;
-    var cmap = "\x00\x00" + string16(numTables) + "\x00\x03" + "\x00\x01" + (0, _util.string32)(4 + numTables * 8);
-    var i, ii, j, jj;
-
-    for (i = ranges.length - 1; i >= 0; --i) {
-      if (ranges[i][0] <= 0xffff) {
-        break;
-      }
-    }
-
-    var bmpLength = i + 1;
-
-    if (ranges[i][0] < 0xffff && ranges[i][1] === 0xffff) {
-      ranges[i][1] = 0xfffe;
-    }
-
-    var trailingRangesCount = ranges[i][1] < 0xffff ? 1 : 0;
-    var segCount = bmpLength + trailingRangesCount;
-    var searchParams = OpenTypeFileBuilder.getSearchParams(segCount, 2);
-    var startCount = "";
-    var endCount = "";
-    var idDeltas = "";
-    var idRangeOffsets = "";
-    var glyphsIds = "";
-    var bias = 0;
-    var range, start, end, codes;
-
-    for (i = 0, ii = bmpLength; i < ii; i++) {
-      range = ranges[i];
-      start = range[0];
-      end = range[1];
-      startCount += string16(start);
-      endCount += string16(end);
-      codes = range[2];
-      var contiguous = true;
-
-      for (j = 1, jj = codes.length; j < jj; ++j) {
-        if (codes[j] !== codes[j - 1] + 1) {
-          contiguous = false;
-          break;
-        }
-      }
-
-      if (!contiguous) {
-        var offset = (segCount - i) * 2 + bias * 2;
-        bias += end - start + 1;
-        idDeltas += string16(0);
-        idRangeOffsets += string16(offset);
-
-        for (j = 0, jj = codes.length; j < jj; ++j) {
-          glyphsIds += string16(codes[j]);
-        }
-      } else {
-        var startCode = codes[0];
-        idDeltas += string16(startCode - start & 0xffff);
-        idRangeOffsets += string16(0);
-      }
-    }
-
-    if (trailingRangesCount > 0) {
-      endCount += "\xFF\xFF";
-      startCount += "\xFF\xFF";
-      idDeltas += "\x00\x01";
-      idRangeOffsets += "\x00\x00";
-    }
-
-    var format314 = "\x00\x00" + string16(2 * segCount) + string16(searchParams.range) + string16(searchParams.entry) + string16(searchParams.rangeShift) + endCount + "\x00\x00" + startCount + idDeltas + idRangeOffsets + glyphsIds;
-    var format31012 = "";
-    var header31012 = "";
-
-    if (numTables > 1) {
-      cmap += "\x00\x03" + "\x00\x0A" + (0, _util.string32)(4 + numTables * 8 + 4 + format314.length);
-      format31012 = "";
-
-      for (i = 0, ii = ranges.length; i < ii; i++) {
-        range = ranges[i];
-        start = range[0];
-        codes = range[2];
-        var code = codes[0];
-
-        for (j = 1, jj = codes.length; j < jj; ++j) {
-          if (codes[j] !== codes[j - 1] + 1) {
-            end = range[0] + j - 1;
-            format31012 += (0, _util.string32)(start) + (0, _util.string32)(end) + (0, _util.string32)(code);
-            start = end + 1;
-            code = codes[j];
-          }
-        }
-
-        format31012 += (0, _util.string32)(start) + (0, _util.string32)(range[1]) + (0, _util.string32)(code);
-      }
-
-      header31012 = "\x00\x0C" + "\x00\x00" + (0, _util.string32)(format31012.length + 16) + "\x00\x00\x00\x00" + (0, _util.string32)(format31012.length / 12);
-    }
-
-    return cmap + "\x00\x04" + string16(format314.length + 4) + format314 + header31012 + format31012;
-  }
-
-  function validateOS2Table(os2, file) {
-    file.pos = (file.start || 0) + os2.offset;
-    var version = file.getUint16();
-    file.skip(60);
-    var selection = file.getUint16();
-
-    if (version < 4 && selection & 0x0300) {
-      return false;
-    }
-
-    var firstChar = file.getUint16();
-    var lastChar = file.getUint16();
-
-    if (firstChar > lastChar) {
-      return false;
-    }
-
-    file.skip(6);
-    var usWinAscent = file.getUint16();
-
-    if (usWinAscent === 0) {
-      return false;
-    }
-
-    os2.data[8] = os2.data[9] = 0;
-    return true;
-  }
-
-  function createOS2Table(properties, charstrings, override) {
-    override = override || {
-      unitsPerEm: 0,
-      yMax: 0,
-      yMin: 0,
-      ascent: 0,
-      descent: 0
-    };
-    var ulUnicodeRange1 = 0;
-    var ulUnicodeRange2 = 0;
-    var ulUnicodeRange3 = 0;
-    var ulUnicodeRange4 = 0;
-    var firstCharIndex = null;
-    var lastCharIndex = 0;
-
-    if (charstrings) {
-      for (var code in charstrings) {
-        code |= 0;
-
-        if (firstCharIndex > code || !firstCharIndex) {
-          firstCharIndex = code;
-        }
-
-        if (lastCharIndex < code) {
-          lastCharIndex = code;
-        }
-
-        var position = (0, _unicode.getUnicodeRangeFor)(code);
-
-        if (position < 32) {
-          ulUnicodeRange1 |= 1 << position;
-        } else if (position < 64) {
-          ulUnicodeRange2 |= 1 << position - 32;
-        } else if (position < 96) {
-          ulUnicodeRange3 |= 1 << position - 64;
-        } else if (position < 123) {
-          ulUnicodeRange4 |= 1 << position - 96;
-        } else {
-          throw new _util.FormatError("Unicode ranges Bits > 123 are reserved for internal usage");
-        }
-      }
-
-      if (lastCharIndex > 0xffff) {
-        lastCharIndex = 0xffff;
-      }
-    } else {
-      firstCharIndex = 0;
-      lastCharIndex = 255;
-    }
-
-    var bbox = properties.bbox || [0, 0, 0, 0];
-    var unitsPerEm = override.unitsPerEm || 1 / (properties.fontMatrix || _util.FONT_IDENTITY_MATRIX)[0];
-    var scale = properties.ascentScaled ? 1.0 : unitsPerEm / PDF_GLYPH_SPACE_UNITS;
-    var typoAscent = override.ascent || Math.round(scale * (properties.ascent || bbox[3]));
-    var typoDescent = override.descent || Math.round(scale * (properties.descent || bbox[1]));
-
-    if (typoDescent > 0 && properties.descent > 0 && bbox[1] < 0) {
-      typoDescent = -typoDescent;
-    }
-
-    var winAscent = override.yMax || typoAscent;
-    var winDescent = -override.yMin || -typoDescent;
-    return "\x00\x03" + "\x02\x24" + "\x01\xF4" + "\x00\x05" + "\x00\x00" + "\x02\x8A" + "\x02\xBB" + "\x00\x00" + "\x00\x8C" + "\x02\x8A" + "\x02\xBB" + "\x00\x00" + "\x01\xDF" + "\x00\x31" + "\x01\x02" + "\x00\x00" + "\x00\x00\x06" + String.fromCharCode(properties.fixedPitch ? 0x09 : 0x00) + "\x00\x00\x00\x00\x00\x00" + (0, _util.string32)(ulUnicodeRange1) + (0, _util.string32)(ulUnicodeRange2) + (0, _util.string32)(ulUnicodeRange3) + (0, _util.string32)(ulUnicodeRange4) + "\x2A\x32\x31\x2A" + string16(properties.italicAngle ? 1 : 0) + string16(firstCharIndex || properties.firstChar) + string16(lastCharIndex || properties.lastChar) + string16(typoAscent) + string16(typoDescent) + "\x00\x64" + string16(winAscent) + string16(winDescent) + "\x00\x00\x00\x00" + "\x00\x00\x00\x00" + string16(properties.xHeight) + string16(properties.capHeight) + string16(0) + string16(firstCharIndex || properties.firstChar) + "\x00\x03";
-  }
-
-  function createPostTable(properties) {
-    var angle = Math.floor(properties.italicAngle * 2 ** 16);
-    return "\x00\x03\x00\x00" + (0, _util.string32)(angle) + "\x00\x00" + "\x00\x00" + (0, _util.string32)(properties.fixedPitch) + "\x00\x00\x00\x00" + "\x00\x00\x00\x00" + "\x00\x00\x00\x00" + "\x00\x00\x00\x00";
-  }
-
-  function createNameTable(name, proto) {
-    if (!proto) {
-      proto = [[], []];
-    }
-
-    var strings = [proto[0][0] || "Original licence", proto[0][1] || name, proto[0][2] || "Unknown", proto[0][3] || "uniqueID", proto[0][4] || name, proto[0][5] || "Version 0.11", proto[0][6] || "", proto[0][7] || "Unknown", proto[0][8] || "Unknown", proto[0][9] || "Unknown"];
-    var stringsUnicode = [];
-    var i, ii, j, jj, str;
-
-    for (i = 0, ii = strings.length; i < ii; i++) {
-      str = proto[1][i] || strings[i];
-      var strBufUnicode = [];
-
-      for (j = 0, jj = str.length; j < jj; j++) {
-        strBufUnicode.push(string16(str.charCodeAt(j)));
-      }
-
-      stringsUnicode.push(strBufUnicode.join(""));
-    }
-
-    var names = [strings, stringsUnicode];
-    var platforms = ["\x00\x01", "\x00\x03"];
-    var encodings = ["\x00\x00", "\x00\x01"];
-    var languages = ["\x00\x00", "\x04\x09"];
-    var namesRecordCount = strings.length * platforms.length;
-    var nameTable = "\x00\x00" + string16(namesRecordCount) + string16(namesRecordCount * 12 + 6);
-    var strOffset = 0;
-
-    for (i = 0, ii = platforms.length; i < ii; i++) {
-      var strs = names[i];
-
-      for (j = 0, jj = strs.length; j < jj; j++) {
-        str = strs[j];
-        var nameRecord = platforms[i] + encodings[i] + languages[i] + string16(j) + string16(str.length) + string16(strOffset);
-        nameTable += nameRecord;
-        strOffset += str.length;
-      }
-    }
-
-    nameTable += strings.join("") + stringsUnicode.join("");
-    return nameTable;
-  }
-
-  Font.prototype = {
-    name: null,
-    font: null,
-    mimetype: null,
-    disableFontFace: false,
-
-    get renderer() {
-      var renderer = _font_renderer.FontRendererFactory.create(this, SEAC_ANALYSIS_ENABLED);
-
-      return (0, _util.shadow)(this, "renderer", renderer);
-    },
-
-    exportData(extraProperties = false) {
-      const exportDataProperties = extraProperties ? [...EXPORT_DATA_PROPERTIES, ...EXPORT_DATA_EXTRA_PROPERTIES] : EXPORT_DATA_PROPERTIES;
-      const data = Object.create(null);
-      let property, value;
-
-      for (property of exportDataProperties) {
-        value = this[property];
-
-        if (value !== undefined) {
-          data[property] = value;
-        }
-      }
-
-      return data;
-    },
-
-    fallbackToSystemFont: function Font_fallbackToSystemFont() {
-      this.missingFile = true;
-      var name = this.name;
-      var type = this.type;
-      var subtype = this.subtype;
-      let fontName = name.replace(/[,_]/g, "-").replace(/\s/g, "");
-      var stdFontMap = (0, _standard_fonts.getStdFontMap)(),
+  fallbackToSystemFont(properties) {
+    this.missingFile = true;
+    const name = this.name;
+    const type = this.type;
+    const subtype = this.subtype;
+    let fontName = (0, _fonts_utils.normalizeFontName)(name);
+    const stdFontMap = (0, _standard_fonts.getStdFontMap)(),
           nonStdFontMap = (0, _standard_fonts.getNonStdFontMap)();
-      var isStandardFont = !!stdFontMap[fontName] || !!(nonStdFontMap[fontName] && stdFontMap[nonStdFontMap[fontName]]);
-      fontName = stdFontMap[fontName] || nonStdFontMap[fontName] || fontName;
-      this.bold = fontName.search(/bold/gi) !== -1;
-      this.italic = fontName.search(/oblique/gi) !== -1 || fontName.search(/italic/gi) !== -1;
-      this.black = name.search(/Black/g) !== -1;
-      this.remeasure = Object.keys(this.widths).length > 0;
+    const isStandardFont = !!stdFontMap[fontName];
+    const isMappedToStandardFont = !!(nonStdFontMap[fontName] && stdFontMap[nonStdFontMap[fontName]]);
+    fontName = stdFontMap[fontName] || nonStdFontMap[fontName] || fontName;
+    const fontBasicMetricsMap = (0, _metrics.getFontBasicMetrics)();
+    const metrics = fontBasicMetricsMap[fontName];
 
-      if (isStandardFont && type === "CIDFontType2" && this.cidEncoding.startsWith("Identity-")) {
-        const GlyphMapForStandardFonts = (0, _standard_fonts.getGlyphMapForStandardFonts)();
-        const map = [];
+    if (metrics) {
+      if (isNaN(this.ascent)) {
+        this.ascent = metrics.ascent / PDF_GLYPH_SPACE_UNITS;
+      }
 
-        for (const charCode in GlyphMapForStandardFonts) {
-          map[+charCode] = GlyphMapForStandardFonts[charCode];
-        }
+      if (isNaN(this.descent)) {
+        this.descent = metrics.descent / PDF_GLYPH_SPACE_UNITS;
+      }
 
-        if (/Arial-?Black/i.test(name)) {
-          var SupplementalGlyphMapForArialBlack = (0, _standard_fonts.getSupplementalGlyphMapForArialBlack)();
+      if (isNaN(this.capHeight)) {
+        this.capHeight = metrics.capHeight / PDF_GLYPH_SPACE_UNITS;
+      }
+    }
 
-          for (const charCode in SupplementalGlyphMapForArialBlack) {
-            map[+charCode] = SupplementalGlyphMapForArialBlack[charCode];
-          }
-        } else if (/Calibri/i.test(name)) {
-          const SupplementalGlyphMapForCalibri = (0, _standard_fonts.getSupplementalGlyphMapForCalibri)();
+    this.bold = fontName.search(/bold/gi) !== -1;
+    this.italic = fontName.search(/oblique/gi) !== -1 || fontName.search(/italic/gi) !== -1;
+    this.black = name.search(/Black/g) !== -1;
+    const isNarrow = name.search(/Narrow/g) !== -1;
+    this.remeasure = (!isStandardFont || isNarrow) && Object.keys(this.widths).length > 0;
 
-          for (const charCode in SupplementalGlyphMapForCalibri) {
-            map[+charCode] = SupplementalGlyphMapForCalibri[charCode];
+    if ((isStandardFont || isMappedToStandardFont) && type === "CIDFontType2" && this.cidEncoding.startsWith("Identity-")) {
+      const cidToGidMap = properties.cidToGidMap;
+      const map = [];
+      applyStandardFontGlyphMap(map, (0, _standard_fonts.getGlyphMapForStandardFonts)());
+
+      if (/Arial-?Black/i.test(name)) {
+        applyStandardFontGlyphMap(map, (0, _standard_fonts.getSupplementalGlyphMapForArialBlack)());
+      } else if (/Calibri/i.test(name)) {
+        applyStandardFontGlyphMap(map, (0, _standard_fonts.getSupplementalGlyphMapForCalibri)());
+      }
+
+      if (cidToGidMap) {
+        for (const charCode in map) {
+          const cid = map[charCode];
+
+          if (cidToGidMap[cid] !== undefined) {
+            map[+charCode] = cidToGidMap[cid];
           }
         }
 
-        var isIdentityUnicode = this.toUnicode instanceof IdentityToUnicodeMap;
-
-        if (!isIdentityUnicode) {
+        if (cidToGidMap.length !== this.toUnicode.length && properties.hasIncludedToUnicodeMap && this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap) {
           this.toUnicode.forEach(function (charCode, unicodeCharCode) {
-            map[+charCode] = unicodeCharCode;
+            const cid = map[charCode];
+
+            if (cidToGidMap[cid] === undefined) {
+              map[+charCode] = unicodeCharCode;
+            }
           });
         }
+      }
 
-        this.toFontChar = map;
-        this.toUnicode = new ToUnicodeMap(map);
-      } else if (/Symbol/i.test(fontName)) {
-        this.toFontChar = buildToFontChar(_encodings.SymbolSetEncoding, (0, _glyphlist.getGlyphsUnicode)(), this.differences);
-      } else if (/Dingbats/i.test(fontName)) {
-        if (/Wingdings/i.test(name)) {
-          (0, _util.warn)("Non-embedded Wingdings font, falling back to ZapfDingbats.");
-        }
-
-        this.toFontChar = buildToFontChar(_encodings.ZapfDingbatsEncoding, (0, _glyphlist.getDingbatsGlyphsUnicode)(), this.differences);
-      } else if (isStandardFont) {
-        this.toFontChar = buildToFontChar(this.defaultEncoding, (0, _glyphlist.getGlyphsUnicode)(), this.differences);
-      } else {
-        const glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
-        const map = [];
-        this.toUnicode.forEach((charCode, unicodeCharCode) => {
-          if (!this.composite) {
-            var glyphName = this.differences[charCode] || this.defaultEncoding[charCode];
-            const unicode = (0, _unicode.getUnicodeForGlyph)(glyphName, glyphsUnicodeMap);
-
-            if (unicode !== -1) {
-              unicodeCharCode = unicode;
-            }
-          }
-
+      if (!(this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap)) {
+        this.toUnicode.forEach(function (charCode, unicodeCharCode) {
           map[+charCode] = unicodeCharCode;
         });
+      }
 
-        if (this.composite && this.toUnicode instanceof IdentityToUnicodeMap) {
-          if (/Verdana/i.test(name)) {
-            const GlyphMapForStandardFonts = (0, _standard_fonts.getGlyphMapForStandardFonts)();
+      this.toFontChar = map;
+      this.toUnicode = new _to_unicode_map.ToUnicodeMap(map);
+    } else if (/Symbol/i.test(fontName)) {
+      this.toFontChar = buildToFontChar(_encodings.SymbolSetEncoding, (0, _glyphlist.getGlyphsUnicode)(), this.differences);
+    } else if (/Dingbats/i.test(fontName)) {
+      if (/Wingdings/i.test(name)) {
+        (0, _util.warn)("Non-embedded Wingdings font, falling back to ZapfDingbats.");
+      }
 
-            for (const charCode in GlyphMapForStandardFonts) {
-              map[+charCode] = GlyphMapForStandardFonts[charCode];
+      this.toFontChar = buildToFontChar(_encodings.ZapfDingbatsEncoding, (0, _glyphlist.getDingbatsGlyphsUnicode)(), this.differences);
+    } else if (isStandardFont) {
+      const map = buildToFontChar(this.defaultEncoding, (0, _glyphlist.getGlyphsUnicode)(), this.differences);
+
+      if (type === "CIDFontType2" && !this.cidEncoding.startsWith("Identity-") && !(this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap)) {
+        this.toUnicode.forEach(function (charCode, unicodeCharCode) {
+          map[+charCode] = unicodeCharCode;
+        });
+      }
+
+      this.toFontChar = map;
+    } else {
+      const glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+      const map = [];
+      this.toUnicode.forEach((charCode, unicodeCharCode) => {
+        if (!this.composite) {
+          const glyphName = this.differences[charCode] || this.defaultEncoding[charCode];
+          const unicode = (0, _unicode.getUnicodeForGlyph)(glyphName, glyphsUnicodeMap);
+
+          if (unicode !== -1) {
+            unicodeCharCode = unicode;
+          }
+        }
+
+        map[+charCode] = unicodeCharCode;
+      });
+
+      if (this.composite && this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap) {
+        if (/Verdana/i.test(name)) {
+          applyStandardFontGlyphMap(map, (0, _standard_fonts.getGlyphMapForStandardFonts)());
+        }
+      }
+
+      this.toFontChar = map;
+    }
+
+    amendFallbackToUnicode(properties);
+    this.loadedName = fontName.split("-")[0];
+    this.fontType = (0, _fonts_utils.getFontType)(type, subtype, properties.isStandardFont);
+  }
+
+  checkAndRepair(name, font, properties) {
+    const VALID_TABLES = ["OS/2", "cmap", "head", "hhea", "hmtx", "maxp", "name", "post", "loca", "glyf", "fpgm", "prep", "cvt ", "CFF "];
+
+    function readTables(file, numTables) {
+      const tables = Object.create(null);
+      tables["OS/2"] = null;
+      tables.cmap = null;
+      tables.head = null;
+      tables.hhea = null;
+      tables.hmtx = null;
+      tables.maxp = null;
+      tables.name = null;
+      tables.post = null;
+
+      for (let i = 0; i < numTables; i++) {
+        const table = readTableEntry(file);
+
+        if (!VALID_TABLES.includes(table.tag)) {
+          continue;
+        }
+
+        if (table.length === 0) {
+          continue;
+        }
+
+        tables[table.tag] = table;
+      }
+
+      return tables;
+    }
+
+    function readTableEntry(file) {
+      const tag = file.getString(4);
+      const checksum = file.getInt32() >>> 0;
+      const offset = file.getInt32() >>> 0;
+      const length = file.getInt32() >>> 0;
+      const previousPosition = file.pos;
+      file.pos = file.start || 0;
+      file.skip(offset);
+      const data = file.getBytes(length);
+      file.pos = previousPosition;
+
+      if (tag === "head") {
+        data[8] = data[9] = data[10] = data[11] = 0;
+        data[17] |= 0x20;
+      }
+
+      return {
+        tag,
+        checksum,
+        length,
+        offset,
+        data
+      };
+    }
+
+    function readOpenTypeHeader(ttf) {
+      return {
+        version: ttf.getString(4),
+        numTables: ttf.getUint16(),
+        searchRange: ttf.getUint16(),
+        entrySelector: ttf.getUint16(),
+        rangeShift: ttf.getUint16()
+      };
+    }
+
+    function readTrueTypeCollectionHeader(ttc) {
+      const ttcTag = ttc.getString(4);
+      (0, _util.assert)(ttcTag === "ttcf", "Must be a TrueType Collection font.");
+      const majorVersion = ttc.getUint16();
+      const minorVersion = ttc.getUint16();
+      const numFonts = ttc.getInt32() >>> 0;
+      const offsetTable = [];
+
+      for (let i = 0; i < numFonts; i++) {
+        offsetTable.push(ttc.getInt32() >>> 0);
+      }
+
+      const header = {
+        ttcTag,
+        majorVersion,
+        minorVersion,
+        numFonts,
+        offsetTable
+      };
+
+      switch (majorVersion) {
+        case 1:
+          return header;
+
+        case 2:
+          header.dsigTag = ttc.getInt32() >>> 0;
+          header.dsigLength = ttc.getInt32() >>> 0;
+          header.dsigOffset = ttc.getInt32() >>> 0;
+          return header;
+      }
+
+      throw new _util.FormatError(`Invalid TrueType Collection majorVersion: ${majorVersion}.`);
+    }
+
+    function readTrueTypeCollectionData(ttc, fontName) {
+      const {
+        numFonts,
+        offsetTable
+      } = readTrueTypeCollectionHeader(ttc);
+      const fontNameParts = fontName.split("+");
+      let fallbackData;
+
+      for (let i = 0; i < numFonts; i++) {
+        ttc.pos = (ttc.start || 0) + offsetTable[i];
+        const potentialHeader = readOpenTypeHeader(ttc);
+        const potentialTables = readTables(ttc, potentialHeader.numTables);
+
+        if (!potentialTables.name) {
+          throw new _util.FormatError('TrueType Collection font must contain a "name" table.');
+        }
+
+        const nameTable = readNameTable(potentialTables.name);
+
+        for (let j = 0, jj = nameTable.length; j < jj; j++) {
+          for (let k = 0, kk = nameTable[j].length; k < kk; k++) {
+            const nameEntry = nameTable[j][k] && nameTable[j][k].replace(/\s/g, "");
+
+            if (!nameEntry) {
+              continue;
             }
-          }
-        }
 
-        this.toFontChar = map;
-      }
+            if (nameEntry === fontName) {
+              return {
+                header: potentialHeader,
+                tables: potentialTables
+              };
+            }
 
-      this.loadedName = fontName.split("-")[0];
-      this.fontType = getFontType(type, subtype);
-    },
-    checkAndRepair: function Font_checkAndRepair(name, font, properties) {
-      const VALID_TABLES = ["OS/2", "cmap", "head", "hhea", "hmtx", "maxp", "name", "post", "loca", "glyf", "fpgm", "prep", "cvt ", "CFF "];
+            if (fontNameParts.length < 2) {
+              continue;
+            }
 
-      function readTables(file, numTables) {
-        const tables = Object.create(null);
-        tables["OS/2"] = null;
-        tables.cmap = null;
-        tables.head = null;
-        tables.hhea = null;
-        tables.hmtx = null;
-        tables.maxp = null;
-        tables.name = null;
-        tables.post = null;
-
-        for (let i = 0; i < numTables; i++) {
-          const table = readTableEntry(file);
-
-          if (!VALID_TABLES.includes(table.tag)) {
-            continue;
-          }
-
-          if (table.length === 0) {
-            continue;
-          }
-
-          tables[table.tag] = table;
-        }
-
-        return tables;
-      }
-
-      function readTableEntry(file) {
-        var tag = (0, _util.bytesToString)(file.getBytes(4));
-        var checksum = file.getInt32() >>> 0;
-        var offset = file.getInt32() >>> 0;
-        var length = file.getInt32() >>> 0;
-        var previousPosition = file.pos;
-        file.pos = file.start ? file.start : 0;
-        file.skip(offset);
-        var data = file.getBytes(length);
-        file.pos = previousPosition;
-
-        if (tag === "head") {
-          data[8] = data[9] = data[10] = data[11] = 0;
-          data[17] |= 0x20;
-        }
-
-        return {
-          tag,
-          checksum,
-          length,
-          offset,
-          data
-        };
-      }
-
-      function readOpenTypeHeader(ttf) {
-        return {
-          version: (0, _util.bytesToString)(ttf.getBytes(4)),
-          numTables: ttf.getUint16(),
-          searchRange: ttf.getUint16(),
-          entrySelector: ttf.getUint16(),
-          rangeShift: ttf.getUint16()
-        };
-      }
-
-      function readTrueTypeCollectionHeader(ttc) {
-        const ttcTag = (0, _util.bytesToString)(ttc.getBytes(4));
-        (0, _util.assert)(ttcTag === "ttcf", "Must be a TrueType Collection font.");
-        const majorVersion = ttc.getUint16();
-        const minorVersion = ttc.getUint16();
-        const numFonts = ttc.getInt32() >>> 0;
-        const offsetTable = [];
-
-        for (let i = 0; i < numFonts; i++) {
-          offsetTable.push(ttc.getInt32() >>> 0);
-        }
-
-        const header = {
-          ttcTag,
-          majorVersion,
-          minorVersion,
-          numFonts,
-          offsetTable
-        };
-
-        switch (majorVersion) {
-          case 1:
-            return header;
-
-          case 2:
-            header.dsigTag = ttc.getInt32() >>> 0;
-            header.dsigLength = ttc.getInt32() >>> 0;
-            header.dsigOffset = ttc.getInt32() >>> 0;
-            return header;
-        }
-
-        throw new _util.FormatError(`Invalid TrueType Collection majorVersion: ${majorVersion}.`);
-      }
-
-      function readTrueTypeCollectionData(ttc, fontName) {
-        const {
-          numFonts,
-          offsetTable
-        } = readTrueTypeCollectionHeader(ttc);
-
-        for (let i = 0; i < numFonts; i++) {
-          ttc.pos = (ttc.start || 0) + offsetTable[i];
-          const potentialHeader = readOpenTypeHeader(ttc);
-          const potentialTables = readTables(ttc, potentialHeader.numTables);
-
-          if (!potentialTables.name) {
-            throw new _util.FormatError('TrueType Collection font must contain a "name" table.');
-          }
-
-          const nameTable = readNameTable(potentialTables.name);
-
-          for (let j = 0, jj = nameTable.length; j < jj; j++) {
-            for (let k = 0, kk = nameTable[j].length; k < kk; k++) {
-              const nameEntry = nameTable[j][k];
-
-              if (nameEntry && nameEntry.replace(/\s/g, "") === fontName) {
-                return {
+            for (const part of fontNameParts) {
+              if (nameEntry === part) {
+                fallbackData = {
+                  name: part,
                   header: potentialHeader,
                   tables: potentialTables
                 };
@@ -27427,1206 +26107,1403 @@ var Font = function FontClosure() {
             }
           }
         }
-
-        throw new _util.FormatError(`TrueType Collection does not contain "${fontName}" font.`);
       }
 
-      function readCmapTable(cmap, file, isSymbolicFont, hasEncoding) {
-        if (!cmap) {
-          (0, _util.warn)("No cmap table available.");
-          return {
-            platformId: -1,
-            encodingId: -1,
-            mappings: [],
-            hasShortCmap: false
+      if (fallbackData) {
+        (0, _util.warn)(`TrueType Collection does not contain "${fontName}" font, ` + `falling back to "${fallbackData.name}" font instead.`);
+        return {
+          header: fallbackData.header,
+          tables: fallbackData.tables
+        };
+      }
+
+      throw new _util.FormatError(`TrueType Collection does not contain "${fontName}" font.`);
+    }
+
+    function readCmapTable(cmap, file, isSymbolicFont, hasEncoding) {
+      if (!cmap) {
+        (0, _util.warn)("No cmap table available.");
+        return {
+          platformId: -1,
+          encodingId: -1,
+          mappings: [],
+          hasShortCmap: false
+        };
+      }
+
+      let segment;
+      let start = (file.start || 0) + cmap.offset;
+      file.pos = start;
+      file.skip(2);
+      const numTables = file.getUint16();
+      let potentialTable;
+      let canBreak = false;
+
+      for (let i = 0; i < numTables; i++) {
+        const platformId = file.getUint16();
+        const encodingId = file.getUint16();
+        const offset = file.getInt32() >>> 0;
+        let useTable = false;
+
+        if (potentialTable && potentialTable.platformId === platformId && potentialTable.encodingId === encodingId) {
+          continue;
+        }
+
+        if (platformId === 0 && (encodingId === 0 || encodingId === 1 || encodingId === 3)) {
+          useTable = true;
+        } else if (platformId === 1 && encodingId === 0) {
+          useTable = true;
+        } else if (platformId === 3 && encodingId === 1 && (hasEncoding || !potentialTable)) {
+          useTable = true;
+
+          if (!isSymbolicFont) {
+            canBreak = true;
+          }
+        } else if (isSymbolicFont && platformId === 3 && encodingId === 0) {
+          useTable = true;
+          let correctlySorted = true;
+
+          if (i < numTables - 1) {
+            const nextBytes = file.peekBytes(2),
+                  nextPlatformId = int16(nextBytes[0], nextBytes[1]);
+
+            if (nextPlatformId < platformId) {
+              correctlySorted = false;
+            }
+          }
+
+          if (correctlySorted) {
+            canBreak = true;
+          }
+        }
+
+        if (useTable) {
+          potentialTable = {
+            platformId,
+            encodingId,
+            offset
           };
         }
 
-        var segment;
-        var start = (file.start ? file.start : 0) + cmap.offset;
-        file.pos = start;
-        file.skip(2);
-        var numTables = file.getUint16();
-        var potentialTable;
-        var canBreak = false;
+        if (canBreak) {
+          break;
+        }
+      }
 
-        for (var i = 0; i < numTables; i++) {
-          var platformId = file.getUint16();
-          var encodingId = file.getUint16();
-          var offset = file.getInt32() >>> 0;
-          var useTable = false;
+      if (potentialTable) {
+        file.pos = start + potentialTable.offset;
+      }
 
-          if (potentialTable && potentialTable.platformId === platformId && potentialTable.encodingId === encodingId) {
+      if (!potentialTable || file.peekByte() === -1) {
+        (0, _util.warn)("Could not find a preferred cmap table.");
+        return {
+          platformId: -1,
+          encodingId: -1,
+          mappings: [],
+          hasShortCmap: false
+        };
+      }
+
+      const format = file.getUint16();
+      let hasShortCmap = false;
+      const mappings = [];
+      let j, glyphId;
+
+      if (format === 0) {
+        file.skip(2 + 2);
+
+        for (j = 0; j < 256; j++) {
+          const index = file.getByte();
+
+          if (!index) {
             continue;
           }
 
-          if (platformId === 0 && (encodingId === 0 || encodingId === 1 || encodingId === 3)) {
-            useTable = true;
-          } else if (platformId === 1 && encodingId === 0) {
-            useTable = true;
-          } else if (platformId === 3 && encodingId === 1 && (hasEncoding || !potentialTable)) {
-            useTable = true;
-
-            if (!isSymbolicFont) {
-              canBreak = true;
-            }
-          } else if (isSymbolicFont && platformId === 3 && encodingId === 0) {
-            useTable = true;
-            canBreak = true;
-          }
-
-          if (useTable) {
-            potentialTable = {
-              platformId,
-              encodingId,
-              offset
-            };
-          }
-
-          if (canBreak) {
-            break;
-          }
+          mappings.push({
+            charCode: j,
+            glyphId: index
+          });
         }
 
-        if (potentialTable) {
-          file.pos = start + potentialTable.offset;
-        }
-
-        if (!potentialTable || file.peekByte() === -1) {
-          (0, _util.warn)("Could not find a preferred cmap table.");
-          return {
-            platformId: -1,
-            encodingId: -1,
-            mappings: [],
-            hasShortCmap: false
-          };
-        }
-
-        var format = file.getUint16();
+        hasShortCmap = true;
+      } else if (format === 2) {
         file.skip(2 + 2);
-        var hasShortCmap = false;
-        var mappings = [];
-        var j, glyphId;
+        const subHeaderKeys = [];
+        let maxSubHeaderKey = 0;
 
-        if (format === 0) {
-          for (j = 0; j < 256; j++) {
-            var index = file.getByte();
+        for (let i = 0; i < 256; i++) {
+          const subHeaderKey = file.getUint16() >> 3;
+          subHeaderKeys.push(subHeaderKey);
+          maxSubHeaderKey = Math.max(subHeaderKey, maxSubHeaderKey);
+        }
 
-            if (!index) {
-              continue;
-            }
+        const subHeaders = [];
 
+        for (let i = 0; i <= maxSubHeaderKey; i++) {
+          subHeaders.push({
+            firstCode: file.getUint16(),
+            entryCount: file.getUint16(),
+            idDelta: signedInt16(file.getByte(), file.getByte()),
+            idRangePos: file.pos + file.getUint16()
+          });
+        }
+
+        for (let i = 0; i < 256; i++) {
+          if (subHeaderKeys[i] === 0) {
+            file.pos = subHeaders[0].idRangePos + 2 * i;
+            glyphId = file.getUint16();
             mappings.push({
-              charCode: j,
-              glyphId: index
+              charCode: i,
+              glyphId
             });
-          }
+          } else {
+            const s = subHeaders[subHeaderKeys[i]];
 
-          hasShortCmap = true;
-        } else if (format === 4) {
-          var segCount = file.getUint16() >> 1;
-          file.skip(6);
-          var segIndex,
-              segments = [];
+            for (j = 0; j < s.entryCount; j++) {
+              const charCode = (i << 8) + j + s.firstCode;
+              file.pos = s.idRangePos + 2 * j;
+              glyphId = file.getUint16();
 
-          for (segIndex = 0; segIndex < segCount; segIndex++) {
-            segments.push({
-              end: file.getUint16()
-            });
-          }
-
-          file.skip(2);
-
-          for (segIndex = 0; segIndex < segCount; segIndex++) {
-            segments[segIndex].start = file.getUint16();
-          }
-
-          for (segIndex = 0; segIndex < segCount; segIndex++) {
-            segments[segIndex].delta = file.getUint16();
-          }
-
-          var offsetsCount = 0;
-
-          for (segIndex = 0; segIndex < segCount; segIndex++) {
-            segment = segments[segIndex];
-            var rangeOffset = file.getUint16();
-
-            if (!rangeOffset) {
-              segment.offsetIndex = -1;
-              continue;
-            }
-
-            var offsetIndex = (rangeOffset >> 1) - (segCount - segIndex);
-            segment.offsetIndex = offsetIndex;
-            offsetsCount = Math.max(offsetsCount, offsetIndex + segment.end - segment.start + 1);
-          }
-
-          var offsets = [];
-
-          for (j = 0; j < offsetsCount; j++) {
-            offsets.push(file.getUint16());
-          }
-
-          for (segIndex = 0; segIndex < segCount; segIndex++) {
-            segment = segments[segIndex];
-            start = segment.start;
-            var end = segment.end;
-            var delta = segment.delta;
-            offsetIndex = segment.offsetIndex;
-
-            for (j = start; j <= end; j++) {
-              if (j === 0xffff) {
-                continue;
+              if (glyphId !== 0) {
+                glyphId = (glyphId + s.idDelta) % 65536;
               }
 
-              glyphId = offsetIndex < 0 ? j : offsets[offsetIndex + j - start];
-              glyphId = glyphId + delta & 0xffff;
               mappings.push({
-                charCode: j,
+                charCode,
                 glyphId
               });
             }
           }
-        } else if (format === 6) {
-          var firstCode = file.getUint16();
-          var entryCount = file.getUint16();
+        }
+      } else if (format === 4) {
+        file.skip(2 + 2);
+        const segCount = file.getUint16() >> 1;
+        file.skip(6);
+        const segments = [];
+        let segIndex;
 
-          for (j = 0; j < entryCount; j++) {
-            glyphId = file.getUint16();
-            var charCode = firstCode + j;
+        for (segIndex = 0; segIndex < segCount; segIndex++) {
+          segments.push({
+            end: file.getUint16()
+          });
+        }
+
+        file.skip(2);
+
+        for (segIndex = 0; segIndex < segCount; segIndex++) {
+          segments[segIndex].start = file.getUint16();
+        }
+
+        for (segIndex = 0; segIndex < segCount; segIndex++) {
+          segments[segIndex].delta = file.getUint16();
+        }
+
+        let offsetsCount = 0,
+            offsetIndex;
+
+        for (segIndex = 0; segIndex < segCount; segIndex++) {
+          segment = segments[segIndex];
+          const rangeOffset = file.getUint16();
+
+          if (!rangeOffset) {
+            segment.offsetIndex = -1;
+            continue;
+          }
+
+          offsetIndex = (rangeOffset >> 1) - (segCount - segIndex);
+          segment.offsetIndex = offsetIndex;
+          offsetsCount = Math.max(offsetsCount, offsetIndex + segment.end - segment.start + 1);
+        }
+
+        const offsets = [];
+
+        for (j = 0; j < offsetsCount; j++) {
+          offsets.push(file.getUint16());
+        }
+
+        for (segIndex = 0; segIndex < segCount; segIndex++) {
+          segment = segments[segIndex];
+          start = segment.start;
+          const end = segment.end;
+          const delta = segment.delta;
+          offsetIndex = segment.offsetIndex;
+
+          for (j = start; j <= end; j++) {
+            if (j === 0xffff) {
+              continue;
+            }
+
+            glyphId = offsetIndex < 0 ? j : offsets[offsetIndex + j - start];
+            glyphId = glyphId + delta & 0xffff;
             mappings.push({
-              charCode,
+              charCode: j,
               glyphId
             });
           }
-        } else {
-          (0, _util.warn)("cmap table has unsupported format: " + format);
-          return {
-            platformId: -1,
-            encodingId: -1,
-            mappings: [],
-            hasShortCmap: false
-          };
         }
+      } else if (format === 6) {
+        file.skip(2 + 2);
+        const firstCode = file.getUint16();
+        const entryCount = file.getUint16();
 
-        mappings.sort(function (a, b) {
-          return a.charCode - b.charCode;
-        });
+        for (j = 0; j < entryCount; j++) {
+          glyphId = file.getUint16();
+          const charCode = firstCode + j;
+          mappings.push({
+            charCode,
+            glyphId
+          });
+        }
+      } else if (format === 12) {
+        file.skip(2 + 4 + 4);
+        const nGroups = file.getInt32() >>> 0;
 
-        for (i = 1; i < mappings.length; i++) {
-          if (mappings[i - 1].charCode === mappings[i].charCode) {
-            mappings.splice(i, 1);
-            i--;
+        for (j = 0; j < nGroups; j++) {
+          const startCharCode = file.getInt32() >>> 0;
+          const endCharCode = file.getInt32() >>> 0;
+          let glyphCode = file.getInt32() >>> 0;
+
+          for (let charCode = startCharCode; charCode <= endCharCode; charCode++) {
+            mappings.push({
+              charCode,
+              glyphId: glyphCode++
+            });
           }
         }
-
+      } else {
+        (0, _util.warn)("cmap table has unsupported format: " + format);
         return {
-          platformId: potentialTable.platformId,
-          encodingId: potentialTable.encodingId,
-          mappings,
-          hasShortCmap
+          platformId: -1,
+          encodingId: -1,
+          mappings: [],
+          hasShortCmap: false
         };
       }
 
-      function sanitizeMetrics(file, header, metrics, numGlyphs, dupFirstEntry) {
-        if (!header) {
-          if (metrics) {
-            metrics.data = null;
-          }
+      mappings.sort(function (a, b) {
+        return a.charCode - b.charCode;
+      });
 
-          return;
-        }
-
-        file.pos = (file.start ? file.start : 0) + header.offset;
-        file.pos += 4;
-        file.pos += 2;
-        file.pos += 2;
-        file.pos += 2;
-        file.pos += 2;
-        file.pos += 2;
-        file.pos += 2;
-        file.pos += 2;
-        file.pos += 2;
-        file.pos += 2;
-        file.pos += 2;
-        file.pos += 8;
-        file.pos += 2;
-        var numOfMetrics = file.getUint16();
-
-        if (numOfMetrics > numGlyphs) {
-          (0, _util.info)("The numOfMetrics (" + numOfMetrics + ") should not be " + "greater than the numGlyphs (" + numGlyphs + ")");
-          numOfMetrics = numGlyphs;
-          header.data[34] = (numOfMetrics & 0xff00) >> 8;
-          header.data[35] = numOfMetrics & 0x00ff;
-        }
-
-        var numOfSidebearings = numGlyphs - numOfMetrics;
-        var numMissing = numOfSidebearings - (metrics.length - numOfMetrics * 4 >> 1);
-
-        if (numMissing > 0) {
-          var entries = new Uint8Array(metrics.length + numMissing * 2);
-          entries.set(metrics.data);
-
-          if (dupFirstEntry) {
-            entries[metrics.length] = metrics.data[2];
-            entries[metrics.length + 1] = metrics.data[3];
-          }
-
-          metrics.data = entries;
+      for (let i = 1; i < mappings.length; i++) {
+        if (mappings[i - 1].charCode === mappings[i].charCode) {
+          mappings.splice(i, 1);
+          i--;
         }
       }
 
-      function sanitizeGlyph(source, sourceStart, sourceEnd, dest, destStart, hintsValid) {
-        var glyphProfile = {
-          length: 0,
-          sizeOfInstructions: 0
-        };
+      return {
+        platformId: potentialTable.platformId,
+        encodingId: potentialTable.encodingId,
+        mappings,
+        hasShortCmap
+      };
+    }
 
-        if (sourceEnd - sourceStart <= 12) {
-          return glyphProfile;
+    function sanitizeMetrics(file, header, metrics, headTable, numGlyphs, dupFirstEntry) {
+      if (!header) {
+        if (metrics) {
+          metrics.data = null;
         }
 
-        var glyf = source.subarray(sourceStart, sourceEnd);
-        var contoursCount = signedInt16(glyf[0], glyf[1]);
+        return;
+      }
 
-        if (contoursCount < 0) {
-          contoursCount = -1;
-          writeSignedInt16(glyf, 0, contoursCount);
-          dest.set(glyf, destStart);
-          glyphProfile.length = glyf.length;
-          return glyphProfile;
+      file.pos = (file.start || 0) + header.offset;
+      file.pos += 4;
+      file.pos += 2;
+      file.pos += 2;
+      file.pos += 2;
+      file.pos += 2;
+      file.pos += 2;
+      file.pos += 2;
+      file.pos += 2;
+      file.pos += 2;
+      file.pos += 2;
+      const caretOffset = file.getUint16();
+      file.pos += 8;
+      file.pos += 2;
+      let numOfMetrics = file.getUint16();
+
+      if (caretOffset !== 0) {
+        const macStyle = int16(headTable.data[44], headTable.data[45]);
+
+        if (!(macStyle & 2)) {
+          header.data[22] = 0;
+          header.data[23] = 0;
+        }
+      }
+
+      if (numOfMetrics > numGlyphs) {
+        (0, _util.info)(`The numOfMetrics (${numOfMetrics}) should not be ` + `greater than the numGlyphs (${numGlyphs}).`);
+        numOfMetrics = numGlyphs;
+        header.data[34] = (numOfMetrics & 0xff00) >> 8;
+        header.data[35] = numOfMetrics & 0x00ff;
+      }
+
+      const numOfSidebearings = numGlyphs - numOfMetrics;
+      const numMissing = numOfSidebearings - (metrics.length - numOfMetrics * 4 >> 1);
+
+      if (numMissing > 0) {
+        const entries = new Uint8Array(metrics.length + numMissing * 2);
+        entries.set(metrics.data);
+
+        if (dupFirstEntry) {
+          entries[metrics.length] = metrics.data[2];
+          entries[metrics.length + 1] = metrics.data[3];
         }
 
-        var i,
-            j = 10,
-            flagsCount = 0;
+        metrics.data = entries;
+      }
+    }
 
-        for (i = 0; i < contoursCount; i++) {
-          var endPoint = glyf[j] << 8 | glyf[j + 1];
-          flagsCount = endPoint + 1;
-          j += 2;
-        }
+    function sanitizeGlyph(source, sourceStart, sourceEnd, dest, destStart, hintsValid) {
+      const glyphProfile = {
+        length: 0,
+        sizeOfInstructions: 0
+      };
 
-        var instructionsStart = j;
-        var instructionsLength = glyf[j] << 8 | glyf[j + 1];
-        glyphProfile.sizeOfInstructions = instructionsLength;
-        j += 2 + instructionsLength;
-        var instructionsEnd = j;
-        var coordinatesLength = 0;
+      if (sourceEnd - sourceStart <= 12) {
+        return glyphProfile;
+      }
 
-        for (i = 0; i < flagsCount; i++) {
-          var flag = glyf[j++];
-
-          if (flag & 0xc0) {
-            glyf[j - 1] = flag & 0x3f;
-          }
-
-          let xLength = 2;
-
-          if (flag & 2) {
-            xLength = 1;
-          } else if (flag & 16) {
-            xLength = 0;
-          }
-
-          let yLength = 2;
-
-          if (flag & 4) {
-            yLength = 1;
-          } else if (flag & 32) {
-            yLength = 0;
-          }
-
-          const xyLength = xLength + yLength;
-          coordinatesLength += xyLength;
-
-          if (flag & 8) {
-            var repeat = glyf[j++];
-            i += repeat;
-            coordinatesLength += repeat * xyLength;
-          }
-        }
-
-        if (coordinatesLength === 0) {
-          return glyphProfile;
-        }
-
-        var glyphDataLength = j + coordinatesLength;
-
-        if (glyphDataLength > glyf.length) {
-          return glyphProfile;
-        }
-
-        if (!hintsValid && instructionsLength > 0) {
-          dest.set(glyf.subarray(0, instructionsStart), destStart);
-          dest.set([0, 0], destStart + instructionsStart);
-          dest.set(glyf.subarray(instructionsEnd, glyphDataLength), destStart + instructionsStart + 2);
-          glyphDataLength -= instructionsLength;
-
-          if (glyf.length - glyphDataLength > 3) {
-            glyphDataLength = glyphDataLength + 3 & ~3;
-          }
-
-          glyphProfile.length = glyphDataLength;
-          return glyphProfile;
-        }
-
-        if (glyf.length - glyphDataLength > 3) {
-          glyphDataLength = glyphDataLength + 3 & ~3;
-          dest.set(glyf.subarray(0, glyphDataLength), destStart);
-          glyphProfile.length = glyphDataLength;
-          return glyphProfile;
-        }
+      const glyf = source.subarray(sourceStart, sourceEnd);
+      let contoursCount = signedInt16(glyf[0], glyf[1]);
 
+      if (contoursCount < 0) {
+        contoursCount = -1;
+        writeSignedInt16(glyf, 0, contoursCount);
         dest.set(glyf, destStart);
         glyphProfile.length = glyf.length;
         return glyphProfile;
       }
 
-      function sanitizeHead(head, numGlyphs, locaLength) {
-        var data = head.data;
-        var version = int32(data[0], data[1], data[2], data[3]);
+      let i,
+          j = 10,
+          flagsCount = 0;
 
-        if (version >> 16 !== 1) {
-          (0, _util.info)("Attempting to fix invalid version in head table: " + version);
-          data[0] = 0;
-          data[1] = 1;
-          data[2] = 0;
-          data[3] = 0;
+      for (i = 0; i < contoursCount; i++) {
+        const endPoint = glyf[j] << 8 | glyf[j + 1];
+        flagsCount = endPoint + 1;
+        j += 2;
+      }
+
+      const instructionsStart = j;
+      const instructionsLength = glyf[j] << 8 | glyf[j + 1];
+      glyphProfile.sizeOfInstructions = instructionsLength;
+      j += 2 + instructionsLength;
+      const instructionsEnd = j;
+      let coordinatesLength = 0;
+
+      for (i = 0; i < flagsCount; i++) {
+        const flag = glyf[j++];
+
+        if (flag & 0xc0) {
+          glyf[j - 1] = flag & 0x3f;
         }
 
-        var indexToLocFormat = int16(data[50], data[51]);
+        let xLength = 2;
 
-        if (indexToLocFormat < 0 || indexToLocFormat > 1) {
-          (0, _util.info)("Attempting to fix invalid indexToLocFormat in head table: " + indexToLocFormat);
-          var numGlyphsPlusOne = numGlyphs + 1;
+        if (flag & 2) {
+          xLength = 1;
+        } else if (flag & 16) {
+          xLength = 0;
+        }
 
-          if (locaLength === numGlyphsPlusOne << 1) {
-            data[50] = 0;
-            data[51] = 0;
-          } else if (locaLength === numGlyphsPlusOne << 2) {
-            data[50] = 0;
-            data[51] = 1;
-          } else {
-            throw new _util.FormatError("Could not fix indexToLocFormat: " + indexToLocFormat);
-          }
+        let yLength = 2;
+
+        if (flag & 4) {
+          yLength = 1;
+        } else if (flag & 32) {
+          yLength = 0;
+        }
+
+        const xyLength = xLength + yLength;
+        coordinatesLength += xyLength;
+
+        if (flag & 8) {
+          const repeat = glyf[j++];
+          i += repeat;
+          coordinatesLength += repeat * xyLength;
         }
       }
 
-      function sanitizeGlyphLocations(loca, glyf, numGlyphs, isGlyphLocationsLong, hintsValid, dupFirstEntry, maxSizeOfInstructions) {
-        var itemSize, itemDecode, itemEncode;
+      if (coordinatesLength === 0) {
+        return glyphProfile;
+      }
 
-        if (isGlyphLocationsLong) {
-          itemSize = 4;
+      let glyphDataLength = j + coordinatesLength;
 
-          itemDecode = function fontItemDecodeLong(data, offset) {
-            return data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3];
-          };
+      if (glyphDataLength > glyf.length) {
+        return glyphProfile;
+      }
 
-          itemEncode = function fontItemEncodeLong(data, offset, value) {
-            data[offset] = value >>> 24 & 0xff;
-            data[offset + 1] = value >> 16 & 0xff;
-            data[offset + 2] = value >> 8 & 0xff;
-            data[offset + 3] = value & 0xff;
-          };
+      if (!hintsValid && instructionsLength > 0) {
+        dest.set(glyf.subarray(0, instructionsStart), destStart);
+        dest.set([0, 0], destStart + instructionsStart);
+        dest.set(glyf.subarray(instructionsEnd, glyphDataLength), destStart + instructionsStart + 2);
+        glyphDataLength -= instructionsLength;
+
+        if (glyf.length - glyphDataLength > 3) {
+          glyphDataLength = glyphDataLength + 3 & ~3;
+        }
+
+        glyphProfile.length = glyphDataLength;
+        return glyphProfile;
+      }
+
+      if (glyf.length - glyphDataLength > 3) {
+        glyphDataLength = glyphDataLength + 3 & ~3;
+        dest.set(glyf.subarray(0, glyphDataLength), destStart);
+        glyphProfile.length = glyphDataLength;
+        return glyphProfile;
+      }
+
+      dest.set(glyf, destStart);
+      glyphProfile.length = glyf.length;
+      return glyphProfile;
+    }
+
+    function sanitizeHead(head, numGlyphs, locaLength) {
+      const data = head.data;
+      const version = int32(data[0], data[1], data[2], data[3]);
+
+      if (version >> 16 !== 1) {
+        (0, _util.info)("Attempting to fix invalid version in head table: " + version);
+        data[0] = 0;
+        data[1] = 1;
+        data[2] = 0;
+        data[3] = 0;
+      }
+
+      const indexToLocFormat = int16(data[50], data[51]);
+
+      if (indexToLocFormat < 0 || indexToLocFormat > 1) {
+        (0, _util.info)("Attempting to fix invalid indexToLocFormat in head table: " + indexToLocFormat);
+        const numGlyphsPlusOne = numGlyphs + 1;
+
+        if (locaLength === numGlyphsPlusOne << 1) {
+          data[50] = 0;
+          data[51] = 0;
+        } else if (locaLength === numGlyphsPlusOne << 2) {
+          data[50] = 0;
+          data[51] = 1;
         } else {
-          itemSize = 2;
-
-          itemDecode = function fontItemDecode(data, offset) {
-            return data[offset] << 9 | data[offset + 1] << 1;
-          };
-
-          itemEncode = function fontItemEncode(data, offset, value) {
-            data[offset] = value >> 9 & 0xff;
-            data[offset + 1] = value >> 1 & 0xff;
-          };
+          throw new _util.FormatError("Could not fix indexToLocFormat: " + indexToLocFormat);
         }
+      }
+    }
 
-        var numGlyphsOut = dupFirstEntry ? numGlyphs + 1 : numGlyphs;
-        var locaDataSize = itemSize * (1 + numGlyphsOut);
-        var locaData = new Uint8Array(locaDataSize);
-        locaData.set(loca.data.subarray(0, locaDataSize));
-        loca.data = locaData;
-        var oldGlyfData = glyf.data;
-        var oldGlyfDataLength = oldGlyfData.length;
-        var newGlyfData = new Uint8Array(oldGlyfDataLength);
-        var i, j;
-        const locaEntries = [];
+    function sanitizeGlyphLocations(loca, glyf, numGlyphs, isGlyphLocationsLong, hintsValid, dupFirstEntry, maxSizeOfInstructions) {
+      let itemSize, itemDecode, itemEncode;
 
-        for (i = 0, j = 0; i < numGlyphs + 1; i++, j += itemSize) {
-          let offset = itemDecode(locaData, j);
+      if (isGlyphLocationsLong) {
+        itemSize = 4;
 
-          if (offset > oldGlyfDataLength) {
-            offset = oldGlyfDataLength;
-          }
+        itemDecode = function fontItemDecodeLong(data, offset) {
+          return data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3];
+        };
 
-          locaEntries.push({
-            index: i,
-            offset,
-            endOffset: 0
-          });
-        }
+        itemEncode = function fontItemEncodeLong(data, offset, value) {
+          data[offset] = value >>> 24 & 0xff;
+          data[offset + 1] = value >> 16 & 0xff;
+          data[offset + 2] = value >> 8 & 0xff;
+          data[offset + 3] = value & 0xff;
+        };
+      } else {
+        itemSize = 2;
 
-        locaEntries.sort((a, b) => {
-          return a.offset - b.offset;
-        });
+        itemDecode = function fontItemDecode(data, offset) {
+          return data[offset] << 9 | data[offset + 1] << 1;
+        };
 
-        for (i = 0; i < numGlyphs; i++) {
-          locaEntries[i].endOffset = locaEntries[i + 1].offset;
-        }
-
-        locaEntries.sort((a, b) => {
-          return a.index - b.index;
-        });
-        var missingGlyphs = Object.create(null);
-        var writeOffset = 0;
-        itemEncode(locaData, 0, writeOffset);
-
-        for (i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize) {
-          var glyphProfile = sanitizeGlyph(oldGlyfData, locaEntries[i].offset, locaEntries[i].endOffset, newGlyfData, writeOffset, hintsValid);
-          var newLength = glyphProfile.length;
-
-          if (newLength === 0) {
-            missingGlyphs[i] = true;
-          }
-
-          if (glyphProfile.sizeOfInstructions > maxSizeOfInstructions) {
-            maxSizeOfInstructions = glyphProfile.sizeOfInstructions;
-          }
-
-          writeOffset += newLength;
-          itemEncode(locaData, j, writeOffset);
-        }
-
-        if (writeOffset === 0) {
-          var simpleGlyph = new Uint8Array([0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0]);
-
-          for (i = 0, j = itemSize; i < numGlyphsOut; i++, j += itemSize) {
-            itemEncode(locaData, j, simpleGlyph.length);
-          }
-
-          glyf.data = simpleGlyph;
-        } else if (dupFirstEntry) {
-          var firstEntryLength = itemDecode(locaData, itemSize);
-
-          if (newGlyfData.length > firstEntryLength + writeOffset) {
-            glyf.data = newGlyfData.subarray(0, firstEntryLength + writeOffset);
-          } else {
-            glyf.data = new Uint8Array(firstEntryLength + writeOffset);
-            glyf.data.set(newGlyfData.subarray(0, writeOffset));
-          }
-
-          glyf.data.set(newGlyfData.subarray(0, firstEntryLength), writeOffset);
-          itemEncode(loca.data, locaData.length - itemSize, writeOffset + firstEntryLength);
-        } else {
-          glyf.data = newGlyfData.subarray(0, writeOffset);
-        }
-
-        return {
-          missingGlyphs,
-          maxSizeOfInstructions
+        itemEncode = function fontItemEncode(data, offset, value) {
+          data[offset] = value >> 9 & 0xff;
+          data[offset + 1] = value >> 1 & 0xff;
         };
       }
 
-      function readPostScriptTable(post, propertiesObj, maxpNumGlyphs) {
-        var start = (font.start ? font.start : 0) + post.offset;
-        font.pos = start;
-        var length = post.length,
+      const numGlyphsOut = dupFirstEntry ? numGlyphs + 1 : numGlyphs;
+      const locaDataSize = itemSize * (1 + numGlyphsOut);
+      const locaData = new Uint8Array(locaDataSize);
+      locaData.set(loca.data.subarray(0, locaDataSize));
+      loca.data = locaData;
+      const oldGlyfData = glyf.data;
+      const oldGlyfDataLength = oldGlyfData.length;
+      const newGlyfData = new Uint8Array(oldGlyfDataLength);
+      let i, j;
+      const locaEntries = [];
+
+      for (i = 0, j = 0; i < numGlyphs + 1; i++, j += itemSize) {
+        let offset = itemDecode(locaData, j);
+
+        if (offset > oldGlyfDataLength) {
+          offset = oldGlyfDataLength;
+        }
+
+        locaEntries.push({
+          index: i,
+          offset,
+          endOffset: 0
+        });
+      }
+
+      locaEntries.sort((a, b) => {
+        return a.offset - b.offset;
+      });
+
+      for (i = 0; i < numGlyphs; i++) {
+        locaEntries[i].endOffset = locaEntries[i + 1].offset;
+      }
+
+      locaEntries.sort((a, b) => {
+        return a.index - b.index;
+      });
+
+      for (i = 0; i < numGlyphs; i++) {
+        const {
+          offset,
+          endOffset
+        } = locaEntries[i];
+
+        if (offset !== 0 || endOffset !== 0) {
+          break;
+        }
+
+        const nextOffset = locaEntries[i + 1].offset;
+
+        if (nextOffset === 0) {
+          continue;
+        }
+
+        locaEntries[i].endOffset = nextOffset;
+        break;
+      }
+
+      const missingGlyphs = Object.create(null);
+      let writeOffset = 0;
+      itemEncode(locaData, 0, writeOffset);
+
+      for (i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize) {
+        const glyphProfile = sanitizeGlyph(oldGlyfData, locaEntries[i].offset, locaEntries[i].endOffset, newGlyfData, writeOffset, hintsValid);
+        const newLength = glyphProfile.length;
+
+        if (newLength === 0) {
+          missingGlyphs[i] = true;
+        }
+
+        if (glyphProfile.sizeOfInstructions > maxSizeOfInstructions) {
+          maxSizeOfInstructions = glyphProfile.sizeOfInstructions;
+        }
+
+        writeOffset += newLength;
+        itemEncode(locaData, j, writeOffset);
+      }
+
+      if (writeOffset === 0) {
+        const simpleGlyph = new Uint8Array([0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0]);
+
+        for (i = 0, j = itemSize; i < numGlyphsOut; i++, j += itemSize) {
+          itemEncode(locaData, j, simpleGlyph.length);
+        }
+
+        glyf.data = simpleGlyph;
+      } else if (dupFirstEntry) {
+        const firstEntryLength = itemDecode(locaData, itemSize);
+
+        if (newGlyfData.length > firstEntryLength + writeOffset) {
+          glyf.data = newGlyfData.subarray(0, firstEntryLength + writeOffset);
+        } else {
+          glyf.data = new Uint8Array(firstEntryLength + writeOffset);
+          glyf.data.set(newGlyfData.subarray(0, writeOffset));
+        }
+
+        glyf.data.set(newGlyfData.subarray(0, firstEntryLength), writeOffset);
+        itemEncode(loca.data, locaData.length - itemSize, writeOffset + firstEntryLength);
+      } else {
+        glyf.data = newGlyfData.subarray(0, writeOffset);
+      }
+
+      return {
+        missingGlyphs,
+        maxSizeOfInstructions
+      };
+    }
+
+    function readPostScriptTable(post, propertiesObj, maxpNumGlyphs) {
+      const start = (font.start || 0) + post.offset;
+      font.pos = start;
+      const length = post.length,
             end = start + length;
-        var version = font.getInt32();
-        font.skip(28);
-        var glyphNames;
-        var valid = true;
-        var i;
+      const version = font.getInt32();
+      font.skip(28);
+      let glyphNames;
+      let valid = true;
+      let i;
 
-        switch (version) {
-          case 0x00010000:
-            glyphNames = MacStandardGlyphOrdering;
+      switch (version) {
+        case 0x00010000:
+          glyphNames = _fonts_utils.MacStandardGlyphOrdering;
+          break;
+
+        case 0x00020000:
+          const numGlyphs = font.getUint16();
+
+          if (numGlyphs !== maxpNumGlyphs) {
+            valid = false;
             break;
+          }
 
-          case 0x00020000:
-            var numGlyphs = font.getUint16();
+          const glyphNameIndexes = [];
 
-            if (numGlyphs !== maxpNumGlyphs) {
+          for (i = 0; i < numGlyphs; ++i) {
+            const index = font.getUint16();
+
+            if (index >= 32768) {
               valid = false;
               break;
             }
 
-            var glyphNameIndexes = [];
-
-            for (i = 0; i < numGlyphs; ++i) {
-              var index = font.getUint16();
-
-              if (index >= 32768) {
-                valid = false;
-                break;
-              }
-
-              glyphNameIndexes.push(index);
-            }
-
-            if (!valid) {
-              break;
-            }
-
-            var customNames = [];
-            var strBuf = [];
-
-            while (font.pos < end) {
-              var stringLength = font.getByte();
-              strBuf.length = stringLength;
-
-              for (i = 0; i < stringLength; ++i) {
-                strBuf[i] = String.fromCharCode(font.getByte());
-              }
-
-              customNames.push(strBuf.join(""));
-            }
-
-            glyphNames = [];
-
-            for (i = 0; i < numGlyphs; ++i) {
-              var j = glyphNameIndexes[i];
-
-              if (j < 258) {
-                glyphNames.push(MacStandardGlyphOrdering[j]);
-                continue;
-              }
-
-              glyphNames.push(customNames[j - 258]);
-            }
+            glyphNameIndexes.push(index);
+          }
 
+          if (!valid) {
             break;
+          }
 
-          case 0x00030000:
-            break;
+          const customNames = [],
+                strBuf = [];
 
-          default:
-            (0, _util.warn)("Unknown/unsupported post table version " + version);
-            valid = false;
+          while (font.pos < end) {
+            const stringLength = font.getByte();
+            strBuf.length = stringLength;
 
-            if (propertiesObj.defaultEncoding) {
-              glyphNames = propertiesObj.defaultEncoding;
+            for (i = 0; i < stringLength; ++i) {
+              strBuf[i] = String.fromCharCode(font.getByte());
             }
 
-            break;
-        }
+            customNames.push(strBuf.join(""));
+          }
 
-        propertiesObj.glyphNames = glyphNames;
-        return valid;
+          glyphNames = [];
+
+          for (i = 0; i < numGlyphs; ++i) {
+            const j = glyphNameIndexes[i];
+
+            if (j < 258) {
+              glyphNames.push(_fonts_utils.MacStandardGlyphOrdering[j]);
+              continue;
+            }
+
+            glyphNames.push(customNames[j - 258]);
+          }
+
+          break;
+
+        case 0x00030000:
+          break;
+
+        default:
+          (0, _util.warn)("Unknown/unsupported post table version " + version);
+          valid = false;
+
+          if (propertiesObj.defaultEncoding) {
+            glyphNames = propertiesObj.defaultEncoding;
+          }
+
+          break;
       }
 
-      function readNameTable(nameTable) {
-        var start = (font.start ? font.start : 0) + nameTable.offset;
-        font.pos = start;
-        var names = [[], []];
-        var length = nameTable.length,
+      propertiesObj.glyphNames = glyphNames;
+      return valid;
+    }
+
+    function readNameTable(nameTable) {
+      const start = (font.start || 0) + nameTable.offset;
+      font.pos = start;
+      const names = [[], []];
+      const length = nameTable.length,
             end = start + length;
-        var format = font.getUint16();
-        var FORMAT_0_HEADER_LENGTH = 6;
-
-        if (format !== 0 || length < FORMAT_0_HEADER_LENGTH) {
-          return names;
-        }
-
-        var numRecords = font.getUint16();
-        var stringsStart = font.getUint16();
-        var records = [];
-        var NAME_RECORD_LENGTH = 12;
-        var i, ii;
-
-        for (i = 0; i < numRecords && font.pos + NAME_RECORD_LENGTH <= end; i++) {
-          var r = {
-            platform: font.getUint16(),
-            encoding: font.getUint16(),
-            language: font.getUint16(),
-            name: font.getUint16(),
-            length: font.getUint16(),
-            offset: font.getUint16()
-          };
-
-          if (r.platform === 1 && r.encoding === 0 && r.language === 0 || r.platform === 3 && r.encoding === 1 && r.language === 0x409) {
-            records.push(r);
-          }
-        }
-
-        for (i = 0, ii = records.length; i < ii; i++) {
-          var record = records[i];
-
-          if (record.length <= 0) {
-            continue;
-          }
-
-          var pos = start + stringsStart + record.offset;
-
-          if (pos + record.length > end) {
-            continue;
-          }
-
-          font.pos = pos;
-          var nameIndex = record.name;
-
-          if (record.encoding) {
-            var str = "";
-
-            for (var j = 0, jj = record.length; j < jj; j += 2) {
-              str += String.fromCharCode(font.getUint16());
-            }
-
-            names[1][nameIndex] = str;
-          } else {
-            names[0][nameIndex] = (0, _util.bytesToString)(font.getBytes(record.length));
-          }
-        }
+      const format = font.getUint16();
+      const FORMAT_0_HEADER_LENGTH = 6;
 
+      if (format !== 0 || length < FORMAT_0_HEADER_LENGTH) {
         return names;
       }
 
-      var TTOpsStackDeltas = [0, 0, 0, 0, 0, 0, 0, 0, -2, -2, -2, -2, 0, 0, -2, -5, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, -1, 0, -1, -1, -1, -1, 1, -1, -999, 0, 1, 0, -1, -2, 0, -1, -2, -1, -1, 0, -1, -1, 0, 0, -999, -999, -1, -1, -1, -1, -2, -999, -2, -2, -999, 0, -2, -2, 0, 0, -2, 0, -2, 0, 0, 0, -2, -1, -1, 1, 1, 0, 0, -1, -1, -1, -1, -1, -1, -1, 0, 0, -1, 0, -1, -1, 0, -999, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2, -999, -999, -999, -999, -999, -1, -1, -2, -2, 0, 0, 0, 0, -1, -1, -999, -2, -2, 0, 0, -1, -2, -2, 0, 0, 0, -1, -1, -1, -2];
+      const numRecords = font.getUint16();
+      const stringsStart = font.getUint16();
+      const records = [];
+      const NAME_RECORD_LENGTH = 12;
+      let i, ii;
 
-      function sanitizeTTProgram(table, ttContext) {
-        var data = table.data;
-        var i = 0,
-            j,
-            n,
-            b,
-            funcId,
-            pc,
-            lastEndf = 0,
-            lastDeff = 0;
-        var stack = [];
-        var callstack = [];
-        var functionsCalled = [];
-        var tooComplexToFollowFunctions = ttContext.tooComplexToFollowFunctions;
-        var inFDEF = false,
-            ifLevel = 0,
-            inELSE = 0;
+      for (i = 0; i < numRecords && font.pos + NAME_RECORD_LENGTH <= end; i++) {
+        const r = {
+          platform: font.getUint16(),
+          encoding: font.getUint16(),
+          language: font.getUint16(),
+          name: font.getUint16(),
+          length: font.getUint16(),
+          offset: font.getUint16()
+        };
 
-        for (var ii = data.length; i < ii;) {
-          var op = data[i++];
-
-          if (op === 0x40) {
-            n = data[i++];
-
-            if (inFDEF || inELSE) {
-              i += n;
-            } else {
-              for (j = 0; j < n; j++) {
-                stack.push(data[i++]);
-              }
-            }
-          } else if (op === 0x41) {
-            n = data[i++];
-
-            if (inFDEF || inELSE) {
-              i += n * 2;
-            } else {
-              for (j = 0; j < n; j++) {
-                b = data[i++];
-                stack.push(b << 8 | data[i++]);
-              }
-            }
-          } else if ((op & 0xf8) === 0xb0) {
-            n = op - 0xb0 + 1;
-
-            if (inFDEF || inELSE) {
-              i += n;
-            } else {
-              for (j = 0; j < n; j++) {
-                stack.push(data[i++]);
-              }
-            }
-          } else if ((op & 0xf8) === 0xb8) {
-            n = op - 0xb8 + 1;
-
-            if (inFDEF || inELSE) {
-              i += n * 2;
-            } else {
-              for (j = 0; j < n; j++) {
-                b = data[i++];
-                stack.push(b << 8 | data[i++]);
-              }
-            }
-          } else if (op === 0x2b && !tooComplexToFollowFunctions) {
-            if (!inFDEF && !inELSE) {
-              funcId = stack[stack.length - 1];
-
-              if (isNaN(funcId)) {
-                (0, _util.info)("TT: CALL empty stack (or invalid entry).");
-              } else {
-                ttContext.functionsUsed[funcId] = true;
-
-                if (funcId in ttContext.functionsStackDeltas) {
-                  const newStackLength = stack.length + ttContext.functionsStackDeltas[funcId];
-
-                  if (newStackLength < 0) {
-                    (0, _util.warn)("TT: CALL invalid functions stack delta.");
-                    ttContext.hintsValid = false;
-                    return;
-                  }
-
-                  stack.length = newStackLength;
-                } else if (funcId in ttContext.functionsDefined && !functionsCalled.includes(funcId)) {
-                  callstack.push({
-                    data,
-                    i,
-                    stackTop: stack.length - 1
-                  });
-                  functionsCalled.push(funcId);
-                  pc = ttContext.functionsDefined[funcId];
-
-                  if (!pc) {
-                    (0, _util.warn)("TT: CALL non-existent function");
-                    ttContext.hintsValid = false;
-                    return;
-                  }
-
-                  data = pc.data;
-                  i = pc.i;
-                }
-              }
-            }
-          } else if (op === 0x2c && !tooComplexToFollowFunctions) {
-            if (inFDEF || inELSE) {
-              (0, _util.warn)("TT: nested FDEFs not allowed");
-              tooComplexToFollowFunctions = true;
-            }
-
-            inFDEF = true;
-            lastDeff = i;
-            funcId = stack.pop();
-            ttContext.functionsDefined[funcId] = {
-              data,
-              i
-            };
-          } else if (op === 0x2d) {
-            if (inFDEF) {
-              inFDEF = false;
-              lastEndf = i;
-            } else {
-              pc = callstack.pop();
-
-              if (!pc) {
-                (0, _util.warn)("TT: ENDF bad stack");
-                ttContext.hintsValid = false;
-                return;
-              }
-
-              funcId = functionsCalled.pop();
-              data = pc.data;
-              i = pc.i;
-              ttContext.functionsStackDeltas[funcId] = stack.length - pc.stackTop;
-            }
-          } else if (op === 0x89) {
-            if (inFDEF || inELSE) {
-              (0, _util.warn)("TT: nested IDEFs not allowed");
-              tooComplexToFollowFunctions = true;
-            }
-
-            inFDEF = true;
-            lastDeff = i;
-          } else if (op === 0x58) {
-            ++ifLevel;
-          } else if (op === 0x1b) {
-            inELSE = ifLevel;
-          } else if (op === 0x59) {
-            if (inELSE === ifLevel) {
-              inELSE = 0;
-            }
-
-            --ifLevel;
-          } else if (op === 0x1c) {
-            if (!inFDEF && !inELSE) {
-              var offset = stack[stack.length - 1];
-
-              if (offset > 0) {
-                i += offset - 1;
-              }
-            }
-          }
-
-          if (!inFDEF && !inELSE) {
-            let stackDelta = 0;
-
-            if (op <= 0x8e) {
-              stackDelta = TTOpsStackDeltas[op];
-            } else if (op >= 0xc0 && op <= 0xdf) {
-              stackDelta = -1;
-            } else if (op >= 0xe0) {
-              stackDelta = -2;
-            }
-
-            if (op >= 0x71 && op <= 0x75) {
-              n = stack.pop();
-
-              if (!isNaN(n)) {
-                stackDelta = -n * 2;
-              }
-            }
-
-            while (stackDelta < 0 && stack.length > 0) {
-              stack.pop();
-              stackDelta++;
-            }
-
-            while (stackDelta > 0) {
-              stack.push(NaN);
-              stackDelta--;
-            }
-          }
+        if (r.platform === 1 && r.encoding === 0 && r.language === 0 || r.platform === 3 && r.encoding === 1 && r.language === 0x409) {
+          records.push(r);
         }
-
-        ttContext.tooComplexToFollowFunctions = tooComplexToFollowFunctions;
-        var content = [data];
-
-        if (i > data.length) {
-          content.push(new Uint8Array(i - data.length));
-        }
-
-        if (lastDeff > lastEndf) {
-          (0, _util.warn)("TT: complementing a missing function tail");
-          content.push(new Uint8Array([0x22, 0x2d]));
-        }
-
-        foldTTTable(table, content);
       }
 
-      function checkInvalidFunctions(ttContext, maxFunctionDefs) {
-        if (ttContext.tooComplexToFollowFunctions) {
-          return;
+      for (i = 0, ii = records.length; i < ii; i++) {
+        const record = records[i];
+
+        if (record.length <= 0) {
+          continue;
         }
 
-        if (ttContext.functionsDefined.length > maxFunctionDefs) {
-          (0, _util.warn)("TT: more functions defined than expected");
+        const pos = start + stringsStart + record.offset;
+
+        if (pos + record.length > end) {
+          continue;
+        }
+
+        font.pos = pos;
+        const nameIndex = record.name;
+
+        if (record.encoding) {
+          let str = "";
+
+          for (let j = 0, jj = record.length; j < jj; j += 2) {
+            str += String.fromCharCode(font.getUint16());
+          }
+
+          names[1][nameIndex] = str;
+        } else {
+          names[0][nameIndex] = font.getString(record.length);
+        }
+      }
+
+      return names;
+    }
+
+    const TTOpsStackDeltas = [0, 0, 0, 0, 0, 0, 0, 0, -2, -2, -2, -2, 0, 0, -2, -5, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, -1, 0, -1, -1, -1, -1, 1, -1, -999, 0, 1, 0, -1, -2, 0, -1, -2, -1, -1, 0, -1, -1, 0, 0, -999, -999, -1, -1, -1, -1, -2, -999, -2, -2, -999, 0, -2, -2, 0, 0, -2, 0, -2, 0, 0, 0, -2, -1, -1, 1, 1, 0, 0, -1, -1, -1, -1, -1, -1, -1, 0, 0, -1, 0, -1, -1, 0, -999, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2, -999, -999, -999, -999, -999, -1, -1, -2, -2, 0, 0, 0, 0, -1, -1, -999, -2, -2, 0, 0, -1, -2, -2, 0, 0, 0, -1, -1, -1, -2];
+
+    function sanitizeTTProgram(table, ttContext) {
+      let data = table.data;
+      let i = 0,
+          j,
+          n,
+          b,
+          funcId,
+          pc,
+          lastEndf = 0,
+          lastDeff = 0;
+      const stack = [];
+      const callstack = [];
+      const functionsCalled = [];
+      let tooComplexToFollowFunctions = ttContext.tooComplexToFollowFunctions;
+      let inFDEF = false,
+          ifLevel = 0,
+          inELSE = 0;
+
+      for (let ii = data.length; i < ii;) {
+        const op = data[i++];
+
+        if (op === 0x40) {
+          n = data[i++];
+
+          if (inFDEF || inELSE) {
+            i += n;
+          } else {
+            for (j = 0; j < n; j++) {
+              stack.push(data[i++]);
+            }
+          }
+        } else if (op === 0x41) {
+          n = data[i++];
+
+          if (inFDEF || inELSE) {
+            i += n * 2;
+          } else {
+            for (j = 0; j < n; j++) {
+              b = data[i++];
+              stack.push(b << 8 | data[i++]);
+            }
+          }
+        } else if ((op & 0xf8) === 0xb0) {
+          n = op - 0xb0 + 1;
+
+          if (inFDEF || inELSE) {
+            i += n;
+          } else {
+            for (j = 0; j < n; j++) {
+              stack.push(data[i++]);
+            }
+          }
+        } else if ((op & 0xf8) === 0xb8) {
+          n = op - 0xb8 + 1;
+
+          if (inFDEF || inELSE) {
+            i += n * 2;
+          } else {
+            for (j = 0; j < n; j++) {
+              b = data[i++];
+              stack.push(b << 8 | data[i++]);
+            }
+          }
+        } else if (op === 0x2b && !tooComplexToFollowFunctions) {
+          if (!inFDEF && !inELSE) {
+            funcId = stack.at(-1);
+
+            if (isNaN(funcId)) {
+              (0, _util.info)("TT: CALL empty stack (or invalid entry).");
+            } else {
+              ttContext.functionsUsed[funcId] = true;
+
+              if (funcId in ttContext.functionsStackDeltas) {
+                const newStackLength = stack.length + ttContext.functionsStackDeltas[funcId];
+
+                if (newStackLength < 0) {
+                  (0, _util.warn)("TT: CALL invalid functions stack delta.");
+                  ttContext.hintsValid = false;
+                  return;
+                }
+
+                stack.length = newStackLength;
+              } else if (funcId in ttContext.functionsDefined && !functionsCalled.includes(funcId)) {
+                callstack.push({
+                  data,
+                  i,
+                  stackTop: stack.length - 1
+                });
+                functionsCalled.push(funcId);
+                pc = ttContext.functionsDefined[funcId];
+
+                if (!pc) {
+                  (0, _util.warn)("TT: CALL non-existent function");
+                  ttContext.hintsValid = false;
+                  return;
+                }
+
+                data = pc.data;
+                i = pc.i;
+              }
+            }
+          }
+        } else if (op === 0x2c && !tooComplexToFollowFunctions) {
+          if (inFDEF || inELSE) {
+            (0, _util.warn)("TT: nested FDEFs not allowed");
+            tooComplexToFollowFunctions = true;
+          }
+
+          inFDEF = true;
+          lastDeff = i;
+          funcId = stack.pop();
+          ttContext.functionsDefined[funcId] = {
+            data,
+            i
+          };
+        } else if (op === 0x2d) {
+          if (inFDEF) {
+            inFDEF = false;
+            lastEndf = i;
+          } else {
+            pc = callstack.pop();
+
+            if (!pc) {
+              (0, _util.warn)("TT: ENDF bad stack");
+              ttContext.hintsValid = false;
+              return;
+            }
+
+            funcId = functionsCalled.pop();
+            data = pc.data;
+            i = pc.i;
+            ttContext.functionsStackDeltas[funcId] = stack.length - pc.stackTop;
+          }
+        } else if (op === 0x89) {
+          if (inFDEF || inELSE) {
+            (0, _util.warn)("TT: nested IDEFs not allowed");
+            tooComplexToFollowFunctions = true;
+          }
+
+          inFDEF = true;
+          lastDeff = i;
+        } else if (op === 0x58) {
+          ++ifLevel;
+        } else if (op === 0x1b) {
+          inELSE = ifLevel;
+        } else if (op === 0x59) {
+          if (inELSE === ifLevel) {
+            inELSE = 0;
+          }
+
+          --ifLevel;
+        } else if (op === 0x1c) {
+          if (!inFDEF && !inELSE) {
+            const offset = stack.at(-1);
+
+            if (offset > 0) {
+              i += offset - 1;
+            }
+          }
+        }
+
+        if (!inFDEF && !inELSE) {
+          let stackDelta = 0;
+
+          if (op <= 0x8e) {
+            stackDelta = TTOpsStackDeltas[op];
+          } else if (op >= 0xc0 && op <= 0xdf) {
+            stackDelta = -1;
+          } else if (op >= 0xe0) {
+            stackDelta = -2;
+          }
+
+          if (op >= 0x71 && op <= 0x75) {
+            n = stack.pop();
+
+            if (!isNaN(n)) {
+              stackDelta = -n * 2;
+            }
+          }
+
+          while (stackDelta < 0 && stack.length > 0) {
+            stack.pop();
+            stackDelta++;
+          }
+
+          while (stackDelta > 0) {
+            stack.push(NaN);
+            stackDelta--;
+          }
+        }
+      }
+
+      ttContext.tooComplexToFollowFunctions = tooComplexToFollowFunctions;
+      const content = [data];
+
+      if (i > data.length) {
+        content.push(new Uint8Array(i - data.length));
+      }
+
+      if (lastDeff > lastEndf) {
+        (0, _util.warn)("TT: complementing a missing function tail");
+        content.push(new Uint8Array([0x22, 0x2d]));
+      }
+
+      foldTTTable(table, content);
+    }
+
+    function checkInvalidFunctions(ttContext, maxFunctionDefs) {
+      if (ttContext.tooComplexToFollowFunctions) {
+        return;
+      }
+
+      if (ttContext.functionsDefined.length > maxFunctionDefs) {
+        (0, _util.warn)("TT: more functions defined than expected");
+        ttContext.hintsValid = false;
+        return;
+      }
+
+      for (let j = 0, jj = ttContext.functionsUsed.length; j < jj; j++) {
+        if (j > maxFunctionDefs) {
+          (0, _util.warn)("TT: invalid function id: " + j);
           ttContext.hintsValid = false;
           return;
         }
 
-        for (var j = 0, jj = ttContext.functionsUsed.length; j < jj; j++) {
-          if (j > maxFunctionDefs) {
-            (0, _util.warn)("TT: invalid function id: " + j);
-            ttContext.hintsValid = false;
-            return;
-          }
-
-          if (ttContext.functionsUsed[j] && !ttContext.functionsDefined[j]) {
-            (0, _util.warn)("TT: undefined function: " + j);
-            ttContext.hintsValid = false;
-            return;
-          }
+        if (ttContext.functionsUsed[j] && !ttContext.functionsDefined[j]) {
+          (0, _util.warn)("TT: undefined function: " + j);
+          ttContext.hintsValid = false;
+          return;
         }
       }
+    }
 
-      function foldTTTable(table, content) {
-        if (content.length > 1) {
-          var newLength = 0;
-          var j, jj;
+    function foldTTTable(table, content) {
+      if (content.length > 1) {
+        let newLength = 0;
+        let j, jj;
 
-          for (j = 0, jj = content.length; j < jj; j++) {
-            newLength += content[j].length;
-          }
-
-          newLength = newLength + 3 & ~3;
-          var result = new Uint8Array(newLength);
-          var pos = 0;
-
-          for (j = 0, jj = content.length; j < jj; j++) {
-            result.set(content[j], pos);
-            pos += content[j].length;
-          }
-
-          table.data = result;
-          table.length = newLength;
+        for (j = 0, jj = content.length; j < jj; j++) {
+          newLength += content[j].length;
         }
+
+        newLength = newLength + 3 & ~3;
+        const result = new Uint8Array(newLength);
+        let pos = 0;
+
+        for (j = 0, jj = content.length; j < jj; j++) {
+          result.set(content[j], pos);
+          pos += content[j].length;
+        }
+
+        table.data = result;
+        table.length = newLength;
+      }
+    }
+
+    function sanitizeTTPrograms(fpgm, prep, cvt, maxFunctionDefs) {
+      const ttContext = {
+        functionsDefined: [],
+        functionsUsed: [],
+        functionsStackDeltas: [],
+        tooComplexToFollowFunctions: false,
+        hintsValid: true
+      };
+
+      if (fpgm) {
+        sanitizeTTProgram(fpgm, ttContext);
       }
 
-      function sanitizeTTPrograms(fpgm, prep, cvt, maxFunctionDefs) {
-        var ttContext = {
-          functionsDefined: [],
-          functionsUsed: [],
-          functionsStackDeltas: [],
-          tooComplexToFollowFunctions: false,
-          hintsValid: true
+      if (prep) {
+        sanitizeTTProgram(prep, ttContext);
+      }
+
+      if (fpgm) {
+        checkInvalidFunctions(ttContext, maxFunctionDefs);
+      }
+
+      if (cvt && cvt.length & 1) {
+        const cvtData = new Uint8Array(cvt.length + 1);
+        cvtData.set(cvt.data);
+        cvt.data = cvtData;
+      }
+
+      return ttContext.hintsValid;
+    }
+
+    font = new _stream.Stream(new Uint8Array(font.getBytes()));
+    let header, tables;
+
+    if (isTrueTypeCollectionFile(font)) {
+      const ttcData = readTrueTypeCollectionData(font, this.name);
+      header = ttcData.header;
+      tables = ttcData.tables;
+    } else {
+      header = readOpenTypeHeader(font);
+      tables = readTables(font, header.numTables);
+    }
+
+    let cff, cffFile;
+    const isTrueType = !tables["CFF "];
+
+    if (!isTrueType) {
+      const isComposite = properties.composite && ((properties.cidToGidMap || []).length > 0 || !(properties.cMap instanceof _cmap.IdentityCMap));
+
+      if (header.version === "OTTO" && !isComposite || !tables.head || !tables.hhea || !tables.maxp || !tables.post) {
+        cffFile = new _stream.Stream(tables["CFF "].data);
+        cff = new _cff_font.CFFFont(cffFile, properties);
+        adjustWidths(properties);
+        return this.convert(name, cff, properties);
+      }
+
+      delete tables.glyf;
+      delete tables.loca;
+      delete tables.fpgm;
+      delete tables.prep;
+      delete tables["cvt "];
+      this.isOpenType = true;
+    } else {
+      if (!tables.loca) {
+        throw new _util.FormatError('Required "loca" table is not found');
+      }
+
+      if (!tables.glyf) {
+        (0, _util.warn)('Required "glyf" table is not found -- trying to recover.');
+        tables.glyf = {
+          tag: "glyf",
+          data: new Uint8Array(0)
         };
-
-        if (fpgm) {
-          sanitizeTTProgram(fpgm, ttContext);
-        }
-
-        if (prep) {
-          sanitizeTTProgram(prep, ttContext);
-        }
-
-        if (fpgm) {
-          checkInvalidFunctions(ttContext, maxFunctionDefs);
-        }
-
-        if (cvt && cvt.length & 1) {
-          var cvtData = new Uint8Array(cvt.length + 1);
-          cvtData.set(cvt.data);
-          cvt.data = cvtData;
-        }
-
-        return ttContext.hintsValid;
       }
 
-      font = new _stream.Stream(new Uint8Array(font.getBytes()));
-      let header, tables;
+      this.isOpenType = false;
+    }
 
-      if (isTrueTypeCollectionFile(font)) {
-        const ttcData = readTrueTypeCollectionData(font, this.name);
-        header = ttcData.header;
-        tables = ttcData.tables;
-      } else {
-        header = readOpenTypeHeader(font);
-        tables = readTables(font, header.numTables);
+    if (!tables.maxp) {
+      throw new _util.FormatError('Required "maxp" table is not found');
+    }
+
+    font.pos = (font.start || 0) + tables.maxp.offset;
+    const version = font.getInt32();
+    const numGlyphs = font.getUint16();
+
+    if (properties.scaleFactors && properties.scaleFactors.length === numGlyphs && isTrueType) {
+      const {
+        scaleFactors
+      } = properties;
+      const isGlyphLocationsLong = int16(tables.head.data[50], tables.head.data[51]);
+      const glyphs = new _glyf.GlyfTable({
+        glyfTable: tables.glyf.data,
+        isGlyphLocationsLong,
+        locaTable: tables.loca.data,
+        numGlyphs
+      });
+      glyphs.scale(scaleFactors);
+      const {
+        glyf,
+        loca,
+        isLocationLong
+      } = glyphs.write();
+      tables.glyf.data = glyf;
+      tables.loca.data = loca;
+
+      if (isLocationLong !== !!isGlyphLocationsLong) {
+        tables.head.data[50] = 0;
+        tables.head.data[51] = isLocationLong ? 1 : 0;
       }
 
-      let cff, cffFile;
-      var isTrueType = !tables["CFF "];
+      const metrics = tables.hmtx.data;
 
-      if (!isTrueType) {
-        const isComposite = properties.composite && ((properties.cidToGidMap || []).length > 0 || !(properties.cMap instanceof _cmap.IdentityCMap));
+      for (let i = 0; i < numGlyphs; i++) {
+        const j = 4 * i;
+        const advanceWidth = Math.round(scaleFactors[i] * int16(metrics[j], metrics[j + 1]));
+        metrics[j] = advanceWidth >> 8 & 0xff;
+        metrics[j + 1] = advanceWidth & 0xff;
+        const lsb = Math.round(scaleFactors[i] * signedInt16(metrics[j + 2], metrics[j + 3]));
+        writeSignedInt16(metrics, j + 2, lsb);
+      }
+    }
 
-        if (header.version === "OTTO" && !isComposite || !tables.head || !tables.hhea || !tables.maxp || !tables.post) {
-          cffFile = new _stream.Stream(tables["CFF "].data);
-          cff = new CFFFont(cffFile, properties);
-          adjustWidths(properties);
-          return this.convert(name, cff, properties);
-        }
+    let numGlyphsOut = numGlyphs + 1;
+    let dupFirstEntry = true;
 
-        delete tables.glyf;
-        delete tables.loca;
-        delete tables.fpgm;
-        delete tables.prep;
-        delete tables["cvt "];
-        this.isOpenType = true;
-      } else {
-        if (!tables.loca) {
-          throw new _util.FormatError('Required "loca" table is not found');
-        }
+    if (numGlyphsOut > 0xffff) {
+      dupFirstEntry = false;
+      numGlyphsOut = numGlyphs;
+      (0, _util.warn)("Not enough space in glyfs to duplicate first glyph.");
+    }
 
-        if (!tables.glyf) {
-          (0, _util.warn)('Required "glyf" table is not found -- trying to recover.');
-          tables.glyf = {
-            tag: "glyf",
-            data: new Uint8Array(0)
-          };
-        }
+    let maxFunctionDefs = 0;
+    let maxSizeOfInstructions = 0;
 
-        this.isOpenType = false;
+    if (version >= 0x00010000 && tables.maxp.length >= 22) {
+      font.pos += 8;
+      const maxZones = font.getUint16();
+
+      if (maxZones > 2) {
+        tables.maxp.data[14] = 0;
+        tables.maxp.data[15] = 2;
       }
 
-      if (!tables.maxp) {
-        throw new _util.FormatError('Required "maxp" table is not found');
-      }
+      font.pos += 4;
+      maxFunctionDefs = font.getUint16();
+      font.pos += 4;
+      maxSizeOfInstructions = font.getUint16();
+    }
 
-      font.pos = (font.start || 0) + tables.maxp.offset;
-      var version = font.getInt32();
-      const numGlyphs = font.getUint16();
-      let numGlyphsOut = numGlyphs + 1;
-      let dupFirstEntry = true;
+    tables.maxp.data[4] = numGlyphsOut >> 8;
+    tables.maxp.data[5] = numGlyphsOut & 255;
+    const hintsValid = sanitizeTTPrograms(tables.fpgm, tables.prep, tables["cvt "], maxFunctionDefs);
 
-      if (numGlyphsOut > 0xffff) {
-        dupFirstEntry = false;
-        numGlyphsOut = numGlyphs;
-        (0, _util.warn)("Not enough space in glyfs to duplicate first glyph.");
-      }
+    if (!hintsValid) {
+      delete tables.fpgm;
+      delete tables.prep;
+      delete tables["cvt "];
+    }
 
-      var maxFunctionDefs = 0;
-      var maxSizeOfInstructions = 0;
+    sanitizeMetrics(font, tables.hhea, tables.hmtx, tables.head, numGlyphsOut, dupFirstEntry);
+
+    if (!tables.head) {
+      throw new _util.FormatError('Required "head" table is not found');
+    }
+
+    sanitizeHead(tables.head, numGlyphs, isTrueType ? tables.loca.length : 0);
+    let missingGlyphs = Object.create(null);
+
+    if (isTrueType) {
+      const isGlyphLocationsLong = int16(tables.head.data[50], tables.head.data[51]);
+      const glyphsInfo = sanitizeGlyphLocations(tables.loca, tables.glyf, numGlyphs, isGlyphLocationsLong, hintsValid, dupFirstEntry, maxSizeOfInstructions);
+      missingGlyphs = glyphsInfo.missingGlyphs;
 
       if (version >= 0x00010000 && tables.maxp.length >= 22) {
-        font.pos += 8;
-        var maxZones = font.getUint16();
+        tables.maxp.data[26] = glyphsInfo.maxSizeOfInstructions >> 8;
+        tables.maxp.data[27] = glyphsInfo.maxSizeOfInstructions & 255;
+      }
+    }
 
-        if (maxZones > 2) {
-          tables.maxp.data[14] = 0;
-          tables.maxp.data[15] = 2;
+    if (!tables.hhea) {
+      throw new _util.FormatError('Required "hhea" table is not found');
+    }
+
+    if (tables.hhea.data[10] === 0 && tables.hhea.data[11] === 0) {
+      tables.hhea.data[10] = 0xff;
+      tables.hhea.data[11] = 0xff;
+    }
+
+    const metricsOverride = {
+      unitsPerEm: int16(tables.head.data[18], tables.head.data[19]),
+      yMax: int16(tables.head.data[42], tables.head.data[43]),
+      yMin: signedInt16(tables.head.data[38], tables.head.data[39]),
+      ascent: signedInt16(tables.hhea.data[4], tables.hhea.data[5]),
+      descent: signedInt16(tables.hhea.data[6], tables.hhea.data[7]),
+      lineGap: signedInt16(tables.hhea.data[8], tables.hhea.data[9])
+    };
+    this.ascent = metricsOverride.ascent / metricsOverride.unitsPerEm;
+    this.descent = metricsOverride.descent / metricsOverride.unitsPerEm;
+    this.lineGap = metricsOverride.lineGap / metricsOverride.unitsPerEm;
+
+    if (this.cssFontInfo && this.cssFontInfo.lineHeight) {
+      this.lineHeight = this.cssFontInfo.metrics.lineHeight;
+      this.lineGap = this.cssFontInfo.metrics.lineGap;
+    } else {
+      this.lineHeight = this.ascent - this.descent + this.lineGap;
+    }
+
+    if (tables.post) {
+      readPostScriptTable(tables.post, properties, numGlyphs);
+    }
+
+    tables.post = {
+      tag: "post",
+      data: createPostTable(properties)
+    };
+    const charCodeToGlyphId = [];
+
+    function hasGlyph(glyphId) {
+      return !missingGlyphs[glyphId];
+    }
+
+    if (properties.composite) {
+      const cidToGidMap = properties.cidToGidMap || [];
+      const isCidToGidMapEmpty = cidToGidMap.length === 0;
+      properties.cMap.forEach(function (charCode, cid) {
+        if (typeof cid === "string") {
+          cid = convertCidString(charCode, cid, true);
         }
 
-        font.pos += 4;
-        maxFunctionDefs = font.getUint16();
-        font.pos += 4;
-        maxSizeOfInstructions = font.getUint16();
-      }
-
-      tables.maxp.data[4] = numGlyphsOut >> 8;
-      tables.maxp.data[5] = numGlyphsOut & 255;
-      var hintsValid = sanitizeTTPrograms(tables.fpgm, tables.prep, tables["cvt "], maxFunctionDefs);
-
-      if (!hintsValid) {
-        delete tables.fpgm;
-        delete tables.prep;
-        delete tables["cvt "];
-      }
-
-      sanitizeMetrics(font, tables.hhea, tables.hmtx, numGlyphsOut, dupFirstEntry);
-
-      if (!tables.head) {
-        throw new _util.FormatError('Required "head" table is not found');
-      }
-
-      sanitizeHead(tables.head, numGlyphs, isTrueType ? tables.loca.length : 0);
-      var missingGlyphs = Object.create(null);
-
-      if (isTrueType) {
-        var isGlyphLocationsLong = int16(tables.head.data[50], tables.head.data[51]);
-        var glyphsInfo = sanitizeGlyphLocations(tables.loca, tables.glyf, numGlyphs, isGlyphLocationsLong, hintsValid, dupFirstEntry, maxSizeOfInstructions);
-        missingGlyphs = glyphsInfo.missingGlyphs;
-
-        if (version >= 0x00010000 && tables.maxp.length >= 22) {
-          tables.maxp.data[26] = glyphsInfo.maxSizeOfInstructions >> 8;
-          tables.maxp.data[27] = glyphsInfo.maxSizeOfInstructions & 255;
-        }
-      }
-
-      if (!tables.hhea) {
-        throw new _util.FormatError('Required "hhea" table is not found');
-      }
-
-      if (tables.hhea.data[10] === 0 && tables.hhea.data[11] === 0) {
-        tables.hhea.data[10] = 0xff;
-        tables.hhea.data[11] = 0xff;
-      }
-
-      var metricsOverride = {
-        unitsPerEm: int16(tables.head.data[18], tables.head.data[19]),
-        yMax: int16(tables.head.data[42], tables.head.data[43]),
-        yMin: signedInt16(tables.head.data[38], tables.head.data[39]),
-        ascent: int16(tables.hhea.data[4], tables.hhea.data[5]),
-        descent: signedInt16(tables.hhea.data[6], tables.hhea.data[7])
-      };
-      this.ascent = metricsOverride.ascent / metricsOverride.unitsPerEm;
-      this.descent = metricsOverride.descent / metricsOverride.unitsPerEm;
-
-      if (tables.post) {
-        readPostScriptTable(tables.post, properties, numGlyphs);
-      }
-
-      tables.post = {
-        tag: "post",
-        data: createPostTable(properties)
-      };
-      const charCodeToGlyphId = [];
-
-      function hasGlyph(glyphId) {
-        return !missingGlyphs[glyphId];
-      }
-
-      if (properties.composite) {
-        var cidToGidMap = properties.cidToGidMap || [];
-        var isCidToGidMapEmpty = cidToGidMap.length === 0;
-        properties.cMap.forEach(function (charCode, cid) {
-          if (cid > 0xffff) {
-            throw new _util.FormatError("Max size of CID is 65,535");
-          }
-
-          var glyphId = -1;
-
-          if (isCidToGidMapEmpty) {
-            glyphId = cid;
-          } else if (cidToGidMap[cid] !== undefined) {
-            glyphId = cidToGidMap[cid];
-          }
-
-          if (glyphId >= 0 && glyphId < numGlyphs && hasGlyph(glyphId)) {
-            charCodeToGlyphId[charCode] = glyphId;
-          }
-        });
-      } else {
-        var cmapTable = readCmapTable(tables.cmap, font, this.isSymbolicFont, properties.hasEncoding);
-        var cmapPlatformId = cmapTable.platformId;
-        var cmapEncodingId = cmapTable.encodingId;
-        var cmapMappings = cmapTable.mappings;
-        var cmapMappingsLength = cmapMappings.length;
-        let baseEncoding = [];
-
-        if (properties.hasEncoding && (properties.baseEncodingName === "MacRomanEncoding" || properties.baseEncodingName === "WinAnsiEncoding")) {
-          baseEncoding = (0, _encodings.getEncoding)(properties.baseEncodingName);
+        if (cid > 0xffff) {
+          throw new _util.FormatError("Max size of CID is 65,535");
         }
 
-        if (properties.hasEncoding && !this.isSymbolicFont && (cmapPlatformId === 3 && cmapEncodingId === 1 || cmapPlatformId === 1 && cmapEncodingId === 0)) {
-          var glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+        let glyphId = -1;
 
-          for (let charCode = 0; charCode < 256; charCode++) {
-            var glyphName, standardGlyphName;
+        if (isCidToGidMapEmpty) {
+          glyphId = cid;
+        } else if (cidToGidMap[cid] !== undefined) {
+          glyphId = cidToGidMap[cid];
+        }
 
-            if (this.differences && charCode in this.differences) {
-              glyphName = this.differences[charCode];
-            } else if (charCode in baseEncoding && baseEncoding[charCode] !== "") {
-              glyphName = baseEncoding[charCode];
-            } else {
-              glyphName = _encodings.StandardEncoding[charCode];
+        if (glyphId >= 0 && glyphId < numGlyphs && hasGlyph(glyphId)) {
+          charCodeToGlyphId[charCode] = glyphId;
+        }
+      });
+    } else {
+      const cmapTable = readCmapTable(tables.cmap, font, this.isSymbolicFont, properties.hasEncoding);
+      const cmapPlatformId = cmapTable.platformId;
+      const cmapEncodingId = cmapTable.encodingId;
+      const cmapMappings = cmapTable.mappings;
+      const cmapMappingsLength = cmapMappings.length;
+      let baseEncoding = [],
+          forcePostTable = false;
+
+      if (properties.hasEncoding && (properties.baseEncodingName === "MacRomanEncoding" || properties.baseEncodingName === "WinAnsiEncoding")) {
+        baseEncoding = (0, _encodings.getEncoding)(properties.baseEncodingName);
+      }
+
+      if (properties.hasEncoding && !this.isSymbolicFont && (cmapPlatformId === 3 && cmapEncodingId === 1 || cmapPlatformId === 1 && cmapEncodingId === 0)) {
+        const glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+
+        for (let charCode = 0; charCode < 256; charCode++) {
+          let glyphName;
+
+          if (this.differences[charCode] !== undefined) {
+            glyphName = this.differences[charCode];
+          } else if (baseEncoding.length && baseEncoding[charCode] !== "") {
+            glyphName = baseEncoding[charCode];
+          } else {
+            glyphName = _encodings.StandardEncoding[charCode];
+          }
+
+          if (!glyphName) {
+            continue;
+          }
+
+          const standardGlyphName = (0, _fonts_utils.recoverGlyphName)(glyphName, glyphsUnicodeMap);
+          let unicodeOrCharCode;
+
+          if (cmapPlatformId === 3 && cmapEncodingId === 1) {
+            unicodeOrCharCode = glyphsUnicodeMap[standardGlyphName];
+          } else if (cmapPlatformId === 1 && cmapEncodingId === 0) {
+            unicodeOrCharCode = _encodings.MacRomanEncoding.indexOf(standardGlyphName);
+          }
+
+          if (unicodeOrCharCode === undefined) {
+            if (!properties.glyphNames && properties.hasIncludedToUnicodeMap && !(this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap)) {
+              const unicode = this.toUnicode.get(charCode);
+
+              if (unicode) {
+                unicodeOrCharCode = unicode.codePointAt(0);
+              }
             }
 
-            if (!glyphName) {
+            if (unicodeOrCharCode === undefined) {
+              continue;
+            }
+          }
+
+          for (let i = 0; i < cmapMappingsLength; ++i) {
+            if (cmapMappings[i].charCode !== unicodeOrCharCode) {
               continue;
             }
 
-            standardGlyphName = recoverGlyphName(glyphName, glyphsUnicodeMap);
-            var unicodeOrCharCode;
-
-            if (cmapPlatformId === 3 && cmapEncodingId === 1) {
-              unicodeOrCharCode = glyphsUnicodeMap[standardGlyphName];
-            } else if (cmapPlatformId === 1 && cmapEncodingId === 0) {
-              unicodeOrCharCode = _encodings.MacRomanEncoding.indexOf(standardGlyphName);
-            }
-
-            for (let i = 0; i < cmapMappingsLength; ++i) {
-              if (cmapMappings[i].charCode !== unicodeOrCharCode) {
-                continue;
-              }
-
-              charCodeToGlyphId[charCode] = cmapMappings[i].glyphId;
-              break;
-            }
-          }
-        } else if (cmapPlatformId === 0) {
-          for (let i = 0; i < cmapMappingsLength; ++i) {
-            charCodeToGlyphId[cmapMappings[i].charCode] = cmapMappings[i].glyphId;
-          }
-        } else {
-          for (let i = 0; i < cmapMappingsLength; ++i) {
-            let charCode = cmapMappings[i].charCode;
-
-            if (cmapPlatformId === 3 && charCode >= 0xf000 && charCode <= 0xf0ff) {
-              charCode &= 0xff;
-            }
-
             charCodeToGlyphId[charCode] = cmapMappings[i].glyphId;
+            break;
           }
         }
+      } else if (cmapPlatformId === 0) {
+        for (let i = 0; i < cmapMappingsLength; ++i) {
+          charCodeToGlyphId[cmapMappings[i].charCode] = cmapMappings[i].glyphId;
+        }
 
-        if (properties.glyphNames && baseEncoding.length) {
-          for (let i = 0; i < 256; ++i) {
-            if (charCodeToGlyphId[i] === undefined && baseEncoding[i]) {
-              glyphName = baseEncoding[i];
-              const glyphId = properties.glyphNames.indexOf(glyphName);
+        forcePostTable = true;
+      } else {
+        for (let i = 0; i < cmapMappingsLength; ++i) {
+          let charCode = cmapMappings[i].charCode;
 
-              if (glyphId > 0 && hasGlyph(glyphId)) {
-                charCodeToGlyphId[i] = glyphId;
-              }
-            }
+          if (cmapPlatformId === 3 && charCode >= 0xf000 && charCode <= 0xf0ff) {
+            charCode &= 0xff;
           }
+
+          charCodeToGlyphId[charCode] = cmapMappings[i].glyphId;
         }
       }
 
-      if (charCodeToGlyphId.length === 0) {
-        charCodeToGlyphId[0] = 0;
+      if (properties.glyphNames && (baseEncoding.length || this.differences.length)) {
+        for (let i = 0; i < 256; ++i) {
+          if (!forcePostTable && charCodeToGlyphId[i] !== undefined) {
+            continue;
+          }
+
+          const glyphName = this.differences[i] || baseEncoding[i];
+
+          if (!glyphName) {
+            continue;
+          }
+
+          const glyphId = properties.glyphNames.indexOf(glyphName);
+
+          if (glyphId > 0 && hasGlyph(glyphId)) {
+            charCodeToGlyphId[i] = glyphId;
+          }
+        }
       }
+    }
 
-      let glyphZeroId = numGlyphsOut - 1;
+    if (charCodeToGlyphId.length === 0) {
+      charCodeToGlyphId[0] = 0;
+    }
 
-      if (!dupFirstEntry) {
-        glyphZeroId = 0;
-      }
+    let glyphZeroId = numGlyphsOut - 1;
 
-      var newMapping = adjustMapping(charCodeToGlyphId, hasGlyph, glyphZeroId);
+    if (!dupFirstEntry) {
+      glyphZeroId = 0;
+    }
+
+    if (!properties.cssFontInfo) {
+      const newMapping = adjustMapping(charCodeToGlyphId, hasGlyph, glyphZeroId, this.toUnicode);
       this.toFontChar = newMapping.toFontChar;
       tables.cmap = {
         tag: "cmap",
-        data: createCmapTable(newMapping.charCodeToGlyphId, numGlyphsOut)
+        data: createCmapTable(newMapping.charCodeToGlyphId, newMapping.toUnicodeExtraMap, numGlyphsOut)
       };
 
       if (!tables["OS/2"] || !validateOS2Table(tables["OS/2"], font)) {
@@ -28635,1782 +27512,1411 @@ var Font = function FontClosure() {
           data: createOS2Table(properties, newMapping.charCodeToGlyphId, metricsOverride)
         };
       }
-
-      if (!isTrueType) {
-        try {
-          cffFile = new _stream.Stream(tables["CFF "].data);
-          var parser = new _cff_parser.CFFParser(cffFile, properties, SEAC_ANALYSIS_ENABLED);
-          cff = parser.parse();
-          cff.duplicateFirstGlyph();
-          var compiler = new _cff_parser.CFFCompiler(cff);
-          tables["CFF "].data = compiler.compile();
-        } catch (e) {
-          (0, _util.warn)("Failed to compile font " + properties.loadedName);
-        }
-      }
-
-      if (!tables.name) {
-        tables.name = {
-          tag: "name",
-          data: createNameTable(this.name)
-        };
-      } else {
-        var namePrototype = readNameTable(tables.name);
-        tables.name.data = createNameTable(name, namePrototype);
-      }
-
-      var builder = new OpenTypeFileBuilder(header.version);
-
-      for (var tableTag in tables) {
-        builder.addTable(tableTag, tables[tableTag].data);
-      }
-
-      return builder.toArray();
-    },
-    convert: function Font_convert(fontName, font, properties) {
-      properties.fixedPitch = false;
-
-      if (properties.builtInEncoding) {
-        adjustToUnicode(properties, properties.builtInEncoding);
-      }
-
-      let glyphZeroId = 1;
-
-      if (font instanceof CFFFont) {
-        glyphZeroId = font.numGlyphs - 1;
-      }
-
-      var mapping = font.getGlyphMapping(properties);
-      var newMapping = adjustMapping(mapping, font.hasGlyphId.bind(font), glyphZeroId);
-      this.toFontChar = newMapping.toFontChar;
-      var numGlyphs = font.numGlyphs;
-
-      function getCharCodes(charCodeToGlyphId, glyphId) {
-        var charCodes = null;
-
-        for (var charCode in charCodeToGlyphId) {
-          if (glyphId === charCodeToGlyphId[charCode]) {
-            if (!charCodes) {
-              charCodes = [];
-            }
-
-            charCodes.push(charCode | 0);
-          }
-        }
-
-        return charCodes;
-      }
-
-      function createCharCode(charCodeToGlyphId, glyphId) {
-        for (var charCode in charCodeToGlyphId) {
-          if (glyphId === charCodeToGlyphId[charCode]) {
-            return charCode | 0;
-          }
-        }
-
-        newMapping.charCodeToGlyphId[newMapping.nextAvailableFontCharCode] = glyphId;
-        return newMapping.nextAvailableFontCharCode++;
-      }
-
-      var seacs = font.seacs;
-
-      if (SEAC_ANALYSIS_ENABLED && seacs && seacs.length) {
-        var matrix = properties.fontMatrix || _util.FONT_IDENTITY_MATRIX;
-        var charset = font.getCharset();
-        var seacMap = Object.create(null);
-
-        for (var glyphId in seacs) {
-          glyphId |= 0;
-          var seac = seacs[glyphId];
-          var baseGlyphName = _encodings.StandardEncoding[seac[2]];
-          var accentGlyphName = _encodings.StandardEncoding[seac[3]];
-          var baseGlyphId = charset.indexOf(baseGlyphName);
-          var accentGlyphId = charset.indexOf(accentGlyphName);
-
-          if (baseGlyphId < 0 || accentGlyphId < 0) {
-            continue;
-          }
-
-          var accentOffset = {
-            x: seac[0] * matrix[0] + seac[1] * matrix[2] + matrix[4],
-            y: seac[0] * matrix[1] + seac[1] * matrix[3] + matrix[5]
-          };
-          var charCodes = getCharCodes(mapping, glyphId);
-
-          if (!charCodes) {
-            continue;
-          }
-
-          for (let i = 0, ii = charCodes.length; i < ii; i++) {
-            var charCode = charCodes[i];
-            var charCodeToGlyphId = newMapping.charCodeToGlyphId;
-            var baseFontCharCode = createCharCode(charCodeToGlyphId, baseGlyphId);
-            var accentFontCharCode = createCharCode(charCodeToGlyphId, accentGlyphId);
-            seacMap[charCode] = {
-              baseFontCharCode,
-              accentFontCharCode,
-              accentOffset
-            };
-          }
-        }
-
-        properties.seacMap = seacMap;
-      }
-
-      var unitsPerEm = 1 / (properties.fontMatrix || _util.FONT_IDENTITY_MATRIX)[0];
-      var builder = new OpenTypeFileBuilder("\x4F\x54\x54\x4F");
-      builder.addTable("CFF ", font.data);
-      builder.addTable("OS/2", createOS2Table(properties, newMapping.charCodeToGlyphId));
-      builder.addTable("cmap", createCmapTable(newMapping.charCodeToGlyphId, numGlyphs));
-      builder.addTable("head", "\x00\x01\x00\x00" + "\x00\x00\x10\x00" + "\x00\x00\x00\x00" + "\x5F\x0F\x3C\xF5" + "\x00\x00" + safeString16(unitsPerEm) + "\x00\x00\x00\x00\x9e\x0b\x7e\x27" + "\x00\x00\x00\x00\x9e\x0b\x7e\x27" + "\x00\x00" + safeString16(properties.descent) + "\x0F\xFF" + safeString16(properties.ascent) + string16(properties.italicAngle ? 2 : 0) + "\x00\x11" + "\x00\x00" + "\x00\x00" + "\x00\x00");
-      builder.addTable("hhea", "\x00\x01\x00\x00" + safeString16(properties.ascent) + safeString16(properties.descent) + "\x00\x00" + "\xFF\xFF" + "\x00\x00" + "\x00\x00" + "\x00\x00" + safeString16(properties.capHeight) + safeString16(Math.tan(properties.italicAngle) * properties.xHeight) + "\x00\x00" + "\x00\x00" + "\x00\x00" + "\x00\x00" + "\x00\x00" + "\x00\x00" + string16(numGlyphs));
-      builder.addTable("hmtx", function fontFieldsHmtx() {
-        var charstrings = font.charstrings;
-        var cffWidths = font.cff ? font.cff.widths : null;
-        var hmtx = "\x00\x00\x00\x00";
-
-        for (let i = 1, ii = numGlyphs; i < ii; i++) {
-          var width = 0;
-
-          if (charstrings) {
-            var charstring = charstrings[i - 1];
-            width = "width" in charstring ? charstring.width : 0;
-          } else if (cffWidths) {
-            width = Math.ceil(cffWidths[i] || 0);
-          }
-
-          hmtx += string16(width) + string16(0);
-        }
-
-        return hmtx;
-      }());
-      builder.addTable("maxp", "\x00\x00\x50\x00" + string16(numGlyphs));
-      builder.addTable("name", createNameTable(fontName));
-      builder.addTable("post", createPostTable(properties));
-      return builder.toArray();
-    },
-
-    get spaceWidth() {
-      var possibleSpaceReplacements = ["space", "minus", "one", "i", "I"];
-      var width;
-
-      for (var i = 0, ii = possibleSpaceReplacements.length; i < ii; i++) {
-        var glyphName = possibleSpaceReplacements[i];
-
-        if (glyphName in this.widths) {
-          width = this.widths[glyphName];
-          break;
-        }
-
-        var glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
-        var glyphUnicode = glyphsUnicodeMap[glyphName];
-        var charcode = 0;
-
-        if (this.composite && this.cMap.contains(glyphUnicode)) {
-          charcode = this.cMap.lookup(glyphUnicode);
-        }
-
-        if (!charcode && this.toUnicode) {
-          charcode = this.toUnicode.charCodeOf(glyphUnicode);
-        }
-
-        if (charcode <= 0) {
-          charcode = glyphUnicode;
-        }
-
-        width = this.widths[charcode];
-
-        if (width) {
-          break;
-        }
-      }
-
-      width = width || this.defaultWidth;
-      return (0, _util.shadow)(this, "spaceWidth", width);
-    },
-
-    charToGlyph: function Font_charToGlyph(charcode, isSpace) {
-      var fontCharCode, width, operatorListId;
-      var widthCode = charcode;
-
-      if (this.cMap && this.cMap.contains(charcode)) {
-        widthCode = this.cMap.lookup(charcode);
-      }
-
-      width = this.widths[widthCode];
-      width = (0, _util.isNum)(width) ? width : this.defaultWidth;
-      var vmetric = this.vmetrics && this.vmetrics[widthCode];
-      let unicode = this.toUnicode.get(charcode) || this.fallbackToUnicode.get(charcode) || charcode;
-
-      if (typeof unicode === "number") {
-        unicode = String.fromCharCode(unicode);
-      }
-
-      var isInFont = (charcode in this.toFontChar);
-      fontCharCode = this.toFontChar[charcode] || charcode;
-
-      if (this.missingFile) {
-        const glyphName = this.differences[charcode] || this.defaultEncoding[charcode];
-
-        if ((glyphName === ".notdef" || glyphName === "") && this.type === "Type1") {
-          fontCharCode = 0x20;
-        }
-
-        fontCharCode = (0, _unicode.mapSpecialUnicodeValues)(fontCharCode);
-      }
-
-      if (this.isType3Font) {
-        operatorListId = fontCharCode;
-      }
-
-      var accent = null;
-
-      if (this.seacMap && this.seacMap[charcode]) {
-        isInFont = true;
-        var seac = this.seacMap[charcode];
-        fontCharCode = seac.baseFontCharCode;
-        accent = {
-          fontChar: String.fromCodePoint(seac.accentFontCharCode),
-          offset: seac.accentOffset
-        };
-      }
-
-      let fontChar = "";
-
-      if (typeof fontCharCode === "number") {
-        if (fontCharCode <= 0x10ffff) {
-          fontChar = String.fromCodePoint(fontCharCode);
-        } else {
-          (0, _util.warn)(`charToGlyph - invalid fontCharCode: ${fontCharCode}`);
-        }
-      }
-
-      var glyph = this.glyphCache[charcode];
-
-      if (!glyph || !glyph.matchesForCache(fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont)) {
-        glyph = new Glyph(fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont);
-        this.glyphCache[charcode] = glyph;
-      }
-
-      return glyph;
-    },
-    charsToGlyphs: function Font_charsToGlyphs(chars) {
-      var charsCache = this.charsCache;
-      var glyphs, glyph, charcode;
-
-      if (charsCache) {
-        glyphs = charsCache[chars];
-
-        if (glyphs) {
-          return glyphs;
-        }
-      }
-
-      if (!charsCache) {
-        charsCache = this.charsCache = Object.create(null);
-      }
-
-      glyphs = [];
-      var charsCacheKey = chars;
-      var i = 0,
-          ii;
-
-      if (this.cMap) {
-        var c = Object.create(null);
-
-        while (i < chars.length) {
-          this.cMap.readCharCode(chars, i, c);
-          charcode = c.charcode;
-          var length = c.length;
-          i += length;
-          var isSpace = length === 1 && chars.charCodeAt(i - 1) === 0x20;
-          glyph = this.charToGlyph(charcode, isSpace);
-          glyphs.push(glyph);
-        }
-      } else {
-        for (i = 0, ii = chars.length; i < ii; ++i) {
-          charcode = chars.charCodeAt(i);
-          glyph = this.charToGlyph(charcode, charcode === 0x20);
-          glyphs.push(glyph);
-        }
-      }
-
-      return charsCache[charsCacheKey] = glyphs;
-    },
-
-    get glyphCacheValues() {
-      return Object.values(this.glyphCache);
     }
 
-  };
-  return Font;
-}();
+    if (!isTrueType) {
+      try {
+        cffFile = new _stream.Stream(tables["CFF "].data);
+        const parser = new _cff_parser.CFFParser(cffFile, properties, _fonts_utils.SEAC_ANALYSIS_ENABLED);
+        cff = parser.parse();
+        cff.duplicateFirstGlyph();
+        const compiler = new _cff_parser.CFFCompiler(cff);
+        tables["CFF "].data = compiler.compile();
+      } catch (e) {
+        (0, _util.warn)("Failed to compile font " + properties.loadedName);
+      }
+    }
+
+    if (!tables.name) {
+      tables.name = {
+        tag: "name",
+        data: createNameTable(this.name)
+      };
+    } else {
+      const namePrototype = readNameTable(tables.name);
+      tables.name.data = createNameTable(name, namePrototype);
+      this.psName = namePrototype[0][6] || null;
+    }
+
+    const builder = new _opentype_file_builder.OpenTypeFileBuilder(header.version);
+
+    for (const tableTag in tables) {
+      builder.addTable(tableTag, tables[tableTag].data);
+    }
+
+    return builder.toArray();
+  }
+
+  convert(fontName, font, properties) {
+    properties.fixedPitch = false;
+
+    if (properties.builtInEncoding) {
+      adjustToUnicode(properties, properties.builtInEncoding);
+    }
+
+    let glyphZeroId = 1;
+
+    if (font instanceof _cff_font.CFFFont) {
+      glyphZeroId = font.numGlyphs - 1;
+    }
+
+    const mapping = font.getGlyphMapping(properties);
+    let newMapping = null;
+    let newCharCodeToGlyphId = mapping;
+    let toUnicodeExtraMap = null;
+
+    if (!properties.cssFontInfo) {
+      newMapping = adjustMapping(mapping, font.hasGlyphId.bind(font), glyphZeroId, this.toUnicode);
+      this.toFontChar = newMapping.toFontChar;
+      newCharCodeToGlyphId = newMapping.charCodeToGlyphId;
+      toUnicodeExtraMap = newMapping.toUnicodeExtraMap;
+    }
+
+    const numGlyphs = font.numGlyphs;
+
+    function getCharCodes(charCodeToGlyphId, glyphId) {
+      let charCodes = null;
+
+      for (const charCode in charCodeToGlyphId) {
+        if (glyphId === charCodeToGlyphId[charCode]) {
+          if (!charCodes) {
+            charCodes = [];
+          }
+
+          charCodes.push(charCode | 0);
+        }
+      }
+
+      return charCodes;
+    }
+
+    function createCharCode(charCodeToGlyphId, glyphId) {
+      for (const charCode in charCodeToGlyphId) {
+        if (glyphId === charCodeToGlyphId[charCode]) {
+          return charCode | 0;
+        }
+      }
+
+      newMapping.charCodeToGlyphId[newMapping.nextAvailableFontCharCode] = glyphId;
+      return newMapping.nextAvailableFontCharCode++;
+    }
+
+    const seacs = font.seacs;
+
+    if (newMapping && _fonts_utils.SEAC_ANALYSIS_ENABLED && seacs && seacs.length) {
+      const matrix = properties.fontMatrix || _util.FONT_IDENTITY_MATRIX;
+      const charset = font.getCharset();
+      const seacMap = Object.create(null);
+
+      for (let glyphId in seacs) {
+        glyphId |= 0;
+        const seac = seacs[glyphId];
+        const baseGlyphName = _encodings.StandardEncoding[seac[2]];
+        const accentGlyphName = _encodings.StandardEncoding[seac[3]];
+        const baseGlyphId = charset.indexOf(baseGlyphName);
+        const accentGlyphId = charset.indexOf(accentGlyphName);
+
+        if (baseGlyphId < 0 || accentGlyphId < 0) {
+          continue;
+        }
+
+        const accentOffset = {
+          x: seac[0] * matrix[0] + seac[1] * matrix[2] + matrix[4],
+          y: seac[0] * matrix[1] + seac[1] * matrix[3] + matrix[5]
+        };
+        const charCodes = getCharCodes(mapping, glyphId);
+
+        if (!charCodes) {
+          continue;
+        }
+
+        for (let i = 0, ii = charCodes.length; i < ii; i++) {
+          const charCode = charCodes[i];
+          const charCodeToGlyphId = newMapping.charCodeToGlyphId;
+          const baseFontCharCode = createCharCode(charCodeToGlyphId, baseGlyphId);
+          const accentFontCharCode = createCharCode(charCodeToGlyphId, accentGlyphId);
+          seacMap[charCode] = {
+            baseFontCharCode,
+            accentFontCharCode,
+            accentOffset
+          };
+        }
+      }
+
+      properties.seacMap = seacMap;
+    }
+
+    const unitsPerEm = 1 / (properties.fontMatrix || _util.FONT_IDENTITY_MATRIX)[0];
+    const builder = new _opentype_file_builder.OpenTypeFileBuilder("\x4F\x54\x54\x4F");
+    builder.addTable("CFF ", font.data);
+    builder.addTable("OS/2", createOS2Table(properties, newCharCodeToGlyphId));
+    builder.addTable("cmap", createCmapTable(newCharCodeToGlyphId, toUnicodeExtraMap, numGlyphs));
+    builder.addTable("head", "\x00\x01\x00\x00" + "\x00\x00\x10\x00" + "\x00\x00\x00\x00" + "\x5F\x0F\x3C\xF5" + "\x00\x00" + safeString16(unitsPerEm) + "\x00\x00\x00\x00\x9e\x0b\x7e\x27" + "\x00\x00\x00\x00\x9e\x0b\x7e\x27" + "\x00\x00" + safeString16(properties.descent) + "\x0F\xFF" + safeString16(properties.ascent) + string16(properties.italicAngle ? 2 : 0) + "\x00\x11" + "\x00\x00" + "\x00\x00" + "\x00\x00");
+    builder.addTable("hhea", "\x00\x01\x00\x00" + safeString16(properties.ascent) + safeString16(properties.descent) + "\x00\x00" + "\xFF\xFF" + "\x00\x00" + "\x00\x00" + "\x00\x00" + safeString16(properties.capHeight) + safeString16(Math.tan(properties.italicAngle) * properties.xHeight) + "\x00\x00" + "\x00\x00" + "\x00\x00" + "\x00\x00" + "\x00\x00" + "\x00\x00" + string16(numGlyphs));
+    builder.addTable("hmtx", function fontFieldsHmtx() {
+      const charstrings = font.charstrings;
+      const cffWidths = font.cff ? font.cff.widths : null;
+      let hmtx = "\x00\x00\x00\x00";
+
+      for (let i = 1, ii = numGlyphs; i < ii; i++) {
+        let width = 0;
+
+        if (charstrings) {
+          const charstring = charstrings[i - 1];
+          width = "width" in charstring ? charstring.width : 0;
+        } else if (cffWidths) {
+          width = Math.ceil(cffWidths[i] || 0);
+        }
+
+        hmtx += string16(width) + string16(0);
+      }
+
+      return hmtx;
+    }());
+    builder.addTable("maxp", "\x00\x00\x50\x00" + string16(numGlyphs));
+    builder.addTable("name", createNameTable(fontName));
+    builder.addTable("post", createPostTable(properties));
+    return builder.toArray();
+  }
+
+  get spaceWidth() {
+    const possibleSpaceReplacements = ["space", "minus", "one", "i", "I"];
+    let width;
+
+    for (let i = 0, ii = possibleSpaceReplacements.length; i < ii; i++) {
+      const glyphName = possibleSpaceReplacements[i];
+
+      if (glyphName in this.widths) {
+        width = this.widths[glyphName];
+        break;
+      }
+
+      const glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+      const glyphUnicode = glyphsUnicodeMap[glyphName];
+      let charcode = 0;
+
+      if (this.composite && this.cMap.contains(glyphUnicode)) {
+        charcode = this.cMap.lookup(glyphUnicode);
+
+        if (typeof charcode === "string") {
+          charcode = convertCidString(glyphUnicode, charcode);
+        }
+      }
+
+      if (!charcode && this.toUnicode) {
+        charcode = this.toUnicode.charCodeOf(glyphUnicode);
+      }
+
+      if (charcode <= 0) {
+        charcode = glyphUnicode;
+      }
+
+      width = this.widths[charcode];
+
+      if (width) {
+        break;
+      }
+    }
+
+    width = width || this.defaultWidth;
+    return (0, _util.shadow)(this, "spaceWidth", width);
+  }
+
+  _charToGlyph(charcode, isSpace = false) {
+    let fontCharCode, width, operatorListId;
+    let widthCode = charcode;
+
+    if (this.cMap && this.cMap.contains(charcode)) {
+      widthCode = this.cMap.lookup(charcode);
+
+      if (typeof widthCode === "string") {
+        widthCode = convertCidString(charcode, widthCode);
+      }
+    }
+
+    width = this.widths[widthCode];
+
+    if (typeof width !== "number") {
+      width = this.defaultWidth;
+    }
+
+    const vmetric = this.vmetrics && this.vmetrics[widthCode];
+    let unicode = this.toUnicode.get(charcode) || charcode;
+
+    if (typeof unicode === "number") {
+      unicode = String.fromCharCode(unicode);
+    }
+
+    let isInFont = this.toFontChar[charcode] !== undefined;
+    fontCharCode = this.toFontChar[charcode] || charcode;
+
+    if (this.missingFile) {
+      const glyphName = this.differences[charcode] || this.defaultEncoding[charcode];
+
+      if ((glyphName === ".notdef" || glyphName === "") && this.type === "Type1") {
+        fontCharCode = 0x20;
+      }
+
+      fontCharCode = (0, _unicode.mapSpecialUnicodeValues)(fontCharCode);
+    }
+
+    if (this.isType3Font) {
+      operatorListId = fontCharCode;
+    }
+
+    let accent = null;
+
+    if (this.seacMap && this.seacMap[charcode]) {
+      isInFont = true;
+      const seac = this.seacMap[charcode];
+      fontCharCode = seac.baseFontCharCode;
+      accent = {
+        fontChar: String.fromCodePoint(seac.accentFontCharCode),
+        offset: seac.accentOffset
+      };
+    }
+
+    let fontChar = "";
+
+    if (typeof fontCharCode === "number") {
+      if (fontCharCode <= 0x10ffff) {
+        fontChar = String.fromCodePoint(fontCharCode);
+      } else {
+        (0, _util.warn)(`charToGlyph - invalid fontCharCode: ${fontCharCode}`);
+      }
+    }
+
+    let glyph = this._glyphCache[charcode];
+
+    if (!glyph || !glyph.matchesForCache(charcode, fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont)) {
+      glyph = new Glyph(charcode, fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont);
+      this._glyphCache[charcode] = glyph;
+    }
+
+    return glyph;
+  }
+
+  charsToGlyphs(chars) {
+    let glyphs = this._charsCache[chars];
+
+    if (glyphs) {
+      return glyphs;
+    }
+
+    glyphs = [];
+
+    if (this.cMap) {
+      const c = Object.create(null),
+            ii = chars.length;
+      let i = 0;
+
+      while (i < ii) {
+        this.cMap.readCharCode(chars, i, c);
+        const {
+          charcode,
+          length
+        } = c;
+        i += length;
+
+        const glyph = this._charToGlyph(charcode, length === 1 && chars.charCodeAt(i - 1) === 0x20);
+
+        glyphs.push(glyph);
+      }
+    } else {
+      for (let i = 0, ii = chars.length; i < ii; ++i) {
+        const charcode = chars.charCodeAt(i);
+
+        const glyph = this._charToGlyph(charcode, charcode === 0x20);
+
+        glyphs.push(glyph);
+      }
+    }
+
+    return this._charsCache[chars] = glyphs;
+  }
+
+  getCharPositions(chars) {
+    const positions = [];
+
+    if (this.cMap) {
+      const c = Object.create(null);
+      let i = 0;
+
+      while (i < chars.length) {
+        this.cMap.readCharCode(chars, i, c);
+        const length = c.length;
+        positions.push([i, i + length]);
+        i += length;
+      }
+    } else {
+      for (let i = 0, ii = chars.length; i < ii; ++i) {
+        positions.push([i, i + 1]);
+      }
+    }
+
+    return positions;
+  }
+
+  get glyphCacheValues() {
+    return Object.values(this._glyphCache);
+  }
+
+  encodeString(str) {
+    const buffers = [];
+    const currentBuf = [];
+
+    const hasCurrentBufErrors = () => buffers.length % 2 === 1;
+
+    const getCharCode = this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap ? unicode => this.toUnicode.charCodeOf(unicode) : unicode => this.toUnicode.charCodeOf(String.fromCodePoint(unicode));
+
+    for (let i = 0, ii = str.length; i < ii; i++) {
+      const unicode = str.codePointAt(i);
+
+      if (unicode > 0xd7ff && (unicode < 0xe000 || unicode > 0xfffd)) {
+        i++;
+      }
+
+      if (this.toUnicode) {
+        const charCode = getCharCode(unicode);
+
+        if (charCode !== -1) {
+          if (hasCurrentBufErrors()) {
+            buffers.push(currentBuf.join(""));
+            currentBuf.length = 0;
+          }
+
+          const charCodeLength = this.cMap ? this.cMap.getCharCodeLength(charCode) : 1;
+
+          for (let j = charCodeLength - 1; j >= 0; j--) {
+            currentBuf.push(String.fromCharCode(charCode >> 8 * j & 0xff));
+          }
+
+          continue;
+        }
+      }
+
+      if (!hasCurrentBufErrors()) {
+        buffers.push(currentBuf.join(""));
+        currentBuf.length = 0;
+      }
+
+      currentBuf.push(String.fromCodePoint(unicode));
+    }
+
+    buffers.push(currentBuf.join(""));
+    return buffers;
+  }
+
+}
 
 exports.Font = Font;
 
-var ErrorFont = function ErrorFontClosure() {
-  function ErrorFont(error) {
+class ErrorFont {
+  constructor(error) {
     this.error = error;
     this.loadedName = "g_font_error";
     this.missingFile = true;
   }
 
-  ErrorFont.prototype = {
-    charsToGlyphs: function ErrorFont_charsToGlyphs() {
-      return [];
-    },
+  charsToGlyphs() {
+    return [];
+  }
 
-    exportData(extraProperties = false) {
-      return {
-        error: this.error
-      };
-    }
+  encodeString(chars) {
+    return [chars];
+  }
 
-  };
-  return ErrorFont;
-}();
+  exportData(extraProperties = false) {
+    return {
+      error: this.error
+    };
+  }
+
+}
 
 exports.ErrorFont = ErrorFont;
 
-function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
-  var charCodeToGlyphId = Object.create(null);
-  var glyphId, charCode, baseEncoding;
-  var isSymbolicFont = !!(properties.flags & FontFlags.Symbolic);
-
-  if (properties.baseEncodingName) {
-    baseEncoding = (0, _encodings.getEncoding)(properties.baseEncodingName);
-
-    for (charCode = 0; charCode < baseEncoding.length; charCode++) {
-      glyphId = glyphNames.indexOf(baseEncoding[charCode]);
-
-      if (glyphId >= 0) {
-        charCodeToGlyphId[charCode] = glyphId;
-      } else {
-        charCodeToGlyphId[charCode] = 0;
-      }
-    }
-  } else if (isSymbolicFont) {
-    for (charCode in builtInEncoding) {
-      charCodeToGlyphId[charCode] = builtInEncoding[charCode];
-    }
-  } else {
-    baseEncoding = _encodings.StandardEncoding;
-
-    for (charCode = 0; charCode < baseEncoding.length; charCode++) {
-      glyphId = glyphNames.indexOf(baseEncoding[charCode]);
-
-      if (glyphId >= 0) {
-        charCodeToGlyphId[charCode] = glyphId;
-      } else {
-        charCodeToGlyphId[charCode] = 0;
-      }
-    }
-  }
-
-  var differences = properties.differences,
-      glyphsUnicodeMap;
-
-  if (differences) {
-    for (charCode in differences) {
-      var glyphName = differences[charCode];
-      glyphId = glyphNames.indexOf(glyphName);
-
-      if (glyphId === -1) {
-        if (!glyphsUnicodeMap) {
-          glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
-        }
-
-        var standardGlyphName = recoverGlyphName(glyphName, glyphsUnicodeMap);
-
-        if (standardGlyphName !== glyphName) {
-          glyphId = glyphNames.indexOf(standardGlyphName);
-        }
-      }
-
-      if (glyphId >= 0) {
-        charCodeToGlyphId[charCode] = glyphId;
-      } else {
-        charCodeToGlyphId[charCode] = 0;
-      }
-    }
-  }
-
-  return charCodeToGlyphId;
-}
-
-var Type1Font = function Type1FontClosure() {
-  function findBlock(streamBytes, signature, startIndex) {
-    var streamBytesLength = streamBytes.length;
-    var signatureLength = signature.length;
-    var scanLength = streamBytesLength - signatureLength;
-    var i = startIndex,
-        j,
-        found = false;
-
-    while (i < scanLength) {
-      j = 0;
-
-      while (j < signatureLength && streamBytes[i + j] === signature[j]) {
-        j++;
-      }
-
-      if (j >= signatureLength) {
-        i += j;
-
-        while (i < streamBytesLength && (0, _core_utils.isWhiteSpace)(streamBytes[i])) {
-          i++;
-        }
-
-        found = true;
-        break;
-      }
-
-      i++;
-    }
-
-    return {
-      found,
-      length: i
-    };
-  }
-
-  function getHeaderBlock(stream, suggestedLength) {
-    var EEXEC_SIGNATURE = [0x65, 0x65, 0x78, 0x65, 0x63];
-    var streamStartPos = stream.pos;
-    var headerBytes, headerBytesLength, block;
-
-    try {
-      headerBytes = stream.getBytes(suggestedLength);
-      headerBytesLength = headerBytes.length;
-    } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-    }
-
-    if (headerBytesLength === suggestedLength) {
-      block = findBlock(headerBytes, EEXEC_SIGNATURE, suggestedLength - 2 * EEXEC_SIGNATURE.length);
-
-      if (block.found && block.length === suggestedLength) {
-        return {
-          stream: new _stream.Stream(headerBytes),
-          length: suggestedLength
-        };
-      }
-    }
-
-    (0, _util.warn)('Invalid "Length1" property in Type1 font -- trying to recover.');
-    stream.pos = streamStartPos;
-    var SCAN_BLOCK_LENGTH = 2048;
-    var actualLength;
-
-    while (true) {
-      var scanBytes = stream.peekBytes(SCAN_BLOCK_LENGTH);
-      block = findBlock(scanBytes, EEXEC_SIGNATURE, 0);
-
-      if (block.length === 0) {
-        break;
-      }
-
-      stream.pos += block.length;
-
-      if (block.found) {
-        actualLength = stream.pos - streamStartPos;
-        break;
-      }
-    }
-
-    stream.pos = streamStartPos;
-
-    if (actualLength) {
-      return {
-        stream: new _stream.Stream(stream.getBytes(actualLength)),
-        length: actualLength
-      };
-    }
-
-    (0, _util.warn)('Unable to recover "Length1" property in Type1 font -- using as is.');
-    return {
-      stream: new _stream.Stream(stream.getBytes(suggestedLength)),
-      length: suggestedLength
-    };
-  }
-
-  function getEexecBlock(stream, suggestedLength) {
-    var eexecBytes = stream.getBytes();
-    return {
-      stream: new _stream.Stream(eexecBytes),
-      length: eexecBytes.length
-    };
-  }
-
-  function Type1Font(name, file, properties) {
-    var PFB_HEADER_SIZE = 6;
-    var headerBlockLength = properties.length1;
-    var eexecBlockLength = properties.length2;
-    var pfbHeader = file.peekBytes(PFB_HEADER_SIZE);
-    var pfbHeaderPresent = pfbHeader[0] === 0x80 && pfbHeader[1] === 0x01;
-
-    if (pfbHeaderPresent) {
-      file.skip(PFB_HEADER_SIZE);
-      headerBlockLength = pfbHeader[5] << 24 | pfbHeader[4] << 16 | pfbHeader[3] << 8 | pfbHeader[2];
-    }
-
-    var headerBlock = getHeaderBlock(file, headerBlockLength);
-    var headerBlockParser = new _type1_parser.Type1Parser(headerBlock.stream, false, SEAC_ANALYSIS_ENABLED);
-    headerBlockParser.extractFontHeader(properties);
-
-    if (pfbHeaderPresent) {
-      pfbHeader = file.getBytes(PFB_HEADER_SIZE);
-      eexecBlockLength = pfbHeader[5] << 24 | pfbHeader[4] << 16 | pfbHeader[3] << 8 | pfbHeader[2];
-    }
-
-    var eexecBlock = getEexecBlock(file, eexecBlockLength);
-    var eexecBlockParser = new _type1_parser.Type1Parser(eexecBlock.stream, true, SEAC_ANALYSIS_ENABLED);
-    var data = eexecBlockParser.extractFontProgram(properties);
-
-    for (const key in data.properties) {
-      properties[key] = data.properties[key];
-    }
-
-    var charstrings = data.charstrings;
-    var type2Charstrings = this.getType2Charstrings(charstrings);
-    var subrs = this.getType2Subrs(data.subrs);
-    this.charstrings = charstrings;
-    this.data = this.wrap(name, type2Charstrings, this.charstrings, subrs, properties);
-    this.seacs = this.getSeacs(data.charstrings);
-  }
-
-  Type1Font.prototype = {
-    get numGlyphs() {
-      return this.charstrings.length + 1;
-    },
-
-    getCharset: function Type1Font_getCharset() {
-      var charset = [".notdef"];
-      var charstrings = this.charstrings;
-
-      for (var glyphId = 0; glyphId < charstrings.length; glyphId++) {
-        charset.push(charstrings[glyphId].glyphName);
-      }
-
-      return charset;
-    },
-    getGlyphMapping: function Type1Font_getGlyphMapping(properties) {
-      var charstrings = this.charstrings;
-
-      if (properties.composite) {
-        const charCodeToGlyphId = Object.create(null);
-
-        for (let glyphId = 0, charstringsLen = charstrings.length; glyphId < charstringsLen; glyphId++) {
-          const charCode = properties.cMap.charCodeOf(glyphId);
-          charCodeToGlyphId[charCode] = glyphId + 1;
-        }
-
-        return charCodeToGlyphId;
-      }
-
-      var glyphNames = [".notdef"],
-          glyphId;
-
-      for (glyphId = 0; glyphId < charstrings.length; glyphId++) {
-        glyphNames.push(charstrings[glyphId].glyphName);
-      }
-
-      var encoding = properties.builtInEncoding;
-
-      if (encoding) {
-        var builtInEncoding = Object.create(null);
-
-        for (var charCode in encoding) {
-          glyphId = glyphNames.indexOf(encoding[charCode]);
-
-          if (glyphId >= 0) {
-            builtInEncoding[charCode] = glyphId;
-          }
-        }
-      }
-
-      return type1FontGlyphMapping(properties, builtInEncoding, glyphNames);
-    },
-    hasGlyphId: function Type1Font_hasGlyphID(id) {
-      if (id < 0 || id >= this.numGlyphs) {
-        return false;
-      }
-
-      if (id === 0) {
-        return true;
-      }
-
-      var glyph = this.charstrings[id - 1];
-      return glyph.charstring.length > 0;
-    },
-    getSeacs: function Type1Font_getSeacs(charstrings) {
-      var i, ii;
-      var seacMap = [];
-
-      for (i = 0, ii = charstrings.length; i < ii; i++) {
-        var charstring = charstrings[i];
-
-        if (charstring.seac) {
-          seacMap[i + 1] = charstring.seac;
-        }
-      }
-
-      return seacMap;
-    },
-    getType2Charstrings: function Type1Font_getType2Charstrings(type1Charstrings) {
-      var type2Charstrings = [];
-
-      for (var i = 0, ii = type1Charstrings.length; i < ii; i++) {
-        type2Charstrings.push(type1Charstrings[i].charstring);
-      }
-
-      return type2Charstrings;
-    },
-    getType2Subrs: function Type1Font_getType2Subrs(type1Subrs) {
-      var bias = 0;
-      var count = type1Subrs.length;
-
-      if (count < 1133) {
-        bias = 107;
-      } else if (count < 33769) {
-        bias = 1131;
-      } else {
-        bias = 32768;
-      }
-
-      var type2Subrs = [];
-      var i;
-
-      for (i = 0; i < bias; i++) {
-        type2Subrs.push([0x0b]);
-      }
-
-      for (i = 0; i < count; i++) {
-        type2Subrs.push(type1Subrs[i]);
-      }
-
-      return type2Subrs;
-    },
-    wrap: function Type1Font_wrap(name, glyphs, charstrings, subrs, properties) {
-      var cff = new _cff_parser.CFF();
-      cff.header = new _cff_parser.CFFHeader(1, 0, 4, 4);
-      cff.names = [name];
-      var topDict = new _cff_parser.CFFTopDict();
-      topDict.setByName("version", 391);
-      topDict.setByName("Notice", 392);
-      topDict.setByName("FullName", 393);
-      topDict.setByName("FamilyName", 394);
-      topDict.setByName("Weight", 395);
-      topDict.setByName("Encoding", null);
-      topDict.setByName("FontMatrix", properties.fontMatrix);
-      topDict.setByName("FontBBox", properties.bbox);
-      topDict.setByName("charset", null);
-      topDict.setByName("CharStrings", null);
-      topDict.setByName("Private", null);
-      cff.topDict = topDict;
-      var strings = new _cff_parser.CFFStrings();
-      strings.add("Version 0.11");
-      strings.add("See original notice");
-      strings.add(name);
-      strings.add(name);
-      strings.add("Medium");
-      cff.strings = strings;
-      cff.globalSubrIndex = new _cff_parser.CFFIndex();
-      var count = glyphs.length;
-      var charsetArray = [".notdef"];
-      var i, ii;
-
-      for (i = 0; i < count; i++) {
-        const glyphName = charstrings[i].glyphName;
-
-        const index = _cff_parser.CFFStandardStrings.indexOf(glyphName);
-
-        if (index === -1) {
-          strings.add(glyphName);
-        }
-
-        charsetArray.push(glyphName);
-      }
-
-      cff.charset = new _cff_parser.CFFCharset(false, 0, charsetArray);
-      var charStringsIndex = new _cff_parser.CFFIndex();
-      charStringsIndex.add([0x8b, 0x0e]);
-
-      for (i = 0; i < count; i++) {
-        charStringsIndex.add(glyphs[i]);
-      }
-
-      cff.charStrings = charStringsIndex;
-      var privateDict = new _cff_parser.CFFPrivateDict();
-      privateDict.setByName("Subrs", null);
-      var fields = ["BlueValues", "OtherBlues", "FamilyBlues", "FamilyOtherBlues", "StemSnapH", "StemSnapV", "BlueShift", "BlueFuzz", "BlueScale", "LanguageGroup", "ExpansionFactor", "ForceBold", "StdHW", "StdVW"];
-
-      for (i = 0, ii = fields.length; i < ii; i++) {
-        var field = fields[i];
-
-        if (!(field in properties.privateData)) {
-          continue;
-        }
-
-        var value = properties.privateData[field];
-
-        if (Array.isArray(value)) {
-          for (var j = value.length - 1; j > 0; j--) {
-            value[j] -= value[j - 1];
-          }
-        }
-
-        privateDict.setByName(field, value);
-      }
-
-      cff.topDict.privateDict = privateDict;
-      var subrIndex = new _cff_parser.CFFIndex();
-
-      for (i = 0, ii = subrs.length; i < ii; i++) {
-        subrIndex.add(subrs[i]);
-      }
-
-      privateDict.subrsIndex = subrIndex;
-      var compiler = new _cff_parser.CFFCompiler(cff);
-      return compiler.compile();
-    }
-  };
-  return Type1Font;
-}();
-
-var CFFFont = function CFFFontClosure() {
-  function CFFFont(file, properties) {
-    this.properties = properties;
-    var parser = new _cff_parser.CFFParser(file, properties, SEAC_ANALYSIS_ENABLED);
-    this.cff = parser.parse();
-    this.cff.duplicateFirstGlyph();
-    var compiler = new _cff_parser.CFFCompiler(this.cff);
-    this.seacs = this.cff.seacs;
-
-    try {
-      this.data = compiler.compile();
-    } catch (e) {
-      (0, _util.warn)("Failed to compile font " + properties.loadedName);
-      this.data = file;
-    }
-  }
-
-  CFFFont.prototype = {
-    get numGlyphs() {
-      return this.cff.charStrings.count;
-    },
-
-    getCharset: function CFFFont_getCharset() {
-      return this.cff.charset.charset;
-    },
-    getGlyphMapping: function CFFFont_getGlyphMapping() {
-      var cff = this.cff;
-      var properties = this.properties;
-      var charsets = cff.charset.charset;
-      var charCodeToGlyphId;
-      var glyphId;
-
-      if (properties.composite) {
-        charCodeToGlyphId = Object.create(null);
-        let charCode;
-
-        if (cff.isCIDFont) {
-          for (glyphId = 0; glyphId < charsets.length; glyphId++) {
-            var cid = charsets[glyphId];
-            charCode = properties.cMap.charCodeOf(cid);
-            charCodeToGlyphId[charCode] = glyphId;
-          }
-        } else {
-          for (glyphId = 0; glyphId < cff.charStrings.count; glyphId++) {
-            charCode = properties.cMap.charCodeOf(glyphId);
-            charCodeToGlyphId[charCode] = glyphId;
-          }
-        }
-
-        return charCodeToGlyphId;
-      }
-
-      var encoding = cff.encoding ? cff.encoding.encoding : null;
-      charCodeToGlyphId = type1FontGlyphMapping(properties, encoding, charsets);
-      return charCodeToGlyphId;
-    },
-    hasGlyphId: function CFFFont_hasGlyphID(id) {
-      return this.cff.hasGlyphId(id);
-    }
-  };
-  return CFFFont;
-}();
-
 /***/ }),
-/* 31 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 35 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.CFFFDSelect = exports.CFFCompiler = exports.CFFPrivateDict = exports.CFFTopDict = exports.CFFCharset = exports.CFFIndex = exports.CFFStrings = exports.CFFHeader = exports.CFF = exports.CFFParser = exports.CFFStandardStrings = void 0;
+}));
+exports.CFFTopDict = exports.CFFStrings = exports.CFFStandardStrings = exports.CFFPrivateDict = exports.CFFParser = exports.CFFIndex = exports.CFFHeader = exports.CFFFDSelect = exports.CFFCompiler = exports.CFFCharset = exports.CFF = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
-var _charsets = __w_pdfjs_require__(32);
+var _charsets = __w_pdfjs_require__(36);
 
-var _encodings = __w_pdfjs_require__(33);
+var _encodings = __w_pdfjs_require__(37);
 
-var MAX_SUBR_NESTING = 10;
-var CFFStandardStrings = [".notdef", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quoteright", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "exclamdown", "cent", "sterling", "fraction", "yen", "florin", "section", "currency", "quotesingle", "quotedblleft", "guillemotleft", "guilsinglleft", "guilsinglright", "fi", "fl", "endash", "dagger", "daggerdbl", "periodcentered", "paragraph", "bullet", "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright", "ellipsis", "perthousand", "questiondown", "grave", "acute", "circumflex", "tilde", "macron", "breve", "dotaccent", "dieresis", "ring", "cedilla", "hungarumlaut", "ogonek", "caron", "emdash", "AE", "ordfeminine", "Lslash", "Oslash", "OE", "ordmasculine", "ae", "dotlessi", "lslash", "oslash", "oe", "germandbls", "onesuperior", "logicalnot", "mu", "trademark", "Eth", "onehalf", "plusminus", "Thorn", "onequarter", "divide", "brokenbar", "degree", "thorn", "threequarters", "twosuperior", "registered", "minus", "eth", "multiply", "threesuperior", "copyright", "Aacute", "Acircumflex", "Adieresis", "Agrave", "Aring", "Atilde", "Ccedilla", "Eacute", "Ecircumflex", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Ntilde", "Oacute", "Ocircumflex", "Odieresis", "Ograve", "Otilde", "Scaron", "Uacute", "Ucircumflex", "Udieresis", "Ugrave", "Yacute", "Ydieresis", "Zcaron", "aacute", "acircumflex", "adieresis", "agrave", "aring", "atilde", "ccedilla", "eacute", "ecircumflex", "edieresis", "egrave", "iacute", "icircumflex", "idieresis", "igrave", "ntilde", "oacute", "ocircumflex", "odieresis", "ograve", "otilde", "scaron", "uacute", "ucircumflex", "udieresis", "ugrave", "yacute", "ydieresis", "zcaron", "exclamsmall", "Hungarumlautsmall", "dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "twodotenleader", "onedotenleader", "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "commasuperior", "threequartersemdash", "periodsuperior", "questionsmall", "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior", "isuperior", "lsuperior", "msuperior", "nsuperior", "osuperior", "rsuperior", "ssuperior", "tsuperior", "ff", "ffi", "ffl", "parenleftinferior", "parenrightinferior", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "exclamdownsmall", "centoldstyle", "Lslashsmall", "Scaronsmall", "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "Dotaccentsmall", "Macronsmall", "figuredash", "hypheninferior", "Ogoneksmall", "Ringsmall", "Cedillasmall", "questiondownsmall", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "zerosuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior", "ninesuperior", "zeroinferior", "oneinferior", "twoinferior", "threeinferior", "fourinferior", "fiveinferior", "sixinferior", "seveninferior", "eightinferior", "nineinferior", "centinferior", "dollarinferior", "periodinferior", "commainferior", "Agravesmall", "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall", "Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall", "Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall", "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall", "Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall", "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall", "Ydieresissmall", "001.000", "001.001", "001.002", "001.003", "Black", "Bold", "Book", "Light", "Medium", "Regular", "Roman", "Semibold"];
+const MAX_SUBR_NESTING = 10;
+const CFFStandardStrings = [".notdef", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quoteright", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "exclamdown", "cent", "sterling", "fraction", "yen", "florin", "section", "currency", "quotesingle", "quotedblleft", "guillemotleft", "guilsinglleft", "guilsinglright", "fi", "fl", "endash", "dagger", "daggerdbl", "periodcentered", "paragraph", "bullet", "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright", "ellipsis", "perthousand", "questiondown", "grave", "acute", "circumflex", "tilde", "macron", "breve", "dotaccent", "dieresis", "ring", "cedilla", "hungarumlaut", "ogonek", "caron", "emdash", "AE", "ordfeminine", "Lslash", "Oslash", "OE", "ordmasculine", "ae", "dotlessi", "lslash", "oslash", "oe", "germandbls", "onesuperior", "logicalnot", "mu", "trademark", "Eth", "onehalf", "plusminus", "Thorn", "onequarter", "divide", "brokenbar", "degree", "thorn", "threequarters", "twosuperior", "registered", "minus", "eth", "multiply", "threesuperior", "copyright", "Aacute", "Acircumflex", "Adieresis", "Agrave", "Aring", "Atilde", "Ccedilla", "Eacute", "Ecircumflex", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Ntilde", "Oacute", "Ocircumflex", "Odieresis", "Ograve", "Otilde", "Scaron", "Uacute", "Ucircumflex", "Udieresis", "Ugrave", "Yacute", "Ydieresis", "Zcaron", "aacute", "acircumflex", "adieresis", "agrave", "aring", "atilde", "ccedilla", "eacute", "ecircumflex", "edieresis", "egrave", "iacute", "icircumflex", "idieresis", "igrave", "ntilde", "oacute", "ocircumflex", "odieresis", "ograve", "otilde", "scaron", "uacute", "ucircumflex", "udieresis", "ugrave", "yacute", "ydieresis", "zcaron", "exclamsmall", "Hungarumlautsmall", "dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "twodotenleader", "onedotenleader", "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "commasuperior", "threequartersemdash", "periodsuperior", "questionsmall", "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior", "isuperior", "lsuperior", "msuperior", "nsuperior", "osuperior", "rsuperior", "ssuperior", "tsuperior", "ff", "ffi", "ffl", "parenleftinferior", "parenrightinferior", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "exclamdownsmall", "centoldstyle", "Lslashsmall", "Scaronsmall", "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "Dotaccentsmall", "Macronsmall", "figuredash", "hypheninferior", "Ogoneksmall", "Ringsmall", "Cedillasmall", "questiondownsmall", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "zerosuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior", "ninesuperior", "zeroinferior", "oneinferior", "twoinferior", "threeinferior", "fourinferior", "fiveinferior", "sixinferior", "seveninferior", "eightinferior", "nineinferior", "centinferior", "dollarinferior", "periodinferior", "commainferior", "Agravesmall", "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall", "Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall", "Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall", "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall", "Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall", "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall", "Ydieresissmall", "001.000", "001.001", "001.002", "001.003", "Black", "Bold", "Book", "Light", "Medium", "Regular", "Roman", "Semibold"];
 exports.CFFStandardStrings = CFFStandardStrings;
 const NUM_STANDARD_CFF_STRINGS = 391;
+const CharstringValidationData = [null, {
+  id: "hstem",
+  min: 2,
+  stackClearing: true,
+  stem: true
+}, null, {
+  id: "vstem",
+  min: 2,
+  stackClearing: true,
+  stem: true
+}, {
+  id: "vmoveto",
+  min: 1,
+  stackClearing: true
+}, {
+  id: "rlineto",
+  min: 2,
+  resetStack: true
+}, {
+  id: "hlineto",
+  min: 1,
+  resetStack: true
+}, {
+  id: "vlineto",
+  min: 1,
+  resetStack: true
+}, {
+  id: "rrcurveto",
+  min: 6,
+  resetStack: true
+}, null, {
+  id: "callsubr",
+  min: 1,
+  undefStack: true
+}, {
+  id: "return",
+  min: 0,
+  undefStack: true
+}, null, null, {
+  id: "endchar",
+  min: 0,
+  stackClearing: true
+}, null, null, null, {
+  id: "hstemhm",
+  min: 2,
+  stackClearing: true,
+  stem: true
+}, {
+  id: "hintmask",
+  min: 0,
+  stackClearing: true
+}, {
+  id: "cntrmask",
+  min: 0,
+  stackClearing: true
+}, {
+  id: "rmoveto",
+  min: 2,
+  stackClearing: true
+}, {
+  id: "hmoveto",
+  min: 1,
+  stackClearing: true
+}, {
+  id: "vstemhm",
+  min: 2,
+  stackClearing: true,
+  stem: true
+}, {
+  id: "rcurveline",
+  min: 8,
+  resetStack: true
+}, {
+  id: "rlinecurve",
+  min: 8,
+  resetStack: true
+}, {
+  id: "vvcurveto",
+  min: 4,
+  resetStack: true
+}, {
+  id: "hhcurveto",
+  min: 4,
+  resetStack: true
+}, null, {
+  id: "callgsubr",
+  min: 1,
+  undefStack: true
+}, {
+  id: "vhcurveto",
+  min: 4,
+  resetStack: true
+}, {
+  id: "hvcurveto",
+  min: 4,
+  resetStack: true
+}];
+const CharstringValidationData12 = [null, null, null, {
+  id: "and",
+  min: 2,
+  stackDelta: -1
+}, {
+  id: "or",
+  min: 2,
+  stackDelta: -1
+}, {
+  id: "not",
+  min: 1,
+  stackDelta: 0
+}, null, null, null, {
+  id: "abs",
+  min: 1,
+  stackDelta: 0
+}, {
+  id: "add",
+  min: 2,
+  stackDelta: -1,
 
-var CFFParser = function CFFParserClosure() {
-  var CharstringValidationData = [null, {
-    id: "hstem",
-    min: 2,
-    stackClearing: true,
-    stem: true
-  }, null, {
-    id: "vstem",
-    min: 2,
-    stackClearing: true,
-    stem: true
-  }, {
-    id: "vmoveto",
-    min: 1,
-    stackClearing: true
-  }, {
-    id: "rlineto",
-    min: 2,
-    resetStack: true
-  }, {
-    id: "hlineto",
-    min: 1,
-    resetStack: true
-  }, {
-    id: "vlineto",
-    min: 1,
-    resetStack: true
-  }, {
-    id: "rrcurveto",
-    min: 6,
-    resetStack: true
-  }, null, {
-    id: "callsubr",
-    min: 1,
-    undefStack: true
-  }, {
-    id: "return",
-    min: 0,
-    undefStack: true
-  }, null, null, {
-    id: "endchar",
-    min: 0,
-    stackClearing: true
-  }, null, null, null, {
-    id: "hstemhm",
-    min: 2,
-    stackClearing: true,
-    stem: true
-  }, {
-    id: "hintmask",
-    min: 0,
-    stackClearing: true
-  }, {
-    id: "cntrmask",
-    min: 0,
-    stackClearing: true
-  }, {
-    id: "rmoveto",
-    min: 2,
-    stackClearing: true
-  }, {
-    id: "hmoveto",
-    min: 1,
-    stackClearing: true
-  }, {
-    id: "vstemhm",
-    min: 2,
-    stackClearing: true,
-    stem: true
-  }, {
-    id: "rcurveline",
-    min: 8,
-    resetStack: true
-  }, {
-    id: "rlinecurve",
-    min: 8,
-    resetStack: true
-  }, {
-    id: "vvcurveto",
-    min: 4,
-    resetStack: true
-  }, {
-    id: "hhcurveto",
-    min: 4,
-    resetStack: true
-  }, null, {
-    id: "callgsubr",
-    min: 1,
-    undefStack: true
-  }, {
-    id: "vhcurveto",
-    min: 4,
-    resetStack: true
-  }, {
-    id: "hvcurveto",
-    min: 4,
-    resetStack: true
-  }];
-  var CharstringValidationData12 = [null, null, null, {
-    id: "and",
-    min: 2,
-    stackDelta: -1
-  }, {
-    id: "or",
-    min: 2,
-    stackDelta: -1
-  }, {
-    id: "not",
-    min: 1,
-    stackDelta: 0
-  }, null, null, null, {
-    id: "abs",
-    min: 1,
-    stackDelta: 0
-  }, {
-    id: "add",
-    min: 2,
-    stackDelta: -1,
-    stackFn: function stack_div(stack, index) {
-      stack[index - 2] = stack[index - 2] + stack[index - 1];
-    }
-  }, {
-    id: "sub",
-    min: 2,
-    stackDelta: -1,
-    stackFn: function stack_div(stack, index) {
-      stack[index - 2] = stack[index - 2] - stack[index - 1];
-    }
-  }, {
-    id: "div",
-    min: 2,
-    stackDelta: -1,
-    stackFn: function stack_div(stack, index) {
-      stack[index - 2] = stack[index - 2] / stack[index - 1];
-    }
-  }, null, {
-    id: "neg",
-    min: 1,
-    stackDelta: 0,
-    stackFn: function stack_div(stack, index) {
-      stack[index - 1] = -stack[index - 1];
-    }
-  }, {
-    id: "eq",
-    min: 2,
-    stackDelta: -1
-  }, null, null, {
-    id: "drop",
-    min: 1,
-    stackDelta: -1
-  }, null, {
-    id: "put",
-    min: 2,
-    stackDelta: -2
-  }, {
-    id: "get",
-    min: 1,
-    stackDelta: 0
-  }, {
-    id: "ifelse",
-    min: 4,
-    stackDelta: -3
-  }, {
-    id: "random",
-    min: 0,
-    stackDelta: 1
-  }, {
-    id: "mul",
-    min: 2,
-    stackDelta: -1,
-    stackFn: function stack_div(stack, index) {
-      stack[index - 2] = stack[index - 2] * stack[index - 1];
-    }
-  }, null, {
-    id: "sqrt",
-    min: 1,
-    stackDelta: 0
-  }, {
-    id: "dup",
-    min: 1,
-    stackDelta: 1
-  }, {
-    id: "exch",
-    min: 2,
-    stackDelta: 0
-  }, {
-    id: "index",
-    min: 2,
-    stackDelta: 0
-  }, {
-    id: "roll",
-    min: 3,
-    stackDelta: -2
-  }, null, null, null, {
-    id: "hflex",
-    min: 7,
-    resetStack: true
-  }, {
-    id: "flex",
-    min: 13,
-    resetStack: true
-  }, {
-    id: "hflex1",
-    min: 9,
-    resetStack: true
-  }, {
-    id: "flex1",
-    min: 11,
-    resetStack: true
-  }];
+  stackFn(stack, index) {
+    stack[index - 2] = stack[index - 2] + stack[index - 1];
+  }
 
-  class CFFParser {
-    constructor(file, properties, seacAnalysisEnabled) {
-      this.bytes = file.getBytes();
-      this.properties = properties;
-      this.seacAnalysisEnabled = !!seacAnalysisEnabled;
+}, {
+  id: "sub",
+  min: 2,
+  stackDelta: -1,
+
+  stackFn(stack, index) {
+    stack[index - 2] = stack[index - 2] - stack[index - 1];
+  }
+
+}, {
+  id: "div",
+  min: 2,
+  stackDelta: -1,
+
+  stackFn(stack, index) {
+    stack[index - 2] = stack[index - 2] / stack[index - 1];
+  }
+
+}, null, {
+  id: "neg",
+  min: 1,
+  stackDelta: 0,
+
+  stackFn(stack, index) {
+    stack[index - 1] = -stack[index - 1];
+  }
+
+}, {
+  id: "eq",
+  min: 2,
+  stackDelta: -1
+}, null, null, {
+  id: "drop",
+  min: 1,
+  stackDelta: -1
+}, null, {
+  id: "put",
+  min: 2,
+  stackDelta: -2
+}, {
+  id: "get",
+  min: 1,
+  stackDelta: 0
+}, {
+  id: "ifelse",
+  min: 4,
+  stackDelta: -3
+}, {
+  id: "random",
+  min: 0,
+  stackDelta: 1
+}, {
+  id: "mul",
+  min: 2,
+  stackDelta: -1,
+
+  stackFn(stack, index) {
+    stack[index - 2] = stack[index - 2] * stack[index - 1];
+  }
+
+}, null, {
+  id: "sqrt",
+  min: 1,
+  stackDelta: 0
+}, {
+  id: "dup",
+  min: 1,
+  stackDelta: 1
+}, {
+  id: "exch",
+  min: 2,
+  stackDelta: 0
+}, {
+  id: "index",
+  min: 2,
+  stackDelta: 0
+}, {
+  id: "roll",
+  min: 3,
+  stackDelta: -2
+}, null, null, null, {
+  id: "hflex",
+  min: 7,
+  resetStack: true
+}, {
+  id: "flex",
+  min: 13,
+  resetStack: true
+}, {
+  id: "hflex1",
+  min: 9,
+  resetStack: true
+}, {
+  id: "flex1",
+  min: 11,
+  resetStack: true
+}];
+
+class CFFParser {
+  constructor(file, properties, seacAnalysisEnabled) {
+    this.bytes = file.getBytes();
+    this.properties = properties;
+    this.seacAnalysisEnabled = !!seacAnalysisEnabled;
+  }
+
+  parse() {
+    const properties = this.properties;
+    const cff = new CFF();
+    this.cff = cff;
+    const header = this.parseHeader();
+    const nameIndex = this.parseIndex(header.endPos);
+    const topDictIndex = this.parseIndex(nameIndex.endPos);
+    const stringIndex = this.parseIndex(topDictIndex.endPos);
+    const globalSubrIndex = this.parseIndex(stringIndex.endPos);
+    const topDictParsed = this.parseDict(topDictIndex.obj.get(0));
+    const topDict = this.createDict(CFFTopDict, topDictParsed, cff.strings);
+    cff.header = header.obj;
+    cff.names = this.parseNameIndex(nameIndex.obj);
+    cff.strings = this.parseStringIndex(stringIndex.obj);
+    cff.topDict = topDict;
+    cff.globalSubrIndex = globalSubrIndex.obj;
+    this.parsePrivateDict(cff.topDict);
+    cff.isCIDFont = topDict.hasName("ROS");
+    const charStringOffset = topDict.getByName("CharStrings");
+    const charStringIndex = this.parseIndex(charStringOffset).obj;
+    const fontMatrix = topDict.getByName("FontMatrix");
+
+    if (fontMatrix) {
+      properties.fontMatrix = fontMatrix;
     }
 
-    parse() {
-      var properties = this.properties;
-      var cff = new CFF();
-      this.cff = cff;
-      var header = this.parseHeader();
-      var nameIndex = this.parseIndex(header.endPos);
-      var topDictIndex = this.parseIndex(nameIndex.endPos);
-      var stringIndex = this.parseIndex(topDictIndex.endPos);
-      var globalSubrIndex = this.parseIndex(stringIndex.endPos);
-      var topDictParsed = this.parseDict(topDictIndex.obj.get(0));
-      var topDict = this.createDict(CFFTopDict, topDictParsed, cff.strings);
-      cff.header = header.obj;
-      cff.names = this.parseNameIndex(nameIndex.obj);
-      cff.strings = this.parseStringIndex(stringIndex.obj);
-      cff.topDict = topDict;
-      cff.globalSubrIndex = globalSubrIndex.obj;
-      this.parsePrivateDict(cff.topDict);
-      cff.isCIDFont = topDict.hasName("ROS");
-      var charStringOffset = topDict.getByName("CharStrings");
-      var charStringIndex = this.parseIndex(charStringOffset).obj;
-      var fontMatrix = topDict.getByName("FontMatrix");
+    const fontBBox = topDict.getByName("FontBBox");
 
-      if (fontMatrix) {
-        properties.fontMatrix = fontMatrix;
+    if (fontBBox) {
+      properties.ascent = Math.max(fontBBox[3], fontBBox[1]);
+      properties.descent = Math.min(fontBBox[1], fontBBox[3]);
+      properties.ascentScaled = true;
+    }
+
+    let charset, encoding;
+
+    if (cff.isCIDFont) {
+      const fdArrayIndex = this.parseIndex(topDict.getByName("FDArray")).obj;
+
+      for (let i = 0, ii = fdArrayIndex.count; i < ii; ++i) {
+        const dictRaw = fdArrayIndex.get(i);
+        const fontDict = this.createDict(CFFTopDict, this.parseDict(dictRaw), cff.strings);
+        this.parsePrivateDict(fontDict);
+        cff.fdArray.push(fontDict);
       }
 
-      var fontBBox = topDict.getByName("FontBBox");
+      encoding = null;
+      charset = this.parseCharsets(topDict.getByName("charset"), charStringIndex.count, cff.strings, true);
+      cff.fdSelect = this.parseFDSelect(topDict.getByName("FDSelect"), charStringIndex.count);
+    } else {
+      charset = this.parseCharsets(topDict.getByName("charset"), charStringIndex.count, cff.strings, false);
+      encoding = this.parseEncoding(topDict.getByName("Encoding"), properties, cff.strings, charset.charset);
+    }
 
-      if (fontBBox) {
-        properties.ascent = Math.max(fontBBox[3], fontBBox[1]);
-        properties.descent = Math.min(fontBBox[1], fontBBox[3]);
-        properties.ascentScaled = true;
+    cff.charset = charset;
+    cff.encoding = encoding;
+    const charStringsAndSeacs = this.parseCharStrings({
+      charStrings: charStringIndex,
+      localSubrIndex: topDict.privateDict.subrsIndex,
+      globalSubrIndex: globalSubrIndex.obj,
+      fdSelect: cff.fdSelect,
+      fdArray: cff.fdArray,
+      privateDict: topDict.privateDict
+    });
+    cff.charStrings = charStringsAndSeacs.charStrings;
+    cff.seacs = charStringsAndSeacs.seacs;
+    cff.widths = charStringsAndSeacs.widths;
+    return cff;
+  }
+
+  parseHeader() {
+    let bytes = this.bytes;
+    const bytesLength = bytes.length;
+    let offset = 0;
+
+    while (offset < bytesLength && bytes[offset] !== 1) {
+      ++offset;
+    }
+
+    if (offset >= bytesLength) {
+      throw new _util.FormatError("Invalid CFF header");
+    }
+
+    if (offset !== 0) {
+      (0, _util.info)("cff data is shifted");
+      bytes = bytes.subarray(offset);
+      this.bytes = bytes;
+    }
+
+    const major = bytes[0];
+    const minor = bytes[1];
+    const hdrSize = bytes[2];
+    const offSize = bytes[3];
+    const header = new CFFHeader(major, minor, hdrSize, offSize);
+    return {
+      obj: header,
+      endPos: hdrSize
+    };
+  }
+
+  parseDict(dict) {
+    let pos = 0;
+
+    function parseOperand() {
+      let value = dict[pos++];
+
+      if (value === 30) {
+        return parseFloatOperand();
+      } else if (value === 28) {
+        value = dict[pos++];
+        value = (value << 24 | dict[pos++] << 16) >> 16;
+        return value;
+      } else if (value === 29) {
+        value = dict[pos++];
+        value = value << 8 | dict[pos++];
+        value = value << 8 | dict[pos++];
+        value = value << 8 | dict[pos++];
+        return value;
+      } else if (value >= 32 && value <= 246) {
+        return value - 139;
+      } else if (value >= 247 && value <= 250) {
+        return (value - 247) * 256 + dict[pos++] + 108;
+      } else if (value >= 251 && value <= 254) {
+        return -((value - 251) * 256) - dict[pos++] - 108;
       }
 
-      var charset, encoding;
+      (0, _util.warn)('CFFParser_parseDict: "' + value + '" is a reserved command.');
+      return NaN;
+    }
 
-      if (cff.isCIDFont) {
-        var fdArrayIndex = this.parseIndex(topDict.getByName("FDArray")).obj;
+    function parseFloatOperand() {
+      let str = "";
+      const eof = 15;
+      const lookup = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "E", "E-", null, "-"];
+      const length = dict.length;
 
-        for (var i = 0, ii = fdArrayIndex.count; i < ii; ++i) {
-          var dictRaw = fdArrayIndex.get(i);
-          var fontDict = this.createDict(CFFTopDict, this.parseDict(dictRaw), cff.strings);
-          this.parsePrivateDict(fontDict);
-          cff.fdArray.push(fontDict);
+      while (pos < length) {
+        const b = dict[pos++];
+        const b1 = b >> 4;
+        const b2 = b & 15;
+
+        if (b1 === eof) {
+          break;
         }
 
-        encoding = null;
-        charset = this.parseCharsets(topDict.getByName("charset"), charStringIndex.count, cff.strings, true);
-        cff.fdSelect = this.parseFDSelect(topDict.getByName("FDSelect"), charStringIndex.count);
+        str += lookup[b1];
+
+        if (b2 === eof) {
+          break;
+        }
+
+        str += lookup[b2];
+      }
+
+      return parseFloat(str);
+    }
+
+    let operands = [];
+    const entries = [];
+    pos = 0;
+    const end = dict.length;
+
+    while (pos < end) {
+      let b = dict[pos];
+
+      if (b <= 21) {
+        if (b === 12) {
+          b = b << 8 | dict[++pos];
+        }
+
+        entries.push([b, operands]);
+        operands = [];
+        ++pos;
       } else {
-        charset = this.parseCharsets(topDict.getByName("charset"), charStringIndex.count, cff.strings, false);
-        encoding = this.parseEncoding(topDict.getByName("Encoding"), properties, cff.strings, charset.charset);
+        operands.push(parseOperand());
       }
-
-      cff.charset = charset;
-      cff.encoding = encoding;
-      var charStringsAndSeacs = this.parseCharStrings({
-        charStrings: charStringIndex,
-        localSubrIndex: topDict.privateDict.subrsIndex,
-        globalSubrIndex: globalSubrIndex.obj,
-        fdSelect: cff.fdSelect,
-        fdArray: cff.fdArray,
-        privateDict: topDict.privateDict
-      });
-      cff.charStrings = charStringsAndSeacs.charStrings;
-      cff.seacs = charStringsAndSeacs.seacs;
-      cff.widths = charStringsAndSeacs.widths;
-      return cff;
     }
 
-    parseHeader() {
-      var bytes = this.bytes;
-      var bytesLength = bytes.length;
-      var offset = 0;
+    return entries;
+  }
 
-      while (offset < bytesLength && bytes[offset] !== 1) {
-        ++offset;
+  parseIndex(pos) {
+    const cffIndex = new CFFIndex();
+    const bytes = this.bytes;
+    const count = bytes[pos++] << 8 | bytes[pos++];
+    const offsets = [];
+    let end = pos;
+    let i, ii;
+
+    if (count !== 0) {
+      const offsetSize = bytes[pos++];
+      const startPos = pos + (count + 1) * offsetSize - 1;
+
+      for (i = 0, ii = count + 1; i < ii; ++i) {
+        let offset = 0;
+
+        for (let j = 0; j < offsetSize; ++j) {
+          offset <<= 8;
+          offset += bytes[pos++];
+        }
+
+        offsets.push(startPos + offset);
       }
 
-      if (offset >= bytesLength) {
-        throw new _util.FormatError("Invalid CFF header");
-      }
-
-      if (offset !== 0) {
-        (0, _util.info)("cff data is shifted");
-        bytes = bytes.subarray(offset);
-        this.bytes = bytes;
-      }
-
-      var major = bytes[0];
-      var minor = bytes[1];
-      var hdrSize = bytes[2];
-      var offSize = bytes[3];
-      var header = new CFFHeader(major, minor, hdrSize, offSize);
-      return {
-        obj: header,
-        endPos: hdrSize
-      };
+      end = offsets[count];
     }
 
-    parseDict(dict) {
-      var pos = 0;
+    for (i = 0, ii = offsets.length - 1; i < ii; ++i) {
+      const offsetStart = offsets[i];
+      const offsetEnd = offsets[i + 1];
+      cffIndex.add(bytes.subarray(offsetStart, offsetEnd));
+    }
 
-      function parseOperand() {
-        var value = dict[pos++];
+    return {
+      obj: cffIndex,
+      endPos: end
+    };
+  }
 
-        if (value === 30) {
-          return parseFloatOperand();
-        } else if (value === 28) {
-          value = dict[pos++];
-          value = (value << 24 | dict[pos++] << 16) >> 16;
-          return value;
-        } else if (value === 29) {
-          value = dict[pos++];
-          value = value << 8 | dict[pos++];
-          value = value << 8 | dict[pos++];
-          value = value << 8 | dict[pos++];
-          return value;
-        } else if (value >= 32 && value <= 246) {
-          return value - 139;
-        } else if (value >= 247 && value <= 250) {
-          return (value - 247) * 256 + dict[pos++] + 108;
-        } else if (value >= 251 && value <= 254) {
-          return -((value - 251) * 256) - dict[pos++] - 108;
-        }
+  parseNameIndex(index) {
+    const names = [];
 
-        (0, _util.warn)('CFFParser_parseDict: "' + value + '" is a reserved command.');
-        return NaN;
-      }
+    for (let i = 0, ii = index.count; i < ii; ++i) {
+      const name = index.get(i);
+      names.push((0, _util.bytesToString)(name));
+    }
 
-      function parseFloatOperand() {
-        var str = "";
-        var eof = 15;
-        const lookup = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "E", "E-", null, "-"];
-        var length = dict.length;
+    return names;
+  }
 
-        while (pos < length) {
-          var b = dict[pos++];
-          var b1 = b >> 4;
-          var b2 = b & 15;
+  parseStringIndex(index) {
+    const strings = new CFFStrings();
 
-          if (b1 === eof) {
-            break;
-          }
+    for (let i = 0, ii = index.count; i < ii; ++i) {
+      const data = index.get(i);
+      strings.add((0, _util.bytesToString)(data));
+    }
 
-          str += lookup[b1];
+    return strings;
+  }
 
-          if (b2 === eof) {
-            break;
-          }
+  createDict(Type, dict, strings) {
+    const cffDict = new Type(strings);
 
-          str += lookup[b2];
-        }
+    for (let i = 0, ii = dict.length; i < ii; ++i) {
+      const pair = dict[i];
+      const key = pair[0];
+      const value = pair[1];
+      cffDict.setByKey(key, value);
+    }
 
-        return parseFloat(str);
-      }
+    return cffDict;
+  }
 
-      var operands = [];
-      var entries = [];
-      pos = 0;
-      var end = dict.length;
+  parseCharString(state, data, localSubrIndex, globalSubrIndex) {
+    if (!data || state.callDepth > MAX_SUBR_NESTING) {
+      return false;
+    }
 
-      while (pos < end) {
-        var b = dict[pos];
+    let stackSize = state.stackSize;
+    const stack = state.stack;
+    const length = data.length;
 
-        if (b <= 21) {
-          if (b === 12) {
-            b = b << 8 | dict[++pos];
-          }
+    for (let j = 0; j < length;) {
+      const value = data[j++];
+      let validationCommand = null;
 
-          entries.push([b, operands]);
-          operands = [];
-          ++pos;
+      if (value === 12) {
+        const q = data[j++];
+
+        if (q === 0) {
+          data[j - 2] = 139;
+          data[j - 1] = 22;
+          stackSize = 0;
         } else {
-          operands.push(parseOperand());
+          validationCommand = CharstringValidationData12[q];
         }
-      }
+      } else if (value === 28) {
+        stack[stackSize] = (data[j] << 24 | data[j + 1] << 16) >> 16;
+        j += 2;
+        stackSize++;
+      } else if (value === 14) {
+        if (stackSize >= 4) {
+          stackSize -= 4;
 
-      return entries;
-    }
-
-    parseIndex(pos) {
-      var cffIndex = new CFFIndex();
-      var bytes = this.bytes;
-      var count = bytes[pos++] << 8 | bytes[pos++];
-      var offsets = [];
-      var end = pos;
-      var i, ii;
-
-      if (count !== 0) {
-        var offsetSize = bytes[pos++];
-        var startPos = pos + (count + 1) * offsetSize - 1;
-
-        for (i = 0, ii = count + 1; i < ii; ++i) {
-          var offset = 0;
-
-          for (var j = 0; j < offsetSize; ++j) {
-            offset <<= 8;
-            offset += bytes[pos++];
+          if (this.seacAnalysisEnabled) {
+            state.seac = stack.slice(stackSize, stackSize + 4);
+            return false;
           }
-
-          offsets.push(startPos + offset);
         }
 
-        end = offsets[count];
-      }
+        validationCommand = CharstringValidationData[value];
+      } else if (value >= 32 && value <= 246) {
+        stack[stackSize] = value - 139;
+        stackSize++;
+      } else if (value >= 247 && value <= 254) {
+        stack[stackSize] = value < 251 ? (value - 247 << 8) + data[j] + 108 : -(value - 251 << 8) - data[j] - 108;
+        j++;
+        stackSize++;
+      } else if (value === 255) {
+        stack[stackSize] = (data[j] << 24 | data[j + 1] << 16 | data[j + 2] << 8 | data[j + 3]) / 65536;
+        j += 4;
+        stackSize++;
+      } else if (value === 19 || value === 20) {
+        state.hints += stackSize >> 1;
+        j += state.hints + 7 >> 3;
+        stackSize %= 2;
+        validationCommand = CharstringValidationData[value];
+      } else if (value === 10 || value === 29) {
+        let subrsIndex;
 
-      for (i = 0, ii = offsets.length - 1; i < ii; ++i) {
-        var offsetStart = offsets[i];
-        var offsetEnd = offsets[i + 1];
-        cffIndex.add(bytes.subarray(offsetStart, offsetEnd));
-      }
-
-      return {
-        obj: cffIndex,
-        endPos: end
-      };
-    }
-
-    parseNameIndex(index) {
-      var names = [];
-
-      for (var i = 0, ii = index.count; i < ii; ++i) {
-        var name = index.get(i);
-        names.push((0, _util.bytesToString)(name));
-      }
-
-      return names;
-    }
-
-    parseStringIndex(index) {
-      var strings = new CFFStrings();
-
-      for (var i = 0, ii = index.count; i < ii; ++i) {
-        var data = index.get(i);
-        strings.add((0, _util.bytesToString)(data));
-      }
-
-      return strings;
-    }
-
-    createDict(Type, dict, strings) {
-      var cffDict = new Type(strings);
-
-      for (var i = 0, ii = dict.length; i < ii; ++i) {
-        var pair = dict[i];
-        var key = pair[0];
-        var value = pair[1];
-        cffDict.setByKey(key, value);
-      }
-
-      return cffDict;
-    }
-
-    parseCharString(state, data, localSubrIndex, globalSubrIndex) {
-      if (!data || state.callDepth > MAX_SUBR_NESTING) {
-        return false;
-      }
-
-      var stackSize = state.stackSize;
-      var stack = state.stack;
-      var length = data.length;
-
-      for (var j = 0; j < length;) {
-        var value = data[j++];
-        var validationCommand = null;
-
-        if (value === 12) {
-          var q = data[j++];
-
-          if (q === 0) {
-            data[j - 2] = 139;
-            data[j - 1] = 22;
-            stackSize = 0;
-          } else {
-            validationCommand = CharstringValidationData12[q];
-          }
-        } else if (value === 28) {
-          stack[stackSize] = (data[j] << 24 | data[j + 1] << 16) >> 16;
-          j += 2;
-          stackSize++;
-        } else if (value === 14) {
-          if (stackSize >= 4) {
-            stackSize -= 4;
-
-            if (this.seacAnalysisEnabled) {
-              state.seac = stack.slice(stackSize, stackSize + 4);
-              return false;
-            }
-          }
+        if (value === 10) {
+          subrsIndex = localSubrIndex;
+        } else {
+          subrsIndex = globalSubrIndex;
+        }
 
+        if (!subrsIndex) {
           validationCommand = CharstringValidationData[value];
-        } else if (value >= 32 && value <= 246) {
-          stack[stackSize] = value - 139;
-          stackSize++;
-        } else if (value >= 247 && value <= 254) {
-          stack[stackSize] = value < 251 ? (value - 247 << 8) + data[j] + 108 : -(value - 251 << 8) - data[j] - 108;
-          j++;
-          stackSize++;
-        } else if (value === 255) {
-          stack[stackSize] = (data[j] << 24 | data[j + 1] << 16 | data[j + 2] << 8 | data[j + 3]) / 65536;
-          j += 4;
-          stackSize++;
-        } else if (value === 19 || value === 20) {
+          (0, _util.warn)("Missing subrsIndex for " + validationCommand.id);
+          return false;
+        }
+
+        let bias = 32768;
+
+        if (subrsIndex.count < 1240) {
+          bias = 107;
+        } else if (subrsIndex.count < 33900) {
+          bias = 1131;
+        }
+
+        const subrNumber = stack[--stackSize] + bias;
+
+        if (subrNumber < 0 || subrNumber >= subrsIndex.count || isNaN(subrNumber)) {
+          validationCommand = CharstringValidationData[value];
+          (0, _util.warn)("Out of bounds subrIndex for " + validationCommand.id);
+          return false;
+        }
+
+        state.stackSize = stackSize;
+        state.callDepth++;
+        const valid = this.parseCharString(state, subrsIndex.get(subrNumber), localSubrIndex, globalSubrIndex);
+
+        if (!valid) {
+          return false;
+        }
+
+        state.callDepth--;
+        stackSize = state.stackSize;
+        continue;
+      } else if (value === 11) {
+        state.stackSize = stackSize;
+        return true;
+      } else if (value === 0 && j === data.length) {
+        data[j - 1] = 14;
+        validationCommand = CharstringValidationData[14];
+      } else {
+        validationCommand = CharstringValidationData[value];
+      }
+
+      if (validationCommand) {
+        if (validationCommand.stem) {
           state.hints += stackSize >> 1;
-          j += state.hints + 7 >> 3;
-          stackSize %= 2;
-          validationCommand = CharstringValidationData[value];
-        } else if (value === 10 || value === 29) {
-          var subrsIndex;
 
-          if (value === 10) {
-            subrsIndex = localSubrIndex;
-          } else {
-            subrsIndex = globalSubrIndex;
+          if (value === 3 || value === 23) {
+            state.hasVStems = true;
+          } else if (state.hasVStems && (value === 1 || value === 18)) {
+            (0, _util.warn)("CFF stem hints are in wrong order");
+            data[j - 1] = value === 1 ? 3 : 23;
           }
-
-          if (!subrsIndex) {
-            validationCommand = CharstringValidationData[value];
-            (0, _util.warn)("Missing subrsIndex for " + validationCommand.id);
-            return false;
-          }
-
-          var bias = 32768;
-
-          if (subrsIndex.count < 1240) {
-            bias = 107;
-          } else if (subrsIndex.count < 33900) {
-            bias = 1131;
-          }
-
-          var subrNumber = stack[--stackSize] + bias;
-
-          if (subrNumber < 0 || subrNumber >= subrsIndex.count || isNaN(subrNumber)) {
-            validationCommand = CharstringValidationData[value];
-            (0, _util.warn)("Out of bounds subrIndex for " + validationCommand.id);
-            return false;
-          }
-
-          state.stackSize = stackSize;
-          state.callDepth++;
-          var valid = this.parseCharString(state, subrsIndex.get(subrNumber), localSubrIndex, globalSubrIndex);
-
-          if (!valid) {
-            return false;
-          }
-
-          state.callDepth--;
-          stackSize = state.stackSize;
-          continue;
-        } else if (value === 11) {
-          state.stackSize = stackSize;
-          return true;
-        } else {
-          validationCommand = CharstringValidationData[value];
         }
 
-        if (validationCommand) {
-          if (validationCommand.stem) {
-            state.hints += stackSize >> 1;
+        if ("min" in validationCommand) {
+          if (!state.undefStack && stackSize < validationCommand.min) {
+            (0, _util.warn)("Not enough parameters for " + validationCommand.id + "; actual: " + stackSize + ", expected: " + validationCommand.min);
 
-            if (value === 3 || value === 23) {
-              state.hasVStems = true;
-            } else if (state.hasVStems && (value === 1 || value === 18)) {
-              (0, _util.warn)("CFF stem hints are in wrong order");
-              data[j - 1] = value === 1 ? 3 : 23;
+            if (stackSize === 0) {
+              data[j - 1] = 14;
+              return true;
             }
+
+            return false;
+          }
+        }
+
+        if (state.firstStackClearing && validationCommand.stackClearing) {
+          state.firstStackClearing = false;
+          stackSize -= validationCommand.min;
+
+          if (stackSize >= 2 && validationCommand.stem) {
+            stackSize %= 2;
+          } else if (stackSize > 1) {
+            (0, _util.warn)("Found too many parameters for stack-clearing command");
           }
 
-          if ("min" in validationCommand) {
-            if (!state.undefStack && stackSize < validationCommand.min) {
-              (0, _util.warn)("Not enough parameters for " + validationCommand.id + "; actual: " + stackSize + ", expected: " + validationCommand.min);
-              return false;
-            }
+          if (stackSize > 0) {
+            state.width = stack[stackSize - 1];
+          }
+        }
+
+        if ("stackDelta" in validationCommand) {
+          if ("stackFn" in validationCommand) {
+            validationCommand.stackFn(stack, stackSize);
           }
 
-          if (state.firstStackClearing && validationCommand.stackClearing) {
-            state.firstStackClearing = false;
-            stackSize -= validationCommand.min;
-
-            if (stackSize >= 2 && validationCommand.stem) {
-              stackSize %= 2;
-            } else if (stackSize > 1) {
-              (0, _util.warn)("Found too many parameters for stack-clearing command");
-            }
-
-            if (stackSize > 0 && stack[stackSize - 1] >= 0) {
-              state.width = stack[stackSize - 1];
-            }
-          }
-
-          if ("stackDelta" in validationCommand) {
-            if ("stackFn" in validationCommand) {
-              validationCommand.stackFn(stack, stackSize);
-            }
-
-            stackSize += validationCommand.stackDelta;
-          } else if (validationCommand.stackClearing) {
-            stackSize = 0;
-          } else if (validationCommand.resetStack) {
-            stackSize = 0;
-            state.undefStack = false;
-          } else if (validationCommand.undefStack) {
-            stackSize = 0;
-            state.undefStack = true;
-            state.firstStackClearing = false;
-          }
+          stackSize += validationCommand.stackDelta;
+        } else if (validationCommand.stackClearing) {
+          stackSize = 0;
+        } else if (validationCommand.resetStack) {
+          stackSize = 0;
+          state.undefStack = false;
+        } else if (validationCommand.undefStack) {
+          stackSize = 0;
+          state.undefStack = true;
+          state.firstStackClearing = false;
         }
       }
-
-      state.stackSize = stackSize;
-      return true;
     }
 
-    parseCharStrings({
-      charStrings,
-      localSubrIndex,
-      globalSubrIndex,
-      fdSelect,
-      fdArray,
-      privateDict
-    }) {
-      var seacs = [];
-      var widths = [];
-      var count = charStrings.count;
+    state.stackSize = stackSize;
+    return true;
+  }
 
-      for (var i = 0; i < count; i++) {
-        var charstring = charStrings.get(i);
-        var state = {
-          callDepth: 0,
-          stackSize: 0,
-          stack: [],
-          undefStack: true,
-          hints: 0,
-          firstStackClearing: true,
-          seac: null,
-          width: null,
-          hasVStems: false
-        };
-        var valid = true;
-        var localSubrToUse = null;
-        var privateDictToUse = privateDict;
+  parseCharStrings({
+    charStrings,
+    localSubrIndex,
+    globalSubrIndex,
+    fdSelect,
+    fdArray,
+    privateDict
+  }) {
+    const seacs = [];
+    const widths = [];
+    const count = charStrings.count;
 
-        if (fdSelect && fdArray.length) {
-          var fdIndex = fdSelect.getFDIndex(i);
+    for (let i = 0; i < count; i++) {
+      const charstring = charStrings.get(i);
+      const state = {
+        callDepth: 0,
+        stackSize: 0,
+        stack: [],
+        undefStack: true,
+        hints: 0,
+        firstStackClearing: true,
+        seac: null,
+        width: null,
+        hasVStems: false
+      };
+      let valid = true;
+      let localSubrToUse = null;
+      let privateDictToUse = privateDict;
 
-          if (fdIndex === -1) {
-            (0, _util.warn)("Glyph index is not in fd select.");
-            valid = false;
-          }
+      if (fdSelect && fdArray.length) {
+        const fdIndex = fdSelect.getFDIndex(i);
 
-          if (fdIndex >= fdArray.length) {
-            (0, _util.warn)("Invalid fd index for glyph index.");
-            valid = false;
-          }
+        if (fdIndex === -1) {
+          (0, _util.warn)("Glyph index is not in fd select.");
+          valid = false;
+        }
 
-          if (valid) {
-            privateDictToUse = fdArray[fdIndex].privateDict;
-            localSubrToUse = privateDictToUse.subrsIndex;
-          }
-        } else if (localSubrIndex) {
-          localSubrToUse = localSubrIndex;
+        if (fdIndex >= fdArray.length) {
+          (0, _util.warn)("Invalid fd index for glyph index.");
+          valid = false;
         }
 
         if (valid) {
-          valid = this.parseCharString(state, charstring, localSubrToUse, globalSubrIndex);
-        }
-
-        if (state.width !== null) {
-          const nominalWidth = privateDictToUse.getByName("nominalWidthX");
-          widths[i] = nominalWidth + state.width;
-        } else {
-          const defaultWidth = privateDictToUse.getByName("defaultWidthX");
-          widths[i] = defaultWidth;
-        }
-
-        if (state.seac !== null) {
-          seacs[i] = state.seac;
-        }
-
-        if (!valid) {
-          charStrings.set(i, new Uint8Array([14]));
+          privateDictToUse = fdArray[fdIndex].privateDict;
+          localSubrToUse = privateDictToUse.subrsIndex;
         }
+      } else if (localSubrIndex) {
+        localSubrToUse = localSubrIndex;
       }
 
-      return {
-        charStrings,
-        seacs,
-        widths
-      };
+      if (valid) {
+        valid = this.parseCharString(state, charstring, localSubrToUse, globalSubrIndex);
+      }
+
+      if (state.width !== null) {
+        const nominalWidth = privateDictToUse.getByName("nominalWidthX");
+        widths[i] = nominalWidth + state.width;
+      } else {
+        const defaultWidth = privateDictToUse.getByName("defaultWidthX");
+        widths[i] = defaultWidth;
+      }
+
+      if (state.seac !== null) {
+        seacs[i] = state.seac;
+      }
+
+      if (!valid) {
+        charStrings.set(i, new Uint8Array([14]));
+      }
     }
 
-    emptyPrivateDictionary(parentDict) {
-      var privateDict = this.createDict(CFFPrivateDict, [], parentDict.strings);
-      parentDict.setByKey(18, [0, 0]);
-      parentDict.privateDict = privateDict;
+    return {
+      charStrings,
+      seacs,
+      widths
+    };
+  }
+
+  emptyPrivateDictionary(parentDict) {
+    const privateDict = this.createDict(CFFPrivateDict, [], parentDict.strings);
+    parentDict.setByKey(18, [0, 0]);
+    parentDict.privateDict = privateDict;
+  }
+
+  parsePrivateDict(parentDict) {
+    if (!parentDict.hasName("Private")) {
+      this.emptyPrivateDictionary(parentDict);
+      return;
     }
 
-    parsePrivateDict(parentDict) {
-      if (!parentDict.hasName("Private")) {
-        this.emptyPrivateDictionary(parentDict);
-        return;
-      }
+    const privateOffset = parentDict.getByName("Private");
 
-      var privateOffset = parentDict.getByName("Private");
-
-      if (!Array.isArray(privateOffset) || privateOffset.length !== 2) {
-        parentDict.removeByName("Private");
-        return;
-      }
-
-      var size = privateOffset[0];
-      var offset = privateOffset[1];
-
-      if (size === 0 || offset >= this.bytes.length) {
-        this.emptyPrivateDictionary(parentDict);
-        return;
-      }
-
-      var privateDictEnd = offset + size;
-      var dictData = this.bytes.subarray(offset, privateDictEnd);
-      var dict = this.parseDict(dictData);
-      var privateDict = this.createDict(CFFPrivateDict, dict, parentDict.strings);
-      parentDict.privateDict = privateDict;
-
-      if (!privateDict.getByName("Subrs")) {
-        return;
-      }
-
-      var subrsOffset = privateDict.getByName("Subrs");
-      var relativeOffset = offset + subrsOffset;
-
-      if (subrsOffset === 0 || relativeOffset >= this.bytes.length) {
-        this.emptyPrivateDictionary(parentDict);
-        return;
-      }
-
-      var subrsIndex = this.parseIndex(relativeOffset);
-      privateDict.subrsIndex = subrsIndex.obj;
+    if (!Array.isArray(privateOffset) || privateOffset.length !== 2) {
+      parentDict.removeByName("Private");
+      return;
     }
 
-    parseCharsets(pos, length, strings, cid) {
-      if (pos === 0) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.ISO_ADOBE, _charsets.ISOAdobeCharset);
-      } else if (pos === 1) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT, _charsets.ExpertCharset);
-      } else if (pos === 2) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT_SUBSET, _charsets.ExpertSubsetCharset);
+    const size = privateOffset[0];
+    const offset = privateOffset[1];
+
+    if (size === 0 || offset >= this.bytes.length) {
+      this.emptyPrivateDictionary(parentDict);
+      return;
+    }
+
+    const privateDictEnd = offset + size;
+    const dictData = this.bytes.subarray(offset, privateDictEnd);
+    const dict = this.parseDict(dictData);
+    const privateDict = this.createDict(CFFPrivateDict, dict, parentDict.strings);
+    parentDict.privateDict = privateDict;
+
+    if (!privateDict.getByName("Subrs")) {
+      return;
+    }
+
+    const subrsOffset = privateDict.getByName("Subrs");
+    const relativeOffset = offset + subrsOffset;
+
+    if (subrsOffset === 0 || relativeOffset >= this.bytes.length) {
+      this.emptyPrivateDictionary(parentDict);
+      return;
+    }
+
+    const subrsIndex = this.parseIndex(relativeOffset);
+    privateDict.subrsIndex = subrsIndex.obj;
+  }
+
+  parseCharsets(pos, length, strings, cid) {
+    if (pos === 0) {
+      return new CFFCharset(true, CFFCharsetPredefinedTypes.ISO_ADOBE, _charsets.ISOAdobeCharset);
+    } else if (pos === 1) {
+      return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT, _charsets.ExpertCharset);
+    } else if (pos === 2) {
+      return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT_SUBSET, _charsets.ExpertSubsetCharset);
+    }
+
+    const bytes = this.bytes;
+    const start = pos;
+    const format = bytes[pos++];
+    const charset = [cid ? 0 : ".notdef"];
+    let id, count, i;
+    length -= 1;
+
+    switch (format) {
+      case 0:
+        for (i = 0; i < length; i++) {
+          id = bytes[pos++] << 8 | bytes[pos++];
+          charset.push(cid ? id : strings.get(id));
+        }
+
+        break;
+
+      case 1:
+        while (charset.length <= length) {
+          id = bytes[pos++] << 8 | bytes[pos++];
+          count = bytes[pos++];
+
+          for (i = 0; i <= count; i++) {
+            charset.push(cid ? id++ : strings.get(id++));
+          }
+        }
+
+        break;
+
+      case 2:
+        while (charset.length <= length) {
+          id = bytes[pos++] << 8 | bytes[pos++];
+          count = bytes[pos++] << 8 | bytes[pos++];
+
+          for (i = 0; i <= count; i++) {
+            charset.push(cid ? id++ : strings.get(id++));
+          }
+        }
+
+        break;
+
+      default:
+        throw new _util.FormatError("Unknown charset format");
+    }
+
+    const end = pos;
+    const raw = bytes.subarray(start, end);
+    return new CFFCharset(false, format, charset, raw);
+  }
+
+  parseEncoding(pos, properties, strings, charset) {
+    const encoding = Object.create(null);
+    const bytes = this.bytes;
+    let predefined = false;
+    let format, i, ii;
+    let raw = null;
+
+    function readSupplement() {
+      const supplementsCount = bytes[pos++];
+
+      for (i = 0; i < supplementsCount; i++) {
+        const code = bytes[pos++];
+        const sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
+        encoding[code] = charset.indexOf(strings.get(sid));
       }
+    }
 
-      var bytes = this.bytes;
-      var start = pos;
-      var format = bytes[pos++];
-      const charset = [cid ? 0 : ".notdef"];
-      var id, count, i;
-      length -= 1;
+    if (pos === 0 || pos === 1) {
+      predefined = true;
+      format = pos;
+      const baseEncoding = pos ? _encodings.ExpertEncoding : _encodings.StandardEncoding;
 
-      switch (format) {
+      for (i = 0, ii = charset.length; i < ii; i++) {
+        const index = baseEncoding.indexOf(charset[i]);
+
+        if (index !== -1) {
+          encoding[index] = i;
+        }
+      }
+    } else {
+      const dataStart = pos;
+      format = bytes[pos++];
+
+      switch (format & 0x7f) {
         case 0:
-          for (i = 0; i < length; i++) {
-            id = bytes[pos++] << 8 | bytes[pos++];
-            charset.push(cid ? id : strings.get(id));
+          const glyphsCount = bytes[pos++];
+
+          for (i = 1; i <= glyphsCount; i++) {
+            encoding[bytes[pos++]] = i;
           }
 
           break;
 
         case 1:
-          while (charset.length <= length) {
-            id = bytes[pos++] << 8 | bytes[pos++];
-            count = bytes[pos++];
+          const rangesCount = bytes[pos++];
+          let gid = 1;
 
-            for (i = 0; i <= count; i++) {
-              charset.push(cid ? id++ : strings.get(id++));
-            }
-          }
+          for (i = 0; i < rangesCount; i++) {
+            const start = bytes[pos++];
+            const left = bytes[pos++];
 
-          break;
-
-        case 2:
-          while (charset.length <= length) {
-            id = bytes[pos++] << 8 | bytes[pos++];
-            count = bytes[pos++] << 8 | bytes[pos++];
-
-            for (i = 0; i <= count; i++) {
-              charset.push(cid ? id++ : strings.get(id++));
+            for (let j = start; j <= start + left; j++) {
+              encoding[j] = gid++;
             }
           }
 
           break;
 
         default:
-          throw new _util.FormatError("Unknown charset format");
+          throw new _util.FormatError(`Unknown encoding format: ${format} in CFF`);
       }
 
-      var end = pos;
-      var raw = bytes.subarray(start, end);
-      return new CFFCharset(false, format, charset, raw);
-    }
-
-    parseEncoding(pos, properties, strings, charset) {
-      var encoding = Object.create(null);
-      var bytes = this.bytes;
-      var predefined = false;
-      var format, i, ii;
-      var raw = null;
-
-      function readSupplement() {
-        var supplementsCount = bytes[pos++];
-
-        for (i = 0; i < supplementsCount; i++) {
-          var code = bytes[pos++];
-          var sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
-          encoding[code] = charset.indexOf(strings.get(sid));
-        }
-      }
-
-      if (pos === 0 || pos === 1) {
-        predefined = true;
-        format = pos;
-        var baseEncoding = pos ? _encodings.ExpertEncoding : _encodings.StandardEncoding;
-
-        for (i = 0, ii = charset.length; i < ii; i++) {
-          var index = baseEncoding.indexOf(charset[i]);
-
-          if (index !== -1) {
-            encoding[index] = i;
-          }
-        }
-      } else {
-        var dataStart = pos;
-        format = bytes[pos++];
-
-        switch (format & 0x7f) {
-          case 0:
-            var glyphsCount = bytes[pos++];
-
-            for (i = 1; i <= glyphsCount; i++) {
-              encoding[bytes[pos++]] = i;
-            }
-
-            break;
-
-          case 1:
-            var rangesCount = bytes[pos++];
-            var gid = 1;
-
-            for (i = 0; i < rangesCount; i++) {
-              var start = bytes[pos++];
-              var left = bytes[pos++];
-
-              for (var j = start; j <= start + left; j++) {
-                encoding[j] = gid++;
-              }
-            }
-
-            break;
-
-          default:
-            throw new _util.FormatError(`Unknown encoding format: ${format} in CFF`);
-        }
-
-        var dataEnd = pos;
-
-        if (format & 0x80) {
-          bytes[dataStart] &= 0x7f;
-          readSupplement();
-        }
-
-        raw = bytes.subarray(dataStart, dataEnd);
-      }
-
-      format = format & 0x7f;
-      return new CFFEncoding(predefined, format, encoding, raw);
-    }
-
-    parseFDSelect(pos, length) {
-      var bytes = this.bytes;
-      var format = bytes[pos++];
-      var fdSelect = [];
-      var i;
-
-      switch (format) {
-        case 0:
-          for (i = 0; i < length; ++i) {
-            var id = bytes[pos++];
-            fdSelect.push(id);
-          }
-
-          break;
-
-        case 3:
-          var rangesCount = bytes[pos++] << 8 | bytes[pos++];
-
-          for (i = 0; i < rangesCount; ++i) {
-            var first = bytes[pos++] << 8 | bytes[pos++];
-
-            if (i === 0 && first !== 0) {
-              (0, _util.warn)("parseFDSelect: The first range must have a first GID of 0" + " -- trying to recover.");
-              first = 0;
-            }
-
-            var fdIndex = bytes[pos++];
-            var next = bytes[pos] << 8 | bytes[pos + 1];
-
-            for (var j = first; j < next; ++j) {
-              fdSelect.push(fdIndex);
-            }
-          }
-
-          pos += 2;
-          break;
-
-        default:
-          throw new _util.FormatError(`parseFDSelect: Unknown format "${format}".`);
-      }
-
-      if (fdSelect.length !== length) {
-        throw new _util.FormatError("parseFDSelect: Invalid font data.");
-      }
-
-      return new CFFFDSelect(format, fdSelect);
+      const dataEnd = pos;
+
+      if (format & 0x80) {
+        bytes[dataStart] &= 0x7f;
+        readSupplement();
+      }
+
+      raw = bytes.subarray(dataStart, dataEnd);
     }
 
+    format &= 0x7f;
+    return new CFFEncoding(predefined, format, encoding, raw);
   }
 
-  return CFFParser;
-}();
+  parseFDSelect(pos, length) {
+    const bytes = this.bytes;
+    const format = bytes[pos++];
+    const fdSelect = [];
+    let i;
+
+    switch (format) {
+      case 0:
+        for (i = 0; i < length; ++i) {
+          const id = bytes[pos++];
+          fdSelect.push(id);
+        }
+
+        break;
+
+      case 3:
+        const rangesCount = bytes[pos++] << 8 | bytes[pos++];
+
+        for (i = 0; i < rangesCount; ++i) {
+          let first = bytes[pos++] << 8 | bytes[pos++];
+
+          if (i === 0 && first !== 0) {
+            (0, _util.warn)("parseFDSelect: The first range must have a first GID of 0" + " -- trying to recover.");
+            first = 0;
+          }
+
+          const fdIndex = bytes[pos++];
+          const next = bytes[pos] << 8 | bytes[pos + 1];
+
+          for (let j = first; j < next; ++j) {
+            fdSelect.push(fdIndex);
+          }
+        }
+
+        pos += 2;
+        break;
+
+      default:
+        throw new _util.FormatError(`parseFDSelect: Unknown format "${format}".`);
+    }
+
+    if (fdSelect.length !== length) {
+      throw new _util.FormatError("parseFDSelect: Invalid font data.");
+    }
+
+    return new CFFFDSelect(format, fdSelect);
+  }
+
+}
 
 exports.CFFParser = CFFParser;
 
@@ -30435,7 +28941,7 @@ class CFF {
       return;
     }
 
-    var glyphZero = this.charStrings.get(0);
+    const glyphZero = this.charStrings.get(0);
     this.charStrings.add(glyphZero);
 
     if (this.isCIDFont) {
@@ -30448,7 +28954,7 @@ class CFF {
       return false;
     }
 
-    var glyph = this.charStrings.get(id);
+    const glyph = this.charStrings.get(id);
     return glyph.length > 0;
   }
 
@@ -30558,20 +29064,20 @@ class CFFDict {
       return false;
     }
 
-    var valueLength = value.length;
+    const valueLength = value.length;
 
     if (valueLength === 0) {
       return true;
     }
 
-    for (var i = 0; i < valueLength; i++) {
+    for (let i = 0; i < valueLength; i++) {
       if (isNaN(value[i])) {
         (0, _util.warn)('Invalid CFFDict value: "' + value + '" for key "' + key + '".');
         return true;
       }
     }
 
-    var type = this.types[key];
+    const type = this.types[key];
 
     if (type === "num" || type === "sid" || type === "offset") {
       value = value[0];
@@ -30598,7 +29104,7 @@ class CFFDict {
       throw new _util.FormatError(`Invalid dictionary name ${name}"`);
     }
 
-    var key = this.nameToKeyMap[name];
+    const key = this.nameToKeyMap[name];
 
     if (!(key in this.values)) {
       return this.defaults[key];
@@ -30612,7 +29118,7 @@ class CFFDict {
   }
 
   static createTables(layout) {
-    var tables = {
+    const tables = {
       keyToNameMap: {},
       nameToKeyMap: {},
       defaults: {},
@@ -30621,9 +29127,9 @@ class CFFDict {
       order: []
     };
 
-    for (var i = 0, ii = layout.length; i < ii; ++i) {
-      var entry = layout[i];
-      var key = Array.isArray(entry[0]) ? (entry[0][0] << 8) + entry[0][1] : entry[0];
+    for (let i = 0, ii = layout.length; i < ii; ++i) {
+      const entry = layout[i];
+      const key = Array.isArray(entry[0]) ? (entry[0][0] << 8) + entry[0][1] : entry[0];
       tables.keyToNameMap[key] = entry[1];
       tables.nameToKeyMap[entry[1]] = key;
       tables.types[key] = entry[2];
@@ -30637,48 +29143,37 @@ class CFFDict {
 
 }
 
-var CFFTopDict = function CFFTopDictClosure() {
-  var layout = [[[12, 30], "ROS", ["sid", "sid", "num"], null], [[12, 20], "SyntheticBase", "num", null], [0, "version", "sid", null], [1, "Notice", "sid", null], [[12, 0], "Copyright", "sid", null], [2, "FullName", "sid", null], [3, "FamilyName", "sid", null], [4, "Weight", "sid", null], [[12, 1], "isFixedPitch", "num", 0], [[12, 2], "ItalicAngle", "num", 0], [[12, 3], "UnderlinePosition", "num", -100], [[12, 4], "UnderlineThickness", "num", 50], [[12, 5], "PaintType", "num", 0], [[12, 6], "CharstringType", "num", 2], [[12, 7], "FontMatrix", ["num", "num", "num", "num", "num", "num"], [0.001, 0, 0, 0.001, 0, 0]], [13, "UniqueID", "num", null], [5, "FontBBox", ["num", "num", "num", "num"], [0, 0, 0, 0]], [[12, 8], "StrokeWidth", "num", 0], [14, "XUID", "array", null], [15, "charset", "offset", 0], [16, "Encoding", "offset", 0], [17, "CharStrings", "offset", 0], [18, "Private", ["offset", "offset"], null], [[12, 21], "PostScript", "sid", null], [[12, 22], "BaseFontName", "sid", null], [[12, 23], "BaseFontBlend", "delta", null], [[12, 31], "CIDFontVersion", "num", 0], [[12, 32], "CIDFontRevision", "num", 0], [[12, 33], "CIDFontType", "num", 0], [[12, 34], "CIDCount", "num", 8720], [[12, 35], "UIDBase", "num", null], [[12, 37], "FDSelect", "offset", null], [[12, 36], "FDArray", "offset", null], [[12, 38], "FontName", "sid", null]];
-  var tables = null;
-
-  class CFFTopDict extends CFFDict {
-    constructor(strings) {
-      if (tables === null) {
-        tables = CFFDict.createTables(layout);
-      }
-
-      super(tables, strings);
-      this.privateDict = null;
-    }
+const CFFTopDictLayout = [[[12, 30], "ROS", ["sid", "sid", "num"], null], [[12, 20], "SyntheticBase", "num", null], [0, "version", "sid", null], [1, "Notice", "sid", null], [[12, 0], "Copyright", "sid", null], [2, "FullName", "sid", null], [3, "FamilyName", "sid", null], [4, "Weight", "sid", null], [[12, 1], "isFixedPitch", "num", 0], [[12, 2], "ItalicAngle", "num", 0], [[12, 3], "UnderlinePosition", "num", -100], [[12, 4], "UnderlineThickness", "num", 50], [[12, 5], "PaintType", "num", 0], [[12, 6], "CharstringType", "num", 2], [[12, 7], "FontMatrix", ["num", "num", "num", "num", "num", "num"], [0.001, 0, 0, 0.001, 0, 0]], [13, "UniqueID", "num", null], [5, "FontBBox", ["num", "num", "num", "num"], [0, 0, 0, 0]], [[12, 8], "StrokeWidth", "num", 0], [14, "XUID", "array", null], [15, "charset", "offset", 0], [16, "Encoding", "offset", 0], [17, "CharStrings", "offset", 0], [18, "Private", ["offset", "offset"], null], [[12, 21], "PostScript", "sid", null], [[12, 22], "BaseFontName", "sid", null], [[12, 23], "BaseFontBlend", "delta", null], [[12, 31], "CIDFontVersion", "num", 0], [[12, 32], "CIDFontRevision", "num", 0], [[12, 33], "CIDFontType", "num", 0], [[12, 34], "CIDCount", "num", 8720], [[12, 35], "UIDBase", "num", null], [[12, 37], "FDSelect", "offset", null], [[12, 36], "FDArray", "offset", null], [[12, 38], "FontName", "sid", null]];
 
+class CFFTopDict extends CFFDict {
+  static get tables() {
+    return (0, _util.shadow)(this, "tables", this.createTables(CFFTopDictLayout));
   }
 
-  return CFFTopDict;
-}();
+  constructor(strings) {
+    super(CFFTopDict.tables, strings);
+    this.privateDict = null;
+  }
+
+}
 
 exports.CFFTopDict = CFFTopDict;
+const CFFPrivateDictLayout = [[6, "BlueValues", "delta", null], [7, "OtherBlues", "delta", null], [8, "FamilyBlues", "delta", null], [9, "FamilyOtherBlues", "delta", null], [[12, 9], "BlueScale", "num", 0.039625], [[12, 10], "BlueShift", "num", 7], [[12, 11], "BlueFuzz", "num", 1], [10, "StdHW", "num", null], [11, "StdVW", "num", null], [[12, 12], "StemSnapH", "delta", null], [[12, 13], "StemSnapV", "delta", null], [[12, 14], "ForceBold", "num", 0], [[12, 17], "LanguageGroup", "num", 0], [[12, 18], "ExpansionFactor", "num", 0.06], [[12, 19], "initialRandomSeed", "num", 0], [20, "defaultWidthX", "num", 0], [21, "nominalWidthX", "num", 0], [19, "Subrs", "offset", null]];
 
-var CFFPrivateDict = function CFFPrivateDictClosure() {
-  var layout = [[6, "BlueValues", "delta", null], [7, "OtherBlues", "delta", null], [8, "FamilyBlues", "delta", null], [9, "FamilyOtherBlues", "delta", null], [[12, 9], "BlueScale", "num", 0.039625], [[12, 10], "BlueShift", "num", 7], [[12, 11], "BlueFuzz", "num", 1], [10, "StdHW", "num", null], [11, "StdVW", "num", null], [[12, 12], "StemSnapH", "delta", null], [[12, 13], "StemSnapV", "delta", null], [[12, 14], "ForceBold", "num", 0], [[12, 17], "LanguageGroup", "num", 0], [[12, 18], "ExpansionFactor", "num", 0.06], [[12, 19], "initialRandomSeed", "num", 0], [20, "defaultWidthX", "num", 0], [21, "nominalWidthX", "num", 0], [19, "Subrs", "offset", null]];
-  var tables = null;
-
-  class CFFPrivateDict extends CFFDict {
-    constructor(strings) {
-      if (tables === null) {
-        tables = CFFDict.createTables(layout);
-      }
-
-      super(tables, strings);
-      this.subrsIndex = null;
-    }
-
+class CFFPrivateDict extends CFFDict {
+  static get tables() {
+    return (0, _util.shadow)(this, "tables", this.createTables(CFFPrivateDictLayout));
   }
 
-  return CFFPrivateDict;
-}();
+  constructor(strings) {
+    super(CFFPrivateDict.tables, strings);
+    this.subrsIndex = null;
+  }
+
+}
 
 exports.CFFPrivateDict = CFFPrivateDict;
-var CFFCharsetPredefinedTypes = {
+const CFFCharsetPredefinedTypes = {
   ISO_ADOBE: 0,
   EXPERT: 1,
   EXPERT_SUBSET: 2
@@ -30742,7 +29237,7 @@ class CFFOffsetTracker {
   }
 
   offset(value) {
-    for (var key in this.offsets) {
+    for (const key in this.offsets) {
       this.offsets[key] += value;
     }
   }
@@ -30752,22 +29247,22 @@ class CFFOffsetTracker {
       throw new _util.FormatError(`Not tracking location of ${key}`);
     }
 
-    var data = output.data;
-    var dataOffset = this.offsets[key];
-    var size = 5;
+    const data = output.data;
+    const dataOffset = this.offsets[key];
+    const size = 5;
 
-    for (var i = 0, ii = values.length; i < ii; ++i) {
-      var offset0 = i * size + dataOffset;
-      var offset1 = offset0 + 1;
-      var offset2 = offset0 + 2;
-      var offset3 = offset0 + 3;
-      var offset4 = offset0 + 4;
+    for (let i = 0, ii = values.length; i < ii; ++i) {
+      const offset0 = i * size + dataOffset;
+      const offset1 = offset0 + 1;
+      const offset2 = offset0 + 2;
+      const offset3 = offset0 + 3;
+      const offset4 = offset0 + 4;
 
       if (data[offset0] !== 0x1d || data[offset1] !== 0 || data[offset2] !== 0 || data[offset3] !== 0 || data[offset4] !== 0) {
         throw new _util.FormatError("writing to an offset that is not empty");
       }
 
-      var value = values[i];
+      const value = values[i];
       data[offset0] = 0x1d;
       data[offset1] = value >> 24 & 0xff;
       data[offset2] = value >> 16 & 0xff;
@@ -30784,28 +29279,30 @@ class CFFCompiler {
   }
 
   compile() {
-    var cff = this.cff;
-    var output = {
+    const cff = this.cff;
+    const output = {
       data: [],
       length: 0,
-      add: function CFFCompiler_add(data) {
+
+      add(data) {
         this.data = this.data.concat(data);
         this.length = this.data.length;
       }
+
     };
-    var header = this.compileHeader(cff.header);
+    const header = this.compileHeader(cff.header);
     output.add(header);
-    var nameIndex = this.compileNameIndex(cff.names);
+    const nameIndex = this.compileNameIndex(cff.names);
     output.add(nameIndex);
 
     if (cff.isCIDFont) {
       if (cff.topDict.hasName("FontMatrix")) {
-        var base = cff.topDict.getByName("FontMatrix");
+        const base = cff.topDict.getByName("FontMatrix");
         cff.topDict.removeByName("FontMatrix");
 
-        for (var i = 0, ii = cff.fdArray.length; i < ii; i++) {
-          var subDict = cff.fdArray[i];
-          var matrix = base.slice(0);
+        for (let i = 0, ii = cff.fdArray.length; i < ii; i++) {
+          const subDict = cff.fdArray[i];
+          let matrix = base.slice(0);
 
           if (subDict.hasName("FontMatrix")) {
             matrix = _util.Util.transform(matrix, subDict.getByName("FontMatrix"));
@@ -30816,40 +29313,46 @@ class CFFCompiler {
       }
     }
 
+    const xuid = cff.topDict.getByName("XUID");
+
+    if (xuid && xuid.length > 16) {
+      cff.topDict.removeByName("XUID");
+    }
+
     cff.topDict.setByName("charset", 0);
-    var compiled = this.compileTopDicts([cff.topDict], output.length, cff.isCIDFont);
+    let compiled = this.compileTopDicts([cff.topDict], output.length, cff.isCIDFont);
     output.add(compiled.output);
-    var topDictTracker = compiled.trackers[0];
-    var stringIndex = this.compileStringIndex(cff.strings.strings);
+    const topDictTracker = compiled.trackers[0];
+    const stringIndex = this.compileStringIndex(cff.strings.strings);
     output.add(stringIndex);
-    var globalSubrIndex = this.compileIndex(cff.globalSubrIndex);
+    const globalSubrIndex = this.compileIndex(cff.globalSubrIndex);
     output.add(globalSubrIndex);
 
     if (cff.encoding && cff.topDict.hasName("Encoding")) {
       if (cff.encoding.predefined) {
         topDictTracker.setEntryLocation("Encoding", [cff.encoding.format], output);
       } else {
-        var encoding = this.compileEncoding(cff.encoding);
+        const encoding = this.compileEncoding(cff.encoding);
         topDictTracker.setEntryLocation("Encoding", [output.length], output);
         output.add(encoding);
       }
     }
 
-    var charset = this.compileCharset(cff.charset, cff.charStrings.count, cff.strings, cff.isCIDFont);
+    const charset = this.compileCharset(cff.charset, cff.charStrings.count, cff.strings, cff.isCIDFont);
     topDictTracker.setEntryLocation("charset", [output.length], output);
     output.add(charset);
-    var charStrings = this.compileCharStrings(cff.charStrings);
+    const charStrings = this.compileCharStrings(cff.charStrings);
     topDictTracker.setEntryLocation("CharStrings", [output.length], output);
     output.add(charStrings);
 
     if (cff.isCIDFont) {
       topDictTracker.setEntryLocation("FDSelect", [output.length], output);
-      var fdSelect = this.compileFDSelect(cff.fdSelect);
+      const fdSelect = this.compileFDSelect(cff.fdSelect);
       output.add(fdSelect);
       compiled = this.compileTopDicts(cff.fdArray, output.length, true);
       topDictTracker.setEntryLocation("FDArray", [output.length], output);
       output.add(compiled.output);
-      var fontDictTrackers = compiled.trackers;
+      const fontDictTrackers = compiled.trackers;
       this.compilePrivateDicts(cff.fdArray, fontDictTrackers, output);
     }
 
@@ -30871,19 +29374,19 @@ class CFFCompiler {
   }
 
   encodeFloat(num) {
-    var value = num.toString();
-    var m = CFFCompiler.EncodeFloatRegExp.exec(value);
+    let value = num.toString();
+    const m = CFFCompiler.EncodeFloatRegExp.exec(value);
 
     if (m) {
-      var epsilon = parseFloat("1e" + ((m[2] ? +m[2] : 0) + m[1].length));
+      const epsilon = parseFloat("1e" + ((m[2] ? +m[2] : 0) + m[1].length));
       value = (Math.round(num * epsilon) / epsilon).toString();
     }
 
-    var nibbles = "";
-    var i, ii;
+    let nibbles = "";
+    let i, ii;
 
     for (i = 0, ii = value.length; i < ii; ++i) {
-      var a = value[i];
+      const a = value[i];
 
       if (a === "e") {
         nibbles += value[++i] === "-" ? "c" : "b";
@@ -30897,7 +29400,7 @@ class CFFCompiler {
     }
 
     nibbles += nibbles.length & 1 ? "f" : "ff";
-    var out = [30];
+    const out = [30];
 
     for (i = 0, ii = nibbles.length; i < ii; i += 2) {
       out.push(parseInt(nibbles.substring(i, i + 2), 16));
@@ -30907,12 +29410,12 @@ class CFFCompiler {
   }
 
   encodeInteger(value) {
-    var code;
+    let code;
 
     if (value >= -107 && value <= 107) {
       code = [value + 139];
     } else if (value >= 108 && value <= 1131) {
-      value = value - 108;
+      value -= 108;
       code = [(value >> 8) + 247, value & 0xff];
     } else if (value >= -1131 && value <= -108) {
       value = -value - 108;
@@ -30927,19 +29430,19 @@ class CFFCompiler {
   }
 
   compileHeader(header) {
-    return [header.major, header.minor, header.hdrSize, header.offSize];
+    return [header.major, header.minor, 4, header.offSize];
   }
 
   compileNameIndex(names) {
-    var nameIndex = new CFFIndex();
+    const nameIndex = new CFFIndex();
 
-    for (var i = 0, ii = names.length; i < ii; ++i) {
-      var name = names[i];
-      var length = Math.min(name.length, 127);
-      var sanitizedName = new Array(length);
+    for (let i = 0, ii = names.length; i < ii; ++i) {
+      const name = names[i];
+      const length = Math.min(name.length, 127);
+      let sanitizedName = new Array(length);
 
-      for (var j = 0; j < length; j++) {
-        var char = name[j];
+      for (let j = 0; j < length; j++) {
+        let char = name[j];
 
         if (char < "!" || char > "~" || char === "[" || char === "]" || char === "(" || char === ")" || char === "{" || char === "}" || char === "<" || char === ">" || char === "/" || char === "%") {
           char = "_";
@@ -30961,11 +29464,11 @@ class CFFCompiler {
   }
 
   compileTopDicts(dicts, length, removeCidKeys) {
-    var fontDictTrackers = [];
-    var fdArrayIndex = new CFFIndex();
+    const fontDictTrackers = [];
+    let fdArrayIndex = new CFFIndex();
 
-    for (var i = 0, ii = dicts.length; i < ii; ++i) {
-      var fontDict = dicts[i];
+    for (let i = 0, ii = dicts.length; i < ii; ++i) {
+      const fontDict = dicts[i];
 
       if (removeCidKeys) {
         fontDict.removeByName("CIDFontVersion");
@@ -30975,8 +29478,8 @@ class CFFCompiler {
         fontDict.removeByName("UIDBase");
       }
 
-      var fontDictTracker = new CFFOffsetTracker();
-      var fontDictData = this.compileDict(fontDict, fontDictTracker);
+      const fontDictTracker = new CFFOffsetTracker();
+      const fontDictData = this.compileDict(fontDict, fontDictTracker);
       fontDictTrackers.push(fontDictTracker);
       fdArrayIndex.add(fontDictData);
       fontDictTracker.offset(length);
@@ -30990,17 +29493,17 @@ class CFFCompiler {
   }
 
   compilePrivateDicts(dicts, trackers, output) {
-    for (var i = 0, ii = dicts.length; i < ii; ++i) {
-      var fontDict = dicts[i];
-      var privateDict = fontDict.privateDict;
+    for (let i = 0, ii = dicts.length; i < ii; ++i) {
+      const fontDict = dicts[i];
+      const privateDict = fontDict.privateDict;
 
       if (!privateDict || !fontDict.hasName("Private")) {
         throw new _util.FormatError("There must be a private dictionary.");
       }
 
-      var privateDictTracker = new CFFOffsetTracker();
-      var privateDictData = this.compileDict(privateDict, privateDictTracker);
-      var outputLength = output.length;
+      const privateDictTracker = new CFFOffsetTracker();
+      const privateDictData = this.compileDict(privateDict, privateDictTracker);
+      let outputLength = output.length;
       privateDictTracker.offset(outputLength);
 
       if (!privateDictData.length) {
@@ -31011,7 +29514,7 @@ class CFFCompiler {
       output.add(privateDictData);
 
       if (privateDict.subrsIndex && privateDict.hasName("Subrs")) {
-        var subrs = this.compileIndex(privateDict.subrsIndex);
+        const subrs = this.compileIndex(privateDict.subrsIndex);
         privateDictTracker.setEntryLocation("Subrs", [privateDictData.length], output);
         output.add(subrs);
       }
@@ -31019,18 +29522,15 @@ class CFFCompiler {
   }
 
   compileDict(dict, offsetTracker) {
-    var out = [];
-    var order = dict.order;
-
-    for (var i = 0; i < order.length; ++i) {
-      var key = order[i];
+    const out = [];
 
+    for (const key of dict.order) {
       if (!(key in dict.values)) {
         continue;
       }
 
-      var values = dict.values[key];
-      var types = dict.types[key];
+      let values = dict.values[key];
+      let types = dict.types[key];
 
       if (!Array.isArray(types)) {
         types = [types];
@@ -31044,32 +29544,32 @@ class CFFCompiler {
         continue;
       }
 
-      for (var j = 0, jj = types.length; j < jj; ++j) {
-        var type = types[j];
-        var value = values[j];
+      for (let j = 0, jj = types.length; j < jj; ++j) {
+        const type = types[j];
+        const value = values[j];
 
         switch (type) {
           case "num":
           case "sid":
-            out = out.concat(this.encodeNumber(value));
+            out.push(...this.encodeNumber(value));
             break;
 
           case "offset":
-            var name = dict.keyToNameMap[key];
+            const name = dict.keyToNameMap[key];
 
             if (!offsetTracker.isTracking(name)) {
               offsetTracker.track(name, out.length);
             }
 
-            out = out.concat([0x1d, 0, 0, 0, 0]);
+            out.push(0x1d, 0, 0, 0, 0);
             break;
 
           case "array":
           case "delta":
-            out = out.concat(this.encodeNumber(value));
+            out.push(...this.encodeNumber(value));
 
-            for (var k = 1, kk = values.length; k < kk; ++k) {
-              out = out.concat(this.encodeNumber(values[k]));
+            for (let k = 1, kk = values.length; k < kk; ++k) {
+              out.push(...this.encodeNumber(values[k]));
             }
 
             break;
@@ -31079,16 +29579,16 @@ class CFFCompiler {
         }
       }
 
-      out = out.concat(dict.opcodes[key]);
+      out.push(...dict.opcodes[key]);
     }
 
     return out;
   }
 
   compileStringIndex(strings) {
-    var stringIndex = new CFFIndex();
+    const stringIndex = new CFFIndex();
 
-    for (var i = 0, ii = strings.length; i < ii; ++i) {
+    for (let i = 0, ii = strings.length; i < ii; ++i) {
       stringIndex.add((0, _util.stringToBytes)(strings[i]));
     }
 
@@ -31096,15 +29596,15 @@ class CFFCompiler {
   }
 
   compileGlobalSubrIndex() {
-    var globalSubrIndex = this.cff.globalSubrIndex;
+    const globalSubrIndex = this.cff.globalSubrIndex;
     this.out.writeByteArray(this.compileIndex(globalSubrIndex));
   }
 
   compileCharStrings(charStrings) {
-    var charStringsIndex = new CFFIndex();
+    const charStringsIndex = new CFFIndex();
 
-    for (var i = 0; i < charStrings.count; i++) {
-      var glyph = charStrings.get(i);
+    for (let i = 0; i < charStrings.count; i++) {
+      const glyph = charStrings.get(i);
 
       if (glyph.length === 0) {
         charStringsIndex.add(new Uint8Array([0x8b, 0x0e]));
@@ -31201,9 +29701,9 @@ class CFFCompiler {
   }
 
   compileTypedArray(data) {
-    var out = [];
+    const out = [];
 
-    for (var i = 0, ii = data.length; i < ii; ++i) {
+    for (let i = 0, ii = data.length; i < ii; ++i) {
       out[i] = data[i];
     }
 
@@ -31211,22 +29711,22 @@ class CFFCompiler {
   }
 
   compileIndex(index, trackers = []) {
-    var objects = index.objects;
-    var count = objects.length;
+    const objects = index.objects;
+    const count = objects.length;
 
     if (count === 0) {
-      return [0, 0, 0];
+      return [0, 0];
     }
 
-    var data = [count >> 8 & 0xff, count & 0xff];
-    var lastOffset = 1,
+    const data = [count >> 8 & 0xff, count & 0xff];
+    let lastOffset = 1,
         i;
 
     for (i = 0; i < count; ++i) {
       lastOffset += objects[i].length;
     }
 
-    var offsetSize;
+    let offsetSize;
 
     if (lastOffset < 0x100) {
       offsetSize = 1;
@@ -31239,7 +29739,7 @@ class CFFCompiler {
     }
 
     data.push(offsetSize);
-    var relativeOffset = 1;
+    let relativeOffset = 1;
 
     for (i = 0; i < count + 1; i++) {
       if (offsetSize === 1) {
@@ -31262,7 +29762,7 @@ class CFFCompiler {
         trackers[i].offset(data.length);
       }
 
-      for (var j = 0, jj = objects[i].length; j < jj; j++) {
+      for (let j = 0, jj = objects[i].length; j < jj; j++) {
         data.push(objects[i][j]);
       }
     }
@@ -31275,16 +29775,15 @@ class CFFCompiler {
 exports.CFFCompiler = CFFCompiler;
 
 /***/ }),
-/* 32 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 36 */
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.ExpertSubsetCharset = exports.ExpertCharset = exports.ISOAdobeCharset = void 0;
+}));
+exports.ISOAdobeCharset = exports.ExpertSubsetCharset = exports.ExpertCharset = void 0;
 const ISOAdobeCharset = [".notdef", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quoteright", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "exclamdown", "cent", "sterling", "fraction", "yen", "florin", "section", "currency", "quotesingle", "quotedblleft", "guillemotleft", "guilsinglleft", "guilsinglright", "fi", "fl", "endash", "dagger", "daggerdbl", "periodcentered", "paragraph", "bullet", "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright", "ellipsis", "perthousand", "questiondown", "grave", "acute", "circumflex", "tilde", "macron", "breve", "dotaccent", "dieresis", "ring", "cedilla", "hungarumlaut", "ogonek", "caron", "emdash", "AE", "ordfeminine", "Lslash", "Oslash", "OE", "ordmasculine", "ae", "dotlessi", "lslash", "oslash", "oe", "germandbls", "onesuperior", "logicalnot", "mu", "trademark", "Eth", "onehalf", "plusminus", "Thorn", "onequarter", "divide", "brokenbar", "degree", "thorn", "threequarters", "twosuperior", "registered", "minus", "eth", "multiply", "threesuperior", "copyright", "Aacute", "Acircumflex", "Adieresis", "Agrave", "Aring", "Atilde", "Ccedilla", "Eacute", "Ecircumflex", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Ntilde", "Oacute", "Ocircumflex", "Odieresis", "Ograve", "Otilde", "Scaron", "Uacute", "Ucircumflex", "Udieresis", "Ugrave", "Yacute", "Ydieresis", "Zcaron", "aacute", "acircumflex", "adieresis", "agrave", "aring", "atilde", "ccedilla", "eacute", "ecircumflex", "edieresis", "egrave", "iacute", "icircumflex", "idieresis", "igrave", "ntilde", "oacute", "ocircumflex", "odieresis", "ograve", "otilde", "scaron", "uacute", "ucircumflex", "udieresis", "ugrave", "yacute", "ydieresis", "zcaron"];
 exports.ISOAdobeCharset = ISOAdobeCharset;
 const ExpertCharset = [".notdef", "space", "exclamsmall", "Hungarumlautsmall", "dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "twodotenleader", "onedotenleader", "comma", "hyphen", "period", "fraction", "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "colon", "semicolon", "commasuperior", "threequartersemdash", "periodsuperior", "questionsmall", "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior", "isuperior", "lsuperior", "msuperior", "nsuperior", "osuperior", "rsuperior", "ssuperior", "tsuperior", "ff", "fi", "fl", "ffi", "ffl", "parenleftinferior", "parenrightinferior", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "exclamdownsmall", "centoldstyle", "Lslashsmall", "Scaronsmall", "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "Dotaccentsmall", "Macronsmall", "figuredash", "hypheninferior", "Ogoneksmall", "Ringsmall", "Cedillasmall", "onequarter", "onehalf", "threequarters", "questiondownsmall", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "zerosuperior", "onesuperior", "twosuperior", "threesuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior", "ninesuperior", "zeroinferior", "oneinferior", "twoinferior", "threeinferior", "fourinferior", "fiveinferior", "sixinferior", "seveninferior", "eightinferior", "nineinferior", "centinferior", "dollarinferior", "periodinferior", "commainferior", "Agravesmall", "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall", "Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall", "Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall", "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall", "Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall", "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall", "Ydieresissmall"];
@@ -31293,17 +29792,16 @@ const ExpertSubsetCharset = [".notdef", "space", "dollaroldstyle", "dollarsuperi
 exports.ExpertSubsetCharset = ExpertSubsetCharset;
 
 /***/ }),
-/* 33 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 37 */
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.ZapfDingbatsEncoding = exports.WinAnsiEncoding = exports.SymbolSetEncoding = exports.StandardEncoding = exports.MacRomanEncoding = exports.ExpertEncoding = void 0;
 exports.getEncoding = getEncoding;
-exports.ExpertEncoding = exports.ZapfDingbatsEncoding = exports.SymbolSetEncoding = exports.MacRomanEncoding = exports.StandardEncoding = exports.WinAnsiEncoding = void 0;
 const ExpertEncoding = ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "space", "exclamsmall", "Hungarumlautsmall", "", "dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "twodotenleader", "onedotenleader", "comma", "hyphen", "period", "fraction", "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "colon", "semicolon", "commasuperior", "threequartersemdash", "periodsuperior", "questionsmall", "", "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior", "", "", "", "isuperior", "", "", "lsuperior", "msuperior", "nsuperior", "osuperior", "", "", "rsuperior", "ssuperior", "tsuperior", "", "ff", "fi", "fl", "ffi", "ffl", "parenleftinferior", "", "parenrightinferior", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "exclamdownsmall", "centoldstyle", "Lslashsmall", "", "", "Scaronsmall", "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "", "Dotaccentsmall", "", "", "Macronsmall", "", "", "figuredash", "hypheninferior", "", "", "Ogoneksmall", "Ringsmall", "Cedillasmall", "", "", "", "onequarter", "onehalf", "threequarters", "questiondownsmall", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "", "", "zerosuperior", "onesuperior", "twosuperior", "threesuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior", "ninesuperior", "zeroinferior", "oneinferior", "twoinferior", "threeinferior", "fourinferior", "fiveinferior", "sixinferior", "seveninferior", "eightinferior", "nineinferior", "centinferior", "dollarinferior", "periodinferior", "commainferior", "Agravesmall", "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall", "Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall", "Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall", "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall", "Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall", "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall", "Ydieresissmall"];
 exports.ExpertEncoding = ExpertEncoding;
 const MacExpertEncoding = ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "space", "exclamsmall", "Hungarumlautsmall", "centoldstyle", "dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "twodotenleader", "onedotenleader", "comma", "hyphen", "period", "fraction", "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "colon", "semicolon", "", "threequartersemdash", "", "questionsmall", "", "", "", "", "Ethsmall", "", "", "onequarter", "onehalf", "threequarters", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "", "", "", "", "", "", "ff", "fi", "fl", "ffi", "ffl", "parenleftinferior", "", "parenrightinferior", "Circumflexsmall", "hypheninferior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "", "", "asuperior", "centsuperior", "", "", "", "", "Aacutesmall", "Agravesmall", "Acircumflexsmall", "Adieresissmall", "Atildesmall", "Aringsmall", "Ccedillasmall", "Eacutesmall", "Egravesmall", "Ecircumflexsmall", "Edieresissmall", "Iacutesmall", "Igravesmall", "Icircumflexsmall", "Idieresissmall", "Ntildesmall", "Oacutesmall", "Ogravesmall", "Ocircumflexsmall", "Odieresissmall", "Otildesmall", "Uacutesmall", "Ugravesmall", "Ucircumflexsmall", "Udieresissmall", "", "eightsuperior", "fourinferior", "threeinferior", "sixinferior", "eightinferior", "seveninferior", "Scaronsmall", "", "centinferior", "twoinferior", "", "Dieresissmall", "", "Caronsmall", "osuperior", "fiveinferior", "", "commainferior", "periodinferior", "Yacutesmall", "", "dollarinferior", "", "", "Thornsmall", "", "nineinferior", "zeroinferior", "Zcaronsmall", "AEsmall", "Oslashsmall", "questiondownsmall", "oneinferior", "Lslashsmall", "", "", "", "", "", "", "Cedillasmall", "", "", "", "", "", "OEsmall", "figuredash", "hyphensuperior", "", "", "", "", "exclamdownsmall", "", "Ydieresissmall", "", "onesuperior", "twosuperior", "threesuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "ninesuperior", "zerosuperior", "", "esuperior", "rsuperior", "tsuperior", "", "", "isuperior", "ssuperior", "dsuperior", "", "", "", "", "", "lsuperior", "Ogoneksmall", "Brevesmall", "Macronsmall", "bsuperior", "nsuperior", "msuperior", "commasuperior", "periodsuperior", "Dotaccentsmall", "Ringsmall", "", "", "", ""];
@@ -31347,5292 +29845,9266 @@ function getEncoding(encodingName) {
 }
 
 /***/ }),
-/* 34 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-var getLookupTableFactory = __w_pdfjs_require__(8).getLookupTableFactory;
-var getGlyphsUnicode = getLookupTableFactory(function (t) {
- t.A = 0x0041;
- t.AE = 0x00c6;
- t.AEacute = 0x01fc;
- t.AEmacron = 0x01e2;
- t.AEsmall = 0xf7e6;
- t.Aacute = 0x00c1;
- t.Aacutesmall = 0xf7e1;
- t.Abreve = 0x0102;
- t.Abreveacute = 0x1eae;
- t.Abrevecyrillic = 0x04d0;
- t.Abrevedotbelow = 0x1eb6;
- t.Abrevegrave = 0x1eb0;
- t.Abrevehookabove = 0x1eb2;
- t.Abrevetilde = 0x1eb4;
- t.Acaron = 0x01cd;
- t.Acircle = 0x24b6;
- t.Acircumflex = 0x00c2;
- t.Acircumflexacute = 0x1ea4;
- t.Acircumflexdotbelow = 0x1eac;
- t.Acircumflexgrave = 0x1ea6;
- t.Acircumflexhookabove = 0x1ea8;
- t.Acircumflexsmall = 0xf7e2;
- t.Acircumflextilde = 0x1eaa;
- t.Acute = 0xf6c9;
- t.Acutesmall = 0xf7b4;
- t.Acyrillic = 0x0410;
- t.Adblgrave = 0x0200;
- t.Adieresis = 0x00c4;
- t.Adieresiscyrillic = 0x04d2;
- t.Adieresismacron = 0x01de;
- t.Adieresissmall = 0xf7e4;
- t.Adotbelow = 0x1ea0;
- t.Adotmacron = 0x01e0;
- t.Agrave = 0x00c0;
- t.Agravesmall = 0xf7e0;
- t.Ahookabove = 0x1ea2;
- t.Aiecyrillic = 0x04d4;
- t.Ainvertedbreve = 0x0202;
- t.Alpha = 0x0391;
- t.Alphatonos = 0x0386;
- t.Amacron = 0x0100;
- t.Amonospace = 0xff21;
- t.Aogonek = 0x0104;
- t.Aring = 0x00c5;
- t.Aringacute = 0x01fa;
- t.Aringbelow = 0x1e00;
- t.Aringsmall = 0xf7e5;
- t.Asmall = 0xf761;
- t.Atilde = 0x00c3;
- t.Atildesmall = 0xf7e3;
- t.Aybarmenian = 0x0531;
- t.B = 0x0042;
- t.Bcircle = 0x24b7;
- t.Bdotaccent = 0x1e02;
- t.Bdotbelow = 0x1e04;
- t.Becyrillic = 0x0411;
- t.Benarmenian = 0x0532;
- t.Beta = 0x0392;
- t.Bhook = 0x0181;
- t.Blinebelow = 0x1e06;
- t.Bmonospace = 0xff22;
- t.Brevesmall = 0xf6f4;
- t.Bsmall = 0xf762;
- t.Btopbar = 0x0182;
- t.C = 0x0043;
- t.Caarmenian = 0x053e;
- t.Cacute = 0x0106;
- t.Caron = 0xf6ca;
- t.Caronsmall = 0xf6f5;
- t.Ccaron = 0x010c;
- t.Ccedilla = 0x00c7;
- t.Ccedillaacute = 0x1e08;
- t.Ccedillasmall = 0xf7e7;
- t.Ccircle = 0x24b8;
- t.Ccircumflex = 0x0108;
- t.Cdot = 0x010a;
- t.Cdotaccent = 0x010a;
- t.Cedillasmall = 0xf7b8;
- t.Chaarmenian = 0x0549;
- t.Cheabkhasiancyrillic = 0x04bc;
- t.Checyrillic = 0x0427;
- t.Chedescenderabkhasiancyrillic = 0x04be;
- t.Chedescendercyrillic = 0x04b6;
- t.Chedieresiscyrillic = 0x04f4;
- t.Cheharmenian = 0x0543;
- t.Chekhakassiancyrillic = 0x04cb;
- t.Cheverticalstrokecyrillic = 0x04b8;
- t.Chi = 0x03a7;
- t.Chook = 0x0187;
- t.Circumflexsmall = 0xf6f6;
- t.Cmonospace = 0xff23;
- t.Coarmenian = 0x0551;
- t.Csmall = 0xf763;
- t.D = 0x0044;
- t.DZ = 0x01f1;
- t.DZcaron = 0x01c4;
- t.Daarmenian = 0x0534;
- t.Dafrican = 0x0189;
- t.Dcaron = 0x010e;
- t.Dcedilla = 0x1e10;
- t.Dcircle = 0x24b9;
- t.Dcircumflexbelow = 0x1e12;
- t.Dcroat = 0x0110;
- t.Ddotaccent = 0x1e0a;
- t.Ddotbelow = 0x1e0c;
- t.Decyrillic = 0x0414;
- t.Deicoptic = 0x03ee;
- t.Delta = 0x2206;
- t.Deltagreek = 0x0394;
- t.Dhook = 0x018a;
- t.Dieresis = 0xf6cb;
- t.DieresisAcute = 0xf6cc;
- t.DieresisGrave = 0xf6cd;
- t.Dieresissmall = 0xf7a8;
- t.Digammagreek = 0x03dc;
- t.Djecyrillic = 0x0402;
- t.Dlinebelow = 0x1e0e;
- t.Dmonospace = 0xff24;
- t.Dotaccentsmall = 0xf6f7;
- t.Dslash = 0x0110;
- t.Dsmall = 0xf764;
- t.Dtopbar = 0x018b;
- t.Dz = 0x01f2;
- t.Dzcaron = 0x01c5;
- t.Dzeabkhasiancyrillic = 0x04e0;
- t.Dzecyrillic = 0x0405;
- t.Dzhecyrillic = 0x040f;
- t.E = 0x0045;
- t.Eacute = 0x00c9;
- t.Eacutesmall = 0xf7e9;
- t.Ebreve = 0x0114;
- t.Ecaron = 0x011a;
- t.Ecedillabreve = 0x1e1c;
- t.Echarmenian = 0x0535;
- t.Ecircle = 0x24ba;
- t.Ecircumflex = 0x00ca;
- t.Ecircumflexacute = 0x1ebe;
- t.Ecircumflexbelow = 0x1e18;
- t.Ecircumflexdotbelow = 0x1ec6;
- t.Ecircumflexgrave = 0x1ec0;
- t.Ecircumflexhookabove = 0x1ec2;
- t.Ecircumflexsmall = 0xf7ea;
- t.Ecircumflextilde = 0x1ec4;
- t.Ecyrillic = 0x0404;
- t.Edblgrave = 0x0204;
- t.Edieresis = 0x00cb;
- t.Edieresissmall = 0xf7eb;
- t.Edot = 0x0116;
- t.Edotaccent = 0x0116;
- t.Edotbelow = 0x1eb8;
- t.Efcyrillic = 0x0424;
- t.Egrave = 0x00c8;
- t.Egravesmall = 0xf7e8;
- t.Eharmenian = 0x0537;
- t.Ehookabove = 0x1eba;
- t.Eightroman = 0x2167;
- t.Einvertedbreve = 0x0206;
- t.Eiotifiedcyrillic = 0x0464;
- t.Elcyrillic = 0x041b;
- t.Elevenroman = 0x216a;
- t.Emacron = 0x0112;
- t.Emacronacute = 0x1e16;
- t.Emacrongrave = 0x1e14;
- t.Emcyrillic = 0x041c;
- t.Emonospace = 0xff25;
- t.Encyrillic = 0x041d;
- t.Endescendercyrillic = 0x04a2;
- t.Eng = 0x014a;
- t.Enghecyrillic = 0x04a4;
- t.Enhookcyrillic = 0x04c7;
- t.Eogonek = 0x0118;
- t.Eopen = 0x0190;
- t.Epsilon = 0x0395;
- t.Epsilontonos = 0x0388;
- t.Ercyrillic = 0x0420;
- t.Ereversed = 0x018e;
- t.Ereversedcyrillic = 0x042d;
- t.Escyrillic = 0x0421;
- t.Esdescendercyrillic = 0x04aa;
- t.Esh = 0x01a9;
- t.Esmall = 0xf765;
- t.Eta = 0x0397;
- t.Etarmenian = 0x0538;
- t.Etatonos = 0x0389;
- t.Eth = 0x00d0;
- t.Ethsmall = 0xf7f0;
- t.Etilde = 0x1ebc;
- t.Etildebelow = 0x1e1a;
- t.Euro = 0x20ac;
- t.Ezh = 0x01b7;
- t.Ezhcaron = 0x01ee;
- t.Ezhreversed = 0x01b8;
- t.F = 0x0046;
- t.Fcircle = 0x24bb;
- t.Fdotaccent = 0x1e1e;
- t.Feharmenian = 0x0556;
- t.Feicoptic = 0x03e4;
- t.Fhook = 0x0191;
- t.Fitacyrillic = 0x0472;
- t.Fiveroman = 0x2164;
- t.Fmonospace = 0xff26;
- t.Fourroman = 0x2163;
- t.Fsmall = 0xf766;
- t.G = 0x0047;
- t.GBsquare = 0x3387;
- t.Gacute = 0x01f4;
- t.Gamma = 0x0393;
- t.Gammaafrican = 0x0194;
- t.Gangiacoptic = 0x03ea;
- t.Gbreve = 0x011e;
- t.Gcaron = 0x01e6;
- t.Gcedilla = 0x0122;
- t.Gcircle = 0x24bc;
- t.Gcircumflex = 0x011c;
- t.Gcommaaccent = 0x0122;
- t.Gdot = 0x0120;
- t.Gdotaccent = 0x0120;
- t.Gecyrillic = 0x0413;
- t.Ghadarmenian = 0x0542;
- t.Ghemiddlehookcyrillic = 0x0494;
- t.Ghestrokecyrillic = 0x0492;
- t.Gheupturncyrillic = 0x0490;
- t.Ghook = 0x0193;
- t.Gimarmenian = 0x0533;
- t.Gjecyrillic = 0x0403;
- t.Gmacron = 0x1e20;
- t.Gmonospace = 0xff27;
- t.Grave = 0xf6ce;
- t.Gravesmall = 0xf760;
- t.Gsmall = 0xf767;
- t.Gsmallhook = 0x029b;
- t.Gstroke = 0x01e4;
- t.H = 0x0048;
- t.H18533 = 0x25cf;
- t.H18543 = 0x25aa;
- t.H18551 = 0x25ab;
- t.H22073 = 0x25a1;
- t.HPsquare = 0x33cb;
- t.Haabkhasiancyrillic = 0x04a8;
- t.Hadescendercyrillic = 0x04b2;
- t.Hardsigncyrillic = 0x042a;
- t.Hbar = 0x0126;
- t.Hbrevebelow = 0x1e2a;
- t.Hcedilla = 0x1e28;
- t.Hcircle = 0x24bd;
- t.Hcircumflex = 0x0124;
- t.Hdieresis = 0x1e26;
- t.Hdotaccent = 0x1e22;
- t.Hdotbelow = 0x1e24;
- t.Hmonospace = 0xff28;
- t.Hoarmenian = 0x0540;
- t.Horicoptic = 0x03e8;
- t.Hsmall = 0xf768;
- t.Hungarumlaut = 0xf6cf;
- t.Hungarumlautsmall = 0xf6f8;
- t.Hzsquare = 0x3390;
- t.I = 0x0049;
- t.IAcyrillic = 0x042f;
- t.IJ = 0x0132;
- t.IUcyrillic = 0x042e;
- t.Iacute = 0x00cd;
- t.Iacutesmall = 0xf7ed;
- t.Ibreve = 0x012c;
- t.Icaron = 0x01cf;
- t.Icircle = 0x24be;
- t.Icircumflex = 0x00ce;
- t.Icircumflexsmall = 0xf7ee;
- t.Icyrillic = 0x0406;
- t.Idblgrave = 0x0208;
- t.Idieresis = 0x00cf;
- t.Idieresisacute = 0x1e2e;
- t.Idieresiscyrillic = 0x04e4;
- t.Idieresissmall = 0xf7ef;
- t.Idot = 0x0130;
- t.Idotaccent = 0x0130;
- t.Idotbelow = 0x1eca;
- t.Iebrevecyrillic = 0x04d6;
- t.Iecyrillic = 0x0415;
- t.Ifraktur = 0x2111;
- t.Igrave = 0x00cc;
- t.Igravesmall = 0xf7ec;
- t.Ihookabove = 0x1ec8;
- t.Iicyrillic = 0x0418;
- t.Iinvertedbreve = 0x020a;
- t.Iishortcyrillic = 0x0419;
- t.Imacron = 0x012a;
- t.Imacroncyrillic = 0x04e2;
- t.Imonospace = 0xff29;
- t.Iniarmenian = 0x053b;
- t.Iocyrillic = 0x0401;
- t.Iogonek = 0x012e;
- t.Iota = 0x0399;
- t.Iotaafrican = 0x0196;
- t.Iotadieresis = 0x03aa;
- t.Iotatonos = 0x038a;
- t.Ismall = 0xf769;
- t.Istroke = 0x0197;
- t.Itilde = 0x0128;
- t.Itildebelow = 0x1e2c;
- t.Izhitsacyrillic = 0x0474;
- t.Izhitsadblgravecyrillic = 0x0476;
- t.J = 0x004a;
- t.Jaarmenian = 0x0541;
- t.Jcircle = 0x24bf;
- t.Jcircumflex = 0x0134;
- t.Jecyrillic = 0x0408;
- t.Jheharmenian = 0x054b;
- t.Jmonospace = 0xff2a;
- t.Jsmall = 0xf76a;
- t.K = 0x004b;
- t.KBsquare = 0x3385;
- t.KKsquare = 0x33cd;
- t.Kabashkircyrillic = 0x04a0;
- t.Kacute = 0x1e30;
- t.Kacyrillic = 0x041a;
- t.Kadescendercyrillic = 0x049a;
- t.Kahookcyrillic = 0x04c3;
- t.Kappa = 0x039a;
- t.Kastrokecyrillic = 0x049e;
- t.Kaverticalstrokecyrillic = 0x049c;
- t.Kcaron = 0x01e8;
- t.Kcedilla = 0x0136;
- t.Kcircle = 0x24c0;
- t.Kcommaaccent = 0x0136;
- t.Kdotbelow = 0x1e32;
- t.Keharmenian = 0x0554;
- t.Kenarmenian = 0x053f;
- t.Khacyrillic = 0x0425;
- t.Kheicoptic = 0x03e6;
- t.Khook = 0x0198;
- t.Kjecyrillic = 0x040c;
- t.Klinebelow = 0x1e34;
- t.Kmonospace = 0xff2b;
- t.Koppacyrillic = 0x0480;
- t.Koppagreek = 0x03de;
- t.Ksicyrillic = 0x046e;
- t.Ksmall = 0xf76b;
- t.L = 0x004c;
- t.LJ = 0x01c7;
- t.LL = 0xf6bf;
- t.Lacute = 0x0139;
- t.Lambda = 0x039b;
- t.Lcaron = 0x013d;
- t.Lcedilla = 0x013b;
- t.Lcircle = 0x24c1;
- t.Lcircumflexbelow = 0x1e3c;
- t.Lcommaaccent = 0x013b;
- t.Ldot = 0x013f;
- t.Ldotaccent = 0x013f;
- t.Ldotbelow = 0x1e36;
- t.Ldotbelowmacron = 0x1e38;
- t.Liwnarmenian = 0x053c;
- t.Lj = 0x01c8;
- t.Ljecyrillic = 0x0409;
- t.Llinebelow = 0x1e3a;
- t.Lmonospace = 0xff2c;
- t.Lslash = 0x0141;
- t.Lslashsmall = 0xf6f9;
- t.Lsmall = 0xf76c;
- t.M = 0x004d;
- t.MBsquare = 0x3386;
- t.Macron = 0xf6d0;
- t.Macronsmall = 0xf7af;
- t.Macute = 0x1e3e;
- t.Mcircle = 0x24c2;
- t.Mdotaccent = 0x1e40;
- t.Mdotbelow = 0x1e42;
- t.Menarmenian = 0x0544;
- t.Mmonospace = 0xff2d;
- t.Msmall = 0xf76d;
- t.Mturned = 0x019c;
- t.Mu = 0x039c;
- t.N = 0x004e;
- t.NJ = 0x01ca;
- t.Nacute = 0x0143;
- t.Ncaron = 0x0147;
- t.Ncedilla = 0x0145;
- t.Ncircle = 0x24c3;
- t.Ncircumflexbelow = 0x1e4a;
- t.Ncommaaccent = 0x0145;
- t.Ndotaccent = 0x1e44;
- t.Ndotbelow = 0x1e46;
- t.Nhookleft = 0x019d;
- t.Nineroman = 0x2168;
- t.Nj = 0x01cb;
- t.Njecyrillic = 0x040a;
- t.Nlinebelow = 0x1e48;
- t.Nmonospace = 0xff2e;
- t.Nowarmenian = 0x0546;
- t.Nsmall = 0xf76e;
- t.Ntilde = 0x00d1;
- t.Ntildesmall = 0xf7f1;
- t.Nu = 0x039d;
- t.O = 0x004f;
- t.OE = 0x0152;
- t.OEsmall = 0xf6fa;
- t.Oacute = 0x00d3;
- t.Oacutesmall = 0xf7f3;
- t.Obarredcyrillic = 0x04e8;
- t.Obarreddieresiscyrillic = 0x04ea;
- t.Obreve = 0x014e;
- t.Ocaron = 0x01d1;
- t.Ocenteredtilde = 0x019f;
- t.Ocircle = 0x24c4;
- t.Ocircumflex = 0x00d4;
- t.Ocircumflexacute = 0x1ed0;
- t.Ocircumflexdotbelow = 0x1ed8;
- t.Ocircumflexgrave = 0x1ed2;
- t.Ocircumflexhookabove = 0x1ed4;
- t.Ocircumflexsmall = 0xf7f4;
- t.Ocircumflextilde = 0x1ed6;
- t.Ocyrillic = 0x041e;
- t.Odblacute = 0x0150;
- t.Odblgrave = 0x020c;
- t.Odieresis = 0x00d6;
- t.Odieresiscyrillic = 0x04e6;
- t.Odieresissmall = 0xf7f6;
- t.Odotbelow = 0x1ecc;
- t.Ogoneksmall = 0xf6fb;
- t.Ograve = 0x00d2;
- t.Ogravesmall = 0xf7f2;
- t.Oharmenian = 0x0555;
- t.Ohm = 0x2126;
- t.Ohookabove = 0x1ece;
- t.Ohorn = 0x01a0;
- t.Ohornacute = 0x1eda;
- t.Ohorndotbelow = 0x1ee2;
- t.Ohorngrave = 0x1edc;
- t.Ohornhookabove = 0x1ede;
- t.Ohorntilde = 0x1ee0;
- t.Ohungarumlaut = 0x0150;
- t.Oi = 0x01a2;
- t.Oinvertedbreve = 0x020e;
- t.Omacron = 0x014c;
- t.Omacronacute = 0x1e52;
- t.Omacrongrave = 0x1e50;
- t.Omega = 0x2126;
- t.Omegacyrillic = 0x0460;
- t.Omegagreek = 0x03a9;
- t.Omegaroundcyrillic = 0x047a;
- t.Omegatitlocyrillic = 0x047c;
- t.Omegatonos = 0x038f;
- t.Omicron = 0x039f;
- t.Omicrontonos = 0x038c;
- t.Omonospace = 0xff2f;
- t.Oneroman = 0x2160;
- t.Oogonek = 0x01ea;
- t.Oogonekmacron = 0x01ec;
- t.Oopen = 0x0186;
- t.Oslash = 0x00d8;
- t.Oslashacute = 0x01fe;
- t.Oslashsmall = 0xf7f8;
- t.Osmall = 0xf76f;
- t.Ostrokeacute = 0x01fe;
- t.Otcyrillic = 0x047e;
- t.Otilde = 0x00d5;
- t.Otildeacute = 0x1e4c;
- t.Otildedieresis = 0x1e4e;
- t.Otildesmall = 0xf7f5;
- t.P = 0x0050;
- t.Pacute = 0x1e54;
- t.Pcircle = 0x24c5;
- t.Pdotaccent = 0x1e56;
- t.Pecyrillic = 0x041f;
- t.Peharmenian = 0x054a;
- t.Pemiddlehookcyrillic = 0x04a6;
- t.Phi = 0x03a6;
- t.Phook = 0x01a4;
- t.Pi = 0x03a0;
- t.Piwrarmenian = 0x0553;
- t.Pmonospace = 0xff30;
- t.Psi = 0x03a8;
- t.Psicyrillic = 0x0470;
- t.Psmall = 0xf770;
- t.Q = 0x0051;
- t.Qcircle = 0x24c6;
- t.Qmonospace = 0xff31;
- t.Qsmall = 0xf771;
- t.R = 0x0052;
- t.Raarmenian = 0x054c;
- t.Racute = 0x0154;
- t.Rcaron = 0x0158;
- t.Rcedilla = 0x0156;
- t.Rcircle = 0x24c7;
- t.Rcommaaccent = 0x0156;
- t.Rdblgrave = 0x0210;
- t.Rdotaccent = 0x1e58;
- t.Rdotbelow = 0x1e5a;
- t.Rdotbelowmacron = 0x1e5c;
- t.Reharmenian = 0x0550;
- t.Rfraktur = 0x211c;
- t.Rho = 0x03a1;
- t.Ringsmall = 0xf6fc;
- t.Rinvertedbreve = 0x0212;
- t.Rlinebelow = 0x1e5e;
- t.Rmonospace = 0xff32;
- t.Rsmall = 0xf772;
- t.Rsmallinverted = 0x0281;
- t.Rsmallinvertedsuperior = 0x02b6;
- t.S = 0x0053;
- t.SF010000 = 0x250c;
- t.SF020000 = 0x2514;
- t.SF030000 = 0x2510;
- t.SF040000 = 0x2518;
- t.SF050000 = 0x253c;
- t.SF060000 = 0x252c;
- t.SF070000 = 0x2534;
- t.SF080000 = 0x251c;
- t.SF090000 = 0x2524;
- t.SF100000 = 0x2500;
- t.SF110000 = 0x2502;
- t.SF190000 = 0x2561;
- t.SF200000 = 0x2562;
- t.SF210000 = 0x2556;
- t.SF220000 = 0x2555;
- t.SF230000 = 0x2563;
- t.SF240000 = 0x2551;
- t.SF250000 = 0x2557;
- t.SF260000 = 0x255d;
- t.SF270000 = 0x255c;
- t.SF280000 = 0x255b;
- t.SF360000 = 0x255e;
- t.SF370000 = 0x255f;
- t.SF380000 = 0x255a;
- t.SF390000 = 0x2554;
- t.SF400000 = 0x2569;
- t.SF410000 = 0x2566;
- t.SF420000 = 0x2560;
- t.SF430000 = 0x2550;
- t.SF440000 = 0x256c;
- t.SF450000 = 0x2567;
- t.SF460000 = 0x2568;
- t.SF470000 = 0x2564;
- t.SF480000 = 0x2565;
- t.SF490000 = 0x2559;
- t.SF500000 = 0x2558;
- t.SF510000 = 0x2552;
- t.SF520000 = 0x2553;
- t.SF530000 = 0x256b;
- t.SF540000 = 0x256a;
- t.Sacute = 0x015a;
- t.Sacutedotaccent = 0x1e64;
- t.Sampigreek = 0x03e0;
- t.Scaron = 0x0160;
- t.Scarondotaccent = 0x1e66;
- t.Scaronsmall = 0xf6fd;
- t.Scedilla = 0x015e;
- t.Schwa = 0x018f;
- t.Schwacyrillic = 0x04d8;
- t.Schwadieresiscyrillic = 0x04da;
- t.Scircle = 0x24c8;
- t.Scircumflex = 0x015c;
- t.Scommaaccent = 0x0218;
- t.Sdotaccent = 0x1e60;
- t.Sdotbelow = 0x1e62;
- t.Sdotbelowdotaccent = 0x1e68;
- t.Seharmenian = 0x054d;
- t.Sevenroman = 0x2166;
- t.Shaarmenian = 0x0547;
- t.Shacyrillic = 0x0428;
- t.Shchacyrillic = 0x0429;
- t.Sheicoptic = 0x03e2;
- t.Shhacyrillic = 0x04ba;
- t.Shimacoptic = 0x03ec;
- t.Sigma = 0x03a3;
- t.Sixroman = 0x2165;
- t.Smonospace = 0xff33;
- t.Softsigncyrillic = 0x042c;
- t.Ssmall = 0xf773;
- t.Stigmagreek = 0x03da;
- t.T = 0x0054;
- t.Tau = 0x03a4;
- t.Tbar = 0x0166;
- t.Tcaron = 0x0164;
- t.Tcedilla = 0x0162;
- t.Tcircle = 0x24c9;
- t.Tcircumflexbelow = 0x1e70;
- t.Tcommaaccent = 0x0162;
- t.Tdotaccent = 0x1e6a;
- t.Tdotbelow = 0x1e6c;
- t.Tecyrillic = 0x0422;
- t.Tedescendercyrillic = 0x04ac;
- t.Tenroman = 0x2169;
- t.Tetsecyrillic = 0x04b4;
- t.Theta = 0x0398;
- t.Thook = 0x01ac;
- t.Thorn = 0x00de;
- t.Thornsmall = 0xf7fe;
- t.Threeroman = 0x2162;
- t.Tildesmall = 0xf6fe;
- t.Tiwnarmenian = 0x054f;
- t.Tlinebelow = 0x1e6e;
- t.Tmonospace = 0xff34;
- t.Toarmenian = 0x0539;
- t.Tonefive = 0x01bc;
- t.Tonesix = 0x0184;
- t.Tonetwo = 0x01a7;
- t.Tretroflexhook = 0x01ae;
- t.Tsecyrillic = 0x0426;
- t.Tshecyrillic = 0x040b;
- t.Tsmall = 0xf774;
- t.Twelveroman = 0x216b;
- t.Tworoman = 0x2161;
- t.U = 0x0055;
- t.Uacute = 0x00da;
- t.Uacutesmall = 0xf7fa;
- t.Ubreve = 0x016c;
- t.Ucaron = 0x01d3;
- t.Ucircle = 0x24ca;
- t.Ucircumflex = 0x00db;
- t.Ucircumflexbelow = 0x1e76;
- t.Ucircumflexsmall = 0xf7fb;
- t.Ucyrillic = 0x0423;
- t.Udblacute = 0x0170;
- t.Udblgrave = 0x0214;
- t.Udieresis = 0x00dc;
- t.Udieresisacute = 0x01d7;
- t.Udieresisbelow = 0x1e72;
- t.Udieresiscaron = 0x01d9;
- t.Udieresiscyrillic = 0x04f0;
- t.Udieresisgrave = 0x01db;
- t.Udieresismacron = 0x01d5;
- t.Udieresissmall = 0xf7fc;
- t.Udotbelow = 0x1ee4;
- t.Ugrave = 0x00d9;
- t.Ugravesmall = 0xf7f9;
- t.Uhookabove = 0x1ee6;
- t.Uhorn = 0x01af;
- t.Uhornacute = 0x1ee8;
- t.Uhorndotbelow = 0x1ef0;
- t.Uhorngrave = 0x1eea;
- t.Uhornhookabove = 0x1eec;
- t.Uhorntilde = 0x1eee;
- t.Uhungarumlaut = 0x0170;
- t.Uhungarumlautcyrillic = 0x04f2;
- t.Uinvertedbreve = 0x0216;
- t.Ukcyrillic = 0x0478;
- t.Umacron = 0x016a;
- t.Umacroncyrillic = 0x04ee;
- t.Umacrondieresis = 0x1e7a;
- t.Umonospace = 0xff35;
- t.Uogonek = 0x0172;
- t.Upsilon = 0x03a5;
- t.Upsilon1 = 0x03d2;
- t.Upsilonacutehooksymbolgreek = 0x03d3;
- t.Upsilonafrican = 0x01b1;
- t.Upsilondieresis = 0x03ab;
- t.Upsilondieresishooksymbolgreek = 0x03d4;
- t.Upsilonhooksymbol = 0x03d2;
- t.Upsilontonos = 0x038e;
- t.Uring = 0x016e;
- t.Ushortcyrillic = 0x040e;
- t.Usmall = 0xf775;
- t.Ustraightcyrillic = 0x04ae;
- t.Ustraightstrokecyrillic = 0x04b0;
- t.Utilde = 0x0168;
- t.Utildeacute = 0x1e78;
- t.Utildebelow = 0x1e74;
- t.V = 0x0056;
- t.Vcircle = 0x24cb;
- t.Vdotbelow = 0x1e7e;
- t.Vecyrillic = 0x0412;
- t.Vewarmenian = 0x054e;
- t.Vhook = 0x01b2;
- t.Vmonospace = 0xff36;
- t.Voarmenian = 0x0548;
- t.Vsmall = 0xf776;
- t.Vtilde = 0x1e7c;
- t.W = 0x0057;
- t.Wacute = 0x1e82;
- t.Wcircle = 0x24cc;
- t.Wcircumflex = 0x0174;
- t.Wdieresis = 0x1e84;
- t.Wdotaccent = 0x1e86;
- t.Wdotbelow = 0x1e88;
- t.Wgrave = 0x1e80;
- t.Wmonospace = 0xff37;
- t.Wsmall = 0xf777;
- t.X = 0x0058;
- t.Xcircle = 0x24cd;
- t.Xdieresis = 0x1e8c;
- t.Xdotaccent = 0x1e8a;
- t.Xeharmenian = 0x053d;
- t.Xi = 0x039e;
- t.Xmonospace = 0xff38;
- t.Xsmall = 0xf778;
- t.Y = 0x0059;
- t.Yacute = 0x00dd;
- t.Yacutesmall = 0xf7fd;
- t.Yatcyrillic = 0x0462;
- t.Ycircle = 0x24ce;
- t.Ycircumflex = 0x0176;
- t.Ydieresis = 0x0178;
- t.Ydieresissmall = 0xf7ff;
- t.Ydotaccent = 0x1e8e;
- t.Ydotbelow = 0x1ef4;
- t.Yericyrillic = 0x042b;
- t.Yerudieresiscyrillic = 0x04f8;
- t.Ygrave = 0x1ef2;
- t.Yhook = 0x01b3;
- t.Yhookabove = 0x1ef6;
- t.Yiarmenian = 0x0545;
- t.Yicyrillic = 0x0407;
- t.Yiwnarmenian = 0x0552;
- t.Ymonospace = 0xff39;
- t.Ysmall = 0xf779;
- t.Ytilde = 0x1ef8;
- t.Yusbigcyrillic = 0x046a;
- t.Yusbigiotifiedcyrillic = 0x046c;
- t.Yuslittlecyrillic = 0x0466;
- t.Yuslittleiotifiedcyrillic = 0x0468;
- t.Z = 0x005a;
- t.Zaarmenian = 0x0536;
- t.Zacute = 0x0179;
- t.Zcaron = 0x017d;
- t.Zcaronsmall = 0xf6ff;
- t.Zcircle = 0x24cf;
- t.Zcircumflex = 0x1e90;
- t.Zdot = 0x017b;
- t.Zdotaccent = 0x017b;
- t.Zdotbelow = 0x1e92;
- t.Zecyrillic = 0x0417;
- t.Zedescendercyrillic = 0x0498;
- t.Zedieresiscyrillic = 0x04de;
- t.Zeta = 0x0396;
- t.Zhearmenian = 0x053a;
- t.Zhebrevecyrillic = 0x04c1;
- t.Zhecyrillic = 0x0416;
- t.Zhedescendercyrillic = 0x0496;
- t.Zhedieresiscyrillic = 0x04dc;
- t.Zlinebelow = 0x1e94;
- t.Zmonospace = 0xff3a;
- t.Zsmall = 0xf77a;
- t.Zstroke = 0x01b5;
- t.a = 0x0061;
- t.aabengali = 0x0986;
- t.aacute = 0x00e1;
- t.aadeva = 0x0906;
- t.aagujarati = 0x0a86;
- t.aagurmukhi = 0x0a06;
- t.aamatragurmukhi = 0x0a3e;
- t.aarusquare = 0x3303;
- t.aavowelsignbengali = 0x09be;
- t.aavowelsigndeva = 0x093e;
- t.aavowelsigngujarati = 0x0abe;
- t.abbreviationmarkarmenian = 0x055f;
- t.abbreviationsigndeva = 0x0970;
- t.abengali = 0x0985;
- t.abopomofo = 0x311a;
- t.abreve = 0x0103;
- t.abreveacute = 0x1eaf;
- t.abrevecyrillic = 0x04d1;
- t.abrevedotbelow = 0x1eb7;
- t.abrevegrave = 0x1eb1;
- t.abrevehookabove = 0x1eb3;
- t.abrevetilde = 0x1eb5;
- t.acaron = 0x01ce;
- t.acircle = 0x24d0;
- t.acircumflex = 0x00e2;
- t.acircumflexacute = 0x1ea5;
- t.acircumflexdotbelow = 0x1ead;
- t.acircumflexgrave = 0x1ea7;
- t.acircumflexhookabove = 0x1ea9;
- t.acircumflextilde = 0x1eab;
- t.acute = 0x00b4;
- t.acutebelowcmb = 0x0317;
- t.acutecmb = 0x0301;
- t.acutecomb = 0x0301;
- t.acutedeva = 0x0954;
- t.acutelowmod = 0x02cf;
- t.acutetonecmb = 0x0341;
- t.acyrillic = 0x0430;
- t.adblgrave = 0x0201;
- t.addakgurmukhi = 0x0a71;
- t.adeva = 0x0905;
- t.adieresis = 0x00e4;
- t.adieresiscyrillic = 0x04d3;
- t.adieresismacron = 0x01df;
- t.adotbelow = 0x1ea1;
- t.adotmacron = 0x01e1;
- t.ae = 0x00e6;
- t.aeacute = 0x01fd;
- t.aekorean = 0x3150;
- t.aemacron = 0x01e3;
- t.afii00208 = 0x2015;
- t.afii08941 = 0x20a4;
- t.afii10017 = 0x0410;
- t.afii10018 = 0x0411;
- t.afii10019 = 0x0412;
- t.afii10020 = 0x0413;
- t.afii10021 = 0x0414;
- t.afii10022 = 0x0415;
- t.afii10023 = 0x0401;
- t.afii10024 = 0x0416;
- t.afii10025 = 0x0417;
- t.afii10026 = 0x0418;
- t.afii10027 = 0x0419;
- t.afii10028 = 0x041a;
- t.afii10029 = 0x041b;
- t.afii10030 = 0x041c;
- t.afii10031 = 0x041d;
- t.afii10032 = 0x041e;
- t.afii10033 = 0x041f;
- t.afii10034 = 0x0420;
- t.afii10035 = 0x0421;
- t.afii10036 = 0x0422;
- t.afii10037 = 0x0423;
- t.afii10038 = 0x0424;
- t.afii10039 = 0x0425;
- t.afii10040 = 0x0426;
- t.afii10041 = 0x0427;
- t.afii10042 = 0x0428;
- t.afii10043 = 0x0429;
- t.afii10044 = 0x042a;
- t.afii10045 = 0x042b;
- t.afii10046 = 0x042c;
- t.afii10047 = 0x042d;
- t.afii10048 = 0x042e;
- t.afii10049 = 0x042f;
- t.afii10050 = 0x0490;
- t.afii10051 = 0x0402;
- t.afii10052 = 0x0403;
- t.afii10053 = 0x0404;
- t.afii10054 = 0x0405;
- t.afii10055 = 0x0406;
- t.afii10056 = 0x0407;
- t.afii10057 = 0x0408;
- t.afii10058 = 0x0409;
- t.afii10059 = 0x040a;
- t.afii10060 = 0x040b;
- t.afii10061 = 0x040c;
- t.afii10062 = 0x040e;
- t.afii10063 = 0xf6c4;
- t.afii10064 = 0xf6c5;
- t.afii10065 = 0x0430;
- t.afii10066 = 0x0431;
- t.afii10067 = 0x0432;
- t.afii10068 = 0x0433;
- t.afii10069 = 0x0434;
- t.afii10070 = 0x0435;
- t.afii10071 = 0x0451;
- t.afii10072 = 0x0436;
- t.afii10073 = 0x0437;
- t.afii10074 = 0x0438;
- t.afii10075 = 0x0439;
- t.afii10076 = 0x043a;
- t.afii10077 = 0x043b;
- t.afii10078 = 0x043c;
- t.afii10079 = 0x043d;
- t.afii10080 = 0x043e;
- t.afii10081 = 0x043f;
- t.afii10082 = 0x0440;
- t.afii10083 = 0x0441;
- t.afii10084 = 0x0442;
- t.afii10085 = 0x0443;
- t.afii10086 = 0x0444;
- t.afii10087 = 0x0445;
- t.afii10088 = 0x0446;
- t.afii10089 = 0x0447;
- t.afii10090 = 0x0448;
- t.afii10091 = 0x0449;
- t.afii10092 = 0x044a;
- t.afii10093 = 0x044b;
- t.afii10094 = 0x044c;
- t.afii10095 = 0x044d;
- t.afii10096 = 0x044e;
- t.afii10097 = 0x044f;
- t.afii10098 = 0x0491;
- t.afii10099 = 0x0452;
- t.afii10100 = 0x0453;
- t.afii10101 = 0x0454;
- t.afii10102 = 0x0455;
- t.afii10103 = 0x0456;
- t.afii10104 = 0x0457;
- t.afii10105 = 0x0458;
- t.afii10106 = 0x0459;
- t.afii10107 = 0x045a;
- t.afii10108 = 0x045b;
- t.afii10109 = 0x045c;
- t.afii10110 = 0x045e;
- t.afii10145 = 0x040f;
- t.afii10146 = 0x0462;
- t.afii10147 = 0x0472;
- t.afii10148 = 0x0474;
- t.afii10192 = 0xf6c6;
- t.afii10193 = 0x045f;
- t.afii10194 = 0x0463;
- t.afii10195 = 0x0473;
- t.afii10196 = 0x0475;
- t.afii10831 = 0xf6c7;
- t.afii10832 = 0xf6c8;
- t.afii10846 = 0x04d9;
- t.afii299 = 0x200e;
- t.afii300 = 0x200f;
- t.afii301 = 0x200d;
- t.afii57381 = 0x066a;
- t.afii57388 = 0x060c;
- t.afii57392 = 0x0660;
- t.afii57393 = 0x0661;
- t.afii57394 = 0x0662;
- t.afii57395 = 0x0663;
- t.afii57396 = 0x0664;
- t.afii57397 = 0x0665;
- t.afii57398 = 0x0666;
- t.afii57399 = 0x0667;
- t.afii57400 = 0x0668;
- t.afii57401 = 0x0669;
- t.afii57403 = 0x061b;
- t.afii57407 = 0x061f;
- t.afii57409 = 0x0621;
- t.afii57410 = 0x0622;
- t.afii57411 = 0x0623;
- t.afii57412 = 0x0624;
- t.afii57413 = 0x0625;
- t.afii57414 = 0x0626;
- t.afii57415 = 0x0627;
- t.afii57416 = 0x0628;
- t.afii57417 = 0x0629;
- t.afii57418 = 0x062a;
- t.afii57419 = 0x062b;
- t.afii57420 = 0x062c;
- t.afii57421 = 0x062d;
- t.afii57422 = 0x062e;
- t.afii57423 = 0x062f;
- t.afii57424 = 0x0630;
- t.afii57425 = 0x0631;
- t.afii57426 = 0x0632;
- t.afii57427 = 0x0633;
- t.afii57428 = 0x0634;
- t.afii57429 = 0x0635;
- t.afii57430 = 0x0636;
- t.afii57431 = 0x0637;
- t.afii57432 = 0x0638;
- t.afii57433 = 0x0639;
- t.afii57434 = 0x063a;
- t.afii57440 = 0x0640;
- t.afii57441 = 0x0641;
- t.afii57442 = 0x0642;
- t.afii57443 = 0x0643;
- t.afii57444 = 0x0644;
- t.afii57445 = 0x0645;
- t.afii57446 = 0x0646;
- t.afii57448 = 0x0648;
- t.afii57449 = 0x0649;
- t.afii57450 = 0x064a;
- t.afii57451 = 0x064b;
- t.afii57452 = 0x064c;
- t.afii57453 = 0x064d;
- t.afii57454 = 0x064e;
- t.afii57455 = 0x064f;
- t.afii57456 = 0x0650;
- t.afii57457 = 0x0651;
- t.afii57458 = 0x0652;
- t.afii57470 = 0x0647;
- t.afii57505 = 0x06a4;
- t.afii57506 = 0x067e;
- t.afii57507 = 0x0686;
- t.afii57508 = 0x0698;
- t.afii57509 = 0x06af;
- t.afii57511 = 0x0679;
- t.afii57512 = 0x0688;
- t.afii57513 = 0x0691;
- t.afii57514 = 0x06ba;
- t.afii57519 = 0x06d2;
- t.afii57534 = 0x06d5;
- t.afii57636 = 0x20aa;
- t.afii57645 = 0x05be;
- t.afii57658 = 0x05c3;
- t.afii57664 = 0x05d0;
- t.afii57665 = 0x05d1;
- t.afii57666 = 0x05d2;
- t.afii57667 = 0x05d3;
- t.afii57668 = 0x05d4;
- t.afii57669 = 0x05d5;
- t.afii57670 = 0x05d6;
- t.afii57671 = 0x05d7;
- t.afii57672 = 0x05d8;
- t.afii57673 = 0x05d9;
- t.afii57674 = 0x05da;
- t.afii57675 = 0x05db;
- t.afii57676 = 0x05dc;
- t.afii57677 = 0x05dd;
- t.afii57678 = 0x05de;
- t.afii57679 = 0x05df;
- t.afii57680 = 0x05e0;
- t.afii57681 = 0x05e1;
- t.afii57682 = 0x05e2;
- t.afii57683 = 0x05e3;
- t.afii57684 = 0x05e4;
- t.afii57685 = 0x05e5;
- t.afii57686 = 0x05e6;
- t.afii57687 = 0x05e7;
- t.afii57688 = 0x05e8;
- t.afii57689 = 0x05e9;
- t.afii57690 = 0x05ea;
- t.afii57694 = 0xfb2a;
- t.afii57695 = 0xfb2b;
- t.afii57700 = 0xfb4b;
- t.afii57705 = 0xfb1f;
- t.afii57716 = 0x05f0;
- t.afii57717 = 0x05f1;
- t.afii57718 = 0x05f2;
- t.afii57723 = 0xfb35;
- t.afii57793 = 0x05b4;
- t.afii57794 = 0x05b5;
- t.afii57795 = 0x05b6;
- t.afii57796 = 0x05bb;
- t.afii57797 = 0x05b8;
- t.afii57798 = 0x05b7;
- t.afii57799 = 0x05b0;
- t.afii57800 = 0x05b2;
- t.afii57801 = 0x05b1;
- t.afii57802 = 0x05b3;
- t.afii57803 = 0x05c2;
- t.afii57804 = 0x05c1;
- t.afii57806 = 0x05b9;
- t.afii57807 = 0x05bc;
- t.afii57839 = 0x05bd;
- t.afii57841 = 0x05bf;
- t.afii57842 = 0x05c0;
- t.afii57929 = 0x02bc;
- t.afii61248 = 0x2105;
- t.afii61289 = 0x2113;
- t.afii61352 = 0x2116;
- t.afii61573 = 0x202c;
- t.afii61574 = 0x202d;
- t.afii61575 = 0x202e;
- t.afii61664 = 0x200c;
- t.afii63167 = 0x066d;
- t.afii64937 = 0x02bd;
- t.agrave = 0x00e0;
- t.agujarati = 0x0a85;
- t.agurmukhi = 0x0a05;
- t.ahiragana = 0x3042;
- t.ahookabove = 0x1ea3;
- t.aibengali = 0x0990;
- t.aibopomofo = 0x311e;
- t.aideva = 0x0910;
- t.aiecyrillic = 0x04d5;
- t.aigujarati = 0x0a90;
- t.aigurmukhi = 0x0a10;
- t.aimatragurmukhi = 0x0a48;
- t.ainarabic = 0x0639;
- t.ainfinalarabic = 0xfeca;
- t.aininitialarabic = 0xfecb;
- t.ainmedialarabic = 0xfecc;
- t.ainvertedbreve = 0x0203;
- t.aivowelsignbengali = 0x09c8;
- t.aivowelsigndeva = 0x0948;
- t.aivowelsigngujarati = 0x0ac8;
- t.akatakana = 0x30a2;
- t.akatakanahalfwidth = 0xff71;
- t.akorean = 0x314f;
- t.alef = 0x05d0;
- t.alefarabic = 0x0627;
- t.alefdageshhebrew = 0xfb30;
- t.aleffinalarabic = 0xfe8e;
- t.alefhamzaabovearabic = 0x0623;
- t.alefhamzaabovefinalarabic = 0xfe84;
- t.alefhamzabelowarabic = 0x0625;
- t.alefhamzabelowfinalarabic = 0xfe88;
- t.alefhebrew = 0x05d0;
- t.aleflamedhebrew = 0xfb4f;
- t.alefmaddaabovearabic = 0x0622;
- t.alefmaddaabovefinalarabic = 0xfe82;
- t.alefmaksuraarabic = 0x0649;
- t.alefmaksurafinalarabic = 0xfef0;
- t.alefmaksurainitialarabic = 0xfef3;
- t.alefmaksuramedialarabic = 0xfef4;
- t.alefpatahhebrew = 0xfb2e;
- t.alefqamatshebrew = 0xfb2f;
- t.aleph = 0x2135;
- t.allequal = 0x224c;
- t.alpha = 0x03b1;
- t.alphatonos = 0x03ac;
- t.amacron = 0x0101;
- t.amonospace = 0xff41;
- t.ampersand = 0x0026;
- t.ampersandmonospace = 0xff06;
- t.ampersandsmall = 0xf726;
- t.amsquare = 0x33c2;
- t.anbopomofo = 0x3122;
- t.angbopomofo = 0x3124;
- t.angbracketleft = 0x3008;
- t.angbracketright = 0x3009;
- t.angkhankhuthai = 0x0e5a;
- t.angle = 0x2220;
- t.anglebracketleft = 0x3008;
- t.anglebracketleftvertical = 0xfe3f;
- t.anglebracketright = 0x3009;
- t.anglebracketrightvertical = 0xfe40;
- t.angleleft = 0x2329;
- t.angleright = 0x232a;
- t.angstrom = 0x212b;
- t.anoteleia = 0x0387;
- t.anudattadeva = 0x0952;
- t.anusvarabengali = 0x0982;
- t.anusvaradeva = 0x0902;
- t.anusvaragujarati = 0x0a82;
- t.aogonek = 0x0105;
- t.apaatosquare = 0x3300;
- t.aparen = 0x249c;
- t.apostrophearmenian = 0x055a;
- t.apostrophemod = 0x02bc;
- t.apple = 0xf8ff;
- t.approaches = 0x2250;
- t.approxequal = 0x2248;
- t.approxequalorimage = 0x2252;
- t.approximatelyequal = 0x2245;
- t.araeaekorean = 0x318e;
- t.araeakorean = 0x318d;
- t.arc = 0x2312;
- t.arighthalfring = 0x1e9a;
- t.aring = 0x00e5;
- t.aringacute = 0x01fb;
- t.aringbelow = 0x1e01;
- t.arrowboth = 0x2194;
- t.arrowdashdown = 0x21e3;
- t.arrowdashleft = 0x21e0;
- t.arrowdashright = 0x21e2;
- t.arrowdashup = 0x21e1;
- t.arrowdblboth = 0x21d4;
- t.arrowdbldown = 0x21d3;
- t.arrowdblleft = 0x21d0;
- t.arrowdblright = 0x21d2;
- t.arrowdblup = 0x21d1;
- t.arrowdown = 0x2193;
- t.arrowdownleft = 0x2199;
- t.arrowdownright = 0x2198;
- t.arrowdownwhite = 0x21e9;
- t.arrowheaddownmod = 0x02c5;
- t.arrowheadleftmod = 0x02c2;
- t.arrowheadrightmod = 0x02c3;
- t.arrowheadupmod = 0x02c4;
- t.arrowhorizex = 0xf8e7;
- t.arrowleft = 0x2190;
- t.arrowleftdbl = 0x21d0;
- t.arrowleftdblstroke = 0x21cd;
- t.arrowleftoverright = 0x21c6;
- t.arrowleftwhite = 0x21e6;
- t.arrowright = 0x2192;
- t.arrowrightdblstroke = 0x21cf;
- t.arrowrightheavy = 0x279e;
- t.arrowrightoverleft = 0x21c4;
- t.arrowrightwhite = 0x21e8;
- t.arrowtableft = 0x21e4;
- t.arrowtabright = 0x21e5;
- t.arrowup = 0x2191;
- t.arrowupdn = 0x2195;
- t.arrowupdnbse = 0x21a8;
- t.arrowupdownbase = 0x21a8;
- t.arrowupleft = 0x2196;
- t.arrowupleftofdown = 0x21c5;
- t.arrowupright = 0x2197;
- t.arrowupwhite = 0x21e7;
- t.arrowvertex = 0xf8e6;
- t.asciicircum = 0x005e;
- t.asciicircummonospace = 0xff3e;
- t.asciitilde = 0x007e;
- t.asciitildemonospace = 0xff5e;
- t.ascript = 0x0251;
- t.ascriptturned = 0x0252;
- t.asmallhiragana = 0x3041;
- t.asmallkatakana = 0x30a1;
- t.asmallkatakanahalfwidth = 0xff67;
- t.asterisk = 0x002a;
- t.asteriskaltonearabic = 0x066d;
- t.asteriskarabic = 0x066d;
- t.asteriskmath = 0x2217;
- t.asteriskmonospace = 0xff0a;
- t.asterisksmall = 0xfe61;
- t.asterism = 0x2042;
- t.asuperior = 0xf6e9;
- t.asymptoticallyequal = 0x2243;
- t.at = 0x0040;
- t.atilde = 0x00e3;
- t.atmonospace = 0xff20;
- t.atsmall = 0xfe6b;
- t.aturned = 0x0250;
- t.aubengali = 0x0994;
- t.aubopomofo = 0x3120;
- t.audeva = 0x0914;
- t.augujarati = 0x0a94;
- t.augurmukhi = 0x0a14;
- t.aulengthmarkbengali = 0x09d7;
- t.aumatragurmukhi = 0x0a4c;
- t.auvowelsignbengali = 0x09cc;
- t.auvowelsigndeva = 0x094c;
- t.auvowelsigngujarati = 0x0acc;
- t.avagrahadeva = 0x093d;
- t.aybarmenian = 0x0561;
- t.ayin = 0x05e2;
- t.ayinaltonehebrew = 0xfb20;
- t.ayinhebrew = 0x05e2;
- t.b = 0x0062;
- t.babengali = 0x09ac;
- t.backslash = 0x005c;
- t.backslashmonospace = 0xff3c;
- t.badeva = 0x092c;
- t.bagujarati = 0x0aac;
- t.bagurmukhi = 0x0a2c;
- t.bahiragana = 0x3070;
- t.bahtthai = 0x0e3f;
- t.bakatakana = 0x30d0;
- t.bar = 0x007c;
- t.barmonospace = 0xff5c;
- t.bbopomofo = 0x3105;
- t.bcircle = 0x24d1;
- t.bdotaccent = 0x1e03;
- t.bdotbelow = 0x1e05;
- t.beamedsixteenthnotes = 0x266c;
- t.because = 0x2235;
- t.becyrillic = 0x0431;
- t.beharabic = 0x0628;
- t.behfinalarabic = 0xfe90;
- t.behinitialarabic = 0xfe91;
- t.behiragana = 0x3079;
- t.behmedialarabic = 0xfe92;
- t.behmeeminitialarabic = 0xfc9f;
- t.behmeemisolatedarabic = 0xfc08;
- t.behnoonfinalarabic = 0xfc6d;
- t.bekatakana = 0x30d9;
- t.benarmenian = 0x0562;
- t.bet = 0x05d1;
- t.beta = 0x03b2;
- t.betasymbolgreek = 0x03d0;
- t.betdagesh = 0xfb31;
- t.betdageshhebrew = 0xfb31;
- t.bethebrew = 0x05d1;
- t.betrafehebrew = 0xfb4c;
- t.bhabengali = 0x09ad;
- t.bhadeva = 0x092d;
- t.bhagujarati = 0x0aad;
- t.bhagurmukhi = 0x0a2d;
- t.bhook = 0x0253;
- t.bihiragana = 0x3073;
- t.bikatakana = 0x30d3;
- t.bilabialclick = 0x0298;
- t.bindigurmukhi = 0x0a02;
- t.birusquare = 0x3331;
- t.blackcircle = 0x25cf;
- t.blackdiamond = 0x25c6;
- t.blackdownpointingtriangle = 0x25bc;
- t.blackleftpointingpointer = 0x25c4;
- t.blackleftpointingtriangle = 0x25c0;
- t.blacklenticularbracketleft = 0x3010;
- t.blacklenticularbracketleftvertical = 0xfe3b;
- t.blacklenticularbracketright = 0x3011;
- t.blacklenticularbracketrightvertical = 0xfe3c;
- t.blacklowerlefttriangle = 0x25e3;
- t.blacklowerrighttriangle = 0x25e2;
- t.blackrectangle = 0x25ac;
- t.blackrightpointingpointer = 0x25ba;
- t.blackrightpointingtriangle = 0x25b6;
- t.blacksmallsquare = 0x25aa;
- t.blacksmilingface = 0x263b;
- t.blacksquare = 0x25a0;
- t.blackstar = 0x2605;
- t.blackupperlefttriangle = 0x25e4;
- t.blackupperrighttriangle = 0x25e5;
- t.blackuppointingsmalltriangle = 0x25b4;
- t.blackuppointingtriangle = 0x25b2;
- t.blank = 0x2423;
- t.blinebelow = 0x1e07;
- t.block = 0x2588;
- t.bmonospace = 0xff42;
- t.bobaimaithai = 0x0e1a;
- t.bohiragana = 0x307c;
- t.bokatakana = 0x30dc;
- t.bparen = 0x249d;
- t.bqsquare = 0x33c3;
- t.braceex = 0xf8f4;
- t.braceleft = 0x007b;
- t.braceleftbt = 0xf8f3;
- t.braceleftmid = 0xf8f2;
- t.braceleftmonospace = 0xff5b;
- t.braceleftsmall = 0xfe5b;
- t.bracelefttp = 0xf8f1;
- t.braceleftvertical = 0xfe37;
- t.braceright = 0x007d;
- t.bracerightbt = 0xf8fe;
- t.bracerightmid = 0xf8fd;
- t.bracerightmonospace = 0xff5d;
- t.bracerightsmall = 0xfe5c;
- t.bracerighttp = 0xf8fc;
- t.bracerightvertical = 0xfe38;
- t.bracketleft = 0x005b;
- t.bracketleftbt = 0xf8f0;
- t.bracketleftex = 0xf8ef;
- t.bracketleftmonospace = 0xff3b;
- t.bracketlefttp = 0xf8ee;
- t.bracketright = 0x005d;
- t.bracketrightbt = 0xf8fb;
- t.bracketrightex = 0xf8fa;
- t.bracketrightmonospace = 0xff3d;
- t.bracketrighttp = 0xf8f9;
- t.breve = 0x02d8;
- t.brevebelowcmb = 0x032e;
- t.brevecmb = 0x0306;
- t.breveinvertedbelowcmb = 0x032f;
- t.breveinvertedcmb = 0x0311;
- t.breveinverteddoublecmb = 0x0361;
- t.bridgebelowcmb = 0x032a;
- t.bridgeinvertedbelowcmb = 0x033a;
- t.brokenbar = 0x00a6;
- t.bstroke = 0x0180;
- t.bsuperior = 0xf6ea;
- t.btopbar = 0x0183;
- t.buhiragana = 0x3076;
- t.bukatakana = 0x30d6;
- t.bullet = 0x2022;
- t.bulletinverse = 0x25d8;
- t.bulletoperator = 0x2219;
- t.bullseye = 0x25ce;
- t.c = 0x0063;
- t.caarmenian = 0x056e;
- t.cabengali = 0x099a;
- t.cacute = 0x0107;
- t.cadeva = 0x091a;
- t.cagujarati = 0x0a9a;
- t.cagurmukhi = 0x0a1a;
- t.calsquare = 0x3388;
- t.candrabindubengali = 0x0981;
- t.candrabinducmb = 0x0310;
- t.candrabindudeva = 0x0901;
- t.candrabindugujarati = 0x0a81;
- t.capslock = 0x21ea;
- t.careof = 0x2105;
- t.caron = 0x02c7;
- t.caronbelowcmb = 0x032c;
- t.caroncmb = 0x030c;
- t.carriagereturn = 0x21b5;
- t.cbopomofo = 0x3118;
- t.ccaron = 0x010d;
- t.ccedilla = 0x00e7;
- t.ccedillaacute = 0x1e09;
- t.ccircle = 0x24d2;
- t.ccircumflex = 0x0109;
- t.ccurl = 0x0255;
- t.cdot = 0x010b;
- t.cdotaccent = 0x010b;
- t.cdsquare = 0x33c5;
- t.cedilla = 0x00b8;
- t.cedillacmb = 0x0327;
- t.cent = 0x00a2;
- t.centigrade = 0x2103;
- t.centinferior = 0xf6df;
- t.centmonospace = 0xffe0;
- t.centoldstyle = 0xf7a2;
- t.centsuperior = 0xf6e0;
- t.chaarmenian = 0x0579;
- t.chabengali = 0x099b;
- t.chadeva = 0x091b;
- t.chagujarati = 0x0a9b;
- t.chagurmukhi = 0x0a1b;
- t.chbopomofo = 0x3114;
- t.cheabkhasiancyrillic = 0x04bd;
- t.checkmark = 0x2713;
- t.checyrillic = 0x0447;
- t.chedescenderabkhasiancyrillic = 0x04bf;
- t.chedescendercyrillic = 0x04b7;
- t.chedieresiscyrillic = 0x04f5;
- t.cheharmenian = 0x0573;
- t.chekhakassiancyrillic = 0x04cc;
- t.cheverticalstrokecyrillic = 0x04b9;
- t.chi = 0x03c7;
- t.chieuchacirclekorean = 0x3277;
- t.chieuchaparenkorean = 0x3217;
- t.chieuchcirclekorean = 0x3269;
- t.chieuchkorean = 0x314a;
- t.chieuchparenkorean = 0x3209;
- t.chochangthai = 0x0e0a;
- t.chochanthai = 0x0e08;
- t.chochingthai = 0x0e09;
- t.chochoethai = 0x0e0c;
- t.chook = 0x0188;
- t.cieucacirclekorean = 0x3276;
- t.cieucaparenkorean = 0x3216;
- t.cieuccirclekorean = 0x3268;
- t.cieuckorean = 0x3148;
- t.cieucparenkorean = 0x3208;
- t.cieucuparenkorean = 0x321c;
- t.circle = 0x25cb;
- t.circlecopyrt = 0x00a9;
- t.circlemultiply = 0x2297;
- t.circleot = 0x2299;
- t.circleplus = 0x2295;
- t.circlepostalmark = 0x3036;
- t.circlewithlefthalfblack = 0x25d0;
- t.circlewithrighthalfblack = 0x25d1;
- t.circumflex = 0x02c6;
- t.circumflexbelowcmb = 0x032d;
- t.circumflexcmb = 0x0302;
- t.clear = 0x2327;
- t.clickalveolar = 0x01c2;
- t.clickdental = 0x01c0;
- t.clicklateral = 0x01c1;
- t.clickretroflex = 0x01c3;
- t.club = 0x2663;
- t.clubsuitblack = 0x2663;
- t.clubsuitwhite = 0x2667;
- t.cmcubedsquare = 0x33a4;
- t.cmonospace = 0xff43;
- t.cmsquaredsquare = 0x33a0;
- t.coarmenian = 0x0581;
- t.colon = 0x003a;
- t.colonmonetary = 0x20a1;
- t.colonmonospace = 0xff1a;
- t.colonsign = 0x20a1;
- t.colonsmall = 0xfe55;
- t.colontriangularhalfmod = 0x02d1;
- t.colontriangularmod = 0x02d0;
- t.comma = 0x002c;
- t.commaabovecmb = 0x0313;
- t.commaaboverightcmb = 0x0315;
- t.commaaccent = 0xf6c3;
- t.commaarabic = 0x060c;
- t.commaarmenian = 0x055d;
- t.commainferior = 0xf6e1;
- t.commamonospace = 0xff0c;
- t.commareversedabovecmb = 0x0314;
- t.commareversedmod = 0x02bd;
- t.commasmall = 0xfe50;
- t.commasuperior = 0xf6e2;
- t.commaturnedabovecmb = 0x0312;
- t.commaturnedmod = 0x02bb;
- t.compass = 0x263c;
- t.congruent = 0x2245;
- t.contourintegral = 0x222e;
- t.control = 0x2303;
- t.controlACK = 0x0006;
- t.controlBEL = 0x0007;
- t.controlBS = 0x0008;
- t.controlCAN = 0x0018;
- t.controlCR = 0x000d;
- t.controlDC1 = 0x0011;
- t.controlDC2 = 0x0012;
- t.controlDC3 = 0x0013;
- t.controlDC4 = 0x0014;
- t.controlDEL = 0x007f;
- t.controlDLE = 0x0010;
- t.controlEM = 0x0019;
- t.controlENQ = 0x0005;
- t.controlEOT = 0x0004;
- t.controlESC = 0x001b;
- t.controlETB = 0x0017;
- t.controlETX = 0x0003;
- t.controlFF = 0x000c;
- t.controlFS = 0x001c;
- t.controlGS = 0x001d;
- t.controlHT = 0x0009;
- t.controlLF = 0x000a;
- t.controlNAK = 0x0015;
- t.controlNULL = 0x0000;
- t.controlRS = 0x001e;
- t.controlSI = 0x000f;
- t.controlSO = 0x000e;
- t.controlSOT = 0x0002;
- t.controlSTX = 0x0001;
- t.controlSUB = 0x001a;
- t.controlSYN = 0x0016;
- t.controlUS = 0x001f;
- t.controlVT = 0x000b;
- t.copyright = 0x00a9;
- t.copyrightsans = 0xf8e9;
- t.copyrightserif = 0xf6d9;
- t.cornerbracketleft = 0x300c;
- t.cornerbracketlefthalfwidth = 0xff62;
- t.cornerbracketleftvertical = 0xfe41;
- t.cornerbracketright = 0x300d;
- t.cornerbracketrighthalfwidth = 0xff63;
- t.cornerbracketrightvertical = 0xfe42;
- t.corporationsquare = 0x337f;
- t.cosquare = 0x33c7;
- t.coverkgsquare = 0x33c6;
- t.cparen = 0x249e;
- t.cruzeiro = 0x20a2;
- t.cstretched = 0x0297;
- t.curlyand = 0x22cf;
- t.curlyor = 0x22ce;
- t.currency = 0x00a4;
- t.cyrBreve = 0xf6d1;
- t.cyrFlex = 0xf6d2;
- t.cyrbreve = 0xf6d4;
- t.cyrflex = 0xf6d5;
- t.d = 0x0064;
- t.daarmenian = 0x0564;
- t.dabengali = 0x09a6;
- t.dadarabic = 0x0636;
- t.dadeva = 0x0926;
- t.dadfinalarabic = 0xfebe;
- t.dadinitialarabic = 0xfebf;
- t.dadmedialarabic = 0xfec0;
- t.dagesh = 0x05bc;
- t.dageshhebrew = 0x05bc;
- t.dagger = 0x2020;
- t.daggerdbl = 0x2021;
- t.dagujarati = 0x0aa6;
- t.dagurmukhi = 0x0a26;
- t.dahiragana = 0x3060;
- t.dakatakana = 0x30c0;
- t.dalarabic = 0x062f;
- t.dalet = 0x05d3;
- t.daletdagesh = 0xfb33;
- t.daletdageshhebrew = 0xfb33;
- t.dalethebrew = 0x05d3;
- t.dalfinalarabic = 0xfeaa;
- t.dammaarabic = 0x064f;
- t.dammalowarabic = 0x064f;
- t.dammatanaltonearabic = 0x064c;
- t.dammatanarabic = 0x064c;
- t.danda = 0x0964;
- t.dargahebrew = 0x05a7;
- t.dargalefthebrew = 0x05a7;
- t.dasiapneumatacyrilliccmb = 0x0485;
- t.dblGrave = 0xf6d3;
- t.dblanglebracketleft = 0x300a;
- t.dblanglebracketleftvertical = 0xfe3d;
- t.dblanglebracketright = 0x300b;
- t.dblanglebracketrightvertical = 0xfe3e;
- t.dblarchinvertedbelowcmb = 0x032b;
- t.dblarrowleft = 0x21d4;
- t.dblarrowright = 0x21d2;
- t.dbldanda = 0x0965;
- t.dblgrave = 0xf6d6;
- t.dblgravecmb = 0x030f;
- t.dblintegral = 0x222c;
- t.dbllowline = 0x2017;
- t.dbllowlinecmb = 0x0333;
- t.dbloverlinecmb = 0x033f;
- t.dblprimemod = 0x02ba;
- t.dblverticalbar = 0x2016;
- t.dblverticallineabovecmb = 0x030e;
- t.dbopomofo = 0x3109;
- t.dbsquare = 0x33c8;
- t.dcaron = 0x010f;
- t.dcedilla = 0x1e11;
- t.dcircle = 0x24d3;
- t.dcircumflexbelow = 0x1e13;
- t.dcroat = 0x0111;
- t.ddabengali = 0x09a1;
- t.ddadeva = 0x0921;
- t.ddagujarati = 0x0aa1;
- t.ddagurmukhi = 0x0a21;
- t.ddalarabic = 0x0688;
- t.ddalfinalarabic = 0xfb89;
- t.dddhadeva = 0x095c;
- t.ddhabengali = 0x09a2;
- t.ddhadeva = 0x0922;
- t.ddhagujarati = 0x0aa2;
- t.ddhagurmukhi = 0x0a22;
- t.ddotaccent = 0x1e0b;
- t.ddotbelow = 0x1e0d;
- t.decimalseparatorarabic = 0x066b;
- t.decimalseparatorpersian = 0x066b;
- t.decyrillic = 0x0434;
- t.degree = 0x00b0;
- t.dehihebrew = 0x05ad;
- t.dehiragana = 0x3067;
- t.deicoptic = 0x03ef;
- t.dekatakana = 0x30c7;
- t.deleteleft = 0x232b;
- t.deleteright = 0x2326;
- t.delta = 0x03b4;
- t.deltaturned = 0x018d;
- t.denominatorminusonenumeratorbengali = 0x09f8;
- t.dezh = 0x02a4;
- t.dhabengali = 0x09a7;
- t.dhadeva = 0x0927;
- t.dhagujarati = 0x0aa7;
- t.dhagurmukhi = 0x0a27;
- t.dhook = 0x0257;
- t.dialytikatonos = 0x0385;
- t.dialytikatonoscmb = 0x0344;
- t.diamond = 0x2666;
- t.diamondsuitwhite = 0x2662;
- t.dieresis = 0x00a8;
- t.dieresisacute = 0xf6d7;
- t.dieresisbelowcmb = 0x0324;
- t.dieresiscmb = 0x0308;
- t.dieresisgrave = 0xf6d8;
- t.dieresistonos = 0x0385;
- t.dihiragana = 0x3062;
- t.dikatakana = 0x30c2;
- t.dittomark = 0x3003;
- t.divide = 0x00f7;
- t.divides = 0x2223;
- t.divisionslash = 0x2215;
- t.djecyrillic = 0x0452;
- t.dkshade = 0x2593;
- t.dlinebelow = 0x1e0f;
- t.dlsquare = 0x3397;
- t.dmacron = 0x0111;
- t.dmonospace = 0xff44;
- t.dnblock = 0x2584;
- t.dochadathai = 0x0e0e;
- t.dodekthai = 0x0e14;
- t.dohiragana = 0x3069;
- t.dokatakana = 0x30c9;
- t.dollar = 0x0024;
- t.dollarinferior = 0xf6e3;
- t.dollarmonospace = 0xff04;
- t.dollaroldstyle = 0xf724;
- t.dollarsmall = 0xfe69;
- t.dollarsuperior = 0xf6e4;
- t.dong = 0x20ab;
- t.dorusquare = 0x3326;
- t.dotaccent = 0x02d9;
- t.dotaccentcmb = 0x0307;
- t.dotbelowcmb = 0x0323;
- t.dotbelowcomb = 0x0323;
- t.dotkatakana = 0x30fb;
- t.dotlessi = 0x0131;
- t.dotlessj = 0xf6be;
- t.dotlessjstrokehook = 0x0284;
- t.dotmath = 0x22c5;
- t.dottedcircle = 0x25cc;
- t.doubleyodpatah = 0xfb1f;
- t.doubleyodpatahhebrew = 0xfb1f;
- t.downtackbelowcmb = 0x031e;
- t.downtackmod = 0x02d5;
- t.dparen = 0x249f;
- t.dsuperior = 0xf6eb;
- t.dtail = 0x0256;
- t.dtopbar = 0x018c;
- t.duhiragana = 0x3065;
- t.dukatakana = 0x30c5;
- t.dz = 0x01f3;
- t.dzaltone = 0x02a3;
- t.dzcaron = 0x01c6;
- t.dzcurl = 0x02a5;
- t.dzeabkhasiancyrillic = 0x04e1;
- t.dzecyrillic = 0x0455;
- t.dzhecyrillic = 0x045f;
- t.e = 0x0065;
- t.eacute = 0x00e9;
- t.earth = 0x2641;
- t.ebengali = 0x098f;
- t.ebopomofo = 0x311c;
- t.ebreve = 0x0115;
- t.ecandradeva = 0x090d;
- t.ecandragujarati = 0x0a8d;
- t.ecandravowelsigndeva = 0x0945;
- t.ecandravowelsigngujarati = 0x0ac5;
- t.ecaron = 0x011b;
- t.ecedillabreve = 0x1e1d;
- t.echarmenian = 0x0565;
- t.echyiwnarmenian = 0x0587;
- t.ecircle = 0x24d4;
- t.ecircumflex = 0x00ea;
- t.ecircumflexacute = 0x1ebf;
- t.ecircumflexbelow = 0x1e19;
- t.ecircumflexdotbelow = 0x1ec7;
- t.ecircumflexgrave = 0x1ec1;
- t.ecircumflexhookabove = 0x1ec3;
- t.ecircumflextilde = 0x1ec5;
- t.ecyrillic = 0x0454;
- t.edblgrave = 0x0205;
- t.edeva = 0x090f;
- t.edieresis = 0x00eb;
- t.edot = 0x0117;
- t.edotaccent = 0x0117;
- t.edotbelow = 0x1eb9;
- t.eegurmukhi = 0x0a0f;
- t.eematragurmukhi = 0x0a47;
- t.efcyrillic = 0x0444;
- t.egrave = 0x00e8;
- t.egujarati = 0x0a8f;
- t.eharmenian = 0x0567;
- t.ehbopomofo = 0x311d;
- t.ehiragana = 0x3048;
- t.ehookabove = 0x1ebb;
- t.eibopomofo = 0x311f;
- t.eight = 0x0038;
- t.eightarabic = 0x0668;
- t.eightbengali = 0x09ee;
- t.eightcircle = 0x2467;
- t.eightcircleinversesansserif = 0x2791;
- t.eightdeva = 0x096e;
- t.eighteencircle = 0x2471;
- t.eighteenparen = 0x2485;
- t.eighteenperiod = 0x2499;
- t.eightgujarati = 0x0aee;
- t.eightgurmukhi = 0x0a6e;
- t.eighthackarabic = 0x0668;
- t.eighthangzhou = 0x3028;
- t.eighthnotebeamed = 0x266b;
- t.eightideographicparen = 0x3227;
- t.eightinferior = 0x2088;
- t.eightmonospace = 0xff18;
- t.eightoldstyle = 0xf738;
- t.eightparen = 0x247b;
- t.eightperiod = 0x248f;
- t.eightpersian = 0x06f8;
- t.eightroman = 0x2177;
- t.eightsuperior = 0x2078;
- t.eightthai = 0x0e58;
- t.einvertedbreve = 0x0207;
- t.eiotifiedcyrillic = 0x0465;
- t.ekatakana = 0x30a8;
- t.ekatakanahalfwidth = 0xff74;
- t.ekonkargurmukhi = 0x0a74;
- t.ekorean = 0x3154;
- t.elcyrillic = 0x043b;
- t.element = 0x2208;
- t.elevencircle = 0x246a;
- t.elevenparen = 0x247e;
- t.elevenperiod = 0x2492;
- t.elevenroman = 0x217a;
- t.ellipsis = 0x2026;
- t.ellipsisvertical = 0x22ee;
- t.emacron = 0x0113;
- t.emacronacute = 0x1e17;
- t.emacrongrave = 0x1e15;
- t.emcyrillic = 0x043c;
- t.emdash = 0x2014;
- t.emdashvertical = 0xfe31;
- t.emonospace = 0xff45;
- t.emphasismarkarmenian = 0x055b;
- t.emptyset = 0x2205;
- t.enbopomofo = 0x3123;
- t.encyrillic = 0x043d;
- t.endash = 0x2013;
- t.endashvertical = 0xfe32;
- t.endescendercyrillic = 0x04a3;
- t.eng = 0x014b;
- t.engbopomofo = 0x3125;
- t.enghecyrillic = 0x04a5;
- t.enhookcyrillic = 0x04c8;
- t.enspace = 0x2002;
- t.eogonek = 0x0119;
- t.eokorean = 0x3153;
- t.eopen = 0x025b;
- t.eopenclosed = 0x029a;
- t.eopenreversed = 0x025c;
- t.eopenreversedclosed = 0x025e;
- t.eopenreversedhook = 0x025d;
- t.eparen = 0x24a0;
- t.epsilon = 0x03b5;
- t.epsilontonos = 0x03ad;
- t.equal = 0x003d;
- t.equalmonospace = 0xff1d;
- t.equalsmall = 0xfe66;
- t.equalsuperior = 0x207c;
- t.equivalence = 0x2261;
- t.erbopomofo = 0x3126;
- t.ercyrillic = 0x0440;
- t.ereversed = 0x0258;
- t.ereversedcyrillic = 0x044d;
- t.escyrillic = 0x0441;
- t.esdescendercyrillic = 0x04ab;
- t.esh = 0x0283;
- t.eshcurl = 0x0286;
- t.eshortdeva = 0x090e;
- t.eshortvowelsigndeva = 0x0946;
- t.eshreversedloop = 0x01aa;
- t.eshsquatreversed = 0x0285;
- t.esmallhiragana = 0x3047;
- t.esmallkatakana = 0x30a7;
- t.esmallkatakanahalfwidth = 0xff6a;
- t.estimated = 0x212e;
- t.esuperior = 0xf6ec;
- t.eta = 0x03b7;
- t.etarmenian = 0x0568;
- t.etatonos = 0x03ae;
- t.eth = 0x00f0;
- t.etilde = 0x1ebd;
- t.etildebelow = 0x1e1b;
- t.etnahtafoukhhebrew = 0x0591;
- t.etnahtafoukhlefthebrew = 0x0591;
- t.etnahtahebrew = 0x0591;
- t.etnahtalefthebrew = 0x0591;
- t.eturned = 0x01dd;
- t.eukorean = 0x3161;
- t.euro = 0x20ac;
- t.evowelsignbengali = 0x09c7;
- t.evowelsigndeva = 0x0947;
- t.evowelsigngujarati = 0x0ac7;
- t.exclam = 0x0021;
- t.exclamarmenian = 0x055c;
- t.exclamdbl = 0x203c;
- t.exclamdown = 0x00a1;
- t.exclamdownsmall = 0xf7a1;
- t.exclammonospace = 0xff01;
- t.exclamsmall = 0xf721;
- t.existential = 0x2203;
- t.ezh = 0x0292;
- t.ezhcaron = 0x01ef;
- t.ezhcurl = 0x0293;
- t.ezhreversed = 0x01b9;
- t.ezhtail = 0x01ba;
- t.f = 0x0066;
- t.fadeva = 0x095e;
- t.fagurmukhi = 0x0a5e;
- t.fahrenheit = 0x2109;
- t.fathaarabic = 0x064e;
- t.fathalowarabic = 0x064e;
- t.fathatanarabic = 0x064b;
- t.fbopomofo = 0x3108;
- t.fcircle = 0x24d5;
- t.fdotaccent = 0x1e1f;
- t.feharabic = 0x0641;
- t.feharmenian = 0x0586;
- t.fehfinalarabic = 0xfed2;
- t.fehinitialarabic = 0xfed3;
- t.fehmedialarabic = 0xfed4;
- t.feicoptic = 0x03e5;
- t.female = 0x2640;
- t.ff = 0xfb00;
- t.f_f = 0xfb00;
- t.ffi = 0xfb03;
- t.ffl = 0xfb04;
- t.fi = 0xfb01;
- t.fifteencircle = 0x246e;
- t.fifteenparen = 0x2482;
- t.fifteenperiod = 0x2496;
- t.figuredash = 0x2012;
- t.filledbox = 0x25a0;
- t.filledrect = 0x25ac;
- t.finalkaf = 0x05da;
- t.finalkafdagesh = 0xfb3a;
- t.finalkafdageshhebrew = 0xfb3a;
- t.finalkafhebrew = 0x05da;
- t.finalmem = 0x05dd;
- t.finalmemhebrew = 0x05dd;
- t.finalnun = 0x05df;
- t.finalnunhebrew = 0x05df;
- t.finalpe = 0x05e3;
- t.finalpehebrew = 0x05e3;
- t.finaltsadi = 0x05e5;
- t.finaltsadihebrew = 0x05e5;
- t.firsttonechinese = 0x02c9;
- t.fisheye = 0x25c9;
- t.fitacyrillic = 0x0473;
- t.five = 0x0035;
- t.fivearabic = 0x0665;
- t.fivebengali = 0x09eb;
- t.fivecircle = 0x2464;
- t.fivecircleinversesansserif = 0x278e;
- t.fivedeva = 0x096b;
- t.fiveeighths = 0x215d;
- t.fivegujarati = 0x0aeb;
- t.fivegurmukhi = 0x0a6b;
- t.fivehackarabic = 0x0665;
- t.fivehangzhou = 0x3025;
- t.fiveideographicparen = 0x3224;
- t.fiveinferior = 0x2085;
- t.fivemonospace = 0xff15;
- t.fiveoldstyle = 0xf735;
- t.fiveparen = 0x2478;
- t.fiveperiod = 0x248c;
- t.fivepersian = 0x06f5;
- t.fiveroman = 0x2174;
- t.fivesuperior = 0x2075;
- t.fivethai = 0x0e55;
- t.fl = 0xfb02;
- t.florin = 0x0192;
- t.fmonospace = 0xff46;
- t.fmsquare = 0x3399;
- t.fofanthai = 0x0e1f;
- t.fofathai = 0x0e1d;
- t.fongmanthai = 0x0e4f;
- t.forall = 0x2200;
- t.four = 0x0034;
- t.fourarabic = 0x0664;
- t.fourbengali = 0x09ea;
- t.fourcircle = 0x2463;
- t.fourcircleinversesansserif = 0x278d;
- t.fourdeva = 0x096a;
- t.fourgujarati = 0x0aea;
- t.fourgurmukhi = 0x0a6a;
- t.fourhackarabic = 0x0664;
- t.fourhangzhou = 0x3024;
- t.fourideographicparen = 0x3223;
- t.fourinferior = 0x2084;
- t.fourmonospace = 0xff14;
- t.fournumeratorbengali = 0x09f7;
- t.fouroldstyle = 0xf734;
- t.fourparen = 0x2477;
- t.fourperiod = 0x248b;
- t.fourpersian = 0x06f4;
- t.fourroman = 0x2173;
- t.foursuperior = 0x2074;
- t.fourteencircle = 0x246d;
- t.fourteenparen = 0x2481;
- t.fourteenperiod = 0x2495;
- t.fourthai = 0x0e54;
- t.fourthtonechinese = 0x02cb;
- t.fparen = 0x24a1;
- t.fraction = 0x2044;
- t.franc = 0x20a3;
- t.g = 0x0067;
- t.gabengali = 0x0997;
- t.gacute = 0x01f5;
- t.gadeva = 0x0917;
- t.gafarabic = 0x06af;
- t.gaffinalarabic = 0xfb93;
- t.gafinitialarabic = 0xfb94;
- t.gafmedialarabic = 0xfb95;
- t.gagujarati = 0x0a97;
- t.gagurmukhi = 0x0a17;
- t.gahiragana = 0x304c;
- t.gakatakana = 0x30ac;
- t.gamma = 0x03b3;
- t.gammalatinsmall = 0x0263;
- t.gammasuperior = 0x02e0;
- t.gangiacoptic = 0x03eb;
- t.gbopomofo = 0x310d;
- t.gbreve = 0x011f;
- t.gcaron = 0x01e7;
- t.gcedilla = 0x0123;
- t.gcircle = 0x24d6;
- t.gcircumflex = 0x011d;
- t.gcommaaccent = 0x0123;
- t.gdot = 0x0121;
- t.gdotaccent = 0x0121;
- t.gecyrillic = 0x0433;
- t.gehiragana = 0x3052;
- t.gekatakana = 0x30b2;
- t.geometricallyequal = 0x2251;
- t.gereshaccenthebrew = 0x059c;
- t.gereshhebrew = 0x05f3;
- t.gereshmuqdamhebrew = 0x059d;
- t.germandbls = 0x00df;
- t.gershayimaccenthebrew = 0x059e;
- t.gershayimhebrew = 0x05f4;
- t.getamark = 0x3013;
- t.ghabengali = 0x0998;
- t.ghadarmenian = 0x0572;
- t.ghadeva = 0x0918;
- t.ghagujarati = 0x0a98;
- t.ghagurmukhi = 0x0a18;
- t.ghainarabic = 0x063a;
- t.ghainfinalarabic = 0xfece;
- t.ghaininitialarabic = 0xfecf;
- t.ghainmedialarabic = 0xfed0;
- t.ghemiddlehookcyrillic = 0x0495;
- t.ghestrokecyrillic = 0x0493;
- t.gheupturncyrillic = 0x0491;
- t.ghhadeva = 0x095a;
- t.ghhagurmukhi = 0x0a5a;
- t.ghook = 0x0260;
- t.ghzsquare = 0x3393;
- t.gihiragana = 0x304e;
- t.gikatakana = 0x30ae;
- t.gimarmenian = 0x0563;
- t.gimel = 0x05d2;
- t.gimeldagesh = 0xfb32;
- t.gimeldageshhebrew = 0xfb32;
- t.gimelhebrew = 0x05d2;
- t.gjecyrillic = 0x0453;
- t.glottalinvertedstroke = 0x01be;
- t.glottalstop = 0x0294;
- t.glottalstopinverted = 0x0296;
- t.glottalstopmod = 0x02c0;
- t.glottalstopreversed = 0x0295;
- t.glottalstopreversedmod = 0x02c1;
- t.glottalstopreversedsuperior = 0x02e4;
- t.glottalstopstroke = 0x02a1;
- t.glottalstopstrokereversed = 0x02a2;
- t.gmacron = 0x1e21;
- t.gmonospace = 0xff47;
- t.gohiragana = 0x3054;
- t.gokatakana = 0x30b4;
- t.gparen = 0x24a2;
- t.gpasquare = 0x33ac;
- t.gradient = 0x2207;
- t.grave = 0x0060;
- t.gravebelowcmb = 0x0316;
- t.gravecmb = 0x0300;
- t.gravecomb = 0x0300;
- t.gravedeva = 0x0953;
- t.gravelowmod = 0x02ce;
- t.gravemonospace = 0xff40;
- t.gravetonecmb = 0x0340;
- t.greater = 0x003e;
- t.greaterequal = 0x2265;
- t.greaterequalorless = 0x22db;
- t.greatermonospace = 0xff1e;
- t.greaterorequivalent = 0x2273;
- t.greaterorless = 0x2277;
- t.greateroverequal = 0x2267;
- t.greatersmall = 0xfe65;
- t.gscript = 0x0261;
- t.gstroke = 0x01e5;
- t.guhiragana = 0x3050;
- t.guillemotleft = 0x00ab;
- t.guillemotright = 0x00bb;
- t.guilsinglleft = 0x2039;
- t.guilsinglright = 0x203a;
- t.gukatakana = 0x30b0;
- t.guramusquare = 0x3318;
- t.gysquare = 0x33c9;
- t.h = 0x0068;
- t.haabkhasiancyrillic = 0x04a9;
- t.haaltonearabic = 0x06c1;
- t.habengali = 0x09b9;
- t.hadescendercyrillic = 0x04b3;
- t.hadeva = 0x0939;
- t.hagujarati = 0x0ab9;
- t.hagurmukhi = 0x0a39;
- t.haharabic = 0x062d;
- t.hahfinalarabic = 0xfea2;
- t.hahinitialarabic = 0xfea3;
- t.hahiragana = 0x306f;
- t.hahmedialarabic = 0xfea4;
- t.haitusquare = 0x332a;
- t.hakatakana = 0x30cf;
- t.hakatakanahalfwidth = 0xff8a;
- t.halantgurmukhi = 0x0a4d;
- t.hamzaarabic = 0x0621;
- t.hamzalowarabic = 0x0621;
- t.hangulfiller = 0x3164;
- t.hardsigncyrillic = 0x044a;
- t.harpoonleftbarbup = 0x21bc;
- t.harpoonrightbarbup = 0x21c0;
- t.hasquare = 0x33ca;
- t.hatafpatah = 0x05b2;
- t.hatafpatah16 = 0x05b2;
- t.hatafpatah23 = 0x05b2;
- t.hatafpatah2f = 0x05b2;
- t.hatafpatahhebrew = 0x05b2;
- t.hatafpatahnarrowhebrew = 0x05b2;
- t.hatafpatahquarterhebrew = 0x05b2;
- t.hatafpatahwidehebrew = 0x05b2;
- t.hatafqamats = 0x05b3;
- t.hatafqamats1b = 0x05b3;
- t.hatafqamats28 = 0x05b3;
- t.hatafqamats34 = 0x05b3;
- t.hatafqamatshebrew = 0x05b3;
- t.hatafqamatsnarrowhebrew = 0x05b3;
- t.hatafqamatsquarterhebrew = 0x05b3;
- t.hatafqamatswidehebrew = 0x05b3;
- t.hatafsegol = 0x05b1;
- t.hatafsegol17 = 0x05b1;
- t.hatafsegol24 = 0x05b1;
- t.hatafsegol30 = 0x05b1;
- t.hatafsegolhebrew = 0x05b1;
- t.hatafsegolnarrowhebrew = 0x05b1;
- t.hatafsegolquarterhebrew = 0x05b1;
- t.hatafsegolwidehebrew = 0x05b1;
- t.hbar = 0x0127;
- t.hbopomofo = 0x310f;
- t.hbrevebelow = 0x1e2b;
- t.hcedilla = 0x1e29;
- t.hcircle = 0x24d7;
- t.hcircumflex = 0x0125;
- t.hdieresis = 0x1e27;
- t.hdotaccent = 0x1e23;
- t.hdotbelow = 0x1e25;
- t.he = 0x05d4;
- t.heart = 0x2665;
- t.heartsuitblack = 0x2665;
- t.heartsuitwhite = 0x2661;
- t.hedagesh = 0xfb34;
- t.hedageshhebrew = 0xfb34;
- t.hehaltonearabic = 0x06c1;
- t.heharabic = 0x0647;
- t.hehebrew = 0x05d4;
- t.hehfinalaltonearabic = 0xfba7;
- t.hehfinalalttwoarabic = 0xfeea;
- t.hehfinalarabic = 0xfeea;
- t.hehhamzaabovefinalarabic = 0xfba5;
- t.hehhamzaaboveisolatedarabic = 0xfba4;
- t.hehinitialaltonearabic = 0xfba8;
- t.hehinitialarabic = 0xfeeb;
- t.hehiragana = 0x3078;
- t.hehmedialaltonearabic = 0xfba9;
- t.hehmedialarabic = 0xfeec;
- t.heiseierasquare = 0x337b;
- t.hekatakana = 0x30d8;
- t.hekatakanahalfwidth = 0xff8d;
- t.hekutaarusquare = 0x3336;
- t.henghook = 0x0267;
- t.herutusquare = 0x3339;
- t.het = 0x05d7;
- t.hethebrew = 0x05d7;
- t.hhook = 0x0266;
- t.hhooksuperior = 0x02b1;
- t.hieuhacirclekorean = 0x327b;
- t.hieuhaparenkorean = 0x321b;
- t.hieuhcirclekorean = 0x326d;
- t.hieuhkorean = 0x314e;
- t.hieuhparenkorean = 0x320d;
- t.hihiragana = 0x3072;
- t.hikatakana = 0x30d2;
- t.hikatakanahalfwidth = 0xff8b;
- t.hiriq = 0x05b4;
- t.hiriq14 = 0x05b4;
- t.hiriq21 = 0x05b4;
- t.hiriq2d = 0x05b4;
- t.hiriqhebrew = 0x05b4;
- t.hiriqnarrowhebrew = 0x05b4;
- t.hiriqquarterhebrew = 0x05b4;
- t.hiriqwidehebrew = 0x05b4;
- t.hlinebelow = 0x1e96;
- t.hmonospace = 0xff48;
- t.hoarmenian = 0x0570;
- t.hohipthai = 0x0e2b;
- t.hohiragana = 0x307b;
- t.hokatakana = 0x30db;
- t.hokatakanahalfwidth = 0xff8e;
- t.holam = 0x05b9;
- t.holam19 = 0x05b9;
- t.holam26 = 0x05b9;
- t.holam32 = 0x05b9;
- t.holamhebrew = 0x05b9;
- t.holamnarrowhebrew = 0x05b9;
- t.holamquarterhebrew = 0x05b9;
- t.holamwidehebrew = 0x05b9;
- t.honokhukthai = 0x0e2e;
- t.hookabovecomb = 0x0309;
- t.hookcmb = 0x0309;
- t.hookpalatalizedbelowcmb = 0x0321;
- t.hookretroflexbelowcmb = 0x0322;
- t.hoonsquare = 0x3342;
- t.horicoptic = 0x03e9;
- t.horizontalbar = 0x2015;
- t.horncmb = 0x031b;
- t.hotsprings = 0x2668;
- t.house = 0x2302;
- t.hparen = 0x24a3;
- t.hsuperior = 0x02b0;
- t.hturned = 0x0265;
- t.huhiragana = 0x3075;
- t.huiitosquare = 0x3333;
- t.hukatakana = 0x30d5;
- t.hukatakanahalfwidth = 0xff8c;
- t.hungarumlaut = 0x02dd;
- t.hungarumlautcmb = 0x030b;
- t.hv = 0x0195;
- t.hyphen = 0x002d;
- t.hypheninferior = 0xf6e5;
- t.hyphenmonospace = 0xff0d;
- t.hyphensmall = 0xfe63;
- t.hyphensuperior = 0xf6e6;
- t.hyphentwo = 0x2010;
- t.i = 0x0069;
- t.iacute = 0x00ed;
- t.iacyrillic = 0x044f;
- t.ibengali = 0x0987;
- t.ibopomofo = 0x3127;
- t.ibreve = 0x012d;
- t.icaron = 0x01d0;
- t.icircle = 0x24d8;
- t.icircumflex = 0x00ee;
- t.icyrillic = 0x0456;
- t.idblgrave = 0x0209;
- t.ideographearthcircle = 0x328f;
- t.ideographfirecircle = 0x328b;
- t.ideographicallianceparen = 0x323f;
- t.ideographiccallparen = 0x323a;
- t.ideographiccentrecircle = 0x32a5;
- t.ideographicclose = 0x3006;
- t.ideographiccomma = 0x3001;
- t.ideographiccommaleft = 0xff64;
- t.ideographiccongratulationparen = 0x3237;
- t.ideographiccorrectcircle = 0x32a3;
- t.ideographicearthparen = 0x322f;
- t.ideographicenterpriseparen = 0x323d;
- t.ideographicexcellentcircle = 0x329d;
- t.ideographicfestivalparen = 0x3240;
- t.ideographicfinancialcircle = 0x3296;
- t.ideographicfinancialparen = 0x3236;
- t.ideographicfireparen = 0x322b;
- t.ideographichaveparen = 0x3232;
- t.ideographichighcircle = 0x32a4;
- t.ideographiciterationmark = 0x3005;
- t.ideographiclaborcircle = 0x3298;
- t.ideographiclaborparen = 0x3238;
- t.ideographicleftcircle = 0x32a7;
- t.ideographiclowcircle = 0x32a6;
- t.ideographicmedicinecircle = 0x32a9;
- t.ideographicmetalparen = 0x322e;
- t.ideographicmoonparen = 0x322a;
- t.ideographicnameparen = 0x3234;
- t.ideographicperiod = 0x3002;
- t.ideographicprintcircle = 0x329e;
- t.ideographicreachparen = 0x3243;
- t.ideographicrepresentparen = 0x3239;
- t.ideographicresourceparen = 0x323e;
- t.ideographicrightcircle = 0x32a8;
- t.ideographicsecretcircle = 0x3299;
- t.ideographicselfparen = 0x3242;
- t.ideographicsocietyparen = 0x3233;
- t.ideographicspace = 0x3000;
- t.ideographicspecialparen = 0x3235;
- t.ideographicstockparen = 0x3231;
- t.ideographicstudyparen = 0x323b;
- t.ideographicsunparen = 0x3230;
- t.ideographicsuperviseparen = 0x323c;
- t.ideographicwaterparen = 0x322c;
- t.ideographicwoodparen = 0x322d;
- t.ideographiczero = 0x3007;
- t.ideographmetalcircle = 0x328e;
- t.ideographmooncircle = 0x328a;
- t.ideographnamecircle = 0x3294;
- t.ideographsuncircle = 0x3290;
- t.ideographwatercircle = 0x328c;
- t.ideographwoodcircle = 0x328d;
- t.ideva = 0x0907;
- t.idieresis = 0x00ef;
- t.idieresisacute = 0x1e2f;
- t.idieresiscyrillic = 0x04e5;
- t.idotbelow = 0x1ecb;
- t.iebrevecyrillic = 0x04d7;
- t.iecyrillic = 0x0435;
- t.ieungacirclekorean = 0x3275;
- t.ieungaparenkorean = 0x3215;
- t.ieungcirclekorean = 0x3267;
- t.ieungkorean = 0x3147;
- t.ieungparenkorean = 0x3207;
- t.igrave = 0x00ec;
- t.igujarati = 0x0a87;
- t.igurmukhi = 0x0a07;
- t.ihiragana = 0x3044;
- t.ihookabove = 0x1ec9;
- t.iibengali = 0x0988;
- t.iicyrillic = 0x0438;
- t.iideva = 0x0908;
- t.iigujarati = 0x0a88;
- t.iigurmukhi = 0x0a08;
- t.iimatragurmukhi = 0x0a40;
- t.iinvertedbreve = 0x020b;
- t.iishortcyrillic = 0x0439;
- t.iivowelsignbengali = 0x09c0;
- t.iivowelsigndeva = 0x0940;
- t.iivowelsigngujarati = 0x0ac0;
- t.ij = 0x0133;
- t.ikatakana = 0x30a4;
- t.ikatakanahalfwidth = 0xff72;
- t.ikorean = 0x3163;
- t.ilde = 0x02dc;
- t.iluyhebrew = 0x05ac;
- t.imacron = 0x012b;
- t.imacroncyrillic = 0x04e3;
- t.imageorapproximatelyequal = 0x2253;
- t.imatragurmukhi = 0x0a3f;
- t.imonospace = 0xff49;
- t.increment = 0x2206;
- t.infinity = 0x221e;
- t.iniarmenian = 0x056b;
- t.integral = 0x222b;
- t.integralbottom = 0x2321;
- t.integralbt = 0x2321;
- t.integralex = 0xf8f5;
- t.integraltop = 0x2320;
- t.integraltp = 0x2320;
- t.intersection = 0x2229;
- t.intisquare = 0x3305;
- t.invbullet = 0x25d8;
- t.invcircle = 0x25d9;
- t.invsmileface = 0x263b;
- t.iocyrillic = 0x0451;
- t.iogonek = 0x012f;
- t.iota = 0x03b9;
- t.iotadieresis = 0x03ca;
- t.iotadieresistonos = 0x0390;
- t.iotalatin = 0x0269;
- t.iotatonos = 0x03af;
- t.iparen = 0x24a4;
- t.irigurmukhi = 0x0a72;
- t.ismallhiragana = 0x3043;
- t.ismallkatakana = 0x30a3;
- t.ismallkatakanahalfwidth = 0xff68;
- t.issharbengali = 0x09fa;
- t.istroke = 0x0268;
- t.isuperior = 0xf6ed;
- t.iterationhiragana = 0x309d;
- t.iterationkatakana = 0x30fd;
- t.itilde = 0x0129;
- t.itildebelow = 0x1e2d;
- t.iubopomofo = 0x3129;
- t.iucyrillic = 0x044e;
- t.ivowelsignbengali = 0x09bf;
- t.ivowelsigndeva = 0x093f;
- t.ivowelsigngujarati = 0x0abf;
- t.izhitsacyrillic = 0x0475;
- t.izhitsadblgravecyrillic = 0x0477;
- t.j = 0x006a;
- t.jaarmenian = 0x0571;
- t.jabengali = 0x099c;
- t.jadeva = 0x091c;
- t.jagujarati = 0x0a9c;
- t.jagurmukhi = 0x0a1c;
- t.jbopomofo = 0x3110;
- t.jcaron = 0x01f0;
- t.jcircle = 0x24d9;
- t.jcircumflex = 0x0135;
- t.jcrossedtail = 0x029d;
- t.jdotlessstroke = 0x025f;
- t.jecyrillic = 0x0458;
- t.jeemarabic = 0x062c;
- t.jeemfinalarabic = 0xfe9e;
- t.jeeminitialarabic = 0xfe9f;
- t.jeemmedialarabic = 0xfea0;
- t.jeharabic = 0x0698;
- t.jehfinalarabic = 0xfb8b;
- t.jhabengali = 0x099d;
- t.jhadeva = 0x091d;
- t.jhagujarati = 0x0a9d;
- t.jhagurmukhi = 0x0a1d;
- t.jheharmenian = 0x057b;
- t.jis = 0x3004;
- t.jmonospace = 0xff4a;
- t.jparen = 0x24a5;
- t.jsuperior = 0x02b2;
- t.k = 0x006b;
- t.kabashkircyrillic = 0x04a1;
- t.kabengali = 0x0995;
- t.kacute = 0x1e31;
- t.kacyrillic = 0x043a;
- t.kadescendercyrillic = 0x049b;
- t.kadeva = 0x0915;
- t.kaf = 0x05db;
- t.kafarabic = 0x0643;
- t.kafdagesh = 0xfb3b;
- t.kafdageshhebrew = 0xfb3b;
- t.kaffinalarabic = 0xfeda;
- t.kafhebrew = 0x05db;
- t.kafinitialarabic = 0xfedb;
- t.kafmedialarabic = 0xfedc;
- t.kafrafehebrew = 0xfb4d;
- t.kagujarati = 0x0a95;
- t.kagurmukhi = 0x0a15;
- t.kahiragana = 0x304b;
- t.kahookcyrillic = 0x04c4;
- t.kakatakana = 0x30ab;
- t.kakatakanahalfwidth = 0xff76;
- t.kappa = 0x03ba;
- t.kappasymbolgreek = 0x03f0;
- t.kapyeounmieumkorean = 0x3171;
- t.kapyeounphieuphkorean = 0x3184;
- t.kapyeounpieupkorean = 0x3178;
- t.kapyeounssangpieupkorean = 0x3179;
- t.karoriisquare = 0x330d;
- t.kashidaautoarabic = 0x0640;
- t.kashidaautonosidebearingarabic = 0x0640;
- t.kasmallkatakana = 0x30f5;
- t.kasquare = 0x3384;
- t.kasraarabic = 0x0650;
- t.kasratanarabic = 0x064d;
- t.kastrokecyrillic = 0x049f;
- t.katahiraprolongmarkhalfwidth = 0xff70;
- t.kaverticalstrokecyrillic = 0x049d;
- t.kbopomofo = 0x310e;
- t.kcalsquare = 0x3389;
- t.kcaron = 0x01e9;
- t.kcedilla = 0x0137;
- t.kcircle = 0x24da;
- t.kcommaaccent = 0x0137;
- t.kdotbelow = 0x1e33;
- t.keharmenian = 0x0584;
- t.kehiragana = 0x3051;
- t.kekatakana = 0x30b1;
- t.kekatakanahalfwidth = 0xff79;
- t.kenarmenian = 0x056f;
- t.kesmallkatakana = 0x30f6;
- t.kgreenlandic = 0x0138;
- t.khabengali = 0x0996;
- t.khacyrillic = 0x0445;
- t.khadeva = 0x0916;
- t.khagujarati = 0x0a96;
- t.khagurmukhi = 0x0a16;
- t.khaharabic = 0x062e;
- t.khahfinalarabic = 0xfea6;
- t.khahinitialarabic = 0xfea7;
- t.khahmedialarabic = 0xfea8;
- t.kheicoptic = 0x03e7;
- t.khhadeva = 0x0959;
- t.khhagurmukhi = 0x0a59;
- t.khieukhacirclekorean = 0x3278;
- t.khieukhaparenkorean = 0x3218;
- t.khieukhcirclekorean = 0x326a;
- t.khieukhkorean = 0x314b;
- t.khieukhparenkorean = 0x320a;
- t.khokhaithai = 0x0e02;
- t.khokhonthai = 0x0e05;
- t.khokhuatthai = 0x0e03;
- t.khokhwaithai = 0x0e04;
- t.khomutthai = 0x0e5b;
- t.khook = 0x0199;
- t.khorakhangthai = 0x0e06;
- t.khzsquare = 0x3391;
- t.kihiragana = 0x304d;
- t.kikatakana = 0x30ad;
- t.kikatakanahalfwidth = 0xff77;
- t.kiroguramusquare = 0x3315;
- t.kiromeetorusquare = 0x3316;
- t.kirosquare = 0x3314;
- t.kiyeokacirclekorean = 0x326e;
- t.kiyeokaparenkorean = 0x320e;
- t.kiyeokcirclekorean = 0x3260;
- t.kiyeokkorean = 0x3131;
- t.kiyeokparenkorean = 0x3200;
- t.kiyeoksioskorean = 0x3133;
- t.kjecyrillic = 0x045c;
- t.klinebelow = 0x1e35;
- t.klsquare = 0x3398;
- t.kmcubedsquare = 0x33a6;
- t.kmonospace = 0xff4b;
- t.kmsquaredsquare = 0x33a2;
- t.kohiragana = 0x3053;
- t.kohmsquare = 0x33c0;
- t.kokaithai = 0x0e01;
- t.kokatakana = 0x30b3;
- t.kokatakanahalfwidth = 0xff7a;
- t.kooposquare = 0x331e;
- t.koppacyrillic = 0x0481;
- t.koreanstandardsymbol = 0x327f;
- t.koroniscmb = 0x0343;
- t.kparen = 0x24a6;
- t.kpasquare = 0x33aa;
- t.ksicyrillic = 0x046f;
- t.ktsquare = 0x33cf;
- t.kturned = 0x029e;
- t.kuhiragana = 0x304f;
- t.kukatakana = 0x30af;
- t.kukatakanahalfwidth = 0xff78;
- t.kvsquare = 0x33b8;
- t.kwsquare = 0x33be;
- t.l = 0x006c;
- t.labengali = 0x09b2;
- t.lacute = 0x013a;
- t.ladeva = 0x0932;
- t.lagujarati = 0x0ab2;
- t.lagurmukhi = 0x0a32;
- t.lakkhangyaothai = 0x0e45;
- t.lamaleffinalarabic = 0xfefc;
- t.lamalefhamzaabovefinalarabic = 0xfef8;
- t.lamalefhamzaaboveisolatedarabic = 0xfef7;
- t.lamalefhamzabelowfinalarabic = 0xfefa;
- t.lamalefhamzabelowisolatedarabic = 0xfef9;
- t.lamalefisolatedarabic = 0xfefb;
- t.lamalefmaddaabovefinalarabic = 0xfef6;
- t.lamalefmaddaaboveisolatedarabic = 0xfef5;
- t.lamarabic = 0x0644;
- t.lambda = 0x03bb;
- t.lambdastroke = 0x019b;
- t.lamed = 0x05dc;
- t.lameddagesh = 0xfb3c;
- t.lameddageshhebrew = 0xfb3c;
- t.lamedhebrew = 0x05dc;
- t.lamfinalarabic = 0xfede;
- t.lamhahinitialarabic = 0xfcca;
- t.laminitialarabic = 0xfedf;
- t.lamjeeminitialarabic = 0xfcc9;
- t.lamkhahinitialarabic = 0xfccb;
- t.lamlamhehisolatedarabic = 0xfdf2;
- t.lammedialarabic = 0xfee0;
- t.lammeemhahinitialarabic = 0xfd88;
- t.lammeeminitialarabic = 0xfccc;
- t.largecircle = 0x25ef;
- t.lbar = 0x019a;
- t.lbelt = 0x026c;
- t.lbopomofo = 0x310c;
- t.lcaron = 0x013e;
- t.lcedilla = 0x013c;
- t.lcircle = 0x24db;
- t.lcircumflexbelow = 0x1e3d;
- t.lcommaaccent = 0x013c;
- t.ldot = 0x0140;
- t.ldotaccent = 0x0140;
- t.ldotbelow = 0x1e37;
- t.ldotbelowmacron = 0x1e39;
- t.leftangleabovecmb = 0x031a;
- t.lefttackbelowcmb = 0x0318;
- t.less = 0x003c;
- t.lessequal = 0x2264;
- t.lessequalorgreater = 0x22da;
- t.lessmonospace = 0xff1c;
- t.lessorequivalent = 0x2272;
- t.lessorgreater = 0x2276;
- t.lessoverequal = 0x2266;
- t.lesssmall = 0xfe64;
- t.lezh = 0x026e;
- t.lfblock = 0x258c;
- t.lhookretroflex = 0x026d;
- t.lira = 0x20a4;
- t.liwnarmenian = 0x056c;
- t.lj = 0x01c9;
- t.ljecyrillic = 0x0459;
- t.ll = 0xf6c0;
- t.lladeva = 0x0933;
- t.llagujarati = 0x0ab3;
- t.llinebelow = 0x1e3b;
- t.llladeva = 0x0934;
- t.llvocalicbengali = 0x09e1;
- t.llvocalicdeva = 0x0961;
- t.llvocalicvowelsignbengali = 0x09e3;
- t.llvocalicvowelsigndeva = 0x0963;
- t.lmiddletilde = 0x026b;
- t.lmonospace = 0xff4c;
- t.lmsquare = 0x33d0;
- t.lochulathai = 0x0e2c;
- t.logicaland = 0x2227;
- t.logicalnot = 0x00ac;
- t.logicalnotreversed = 0x2310;
- t.logicalor = 0x2228;
- t.lolingthai = 0x0e25;
- t.longs = 0x017f;
- t.lowlinecenterline = 0xfe4e;
- t.lowlinecmb = 0x0332;
- t.lowlinedashed = 0xfe4d;
- t.lozenge = 0x25ca;
- t.lparen = 0x24a7;
- t.lslash = 0x0142;
- t.lsquare = 0x2113;
- t.lsuperior = 0xf6ee;
- t.ltshade = 0x2591;
- t.luthai = 0x0e26;
- t.lvocalicbengali = 0x098c;
- t.lvocalicdeva = 0x090c;
- t.lvocalicvowelsignbengali = 0x09e2;
- t.lvocalicvowelsigndeva = 0x0962;
- t.lxsquare = 0x33d3;
- t.m = 0x006d;
- t.mabengali = 0x09ae;
- t.macron = 0x00af;
- t.macronbelowcmb = 0x0331;
- t.macroncmb = 0x0304;
- t.macronlowmod = 0x02cd;
- t.macronmonospace = 0xffe3;
- t.macute = 0x1e3f;
- t.madeva = 0x092e;
- t.magujarati = 0x0aae;
- t.magurmukhi = 0x0a2e;
- t.mahapakhhebrew = 0x05a4;
- t.mahapakhlefthebrew = 0x05a4;
- t.mahiragana = 0x307e;
- t.maichattawalowleftthai = 0xf895;
- t.maichattawalowrightthai = 0xf894;
- t.maichattawathai = 0x0e4b;
- t.maichattawaupperleftthai = 0xf893;
- t.maieklowleftthai = 0xf88c;
- t.maieklowrightthai = 0xf88b;
- t.maiekthai = 0x0e48;
- t.maiekupperleftthai = 0xf88a;
- t.maihanakatleftthai = 0xf884;
- t.maihanakatthai = 0x0e31;
- t.maitaikhuleftthai = 0xf889;
- t.maitaikhuthai = 0x0e47;
- t.maitholowleftthai = 0xf88f;
- t.maitholowrightthai = 0xf88e;
- t.maithothai = 0x0e49;
- t.maithoupperleftthai = 0xf88d;
- t.maitrilowleftthai = 0xf892;
- t.maitrilowrightthai = 0xf891;
- t.maitrithai = 0x0e4a;
- t.maitriupperleftthai = 0xf890;
- t.maiyamokthai = 0x0e46;
- t.makatakana = 0x30de;
- t.makatakanahalfwidth = 0xff8f;
- t.male = 0x2642;
- t.mansyonsquare = 0x3347;
- t.maqafhebrew = 0x05be;
- t.mars = 0x2642;
- t.masoracirclehebrew = 0x05af;
- t.masquare = 0x3383;
- t.mbopomofo = 0x3107;
- t.mbsquare = 0x33d4;
- t.mcircle = 0x24dc;
- t.mcubedsquare = 0x33a5;
- t.mdotaccent = 0x1e41;
- t.mdotbelow = 0x1e43;
- t.meemarabic = 0x0645;
- t.meemfinalarabic = 0xfee2;
- t.meeminitialarabic = 0xfee3;
- t.meemmedialarabic = 0xfee4;
- t.meemmeeminitialarabic = 0xfcd1;
- t.meemmeemisolatedarabic = 0xfc48;
- t.meetorusquare = 0x334d;
- t.mehiragana = 0x3081;
- t.meizierasquare = 0x337e;
- t.mekatakana = 0x30e1;
- t.mekatakanahalfwidth = 0xff92;
- t.mem = 0x05de;
- t.memdagesh = 0xfb3e;
- t.memdageshhebrew = 0xfb3e;
- t.memhebrew = 0x05de;
- t.menarmenian = 0x0574;
- t.merkhahebrew = 0x05a5;
- t.merkhakefulahebrew = 0x05a6;
- t.merkhakefulalefthebrew = 0x05a6;
- t.merkhalefthebrew = 0x05a5;
- t.mhook = 0x0271;
- t.mhzsquare = 0x3392;
- t.middledotkatakanahalfwidth = 0xff65;
- t.middot = 0x00b7;
- t.mieumacirclekorean = 0x3272;
- t.mieumaparenkorean = 0x3212;
- t.mieumcirclekorean = 0x3264;
- t.mieumkorean = 0x3141;
- t.mieumpansioskorean = 0x3170;
- t.mieumparenkorean = 0x3204;
- t.mieumpieupkorean = 0x316e;
- t.mieumsioskorean = 0x316f;
- t.mihiragana = 0x307f;
- t.mikatakana = 0x30df;
- t.mikatakanahalfwidth = 0xff90;
- t.minus = 0x2212;
- t.minusbelowcmb = 0x0320;
- t.minuscircle = 0x2296;
- t.minusmod = 0x02d7;
- t.minusplus = 0x2213;
- t.minute = 0x2032;
- t.miribaarusquare = 0x334a;
- t.mirisquare = 0x3349;
- t.mlonglegturned = 0x0270;
- t.mlsquare = 0x3396;
- t.mmcubedsquare = 0x33a3;
- t.mmonospace = 0xff4d;
- t.mmsquaredsquare = 0x339f;
- t.mohiragana = 0x3082;
- t.mohmsquare = 0x33c1;
- t.mokatakana = 0x30e2;
- t.mokatakanahalfwidth = 0xff93;
- t.molsquare = 0x33d6;
- t.momathai = 0x0e21;
- t.moverssquare = 0x33a7;
- t.moverssquaredsquare = 0x33a8;
- t.mparen = 0x24a8;
- t.mpasquare = 0x33ab;
- t.mssquare = 0x33b3;
- t.msuperior = 0xf6ef;
- t.mturned = 0x026f;
- t.mu = 0x00b5;
- t.mu1 = 0x00b5;
- t.muasquare = 0x3382;
- t.muchgreater = 0x226b;
- t.muchless = 0x226a;
- t.mufsquare = 0x338c;
- t.mugreek = 0x03bc;
- t.mugsquare = 0x338d;
- t.muhiragana = 0x3080;
- t.mukatakana = 0x30e0;
- t.mukatakanahalfwidth = 0xff91;
- t.mulsquare = 0x3395;
- t.multiply = 0x00d7;
- t.mumsquare = 0x339b;
- t.munahhebrew = 0x05a3;
- t.munahlefthebrew = 0x05a3;
- t.musicalnote = 0x266a;
- t.musicalnotedbl = 0x266b;
- t.musicflatsign = 0x266d;
- t.musicsharpsign = 0x266f;
- t.mussquare = 0x33b2;
- t.muvsquare = 0x33b6;
- t.muwsquare = 0x33bc;
- t.mvmegasquare = 0x33b9;
- t.mvsquare = 0x33b7;
- t.mwmegasquare = 0x33bf;
- t.mwsquare = 0x33bd;
- t.n = 0x006e;
- t.nabengali = 0x09a8;
- t.nabla = 0x2207;
- t.nacute = 0x0144;
- t.nadeva = 0x0928;
- t.nagujarati = 0x0aa8;
- t.nagurmukhi = 0x0a28;
- t.nahiragana = 0x306a;
- t.nakatakana = 0x30ca;
- t.nakatakanahalfwidth = 0xff85;
- t.napostrophe = 0x0149;
- t.nasquare = 0x3381;
- t.nbopomofo = 0x310b;
- t.nbspace = 0x00a0;
- t.ncaron = 0x0148;
- t.ncedilla = 0x0146;
- t.ncircle = 0x24dd;
- t.ncircumflexbelow = 0x1e4b;
- t.ncommaaccent = 0x0146;
- t.ndotaccent = 0x1e45;
- t.ndotbelow = 0x1e47;
- t.nehiragana = 0x306d;
- t.nekatakana = 0x30cd;
- t.nekatakanahalfwidth = 0xff88;
- t.newsheqelsign = 0x20aa;
- t.nfsquare = 0x338b;
- t.ngabengali = 0x0999;
- t.ngadeva = 0x0919;
- t.ngagujarati = 0x0a99;
- t.ngagurmukhi = 0x0a19;
- t.ngonguthai = 0x0e07;
- t.nhiragana = 0x3093;
- t.nhookleft = 0x0272;
- t.nhookretroflex = 0x0273;
- t.nieunacirclekorean = 0x326f;
- t.nieunaparenkorean = 0x320f;
- t.nieuncieuckorean = 0x3135;
- t.nieuncirclekorean = 0x3261;
- t.nieunhieuhkorean = 0x3136;
- t.nieunkorean = 0x3134;
- t.nieunpansioskorean = 0x3168;
- t.nieunparenkorean = 0x3201;
- t.nieunsioskorean = 0x3167;
- t.nieuntikeutkorean = 0x3166;
- t.nihiragana = 0x306b;
- t.nikatakana = 0x30cb;
- t.nikatakanahalfwidth = 0xff86;
- t.nikhahitleftthai = 0xf899;
- t.nikhahitthai = 0x0e4d;
- t.nine = 0x0039;
- t.ninearabic = 0x0669;
- t.ninebengali = 0x09ef;
- t.ninecircle = 0x2468;
- t.ninecircleinversesansserif = 0x2792;
- t.ninedeva = 0x096f;
- t.ninegujarati = 0x0aef;
- t.ninegurmukhi = 0x0a6f;
- t.ninehackarabic = 0x0669;
- t.ninehangzhou = 0x3029;
- t.nineideographicparen = 0x3228;
- t.nineinferior = 0x2089;
- t.ninemonospace = 0xff19;
- t.nineoldstyle = 0xf739;
- t.nineparen = 0x247c;
- t.nineperiod = 0x2490;
- t.ninepersian = 0x06f9;
- t.nineroman = 0x2178;
- t.ninesuperior = 0x2079;
- t.nineteencircle = 0x2472;
- t.nineteenparen = 0x2486;
- t.nineteenperiod = 0x249a;
- t.ninethai = 0x0e59;
- t.nj = 0x01cc;
- t.njecyrillic = 0x045a;
- t.nkatakana = 0x30f3;
- t.nkatakanahalfwidth = 0xff9d;
- t.nlegrightlong = 0x019e;
- t.nlinebelow = 0x1e49;
- t.nmonospace = 0xff4e;
- t.nmsquare = 0x339a;
- t.nnabengali = 0x09a3;
- t.nnadeva = 0x0923;
- t.nnagujarati = 0x0aa3;
- t.nnagurmukhi = 0x0a23;
- t.nnnadeva = 0x0929;
- t.nohiragana = 0x306e;
- t.nokatakana = 0x30ce;
- t.nokatakanahalfwidth = 0xff89;
- t.nonbreakingspace = 0x00a0;
- t.nonenthai = 0x0e13;
- t.nonuthai = 0x0e19;
- t.noonarabic = 0x0646;
- t.noonfinalarabic = 0xfee6;
- t.noonghunnaarabic = 0x06ba;
- t.noonghunnafinalarabic = 0xfb9f;
- t.nooninitialarabic = 0xfee7;
- t.noonjeeminitialarabic = 0xfcd2;
- t.noonjeemisolatedarabic = 0xfc4b;
- t.noonmedialarabic = 0xfee8;
- t.noonmeeminitialarabic = 0xfcd5;
- t.noonmeemisolatedarabic = 0xfc4e;
- t.noonnoonfinalarabic = 0xfc8d;
- t.notcontains = 0x220c;
- t.notelement = 0x2209;
- t.notelementof = 0x2209;
- t.notequal = 0x2260;
- t.notgreater = 0x226f;
- t.notgreaternorequal = 0x2271;
- t.notgreaternorless = 0x2279;
- t.notidentical = 0x2262;
- t.notless = 0x226e;
- t.notlessnorequal = 0x2270;
- t.notparallel = 0x2226;
- t.notprecedes = 0x2280;
- t.notsubset = 0x2284;
- t.notsucceeds = 0x2281;
- t.notsuperset = 0x2285;
- t.nowarmenian = 0x0576;
- t.nparen = 0x24a9;
- t.nssquare = 0x33b1;
- t.nsuperior = 0x207f;
- t.ntilde = 0x00f1;
- t.nu = 0x03bd;
- t.nuhiragana = 0x306c;
- t.nukatakana = 0x30cc;
- t.nukatakanahalfwidth = 0xff87;
- t.nuktabengali = 0x09bc;
- t.nuktadeva = 0x093c;
- t.nuktagujarati = 0x0abc;
- t.nuktagurmukhi = 0x0a3c;
- t.numbersign = 0x0023;
- t.numbersignmonospace = 0xff03;
- t.numbersignsmall = 0xfe5f;
- t.numeralsigngreek = 0x0374;
- t.numeralsignlowergreek = 0x0375;
- t.numero = 0x2116;
- t.nun = 0x05e0;
- t.nundagesh = 0xfb40;
- t.nundageshhebrew = 0xfb40;
- t.nunhebrew = 0x05e0;
- t.nvsquare = 0x33b5;
- t.nwsquare = 0x33bb;
- t.nyabengali = 0x099e;
- t.nyadeva = 0x091e;
- t.nyagujarati = 0x0a9e;
- t.nyagurmukhi = 0x0a1e;
- t.o = 0x006f;
- t.oacute = 0x00f3;
- t.oangthai = 0x0e2d;
- t.obarred = 0x0275;
- t.obarredcyrillic = 0x04e9;
- t.obarreddieresiscyrillic = 0x04eb;
- t.obengali = 0x0993;
- t.obopomofo = 0x311b;
- t.obreve = 0x014f;
- t.ocandradeva = 0x0911;
- t.ocandragujarati = 0x0a91;
- t.ocandravowelsigndeva = 0x0949;
- t.ocandravowelsigngujarati = 0x0ac9;
- t.ocaron = 0x01d2;
- t.ocircle = 0x24de;
- t.ocircumflex = 0x00f4;
- t.ocircumflexacute = 0x1ed1;
- t.ocircumflexdotbelow = 0x1ed9;
- t.ocircumflexgrave = 0x1ed3;
- t.ocircumflexhookabove = 0x1ed5;
- t.ocircumflextilde = 0x1ed7;
- t.ocyrillic = 0x043e;
- t.odblacute = 0x0151;
- t.odblgrave = 0x020d;
- t.odeva = 0x0913;
- t.odieresis = 0x00f6;
- t.odieresiscyrillic = 0x04e7;
- t.odotbelow = 0x1ecd;
- t.oe = 0x0153;
- t.oekorean = 0x315a;
- t.ogonek = 0x02db;
- t.ogonekcmb = 0x0328;
- t.ograve = 0x00f2;
- t.ogujarati = 0x0a93;
- t.oharmenian = 0x0585;
- t.ohiragana = 0x304a;
- t.ohookabove = 0x1ecf;
- t.ohorn = 0x01a1;
- t.ohornacute = 0x1edb;
- t.ohorndotbelow = 0x1ee3;
- t.ohorngrave = 0x1edd;
- t.ohornhookabove = 0x1edf;
- t.ohorntilde = 0x1ee1;
- t.ohungarumlaut = 0x0151;
- t.oi = 0x01a3;
- t.oinvertedbreve = 0x020f;
- t.okatakana = 0x30aa;
- t.okatakanahalfwidth = 0xff75;
- t.okorean = 0x3157;
- t.olehebrew = 0x05ab;
- t.omacron = 0x014d;
- t.omacronacute = 0x1e53;
- t.omacrongrave = 0x1e51;
- t.omdeva = 0x0950;
- t.omega = 0x03c9;
- t.omega1 = 0x03d6;
- t.omegacyrillic = 0x0461;
- t.omegalatinclosed = 0x0277;
- t.omegaroundcyrillic = 0x047b;
- t.omegatitlocyrillic = 0x047d;
- t.omegatonos = 0x03ce;
- t.omgujarati = 0x0ad0;
- t.omicron = 0x03bf;
- t.omicrontonos = 0x03cc;
- t.omonospace = 0xff4f;
- t.one = 0x0031;
- t.onearabic = 0x0661;
- t.onebengali = 0x09e7;
- t.onecircle = 0x2460;
- t.onecircleinversesansserif = 0x278a;
- t.onedeva = 0x0967;
- t.onedotenleader = 0x2024;
- t.oneeighth = 0x215b;
- t.onefitted = 0xf6dc;
- t.onegujarati = 0x0ae7;
- t.onegurmukhi = 0x0a67;
- t.onehackarabic = 0x0661;
- t.onehalf = 0x00bd;
- t.onehangzhou = 0x3021;
- t.oneideographicparen = 0x3220;
- t.oneinferior = 0x2081;
- t.onemonospace = 0xff11;
- t.onenumeratorbengali = 0x09f4;
- t.oneoldstyle = 0xf731;
- t.oneparen = 0x2474;
- t.oneperiod = 0x2488;
- t.onepersian = 0x06f1;
- t.onequarter = 0x00bc;
- t.oneroman = 0x2170;
- t.onesuperior = 0x00b9;
- t.onethai = 0x0e51;
- t.onethird = 0x2153;
- t.oogonek = 0x01eb;
- t.oogonekmacron = 0x01ed;
- t.oogurmukhi = 0x0a13;
- t.oomatragurmukhi = 0x0a4b;
- t.oopen = 0x0254;
- t.oparen = 0x24aa;
- t.openbullet = 0x25e6;
- t.option = 0x2325;
- t.ordfeminine = 0x00aa;
- t.ordmasculine = 0x00ba;
- t.orthogonal = 0x221f;
- t.oshortdeva = 0x0912;
- t.oshortvowelsigndeva = 0x094a;
- t.oslash = 0x00f8;
- t.oslashacute = 0x01ff;
- t.osmallhiragana = 0x3049;
- t.osmallkatakana = 0x30a9;
- t.osmallkatakanahalfwidth = 0xff6b;
- t.ostrokeacute = 0x01ff;
- t.osuperior = 0xf6f0;
- t.otcyrillic = 0x047f;
- t.otilde = 0x00f5;
- t.otildeacute = 0x1e4d;
- t.otildedieresis = 0x1e4f;
- t.oubopomofo = 0x3121;
- t.overline = 0x203e;
- t.overlinecenterline = 0xfe4a;
- t.overlinecmb = 0x0305;
- t.overlinedashed = 0xfe49;
- t.overlinedblwavy = 0xfe4c;
- t.overlinewavy = 0xfe4b;
- t.overscore = 0x00af;
- t.ovowelsignbengali = 0x09cb;
- t.ovowelsigndeva = 0x094b;
- t.ovowelsigngujarati = 0x0acb;
- t.p = 0x0070;
- t.paampssquare = 0x3380;
- t.paasentosquare = 0x332b;
- t.pabengali = 0x09aa;
- t.pacute = 0x1e55;
- t.padeva = 0x092a;
- t.pagedown = 0x21df;
- t.pageup = 0x21de;
- t.pagujarati = 0x0aaa;
- t.pagurmukhi = 0x0a2a;
- t.pahiragana = 0x3071;
- t.paiyannoithai = 0x0e2f;
- t.pakatakana = 0x30d1;
- t.palatalizationcyrilliccmb = 0x0484;
- t.palochkacyrillic = 0x04c0;
- t.pansioskorean = 0x317f;
- t.paragraph = 0x00b6;
- t.parallel = 0x2225;
- t.parenleft = 0x0028;
- t.parenleftaltonearabic = 0xfd3e;
- t.parenleftbt = 0xf8ed;
- t.parenleftex = 0xf8ec;
- t.parenleftinferior = 0x208d;
- t.parenleftmonospace = 0xff08;
- t.parenleftsmall = 0xfe59;
- t.parenleftsuperior = 0x207d;
- t.parenlefttp = 0xf8eb;
- t.parenleftvertical = 0xfe35;
- t.parenright = 0x0029;
- t.parenrightaltonearabic = 0xfd3f;
- t.parenrightbt = 0xf8f8;
- t.parenrightex = 0xf8f7;
- t.parenrightinferior = 0x208e;
- t.parenrightmonospace = 0xff09;
- t.parenrightsmall = 0xfe5a;
- t.parenrightsuperior = 0x207e;
- t.parenrighttp = 0xf8f6;
- t.parenrightvertical = 0xfe36;
- t.partialdiff = 0x2202;
- t.paseqhebrew = 0x05c0;
- t.pashtahebrew = 0x0599;
- t.pasquare = 0x33a9;
- t.patah = 0x05b7;
- t.patah11 = 0x05b7;
- t.patah1d = 0x05b7;
- t.patah2a = 0x05b7;
- t.patahhebrew = 0x05b7;
- t.patahnarrowhebrew = 0x05b7;
- t.patahquarterhebrew = 0x05b7;
- t.patahwidehebrew = 0x05b7;
- t.pazerhebrew = 0x05a1;
- t.pbopomofo = 0x3106;
- t.pcircle = 0x24df;
- t.pdotaccent = 0x1e57;
- t.pe = 0x05e4;
- t.pecyrillic = 0x043f;
- t.pedagesh = 0xfb44;
- t.pedageshhebrew = 0xfb44;
- t.peezisquare = 0x333b;
- t.pefinaldageshhebrew = 0xfb43;
- t.peharabic = 0x067e;
- t.peharmenian = 0x057a;
- t.pehebrew = 0x05e4;
- t.pehfinalarabic = 0xfb57;
- t.pehinitialarabic = 0xfb58;
- t.pehiragana = 0x307a;
- t.pehmedialarabic = 0xfb59;
- t.pekatakana = 0x30da;
- t.pemiddlehookcyrillic = 0x04a7;
- t.perafehebrew = 0xfb4e;
- t.percent = 0x0025;
- t.percentarabic = 0x066a;
- t.percentmonospace = 0xff05;
- t.percentsmall = 0xfe6a;
- t.period = 0x002e;
- t.periodarmenian = 0x0589;
- t.periodcentered = 0x00b7;
- t.periodhalfwidth = 0xff61;
- t.periodinferior = 0xf6e7;
- t.periodmonospace = 0xff0e;
- t.periodsmall = 0xfe52;
- t.periodsuperior = 0xf6e8;
- t.perispomenigreekcmb = 0x0342;
- t.perpendicular = 0x22a5;
- t.perthousand = 0x2030;
- t.peseta = 0x20a7;
- t.pfsquare = 0x338a;
- t.phabengali = 0x09ab;
- t.phadeva = 0x092b;
- t.phagujarati = 0x0aab;
- t.phagurmukhi = 0x0a2b;
- t.phi = 0x03c6;
- t.phi1 = 0x03d5;
- t.phieuphacirclekorean = 0x327a;
- t.phieuphaparenkorean = 0x321a;
- t.phieuphcirclekorean = 0x326c;
- t.phieuphkorean = 0x314d;
- t.phieuphparenkorean = 0x320c;
- t.philatin = 0x0278;
- t.phinthuthai = 0x0e3a;
- t.phisymbolgreek = 0x03d5;
- t.phook = 0x01a5;
- t.phophanthai = 0x0e1e;
- t.phophungthai = 0x0e1c;
- t.phosamphaothai = 0x0e20;
- t.pi = 0x03c0;
- t.pieupacirclekorean = 0x3273;
- t.pieupaparenkorean = 0x3213;
- t.pieupcieuckorean = 0x3176;
- t.pieupcirclekorean = 0x3265;
- t.pieupkiyeokkorean = 0x3172;
- t.pieupkorean = 0x3142;
- t.pieupparenkorean = 0x3205;
- t.pieupsioskiyeokkorean = 0x3174;
- t.pieupsioskorean = 0x3144;
- t.pieupsiostikeutkorean = 0x3175;
- t.pieupthieuthkorean = 0x3177;
- t.pieuptikeutkorean = 0x3173;
- t.pihiragana = 0x3074;
- t.pikatakana = 0x30d4;
- t.pisymbolgreek = 0x03d6;
- t.piwrarmenian = 0x0583;
- t.plus = 0x002b;
- t.plusbelowcmb = 0x031f;
- t.pluscircle = 0x2295;
- t.plusminus = 0x00b1;
- t.plusmod = 0x02d6;
- t.plusmonospace = 0xff0b;
- t.plussmall = 0xfe62;
- t.plussuperior = 0x207a;
- t.pmonospace = 0xff50;
- t.pmsquare = 0x33d8;
- t.pohiragana = 0x307d;
- t.pointingindexdownwhite = 0x261f;
- t.pointingindexleftwhite = 0x261c;
- t.pointingindexrightwhite = 0x261e;
- t.pointingindexupwhite = 0x261d;
- t.pokatakana = 0x30dd;
- t.poplathai = 0x0e1b;
- t.postalmark = 0x3012;
- t.postalmarkface = 0x3020;
- t.pparen = 0x24ab;
- t.precedes = 0x227a;
- t.prescription = 0x211e;
- t.primemod = 0x02b9;
- t.primereversed = 0x2035;
- t.product = 0x220f;
- t.projective = 0x2305;
- t.prolongedkana = 0x30fc;
- t.propellor = 0x2318;
- t.propersubset = 0x2282;
- t.propersuperset = 0x2283;
- t.proportion = 0x2237;
- t.proportional = 0x221d;
- t.psi = 0x03c8;
- t.psicyrillic = 0x0471;
- t.psilipneumatacyrilliccmb = 0x0486;
- t.pssquare = 0x33b0;
- t.puhiragana = 0x3077;
- t.pukatakana = 0x30d7;
- t.pvsquare = 0x33b4;
- t.pwsquare = 0x33ba;
- t.q = 0x0071;
- t.qadeva = 0x0958;
- t.qadmahebrew = 0x05a8;
- t.qafarabic = 0x0642;
- t.qaffinalarabic = 0xfed6;
- t.qafinitialarabic = 0xfed7;
- t.qafmedialarabic = 0xfed8;
- t.qamats = 0x05b8;
- t.qamats10 = 0x05b8;
- t.qamats1a = 0x05b8;
- t.qamats1c = 0x05b8;
- t.qamats27 = 0x05b8;
- t.qamats29 = 0x05b8;
- t.qamats33 = 0x05b8;
- t.qamatsde = 0x05b8;
- t.qamatshebrew = 0x05b8;
- t.qamatsnarrowhebrew = 0x05b8;
- t.qamatsqatanhebrew = 0x05b8;
- t.qamatsqatannarrowhebrew = 0x05b8;
- t.qamatsqatanquarterhebrew = 0x05b8;
- t.qamatsqatanwidehebrew = 0x05b8;
- t.qamatsquarterhebrew = 0x05b8;
- t.qamatswidehebrew = 0x05b8;
- t.qarneyparahebrew = 0x059f;
- t.qbopomofo = 0x3111;
- t.qcircle = 0x24e0;
- t.qhook = 0x02a0;
- t.qmonospace = 0xff51;
- t.qof = 0x05e7;
- t.qofdagesh = 0xfb47;
- t.qofdageshhebrew = 0xfb47;
- t.qofhebrew = 0x05e7;
- t.qparen = 0x24ac;
- t.quarternote = 0x2669;
- t.qubuts = 0x05bb;
- t.qubuts18 = 0x05bb;
- t.qubuts25 = 0x05bb;
- t.qubuts31 = 0x05bb;
- t.qubutshebrew = 0x05bb;
- t.qubutsnarrowhebrew = 0x05bb;
- t.qubutsquarterhebrew = 0x05bb;
- t.qubutswidehebrew = 0x05bb;
- t.question = 0x003f;
- t.questionarabic = 0x061f;
- t.questionarmenian = 0x055e;
- t.questiondown = 0x00bf;
- t.questiondownsmall = 0xf7bf;
- t.questiongreek = 0x037e;
- t.questionmonospace = 0xff1f;
- t.questionsmall = 0xf73f;
- t.quotedbl = 0x0022;
- t.quotedblbase = 0x201e;
- t.quotedblleft = 0x201c;
- t.quotedblmonospace = 0xff02;
- t.quotedblprime = 0x301e;
- t.quotedblprimereversed = 0x301d;
- t.quotedblright = 0x201d;
- t.quoteleft = 0x2018;
- t.quoteleftreversed = 0x201b;
- t.quotereversed = 0x201b;
- t.quoteright = 0x2019;
- t.quoterightn = 0x0149;
- t.quotesinglbase = 0x201a;
- t.quotesingle = 0x0027;
- t.quotesinglemonospace = 0xff07;
- t.r = 0x0072;
- t.raarmenian = 0x057c;
- t.rabengali = 0x09b0;
- t.racute = 0x0155;
- t.radeva = 0x0930;
- t.radical = 0x221a;
- t.radicalex = 0xf8e5;
- t.radoverssquare = 0x33ae;
- t.radoverssquaredsquare = 0x33af;
- t.radsquare = 0x33ad;
- t.rafe = 0x05bf;
- t.rafehebrew = 0x05bf;
- t.ragujarati = 0x0ab0;
- t.ragurmukhi = 0x0a30;
- t.rahiragana = 0x3089;
- t.rakatakana = 0x30e9;
- t.rakatakanahalfwidth = 0xff97;
- t.ralowerdiagonalbengali = 0x09f1;
- t.ramiddlediagonalbengali = 0x09f0;
- t.ramshorn = 0x0264;
- t.ratio = 0x2236;
- t.rbopomofo = 0x3116;
- t.rcaron = 0x0159;
- t.rcedilla = 0x0157;
- t.rcircle = 0x24e1;
- t.rcommaaccent = 0x0157;
- t.rdblgrave = 0x0211;
- t.rdotaccent = 0x1e59;
- t.rdotbelow = 0x1e5b;
- t.rdotbelowmacron = 0x1e5d;
- t.referencemark = 0x203b;
- t.reflexsubset = 0x2286;
- t.reflexsuperset = 0x2287;
- t.registered = 0x00ae;
- t.registersans = 0xf8e8;
- t.registerserif = 0xf6da;
- t.reharabic = 0x0631;
- t.reharmenian = 0x0580;
- t.rehfinalarabic = 0xfeae;
- t.rehiragana = 0x308c;
- t.rekatakana = 0x30ec;
- t.rekatakanahalfwidth = 0xff9a;
- t.resh = 0x05e8;
- t.reshdageshhebrew = 0xfb48;
- t.reshhebrew = 0x05e8;
- t.reversedtilde = 0x223d;
- t.reviahebrew = 0x0597;
- t.reviamugrashhebrew = 0x0597;
- t.revlogicalnot = 0x2310;
- t.rfishhook = 0x027e;
- t.rfishhookreversed = 0x027f;
- t.rhabengali = 0x09dd;
- t.rhadeva = 0x095d;
- t.rho = 0x03c1;
- t.rhook = 0x027d;
- t.rhookturned = 0x027b;
- t.rhookturnedsuperior = 0x02b5;
- t.rhosymbolgreek = 0x03f1;
- t.rhotichookmod = 0x02de;
- t.rieulacirclekorean = 0x3271;
- t.rieulaparenkorean = 0x3211;
- t.rieulcirclekorean = 0x3263;
- t.rieulhieuhkorean = 0x3140;
- t.rieulkiyeokkorean = 0x313a;
- t.rieulkiyeoksioskorean = 0x3169;
- t.rieulkorean = 0x3139;
- t.rieulmieumkorean = 0x313b;
- t.rieulpansioskorean = 0x316c;
- t.rieulparenkorean = 0x3203;
- t.rieulphieuphkorean = 0x313f;
- t.rieulpieupkorean = 0x313c;
- t.rieulpieupsioskorean = 0x316b;
- t.rieulsioskorean = 0x313d;
- t.rieulthieuthkorean = 0x313e;
- t.rieultikeutkorean = 0x316a;
- t.rieulyeorinhieuhkorean = 0x316d;
- t.rightangle = 0x221f;
- t.righttackbelowcmb = 0x0319;
- t.righttriangle = 0x22bf;
- t.rihiragana = 0x308a;
- t.rikatakana = 0x30ea;
- t.rikatakanahalfwidth = 0xff98;
- t.ring = 0x02da;
- t.ringbelowcmb = 0x0325;
- t.ringcmb = 0x030a;
- t.ringhalfleft = 0x02bf;
- t.ringhalfleftarmenian = 0x0559;
- t.ringhalfleftbelowcmb = 0x031c;
- t.ringhalfleftcentered = 0x02d3;
- t.ringhalfright = 0x02be;
- t.ringhalfrightbelowcmb = 0x0339;
- t.ringhalfrightcentered = 0x02d2;
- t.rinvertedbreve = 0x0213;
- t.rittorusquare = 0x3351;
- t.rlinebelow = 0x1e5f;
- t.rlongleg = 0x027c;
- t.rlonglegturned = 0x027a;
- t.rmonospace = 0xff52;
- t.rohiragana = 0x308d;
- t.rokatakana = 0x30ed;
- t.rokatakanahalfwidth = 0xff9b;
- t.roruathai = 0x0e23;
- t.rparen = 0x24ad;
- t.rrabengali = 0x09dc;
- t.rradeva = 0x0931;
- t.rragurmukhi = 0x0a5c;
- t.rreharabic = 0x0691;
- t.rrehfinalarabic = 0xfb8d;
- t.rrvocalicbengali = 0x09e0;
- t.rrvocalicdeva = 0x0960;
- t.rrvocalicgujarati = 0x0ae0;
- t.rrvocalicvowelsignbengali = 0x09c4;
- t.rrvocalicvowelsigndeva = 0x0944;
- t.rrvocalicvowelsigngujarati = 0x0ac4;
- t.rsuperior = 0xf6f1;
- t.rtblock = 0x2590;
- t.rturned = 0x0279;
- t.rturnedsuperior = 0x02b4;
- t.ruhiragana = 0x308b;
- t.rukatakana = 0x30eb;
- t.rukatakanahalfwidth = 0xff99;
- t.rupeemarkbengali = 0x09f2;
- t.rupeesignbengali = 0x09f3;
- t.rupiah = 0xf6dd;
- t.ruthai = 0x0e24;
- t.rvocalicbengali = 0x098b;
- t.rvocalicdeva = 0x090b;
- t.rvocalicgujarati = 0x0a8b;
- t.rvocalicvowelsignbengali = 0x09c3;
- t.rvocalicvowelsigndeva = 0x0943;
- t.rvocalicvowelsigngujarati = 0x0ac3;
- t.s = 0x0073;
- t.sabengali = 0x09b8;
- t.sacute = 0x015b;
- t.sacutedotaccent = 0x1e65;
- t.sadarabic = 0x0635;
- t.sadeva = 0x0938;
- t.sadfinalarabic = 0xfeba;
- t.sadinitialarabic = 0xfebb;
- t.sadmedialarabic = 0xfebc;
- t.sagujarati = 0x0ab8;
- t.sagurmukhi = 0x0a38;
- t.sahiragana = 0x3055;
- t.sakatakana = 0x30b5;
- t.sakatakanahalfwidth = 0xff7b;
- t.sallallahoualayhewasallamarabic = 0xfdfa;
- t.samekh = 0x05e1;
- t.samekhdagesh = 0xfb41;
- t.samekhdageshhebrew = 0xfb41;
- t.samekhhebrew = 0x05e1;
- t.saraaathai = 0x0e32;
- t.saraaethai = 0x0e41;
- t.saraaimaimalaithai = 0x0e44;
- t.saraaimaimuanthai = 0x0e43;
- t.saraamthai = 0x0e33;
- t.saraathai = 0x0e30;
- t.saraethai = 0x0e40;
- t.saraiileftthai = 0xf886;
- t.saraiithai = 0x0e35;
- t.saraileftthai = 0xf885;
- t.saraithai = 0x0e34;
- t.saraothai = 0x0e42;
- t.saraueeleftthai = 0xf888;
- t.saraueethai = 0x0e37;
- t.saraueleftthai = 0xf887;
- t.sarauethai = 0x0e36;
- t.sarauthai = 0x0e38;
- t.sarauuthai = 0x0e39;
- t.sbopomofo = 0x3119;
- t.scaron = 0x0161;
- t.scarondotaccent = 0x1e67;
- t.scedilla = 0x015f;
- t.schwa = 0x0259;
- t.schwacyrillic = 0x04d9;
- t.schwadieresiscyrillic = 0x04db;
- t.schwahook = 0x025a;
- t.scircle = 0x24e2;
- t.scircumflex = 0x015d;
- t.scommaaccent = 0x0219;
- t.sdotaccent = 0x1e61;
- t.sdotbelow = 0x1e63;
- t.sdotbelowdotaccent = 0x1e69;
- t.seagullbelowcmb = 0x033c;
- t.second = 0x2033;
- t.secondtonechinese = 0x02ca;
- t.section = 0x00a7;
- t.seenarabic = 0x0633;
- t.seenfinalarabic = 0xfeb2;
- t.seeninitialarabic = 0xfeb3;
- t.seenmedialarabic = 0xfeb4;
- t.segol = 0x05b6;
- t.segol13 = 0x05b6;
- t.segol1f = 0x05b6;
- t.segol2c = 0x05b6;
- t.segolhebrew = 0x05b6;
- t.segolnarrowhebrew = 0x05b6;
- t.segolquarterhebrew = 0x05b6;
- t.segoltahebrew = 0x0592;
- t.segolwidehebrew = 0x05b6;
- t.seharmenian = 0x057d;
- t.sehiragana = 0x305b;
- t.sekatakana = 0x30bb;
- t.sekatakanahalfwidth = 0xff7e;
- t.semicolon = 0x003b;
- t.semicolonarabic = 0x061b;
- t.semicolonmonospace = 0xff1b;
- t.semicolonsmall = 0xfe54;
- t.semivoicedmarkkana = 0x309c;
- t.semivoicedmarkkanahalfwidth = 0xff9f;
- t.sentisquare = 0x3322;
- t.sentosquare = 0x3323;
- t.seven = 0x0037;
- t.sevenarabic = 0x0667;
- t.sevenbengali = 0x09ed;
- t.sevencircle = 0x2466;
- t.sevencircleinversesansserif = 0x2790;
- t.sevendeva = 0x096d;
- t.seveneighths = 0x215e;
- t.sevengujarati = 0x0aed;
- t.sevengurmukhi = 0x0a6d;
- t.sevenhackarabic = 0x0667;
- t.sevenhangzhou = 0x3027;
- t.sevenideographicparen = 0x3226;
- t.seveninferior = 0x2087;
- t.sevenmonospace = 0xff17;
- t.sevenoldstyle = 0xf737;
- t.sevenparen = 0x247a;
- t.sevenperiod = 0x248e;
- t.sevenpersian = 0x06f7;
- t.sevenroman = 0x2176;
- t.sevensuperior = 0x2077;
- t.seventeencircle = 0x2470;
- t.seventeenparen = 0x2484;
- t.seventeenperiod = 0x2498;
- t.seventhai = 0x0e57;
- t.sfthyphen = 0x00ad;
- t.shaarmenian = 0x0577;
- t.shabengali = 0x09b6;
- t.shacyrillic = 0x0448;
- t.shaddaarabic = 0x0651;
- t.shaddadammaarabic = 0xfc61;
- t.shaddadammatanarabic = 0xfc5e;
- t.shaddafathaarabic = 0xfc60;
- t.shaddakasraarabic = 0xfc62;
- t.shaddakasratanarabic = 0xfc5f;
- t.shade = 0x2592;
- t.shadedark = 0x2593;
- t.shadelight = 0x2591;
- t.shademedium = 0x2592;
- t.shadeva = 0x0936;
- t.shagujarati = 0x0ab6;
- t.shagurmukhi = 0x0a36;
- t.shalshelethebrew = 0x0593;
- t.shbopomofo = 0x3115;
- t.shchacyrillic = 0x0449;
- t.sheenarabic = 0x0634;
- t.sheenfinalarabic = 0xfeb6;
- t.sheeninitialarabic = 0xfeb7;
- t.sheenmedialarabic = 0xfeb8;
- t.sheicoptic = 0x03e3;
- t.sheqel = 0x20aa;
- t.sheqelhebrew = 0x20aa;
- t.sheva = 0x05b0;
- t.sheva115 = 0x05b0;
- t.sheva15 = 0x05b0;
- t.sheva22 = 0x05b0;
- t.sheva2e = 0x05b0;
- t.shevahebrew = 0x05b0;
- t.shevanarrowhebrew = 0x05b0;
- t.shevaquarterhebrew = 0x05b0;
- t.shevawidehebrew = 0x05b0;
- t.shhacyrillic = 0x04bb;
- t.shimacoptic = 0x03ed;
- t.shin = 0x05e9;
- t.shindagesh = 0xfb49;
- t.shindageshhebrew = 0xfb49;
- t.shindageshshindot = 0xfb2c;
- t.shindageshshindothebrew = 0xfb2c;
- t.shindageshsindot = 0xfb2d;
- t.shindageshsindothebrew = 0xfb2d;
- t.shindothebrew = 0x05c1;
- t.shinhebrew = 0x05e9;
- t.shinshindot = 0xfb2a;
- t.shinshindothebrew = 0xfb2a;
- t.shinsindot = 0xfb2b;
- t.shinsindothebrew = 0xfb2b;
- t.shook = 0x0282;
- t.sigma = 0x03c3;
- t.sigma1 = 0x03c2;
- t.sigmafinal = 0x03c2;
- t.sigmalunatesymbolgreek = 0x03f2;
- t.sihiragana = 0x3057;
- t.sikatakana = 0x30b7;
- t.sikatakanahalfwidth = 0xff7c;
- t.siluqhebrew = 0x05bd;
- t.siluqlefthebrew = 0x05bd;
- t.similar = 0x223c;
- t.sindothebrew = 0x05c2;
- t.siosacirclekorean = 0x3274;
- t.siosaparenkorean = 0x3214;
- t.sioscieuckorean = 0x317e;
- t.sioscirclekorean = 0x3266;
- t.sioskiyeokkorean = 0x317a;
- t.sioskorean = 0x3145;
- t.siosnieunkorean = 0x317b;
- t.siosparenkorean = 0x3206;
- t.siospieupkorean = 0x317d;
- t.siostikeutkorean = 0x317c;
- t.six = 0x0036;
- t.sixarabic = 0x0666;
- t.sixbengali = 0x09ec;
- t.sixcircle = 0x2465;
- t.sixcircleinversesansserif = 0x278f;
- t.sixdeva = 0x096c;
- t.sixgujarati = 0x0aec;
- t.sixgurmukhi = 0x0a6c;
- t.sixhackarabic = 0x0666;
- t.sixhangzhou = 0x3026;
- t.sixideographicparen = 0x3225;
- t.sixinferior = 0x2086;
- t.sixmonospace = 0xff16;
- t.sixoldstyle = 0xf736;
- t.sixparen = 0x2479;
- t.sixperiod = 0x248d;
- t.sixpersian = 0x06f6;
- t.sixroman = 0x2175;
- t.sixsuperior = 0x2076;
- t.sixteencircle = 0x246f;
- t.sixteencurrencydenominatorbengali = 0x09f9;
- t.sixteenparen = 0x2483;
- t.sixteenperiod = 0x2497;
- t.sixthai = 0x0e56;
- t.slash = 0x002f;
- t.slashmonospace = 0xff0f;
- t.slong = 0x017f;
- t.slongdotaccent = 0x1e9b;
- t.smileface = 0x263a;
- t.smonospace = 0xff53;
- t.sofpasuqhebrew = 0x05c3;
- t.softhyphen = 0x00ad;
- t.softsigncyrillic = 0x044c;
- t.sohiragana = 0x305d;
- t.sokatakana = 0x30bd;
- t.sokatakanahalfwidth = 0xff7f;
- t.soliduslongoverlaycmb = 0x0338;
- t.solidusshortoverlaycmb = 0x0337;
- t.sorusithai = 0x0e29;
- t.sosalathai = 0x0e28;
- t.sosothai = 0x0e0b;
- t.sosuathai = 0x0e2a;
- t.space = 0x0020;
- t.spacehackarabic = 0x0020;
- t.spade = 0x2660;
- t.spadesuitblack = 0x2660;
- t.spadesuitwhite = 0x2664;
- t.sparen = 0x24ae;
- t.squarebelowcmb = 0x033b;
- t.squarecc = 0x33c4;
- t.squarecm = 0x339d;
- t.squarediagonalcrosshatchfill = 0x25a9;
- t.squarehorizontalfill = 0x25a4;
- t.squarekg = 0x338f;
- t.squarekm = 0x339e;
- t.squarekmcapital = 0x33ce;
- t.squareln = 0x33d1;
- t.squarelog = 0x33d2;
- t.squaremg = 0x338e;
- t.squaremil = 0x33d5;
- t.squaremm = 0x339c;
- t.squaremsquared = 0x33a1;
- t.squareorthogonalcrosshatchfill = 0x25a6;
- t.squareupperlefttolowerrightfill = 0x25a7;
- t.squareupperrighttolowerleftfill = 0x25a8;
- t.squareverticalfill = 0x25a5;
- t.squarewhitewithsmallblack = 0x25a3;
- t.srsquare = 0x33db;
- t.ssabengali = 0x09b7;
- t.ssadeva = 0x0937;
- t.ssagujarati = 0x0ab7;
- t.ssangcieuckorean = 0x3149;
- t.ssanghieuhkorean = 0x3185;
- t.ssangieungkorean = 0x3180;
- t.ssangkiyeokkorean = 0x3132;
- t.ssangnieunkorean = 0x3165;
- t.ssangpieupkorean = 0x3143;
- t.ssangsioskorean = 0x3146;
- t.ssangtikeutkorean = 0x3138;
- t.ssuperior = 0xf6f2;
- t.sterling = 0x00a3;
- t.sterlingmonospace = 0xffe1;
- t.strokelongoverlaycmb = 0x0336;
- t.strokeshortoverlaycmb = 0x0335;
- t.subset = 0x2282;
- t.subsetnotequal = 0x228a;
- t.subsetorequal = 0x2286;
- t.succeeds = 0x227b;
- t.suchthat = 0x220b;
- t.suhiragana = 0x3059;
- t.sukatakana = 0x30b9;
- t.sukatakanahalfwidth = 0xff7d;
- t.sukunarabic = 0x0652;
- t.summation = 0x2211;
- t.sun = 0x263c;
- t.superset = 0x2283;
- t.supersetnotequal = 0x228b;
- t.supersetorequal = 0x2287;
- t.svsquare = 0x33dc;
- t.syouwaerasquare = 0x337c;
- t.t = 0x0074;
- t.tabengali = 0x09a4;
- t.tackdown = 0x22a4;
- t.tackleft = 0x22a3;
- t.tadeva = 0x0924;
- t.tagujarati = 0x0aa4;
- t.tagurmukhi = 0x0a24;
- t.taharabic = 0x0637;
- t.tahfinalarabic = 0xfec2;
- t.tahinitialarabic = 0xfec3;
- t.tahiragana = 0x305f;
- t.tahmedialarabic = 0xfec4;
- t.taisyouerasquare = 0x337d;
- t.takatakana = 0x30bf;
- t.takatakanahalfwidth = 0xff80;
- t.tatweelarabic = 0x0640;
- t.tau = 0x03c4;
- t.tav = 0x05ea;
- t.tavdages = 0xfb4a;
- t.tavdagesh = 0xfb4a;
- t.tavdageshhebrew = 0xfb4a;
- t.tavhebrew = 0x05ea;
- t.tbar = 0x0167;
- t.tbopomofo = 0x310a;
- t.tcaron = 0x0165;
- t.tccurl = 0x02a8;
- t.tcedilla = 0x0163;
- t.tcheharabic = 0x0686;
- t.tchehfinalarabic = 0xfb7b;
- t.tchehinitialarabic = 0xfb7c;
- t.tchehmedialarabic = 0xfb7d;
- t.tcircle = 0x24e3;
- t.tcircumflexbelow = 0x1e71;
- t.tcommaaccent = 0x0163;
- t.tdieresis = 0x1e97;
- t.tdotaccent = 0x1e6b;
- t.tdotbelow = 0x1e6d;
- t.tecyrillic = 0x0442;
- t.tedescendercyrillic = 0x04ad;
- t.teharabic = 0x062a;
- t.tehfinalarabic = 0xfe96;
- t.tehhahinitialarabic = 0xfca2;
- t.tehhahisolatedarabic = 0xfc0c;
- t.tehinitialarabic = 0xfe97;
- t.tehiragana = 0x3066;
- t.tehjeeminitialarabic = 0xfca1;
- t.tehjeemisolatedarabic = 0xfc0b;
- t.tehmarbutaarabic = 0x0629;
- t.tehmarbutafinalarabic = 0xfe94;
- t.tehmedialarabic = 0xfe98;
- t.tehmeeminitialarabic = 0xfca4;
- t.tehmeemisolatedarabic = 0xfc0e;
- t.tehnoonfinalarabic = 0xfc73;
- t.tekatakana = 0x30c6;
- t.tekatakanahalfwidth = 0xff83;
- t.telephone = 0x2121;
- t.telephoneblack = 0x260e;
- t.telishagedolahebrew = 0x05a0;
- t.telishaqetanahebrew = 0x05a9;
- t.tencircle = 0x2469;
- t.tenideographicparen = 0x3229;
- t.tenparen = 0x247d;
- t.tenperiod = 0x2491;
- t.tenroman = 0x2179;
- t.tesh = 0x02a7;
- t.tet = 0x05d8;
- t.tetdagesh = 0xfb38;
- t.tetdageshhebrew = 0xfb38;
- t.tethebrew = 0x05d8;
- t.tetsecyrillic = 0x04b5;
- t.tevirhebrew = 0x059b;
- t.tevirlefthebrew = 0x059b;
- t.thabengali = 0x09a5;
- t.thadeva = 0x0925;
- t.thagujarati = 0x0aa5;
- t.thagurmukhi = 0x0a25;
- t.thalarabic = 0x0630;
- t.thalfinalarabic = 0xfeac;
- t.thanthakhatlowleftthai = 0xf898;
- t.thanthakhatlowrightthai = 0xf897;
- t.thanthakhatthai = 0x0e4c;
- t.thanthakhatupperleftthai = 0xf896;
- t.theharabic = 0x062b;
- t.thehfinalarabic = 0xfe9a;
- t.thehinitialarabic = 0xfe9b;
- t.thehmedialarabic = 0xfe9c;
- t.thereexists = 0x2203;
- t.therefore = 0x2234;
- t.theta = 0x03b8;
- t.theta1 = 0x03d1;
- t.thetasymbolgreek = 0x03d1;
- t.thieuthacirclekorean = 0x3279;
- t.thieuthaparenkorean = 0x3219;
- t.thieuthcirclekorean = 0x326b;
- t.thieuthkorean = 0x314c;
- t.thieuthparenkorean = 0x320b;
- t.thirteencircle = 0x246c;
- t.thirteenparen = 0x2480;
- t.thirteenperiod = 0x2494;
- t.thonangmonthothai = 0x0e11;
- t.thook = 0x01ad;
- t.thophuthaothai = 0x0e12;
- t.thorn = 0x00fe;
- t.thothahanthai = 0x0e17;
- t.thothanthai = 0x0e10;
- t.thothongthai = 0x0e18;
- t.thothungthai = 0x0e16;
- t.thousandcyrillic = 0x0482;
- t.thousandsseparatorarabic = 0x066c;
- t.thousandsseparatorpersian = 0x066c;
- t.three = 0x0033;
- t.threearabic = 0x0663;
- t.threebengali = 0x09e9;
- t.threecircle = 0x2462;
- t.threecircleinversesansserif = 0x278c;
- t.threedeva = 0x0969;
- t.threeeighths = 0x215c;
- t.threegujarati = 0x0ae9;
- t.threegurmukhi = 0x0a69;
- t.threehackarabic = 0x0663;
- t.threehangzhou = 0x3023;
- t.threeideographicparen = 0x3222;
- t.threeinferior = 0x2083;
- t.threemonospace = 0xff13;
- t.threenumeratorbengali = 0x09f6;
- t.threeoldstyle = 0xf733;
- t.threeparen = 0x2476;
- t.threeperiod = 0x248a;
- t.threepersian = 0x06f3;
- t.threequarters = 0x00be;
- t.threequartersemdash = 0xf6de;
- t.threeroman = 0x2172;
- t.threesuperior = 0x00b3;
- t.threethai = 0x0e53;
- t.thzsquare = 0x3394;
- t.tihiragana = 0x3061;
- t.tikatakana = 0x30c1;
- t.tikatakanahalfwidth = 0xff81;
- t.tikeutacirclekorean = 0x3270;
- t.tikeutaparenkorean = 0x3210;
- t.tikeutcirclekorean = 0x3262;
- t.tikeutkorean = 0x3137;
- t.tikeutparenkorean = 0x3202;
- t.tilde = 0x02dc;
- t.tildebelowcmb = 0x0330;
- t.tildecmb = 0x0303;
- t.tildecomb = 0x0303;
- t.tildedoublecmb = 0x0360;
- t.tildeoperator = 0x223c;
- t.tildeoverlaycmb = 0x0334;
- t.tildeverticalcmb = 0x033e;
- t.timescircle = 0x2297;
- t.tipehahebrew = 0x0596;
- t.tipehalefthebrew = 0x0596;
- t.tippigurmukhi = 0x0a70;
- t.titlocyrilliccmb = 0x0483;
- t.tiwnarmenian = 0x057f;
- t.tlinebelow = 0x1e6f;
- t.tmonospace = 0xff54;
- t.toarmenian = 0x0569;
- t.tohiragana = 0x3068;
- t.tokatakana = 0x30c8;
- t.tokatakanahalfwidth = 0xff84;
- t.tonebarextrahighmod = 0x02e5;
- t.tonebarextralowmod = 0x02e9;
- t.tonebarhighmod = 0x02e6;
- t.tonebarlowmod = 0x02e8;
- t.tonebarmidmod = 0x02e7;
- t.tonefive = 0x01bd;
- t.tonesix = 0x0185;
- t.tonetwo = 0x01a8;
- t.tonos = 0x0384;
- t.tonsquare = 0x3327;
- t.topatakthai = 0x0e0f;
- t.tortoiseshellbracketleft = 0x3014;
- t.tortoiseshellbracketleftsmall = 0xfe5d;
- t.tortoiseshellbracketleftvertical = 0xfe39;
- t.tortoiseshellbracketright = 0x3015;
- t.tortoiseshellbracketrightsmall = 0xfe5e;
- t.tortoiseshellbracketrightvertical = 0xfe3a;
- t.totaothai = 0x0e15;
- t.tpalatalhook = 0x01ab;
- t.tparen = 0x24af;
- t.trademark = 0x2122;
- t.trademarksans = 0xf8ea;
- t.trademarkserif = 0xf6db;
- t.tretroflexhook = 0x0288;
- t.triagdn = 0x25bc;
- t.triaglf = 0x25c4;
- t.triagrt = 0x25ba;
- t.triagup = 0x25b2;
- t.ts = 0x02a6;
- t.tsadi = 0x05e6;
- t.tsadidagesh = 0xfb46;
- t.tsadidageshhebrew = 0xfb46;
- t.tsadihebrew = 0x05e6;
- t.tsecyrillic = 0x0446;
- t.tsere = 0x05b5;
- t.tsere12 = 0x05b5;
- t.tsere1e = 0x05b5;
- t.tsere2b = 0x05b5;
- t.tserehebrew = 0x05b5;
- t.tserenarrowhebrew = 0x05b5;
- t.tserequarterhebrew = 0x05b5;
- t.tserewidehebrew = 0x05b5;
- t.tshecyrillic = 0x045b;
- t.tsuperior = 0xf6f3;
- t.ttabengali = 0x099f;
- t.ttadeva = 0x091f;
- t.ttagujarati = 0x0a9f;
- t.ttagurmukhi = 0x0a1f;
- t.tteharabic = 0x0679;
- t.ttehfinalarabic = 0xfb67;
- t.ttehinitialarabic = 0xfb68;
- t.ttehmedialarabic = 0xfb69;
- t.tthabengali = 0x09a0;
- t.tthadeva = 0x0920;
- t.tthagujarati = 0x0aa0;
- t.tthagurmukhi = 0x0a20;
- t.tturned = 0x0287;
- t.tuhiragana = 0x3064;
- t.tukatakana = 0x30c4;
- t.tukatakanahalfwidth = 0xff82;
- t.tusmallhiragana = 0x3063;
- t.tusmallkatakana = 0x30c3;
- t.tusmallkatakanahalfwidth = 0xff6f;
- t.twelvecircle = 0x246b;
- t.twelveparen = 0x247f;
- t.twelveperiod = 0x2493;
- t.twelveroman = 0x217b;
- t.twentycircle = 0x2473;
- t.twentyhangzhou = 0x5344;
- t.twentyparen = 0x2487;
- t.twentyperiod = 0x249b;
- t.two = 0x0032;
- t.twoarabic = 0x0662;
- t.twobengali = 0x09e8;
- t.twocircle = 0x2461;
- t.twocircleinversesansserif = 0x278b;
- t.twodeva = 0x0968;
- t.twodotenleader = 0x2025;
- t.twodotleader = 0x2025;
- t.twodotleadervertical = 0xfe30;
- t.twogujarati = 0x0ae8;
- t.twogurmukhi = 0x0a68;
- t.twohackarabic = 0x0662;
- t.twohangzhou = 0x3022;
- t.twoideographicparen = 0x3221;
- t.twoinferior = 0x2082;
- t.twomonospace = 0xff12;
- t.twonumeratorbengali = 0x09f5;
- t.twooldstyle = 0xf732;
- t.twoparen = 0x2475;
- t.twoperiod = 0x2489;
- t.twopersian = 0x06f2;
- t.tworoman = 0x2171;
- t.twostroke = 0x01bb;
- t.twosuperior = 0x00b2;
- t.twothai = 0x0e52;
- t.twothirds = 0x2154;
- t.u = 0x0075;
- t.uacute = 0x00fa;
- t.ubar = 0x0289;
- t.ubengali = 0x0989;
- t.ubopomofo = 0x3128;
- t.ubreve = 0x016d;
- t.ucaron = 0x01d4;
- t.ucircle = 0x24e4;
- t.ucircumflex = 0x00fb;
- t.ucircumflexbelow = 0x1e77;
- t.ucyrillic = 0x0443;
- t.udattadeva = 0x0951;
- t.udblacute = 0x0171;
- t.udblgrave = 0x0215;
- t.udeva = 0x0909;
- t.udieresis = 0x00fc;
- t.udieresisacute = 0x01d8;
- t.udieresisbelow = 0x1e73;
- t.udieresiscaron = 0x01da;
- t.udieresiscyrillic = 0x04f1;
- t.udieresisgrave = 0x01dc;
- t.udieresismacron = 0x01d6;
- t.udotbelow = 0x1ee5;
- t.ugrave = 0x00f9;
- t.ugujarati = 0x0a89;
- t.ugurmukhi = 0x0a09;
- t.uhiragana = 0x3046;
- t.uhookabove = 0x1ee7;
- t.uhorn = 0x01b0;
- t.uhornacute = 0x1ee9;
- t.uhorndotbelow = 0x1ef1;
- t.uhorngrave = 0x1eeb;
- t.uhornhookabove = 0x1eed;
- t.uhorntilde = 0x1eef;
- t.uhungarumlaut = 0x0171;
- t.uhungarumlautcyrillic = 0x04f3;
- t.uinvertedbreve = 0x0217;
- t.ukatakana = 0x30a6;
- t.ukatakanahalfwidth = 0xff73;
- t.ukcyrillic = 0x0479;
- t.ukorean = 0x315c;
- t.umacron = 0x016b;
- t.umacroncyrillic = 0x04ef;
- t.umacrondieresis = 0x1e7b;
- t.umatragurmukhi = 0x0a41;
- t.umonospace = 0xff55;
- t.underscore = 0x005f;
- t.underscoredbl = 0x2017;
- t.underscoremonospace = 0xff3f;
- t.underscorevertical = 0xfe33;
- t.underscorewavy = 0xfe4f;
- t.union = 0x222a;
- t.universal = 0x2200;
- t.uogonek = 0x0173;
- t.uparen = 0x24b0;
- t.upblock = 0x2580;
- t.upperdothebrew = 0x05c4;
- t.upsilon = 0x03c5;
- t.upsilondieresis = 0x03cb;
- t.upsilondieresistonos = 0x03b0;
- t.upsilonlatin = 0x028a;
- t.upsilontonos = 0x03cd;
- t.uptackbelowcmb = 0x031d;
- t.uptackmod = 0x02d4;
- t.uragurmukhi = 0x0a73;
- t.uring = 0x016f;
- t.ushortcyrillic = 0x045e;
- t.usmallhiragana = 0x3045;
- t.usmallkatakana = 0x30a5;
- t.usmallkatakanahalfwidth = 0xff69;
- t.ustraightcyrillic = 0x04af;
- t.ustraightstrokecyrillic = 0x04b1;
- t.utilde = 0x0169;
- t.utildeacute = 0x1e79;
- t.utildebelow = 0x1e75;
- t.uubengali = 0x098a;
- t.uudeva = 0x090a;
- t.uugujarati = 0x0a8a;
- t.uugurmukhi = 0x0a0a;
- t.uumatragurmukhi = 0x0a42;
- t.uuvowelsignbengali = 0x09c2;
- t.uuvowelsigndeva = 0x0942;
- t.uuvowelsigngujarati = 0x0ac2;
- t.uvowelsignbengali = 0x09c1;
- t.uvowelsigndeva = 0x0941;
- t.uvowelsigngujarati = 0x0ac1;
- t.v = 0x0076;
- t.vadeva = 0x0935;
- t.vagujarati = 0x0ab5;
- t.vagurmukhi = 0x0a35;
- t.vakatakana = 0x30f7;
- t.vav = 0x05d5;
- t.vavdagesh = 0xfb35;
- t.vavdagesh65 = 0xfb35;
- t.vavdageshhebrew = 0xfb35;
- t.vavhebrew = 0x05d5;
- t.vavholam = 0xfb4b;
- t.vavholamhebrew = 0xfb4b;
- t.vavvavhebrew = 0x05f0;
- t.vavyodhebrew = 0x05f1;
- t.vcircle = 0x24e5;
- t.vdotbelow = 0x1e7f;
- t.vecyrillic = 0x0432;
- t.veharabic = 0x06a4;
- t.vehfinalarabic = 0xfb6b;
- t.vehinitialarabic = 0xfb6c;
- t.vehmedialarabic = 0xfb6d;
- t.vekatakana = 0x30f9;
- t.venus = 0x2640;
- t.verticalbar = 0x007c;
- t.verticallineabovecmb = 0x030d;
- t.verticallinebelowcmb = 0x0329;
- t.verticallinelowmod = 0x02cc;
- t.verticallinemod = 0x02c8;
- t.vewarmenian = 0x057e;
- t.vhook = 0x028b;
- t.vikatakana = 0x30f8;
- t.viramabengali = 0x09cd;
- t.viramadeva = 0x094d;
- t.viramagujarati = 0x0acd;
- t.visargabengali = 0x0983;
- t.visargadeva = 0x0903;
- t.visargagujarati = 0x0a83;
- t.vmonospace = 0xff56;
- t.voarmenian = 0x0578;
- t.voicediterationhiragana = 0x309e;
- t.voicediterationkatakana = 0x30fe;
- t.voicedmarkkana = 0x309b;
- t.voicedmarkkanahalfwidth = 0xff9e;
- t.vokatakana = 0x30fa;
- t.vparen = 0x24b1;
- t.vtilde = 0x1e7d;
- t.vturned = 0x028c;
- t.vuhiragana = 0x3094;
- t.vukatakana = 0x30f4;
- t.w = 0x0077;
- t.wacute = 0x1e83;
- t.waekorean = 0x3159;
- t.wahiragana = 0x308f;
- t.wakatakana = 0x30ef;
- t.wakatakanahalfwidth = 0xff9c;
- t.wakorean = 0x3158;
- t.wasmallhiragana = 0x308e;
- t.wasmallkatakana = 0x30ee;
- t.wattosquare = 0x3357;
- t.wavedash = 0x301c;
- t.wavyunderscorevertical = 0xfe34;
- t.wawarabic = 0x0648;
- t.wawfinalarabic = 0xfeee;
- t.wawhamzaabovearabic = 0x0624;
- t.wawhamzaabovefinalarabic = 0xfe86;
- t.wbsquare = 0x33dd;
- t.wcircle = 0x24e6;
- t.wcircumflex = 0x0175;
- t.wdieresis = 0x1e85;
- t.wdotaccent = 0x1e87;
- t.wdotbelow = 0x1e89;
- t.wehiragana = 0x3091;
- t.weierstrass = 0x2118;
- t.wekatakana = 0x30f1;
- t.wekorean = 0x315e;
- t.weokorean = 0x315d;
- t.wgrave = 0x1e81;
- t.whitebullet = 0x25e6;
- t.whitecircle = 0x25cb;
- t.whitecircleinverse = 0x25d9;
- t.whitecornerbracketleft = 0x300e;
- t.whitecornerbracketleftvertical = 0xfe43;
- t.whitecornerbracketright = 0x300f;
- t.whitecornerbracketrightvertical = 0xfe44;
- t.whitediamond = 0x25c7;
- t.whitediamondcontainingblacksmalldiamond = 0x25c8;
- t.whitedownpointingsmalltriangle = 0x25bf;
- t.whitedownpointingtriangle = 0x25bd;
- t.whiteleftpointingsmalltriangle = 0x25c3;
- t.whiteleftpointingtriangle = 0x25c1;
- t.whitelenticularbracketleft = 0x3016;
- t.whitelenticularbracketright = 0x3017;
- t.whiterightpointingsmalltriangle = 0x25b9;
- t.whiterightpointingtriangle = 0x25b7;
- t.whitesmallsquare = 0x25ab;
- t.whitesmilingface = 0x263a;
- t.whitesquare = 0x25a1;
- t.whitestar = 0x2606;
- t.whitetelephone = 0x260f;
- t.whitetortoiseshellbracketleft = 0x3018;
- t.whitetortoiseshellbracketright = 0x3019;
- t.whiteuppointingsmalltriangle = 0x25b5;
- t.whiteuppointingtriangle = 0x25b3;
- t.wihiragana = 0x3090;
- t.wikatakana = 0x30f0;
- t.wikorean = 0x315f;
- t.wmonospace = 0xff57;
- t.wohiragana = 0x3092;
- t.wokatakana = 0x30f2;
- t.wokatakanahalfwidth = 0xff66;
- t.won = 0x20a9;
- t.wonmonospace = 0xffe6;
- t.wowaenthai = 0x0e27;
- t.wparen = 0x24b2;
- t.wring = 0x1e98;
- t.wsuperior = 0x02b7;
- t.wturned = 0x028d;
- t.wynn = 0x01bf;
- t.x = 0x0078;
- t.xabovecmb = 0x033d;
- t.xbopomofo = 0x3112;
- t.xcircle = 0x24e7;
- t.xdieresis = 0x1e8d;
- t.xdotaccent = 0x1e8b;
- t.xeharmenian = 0x056d;
- t.xi = 0x03be;
- t.xmonospace = 0xff58;
- t.xparen = 0x24b3;
- t.xsuperior = 0x02e3;
- t.y = 0x0079;
- t.yaadosquare = 0x334e;
- t.yabengali = 0x09af;
- t.yacute = 0x00fd;
- t.yadeva = 0x092f;
- t.yaekorean = 0x3152;
- t.yagujarati = 0x0aaf;
- t.yagurmukhi = 0x0a2f;
- t.yahiragana = 0x3084;
- t.yakatakana = 0x30e4;
- t.yakatakanahalfwidth = 0xff94;
- t.yakorean = 0x3151;
- t.yamakkanthai = 0x0e4e;
- t.yasmallhiragana = 0x3083;
- t.yasmallkatakana = 0x30e3;
- t.yasmallkatakanahalfwidth = 0xff6c;
- t.yatcyrillic = 0x0463;
- t.ycircle = 0x24e8;
- t.ycircumflex = 0x0177;
- t.ydieresis = 0x00ff;
- t.ydotaccent = 0x1e8f;
- t.ydotbelow = 0x1ef5;
- t.yeharabic = 0x064a;
- t.yehbarreearabic = 0x06d2;
- t.yehbarreefinalarabic = 0xfbaf;
- t.yehfinalarabic = 0xfef2;
- t.yehhamzaabovearabic = 0x0626;
- t.yehhamzaabovefinalarabic = 0xfe8a;
- t.yehhamzaaboveinitialarabic = 0xfe8b;
- t.yehhamzaabovemedialarabic = 0xfe8c;
- t.yehinitialarabic = 0xfef3;
- t.yehmedialarabic = 0xfef4;
- t.yehmeeminitialarabic = 0xfcdd;
- t.yehmeemisolatedarabic = 0xfc58;
- t.yehnoonfinalarabic = 0xfc94;
- t.yehthreedotsbelowarabic = 0x06d1;
- t.yekorean = 0x3156;
- t.yen = 0x00a5;
- t.yenmonospace = 0xffe5;
- t.yeokorean = 0x3155;
- t.yeorinhieuhkorean = 0x3186;
- t.yerahbenyomohebrew = 0x05aa;
- t.yerahbenyomolefthebrew = 0x05aa;
- t.yericyrillic = 0x044b;
- t.yerudieresiscyrillic = 0x04f9;
- t.yesieungkorean = 0x3181;
- t.yesieungpansioskorean = 0x3183;
- t.yesieungsioskorean = 0x3182;
- t.yetivhebrew = 0x059a;
- t.ygrave = 0x1ef3;
- t.yhook = 0x01b4;
- t.yhookabove = 0x1ef7;
- t.yiarmenian = 0x0575;
- t.yicyrillic = 0x0457;
- t.yikorean = 0x3162;
- t.yinyang = 0x262f;
- t.yiwnarmenian = 0x0582;
- t.ymonospace = 0xff59;
- t.yod = 0x05d9;
- t.yoddagesh = 0xfb39;
- t.yoddageshhebrew = 0xfb39;
- t.yodhebrew = 0x05d9;
- t.yodyodhebrew = 0x05f2;
- t.yodyodpatahhebrew = 0xfb1f;
- t.yohiragana = 0x3088;
- t.yoikorean = 0x3189;
- t.yokatakana = 0x30e8;
- t.yokatakanahalfwidth = 0xff96;
- t.yokorean = 0x315b;
- t.yosmallhiragana = 0x3087;
- t.yosmallkatakana = 0x30e7;
- t.yosmallkatakanahalfwidth = 0xff6e;
- t.yotgreek = 0x03f3;
- t.yoyaekorean = 0x3188;
- t.yoyakorean = 0x3187;
- t.yoyakthai = 0x0e22;
- t.yoyingthai = 0x0e0d;
- t.yparen = 0x24b4;
- t.ypogegrammeni = 0x037a;
- t.ypogegrammenigreekcmb = 0x0345;
- t.yr = 0x01a6;
- t.yring = 0x1e99;
- t.ysuperior = 0x02b8;
- t.ytilde = 0x1ef9;
- t.yturned = 0x028e;
- t.yuhiragana = 0x3086;
- t.yuikorean = 0x318c;
- t.yukatakana = 0x30e6;
- t.yukatakanahalfwidth = 0xff95;
- t.yukorean = 0x3160;
- t.yusbigcyrillic = 0x046b;
- t.yusbigiotifiedcyrillic = 0x046d;
- t.yuslittlecyrillic = 0x0467;
- t.yuslittleiotifiedcyrillic = 0x0469;
- t.yusmallhiragana = 0x3085;
- t.yusmallkatakana = 0x30e5;
- t.yusmallkatakanahalfwidth = 0xff6d;
- t.yuyekorean = 0x318b;
- t.yuyeokorean = 0x318a;
- t.yyabengali = 0x09df;
- t.yyadeva = 0x095f;
- t.z = 0x007a;
- t.zaarmenian = 0x0566;
- t.zacute = 0x017a;
- t.zadeva = 0x095b;
- t.zagurmukhi = 0x0a5b;
- t.zaharabic = 0x0638;
- t.zahfinalarabic = 0xfec6;
- t.zahinitialarabic = 0xfec7;
- t.zahiragana = 0x3056;
- t.zahmedialarabic = 0xfec8;
- t.zainarabic = 0x0632;
- t.zainfinalarabic = 0xfeb0;
- t.zakatakana = 0x30b6;
- t.zaqefgadolhebrew = 0x0595;
- t.zaqefqatanhebrew = 0x0594;
- t.zarqahebrew = 0x0598;
- t.zayin = 0x05d6;
- t.zayindagesh = 0xfb36;
- t.zayindageshhebrew = 0xfb36;
- t.zayinhebrew = 0x05d6;
- t.zbopomofo = 0x3117;
- t.zcaron = 0x017e;
- t.zcircle = 0x24e9;
- t.zcircumflex = 0x1e91;
- t.zcurl = 0x0291;
- t.zdot = 0x017c;
- t.zdotaccent = 0x017c;
- t.zdotbelow = 0x1e93;
- t.zecyrillic = 0x0437;
- t.zedescendercyrillic = 0x0499;
- t.zedieresiscyrillic = 0x04df;
- t.zehiragana = 0x305c;
- t.zekatakana = 0x30bc;
- t.zero = 0x0030;
- t.zeroarabic = 0x0660;
- t.zerobengali = 0x09e6;
- t.zerodeva = 0x0966;
- t.zerogujarati = 0x0ae6;
- t.zerogurmukhi = 0x0a66;
- t.zerohackarabic = 0x0660;
- t.zeroinferior = 0x2080;
- t.zeromonospace = 0xff10;
- t.zerooldstyle = 0xf730;
- t.zeropersian = 0x06f0;
- t.zerosuperior = 0x2070;
- t.zerothai = 0x0e50;
- t.zerowidthjoiner = 0xfeff;
- t.zerowidthnonjoiner = 0x200c;
- t.zerowidthspace = 0x200b;
- t.zeta = 0x03b6;
- t.zhbopomofo = 0x3113;
- t.zhearmenian = 0x056a;
- t.zhebrevecyrillic = 0x04c2;
- t.zhecyrillic = 0x0436;
- t.zhedescendercyrillic = 0x0497;
- t.zhedieresiscyrillic = 0x04dd;
- t.zihiragana = 0x3058;
- t.zikatakana = 0x30b8;
- t.zinorhebrew = 0x05ae;
- t.zlinebelow = 0x1e95;
- t.zmonospace = 0xff5a;
- t.zohiragana = 0x305e;
- t.zokatakana = 0x30be;
- t.zparen = 0x24b5;
- t.zretroflexhook = 0x0290;
- t.zstroke = 0x01b6;
- t.zuhiragana = 0x305a;
- t.zukatakana = 0x30ba;
- t[".notdef"] = 0x0000;
- t.angbracketleftbig = 0x2329;
- t.angbracketleftBig = 0x2329;
- t.angbracketleftbigg = 0x2329;
- t.angbracketleftBigg = 0x2329;
- t.angbracketrightBig = 0x232a;
- t.angbracketrightbig = 0x232a;
- t.angbracketrightBigg = 0x232a;
- t.angbracketrightbigg = 0x232a;
- t.arrowhookleft = 0x21aa;
- t.arrowhookright = 0x21a9;
- t.arrowlefttophalf = 0x21bc;
- t.arrowleftbothalf = 0x21bd;
- t.arrownortheast = 0x2197;
- t.arrownorthwest = 0x2196;
- t.arrowrighttophalf = 0x21c0;
- t.arrowrightbothalf = 0x21c1;
- t.arrowsoutheast = 0x2198;
- t.arrowsouthwest = 0x2199;
- t.backslashbig = 0x2216;
- t.backslashBig = 0x2216;
- t.backslashBigg = 0x2216;
- t.backslashbigg = 0x2216;
- t.bardbl = 0x2016;
- t.bracehtipdownleft = 0xfe37;
- t.bracehtipdownright = 0xfe37;
- t.bracehtipupleft = 0xfe38;
- t.bracehtipupright = 0xfe38;
- t.braceleftBig = 0x007b;
- t.braceleftbig = 0x007b;
- t.braceleftbigg = 0x007b;
- t.braceleftBigg = 0x007b;
- t.bracerightBig = 0x007d;
- t.bracerightbig = 0x007d;
- t.bracerightbigg = 0x007d;
- t.bracerightBigg = 0x007d;
- t.bracketleftbig = 0x005b;
- t.bracketleftBig = 0x005b;
- t.bracketleftbigg = 0x005b;
- t.bracketleftBigg = 0x005b;
- t.bracketrightBig = 0x005d;
- t.bracketrightbig = 0x005d;
- t.bracketrightbigg = 0x005d;
- t.bracketrightBigg = 0x005d;
- t.ceilingleftbig = 0x2308;
- t.ceilingleftBig = 0x2308;
- t.ceilingleftBigg = 0x2308;
- t.ceilingleftbigg = 0x2308;
- t.ceilingrightbig = 0x2309;
- t.ceilingrightBig = 0x2309;
- t.ceilingrightbigg = 0x2309;
- t.ceilingrightBigg = 0x2309;
- t.circledotdisplay = 0x2299;
- t.circledottext = 0x2299;
- t.circlemultiplydisplay = 0x2297;
- t.circlemultiplytext = 0x2297;
- t.circleplusdisplay = 0x2295;
- t.circleplustext = 0x2295;
- t.contintegraldisplay = 0x222e;
- t.contintegraltext = 0x222e;
- t.coproductdisplay = 0x2210;
- t.coproducttext = 0x2210;
- t.floorleftBig = 0x230a;
- t.floorleftbig = 0x230a;
- t.floorleftbigg = 0x230a;
- t.floorleftBigg = 0x230a;
- t.floorrightbig = 0x230b;
- t.floorrightBig = 0x230b;
- t.floorrightBigg = 0x230b;
- t.floorrightbigg = 0x230b;
- t.hatwide = 0x0302;
- t.hatwider = 0x0302;
- t.hatwidest = 0x0302;
- t.intercal = 0x1d40;
- t.integraldisplay = 0x222b;
- t.integraltext = 0x222b;
- t.intersectiondisplay = 0x22c2;
- t.intersectiontext = 0x22c2;
- t.logicalanddisplay = 0x2227;
- t.logicalandtext = 0x2227;
- t.logicalordisplay = 0x2228;
- t.logicalortext = 0x2228;
- t.parenleftBig = 0x0028;
- t.parenleftbig = 0x0028;
- t.parenleftBigg = 0x0028;
- t.parenleftbigg = 0x0028;
- t.parenrightBig = 0x0029;
- t.parenrightbig = 0x0029;
- t.parenrightBigg = 0x0029;
- t.parenrightbigg = 0x0029;
- t.prime = 0x2032;
- t.productdisplay = 0x220f;
- t.producttext = 0x220f;
- t.radicalbig = 0x221a;
- t.radicalBig = 0x221a;
- t.radicalBigg = 0x221a;
- t.radicalbigg = 0x221a;
- t.radicalbt = 0x221a;
- t.radicaltp = 0x221a;
- t.radicalvertex = 0x221a;
- t.slashbig = 0x002f;
- t.slashBig = 0x002f;
- t.slashBigg = 0x002f;
- t.slashbigg = 0x002f;
- t.summationdisplay = 0x2211;
- t.summationtext = 0x2211;
- t.tildewide = 0x02dc;
- t.tildewider = 0x02dc;
- t.tildewidest = 0x02dc;
- t.uniondisplay = 0x22c3;
- t.unionmultidisplay = 0x228e;
- t.unionmultitext = 0x228e;
- t.unionsqdisplay = 0x2294;
- t.unionsqtext = 0x2294;
- t.uniontext = 0x22c3;
- t.vextenddouble = 0x2225;
- t.vextendsingle = 0x2223;
-});
-var getDingbatsGlyphsUnicode = getLookupTableFactory(function (t) {
- t.space = 0x0020;
- t.a1 = 0x2701;
- t.a2 = 0x2702;
- t.a202 = 0x2703;
- t.a3 = 0x2704;
- t.a4 = 0x260e;
- t.a5 = 0x2706;
- t.a119 = 0x2707;
- t.a118 = 0x2708;
- t.a117 = 0x2709;
- t.a11 = 0x261b;
- t.a12 = 0x261e;
- t.a13 = 0x270c;
- t.a14 = 0x270d;
- t.a15 = 0x270e;
- t.a16 = 0x270f;
- t.a105 = 0x2710;
- t.a17 = 0x2711;
- t.a18 = 0x2712;
- t.a19 = 0x2713;
- t.a20 = 0x2714;
- t.a21 = 0x2715;
- t.a22 = 0x2716;
- t.a23 = 0x2717;
- t.a24 = 0x2718;
- t.a25 = 0x2719;
- t.a26 = 0x271a;
- t.a27 = 0x271b;
- t.a28 = 0x271c;
- t.a6 = 0x271d;
- t.a7 = 0x271e;
- t.a8 = 0x271f;
- t.a9 = 0x2720;
- t.a10 = 0x2721;
- t.a29 = 0x2722;
- t.a30 = 0x2723;
- t.a31 = 0x2724;
- t.a32 = 0x2725;
- t.a33 = 0x2726;
- t.a34 = 0x2727;
- t.a35 = 0x2605;
- t.a36 = 0x2729;
- t.a37 = 0x272a;
- t.a38 = 0x272b;
- t.a39 = 0x272c;
- t.a40 = 0x272d;
- t.a41 = 0x272e;
- t.a42 = 0x272f;
- t.a43 = 0x2730;
- t.a44 = 0x2731;
- t.a45 = 0x2732;
- t.a46 = 0x2733;
- t.a47 = 0x2734;
- t.a48 = 0x2735;
- t.a49 = 0x2736;
- t.a50 = 0x2737;
- t.a51 = 0x2738;
- t.a52 = 0x2739;
- t.a53 = 0x273a;
- t.a54 = 0x273b;
- t.a55 = 0x273c;
- t.a56 = 0x273d;
- t.a57 = 0x273e;
- t.a58 = 0x273f;
- t.a59 = 0x2740;
- t.a60 = 0x2741;
- t.a61 = 0x2742;
- t.a62 = 0x2743;
- t.a63 = 0x2744;
- t.a64 = 0x2745;
- t.a65 = 0x2746;
- t.a66 = 0x2747;
- t.a67 = 0x2748;
- t.a68 = 0x2749;
- t.a69 = 0x274a;
- t.a70 = 0x274b;
- t.a71 = 0x25cf;
- t.a72 = 0x274d;
- t.a73 = 0x25a0;
- t.a74 = 0x274f;
- t.a203 = 0x2750;
- t.a75 = 0x2751;
- t.a204 = 0x2752;
- t.a76 = 0x25b2;
- t.a77 = 0x25bc;
- t.a78 = 0x25c6;
- t.a79 = 0x2756;
- t.a81 = 0x25d7;
- t.a82 = 0x2758;
- t.a83 = 0x2759;
- t.a84 = 0x275a;
- t.a97 = 0x275b;
- t.a98 = 0x275c;
- t.a99 = 0x275d;
- t.a100 = 0x275e;
- t.a101 = 0x2761;
- t.a102 = 0x2762;
- t.a103 = 0x2763;
- t.a104 = 0x2764;
- t.a106 = 0x2765;
- t.a107 = 0x2766;
- t.a108 = 0x2767;
- t.a112 = 0x2663;
- t.a111 = 0x2666;
- t.a110 = 0x2665;
- t.a109 = 0x2660;
- t.a120 = 0x2460;
- t.a121 = 0x2461;
- t.a122 = 0x2462;
- t.a123 = 0x2463;
- t.a124 = 0x2464;
- t.a125 = 0x2465;
- t.a126 = 0x2466;
- t.a127 = 0x2467;
- t.a128 = 0x2468;
- t.a129 = 0x2469;
- t.a130 = 0x2776;
- t.a131 = 0x2777;
- t.a132 = 0x2778;
- t.a133 = 0x2779;
- t.a134 = 0x277a;
- t.a135 = 0x277b;
- t.a136 = 0x277c;
- t.a137 = 0x277d;
- t.a138 = 0x277e;
- t.a139 = 0x277f;
- t.a140 = 0x2780;
- t.a141 = 0x2781;
- t.a142 = 0x2782;
- t.a143 = 0x2783;
- t.a144 = 0x2784;
- t.a145 = 0x2785;
- t.a146 = 0x2786;
- t.a147 = 0x2787;
- t.a148 = 0x2788;
- t.a149 = 0x2789;
- t.a150 = 0x278a;
- t.a151 = 0x278b;
- t.a152 = 0x278c;
- t.a153 = 0x278d;
- t.a154 = 0x278e;
- t.a155 = 0x278f;
- t.a156 = 0x2790;
- t.a157 = 0x2791;
- t.a158 = 0x2792;
- t.a159 = 0x2793;
- t.a160 = 0x2794;
- t.a161 = 0x2192;
- t.a163 = 0x2194;
- t.a164 = 0x2195;
- t.a196 = 0x2798;
- t.a165 = 0x2799;
- t.a192 = 0x279a;
- t.a166 = 0x279b;
- t.a167 = 0x279c;
- t.a168 = 0x279d;
- t.a169 = 0x279e;
- t.a170 = 0x279f;
- t.a171 = 0x27a0;
- t.a172 = 0x27a1;
- t.a173 = 0x27a2;
- t.a162 = 0x27a3;
- t.a174 = 0x27a4;
- t.a175 = 0x27a5;
- t.a176 = 0x27a6;
- t.a177 = 0x27a7;
- t.a178 = 0x27a8;
- t.a179 = 0x27a9;
- t.a193 = 0x27aa;
- t.a180 = 0x27ab;
- t.a199 = 0x27ac;
- t.a181 = 0x27ad;
- t.a200 = 0x27ae;
- t.a182 = 0x27af;
- t.a201 = 0x27b1;
- t.a183 = 0x27b2;
- t.a184 = 0x27b3;
- t.a197 = 0x27b4;
- t.a185 = 0x27b5;
- t.a194 = 0x27b6;
- t.a198 = 0x27b7;
- t.a186 = 0x27b8;
- t.a195 = 0x27b9;
- t.a187 = 0x27ba;
- t.a188 = 0x27bb;
- t.a189 = 0x27bc;
- t.a190 = 0x27bd;
- t.a191 = 0x27be;
- t.a89 = 0x2768;
- t.a90 = 0x2769;
- t.a93 = 0x276a;
- t.a94 = 0x276b;
- t.a91 = 0x276c;
- t.a92 = 0x276d;
- t.a205 = 0x276e;
- t.a85 = 0x276f;
- t.a206 = 0x2770;
- t.a86 = 0x2771;
- t.a87 = 0x2772;
- t.a88 = 0x2773;
- t.a95 = 0x2774;
- t.a96 = 0x2775;
- t[".notdef"] = 0x0000;
-});
-exports.getGlyphsUnicode = getGlyphsUnicode;
-exports.getDingbatsGlyphsUnicode = getDingbatsGlyphsUnicode;
-
-/***/ }),
-/* 35 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 38 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.getSupplementalGlyphMapForCalibri = exports.getSupplementalGlyphMapForArialBlack = exports.getGlyphMapForStandardFonts = exports.getSymbolsFonts = exports.getSerifFonts = exports.getNonStdFontMap = exports.getStdFontMap = void 0;
+}));
+exports.SEAC_ANALYSIS_ENABLED = exports.MacStandardGlyphOrdering = exports.FontFlags = void 0;
+exports.getFontType = getFontType;
+exports.normalizeFontName = normalizeFontName;
+exports.recoverGlyphName = recoverGlyphName;
+exports.type1FontGlyphMapping = type1FontGlyphMapping;
 
-var _core_utils = __w_pdfjs_require__(8);
+var _util = __w_pdfjs_require__(2);
 
-const getStdFontMap = (0, _core_utils.getLookupTableFactory)(function (t) {
-  t.ArialNarrow = "Helvetica";
-  t["ArialNarrow-Bold"] = "Helvetica-Bold";
-  t["ArialNarrow-BoldItalic"] = "Helvetica-BoldOblique";
-  t["ArialNarrow-Italic"] = "Helvetica-Oblique";
-  t.ArialBlack = "Helvetica";
-  t["ArialBlack-Bold"] = "Helvetica-Bold";
-  t["ArialBlack-BoldItalic"] = "Helvetica-BoldOblique";
-  t["ArialBlack-Italic"] = "Helvetica-Oblique";
-  t["Arial-Black"] = "Helvetica";
-  t["Arial-Black-Bold"] = "Helvetica-Bold";
-  t["Arial-Black-BoldItalic"] = "Helvetica-BoldOblique";
-  t["Arial-Black-Italic"] = "Helvetica-Oblique";
-  t.Arial = "Helvetica";
-  t["Arial-Bold"] = "Helvetica-Bold";
-  t["Arial-BoldItalic"] = "Helvetica-BoldOblique";
-  t["Arial-Italic"] = "Helvetica-Oblique";
-  t["Arial-BoldItalicMT"] = "Helvetica-BoldOblique";
-  t["Arial-BoldMT"] = "Helvetica-Bold";
-  t["Arial-ItalicMT"] = "Helvetica-Oblique";
-  t.ArialMT = "Helvetica";
-  t["Courier-Bold"] = "Courier-Bold";
-  t["Courier-BoldItalic"] = "Courier-BoldOblique";
-  t["Courier-Italic"] = "Courier-Oblique";
-  t.CourierNew = "Courier";
-  t["CourierNew-Bold"] = "Courier-Bold";
-  t["CourierNew-BoldItalic"] = "Courier-BoldOblique";
-  t["CourierNew-Italic"] = "Courier-Oblique";
-  t["CourierNewPS-BoldItalicMT"] = "Courier-BoldOblique";
-  t["CourierNewPS-BoldMT"] = "Courier-Bold";
-  t["CourierNewPS-ItalicMT"] = "Courier-Oblique";
-  t.CourierNewPSMT = "Courier";
-  t.Helvetica = "Helvetica";
-  t["Helvetica-Bold"] = "Helvetica-Bold";
-  t["Helvetica-BoldItalic"] = "Helvetica-BoldOblique";
-  t["Helvetica-BoldOblique"] = "Helvetica-BoldOblique";
-  t["Helvetica-Italic"] = "Helvetica-Oblique";
-  t["Helvetica-Oblique"] = "Helvetica-Oblique";
-  t["Symbol-Bold"] = "Symbol";
-  t["Symbol-BoldItalic"] = "Symbol";
-  t["Symbol-Italic"] = "Symbol";
-  t.TimesNewRoman = "Times-Roman";
-  t["TimesNewRoman-Bold"] = "Times-Bold";
-  t["TimesNewRoman-BoldItalic"] = "Times-BoldItalic";
-  t["TimesNewRoman-Italic"] = "Times-Italic";
-  t.TimesNewRomanPS = "Times-Roman";
-  t["TimesNewRomanPS-Bold"] = "Times-Bold";
-  t["TimesNewRomanPS-BoldItalic"] = "Times-BoldItalic";
-  t["TimesNewRomanPS-BoldItalicMT"] = "Times-BoldItalic";
-  t["TimesNewRomanPS-BoldMT"] = "Times-Bold";
-  t["TimesNewRomanPS-Italic"] = "Times-Italic";
-  t["TimesNewRomanPS-ItalicMT"] = "Times-Italic";
-  t.TimesNewRomanPSMT = "Times-Roman";
-  t["TimesNewRomanPSMT-Bold"] = "Times-Bold";
-  t["TimesNewRomanPSMT-BoldItalic"] = "Times-BoldItalic";
-  t["TimesNewRomanPSMT-Italic"] = "Times-Italic";
-});
-exports.getStdFontMap = getStdFontMap;
-const getNonStdFontMap = (0, _core_utils.getLookupTableFactory)(function (t) {
-  t.Calibri = "Helvetica";
-  t["Calibri-Bold"] = "Helvetica-Bold";
-  t["Calibri-BoldItalic"] = "Helvetica-BoldOblique";
-  t["Calibri-Italic"] = "Helvetica-Oblique";
-  t.CenturyGothic = "Helvetica";
-  t["CenturyGothic-Bold"] = "Helvetica-Bold";
-  t["CenturyGothic-BoldItalic"] = "Helvetica-BoldOblique";
-  t["CenturyGothic-Italic"] = "Helvetica-Oblique";
-  t.ComicSansMS = "Comic Sans MS";
-  t["ComicSansMS-Bold"] = "Comic Sans MS-Bold";
-  t["ComicSansMS-BoldItalic"] = "Comic Sans MS-BoldItalic";
-  t["ComicSansMS-Italic"] = "Comic Sans MS-Italic";
-  t.LucidaConsole = "Courier";
-  t["LucidaConsole-Bold"] = "Courier-Bold";
-  t["LucidaConsole-BoldItalic"] = "Courier-BoldOblique";
-  t["LucidaConsole-Italic"] = "Courier-Oblique";
-  t["LucidaSans-Demi"] = "Helvetica-Bold";
-  t["MS-Gothic"] = "MS Gothic";
-  t["MS-Gothic-Bold"] = "MS Gothic-Bold";
-  t["MS-Gothic-BoldItalic"] = "MS Gothic-BoldItalic";
-  t["MS-Gothic-Italic"] = "MS Gothic-Italic";
-  t["MS-Mincho"] = "MS Mincho";
-  t["MS-Mincho-Bold"] = "MS Mincho-Bold";
-  t["MS-Mincho-BoldItalic"] = "MS Mincho-BoldItalic";
-  t["MS-Mincho-Italic"] = "MS Mincho-Italic";
-  t["MS-PGothic"] = "MS PGothic";
-  t["MS-PGothic-Bold"] = "MS PGothic-Bold";
-  t["MS-PGothic-BoldItalic"] = "MS PGothic-BoldItalic";
-  t["MS-PGothic-Italic"] = "MS PGothic-Italic";
-  t["MS-PMincho"] = "MS PMincho";
-  t["MS-PMincho-Bold"] = "MS PMincho-Bold";
-  t["MS-PMincho-BoldItalic"] = "MS PMincho-BoldItalic";
-  t["MS-PMincho-Italic"] = "MS PMincho-Italic";
-  t.NuptialScript = "Times-Italic";
-  t.SegoeUISymbol = "Helvetica";
-  t.Wingdings = "ZapfDingbats";
-  t["Wingdings-Regular"] = "ZapfDingbats";
-});
-exports.getNonStdFontMap = getNonStdFontMap;
-const getSerifFonts = (0, _core_utils.getLookupTableFactory)(function (t) {
-  t["Adobe Jenson"] = true;
-  t["Adobe Text"] = true;
-  t.Albertus = true;
-  t.Aldus = true;
-  t.Alexandria = true;
-  t.Algerian = true;
-  t["American Typewriter"] = true;
-  t.Antiqua = true;
-  t.Apex = true;
-  t.Arno = true;
-  t.Aster = true;
-  t.Aurora = true;
-  t.Baskerville = true;
-  t.Bell = true;
-  t.Bembo = true;
-  t["Bembo Schoolbook"] = true;
-  t.Benguiat = true;
-  t["Berkeley Old Style"] = true;
-  t["Bernhard Modern"] = true;
-  t["Berthold City"] = true;
-  t.Bodoni = true;
-  t["Bauer Bodoni"] = true;
-  t["Book Antiqua"] = true;
-  t.Bookman = true;
-  t["Bordeaux Roman"] = true;
-  t["Californian FB"] = true;
-  t.Calisto = true;
-  t.Calvert = true;
-  t.Capitals = true;
-  t.Cambria = true;
-  t.Cartier = true;
-  t.Caslon = true;
-  t.Catull = true;
-  t.Centaur = true;
-  t["Century Old Style"] = true;
-  t["Century Schoolbook"] = true;
-  t.Chaparral = true;
-  t["Charis SIL"] = true;
-  t.Cheltenham = true;
-  t["Cholla Slab"] = true;
-  t.Clarendon = true;
-  t.Clearface = true;
-  t.Cochin = true;
-  t.Colonna = true;
-  t["Computer Modern"] = true;
-  t["Concrete Roman"] = true;
-  t.Constantia = true;
-  t["Cooper Black"] = true;
-  t.Corona = true;
-  t.Ecotype = true;
-  t.Egyptienne = true;
-  t.Elephant = true;
-  t.Excelsior = true;
-  t.Fairfield = true;
-  t["FF Scala"] = true;
-  t.Folkard = true;
-  t.Footlight = true;
-  t.FreeSerif = true;
-  t["Friz Quadrata"] = true;
-  t.Garamond = true;
-  t.Gentium = true;
-  t.Georgia = true;
-  t.Gloucester = true;
-  t["Goudy Old Style"] = true;
-  t["Goudy Schoolbook"] = true;
-  t["Goudy Pro Font"] = true;
-  t.Granjon = true;
-  t["Guardian Egyptian"] = true;
-  t.Heather = true;
-  t.Hercules = true;
-  t["High Tower Text"] = true;
-  t.Hiroshige = true;
-  t["Hoefler Text"] = true;
-  t["Humana Serif"] = true;
-  t.Imprint = true;
-  t["Ionic No. 5"] = true;
-  t.Janson = true;
-  t.Joanna = true;
-  t.Korinna = true;
-  t.Lexicon = true;
-  t["Liberation Serif"] = true;
-  t["Linux Libertine"] = true;
-  t.Literaturnaya = true;
-  t.Lucida = true;
-  t["Lucida Bright"] = true;
-  t.Melior = true;
-  t.Memphis = true;
-  t.Miller = true;
-  t.Minion = true;
-  t.Modern = true;
-  t["Mona Lisa"] = true;
-  t["Mrs Eaves"] = true;
-  t["MS Serif"] = true;
-  t["Museo Slab"] = true;
-  t["New York"] = true;
-  t["Nimbus Roman"] = true;
-  t["NPS Rawlinson Roadway"] = true;
-  t.NuptialScript = true;
-  t.Palatino = true;
-  t.Perpetua = true;
-  t.Plantin = true;
-  t["Plantin Schoolbook"] = true;
-  t.Playbill = true;
-  t["Poor Richard"] = true;
-  t["Rawlinson Roadway"] = true;
-  t.Renault = true;
-  t.Requiem = true;
-  t.Rockwell = true;
-  t.Roman = true;
-  t["Rotis Serif"] = true;
-  t.Sabon = true;
-  t.Scala = true;
-  t.Seagull = true;
-  t.Sistina = true;
-  t.Souvenir = true;
-  t.STIX = true;
-  t["Stone Informal"] = true;
-  t["Stone Serif"] = true;
-  t.Sylfaen = true;
-  t.Times = true;
-  t.Trajan = true;
-  t["Trinité"] = true;
-  t["Trump Mediaeval"] = true;
-  t.Utopia = true;
-  t["Vale Type"] = true;
-  t["Bitstream Vera"] = true;
-  t["Vera Serif"] = true;
-  t.Versailles = true;
-  t.Wanted = true;
-  t.Weiss = true;
-  t["Wide Latin"] = true;
-  t.Windsor = true;
-  t.XITS = true;
-});
-exports.getSerifFonts = getSerifFonts;
-const getSymbolsFonts = (0, _core_utils.getLookupTableFactory)(function (t) {
-  t.Dingbats = true;
-  t.Symbol = true;
-  t.ZapfDingbats = true;
-});
-exports.getSymbolsFonts = getSymbolsFonts;
-const getGlyphMapForStandardFonts = (0, _core_utils.getLookupTableFactory)(function (t) {
-  t[2] = 10;
-  t[3] = 32;
-  t[4] = 33;
-  t[5] = 34;
-  t[6] = 35;
-  t[7] = 36;
-  t[8] = 37;
-  t[9] = 38;
-  t[10] = 39;
-  t[11] = 40;
-  t[12] = 41;
-  t[13] = 42;
-  t[14] = 43;
-  t[15] = 44;
-  t[16] = 45;
-  t[17] = 46;
-  t[18] = 47;
-  t[19] = 48;
-  t[20] = 49;
-  t[21] = 50;
-  t[22] = 51;
-  t[23] = 52;
-  t[24] = 53;
-  t[25] = 54;
-  t[26] = 55;
-  t[27] = 56;
-  t[28] = 57;
-  t[29] = 58;
-  t[30] = 894;
-  t[31] = 60;
-  t[32] = 61;
-  t[33] = 62;
-  t[34] = 63;
-  t[35] = 64;
-  t[36] = 65;
-  t[37] = 66;
-  t[38] = 67;
-  t[39] = 68;
-  t[40] = 69;
-  t[41] = 70;
-  t[42] = 71;
-  t[43] = 72;
-  t[44] = 73;
-  t[45] = 74;
-  t[46] = 75;
-  t[47] = 76;
-  t[48] = 77;
-  t[49] = 78;
-  t[50] = 79;
-  t[51] = 80;
-  t[52] = 81;
-  t[53] = 82;
-  t[54] = 83;
-  t[55] = 84;
-  t[56] = 85;
-  t[57] = 86;
-  t[58] = 87;
-  t[59] = 88;
-  t[60] = 89;
-  t[61] = 90;
-  t[62] = 91;
-  t[63] = 92;
-  t[64] = 93;
-  t[65] = 94;
-  t[66] = 95;
-  t[67] = 96;
-  t[68] = 97;
-  t[69] = 98;
-  t[70] = 99;
-  t[71] = 100;
-  t[72] = 101;
-  t[73] = 102;
-  t[74] = 103;
-  t[75] = 104;
-  t[76] = 105;
-  t[77] = 106;
-  t[78] = 107;
-  t[79] = 108;
-  t[80] = 109;
-  t[81] = 110;
-  t[82] = 111;
-  t[83] = 112;
-  t[84] = 113;
-  t[85] = 114;
-  t[86] = 115;
-  t[87] = 116;
-  t[88] = 117;
-  t[89] = 118;
-  t[90] = 119;
-  t[91] = 120;
-  t[92] = 121;
-  t[93] = 122;
-  t[94] = 123;
-  t[95] = 124;
-  t[96] = 125;
-  t[97] = 126;
-  t[98] = 196;
-  t[99] = 197;
-  t[100] = 199;
-  t[101] = 201;
-  t[102] = 209;
-  t[103] = 214;
-  t[104] = 220;
-  t[105] = 225;
-  t[106] = 224;
-  t[107] = 226;
-  t[108] = 228;
-  t[109] = 227;
-  t[110] = 229;
-  t[111] = 231;
-  t[112] = 233;
-  t[113] = 232;
-  t[114] = 234;
-  t[115] = 235;
-  t[116] = 237;
-  t[117] = 236;
-  t[118] = 238;
-  t[119] = 239;
-  t[120] = 241;
-  t[121] = 243;
-  t[122] = 242;
-  t[123] = 244;
-  t[124] = 246;
-  t[125] = 245;
-  t[126] = 250;
-  t[127] = 249;
-  t[128] = 251;
-  t[129] = 252;
-  t[130] = 8224;
-  t[131] = 176;
-  t[132] = 162;
-  t[133] = 163;
-  t[134] = 167;
-  t[135] = 8226;
-  t[136] = 182;
-  t[137] = 223;
-  t[138] = 174;
-  t[139] = 169;
-  t[140] = 8482;
-  t[141] = 180;
-  t[142] = 168;
-  t[143] = 8800;
-  t[144] = 198;
-  t[145] = 216;
-  t[146] = 8734;
-  t[147] = 177;
-  t[148] = 8804;
-  t[149] = 8805;
-  t[150] = 165;
-  t[151] = 181;
-  t[152] = 8706;
-  t[153] = 8721;
-  t[154] = 8719;
-  t[156] = 8747;
-  t[157] = 170;
-  t[158] = 186;
-  t[159] = 8486;
-  t[160] = 230;
-  t[161] = 248;
-  t[162] = 191;
-  t[163] = 161;
-  t[164] = 172;
-  t[165] = 8730;
-  t[166] = 402;
-  t[167] = 8776;
-  t[168] = 8710;
-  t[169] = 171;
-  t[170] = 187;
-  t[171] = 8230;
-  t[210] = 218;
-  t[223] = 711;
-  t[224] = 321;
-  t[225] = 322;
-  t[227] = 353;
-  t[229] = 382;
-  t[234] = 253;
-  t[252] = 263;
-  t[253] = 268;
-  t[254] = 269;
-  t[258] = 258;
-  t[260] = 260;
-  t[261] = 261;
-  t[265] = 280;
-  t[266] = 281;
-  t[268] = 283;
-  t[269] = 313;
-  t[275] = 323;
-  t[276] = 324;
-  t[278] = 328;
-  t[284] = 345;
-  t[285] = 346;
-  t[286] = 347;
-  t[292] = 367;
-  t[295] = 377;
-  t[296] = 378;
-  t[298] = 380;
-  t[305] = 963;
-  t[306] = 964;
-  t[307] = 966;
-  t[308] = 8215;
-  t[309] = 8252;
-  t[310] = 8319;
-  t[311] = 8359;
-  t[312] = 8592;
-  t[313] = 8593;
-  t[337] = 9552;
-  t[493] = 1039;
-  t[494] = 1040;
-  t[705] = 1524;
-  t[706] = 8362;
-  t[710] = 64288;
-  t[711] = 64298;
-  t[759] = 1617;
-  t[761] = 1776;
-  t[763] = 1778;
-  t[775] = 1652;
-  t[777] = 1764;
-  t[778] = 1780;
-  t[779] = 1781;
-  t[780] = 1782;
-  t[782] = 771;
-  t[783] = 64726;
-  t[786] = 8363;
-  t[788] = 8532;
-  t[790] = 768;
-  t[791] = 769;
-  t[792] = 768;
-  t[795] = 803;
-  t[797] = 64336;
-  t[798] = 64337;
-  t[799] = 64342;
-  t[800] = 64343;
-  t[801] = 64344;
-  t[802] = 64345;
-  t[803] = 64362;
-  t[804] = 64363;
-  t[805] = 64364;
-  t[2424] = 7821;
-  t[2425] = 7822;
-  t[2426] = 7823;
-  t[2427] = 7824;
-  t[2428] = 7825;
-  t[2429] = 7826;
-  t[2430] = 7827;
-  t[2433] = 7682;
-  t[2678] = 8045;
-  t[2679] = 8046;
-  t[2830] = 1552;
-  t[2838] = 686;
-  t[2840] = 751;
-  t[2842] = 753;
-  t[2843] = 754;
-  t[2844] = 755;
-  t[2846] = 757;
-  t[2856] = 767;
-  t[2857] = 848;
-  t[2858] = 849;
-  t[2862] = 853;
-  t[2863] = 854;
-  t[2864] = 855;
-  t[2865] = 861;
-  t[2866] = 862;
-  t[2906] = 7460;
-  t[2908] = 7462;
-  t[2909] = 7463;
-  t[2910] = 7464;
-  t[2912] = 7466;
-  t[2913] = 7467;
-  t[2914] = 7468;
-  t[2916] = 7470;
-  t[2917] = 7471;
-  t[2918] = 7472;
-  t[2920] = 7474;
-  t[2921] = 7475;
-  t[2922] = 7476;
-  t[2924] = 7478;
-  t[2925] = 7479;
-  t[2926] = 7480;
-  t[2928] = 7482;
-  t[2929] = 7483;
-  t[2930] = 7484;
-  t[2932] = 7486;
-  t[2933] = 7487;
-  t[2934] = 7488;
-  t[2936] = 7490;
-  t[2937] = 7491;
-  t[2938] = 7492;
-  t[2940] = 7494;
-  t[2941] = 7495;
-  t[2942] = 7496;
-  t[2944] = 7498;
-  t[2946] = 7500;
-  t[2948] = 7502;
-  t[2950] = 7504;
-  t[2951] = 7505;
-  t[2952] = 7506;
-  t[2954] = 7508;
-  t[2955] = 7509;
-  t[2956] = 7510;
-  t[2958] = 7512;
-  t[2959] = 7513;
-  t[2960] = 7514;
-  t[2962] = 7516;
-  t[2963] = 7517;
-  t[2964] = 7518;
-  t[2966] = 7520;
-  t[2967] = 7521;
-  t[2968] = 7522;
-  t[2970] = 7524;
-  t[2971] = 7525;
-  t[2972] = 7526;
-  t[2974] = 7528;
-  t[2975] = 7529;
-  t[2976] = 7530;
-  t[2978] = 1537;
-  t[2979] = 1538;
-  t[2980] = 1539;
-  t[2982] = 1549;
-  t[2983] = 1551;
-  t[2984] = 1552;
-  t[2986] = 1554;
-  t[2987] = 1555;
-  t[2988] = 1556;
-  t[2990] = 1623;
-  t[2991] = 1624;
-  t[2995] = 1775;
-  t[2999] = 1791;
-  t[3002] = 64290;
-  t[3003] = 64291;
-  t[3004] = 64292;
-  t[3006] = 64294;
-  t[3007] = 64295;
-  t[3008] = 64296;
-  t[3011] = 1900;
-  t[3014] = 8223;
-  t[3015] = 8244;
-  t[3017] = 7532;
-  t[3018] = 7533;
-  t[3019] = 7534;
-  t[3075] = 7590;
-  t[3076] = 7591;
-  t[3079] = 7594;
-  t[3080] = 7595;
-  t[3083] = 7598;
-  t[3084] = 7599;
-  t[3087] = 7602;
-  t[3088] = 7603;
-  t[3091] = 7606;
-  t[3092] = 7607;
-  t[3095] = 7610;
-  t[3096] = 7611;
-  t[3099] = 7614;
-  t[3100] = 7615;
-  t[3103] = 7618;
-  t[3104] = 7619;
-  t[3107] = 8337;
-  t[3108] = 8338;
-  t[3116] = 1884;
-  t[3119] = 1885;
-  t[3120] = 1885;
-  t[3123] = 1886;
-  t[3124] = 1886;
-  t[3127] = 1887;
-  t[3128] = 1887;
-  t[3131] = 1888;
-  t[3132] = 1888;
-  t[3135] = 1889;
-  t[3136] = 1889;
-  t[3139] = 1890;
-  t[3140] = 1890;
-  t[3143] = 1891;
-  t[3144] = 1891;
-  t[3147] = 1892;
-  t[3148] = 1892;
-  t[3153] = 580;
-  t[3154] = 581;
-  t[3157] = 584;
-  t[3158] = 585;
-  t[3161] = 588;
-  t[3162] = 589;
-  t[3165] = 891;
-  t[3166] = 892;
-  t[3169] = 1274;
-  t[3170] = 1275;
-  t[3173] = 1278;
-  t[3174] = 1279;
-  t[3181] = 7622;
-  t[3182] = 7623;
-  t[3282] = 11799;
-  t[3316] = 578;
-  t[3379] = 42785;
-  t[3393] = 1159;
-  t[3416] = 8377;
-});
-exports.getGlyphMapForStandardFonts = getGlyphMapForStandardFonts;
-const getSupplementalGlyphMapForArialBlack = (0, _core_utils.getLookupTableFactory)(function (t) {
-  t[227] = 322;
-  t[264] = 261;
-  t[291] = 346;
-});
-exports.getSupplementalGlyphMapForArialBlack = getSupplementalGlyphMapForArialBlack;
-const getSupplementalGlyphMapForCalibri = (0, _core_utils.getLookupTableFactory)(function (t) {
-  t[1] = 32;
-  t[4] = 65;
-  t[17] = 66;
-  t[18] = 67;
-  t[24] = 68;
-  t[28] = 69;
-  t[38] = 70;
-  t[39] = 71;
-  t[44] = 72;
-  t[47] = 73;
-  t[58] = 74;
-  t[60] = 75;
-  t[62] = 76;
-  t[68] = 77;
-  t[69] = 78;
-  t[75] = 79;
-  t[87] = 80;
-  t[89] = 81;
-  t[90] = 82;
-  t[94] = 83;
-  t[100] = 84;
-  t[104] = 85;
-  t[115] = 86;
-  t[116] = 87;
-  t[121] = 88;
-  t[122] = 89;
-  t[127] = 90;
-  t[258] = 97;
-  t[268] = 261;
-  t[271] = 98;
-  t[272] = 99;
-  t[273] = 263;
-  t[282] = 100;
-  t[286] = 101;
-  t[295] = 281;
-  t[296] = 102;
-  t[336] = 103;
-  t[346] = 104;
-  t[349] = 105;
-  t[361] = 106;
-  t[364] = 107;
-  t[367] = 108;
-  t[371] = 322;
-  t[373] = 109;
-  t[374] = 110;
-  t[381] = 111;
-  t[383] = 243;
-  t[393] = 112;
-  t[395] = 113;
-  t[396] = 114;
-  t[400] = 115;
-  t[401] = 347;
-  t[410] = 116;
-  t[437] = 117;
-  t[448] = 118;
-  t[449] = 119;
-  t[454] = 120;
-  t[455] = 121;
-  t[460] = 122;
-  t[463] = 380;
-  t[853] = 44;
-  t[855] = 58;
-  t[856] = 46;
-  t[876] = 47;
-  t[878] = 45;
-  t[882] = 45;
-  t[894] = 40;
-  t[895] = 41;
-  t[896] = 91;
-  t[897] = 93;
-  t[923] = 64;
-  t[1004] = 48;
-  t[1005] = 49;
-  t[1006] = 50;
-  t[1007] = 51;
-  t[1008] = 52;
-  t[1009] = 53;
-  t[1010] = 54;
-  t[1011] = 55;
-  t[1012] = 56;
-  t[1013] = 57;
-  t[1081] = 37;
-  t[1085] = 43;
-  t[1086] = 45;
-});
-exports.getSupplementalGlyphMapForCalibri = getSupplementalGlyphMapForCalibri;
+var _encodings = __w_pdfjs_require__(37);
+
+var _glyphlist = __w_pdfjs_require__(39);
+
+var _unicode = __w_pdfjs_require__(40);
+
+const SEAC_ANALYSIS_ENABLED = true;
+exports.SEAC_ANALYSIS_ENABLED = SEAC_ANALYSIS_ENABLED;
+const FontFlags = {
+  FixedPitch: 1,
+  Serif: 2,
+  Symbolic: 4,
+  Script: 8,
+  Nonsymbolic: 32,
+  Italic: 64,
+  AllCap: 65536,
+  SmallCap: 131072,
+  ForceBold: 262144
+};
+exports.FontFlags = FontFlags;
+const MacStandardGlyphOrdering = [".notdef", ".null", "nonmarkingreturn", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quotesingle", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "grave", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "Adieresis", "Aring", "Ccedilla", "Eacute", "Ntilde", "Odieresis", "Udieresis", "aacute", "agrave", "acircumflex", "adieresis", "atilde", "aring", "ccedilla", "eacute", "egrave", "ecircumflex", "edieresis", "iacute", "igrave", "icircumflex", "idieresis", "ntilde", "oacute", "ograve", "ocircumflex", "odieresis", "otilde", "uacute", "ugrave", "ucircumflex", "udieresis", "dagger", "degree", "cent", "sterling", "section", "bullet", "paragraph", "germandbls", "registered", "copyright", "trademark", "acute", "dieresis", "notequal", "AE", "Oslash", "infinity", "plusminus", "lessequal", "greaterequal", "yen", "mu", "partialdiff", "summation", "product", "pi", "integral", "ordfeminine", "ordmasculine", "Omega", "ae", "oslash", "questiondown", "exclamdown", "logicalnot", "radical", "florin", "approxequal", "Delta", "guillemotleft", "guillemotright", "ellipsis", "nonbreakingspace", "Agrave", "Atilde", "Otilde", "OE", "oe", "endash", "emdash", "quotedblleft", "quotedblright", "quoteleft", "quoteright", "divide", "lozenge", "ydieresis", "Ydieresis", "fraction", "currency", "guilsinglleft", "guilsinglright", "fi", "fl", "daggerdbl", "periodcentered", "quotesinglbase", "quotedblbase", "perthousand", "Acircumflex", "Ecircumflex", "Aacute", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Oacute", "Ocircumflex", "apple", "Ograve", "Uacute", "Ucircumflex", "Ugrave", "dotlessi", "circumflex", "tilde", "macron", "breve", "dotaccent", "ring", "cedilla", "hungarumlaut", "ogonek", "caron", "Lslash", "lslash", "Scaron", "scaron", "Zcaron", "zcaron", "brokenbar", "Eth", "eth", "Yacute", "yacute", "Thorn", "thorn", "minus", "multiply", "onesuperior", "twosuperior", "threesuperior", "onehalf", "onequarter", "threequarters", "franc", "Gbreve", "gbreve", "Idotaccent", "Scedilla", "scedilla", "Cacute", "cacute", "Ccaron", "ccaron", "dcroat"];
+exports.MacStandardGlyphOrdering = MacStandardGlyphOrdering;
+
+function getFontType(type, subtype, isStandardFont = false) {
+  switch (type) {
+    case "Type1":
+      if (isStandardFont) {
+        return _util.FontType.TYPE1STANDARD;
+      }
+
+      return subtype === "Type1C" ? _util.FontType.TYPE1C : _util.FontType.TYPE1;
+
+    case "CIDFontType0":
+      return subtype === "CIDFontType0C" ? _util.FontType.CIDFONTTYPE0C : _util.FontType.CIDFONTTYPE0;
+
+    case "OpenType":
+      return _util.FontType.OPENTYPE;
+
+    case "TrueType":
+      return _util.FontType.TRUETYPE;
+
+    case "CIDFontType2":
+      return _util.FontType.CIDFONTTYPE2;
+
+    case "MMType1":
+      return _util.FontType.MMTYPE1;
+
+    case "Type0":
+      return _util.FontType.TYPE0;
+
+    default:
+      return _util.FontType.UNKNOWN;
+  }
+}
+
+function recoverGlyphName(name, glyphsUnicodeMap) {
+  if (glyphsUnicodeMap[name] !== undefined) {
+    return name;
+  }
+
+  const unicode = (0, _unicode.getUnicodeForGlyph)(name, glyphsUnicodeMap);
+
+  if (unicode !== -1) {
+    for (const key in glyphsUnicodeMap) {
+      if (glyphsUnicodeMap[key] === unicode) {
+        return key;
+      }
+    }
+  }
+
+  (0, _util.info)("Unable to recover a standard glyph name for: " + name);
+  return name;
+}
+
+function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
+  const charCodeToGlyphId = Object.create(null);
+  let glyphId, charCode, baseEncoding;
+  const isSymbolicFont = !!(properties.flags & FontFlags.Symbolic);
+
+  if (properties.isInternalFont) {
+    baseEncoding = builtInEncoding;
+
+    for (charCode = 0; charCode < baseEncoding.length; charCode++) {
+      glyphId = glyphNames.indexOf(baseEncoding[charCode]);
+
+      if (glyphId >= 0) {
+        charCodeToGlyphId[charCode] = glyphId;
+      } else {
+        charCodeToGlyphId[charCode] = 0;
+      }
+    }
+  } else if (properties.baseEncodingName) {
+    baseEncoding = (0, _encodings.getEncoding)(properties.baseEncodingName);
+
+    for (charCode = 0; charCode < baseEncoding.length; charCode++) {
+      glyphId = glyphNames.indexOf(baseEncoding[charCode]);
+
+      if (glyphId >= 0) {
+        charCodeToGlyphId[charCode] = glyphId;
+      } else {
+        charCodeToGlyphId[charCode] = 0;
+      }
+    }
+  } else if (isSymbolicFont) {
+    for (charCode in builtInEncoding) {
+      charCodeToGlyphId[charCode] = builtInEncoding[charCode];
+    }
+  } else {
+    baseEncoding = _encodings.StandardEncoding;
+
+    for (charCode = 0; charCode < baseEncoding.length; charCode++) {
+      glyphId = glyphNames.indexOf(baseEncoding[charCode]);
+
+      if (glyphId >= 0) {
+        charCodeToGlyphId[charCode] = glyphId;
+      } else {
+        charCodeToGlyphId[charCode] = 0;
+      }
+    }
+  }
+
+  const differences = properties.differences;
+  let glyphsUnicodeMap;
+
+  if (differences) {
+    for (charCode in differences) {
+      const glyphName = differences[charCode];
+      glyphId = glyphNames.indexOf(glyphName);
+
+      if (glyphId === -1) {
+        if (!glyphsUnicodeMap) {
+          glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+        }
+
+        const standardGlyphName = recoverGlyphName(glyphName, glyphsUnicodeMap);
+
+        if (standardGlyphName !== glyphName) {
+          glyphId = glyphNames.indexOf(standardGlyphName);
+        }
+      }
+
+      if (glyphId >= 0) {
+        charCodeToGlyphId[charCode] = glyphId;
+      } else {
+        charCodeToGlyphId[charCode] = 0;
+      }
+    }
+  }
+
+  return charCodeToGlyphId;
+}
+
+function normalizeFontName(name) {
+  return name.replace(/[,_]/g, "-").replace(/\s/g, "");
+}
 
 /***/ }),
-/* 36 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+/* 39 */
+/***/ ((__unused_webpack_module, __webpack_exports__, __w_pdfjs_require__) => {
 
-var getLookupTableFactory = __w_pdfjs_require__(8).getLookupTableFactory;
-var getSpecialPUASymbols = getLookupTableFactory(function (t) {
+__w_pdfjs_require__.r(__webpack_exports__);
+/* harmony export */ __w_pdfjs_require__.d(__webpack_exports__, {
+/* harmony export */   "getDingbatsGlyphsUnicode": () => (/* binding */ getDingbatsGlyphsUnicode),
+/* harmony export */   "getGlyphsUnicode": () => (/* binding */ getGlyphsUnicode)
+/* harmony export */ });
+/* harmony import */ var _core_utils_js__WEBPACK_IMPORTED_MODULE_0__ = __w_pdfjs_require__(6);
+
+const getGlyphsUnicode = (0,_core_utils_js__WEBPACK_IMPORTED_MODULE_0__.getArrayLookupTableFactory)(function () {
+ return [
+  "A",
+  0x0041,
+  "AE",
+  0x00c6,
+  "AEacute",
+  0x01fc,
+  "AEmacron",
+  0x01e2,
+  "AEsmall",
+  0xf7e6,
+  "Aacute",
+  0x00c1,
+  "Aacutesmall",
+  0xf7e1,
+  "Abreve",
+  0x0102,
+  "Abreveacute",
+  0x1eae,
+  "Abrevecyrillic",
+  0x04d0,
+  "Abrevedotbelow",
+  0x1eb6,
+  "Abrevegrave",
+  0x1eb0,
+  "Abrevehookabove",
+  0x1eb2,
+  "Abrevetilde",
+  0x1eb4,
+  "Acaron",
+  0x01cd,
+  "Acircle",
+  0x24b6,
+  "Acircumflex",
+  0x00c2,
+  "Acircumflexacute",
+  0x1ea4,
+  "Acircumflexdotbelow",
+  0x1eac,
+  "Acircumflexgrave",
+  0x1ea6,
+  "Acircumflexhookabove",
+  0x1ea8,
+  "Acircumflexsmall",
+  0xf7e2,
+  "Acircumflextilde",
+  0x1eaa,
+  "Acute",
+  0xf6c9,
+  "Acutesmall",
+  0xf7b4,
+  "Acyrillic",
+  0x0410,
+  "Adblgrave",
+  0x0200,
+  "Adieresis",
+  0x00c4,
+  "Adieresiscyrillic",
+  0x04d2,
+  "Adieresismacron",
+  0x01de,
+  "Adieresissmall",
+  0xf7e4,
+  "Adotbelow",
+  0x1ea0,
+  "Adotmacron",
+  0x01e0,
+  "Agrave",
+  0x00c0,
+  "Agravesmall",
+  0xf7e0,
+  "Ahookabove",
+  0x1ea2,
+  "Aiecyrillic",
+  0x04d4,
+  "Ainvertedbreve",
+  0x0202,
+  "Alpha",
+  0x0391,
+  "Alphatonos",
+  0x0386,
+  "Amacron",
+  0x0100,
+  "Amonospace",
+  0xff21,
+  "Aogonek",
+  0x0104,
+  "Aring",
+  0x00c5,
+  "Aringacute",
+  0x01fa,
+  "Aringbelow",
+  0x1e00,
+  "Aringsmall",
+  0xf7e5,
+  "Asmall",
+  0xf761,
+  "Atilde",
+  0x00c3,
+  "Atildesmall",
+  0xf7e3,
+  "Aybarmenian",
+  0x0531,
+  "B",
+  0x0042,
+  "Bcircle",
+  0x24b7,
+  "Bdotaccent",
+  0x1e02,
+  "Bdotbelow",
+  0x1e04,
+  "Becyrillic",
+  0x0411,
+  "Benarmenian",
+  0x0532,
+  "Beta",
+  0x0392,
+  "Bhook",
+  0x0181,
+  "Blinebelow",
+  0x1e06,
+  "Bmonospace",
+  0xff22,
+  "Brevesmall",
+  0xf6f4,
+  "Bsmall",
+  0xf762,
+  "Btopbar",
+  0x0182,
+  "C",
+  0x0043,
+  "Caarmenian",
+  0x053e,
+  "Cacute",
+  0x0106,
+  "Caron",
+  0xf6ca,
+  "Caronsmall",
+  0xf6f5,
+  "Ccaron",
+  0x010c,
+  "Ccedilla",
+  0x00c7,
+  "Ccedillaacute",
+  0x1e08,
+  "Ccedillasmall",
+  0xf7e7,
+  "Ccircle",
+  0x24b8,
+  "Ccircumflex",
+  0x0108,
+  "Cdot",
+  0x010a,
+  "Cdotaccent",
+  0x010a,
+  "Cedillasmall",
+  0xf7b8,
+  "Chaarmenian",
+  0x0549,
+  "Cheabkhasiancyrillic",
+  0x04bc,
+  "Checyrillic",
+  0x0427,
+  "Chedescenderabkhasiancyrillic",
+  0x04be,
+  "Chedescendercyrillic",
+  0x04b6,
+  "Chedieresiscyrillic",
+  0x04f4,
+  "Cheharmenian",
+  0x0543,
+  "Chekhakassiancyrillic",
+  0x04cb,
+  "Cheverticalstrokecyrillic",
+  0x04b8,
+  "Chi",
+  0x03a7,
+  "Chook",
+  0x0187,
+  "Circumflexsmall",
+  0xf6f6,
+  "Cmonospace",
+  0xff23,
+  "Coarmenian",
+  0x0551,
+  "Csmall",
+  0xf763,
+  "D",
+  0x0044,
+  "DZ",
+  0x01f1,
+  "DZcaron",
+  0x01c4,
+  "Daarmenian",
+  0x0534,
+  "Dafrican",
+  0x0189,
+  "Dcaron",
+  0x010e,
+  "Dcedilla",
+  0x1e10,
+  "Dcircle",
+  0x24b9,
+  "Dcircumflexbelow",
+  0x1e12,
+  "Dcroat",
+  0x0110,
+  "Ddotaccent",
+  0x1e0a,
+  "Ddotbelow",
+  0x1e0c,
+  "Decyrillic",
+  0x0414,
+  "Deicoptic",
+  0x03ee,
+  "Delta",
+  0x2206,
+  "Deltagreek",
+  0x0394,
+  "Dhook",
+  0x018a,
+  "Dieresis",
+  0xf6cb,
+  "DieresisAcute",
+  0xf6cc,
+  "DieresisGrave",
+  0xf6cd,
+  "Dieresissmall",
+  0xf7a8,
+  "Digammagreek",
+  0x03dc,
+  "Djecyrillic",
+  0x0402,
+  "Dlinebelow",
+  0x1e0e,
+  "Dmonospace",
+  0xff24,
+  "Dotaccentsmall",
+  0xf6f7,
+  "Dslash",
+  0x0110,
+  "Dsmall",
+  0xf764,
+  "Dtopbar",
+  0x018b,
+  "Dz",
+  0x01f2,
+  "Dzcaron",
+  0x01c5,
+  "Dzeabkhasiancyrillic",
+  0x04e0,
+  "Dzecyrillic",
+  0x0405,
+  "Dzhecyrillic",
+  0x040f,
+  "E",
+  0x0045,
+  "Eacute",
+  0x00c9,
+  "Eacutesmall",
+  0xf7e9,
+  "Ebreve",
+  0x0114,
+  "Ecaron",
+  0x011a,
+  "Ecedillabreve",
+  0x1e1c,
+  "Echarmenian",
+  0x0535,
+  "Ecircle",
+  0x24ba,
+  "Ecircumflex",
+  0x00ca,
+  "Ecircumflexacute",
+  0x1ebe,
+  "Ecircumflexbelow",
+  0x1e18,
+  "Ecircumflexdotbelow",
+  0x1ec6,
+  "Ecircumflexgrave",
+  0x1ec0,
+  "Ecircumflexhookabove",
+  0x1ec2,
+  "Ecircumflexsmall",
+  0xf7ea,
+  "Ecircumflextilde",
+  0x1ec4,
+  "Ecyrillic",
+  0x0404,
+  "Edblgrave",
+  0x0204,
+  "Edieresis",
+  0x00cb,
+  "Edieresissmall",
+  0xf7eb,
+  "Edot",
+  0x0116,
+  "Edotaccent",
+  0x0116,
+  "Edotbelow",
+  0x1eb8,
+  "Efcyrillic",
+  0x0424,
+  "Egrave",
+  0x00c8,
+  "Egravesmall",
+  0xf7e8,
+  "Eharmenian",
+  0x0537,
+  "Ehookabove",
+  0x1eba,
+  "Eightroman",
+  0x2167,
+  "Einvertedbreve",
+  0x0206,
+  "Eiotifiedcyrillic",
+  0x0464,
+  "Elcyrillic",
+  0x041b,
+  "Elevenroman",
+  0x216a,
+  "Emacron",
+  0x0112,
+  "Emacronacute",
+  0x1e16,
+  "Emacrongrave",
+  0x1e14,
+  "Emcyrillic",
+  0x041c,
+  "Emonospace",
+  0xff25,
+  "Encyrillic",
+  0x041d,
+  "Endescendercyrillic",
+  0x04a2,
+  "Eng",
+  0x014a,
+  "Enghecyrillic",
+  0x04a4,
+  "Enhookcyrillic",
+  0x04c7,
+  "Eogonek",
+  0x0118,
+  "Eopen",
+  0x0190,
+  "Epsilon",
+  0x0395,
+  "Epsilontonos",
+  0x0388,
+  "Ercyrillic",
+  0x0420,
+  "Ereversed",
+  0x018e,
+  "Ereversedcyrillic",
+  0x042d,
+  "Escyrillic",
+  0x0421,
+  "Esdescendercyrillic",
+  0x04aa,
+  "Esh",
+  0x01a9,
+  "Esmall",
+  0xf765,
+  "Eta",
+  0x0397,
+  "Etarmenian",
+  0x0538,
+  "Etatonos",
+  0x0389,
+  "Eth",
+  0x00d0,
+  "Ethsmall",
+  0xf7f0,
+  "Etilde",
+  0x1ebc,
+  "Etildebelow",
+  0x1e1a,
+  "Euro",
+  0x20ac,
+  "Ezh",
+  0x01b7,
+  "Ezhcaron",
+  0x01ee,
+  "Ezhreversed",
+  0x01b8,
+  "F",
+  0x0046,
+  "Fcircle",
+  0x24bb,
+  "Fdotaccent",
+  0x1e1e,
+  "Feharmenian",
+  0x0556,
+  "Feicoptic",
+  0x03e4,
+  "Fhook",
+  0x0191,
+  "Fitacyrillic",
+  0x0472,
+  "Fiveroman",
+  0x2164,
+  "Fmonospace",
+  0xff26,
+  "Fourroman",
+  0x2163,
+  "Fsmall",
+  0xf766,
+  "G",
+  0x0047,
+  "GBsquare",
+  0x3387,
+  "Gacute",
+  0x01f4,
+  "Gamma",
+  0x0393,
+  "Gammaafrican",
+  0x0194,
+  "Gangiacoptic",
+  0x03ea,
+  "Gbreve",
+  0x011e,
+  "Gcaron",
+  0x01e6,
+  "Gcedilla",
+  0x0122,
+  "Gcircle",
+  0x24bc,
+  "Gcircumflex",
+  0x011c,
+  "Gcommaaccent",
+  0x0122,
+  "Gdot",
+  0x0120,
+  "Gdotaccent",
+  0x0120,
+  "Gecyrillic",
+  0x0413,
+  "Ghadarmenian",
+  0x0542,
+  "Ghemiddlehookcyrillic",
+  0x0494,
+  "Ghestrokecyrillic",
+  0x0492,
+  "Gheupturncyrillic",
+  0x0490,
+  "Ghook",
+  0x0193,
+  "Gimarmenian",
+  0x0533,
+  "Gjecyrillic",
+  0x0403,
+  "Gmacron",
+  0x1e20,
+  "Gmonospace",
+  0xff27,
+  "Grave",
+  0xf6ce,
+  "Gravesmall",
+  0xf760,
+  "Gsmall",
+  0xf767,
+  "Gsmallhook",
+  0x029b,
+  "Gstroke",
+  0x01e4,
+  "H",
+  0x0048,
+  "H18533",
+  0x25cf,
+  "H18543",
+  0x25aa,
+  "H18551",
+  0x25ab,
+  "H22073",
+  0x25a1,
+  "HPsquare",
+  0x33cb,
+  "Haabkhasiancyrillic",
+  0x04a8,
+  "Hadescendercyrillic",
+  0x04b2,
+  "Hardsigncyrillic",
+  0x042a,
+  "Hbar",
+  0x0126,
+  "Hbrevebelow",
+  0x1e2a,
+  "Hcedilla",
+  0x1e28,
+  "Hcircle",
+  0x24bd,
+  "Hcircumflex",
+  0x0124,
+  "Hdieresis",
+  0x1e26,
+  "Hdotaccent",
+  0x1e22,
+  "Hdotbelow",
+  0x1e24,
+  "Hmonospace",
+  0xff28,
+  "Hoarmenian",
+  0x0540,
+  "Horicoptic",
+  0x03e8,
+  "Hsmall",
+  0xf768,
+  "Hungarumlaut",
+  0xf6cf,
+  "Hungarumlautsmall",
+  0xf6f8,
+  "Hzsquare",
+  0x3390,
+  "I",
+  0x0049,
+  "IAcyrillic",
+  0x042f,
+  "IJ",
+  0x0132,
+  "IUcyrillic",
+  0x042e,
+  "Iacute",
+  0x00cd,
+  "Iacutesmall",
+  0xf7ed,
+  "Ibreve",
+  0x012c,
+  "Icaron",
+  0x01cf,
+  "Icircle",
+  0x24be,
+  "Icircumflex",
+  0x00ce,
+  "Icircumflexsmall",
+  0xf7ee,
+  "Icyrillic",
+  0x0406,
+  "Idblgrave",
+  0x0208,
+  "Idieresis",
+  0x00cf,
+  "Idieresisacute",
+  0x1e2e,
+  "Idieresiscyrillic",
+  0x04e4,
+  "Idieresissmall",
+  0xf7ef,
+  "Idot",
+  0x0130,
+  "Idotaccent",
+  0x0130,
+  "Idotbelow",
+  0x1eca,
+  "Iebrevecyrillic",
+  0x04d6,
+  "Iecyrillic",
+  0x0415,
+  "Ifraktur",
+  0x2111,
+  "Igrave",
+  0x00cc,
+  "Igravesmall",
+  0xf7ec,
+  "Ihookabove",
+  0x1ec8,
+  "Iicyrillic",
+  0x0418,
+  "Iinvertedbreve",
+  0x020a,
+  "Iishortcyrillic",
+  0x0419,
+  "Imacron",
+  0x012a,
+  "Imacroncyrillic",
+  0x04e2,
+  "Imonospace",
+  0xff29,
+  "Iniarmenian",
+  0x053b,
+  "Iocyrillic",
+  0x0401,
+  "Iogonek",
+  0x012e,
+  "Iota",
+  0x0399,
+  "Iotaafrican",
+  0x0196,
+  "Iotadieresis",
+  0x03aa,
+  "Iotatonos",
+  0x038a,
+  "Ismall",
+  0xf769,
+  "Istroke",
+  0x0197,
+  "Itilde",
+  0x0128,
+  "Itildebelow",
+  0x1e2c,
+  "Izhitsacyrillic",
+  0x0474,
+  "Izhitsadblgravecyrillic",
+  0x0476,
+  "J",
+  0x004a,
+  "Jaarmenian",
+  0x0541,
+  "Jcircle",
+  0x24bf,
+  "Jcircumflex",
+  0x0134,
+  "Jecyrillic",
+  0x0408,
+  "Jheharmenian",
+  0x054b,
+  "Jmonospace",
+  0xff2a,
+  "Jsmall",
+  0xf76a,
+  "K",
+  0x004b,
+  "KBsquare",
+  0x3385,
+  "KKsquare",
+  0x33cd,
+  "Kabashkircyrillic",
+  0x04a0,
+  "Kacute",
+  0x1e30,
+  "Kacyrillic",
+  0x041a,
+  "Kadescendercyrillic",
+  0x049a,
+  "Kahookcyrillic",
+  0x04c3,
+  "Kappa",
+  0x039a,
+  "Kastrokecyrillic",
+  0x049e,
+  "Kaverticalstrokecyrillic",
+  0x049c,
+  "Kcaron",
+  0x01e8,
+  "Kcedilla",
+  0x0136,
+  "Kcircle",
+  0x24c0,
+  "Kcommaaccent",
+  0x0136,
+  "Kdotbelow",
+  0x1e32,
+  "Keharmenian",
+  0x0554,
+  "Kenarmenian",
+  0x053f,
+  "Khacyrillic",
+  0x0425,
+  "Kheicoptic",
+  0x03e6,
+  "Khook",
+  0x0198,
+  "Kjecyrillic",
+  0x040c,
+  "Klinebelow",
+  0x1e34,
+  "Kmonospace",
+  0xff2b,
+  "Koppacyrillic",
+  0x0480,
+  "Koppagreek",
+  0x03de,
+  "Ksicyrillic",
+  0x046e,
+  "Ksmall",
+  0xf76b,
+  "L",
+  0x004c,
+  "LJ",
+  0x01c7,
+  "LL",
+  0xf6bf,
+  "Lacute",
+  0x0139,
+  "Lambda",
+  0x039b,
+  "Lcaron",
+  0x013d,
+  "Lcedilla",
+  0x013b,
+  "Lcircle",
+  0x24c1,
+  "Lcircumflexbelow",
+  0x1e3c,
+  "Lcommaaccent",
+  0x013b,
+  "Ldot",
+  0x013f,
+  "Ldotaccent",
+  0x013f,
+  "Ldotbelow",
+  0x1e36,
+  "Ldotbelowmacron",
+  0x1e38,
+  "Liwnarmenian",
+  0x053c,
+  "Lj",
+  0x01c8,
+  "Ljecyrillic",
+  0x0409,
+  "Llinebelow",
+  0x1e3a,
+  "Lmonospace",
+  0xff2c,
+  "Lslash",
+  0x0141,
+  "Lslashsmall",
+  0xf6f9,
+  "Lsmall",
+  0xf76c,
+  "M",
+  0x004d,
+  "MBsquare",
+  0x3386,
+  "Macron",
+  0xf6d0,
+  "Macronsmall",
+  0xf7af,
+  "Macute",
+  0x1e3e,
+  "Mcircle",
+  0x24c2,
+  "Mdotaccent",
+  0x1e40,
+  "Mdotbelow",
+  0x1e42,
+  "Menarmenian",
+  0x0544,
+  "Mmonospace",
+  0xff2d,
+  "Msmall",
+  0xf76d,
+  "Mturned",
+  0x019c,
+  "Mu",
+  0x039c,
+  "N",
+  0x004e,
+  "NJ",
+  0x01ca,
+  "Nacute",
+  0x0143,
+  "Ncaron",
+  0x0147,
+  "Ncedilla",
+  0x0145,
+  "Ncircle",
+  0x24c3,
+  "Ncircumflexbelow",
+  0x1e4a,
+  "Ncommaaccent",
+  0x0145,
+  "Ndotaccent",
+  0x1e44,
+  "Ndotbelow",
+  0x1e46,
+  "Nhookleft",
+  0x019d,
+  "Nineroman",
+  0x2168,
+  "Nj",
+  0x01cb,
+  "Njecyrillic",
+  0x040a,
+  "Nlinebelow",
+  0x1e48,
+  "Nmonospace",
+  0xff2e,
+  "Nowarmenian",
+  0x0546,
+  "Nsmall",
+  0xf76e,
+  "Ntilde",
+  0x00d1,
+  "Ntildesmall",
+  0xf7f1,
+  "Nu",
+  0x039d,
+  "O",
+  0x004f,
+  "OE",
+  0x0152,
+  "OEsmall",
+  0xf6fa,
+  "Oacute",
+  0x00d3,
+  "Oacutesmall",
+  0xf7f3,
+  "Obarredcyrillic",
+  0x04e8,
+  "Obarreddieresiscyrillic",
+  0x04ea,
+  "Obreve",
+  0x014e,
+  "Ocaron",
+  0x01d1,
+  "Ocenteredtilde",
+  0x019f,
+  "Ocircle",
+  0x24c4,
+  "Ocircumflex",
+  0x00d4,
+  "Ocircumflexacute",
+  0x1ed0,
+  "Ocircumflexdotbelow",
+  0x1ed8,
+  "Ocircumflexgrave",
+  0x1ed2,
+  "Ocircumflexhookabove",
+  0x1ed4,
+  "Ocircumflexsmall",
+  0xf7f4,
+  "Ocircumflextilde",
+  0x1ed6,
+  "Ocyrillic",
+  0x041e,
+  "Odblacute",
+  0x0150,
+  "Odblgrave",
+  0x020c,
+  "Odieresis",
+  0x00d6,
+  "Odieresiscyrillic",
+  0x04e6,
+  "Odieresissmall",
+  0xf7f6,
+  "Odotbelow",
+  0x1ecc,
+  "Ogoneksmall",
+  0xf6fb,
+  "Ograve",
+  0x00d2,
+  "Ogravesmall",
+  0xf7f2,
+  "Oharmenian",
+  0x0555,
+  "Ohm",
+  0x2126,
+  "Ohookabove",
+  0x1ece,
+  "Ohorn",
+  0x01a0,
+  "Ohornacute",
+  0x1eda,
+  "Ohorndotbelow",
+  0x1ee2,
+  "Ohorngrave",
+  0x1edc,
+  "Ohornhookabove",
+  0x1ede,
+  "Ohorntilde",
+  0x1ee0,
+  "Ohungarumlaut",
+  0x0150,
+  "Oi",
+  0x01a2,
+  "Oinvertedbreve",
+  0x020e,
+  "Omacron",
+  0x014c,
+  "Omacronacute",
+  0x1e52,
+  "Omacrongrave",
+  0x1e50,
+  "Omega",
+  0x2126,
+  "Omegacyrillic",
+  0x0460,
+  "Omegagreek",
+  0x03a9,
+  "Omegaroundcyrillic",
+  0x047a,
+  "Omegatitlocyrillic",
+  0x047c,
+  "Omegatonos",
+  0x038f,
+  "Omicron",
+  0x039f,
+  "Omicrontonos",
+  0x038c,
+  "Omonospace",
+  0xff2f,
+  "Oneroman",
+  0x2160,
+  "Oogonek",
+  0x01ea,
+  "Oogonekmacron",
+  0x01ec,
+  "Oopen",
+  0x0186,
+  "Oslash",
+  0x00d8,
+  "Oslashacute",
+  0x01fe,
+  "Oslashsmall",
+  0xf7f8,
+  "Osmall",
+  0xf76f,
+  "Ostrokeacute",
+  0x01fe,
+  "Otcyrillic",
+  0x047e,
+  "Otilde",
+  0x00d5,
+  "Otildeacute",
+  0x1e4c,
+  "Otildedieresis",
+  0x1e4e,
+  "Otildesmall",
+  0xf7f5,
+  "P",
+  0x0050,
+  "Pacute",
+  0x1e54,
+  "Pcircle",
+  0x24c5,
+  "Pdotaccent",
+  0x1e56,
+  "Pecyrillic",
+  0x041f,
+  "Peharmenian",
+  0x054a,
+  "Pemiddlehookcyrillic",
+  0x04a6,
+  "Phi",
+  0x03a6,
+  "Phook",
+  0x01a4,
+  "Pi",
+  0x03a0,
+  "Piwrarmenian",
+  0x0553,
+  "Pmonospace",
+  0xff30,
+  "Psi",
+  0x03a8,
+  "Psicyrillic",
+  0x0470,
+  "Psmall",
+  0xf770,
+  "Q",
+  0x0051,
+  "Qcircle",
+  0x24c6,
+  "Qmonospace",
+  0xff31,
+  "Qsmall",
+  0xf771,
+  "R",
+  0x0052,
+  "Raarmenian",
+  0x054c,
+  "Racute",
+  0x0154,
+  "Rcaron",
+  0x0158,
+  "Rcedilla",
+  0x0156,
+  "Rcircle",
+  0x24c7,
+  "Rcommaaccent",
+  0x0156,
+  "Rdblgrave",
+  0x0210,
+  "Rdotaccent",
+  0x1e58,
+  "Rdotbelow",
+  0x1e5a,
+  "Rdotbelowmacron",
+  0x1e5c,
+  "Reharmenian",
+  0x0550,
+  "Rfraktur",
+  0x211c,
+  "Rho",
+  0x03a1,
+  "Ringsmall",
+  0xf6fc,
+  "Rinvertedbreve",
+  0x0212,
+  "Rlinebelow",
+  0x1e5e,
+  "Rmonospace",
+  0xff32,
+  "Rsmall",
+  0xf772,
+  "Rsmallinverted",
+  0x0281,
+  "Rsmallinvertedsuperior",
+  0x02b6,
+  "S",
+  0x0053,
+  "SF010000",
+  0x250c,
+  "SF020000",
+  0x2514,
+  "SF030000",
+  0x2510,
+  "SF040000",
+  0x2518,
+  "SF050000",
+  0x253c,
+  "SF060000",
+  0x252c,
+  "SF070000",
+  0x2534,
+  "SF080000",
+  0x251c,
+  "SF090000",
+  0x2524,
+  "SF100000",
+  0x2500,
+  "SF110000",
+  0x2502,
+  "SF190000",
+  0x2561,
+  "SF200000",
+  0x2562,
+  "SF210000",
+  0x2556,
+  "SF220000",
+  0x2555,
+  "SF230000",
+  0x2563,
+  "SF240000",
+  0x2551,
+  "SF250000",
+  0x2557,
+  "SF260000",
+  0x255d,
+  "SF270000",
+  0x255c,
+  "SF280000",
+  0x255b,
+  "SF360000",
+  0x255e,
+  "SF370000",
+  0x255f,
+  "SF380000",
+  0x255a,
+  "SF390000",
+  0x2554,
+  "SF400000",
+  0x2569,
+  "SF410000",
+  0x2566,
+  "SF420000",
+  0x2560,
+  "SF430000",
+  0x2550,
+  "SF440000",
+  0x256c,
+  "SF450000",
+  0x2567,
+  "SF460000",
+  0x2568,
+  "SF470000",
+  0x2564,
+  "SF480000",
+  0x2565,
+  "SF490000",
+  0x2559,
+  "SF500000",
+  0x2558,
+  "SF510000",
+  0x2552,
+  "SF520000",
+  0x2553,
+  "SF530000",
+  0x256b,
+  "SF540000",
+  0x256a,
+  "Sacute",
+  0x015a,
+  "Sacutedotaccent",
+  0x1e64,
+  "Sampigreek",
+  0x03e0,
+  "Scaron",
+  0x0160,
+  "Scarondotaccent",
+  0x1e66,
+  "Scaronsmall",
+  0xf6fd,
+  "Scedilla",
+  0x015e,
+  "Schwa",
+  0x018f,
+  "Schwacyrillic",
+  0x04d8,
+  "Schwadieresiscyrillic",
+  0x04da,
+  "Scircle",
+  0x24c8,
+  "Scircumflex",
+  0x015c,
+  "Scommaaccent",
+  0x0218,
+  "Sdotaccent",
+  0x1e60,
+  "Sdotbelow",
+  0x1e62,
+  "Sdotbelowdotaccent",
+  0x1e68,
+  "Seharmenian",
+  0x054d,
+  "Sevenroman",
+  0x2166,
+  "Shaarmenian",
+  0x0547,
+  "Shacyrillic",
+  0x0428,
+  "Shchacyrillic",
+  0x0429,
+  "Sheicoptic",
+  0x03e2,
+  "Shhacyrillic",
+  0x04ba,
+  "Shimacoptic",
+  0x03ec,
+  "Sigma",
+  0x03a3,
+  "Sixroman",
+  0x2165,
+  "Smonospace",
+  0xff33,
+  "Softsigncyrillic",
+  0x042c,
+  "Ssmall",
+  0xf773,
+  "Stigmagreek",
+  0x03da,
+  "T",
+  0x0054,
+  "Tau",
+  0x03a4,
+  "Tbar",
+  0x0166,
+  "Tcaron",
+  0x0164,
+  "Tcedilla",
+  0x0162,
+  "Tcircle",
+  0x24c9,
+  "Tcircumflexbelow",
+  0x1e70,
+  "Tcommaaccent",
+  0x0162,
+  "Tdotaccent",
+  0x1e6a,
+  "Tdotbelow",
+  0x1e6c,
+  "Tecyrillic",
+  0x0422,
+  "Tedescendercyrillic",
+  0x04ac,
+  "Tenroman",
+  0x2169,
+  "Tetsecyrillic",
+  0x04b4,
+  "Theta",
+  0x0398,
+  "Thook",
+  0x01ac,
+  "Thorn",
+  0x00de,
+  "Thornsmall",
+  0xf7fe,
+  "Threeroman",
+  0x2162,
+  "Tildesmall",
+  0xf6fe,
+  "Tiwnarmenian",
+  0x054f,
+  "Tlinebelow",
+  0x1e6e,
+  "Tmonospace",
+  0xff34,
+  "Toarmenian",
+  0x0539,
+  "Tonefive",
+  0x01bc,
+  "Tonesix",
+  0x0184,
+  "Tonetwo",
+  0x01a7,
+  "Tretroflexhook",
+  0x01ae,
+  "Tsecyrillic",
+  0x0426,
+  "Tshecyrillic",
+  0x040b,
+  "Tsmall",
+  0xf774,
+  "Twelveroman",
+  0x216b,
+  "Tworoman",
+  0x2161,
+  "U",
+  0x0055,
+  "Uacute",
+  0x00da,
+  "Uacutesmall",
+  0xf7fa,
+  "Ubreve",
+  0x016c,
+  "Ucaron",
+  0x01d3,
+  "Ucircle",
+  0x24ca,
+  "Ucircumflex",
+  0x00db,
+  "Ucircumflexbelow",
+  0x1e76,
+  "Ucircumflexsmall",
+  0xf7fb,
+  "Ucyrillic",
+  0x0423,
+  "Udblacute",
+  0x0170,
+  "Udblgrave",
+  0x0214,
+  "Udieresis",
+  0x00dc,
+  "Udieresisacute",
+  0x01d7,
+  "Udieresisbelow",
+  0x1e72,
+  "Udieresiscaron",
+  0x01d9,
+  "Udieresiscyrillic",
+  0x04f0,
+  "Udieresisgrave",
+  0x01db,
+  "Udieresismacron",
+  0x01d5,
+  "Udieresissmall",
+  0xf7fc,
+  "Udotbelow",
+  0x1ee4,
+  "Ugrave",
+  0x00d9,
+  "Ugravesmall",
+  0xf7f9,
+  "Uhookabove",
+  0x1ee6,
+  "Uhorn",
+  0x01af,
+  "Uhornacute",
+  0x1ee8,
+  "Uhorndotbelow",
+  0x1ef0,
+  "Uhorngrave",
+  0x1eea,
+  "Uhornhookabove",
+  0x1eec,
+  "Uhorntilde",
+  0x1eee,
+  "Uhungarumlaut",
+  0x0170,
+  "Uhungarumlautcyrillic",
+  0x04f2,
+  "Uinvertedbreve",
+  0x0216,
+  "Ukcyrillic",
+  0x0478,
+  "Umacron",
+  0x016a,
+  "Umacroncyrillic",
+  0x04ee,
+  "Umacrondieresis",
+  0x1e7a,
+  "Umonospace",
+  0xff35,
+  "Uogonek",
+  0x0172,
+  "Upsilon",
+  0x03a5,
+  "Upsilon1",
+  0x03d2,
+  "Upsilonacutehooksymbolgreek",
+  0x03d3,
+  "Upsilonafrican",
+  0x01b1,
+  "Upsilondieresis",
+  0x03ab,
+  "Upsilondieresishooksymbolgreek",
+  0x03d4,
+  "Upsilonhooksymbol",
+  0x03d2,
+  "Upsilontonos",
+  0x038e,
+  "Uring",
+  0x016e,
+  "Ushortcyrillic",
+  0x040e,
+  "Usmall",
+  0xf775,
+  "Ustraightcyrillic",
+  0x04ae,
+  "Ustraightstrokecyrillic",
+  0x04b0,
+  "Utilde",
+  0x0168,
+  "Utildeacute",
+  0x1e78,
+  "Utildebelow",
+  0x1e74,
+  "V",
+  0x0056,
+  "Vcircle",
+  0x24cb,
+  "Vdotbelow",
+  0x1e7e,
+  "Vecyrillic",
+  0x0412,
+  "Vewarmenian",
+  0x054e,
+  "Vhook",
+  0x01b2,
+  "Vmonospace",
+  0xff36,
+  "Voarmenian",
+  0x0548,
+  "Vsmall",
+  0xf776,
+  "Vtilde",
+  0x1e7c,
+  "W",
+  0x0057,
+  "Wacute",
+  0x1e82,
+  "Wcircle",
+  0x24cc,
+  "Wcircumflex",
+  0x0174,
+  "Wdieresis",
+  0x1e84,
+  "Wdotaccent",
+  0x1e86,
+  "Wdotbelow",
+  0x1e88,
+  "Wgrave",
+  0x1e80,
+  "Wmonospace",
+  0xff37,
+  "Wsmall",
+  0xf777,
+  "X",
+  0x0058,
+  "Xcircle",
+  0x24cd,
+  "Xdieresis",
+  0x1e8c,
+  "Xdotaccent",
+  0x1e8a,
+  "Xeharmenian",
+  0x053d,
+  "Xi",
+  0x039e,
+  "Xmonospace",
+  0xff38,
+  "Xsmall",
+  0xf778,
+  "Y",
+  0x0059,
+  "Yacute",
+  0x00dd,
+  "Yacutesmall",
+  0xf7fd,
+  "Yatcyrillic",
+  0x0462,
+  "Ycircle",
+  0x24ce,
+  "Ycircumflex",
+  0x0176,
+  "Ydieresis",
+  0x0178,
+  "Ydieresissmall",
+  0xf7ff,
+  "Ydotaccent",
+  0x1e8e,
+  "Ydotbelow",
+  0x1ef4,
+  "Yericyrillic",
+  0x042b,
+  "Yerudieresiscyrillic",
+  0x04f8,
+  "Ygrave",
+  0x1ef2,
+  "Yhook",
+  0x01b3,
+  "Yhookabove",
+  0x1ef6,
+  "Yiarmenian",
+  0x0545,
+  "Yicyrillic",
+  0x0407,
+  "Yiwnarmenian",
+  0x0552,
+  "Ymonospace",
+  0xff39,
+  "Ysmall",
+  0xf779,
+  "Ytilde",
+  0x1ef8,
+  "Yusbigcyrillic",
+  0x046a,
+  "Yusbigiotifiedcyrillic",
+  0x046c,
+  "Yuslittlecyrillic",
+  0x0466,
+  "Yuslittleiotifiedcyrillic",
+  0x0468,
+  "Z",
+  0x005a,
+  "Zaarmenian",
+  0x0536,
+  "Zacute",
+  0x0179,
+  "Zcaron",
+  0x017d,
+  "Zcaronsmall",
+  0xf6ff,
+  "Zcircle",
+  0x24cf,
+  "Zcircumflex",
+  0x1e90,
+  "Zdot",
+  0x017b,
+  "Zdotaccent",
+  0x017b,
+  "Zdotbelow",
+  0x1e92,
+  "Zecyrillic",
+  0x0417,
+  "Zedescendercyrillic",
+  0x0498,
+  "Zedieresiscyrillic",
+  0x04de,
+  "Zeta",
+  0x0396,
+  "Zhearmenian",
+  0x053a,
+  "Zhebrevecyrillic",
+  0x04c1,
+  "Zhecyrillic",
+  0x0416,
+  "Zhedescendercyrillic",
+  0x0496,
+  "Zhedieresiscyrillic",
+  0x04dc,
+  "Zlinebelow",
+  0x1e94,
+  "Zmonospace",
+  0xff3a,
+  "Zsmall",
+  0xf77a,
+  "Zstroke",
+  0x01b5,
+  "a",
+  0x0061,
+  "aabengali",
+  0x0986,
+  "aacute",
+  0x00e1,
+  "aadeva",
+  0x0906,
+  "aagujarati",
+  0x0a86,
+  "aagurmukhi",
+  0x0a06,
+  "aamatragurmukhi",
+  0x0a3e,
+  "aarusquare",
+  0x3303,
+  "aavowelsignbengali",
+  0x09be,
+  "aavowelsigndeva",
+  0x093e,
+  "aavowelsigngujarati",
+  0x0abe,
+  "abbreviationmarkarmenian",
+  0x055f,
+  "abbreviationsigndeva",
+  0x0970,
+  "abengali",
+  0x0985,
+  "abopomofo",
+  0x311a,
+  "abreve",
+  0x0103,
+  "abreveacute",
+  0x1eaf,
+  "abrevecyrillic",
+  0x04d1,
+  "abrevedotbelow",
+  0x1eb7,
+  "abrevegrave",
+  0x1eb1,
+  "abrevehookabove",
+  0x1eb3,
+  "abrevetilde",
+  0x1eb5,
+  "acaron",
+  0x01ce,
+  "acircle",
+  0x24d0,
+  "acircumflex",
+  0x00e2,
+  "acircumflexacute",
+  0x1ea5,
+  "acircumflexdotbelow",
+  0x1ead,
+  "acircumflexgrave",
+  0x1ea7,
+  "acircumflexhookabove",
+  0x1ea9,
+  "acircumflextilde",
+  0x1eab,
+  "acute",
+  0x00b4,
+  "acutebelowcmb",
+  0x0317,
+  "acutecmb",
+  0x0301,
+  "acutecomb",
+  0x0301,
+  "acutedeva",
+  0x0954,
+  "acutelowmod",
+  0x02cf,
+  "acutetonecmb",
+  0x0341,
+  "acyrillic",
+  0x0430,
+  "adblgrave",
+  0x0201,
+  "addakgurmukhi",
+  0x0a71,
+  "adeva",
+  0x0905,
+  "adieresis",
+  0x00e4,
+  "adieresiscyrillic",
+  0x04d3,
+  "adieresismacron",
+  0x01df,
+  "adotbelow",
+  0x1ea1,
+  "adotmacron",
+  0x01e1,
+  "ae",
+  0x00e6,
+  "aeacute",
+  0x01fd,
+  "aekorean",
+  0x3150,
+  "aemacron",
+  0x01e3,
+  "afii00208",
+  0x2015,
+  "afii08941",
+  0x20a4,
+  "afii10017",
+  0x0410,
+  "afii10018",
+  0x0411,
+  "afii10019",
+  0x0412,
+  "afii10020",
+  0x0413,
+  "afii10021",
+  0x0414,
+  "afii10022",
+  0x0415,
+  "afii10023",
+  0x0401,
+  "afii10024",
+  0x0416,
+  "afii10025",
+  0x0417,
+  "afii10026",
+  0x0418,
+  "afii10027",
+  0x0419,
+  "afii10028",
+  0x041a,
+  "afii10029",
+  0x041b,
+  "afii10030",
+  0x041c,
+  "afii10031",
+  0x041d,
+  "afii10032",
+  0x041e,
+  "afii10033",
+  0x041f,
+  "afii10034",
+  0x0420,
+  "afii10035",
+  0x0421,
+  "afii10036",
+  0x0422,
+  "afii10037",
+  0x0423,
+  "afii10038",
+  0x0424,
+  "afii10039",
+  0x0425,
+  "afii10040",
+  0x0426,
+  "afii10041",
+  0x0427,
+  "afii10042",
+  0x0428,
+  "afii10043",
+  0x0429,
+  "afii10044",
+  0x042a,
+  "afii10045",
+  0x042b,
+  "afii10046",
+  0x042c,
+  "afii10047",
+  0x042d,
+  "afii10048",
+  0x042e,
+  "afii10049",
+  0x042f,
+  "afii10050",
+  0x0490,
+  "afii10051",
+  0x0402,
+  "afii10052",
+  0x0403,
+  "afii10053",
+  0x0404,
+  "afii10054",
+  0x0405,
+  "afii10055",
+  0x0406,
+  "afii10056",
+  0x0407,
+  "afii10057",
+  0x0408,
+  "afii10058",
+  0x0409,
+  "afii10059",
+  0x040a,
+  "afii10060",
+  0x040b,
+  "afii10061",
+  0x040c,
+  "afii10062",
+  0x040e,
+  "afii10063",
+  0xf6c4,
+  "afii10064",
+  0xf6c5,
+  "afii10065",
+  0x0430,
+  "afii10066",
+  0x0431,
+  "afii10067",
+  0x0432,
+  "afii10068",
+  0x0433,
+  "afii10069",
+  0x0434,
+  "afii10070",
+  0x0435,
+  "afii10071",
+  0x0451,
+  "afii10072",
+  0x0436,
+  "afii10073",
+  0x0437,
+  "afii10074",
+  0x0438,
+  "afii10075",
+  0x0439,
+  "afii10076",
+  0x043a,
+  "afii10077",
+  0x043b,
+  "afii10078",
+  0x043c,
+  "afii10079",
+  0x043d,
+  "afii10080",
+  0x043e,
+  "afii10081",
+  0x043f,
+  "afii10082",
+  0x0440,
+  "afii10083",
+  0x0441,
+  "afii10084",
+  0x0442,
+  "afii10085",
+  0x0443,
+  "afii10086",
+  0x0444,
+  "afii10087",
+  0x0445,
+  "afii10088",
+  0x0446,
+  "afii10089",
+  0x0447,
+  "afii10090",
+  0x0448,
+  "afii10091",
+  0x0449,
+  "afii10092",
+  0x044a,
+  "afii10093",
+  0x044b,
+  "afii10094",
+  0x044c,
+  "afii10095",
+  0x044d,
+  "afii10096",
+  0x044e,
+  "afii10097",
+  0x044f,
+  "afii10098",
+  0x0491,
+  "afii10099",
+  0x0452,
+  "afii10100",
+  0x0453,
+  "afii10101",
+  0x0454,
+  "afii10102",
+  0x0455,
+  "afii10103",
+  0x0456,
+  "afii10104",
+  0x0457,
+  "afii10105",
+  0x0458,
+  "afii10106",
+  0x0459,
+  "afii10107",
+  0x045a,
+  "afii10108",
+  0x045b,
+  "afii10109",
+  0x045c,
+  "afii10110",
+  0x045e,
+  "afii10145",
+  0x040f,
+  "afii10146",
+  0x0462,
+  "afii10147",
+  0x0472,
+  "afii10148",
+  0x0474,
+  "afii10192",
+  0xf6c6,
+  "afii10193",
+  0x045f,
+  "afii10194",
+  0x0463,
+  "afii10195",
+  0x0473,
+  "afii10196",
+  0x0475,
+  "afii10831",
+  0xf6c7,
+  "afii10832",
+  0xf6c8,
+  "afii10846",
+  0x04d9,
+  "afii299",
+  0x200e,
+  "afii300",
+  0x200f,
+  "afii301",
+  0x200d,
+  "afii57381",
+  0x066a,
+  "afii57388",
+  0x060c,
+  "afii57392",
+  0x0660,
+  "afii57393",
+  0x0661,
+  "afii57394",
+  0x0662,
+  "afii57395",
+  0x0663,
+  "afii57396",
+  0x0664,
+  "afii57397",
+  0x0665,
+  "afii57398",
+  0x0666,
+  "afii57399",
+  0x0667,
+  "afii57400",
+  0x0668,
+  "afii57401",
+  0x0669,
+  "afii57403",
+  0x061b,
+  "afii57407",
+  0x061f,
+  "afii57409",
+  0x0621,
+  "afii57410",
+  0x0622,
+  "afii57411",
+  0x0623,
+  "afii57412",
+  0x0624,
+  "afii57413",
+  0x0625,
+  "afii57414",
+  0x0626,
+  "afii57415",
+  0x0627,
+  "afii57416",
+  0x0628,
+  "afii57417",
+  0x0629,
+  "afii57418",
+  0x062a,
+  "afii57419",
+  0x062b,
+  "afii57420",
+  0x062c,
+  "afii57421",
+  0x062d,
+  "afii57422",
+  0x062e,
+  "afii57423",
+  0x062f,
+  "afii57424",
+  0x0630,
+  "afii57425",
+  0x0631,
+  "afii57426",
+  0x0632,
+  "afii57427",
+  0x0633,
+  "afii57428",
+  0x0634,
+  "afii57429",
+  0x0635,
+  "afii57430",
+  0x0636,
+  "afii57431",
+  0x0637,
+  "afii57432",
+  0x0638,
+  "afii57433",
+  0x0639,
+  "afii57434",
+  0x063a,
+  "afii57440",
+  0x0640,
+  "afii57441",
+  0x0641,
+  "afii57442",
+  0x0642,
+  "afii57443",
+  0x0643,
+  "afii57444",
+  0x0644,
+  "afii57445",
+  0x0645,
+  "afii57446",
+  0x0646,
+  "afii57448",
+  0x0648,
+  "afii57449",
+  0x0649,
+  "afii57450",
+  0x064a,
+  "afii57451",
+  0x064b,
+  "afii57452",
+  0x064c,
+  "afii57453",
+  0x064d,
+  "afii57454",
+  0x064e,
+  "afii57455",
+  0x064f,
+  "afii57456",
+  0x0650,
+  "afii57457",
+  0x0651,
+  "afii57458",
+  0x0652,
+  "afii57470",
+  0x0647,
+  "afii57505",
+  0x06a4,
+  "afii57506",
+  0x067e,
+  "afii57507",
+  0x0686,
+  "afii57508",
+  0x0698,
+  "afii57509",
+  0x06af,
+  "afii57511",
+  0x0679,
+  "afii57512",
+  0x0688,
+  "afii57513",
+  0x0691,
+  "afii57514",
+  0x06ba,
+  "afii57519",
+  0x06d2,
+  "afii57534",
+  0x06d5,
+  "afii57636",
+  0x20aa,
+  "afii57645",
+  0x05be,
+  "afii57658",
+  0x05c3,
+  "afii57664",
+  0x05d0,
+  "afii57665",
+  0x05d1,
+  "afii57666",
+  0x05d2,
+  "afii57667",
+  0x05d3,
+  "afii57668",
+  0x05d4,
+  "afii57669",
+  0x05d5,
+  "afii57670",
+  0x05d6,
+  "afii57671",
+  0x05d7,
+  "afii57672",
+  0x05d8,
+  "afii57673",
+  0x05d9,
+  "afii57674",
+  0x05da,
+  "afii57675",
+  0x05db,
+  "afii57676",
+  0x05dc,
+  "afii57677",
+  0x05dd,
+  "afii57678",
+  0x05de,
+  "afii57679",
+  0x05df,
+  "afii57680",
+  0x05e0,
+  "afii57681",
+  0x05e1,
+  "afii57682",
+  0x05e2,
+  "afii57683",
+  0x05e3,
+  "afii57684",
+  0x05e4,
+  "afii57685",
+  0x05e5,
+  "afii57686",
+  0x05e6,
+  "afii57687",
+  0x05e7,
+  "afii57688",
+  0x05e8,
+  "afii57689",
+  0x05e9,
+  "afii57690",
+  0x05ea,
+  "afii57694",
+  0xfb2a,
+  "afii57695",
+  0xfb2b,
+  "afii57700",
+  0xfb4b,
+  "afii57705",
+  0xfb1f,
+  "afii57716",
+  0x05f0,
+  "afii57717",
+  0x05f1,
+  "afii57718",
+  0x05f2,
+  "afii57723",
+  0xfb35,
+  "afii57793",
+  0x05b4,
+  "afii57794",
+  0x05b5,
+  "afii57795",
+  0x05b6,
+  "afii57796",
+  0x05bb,
+  "afii57797",
+  0x05b8,
+  "afii57798",
+  0x05b7,
+  "afii57799",
+  0x05b0,
+  "afii57800",
+  0x05b2,
+  "afii57801",
+  0x05b1,
+  "afii57802",
+  0x05b3,
+  "afii57803",
+  0x05c2,
+  "afii57804",
+  0x05c1,
+  "afii57806",
+  0x05b9,
+  "afii57807",
+  0x05bc,
+  "afii57839",
+  0x05bd,
+  "afii57841",
+  0x05bf,
+  "afii57842",
+  0x05c0,
+  "afii57929",
+  0x02bc,
+  "afii61248",
+  0x2105,
+  "afii61289",
+  0x2113,
+  "afii61352",
+  0x2116,
+  "afii61573",
+  0x202c,
+  "afii61574",
+  0x202d,
+  "afii61575",
+  0x202e,
+  "afii61664",
+  0x200c,
+  "afii63167",
+  0x066d,
+  "afii64937",
+  0x02bd,
+  "agrave",
+  0x00e0,
+  "agujarati",
+  0x0a85,
+  "agurmukhi",
+  0x0a05,
+  "ahiragana",
+  0x3042,
+  "ahookabove",
+  0x1ea3,
+  "aibengali",
+  0x0990,
+  "aibopomofo",
+  0x311e,
+  "aideva",
+  0x0910,
+  "aiecyrillic",
+  0x04d5,
+  "aigujarati",
+  0x0a90,
+  "aigurmukhi",
+  0x0a10,
+  "aimatragurmukhi",
+  0x0a48,
+  "ainarabic",
+  0x0639,
+  "ainfinalarabic",
+  0xfeca,
+  "aininitialarabic",
+  0xfecb,
+  "ainmedialarabic",
+  0xfecc,
+  "ainvertedbreve",
+  0x0203,
+  "aivowelsignbengali",
+  0x09c8,
+  "aivowelsigndeva",
+  0x0948,
+  "aivowelsigngujarati",
+  0x0ac8,
+  "akatakana",
+  0x30a2,
+  "akatakanahalfwidth",
+  0xff71,
+  "akorean",
+  0x314f,
+  "alef",
+  0x05d0,
+  "alefarabic",
+  0x0627,
+  "alefdageshhebrew",
+  0xfb30,
+  "aleffinalarabic",
+  0xfe8e,
+  "alefhamzaabovearabic",
+  0x0623,
+  "alefhamzaabovefinalarabic",
+  0xfe84,
+  "alefhamzabelowarabic",
+  0x0625,
+  "alefhamzabelowfinalarabic",
+  0xfe88,
+  "alefhebrew",
+  0x05d0,
+  "aleflamedhebrew",
+  0xfb4f,
+  "alefmaddaabovearabic",
+  0x0622,
+  "alefmaddaabovefinalarabic",
+  0xfe82,
+  "alefmaksuraarabic",
+  0x0649,
+  "alefmaksurafinalarabic",
+  0xfef0,
+  "alefmaksurainitialarabic",
+  0xfef3,
+  "alefmaksuramedialarabic",
+  0xfef4,
+  "alefpatahhebrew",
+  0xfb2e,
+  "alefqamatshebrew",
+  0xfb2f,
+  "aleph",
+  0x2135,
+  "allequal",
+  0x224c,
+  "alpha",
+  0x03b1,
+  "alphatonos",
+  0x03ac,
+  "amacron",
+  0x0101,
+  "amonospace",
+  0xff41,
+  "ampersand",
+  0x0026,
+  "ampersandmonospace",
+  0xff06,
+  "ampersandsmall",
+  0xf726,
+  "amsquare",
+  0x33c2,
+  "anbopomofo",
+  0x3122,
+  "angbopomofo",
+  0x3124,
+  "angbracketleft",
+  0x3008,
+  "angbracketright",
+  0x3009,
+  "angkhankhuthai",
+  0x0e5a,
+  "angle",
+  0x2220,
+  "anglebracketleft",
+  0x3008,
+  "anglebracketleftvertical",
+  0xfe3f,
+  "anglebracketright",
+  0x3009,
+  "anglebracketrightvertical",
+  0xfe40,
+  "angleleft",
+  0x2329,
+  "angleright",
+  0x232a,
+  "angstrom",
+  0x212b,
+  "anoteleia",
+  0x0387,
+  "anudattadeva",
+  0x0952,
+  "anusvarabengali",
+  0x0982,
+  "anusvaradeva",
+  0x0902,
+  "anusvaragujarati",
+  0x0a82,
+  "aogonek",
+  0x0105,
+  "apaatosquare",
+  0x3300,
+  "aparen",
+  0x249c,
+  "apostrophearmenian",
+  0x055a,
+  "apostrophemod",
+  0x02bc,
+  "apple",
+  0xf8ff,
+  "approaches",
+  0x2250,
+  "approxequal",
+  0x2248,
+  "approxequalorimage",
+  0x2252,
+  "approximatelyequal",
+  0x2245,
+  "araeaekorean",
+  0x318e,
+  "araeakorean",
+  0x318d,
+  "arc",
+  0x2312,
+  "arighthalfring",
+  0x1e9a,
+  "aring",
+  0x00e5,
+  "aringacute",
+  0x01fb,
+  "aringbelow",
+  0x1e01,
+  "arrowboth",
+  0x2194,
+  "arrowdashdown",
+  0x21e3,
+  "arrowdashleft",
+  0x21e0,
+  "arrowdashright",
+  0x21e2,
+  "arrowdashup",
+  0x21e1,
+  "arrowdblboth",
+  0x21d4,
+  "arrowdbldown",
+  0x21d3,
+  "arrowdblleft",
+  0x21d0,
+  "arrowdblright",
+  0x21d2,
+  "arrowdblup",
+  0x21d1,
+  "arrowdown",
+  0x2193,
+  "arrowdownleft",
+  0x2199,
+  "arrowdownright",
+  0x2198,
+  "arrowdownwhite",
+  0x21e9,
+  "arrowheaddownmod",
+  0x02c5,
+  "arrowheadleftmod",
+  0x02c2,
+  "arrowheadrightmod",
+  0x02c3,
+  "arrowheadupmod",
+  0x02c4,
+  "arrowhorizex",
+  0xf8e7,
+  "arrowleft",
+  0x2190,
+  "arrowleftdbl",
+  0x21d0,
+  "arrowleftdblstroke",
+  0x21cd,
+  "arrowleftoverright",
+  0x21c6,
+  "arrowleftwhite",
+  0x21e6,
+  "arrowright",
+  0x2192,
+  "arrowrightdblstroke",
+  0x21cf,
+  "arrowrightheavy",
+  0x279e,
+  "arrowrightoverleft",
+  0x21c4,
+  "arrowrightwhite",
+  0x21e8,
+  "arrowtableft",
+  0x21e4,
+  "arrowtabright",
+  0x21e5,
+  "arrowup",
+  0x2191,
+  "arrowupdn",
+  0x2195,
+  "arrowupdnbse",
+  0x21a8,
+  "arrowupdownbase",
+  0x21a8,
+  "arrowupleft",
+  0x2196,
+  "arrowupleftofdown",
+  0x21c5,
+  "arrowupright",
+  0x2197,
+  "arrowupwhite",
+  0x21e7,
+  "arrowvertex",
+  0xf8e6,
+  "asciicircum",
+  0x005e,
+  "asciicircummonospace",
+  0xff3e,
+  "asciitilde",
+  0x007e,
+  "asciitildemonospace",
+  0xff5e,
+  "ascript",
+  0x0251,
+  "ascriptturned",
+  0x0252,
+  "asmallhiragana",
+  0x3041,
+  "asmallkatakana",
+  0x30a1,
+  "asmallkatakanahalfwidth",
+  0xff67,
+  "asterisk",
+  0x002a,
+  "asteriskaltonearabic",
+  0x066d,
+  "asteriskarabic",
+  0x066d,
+  "asteriskmath",
+  0x2217,
+  "asteriskmonospace",
+  0xff0a,
+  "asterisksmall",
+  0xfe61,
+  "asterism",
+  0x2042,
+  "asuperior",
+  0xf6e9,
+  "asymptoticallyequal",
+  0x2243,
+  "at",
+  0x0040,
+  "atilde",
+  0x00e3,
+  "atmonospace",
+  0xff20,
+  "atsmall",
+  0xfe6b,
+  "aturned",
+  0x0250,
+  "aubengali",
+  0x0994,
+  "aubopomofo",
+  0x3120,
+  "audeva",
+  0x0914,
+  "augujarati",
+  0x0a94,
+  "augurmukhi",
+  0x0a14,
+  "aulengthmarkbengali",
+  0x09d7,
+  "aumatragurmukhi",
+  0x0a4c,
+  "auvowelsignbengali",
+  0x09cc,
+  "auvowelsigndeva",
+  0x094c,
+  "auvowelsigngujarati",
+  0x0acc,
+  "avagrahadeva",
+  0x093d,
+  "aybarmenian",
+  0x0561,
+  "ayin",
+  0x05e2,
+  "ayinaltonehebrew",
+  0xfb20,
+  "ayinhebrew",
+  0x05e2,
+  "b",
+  0x0062,
+  "babengali",
+  0x09ac,
+  "backslash",
+  0x005c,
+  "backslashmonospace",
+  0xff3c,
+  "badeva",
+  0x092c,
+  "bagujarati",
+  0x0aac,
+  "bagurmukhi",
+  0x0a2c,
+  "bahiragana",
+  0x3070,
+  "bahtthai",
+  0x0e3f,
+  "bakatakana",
+  0x30d0,
+  "bar",
+  0x007c,
+  "barmonospace",
+  0xff5c,
+  "bbopomofo",
+  0x3105,
+  "bcircle",
+  0x24d1,
+  "bdotaccent",
+  0x1e03,
+  "bdotbelow",
+  0x1e05,
+  "beamedsixteenthnotes",
+  0x266c,
+  "because",
+  0x2235,
+  "becyrillic",
+  0x0431,
+  "beharabic",
+  0x0628,
+  "behfinalarabic",
+  0xfe90,
+  "behinitialarabic",
+  0xfe91,
+  "behiragana",
+  0x3079,
+  "behmedialarabic",
+  0xfe92,
+  "behmeeminitialarabic",
+  0xfc9f,
+  "behmeemisolatedarabic",
+  0xfc08,
+  "behnoonfinalarabic",
+  0xfc6d,
+  "bekatakana",
+  0x30d9,
+  "benarmenian",
+  0x0562,
+  "bet",
+  0x05d1,
+  "beta",
+  0x03b2,
+  "betasymbolgreek",
+  0x03d0,
+  "betdagesh",
+  0xfb31,
+  "betdageshhebrew",
+  0xfb31,
+  "bethebrew",
+  0x05d1,
+  "betrafehebrew",
+  0xfb4c,
+  "bhabengali",
+  0x09ad,
+  "bhadeva",
+  0x092d,
+  "bhagujarati",
+  0x0aad,
+  "bhagurmukhi",
+  0x0a2d,
+  "bhook",
+  0x0253,
+  "bihiragana",
+  0x3073,
+  "bikatakana",
+  0x30d3,
+  "bilabialclick",
+  0x0298,
+  "bindigurmukhi",
+  0x0a02,
+  "birusquare",
+  0x3331,
+  "blackcircle",
+  0x25cf,
+  "blackdiamond",
+  0x25c6,
+  "blackdownpointingtriangle",
+  0x25bc,
+  "blackleftpointingpointer",
+  0x25c4,
+  "blackleftpointingtriangle",
+  0x25c0,
+  "blacklenticularbracketleft",
+  0x3010,
+  "blacklenticularbracketleftvertical",
+  0xfe3b,
+  "blacklenticularbracketright",
+  0x3011,
+  "blacklenticularbracketrightvertical",
+  0xfe3c,
+  "blacklowerlefttriangle",
+  0x25e3,
+  "blacklowerrighttriangle",
+  0x25e2,
+  "blackrectangle",
+  0x25ac,
+  "blackrightpointingpointer",
+  0x25ba,
+  "blackrightpointingtriangle",
+  0x25b6,
+  "blacksmallsquare",
+  0x25aa,
+  "blacksmilingface",
+  0x263b,
+  "blacksquare",
+  0x25a0,
+  "blackstar",
+  0x2605,
+  "blackupperlefttriangle",
+  0x25e4,
+  "blackupperrighttriangle",
+  0x25e5,
+  "blackuppointingsmalltriangle",
+  0x25b4,
+  "blackuppointingtriangle",
+  0x25b2,
+  "blank",
+  0x2423,
+  "blinebelow",
+  0x1e07,
+  "block",
+  0x2588,
+  "bmonospace",
+  0xff42,
+  "bobaimaithai",
+  0x0e1a,
+  "bohiragana",
+  0x307c,
+  "bokatakana",
+  0x30dc,
+  "bparen",
+  0x249d,
+  "bqsquare",
+  0x33c3,
+  "braceex",
+  0xf8f4,
+  "braceleft",
+  0x007b,
+  "braceleftbt",
+  0xf8f3,
+  "braceleftmid",
+  0xf8f2,
+  "braceleftmonospace",
+  0xff5b,
+  "braceleftsmall",
+  0xfe5b,
+  "bracelefttp",
+  0xf8f1,
+  "braceleftvertical",
+  0xfe37,
+  "braceright",
+  0x007d,
+  "bracerightbt",
+  0xf8fe,
+  "bracerightmid",
+  0xf8fd,
+  "bracerightmonospace",
+  0xff5d,
+  "bracerightsmall",
+  0xfe5c,
+  "bracerighttp",
+  0xf8fc,
+  "bracerightvertical",
+  0xfe38,
+  "bracketleft",
+  0x005b,
+  "bracketleftbt",
+  0xf8f0,
+  "bracketleftex",
+  0xf8ef,
+  "bracketleftmonospace",
+  0xff3b,
+  "bracketlefttp",
+  0xf8ee,
+  "bracketright",
+  0x005d,
+  "bracketrightbt",
+  0xf8fb,
+  "bracketrightex",
+  0xf8fa,
+  "bracketrightmonospace",
+  0xff3d,
+  "bracketrighttp",
+  0xf8f9,
+  "breve",
+  0x02d8,
+  "brevebelowcmb",
+  0x032e,
+  "brevecmb",
+  0x0306,
+  "breveinvertedbelowcmb",
+  0x032f,
+  "breveinvertedcmb",
+  0x0311,
+  "breveinverteddoublecmb",
+  0x0361,
+  "bridgebelowcmb",
+  0x032a,
+  "bridgeinvertedbelowcmb",
+  0x033a,
+  "brokenbar",
+  0x00a6,
+  "bstroke",
+  0x0180,
+  "bsuperior",
+  0xf6ea,
+  "btopbar",
+  0x0183,
+  "buhiragana",
+  0x3076,
+  "bukatakana",
+  0x30d6,
+  "bullet",
+  0x2022,
+  "bulletinverse",
+  0x25d8,
+  "bulletoperator",
+  0x2219,
+  "bullseye",
+  0x25ce,
+  "c",
+  0x0063,
+  "caarmenian",
+  0x056e,
+  "cabengali",
+  0x099a,
+  "cacute",
+  0x0107,
+  "cadeva",
+  0x091a,
+  "cagujarati",
+  0x0a9a,
+  "cagurmukhi",
+  0x0a1a,
+  "calsquare",
+  0x3388,
+  "candrabindubengali",
+  0x0981,
+  "candrabinducmb",
+  0x0310,
+  "candrabindudeva",
+  0x0901,
+  "candrabindugujarati",
+  0x0a81,
+  "capslock",
+  0x21ea,
+  "careof",
+  0x2105,
+  "caron",
+  0x02c7,
+  "caronbelowcmb",
+  0x032c,
+  "caroncmb",
+  0x030c,
+  "carriagereturn",
+  0x21b5,
+  "cbopomofo",
+  0x3118,
+  "ccaron",
+  0x010d,
+  "ccedilla",
+  0x00e7,
+  "ccedillaacute",
+  0x1e09,
+  "ccircle",
+  0x24d2,
+  "ccircumflex",
+  0x0109,
+  "ccurl",
+  0x0255,
+  "cdot",
+  0x010b,
+  "cdotaccent",
+  0x010b,
+  "cdsquare",
+  0x33c5,
+  "cedilla",
+  0x00b8,
+  "cedillacmb",
+  0x0327,
+  "cent",
+  0x00a2,
+  "centigrade",
+  0x2103,
+  "centinferior",
+  0xf6df,
+  "centmonospace",
+  0xffe0,
+  "centoldstyle",
+  0xf7a2,
+  "centsuperior",
+  0xf6e0,
+  "chaarmenian",
+  0x0579,
+  "chabengali",
+  0x099b,
+  "chadeva",
+  0x091b,
+  "chagujarati",
+  0x0a9b,
+  "chagurmukhi",
+  0x0a1b,
+  "chbopomofo",
+  0x3114,
+  "cheabkhasiancyrillic",
+  0x04bd,
+  "checkmark",
+  0x2713,
+  "checyrillic",
+  0x0447,
+  "chedescenderabkhasiancyrillic",
+  0x04bf,
+  "chedescendercyrillic",
+  0x04b7,
+  "chedieresiscyrillic",
+  0x04f5,
+  "cheharmenian",
+  0x0573,
+  "chekhakassiancyrillic",
+  0x04cc,
+  "cheverticalstrokecyrillic",
+  0x04b9,
+  "chi",
+  0x03c7,
+  "chieuchacirclekorean",
+  0x3277,
+  "chieuchaparenkorean",
+  0x3217,
+  "chieuchcirclekorean",
+  0x3269,
+  "chieuchkorean",
+  0x314a,
+  "chieuchparenkorean",
+  0x3209,
+  "chochangthai",
+  0x0e0a,
+  "chochanthai",
+  0x0e08,
+  "chochingthai",
+  0x0e09,
+  "chochoethai",
+  0x0e0c,
+  "chook",
+  0x0188,
+  "cieucacirclekorean",
+  0x3276,
+  "cieucaparenkorean",
+  0x3216,
+  "cieuccirclekorean",
+  0x3268,
+  "cieuckorean",
+  0x3148,
+  "cieucparenkorean",
+  0x3208,
+  "cieucuparenkorean",
+  0x321c,
+  "circle",
+  0x25cb,
+  "circlecopyrt",
+  0x00a9,
+  "circlemultiply",
+  0x2297,
+  "circleot",
+  0x2299,
+  "circleplus",
+  0x2295,
+  "circlepostalmark",
+  0x3036,
+  "circlewithlefthalfblack",
+  0x25d0,
+  "circlewithrighthalfblack",
+  0x25d1,
+  "circumflex",
+  0x02c6,
+  "circumflexbelowcmb",
+  0x032d,
+  "circumflexcmb",
+  0x0302,
+  "clear",
+  0x2327,
+  "clickalveolar",
+  0x01c2,
+  "clickdental",
+  0x01c0,
+  "clicklateral",
+  0x01c1,
+  "clickretroflex",
+  0x01c3,
+  "club",
+  0x2663,
+  "clubsuitblack",
+  0x2663,
+  "clubsuitwhite",
+  0x2667,
+  "cmcubedsquare",
+  0x33a4,
+  "cmonospace",
+  0xff43,
+  "cmsquaredsquare",
+  0x33a0,
+  "coarmenian",
+  0x0581,
+  "colon",
+  0x003a,
+  "colonmonetary",
+  0x20a1,
+  "colonmonospace",
+  0xff1a,
+  "colonsign",
+  0x20a1,
+  "colonsmall",
+  0xfe55,
+  "colontriangularhalfmod",
+  0x02d1,
+  "colontriangularmod",
+  0x02d0,
+  "comma",
+  0x002c,
+  "commaabovecmb",
+  0x0313,
+  "commaaboverightcmb",
+  0x0315,
+  "commaaccent",
+  0xf6c3,
+  "commaarabic",
+  0x060c,
+  "commaarmenian",
+  0x055d,
+  "commainferior",
+  0xf6e1,
+  "commamonospace",
+  0xff0c,
+  "commareversedabovecmb",
+  0x0314,
+  "commareversedmod",
+  0x02bd,
+  "commasmall",
+  0xfe50,
+  "commasuperior",
+  0xf6e2,
+  "commaturnedabovecmb",
+  0x0312,
+  "commaturnedmod",
+  0x02bb,
+  "compass",
+  0x263c,
+  "congruent",
+  0x2245,
+  "contourintegral",
+  0x222e,
+  "control",
+  0x2303,
+  "controlACK",
+  0x0006,
+  "controlBEL",
+  0x0007,
+  "controlBS",
+  0x0008,
+  "controlCAN",
+  0x0018,
+  "controlCR",
+  0x000d,
+  "controlDC1",
+  0x0011,
+  "controlDC2",
+  0x0012,
+  "controlDC3",
+  0x0013,
+  "controlDC4",
+  0x0014,
+  "controlDEL",
+  0x007f,
+  "controlDLE",
+  0x0010,
+  "controlEM",
+  0x0019,
+  "controlENQ",
+  0x0005,
+  "controlEOT",
+  0x0004,
+  "controlESC",
+  0x001b,
+  "controlETB",
+  0x0017,
+  "controlETX",
+  0x0003,
+  "controlFF",
+  0x000c,
+  "controlFS",
+  0x001c,
+  "controlGS",
+  0x001d,
+  "controlHT",
+  0x0009,
+  "controlLF",
+  0x000a,
+  "controlNAK",
+  0x0015,
+  "controlNULL",
+  0x0000,
+  "controlRS",
+  0x001e,
+  "controlSI",
+  0x000f,
+  "controlSO",
+  0x000e,
+  "controlSOT",
+  0x0002,
+  "controlSTX",
+  0x0001,
+  "controlSUB",
+  0x001a,
+  "controlSYN",
+  0x0016,
+  "controlUS",
+  0x001f,
+  "controlVT",
+  0x000b,
+  "copyright",
+  0x00a9,
+  "copyrightsans",
+  0xf8e9,
+  "copyrightserif",
+  0xf6d9,
+  "cornerbracketleft",
+  0x300c,
+  "cornerbracketlefthalfwidth",
+  0xff62,
+  "cornerbracketleftvertical",
+  0xfe41,
+  "cornerbracketright",
+  0x300d,
+  "cornerbracketrighthalfwidth",
+  0xff63,
+  "cornerbracketrightvertical",
+  0xfe42,
+  "corporationsquare",
+  0x337f,
+  "cosquare",
+  0x33c7,
+  "coverkgsquare",
+  0x33c6,
+  "cparen",
+  0x249e,
+  "cruzeiro",
+  0x20a2,
+  "cstretched",
+  0x0297,
+  "curlyand",
+  0x22cf,
+  "curlyor",
+  0x22ce,
+  "currency",
+  0x00a4,
+  "cyrBreve",
+  0xf6d1,
+  "cyrFlex",
+  0xf6d2,
+  "cyrbreve",
+  0xf6d4,
+  "cyrflex",
+  0xf6d5,
+  "d",
+  0x0064,
+  "daarmenian",
+  0x0564,
+  "dabengali",
+  0x09a6,
+  "dadarabic",
+  0x0636,
+  "dadeva",
+  0x0926,
+  "dadfinalarabic",
+  0xfebe,
+  "dadinitialarabic",
+  0xfebf,
+  "dadmedialarabic",
+  0xfec0,
+  "dagesh",
+  0x05bc,
+  "dageshhebrew",
+  0x05bc,
+  "dagger",
+  0x2020,
+  "daggerdbl",
+  0x2021,
+  "dagujarati",
+  0x0aa6,
+  "dagurmukhi",
+  0x0a26,
+  "dahiragana",
+  0x3060,
+  "dakatakana",
+  0x30c0,
+  "dalarabic",
+  0x062f,
+  "dalet",
+  0x05d3,
+  "daletdagesh",
+  0xfb33,
+  "daletdageshhebrew",
+  0xfb33,
+  "dalethebrew",
+  0x05d3,
+  "dalfinalarabic",
+  0xfeaa,
+  "dammaarabic",
+  0x064f,
+  "dammalowarabic",
+  0x064f,
+  "dammatanaltonearabic",
+  0x064c,
+  "dammatanarabic",
+  0x064c,
+  "danda",
+  0x0964,
+  "dargahebrew",
+  0x05a7,
+  "dargalefthebrew",
+  0x05a7,
+  "dasiapneumatacyrilliccmb",
+  0x0485,
+  "dblGrave",
+  0xf6d3,
+  "dblanglebracketleft",
+  0x300a,
+  "dblanglebracketleftvertical",
+  0xfe3d,
+  "dblanglebracketright",
+  0x300b,
+  "dblanglebracketrightvertical",
+  0xfe3e,
+  "dblarchinvertedbelowcmb",
+  0x032b,
+  "dblarrowleft",
+  0x21d4,
+  "dblarrowright",
+  0x21d2,
+  "dbldanda",
+  0x0965,
+  "dblgrave",
+  0xf6d6,
+  "dblgravecmb",
+  0x030f,
+  "dblintegral",
+  0x222c,
+  "dbllowline",
+  0x2017,
+  "dbllowlinecmb",
+  0x0333,
+  "dbloverlinecmb",
+  0x033f,
+  "dblprimemod",
+  0x02ba,
+  "dblverticalbar",
+  0x2016,
+  "dblverticallineabovecmb",
+  0x030e,
+  "dbopomofo",
+  0x3109,
+  "dbsquare",
+  0x33c8,
+  "dcaron",
+  0x010f,
+  "dcedilla",
+  0x1e11,
+  "dcircle",
+  0x24d3,
+  "dcircumflexbelow",
+  0x1e13,
+  "dcroat",
+  0x0111,
+  "ddabengali",
+  0x09a1,
+  "ddadeva",
+  0x0921,
+  "ddagujarati",
+  0x0aa1,
+  "ddagurmukhi",
+  0x0a21,
+  "ddalarabic",
+  0x0688,
+  "ddalfinalarabic",
+  0xfb89,
+  "dddhadeva",
+  0x095c,
+  "ddhabengali",
+  0x09a2,
+  "ddhadeva",
+  0x0922,
+  "ddhagujarati",
+  0x0aa2,
+  "ddhagurmukhi",
+  0x0a22,
+  "ddotaccent",
+  0x1e0b,
+  "ddotbelow",
+  0x1e0d,
+  "decimalseparatorarabic",
+  0x066b,
+  "decimalseparatorpersian",
+  0x066b,
+  "decyrillic",
+  0x0434,
+  "degree",
+  0x00b0,
+  "dehihebrew",
+  0x05ad,
+  "dehiragana",
+  0x3067,
+  "deicoptic",
+  0x03ef,
+  "dekatakana",
+  0x30c7,
+  "deleteleft",
+  0x232b,
+  "deleteright",
+  0x2326,
+  "delta",
+  0x03b4,
+  "deltaturned",
+  0x018d,
+  "denominatorminusonenumeratorbengali",
+  0x09f8,
+  "dezh",
+  0x02a4,
+  "dhabengali",
+  0x09a7,
+  "dhadeva",
+  0x0927,
+  "dhagujarati",
+  0x0aa7,
+  "dhagurmukhi",
+  0x0a27,
+  "dhook",
+  0x0257,
+  "dialytikatonos",
+  0x0385,
+  "dialytikatonoscmb",
+  0x0344,
+  "diamond",
+  0x2666,
+  "diamondsuitwhite",
+  0x2662,
+  "dieresis",
+  0x00a8,
+  "dieresisacute",
+  0xf6d7,
+  "dieresisbelowcmb",
+  0x0324,
+  "dieresiscmb",
+  0x0308,
+  "dieresisgrave",
+  0xf6d8,
+  "dieresistonos",
+  0x0385,
+  "dihiragana",
+  0x3062,
+  "dikatakana",
+  0x30c2,
+  "dittomark",
+  0x3003,
+  "divide",
+  0x00f7,
+  "divides",
+  0x2223,
+  "divisionslash",
+  0x2215,
+  "djecyrillic",
+  0x0452,
+  "dkshade",
+  0x2593,
+  "dlinebelow",
+  0x1e0f,
+  "dlsquare",
+  0x3397,
+  "dmacron",
+  0x0111,
+  "dmonospace",
+  0xff44,
+  "dnblock",
+  0x2584,
+  "dochadathai",
+  0x0e0e,
+  "dodekthai",
+  0x0e14,
+  "dohiragana",
+  0x3069,
+  "dokatakana",
+  0x30c9,
+  "dollar",
+  0x0024,
+  "dollarinferior",
+  0xf6e3,
+  "dollarmonospace",
+  0xff04,
+  "dollaroldstyle",
+  0xf724,
+  "dollarsmall",
+  0xfe69,
+  "dollarsuperior",
+  0xf6e4,
+  "dong",
+  0x20ab,
+  "dorusquare",
+  0x3326,
+  "dotaccent",
+  0x02d9,
+  "dotaccentcmb",
+  0x0307,
+  "dotbelowcmb",
+  0x0323,
+  "dotbelowcomb",
+  0x0323,
+  "dotkatakana",
+  0x30fb,
+  "dotlessi",
+  0x0131,
+  "dotlessj",
+  0xf6be,
+  "dotlessjstrokehook",
+  0x0284,
+  "dotmath",
+  0x22c5,
+  "dottedcircle",
+  0x25cc,
+  "doubleyodpatah",
+  0xfb1f,
+  "doubleyodpatahhebrew",
+  0xfb1f,
+  "downtackbelowcmb",
+  0x031e,
+  "downtackmod",
+  0x02d5,
+  "dparen",
+  0x249f,
+  "dsuperior",
+  0xf6eb,
+  "dtail",
+  0x0256,
+  "dtopbar",
+  0x018c,
+  "duhiragana",
+  0x3065,
+  "dukatakana",
+  0x30c5,
+  "dz",
+  0x01f3,
+  "dzaltone",
+  0x02a3,
+  "dzcaron",
+  0x01c6,
+  "dzcurl",
+  0x02a5,
+  "dzeabkhasiancyrillic",
+  0x04e1,
+  "dzecyrillic",
+  0x0455,
+  "dzhecyrillic",
+  0x045f,
+  "e",
+  0x0065,
+  "eacute",
+  0x00e9,
+  "earth",
+  0x2641,
+  "ebengali",
+  0x098f,
+  "ebopomofo",
+  0x311c,
+  "ebreve",
+  0x0115,
+  "ecandradeva",
+  0x090d,
+  "ecandragujarati",
+  0x0a8d,
+  "ecandravowelsigndeva",
+  0x0945,
+  "ecandravowelsigngujarati",
+  0x0ac5,
+  "ecaron",
+  0x011b,
+  "ecedillabreve",
+  0x1e1d,
+  "echarmenian",
+  0x0565,
+  "echyiwnarmenian",
+  0x0587,
+  "ecircle",
+  0x24d4,
+  "ecircumflex",
+  0x00ea,
+  "ecircumflexacute",
+  0x1ebf,
+  "ecircumflexbelow",
+  0x1e19,
+  "ecircumflexdotbelow",
+  0x1ec7,
+  "ecircumflexgrave",
+  0x1ec1,
+  "ecircumflexhookabove",
+  0x1ec3,
+  "ecircumflextilde",
+  0x1ec5,
+  "ecyrillic",
+  0x0454,
+  "edblgrave",
+  0x0205,
+  "edeva",
+  0x090f,
+  "edieresis",
+  0x00eb,
+  "edot",
+  0x0117,
+  "edotaccent",
+  0x0117,
+  "edotbelow",
+  0x1eb9,
+  "eegurmukhi",
+  0x0a0f,
+  "eematragurmukhi",
+  0x0a47,
+  "efcyrillic",
+  0x0444,
+  "egrave",
+  0x00e8,
+  "egujarati",
+  0x0a8f,
+  "eharmenian",
+  0x0567,
+  "ehbopomofo",
+  0x311d,
+  "ehiragana",
+  0x3048,
+  "ehookabove",
+  0x1ebb,
+  "eibopomofo",
+  0x311f,
+  "eight",
+  0x0038,
+  "eightarabic",
+  0x0668,
+  "eightbengali",
+  0x09ee,
+  "eightcircle",
+  0x2467,
+  "eightcircleinversesansserif",
+  0x2791,
+  "eightdeva",
+  0x096e,
+  "eighteencircle",
+  0x2471,
+  "eighteenparen",
+  0x2485,
+  "eighteenperiod",
+  0x2499,
+  "eightgujarati",
+  0x0aee,
+  "eightgurmukhi",
+  0x0a6e,
+  "eighthackarabic",
+  0x0668,
+  "eighthangzhou",
+  0x3028,
+  "eighthnotebeamed",
+  0x266b,
+  "eightideographicparen",
+  0x3227,
+  "eightinferior",
+  0x2088,
+  "eightmonospace",
+  0xff18,
+  "eightoldstyle",
+  0xf738,
+  "eightparen",
+  0x247b,
+  "eightperiod",
+  0x248f,
+  "eightpersian",
+  0x06f8,
+  "eightroman",
+  0x2177,
+  "eightsuperior",
+  0x2078,
+  "eightthai",
+  0x0e58,
+  "einvertedbreve",
+  0x0207,
+  "eiotifiedcyrillic",
+  0x0465,
+  "ekatakana",
+  0x30a8,
+  "ekatakanahalfwidth",
+  0xff74,
+  "ekonkargurmukhi",
+  0x0a74,
+  "ekorean",
+  0x3154,
+  "elcyrillic",
+  0x043b,
+  "element",
+  0x2208,
+  "elevencircle",
+  0x246a,
+  "elevenparen",
+  0x247e,
+  "elevenperiod",
+  0x2492,
+  "elevenroman",
+  0x217a,
+  "ellipsis",
+  0x2026,
+  "ellipsisvertical",
+  0x22ee,
+  "emacron",
+  0x0113,
+  "emacronacute",
+  0x1e17,
+  "emacrongrave",
+  0x1e15,
+  "emcyrillic",
+  0x043c,
+  "emdash",
+  0x2014,
+  "emdashvertical",
+  0xfe31,
+  "emonospace",
+  0xff45,
+  "emphasismarkarmenian",
+  0x055b,
+  "emptyset",
+  0x2205,
+  "enbopomofo",
+  0x3123,
+  "encyrillic",
+  0x043d,
+  "endash",
+  0x2013,
+  "endashvertical",
+  0xfe32,
+  "endescendercyrillic",
+  0x04a3,
+  "eng",
+  0x014b,
+  "engbopomofo",
+  0x3125,
+  "enghecyrillic",
+  0x04a5,
+  "enhookcyrillic",
+  0x04c8,
+  "enspace",
+  0x2002,
+  "eogonek",
+  0x0119,
+  "eokorean",
+  0x3153,
+  "eopen",
+  0x025b,
+  "eopenclosed",
+  0x029a,
+  "eopenreversed",
+  0x025c,
+  "eopenreversedclosed",
+  0x025e,
+  "eopenreversedhook",
+  0x025d,
+  "eparen",
+  0x24a0,
+  "epsilon",
+  0x03b5,
+  "epsilontonos",
+  0x03ad,
+  "equal",
+  0x003d,
+  "equalmonospace",
+  0xff1d,
+  "equalsmall",
+  0xfe66,
+  "equalsuperior",
+  0x207c,
+  "equivalence",
+  0x2261,
+  "erbopomofo",
+  0x3126,
+  "ercyrillic",
+  0x0440,
+  "ereversed",
+  0x0258,
+  "ereversedcyrillic",
+  0x044d,
+  "escyrillic",
+  0x0441,
+  "esdescendercyrillic",
+  0x04ab,
+  "esh",
+  0x0283,
+  "eshcurl",
+  0x0286,
+  "eshortdeva",
+  0x090e,
+  "eshortvowelsigndeva",
+  0x0946,
+  "eshreversedloop",
+  0x01aa,
+  "eshsquatreversed",
+  0x0285,
+  "esmallhiragana",
+  0x3047,
+  "esmallkatakana",
+  0x30a7,
+  "esmallkatakanahalfwidth",
+  0xff6a,
+  "estimated",
+  0x212e,
+  "esuperior",
+  0xf6ec,
+  "eta",
+  0x03b7,
+  "etarmenian",
+  0x0568,
+  "etatonos",
+  0x03ae,
+  "eth",
+  0x00f0,
+  "etilde",
+  0x1ebd,
+  "etildebelow",
+  0x1e1b,
+  "etnahtafoukhhebrew",
+  0x0591,
+  "etnahtafoukhlefthebrew",
+  0x0591,
+  "etnahtahebrew",
+  0x0591,
+  "etnahtalefthebrew",
+  0x0591,
+  "eturned",
+  0x01dd,
+  "eukorean",
+  0x3161,
+  "euro",
+  0x20ac,
+  "evowelsignbengali",
+  0x09c7,
+  "evowelsigndeva",
+  0x0947,
+  "evowelsigngujarati",
+  0x0ac7,
+  "exclam",
+  0x0021,
+  "exclamarmenian",
+  0x055c,
+  "exclamdbl",
+  0x203c,
+  "exclamdown",
+  0x00a1,
+  "exclamdownsmall",
+  0xf7a1,
+  "exclammonospace",
+  0xff01,
+  "exclamsmall",
+  0xf721,
+  "existential",
+  0x2203,
+  "ezh",
+  0x0292,
+  "ezhcaron",
+  0x01ef,
+  "ezhcurl",
+  0x0293,
+  "ezhreversed",
+  0x01b9,
+  "ezhtail",
+  0x01ba,
+  "f",
+  0x0066,
+  "fadeva",
+  0x095e,
+  "fagurmukhi",
+  0x0a5e,
+  "fahrenheit",
+  0x2109,
+  "fathaarabic",
+  0x064e,
+  "fathalowarabic",
+  0x064e,
+  "fathatanarabic",
+  0x064b,
+  "fbopomofo",
+  0x3108,
+  "fcircle",
+  0x24d5,
+  "fdotaccent",
+  0x1e1f,
+  "feharabic",
+  0x0641,
+  "feharmenian",
+  0x0586,
+  "fehfinalarabic",
+  0xfed2,
+  "fehinitialarabic",
+  0xfed3,
+  "fehmedialarabic",
+  0xfed4,
+  "feicoptic",
+  0x03e5,
+  "female",
+  0x2640,
+  "ff",
+  0xfb00,
+  "f_f",
+  0xfb00,
+  "ffi",
+  0xfb03,
+  "ffl",
+  0xfb04,
+  "fi",
+  0xfb01,
+  "fifteencircle",
+  0x246e,
+  "fifteenparen",
+  0x2482,
+  "fifteenperiod",
+  0x2496,
+  "figuredash",
+  0x2012,
+  "filledbox",
+  0x25a0,
+  "filledrect",
+  0x25ac,
+  "finalkaf",
+  0x05da,
+  "finalkafdagesh",
+  0xfb3a,
+  "finalkafdageshhebrew",
+  0xfb3a,
+  "finalkafhebrew",
+  0x05da,
+  "finalmem",
+  0x05dd,
+  "finalmemhebrew",
+  0x05dd,
+  "finalnun",
+  0x05df,
+  "finalnunhebrew",
+  0x05df,
+  "finalpe",
+  0x05e3,
+  "finalpehebrew",
+  0x05e3,
+  "finaltsadi",
+  0x05e5,
+  "finaltsadihebrew",
+  0x05e5,
+  "firsttonechinese",
+  0x02c9,
+  "fisheye",
+  0x25c9,
+  "fitacyrillic",
+  0x0473,
+  "five",
+  0x0035,
+  "fivearabic",
+  0x0665,
+  "fivebengali",
+  0x09eb,
+  "fivecircle",
+  0x2464,
+  "fivecircleinversesansserif",
+  0x278e,
+  "fivedeva",
+  0x096b,
+  "fiveeighths",
+  0x215d,
+  "fivegujarati",
+  0x0aeb,
+  "fivegurmukhi",
+  0x0a6b,
+  "fivehackarabic",
+  0x0665,
+  "fivehangzhou",
+  0x3025,
+  "fiveideographicparen",
+  0x3224,
+  "fiveinferior",
+  0x2085,
+  "fivemonospace",
+  0xff15,
+  "fiveoldstyle",
+  0xf735,
+  "fiveparen",
+  0x2478,
+  "fiveperiod",
+  0x248c,
+  "fivepersian",
+  0x06f5,
+  "fiveroman",
+  0x2174,
+  "fivesuperior",
+  0x2075,
+  "fivethai",
+  0x0e55,
+  "fl",
+  0xfb02,
+  "florin",
+  0x0192,
+  "fmonospace",
+  0xff46,
+  "fmsquare",
+  0x3399,
+  "fofanthai",
+  0x0e1f,
+  "fofathai",
+  0x0e1d,
+  "fongmanthai",
+  0x0e4f,
+  "forall",
+  0x2200,
+  "four",
+  0x0034,
+  "fourarabic",
+  0x0664,
+  "fourbengali",
+  0x09ea,
+  "fourcircle",
+  0x2463,
+  "fourcircleinversesansserif",
+  0x278d,
+  "fourdeva",
+  0x096a,
+  "fourgujarati",
+  0x0aea,
+  "fourgurmukhi",
+  0x0a6a,
+  "fourhackarabic",
+  0x0664,
+  "fourhangzhou",
+  0x3024,
+  "fourideographicparen",
+  0x3223,
+  "fourinferior",
+  0x2084,
+  "fourmonospace",
+  0xff14,
+  "fournumeratorbengali",
+  0x09f7,
+  "fouroldstyle",
+  0xf734,
+  "fourparen",
+  0x2477,
+  "fourperiod",
+  0x248b,
+  "fourpersian",
+  0x06f4,
+  "fourroman",
+  0x2173,
+  "foursuperior",
+  0x2074,
+  "fourteencircle",
+  0x246d,
+  "fourteenparen",
+  0x2481,
+  "fourteenperiod",
+  0x2495,
+  "fourthai",
+  0x0e54,
+  "fourthtonechinese",
+  0x02cb,
+  "fparen",
+  0x24a1,
+  "fraction",
+  0x2044,
+  "franc",
+  0x20a3,
+  "g",
+  0x0067,
+  "gabengali",
+  0x0997,
+  "gacute",
+  0x01f5,
+  "gadeva",
+  0x0917,
+  "gafarabic",
+  0x06af,
+  "gaffinalarabic",
+  0xfb93,
+  "gafinitialarabic",
+  0xfb94,
+  "gafmedialarabic",
+  0xfb95,
+  "gagujarati",
+  0x0a97,
+  "gagurmukhi",
+  0x0a17,
+  "gahiragana",
+  0x304c,
+  "gakatakana",
+  0x30ac,
+  "gamma",
+  0x03b3,
+  "gammalatinsmall",
+  0x0263,
+  "gammasuperior",
+  0x02e0,
+  "gangiacoptic",
+  0x03eb,
+  "gbopomofo",
+  0x310d,
+  "gbreve",
+  0x011f,
+  "gcaron",
+  0x01e7,
+  "gcedilla",
+  0x0123,
+  "gcircle",
+  0x24d6,
+  "gcircumflex",
+  0x011d,
+  "gcommaaccent",
+  0x0123,
+  "gdot",
+  0x0121,
+  "gdotaccent",
+  0x0121,
+  "gecyrillic",
+  0x0433,
+  "gehiragana",
+  0x3052,
+  "gekatakana",
+  0x30b2,
+  "geometricallyequal",
+  0x2251,
+  "gereshaccenthebrew",
+  0x059c,
+  "gereshhebrew",
+  0x05f3,
+  "gereshmuqdamhebrew",
+  0x059d,
+  "germandbls",
+  0x00df,
+  "gershayimaccenthebrew",
+  0x059e,
+  "gershayimhebrew",
+  0x05f4,
+  "getamark",
+  0x3013,
+  "ghabengali",
+  0x0998,
+  "ghadarmenian",
+  0x0572,
+  "ghadeva",
+  0x0918,
+  "ghagujarati",
+  0x0a98,
+  "ghagurmukhi",
+  0x0a18,
+  "ghainarabic",
+  0x063a,
+  "ghainfinalarabic",
+  0xfece,
+  "ghaininitialarabic",
+  0xfecf,
+  "ghainmedialarabic",
+  0xfed0,
+  "ghemiddlehookcyrillic",
+  0x0495,
+  "ghestrokecyrillic",
+  0x0493,
+  "gheupturncyrillic",
+  0x0491,
+  "ghhadeva",
+  0x095a,
+  "ghhagurmukhi",
+  0x0a5a,
+  "ghook",
+  0x0260,
+  "ghzsquare",
+  0x3393,
+  "gihiragana",
+  0x304e,
+  "gikatakana",
+  0x30ae,
+  "gimarmenian",
+  0x0563,
+  "gimel",
+  0x05d2,
+  "gimeldagesh",
+  0xfb32,
+  "gimeldageshhebrew",
+  0xfb32,
+  "gimelhebrew",
+  0x05d2,
+  "gjecyrillic",
+  0x0453,
+  "glottalinvertedstroke",
+  0x01be,
+  "glottalstop",
+  0x0294,
+  "glottalstopinverted",
+  0x0296,
+  "glottalstopmod",
+  0x02c0,
+  "glottalstopreversed",
+  0x0295,
+  "glottalstopreversedmod",
+  0x02c1,
+  "glottalstopreversedsuperior",
+  0x02e4,
+  "glottalstopstroke",
+  0x02a1,
+  "glottalstopstrokereversed",
+  0x02a2,
+  "gmacron",
+  0x1e21,
+  "gmonospace",
+  0xff47,
+  "gohiragana",
+  0x3054,
+  "gokatakana",
+  0x30b4,
+  "gparen",
+  0x24a2,
+  "gpasquare",
+  0x33ac,
+  "gradient",
+  0x2207,
+  "grave",
+  0x0060,
+  "gravebelowcmb",
+  0x0316,
+  "gravecmb",
+  0x0300,
+  "gravecomb",
+  0x0300,
+  "gravedeva",
+  0x0953,
+  "gravelowmod",
+  0x02ce,
+  "gravemonospace",
+  0xff40,
+  "gravetonecmb",
+  0x0340,
+  "greater",
+  0x003e,
+  "greaterequal",
+  0x2265,
+  "greaterequalorless",
+  0x22db,
+  "greatermonospace",
+  0xff1e,
+  "greaterorequivalent",
+  0x2273,
+  "greaterorless",
+  0x2277,
+  "greateroverequal",
+  0x2267,
+  "greatersmall",
+  0xfe65,
+  "gscript",
+  0x0261,
+  "gstroke",
+  0x01e5,
+  "guhiragana",
+  0x3050,
+  "guillemotleft",
+  0x00ab,
+  "guillemotright",
+  0x00bb,
+  "guilsinglleft",
+  0x2039,
+  "guilsinglright",
+  0x203a,
+  "gukatakana",
+  0x30b0,
+  "guramusquare",
+  0x3318,
+  "gysquare",
+  0x33c9,
+  "h",
+  0x0068,
+  "haabkhasiancyrillic",
+  0x04a9,
+  "haaltonearabic",
+  0x06c1,
+  "habengali",
+  0x09b9,
+  "hadescendercyrillic",
+  0x04b3,
+  "hadeva",
+  0x0939,
+  "hagujarati",
+  0x0ab9,
+  "hagurmukhi",
+  0x0a39,
+  "haharabic",
+  0x062d,
+  "hahfinalarabic",
+  0xfea2,
+  "hahinitialarabic",
+  0xfea3,
+  "hahiragana",
+  0x306f,
+  "hahmedialarabic",
+  0xfea4,
+  "haitusquare",
+  0x332a,
+  "hakatakana",
+  0x30cf,
+  "hakatakanahalfwidth",
+  0xff8a,
+  "halantgurmukhi",
+  0x0a4d,
+  "hamzaarabic",
+  0x0621,
+  "hamzalowarabic",
+  0x0621,
+  "hangulfiller",
+  0x3164,
+  "hardsigncyrillic",
+  0x044a,
+  "harpoonleftbarbup",
+  0x21bc,
+  "harpoonrightbarbup",
+  0x21c0,
+  "hasquare",
+  0x33ca,
+  "hatafpatah",
+  0x05b2,
+  "hatafpatah16",
+  0x05b2,
+  "hatafpatah23",
+  0x05b2,
+  "hatafpatah2f",
+  0x05b2,
+  "hatafpatahhebrew",
+  0x05b2,
+  "hatafpatahnarrowhebrew",
+  0x05b2,
+  "hatafpatahquarterhebrew",
+  0x05b2,
+  "hatafpatahwidehebrew",
+  0x05b2,
+  "hatafqamats",
+  0x05b3,
+  "hatafqamats1b",
+  0x05b3,
+  "hatafqamats28",
+  0x05b3,
+  "hatafqamats34",
+  0x05b3,
+  "hatafqamatshebrew",
+  0x05b3,
+  "hatafqamatsnarrowhebrew",
+  0x05b3,
+  "hatafqamatsquarterhebrew",
+  0x05b3,
+  "hatafqamatswidehebrew",
+  0x05b3,
+  "hatafsegol",
+  0x05b1,
+  "hatafsegol17",
+  0x05b1,
+  "hatafsegol24",
+  0x05b1,
+  "hatafsegol30",
+  0x05b1,
+  "hatafsegolhebrew",
+  0x05b1,
+  "hatafsegolnarrowhebrew",
+  0x05b1,
+  "hatafsegolquarterhebrew",
+  0x05b1,
+  "hatafsegolwidehebrew",
+  0x05b1,
+  "hbar",
+  0x0127,
+  "hbopomofo",
+  0x310f,
+  "hbrevebelow",
+  0x1e2b,
+  "hcedilla",
+  0x1e29,
+  "hcircle",
+  0x24d7,
+  "hcircumflex",
+  0x0125,
+  "hdieresis",
+  0x1e27,
+  "hdotaccent",
+  0x1e23,
+  "hdotbelow",
+  0x1e25,
+  "he",
+  0x05d4,
+  "heart",
+  0x2665,
+  "heartsuitblack",
+  0x2665,
+  "heartsuitwhite",
+  0x2661,
+  "hedagesh",
+  0xfb34,
+  "hedageshhebrew",
+  0xfb34,
+  "hehaltonearabic",
+  0x06c1,
+  "heharabic",
+  0x0647,
+  "hehebrew",
+  0x05d4,
+  "hehfinalaltonearabic",
+  0xfba7,
+  "hehfinalalttwoarabic",
+  0xfeea,
+  "hehfinalarabic",
+  0xfeea,
+  "hehhamzaabovefinalarabic",
+  0xfba5,
+  "hehhamzaaboveisolatedarabic",
+  0xfba4,
+  "hehinitialaltonearabic",
+  0xfba8,
+  "hehinitialarabic",
+  0xfeeb,
+  "hehiragana",
+  0x3078,
+  "hehmedialaltonearabic",
+  0xfba9,
+  "hehmedialarabic",
+  0xfeec,
+  "heiseierasquare",
+  0x337b,
+  "hekatakana",
+  0x30d8,
+  "hekatakanahalfwidth",
+  0xff8d,
+  "hekutaarusquare",
+  0x3336,
+  "henghook",
+  0x0267,
+  "herutusquare",
+  0x3339,
+  "het",
+  0x05d7,
+  "hethebrew",
+  0x05d7,
+  "hhook",
+  0x0266,
+  "hhooksuperior",
+  0x02b1,
+  "hieuhacirclekorean",
+  0x327b,
+  "hieuhaparenkorean",
+  0x321b,
+  "hieuhcirclekorean",
+  0x326d,
+  "hieuhkorean",
+  0x314e,
+  "hieuhparenkorean",
+  0x320d,
+  "hihiragana",
+  0x3072,
+  "hikatakana",
+  0x30d2,
+  "hikatakanahalfwidth",
+  0xff8b,
+  "hiriq",
+  0x05b4,
+  "hiriq14",
+  0x05b4,
+  "hiriq21",
+  0x05b4,
+  "hiriq2d",
+  0x05b4,
+  "hiriqhebrew",
+  0x05b4,
+  "hiriqnarrowhebrew",
+  0x05b4,
+  "hiriqquarterhebrew",
+  0x05b4,
+  "hiriqwidehebrew",
+  0x05b4,
+  "hlinebelow",
+  0x1e96,
+  "hmonospace",
+  0xff48,
+  "hoarmenian",
+  0x0570,
+  "hohipthai",
+  0x0e2b,
+  "hohiragana",
+  0x307b,
+  "hokatakana",
+  0x30db,
+  "hokatakanahalfwidth",
+  0xff8e,
+  "holam",
+  0x05b9,
+  "holam19",
+  0x05b9,
+  "holam26",
+  0x05b9,
+  "holam32",
+  0x05b9,
+  "holamhebrew",
+  0x05b9,
+  "holamnarrowhebrew",
+  0x05b9,
+  "holamquarterhebrew",
+  0x05b9,
+  "holamwidehebrew",
+  0x05b9,
+  "honokhukthai",
+  0x0e2e,
+  "hookabovecomb",
+  0x0309,
+  "hookcmb",
+  0x0309,
+  "hookpalatalizedbelowcmb",
+  0x0321,
+  "hookretroflexbelowcmb",
+  0x0322,
+  "hoonsquare",
+  0x3342,
+  "horicoptic",
+  0x03e9,
+  "horizontalbar",
+  0x2015,
+  "horncmb",
+  0x031b,
+  "hotsprings",
+  0x2668,
+  "house",
+  0x2302,
+  "hparen",
+  0x24a3,
+  "hsuperior",
+  0x02b0,
+  "hturned",
+  0x0265,
+  "huhiragana",
+  0x3075,
+  "huiitosquare",
+  0x3333,
+  "hukatakana",
+  0x30d5,
+  "hukatakanahalfwidth",
+  0xff8c,
+  "hungarumlaut",
+  0x02dd,
+  "hungarumlautcmb",
+  0x030b,
+  "hv",
+  0x0195,
+  "hyphen",
+  0x002d,
+  "hypheninferior",
+  0xf6e5,
+  "hyphenmonospace",
+  0xff0d,
+  "hyphensmall",
+  0xfe63,
+  "hyphensuperior",
+  0xf6e6,
+  "hyphentwo",
+  0x2010,
+  "i",
+  0x0069,
+  "iacute",
+  0x00ed,
+  "iacyrillic",
+  0x044f,
+  "ibengali",
+  0x0987,
+  "ibopomofo",
+  0x3127,
+  "ibreve",
+  0x012d,
+  "icaron",
+  0x01d0,
+  "icircle",
+  0x24d8,
+  "icircumflex",
+  0x00ee,
+  "icyrillic",
+  0x0456,
+  "idblgrave",
+  0x0209,
+  "ideographearthcircle",
+  0x328f,
+  "ideographfirecircle",
+  0x328b,
+  "ideographicallianceparen",
+  0x323f,
+  "ideographiccallparen",
+  0x323a,
+  "ideographiccentrecircle",
+  0x32a5,
+  "ideographicclose",
+  0x3006,
+  "ideographiccomma",
+  0x3001,
+  "ideographiccommaleft",
+  0xff64,
+  "ideographiccongratulationparen",
+  0x3237,
+  "ideographiccorrectcircle",
+  0x32a3,
+  "ideographicearthparen",
+  0x322f,
+  "ideographicenterpriseparen",
+  0x323d,
+  "ideographicexcellentcircle",
+  0x329d,
+  "ideographicfestivalparen",
+  0x3240,
+  "ideographicfinancialcircle",
+  0x3296,
+  "ideographicfinancialparen",
+  0x3236,
+  "ideographicfireparen",
+  0x322b,
+  "ideographichaveparen",
+  0x3232,
+  "ideographichighcircle",
+  0x32a4,
+  "ideographiciterationmark",
+  0x3005,
+  "ideographiclaborcircle",
+  0x3298,
+  "ideographiclaborparen",
+  0x3238,
+  "ideographicleftcircle",
+  0x32a7,
+  "ideographiclowcircle",
+  0x32a6,
+  "ideographicmedicinecircle",
+  0x32a9,
+  "ideographicmetalparen",
+  0x322e,
+  "ideographicmoonparen",
+  0x322a,
+  "ideographicnameparen",
+  0x3234,
+  "ideographicperiod",
+  0x3002,
+  "ideographicprintcircle",
+  0x329e,
+  "ideographicreachparen",
+  0x3243,
+  "ideographicrepresentparen",
+  0x3239,
+  "ideographicresourceparen",
+  0x323e,
+  "ideographicrightcircle",
+  0x32a8,
+  "ideographicsecretcircle",
+  0x3299,
+  "ideographicselfparen",
+  0x3242,
+  "ideographicsocietyparen",
+  0x3233,
+  "ideographicspace",
+  0x3000,
+  "ideographicspecialparen",
+  0x3235,
+  "ideographicstockparen",
+  0x3231,
+  "ideographicstudyparen",
+  0x323b,
+  "ideographicsunparen",
+  0x3230,
+  "ideographicsuperviseparen",
+  0x323c,
+  "ideographicwaterparen",
+  0x322c,
+  "ideographicwoodparen",
+  0x322d,
+  "ideographiczero",
+  0x3007,
+  "ideographmetalcircle",
+  0x328e,
+  "ideographmooncircle",
+  0x328a,
+  "ideographnamecircle",
+  0x3294,
+  "ideographsuncircle",
+  0x3290,
+  "ideographwatercircle",
+  0x328c,
+  "ideographwoodcircle",
+  0x328d,
+  "ideva",
+  0x0907,
+  "idieresis",
+  0x00ef,
+  "idieresisacute",
+  0x1e2f,
+  "idieresiscyrillic",
+  0x04e5,
+  "idotbelow",
+  0x1ecb,
+  "iebrevecyrillic",
+  0x04d7,
+  "iecyrillic",
+  0x0435,
+  "ieungacirclekorean",
+  0x3275,
+  "ieungaparenkorean",
+  0x3215,
+  "ieungcirclekorean",
+  0x3267,
+  "ieungkorean",
+  0x3147,
+  "ieungparenkorean",
+  0x3207,
+  "igrave",
+  0x00ec,
+  "igujarati",
+  0x0a87,
+  "igurmukhi",
+  0x0a07,
+  "ihiragana",
+  0x3044,
+  "ihookabove",
+  0x1ec9,
+  "iibengali",
+  0x0988,
+  "iicyrillic",
+  0x0438,
+  "iideva",
+  0x0908,
+  "iigujarati",
+  0x0a88,
+  "iigurmukhi",
+  0x0a08,
+  "iimatragurmukhi",
+  0x0a40,
+  "iinvertedbreve",
+  0x020b,
+  "iishortcyrillic",
+  0x0439,
+  "iivowelsignbengali",
+  0x09c0,
+  "iivowelsigndeva",
+  0x0940,
+  "iivowelsigngujarati",
+  0x0ac0,
+  "ij",
+  0x0133,
+  "ikatakana",
+  0x30a4,
+  "ikatakanahalfwidth",
+  0xff72,
+  "ikorean",
+  0x3163,
+  "ilde",
+  0x02dc,
+  "iluyhebrew",
+  0x05ac,
+  "imacron",
+  0x012b,
+  "imacroncyrillic",
+  0x04e3,
+  "imageorapproximatelyequal",
+  0x2253,
+  "imatragurmukhi",
+  0x0a3f,
+  "imonospace",
+  0xff49,
+  "increment",
+  0x2206,
+  "infinity",
+  0x221e,
+  "iniarmenian",
+  0x056b,
+  "integral",
+  0x222b,
+  "integralbottom",
+  0x2321,
+  "integralbt",
+  0x2321,
+  "integralex",
+  0xf8f5,
+  "integraltop",
+  0x2320,
+  "integraltp",
+  0x2320,
+  "intersection",
+  0x2229,
+  "intisquare",
+  0x3305,
+  "invbullet",
+  0x25d8,
+  "invcircle",
+  0x25d9,
+  "invsmileface",
+  0x263b,
+  "iocyrillic",
+  0x0451,
+  "iogonek",
+  0x012f,
+  "iota",
+  0x03b9,
+  "iotadieresis",
+  0x03ca,
+  "iotadieresistonos",
+  0x0390,
+  "iotalatin",
+  0x0269,
+  "iotatonos",
+  0x03af,
+  "iparen",
+  0x24a4,
+  "irigurmukhi",
+  0x0a72,
+  "ismallhiragana",
+  0x3043,
+  "ismallkatakana",
+  0x30a3,
+  "ismallkatakanahalfwidth",
+  0xff68,
+  "issharbengali",
+  0x09fa,
+  "istroke",
+  0x0268,
+  "isuperior",
+  0xf6ed,
+  "iterationhiragana",
+  0x309d,
+  "iterationkatakana",
+  0x30fd,
+  "itilde",
+  0x0129,
+  "itildebelow",
+  0x1e2d,
+  "iubopomofo",
+  0x3129,
+  "iucyrillic",
+  0x044e,
+  "ivowelsignbengali",
+  0x09bf,
+  "ivowelsigndeva",
+  0x093f,
+  "ivowelsigngujarati",
+  0x0abf,
+  "izhitsacyrillic",
+  0x0475,
+  "izhitsadblgravecyrillic",
+  0x0477,
+  "j",
+  0x006a,
+  "jaarmenian",
+  0x0571,
+  "jabengali",
+  0x099c,
+  "jadeva",
+  0x091c,
+  "jagujarati",
+  0x0a9c,
+  "jagurmukhi",
+  0x0a1c,
+  "jbopomofo",
+  0x3110,
+  "jcaron",
+  0x01f0,
+  "jcircle",
+  0x24d9,
+  "jcircumflex",
+  0x0135,
+  "jcrossedtail",
+  0x029d,
+  "jdotlessstroke",
+  0x025f,
+  "jecyrillic",
+  0x0458,
+  "jeemarabic",
+  0x062c,
+  "jeemfinalarabic",
+  0xfe9e,
+  "jeeminitialarabic",
+  0xfe9f,
+  "jeemmedialarabic",
+  0xfea0,
+  "jeharabic",
+  0x0698,
+  "jehfinalarabic",
+  0xfb8b,
+  "jhabengali",
+  0x099d,
+  "jhadeva",
+  0x091d,
+  "jhagujarati",
+  0x0a9d,
+  "jhagurmukhi",
+  0x0a1d,
+  "jheharmenian",
+  0x057b,
+  "jis",
+  0x3004,
+  "jmonospace",
+  0xff4a,
+  "jparen",
+  0x24a5,
+  "jsuperior",
+  0x02b2,
+  "k",
+  0x006b,
+  "kabashkircyrillic",
+  0x04a1,
+  "kabengali",
+  0x0995,
+  "kacute",
+  0x1e31,
+  "kacyrillic",
+  0x043a,
+  "kadescendercyrillic",
+  0x049b,
+  "kadeva",
+  0x0915,
+  "kaf",
+  0x05db,
+  "kafarabic",
+  0x0643,
+  "kafdagesh",
+  0xfb3b,
+  "kafdageshhebrew",
+  0xfb3b,
+  "kaffinalarabic",
+  0xfeda,
+  "kafhebrew",
+  0x05db,
+  "kafinitialarabic",
+  0xfedb,
+  "kafmedialarabic",
+  0xfedc,
+  "kafrafehebrew",
+  0xfb4d,
+  "kagujarati",
+  0x0a95,
+  "kagurmukhi",
+  0x0a15,
+  "kahiragana",
+  0x304b,
+  "kahookcyrillic",
+  0x04c4,
+  "kakatakana",
+  0x30ab,
+  "kakatakanahalfwidth",
+  0xff76,
+  "kappa",
+  0x03ba,
+  "kappasymbolgreek",
+  0x03f0,
+  "kapyeounmieumkorean",
+  0x3171,
+  "kapyeounphieuphkorean",
+  0x3184,
+  "kapyeounpieupkorean",
+  0x3178,
+  "kapyeounssangpieupkorean",
+  0x3179,
+  "karoriisquare",
+  0x330d,
+  "kashidaautoarabic",
+  0x0640,
+  "kashidaautonosidebearingarabic",
+  0x0640,
+  "kasmallkatakana",
+  0x30f5,
+  "kasquare",
+  0x3384,
+  "kasraarabic",
+  0x0650,
+  "kasratanarabic",
+  0x064d,
+  "kastrokecyrillic",
+  0x049f,
+  "katahiraprolongmarkhalfwidth",
+  0xff70,
+  "kaverticalstrokecyrillic",
+  0x049d,
+  "kbopomofo",
+  0x310e,
+  "kcalsquare",
+  0x3389,
+  "kcaron",
+  0x01e9,
+  "kcedilla",
+  0x0137,
+  "kcircle",
+  0x24da,
+  "kcommaaccent",
+  0x0137,
+  "kdotbelow",
+  0x1e33,
+  "keharmenian",
+  0x0584,
+  "kehiragana",
+  0x3051,
+  "kekatakana",
+  0x30b1,
+  "kekatakanahalfwidth",
+  0xff79,
+  "kenarmenian",
+  0x056f,
+  "kesmallkatakana",
+  0x30f6,
+  "kgreenlandic",
+  0x0138,
+  "khabengali",
+  0x0996,
+  "khacyrillic",
+  0x0445,
+  "khadeva",
+  0x0916,
+  "khagujarati",
+  0x0a96,
+  "khagurmukhi",
+  0x0a16,
+  "khaharabic",
+  0x062e,
+  "khahfinalarabic",
+  0xfea6,
+  "khahinitialarabic",
+  0xfea7,
+  "khahmedialarabic",
+  0xfea8,
+  "kheicoptic",
+  0x03e7,
+  "khhadeva",
+  0x0959,
+  "khhagurmukhi",
+  0x0a59,
+  "khieukhacirclekorean",
+  0x3278,
+  "khieukhaparenkorean",
+  0x3218,
+  "khieukhcirclekorean",
+  0x326a,
+  "khieukhkorean",
+  0x314b,
+  "khieukhparenkorean",
+  0x320a,
+  "khokhaithai",
+  0x0e02,
+  "khokhonthai",
+  0x0e05,
+  "khokhuatthai",
+  0x0e03,
+  "khokhwaithai",
+  0x0e04,
+  "khomutthai",
+  0x0e5b,
+  "khook",
+  0x0199,
+  "khorakhangthai",
+  0x0e06,
+  "khzsquare",
+  0x3391,
+  "kihiragana",
+  0x304d,
+  "kikatakana",
+  0x30ad,
+  "kikatakanahalfwidth",
+  0xff77,
+  "kiroguramusquare",
+  0x3315,
+  "kiromeetorusquare",
+  0x3316,
+  "kirosquare",
+  0x3314,
+  "kiyeokacirclekorean",
+  0x326e,
+  "kiyeokaparenkorean",
+  0x320e,
+  "kiyeokcirclekorean",
+  0x3260,
+  "kiyeokkorean",
+  0x3131,
+  "kiyeokparenkorean",
+  0x3200,
+  "kiyeoksioskorean",
+  0x3133,
+  "kjecyrillic",
+  0x045c,
+  "klinebelow",
+  0x1e35,
+  "klsquare",
+  0x3398,
+  "kmcubedsquare",
+  0x33a6,
+  "kmonospace",
+  0xff4b,
+  "kmsquaredsquare",
+  0x33a2,
+  "kohiragana",
+  0x3053,
+  "kohmsquare",
+  0x33c0,
+  "kokaithai",
+  0x0e01,
+  "kokatakana",
+  0x30b3,
+  "kokatakanahalfwidth",
+  0xff7a,
+  "kooposquare",
+  0x331e,
+  "koppacyrillic",
+  0x0481,
+  "koreanstandardsymbol",
+  0x327f,
+  "koroniscmb",
+  0x0343,
+  "kparen",
+  0x24a6,
+  "kpasquare",
+  0x33aa,
+  "ksicyrillic",
+  0x046f,
+  "ktsquare",
+  0x33cf,
+  "kturned",
+  0x029e,
+  "kuhiragana",
+  0x304f,
+  "kukatakana",
+  0x30af,
+  "kukatakanahalfwidth",
+  0xff78,
+  "kvsquare",
+  0x33b8,
+  "kwsquare",
+  0x33be,
+  "l",
+  0x006c,
+  "labengali",
+  0x09b2,
+  "lacute",
+  0x013a,
+  "ladeva",
+  0x0932,
+  "lagujarati",
+  0x0ab2,
+  "lagurmukhi",
+  0x0a32,
+  "lakkhangyaothai",
+  0x0e45,
+  "lamaleffinalarabic",
+  0xfefc,
+  "lamalefhamzaabovefinalarabic",
+  0xfef8,
+  "lamalefhamzaaboveisolatedarabic",
+  0xfef7,
+  "lamalefhamzabelowfinalarabic",
+  0xfefa,
+  "lamalefhamzabelowisolatedarabic",
+  0xfef9,
+  "lamalefisolatedarabic",
+  0xfefb,
+  "lamalefmaddaabovefinalarabic",
+  0xfef6,
+  "lamalefmaddaaboveisolatedarabic",
+  0xfef5,
+  "lamarabic",
+  0x0644,
+  "lambda",
+  0x03bb,
+  "lambdastroke",
+  0x019b,
+  "lamed",
+  0x05dc,
+  "lameddagesh",
+  0xfb3c,
+  "lameddageshhebrew",
+  0xfb3c,
+  "lamedhebrew",
+  0x05dc,
+  "lamfinalarabic",
+  0xfede,
+  "lamhahinitialarabic",
+  0xfcca,
+  "laminitialarabic",
+  0xfedf,
+  "lamjeeminitialarabic",
+  0xfcc9,
+  "lamkhahinitialarabic",
+  0xfccb,
+  "lamlamhehisolatedarabic",
+  0xfdf2,
+  "lammedialarabic",
+  0xfee0,
+  "lammeemhahinitialarabic",
+  0xfd88,
+  "lammeeminitialarabic",
+  0xfccc,
+  "largecircle",
+  0x25ef,
+  "lbar",
+  0x019a,
+  "lbelt",
+  0x026c,
+  "lbopomofo",
+  0x310c,
+  "lcaron",
+  0x013e,
+  "lcedilla",
+  0x013c,
+  "lcircle",
+  0x24db,
+  "lcircumflexbelow",
+  0x1e3d,
+  "lcommaaccent",
+  0x013c,
+  "ldot",
+  0x0140,
+  "ldotaccent",
+  0x0140,
+  "ldotbelow",
+  0x1e37,
+  "ldotbelowmacron",
+  0x1e39,
+  "leftangleabovecmb",
+  0x031a,
+  "lefttackbelowcmb",
+  0x0318,
+  "less",
+  0x003c,
+  "lessequal",
+  0x2264,
+  "lessequalorgreater",
+  0x22da,
+  "lessmonospace",
+  0xff1c,
+  "lessorequivalent",
+  0x2272,
+  "lessorgreater",
+  0x2276,
+  "lessoverequal",
+  0x2266,
+  "lesssmall",
+  0xfe64,
+  "lezh",
+  0x026e,
+  "lfblock",
+  0x258c,
+  "lhookretroflex",
+  0x026d,
+  "lira",
+  0x20a4,
+  "liwnarmenian",
+  0x056c,
+  "lj",
+  0x01c9,
+  "ljecyrillic",
+  0x0459,
+  "ll",
+  0xf6c0,
+  "lladeva",
+  0x0933,
+  "llagujarati",
+  0x0ab3,
+  "llinebelow",
+  0x1e3b,
+  "llladeva",
+  0x0934,
+  "llvocalicbengali",
+  0x09e1,
+  "llvocalicdeva",
+  0x0961,
+  "llvocalicvowelsignbengali",
+  0x09e3,
+  "llvocalicvowelsigndeva",
+  0x0963,
+  "lmiddletilde",
+  0x026b,
+  "lmonospace",
+  0xff4c,
+  "lmsquare",
+  0x33d0,
+  "lochulathai",
+  0x0e2c,
+  "logicaland",
+  0x2227,
+  "logicalnot",
+  0x00ac,
+  "logicalnotreversed",
+  0x2310,
+  "logicalor",
+  0x2228,
+  "lolingthai",
+  0x0e25,
+  "longs",
+  0x017f,
+  "lowlinecenterline",
+  0xfe4e,
+  "lowlinecmb",
+  0x0332,
+  "lowlinedashed",
+  0xfe4d,
+  "lozenge",
+  0x25ca,
+  "lparen",
+  0x24a7,
+  "lslash",
+  0x0142,
+  "lsquare",
+  0x2113,
+  "lsuperior",
+  0xf6ee,
+  "ltshade",
+  0x2591,
+  "luthai",
+  0x0e26,
+  "lvocalicbengali",
+  0x098c,
+  "lvocalicdeva",
+  0x090c,
+  "lvocalicvowelsignbengali",
+  0x09e2,
+  "lvocalicvowelsigndeva",
+  0x0962,
+  "lxsquare",
+  0x33d3,
+  "m",
+  0x006d,
+  "mabengali",
+  0x09ae,
+  "macron",
+  0x00af,
+  "macronbelowcmb",
+  0x0331,
+  "macroncmb",
+  0x0304,
+  "macronlowmod",
+  0x02cd,
+  "macronmonospace",
+  0xffe3,
+  "macute",
+  0x1e3f,
+  "madeva",
+  0x092e,
+  "magujarati",
+  0x0aae,
+  "magurmukhi",
+  0x0a2e,
+  "mahapakhhebrew",
+  0x05a4,
+  "mahapakhlefthebrew",
+  0x05a4,
+  "mahiragana",
+  0x307e,
+  "maichattawalowleftthai",
+  0xf895,
+  "maichattawalowrightthai",
+  0xf894,
+  "maichattawathai",
+  0x0e4b,
+  "maichattawaupperleftthai",
+  0xf893,
+  "maieklowleftthai",
+  0xf88c,
+  "maieklowrightthai",
+  0xf88b,
+  "maiekthai",
+  0x0e48,
+  "maiekupperleftthai",
+  0xf88a,
+  "maihanakatleftthai",
+  0xf884,
+  "maihanakatthai",
+  0x0e31,
+  "maitaikhuleftthai",
+  0xf889,
+  "maitaikhuthai",
+  0x0e47,
+  "maitholowleftthai",
+  0xf88f,
+  "maitholowrightthai",
+  0xf88e,
+  "maithothai",
+  0x0e49,
+  "maithoupperleftthai",
+  0xf88d,
+  "maitrilowleftthai",
+  0xf892,
+  "maitrilowrightthai",
+  0xf891,
+  "maitrithai",
+  0x0e4a,
+  "maitriupperleftthai",
+  0xf890,
+  "maiyamokthai",
+  0x0e46,
+  "makatakana",
+  0x30de,
+  "makatakanahalfwidth",
+  0xff8f,
+  "male",
+  0x2642,
+  "mansyonsquare",
+  0x3347,
+  "maqafhebrew",
+  0x05be,
+  "mars",
+  0x2642,
+  "masoracirclehebrew",
+  0x05af,
+  "masquare",
+  0x3383,
+  "mbopomofo",
+  0x3107,
+  "mbsquare",
+  0x33d4,
+  "mcircle",
+  0x24dc,
+  "mcubedsquare",
+  0x33a5,
+  "mdotaccent",
+  0x1e41,
+  "mdotbelow",
+  0x1e43,
+  "meemarabic",
+  0x0645,
+  "meemfinalarabic",
+  0xfee2,
+  "meeminitialarabic",
+  0xfee3,
+  "meemmedialarabic",
+  0xfee4,
+  "meemmeeminitialarabic",
+  0xfcd1,
+  "meemmeemisolatedarabic",
+  0xfc48,
+  "meetorusquare",
+  0x334d,
+  "mehiragana",
+  0x3081,
+  "meizierasquare",
+  0x337e,
+  "mekatakana",
+  0x30e1,
+  "mekatakanahalfwidth",
+  0xff92,
+  "mem",
+  0x05de,
+  "memdagesh",
+  0xfb3e,
+  "memdageshhebrew",
+  0xfb3e,
+  "memhebrew",
+  0x05de,
+  "menarmenian",
+  0x0574,
+  "merkhahebrew",
+  0x05a5,
+  "merkhakefulahebrew",
+  0x05a6,
+  "merkhakefulalefthebrew",
+  0x05a6,
+  "merkhalefthebrew",
+  0x05a5,
+  "mhook",
+  0x0271,
+  "mhzsquare",
+  0x3392,
+  "middledotkatakanahalfwidth",
+  0xff65,
+  "middot",
+  0x00b7,
+  "mieumacirclekorean",
+  0x3272,
+  "mieumaparenkorean",
+  0x3212,
+  "mieumcirclekorean",
+  0x3264,
+  "mieumkorean",
+  0x3141,
+  "mieumpansioskorean",
+  0x3170,
+  "mieumparenkorean",
+  0x3204,
+  "mieumpieupkorean",
+  0x316e,
+  "mieumsioskorean",
+  0x316f,
+  "mihiragana",
+  0x307f,
+  "mikatakana",
+  0x30df,
+  "mikatakanahalfwidth",
+  0xff90,
+  "minus",
+  0x2212,
+  "minusbelowcmb",
+  0x0320,
+  "minuscircle",
+  0x2296,
+  "minusmod",
+  0x02d7,
+  "minusplus",
+  0x2213,
+  "minute",
+  0x2032,
+  "miribaarusquare",
+  0x334a,
+  "mirisquare",
+  0x3349,
+  "mlonglegturned",
+  0x0270,
+  "mlsquare",
+  0x3396,
+  "mmcubedsquare",
+  0x33a3,
+  "mmonospace",
+  0xff4d,
+  "mmsquaredsquare",
+  0x339f,
+  "mohiragana",
+  0x3082,
+  "mohmsquare",
+  0x33c1,
+  "mokatakana",
+  0x30e2,
+  "mokatakanahalfwidth",
+  0xff93,
+  "molsquare",
+  0x33d6,
+  "momathai",
+  0x0e21,
+  "moverssquare",
+  0x33a7,
+  "moverssquaredsquare",
+  0x33a8,
+  "mparen",
+  0x24a8,
+  "mpasquare",
+  0x33ab,
+  "mssquare",
+  0x33b3,
+  "msuperior",
+  0xf6ef,
+  "mturned",
+  0x026f,
+  "mu",
+  0x00b5,
+  "mu1",
+  0x00b5,
+  "muasquare",
+  0x3382,
+  "muchgreater",
+  0x226b,
+  "muchless",
+  0x226a,
+  "mufsquare",
+  0x338c,
+  "mugreek",
+  0x03bc,
+  "mugsquare",
+  0x338d,
+  "muhiragana",
+  0x3080,
+  "mukatakana",
+  0x30e0,
+  "mukatakanahalfwidth",
+  0xff91,
+  "mulsquare",
+  0x3395,
+  "multiply",
+  0x00d7,
+  "mumsquare",
+  0x339b,
+  "munahhebrew",
+  0x05a3,
+  "munahlefthebrew",
+  0x05a3,
+  "musicalnote",
+  0x266a,
+  "musicalnotedbl",
+  0x266b,
+  "musicflatsign",
+  0x266d,
+  "musicsharpsign",
+  0x266f,
+  "mussquare",
+  0x33b2,
+  "muvsquare",
+  0x33b6,
+  "muwsquare",
+  0x33bc,
+  "mvmegasquare",
+  0x33b9,
+  "mvsquare",
+  0x33b7,
+  "mwmegasquare",
+  0x33bf,
+  "mwsquare",
+  0x33bd,
+  "n",
+  0x006e,
+  "nabengali",
+  0x09a8,
+  "nabla",
+  0x2207,
+  "nacute",
+  0x0144,
+  "nadeva",
+  0x0928,
+  "nagujarati",
+  0x0aa8,
+  "nagurmukhi",
+  0x0a28,
+  "nahiragana",
+  0x306a,
+  "nakatakana",
+  0x30ca,
+  "nakatakanahalfwidth",
+  0xff85,
+  "napostrophe",
+  0x0149,
+  "nasquare",
+  0x3381,
+  "nbopomofo",
+  0x310b,
+  "nbspace",
+  0x00a0,
+  "ncaron",
+  0x0148,
+  "ncedilla",
+  0x0146,
+  "ncircle",
+  0x24dd,
+  "ncircumflexbelow",
+  0x1e4b,
+  "ncommaaccent",
+  0x0146,
+  "ndotaccent",
+  0x1e45,
+  "ndotbelow",
+  0x1e47,
+  "nehiragana",
+  0x306d,
+  "nekatakana",
+  0x30cd,
+  "nekatakanahalfwidth",
+  0xff88,
+  "newsheqelsign",
+  0x20aa,
+  "nfsquare",
+  0x338b,
+  "ngabengali",
+  0x0999,
+  "ngadeva",
+  0x0919,
+  "ngagujarati",
+  0x0a99,
+  "ngagurmukhi",
+  0x0a19,
+  "ngonguthai",
+  0x0e07,
+  "nhiragana",
+  0x3093,
+  "nhookleft",
+  0x0272,
+  "nhookretroflex",
+  0x0273,
+  "nieunacirclekorean",
+  0x326f,
+  "nieunaparenkorean",
+  0x320f,
+  "nieuncieuckorean",
+  0x3135,
+  "nieuncirclekorean",
+  0x3261,
+  "nieunhieuhkorean",
+  0x3136,
+  "nieunkorean",
+  0x3134,
+  "nieunpansioskorean",
+  0x3168,
+  "nieunparenkorean",
+  0x3201,
+  "nieunsioskorean",
+  0x3167,
+  "nieuntikeutkorean",
+  0x3166,
+  "nihiragana",
+  0x306b,
+  "nikatakana",
+  0x30cb,
+  "nikatakanahalfwidth",
+  0xff86,
+  "nikhahitleftthai",
+  0xf899,
+  "nikhahitthai",
+  0x0e4d,
+  "nine",
+  0x0039,
+  "ninearabic",
+  0x0669,
+  "ninebengali",
+  0x09ef,
+  "ninecircle",
+  0x2468,
+  "ninecircleinversesansserif",
+  0x2792,
+  "ninedeva",
+  0x096f,
+  "ninegujarati",
+  0x0aef,
+  "ninegurmukhi",
+  0x0a6f,
+  "ninehackarabic",
+  0x0669,
+  "ninehangzhou",
+  0x3029,
+  "nineideographicparen",
+  0x3228,
+  "nineinferior",
+  0x2089,
+  "ninemonospace",
+  0xff19,
+  "nineoldstyle",
+  0xf739,
+  "nineparen",
+  0x247c,
+  "nineperiod",
+  0x2490,
+  "ninepersian",
+  0x06f9,
+  "nineroman",
+  0x2178,
+  "ninesuperior",
+  0x2079,
+  "nineteencircle",
+  0x2472,
+  "nineteenparen",
+  0x2486,
+  "nineteenperiod",
+  0x249a,
+  "ninethai",
+  0x0e59,
+  "nj",
+  0x01cc,
+  "njecyrillic",
+  0x045a,
+  "nkatakana",
+  0x30f3,
+  "nkatakanahalfwidth",
+  0xff9d,
+  "nlegrightlong",
+  0x019e,
+  "nlinebelow",
+  0x1e49,
+  "nmonospace",
+  0xff4e,
+  "nmsquare",
+  0x339a,
+  "nnabengali",
+  0x09a3,
+  "nnadeva",
+  0x0923,
+  "nnagujarati",
+  0x0aa3,
+  "nnagurmukhi",
+  0x0a23,
+  "nnnadeva",
+  0x0929,
+  "nohiragana",
+  0x306e,
+  "nokatakana",
+  0x30ce,
+  "nokatakanahalfwidth",
+  0xff89,
+  "nonbreakingspace",
+  0x00a0,
+  "nonenthai",
+  0x0e13,
+  "nonuthai",
+  0x0e19,
+  "noonarabic",
+  0x0646,
+  "noonfinalarabic",
+  0xfee6,
+  "noonghunnaarabic",
+  0x06ba,
+  "noonghunnafinalarabic",
+  0xfb9f,
+  "nooninitialarabic",
+  0xfee7,
+  "noonjeeminitialarabic",
+  0xfcd2,
+  "noonjeemisolatedarabic",
+  0xfc4b,
+  "noonmedialarabic",
+  0xfee8,
+  "noonmeeminitialarabic",
+  0xfcd5,
+  "noonmeemisolatedarabic",
+  0xfc4e,
+  "noonnoonfinalarabic",
+  0xfc8d,
+  "notcontains",
+  0x220c,
+  "notelement",
+  0x2209,
+  "notelementof",
+  0x2209,
+  "notequal",
+  0x2260,
+  "notgreater",
+  0x226f,
+  "notgreaternorequal",
+  0x2271,
+  "notgreaternorless",
+  0x2279,
+  "notidentical",
+  0x2262,
+  "notless",
+  0x226e,
+  "notlessnorequal",
+  0x2270,
+  "notparallel",
+  0x2226,
+  "notprecedes",
+  0x2280,
+  "notsubset",
+  0x2284,
+  "notsucceeds",
+  0x2281,
+  "notsuperset",
+  0x2285,
+  "nowarmenian",
+  0x0576,
+  "nparen",
+  0x24a9,
+  "nssquare",
+  0x33b1,
+  "nsuperior",
+  0x207f,
+  "ntilde",
+  0x00f1,
+  "nu",
+  0x03bd,
+  "nuhiragana",
+  0x306c,
+  "nukatakana",
+  0x30cc,
+  "nukatakanahalfwidth",
+  0xff87,
+  "nuktabengali",
+  0x09bc,
+  "nuktadeva",
+  0x093c,
+  "nuktagujarati",
+  0x0abc,
+  "nuktagurmukhi",
+  0x0a3c,
+  "numbersign",
+  0x0023,
+  "numbersignmonospace",
+  0xff03,
+  "numbersignsmall",
+  0xfe5f,
+  "numeralsigngreek",
+  0x0374,
+  "numeralsignlowergreek",
+  0x0375,
+  "numero",
+  0x2116,
+  "nun",
+  0x05e0,
+  "nundagesh",
+  0xfb40,
+  "nundageshhebrew",
+  0xfb40,
+  "nunhebrew",
+  0x05e0,
+  "nvsquare",
+  0x33b5,
+  "nwsquare",
+  0x33bb,
+  "nyabengali",
+  0x099e,
+  "nyadeva",
+  0x091e,
+  "nyagujarati",
+  0x0a9e,
+  "nyagurmukhi",
+  0x0a1e,
+  "o",
+  0x006f,
+  "oacute",
+  0x00f3,
+  "oangthai",
+  0x0e2d,
+  "obarred",
+  0x0275,
+  "obarredcyrillic",
+  0x04e9,
+  "obarreddieresiscyrillic",
+  0x04eb,
+  "obengali",
+  0x0993,
+  "obopomofo",
+  0x311b,
+  "obreve",
+  0x014f,
+  "ocandradeva",
+  0x0911,
+  "ocandragujarati",
+  0x0a91,
+  "ocandravowelsigndeva",
+  0x0949,
+  "ocandravowelsigngujarati",
+  0x0ac9,
+  "ocaron",
+  0x01d2,
+  "ocircle",
+  0x24de,
+  "ocircumflex",
+  0x00f4,
+  "ocircumflexacute",
+  0x1ed1,
+  "ocircumflexdotbelow",
+  0x1ed9,
+  "ocircumflexgrave",
+  0x1ed3,
+  "ocircumflexhookabove",
+  0x1ed5,
+  "ocircumflextilde",
+  0x1ed7,
+  "ocyrillic",
+  0x043e,
+  "odblacute",
+  0x0151,
+  "odblgrave",
+  0x020d,
+  "odeva",
+  0x0913,
+  "odieresis",
+  0x00f6,
+  "odieresiscyrillic",
+  0x04e7,
+  "odotbelow",
+  0x1ecd,
+  "oe",
+  0x0153,
+  "oekorean",
+  0x315a,
+  "ogonek",
+  0x02db,
+  "ogonekcmb",
+  0x0328,
+  "ograve",
+  0x00f2,
+  "ogujarati",
+  0x0a93,
+  "oharmenian",
+  0x0585,
+  "ohiragana",
+  0x304a,
+  "ohookabove",
+  0x1ecf,
+  "ohorn",
+  0x01a1,
+  "ohornacute",
+  0x1edb,
+  "ohorndotbelow",
+  0x1ee3,
+  "ohorngrave",
+  0x1edd,
+  "ohornhookabove",
+  0x1edf,
+  "ohorntilde",
+  0x1ee1,
+  "ohungarumlaut",
+  0x0151,
+  "oi",
+  0x01a3,
+  "oinvertedbreve",
+  0x020f,
+  "okatakana",
+  0x30aa,
+  "okatakanahalfwidth",
+  0xff75,
+  "okorean",
+  0x3157,
+  "olehebrew",
+  0x05ab,
+  "omacron",
+  0x014d,
+  "omacronacute",
+  0x1e53,
+  "omacrongrave",
+  0x1e51,
+  "omdeva",
+  0x0950,
+  "omega",
+  0x03c9,
+  "omega1",
+  0x03d6,
+  "omegacyrillic",
+  0x0461,
+  "omegalatinclosed",
+  0x0277,
+  "omegaroundcyrillic",
+  0x047b,
+  "omegatitlocyrillic",
+  0x047d,
+  "omegatonos",
+  0x03ce,
+  "omgujarati",
+  0x0ad0,
+  "omicron",
+  0x03bf,
+  "omicrontonos",
+  0x03cc,
+  "omonospace",
+  0xff4f,
+  "one",
+  0x0031,
+  "onearabic",
+  0x0661,
+  "onebengali",
+  0x09e7,
+  "onecircle",
+  0x2460,
+  "onecircleinversesansserif",
+  0x278a,
+  "onedeva",
+  0x0967,
+  "onedotenleader",
+  0x2024,
+  "oneeighth",
+  0x215b,
+  "onefitted",
+  0xf6dc,
+  "onegujarati",
+  0x0ae7,
+  "onegurmukhi",
+  0x0a67,
+  "onehackarabic",
+  0x0661,
+  "onehalf",
+  0x00bd,
+  "onehangzhou",
+  0x3021,
+  "oneideographicparen",
+  0x3220,
+  "oneinferior",
+  0x2081,
+  "onemonospace",
+  0xff11,
+  "onenumeratorbengali",
+  0x09f4,
+  "oneoldstyle",
+  0xf731,
+  "oneparen",
+  0x2474,
+  "oneperiod",
+  0x2488,
+  "onepersian",
+  0x06f1,
+  "onequarter",
+  0x00bc,
+  "oneroman",
+  0x2170,
+  "onesuperior",
+  0x00b9,
+  "onethai",
+  0x0e51,
+  "onethird",
+  0x2153,
+  "oogonek",
+  0x01eb,
+  "oogonekmacron",
+  0x01ed,
+  "oogurmukhi",
+  0x0a13,
+  "oomatragurmukhi",
+  0x0a4b,
+  "oopen",
+  0x0254,
+  "oparen",
+  0x24aa,
+  "openbullet",
+  0x25e6,
+  "option",
+  0x2325,
+  "ordfeminine",
+  0x00aa,
+  "ordmasculine",
+  0x00ba,
+  "orthogonal",
+  0x221f,
+  "oshortdeva",
+  0x0912,
+  "oshortvowelsigndeva",
+  0x094a,
+  "oslash",
+  0x00f8,
+  "oslashacute",
+  0x01ff,
+  "osmallhiragana",
+  0x3049,
+  "osmallkatakana",
+  0x30a9,
+  "osmallkatakanahalfwidth",
+  0xff6b,
+  "ostrokeacute",
+  0x01ff,
+  "osuperior",
+  0xf6f0,
+  "otcyrillic",
+  0x047f,
+  "otilde",
+  0x00f5,
+  "otildeacute",
+  0x1e4d,
+  "otildedieresis",
+  0x1e4f,
+  "oubopomofo",
+  0x3121,
+  "overline",
+  0x203e,
+  "overlinecenterline",
+  0xfe4a,
+  "overlinecmb",
+  0x0305,
+  "overlinedashed",
+  0xfe49,
+  "overlinedblwavy",
+  0xfe4c,
+  "overlinewavy",
+  0xfe4b,
+  "overscore",
+  0x00af,
+  "ovowelsignbengali",
+  0x09cb,
+  "ovowelsigndeva",
+  0x094b,
+  "ovowelsigngujarati",
+  0x0acb,
+  "p",
+  0x0070,
+  "paampssquare",
+  0x3380,
+  "paasentosquare",
+  0x332b,
+  "pabengali",
+  0x09aa,
+  "pacute",
+  0x1e55,
+  "padeva",
+  0x092a,
+  "pagedown",
+  0x21df,
+  "pageup",
+  0x21de,
+  "pagujarati",
+  0x0aaa,
+  "pagurmukhi",
+  0x0a2a,
+  "pahiragana",
+  0x3071,
+  "paiyannoithai",
+  0x0e2f,
+  "pakatakana",
+  0x30d1,
+  "palatalizationcyrilliccmb",
+  0x0484,
+  "palochkacyrillic",
+  0x04c0,
+  "pansioskorean",
+  0x317f,
+  "paragraph",
+  0x00b6,
+  "parallel",
+  0x2225,
+  "parenleft",
+  0x0028,
+  "parenleftaltonearabic",
+  0xfd3e,
+  "parenleftbt",
+  0xf8ed,
+  "parenleftex",
+  0xf8ec,
+  "parenleftinferior",
+  0x208d,
+  "parenleftmonospace",
+  0xff08,
+  "parenleftsmall",
+  0xfe59,
+  "parenleftsuperior",
+  0x207d,
+  "parenlefttp",
+  0xf8eb,
+  "parenleftvertical",
+  0xfe35,
+  "parenright",
+  0x0029,
+  "parenrightaltonearabic",
+  0xfd3f,
+  "parenrightbt",
+  0xf8f8,
+  "parenrightex",
+  0xf8f7,
+  "parenrightinferior",
+  0x208e,
+  "parenrightmonospace",
+  0xff09,
+  "parenrightsmall",
+  0xfe5a,
+  "parenrightsuperior",
+  0x207e,
+  "parenrighttp",
+  0xf8f6,
+  "parenrightvertical",
+  0xfe36,
+  "partialdiff",
+  0x2202,
+  "paseqhebrew",
+  0x05c0,
+  "pashtahebrew",
+  0x0599,
+  "pasquare",
+  0x33a9,
+  "patah",
+  0x05b7,
+  "patah11",
+  0x05b7,
+  "patah1d",
+  0x05b7,
+  "patah2a",
+  0x05b7,
+  "patahhebrew",
+  0x05b7,
+  "patahnarrowhebrew",
+  0x05b7,
+  "patahquarterhebrew",
+  0x05b7,
+  "patahwidehebrew",
+  0x05b7,
+  "pazerhebrew",
+  0x05a1,
+  "pbopomofo",
+  0x3106,
+  "pcircle",
+  0x24df,
+  "pdotaccent",
+  0x1e57,
+  "pe",
+  0x05e4,
+  "pecyrillic",
+  0x043f,
+  "pedagesh",
+  0xfb44,
+  "pedageshhebrew",
+  0xfb44,
+  "peezisquare",
+  0x333b,
+  "pefinaldageshhebrew",
+  0xfb43,
+  "peharabic",
+  0x067e,
+  "peharmenian",
+  0x057a,
+  "pehebrew",
+  0x05e4,
+  "pehfinalarabic",
+  0xfb57,
+  "pehinitialarabic",
+  0xfb58,
+  "pehiragana",
+  0x307a,
+  "pehmedialarabic",
+  0xfb59,
+  "pekatakana",
+  0x30da,
+  "pemiddlehookcyrillic",
+  0x04a7,
+  "perafehebrew",
+  0xfb4e,
+  "percent",
+  0x0025,
+  "percentarabic",
+  0x066a,
+  "percentmonospace",
+  0xff05,
+  "percentsmall",
+  0xfe6a,
+  "period",
+  0x002e,
+  "periodarmenian",
+  0x0589,
+  "periodcentered",
+  0x00b7,
+  "periodhalfwidth",
+  0xff61,
+  "periodinferior",
+  0xf6e7,
+  "periodmonospace",
+  0xff0e,
+  "periodsmall",
+  0xfe52,
+  "periodsuperior",
+  0xf6e8,
+  "perispomenigreekcmb",
+  0x0342,
+  "perpendicular",
+  0x22a5,
+  "perthousand",
+  0x2030,
+  "peseta",
+  0x20a7,
+  "pfsquare",
+  0x338a,
+  "phabengali",
+  0x09ab,
+  "phadeva",
+  0x092b,
+  "phagujarati",
+  0x0aab,
+  "phagurmukhi",
+  0x0a2b,
+  "phi",
+  0x03c6,
+  "phi1",
+  0x03d5,
+  "phieuphacirclekorean",
+  0x327a,
+  "phieuphaparenkorean",
+  0x321a,
+  "phieuphcirclekorean",
+  0x326c,
+  "phieuphkorean",
+  0x314d,
+  "phieuphparenkorean",
+  0x320c,
+  "philatin",
+  0x0278,
+  "phinthuthai",
+  0x0e3a,
+  "phisymbolgreek",
+  0x03d5,
+  "phook",
+  0x01a5,
+  "phophanthai",
+  0x0e1e,
+  "phophungthai",
+  0x0e1c,
+  "phosamphaothai",
+  0x0e20,
+  "pi",
+  0x03c0,
+  "pieupacirclekorean",
+  0x3273,
+  "pieupaparenkorean",
+  0x3213,
+  "pieupcieuckorean",
+  0x3176,
+  "pieupcirclekorean",
+  0x3265,
+  "pieupkiyeokkorean",
+  0x3172,
+  "pieupkorean",
+  0x3142,
+  "pieupparenkorean",
+  0x3205,
+  "pieupsioskiyeokkorean",
+  0x3174,
+  "pieupsioskorean",
+  0x3144,
+  "pieupsiostikeutkorean",
+  0x3175,
+  "pieupthieuthkorean",
+  0x3177,
+  "pieuptikeutkorean",
+  0x3173,
+  "pihiragana",
+  0x3074,
+  "pikatakana",
+  0x30d4,
+  "pisymbolgreek",
+  0x03d6,
+  "piwrarmenian",
+  0x0583,
+  "plus",
+  0x002b,
+  "plusbelowcmb",
+  0x031f,
+  "pluscircle",
+  0x2295,
+  "plusminus",
+  0x00b1,
+  "plusmod",
+  0x02d6,
+  "plusmonospace",
+  0xff0b,
+  "plussmall",
+  0xfe62,
+  "plussuperior",
+  0x207a,
+  "pmonospace",
+  0xff50,
+  "pmsquare",
+  0x33d8,
+  "pohiragana",
+  0x307d,
+  "pointingindexdownwhite",
+  0x261f,
+  "pointingindexleftwhite",
+  0x261c,
+  "pointingindexrightwhite",
+  0x261e,
+  "pointingindexupwhite",
+  0x261d,
+  "pokatakana",
+  0x30dd,
+  "poplathai",
+  0x0e1b,
+  "postalmark",
+  0x3012,
+  "postalmarkface",
+  0x3020,
+  "pparen",
+  0x24ab,
+  "precedes",
+  0x227a,
+  "prescription",
+  0x211e,
+  "primemod",
+  0x02b9,
+  "primereversed",
+  0x2035,
+  "product",
+  0x220f,
+  "projective",
+  0x2305,
+  "prolongedkana",
+  0x30fc,
+  "propellor",
+  0x2318,
+  "propersubset",
+  0x2282,
+  "propersuperset",
+  0x2283,
+  "proportion",
+  0x2237,
+  "proportional",
+  0x221d,
+  "psi",
+  0x03c8,
+  "psicyrillic",
+  0x0471,
+  "psilipneumatacyrilliccmb",
+  0x0486,
+  "pssquare",
+  0x33b0,
+  "puhiragana",
+  0x3077,
+  "pukatakana",
+  0x30d7,
+  "pvsquare",
+  0x33b4,
+  "pwsquare",
+  0x33ba,
+  "q",
+  0x0071,
+  "qadeva",
+  0x0958,
+  "qadmahebrew",
+  0x05a8,
+  "qafarabic",
+  0x0642,
+  "qaffinalarabic",
+  0xfed6,
+  "qafinitialarabic",
+  0xfed7,
+  "qafmedialarabic",
+  0xfed8,
+  "qamats",
+  0x05b8,
+  "qamats10",
+  0x05b8,
+  "qamats1a",
+  0x05b8,
+  "qamats1c",
+  0x05b8,
+  "qamats27",
+  0x05b8,
+  "qamats29",
+  0x05b8,
+  "qamats33",
+  0x05b8,
+  "qamatsde",
+  0x05b8,
+  "qamatshebrew",
+  0x05b8,
+  "qamatsnarrowhebrew",
+  0x05b8,
+  "qamatsqatanhebrew",
+  0x05b8,
+  "qamatsqatannarrowhebrew",
+  0x05b8,
+  "qamatsqatanquarterhebrew",
+  0x05b8,
+  "qamatsqatanwidehebrew",
+  0x05b8,
+  "qamatsquarterhebrew",
+  0x05b8,
+  "qamatswidehebrew",
+  0x05b8,
+  "qarneyparahebrew",
+  0x059f,
+  "qbopomofo",
+  0x3111,
+  "qcircle",
+  0x24e0,
+  "qhook",
+  0x02a0,
+  "qmonospace",
+  0xff51,
+  "qof",
+  0x05e7,
+  "qofdagesh",
+  0xfb47,
+  "qofdageshhebrew",
+  0xfb47,
+  "qofhebrew",
+  0x05e7,
+  "qparen",
+  0x24ac,
+  "quarternote",
+  0x2669,
+  "qubuts",
+  0x05bb,
+  "qubuts18",
+  0x05bb,
+  "qubuts25",
+  0x05bb,
+  "qubuts31",
+  0x05bb,
+  "qubutshebrew",
+  0x05bb,
+  "qubutsnarrowhebrew",
+  0x05bb,
+  "qubutsquarterhebrew",
+  0x05bb,
+  "qubutswidehebrew",
+  0x05bb,
+  "question",
+  0x003f,
+  "questionarabic",
+  0x061f,
+  "questionarmenian",
+  0x055e,
+  "questiondown",
+  0x00bf,
+  "questiondownsmall",
+  0xf7bf,
+  "questiongreek",
+  0x037e,
+  "questionmonospace",
+  0xff1f,
+  "questionsmall",
+  0xf73f,
+  "quotedbl",
+  0x0022,
+  "quotedblbase",
+  0x201e,
+  "quotedblleft",
+  0x201c,
+  "quotedblmonospace",
+  0xff02,
+  "quotedblprime",
+  0x301e,
+  "quotedblprimereversed",
+  0x301d,
+  "quotedblright",
+  0x201d,
+  "quoteleft",
+  0x2018,
+  "quoteleftreversed",
+  0x201b,
+  "quotereversed",
+  0x201b,
+  "quoteright",
+  0x2019,
+  "quoterightn",
+  0x0149,
+  "quotesinglbase",
+  0x201a,
+  "quotesingle",
+  0x0027,
+  "quotesinglemonospace",
+  0xff07,
+  "r",
+  0x0072,
+  "raarmenian",
+  0x057c,
+  "rabengali",
+  0x09b0,
+  "racute",
+  0x0155,
+  "radeva",
+  0x0930,
+  "radical",
+  0x221a,
+  "radicalex",
+  0xf8e5,
+  "radoverssquare",
+  0x33ae,
+  "radoverssquaredsquare",
+  0x33af,
+  "radsquare",
+  0x33ad,
+  "rafe",
+  0x05bf,
+  "rafehebrew",
+  0x05bf,
+  "ragujarati",
+  0x0ab0,
+  "ragurmukhi",
+  0x0a30,
+  "rahiragana",
+  0x3089,
+  "rakatakana",
+  0x30e9,
+  "rakatakanahalfwidth",
+  0xff97,
+  "ralowerdiagonalbengali",
+  0x09f1,
+  "ramiddlediagonalbengali",
+  0x09f0,
+  "ramshorn",
+  0x0264,
+  "ratio",
+  0x2236,
+  "rbopomofo",
+  0x3116,
+  "rcaron",
+  0x0159,
+  "rcedilla",
+  0x0157,
+  "rcircle",
+  0x24e1,
+  "rcommaaccent",
+  0x0157,
+  "rdblgrave",
+  0x0211,
+  "rdotaccent",
+  0x1e59,
+  "rdotbelow",
+  0x1e5b,
+  "rdotbelowmacron",
+  0x1e5d,
+  "referencemark",
+  0x203b,
+  "reflexsubset",
+  0x2286,
+  "reflexsuperset",
+  0x2287,
+  "registered",
+  0x00ae,
+  "registersans",
+  0xf8e8,
+  "registerserif",
+  0xf6da,
+  "reharabic",
+  0x0631,
+  "reharmenian",
+  0x0580,
+  "rehfinalarabic",
+  0xfeae,
+  "rehiragana",
+  0x308c,
+  "rekatakana",
+  0x30ec,
+  "rekatakanahalfwidth",
+  0xff9a,
+  "resh",
+  0x05e8,
+  "reshdageshhebrew",
+  0xfb48,
+  "reshhebrew",
+  0x05e8,
+  "reversedtilde",
+  0x223d,
+  "reviahebrew",
+  0x0597,
+  "reviamugrashhebrew",
+  0x0597,
+  "revlogicalnot",
+  0x2310,
+  "rfishhook",
+  0x027e,
+  "rfishhookreversed",
+  0x027f,
+  "rhabengali",
+  0x09dd,
+  "rhadeva",
+  0x095d,
+  "rho",
+  0x03c1,
+  "rhook",
+  0x027d,
+  "rhookturned",
+  0x027b,
+  "rhookturnedsuperior",
+  0x02b5,
+  "rhosymbolgreek",
+  0x03f1,
+  "rhotichookmod",
+  0x02de,
+  "rieulacirclekorean",
+  0x3271,
+  "rieulaparenkorean",
+  0x3211,
+  "rieulcirclekorean",
+  0x3263,
+  "rieulhieuhkorean",
+  0x3140,
+  "rieulkiyeokkorean",
+  0x313a,
+  "rieulkiyeoksioskorean",
+  0x3169,
+  "rieulkorean",
+  0x3139,
+  "rieulmieumkorean",
+  0x313b,
+  "rieulpansioskorean",
+  0x316c,
+  "rieulparenkorean",
+  0x3203,
+  "rieulphieuphkorean",
+  0x313f,
+  "rieulpieupkorean",
+  0x313c,
+  "rieulpieupsioskorean",
+  0x316b,
+  "rieulsioskorean",
+  0x313d,
+  "rieulthieuthkorean",
+  0x313e,
+  "rieultikeutkorean",
+  0x316a,
+  "rieulyeorinhieuhkorean",
+  0x316d,
+  "rightangle",
+  0x221f,
+  "righttackbelowcmb",
+  0x0319,
+  "righttriangle",
+  0x22bf,
+  "rihiragana",
+  0x308a,
+  "rikatakana",
+  0x30ea,
+  "rikatakanahalfwidth",
+  0xff98,
+  "ring",
+  0x02da,
+  "ringbelowcmb",
+  0x0325,
+  "ringcmb",
+  0x030a,
+  "ringhalfleft",
+  0x02bf,
+  "ringhalfleftarmenian",
+  0x0559,
+  "ringhalfleftbelowcmb",
+  0x031c,
+  "ringhalfleftcentered",
+  0x02d3,
+  "ringhalfright",
+  0x02be,
+  "ringhalfrightbelowcmb",
+  0x0339,
+  "ringhalfrightcentered",
+  0x02d2,
+  "rinvertedbreve",
+  0x0213,
+  "rittorusquare",
+  0x3351,
+  "rlinebelow",
+  0x1e5f,
+  "rlongleg",
+  0x027c,
+  "rlonglegturned",
+  0x027a,
+  "rmonospace",
+  0xff52,
+  "rohiragana",
+  0x308d,
+  "rokatakana",
+  0x30ed,
+  "rokatakanahalfwidth",
+  0xff9b,
+  "roruathai",
+  0x0e23,
+  "rparen",
+  0x24ad,
+  "rrabengali",
+  0x09dc,
+  "rradeva",
+  0x0931,
+  "rragurmukhi",
+  0x0a5c,
+  "rreharabic",
+  0x0691,
+  "rrehfinalarabic",
+  0xfb8d,
+  "rrvocalicbengali",
+  0x09e0,
+  "rrvocalicdeva",
+  0x0960,
+  "rrvocalicgujarati",
+  0x0ae0,
+  "rrvocalicvowelsignbengali",
+  0x09c4,
+  "rrvocalicvowelsigndeva",
+  0x0944,
+  "rrvocalicvowelsigngujarati",
+  0x0ac4,
+  "rsuperior",
+  0xf6f1,
+  "rtblock",
+  0x2590,
+  "rturned",
+  0x0279,
+  "rturnedsuperior",
+  0x02b4,
+  "ruhiragana",
+  0x308b,
+  "rukatakana",
+  0x30eb,
+  "rukatakanahalfwidth",
+  0xff99,
+  "rupeemarkbengali",
+  0x09f2,
+  "rupeesignbengali",
+  0x09f3,
+  "rupiah",
+  0xf6dd,
+  "ruthai",
+  0x0e24,
+  "rvocalicbengali",
+  0x098b,
+  "rvocalicdeva",
+  0x090b,
+  "rvocalicgujarati",
+  0x0a8b,
+  "rvocalicvowelsignbengali",
+  0x09c3,
+  "rvocalicvowelsigndeva",
+  0x0943,
+  "rvocalicvowelsigngujarati",
+  0x0ac3,
+  "s",
+  0x0073,
+  "sabengali",
+  0x09b8,
+  "sacute",
+  0x015b,
+  "sacutedotaccent",
+  0x1e65,
+  "sadarabic",
+  0x0635,
+  "sadeva",
+  0x0938,
+  "sadfinalarabic",
+  0xfeba,
+  "sadinitialarabic",
+  0xfebb,
+  "sadmedialarabic",
+  0xfebc,
+  "sagujarati",
+  0x0ab8,
+  "sagurmukhi",
+  0x0a38,
+  "sahiragana",
+  0x3055,
+  "sakatakana",
+  0x30b5,
+  "sakatakanahalfwidth",
+  0xff7b,
+  "sallallahoualayhewasallamarabic",
+  0xfdfa,
+  "samekh",
+  0x05e1,
+  "samekhdagesh",
+  0xfb41,
+  "samekhdageshhebrew",
+  0xfb41,
+  "samekhhebrew",
+  0x05e1,
+  "saraaathai",
+  0x0e32,
+  "saraaethai",
+  0x0e41,
+  "saraaimaimalaithai",
+  0x0e44,
+  "saraaimaimuanthai",
+  0x0e43,
+  "saraamthai",
+  0x0e33,
+  "saraathai",
+  0x0e30,
+  "saraethai",
+  0x0e40,
+  "saraiileftthai",
+  0xf886,
+  "saraiithai",
+  0x0e35,
+  "saraileftthai",
+  0xf885,
+  "saraithai",
+  0x0e34,
+  "saraothai",
+  0x0e42,
+  "saraueeleftthai",
+  0xf888,
+  "saraueethai",
+  0x0e37,
+  "saraueleftthai",
+  0xf887,
+  "sarauethai",
+  0x0e36,
+  "sarauthai",
+  0x0e38,
+  "sarauuthai",
+  0x0e39,
+  "sbopomofo",
+  0x3119,
+  "scaron",
+  0x0161,
+  "scarondotaccent",
+  0x1e67,
+  "scedilla",
+  0x015f,
+  "schwa",
+  0x0259,
+  "schwacyrillic",
+  0x04d9,
+  "schwadieresiscyrillic",
+  0x04db,
+  "schwahook",
+  0x025a,
+  "scircle",
+  0x24e2,
+  "scircumflex",
+  0x015d,
+  "scommaaccent",
+  0x0219,
+  "sdotaccent",
+  0x1e61,
+  "sdotbelow",
+  0x1e63,
+  "sdotbelowdotaccent",
+  0x1e69,
+  "seagullbelowcmb",
+  0x033c,
+  "second",
+  0x2033,
+  "secondtonechinese",
+  0x02ca,
+  "section",
+  0x00a7,
+  "seenarabic",
+  0x0633,
+  "seenfinalarabic",
+  0xfeb2,
+  "seeninitialarabic",
+  0xfeb3,
+  "seenmedialarabic",
+  0xfeb4,
+  "segol",
+  0x05b6,
+  "segol13",
+  0x05b6,
+  "segol1f",
+  0x05b6,
+  "segol2c",
+  0x05b6,
+  "segolhebrew",
+  0x05b6,
+  "segolnarrowhebrew",
+  0x05b6,
+  "segolquarterhebrew",
+  0x05b6,
+  "segoltahebrew",
+  0x0592,
+  "segolwidehebrew",
+  0x05b6,
+  "seharmenian",
+  0x057d,
+  "sehiragana",
+  0x305b,
+  "sekatakana",
+  0x30bb,
+  "sekatakanahalfwidth",
+  0xff7e,
+  "semicolon",
+  0x003b,
+  "semicolonarabic",
+  0x061b,
+  "semicolonmonospace",
+  0xff1b,
+  "semicolonsmall",
+  0xfe54,
+  "semivoicedmarkkana",
+  0x309c,
+  "semivoicedmarkkanahalfwidth",
+  0xff9f,
+  "sentisquare",
+  0x3322,
+  "sentosquare",
+  0x3323,
+  "seven",
+  0x0037,
+  "sevenarabic",
+  0x0667,
+  "sevenbengali",
+  0x09ed,
+  "sevencircle",
+  0x2466,
+  "sevencircleinversesansserif",
+  0x2790,
+  "sevendeva",
+  0x096d,
+  "seveneighths",
+  0x215e,
+  "sevengujarati",
+  0x0aed,
+  "sevengurmukhi",
+  0x0a6d,
+  "sevenhackarabic",
+  0x0667,
+  "sevenhangzhou",
+  0x3027,
+  "sevenideographicparen",
+  0x3226,
+  "seveninferior",
+  0x2087,
+  "sevenmonospace",
+  0xff17,
+  "sevenoldstyle",
+  0xf737,
+  "sevenparen",
+  0x247a,
+  "sevenperiod",
+  0x248e,
+  "sevenpersian",
+  0x06f7,
+  "sevenroman",
+  0x2176,
+  "sevensuperior",
+  0x2077,
+  "seventeencircle",
+  0x2470,
+  "seventeenparen",
+  0x2484,
+  "seventeenperiod",
+  0x2498,
+  "seventhai",
+  0x0e57,
+  "sfthyphen",
+  0x00ad,
+  "shaarmenian",
+  0x0577,
+  "shabengali",
+  0x09b6,
+  "shacyrillic",
+  0x0448,
+  "shaddaarabic",
+  0x0651,
+  "shaddadammaarabic",
+  0xfc61,
+  "shaddadammatanarabic",
+  0xfc5e,
+  "shaddafathaarabic",
+  0xfc60,
+  "shaddakasraarabic",
+  0xfc62,
+  "shaddakasratanarabic",
+  0xfc5f,
+  "shade",
+  0x2592,
+  "shadedark",
+  0x2593,
+  "shadelight",
+  0x2591,
+  "shademedium",
+  0x2592,
+  "shadeva",
+  0x0936,
+  "shagujarati",
+  0x0ab6,
+  "shagurmukhi",
+  0x0a36,
+  "shalshelethebrew",
+  0x0593,
+  "shbopomofo",
+  0x3115,
+  "shchacyrillic",
+  0x0449,
+  "sheenarabic",
+  0x0634,
+  "sheenfinalarabic",
+  0xfeb6,
+  "sheeninitialarabic",
+  0xfeb7,
+  "sheenmedialarabic",
+  0xfeb8,
+  "sheicoptic",
+  0x03e3,
+  "sheqel",
+  0x20aa,
+  "sheqelhebrew",
+  0x20aa,
+  "sheva",
+  0x05b0,
+  "sheva115",
+  0x05b0,
+  "sheva15",
+  0x05b0,
+  "sheva22",
+  0x05b0,
+  "sheva2e",
+  0x05b0,
+  "shevahebrew",
+  0x05b0,
+  "shevanarrowhebrew",
+  0x05b0,
+  "shevaquarterhebrew",
+  0x05b0,
+  "shevawidehebrew",
+  0x05b0,
+  "shhacyrillic",
+  0x04bb,
+  "shimacoptic",
+  0x03ed,
+  "shin",
+  0x05e9,
+  "shindagesh",
+  0xfb49,
+  "shindageshhebrew",
+  0xfb49,
+  "shindageshshindot",
+  0xfb2c,
+  "shindageshshindothebrew",
+  0xfb2c,
+  "shindageshsindot",
+  0xfb2d,
+  "shindageshsindothebrew",
+  0xfb2d,
+  "shindothebrew",
+  0x05c1,
+  "shinhebrew",
+  0x05e9,
+  "shinshindot",
+  0xfb2a,
+  "shinshindothebrew",
+  0xfb2a,
+  "shinsindot",
+  0xfb2b,
+  "shinsindothebrew",
+  0xfb2b,
+  "shook",
+  0x0282,
+  "sigma",
+  0x03c3,
+  "sigma1",
+  0x03c2,
+  "sigmafinal",
+  0x03c2,
+  "sigmalunatesymbolgreek",
+  0x03f2,
+  "sihiragana",
+  0x3057,
+  "sikatakana",
+  0x30b7,
+  "sikatakanahalfwidth",
+  0xff7c,
+  "siluqhebrew",
+  0x05bd,
+  "siluqlefthebrew",
+  0x05bd,
+  "similar",
+  0x223c,
+  "sindothebrew",
+  0x05c2,
+  "siosacirclekorean",
+  0x3274,
+  "siosaparenkorean",
+  0x3214,
+  "sioscieuckorean",
+  0x317e,
+  "sioscirclekorean",
+  0x3266,
+  "sioskiyeokkorean",
+  0x317a,
+  "sioskorean",
+  0x3145,
+  "siosnieunkorean",
+  0x317b,
+  "siosparenkorean",
+  0x3206,
+  "siospieupkorean",
+  0x317d,
+  "siostikeutkorean",
+  0x317c,
+  "six",
+  0x0036,
+  "sixarabic",
+  0x0666,
+  "sixbengali",
+  0x09ec,
+  "sixcircle",
+  0x2465,
+  "sixcircleinversesansserif",
+  0x278f,
+  "sixdeva",
+  0x096c,
+  "sixgujarati",
+  0x0aec,
+  "sixgurmukhi",
+  0x0a6c,
+  "sixhackarabic",
+  0x0666,
+  "sixhangzhou",
+  0x3026,
+  "sixideographicparen",
+  0x3225,
+  "sixinferior",
+  0x2086,
+  "sixmonospace",
+  0xff16,
+  "sixoldstyle",
+  0xf736,
+  "sixparen",
+  0x2479,
+  "sixperiod",
+  0x248d,
+  "sixpersian",
+  0x06f6,
+  "sixroman",
+  0x2175,
+  "sixsuperior",
+  0x2076,
+  "sixteencircle",
+  0x246f,
+  "sixteencurrencydenominatorbengali",
+  0x09f9,
+  "sixteenparen",
+  0x2483,
+  "sixteenperiod",
+  0x2497,
+  "sixthai",
+  0x0e56,
+  "slash",
+  0x002f,
+  "slashmonospace",
+  0xff0f,
+  "slong",
+  0x017f,
+  "slongdotaccent",
+  0x1e9b,
+  "smileface",
+  0x263a,
+  "smonospace",
+  0xff53,
+  "sofpasuqhebrew",
+  0x05c3,
+  "softhyphen",
+  0x00ad,
+  "softsigncyrillic",
+  0x044c,
+  "sohiragana",
+  0x305d,
+  "sokatakana",
+  0x30bd,
+  "sokatakanahalfwidth",
+  0xff7f,
+  "soliduslongoverlaycmb",
+  0x0338,
+  "solidusshortoverlaycmb",
+  0x0337,
+  "sorusithai",
+  0x0e29,
+  "sosalathai",
+  0x0e28,
+  "sosothai",
+  0x0e0b,
+  "sosuathai",
+  0x0e2a,
+  "space",
+  0x0020,
+  "spacehackarabic",
+  0x0020,
+  "spade",
+  0x2660,
+  "spadesuitblack",
+  0x2660,
+  "spadesuitwhite",
+  0x2664,
+  "sparen",
+  0x24ae,
+  "squarebelowcmb",
+  0x033b,
+  "squarecc",
+  0x33c4,
+  "squarecm",
+  0x339d,
+  "squarediagonalcrosshatchfill",
+  0x25a9,
+  "squarehorizontalfill",
+  0x25a4,
+  "squarekg",
+  0x338f,
+  "squarekm",
+  0x339e,
+  "squarekmcapital",
+  0x33ce,
+  "squareln",
+  0x33d1,
+  "squarelog",
+  0x33d2,
+  "squaremg",
+  0x338e,
+  "squaremil",
+  0x33d5,
+  "squaremm",
+  0x339c,
+  "squaremsquared",
+  0x33a1,
+  "squareorthogonalcrosshatchfill",
+  0x25a6,
+  "squareupperlefttolowerrightfill",
+  0x25a7,
+  "squareupperrighttolowerleftfill",
+  0x25a8,
+  "squareverticalfill",
+  0x25a5,
+  "squarewhitewithsmallblack",
+  0x25a3,
+  "srsquare",
+  0x33db,
+  "ssabengali",
+  0x09b7,
+  "ssadeva",
+  0x0937,
+  "ssagujarati",
+  0x0ab7,
+  "ssangcieuckorean",
+  0x3149,
+  "ssanghieuhkorean",
+  0x3185,
+  "ssangieungkorean",
+  0x3180,
+  "ssangkiyeokkorean",
+  0x3132,
+  "ssangnieunkorean",
+  0x3165,
+  "ssangpieupkorean",
+  0x3143,
+  "ssangsioskorean",
+  0x3146,
+  "ssangtikeutkorean",
+  0x3138,
+  "ssuperior",
+  0xf6f2,
+  "sterling",
+  0x00a3,
+  "sterlingmonospace",
+  0xffe1,
+  "strokelongoverlaycmb",
+  0x0336,
+  "strokeshortoverlaycmb",
+  0x0335,
+  "subset",
+  0x2282,
+  "subsetnotequal",
+  0x228a,
+  "subsetorequal",
+  0x2286,
+  "succeeds",
+  0x227b,
+  "suchthat",
+  0x220b,
+  "suhiragana",
+  0x3059,
+  "sukatakana",
+  0x30b9,
+  "sukatakanahalfwidth",
+  0xff7d,
+  "sukunarabic",
+  0x0652,
+  "summation",
+  0x2211,
+  "sun",
+  0x263c,
+  "superset",
+  0x2283,
+  "supersetnotequal",
+  0x228b,
+  "supersetorequal",
+  0x2287,
+  "svsquare",
+  0x33dc,
+  "syouwaerasquare",
+  0x337c,
+  "t",
+  0x0074,
+  "tabengali",
+  0x09a4,
+  "tackdown",
+  0x22a4,
+  "tackleft",
+  0x22a3,
+  "tadeva",
+  0x0924,
+  "tagujarati",
+  0x0aa4,
+  "tagurmukhi",
+  0x0a24,
+  "taharabic",
+  0x0637,
+  "tahfinalarabic",
+  0xfec2,
+  "tahinitialarabic",
+  0xfec3,
+  "tahiragana",
+  0x305f,
+  "tahmedialarabic",
+  0xfec4,
+  "taisyouerasquare",
+  0x337d,
+  "takatakana",
+  0x30bf,
+  "takatakanahalfwidth",
+  0xff80,
+  "tatweelarabic",
+  0x0640,
+  "tau",
+  0x03c4,
+  "tav",
+  0x05ea,
+  "tavdages",
+  0xfb4a,
+  "tavdagesh",
+  0xfb4a,
+  "tavdageshhebrew",
+  0xfb4a,
+  "tavhebrew",
+  0x05ea,
+  "tbar",
+  0x0167,
+  "tbopomofo",
+  0x310a,
+  "tcaron",
+  0x0165,
+  "tccurl",
+  0x02a8,
+  "tcedilla",
+  0x0163,
+  "tcheharabic",
+  0x0686,
+  "tchehfinalarabic",
+  0xfb7b,
+  "tchehinitialarabic",
+  0xfb7c,
+  "tchehmedialarabic",
+  0xfb7d,
+  "tcircle",
+  0x24e3,
+  "tcircumflexbelow",
+  0x1e71,
+  "tcommaaccent",
+  0x0163,
+  "tdieresis",
+  0x1e97,
+  "tdotaccent",
+  0x1e6b,
+  "tdotbelow",
+  0x1e6d,
+  "tecyrillic",
+  0x0442,
+  "tedescendercyrillic",
+  0x04ad,
+  "teharabic",
+  0x062a,
+  "tehfinalarabic",
+  0xfe96,
+  "tehhahinitialarabic",
+  0xfca2,
+  "tehhahisolatedarabic",
+  0xfc0c,
+  "tehinitialarabic",
+  0xfe97,
+  "tehiragana",
+  0x3066,
+  "tehjeeminitialarabic",
+  0xfca1,
+  "tehjeemisolatedarabic",
+  0xfc0b,
+  "tehmarbutaarabic",
+  0x0629,
+  "tehmarbutafinalarabic",
+  0xfe94,
+  "tehmedialarabic",
+  0xfe98,
+  "tehmeeminitialarabic",
+  0xfca4,
+  "tehmeemisolatedarabic",
+  0xfc0e,
+  "tehnoonfinalarabic",
+  0xfc73,
+  "tekatakana",
+  0x30c6,
+  "tekatakanahalfwidth",
+  0xff83,
+  "telephone",
+  0x2121,
+  "telephoneblack",
+  0x260e,
+  "telishagedolahebrew",
+  0x05a0,
+  "telishaqetanahebrew",
+  0x05a9,
+  "tencircle",
+  0x2469,
+  "tenideographicparen",
+  0x3229,
+  "tenparen",
+  0x247d,
+  "tenperiod",
+  0x2491,
+  "tenroman",
+  0x2179,
+  "tesh",
+  0x02a7,
+  "tet",
+  0x05d8,
+  "tetdagesh",
+  0xfb38,
+  "tetdageshhebrew",
+  0xfb38,
+  "tethebrew",
+  0x05d8,
+  "tetsecyrillic",
+  0x04b5,
+  "tevirhebrew",
+  0x059b,
+  "tevirlefthebrew",
+  0x059b,
+  "thabengali",
+  0x09a5,
+  "thadeva",
+  0x0925,
+  "thagujarati",
+  0x0aa5,
+  "thagurmukhi",
+  0x0a25,
+  "thalarabic",
+  0x0630,
+  "thalfinalarabic",
+  0xfeac,
+  "thanthakhatlowleftthai",
+  0xf898,
+  "thanthakhatlowrightthai",
+  0xf897,
+  "thanthakhatthai",
+  0x0e4c,
+  "thanthakhatupperleftthai",
+  0xf896,
+  "theharabic",
+  0x062b,
+  "thehfinalarabic",
+  0xfe9a,
+  "thehinitialarabic",
+  0xfe9b,
+  "thehmedialarabic",
+  0xfe9c,
+  "thereexists",
+  0x2203,
+  "therefore",
+  0x2234,
+  "theta",
+  0x03b8,
+  "theta1",
+  0x03d1,
+  "thetasymbolgreek",
+  0x03d1,
+  "thieuthacirclekorean",
+  0x3279,
+  "thieuthaparenkorean",
+  0x3219,
+  "thieuthcirclekorean",
+  0x326b,
+  "thieuthkorean",
+  0x314c,
+  "thieuthparenkorean",
+  0x320b,
+  "thirteencircle",
+  0x246c,
+  "thirteenparen",
+  0x2480,
+  "thirteenperiod",
+  0x2494,
+  "thonangmonthothai",
+  0x0e11,
+  "thook",
+  0x01ad,
+  "thophuthaothai",
+  0x0e12,
+  "thorn",
+  0x00fe,
+  "thothahanthai",
+  0x0e17,
+  "thothanthai",
+  0x0e10,
+  "thothongthai",
+  0x0e18,
+  "thothungthai",
+  0x0e16,
+  "thousandcyrillic",
+  0x0482,
+  "thousandsseparatorarabic",
+  0x066c,
+  "thousandsseparatorpersian",
+  0x066c,
+  "three",
+  0x0033,
+  "threearabic",
+  0x0663,
+  "threebengali",
+  0x09e9,
+  "threecircle",
+  0x2462,
+  "threecircleinversesansserif",
+  0x278c,
+  "threedeva",
+  0x0969,
+  "threeeighths",
+  0x215c,
+  "threegujarati",
+  0x0ae9,
+  "threegurmukhi",
+  0x0a69,
+  "threehackarabic",
+  0x0663,
+  "threehangzhou",
+  0x3023,
+  "threeideographicparen",
+  0x3222,
+  "threeinferior",
+  0x2083,
+  "threemonospace",
+  0xff13,
+  "threenumeratorbengali",
+  0x09f6,
+  "threeoldstyle",
+  0xf733,
+  "threeparen",
+  0x2476,
+  "threeperiod",
+  0x248a,
+  "threepersian",
+  0x06f3,
+  "threequarters",
+  0x00be,
+  "threequartersemdash",
+  0xf6de,
+  "threeroman",
+  0x2172,
+  "threesuperior",
+  0x00b3,
+  "threethai",
+  0x0e53,
+  "thzsquare",
+  0x3394,
+  "tihiragana",
+  0x3061,
+  "tikatakana",
+  0x30c1,
+  "tikatakanahalfwidth",
+  0xff81,
+  "tikeutacirclekorean",
+  0x3270,
+  "tikeutaparenkorean",
+  0x3210,
+  "tikeutcirclekorean",
+  0x3262,
+  "tikeutkorean",
+  0x3137,
+  "tikeutparenkorean",
+  0x3202,
+  "tilde",
+  0x02dc,
+  "tildebelowcmb",
+  0x0330,
+  "tildecmb",
+  0x0303,
+  "tildecomb",
+  0x0303,
+  "tildedoublecmb",
+  0x0360,
+  "tildeoperator",
+  0x223c,
+  "tildeoverlaycmb",
+  0x0334,
+  "tildeverticalcmb",
+  0x033e,
+  "timescircle",
+  0x2297,
+  "tipehahebrew",
+  0x0596,
+  "tipehalefthebrew",
+  0x0596,
+  "tippigurmukhi",
+  0x0a70,
+  "titlocyrilliccmb",
+  0x0483,
+  "tiwnarmenian",
+  0x057f,
+  "tlinebelow",
+  0x1e6f,
+  "tmonospace",
+  0xff54,
+  "toarmenian",
+  0x0569,
+  "tohiragana",
+  0x3068,
+  "tokatakana",
+  0x30c8,
+  "tokatakanahalfwidth",
+  0xff84,
+  "tonebarextrahighmod",
+  0x02e5,
+  "tonebarextralowmod",
+  0x02e9,
+  "tonebarhighmod",
+  0x02e6,
+  "tonebarlowmod",
+  0x02e8,
+  "tonebarmidmod",
+  0x02e7,
+  "tonefive",
+  0x01bd,
+  "tonesix",
+  0x0185,
+  "tonetwo",
+  0x01a8,
+  "tonos",
+  0x0384,
+  "tonsquare",
+  0x3327,
+  "topatakthai",
+  0x0e0f,
+  "tortoiseshellbracketleft",
+  0x3014,
+  "tortoiseshellbracketleftsmall",
+  0xfe5d,
+  "tortoiseshellbracketleftvertical",
+  0xfe39,
+  "tortoiseshellbracketright",
+  0x3015,
+  "tortoiseshellbracketrightsmall",
+  0xfe5e,
+  "tortoiseshellbracketrightvertical",
+  0xfe3a,
+  "totaothai",
+  0x0e15,
+  "tpalatalhook",
+  0x01ab,
+  "tparen",
+  0x24af,
+  "trademark",
+  0x2122,
+  "trademarksans",
+  0xf8ea,
+  "trademarkserif",
+  0xf6db,
+  "tretroflexhook",
+  0x0288,
+  "triagdn",
+  0x25bc,
+  "triaglf",
+  0x25c4,
+  "triagrt",
+  0x25ba,
+  "triagup",
+  0x25b2,
+  "ts",
+  0x02a6,
+  "tsadi",
+  0x05e6,
+  "tsadidagesh",
+  0xfb46,
+  "tsadidageshhebrew",
+  0xfb46,
+  "tsadihebrew",
+  0x05e6,
+  "tsecyrillic",
+  0x0446,
+  "tsere",
+  0x05b5,
+  "tsere12",
+  0x05b5,
+  "tsere1e",
+  0x05b5,
+  "tsere2b",
+  0x05b5,
+  "tserehebrew",
+  0x05b5,
+  "tserenarrowhebrew",
+  0x05b5,
+  "tserequarterhebrew",
+  0x05b5,
+  "tserewidehebrew",
+  0x05b5,
+  "tshecyrillic",
+  0x045b,
+  "tsuperior",
+  0xf6f3,
+  "ttabengali",
+  0x099f,
+  "ttadeva",
+  0x091f,
+  "ttagujarati",
+  0x0a9f,
+  "ttagurmukhi",
+  0x0a1f,
+  "tteharabic",
+  0x0679,
+  "ttehfinalarabic",
+  0xfb67,
+  "ttehinitialarabic",
+  0xfb68,
+  "ttehmedialarabic",
+  0xfb69,
+  "tthabengali",
+  0x09a0,
+  "tthadeva",
+  0x0920,
+  "tthagujarati",
+  0x0aa0,
+  "tthagurmukhi",
+  0x0a20,
+  "tturned",
+  0x0287,
+  "tuhiragana",
+  0x3064,
+  "tukatakana",
+  0x30c4,
+  "tukatakanahalfwidth",
+  0xff82,
+  "tusmallhiragana",
+  0x3063,
+  "tusmallkatakana",
+  0x30c3,
+  "tusmallkatakanahalfwidth",
+  0xff6f,
+  "twelvecircle",
+  0x246b,
+  "twelveparen",
+  0x247f,
+  "twelveperiod",
+  0x2493,
+  "twelveroman",
+  0x217b,
+  "twentycircle",
+  0x2473,
+  "twentyhangzhou",
+  0x5344,
+  "twentyparen",
+  0x2487,
+  "twentyperiod",
+  0x249b,
+  "two",
+  0x0032,
+  "twoarabic",
+  0x0662,
+  "twobengali",
+  0x09e8,
+  "twocircle",
+  0x2461,
+  "twocircleinversesansserif",
+  0x278b,
+  "twodeva",
+  0x0968,
+  "twodotenleader",
+  0x2025,
+  "twodotleader",
+  0x2025,
+  "twodotleadervertical",
+  0xfe30,
+  "twogujarati",
+  0x0ae8,
+  "twogurmukhi",
+  0x0a68,
+  "twohackarabic",
+  0x0662,
+  "twohangzhou",
+  0x3022,
+  "twoideographicparen",
+  0x3221,
+  "twoinferior",
+  0x2082,
+  "twomonospace",
+  0xff12,
+  "twonumeratorbengali",
+  0x09f5,
+  "twooldstyle",
+  0xf732,
+  "twoparen",
+  0x2475,
+  "twoperiod",
+  0x2489,
+  "twopersian",
+  0x06f2,
+  "tworoman",
+  0x2171,
+  "twostroke",
+  0x01bb,
+  "twosuperior",
+  0x00b2,
+  "twothai",
+  0x0e52,
+  "twothirds",
+  0x2154,
+  "u",
+  0x0075,
+  "uacute",
+  0x00fa,
+  "ubar",
+  0x0289,
+  "ubengali",
+  0x0989,
+  "ubopomofo",
+  0x3128,
+  "ubreve",
+  0x016d,
+  "ucaron",
+  0x01d4,
+  "ucircle",
+  0x24e4,
+  "ucircumflex",
+  0x00fb,
+  "ucircumflexbelow",
+  0x1e77,
+  "ucyrillic",
+  0x0443,
+  "udattadeva",
+  0x0951,
+  "udblacute",
+  0x0171,
+  "udblgrave",
+  0x0215,
+  "udeva",
+  0x0909,
+  "udieresis",
+  0x00fc,
+  "udieresisacute",
+  0x01d8,
+  "udieresisbelow",
+  0x1e73,
+  "udieresiscaron",
+  0x01da,
+  "udieresiscyrillic",
+  0x04f1,
+  "udieresisgrave",
+  0x01dc,
+  "udieresismacron",
+  0x01d6,
+  "udotbelow",
+  0x1ee5,
+  "ugrave",
+  0x00f9,
+  "ugujarati",
+  0x0a89,
+  "ugurmukhi",
+  0x0a09,
+  "uhiragana",
+  0x3046,
+  "uhookabove",
+  0x1ee7,
+  "uhorn",
+  0x01b0,
+  "uhornacute",
+  0x1ee9,
+  "uhorndotbelow",
+  0x1ef1,
+  "uhorngrave",
+  0x1eeb,
+  "uhornhookabove",
+  0x1eed,
+  "uhorntilde",
+  0x1eef,
+  "uhungarumlaut",
+  0x0171,
+  "uhungarumlautcyrillic",
+  0x04f3,
+  "uinvertedbreve",
+  0x0217,
+  "ukatakana",
+  0x30a6,
+  "ukatakanahalfwidth",
+  0xff73,
+  "ukcyrillic",
+  0x0479,
+  "ukorean",
+  0x315c,
+  "umacron",
+  0x016b,
+  "umacroncyrillic",
+  0x04ef,
+  "umacrondieresis",
+  0x1e7b,
+  "umatragurmukhi",
+  0x0a41,
+  "umonospace",
+  0xff55,
+  "underscore",
+  0x005f,
+  "underscoredbl",
+  0x2017,
+  "underscoremonospace",
+  0xff3f,
+  "underscorevertical",
+  0xfe33,
+  "underscorewavy",
+  0xfe4f,
+  "union",
+  0x222a,
+  "universal",
+  0x2200,
+  "uogonek",
+  0x0173,
+  "uparen",
+  0x24b0,
+  "upblock",
+  0x2580,
+  "upperdothebrew",
+  0x05c4,
+  "upsilon",
+  0x03c5,
+  "upsilondieresis",
+  0x03cb,
+  "upsilondieresistonos",
+  0x03b0,
+  "upsilonlatin",
+  0x028a,
+  "upsilontonos",
+  0x03cd,
+  "uptackbelowcmb",
+  0x031d,
+  "uptackmod",
+  0x02d4,
+  "uragurmukhi",
+  0x0a73,
+  "uring",
+  0x016f,
+  "ushortcyrillic",
+  0x045e,
+  "usmallhiragana",
+  0x3045,
+  "usmallkatakana",
+  0x30a5,
+  "usmallkatakanahalfwidth",
+  0xff69,
+  "ustraightcyrillic",
+  0x04af,
+  "ustraightstrokecyrillic",
+  0x04b1,
+  "utilde",
+  0x0169,
+  "utildeacute",
+  0x1e79,
+  "utildebelow",
+  0x1e75,
+  "uubengali",
+  0x098a,
+  "uudeva",
+  0x090a,
+  "uugujarati",
+  0x0a8a,
+  "uugurmukhi",
+  0x0a0a,
+  "uumatragurmukhi",
+  0x0a42,
+  "uuvowelsignbengali",
+  0x09c2,
+  "uuvowelsigndeva",
+  0x0942,
+  "uuvowelsigngujarati",
+  0x0ac2,
+  "uvowelsignbengali",
+  0x09c1,
+  "uvowelsigndeva",
+  0x0941,
+  "uvowelsigngujarati",
+  0x0ac1,
+  "v",
+  0x0076,
+  "vadeva",
+  0x0935,
+  "vagujarati",
+  0x0ab5,
+  "vagurmukhi",
+  0x0a35,
+  "vakatakana",
+  0x30f7,
+  "vav",
+  0x05d5,
+  "vavdagesh",
+  0xfb35,
+  "vavdagesh65",
+  0xfb35,
+  "vavdageshhebrew",
+  0xfb35,
+  "vavhebrew",
+  0x05d5,
+  "vavholam",
+  0xfb4b,
+  "vavholamhebrew",
+  0xfb4b,
+  "vavvavhebrew",
+  0x05f0,
+  "vavyodhebrew",
+  0x05f1,
+  "vcircle",
+  0x24e5,
+  "vdotbelow",
+  0x1e7f,
+  "vecyrillic",
+  0x0432,
+  "veharabic",
+  0x06a4,
+  "vehfinalarabic",
+  0xfb6b,
+  "vehinitialarabic",
+  0xfb6c,
+  "vehmedialarabic",
+  0xfb6d,
+  "vekatakana",
+  0x30f9,
+  "venus",
+  0x2640,
+  "verticalbar",
+  0x007c,
+  "verticallineabovecmb",
+  0x030d,
+  "verticallinebelowcmb",
+  0x0329,
+  "verticallinelowmod",
+  0x02cc,
+  "verticallinemod",
+  0x02c8,
+  "vewarmenian",
+  0x057e,
+  "vhook",
+  0x028b,
+  "vikatakana",
+  0x30f8,
+  "viramabengali",
+  0x09cd,
+  "viramadeva",
+  0x094d,
+  "viramagujarati",
+  0x0acd,
+  "visargabengali",
+  0x0983,
+  "visargadeva",
+  0x0903,
+  "visargagujarati",
+  0x0a83,
+  "vmonospace",
+  0xff56,
+  "voarmenian",
+  0x0578,
+  "voicediterationhiragana",
+  0x309e,
+  "voicediterationkatakana",
+  0x30fe,
+  "voicedmarkkana",
+  0x309b,
+  "voicedmarkkanahalfwidth",
+  0xff9e,
+  "vokatakana",
+  0x30fa,
+  "vparen",
+  0x24b1,
+  "vtilde",
+  0x1e7d,
+  "vturned",
+  0x028c,
+  "vuhiragana",
+  0x3094,
+  "vukatakana",
+  0x30f4,
+  "w",
+  0x0077,
+  "wacute",
+  0x1e83,
+  "waekorean",
+  0x3159,
+  "wahiragana",
+  0x308f,
+  "wakatakana",
+  0x30ef,
+  "wakatakanahalfwidth",
+  0xff9c,
+  "wakorean",
+  0x3158,
+  "wasmallhiragana",
+  0x308e,
+  "wasmallkatakana",
+  0x30ee,
+  "wattosquare",
+  0x3357,
+  "wavedash",
+  0x301c,
+  "wavyunderscorevertical",
+  0xfe34,
+  "wawarabic",
+  0x0648,
+  "wawfinalarabic",
+  0xfeee,
+  "wawhamzaabovearabic",
+  0x0624,
+  "wawhamzaabovefinalarabic",
+  0xfe86,
+  "wbsquare",
+  0x33dd,
+  "wcircle",
+  0x24e6,
+  "wcircumflex",
+  0x0175,
+  "wdieresis",
+  0x1e85,
+  "wdotaccent",
+  0x1e87,
+  "wdotbelow",
+  0x1e89,
+  "wehiragana",
+  0x3091,
+  "weierstrass",
+  0x2118,
+  "wekatakana",
+  0x30f1,
+  "wekorean",
+  0x315e,
+  "weokorean",
+  0x315d,
+  "wgrave",
+  0x1e81,
+  "whitebullet",
+  0x25e6,
+  "whitecircle",
+  0x25cb,
+  "whitecircleinverse",
+  0x25d9,
+  "whitecornerbracketleft",
+  0x300e,
+  "whitecornerbracketleftvertical",
+  0xfe43,
+  "whitecornerbracketright",
+  0x300f,
+  "whitecornerbracketrightvertical",
+  0xfe44,
+  "whitediamond",
+  0x25c7,
+  "whitediamondcontainingblacksmalldiamond",
+  0x25c8,
+  "whitedownpointingsmalltriangle",
+  0x25bf,
+  "whitedownpointingtriangle",
+  0x25bd,
+  "whiteleftpointingsmalltriangle",
+  0x25c3,
+  "whiteleftpointingtriangle",
+  0x25c1,
+  "whitelenticularbracketleft",
+  0x3016,
+  "whitelenticularbracketright",
+  0x3017,
+  "whiterightpointingsmalltriangle",
+  0x25b9,
+  "whiterightpointingtriangle",
+  0x25b7,
+  "whitesmallsquare",
+  0x25ab,
+  "whitesmilingface",
+  0x263a,
+  "whitesquare",
+  0x25a1,
+  "whitestar",
+  0x2606,
+  "whitetelephone",
+  0x260f,
+  "whitetortoiseshellbracketleft",
+  0x3018,
+  "whitetortoiseshellbracketright",
+  0x3019,
+  "whiteuppointingsmalltriangle",
+  0x25b5,
+  "whiteuppointingtriangle",
+  0x25b3,
+  "wihiragana",
+  0x3090,
+  "wikatakana",
+  0x30f0,
+  "wikorean",
+  0x315f,
+  "wmonospace",
+  0xff57,
+  "wohiragana",
+  0x3092,
+  "wokatakana",
+  0x30f2,
+  "wokatakanahalfwidth",
+  0xff66,
+  "won",
+  0x20a9,
+  "wonmonospace",
+  0xffe6,
+  "wowaenthai",
+  0x0e27,
+  "wparen",
+  0x24b2,
+  "wring",
+  0x1e98,
+  "wsuperior",
+  0x02b7,
+  "wturned",
+  0x028d,
+  "wynn",
+  0x01bf,
+  "x",
+  0x0078,
+  "xabovecmb",
+  0x033d,
+  "xbopomofo",
+  0x3112,
+  "xcircle",
+  0x24e7,
+  "xdieresis",
+  0x1e8d,
+  "xdotaccent",
+  0x1e8b,
+  "xeharmenian",
+  0x056d,
+  "xi",
+  0x03be,
+  "xmonospace",
+  0xff58,
+  "xparen",
+  0x24b3,
+  "xsuperior",
+  0x02e3,
+  "y",
+  0x0079,
+  "yaadosquare",
+  0x334e,
+  "yabengali",
+  0x09af,
+  "yacute",
+  0x00fd,
+  "yadeva",
+  0x092f,
+  "yaekorean",
+  0x3152,
+  "yagujarati",
+  0x0aaf,
+  "yagurmukhi",
+  0x0a2f,
+  "yahiragana",
+  0x3084,
+  "yakatakana",
+  0x30e4,
+  "yakatakanahalfwidth",
+  0xff94,
+  "yakorean",
+  0x3151,
+  "yamakkanthai",
+  0x0e4e,
+  "yasmallhiragana",
+  0x3083,
+  "yasmallkatakana",
+  0x30e3,
+  "yasmallkatakanahalfwidth",
+  0xff6c,
+  "yatcyrillic",
+  0x0463,
+  "ycircle",
+  0x24e8,
+  "ycircumflex",
+  0x0177,
+  "ydieresis",
+  0x00ff,
+  "ydotaccent",
+  0x1e8f,
+  "ydotbelow",
+  0x1ef5,
+  "yeharabic",
+  0x064a,
+  "yehbarreearabic",
+  0x06d2,
+  "yehbarreefinalarabic",
+  0xfbaf,
+  "yehfinalarabic",
+  0xfef2,
+  "yehhamzaabovearabic",
+  0x0626,
+  "yehhamzaabovefinalarabic",
+  0xfe8a,
+  "yehhamzaaboveinitialarabic",
+  0xfe8b,
+  "yehhamzaabovemedialarabic",
+  0xfe8c,
+  "yehinitialarabic",
+  0xfef3,
+  "yehmedialarabic",
+  0xfef4,
+  "yehmeeminitialarabic",
+  0xfcdd,
+  "yehmeemisolatedarabic",
+  0xfc58,
+  "yehnoonfinalarabic",
+  0xfc94,
+  "yehthreedotsbelowarabic",
+  0x06d1,
+  "yekorean",
+  0x3156,
+  "yen",
+  0x00a5,
+  "yenmonospace",
+  0xffe5,
+  "yeokorean",
+  0x3155,
+  "yeorinhieuhkorean",
+  0x3186,
+  "yerahbenyomohebrew",
+  0x05aa,
+  "yerahbenyomolefthebrew",
+  0x05aa,
+  "yericyrillic",
+  0x044b,
+  "yerudieresiscyrillic",
+  0x04f9,
+  "yesieungkorean",
+  0x3181,
+  "yesieungpansioskorean",
+  0x3183,
+  "yesieungsioskorean",
+  0x3182,
+  "yetivhebrew",
+  0x059a,
+  "ygrave",
+  0x1ef3,
+  "yhook",
+  0x01b4,
+  "yhookabove",
+  0x1ef7,
+  "yiarmenian",
+  0x0575,
+  "yicyrillic",
+  0x0457,
+  "yikorean",
+  0x3162,
+  "yinyang",
+  0x262f,
+  "yiwnarmenian",
+  0x0582,
+  "ymonospace",
+  0xff59,
+  "yod",
+  0x05d9,
+  "yoddagesh",
+  0xfb39,
+  "yoddageshhebrew",
+  0xfb39,
+  "yodhebrew",
+  0x05d9,
+  "yodyodhebrew",
+  0x05f2,
+  "yodyodpatahhebrew",
+  0xfb1f,
+  "yohiragana",
+  0x3088,
+  "yoikorean",
+  0x3189,
+  "yokatakana",
+  0x30e8,
+  "yokatakanahalfwidth",
+  0xff96,
+  "yokorean",
+  0x315b,
+  "yosmallhiragana",
+  0x3087,
+  "yosmallkatakana",
+  0x30e7,
+  "yosmallkatakanahalfwidth",
+  0xff6e,
+  "yotgreek",
+  0x03f3,
+  "yoyaekorean",
+  0x3188,
+  "yoyakorean",
+  0x3187,
+  "yoyakthai",
+  0x0e22,
+  "yoyingthai",
+  0x0e0d,
+  "yparen",
+  0x24b4,
+  "ypogegrammeni",
+  0x037a,
+  "ypogegrammenigreekcmb",
+  0x0345,
+  "yr",
+  0x01a6,
+  "yring",
+  0x1e99,
+  "ysuperior",
+  0x02b8,
+  "ytilde",
+  0x1ef9,
+  "yturned",
+  0x028e,
+  "yuhiragana",
+  0x3086,
+  "yuikorean",
+  0x318c,
+  "yukatakana",
+  0x30e6,
+  "yukatakanahalfwidth",
+  0xff95,
+  "yukorean",
+  0x3160,
+  "yusbigcyrillic",
+  0x046b,
+  "yusbigiotifiedcyrillic",
+  0x046d,
+  "yuslittlecyrillic",
+  0x0467,
+  "yuslittleiotifiedcyrillic",
+  0x0469,
+  "yusmallhiragana",
+  0x3085,
+  "yusmallkatakana",
+  0x30e5,
+  "yusmallkatakanahalfwidth",
+  0xff6d,
+  "yuyekorean",
+  0x318b,
+  "yuyeokorean",
+  0x318a,
+  "yyabengali",
+  0x09df,
+  "yyadeva",
+  0x095f,
+  "z",
+  0x007a,
+  "zaarmenian",
+  0x0566,
+  "zacute",
+  0x017a,
+  "zadeva",
+  0x095b,
+  "zagurmukhi",
+  0x0a5b,
+  "zaharabic",
+  0x0638,
+  "zahfinalarabic",
+  0xfec6,
+  "zahinitialarabic",
+  0xfec7,
+  "zahiragana",
+  0x3056,
+  "zahmedialarabic",
+  0xfec8,
+  "zainarabic",
+  0x0632,
+  "zainfinalarabic",
+  0xfeb0,
+  "zakatakana",
+  0x30b6,
+  "zaqefgadolhebrew",
+  0x0595,
+  "zaqefqatanhebrew",
+  0x0594,
+  "zarqahebrew",
+  0x0598,
+  "zayin",
+  0x05d6,
+  "zayindagesh",
+  0xfb36,
+  "zayindageshhebrew",
+  0xfb36,
+  "zayinhebrew",
+  0x05d6,
+  "zbopomofo",
+  0x3117,
+  "zcaron",
+  0x017e,
+  "zcircle",
+  0x24e9,
+  "zcircumflex",
+  0x1e91,
+  "zcurl",
+  0x0291,
+  "zdot",
+  0x017c,
+  "zdotaccent",
+  0x017c,
+  "zdotbelow",
+  0x1e93,
+  "zecyrillic",
+  0x0437,
+  "zedescendercyrillic",
+  0x0499,
+  "zedieresiscyrillic",
+  0x04df,
+  "zehiragana",
+  0x305c,
+  "zekatakana",
+  0x30bc,
+  "zero",
+  0x0030,
+  "zeroarabic",
+  0x0660,
+  "zerobengali",
+  0x09e6,
+  "zerodeva",
+  0x0966,
+  "zerogujarati",
+  0x0ae6,
+  "zerogurmukhi",
+  0x0a66,
+  "zerohackarabic",
+  0x0660,
+  "zeroinferior",
+  0x2080,
+  "zeromonospace",
+  0xff10,
+  "zerooldstyle",
+  0xf730,
+  "zeropersian",
+  0x06f0,
+  "zerosuperior",
+  0x2070,
+  "zerothai",
+  0x0e50,
+  "zerowidthjoiner",
+  0xfeff,
+  "zerowidthnonjoiner",
+  0x200c,
+  "zerowidthspace",
+  0x200b,
+  "zeta",
+  0x03b6,
+  "zhbopomofo",
+  0x3113,
+  "zhearmenian",
+  0x056a,
+  "zhebrevecyrillic",
+  0x04c2,
+  "zhecyrillic",
+  0x0436,
+  "zhedescendercyrillic",
+  0x0497,
+  "zhedieresiscyrillic",
+  0x04dd,
+  "zihiragana",
+  0x3058,
+  "zikatakana",
+  0x30b8,
+  "zinorhebrew",
+  0x05ae,
+  "zlinebelow",
+  0x1e95,
+  "zmonospace",
+  0xff5a,
+  "zohiragana",
+  0x305e,
+  "zokatakana",
+  0x30be,
+  "zparen",
+  0x24b5,
+  "zretroflexhook",
+  0x0290,
+  "zstroke",
+  0x01b6,
+  "zuhiragana",
+  0x305a,
+  "zukatakana",
+  0x30ba,
+  ".notdef",
+  0x0000,
+  "angbracketleftbig",
+  0x2329,
+  "angbracketleftBig",
+  0x2329,
+  "angbracketleftbigg",
+  0x2329,
+  "angbracketleftBigg",
+  0x2329,
+  "angbracketrightBig",
+  0x232a,
+  "angbracketrightbig",
+  0x232a,
+  "angbracketrightBigg",
+  0x232a,
+  "angbracketrightbigg",
+  0x232a,
+  "arrowhookleft",
+  0x21aa,
+  "arrowhookright",
+  0x21a9,
+  "arrowlefttophalf",
+  0x21bc,
+  "arrowleftbothalf",
+  0x21bd,
+  "arrownortheast",
+  0x2197,
+  "arrownorthwest",
+  0x2196,
+  "arrowrighttophalf",
+  0x21c0,
+  "arrowrightbothalf",
+  0x21c1,
+  "arrowsoutheast",
+  0x2198,
+  "arrowsouthwest",
+  0x2199,
+  "backslashbig",
+  0x2216,
+  "backslashBig",
+  0x2216,
+  "backslashBigg",
+  0x2216,
+  "backslashbigg",
+  0x2216,
+  "bardbl",
+  0x2016,
+  "bracehtipdownleft",
+  0xfe37,
+  "bracehtipdownright",
+  0xfe37,
+  "bracehtipupleft",
+  0xfe38,
+  "bracehtipupright",
+  0xfe38,
+  "braceleftBig",
+  0x007b,
+  "braceleftbig",
+  0x007b,
+  "braceleftbigg",
+  0x007b,
+  "braceleftBigg",
+  0x007b,
+  "bracerightBig",
+  0x007d,
+  "bracerightbig",
+  0x007d,
+  "bracerightbigg",
+  0x007d,
+  "bracerightBigg",
+  0x007d,
+  "bracketleftbig",
+  0x005b,
+  "bracketleftBig",
+  0x005b,
+  "bracketleftbigg",
+  0x005b,
+  "bracketleftBigg",
+  0x005b,
+  "bracketrightBig",
+  0x005d,
+  "bracketrightbig",
+  0x005d,
+  "bracketrightbigg",
+  0x005d,
+  "bracketrightBigg",
+  0x005d,
+  "ceilingleftbig",
+  0x2308,
+  "ceilingleftBig",
+  0x2308,
+  "ceilingleftBigg",
+  0x2308,
+  "ceilingleftbigg",
+  0x2308,
+  "ceilingrightbig",
+  0x2309,
+  "ceilingrightBig",
+  0x2309,
+  "ceilingrightbigg",
+  0x2309,
+  "ceilingrightBigg",
+  0x2309,
+  "circledotdisplay",
+  0x2299,
+  "circledottext",
+  0x2299,
+  "circlemultiplydisplay",
+  0x2297,
+  "circlemultiplytext",
+  0x2297,
+  "circleplusdisplay",
+  0x2295,
+  "circleplustext",
+  0x2295,
+  "contintegraldisplay",
+  0x222e,
+  "contintegraltext",
+  0x222e,
+  "coproductdisplay",
+  0x2210,
+  "coproducttext",
+  0x2210,
+  "floorleftBig",
+  0x230a,
+  "floorleftbig",
+  0x230a,
+  "floorleftbigg",
+  0x230a,
+  "floorleftBigg",
+  0x230a,
+  "floorrightbig",
+  0x230b,
+  "floorrightBig",
+  0x230b,
+  "floorrightBigg",
+  0x230b,
+  "floorrightbigg",
+  0x230b,
+  "hatwide",
+  0x0302,
+  "hatwider",
+  0x0302,
+  "hatwidest",
+  0x0302,
+  "intercal",
+  0x1d40,
+  "integraldisplay",
+  0x222b,
+  "integraltext",
+  0x222b,
+  "intersectiondisplay",
+  0x22c2,
+  "intersectiontext",
+  0x22c2,
+  "logicalanddisplay",
+  0x2227,
+  "logicalandtext",
+  0x2227,
+  "logicalordisplay",
+  0x2228,
+  "logicalortext",
+  0x2228,
+  "parenleftBig",
+  0x0028,
+  "parenleftbig",
+  0x0028,
+  "parenleftBigg",
+  0x0028,
+  "parenleftbigg",
+  0x0028,
+  "parenrightBig",
+  0x0029,
+  "parenrightbig",
+  0x0029,
+  "parenrightBigg",
+  0x0029,
+  "parenrightbigg",
+  0x0029,
+  "prime",
+  0x2032,
+  "productdisplay",
+  0x220f,
+  "producttext",
+  0x220f,
+  "radicalbig",
+  0x221a,
+  "radicalBig",
+  0x221a,
+  "radicalBigg",
+  0x221a,
+  "radicalbigg",
+  0x221a,
+  "radicalbt",
+  0x221a,
+  "radicaltp",
+  0x221a,
+  "radicalvertex",
+  0x221a,
+  "slashbig",
+  0x002f,
+  "slashBig",
+  0x002f,
+  "slashBigg",
+  0x002f,
+  "slashbigg",
+  0x002f,
+  "summationdisplay",
+  0x2211,
+  "summationtext",
+  0x2211,
+  "tildewide",
+  0x02dc,
+  "tildewider",
+  0x02dc,
+  "tildewidest",
+  0x02dc,
+  "uniondisplay",
+  0x22c3,
+  "unionmultidisplay",
+  0x228e,
+  "unionmultitext",
+  0x228e,
+  "unionsqdisplay",
+  0x2294,
+  "unionsqtext",
+  0x2294,
+  "uniontext",
+  0x22c3,
+  "vextenddouble",
+  0x2225,
+  "vextendsingle",
+  0x2223
+ ];
+});
+const getDingbatsGlyphsUnicode = (0,_core_utils_js__WEBPACK_IMPORTED_MODULE_0__.getArrayLookupTableFactory)(function () {
+ return [
+  "space",
+  0x0020,
+  "a1",
+  0x2701,
+  "a2",
+  0x2702,
+  "a202",
+  0x2703,
+  "a3",
+  0x2704,
+  "a4",
+  0x260e,
+  "a5",
+  0x2706,
+  "a119",
+  0x2707,
+  "a118",
+  0x2708,
+  "a117",
+  0x2709,
+  "a11",
+  0x261b,
+  "a12",
+  0x261e,
+  "a13",
+  0x270c,
+  "a14",
+  0x270d,
+  "a15",
+  0x270e,
+  "a16",
+  0x270f,
+  "a105",
+  0x2710,
+  "a17",
+  0x2711,
+  "a18",
+  0x2712,
+  "a19",
+  0x2713,
+  "a20",
+  0x2714,
+  "a21",
+  0x2715,
+  "a22",
+  0x2716,
+  "a23",
+  0x2717,
+  "a24",
+  0x2718,
+  "a25",
+  0x2719,
+  "a26",
+  0x271a,
+  "a27",
+  0x271b,
+  "a28",
+  0x271c,
+  "a6",
+  0x271d,
+  "a7",
+  0x271e,
+  "a8",
+  0x271f,
+  "a9",
+  0x2720,
+  "a10",
+  0x2721,
+  "a29",
+  0x2722,
+  "a30",
+  0x2723,
+  "a31",
+  0x2724,
+  "a32",
+  0x2725,
+  "a33",
+  0x2726,
+  "a34",
+  0x2727,
+  "a35",
+  0x2605,
+  "a36",
+  0x2729,
+  "a37",
+  0x272a,
+  "a38",
+  0x272b,
+  "a39",
+  0x272c,
+  "a40",
+  0x272d,
+  "a41",
+  0x272e,
+  "a42",
+  0x272f,
+  "a43",
+  0x2730,
+  "a44",
+  0x2731,
+  "a45",
+  0x2732,
+  "a46",
+  0x2733,
+  "a47",
+  0x2734,
+  "a48",
+  0x2735,
+  "a49",
+  0x2736,
+  "a50",
+  0x2737,
+  "a51",
+  0x2738,
+  "a52",
+  0x2739,
+  "a53",
+  0x273a,
+  "a54",
+  0x273b,
+  "a55",
+  0x273c,
+  "a56",
+  0x273d,
+  "a57",
+  0x273e,
+  "a58",
+  0x273f,
+  "a59",
+  0x2740,
+  "a60",
+  0x2741,
+  "a61",
+  0x2742,
+  "a62",
+  0x2743,
+  "a63",
+  0x2744,
+  "a64",
+  0x2745,
+  "a65",
+  0x2746,
+  "a66",
+  0x2747,
+  "a67",
+  0x2748,
+  "a68",
+  0x2749,
+  "a69",
+  0x274a,
+  "a70",
+  0x274b,
+  "a71",
+  0x25cf,
+  "a72",
+  0x274d,
+  "a73",
+  0x25a0,
+  "a74",
+  0x274f,
+  "a203",
+  0x2750,
+  "a75",
+  0x2751,
+  "a204",
+  0x2752,
+  "a76",
+  0x25b2,
+  "a77",
+  0x25bc,
+  "a78",
+  0x25c6,
+  "a79",
+  0x2756,
+  "a81",
+  0x25d7,
+  "a82",
+  0x2758,
+  "a83",
+  0x2759,
+  "a84",
+  0x275a,
+  "a97",
+  0x275b,
+  "a98",
+  0x275c,
+  "a99",
+  0x275d,
+  "a100",
+  0x275e,
+  "a101",
+  0x2761,
+  "a102",
+  0x2762,
+  "a103",
+  0x2763,
+  "a104",
+  0x2764,
+  "a106",
+  0x2765,
+  "a107",
+  0x2766,
+  "a108",
+  0x2767,
+  "a112",
+  0x2663,
+  "a111",
+  0x2666,
+  "a110",
+  0x2665,
+  "a109",
+  0x2660,
+  "a120",
+  0x2460,
+  "a121",
+  0x2461,
+  "a122",
+  0x2462,
+  "a123",
+  0x2463,
+  "a124",
+  0x2464,
+  "a125",
+  0x2465,
+  "a126",
+  0x2466,
+  "a127",
+  0x2467,
+  "a128",
+  0x2468,
+  "a129",
+  0x2469,
+  "a130",
+  0x2776,
+  "a131",
+  0x2777,
+  "a132",
+  0x2778,
+  "a133",
+  0x2779,
+  "a134",
+  0x277a,
+  "a135",
+  0x277b,
+  "a136",
+  0x277c,
+  "a137",
+  0x277d,
+  "a138",
+  0x277e,
+  "a139",
+  0x277f,
+  "a140",
+  0x2780,
+  "a141",
+  0x2781,
+  "a142",
+  0x2782,
+  "a143",
+  0x2783,
+  "a144",
+  0x2784,
+  "a145",
+  0x2785,
+  "a146",
+  0x2786,
+  "a147",
+  0x2787,
+  "a148",
+  0x2788,
+  "a149",
+  0x2789,
+  "a150",
+  0x278a,
+  "a151",
+  0x278b,
+  "a152",
+  0x278c,
+  "a153",
+  0x278d,
+  "a154",
+  0x278e,
+  "a155",
+  0x278f,
+  "a156",
+  0x2790,
+  "a157",
+  0x2791,
+  "a158",
+  0x2792,
+  "a159",
+  0x2793,
+  "a160",
+  0x2794,
+  "a161",
+  0x2192,
+  "a163",
+  0x2194,
+  "a164",
+  0x2195,
+  "a196",
+  0x2798,
+  "a165",
+  0x2799,
+  "a192",
+  0x279a,
+  "a166",
+  0x279b,
+  "a167",
+  0x279c,
+  "a168",
+  0x279d,
+  "a169",
+  0x279e,
+  "a170",
+  0x279f,
+  "a171",
+  0x27a0,
+  "a172",
+  0x27a1,
+  "a173",
+  0x27a2,
+  "a162",
+  0x27a3,
+  "a174",
+  0x27a4,
+  "a175",
+  0x27a5,
+  "a176",
+  0x27a6,
+  "a177",
+  0x27a7,
+  "a178",
+  0x27a8,
+  "a179",
+  0x27a9,
+  "a193",
+  0x27aa,
+  "a180",
+  0x27ab,
+  "a199",
+  0x27ac,
+  "a181",
+  0x27ad,
+  "a200",
+  0x27ae,
+  "a182",
+  0x27af,
+  "a201",
+  0x27b1,
+  "a183",
+  0x27b2,
+  "a184",
+  0x27b3,
+  "a197",
+  0x27b4,
+  "a185",
+  0x27b5,
+  "a194",
+  0x27b6,
+  "a198",
+  0x27b7,
+  "a186",
+  0x27b8,
+  "a195",
+  0x27b9,
+  "a187",
+  0x27ba,
+  "a188",
+  0x27bb,
+  "a189",
+  0x27bc,
+  "a190",
+  0x27bd,
+  "a191",
+  0x27be,
+  "a89",
+  0x2768,
+  "a90",
+  0x2769,
+  "a93",
+  0x276a,
+  "a94",
+  0x276b,
+  "a91",
+  0x276c,
+  "a92",
+  0x276d,
+  "a205",
+  0x276e,
+  "a85",
+  0x276f,
+  "a206",
+  0x2770,
+  "a86",
+  0x2771,
+  "a87",
+  0x2772,
+  "a88",
+  0x2773,
+  "a95",
+  0x2774,
+  "a96",
+  0x2775,
+  ".notdef",
+  0x0000
+ ];
+});
+
+
+/***/ }),
+/* 40 */
+/***/ ((__unused_webpack_module, __webpack_exports__, __w_pdfjs_require__) => {
+
+__w_pdfjs_require__.r(__webpack_exports__);
+/* harmony export */ __w_pdfjs_require__.d(__webpack_exports__, {
+/* harmony export */   "clearUnicodeCaches": () => (/* binding */ clearUnicodeCaches),
+/* harmony export */   "getCharUnicodeCategory": () => (/* binding */ getCharUnicodeCategory),
+/* harmony export */   "getNormalizedUnicodes": () => (/* binding */ getNormalizedUnicodes),
+/* harmony export */   "getUnicodeForGlyph": () => (/* binding */ getUnicodeForGlyph),
+/* harmony export */   "getUnicodeRangeFor": () => (/* binding */ getUnicodeRangeFor),
+/* harmony export */   "mapSpecialUnicodeValues": () => (/* binding */ mapSpecialUnicodeValues),
+/* harmony export */   "reverseIfRtl": () => (/* binding */ reverseIfRtl)
+/* harmony export */ });
+/* harmony import */ var _core_utils_js__WEBPACK_IMPORTED_MODULE_0__ = __w_pdfjs_require__(6);
+
+const getSpecialPUASymbols = (0,_core_utils_js__WEBPACK_IMPORTED_MODULE_0__.getLookupTableFactory)(function (t) {
  t[63721] = 0x00a9;
  t[63193] = 0x00a9;
  t[63720] = 0x00ae;
@@ -36669,7 +39141,7 @@ function mapSpecialUnicodeValues(code) {
  return code;
 }
 function getUnicodeForGlyph(name, glyphsUnicodeMap) {
- var unicode = glyphsUnicodeMap[name];
+ let unicode = glyphsUnicodeMap[name];
  if (unicode !== undefined) {
   return unicode;
  }
@@ -36677,7 +39149,8 @@ function getUnicodeForGlyph(name, glyphsUnicodeMap) {
   return -1;
  }
  if (name[0] === "u") {
-  var nameLen = name.length, hexStr;
+  const nameLen = name.length;
+  let hexStr;
   if (nameLen === 7 && name[1] === "n" && name[2] === "i") {
    hexStr = name.substring(3);
   } else if (nameLen >= 5 && nameLen <= 7) {
@@ -36694,7 +39167,7 @@ function getUnicodeForGlyph(name, glyphsUnicodeMap) {
  }
  return -1;
 }
-var UnicodeRanges = [
+const UnicodeRanges = [
  {
   begin: 0x0000,
   end: 0x007f
@@ -37189,8 +39662,8 @@ var UnicodeRanges = [
  }
 ];
 function getUnicodeRangeFor(value) {
- for (var i = 0, ii = UnicodeRanges.length; i < ii; i++) {
-  var range = UnicodeRanges[i];
+ for (let i = 0, ii = UnicodeRanges.length; i < ii; i++) {
+  const range = UnicodeRanges[i];
   if (value >= range.begin && value < range.end) {
    return i;
   }
@@ -37198,7 +39671,7 @@ function getUnicodeRangeFor(value) {
  return -1;
 }
 function isRTLRangeFor(value) {
- var range = UnicodeRanges[13];
+ let range = UnicodeRanges[13];
  if (value >= range.begin && value < range.end) {
   return true;
  }
@@ -37208,2074 +39681,4346 @@ function isRTLRangeFor(value) {
  }
  return false;
 }
-var getNormalizedUnicodes = getLookupTableFactory(function (t) {
- t["\u00A8"] = "\u0020\u0308";
- t["\u00AF"] = "\u0020\u0304";
- t["\u00B4"] = "\u0020\u0301";
- t["\u00B5"] = "\u03BC";
- t["\u00B8"] = "\u0020\u0327";
- t["\u0132"] = "\u0049\u004A";
- t["\u0133"] = "\u0069\u006A";
- t["\u013F"] = "\u004C\u00B7";
- t["\u0140"] = "\u006C\u00B7";
- t["\u0149"] = "\u02BC\u006E";
- t["\u017F"] = "\u0073";
- t["\u01C4"] = "\u0044\u017D";
- t["\u01C5"] = "\u0044\u017E";
- t["\u01C6"] = "\u0064\u017E";
- t["\u01C7"] = "\u004C\u004A";
- t["\u01C8"] = "\u004C\u006A";
- t["\u01C9"] = "\u006C\u006A";
- t["\u01CA"] = "\u004E\u004A";
- t["\u01CB"] = "\u004E\u006A";
- t["\u01CC"] = "\u006E\u006A";
- t["\u01F1"] = "\u0044\u005A";
- t["\u01F2"] = "\u0044\u007A";
- t["\u01F3"] = "\u0064\u007A";
- t["\u02D8"] = "\u0020\u0306";
- t["\u02D9"] = "\u0020\u0307";
- t["\u02DA"] = "\u0020\u030A";
- t["\u02DB"] = "\u0020\u0328";
- t["\u02DC"] = "\u0020\u0303";
- t["\u02DD"] = "\u0020\u030B";
- t["\u037A"] = "\u0020\u0345";
- t["\u0384"] = "\u0020\u0301";
- t["\u03D0"] = "\u03B2";
- t["\u03D1"] = "\u03B8";
- t["\u03D2"] = "\u03A5";
- t["\u03D5"] = "\u03C6";
- t["\u03D6"] = "\u03C0";
- t["\u03F0"] = "\u03BA";
- t["\u03F1"] = "\u03C1";
- t["\u03F2"] = "\u03C2";
- t["\u03F4"] = "\u0398";
- t["\u03F5"] = "\u03B5";
- t["\u03F9"] = "\u03A3";
- t["\u0587"] = "\u0565\u0582";
- t["\u0675"] = "\u0627\u0674";
- t["\u0676"] = "\u0648\u0674";
- t["\u0677"] = "\u06C7\u0674";
- t["\u0678"] = "\u064A\u0674";
- t["\u0E33"] = "\u0E4D\u0E32";
- t["\u0EB3"] = "\u0ECD\u0EB2";
- t["\u0EDC"] = "\u0EAB\u0E99";
- t["\u0EDD"] = "\u0EAB\u0EA1";
- t["\u0F77"] = "\u0FB2\u0F81";
- t["\u0F79"] = "\u0FB3\u0F81";
- t["\u1E9A"] = "\u0061\u02BE";
- t["\u1FBD"] = "\u0020\u0313";
- t["\u1FBF"] = "\u0020\u0313";
- t["\u1FC0"] = "\u0020\u0342";
- t["\u1FFE"] = "\u0020\u0314";
- t["\u2002"] = "\u0020";
- t["\u2003"] = "\u0020";
- t["\u2004"] = "\u0020";
- t["\u2005"] = "\u0020";
- t["\u2006"] = "\u0020";
- t["\u2008"] = "\u0020";
- t["\u2009"] = "\u0020";
- t["\u200A"] = "\u0020";
- t["\u2017"] = "\u0020\u0333";
- t["\u2024"] = "\u002E";
- t["\u2025"] = "\u002E\u002E";
- t["\u2026"] = "\u002E\u002E\u002E";
- t["\u2033"] = "\u2032\u2032";
- t["\u2034"] = "\u2032\u2032\u2032";
- t["\u2036"] = "\u2035\u2035";
- t["\u2037"] = "\u2035\u2035\u2035";
- t["\u203C"] = "\u0021\u0021";
- t["\u203E"] = "\u0020\u0305";
- t["\u2047"] = "\u003F\u003F";
- t["\u2048"] = "\u003F\u0021";
- t["\u2049"] = "\u0021\u003F";
- t["\u2057"] = "\u2032\u2032\u2032\u2032";
- t["\u205F"] = "\u0020";
- t["\u20A8"] = "\u0052\u0073";
- t["\u2100"] = "\u0061\u002F\u0063";
- t["\u2101"] = "\u0061\u002F\u0073";
- t["\u2103"] = "\u00B0\u0043";
- t["\u2105"] = "\u0063\u002F\u006F";
- t["\u2106"] = "\u0063\u002F\u0075";
- t["\u2107"] = "\u0190";
- t["\u2109"] = "\u00B0\u0046";
- t["\u2116"] = "\u004E\u006F";
- t["\u2121"] = "\u0054\u0045\u004C";
- t["\u2135"] = "\u05D0";
- t["\u2136"] = "\u05D1";
- t["\u2137"] = "\u05D2";
- t["\u2138"] = "\u05D3";
- t["\u213B"] = "\u0046\u0041\u0058";
- t["\u2160"] = "\u0049";
- t["\u2161"] = "\u0049\u0049";
- t["\u2162"] = "\u0049\u0049\u0049";
- t["\u2163"] = "\u0049\u0056";
- t["\u2164"] = "\u0056";
- t["\u2165"] = "\u0056\u0049";
- t["\u2166"] = "\u0056\u0049\u0049";
- t["\u2167"] = "\u0056\u0049\u0049\u0049";
- t["\u2168"] = "\u0049\u0058";
- t["\u2169"] = "\u0058";
- t["\u216A"] = "\u0058\u0049";
- t["\u216B"] = "\u0058\u0049\u0049";
- t["\u216C"] = "\u004C";
- t["\u216D"] = "\u0043";
- t["\u216E"] = "\u0044";
- t["\u216F"] = "\u004D";
- t["\u2170"] = "\u0069";
- t["\u2171"] = "\u0069\u0069";
- t["\u2172"] = "\u0069\u0069\u0069";
- t["\u2173"] = "\u0069\u0076";
- t["\u2174"] = "\u0076";
- t["\u2175"] = "\u0076\u0069";
- t["\u2176"] = "\u0076\u0069\u0069";
- t["\u2177"] = "\u0076\u0069\u0069\u0069";
- t["\u2178"] = "\u0069\u0078";
- t["\u2179"] = "\u0078";
- t["\u217A"] = "\u0078\u0069";
- t["\u217B"] = "\u0078\u0069\u0069";
- t["\u217C"] = "\u006C";
- t["\u217D"] = "\u0063";
- t["\u217E"] = "\u0064";
- t["\u217F"] = "\u006D";
- t["\u222C"] = "\u222B\u222B";
- t["\u222D"] = "\u222B\u222B\u222B";
- t["\u222F"] = "\u222E\u222E";
- t["\u2230"] = "\u222E\u222E\u222E";
- t["\u2474"] = "\u0028\u0031\u0029";
- t["\u2475"] = "\u0028\u0032\u0029";
- t["\u2476"] = "\u0028\u0033\u0029";
- t["\u2477"] = "\u0028\u0034\u0029";
- t["\u2478"] = "\u0028\u0035\u0029";
- t["\u2479"] = "\u0028\u0036\u0029";
- t["\u247A"] = "\u0028\u0037\u0029";
- t["\u247B"] = "\u0028\u0038\u0029";
- t["\u247C"] = "\u0028\u0039\u0029";
- t["\u247D"] = "\u0028\u0031\u0030\u0029";
- t["\u247E"] = "\u0028\u0031\u0031\u0029";
- t["\u247F"] = "\u0028\u0031\u0032\u0029";
- t["\u2480"] = "\u0028\u0031\u0033\u0029";
- t["\u2481"] = "\u0028\u0031\u0034\u0029";
- t["\u2482"] = "\u0028\u0031\u0035\u0029";
- t["\u2483"] = "\u0028\u0031\u0036\u0029";
- t["\u2484"] = "\u0028\u0031\u0037\u0029";
- t["\u2485"] = "\u0028\u0031\u0038\u0029";
- t["\u2486"] = "\u0028\u0031\u0039\u0029";
- t["\u2487"] = "\u0028\u0032\u0030\u0029";
- t["\u2488"] = "\u0031\u002E";
- t["\u2489"] = "\u0032\u002E";
- t["\u248A"] = "\u0033\u002E";
- t["\u248B"] = "\u0034\u002E";
- t["\u248C"] = "\u0035\u002E";
- t["\u248D"] = "\u0036\u002E";
- t["\u248E"] = "\u0037\u002E";
- t["\u248F"] = "\u0038\u002E";
- t["\u2490"] = "\u0039\u002E";
- t["\u2491"] = "\u0031\u0030\u002E";
- t["\u2492"] = "\u0031\u0031\u002E";
- t["\u2493"] = "\u0031\u0032\u002E";
- t["\u2494"] = "\u0031\u0033\u002E";
- t["\u2495"] = "\u0031\u0034\u002E";
- t["\u2496"] = "\u0031\u0035\u002E";
- t["\u2497"] = "\u0031\u0036\u002E";
- t["\u2498"] = "\u0031\u0037\u002E";
- t["\u2499"] = "\u0031\u0038\u002E";
- t["\u249A"] = "\u0031\u0039\u002E";
- t["\u249B"] = "\u0032\u0030\u002E";
- t["\u249C"] = "\u0028\u0061\u0029";
- t["\u249D"] = "\u0028\u0062\u0029";
- t["\u249E"] = "\u0028\u0063\u0029";
- t["\u249F"] = "\u0028\u0064\u0029";
- t["\u24A0"] = "\u0028\u0065\u0029";
- t["\u24A1"] = "\u0028\u0066\u0029";
- t["\u24A2"] = "\u0028\u0067\u0029";
- t["\u24A3"] = "\u0028\u0068\u0029";
- t["\u24A4"] = "\u0028\u0069\u0029";
- t["\u24A5"] = "\u0028\u006A\u0029";
- t["\u24A6"] = "\u0028\u006B\u0029";
- t["\u24A7"] = "\u0028\u006C\u0029";
- t["\u24A8"] = "\u0028\u006D\u0029";
- t["\u24A9"] = "\u0028\u006E\u0029";
- t["\u24AA"] = "\u0028\u006F\u0029";
- t["\u24AB"] = "\u0028\u0070\u0029";
- t["\u24AC"] = "\u0028\u0071\u0029";
- t["\u24AD"] = "\u0028\u0072\u0029";
- t["\u24AE"] = "\u0028\u0073\u0029";
- t["\u24AF"] = "\u0028\u0074\u0029";
- t["\u24B0"] = "\u0028\u0075\u0029";
- t["\u24B1"] = "\u0028\u0076\u0029";
- t["\u24B2"] = "\u0028\u0077\u0029";
- t["\u24B3"] = "\u0028\u0078\u0029";
- t["\u24B4"] = "\u0028\u0079\u0029";
- t["\u24B5"] = "\u0028\u007A\u0029";
- t["\u2A0C"] = "\u222B\u222B\u222B\u222B";
- t["\u2A74"] = "\u003A\u003A\u003D";
- t["\u2A75"] = "\u003D\u003D";
- t["\u2A76"] = "\u003D\u003D\u003D";
- t["\u2E9F"] = "\u6BCD";
- t["\u2EF3"] = "\u9F9F";
- t["\u2F00"] = "\u4E00";
- t["\u2F01"] = "\u4E28";
- t["\u2F02"] = "\u4E36";
- t["\u2F03"] = "\u4E3F";
- t["\u2F04"] = "\u4E59";
- t["\u2F05"] = "\u4E85";
- t["\u2F06"] = "\u4E8C";
- t["\u2F07"] = "\u4EA0";
- t["\u2F08"] = "\u4EBA";
- t["\u2F09"] = "\u513F";
- t["\u2F0A"] = "\u5165";
- t["\u2F0B"] = "\u516B";
- t["\u2F0C"] = "\u5182";
- t["\u2F0D"] = "\u5196";
- t["\u2F0E"] = "\u51AB";
- t["\u2F0F"] = "\u51E0";
- t["\u2F10"] = "\u51F5";
- t["\u2F11"] = "\u5200";
- t["\u2F12"] = "\u529B";
- t["\u2F13"] = "\u52F9";
- t["\u2F14"] = "\u5315";
- t["\u2F15"] = "\u531A";
- t["\u2F16"] = "\u5338";
- t["\u2F17"] = "\u5341";
- t["\u2F18"] = "\u535C";
- t["\u2F19"] = "\u5369";
- t["\u2F1A"] = "\u5382";
- t["\u2F1B"] = "\u53B6";
- t["\u2F1C"] = "\u53C8";
- t["\u2F1D"] = "\u53E3";
- t["\u2F1E"] = "\u56D7";
- t["\u2F1F"] = "\u571F";
- t["\u2F20"] = "\u58EB";
- t["\u2F21"] = "\u5902";
- t["\u2F22"] = "\u590A";
- t["\u2F23"] = "\u5915";
- t["\u2F24"] = "\u5927";
- t["\u2F25"] = "\u5973";
- t["\u2F26"] = "\u5B50";
- t["\u2F27"] = "\u5B80";
- t["\u2F28"] = "\u5BF8";
- t["\u2F29"] = "\u5C0F";
- t["\u2F2A"] = "\u5C22";
- t["\u2F2B"] = "\u5C38";
- t["\u2F2C"] = "\u5C6E";
- t["\u2F2D"] = "\u5C71";
- t["\u2F2E"] = "\u5DDB";
- t["\u2F2F"] = "\u5DE5";
- t["\u2F30"] = "\u5DF1";
- t["\u2F31"] = "\u5DFE";
- t["\u2F32"] = "\u5E72";
- t["\u2F33"] = "\u5E7A";
- t["\u2F34"] = "\u5E7F";
- t["\u2F35"] = "\u5EF4";
- t["\u2F36"] = "\u5EFE";
- t["\u2F37"] = "\u5F0B";
- t["\u2F38"] = "\u5F13";
- t["\u2F39"] = "\u5F50";
- t["\u2F3A"] = "\u5F61";
- t["\u2F3B"] = "\u5F73";
- t["\u2F3C"] = "\u5FC3";
- t["\u2F3D"] = "\u6208";
- t["\u2F3E"] = "\u6236";
- t["\u2F3F"] = "\u624B";
- t["\u2F40"] = "\u652F";
- t["\u2F41"] = "\u6534";
- t["\u2F42"] = "\u6587";
- t["\u2F43"] = "\u6597";
- t["\u2F44"] = "\u65A4";
- t["\u2F45"] = "\u65B9";
- t["\u2F46"] = "\u65E0";
- t["\u2F47"] = "\u65E5";
- t["\u2F48"] = "\u66F0";
- t["\u2F49"] = "\u6708";
- t["\u2F4A"] = "\u6728";
- t["\u2F4B"] = "\u6B20";
- t["\u2F4C"] = "\u6B62";
- t["\u2F4D"] = "\u6B79";
- t["\u2F4E"] = "\u6BB3";
- t["\u2F4F"] = "\u6BCB";
- t["\u2F50"] = "\u6BD4";
- t["\u2F51"] = "\u6BDB";
- t["\u2F52"] = "\u6C0F";
- t["\u2F53"] = "\u6C14";
- t["\u2F54"] = "\u6C34";
- t["\u2F55"] = "\u706B";
- t["\u2F56"] = "\u722A";
- t["\u2F57"] = "\u7236";
- t["\u2F58"] = "\u723B";
- t["\u2F59"] = "\u723F";
- t["\u2F5A"] = "\u7247";
- t["\u2F5B"] = "\u7259";
- t["\u2F5C"] = "\u725B";
- t["\u2F5D"] = "\u72AC";
- t["\u2F5E"] = "\u7384";
- t["\u2F5F"] = "\u7389";
- t["\u2F60"] = "\u74DC";
- t["\u2F61"] = "\u74E6";
- t["\u2F62"] = "\u7518";
- t["\u2F63"] = "\u751F";
- t["\u2F64"] = "\u7528";
- t["\u2F65"] = "\u7530";
- t["\u2F66"] = "\u758B";
- t["\u2F67"] = "\u7592";
- t["\u2F68"] = "\u7676";
- t["\u2F69"] = "\u767D";
- t["\u2F6A"] = "\u76AE";
- t["\u2F6B"] = "\u76BF";
- t["\u2F6C"] = "\u76EE";
- t["\u2F6D"] = "\u77DB";
- t["\u2F6E"] = "\u77E2";
- t["\u2F6F"] = "\u77F3";
- t["\u2F70"] = "\u793A";
- t["\u2F71"] = "\u79B8";
- t["\u2F72"] = "\u79BE";
- t["\u2F73"] = "\u7A74";
- t["\u2F74"] = "\u7ACB";
- t["\u2F75"] = "\u7AF9";
- t["\u2F76"] = "\u7C73";
- t["\u2F77"] = "\u7CF8";
- t["\u2F78"] = "\u7F36";
- t["\u2F79"] = "\u7F51";
- t["\u2F7A"] = "\u7F8A";
- t["\u2F7B"] = "\u7FBD";
- t["\u2F7C"] = "\u8001";
- t["\u2F7D"] = "\u800C";
- t["\u2F7E"] = "\u8012";
- t["\u2F7F"] = "\u8033";
- t["\u2F80"] = "\u807F";
- t["\u2F81"] = "\u8089";
- t["\u2F82"] = "\u81E3";
- t["\u2F83"] = "\u81EA";
- t["\u2F84"] = "\u81F3";
- t["\u2F85"] = "\u81FC";
- t["\u2F86"] = "\u820C";
- t["\u2F87"] = "\u821B";
- t["\u2F88"] = "\u821F";
- t["\u2F89"] = "\u826E";
- t["\u2F8A"] = "\u8272";
- t["\u2F8B"] = "\u8278";
- t["\u2F8C"] = "\u864D";
- t["\u2F8D"] = "\u866B";
- t["\u2F8E"] = "\u8840";
- t["\u2F8F"] = "\u884C";
- t["\u2F90"] = "\u8863";
- t["\u2F91"] = "\u897E";
- t["\u2F92"] = "\u898B";
- t["\u2F93"] = "\u89D2";
- t["\u2F94"] = "\u8A00";
- t["\u2F95"] = "\u8C37";
- t["\u2F96"] = "\u8C46";
- t["\u2F97"] = "\u8C55";
- t["\u2F98"] = "\u8C78";
- t["\u2F99"] = "\u8C9D";
- t["\u2F9A"] = "\u8D64";
- t["\u2F9B"] = "\u8D70";
- t["\u2F9C"] = "\u8DB3";
- t["\u2F9D"] = "\u8EAB";
- t["\u2F9E"] = "\u8ECA";
- t["\u2F9F"] = "\u8F9B";
- t["\u2FA0"] = "\u8FB0";
- t["\u2FA1"] = "\u8FB5";
- t["\u2FA2"] = "\u9091";
- t["\u2FA3"] = "\u9149";
- t["\u2FA4"] = "\u91C6";
- t["\u2FA5"] = "\u91CC";
- t["\u2FA6"] = "\u91D1";
- t["\u2FA7"] = "\u9577";
- t["\u2FA8"] = "\u9580";
- t["\u2FA9"] = "\u961C";
- t["\u2FAA"] = "\u96B6";
- t["\u2FAB"] = "\u96B9";
- t["\u2FAC"] = "\u96E8";
- t["\u2FAD"] = "\u9751";
- t["\u2FAE"] = "\u975E";
- t["\u2FAF"] = "\u9762";
- t["\u2FB0"] = "\u9769";
- t["\u2FB1"] = "\u97CB";
- t["\u2FB2"] = "\u97ED";
- t["\u2FB3"] = "\u97F3";
- t["\u2FB4"] = "\u9801";
- t["\u2FB5"] = "\u98A8";
- t["\u2FB6"] = "\u98DB";
- t["\u2FB7"] = "\u98DF";
- t["\u2FB8"] = "\u9996";
- t["\u2FB9"] = "\u9999";
- t["\u2FBA"] = "\u99AC";
- t["\u2FBB"] = "\u9AA8";
- t["\u2FBC"] = "\u9AD8";
- t["\u2FBD"] = "\u9ADF";
- t["\u2FBE"] = "\u9B25";
- t["\u2FBF"] = "\u9B2F";
- t["\u2FC0"] = "\u9B32";
- t["\u2FC1"] = "\u9B3C";
- t["\u2FC2"] = "\u9B5A";
- t["\u2FC3"] = "\u9CE5";
- t["\u2FC4"] = "\u9E75";
- t["\u2FC5"] = "\u9E7F";
- t["\u2FC6"] = "\u9EA5";
- t["\u2FC7"] = "\u9EBB";
- t["\u2FC8"] = "\u9EC3";
- t["\u2FC9"] = "\u9ECD";
- t["\u2FCA"] = "\u9ED1";
- t["\u2FCB"] = "\u9EF9";
- t["\u2FCC"] = "\u9EFD";
- t["\u2FCD"] = "\u9F0E";
- t["\u2FCE"] = "\u9F13";
- t["\u2FCF"] = "\u9F20";
- t["\u2FD0"] = "\u9F3B";
- t["\u2FD1"] = "\u9F4A";
- t["\u2FD2"] = "\u9F52";
- t["\u2FD3"] = "\u9F8D";
- t["\u2FD4"] = "\u9F9C";
- t["\u2FD5"] = "\u9FA0";
- t["\u3036"] = "\u3012";
- t["\u3038"] = "\u5341";
- t["\u3039"] = "\u5344";
- t["\u303A"] = "\u5345";
- t["\u309B"] = "\u0020\u3099";
- t["\u309C"] = "\u0020\u309A";
- t["\u3131"] = "\u1100";
- t["\u3132"] = "\u1101";
- t["\u3133"] = "\u11AA";
- t["\u3134"] = "\u1102";
- t["\u3135"] = "\u11AC";
- t["\u3136"] = "\u11AD";
- t["\u3137"] = "\u1103";
- t["\u3138"] = "\u1104";
- t["\u3139"] = "\u1105";
- t["\u313A"] = "\u11B0";
- t["\u313B"] = "\u11B1";
- t["\u313C"] = "\u11B2";
- t["\u313D"] = "\u11B3";
- t["\u313E"] = "\u11B4";
- t["\u313F"] = "\u11B5";
- t["\u3140"] = "\u111A";
- t["\u3141"] = "\u1106";
- t["\u3142"] = "\u1107";
- t["\u3143"] = "\u1108";
- t["\u3144"] = "\u1121";
- t["\u3145"] = "\u1109";
- t["\u3146"] = "\u110A";
- t["\u3147"] = "\u110B";
- t["\u3148"] = "\u110C";
- t["\u3149"] = "\u110D";
- t["\u314A"] = "\u110E";
- t["\u314B"] = "\u110F";
- t["\u314C"] = "\u1110";
- t["\u314D"] = "\u1111";
- t["\u314E"] = "\u1112";
- t["\u314F"] = "\u1161";
- t["\u3150"] = "\u1162";
- t["\u3151"] = "\u1163";
- t["\u3152"] = "\u1164";
- t["\u3153"] = "\u1165";
- t["\u3154"] = "\u1166";
- t["\u3155"] = "\u1167";
- t["\u3156"] = "\u1168";
- t["\u3157"] = "\u1169";
- t["\u3158"] = "\u116A";
- t["\u3159"] = "\u116B";
- t["\u315A"] = "\u116C";
- t["\u315B"] = "\u116D";
- t["\u315C"] = "\u116E";
- t["\u315D"] = "\u116F";
- t["\u315E"] = "\u1170";
- t["\u315F"] = "\u1171";
- t["\u3160"] = "\u1172";
- t["\u3161"] = "\u1173";
- t["\u3162"] = "\u1174";
- t["\u3163"] = "\u1175";
- t["\u3164"] = "\u1160";
- t["\u3165"] = "\u1114";
- t["\u3166"] = "\u1115";
- t["\u3167"] = "\u11C7";
- t["\u3168"] = "\u11C8";
- t["\u3169"] = "\u11CC";
- t["\u316A"] = "\u11CE";
- t["\u316B"] = "\u11D3";
- t["\u316C"] = "\u11D7";
- t["\u316D"] = "\u11D9";
- t["\u316E"] = "\u111C";
- t["\u316F"] = "\u11DD";
- t["\u3170"] = "\u11DF";
- t["\u3171"] = "\u111D";
- t["\u3172"] = "\u111E";
- t["\u3173"] = "\u1120";
- t["\u3174"] = "\u1122";
- t["\u3175"] = "\u1123";
- t["\u3176"] = "\u1127";
- t["\u3177"] = "\u1129";
- t["\u3178"] = "\u112B";
- t["\u3179"] = "\u112C";
- t["\u317A"] = "\u112D";
- t["\u317B"] = "\u112E";
- t["\u317C"] = "\u112F";
- t["\u317D"] = "\u1132";
- t["\u317E"] = "\u1136";
- t["\u317F"] = "\u1140";
- t["\u3180"] = "\u1147";
- t["\u3181"] = "\u114C";
- t["\u3182"] = "\u11F1";
- t["\u3183"] = "\u11F2";
- t["\u3184"] = "\u1157";
- t["\u3185"] = "\u1158";
- t["\u3186"] = "\u1159";
- t["\u3187"] = "\u1184";
- t["\u3188"] = "\u1185";
- t["\u3189"] = "\u1188";
- t["\u318A"] = "\u1191";
- t["\u318B"] = "\u1192";
- t["\u318C"] = "\u1194";
- t["\u318D"] = "\u119E";
- t["\u318E"] = "\u11A1";
- t["\u3200"] = "\u0028\u1100\u0029";
- t["\u3201"] = "\u0028\u1102\u0029";
- t["\u3202"] = "\u0028\u1103\u0029";
- t["\u3203"] = "\u0028\u1105\u0029";
- t["\u3204"] = "\u0028\u1106\u0029";
- t["\u3205"] = "\u0028\u1107\u0029";
- t["\u3206"] = "\u0028\u1109\u0029";
- t["\u3207"] = "\u0028\u110B\u0029";
- t["\u3208"] = "\u0028\u110C\u0029";
- t["\u3209"] = "\u0028\u110E\u0029";
- t["\u320A"] = "\u0028\u110F\u0029";
- t["\u320B"] = "\u0028\u1110\u0029";
- t["\u320C"] = "\u0028\u1111\u0029";
- t["\u320D"] = "\u0028\u1112\u0029";
- t["\u320E"] = "\u0028\u1100\u1161\u0029";
- t["\u320F"] = "\u0028\u1102\u1161\u0029";
- t["\u3210"] = "\u0028\u1103\u1161\u0029";
- t["\u3211"] = "\u0028\u1105\u1161\u0029";
- t["\u3212"] = "\u0028\u1106\u1161\u0029";
- t["\u3213"] = "\u0028\u1107\u1161\u0029";
- t["\u3214"] = "\u0028\u1109\u1161\u0029";
- t["\u3215"] = "\u0028\u110B\u1161\u0029";
- t["\u3216"] = "\u0028\u110C\u1161\u0029";
- t["\u3217"] = "\u0028\u110E\u1161\u0029";
- t["\u3218"] = "\u0028\u110F\u1161\u0029";
- t["\u3219"] = "\u0028\u1110\u1161\u0029";
- t["\u321A"] = "\u0028\u1111\u1161\u0029";
- t["\u321B"] = "\u0028\u1112\u1161\u0029";
- t["\u321C"] = "\u0028\u110C\u116E\u0029";
- t["\u321D"] = "\u0028\u110B\u1169\u110C\u1165\u11AB\u0029";
- t["\u321E"] = "\u0028\u110B\u1169\u1112\u116E\u0029";
- t["\u3220"] = "\u0028\u4E00\u0029";
- t["\u3221"] = "\u0028\u4E8C\u0029";
- t["\u3222"] = "\u0028\u4E09\u0029";
- t["\u3223"] = "\u0028\u56DB\u0029";
- t["\u3224"] = "\u0028\u4E94\u0029";
- t["\u3225"] = "\u0028\u516D\u0029";
- t["\u3226"] = "\u0028\u4E03\u0029";
- t["\u3227"] = "\u0028\u516B\u0029";
- t["\u3228"] = "\u0028\u4E5D\u0029";
- t["\u3229"] = "\u0028\u5341\u0029";
- t["\u322A"] = "\u0028\u6708\u0029";
- t["\u322B"] = "\u0028\u706B\u0029";
- t["\u322C"] = "\u0028\u6C34\u0029";
- t["\u322D"] = "\u0028\u6728\u0029";
- t["\u322E"] = "\u0028\u91D1\u0029";
- t["\u322F"] = "\u0028\u571F\u0029";
- t["\u3230"] = "\u0028\u65E5\u0029";
- t["\u3231"] = "\u0028\u682A\u0029";
- t["\u3232"] = "\u0028\u6709\u0029";
- t["\u3233"] = "\u0028\u793E\u0029";
- t["\u3234"] = "\u0028\u540D\u0029";
- t["\u3235"] = "\u0028\u7279\u0029";
- t["\u3236"] = "\u0028\u8CA1\u0029";
- t["\u3237"] = "\u0028\u795D\u0029";
- t["\u3238"] = "\u0028\u52B4\u0029";
- t["\u3239"] = "\u0028\u4EE3\u0029";
- t["\u323A"] = "\u0028\u547C\u0029";
- t["\u323B"] = "\u0028\u5B66\u0029";
- t["\u323C"] = "\u0028\u76E3\u0029";
- t["\u323D"] = "\u0028\u4F01\u0029";
- t["\u323E"] = "\u0028\u8CC7\u0029";
- t["\u323F"] = "\u0028\u5354\u0029";
- t["\u3240"] = "\u0028\u796D\u0029";
- t["\u3241"] = "\u0028\u4F11\u0029";
- t["\u3242"] = "\u0028\u81EA\u0029";
- t["\u3243"] = "\u0028\u81F3\u0029";
- t["\u32C0"] = "\u0031\u6708";
- t["\u32C1"] = "\u0032\u6708";
- t["\u32C2"] = "\u0033\u6708";
- t["\u32C3"] = "\u0034\u6708";
- t["\u32C4"] = "\u0035\u6708";
- t["\u32C5"] = "\u0036\u6708";
- t["\u32C6"] = "\u0037\u6708";
- t["\u32C7"] = "\u0038\u6708";
- t["\u32C8"] = "\u0039\u6708";
- t["\u32C9"] = "\u0031\u0030\u6708";
- t["\u32CA"] = "\u0031\u0031\u6708";
- t["\u32CB"] = "\u0031\u0032\u6708";
- t["\u3358"] = "\u0030\u70B9";
- t["\u3359"] = "\u0031\u70B9";
- t["\u335A"] = "\u0032\u70B9";
- t["\u335B"] = "\u0033\u70B9";
- t["\u335C"] = "\u0034\u70B9";
- t["\u335D"] = "\u0035\u70B9";
- t["\u335E"] = "\u0036\u70B9";
- t["\u335F"] = "\u0037\u70B9";
- t["\u3360"] = "\u0038\u70B9";
- t["\u3361"] = "\u0039\u70B9";
- t["\u3362"] = "\u0031\u0030\u70B9";
- t["\u3363"] = "\u0031\u0031\u70B9";
- t["\u3364"] = "\u0031\u0032\u70B9";
- t["\u3365"] = "\u0031\u0033\u70B9";
- t["\u3366"] = "\u0031\u0034\u70B9";
- t["\u3367"] = "\u0031\u0035\u70B9";
- t["\u3368"] = "\u0031\u0036\u70B9";
- t["\u3369"] = "\u0031\u0037\u70B9";
- t["\u336A"] = "\u0031\u0038\u70B9";
- t["\u336B"] = "\u0031\u0039\u70B9";
- t["\u336C"] = "\u0032\u0030\u70B9";
- t["\u336D"] = "\u0032\u0031\u70B9";
- t["\u336E"] = "\u0032\u0032\u70B9";
- t["\u336F"] = "\u0032\u0033\u70B9";
- t["\u3370"] = "\u0032\u0034\u70B9";
- t["\u33E0"] = "\u0031\u65E5";
- t["\u33E1"] = "\u0032\u65E5";
- t["\u33E2"] = "\u0033\u65E5";
- t["\u33E3"] = "\u0034\u65E5";
- t["\u33E4"] = "\u0035\u65E5";
- t["\u33E5"] = "\u0036\u65E5";
- t["\u33E6"] = "\u0037\u65E5";
- t["\u33E7"] = "\u0038\u65E5";
- t["\u33E8"] = "\u0039\u65E5";
- t["\u33E9"] = "\u0031\u0030\u65E5";
- t["\u33EA"] = "\u0031\u0031\u65E5";
- t["\u33EB"] = "\u0031\u0032\u65E5";
- t["\u33EC"] = "\u0031\u0033\u65E5";
- t["\u33ED"] = "\u0031\u0034\u65E5";
- t["\u33EE"] = "\u0031\u0035\u65E5";
- t["\u33EF"] = "\u0031\u0036\u65E5";
- t["\u33F0"] = "\u0031\u0037\u65E5";
- t["\u33F1"] = "\u0031\u0038\u65E5";
- t["\u33F2"] = "\u0031\u0039\u65E5";
- t["\u33F3"] = "\u0032\u0030\u65E5";
- t["\u33F4"] = "\u0032\u0031\u65E5";
- t["\u33F5"] = "\u0032\u0032\u65E5";
- t["\u33F6"] = "\u0032\u0033\u65E5";
- t["\u33F7"] = "\u0032\u0034\u65E5";
- t["\u33F8"] = "\u0032\u0035\u65E5";
- t["\u33F9"] = "\u0032\u0036\u65E5";
- t["\u33FA"] = "\u0032\u0037\u65E5";
- t["\u33FB"] = "\u0032\u0038\u65E5";
- t["\u33FC"] = "\u0032\u0039\u65E5";
- t["\u33FD"] = "\u0033\u0030\u65E5";
- t["\u33FE"] = "\u0033\u0031\u65E5";
- t["\uFB00"] = "\u0066\u0066";
- t["\uFB01"] = "\u0066\u0069";
- t["\uFB02"] = "\u0066\u006C";
- t["\uFB03"] = "\u0066\u0066\u0069";
- t["\uFB04"] = "\u0066\u0066\u006C";
- t["\uFB05"] = "\u017F\u0074";
- t["\uFB06"] = "\u0073\u0074";
- t["\uFB13"] = "\u0574\u0576";
- t["\uFB14"] = "\u0574\u0565";
- t["\uFB15"] = "\u0574\u056B";
- t["\uFB16"] = "\u057E\u0576";
- t["\uFB17"] = "\u0574\u056D";
- t["\uFB4F"] = "\u05D0\u05DC";
- t["\uFB50"] = "\u0671";
- t["\uFB51"] = "\u0671";
- t["\uFB52"] = "\u067B";
- t["\uFB53"] = "\u067B";
- t["\uFB54"] = "\u067B";
- t["\uFB55"] = "\u067B";
- t["\uFB56"] = "\u067E";
- t["\uFB57"] = "\u067E";
- t["\uFB58"] = "\u067E";
- t["\uFB59"] = "\u067E";
- t["\uFB5A"] = "\u0680";
- t["\uFB5B"] = "\u0680";
- t["\uFB5C"] = "\u0680";
- t["\uFB5D"] = "\u0680";
- t["\uFB5E"] = "\u067A";
- t["\uFB5F"] = "\u067A";
- t["\uFB60"] = "\u067A";
- t["\uFB61"] = "\u067A";
- t["\uFB62"] = "\u067F";
- t["\uFB63"] = "\u067F";
- t["\uFB64"] = "\u067F";
- t["\uFB65"] = "\u067F";
- t["\uFB66"] = "\u0679";
- t["\uFB67"] = "\u0679";
- t["\uFB68"] = "\u0679";
- t["\uFB69"] = "\u0679";
- t["\uFB6A"] = "\u06A4";
- t["\uFB6B"] = "\u06A4";
- t["\uFB6C"] = "\u06A4";
- t["\uFB6D"] = "\u06A4";
- t["\uFB6E"] = "\u06A6";
- t["\uFB6F"] = "\u06A6";
- t["\uFB70"] = "\u06A6";
- t["\uFB71"] = "\u06A6";
- t["\uFB72"] = "\u0684";
- t["\uFB73"] = "\u0684";
- t["\uFB74"] = "\u0684";
- t["\uFB75"] = "\u0684";
- t["\uFB76"] = "\u0683";
- t["\uFB77"] = "\u0683";
- t["\uFB78"] = "\u0683";
- t["\uFB79"] = "\u0683";
- t["\uFB7A"] = "\u0686";
- t["\uFB7B"] = "\u0686";
- t["\uFB7C"] = "\u0686";
- t["\uFB7D"] = "\u0686";
- t["\uFB7E"] = "\u0687";
- t["\uFB7F"] = "\u0687";
- t["\uFB80"] = "\u0687";
- t["\uFB81"] = "\u0687";
- t["\uFB82"] = "\u068D";
- t["\uFB83"] = "\u068D";
- t["\uFB84"] = "\u068C";
- t["\uFB85"] = "\u068C";
- t["\uFB86"] = "\u068E";
- t["\uFB87"] = "\u068E";
- t["\uFB88"] = "\u0688";
- t["\uFB89"] = "\u0688";
- t["\uFB8A"] = "\u0698";
- t["\uFB8B"] = "\u0698";
- t["\uFB8C"] = "\u0691";
- t["\uFB8D"] = "\u0691";
- t["\uFB8E"] = "\u06A9";
- t["\uFB8F"] = "\u06A9";
- t["\uFB90"] = "\u06A9";
- t["\uFB91"] = "\u06A9";
- t["\uFB92"] = "\u06AF";
- t["\uFB93"] = "\u06AF";
- t["\uFB94"] = "\u06AF";
- t["\uFB95"] = "\u06AF";
- t["\uFB96"] = "\u06B3";
- t["\uFB97"] = "\u06B3";
- t["\uFB98"] = "\u06B3";
- t["\uFB99"] = "\u06B3";
- t["\uFB9A"] = "\u06B1";
- t["\uFB9B"] = "\u06B1";
- t["\uFB9C"] = "\u06B1";
- t["\uFB9D"] = "\u06B1";
- t["\uFB9E"] = "\u06BA";
- t["\uFB9F"] = "\u06BA";
- t["\uFBA0"] = "\u06BB";
- t["\uFBA1"] = "\u06BB";
- t["\uFBA2"] = "\u06BB";
- t["\uFBA3"] = "\u06BB";
- t["\uFBA4"] = "\u06C0";
- t["\uFBA5"] = "\u06C0";
- t["\uFBA6"] = "\u06C1";
- t["\uFBA7"] = "\u06C1";
- t["\uFBA8"] = "\u06C1";
- t["\uFBA9"] = "\u06C1";
- t["\uFBAA"] = "\u06BE";
- t["\uFBAB"] = "\u06BE";
- t["\uFBAC"] = "\u06BE";
- t["\uFBAD"] = "\u06BE";
- t["\uFBAE"] = "\u06D2";
- t["\uFBAF"] = "\u06D2";
- t["\uFBB0"] = "\u06D3";
- t["\uFBB1"] = "\u06D3";
- t["\uFBD3"] = "\u06AD";
- t["\uFBD4"] = "\u06AD";
- t["\uFBD5"] = "\u06AD";
- t["\uFBD6"] = "\u06AD";
- t["\uFBD7"] = "\u06C7";
- t["\uFBD8"] = "\u06C7";
- t["\uFBD9"] = "\u06C6";
- t["\uFBDA"] = "\u06C6";
- t["\uFBDB"] = "\u06C8";
- t["\uFBDC"] = "\u06C8";
- t["\uFBDD"] = "\u0677";
- t["\uFBDE"] = "\u06CB";
- t["\uFBDF"] = "\u06CB";
- t["\uFBE0"] = "\u06C5";
- t["\uFBE1"] = "\u06C5";
- t["\uFBE2"] = "\u06C9";
- t["\uFBE3"] = "\u06C9";
- t["\uFBE4"] = "\u06D0";
- t["\uFBE5"] = "\u06D0";
- t["\uFBE6"] = "\u06D0";
- t["\uFBE7"] = "\u06D0";
- t["\uFBE8"] = "\u0649";
- t["\uFBE9"] = "\u0649";
- t["\uFBEA"] = "\u0626\u0627";
- t["\uFBEB"] = "\u0626\u0627";
- t["\uFBEC"] = "\u0626\u06D5";
- t["\uFBED"] = "\u0626\u06D5";
- t["\uFBEE"] = "\u0626\u0648";
- t["\uFBEF"] = "\u0626\u0648";
- t["\uFBF0"] = "\u0626\u06C7";
- t["\uFBF1"] = "\u0626\u06C7";
- t["\uFBF2"] = "\u0626\u06C6";
- t["\uFBF3"] = "\u0626\u06C6";
- t["\uFBF4"] = "\u0626\u06C8";
- t["\uFBF5"] = "\u0626\u06C8";
- t["\uFBF6"] = "\u0626\u06D0";
- t["\uFBF7"] = "\u0626\u06D0";
- t["\uFBF8"] = "\u0626\u06D0";
- t["\uFBF9"] = "\u0626\u0649";
- t["\uFBFA"] = "\u0626\u0649";
- t["\uFBFB"] = "\u0626\u0649";
- t["\uFBFC"] = "\u06CC";
- t["\uFBFD"] = "\u06CC";
- t["\uFBFE"] = "\u06CC";
- t["\uFBFF"] = "\u06CC";
- t["\uFC00"] = "\u0626\u062C";
- t["\uFC01"] = "\u0626\u062D";
- t["\uFC02"] = "\u0626\u0645";
- t["\uFC03"] = "\u0626\u0649";
- t["\uFC04"] = "\u0626\u064A";
- t["\uFC05"] = "\u0628\u062C";
- t["\uFC06"] = "\u0628\u062D";
- t["\uFC07"] = "\u0628\u062E";
- t["\uFC08"] = "\u0628\u0645";
- t["\uFC09"] = "\u0628\u0649";
- t["\uFC0A"] = "\u0628\u064A";
- t["\uFC0B"] = "\u062A\u062C";
- t["\uFC0C"] = "\u062A\u062D";
- t["\uFC0D"] = "\u062A\u062E";
- t["\uFC0E"] = "\u062A\u0645";
- t["\uFC0F"] = "\u062A\u0649";
- t["\uFC10"] = "\u062A\u064A";
- t["\uFC11"] = "\u062B\u062C";
- t["\uFC12"] = "\u062B\u0645";
- t["\uFC13"] = "\u062B\u0649";
- t["\uFC14"] = "\u062B\u064A";
- t["\uFC15"] = "\u062C\u062D";
- t["\uFC16"] = "\u062C\u0645";
- t["\uFC17"] = "\u062D\u062C";
- t["\uFC18"] = "\u062D\u0645";
- t["\uFC19"] = "\u062E\u062C";
- t["\uFC1A"] = "\u062E\u062D";
- t["\uFC1B"] = "\u062E\u0645";
- t["\uFC1C"] = "\u0633\u062C";
- t["\uFC1D"] = "\u0633\u062D";
- t["\uFC1E"] = "\u0633\u062E";
- t["\uFC1F"] = "\u0633\u0645";
- t["\uFC20"] = "\u0635\u062D";
- t["\uFC21"] = "\u0635\u0645";
- t["\uFC22"] = "\u0636\u062C";
- t["\uFC23"] = "\u0636\u062D";
- t["\uFC24"] = "\u0636\u062E";
- t["\uFC25"] = "\u0636\u0645";
- t["\uFC26"] = "\u0637\u062D";
- t["\uFC27"] = "\u0637\u0645";
- t["\uFC28"] = "\u0638\u0645";
- t["\uFC29"] = "\u0639\u062C";
- t["\uFC2A"] = "\u0639\u0645";
- t["\uFC2B"] = "\u063A\u062C";
- t["\uFC2C"] = "\u063A\u0645";
- t["\uFC2D"] = "\u0641\u062C";
- t["\uFC2E"] = "\u0641\u062D";
- t["\uFC2F"] = "\u0641\u062E";
- t["\uFC30"] = "\u0641\u0645";
- t["\uFC31"] = "\u0641\u0649";
- t["\uFC32"] = "\u0641\u064A";
- t["\uFC33"] = "\u0642\u062D";
- t["\uFC34"] = "\u0642\u0645";
- t["\uFC35"] = "\u0642\u0649";
- t["\uFC36"] = "\u0642\u064A";
- t["\uFC37"] = "\u0643\u0627";
- t["\uFC38"] = "\u0643\u062C";
- t["\uFC39"] = "\u0643\u062D";
- t["\uFC3A"] = "\u0643\u062E";
- t["\uFC3B"] = "\u0643\u0644";
- t["\uFC3C"] = "\u0643\u0645";
- t["\uFC3D"] = "\u0643\u0649";
- t["\uFC3E"] = "\u0643\u064A";
- t["\uFC3F"] = "\u0644\u062C";
- t["\uFC40"] = "\u0644\u062D";
- t["\uFC41"] = "\u0644\u062E";
- t["\uFC42"] = "\u0644\u0645";
- t["\uFC43"] = "\u0644\u0649";
- t["\uFC44"] = "\u0644\u064A";
- t["\uFC45"] = "\u0645\u062C";
- t["\uFC46"] = "\u0645\u062D";
- t["\uFC47"] = "\u0645\u062E";
- t["\uFC48"] = "\u0645\u0645";
- t["\uFC49"] = "\u0645\u0649";
- t["\uFC4A"] = "\u0645\u064A";
- t["\uFC4B"] = "\u0646\u062C";
- t["\uFC4C"] = "\u0646\u062D";
- t["\uFC4D"] = "\u0646\u062E";
- t["\uFC4E"] = "\u0646\u0645";
- t["\uFC4F"] = "\u0646\u0649";
- t["\uFC50"] = "\u0646\u064A";
- t["\uFC51"] = "\u0647\u062C";
- t["\uFC52"] = "\u0647\u0645";
- t["\uFC53"] = "\u0647\u0649";
- t["\uFC54"] = "\u0647\u064A";
- t["\uFC55"] = "\u064A\u062C";
- t["\uFC56"] = "\u064A\u062D";
- t["\uFC57"] = "\u064A\u062E";
- t["\uFC58"] = "\u064A\u0645";
- t["\uFC59"] = "\u064A\u0649";
- t["\uFC5A"] = "\u064A\u064A";
- t["\uFC5B"] = "\u0630\u0670";
- t["\uFC5C"] = "\u0631\u0670";
- t["\uFC5D"] = "\u0649\u0670";
- t["\uFC5E"] = "\u0020\u064C\u0651";
- t["\uFC5F"] = "\u0020\u064D\u0651";
- t["\uFC60"] = "\u0020\u064E\u0651";
- t["\uFC61"] = "\u0020\u064F\u0651";
- t["\uFC62"] = "\u0020\u0650\u0651";
- t["\uFC63"] = "\u0020\u0651\u0670";
- t["\uFC64"] = "\u0626\u0631";
- t["\uFC65"] = "\u0626\u0632";
- t["\uFC66"] = "\u0626\u0645";
- t["\uFC67"] = "\u0626\u0646";
- t["\uFC68"] = "\u0626\u0649";
- t["\uFC69"] = "\u0626\u064A";
- t["\uFC6A"] = "\u0628\u0631";
- t["\uFC6B"] = "\u0628\u0632";
- t["\uFC6C"] = "\u0628\u0645";
- t["\uFC6D"] = "\u0628\u0646";
- t["\uFC6E"] = "\u0628\u0649";
- t["\uFC6F"] = "\u0628\u064A";
- t["\uFC70"] = "\u062A\u0631";
- t["\uFC71"] = "\u062A\u0632";
- t["\uFC72"] = "\u062A\u0645";
- t["\uFC73"] = "\u062A\u0646";
- t["\uFC74"] = "\u062A\u0649";
- t["\uFC75"] = "\u062A\u064A";
- t["\uFC76"] = "\u062B\u0631";
- t["\uFC77"] = "\u062B\u0632";
- t["\uFC78"] = "\u062B\u0645";
- t["\uFC79"] = "\u062B\u0646";
- t["\uFC7A"] = "\u062B\u0649";
- t["\uFC7B"] = "\u062B\u064A";
- t["\uFC7C"] = "\u0641\u0649";
- t["\uFC7D"] = "\u0641\u064A";
- t["\uFC7E"] = "\u0642\u0649";
- t["\uFC7F"] = "\u0642\u064A";
- t["\uFC80"] = "\u0643\u0627";
- t["\uFC81"] = "\u0643\u0644";
- t["\uFC82"] = "\u0643\u0645";
- t["\uFC83"] = "\u0643\u0649";
- t["\uFC84"] = "\u0643\u064A";
- t["\uFC85"] = "\u0644\u0645";
- t["\uFC86"] = "\u0644\u0649";
- t["\uFC87"] = "\u0644\u064A";
- t["\uFC88"] = "\u0645\u0627";
- t["\uFC89"] = "\u0645\u0645";
- t["\uFC8A"] = "\u0646\u0631";
- t["\uFC8B"] = "\u0646\u0632";
- t["\uFC8C"] = "\u0646\u0645";
- t["\uFC8D"] = "\u0646\u0646";
- t["\uFC8E"] = "\u0646\u0649";
- t["\uFC8F"] = "\u0646\u064A";
- t["\uFC90"] = "\u0649\u0670";
- t["\uFC91"] = "\u064A\u0631";
- t["\uFC92"] = "\u064A\u0632";
- t["\uFC93"] = "\u064A\u0645";
- t["\uFC94"] = "\u064A\u0646";
- t["\uFC95"] = "\u064A\u0649";
- t["\uFC96"] = "\u064A\u064A";
- t["\uFC97"] = "\u0626\u062C";
- t["\uFC98"] = "\u0626\u062D";
- t["\uFC99"] = "\u0626\u062E";
- t["\uFC9A"] = "\u0626\u0645";
- t["\uFC9B"] = "\u0626\u0647";
- t["\uFC9C"] = "\u0628\u062C";
- t["\uFC9D"] = "\u0628\u062D";
- t["\uFC9E"] = "\u0628\u062E";
- t["\uFC9F"] = "\u0628\u0645";
- t["\uFCA0"] = "\u0628\u0647";
- t["\uFCA1"] = "\u062A\u062C";
- t["\uFCA2"] = "\u062A\u062D";
- t["\uFCA3"] = "\u062A\u062E";
- t["\uFCA4"] = "\u062A\u0645";
- t["\uFCA5"] = "\u062A\u0647";
- t["\uFCA6"] = "\u062B\u0645";
- t["\uFCA7"] = "\u062C\u062D";
- t["\uFCA8"] = "\u062C\u0645";
- t["\uFCA9"] = "\u062D\u062C";
- t["\uFCAA"] = "\u062D\u0645";
- t["\uFCAB"] = "\u062E\u062C";
- t["\uFCAC"] = "\u062E\u0645";
- t["\uFCAD"] = "\u0633\u062C";
- t["\uFCAE"] = "\u0633\u062D";
- t["\uFCAF"] = "\u0633\u062E";
- t["\uFCB0"] = "\u0633\u0645";
- t["\uFCB1"] = "\u0635\u062D";
- t["\uFCB2"] = "\u0635\u062E";
- t["\uFCB3"] = "\u0635\u0645";
- t["\uFCB4"] = "\u0636\u062C";
- t["\uFCB5"] = "\u0636\u062D";
- t["\uFCB6"] = "\u0636\u062E";
- t["\uFCB7"] = "\u0636\u0645";
- t["\uFCB8"] = "\u0637\u062D";
- t["\uFCB9"] = "\u0638\u0645";
- t["\uFCBA"] = "\u0639\u062C";
- t["\uFCBB"] = "\u0639\u0645";
- t["\uFCBC"] = "\u063A\u062C";
- t["\uFCBD"] = "\u063A\u0645";
- t["\uFCBE"] = "\u0641\u062C";
- t["\uFCBF"] = "\u0641\u062D";
- t["\uFCC0"] = "\u0641\u062E";
- t["\uFCC1"] = "\u0641\u0645";
- t["\uFCC2"] = "\u0642\u062D";
- t["\uFCC3"] = "\u0642\u0645";
- t["\uFCC4"] = "\u0643\u062C";
- t["\uFCC5"] = "\u0643\u062D";
- t["\uFCC6"] = "\u0643\u062E";
- t["\uFCC7"] = "\u0643\u0644";
- t["\uFCC8"] = "\u0643\u0645";
- t["\uFCC9"] = "\u0644\u062C";
- t["\uFCCA"] = "\u0644\u062D";
- t["\uFCCB"] = "\u0644\u062E";
- t["\uFCCC"] = "\u0644\u0645";
- t["\uFCCD"] = "\u0644\u0647";
- t["\uFCCE"] = "\u0645\u062C";
- t["\uFCCF"] = "\u0645\u062D";
- t["\uFCD0"] = "\u0645\u062E";
- t["\uFCD1"] = "\u0645\u0645";
- t["\uFCD2"] = "\u0646\u062C";
- t["\uFCD3"] = "\u0646\u062D";
- t["\uFCD4"] = "\u0646\u062E";
- t["\uFCD5"] = "\u0646\u0645";
- t["\uFCD6"] = "\u0646\u0647";
- t["\uFCD7"] = "\u0647\u062C";
- t["\uFCD8"] = "\u0647\u0645";
- t["\uFCD9"] = "\u0647\u0670";
- t["\uFCDA"] = "\u064A\u062C";
- t["\uFCDB"] = "\u064A\u062D";
- t["\uFCDC"] = "\u064A\u062E";
- t["\uFCDD"] = "\u064A\u0645";
- t["\uFCDE"] = "\u064A\u0647";
- t["\uFCDF"] = "\u0626\u0645";
- t["\uFCE0"] = "\u0626\u0647";
- t["\uFCE1"] = "\u0628\u0645";
- t["\uFCE2"] = "\u0628\u0647";
- t["\uFCE3"] = "\u062A\u0645";
- t["\uFCE4"] = "\u062A\u0647";
- t["\uFCE5"] = "\u062B\u0645";
- t["\uFCE6"] = "\u062B\u0647";
- t["\uFCE7"] = "\u0633\u0645";
- t["\uFCE8"] = "\u0633\u0647";
- t["\uFCE9"] = "\u0634\u0645";
- t["\uFCEA"] = "\u0634\u0647";
- t["\uFCEB"] = "\u0643\u0644";
- t["\uFCEC"] = "\u0643\u0645";
- t["\uFCED"] = "\u0644\u0645";
- t["\uFCEE"] = "\u0646\u0645";
- t["\uFCEF"] = "\u0646\u0647";
- t["\uFCF0"] = "\u064A\u0645";
- t["\uFCF1"] = "\u064A\u0647";
- t["\uFCF2"] = "\u0640\u064E\u0651";
- t["\uFCF3"] = "\u0640\u064F\u0651";
- t["\uFCF4"] = "\u0640\u0650\u0651";
- t["\uFCF5"] = "\u0637\u0649";
- t["\uFCF6"] = "\u0637\u064A";
- t["\uFCF7"] = "\u0639\u0649";
- t["\uFCF8"] = "\u0639\u064A";
- t["\uFCF9"] = "\u063A\u0649";
- t["\uFCFA"] = "\u063A\u064A";
- t["\uFCFB"] = "\u0633\u0649";
- t["\uFCFC"] = "\u0633\u064A";
- t["\uFCFD"] = "\u0634\u0649";
- t["\uFCFE"] = "\u0634\u064A";
- t["\uFCFF"] = "\u062D\u0649";
- t["\uFD00"] = "\u062D\u064A";
- t["\uFD01"] = "\u062C\u0649";
- t["\uFD02"] = "\u062C\u064A";
- t["\uFD03"] = "\u062E\u0649";
- t["\uFD04"] = "\u062E\u064A";
- t["\uFD05"] = "\u0635\u0649";
- t["\uFD06"] = "\u0635\u064A";
- t["\uFD07"] = "\u0636\u0649";
- t["\uFD08"] = "\u0636\u064A";
- t["\uFD09"] = "\u0634\u062C";
- t["\uFD0A"] = "\u0634\u062D";
- t["\uFD0B"] = "\u0634\u062E";
- t["\uFD0C"] = "\u0634\u0645";
- t["\uFD0D"] = "\u0634\u0631";
- t["\uFD0E"] = "\u0633\u0631";
- t["\uFD0F"] = "\u0635\u0631";
- t["\uFD10"] = "\u0636\u0631";
- t["\uFD11"] = "\u0637\u0649";
- t["\uFD12"] = "\u0637\u064A";
- t["\uFD13"] = "\u0639\u0649";
- t["\uFD14"] = "\u0639\u064A";
- t["\uFD15"] = "\u063A\u0649";
- t["\uFD16"] = "\u063A\u064A";
- t["\uFD17"] = "\u0633\u0649";
- t["\uFD18"] = "\u0633\u064A";
- t["\uFD19"] = "\u0634\u0649";
- t["\uFD1A"] = "\u0634\u064A";
- t["\uFD1B"] = "\u062D\u0649";
- t["\uFD1C"] = "\u062D\u064A";
- t["\uFD1D"] = "\u062C\u0649";
- t["\uFD1E"] = "\u062C\u064A";
- t["\uFD1F"] = "\u062E\u0649";
- t["\uFD20"] = "\u062E\u064A";
- t["\uFD21"] = "\u0635\u0649";
- t["\uFD22"] = "\u0635\u064A";
- t["\uFD23"] = "\u0636\u0649";
- t["\uFD24"] = "\u0636\u064A";
- t["\uFD25"] = "\u0634\u062C";
- t["\uFD26"] = "\u0634\u062D";
- t["\uFD27"] = "\u0634\u062E";
- t["\uFD28"] = "\u0634\u0645";
- t["\uFD29"] = "\u0634\u0631";
- t["\uFD2A"] = "\u0633\u0631";
- t["\uFD2B"] = "\u0635\u0631";
- t["\uFD2C"] = "\u0636\u0631";
- t["\uFD2D"] = "\u0634\u062C";
- t["\uFD2E"] = "\u0634\u062D";
- t["\uFD2F"] = "\u0634\u062E";
- t["\uFD30"] = "\u0634\u0645";
- t["\uFD31"] = "\u0633\u0647";
- t["\uFD32"] = "\u0634\u0647";
- t["\uFD33"] = "\u0637\u0645";
- t["\uFD34"] = "\u0633\u062C";
- t["\uFD35"] = "\u0633\u062D";
- t["\uFD36"] = "\u0633\u062E";
- t["\uFD37"] = "\u0634\u062C";
- t["\uFD38"] = "\u0634\u062D";
- t["\uFD39"] = "\u0634\u062E";
- t["\uFD3A"] = "\u0637\u0645";
- t["\uFD3B"] = "\u0638\u0645";
- t["\uFD3C"] = "\u0627\u064B";
- t["\uFD3D"] = "\u0627\u064B";
- t["\uFD50"] = "\u062A\u062C\u0645";
- t["\uFD51"] = "\u062A\u062D\u062C";
- t["\uFD52"] = "\u062A\u062D\u062C";
- t["\uFD53"] = "\u062A\u062D\u0645";
- t["\uFD54"] = "\u062A\u062E\u0645";
- t["\uFD55"] = "\u062A\u0645\u062C";
- t["\uFD56"] = "\u062A\u0645\u062D";
- t["\uFD57"] = "\u062A\u0645\u062E";
- t["\uFD58"] = "\u062C\u0645\u062D";
- t["\uFD59"] = "\u062C\u0645\u062D";
- t["\uFD5A"] = "\u062D\u0645\u064A";
- t["\uFD5B"] = "\u062D\u0645\u0649";
- t["\uFD5C"] = "\u0633\u062D\u062C";
- t["\uFD5D"] = "\u0633\u062C\u062D";
- t["\uFD5E"] = "\u0633\u062C\u0649";
- t["\uFD5F"] = "\u0633\u0645\u062D";
- t["\uFD60"] = "\u0633\u0645\u062D";
- t["\uFD61"] = "\u0633\u0645\u062C";
- t["\uFD62"] = "\u0633\u0645\u0645";
- t["\uFD63"] = "\u0633\u0645\u0645";
- t["\uFD64"] = "\u0635\u062D\u062D";
- t["\uFD65"] = "\u0635\u062D\u062D";
- t["\uFD66"] = "\u0635\u0645\u0645";
- t["\uFD67"] = "\u0634\u062D\u0645";
- t["\uFD68"] = "\u0634\u062D\u0645";
- t["\uFD69"] = "\u0634\u062C\u064A";
- t["\uFD6A"] = "\u0634\u0645\u062E";
- t["\uFD6B"] = "\u0634\u0645\u062E";
- t["\uFD6C"] = "\u0634\u0645\u0645";
- t["\uFD6D"] = "\u0634\u0645\u0645";
- t["\uFD6E"] = "\u0636\u062D\u0649";
- t["\uFD6F"] = "\u0636\u062E\u0645";
- t["\uFD70"] = "\u0636\u062E\u0645";
- t["\uFD71"] = "\u0637\u0645\u062D";
- t["\uFD72"] = "\u0637\u0645\u062D";
- t["\uFD73"] = "\u0637\u0645\u0645";
- t["\uFD74"] = "\u0637\u0645\u064A";
- t["\uFD75"] = "\u0639\u062C\u0645";
- t["\uFD76"] = "\u0639\u0645\u0645";
- t["\uFD77"] = "\u0639\u0645\u0645";
- t["\uFD78"] = "\u0639\u0645\u0649";
- t["\uFD79"] = "\u063A\u0645\u0645";
- t["\uFD7A"] = "\u063A\u0645\u064A";
- t["\uFD7B"] = "\u063A\u0645\u0649";
- t["\uFD7C"] = "\u0641\u062E\u0645";
- t["\uFD7D"] = "\u0641\u062E\u0645";
- t["\uFD7E"] = "\u0642\u0645\u062D";
- t["\uFD7F"] = "\u0642\u0645\u0645";
- t["\uFD80"] = "\u0644\u062D\u0645";
- t["\uFD81"] = "\u0644\u062D\u064A";
- t["\uFD82"] = "\u0644\u062D\u0649";
- t["\uFD83"] = "\u0644\u062C\u062C";
- t["\uFD84"] = "\u0644\u062C\u062C";
- t["\uFD85"] = "\u0644\u062E\u0645";
- t["\uFD86"] = "\u0644\u062E\u0645";
- t["\uFD87"] = "\u0644\u0645\u062D";
- t["\uFD88"] = "\u0644\u0645\u062D";
- t["\uFD89"] = "\u0645\u062D\u062C";
- t["\uFD8A"] = "\u0645\u062D\u0645";
- t["\uFD8B"] = "\u0645\u062D\u064A";
- t["\uFD8C"] = "\u0645\u062C\u062D";
- t["\uFD8D"] = "\u0645\u062C\u0645";
- t["\uFD8E"] = "\u0645\u062E\u062C";
- t["\uFD8F"] = "\u0645\u062E\u0645";
- t["\uFD92"] = "\u0645\u062C\u062E";
- t["\uFD93"] = "\u0647\u0645\u062C";
- t["\uFD94"] = "\u0647\u0645\u0645";
- t["\uFD95"] = "\u0646\u062D\u0645";
- t["\uFD96"] = "\u0646\u062D\u0649";
- t["\uFD97"] = "\u0646\u062C\u0645";
- t["\uFD98"] = "\u0646\u062C\u0645";
- t["\uFD99"] = "\u0646\u062C\u0649";
- t["\uFD9A"] = "\u0646\u0645\u064A";
- t["\uFD9B"] = "\u0646\u0645\u0649";
- t["\uFD9C"] = "\u064A\u0645\u0645";
- t["\uFD9D"] = "\u064A\u0645\u0645";
- t["\uFD9E"] = "\u0628\u062E\u064A";
- t["\uFD9F"] = "\u062A\u062C\u064A";
- t["\uFDA0"] = "\u062A\u062C\u0649";
- t["\uFDA1"] = "\u062A\u062E\u064A";
- t["\uFDA2"] = "\u062A\u062E\u0649";
- t["\uFDA3"] = "\u062A\u0645\u064A";
- t["\uFDA4"] = "\u062A\u0645\u0649";
- t["\uFDA5"] = "\u062C\u0645\u064A";
- t["\uFDA6"] = "\u062C\u062D\u0649";
- t["\uFDA7"] = "\u062C\u0645\u0649";
- t["\uFDA8"] = "\u0633\u062E\u0649";
- t["\uFDA9"] = "\u0635\u062D\u064A";
- t["\uFDAA"] = "\u0634\u062D\u064A";
- t["\uFDAB"] = "\u0636\u062D\u064A";
- t["\uFDAC"] = "\u0644\u062C\u064A";
- t["\uFDAD"] = "\u0644\u0645\u064A";
- t["\uFDAE"] = "\u064A\u062D\u064A";
- t["\uFDAF"] = "\u064A\u062C\u064A";
- t["\uFDB0"] = "\u064A\u0645\u064A";
- t["\uFDB1"] = "\u0645\u0645\u064A";
- t["\uFDB2"] = "\u0642\u0645\u064A";
- t["\uFDB3"] = "\u0646\u062D\u064A";
- t["\uFDB4"] = "\u0642\u0645\u062D";
- t["\uFDB5"] = "\u0644\u062D\u0645";
- t["\uFDB6"] = "\u0639\u0645\u064A";
- t["\uFDB7"] = "\u0643\u0645\u064A";
- t["\uFDB8"] = "\u0646\u062C\u062D";
- t["\uFDB9"] = "\u0645\u062E\u064A";
- t["\uFDBA"] = "\u0644\u062C\u0645";
- t["\uFDBB"] = "\u0643\u0645\u0645";
- t["\uFDBC"] = "\u0644\u062C\u0645";
- t["\uFDBD"] = "\u0646\u062C\u062D";
- t["\uFDBE"] = "\u062C\u062D\u064A";
- t["\uFDBF"] = "\u062D\u062C\u064A";
- t["\uFDC0"] = "\u0645\u062C\u064A";
- t["\uFDC1"] = "\u0641\u0645\u064A";
- t["\uFDC2"] = "\u0628\u062D\u064A";
- t["\uFDC3"] = "\u0643\u0645\u0645";
- t["\uFDC4"] = "\u0639\u062C\u0645";
- t["\uFDC5"] = "\u0635\u0645\u0645";
- t["\uFDC6"] = "\u0633\u062E\u064A";
- t["\uFDC7"] = "\u0646\u062C\u064A";
- t["\uFE49"] = "\u203E";
- t["\uFE4A"] = "\u203E";
- t["\uFE4B"] = "\u203E";
- t["\uFE4C"] = "\u203E";
- t["\uFE4D"] = "\u005F";
- t["\uFE4E"] = "\u005F";
- t["\uFE4F"] = "\u005F";
- t["\uFE80"] = "\u0621";
- t["\uFE81"] = "\u0622";
- t["\uFE82"] = "\u0622";
- t["\uFE83"] = "\u0623";
- t["\uFE84"] = "\u0623";
- t["\uFE85"] = "\u0624";
- t["\uFE86"] = "\u0624";
- t["\uFE87"] = "\u0625";
- t["\uFE88"] = "\u0625";
- t["\uFE89"] = "\u0626";
- t["\uFE8A"] = "\u0626";
- t["\uFE8B"] = "\u0626";
- t["\uFE8C"] = "\u0626";
- t["\uFE8D"] = "\u0627";
- t["\uFE8E"] = "\u0627";
- t["\uFE8F"] = "\u0628";
- t["\uFE90"] = "\u0628";
- t["\uFE91"] = "\u0628";
- t["\uFE92"] = "\u0628";
- t["\uFE93"] = "\u0629";
- t["\uFE94"] = "\u0629";
- t["\uFE95"] = "\u062A";
- t["\uFE96"] = "\u062A";
- t["\uFE97"] = "\u062A";
- t["\uFE98"] = "\u062A";
- t["\uFE99"] = "\u062B";
- t["\uFE9A"] = "\u062B";
- t["\uFE9B"] = "\u062B";
- t["\uFE9C"] = "\u062B";
- t["\uFE9D"] = "\u062C";
- t["\uFE9E"] = "\u062C";
- t["\uFE9F"] = "\u062C";
- t["\uFEA0"] = "\u062C";
- t["\uFEA1"] = "\u062D";
- t["\uFEA2"] = "\u062D";
- t["\uFEA3"] = "\u062D";
- t["\uFEA4"] = "\u062D";
- t["\uFEA5"] = "\u062E";
- t["\uFEA6"] = "\u062E";
- t["\uFEA7"] = "\u062E";
- t["\uFEA8"] = "\u062E";
- t["\uFEA9"] = "\u062F";
- t["\uFEAA"] = "\u062F";
- t["\uFEAB"] = "\u0630";
- t["\uFEAC"] = "\u0630";
- t["\uFEAD"] = "\u0631";
- t["\uFEAE"] = "\u0631";
- t["\uFEAF"] = "\u0632";
- t["\uFEB0"] = "\u0632";
- t["\uFEB1"] = "\u0633";
- t["\uFEB2"] = "\u0633";
- t["\uFEB3"] = "\u0633";
- t["\uFEB4"] = "\u0633";
- t["\uFEB5"] = "\u0634";
- t["\uFEB6"] = "\u0634";
- t["\uFEB7"] = "\u0634";
- t["\uFEB8"] = "\u0634";
- t["\uFEB9"] = "\u0635";
- t["\uFEBA"] = "\u0635";
- t["\uFEBB"] = "\u0635";
- t["\uFEBC"] = "\u0635";
- t["\uFEBD"] = "\u0636";
- t["\uFEBE"] = "\u0636";
- t["\uFEBF"] = "\u0636";
- t["\uFEC0"] = "\u0636";
- t["\uFEC1"] = "\u0637";
- t["\uFEC2"] = "\u0637";
- t["\uFEC3"] = "\u0637";
- t["\uFEC4"] = "\u0637";
- t["\uFEC5"] = "\u0638";
- t["\uFEC6"] = "\u0638";
- t["\uFEC7"] = "\u0638";
- t["\uFEC8"] = "\u0638";
- t["\uFEC9"] = "\u0639";
- t["\uFECA"] = "\u0639";
- t["\uFECB"] = "\u0639";
- t["\uFECC"] = "\u0639";
- t["\uFECD"] = "\u063A";
- t["\uFECE"] = "\u063A";
- t["\uFECF"] = "\u063A";
- t["\uFED0"] = "\u063A";
- t["\uFED1"] = "\u0641";
- t["\uFED2"] = "\u0641";
- t["\uFED3"] = "\u0641";
- t["\uFED4"] = "\u0641";
- t["\uFED5"] = "\u0642";
- t["\uFED6"] = "\u0642";
- t["\uFED7"] = "\u0642";
- t["\uFED8"] = "\u0642";
- t["\uFED9"] = "\u0643";
- t["\uFEDA"] = "\u0643";
- t["\uFEDB"] = "\u0643";
- t["\uFEDC"] = "\u0643";
- t["\uFEDD"] = "\u0644";
- t["\uFEDE"] = "\u0644";
- t["\uFEDF"] = "\u0644";
- t["\uFEE0"] = "\u0644";
- t["\uFEE1"] = "\u0645";
- t["\uFEE2"] = "\u0645";
- t["\uFEE3"] = "\u0645";
- t["\uFEE4"] = "\u0645";
- t["\uFEE5"] = "\u0646";
- t["\uFEE6"] = "\u0646";
- t["\uFEE7"] = "\u0646";
- t["\uFEE8"] = "\u0646";
- t["\uFEE9"] = "\u0647";
- t["\uFEEA"] = "\u0647";
- t["\uFEEB"] = "\u0647";
- t["\uFEEC"] = "\u0647";
- t["\uFEED"] = "\u0648";
- t["\uFEEE"] = "\u0648";
- t["\uFEEF"] = "\u0649";
- t["\uFEF0"] = "\u0649";
- t["\uFEF1"] = "\u064A";
- t["\uFEF2"] = "\u064A";
- t["\uFEF3"] = "\u064A";
- t["\uFEF4"] = "\u064A";
- t["\uFEF5"] = "\u0644\u0622";
- t["\uFEF6"] = "\u0644\u0622";
- t["\uFEF7"] = "\u0644\u0623";
- t["\uFEF8"] = "\u0644\u0623";
- t["\uFEF9"] = "\u0644\u0625";
- t["\uFEFA"] = "\u0644\u0625";
- t["\uFEFB"] = "\u0644\u0627";
- t["\uFEFC"] = "\u0644\u0627";
+const getNormalizedUnicodes = (0,_core_utils_js__WEBPACK_IMPORTED_MODULE_0__.getArrayLookupTableFactory)(function () {
+ return [
+  "\u00A8",
+  "\u0020\u0308",
+  "\u00AF",
+  "\u0020\u0304",
+  "\u00B4",
+  "\u0020\u0301",
+  "\u00B5",
+  "\u03BC",
+  "\u00B8",
+  "\u0020\u0327",
+  "\u0132",
+  "\u0049\u004A",
+  "\u0133",
+  "\u0069\u006A",
+  "\u013F",
+  "\u004C\u00B7",
+  "\u0140",
+  "\u006C\u00B7",
+  "\u0149",
+  "\u02BC\u006E",
+  "\u017F",
+  "\u0073",
+  "\u01C4",
+  "\u0044\u017D",
+  "\u01C5",
+  "\u0044\u017E",
+  "\u01C6",
+  "\u0064\u017E",
+  "\u01C7",
+  "\u004C\u004A",
+  "\u01C8",
+  "\u004C\u006A",
+  "\u01C9",
+  "\u006C\u006A",
+  "\u01CA",
+  "\u004E\u004A",
+  "\u01CB",
+  "\u004E\u006A",
+  "\u01CC",
+  "\u006E\u006A",
+  "\u01F1",
+  "\u0044\u005A",
+  "\u01F2",
+  "\u0044\u007A",
+  "\u01F3",
+  "\u0064\u007A",
+  "\u02D8",
+  "\u0020\u0306",
+  "\u02D9",
+  "\u0020\u0307",
+  "\u02DA",
+  "\u0020\u030A",
+  "\u02DB",
+  "\u0020\u0328",
+  "\u02DC",
+  "\u0020\u0303",
+  "\u02DD",
+  "\u0020\u030B",
+  "\u037A",
+  "\u0020\u0345",
+  "\u0384",
+  "\u0020\u0301",
+  "\u03D0",
+  "\u03B2",
+  "\u03D1",
+  "\u03B8",
+  "\u03D2",
+  "\u03A5",
+  "\u03D5",
+  "\u03C6",
+  "\u03D6",
+  "\u03C0",
+  "\u03F0",
+  "\u03BA",
+  "\u03F1",
+  "\u03C1",
+  "\u03F2",
+  "\u03C2",
+  "\u03F4",
+  "\u0398",
+  "\u03F5",
+  "\u03B5",
+  "\u03F9",
+  "\u03A3",
+  "\u0587",
+  "\u0565\u0582",
+  "\u0675",
+  "\u0627\u0674",
+  "\u0676",
+  "\u0648\u0674",
+  "\u0677",
+  "\u06C7\u0674",
+  "\u0678",
+  "\u064A\u0674",
+  "\u0E33",
+  "\u0E4D\u0E32",
+  "\u0EB3",
+  "\u0ECD\u0EB2",
+  "\u0EDC",
+  "\u0EAB\u0E99",
+  "\u0EDD",
+  "\u0EAB\u0EA1",
+  "\u0F77",
+  "\u0FB2\u0F81",
+  "\u0F79",
+  "\u0FB3\u0F81",
+  "\u1E9A",
+  "\u0061\u02BE",
+  "\u1FBD",
+  "\u0020\u0313",
+  "\u1FBF",
+  "\u0020\u0313",
+  "\u1FC0",
+  "\u0020\u0342",
+  "\u1FFE",
+  "\u0020\u0314",
+  "\u2002",
+  "\u0020",
+  "\u2003",
+  "\u0020",
+  "\u2004",
+  "\u0020",
+  "\u2005",
+  "\u0020",
+  "\u2006",
+  "\u0020",
+  "\u2008",
+  "\u0020",
+  "\u2009",
+  "\u0020",
+  "\u200A",
+  "\u0020",
+  "\u2017",
+  "\u0020\u0333",
+  "\u2024",
+  "\u002E",
+  "\u2025",
+  "\u002E\u002E",
+  "\u2026",
+  "\u002E\u002E\u002E",
+  "\u2033",
+  "\u2032\u2032",
+  "\u2034",
+  "\u2032\u2032\u2032",
+  "\u2036",
+  "\u2035\u2035",
+  "\u2037",
+  "\u2035\u2035\u2035",
+  "\u203C",
+  "\u0021\u0021",
+  "\u203E",
+  "\u0020\u0305",
+  "\u2047",
+  "\u003F\u003F",
+  "\u2048",
+  "\u003F\u0021",
+  "\u2049",
+  "\u0021\u003F",
+  "\u2057",
+  "\u2032\u2032\u2032\u2032",
+  "\u205F",
+  "\u0020",
+  "\u20A8",
+  "\u0052\u0073",
+  "\u2100",
+  "\u0061\u002F\u0063",
+  "\u2101",
+  "\u0061\u002F\u0073",
+  "\u2103",
+  "\u00B0\u0043",
+  "\u2105",
+  "\u0063\u002F\u006F",
+  "\u2106",
+  "\u0063\u002F\u0075",
+  "\u2107",
+  "\u0190",
+  "\u2109",
+  "\u00B0\u0046",
+  "\u2116",
+  "\u004E\u006F",
+  "\u2121",
+  "\u0054\u0045\u004C",
+  "\u2135",
+  "\u05D0",
+  "\u2136",
+  "\u05D1",
+  "\u2137",
+  "\u05D2",
+  "\u2138",
+  "\u05D3",
+  "\u213B",
+  "\u0046\u0041\u0058",
+  "\u2160",
+  "\u0049",
+  "\u2161",
+  "\u0049\u0049",
+  "\u2162",
+  "\u0049\u0049\u0049",
+  "\u2163",
+  "\u0049\u0056",
+  "\u2164",
+  "\u0056",
+  "\u2165",
+  "\u0056\u0049",
+  "\u2166",
+  "\u0056\u0049\u0049",
+  "\u2167",
+  "\u0056\u0049\u0049\u0049",
+  "\u2168",
+  "\u0049\u0058",
+  "\u2169",
+  "\u0058",
+  "\u216A",
+  "\u0058\u0049",
+  "\u216B",
+  "\u0058\u0049\u0049",
+  "\u216C",
+  "\u004C",
+  "\u216D",
+  "\u0043",
+  "\u216E",
+  "\u0044",
+  "\u216F",
+  "\u004D",
+  "\u2170",
+  "\u0069",
+  "\u2171",
+  "\u0069\u0069",
+  "\u2172",
+  "\u0069\u0069\u0069",
+  "\u2173",
+  "\u0069\u0076",
+  "\u2174",
+  "\u0076",
+  "\u2175",
+  "\u0076\u0069",
+  "\u2176",
+  "\u0076\u0069\u0069",
+  "\u2177",
+  "\u0076\u0069\u0069\u0069",
+  "\u2178",
+  "\u0069\u0078",
+  "\u2179",
+  "\u0078",
+  "\u217A",
+  "\u0078\u0069",
+  "\u217B",
+  "\u0078\u0069\u0069",
+  "\u217C",
+  "\u006C",
+  "\u217D",
+  "\u0063",
+  "\u217E",
+  "\u0064",
+  "\u217F",
+  "\u006D",
+  "\u222C",
+  "\u222B\u222B",
+  "\u222D",
+  "\u222B\u222B\u222B",
+  "\u222F",
+  "\u222E\u222E",
+  "\u2230",
+  "\u222E\u222E\u222E",
+  "\u2474",
+  "\u0028\u0031\u0029",
+  "\u2475",
+  "\u0028\u0032\u0029",
+  "\u2476",
+  "\u0028\u0033\u0029",
+  "\u2477",
+  "\u0028\u0034\u0029",
+  "\u2478",
+  "\u0028\u0035\u0029",
+  "\u2479",
+  "\u0028\u0036\u0029",
+  "\u247A",
+  "\u0028\u0037\u0029",
+  "\u247B",
+  "\u0028\u0038\u0029",
+  "\u247C",
+  "\u0028\u0039\u0029",
+  "\u247D",
+  "\u0028\u0031\u0030\u0029",
+  "\u247E",
+  "\u0028\u0031\u0031\u0029",
+  "\u247F",
+  "\u0028\u0031\u0032\u0029",
+  "\u2480",
+  "\u0028\u0031\u0033\u0029",
+  "\u2481",
+  "\u0028\u0031\u0034\u0029",
+  "\u2482",
+  "\u0028\u0031\u0035\u0029",
+  "\u2483",
+  "\u0028\u0031\u0036\u0029",
+  "\u2484",
+  "\u0028\u0031\u0037\u0029",
+  "\u2485",
+  "\u0028\u0031\u0038\u0029",
+  "\u2486",
+  "\u0028\u0031\u0039\u0029",
+  "\u2487",
+  "\u0028\u0032\u0030\u0029",
+  "\u2488",
+  "\u0031\u002E",
+  "\u2489",
+  "\u0032\u002E",
+  "\u248A",
+  "\u0033\u002E",
+  "\u248B",
+  "\u0034\u002E",
+  "\u248C",
+  "\u0035\u002E",
+  "\u248D",
+  "\u0036\u002E",
+  "\u248E",
+  "\u0037\u002E",
+  "\u248F",
+  "\u0038\u002E",
+  "\u2490",
+  "\u0039\u002E",
+  "\u2491",
+  "\u0031\u0030\u002E",
+  "\u2492",
+  "\u0031\u0031\u002E",
+  "\u2493",
+  "\u0031\u0032\u002E",
+  "\u2494",
+  "\u0031\u0033\u002E",
+  "\u2495",
+  "\u0031\u0034\u002E",
+  "\u2496",
+  "\u0031\u0035\u002E",
+  "\u2497",
+  "\u0031\u0036\u002E",
+  "\u2498",
+  "\u0031\u0037\u002E",
+  "\u2499",
+  "\u0031\u0038\u002E",
+  "\u249A",
+  "\u0031\u0039\u002E",
+  "\u249B",
+  "\u0032\u0030\u002E",
+  "\u249C",
+  "\u0028\u0061\u0029",
+  "\u249D",
+  "\u0028\u0062\u0029",
+  "\u249E",
+  "\u0028\u0063\u0029",
+  "\u249F",
+  "\u0028\u0064\u0029",
+  "\u24A0",
+  "\u0028\u0065\u0029",
+  "\u24A1",
+  "\u0028\u0066\u0029",
+  "\u24A2",
+  "\u0028\u0067\u0029",
+  "\u24A3",
+  "\u0028\u0068\u0029",
+  "\u24A4",
+  "\u0028\u0069\u0029",
+  "\u24A5",
+  "\u0028\u006A\u0029",
+  "\u24A6",
+  "\u0028\u006B\u0029",
+  "\u24A7",
+  "\u0028\u006C\u0029",
+  "\u24A8",
+  "\u0028\u006D\u0029",
+  "\u24A9",
+  "\u0028\u006E\u0029",
+  "\u24AA",
+  "\u0028\u006F\u0029",
+  "\u24AB",
+  "\u0028\u0070\u0029",
+  "\u24AC",
+  "\u0028\u0071\u0029",
+  "\u24AD",
+  "\u0028\u0072\u0029",
+  "\u24AE",
+  "\u0028\u0073\u0029",
+  "\u24AF",
+  "\u0028\u0074\u0029",
+  "\u24B0",
+  "\u0028\u0075\u0029",
+  "\u24B1",
+  "\u0028\u0076\u0029",
+  "\u24B2",
+  "\u0028\u0077\u0029",
+  "\u24B3",
+  "\u0028\u0078\u0029",
+  "\u24B4",
+  "\u0028\u0079\u0029",
+  "\u24B5",
+  "\u0028\u007A\u0029",
+  "\u2A0C",
+  "\u222B\u222B\u222B\u222B",
+  "\u2A74",
+  "\u003A\u003A\u003D",
+  "\u2A75",
+  "\u003D\u003D",
+  "\u2A76",
+  "\u003D\u003D\u003D",
+  "\u2E9F",
+  "\u6BCD",
+  "\u2EF3",
+  "\u9F9F",
+  "\u2F00",
+  "\u4E00",
+  "\u2F01",
+  "\u4E28",
+  "\u2F02",
+  "\u4E36",
+  "\u2F03",
+  "\u4E3F",
+  "\u2F04",
+  "\u4E59",
+  "\u2F05",
+  "\u4E85",
+  "\u2F06",
+  "\u4E8C",
+  "\u2F07",
+  "\u4EA0",
+  "\u2F08",
+  "\u4EBA",
+  "\u2F09",
+  "\u513F",
+  "\u2F0A",
+  "\u5165",
+  "\u2F0B",
+  "\u516B",
+  "\u2F0C",
+  "\u5182",
+  "\u2F0D",
+  "\u5196",
+  "\u2F0E",
+  "\u51AB",
+  "\u2F0F",
+  "\u51E0",
+  "\u2F10",
+  "\u51F5",
+  "\u2F11",
+  "\u5200",
+  "\u2F12",
+  "\u529B",
+  "\u2F13",
+  "\u52F9",
+  "\u2F14",
+  "\u5315",
+  "\u2F15",
+  "\u531A",
+  "\u2F16",
+  "\u5338",
+  "\u2F17",
+  "\u5341",
+  "\u2F18",
+  "\u535C",
+  "\u2F19",
+  "\u5369",
+  "\u2F1A",
+  "\u5382",
+  "\u2F1B",
+  "\u53B6",
+  "\u2F1C",
+  "\u53C8",
+  "\u2F1D",
+  "\u53E3",
+  "\u2F1E",
+  "\u56D7",
+  "\u2F1F",
+  "\u571F",
+  "\u2F20",
+  "\u58EB",
+  "\u2F21",
+  "\u5902",
+  "\u2F22",
+  "\u590A",
+  "\u2F23",
+  "\u5915",
+  "\u2F24",
+  "\u5927",
+  "\u2F25",
+  "\u5973",
+  "\u2F26",
+  "\u5B50",
+  "\u2F27",
+  "\u5B80",
+  "\u2F28",
+  "\u5BF8",
+  "\u2F29",
+  "\u5C0F",
+  "\u2F2A",
+  "\u5C22",
+  "\u2F2B",
+  "\u5C38",
+  "\u2F2C",
+  "\u5C6E",
+  "\u2F2D",
+  "\u5C71",
+  "\u2F2E",
+  "\u5DDB",
+  "\u2F2F",
+  "\u5DE5",
+  "\u2F30",
+  "\u5DF1",
+  "\u2F31",
+  "\u5DFE",
+  "\u2F32",
+  "\u5E72",
+  "\u2F33",
+  "\u5E7A",
+  "\u2F34",
+  "\u5E7F",
+  "\u2F35",
+  "\u5EF4",
+  "\u2F36",
+  "\u5EFE",
+  "\u2F37",
+  "\u5F0B",
+  "\u2F38",
+  "\u5F13",
+  "\u2F39",
+  "\u5F50",
+  "\u2F3A",
+  "\u5F61",
+  "\u2F3B",
+  "\u5F73",
+  "\u2F3C",
+  "\u5FC3",
+  "\u2F3D",
+  "\u6208",
+  "\u2F3E",
+  "\u6236",
+  "\u2F3F",
+  "\u624B",
+  "\u2F40",
+  "\u652F",
+  "\u2F41",
+  "\u6534",
+  "\u2F42",
+  "\u6587",
+  "\u2F43",
+  "\u6597",
+  "\u2F44",
+  "\u65A4",
+  "\u2F45",
+  "\u65B9",
+  "\u2F46",
+  "\u65E0",
+  "\u2F47",
+  "\u65E5",
+  "\u2F48",
+  "\u66F0",
+  "\u2F49",
+  "\u6708",
+  "\u2F4A",
+  "\u6728",
+  "\u2F4B",
+  "\u6B20",
+  "\u2F4C",
+  "\u6B62",
+  "\u2F4D",
+  "\u6B79",
+  "\u2F4E",
+  "\u6BB3",
+  "\u2F4F",
+  "\u6BCB",
+  "\u2F50",
+  "\u6BD4",
+  "\u2F51",
+  "\u6BDB",
+  "\u2F52",
+  "\u6C0F",
+  "\u2F53",
+  "\u6C14",
+  "\u2F54",
+  "\u6C34",
+  "\u2F55",
+  "\u706B",
+  "\u2F56",
+  "\u722A",
+  "\u2F57",
+  "\u7236",
+  "\u2F58",
+  "\u723B",
+  "\u2F59",
+  "\u723F",
+  "\u2F5A",
+  "\u7247",
+  "\u2F5B",
+  "\u7259",
+  "\u2F5C",
+  "\u725B",
+  "\u2F5D",
+  "\u72AC",
+  "\u2F5E",
+  "\u7384",
+  "\u2F5F",
+  "\u7389",
+  "\u2F60",
+  "\u74DC",
+  "\u2F61",
+  "\u74E6",
+  "\u2F62",
+  "\u7518",
+  "\u2F63",
+  "\u751F",
+  "\u2F64",
+  "\u7528",
+  "\u2F65",
+  "\u7530",
+  "\u2F66",
+  "\u758B",
+  "\u2F67",
+  "\u7592",
+  "\u2F68",
+  "\u7676",
+  "\u2F69",
+  "\u767D",
+  "\u2F6A",
+  "\u76AE",
+  "\u2F6B",
+  "\u76BF",
+  "\u2F6C",
+  "\u76EE",
+  "\u2F6D",
+  "\u77DB",
+  "\u2F6E",
+  "\u77E2",
+  "\u2F6F",
+  "\u77F3",
+  "\u2F70",
+  "\u793A",
+  "\u2F71",
+  "\u79B8",
+  "\u2F72",
+  "\u79BE",
+  "\u2F73",
+  "\u7A74",
+  "\u2F74",
+  "\u7ACB",
+  "\u2F75",
+  "\u7AF9",
+  "\u2F76",
+  "\u7C73",
+  "\u2F77",
+  "\u7CF8",
+  "\u2F78",
+  "\u7F36",
+  "\u2F79",
+  "\u7F51",
+  "\u2F7A",
+  "\u7F8A",
+  "\u2F7B",
+  "\u7FBD",
+  "\u2F7C",
+  "\u8001",
+  "\u2F7D",
+  "\u800C",
+  "\u2F7E",
+  "\u8012",
+  "\u2F7F",
+  "\u8033",
+  "\u2F80",
+  "\u807F",
+  "\u2F81",
+  "\u8089",
+  "\u2F82",
+  "\u81E3",
+  "\u2F83",
+  "\u81EA",
+  "\u2F84",
+  "\u81F3",
+  "\u2F85",
+  "\u81FC",
+  "\u2F86",
+  "\u820C",
+  "\u2F87",
+  "\u821B",
+  "\u2F88",
+  "\u821F",
+  "\u2F89",
+  "\u826E",
+  "\u2F8A",
+  "\u8272",
+  "\u2F8B",
+  "\u8278",
+  "\u2F8C",
+  "\u864D",
+  "\u2F8D",
+  "\u866B",
+  "\u2F8E",
+  "\u8840",
+  "\u2F8F",
+  "\u884C",
+  "\u2F90",
+  "\u8863",
+  "\u2F91",
+  "\u897E",
+  "\u2F92",
+  "\u898B",
+  "\u2F93",
+  "\u89D2",
+  "\u2F94",
+  "\u8A00",
+  "\u2F95",
+  "\u8C37",
+  "\u2F96",
+  "\u8C46",
+  "\u2F97",
+  "\u8C55",
+  "\u2F98",
+  "\u8C78",
+  "\u2F99",
+  "\u8C9D",
+  "\u2F9A",
+  "\u8D64",
+  "\u2F9B",
+  "\u8D70",
+  "\u2F9C",
+  "\u8DB3",
+  "\u2F9D",
+  "\u8EAB",
+  "\u2F9E",
+  "\u8ECA",
+  "\u2F9F",
+  "\u8F9B",
+  "\u2FA0",
+  "\u8FB0",
+  "\u2FA1",
+  "\u8FB5",
+  "\u2FA2",
+  "\u9091",
+  "\u2FA3",
+  "\u9149",
+  "\u2FA4",
+  "\u91C6",
+  "\u2FA5",
+  "\u91CC",
+  "\u2FA6",
+  "\u91D1",
+  "\u2FA7",
+  "\u9577",
+  "\u2FA8",
+  "\u9580",
+  "\u2FA9",
+  "\u961C",
+  "\u2FAA",
+  "\u96B6",
+  "\u2FAB",
+  "\u96B9",
+  "\u2FAC",
+  "\u96E8",
+  "\u2FAD",
+  "\u9751",
+  "\u2FAE",
+  "\u975E",
+  "\u2FAF",
+  "\u9762",
+  "\u2FB0",
+  "\u9769",
+  "\u2FB1",
+  "\u97CB",
+  "\u2FB2",
+  "\u97ED",
+  "\u2FB3",
+  "\u97F3",
+  "\u2FB4",
+  "\u9801",
+  "\u2FB5",
+  "\u98A8",
+  "\u2FB6",
+  "\u98DB",
+  "\u2FB7",
+  "\u98DF",
+  "\u2FB8",
+  "\u9996",
+  "\u2FB9",
+  "\u9999",
+  "\u2FBA",
+  "\u99AC",
+  "\u2FBB",
+  "\u9AA8",
+  "\u2FBC",
+  "\u9AD8",
+  "\u2FBD",
+  "\u9ADF",
+  "\u2FBE",
+  "\u9B25",
+  "\u2FBF",
+  "\u9B2F",
+  "\u2FC0",
+  "\u9B32",
+  "\u2FC1",
+  "\u9B3C",
+  "\u2FC2",
+  "\u9B5A",
+  "\u2FC3",
+  "\u9CE5",
+  "\u2FC4",
+  "\u9E75",
+  "\u2FC5",
+  "\u9E7F",
+  "\u2FC6",
+  "\u9EA5",
+  "\u2FC7",
+  "\u9EBB",
+  "\u2FC8",
+  "\u9EC3",
+  "\u2FC9",
+  "\u9ECD",
+  "\u2FCA",
+  "\u9ED1",
+  "\u2FCB",
+  "\u9EF9",
+  "\u2FCC",
+  "\u9EFD",
+  "\u2FCD",
+  "\u9F0E",
+  "\u2FCE",
+  "\u9F13",
+  "\u2FCF",
+  "\u9F20",
+  "\u2FD0",
+  "\u9F3B",
+  "\u2FD1",
+  "\u9F4A",
+  "\u2FD2",
+  "\u9F52",
+  "\u2FD3",
+  "\u9F8D",
+  "\u2FD4",
+  "\u9F9C",
+  "\u2FD5",
+  "\u9FA0",
+  "\u3036",
+  "\u3012",
+  "\u3038",
+  "\u5341",
+  "\u3039",
+  "\u5344",
+  "\u303A",
+  "\u5345",
+  "\u309B",
+  "\u0020\u3099",
+  "\u309C",
+  "\u0020\u309A",
+  "\u3131",
+  "\u1100",
+  "\u3132",
+  "\u1101",
+  "\u3133",
+  "\u11AA",
+  "\u3134",
+  "\u1102",
+  "\u3135",
+  "\u11AC",
+  "\u3136",
+  "\u11AD",
+  "\u3137",
+  "\u1103",
+  "\u3138",
+  "\u1104",
+  "\u3139",
+  "\u1105",
+  "\u313A",
+  "\u11B0",
+  "\u313B",
+  "\u11B1",
+  "\u313C",
+  "\u11B2",
+  "\u313D",
+  "\u11B3",
+  "\u313E",
+  "\u11B4",
+  "\u313F",
+  "\u11B5",
+  "\u3140",
+  "\u111A",
+  "\u3141",
+  "\u1106",
+  "\u3142",
+  "\u1107",
+  "\u3143",
+  "\u1108",
+  "\u3144",
+  "\u1121",
+  "\u3145",
+  "\u1109",
+  "\u3146",
+  "\u110A",
+  "\u3147",
+  "\u110B",
+  "\u3148",
+  "\u110C",
+  "\u3149",
+  "\u110D",
+  "\u314A",
+  "\u110E",
+  "\u314B",
+  "\u110F",
+  "\u314C",
+  "\u1110",
+  "\u314D",
+  "\u1111",
+  "\u314E",
+  "\u1112",
+  "\u314F",
+  "\u1161",
+  "\u3150",
+  "\u1162",
+  "\u3151",
+  "\u1163",
+  "\u3152",
+  "\u1164",
+  "\u3153",
+  "\u1165",
+  "\u3154",
+  "\u1166",
+  "\u3155",
+  "\u1167",
+  "\u3156",
+  "\u1168",
+  "\u3157",
+  "\u1169",
+  "\u3158",
+  "\u116A",
+  "\u3159",
+  "\u116B",
+  "\u315A",
+  "\u116C",
+  "\u315B",
+  "\u116D",
+  "\u315C",
+  "\u116E",
+  "\u315D",
+  "\u116F",
+  "\u315E",
+  "\u1170",
+  "\u315F",
+  "\u1171",
+  "\u3160",
+  "\u1172",
+  "\u3161",
+  "\u1173",
+  "\u3162",
+  "\u1174",
+  "\u3163",
+  "\u1175",
+  "\u3164",
+  "\u1160",
+  "\u3165",
+  "\u1114",
+  "\u3166",
+  "\u1115",
+  "\u3167",
+  "\u11C7",
+  "\u3168",
+  "\u11C8",
+  "\u3169",
+  "\u11CC",
+  "\u316A",
+  "\u11CE",
+  "\u316B",
+  "\u11D3",
+  "\u316C",
+  "\u11D7",
+  "\u316D",
+  "\u11D9",
+  "\u316E",
+  "\u111C",
+  "\u316F",
+  "\u11DD",
+  "\u3170",
+  "\u11DF",
+  "\u3171",
+  "\u111D",
+  "\u3172",
+  "\u111E",
+  "\u3173",
+  "\u1120",
+  "\u3174",
+  "\u1122",
+  "\u3175",
+  "\u1123",
+  "\u3176",
+  "\u1127",
+  "\u3177",
+  "\u1129",
+  "\u3178",
+  "\u112B",
+  "\u3179",
+  "\u112C",
+  "\u317A",
+  "\u112D",
+  "\u317B",
+  "\u112E",
+  "\u317C",
+  "\u112F",
+  "\u317D",
+  "\u1132",
+  "\u317E",
+  "\u1136",
+  "\u317F",
+  "\u1140",
+  "\u3180",
+  "\u1147",
+  "\u3181",
+  "\u114C",
+  "\u3182",
+  "\u11F1",
+  "\u3183",
+  "\u11F2",
+  "\u3184",
+  "\u1157",
+  "\u3185",
+  "\u1158",
+  "\u3186",
+  "\u1159",
+  "\u3187",
+  "\u1184",
+  "\u3188",
+  "\u1185",
+  "\u3189",
+  "\u1188",
+  "\u318A",
+  "\u1191",
+  "\u318B",
+  "\u1192",
+  "\u318C",
+  "\u1194",
+  "\u318D",
+  "\u119E",
+  "\u318E",
+  "\u11A1",
+  "\u3200",
+  "\u0028\u1100\u0029",
+  "\u3201",
+  "\u0028\u1102\u0029",
+  "\u3202",
+  "\u0028\u1103\u0029",
+  "\u3203",
+  "\u0028\u1105\u0029",
+  "\u3204",
+  "\u0028\u1106\u0029",
+  "\u3205",
+  "\u0028\u1107\u0029",
+  "\u3206",
+  "\u0028\u1109\u0029",
+  "\u3207",
+  "\u0028\u110B\u0029",
+  "\u3208",
+  "\u0028\u110C\u0029",
+  "\u3209",
+  "\u0028\u110E\u0029",
+  "\u320A",
+  "\u0028\u110F\u0029",
+  "\u320B",
+  "\u0028\u1110\u0029",
+  "\u320C",
+  "\u0028\u1111\u0029",
+  "\u320D",
+  "\u0028\u1112\u0029",
+  "\u320E",
+  "\u0028\u1100\u1161\u0029",
+  "\u320F",
+  "\u0028\u1102\u1161\u0029",
+  "\u3210",
+  "\u0028\u1103\u1161\u0029",
+  "\u3211",
+  "\u0028\u1105\u1161\u0029",
+  "\u3212",
+  "\u0028\u1106\u1161\u0029",
+  "\u3213",
+  "\u0028\u1107\u1161\u0029",
+  "\u3214",
+  "\u0028\u1109\u1161\u0029",
+  "\u3215",
+  "\u0028\u110B\u1161\u0029",
+  "\u3216",
+  "\u0028\u110C\u1161\u0029",
+  "\u3217",
+  "\u0028\u110E\u1161\u0029",
+  "\u3218",
+  "\u0028\u110F\u1161\u0029",
+  "\u3219",
+  "\u0028\u1110\u1161\u0029",
+  "\u321A",
+  "\u0028\u1111\u1161\u0029",
+  "\u321B",
+  "\u0028\u1112\u1161\u0029",
+  "\u321C",
+  "\u0028\u110C\u116E\u0029",
+  "\u321D",
+  "\u0028\u110B\u1169\u110C\u1165\u11AB\u0029",
+  "\u321E",
+  "\u0028\u110B\u1169\u1112\u116E\u0029",
+  "\u3220",
+  "\u0028\u4E00\u0029",
+  "\u3221",
+  "\u0028\u4E8C\u0029",
+  "\u3222",
+  "\u0028\u4E09\u0029",
+  "\u3223",
+  "\u0028\u56DB\u0029",
+  "\u3224",
+  "\u0028\u4E94\u0029",
+  "\u3225",
+  "\u0028\u516D\u0029",
+  "\u3226",
+  "\u0028\u4E03\u0029",
+  "\u3227",
+  "\u0028\u516B\u0029",
+  "\u3228",
+  "\u0028\u4E5D\u0029",
+  "\u3229",
+  "\u0028\u5341\u0029",
+  "\u322A",
+  "\u0028\u6708\u0029",
+  "\u322B",
+  "\u0028\u706B\u0029",
+  "\u322C",
+  "\u0028\u6C34\u0029",
+  "\u322D",
+  "\u0028\u6728\u0029",
+  "\u322E",
+  "\u0028\u91D1\u0029",
+  "\u322F",
+  "\u0028\u571F\u0029",
+  "\u3230",
+  "\u0028\u65E5\u0029",
+  "\u3231",
+  "\u0028\u682A\u0029",
+  "\u3232",
+  "\u0028\u6709\u0029",
+  "\u3233",
+  "\u0028\u793E\u0029",
+  "\u3234",
+  "\u0028\u540D\u0029",
+  "\u3235",
+  "\u0028\u7279\u0029",
+  "\u3236",
+  "\u0028\u8CA1\u0029",
+  "\u3237",
+  "\u0028\u795D\u0029",
+  "\u3238",
+  "\u0028\u52B4\u0029",
+  "\u3239",
+  "\u0028\u4EE3\u0029",
+  "\u323A",
+  "\u0028\u547C\u0029",
+  "\u323B",
+  "\u0028\u5B66\u0029",
+  "\u323C",
+  "\u0028\u76E3\u0029",
+  "\u323D",
+  "\u0028\u4F01\u0029",
+  "\u323E",
+  "\u0028\u8CC7\u0029",
+  "\u323F",
+  "\u0028\u5354\u0029",
+  "\u3240",
+  "\u0028\u796D\u0029",
+  "\u3241",
+  "\u0028\u4F11\u0029",
+  "\u3242",
+  "\u0028\u81EA\u0029",
+  "\u3243",
+  "\u0028\u81F3\u0029",
+  "\u32C0",
+  "\u0031\u6708",
+  "\u32C1",
+  "\u0032\u6708",
+  "\u32C2",
+  "\u0033\u6708",
+  "\u32C3",
+  "\u0034\u6708",
+  "\u32C4",
+  "\u0035\u6708",
+  "\u32C5",
+  "\u0036\u6708",
+  "\u32C6",
+  "\u0037\u6708",
+  "\u32C7",
+  "\u0038\u6708",
+  "\u32C8",
+  "\u0039\u6708",
+  "\u32C9",
+  "\u0031\u0030\u6708",
+  "\u32CA",
+  "\u0031\u0031\u6708",
+  "\u32CB",
+  "\u0031\u0032\u6708",
+  "\u3358",
+  "\u0030\u70B9",
+  "\u3359",
+  "\u0031\u70B9",
+  "\u335A",
+  "\u0032\u70B9",
+  "\u335B",
+  "\u0033\u70B9",
+  "\u335C",
+  "\u0034\u70B9",
+  "\u335D",
+  "\u0035\u70B9",
+  "\u335E",
+  "\u0036\u70B9",
+  "\u335F",
+  "\u0037\u70B9",
+  "\u3360",
+  "\u0038\u70B9",
+  "\u3361",
+  "\u0039\u70B9",
+  "\u3362",
+  "\u0031\u0030\u70B9",
+  "\u3363",
+  "\u0031\u0031\u70B9",
+  "\u3364",
+  "\u0031\u0032\u70B9",
+  "\u3365",
+  "\u0031\u0033\u70B9",
+  "\u3366",
+  "\u0031\u0034\u70B9",
+  "\u3367",
+  "\u0031\u0035\u70B9",
+  "\u3368",
+  "\u0031\u0036\u70B9",
+  "\u3369",
+  "\u0031\u0037\u70B9",
+  "\u336A",
+  "\u0031\u0038\u70B9",
+  "\u336B",
+  "\u0031\u0039\u70B9",
+  "\u336C",
+  "\u0032\u0030\u70B9",
+  "\u336D",
+  "\u0032\u0031\u70B9",
+  "\u336E",
+  "\u0032\u0032\u70B9",
+  "\u336F",
+  "\u0032\u0033\u70B9",
+  "\u3370",
+  "\u0032\u0034\u70B9",
+  "\u33E0",
+  "\u0031\u65E5",
+  "\u33E1",
+  "\u0032\u65E5",
+  "\u33E2",
+  "\u0033\u65E5",
+  "\u33E3",
+  "\u0034\u65E5",
+  "\u33E4",
+  "\u0035\u65E5",
+  "\u33E5",
+  "\u0036\u65E5",
+  "\u33E6",
+  "\u0037\u65E5",
+  "\u33E7",
+  "\u0038\u65E5",
+  "\u33E8",
+  "\u0039\u65E5",
+  "\u33E9",
+  "\u0031\u0030\u65E5",
+  "\u33EA",
+  "\u0031\u0031\u65E5",
+  "\u33EB",
+  "\u0031\u0032\u65E5",
+  "\u33EC",
+  "\u0031\u0033\u65E5",
+  "\u33ED",
+  "\u0031\u0034\u65E5",
+  "\u33EE",
+  "\u0031\u0035\u65E5",
+  "\u33EF",
+  "\u0031\u0036\u65E5",
+  "\u33F0",
+  "\u0031\u0037\u65E5",
+  "\u33F1",
+  "\u0031\u0038\u65E5",
+  "\u33F2",
+  "\u0031\u0039\u65E5",
+  "\u33F3",
+  "\u0032\u0030\u65E5",
+  "\u33F4",
+  "\u0032\u0031\u65E5",
+  "\u33F5",
+  "\u0032\u0032\u65E5",
+  "\u33F6",
+  "\u0032\u0033\u65E5",
+  "\u33F7",
+  "\u0032\u0034\u65E5",
+  "\u33F8",
+  "\u0032\u0035\u65E5",
+  "\u33F9",
+  "\u0032\u0036\u65E5",
+  "\u33FA",
+  "\u0032\u0037\u65E5",
+  "\u33FB",
+  "\u0032\u0038\u65E5",
+  "\u33FC",
+  "\u0032\u0039\u65E5",
+  "\u33FD",
+  "\u0033\u0030\u65E5",
+  "\u33FE",
+  "\u0033\u0031\u65E5",
+  "\uFB00",
+  "\u0066\u0066",
+  "\uFB01",
+  "\u0066\u0069",
+  "\uFB02",
+  "\u0066\u006C",
+  "\uFB03",
+  "\u0066\u0066\u0069",
+  "\uFB04",
+  "\u0066\u0066\u006C",
+  "\uFB05",
+  "\u017F\u0074",
+  "\uFB06",
+  "\u0073\u0074",
+  "\uFB13",
+  "\u0574\u0576",
+  "\uFB14",
+  "\u0574\u0565",
+  "\uFB15",
+  "\u0574\u056B",
+  "\uFB16",
+  "\u057E\u0576",
+  "\uFB17",
+  "\u0574\u056D",
+  "\uFB4F",
+  "\u05D0\u05DC",
+  "\uFB50",
+  "\u0671",
+  "\uFB51",
+  "\u0671",
+  "\uFB52",
+  "\u067B",
+  "\uFB53",
+  "\u067B",
+  "\uFB54",
+  "\u067B",
+  "\uFB55",
+  "\u067B",
+  "\uFB56",
+  "\u067E",
+  "\uFB57",
+  "\u067E",
+  "\uFB58",
+  "\u067E",
+  "\uFB59",
+  "\u067E",
+  "\uFB5A",
+  "\u0680",
+  "\uFB5B",
+  "\u0680",
+  "\uFB5C",
+  "\u0680",
+  "\uFB5D",
+  "\u0680",
+  "\uFB5E",
+  "\u067A",
+  "\uFB5F",
+  "\u067A",
+  "\uFB60",
+  "\u067A",
+  "\uFB61",
+  "\u067A",
+  "\uFB62",
+  "\u067F",
+  "\uFB63",
+  "\u067F",
+  "\uFB64",
+  "\u067F",
+  "\uFB65",
+  "\u067F",
+  "\uFB66",
+  "\u0679",
+  "\uFB67",
+  "\u0679",
+  "\uFB68",
+  "\u0679",
+  "\uFB69",
+  "\u0679",
+  "\uFB6A",
+  "\u06A4",
+  "\uFB6B",
+  "\u06A4",
+  "\uFB6C",
+  "\u06A4",
+  "\uFB6D",
+  "\u06A4",
+  "\uFB6E",
+  "\u06A6",
+  "\uFB6F",
+  "\u06A6",
+  "\uFB70",
+  "\u06A6",
+  "\uFB71",
+  "\u06A6",
+  "\uFB72",
+  "\u0684",
+  "\uFB73",
+  "\u0684",
+  "\uFB74",
+  "\u0684",
+  "\uFB75",
+  "\u0684",
+  "\uFB76",
+  "\u0683",
+  "\uFB77",
+  "\u0683",
+  "\uFB78",
+  "\u0683",
+  "\uFB79",
+  "\u0683",
+  "\uFB7A",
+  "\u0686",
+  "\uFB7B",
+  "\u0686",
+  "\uFB7C",
+  "\u0686",
+  "\uFB7D",
+  "\u0686",
+  "\uFB7E",
+  "\u0687",
+  "\uFB7F",
+  "\u0687",
+  "\uFB80",
+  "\u0687",
+  "\uFB81",
+  "\u0687",
+  "\uFB82",
+  "\u068D",
+  "\uFB83",
+  "\u068D",
+  "\uFB84",
+  "\u068C",
+  "\uFB85",
+  "\u068C",
+  "\uFB86",
+  "\u068E",
+  "\uFB87",
+  "\u068E",
+  "\uFB88",
+  "\u0688",
+  "\uFB89",
+  "\u0688",
+  "\uFB8A",
+  "\u0698",
+  "\uFB8B",
+  "\u0698",
+  "\uFB8C",
+  "\u0691",
+  "\uFB8D",
+  "\u0691",
+  "\uFB8E",
+  "\u06A9",
+  "\uFB8F",
+  "\u06A9",
+  "\uFB90",
+  "\u06A9",
+  "\uFB91",
+  "\u06A9",
+  "\uFB92",
+  "\u06AF",
+  "\uFB93",
+  "\u06AF",
+  "\uFB94",
+  "\u06AF",
+  "\uFB95",
+  "\u06AF",
+  "\uFB96",
+  "\u06B3",
+  "\uFB97",
+  "\u06B3",
+  "\uFB98",
+  "\u06B3",
+  "\uFB99",
+  "\u06B3",
+  "\uFB9A",
+  "\u06B1",
+  "\uFB9B",
+  "\u06B1",
+  "\uFB9C",
+  "\u06B1",
+  "\uFB9D",
+  "\u06B1",
+  "\uFB9E",
+  "\u06BA",
+  "\uFB9F",
+  "\u06BA",
+  "\uFBA0",
+  "\u06BB",
+  "\uFBA1",
+  "\u06BB",
+  "\uFBA2",
+  "\u06BB",
+  "\uFBA3",
+  "\u06BB",
+  "\uFBA4",
+  "\u06C0",
+  "\uFBA5",
+  "\u06C0",
+  "\uFBA6",
+  "\u06C1",
+  "\uFBA7",
+  "\u06C1",
+  "\uFBA8",
+  "\u06C1",
+  "\uFBA9",
+  "\u06C1",
+  "\uFBAA",
+  "\u06BE",
+  "\uFBAB",
+  "\u06BE",
+  "\uFBAC",
+  "\u06BE",
+  "\uFBAD",
+  "\u06BE",
+  "\uFBAE",
+  "\u06D2",
+  "\uFBAF",
+  "\u06D2",
+  "\uFBB0",
+  "\u06D3",
+  "\uFBB1",
+  "\u06D3",
+  "\uFBD3",
+  "\u06AD",
+  "\uFBD4",
+  "\u06AD",
+  "\uFBD5",
+  "\u06AD",
+  "\uFBD6",
+  "\u06AD",
+  "\uFBD7",
+  "\u06C7",
+  "\uFBD8",
+  "\u06C7",
+  "\uFBD9",
+  "\u06C6",
+  "\uFBDA",
+  "\u06C6",
+  "\uFBDB",
+  "\u06C8",
+  "\uFBDC",
+  "\u06C8",
+  "\uFBDD",
+  "\u0677",
+  "\uFBDE",
+  "\u06CB",
+  "\uFBDF",
+  "\u06CB",
+  "\uFBE0",
+  "\u06C5",
+  "\uFBE1",
+  "\u06C5",
+  "\uFBE2",
+  "\u06C9",
+  "\uFBE3",
+  "\u06C9",
+  "\uFBE4",
+  "\u06D0",
+  "\uFBE5",
+  "\u06D0",
+  "\uFBE6",
+  "\u06D0",
+  "\uFBE7",
+  "\u06D0",
+  "\uFBE8",
+  "\u0649",
+  "\uFBE9",
+  "\u0649",
+  "\uFBEA",
+  "\u0626\u0627",
+  "\uFBEB",
+  "\u0626\u0627",
+  "\uFBEC",
+  "\u0626\u06D5",
+  "\uFBED",
+  "\u0626\u06D5",
+  "\uFBEE",
+  "\u0626\u0648",
+  "\uFBEF",
+  "\u0626\u0648",
+  "\uFBF0",
+  "\u0626\u06C7",
+  "\uFBF1",
+  "\u0626\u06C7",
+  "\uFBF2",
+  "\u0626\u06C6",
+  "\uFBF3",
+  "\u0626\u06C6",
+  "\uFBF4",
+  "\u0626\u06C8",
+  "\uFBF5",
+  "\u0626\u06C8",
+  "\uFBF6",
+  "\u0626\u06D0",
+  "\uFBF7",
+  "\u0626\u06D0",
+  "\uFBF8",
+  "\u0626\u06D0",
+  "\uFBF9",
+  "\u0626\u0649",
+  "\uFBFA",
+  "\u0626\u0649",
+  "\uFBFB",
+  "\u0626\u0649",
+  "\uFBFC",
+  "\u06CC",
+  "\uFBFD",
+  "\u06CC",
+  "\uFBFE",
+  "\u06CC",
+  "\uFBFF",
+  "\u06CC",
+  "\uFC00",
+  "\u0626\u062C",
+  "\uFC01",
+  "\u0626\u062D",
+  "\uFC02",
+  "\u0626\u0645",
+  "\uFC03",
+  "\u0626\u0649",
+  "\uFC04",
+  "\u0626\u064A",
+  "\uFC05",
+  "\u0628\u062C",
+  "\uFC06",
+  "\u0628\u062D",
+  "\uFC07",
+  "\u0628\u062E",
+  "\uFC08",
+  "\u0628\u0645",
+  "\uFC09",
+  "\u0628\u0649",
+  "\uFC0A",
+  "\u0628\u064A",
+  "\uFC0B",
+  "\u062A\u062C",
+  "\uFC0C",
+  "\u062A\u062D",
+  "\uFC0D",
+  "\u062A\u062E",
+  "\uFC0E",
+  "\u062A\u0645",
+  "\uFC0F",
+  "\u062A\u0649",
+  "\uFC10",
+  "\u062A\u064A",
+  "\uFC11",
+  "\u062B\u062C",
+  "\uFC12",
+  "\u062B\u0645",
+  "\uFC13",
+  "\u062B\u0649",
+  "\uFC14",
+  "\u062B\u064A",
+  "\uFC15",
+  "\u062C\u062D",
+  "\uFC16",
+  "\u062C\u0645",
+  "\uFC17",
+  "\u062D\u062C",
+  "\uFC18",
+  "\u062D\u0645",
+  "\uFC19",
+  "\u062E\u062C",
+  "\uFC1A",
+  "\u062E\u062D",
+  "\uFC1B",
+  "\u062E\u0645",
+  "\uFC1C",
+  "\u0633\u062C",
+  "\uFC1D",
+  "\u0633\u062D",
+  "\uFC1E",
+  "\u0633\u062E",
+  "\uFC1F",
+  "\u0633\u0645",
+  "\uFC20",
+  "\u0635\u062D",
+  "\uFC21",
+  "\u0635\u0645",
+  "\uFC22",
+  "\u0636\u062C",
+  "\uFC23",
+  "\u0636\u062D",
+  "\uFC24",
+  "\u0636\u062E",
+  "\uFC25",
+  "\u0636\u0645",
+  "\uFC26",
+  "\u0637\u062D",
+  "\uFC27",
+  "\u0637\u0645",
+  "\uFC28",
+  "\u0638\u0645",
+  "\uFC29",
+  "\u0639\u062C",
+  "\uFC2A",
+  "\u0639\u0645",
+  "\uFC2B",
+  "\u063A\u062C",
+  "\uFC2C",
+  "\u063A\u0645",
+  "\uFC2D",
+  "\u0641\u062C",
+  "\uFC2E",
+  "\u0641\u062D",
+  "\uFC2F",
+  "\u0641\u062E",
+  "\uFC30",
+  "\u0641\u0645",
+  "\uFC31",
+  "\u0641\u0649",
+  "\uFC32",
+  "\u0641\u064A",
+  "\uFC33",
+  "\u0642\u062D",
+  "\uFC34",
+  "\u0642\u0645",
+  "\uFC35",
+  "\u0642\u0649",
+  "\uFC36",
+  "\u0642\u064A",
+  "\uFC37",
+  "\u0643\u0627",
+  "\uFC38",
+  "\u0643\u062C",
+  "\uFC39",
+  "\u0643\u062D",
+  "\uFC3A",
+  "\u0643\u062E",
+  "\uFC3B",
+  "\u0643\u0644",
+  "\uFC3C",
+  "\u0643\u0645",
+  "\uFC3D",
+  "\u0643\u0649",
+  "\uFC3E",
+  "\u0643\u064A",
+  "\uFC3F",
+  "\u0644\u062C",
+  "\uFC40",
+  "\u0644\u062D",
+  "\uFC41",
+  "\u0644\u062E",
+  "\uFC42",
+  "\u0644\u0645",
+  "\uFC43",
+  "\u0644\u0649",
+  "\uFC44",
+  "\u0644\u064A",
+  "\uFC45",
+  "\u0645\u062C",
+  "\uFC46",
+  "\u0645\u062D",
+  "\uFC47",
+  "\u0645\u062E",
+  "\uFC48",
+  "\u0645\u0645",
+  "\uFC49",
+  "\u0645\u0649",
+  "\uFC4A",
+  "\u0645\u064A",
+  "\uFC4B",
+  "\u0646\u062C",
+  "\uFC4C",
+  "\u0646\u062D",
+  "\uFC4D",
+  "\u0646\u062E",
+  "\uFC4E",
+  "\u0646\u0645",
+  "\uFC4F",
+  "\u0646\u0649",
+  "\uFC50",
+  "\u0646\u064A",
+  "\uFC51",
+  "\u0647\u062C",
+  "\uFC52",
+  "\u0647\u0645",
+  "\uFC53",
+  "\u0647\u0649",
+  "\uFC54",
+  "\u0647\u064A",
+  "\uFC55",
+  "\u064A\u062C",
+  "\uFC56",
+  "\u064A\u062D",
+  "\uFC57",
+  "\u064A\u062E",
+  "\uFC58",
+  "\u064A\u0645",
+  "\uFC59",
+  "\u064A\u0649",
+  "\uFC5A",
+  "\u064A\u064A",
+  "\uFC5B",
+  "\u0630\u0670",
+  "\uFC5C",
+  "\u0631\u0670",
+  "\uFC5D",
+  "\u0649\u0670",
+  "\uFC5E",
+  "\u0020\u064C\u0651",
+  "\uFC5F",
+  "\u0020\u064D\u0651",
+  "\uFC60",
+  "\u0020\u064E\u0651",
+  "\uFC61",
+  "\u0020\u064F\u0651",
+  "\uFC62",
+  "\u0020\u0650\u0651",
+  "\uFC63",
+  "\u0020\u0651\u0670",
+  "\uFC64",
+  "\u0626\u0631",
+  "\uFC65",
+  "\u0626\u0632",
+  "\uFC66",
+  "\u0626\u0645",
+  "\uFC67",
+  "\u0626\u0646",
+  "\uFC68",
+  "\u0626\u0649",
+  "\uFC69",
+  "\u0626\u064A",
+  "\uFC6A",
+  "\u0628\u0631",
+  "\uFC6B",
+  "\u0628\u0632",
+  "\uFC6C",
+  "\u0628\u0645",
+  "\uFC6D",
+  "\u0628\u0646",
+  "\uFC6E",
+  "\u0628\u0649",
+  "\uFC6F",
+  "\u0628\u064A",
+  "\uFC70",
+  "\u062A\u0631",
+  "\uFC71",
+  "\u062A\u0632",
+  "\uFC72",
+  "\u062A\u0645",
+  "\uFC73",
+  "\u062A\u0646",
+  "\uFC74",
+  "\u062A\u0649",
+  "\uFC75",
+  "\u062A\u064A",
+  "\uFC76",
+  "\u062B\u0631",
+  "\uFC77",
+  "\u062B\u0632",
+  "\uFC78",
+  "\u062B\u0645",
+  "\uFC79",
+  "\u062B\u0646",
+  "\uFC7A",
+  "\u062B\u0649",
+  "\uFC7B",
+  "\u062B\u064A",
+  "\uFC7C",
+  "\u0641\u0649",
+  "\uFC7D",
+  "\u0641\u064A",
+  "\uFC7E",
+  "\u0642\u0649",
+  "\uFC7F",
+  "\u0642\u064A",
+  "\uFC80",
+  "\u0643\u0627",
+  "\uFC81",
+  "\u0643\u0644",
+  "\uFC82",
+  "\u0643\u0645",
+  "\uFC83",
+  "\u0643\u0649",
+  "\uFC84",
+  "\u0643\u064A",
+  "\uFC85",
+  "\u0644\u0645",
+  "\uFC86",
+  "\u0644\u0649",
+  "\uFC87",
+  "\u0644\u064A",
+  "\uFC88",
+  "\u0645\u0627",
+  "\uFC89",
+  "\u0645\u0645",
+  "\uFC8A",
+  "\u0646\u0631",
+  "\uFC8B",
+  "\u0646\u0632",
+  "\uFC8C",
+  "\u0646\u0645",
+  "\uFC8D",
+  "\u0646\u0646",
+  "\uFC8E",
+  "\u0646\u0649",
+  "\uFC8F",
+  "\u0646\u064A",
+  "\uFC90",
+  "\u0649\u0670",
+  "\uFC91",
+  "\u064A\u0631",
+  "\uFC92",
+  "\u064A\u0632",
+  "\uFC93",
+  "\u064A\u0645",
+  "\uFC94",
+  "\u064A\u0646",
+  "\uFC95",
+  "\u064A\u0649",
+  "\uFC96",
+  "\u064A\u064A",
+  "\uFC97",
+  "\u0626\u062C",
+  "\uFC98",
+  "\u0626\u062D",
+  "\uFC99",
+  "\u0626\u062E",
+  "\uFC9A",
+  "\u0626\u0645",
+  "\uFC9B",
+  "\u0626\u0647",
+  "\uFC9C",
+  "\u0628\u062C",
+  "\uFC9D",
+  "\u0628\u062D",
+  "\uFC9E",
+  "\u0628\u062E",
+  "\uFC9F",
+  "\u0628\u0645",
+  "\uFCA0",
+  "\u0628\u0647",
+  "\uFCA1",
+  "\u062A\u062C",
+  "\uFCA2",
+  "\u062A\u062D",
+  "\uFCA3",
+  "\u062A\u062E",
+  "\uFCA4",
+  "\u062A\u0645",
+  "\uFCA5",
+  "\u062A\u0647",
+  "\uFCA6",
+  "\u062B\u0645",
+  "\uFCA7",
+  "\u062C\u062D",
+  "\uFCA8",
+  "\u062C\u0645",
+  "\uFCA9",
+  "\u062D\u062C",
+  "\uFCAA",
+  "\u062D\u0645",
+  "\uFCAB",
+  "\u062E\u062C",
+  "\uFCAC",
+  "\u062E\u0645",
+  "\uFCAD",
+  "\u0633\u062C",
+  "\uFCAE",
+  "\u0633\u062D",
+  "\uFCAF",
+  "\u0633\u062E",
+  "\uFCB0",
+  "\u0633\u0645",
+  "\uFCB1",
+  "\u0635\u062D",
+  "\uFCB2",
+  "\u0635\u062E",
+  "\uFCB3",
+  "\u0635\u0645",
+  "\uFCB4",
+  "\u0636\u062C",
+  "\uFCB5",
+  "\u0636\u062D",
+  "\uFCB6",
+  "\u0636\u062E",
+  "\uFCB7",
+  "\u0636\u0645",
+  "\uFCB8",
+  "\u0637\u062D",
+  "\uFCB9",
+  "\u0638\u0645",
+  "\uFCBA",
+  "\u0639\u062C",
+  "\uFCBB",
+  "\u0639\u0645",
+  "\uFCBC",
+  "\u063A\u062C",
+  "\uFCBD",
+  "\u063A\u0645",
+  "\uFCBE",
+  "\u0641\u062C",
+  "\uFCBF",
+  "\u0641\u062D",
+  "\uFCC0",
+  "\u0641\u062E",
+  "\uFCC1",
+  "\u0641\u0645",
+  "\uFCC2",
+  "\u0642\u062D",
+  "\uFCC3",
+  "\u0642\u0645",
+  "\uFCC4",
+  "\u0643\u062C",
+  "\uFCC5",
+  "\u0643\u062D",
+  "\uFCC6",
+  "\u0643\u062E",
+  "\uFCC7",
+  "\u0643\u0644",
+  "\uFCC8",
+  "\u0643\u0645",
+  "\uFCC9",
+  "\u0644\u062C",
+  "\uFCCA",
+  "\u0644\u062D",
+  "\uFCCB",
+  "\u0644\u062E",
+  "\uFCCC",
+  "\u0644\u0645",
+  "\uFCCD",
+  "\u0644\u0647",
+  "\uFCCE",
+  "\u0645\u062C",
+  "\uFCCF",
+  "\u0645\u062D",
+  "\uFCD0",
+  "\u0645\u062E",
+  "\uFCD1",
+  "\u0645\u0645",
+  "\uFCD2",
+  "\u0646\u062C",
+  "\uFCD3",
+  "\u0646\u062D",
+  "\uFCD4",
+  "\u0646\u062E",
+  "\uFCD5",
+  "\u0646\u0645",
+  "\uFCD6",
+  "\u0646\u0647",
+  "\uFCD7",
+  "\u0647\u062C",
+  "\uFCD8",
+  "\u0647\u0645",
+  "\uFCD9",
+  "\u0647\u0670",
+  "\uFCDA",
+  "\u064A\u062C",
+  "\uFCDB",
+  "\u064A\u062D",
+  "\uFCDC",
+  "\u064A\u062E",
+  "\uFCDD",
+  "\u064A\u0645",
+  "\uFCDE",
+  "\u064A\u0647",
+  "\uFCDF",
+  "\u0626\u0645",
+  "\uFCE0",
+  "\u0626\u0647",
+  "\uFCE1",
+  "\u0628\u0645",
+  "\uFCE2",
+  "\u0628\u0647",
+  "\uFCE3",
+  "\u062A\u0645",
+  "\uFCE4",
+  "\u062A\u0647",
+  "\uFCE5",
+  "\u062B\u0645",
+  "\uFCE6",
+  "\u062B\u0647",
+  "\uFCE7",
+  "\u0633\u0645",
+  "\uFCE8",
+  "\u0633\u0647",
+  "\uFCE9",
+  "\u0634\u0645",
+  "\uFCEA",
+  "\u0634\u0647",
+  "\uFCEB",
+  "\u0643\u0644",
+  "\uFCEC",
+  "\u0643\u0645",
+  "\uFCED",
+  "\u0644\u0645",
+  "\uFCEE",
+  "\u0646\u0645",
+  "\uFCEF",
+  "\u0646\u0647",
+  "\uFCF0",
+  "\u064A\u0645",
+  "\uFCF1",
+  "\u064A\u0647",
+  "\uFCF2",
+  "\u0640\u064E\u0651",
+  "\uFCF3",
+  "\u0640\u064F\u0651",
+  "\uFCF4",
+  "\u0640\u0650\u0651",
+  "\uFCF5",
+  "\u0637\u0649",
+  "\uFCF6",
+  "\u0637\u064A",
+  "\uFCF7",
+  "\u0639\u0649",
+  "\uFCF8",
+  "\u0639\u064A",
+  "\uFCF9",
+  "\u063A\u0649",
+  "\uFCFA",
+  "\u063A\u064A",
+  "\uFCFB",
+  "\u0633\u0649",
+  "\uFCFC",
+  "\u0633\u064A",
+  "\uFCFD",
+  "\u0634\u0649",
+  "\uFCFE",
+  "\u0634\u064A",
+  "\uFCFF",
+  "\u062D\u0649",
+  "\uFD00",
+  "\u062D\u064A",
+  "\uFD01",
+  "\u062C\u0649",
+  "\uFD02",
+  "\u062C\u064A",
+  "\uFD03",
+  "\u062E\u0649",
+  "\uFD04",
+  "\u062E\u064A",
+  "\uFD05",
+  "\u0635\u0649",
+  "\uFD06",
+  "\u0635\u064A",
+  "\uFD07",
+  "\u0636\u0649",
+  "\uFD08",
+  "\u0636\u064A",
+  "\uFD09",
+  "\u0634\u062C",
+  "\uFD0A",
+  "\u0634\u062D",
+  "\uFD0B",
+  "\u0634\u062E",
+  "\uFD0C",
+  "\u0634\u0645",
+  "\uFD0D",
+  "\u0634\u0631",
+  "\uFD0E",
+  "\u0633\u0631",
+  "\uFD0F",
+  "\u0635\u0631",
+  "\uFD10",
+  "\u0636\u0631",
+  "\uFD11",
+  "\u0637\u0649",
+  "\uFD12",
+  "\u0637\u064A",
+  "\uFD13",
+  "\u0639\u0649",
+  "\uFD14",
+  "\u0639\u064A",
+  "\uFD15",
+  "\u063A\u0649",
+  "\uFD16",
+  "\u063A\u064A",
+  "\uFD17",
+  "\u0633\u0649",
+  "\uFD18",
+  "\u0633\u064A",
+  "\uFD19",
+  "\u0634\u0649",
+  "\uFD1A",
+  "\u0634\u064A",
+  "\uFD1B",
+  "\u062D\u0649",
+  "\uFD1C",
+  "\u062D\u064A",
+  "\uFD1D",
+  "\u062C\u0649",
+  "\uFD1E",
+  "\u062C\u064A",
+  "\uFD1F",
+  "\u062E\u0649",
+  "\uFD20",
+  "\u062E\u064A",
+  "\uFD21",
+  "\u0635\u0649",
+  "\uFD22",
+  "\u0635\u064A",
+  "\uFD23",
+  "\u0636\u0649",
+  "\uFD24",
+  "\u0636\u064A",
+  "\uFD25",
+  "\u0634\u062C",
+  "\uFD26",
+  "\u0634\u062D",
+  "\uFD27",
+  "\u0634\u062E",
+  "\uFD28",
+  "\u0634\u0645",
+  "\uFD29",
+  "\u0634\u0631",
+  "\uFD2A",
+  "\u0633\u0631",
+  "\uFD2B",
+  "\u0635\u0631",
+  "\uFD2C",
+  "\u0636\u0631",
+  "\uFD2D",
+  "\u0634\u062C",
+  "\uFD2E",
+  "\u0634\u062D",
+  "\uFD2F",
+  "\u0634\u062E",
+  "\uFD30",
+  "\u0634\u0645",
+  "\uFD31",
+  "\u0633\u0647",
+  "\uFD32",
+  "\u0634\u0647",
+  "\uFD33",
+  "\u0637\u0645",
+  "\uFD34",
+  "\u0633\u062C",
+  "\uFD35",
+  "\u0633\u062D",
+  "\uFD36",
+  "\u0633\u062E",
+  "\uFD37",
+  "\u0634\u062C",
+  "\uFD38",
+  "\u0634\u062D",
+  "\uFD39",
+  "\u0634\u062E",
+  "\uFD3A",
+  "\u0637\u0645",
+  "\uFD3B",
+  "\u0638\u0645",
+  "\uFD3C",
+  "\u0627\u064B",
+  "\uFD3D",
+  "\u0627\u064B",
+  "\uFD50",
+  "\u062A\u062C\u0645",
+  "\uFD51",
+  "\u062A\u062D\u062C",
+  "\uFD52",
+  "\u062A\u062D\u062C",
+  "\uFD53",
+  "\u062A\u062D\u0645",
+  "\uFD54",
+  "\u062A\u062E\u0645",
+  "\uFD55",
+  "\u062A\u0645\u062C",
+  "\uFD56",
+  "\u062A\u0645\u062D",
+  "\uFD57",
+  "\u062A\u0645\u062E",
+  "\uFD58",
+  "\u062C\u0645\u062D",
+  "\uFD59",
+  "\u062C\u0645\u062D",
+  "\uFD5A",
+  "\u062D\u0645\u064A",
+  "\uFD5B",
+  "\u062D\u0645\u0649",
+  "\uFD5C",
+  "\u0633\u062D\u062C",
+  "\uFD5D",
+  "\u0633\u062C\u062D",
+  "\uFD5E",
+  "\u0633\u062C\u0649",
+  "\uFD5F",
+  "\u0633\u0645\u062D",
+  "\uFD60",
+  "\u0633\u0645\u062D",
+  "\uFD61",
+  "\u0633\u0645\u062C",
+  "\uFD62",
+  "\u0633\u0645\u0645",
+  "\uFD63",
+  "\u0633\u0645\u0645",
+  "\uFD64",
+  "\u0635\u062D\u062D",
+  "\uFD65",
+  "\u0635\u062D\u062D",
+  "\uFD66",
+  "\u0635\u0645\u0645",
+  "\uFD67",
+  "\u0634\u062D\u0645",
+  "\uFD68",
+  "\u0634\u062D\u0645",
+  "\uFD69",
+  "\u0634\u062C\u064A",
+  "\uFD6A",
+  "\u0634\u0645\u062E",
+  "\uFD6B",
+  "\u0634\u0645\u062E",
+  "\uFD6C",
+  "\u0634\u0645\u0645",
+  "\uFD6D",
+  "\u0634\u0645\u0645",
+  "\uFD6E",
+  "\u0636\u062D\u0649",
+  "\uFD6F",
+  "\u0636\u062E\u0645",
+  "\uFD70",
+  "\u0636\u062E\u0645",
+  "\uFD71",
+  "\u0637\u0645\u062D",
+  "\uFD72",
+  "\u0637\u0645\u062D",
+  "\uFD73",
+  "\u0637\u0645\u0645",
+  "\uFD74",
+  "\u0637\u0645\u064A",
+  "\uFD75",
+  "\u0639\u062C\u0645",
+  "\uFD76",
+  "\u0639\u0645\u0645",
+  "\uFD77",
+  "\u0639\u0645\u0645",
+  "\uFD78",
+  "\u0639\u0645\u0649",
+  "\uFD79",
+  "\u063A\u0645\u0645",
+  "\uFD7A",
+  "\u063A\u0645\u064A",
+  "\uFD7B",
+  "\u063A\u0645\u0649",
+  "\uFD7C",
+  "\u0641\u062E\u0645",
+  "\uFD7D",
+  "\u0641\u062E\u0645",
+  "\uFD7E",
+  "\u0642\u0645\u062D",
+  "\uFD7F",
+  "\u0642\u0645\u0645",
+  "\uFD80",
+  "\u0644\u062D\u0645",
+  "\uFD81",
+  "\u0644\u062D\u064A",
+  "\uFD82",
+  "\u0644\u062D\u0649",
+  "\uFD83",
+  "\u0644\u062C\u062C",
+  "\uFD84",
+  "\u0644\u062C\u062C",
+  "\uFD85",
+  "\u0644\u062E\u0645",
+  "\uFD86",
+  "\u0644\u062E\u0645",
+  "\uFD87",
+  "\u0644\u0645\u062D",
+  "\uFD88",
+  "\u0644\u0645\u062D",
+  "\uFD89",
+  "\u0645\u062D\u062C",
+  "\uFD8A",
+  "\u0645\u062D\u0645",
+  "\uFD8B",
+  "\u0645\u062D\u064A",
+  "\uFD8C",
+  "\u0645\u062C\u062D",
+  "\uFD8D",
+  "\u0645\u062C\u0645",
+  "\uFD8E",
+  "\u0645\u062E\u062C",
+  "\uFD8F",
+  "\u0645\u062E\u0645",
+  "\uFD92",
+  "\u0645\u062C\u062E",
+  "\uFD93",
+  "\u0647\u0645\u062C",
+  "\uFD94",
+  "\u0647\u0645\u0645",
+  "\uFD95",
+  "\u0646\u062D\u0645",
+  "\uFD96",
+  "\u0646\u062D\u0649",
+  "\uFD97",
+  "\u0646\u062C\u0645",
+  "\uFD98",
+  "\u0646\u062C\u0645",
+  "\uFD99",
+  "\u0646\u062C\u0649",
+  "\uFD9A",
+  "\u0646\u0645\u064A",
+  "\uFD9B",
+  "\u0646\u0645\u0649",
+  "\uFD9C",
+  "\u064A\u0645\u0645",
+  "\uFD9D",
+  "\u064A\u0645\u0645",
+  "\uFD9E",
+  "\u0628\u062E\u064A",
+  "\uFD9F",
+  "\u062A\u062C\u064A",
+  "\uFDA0",
+  "\u062A\u062C\u0649",
+  "\uFDA1",
+  "\u062A\u062E\u064A",
+  "\uFDA2",
+  "\u062A\u062E\u0649",
+  "\uFDA3",
+  "\u062A\u0645\u064A",
+  "\uFDA4",
+  "\u062A\u0645\u0649",
+  "\uFDA5",
+  "\u062C\u0645\u064A",
+  "\uFDA6",
+  "\u062C\u062D\u0649",
+  "\uFDA7",
+  "\u062C\u0645\u0649",
+  "\uFDA8",
+  "\u0633\u062E\u0649",
+  "\uFDA9",
+  "\u0635\u062D\u064A",
+  "\uFDAA",
+  "\u0634\u062D\u064A",
+  "\uFDAB",
+  "\u0636\u062D\u064A",
+  "\uFDAC",
+  "\u0644\u062C\u064A",
+  "\uFDAD",
+  "\u0644\u0645\u064A",
+  "\uFDAE",
+  "\u064A\u062D\u064A",
+  "\uFDAF",
+  "\u064A\u062C\u064A",
+  "\uFDB0",
+  "\u064A\u0645\u064A",
+  "\uFDB1",
+  "\u0645\u0645\u064A",
+  "\uFDB2",
+  "\u0642\u0645\u064A",
+  "\uFDB3",
+  "\u0646\u062D\u064A",
+  "\uFDB4",
+  "\u0642\u0645\u062D",
+  "\uFDB5",
+  "\u0644\u062D\u0645",
+  "\uFDB6",
+  "\u0639\u0645\u064A",
+  "\uFDB7",
+  "\u0643\u0645\u064A",
+  "\uFDB8",
+  "\u0646\u062C\u062D",
+  "\uFDB9",
+  "\u0645\u062E\u064A",
+  "\uFDBA",
+  "\u0644\u062C\u0645",
+  "\uFDBB",
+  "\u0643\u0645\u0645",
+  "\uFDBC",
+  "\u0644\u062C\u0645",
+  "\uFDBD",
+  "\u0646\u062C\u062D",
+  "\uFDBE",
+  "\u062C\u062D\u064A",
+  "\uFDBF",
+  "\u062D\u062C\u064A",
+  "\uFDC0",
+  "\u0645\u062C\u064A",
+  "\uFDC1",
+  "\u0641\u0645\u064A",
+  "\uFDC2",
+  "\u0628\u062D\u064A",
+  "\uFDC3",
+  "\u0643\u0645\u0645",
+  "\uFDC4",
+  "\u0639\u062C\u0645",
+  "\uFDC5",
+  "\u0635\u0645\u0645",
+  "\uFDC6",
+  "\u0633\u062E\u064A",
+  "\uFDC7",
+  "\u0646\u062C\u064A",
+  "\uFE49",
+  "\u203E",
+  "\uFE4A",
+  "\u203E",
+  "\uFE4B",
+  "\u203E",
+  "\uFE4C",
+  "\u203E",
+  "\uFE4D",
+  "\u005F",
+  "\uFE4E",
+  "\u005F",
+  "\uFE4F",
+  "\u005F",
+  "\uFE80",
+  "\u0621",
+  "\uFE81",
+  "\u0622",
+  "\uFE82",
+  "\u0622",
+  "\uFE83",
+  "\u0623",
+  "\uFE84",
+  "\u0623",
+  "\uFE85",
+  "\u0624",
+  "\uFE86",
+  "\u0624",
+  "\uFE87",
+  "\u0625",
+  "\uFE88",
+  "\u0625",
+  "\uFE89",
+  "\u0626",
+  "\uFE8A",
+  "\u0626",
+  "\uFE8B",
+  "\u0626",
+  "\uFE8C",
+  "\u0626",
+  "\uFE8D",
+  "\u0627",
+  "\uFE8E",
+  "\u0627",
+  "\uFE8F",
+  "\u0628",
+  "\uFE90",
+  "\u0628",
+  "\uFE91",
+  "\u0628",
+  "\uFE92",
+  "\u0628",
+  "\uFE93",
+  "\u0629",
+  "\uFE94",
+  "\u0629",
+  "\uFE95",
+  "\u062A",
+  "\uFE96",
+  "\u062A",
+  "\uFE97",
+  "\u062A",
+  "\uFE98",
+  "\u062A",
+  "\uFE99",
+  "\u062B",
+  "\uFE9A",
+  "\u062B",
+  "\uFE9B",
+  "\u062B",
+  "\uFE9C",
+  "\u062B",
+  "\uFE9D",
+  "\u062C",
+  "\uFE9E",
+  "\u062C",
+  "\uFE9F",
+  "\u062C",
+  "\uFEA0",
+  "\u062C",
+  "\uFEA1",
+  "\u062D",
+  "\uFEA2",
+  "\u062D",
+  "\uFEA3",
+  "\u062D",
+  "\uFEA4",
+  "\u062D",
+  "\uFEA5",
+  "\u062E",
+  "\uFEA6",
+  "\u062E",
+  "\uFEA7",
+  "\u062E",
+  "\uFEA8",
+  "\u062E",
+  "\uFEA9",
+  "\u062F",
+  "\uFEAA",
+  "\u062F",
+  "\uFEAB",
+  "\u0630",
+  "\uFEAC",
+  "\u0630",
+  "\uFEAD",
+  "\u0631",
+  "\uFEAE",
+  "\u0631",
+  "\uFEAF",
+  "\u0632",
+  "\uFEB0",
+  "\u0632",
+  "\uFEB1",
+  "\u0633",
+  "\uFEB2",
+  "\u0633",
+  "\uFEB3",
+  "\u0633",
+  "\uFEB4",
+  "\u0633",
+  "\uFEB5",
+  "\u0634",
+  "\uFEB6",
+  "\u0634",
+  "\uFEB7",
+  "\u0634",
+  "\uFEB8",
+  "\u0634",
+  "\uFEB9",
+  "\u0635",
+  "\uFEBA",
+  "\u0635",
+  "\uFEBB",
+  "\u0635",
+  "\uFEBC",
+  "\u0635",
+  "\uFEBD",
+  "\u0636",
+  "\uFEBE",
+  "\u0636",
+  "\uFEBF",
+  "\u0636",
+  "\uFEC0",
+  "\u0636",
+  "\uFEC1",
+  "\u0637",
+  "\uFEC2",
+  "\u0637",
+  "\uFEC3",
+  "\u0637",
+  "\uFEC4",
+  "\u0637",
+  "\uFEC5",
+  "\u0638",
+  "\uFEC6",
+  "\u0638",
+  "\uFEC7",
+  "\u0638",
+  "\uFEC8",
+  "\u0638",
+  "\uFEC9",
+  "\u0639",
+  "\uFECA",
+  "\u0639",
+  "\uFECB",
+  "\u0639",
+  "\uFECC",
+  "\u0639",
+  "\uFECD",
+  "\u063A",
+  "\uFECE",
+  "\u063A",
+  "\uFECF",
+  "\u063A",
+  "\uFED0",
+  "\u063A",
+  "\uFED1",
+  "\u0641",
+  "\uFED2",
+  "\u0641",
+  "\uFED3",
+  "\u0641",
+  "\uFED4",
+  "\u0641",
+  "\uFED5",
+  "\u0642",
+  "\uFED6",
+  "\u0642",
+  "\uFED7",
+  "\u0642",
+  "\uFED8",
+  "\u0642",
+  "\uFED9",
+  "\u0643",
+  "\uFEDA",
+  "\u0643",
+  "\uFEDB",
+  "\u0643",
+  "\uFEDC",
+  "\u0643",
+  "\uFEDD",
+  "\u0644",
+  "\uFEDE",
+  "\u0644",
+  "\uFEDF",
+  "\u0644",
+  "\uFEE0",
+  "\u0644",
+  "\uFEE1",
+  "\u0645",
+  "\uFEE2",
+  "\u0645",
+  "\uFEE3",
+  "\u0645",
+  "\uFEE4",
+  "\u0645",
+  "\uFEE5",
+  "\u0646",
+  "\uFEE6",
+  "\u0646",
+  "\uFEE7",
+  "\u0646",
+  "\uFEE8",
+  "\u0646",
+  "\uFEE9",
+  "\u0647",
+  "\uFEEA",
+  "\u0647",
+  "\uFEEB",
+  "\u0647",
+  "\uFEEC",
+  "\u0647",
+  "\uFEED",
+  "\u0648",
+  "\uFEEE",
+  "\u0648",
+  "\uFEEF",
+  "\u0649",
+  "\uFEF0",
+  "\u0649",
+  "\uFEF1",
+  "\u064A",
+  "\uFEF2",
+  "\u064A",
+  "\uFEF3",
+  "\u064A",
+  "\uFEF4",
+  "\u064A",
+  "\uFEF5",
+  "\u0644\u0622",
+  "\uFEF6",
+  "\u0644\u0622",
+  "\uFEF7",
+  "\u0644\u0623",
+  "\uFEF8",
+  "\u0644\u0623",
+  "\uFEF9",
+  "\u0644\u0625",
+  "\uFEFA",
+  "\u0644\u0625",
+  "\uFEFB",
+  "\u0644\u0627",
+  "\uFEFC",
+  "\u0644\u0627"
+ ];
 });
 function reverseIfRtl(chars) {
- var charsLength = chars.length;
+ const charsLength = chars.length;
  if (charsLength <= 1 || !isRTLRangeFor(chars.charCodeAt(0))) {
   return chars;
  }
- var s = "";
- for (var ii = charsLength - 1; ii >= 0; ii--) {
-  s += chars[ii];
+ const buf = [];
+ for (let ii = charsLength - 1; ii >= 0; ii--) {
+  buf.push(chars[ii]);
  }
- return s;
+ return buf.join("");
 }
-exports.mapSpecialUnicodeValues = mapSpecialUnicodeValues;
-exports.reverseIfRtl = reverseIfRtl;
-exports.getUnicodeRangeFor = getUnicodeRangeFor;
-exports.getNormalizedUnicodes = getNormalizedUnicodes;
-exports.getUnicodeForGlyph = getUnicodeForGlyph;
+const SpecialCharRegExp = new RegExp("^(\\s)|(\\p{Mn})|(\\p{Cf})$", "u");
+const CategoryCache = new Map();
+function getCharUnicodeCategory(char) {
+ const cachedCategory = CategoryCache.get(char);
+ if (cachedCategory) {
+  return cachedCategory;
+ }
+ const groups = char.match(SpecialCharRegExp);
+ const category = {
+  isWhitespace: !!(groups && groups[1]),
+  isZeroWidthDiacritic: !!(groups && groups[2]),
+  isInvisibleFormatMark: !!(groups && groups[3])
+ };
+ CategoryCache.set(char, category);
+ return category;
+}
+function clearUnicodeCaches() {
+ CategoryCache.clear();
+}
+
 
 /***/ }),
-/* 37 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 41 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
+}));
+exports.getSerifFonts = exports.getNonStdFontMap = exports.getGlyphMapForStandardFonts = exports.getFontNameToFileMap = void 0;
+exports.getStandardFontName = getStandardFontName;
+exports.getSymbolsFonts = exports.getSupplementalGlyphMapForCalibri = exports.getSupplementalGlyphMapForArialBlack = exports.getStdFontMap = void 0;
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _fonts_utils = __w_pdfjs_require__(38);
+
+const getStdFontMap = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t["Times-Roman"] = "Times-Roman";
+  t.Helvetica = "Helvetica";
+  t.Courier = "Courier";
+  t.Symbol = "Symbol";
+  t["Times-Bold"] = "Times-Bold";
+  t["Helvetica-Bold"] = "Helvetica-Bold";
+  t["Courier-Bold"] = "Courier-Bold";
+  t.ZapfDingbats = "ZapfDingbats";
+  t["Times-Italic"] = "Times-Italic";
+  t["Helvetica-Oblique"] = "Helvetica-Oblique";
+  t["Courier-Oblique"] = "Courier-Oblique";
+  t["Times-BoldItalic"] = "Times-BoldItalic";
+  t["Helvetica-BoldOblique"] = "Helvetica-BoldOblique";
+  t["Courier-BoldOblique"] = "Courier-BoldOblique";
+  t.ArialNarrow = "Helvetica";
+  t["ArialNarrow-Bold"] = "Helvetica-Bold";
+  t["ArialNarrow-BoldItalic"] = "Helvetica-BoldOblique";
+  t["ArialNarrow-Italic"] = "Helvetica-Oblique";
+  t.ArialBlack = "Helvetica";
+  t["ArialBlack-Bold"] = "Helvetica-Bold";
+  t["ArialBlack-BoldItalic"] = "Helvetica-BoldOblique";
+  t["ArialBlack-Italic"] = "Helvetica-Oblique";
+  t["Arial-Black"] = "Helvetica";
+  t["Arial-Black-Bold"] = "Helvetica-Bold";
+  t["Arial-Black-BoldItalic"] = "Helvetica-BoldOblique";
+  t["Arial-Black-Italic"] = "Helvetica-Oblique";
+  t.Arial = "Helvetica";
+  t["Arial-Bold"] = "Helvetica-Bold";
+  t["Arial-BoldItalic"] = "Helvetica-BoldOblique";
+  t["Arial-Italic"] = "Helvetica-Oblique";
+  t.ArialMT = "Helvetica";
+  t["Arial-BoldItalicMT"] = "Helvetica-BoldOblique";
+  t["Arial-BoldMT"] = "Helvetica-Bold";
+  t["Arial-ItalicMT"] = "Helvetica-Oblique";
+  t.ArialUnicodeMS = "Helvetica";
+  t["ArialUnicodeMS-Bold"] = "Helvetica-Bold";
+  t["ArialUnicodeMS-BoldItalic"] = "Helvetica-BoldOblique";
+  t["ArialUnicodeMS-Italic"] = "Helvetica-Oblique";
+  t["Courier-BoldItalic"] = "Courier-BoldOblique";
+  t["Courier-Italic"] = "Courier-Oblique";
+  t.CourierNew = "Courier";
+  t["CourierNew-Bold"] = "Courier-Bold";
+  t["CourierNew-BoldItalic"] = "Courier-BoldOblique";
+  t["CourierNew-Italic"] = "Courier-Oblique";
+  t["CourierNewPS-BoldItalicMT"] = "Courier-BoldOblique";
+  t["CourierNewPS-BoldMT"] = "Courier-Bold";
+  t["CourierNewPS-ItalicMT"] = "Courier-Oblique";
+  t.CourierNewPSMT = "Courier";
+  t["Helvetica-BoldItalic"] = "Helvetica-BoldOblique";
+  t["Helvetica-Italic"] = "Helvetica-Oblique";
+  t["Symbol-Bold"] = "Symbol";
+  t["Symbol-BoldItalic"] = "Symbol";
+  t["Symbol-Italic"] = "Symbol";
+  t.TimesNewRoman = "Times-Roman";
+  t["TimesNewRoman-Bold"] = "Times-Bold";
+  t["TimesNewRoman-BoldItalic"] = "Times-BoldItalic";
+  t["TimesNewRoman-Italic"] = "Times-Italic";
+  t.TimesNewRomanPS = "Times-Roman";
+  t["TimesNewRomanPS-Bold"] = "Times-Bold";
+  t["TimesNewRomanPS-BoldItalic"] = "Times-BoldItalic";
+  t["TimesNewRomanPS-BoldItalicMT"] = "Times-BoldItalic";
+  t["TimesNewRomanPS-BoldMT"] = "Times-Bold";
+  t["TimesNewRomanPS-Italic"] = "Times-Italic";
+  t["TimesNewRomanPS-ItalicMT"] = "Times-Italic";
+  t.TimesNewRomanPSMT = "Times-Roman";
+  t["TimesNewRomanPSMT-Bold"] = "Times-Bold";
+  t["TimesNewRomanPSMT-BoldItalic"] = "Times-BoldItalic";
+  t["TimesNewRomanPSMT-Italic"] = "Times-Italic";
 });
+exports.getStdFontMap = getStdFontMap;
+const getFontNameToFileMap = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t.Courier = "FoxitFixed.pfb";
+  t["Courier-Bold"] = "FoxitFixedBold.pfb";
+  t["Courier-BoldOblique"] = "FoxitFixedBoldItalic.pfb";
+  t["Courier-Oblique"] = "FoxitFixedItalic.pfb";
+  t.Helvetica = "FoxitSans.pfb";
+  t["Helvetica-Bold"] = "FoxitSansBold.pfb";
+  t["Helvetica-BoldOblique"] = "FoxitSansBoldItalic.pfb";
+  t["Helvetica-Oblique"] = "FoxitSansItalic.pfb";
+  t["Times-Roman"] = "FoxitSerif.pfb";
+  t["Times-Bold"] = "FoxitSerifBold.pfb";
+  t["Times-BoldItalic"] = "FoxitSerifBoldItalic.pfb";
+  t["Times-Italic"] = "FoxitSerifItalic.pfb";
+  t.Symbol = "FoxitSymbol.pfb";
+  t.ZapfDingbats = "FoxitDingbats.pfb";
+  t["LiberationSans-Regular"] = "LiberationSans-Regular.ttf";
+  t["LiberationSans-Bold"] = "LiberationSans-Bold.ttf";
+  t["LiberationSans-Italic"] = "LiberationSans-Italic.ttf";
+  t["LiberationSans-BoldItalic"] = "LiberationSans-BoldItalic.ttf";
+});
+exports.getFontNameToFileMap = getFontNameToFileMap;
+const getNonStdFontMap = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t.Calibri = "Helvetica";
+  t["Calibri-Bold"] = "Helvetica-Bold";
+  t["Calibri-BoldItalic"] = "Helvetica-BoldOblique";
+  t["Calibri-Italic"] = "Helvetica-Oblique";
+  t.CenturyGothic = "Helvetica";
+  t["CenturyGothic-Bold"] = "Helvetica-Bold";
+  t["CenturyGothic-BoldItalic"] = "Helvetica-BoldOblique";
+  t["CenturyGothic-Italic"] = "Helvetica-Oblique";
+  t.ComicSansMS = "Comic Sans MS";
+  t["ComicSansMS-Bold"] = "Comic Sans MS-Bold";
+  t["ComicSansMS-BoldItalic"] = "Comic Sans MS-BoldItalic";
+  t["ComicSansMS-Italic"] = "Comic Sans MS-Italic";
+  t["ItcSymbol-Bold"] = "Helvetica-Bold";
+  t["ItcSymbol-BoldItalic"] = "Helvetica-BoldOblique";
+  t["ItcSymbol-Book"] = "Helvetica";
+  t["ItcSymbol-BookItalic"] = "Helvetica-Oblique";
+  t["ItcSymbol-Medium"] = "Helvetica";
+  t["ItcSymbol-MediumItalic"] = "Helvetica-Oblique";
+  t.LucidaConsole = "Courier";
+  t["LucidaConsole-Bold"] = "Courier-Bold";
+  t["LucidaConsole-BoldItalic"] = "Courier-BoldOblique";
+  t["LucidaConsole-Italic"] = "Courier-Oblique";
+  t["LucidaSans-Demi"] = "Helvetica-Bold";
+  t["MS-Gothic"] = "MS Gothic";
+  t["MS-Gothic-Bold"] = "MS Gothic-Bold";
+  t["MS-Gothic-BoldItalic"] = "MS Gothic-BoldItalic";
+  t["MS-Gothic-Italic"] = "MS Gothic-Italic";
+  t["MS-Mincho"] = "MS Mincho";
+  t["MS-Mincho-Bold"] = "MS Mincho-Bold";
+  t["MS-Mincho-BoldItalic"] = "MS Mincho-BoldItalic";
+  t["MS-Mincho-Italic"] = "MS Mincho-Italic";
+  t["MS-PGothic"] = "MS PGothic";
+  t["MS-PGothic-Bold"] = "MS PGothic-Bold";
+  t["MS-PGothic-BoldItalic"] = "MS PGothic-BoldItalic";
+  t["MS-PGothic-Italic"] = "MS PGothic-Italic";
+  t["MS-PMincho"] = "MS PMincho";
+  t["MS-PMincho-Bold"] = "MS PMincho-Bold";
+  t["MS-PMincho-BoldItalic"] = "MS PMincho-BoldItalic";
+  t["MS-PMincho-Italic"] = "MS PMincho-Italic";
+  t.NuptialScript = "Times-Italic";
+  t.SegoeUISymbol = "Helvetica";
+  t.Wingdings = "ZapfDingbats";
+  t["Wingdings-Regular"] = "ZapfDingbats";
+});
+exports.getNonStdFontMap = getNonStdFontMap;
+const getSerifFonts = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t["Adobe Jenson"] = true;
+  t["Adobe Text"] = true;
+  t.Albertus = true;
+  t.Aldus = true;
+  t.Alexandria = true;
+  t.Algerian = true;
+  t["American Typewriter"] = true;
+  t.Antiqua = true;
+  t.Apex = true;
+  t.Arno = true;
+  t.Aster = true;
+  t.Aurora = true;
+  t.Baskerville = true;
+  t.Bell = true;
+  t.Bembo = true;
+  t["Bembo Schoolbook"] = true;
+  t.Benguiat = true;
+  t["Berkeley Old Style"] = true;
+  t["Bernhard Modern"] = true;
+  t["Berthold City"] = true;
+  t.Bodoni = true;
+  t["Bauer Bodoni"] = true;
+  t["Book Antiqua"] = true;
+  t.Bookman = true;
+  t["Bordeaux Roman"] = true;
+  t["Californian FB"] = true;
+  t.Calisto = true;
+  t.Calvert = true;
+  t.Capitals = true;
+  t.Cambria = true;
+  t.Cartier = true;
+  t.Caslon = true;
+  t.Catull = true;
+  t.Centaur = true;
+  t["Century Old Style"] = true;
+  t["Century Schoolbook"] = true;
+  t.Chaparral = true;
+  t["Charis SIL"] = true;
+  t.Cheltenham = true;
+  t["Cholla Slab"] = true;
+  t.Clarendon = true;
+  t.Clearface = true;
+  t.Cochin = true;
+  t.Colonna = true;
+  t["Computer Modern"] = true;
+  t["Concrete Roman"] = true;
+  t.Constantia = true;
+  t["Cooper Black"] = true;
+  t.Corona = true;
+  t.Ecotype = true;
+  t.Egyptienne = true;
+  t.Elephant = true;
+  t.Excelsior = true;
+  t.Fairfield = true;
+  t["FF Scala"] = true;
+  t.Folkard = true;
+  t.Footlight = true;
+  t.FreeSerif = true;
+  t["Friz Quadrata"] = true;
+  t.Garamond = true;
+  t.Gentium = true;
+  t.Georgia = true;
+  t.Gloucester = true;
+  t["Goudy Old Style"] = true;
+  t["Goudy Schoolbook"] = true;
+  t["Goudy Pro Font"] = true;
+  t.Granjon = true;
+  t["Guardian Egyptian"] = true;
+  t.Heather = true;
+  t.Hercules = true;
+  t["High Tower Text"] = true;
+  t.Hiroshige = true;
+  t["Hoefler Text"] = true;
+  t["Humana Serif"] = true;
+  t.Imprint = true;
+  t["Ionic No. 5"] = true;
+  t.Janson = true;
+  t.Joanna = true;
+  t.Korinna = true;
+  t.Lexicon = true;
+  t.LiberationSerif = true;
+  t["Liberation Serif"] = true;
+  t["Linux Libertine"] = true;
+  t.Literaturnaya = true;
+  t.Lucida = true;
+  t["Lucida Bright"] = true;
+  t.Melior = true;
+  t.Memphis = true;
+  t.Miller = true;
+  t.Minion = true;
+  t.Modern = true;
+  t["Mona Lisa"] = true;
+  t["Mrs Eaves"] = true;
+  t["MS Serif"] = true;
+  t["Museo Slab"] = true;
+  t["New York"] = true;
+  t["Nimbus Roman"] = true;
+  t["NPS Rawlinson Roadway"] = true;
+  t.NuptialScript = true;
+  t.Palatino = true;
+  t.Perpetua = true;
+  t.Plantin = true;
+  t["Plantin Schoolbook"] = true;
+  t.Playbill = true;
+  t["Poor Richard"] = true;
+  t["Rawlinson Roadway"] = true;
+  t.Renault = true;
+  t.Requiem = true;
+  t.Rockwell = true;
+  t.Roman = true;
+  t["Rotis Serif"] = true;
+  t.Sabon = true;
+  t.Scala = true;
+  t.Seagull = true;
+  t.Sistina = true;
+  t.Souvenir = true;
+  t.STIX = true;
+  t["Stone Informal"] = true;
+  t["Stone Serif"] = true;
+  t.Sylfaen = true;
+  t.Times = true;
+  t.Trajan = true;
+  t["Trinité"] = true;
+  t["Trump Mediaeval"] = true;
+  t.Utopia = true;
+  t["Vale Type"] = true;
+  t["Bitstream Vera"] = true;
+  t["Vera Serif"] = true;
+  t.Versailles = true;
+  t.Wanted = true;
+  t.Weiss = true;
+  t["Wide Latin"] = true;
+  t.Windsor = true;
+  t.XITS = true;
+});
+exports.getSerifFonts = getSerifFonts;
+const getSymbolsFonts = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t.Dingbats = true;
+  t.Symbol = true;
+  t.ZapfDingbats = true;
+});
+exports.getSymbolsFonts = getSymbolsFonts;
+const getGlyphMapForStandardFonts = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t[2] = 10;
+  t[3] = 32;
+  t[4] = 33;
+  t[5] = 34;
+  t[6] = 35;
+  t[7] = 36;
+  t[8] = 37;
+  t[9] = 38;
+  t[10] = 39;
+  t[11] = 40;
+  t[12] = 41;
+  t[13] = 42;
+  t[14] = 43;
+  t[15] = 44;
+  t[16] = 45;
+  t[17] = 46;
+  t[18] = 47;
+  t[19] = 48;
+  t[20] = 49;
+  t[21] = 50;
+  t[22] = 51;
+  t[23] = 52;
+  t[24] = 53;
+  t[25] = 54;
+  t[26] = 55;
+  t[27] = 56;
+  t[28] = 57;
+  t[29] = 58;
+  t[30] = 894;
+  t[31] = 60;
+  t[32] = 61;
+  t[33] = 62;
+  t[34] = 63;
+  t[35] = 64;
+  t[36] = 65;
+  t[37] = 66;
+  t[38] = 67;
+  t[39] = 68;
+  t[40] = 69;
+  t[41] = 70;
+  t[42] = 71;
+  t[43] = 72;
+  t[44] = 73;
+  t[45] = 74;
+  t[46] = 75;
+  t[47] = 76;
+  t[48] = 77;
+  t[49] = 78;
+  t[50] = 79;
+  t[51] = 80;
+  t[52] = 81;
+  t[53] = 82;
+  t[54] = 83;
+  t[55] = 84;
+  t[56] = 85;
+  t[57] = 86;
+  t[58] = 87;
+  t[59] = 88;
+  t[60] = 89;
+  t[61] = 90;
+  t[62] = 91;
+  t[63] = 92;
+  t[64] = 93;
+  t[65] = 94;
+  t[66] = 95;
+  t[67] = 96;
+  t[68] = 97;
+  t[69] = 98;
+  t[70] = 99;
+  t[71] = 100;
+  t[72] = 101;
+  t[73] = 102;
+  t[74] = 103;
+  t[75] = 104;
+  t[76] = 105;
+  t[77] = 106;
+  t[78] = 107;
+  t[79] = 108;
+  t[80] = 109;
+  t[81] = 110;
+  t[82] = 111;
+  t[83] = 112;
+  t[84] = 113;
+  t[85] = 114;
+  t[86] = 115;
+  t[87] = 116;
+  t[88] = 117;
+  t[89] = 118;
+  t[90] = 119;
+  t[91] = 120;
+  t[92] = 121;
+  t[93] = 122;
+  t[94] = 123;
+  t[95] = 124;
+  t[96] = 125;
+  t[97] = 126;
+  t[98] = 196;
+  t[99] = 197;
+  t[100] = 199;
+  t[101] = 201;
+  t[102] = 209;
+  t[103] = 214;
+  t[104] = 220;
+  t[105] = 225;
+  t[106] = 224;
+  t[107] = 226;
+  t[108] = 228;
+  t[109] = 227;
+  t[110] = 229;
+  t[111] = 231;
+  t[112] = 233;
+  t[113] = 232;
+  t[114] = 234;
+  t[115] = 235;
+  t[116] = 237;
+  t[117] = 236;
+  t[118] = 238;
+  t[119] = 239;
+  t[120] = 241;
+  t[121] = 243;
+  t[122] = 242;
+  t[123] = 244;
+  t[124] = 246;
+  t[125] = 245;
+  t[126] = 250;
+  t[127] = 249;
+  t[128] = 251;
+  t[129] = 252;
+  t[130] = 8224;
+  t[131] = 176;
+  t[132] = 162;
+  t[133] = 163;
+  t[134] = 167;
+  t[135] = 8226;
+  t[136] = 182;
+  t[137] = 223;
+  t[138] = 174;
+  t[139] = 169;
+  t[140] = 8482;
+  t[141] = 180;
+  t[142] = 168;
+  t[143] = 8800;
+  t[144] = 198;
+  t[145] = 216;
+  t[146] = 8734;
+  t[147] = 177;
+  t[148] = 8804;
+  t[149] = 8805;
+  t[150] = 165;
+  t[151] = 181;
+  t[152] = 8706;
+  t[153] = 8721;
+  t[154] = 8719;
+  t[156] = 8747;
+  t[157] = 170;
+  t[158] = 186;
+  t[159] = 8486;
+  t[160] = 230;
+  t[161] = 248;
+  t[162] = 191;
+  t[163] = 161;
+  t[164] = 172;
+  t[165] = 8730;
+  t[166] = 402;
+  t[167] = 8776;
+  t[168] = 8710;
+  t[169] = 171;
+  t[170] = 187;
+  t[171] = 8230;
+  t[200] = 193;
+  t[203] = 205;
+  t[210] = 218;
+  t[223] = 711;
+  t[224] = 321;
+  t[225] = 322;
+  t[226] = 352;
+  t[227] = 353;
+  t[228] = 381;
+  t[229] = 382;
+  t[233] = 221;
+  t[234] = 253;
+  t[252] = 263;
+  t[253] = 268;
+  t[254] = 269;
+  t[258] = 258;
+  t[260] = 260;
+  t[261] = 261;
+  t[265] = 280;
+  t[266] = 281;
+  t[267] = 282;
+  t[268] = 283;
+  t[269] = 313;
+  t[275] = 323;
+  t[276] = 324;
+  t[278] = 328;
+  t[283] = 344;
+  t[284] = 345;
+  t[285] = 346;
+  t[286] = 347;
+  t[292] = 367;
+  t[295] = 377;
+  t[296] = 378;
+  t[298] = 380;
+  t[305] = 963;
+  t[306] = 964;
+  t[307] = 966;
+  t[308] = 8215;
+  t[309] = 8252;
+  t[310] = 8319;
+  t[311] = 8359;
+  t[312] = 8592;
+  t[313] = 8593;
+  t[337] = 9552;
+  t[493] = 1039;
+  t[494] = 1040;
+  t[672] = 1488;
+  t[673] = 1489;
+  t[674] = 1490;
+  t[675] = 1491;
+  t[676] = 1492;
+  t[677] = 1493;
+  t[678] = 1494;
+  t[679] = 1495;
+  t[680] = 1496;
+  t[681] = 1497;
+  t[682] = 1498;
+  t[683] = 1499;
+  t[684] = 1500;
+  t[685] = 1501;
+  t[686] = 1502;
+  t[687] = 1503;
+  t[688] = 1504;
+  t[689] = 1505;
+  t[690] = 1506;
+  t[691] = 1507;
+  t[692] = 1508;
+  t[693] = 1509;
+  t[694] = 1510;
+  t[695] = 1511;
+  t[696] = 1512;
+  t[697] = 1513;
+  t[698] = 1514;
+  t[705] = 1524;
+  t[706] = 8362;
+  t[710] = 64288;
+  t[711] = 64298;
+  t[759] = 1617;
+  t[761] = 1776;
+  t[763] = 1778;
+  t[775] = 1652;
+  t[777] = 1764;
+  t[778] = 1780;
+  t[779] = 1781;
+  t[780] = 1782;
+  t[782] = 771;
+  t[783] = 64726;
+  t[786] = 8363;
+  t[788] = 8532;
+  t[790] = 768;
+  t[791] = 769;
+  t[792] = 768;
+  t[795] = 803;
+  t[797] = 64336;
+  t[798] = 64337;
+  t[799] = 64342;
+  t[800] = 64343;
+  t[801] = 64344;
+  t[802] = 64345;
+  t[803] = 64362;
+  t[804] = 64363;
+  t[805] = 64364;
+  t[2424] = 7821;
+  t[2425] = 7822;
+  t[2426] = 7823;
+  t[2427] = 7824;
+  t[2428] = 7825;
+  t[2429] = 7826;
+  t[2430] = 7827;
+  t[2433] = 7682;
+  t[2678] = 8045;
+  t[2679] = 8046;
+  t[2830] = 1552;
+  t[2838] = 686;
+  t[2840] = 751;
+  t[2842] = 753;
+  t[2843] = 754;
+  t[2844] = 755;
+  t[2846] = 757;
+  t[2856] = 767;
+  t[2857] = 848;
+  t[2858] = 849;
+  t[2862] = 853;
+  t[2863] = 854;
+  t[2864] = 855;
+  t[2865] = 861;
+  t[2866] = 862;
+  t[2906] = 7460;
+  t[2908] = 7462;
+  t[2909] = 7463;
+  t[2910] = 7464;
+  t[2912] = 7466;
+  t[2913] = 7467;
+  t[2914] = 7468;
+  t[2916] = 7470;
+  t[2917] = 7471;
+  t[2918] = 7472;
+  t[2920] = 7474;
+  t[2921] = 7475;
+  t[2922] = 7476;
+  t[2924] = 7478;
+  t[2925] = 7479;
+  t[2926] = 7480;
+  t[2928] = 7482;
+  t[2929] = 7483;
+  t[2930] = 7484;
+  t[2932] = 7486;
+  t[2933] = 7487;
+  t[2934] = 7488;
+  t[2936] = 7490;
+  t[2937] = 7491;
+  t[2938] = 7492;
+  t[2940] = 7494;
+  t[2941] = 7495;
+  t[2942] = 7496;
+  t[2944] = 7498;
+  t[2946] = 7500;
+  t[2948] = 7502;
+  t[2950] = 7504;
+  t[2951] = 7505;
+  t[2952] = 7506;
+  t[2954] = 7508;
+  t[2955] = 7509;
+  t[2956] = 7510;
+  t[2958] = 7512;
+  t[2959] = 7513;
+  t[2960] = 7514;
+  t[2962] = 7516;
+  t[2963] = 7517;
+  t[2964] = 7518;
+  t[2966] = 7520;
+  t[2967] = 7521;
+  t[2968] = 7522;
+  t[2970] = 7524;
+  t[2971] = 7525;
+  t[2972] = 7526;
+  t[2974] = 7528;
+  t[2975] = 7529;
+  t[2976] = 7530;
+  t[2978] = 1537;
+  t[2979] = 1538;
+  t[2980] = 1539;
+  t[2982] = 1549;
+  t[2983] = 1551;
+  t[2984] = 1552;
+  t[2986] = 1554;
+  t[2987] = 1555;
+  t[2988] = 1556;
+  t[2990] = 1623;
+  t[2991] = 1624;
+  t[2995] = 1775;
+  t[2999] = 1791;
+  t[3002] = 64290;
+  t[3003] = 64291;
+  t[3004] = 64292;
+  t[3006] = 64294;
+  t[3007] = 64295;
+  t[3008] = 64296;
+  t[3011] = 1900;
+  t[3014] = 8223;
+  t[3015] = 8244;
+  t[3017] = 7532;
+  t[3018] = 7533;
+  t[3019] = 7534;
+  t[3075] = 7590;
+  t[3076] = 7591;
+  t[3079] = 7594;
+  t[3080] = 7595;
+  t[3083] = 7598;
+  t[3084] = 7599;
+  t[3087] = 7602;
+  t[3088] = 7603;
+  t[3091] = 7606;
+  t[3092] = 7607;
+  t[3095] = 7610;
+  t[3096] = 7611;
+  t[3099] = 7614;
+  t[3100] = 7615;
+  t[3103] = 7618;
+  t[3104] = 7619;
+  t[3107] = 8337;
+  t[3108] = 8338;
+  t[3116] = 1884;
+  t[3119] = 1885;
+  t[3120] = 1885;
+  t[3123] = 1886;
+  t[3124] = 1886;
+  t[3127] = 1887;
+  t[3128] = 1887;
+  t[3131] = 1888;
+  t[3132] = 1888;
+  t[3135] = 1889;
+  t[3136] = 1889;
+  t[3139] = 1890;
+  t[3140] = 1890;
+  t[3143] = 1891;
+  t[3144] = 1891;
+  t[3147] = 1892;
+  t[3148] = 1892;
+  t[3153] = 580;
+  t[3154] = 581;
+  t[3157] = 584;
+  t[3158] = 585;
+  t[3161] = 588;
+  t[3162] = 589;
+  t[3165] = 891;
+  t[3166] = 892;
+  t[3169] = 1274;
+  t[3170] = 1275;
+  t[3173] = 1278;
+  t[3174] = 1279;
+  t[3181] = 7622;
+  t[3182] = 7623;
+  t[3282] = 11799;
+  t[3316] = 578;
+  t[3379] = 42785;
+  t[3393] = 1159;
+  t[3416] = 8377;
+});
+exports.getGlyphMapForStandardFonts = getGlyphMapForStandardFonts;
+const getSupplementalGlyphMapForArialBlack = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t[227] = 322;
+  t[264] = 261;
+  t[291] = 346;
+});
+exports.getSupplementalGlyphMapForArialBlack = getSupplementalGlyphMapForArialBlack;
+const getSupplementalGlyphMapForCalibri = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t[1] = 32;
+  t[4] = 65;
+  t[6] = 193;
+  t[17] = 66;
+  t[18] = 67;
+  t[21] = 268;
+  t[24] = 68;
+  t[28] = 69;
+  t[30] = 201;
+  t[32] = 282;
+  t[38] = 70;
+  t[39] = 71;
+  t[44] = 72;
+  t[47] = 73;
+  t[49] = 205;
+  t[58] = 74;
+  t[60] = 75;
+  t[62] = 76;
+  t[68] = 77;
+  t[69] = 78;
+  t[75] = 79;
+  t[87] = 80;
+  t[89] = 81;
+  t[90] = 82;
+  t[92] = 344;
+  t[94] = 83;
+  t[97] = 352;
+  t[100] = 84;
+  t[104] = 85;
+  t[115] = 86;
+  t[116] = 87;
+  t[121] = 88;
+  t[122] = 89;
+  t[124] = 221;
+  t[127] = 90;
+  t[129] = 381;
+  t[258] = 97;
+  t[260] = 225;
+  t[268] = 261;
+  t[271] = 98;
+  t[272] = 99;
+  t[273] = 263;
+  t[275] = 269;
+  t[282] = 100;
+  t[286] = 101;
+  t[288] = 233;
+  t[290] = 283;
+  t[295] = 281;
+  t[296] = 102;
+  t[336] = 103;
+  t[346] = 104;
+  t[349] = 105;
+  t[351] = 237;
+  t[361] = 106;
+  t[364] = 107;
+  t[367] = 108;
+  t[371] = 322;
+  t[373] = 109;
+  t[374] = 110;
+  t[381] = 111;
+  t[383] = 243;
+  t[393] = 112;
+  t[395] = 113;
+  t[396] = 114;
+  t[398] = 345;
+  t[400] = 115;
+  t[401] = 347;
+  t[403] = 353;
+  t[410] = 116;
+  t[437] = 117;
+  t[448] = 118;
+  t[449] = 119;
+  t[454] = 120;
+  t[455] = 121;
+  t[457] = 253;
+  t[460] = 122;
+  t[462] = 382;
+  t[463] = 380;
+  t[853] = 44;
+  t[855] = 58;
+  t[856] = 46;
+  t[876] = 47;
+  t[878] = 45;
+  t[882] = 45;
+  t[894] = 40;
+  t[895] = 41;
+  t[896] = 91;
+  t[897] = 93;
+  t[923] = 64;
+  t[1004] = 48;
+  t[1005] = 49;
+  t[1006] = 50;
+  t[1007] = 51;
+  t[1008] = 52;
+  t[1009] = 53;
+  t[1010] = 54;
+  t[1011] = 55;
+  t[1012] = 56;
+  t[1013] = 57;
+  t[1081] = 37;
+  t[1085] = 43;
+  t[1086] = 45;
+});
+exports.getSupplementalGlyphMapForCalibri = getSupplementalGlyphMapForCalibri;
+
+function getStandardFontName(name) {
+  const fontName = (0, _fonts_utils.normalizeFontName)(name);
+  const stdFontMap = getStdFontMap();
+  return stdFontMap[fontName];
+}
+
+/***/ }),
+/* 42 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.ToUnicodeMap = exports.IdentityToUnicodeMap = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+class ToUnicodeMap {
+  constructor(cmap = []) {
+    this._map = cmap;
+  }
+
+  get length() {
+    return this._map.length;
+  }
+
+  forEach(callback) {
+    for (const charCode in this._map) {
+      callback(charCode, this._map[charCode].charCodeAt(0));
+    }
+  }
+
+  has(i) {
+    return this._map[i] !== undefined;
+  }
+
+  get(i) {
+    return this._map[i];
+  }
+
+  charCodeOf(value) {
+    const map = this._map;
+
+    if (map.length <= 0x10000) {
+      return map.indexOf(value);
+    }
+
+    for (const charCode in map) {
+      if (map[charCode] === value) {
+        return charCode | 0;
+      }
+    }
+
+    return -1;
+  }
+
+  amend(map) {
+    for (const charCode in map) {
+      this._map[charCode] = map[charCode];
+    }
+  }
+
+}
+
+exports.ToUnicodeMap = ToUnicodeMap;
+
+class IdentityToUnicodeMap {
+  constructor(firstChar, lastChar) {
+    this.firstChar = firstChar;
+    this.lastChar = lastChar;
+  }
+
+  get length() {
+    return this.lastChar + 1 - this.firstChar;
+  }
+
+  forEach(callback) {
+    for (let i = this.firstChar, ii = this.lastChar; i <= ii; i++) {
+      callback(i, i);
+    }
+  }
+
+  has(i) {
+    return this.firstChar <= i && i <= this.lastChar;
+  }
+
+  get(i) {
+    if (this.firstChar <= i && i <= this.lastChar) {
+      return String.fromCharCode(i);
+    }
+
+    return undefined;
+  }
+
+  charCodeOf(v) {
+    return Number.isInteger(v) && v >= this.firstChar && v <= this.lastChar ? v : -1;
+  }
+
+  amend(map) {
+    (0, _util.unreachable)("Should not call amend()");
+  }
+
+}
+
+exports.IdentityToUnicodeMap = IdentityToUnicodeMap;
+
+/***/ }),
+/* 43 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.CFFFont = void 0;
+
+var _cff_parser = __w_pdfjs_require__(35);
+
+var _fonts_utils = __w_pdfjs_require__(38);
+
+var _util = __w_pdfjs_require__(2);
+
+class CFFFont {
+  constructor(file, properties) {
+    this.properties = properties;
+    const parser = new _cff_parser.CFFParser(file, properties, _fonts_utils.SEAC_ANALYSIS_ENABLED);
+    this.cff = parser.parse();
+    this.cff.duplicateFirstGlyph();
+    const compiler = new _cff_parser.CFFCompiler(this.cff);
+    this.seacs = this.cff.seacs;
+
+    try {
+      this.data = compiler.compile();
+    } catch (e) {
+      (0, _util.warn)("Failed to compile font " + properties.loadedName);
+      this.data = file;
+    }
+
+    this._createBuiltInEncoding();
+  }
+
+  get numGlyphs() {
+    return this.cff.charStrings.count;
+  }
+
+  getCharset() {
+    return this.cff.charset.charset;
+  }
+
+  getGlyphMapping() {
+    const cff = this.cff;
+    const properties = this.properties;
+    const charsets = cff.charset.charset;
+    let charCodeToGlyphId;
+    let glyphId;
+
+    if (properties.composite) {
+      charCodeToGlyphId = Object.create(null);
+      let charCode;
+
+      if (cff.isCIDFont) {
+        for (glyphId = 0; glyphId < charsets.length; glyphId++) {
+          const cid = charsets[glyphId];
+          charCode = properties.cMap.charCodeOf(cid);
+          charCodeToGlyphId[charCode] = glyphId;
+        }
+      } else {
+        for (glyphId = 0; glyphId < cff.charStrings.count; glyphId++) {
+          charCode = properties.cMap.charCodeOf(glyphId);
+          charCodeToGlyphId[charCode] = glyphId;
+        }
+      }
+
+      return charCodeToGlyphId;
+    }
+
+    let encoding = cff.encoding ? cff.encoding.encoding : null;
+
+    if (properties.isInternalFont) {
+      encoding = properties.defaultEncoding;
+    }
+
+    charCodeToGlyphId = (0, _fonts_utils.type1FontGlyphMapping)(properties, encoding, charsets);
+    return charCodeToGlyphId;
+  }
+
+  hasGlyphId(id) {
+    return this.cff.hasGlyphId(id);
+  }
+
+  _createBuiltInEncoding() {
+    const {
+      charset,
+      encoding
+    } = this.cff;
+
+    if (!charset || !encoding) {
+      return;
+    }
+
+    const charsets = charset.charset,
+          encodings = encoding.encoding;
+    const map = [];
+
+    for (const charCode in encodings) {
+      const glyphId = encodings[charCode];
+
+      if (glyphId >= 0) {
+        const glyphName = charsets[glyphId];
+
+        if (glyphName) {
+          map[charCode] = glyphName;
+        }
+      }
+    }
+
+    if (map.length > 0) {
+      this.properties.builtInEncoding = map;
+    }
+  }
+
+}
+
+exports.CFFFont = CFFFont;
+
+/***/ }),
+/* 44 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.FontRendererFactory = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
-var _cff_parser = __w_pdfjs_require__(31);
+var _cff_parser = __w_pdfjs_require__(35);
 
-var _glyphlist = __w_pdfjs_require__(34);
+var _glyphlist = __w_pdfjs_require__(39);
 
-var _encodings = __w_pdfjs_require__(33);
+var _encodings = __w_pdfjs_require__(37);
 
-var _stream = __w_pdfjs_require__(12);
+var _stream = __w_pdfjs_require__(10);
 
-var FontRendererFactory = function FontRendererFactoryClosure() {
-  function getLong(data, offset) {
-    return data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3];
+function getUint32(data, offset) {
+  return (data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3]) >>> 0;
+}
+
+function getUint16(data, offset) {
+  return data[offset] << 8 | data[offset + 1];
+}
+
+function getInt16(data, offset) {
+  return (data[offset] << 24 | data[offset + 1] << 16) >> 16;
+}
+
+function getInt8(data, offset) {
+  return data[offset] << 24 >> 24;
+}
+
+function getFloat214(data, offset) {
+  return getInt16(data, offset) / 16384;
+}
+
+function getSubroutineBias(subrs) {
+  const numSubrs = subrs.length;
+  let bias = 32768;
+
+  if (numSubrs < 1240) {
+    bias = 107;
+  } else if (numSubrs < 33900) {
+    bias = 1131;
   }
 
-  function getUshort(data, offset) {
-    return data[offset] << 8 | data[offset + 1];
-  }
+  return bias;
+}
 
-  function getSubroutineBias(subrs) {
-    const numSubrs = subrs.length;
-    let bias = 32768;
+function parseCmap(data, start, end) {
+  const offset = getUint16(data, start + 2) === 1 ? getUint32(data, start + 8) : getUint32(data, start + 16);
+  const format = getUint16(data, start + offset);
+  let ranges, p, i;
 
-    if (numSubrs < 1240) {
-      bias = 107;
-    } else if (numSubrs < 33900) {
-      bias = 1131;
-    }
+  if (format === 4) {
+    getUint16(data, start + offset + 2);
+    const segCount = getUint16(data, start + offset + 6) >> 1;
+    p = start + offset + 14;
+    ranges = [];
 
-    return bias;
-  }
-
-  function parseCmap(data, start, end) {
-    var offset = getUshort(data, start + 2) === 1 ? getLong(data, start + 8) : getLong(data, start + 16);
-    var format = getUshort(data, start + offset);
-    var ranges, p, i;
-
-    if (format === 4) {
-      getUshort(data, start + offset + 2);
-      var segCount = getUshort(data, start + offset + 6) >> 1;
-      p = start + offset + 14;
-      ranges = [];
-
-      for (i = 0; i < segCount; i++, p += 2) {
-        ranges[i] = {
-          end: getUshort(data, p)
-        };
-      }
-
-      p += 2;
-
-      for (i = 0; i < segCount; i++, p += 2) {
-        ranges[i].start = getUshort(data, p);
-      }
-
-      for (i = 0; i < segCount; i++, p += 2) {
-        ranges[i].idDelta = getUshort(data, p);
-      }
-
-      for (i = 0; i < segCount; i++, p += 2) {
-        var idOffset = getUshort(data, p);
-
-        if (idOffset === 0) {
-          continue;
-        }
-
-        ranges[i].ids = [];
-
-        for (var j = 0, jj = ranges[i].end - ranges[i].start + 1; j < jj; j++) {
-          ranges[i].ids[j] = getUshort(data, p + idOffset);
-          idOffset += 2;
-        }
-      }
-
-      return ranges;
-    } else if (format === 12) {
-      getLong(data, start + offset + 4);
-      var groups = getLong(data, start + offset + 12);
-      p = start + offset + 16;
-      ranges = [];
-
-      for (i = 0; i < groups; i++) {
-        ranges.push({
-          start: getLong(data, p),
-          end: getLong(data, p + 4),
-          idDelta: getLong(data, p + 8) - getLong(data, p)
-        });
-        p += 12;
-      }
-
-      return ranges;
-    }
-
-    throw new _util.FormatError(`unsupported cmap: ${format}`);
-  }
-
-  function parseCff(data, start, end, seacAnalysisEnabled) {
-    var properties = {};
-    var parser = new _cff_parser.CFFParser(new _stream.Stream(data, start, end - start), properties, seacAnalysisEnabled);
-    var cff = parser.parse();
-    return {
-      glyphs: cff.charStrings.objects,
-      subrs: cff.topDict.privateDict && cff.topDict.privateDict.subrsIndex && cff.topDict.privateDict.subrsIndex.objects,
-      gsubrs: cff.globalSubrIndex && cff.globalSubrIndex.objects,
-      isCFFCIDFont: cff.isCIDFont,
-      fdSelect: cff.fdSelect,
-      fdArray: cff.fdArray
-    };
-  }
-
-  function parseGlyfTable(glyf, loca, isGlyphLocationsLong) {
-    var itemSize, itemDecode;
-
-    if (isGlyphLocationsLong) {
-      itemSize = 4;
-
-      itemDecode = function fontItemDecodeLong(data, offset) {
-        return data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3];
+    for (i = 0; i < segCount; i++, p += 2) {
+      ranges[i] = {
+        end: getUint16(data, p)
       };
+    }
+
+    p += 2;
+
+    for (i = 0; i < segCount; i++, p += 2) {
+      ranges[i].start = getUint16(data, p);
+    }
+
+    for (i = 0; i < segCount; i++, p += 2) {
+      ranges[i].idDelta = getUint16(data, p);
+    }
+
+    for (i = 0; i < segCount; i++, p += 2) {
+      let idOffset = getUint16(data, p);
+
+      if (idOffset === 0) {
+        continue;
+      }
+
+      ranges[i].ids = [];
+
+      for (let j = 0, jj = ranges[i].end - ranges[i].start + 1; j < jj; j++) {
+        ranges[i].ids[j] = getUint16(data, p + idOffset);
+        idOffset += 2;
+      }
+    }
+
+    return ranges;
+  } else if (format === 12) {
+    const groups = getUint32(data, start + offset + 12);
+    p = start + offset + 16;
+    ranges = [];
+
+    for (i = 0; i < groups; i++) {
+      start = getUint32(data, p);
+      ranges.push({
+        start,
+        end: getUint32(data, p + 4),
+        idDelta: getUint32(data, p + 8) - start
+      });
+      p += 12;
+    }
+
+    return ranges;
+  }
+
+  throw new _util.FormatError(`unsupported cmap: ${format}`);
+}
+
+function parseCff(data, start, end, seacAnalysisEnabled) {
+  const properties = {};
+  const parser = new _cff_parser.CFFParser(new _stream.Stream(data, start, end - start), properties, seacAnalysisEnabled);
+  const cff = parser.parse();
+  return {
+    glyphs: cff.charStrings.objects,
+    subrs: cff.topDict.privateDict && cff.topDict.privateDict.subrsIndex && cff.topDict.privateDict.subrsIndex.objects,
+    gsubrs: cff.globalSubrIndex && cff.globalSubrIndex.objects,
+    isCFFCIDFont: cff.isCIDFont,
+    fdSelect: cff.fdSelect,
+    fdArray: cff.fdArray
+  };
+}
+
+function parseGlyfTable(glyf, loca, isGlyphLocationsLong) {
+  let itemSize, itemDecode;
+
+  if (isGlyphLocationsLong) {
+    itemSize = 4;
+    itemDecode = getUint32;
+  } else {
+    itemSize = 2;
+
+    itemDecode = (data, offset) => 2 * getUint16(data, offset);
+  }
+
+  const glyphs = [];
+  let startOffset = itemDecode(loca, 0);
+
+  for (let j = itemSize; j < loca.length; j += itemSize) {
+    const endOffset = itemDecode(loca, j);
+    glyphs.push(glyf.subarray(startOffset, endOffset));
+    startOffset = endOffset;
+  }
+
+  return glyphs;
+}
+
+function lookupCmap(ranges, unicode) {
+  const code = unicode.codePointAt(0);
+  let gid = 0,
+      l = 0,
+      r = ranges.length - 1;
+
+  while (l < r) {
+    const c = l + r + 1 >> 1;
+
+    if (code < ranges[c].start) {
+      r = c - 1;
     } else {
-      itemSize = 2;
-
-      itemDecode = function fontItemDecode(data, offset) {
-        return data[offset] << 9 | data[offset + 1] << 1;
-      };
+      l = c;
     }
-
-    var glyphs = [];
-    var startOffset = itemDecode(loca, 0);
-
-    for (var j = itemSize; j < loca.length; j += itemSize) {
-      var endOffset = itemDecode(loca, j);
-      glyphs.push(glyf.subarray(startOffset, endOffset));
-      startOffset = endOffset;
-    }
-
-    return glyphs;
   }
 
-  function lookupCmap(ranges, unicode) {
-    var code = unicode.codePointAt(0),
-        gid = 0;
-    var l = 0,
-        r = ranges.length - 1;
-
-    while (l < r) {
-      var c = l + r + 1 >> 1;
-
-      if (code < ranges[c].start) {
-        r = c - 1;
-      } else {
-        l = c;
-      }
-    }
-
-    if (ranges[l].start <= code && code <= ranges[l].end) {
-      gid = ranges[l].idDelta + (ranges[l].ids ? ranges[l].ids[code - ranges[l].start] : code) & 0xffff;
-    }
-
-    return {
-      charCode: code,
-      glyphId: gid
-    };
+  if (ranges[l].start <= code && code <= ranges[l].end) {
+    gid = ranges[l].idDelta + (ranges[l].ids ? ranges[l].ids[code - ranges[l].start] : code) & 0xffff;
   }
 
-  function compileGlyf(code, cmds, font) {
-    function moveTo(x, y) {
-      cmds.push({
-        cmd: "moveTo",
-        args: [x, y]
-      });
-    }
+  return {
+    charCode: code,
+    glyphId: gid
+  };
+}
 
-    function lineTo(x, y) {
-      cmds.push({
-        cmd: "lineTo",
-        args: [x, y]
-      });
-    }
+function compileGlyf(code, cmds, font) {
+  function moveTo(x, y) {
+    cmds.push({
+      cmd: "moveTo",
+      args: [x, y]
+    });
+  }
 
-    function quadraticCurveTo(xa, ya, x, y) {
-      cmds.push({
-        cmd: "quadraticCurveTo",
-        args: [xa, ya, x, y]
-      });
-    }
+  function lineTo(x, y) {
+    cmds.push({
+      cmd: "lineTo",
+      args: [x, y]
+    });
+  }
 
-    var i = 0;
-    var numberOfContours = (code[i] << 24 | code[i + 1] << 16) >> 16;
-    var flags;
-    var x = 0,
-        y = 0;
-    i += 10;
+  function quadraticCurveTo(xa, ya, x, y) {
+    cmds.push({
+      cmd: "quadraticCurveTo",
+      args: [xa, ya, x, y]
+    });
+  }
+
+  let i = 0;
+  const numberOfContours = getInt16(code, i);
+  let flags;
+  let x = 0,
+      y = 0;
+  i += 10;
+
+  if (numberOfContours < 0) {
+    do {
+      flags = getUint16(code, i);
+      const glyphIndex = getUint16(code, i + 2);
+      i += 4;
+      let arg1, arg2;
+
+      if (flags & 0x01) {
+        if (flags & 0x02) {
+          arg1 = getInt16(code, i);
+          arg2 = getInt16(code, i + 2);
+        } else {
+          arg1 = getUint16(code, i);
+          arg2 = getUint16(code, i + 2);
+        }
 
-    if (numberOfContours < 0) {
-      do {
-        flags = code[i] << 8 | code[i + 1];
-        var glyphIndex = code[i + 2] << 8 | code[i + 3];
         i += 4;
-        var arg1, arg2;
-
-        if (flags & 0x01) {
-          arg1 = (code[i] << 24 | code[i + 1] << 16) >> 16;
-          arg2 = (code[i + 2] << 24 | code[i + 3] << 16) >> 16;
-          i += 4;
+      } else {
+        if (flags & 0x02) {
+          arg1 = getInt8(code, i++);
+          arg2 = getInt8(code, i++);
         } else {
           arg1 = code[i++];
           arg2 = code[i++];
         }
+      }
 
-        if (flags & 0x02) {
-          x = arg1;
-          y = arg2;
-        } else {
-          x = 0;
-          y = 0;
-        }
+      if (flags & 0x02) {
+        x = arg1;
+        y = arg2;
+      } else {
+        x = 0;
+        y = 0;
+      }
 
-        var scaleX = 1,
-            scaleY = 1,
-            scale01 = 0,
-            scale10 = 0;
+      let scaleX = 1,
+          scaleY = 1,
+          scale01 = 0,
+          scale10 = 0;
 
-        if (flags & 0x08) {
-          scaleX = scaleY = (code[i] << 24 | code[i + 1] << 16) / 1073741824;
-          i += 2;
-        } else if (flags & 0x40) {
-          scaleX = (code[i] << 24 | code[i + 1] << 16) / 1073741824;
-          scaleY = (code[i + 2] << 24 | code[i + 3] << 16) / 1073741824;
-          i += 4;
-        } else if (flags & 0x80) {
-          scaleX = (code[i] << 24 | code[i + 1] << 16) / 1073741824;
-          scale01 = (code[i + 2] << 24 | code[i + 3] << 16) / 1073741824;
-          scale10 = (code[i + 4] << 24 | code[i + 5] << 16) / 1073741824;
-          scaleY = (code[i + 6] << 24 | code[i + 7] << 16) / 1073741824;
-          i += 8;
-        }
-
-        var subglyph = font.glyphs[glyphIndex];
-
-        if (subglyph) {
-          cmds.push({
-            cmd: "save"
-          });
-          cmds.push({
-            cmd: "transform",
-            args: [scaleX, scale01, scale10, scaleY, x, y]
-          });
-          compileGlyf(subglyph, cmds, font);
-          cmds.push({
-            cmd: "restore"
-          });
-        }
-      } while (flags & 0x20);
-    } else {
-      var endPtsOfContours = [];
-      var j, jj;
-
-      for (j = 0; j < numberOfContours; j++) {
-        endPtsOfContours.push(code[i] << 8 | code[i + 1]);
+      if (flags & 0x08) {
+        scaleX = scaleY = getFloat214(code, i);
         i += 2;
+      } else if (flags & 0x40) {
+        scaleX = getFloat214(code, i);
+        scaleY = getFloat214(code, i + 2);
+        i += 4;
+      } else if (flags & 0x80) {
+        scaleX = getFloat214(code, i);
+        scale01 = getFloat214(code, i + 2);
+        scale10 = getFloat214(code, i + 4);
+        scaleY = getFloat214(code, i + 6);
+        i += 8;
       }
 
-      var instructionLength = code[i] << 8 | code[i + 1];
-      i += 2 + instructionLength;
-      var numberOfPoints = endPtsOfContours[endPtsOfContours.length - 1] + 1;
-      var points = [];
+      const subglyph = font.glyphs[glyphIndex];
 
-      while (points.length < numberOfPoints) {
-        flags = code[i++];
-        var repeat = 1;
+      if (subglyph) {
+        cmds.push({
+          cmd: "save"
+        }, {
+          cmd: "transform",
+          args: [scaleX, scale01, scale10, scaleY, x, y]
+        });
 
-        if (flags & 0x08) {
-          repeat += code[i++];
-        }
+        if (!(flags & 0x02)) {}
 
-        while (repeat-- > 0) {
-          points.push({
-            flags
-          });
-        }
+        compileGlyf(subglyph, cmds, font);
+        cmds.push({
+          cmd: "restore"
+        });
+      }
+    } while (flags & 0x20);
+  } else {
+    const endPtsOfContours = [];
+    let j, jj;
+
+    for (j = 0; j < numberOfContours; j++) {
+      endPtsOfContours.push(getUint16(code, i));
+      i += 2;
+    }
+
+    const instructionLength = getUint16(code, i);
+    i += 2 + instructionLength;
+    const numberOfPoints = endPtsOfContours.at(-1) + 1;
+    const points = [];
+
+    while (points.length < numberOfPoints) {
+      flags = code[i++];
+      let repeat = 1;
+
+      if (flags & 0x08) {
+        repeat += code[i++];
       }
 
-      for (j = 0; j < numberOfPoints; j++) {
-        switch (points[j].flags & 0x12) {
-          case 0x00:
-            x += (code[i] << 24 | code[i + 1] << 16) >> 16;
-            i += 2;
-            break;
+      while (repeat-- > 0) {
+        points.push({
+          flags
+        });
+      }
+    }
 
-          case 0x02:
-            x -= code[i++];
-            break;
+    for (j = 0; j < numberOfPoints; j++) {
+      switch (points[j].flags & 0x12) {
+        case 0x00:
+          x += getInt16(code, i);
+          i += 2;
+          break;
 
-          case 0x12:
-            x += code[i++];
-            break;
-        }
+        case 0x02:
+          x -= code[i++];
+          break;
 
-        points[j].x = x;
+        case 0x12:
+          x += code[i++];
+          break;
       }
 
-      for (j = 0; j < numberOfPoints; j++) {
-        switch (points[j].flags & 0x24) {
-          case 0x00:
-            y += (code[i] << 24 | code[i + 1] << 16) >> 16;
-            i += 2;
-            break;
+      points[j].x = x;
+    }
 
-          case 0x04:
-            y -= code[i++];
-            break;
+    for (j = 0; j < numberOfPoints; j++) {
+      switch (points[j].flags & 0x24) {
+        case 0x00:
+          y += getInt16(code, i);
+          i += 2;
+          break;
 
-          case 0x24:
-            y += code[i++];
-            break;
-        }
+        case 0x04:
+          y -= code[i++];
+          break;
 
-        points[j].y = y;
+        case 0x24:
+          y += code[i++];
+          break;
       }
 
-      var startPoint = 0;
+      points[j].y = y;
+    }
 
-      for (i = 0; i < numberOfContours; i++) {
-        var endPoint = endPtsOfContours[i];
-        var contour = points.slice(startPoint, endPoint + 1);
+    let startPoint = 0;
 
-        if (contour[0].flags & 1) {
-          contour.push(contour[0]);
-        } else if (contour[contour.length - 1].flags & 1) {
-          contour.unshift(contour[contour.length - 1]);
+    for (i = 0; i < numberOfContours; i++) {
+      const endPoint = endPtsOfContours[i];
+      const contour = points.slice(startPoint, endPoint + 1);
+
+      if (contour[0].flags & 1) {
+        contour.push(contour[0]);
+      } else if (contour.at(-1).flags & 1) {
+        contour.unshift(contour.at(-1));
+      } else {
+        const p = {
+          flags: 1,
+          x: (contour[0].x + contour.at(-1).x) / 2,
+          y: (contour[0].y + contour.at(-1).y) / 2
+        };
+        contour.unshift(p);
+        contour.push(p);
+      }
+
+      moveTo(contour[0].x, contour[0].y);
+
+      for (j = 1, jj = contour.length; j < jj; j++) {
+        if (contour[j].flags & 1) {
+          lineTo(contour[j].x, contour[j].y);
+        } else if (contour[j + 1].flags & 1) {
+          quadraticCurveTo(contour[j].x, contour[j].y, contour[j + 1].x, contour[j + 1].y);
+          j++;
         } else {
-          var p = {
-            flags: 1,
-            x: (contour[0].x + contour[contour.length - 1].x) / 2,
-            y: (contour[0].y + contour[contour.length - 1].y) / 2
-          };
-          contour.unshift(p);
-          contour.push(p);
+          quadraticCurveTo(contour[j].x, contour[j].y, (contour[j].x + contour[j + 1].x) / 2, (contour[j].y + contour[j + 1].y) / 2);
         }
-
-        moveTo(contour[0].x, contour[0].y);
-
-        for (j = 1, jj = contour.length; j < jj; j++) {
-          if (contour[j].flags & 1) {
-            lineTo(contour[j].x, contour[j].y);
-          } else if (contour[j + 1].flags & 1) {
-            quadraticCurveTo(contour[j].x, contour[j].y, contour[j + 1].x, contour[j + 1].y);
-            j++;
-          } else {
-            quadraticCurveTo(contour[j].x, contour[j].y, (contour[j].x + contour[j + 1].x) / 2, (contour[j].y + contour[j + 1].y) / 2);
-          }
-        }
-
-        startPoint = endPoint + 1;
       }
+
+      startPoint = endPoint + 1;
     }
   }
+}
 
-  function compileCharString(charStringCode, cmds, font, glyphId) {
-    function moveTo(x, y) {
-      cmds.push({
-        cmd: "moveTo",
-        args: [x, y]
-      });
-    }
+function compileCharString(charStringCode, cmds, font, glyphId) {
+  function moveTo(x, y) {
+    cmds.push({
+      cmd: "moveTo",
+      args: [x, y]
+    });
+  }
 
-    function lineTo(x, y) {
-      cmds.push({
-        cmd: "lineTo",
-        args: [x, y]
-      });
-    }
+  function lineTo(x, y) {
+    cmds.push({
+      cmd: "lineTo",
+      args: [x, y]
+    });
+  }
 
-    function bezierCurveTo(x1, y1, x2, y2, x, y) {
-      cmds.push({
-        cmd: "bezierCurveTo",
-        args: [x1, y1, x2, y2, x, y]
-      });
-    }
+  function bezierCurveTo(x1, y1, x2, y2, x, y) {
+    cmds.push({
+      cmd: "bezierCurveTo",
+      args: [x1, y1, x2, y2, x, y]
+    });
+  }
 
-    var stack = [];
-    var x = 0,
-        y = 0;
-    var stems = 0;
+  const stack = [];
+  let x = 0,
+      y = 0;
+  let stems = 0;
 
-    function parse(code) {
-      var i = 0;
+  function parse(code) {
+    let i = 0;
 
-      while (i < code.length) {
-        var stackClean = false;
-        var v = code[i++];
-        var xa, xb, ya, yb, y1, y2, y3, n, subrCode;
+    while (i < code.length) {
+      let stackClean = false;
+      let v = code[i++];
+      let xa, xb, ya, yb, y1, y2, y3, n, subrCode;
 
-        switch (v) {
-          case 1:
-            stems += stack.length >> 1;
-            stackClean = true;
-            break;
+      switch (v) {
+        case 1:
+          stems += stack.length >> 1;
+          stackClean = true;
+          break;
 
-          case 3:
-            stems += stack.length >> 1;
-            stackClean = true;
-            break;
+        case 3:
+          stems += stack.length >> 1;
+          stackClean = true;
+          break;
 
-          case 4:
-            y += stack.pop();
-            moveTo(x, y);
-            stackClean = true;
-            break;
-
-          case 5:
-            while (stack.length > 0) {
-              x += stack.shift();
-              y += stack.shift();
-              lineTo(x, y);
-            }
-
-            break;
-
-          case 6:
-            while (stack.length > 0) {
-              x += stack.shift();
-              lineTo(x, y);
-
-              if (stack.length === 0) {
-                break;
-              }
-
-              y += stack.shift();
-              lineTo(x, y);
-            }
-
-            break;
-
-          case 7:
-            while (stack.length > 0) {
-              y += stack.shift();
-              lineTo(x, y);
-
-              if (stack.length === 0) {
-                break;
-              }
-
-              x += stack.shift();
-              lineTo(x, y);
-            }
-
-            break;
-
-          case 8:
-            while (stack.length > 0) {
-              xa = x + stack.shift();
-              ya = y + stack.shift();
-              xb = xa + stack.shift();
-              yb = ya + stack.shift();
-              x = xb + stack.shift();
-              y = yb + stack.shift();
-              bezierCurveTo(xa, ya, xb, yb, x, y);
-            }
-
-            break;
-
-          case 10:
-            n = stack.pop();
-            subrCode = null;
-
-            if (font.isCFFCIDFont) {
-              const fdIndex = font.fdSelect.getFDIndex(glyphId);
-
-              if (fdIndex >= 0 && fdIndex < font.fdArray.length) {
-                const fontDict = font.fdArray[fdIndex];
-                let subrs;
-
-                if (fontDict.privateDict && fontDict.privateDict.subrsIndex) {
-                  subrs = fontDict.privateDict.subrsIndex.objects;
-                }
-
-                if (subrs) {
-                  n += getSubroutineBias(subrs);
-                  subrCode = subrs[n];
-                }
-              } else {
-                (0, _util.warn)("Invalid fd index for glyph index.");
-              }
-            } else {
-              subrCode = font.subrs[n + font.subrsBias];
-            }
-
-            if (subrCode) {
-              parse(subrCode);
-            }
-
-            break;
-
-          case 11:
-            return;
-
-          case 12:
-            v = code[i++];
-
-            switch (v) {
-              case 34:
-                xa = x + stack.shift();
-                xb = xa + stack.shift();
-                y1 = y + stack.shift();
-                x = xb + stack.shift();
-                bezierCurveTo(xa, y, xb, y1, x, y1);
-                xa = x + stack.shift();
-                xb = xa + stack.shift();
-                x = xb + stack.shift();
-                bezierCurveTo(xa, y1, xb, y, x, y);
-                break;
-
-              case 35:
-                xa = x + stack.shift();
-                ya = y + stack.shift();
-                xb = xa + stack.shift();
-                yb = ya + stack.shift();
-                x = xb + stack.shift();
-                y = yb + stack.shift();
-                bezierCurveTo(xa, ya, xb, yb, x, y);
-                xa = x + stack.shift();
-                ya = y + stack.shift();
-                xb = xa + stack.shift();
-                yb = ya + stack.shift();
-                x = xb + stack.shift();
-                y = yb + stack.shift();
-                bezierCurveTo(xa, ya, xb, yb, x, y);
-                stack.pop();
-                break;
-
-              case 36:
-                xa = x + stack.shift();
-                y1 = y + stack.shift();
-                xb = xa + stack.shift();
-                y2 = y1 + stack.shift();
-                x = xb + stack.shift();
-                bezierCurveTo(xa, y1, xb, y2, x, y2);
-                xa = x + stack.shift();
-                xb = xa + stack.shift();
-                y3 = y2 + stack.shift();
-                x = xb + stack.shift();
-                bezierCurveTo(xa, y2, xb, y3, x, y);
-                break;
-
-              case 37:
-                var x0 = x,
-                    y0 = y;
-                xa = x + stack.shift();
-                ya = y + stack.shift();
-                xb = xa + stack.shift();
-                yb = ya + stack.shift();
-                x = xb + stack.shift();
-                y = yb + stack.shift();
-                bezierCurveTo(xa, ya, xb, yb, x, y);
-                xa = x + stack.shift();
-                ya = y + stack.shift();
-                xb = xa + stack.shift();
-                yb = ya + stack.shift();
-                x = xb;
-                y = yb;
-
-                if (Math.abs(x - x0) > Math.abs(y - y0)) {
-                  x += stack.shift();
-                } else {
-                  y += stack.shift();
-                }
-
-                bezierCurveTo(xa, ya, xb, yb, x, y);
-                break;
-
-              default:
-                throw new _util.FormatError(`unknown operator: 12 ${v}`);
-            }
-
-            break;
-
-          case 14:
-            if (stack.length >= 4) {
-              var achar = stack.pop();
-              var bchar = stack.pop();
-              y = stack.pop();
-              x = stack.pop();
-              cmds.push({
-                cmd: "save"
-              });
-              cmds.push({
-                cmd: "translate",
-                args: [x, y]
-              });
-              var cmap = lookupCmap(font.cmap, String.fromCharCode(font.glyphNameMap[_encodings.StandardEncoding[achar]]));
-              compileCharString(font.glyphs[cmap.glyphId], cmds, font, cmap.glyphId);
-              cmds.push({
-                cmd: "restore"
-              });
-              cmap = lookupCmap(font.cmap, String.fromCharCode(font.glyphNameMap[_encodings.StandardEncoding[bchar]]));
-              compileCharString(font.glyphs[cmap.glyphId], cmds, font, cmap.glyphId);
-            }
-
-            return;
-
-          case 18:
-            stems += stack.length >> 1;
-            stackClean = true;
-            break;
-
-          case 19:
-            stems += stack.length >> 1;
-            i += stems + 7 >> 3;
-            stackClean = true;
-            break;
-
-          case 20:
-            stems += stack.length >> 1;
-            i += stems + 7 >> 3;
-            stackClean = true;
-            break;
-
-          case 21:
-            y += stack.pop();
-            x += stack.pop();
-            moveTo(x, y);
-            stackClean = true;
-            break;
-
-          case 22:
-            x += stack.pop();
-            moveTo(x, y);
-            stackClean = true;
-            break;
-
-          case 23:
-            stems += stack.length >> 1;
-            stackClean = true;
-            break;
-
-          case 24:
-            while (stack.length > 2) {
-              xa = x + stack.shift();
-              ya = y + stack.shift();
-              xb = xa + stack.shift();
-              yb = ya + stack.shift();
-              x = xb + stack.shift();
-              y = yb + stack.shift();
-              bezierCurveTo(xa, ya, xb, yb, x, y);
-            }
+        case 4:
+          y += stack.pop();
+          moveTo(x, y);
+          stackClean = true;
+          break;
 
+        case 5:
+          while (stack.length > 0) {
             x += stack.shift();
             y += stack.shift();
             lineTo(x, y);
-            break;
+          }
 
-          case 25:
-            while (stack.length > 6) {
-              x += stack.shift();
-              y += stack.shift();
-              lineTo(x, y);
+          break;
+
+        case 6:
+          while (stack.length > 0) {
+            x += stack.shift();
+            lineTo(x, y);
+
+            if (stack.length === 0) {
+              break;
             }
 
+            y += stack.shift();
+            lineTo(x, y);
+          }
+
+          break;
+
+        case 7:
+          while (stack.length > 0) {
+            y += stack.shift();
+            lineTo(x, y);
+
+            if (stack.length === 0) {
+              break;
+            }
+
+            x += stack.shift();
+            lineTo(x, y);
+          }
+
+          break;
+
+        case 8:
+          while (stack.length > 0) {
             xa = x + stack.shift();
             ya = y + stack.shift();
             xb = xa + stack.shift();
@@ -39283,3962 +44028,527 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
             x = xb + stack.shift();
             y = yb + stack.shift();
             bezierCurveTo(xa, ya, xb, yb, x, y);
-            break;
+          }
 
-          case 26:
-            if (stack.length % 2) {
-              x += stack.shift();
+          break;
+
+        case 10:
+          n = stack.pop();
+          subrCode = null;
+
+          if (font.isCFFCIDFont) {
+            const fdIndex = font.fdSelect.getFDIndex(glyphId);
+
+            if (fdIndex >= 0 && fdIndex < font.fdArray.length) {
+              const fontDict = font.fdArray[fdIndex];
+              let subrs;
+
+              if (fontDict.privateDict && fontDict.privateDict.subrsIndex) {
+                subrs = fontDict.privateDict.subrsIndex.objects;
+              }
+
+              if (subrs) {
+                n += getSubroutineBias(subrs);
+                subrCode = subrs[n];
+              }
+            } else {
+              (0, _util.warn)("Invalid fd index for glyph index.");
             }
+          } else {
+            subrCode = font.subrs[n + font.subrsBias];
+          }
 
-            while (stack.length > 0) {
-              xa = x;
+          if (subrCode) {
+            parse(subrCode);
+          }
+
+          break;
+
+        case 11:
+          return;
+
+        case 12:
+          v = code[i++];
+
+          switch (v) {
+            case 34:
+              xa = x + stack.shift();
+              xb = xa + stack.shift();
+              y1 = y + stack.shift();
+              x = xb + stack.shift();
+              bezierCurveTo(xa, y, xb, y1, x, y1);
+              xa = x + stack.shift();
+              xb = xa + stack.shift();
+              x = xb + stack.shift();
+              bezierCurveTo(xa, y1, xb, y, x, y);
+              break;
+
+            case 35:
+              xa = x + stack.shift();
+              ya = y + stack.shift();
+              xb = xa + stack.shift();
+              yb = ya + stack.shift();
+              x = xb + stack.shift();
+              y = yb + stack.shift();
+              bezierCurveTo(xa, ya, xb, yb, x, y);
+              xa = x + stack.shift();
+              ya = y + stack.shift();
+              xb = xa + stack.shift();
+              yb = ya + stack.shift();
+              x = xb + stack.shift();
+              y = yb + stack.shift();
+              bezierCurveTo(xa, ya, xb, yb, x, y);
+              stack.pop();
+              break;
+
+            case 36:
+              xa = x + stack.shift();
+              y1 = y + stack.shift();
+              xb = xa + stack.shift();
+              y2 = y1 + stack.shift();
+              x = xb + stack.shift();
+              bezierCurveTo(xa, y1, xb, y2, x, y2);
+              xa = x + stack.shift();
+              xb = xa + stack.shift();
+              y3 = y2 + stack.shift();
+              x = xb + stack.shift();
+              bezierCurveTo(xa, y2, xb, y3, x, y);
+              break;
+
+            case 37:
+              const x0 = x,
+                    y0 = y;
+              xa = x + stack.shift();
+              ya = y + stack.shift();
+              xb = xa + stack.shift();
+              yb = ya + stack.shift();
+              x = xb + stack.shift();
+              y = yb + stack.shift();
+              bezierCurveTo(xa, ya, xb, yb, x, y);
+              xa = x + stack.shift();
               ya = y + stack.shift();
               xb = xa + stack.shift();
               yb = ya + stack.shift();
               x = xb;
-              y = yb + stack.shift();
-              bezierCurveTo(xa, ya, xb, yb, x, y);
-            }
-
-            break;
-
-          case 27:
-            if (stack.length % 2) {
-              y += stack.shift();
-            }
-
-            while (stack.length > 0) {
-              xa = x + stack.shift();
-              ya = y;
-              xb = xa + stack.shift();
-              yb = ya + stack.shift();
-              x = xb + stack.shift();
               y = yb;
-              bezierCurveTo(xa, ya, xb, yb, x, y);
-            }
 
-            break;
-
-          case 28:
-            stack.push((code[i] << 24 | code[i + 1] << 16) >> 16);
-            i += 2;
-            break;
-
-          case 29:
-            n = stack.pop() + font.gsubrsBias;
-            subrCode = font.gsubrs[n];
-
-            if (subrCode) {
-              parse(subrCode);
-            }
-
-            break;
-
-          case 30:
-            while (stack.length > 0) {
-              xa = x;
-              ya = y + stack.shift();
-              xb = xa + stack.shift();
-              yb = ya + stack.shift();
-              x = xb + stack.shift();
-              y = yb + (stack.length === 1 ? stack.shift() : 0);
-              bezierCurveTo(xa, ya, xb, yb, x, y);
-
-              if (stack.length === 0) {
-                break;
+              if (Math.abs(x - x0) > Math.abs(y - y0)) {
+                x += stack.shift();
+              } else {
+                y += stack.shift();
               }
 
-              xa = x + stack.shift();
-              ya = y;
-              xb = xa + stack.shift();
-              yb = ya + stack.shift();
-              y = yb + stack.shift();
-              x = xb + (stack.length === 1 ? stack.shift() : 0);
               bezierCurveTo(xa, ya, xb, yb, x, y);
+              break;
+
+            default:
+              throw new _util.FormatError(`unknown operator: 12 ${v}`);
+          }
+
+          break;
+
+        case 14:
+          if (stack.length >= 4) {
+            const achar = stack.pop();
+            const bchar = stack.pop();
+            y = stack.pop();
+            x = stack.pop();
+            cmds.push({
+              cmd: "save"
+            }, {
+              cmd: "translate",
+              args: [x, y]
+            });
+            let cmap = lookupCmap(font.cmap, String.fromCharCode(font.glyphNameMap[_encodings.StandardEncoding[achar]]));
+            compileCharString(font.glyphs[cmap.glyphId], cmds, font, cmap.glyphId);
+            cmds.push({
+              cmd: "restore"
+            });
+            cmap = lookupCmap(font.cmap, String.fromCharCode(font.glyphNameMap[_encodings.StandardEncoding[bchar]]));
+            compileCharString(font.glyphs[cmap.glyphId], cmds, font, cmap.glyphId);
+          }
+
+          return;
+
+        case 18:
+          stems += stack.length >> 1;
+          stackClean = true;
+          break;
+
+        case 19:
+          stems += stack.length >> 1;
+          i += stems + 7 >> 3;
+          stackClean = true;
+          break;
+
+        case 20:
+          stems += stack.length >> 1;
+          i += stems + 7 >> 3;
+          stackClean = true;
+          break;
+
+        case 21:
+          y += stack.pop();
+          x += stack.pop();
+          moveTo(x, y);
+          stackClean = true;
+          break;
+
+        case 22:
+          x += stack.pop();
+          moveTo(x, y);
+          stackClean = true;
+          break;
+
+        case 23:
+          stems += stack.length >> 1;
+          stackClean = true;
+          break;
+
+        case 24:
+          while (stack.length > 2) {
+            xa = x + stack.shift();
+            ya = y + stack.shift();
+            xb = xa + stack.shift();
+            yb = ya + stack.shift();
+            x = xb + stack.shift();
+            y = yb + stack.shift();
+            bezierCurveTo(xa, ya, xb, yb, x, y);
+          }
+
+          x += stack.shift();
+          y += stack.shift();
+          lineTo(x, y);
+          break;
+
+        case 25:
+          while (stack.length > 6) {
+            x += stack.shift();
+            y += stack.shift();
+            lineTo(x, y);
+          }
+
+          xa = x + stack.shift();
+          ya = y + stack.shift();
+          xb = xa + stack.shift();
+          yb = ya + stack.shift();
+          x = xb + stack.shift();
+          y = yb + stack.shift();
+          bezierCurveTo(xa, ya, xb, yb, x, y);
+          break;
+
+        case 26:
+          if (stack.length % 2) {
+            x += stack.shift();
+          }
+
+          while (stack.length > 0) {
+            xa = x;
+            ya = y + stack.shift();
+            xb = xa + stack.shift();
+            yb = ya + stack.shift();
+            x = xb;
+            y = yb + stack.shift();
+            bezierCurveTo(xa, ya, xb, yb, x, y);
+          }
+
+          break;
+
+        case 27:
+          if (stack.length % 2) {
+            y += stack.shift();
+          }
+
+          while (stack.length > 0) {
+            xa = x + stack.shift();
+            ya = y;
+            xb = xa + stack.shift();
+            yb = ya + stack.shift();
+            x = xb + stack.shift();
+            y = yb;
+            bezierCurveTo(xa, ya, xb, yb, x, y);
+          }
+
+          break;
+
+        case 28:
+          stack.push((code[i] << 24 | code[i + 1] << 16) >> 16);
+          i += 2;
+          break;
+
+        case 29:
+          n = stack.pop() + font.gsubrsBias;
+          subrCode = font.gsubrs[n];
+
+          if (subrCode) {
+            parse(subrCode);
+          }
+
+          break;
+
+        case 30:
+          while (stack.length > 0) {
+            xa = x;
+            ya = y + stack.shift();
+            xb = xa + stack.shift();
+            yb = ya + stack.shift();
+            x = xb + stack.shift();
+            y = yb + (stack.length === 1 ? stack.shift() : 0);
+            bezierCurveTo(xa, ya, xb, yb, x, y);
+
+            if (stack.length === 0) {
+              break;
             }
 
-            break;
+            xa = x + stack.shift();
+            ya = y;
+            xb = xa + stack.shift();
+            yb = ya + stack.shift();
+            y = yb + stack.shift();
+            x = xb + (stack.length === 1 ? stack.shift() : 0);
+            bezierCurveTo(xa, ya, xb, yb, x, y);
+          }
 
-          case 31:
-            while (stack.length > 0) {
-              xa = x + stack.shift();
-              ya = y;
-              xb = xa + stack.shift();
-              yb = ya + stack.shift();
-              y = yb + stack.shift();
-              x = xb + (stack.length === 1 ? stack.shift() : 0);
-              bezierCurveTo(xa, ya, xb, yb, x, y);
+          break;
 
-              if (stack.length === 0) {
-                break;
-              }
+        case 31:
+          while (stack.length > 0) {
+            xa = x + stack.shift();
+            ya = y;
+            xb = xa + stack.shift();
+            yb = ya + stack.shift();
+            y = yb + stack.shift();
+            x = xb + (stack.length === 1 ? stack.shift() : 0);
+            bezierCurveTo(xa, ya, xb, yb, x, y);
 
-              xa = x;
-              ya = y + stack.shift();
-              xb = xa + stack.shift();
-              yb = ya + stack.shift();
-              x = xb + stack.shift();
-              y = yb + (stack.length === 1 ? stack.shift() : 0);
-              bezierCurveTo(xa, ya, xb, yb, x, y);
+            if (stack.length === 0) {
+              break;
             }
 
-            break;
+            xa = x;
+            ya = y + stack.shift();
+            xb = xa + stack.shift();
+            yb = ya + stack.shift();
+            x = xb + stack.shift();
+            y = yb + (stack.length === 1 ? stack.shift() : 0);
+            bezierCurveTo(xa, ya, xb, yb, x, y);
+          }
 
-          default:
-            if (v < 32) {
-              throw new _util.FormatError(`unknown operator: ${v}`);
-            }
+          break;
 
-            if (v < 247) {
-              stack.push(v - 139);
-            } else if (v < 251) {
-              stack.push((v - 247) * 256 + code[i++] + 108);
-            } else if (v < 255) {
-              stack.push(-(v - 251) * 256 - code[i++] - 108);
-            } else {
-              stack.push((code[i] << 24 | code[i + 1] << 16 | code[i + 2] << 8 | code[i + 3]) / 65536);
-              i += 4;
-            }
+        default:
+          if (v < 32) {
+            throw new _util.FormatError(`unknown operator: ${v}`);
+          }
 
-            break;
-        }
+          if (v < 247) {
+            stack.push(v - 139);
+          } else if (v < 251) {
+            stack.push((v - 247) * 256 + code[i++] + 108);
+          } else if (v < 255) {
+            stack.push(-(v - 251) * 256 - code[i++] - 108);
+          } else {
+            stack.push((code[i] << 24 | code[i + 1] << 16 | code[i + 2] << 8 | code[i + 3]) / 65536);
+            i += 4;
+          }
 
-        if (stackClean) {
-          stack.length = 0;
-        }
+          break;
+      }
+
+      if (stackClean) {
+        stack.length = 0;
       }
     }
-
-    parse(charStringCode);
   }
 
-  const NOOP = [];
+  parse(charStringCode);
+}
 
-  class CompiledFont {
-    constructor(fontMatrix) {
-      if (this.constructor === CompiledFont) {
-        (0, _util.unreachable)("Cannot initialize CompiledFont.");
-      }
+const NOOP = [];
 
-      this.fontMatrix = fontMatrix;
-      this.compiledGlyphs = Object.create(null);
-      this.compiledCharCodeToGlyphId = Object.create(null);
+class CompiledFont {
+  constructor(fontMatrix) {
+    if (this.constructor === CompiledFont) {
+      (0, _util.unreachable)("Cannot initialize CompiledFont.");
     }
 
-    getPathJs(unicode) {
-      const cmap = lookupCmap(this.cmap, unicode);
-      let fn = this.compiledGlyphs[cmap.glyphId];
+    this.fontMatrix = fontMatrix;
+    this.compiledGlyphs = Object.create(null);
+    this.compiledCharCodeToGlyphId = Object.create(null);
+  }
 
-      if (!fn) {
-        fn = this.compileGlyph(this.glyphs[cmap.glyphId], cmap.glyphId);
-        this.compiledGlyphs[cmap.glyphId] = fn;
-      }
+  getPathJs(unicode) {
+    const {
+      charCode,
+      glyphId
+    } = lookupCmap(this.cmap, unicode);
+    let fn = this.compiledGlyphs[glyphId];
 
-      if (this.compiledCharCodeToGlyphId[cmap.charCode] === undefined) {
-        this.compiledCharCodeToGlyphId[cmap.charCode] = cmap.glyphId;
-      }
+    if (!fn) {
+      try {
+        fn = this.compileGlyph(this.glyphs[glyphId], glyphId);
+        this.compiledGlyphs[glyphId] = fn;
+      } catch (ex) {
+        this.compiledGlyphs[glyphId] = NOOP;
 
-      return fn;
-    }
-
-    compileGlyph(code, glyphId) {
-      if (!code || code.length === 0 || code[0] === 14) {
-        return NOOP;
-      }
-
-      let fontMatrix = this.fontMatrix;
-
-      if (this.isCFFCIDFont) {
-        const fdIndex = this.fdSelect.getFDIndex(glyphId);
-
-        if (fdIndex >= 0 && fdIndex < this.fdArray.length) {
-          const fontDict = this.fdArray[fdIndex];
-          fontMatrix = fontDict.getByName("FontMatrix") || _util.FONT_IDENTITY_MATRIX;
-        } else {
-          (0, _util.warn)("Invalid fd index for glyph index.");
+        if (this.compiledCharCodeToGlyphId[charCode] === undefined) {
+          this.compiledCharCodeToGlyphId[charCode] = glyphId;
         }
+
+        throw ex;
       }
-
-      const cmds = [];
-      cmds.push({
-        cmd: "save"
-      });
-      cmds.push({
-        cmd: "transform",
-        args: fontMatrix.slice()
-      });
-      cmds.push({
-        cmd: "scale",
-        args: ["size", "-size"]
-      });
-      this.compileGlyphImpl(code, cmds, glyphId);
-      cmds.push({
-        cmd: "restore"
-      });
-      return cmds;
     }
 
-    compileGlyphImpl() {
-      (0, _util.unreachable)("Children classes should implement this.");
-    }
-
-    hasBuiltPath(unicode) {
-      const cmap = lookupCmap(this.cmap, unicode);
-      return this.compiledGlyphs[cmap.glyphId] !== undefined && this.compiledCharCodeToGlyphId[cmap.charCode] !== undefined;
+    if (this.compiledCharCodeToGlyphId[charCode] === undefined) {
+      this.compiledCharCodeToGlyphId[charCode] = glyphId;
     }
 
+    return fn;
   }
 
-  class TrueTypeCompiled extends CompiledFont {
-    constructor(glyphs, cmap, fontMatrix) {
-      super(fontMatrix || [0.000488, 0, 0, 0.000488, 0, 0]);
-      this.glyphs = glyphs;
-      this.cmap = cmap;
+  compileGlyph(code, glyphId) {
+    if (!code || code.length === 0 || code[0] === 14) {
+      return NOOP;
     }
 
-    compileGlyphImpl(code, cmds) {
-      compileGlyf(code, cmds, this);
+    let fontMatrix = this.fontMatrix;
+
+    if (this.isCFFCIDFont) {
+      const fdIndex = this.fdSelect.getFDIndex(glyphId);
+
+      if (fdIndex >= 0 && fdIndex < this.fdArray.length) {
+        const fontDict = this.fdArray[fdIndex];
+        fontMatrix = fontDict.getByName("FontMatrix") || _util.FONT_IDENTITY_MATRIX;
+      } else {
+        (0, _util.warn)("Invalid fd index for glyph index.");
+      }
     }
 
+    const cmds = [{
+      cmd: "save"
+    }, {
+      cmd: "transform",
+      args: fontMatrix.slice()
+    }, {
+      cmd: "scale",
+      args: ["size", "-size"]
+    }];
+    this.compileGlyphImpl(code, cmds, glyphId);
+    cmds.push({
+      cmd: "restore"
+    });
+    return cmds;
   }
 
-  class Type2Compiled extends CompiledFont {
-    constructor(cffInfo, cmap, fontMatrix, glyphNameMap) {
-      super(fontMatrix || [0.001, 0, 0, 0.001, 0, 0]);
-      this.glyphs = cffInfo.glyphs;
-      this.gsubrs = cffInfo.gsubrs || [];
-      this.subrs = cffInfo.subrs || [];
-      this.cmap = cmap;
-      this.glyphNameMap = glyphNameMap || (0, _glyphlist.getGlyphsUnicode)();
-      this.gsubrsBias = getSubroutineBias(this.gsubrs);
-      this.subrsBias = getSubroutineBias(this.subrs);
-      this.isCFFCIDFont = cffInfo.isCFFCIDFont;
-      this.fdSelect = cffInfo.fdSelect;
-      this.fdArray = cffInfo.fdArray;
-    }
-
-    compileGlyphImpl(code, cmds, glyphId) {
-      compileCharString(code, cmds, this, glyphId);
-    }
-
+  compileGlyphImpl() {
+    (0, _util.unreachable)("Children classes should implement this.");
   }
 
-  return {
-    create: function FontRendererFactory_create(font, seacAnalysisEnabled) {
-      var data = new Uint8Array(font.data);
-      var cmap, glyf, loca, cff, indexToLocFormat, unitsPerEm;
-      var numTables = getUshort(data, 4);
+  hasBuiltPath(unicode) {
+    const {
+      charCode,
+      glyphId
+    } = lookupCmap(this.cmap, unicode);
+    return this.compiledGlyphs[glyphId] !== undefined && this.compiledCharCodeToGlyphId[charCode] !== undefined;
+  }
 
-      for (var i = 0, p = 12; i < numTables; i++, p += 16) {
-        var tag = (0, _util.bytesToString)(data.subarray(p, p + 4));
-        var offset = getLong(data, p + 8);
-        var length = getLong(data, p + 12);
+}
 
-        switch (tag) {
-          case "cmap":
-            cmap = parseCmap(data, offset, offset + length);
-            break;
+class TrueTypeCompiled extends CompiledFont {
+  constructor(glyphs, cmap, fontMatrix) {
+    super(fontMatrix || [0.000488, 0, 0, 0.000488, 0, 0]);
+    this.glyphs = glyphs;
+    this.cmap = cmap;
+  }
 
-          case "glyf":
-            glyf = data.subarray(offset, offset + length);
-            break;
+  compileGlyphImpl(code, cmds) {
+    compileGlyf(code, cmds, this);
+  }
 
-          case "loca":
-            loca = data.subarray(offset, offset + length);
-            break;
+}
 
-          case "head":
-            unitsPerEm = getUshort(data, offset + 18);
-            indexToLocFormat = getUshort(data, offset + 50);
-            break;
+class Type2Compiled extends CompiledFont {
+  constructor(cffInfo, cmap, fontMatrix, glyphNameMap) {
+    super(fontMatrix || [0.001, 0, 0, 0.001, 0, 0]);
+    this.glyphs = cffInfo.glyphs;
+    this.gsubrs = cffInfo.gsubrs || [];
+    this.subrs = cffInfo.subrs || [];
+    this.cmap = cmap;
+    this.glyphNameMap = glyphNameMap || (0, _glyphlist.getGlyphsUnicode)();
+    this.gsubrsBias = getSubroutineBias(this.gsubrs);
+    this.subrsBias = getSubroutineBias(this.subrs);
+    this.isCFFCIDFont = cffInfo.isCFFCIDFont;
+    this.fdSelect = cffInfo.fdSelect;
+    this.fdArray = cffInfo.fdArray;
+  }
 
-          case "CFF ":
-            cff = parseCff(data, offset, offset + length, seacAnalysisEnabled);
-            break;
-        }
+  compileGlyphImpl(code, cmds, glyphId) {
+    compileCharString(code, cmds, this, glyphId);
+  }
+
+}
+
+class FontRendererFactory {
+  static create(font, seacAnalysisEnabled) {
+    const data = new Uint8Array(font.data);
+    let cmap, glyf, loca, cff, indexToLocFormat, unitsPerEm;
+    const numTables = getUint16(data, 4);
+
+    for (let i = 0, p = 12; i < numTables; i++, p += 16) {
+      const tag = (0, _util.bytesToString)(data.subarray(p, p + 4));
+      const offset = getUint32(data, p + 8);
+      const length = getUint32(data, p + 12);
+
+      switch (tag) {
+        case "cmap":
+          cmap = parseCmap(data, offset, offset + length);
+          break;
+
+        case "glyf":
+          glyf = data.subarray(offset, offset + length);
+          break;
+
+        case "loca":
+          loca = data.subarray(offset, offset + length);
+          break;
+
+        case "head":
+          unitsPerEm = getUint16(data, offset + 18);
+          indexToLocFormat = getUint16(data, offset + 50);
+          break;
+
+        case "CFF ":
+          cff = parseCff(data, offset, offset + length, seacAnalysisEnabled);
+          break;
       }
-
-      if (glyf) {
-        var fontMatrix = !unitsPerEm ? font.fontMatrix : [1 / unitsPerEm, 0, 0, 1 / unitsPerEm, 0, 0];
-        return new TrueTypeCompiled(parseGlyfTable(glyf, loca, indexToLocFormat), cmap, fontMatrix);
-      }
-
-      return new Type2Compiled(cff, cmap, font.fontMatrix, font.glyphNameMap);
     }
-  };
-}();
+
+    if (glyf) {
+      const fontMatrix = !unitsPerEm ? font.fontMatrix : [1 / unitsPerEm, 0, 0, 1 / unitsPerEm, 0, 0];
+      return new TrueTypeCompiled(parseGlyfTable(glyf, loca, indexToLocFormat), cmap, fontMatrix);
+    }
+
+    return new Type2Compiled(cff, cmap, font.fontMatrix, font.glyphNameMap);
+  }
+
+}
 
 exports.FontRendererFactory = FontRendererFactory;
 
 /***/ }),
-/* 38 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 45 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.Type1Parser = void 0;
+}));
+exports.getMetrics = exports.getFontBasicMetrics = void 0;
 
-var _encodings = __w_pdfjs_require__(33);
+var _core_utils = __w_pdfjs_require__(6);
 
-var _core_utils = __w_pdfjs_require__(8);
-
-var _stream = __w_pdfjs_require__(12);
-
-var _util = __w_pdfjs_require__(2);
-
-var HINTING_ENABLED = false;
-
-var Type1CharString = function Type1CharStringClosure() {
-  var COMMAND_MAP = {
-    hstem: [1],
-    vstem: [3],
-    vmoveto: [4],
-    rlineto: [5],
-    hlineto: [6],
-    vlineto: [7],
-    rrcurveto: [8],
-    callsubr: [10],
-    flex: [12, 35],
-    drop: [12, 18],
-    endchar: [14],
-    rmoveto: [21],
-    hmoveto: [22],
-    vhcurveto: [30],
-    hvcurveto: [31]
-  };
-
-  function Type1CharString() {
-    this.width = 0;
-    this.lsb = 0;
-    this.flexing = false;
-    this.output = [];
-    this.stack = [];
-  }
-
-  Type1CharString.prototype = {
-    convert: function Type1CharString_convert(encoded, subrs, seacAnalysisEnabled) {
-      var count = encoded.length;
-      var error = false;
-      var wx, sbx, subrNumber;
-
-      for (var i = 0; i < count; i++) {
-        var value = encoded[i];
-
-        if (value < 32) {
-          if (value === 12) {
-            value = (value << 8) + encoded[++i];
-          }
-
-          switch (value) {
-            case 1:
-              if (!HINTING_ENABLED) {
-                this.stack = [];
-                break;
-              }
-
-              error = this.executeCommand(2, COMMAND_MAP.hstem);
-              break;
-
-            case 3:
-              if (!HINTING_ENABLED) {
-                this.stack = [];
-                break;
-              }
-
-              error = this.executeCommand(2, COMMAND_MAP.vstem);
-              break;
-
-            case 4:
-              if (this.flexing) {
-                if (this.stack.length < 1) {
-                  error = true;
-                  break;
-                }
-
-                var dy = this.stack.pop();
-                this.stack.push(0, dy);
-                break;
-              }
-
-              error = this.executeCommand(1, COMMAND_MAP.vmoveto);
-              break;
-
-            case 5:
-              error = this.executeCommand(2, COMMAND_MAP.rlineto);
-              break;
-
-            case 6:
-              error = this.executeCommand(1, COMMAND_MAP.hlineto);
-              break;
-
-            case 7:
-              error = this.executeCommand(1, COMMAND_MAP.vlineto);
-              break;
-
-            case 8:
-              error = this.executeCommand(6, COMMAND_MAP.rrcurveto);
-              break;
-
-            case 9:
-              this.stack = [];
-              break;
-
-            case 10:
-              if (this.stack.length < 1) {
-                error = true;
-                break;
-              }
-
-              subrNumber = this.stack.pop();
-
-              if (!subrs[subrNumber]) {
-                error = true;
-                break;
-              }
-
-              error = this.convert(subrs[subrNumber], subrs, seacAnalysisEnabled);
-              break;
-
-            case 11:
-              return error;
-
-            case 13:
-              if (this.stack.length < 2) {
-                error = true;
-                break;
-              }
-
-              wx = this.stack.pop();
-              sbx = this.stack.pop();
-              this.lsb = sbx;
-              this.width = wx;
-              this.stack.push(wx, sbx);
-              error = this.executeCommand(2, COMMAND_MAP.hmoveto);
-              break;
-
-            case 14:
-              this.output.push(COMMAND_MAP.endchar[0]);
-              break;
-
-            case 21:
-              if (this.flexing) {
-                break;
-              }
-
-              error = this.executeCommand(2, COMMAND_MAP.rmoveto);
-              break;
-
-            case 22:
-              if (this.flexing) {
-                this.stack.push(0);
-                break;
-              }
-
-              error = this.executeCommand(1, COMMAND_MAP.hmoveto);
-              break;
-
-            case 30:
-              error = this.executeCommand(4, COMMAND_MAP.vhcurveto);
-              break;
-
-            case 31:
-              error = this.executeCommand(4, COMMAND_MAP.hvcurveto);
-              break;
-
-            case (12 << 8) + 0:
-              this.stack = [];
-              break;
-
-            case (12 << 8) + 1:
-              if (!HINTING_ENABLED) {
-                this.stack = [];
-                break;
-              }
-
-              error = this.executeCommand(2, COMMAND_MAP.vstem);
-              break;
-
-            case (12 << 8) + 2:
-              if (!HINTING_ENABLED) {
-                this.stack = [];
-                break;
-              }
-
-              error = this.executeCommand(2, COMMAND_MAP.hstem);
-              break;
-
-            case (12 << 8) + 6:
-              if (seacAnalysisEnabled) {
-                const asb = this.stack[this.stack.length - 5];
-                this.seac = this.stack.splice(-4, 4);
-                this.seac[0] += this.lsb - asb;
-                error = this.executeCommand(0, COMMAND_MAP.endchar);
-              } else {
-                error = this.executeCommand(4, COMMAND_MAP.endchar);
-              }
-
-              break;
-
-            case (12 << 8) + 7:
-              if (this.stack.length < 4) {
-                error = true;
-                break;
-              }
-
-              this.stack.pop();
-              wx = this.stack.pop();
-              var sby = this.stack.pop();
-              sbx = this.stack.pop();
-              this.lsb = sbx;
-              this.width = wx;
-              this.stack.push(wx, sbx, sby);
-              error = this.executeCommand(3, COMMAND_MAP.rmoveto);
-              break;
-
-            case (12 << 8) + 12:
-              if (this.stack.length < 2) {
-                error = true;
-                break;
-              }
-
-              var num2 = this.stack.pop();
-              var num1 = this.stack.pop();
-              this.stack.push(num1 / num2);
-              break;
-
-            case (12 << 8) + 16:
-              if (this.stack.length < 2) {
-                error = true;
-                break;
-              }
-
-              subrNumber = this.stack.pop();
-              var numArgs = this.stack.pop();
-
-              if (subrNumber === 0 && numArgs === 3) {
-                var flexArgs = this.stack.splice(this.stack.length - 17, 17);
-                this.stack.push(flexArgs[2] + flexArgs[0], flexArgs[3] + flexArgs[1], flexArgs[4], flexArgs[5], flexArgs[6], flexArgs[7], flexArgs[8], flexArgs[9], flexArgs[10], flexArgs[11], flexArgs[12], flexArgs[13], flexArgs[14]);
-                error = this.executeCommand(13, COMMAND_MAP.flex, true);
-                this.flexing = false;
-                this.stack.push(flexArgs[15], flexArgs[16]);
-              } else if (subrNumber === 1 && numArgs === 0) {
-                this.flexing = true;
-              }
-
-              break;
-
-            case (12 << 8) + 17:
-              break;
-
-            case (12 << 8) + 33:
-              this.stack = [];
-              break;
-
-            default:
-              (0, _util.warn)('Unknown type 1 charstring command of "' + value + '"');
-              break;
-          }
-
-          if (error) {
-            break;
-          }
-
-          continue;
-        } else if (value <= 246) {
-          value = value - 139;
-        } else if (value <= 250) {
-          value = (value - 247) * 256 + encoded[++i] + 108;
-        } else if (value <= 254) {
-          value = -((value - 251) * 256) - encoded[++i] - 108;
-        } else {
-          value = (encoded[++i] & 0xff) << 24 | (encoded[++i] & 0xff) << 16 | (encoded[++i] & 0xff) << 8 | (encoded[++i] & 0xff) << 0;
-        }
-
-        this.stack.push(value);
-      }
-
-      return error;
-    },
-
-    executeCommand(howManyArgs, command, keepStack) {
-      var stackLength = this.stack.length;
-
-      if (howManyArgs > stackLength) {
-        return true;
-      }
-
-      var start = stackLength - howManyArgs;
-
-      for (var i = start; i < stackLength; i++) {
-        var value = this.stack[i];
-
-        if (Number.isInteger(value)) {
-          this.output.push(28, value >> 8 & 0xff, value & 0xff);
-        } else {
-          value = 65536 * value | 0;
-          this.output.push(255, value >> 24 & 0xff, value >> 16 & 0xff, value >> 8 & 0xff, value & 0xff);
-        }
-      }
-
-      this.output.push.apply(this.output, command);
-
-      if (keepStack) {
-        this.stack.splice(start, howManyArgs);
-      } else {
-        this.stack.length = 0;
-      }
-
-      return false;
-    }
-
-  };
-  return Type1CharString;
-}();
-
-var Type1Parser = function Type1ParserClosure() {
-  var EEXEC_ENCRYPT_KEY = 55665;
-  var CHAR_STRS_ENCRYPT_KEY = 4330;
-
-  function isHexDigit(code) {
-    return code >= 48 && code <= 57 || code >= 65 && code <= 70 || code >= 97 && code <= 102;
-  }
-
-  function decrypt(data, key, discardNumber) {
-    if (discardNumber >= data.length) {
-      return new Uint8Array(0);
-    }
-
-    var r = key | 0,
-        c1 = 52845,
-        c2 = 22719,
-        i,
-        j;
-
-    for (i = 0; i < discardNumber; i++) {
-      r = (data[i] + r) * c1 + c2 & (1 << 16) - 1;
-    }
-
-    var count = data.length - discardNumber;
-    var decrypted = new Uint8Array(count);
-
-    for (i = discardNumber, j = 0; j < count; i++, j++) {
-      var value = data[i];
-      decrypted[j] = value ^ r >> 8;
-      r = (value + r) * c1 + c2 & (1 << 16) - 1;
-    }
-
-    return decrypted;
-  }
-
-  function decryptAscii(data, key, discardNumber) {
-    var r = key | 0,
-        c1 = 52845,
-        c2 = 22719;
-    var count = data.length,
-        maybeLength = count >>> 1;
-    var decrypted = new Uint8Array(maybeLength);
-    var i, j;
-
-    for (i = 0, j = 0; i < count; i++) {
-      var digit1 = data[i];
-
-      if (!isHexDigit(digit1)) {
-        continue;
-      }
-
-      i++;
-      var digit2;
-
-      while (i < count && !isHexDigit(digit2 = data[i])) {
-        i++;
-      }
-
-      if (i < count) {
-        var value = parseInt(String.fromCharCode(digit1, digit2), 16);
-        decrypted[j++] = value ^ r >> 8;
-        r = (value + r) * c1 + c2 & (1 << 16) - 1;
-      }
-    }
-
-    return decrypted.slice(discardNumber, j);
-  }
-
-  function isSpecial(c) {
-    return c === 0x2f || c === 0x5b || c === 0x5d || c === 0x7b || c === 0x7d || c === 0x28 || c === 0x29;
-  }
-
-  function Type1Parser(stream, encrypted, seacAnalysisEnabled) {
-    if (encrypted) {
-      var data = stream.getBytes();
-      var isBinary = !((isHexDigit(data[0]) || (0, _core_utils.isWhiteSpace)(data[0])) && isHexDigit(data[1]) && isHexDigit(data[2]) && isHexDigit(data[3]) && isHexDigit(data[4]) && isHexDigit(data[5]) && isHexDigit(data[6]) && isHexDigit(data[7]));
-      stream = new _stream.Stream(isBinary ? decrypt(data, EEXEC_ENCRYPT_KEY, 4) : decryptAscii(data, EEXEC_ENCRYPT_KEY, 4));
-    }
-
-    this.seacAnalysisEnabled = !!seacAnalysisEnabled;
-    this.stream = stream;
-    this.nextChar();
-  }
-
-  Type1Parser.prototype = {
-    readNumberArray: function Type1Parser_readNumberArray() {
-      this.getToken();
-      var array = [];
-
-      while (true) {
-        var token = this.getToken();
-
-        if (token === null || token === "]" || token === "}") {
-          break;
-        }
-
-        array.push(parseFloat(token || 0));
-      }
-
-      return array;
-    },
-    readNumber: function Type1Parser_readNumber() {
-      var token = this.getToken();
-      return parseFloat(token || 0);
-    },
-    readInt: function Type1Parser_readInt() {
-      var token = this.getToken();
-      return parseInt(token || 0, 10) | 0;
-    },
-    readBoolean: function Type1Parser_readBoolean() {
-      var token = this.getToken();
-      return token === "true" ? 1 : 0;
-    },
-    nextChar: function Type1_nextChar() {
-      return this.currentChar = this.stream.getByte();
-    },
-    getToken: function Type1Parser_getToken() {
-      var comment = false;
-      var ch = this.currentChar;
-
-      while (true) {
-        if (ch === -1) {
-          return null;
-        }
-
-        if (comment) {
-          if (ch === 0x0a || ch === 0x0d) {
-            comment = false;
-          }
-        } else if (ch === 0x25) {
-          comment = true;
-        } else if (!(0, _core_utils.isWhiteSpace)(ch)) {
-          break;
-        }
-
-        ch = this.nextChar();
-      }
-
-      if (isSpecial(ch)) {
-        this.nextChar();
-        return String.fromCharCode(ch);
-      }
-
-      var token = "";
-
-      do {
-        token += String.fromCharCode(ch);
-        ch = this.nextChar();
-      } while (ch >= 0 && !(0, _core_utils.isWhiteSpace)(ch) && !isSpecial(ch));
-
-      return token;
-    },
-    readCharStrings: function Type1Parser_readCharStrings(bytes, lenIV) {
-      if (lenIV === -1) {
-        return bytes;
-      }
-
-      return decrypt(bytes, CHAR_STRS_ENCRYPT_KEY, lenIV);
-    },
-    extractFontProgram: function Type1Parser_extractFontProgram(properties) {
-      var stream = this.stream;
-      var subrs = [],
-          charstrings = [];
-      var privateData = Object.create(null);
-      privateData.lenIV = 4;
-      var program = {
-        subrs: [],
-        charstrings: [],
-        properties: {
-          privateData
-        }
-      };
-      var token, length, data, lenIV, encoded;
-
-      while ((token = this.getToken()) !== null) {
-        if (token !== "/") {
-          continue;
-        }
-
-        token = this.getToken();
-
-        switch (token) {
-          case "CharStrings":
-            this.getToken();
-            this.getToken();
-            this.getToken();
-            this.getToken();
-
-            while (true) {
-              token = this.getToken();
-
-              if (token === null || token === "end") {
-                break;
-              }
-
-              if (token !== "/") {
-                continue;
-              }
-
-              var glyph = this.getToken();
-              length = this.readInt();
-              this.getToken();
-              data = length > 0 ? stream.getBytes(length) : new Uint8Array(0);
-              lenIV = program.properties.privateData.lenIV;
-              encoded = this.readCharStrings(data, lenIV);
-              this.nextChar();
-              token = this.getToken();
-
-              if (token === "noaccess") {
-                this.getToken();
-              }
-
-              charstrings.push({
-                glyph,
-                encoded
-              });
-            }
-
-            break;
-
-          case "Subrs":
-            this.readInt();
-            this.getToken();
-
-            while (this.getToken() === "dup") {
-              const index = this.readInt();
-              length = this.readInt();
-              this.getToken();
-              data = length > 0 ? stream.getBytes(length) : new Uint8Array(0);
-              lenIV = program.properties.privateData.lenIV;
-              encoded = this.readCharStrings(data, lenIV);
-              this.nextChar();
-              token = this.getToken();
-
-              if (token === "noaccess") {
-                this.getToken();
-              }
-
-              subrs[index] = encoded;
-            }
-
-            break;
-
-          case "BlueValues":
-          case "OtherBlues":
-          case "FamilyBlues":
-          case "FamilyOtherBlues":
-            var blueArray = this.readNumberArray();
-
-            if (blueArray.length > 0 && blueArray.length % 2 === 0 && HINTING_ENABLED) {
-              program.properties.privateData[token] = blueArray;
-            }
-
-            break;
-
-          case "StemSnapH":
-          case "StemSnapV":
-            program.properties.privateData[token] = this.readNumberArray();
-            break;
-
-          case "StdHW":
-          case "StdVW":
-            program.properties.privateData[token] = this.readNumberArray()[0];
-            break;
-
-          case "BlueShift":
-          case "lenIV":
-          case "BlueFuzz":
-          case "BlueScale":
-          case "LanguageGroup":
-          case "ExpansionFactor":
-            program.properties.privateData[token] = this.readNumber();
-            break;
-
-          case "ForceBold":
-            program.properties.privateData[token] = this.readBoolean();
-            break;
-        }
-      }
-
-      for (var i = 0; i < charstrings.length; i++) {
-        glyph = charstrings[i].glyph;
-        encoded = charstrings[i].encoded;
-        var charString = new Type1CharString();
-        var error = charString.convert(encoded, subrs, this.seacAnalysisEnabled);
-        var output = charString.output;
-
-        if (error) {
-          output = [14];
-        }
-
-        const charStringObject = {
-          glyphName: glyph,
-          charstring: output,
-          width: charString.width,
-          lsb: charString.lsb,
-          seac: charString.seac
-        };
-
-        if (glyph === ".notdef") {
-          program.charstrings.unshift(charStringObject);
-        } else {
-          program.charstrings.push(charStringObject);
-        }
-
-        if (properties.builtInEncoding) {
-          const index = properties.builtInEncoding.indexOf(glyph);
-
-          if (index > -1 && properties.widths[index] === undefined && index >= properties.firstChar && index <= properties.lastChar) {
-            properties.widths[index] = charString.width;
-          }
-        }
-      }
-
-      return program;
-    },
-    extractFontHeader: function Type1Parser_extractFontHeader(properties) {
-      var token;
-
-      while ((token = this.getToken()) !== null) {
-        if (token !== "/") {
-          continue;
-        }
-
-        token = this.getToken();
-
-        switch (token) {
-          case "FontMatrix":
-            var matrix = this.readNumberArray();
-            properties.fontMatrix = matrix;
-            break;
-
-          case "Encoding":
-            var encodingArg = this.getToken();
-            var encoding;
-
-            if (!/^\d+$/.test(encodingArg)) {
-              encoding = (0, _encodings.getEncoding)(encodingArg);
-            } else {
-              encoding = [];
-              var size = parseInt(encodingArg, 10) | 0;
-              this.getToken();
-
-              for (var j = 0; j < size; j++) {
-                token = this.getToken();
-
-                while (token !== "dup" && token !== "def") {
-                  token = this.getToken();
-
-                  if (token === null) {
-                    return;
-                  }
-                }
-
-                if (token === "def") {
-                  break;
-                }
-
-                var index = this.readInt();
-                this.getToken();
-                var glyph = this.getToken();
-                encoding[index] = glyph;
-                this.getToken();
-              }
-            }
-
-            properties.builtInEncoding = encoding;
-            break;
-
-          case "FontBBox":
-            var fontBBox = this.readNumberArray();
-            properties.ascent = Math.max(fontBBox[3], fontBBox[1]);
-            properties.descent = Math.min(fontBBox[1], fontBBox[3]);
-            properties.ascentScaled = true;
-            break;
-        }
-      }
-    }
-  };
-  return Type1Parser;
-}();
-
-exports.Type1Parser = Type1Parser;
-
-/***/ }),
-/* 39 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getTilingPatternIR = getTilingPatternIR;
-exports.Pattern = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var _colorspace = __w_pdfjs_require__(23);
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _core_utils = __w_pdfjs_require__(8);
-
-var ShadingType = {
-  FUNCTION_BASED: 1,
-  AXIAL: 2,
-  RADIAL: 3,
-  FREE_FORM_MESH: 4,
-  LATTICE_FORM_MESH: 5,
-  COONS_PATCH_MESH: 6,
-  TENSOR_PATCH_MESH: 7
-};
-
-var Pattern = function PatternClosure() {
-  function Pattern() {
-    (0, _util.unreachable)("should not call Pattern constructor");
-  }
-
-  Pattern.prototype = {
-    getPattern: function Pattern_getPattern(ctx) {
-      (0, _util.unreachable)(`Should not call Pattern.getStyle: ${ctx}`);
-    }
-  };
-
-  Pattern.parseShading = function (shading, matrix, xref, res, handler, pdfFunctionFactory, localColorSpaceCache) {
-    var dict = (0, _primitives.isStream)(shading) ? shading.dict : shading;
-    var type = dict.get("ShadingType");
-
-    try {
-      switch (type) {
-        case ShadingType.AXIAL:
-        case ShadingType.RADIAL:
-          return new Shadings.RadialAxial(dict, matrix, xref, res, pdfFunctionFactory, localColorSpaceCache);
-
-        case ShadingType.FREE_FORM_MESH:
-        case ShadingType.LATTICE_FORM_MESH:
-        case ShadingType.COONS_PATCH_MESH:
-        case ShadingType.TENSOR_PATCH_MESH:
-          return new Shadings.Mesh(shading, matrix, xref, res, pdfFunctionFactory, localColorSpaceCache);
-
-        default:
-          throw new _util.FormatError("Unsupported ShadingType: " + type);
-      }
-    } catch (ex) {
-      if (ex instanceof _core_utils.MissingDataException) {
-        throw ex;
-      }
-
-      handler.send("UnsupportedFeature", {
-        featureId: _util.UNSUPPORTED_FEATURES.shadingPattern
-      });
-      (0, _util.warn)(ex);
-      return new Shadings.Dummy();
-    }
-  };
-
-  return Pattern;
-}();
-
-exports.Pattern = Pattern;
-var Shadings = {};
-Shadings.SMALL_NUMBER = 1e-6;
-
-Shadings.RadialAxial = function RadialAxialClosure() {
-  function RadialAxial(dict, matrix, xref, resources, pdfFunctionFactory, localColorSpaceCache) {
-    this.matrix = matrix;
-    this.coordsArr = dict.getArray("Coords");
-    this.shadingType = dict.get("ShadingType");
-    this.type = "Pattern";
-
-    const cs = _colorspace.ColorSpace.parse({
-      cs: dict.getRaw("ColorSpace") || dict.getRaw("CS"),
-      xref,
-      resources,
-      pdfFunctionFactory,
-      localColorSpaceCache
-    });
-
-    this.cs = cs;
-    const bbox = dict.getArray("BBox");
-
-    if (Array.isArray(bbox) && bbox.length === 4) {
-      this.bbox = _util.Util.normalizeRect(bbox);
-    } else {
-      this.bbox = null;
-    }
-
-    var t0 = 0.0,
-        t1 = 1.0;
-
-    if (dict.has("Domain")) {
-      var domainArr = dict.getArray("Domain");
-      t0 = domainArr[0];
-      t1 = domainArr[1];
-    }
-
-    var extendStart = false,
-        extendEnd = false;
-
-    if (dict.has("Extend")) {
-      var extendArr = dict.getArray("Extend");
-      extendStart = extendArr[0];
-      extendEnd = extendArr[1];
-    }
-
-    if (this.shadingType === ShadingType.RADIAL && (!extendStart || !extendEnd)) {
-      var x1 = this.coordsArr[0];
-      var y1 = this.coordsArr[1];
-      var r1 = this.coordsArr[2];
-      var x2 = this.coordsArr[3];
-      var y2 = this.coordsArr[4];
-      var r2 = this.coordsArr[5];
-      var distance = Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2));
-
-      if (r1 <= r2 + distance && r2 <= r1 + distance) {
-        (0, _util.warn)("Unsupported radial gradient.");
-      }
-    }
-
-    this.extendStart = extendStart;
-    this.extendEnd = extendEnd;
-    var fnObj = dict.getRaw("Function");
-    var fn = pdfFunctionFactory.createFromArray(fnObj);
-    const NUMBER_OF_SAMPLES = 10;
-    const step = (t1 - t0) / NUMBER_OF_SAMPLES;
-    var colorStops = this.colorStops = [];
-
-    if (t0 >= t1 || step <= 0) {
-      (0, _util.info)("Bad shading domain.");
-      return;
-    }
-
-    var color = new Float32Array(cs.numComps),
-        ratio = new Float32Array(1);
-    var rgbColor;
-
-    for (let i = 0; i <= NUMBER_OF_SAMPLES; i++) {
-      ratio[0] = t0 + i * step;
-      fn(ratio, 0, color, 0);
-      rgbColor = cs.getRgb(color, 0);
-
-      var cssColor = _util.Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-
-      colorStops.push([i / NUMBER_OF_SAMPLES, cssColor]);
-    }
-
-    var background = "transparent";
-
-    if (dict.has("Background")) {
-      rgbColor = cs.getRgb(dict.get("Background"), 0);
-      background = _util.Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-    }
-
-    if (!extendStart) {
-      colorStops.unshift([0, background]);
-      colorStops[1][0] += Shadings.SMALL_NUMBER;
-    }
-
-    if (!extendEnd) {
-      colorStops[colorStops.length - 1][0] -= Shadings.SMALL_NUMBER;
-      colorStops.push([1, background]);
-    }
-
-    this.colorStops = colorStops;
-  }
-
-  RadialAxial.prototype = {
-    getIR: function RadialAxial_getIR() {
-      var coordsArr = this.coordsArr;
-      var shadingType = this.shadingType;
-      var type, p0, p1, r0, r1;
-
-      if (shadingType === ShadingType.AXIAL) {
-        p0 = [coordsArr[0], coordsArr[1]];
-        p1 = [coordsArr[2], coordsArr[3]];
-        r0 = null;
-        r1 = null;
-        type = "axial";
-      } else if (shadingType === ShadingType.RADIAL) {
-        p0 = [coordsArr[0], coordsArr[1]];
-        p1 = [coordsArr[3], coordsArr[4]];
-        r0 = coordsArr[2];
-        r1 = coordsArr[5];
-        type = "radial";
-      } else {
-        (0, _util.unreachable)(`getPattern type unknown: ${shadingType}`);
-      }
-
-      var matrix = this.matrix;
-
-      if (matrix) {
-        p0 = _util.Util.applyTransform(p0, matrix);
-        p1 = _util.Util.applyTransform(p1, matrix);
-
-        if (shadingType === ShadingType.RADIAL) {
-          var scale = _util.Util.singularValueDecompose2dScale(matrix);
-
-          r0 *= scale[0];
-          r1 *= scale[1];
-        }
-      }
-
-      return ["RadialAxial", type, this.bbox, this.colorStops, p0, p1, r0, r1];
-    }
-  };
-  return RadialAxial;
-}();
-
-Shadings.Mesh = function MeshClosure() {
-  function MeshStreamReader(stream, context) {
-    this.stream = stream;
-    this.context = context;
-    this.buffer = 0;
-    this.bufferLength = 0;
-    var numComps = context.numComps;
-    this.tmpCompsBuf = new Float32Array(numComps);
-    var csNumComps = context.colorSpace.numComps;
-    this.tmpCsCompsBuf = context.colorFn ? new Float32Array(csNumComps) : this.tmpCompsBuf;
-  }
-
-  MeshStreamReader.prototype = {
-    get hasData() {
-      if (this.stream.end) {
-        return this.stream.pos < this.stream.end;
-      }
-
-      if (this.bufferLength > 0) {
-        return true;
-      }
-
-      var nextByte = this.stream.getByte();
-
-      if (nextByte < 0) {
-        return false;
-      }
-
-      this.buffer = nextByte;
-      this.bufferLength = 8;
-      return true;
-    },
-
-    readBits: function MeshStreamReader_readBits(n) {
-      var buffer = this.buffer;
-      var bufferLength = this.bufferLength;
-
-      if (n === 32) {
-        if (bufferLength === 0) {
-          return (this.stream.getByte() << 24 | this.stream.getByte() << 16 | this.stream.getByte() << 8 | this.stream.getByte()) >>> 0;
-        }
-
-        buffer = buffer << 24 | this.stream.getByte() << 16 | this.stream.getByte() << 8 | this.stream.getByte();
-        var nextByte = this.stream.getByte();
-        this.buffer = nextByte & (1 << bufferLength) - 1;
-        return (buffer << 8 - bufferLength | (nextByte & 0xff) >> bufferLength) >>> 0;
-      }
-
-      if (n === 8 && bufferLength === 0) {
-        return this.stream.getByte();
-      }
-
-      while (bufferLength < n) {
-        buffer = buffer << 8 | this.stream.getByte();
-        bufferLength += 8;
-      }
-
-      bufferLength -= n;
-      this.bufferLength = bufferLength;
-      this.buffer = buffer & (1 << bufferLength) - 1;
-      return buffer >> bufferLength;
-    },
-    align: function MeshStreamReader_align() {
-      this.buffer = 0;
-      this.bufferLength = 0;
-    },
-    readFlag: function MeshStreamReader_readFlag() {
-      return this.readBits(this.context.bitsPerFlag);
-    },
-    readCoordinate: function MeshStreamReader_readCoordinate() {
-      var bitsPerCoordinate = this.context.bitsPerCoordinate;
-      var xi = this.readBits(bitsPerCoordinate);
-      var yi = this.readBits(bitsPerCoordinate);
-      var decode = this.context.decode;
-      var scale = bitsPerCoordinate < 32 ? 1 / ((1 << bitsPerCoordinate) - 1) : 2.3283064365386963e-10;
-      return [xi * scale * (decode[1] - decode[0]) + decode[0], yi * scale * (decode[3] - decode[2]) + decode[2]];
-    },
-    readComponents: function MeshStreamReader_readComponents() {
-      var numComps = this.context.numComps;
-      var bitsPerComponent = this.context.bitsPerComponent;
-      var scale = bitsPerComponent < 32 ? 1 / ((1 << bitsPerComponent) - 1) : 2.3283064365386963e-10;
-      var decode = this.context.decode;
-      var components = this.tmpCompsBuf;
-
-      for (var i = 0, j = 4; i < numComps; i++, j += 2) {
-        var ci = this.readBits(bitsPerComponent);
-        components[i] = ci * scale * (decode[j + 1] - decode[j]) + decode[j];
-      }
-
-      var color = this.tmpCsCompsBuf;
-
-      if (this.context.colorFn) {
-        this.context.colorFn(components, 0, color, 0);
-      }
-
-      return this.context.colorSpace.getRgb(color, 0);
-    }
-  };
-
-  function decodeType4Shading(mesh, reader) {
-    var coords = mesh.coords;
-    var colors = mesh.colors;
-    var operators = [];
-    var ps = [];
-    var verticesLeft = 0;
-
-    while (reader.hasData) {
-      var f = reader.readFlag();
-      var coord = reader.readCoordinate();
-      var color = reader.readComponents();
-
-      if (verticesLeft === 0) {
-        if (!(0 <= f && f <= 2)) {
-          throw new _util.FormatError("Unknown type4 flag");
-        }
-
-        switch (f) {
-          case 0:
-            verticesLeft = 3;
-            break;
-
-          case 1:
-            ps.push(ps[ps.length - 2], ps[ps.length - 1]);
-            verticesLeft = 1;
-            break;
-
-          case 2:
-            ps.push(ps[ps.length - 3], ps[ps.length - 1]);
-            verticesLeft = 1;
-            break;
-        }
-
-        operators.push(f);
-      }
-
-      ps.push(coords.length);
-      coords.push(coord);
-      colors.push(color);
-      verticesLeft--;
-      reader.align();
-    }
-
-    mesh.figures.push({
-      type: "triangles",
-      coords: new Int32Array(ps),
-      colors: new Int32Array(ps)
-    });
-  }
-
-  function decodeType5Shading(mesh, reader, verticesPerRow) {
-    var coords = mesh.coords;
-    var colors = mesh.colors;
-    var ps = [];
-
-    while (reader.hasData) {
-      var coord = reader.readCoordinate();
-      var color = reader.readComponents();
-      ps.push(coords.length);
-      coords.push(coord);
-      colors.push(color);
-    }
-
-    mesh.figures.push({
-      type: "lattice",
-      coords: new Int32Array(ps),
-      colors: new Int32Array(ps),
-      verticesPerRow
-    });
-  }
-
-  var MIN_SPLIT_PATCH_CHUNKS_AMOUNT = 3;
-  var MAX_SPLIT_PATCH_CHUNKS_AMOUNT = 20;
-  var TRIANGLE_DENSITY = 20;
-
-  var getB = function getBClosure() {
-    function buildB(count) {
-      var lut = [];
-
-      for (var i = 0; i <= count; i++) {
-        var t = i / count,
-            t_ = 1 - t;
-        lut.push(new Float32Array([t_ * t_ * t_, 3 * t * t_ * t_, 3 * t * t * t_, t * t * t]));
-      }
-
-      return lut;
-    }
-
-    var cache = [];
-    return function getB(count) {
-      if (!cache[count]) {
-        cache[count] = buildB(count);
-      }
-
-      return cache[count];
-    };
-  }();
-
-  function buildFigureFromPatch(mesh, index) {
-    var figure = mesh.figures[index];
-    (0, _util.assert)(figure.type === "patch", "Unexpected patch mesh figure");
-    var coords = mesh.coords,
-        colors = mesh.colors;
-    var pi = figure.coords;
-    var ci = figure.colors;
-    var figureMinX = Math.min(coords[pi[0]][0], coords[pi[3]][0], coords[pi[12]][0], coords[pi[15]][0]);
-    var figureMinY = Math.min(coords[pi[0]][1], coords[pi[3]][1], coords[pi[12]][1], coords[pi[15]][1]);
-    var figureMaxX = Math.max(coords[pi[0]][0], coords[pi[3]][0], coords[pi[12]][0], coords[pi[15]][0]);
-    var figureMaxY = Math.max(coords[pi[0]][1], coords[pi[3]][1], coords[pi[12]][1], coords[pi[15]][1]);
-    var splitXBy = Math.ceil((figureMaxX - figureMinX) * TRIANGLE_DENSITY / (mesh.bounds[2] - mesh.bounds[0]));
-    splitXBy = Math.max(MIN_SPLIT_PATCH_CHUNKS_AMOUNT, Math.min(MAX_SPLIT_PATCH_CHUNKS_AMOUNT, splitXBy));
-    var splitYBy = Math.ceil((figureMaxY - figureMinY) * TRIANGLE_DENSITY / (mesh.bounds[3] - mesh.bounds[1]));
-    splitYBy = Math.max(MIN_SPLIT_PATCH_CHUNKS_AMOUNT, Math.min(MAX_SPLIT_PATCH_CHUNKS_AMOUNT, splitYBy));
-    var verticesPerRow = splitXBy + 1;
-    var figureCoords = new Int32Array((splitYBy + 1) * verticesPerRow);
-    var figureColors = new Int32Array((splitYBy + 1) * verticesPerRow);
-    var k = 0;
-    var cl = new Uint8Array(3),
-        cr = new Uint8Array(3);
-    var c0 = colors[ci[0]],
-        c1 = colors[ci[1]],
-        c2 = colors[ci[2]],
-        c3 = colors[ci[3]];
-    var bRow = getB(splitYBy),
-        bCol = getB(splitXBy);
-
-    for (var row = 0; row <= splitYBy; row++) {
-      cl[0] = (c0[0] * (splitYBy - row) + c2[0] * row) / splitYBy | 0;
-      cl[1] = (c0[1] * (splitYBy - row) + c2[1] * row) / splitYBy | 0;
-      cl[2] = (c0[2] * (splitYBy - row) + c2[2] * row) / splitYBy | 0;
-      cr[0] = (c1[0] * (splitYBy - row) + c3[0] * row) / splitYBy | 0;
-      cr[1] = (c1[1] * (splitYBy - row) + c3[1] * row) / splitYBy | 0;
-      cr[2] = (c1[2] * (splitYBy - row) + c3[2] * row) / splitYBy | 0;
-
-      for (var col = 0; col <= splitXBy; col++, k++) {
-        if ((row === 0 || row === splitYBy) && (col === 0 || col === splitXBy)) {
-          continue;
-        }
-
-        var x = 0,
-            y = 0;
-        var q = 0;
-
-        for (var i = 0; i <= 3; i++) {
-          for (var j = 0; j <= 3; j++, q++) {
-            var m = bRow[row][i] * bCol[col][j];
-            x += coords[pi[q]][0] * m;
-            y += coords[pi[q]][1] * m;
-          }
-        }
-
-        figureCoords[k] = coords.length;
-        coords.push([x, y]);
-        figureColors[k] = colors.length;
-        var newColor = new Uint8Array(3);
-        newColor[0] = (cl[0] * (splitXBy - col) + cr[0] * col) / splitXBy | 0;
-        newColor[1] = (cl[1] * (splitXBy - col) + cr[1] * col) / splitXBy | 0;
-        newColor[2] = (cl[2] * (splitXBy - col) + cr[2] * col) / splitXBy | 0;
-        colors.push(newColor);
-      }
-    }
-
-    figureCoords[0] = pi[0];
-    figureColors[0] = ci[0];
-    figureCoords[splitXBy] = pi[3];
-    figureColors[splitXBy] = ci[1];
-    figureCoords[verticesPerRow * splitYBy] = pi[12];
-    figureColors[verticesPerRow * splitYBy] = ci[2];
-    figureCoords[verticesPerRow * splitYBy + splitXBy] = pi[15];
-    figureColors[verticesPerRow * splitYBy + splitXBy] = ci[3];
-    mesh.figures[index] = {
-      type: "lattice",
-      coords: figureCoords,
-      colors: figureColors,
-      verticesPerRow
-    };
-  }
-
-  function decodeType6Shading(mesh, reader) {
-    var coords = mesh.coords;
-    var colors = mesh.colors;
-    var ps = new Int32Array(16);
-    var cs = new Int32Array(4);
-
-    while (reader.hasData) {
-      var f = reader.readFlag();
-
-      if (!(0 <= f && f <= 3)) {
-        throw new _util.FormatError("Unknown type6 flag");
-      }
-
-      var i, ii;
-      var pi = coords.length;
-
-      for (i = 0, ii = f !== 0 ? 8 : 12; i < ii; i++) {
-        coords.push(reader.readCoordinate());
-      }
-
-      var ci = colors.length;
-
-      for (i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) {
-        colors.push(reader.readComponents());
-      }
-
-      var tmp1, tmp2, tmp3, tmp4;
-
-      switch (f) {
-        case 0:
-          ps[12] = pi + 3;
-          ps[13] = pi + 4;
-          ps[14] = pi + 5;
-          ps[15] = pi + 6;
-          ps[8] = pi + 2;
-          ps[11] = pi + 7;
-          ps[4] = pi + 1;
-          ps[7] = pi + 8;
-          ps[0] = pi;
-          ps[1] = pi + 11;
-          ps[2] = pi + 10;
-          ps[3] = pi + 9;
-          cs[2] = ci + 1;
-          cs[3] = ci + 2;
-          cs[0] = ci;
-          cs[1] = ci + 3;
-          break;
-
-        case 1:
-          tmp1 = ps[12];
-          tmp2 = ps[13];
-          tmp3 = ps[14];
-          tmp4 = ps[15];
-          ps[12] = tmp4;
-          ps[13] = pi + 0;
-          ps[14] = pi + 1;
-          ps[15] = pi + 2;
-          ps[8] = tmp3;
-          ps[11] = pi + 3;
-          ps[4] = tmp2;
-          ps[7] = pi + 4;
-          ps[0] = tmp1;
-          ps[1] = pi + 7;
-          ps[2] = pi + 6;
-          ps[3] = pi + 5;
-          tmp1 = cs[2];
-          tmp2 = cs[3];
-          cs[2] = tmp2;
-          cs[3] = ci;
-          cs[0] = tmp1;
-          cs[1] = ci + 1;
-          break;
-
-        case 2:
-          tmp1 = ps[15];
-          tmp2 = ps[11];
-          ps[12] = ps[3];
-          ps[13] = pi + 0;
-          ps[14] = pi + 1;
-          ps[15] = pi + 2;
-          ps[8] = ps[7];
-          ps[11] = pi + 3;
-          ps[4] = tmp2;
-          ps[7] = pi + 4;
-          ps[0] = tmp1;
-          ps[1] = pi + 7;
-          ps[2] = pi + 6;
-          ps[3] = pi + 5;
-          tmp1 = cs[3];
-          cs[2] = cs[1];
-          cs[3] = ci;
-          cs[0] = tmp1;
-          cs[1] = ci + 1;
-          break;
-
-        case 3:
-          ps[12] = ps[0];
-          ps[13] = pi + 0;
-          ps[14] = pi + 1;
-          ps[15] = pi + 2;
-          ps[8] = ps[1];
-          ps[11] = pi + 3;
-          ps[4] = ps[2];
-          ps[7] = pi + 4;
-          ps[0] = ps[3];
-          ps[1] = pi + 7;
-          ps[2] = pi + 6;
-          ps[3] = pi + 5;
-          cs[2] = cs[0];
-          cs[3] = ci;
-          cs[0] = cs[1];
-          cs[1] = ci + 1;
-          break;
-      }
-
-      ps[5] = coords.length;
-      coords.push([(-4 * coords[ps[0]][0] - coords[ps[15]][0] + 6 * (coords[ps[4]][0] + coords[ps[1]][0]) - 2 * (coords[ps[12]][0] + coords[ps[3]][0]) + 3 * (coords[ps[13]][0] + coords[ps[7]][0])) / 9, (-4 * coords[ps[0]][1] - coords[ps[15]][1] + 6 * (coords[ps[4]][1] + coords[ps[1]][1]) - 2 * (coords[ps[12]][1] + coords[ps[3]][1]) + 3 * (coords[ps[13]][1] + coords[ps[7]][1])) / 9]);
-      ps[6] = coords.length;
-      coords.push([(-4 * coords[ps[3]][0] - coords[ps[12]][0] + 6 * (coords[ps[2]][0] + coords[ps[7]][0]) - 2 * (coords[ps[0]][0] + coords[ps[15]][0]) + 3 * (coords[ps[4]][0] + coords[ps[14]][0])) / 9, (-4 * coords[ps[3]][1] - coords[ps[12]][1] + 6 * (coords[ps[2]][1] + coords[ps[7]][1]) - 2 * (coords[ps[0]][1] + coords[ps[15]][1]) + 3 * (coords[ps[4]][1] + coords[ps[14]][1])) / 9]);
-      ps[9] = coords.length;
-      coords.push([(-4 * coords[ps[12]][0] - coords[ps[3]][0] + 6 * (coords[ps[8]][0] + coords[ps[13]][0]) - 2 * (coords[ps[0]][0] + coords[ps[15]][0]) + 3 * (coords[ps[11]][0] + coords[ps[1]][0])) / 9, (-4 * coords[ps[12]][1] - coords[ps[3]][1] + 6 * (coords[ps[8]][1] + coords[ps[13]][1]) - 2 * (coords[ps[0]][1] + coords[ps[15]][1]) + 3 * (coords[ps[11]][1] + coords[ps[1]][1])) / 9]);
-      ps[10] = coords.length;
-      coords.push([(-4 * coords[ps[15]][0] - coords[ps[0]][0] + 6 * (coords[ps[11]][0] + coords[ps[14]][0]) - 2 * (coords[ps[12]][0] + coords[ps[3]][0]) + 3 * (coords[ps[2]][0] + coords[ps[8]][0])) / 9, (-4 * coords[ps[15]][1] - coords[ps[0]][1] + 6 * (coords[ps[11]][1] + coords[ps[14]][1]) - 2 * (coords[ps[12]][1] + coords[ps[3]][1]) + 3 * (coords[ps[2]][1] + coords[ps[8]][1])) / 9]);
-      mesh.figures.push({
-        type: "patch",
-        coords: new Int32Array(ps),
-        colors: new Int32Array(cs)
-      });
-    }
-  }
-
-  function decodeType7Shading(mesh, reader) {
-    var coords = mesh.coords;
-    var colors = mesh.colors;
-    var ps = new Int32Array(16);
-    var cs = new Int32Array(4);
-
-    while (reader.hasData) {
-      var f = reader.readFlag();
-
-      if (!(0 <= f && f <= 3)) {
-        throw new _util.FormatError("Unknown type7 flag");
-      }
-
-      var i, ii;
-      var pi = coords.length;
-
-      for (i = 0, ii = f !== 0 ? 12 : 16; i < ii; i++) {
-        coords.push(reader.readCoordinate());
-      }
-
-      var ci = colors.length;
-
-      for (i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) {
-        colors.push(reader.readComponents());
-      }
-
-      var tmp1, tmp2, tmp3, tmp4;
-
-      switch (f) {
-        case 0:
-          ps[12] = pi + 3;
-          ps[13] = pi + 4;
-          ps[14] = pi + 5;
-          ps[15] = pi + 6;
-          ps[8] = pi + 2;
-          ps[9] = pi + 13;
-          ps[10] = pi + 14;
-          ps[11] = pi + 7;
-          ps[4] = pi + 1;
-          ps[5] = pi + 12;
-          ps[6] = pi + 15;
-          ps[7] = pi + 8;
-          ps[0] = pi;
-          ps[1] = pi + 11;
-          ps[2] = pi + 10;
-          ps[3] = pi + 9;
-          cs[2] = ci + 1;
-          cs[3] = ci + 2;
-          cs[0] = ci;
-          cs[1] = ci + 3;
-          break;
-
-        case 1:
-          tmp1 = ps[12];
-          tmp2 = ps[13];
-          tmp3 = ps[14];
-          tmp4 = ps[15];
-          ps[12] = tmp4;
-          ps[13] = pi + 0;
-          ps[14] = pi + 1;
-          ps[15] = pi + 2;
-          ps[8] = tmp3;
-          ps[9] = pi + 9;
-          ps[10] = pi + 10;
-          ps[11] = pi + 3;
-          ps[4] = tmp2;
-          ps[5] = pi + 8;
-          ps[6] = pi + 11;
-          ps[7] = pi + 4;
-          ps[0] = tmp1;
-          ps[1] = pi + 7;
-          ps[2] = pi + 6;
-          ps[3] = pi + 5;
-          tmp1 = cs[2];
-          tmp2 = cs[3];
-          cs[2] = tmp2;
-          cs[3] = ci;
-          cs[0] = tmp1;
-          cs[1] = ci + 1;
-          break;
-
-        case 2:
-          tmp1 = ps[15];
-          tmp2 = ps[11];
-          ps[12] = ps[3];
-          ps[13] = pi + 0;
-          ps[14] = pi + 1;
-          ps[15] = pi + 2;
-          ps[8] = ps[7];
-          ps[9] = pi + 9;
-          ps[10] = pi + 10;
-          ps[11] = pi + 3;
-          ps[4] = tmp2;
-          ps[5] = pi + 8;
-          ps[6] = pi + 11;
-          ps[7] = pi + 4;
-          ps[0] = tmp1;
-          ps[1] = pi + 7;
-          ps[2] = pi + 6;
-          ps[3] = pi + 5;
-          tmp1 = cs[3];
-          cs[2] = cs[1];
-          cs[3] = ci;
-          cs[0] = tmp1;
-          cs[1] = ci + 1;
-          break;
-
-        case 3:
-          ps[12] = ps[0];
-          ps[13] = pi + 0;
-          ps[14] = pi + 1;
-          ps[15] = pi + 2;
-          ps[8] = ps[1];
-          ps[9] = pi + 9;
-          ps[10] = pi + 10;
-          ps[11] = pi + 3;
-          ps[4] = ps[2];
-          ps[5] = pi + 8;
-          ps[6] = pi + 11;
-          ps[7] = pi + 4;
-          ps[0] = ps[3];
-          ps[1] = pi + 7;
-          ps[2] = pi + 6;
-          ps[3] = pi + 5;
-          cs[2] = cs[0];
-          cs[3] = ci;
-          cs[0] = cs[1];
-          cs[1] = ci + 1;
-          break;
-      }
-
-      mesh.figures.push({
-        type: "patch",
-        coords: new Int32Array(ps),
-        colors: new Int32Array(cs)
-      });
-    }
-  }
-
-  function updateBounds(mesh) {
-    var minX = mesh.coords[0][0],
-        minY = mesh.coords[0][1],
-        maxX = minX,
-        maxY = minY;
-
-    for (var i = 1, ii = mesh.coords.length; i < ii; i++) {
-      var x = mesh.coords[i][0],
-          y = mesh.coords[i][1];
-      minX = minX > x ? x : minX;
-      minY = minY > y ? y : minY;
-      maxX = maxX < x ? x : maxX;
-      maxY = maxY < y ? y : maxY;
-    }
-
-    mesh.bounds = [minX, minY, maxX, maxY];
-  }
-
-  function packData(mesh) {
-    var i, ii, j, jj;
-    var coords = mesh.coords;
-    var coordsPacked = new Float32Array(coords.length * 2);
-
-    for (i = 0, j = 0, ii = coords.length; i < ii; i++) {
-      var xy = coords[i];
-      coordsPacked[j++] = xy[0];
-      coordsPacked[j++] = xy[1];
-    }
-
-    mesh.coords = coordsPacked;
-    var colors = mesh.colors;
-    var colorsPacked = new Uint8Array(colors.length * 3);
-
-    for (i = 0, j = 0, ii = colors.length; i < ii; i++) {
-      var c = colors[i];
-      colorsPacked[j++] = c[0];
-      colorsPacked[j++] = c[1];
-      colorsPacked[j++] = c[2];
-    }
-
-    mesh.colors = colorsPacked;
-    var figures = mesh.figures;
-
-    for (i = 0, ii = figures.length; i < ii; i++) {
-      var figure = figures[i],
-          ps = figure.coords,
-          cs = figure.colors;
-
-      for (j = 0, jj = ps.length; j < jj; j++) {
-        ps[j] *= 2;
-        cs[j] *= 3;
-      }
-    }
-  }
-
-  function Mesh(stream, matrix, xref, resources, pdfFunctionFactory, localColorSpaceCache) {
-    if (!(0, _primitives.isStream)(stream)) {
-      throw new _util.FormatError("Mesh data is not a stream");
-    }
-
-    var dict = stream.dict;
-    this.matrix = matrix;
-    this.shadingType = dict.get("ShadingType");
-    this.type = "Pattern";
-    const bbox = dict.getArray("BBox");
-
-    if (Array.isArray(bbox) && bbox.length === 4) {
-      this.bbox = _util.Util.normalizeRect(bbox);
-    } else {
-      this.bbox = null;
-    }
-
-    const cs = _colorspace.ColorSpace.parse({
-      cs: dict.getRaw("ColorSpace") || dict.getRaw("CS"),
-      xref,
-      resources,
-      pdfFunctionFactory,
-      localColorSpaceCache
-    });
-
-    this.cs = cs;
-    this.background = dict.has("Background") ? cs.getRgb(dict.get("Background"), 0) : null;
-    var fnObj = dict.getRaw("Function");
-    var fn = fnObj ? pdfFunctionFactory.createFromArray(fnObj) : null;
-    this.coords = [];
-    this.colors = [];
-    this.figures = [];
-    var decodeContext = {
-      bitsPerCoordinate: dict.get("BitsPerCoordinate"),
-      bitsPerComponent: dict.get("BitsPerComponent"),
-      bitsPerFlag: dict.get("BitsPerFlag"),
-      decode: dict.getArray("Decode"),
-      colorFn: fn,
-      colorSpace: cs,
-      numComps: fn ? 1 : cs.numComps
-    };
-    var reader = new MeshStreamReader(stream, decodeContext);
-    var patchMesh = false;
-
-    switch (this.shadingType) {
-      case ShadingType.FREE_FORM_MESH:
-        decodeType4Shading(this, reader);
-        break;
-
-      case ShadingType.LATTICE_FORM_MESH:
-        var verticesPerRow = dict.get("VerticesPerRow") | 0;
-
-        if (verticesPerRow < 2) {
-          throw new _util.FormatError("Invalid VerticesPerRow");
-        }
-
-        decodeType5Shading(this, reader, verticesPerRow);
-        break;
-
-      case ShadingType.COONS_PATCH_MESH:
-        decodeType6Shading(this, reader);
-        patchMesh = true;
-        break;
-
-      case ShadingType.TENSOR_PATCH_MESH:
-        decodeType7Shading(this, reader);
-        patchMesh = true;
-        break;
-
-      default:
-        (0, _util.unreachable)("Unsupported mesh type.");
-        break;
-    }
-
-    if (patchMesh) {
-      updateBounds(this);
-
-      for (var i = 0, ii = this.figures.length; i < ii; i++) {
-        buildFigureFromPatch(this, i);
-      }
-    }
-
-    updateBounds(this);
-    packData(this);
-  }
-
-  Mesh.prototype = {
-    getIR: function Mesh_getIR() {
-      return ["Mesh", this.shadingType, this.coords, this.colors, this.figures, this.bounds, this.matrix, this.bbox, this.background];
-    }
-  };
-  return Mesh;
-}();
-
-Shadings.Dummy = function DummyClosure() {
-  function Dummy() {
-    this.type = "Pattern";
-  }
-
-  Dummy.prototype = {
-    getIR: function Dummy_getIR() {
-      return ["Dummy"];
-    }
-  };
-  return Dummy;
-}();
-
-function getTilingPatternIR(operatorList, dict, args) {
-  const matrix = dict.getArray("Matrix");
-
-  const bbox = _util.Util.normalizeRect(dict.getArray("BBox"));
-
-  const xstep = dict.get("XStep");
-  const ystep = dict.get("YStep");
-  const paintType = dict.get("PaintType");
-  const tilingType = dict.get("TilingType");
-
-  if (bbox[2] - bbox[0] === 0 || bbox[3] - bbox[1] === 0) {
-    throw new _util.FormatError(`Invalid getTilingPatternIR /BBox array: [${bbox}].`);
-  }
-
-  return ["TilingPattern", args, operatorList, matrix, bbox, xstep, ystep, paintType, tilingType];
-}
-
-/***/ }),
-/* 40 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isPDFFunction = isPDFFunction;
-exports.PostScriptCompiler = exports.PostScriptEvaluator = exports.PDFFunctionFactory = void 0;
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _util = __w_pdfjs_require__(2);
-
-var _ps_parser = __w_pdfjs_require__(41);
-
-var _image_utils = __w_pdfjs_require__(24);
-
-class PDFFunctionFactory {
-  constructor({
-    xref,
-    isEvalSupported = true
-  }) {
-    this.xref = xref;
-    this.isEvalSupported = isEvalSupported !== false;
-    this._localFunctionCache = null;
-  }
-
-  create(fn) {
-    const cachedFunction = this.getCached(fn);
-
-    if (cachedFunction) {
-      return cachedFunction;
-    }
-
-    const parsedFunction = PDFFunction.parse({
-      xref: this.xref,
-      isEvalSupported: this.isEvalSupported,
-      fn: fn instanceof _primitives.Ref ? this.xref.fetch(fn) : fn
-    });
-
-    this._cache(fn, parsedFunction);
-
-    return parsedFunction;
-  }
-
-  createFromArray(fnObj) {
-    const cachedFunction = this.getCached(fnObj);
-
-    if (cachedFunction) {
-      return cachedFunction;
-    }
-
-    const parsedFunction = PDFFunction.parseArray({
-      xref: this.xref,
-      isEvalSupported: this.isEvalSupported,
-      fnObj: fnObj instanceof _primitives.Ref ? this.xref.fetch(fnObj) : fnObj
-    });
-
-    this._cache(fnObj, parsedFunction);
-
-    return parsedFunction;
-  }
-
-  getCached(cacheKey) {
-    let fnRef;
-
-    if (cacheKey instanceof _primitives.Ref) {
-      fnRef = cacheKey;
-    } else if (cacheKey instanceof _primitives.Dict) {
-      fnRef = cacheKey.objId;
-    } else if ((0, _primitives.isStream)(cacheKey)) {
-      fnRef = cacheKey.dict && cacheKey.dict.objId;
-    }
-
-    if (fnRef) {
-      if (!this._localFunctionCache) {
-        this._localFunctionCache = new _image_utils.LocalFunctionCache();
-      }
-
-      const localFunction = this._localFunctionCache.getByRef(fnRef);
-
-      if (localFunction) {
-        return localFunction;
-      }
-    }
-
-    return null;
-  }
-
-  _cache(cacheKey, parsedFunction) {
-    if (!parsedFunction) {
-      throw new Error('PDFFunctionFactory._cache - expected "parsedFunction" argument.');
-    }
-
-    let fnRef;
-
-    if (cacheKey instanceof _primitives.Ref) {
-      fnRef = cacheKey;
-    } else if (cacheKey instanceof _primitives.Dict) {
-      fnRef = cacheKey.objId;
-    } else if ((0, _primitives.isStream)(cacheKey)) {
-      fnRef = cacheKey.dict && cacheKey.dict.objId;
-    }
-
-    if (fnRef) {
-      if (!this._localFunctionCache) {
-        this._localFunctionCache = new _image_utils.LocalFunctionCache();
-      }
-
-      this._localFunctionCache.set(null, fnRef, parsedFunction);
-    }
-  }
-
-}
-
-exports.PDFFunctionFactory = PDFFunctionFactory;
-
-function toNumberArray(arr) {
-  if (!Array.isArray(arr)) {
-    return null;
-  }
-
-  const length = arr.length;
-
-  for (let i = 0; i < length; i++) {
-    if (typeof arr[i] !== "number") {
-      const result = new Array(length);
-
-      for (let j = 0; j < length; j++) {
-        result[j] = +arr[j];
-      }
-
-      return result;
-    }
-  }
-
-  return arr;
-}
-
-var PDFFunction = function PDFFunctionClosure() {
-  const CONSTRUCT_SAMPLED = 0;
-  const CONSTRUCT_INTERPOLATED = 2;
-  const CONSTRUCT_STICHED = 3;
-  const CONSTRUCT_POSTSCRIPT = 4;
-  return {
-    getSampleArray(size, outputSize, bps, stream) {
-      var i, ii;
-      var length = 1;
-
-      for (i = 0, ii = size.length; i < ii; i++) {
-        length *= size[i];
-      }
-
-      length *= outputSize;
-      var array = new Array(length);
-      var codeSize = 0;
-      var codeBuf = 0;
-      var sampleMul = 1.0 / (2.0 ** bps - 1);
-      var strBytes = stream.getBytes((length * bps + 7) / 8);
-      var strIdx = 0;
-
-      for (i = 0; i < length; i++) {
-        while (codeSize < bps) {
-          codeBuf <<= 8;
-          codeBuf |= strBytes[strIdx++];
-          codeSize += 8;
-        }
-
-        codeSize -= bps;
-        array[i] = (codeBuf >> codeSize) * sampleMul;
-        codeBuf &= (1 << codeSize) - 1;
-      }
-
-      return array;
-    },
-
-    getIR({
-      xref,
-      isEvalSupported,
-      fn
-    }) {
-      var dict = fn.dict;
-
-      if (!dict) {
-        dict = fn;
-      }
-
-      var types = [this.constructSampled, null, this.constructInterpolated, this.constructStiched, this.constructPostScript];
-      var typeNum = dict.get("FunctionType");
-      var typeFn = types[typeNum];
-
-      if (!typeFn) {
-        throw new _util.FormatError("Unknown type of function");
-      }
-
-      return typeFn.call(this, {
-        xref,
-        isEvalSupported,
-        fn,
-        dict
-      });
-    },
-
-    fromIR({
-      xref,
-      isEvalSupported,
-      IR
-    }) {
-      var type = IR[0];
-
-      switch (type) {
-        case CONSTRUCT_SAMPLED:
-          return this.constructSampledFromIR({
-            xref,
-            isEvalSupported,
-            IR
-          });
-
-        case CONSTRUCT_INTERPOLATED:
-          return this.constructInterpolatedFromIR({
-            xref,
-            isEvalSupported,
-            IR
-          });
-
-        case CONSTRUCT_STICHED:
-          return this.constructStichedFromIR({
-            xref,
-            isEvalSupported,
-            IR
-          });
-
-        default:
-          return this.constructPostScriptFromIR({
-            xref,
-            isEvalSupported,
-            IR
-          });
-      }
-    },
-
-    parse({
-      xref,
-      isEvalSupported,
-      fn
-    }) {
-      const IR = this.getIR({
-        xref,
-        isEvalSupported,
-        fn
-      });
-      return this.fromIR({
-        xref,
-        isEvalSupported,
-        IR
-      });
-    },
-
-    parseArray({
-      xref,
-      isEvalSupported,
-      fnObj
-    }) {
-      if (!Array.isArray(fnObj)) {
-        return this.parse({
-          xref,
-          isEvalSupported,
-          fn: fnObj
-        });
-      }
-
-      var fnArray = [];
-
-      for (var j = 0, jj = fnObj.length; j < jj; j++) {
-        fnArray.push(this.parse({
-          xref,
-          isEvalSupported,
-          fn: xref.fetchIfRef(fnObj[j])
-        }));
-      }
-
-      return function (src, srcOffset, dest, destOffset) {
-        for (var i = 0, ii = fnArray.length; i < ii; i++) {
-          fnArray[i](src, srcOffset, dest, destOffset + i);
-        }
-      };
-    },
-
-    constructSampled({
-      xref,
-      isEvalSupported,
-      fn,
-      dict
-    }) {
-      function toMultiArray(arr) {
-        var inputLength = arr.length;
-        var out = [];
-        var index = 0;
-
-        for (var i = 0; i < inputLength; i += 2) {
-          out[index] = [arr[i], arr[i + 1]];
-          ++index;
-        }
-
-        return out;
-      }
-
-      var domain = toNumberArray(dict.getArray("Domain"));
-      var range = toNumberArray(dict.getArray("Range"));
-
-      if (!domain || !range) {
-        throw new _util.FormatError("No domain or range");
-      }
-
-      var inputSize = domain.length / 2;
-      var outputSize = range.length / 2;
-      domain = toMultiArray(domain);
-      range = toMultiArray(range);
-      var size = toNumberArray(dict.getArray("Size"));
-      var bps = dict.get("BitsPerSample");
-      var order = dict.get("Order") || 1;
-
-      if (order !== 1) {
-        (0, _util.info)("No support for cubic spline interpolation: " + order);
-      }
-
-      var encode = toNumberArray(dict.getArray("Encode"));
-
-      if (!encode) {
-        encode = [];
-
-        for (var i = 0; i < inputSize; ++i) {
-          encode.push([0, size[i] - 1]);
-        }
-      } else {
-        encode = toMultiArray(encode);
-      }
-
-      var decode = toNumberArray(dict.getArray("Decode"));
-
-      if (!decode) {
-        decode = range;
-      } else {
-        decode = toMultiArray(decode);
-      }
-
-      var samples = this.getSampleArray(size, outputSize, bps, fn);
-      return [CONSTRUCT_SAMPLED, inputSize, domain, encode, decode, samples, size, outputSize, 2 ** bps - 1, range];
-    },
-
-    constructSampledFromIR({
-      xref,
-      isEvalSupported,
-      IR
-    }) {
-      function interpolate(x, xmin, xmax, ymin, ymax) {
-        return ymin + (x - xmin) * ((ymax - ymin) / (xmax - xmin));
-      }
-
-      return function constructSampledFromIRResult(src, srcOffset, dest, destOffset) {
-        var m = IR[1];
-        var domain = IR[2];
-        var encode = IR[3];
-        var decode = IR[4];
-        var samples = IR[5];
-        var size = IR[6];
-        var n = IR[7];
-        var range = IR[9];
-        var cubeVertices = 1 << m;
-        var cubeN = new Float64Array(cubeVertices);
-        var cubeVertex = new Uint32Array(cubeVertices);
-        var i, j;
-
-        for (j = 0; j < cubeVertices; j++) {
-          cubeN[j] = 1;
-        }
-
-        var k = n,
-            pos = 1;
-
-        for (i = 0; i < m; ++i) {
-          var domain_2i = domain[i][0];
-          var domain_2i_1 = domain[i][1];
-          var xi = Math.min(Math.max(src[srcOffset + i], domain_2i), domain_2i_1);
-          var e = interpolate(xi, domain_2i, domain_2i_1, encode[i][0], encode[i][1]);
-          var size_i = size[i];
-          e = Math.min(Math.max(e, 0), size_i - 1);
-          var e0 = e < size_i - 1 ? Math.floor(e) : e - 1;
-          var n0 = e0 + 1 - e;
-          var n1 = e - e0;
-          var offset0 = e0 * k;
-          var offset1 = offset0 + k;
-
-          for (j = 0; j < cubeVertices; j++) {
-            if (j & pos) {
-              cubeN[j] *= n1;
-              cubeVertex[j] += offset1;
-            } else {
-              cubeN[j] *= n0;
-              cubeVertex[j] += offset0;
-            }
-          }
-
-          k *= size_i;
-          pos <<= 1;
-        }
-
-        for (j = 0; j < n; ++j) {
-          var rj = 0;
-
-          for (i = 0; i < cubeVertices; i++) {
-            rj += samples[cubeVertex[i] + j] * cubeN[i];
-          }
-
-          rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]);
-          dest[destOffset + j] = Math.min(Math.max(rj, range[j][0]), range[j][1]);
-        }
-      };
-    },
-
-    constructInterpolated({
-      xref,
-      isEvalSupported,
-      fn,
-      dict
-    }) {
-      var c0 = toNumberArray(dict.getArray("C0")) || [0];
-      var c1 = toNumberArray(dict.getArray("C1")) || [1];
-      var n = dict.get("N");
-      var length = c0.length;
-      var diff = [];
-
-      for (var i = 0; i < length; ++i) {
-        diff.push(c1[i] - c0[i]);
-      }
-
-      return [CONSTRUCT_INTERPOLATED, c0, diff, n];
-    },
-
-    constructInterpolatedFromIR({
-      xref,
-      isEvalSupported,
-      IR
-    }) {
-      var c0 = IR[1];
-      var diff = IR[2];
-      var n = IR[3];
-      var length = diff.length;
-      return function constructInterpolatedFromIRResult(src, srcOffset, dest, destOffset) {
-        var x = n === 1 ? src[srcOffset] : src[srcOffset] ** n;
-
-        for (var j = 0; j < length; ++j) {
-          dest[destOffset + j] = c0[j] + x * diff[j];
-        }
-      };
-    },
-
-    constructStiched({
-      xref,
-      isEvalSupported,
-      fn,
-      dict
-    }) {
-      var domain = toNumberArray(dict.getArray("Domain"));
-
-      if (!domain) {
-        throw new _util.FormatError("No domain");
-      }
-
-      var inputSize = domain.length / 2;
-
-      if (inputSize !== 1) {
-        throw new _util.FormatError("Bad domain for stiched function");
-      }
-
-      var fnRefs = dict.get("Functions");
-      var fns = [];
-
-      for (var i = 0, ii = fnRefs.length; i < ii; ++i) {
-        fns.push(this.parse({
-          xref,
-          isEvalSupported,
-          fn: xref.fetchIfRef(fnRefs[i])
-        }));
-      }
-
-      var bounds = toNumberArray(dict.getArray("Bounds"));
-      var encode = toNumberArray(dict.getArray("Encode"));
-      return [CONSTRUCT_STICHED, domain, bounds, encode, fns];
-    },
-
-    constructStichedFromIR({
-      xref,
-      isEvalSupported,
-      IR
-    }) {
-      var domain = IR[1];
-      var bounds = IR[2];
-      var encode = IR[3];
-      var fns = IR[4];
-      var tmpBuf = new Float32Array(1);
-      return function constructStichedFromIRResult(src, srcOffset, dest, destOffset) {
-        var clip = function constructStichedFromIRClip(v, min, max) {
-          if (v > max) {
-            v = max;
-          } else if (v < min) {
-            v = min;
-          }
-
-          return v;
-        };
-
-        var v = clip(src[srcOffset], domain[0], domain[1]);
-
-        for (var i = 0, ii = bounds.length; i < ii; ++i) {
-          if (v < bounds[i]) {
-            break;
-          }
-        }
-
-        var dmin = domain[0];
-
-        if (i > 0) {
-          dmin = bounds[i - 1];
-        }
-
-        var dmax = domain[1];
-
-        if (i < bounds.length) {
-          dmax = bounds[i];
-        }
-
-        var rmin = encode[2 * i];
-        var rmax = encode[2 * i + 1];
-        tmpBuf[0] = dmin === dmax ? rmin : rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
-        fns[i](tmpBuf, 0, dest, destOffset);
-      };
-    },
-
-    constructPostScript({
-      xref,
-      isEvalSupported,
-      fn,
-      dict
-    }) {
-      var domain = toNumberArray(dict.getArray("Domain"));
-      var range = toNumberArray(dict.getArray("Range"));
-
-      if (!domain) {
-        throw new _util.FormatError("No domain.");
-      }
-
-      if (!range) {
-        throw new _util.FormatError("No range.");
-      }
-
-      var lexer = new _ps_parser.PostScriptLexer(fn);
-      var parser = new _ps_parser.PostScriptParser(lexer);
-      var code = parser.parse();
-      return [CONSTRUCT_POSTSCRIPT, domain, range, code];
-    },
-
-    constructPostScriptFromIR({
-      xref,
-      isEvalSupported,
-      IR
-    }) {
-      var domain = IR[1];
-      var range = IR[2];
-      var code = IR[3];
-
-      if (isEvalSupported && _util.IsEvalSupportedCached.value) {
-        const compiled = new PostScriptCompiler().compile(code, domain, range);
-
-        if (compiled) {
-          return new Function("src", "srcOffset", "dest", "destOffset", compiled);
-        }
-      }
-
-      (0, _util.info)("Unable to compile PS function");
-      var numOutputs = range.length >> 1;
-      var numInputs = domain.length >> 1;
-      var evaluator = new PostScriptEvaluator(code);
-      var cache = Object.create(null);
-      var MAX_CACHE_SIZE = 2048 * 4;
-      var cache_available = MAX_CACHE_SIZE;
-      var tmpBuf = new Float32Array(numInputs);
-      return function constructPostScriptFromIRResult(src, srcOffset, dest, destOffset) {
-        var i, value;
-        var key = "";
-        var input = tmpBuf;
-
-        for (i = 0; i < numInputs; i++) {
-          value = src[srcOffset + i];
-          input[i] = value;
-          key += value + "_";
-        }
-
-        var cachedValue = cache[key];
-
-        if (cachedValue !== undefined) {
-          dest.set(cachedValue, destOffset);
-          return;
-        }
-
-        var output = new Float32Array(numOutputs);
-        var stack = evaluator.execute(input);
-        var stackIndex = stack.length - numOutputs;
-
-        for (i = 0; i < numOutputs; i++) {
-          value = stack[stackIndex + i];
-          var bound = range[i * 2];
-
-          if (value < bound) {
-            value = bound;
-          } else {
-            bound = range[i * 2 + 1];
-
-            if (value > bound) {
-              value = bound;
-            }
-          }
-
-          output[i] = value;
-        }
-
-        if (cache_available > 0) {
-          cache_available--;
-          cache[key] = output;
-        }
-
-        dest.set(output, destOffset);
-      };
-    }
-
-  };
-}();
-
-function isPDFFunction(v) {
-  var fnDict;
-
-  if (typeof v !== "object") {
-    return false;
-  } else if ((0, _primitives.isDict)(v)) {
-    fnDict = v;
-  } else if ((0, _primitives.isStream)(v)) {
-    fnDict = v.dict;
-  } else {
-    return false;
-  }
-
-  return fnDict.has("FunctionType");
-}
-
-var PostScriptStack = function PostScriptStackClosure() {
-  var MAX_STACK_SIZE = 100;
-
-  function PostScriptStack(initialStack) {
-    this.stack = !initialStack ? [] : Array.prototype.slice.call(initialStack, 0);
-  }
-
-  PostScriptStack.prototype = {
-    push: function PostScriptStack_push(value) {
-      if (this.stack.length >= MAX_STACK_SIZE) {
-        throw new Error("PostScript function stack overflow.");
-      }
-
-      this.stack.push(value);
-    },
-    pop: function PostScriptStack_pop() {
-      if (this.stack.length <= 0) {
-        throw new Error("PostScript function stack underflow.");
-      }
-
-      return this.stack.pop();
-    },
-    copy: function PostScriptStack_copy(n) {
-      if (this.stack.length + n >= MAX_STACK_SIZE) {
-        throw new Error("PostScript function stack overflow.");
-      }
-
-      var stack = this.stack;
-
-      for (var i = stack.length - n, j = n - 1; j >= 0; j--, i++) {
-        stack.push(stack[i]);
-      }
-    },
-    index: function PostScriptStack_index(n) {
-      this.push(this.stack[this.stack.length - n - 1]);
-    },
-    roll: function PostScriptStack_roll(n, p) {
-      var stack = this.stack;
-      var l = stack.length - n;
-      var r = stack.length - 1,
-          c = l + (p - Math.floor(p / n) * n),
-          i,
-          j,
-          t;
-
-      for (i = l, j = r; i < j; i++, j--) {
-        t = stack[i];
-        stack[i] = stack[j];
-        stack[j] = t;
-      }
-
-      for (i = l, j = c - 1; i < j; i++, j--) {
-        t = stack[i];
-        stack[i] = stack[j];
-        stack[j] = t;
-      }
-
-      for (i = c, j = r; i < j; i++, j--) {
-        t = stack[i];
-        stack[i] = stack[j];
-        stack[j] = t;
-      }
-    }
-  };
-  return PostScriptStack;
-}();
-
-var PostScriptEvaluator = function PostScriptEvaluatorClosure() {
-  function PostScriptEvaluator(operators) {
-    this.operators = operators;
-  }
-
-  PostScriptEvaluator.prototype = {
-    execute: function PostScriptEvaluator_execute(initialStack) {
-      var stack = new PostScriptStack(initialStack);
-      var counter = 0;
-      var operators = this.operators;
-      var length = operators.length;
-      var operator, a, b;
-
-      while (counter < length) {
-        operator = operators[counter++];
-
-        if (typeof operator === "number") {
-          stack.push(operator);
-          continue;
-        }
-
-        switch (operator) {
-          case "jz":
-            b = stack.pop();
-            a = stack.pop();
-
-            if (!a) {
-              counter = b;
-            }
-
-            break;
-
-          case "j":
-            a = stack.pop();
-            counter = a;
-            break;
-
-          case "abs":
-            a = stack.pop();
-            stack.push(Math.abs(a));
-            break;
-
-          case "add":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a + b);
-            break;
-
-          case "and":
-            b = stack.pop();
-            a = stack.pop();
-
-            if ((0, _util.isBool)(a) && (0, _util.isBool)(b)) {
-              stack.push(a && b);
-            } else {
-              stack.push(a & b);
-            }
-
-            break;
-
-          case "atan":
-            a = stack.pop();
-            stack.push(Math.atan(a));
-            break;
-
-          case "bitshift":
-            b = stack.pop();
-            a = stack.pop();
-
-            if (a > 0) {
-              stack.push(a << b);
-            } else {
-              stack.push(a >> b);
-            }
-
-            break;
-
-          case "ceiling":
-            a = stack.pop();
-            stack.push(Math.ceil(a));
-            break;
-
-          case "copy":
-            a = stack.pop();
-            stack.copy(a);
-            break;
-
-          case "cos":
-            a = stack.pop();
-            stack.push(Math.cos(a));
-            break;
-
-          case "cvi":
-            a = stack.pop() | 0;
-            stack.push(a);
-            break;
-
-          case "cvr":
-            break;
-
-          case "div":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a / b);
-            break;
-
-          case "dup":
-            stack.copy(1);
-            break;
-
-          case "eq":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a === b);
-            break;
-
-          case "exch":
-            stack.roll(2, 1);
-            break;
-
-          case "exp":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a ** b);
-            break;
-
-          case "false":
-            stack.push(false);
-            break;
-
-          case "floor":
-            a = stack.pop();
-            stack.push(Math.floor(a));
-            break;
-
-          case "ge":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a >= b);
-            break;
-
-          case "gt":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a > b);
-            break;
-
-          case "idiv":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a / b | 0);
-            break;
-
-          case "index":
-            a = stack.pop();
-            stack.index(a);
-            break;
-
-          case "le":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a <= b);
-            break;
-
-          case "ln":
-            a = stack.pop();
-            stack.push(Math.log(a));
-            break;
-
-          case "log":
-            a = stack.pop();
-            stack.push(Math.log(a) / Math.LN10);
-            break;
-
-          case "lt":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a < b);
-            break;
-
-          case "mod":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a % b);
-            break;
-
-          case "mul":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a * b);
-            break;
-
-          case "ne":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a !== b);
-            break;
-
-          case "neg":
-            a = stack.pop();
-            stack.push(-a);
-            break;
-
-          case "not":
-            a = stack.pop();
-
-            if ((0, _util.isBool)(a)) {
-              stack.push(!a);
-            } else {
-              stack.push(~a);
-            }
-
-            break;
-
-          case "or":
-            b = stack.pop();
-            a = stack.pop();
-
-            if ((0, _util.isBool)(a) && (0, _util.isBool)(b)) {
-              stack.push(a || b);
-            } else {
-              stack.push(a | b);
-            }
-
-            break;
-
-          case "pop":
-            stack.pop();
-            break;
-
-          case "roll":
-            b = stack.pop();
-            a = stack.pop();
-            stack.roll(a, b);
-            break;
-
-          case "round":
-            a = stack.pop();
-            stack.push(Math.round(a));
-            break;
-
-          case "sin":
-            a = stack.pop();
-            stack.push(Math.sin(a));
-            break;
-
-          case "sqrt":
-            a = stack.pop();
-            stack.push(Math.sqrt(a));
-            break;
-
-          case "sub":
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a - b);
-            break;
-
-          case "true":
-            stack.push(true);
-            break;
-
-          case "truncate":
-            a = stack.pop();
-            a = a < 0 ? Math.ceil(a) : Math.floor(a);
-            stack.push(a);
-            break;
-
-          case "xor":
-            b = stack.pop();
-            a = stack.pop();
-
-            if ((0, _util.isBool)(a) && (0, _util.isBool)(b)) {
-              stack.push(a !== b);
-            } else {
-              stack.push(a ^ b);
-            }
-
-            break;
-
-          default:
-            throw new _util.FormatError(`Unknown operator ${operator}`);
-        }
-      }
-
-      return stack.stack;
-    }
-  };
-  return PostScriptEvaluator;
-}();
-
-exports.PostScriptEvaluator = PostScriptEvaluator;
-
-var PostScriptCompiler = function PostScriptCompilerClosure() {
-  function AstNode(type) {
-    this.type = type;
-  }
-
-  AstNode.prototype.visit = function (visitor) {
-    (0, _util.unreachable)("abstract method");
-  };
-
-  function AstArgument(index, min, max) {
-    AstNode.call(this, "args");
-    this.index = index;
-    this.min = min;
-    this.max = max;
-  }
-
-  AstArgument.prototype = Object.create(AstNode.prototype);
-
-  AstArgument.prototype.visit = function (visitor) {
-    visitor.visitArgument(this);
-  };
-
-  function AstLiteral(number) {
-    AstNode.call(this, "literal");
-    this.number = number;
-    this.min = number;
-    this.max = number;
-  }
-
-  AstLiteral.prototype = Object.create(AstNode.prototype);
-
-  AstLiteral.prototype.visit = function (visitor) {
-    visitor.visitLiteral(this);
-  };
-
-  function AstBinaryOperation(op, arg1, arg2, min, max) {
-    AstNode.call(this, "binary");
-    this.op = op;
-    this.arg1 = arg1;
-    this.arg2 = arg2;
-    this.min = min;
-    this.max = max;
-  }
-
-  AstBinaryOperation.prototype = Object.create(AstNode.prototype);
-
-  AstBinaryOperation.prototype.visit = function (visitor) {
-    visitor.visitBinaryOperation(this);
-  };
-
-  function AstMin(arg, max) {
-    AstNode.call(this, "max");
-    this.arg = arg;
-    this.min = arg.min;
-    this.max = max;
-  }
-
-  AstMin.prototype = Object.create(AstNode.prototype);
-
-  AstMin.prototype.visit = function (visitor) {
-    visitor.visitMin(this);
-  };
-
-  function AstVariable(index, min, max) {
-    AstNode.call(this, "var");
-    this.index = index;
-    this.min = min;
-    this.max = max;
-  }
-
-  AstVariable.prototype = Object.create(AstNode.prototype);
-
-  AstVariable.prototype.visit = function (visitor) {
-    visitor.visitVariable(this);
-  };
-
-  function AstVariableDefinition(variable, arg) {
-    AstNode.call(this, "definition");
-    this.variable = variable;
-    this.arg = arg;
-  }
-
-  AstVariableDefinition.prototype = Object.create(AstNode.prototype);
-
-  AstVariableDefinition.prototype.visit = function (visitor) {
-    visitor.visitVariableDefinition(this);
-  };
-
-  function ExpressionBuilderVisitor() {
-    this.parts = [];
-  }
-
-  ExpressionBuilderVisitor.prototype = {
-    visitArgument(arg) {
-      this.parts.push("Math.max(", arg.min, ", Math.min(", arg.max, ", src[srcOffset + ", arg.index, "]))");
-    },
-
-    visitVariable(variable) {
-      this.parts.push("v", variable.index);
-    },
-
-    visitLiteral(literal) {
-      this.parts.push(literal.number);
-    },
-
-    visitBinaryOperation(operation) {
-      this.parts.push("(");
-      operation.arg1.visit(this);
-      this.parts.push(" ", operation.op, " ");
-      operation.arg2.visit(this);
-      this.parts.push(")");
-    },
-
-    visitVariableDefinition(definition) {
-      this.parts.push("var ");
-      definition.variable.visit(this);
-      this.parts.push(" = ");
-      definition.arg.visit(this);
-      this.parts.push(";");
-    },
-
-    visitMin(max) {
-      this.parts.push("Math.min(");
-      max.arg.visit(this);
-      this.parts.push(", ", max.max, ")");
-    },
-
-    toString() {
-      return this.parts.join("");
-    }
-
-  };
-
-  function buildAddOperation(num1, num2) {
-    if (num2.type === "literal" && num2.number === 0) {
-      return num1;
-    }
-
-    if (num1.type === "literal" && num1.number === 0) {
-      return num2;
-    }
-
-    if (num2.type === "literal" && num1.type === "literal") {
-      return new AstLiteral(num1.number + num2.number);
-    }
-
-    return new AstBinaryOperation("+", num1, num2, num1.min + num2.min, num1.max + num2.max);
-  }
-
-  function buildMulOperation(num1, num2) {
-    if (num2.type === "literal") {
-      if (num2.number === 0) {
-        return new AstLiteral(0);
-      } else if (num2.number === 1) {
-        return num1;
-      } else if (num1.type === "literal") {
-        return new AstLiteral(num1.number * num2.number);
-      }
-    }
-
-    if (num1.type === "literal") {
-      if (num1.number === 0) {
-        return new AstLiteral(0);
-      } else if (num1.number === 1) {
-        return num2;
-      }
-    }
-
-    var min = Math.min(num1.min * num2.min, num1.min * num2.max, num1.max * num2.min, num1.max * num2.max);
-    var max = Math.max(num1.min * num2.min, num1.min * num2.max, num1.max * num2.min, num1.max * num2.max);
-    return new AstBinaryOperation("*", num1, num2, min, max);
-  }
-
-  function buildSubOperation(num1, num2) {
-    if (num2.type === "literal") {
-      if (num2.number === 0) {
-        return num1;
-      } else if (num1.type === "literal") {
-        return new AstLiteral(num1.number - num2.number);
-      }
-    }
-
-    if (num2.type === "binary" && num2.op === "-" && num1.type === "literal" && num1.number === 1 && num2.arg1.type === "literal" && num2.arg1.number === 1) {
-      return num2.arg2;
-    }
-
-    return new AstBinaryOperation("-", num1, num2, num1.min - num2.max, num1.max - num2.min);
-  }
-
-  function buildMinOperation(num1, max) {
-    if (num1.min >= max) {
-      return new AstLiteral(max);
-    } else if (num1.max <= max) {
-      return num1;
-    }
-
-    return new AstMin(num1, max);
-  }
-
-  function PostScriptCompiler() {}
-
-  PostScriptCompiler.prototype = {
-    compile: function PostScriptCompiler_compile(code, domain, range) {
-      var stack = [];
-      var instructions = [];
-      var inputSize = domain.length >> 1,
-          outputSize = range.length >> 1;
-      var lastRegister = 0;
-      var n, j;
-      var num1, num2, ast1, ast2, tmpVar, item;
-
-      for (let i = 0; i < inputSize; i++) {
-        stack.push(new AstArgument(i, domain[i * 2], domain[i * 2 + 1]));
-      }
-
-      for (let i = 0, ii = code.length; i < ii; i++) {
-        item = code[i];
-
-        if (typeof item === "number") {
-          stack.push(new AstLiteral(item));
-          continue;
-        }
-
-        switch (item) {
-          case "add":
-            if (stack.length < 2) {
-              return null;
-            }
-
-            num2 = stack.pop();
-            num1 = stack.pop();
-            stack.push(buildAddOperation(num1, num2));
-            break;
-
-          case "cvr":
-            if (stack.length < 1) {
-              return null;
-            }
-
-            break;
-
-          case "mul":
-            if (stack.length < 2) {
-              return null;
-            }
-
-            num2 = stack.pop();
-            num1 = stack.pop();
-            stack.push(buildMulOperation(num1, num2));
-            break;
-
-          case "sub":
-            if (stack.length < 2) {
-              return null;
-            }
-
-            num2 = stack.pop();
-            num1 = stack.pop();
-            stack.push(buildSubOperation(num1, num2));
-            break;
-
-          case "exch":
-            if (stack.length < 2) {
-              return null;
-            }
-
-            ast1 = stack.pop();
-            ast2 = stack.pop();
-            stack.push(ast1, ast2);
-            break;
-
-          case "pop":
-            if (stack.length < 1) {
-              return null;
-            }
-
-            stack.pop();
-            break;
-
-          case "index":
-            if (stack.length < 1) {
-              return null;
-            }
-
-            num1 = stack.pop();
-
-            if (num1.type !== "literal") {
-              return null;
-            }
-
-            n = num1.number;
-
-            if (n < 0 || !Number.isInteger(n) || stack.length < n) {
-              return null;
-            }
-
-            ast1 = stack[stack.length - n - 1];
-
-            if (ast1.type === "literal" || ast1.type === "var") {
-              stack.push(ast1);
-              break;
-            }
-
-            tmpVar = new AstVariable(lastRegister++, ast1.min, ast1.max);
-            stack[stack.length - n - 1] = tmpVar;
-            stack.push(tmpVar);
-            instructions.push(new AstVariableDefinition(tmpVar, ast1));
-            break;
-
-          case "dup":
-            if (stack.length < 1) {
-              return null;
-            }
-
-            if (typeof code[i + 1] === "number" && code[i + 2] === "gt" && code[i + 3] === i + 7 && code[i + 4] === "jz" && code[i + 5] === "pop" && code[i + 6] === code[i + 1]) {
-              num1 = stack.pop();
-              stack.push(buildMinOperation(num1, code[i + 1]));
-              i += 6;
-              break;
-            }
-
-            ast1 = stack[stack.length - 1];
-
-            if (ast1.type === "literal" || ast1.type === "var") {
-              stack.push(ast1);
-              break;
-            }
-
-            tmpVar = new AstVariable(lastRegister++, ast1.min, ast1.max);
-            stack[stack.length - 1] = tmpVar;
-            stack.push(tmpVar);
-            instructions.push(new AstVariableDefinition(tmpVar, ast1));
-            break;
-
-          case "roll":
-            if (stack.length < 2) {
-              return null;
-            }
-
-            num2 = stack.pop();
-            num1 = stack.pop();
-
-            if (num2.type !== "literal" || num1.type !== "literal") {
-              return null;
-            }
-
-            j = num2.number;
-            n = num1.number;
-
-            if (n <= 0 || !Number.isInteger(n) || !Number.isInteger(j) || stack.length < n) {
-              return null;
-            }
-
-            j = (j % n + n) % n;
-
-            if (j === 0) {
-              break;
-            }
-
-            Array.prototype.push.apply(stack, stack.splice(stack.length - n, n - j));
-            break;
-
-          default:
-            return null;
-        }
-      }
-
-      if (stack.length !== outputSize) {
-        return null;
-      }
-
-      var result = [];
-      instructions.forEach(function (instruction) {
-        var statementBuilder = new ExpressionBuilderVisitor();
-        instruction.visit(statementBuilder);
-        result.push(statementBuilder.toString());
-      });
-      stack.forEach(function (expr, i) {
-        var statementBuilder = new ExpressionBuilderVisitor();
-        expr.visit(statementBuilder);
-        var min = range[i * 2],
-            max = range[i * 2 + 1];
-        var out = [statementBuilder.toString()];
-
-        if (min > expr.min) {
-          out.unshift("Math.max(", min, ", ");
-          out.push(")");
-        }
-
-        if (max < expr.max) {
-          out.unshift("Math.min(", max, ", ");
-          out.push(")");
-        }
-
-        out.unshift("dest[destOffset + ", i, "] = ");
-        out.push(";");
-        result.push(out.join(""));
-      });
-      return result.join("\n");
-    }
-  };
-  return PostScriptCompiler;
-}();
-
-exports.PostScriptCompiler = PostScriptCompiler;
-
-/***/ }),
-/* 41 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.PostScriptParser = exports.PostScriptLexer = void 0;
-
-var _util = __w_pdfjs_require__(2);
-
-var _primitives = __w_pdfjs_require__(5);
-
-var _core_utils = __w_pdfjs_require__(8);
-
-class PostScriptParser {
-  constructor(lexer) {
-    this.lexer = lexer;
-    this.operators = [];
-    this.token = null;
-    this.prev = null;
-  }
-
-  nextToken() {
-    this.prev = this.token;
-    this.token = this.lexer.getToken();
-  }
-
-  accept(type) {
-    if (this.token.type === type) {
-      this.nextToken();
-      return true;
-    }
-
-    return false;
-  }
-
-  expect(type) {
-    if (this.accept(type)) {
-      return true;
-    }
-
-    throw new _util.FormatError(`Unexpected symbol: found ${this.token.type} expected ${type}.`);
-  }
-
-  parse() {
-    this.nextToken();
-    this.expect(PostScriptTokenTypes.LBRACE);
-    this.parseBlock();
-    this.expect(PostScriptTokenTypes.RBRACE);
-    return this.operators;
-  }
-
-  parseBlock() {
-    while (true) {
-      if (this.accept(PostScriptTokenTypes.NUMBER)) {
-        this.operators.push(this.prev.value);
-      } else if (this.accept(PostScriptTokenTypes.OPERATOR)) {
-        this.operators.push(this.prev.value);
-      } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
-        this.parseCondition();
-      } else {
-        return;
-      }
-    }
-  }
-
-  parseCondition() {
-    const conditionLocation = this.operators.length;
-    this.operators.push(null, null);
-    this.parseBlock();
-    this.expect(PostScriptTokenTypes.RBRACE);
-
-    if (this.accept(PostScriptTokenTypes.IF)) {
-      this.operators[conditionLocation] = this.operators.length;
-      this.operators[conditionLocation + 1] = "jz";
-    } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
-      const jumpLocation = this.operators.length;
-      this.operators.push(null, null);
-      const endOfTrue = this.operators.length;
-      this.parseBlock();
-      this.expect(PostScriptTokenTypes.RBRACE);
-      this.expect(PostScriptTokenTypes.IFELSE);
-      this.operators[jumpLocation] = this.operators.length;
-      this.operators[jumpLocation + 1] = "j";
-      this.operators[conditionLocation] = endOfTrue;
-      this.operators[conditionLocation + 1] = "jz";
-    } else {
-      throw new _util.FormatError("PS Function: error parsing conditional.");
-    }
-  }
-
-}
-
-exports.PostScriptParser = PostScriptParser;
-const PostScriptTokenTypes = {
-  LBRACE: 0,
-  RBRACE: 1,
-  NUMBER: 2,
-  OPERATOR: 3,
-  IF: 4,
-  IFELSE: 5
-};
-
-const PostScriptToken = function PostScriptTokenClosure() {
-  const opCache = Object.create(null);
-
-  class PostScriptToken {
-    constructor(type, value) {
-      this.type = type;
-      this.value = value;
-    }
-
-    static getOperator(op) {
-      const opValue = opCache[op];
-
-      if (opValue) {
-        return opValue;
-      }
-
-      return opCache[op] = new PostScriptToken(PostScriptTokenTypes.OPERATOR, op);
-    }
-
-    static get LBRACE() {
-      return (0, _util.shadow)(this, "LBRACE", new PostScriptToken(PostScriptTokenTypes.LBRACE, "{"));
-    }
-
-    static get RBRACE() {
-      return (0, _util.shadow)(this, "RBRACE", new PostScriptToken(PostScriptTokenTypes.RBRACE, "}"));
-    }
-
-    static get IF() {
-      return (0, _util.shadow)(this, "IF", new PostScriptToken(PostScriptTokenTypes.IF, "IF"));
-    }
-
-    static get IFELSE() {
-      return (0, _util.shadow)(this, "IFELSE", new PostScriptToken(PostScriptTokenTypes.IFELSE, "IFELSE"));
-    }
-
-  }
-
-  return PostScriptToken;
-}();
-
-class PostScriptLexer {
-  constructor(stream) {
-    this.stream = stream;
-    this.nextChar();
-    this.strBuf = [];
-  }
-
-  nextChar() {
-    return this.currentChar = this.stream.getByte();
-  }
-
-  getToken() {
-    let comment = false;
-    let ch = this.currentChar;
-
-    while (true) {
-      if (ch < 0) {
-        return _primitives.EOF;
-      }
-
-      if (comment) {
-        if (ch === 0x0a || ch === 0x0d) {
-          comment = false;
-        }
-      } else if (ch === 0x25) {
-        comment = true;
-      } else if (!(0, _core_utils.isWhiteSpace)(ch)) {
-        break;
-      }
-
-      ch = this.nextChar();
-    }
-
-    switch (ch | 0) {
-      case 0x30:
-      case 0x31:
-      case 0x32:
-      case 0x33:
-      case 0x34:
-      case 0x35:
-      case 0x36:
-      case 0x37:
-      case 0x38:
-      case 0x39:
-      case 0x2b:
-      case 0x2d:
-      case 0x2e:
-        return new PostScriptToken(PostScriptTokenTypes.NUMBER, this.getNumber());
-
-      case 0x7b:
-        this.nextChar();
-        return PostScriptToken.LBRACE;
-
-      case 0x7d:
-        this.nextChar();
-        return PostScriptToken.RBRACE;
-    }
-
-    const strBuf = this.strBuf;
-    strBuf.length = 0;
-    strBuf[0] = String.fromCharCode(ch);
-
-    while ((ch = this.nextChar()) >= 0 && (ch >= 0x41 && ch <= 0x5a || ch >= 0x61 && ch <= 0x7a)) {
-      strBuf.push(String.fromCharCode(ch));
-    }
-
-    const str = strBuf.join("");
-
-    switch (str.toLowerCase()) {
-      case "if":
-        return PostScriptToken.IF;
-
-      case "ifelse":
-        return PostScriptToken.IFELSE;
-
-      default:
-        return PostScriptToken.getOperator(str);
-    }
-  }
-
-  getNumber() {
-    let ch = this.currentChar;
-    const strBuf = this.strBuf;
-    strBuf.length = 0;
-    strBuf[0] = String.fromCharCode(ch);
-
-    while ((ch = this.nextChar()) >= 0) {
-      if (ch >= 0x30 && ch <= 0x39 || ch === 0x2d || ch === 0x2e) {
-        strBuf.push(String.fromCharCode(ch));
-      } else {
-        break;
-      }
-    }
-
-    const value = parseFloat(strBuf.join(""));
-
-    if (isNaN(value)) {
-      throw new _util.FormatError(`Invalid floating point number: ${value}`);
-    }
-
-    return value;
-  }
-
-}
-
-exports.PostScriptLexer = PostScriptLexer;
-
-/***/ }),
-/* 42 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.bidi = bidi;
-
-var _util = __w_pdfjs_require__(2);
-
-var baseTypes = ["BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "S", "B", "S", "WS", "B", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "B", "B", "B", "S", "WS", "ON", "ON", "ET", "ET", "ET", "ON", "ON", "ON", "ON", "ON", "ES", "CS", "ES", "CS", "CS", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "CS", "ON", "ON", "ON", "ON", "ON", "ON", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "ON", "ON", "ON", "ON", "ON", "ON", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "ON", "ON", "ON", "ON", "BN", "BN", "BN", "BN", "BN", "BN", "B", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "CS", "ON", "ET", "ET", "ET", "ET", "ON", "ON", "ON", "ON", "L", "ON", "ON", "BN", "ON", "ON", "ET", "ET", "EN", "EN", "ON", "L", "ON", "ON", "ON", "EN", "L", "ON", "ON", "ON", "ON", "ON", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "ON", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "ON", "L", "L", "L", "L", "L", "L", "L", "L"];
-var arabicTypes = ["AN", "AN", "AN", "AN", "AN", "AN", "ON", "ON", "AL", "ET", "ET", "AL", "CS", "AL", "ON", "ON", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "AL", "AL", "", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "AN", "AN", "AN", "AN", "AN", "AN", "AN", "AN", "AN", "AN", "ET", "AN", "AN", "AL", "AL", "AL", "NSM", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "AN", "ON", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "AL", "AL", "NSM", "NSM", "ON", "NSM", "NSM", "NSM", "NSM", "AL", "AL", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "AL", "AL", "AL", "AL", "AL", "AL"];
-
-function isOdd(i) {
-  return (i & 1) !== 0;
-}
-
-function isEven(i) {
-  return (i & 1) === 0;
-}
-
-function findUnequal(arr, start, value) {
-  for (var j = start, jj = arr.length; j < jj; ++j) {
-    if (arr[j] !== value) {
-      return j;
-    }
-  }
-
-  return j;
-}
-
-function setValues(arr, start, end, value) {
-  for (var j = start; j < end; ++j) {
-    arr[j] = value;
-  }
-}
-
-function reverseValues(arr, start, end) {
-  for (var i = start, j = end - 1; i < j; ++i, --j) {
-    var temp = arr[i];
-    arr[i] = arr[j];
-    arr[j] = temp;
-  }
-}
-
-function createBidiText(str, isLTR, vertical = false) {
-  let dir = "ltr";
-
-  if (vertical) {
-    dir = "ttb";
-  } else if (!isLTR) {
-    dir = "rtl";
-  }
-
-  return {
-    str,
-    dir
-  };
-}
-
-var chars = [];
-var types = [];
-
-function bidi(str, startLevel, vertical) {
-  var isLTR = true;
-  var strLength = str.length;
-
-  if (strLength === 0 || vertical) {
-    return createBidiText(str, isLTR, vertical);
-  }
-
-  chars.length = strLength;
-  types.length = strLength;
-  var numBidi = 0;
-  var i, ii;
-
-  for (i = 0; i < strLength; ++i) {
-    chars[i] = str.charAt(i);
-    var charCode = str.charCodeAt(i);
-    var charType = "L";
-
-    if (charCode <= 0x00ff) {
-      charType = baseTypes[charCode];
-    } else if (0x0590 <= charCode && charCode <= 0x05f4) {
-      charType = "R";
-    } else if (0x0600 <= charCode && charCode <= 0x06ff) {
-      charType = arabicTypes[charCode & 0xff];
-
-      if (!charType) {
-        (0, _util.warn)("Bidi: invalid Unicode character " + charCode.toString(16));
-      }
-    } else if (0x0700 <= charCode && charCode <= 0x08ac) {
-      charType = "AL";
-    }
-
-    if (charType === "R" || charType === "AL" || charType === "AN") {
-      numBidi++;
-    }
-
-    types[i] = charType;
-  }
-
-  if (numBidi === 0) {
-    isLTR = true;
-    return createBidiText(str, isLTR);
-  }
-
-  if (startLevel === -1) {
-    if (numBidi / strLength < 0.3) {
-      isLTR = true;
-      startLevel = 0;
-    } else {
-      isLTR = false;
-      startLevel = 1;
-    }
-  }
-
-  var levels = [];
-
-  for (i = 0; i < strLength; ++i) {
-    levels[i] = startLevel;
-  }
-
-  var e = isOdd(startLevel) ? "R" : "L";
-  var sor = e;
-  var eor = sor;
-  var lastType = sor;
-
-  for (i = 0; i < strLength; ++i) {
-    if (types[i] === "NSM") {
-      types[i] = lastType;
-    } else {
-      lastType = types[i];
-    }
-  }
-
-  lastType = sor;
-  var t;
-
-  for (i = 0; i < strLength; ++i) {
-    t = types[i];
-
-    if (t === "EN") {
-      types[i] = lastType === "AL" ? "AN" : "EN";
-    } else if (t === "R" || t === "L" || t === "AL") {
-      lastType = t;
-    }
-  }
-
-  for (i = 0; i < strLength; ++i) {
-    t = types[i];
-
-    if (t === "AL") {
-      types[i] = "R";
-    }
-  }
-
-  for (i = 1; i < strLength - 1; ++i) {
-    if (types[i] === "ES" && types[i - 1] === "EN" && types[i + 1] === "EN") {
-      types[i] = "EN";
-    }
-
-    if (types[i] === "CS" && (types[i - 1] === "EN" || types[i - 1] === "AN") && types[i + 1] === types[i - 1]) {
-      types[i] = types[i - 1];
-    }
-  }
-
-  for (i = 0; i < strLength; ++i) {
-    if (types[i] === "EN") {
-      var j;
-
-      for (j = i - 1; j >= 0; --j) {
-        if (types[j] !== "ET") {
-          break;
-        }
-
-        types[j] = "EN";
-      }
-
-      for (j = i + 1; j < strLength; ++j) {
-        if (types[j] !== "ET") {
-          break;
-        }
-
-        types[j] = "EN";
-      }
-    }
-  }
-
-  for (i = 0; i < strLength; ++i) {
-    t = types[i];
-
-    if (t === "WS" || t === "ES" || t === "ET" || t === "CS") {
-      types[i] = "ON";
-    }
-  }
-
-  lastType = sor;
-
-  for (i = 0; i < strLength; ++i) {
-    t = types[i];
-
-    if (t === "EN") {
-      types[i] = lastType === "L" ? "L" : "EN";
-    } else if (t === "R" || t === "L") {
-      lastType = t;
-    }
-  }
-
-  for (i = 0; i < strLength; ++i) {
-    if (types[i] === "ON") {
-      var end = findUnequal(types, i + 1, "ON");
-      var before = sor;
-
-      if (i > 0) {
-        before = types[i - 1];
-      }
-
-      var after = eor;
-
-      if (end + 1 < strLength) {
-        after = types[end + 1];
-      }
-
-      if (before !== "L") {
-        before = "R";
-      }
-
-      if (after !== "L") {
-        after = "R";
-      }
-
-      if (before === after) {
-        setValues(types, i, end, before);
-      }
-
-      i = end - 1;
-    }
-  }
-
-  for (i = 0; i < strLength; ++i) {
-    if (types[i] === "ON") {
-      types[i] = e;
-    }
-  }
-
-  for (i = 0; i < strLength; ++i) {
-    t = types[i];
-
-    if (isEven(levels[i])) {
-      if (t === "R") {
-        levels[i] += 1;
-      } else if (t === "AN" || t === "EN") {
-        levels[i] += 2;
-      }
-    } else {
-      if (t === "L" || t === "AN" || t === "EN") {
-        levels[i] += 1;
-      }
-    }
-  }
-
-  var highestLevel = -1;
-  var lowestOddLevel = 99;
-  var level;
-
-  for (i = 0, ii = levels.length; i < ii; ++i) {
-    level = levels[i];
-
-    if (highestLevel < level) {
-      highestLevel = level;
-    }
-
-    if (lowestOddLevel > level && isOdd(level)) {
-      lowestOddLevel = level;
-    }
-  }
-
-  for (level = highestLevel; level >= lowestOddLevel; --level) {
-    var start = -1;
-
-    for (i = 0, ii = levels.length; i < ii; ++i) {
-      if (levels[i] < level) {
-        if (start >= 0) {
-          reverseValues(chars, start, i);
-          start = -1;
-        }
-      } else if (start < 0) {
-        start = i;
-      }
-    }
-
-    if (start >= 0) {
-      reverseValues(chars, start, levels.length);
-    }
-  }
-
-  for (i = 0, ii = chars.length; i < ii; ++i) {
-    var ch = chars[i];
-
-    if (ch === "<" || ch === ">") {
-      chars[i] = "";
-    }
-  }
-
-  return createBidiText(chars.join(""), isLTR);
-}
-
-/***/ }),
-/* 43 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getMetrics = void 0;
-
-var _core_utils = __w_pdfjs_require__(8);
-
-var getMetrics = (0, _core_utils.getLookupTableFactory)(function (t) {
+const getMetrics = (0, _core_utils.getLookupTableFactory)(function (t) {
   t.Courier = 600;
   t["Courier-Bold"] = 600;
   t["Courier-BoldOblique"] = 600;
@@ -46177,17 +47487,5560 @@ var getMetrics = (0, _core_utils.getLookupTableFactory)(function (t) {
   });
 });
 exports.getMetrics = getMetrics;
+const getFontBasicMetrics = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t.Courier = {
+    ascent: 629,
+    descent: -157,
+    capHeight: 562,
+    xHeight: -426
+  };
+  t["Courier-Bold"] = {
+    ascent: 629,
+    descent: -157,
+    capHeight: 562,
+    xHeight: 439
+  };
+  t["Courier-Oblique"] = {
+    ascent: 629,
+    descent: -157,
+    capHeight: 562,
+    xHeight: 426
+  };
+  t["Courier-BoldOblique"] = {
+    ascent: 629,
+    descent: -157,
+    capHeight: 562,
+    xHeight: 426
+  };
+  t.Helvetica = {
+    ascent: 718,
+    descent: -207,
+    capHeight: 718,
+    xHeight: 523
+  };
+  t["Helvetica-Bold"] = {
+    ascent: 718,
+    descent: -207,
+    capHeight: 718,
+    xHeight: 532
+  };
+  t["Helvetica-Oblique"] = {
+    ascent: 718,
+    descent: -207,
+    capHeight: 718,
+    xHeight: 523
+  };
+  t["Helvetica-BoldOblique"] = {
+    ascent: 718,
+    descent: -207,
+    capHeight: 718,
+    xHeight: 532
+  };
+  t["Times-Roman"] = {
+    ascent: 683,
+    descent: -217,
+    capHeight: 662,
+    xHeight: 450
+  };
+  t["Times-Bold"] = {
+    ascent: 683,
+    descent: -217,
+    capHeight: 676,
+    xHeight: 461
+  };
+  t["Times-Italic"] = {
+    ascent: 683,
+    descent: -217,
+    capHeight: 653,
+    xHeight: 441
+  };
+  t["Times-BoldItalic"] = {
+    ascent: 683,
+    descent: -217,
+    capHeight: 669,
+    xHeight: 462
+  };
+  t.Symbol = {
+    ascent: Math.NaN,
+    descent: Math.NaN,
+    capHeight: Math.NaN,
+    xHeight: Math.NaN
+  };
+  t.ZapfDingbats = {
+    ascent: Math.NaN,
+    descent: Math.NaN,
+    capHeight: Math.NaN,
+    xHeight: Math.NaN
+  };
+});
+exports.getFontBasicMetrics = getFontBasicMetrics;
 
 /***/ }),
-/* 44 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 46 */
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
+}));
+exports.GlyfTable = void 0;
+const ON_CURVE_POINT = 1 << 0;
+const X_SHORT_VECTOR = 1 << 1;
+const Y_SHORT_VECTOR = 1 << 2;
+const REPEAT_FLAG = 1 << 3;
+const X_IS_SAME_OR_POSITIVE_X_SHORT_VECTOR = 1 << 4;
+const Y_IS_SAME_OR_POSITIVE_Y_SHORT_VECTOR = 1 << 5;
+const OVERLAP_SIMPLE = 1 << 6;
+const ARG_1_AND_2_ARE_WORDS = 1 << 0;
+const ARGS_ARE_XY_VALUES = 1 << 1;
+const WE_HAVE_A_SCALE = 1 << 3;
+const MORE_COMPONENTS = 1 << 5;
+const WE_HAVE_AN_X_AND_Y_SCALE = 1 << 6;
+const WE_HAVE_A_TWO_BY_TWO = 1 << 7;
+const WE_HAVE_INSTRUCTIONS = 1 << 8;
+
+class GlyfTable {
+  constructor({
+    glyfTable,
+    isGlyphLocationsLong,
+    locaTable,
+    numGlyphs
+  }) {
+    this.glyphs = [];
+    const loca = new DataView(locaTable.buffer, locaTable.byteOffset, locaTable.byteLength);
+    const glyf = new DataView(glyfTable.buffer, glyfTable.byteOffset, glyfTable.byteLength);
+    const offsetSize = isGlyphLocationsLong ? 4 : 2;
+    let prev = isGlyphLocationsLong ? loca.getUint32(0) : 2 * loca.getUint16(0);
+    let pos = 0;
+
+    for (let i = 0; i < numGlyphs; i++) {
+      pos += offsetSize;
+      const next = isGlyphLocationsLong ? loca.getUint32(pos) : 2 * loca.getUint16(pos);
+
+      if (next === prev) {
+        this.glyphs.push(new Glyph({}));
+        continue;
+      }
+
+      const glyph = Glyph.parse(prev, glyf);
+      this.glyphs.push(glyph);
+      prev = next;
+    }
+  }
+
+  getSize() {
+    return this.glyphs.reduce((a, g) => {
+      const size = g.getSize();
+      return a + (size + 3 & ~3);
+    }, 0);
+  }
+
+  write() {
+    const totalSize = this.getSize();
+    const glyfTable = new DataView(new ArrayBuffer(totalSize));
+    const isLocationLong = totalSize > 0x1fffe;
+    const offsetSize = isLocationLong ? 4 : 2;
+    const locaTable = new DataView(new ArrayBuffer((this.glyphs.length + 1) * offsetSize));
+
+    if (isLocationLong) {
+      locaTable.setUint32(0, 0);
+    } else {
+      locaTable.setUint16(0, 0);
+    }
+
+    let pos = 0;
+    let locaIndex = 0;
+
+    for (const glyph of this.glyphs) {
+      pos += glyph.write(pos, glyfTable);
+      pos = pos + 3 & ~3;
+      locaIndex += offsetSize;
+
+      if (isLocationLong) {
+        locaTable.setUint32(locaIndex, pos);
+      } else {
+        locaTable.setUint16(locaIndex, pos >> 1);
+      }
+    }
+
+    return {
+      isLocationLong,
+      loca: new Uint8Array(locaTable.buffer),
+      glyf: new Uint8Array(glyfTable.buffer)
+    };
+  }
+
+  scale(factors) {
+    for (let i = 0, ii = this.glyphs.length; i < ii; i++) {
+      this.glyphs[i].scale(factors[i]);
+    }
+  }
+
+}
+
+exports.GlyfTable = GlyfTable;
+
+class Glyph {
+  constructor({
+    header = null,
+    simple = null,
+    composites = null
+  }) {
+    this.header = header;
+    this.simple = simple;
+    this.composites = composites;
+  }
+
+  static parse(pos, glyf) {
+    const [read, header] = GlyphHeader.parse(pos, glyf);
+    pos += read;
+
+    if (header.numberOfContours < 0) {
+      const composites = [];
+
+      while (true) {
+        const [n, composite] = CompositeGlyph.parse(pos, glyf);
+        pos += n;
+        composites.push(composite);
+
+        if (!(composite.flags & MORE_COMPONENTS)) {
+          break;
+        }
+      }
+
+      return new Glyph({
+        header,
+        composites
+      });
+    }
+
+    const simple = SimpleGlyph.parse(pos, glyf, header.numberOfContours);
+    return new Glyph({
+      header,
+      simple
+    });
+  }
+
+  getSize() {
+    if (!this.header) {
+      return 0;
+    }
+
+    const size = this.simple ? this.simple.getSize() : this.composites.reduce((a, c) => a + c.getSize(), 0);
+    return this.header.getSize() + size;
+  }
+
+  write(pos, buf) {
+    if (!this.header) {
+      return 0;
+    }
+
+    const spos = pos;
+    pos += this.header.write(pos, buf);
+
+    if (this.simple) {
+      pos += this.simple.write(pos, buf);
+    } else {
+      for (const composite of this.composites) {
+        pos += composite.write(pos, buf);
+      }
+    }
+
+    return pos - spos;
+  }
+
+  scale(factor) {
+    if (!this.header) {
+      return;
+    }
+
+    const xMiddle = (this.header.xMin + this.header.xMax) / 2;
+    this.header.scale(xMiddle, factor);
+
+    if (this.simple) {
+      this.simple.scale(xMiddle, factor);
+    } else {
+      for (const composite of this.composites) {
+        composite.scale(xMiddle, factor);
+      }
+    }
+  }
+
+}
+
+class GlyphHeader {
+  constructor({
+    numberOfContours,
+    xMin,
+    yMin,
+    xMax,
+    yMax
+  }) {
+    this.numberOfContours = numberOfContours;
+    this.xMin = xMin;
+    this.yMin = yMin;
+    this.xMax = xMax;
+    this.yMax = yMax;
+  }
+
+  static parse(pos, glyf) {
+    return [10, new GlyphHeader({
+      numberOfContours: glyf.getInt16(pos),
+      xMin: glyf.getInt16(pos + 2),
+      yMin: glyf.getInt16(pos + 4),
+      xMax: glyf.getInt16(pos + 6),
+      yMax: glyf.getInt16(pos + 8)
+    })];
+  }
+
+  getSize() {
+    return 10;
+  }
+
+  write(pos, buf) {
+    buf.setInt16(pos, this.numberOfContours);
+    buf.setInt16(pos + 2, this.xMin);
+    buf.setInt16(pos + 4, this.yMin);
+    buf.setInt16(pos + 6, this.xMax);
+    buf.setInt16(pos + 8, this.yMax);
+    return 10;
+  }
+
+  scale(x, factor) {
+    this.xMin = Math.round(x + (this.xMin - x) * factor);
+    this.xMax = Math.round(x + (this.xMax - x) * factor);
+  }
+
+}
+
+class Contour {
+  constructor({
+    flags,
+    xCoordinates,
+    yCoordinates
+  }) {
+    this.xCoordinates = xCoordinates;
+    this.yCoordinates = yCoordinates;
+    this.flags = flags;
+  }
+
+}
+
+class SimpleGlyph {
+  constructor({
+    contours,
+    instructions
+  }) {
+    this.contours = contours;
+    this.instructions = instructions;
+  }
+
+  static parse(pos, glyf, numberOfContours) {
+    const endPtsOfContours = [];
+
+    for (let i = 0; i < numberOfContours; i++) {
+      const endPt = glyf.getUint16(pos);
+      pos += 2;
+      endPtsOfContours.push(endPt);
+    }
+
+    const numberOfPt = endPtsOfContours[numberOfContours - 1] + 1;
+    const instructionLength = glyf.getUint16(pos);
+    pos += 2;
+    const instructions = new Uint8Array(glyf).slice(pos, pos + instructionLength);
+    pos += instructionLength;
+    const flags = [];
+
+    for (let i = 0; i < numberOfPt; pos++, i++) {
+      let flag = glyf.getUint8(pos);
+      flags.push(flag);
+
+      if (flag & REPEAT_FLAG) {
+        const count = glyf.getUint8(++pos);
+        flag ^= REPEAT_FLAG;
+
+        for (let m = 0; m < count; m++) {
+          flags.push(flag);
+        }
+
+        i += count;
+      }
+    }
+
+    const allXCoordinates = [];
+    let xCoordinates = [];
+    let yCoordinates = [];
+    let pointFlags = [];
+    const contours = [];
+    let endPtsOfContoursIndex = 0;
+    let lastCoordinate = 0;
+
+    for (let i = 0; i < numberOfPt; i++) {
+      const flag = flags[i];
+
+      if (flag & X_SHORT_VECTOR) {
+        const x = glyf.getUint8(pos++);
+        lastCoordinate += flag & X_IS_SAME_OR_POSITIVE_X_SHORT_VECTOR ? x : -x;
+        xCoordinates.push(lastCoordinate);
+      } else if (flag & X_IS_SAME_OR_POSITIVE_X_SHORT_VECTOR) {
+        xCoordinates.push(lastCoordinate);
+      } else {
+        lastCoordinate += glyf.getInt16(pos);
+        pos += 2;
+        xCoordinates.push(lastCoordinate);
+      }
+
+      if (endPtsOfContours[endPtsOfContoursIndex] === i) {
+        endPtsOfContoursIndex++;
+        allXCoordinates.push(xCoordinates);
+        xCoordinates = [];
+      }
+    }
+
+    lastCoordinate = 0;
+    endPtsOfContoursIndex = 0;
+
+    for (let i = 0; i < numberOfPt; i++) {
+      const flag = flags[i];
+
+      if (flag & Y_SHORT_VECTOR) {
+        const y = glyf.getUint8(pos++);
+        lastCoordinate += flag & Y_IS_SAME_OR_POSITIVE_Y_SHORT_VECTOR ? y : -y;
+        yCoordinates.push(lastCoordinate);
+      } else if (flag & Y_IS_SAME_OR_POSITIVE_Y_SHORT_VECTOR) {
+        yCoordinates.push(lastCoordinate);
+      } else {
+        lastCoordinate += glyf.getInt16(pos);
+        pos += 2;
+        yCoordinates.push(lastCoordinate);
+      }
+
+      pointFlags.push(flag & ON_CURVE_POINT | flag & OVERLAP_SIMPLE);
+
+      if (endPtsOfContours[endPtsOfContoursIndex] === i) {
+        xCoordinates = allXCoordinates[endPtsOfContoursIndex];
+        endPtsOfContoursIndex++;
+        contours.push(new Contour({
+          flags: pointFlags,
+          xCoordinates,
+          yCoordinates
+        }));
+        yCoordinates = [];
+        pointFlags = [];
+      }
+    }
+
+    return new SimpleGlyph({
+      contours,
+      instructions
+    });
+  }
+
+  getSize() {
+    let size = this.contours.length * 2 + 2 + this.instructions.length;
+    let lastX = 0;
+    let lastY = 0;
+
+    for (const contour of this.contours) {
+      size += contour.flags.length;
+
+      for (let i = 0, ii = contour.xCoordinates.length; i < ii; i++) {
+        const x = contour.xCoordinates[i];
+        const y = contour.yCoordinates[i];
+        let abs = Math.abs(x - lastX);
+
+        if (abs > 255) {
+          size += 2;
+        } else if (abs > 0) {
+          size += 1;
+        }
+
+        lastX = x;
+        abs = Math.abs(y - lastY);
+
+        if (abs > 255) {
+          size += 2;
+        } else if (abs > 0) {
+          size += 1;
+        }
+
+        lastY = y;
+      }
+    }
+
+    return size;
+  }
+
+  write(pos, buf) {
+    const spos = pos;
+    const xCoordinates = [];
+    const yCoordinates = [];
+    const flags = [];
+    let lastX = 0;
+    let lastY = 0;
+
+    for (const contour of this.contours) {
+      for (let i = 0, ii = contour.xCoordinates.length; i < ii; i++) {
+        let flag = contour.flags[i];
+        const x = contour.xCoordinates[i];
+        let delta = x - lastX;
+
+        if (delta === 0) {
+          flag |= X_IS_SAME_OR_POSITIVE_X_SHORT_VECTOR;
+          xCoordinates.push(0);
+        } else {
+          const abs = Math.abs(delta);
+
+          if (abs <= 255) {
+            flag |= delta >= 0 ? X_SHORT_VECTOR | X_IS_SAME_OR_POSITIVE_X_SHORT_VECTOR : X_SHORT_VECTOR;
+            xCoordinates.push(abs);
+          } else {
+            xCoordinates.push(delta);
+          }
+        }
+
+        lastX = x;
+        const y = contour.yCoordinates[i];
+        delta = y - lastY;
+
+        if (delta === 0) {
+          flag |= Y_IS_SAME_OR_POSITIVE_Y_SHORT_VECTOR;
+          yCoordinates.push(0);
+        } else {
+          const abs = Math.abs(delta);
+
+          if (abs <= 255) {
+            flag |= delta >= 0 ? Y_SHORT_VECTOR | Y_IS_SAME_OR_POSITIVE_Y_SHORT_VECTOR : Y_SHORT_VECTOR;
+            yCoordinates.push(abs);
+          } else {
+            yCoordinates.push(delta);
+          }
+        }
+
+        lastY = y;
+        flags.push(flag);
+      }
+
+      buf.setUint16(pos, xCoordinates.length - 1);
+      pos += 2;
+    }
+
+    buf.setUint16(pos, this.instructions.length);
+    pos += 2;
+
+    if (this.instructions.length) {
+      new Uint8Array(buf.buffer, 0, buf.buffer.byteLength).set(this.instructions, pos);
+      pos += this.instructions.length;
+    }
+
+    for (const flag of flags) {
+      buf.setUint8(pos++, flag);
+    }
+
+    for (let i = 0, ii = xCoordinates.length; i < ii; i++) {
+      const x = xCoordinates[i];
+      const flag = flags[i];
+
+      if (flag & X_SHORT_VECTOR) {
+        buf.setUint8(pos++, x);
+      } else if (!(flag & X_IS_SAME_OR_POSITIVE_X_SHORT_VECTOR)) {
+        buf.setInt16(pos, x);
+        pos += 2;
+      }
+    }
+
+    for (let i = 0, ii = yCoordinates.length; i < ii; i++) {
+      const y = yCoordinates[i];
+      const flag = flags[i];
+
+      if (flag & Y_SHORT_VECTOR) {
+        buf.setUint8(pos++, y);
+      } else if (!(flag & Y_IS_SAME_OR_POSITIVE_Y_SHORT_VECTOR)) {
+        buf.setInt16(pos, y);
+        pos += 2;
+      }
+    }
+
+    return pos - spos;
+  }
+
+  scale(x, factor) {
+    for (const contour of this.contours) {
+      if (contour.xCoordinates.length === 0) {
+        continue;
+      }
+
+      for (let i = 0, ii = contour.xCoordinates.length; i < ii; i++) {
+        contour.xCoordinates[i] = Math.round(x + (contour.xCoordinates[i] - x) * factor);
+      }
+    }
+  }
+
+}
+
+class CompositeGlyph {
+  constructor({
+    flags,
+    glyphIndex,
+    argument1,
+    argument2,
+    transf,
+    instructions
+  }) {
+    this.flags = flags;
+    this.glyphIndex = glyphIndex;
+    this.argument1 = argument1;
+    this.argument2 = argument2;
+    this.transf = transf;
+    this.instructions = instructions;
+  }
+
+  static parse(pos, glyf) {
+    const spos = pos;
+    const transf = [];
+    let flags = glyf.getUint16(pos);
+    const glyphIndex = glyf.getUint16(pos + 2);
+    pos += 4;
+    let argument1, argument2;
+
+    if (flags & ARG_1_AND_2_ARE_WORDS) {
+      if (flags & ARGS_ARE_XY_VALUES) {
+        argument1 = glyf.getInt16(pos);
+        argument2 = glyf.getInt16(pos + 2);
+      } else {
+        argument1 = glyf.getUint16(pos);
+        argument2 = glyf.getUint16(pos + 2);
+      }
+
+      pos += 4;
+      flags ^= ARG_1_AND_2_ARE_WORDS;
+    } else {
+      if (flags & ARGS_ARE_XY_VALUES) {
+        argument1 = glyf.getInt8(pos);
+        argument2 = glyf.getInt8(pos + 1);
+      } else {
+        argument1 = glyf.getUint8(pos);
+        argument2 = glyf.getUint8(pos + 1);
+      }
+
+      pos += 2;
+    }
+
+    if (flags & WE_HAVE_A_SCALE) {
+      transf.push(glyf.getUint16(pos));
+      pos += 2;
+    } else if (flags & WE_HAVE_AN_X_AND_Y_SCALE) {
+      transf.push(glyf.getUint16(pos), glyf.getUint16(pos + 2));
+      pos += 4;
+    } else if (flags & WE_HAVE_A_TWO_BY_TWO) {
+      transf.push(glyf.getUint16(pos), glyf.getUint16(pos + 2), glyf.getUint16(pos + 4), glyf.getUint16(pos + 6));
+      pos += 8;
+    }
+
+    let instructions = null;
+
+    if (flags & WE_HAVE_INSTRUCTIONS) {
+      const instructionLength = glyf.getUint16(pos);
+      pos += 2;
+      instructions = new Uint8Array(glyf).slice(pos, pos + instructionLength);
+      pos += instructionLength;
+    }
+
+    return [pos - spos, new CompositeGlyph({
+      flags,
+      glyphIndex,
+      argument1,
+      argument2,
+      transf,
+      instructions
+    })];
+  }
+
+  getSize() {
+    let size = 2 + 2 + this.transf.length * 2;
+
+    if (this.flags & WE_HAVE_INSTRUCTIONS) {
+      size += 2 + this.instructions.length;
+    }
+
+    size += 2;
+
+    if (this.flags & 2) {
+      if (!(this.argument1 >= -128 && this.argument1 <= 127 && this.argument2 >= -128 && this.argument2 <= 127)) {
+        size += 2;
+      }
+    } else {
+      if (!(this.argument1 >= 0 && this.argument1 <= 255 && this.argument2 >= 0 && this.argument2 <= 255)) {
+        size += 2;
+      }
+    }
+
+    return size;
+  }
+
+  write(pos, buf) {
+    const spos = pos;
+
+    if (this.flags & ARGS_ARE_XY_VALUES) {
+      if (!(this.argument1 >= -128 && this.argument1 <= 127 && this.argument2 >= -128 && this.argument2 <= 127)) {
+        this.flags |= ARG_1_AND_2_ARE_WORDS;
+      }
+    } else {
+      if (!(this.argument1 >= 0 && this.argument1 <= 255 && this.argument2 >= 0 && this.argument2 <= 255)) {
+        this.flags |= ARG_1_AND_2_ARE_WORDS;
+      }
+    }
+
+    buf.setUint16(pos, this.flags);
+    buf.setUint16(pos + 2, this.glyphIndex);
+    pos += 4;
+
+    if (this.flags & ARG_1_AND_2_ARE_WORDS) {
+      if (this.flags & ARGS_ARE_XY_VALUES) {
+        buf.setInt16(pos, this.argument1);
+        buf.setInt16(pos + 2, this.argument2);
+      } else {
+        buf.setUint16(pos, this.argument1);
+        buf.setUint16(pos + 2, this.argument2);
+      }
+
+      pos += 4;
+    } else {
+      buf.setUint8(pos, this.argument1);
+      buf.setUint8(pos + 1, this.argument2);
+      pos += 2;
+    }
+
+    if (this.flags & WE_HAVE_INSTRUCTIONS) {
+      buf.setUint16(pos, this.instructions.length);
+      pos += 2;
+
+      if (this.instructions.length) {
+        new Uint8Array(buf.buffer, 0, buf.buffer.byteLength).set(this.instructions, pos);
+        pos += this.instructions.length;
+      }
+    }
+
+    return pos - spos;
+  }
+
+  scale(x, factor) {}
+
+}
+
+/***/ }),
+/* 47 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.OpenTypeFileBuilder = void 0;
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _util = __w_pdfjs_require__(2);
+
+function writeInt16(dest, offset, num) {
+  dest[offset] = num >> 8 & 0xff;
+  dest[offset + 1] = num & 0xff;
+}
+
+function writeInt32(dest, offset, num) {
+  dest[offset] = num >> 24 & 0xff;
+  dest[offset + 1] = num >> 16 & 0xff;
+  dest[offset + 2] = num >> 8 & 0xff;
+  dest[offset + 3] = num & 0xff;
+}
+
+function writeData(dest, offset, data) {
+  if (data instanceof Uint8Array) {
+    dest.set(data, offset);
+  } else if (typeof data === "string") {
+    for (let i = 0, ii = data.length; i < ii; i++) {
+      dest[offset++] = data.charCodeAt(i) & 0xff;
+    }
+  } else {
+    for (let i = 0, ii = data.length; i < ii; i++) {
+      dest[offset++] = data[i] & 0xff;
+    }
+  }
+}
+
+const OTF_HEADER_SIZE = 12;
+const OTF_TABLE_ENTRY_SIZE = 16;
+
+class OpenTypeFileBuilder {
+  constructor(sfnt) {
+    this.sfnt = sfnt;
+    this.tables = Object.create(null);
+  }
+
+  static getSearchParams(entriesCount, entrySize) {
+    let maxPower2 = 1,
+        log2 = 0;
+
+    while ((maxPower2 ^ entriesCount) > maxPower2) {
+      maxPower2 <<= 1;
+      log2++;
+    }
+
+    const searchRange = maxPower2 * entrySize;
+    return {
+      range: searchRange,
+      entry: log2,
+      rangeShift: entrySize * entriesCount - searchRange
+    };
+  }
+
+  toArray() {
+    let sfnt = this.sfnt;
+    const tables = this.tables;
+    const tablesNames = Object.keys(tables);
+    tablesNames.sort();
+    const numTables = tablesNames.length;
+    let i, j, jj, table, tableName;
+    let offset = OTF_HEADER_SIZE + numTables * OTF_TABLE_ENTRY_SIZE;
+    const tableOffsets = [offset];
+
+    for (i = 0; i < numTables; i++) {
+      table = tables[tablesNames[i]];
+      const paddedLength = (table.length + 3 & ~3) >>> 0;
+      offset += paddedLength;
+      tableOffsets.push(offset);
+    }
+
+    const file = new Uint8Array(offset);
+
+    for (i = 0; i < numTables; i++) {
+      table = tables[tablesNames[i]];
+      writeData(file, tableOffsets[i], table);
+    }
+
+    if (sfnt === "true") {
+      sfnt = (0, _util.string32)(0x00010000);
+    }
+
+    file[0] = sfnt.charCodeAt(0) & 0xff;
+    file[1] = sfnt.charCodeAt(1) & 0xff;
+    file[2] = sfnt.charCodeAt(2) & 0xff;
+    file[3] = sfnt.charCodeAt(3) & 0xff;
+    writeInt16(file, 4, numTables);
+    const searchParams = OpenTypeFileBuilder.getSearchParams(numTables, 16);
+    writeInt16(file, 6, searchParams.range);
+    writeInt16(file, 8, searchParams.entry);
+    writeInt16(file, 10, searchParams.rangeShift);
+    offset = OTF_HEADER_SIZE;
+
+    for (i = 0; i < numTables; i++) {
+      tableName = tablesNames[i];
+      file[offset] = tableName.charCodeAt(0) & 0xff;
+      file[offset + 1] = tableName.charCodeAt(1) & 0xff;
+      file[offset + 2] = tableName.charCodeAt(2) & 0xff;
+      file[offset + 3] = tableName.charCodeAt(3) & 0xff;
+      let checksum = 0;
+
+      for (j = tableOffsets[i], jj = tableOffsets[i + 1]; j < jj; j += 4) {
+        const quad = (0, _core_utils.readUint32)(file, j);
+        checksum = checksum + quad >>> 0;
+      }
+
+      writeInt32(file, offset + 4, checksum);
+      writeInt32(file, offset + 8, tableOffsets[i]);
+      writeInt32(file, offset + 12, tables[tableName].length);
+      offset += OTF_TABLE_ENTRY_SIZE;
+    }
+
+    return file;
+  }
+
+  addTable(tag, data) {
+    if (tag in this.tables) {
+      throw new Error("Table " + tag + " already exists");
+    }
+
+    this.tables[tag] = data;
+  }
+
+}
+
+exports.OpenTypeFileBuilder = OpenTypeFileBuilder;
+
+/***/ }),
+/* 48 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Type1Font = void 0;
+
+var _cff_parser = __w_pdfjs_require__(35);
+
+var _fonts_utils = __w_pdfjs_require__(38);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _stream = __w_pdfjs_require__(10);
+
+var _type1_parser = __w_pdfjs_require__(49);
+
+var _util = __w_pdfjs_require__(2);
+
+function findBlock(streamBytes, signature, startIndex) {
+  const streamBytesLength = streamBytes.length;
+  const signatureLength = signature.length;
+  const scanLength = streamBytesLength - signatureLength;
+  let i = startIndex,
+      found = false;
+
+  while (i < scanLength) {
+    let j = 0;
+
+    while (j < signatureLength && streamBytes[i + j] === signature[j]) {
+      j++;
+    }
+
+    if (j >= signatureLength) {
+      i += j;
+
+      while (i < streamBytesLength && (0, _core_utils.isWhiteSpace)(streamBytes[i])) {
+        i++;
+      }
+
+      found = true;
+      break;
+    }
+
+    i++;
+  }
+
+  return {
+    found,
+    length: i
+  };
+}
+
+function getHeaderBlock(stream, suggestedLength) {
+  const EEXEC_SIGNATURE = [0x65, 0x65, 0x78, 0x65, 0x63];
+  const streamStartPos = stream.pos;
+  let headerBytes, headerBytesLength, block;
+
+  try {
+    headerBytes = stream.getBytes(suggestedLength);
+    headerBytesLength = headerBytes.length;
+  } catch (ex) {}
+
+  if (headerBytesLength === suggestedLength) {
+    block = findBlock(headerBytes, EEXEC_SIGNATURE, suggestedLength - 2 * EEXEC_SIGNATURE.length);
+
+    if (block.found && block.length === suggestedLength) {
+      return {
+        stream: new _stream.Stream(headerBytes),
+        length: suggestedLength
+      };
+    }
+  }
+
+  (0, _util.warn)('Invalid "Length1" property in Type1 font -- trying to recover.');
+  stream.pos = streamStartPos;
+  const SCAN_BLOCK_LENGTH = 2048;
+  let actualLength;
+
+  while (true) {
+    const scanBytes = stream.peekBytes(SCAN_BLOCK_LENGTH);
+    block = findBlock(scanBytes, EEXEC_SIGNATURE, 0);
+
+    if (block.length === 0) {
+      break;
+    }
+
+    stream.pos += block.length;
+
+    if (block.found) {
+      actualLength = stream.pos - streamStartPos;
+      break;
+    }
+  }
+
+  stream.pos = streamStartPos;
+
+  if (actualLength) {
+    return {
+      stream: new _stream.Stream(stream.getBytes(actualLength)),
+      length: actualLength
+    };
+  }
+
+  (0, _util.warn)('Unable to recover "Length1" property in Type1 font -- using as is.');
+  return {
+    stream: new _stream.Stream(stream.getBytes(suggestedLength)),
+    length: suggestedLength
+  };
+}
+
+function getEexecBlock(stream, suggestedLength) {
+  const eexecBytes = stream.getBytes();
+  return {
+    stream: new _stream.Stream(eexecBytes),
+    length: eexecBytes.length
+  };
+}
+
+class Type1Font {
+  constructor(name, file, properties) {
+    const PFB_HEADER_SIZE = 6;
+    let headerBlockLength = properties.length1;
+    let eexecBlockLength = properties.length2;
+    let pfbHeader = file.peekBytes(PFB_HEADER_SIZE);
+    const pfbHeaderPresent = pfbHeader[0] === 0x80 && pfbHeader[1] === 0x01;
+
+    if (pfbHeaderPresent) {
+      file.skip(PFB_HEADER_SIZE);
+      headerBlockLength = pfbHeader[5] << 24 | pfbHeader[4] << 16 | pfbHeader[3] << 8 | pfbHeader[2];
+    }
+
+    const headerBlock = getHeaderBlock(file, headerBlockLength);
+    const headerBlockParser = new _type1_parser.Type1Parser(headerBlock.stream, false, _fonts_utils.SEAC_ANALYSIS_ENABLED);
+    headerBlockParser.extractFontHeader(properties);
+
+    if (pfbHeaderPresent) {
+      pfbHeader = file.getBytes(PFB_HEADER_SIZE);
+      eexecBlockLength = pfbHeader[5] << 24 | pfbHeader[4] << 16 | pfbHeader[3] << 8 | pfbHeader[2];
+    }
+
+    const eexecBlock = getEexecBlock(file, eexecBlockLength);
+    const eexecBlockParser = new _type1_parser.Type1Parser(eexecBlock.stream, true, _fonts_utils.SEAC_ANALYSIS_ENABLED);
+    const data = eexecBlockParser.extractFontProgram(properties);
+
+    for (const key in data.properties) {
+      properties[key] = data.properties[key];
+    }
+
+    const charstrings = data.charstrings;
+    const type2Charstrings = this.getType2Charstrings(charstrings);
+    const subrs = this.getType2Subrs(data.subrs);
+    this.charstrings = charstrings;
+    this.data = this.wrap(name, type2Charstrings, this.charstrings, subrs, properties);
+    this.seacs = this.getSeacs(data.charstrings);
+  }
+
+  get numGlyphs() {
+    return this.charstrings.length + 1;
+  }
+
+  getCharset() {
+    const charset = [".notdef"];
+
+    for (const {
+      glyphName
+    } of this.charstrings) {
+      charset.push(glyphName);
+    }
+
+    return charset;
+  }
+
+  getGlyphMapping(properties) {
+    const charstrings = this.charstrings;
+
+    if (properties.composite) {
+      const charCodeToGlyphId = Object.create(null);
+
+      for (let glyphId = 0, charstringsLen = charstrings.length; glyphId < charstringsLen; glyphId++) {
+        const charCode = properties.cMap.charCodeOf(glyphId);
+        charCodeToGlyphId[charCode] = glyphId + 1;
+      }
+
+      return charCodeToGlyphId;
+    }
+
+    const glyphNames = [".notdef"];
+    let builtInEncoding, glyphId;
+
+    for (glyphId = 0; glyphId < charstrings.length; glyphId++) {
+      glyphNames.push(charstrings[glyphId].glyphName);
+    }
+
+    const encoding = properties.builtInEncoding;
+
+    if (encoding) {
+      builtInEncoding = Object.create(null);
+
+      for (const charCode in encoding) {
+        glyphId = glyphNames.indexOf(encoding[charCode]);
+
+        if (glyphId >= 0) {
+          builtInEncoding[charCode] = glyphId;
+        }
+      }
+    }
+
+    return (0, _fonts_utils.type1FontGlyphMapping)(properties, builtInEncoding, glyphNames);
+  }
+
+  hasGlyphId(id) {
+    if (id < 0 || id >= this.numGlyphs) {
+      return false;
+    }
+
+    if (id === 0) {
+      return true;
+    }
+
+    const glyph = this.charstrings[id - 1];
+    return glyph.charstring.length > 0;
+  }
+
+  getSeacs(charstrings) {
+    const seacMap = [];
+
+    for (let i = 0, ii = charstrings.length; i < ii; i++) {
+      const charstring = charstrings[i];
+
+      if (charstring.seac) {
+        seacMap[i + 1] = charstring.seac;
+      }
+    }
+
+    return seacMap;
+  }
+
+  getType2Charstrings(type1Charstrings) {
+    const type2Charstrings = [];
+
+    for (let i = 0, ii = type1Charstrings.length; i < ii; i++) {
+      type2Charstrings.push(type1Charstrings[i].charstring);
+    }
+
+    return type2Charstrings;
+  }
+
+  getType2Subrs(type1Subrs) {
+    let bias = 0;
+    const count = type1Subrs.length;
+
+    if (count < 1133) {
+      bias = 107;
+    } else if (count < 33769) {
+      bias = 1131;
+    } else {
+      bias = 32768;
+    }
+
+    const type2Subrs = [];
+    let i;
+
+    for (i = 0; i < bias; i++) {
+      type2Subrs.push([0x0b]);
+    }
+
+    for (i = 0; i < count; i++) {
+      type2Subrs.push(type1Subrs[i]);
+    }
+
+    return type2Subrs;
+  }
+
+  wrap(name, glyphs, charstrings, subrs, properties) {
+    const cff = new _cff_parser.CFF();
+    cff.header = new _cff_parser.CFFHeader(1, 0, 4, 4);
+    cff.names = [name];
+    const topDict = new _cff_parser.CFFTopDict();
+    topDict.setByName("version", 391);
+    topDict.setByName("Notice", 392);
+    topDict.setByName("FullName", 393);
+    topDict.setByName("FamilyName", 394);
+    topDict.setByName("Weight", 395);
+    topDict.setByName("Encoding", null);
+    topDict.setByName("FontMatrix", properties.fontMatrix);
+    topDict.setByName("FontBBox", properties.bbox);
+    topDict.setByName("charset", null);
+    topDict.setByName("CharStrings", null);
+    topDict.setByName("Private", null);
+    cff.topDict = topDict;
+    const strings = new _cff_parser.CFFStrings();
+    strings.add("Version 0.11");
+    strings.add("See original notice");
+    strings.add(name);
+    strings.add(name);
+    strings.add("Medium");
+    cff.strings = strings;
+    cff.globalSubrIndex = new _cff_parser.CFFIndex();
+    const count = glyphs.length;
+    const charsetArray = [".notdef"];
+    let i, ii;
+
+    for (i = 0; i < count; i++) {
+      const glyphName = charstrings[i].glyphName;
+
+      const index = _cff_parser.CFFStandardStrings.indexOf(glyphName);
+
+      if (index === -1) {
+        strings.add(glyphName);
+      }
+
+      charsetArray.push(glyphName);
+    }
+
+    cff.charset = new _cff_parser.CFFCharset(false, 0, charsetArray);
+    const charStringsIndex = new _cff_parser.CFFIndex();
+    charStringsIndex.add([0x8b, 0x0e]);
+
+    for (i = 0; i < count; i++) {
+      charStringsIndex.add(glyphs[i]);
+    }
+
+    cff.charStrings = charStringsIndex;
+    const privateDict = new _cff_parser.CFFPrivateDict();
+    privateDict.setByName("Subrs", null);
+    const fields = ["BlueValues", "OtherBlues", "FamilyBlues", "FamilyOtherBlues", "StemSnapH", "StemSnapV", "BlueShift", "BlueFuzz", "BlueScale", "LanguageGroup", "ExpansionFactor", "ForceBold", "StdHW", "StdVW"];
+
+    for (i = 0, ii = fields.length; i < ii; i++) {
+      const field = fields[i];
+
+      if (!(field in properties.privateData)) {
+        continue;
+      }
+
+      const value = properties.privateData[field];
+
+      if (Array.isArray(value)) {
+        for (let j = value.length - 1; j > 0; j--) {
+          value[j] -= value[j - 1];
+        }
+      }
+
+      privateDict.setByName(field, value);
+    }
+
+    cff.topDict.privateDict = privateDict;
+    const subrIndex = new _cff_parser.CFFIndex();
+
+    for (i = 0, ii = subrs.length; i < ii; i++) {
+      subrIndex.add(subrs[i]);
+    }
+
+    privateDict.subrsIndex = subrIndex;
+    const compiler = new _cff_parser.CFFCompiler(cff);
+    return compiler.compile();
+  }
+
+}
+
+exports.Type1Font = Type1Font;
+
+/***/ }),
+/* 49 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Type1Parser = void 0;
+
+var _encodings = __w_pdfjs_require__(37);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _stream = __w_pdfjs_require__(10);
+
+var _util = __w_pdfjs_require__(2);
+
+const HINTING_ENABLED = false;
+const COMMAND_MAP = {
+  hstem: [1],
+  vstem: [3],
+  vmoveto: [4],
+  rlineto: [5],
+  hlineto: [6],
+  vlineto: [7],
+  rrcurveto: [8],
+  callsubr: [10],
+  flex: [12, 35],
+  drop: [12, 18],
+  endchar: [14],
+  rmoveto: [21],
+  hmoveto: [22],
+  vhcurveto: [30],
+  hvcurveto: [31]
+};
+
+class Type1CharString {
+  constructor() {
+    this.width = 0;
+    this.lsb = 0;
+    this.flexing = false;
+    this.output = [];
+    this.stack = [];
+  }
+
+  convert(encoded, subrs, seacAnalysisEnabled) {
+    const count = encoded.length;
+    let error = false;
+    let wx, sbx, subrNumber;
+
+    for (let i = 0; i < count; i++) {
+      let value = encoded[i];
+
+      if (value < 32) {
+        if (value === 12) {
+          value = (value << 8) + encoded[++i];
+        }
+
+        switch (value) {
+          case 1:
+            if (!HINTING_ENABLED) {
+              this.stack = [];
+              break;
+            }
+
+            error = this.executeCommand(2, COMMAND_MAP.hstem);
+            break;
+
+          case 3:
+            if (!HINTING_ENABLED) {
+              this.stack = [];
+              break;
+            }
+
+            error = this.executeCommand(2, COMMAND_MAP.vstem);
+            break;
+
+          case 4:
+            if (this.flexing) {
+              if (this.stack.length < 1) {
+                error = true;
+                break;
+              }
+
+              const dy = this.stack.pop();
+              this.stack.push(0, dy);
+              break;
+            }
+
+            error = this.executeCommand(1, COMMAND_MAP.vmoveto);
+            break;
+
+          case 5:
+            error = this.executeCommand(2, COMMAND_MAP.rlineto);
+            break;
+
+          case 6:
+            error = this.executeCommand(1, COMMAND_MAP.hlineto);
+            break;
+
+          case 7:
+            error = this.executeCommand(1, COMMAND_MAP.vlineto);
+            break;
+
+          case 8:
+            error = this.executeCommand(6, COMMAND_MAP.rrcurveto);
+            break;
+
+          case 9:
+            this.stack = [];
+            break;
+
+          case 10:
+            if (this.stack.length < 1) {
+              error = true;
+              break;
+            }
+
+            subrNumber = this.stack.pop();
+
+            if (!subrs[subrNumber]) {
+              error = true;
+              break;
+            }
+
+            error = this.convert(subrs[subrNumber], subrs, seacAnalysisEnabled);
+            break;
+
+          case 11:
+            return error;
+
+          case 13:
+            if (this.stack.length < 2) {
+              error = true;
+              break;
+            }
+
+            wx = this.stack.pop();
+            sbx = this.stack.pop();
+            this.lsb = sbx;
+            this.width = wx;
+            this.stack.push(wx, sbx);
+            error = this.executeCommand(2, COMMAND_MAP.hmoveto);
+            break;
+
+          case 14:
+            this.output.push(COMMAND_MAP.endchar[0]);
+            break;
+
+          case 21:
+            if (this.flexing) {
+              break;
+            }
+
+            error = this.executeCommand(2, COMMAND_MAP.rmoveto);
+            break;
+
+          case 22:
+            if (this.flexing) {
+              this.stack.push(0);
+              break;
+            }
+
+            error = this.executeCommand(1, COMMAND_MAP.hmoveto);
+            break;
+
+          case 30:
+            error = this.executeCommand(4, COMMAND_MAP.vhcurveto);
+            break;
+
+          case 31:
+            error = this.executeCommand(4, COMMAND_MAP.hvcurveto);
+            break;
+
+          case (12 << 8) + 0:
+            this.stack = [];
+            break;
+
+          case (12 << 8) + 1:
+            if (!HINTING_ENABLED) {
+              this.stack = [];
+              break;
+            }
+
+            error = this.executeCommand(2, COMMAND_MAP.vstem);
+            break;
+
+          case (12 << 8) + 2:
+            if (!HINTING_ENABLED) {
+              this.stack = [];
+              break;
+            }
+
+            error = this.executeCommand(2, COMMAND_MAP.hstem);
+            break;
+
+          case (12 << 8) + 6:
+            if (seacAnalysisEnabled) {
+              const asb = this.stack.at(-5);
+              this.seac = this.stack.splice(-4, 4);
+              this.seac[0] += this.lsb - asb;
+              error = this.executeCommand(0, COMMAND_MAP.endchar);
+            } else {
+              error = this.executeCommand(4, COMMAND_MAP.endchar);
+            }
+
+            break;
+
+          case (12 << 8) + 7:
+            if (this.stack.length < 4) {
+              error = true;
+              break;
+            }
+
+            this.stack.pop();
+            wx = this.stack.pop();
+            const sby = this.stack.pop();
+            sbx = this.stack.pop();
+            this.lsb = sbx;
+            this.width = wx;
+            this.stack.push(wx, sbx, sby);
+            error = this.executeCommand(3, COMMAND_MAP.rmoveto);
+            break;
+
+          case (12 << 8) + 12:
+            if (this.stack.length < 2) {
+              error = true;
+              break;
+            }
+
+            const num2 = this.stack.pop();
+            const num1 = this.stack.pop();
+            this.stack.push(num1 / num2);
+            break;
+
+          case (12 << 8) + 16:
+            if (this.stack.length < 2) {
+              error = true;
+              break;
+            }
+
+            subrNumber = this.stack.pop();
+            const numArgs = this.stack.pop();
+
+            if (subrNumber === 0 && numArgs === 3) {
+              const flexArgs = this.stack.splice(this.stack.length - 17, 17);
+              this.stack.push(flexArgs[2] + flexArgs[0], flexArgs[3] + flexArgs[1], flexArgs[4], flexArgs[5], flexArgs[6], flexArgs[7], flexArgs[8], flexArgs[9], flexArgs[10], flexArgs[11], flexArgs[12], flexArgs[13], flexArgs[14]);
+              error = this.executeCommand(13, COMMAND_MAP.flex, true);
+              this.flexing = false;
+              this.stack.push(flexArgs[15], flexArgs[16]);
+            } else if (subrNumber === 1 && numArgs === 0) {
+              this.flexing = true;
+            }
+
+            break;
+
+          case (12 << 8) + 17:
+            break;
+
+          case (12 << 8) + 33:
+            this.stack = [];
+            break;
+
+          default:
+            (0, _util.warn)('Unknown type 1 charstring command of "' + value + '"');
+            break;
+        }
+
+        if (error) {
+          break;
+        }
+
+        continue;
+      } else if (value <= 246) {
+        value -= 139;
+      } else if (value <= 250) {
+        value = (value - 247) * 256 + encoded[++i] + 108;
+      } else if (value <= 254) {
+        value = -((value - 251) * 256) - encoded[++i] - 108;
+      } else {
+        value = (encoded[++i] & 0xff) << 24 | (encoded[++i] & 0xff) << 16 | (encoded[++i] & 0xff) << 8 | (encoded[++i] & 0xff) << 0;
+      }
+
+      this.stack.push(value);
+    }
+
+    return error;
+  }
+
+  executeCommand(howManyArgs, command, keepStack) {
+    const stackLength = this.stack.length;
+
+    if (howManyArgs > stackLength) {
+      return true;
+    }
+
+    const start = stackLength - howManyArgs;
+
+    for (let i = start; i < stackLength; i++) {
+      let value = this.stack[i];
+
+      if (Number.isInteger(value)) {
+        this.output.push(28, value >> 8 & 0xff, value & 0xff);
+      } else {
+        value = 65536 * value | 0;
+        this.output.push(255, value >> 24 & 0xff, value >> 16 & 0xff, value >> 8 & 0xff, value & 0xff);
+      }
+    }
+
+    this.output.push(...command);
+
+    if (keepStack) {
+      this.stack.splice(start, howManyArgs);
+    } else {
+      this.stack.length = 0;
+    }
+
+    return false;
+  }
+
+}
+
+const EEXEC_ENCRYPT_KEY = 55665;
+const CHAR_STRS_ENCRYPT_KEY = 4330;
+
+function isHexDigit(code) {
+  return code >= 48 && code <= 57 || code >= 65 && code <= 70 || code >= 97 && code <= 102;
+}
+
+function decrypt(data, key, discardNumber) {
+  if (discardNumber >= data.length) {
+    return new Uint8Array(0);
+  }
+
+  const c1 = 52845,
+        c2 = 22719;
+  let r = key | 0,
+      i,
+      j;
+
+  for (i = 0; i < discardNumber; i++) {
+    r = (data[i] + r) * c1 + c2 & (1 << 16) - 1;
+  }
+
+  const count = data.length - discardNumber;
+  const decrypted = new Uint8Array(count);
+
+  for (i = discardNumber, j = 0; j < count; i++, j++) {
+    const value = data[i];
+    decrypted[j] = value ^ r >> 8;
+    r = (value + r) * c1 + c2 & (1 << 16) - 1;
+  }
+
+  return decrypted;
+}
+
+function decryptAscii(data, key, discardNumber) {
+  const c1 = 52845,
+        c2 = 22719;
+  let r = key | 0;
+  const count = data.length,
+        maybeLength = count >>> 1;
+  const decrypted = new Uint8Array(maybeLength);
+  let i, j;
+
+  for (i = 0, j = 0; i < count; i++) {
+    const digit1 = data[i];
+
+    if (!isHexDigit(digit1)) {
+      continue;
+    }
+
+    i++;
+    let digit2;
+
+    while (i < count && !isHexDigit(digit2 = data[i])) {
+      i++;
+    }
+
+    if (i < count) {
+      const value = parseInt(String.fromCharCode(digit1, digit2), 16);
+      decrypted[j++] = value ^ r >> 8;
+      r = (value + r) * c1 + c2 & (1 << 16) - 1;
+    }
+  }
+
+  return decrypted.slice(discardNumber, j);
+}
+
+function isSpecial(c) {
+  return c === 0x2f || c === 0x5b || c === 0x5d || c === 0x7b || c === 0x7d || c === 0x28 || c === 0x29;
+}
+
+class Type1Parser {
+  constructor(stream, encrypted, seacAnalysisEnabled) {
+    if (encrypted) {
+      const data = stream.getBytes();
+      const isBinary = !((isHexDigit(data[0]) || (0, _core_utils.isWhiteSpace)(data[0])) && isHexDigit(data[1]) && isHexDigit(data[2]) && isHexDigit(data[3]) && isHexDigit(data[4]) && isHexDigit(data[5]) && isHexDigit(data[6]) && isHexDigit(data[7]));
+      stream = new _stream.Stream(isBinary ? decrypt(data, EEXEC_ENCRYPT_KEY, 4) : decryptAscii(data, EEXEC_ENCRYPT_KEY, 4));
+    }
+
+    this.seacAnalysisEnabled = !!seacAnalysisEnabled;
+    this.stream = stream;
+    this.nextChar();
+  }
+
+  readNumberArray() {
+    this.getToken();
+    const array = [];
+
+    while (true) {
+      const token = this.getToken();
+
+      if (token === null || token === "]" || token === "}") {
+        break;
+      }
+
+      array.push(parseFloat(token || 0));
+    }
+
+    return array;
+  }
+
+  readNumber() {
+    const token = this.getToken();
+    return parseFloat(token || 0);
+  }
+
+  readInt() {
+    const token = this.getToken();
+    return parseInt(token || 0, 10) | 0;
+  }
+
+  readBoolean() {
+    const token = this.getToken();
+    return token === "true" ? 1 : 0;
+  }
+
+  nextChar() {
+    return this.currentChar = this.stream.getByte();
+  }
+
+  prevChar() {
+    this.stream.skip(-2);
+    return this.currentChar = this.stream.getByte();
+  }
+
+  getToken() {
+    let comment = false;
+    let ch = this.currentChar;
+
+    while (true) {
+      if (ch === -1) {
+        return null;
+      }
+
+      if (comment) {
+        if (ch === 0x0a || ch === 0x0d) {
+          comment = false;
+        }
+      } else if (ch === 0x25) {
+        comment = true;
+      } else if (!(0, _core_utils.isWhiteSpace)(ch)) {
+        break;
+      }
+
+      ch = this.nextChar();
+    }
+
+    if (isSpecial(ch)) {
+      this.nextChar();
+      return String.fromCharCode(ch);
+    }
+
+    let token = "";
+
+    do {
+      token += String.fromCharCode(ch);
+      ch = this.nextChar();
+    } while (ch >= 0 && !(0, _core_utils.isWhiteSpace)(ch) && !isSpecial(ch));
+
+    return token;
+  }
+
+  readCharStrings(bytes, lenIV) {
+    if (lenIV === -1) {
+      return bytes;
+    }
+
+    return decrypt(bytes, CHAR_STRS_ENCRYPT_KEY, lenIV);
+  }
+
+  extractFontProgram(properties) {
+    const stream = this.stream;
+    const subrs = [],
+          charstrings = [];
+    const privateData = Object.create(null);
+    privateData.lenIV = 4;
+    const program = {
+      subrs: [],
+      charstrings: [],
+      properties: {
+        privateData
+      }
+    };
+    let token, length, data, lenIV;
+
+    while ((token = this.getToken()) !== null) {
+      if (token !== "/") {
+        continue;
+      }
+
+      token = this.getToken();
+
+      switch (token) {
+        case "CharStrings":
+          this.getToken();
+          this.getToken();
+          this.getToken();
+          this.getToken();
+
+          while (true) {
+            token = this.getToken();
+
+            if (token === null || token === "end") {
+              break;
+            }
+
+            if (token !== "/") {
+              continue;
+            }
+
+            const glyph = this.getToken();
+            length = this.readInt();
+            this.getToken();
+            data = length > 0 ? stream.getBytes(length) : new Uint8Array(0);
+            lenIV = program.properties.privateData.lenIV;
+            const encoded = this.readCharStrings(data, lenIV);
+            this.nextChar();
+            token = this.getToken();
+
+            if (token === "noaccess") {
+              this.getToken();
+            } else if (token === "/") {
+              this.prevChar();
+            }
+
+            charstrings.push({
+              glyph,
+              encoded
+            });
+          }
+
+          break;
+
+        case "Subrs":
+          this.readInt();
+          this.getToken();
+
+          while (this.getToken() === "dup") {
+            const index = this.readInt();
+            length = this.readInt();
+            this.getToken();
+            data = length > 0 ? stream.getBytes(length) : new Uint8Array(0);
+            lenIV = program.properties.privateData.lenIV;
+            const encoded = this.readCharStrings(data, lenIV);
+            this.nextChar();
+            token = this.getToken();
+
+            if (token === "noaccess") {
+              this.getToken();
+            }
+
+            subrs[index] = encoded;
+          }
+
+          break;
+
+        case "BlueValues":
+        case "OtherBlues":
+        case "FamilyBlues":
+        case "FamilyOtherBlues":
+          const blueArray = this.readNumberArray();
+
+          if (blueArray.length > 0 && blueArray.length % 2 === 0 && HINTING_ENABLED) {
+            program.properties.privateData[token] = blueArray;
+          }
+
+          break;
+
+        case "StemSnapH":
+        case "StemSnapV":
+          program.properties.privateData[token] = this.readNumberArray();
+          break;
+
+        case "StdHW":
+        case "StdVW":
+          program.properties.privateData[token] = this.readNumberArray()[0];
+          break;
+
+        case "BlueShift":
+        case "lenIV":
+        case "BlueFuzz":
+        case "BlueScale":
+        case "LanguageGroup":
+        case "ExpansionFactor":
+          program.properties.privateData[token] = this.readNumber();
+          break;
+
+        case "ForceBold":
+          program.properties.privateData[token] = this.readBoolean();
+          break;
+      }
+    }
+
+    for (const {
+      encoded,
+      glyph
+    } of charstrings) {
+      const charString = new Type1CharString();
+      const error = charString.convert(encoded, subrs, this.seacAnalysisEnabled);
+      let output = charString.output;
+
+      if (error) {
+        output = [14];
+      }
+
+      const charStringObject = {
+        glyphName: glyph,
+        charstring: output,
+        width: charString.width,
+        lsb: charString.lsb,
+        seac: charString.seac
+      };
+
+      if (glyph === ".notdef") {
+        program.charstrings.unshift(charStringObject);
+      } else {
+        program.charstrings.push(charStringObject);
+      }
+
+      if (properties.builtInEncoding) {
+        const index = properties.builtInEncoding.indexOf(glyph);
+
+        if (index > -1 && properties.widths[index] === undefined && index >= properties.firstChar && index <= properties.lastChar) {
+          properties.widths[index] = charString.width;
+        }
+      }
+    }
+
+    return program;
+  }
+
+  extractFontHeader(properties) {
+    let token;
+
+    while ((token = this.getToken()) !== null) {
+      if (token !== "/") {
+        continue;
+      }
+
+      token = this.getToken();
+
+      switch (token) {
+        case "FontMatrix":
+          const matrix = this.readNumberArray();
+          properties.fontMatrix = matrix;
+          break;
+
+        case "Encoding":
+          const encodingArg = this.getToken();
+          let encoding;
+
+          if (!/^\d+$/.test(encodingArg)) {
+            encoding = (0, _encodings.getEncoding)(encodingArg);
+          } else {
+            encoding = [];
+            const size = parseInt(encodingArg, 10) | 0;
+            this.getToken();
+
+            for (let j = 0; j < size; j++) {
+              token = this.getToken();
+
+              while (token !== "dup" && token !== "def") {
+                token = this.getToken();
+
+                if (token === null) {
+                  return;
+                }
+              }
+
+              if (token === "def") {
+                break;
+              }
+
+              const index = this.readInt();
+              this.getToken();
+              const glyph = this.getToken();
+              encoding[index] = glyph;
+              this.getToken();
+            }
+          }
+
+          properties.builtInEncoding = encoding;
+          break;
+
+        case "FontBBox":
+          const fontBBox = this.readNumberArray();
+          properties.ascent = Math.max(fontBBox[3], fontBBox[1]);
+          properties.descent = Math.min(fontBBox[1], fontBBox[3]);
+          properties.ascentScaled = true;
+          break;
+      }
+    }
+  }
+
+}
+
+exports.Type1Parser = Type1Parser;
+
+/***/ }),
+/* 50 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Pattern = void 0;
+exports.getTilingPatternIR = getTilingPatternIR;
+
+var _util = __w_pdfjs_require__(2);
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _colorspace = __w_pdfjs_require__(14);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+const ShadingType = {
+  FUNCTION_BASED: 1,
+  AXIAL: 2,
+  RADIAL: 3,
+  FREE_FORM_MESH: 4,
+  LATTICE_FORM_MESH: 5,
+  COONS_PATCH_MESH: 6,
+  TENSOR_PATCH_MESH: 7
+};
+
+class Pattern {
+  constructor() {
+    (0, _util.unreachable)("Cannot initialize Pattern.");
+  }
+
+  static parseShading(shading, xref, res, handler, pdfFunctionFactory, localColorSpaceCache) {
+    const dict = shading instanceof _base_stream.BaseStream ? shading.dict : shading;
+    const type = dict.get("ShadingType");
+
+    try {
+      switch (type) {
+        case ShadingType.AXIAL:
+        case ShadingType.RADIAL:
+          return new RadialAxialShading(dict, xref, res, pdfFunctionFactory, localColorSpaceCache);
+
+        case ShadingType.FREE_FORM_MESH:
+        case ShadingType.LATTICE_FORM_MESH:
+        case ShadingType.COONS_PATCH_MESH:
+        case ShadingType.TENSOR_PATCH_MESH:
+          return new MeshShading(shading, xref, res, pdfFunctionFactory, localColorSpaceCache);
+
+        default:
+          throw new _util.FormatError("Unsupported ShadingType: " + type);
+      }
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      handler.send("UnsupportedFeature", {
+        featureId: _util.UNSUPPORTED_FEATURES.shadingPattern
+      });
+      (0, _util.warn)(ex);
+      return new DummyShading();
+    }
+  }
+
+}
+
+exports.Pattern = Pattern;
+
+class BaseShading {
+  static get SMALL_NUMBER() {
+    return (0, _util.shadow)(this, "SMALL_NUMBER", 1e-6);
+  }
+
+  constructor() {
+    if (this.constructor === BaseShading) {
+      (0, _util.unreachable)("Cannot initialize BaseShading.");
+    }
+  }
+
+  getIR() {
+    (0, _util.unreachable)("Abstract method `getIR` called.");
+  }
+
+}
+
+class RadialAxialShading extends BaseShading {
+  constructor(dict, xref, resources, pdfFunctionFactory, localColorSpaceCache) {
+    super();
+    this.coordsArr = dict.getArray("Coords");
+    this.shadingType = dict.get("ShadingType");
+
+    const cs = _colorspace.ColorSpace.parse({
+      cs: dict.getRaw("CS") || dict.getRaw("ColorSpace"),
+      xref,
+      resources,
+      pdfFunctionFactory,
+      localColorSpaceCache
+    });
+
+    const bbox = dict.getArray("BBox");
+
+    if (Array.isArray(bbox) && bbox.length === 4) {
+      this.bbox = _util.Util.normalizeRect(bbox);
+    } else {
+      this.bbox = null;
+    }
+
+    let t0 = 0.0,
+        t1 = 1.0;
+
+    if (dict.has("Domain")) {
+      const domainArr = dict.getArray("Domain");
+      t0 = domainArr[0];
+      t1 = domainArr[1];
+    }
+
+    let extendStart = false,
+        extendEnd = false;
+
+    if (dict.has("Extend")) {
+      const extendArr = dict.getArray("Extend");
+      extendStart = extendArr[0];
+      extendEnd = extendArr[1];
+    }
+
+    if (this.shadingType === ShadingType.RADIAL && (!extendStart || !extendEnd)) {
+      const [x1, y1, r1, x2, y2, r2] = this.coordsArr;
+      const distance = Math.hypot(x1 - x2, y1 - y2);
+
+      if (r1 <= r2 + distance && r2 <= r1 + distance) {
+        (0, _util.warn)("Unsupported radial gradient.");
+      }
+    }
+
+    this.extendStart = extendStart;
+    this.extendEnd = extendEnd;
+    const fnObj = dict.getRaw("Function");
+    const fn = pdfFunctionFactory.createFromArray(fnObj);
+    const NUMBER_OF_SAMPLES = 10;
+    const step = (t1 - t0) / NUMBER_OF_SAMPLES;
+    const colorStops = this.colorStops = [];
+
+    if (t0 >= t1 || step <= 0) {
+      (0, _util.info)("Bad shading domain.");
+      return;
+    }
+
+    const color = new Float32Array(cs.numComps),
+          ratio = new Float32Array(1);
+    let rgbColor;
+
+    for (let i = 0; i <= NUMBER_OF_SAMPLES; i++) {
+      ratio[0] = t0 + i * step;
+      fn(ratio, 0, color, 0);
+      rgbColor = cs.getRgb(color, 0);
+
+      const cssColor = _util.Util.makeHexColor(rgbColor[0], rgbColor[1], rgbColor[2]);
+
+      colorStops.push([i / NUMBER_OF_SAMPLES, cssColor]);
+    }
+
+    let background = "transparent";
+
+    if (dict.has("Background")) {
+      rgbColor = cs.getRgb(dict.get("Background"), 0);
+      background = _util.Util.makeHexColor(rgbColor[0], rgbColor[1], rgbColor[2]);
+    }
+
+    if (!extendStart) {
+      colorStops.unshift([0, background]);
+      colorStops[1][0] += BaseShading.SMALL_NUMBER;
+    }
+
+    if (!extendEnd) {
+      colorStops.at(-1)[0] -= BaseShading.SMALL_NUMBER;
+      colorStops.push([1, background]);
+    }
+
+    this.colorStops = colorStops;
+  }
+
+  getIR() {
+    const coordsArr = this.coordsArr;
+    const shadingType = this.shadingType;
+    let type, p0, p1, r0, r1;
+
+    if (shadingType === ShadingType.AXIAL) {
+      p0 = [coordsArr[0], coordsArr[1]];
+      p1 = [coordsArr[2], coordsArr[3]];
+      r0 = null;
+      r1 = null;
+      type = "axial";
+    } else if (shadingType === ShadingType.RADIAL) {
+      p0 = [coordsArr[0], coordsArr[1]];
+      p1 = [coordsArr[3], coordsArr[4]];
+      r0 = coordsArr[2];
+      r1 = coordsArr[5];
+      type = "radial";
+    } else {
+      (0, _util.unreachable)(`getPattern type unknown: ${shadingType}`);
+    }
+
+    return ["RadialAxial", type, this.bbox, this.colorStops, p0, p1, r0, r1];
+  }
+
+}
+
+class MeshStreamReader {
+  constructor(stream, context) {
+    this.stream = stream;
+    this.context = context;
+    this.buffer = 0;
+    this.bufferLength = 0;
+    const numComps = context.numComps;
+    this.tmpCompsBuf = new Float32Array(numComps);
+    const csNumComps = context.colorSpace.numComps;
+    this.tmpCsCompsBuf = context.colorFn ? new Float32Array(csNumComps) : this.tmpCompsBuf;
+  }
+
+  get hasData() {
+    if (this.stream.end) {
+      return this.stream.pos < this.stream.end;
+    }
+
+    if (this.bufferLength > 0) {
+      return true;
+    }
+
+    const nextByte = this.stream.getByte();
+
+    if (nextByte < 0) {
+      return false;
+    }
+
+    this.buffer = nextByte;
+    this.bufferLength = 8;
+    return true;
+  }
+
+  readBits(n) {
+    let buffer = this.buffer;
+    let bufferLength = this.bufferLength;
+
+    if (n === 32) {
+      if (bufferLength === 0) {
+        return (this.stream.getByte() << 24 | this.stream.getByte() << 16 | this.stream.getByte() << 8 | this.stream.getByte()) >>> 0;
+      }
+
+      buffer = buffer << 24 | this.stream.getByte() << 16 | this.stream.getByte() << 8 | this.stream.getByte();
+      const nextByte = this.stream.getByte();
+      this.buffer = nextByte & (1 << bufferLength) - 1;
+      return (buffer << 8 - bufferLength | (nextByte & 0xff) >> bufferLength) >>> 0;
+    }
+
+    if (n === 8 && bufferLength === 0) {
+      return this.stream.getByte();
+    }
+
+    while (bufferLength < n) {
+      buffer = buffer << 8 | this.stream.getByte();
+      bufferLength += 8;
+    }
+
+    bufferLength -= n;
+    this.bufferLength = bufferLength;
+    this.buffer = buffer & (1 << bufferLength) - 1;
+    return buffer >> bufferLength;
+  }
+
+  align() {
+    this.buffer = 0;
+    this.bufferLength = 0;
+  }
+
+  readFlag() {
+    return this.readBits(this.context.bitsPerFlag);
+  }
+
+  readCoordinate() {
+    const bitsPerCoordinate = this.context.bitsPerCoordinate;
+    const xi = this.readBits(bitsPerCoordinate);
+    const yi = this.readBits(bitsPerCoordinate);
+    const decode = this.context.decode;
+    const scale = bitsPerCoordinate < 32 ? 1 / ((1 << bitsPerCoordinate) - 1) : 2.3283064365386963e-10;
+    return [xi * scale * (decode[1] - decode[0]) + decode[0], yi * scale * (decode[3] - decode[2]) + decode[2]];
+  }
+
+  readComponents() {
+    const numComps = this.context.numComps;
+    const bitsPerComponent = this.context.bitsPerComponent;
+    const scale = bitsPerComponent < 32 ? 1 / ((1 << bitsPerComponent) - 1) : 2.3283064365386963e-10;
+    const decode = this.context.decode;
+    const components = this.tmpCompsBuf;
+
+    for (let i = 0, j = 4; i < numComps; i++, j += 2) {
+      const ci = this.readBits(bitsPerComponent);
+      components[i] = ci * scale * (decode[j + 1] - decode[j]) + decode[j];
+    }
+
+    const color = this.tmpCsCompsBuf;
+
+    if (this.context.colorFn) {
+      this.context.colorFn(components, 0, color, 0);
+    }
+
+    return this.context.colorSpace.getRgb(color, 0);
+  }
+
+}
+
+const getB = function getBClosure() {
+  function buildB(count) {
+    const lut = [];
+
+    for (let i = 0; i <= count; i++) {
+      const t = i / count,
+            t_ = 1 - t;
+      lut.push(new Float32Array([t_ * t_ * t_, 3 * t * t_ * t_, 3 * t * t * t_, t * t * t]));
+    }
+
+    return lut;
+  }
+
+  const cache = [];
+  return function (count) {
+    if (!cache[count]) {
+      cache[count] = buildB(count);
+    }
+
+    return cache[count];
+  };
+}();
+
+class MeshShading extends BaseShading {
+  static get MIN_SPLIT_PATCH_CHUNKS_AMOUNT() {
+    return (0, _util.shadow)(this, "MIN_SPLIT_PATCH_CHUNKS_AMOUNT", 3);
+  }
+
+  static get MAX_SPLIT_PATCH_CHUNKS_AMOUNT() {
+    return (0, _util.shadow)(this, "MAX_SPLIT_PATCH_CHUNKS_AMOUNT", 20);
+  }
+
+  static get TRIANGLE_DENSITY() {
+    return (0, _util.shadow)(this, "TRIANGLE_DENSITY", 20);
+  }
+
+  constructor(stream, xref, resources, pdfFunctionFactory, localColorSpaceCache) {
+    super();
+
+    if (!(stream instanceof _base_stream.BaseStream)) {
+      throw new _util.FormatError("Mesh data is not a stream");
+    }
+
+    const dict = stream.dict;
+    this.shadingType = dict.get("ShadingType");
+    const bbox = dict.getArray("BBox");
+
+    if (Array.isArray(bbox) && bbox.length === 4) {
+      this.bbox = _util.Util.normalizeRect(bbox);
+    } else {
+      this.bbox = null;
+    }
+
+    const cs = _colorspace.ColorSpace.parse({
+      cs: dict.getRaw("CS") || dict.getRaw("ColorSpace"),
+      xref,
+      resources,
+      pdfFunctionFactory,
+      localColorSpaceCache
+    });
+
+    this.background = dict.has("Background") ? cs.getRgb(dict.get("Background"), 0) : null;
+    const fnObj = dict.getRaw("Function");
+    const fn = fnObj ? pdfFunctionFactory.createFromArray(fnObj) : null;
+    this.coords = [];
+    this.colors = [];
+    this.figures = [];
+    const decodeContext = {
+      bitsPerCoordinate: dict.get("BitsPerCoordinate"),
+      bitsPerComponent: dict.get("BitsPerComponent"),
+      bitsPerFlag: dict.get("BitsPerFlag"),
+      decode: dict.getArray("Decode"),
+      colorFn: fn,
+      colorSpace: cs,
+      numComps: fn ? 1 : cs.numComps
+    };
+    const reader = new MeshStreamReader(stream, decodeContext);
+    let patchMesh = false;
+
+    switch (this.shadingType) {
+      case ShadingType.FREE_FORM_MESH:
+        this._decodeType4Shading(reader);
+
+        break;
+
+      case ShadingType.LATTICE_FORM_MESH:
+        const verticesPerRow = dict.get("VerticesPerRow") | 0;
+
+        if (verticesPerRow < 2) {
+          throw new _util.FormatError("Invalid VerticesPerRow");
+        }
+
+        this._decodeType5Shading(reader, verticesPerRow);
+
+        break;
+
+      case ShadingType.COONS_PATCH_MESH:
+        this._decodeType6Shading(reader);
+
+        patchMesh = true;
+        break;
+
+      case ShadingType.TENSOR_PATCH_MESH:
+        this._decodeType7Shading(reader);
+
+        patchMesh = true;
+        break;
+
+      default:
+        (0, _util.unreachable)("Unsupported mesh type.");
+        break;
+    }
+
+    if (patchMesh) {
+      this._updateBounds();
+
+      for (let i = 0, ii = this.figures.length; i < ii; i++) {
+        this._buildFigureFromPatch(i);
+      }
+    }
+
+    this._updateBounds();
+
+    this._packData();
+  }
+
+  _decodeType4Shading(reader) {
+    const coords = this.coords;
+    const colors = this.colors;
+    const operators = [];
+    const ps = [];
+    let verticesLeft = 0;
+
+    while (reader.hasData) {
+      const f = reader.readFlag();
+      const coord = reader.readCoordinate();
+      const color = reader.readComponents();
+
+      if (verticesLeft === 0) {
+        if (!(0 <= f && f <= 2)) {
+          throw new _util.FormatError("Unknown type4 flag");
+        }
+
+        switch (f) {
+          case 0:
+            verticesLeft = 3;
+            break;
+
+          case 1:
+            ps.push(ps.at(-2), ps.at(-1));
+            verticesLeft = 1;
+            break;
+
+          case 2:
+            ps.push(ps.at(-3), ps.at(-1));
+            verticesLeft = 1;
+            break;
+        }
+
+        operators.push(f);
+      }
+
+      ps.push(coords.length);
+      coords.push(coord);
+      colors.push(color);
+      verticesLeft--;
+      reader.align();
+    }
+
+    this.figures.push({
+      type: "triangles",
+      coords: new Int32Array(ps),
+      colors: new Int32Array(ps)
+    });
+  }
+
+  _decodeType5Shading(reader, verticesPerRow) {
+    const coords = this.coords;
+    const colors = this.colors;
+    const ps = [];
+
+    while (reader.hasData) {
+      const coord = reader.readCoordinate();
+      const color = reader.readComponents();
+      ps.push(coords.length);
+      coords.push(coord);
+      colors.push(color);
+    }
+
+    this.figures.push({
+      type: "lattice",
+      coords: new Int32Array(ps),
+      colors: new Int32Array(ps),
+      verticesPerRow
+    });
+  }
+
+  _decodeType6Shading(reader) {
+    const coords = this.coords;
+    const colors = this.colors;
+    const ps = new Int32Array(16);
+    const cs = new Int32Array(4);
+
+    while (reader.hasData) {
+      const f = reader.readFlag();
+
+      if (!(0 <= f && f <= 3)) {
+        throw new _util.FormatError("Unknown type6 flag");
+      }
+
+      const pi = coords.length;
+
+      for (let i = 0, ii = f !== 0 ? 8 : 12; i < ii; i++) {
+        coords.push(reader.readCoordinate());
+      }
+
+      const ci = colors.length;
+
+      for (let i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) {
+        colors.push(reader.readComponents());
+      }
+
+      let tmp1, tmp2, tmp3, tmp4;
+
+      switch (f) {
+        case 0:
+          ps[12] = pi + 3;
+          ps[13] = pi + 4;
+          ps[14] = pi + 5;
+          ps[15] = pi + 6;
+          ps[8] = pi + 2;
+          ps[11] = pi + 7;
+          ps[4] = pi + 1;
+          ps[7] = pi + 8;
+          ps[0] = pi;
+          ps[1] = pi + 11;
+          ps[2] = pi + 10;
+          ps[3] = pi + 9;
+          cs[2] = ci + 1;
+          cs[3] = ci + 2;
+          cs[0] = ci;
+          cs[1] = ci + 3;
+          break;
+
+        case 1:
+          tmp1 = ps[12];
+          tmp2 = ps[13];
+          tmp3 = ps[14];
+          tmp4 = ps[15];
+          ps[12] = tmp4;
+          ps[13] = pi + 0;
+          ps[14] = pi + 1;
+          ps[15] = pi + 2;
+          ps[8] = tmp3;
+          ps[11] = pi + 3;
+          ps[4] = tmp2;
+          ps[7] = pi + 4;
+          ps[0] = tmp1;
+          ps[1] = pi + 7;
+          ps[2] = pi + 6;
+          ps[3] = pi + 5;
+          tmp1 = cs[2];
+          tmp2 = cs[3];
+          cs[2] = tmp2;
+          cs[3] = ci;
+          cs[0] = tmp1;
+          cs[1] = ci + 1;
+          break;
+
+        case 2:
+          tmp1 = ps[15];
+          tmp2 = ps[11];
+          ps[12] = ps[3];
+          ps[13] = pi + 0;
+          ps[14] = pi + 1;
+          ps[15] = pi + 2;
+          ps[8] = ps[7];
+          ps[11] = pi + 3;
+          ps[4] = tmp2;
+          ps[7] = pi + 4;
+          ps[0] = tmp1;
+          ps[1] = pi + 7;
+          ps[2] = pi + 6;
+          ps[3] = pi + 5;
+          tmp1 = cs[3];
+          cs[2] = cs[1];
+          cs[3] = ci;
+          cs[0] = tmp1;
+          cs[1] = ci + 1;
+          break;
+
+        case 3:
+          ps[12] = ps[0];
+          ps[13] = pi + 0;
+          ps[14] = pi + 1;
+          ps[15] = pi + 2;
+          ps[8] = ps[1];
+          ps[11] = pi + 3;
+          ps[4] = ps[2];
+          ps[7] = pi + 4;
+          ps[0] = ps[3];
+          ps[1] = pi + 7;
+          ps[2] = pi + 6;
+          ps[3] = pi + 5;
+          cs[2] = cs[0];
+          cs[3] = ci;
+          cs[0] = cs[1];
+          cs[1] = ci + 1;
+          break;
+      }
+
+      ps[5] = coords.length;
+      coords.push([(-4 * coords[ps[0]][0] - coords[ps[15]][0] + 6 * (coords[ps[4]][0] + coords[ps[1]][0]) - 2 * (coords[ps[12]][0] + coords[ps[3]][0]) + 3 * (coords[ps[13]][0] + coords[ps[7]][0])) / 9, (-4 * coords[ps[0]][1] - coords[ps[15]][1] + 6 * (coords[ps[4]][1] + coords[ps[1]][1]) - 2 * (coords[ps[12]][1] + coords[ps[3]][1]) + 3 * (coords[ps[13]][1] + coords[ps[7]][1])) / 9]);
+      ps[6] = coords.length;
+      coords.push([(-4 * coords[ps[3]][0] - coords[ps[12]][0] + 6 * (coords[ps[2]][0] + coords[ps[7]][0]) - 2 * (coords[ps[0]][0] + coords[ps[15]][0]) + 3 * (coords[ps[4]][0] + coords[ps[14]][0])) / 9, (-4 * coords[ps[3]][1] - coords[ps[12]][1] + 6 * (coords[ps[2]][1] + coords[ps[7]][1]) - 2 * (coords[ps[0]][1] + coords[ps[15]][1]) + 3 * (coords[ps[4]][1] + coords[ps[14]][1])) / 9]);
+      ps[9] = coords.length;
+      coords.push([(-4 * coords[ps[12]][0] - coords[ps[3]][0] + 6 * (coords[ps[8]][0] + coords[ps[13]][0]) - 2 * (coords[ps[0]][0] + coords[ps[15]][0]) + 3 * (coords[ps[11]][0] + coords[ps[1]][0])) / 9, (-4 * coords[ps[12]][1] - coords[ps[3]][1] + 6 * (coords[ps[8]][1] + coords[ps[13]][1]) - 2 * (coords[ps[0]][1] + coords[ps[15]][1]) + 3 * (coords[ps[11]][1] + coords[ps[1]][1])) / 9]);
+      ps[10] = coords.length;
+      coords.push([(-4 * coords[ps[15]][0] - coords[ps[0]][0] + 6 * (coords[ps[11]][0] + coords[ps[14]][0]) - 2 * (coords[ps[12]][0] + coords[ps[3]][0]) + 3 * (coords[ps[2]][0] + coords[ps[8]][0])) / 9, (-4 * coords[ps[15]][1] - coords[ps[0]][1] + 6 * (coords[ps[11]][1] + coords[ps[14]][1]) - 2 * (coords[ps[12]][1] + coords[ps[3]][1]) + 3 * (coords[ps[2]][1] + coords[ps[8]][1])) / 9]);
+      this.figures.push({
+        type: "patch",
+        coords: new Int32Array(ps),
+        colors: new Int32Array(cs)
+      });
+    }
+  }
+
+  _decodeType7Shading(reader) {
+    const coords = this.coords;
+    const colors = this.colors;
+    const ps = new Int32Array(16);
+    const cs = new Int32Array(4);
+
+    while (reader.hasData) {
+      const f = reader.readFlag();
+
+      if (!(0 <= f && f <= 3)) {
+        throw new _util.FormatError("Unknown type7 flag");
+      }
+
+      const pi = coords.length;
+
+      for (let i = 0, ii = f !== 0 ? 12 : 16; i < ii; i++) {
+        coords.push(reader.readCoordinate());
+      }
+
+      const ci = colors.length;
+
+      for (let i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) {
+        colors.push(reader.readComponents());
+      }
+
+      let tmp1, tmp2, tmp3, tmp4;
+
+      switch (f) {
+        case 0:
+          ps[12] = pi + 3;
+          ps[13] = pi + 4;
+          ps[14] = pi + 5;
+          ps[15] = pi + 6;
+          ps[8] = pi + 2;
+          ps[9] = pi + 13;
+          ps[10] = pi + 14;
+          ps[11] = pi + 7;
+          ps[4] = pi + 1;
+          ps[5] = pi + 12;
+          ps[6] = pi + 15;
+          ps[7] = pi + 8;
+          ps[0] = pi;
+          ps[1] = pi + 11;
+          ps[2] = pi + 10;
+          ps[3] = pi + 9;
+          cs[2] = ci + 1;
+          cs[3] = ci + 2;
+          cs[0] = ci;
+          cs[1] = ci + 3;
+          break;
+
+        case 1:
+          tmp1 = ps[12];
+          tmp2 = ps[13];
+          tmp3 = ps[14];
+          tmp4 = ps[15];
+          ps[12] = tmp4;
+          ps[13] = pi + 0;
+          ps[14] = pi + 1;
+          ps[15] = pi + 2;
+          ps[8] = tmp3;
+          ps[9] = pi + 9;
+          ps[10] = pi + 10;
+          ps[11] = pi + 3;
+          ps[4] = tmp2;
+          ps[5] = pi + 8;
+          ps[6] = pi + 11;
+          ps[7] = pi + 4;
+          ps[0] = tmp1;
+          ps[1] = pi + 7;
+          ps[2] = pi + 6;
+          ps[3] = pi + 5;
+          tmp1 = cs[2];
+          tmp2 = cs[3];
+          cs[2] = tmp2;
+          cs[3] = ci;
+          cs[0] = tmp1;
+          cs[1] = ci + 1;
+          break;
+
+        case 2:
+          tmp1 = ps[15];
+          tmp2 = ps[11];
+          ps[12] = ps[3];
+          ps[13] = pi + 0;
+          ps[14] = pi + 1;
+          ps[15] = pi + 2;
+          ps[8] = ps[7];
+          ps[9] = pi + 9;
+          ps[10] = pi + 10;
+          ps[11] = pi + 3;
+          ps[4] = tmp2;
+          ps[5] = pi + 8;
+          ps[6] = pi + 11;
+          ps[7] = pi + 4;
+          ps[0] = tmp1;
+          ps[1] = pi + 7;
+          ps[2] = pi + 6;
+          ps[3] = pi + 5;
+          tmp1 = cs[3];
+          cs[2] = cs[1];
+          cs[3] = ci;
+          cs[0] = tmp1;
+          cs[1] = ci + 1;
+          break;
+
+        case 3:
+          ps[12] = ps[0];
+          ps[13] = pi + 0;
+          ps[14] = pi + 1;
+          ps[15] = pi + 2;
+          ps[8] = ps[1];
+          ps[9] = pi + 9;
+          ps[10] = pi + 10;
+          ps[11] = pi + 3;
+          ps[4] = ps[2];
+          ps[5] = pi + 8;
+          ps[6] = pi + 11;
+          ps[7] = pi + 4;
+          ps[0] = ps[3];
+          ps[1] = pi + 7;
+          ps[2] = pi + 6;
+          ps[3] = pi + 5;
+          cs[2] = cs[0];
+          cs[3] = ci;
+          cs[0] = cs[1];
+          cs[1] = ci + 1;
+          break;
+      }
+
+      this.figures.push({
+        type: "patch",
+        coords: new Int32Array(ps),
+        colors: new Int32Array(cs)
+      });
+    }
+  }
+
+  _buildFigureFromPatch(index) {
+    const figure = this.figures[index];
+    (0, _util.assert)(figure.type === "patch", "Unexpected patch mesh figure");
+    const coords = this.coords,
+          colors = this.colors;
+    const pi = figure.coords;
+    const ci = figure.colors;
+    const figureMinX = Math.min(coords[pi[0]][0], coords[pi[3]][0], coords[pi[12]][0], coords[pi[15]][0]);
+    const figureMinY = Math.min(coords[pi[0]][1], coords[pi[3]][1], coords[pi[12]][1], coords[pi[15]][1]);
+    const figureMaxX = Math.max(coords[pi[0]][0], coords[pi[3]][0], coords[pi[12]][0], coords[pi[15]][0]);
+    const figureMaxY = Math.max(coords[pi[0]][1], coords[pi[3]][1], coords[pi[12]][1], coords[pi[15]][1]);
+    let splitXBy = Math.ceil((figureMaxX - figureMinX) * MeshShading.TRIANGLE_DENSITY / (this.bounds[2] - this.bounds[0]));
+    splitXBy = Math.max(MeshShading.MIN_SPLIT_PATCH_CHUNKS_AMOUNT, Math.min(MeshShading.MAX_SPLIT_PATCH_CHUNKS_AMOUNT, splitXBy));
+    let splitYBy = Math.ceil((figureMaxY - figureMinY) * MeshShading.TRIANGLE_DENSITY / (this.bounds[3] - this.bounds[1]));
+    splitYBy = Math.max(MeshShading.MIN_SPLIT_PATCH_CHUNKS_AMOUNT, Math.min(MeshShading.MAX_SPLIT_PATCH_CHUNKS_AMOUNT, splitYBy));
+    const verticesPerRow = splitXBy + 1;
+    const figureCoords = new Int32Array((splitYBy + 1) * verticesPerRow);
+    const figureColors = new Int32Array((splitYBy + 1) * verticesPerRow);
+    let k = 0;
+    const cl = new Uint8Array(3),
+          cr = new Uint8Array(3);
+    const c0 = colors[ci[0]],
+          c1 = colors[ci[1]],
+          c2 = colors[ci[2]],
+          c3 = colors[ci[3]];
+    const bRow = getB(splitYBy),
+          bCol = getB(splitXBy);
+
+    for (let row = 0; row <= splitYBy; row++) {
+      cl[0] = (c0[0] * (splitYBy - row) + c2[0] * row) / splitYBy | 0;
+      cl[1] = (c0[1] * (splitYBy - row) + c2[1] * row) / splitYBy | 0;
+      cl[2] = (c0[2] * (splitYBy - row) + c2[2] * row) / splitYBy | 0;
+      cr[0] = (c1[0] * (splitYBy - row) + c3[0] * row) / splitYBy | 0;
+      cr[1] = (c1[1] * (splitYBy - row) + c3[1] * row) / splitYBy | 0;
+      cr[2] = (c1[2] * (splitYBy - row) + c3[2] * row) / splitYBy | 0;
+
+      for (let col = 0; col <= splitXBy; col++, k++) {
+        if ((row === 0 || row === splitYBy) && (col === 0 || col === splitXBy)) {
+          continue;
+        }
+
+        let x = 0,
+            y = 0;
+        let q = 0;
+
+        for (let i = 0; i <= 3; i++) {
+          for (let j = 0; j <= 3; j++, q++) {
+            const m = bRow[row][i] * bCol[col][j];
+            x += coords[pi[q]][0] * m;
+            y += coords[pi[q]][1] * m;
+          }
+        }
+
+        figureCoords[k] = coords.length;
+        coords.push([x, y]);
+        figureColors[k] = colors.length;
+        const newColor = new Uint8Array(3);
+        newColor[0] = (cl[0] * (splitXBy - col) + cr[0] * col) / splitXBy | 0;
+        newColor[1] = (cl[1] * (splitXBy - col) + cr[1] * col) / splitXBy | 0;
+        newColor[2] = (cl[2] * (splitXBy - col) + cr[2] * col) / splitXBy | 0;
+        colors.push(newColor);
+      }
+    }
+
+    figureCoords[0] = pi[0];
+    figureColors[0] = ci[0];
+    figureCoords[splitXBy] = pi[3];
+    figureColors[splitXBy] = ci[1];
+    figureCoords[verticesPerRow * splitYBy] = pi[12];
+    figureColors[verticesPerRow * splitYBy] = ci[2];
+    figureCoords[verticesPerRow * splitYBy + splitXBy] = pi[15];
+    figureColors[verticesPerRow * splitYBy + splitXBy] = ci[3];
+    this.figures[index] = {
+      type: "lattice",
+      coords: figureCoords,
+      colors: figureColors,
+      verticesPerRow
+    };
+  }
+
+  _updateBounds() {
+    let minX = this.coords[0][0],
+        minY = this.coords[0][1],
+        maxX = minX,
+        maxY = minY;
+
+    for (let i = 1, ii = this.coords.length; i < ii; i++) {
+      const x = this.coords[i][0],
+            y = this.coords[i][1];
+      minX = minX > x ? x : minX;
+      minY = minY > y ? y : minY;
+      maxX = maxX < x ? x : maxX;
+      maxY = maxY < y ? y : maxY;
+    }
+
+    this.bounds = [minX, minY, maxX, maxY];
+  }
+
+  _packData() {
+    let i, ii, j, jj;
+    const coords = this.coords;
+    const coordsPacked = new Float32Array(coords.length * 2);
+
+    for (i = 0, j = 0, ii = coords.length; i < ii; i++) {
+      const xy = coords[i];
+      coordsPacked[j++] = xy[0];
+      coordsPacked[j++] = xy[1];
+    }
+
+    this.coords = coordsPacked;
+    const colors = this.colors;
+    const colorsPacked = new Uint8Array(colors.length * 3);
+
+    for (i = 0, j = 0, ii = colors.length; i < ii; i++) {
+      const c = colors[i];
+      colorsPacked[j++] = c[0];
+      colorsPacked[j++] = c[1];
+      colorsPacked[j++] = c[2];
+    }
+
+    this.colors = colorsPacked;
+    const figures = this.figures;
+
+    for (i = 0, ii = figures.length; i < ii; i++) {
+      const figure = figures[i],
+            ps = figure.coords,
+            cs = figure.colors;
+
+      for (j = 0, jj = ps.length; j < jj; j++) {
+        ps[j] *= 2;
+        cs[j] *= 3;
+      }
+    }
+  }
+
+  getIR() {
+    return ["Mesh", this.shadingType, this.coords, this.colors, this.figures, this.bounds, this.bbox, this.background];
+  }
+
+}
+
+class DummyShading extends BaseShading {
+  getIR() {
+    return ["Dummy"];
+  }
+
+}
+
+function getTilingPatternIR(operatorList, dict, color) {
+  const matrix = dict.getArray("Matrix");
+
+  const bbox = _util.Util.normalizeRect(dict.getArray("BBox"));
+
+  const xstep = dict.get("XStep");
+  const ystep = dict.get("YStep");
+  const paintType = dict.get("PaintType");
+  const tilingType = dict.get("TilingType");
+
+  if (bbox[2] - bbox[0] === 0 || bbox[3] - bbox[1] === 0) {
+    throw new _util.FormatError(`Invalid getTilingPatternIR /BBox array: [${bbox}].`);
+  }
+
+  return ["TilingPattern", color, operatorList, matrix, bbox, xstep, ystep, paintType, tilingType];
+}
+
+/***/ }),
+/* 51 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.getXfaFontDict = getXfaFontDict;
+exports.getXfaFontName = getXfaFontName;
+
+var _calibri_factors = __w_pdfjs_require__(52);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _helvetica_factors = __w_pdfjs_require__(53);
+
+var _liberationsans_widths = __w_pdfjs_require__(54);
+
+var _myriadpro_factors = __w_pdfjs_require__(55);
+
+var _segoeui_factors = __w_pdfjs_require__(56);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _fonts_utils = __w_pdfjs_require__(38);
+
+const getXFAFontMap = (0, _core_utils.getLookupTableFactory)(function (t) {
+  t["MyriadPro-Regular"] = t["PdfJS-Fallback-Regular"] = {
+    name: "LiberationSans-Regular",
+    factors: _myriadpro_factors.MyriadProRegularFactors,
+    baseWidths: _liberationsans_widths.LiberationSansRegularWidths,
+    baseMapping: _liberationsans_widths.LiberationSansRegularMapping,
+    metrics: _myriadpro_factors.MyriadProRegularMetrics
+  };
+  t["MyriadPro-Bold"] = t["PdfJS-Fallback-Bold"] = {
+    name: "LiberationSans-Bold",
+    factors: _myriadpro_factors.MyriadProBoldFactors,
+    baseWidths: _liberationsans_widths.LiberationSansBoldWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldMapping,
+    metrics: _myriadpro_factors.MyriadProBoldMetrics
+  };
+  t["MyriadPro-It"] = t["MyriadPro-Italic"] = t["PdfJS-Fallback-Italic"] = {
+    name: "LiberationSans-Italic",
+    factors: _myriadpro_factors.MyriadProItalicFactors,
+    baseWidths: _liberationsans_widths.LiberationSansItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansItalicMapping,
+    metrics: _myriadpro_factors.MyriadProItalicMetrics
+  };
+  t["MyriadPro-BoldIt"] = t["MyriadPro-BoldItalic"] = t["PdfJS-Fallback-BoldItalic"] = {
+    name: "LiberationSans-BoldItalic",
+    factors: _myriadpro_factors.MyriadProBoldItalicFactors,
+    baseWidths: _liberationsans_widths.LiberationSansBoldItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldItalicMapping,
+    metrics: _myriadpro_factors.MyriadProBoldItalicMetrics
+  };
+  t.ArialMT = t.Arial = t["Arial-Regular"] = {
+    name: "LiberationSans-Regular",
+    baseWidths: _liberationsans_widths.LiberationSansRegularWidths,
+    baseMapping: _liberationsans_widths.LiberationSansRegularMapping
+  };
+  t["Arial-BoldMT"] = t["Arial-Bold"] = {
+    name: "LiberationSans-Bold",
+    baseWidths: _liberationsans_widths.LiberationSansBoldWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldMapping
+  };
+  t["Arial-ItalicMT"] = t["Arial-Italic"] = {
+    name: "LiberationSans-Italic",
+    baseWidths: _liberationsans_widths.LiberationSansItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansItalicMapping
+  };
+  t["Arial-BoldItalicMT"] = t["Arial-BoldItalic"] = {
+    name: "LiberationSans-BoldItalic",
+    baseWidths: _liberationsans_widths.LiberationSansBoldItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldItalicMapping
+  };
+  t["Calibri-Regular"] = {
+    name: "LiberationSans-Regular",
+    factors: _calibri_factors.CalibriRegularFactors,
+    baseWidths: _liberationsans_widths.LiberationSansRegularWidths,
+    baseMapping: _liberationsans_widths.LiberationSansRegularMapping,
+    metrics: _calibri_factors.CalibriRegularMetrics
+  };
+  t["Calibri-Bold"] = {
+    name: "LiberationSans-Bold",
+    factors: _calibri_factors.CalibriBoldFactors,
+    baseWidths: _liberationsans_widths.LiberationSansBoldWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldMapping,
+    metrics: _calibri_factors.CalibriBoldMetrics
+  };
+  t["Calibri-Italic"] = {
+    name: "LiberationSans-Italic",
+    factors: _calibri_factors.CalibriItalicFactors,
+    baseWidths: _liberationsans_widths.LiberationSansItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansItalicMapping,
+    metrics: _calibri_factors.CalibriItalicMetrics
+  };
+  t["Calibri-BoldItalic"] = {
+    name: "LiberationSans-BoldItalic",
+    factors: _calibri_factors.CalibriBoldItalicFactors,
+    baseWidths: _liberationsans_widths.LiberationSansBoldItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldItalicMapping,
+    metrics: _calibri_factors.CalibriBoldItalicMetrics
+  };
+  t["Segoeui-Regular"] = {
+    name: "LiberationSans-Regular",
+    factors: _segoeui_factors.SegoeuiRegularFactors,
+    baseWidths: _liberationsans_widths.LiberationSansRegularWidths,
+    baseMapping: _liberationsans_widths.LiberationSansRegularMapping,
+    metrics: _segoeui_factors.SegoeuiRegularMetrics
+  };
+  t["Segoeui-Bold"] = {
+    name: "LiberationSans-Bold",
+    factors: _segoeui_factors.SegoeuiBoldFactors,
+    baseWidths: _liberationsans_widths.LiberationSansBoldWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldMapping,
+    metrics: _segoeui_factors.SegoeuiBoldMetrics
+  };
+  t["Segoeui-Italic"] = {
+    name: "LiberationSans-Italic",
+    factors: _segoeui_factors.SegoeuiItalicFactors,
+    baseWidths: _liberationsans_widths.LiberationSansItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansItalicMapping,
+    metrics: _segoeui_factors.SegoeuiItalicMetrics
+  };
+  t["Segoeui-BoldItalic"] = {
+    name: "LiberationSans-BoldItalic",
+    factors: _segoeui_factors.SegoeuiBoldItalicFactors,
+    baseWidths: _liberationsans_widths.LiberationSansBoldItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldItalicMapping,
+    metrics: _segoeui_factors.SegoeuiBoldItalicMetrics
+  };
+  t["Helvetica-Regular"] = t.Helvetica = {
+    name: "LiberationSans-Regular",
+    factors: _helvetica_factors.HelveticaRegularFactors,
+    baseWidths: _liberationsans_widths.LiberationSansRegularWidths,
+    baseMapping: _liberationsans_widths.LiberationSansRegularMapping,
+    metrics: _helvetica_factors.HelveticaRegularMetrics
+  };
+  t["Helvetica-Bold"] = {
+    name: "LiberationSans-Bold",
+    factors: _helvetica_factors.HelveticaBoldFactors,
+    baseWidths: _liberationsans_widths.LiberationSansBoldWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldMapping,
+    metrics: _helvetica_factors.HelveticaBoldMetrics
+  };
+  t["Helvetica-Italic"] = {
+    name: "LiberationSans-Italic",
+    factors: _helvetica_factors.HelveticaItalicFactors,
+    baseWidths: _liberationsans_widths.LiberationSansItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansItalicMapping,
+    metrics: _helvetica_factors.HelveticaItalicMetrics
+  };
+  t["Helvetica-BoldItalic"] = {
+    name: "LiberationSans-BoldItalic",
+    factors: _helvetica_factors.HelveticaBoldItalicFactors,
+    baseWidths: _liberationsans_widths.LiberationSansBoldItalicWidths,
+    baseMapping: _liberationsans_widths.LiberationSansBoldItalicMapping,
+    metrics: _helvetica_factors.HelveticaBoldItalicMetrics
+  };
 });
+
+function getXfaFontName(name) {
+  const fontName = (0, _fonts_utils.normalizeFontName)(name);
+  const fontMap = getXFAFontMap();
+  return fontMap[fontName];
+}
+
+function getXfaFontWidths(name) {
+  const info = getXfaFontName(name);
+
+  if (!info) {
+    return null;
+  }
+
+  const {
+    baseWidths,
+    baseMapping,
+    factors
+  } = info;
+  let rescaledBaseWidths;
+
+  if (!factors) {
+    rescaledBaseWidths = baseWidths;
+  } else {
+    rescaledBaseWidths = baseWidths.map((w, i) => w * factors[i]);
+  }
+
+  let currentCode = -2;
+  let currentArray;
+  const newWidths = [];
+
+  for (const [unicode, glyphIndex] of baseMapping.map((charUnicode, index) => [charUnicode, index]).sort(([unicode1], [unicode2]) => unicode1 - unicode2)) {
+    if (unicode === -1) {
+      continue;
+    }
+
+    if (unicode === currentCode + 1) {
+      currentArray.push(rescaledBaseWidths[glyphIndex]);
+      currentCode += 1;
+    } else {
+      currentCode = unicode;
+      currentArray = [rescaledBaseWidths[glyphIndex]];
+      newWidths.push(unicode, currentArray);
+    }
+  }
+
+  return newWidths;
+}
+
+function getXfaFontDict(name) {
+  const widths = getXfaFontWidths(name);
+  const dict = new _primitives.Dict(null);
+  dict.set("BaseFont", _primitives.Name.get(name));
+  dict.set("Type", _primitives.Name.get("Font"));
+  dict.set("Subtype", _primitives.Name.get("CIDFontType2"));
+  dict.set("Encoding", _primitives.Name.get("Identity-H"));
+  dict.set("CIDToGIDMap", _primitives.Name.get("Identity"));
+  dict.set("W", widths);
+  dict.set("FirstChar", widths[0]);
+  dict.set("LastChar", widths.at(-2) + widths.at(-1).length - 1);
+  const descriptor = new _primitives.Dict(null);
+  dict.set("FontDescriptor", descriptor);
+  const systemInfo = new _primitives.Dict(null);
+  systemInfo.set("Ordering", "Identity");
+  systemInfo.set("Registry", "Adobe");
+  systemInfo.set("Supplement", 0);
+  dict.set("CIDSystemInfo", systemInfo);
+  return dict;
+}
+
+/***/ }),
+/* 52 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.CalibriRegularMetrics = exports.CalibriRegularFactors = exports.CalibriItalicMetrics = exports.CalibriItalicFactors = exports.CalibriBoldMetrics = exports.CalibriBoldItalicMetrics = exports.CalibriBoldItalicFactors = exports.CalibriBoldFactors = void 0;
+const CalibriBoldFactors = [1.3877, 1, 1, 1, 0.97801, 0.92482, 0.89552, 0.91133, 0.81988, 0.97566, 0.98152, 0.93548, 0.93548, 1.2798, 0.85284, 0.92794, 1, 0.96134, 1.54657, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.82845, 0.82845, 0.85284, 0.85284, 0.85284, 0.75859, 0.92138, 0.83908, 0.7762, 0.73293, 0.87289, 0.73133, 0.7514, 0.81921, 0.87356, 0.95958, 0.59526, 0.75727, 0.69225, 1.04924, 0.9121, 0.86943, 0.79795, 0.88198, 0.77958, 0.70864, 0.81055, 0.90399, 0.88653, 0.96017, 0.82577, 0.77892, 0.78257, 0.97507, 1.54657, 0.97507, 0.85284, 0.89552, 0.90176, 0.88762, 0.8785, 0.75241, 0.8785, 0.90518, 0.95015, 0.77618, 0.8785, 0.88401, 0.91916, 0.86304, 0.88401, 0.91488, 0.8785, 0.8801, 0.8785, 0.8785, 0.91343, 0.7173, 1.04106, 0.8785, 0.85075, 0.95794, 0.82616, 0.85162, 0.79492, 0.88331, 1.69808, 0.88331, 0.85284, 0.97801, 0.89552, 0.91133, 0.89552, 0.91133, 1.7801, 0.89552, 1.24487, 1.13254, 1.12401, 0.96839, 0.85284, 0.68787, 0.70645, 0.85592, 0.90747, 1.01466, 1.0088, 0.90323, 1, 1.07463, 1, 0.91056, 0.75806, 1.19118, 0.96839, 0.78864, 0.82845, 0.84133, 0.75859, 0.83908, 0.83908, 0.83908, 0.83908, 0.83908, 0.83908, 0.77539, 0.73293, 0.73133, 0.73133, 0.73133, 0.73133, 0.95958, 0.95958, 0.95958, 0.95958, 0.88506, 0.9121, 0.86943, 0.86943, 0.86943, 0.86943, 0.86943, 0.85284, 0.87508, 0.90399, 0.90399, 0.90399, 0.90399, 0.77892, 0.79795, 0.90807, 0.88762, 0.88762, 0.88762, 0.88762, 0.88762, 0.88762, 0.8715, 0.75241, 0.90518, 0.90518, 0.90518, 0.90518, 0.88401, 0.88401, 0.88401, 0.88401, 0.8785, 0.8785, 0.8801, 0.8801, 0.8801, 0.8801, 0.8801, 0.90747, 0.89049, 0.8785, 0.8785, 0.8785, 0.8785, 0.85162, 0.8785, 0.85162, 0.83908, 0.88762, 0.83908, 0.88762, 0.83908, 0.88762, 0.73293, 0.75241, 0.73293, 0.75241, 0.73293, 0.75241, 0.73293, 0.75241, 0.87289, 0.83016, 0.88506, 0.93125, 0.73133, 0.90518, 0.73133, 0.90518, 0.73133, 0.90518, 0.73133, 0.90518, 0.73133, 0.90518, 0.81921, 0.77618, 0.81921, 0.77618, 0.81921, 0.77618, 1, 1, 0.87356, 0.8785, 0.91075, 0.89608, 0.95958, 0.88401, 0.95958, 0.88401, 0.95958, 0.88401, 0.95958, 0.88401, 0.95958, 0.88401, 0.76229, 0.90167, 0.59526, 0.91916, 1, 1, 0.86304, 0.69225, 0.88401, 1, 1, 0.70424, 0.79468, 0.91926, 0.88175, 0.70823, 0.94903, 0.9121, 0.8785, 1, 1, 0.9121, 0.8785, 0.87802, 0.88656, 0.8785, 0.86943, 0.8801, 0.86943, 0.8801, 0.86943, 0.8801, 0.87402, 0.89291, 0.77958, 0.91343, 1, 1, 0.77958, 0.91343, 0.70864, 0.7173, 0.70864, 0.7173, 0.70864, 0.7173, 0.70864, 0.7173, 1, 1, 0.81055, 0.75841, 0.81055, 1.06452, 0.90399, 0.8785, 0.90399, 0.8785, 0.90399, 0.8785, 0.90399, 0.8785, 0.90399, 0.8785, 0.90399, 0.8785, 0.96017, 0.95794, 0.77892, 0.85162, 0.77892, 0.78257, 0.79492, 0.78257, 0.79492, 0.78257, 0.79492, 0.9297, 0.56892, 0.83908, 0.88762, 0.77539, 0.8715, 0.87508, 0.89049, 1, 1, 0.81055, 1.04106, 1.20528, 1.20528, 1, 1.15543, 0.70674, 0.98387, 0.94721, 1.33431, 1.45894, 0.95161, 1.06303, 0.83908, 0.80352, 0.57184, 0.6965, 0.56289, 0.82001, 0.56029, 0.81235, 1.02988, 0.83908, 0.7762, 0.68156, 0.80367, 0.73133, 0.78257, 0.87356, 0.86943, 0.95958, 0.75727, 0.89019, 1.04924, 0.9121, 0.7648, 0.86943, 0.87356, 0.79795, 0.78275, 0.81055, 0.77892, 0.9762, 0.82577, 0.99819, 0.84896, 0.95958, 0.77892, 0.96108, 1.01407, 0.89049, 1.02988, 0.94211, 0.96108, 0.8936, 0.84021, 0.87842, 0.96399, 0.79109, 0.89049, 1.00813, 1.02988, 0.86077, 0.87445, 0.92099, 0.84723, 0.86513, 0.8801, 0.75638, 0.85714, 0.78216, 0.79586, 0.87965, 0.94211, 0.97747, 0.78287, 0.97926, 0.84971, 1.02988, 0.94211, 0.8801, 0.94211, 0.84971, 0.73133, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.90264, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.90518, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.90548, 1, 1, 1, 1, 1, 1, 0.96017, 0.95794, 0.96017, 0.95794, 0.96017, 0.95794, 0.77892, 0.85162, 1, 1, 0.89552, 0.90527, 1, 0.90363, 0.92794, 0.92794, 0.92794, 0.92794, 0.87012, 0.87012, 0.87012, 0.89552, 0.89552, 1.42259, 0.71143, 1.06152, 1, 1, 1.03372, 1.03372, 0.97171, 1.4956, 2.2807, 0.93835, 0.83406, 0.91133, 0.84107, 0.91133, 1, 1, 1, 0.72021, 1, 1.23108, 0.83489, 0.88525, 0.88525, 0.81499, 0.90527, 1.81055, 0.90527, 1.81055, 1.31006, 1.53711, 0.94434, 1.08696, 1, 0.95018, 0.77192, 0.85284, 0.90747, 1.17534, 0.69825, 0.9716, 1.37077, 0.90747, 0.90747, 0.85356, 0.90747, 0.90747, 1.44947, 0.85284, 0.8941, 0.8941, 0.70572, 0.8, 0.70572, 0.70572, 0.70572, 0.70572, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.99862, 0.99862, 1, 1, 1, 1, 1, 1.08004, 0.91027, 1, 1, 1, 0.99862, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.90727, 0.90727, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.CalibriBoldFactors = CalibriBoldFactors;
+const CalibriBoldMetrics = {
+  lineHeight: 1.2207,
+  lineGap: 0.2207
+};
+exports.CalibriBoldMetrics = CalibriBoldMetrics;
+const CalibriBoldItalicFactors = [1.3877, 1, 1, 1, 0.97801, 0.92482, 0.89552, 0.91133, 0.81988, 0.97566, 0.98152, 0.93548, 0.93548, 1.2798, 0.85284, 0.92794, 1, 0.96134, 1.56239, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.82845, 0.82845, 0.85284, 0.85284, 0.85284, 0.75859, 0.92138, 0.83908, 0.7762, 0.71805, 0.87289, 0.73133, 0.7514, 0.81921, 0.87356, 0.95958, 0.59526, 0.75727, 0.69225, 1.04924, 0.90872, 0.85938, 0.79795, 0.87068, 0.77958, 0.69766, 0.81055, 0.90399, 0.88653, 0.96068, 0.82577, 0.77892, 0.78257, 0.97507, 1.529, 0.97507, 0.85284, 0.89552, 0.90176, 0.94908, 0.86411, 0.74012, 0.86411, 0.88323, 0.95015, 0.86411, 0.86331, 0.88401, 0.91916, 0.86304, 0.88401, 0.9039, 0.86331, 0.86331, 0.86411, 0.86411, 0.90464, 0.70852, 1.04106, 0.86331, 0.84372, 0.95794, 0.82616, 0.84548, 0.79492, 0.88331, 1.69808, 0.88331, 0.85284, 0.97801, 0.89552, 0.91133, 0.89552, 0.91133, 1.7801, 0.89552, 1.24487, 1.13254, 1.19129, 0.96839, 0.85284, 0.68787, 0.70645, 0.85592, 0.90747, 1.01466, 1.0088, 0.90323, 1, 1.07463, 1, 0.91056, 0.75806, 1.19118, 0.96839, 0.78864, 0.82845, 0.84133, 0.75859, 0.83908, 0.83908, 0.83908, 0.83908, 0.83908, 0.83908, 0.77539, 0.71805, 0.73133, 0.73133, 0.73133, 0.73133, 0.95958, 0.95958, 0.95958, 0.95958, 0.88506, 0.90872, 0.85938, 0.85938, 0.85938, 0.85938, 0.85938, 0.85284, 0.87068, 0.90399, 0.90399, 0.90399, 0.90399, 0.77892, 0.79795, 0.90807, 0.94908, 0.94908, 0.94908, 0.94908, 0.94908, 0.94908, 0.85887, 0.74012, 0.88323, 0.88323, 0.88323, 0.88323, 0.88401, 0.88401, 0.88401, 0.88401, 0.8785, 0.86331, 0.86331, 0.86331, 0.86331, 0.86331, 0.86331, 0.90747, 0.89049, 0.86331, 0.86331, 0.86331, 0.86331, 0.84548, 0.86411, 0.84548, 0.83908, 0.94908, 0.83908, 0.94908, 0.83908, 0.94908, 0.71805, 0.74012, 0.71805, 0.74012, 0.71805, 0.74012, 0.71805, 0.74012, 0.87289, 0.79538, 0.88506, 0.92726, 0.73133, 0.88323, 0.73133, 0.88323, 0.73133, 0.88323, 0.73133, 0.88323, 0.73133, 0.88323, 0.81921, 0.86411, 0.81921, 0.86411, 0.81921, 0.86411, 1, 1, 0.87356, 0.86331, 0.91075, 0.8777, 0.95958, 0.88401, 0.95958, 0.88401, 0.95958, 0.88401, 0.95958, 0.88401, 0.95958, 0.88401, 0.76467, 0.90167, 0.59526, 0.91916, 1, 1, 0.86304, 0.69225, 0.88401, 1, 1, 0.70424, 0.77312, 0.91926, 0.88175, 0.70823, 0.94903, 0.90872, 0.86331, 1, 1, 0.90872, 0.86331, 0.86906, 0.88116, 0.86331, 0.85938, 0.86331, 0.85938, 0.86331, 0.85938, 0.86331, 0.87402, 0.86549, 0.77958, 0.90464, 1, 1, 0.77958, 0.90464, 0.69766, 0.70852, 0.69766, 0.70852, 0.69766, 0.70852, 0.69766, 0.70852, 1, 1, 0.81055, 0.75841, 0.81055, 1.06452, 0.90399, 0.86331, 0.90399, 0.86331, 0.90399, 0.86331, 0.90399, 0.86331, 0.90399, 0.86331, 0.90399, 0.86331, 0.96068, 0.95794, 0.77892, 0.84548, 0.77892, 0.78257, 0.79492, 0.78257, 0.79492, 0.78257, 0.79492, 0.9297, 0.56892, 0.83908, 0.94908, 0.77539, 0.85887, 0.87068, 0.89049, 1, 1, 0.81055, 1.04106, 1.20528, 1.20528, 1, 1.15543, 0.70088, 0.98387, 0.94721, 1.33431, 1.45894, 0.95161, 1.48387, 0.83908, 0.80352, 0.57118, 0.6965, 0.56347, 0.79179, 0.55853, 0.80346, 1.02988, 0.83908, 0.7762, 0.67174, 0.86036, 0.73133, 0.78257, 0.87356, 0.86441, 0.95958, 0.75727, 0.89019, 1.04924, 0.90872, 0.74889, 0.85938, 0.87891, 0.79795, 0.7957, 0.81055, 0.77892, 0.97447, 0.82577, 0.97466, 0.87179, 0.95958, 0.77892, 0.94252, 0.95612, 0.8753, 1.02988, 0.92733, 0.94252, 0.87411, 0.84021, 0.8728, 0.95612, 0.74081, 0.8753, 1.02189, 1.02988, 0.84814, 0.87445, 0.91822, 0.84723, 0.85668, 0.86331, 0.81344, 0.87581, 0.76422, 0.82046, 0.96057, 0.92733, 0.99375, 0.78022, 0.95452, 0.86015, 1.02988, 0.92733, 0.86331, 0.92733, 0.86015, 0.73133, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.90631, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.88323, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.85174, 1, 1, 1, 1, 1, 1, 0.96068, 0.95794, 0.96068, 0.95794, 0.96068, 0.95794, 0.77892, 0.84548, 1, 1, 0.89552, 0.90527, 1, 0.90363, 0.92794, 0.92794, 0.92794, 0.89807, 0.87012, 0.87012, 0.87012, 0.89552, 0.89552, 1.42259, 0.71094, 1.06152, 1, 1, 1.03372, 1.03372, 0.97171, 1.4956, 2.2807, 0.92972, 0.83406, 0.91133, 0.83326, 0.91133, 1, 1, 1, 0.72021, 1, 1.23108, 0.83489, 0.88525, 0.88525, 0.81499, 0.90616, 1.81055, 0.90527, 1.81055, 1.3107, 1.53711, 0.94434, 1.08696, 1, 0.95018, 0.77192, 0.85284, 0.90747, 1.17534, 0.69825, 0.9716, 1.37077, 0.90747, 0.90747, 0.85356, 0.90747, 0.90747, 1.44947, 0.85284, 0.8941, 0.8941, 0.70572, 0.8, 0.70572, 0.70572, 0.70572, 0.70572, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.99862, 0.99862, 1, 1, 1, 1, 1, 1.08004, 0.91027, 1, 1, 1, 0.99862, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.90727, 0.90727, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.CalibriBoldItalicFactors = CalibriBoldItalicFactors;
+const CalibriBoldItalicMetrics = {
+  lineHeight: 1.2207,
+  lineGap: 0.2207
+};
+exports.CalibriBoldItalicMetrics = CalibriBoldItalicMetrics;
+const CalibriItalicFactors = [1.3877, 1, 1, 1, 1.17223, 1.1293, 0.89552, 0.91133, 0.80395, 1.02269, 1.15601, 0.91056, 0.91056, 1.2798, 0.85284, 0.89807, 1, 0.90861, 1.39543, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.96309, 0.96309, 0.85284, 0.85284, 0.85284, 0.83319, 0.88071, 0.8675, 0.81552, 0.72346, 0.85193, 0.73206, 0.7522, 0.81105, 0.86275, 0.90685, 0.6377, 0.77892, 0.75593, 1.02638, 0.89249, 0.84118, 0.77452, 0.85374, 0.75186, 0.67789, 0.79776, 0.88844, 0.85066, 0.94309, 0.77818, 0.7306, 0.76659, 1.10369, 1.38313, 1.10369, 1.06139, 0.89552, 0.8739, 0.9245, 0.9245, 0.83203, 0.9245, 0.85865, 1.09842, 0.9245, 0.9245, 1.03297, 1.07692, 0.90918, 1.03297, 0.94959, 0.9245, 0.92274, 0.9245, 0.9245, 1.02933, 0.77832, 1.20562, 0.9245, 0.8916, 0.98986, 0.86621, 0.89453, 0.79004, 0.94152, 1.77256, 0.94152, 0.85284, 0.97801, 0.89552, 0.91133, 0.89552, 0.91133, 1.91729, 0.89552, 1.17889, 1.13254, 1.16359, 0.92098, 0.85284, 0.68787, 0.71353, 0.84737, 0.90747, 1.0088, 1.0044, 0.87683, 1, 1.09091, 1, 0.92229, 0.739, 1.15642, 0.92098, 0.76288, 0.80504, 0.80972, 0.75859, 0.8675, 0.8675, 0.8675, 0.8675, 0.8675, 0.8675, 0.76318, 0.72346, 0.73206, 0.73206, 0.73206, 0.73206, 0.90685, 0.90685, 0.90685, 0.90685, 0.86477, 0.89249, 0.84118, 0.84118, 0.84118, 0.84118, 0.84118, 0.85284, 0.84557, 0.88844, 0.88844, 0.88844, 0.88844, 0.7306, 0.77452, 0.86331, 0.9245, 0.9245, 0.9245, 0.9245, 0.9245, 0.9245, 0.84843, 0.83203, 0.85865, 0.85865, 0.85865, 0.85865, 0.82601, 0.82601, 0.82601, 0.82601, 0.94469, 0.9245, 0.92274, 0.92274, 0.92274, 0.92274, 0.92274, 0.90747, 0.86651, 0.9245, 0.9245, 0.9245, 0.9245, 0.89453, 0.9245, 0.89453, 0.8675, 0.9245, 0.8675, 0.9245, 0.8675, 0.9245, 0.72346, 0.83203, 0.72346, 0.83203, 0.72346, 0.83203, 0.72346, 0.83203, 0.85193, 0.8875, 0.86477, 0.99034, 0.73206, 0.85865, 0.73206, 0.85865, 0.73206, 0.85865, 0.73206, 0.85865, 0.73206, 0.85865, 0.81105, 0.9245, 0.81105, 0.9245, 0.81105, 0.9245, 1, 1, 0.86275, 0.9245, 0.90872, 0.93591, 0.90685, 0.82601, 0.90685, 0.82601, 0.90685, 0.82601, 0.90685, 1.03297, 0.90685, 0.82601, 0.77896, 1.05611, 0.6377, 1.07692, 1, 1, 0.90918, 0.75593, 1.03297, 1, 1, 0.76032, 0.9375, 0.98156, 0.93407, 0.77261, 1.11429, 0.89249, 0.9245, 1, 1, 0.89249, 0.9245, 0.92534, 0.86698, 0.9245, 0.84118, 0.92274, 0.84118, 0.92274, 0.84118, 0.92274, 0.8667, 0.86291, 0.75186, 1.02933, 1, 1, 0.75186, 1.02933, 0.67789, 0.77832, 0.67789, 0.77832, 0.67789, 0.77832, 0.67789, 0.77832, 1, 1, 0.79776, 0.97655, 0.79776, 1.23023, 0.88844, 0.9245, 0.88844, 0.9245, 0.88844, 0.9245, 0.88844, 0.9245, 0.88844, 0.9245, 0.88844, 0.9245, 0.94309, 0.98986, 0.7306, 0.89453, 0.7306, 0.76659, 0.79004, 0.76659, 0.79004, 0.76659, 0.79004, 1.09231, 0.54873, 0.8675, 0.9245, 0.76318, 0.84843, 0.84557, 0.86651, 1, 1, 0.79776, 1.20562, 1.18622, 1.18622, 1, 1.1437, 0.67009, 0.96334, 0.93695, 1.35191, 1.40909, 0.95161, 1.48387, 0.8675, 0.90861, 0.6192, 0.7363, 0.64824, 0.82411, 0.56321, 0.85696, 1.23516, 0.8675, 0.81552, 0.7286, 0.84134, 0.73206, 0.76659, 0.86275, 0.84369, 0.90685, 0.77892, 0.85871, 1.02638, 0.89249, 0.75828, 0.84118, 0.85984, 0.77452, 0.76466, 0.79776, 0.7306, 0.90782, 0.77818, 0.903, 0.87291, 0.90685, 0.7306, 0.99058, 1.03667, 0.94635, 1.23516, 0.9849, 0.99058, 0.92393, 0.8916, 0.942, 1.03667, 0.75026, 0.94635, 1.0297, 1.23516, 0.90918, 0.94048, 0.98217, 0.89746, 0.84153, 0.92274, 0.82507, 0.88832, 0.84438, 0.88178, 1.03525, 0.9849, 1.00225, 0.78086, 0.97248, 0.89404, 1.23516, 0.9849, 0.92274, 0.9849, 0.89404, 0.73206, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.89693, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.85865, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.90933, 1, 1, 1, 1, 1, 1, 0.94309, 0.98986, 0.94309, 0.98986, 0.94309, 0.98986, 0.7306, 0.89453, 1, 1, 0.89552, 0.90527, 1, 0.90186, 1.12308, 1.12308, 1.12308, 1.12308, 1.2566, 1.2566, 1.2566, 0.89552, 0.89552, 1.42259, 0.68994, 1.03809, 1, 1, 1.0176, 1.0176, 1.11523, 1.4956, 2.01462, 0.97858, 0.82616, 0.91133, 0.83437, 0.91133, 1, 1, 1, 0.70508, 1, 1.23108, 0.79801, 0.84426, 0.84426, 0.774, 0.90572, 1.81055, 0.90749, 1.81055, 1.28809, 1.55469, 0.94434, 1.07806, 1, 0.97094, 0.7589, 0.85284, 0.90747, 1.19658, 0.69825, 0.97622, 1.33512, 0.90747, 0.90747, 0.85284, 0.90747, 0.90747, 1.44947, 0.85284, 0.8941, 0.8941, 0.70572, 0.8, 0.70572, 0.70572, 0.70572, 0.70572, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.99862, 0.99862, 1, 1, 1, 1, 1, 1.0336, 0.91027, 1, 1, 1, 0.99862, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.05859, 1.05859, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.CalibriItalicFactors = CalibriItalicFactors;
+const CalibriItalicMetrics = {
+  lineHeight: 1.2207,
+  lineGap: 0.2207
+};
+exports.CalibriItalicMetrics = CalibriItalicMetrics;
+const CalibriRegularFactors = [1.3877, 1, 1, 1, 1.17223, 1.1293, 0.89552, 0.91133, 0.80395, 1.02269, 1.15601, 0.91056, 0.91056, 1.2798, 0.85284, 0.89807, 1, 0.90861, 1.39016, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.91133, 0.96309, 0.96309, 0.85284, 0.85284, 0.85284, 0.83319, 0.88071, 0.8675, 0.81552, 0.73834, 0.85193, 0.73206, 0.7522, 0.81105, 0.86275, 0.90685, 0.6377, 0.77892, 0.75593, 1.02638, 0.89385, 0.85122, 0.77452, 0.86503, 0.75186, 0.68887, 0.79776, 0.88844, 0.85066, 0.94258, 0.77818, 0.7306, 0.76659, 1.10369, 1.39016, 1.10369, 1.06139, 0.89552, 0.8739, 0.86128, 0.94469, 0.8457, 0.94469, 0.89464, 1.09842, 0.84636, 0.94469, 1.03297, 1.07692, 0.90918, 1.03297, 0.95897, 0.94469, 0.9482, 0.94469, 0.94469, 1.04692, 0.78223, 1.20562, 0.94469, 0.90332, 0.98986, 0.86621, 0.90527, 0.79004, 0.94152, 1.77256, 0.94152, 0.85284, 0.97801, 0.89552, 0.91133, 0.89552, 0.91133, 1.91729, 0.89552, 1.17889, 1.13254, 1.08707, 0.92098, 0.85284, 0.68787, 0.71353, 0.84737, 0.90747, 1.0088, 1.0044, 0.87683, 1, 1.09091, 1, 0.92229, 0.739, 1.15642, 0.92098, 0.76288, 0.80504, 0.80972, 0.75859, 0.8675, 0.8675, 0.8675, 0.8675, 0.8675, 0.8675, 0.76318, 0.73834, 0.73206, 0.73206, 0.73206, 0.73206, 0.90685, 0.90685, 0.90685, 0.90685, 0.86477, 0.89385, 0.85122, 0.85122, 0.85122, 0.85122, 0.85122, 0.85284, 0.85311, 0.88844, 0.88844, 0.88844, 0.88844, 0.7306, 0.77452, 0.86331, 0.86128, 0.86128, 0.86128, 0.86128, 0.86128, 0.86128, 0.8693, 0.8457, 0.89464, 0.89464, 0.89464, 0.89464, 0.82601, 0.82601, 0.82601, 0.82601, 0.94469, 0.94469, 0.9482, 0.9482, 0.9482, 0.9482, 0.9482, 0.90747, 0.86651, 0.94469, 0.94469, 0.94469, 0.94469, 0.90527, 0.94469, 0.90527, 0.8675, 0.86128, 0.8675, 0.86128, 0.8675, 0.86128, 0.73834, 0.8457, 0.73834, 0.8457, 0.73834, 0.8457, 0.73834, 0.8457, 0.85193, 0.92454, 0.86477, 0.9921, 0.73206, 0.89464, 0.73206, 0.89464, 0.73206, 0.89464, 0.73206, 0.89464, 0.73206, 0.89464, 0.81105, 0.84636, 0.81105, 0.84636, 0.81105, 0.84636, 1, 1, 0.86275, 0.94469, 0.90872, 0.95786, 0.90685, 0.82601, 0.90685, 0.82601, 0.90685, 0.82601, 0.90685, 1.03297, 0.90685, 0.82601, 0.77741, 1.05611, 0.6377, 1.07692, 1, 1, 0.90918, 0.75593, 1.03297, 1, 1, 0.76032, 0.90452, 0.98156, 1.11842, 0.77261, 1.11429, 0.89385, 0.94469, 1, 1, 0.89385, 0.94469, 0.95877, 0.86901, 0.94469, 0.85122, 0.9482, 0.85122, 0.9482, 0.85122, 0.9482, 0.8667, 0.90016, 0.75186, 1.04692, 1, 1, 0.75186, 1.04692, 0.68887, 0.78223, 0.68887, 0.78223, 0.68887, 0.78223, 0.68887, 0.78223, 1, 1, 0.79776, 0.92188, 0.79776, 1.23023, 0.88844, 0.94469, 0.88844, 0.94469, 0.88844, 0.94469, 0.88844, 0.94469, 0.88844, 0.94469, 0.88844, 0.94469, 0.94258, 0.98986, 0.7306, 0.90527, 0.7306, 0.76659, 0.79004, 0.76659, 0.79004, 0.76659, 0.79004, 1.09231, 0.54873, 0.8675, 0.86128, 0.76318, 0.8693, 0.85311, 0.86651, 1, 1, 0.79776, 1.20562, 1.18622, 1.18622, 1, 1.1437, 0.67742, 0.96334, 0.93695, 1.35191, 1.40909, 0.95161, 1.48387, 0.86686, 0.90861, 0.62267, 0.74359, 0.65649, 0.85498, 0.56963, 0.88254, 1.23516, 0.8675, 0.81552, 0.75443, 0.84503, 0.73206, 0.76659, 0.86275, 0.85122, 0.90685, 0.77892, 0.85746, 1.02638, 0.89385, 0.75657, 0.85122, 0.86275, 0.77452, 0.74171, 0.79776, 0.7306, 0.95165, 0.77818, 0.89772, 0.88831, 0.90685, 0.7306, 0.98142, 1.02191, 0.96576, 1.23516, 0.99018, 0.98142, 0.9236, 0.89258, 0.94035, 1.02191, 0.78848, 0.96576, 0.9561, 1.23516, 0.90918, 0.92578, 0.95424, 0.89746, 0.83969, 0.9482, 0.80113, 0.89442, 0.85208, 0.86155, 0.98022, 0.99018, 1.00452, 0.81209, 0.99247, 0.89181, 1.23516, 0.99018, 0.9482, 0.99018, 0.89181, 0.73206, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.88844, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.89464, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.96766, 1, 1, 1, 1, 1, 1, 0.94258, 0.98986, 0.94258, 0.98986, 0.94258, 0.98986, 0.7306, 0.90527, 1, 1, 0.89552, 0.90527, 1, 0.90186, 1.12308, 1.12308, 1.12308, 1.12308, 1.2566, 1.2566, 1.2566, 0.89552, 0.89552, 1.42259, 0.69043, 1.03809, 1, 1, 1.0176, 1.0176, 1.11523, 1.4956, 2.01462, 0.99331, 0.82616, 0.91133, 0.84286, 0.91133, 1, 1, 1, 0.70508, 1, 1.23108, 0.79801, 0.84426, 0.84426, 0.774, 0.90527, 1.81055, 0.90527, 1.81055, 1.28809, 1.55469, 0.94434, 1.07806, 1, 0.97094, 0.7589, 0.85284, 0.90747, 1.19658, 0.69825, 0.97622, 1.33512, 0.90747, 0.90747, 0.85356, 0.90747, 0.90747, 1.44947, 0.85284, 0.8941, 0.8941, 0.70572, 0.8, 0.70572, 0.70572, 0.70572, 0.70572, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.99862, 0.99862, 1, 1, 1, 1, 1, 1.0336, 0.91027, 1, 1, 1, 0.99862, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.05859, 1.05859, 1, 1, 1, 1.07185, 0.99413, 0.96334, 1.08065, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.CalibriRegularFactors = CalibriRegularFactors;
+const CalibriRegularMetrics = {
+  lineHeight: 1.2207,
+  lineGap: 0.2207
+};
+exports.CalibriRegularMetrics = CalibriRegularMetrics;
+
+/***/ }),
+/* 53 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.HelveticaRegularMetrics = exports.HelveticaRegularFactors = exports.HelveticaItalicMetrics = exports.HelveticaItalicFactors = exports.HelveticaBoldMetrics = exports.HelveticaBoldItalicMetrics = exports.HelveticaBoldItalicFactors = exports.HelveticaBoldFactors = void 0;
+const HelveticaBoldFactors = [0.76116, 1, 1, 1.0006, 0.99998, 0.99974, 0.99973, 0.99973, 0.99982, 0.99977, 1.00087, 0.99998, 0.99998, 0.99959, 1.00003, 1.0006, 0.99998, 1.0006, 1.0006, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99998, 1, 1.00003, 1.00003, 1.00003, 1.00026, 0.9999, 0.99977, 0.99977, 0.99977, 0.99977, 1.00001, 1.00026, 1.00022, 0.99977, 1.0006, 0.99973, 0.99977, 1.00026, 0.99999, 0.99977, 1.00022, 1.00001, 1.00022, 0.99977, 1.00001, 1.00026, 0.99977, 1.00001, 1.00016, 1.00001, 1.00001, 1.00026, 0.99998, 1.0006, 0.99998, 1.00003, 0.99973, 0.99998, 0.99973, 1.00026, 0.99973, 1.00026, 0.99973, 0.99998, 1.00026, 1.00026, 1.0006, 1.0006, 0.99973, 1.0006, 0.99982, 1.00026, 1.00026, 1.00026, 1.00026, 0.99959, 0.99973, 0.99998, 1.00026, 0.99973, 1.00022, 0.99973, 0.99973, 1, 0.99959, 1.00077, 0.99959, 1.00003, 0.99998, 0.99973, 0.99973, 0.99973, 0.99973, 1.00077, 0.99973, 0.99998, 1.00025, 0.99968, 0.99973, 1.00003, 1.00025, 0.60299, 1.00024, 1.06409, 1, 1, 0.99998, 1, 0.99973, 1.0006, 0.99998, 1, 0.99936, 0.99973, 1.00002, 1.00002, 1.00002, 1.00026, 0.99977, 0.99977, 0.99977, 0.99977, 0.99977, 0.99977, 1, 0.99977, 1.00001, 1.00001, 1.00001, 1.00001, 1.0006, 1.0006, 1.0006, 1.0006, 0.99977, 0.99977, 1.00022, 1.00022, 1.00022, 1.00022, 1.00022, 1.00003, 1.00022, 0.99977, 0.99977, 0.99977, 0.99977, 1.00001, 1.00001, 1.00026, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99982, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 1.0006, 1.0006, 1.0006, 1.0006, 1.00026, 1.00026, 1.00026, 1.00026, 1.00026, 1.00026, 1.00026, 1.06409, 1.00026, 1.00026, 1.00026, 1.00026, 1.00026, 0.99973, 1.00026, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 1.03374, 0.99977, 1.00026, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00022, 1.00026, 1.00022, 1.00026, 1.00022, 1.00026, 1.00022, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.00042, 0.99973, 0.99973, 1.0006, 0.99977, 0.99973, 0.99973, 1.00026, 1.0006, 1.00026, 1.0006, 1.00026, 1.03828, 1.00026, 0.99999, 1.00026, 1.0006, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 0.9993, 0.9998, 1.00026, 1.00022, 1.00026, 1.00022, 1.00026, 1.00022, 1.00026, 1, 1.00016, 0.99977, 0.99959, 0.99977, 0.99959, 0.99977, 0.99959, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00026, 0.99998, 1.00026, 0.8121, 1.00026, 0.99998, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 1.00016, 1.00022, 1.00001, 0.99973, 1.00001, 1.00026, 1, 1.00026, 1, 1.00026, 1, 1.0006, 0.99973, 0.99977, 0.99973, 1, 0.99982, 1.00022, 1.00026, 1.00001, 0.99973, 1.00026, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 1.00034, 0.99977, 1, 0.99997, 1.00026, 1.00078, 1.00036, 0.99973, 1.00013, 1.0006, 0.99977, 0.99977, 0.99988, 0.85148, 1.00001, 1.00026, 0.99977, 1.00022, 1.0006, 0.99977, 1.00001, 0.99999, 0.99977, 1.00069, 1.00022, 0.99977, 1.00001, 0.99984, 1.00026, 1.00001, 1.00024, 1.00001, 0.9999, 1, 1.0006, 1.00001, 1.00041, 0.99962, 1.00026, 1.0006, 0.99995, 1.00041, 0.99942, 0.99973, 0.99927, 1.00082, 0.99902, 1.00026, 1.00087, 1.0006, 1.00069, 0.99973, 0.99867, 0.99973, 0.9993, 1.00026, 1.00049, 1.00056, 1, 0.99988, 0.99935, 0.99995, 0.99954, 1.00055, 0.99945, 1.00032, 1.0006, 0.99995, 1.00026, 0.99995, 1.00032, 1.00001, 1.00008, 0.99971, 1.00019, 0.9994, 1.00001, 1.0006, 1.00044, 0.99973, 1.00023, 1.00047, 1, 0.99942, 0.99561, 0.99989, 1.00035, 0.99977, 1.00035, 0.99977, 1.00019, 0.99944, 1.00001, 1.00021, 0.99926, 1.00035, 1.00035, 0.99942, 1.00048, 0.99999, 0.99977, 1.00022, 1.00035, 1.00001, 0.99977, 1.00026, 0.99989, 1.00057, 1.00001, 0.99936, 1.00052, 1.00012, 0.99996, 1.00043, 1, 1.00035, 0.9994, 0.99976, 1.00035, 0.99973, 1.00052, 1.00041, 1.00119, 1.00037, 0.99973, 1.00002, 0.99986, 1.00041, 1.00041, 0.99902, 0.9996, 1.00034, 0.99999, 1.00026, 0.99999, 1.00026, 0.99973, 1.00052, 0.99973, 1, 0.99973, 1.00041, 1.00075, 0.9994, 1.0003, 0.99999, 1, 1.00041, 0.99955, 1, 0.99915, 0.99973, 0.99973, 1.00026, 1.00119, 0.99955, 0.99973, 1.0006, 0.99911, 1.0006, 1.00026, 0.99972, 1.00026, 0.99902, 1.00041, 0.99973, 0.99999, 1, 1, 1.00038, 1.0005, 1.00016, 1.00022, 1.00016, 1.00022, 1.00016, 1.00022, 1.00001, 0.99973, 1, 1, 0.99973, 1, 1, 0.99955, 1.0006, 1.0006, 1.0006, 1.0006, 1, 1, 1, 0.99973, 0.99973, 0.99972, 1, 1, 1.00106, 0.99999, 0.99998, 0.99998, 0.99999, 0.99998, 1.66475, 1, 0.99973, 0.99973, 1.00023, 0.99973, 0.99971, 1.00047, 1.00023, 1, 0.99991, 0.99984, 1.00002, 1.00002, 1.00002, 1.00002, 1, 1, 1, 1, 1, 1, 1, 0.99972, 1, 1.20985, 1.39713, 1.00003, 1.00031, 1.00015, 1, 0.99561, 1.00027, 1.00031, 1.00031, 0.99915, 1.00031, 1.00031, 0.99999, 1.00003, 0.99999, 0.99999, 1.41144, 1.6, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.40579, 1.40579, 1.36625, 0.99999, 1, 0.99861, 0.99861, 1, 1.00026, 1.00026, 1.00026, 1.00026, 0.99972, 0.99999, 0.99999, 0.99999, 0.99999, 1.40483, 1, 0.99977, 1.00054, 1, 1, 0.99953, 0.99962, 1.00042, 0.9995, 1, 1, 1, 1, 1, 1, 1, 1, 0.99998, 0.99998, 0.99998, 0.99998, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.HelveticaBoldFactors = HelveticaBoldFactors;
+const HelveticaBoldMetrics = {
+  lineHeight: 1.2,
+  lineGap: 0.2
+};
+exports.HelveticaBoldMetrics = HelveticaBoldMetrics;
+const HelveticaBoldItalicFactors = [0.76116, 1, 1, 1.0006, 0.99998, 0.99974, 0.99973, 0.99973, 0.99982, 0.99977, 1.00087, 0.99998, 0.99998, 0.99959, 1.00003, 1.0006, 0.99998, 1.0006, 1.0006, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99998, 1, 1.00003, 1.00003, 1.00003, 1.00026, 0.9999, 0.99977, 0.99977, 0.99977, 0.99977, 1.00001, 1.00026, 1.00022, 0.99977, 1.0006, 0.99973, 0.99977, 1.00026, 0.99999, 0.99977, 1.00022, 1.00001, 1.00022, 0.99977, 1.00001, 1.00026, 0.99977, 1.00001, 1.00016, 1.00001, 1.00001, 1.00026, 0.99998, 1.0006, 0.99998, 1.00003, 0.99973, 0.99998, 0.99973, 1.00026, 0.99973, 1.00026, 0.99973, 0.99998, 1.00026, 1.00026, 1.0006, 1.0006, 0.99973, 1.0006, 0.99982, 1.00026, 1.00026, 1.00026, 1.00026, 0.99959, 0.99973, 0.99998, 1.00026, 0.99973, 1.00022, 0.99973, 0.99973, 1, 0.99959, 1.00077, 0.99959, 1.00003, 0.99998, 0.99973, 0.99973, 0.99973, 0.99973, 1.00077, 0.99973, 0.99998, 1.00025, 0.99968, 0.99973, 1.00003, 1.00025, 0.60299, 1.00024, 1.06409, 1, 1, 0.99998, 1, 0.99973, 1.0006, 0.99998, 1, 0.99936, 0.99973, 1.00002, 1.00002, 1.00002, 1.00026, 0.99977, 0.99977, 0.99977, 0.99977, 0.99977, 0.99977, 1, 0.99977, 1.00001, 1.00001, 1.00001, 1.00001, 1.0006, 1.0006, 1.0006, 1.0006, 0.99977, 0.99977, 1.00022, 1.00022, 1.00022, 1.00022, 1.00022, 1.00003, 1.00022, 0.99977, 0.99977, 0.99977, 0.99977, 1.00001, 1.00001, 1.00026, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99982, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 1.0006, 1.0006, 1.0006, 1.0006, 1.00026, 1.00026, 1.00026, 1.00026, 1.00026, 1.00026, 1.00026, 1.06409, 1.00026, 1.00026, 1.00026, 1.00026, 1.00026, 0.99973, 1.00026, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 1.0044, 0.99977, 1.00026, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00022, 1.00026, 1.00022, 1.00026, 1.00022, 1.00026, 1.00022, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 0.99971, 0.99973, 0.99973, 1.0006, 0.99977, 0.99973, 0.99973, 1.00026, 1.0006, 1.00026, 1.0006, 1.00026, 1.01011, 1.00026, 0.99999, 1.00026, 1.0006, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 0.9993, 0.9998, 1.00026, 1.00022, 1.00026, 1.00022, 1.00026, 1.00022, 1.00026, 1, 1.00016, 0.99977, 0.99959, 0.99977, 0.99959, 0.99977, 0.99959, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00026, 0.99998, 1.00026, 0.8121, 1.00026, 0.99998, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 0.99977, 1.00026, 1.00016, 1.00022, 1.00001, 0.99973, 1.00001, 1.00026, 1, 1.00026, 1, 1.00026, 1, 1.0006, 0.99973, 0.99977, 0.99973, 1, 0.99982, 1.00022, 1.00026, 1.00001, 0.99973, 1.00026, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99977, 1, 1, 1.00026, 0.99969, 0.99972, 0.99981, 0.9998, 1.0006, 0.99977, 0.99977, 1.00022, 0.91155, 1.00001, 1.00026, 0.99977, 1.00022, 1.0006, 0.99977, 1.00001, 0.99999, 0.99977, 0.99966, 1.00022, 1.00032, 1.00001, 0.99944, 1.00026, 1.00001, 0.99968, 1.00001, 1.00047, 1, 1.0006, 1.00001, 0.99981, 1.00101, 1.00026, 1.0006, 0.99948, 0.99981, 1.00064, 0.99973, 0.99942, 1.00101, 1.00061, 1.00026, 1.00069, 1.0006, 1.00014, 0.99973, 1.01322, 0.99973, 1.00065, 1.00026, 1.00012, 0.99923, 1, 1.00064, 1.00076, 0.99948, 1.00055, 1.00063, 1.00007, 0.99943, 1.0006, 0.99948, 1.00026, 0.99948, 0.99943, 1.00001, 1.00001, 1.00029, 1.00038, 1.00035, 1.00001, 1.0006, 1.0006, 0.99973, 0.99978, 1.00001, 1.00057, 0.99989, 0.99967, 0.99964, 0.99967, 0.99977, 0.99999, 0.99977, 1.00038, 0.99977, 1.00001, 0.99973, 1.00066, 0.99967, 0.99967, 1.00041, 0.99998, 0.99999, 0.99977, 1.00022, 0.99967, 1.00001, 0.99977, 1.00026, 0.99964, 1.00031, 1.00001, 0.99999, 0.99999, 1, 1.00023, 1, 1, 0.99999, 1.00035, 1.00001, 0.99999, 0.99973, 0.99977, 0.99999, 1.00058, 0.99973, 0.99973, 0.99955, 0.9995, 1.00026, 1.00026, 1.00032, 0.99989, 1.00034, 0.99999, 1.00026, 1.00026, 1.00026, 0.99973, 0.45998, 0.99973, 1.00026, 0.99973, 1.00001, 0.99999, 0.99982, 0.99994, 0.99996, 1, 1.00042, 1.00044, 1.00029, 1.00023, 0.99973, 0.99973, 1.00026, 0.99949, 1.00002, 0.99973, 1.0006, 1.0006, 1.0006, 0.99975, 1.00026, 1.00026, 1.00032, 0.98685, 0.99973, 1.00026, 1, 1, 0.99966, 1.00044, 1.00016, 1.00022, 1.00016, 1.00022, 1.00016, 1.00022, 1.00001, 0.99973, 1, 1, 0.99973, 1, 1, 0.99955, 1.0006, 1.0006, 1.0006, 1.0006, 1, 1, 1, 0.99973, 0.99973, 0.99972, 1, 1, 1.00106, 0.99999, 0.99998, 0.99998, 0.99999, 0.99998, 1.66475, 1, 0.99973, 0.99973, 1, 0.99973, 0.99971, 0.99978, 1, 1, 0.99991, 0.99984, 1.00002, 1.00002, 1.00002, 1.00002, 1.00098, 1, 1, 1, 1.00049, 1, 1, 0.99972, 1, 1.20985, 1.39713, 1.00003, 1.00031, 1.00015, 1, 0.99561, 1.00027, 1.00031, 1.00031, 0.99915, 1.00031, 1.00031, 0.99999, 1.00003, 0.99999, 0.99999, 1.41144, 1.6, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.40579, 1.40579, 1.36625, 0.99999, 1, 0.99861, 0.99861, 1, 1.00026, 1.00026, 1.00026, 1.00026, 0.99972, 0.99999, 0.99999, 0.99999, 0.99999, 1.40483, 1, 0.99977, 1.00054, 1, 1, 0.99953, 0.99962, 1.00042, 0.9995, 1, 1, 1, 1, 1, 1, 1, 1, 0.99998, 0.99998, 0.99998, 0.99998, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.HelveticaBoldItalicFactors = HelveticaBoldItalicFactors;
+const HelveticaBoldItalicMetrics = {
+  lineHeight: 1.35,
+  lineGap: 0.2
+};
+exports.HelveticaBoldItalicMetrics = HelveticaBoldItalicMetrics;
+const HelveticaItalicFactors = [0.76116, 1, 1, 1.0006, 1.0006, 1.00006, 0.99973, 0.99973, 0.99982, 1.00001, 1.00043, 0.99998, 0.99998, 0.99959, 1.00003, 1.0006, 0.99998, 1.0006, 1.0006, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 1.0006, 1, 1.00003, 1.00003, 1.00003, 0.99973, 0.99987, 1.00001, 1.00001, 0.99977, 0.99977, 1.00001, 1.00026, 1.00022, 0.99977, 1.0006, 1, 1.00001, 0.99973, 0.99999, 0.99977, 1.00022, 1.00001, 1.00022, 0.99977, 1.00001, 1.00026, 0.99977, 1.00001, 1.00016, 1.00001, 1.00001, 1.00026, 1.0006, 1.0006, 1.0006, 0.99949, 0.99973, 0.99998, 0.99973, 0.99973, 1, 0.99973, 0.99973, 1.0006, 0.99973, 0.99973, 0.99924, 0.99924, 1, 0.99924, 0.99999, 0.99973, 0.99973, 0.99973, 0.99973, 0.99998, 1, 1.0006, 0.99973, 1, 0.99977, 1, 1, 1, 1.00005, 1.0009, 1.00005, 1.00003, 0.99998, 0.99973, 0.99973, 0.99973, 0.99973, 1.0009, 0.99973, 0.99998, 1.00025, 0.99968, 0.99973, 1.00003, 1.00025, 0.60299, 1.00024, 1.06409, 1, 1, 0.99998, 1, 0.9998, 1.0006, 0.99998, 1, 0.99936, 0.99973, 1.00002, 1.00002, 1.00002, 1.00026, 1.00001, 1.00001, 1.00001, 1.00001, 1.00001, 1.00001, 1, 0.99977, 1.00001, 1.00001, 1.00001, 1.00001, 1.0006, 1.0006, 1.0006, 1.0006, 0.99977, 0.99977, 1.00022, 1.00022, 1.00022, 1.00022, 1.00022, 1.00003, 1.00022, 0.99977, 0.99977, 0.99977, 0.99977, 1.00001, 1.00001, 1.00026, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99982, 1, 0.99973, 0.99973, 0.99973, 0.99973, 1.0006, 1.0006, 1.0006, 1.0006, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 1.06409, 1.00026, 0.99973, 0.99973, 0.99973, 0.99973, 1, 0.99973, 1, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 0.99977, 1, 0.99977, 1, 0.99977, 1, 0.99977, 1, 0.99977, 1.0288, 0.99977, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 0.99924, 1.0006, 1.0006, 0.99946, 1.00034, 1, 0.99924, 1.00001, 1, 1, 0.99973, 0.99924, 0.99973, 0.99924, 0.99973, 1.06311, 0.99973, 1.00024, 0.99973, 0.99924, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 1.00041, 0.9998, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 1, 1.00016, 0.99977, 0.99998, 0.99977, 0.99998, 0.99977, 0.99998, 1.00001, 1, 1.00001, 1, 1.00001, 1, 1.00001, 1, 1.00026, 1.0006, 1.00026, 0.89547, 1.00026, 1.0006, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 1.00016, 0.99977, 1.00001, 1, 1.00001, 1.00026, 1, 1.00026, 1, 1.00026, 1, 0.99924, 0.99973, 1.00001, 0.99973, 1, 0.99982, 1.00022, 1.00026, 1.00001, 1, 1.00026, 1.0006, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 1.00001, 1, 1.00054, 0.99977, 1.00084, 1.00007, 0.99973, 1.00013, 0.99924, 1.00001, 1.00001, 0.99945, 0.91221, 1.00001, 1.00026, 0.99977, 1.00022, 1.0006, 1.00001, 1.00001, 0.99999, 0.99977, 0.99933, 1.00022, 1.00054, 1.00001, 1.00065, 1.00026, 1.00001, 1.0001, 1.00001, 1.00052, 1, 1.0006, 1.00001, 0.99945, 0.99897, 0.99968, 0.99924, 1.00036, 0.99945, 0.99949, 1, 1.0006, 0.99897, 0.99918, 0.99968, 0.99911, 0.99924, 1, 0.99962, 1.01487, 1, 1.0005, 0.99973, 1.00012, 1.00043, 1, 0.99995, 0.99994, 1.00036, 0.99947, 1.00019, 1.00063, 1.00025, 0.99924, 1.00036, 0.99973, 1.00036, 1.00025, 1.00001, 1.00001, 1.00027, 1.0001, 1.00068, 1.00001, 1.0006, 1.0006, 1, 1.00008, 0.99957, 0.99972, 0.9994, 0.99954, 0.99975, 1.00051, 1.00001, 1.00019, 1.00001, 1.0001, 0.99986, 1.00001, 1.00001, 1.00038, 0.99954, 0.99954, 0.9994, 1.00066, 0.99999, 0.99977, 1.00022, 1.00054, 1.00001, 0.99977, 1.00026, 0.99975, 1.0001, 1.00001, 0.99993, 0.9995, 0.99955, 1.00016, 0.99978, 0.99974, 1.00019, 1.00022, 0.99955, 1.00053, 0.99973, 1.00089, 1.00005, 0.99967, 1.00048, 0.99973, 1.00002, 1.00034, 0.99973, 0.99973, 0.99964, 1.00006, 1.00066, 0.99947, 0.99973, 0.98894, 0.99973, 1, 0.44898, 1, 0.99946, 1, 1.00039, 1.00082, 0.99991, 0.99991, 0.99985, 1.00022, 1.00023, 1.00061, 1.00006, 0.99966, 0.99973, 0.99973, 0.99973, 1.00019, 1.0008, 1, 0.99924, 0.99924, 0.99924, 0.99983, 1.00044, 0.99973, 0.99964, 0.98332, 1, 0.99973, 1, 1, 0.99962, 0.99895, 1.00016, 0.99977, 1.00016, 0.99977, 1.00016, 0.99977, 1.00001, 1, 1, 1, 0.99973, 1, 1, 0.99955, 0.99924, 0.99924, 0.99924, 0.99924, 0.99998, 0.99998, 0.99998, 0.99973, 0.99973, 0.99972, 1, 1, 1.00267, 0.99999, 0.99998, 0.99998, 1, 0.99998, 1.66475, 1, 0.99973, 0.99973, 1.00023, 0.99973, 1.00423, 0.99925, 0.99999, 1, 0.99991, 0.99984, 1.00002, 1.00002, 1.00002, 1.00002, 1.00049, 1, 1.00245, 1, 1, 1, 1, 0.96329, 1, 1.20985, 1.39713, 1.00003, 0.8254, 1.00015, 1, 1.00035, 1.00027, 1.00031, 1.00031, 1.00003, 1.00031, 1.00031, 0.99999, 1.00003, 0.99999, 0.99999, 1.41144, 1.6, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.40579, 1.40579, 1.36625, 0.99999, 1, 0.99861, 0.99861, 1, 1.00026, 1.00026, 1.00026, 1.00026, 0.95317, 0.99999, 0.99999, 0.99999, 0.99999, 1.40483, 1, 0.99977, 1.00054, 1, 1, 0.99953, 0.99962, 1.00042, 0.9995, 1, 1, 1, 1, 1, 1, 1, 1, 0.99998, 0.99998, 0.99998, 0.99998, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.HelveticaItalicFactors = HelveticaItalicFactors;
+const HelveticaItalicMetrics = {
+  lineHeight: 1.35,
+  lineGap: 0.2
+};
+exports.HelveticaItalicMetrics = HelveticaItalicMetrics;
+const HelveticaRegularFactors = [0.76116, 1, 1, 1.0006, 1.0006, 1.00006, 0.99973, 0.99973, 0.99982, 1.00001, 1.00043, 0.99998, 0.99998, 0.99959, 1.00003, 1.0006, 0.99998, 1.0006, 1.0006, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 1.0006, 1, 1.00003, 1.00003, 1.00003, 0.99973, 0.99987, 1.00001, 1.00001, 0.99977, 0.99977, 1.00001, 1.00026, 1.00022, 0.99977, 1.0006, 1, 1.00001, 0.99973, 0.99999, 0.99977, 1.00022, 1.00001, 1.00022, 0.99977, 1.00001, 1.00026, 0.99977, 1.00001, 1.00016, 1.00001, 1.00001, 1.00026, 1.0006, 1.0006, 1.0006, 0.99949, 0.99973, 0.99998, 0.99973, 0.99973, 1, 0.99973, 0.99973, 1.0006, 0.99973, 0.99973, 0.99924, 0.99924, 1, 0.99924, 0.99999, 0.99973, 0.99973, 0.99973, 0.99973, 0.99998, 1, 1.0006, 0.99973, 1, 0.99977, 1, 1, 1, 1.00005, 1.0009, 1.00005, 1.00003, 0.99998, 0.99973, 0.99973, 0.99973, 0.99973, 1.0009, 0.99973, 0.99998, 1.00025, 0.99968, 0.99973, 1.00003, 1.00025, 0.60299, 1.00024, 1.06409, 1, 1, 0.99998, 1, 0.9998, 1.0006, 0.99998, 1, 0.99936, 0.99973, 1.00002, 1.00002, 1.00002, 1.00026, 1.00001, 1.00001, 1.00001, 1.00001, 1.00001, 1.00001, 1, 0.99977, 1.00001, 1.00001, 1.00001, 1.00001, 1.0006, 1.0006, 1.0006, 1.0006, 0.99977, 0.99977, 1.00022, 1.00022, 1.00022, 1.00022, 1.00022, 1.00003, 1.00022, 0.99977, 0.99977, 0.99977, 0.99977, 1.00001, 1.00001, 1.00026, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99982, 1, 0.99973, 0.99973, 0.99973, 0.99973, 1.0006, 1.0006, 1.0006, 1.0006, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 1.06409, 1.00026, 0.99973, 0.99973, 0.99973, 0.99973, 1, 0.99973, 1, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 0.99977, 1, 0.99977, 1, 0.99977, 1, 0.99977, 1, 0.99977, 1.04596, 0.99977, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00001, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 1.0006, 0.99924, 1.0006, 1.0006, 1.00019, 1.00034, 1, 0.99924, 1.00001, 1, 1, 0.99973, 0.99924, 0.99973, 0.99924, 0.99973, 1.02572, 0.99973, 1.00005, 0.99973, 0.99924, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99999, 0.9998, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 1.00022, 0.99973, 1, 1.00016, 0.99977, 0.99998, 0.99977, 0.99998, 0.99977, 0.99998, 1.00001, 1, 1.00001, 1, 1.00001, 1, 1.00001, 1, 1.00026, 1.0006, 1.00026, 0.84533, 1.00026, 1.0006, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 0.99977, 0.99973, 1.00016, 0.99977, 1.00001, 1, 1.00001, 1.00026, 1, 1.00026, 1, 1.00026, 1, 0.99924, 0.99973, 1.00001, 0.99973, 1, 0.99982, 1.00022, 1.00026, 1.00001, 1, 1.00026, 1.0006, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99998, 0.99928, 1, 0.99977, 1.00013, 1.00055, 0.99947, 0.99945, 0.99941, 0.99924, 1.00001, 1.00001, 1.0004, 0.91621, 1.00001, 1.00026, 0.99977, 1.00022, 1.0006, 1.00001, 1.00005, 0.99999, 0.99977, 1.00015, 1.00022, 0.99977, 1.00001, 0.99973, 1.00026, 1.00001, 1.00019, 1.00001, 0.99946, 1, 1.0006, 1.00001, 0.99978, 1.00045, 0.99973, 0.99924, 1.00023, 0.99978, 0.99966, 1, 1.00065, 1.00045, 1.00019, 0.99973, 0.99973, 0.99924, 1, 1, 0.96499, 1, 1.00055, 0.99973, 1.00008, 1.00027, 1, 0.9997, 0.99995, 1.00023, 0.99933, 1.00019, 1.00015, 1.00031, 0.99924, 1.00023, 0.99973, 1.00023, 1.00031, 1.00001, 0.99928, 1.00029, 1.00092, 1.00035, 1.00001, 1.0006, 1.0006, 1, 0.99988, 0.99975, 1, 1.00082, 0.99561, 0.9996, 1.00035, 1.00001, 0.99962, 1.00001, 1.00092, 0.99964, 1.00001, 0.99963, 0.99999, 1.00035, 1.00035, 1.00082, 0.99962, 0.99999, 0.99977, 1.00022, 1.00035, 1.00001, 0.99977, 1.00026, 0.9996, 0.99967, 1.00001, 1.00034, 1.00074, 1.00054, 1.00053, 1.00063, 0.99971, 0.99962, 1.00035, 0.99975, 0.99977, 0.99973, 1.00043, 0.99953, 1.0007, 0.99915, 0.99973, 1.00008, 0.99892, 1.00073, 1.00073, 1.00114, 0.99915, 1.00073, 0.99955, 0.99973, 1.00092, 0.99973, 1, 0.99998, 1, 1.0003, 1, 1.00043, 1.00001, 0.99969, 1.0003, 1, 1.00035, 1.00001, 0.9995, 1, 1.00092, 0.99973, 0.99973, 0.99973, 1.0007, 0.9995, 1, 0.99924, 1.0006, 0.99924, 0.99972, 1.00062, 0.99973, 1.00114, 1.00073, 1, 0.99955, 1, 1, 1.00047, 0.99968, 1.00016, 0.99977, 1.00016, 0.99977, 1.00016, 0.99977, 1.00001, 1, 1, 1, 0.99973, 1, 1, 0.99955, 0.99924, 0.99924, 0.99924, 0.99924, 0.99998, 0.99998, 0.99998, 0.99973, 0.99973, 0.99972, 1, 1, 1.00267, 0.99999, 0.99998, 0.99998, 1, 0.99998, 1.66475, 1, 0.99973, 0.99973, 1.00023, 0.99973, 0.99971, 0.99925, 1.00023, 1, 0.99991, 0.99984, 1.00002, 1.00002, 1.00002, 1.00002, 1, 1, 1, 1, 1, 1, 1, 0.96329, 1, 1.20985, 1.39713, 1.00003, 0.8254, 1.00015, 1, 1.00035, 1.00027, 1.00031, 1.00031, 0.99915, 1.00031, 1.00031, 0.99999, 1.00003, 0.99999, 0.99999, 1.41144, 1.6, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.41144, 1.40579, 1.40579, 1.36625, 0.99999, 1, 0.99861, 0.99861, 1, 1.00026, 1.00026, 1.00026, 1.00026, 0.95317, 0.99999, 0.99999, 0.99999, 0.99999, 1.40483, 1, 0.99977, 1.00054, 1, 1, 0.99953, 0.99962, 1.00042, 0.9995, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.HelveticaRegularFactors = HelveticaRegularFactors;
+const HelveticaRegularMetrics = {
+  lineHeight: 1.2,
+  lineGap: 0.2
+};
+exports.HelveticaRegularMetrics = HelveticaRegularMetrics;
+
+/***/ }),
+/* 54 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.LiberationSansRegularWidths = exports.LiberationSansRegularMapping = exports.LiberationSansItalicWidths = exports.LiberationSansItalicMapping = exports.LiberationSansBoldWidths = exports.LiberationSansBoldMapping = exports.LiberationSansBoldItalicWidths = exports.LiberationSansBoldItalicMapping = void 0;
+const LiberationSansBoldWidths = [365, 0, 333, 278, 333, 474, 556, 556, 889, 722, 238, 333, 333, 389, 584, 278, 333, 278, 278, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 333, 333, 584, 584, 584, 611, 975, 722, 722, 722, 722, 667, 611, 778, 722, 278, 556, 722, 611, 833, 722, 778, 667, 778, 722, 667, 611, 722, 667, 944, 667, 667, 611, 333, 278, 333, 584, 556, 333, 556, 611, 556, 611, 556, 333, 611, 611, 278, 278, 556, 278, 889, 611, 611, 611, 611, 389, 556, 333, 611, 556, 778, 556, 556, 500, 389, 280, 389, 584, 333, 556, 556, 556, 556, 280, 556, 333, 737, 370, 556, 584, 737, 552, 400, 549, 333, 333, 333, 576, 556, 278, 333, 333, 365, 556, 834, 834, 834, 611, 722, 722, 722, 722, 722, 722, 1000, 722, 667, 667, 667, 667, 278, 278, 278, 278, 722, 722, 778, 778, 778, 778, 778, 584, 778, 722, 722, 722, 722, 667, 667, 611, 556, 556, 556, 556, 556, 556, 889, 556, 556, 556, 556, 556, 278, 278, 278, 278, 611, 611, 611, 611, 611, 611, 611, 549, 611, 611, 611, 611, 611, 556, 611, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 719, 722, 611, 667, 556, 667, 556, 667, 556, 667, 556, 667, 556, 778, 611, 778, 611, 778, 611, 778, 611, 722, 611, 722, 611, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 785, 556, 556, 278, 722, 556, 556, 611, 278, 611, 278, 611, 385, 611, 479, 611, 278, 722, 611, 722, 611, 722, 611, 708, 723, 611, 778, 611, 778, 611, 778, 611, 1000, 944, 722, 389, 722, 389, 722, 389, 667, 556, 667, 556, 667, 556, 667, 556, 611, 333, 611, 479, 611, 333, 722, 611, 722, 611, 722, 611, 722, 611, 722, 611, 722, 611, 944, 778, 667, 556, 667, 611, 500, 611, 500, 611, 500, 278, 556, 722, 556, 1000, 889, 778, 611, 667, 556, 611, 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, 465, 722, 333, 853, 906, 474, 825, 927, 838, 278, 722, 722, 601, 719, 667, 611, 722, 778, 278, 722, 667, 833, 722, 644, 778, 722, 667, 600, 611, 667, 821, 667, 809, 802, 278, 667, 615, 451, 611, 278, 582, 615, 610, 556, 606, 475, 460, 611, 541, 278, 558, 556, 612, 556, 445, 611, 766, 619, 520, 684, 446, 582, 715, 576, 753, 845, 278, 582, 611, 582, 845, 667, 669, 885, 567, 711, 667, 278, 276, 556, 1094, 1062, 875, 610, 722, 622, 719, 722, 719, 722, 567, 712, 667, 904, 626, 719, 719, 610, 702, 833, 722, 778, 719, 667, 722, 611, 622, 854, 667, 730, 703, 1005, 1019, 870, 979, 719, 711, 1031, 719, 556, 618, 615, 417, 635, 556, 709, 497, 615, 615, 500, 635, 740, 604, 611, 604, 611, 556, 490, 556, 875, 556, 615, 581, 833, 844, 729, 854, 615, 552, 854, 583, 556, 556, 611, 417, 552, 556, 278, 281, 278, 969, 906, 611, 500, 615, 556, 604, 778, 611, 487, 447, 944, 778, 944, 778, 944, 778, 667, 556, 333, 333, 556, 1000, 1000, 552, 278, 278, 278, 278, 500, 500, 500, 556, 556, 350, 1000, 1000, 240, 479, 333, 333, 604, 333, 167, 396, 556, 556, 1094, 556, 885, 489, 1115, 1000, 768, 600, 834, 834, 834, 834, 1000, 500, 1000, 500, 1000, 500, 500, 494, 612, 823, 713, 584, 549, 713, 979, 722, 274, 549, 549, 583, 549, 549, 604, 584, 604, 604, 708, 625, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 729, 604, 604, 354, 354, 1000, 990, 990, 990, 990, 494, 604, 604, 604, 604, 354, 1021, 1052, 917, 750, 750, 531, 656, 594, 510, 500, 750, 750, 611, 611, 333, 333, 333, 333, 333, 333, 333, 333, 222, 222, 333, 333, 333, 333, 333, 333, 333, 333];
+exports.LiberationSansBoldWidths = LiberationSansBoldWidths;
+const LiberationSansBoldMapping = [-1, -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 402, 506, 507, 508, 509, 510, 511, 536, 537, 538, 539, 710, 711, 713, 728, 729, 730, 731, 732, 733, 900, 901, 902, 903, 904, 905, 906, 908, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1138, 1139, 1168, 1169, 7808, 7809, 7810, 7811, 7812, 7813, 7922, 7923, 8208, 8209, 8211, 8212, 8213, 8215, 8216, 8217, 8218, 8219, 8220, 8221, 8222, 8224, 8225, 8226, 8230, 8240, 8242, 8243, 8249, 8250, 8252, 8254, 8260, 8319, 8355, 8356, 8359, 8364, 8453, 8467, 8470, 8482, 8486, 8494, 8539, 8540, 8541, 8542, 8592, 8593, 8594, 8595, 8596, 8597, 8616, 8706, 8710, 8719, 8721, 8722, 8730, 8734, 8735, 8745, 8747, 8776, 8800, 8801, 8804, 8805, 8962, 8976, 8992, 8993, 9472, 9474, 9484, 9488, 9492, 9496, 9500, 9508, 9516, 9524, 9532, 9552, 9553, 9554, 9555, 9556, 9557, 9558, 9559, 9560, 9561, 9562, 9563, 9564, 9565, 9566, 9567, 9568, 9569, 9570, 9571, 9572, 9573, 9574, 9575, 9576, 9577, 9578, 9579, 9580, 9600, 9604, 9608, 9612, 9616, 9617, 9618, 9619, 9632, 9633, 9642, 9643, 9644, 9650, 9658, 9660, 9668, 9674, 9675, 9679, 9688, 9689, 9702, 9786, 9787, 9788, 9792, 9794, 9824, 9827, 9829, 9830, 9834, 9835, 9836, 61441, 61442, 61445, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1];
+exports.LiberationSansBoldMapping = LiberationSansBoldMapping;
+const LiberationSansBoldItalicWidths = [365, 0, 333, 278, 333, 474, 556, 556, 889, 722, 238, 333, 333, 389, 584, 278, 333, 278, 278, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 333, 333, 584, 584, 584, 611, 975, 722, 722, 722, 722, 667, 611, 778, 722, 278, 556, 722, 611, 833, 722, 778, 667, 778, 722, 667, 611, 722, 667, 944, 667, 667, 611, 333, 278, 333, 584, 556, 333, 556, 611, 556, 611, 556, 333, 611, 611, 278, 278, 556, 278, 889, 611, 611, 611, 611, 389, 556, 333, 611, 556, 778, 556, 556, 500, 389, 280, 389, 584, 333, 556, 556, 556, 556, 280, 556, 333, 737, 370, 556, 584, 737, 552, 400, 549, 333, 333, 333, 576, 556, 278, 333, 333, 365, 556, 834, 834, 834, 611, 722, 722, 722, 722, 722, 722, 1000, 722, 667, 667, 667, 667, 278, 278, 278, 278, 722, 722, 778, 778, 778, 778, 778, 584, 778, 722, 722, 722, 722, 667, 667, 611, 556, 556, 556, 556, 556, 556, 889, 556, 556, 556, 556, 556, 278, 278, 278, 278, 611, 611, 611, 611, 611, 611, 611, 549, 611, 611, 611, 611, 611, 556, 611, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 740, 722, 611, 667, 556, 667, 556, 667, 556, 667, 556, 667, 556, 778, 611, 778, 611, 778, 611, 778, 611, 722, 611, 722, 611, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 782, 556, 556, 278, 722, 556, 556, 611, 278, 611, 278, 611, 396, 611, 479, 611, 278, 722, 611, 722, 611, 722, 611, 708, 723, 611, 778, 611, 778, 611, 778, 611, 1000, 944, 722, 389, 722, 389, 722, 389, 667, 556, 667, 556, 667, 556, 667, 556, 611, 333, 611, 479, 611, 333, 722, 611, 722, 611, 722, 611, 722, 611, 722, 611, 722, 611, 944, 778, 667, 556, 667, 611, 500, 611, 500, 611, 500, 278, 556, 722, 556, 1000, 889, 778, 611, 667, 556, 611, 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, 722, 333, 854, 906, 473, 844, 930, 847, 278, 722, 722, 610, 671, 667, 611, 722, 778, 278, 722, 667, 833, 722, 657, 778, 718, 667, 590, 611, 667, 822, 667, 829, 781, 278, 667, 620, 479, 611, 278, 591, 620, 621, 556, 610, 479, 492, 611, 558, 278, 566, 556, 603, 556, 450, 611, 712, 605, 532, 664, 409, 591, 704, 578, 773, 834, 278, 591, 611, 591, 834, 667, 667, 886, 614, 719, 667, 278, 278, 556, 1094, 1042, 854, 622, 719, 677, 719, 722, 708, 722, 614, 722, 667, 927, 643, 719, 719, 615, 687, 833, 722, 778, 719, 667, 722, 611, 677, 781, 667, 729, 708, 979, 989, 854, 1000, 708, 719, 1042, 729, 556, 619, 604, 534, 618, 556, 736, 510, 611, 611, 507, 622, 740, 604, 611, 611, 611, 556, 889, 556, 885, 556, 646, 583, 889, 935, 707, 854, 594, 552, 865, 589, 556, 556, 611, 469, 563, 556, 278, 278, 278, 969, 906, 611, 507, 619, 556, 611, 778, 611, 575, 467, 944, 778, 944, 778, 944, 778, 667, 556, 333, 333, 556, 1000, 1000, 552, 278, 278, 278, 278, 500, 500, 500, 556, 556, 350, 1000, 1000, 240, 479, 333, 333, 604, 333, 167, 396, 556, 556, 1104, 556, 885, 516, 1146, 1000, 768, 600, 834, 834, 834, 834, 999, 500, 1000, 500, 1000, 500, 500, 494, 612, 823, 713, 584, 549, 713, 979, 722, 274, 549, 549, 583, 549, 549, 604, 584, 604, 604, 708, 625, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 729, 604, 604, 354, 354, 1000, 990, 990, 990, 990, 494, 604, 604, 604, 604, 354, 1021, 1052, 917, 750, 750, 531, 656, 594, 510, 500, 750, 750, 611, 611, 333, 333, 333, 333, 333, 333, 333, 333, 222, 222, 333, 333, 333, 333, 333, 333, 333, 333];
+exports.LiberationSansBoldItalicWidths = LiberationSansBoldItalicWidths;
+const LiberationSansBoldItalicMapping = [-1, -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 402, 506, 507, 508, 509, 510, 511, 536, 537, 538, 539, 710, 711, 713, 728, 729, 730, 731, 732, 733, 900, 901, 902, 903, 904, 905, 906, 908, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1138, 1139, 1168, 1169, 7808, 7809, 7810, 7811, 7812, 7813, 7922, 7923, 8208, 8209, 8211, 8212, 8213, 8215, 8216, 8217, 8218, 8219, 8220, 8221, 8222, 8224, 8225, 8226, 8230, 8240, 8242, 8243, 8249, 8250, 8252, 8254, 8260, 8319, 8355, 8356, 8359, 8364, 8453, 8467, 8470, 8482, 8486, 8494, 8539, 8540, 8541, 8542, 8592, 8593, 8594, 8595, 8596, 8597, 8616, 8706, 8710, 8719, 8721, 8722, 8730, 8734, 8735, 8745, 8747, 8776, 8800, 8801, 8804, 8805, 8962, 8976, 8992, 8993, 9472, 9474, 9484, 9488, 9492, 9496, 9500, 9508, 9516, 9524, 9532, 9552, 9553, 9554, 9555, 9556, 9557, 9558, 9559, 9560, 9561, 9562, 9563, 9564, 9565, 9566, 9567, 9568, 9569, 9570, 9571, 9572, 9573, 9574, 9575, 9576, 9577, 9578, 9579, 9580, 9600, 9604, 9608, 9612, 9616, 9617, 9618, 9619, 9632, 9633, 9642, 9643, 9644, 9650, 9658, 9660, 9668, 9674, 9675, 9679, 9688, 9689, 9702, 9786, 9787, 9788, 9792, 9794, 9824, 9827, 9829, 9830, 9834, 9835, 9836, 61441, 61442, 61445, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1];
+exports.LiberationSansBoldItalicMapping = LiberationSansBoldItalicMapping;
+const LiberationSansItalicWidths = [365, 0, 333, 278, 278, 355, 556, 556, 889, 667, 191, 333, 333, 389, 584, 278, 333, 278, 278, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 278, 278, 584, 584, 584, 556, 1015, 667, 667, 722, 722, 667, 611, 778, 722, 278, 500, 667, 556, 833, 722, 778, 667, 778, 722, 667, 611, 722, 667, 944, 667, 667, 611, 278, 278, 278, 469, 556, 333, 556, 556, 500, 556, 556, 278, 556, 556, 222, 222, 500, 222, 833, 556, 556, 556, 556, 333, 500, 278, 556, 500, 722, 500, 500, 500, 334, 260, 334, 584, 333, 556, 556, 556, 556, 260, 556, 333, 737, 370, 556, 584, 737, 552, 400, 549, 333, 333, 333, 576, 537, 278, 333, 333, 365, 556, 834, 834, 834, 611, 667, 667, 667, 667, 667, 667, 1000, 722, 667, 667, 667, 667, 278, 278, 278, 278, 722, 722, 778, 778, 778, 778, 778, 584, 778, 722, 722, 722, 722, 667, 667, 611, 556, 556, 556, 556, 556, 556, 889, 500, 556, 556, 556, 556, 278, 278, 278, 278, 556, 556, 556, 556, 556, 556, 556, 549, 611, 556, 556, 556, 556, 500, 556, 500, 667, 556, 667, 556, 667, 556, 722, 500, 722, 500, 722, 500, 722, 500, 722, 625, 722, 556, 667, 556, 667, 556, 667, 556, 667, 556, 667, 556, 778, 556, 778, 556, 778, 556, 778, 556, 722, 556, 722, 556, 278, 278, 278, 278, 278, 278, 278, 222, 278, 278, 733, 444, 500, 222, 667, 500, 500, 556, 222, 556, 222, 556, 281, 556, 400, 556, 222, 722, 556, 722, 556, 722, 556, 615, 723, 556, 778, 556, 778, 556, 778, 556, 1000, 944, 722, 333, 722, 333, 722, 333, 667, 500, 667, 500, 667, 500, 667, 500, 611, 278, 611, 354, 611, 278, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 944, 722, 667, 500, 667, 611, 500, 611, 500, 611, 500, 222, 556, 667, 556, 1000, 889, 778, 611, 667, 500, 611, 278, 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, 667, 278, 789, 846, 389, 794, 865, 775, 222, 667, 667, 570, 671, 667, 611, 722, 778, 278, 667, 667, 833, 722, 648, 778, 725, 667, 600, 611, 667, 837, 667, 831, 761, 278, 667, 570, 439, 555, 222, 550, 570, 571, 500, 556, 439, 463, 555, 542, 222, 500, 492, 548, 500, 447, 556, 670, 573, 486, 603, 374, 550, 652, 546, 728, 779, 222, 550, 556, 550, 779, 667, 667, 843, 544, 708, 667, 278, 278, 500, 1066, 982, 844, 589, 715, 639, 724, 667, 651, 667, 544, 704, 667, 917, 614, 715, 715, 589, 686, 833, 722, 778, 725, 667, 722, 611, 639, 795, 667, 727, 673, 920, 923, 805, 886, 651, 694, 1022, 682, 556, 562, 522, 493, 553, 556, 688, 465, 556, 556, 472, 564, 686, 550, 556, 556, 556, 500, 833, 500, 835, 500, 572, 518, 830, 851, 621, 736, 526, 492, 752, 534, 556, 556, 556, 378, 496, 500, 222, 222, 222, 910, 828, 556, 472, 565, 500, 556, 778, 556, 492, 339, 944, 722, 944, 722, 944, 722, 667, 500, 333, 333, 556, 1000, 1000, 552, 222, 222, 222, 222, 333, 333, 333, 556, 556, 350, 1000, 1000, 188, 354, 333, 333, 500, 333, 167, 365, 556, 556, 1094, 556, 885, 323, 1083, 1000, 768, 600, 834, 834, 834, 834, 1000, 500, 998, 500, 1000, 500, 500, 494, 612, 823, 713, 584, 549, 713, 979, 719, 274, 549, 549, 584, 549, 549, 604, 584, 604, 604, 708, 625, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 729, 604, 604, 354, 354, 1000, 990, 990, 990, 990, 494, 604, 604, 604, 604, 354, 1021, 1052, 917, 750, 750, 531, 656, 594, 510, 500, 750, 750, 500, 500, 333, 333, 333, 333, 333, 333, 333, 333, 222, 222, 294, 294, 324, 324, 316, 328, 398, 285];
+exports.LiberationSansItalicWidths = LiberationSansItalicWidths;
+const LiberationSansItalicMapping = [-1, -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 402, 506, 507, 508, 509, 510, 511, 536, 537, 538, 539, 710, 711, 713, 728, 729, 730, 731, 732, 733, 900, 901, 902, 903, 904, 905, 906, 908, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1138, 1139, 1168, 1169, 7808, 7809, 7810, 7811, 7812, 7813, 7922, 7923, 8208, 8209, 8211, 8212, 8213, 8215, 8216, 8217, 8218, 8219, 8220, 8221, 8222, 8224, 8225, 8226, 8230, 8240, 8242, 8243, 8249, 8250, 8252, 8254, 8260, 8319, 8355, 8356, 8359, 8364, 8453, 8467, 8470, 8482, 8486, 8494, 8539, 8540, 8541, 8542, 8592, 8593, 8594, 8595, 8596, 8597, 8616, 8706, 8710, 8719, 8721, 8722, 8730, 8734, 8735, 8745, 8747, 8776, 8800, 8801, 8804, 8805, 8962, 8976, 8992, 8993, 9472, 9474, 9484, 9488, 9492, 9496, 9500, 9508, 9516, 9524, 9532, 9552, 9553, 9554, 9555, 9556, 9557, 9558, 9559, 9560, 9561, 9562, 9563, 9564, 9565, 9566, 9567, 9568, 9569, 9570, 9571, 9572, 9573, 9574, 9575, 9576, 9577, 9578, 9579, 9580, 9600, 9604, 9608, 9612, 9616, 9617, 9618, 9619, 9632, 9633, 9642, 9643, 9644, 9650, 9658, 9660, 9668, 9674, 9675, 9679, 9688, 9689, 9702, 9786, 9787, 9788, 9792, 9794, 9824, 9827, 9829, 9830, 9834, 9835, 9836, 61441, 61442, 61445, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1];
+exports.LiberationSansItalicMapping = LiberationSansItalicMapping;
+const LiberationSansRegularWidths = [365, 0, 333, 278, 278, 355, 556, 556, 889, 667, 191, 333, 333, 389, 584, 278, 333, 278, 278, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 278, 278, 584, 584, 584, 556, 1015, 667, 667, 722, 722, 667, 611, 778, 722, 278, 500, 667, 556, 833, 722, 778, 667, 778, 722, 667, 611, 722, 667, 944, 667, 667, 611, 278, 278, 278, 469, 556, 333, 556, 556, 500, 556, 556, 278, 556, 556, 222, 222, 500, 222, 833, 556, 556, 556, 556, 333, 500, 278, 556, 500, 722, 500, 500, 500, 334, 260, 334, 584, 333, 556, 556, 556, 556, 260, 556, 333, 737, 370, 556, 584, 737, 552, 400, 549, 333, 333, 333, 576, 537, 278, 333, 333, 365, 556, 834, 834, 834, 611, 667, 667, 667, 667, 667, 667, 1000, 722, 667, 667, 667, 667, 278, 278, 278, 278, 722, 722, 778, 778, 778, 778, 778, 584, 778, 722, 722, 722, 722, 667, 667, 611, 556, 556, 556, 556, 556, 556, 889, 500, 556, 556, 556, 556, 278, 278, 278, 278, 556, 556, 556, 556, 556, 556, 556, 549, 611, 556, 556, 556, 556, 500, 556, 500, 667, 556, 667, 556, 667, 556, 722, 500, 722, 500, 722, 500, 722, 500, 722, 615, 722, 556, 667, 556, 667, 556, 667, 556, 667, 556, 667, 556, 778, 556, 778, 556, 778, 556, 778, 556, 722, 556, 722, 556, 278, 278, 278, 278, 278, 278, 278, 222, 278, 278, 735, 444, 500, 222, 667, 500, 500, 556, 222, 556, 222, 556, 292, 556, 334, 556, 222, 722, 556, 722, 556, 722, 556, 604, 723, 556, 778, 556, 778, 556, 778, 556, 1000, 944, 722, 333, 722, 333, 722, 333, 667, 500, 667, 500, 667, 500, 667, 500, 611, 278, 611, 375, 611, 278, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 722, 556, 944, 722, 667, 500, 667, 611, 500, 611, 500, 611, 500, 222, 556, 667, 556, 1000, 889, 778, 611, 667, 500, 611, 278, 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, 667, 278, 784, 838, 384, 774, 855, 752, 222, 667, 667, 551, 668, 667, 611, 722, 778, 278, 667, 668, 833, 722, 650, 778, 722, 667, 618, 611, 667, 798, 667, 835, 748, 278, 667, 578, 446, 556, 222, 547, 578, 575, 500, 557, 446, 441, 556, 556, 222, 500, 500, 576, 500, 448, 556, 690, 569, 482, 617, 395, 547, 648, 525, 713, 781, 222, 547, 556, 547, 781, 667, 667, 865, 542, 719, 667, 278, 278, 500, 1057, 1010, 854, 583, 722, 635, 719, 667, 656, 667, 542, 677, 667, 923, 604, 719, 719, 583, 656, 833, 722, 778, 719, 667, 722, 611, 635, 760, 667, 740, 667, 917, 938, 792, 885, 656, 719, 1010, 722, 556, 573, 531, 365, 583, 556, 669, 458, 559, 559, 438, 583, 688, 552, 556, 542, 556, 500, 458, 500, 823, 500, 573, 521, 802, 823, 625, 719, 521, 510, 750, 542, 556, 556, 556, 365, 510, 500, 222, 278, 222, 906, 812, 556, 438, 559, 500, 552, 778, 556, 489, 411, 944, 722, 944, 722, 944, 722, 667, 500, 333, 333, 556, 1000, 1000, 552, 222, 222, 222, 222, 333, 333, 333, 556, 556, 350, 1000, 1000, 188, 354, 333, 333, 500, 333, 167, 365, 556, 556, 1094, 556, 885, 323, 1073, 1000, 768, 600, 834, 834, 834, 834, 1000, 500, 1000, 500, 1000, 500, 500, 494, 612, 823, 713, 584, 549, 713, 979, 719, 274, 549, 549, 583, 549, 549, 604, 584, 604, 604, 708, 625, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 708, 729, 604, 604, 354, 354, 1000, 990, 990, 990, 990, 494, 604, 604, 604, 604, 354, 1021, 1052, 917, 750, 750, 531, 656, 594, 510, 500, 750, 750, 500, 500, 333, 333, 333, 333, 333, 333, 333, 333, 222, 222, 294, 294, 324, 324, 316, 328, 398, 285];
+exports.LiberationSansRegularWidths = LiberationSansRegularWidths;
+const LiberationSansRegularMapping = [-1, -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 402, 506, 507, 508, 509, 510, 511, 536, 537, 538, 539, 710, 711, 713, 728, 729, 730, 731, 732, 733, 900, 901, 902, 903, 904, 905, 906, 908, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1138, 1139, 1168, 1169, 7808, 7809, 7810, 7811, 7812, 7813, 7922, 7923, 8208, 8209, 8211, 8212, 8213, 8215, 8216, 8217, 8218, 8219, 8220, 8221, 8222, 8224, 8225, 8226, 8230, 8240, 8242, 8243, 8249, 8250, 8252, 8254, 8260, 8319, 8355, 8356, 8359, 8364, 8453, 8467, 8470, 8482, 8486, 8494, 8539, 8540, 8541, 8542, 8592, 8593, 8594, 8595, 8596, 8597, 8616, 8706, 8710, 8719, 8721, 8722, 8730, 8734, 8735, 8745, 8747, 8776, 8800, 8801, 8804, 8805, 8962, 8976, 8992, 8993, 9472, 9474, 9484, 9488, 9492, 9496, 9500, 9508, 9516, 9524, 9532, 9552, 9553, 9554, 9555, 9556, 9557, 9558, 9559, 9560, 9561, 9562, 9563, 9564, 9565, 9566, 9567, 9568, 9569, 9570, 9571, 9572, 9573, 9574, 9575, 9576, 9577, 9578, 9579, 9580, 9600, 9604, 9608, 9612, 9616, 9617, 9618, 9619, 9632, 9633, 9642, 9643, 9644, 9650, 9658, 9660, 9668, 9674, 9675, 9679, 9688, 9689, 9702, 9786, 9787, 9788, 9792, 9794, 9824, 9827, 9829, 9830, 9834, 9835, 9836, 61441, 61442, 61445, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1];
+exports.LiberationSansRegularMapping = LiberationSansRegularMapping;
+
+/***/ }),
+/* 55 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.MyriadProRegularMetrics = exports.MyriadProRegularFactors = exports.MyriadProItalicMetrics = exports.MyriadProItalicFactors = exports.MyriadProBoldMetrics = exports.MyriadProBoldItalicMetrics = exports.MyriadProBoldItalicFactors = exports.MyriadProBoldFactors = void 0;
+const MyriadProBoldFactors = [1.36898, 1, 1, 0.72706, 0.80479, 0.83734, 0.98894, 0.99793, 0.9897, 0.93884, 0.86209, 0.94292, 0.94292, 1.16661, 1.02058, 0.93582, 0.96694, 0.93582, 1.19137, 0.99793, 0.99793, 0.99793, 0.99793, 0.99793, 0.99793, 0.99793, 0.99793, 0.99793, 0.99793, 0.78076, 0.78076, 1.02058, 1.02058, 1.02058, 0.72851, 0.78966, 0.90838, 0.83637, 0.82391, 0.96376, 0.80061, 0.86275, 0.8768, 0.95407, 1.0258, 0.73901, 0.85022, 0.83655, 1.0156, 0.95546, 0.92179, 0.87107, 0.92179, 0.82114, 0.8096, 0.89713, 0.94438, 0.95353, 0.94083, 0.91905, 0.90406, 0.9446, 0.94292, 1.18777, 0.94292, 1.02058, 0.89903, 0.90088, 0.94938, 0.97898, 0.81093, 0.97571, 0.94938, 1.024, 0.9577, 0.95933, 0.98621, 1.0474, 0.97455, 0.98981, 0.9672, 0.95933, 0.9446, 0.97898, 0.97407, 0.97646, 0.78036, 1.10208, 0.95442, 0.95298, 0.97579, 0.9332, 0.94039, 0.938, 0.80687, 1.01149, 0.80687, 1.02058, 0.80479, 0.99793, 0.99793, 0.99793, 0.99793, 1.01149, 1.00872, 0.90088, 0.91882, 1.0213, 0.8361, 1.02058, 0.62295, 0.54324, 0.89022, 1.08595, 1, 1, 0.90088, 1, 0.97455, 0.93582, 0.90088, 1, 1.05686, 0.8361, 0.99642, 0.99642, 0.99642, 0.72851, 0.90838, 0.90838, 0.90838, 0.90838, 0.90838, 0.90838, 0.868, 0.82391, 0.80061, 0.80061, 0.80061, 0.80061, 1.0258, 1.0258, 1.0258, 1.0258, 0.97484, 0.95546, 0.92179, 0.92179, 0.92179, 0.92179, 0.92179, 1.02058, 0.92179, 0.94438, 0.94438, 0.94438, 0.94438, 0.90406, 0.86958, 0.98225, 0.94938, 0.94938, 0.94938, 0.94938, 0.94938, 0.94938, 0.9031, 0.81093, 0.94938, 0.94938, 0.94938, 0.94938, 0.98621, 0.98621, 0.98621, 0.98621, 0.93969, 0.95933, 0.9446, 0.9446, 0.9446, 0.9446, 0.9446, 1.08595, 0.9446, 0.95442, 0.95442, 0.95442, 0.95442, 0.94039, 0.97898, 0.94039, 0.90838, 0.94938, 0.90838, 0.94938, 0.90838, 0.94938, 0.82391, 0.81093, 0.82391, 0.81093, 0.82391, 0.81093, 0.82391, 0.81093, 0.96376, 0.84313, 0.97484, 0.97571, 0.80061, 0.94938, 0.80061, 0.94938, 0.80061, 0.94938, 0.80061, 0.94938, 0.80061, 0.94938, 0.8768, 0.9577, 0.8768, 0.9577, 0.8768, 0.9577, 1, 1, 0.95407, 0.95933, 0.97069, 0.95933, 1.0258, 0.98621, 1.0258, 0.98621, 1.0258, 0.98621, 1.0258, 0.98621, 1.0258, 0.98621, 0.887, 1.01591, 0.73901, 1.0474, 1, 1, 0.97455, 0.83655, 0.98981, 1, 1, 0.83655, 0.73977, 0.83655, 0.73903, 0.84638, 1.033, 0.95546, 0.95933, 1, 1, 0.95546, 0.95933, 0.8271, 0.95417, 0.95933, 0.92179, 0.9446, 0.92179, 0.9446, 0.92179, 0.9446, 0.936, 0.91964, 0.82114, 0.97646, 1, 1, 0.82114, 0.97646, 0.8096, 0.78036, 0.8096, 0.78036, 1, 1, 0.8096, 0.78036, 1, 1, 0.89713, 0.77452, 0.89713, 1.10208, 0.94438, 0.95442, 0.94438, 0.95442, 0.94438, 0.95442, 0.94438, 0.95442, 0.94438, 0.95442, 0.94438, 0.95442, 0.94083, 0.97579, 0.90406, 0.94039, 0.90406, 0.9446, 0.938, 0.9446, 0.938, 0.9446, 0.938, 1, 0.99793, 0.90838, 0.94938, 0.868, 0.9031, 0.92179, 0.9446, 1, 1, 0.89713, 1.10208, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90989, 0.9358, 0.91945, 0.83181, 0.75261, 0.87992, 0.82976, 0.96034, 0.83689, 0.97268, 1.0078, 0.90838, 0.83637, 0.8019, 0.90157, 0.80061, 0.9446, 0.95407, 0.92436, 1.0258, 0.85022, 0.97153, 1.0156, 0.95546, 0.89192, 0.92179, 0.92361, 0.87107, 0.96318, 0.89713, 0.93704, 0.95638, 0.91905, 0.91709, 0.92796, 1.0258, 0.93704, 0.94836, 1.0373, 0.95933, 1.0078, 0.95871, 0.94836, 0.96174, 0.92601, 0.9498, 0.98607, 0.95776, 0.95933, 1.05453, 1.0078, 0.98275, 0.9314, 0.95617, 0.91701, 1.05993, 0.9446, 0.78367, 0.9553, 1, 0.86832, 1.0128, 0.95871, 0.99394, 0.87548, 0.96361, 0.86774, 1.0078, 0.95871, 0.9446, 0.95871, 0.86774, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.94083, 0.97579, 0.94083, 0.97579, 0.94083, 0.97579, 0.90406, 0.94039, 0.96694, 1, 0.89903, 1, 1, 1, 0.93582, 0.93582, 0.93582, 1, 0.908, 0.908, 0.918, 0.94219, 0.94219, 0.96544, 1, 1.285, 1, 1, 0.81079, 0.81079, 1, 1, 0.74854, 1, 1, 1, 1, 0.99793, 1, 1, 1, 0.65, 1, 1.36145, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.17173, 1, 0.80535, 0.76169, 1.02058, 1.0732, 1.05486, 1, 1, 1.30692, 1.08595, 1.08595, 1, 1.08595, 1.08595, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.16161, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.MyriadProBoldFactors = MyriadProBoldFactors;
+const MyriadProBoldMetrics = {
+  lineHeight: 1.2,
+  lineGap: 0.2
+};
+exports.MyriadProBoldMetrics = MyriadProBoldMetrics;
+const MyriadProBoldItalicFactors = [1.36898, 1, 1, 0.66227, 0.80779, 0.81625, 0.97276, 0.97276, 0.97733, 0.92222, 0.83266, 0.94292, 0.94292, 1.16148, 1.02058, 0.93582, 0.96694, 0.93582, 1.17337, 0.97276, 0.97276, 0.97276, 0.97276, 0.97276, 0.97276, 0.97276, 0.97276, 0.97276, 0.97276, 0.78076, 0.78076, 1.02058, 1.02058, 1.02058, 0.71541, 0.76813, 0.85576, 0.80591, 0.80729, 0.94299, 0.77512, 0.83655, 0.86523, 0.92222, 0.98621, 0.71743, 0.81698, 0.79726, 0.98558, 0.92222, 0.90637, 0.83809, 0.90637, 0.80729, 0.76463, 0.86275, 0.90699, 0.91605, 0.9154, 0.85308, 0.85458, 0.90531, 0.94292, 1.21296, 0.94292, 1.02058, 0.89903, 1.18616, 0.99613, 0.91677, 0.78216, 0.91677, 0.90083, 0.98796, 0.9135, 0.92168, 0.95381, 0.98981, 0.95298, 0.95381, 0.93459, 0.92168, 0.91513, 0.92004, 0.91677, 0.95077, 0.748, 1.04502, 0.91677, 0.92061, 0.94236, 0.89544, 0.89364, 0.9, 0.80687, 0.8578, 0.80687, 1.02058, 0.80779, 0.97276, 0.97276, 0.97276, 0.97276, 0.8578, 0.99973, 1.18616, 0.91339, 1.08074, 0.82891, 1.02058, 0.55509, 0.71526, 0.89022, 1.08595, 1, 1, 1.18616, 1, 0.96736, 0.93582, 1.18616, 1, 1.04864, 0.82711, 0.99043, 0.99043, 0.99043, 0.71541, 0.85576, 0.85576, 0.85576, 0.85576, 0.85576, 0.85576, 0.845, 0.80729, 0.77512, 0.77512, 0.77512, 0.77512, 0.98621, 0.98621, 0.98621, 0.98621, 0.95961, 0.92222, 0.90637, 0.90637, 0.90637, 0.90637, 0.90637, 1.02058, 0.90251, 0.90699, 0.90699, 0.90699, 0.90699, 0.85458, 0.83659, 0.94951, 0.99613, 0.99613, 0.99613, 0.99613, 0.99613, 0.99613, 0.85811, 0.78216, 0.90083, 0.90083, 0.90083, 0.90083, 0.95381, 0.95381, 0.95381, 0.95381, 0.9135, 0.92168, 0.91513, 0.91513, 0.91513, 0.91513, 0.91513, 1.08595, 0.91677, 0.91677, 0.91677, 0.91677, 0.91677, 0.89364, 0.92332, 0.89364, 0.85576, 0.99613, 0.85576, 0.99613, 0.85576, 0.99613, 0.80729, 0.78216, 0.80729, 0.78216, 0.80729, 0.78216, 0.80729, 0.78216, 0.94299, 0.76783, 0.95961, 0.91677, 0.77512, 0.90083, 0.77512, 0.90083, 0.77512, 0.90083, 0.77512, 0.90083, 0.77512, 0.90083, 0.86523, 0.9135, 0.86523, 0.9135, 0.86523, 0.9135, 1, 1, 0.92222, 0.92168, 0.92222, 0.92168, 0.98621, 0.95381, 0.98621, 0.95381, 0.98621, 0.95381, 0.98621, 0.95381, 0.98621, 0.95381, 0.86036, 0.97096, 0.71743, 0.98981, 1, 1, 0.95298, 0.79726, 0.95381, 1, 1, 0.79726, 0.6894, 0.79726, 0.74321, 0.81691, 1.0006, 0.92222, 0.92168, 1, 1, 0.92222, 0.92168, 0.79464, 0.92098, 0.92168, 0.90637, 0.91513, 0.90637, 0.91513, 0.90637, 0.91513, 0.909, 0.87514, 0.80729, 0.95077, 1, 1, 0.80729, 0.95077, 0.76463, 0.748, 0.76463, 0.748, 1, 1, 0.76463, 0.748, 1, 1, 0.86275, 0.72651, 0.86275, 1.04502, 0.90699, 0.91677, 0.90699, 0.91677, 0.90699, 0.91677, 0.90699, 0.91677, 0.90699, 0.91677, 0.90699, 0.91677, 0.9154, 0.94236, 0.85458, 0.89364, 0.85458, 0.90531, 0.9, 0.90531, 0.9, 0.90531, 0.9, 1, 0.97276, 0.85576, 0.99613, 0.845, 0.85811, 0.90251, 0.91677, 1, 1, 0.86275, 1.04502, 1.18616, 1.18616, 1.18616, 1.18616, 1.18616, 1.18616, 1.18616, 1.18616, 1.18616, 1.00899, 1.30628, 0.85576, 0.80178, 0.66862, 0.7927, 0.69323, 0.88127, 0.72459, 0.89711, 0.95381, 0.85576, 0.80591, 0.7805, 0.94729, 0.77512, 0.90531, 0.92222, 0.90637, 0.98621, 0.81698, 0.92655, 0.98558, 0.92222, 0.85359, 0.90637, 0.90976, 0.83809, 0.94523, 0.86275, 0.83509, 0.93157, 0.85308, 0.83392, 0.92346, 0.98621, 0.83509, 0.92886, 0.91324, 0.92168, 0.95381, 0.90646, 0.92886, 0.90557, 0.86847, 0.90276, 0.91324, 0.86842, 0.92168, 0.99531, 0.95381, 0.9224, 0.85408, 0.92699, 0.86847, 1.0051, 0.91513, 0.80487, 0.93481, 1, 0.88159, 1.05214, 0.90646, 0.97355, 0.81539, 0.89398, 0.85923, 0.95381, 0.90646, 0.91513, 0.90646, 0.85923, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.9154, 0.94236, 0.9154, 0.94236, 0.9154, 0.94236, 0.85458, 0.89364, 0.96694, 1, 0.89903, 1, 1, 1, 0.91782, 0.91782, 0.91782, 1, 0.896, 0.896, 0.896, 0.9332, 0.9332, 0.95973, 1, 1.26, 1, 1, 0.80479, 0.80178, 1, 1, 0.85633, 1, 1, 1, 1, 0.97276, 1, 1, 1, 0.698, 1, 1.36145, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.14542, 1, 0.79199, 0.78694, 1.02058, 1.03493, 1.05486, 1, 1, 1.23026, 1.08595, 1.08595, 1, 1.08595, 1.08595, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.20006, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.MyriadProBoldItalicFactors = MyriadProBoldItalicFactors;
+const MyriadProBoldItalicMetrics = {
+  lineHeight: 1.2,
+  lineGap: 0.2
+};
+exports.MyriadProBoldItalicMetrics = MyriadProBoldItalicMetrics;
+const MyriadProItalicFactors = [1.36898, 1, 1, 0.65507, 0.84943, 0.85639, 0.88465, 0.88465, 0.86936, 0.88307, 0.86948, 0.85283, 0.85283, 1.06383, 1.02058, 0.75945, 0.9219, 0.75945, 1.17337, 0.88465, 0.88465, 0.88465, 0.88465, 0.88465, 0.88465, 0.88465, 0.88465, 0.88465, 0.88465, 0.75945, 0.75945, 1.02058, 1.02058, 1.02058, 0.69046, 0.70926, 0.85158, 0.77812, 0.76852, 0.89591, 0.70466, 0.76125, 0.80094, 0.86822, 0.83864, 0.728, 0.77212, 0.79475, 0.93637, 0.87514, 0.8588, 0.76013, 0.8588, 0.72421, 0.69866, 0.77598, 0.85991, 0.80811, 0.87832, 0.78112, 0.77512, 0.8562, 1.0222, 1.18417, 1.0222, 1.27014, 0.89903, 1.15012, 0.93859, 0.94399, 0.846, 0.94399, 0.81453, 1.0186, 0.94219, 0.96017, 1.03075, 1.02175, 0.912, 1.03075, 0.96998, 0.96017, 0.93859, 0.94399, 0.94399, 0.95493, 0.746, 1.12658, 0.94578, 0.91, 0.979, 0.882, 0.882, 0.83, 0.85034, 0.83537, 0.85034, 1.02058, 0.70869, 0.88465, 0.88465, 0.88465, 0.88465, 0.83537, 0.90083, 1.15012, 0.9161, 0.94565, 0.73541, 1.02058, 0.53609, 0.69353, 0.79519, 1.08595, 1, 1, 1.15012, 1, 0.91974, 0.75945, 1.15012, 1, 0.9446, 0.73361, 0.9005, 0.9005, 0.9005, 0.62864, 0.85158, 0.85158, 0.85158, 0.85158, 0.85158, 0.85158, 0.773, 0.76852, 0.70466, 0.70466, 0.70466, 0.70466, 0.83864, 0.83864, 0.83864, 0.83864, 0.90561, 0.87514, 0.8588, 0.8588, 0.8588, 0.8588, 0.8588, 1.02058, 0.85751, 0.85991, 0.85991, 0.85991, 0.85991, 0.77512, 0.76013, 0.88075, 0.93859, 0.93859, 0.93859, 0.93859, 0.93859, 0.93859, 0.8075, 0.846, 0.81453, 0.81453, 0.81453, 0.81453, 0.82424, 0.82424, 0.82424, 0.82424, 0.9278, 0.96017, 0.93859, 0.93859, 0.93859, 0.93859, 0.93859, 1.08595, 0.8562, 0.94578, 0.94578, 0.94578, 0.94578, 0.882, 0.94578, 0.882, 0.85158, 0.93859, 0.85158, 0.93859, 0.85158, 0.93859, 0.76852, 0.846, 0.76852, 0.846, 0.76852, 0.846, 0.76852, 0.846, 0.89591, 0.8544, 0.90561, 0.94399, 0.70466, 0.81453, 0.70466, 0.81453, 0.70466, 0.81453, 0.70466, 0.81453, 0.70466, 0.81453, 0.80094, 0.94219, 0.80094, 0.94219, 0.80094, 0.94219, 1, 1, 0.86822, 0.96017, 0.86822, 0.96017, 0.83864, 0.82424, 0.83864, 0.82424, 0.83864, 0.82424, 0.83864, 1.03075, 0.83864, 0.82424, 0.81402, 1.02738, 0.728, 1.02175, 1, 1, 0.912, 0.79475, 1.03075, 1, 1, 0.79475, 0.83911, 0.79475, 0.66266, 0.80553, 1.06676, 0.87514, 0.96017, 1, 1, 0.87514, 0.96017, 0.86865, 0.87396, 0.96017, 0.8588, 0.93859, 0.8588, 0.93859, 0.8588, 0.93859, 0.867, 0.84759, 0.72421, 0.95493, 1, 1, 0.72421, 0.95493, 0.69866, 0.746, 0.69866, 0.746, 1, 1, 0.69866, 0.746, 1, 1, 0.77598, 0.88417, 0.77598, 1.12658, 0.85991, 0.94578, 0.85991, 0.94578, 0.85991, 0.94578, 0.85991, 0.94578, 0.85991, 0.94578, 0.85991, 0.94578, 0.87832, 0.979, 0.77512, 0.882, 0.77512, 0.8562, 0.83, 0.8562, 0.83, 0.8562, 0.83, 1, 0.88465, 0.85158, 0.93859, 0.773, 0.8075, 0.85751, 0.8562, 1, 1, 0.77598, 1.12658, 1.15012, 1.15012, 1.15012, 1.15012, 1.15012, 1.15313, 1.15012, 1.15012, 1.15012, 1.08106, 1.03901, 0.85158, 0.77025, 0.62264, 0.7646, 0.65351, 0.86026, 0.69461, 0.89947, 1.03075, 0.85158, 0.77812, 0.76449, 0.88836, 0.70466, 0.8562, 0.86822, 0.8588, 0.83864, 0.77212, 0.85308, 0.93637, 0.87514, 0.82352, 0.8588, 0.85701, 0.76013, 0.89058, 0.77598, 0.8156, 0.82565, 0.78112, 0.77899, 0.89386, 0.83864, 0.8156, 0.9486, 0.92388, 0.96186, 1.03075, 0.91123, 0.9486, 0.93298, 0.878, 0.93942, 0.92388, 0.84596, 0.96186, 0.95119, 1.03075, 0.922, 0.88787, 0.95829, 0.88, 0.93559, 0.93859, 0.78815, 0.93758, 1, 0.89217, 1.03737, 0.91123, 0.93969, 0.77487, 0.85769, 0.86799, 1.03075, 0.91123, 0.93859, 0.91123, 0.86799, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.87832, 0.979, 0.87832, 0.979, 0.87832, 0.979, 0.77512, 0.882, 0.9219, 1, 0.89903, 1, 1, 1, 0.87321, 0.87321, 0.87321, 1, 1.027, 1.027, 1.027, 0.86847, 0.86847, 0.79121, 1, 1.124, 1, 1, 0.73572, 0.73572, 1, 1, 0.85034, 1, 1, 1, 1, 0.88465, 1, 1, 1, 0.669, 1, 1.36145, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.04828, 1, 0.74948, 0.75187, 1.02058, 0.98391, 1.02119, 1, 1, 1.06233, 1.08595, 1.08595, 1, 1.08595, 1.08595, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.05233, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.MyriadProItalicFactors = MyriadProItalicFactors;
+const MyriadProItalicMetrics = {
+  lineHeight: 1.2,
+  lineGap: 0.2
+};
+exports.MyriadProItalicMetrics = MyriadProItalicMetrics;
+const MyriadProRegularFactors = [1.36898, 1, 1, 0.76305, 0.82784, 0.94935, 0.89364, 0.92241, 0.89073, 0.90706, 0.98472, 0.85283, 0.85283, 1.0664, 1.02058, 0.74505, 0.9219, 0.74505, 1.23456, 0.92241, 0.92241, 0.92241, 0.92241, 0.92241, 0.92241, 0.92241, 0.92241, 0.92241, 0.92241, 0.74505, 0.74505, 1.02058, 1.02058, 1.02058, 0.73002, 0.72601, 0.91755, 0.8126, 0.80314, 0.92222, 0.73764, 0.79726, 0.83051, 0.90284, 0.86023, 0.74, 0.8126, 0.84869, 0.96518, 0.91115, 0.8858, 0.79761, 0.8858, 0.74498, 0.73914, 0.81363, 0.89591, 0.83659, 0.89633, 0.85608, 0.8111, 0.90531, 1.0222, 1.22736, 1.0222, 1.27014, 0.89903, 0.90088, 0.86667, 1.0231, 0.896, 1.01411, 0.90083, 1.05099, 1.00512, 0.99793, 1.05326, 1.09377, 0.938, 1.06226, 1.00119, 0.99793, 0.98714, 1.0231, 1.01231, 0.98196, 0.792, 1.19137, 0.99074, 0.962, 1.01915, 0.926, 0.942, 0.856, 0.85034, 0.92006, 0.85034, 1.02058, 0.69067, 0.92241, 0.92241, 0.92241, 0.92241, 0.92006, 0.9332, 0.90088, 0.91882, 0.93484, 0.75339, 1.02058, 0.56866, 0.54324, 0.79519, 1.08595, 1, 1, 0.90088, 1, 0.95325, 0.74505, 0.90088, 1, 0.97198, 0.75339, 0.91009, 0.91009, 0.91009, 0.66466, 0.91755, 0.91755, 0.91755, 0.91755, 0.91755, 0.91755, 0.788, 0.80314, 0.73764, 0.73764, 0.73764, 0.73764, 0.86023, 0.86023, 0.86023, 0.86023, 0.92915, 0.91115, 0.8858, 0.8858, 0.8858, 0.8858, 0.8858, 1.02058, 0.8858, 0.89591, 0.89591, 0.89591, 0.89591, 0.8111, 0.79611, 0.89713, 0.86667, 0.86667, 0.86667, 0.86667, 0.86667, 0.86667, 0.86936, 0.896, 0.90083, 0.90083, 0.90083, 0.90083, 0.84224, 0.84224, 0.84224, 0.84224, 0.97276, 0.99793, 0.98714, 0.98714, 0.98714, 0.98714, 0.98714, 1.08595, 0.89876, 0.99074, 0.99074, 0.99074, 0.99074, 0.942, 1.0231, 0.942, 0.91755, 0.86667, 0.91755, 0.86667, 0.91755, 0.86667, 0.80314, 0.896, 0.80314, 0.896, 0.80314, 0.896, 0.80314, 0.896, 0.92222, 0.93372, 0.92915, 1.01411, 0.73764, 0.90083, 0.73764, 0.90083, 0.73764, 0.90083, 0.73764, 0.90083, 0.73764, 0.90083, 0.83051, 1.00512, 0.83051, 1.00512, 0.83051, 1.00512, 1, 1, 0.90284, 0.99793, 0.90976, 0.99793, 0.86023, 0.84224, 0.86023, 0.84224, 0.86023, 0.84224, 0.86023, 1.05326, 0.86023, 0.84224, 0.82873, 1.07469, 0.74, 1.09377, 1, 1, 0.938, 0.84869, 1.06226, 1, 1, 0.84869, 0.83704, 0.84869, 0.81441, 0.85588, 1.08927, 0.91115, 0.99793, 1, 1, 0.91115, 0.99793, 0.91887, 0.90991, 0.99793, 0.8858, 0.98714, 0.8858, 0.98714, 0.8858, 0.98714, 0.894, 0.91434, 0.74498, 0.98196, 1, 1, 0.74498, 0.98196, 0.73914, 0.792, 0.73914, 0.792, 1, 1, 0.73914, 0.792, 1, 1, 0.81363, 0.904, 0.81363, 1.19137, 0.89591, 0.99074, 0.89591, 0.99074, 0.89591, 0.99074, 0.89591, 0.99074, 0.89591, 0.99074, 0.89591, 0.99074, 0.89633, 1.01915, 0.8111, 0.942, 0.8111, 0.90531, 0.856, 0.90531, 0.856, 0.90531, 0.856, 1, 0.92241, 0.91755, 0.86667, 0.788, 0.86936, 0.8858, 0.89876, 1, 1, 0.81363, 1.19137, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90088, 0.90388, 1.03901, 0.92138, 0.78105, 0.7154, 0.86169, 0.80513, 0.94007, 0.82528, 0.98612, 1.06226, 0.91755, 0.8126, 0.81884, 0.92819, 0.73764, 0.90531, 0.90284, 0.8858, 0.86023, 0.8126, 0.91172, 0.96518, 0.91115, 0.83089, 0.8858, 0.87791, 0.79761, 0.89297, 0.81363, 0.88157, 0.89992, 0.85608, 0.81992, 0.94307, 0.86023, 0.88157, 0.95308, 0.98699, 0.99793, 1.06226, 0.95817, 0.95308, 0.97358, 0.928, 0.98088, 0.98699, 0.92761, 0.99793, 0.96017, 1.06226, 0.986, 0.944, 0.95978, 0.938, 0.96705, 0.98714, 0.80442, 0.98972, 1, 0.89762, 1.04552, 0.95817, 0.99007, 0.87064, 0.91879, 0.88888, 1.06226, 0.95817, 0.98714, 0.95817, 0.88888, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.89633, 1.01915, 0.89633, 1.01915, 0.89633, 1.01915, 0.8111, 0.942, 0.9219, 1, 0.89903, 1, 1, 1, 0.93173, 0.93173, 0.93173, 1, 1.06304, 1.06304, 1.06904, 0.89903, 0.89903, 0.80549, 1, 1.156, 1, 1, 0.76575, 0.76575, 1, 1, 0.72458, 1, 1, 1, 1, 0.92241, 1, 1, 1, 0.619, 1, 1.36145, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.07257, 1, 0.74705, 0.71119, 1.02058, 1.024, 1.02119, 1, 1, 1.1536, 1.08595, 1.08595, 1, 1.08595, 1.08595, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.05638, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.MyriadProRegularFactors = MyriadProRegularFactors;
+const MyriadProRegularMetrics = {
+  lineHeight: 1.2,
+  lineGap: 0.2
+};
+exports.MyriadProRegularMetrics = MyriadProRegularMetrics;
+
+/***/ }),
+/* 56 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.SegoeuiRegularMetrics = exports.SegoeuiRegularFactors = exports.SegoeuiItalicMetrics = exports.SegoeuiItalicFactors = exports.SegoeuiBoldMetrics = exports.SegoeuiBoldItalicMetrics = exports.SegoeuiBoldItalicFactors = exports.SegoeuiBoldFactors = void 0;
+const SegoeuiBoldFactors = [1.76738, 1, 1, 0.99297, 0.9824, 1.04016, 1.06497, 1.03424, 0.97529, 1.17647, 1.23203, 1.1085, 1.1085, 1.16939, 1.2107, 0.9754, 1.21408, 0.9754, 1.59578, 1.03424, 1.03424, 1.03424, 1.03424, 1.03424, 1.03424, 1.03424, 1.03424, 1.03424, 1.03424, 0.81378, 0.81378, 1.2107, 1.2107, 1.2107, 0.71703, 0.97847, 0.97363, 0.88776, 0.8641, 1.02096, 0.79795, 0.85132, 0.914, 1.06085, 1.1406, 0.8007, 0.89858, 0.83693, 1.14889, 1.09398, 0.97489, 0.92094, 0.97489, 0.90399, 0.84041, 0.95923, 1.00135, 1, 1.06467, 0.98243, 0.90996, 0.99361, 1.1085, 1.56942, 1.1085, 1.2107, 0.74627, 0.94282, 0.96752, 1.01519, 0.86304, 1.01359, 0.97278, 1.15103, 1.01359, 0.98561, 1.02285, 1.02285, 1.00527, 1.02285, 1.0302, 0.99041, 1.0008, 1.01519, 1.01359, 1.02258, 0.79104, 1.16862, 0.99041, 0.97454, 1.02511, 0.99298, 0.96752, 0.95801, 0.94856, 1.16579, 0.94856, 1.2107, 0.9824, 1.03424, 1.03424, 1, 1.03424, 1.16579, 0.8727, 1.3871, 1.18622, 1.10818, 1.04478, 1.2107, 1.18622, 0.75155, 0.94994, 1.28826, 1.21408, 1.21408, 0.91056, 1, 0.91572, 0.9754, 0.64663, 1.18328, 1.24866, 1.04478, 1.14169, 1.15749, 1.17389, 0.71703, 0.97363, 0.97363, 0.97363, 0.97363, 0.97363, 0.97363, 0.93506, 0.8641, 0.79795, 0.79795, 0.79795, 0.79795, 1.1406, 1.1406, 1.1406, 1.1406, 1.02096, 1.09398, 0.97426, 0.97426, 0.97426, 0.97426, 0.97426, 1.2107, 0.97489, 1.00135, 1.00135, 1.00135, 1.00135, 0.90996, 0.92094, 1.02798, 0.96752, 0.96752, 0.96752, 0.96752, 0.96752, 0.96752, 0.93136, 0.86304, 0.97278, 0.97278, 0.97278, 0.97278, 1.02285, 1.02285, 1.02285, 1.02285, 0.97122, 0.99041, 1, 1, 1, 1, 1, 1.28826, 1.0008, 0.99041, 0.99041, 0.99041, 0.99041, 0.96752, 1.01519, 0.96752, 0.97363, 0.96752, 0.97363, 0.96752, 0.97363, 0.96752, 0.8641, 0.86304, 0.8641, 0.86304, 0.8641, 0.86304, 0.8641, 0.86304, 1.02096, 1.03057, 1.02096, 1.03517, 0.79795, 0.97278, 0.79795, 0.97278, 0.79795, 0.97278, 0.79795, 0.97278, 0.79795, 0.97278, 0.914, 1.01359, 0.914, 1.01359, 0.914, 1.01359, 1, 1, 1.06085, 0.98561, 1.06085, 1.00879, 1.1406, 1.02285, 1.1406, 1.02285, 1.1406, 1.02285, 1.1406, 1.02285, 1.1406, 1.02285, 0.97138, 1.08692, 0.8007, 1.02285, 1, 1, 1.00527, 0.83693, 1.02285, 1, 1, 0.83693, 0.9455, 0.83693, 0.90418, 0.83693, 1.13005, 1.09398, 0.99041, 1, 1, 1.09398, 0.99041, 0.96692, 1.09251, 0.99041, 0.97489, 1.0008, 0.97489, 1.0008, 0.97489, 1.0008, 0.93994, 0.97931, 0.90399, 1.02258, 1, 1, 0.90399, 1.02258, 0.84041, 0.79104, 0.84041, 0.79104, 0.84041, 0.79104, 0.84041, 0.79104, 1, 1, 0.95923, 1.07034, 0.95923, 1.16862, 1.00135, 0.99041, 1.00135, 0.99041, 1.00135, 0.99041, 1.00135, 0.99041, 1.00135, 0.99041, 1.00135, 0.99041, 1.06467, 1.02511, 0.90996, 0.96752, 0.90996, 0.99361, 0.95801, 0.99361, 0.95801, 0.99361, 0.95801, 1.07733, 1.03424, 0.97363, 0.96752, 0.93506, 0.93136, 0.97489, 1.0008, 1, 1, 0.95923, 1.16862, 1.15103, 1.15103, 1.01173, 1.03959, 0.75953, 0.81378, 0.79912, 1.15103, 1.21994, 0.95161, 0.87815, 1.01149, 0.81525, 0.7676, 0.98167, 1.01134, 1.02546, 0.84097, 1.03089, 1.18102, 0.97363, 0.88776, 0.85134, 0.97826, 0.79795, 0.99361, 1.06085, 0.97489, 1.1406, 0.89858, 1.0388, 1.14889, 1.09398, 0.86039, 0.97489, 1.0595, 0.92094, 0.94793, 0.95923, 0.90996, 0.99346, 0.98243, 1.02112, 0.95493, 1.1406, 0.90996, 1.03574, 1.02597, 1.0008, 1.18102, 1.06628, 1.03574, 1.0192, 1.01932, 1.00886, 0.97531, 1.0106, 1.0008, 1.13189, 1.18102, 1.02277, 0.98683, 1.0016, 0.99561, 1.07237, 1.0008, 0.90434, 0.99921, 0.93803, 0.8965, 1.23085, 1.06628, 1.04983, 0.96268, 1.0499, 0.98439, 1.18102, 1.06628, 1.0008, 1.06628, 0.98439, 0.79795, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.09466, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.97278, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.02065, 1, 1, 1, 1, 1, 1, 1.06467, 1.02511, 1.06467, 1.02511, 1.06467, 1.02511, 0.90996, 0.96752, 1, 1.21408, 0.89903, 1, 1, 0.75155, 1.04394, 1.04394, 1.04394, 1.04394, 0.98633, 0.98633, 0.98633, 0.73047, 0.73047, 1.20642, 0.91211, 1.25635, 1.222, 1.02956, 1.03372, 1.03372, 0.96039, 1.24633, 1, 1.12454, 0.93503, 1.03424, 1.19687, 1.03424, 1, 1, 1, 0.771, 1, 1, 1.15749, 1.15749, 1.15749, 1.10948, 0.86279, 0.94434, 0.86279, 0.94434, 0.86182, 1, 1, 1.16897, 1, 0.96085, 0.90137, 1.2107, 1.18416, 1.13973, 0.69825, 0.9716, 2.10339, 1.29004, 1.29004, 1.21172, 1.29004, 1.29004, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.42603, 1, 0.99862, 0.99862, 1, 0.87025, 0.87025, 0.87025, 0.87025, 1.18874, 1.42603, 1, 1.42603, 1.42603, 0.99862, 1, 1, 1, 1, 1, 1.2886, 1.04315, 1.15296, 1.34163, 1, 1, 1, 1.09193, 1.09193, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.SegoeuiBoldFactors = SegoeuiBoldFactors;
+const SegoeuiBoldMetrics = {
+  lineHeight: 1.33008,
+  lineGap: 0
+};
+exports.SegoeuiBoldMetrics = SegoeuiBoldMetrics;
+const SegoeuiBoldItalicFactors = [1.76738, 1, 1, 0.98946, 1.03959, 1.04016, 1.02809, 1.036, 0.97639, 1.10953, 1.23203, 1.11144, 1.11144, 1.16939, 1.21237, 0.9754, 1.21261, 0.9754, 1.59754, 1.036, 1.036, 1.036, 1.036, 1.036, 1.036, 1.036, 1.036, 1.036, 1.036, 0.81378, 0.81378, 1.21237, 1.21237, 1.21237, 0.73541, 0.97847, 0.97363, 0.89723, 0.87897, 1.0426, 0.79429, 0.85292, 0.91149, 1.05815, 1.1406, 0.79631, 0.90128, 0.83853, 1.04396, 1.10615, 0.97552, 0.94436, 0.97552, 0.88641, 0.80527, 0.96083, 1.00135, 1, 1.06777, 0.9817, 0.91142, 0.99361, 1.11144, 1.57293, 1.11144, 1.21237, 0.74627, 1.31818, 1.06585, 0.97042, 0.83055, 0.97042, 0.93503, 1.1261, 0.97042, 0.97922, 1.14236, 0.94552, 1.01054, 1.14236, 1.02471, 0.97922, 0.94165, 0.97042, 0.97042, 1.0276, 0.78929, 1.1261, 0.97922, 0.95874, 1.02197, 0.98507, 0.96752, 0.97168, 0.95107, 1.16579, 0.95107, 1.21237, 1.03959, 1.036, 1.036, 1, 1.036, 1.16579, 0.87357, 1.31818, 1.18754, 1.26781, 1.05356, 1.21237, 1.18622, 0.79487, 0.94994, 1.29004, 1.24047, 1.24047, 1.31818, 1, 0.91484, 0.9754, 1.31818, 1.1349, 1.24866, 1.05356, 1.13934, 1.15574, 1.17389, 0.73541, 0.97363, 0.97363, 0.97363, 0.97363, 0.97363, 0.97363, 0.94385, 0.87897, 0.79429, 0.79429, 0.79429, 0.79429, 1.1406, 1.1406, 1.1406, 1.1406, 1.0426, 1.10615, 0.97552, 0.97552, 0.97552, 0.97552, 0.97552, 1.21237, 0.97552, 1.00135, 1.00135, 1.00135, 1.00135, 0.91142, 0.94436, 0.98721, 1.06585, 1.06585, 1.06585, 1.06585, 1.06585, 1.06585, 0.96705, 0.83055, 0.93503, 0.93503, 0.93503, 0.93503, 1.14236, 1.14236, 1.14236, 1.14236, 0.93125, 0.97922, 0.94165, 0.94165, 0.94165, 0.94165, 0.94165, 1.29004, 0.94165, 0.97922, 0.97922, 0.97922, 0.97922, 0.96752, 0.97042, 0.96752, 0.97363, 1.06585, 0.97363, 1.06585, 0.97363, 1.06585, 0.87897, 0.83055, 0.87897, 0.83055, 0.87897, 0.83055, 0.87897, 0.83055, 1.0426, 1.0033, 1.0426, 0.97042, 0.79429, 0.93503, 0.79429, 0.93503, 0.79429, 0.93503, 0.79429, 0.93503, 0.79429, 0.93503, 0.91149, 0.97042, 0.91149, 0.97042, 0.91149, 0.97042, 1, 1, 1.05815, 0.97922, 1.05815, 0.97922, 1.1406, 1.14236, 1.1406, 1.14236, 1.1406, 1.14236, 1.1406, 1.14236, 1.1406, 1.14236, 0.97441, 1.04302, 0.79631, 1.01582, 1, 1, 1.01054, 0.83853, 1.14236, 1, 1, 0.83853, 1.09125, 0.83853, 0.90418, 0.83853, 1.19508, 1.10615, 0.97922, 1, 1, 1.10615, 0.97922, 1.01034, 1.10466, 0.97922, 0.97552, 0.94165, 0.97552, 0.94165, 0.97552, 0.94165, 0.91602, 0.91981, 0.88641, 1.0276, 1, 1, 0.88641, 1.0276, 0.80527, 0.78929, 0.80527, 0.78929, 0.80527, 0.78929, 0.80527, 0.78929, 1, 1, 0.96083, 1.05403, 0.95923, 1.16862, 1.00135, 0.97922, 1.00135, 0.97922, 1.00135, 0.97922, 1.00135, 0.97922, 1.00135, 0.97922, 1.00135, 0.97922, 1.06777, 1.02197, 0.91142, 0.96752, 0.91142, 0.99361, 0.97168, 0.99361, 0.97168, 0.99361, 0.97168, 1.23199, 1.036, 0.97363, 1.06585, 0.94385, 0.96705, 0.97552, 0.94165, 1, 1, 0.96083, 1.1261, 1.31818, 1.31818, 1.31818, 1.31818, 1.31818, 1.31818, 1.31818, 1.31818, 1.31818, 0.95161, 1.27126, 1.00811, 0.83284, 0.77702, 0.99137, 0.95253, 1.0347, 0.86142, 1.07205, 1.14236, 0.97363, 0.89723, 0.86869, 1.09818, 0.79429, 0.99361, 1.05815, 0.97552, 1.1406, 0.90128, 1.06662, 1.04396, 1.10615, 0.84918, 0.97552, 1.04694, 0.94436, 0.98015, 0.96083, 0.91142, 1.00356, 0.9817, 1.01945, 0.98999, 1.1406, 0.91142, 1.04961, 0.9898, 1.00639, 1.14236, 1.07514, 1.04961, 0.99607, 1.02897, 1.008, 0.9898, 0.95134, 1.00639, 1.11121, 1.14236, 1.00518, 0.97981, 1.02186, 1, 1.08578, 0.94165, 0.99314, 0.98387, 0.93028, 0.93377, 1.35125, 1.07514, 1.10687, 0.93491, 1.04232, 1.00351, 1.14236, 1.07514, 0.94165, 1.07514, 1.00351, 0.79429, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.09097, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.93503, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.96609, 1, 1, 1, 1, 1, 1, 1.06777, 1.02197, 1.06777, 1.02197, 1.06777, 1.02197, 0.91142, 0.96752, 1, 1.21261, 0.89903, 1, 1, 0.75155, 1.04745, 1.04745, 1.04745, 1.04394, 0.98633, 0.98633, 0.98633, 0.72959, 0.72959, 1.20502, 0.91406, 1.26514, 1.222, 1.02956, 1.03372, 1.03372, 0.96039, 1.24633, 1, 1.09125, 0.93327, 1.03336, 1.16541, 1.036, 1, 1, 1, 0.771, 1, 1, 1.15574, 1.15574, 1.15574, 1.15574, 0.86364, 0.94434, 0.86279, 0.94434, 0.86224, 1, 1, 1.16798, 1, 0.96085, 0.90068, 1.21237, 1.18416, 1.13904, 0.69825, 0.9716, 2.10339, 1.29004, 1.29004, 1.21339, 1.29004, 1.29004, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.42603, 1, 0.99862, 0.99862, 1, 0.87025, 0.87025, 0.87025, 0.87025, 1.18775, 1.42603, 1, 1.42603, 1.42603, 0.99862, 1, 1, 1, 1, 1, 1.2886, 1.04315, 1.15296, 1.34163, 1, 1, 1, 1.13269, 1.13269, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.SegoeuiBoldItalicFactors = SegoeuiBoldItalicFactors;
+const SegoeuiBoldItalicMetrics = {
+  lineHeight: 1.33008,
+  lineGap: 0
+};
+exports.SegoeuiBoldItalicMetrics = SegoeuiBoldItalicMetrics;
+const SegoeuiItalicFactors = [1.76738, 1, 1, 0.98946, 1.14763, 1.05365, 1.06234, 0.96927, 0.92586, 1.15373, 1.18414, 0.91349, 0.91349, 1.07403, 1.17308, 0.78383, 1.20088, 0.78383, 1.42531, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.78383, 0.78383, 1.17308, 1.17308, 1.17308, 0.77349, 0.94565, 0.94729, 0.85944, 0.88506, 0.9858, 0.74817, 0.80016, 0.88449, 0.98039, 0.95782, 0.69238, 0.89898, 0.83231, 0.98183, 1.03989, 0.96924, 0.86237, 0.96924, 0.80595, 0.74524, 0.86091, 0.95402, 0.94143, 0.98448, 0.8858, 0.83089, 0.93285, 1.0949, 1.39016, 1.0949, 1.45994, 0.74627, 1.04839, 0.97454, 0.97454, 0.87207, 0.97454, 0.87533, 1.06151, 0.97454, 1.00176, 1.16484, 1.08132, 0.98047, 1.16484, 1.02989, 1.01054, 0.96225, 0.97454, 0.97454, 1.06598, 0.79004, 1.16344, 1.00351, 0.94629, 0.9973, 0.91016, 0.96777, 0.9043, 0.91082, 0.92481, 0.91082, 1.17308, 0.95748, 0.96927, 0.96927, 1, 0.96927, 0.92481, 0.80597, 1.04839, 1.23393, 1.1781, 0.9245, 1.17308, 1.20808, 0.63218, 0.94261, 1.24822, 1.09971, 1.09971, 1.04839, 1, 0.85273, 0.78032, 1.04839, 1.09971, 1.22326, 0.9245, 1.09836, 1.13525, 1.15222, 0.70424, 0.94729, 0.94729, 0.94729, 0.94729, 0.94729, 0.94729, 0.85498, 0.88506, 0.74817, 0.74817, 0.74817, 0.74817, 0.95782, 0.95782, 0.95782, 0.95782, 0.9858, 1.03989, 0.96924, 0.96924, 0.96924, 0.96924, 0.96924, 1.17308, 0.96924, 0.95402, 0.95402, 0.95402, 0.95402, 0.83089, 0.86237, 0.88409, 0.97454, 0.97454, 0.97454, 0.97454, 0.97454, 0.97454, 0.92916, 0.87207, 0.87533, 0.87533, 0.87533, 0.87533, 0.93146, 0.93146, 0.93146, 0.93146, 0.93854, 1.01054, 0.96225, 0.96225, 0.96225, 0.96225, 0.96225, 1.24822, 0.8761, 1.00351, 1.00351, 1.00351, 1.00351, 0.96777, 0.97454, 0.96777, 0.94729, 0.97454, 0.94729, 0.97454, 0.94729, 0.97454, 0.88506, 0.87207, 0.88506, 0.87207, 0.88506, 0.87207, 0.88506, 0.87207, 0.9858, 0.95391, 0.9858, 0.97454, 0.74817, 0.87533, 0.74817, 0.87533, 0.74817, 0.87533, 0.74817, 0.87533, 0.74817, 0.87533, 0.88449, 0.97454, 0.88449, 0.97454, 0.88449, 0.97454, 1, 1, 0.98039, 1.00176, 0.98039, 1.00176, 0.95782, 0.93146, 0.95782, 0.93146, 0.95782, 0.93146, 0.95782, 1.16484, 0.95782, 0.93146, 0.84421, 1.12761, 0.69238, 1.08132, 1, 1, 0.98047, 0.83231, 1.16484, 1, 1, 0.84723, 1.04861, 0.84723, 0.78755, 0.83231, 1.23736, 1.03989, 1.01054, 1, 1, 1.03989, 1.01054, 0.9857, 1.03849, 1.01054, 0.96924, 0.96225, 0.96924, 0.96225, 0.96924, 0.96225, 0.92383, 0.90171, 0.80595, 1.06598, 1, 1, 0.80595, 1.06598, 0.74524, 0.79004, 0.74524, 0.79004, 0.74524, 0.79004, 0.74524, 0.79004, 1, 1, 0.86091, 1.02759, 0.85771, 1.16344, 0.95402, 1.00351, 0.95402, 1.00351, 0.95402, 1.00351, 0.95402, 1.00351, 0.95402, 1.00351, 0.95402, 1.00351, 0.98448, 0.9973, 0.83089, 0.96777, 0.83089, 0.93285, 0.9043, 0.93285, 0.9043, 0.93285, 0.9043, 1.31868, 0.96927, 0.94729, 0.97454, 0.85498, 0.92916, 0.96924, 0.8761, 1, 1, 0.86091, 1.16344, 1.04839, 1.04839, 1.04839, 1.04839, 1.04839, 1.04839, 1.04839, 1.04839, 1.04839, 0.81965, 0.81965, 0.94729, 0.78032, 0.71022, 0.90883, 0.84171, 0.99877, 0.77596, 1.05734, 1.2, 0.94729, 0.85944, 0.82791, 0.9607, 0.74817, 0.93285, 0.98039, 0.96924, 0.95782, 0.89898, 0.98316, 0.98183, 1.03989, 0.78614, 0.96924, 0.97642, 0.86237, 0.86075, 0.86091, 0.83089, 0.90082, 0.8858, 0.97296, 1.01284, 0.95782, 0.83089, 1.0976, 1.04, 1.03342, 1.2, 1.0675, 1.0976, 0.98205, 1.03809, 1.05097, 1.04, 0.95364, 1.03342, 1.05401, 1.2, 1.02148, 1.0119, 1.04724, 1.0127, 1.02732, 0.96225, 0.8965, 0.97783, 0.93574, 0.94818, 1.30679, 1.0675, 1.11826, 0.99821, 1.0557, 1.0326, 1.2, 1.0675, 0.96225, 1.0675, 1.0326, 0.74817, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.03754, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.87533, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.98705, 1, 1, 1, 1, 1, 1, 0.98448, 0.9973, 0.98448, 0.9973, 0.98448, 0.9973, 0.83089, 0.96777, 1, 1.20088, 0.89903, 1, 1, 0.75155, 0.94945, 0.94945, 0.94945, 0.94945, 1.12317, 1.12317, 1.12317, 0.67603, 0.67603, 1.15621, 0.73584, 1.21191, 1.22135, 1.06483, 0.94868, 0.94868, 0.95996, 1.24633, 1, 1.07497, 0.87709, 0.96927, 1.01473, 0.96927, 1, 1, 1, 0.77295, 1, 1, 1.09836, 1.09836, 1.09836, 1.01522, 0.86321, 0.94434, 0.8649, 0.94434, 0.86182, 1, 1, 1.083, 1, 0.91578, 0.86438, 1.17308, 1.18416, 1.14589, 0.69825, 0.97622, 1.96791, 1.24822, 1.24822, 1.17308, 1.24822, 1.24822, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.42603, 1, 0.99862, 0.99862, 1, 0.87025, 0.87025, 0.87025, 0.87025, 1.17984, 1.42603, 1, 1.42603, 1.42603, 0.99862, 1, 1, 1, 1, 1, 1.2886, 1.04315, 1.15296, 1.34163, 1, 1, 1, 1.10742, 1.10742, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.SegoeuiItalicFactors = SegoeuiItalicFactors;
+const SegoeuiItalicMetrics = {
+  lineHeight: 1.33008,
+  lineGap: 0
+};
+exports.SegoeuiItalicMetrics = SegoeuiItalicMetrics;
+const SegoeuiRegularFactors = [1.76738, 1, 1, 0.98594, 1.02285, 1.10454, 1.06234, 0.96927, 0.92037, 1.19985, 1.2046, 0.90616, 0.90616, 1.07152, 1.1714, 0.78032, 1.20088, 0.78032, 1.40246, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.96927, 0.78032, 0.78032, 1.1714, 1.1714, 1.1714, 0.80597, 0.94084, 0.96706, 0.85944, 0.85734, 0.97093, 0.75842, 0.79936, 0.88198, 0.9831, 0.95782, 0.71387, 0.86969, 0.84636, 1.07796, 1.03584, 0.96924, 0.83968, 0.96924, 0.82826, 0.79649, 0.85771, 0.95132, 0.93119, 0.98965, 0.88433, 0.8287, 0.93365, 1.08612, 1.3638, 1.08612, 1.45786, 0.74627, 0.80499, 0.91484, 1.05707, 0.92383, 1.05882, 0.9403, 1.12654, 1.05882, 1.01756, 1.09011, 1.09011, 0.99414, 1.09011, 1.034, 1.01756, 1.05356, 1.05707, 1.05882, 1.04399, 0.84863, 1.21968, 1.01756, 0.95801, 1.00068, 0.91797, 0.96777, 0.9043, 0.90351, 0.92105, 0.90351, 1.1714, 0.85337, 0.96927, 0.96927, 0.99912, 0.96927, 0.92105, 0.80597, 1.2434, 1.20808, 1.05937, 0.90957, 1.1714, 1.20808, 0.75155, 0.94261, 1.24644, 1.09971, 1.09971, 0.84751, 1, 0.85273, 0.78032, 0.61584, 1.05425, 1.17914, 0.90957, 1.08665, 1.11593, 1.14169, 0.73381, 0.96706, 0.96706, 0.96706, 0.96706, 0.96706, 0.96706, 0.86035, 0.85734, 0.75842, 0.75842, 0.75842, 0.75842, 0.95782, 0.95782, 0.95782, 0.95782, 0.97093, 1.03584, 0.96924, 0.96924, 0.96924, 0.96924, 0.96924, 1.1714, 0.96924, 0.95132, 0.95132, 0.95132, 0.95132, 0.8287, 0.83968, 0.89049, 0.91484, 0.91484, 0.91484, 0.91484, 0.91484, 0.91484, 0.93575, 0.92383, 0.9403, 0.9403, 0.9403, 0.9403, 0.8717, 0.8717, 0.8717, 0.8717, 1.00527, 1.01756, 1.05356, 1.05356, 1.05356, 1.05356, 1.05356, 1.24644, 0.95923, 1.01756, 1.01756, 1.01756, 1.01756, 0.96777, 1.05707, 0.96777, 0.96706, 0.91484, 0.96706, 0.91484, 0.96706, 0.91484, 0.85734, 0.92383, 0.85734, 0.92383, 0.85734, 0.92383, 0.85734, 0.92383, 0.97093, 1.0969, 0.97093, 1.05882, 0.75842, 0.9403, 0.75842, 0.9403, 0.75842, 0.9403, 0.75842, 0.9403, 0.75842, 0.9403, 0.88198, 1.05882, 0.88198, 1.05882, 0.88198, 1.05882, 1, 1, 0.9831, 1.01756, 0.9831, 1.01756, 0.95782, 0.8717, 0.95782, 0.8717, 0.95782, 0.8717, 0.95782, 1.09011, 0.95782, 0.8717, 0.84784, 1.11551, 0.71387, 1.09011, 1, 1, 0.99414, 0.84636, 1.09011, 1, 1, 0.84636, 1.0536, 0.84636, 0.94298, 0.84636, 1.23297, 1.03584, 1.01756, 1, 1, 1.03584, 1.01756, 1.00323, 1.03444, 1.01756, 0.96924, 1.05356, 0.96924, 1.05356, 0.96924, 1.05356, 0.93066, 0.98293, 0.82826, 1.04399, 1, 1, 0.82826, 1.04399, 0.79649, 0.84863, 0.79649, 0.84863, 0.79649, 0.84863, 0.79649, 0.84863, 1, 1, 0.85771, 1.17318, 0.85771, 1.21968, 0.95132, 1.01756, 0.95132, 1.01756, 0.95132, 1.01756, 0.95132, 1.01756, 0.95132, 1.01756, 0.95132, 1.01756, 0.98965, 1.00068, 0.8287, 0.96777, 0.8287, 0.93365, 0.9043, 0.93365, 0.9043, 0.93365, 0.9043, 1.08571, 0.96927, 0.96706, 0.91484, 0.86035, 0.93575, 0.96924, 0.95923, 1, 1, 0.85771, 1.21968, 1.11437, 1.11437, 0.93109, 0.91202, 0.60411, 0.84164, 0.55572, 1.01173, 0.97361, 0.81818, 0.81818, 0.96635, 0.78032, 0.72727, 0.92366, 0.98601, 1.03405, 0.77968, 1.09799, 1.2, 0.96706, 0.85944, 0.85638, 0.96491, 0.75842, 0.93365, 0.9831, 0.96924, 0.95782, 0.86969, 0.94152, 1.07796, 1.03584, 0.78437, 0.96924, 0.98715, 0.83968, 0.83491, 0.85771, 0.8287, 0.94492, 0.88433, 0.9287, 1.0098, 0.95782, 0.8287, 1.0625, 0.98248, 1.03424, 1.2, 1.01071, 1.0625, 0.95246, 1.03809, 1.04912, 0.98248, 1.00221, 1.03424, 1.05443, 1.2, 1.04785, 0.99609, 1.00169, 1.05176, 0.99346, 1.05356, 0.9087, 1.03004, 0.95542, 0.93117, 1.23362, 1.01071, 1.07831, 1.02512, 1.05205, 1.03502, 1.2, 1.01071, 1.05356, 1.01071, 1.03502, 0.75842, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.03719, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.9403, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.04021, 1, 1, 1, 1, 1, 1, 0.98965, 1.00068, 0.98965, 1.00068, 0.98965, 1.00068, 0.8287, 0.96777, 1, 1.20088, 0.89903, 1, 1, 0.75155, 1.03077, 1.03077, 1.03077, 1.03077, 1.13196, 1.13196, 1.13196, 0.67428, 0.67428, 1.16039, 0.73291, 1.20996, 1.22135, 1.06483, 0.94868, 0.94868, 0.95996, 1.24633, 1, 1.07497, 0.87796, 0.96927, 1.01518, 0.96927, 1, 1, 1, 0.77295, 1, 1, 1.10539, 1.10539, 1.11358, 1.06967, 0.86279, 0.94434, 0.86279, 0.94434, 0.86182, 1, 1, 1.083, 1, 0.91578, 0.86507, 1.1714, 1.18416, 1.14589, 0.69825, 0.97622, 1.9697, 1.24822, 1.24822, 1.17238, 1.24822, 1.24822, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.42603, 1, 0.99862, 0.99862, 1, 0.87025, 0.87025, 0.87025, 0.87025, 1.18083, 1.42603, 1, 1.42603, 1.42603, 0.99862, 1, 1, 1, 1, 1, 1.2886, 1.04315, 1.15296, 1.34163, 1, 1, 1, 1.10938, 1.10938, 1, 1, 1, 1.05425, 1.09971, 1.09971, 1.09971, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
+exports.SegoeuiRegularFactors = SegoeuiRegularFactors;
+const SegoeuiRegularMetrics = {
+  lineHeight: 1.33008,
+  lineGap: 0
+};
+exports.SegoeuiRegularMetrics = SegoeuiRegularMetrics;
+
+/***/ }),
+/* 57 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.PostScriptEvaluator = exports.PostScriptCompiler = exports.PDFFunctionFactory = void 0;
+exports.isPDFFunction = isPDFFunction;
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _util = __w_pdfjs_require__(2);
+
+var _ps_parser = __w_pdfjs_require__(58);
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _image_utils = __w_pdfjs_require__(59);
+
+class PDFFunctionFactory {
+  constructor({
+    xref,
+    isEvalSupported = true
+  }) {
+    this.xref = xref;
+    this.isEvalSupported = isEvalSupported !== false;
+  }
+
+  create(fn) {
+    const cachedFunction = this.getCached(fn);
+
+    if (cachedFunction) {
+      return cachedFunction;
+    }
+
+    const parsedFunction = PDFFunction.parse({
+      xref: this.xref,
+      isEvalSupported: this.isEvalSupported,
+      fn: fn instanceof _primitives.Ref ? this.xref.fetch(fn) : fn
+    });
+
+    this._cache(fn, parsedFunction);
+
+    return parsedFunction;
+  }
+
+  createFromArray(fnObj) {
+    const cachedFunction = this.getCached(fnObj);
+
+    if (cachedFunction) {
+      return cachedFunction;
+    }
+
+    const parsedFunction = PDFFunction.parseArray({
+      xref: this.xref,
+      isEvalSupported: this.isEvalSupported,
+      fnObj: fnObj instanceof _primitives.Ref ? this.xref.fetch(fnObj) : fnObj
+    });
+
+    this._cache(fnObj, parsedFunction);
+
+    return parsedFunction;
+  }
+
+  getCached(cacheKey) {
+    let fnRef;
+
+    if (cacheKey instanceof _primitives.Ref) {
+      fnRef = cacheKey;
+    } else if (cacheKey instanceof _primitives.Dict) {
+      fnRef = cacheKey.objId;
+    } else if (cacheKey instanceof _base_stream.BaseStream) {
+      fnRef = cacheKey.dict && cacheKey.dict.objId;
+    }
+
+    if (fnRef) {
+      const localFunction = this._localFunctionCache.getByRef(fnRef);
+
+      if (localFunction) {
+        return localFunction;
+      }
+    }
+
+    return null;
+  }
+
+  _cache(cacheKey, parsedFunction) {
+    if (!parsedFunction) {
+      throw new Error('PDFFunctionFactory._cache - expected "parsedFunction" argument.');
+    }
+
+    let fnRef;
+
+    if (cacheKey instanceof _primitives.Ref) {
+      fnRef = cacheKey;
+    } else if (cacheKey instanceof _primitives.Dict) {
+      fnRef = cacheKey.objId;
+    } else if (cacheKey instanceof _base_stream.BaseStream) {
+      fnRef = cacheKey.dict && cacheKey.dict.objId;
+    }
+
+    if (fnRef) {
+      this._localFunctionCache.set(null, fnRef, parsedFunction);
+    }
+  }
+
+  get _localFunctionCache() {
+    return (0, _util.shadow)(this, "_localFunctionCache", new _image_utils.LocalFunctionCache());
+  }
+
+}
+
+exports.PDFFunctionFactory = PDFFunctionFactory;
+
+function toNumberArray(arr) {
+  if (!Array.isArray(arr)) {
+    return null;
+  }
+
+  const length = arr.length;
+
+  for (let i = 0; i < length; i++) {
+    if (typeof arr[i] !== "number") {
+      const result = new Array(length);
+
+      for (let j = 0; j < length; j++) {
+        result[j] = +arr[j];
+      }
+
+      return result;
+    }
+  }
+
+  return arr;
+}
+
+class PDFFunction {
+  static getSampleArray(size, outputSize, bps, stream) {
+    let i, ii;
+    let length = 1;
+
+    for (i = 0, ii = size.length; i < ii; i++) {
+      length *= size[i];
+    }
+
+    length *= outputSize;
+    const array = new Array(length);
+    let codeSize = 0;
+    let codeBuf = 0;
+    const sampleMul = 1.0 / (2.0 ** bps - 1);
+    const strBytes = stream.getBytes((length * bps + 7) / 8);
+    let strIdx = 0;
+
+    for (i = 0; i < length; i++) {
+      while (codeSize < bps) {
+        codeBuf <<= 8;
+        codeBuf |= strBytes[strIdx++];
+        codeSize += 8;
+      }
+
+      codeSize -= bps;
+      array[i] = (codeBuf >> codeSize) * sampleMul;
+      codeBuf &= (1 << codeSize) - 1;
+    }
+
+    return array;
+  }
+
+  static parse({
+    xref,
+    isEvalSupported,
+    fn
+  }) {
+    const dict = fn.dict || fn;
+    const typeNum = dict.get("FunctionType");
+
+    switch (typeNum) {
+      case 0:
+        return this.constructSampled({
+          xref,
+          isEvalSupported,
+          fn,
+          dict
+        });
+
+      case 1:
+        break;
+
+      case 2:
+        return this.constructInterpolated({
+          xref,
+          isEvalSupported,
+          dict
+        });
+
+      case 3:
+        return this.constructStiched({
+          xref,
+          isEvalSupported,
+          dict
+        });
+
+      case 4:
+        return this.constructPostScript({
+          xref,
+          isEvalSupported,
+          fn,
+          dict
+        });
+    }
+
+    throw new _util.FormatError("Unknown type of function");
+  }
+
+  static parseArray({
+    xref,
+    isEvalSupported,
+    fnObj
+  }) {
+    if (!Array.isArray(fnObj)) {
+      return this.parse({
+        xref,
+        isEvalSupported,
+        fn: fnObj
+      });
+    }
+
+    const fnArray = [];
+
+    for (let j = 0, jj = fnObj.length; j < jj; j++) {
+      fnArray.push(this.parse({
+        xref,
+        isEvalSupported,
+        fn: xref.fetchIfRef(fnObj[j])
+      }));
+    }
+
+    return function (src, srcOffset, dest, destOffset) {
+      for (let i = 0, ii = fnArray.length; i < ii; i++) {
+        fnArray[i](src, srcOffset, dest, destOffset + i);
+      }
+    };
+  }
+
+  static constructSampled({
+    xref,
+    isEvalSupported,
+    fn,
+    dict
+  }) {
+    function toMultiArray(arr) {
+      const inputLength = arr.length;
+      const out = [];
+      let index = 0;
+
+      for (let i = 0; i < inputLength; i += 2) {
+        out[index++] = [arr[i], arr[i + 1]];
+      }
+
+      return out;
+    }
+
+    function interpolate(x, xmin, xmax, ymin, ymax) {
+      return ymin + (x - xmin) * ((ymax - ymin) / (xmax - xmin));
+    }
+
+    let domain = toNumberArray(dict.getArray("Domain"));
+    let range = toNumberArray(dict.getArray("Range"));
+
+    if (!domain || !range) {
+      throw new _util.FormatError("No domain or range");
+    }
+
+    const inputSize = domain.length / 2;
+    const outputSize = range.length / 2;
+    domain = toMultiArray(domain);
+    range = toMultiArray(range);
+    const size = toNumberArray(dict.getArray("Size"));
+    const bps = dict.get("BitsPerSample");
+    const order = dict.get("Order") || 1;
+
+    if (order !== 1) {
+      (0, _util.info)("No support for cubic spline interpolation: " + order);
+    }
+
+    let encode = toNumberArray(dict.getArray("Encode"));
+
+    if (!encode) {
+      encode = [];
+
+      for (let i = 0; i < inputSize; ++i) {
+        encode.push([0, size[i] - 1]);
+      }
+    } else {
+      encode = toMultiArray(encode);
+    }
+
+    let decode = toNumberArray(dict.getArray("Decode"));
+
+    if (!decode) {
+      decode = range;
+    } else {
+      decode = toMultiArray(decode);
+    }
+
+    const samples = this.getSampleArray(size, outputSize, bps, fn);
+    return function constructSampledFn(src, srcOffset, dest, destOffset) {
+      const cubeVertices = 1 << inputSize;
+      const cubeN = new Float64Array(cubeVertices);
+      const cubeVertex = new Uint32Array(cubeVertices);
+      let i, j;
+
+      for (j = 0; j < cubeVertices; j++) {
+        cubeN[j] = 1;
+      }
+
+      let k = outputSize,
+          pos = 1;
+
+      for (i = 0; i < inputSize; ++i) {
+        const domain_2i = domain[i][0];
+        const domain_2i_1 = domain[i][1];
+        const xi = Math.min(Math.max(src[srcOffset + i], domain_2i), domain_2i_1);
+        let e = interpolate(xi, domain_2i, domain_2i_1, encode[i][0], encode[i][1]);
+        const size_i = size[i];
+        e = Math.min(Math.max(e, 0), size_i - 1);
+        const e0 = e < size_i - 1 ? Math.floor(e) : e - 1;
+        const n0 = e0 + 1 - e;
+        const n1 = e - e0;
+        const offset0 = e0 * k;
+        const offset1 = offset0 + k;
+
+        for (j = 0; j < cubeVertices; j++) {
+          if (j & pos) {
+            cubeN[j] *= n1;
+            cubeVertex[j] += offset1;
+          } else {
+            cubeN[j] *= n0;
+            cubeVertex[j] += offset0;
+          }
+        }
+
+        k *= size_i;
+        pos <<= 1;
+      }
+
+      for (j = 0; j < outputSize; ++j) {
+        let rj = 0;
+
+        for (i = 0; i < cubeVertices; i++) {
+          rj += samples[cubeVertex[i] + j] * cubeN[i];
+        }
+
+        rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]);
+        dest[destOffset + j] = Math.min(Math.max(rj, range[j][0]), range[j][1]);
+      }
+    };
+  }
+
+  static constructInterpolated({
+    xref,
+    isEvalSupported,
+    dict
+  }) {
+    const c0 = toNumberArray(dict.getArray("C0")) || [0];
+    const c1 = toNumberArray(dict.getArray("C1")) || [1];
+    const n = dict.get("N");
+    const diff = [];
+
+    for (let i = 0, ii = c0.length; i < ii; ++i) {
+      diff.push(c1[i] - c0[i]);
+    }
+
+    const length = diff.length;
+    return function constructInterpolatedFn(src, srcOffset, dest, destOffset) {
+      const x = n === 1 ? src[srcOffset] : src[srcOffset] ** n;
+
+      for (let j = 0; j < length; ++j) {
+        dest[destOffset + j] = c0[j] + x * diff[j];
+      }
+    };
+  }
+
+  static constructStiched({
+    xref,
+    isEvalSupported,
+    dict
+  }) {
+    const domain = toNumberArray(dict.getArray("Domain"));
+
+    if (!domain) {
+      throw new _util.FormatError("No domain");
+    }
+
+    const inputSize = domain.length / 2;
+
+    if (inputSize !== 1) {
+      throw new _util.FormatError("Bad domain for stiched function");
+    }
+
+    const fnRefs = dict.get("Functions");
+    const fns = [];
+
+    for (let i = 0, ii = fnRefs.length; i < ii; ++i) {
+      fns.push(this.parse({
+        xref,
+        isEvalSupported,
+        fn: xref.fetchIfRef(fnRefs[i])
+      }));
+    }
+
+    const bounds = toNumberArray(dict.getArray("Bounds"));
+    const encode = toNumberArray(dict.getArray("Encode"));
+    const tmpBuf = new Float32Array(1);
+    return function constructStichedFn(src, srcOffset, dest, destOffset) {
+      const clip = function constructStichedFromIRClip(v, min, max) {
+        if (v > max) {
+          v = max;
+        } else if (v < min) {
+          v = min;
+        }
+
+        return v;
+      };
+
+      const v = clip(src[srcOffset], domain[0], domain[1]);
+      const length = bounds.length;
+      let i;
+
+      for (i = 0; i < length; ++i) {
+        if (v < bounds[i]) {
+          break;
+        }
+      }
+
+      let dmin = domain[0];
+
+      if (i > 0) {
+        dmin = bounds[i - 1];
+      }
+
+      let dmax = domain[1];
+
+      if (i < bounds.length) {
+        dmax = bounds[i];
+      }
+
+      const rmin = encode[2 * i];
+      const rmax = encode[2 * i + 1];
+      tmpBuf[0] = dmin === dmax ? rmin : rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
+      fns[i](tmpBuf, 0, dest, destOffset);
+    };
+  }
+
+  static constructPostScript({
+    xref,
+    isEvalSupported,
+    fn,
+    dict
+  }) {
+    const domain = toNumberArray(dict.getArray("Domain"));
+    const range = toNumberArray(dict.getArray("Range"));
+
+    if (!domain) {
+      throw new _util.FormatError("No domain.");
+    }
+
+    if (!range) {
+      throw new _util.FormatError("No range.");
+    }
+
+    const lexer = new _ps_parser.PostScriptLexer(fn);
+    const parser = new _ps_parser.PostScriptParser(lexer);
+    const code = parser.parse();
+
+    if (isEvalSupported && _util.FeatureTest.isEvalSupported) {
+      const compiled = new PostScriptCompiler().compile(code, domain, range);
+
+      if (compiled) {
+        return new Function("src", "srcOffset", "dest", "destOffset", compiled);
+      }
+    }
+
+    (0, _util.info)("Unable to compile PS function");
+    const numOutputs = range.length >> 1;
+    const numInputs = domain.length >> 1;
+    const evaluator = new PostScriptEvaluator(code);
+    const cache = Object.create(null);
+    const MAX_CACHE_SIZE = 2048 * 4;
+    let cache_available = MAX_CACHE_SIZE;
+    const tmpBuf = new Float32Array(numInputs);
+    return function constructPostScriptFn(src, srcOffset, dest, destOffset) {
+      let i, value;
+      let key = "";
+      const input = tmpBuf;
+
+      for (i = 0; i < numInputs; i++) {
+        value = src[srcOffset + i];
+        input[i] = value;
+        key += value + "_";
+      }
+
+      const cachedValue = cache[key];
+
+      if (cachedValue !== undefined) {
+        dest.set(cachedValue, destOffset);
+        return;
+      }
+
+      const output = new Float32Array(numOutputs);
+      const stack = evaluator.execute(input);
+      const stackIndex = stack.length - numOutputs;
+
+      for (i = 0; i < numOutputs; i++) {
+        value = stack[stackIndex + i];
+        let bound = range[i * 2];
+
+        if (value < bound) {
+          value = bound;
+        } else {
+          bound = range[i * 2 + 1];
+
+          if (value > bound) {
+            value = bound;
+          }
+        }
+
+        output[i] = value;
+      }
+
+      if (cache_available > 0) {
+        cache_available--;
+        cache[key] = output;
+      }
+
+      dest.set(output, destOffset);
+    };
+  }
+
+}
+
+function isPDFFunction(v) {
+  let fnDict;
+
+  if (typeof v !== "object") {
+    return false;
+  } else if (v instanceof _primitives.Dict) {
+    fnDict = v;
+  } else if (v instanceof _base_stream.BaseStream) {
+    fnDict = v.dict;
+  } else {
+    return false;
+  }
+
+  return fnDict.has("FunctionType");
+}
+
+class PostScriptStack {
+  static get MAX_STACK_SIZE() {
+    return (0, _util.shadow)(this, "MAX_STACK_SIZE", 100);
+  }
+
+  constructor(initialStack) {
+    this.stack = !initialStack ? [] : Array.prototype.slice.call(initialStack, 0);
+  }
+
+  push(value) {
+    if (this.stack.length >= PostScriptStack.MAX_STACK_SIZE) {
+      throw new Error("PostScript function stack overflow.");
+    }
+
+    this.stack.push(value);
+  }
+
+  pop() {
+    if (this.stack.length <= 0) {
+      throw new Error("PostScript function stack underflow.");
+    }
+
+    return this.stack.pop();
+  }
+
+  copy(n) {
+    if (this.stack.length + n >= PostScriptStack.MAX_STACK_SIZE) {
+      throw new Error("PostScript function stack overflow.");
+    }
+
+    const stack = this.stack;
+
+    for (let i = stack.length - n, j = n - 1; j >= 0; j--, i++) {
+      stack.push(stack[i]);
+    }
+  }
+
+  index(n) {
+    this.push(this.stack[this.stack.length - n - 1]);
+  }
+
+  roll(n, p) {
+    const stack = this.stack;
+    const l = stack.length - n;
+    const r = stack.length - 1;
+    const c = l + (p - Math.floor(p / n) * n);
+
+    for (let i = l, j = r; i < j; i++, j--) {
+      const t = stack[i];
+      stack[i] = stack[j];
+      stack[j] = t;
+    }
+
+    for (let i = l, j = c - 1; i < j; i++, j--) {
+      const t = stack[i];
+      stack[i] = stack[j];
+      stack[j] = t;
+    }
+
+    for (let i = c, j = r; i < j; i++, j--) {
+      const t = stack[i];
+      stack[i] = stack[j];
+      stack[j] = t;
+    }
+  }
+
+}
+
+class PostScriptEvaluator {
+  constructor(operators) {
+    this.operators = operators;
+  }
+
+  execute(initialStack) {
+    const stack = new PostScriptStack(initialStack);
+    let counter = 0;
+    const operators = this.operators;
+    const length = operators.length;
+    let operator, a, b;
+
+    while (counter < length) {
+      operator = operators[counter++];
+
+      if (typeof operator === "number") {
+        stack.push(operator);
+        continue;
+      }
+
+      switch (operator) {
+        case "jz":
+          b = stack.pop();
+          a = stack.pop();
+
+          if (!a) {
+            counter = b;
+          }
+
+          break;
+
+        case "j":
+          a = stack.pop();
+          counter = a;
+          break;
+
+        case "abs":
+          a = stack.pop();
+          stack.push(Math.abs(a));
+          break;
+
+        case "add":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a + b);
+          break;
+
+        case "and":
+          b = stack.pop();
+          a = stack.pop();
+
+          if (typeof a === "boolean" && typeof b === "boolean") {
+            stack.push(a && b);
+          } else {
+            stack.push(a & b);
+          }
+
+          break;
+
+        case "atan":
+          a = stack.pop();
+          stack.push(Math.atan(a));
+          break;
+
+        case "bitshift":
+          b = stack.pop();
+          a = stack.pop();
+
+          if (a > 0) {
+            stack.push(a << b);
+          } else {
+            stack.push(a >> b);
+          }
+
+          break;
+
+        case "ceiling":
+          a = stack.pop();
+          stack.push(Math.ceil(a));
+          break;
+
+        case "copy":
+          a = stack.pop();
+          stack.copy(a);
+          break;
+
+        case "cos":
+          a = stack.pop();
+          stack.push(Math.cos(a));
+          break;
+
+        case "cvi":
+          a = stack.pop() | 0;
+          stack.push(a);
+          break;
+
+        case "cvr":
+          break;
+
+        case "div":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a / b);
+          break;
+
+        case "dup":
+          stack.copy(1);
+          break;
+
+        case "eq":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a === b);
+          break;
+
+        case "exch":
+          stack.roll(2, 1);
+          break;
+
+        case "exp":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a ** b);
+          break;
+
+        case "false":
+          stack.push(false);
+          break;
+
+        case "floor":
+          a = stack.pop();
+          stack.push(Math.floor(a));
+          break;
+
+        case "ge":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a >= b);
+          break;
+
+        case "gt":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a > b);
+          break;
+
+        case "idiv":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a / b | 0);
+          break;
+
+        case "index":
+          a = stack.pop();
+          stack.index(a);
+          break;
+
+        case "le":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a <= b);
+          break;
+
+        case "ln":
+          a = stack.pop();
+          stack.push(Math.log(a));
+          break;
+
+        case "log":
+          a = stack.pop();
+          stack.push(Math.log(a) / Math.LN10);
+          break;
+
+        case "lt":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a < b);
+          break;
+
+        case "mod":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a % b);
+          break;
+
+        case "mul":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a * b);
+          break;
+
+        case "ne":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a !== b);
+          break;
+
+        case "neg":
+          a = stack.pop();
+          stack.push(-a);
+          break;
+
+        case "not":
+          a = stack.pop();
+
+          if (typeof a === "boolean") {
+            stack.push(!a);
+          } else {
+            stack.push(~a);
+          }
+
+          break;
+
+        case "or":
+          b = stack.pop();
+          a = stack.pop();
+
+          if (typeof a === "boolean" && typeof b === "boolean") {
+            stack.push(a || b);
+          } else {
+            stack.push(a | b);
+          }
+
+          break;
+
+        case "pop":
+          stack.pop();
+          break;
+
+        case "roll":
+          b = stack.pop();
+          a = stack.pop();
+          stack.roll(a, b);
+          break;
+
+        case "round":
+          a = stack.pop();
+          stack.push(Math.round(a));
+          break;
+
+        case "sin":
+          a = stack.pop();
+          stack.push(Math.sin(a));
+          break;
+
+        case "sqrt":
+          a = stack.pop();
+          stack.push(Math.sqrt(a));
+          break;
+
+        case "sub":
+          b = stack.pop();
+          a = stack.pop();
+          stack.push(a - b);
+          break;
+
+        case "true":
+          stack.push(true);
+          break;
+
+        case "truncate":
+          a = stack.pop();
+          a = a < 0 ? Math.ceil(a) : Math.floor(a);
+          stack.push(a);
+          break;
+
+        case "xor":
+          b = stack.pop();
+          a = stack.pop();
+
+          if (typeof a === "boolean" && typeof b === "boolean") {
+            stack.push(a !== b);
+          } else {
+            stack.push(a ^ b);
+          }
+
+          break;
+
+        default:
+          throw new _util.FormatError(`Unknown operator ${operator}`);
+      }
+    }
+
+    return stack.stack;
+  }
+
+}
+
+exports.PostScriptEvaluator = PostScriptEvaluator;
+
+class AstNode {
+  constructor(type) {
+    this.type = type;
+  }
+
+  visit(visitor) {
+    (0, _util.unreachable)("abstract method");
+  }
+
+}
+
+class AstArgument extends AstNode {
+  constructor(index, min, max) {
+    super("args");
+    this.index = index;
+    this.min = min;
+    this.max = max;
+  }
+
+  visit(visitor) {
+    visitor.visitArgument(this);
+  }
+
+}
+
+class AstLiteral extends AstNode {
+  constructor(number) {
+    super("literal");
+    this.number = number;
+    this.min = number;
+    this.max = number;
+  }
+
+  visit(visitor) {
+    visitor.visitLiteral(this);
+  }
+
+}
+
+class AstBinaryOperation extends AstNode {
+  constructor(op, arg1, arg2, min, max) {
+    super("binary");
+    this.op = op;
+    this.arg1 = arg1;
+    this.arg2 = arg2;
+    this.min = min;
+    this.max = max;
+  }
+
+  visit(visitor) {
+    visitor.visitBinaryOperation(this);
+  }
+
+}
+
+class AstMin extends AstNode {
+  constructor(arg, max) {
+    super("max");
+    this.arg = arg;
+    this.min = arg.min;
+    this.max = max;
+  }
+
+  visit(visitor) {
+    visitor.visitMin(this);
+  }
+
+}
+
+class AstVariable extends AstNode {
+  constructor(index, min, max) {
+    super("var");
+    this.index = index;
+    this.min = min;
+    this.max = max;
+  }
+
+  visit(visitor) {
+    visitor.visitVariable(this);
+  }
+
+}
+
+class AstVariableDefinition extends AstNode {
+  constructor(variable, arg) {
+    super("definition");
+    this.variable = variable;
+    this.arg = arg;
+  }
+
+  visit(visitor) {
+    visitor.visitVariableDefinition(this);
+  }
+
+}
+
+class ExpressionBuilderVisitor {
+  constructor() {
+    this.parts = [];
+  }
+
+  visitArgument(arg) {
+    this.parts.push("Math.max(", arg.min, ", Math.min(", arg.max, ", src[srcOffset + ", arg.index, "]))");
+  }
+
+  visitVariable(variable) {
+    this.parts.push("v", variable.index);
+  }
+
+  visitLiteral(literal) {
+    this.parts.push(literal.number);
+  }
+
+  visitBinaryOperation(operation) {
+    this.parts.push("(");
+    operation.arg1.visit(this);
+    this.parts.push(" ", operation.op, " ");
+    operation.arg2.visit(this);
+    this.parts.push(")");
+  }
+
+  visitVariableDefinition(definition) {
+    this.parts.push("var ");
+    definition.variable.visit(this);
+    this.parts.push(" = ");
+    definition.arg.visit(this);
+    this.parts.push(";");
+  }
+
+  visitMin(max) {
+    this.parts.push("Math.min(");
+    max.arg.visit(this);
+    this.parts.push(", ", max.max, ")");
+  }
+
+  toString() {
+    return this.parts.join("");
+  }
+
+}
+
+function buildAddOperation(num1, num2) {
+  if (num2.type === "literal" && num2.number === 0) {
+    return num1;
+  }
+
+  if (num1.type === "literal" && num1.number === 0) {
+    return num2;
+  }
+
+  if (num2.type === "literal" && num1.type === "literal") {
+    return new AstLiteral(num1.number + num2.number);
+  }
+
+  return new AstBinaryOperation("+", num1, num2, num1.min + num2.min, num1.max + num2.max);
+}
+
+function buildMulOperation(num1, num2) {
+  if (num2.type === "literal") {
+    if (num2.number === 0) {
+      return new AstLiteral(0);
+    } else if (num2.number === 1) {
+      return num1;
+    } else if (num1.type === "literal") {
+      return new AstLiteral(num1.number * num2.number);
+    }
+  }
+
+  if (num1.type === "literal") {
+    if (num1.number === 0) {
+      return new AstLiteral(0);
+    } else if (num1.number === 1) {
+      return num2;
+    }
+  }
+
+  const min = Math.min(num1.min * num2.min, num1.min * num2.max, num1.max * num2.min, num1.max * num2.max);
+  const max = Math.max(num1.min * num2.min, num1.min * num2.max, num1.max * num2.min, num1.max * num2.max);
+  return new AstBinaryOperation("*", num1, num2, min, max);
+}
+
+function buildSubOperation(num1, num2) {
+  if (num2.type === "literal") {
+    if (num2.number === 0) {
+      return num1;
+    } else if (num1.type === "literal") {
+      return new AstLiteral(num1.number - num2.number);
+    }
+  }
+
+  if (num2.type === "binary" && num2.op === "-" && num1.type === "literal" && num1.number === 1 && num2.arg1.type === "literal" && num2.arg1.number === 1) {
+    return num2.arg2;
+  }
+
+  return new AstBinaryOperation("-", num1, num2, num1.min - num2.max, num1.max - num2.min);
+}
+
+function buildMinOperation(num1, max) {
+  if (num1.min >= max) {
+    return new AstLiteral(max);
+  } else if (num1.max <= max) {
+    return num1;
+  }
+
+  return new AstMin(num1, max);
+}
+
+class PostScriptCompiler {
+  compile(code, domain, range) {
+    const stack = [];
+    const instructions = [];
+    const inputSize = domain.length >> 1,
+          outputSize = range.length >> 1;
+    let lastRegister = 0;
+    let n, j;
+    let num1, num2, ast1, ast2, tmpVar, item;
+
+    for (let i = 0; i < inputSize; i++) {
+      stack.push(new AstArgument(i, domain[i * 2], domain[i * 2 + 1]));
+    }
+
+    for (let i = 0, ii = code.length; i < ii; i++) {
+      item = code[i];
+
+      if (typeof item === "number") {
+        stack.push(new AstLiteral(item));
+        continue;
+      }
+
+      switch (item) {
+        case "add":
+          if (stack.length < 2) {
+            return null;
+          }
+
+          num2 = stack.pop();
+          num1 = stack.pop();
+          stack.push(buildAddOperation(num1, num2));
+          break;
+
+        case "cvr":
+          if (stack.length < 1) {
+            return null;
+          }
+
+          break;
+
+        case "mul":
+          if (stack.length < 2) {
+            return null;
+          }
+
+          num2 = stack.pop();
+          num1 = stack.pop();
+          stack.push(buildMulOperation(num1, num2));
+          break;
+
+        case "sub":
+          if (stack.length < 2) {
+            return null;
+          }
+
+          num2 = stack.pop();
+          num1 = stack.pop();
+          stack.push(buildSubOperation(num1, num2));
+          break;
+
+        case "exch":
+          if (stack.length < 2) {
+            return null;
+          }
+
+          ast1 = stack.pop();
+          ast2 = stack.pop();
+          stack.push(ast1, ast2);
+          break;
+
+        case "pop":
+          if (stack.length < 1) {
+            return null;
+          }
+
+          stack.pop();
+          break;
+
+        case "index":
+          if (stack.length < 1) {
+            return null;
+          }
+
+          num1 = stack.pop();
+
+          if (num1.type !== "literal") {
+            return null;
+          }
+
+          n = num1.number;
+
+          if (n < 0 || !Number.isInteger(n) || stack.length < n) {
+            return null;
+          }
+
+          ast1 = stack[stack.length - n - 1];
+
+          if (ast1.type === "literal" || ast1.type === "var") {
+            stack.push(ast1);
+            break;
+          }
+
+          tmpVar = new AstVariable(lastRegister++, ast1.min, ast1.max);
+          stack[stack.length - n - 1] = tmpVar;
+          stack.push(tmpVar);
+          instructions.push(new AstVariableDefinition(tmpVar, ast1));
+          break;
+
+        case "dup":
+          if (stack.length < 1) {
+            return null;
+          }
+
+          if (typeof code[i + 1] === "number" && code[i + 2] === "gt" && code[i + 3] === i + 7 && code[i + 4] === "jz" && code[i + 5] === "pop" && code[i + 6] === code[i + 1]) {
+            num1 = stack.pop();
+            stack.push(buildMinOperation(num1, code[i + 1]));
+            i += 6;
+            break;
+          }
+
+          ast1 = stack.at(-1);
+
+          if (ast1.type === "literal" || ast1.type === "var") {
+            stack.push(ast1);
+            break;
+          }
+
+          tmpVar = new AstVariable(lastRegister++, ast1.min, ast1.max);
+          stack[stack.length - 1] = tmpVar;
+          stack.push(tmpVar);
+          instructions.push(new AstVariableDefinition(tmpVar, ast1));
+          break;
+
+        case "roll":
+          if (stack.length < 2) {
+            return null;
+          }
+
+          num2 = stack.pop();
+          num1 = stack.pop();
+
+          if (num2.type !== "literal" || num1.type !== "literal") {
+            return null;
+          }
+
+          j = num2.number;
+          n = num1.number;
+
+          if (n <= 0 || !Number.isInteger(n) || !Number.isInteger(j) || stack.length < n) {
+            return null;
+          }
+
+          j = (j % n + n) % n;
+
+          if (j === 0) {
+            break;
+          }
+
+          Array.prototype.push.apply(stack, stack.splice(stack.length - n, n - j));
+          break;
+
+        default:
+          return null;
+      }
+    }
+
+    if (stack.length !== outputSize) {
+      return null;
+    }
+
+    const result = [];
+
+    for (const instruction of instructions) {
+      const statementBuilder = new ExpressionBuilderVisitor();
+      instruction.visit(statementBuilder);
+      result.push(statementBuilder.toString());
+    }
+
+    for (let i = 0, ii = stack.length; i < ii; i++) {
+      const expr = stack[i],
+            statementBuilder = new ExpressionBuilderVisitor();
+      expr.visit(statementBuilder);
+      const min = range[i * 2],
+            max = range[i * 2 + 1];
+      const out = [statementBuilder.toString()];
+
+      if (min > expr.min) {
+        out.unshift("Math.max(", min, ", ");
+        out.push(")");
+      }
+
+      if (max < expr.max) {
+        out.unshift("Math.min(", max, ", ");
+        out.push(")");
+      }
+
+      out.unshift("dest[destOffset + ", i, "] = ");
+      out.push(";");
+      result.push(out.join(""));
+    }
+
+    return result.join("\n");
+  }
+
+}
+
+exports.PostScriptCompiler = PostScriptCompiler;
+
+/***/ }),
+/* 58 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.PostScriptParser = exports.PostScriptLexer = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+class PostScriptParser {
+  constructor(lexer) {
+    this.lexer = lexer;
+    this.operators = [];
+    this.token = null;
+    this.prev = null;
+  }
+
+  nextToken() {
+    this.prev = this.token;
+    this.token = this.lexer.getToken();
+  }
+
+  accept(type) {
+    if (this.token.type === type) {
+      this.nextToken();
+      return true;
+    }
+
+    return false;
+  }
+
+  expect(type) {
+    if (this.accept(type)) {
+      return true;
+    }
+
+    throw new _util.FormatError(`Unexpected symbol: found ${this.token.type} expected ${type}.`);
+  }
+
+  parse() {
+    this.nextToken();
+    this.expect(PostScriptTokenTypes.LBRACE);
+    this.parseBlock();
+    this.expect(PostScriptTokenTypes.RBRACE);
+    return this.operators;
+  }
+
+  parseBlock() {
+    while (true) {
+      if (this.accept(PostScriptTokenTypes.NUMBER)) {
+        this.operators.push(this.prev.value);
+      } else if (this.accept(PostScriptTokenTypes.OPERATOR)) {
+        this.operators.push(this.prev.value);
+      } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
+        this.parseCondition();
+      } else {
+        return;
+      }
+    }
+  }
+
+  parseCondition() {
+    const conditionLocation = this.operators.length;
+    this.operators.push(null, null);
+    this.parseBlock();
+    this.expect(PostScriptTokenTypes.RBRACE);
+
+    if (this.accept(PostScriptTokenTypes.IF)) {
+      this.operators[conditionLocation] = this.operators.length;
+      this.operators[conditionLocation + 1] = "jz";
+    } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
+      const jumpLocation = this.operators.length;
+      this.operators.push(null, null);
+      const endOfTrue = this.operators.length;
+      this.parseBlock();
+      this.expect(PostScriptTokenTypes.RBRACE);
+      this.expect(PostScriptTokenTypes.IFELSE);
+      this.operators[jumpLocation] = this.operators.length;
+      this.operators[jumpLocation + 1] = "j";
+      this.operators[conditionLocation] = endOfTrue;
+      this.operators[conditionLocation + 1] = "jz";
+    } else {
+      throw new _util.FormatError("PS Function: error parsing conditional.");
+    }
+  }
+
+}
+
+exports.PostScriptParser = PostScriptParser;
+const PostScriptTokenTypes = {
+  LBRACE: 0,
+  RBRACE: 1,
+  NUMBER: 2,
+  OPERATOR: 3,
+  IF: 4,
+  IFELSE: 5
+};
+
+class PostScriptToken {
+  static get opCache() {
+    return (0, _util.shadow)(this, "opCache", Object.create(null));
+  }
+
+  constructor(type, value) {
+    this.type = type;
+    this.value = value;
+  }
+
+  static getOperator(op) {
+    const opValue = PostScriptToken.opCache[op];
+
+    if (opValue) {
+      return opValue;
+    }
+
+    return PostScriptToken.opCache[op] = new PostScriptToken(PostScriptTokenTypes.OPERATOR, op);
+  }
+
+  static get LBRACE() {
+    return (0, _util.shadow)(this, "LBRACE", new PostScriptToken(PostScriptTokenTypes.LBRACE, "{"));
+  }
+
+  static get RBRACE() {
+    return (0, _util.shadow)(this, "RBRACE", new PostScriptToken(PostScriptTokenTypes.RBRACE, "}"));
+  }
+
+  static get IF() {
+    return (0, _util.shadow)(this, "IF", new PostScriptToken(PostScriptTokenTypes.IF, "IF"));
+  }
+
+  static get IFELSE() {
+    return (0, _util.shadow)(this, "IFELSE", new PostScriptToken(PostScriptTokenTypes.IFELSE, "IFELSE"));
+  }
+
+}
+
+class PostScriptLexer {
+  constructor(stream) {
+    this.stream = stream;
+    this.nextChar();
+    this.strBuf = [];
+  }
+
+  nextChar() {
+    return this.currentChar = this.stream.getByte();
+  }
+
+  getToken() {
+    let comment = false;
+    let ch = this.currentChar;
+
+    while (true) {
+      if (ch < 0) {
+        return _primitives.EOF;
+      }
+
+      if (comment) {
+        if (ch === 0x0a || ch === 0x0d) {
+          comment = false;
+        }
+      } else if (ch === 0x25) {
+        comment = true;
+      } else if (!(0, _core_utils.isWhiteSpace)(ch)) {
+        break;
+      }
+
+      ch = this.nextChar();
+    }
+
+    switch (ch | 0) {
+      case 0x30:
+      case 0x31:
+      case 0x32:
+      case 0x33:
+      case 0x34:
+      case 0x35:
+      case 0x36:
+      case 0x37:
+      case 0x38:
+      case 0x39:
+      case 0x2b:
+      case 0x2d:
+      case 0x2e:
+        return new PostScriptToken(PostScriptTokenTypes.NUMBER, this.getNumber());
+
+      case 0x7b:
+        this.nextChar();
+        return PostScriptToken.LBRACE;
+
+      case 0x7d:
+        this.nextChar();
+        return PostScriptToken.RBRACE;
+    }
+
+    const strBuf = this.strBuf;
+    strBuf.length = 0;
+    strBuf[0] = String.fromCharCode(ch);
+
+    while ((ch = this.nextChar()) >= 0 && (ch >= 0x41 && ch <= 0x5a || ch >= 0x61 && ch <= 0x7a)) {
+      strBuf.push(String.fromCharCode(ch));
+    }
+
+    const str = strBuf.join("");
+
+    switch (str.toLowerCase()) {
+      case "if":
+        return PostScriptToken.IF;
+
+      case "ifelse":
+        return PostScriptToken.IFELSE;
+
+      default:
+        return PostScriptToken.getOperator(str);
+    }
+  }
+
+  getNumber() {
+    let ch = this.currentChar;
+    const strBuf = this.strBuf;
+    strBuf.length = 0;
+    strBuf[0] = String.fromCharCode(ch);
+
+    while ((ch = this.nextChar()) >= 0) {
+      if (ch >= 0x30 && ch <= 0x39 || ch === 0x2d || ch === 0x2e) {
+        strBuf.push(String.fromCharCode(ch));
+      } else {
+        break;
+      }
+    }
+
+    const value = parseFloat(strBuf.join(""));
+
+    if (isNaN(value)) {
+      throw new _util.FormatError(`Invalid floating point number: ${value}`);
+    }
+
+    return value;
+  }
+
+}
+
+exports.PostScriptLexer = PostScriptLexer;
+
+/***/ }),
+/* 59 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.LocalTilingPatternCache = exports.LocalImageCache = exports.LocalGStateCache = exports.LocalFunctionCache = exports.LocalColorSpaceCache = exports.GlobalImageCache = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _primitives = __w_pdfjs_require__(5);
+
+class BaseLocalCache {
+  constructor(options) {
+    if (this.constructor === BaseLocalCache) {
+      (0, _util.unreachable)("Cannot initialize BaseLocalCache.");
+    }
+
+    this._onlyRefs = (options && options.onlyRefs) === true;
+
+    if (!this._onlyRefs) {
+      this._nameRefMap = new Map();
+      this._imageMap = new Map();
+    }
+
+    this._imageCache = new _primitives.RefSetCache();
+  }
+
+  getByName(name) {
+    if (this._onlyRefs) {
+      (0, _util.unreachable)("Should not call `getByName` method.");
+    }
+
+    const ref = this._nameRefMap.get(name);
+
+    if (ref) {
+      return this.getByRef(ref);
+    }
+
+    return this._imageMap.get(name) || null;
+  }
+
+  getByRef(ref) {
+    return this._imageCache.get(ref) || null;
+  }
+
+  set(name, ref, data) {
+    (0, _util.unreachable)("Abstract method `set` called.");
+  }
+
+}
+
+class LocalImageCache extends BaseLocalCache {
+  set(name, ref = null, data) {
+    if (typeof name !== "string") {
+      throw new Error('LocalImageCache.set - expected "name" argument.');
+    }
+
+    if (ref) {
+      if (this._imageCache.has(ref)) {
+        return;
+      }
+
+      this._nameRefMap.set(name, ref);
+
+      this._imageCache.put(ref, data);
+
+      return;
+    }
+
+    if (this._imageMap.has(name)) {
+      return;
+    }
+
+    this._imageMap.set(name, data);
+  }
+
+}
+
+exports.LocalImageCache = LocalImageCache;
+
+class LocalColorSpaceCache extends BaseLocalCache {
+  set(name = null, ref = null, data) {
+    if (typeof name !== "string" && !ref) {
+      throw new Error('LocalColorSpaceCache.set - expected "name" and/or "ref" argument.');
+    }
+
+    if (ref) {
+      if (this._imageCache.has(ref)) {
+        return;
+      }
+
+      if (name !== null) {
+        this._nameRefMap.set(name, ref);
+      }
+
+      this._imageCache.put(ref, data);
+
+      return;
+    }
+
+    if (this._imageMap.has(name)) {
+      return;
+    }
+
+    this._imageMap.set(name, data);
+  }
+
+}
+
+exports.LocalColorSpaceCache = LocalColorSpaceCache;
+
+class LocalFunctionCache extends BaseLocalCache {
+  constructor(options) {
+    super({
+      onlyRefs: true
+    });
+  }
+
+  set(name = null, ref, data) {
+    if (!ref) {
+      throw new Error('LocalFunctionCache.set - expected "ref" argument.');
+    }
+
+    if (this._imageCache.has(ref)) {
+      return;
+    }
+
+    this._imageCache.put(ref, data);
+  }
+
+}
+
+exports.LocalFunctionCache = LocalFunctionCache;
+
+class LocalGStateCache extends BaseLocalCache {
+  set(name, ref = null, data) {
+    if (typeof name !== "string") {
+      throw new Error('LocalGStateCache.set - expected "name" argument.');
+    }
+
+    if (ref) {
+      if (this._imageCache.has(ref)) {
+        return;
+      }
+
+      this._nameRefMap.set(name, ref);
+
+      this._imageCache.put(ref, data);
+
+      return;
+    }
+
+    if (this._imageMap.has(name)) {
+      return;
+    }
+
+    this._imageMap.set(name, data);
+  }
+
+}
+
+exports.LocalGStateCache = LocalGStateCache;
+
+class LocalTilingPatternCache extends BaseLocalCache {
+  constructor(options) {
+    super({
+      onlyRefs: true
+    });
+  }
+
+  set(name = null, ref, data) {
+    if (!ref) {
+      throw new Error('LocalTilingPatternCache.set - expected "ref" argument.');
+    }
+
+    if (this._imageCache.has(ref)) {
+      return;
+    }
+
+    this._imageCache.put(ref, data);
+  }
+
+}
+
+exports.LocalTilingPatternCache = LocalTilingPatternCache;
+
+class GlobalImageCache {
+  static get NUM_PAGES_THRESHOLD() {
+    return (0, _util.shadow)(this, "NUM_PAGES_THRESHOLD", 2);
+  }
+
+  static get MIN_IMAGES_TO_CACHE() {
+    return (0, _util.shadow)(this, "MIN_IMAGES_TO_CACHE", 10);
+  }
+
+  static get MAX_BYTE_SIZE() {
+    return (0, _util.shadow)(this, "MAX_BYTE_SIZE", 40e6);
+  }
+
+  constructor() {
+    this._refCache = new _primitives.RefSetCache();
+    this._imageCache = new _primitives.RefSetCache();
+  }
+
+  get _byteSize() {
+    let byteSize = 0;
+
+    for (const imageData of this._imageCache) {
+      byteSize += imageData.byteSize;
+    }
+
+    return byteSize;
+  }
+
+  get _cacheLimitReached() {
+    if (this._imageCache.size < GlobalImageCache.MIN_IMAGES_TO_CACHE) {
+      return false;
+    }
+
+    if (this._byteSize < GlobalImageCache.MAX_BYTE_SIZE) {
+      return false;
+    }
+
+    return true;
+  }
+
+  shouldCache(ref, pageIndex) {
+    const pageIndexSet = this._refCache.get(ref);
+
+    const numPages = pageIndexSet ? pageIndexSet.size + (pageIndexSet.has(pageIndex) ? 0 : 1) : 1;
+
+    if (numPages < GlobalImageCache.NUM_PAGES_THRESHOLD) {
+      return false;
+    }
+
+    if (!this._imageCache.has(ref) && this._cacheLimitReached) {
+      return false;
+    }
+
+    return true;
+  }
+
+  addPageIndex(ref, pageIndex) {
+    let pageIndexSet = this._refCache.get(ref);
+
+    if (!pageIndexSet) {
+      pageIndexSet = new Set();
+
+      this._refCache.put(ref, pageIndexSet);
+    }
+
+    pageIndexSet.add(pageIndex);
+  }
+
+  addByteSize(ref, byteSize) {
+    const imageData = this._imageCache.get(ref);
+
+    if (!imageData) {
+      return;
+    }
+
+    if (imageData.byteSize) {
+      return;
+    }
+
+    imageData.byteSize = byteSize;
+  }
+
+  getData(ref, pageIndex) {
+    const pageIndexSet = this._refCache.get(ref);
+
+    if (!pageIndexSet) {
+      return null;
+    }
+
+    if (pageIndexSet.size < GlobalImageCache.NUM_PAGES_THRESHOLD) {
+      return null;
+    }
+
+    const imageData = this._imageCache.get(ref);
+
+    if (!imageData) {
+      return null;
+    }
+
+    pageIndexSet.add(pageIndex);
+    return imageData;
+  }
+
+  setData(ref, data) {
+    if (!this._refCache.has(ref)) {
+      throw new Error('GlobalImageCache.setData - expected "addPageIndex" to have been called.');
+    }
+
+    if (this._imageCache.has(ref)) {
+      return;
+    }
+
+    if (this._cacheLimitReached) {
+      (0, _util.warn)("GlobalImageCache.setData - cache limit reached.");
+      return;
+    }
+
+    this._imageCache.put(ref, data);
+  }
+
+  clear(onlyData = false) {
+    if (!onlyData) {
+      this._refCache.clear();
+    }
+
+    this._imageCache.clear();
+  }
+
+}
+
+exports.GlobalImageCache = GlobalImageCache;
+
+/***/ }),
+/* 60 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.bidi = bidi;
+
+var _util = __w_pdfjs_require__(2);
+
+const baseTypes = ["BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "S", "B", "S", "WS", "B", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "B", "B", "B", "S", "WS", "ON", "ON", "ET", "ET", "ET", "ON", "ON", "ON", "ON", "ON", "ES", "CS", "ES", "CS", "CS", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "CS", "ON", "ON", "ON", "ON", "ON", "ON", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "ON", "ON", "ON", "ON", "ON", "ON", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "ON", "ON", "ON", "ON", "BN", "BN", "BN", "BN", "BN", "BN", "B", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "BN", "CS", "ON", "ET", "ET", "ET", "ET", "ON", "ON", "ON", "ON", "L", "ON", "ON", "BN", "ON", "ON", "ET", "ET", "EN", "EN", "ON", "L", "ON", "ON", "ON", "EN", "L", "ON", "ON", "ON", "ON", "ON", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "ON", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "ON", "L", "L", "L", "L", "L", "L", "L", "L"];
+const arabicTypes = ["AN", "AN", "AN", "AN", "AN", "AN", "ON", "ON", "AL", "ET", "ET", "AL", "CS", "AL", "ON", "ON", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "AL", "AL", "", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "AN", "AN", "AN", "AN", "AN", "AN", "AN", "AN", "AN", "AN", "ET", "AN", "AN", "AL", "AL", "AL", "NSM", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "AN", "ON", "NSM", "NSM", "NSM", "NSM", "NSM", "NSM", "AL", "AL", "NSM", "NSM", "ON", "NSM", "NSM", "NSM", "NSM", "AL", "AL", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "EN", "AL", "AL", "AL", "AL", "AL", "AL"];
+
+function isOdd(i) {
+  return (i & 1) !== 0;
+}
+
+function isEven(i) {
+  return (i & 1) === 0;
+}
+
+function findUnequal(arr, start, value) {
+  let j, jj;
+
+  for (j = start, jj = arr.length; j < jj; ++j) {
+    if (arr[j] !== value) {
+      return j;
+    }
+  }
+
+  return j;
+}
+
+function setValues(arr, start, end, value) {
+  for (let j = start; j < end; ++j) {
+    arr[j] = value;
+  }
+}
+
+function reverseValues(arr, start, end) {
+  for (let i = start, j = end - 1; i < j; ++i, --j) {
+    const temp = arr[i];
+    arr[i] = arr[j];
+    arr[j] = temp;
+  }
+}
+
+function createBidiText(str, isLTR, vertical = false) {
+  let dir = "ltr";
+
+  if (vertical) {
+    dir = "ttb";
+  } else if (!isLTR) {
+    dir = "rtl";
+  }
+
+  return {
+    str,
+    dir
+  };
+}
+
+const chars = [];
+const types = [];
+
+function bidi(str, startLevel = -1, vertical = false) {
+  let isLTR = true;
+  const strLength = str.length;
+
+  if (strLength === 0 || vertical) {
+    return createBidiText(str, isLTR, vertical);
+  }
+
+  chars.length = strLength;
+  types.length = strLength;
+  let numBidi = 0;
+  let i, ii;
+
+  for (i = 0; i < strLength; ++i) {
+    chars[i] = str.charAt(i);
+    const charCode = str.charCodeAt(i);
+    let charType = "L";
+
+    if (charCode <= 0x00ff) {
+      charType = baseTypes[charCode];
+    } else if (0x0590 <= charCode && charCode <= 0x05f4) {
+      charType = "R";
+    } else if (0x0600 <= charCode && charCode <= 0x06ff) {
+      charType = arabicTypes[charCode & 0xff];
+
+      if (!charType) {
+        (0, _util.warn)("Bidi: invalid Unicode character " + charCode.toString(16));
+      }
+    } else if (0x0700 <= charCode && charCode <= 0x08ac) {
+      charType = "AL";
+    }
+
+    if (charType === "R" || charType === "AL" || charType === "AN") {
+      numBidi++;
+    }
+
+    types[i] = charType;
+  }
+
+  if (numBidi === 0) {
+    isLTR = true;
+    return createBidiText(str, isLTR);
+  }
+
+  if (startLevel === -1) {
+    if (numBidi / strLength < 0.3 && strLength > 4) {
+      isLTR = true;
+      startLevel = 0;
+    } else {
+      isLTR = false;
+      startLevel = 1;
+    }
+  }
+
+  const levels = [];
+
+  for (i = 0; i < strLength; ++i) {
+    levels[i] = startLevel;
+  }
+
+  const e = isOdd(startLevel) ? "R" : "L";
+  const sor = e;
+  const eor = sor;
+  let lastType = sor;
+
+  for (i = 0; i < strLength; ++i) {
+    if (types[i] === "NSM") {
+      types[i] = lastType;
+    } else {
+      lastType = types[i];
+    }
+  }
+
+  lastType = sor;
+  let t;
+
+  for (i = 0; i < strLength; ++i) {
+    t = types[i];
+
+    if (t === "EN") {
+      types[i] = lastType === "AL" ? "AN" : "EN";
+    } else if (t === "R" || t === "L" || t === "AL") {
+      lastType = t;
+    }
+  }
+
+  for (i = 0; i < strLength; ++i) {
+    t = types[i];
+
+    if (t === "AL") {
+      types[i] = "R";
+    }
+  }
+
+  for (i = 1; i < strLength - 1; ++i) {
+    if (types[i] === "ES" && types[i - 1] === "EN" && types[i + 1] === "EN") {
+      types[i] = "EN";
+    }
+
+    if (types[i] === "CS" && (types[i - 1] === "EN" || types[i - 1] === "AN") && types[i + 1] === types[i - 1]) {
+      types[i] = types[i - 1];
+    }
+  }
+
+  for (i = 0; i < strLength; ++i) {
+    if (types[i] === "EN") {
+      for (let j = i - 1; j >= 0; --j) {
+        if (types[j] !== "ET") {
+          break;
+        }
+
+        types[j] = "EN";
+      }
+
+      for (let j = i + 1; j < strLength; ++j) {
+        if (types[j] !== "ET") {
+          break;
+        }
+
+        types[j] = "EN";
+      }
+    }
+  }
+
+  for (i = 0; i < strLength; ++i) {
+    t = types[i];
+
+    if (t === "WS" || t === "ES" || t === "ET" || t === "CS") {
+      types[i] = "ON";
+    }
+  }
+
+  lastType = sor;
+
+  for (i = 0; i < strLength; ++i) {
+    t = types[i];
+
+    if (t === "EN") {
+      types[i] = lastType === "L" ? "L" : "EN";
+    } else if (t === "R" || t === "L") {
+      lastType = t;
+    }
+  }
+
+  for (i = 0; i < strLength; ++i) {
+    if (types[i] === "ON") {
+      const end = findUnequal(types, i + 1, "ON");
+      let before = sor;
+
+      if (i > 0) {
+        before = types[i - 1];
+      }
+
+      let after = eor;
+
+      if (end + 1 < strLength) {
+        after = types[end + 1];
+      }
+
+      if (before !== "L") {
+        before = "R";
+      }
+
+      if (after !== "L") {
+        after = "R";
+      }
+
+      if (before === after) {
+        setValues(types, i, end, before);
+      }
+
+      i = end - 1;
+    }
+  }
+
+  for (i = 0; i < strLength; ++i) {
+    if (types[i] === "ON") {
+      types[i] = e;
+    }
+  }
+
+  for (i = 0; i < strLength; ++i) {
+    t = types[i];
+
+    if (isEven(levels[i])) {
+      if (t === "R") {
+        levels[i] += 1;
+      } else if (t === "AN" || t === "EN") {
+        levels[i] += 2;
+      }
+    } else {
+      if (t === "L" || t === "AN" || t === "EN") {
+        levels[i] += 1;
+      }
+    }
+  }
+
+  let highestLevel = -1;
+  let lowestOddLevel = 99;
+  let level;
+
+  for (i = 0, ii = levels.length; i < ii; ++i) {
+    level = levels[i];
+
+    if (highestLevel < level) {
+      highestLevel = level;
+    }
+
+    if (lowestOddLevel > level && isOdd(level)) {
+      lowestOddLevel = level;
+    }
+  }
+
+  for (level = highestLevel; level >= lowestOddLevel; --level) {
+    let start = -1;
+
+    for (i = 0, ii = levels.length; i < ii; ++i) {
+      if (levels[i] < level) {
+        if (start >= 0) {
+          reverseValues(chars, start, i);
+          start = -1;
+        }
+      } else if (start < 0) {
+        start = i;
+      }
+    }
+
+    if (start >= 0) {
+      reverseValues(chars, start, levels.length);
+    }
+  }
+
+  for (i = 0, ii = chars.length; i < ii; ++i) {
+    const ch = chars[i];
+
+    if (ch === "<" || ch === ">") {
+      chars[i] = "";
+    }
+  }
+
+  return createBidiText(chars.join(""), isLTR);
+}
+
+/***/ }),
+/* 61 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.MurmurHash3_64 = void 0;
 
 var _util = __w_pdfjs_require__(2);
@@ -46205,7 +53058,7 @@ class MurmurHash3_64 {
   update(input) {
     let data, length;
 
-    if ((0, _util.isString)(input)) {
+    if (typeof input === "string") {
       data = new Uint8Array(input.length * 2);
       length = 0;
 
@@ -46220,7 +53073,7 @@ class MurmurHash3_64 {
         }
       }
     } else if ((0, _util.isArrayBuffer)(input)) {
-      data = input;
+      data = input.slice();
       length = data.byteLength;
     } else {
       throw new Error("Wrong data format in MurmurHash3_64_update. " + "Input must be a string or array.");
@@ -46305,29 +53158,681 @@ class MurmurHash3_64 {
 exports.MurmurHash3_64 = MurmurHash3_64;
 
 /***/ }),
-/* 45 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 62 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
+}));
+exports.OperatorList = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+function addState(parentState, pattern, checkFn, iterateFn, processFn) {
+  let state = parentState;
+
+  for (let i = 0, ii = pattern.length - 1; i < ii; i++) {
+    const item = pattern[i];
+    state = state[item] || (state[item] = []);
+  }
+
+  state[pattern.at(-1)] = {
+    checkFn,
+    iterateFn,
+    processFn
+  };
+}
+
+const InitialState = [];
+addState(InitialState, [_util.OPS.save, _util.OPS.transform, _util.OPS.paintInlineImageXObject, _util.OPS.restore], null, function iterateInlineImageGroup(context, i) {
+  const fnArray = context.fnArray;
+  const iFirstSave = context.iCurr - 3;
+  const pos = (i - iFirstSave) % 4;
+
+  switch (pos) {
+    case 0:
+      return fnArray[i] === _util.OPS.save;
+
+    case 1:
+      return fnArray[i] === _util.OPS.transform;
+
+    case 2:
+      return fnArray[i] === _util.OPS.paintInlineImageXObject;
+
+    case 3:
+      return fnArray[i] === _util.OPS.restore;
+  }
+
+  throw new Error(`iterateInlineImageGroup - invalid pos: ${pos}`);
+}, function foundInlineImageGroup(context, i) {
+  const MIN_IMAGES_IN_INLINE_IMAGES_BLOCK = 10;
+  const MAX_IMAGES_IN_INLINE_IMAGES_BLOCK = 200;
+  const MAX_WIDTH = 1000;
+  const IMAGE_PADDING = 1;
+  const fnArray = context.fnArray,
+        argsArray = context.argsArray;
+  const curr = context.iCurr;
+  const iFirstSave = curr - 3;
+  const iFirstTransform = curr - 2;
+  const iFirstPIIXO = curr - 1;
+  const count = Math.min(Math.floor((i - iFirstSave) / 4), MAX_IMAGES_IN_INLINE_IMAGES_BLOCK);
+
+  if (count < MIN_IMAGES_IN_INLINE_IMAGES_BLOCK) {
+    return i - (i - iFirstSave) % 4;
+  }
+
+  let maxX = 0;
+  const map = [];
+  let maxLineHeight = 0;
+  let currentX = IMAGE_PADDING,
+      currentY = IMAGE_PADDING;
+
+  for (let q = 0; q < count; q++) {
+    const transform = argsArray[iFirstTransform + (q << 2)];
+    const img = argsArray[iFirstPIIXO + (q << 2)][0];
+
+    if (currentX + img.width > MAX_WIDTH) {
+      maxX = Math.max(maxX, currentX);
+      currentY += maxLineHeight + 2 * IMAGE_PADDING;
+      currentX = 0;
+      maxLineHeight = 0;
+    }
+
+    map.push({
+      transform,
+      x: currentX,
+      y: currentY,
+      w: img.width,
+      h: img.height
+    });
+    currentX += img.width + 2 * IMAGE_PADDING;
+    maxLineHeight = Math.max(maxLineHeight, img.height);
+  }
+
+  const imgWidth = Math.max(maxX, currentX) + IMAGE_PADDING;
+  const imgHeight = currentY + maxLineHeight + IMAGE_PADDING;
+  const imgData = new Uint8Array(imgWidth * imgHeight * 4);
+  const imgRowSize = imgWidth << 2;
+
+  for (let q = 0; q < count; q++) {
+    const data = argsArray[iFirstPIIXO + (q << 2)][0].data;
+    const rowSize = map[q].w << 2;
+    let dataOffset = 0;
+    let offset = map[q].x + map[q].y * imgWidth << 2;
+    imgData.set(data.subarray(0, rowSize), offset - imgRowSize);
+
+    for (let k = 0, kk = map[q].h; k < kk; k++) {
+      imgData.set(data.subarray(dataOffset, dataOffset + rowSize), offset);
+      dataOffset += rowSize;
+      offset += imgRowSize;
+    }
+
+    imgData.set(data.subarray(dataOffset - rowSize, dataOffset), offset);
+
+    while (offset >= 0) {
+      data[offset - 4] = data[offset];
+      data[offset - 3] = data[offset + 1];
+      data[offset - 2] = data[offset + 2];
+      data[offset - 1] = data[offset + 3];
+      data[offset + rowSize] = data[offset + rowSize - 4];
+      data[offset + rowSize + 1] = data[offset + rowSize - 3];
+      data[offset + rowSize + 2] = data[offset + rowSize - 2];
+      data[offset + rowSize + 3] = data[offset + rowSize - 1];
+      offset -= imgRowSize;
+    }
+  }
+
+  fnArray.splice(iFirstSave, count * 4, _util.OPS.paintInlineImageXObjectGroup);
+  argsArray.splice(iFirstSave, count * 4, [{
+    width: imgWidth,
+    height: imgHeight,
+    kind: _util.ImageKind.RGBA_32BPP,
+    data: imgData
+  }, map]);
+  return iFirstSave + 1;
 });
+addState(InitialState, [_util.OPS.save, _util.OPS.transform, _util.OPS.paintImageMaskXObject, _util.OPS.restore], null, function iterateImageMaskGroup(context, i) {
+  const fnArray = context.fnArray;
+  const iFirstSave = context.iCurr - 3;
+  const pos = (i - iFirstSave) % 4;
+
+  switch (pos) {
+    case 0:
+      return fnArray[i] === _util.OPS.save;
+
+    case 1:
+      return fnArray[i] === _util.OPS.transform;
+
+    case 2:
+      return fnArray[i] === _util.OPS.paintImageMaskXObject;
+
+    case 3:
+      return fnArray[i] === _util.OPS.restore;
+  }
+
+  throw new Error(`iterateImageMaskGroup - invalid pos: ${pos}`);
+}, function foundImageMaskGroup(context, i) {
+  const MIN_IMAGES_IN_MASKS_BLOCK = 10;
+  const MAX_IMAGES_IN_MASKS_BLOCK = 100;
+  const MAX_SAME_IMAGES_IN_MASKS_BLOCK = 1000;
+  const fnArray = context.fnArray,
+        argsArray = context.argsArray;
+  const curr = context.iCurr;
+  const iFirstSave = curr - 3;
+  const iFirstTransform = curr - 2;
+  const iFirstPIMXO = curr - 1;
+  let count = Math.floor((i - iFirstSave) / 4);
+
+  if (count < MIN_IMAGES_IN_MASKS_BLOCK) {
+    return i - (i - iFirstSave) % 4;
+  }
+
+  let isSameImage = false;
+  let iTransform, transformArgs;
+  const firstPIMXOArg0 = argsArray[iFirstPIMXO][0];
+  const firstTransformArg0 = argsArray[iFirstTransform][0],
+        firstTransformArg1 = argsArray[iFirstTransform][1],
+        firstTransformArg2 = argsArray[iFirstTransform][2],
+        firstTransformArg3 = argsArray[iFirstTransform][3];
+
+  if (firstTransformArg1 === firstTransformArg2) {
+    isSameImage = true;
+    iTransform = iFirstTransform + 4;
+    let iPIMXO = iFirstPIMXO + 4;
+
+    for (let q = 1; q < count; q++, iTransform += 4, iPIMXO += 4) {
+      transformArgs = argsArray[iTransform];
+
+      if (argsArray[iPIMXO][0] !== firstPIMXOArg0 || transformArgs[0] !== firstTransformArg0 || transformArgs[1] !== firstTransformArg1 || transformArgs[2] !== firstTransformArg2 || transformArgs[3] !== firstTransformArg3) {
+        if (q < MIN_IMAGES_IN_MASKS_BLOCK) {
+          isSameImage = false;
+        } else {
+          count = q;
+        }
+
+        break;
+      }
+    }
+  }
+
+  if (isSameImage) {
+    count = Math.min(count, MAX_SAME_IMAGES_IN_MASKS_BLOCK);
+    const positions = new Float32Array(count * 2);
+    iTransform = iFirstTransform;
+
+    for (let q = 0; q < count; q++, iTransform += 4) {
+      transformArgs = argsArray[iTransform];
+      positions[q << 1] = transformArgs[4];
+      positions[(q << 1) + 1] = transformArgs[5];
+    }
+
+    fnArray.splice(iFirstSave, count * 4, _util.OPS.paintImageMaskXObjectRepeat);
+    argsArray.splice(iFirstSave, count * 4, [firstPIMXOArg0, firstTransformArg0, firstTransformArg1, firstTransformArg2, firstTransformArg3, positions]);
+  } else {
+    count = Math.min(count, MAX_IMAGES_IN_MASKS_BLOCK);
+    const images = [];
+
+    for (let q = 0; q < count; q++) {
+      transformArgs = argsArray[iFirstTransform + (q << 2)];
+      const maskParams = argsArray[iFirstPIMXO + (q << 2)][0];
+      images.push({
+        data: maskParams.data,
+        width: maskParams.width,
+        height: maskParams.height,
+        interpolate: maskParams.interpolate,
+        count: maskParams.count,
+        transform: transformArgs
+      });
+    }
+
+    fnArray.splice(iFirstSave, count * 4, _util.OPS.paintImageMaskXObjectGroup);
+    argsArray.splice(iFirstSave, count * 4, [images]);
+  }
+
+  return iFirstSave + 1;
+});
+addState(InitialState, [_util.OPS.save, _util.OPS.transform, _util.OPS.paintImageXObject, _util.OPS.restore], function (context) {
+  const argsArray = context.argsArray;
+  const iFirstTransform = context.iCurr - 2;
+  return argsArray[iFirstTransform][1] === 0 && argsArray[iFirstTransform][2] === 0;
+}, function iterateImageGroup(context, i) {
+  const fnArray = context.fnArray,
+        argsArray = context.argsArray;
+  const iFirstSave = context.iCurr - 3;
+  const pos = (i - iFirstSave) % 4;
+
+  switch (pos) {
+    case 0:
+      return fnArray[i] === _util.OPS.save;
+
+    case 1:
+      if (fnArray[i] !== _util.OPS.transform) {
+        return false;
+      }
+
+      const iFirstTransform = context.iCurr - 2;
+      const firstTransformArg0 = argsArray[iFirstTransform][0];
+      const firstTransformArg3 = argsArray[iFirstTransform][3];
+
+      if (argsArray[i][0] !== firstTransformArg0 || argsArray[i][1] !== 0 || argsArray[i][2] !== 0 || argsArray[i][3] !== firstTransformArg3) {
+        return false;
+      }
+
+      return true;
+
+    case 2:
+      if (fnArray[i] !== _util.OPS.paintImageXObject) {
+        return false;
+      }
+
+      const iFirstPIXO = context.iCurr - 1;
+      const firstPIXOArg0 = argsArray[iFirstPIXO][0];
+
+      if (argsArray[i][0] !== firstPIXOArg0) {
+        return false;
+      }
+
+      return true;
+
+    case 3:
+      return fnArray[i] === _util.OPS.restore;
+  }
+
+  throw new Error(`iterateImageGroup - invalid pos: ${pos}`);
+}, function (context, i) {
+  const MIN_IMAGES_IN_BLOCK = 3;
+  const MAX_IMAGES_IN_BLOCK = 1000;
+  const fnArray = context.fnArray,
+        argsArray = context.argsArray;
+  const curr = context.iCurr;
+  const iFirstSave = curr - 3;
+  const iFirstTransform = curr - 2;
+  const iFirstPIXO = curr - 1;
+  const firstPIXOArg0 = argsArray[iFirstPIXO][0];
+  const firstTransformArg0 = argsArray[iFirstTransform][0];
+  const firstTransformArg3 = argsArray[iFirstTransform][3];
+  const count = Math.min(Math.floor((i - iFirstSave) / 4), MAX_IMAGES_IN_BLOCK);
+
+  if (count < MIN_IMAGES_IN_BLOCK) {
+    return i - (i - iFirstSave) % 4;
+  }
+
+  const positions = new Float32Array(count * 2);
+  let iTransform = iFirstTransform;
+
+  for (let q = 0; q < count; q++, iTransform += 4) {
+    const transformArgs = argsArray[iTransform];
+    positions[q << 1] = transformArgs[4];
+    positions[(q << 1) + 1] = transformArgs[5];
+  }
+
+  const args = [firstPIXOArg0, firstTransformArg0, firstTransformArg3, positions];
+  fnArray.splice(iFirstSave, count * 4, _util.OPS.paintImageXObjectRepeat);
+  argsArray.splice(iFirstSave, count * 4, args);
+  return iFirstSave + 1;
+});
+addState(InitialState, [_util.OPS.beginText, _util.OPS.setFont, _util.OPS.setTextMatrix, _util.OPS.showText, _util.OPS.endText], null, function iterateShowTextGroup(context, i) {
+  const fnArray = context.fnArray,
+        argsArray = context.argsArray;
+  const iFirstSave = context.iCurr - 4;
+  const pos = (i - iFirstSave) % 5;
+
+  switch (pos) {
+    case 0:
+      return fnArray[i] === _util.OPS.beginText;
+
+    case 1:
+      return fnArray[i] === _util.OPS.setFont;
+
+    case 2:
+      return fnArray[i] === _util.OPS.setTextMatrix;
+
+    case 3:
+      if (fnArray[i] !== _util.OPS.showText) {
+        return false;
+      }
+
+      const iFirstSetFont = context.iCurr - 3;
+      const firstSetFontArg0 = argsArray[iFirstSetFont][0];
+      const firstSetFontArg1 = argsArray[iFirstSetFont][1];
+
+      if (argsArray[i][0] !== firstSetFontArg0 || argsArray[i][1] !== firstSetFontArg1) {
+        return false;
+      }
+
+      return true;
+
+    case 4:
+      return fnArray[i] === _util.OPS.endText;
+  }
+
+  throw new Error(`iterateShowTextGroup - invalid pos: ${pos}`);
+}, function (context, i) {
+  const MIN_CHARS_IN_BLOCK = 3;
+  const MAX_CHARS_IN_BLOCK = 1000;
+  const fnArray = context.fnArray,
+        argsArray = context.argsArray;
+  const curr = context.iCurr;
+  const iFirstBeginText = curr - 4;
+  const iFirstSetFont = curr - 3;
+  const iFirstSetTextMatrix = curr - 2;
+  const iFirstShowText = curr - 1;
+  const iFirstEndText = curr;
+  const firstSetFontArg0 = argsArray[iFirstSetFont][0];
+  const firstSetFontArg1 = argsArray[iFirstSetFont][1];
+  let count = Math.min(Math.floor((i - iFirstBeginText) / 5), MAX_CHARS_IN_BLOCK);
+
+  if (count < MIN_CHARS_IN_BLOCK) {
+    return i - (i - iFirstBeginText) % 5;
+  }
+
+  let iFirst = iFirstBeginText;
+
+  if (iFirstBeginText >= 4 && fnArray[iFirstBeginText - 4] === fnArray[iFirstSetFont] && fnArray[iFirstBeginText - 3] === fnArray[iFirstSetTextMatrix] && fnArray[iFirstBeginText - 2] === fnArray[iFirstShowText] && fnArray[iFirstBeginText - 1] === fnArray[iFirstEndText] && argsArray[iFirstBeginText - 4][0] === firstSetFontArg0 && argsArray[iFirstBeginText - 4][1] === firstSetFontArg1) {
+    count++;
+    iFirst -= 5;
+  }
+
+  let iEndText = iFirst + 4;
+
+  for (let q = 1; q < count; q++) {
+    fnArray.splice(iEndText, 3);
+    argsArray.splice(iEndText, 3);
+    iEndText += 2;
+  }
+
+  return iEndText + 1;
+});
+
+class NullOptimizer {
+  constructor(queue) {
+    this.queue = queue;
+  }
+
+  _optimize() {}
+
+  push(fn, args) {
+    this.queue.fnArray.push(fn);
+    this.queue.argsArray.push(args);
+
+    this._optimize();
+  }
+
+  flush() {}
+
+  reset() {}
+
+}
+
+class QueueOptimizer extends NullOptimizer {
+  constructor(queue) {
+    super(queue);
+    this.state = null;
+    this.context = {
+      iCurr: 0,
+      fnArray: queue.fnArray,
+      argsArray: queue.argsArray
+    };
+    this.match = null;
+    this.lastProcessed = 0;
+  }
+
+  _optimize() {
+    const fnArray = this.queue.fnArray;
+    let i = this.lastProcessed,
+        ii = fnArray.length;
+    let state = this.state;
+    let match = this.match;
+
+    if (!state && !match && i + 1 === ii && !InitialState[fnArray[i]]) {
+      this.lastProcessed = ii;
+      return;
+    }
+
+    const context = this.context;
+
+    while (i < ii) {
+      if (match) {
+        const iterate = (0, match.iterateFn)(context, i);
+
+        if (iterate) {
+          i++;
+          continue;
+        }
+
+        i = (0, match.processFn)(context, i + 1);
+        ii = fnArray.length;
+        match = null;
+        state = null;
+
+        if (i >= ii) {
+          break;
+        }
+      }
+
+      state = (state || InitialState)[fnArray[i]];
+
+      if (!state || Array.isArray(state)) {
+        i++;
+        continue;
+      }
+
+      context.iCurr = i;
+      i++;
+
+      if (state.checkFn && !(0, state.checkFn)(context)) {
+        state = null;
+        continue;
+      }
+
+      match = state;
+      state = null;
+    }
+
+    this.state = state;
+    this.match = match;
+    this.lastProcessed = i;
+  }
+
+  flush() {
+    while (this.match) {
+      const length = this.queue.fnArray.length;
+      this.lastProcessed = (0, this.match.processFn)(this.context, length);
+      this.match = null;
+      this.state = null;
+
+      this._optimize();
+    }
+  }
+
+  reset() {
+    this.state = null;
+    this.match = null;
+    this.lastProcessed = 0;
+  }
+
+}
+
+class OperatorList {
+  static get CHUNK_SIZE() {
+    return (0, _util.shadow)(this, "CHUNK_SIZE", 1000);
+  }
+
+  static get CHUNK_SIZE_ABOUT() {
+    return (0, _util.shadow)(this, "CHUNK_SIZE_ABOUT", this.CHUNK_SIZE - 5);
+  }
+
+  constructor(intent = 0, streamSink) {
+    this._streamSink = streamSink;
+    this.fnArray = [];
+    this.argsArray = [];
+
+    if (streamSink && !(intent & _util.RenderingIntentFlag.OPLIST)) {
+      this.optimizer = new QueueOptimizer(this);
+    } else {
+      this.optimizer = new NullOptimizer(this);
+    }
+
+    this.dependencies = new Set();
+    this._totalLength = 0;
+    this.weight = 0;
+    this._resolved = streamSink ? null : Promise.resolve();
+  }
+
+  get length() {
+    return this.argsArray.length;
+  }
+
+  get ready() {
+    return this._resolved || this._streamSink.ready;
+  }
+
+  get totalLength() {
+    return this._totalLength + this.length;
+  }
+
+  addOp(fn, args) {
+    this.optimizer.push(fn, args);
+    this.weight++;
+
+    if (this._streamSink) {
+      if (this.weight >= OperatorList.CHUNK_SIZE) {
+        this.flush();
+      } else if (this.weight >= OperatorList.CHUNK_SIZE_ABOUT && (fn === _util.OPS.restore || fn === _util.OPS.endText)) {
+        this.flush();
+      }
+    }
+  }
+
+  addImageOps(fn, args, optionalContent) {
+    if (optionalContent !== undefined) {
+      this.addOp(_util.OPS.beginMarkedContentProps, ["OC", optionalContent]);
+    }
+
+    this.addOp(fn, args);
+
+    if (optionalContent !== undefined) {
+      this.addOp(_util.OPS.endMarkedContent, []);
+    }
+  }
+
+  addDependency(dependency) {
+    if (this.dependencies.has(dependency)) {
+      return;
+    }
+
+    this.dependencies.add(dependency);
+    this.addOp(_util.OPS.dependency, [dependency]);
+  }
+
+  addDependencies(dependencies) {
+    for (const dependency of dependencies) {
+      this.addDependency(dependency);
+    }
+  }
+
+  addOpList(opList) {
+    if (!(opList instanceof OperatorList)) {
+      (0, _util.warn)('addOpList - ignoring invalid "opList" parameter.');
+      return;
+    }
+
+    for (const dependency of opList.dependencies) {
+      this.dependencies.add(dependency);
+    }
+
+    for (let i = 0, ii = opList.length; i < ii; i++) {
+      this.addOp(opList.fnArray[i], opList.argsArray[i]);
+    }
+  }
+
+  getIR() {
+    return {
+      fnArray: this.fnArray,
+      argsArray: this.argsArray,
+      length: this.length
+    };
+  }
+
+  get _transfers() {
+    const transfers = [];
+    const {
+      fnArray,
+      argsArray,
+      length
+    } = this;
+
+    for (let i = 0; i < length; i++) {
+      switch (fnArray[i]) {
+        case _util.OPS.paintInlineImageXObject:
+        case _util.OPS.paintInlineImageXObjectGroup:
+        case _util.OPS.paintImageMaskXObject:
+          const arg = argsArray[i][0];
+
+          if (!arg.cached && arg.data && arg.data.buffer instanceof ArrayBuffer) {
+            transfers.push(arg.data.buffer);
+          }
+
+          break;
+      }
+    }
+
+    return transfers;
+  }
+
+  flush(lastChunk = false, separateAnnots = null) {
+    this.optimizer.flush();
+    const length = this.length;
+    this._totalLength += length;
+
+    this._streamSink.enqueue({
+      fnArray: this.fnArray,
+      argsArray: this.argsArray,
+      lastChunk,
+      separateAnnots,
+      length
+    }, 1, this._transfers);
+
+    this.dependencies.clear();
+    this.fnArray.length = 0;
+    this.argsArray.length = 0;
+    this.weight = 0;
+    this.optimizer.reset();
+  }
+
+}
+
+exports.OperatorList = OperatorList;
+
+/***/ }),
+/* 63 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.PDFImage = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
+var _image_utils = __w_pdfjs_require__(64);
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _colorspace = __w_pdfjs_require__(14);
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+var _jpeg_stream = __w_pdfjs_require__(27);
+
+var _jpx = __w_pdfjs_require__(30);
+
 var _primitives = __w_pdfjs_require__(5);
 
-var _colorspace = __w_pdfjs_require__(23);
-
-var _stream = __w_pdfjs_require__(12);
-
-var _jpeg_stream = __w_pdfjs_require__(18);
-
-var _jpx = __w_pdfjs_require__(21);
-
 function decodeAndClamp(value, addend, coefficient, max) {
   value = addend + value * coefficient;
 
@@ -46341,7 +53846,7 @@ function decodeAndClamp(value, addend, coefficient, max) {
 }
 
 function resizeImageMask(src, bpc, w1, h1, w2, h2) {
-  var length = w2 * h2;
+  const length = w2 * h2;
   let dest;
 
   if (bpc <= 8) {
@@ -46352,15 +53857,15 @@ function resizeImageMask(src, bpc, w1, h1, w2, h2) {
     dest = new Uint32Array(length);
   }
 
-  var xRatio = w1 / w2;
-  var yRatio = h1 / h2;
-  var i,
+  const xRatio = w1 / w2;
+  const yRatio = h1 / h2;
+  let i,
       j,
       py,
       newIndex = 0,
       oldIndex;
-  var xScaled = new Uint16Array(w2);
-  var w1Scanline = w1;
+  const xScaled = new Uint16Array(w2);
+  const w1Scanline = w1;
 
   for (i = 0; i < w2; i++) {
     xScaled[i] = Math.floor(i * xRatio);
@@ -46391,30 +53896,39 @@ class PDFImage {
     localColorSpaceCache
   }) {
     this.image = image;
-    var dict = image.dict;
-    const filter = dict.get("Filter");
+    const dict = image.dict;
+    const filter = dict.get("F", "Filter");
+    let filterName;
 
-    if ((0, _primitives.isName)(filter)) {
-      switch (filter.name) {
-        case "JPXDecode":
-          var jpxImage = new _jpx.JpxImage();
-          jpxImage.parseImageProperties(image.stream);
-          image.stream.reset();
-          image.width = jpxImage.width;
-          image.height = jpxImage.height;
-          image.bitsPerComponent = jpxImage.bitsPerComponent;
-          image.numComps = jpxImage.componentsCount;
-          break;
+    if (filter instanceof _primitives.Name) {
+      filterName = filter.name;
+    } else if (Array.isArray(filter)) {
+      const filterZero = xref.fetchIfRef(filter[0]);
 
-        case "JBIG2Decode":
-          image.bitsPerComponent = 1;
-          image.numComps = 1;
-          break;
+      if (filterZero instanceof _primitives.Name) {
+        filterName = filterZero.name;
       }
     }
 
-    let width = dict.get("Width", "W");
-    let height = dict.get("Height", "H");
+    switch (filterName) {
+      case "JPXDecode":
+        const jpxImage = new _jpx.JpxImage();
+        jpxImage.parseImageProperties(image.stream);
+        image.stream.reset();
+        image.width = jpxImage.width;
+        image.height = jpxImage.height;
+        image.bitsPerComponent = jpxImage.bitsPerComponent;
+        image.numComps = jpxImage.componentsCount;
+        break;
+
+      case "JBIG2Decode":
+        image.bitsPerComponent = 1;
+        image.numComps = 1;
+        break;
+    }
+
+    let width = dict.get("W", "Width");
+    let height = dict.get("H", "Height");
 
     if (Number.isInteger(image.width) && image.width > 0 && Number.isInteger(image.height) && image.height > 0 && (image.width !== width || image.height !== height)) {
       (0, _util.warn)("PDFImage - using the Width/Height of the image data, " + "rather than the image dictionary.");
@@ -46428,13 +53942,13 @@ class PDFImage {
 
     this.width = width;
     this.height = height;
-    this.interpolate = dict.get("Interpolate", "I") || false;
-    this.imageMask = dict.get("ImageMask", "IM") || false;
+    this.interpolate = dict.get("I", "Interpolate");
+    this.imageMask = dict.get("IM", "ImageMask") || false;
     this.matte = dict.get("Matte") || false;
-    var bitsPerComponent = image.bitsPerComponent;
+    let bitsPerComponent = image.bitsPerComponent;
 
     if (!bitsPerComponent) {
-      bitsPerComponent = dict.get("BitsPerComponent", "BPC");
+      bitsPerComponent = dict.get("BPC", "BitsPerComponent");
 
       if (!bitsPerComponent) {
         if (this.imageMask) {
@@ -46448,7 +53962,7 @@ class PDFImage {
     this.bpc = bitsPerComponent;
 
     if (!this.imageMask) {
-      let colorSpace = dict.getRaw("ColorSpace") || dict.getRaw("CS");
+      let colorSpace = dict.getRaw("CS") || dict.getRaw("ColorSpace");
 
       if (!colorSpace) {
         (0, _util.info)("JPX images (which do not require color spaces)");
@@ -46467,7 +53981,7 @@ class PDFImage {
             break;
 
           default:
-            throw new Error(`JPX images with ${image.numComps} ` + "color components not supported.");
+            throw new Error(`JPX images with ${image.numComps} color components not supported.`);
         }
       }
 
@@ -46481,19 +53995,19 @@ class PDFImage {
       this.numComps = this.colorSpace.numComps;
     }
 
-    this.decode = dict.getArray("Decode", "D");
+    this.decode = dict.getArray("D", "Decode");
     this.needsDecode = false;
 
     if (this.decode && (this.colorSpace && !this.colorSpace.isDefaultDecode(this.decode, bitsPerComponent) || isMask && !_colorspace.ColorSpace.isDefaultDecode(this.decode, 1))) {
       this.needsDecode = true;
-      var max = (1 << bitsPerComponent) - 1;
+      const max = (1 << bitsPerComponent) - 1;
       this.decodeCoefficients = [];
       this.decodeAddends = [];
       const isIndexed = this.colorSpace && this.colorSpace.name === "Indexed";
 
-      for (var i = 0, j = 0; i < this.decode.length; i += 2, ++j) {
-        var dmin = this.decode[i];
-        var dmax = this.decode[i + 1];
+      for (let i = 0, j = 0; i < this.decode.length; i += 2, ++j) {
+        const dmin = this.decode[i];
+        const dmax = this.decode[i + 1];
         this.decodeCoefficients[j] = isIndexed ? (dmax - dmin) / max : dmax - dmin;
         this.decodeAddends[j] = isIndexed ? dmin : max * dmin;
       }
@@ -46509,9 +54023,9 @@ class PDFImage {
         localColorSpaceCache
       });
     } else if (mask) {
-      if ((0, _primitives.isStream)(mask)) {
-        var maskDict = mask.dict,
-            imageMask = maskDict.get("ImageMask", "IM");
+      if (mask instanceof _base_stream.BaseStream) {
+        const maskDict = mask.dict,
+              imageMask = maskDict.get("IM", "ImageMask");
 
         if (!imageMask) {
           (0, _util.warn)("Ignoring /Mask in image without /ImageMask.");
@@ -46547,12 +54061,16 @@ class PDFImage {
     const mask = image.dict.get("Mask");
 
     if (smask) {
-      smaskData = smask;
+      if (smask instanceof _base_stream.BaseStream) {
+        smaskData = smask;
+      } else {
+        (0, _util.warn)("Unsupported /SMask format.");
+      }
     } else if (mask) {
-      if ((0, _primitives.isStream)(mask) || Array.isArray(mask)) {
+      if (mask instanceof _base_stream.BaseStream || Array.isArray(mask)) {
         maskData = mask;
       } else {
-        (0, _util.warn)("Unsupported mask format.");
+        (0, _util.warn)("Unsupported /Mask format.");
       }
     }
 
@@ -46568,30 +54086,27 @@ class PDFImage {
     });
   }
 
-  static createMask({
+  static createRawMask({
     imgArray,
     width,
     height,
     imageIsFromDecodeStream,
-    inverseDecode
+    inverseDecode,
+    interpolate
   }) {
-    var computedLength = (width + 7 >> 3) * height;
-    var actualLength = imgArray.byteLength;
-    var haveFullData = computedLength === actualLength;
-    var data, i;
+    const computedLength = (width + 7 >> 3) * height;
+    const actualLength = imgArray.byteLength;
+    const haveFullData = computedLength === actualLength;
+    let data, i;
 
     if (imageIsFromDecodeStream && (!inverseDecode || haveFullData)) {
       data = imgArray;
     } else if (!inverseDecode) {
-      data = new Uint8ClampedArray(actualLength);
-      data.set(imgArray);
+      data = new Uint8Array(imgArray);
     } else {
-      data = new Uint8ClampedArray(computedLength);
+      data = new Uint8Array(computedLength);
       data.set(imgArray);
-
-      for (i = actualLength; i < computedLength; i++) {
-        data[i] = 0xff;
-      }
+      data.fill(0xff, actualLength);
     }
 
     if (inverseDecode) {
@@ -46603,10 +54118,59 @@ class PDFImage {
     return {
       data,
       width,
-      height
+      height,
+      interpolate
     };
   }
 
+  static createMask({
+    imgArray,
+    width,
+    height,
+    imageIsFromDecodeStream,
+    inverseDecode,
+    interpolate
+  }) {
+    const isSingleOpaquePixel = width === 1 && height === 1 && inverseDecode === (imgArray.length === 0 || !!(imgArray[0] & 128));
+
+    if (isSingleOpaquePixel) {
+      return {
+        isSingleOpaquePixel
+      };
+    }
+
+    if (_util.FeatureTest.isOffscreenCanvasSupported) {
+      const canvas = new OffscreenCanvas(width, height);
+      const ctx = canvas.getContext("2d");
+      const imgData = ctx.createImageData(width, height);
+      (0, _image_utils.applyMaskImageData)({
+        src: imgArray,
+        dest: imgData.data,
+        width,
+        height,
+        inverseDecode
+      });
+      ctx.putImageData(imgData, 0, 0);
+      const bitmap = canvas.transferToImageBitmap();
+      return {
+        data: null,
+        width,
+        height,
+        interpolate,
+        bitmap
+      };
+    }
+
+    return this.createRawMask({
+      imgArray,
+      width,
+      height,
+      inverseDecode,
+      imageIsFromDecodeStream,
+      interpolate
+    });
+  }
+
   get drawWidth() {
     return Math.max(this.width, this.smask && this.smask.width || 0, this.mask && this.mask.width || 0);
   }
@@ -46616,12 +54180,12 @@ class PDFImage {
   }
 
   decodeBuffer(buffer) {
-    var bpc = this.bpc;
-    var numComps = this.numComps;
-    var decodeAddends = this.decodeAddends;
-    var decodeCoefficients = this.decodeCoefficients;
-    var max = (1 << bpc) - 1;
-    var i, ii;
+    const bpc = this.bpc;
+    const numComps = this.numComps;
+    const decodeAddends = this.decodeAddends;
+    const decodeCoefficients = this.decodeCoefficients;
+    const max = (1 << bpc) - 1;
+    let i, ii;
 
     if (bpc === 1) {
       for (i = 0, ii = buffer.length; i < ii; i++) {
@@ -46631,10 +54195,10 @@ class PDFImage {
       return;
     }
 
-    var index = 0;
+    let index = 0;
 
     for (i = 0, ii = this.width * this.height; i < ii; i++) {
-      for (var j = 0; j < numComps; j++) {
+      for (let j = 0; j < numComps; j++) {
         buffer[index] = decodeAndClamp(buffer[index], decodeAddends[j], decodeCoefficients[j], max);
         index++;
       }
@@ -46642,17 +54206,17 @@ class PDFImage {
   }
 
   getComponents(buffer) {
-    var bpc = this.bpc;
+    const bpc = this.bpc;
 
     if (bpc === 8) {
       return buffer;
     }
 
-    var width = this.width;
-    var height = this.height;
-    var numComps = this.numComps;
-    var length = width * height * numComps;
-    var bufferPos = 0;
+    const width = this.width;
+    const height = this.height;
+    const numComps = this.numComps;
+    const length = width * height * numComps;
+    let bufferPos = 0;
     let output;
 
     if (bpc <= 8) {
@@ -46663,16 +54227,16 @@ class PDFImage {
       output = new Uint32Array(length);
     }
 
-    var rowComps = width * numComps;
-    var max = (1 << bpc) - 1;
-    var i = 0,
+    const rowComps = width * numComps;
+    const max = (1 << bpc) - 1;
+    let i = 0,
         ii,
         buf;
 
     if (bpc === 1) {
-      var mask, loop1End, loop2End;
+      let mask, loop1End, loop2End;
 
-      for (var j = 0; j < height; j++) {
+      for (let j = 0; j < height; j++) {
         loop1End = i + (rowComps & ~7);
         loop2End = i + rowComps;
 
@@ -46700,7 +54264,7 @@ class PDFImage {
         }
       }
     } else {
-      var bits = 0;
+      let bits = 0;
       buf = 0;
 
       for (i = 0, ii = length; i < ii; ++i) {
@@ -46714,7 +54278,7 @@ class PDFImage {
           bits += 8;
         }
 
-        var remainingBits = bits - bpc;
+        const remainingBits = bits - bpc;
         let value = buf >> remainingBits;
 
         if (value < 0) {
@@ -46724,7 +54288,7 @@ class PDFImage {
         }
 
         output[i] = value;
-        buf = buf & (1 << remainingBits) - 1;
+        buf &= (1 << remainingBits) - 1;
         bits = remainingBits;
       }
     }
@@ -46733,9 +54297,9 @@ class PDFImage {
   }
 
   fillOpacity(rgbaBuf, width, height, actualHeight, image) {
-    var smask = this.smask;
-    var mask = this.mask;
-    var alphaBuf, sw, sh, i, ii, j;
+    const smask = this.smask;
+    const mask = this.mask;
+    let alphaBuf, sw, sh, i, ii, j;
 
     if (smask) {
       sw = smask.width;
@@ -46763,15 +54327,15 @@ class PDFImage {
         }
       } else if (Array.isArray(mask)) {
         alphaBuf = new Uint8ClampedArray(width * height);
-        var numComps = this.numComps;
+        const numComps = this.numComps;
 
         for (i = 0, ii = width * height; i < ii; ++i) {
-          var opacity = 0;
-          var imageOffset = i * numComps;
+          let opacity = 0;
+          const imageOffset = i * numComps;
 
           for (j = 0; j < numComps; ++j) {
-            var color = image[imageOffset + j];
-            var maskOffset = j * 2;
+            const color = image[imageOffset + j];
+            const maskOffset = j * 2;
 
             if (color < mask[maskOffset] || color > mask[maskOffset + 1]) {
               opacity = 255;
@@ -46798,20 +54362,20 @@ class PDFImage {
   }
 
   undoPreblend(buffer, width, height) {
-    var matte = this.smask && this.smask.matte;
+    const matte = this.smask && this.smask.matte;
 
     if (!matte) {
       return;
     }
 
-    var matteRgb = this.colorSpace.getRgb(matte, 0);
-    var matteR = matteRgb[0];
-    var matteG = matteRgb[1];
-    var matteB = matteRgb[2];
-    var length = width * height * 4;
+    const matteRgb = this.colorSpace.getRgb(matte, 0);
+    const matteR = matteRgb[0];
+    const matteG = matteRgb[1];
+    const matteB = matteRgb[2];
+    const length = width * height * 4;
 
-    for (var i = 0; i < length; i += 4) {
-      var alpha = buffer[i + 3];
+    for (let i = 0; i < length; i += 4) {
+      const alpha = buffer[i + 3];
 
       if (alpha === 0) {
         buffer[i] = 255;
@@ -46820,7 +54384,7 @@ class PDFImage {
         continue;
       }
 
-      var k = 255 / alpha;
+      const k = 255 / alpha;
       buffer[i] = (buffer[i] - matteR) * k + matteR;
       buffer[i + 1] = (buffer[i + 1] - matteG) * k + matteG;
       buffer[i + 2] = (buffer[i + 2] - matteB) * k + matteB;
@@ -46828,23 +54392,23 @@ class PDFImage {
   }
 
   createImageData(forceRGBA = false) {
-    var drawWidth = this.drawWidth;
-    var drawHeight = this.drawHeight;
-    var imgData = {
+    const drawWidth = this.drawWidth;
+    const drawHeight = this.drawHeight;
+    const imgData = {
       width: drawWidth,
       height: drawHeight,
+      interpolate: this.interpolate,
       kind: 0,
       data: null
     };
-    var numComps = this.numComps;
-    var originalWidth = this.width;
-    var originalHeight = this.height;
-    var bpc = this.bpc;
-    var rowBytes = originalWidth * numComps * bpc + 7 >> 3;
-    var imgArray;
+    const numComps = this.numComps;
+    const originalWidth = this.width;
+    const originalHeight = this.height;
+    const bpc = this.bpc;
+    const rowBytes = originalWidth * numComps * bpc + 7 >> 3;
 
     if (!forceRGBA) {
-      var kind;
+      let kind;
 
       if (this.colorSpace.name === "DeviceGray" && bpc === 1) {
         kind = _util.ImageKind.GRAYSCALE_1BPP;
@@ -46854,21 +54418,13 @@ class PDFImage {
 
       if (kind && !this.smask && !this.mask && drawWidth === originalWidth && drawHeight === originalHeight) {
         imgData.kind = kind;
-        imgArray = this.getImageBytes(originalHeight * rowBytes);
-
-        if (this.image instanceof _stream.DecodeStream) {
-          imgData.data = imgArray;
-        } else {
-          var newArray = new Uint8ClampedArray(imgArray.length);
-          newArray.set(imgArray);
-          imgData.data = newArray;
-        }
+        imgData.data = this.getImageBytes(originalHeight * rowBytes, {});
 
         if (this.needsDecode) {
           (0, _util.assert)(kind === _util.ImageKind.GRAYSCALE_1BPP, "PDFImage.createImageData: The image must be grayscale.");
-          var buffer = imgData.data;
+          const buffer = imgData.data;
 
-          for (var i = 0, ii = buffer.length; i < ii; i++) {
+          for (let i = 0, ii = buffer.length; i < ii; i++) {
             buffer[i] ^= 0xff;
           }
         }
@@ -46886,16 +54442,22 @@ class PDFImage {
           case "DeviceRGB":
           case "DeviceCMYK":
             imgData.kind = _util.ImageKind.RGB_24BPP;
-            imgData.data = this.getImageBytes(imageLength, drawWidth, drawHeight, true);
+            imgData.data = this.getImageBytes(imageLength, {
+              drawWidth,
+              drawHeight,
+              forceRGB: true
+            });
             return imgData;
         }
       }
     }
 
-    imgArray = this.getImageBytes(originalHeight * rowBytes);
-    var actualHeight = 0 | imgArray.length / rowBytes * drawHeight / originalHeight;
-    var comps = this.getComponents(imgArray);
-    var alpha01, maybeUndoPreblend;
+    const imgArray = this.getImageBytes(originalHeight * rowBytes, {
+      internal: true
+    });
+    const actualHeight = 0 | imgArray.length / rowBytes * drawHeight / originalHeight;
+    const comps = this.getComponents(imgArray);
+    let alpha01, maybeUndoPreblend;
 
     if (!forceRGBA && !this.smask && !this.mask) {
       imgData.kind = _util.ImageKind.RGB_24BPP;
@@ -46924,19 +54486,21 @@ class PDFImage {
   }
 
   fillGrayBuffer(buffer) {
-    var numComps = this.numComps;
+    const numComps = this.numComps;
 
     if (numComps !== 1) {
       throw new _util.FormatError(`Reading gray scale from a color image: ${numComps}`);
     }
 
-    var width = this.width;
-    var height = this.height;
-    var bpc = this.bpc;
-    var rowBytes = width * numComps * bpc + 7 >> 3;
-    var imgArray = this.getImageBytes(height * rowBytes);
-    var comps = this.getComponents(imgArray);
-    var i, length;
+    const width = this.width;
+    const height = this.height;
+    const bpc = this.bpc;
+    const rowBytes = width * numComps * bpc + 7 >> 3;
+    const imgArray = this.getImageBytes(height * rowBytes, {
+      internal: true
+    });
+    const comps = this.getComponents(imgArray);
+    let i, length;
 
     if (bpc === 1) {
       length = width * height;
@@ -46959,19 +54523,31 @@ class PDFImage {
     }
 
     length = width * height;
-    var scale = 255 / ((1 << bpc) - 1);
+    const scale = 255 / ((1 << bpc) - 1);
 
     for (i = 0; i < length; ++i) {
       buffer[i] = scale * comps[i];
     }
   }
 
-  getImageBytes(length, drawWidth, drawHeight, forceRGB = false) {
+  getImageBytes(length, {
+    drawWidth,
+    drawHeight,
+    forceRGB = false,
+    internal = false
+  }) {
     this.image.reset();
     this.image.drawWidth = drawWidth || this.width;
     this.image.drawHeight = drawHeight || this.height;
     this.image.forceRGB = !!forceRGB;
-    return this.image.getBytes(length, true);
+    const imageBytes = this.image.getBytes(length);
+
+    if (internal || this.image instanceof _decode_stream.DecodeStream) {
+      return imageBytes;
+    }
+
+    (0, _util.assert)(imageBytes instanceof Uint8Array, 'PDFImage.getImageBytes: Unsupported "imageBytes" type.');
+    return new Uint8Array(imageBytes);
   }
 
 }
@@ -46979,15 +54555,20128 @@ class PDFImage {
 exports.PDFImage = PDFImage;
 
 /***/ }),
-/* 46 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 64 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.applyMaskImageData = applyMaskImageData;
+
+var _util = __w_pdfjs_require__(2);
+
+function applyMaskImageData({
+  src,
+  srcPos = 0,
+  dest,
+  destPos = 0,
+  width,
+  height,
+  inverseDecode = false
+}) {
+  const opaque = _util.FeatureTest.isLittleEndian ? 0xff000000 : 0x000000ff;
+  const [zeroMapping, oneMapping] = !inverseDecode ? [opaque, 0] : [0, opaque];
+  const widthInSource = width >> 3;
+  const widthRemainder = width & 7;
+  const srcLength = src.length;
+  dest = new Uint32Array(dest.buffer);
+
+  for (let i = 0; i < height; i++) {
+    for (const max = srcPos + widthInSource; srcPos < max; srcPos++) {
+      const elem = srcPos < srcLength ? src[srcPos] : 255;
+      dest[destPos++] = elem & 0b10000000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b1000000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b100000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b10000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b1000 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b100 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b10 ? oneMapping : zeroMapping;
+      dest[destPos++] = elem & 0b1 ? oneMapping : zeroMapping;
+    }
+
+    if (widthRemainder === 0) {
+      continue;
+    }
+
+    const elem = srcPos < srcLength ? src[srcPos++] : 255;
+
+    for (let j = 0; j < widthRemainder; j++) {
+      dest[destPos++] = elem & 1 << 7 - j ? oneMapping : zeroMapping;
+    }
+  }
+
+  return {
+    srcPos,
+    destPos
+  };
+}
+
+/***/ }),
+/* 65 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.incrementalUpdate = incrementalUpdate;
+exports.writeDict = writeDict;
+exports.writeObject = writeObject;
+
+var _util = __w_pdfjs_require__(2);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _xml_parser = __w_pdfjs_require__(66);
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _crypto = __w_pdfjs_require__(67);
+
+function writeObject(ref, obj, buffer, transform) {
+  buffer.push(`${ref.num} ${ref.gen} obj\n`);
+
+  if (obj instanceof _primitives.Dict) {
+    writeDict(obj, buffer, transform);
+  } else if (obj instanceof _base_stream.BaseStream) {
+    writeStream(obj, buffer, transform);
+  }
+
+  buffer.push("\nendobj\n");
+}
+
+function writeDict(dict, buffer, transform) {
+  buffer.push("<<");
+
+  for (const key of dict.getKeys()) {
+    buffer.push(` /${(0, _core_utils.escapePDFName)(key)} `);
+    writeValue(dict.getRaw(key), buffer, transform);
+  }
+
+  buffer.push(">>");
+}
+
+function writeStream(stream, buffer, transform) {
+  writeDict(stream.dict, buffer, transform);
+  buffer.push(" stream\n");
+  let string = stream.getString();
+
+  if (transform !== null) {
+    string = transform.encryptString(string);
+  }
+
+  buffer.push(string, "\nendstream\n");
+}
+
+function writeArray(array, buffer, transform) {
+  buffer.push("[");
+  let first = true;
+
+  for (const val of array) {
+    if (!first) {
+      buffer.push(" ");
+    } else {
+      first = false;
+    }
+
+    writeValue(val, buffer, transform);
+  }
+
+  buffer.push("]");
+}
+
+function writeValue(value, buffer, transform) {
+  if (value instanceof _primitives.Name) {
+    buffer.push(`/${(0, _core_utils.escapePDFName)(value.name)}`);
+  } else if (value instanceof _primitives.Ref) {
+    buffer.push(`${value.num} ${value.gen} R`);
+  } else if (Array.isArray(value)) {
+    writeArray(value, buffer, transform);
+  } else if (typeof value === "string") {
+    if (transform !== null) {
+      value = transform.encryptString(value);
+    }
+
+    buffer.push(`(${(0, _util.escapeString)(value)})`);
+  } else if (typeof value === "number") {
+    buffer.push((0, _core_utils.numberToString)(value));
+  } else if (typeof value === "boolean") {
+    buffer.push(value.toString());
+  } else if (value instanceof _primitives.Dict) {
+    writeDict(value, buffer, transform);
+  } else if (value instanceof _base_stream.BaseStream) {
+    writeStream(value, buffer, transform);
+  } else if (value === null) {
+    buffer.push("null");
+  } else {
+    (0, _util.warn)(`Unhandled value in writer: ${typeof value}, please file a bug.`);
+  }
+}
+
+function writeInt(number, size, offset, buffer) {
+  for (let i = size + offset - 1; i > offset - 1; i--) {
+    buffer[i] = number & 0xff;
+    number >>= 8;
+  }
+
+  return offset + size;
+}
+
+function writeString(string, offset, buffer) {
+  for (let i = 0, len = string.length; i < len; i++) {
+    buffer[offset + i] = string.charCodeAt(i) & 0xff;
+  }
+}
+
+function computeMD5(filesize, xrefInfo) {
+  const time = Math.floor(Date.now() / 1000);
+  const filename = xrefInfo.filename || "";
+  const md5Buffer = [time.toString(), filename, filesize.toString()];
+  let md5BufferLen = md5Buffer.reduce((a, str) => a + str.length, 0);
+
+  for (const value of Object.values(xrefInfo.info)) {
+    md5Buffer.push(value);
+    md5BufferLen += value.length;
+  }
+
+  const array = new Uint8Array(md5BufferLen);
+  let offset = 0;
+
+  for (const str of md5Buffer) {
+    writeString(str, offset, array);
+    offset += str.length;
+  }
+
+  return (0, _util.bytesToString)((0, _crypto.calculateMD5)(array));
+}
+
+function writeXFADataForAcroform(str, newRefs) {
+  const xml = new _xml_parser.SimpleXMLParser({
+    hasAttributes: true
+  }).parseFromString(str);
+
+  for (const {
+    xfa
+  } of newRefs) {
+    if (!xfa) {
+      continue;
+    }
+
+    const {
+      path,
+      value
+    } = xfa;
+
+    if (!path) {
+      continue;
+    }
+
+    const node = xml.documentElement.searchNode((0, _core_utils.parseXFAPath)(path), 0);
+
+    if (node) {
+      if (Array.isArray(value)) {
+        node.childNodes = value.map(val => new _xml_parser.SimpleDOMNode("value", val));
+      } else {
+        node.childNodes = [new _xml_parser.SimpleDOMNode("#text", value)];
+      }
+    } else {
+      (0, _util.warn)(`Node not found for path: ${path}`);
+    }
+  }
+
+  const buffer = [];
+  xml.documentElement.dump(buffer);
+  return buffer.join("");
+}
+
+function updateXFA({
+  xfaData,
+  xfaDatasetsRef,
+  hasXfaDatasetsEntry,
+  acroFormRef,
+  acroForm,
+  newRefs,
+  xref,
+  xrefInfo
+}) {
+  if (xref === null) {
+    return;
+  }
+
+  if (!hasXfaDatasetsEntry) {
+    if (!acroFormRef) {
+      (0, _util.warn)("XFA - Cannot save it");
+      return;
+    }
+
+    const oldXfa = acroForm.get("XFA");
+    const newXfa = oldXfa.slice();
+    newXfa.splice(2, 0, "datasets");
+    newXfa.splice(3, 0, xfaDatasetsRef);
+    acroForm.set("XFA", newXfa);
+    const encrypt = xref.encrypt;
+    let transform = null;
+
+    if (encrypt) {
+      transform = encrypt.createCipherTransform(acroFormRef.num, acroFormRef.gen);
+    }
+
+    const buffer = [`${acroFormRef.num} ${acroFormRef.gen} obj\n`];
+    writeDict(acroForm, buffer, transform);
+    buffer.push("\n");
+    acroForm.set("XFA", oldXfa);
+    newRefs.push({
+      ref: acroFormRef,
+      data: buffer.join("")
+    });
+  }
+
+  if (xfaData === null) {
+    const datasets = xref.fetchIfRef(xfaDatasetsRef);
+    xfaData = writeXFADataForAcroform(datasets.getString(), newRefs);
+  }
+
+  const encrypt = xref.encrypt;
+
+  if (encrypt) {
+    const transform = encrypt.createCipherTransform(xfaDatasetsRef.num, xfaDatasetsRef.gen);
+    xfaData = transform.encryptString(xfaData);
+  }
+
+  const data = `${xfaDatasetsRef.num} ${xfaDatasetsRef.gen} obj\n` + `<< /Type /EmbeddedFile /Length ${xfaData.length}>>\nstream\n` + xfaData + "\nendstream\nendobj\n";
+  newRefs.push({
+    ref: xfaDatasetsRef,
+    data
+  });
+}
+
+function incrementalUpdate({
+  originalData,
+  xrefInfo,
+  newRefs,
+  xref = null,
+  hasXfa = false,
+  xfaDatasetsRef = null,
+  hasXfaDatasetsEntry = false,
+  acroFormRef = null,
+  acroForm = null,
+  xfaData = null
+}) {
+  if (hasXfa) {
+    updateXFA({
+      xfaData,
+      xfaDatasetsRef,
+      hasXfaDatasetsEntry,
+      acroFormRef,
+      acroForm,
+      newRefs,
+      xref,
+      xrefInfo
+    });
+  }
+
+  const newXref = new _primitives.Dict(null);
+  const refForXrefTable = xrefInfo.newRef;
+  let buffer, baseOffset;
+  const lastByte = originalData.at(-1);
+
+  if (lastByte === 0x0a || lastByte === 0x0d) {
+    buffer = [];
+    baseOffset = originalData.length;
+  } else {
+    buffer = ["\n"];
+    baseOffset = originalData.length + 1;
+  }
+
+  newXref.set("Size", refForXrefTable.num + 1);
+  newXref.set("Prev", xrefInfo.startXRef);
+  newXref.set("Type", _primitives.Name.get("XRef"));
+
+  if (xrefInfo.rootRef !== null) {
+    newXref.set("Root", xrefInfo.rootRef);
+  }
+
+  if (xrefInfo.infoRef !== null) {
+    newXref.set("Info", xrefInfo.infoRef);
+  }
+
+  if (xrefInfo.encryptRef !== null) {
+    newXref.set("Encrypt", xrefInfo.encryptRef);
+  }
+
+  newRefs.push({
+    ref: refForXrefTable,
+    data: ""
+  });
+  newRefs = newRefs.sort((a, b) => {
+    return a.ref.num - b.ref.num;
+  });
+  const xrefTableData = [[0, 1, 0xffff]];
+  const indexes = [0, 1];
+  let maxOffset = 0;
+
+  for (const {
+    ref,
+    data
+  } of newRefs) {
+    maxOffset = Math.max(maxOffset, baseOffset);
+    xrefTableData.push([1, baseOffset, Math.min(ref.gen, 0xffff)]);
+    baseOffset += data.length;
+    indexes.push(ref.num, 1);
+    buffer.push(data);
+  }
+
+  newXref.set("Index", indexes);
+
+  if (Array.isArray(xrefInfo.fileIds) && xrefInfo.fileIds.length > 0) {
+    const md5 = computeMD5(baseOffset, xrefInfo);
+    newXref.set("ID", [xrefInfo.fileIds[0], md5]);
+  }
+
+  const offsetSize = Math.ceil(Math.log2(maxOffset) / 8);
+  const sizes = [1, offsetSize, 2];
+  const structSize = sizes[0] + sizes[1] + sizes[2];
+  const tableLength = structSize * xrefTableData.length;
+  newXref.set("W", sizes);
+  newXref.set("Length", tableLength);
+  buffer.push(`${refForXrefTable.num} ${refForXrefTable.gen} obj\n`);
+  writeDict(newXref, buffer, null);
+  buffer.push(" stream\n");
+  const bufferLen = buffer.reduce((a, str) => a + str.length, 0);
+  const footer = `\nendstream\nendobj\nstartxref\n${baseOffset}\n%%EOF\n`;
+  const array = new Uint8Array(originalData.length + bufferLen + tableLength + footer.length);
+  array.set(originalData);
+  let offset = originalData.length;
+
+  for (const str of buffer) {
+    writeString(str, offset, array);
+    offset += str.length;
+  }
+
+  for (const [type, objOffset, gen] of xrefTableData) {
+    offset = writeInt(type, sizes[0], offset, array);
+    offset = writeInt(objOffset, sizes[1], offset, array);
+    offset = writeInt(gen, sizes[2], offset, array);
+  }
+
+  writeString(footer, offset, array);
+  return array;
+}
+
+/***/ }),
+/* 66 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XMLParserErrorCode = exports.XMLParserBase = exports.SimpleXMLParser = exports.SimpleDOMNode = void 0;
+
+var _core_utils = __w_pdfjs_require__(6);
+
+const XMLParserErrorCode = {
+  NoError: 0,
+  EndOfDocument: -1,
+  UnterminatedCdat: -2,
+  UnterminatedXmlDeclaration: -3,
+  UnterminatedDoctypeDeclaration: -4,
+  UnterminatedComment: -5,
+  MalformedElement: -6,
+  OutOfMemory: -7,
+  UnterminatedAttributeValue: -8,
+  UnterminatedElement: -9,
+  ElementNeverBegun: -10
+};
+exports.XMLParserErrorCode = XMLParserErrorCode;
+
+function isWhitespace(s, index) {
+  const ch = s[index];
+  return ch === " " || ch === "\n" || ch === "\r" || ch === "\t";
+}
+
+function isWhitespaceString(s) {
+  for (let i = 0, ii = s.length; i < ii; i++) {
+    if (!isWhitespace(s, i)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+class XMLParserBase {
+  _resolveEntities(s) {
+    return s.replace(/&([^;]+);/g, (all, entity) => {
+      if (entity.substring(0, 2) === "#x") {
+        return String.fromCodePoint(parseInt(entity.substring(2), 16));
+      } else if (entity.substring(0, 1) === "#") {
+        return String.fromCodePoint(parseInt(entity.substring(1), 10));
+      }
+
+      switch (entity) {
+        case "lt":
+          return "<";
+
+        case "gt":
+          return ">";
+
+        case "amp":
+          return "&";
+
+        case "quot":
+          return '"';
+
+        case "apos":
+          return "'";
+      }
+
+      return this.onResolveEntity(entity);
+    });
+  }
+
+  _parseContent(s, start) {
+    const attributes = [];
+    let pos = start;
+
+    function skipWs() {
+      while (pos < s.length && isWhitespace(s, pos)) {
+        ++pos;
+      }
+    }
+
+    while (pos < s.length && !isWhitespace(s, pos) && s[pos] !== ">" && s[pos] !== "/") {
+      ++pos;
+    }
+
+    const name = s.substring(start, pos);
+    skipWs();
+
+    while (pos < s.length && s[pos] !== ">" && s[pos] !== "/" && s[pos] !== "?") {
+      skipWs();
+      let attrName = "",
+          attrValue = "";
+
+      while (pos < s.length && !isWhitespace(s, pos) && s[pos] !== "=") {
+        attrName += s[pos];
+        ++pos;
+      }
+
+      skipWs();
+
+      if (s[pos] !== "=") {
+        return null;
+      }
+
+      ++pos;
+      skipWs();
+      const attrEndChar = s[pos];
+
+      if (attrEndChar !== '"' && attrEndChar !== "'") {
+        return null;
+      }
+
+      const attrEndIndex = s.indexOf(attrEndChar, ++pos);
+
+      if (attrEndIndex < 0) {
+        return null;
+      }
+
+      attrValue = s.substring(pos, attrEndIndex);
+      attributes.push({
+        name: attrName,
+        value: this._resolveEntities(attrValue)
+      });
+      pos = attrEndIndex + 1;
+      skipWs();
+    }
+
+    return {
+      name,
+      attributes,
+      parsed: pos - start
+    };
+  }
+
+  _parseProcessingInstruction(s, start) {
+    let pos = start;
+
+    function skipWs() {
+      while (pos < s.length && isWhitespace(s, pos)) {
+        ++pos;
+      }
+    }
+
+    while (pos < s.length && !isWhitespace(s, pos) && s[pos] !== ">" && s[pos] !== "?" && s[pos] !== "/") {
+      ++pos;
+    }
+
+    const name = s.substring(start, pos);
+    skipWs();
+    const attrStart = pos;
+
+    while (pos < s.length && (s[pos] !== "?" || s[pos + 1] !== ">")) {
+      ++pos;
+    }
+
+    const value = s.substring(attrStart, pos);
+    return {
+      name,
+      value,
+      parsed: pos - start
+    };
+  }
+
+  parseXml(s) {
+    let i = 0;
+
+    while (i < s.length) {
+      const ch = s[i];
+      let j = i;
+
+      if (ch === "<") {
+        ++j;
+        const ch2 = s[j];
+        let q;
+
+        switch (ch2) {
+          case "/":
+            ++j;
+            q = s.indexOf(">", j);
+
+            if (q < 0) {
+              this.onError(XMLParserErrorCode.UnterminatedElement);
+              return;
+            }
+
+            this.onEndElement(s.substring(j, q));
+            j = q + 1;
+            break;
+
+          case "?":
+            ++j;
+
+            const pi = this._parseProcessingInstruction(s, j);
+
+            if (s.substring(j + pi.parsed, j + pi.parsed + 2) !== "?>") {
+              this.onError(XMLParserErrorCode.UnterminatedXmlDeclaration);
+              return;
+            }
+
+            this.onPi(pi.name, pi.value);
+            j += pi.parsed + 2;
+            break;
+
+          case "!":
+            if (s.substring(j + 1, j + 3) === "--") {
+              q = s.indexOf("-->", j + 3);
+
+              if (q < 0) {
+                this.onError(XMLParserErrorCode.UnterminatedComment);
+                return;
+              }
+
+              this.onComment(s.substring(j + 3, q));
+              j = q + 3;
+            } else if (s.substring(j + 1, j + 8) === "[CDATA[") {
+              q = s.indexOf("]]>", j + 8);
+
+              if (q < 0) {
+                this.onError(XMLParserErrorCode.UnterminatedCdat);
+                return;
+              }
+
+              this.onCdata(s.substring(j + 8, q));
+              j = q + 3;
+            } else if (s.substring(j + 1, j + 8) === "DOCTYPE") {
+              const q2 = s.indexOf("[", j + 8);
+              let complexDoctype = false;
+              q = s.indexOf(">", j + 8);
+
+              if (q < 0) {
+                this.onError(XMLParserErrorCode.UnterminatedDoctypeDeclaration);
+                return;
+              }
+
+              if (q2 > 0 && q > q2) {
+                q = s.indexOf("]>", j + 8);
+
+                if (q < 0) {
+                  this.onError(XMLParserErrorCode.UnterminatedDoctypeDeclaration);
+                  return;
+                }
+
+                complexDoctype = true;
+              }
+
+              const doctypeContent = s.substring(j + 8, q + (complexDoctype ? 1 : 0));
+              this.onDoctype(doctypeContent);
+              j = q + (complexDoctype ? 2 : 1);
+            } else {
+              this.onError(XMLParserErrorCode.MalformedElement);
+              return;
+            }
+
+            break;
+
+          default:
+            const content = this._parseContent(s, j);
+
+            if (content === null) {
+              this.onError(XMLParserErrorCode.MalformedElement);
+              return;
+            }
+
+            let isClosed = false;
+
+            if (s.substring(j + content.parsed, j + content.parsed + 2) === "/>") {
+              isClosed = true;
+            } else if (s.substring(j + content.parsed, j + content.parsed + 1) !== ">") {
+              this.onError(XMLParserErrorCode.UnterminatedElement);
+              return;
+            }
+
+            this.onBeginElement(content.name, content.attributes, isClosed);
+            j += content.parsed + (isClosed ? 2 : 1);
+            break;
+        }
+      } else {
+        while (j < s.length && s[j] !== "<") {
+          j++;
+        }
+
+        const text = s.substring(i, j);
+        this.onText(this._resolveEntities(text));
+      }
+
+      i = j;
+    }
+  }
+
+  onResolveEntity(name) {
+    return `&${name};`;
+  }
+
+  onPi(name, value) {}
+
+  onComment(text) {}
+
+  onCdata(text) {}
+
+  onDoctype(doctypeContent) {}
+
+  onText(text) {}
+
+  onBeginElement(name, attributes, isEmpty) {}
+
+  onEndElement(name) {}
+
+  onError(code) {}
+
+}
+
+exports.XMLParserBase = XMLParserBase;
+
+class SimpleDOMNode {
+  constructor(nodeName, nodeValue) {
+    this.nodeName = nodeName;
+    this.nodeValue = nodeValue;
+    Object.defineProperty(this, "parentNode", {
+      value: null,
+      writable: true
+    });
+  }
+
+  get firstChild() {
+    return this.childNodes && this.childNodes[0];
+  }
+
+  get nextSibling() {
+    const childNodes = this.parentNode.childNodes;
+
+    if (!childNodes) {
+      return undefined;
+    }
+
+    const index = childNodes.indexOf(this);
+
+    if (index === -1) {
+      return undefined;
+    }
+
+    return childNodes[index + 1];
+  }
+
+  get textContent() {
+    if (!this.childNodes) {
+      return this.nodeValue || "";
+    }
+
+    return this.childNodes.map(function (child) {
+      return child.textContent;
+    }).join("");
+  }
+
+  get children() {
+    return this.childNodes || [];
+  }
+
+  hasChildNodes() {
+    return this.childNodes && this.childNodes.length > 0;
+  }
+
+  searchNode(paths, pos) {
+    if (pos >= paths.length) {
+      return this;
+    }
+
+    const component = paths[pos];
+    const stack = [];
+    let node = this;
+
+    while (true) {
+      if (component.name === node.nodeName) {
+        if (component.pos === 0) {
+          const res = node.searchNode(paths, pos + 1);
+
+          if (res !== null) {
+            return res;
+          }
+        } else if (stack.length === 0) {
+          return null;
+        } else {
+          const [parent] = stack.pop();
+          let siblingPos = 0;
+
+          for (const child of parent.childNodes) {
+            if (component.name === child.nodeName) {
+              if (siblingPos === component.pos) {
+                return child.searchNode(paths, pos + 1);
+              }
+
+              siblingPos++;
+            }
+          }
+
+          return node.searchNode(paths, pos + 1);
+        }
+      }
+
+      if (node.childNodes && node.childNodes.length !== 0) {
+        stack.push([node, 0]);
+        node = node.childNodes[0];
+      } else if (stack.length === 0) {
+        return null;
+      } else {
+        while (stack.length !== 0) {
+          const [parent, currentPos] = stack.pop();
+          const newPos = currentPos + 1;
+
+          if (newPos < parent.childNodes.length) {
+            stack.push([parent, newPos]);
+            node = parent.childNodes[newPos];
+            break;
+          }
+        }
+
+        if (stack.length === 0) {
+          return null;
+        }
+      }
+    }
+  }
+
+  dump(buffer) {
+    if (this.nodeName === "#text") {
+      buffer.push((0, _core_utils.encodeToXmlString)(this.nodeValue));
+      return;
+    }
+
+    buffer.push(`<${this.nodeName}`);
+
+    if (this.attributes) {
+      for (const attribute of this.attributes) {
+        buffer.push(` ${attribute.name}="${(0, _core_utils.encodeToXmlString)(attribute.value)}"`);
+      }
+    }
+
+    if (this.hasChildNodes()) {
+      buffer.push(">");
+
+      for (const child of this.childNodes) {
+        child.dump(buffer);
+      }
+
+      buffer.push(`</${this.nodeName}>`);
+    } else if (this.nodeValue) {
+      buffer.push(`>${(0, _core_utils.encodeToXmlString)(this.nodeValue)}</${this.nodeName}>`);
+    } else {
+      buffer.push("/>");
+    }
+  }
+
+}
+
+exports.SimpleDOMNode = SimpleDOMNode;
+
+class SimpleXMLParser extends XMLParserBase {
+  constructor({
+    hasAttributes = false,
+    lowerCaseName = false
+  }) {
+    super();
+    this._currentFragment = null;
+    this._stack = null;
+    this._errorCode = XMLParserErrorCode.NoError;
+    this._hasAttributes = hasAttributes;
+    this._lowerCaseName = lowerCaseName;
+  }
+
+  parseFromString(data) {
+    this._currentFragment = [];
+    this._stack = [];
+    this._errorCode = XMLParserErrorCode.NoError;
+    this.parseXml(data);
+
+    if (this._errorCode !== XMLParserErrorCode.NoError) {
+      return undefined;
+    }
+
+    const [documentElement] = this._currentFragment;
+
+    if (!documentElement) {
+      return undefined;
+    }
+
+    return {
+      documentElement
+    };
+  }
+
+  onText(text) {
+    if (isWhitespaceString(text)) {
+      return;
+    }
+
+    const node = new SimpleDOMNode("#text", text);
+
+    this._currentFragment.push(node);
+  }
+
+  onCdata(text) {
+    const node = new SimpleDOMNode("#text", text);
+
+    this._currentFragment.push(node);
+  }
+
+  onBeginElement(name, attributes, isEmpty) {
+    if (this._lowerCaseName) {
+      name = name.toLowerCase();
+    }
+
+    const node = new SimpleDOMNode(name);
+    node.childNodes = [];
+
+    if (this._hasAttributes) {
+      node.attributes = attributes;
+    }
+
+    this._currentFragment.push(node);
+
+    if (isEmpty) {
+      return;
+    }
+
+    this._stack.push(this._currentFragment);
+
+    this._currentFragment = node.childNodes;
+  }
+
+  onEndElement(name) {
+    this._currentFragment = this._stack.pop() || [];
+
+    const lastElement = this._currentFragment.at(-1);
+
+    if (!lastElement) {
+      return null;
+    }
+
+    for (let i = 0, ii = lastElement.childNodes.length; i < ii; i++) {
+      lastElement.childNodes[i].parentNode = lastElement;
+    }
+
+    return lastElement;
+  }
+
+  onError(code) {
+    this._errorCode = code;
+  }
+
+}
+
+exports.SimpleXMLParser = SimpleXMLParser;
+
+/***/ }),
+/* 67 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.calculateSHA256 = exports.calculateMD5 = exports.PDF20 = exports.PDF17 = exports.CipherTransformFactory = exports.ARCFourCipher = exports.AES256Cipher = exports.AES128Cipher = void 0;
+exports.calculateSHA384 = calculateSHA384;
+exports.calculateSHA512 = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _decrypt_stream = __w_pdfjs_require__(68);
+
+class ARCFourCipher {
+  constructor(key) {
+    this.a = 0;
+    this.b = 0;
+    const s = new Uint8Array(256);
+    const keyLength = key.length;
+
+    for (let i = 0; i < 256; ++i) {
+      s[i] = i;
+    }
+
+    for (let i = 0, j = 0; i < 256; ++i) {
+      const tmp = s[i];
+      j = j + tmp + key[i % keyLength] & 0xff;
+      s[i] = s[j];
+      s[j] = tmp;
+    }
+
+    this.s = s;
+  }
+
+  encryptBlock(data) {
+    let a = this.a,
+        b = this.b;
+    const s = this.s;
+    const n = data.length;
+    const output = new Uint8Array(n);
+
+    for (let i = 0; i < n; ++i) {
+      a = a + 1 & 0xff;
+      const tmp = s[a];
+      b = b + tmp & 0xff;
+      const tmp2 = s[b];
+      s[a] = tmp2;
+      s[b] = tmp;
+      output[i] = data[i] ^ s[tmp + tmp2 & 0xff];
+    }
+
+    this.a = a;
+    this.b = b;
+    return output;
+  }
+
+  decryptBlock(data) {
+    return this.encryptBlock(data);
+  }
+
+  encrypt(data) {
+    return this.encryptBlock(data);
+  }
+
+}
+
+exports.ARCFourCipher = ARCFourCipher;
+
+const calculateMD5 = function calculateMD5Closure() {
+  const r = new Uint8Array([7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
+  const k = new Int32Array([-680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426, -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162, 1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632, 643717713, -373897302, -701558691, 38016083, -660478335, -405537848, 568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784, 1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556, -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222, -722521979, 76029189, -640364487, -421815835, 530742520, -995338651, -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606, -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649, -145523070, -1120210379, 718787259, -343485551]);
+
+  function hash(data, offset, length) {
+    let h0 = 1732584193,
+        h1 = -271733879,
+        h2 = -1732584194,
+        h3 = 271733878;
+    const paddedLength = length + 72 & ~63;
+    const padded = new Uint8Array(paddedLength);
+    let i, j;
+
+    for (i = 0; i < length; ++i) {
+      padded[i] = data[offset++];
+    }
+
+    padded[i++] = 0x80;
+    const n = paddedLength - 8;
+
+    while (i < n) {
+      padded[i++] = 0;
+    }
+
+    padded[i++] = length << 3 & 0xff;
+    padded[i++] = length >> 5 & 0xff;
+    padded[i++] = length >> 13 & 0xff;
+    padded[i++] = length >> 21 & 0xff;
+    padded[i++] = length >>> 29 & 0xff;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    const w = new Int32Array(16);
+
+    for (i = 0; i < paddedLength;) {
+      for (j = 0; j < 16; ++j, i += 4) {
+        w[j] = padded[i] | padded[i + 1] << 8 | padded[i + 2] << 16 | padded[i + 3] << 24;
+      }
+
+      let a = h0,
+          b = h1,
+          c = h2,
+          d = h3,
+          f,
+          g;
+
+      for (j = 0; j < 64; ++j) {
+        if (j < 16) {
+          f = b & c | ~b & d;
+          g = j;
+        } else if (j < 32) {
+          f = d & b | ~d & c;
+          g = 5 * j + 1 & 15;
+        } else if (j < 48) {
+          f = b ^ c ^ d;
+          g = 3 * j + 5 & 15;
+        } else {
+          f = c ^ (b | ~d);
+          g = 7 * j & 15;
+        }
+
+        const tmp = d,
+              rotateArg = a + f + k[j] + w[g] | 0,
+              rotate = r[j];
+        d = c;
+        c = b;
+        b = b + (rotateArg << rotate | rotateArg >>> 32 - rotate) | 0;
+        a = tmp;
+      }
+
+      h0 = h0 + a | 0;
+      h1 = h1 + b | 0;
+      h2 = h2 + c | 0;
+      h3 = h3 + d | 0;
+    }
+
+    return new Uint8Array([h0 & 0xFF, h0 >> 8 & 0xFF, h0 >> 16 & 0xFF, h0 >>> 24 & 0xFF, h1 & 0xFF, h1 >> 8 & 0xFF, h1 >> 16 & 0xFF, h1 >>> 24 & 0xFF, h2 & 0xFF, h2 >> 8 & 0xFF, h2 >> 16 & 0xFF, h2 >>> 24 & 0xFF, h3 & 0xFF, h3 >> 8 & 0xFF, h3 >> 16 & 0xFF, h3 >>> 24 & 0xFF]);
+  }
+
+  return hash;
+}();
+
+exports.calculateMD5 = calculateMD5;
+
+class Word64 {
+  constructor(highInteger, lowInteger) {
+    this.high = highInteger | 0;
+    this.low = lowInteger | 0;
+  }
+
+  and(word) {
+    this.high &= word.high;
+    this.low &= word.low;
+  }
+
+  xor(word) {
+    this.high ^= word.high;
+    this.low ^= word.low;
+  }
+
+  or(word) {
+    this.high |= word.high;
+    this.low |= word.low;
+  }
+
+  shiftRight(places) {
+    if (places >= 32) {
+      this.low = this.high >>> places - 32 | 0;
+      this.high = 0;
+    } else {
+      this.low = this.low >>> places | this.high << 32 - places;
+      this.high = this.high >>> places | 0;
+    }
+  }
+
+  shiftLeft(places) {
+    if (places >= 32) {
+      this.high = this.low << places - 32;
+      this.low = 0;
+    } else {
+      this.high = this.high << places | this.low >>> 32 - places;
+      this.low <<= places;
+    }
+  }
+
+  rotateRight(places) {
+    let low, high;
+
+    if (places & 32) {
+      high = this.low;
+      low = this.high;
+    } else {
+      low = this.low;
+      high = this.high;
+    }
+
+    places &= 31;
+    this.low = low >>> places | high << 32 - places;
+    this.high = high >>> places | low << 32 - places;
+  }
+
+  not() {
+    this.high = ~this.high;
+    this.low = ~this.low;
+  }
+
+  add(word) {
+    const lowAdd = (this.low >>> 0) + (word.low >>> 0);
+    let highAdd = (this.high >>> 0) + (word.high >>> 0);
+
+    if (lowAdd > 0xffffffff) {
+      highAdd += 1;
+    }
+
+    this.low = lowAdd | 0;
+    this.high = highAdd | 0;
+  }
+
+  copyTo(bytes, offset) {
+    bytes[offset] = this.high >>> 24 & 0xff;
+    bytes[offset + 1] = this.high >> 16 & 0xff;
+    bytes[offset + 2] = this.high >> 8 & 0xff;
+    bytes[offset + 3] = this.high & 0xff;
+    bytes[offset + 4] = this.low >>> 24 & 0xff;
+    bytes[offset + 5] = this.low >> 16 & 0xff;
+    bytes[offset + 6] = this.low >> 8 & 0xff;
+    bytes[offset + 7] = this.low & 0xff;
+  }
+
+  assign(word) {
+    this.high = word.high;
+    this.low = word.low;
+  }
+
+}
+
+const calculateSHA256 = function calculateSHA256Closure() {
+  function rotr(x, n) {
+    return x >>> n | x << 32 - n;
+  }
+
+  function ch(x, y, z) {
+    return x & y ^ ~x & z;
+  }
+
+  function maj(x, y, z) {
+    return x & y ^ x & z ^ y & z;
+  }
+
+  function sigma(x) {
+    return rotr(x, 2) ^ rotr(x, 13) ^ rotr(x, 22);
+  }
+
+  function sigmaPrime(x) {
+    return rotr(x, 6) ^ rotr(x, 11) ^ rotr(x, 25);
+  }
+
+  function littleSigma(x) {
+    return rotr(x, 7) ^ rotr(x, 18) ^ x >>> 3;
+  }
+
+  function littleSigmaPrime(x) {
+    return rotr(x, 17) ^ rotr(x, 19) ^ x >>> 10;
+  }
+
+  const k = [0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2];
+
+  function hash(data, offset, length) {
+    let h0 = 0x6a09e667,
+        h1 = 0xbb67ae85,
+        h2 = 0x3c6ef372,
+        h3 = 0xa54ff53a,
+        h4 = 0x510e527f,
+        h5 = 0x9b05688c,
+        h6 = 0x1f83d9ab,
+        h7 = 0x5be0cd19;
+    const paddedLength = Math.ceil((length + 9) / 64) * 64;
+    const padded = new Uint8Array(paddedLength);
+    let i, j;
+
+    for (i = 0; i < length; ++i) {
+      padded[i] = data[offset++];
+    }
+
+    padded[i++] = 0x80;
+    const n = paddedLength - 8;
+
+    while (i < n) {
+      padded[i++] = 0;
+    }
+
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = length >>> 29 & 0xff;
+    padded[i++] = length >> 21 & 0xff;
+    padded[i++] = length >> 13 & 0xff;
+    padded[i++] = length >> 5 & 0xff;
+    padded[i++] = length << 3 & 0xff;
+    const w = new Uint32Array(64);
+
+    for (i = 0; i < paddedLength;) {
+      for (j = 0; j < 16; ++j) {
+        w[j] = padded[i] << 24 | padded[i + 1] << 16 | padded[i + 2] << 8 | padded[i + 3];
+        i += 4;
+      }
+
+      for (j = 16; j < 64; ++j) {
+        w[j] = littleSigmaPrime(w[j - 2]) + w[j - 7] + littleSigma(w[j - 15]) + w[j - 16] | 0;
+      }
+
+      let a = h0,
+          b = h1,
+          c = h2,
+          d = h3,
+          e = h4,
+          f = h5,
+          g = h6,
+          h = h7,
+          t1,
+          t2;
+
+      for (j = 0; j < 64; ++j) {
+        t1 = h + sigmaPrime(e) + ch(e, f, g) + k[j] + w[j];
+        t2 = sigma(a) + maj(a, b, c);
+        h = g;
+        g = f;
+        f = e;
+        e = d + t1 | 0;
+        d = c;
+        c = b;
+        b = a;
+        a = t1 + t2 | 0;
+      }
+
+      h0 = h0 + a | 0;
+      h1 = h1 + b | 0;
+      h2 = h2 + c | 0;
+      h3 = h3 + d | 0;
+      h4 = h4 + e | 0;
+      h5 = h5 + f | 0;
+      h6 = h6 + g | 0;
+      h7 = h7 + h | 0;
+    }
+
+    return new Uint8Array([h0 >> 24 & 0xFF, h0 >> 16 & 0xFF, h0 >> 8 & 0xFF, h0 & 0xFF, h1 >> 24 & 0xFF, h1 >> 16 & 0xFF, h1 >> 8 & 0xFF, h1 & 0xFF, h2 >> 24 & 0xFF, h2 >> 16 & 0xFF, h2 >> 8 & 0xFF, h2 & 0xFF, h3 >> 24 & 0xFF, h3 >> 16 & 0xFF, h3 >> 8 & 0xFF, h3 & 0xFF, h4 >> 24 & 0xFF, h4 >> 16 & 0xFF, h4 >> 8 & 0xFF, h4 & 0xFF, h5 >> 24 & 0xFF, h5 >> 16 & 0xFF, h5 >> 8 & 0xFF, h5 & 0xFF, h6 >> 24 & 0xFF, h6 >> 16 & 0xFF, h6 >> 8 & 0xFF, h6 & 0xFF, h7 >> 24 & 0xFF, h7 >> 16 & 0xFF, h7 >> 8 & 0xFF, h7 & 0xFF]);
+  }
+
+  return hash;
+}();
+
+exports.calculateSHA256 = calculateSHA256;
+
+const calculateSHA512 = function calculateSHA512Closure() {
+  function ch(result, x, y, z, tmp) {
+    result.assign(x);
+    result.and(y);
+    tmp.assign(x);
+    tmp.not();
+    tmp.and(z);
+    result.xor(tmp);
+  }
+
+  function maj(result, x, y, z, tmp) {
+    result.assign(x);
+    result.and(y);
+    tmp.assign(x);
+    tmp.and(z);
+    result.xor(tmp);
+    tmp.assign(y);
+    tmp.and(z);
+    result.xor(tmp);
+  }
+
+  function sigma(result, x, tmp) {
+    result.assign(x);
+    result.rotateRight(28);
+    tmp.assign(x);
+    tmp.rotateRight(34);
+    result.xor(tmp);
+    tmp.assign(x);
+    tmp.rotateRight(39);
+    result.xor(tmp);
+  }
+
+  function sigmaPrime(result, x, tmp) {
+    result.assign(x);
+    result.rotateRight(14);
+    tmp.assign(x);
+    tmp.rotateRight(18);
+    result.xor(tmp);
+    tmp.assign(x);
+    tmp.rotateRight(41);
+    result.xor(tmp);
+  }
+
+  function littleSigma(result, x, tmp) {
+    result.assign(x);
+    result.rotateRight(1);
+    tmp.assign(x);
+    tmp.rotateRight(8);
+    result.xor(tmp);
+    tmp.assign(x);
+    tmp.shiftRight(7);
+    result.xor(tmp);
+  }
+
+  function littleSigmaPrime(result, x, tmp) {
+    result.assign(x);
+    result.rotateRight(19);
+    tmp.assign(x);
+    tmp.rotateRight(61);
+    result.xor(tmp);
+    tmp.assign(x);
+    tmp.shiftRight(6);
+    result.xor(tmp);
+  }
+
+  const k = [new Word64(0x428a2f98, 0xd728ae22), new Word64(0x71374491, 0x23ef65cd), new Word64(0xb5c0fbcf, 0xec4d3b2f), new Word64(0xe9b5dba5, 0x8189dbbc), new Word64(0x3956c25b, 0xf348b538), new Word64(0x59f111f1, 0xb605d019), new Word64(0x923f82a4, 0xaf194f9b), new Word64(0xab1c5ed5, 0xda6d8118), new Word64(0xd807aa98, 0xa3030242), new Word64(0x12835b01, 0x45706fbe), new Word64(0x243185be, 0x4ee4b28c), new Word64(0x550c7dc3, 0xd5ffb4e2), new Word64(0x72be5d74, 0xf27b896f), new Word64(0x80deb1fe, 0x3b1696b1), new Word64(0x9bdc06a7, 0x25c71235), new Word64(0xc19bf174, 0xcf692694), new Word64(0xe49b69c1, 0x9ef14ad2), new Word64(0xefbe4786, 0x384f25e3), new Word64(0x0fc19dc6, 0x8b8cd5b5), new Word64(0x240ca1cc, 0x77ac9c65), new Word64(0x2de92c6f, 0x592b0275), new Word64(0x4a7484aa, 0x6ea6e483), new Word64(0x5cb0a9dc, 0xbd41fbd4), new Word64(0x76f988da, 0x831153b5), new Word64(0x983e5152, 0xee66dfab), new Word64(0xa831c66d, 0x2db43210), new Word64(0xb00327c8, 0x98fb213f), new Word64(0xbf597fc7, 0xbeef0ee4), new Word64(0xc6e00bf3, 0x3da88fc2), new Word64(0xd5a79147, 0x930aa725), new Word64(0x06ca6351, 0xe003826f), new Word64(0x14292967, 0x0a0e6e70), new Word64(0x27b70a85, 0x46d22ffc), new Word64(0x2e1b2138, 0x5c26c926), new Word64(0x4d2c6dfc, 0x5ac42aed), new Word64(0x53380d13, 0x9d95b3df), new Word64(0x650a7354, 0x8baf63de), new Word64(0x766a0abb, 0x3c77b2a8), new Word64(0x81c2c92e, 0x47edaee6), new Word64(0x92722c85, 0x1482353b), new Word64(0xa2bfe8a1, 0x4cf10364), new Word64(0xa81a664b, 0xbc423001), new Word64(0xc24b8b70, 0xd0f89791), new Word64(0xc76c51a3, 0x0654be30), new Word64(0xd192e819, 0xd6ef5218), new Word64(0xd6990624, 0x5565a910), new Word64(0xf40e3585, 0x5771202a), new Word64(0x106aa070, 0x32bbd1b8), new Word64(0x19a4c116, 0xb8d2d0c8), new Word64(0x1e376c08, 0x5141ab53), new Word64(0x2748774c, 0xdf8eeb99), new Word64(0x34b0bcb5, 0xe19b48a8), new Word64(0x391c0cb3, 0xc5c95a63), new Word64(0x4ed8aa4a, 0xe3418acb), new Word64(0x5b9cca4f, 0x7763e373), new Word64(0x682e6ff3, 0xd6b2b8a3), new Word64(0x748f82ee, 0x5defb2fc), new Word64(0x78a5636f, 0x43172f60), new Word64(0x84c87814, 0xa1f0ab72), new Word64(0x8cc70208, 0x1a6439ec), new Word64(0x90befffa, 0x23631e28), new Word64(0xa4506ceb, 0xde82bde9), new Word64(0xbef9a3f7, 0xb2c67915), new Word64(0xc67178f2, 0xe372532b), new Word64(0xca273ece, 0xea26619c), new Word64(0xd186b8c7, 0x21c0c207), new Word64(0xeada7dd6, 0xcde0eb1e), new Word64(0xf57d4f7f, 0xee6ed178), new Word64(0x06f067aa, 0x72176fba), new Word64(0x0a637dc5, 0xa2c898a6), new Word64(0x113f9804, 0xbef90dae), new Word64(0x1b710b35, 0x131c471b), new Word64(0x28db77f5, 0x23047d84), new Word64(0x32caab7b, 0x40c72493), new Word64(0x3c9ebe0a, 0x15c9bebc), new Word64(0x431d67c4, 0x9c100d4c), new Word64(0x4cc5d4be, 0xcb3e42b6), new Word64(0x597f299c, 0xfc657e2a), new Word64(0x5fcb6fab, 0x3ad6faec), new Word64(0x6c44198c, 0x4a475817)];
+
+  function hash(data, offset, length, mode384 = false) {
+    let h0, h1, h2, h3, h4, h5, h6, h7;
+
+    if (!mode384) {
+      h0 = new Word64(0x6a09e667, 0xf3bcc908);
+      h1 = new Word64(0xbb67ae85, 0x84caa73b);
+      h2 = new Word64(0x3c6ef372, 0xfe94f82b);
+      h3 = new Word64(0xa54ff53a, 0x5f1d36f1);
+      h4 = new Word64(0x510e527f, 0xade682d1);
+      h5 = new Word64(0x9b05688c, 0x2b3e6c1f);
+      h6 = new Word64(0x1f83d9ab, 0xfb41bd6b);
+      h7 = new Word64(0x5be0cd19, 0x137e2179);
+    } else {
+      h0 = new Word64(0xcbbb9d5d, 0xc1059ed8);
+      h1 = new Word64(0x629a292a, 0x367cd507);
+      h2 = new Word64(0x9159015a, 0x3070dd17);
+      h3 = new Word64(0x152fecd8, 0xf70e5939);
+      h4 = new Word64(0x67332667, 0xffc00b31);
+      h5 = new Word64(0x8eb44a87, 0x68581511);
+      h6 = new Word64(0xdb0c2e0d, 0x64f98fa7);
+      h7 = new Word64(0x47b5481d, 0xbefa4fa4);
+    }
+
+    const paddedLength = Math.ceil((length + 17) / 128) * 128;
+    const padded = new Uint8Array(paddedLength);
+    let i, j;
+
+    for (i = 0; i < length; ++i) {
+      padded[i] = data[offset++];
+    }
+
+    padded[i++] = 0x80;
+    const n = paddedLength - 16;
+
+    while (i < n) {
+      padded[i++] = 0;
+    }
+
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = length >>> 29 & 0xff;
+    padded[i++] = length >> 21 & 0xff;
+    padded[i++] = length >> 13 & 0xff;
+    padded[i++] = length >> 5 & 0xff;
+    padded[i++] = length << 3 & 0xff;
+    const w = new Array(80);
+
+    for (i = 0; i < 80; i++) {
+      w[i] = new Word64(0, 0);
+    }
+
+    let a = new Word64(0, 0),
+        b = new Word64(0, 0),
+        c = new Word64(0, 0);
+    let d = new Word64(0, 0),
+        e = new Word64(0, 0),
+        f = new Word64(0, 0);
+    let g = new Word64(0, 0),
+        h = new Word64(0, 0);
+    const t1 = new Word64(0, 0),
+          t2 = new Word64(0, 0);
+    const tmp1 = new Word64(0, 0),
+          tmp2 = new Word64(0, 0);
+    let tmp3;
+
+    for (i = 0; i < paddedLength;) {
+      for (j = 0; j < 16; ++j) {
+        w[j].high = padded[i] << 24 | padded[i + 1] << 16 | padded[i + 2] << 8 | padded[i + 3];
+        w[j].low = padded[i + 4] << 24 | padded[i + 5] << 16 | padded[i + 6] << 8 | padded[i + 7];
+        i += 8;
+      }
+
+      for (j = 16; j < 80; ++j) {
+        tmp3 = w[j];
+        littleSigmaPrime(tmp3, w[j - 2], tmp2);
+        tmp3.add(w[j - 7]);
+        littleSigma(tmp1, w[j - 15], tmp2);
+        tmp3.add(tmp1);
+        tmp3.add(w[j - 16]);
+      }
+
+      a.assign(h0);
+      b.assign(h1);
+      c.assign(h2);
+      d.assign(h3);
+      e.assign(h4);
+      f.assign(h5);
+      g.assign(h6);
+      h.assign(h7);
+
+      for (j = 0; j < 80; ++j) {
+        t1.assign(h);
+        sigmaPrime(tmp1, e, tmp2);
+        t1.add(tmp1);
+        ch(tmp1, e, f, g, tmp2);
+        t1.add(tmp1);
+        t1.add(k[j]);
+        t1.add(w[j]);
+        sigma(t2, a, tmp2);
+        maj(tmp1, a, b, c, tmp2);
+        t2.add(tmp1);
+        tmp3 = h;
+        h = g;
+        g = f;
+        f = e;
+        d.add(t1);
+        e = d;
+        d = c;
+        c = b;
+        b = a;
+        tmp3.assign(t1);
+        tmp3.add(t2);
+        a = tmp3;
+      }
+
+      h0.add(a);
+      h1.add(b);
+      h2.add(c);
+      h3.add(d);
+      h4.add(e);
+      h5.add(f);
+      h6.add(g);
+      h7.add(h);
+    }
+
+    let result;
+
+    if (!mode384) {
+      result = new Uint8Array(64);
+      h0.copyTo(result, 0);
+      h1.copyTo(result, 8);
+      h2.copyTo(result, 16);
+      h3.copyTo(result, 24);
+      h4.copyTo(result, 32);
+      h5.copyTo(result, 40);
+      h6.copyTo(result, 48);
+      h7.copyTo(result, 56);
+    } else {
+      result = new Uint8Array(48);
+      h0.copyTo(result, 0);
+      h1.copyTo(result, 8);
+      h2.copyTo(result, 16);
+      h3.copyTo(result, 24);
+      h4.copyTo(result, 32);
+      h5.copyTo(result, 40);
+    }
+
+    return result;
+  }
+
+  return hash;
+}();
+
+exports.calculateSHA512 = calculateSHA512;
+
+function calculateSHA384(data, offset, length) {
+  return calculateSHA512(data, offset, length, true);
+}
+
+class NullCipher {
+  decryptBlock(data) {
+    return data;
+  }
+
+  encrypt(data) {
+    return data;
+  }
+
+}
+
+class AESBaseCipher {
+  constructor() {
+    if (this.constructor === AESBaseCipher) {
+      (0, _util.unreachable)("Cannot initialize AESBaseCipher.");
+    }
+
+    this._s = new Uint8Array([0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16]);
+    this._inv_s = new Uint8Array([0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e, 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84, 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73, 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4, 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61, 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d]);
+    this._mix = new Uint32Array([0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927, 0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45, 0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb, 0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381, 0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf, 0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66, 0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28, 0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012, 0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec, 0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e, 0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd, 0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7, 0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89, 0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b, 0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815, 0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f, 0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa, 0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8, 0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36, 0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c, 0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742, 0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea, 0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4, 0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e, 0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360, 0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502, 0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87, 0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd, 0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3, 0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621, 0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f, 0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55, 0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26, 0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844, 0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba, 0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480, 0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce, 0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67, 0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929, 0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713, 0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed, 0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f, 0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
+    this._mixCol = new Uint8Array(256);
+
+    for (let i = 0; i < 256; i++) {
+      if (i < 128) {
+        this._mixCol[i] = i << 1;
+      } else {
+        this._mixCol[i] = i << 1 ^ 0x1b;
+      }
+    }
+
+    this.buffer = new Uint8Array(16);
+    this.bufferPosition = 0;
+  }
+
+  _expandKey(cipherKey) {
+    (0, _util.unreachable)("Cannot call `_expandKey` on the base class");
+  }
+
+  _decrypt(input, key) {
+    let t, u, v;
+    const state = new Uint8Array(16);
+    state.set(input);
+
+    for (let j = 0, k = this._keySize; j < 16; ++j, ++k) {
+      state[j] ^= key[k];
+    }
+
+    for (let i = this._cyclesOfRepetition - 1; i >= 1; --i) {
+      t = state[13];
+      state[13] = state[9];
+      state[9] = state[5];
+      state[5] = state[1];
+      state[1] = t;
+      t = state[14];
+      u = state[10];
+      state[14] = state[6];
+      state[10] = state[2];
+      state[6] = t;
+      state[2] = u;
+      t = state[15];
+      u = state[11];
+      v = state[7];
+      state[15] = state[3];
+      state[11] = t;
+      state[7] = u;
+      state[3] = v;
+
+      for (let j = 0; j < 16; ++j) {
+        state[j] = this._inv_s[state[j]];
+      }
+
+      for (let j = 0, k = i * 16; j < 16; ++j, ++k) {
+        state[j] ^= key[k];
+      }
+
+      for (let j = 0; j < 16; j += 4) {
+        const s0 = this._mix[state[j]];
+        const s1 = this._mix[state[j + 1]];
+        const s2 = this._mix[state[j + 2]];
+        const s3 = this._mix[state[j + 3]];
+        t = s0 ^ s1 >>> 8 ^ s1 << 24 ^ s2 >>> 16 ^ s2 << 16 ^ s3 >>> 24 ^ s3 << 8;
+        state[j] = t >>> 24 & 0xff;
+        state[j + 1] = t >> 16 & 0xff;
+        state[j + 2] = t >> 8 & 0xff;
+        state[j + 3] = t & 0xff;
+      }
+    }
+
+    t = state[13];
+    state[13] = state[9];
+    state[9] = state[5];
+    state[5] = state[1];
+    state[1] = t;
+    t = state[14];
+    u = state[10];
+    state[14] = state[6];
+    state[10] = state[2];
+    state[6] = t;
+    state[2] = u;
+    t = state[15];
+    u = state[11];
+    v = state[7];
+    state[15] = state[3];
+    state[11] = t;
+    state[7] = u;
+    state[3] = v;
+
+    for (let j = 0; j < 16; ++j) {
+      state[j] = this._inv_s[state[j]];
+      state[j] ^= key[j];
+    }
+
+    return state;
+  }
+
+  _encrypt(input, key) {
+    const s = this._s;
+    let t, u, v;
+    const state = new Uint8Array(16);
+    state.set(input);
+
+    for (let j = 0; j < 16; ++j) {
+      state[j] ^= key[j];
+    }
+
+    for (let i = 1; i < this._cyclesOfRepetition; i++) {
+      for (let j = 0; j < 16; ++j) {
+        state[j] = s[state[j]];
+      }
+
+      v = state[1];
+      state[1] = state[5];
+      state[5] = state[9];
+      state[9] = state[13];
+      state[13] = v;
+      v = state[2];
+      u = state[6];
+      state[2] = state[10];
+      state[6] = state[14];
+      state[10] = v;
+      state[14] = u;
+      v = state[3];
+      u = state[7];
+      t = state[11];
+      state[3] = state[15];
+      state[7] = v;
+      state[11] = u;
+      state[15] = t;
+
+      for (let j = 0; j < 16; j += 4) {
+        const s0 = state[j + 0];
+        const s1 = state[j + 1];
+        const s2 = state[j + 2];
+        const s3 = state[j + 3];
+        t = s0 ^ s1 ^ s2 ^ s3;
+        state[j + 0] ^= t ^ this._mixCol[s0 ^ s1];
+        state[j + 1] ^= t ^ this._mixCol[s1 ^ s2];
+        state[j + 2] ^= t ^ this._mixCol[s2 ^ s3];
+        state[j + 3] ^= t ^ this._mixCol[s3 ^ s0];
+      }
+
+      for (let j = 0, k = i * 16; j < 16; ++j, ++k) {
+        state[j] ^= key[k];
+      }
+    }
+
+    for (let j = 0; j < 16; ++j) {
+      state[j] = s[state[j]];
+    }
+
+    v = state[1];
+    state[1] = state[5];
+    state[5] = state[9];
+    state[9] = state[13];
+    state[13] = v;
+    v = state[2];
+    u = state[6];
+    state[2] = state[10];
+    state[6] = state[14];
+    state[10] = v;
+    state[14] = u;
+    v = state[3];
+    u = state[7];
+    t = state[11];
+    state[3] = state[15];
+    state[7] = v;
+    state[11] = u;
+    state[15] = t;
+
+    for (let j = 0, k = this._keySize; j < 16; ++j, ++k) {
+      state[j] ^= key[k];
+    }
+
+    return state;
+  }
+
+  _decryptBlock2(data, finalize) {
+    const sourceLength = data.length;
+    let buffer = this.buffer,
+        bufferLength = this.bufferPosition;
+    const result = [];
+    let iv = this.iv;
+
+    for (let i = 0; i < sourceLength; ++i) {
+      buffer[bufferLength] = data[i];
+      ++bufferLength;
+
+      if (bufferLength < 16) {
+        continue;
+      }
+
+      const plain = this._decrypt(buffer, this._key);
+
+      for (let j = 0; j < 16; ++j) {
+        plain[j] ^= iv[j];
+      }
+
+      iv = buffer;
+      result.push(plain);
+      buffer = new Uint8Array(16);
+      bufferLength = 0;
+    }
+
+    this.buffer = buffer;
+    this.bufferLength = bufferLength;
+    this.iv = iv;
+
+    if (result.length === 0) {
+      return new Uint8Array(0);
+    }
+
+    let outputLength = 16 * result.length;
+
+    if (finalize) {
+      const lastBlock = result.at(-1);
+      let psLen = lastBlock[15];
+
+      if (psLen <= 16) {
+        for (let i = 15, ii = 16 - psLen; i >= ii; --i) {
+          if (lastBlock[i] !== psLen) {
+            psLen = 0;
+            break;
+          }
+        }
+
+        outputLength -= psLen;
+        result[result.length - 1] = lastBlock.subarray(0, 16 - psLen);
+      }
+    }
+
+    const output = new Uint8Array(outputLength);
+
+    for (let i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16) {
+      output.set(result[i], j);
+    }
+
+    return output;
+  }
+
+  decryptBlock(data, finalize, iv = null) {
+    const sourceLength = data.length;
+    const buffer = this.buffer;
+    let bufferLength = this.bufferPosition;
+
+    if (iv) {
+      this.iv = iv;
+    } else {
+      for (let i = 0; bufferLength < 16 && i < sourceLength; ++i, ++bufferLength) {
+        buffer[bufferLength] = data[i];
+      }
+
+      if (bufferLength < 16) {
+        this.bufferLength = bufferLength;
+        return new Uint8Array(0);
+      }
+
+      this.iv = buffer;
+      data = data.subarray(16);
+    }
+
+    this.buffer = new Uint8Array(16);
+    this.bufferLength = 0;
+    this.decryptBlock = this._decryptBlock2;
+    return this.decryptBlock(data, finalize);
+  }
+
+  encrypt(data, iv) {
+    const sourceLength = data.length;
+    let buffer = this.buffer,
+        bufferLength = this.bufferPosition;
+    const result = [];
+
+    if (!iv) {
+      iv = new Uint8Array(16);
+    }
+
+    for (let i = 0; i < sourceLength; ++i) {
+      buffer[bufferLength] = data[i];
+      ++bufferLength;
+
+      if (bufferLength < 16) {
+        continue;
+      }
+
+      for (let j = 0; j < 16; ++j) {
+        buffer[j] ^= iv[j];
+      }
+
+      const cipher = this._encrypt(buffer, this._key);
+
+      iv = cipher;
+      result.push(cipher);
+      buffer = new Uint8Array(16);
+      bufferLength = 0;
+    }
+
+    this.buffer = buffer;
+    this.bufferLength = bufferLength;
+    this.iv = iv;
+
+    if (result.length === 0) {
+      return new Uint8Array(0);
+    }
+
+    const outputLength = 16 * result.length;
+    const output = new Uint8Array(outputLength);
+
+    for (let i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16) {
+      output.set(result[i], j);
+    }
+
+    return output;
+  }
+
+}
+
+class AES128Cipher extends AESBaseCipher {
+  constructor(key) {
+    super();
+    this._cyclesOfRepetition = 10;
+    this._keySize = 160;
+    this._rcon = new Uint8Array([0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d]);
+    this._key = this._expandKey(key);
+  }
+
+  _expandKey(cipherKey) {
+    const b = 176;
+    const s = this._s;
+    const rcon = this._rcon;
+    const result = new Uint8Array(b);
+    result.set(cipherKey);
+
+    for (let j = 16, i = 1; j < b; ++i) {
+      let t1 = result[j - 3];
+      let t2 = result[j - 2];
+      let t3 = result[j - 1];
+      let t4 = result[j - 4];
+      t1 = s[t1];
+      t2 = s[t2];
+      t3 = s[t3];
+      t4 = s[t4];
+      t1 ^= rcon[i];
+
+      for (let n = 0; n < 4; ++n) {
+        result[j] = t1 ^= result[j - 16];
+        j++;
+        result[j] = t2 ^= result[j - 16];
+        j++;
+        result[j] = t3 ^= result[j - 16];
+        j++;
+        result[j] = t4 ^= result[j - 16];
+        j++;
+      }
+    }
+
+    return result;
+  }
+
+}
+
+exports.AES128Cipher = AES128Cipher;
+
+class AES256Cipher extends AESBaseCipher {
+  constructor(key) {
+    super();
+    this._cyclesOfRepetition = 14;
+    this._keySize = 224;
+    this._key = this._expandKey(key);
+  }
+
+  _expandKey(cipherKey) {
+    const b = 240;
+    const s = this._s;
+    const result = new Uint8Array(b);
+    result.set(cipherKey);
+    let r = 1;
+    let t1, t2, t3, t4;
+
+    for (let j = 32, i = 1; j < b; ++i) {
+      if (j % 32 === 16) {
+        t1 = s[t1];
+        t2 = s[t2];
+        t3 = s[t3];
+        t4 = s[t4];
+      } else if (j % 32 === 0) {
+        t1 = result[j - 3];
+        t2 = result[j - 2];
+        t3 = result[j - 1];
+        t4 = result[j - 4];
+        t1 = s[t1];
+        t2 = s[t2];
+        t3 = s[t3];
+        t4 = s[t4];
+        t1 ^= r;
+
+        if ((r <<= 1) >= 256) {
+          r = (r ^ 0x1b) & 0xff;
+        }
+      }
+
+      for (let n = 0; n < 4; ++n) {
+        result[j] = t1 ^= result[j - 32];
+        j++;
+        result[j] = t2 ^= result[j - 32];
+        j++;
+        result[j] = t3 ^= result[j - 32];
+        j++;
+        result[j] = t4 ^= result[j - 32];
+        j++;
+      }
+    }
+
+    return result;
+  }
+
+}
+
+exports.AES256Cipher = AES256Cipher;
+
+class PDF17 {
+  checkOwnerPassword(password, ownerValidationSalt, userBytes, ownerPassword) {
+    const hashData = new Uint8Array(password.length + 56);
+    hashData.set(password, 0);
+    hashData.set(ownerValidationSalt, password.length);
+    hashData.set(userBytes, password.length + ownerValidationSalt.length);
+    const result = calculateSHA256(hashData, 0, hashData.length);
+    return (0, _util.isArrayEqual)(result, ownerPassword);
+  }
+
+  checkUserPassword(password, userValidationSalt, userPassword) {
+    const hashData = new Uint8Array(password.length + 8);
+    hashData.set(password, 0);
+    hashData.set(userValidationSalt, password.length);
+    const result = calculateSHA256(hashData, 0, hashData.length);
+    return (0, _util.isArrayEqual)(result, userPassword);
+  }
+
+  getOwnerKey(password, ownerKeySalt, userBytes, ownerEncryption) {
+    const hashData = new Uint8Array(password.length + 56);
+    hashData.set(password, 0);
+    hashData.set(ownerKeySalt, password.length);
+    hashData.set(userBytes, password.length + ownerKeySalt.length);
+    const key = calculateSHA256(hashData, 0, hashData.length);
+    const cipher = new AES256Cipher(key);
+    return cipher.decryptBlock(ownerEncryption, false, new Uint8Array(16));
+  }
+
+  getUserKey(password, userKeySalt, userEncryption) {
+    const hashData = new Uint8Array(password.length + 8);
+    hashData.set(password, 0);
+    hashData.set(userKeySalt, password.length);
+    const key = calculateSHA256(hashData, 0, hashData.length);
+    const cipher = new AES256Cipher(key);
+    return cipher.decryptBlock(userEncryption, false, new Uint8Array(16));
+  }
+
+}
+
+exports.PDF17 = PDF17;
+
+const PDF20 = function PDF20Closure() {
+  function calculatePDF20Hash(password, input, userBytes) {
+    let k = calculateSHA256(input, 0, input.length).subarray(0, 32);
+    let e = [0];
+    let i = 0;
+
+    while (i < 64 || e.at(-1) > i - 32) {
+      const combinedLength = password.length + k.length + userBytes.length,
+            combinedArray = new Uint8Array(combinedLength);
+      let writeOffset = 0;
+      combinedArray.set(password, writeOffset);
+      writeOffset += password.length;
+      combinedArray.set(k, writeOffset);
+      writeOffset += k.length;
+      combinedArray.set(userBytes, writeOffset);
+      const k1 = new Uint8Array(combinedLength * 64);
+
+      for (let j = 0, pos = 0; j < 64; j++, pos += combinedLength) {
+        k1.set(combinedArray, pos);
+      }
+
+      const cipher = new AES128Cipher(k.subarray(0, 16));
+      e = cipher.encrypt(k1, k.subarray(16, 32));
+      let remainder = 0;
+
+      for (let z = 0; z < 16; z++) {
+        remainder *= 256 % 3;
+        remainder %= 3;
+        remainder += (e[z] >>> 0) % 3;
+        remainder %= 3;
+      }
+
+      if (remainder === 0) {
+        k = calculateSHA256(e, 0, e.length);
+      } else if (remainder === 1) {
+        k = calculateSHA384(e, 0, e.length);
+      } else if (remainder === 2) {
+        k = calculateSHA512(e, 0, e.length);
+      }
+
+      i++;
+    }
+
+    return k.subarray(0, 32);
+  }
+
+  class PDF20 {
+    hash(password, concatBytes, userBytes) {
+      return calculatePDF20Hash(password, concatBytes, userBytes);
+    }
+
+    checkOwnerPassword(password, ownerValidationSalt, userBytes, ownerPassword) {
+      const hashData = new Uint8Array(password.length + 56);
+      hashData.set(password, 0);
+      hashData.set(ownerValidationSalt, password.length);
+      hashData.set(userBytes, password.length + ownerValidationSalt.length);
+      const result = calculatePDF20Hash(password, hashData, userBytes);
+      return (0, _util.isArrayEqual)(result, ownerPassword);
+    }
+
+    checkUserPassword(password, userValidationSalt, userPassword) {
+      const hashData = new Uint8Array(password.length + 8);
+      hashData.set(password, 0);
+      hashData.set(userValidationSalt, password.length);
+      const result = calculatePDF20Hash(password, hashData, []);
+      return (0, _util.isArrayEqual)(result, userPassword);
+    }
+
+    getOwnerKey(password, ownerKeySalt, userBytes, ownerEncryption) {
+      const hashData = new Uint8Array(password.length + 56);
+      hashData.set(password, 0);
+      hashData.set(ownerKeySalt, password.length);
+      hashData.set(userBytes, password.length + ownerKeySalt.length);
+      const key = calculatePDF20Hash(password, hashData, userBytes);
+      const cipher = new AES256Cipher(key);
+      return cipher.decryptBlock(ownerEncryption, false, new Uint8Array(16));
+    }
+
+    getUserKey(password, userKeySalt, userEncryption) {
+      const hashData = new Uint8Array(password.length + 8);
+      hashData.set(password, 0);
+      hashData.set(userKeySalt, password.length);
+      const key = calculatePDF20Hash(password, hashData, []);
+      const cipher = new AES256Cipher(key);
+      return cipher.decryptBlock(userEncryption, false, new Uint8Array(16));
+    }
+
+  }
+
+  return PDF20;
+}();
+
+exports.PDF20 = PDF20;
+
+class CipherTransform {
+  constructor(stringCipherConstructor, streamCipherConstructor) {
+    this.StringCipherConstructor = stringCipherConstructor;
+    this.StreamCipherConstructor = streamCipherConstructor;
+  }
+
+  createStream(stream, length) {
+    const cipher = new this.StreamCipherConstructor();
+    return new _decrypt_stream.DecryptStream(stream, length, function cipherTransformDecryptStream(data, finalize) {
+      return cipher.decryptBlock(data, finalize);
+    });
+  }
+
+  decryptString(s) {
+    const cipher = new this.StringCipherConstructor();
+    let data = (0, _util.stringToBytes)(s);
+    data = cipher.decryptBlock(data, true);
+    return (0, _util.bytesToString)(data);
+  }
+
+  encryptString(s) {
+    const cipher = new this.StringCipherConstructor();
+
+    if (cipher instanceof AESBaseCipher) {
+      const strLen = s.length;
+      const pad = 16 - strLen % 16;
+      s += String.fromCharCode(pad).repeat(pad);
+      const iv = new Uint8Array(16);
+
+      if (typeof crypto !== "undefined") {
+        crypto.getRandomValues(iv);
+      } else {
+        for (let i = 0; i < 16; i++) {
+          iv[i] = Math.floor(256 * Math.random());
+        }
+      }
+
+      let data = (0, _util.stringToBytes)(s);
+      data = cipher.encrypt(data, iv);
+      const buf = new Uint8Array(16 + data.length);
+      buf.set(iv);
+      buf.set(data, 16);
+      return (0, _util.bytesToString)(buf);
+    }
+
+    let data = (0, _util.stringToBytes)(s);
+    data = cipher.encrypt(data);
+    return (0, _util.bytesToString)(data);
+  }
+
+}
+
+const CipherTransformFactory = function CipherTransformFactoryClosure() {
+  const defaultPasswordBytes = new Uint8Array([0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, 0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08, 0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68, 0x3e, 0x80, 0x2f, 0x0c, 0xa9, 0xfe, 0x64, 0x53, 0x69, 0x7a]);
+
+  function createEncryptionKey20(revision, password, ownerPassword, ownerValidationSalt, ownerKeySalt, uBytes, userPassword, userValidationSalt, userKeySalt, ownerEncryption, userEncryption, perms) {
+    if (password) {
+      const passwordLength = Math.min(127, password.length);
+      password = password.subarray(0, passwordLength);
+    } else {
+      password = [];
+    }
+
+    let pdfAlgorithm;
+
+    if (revision === 6) {
+      pdfAlgorithm = new PDF20();
+    } else {
+      pdfAlgorithm = new PDF17();
+    }
+
+    if (pdfAlgorithm.checkUserPassword(password, userValidationSalt, userPassword)) {
+      return pdfAlgorithm.getUserKey(password, userKeySalt, userEncryption);
+    } else if (password.length && pdfAlgorithm.checkOwnerPassword(password, ownerValidationSalt, uBytes, ownerPassword)) {
+      return pdfAlgorithm.getOwnerKey(password, ownerKeySalt, uBytes, ownerEncryption);
+    }
+
+    return null;
+  }
+
+  function prepareKeyData(fileId, password, ownerPassword, userPassword, flags, revision, keyLength, encryptMetadata) {
+    const hashDataSize = 40 + ownerPassword.length + fileId.length;
+    const hashData = new Uint8Array(hashDataSize);
+    let i = 0,
+        j,
+        n;
+
+    if (password) {
+      n = Math.min(32, password.length);
+
+      for (; i < n; ++i) {
+        hashData[i] = password[i];
+      }
+    }
+
+    j = 0;
+
+    while (i < 32) {
+      hashData[i++] = defaultPasswordBytes[j++];
+    }
+
+    for (j = 0, n = ownerPassword.length; j < n; ++j) {
+      hashData[i++] = ownerPassword[j];
+    }
+
+    hashData[i++] = flags & 0xff;
+    hashData[i++] = flags >> 8 & 0xff;
+    hashData[i++] = flags >> 16 & 0xff;
+    hashData[i++] = flags >>> 24 & 0xff;
+
+    for (j = 0, n = fileId.length; j < n; ++j) {
+      hashData[i++] = fileId[j];
+    }
+
+    if (revision >= 4 && !encryptMetadata) {
+      hashData[i++] = 0xff;
+      hashData[i++] = 0xff;
+      hashData[i++] = 0xff;
+      hashData[i++] = 0xff;
+    }
+
+    let hash = calculateMD5(hashData, 0, i);
+    const keyLengthInBytes = keyLength >> 3;
+
+    if (revision >= 3) {
+      for (j = 0; j < 50; ++j) {
+        hash = calculateMD5(hash, 0, keyLengthInBytes);
+      }
+    }
+
+    const encryptionKey = hash.subarray(0, keyLengthInBytes);
+    let cipher, checkData;
+
+    if (revision >= 3) {
+      for (i = 0; i < 32; ++i) {
+        hashData[i] = defaultPasswordBytes[i];
+      }
+
+      for (j = 0, n = fileId.length; j < n; ++j) {
+        hashData[i++] = fileId[j];
+      }
+
+      cipher = new ARCFourCipher(encryptionKey);
+      checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
+      n = encryptionKey.length;
+      const derivedKey = new Uint8Array(n);
+
+      for (j = 1; j <= 19; ++j) {
+        for (let k = 0; k < n; ++k) {
+          derivedKey[k] = encryptionKey[k] ^ j;
+        }
+
+        cipher = new ARCFourCipher(derivedKey);
+        checkData = cipher.encryptBlock(checkData);
+      }
+
+      for (j = 0, n = checkData.length; j < n; ++j) {
+        if (userPassword[j] !== checkData[j]) {
+          return null;
+        }
+      }
+    } else {
+      cipher = new ARCFourCipher(encryptionKey);
+      checkData = cipher.encryptBlock(defaultPasswordBytes);
+
+      for (j = 0, n = checkData.length; j < n; ++j) {
+        if (userPassword[j] !== checkData[j]) {
+          return null;
+        }
+      }
+    }
+
+    return encryptionKey;
+  }
+
+  function decodeUserPassword(password, ownerPassword, revision, keyLength) {
+    const hashData = new Uint8Array(32);
+    let i = 0;
+    const n = Math.min(32, password.length);
+
+    for (; i < n; ++i) {
+      hashData[i] = password[i];
+    }
+
+    let j = 0;
+
+    while (i < 32) {
+      hashData[i++] = defaultPasswordBytes[j++];
+    }
+
+    let hash = calculateMD5(hashData, 0, i);
+    const keyLengthInBytes = keyLength >> 3;
+
+    if (revision >= 3) {
+      for (j = 0; j < 50; ++j) {
+        hash = calculateMD5(hash, 0, hash.length);
+      }
+    }
+
+    let cipher, userPassword;
+
+    if (revision >= 3) {
+      userPassword = ownerPassword;
+      const derivedKey = new Uint8Array(keyLengthInBytes);
+
+      for (j = 19; j >= 0; j--) {
+        for (let k = 0; k < keyLengthInBytes; ++k) {
+          derivedKey[k] = hash[k] ^ j;
+        }
+
+        cipher = new ARCFourCipher(derivedKey);
+        userPassword = cipher.encryptBlock(userPassword);
+      }
+    } else {
+      cipher = new ARCFourCipher(hash.subarray(0, keyLengthInBytes));
+      userPassword = cipher.encryptBlock(ownerPassword);
+    }
+
+    return userPassword;
+  }
+
+  const identityName = _primitives.Name.get("Identity");
+
+  function buildObjectKey(num, gen, encryptionKey, isAes = false) {
+    const key = new Uint8Array(encryptionKey.length + 9);
+    const n = encryptionKey.length;
+    let i;
+
+    for (i = 0; i < n; ++i) {
+      key[i] = encryptionKey[i];
+    }
+
+    key[i++] = num & 0xff;
+    key[i++] = num >> 8 & 0xff;
+    key[i++] = num >> 16 & 0xff;
+    key[i++] = gen & 0xff;
+    key[i++] = gen >> 8 & 0xff;
+
+    if (isAes) {
+      key[i++] = 0x73;
+      key[i++] = 0x41;
+      key[i++] = 0x6c;
+      key[i++] = 0x54;
+    }
+
+    const hash = calculateMD5(key, 0, i);
+    return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
+  }
+
+  function buildCipherConstructor(cf, name, num, gen, key) {
+    if (!(name instanceof _primitives.Name)) {
+      throw new _util.FormatError("Invalid crypt filter name.");
+    }
+
+    const cryptFilter = cf.get(name.name);
+    let cfm;
+
+    if (cryptFilter !== null && cryptFilter !== undefined) {
+      cfm = cryptFilter.get("CFM");
+    }
+
+    if (!cfm || cfm.name === "None") {
+      return function cipherTransformFactoryBuildCipherConstructorNone() {
+        return new NullCipher();
+      };
+    }
+
+    if (cfm.name === "V2") {
+      return function cipherTransformFactoryBuildCipherConstructorV2() {
+        return new ARCFourCipher(buildObjectKey(num, gen, key, false));
+      };
+    }
+
+    if (cfm.name === "AESV2") {
+      return function cipherTransformFactoryBuildCipherConstructorAESV2() {
+        return new AES128Cipher(buildObjectKey(num, gen, key, true));
+      };
+    }
+
+    if (cfm.name === "AESV3") {
+      return function cipherTransformFactoryBuildCipherConstructorAESV3() {
+        return new AES256Cipher(key);
+      };
+    }
+
+    throw new _util.FormatError("Unknown crypto method");
+  }
+
+  class CipherTransformFactory {
+    constructor(dict, fileId, password) {
+      const filter = dict.get("Filter");
+
+      if (!(0, _primitives.isName)(filter, "Standard")) {
+        throw new _util.FormatError("unknown encryption method");
+      }
+
+      this.filterName = filter.name;
+      this.dict = dict;
+      const algorithm = dict.get("V");
+
+      if (!Number.isInteger(algorithm) || algorithm !== 1 && algorithm !== 2 && algorithm !== 4 && algorithm !== 5) {
+        throw new _util.FormatError("unsupported encryption algorithm");
+      }
+
+      this.algorithm = algorithm;
+      let keyLength = dict.get("Length");
+
+      if (!keyLength) {
+        if (algorithm <= 3) {
+          keyLength = 40;
+        } else {
+          const cfDict = dict.get("CF");
+          const streamCryptoName = dict.get("StmF");
+
+          if (cfDict instanceof _primitives.Dict && streamCryptoName instanceof _primitives.Name) {
+            cfDict.suppressEncryption = true;
+            const handlerDict = cfDict.get(streamCryptoName.name);
+            keyLength = handlerDict && handlerDict.get("Length") || 128;
+
+            if (keyLength < 40) {
+              keyLength <<= 3;
+            }
+          }
+        }
+      }
+
+      if (!Number.isInteger(keyLength) || keyLength < 40 || keyLength % 8 !== 0) {
+        throw new _util.FormatError("invalid key length");
+      }
+
+      const ownerPassword = (0, _util.stringToBytes)(dict.get("O")).subarray(0, 32);
+      const userPassword = (0, _util.stringToBytes)(dict.get("U")).subarray(0, 32);
+      const flags = dict.get("P");
+      const revision = dict.get("R");
+      const encryptMetadata = (algorithm === 4 || algorithm === 5) && dict.get("EncryptMetadata") !== false;
+      this.encryptMetadata = encryptMetadata;
+      const fileIdBytes = (0, _util.stringToBytes)(fileId);
+      let passwordBytes;
+
+      if (password) {
+        if (revision === 6) {
+          try {
+            password = (0, _util.utf8StringToString)(password);
+          } catch (ex) {
+            (0, _util.warn)("CipherTransformFactory: " + "Unable to convert UTF8 encoded password.");
+          }
+        }
+
+        passwordBytes = (0, _util.stringToBytes)(password);
+      }
+
+      let encryptionKey;
+
+      if (algorithm !== 5) {
+        encryptionKey = prepareKeyData(fileIdBytes, passwordBytes, ownerPassword, userPassword, flags, revision, keyLength, encryptMetadata);
+      } else {
+        const ownerValidationSalt = (0, _util.stringToBytes)(dict.get("O")).subarray(32, 40);
+        const ownerKeySalt = (0, _util.stringToBytes)(dict.get("O")).subarray(40, 48);
+        const uBytes = (0, _util.stringToBytes)(dict.get("U")).subarray(0, 48);
+        const userValidationSalt = (0, _util.stringToBytes)(dict.get("U")).subarray(32, 40);
+        const userKeySalt = (0, _util.stringToBytes)(dict.get("U")).subarray(40, 48);
+        const ownerEncryption = (0, _util.stringToBytes)(dict.get("OE"));
+        const userEncryption = (0, _util.stringToBytes)(dict.get("UE"));
+        const perms = (0, _util.stringToBytes)(dict.get("Perms"));
+        encryptionKey = createEncryptionKey20(revision, passwordBytes, ownerPassword, ownerValidationSalt, ownerKeySalt, uBytes, userPassword, userValidationSalt, userKeySalt, ownerEncryption, userEncryption, perms);
+      }
+
+      if (!encryptionKey && !password) {
+        throw new _util.PasswordException("No password given", _util.PasswordResponses.NEED_PASSWORD);
+      } else if (!encryptionKey && password) {
+        const decodedPassword = decodeUserPassword(passwordBytes, ownerPassword, revision, keyLength);
+        encryptionKey = prepareKeyData(fileIdBytes, decodedPassword, ownerPassword, userPassword, flags, revision, keyLength, encryptMetadata);
+      }
+
+      if (!encryptionKey) {
+        throw new _util.PasswordException("Incorrect Password", _util.PasswordResponses.INCORRECT_PASSWORD);
+      }
+
+      this.encryptionKey = encryptionKey;
+
+      if (algorithm >= 4) {
+        const cf = dict.get("CF");
+
+        if (cf instanceof _primitives.Dict) {
+          cf.suppressEncryption = true;
+        }
+
+        this.cf = cf;
+        this.stmf = dict.get("StmF") || identityName;
+        this.strf = dict.get("StrF") || identityName;
+        this.eff = dict.get("EFF") || this.stmf;
+      }
+    }
+
+    createCipherTransform(num, gen) {
+      if (this.algorithm === 4 || this.algorithm === 5) {
+        return new CipherTransform(buildCipherConstructor(this.cf, this.strf, num, gen, this.encryptionKey), buildCipherConstructor(this.cf, this.stmf, num, gen, this.encryptionKey));
+      }
+
+      const key = buildObjectKey(num, gen, this.encryptionKey, false);
+
+      const cipherConstructor = function buildCipherCipherConstructor() {
+        return new ARCFourCipher(key);
+      };
+
+      return new CipherTransform(cipherConstructor, cipherConstructor);
+    }
+
+  }
+
+  return CipherTransformFactory;
+}();
+
+exports.CipherTransformFactory = CipherTransformFactory;
+
+/***/ }),
+/* 68 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.DecryptStream = void 0;
+
+var _decode_stream = __w_pdfjs_require__(19);
+
+const chunkSize = 512;
+
+class DecryptStream extends _decode_stream.DecodeStream {
+  constructor(str, maybeLength, decrypt) {
+    super(maybeLength);
+    this.str = str;
+    this.dict = str.dict;
+    this.decrypt = decrypt;
+    this.nextChunk = null;
+    this.initialized = false;
+  }
+
+  readBlock() {
+    let chunk;
+
+    if (this.initialized) {
+      chunk = this.nextChunk;
+    } else {
+      chunk = this.str.getBytes(chunkSize);
+      this.initialized = true;
+    }
+
+    if (!chunk || chunk.length === 0) {
+      this.eof = true;
+      return;
+    }
+
+    this.nextChunk = this.str.getBytes(chunkSize);
+    const hasMoreData = this.nextChunk && this.nextChunk.length > 0;
+    const decrypt = this.decrypt;
+    chunk = decrypt(chunk, !hasMoreData);
+    let bufferLength = this.bufferLength;
+    const n = chunk.length,
+          buffer = this.ensureBuffer(bufferLength + n);
+
+    for (let i = 0; i < n; i++) {
+      buffer[bufferLength++] = chunk[i];
+    }
+
+    this.bufferLength = bufferLength;
+  }
+
+}
+
+exports.DecryptStream = DecryptStream;
+
+/***/ }),
+/* 69 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Catalog = void 0;
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _util = __w_pdfjs_require__(2);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _name_number_tree = __w_pdfjs_require__(70);
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _cleanup_helper = __w_pdfjs_require__(71);
+
+var _colorspace = __w_pdfjs_require__(14);
+
+var _file_spec = __w_pdfjs_require__(72);
+
+var _image_utils = __w_pdfjs_require__(59);
+
+var _metadata_parser = __w_pdfjs_require__(73);
+
+var _struct_tree = __w_pdfjs_require__(74);
+
+function fetchDestination(dest) {
+  if (dest instanceof _primitives.Dict) {
+    dest = dest.get("D");
+  }
+
+  return Array.isArray(dest) ? dest : null;
+}
+
+class Catalog {
+  constructor(pdfManager, xref) {
+    this.pdfManager = pdfManager;
+    this.xref = xref;
+    this._catDict = xref.getCatalogObj();
+
+    if (!(this._catDict instanceof _primitives.Dict)) {
+      throw new _util.FormatError("Catalog object is not a dictionary.");
+    }
+
+    this.toplevelPagesDict;
+    this._actualNumPages = null;
+    this.fontCache = new _primitives.RefSetCache();
+    this.builtInCMapCache = new Map();
+    this.standardFontDataCache = new Map();
+    this.globalImageCache = new _image_utils.GlobalImageCache();
+    this.pageKidsCountCache = new _primitives.RefSetCache();
+    this.pageIndexCache = new _primitives.RefSetCache();
+    this.nonBlendModesSet = new _primitives.RefSet();
+  }
+
+  get version() {
+    const version = this._catDict.get("Version");
+
+    return (0, _util.shadow)(this, "version", version instanceof _primitives.Name ? version.name : null);
+  }
+
+  get lang() {
+    const lang = this._catDict.get("Lang");
+
+    return (0, _util.shadow)(this, "lang", typeof lang === "string" ? (0, _util.stringToPDFString)(lang) : null);
+  }
+
+  get needsRendering() {
+    const needsRendering = this._catDict.get("NeedsRendering");
+
+    return (0, _util.shadow)(this, "needsRendering", typeof needsRendering === "boolean" ? needsRendering : false);
+  }
+
+  get collection() {
+    let collection = null;
+
+    try {
+      const obj = this._catDict.get("Collection");
+
+      if (obj instanceof _primitives.Dict && obj.size > 0) {
+        collection = obj;
+      }
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.info)("Cannot fetch Collection entry; assuming no collection is present.");
+    }
+
+    return (0, _util.shadow)(this, "collection", collection);
+  }
+
+  get acroForm() {
+    let acroForm = null;
+
+    try {
+      const obj = this._catDict.get("AcroForm");
+
+      if (obj instanceof _primitives.Dict && obj.size > 0) {
+        acroForm = obj;
+      }
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.info)("Cannot fetch AcroForm entry; assuming no forms are present.");
+    }
+
+    return (0, _util.shadow)(this, "acroForm", acroForm);
+  }
+
+  get acroFormRef() {
+    const value = this._catDict.getRaw("AcroForm");
+
+    return (0, _util.shadow)(this, "acroFormRef", value instanceof _primitives.Ref ? value : null);
+  }
+
+  get metadata() {
+    const streamRef = this._catDict.getRaw("Metadata");
+
+    if (!(streamRef instanceof _primitives.Ref)) {
+      return (0, _util.shadow)(this, "metadata", null);
+    }
+
+    let metadata = null;
+
+    try {
+      const suppressEncryption = !(this.xref.encrypt && this.xref.encrypt.encryptMetadata);
+      const stream = this.xref.fetch(streamRef, suppressEncryption);
+
+      if (stream instanceof _base_stream.BaseStream && stream.dict instanceof _primitives.Dict) {
+        const type = stream.dict.get("Type");
+        const subtype = stream.dict.get("Subtype");
+
+        if ((0, _primitives.isName)(type, "Metadata") && (0, _primitives.isName)(subtype, "XML")) {
+          const data = (0, _util.stringToUTF8String)(stream.getString());
+
+          if (data) {
+            metadata = new _metadata_parser.MetadataParser(data).serializable;
+          }
+        }
+      }
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.info)(`Skipping invalid Metadata: "${ex}".`);
+    }
+
+    return (0, _util.shadow)(this, "metadata", metadata);
+  }
+
+  get markInfo() {
+    let markInfo = null;
+
+    try {
+      markInfo = this._readMarkInfo();
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)("Unable to read mark info.");
+    }
+
+    return (0, _util.shadow)(this, "markInfo", markInfo);
+  }
+
+  _readMarkInfo() {
+    const obj = this._catDict.get("MarkInfo");
+
+    if (!(obj instanceof _primitives.Dict)) {
+      return null;
+    }
+
+    const markInfo = {
+      Marked: false,
+      UserProperties: false,
+      Suspects: false
+    };
+
+    for (const key in markInfo) {
+      const value = obj.get(key);
+
+      if (typeof value === "boolean") {
+        markInfo[key] = value;
+      }
+    }
+
+    return markInfo;
+  }
+
+  get structTreeRoot() {
+    let structTree = null;
+
+    try {
+      structTree = this._readStructTreeRoot();
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)("Unable read to structTreeRoot info.");
+    }
+
+    return (0, _util.shadow)(this, "structTreeRoot", structTree);
+  }
+
+  _readStructTreeRoot() {
+    const obj = this._catDict.get("StructTreeRoot");
+
+    if (!(obj instanceof _primitives.Dict)) {
+      return null;
+    }
+
+    const root = new _struct_tree.StructTreeRoot(obj);
+    root.init();
+    return root;
+  }
+
+  get toplevelPagesDict() {
+    const pagesObj = this._catDict.get("Pages");
+
+    if (!(pagesObj instanceof _primitives.Dict)) {
+      throw new _util.FormatError("Invalid top-level pages dictionary.");
+    }
+
+    return (0, _util.shadow)(this, "toplevelPagesDict", pagesObj);
+  }
+
+  get documentOutline() {
+    let obj = null;
+
+    try {
+      obj = this._readDocumentOutline();
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)("Unable to read document outline.");
+    }
+
+    return (0, _util.shadow)(this, "documentOutline", obj);
+  }
+
+  _readDocumentOutline() {
+    let obj = this._catDict.get("Outlines");
+
+    if (!(obj instanceof _primitives.Dict)) {
+      return null;
+    }
+
+    obj = obj.getRaw("First");
+
+    if (!(obj instanceof _primitives.Ref)) {
+      return null;
+    }
+
+    const root = {
+      items: []
+    };
+    const queue = [{
+      obj,
+      parent: root
+    }];
+    const processed = new _primitives.RefSet();
+    processed.put(obj);
+    const xref = this.xref,
+          blackColor = new Uint8ClampedArray(3);
+
+    while (queue.length > 0) {
+      const i = queue.shift();
+      const outlineDict = xref.fetchIfRef(i.obj);
+
+      if (outlineDict === null) {
+        continue;
+      }
+
+      if (!outlineDict.has("Title")) {
+        throw new _util.FormatError("Invalid outline item encountered.");
+      }
+
+      const data = {
+        url: null,
+        dest: null
+      };
+      Catalog.parseDestDictionary({
+        destDict: outlineDict,
+        resultObj: data,
+        docBaseUrl: this.pdfManager.docBaseUrl
+      });
+      const title = outlineDict.get("Title");
+      const flags = outlineDict.get("F") || 0;
+      const color = outlineDict.getArray("C");
+      const count = outlineDict.get("Count");
+      let rgbColor = blackColor;
+
+      if (Array.isArray(color) && color.length === 3 && (color[0] !== 0 || color[1] !== 0 || color[2] !== 0)) {
+        rgbColor = _colorspace.ColorSpace.singletons.rgb.getRgb(color, 0);
+      }
+
+      const outlineItem = {
+        dest: data.dest,
+        url: data.url,
+        unsafeUrl: data.unsafeUrl,
+        newWindow: data.newWindow,
+        title: (0, _util.stringToPDFString)(title),
+        color: rgbColor,
+        count: Number.isInteger(count) ? count : undefined,
+        bold: !!(flags & 2),
+        italic: !!(flags & 1),
+        items: []
+      };
+      i.parent.items.push(outlineItem);
+      obj = outlineDict.getRaw("First");
+
+      if (obj instanceof _primitives.Ref && !processed.has(obj)) {
+        queue.push({
+          obj,
+          parent: outlineItem
+        });
+        processed.put(obj);
+      }
+
+      obj = outlineDict.getRaw("Next");
+
+      if (obj instanceof _primitives.Ref && !processed.has(obj)) {
+        queue.push({
+          obj,
+          parent: i.parent
+        });
+        processed.put(obj);
+      }
+    }
+
+    return root.items.length > 0 ? root.items : null;
+  }
+
+  get permissions() {
+    let permissions = null;
+
+    try {
+      permissions = this._readPermissions();
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)("Unable to read permissions.");
+    }
+
+    return (0, _util.shadow)(this, "permissions", permissions);
+  }
+
+  _readPermissions() {
+    const encrypt = this.xref.trailer.get("Encrypt");
+
+    if (!(encrypt instanceof _primitives.Dict)) {
+      return null;
+    }
+
+    let flags = encrypt.get("P");
+
+    if (typeof flags !== "number") {
+      return null;
+    }
+
+    flags += 2 ** 32;
+    const permissions = [];
+
+    for (const key in _util.PermissionFlag) {
+      const value = _util.PermissionFlag[key];
+
+      if (flags & value) {
+        permissions.push(value);
+      }
+    }
+
+    return permissions;
+  }
+
+  get optionalContentConfig() {
+    let config = null;
+
+    try {
+      const properties = this._catDict.get("OCProperties");
+
+      if (!properties) {
+        return (0, _util.shadow)(this, "optionalContentConfig", null);
+      }
+
+      const defaultConfig = properties.get("D");
+
+      if (!defaultConfig) {
+        return (0, _util.shadow)(this, "optionalContentConfig", null);
+      }
+
+      const groupsData = properties.get("OCGs");
+
+      if (!Array.isArray(groupsData)) {
+        return (0, _util.shadow)(this, "optionalContentConfig", null);
+      }
+
+      const groups = [];
+      const groupRefs = [];
+
+      for (const groupRef of groupsData) {
+        if (!(groupRef instanceof _primitives.Ref)) {
+          continue;
+        }
+
+        groupRefs.push(groupRef);
+        const group = this.xref.fetchIfRef(groupRef);
+        groups.push({
+          id: groupRef.toString(),
+          name: typeof group.get("Name") === "string" ? (0, _util.stringToPDFString)(group.get("Name")) : null,
+          intent: typeof group.get("Intent") === "string" ? (0, _util.stringToPDFString)(group.get("Intent")) : null
+        });
+      }
+
+      config = this._readOptionalContentConfig(defaultConfig, groupRefs);
+      config.groups = groups;
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)(`Unable to read optional content config: ${ex}`);
+    }
+
+    return (0, _util.shadow)(this, "optionalContentConfig", config);
+  }
+
+  _readOptionalContentConfig(config, contentGroupRefs) {
+    function parseOnOff(refs) {
+      const onParsed = [];
+
+      if (Array.isArray(refs)) {
+        for (const value of refs) {
+          if (!(value instanceof _primitives.Ref)) {
+            continue;
+          }
+
+          if (contentGroupRefs.includes(value)) {
+            onParsed.push(value.toString());
+          }
+        }
+      }
+
+      return onParsed;
+    }
+
+    function parseOrder(refs, nestedLevels = 0) {
+      if (!Array.isArray(refs)) {
+        return null;
+      }
+
+      const order = [];
+
+      for (const value of refs) {
+        if (value instanceof _primitives.Ref && contentGroupRefs.includes(value)) {
+          parsedOrderRefs.put(value);
+          order.push(value.toString());
+          continue;
+        }
+
+        const nestedOrder = parseNestedOrder(value, nestedLevels);
+
+        if (nestedOrder) {
+          order.push(nestedOrder);
+        }
+      }
+
+      if (nestedLevels > 0) {
+        return order;
+      }
+
+      const hiddenGroups = [];
+
+      for (const groupRef of contentGroupRefs) {
+        if (parsedOrderRefs.has(groupRef)) {
+          continue;
+        }
+
+        hiddenGroups.push(groupRef.toString());
+      }
+
+      if (hiddenGroups.length) {
+        order.push({
+          name: null,
+          order: hiddenGroups
+        });
+      }
+
+      return order;
+    }
+
+    function parseNestedOrder(ref, nestedLevels) {
+      if (++nestedLevels > MAX_NESTED_LEVELS) {
+        (0, _util.warn)("parseNestedOrder - reached MAX_NESTED_LEVELS.");
+        return null;
+      }
+
+      const value = xref.fetchIfRef(ref);
+
+      if (!Array.isArray(value)) {
+        return null;
+      }
+
+      const nestedName = xref.fetchIfRef(value[0]);
+
+      if (typeof nestedName !== "string") {
+        return null;
+      }
+
+      const nestedOrder = parseOrder(value.slice(1), nestedLevels);
+
+      if (!nestedOrder || !nestedOrder.length) {
+        return null;
+      }
+
+      return {
+        name: (0, _util.stringToPDFString)(nestedName),
+        order: nestedOrder
+      };
+    }
+
+    const xref = this.xref,
+          parsedOrderRefs = new _primitives.RefSet(),
+          MAX_NESTED_LEVELS = 10;
+    return {
+      name: typeof config.get("Name") === "string" ? (0, _util.stringToPDFString)(config.get("Name")) : null,
+      creator: typeof config.get("Creator") === "string" ? (0, _util.stringToPDFString)(config.get("Creator")) : null,
+      baseState: config.get("BaseState") instanceof _primitives.Name ? config.get("BaseState").name : null,
+      on: parseOnOff(config.get("ON")),
+      off: parseOnOff(config.get("OFF")),
+      order: parseOrder(config.get("Order")),
+      groups: null
+    };
+  }
+
+  setActualNumPages(num = null) {
+    this._actualNumPages = num;
+  }
+
+  get hasActualNumPages() {
+    return this._actualNumPages !== null;
+  }
+
+  get _pagesCount() {
+    const obj = this.toplevelPagesDict.get("Count");
+
+    if (!Number.isInteger(obj)) {
+      throw new _util.FormatError("Page count in top-level pages dictionary is not an integer.");
+    }
+
+    return (0, _util.shadow)(this, "_pagesCount", obj);
+  }
+
+  get numPages() {
+    return this.hasActualNumPages ? this._actualNumPages : this._pagesCount;
+  }
+
+  get destinations() {
+    const obj = this._readDests(),
+          dests = Object.create(null);
+
+    if (obj instanceof _name_number_tree.NameTree) {
+      for (const [key, value] of obj.getAll()) {
+        const dest = fetchDestination(value);
+
+        if (dest) {
+          dests[(0, _util.stringToPDFString)(key)] = dest;
+        }
+      }
+    } else if (obj instanceof _primitives.Dict) {
+      obj.forEach(function (key, value) {
+        const dest = fetchDestination(value);
+
+        if (dest) {
+          dests[key] = dest;
+        }
+      });
+    }
+
+    return (0, _util.shadow)(this, "destinations", dests);
+  }
+
+  getDestination(id) {
+    const obj = this._readDests();
+
+    if (obj instanceof _name_number_tree.NameTree) {
+      const dest = fetchDestination(obj.get(id));
+
+      if (dest) {
+        return dest;
+      }
+
+      const allDest = this.destinations[id];
+
+      if (allDest) {
+        (0, _util.warn)(`Found "${id}" at an incorrect position in the NameTree.`);
+        return allDest;
+      }
+    } else if (obj instanceof _primitives.Dict) {
+      const dest = fetchDestination(obj.get(id));
+
+      if (dest) {
+        return dest;
+      }
+    }
+
+    return null;
+  }
+
+  _readDests() {
+    const obj = this._catDict.get("Names");
+
+    if (obj && obj.has("Dests")) {
+      return new _name_number_tree.NameTree(obj.getRaw("Dests"), this.xref);
+    } else if (this._catDict.has("Dests")) {
+      return this._catDict.get("Dests");
+    }
+
+    return undefined;
+  }
+
+  get pageLabels() {
+    let obj = null;
+
+    try {
+      obj = this._readPageLabels();
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)("Unable to read page labels.");
+    }
+
+    return (0, _util.shadow)(this, "pageLabels", obj);
+  }
+
+  _readPageLabels() {
+    const obj = this._catDict.getRaw("PageLabels");
+
+    if (!obj) {
+      return null;
+    }
+
+    const pageLabels = new Array(this.numPages);
+    let style = null,
+        prefix = "";
+    const numberTree = new _name_number_tree.NumberTree(obj, this.xref);
+    const nums = numberTree.getAll();
+    let currentLabel = "",
+        currentIndex = 1;
+
+    for (let i = 0, ii = this.numPages; i < ii; i++) {
+      const labelDict = nums.get(i);
+
+      if (labelDict !== undefined) {
+        if (!(labelDict instanceof _primitives.Dict)) {
+          throw new _util.FormatError("PageLabel is not a dictionary.");
+        }
+
+        if (labelDict.has("Type") && !(0, _primitives.isName)(labelDict.get("Type"), "PageLabel")) {
+          throw new _util.FormatError("Invalid type in PageLabel dictionary.");
+        }
+
+        if (labelDict.has("S")) {
+          const s = labelDict.get("S");
+
+          if (!(s instanceof _primitives.Name)) {
+            throw new _util.FormatError("Invalid style in PageLabel dictionary.");
+          }
+
+          style = s.name;
+        } else {
+          style = null;
+        }
+
+        if (labelDict.has("P")) {
+          const p = labelDict.get("P");
+
+          if (typeof p !== "string") {
+            throw new _util.FormatError("Invalid prefix in PageLabel dictionary.");
+          }
+
+          prefix = (0, _util.stringToPDFString)(p);
+        } else {
+          prefix = "";
+        }
+
+        if (labelDict.has("St")) {
+          const st = labelDict.get("St");
+
+          if (!(Number.isInteger(st) && st >= 1)) {
+            throw new _util.FormatError("Invalid start in PageLabel dictionary.");
+          }
+
+          currentIndex = st;
+        } else {
+          currentIndex = 1;
+        }
+      }
+
+      switch (style) {
+        case "D":
+          currentLabel = currentIndex;
+          break;
+
+        case "R":
+        case "r":
+          currentLabel = (0, _core_utils.toRomanNumerals)(currentIndex, style === "r");
+          break;
+
+        case "A":
+        case "a":
+          const LIMIT = 26;
+          const A_UPPER_CASE = 0x41,
+                A_LOWER_CASE = 0x61;
+          const baseCharCode = style === "a" ? A_LOWER_CASE : A_UPPER_CASE;
+          const letterIndex = currentIndex - 1;
+          const character = String.fromCharCode(baseCharCode + letterIndex % LIMIT);
+          currentLabel = character.repeat(Math.floor(letterIndex / LIMIT) + 1);
+          break;
+
+        default:
+          if (style) {
+            throw new _util.FormatError(`Invalid style "${style}" in PageLabel dictionary.`);
+          }
+
+          currentLabel = "";
+      }
+
+      pageLabels[i] = prefix + currentLabel;
+      currentIndex++;
+    }
+
+    return pageLabels;
+  }
+
+  get pageLayout() {
+    const obj = this._catDict.get("PageLayout");
+
+    let pageLayout = "";
+
+    if (obj instanceof _primitives.Name) {
+      switch (obj.name) {
+        case "SinglePage":
+        case "OneColumn":
+        case "TwoColumnLeft":
+        case "TwoColumnRight":
+        case "TwoPageLeft":
+        case "TwoPageRight":
+          pageLayout = obj.name;
+      }
+    }
+
+    return (0, _util.shadow)(this, "pageLayout", pageLayout);
+  }
+
+  get pageMode() {
+    const obj = this._catDict.get("PageMode");
+
+    let pageMode = "UseNone";
+
+    if (obj instanceof _primitives.Name) {
+      switch (obj.name) {
+        case "UseNone":
+        case "UseOutlines":
+        case "UseThumbs":
+        case "FullScreen":
+        case "UseOC":
+        case "UseAttachments":
+          pageMode = obj.name;
+      }
+    }
+
+    return (0, _util.shadow)(this, "pageMode", pageMode);
+  }
+
+  get viewerPreferences() {
+    const obj = this._catDict.get("ViewerPreferences");
+
+    if (!(obj instanceof _primitives.Dict)) {
+      return (0, _util.shadow)(this, "viewerPreferences", null);
+    }
+
+    let prefs = null;
+
+    for (const key of obj.getKeys()) {
+      const value = obj.get(key);
+      let prefValue;
+
+      switch (key) {
+        case "HideToolbar":
+        case "HideMenubar":
+        case "HideWindowUI":
+        case "FitWindow":
+        case "CenterWindow":
+        case "DisplayDocTitle":
+        case "PickTrayByPDFSize":
+          if (typeof value === "boolean") {
+            prefValue = value;
+          }
+
+          break;
+
+        case "NonFullScreenPageMode":
+          if (value instanceof _primitives.Name) {
+            switch (value.name) {
+              case "UseNone":
+              case "UseOutlines":
+              case "UseThumbs":
+              case "UseOC":
+                prefValue = value.name;
+                break;
+
+              default:
+                prefValue = "UseNone";
+            }
+          }
+
+          break;
+
+        case "Direction":
+          if (value instanceof _primitives.Name) {
+            switch (value.name) {
+              case "L2R":
+              case "R2L":
+                prefValue = value.name;
+                break;
+
+              default:
+                prefValue = "L2R";
+            }
+          }
+
+          break;
+
+        case "ViewArea":
+        case "ViewClip":
+        case "PrintArea":
+        case "PrintClip":
+          if (value instanceof _primitives.Name) {
+            switch (value.name) {
+              case "MediaBox":
+              case "CropBox":
+              case "BleedBox":
+              case "TrimBox":
+              case "ArtBox":
+                prefValue = value.name;
+                break;
+
+              default:
+                prefValue = "CropBox";
+            }
+          }
+
+          break;
+
+        case "PrintScaling":
+          if (value instanceof _primitives.Name) {
+            switch (value.name) {
+              case "None":
+              case "AppDefault":
+                prefValue = value.name;
+                break;
+
+              default:
+                prefValue = "AppDefault";
+            }
+          }
+
+          break;
+
+        case "Duplex":
+          if (value instanceof _primitives.Name) {
+            switch (value.name) {
+              case "Simplex":
+              case "DuplexFlipShortEdge":
+              case "DuplexFlipLongEdge":
+                prefValue = value.name;
+                break;
+
+              default:
+                prefValue = "None";
+            }
+          }
+
+          break;
+
+        case "PrintPageRange":
+          if (Array.isArray(value) && value.length % 2 === 0) {
+            const isValid = value.every((page, i, arr) => {
+              return Number.isInteger(page) && page > 0 && (i === 0 || page >= arr[i - 1]) && page <= this.numPages;
+            });
+
+            if (isValid) {
+              prefValue = value;
+            }
+          }
+
+          break;
+
+        case "NumCopies":
+          if (Number.isInteger(value) && value > 0) {
+            prefValue = value;
+          }
+
+          break;
+
+        default:
+          (0, _util.warn)(`Ignoring non-standard key in ViewerPreferences: ${key}.`);
+          continue;
+      }
+
+      if (prefValue === undefined) {
+        (0, _util.warn)(`Bad value, for key "${key}", in ViewerPreferences: ${value}.`);
+        continue;
+      }
+
+      if (!prefs) {
+        prefs = Object.create(null);
+      }
+
+      prefs[key] = prefValue;
+    }
+
+    return (0, _util.shadow)(this, "viewerPreferences", prefs);
+  }
+
+  get openAction() {
+    const obj = this._catDict.get("OpenAction");
+
+    const openAction = Object.create(null);
+
+    if (obj instanceof _primitives.Dict) {
+      const destDict = new _primitives.Dict(this.xref);
+      destDict.set("A", obj);
+      const resultObj = {
+        url: null,
+        dest: null,
+        action: null
+      };
+      Catalog.parseDestDictionary({
+        destDict,
+        resultObj
+      });
+
+      if (Array.isArray(resultObj.dest)) {
+        openAction.dest = resultObj.dest;
+      } else if (resultObj.action) {
+        openAction.action = resultObj.action;
+      }
+    } else if (Array.isArray(obj)) {
+      openAction.dest = obj;
+    }
+
+    return (0, _util.shadow)(this, "openAction", (0, _util.objectSize)(openAction) > 0 ? openAction : null);
+  }
+
+  get attachments() {
+    const obj = this._catDict.get("Names");
+
+    let attachments = null;
+
+    if (obj instanceof _primitives.Dict && obj.has("EmbeddedFiles")) {
+      const nameTree = new _name_number_tree.NameTree(obj.getRaw("EmbeddedFiles"), this.xref);
+
+      for (const [key, value] of nameTree.getAll()) {
+        const fs = new _file_spec.FileSpec(value, this.xref);
+
+        if (!attachments) {
+          attachments = Object.create(null);
+        }
+
+        attachments[(0, _util.stringToPDFString)(key)] = fs.serializable;
+      }
+    }
+
+    return (0, _util.shadow)(this, "attachments", attachments);
+  }
+
+  get xfaImages() {
+    const obj = this._catDict.get("Names");
+
+    let xfaImages = null;
+
+    if (obj instanceof _primitives.Dict && obj.has("XFAImages")) {
+      const nameTree = new _name_number_tree.NameTree(obj.getRaw("XFAImages"), this.xref);
+
+      for (const [key, value] of nameTree.getAll()) {
+        if (!xfaImages) {
+          xfaImages = new _primitives.Dict(this.xref);
+        }
+
+        xfaImages.set((0, _util.stringToPDFString)(key), value);
+      }
+    }
+
+    return (0, _util.shadow)(this, "xfaImages", xfaImages);
+  }
+
+  _collectJavaScript() {
+    const obj = this._catDict.get("Names");
+
+    let javaScript = null;
+
+    function appendIfJavaScriptDict(name, jsDict) {
+      if (!(jsDict instanceof _primitives.Dict)) {
+        return;
+      }
+
+      if (!(0, _primitives.isName)(jsDict.get("S"), "JavaScript")) {
+        return;
+      }
+
+      let js = jsDict.get("JS");
+
+      if (js instanceof _base_stream.BaseStream) {
+        js = js.getString();
+      } else if (typeof js !== "string") {
+        return;
+      }
+
+      if (javaScript === null) {
+        javaScript = new Map();
+      }
+
+      js = (0, _util.stringToPDFString)(js).replace(/\u0000/g, "");
+      javaScript.set(name, js);
+    }
+
+    if (obj instanceof _primitives.Dict && obj.has("JavaScript")) {
+      const nameTree = new _name_number_tree.NameTree(obj.getRaw("JavaScript"), this.xref);
+
+      for (const [key, value] of nameTree.getAll()) {
+        appendIfJavaScriptDict((0, _util.stringToPDFString)(key), value);
+      }
+    }
+
+    const openAction = this._catDict.get("OpenAction");
+
+    if (openAction) {
+      appendIfJavaScriptDict("OpenAction", openAction);
+    }
+
+    return javaScript;
+  }
+
+  get javaScript() {
+    const javaScript = this._collectJavaScript();
+
+    return (0, _util.shadow)(this, "javaScript", javaScript ? [...javaScript.values()] : null);
+  }
+
+  get jsActions() {
+    const javaScript = this._collectJavaScript();
+
+    let actions = (0, _core_utils.collectActions)(this.xref, this._catDict, _util.DocumentActionEventType);
+
+    if (javaScript) {
+      if (!actions) {
+        actions = Object.create(null);
+      }
+
+      for (const [key, val] of javaScript) {
+        if (key in actions) {
+          actions[key].push(val);
+        } else {
+          actions[key] = [val];
+        }
+      }
+    }
+
+    return (0, _util.shadow)(this, "jsActions", actions);
+  }
+
+  async fontFallback(id, handler) {
+    const translatedFonts = await Promise.all(this.fontCache);
+
+    for (const translatedFont of translatedFonts) {
+      if (translatedFont.loadedName === id) {
+        translatedFont.fallback(handler);
+        return;
+      }
+    }
+  }
+
+  async cleanup(manuallyTriggered = false) {
+    (0, _cleanup_helper.clearGlobalCaches)();
+    this.globalImageCache.clear(manuallyTriggered);
+    this.pageKidsCountCache.clear();
+    this.pageIndexCache.clear();
+    this.nonBlendModesSet.clear();
+    const translatedFonts = await Promise.all(this.fontCache);
+
+    for (const {
+      dict
+    } of translatedFonts) {
+      delete dict.cacheKey;
+    }
+
+    this.fontCache.clear();
+    this.builtInCMapCache.clear();
+    this.standardFontDataCache.clear();
+  }
+
+  async getPageDict(pageIndex) {
+    const nodesToVisit = [this.toplevelPagesDict];
+    const visitedNodes = new _primitives.RefSet();
+
+    const pagesRef = this._catDict.getRaw("Pages");
+
+    if (pagesRef instanceof _primitives.Ref) {
+      visitedNodes.put(pagesRef);
+    }
+
+    const xref = this.xref,
+          pageKidsCountCache = this.pageKidsCountCache,
+          pageIndexCache = this.pageIndexCache;
+    let currentPageIndex = 0;
+
+    while (nodesToVisit.length) {
+      const currentNode = nodesToVisit.pop();
+
+      if (currentNode instanceof _primitives.Ref) {
+        const count = pageKidsCountCache.get(currentNode);
+
+        if (count >= 0 && currentPageIndex + count <= pageIndex) {
+          currentPageIndex += count;
+          continue;
+        }
+
+        if (visitedNodes.has(currentNode)) {
+          throw new _util.FormatError("Pages tree contains circular reference.");
+        }
+
+        visitedNodes.put(currentNode);
+        const obj = await xref.fetchAsync(currentNode);
+
+        if (obj instanceof _primitives.Dict) {
+          let type = obj.getRaw("Type");
+
+          if (type instanceof _primitives.Ref) {
+            type = await xref.fetchAsync(type);
+          }
+
+          if ((0, _primitives.isName)(type, "Page") || !obj.has("Kids")) {
+            if (!pageKidsCountCache.has(currentNode)) {
+              pageKidsCountCache.put(currentNode, 1);
+            }
+
+            if (!pageIndexCache.has(currentNode)) {
+              pageIndexCache.put(currentNode, currentPageIndex);
+            }
+
+            if (currentPageIndex === pageIndex) {
+              return [obj, currentNode];
+            }
+
+            currentPageIndex++;
+            continue;
+          }
+        }
+
+        nodesToVisit.push(obj);
+        continue;
+      }
+
+      if (!(currentNode instanceof _primitives.Dict)) {
+        throw new _util.FormatError("Page dictionary kid reference points to wrong type of object.");
+      }
+
+      const {
+        objId
+      } = currentNode;
+      let count = currentNode.getRaw("Count");
+
+      if (count instanceof _primitives.Ref) {
+        count = await xref.fetchAsync(count);
+      }
+
+      if (Number.isInteger(count) && count >= 0) {
+        if (objId && !pageKidsCountCache.has(objId)) {
+          pageKidsCountCache.put(objId, count);
+        }
+
+        if (currentPageIndex + count <= pageIndex) {
+          currentPageIndex += count;
+          continue;
+        }
+      }
+
+      let kids = currentNode.getRaw("Kids");
+
+      if (kids instanceof _primitives.Ref) {
+        kids = await xref.fetchAsync(kids);
+      }
+
+      if (!Array.isArray(kids)) {
+        let type = currentNode.getRaw("Type");
+
+        if (type instanceof _primitives.Ref) {
+          type = await xref.fetchAsync(type);
+        }
+
+        if ((0, _primitives.isName)(type, "Page") || !currentNode.has("Kids")) {
+          if (currentPageIndex === pageIndex) {
+            return [currentNode, null];
+          }
+
+          currentPageIndex++;
+          continue;
+        }
+
+        throw new _util.FormatError("Page dictionary kids object is not an array.");
+      }
+
+      for (let last = kids.length - 1; last >= 0; last--) {
+        nodesToVisit.push(kids[last]);
+      }
+    }
+
+    throw new Error(`Page index ${pageIndex} not found.`);
+  }
+
+  async getAllPageDicts(recoveryMode = false) {
+    const queue = [{
+      currentNode: this.toplevelPagesDict,
+      posInKids: 0
+    }];
+    const visitedNodes = new _primitives.RefSet();
+
+    const pagesRef = this._catDict.getRaw("Pages");
+
+    if (pagesRef instanceof _primitives.Ref) {
+      visitedNodes.put(pagesRef);
+    }
+
+    const map = new Map(),
+          xref = this.xref,
+          pageIndexCache = this.pageIndexCache;
+    let pageIndex = 0;
+
+    function addPageDict(pageDict, pageRef) {
+      if (pageRef && !pageIndexCache.has(pageRef)) {
+        pageIndexCache.put(pageRef, pageIndex);
+      }
+
+      map.set(pageIndex++, [pageDict, pageRef]);
+    }
+
+    function addPageError(error) {
+      if (error instanceof _core_utils.XRefEntryException && !recoveryMode) {
+        throw error;
+      }
+
+      map.set(pageIndex++, [error, null]);
+    }
+
+    while (queue.length > 0) {
+      const queueItem = queue.at(-1);
+      const {
+        currentNode,
+        posInKids
+      } = queueItem;
+      let kids = currentNode.getRaw("Kids");
+
+      if (kids instanceof _primitives.Ref) {
+        try {
+          kids = await xref.fetchAsync(kids);
+        } catch (ex) {
+          addPageError(ex);
+          break;
+        }
+      }
+
+      if (!Array.isArray(kids)) {
+        addPageError(new _util.FormatError("Page dictionary kids object is not an array."));
+        break;
+      }
+
+      if (posInKids >= kids.length) {
+        queue.pop();
+        continue;
+      }
+
+      const kidObj = kids[posInKids];
+      let obj;
+
+      if (kidObj instanceof _primitives.Ref) {
+        if (visitedNodes.has(kidObj)) {
+          addPageError(new _util.FormatError("Pages tree contains circular reference."));
+          break;
+        }
+
+        visitedNodes.put(kidObj);
+
+        try {
+          obj = await xref.fetchAsync(kidObj);
+        } catch (ex) {
+          addPageError(ex);
+          break;
+        }
+      } else {
+        obj = kidObj;
+      }
+
+      if (!(obj instanceof _primitives.Dict)) {
+        addPageError(new _util.FormatError("Page dictionary kid reference points to wrong type of object."));
+        break;
+      }
+
+      let type = obj.getRaw("Type");
+
+      if (type instanceof _primitives.Ref) {
+        try {
+          type = await xref.fetchAsync(type);
+        } catch (ex) {
+          addPageError(ex);
+          break;
+        }
+      }
+
+      if ((0, _primitives.isName)(type, "Page") || !obj.has("Kids")) {
+        addPageDict(obj, kidObj instanceof _primitives.Ref ? kidObj : null);
+      } else {
+        queue.push({
+          currentNode: obj,
+          posInKids: 0
+        });
+      }
+
+      queueItem.posInKids++;
+    }
+
+    return map;
+  }
+
+  getPageIndex(pageRef) {
+    const cachedPageIndex = this.pageIndexCache.get(pageRef);
+
+    if (cachedPageIndex !== undefined) {
+      return Promise.resolve(cachedPageIndex);
+    }
+
+    const xref = this.xref;
+
+    function pagesBeforeRef(kidRef) {
+      let total = 0,
+          parentRef;
+      return xref.fetchAsync(kidRef).then(function (node) {
+        if ((0, _primitives.isRefsEqual)(kidRef, pageRef) && !(0, _primitives.isDict)(node, "Page") && !(node instanceof _primitives.Dict && !node.has("Type") && node.has("Contents"))) {
+          throw new _util.FormatError("The reference does not point to a /Page dictionary.");
+        }
+
+        if (!node) {
+          return null;
+        }
+
+        if (!(node instanceof _primitives.Dict)) {
+          throw new _util.FormatError("Node must be a dictionary.");
+        }
+
+        parentRef = node.getRaw("Parent");
+        return node.getAsync("Parent");
+      }).then(function (parent) {
+        if (!parent) {
+          return null;
+        }
+
+        if (!(parent instanceof _primitives.Dict)) {
+          throw new _util.FormatError("Parent must be a dictionary.");
+        }
+
+        return parent.getAsync("Kids");
+      }).then(function (kids) {
+        if (!kids) {
+          return null;
+        }
+
+        const kidPromises = [];
+        let found = false;
+
+        for (let i = 0, ii = kids.length; i < ii; i++) {
+          const kid = kids[i];
+
+          if (!(kid instanceof _primitives.Ref)) {
+            throw new _util.FormatError("Kid must be a reference.");
+          }
+
+          if ((0, _primitives.isRefsEqual)(kid, kidRef)) {
+            found = true;
+            break;
+          }
+
+          kidPromises.push(xref.fetchAsync(kid).then(function (obj) {
+            if (!(obj instanceof _primitives.Dict)) {
+              throw new _util.FormatError("Kid node must be a dictionary.");
+            }
+
+            if (obj.has("Count")) {
+              total += obj.get("Count");
+            } else {
+              total++;
+            }
+          }));
+        }
+
+        if (!found) {
+          throw new _util.FormatError("Kid reference not found in parent's kids.");
+        }
+
+        return Promise.all(kidPromises).then(function () {
+          return [total, parentRef];
+        });
+      });
+    }
+
+    let total = 0;
+
+    const next = ref => pagesBeforeRef(ref).then(args => {
+      if (!args) {
+        this.pageIndexCache.put(pageRef, total);
+        return total;
+      }
+
+      const [count, parentRef] = args;
+      total += count;
+      return next(parentRef);
+    });
+
+    return next(pageRef);
+  }
+
+  get baseUrl() {
+    const uri = this._catDict.get("URI");
+
+    if (uri instanceof _primitives.Dict) {
+      const base = uri.get("Base");
+
+      if (typeof base === "string") {
+        const absoluteUrl = (0, _util.createValidAbsoluteUrl)(base, null, {
+          tryConvertEncoding: true
+        });
+
+        if (absoluteUrl) {
+          return (0, _util.shadow)(this, "baseUrl", absoluteUrl.href);
+        }
+      }
+    }
+
+    return (0, _util.shadow)(this, "baseUrl", null);
+  }
+
+  static parseDestDictionary(params) {
+    const destDict = params.destDict;
+
+    if (!(destDict instanceof _primitives.Dict)) {
+      (0, _util.warn)("parseDestDictionary: `destDict` must be a dictionary.");
+      return;
+    }
+
+    const resultObj = params.resultObj;
+
+    if (typeof resultObj !== "object") {
+      (0, _util.warn)("parseDestDictionary: `resultObj` must be an object.");
+      return;
+    }
+
+    const docBaseUrl = params.docBaseUrl || null;
+    let action = destDict.get("A"),
+        url,
+        dest;
+
+    if (!(action instanceof _primitives.Dict)) {
+      if (destDict.has("Dest")) {
+        action = destDict.get("Dest");
+      } else {
+        action = destDict.get("AA");
+
+        if (action instanceof _primitives.Dict) {
+          if (action.has("D")) {
+            action = action.get("D");
+          } else if (action.has("U")) {
+            action = action.get("U");
+          }
+        }
+      }
+    }
+
+    if (action instanceof _primitives.Dict) {
+      const actionType = action.get("S");
+
+      if (!(actionType instanceof _primitives.Name)) {
+        (0, _util.warn)("parseDestDictionary: Invalid type in Action dictionary.");
+        return;
+      }
+
+      const actionName = actionType.name;
+
+      switch (actionName) {
+        case "ResetForm":
+          const flags = action.get("Flags");
+          const include = ((typeof flags === "number" ? flags : 0) & 1) === 0;
+          const fields = [];
+          const refs = [];
+
+          for (const obj of action.get("Fields") || []) {
+            if (obj instanceof _primitives.Ref) {
+              refs.push(obj.toString());
+            } else if (typeof obj === "string") {
+              fields.push((0, _util.stringToPDFString)(obj));
+            }
+          }
+
+          resultObj.resetForm = {
+            fields,
+            refs,
+            include
+          };
+          break;
+
+        case "URI":
+          url = action.get("URI");
+
+          if (url instanceof _primitives.Name) {
+            url = "/" + url.name;
+          }
+
+          break;
+
+        case "GoTo":
+          dest = action.get("D");
+          break;
+
+        case "Launch":
+        case "GoToR":
+          const urlDict = action.get("F");
+
+          if (urlDict instanceof _primitives.Dict) {
+            url = urlDict.get("F") || null;
+          } else if (typeof urlDict === "string") {
+            url = urlDict;
+          }
+
+          let remoteDest = action.get("D");
+
+          if (remoteDest) {
+            if (remoteDest instanceof _primitives.Name) {
+              remoteDest = remoteDest.name;
+            }
+
+            if (typeof url === "string") {
+              const baseUrl = url.split("#")[0];
+
+              if (typeof remoteDest === "string") {
+                url = baseUrl + "#" + remoteDest;
+              } else if (Array.isArray(remoteDest)) {
+                url = baseUrl + "#" + JSON.stringify(remoteDest);
+              }
+            }
+          }
+
+          const newWindow = action.get("NewWindow");
+
+          if (typeof newWindow === "boolean") {
+            resultObj.newWindow = newWindow;
+          }
+
+          break;
+
+        case "Named":
+          const namedAction = action.get("N");
+
+          if (namedAction instanceof _primitives.Name) {
+            resultObj.action = namedAction.name;
+          }
+
+          break;
+
+        case "JavaScript":
+          const jsAction = action.get("JS");
+          let js;
+
+          if (jsAction instanceof _base_stream.BaseStream) {
+            js = jsAction.getString();
+          } else if (typeof jsAction === "string") {
+            js = jsAction;
+          }
+
+          const jsURL = js && (0, _core_utils.recoverJsURL)((0, _util.stringToPDFString)(js));
+
+          if (jsURL) {
+            url = jsURL.url;
+            resultObj.newWindow = jsURL.newWindow;
+            break;
+          }
+
+        default:
+          if (actionName === "JavaScript" || actionName === "SubmitForm") {
+            break;
+          }
+
+          (0, _util.warn)(`parseDestDictionary - unsupported action: "${actionName}".`);
+          break;
+      }
+    } else if (destDict.has("Dest")) {
+      dest = destDict.get("Dest");
+    }
+
+    if (typeof url === "string") {
+      const absoluteUrl = (0, _util.createValidAbsoluteUrl)(url, docBaseUrl, {
+        addDefaultProtocol: true,
+        tryConvertEncoding: true
+      });
+
+      if (absoluteUrl) {
+        resultObj.url = absoluteUrl.href;
+      }
+
+      resultObj.unsafeUrl = url;
+    }
+
+    if (dest) {
+      if (dest instanceof _primitives.Name) {
+        dest = dest.name;
+      }
+
+      if (typeof dest === "string") {
+        resultObj.dest = (0, _util.stringToPDFString)(dest);
+      } else if (Array.isArray(dest)) {
+        resultObj.dest = dest;
+      }
+    }
+  }
+
+}
+
+exports.Catalog = Catalog;
+
+/***/ }),
+/* 70 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.NumberTree = exports.NameTree = void 0;
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _util = __w_pdfjs_require__(2);
+
+class NameOrNumberTree {
+  constructor(root, xref, type) {
+    if (this.constructor === NameOrNumberTree) {
+      (0, _util.unreachable)("Cannot initialize NameOrNumberTree.");
+    }
+
+    this.root = root;
+    this.xref = xref;
+    this._type = type;
+  }
+
+  getAll() {
+    const map = new Map();
+
+    if (!this.root) {
+      return map;
+    }
+
+    const xref = this.xref;
+    const processed = new _primitives.RefSet();
+    processed.put(this.root);
+    const queue = [this.root];
+
+    while (queue.length > 0) {
+      const obj = xref.fetchIfRef(queue.shift());
+
+      if (!(obj instanceof _primitives.Dict)) {
+        continue;
+      }
+
+      if (obj.has("Kids")) {
+        const kids = obj.get("Kids");
+
+        if (!Array.isArray(kids)) {
+          continue;
+        }
+
+        for (const kid of kids) {
+          if (processed.has(kid)) {
+            throw new _util.FormatError(`Duplicate entry in "${this._type}" tree.`);
+          }
+
+          queue.push(kid);
+          processed.put(kid);
+        }
+
+        continue;
+      }
+
+      const entries = obj.get(this._type);
+
+      if (!Array.isArray(entries)) {
+        continue;
+      }
+
+      for (let i = 0, ii = entries.length; i < ii; i += 2) {
+        map.set(xref.fetchIfRef(entries[i]), xref.fetchIfRef(entries[i + 1]));
+      }
+    }
+
+    return map;
+  }
+
+  get(key) {
+    if (!this.root) {
+      return null;
+    }
+
+    const xref = this.xref;
+    let kidsOrEntries = xref.fetchIfRef(this.root);
+    let loopCount = 0;
+    const MAX_LEVELS = 10;
+
+    while (kidsOrEntries.has("Kids")) {
+      if (++loopCount > MAX_LEVELS) {
+        (0, _util.warn)(`Search depth limit reached for "${this._type}" tree.`);
+        return null;
+      }
+
+      const kids = kidsOrEntries.get("Kids");
+
+      if (!Array.isArray(kids)) {
+        return null;
+      }
+
+      let l = 0,
+          r = kids.length - 1;
+
+      while (l <= r) {
+        const m = l + r >> 1;
+        const kid = xref.fetchIfRef(kids[m]);
+        const limits = kid.get("Limits");
+
+        if (key < xref.fetchIfRef(limits[0])) {
+          r = m - 1;
+        } else if (key > xref.fetchIfRef(limits[1])) {
+          l = m + 1;
+        } else {
+          kidsOrEntries = kid;
+          break;
+        }
+      }
+
+      if (l > r) {
+        return null;
+      }
+    }
+
+    const entries = kidsOrEntries.get(this._type);
+
+    if (Array.isArray(entries)) {
+      let l = 0,
+          r = entries.length - 2;
+
+      while (l <= r) {
+        const tmp = l + r >> 1,
+              m = tmp + (tmp & 1);
+        const currentKey = xref.fetchIfRef(entries[m]);
+
+        if (key < currentKey) {
+          r = m - 2;
+        } else if (key > currentKey) {
+          l = m + 2;
+        } else {
+          return xref.fetchIfRef(entries[m + 1]);
+        }
+      }
+    }
+
+    return null;
+  }
+
+}
+
+class NameTree extends NameOrNumberTree {
+  constructor(root, xref) {
+    super(root, xref, "Names");
+  }
+
+}
+
+exports.NameTree = NameTree;
+
+class NumberTree extends NameOrNumberTree {
+  constructor(root, xref) {
+    super(root, xref, "Nums");
+  }
+
+}
+
+exports.NumberTree = NumberTree;
+
+/***/ }),
+/* 71 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.clearGlobalCaches = clearGlobalCaches;
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _unicode = __w_pdfjs_require__(40);
+
+function clearGlobalCaches() {
+  (0, _primitives.clearPrimitiveCaches)();
+  (0, _unicode.clearUnicodeCaches)();
+}
+
+/***/ }),
+/* 72 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.FileSpec = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _primitives = __w_pdfjs_require__(5);
+
+function pickPlatformItem(dict) {
+  if (dict.has("UF")) {
+    return dict.get("UF");
+  } else if (dict.has("F")) {
+    return dict.get("F");
+  } else if (dict.has("Unix")) {
+    return dict.get("Unix");
+  } else if (dict.has("Mac")) {
+    return dict.get("Mac");
+  } else if (dict.has("DOS")) {
+    return dict.get("DOS");
+  }
+
+  return null;
+}
+
+class FileSpec {
+  constructor(root, xref) {
+    if (!(root instanceof _primitives.Dict)) {
+      return;
+    }
+
+    this.xref = xref;
+    this.root = root;
+
+    if (root.has("FS")) {
+      this.fs = root.get("FS");
+    }
+
+    this.description = root.has("Desc") ? (0, _util.stringToPDFString)(root.get("Desc")) : "";
+
+    if (root.has("RF")) {
+      (0, _util.warn)("Related file specifications are not supported");
+    }
+
+    this.contentAvailable = true;
+
+    if (!root.has("EF")) {
+      this.contentAvailable = false;
+      (0, _util.warn)("Non-embedded file specifications are not supported");
+    }
+  }
+
+  get filename() {
+    if (!this._filename && this.root) {
+      const filename = pickPlatformItem(this.root) || "unnamed";
+      this._filename = (0, _util.stringToPDFString)(filename).replace(/\\\\/g, "\\").replace(/\\\//g, "/").replace(/\\/g, "/");
+    }
+
+    return this._filename;
+  }
+
+  get content() {
+    if (!this.contentAvailable) {
+      return null;
+    }
+
+    if (!this.contentRef && this.root) {
+      this.contentRef = pickPlatformItem(this.root.get("EF"));
+    }
+
+    let content = null;
+
+    if (this.contentRef) {
+      const fileObj = this.xref.fetchIfRef(this.contentRef);
+
+      if (fileObj instanceof _base_stream.BaseStream) {
+        content = fileObj.getBytes();
+      } else {
+        (0, _util.warn)("Embedded file specification points to non-existing/invalid content");
+      }
+    } else {
+      (0, _util.warn)("Embedded file specification does not have a content");
+    }
+
+    return content;
+  }
+
+  get serializable() {
+    return {
+      filename: this.filename,
+      content: this.content
+    };
+  }
+
+}
+
+exports.FileSpec = FileSpec;
+
+/***/ }),
+/* 73 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.MetadataParser = void 0;
+
+var _xml_parser = __w_pdfjs_require__(66);
+
+class MetadataParser {
+  constructor(data) {
+    data = this._repair(data);
+    const parser = new _xml_parser.SimpleXMLParser({
+      lowerCaseName: true
+    });
+    const xmlDocument = parser.parseFromString(data);
+    this._metadataMap = new Map();
+    this._data = data;
+
+    if (xmlDocument) {
+      this._parse(xmlDocument);
+    }
+  }
+
+  _repair(data) {
+    return data.replace(/^[^<]+/, "").replace(/>\\376\\377([^<]+)/g, function (all, codes) {
+      const bytes = codes.replace(/\\([0-3])([0-7])([0-7])/g, function (code, d1, d2, d3) {
+        return String.fromCharCode(d1 * 64 + d2 * 8 + d3 * 1);
+      }).replace(/&(amp|apos|gt|lt|quot);/g, function (str, name) {
+        switch (name) {
+          case "amp":
+            return "&";
+
+          case "apos":
+            return "'";
+
+          case "gt":
+            return ">";
+
+          case "lt":
+            return "<";
+
+          case "quot":
+            return '"';
+        }
+
+        throw new Error(`_repair: ${name} isn't defined.`);
+      });
+      const charBuf = [];
+
+      for (let i = 0, ii = bytes.length; i < ii; i += 2) {
+        const code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1);
+
+        if (code >= 32 && code < 127 && code !== 60 && code !== 62 && code !== 38) {
+          charBuf.push(String.fromCharCode(code));
+        } else {
+          charBuf.push("&#x" + (0x10000 + code).toString(16).substring(1) + ";");
+        }
+      }
+
+      return ">" + charBuf.join("");
+    });
+  }
+
+  _getSequence(entry) {
+    const name = entry.nodeName;
+
+    if (name !== "rdf:bag" && name !== "rdf:seq" && name !== "rdf:alt") {
+      return null;
+    }
+
+    return entry.childNodes.filter(node => node.nodeName === "rdf:li");
+  }
+
+  _parseArray(entry) {
+    if (!entry.hasChildNodes()) {
+      return;
+    }
+
+    const [seqNode] = entry.childNodes;
+    const sequence = this._getSequence(seqNode) || [];
+
+    this._metadataMap.set(entry.nodeName, sequence.map(node => node.textContent.trim()));
+  }
+
+  _parse(xmlDocument) {
+    let rdf = xmlDocument.documentElement;
+
+    if (rdf.nodeName !== "rdf:rdf") {
+      rdf = rdf.firstChild;
+
+      while (rdf && rdf.nodeName !== "rdf:rdf") {
+        rdf = rdf.nextSibling;
+      }
+    }
+
+    if (!rdf || rdf.nodeName !== "rdf:rdf" || !rdf.hasChildNodes()) {
+      return;
+    }
+
+    for (const desc of rdf.childNodes) {
+      if (desc.nodeName !== "rdf:description") {
+        continue;
+      }
+
+      for (const entry of desc.childNodes) {
+        const name = entry.nodeName;
+
+        switch (name) {
+          case "#text":
+            continue;
+
+          case "dc:creator":
+          case "dc:subject":
+            this._parseArray(entry);
+
+            continue;
+        }
+
+        this._metadataMap.set(name, entry.textContent.trim());
+      }
+    }
+  }
+
+  get serializable() {
+    return {
+      parsedData: this._metadataMap,
+      rawData: this._data
+    };
+  }
+
+}
+
+exports.MetadataParser = MetadataParser;
+
+/***/ }),
+/* 74 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.StructTreeRoot = exports.StructTreePage = void 0;
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _util = __w_pdfjs_require__(2);
+
+var _name_number_tree = __w_pdfjs_require__(70);
+
+const MAX_DEPTH = 40;
+const StructElementType = {
+  PAGE_CONTENT: "PAGE_CONTENT",
+  STREAM_CONTENT: "STREAM_CONTENT",
+  OBJECT: "OBJECT",
+  ELEMENT: "ELEMENT"
+};
+
+class StructTreeRoot {
+  constructor(rootDict) {
+    this.dict = rootDict;
+    this.roleMap = new Map();
+  }
+
+  init() {
+    this.readRoleMap();
+  }
+
+  readRoleMap() {
+    const roleMapDict = this.dict.get("RoleMap");
+
+    if (!(roleMapDict instanceof _primitives.Dict)) {
+      return;
+    }
+
+    roleMapDict.forEach((key, value) => {
+      if (!(value instanceof _primitives.Name)) {
+        return;
+      }
+
+      this.roleMap.set(key, value.name);
+    });
+  }
+
+}
+
+exports.StructTreeRoot = StructTreeRoot;
+
+class StructElementNode {
+  constructor(tree, dict) {
+    this.tree = tree;
+    this.dict = dict;
+    this.kids = [];
+    this.parseKids();
+  }
+
+  get role() {
+    const nameObj = this.dict.get("S");
+    const name = nameObj instanceof _primitives.Name ? nameObj.name : "";
+    const {
+      root
+    } = this.tree;
+
+    if (root.roleMap.has(name)) {
+      return root.roleMap.get(name);
+    }
+
+    return name;
+  }
+
+  parseKids() {
+    let pageObjId = null;
+    const objRef = this.dict.getRaw("Pg");
+
+    if (objRef instanceof _primitives.Ref) {
+      pageObjId = objRef.toString();
+    }
+
+    const kids = this.dict.get("K");
+
+    if (Array.isArray(kids)) {
+      for (const kid of kids) {
+        const element = this.parseKid(pageObjId, kid);
+
+        if (element) {
+          this.kids.push(element);
+        }
+      }
+    } else {
+      const element = this.parseKid(pageObjId, kids);
+
+      if (element) {
+        this.kids.push(element);
+      }
+    }
+  }
+
+  parseKid(pageObjId, kid) {
+    if (Number.isInteger(kid)) {
+      if (this.tree.pageDict.objId !== pageObjId) {
+        return null;
+      }
+
+      return new StructElement({
+        type: StructElementType.PAGE_CONTENT,
+        mcid: kid,
+        pageObjId
+      });
+    }
+
+    let kidDict = null;
+
+    if (kid instanceof _primitives.Ref) {
+      kidDict = this.dict.xref.fetch(kid);
+    } else if (kid instanceof _primitives.Dict) {
+      kidDict = kid;
+    }
+
+    if (!kidDict) {
+      return null;
+    }
+
+    const pageRef = kidDict.getRaw("Pg");
+
+    if (pageRef instanceof _primitives.Ref) {
+      pageObjId = pageRef.toString();
+    }
+
+    const type = kidDict.get("Type") instanceof _primitives.Name ? kidDict.get("Type").name : null;
+
+    if (type === "MCR") {
+      if (this.tree.pageDict.objId !== pageObjId) {
+        return null;
+      }
+
+      return new StructElement({
+        type: StructElementType.STREAM_CONTENT,
+        refObjId: kidDict.getRaw("Stm") instanceof _primitives.Ref ? kidDict.getRaw("Stm").toString() : null,
+        pageObjId,
+        mcid: kidDict.get("MCID")
+      });
+    }
+
+    if (type === "OBJR") {
+      if (this.tree.pageDict.objId !== pageObjId) {
+        return null;
+      }
+
+      return new StructElement({
+        type: StructElementType.OBJECT,
+        refObjId: kidDict.getRaw("Obj") instanceof _primitives.Ref ? kidDict.getRaw("Obj").toString() : null,
+        pageObjId
+      });
+    }
+
+    return new StructElement({
+      type: StructElementType.ELEMENT,
+      dict: kidDict
+    });
+  }
+
+}
+
+class StructElement {
+  constructor({
+    type,
+    dict = null,
+    mcid = null,
+    pageObjId = null,
+    refObjId = null
+  }) {
+    this.type = type;
+    this.dict = dict;
+    this.mcid = mcid;
+    this.pageObjId = pageObjId;
+    this.refObjId = refObjId;
+    this.parentNode = null;
+  }
+
+}
+
+class StructTreePage {
+  constructor(structTreeRoot, pageDict) {
+    this.root = structTreeRoot;
+    this.rootDict = structTreeRoot ? structTreeRoot.dict : null;
+    this.pageDict = pageDict;
+    this.nodes = [];
+  }
+
+  parse() {
+    if (!this.root || !this.rootDict) {
+      return;
+    }
+
+    const parentTree = this.rootDict.get("ParentTree");
+
+    if (!parentTree) {
+      return;
+    }
+
+    const id = this.pageDict.get("StructParents");
+
+    if (!Number.isInteger(id)) {
+      return;
+    }
+
+    const numberTree = new _name_number_tree.NumberTree(parentTree, this.rootDict.xref);
+    const parentArray = numberTree.get(id);
+
+    if (!Array.isArray(parentArray)) {
+      return;
+    }
+
+    const map = new Map();
+
+    for (const ref of parentArray) {
+      if (ref instanceof _primitives.Ref) {
+        this.addNode(this.rootDict.xref.fetch(ref), map);
+      }
+    }
+  }
+
+  addNode(dict, map, level = 0) {
+    if (level > MAX_DEPTH) {
+      (0, _util.warn)("StructTree MAX_DEPTH reached.");
+      return null;
+    }
+
+    if (map.has(dict)) {
+      return map.get(dict);
+    }
+
+    const element = new StructElementNode(this, dict);
+    map.set(dict, element);
+    const parent = dict.get("P");
+
+    if (!parent || (0, _primitives.isName)(parent.get("Type"), "StructTreeRoot")) {
+      if (!this.addTopLevelNode(dict, element)) {
+        map.delete(dict);
+      }
+
+      return element;
+    }
+
+    const parentNode = this.addNode(parent, map, level + 1);
+
+    if (!parentNode) {
+      return element;
+    }
+
+    let save = false;
+
+    for (const kid of parentNode.kids) {
+      if (kid.type === StructElementType.ELEMENT && kid.dict === dict) {
+        kid.parentNode = element;
+        save = true;
+      }
+    }
+
+    if (!save) {
+      map.delete(dict);
+    }
+
+    return element;
+  }
+
+  addTopLevelNode(dict, element) {
+    const obj = this.rootDict.get("K");
+
+    if (!obj) {
+      return false;
+    }
+
+    if (obj instanceof _primitives.Dict) {
+      if (obj.objId !== dict.objId) {
+        return false;
+      }
+
+      this.nodes[0] = element;
+      return true;
+    }
+
+    if (!Array.isArray(obj)) {
+      return true;
+    }
+
+    let save = false;
+
+    for (let i = 0; i < obj.length; i++) {
+      const kidRef = obj[i];
+
+      if (kidRef && kidRef.toString() === dict.objId) {
+        this.nodes[i] = element;
+        save = true;
+      }
+    }
+
+    return save;
+  }
+
+  get serializable() {
+    function nodeToSerializable(node, parent, level = 0) {
+      if (level > MAX_DEPTH) {
+        (0, _util.warn)("StructTree too deep to be fully serialized.");
+        return;
+      }
+
+      const obj = Object.create(null);
+      obj.role = node.role;
+      obj.children = [];
+      parent.children.push(obj);
+      const alt = node.dict.get("Alt");
+
+      if (typeof alt === "string") {
+        obj.alt = (0, _util.stringToPDFString)(alt);
+      }
+
+      const lang = node.dict.get("Lang");
+
+      if (typeof lang === "string") {
+        obj.lang = (0, _util.stringToPDFString)(lang);
+      }
+
+      for (const kid of node.kids) {
+        const kidElement = kid.type === StructElementType.ELEMENT ? kid.parentNode : null;
+
+        if (kidElement) {
+          nodeToSerializable(kidElement, obj, level + 1);
+          continue;
+        } else if (kid.type === StructElementType.PAGE_CONTENT || kid.type === StructElementType.STREAM_CONTENT) {
+          obj.children.push({
+            type: "content",
+            id: `page${kid.pageObjId}_mcid${kid.mcid}`
+          });
+        } else if (kid.type === StructElementType.OBJECT) {
+          obj.children.push({
+            type: "object",
+            id: kid.refObjId
+          });
+        }
+      }
+    }
+
+    const root = Object.create(null);
+    root.children = [];
+    root.role = "Root";
+
+    for (const child of this.nodes) {
+      if (!child) {
+        continue;
+      }
+
+      nodeToSerializable(child, root);
+    }
+
+    return root;
+  }
+
+}
+
+exports.StructTreePage = StructTreePage;
+
+/***/ }),
+/* 75 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.ObjectLoader = void 0;
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _util = __w_pdfjs_require__(2);
+
+function mayHaveChildren(value) {
+  return value instanceof _primitives.Ref || value instanceof _primitives.Dict || value instanceof _base_stream.BaseStream || Array.isArray(value);
+}
+
+function addChildren(node, nodesToVisit) {
+  if (node instanceof _primitives.Dict) {
+    node = node.getRawValues();
+  } else if (node instanceof _base_stream.BaseStream) {
+    node = node.dict.getRawValues();
+  } else if (!Array.isArray(node)) {
+    return;
+  }
+
+  for (const rawValue of node) {
+    if (mayHaveChildren(rawValue)) {
+      nodesToVisit.push(rawValue);
+    }
+  }
+}
+
+class ObjectLoader {
+  constructor(dict, keys, xref) {
+    this.dict = dict;
+    this.keys = keys;
+    this.xref = xref;
+    this.refSet = null;
+  }
+
+  async load() {
+    if (this.xref.stream.isDataLoaded) {
+      return undefined;
+    }
+
+    const {
+      keys,
+      dict
+    } = this;
+    this.refSet = new _primitives.RefSet();
+    const nodesToVisit = [];
+
+    for (let i = 0, ii = keys.length; i < ii; i++) {
+      const rawValue = dict.getRaw(keys[i]);
+
+      if (rawValue !== undefined) {
+        nodesToVisit.push(rawValue);
+      }
+    }
+
+    return this._walk(nodesToVisit);
+  }
+
+  async _walk(nodesToVisit) {
+    const nodesToRevisit = [];
+    const pendingRequests = [];
+
+    while (nodesToVisit.length) {
+      let currentNode = nodesToVisit.pop();
+
+      if (currentNode instanceof _primitives.Ref) {
+        if (this.refSet.has(currentNode)) {
+          continue;
+        }
+
+        try {
+          this.refSet.put(currentNode);
+          currentNode = this.xref.fetch(currentNode);
+        } catch (ex) {
+          if (!(ex instanceof _core_utils.MissingDataException)) {
+            (0, _util.warn)(`ObjectLoader._walk - requesting all data: "${ex}".`);
+            this.refSet = null;
+            const {
+              manager
+            } = this.xref.stream;
+            return manager.requestAllChunks();
+          }
+
+          nodesToRevisit.push(currentNode);
+          pendingRequests.push({
+            begin: ex.begin,
+            end: ex.end
+          });
+        }
+      }
+
+      if (currentNode instanceof _base_stream.BaseStream) {
+        const baseStreams = currentNode.getBaseStreams();
+
+        if (baseStreams) {
+          let foundMissingData = false;
+
+          for (const stream of baseStreams) {
+            if (stream.isDataLoaded) {
+              continue;
+            }
+
+            foundMissingData = true;
+            pendingRequests.push({
+              begin: stream.start,
+              end: stream.end
+            });
+          }
+
+          if (foundMissingData) {
+            nodesToRevisit.push(currentNode);
+          }
+        }
+      }
+
+      addChildren(currentNode, nodesToVisit);
+    }
+
+    if (pendingRequests.length) {
+      await this.xref.stream.manager.requestRanges(pendingRequests);
+
+      for (const node of nodesToRevisit) {
+        if (node instanceof _primitives.Ref) {
+          this.refSet.remove(node);
+        }
+      }
+
+      return this._walk(nodesToRevisit);
+    }
+
+    this.refSet = null;
+    return undefined;
+  }
+
+}
+
+exports.ObjectLoader = ObjectLoader;
+
+/***/ }),
+/* 76 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XFAFactory = void 0;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _bind = __w_pdfjs_require__(81);
+
+var _data = __w_pdfjs_require__(87);
+
+var _fonts = __w_pdfjs_require__(85);
+
+var _utils = __w_pdfjs_require__(78);
+
+var _util = __w_pdfjs_require__(2);
+
+var _parser = __w_pdfjs_require__(88);
+
+var _xhtml = __w_pdfjs_require__(98);
+
+class XFAFactory {
+  constructor(data) {
+    try {
+      this.root = new _parser.XFAParser().parse(XFAFactory._createDocument(data));
+      const binder = new _bind.Binder(this.root);
+      this.form = binder.bind();
+      this.dataHandler = new _data.DataHandler(this.root, binder.getData());
+      this.form[_xfa_object.$globalData].template = this.form;
+    } catch (e) {
+      (0, _util.warn)(`XFA - an error occurred during parsing and binding: ${e}`);
+    }
+  }
+
+  isValid() {
+    return this.root && this.form;
+  }
+
+  _createPagesHelper() {
+    const iterator = this.form[_xfa_object.$toPages]();
+
+    return new Promise((resolve, reject) => {
+      const nextIteration = () => {
+        try {
+          const value = iterator.next();
+
+          if (value.done) {
+            resolve(value.value);
+          } else {
+            setTimeout(nextIteration, 0);
+          }
+        } catch (e) {
+          reject(e);
+        }
+      };
+
+      setTimeout(nextIteration, 0);
+    });
+  }
+
+  async _createPages() {
+    try {
+      this.pages = await this._createPagesHelper();
+      this.dims = this.pages.children.map(c => {
+        const {
+          width,
+          height
+        } = c.attributes.style;
+        return [0, 0, parseInt(width), parseInt(height)];
+      });
+    } catch (e) {
+      (0, _util.warn)(`XFA - an error occurred during layout: ${e}`);
+    }
+  }
+
+  getBoundingBox(pageIndex) {
+    return this.dims[pageIndex];
+  }
+
+  async getNumPages() {
+    if (!this.pages) {
+      await this._createPages();
+    }
+
+    return this.dims.length;
+  }
+
+  setImages(images) {
+    this.form[_xfa_object.$globalData].images = images;
+  }
+
+  setFonts(fonts) {
+    this.form[_xfa_object.$globalData].fontFinder = new _fonts.FontFinder(fonts);
+    const missingFonts = [];
+
+    for (let typeface of this.form[_xfa_object.$globalData].usedTypefaces) {
+      typeface = (0, _utils.stripQuotes)(typeface);
+
+      const font = this.form[_xfa_object.$globalData].fontFinder.find(typeface);
+
+      if (!font) {
+        missingFonts.push(typeface);
+      }
+    }
+
+    if (missingFonts.length > 0) {
+      return missingFonts;
+    }
+
+    return null;
+  }
+
+  appendFonts(fonts, reallyMissingFonts) {
+    this.form[_xfa_object.$globalData].fontFinder.add(fonts, reallyMissingFonts);
+  }
+
+  async getPages() {
+    if (!this.pages) {
+      await this._createPages();
+    }
+
+    const pages = this.pages;
+    this.pages = null;
+    return pages;
+  }
+
+  serializeData(storage) {
+    return this.dataHandler.serialize(storage);
+  }
+
+  static _createDocument(data) {
+    if (!data["/xdp:xdp"]) {
+      return data["xdp:xdp"];
+    }
+
+    return Object.values(data).join("");
+  }
+
+  static getRichTextAsHtml(rc) {
+    if (!rc || typeof rc !== "string") {
+      return null;
+    }
+
+    try {
+      let root = new _parser.XFAParser(_xhtml.XhtmlNamespace, true).parse(rc);
+
+      if (!["body", "xhtml"].includes(root[_xfa_object.$nodeName])) {
+        const newRoot = _xhtml.XhtmlNamespace.body({});
+
+        newRoot[_xfa_object.$appendChild](root);
+
+        root = newRoot;
+      }
+
+      const result = root[_xfa_object.$toHTML]();
+
+      if (!result.success) {
+        return null;
+      }
+
+      const {
+        html
+      } = result;
+      const {
+        attributes
+      } = html;
+
+      if (attributes) {
+        if (attributes.class) {
+          attributes.class = attributes.class.filter(attr => !attr.startsWith("xfa"));
+        }
+
+        attributes.dir = "auto";
+      }
+
+      return {
+        html,
+        str: root[_xfa_object.$text]()
+      };
+    } catch (e) {
+      (0, _util.warn)(`XFA - an error occurred during parsing of rich text: ${e}`);
+    }
+
+    return null;
+  }
+
+}
+
+exports.XFAFactory = XFAFactory;
+
+/***/ }),
+/* 77 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XmlObject = exports.XFAObjectArray = exports.XFAObject = exports.XFAAttribute = exports.StringObject = exports.OptionObject = exports.Option10 = exports.Option01 = exports.IntegerObject = exports.ContentObject = exports.$uid = exports.$toStyle = exports.$toString = exports.$toPages = exports.$toHTML = exports.$text = exports.$tabIndex = exports.$setValue = exports.$setSetAttributes = exports.$setId = exports.$searchNode = exports.$root = exports.$resolvePrototypes = exports.$removeChild = exports.$pushPara = exports.$pushGlyphs = exports.$popPara = exports.$onText = exports.$onChildCheck = exports.$onChild = exports.$nsAttributes = exports.$nodeName = exports.$namespaceId = exports.$isUsable = exports.$isTransparent = exports.$isThereMoreWidth = exports.$isSplittable = exports.$isNsAgnostic = exports.$isDescendent = exports.$isDataValue = exports.$isCDATAXml = exports.$isBindable = exports.$insertAt = exports.$indexOf = exports.$ids = exports.$hasSettableValue = exports.$globalData = exports.$getTemplateRoot = exports.$getSubformParent = exports.$getRealChildrenByNameIt = exports.$getParent = exports.$getNextPage = exports.$getExtra = exports.$getDataValue = exports.$getContainedChildren = exports.$getChildrenByNameIt = exports.$getChildrenByName = exports.$getChildrenByClass = exports.$getChildren = exports.$getAvailableSpace = exports.$getAttributes = exports.$getAttributeIt = exports.$flushHTML = exports.$finalize = exports.$extra = exports.$dump = exports.$data = exports.$content = exports.$consumed = exports.$clone = exports.$cleanup = exports.$cleanPage = exports.$clean = exports.$childrenToHTML = exports.$appendChild = exports.$addHTML = exports.$acceptWhitespace = void 0;
+
+var _utils = __w_pdfjs_require__(78);
+
+var _util = __w_pdfjs_require__(2);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _som = __w_pdfjs_require__(80);
+
+const $acceptWhitespace = Symbol();
+exports.$acceptWhitespace = $acceptWhitespace;
+const $addHTML = Symbol();
+exports.$addHTML = $addHTML;
+const $appendChild = Symbol();
+exports.$appendChild = $appendChild;
+const $childrenToHTML = Symbol();
+exports.$childrenToHTML = $childrenToHTML;
+const $clean = Symbol();
+exports.$clean = $clean;
+const $cleanPage = Symbol();
+exports.$cleanPage = $cleanPage;
+const $cleanup = Symbol();
+exports.$cleanup = $cleanup;
+const $clone = Symbol();
+exports.$clone = $clone;
+const $consumed = Symbol();
+exports.$consumed = $consumed;
+const $content = Symbol("content");
+exports.$content = $content;
+const $data = Symbol("data");
+exports.$data = $data;
+const $dump = Symbol();
+exports.$dump = $dump;
+const $extra = Symbol("extra");
+exports.$extra = $extra;
+const $finalize = Symbol();
+exports.$finalize = $finalize;
+const $flushHTML = Symbol();
+exports.$flushHTML = $flushHTML;
+const $getAttributeIt = Symbol();
+exports.$getAttributeIt = $getAttributeIt;
+const $getAttributes = Symbol();
+exports.$getAttributes = $getAttributes;
+const $getAvailableSpace = Symbol();
+exports.$getAvailableSpace = $getAvailableSpace;
+const $getChildrenByClass = Symbol();
+exports.$getChildrenByClass = $getChildrenByClass;
+const $getChildrenByName = Symbol();
+exports.$getChildrenByName = $getChildrenByName;
+const $getChildrenByNameIt = Symbol();
+exports.$getChildrenByNameIt = $getChildrenByNameIt;
+const $getDataValue = Symbol();
+exports.$getDataValue = $getDataValue;
+const $getExtra = Symbol();
+exports.$getExtra = $getExtra;
+const $getRealChildrenByNameIt = Symbol();
+exports.$getRealChildrenByNameIt = $getRealChildrenByNameIt;
+const $getChildren = Symbol();
+exports.$getChildren = $getChildren;
+const $getContainedChildren = Symbol();
+exports.$getContainedChildren = $getContainedChildren;
+const $getNextPage = Symbol();
+exports.$getNextPage = $getNextPage;
+const $getSubformParent = Symbol();
+exports.$getSubformParent = $getSubformParent;
+const $getParent = Symbol();
+exports.$getParent = $getParent;
+const $getTemplateRoot = Symbol();
+exports.$getTemplateRoot = $getTemplateRoot;
+const $globalData = Symbol();
+exports.$globalData = $globalData;
+const $hasSettableValue = Symbol();
+exports.$hasSettableValue = $hasSettableValue;
+const $ids = Symbol();
+exports.$ids = $ids;
+const $indexOf = Symbol();
+exports.$indexOf = $indexOf;
+const $insertAt = Symbol();
+exports.$insertAt = $insertAt;
+const $isCDATAXml = Symbol();
+exports.$isCDATAXml = $isCDATAXml;
+const $isBindable = Symbol();
+exports.$isBindable = $isBindable;
+const $isDataValue = Symbol();
+exports.$isDataValue = $isDataValue;
+const $isDescendent = Symbol();
+exports.$isDescendent = $isDescendent;
+const $isNsAgnostic = Symbol();
+exports.$isNsAgnostic = $isNsAgnostic;
+const $isSplittable = Symbol();
+exports.$isSplittable = $isSplittable;
+const $isThereMoreWidth = Symbol();
+exports.$isThereMoreWidth = $isThereMoreWidth;
+const $isTransparent = Symbol();
+exports.$isTransparent = $isTransparent;
+const $isUsable = Symbol();
+exports.$isUsable = $isUsable;
+const $lastAttribute = Symbol();
+const $namespaceId = Symbol("namespaceId");
+exports.$namespaceId = $namespaceId;
+const $nodeName = Symbol("nodeName");
+exports.$nodeName = $nodeName;
+const $nsAttributes = Symbol();
+exports.$nsAttributes = $nsAttributes;
+const $onChild = Symbol();
+exports.$onChild = $onChild;
+const $onChildCheck = Symbol();
+exports.$onChildCheck = $onChildCheck;
+const $onText = Symbol();
+exports.$onText = $onText;
+const $pushGlyphs = Symbol();
+exports.$pushGlyphs = $pushGlyphs;
+const $popPara = Symbol();
+exports.$popPara = $popPara;
+const $pushPara = Symbol();
+exports.$pushPara = $pushPara;
+const $removeChild = Symbol();
+exports.$removeChild = $removeChild;
+const $root = Symbol("root");
+exports.$root = $root;
+const $resolvePrototypes = Symbol();
+exports.$resolvePrototypes = $resolvePrototypes;
+const $searchNode = Symbol();
+exports.$searchNode = $searchNode;
+const $setId = Symbol();
+exports.$setId = $setId;
+const $setSetAttributes = Symbol();
+exports.$setSetAttributes = $setSetAttributes;
+const $setValue = Symbol();
+exports.$setValue = $setValue;
+const $tabIndex = Symbol();
+exports.$tabIndex = $tabIndex;
+const $text = Symbol();
+exports.$text = $text;
+const $toPages = Symbol();
+exports.$toPages = $toPages;
+const $toHTML = Symbol();
+exports.$toHTML = $toHTML;
+const $toString = Symbol();
+exports.$toString = $toString;
+const $toStyle = Symbol();
+exports.$toStyle = $toStyle;
+const $uid = Symbol("uid");
+exports.$uid = $uid;
+
+const _applyPrototype = Symbol();
+
+const _attributes = Symbol();
+
+const _attributeNames = Symbol();
+
+const _children = Symbol("_children");
+
+const _cloneAttribute = Symbol();
+
+const _dataValue = Symbol();
+
+const _defaultValue = Symbol();
+
+const _filteredChildrenGenerator = Symbol();
+
+const _getPrototype = Symbol();
+
+const _getUnsetAttributes = Symbol();
+
+const _hasChildren = Symbol();
+
+const _max = Symbol();
+
+const _options = Symbol();
+
+const _parent = Symbol("parent");
+
+const _resolvePrototypesHelper = Symbol();
+
+const _setAttributes = Symbol();
+
+const _validator = Symbol();
+
+let uid = 0;
+const NS_DATASETS = _namespaces.NamespaceIds.datasets.id;
+
+class XFAObject {
+  constructor(nsId, name, hasChildren = false) {
+    this[$namespaceId] = nsId;
+    this[$nodeName] = name;
+    this[_hasChildren] = hasChildren;
+    this[_parent] = null;
+    this[_children] = [];
+    this[$uid] = `${name}${uid++}`;
+    this[$globalData] = null;
+  }
+
+  [$onChild](child) {
+    if (!this[_hasChildren] || !this[$onChildCheck](child)) {
+      return false;
+    }
+
+    const name = child[$nodeName];
+    const node = this[name];
+
+    if (node instanceof XFAObjectArray) {
+      if (node.push(child)) {
+        this[$appendChild](child);
+        return true;
+      }
+    } else {
+      if (node !== null) {
+        this[$removeChild](node);
+      }
+
+      this[name] = child;
+      this[$appendChild](child);
+      return true;
+    }
+
+    let id = "";
+
+    if (this.id) {
+      id = ` (id: ${this.id})`;
+    } else if (this.name) {
+      id = ` (name: ${this.name} ${this.h.value})`;
+    }
+
+    (0, _util.warn)(`XFA - node "${this[$nodeName]}"${id} has already enough "${name}"!`);
+    return false;
+  }
+
+  [$onChildCheck](child) {
+    return this.hasOwnProperty(child[$nodeName]) && child[$namespaceId] === this[$namespaceId];
+  }
+
+  [$isNsAgnostic]() {
+    return false;
+  }
+
+  [$acceptWhitespace]() {
+    return false;
+  }
+
+  [$isCDATAXml]() {
+    return false;
+  }
+
+  [$isBindable]() {
+    return false;
+  }
+
+  [$popPara]() {
+    if (this.para) {
+      this[$getTemplateRoot]()[$extra].paraStack.pop();
+    }
+  }
+
+  [$pushPara]() {
+    this[$getTemplateRoot]()[$extra].paraStack.push(this.para);
+  }
+
+  [$setId](ids) {
+    if (this.id && this[$namespaceId] === _namespaces.NamespaceIds.template.id) {
+      ids.set(this.id, this);
+    }
+  }
+
+  [$getTemplateRoot]() {
+    return this[$globalData].template;
+  }
+
+  [$isSplittable]() {
+    return false;
+  }
+
+  [$isThereMoreWidth]() {
+    return false;
+  }
+
+  [$appendChild](child) {
+    child[_parent] = this;
+
+    this[_children].push(child);
+
+    if (!child[$globalData] && this[$globalData]) {
+      child[$globalData] = this[$globalData];
+    }
+  }
+
+  [$removeChild](child) {
+    const i = this[_children].indexOf(child);
+
+    this[_children].splice(i, 1);
+  }
+
+  [$hasSettableValue]() {
+    return this.hasOwnProperty("value");
+  }
+
+  [$setValue](_) {}
+
+  [$onText](_) {}
+
+  [$finalize]() {}
+
+  [$clean](builder) {
+    delete this[_hasChildren];
+
+    if (this[$cleanup]) {
+      builder.clean(this[$cleanup]);
+      delete this[$cleanup];
+    }
+  }
+
+  [$indexOf](child) {
+    return this[_children].indexOf(child);
+  }
+
+  [$insertAt](i, child) {
+    child[_parent] = this;
+
+    this[_children].splice(i, 0, child);
+
+    if (!child[$globalData] && this[$globalData]) {
+      child[$globalData] = this[$globalData];
+    }
+  }
+
+  [$isTransparent]() {
+    return !this.name;
+  }
+
+  [$lastAttribute]() {
+    return "";
+  }
+
+  [$text]() {
+    if (this[_children].length === 0) {
+      return this[$content];
+    }
+
+    return this[_children].map(c => c[$text]()).join("");
+  }
+
+  get [_attributeNames]() {
+    const proto = Object.getPrototypeOf(this);
+
+    if (!proto._attributes) {
+      const attributes = proto._attributes = new Set();
+
+      for (const name of Object.getOwnPropertyNames(this)) {
+        if (this[name] === null || this[name] instanceof XFAObject || this[name] instanceof XFAObjectArray) {
+          break;
+        }
+
+        attributes.add(name);
+      }
+    }
+
+    return (0, _util.shadow)(this, _attributeNames, proto._attributes);
+  }
+
+  [$isDescendent](parent) {
+    let node = this;
+
+    while (node) {
+      if (node === parent) {
+        return true;
+      }
+
+      node = node[$getParent]();
+    }
+
+    return false;
+  }
+
+  [$getParent]() {
+    return this[_parent];
+  }
+
+  [$getSubformParent]() {
+    return this[$getParent]();
+  }
+
+  [$getChildren](name = null) {
+    if (!name) {
+      return this[_children];
+    }
+
+    return this[name];
+  }
+
+  [$dump]() {
+    const dumped = Object.create(null);
+
+    if (this[$content]) {
+      dumped.$content = this[$content];
+    }
+
+    for (const name of Object.getOwnPropertyNames(this)) {
+      const value = this[name];
+
+      if (value === null) {
+        continue;
+      }
+
+      if (value instanceof XFAObject) {
+        dumped[name] = value[$dump]();
+      } else if (value instanceof XFAObjectArray) {
+        if (!value.isEmpty()) {
+          dumped[name] = value.dump();
+        }
+      } else {
+        dumped[name] = value;
+      }
+    }
+
+    return dumped;
+  }
+
+  [$toStyle]() {
+    return null;
+  }
+
+  [$toHTML]() {
+    return _utils.HTMLResult.EMPTY;
+  }
+
+  *[$getContainedChildren]() {
+    for (const node of this[$getChildren]()) {
+      yield node;
+    }
+  }
+
+  *[_filteredChildrenGenerator](filter, include) {
+    for (const node of this[$getContainedChildren]()) {
+      if (!filter || include === filter.has(node[$nodeName])) {
+        const availableSpace = this[$getAvailableSpace]();
+        const res = node[$toHTML](availableSpace);
+
+        if (!res.success) {
+          this[$extra].failingNode = node;
+        }
+
+        yield res;
+      }
+    }
+  }
+
+  [$flushHTML]() {
+    return null;
+  }
+
+  [$addHTML](html, bbox) {
+    this[$extra].children.push(html);
+  }
+
+  [$getAvailableSpace]() {}
+
+  [$childrenToHTML]({
+    filter = null,
+    include = true
+  }) {
+    if (!this[$extra].generator) {
+      this[$extra].generator = this[_filteredChildrenGenerator](filter, include);
+    } else {
+      const availableSpace = this[$getAvailableSpace]();
+      const res = this[$extra].failingNode[$toHTML](availableSpace);
+
+      if (!res.success) {
+        return res;
+      }
+
+      if (res.html) {
+        this[$addHTML](res.html, res.bbox);
+      }
+
+      delete this[$extra].failingNode;
+    }
+
+    while (true) {
+      const gen = this[$extra].generator.next();
+
+      if (gen.done) {
+        break;
+      }
+
+      const res = gen.value;
+
+      if (!res.success) {
+        return res;
+      }
+
+      if (res.html) {
+        this[$addHTML](res.html, res.bbox);
+      }
+    }
+
+    this[$extra].generator = null;
+    return _utils.HTMLResult.EMPTY;
+  }
+
+  [$setSetAttributes](attributes) {
+    this[_setAttributes] = new Set(Object.keys(attributes));
+  }
+
+  [_getUnsetAttributes](protoAttributes) {
+    const allAttr = this[_attributeNames];
+    const setAttr = this[_setAttributes];
+    return [...protoAttributes].filter(x => allAttr.has(x) && !setAttr.has(x));
+  }
+
+  [$resolvePrototypes](ids, ancestors = new Set()) {
+    for (const child of this[_children]) {
+      child[_resolvePrototypesHelper](ids, ancestors);
+    }
+  }
+
+  [_resolvePrototypesHelper](ids, ancestors) {
+    const proto = this[_getPrototype](ids, ancestors);
+
+    if (proto) {
+      this[_applyPrototype](proto, ids, ancestors);
+    } else {
+      this[$resolvePrototypes](ids, ancestors);
+    }
+  }
+
+  [_getPrototype](ids, ancestors) {
+    const {
+      use,
+      usehref
+    } = this;
+
+    if (!use && !usehref) {
+      return null;
+    }
+
+    let proto = null;
+    let somExpression = null;
+    let id = null;
+    let ref = use;
+
+    if (usehref) {
+      ref = usehref;
+
+      if (usehref.startsWith("#som(") && usehref.endsWith(")")) {
+        somExpression = usehref.slice("#som(".length, usehref.length - 1);
+      } else if (usehref.startsWith(".#som(") && usehref.endsWith(")")) {
+        somExpression = usehref.slice(".#som(".length, usehref.length - 1);
+      } else if (usehref.startsWith("#")) {
+        id = usehref.slice(1);
+      } else if (usehref.startsWith(".#")) {
+        id = usehref.slice(2);
+      }
+    } else if (use.startsWith("#")) {
+      id = use.slice(1);
+    } else {
+      somExpression = use;
+    }
+
+    this.use = this.usehref = "";
+
+    if (id) {
+      proto = ids.get(id);
+    } else {
+      proto = (0, _som.searchNode)(ids.get($root), this, somExpression, true, false);
+
+      if (proto) {
+        proto = proto[0];
+      }
+    }
+
+    if (!proto) {
+      (0, _util.warn)(`XFA - Invalid prototype reference: ${ref}.`);
+      return null;
+    }
+
+    if (proto[$nodeName] !== this[$nodeName]) {
+      (0, _util.warn)(`XFA - Incompatible prototype: ${proto[$nodeName]} !== ${this[$nodeName]}.`);
+      return null;
+    }
+
+    if (ancestors.has(proto)) {
+      (0, _util.warn)(`XFA - Cycle detected in prototypes use.`);
+      return null;
+    }
+
+    ancestors.add(proto);
+
+    const protoProto = proto[_getPrototype](ids, ancestors);
+
+    if (protoProto) {
+      proto[_applyPrototype](protoProto, ids, ancestors);
+    }
+
+    proto[$resolvePrototypes](ids, ancestors);
+    ancestors.delete(proto);
+    return proto;
+  }
+
+  [_applyPrototype](proto, ids, ancestors) {
+    if (ancestors.has(proto)) {
+      (0, _util.warn)(`XFA - Cycle detected in prototypes use.`);
+      return;
+    }
+
+    if (!this[$content] && proto[$content]) {
+      this[$content] = proto[$content];
+    }
+
+    const newAncestors = new Set(ancestors);
+    newAncestors.add(proto);
+
+    for (const unsetAttrName of this[_getUnsetAttributes](proto[_setAttributes])) {
+      this[unsetAttrName] = proto[unsetAttrName];
+
+      if (this[_setAttributes]) {
+        this[_setAttributes].add(unsetAttrName);
+      }
+    }
+
+    for (const name of Object.getOwnPropertyNames(this)) {
+      if (this[_attributeNames].has(name)) {
+        continue;
+      }
+
+      const value = this[name];
+      const protoValue = proto[name];
+
+      if (value instanceof XFAObjectArray) {
+        for (const child of value[_children]) {
+          child[_resolvePrototypesHelper](ids, ancestors);
+        }
+
+        for (let i = value[_children].length, ii = protoValue[_children].length; i < ii; i++) {
+          const child = proto[_children][i][$clone]();
+
+          if (value.push(child)) {
+            child[_parent] = this;
+
+            this[_children].push(child);
+
+            child[_resolvePrototypesHelper](ids, ancestors);
+          } else {
+            break;
+          }
+        }
+
+        continue;
+      }
+
+      if (value !== null) {
+        value[$resolvePrototypes](ids, ancestors);
+
+        if (protoValue) {
+          value[_applyPrototype](protoValue, ids, ancestors);
+        }
+
+        continue;
+      }
+
+      if (protoValue !== null) {
+        const child = protoValue[$clone]();
+        child[_parent] = this;
+        this[name] = child;
+
+        this[_children].push(child);
+
+        child[_resolvePrototypesHelper](ids, ancestors);
+      }
+    }
+  }
+
+  static [_cloneAttribute](obj) {
+    if (Array.isArray(obj)) {
+      return obj.map(x => XFAObject[_cloneAttribute](x));
+    }
+
+    if (typeof obj === "object" && obj !== null) {
+      return Object.assign({}, obj);
+    }
+
+    return obj;
+  }
+
+  [$clone]() {
+    const clone = Object.create(Object.getPrototypeOf(this));
+
+    for (const $symbol of Object.getOwnPropertySymbols(this)) {
+      try {
+        clone[$symbol] = this[$symbol];
+      } catch (_) {
+        (0, _util.shadow)(clone, $symbol, this[$symbol]);
+      }
+    }
+
+    clone[$uid] = `${clone[$nodeName]}${uid++}`;
+    clone[_children] = [];
+
+    for (const name of Object.getOwnPropertyNames(this)) {
+      if (this[_attributeNames].has(name)) {
+        clone[name] = XFAObject[_cloneAttribute](this[name]);
+        continue;
+      }
+
+      const value = this[name];
+
+      if (value instanceof XFAObjectArray) {
+        clone[name] = new XFAObjectArray(value[_max]);
+      } else {
+        clone[name] = null;
+      }
+    }
+
+    for (const child of this[_children]) {
+      const name = child[$nodeName];
+      const clonedChild = child[$clone]();
+
+      clone[_children].push(clonedChild);
+
+      clonedChild[_parent] = clone;
+
+      if (clone[name] === null) {
+        clone[name] = clonedChild;
+      } else {
+        clone[name][_children].push(clonedChild);
+      }
+    }
+
+    return clone;
+  }
+
+  [$getChildren](name = null) {
+    if (!name) {
+      return this[_children];
+    }
+
+    return this[_children].filter(c => c[$nodeName] === name);
+  }
+
+  [$getChildrenByClass](name) {
+    return this[name];
+  }
+
+  [$getChildrenByName](name, allTransparent, first = true) {
+    return Array.from(this[$getChildrenByNameIt](name, allTransparent, first));
+  }
+
+  *[$getChildrenByNameIt](name, allTransparent, first = true) {
+    if (name === "parent") {
+      yield this[_parent];
+      return;
+    }
+
+    for (const child of this[_children]) {
+      if (child[$nodeName] === name) {
+        yield child;
+      }
+
+      if (child.name === name) {
+        yield child;
+      }
+
+      if (allTransparent || child[$isTransparent]()) {
+        yield* child[$getChildrenByNameIt](name, allTransparent, false);
+      }
+    }
+
+    if (first && this[_attributeNames].has(name)) {
+      yield new XFAAttribute(this, name, this[name]);
+    }
+  }
+
+}
+
+exports.XFAObject = XFAObject;
+
+class XFAObjectArray {
+  constructor(max = Infinity) {
+    this[_max] = max;
+    this[_children] = [];
+  }
+
+  push(child) {
+    const len = this[_children].length;
+
+    if (len <= this[_max]) {
+      this[_children].push(child);
+
+      return true;
+    }
+
+    (0, _util.warn)(`XFA - node "${child[$nodeName]}" accepts no more than ${this[_max]} children`);
+    return false;
+  }
+
+  isEmpty() {
+    return this[_children].length === 0;
+  }
+
+  dump() {
+    return this[_children].length === 1 ? this[_children][0][$dump]() : this[_children].map(x => x[$dump]());
+  }
+
+  [$clone]() {
+    const clone = new XFAObjectArray(this[_max]);
+    clone[_children] = this[_children].map(c => c[$clone]());
+    return clone;
+  }
+
+  get children() {
+    return this[_children];
+  }
+
+  clear() {
+    this[_children].length = 0;
+  }
+
+}
+
+exports.XFAObjectArray = XFAObjectArray;
+
+class XFAAttribute {
+  constructor(node, name, value) {
+    this[_parent] = node;
+    this[$nodeName] = name;
+    this[$content] = value;
+    this[$consumed] = false;
+    this[$uid] = `attribute${uid++}`;
+  }
+
+  [$getParent]() {
+    return this[_parent];
+  }
+
+  [$isDataValue]() {
+    return true;
+  }
+
+  [$getDataValue]() {
+    return this[$content].trim();
+  }
+
+  [$setValue](value) {
+    value = value.value || "";
+    this[$content] = value.toString();
+  }
+
+  [$text]() {
+    return this[$content];
+  }
+
+  [$isDescendent](parent) {
+    return this[_parent] === parent || this[_parent][$isDescendent](parent);
+  }
+
+}
+
+exports.XFAAttribute = XFAAttribute;
+
+class XmlObject extends XFAObject {
+  constructor(nsId, name, attributes = {}) {
+    super(nsId, name);
+    this[$content] = "";
+    this[_dataValue] = null;
+
+    if (name !== "#text") {
+      const map = new Map();
+      this[_attributes] = map;
+
+      for (const [attrName, value] of Object.entries(attributes)) {
+        map.set(attrName, new XFAAttribute(this, attrName, value));
+      }
+
+      if (attributes.hasOwnProperty($nsAttributes)) {
+        const dataNode = attributes[$nsAttributes].xfa.dataNode;
+
+        if (dataNode !== undefined) {
+          if (dataNode === "dataGroup") {
+            this[_dataValue] = false;
+          } else if (dataNode === "dataValue") {
+            this[_dataValue] = true;
+          }
+        }
+      }
+    }
+
+    this[$consumed] = false;
+  }
+
+  [$toString](buf) {
+    const tagName = this[$nodeName];
+
+    if (tagName === "#text") {
+      buf.push((0, _core_utils.encodeToXmlString)(this[$content]));
+      return;
+    }
+
+    const utf8TagName = (0, _util.utf8StringToString)(tagName);
+    const prefix = this[$namespaceId] === NS_DATASETS ? "xfa:" : "";
+    buf.push(`<${prefix}${utf8TagName}`);
+
+    for (const [name, value] of this[_attributes].entries()) {
+      const utf8Name = (0, _util.utf8StringToString)(name);
+      buf.push(` ${utf8Name}="${(0, _core_utils.encodeToXmlString)(value[$content])}"`);
+    }
+
+    if (this[_dataValue] !== null) {
+      if (this[_dataValue]) {
+        buf.push(` xfa:dataNode="dataValue"`);
+      } else {
+        buf.push(` xfa:dataNode="dataGroup"`);
+      }
+    }
+
+    if (!this[$content] && this[_children].length === 0) {
+      buf.push("/>");
+      return;
+    }
+
+    buf.push(">");
+
+    if (this[$content]) {
+      if (typeof this[$content] === "string") {
+        buf.push((0, _core_utils.encodeToXmlString)(this[$content]));
+      } else {
+        this[$content][$toString](buf);
+      }
+    } else {
+      for (const child of this[_children]) {
+        child[$toString](buf);
+      }
+    }
+
+    buf.push(`</${prefix}${utf8TagName}>`);
+  }
+
+  [$onChild](child) {
+    if (this[$content]) {
+      const node = new XmlObject(this[$namespaceId], "#text");
+      this[$appendChild](node);
+      node[$content] = this[$content];
+      this[$content] = "";
+    }
+
+    this[$appendChild](child);
+    return true;
+  }
+
+  [$onText](str) {
+    this[$content] += str;
+  }
+
+  [$finalize]() {
+    if (this[$content] && this[_children].length > 0) {
+      const node = new XmlObject(this[$namespaceId], "#text");
+      this[$appendChild](node);
+      node[$content] = this[$content];
+      delete this[$content];
+    }
+  }
+
+  [$toHTML]() {
+    if (this[$nodeName] === "#text") {
+      return _utils.HTMLResult.success({
+        name: "#text",
+        value: this[$content]
+      });
+    }
+
+    return _utils.HTMLResult.EMPTY;
+  }
+
+  [$getChildren](name = null) {
+    if (!name) {
+      return this[_children];
+    }
+
+    return this[_children].filter(c => c[$nodeName] === name);
+  }
+
+  [$getAttributes]() {
+    return this[_attributes];
+  }
+
+  [$getChildrenByClass](name) {
+    const value = this[_attributes].get(name);
+
+    if (value !== undefined) {
+      return value;
+    }
+
+    return this[$getChildren](name);
+  }
+
+  *[$getChildrenByNameIt](name, allTransparent) {
+    const value = this[_attributes].get(name);
+
+    if (value) {
+      yield value;
+    }
+
+    for (const child of this[_children]) {
+      if (child[$nodeName] === name) {
+        yield child;
+      }
+
+      if (allTransparent) {
+        yield* child[$getChildrenByNameIt](name, allTransparent);
+      }
+    }
+  }
+
+  *[$getAttributeIt](name, skipConsumed) {
+    const value = this[_attributes].get(name);
+
+    if (value && (!skipConsumed || !value[$consumed])) {
+      yield value;
+    }
+
+    for (const child of this[_children]) {
+      yield* child[$getAttributeIt](name, skipConsumed);
+    }
+  }
+
+  *[$getRealChildrenByNameIt](name, allTransparent, skipConsumed) {
+    for (const child of this[_children]) {
+      if (child[$nodeName] === name && (!skipConsumed || !child[$consumed])) {
+        yield child;
+      }
+
+      if (allTransparent) {
+        yield* child[$getRealChildrenByNameIt](name, allTransparent, skipConsumed);
+      }
+    }
+  }
+
+  [$isDataValue]() {
+    if (this[_dataValue] === null) {
+      return this[_children].length === 0 || this[_children][0][$namespaceId] === _namespaces.NamespaceIds.xhtml.id;
+    }
+
+    return this[_dataValue];
+  }
+
+  [$getDataValue]() {
+    if (this[_dataValue] === null) {
+      if (this[_children].length === 0) {
+        return this[$content].trim();
+      }
+
+      if (this[_children][0][$namespaceId] === _namespaces.NamespaceIds.xhtml.id) {
+        return this[_children][0][$text]().trim();
+      }
+
+      return null;
+    }
+
+    return this[$content].trim();
+  }
+
+  [$setValue](value) {
+    value = value.value || "";
+    this[$content] = value.toString();
+  }
+
+  [$dump](hasNS = false) {
+    const dumped = Object.create(null);
+
+    if (hasNS) {
+      dumped.$ns = this[$namespaceId];
+    }
+
+    if (this[$content]) {
+      dumped.$content = this[$content];
+    }
+
+    dumped.$name = this[$nodeName];
+    dumped.children = [];
+
+    for (const child of this[_children]) {
+      dumped.children.push(child[$dump](hasNS));
+    }
+
+    dumped.attributes = Object.create(null);
+
+    for (const [name, value] of this[_attributes]) {
+      dumped.attributes[name] = value[$content];
+    }
+
+    return dumped;
+  }
+
+}
+
+exports.XmlObject = XmlObject;
+
+class ContentObject extends XFAObject {
+  constructor(nsId, name) {
+    super(nsId, name);
+    this[$content] = "";
+  }
+
+  [$onText](text) {
+    this[$content] += text;
+  }
+
+  [$finalize]() {}
+
+}
+
+exports.ContentObject = ContentObject;
+
+class OptionObject extends ContentObject {
+  constructor(nsId, name, options) {
+    super(nsId, name);
+    this[_options] = options;
+  }
+
+  [$finalize]() {
+    this[$content] = (0, _utils.getKeyword)({
+      data: this[$content],
+      defaultValue: this[_options][0],
+      validate: k => this[_options].includes(k)
+    });
+  }
+
+  [$clean](builder) {
+    super[$clean](builder);
+    delete this[_options];
+  }
+
+}
+
+exports.OptionObject = OptionObject;
+
+class StringObject extends ContentObject {
+  [$finalize]() {
+    this[$content] = this[$content].trim();
+  }
+
+}
+
+exports.StringObject = StringObject;
+
+class IntegerObject extends ContentObject {
+  constructor(nsId, name, defaultValue, validator) {
+    super(nsId, name);
+    this[_defaultValue] = defaultValue;
+    this[_validator] = validator;
+  }
+
+  [$finalize]() {
+    this[$content] = (0, _utils.getInteger)({
+      data: this[$content],
+      defaultValue: this[_defaultValue],
+      validate: this[_validator]
+    });
+  }
+
+  [$clean](builder) {
+    super[$clean](builder);
+    delete this[_defaultValue];
+    delete this[_validator];
+  }
+
+}
+
+exports.IntegerObject = IntegerObject;
+
+class Option01 extends IntegerObject {
+  constructor(nsId, name) {
+    super(nsId, name, 0, n => n === 1);
+  }
+
+}
+
+exports.Option01 = Option01;
+
+class Option10 extends IntegerObject {
+  constructor(nsId, name) {
+    super(nsId, name, 1, n => n === 0);
+  }
+
+}
+
+exports.Option10 = Option10;
+
+/***/ }),
+/* 78 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.HTMLResult = void 0;
+exports.getBBox = getBBox;
+exports.getColor = getColor;
+exports.getFloat = getFloat;
+exports.getInteger = getInteger;
+exports.getKeyword = getKeyword;
+exports.getMeasurement = getMeasurement;
+exports.getRatio = getRatio;
+exports.getRelevant = getRelevant;
+exports.getStringOption = getStringOption;
+exports.stripQuotes = stripQuotes;
+
+var _util = __w_pdfjs_require__(2);
+
+const dimConverters = {
+  pt: x => x,
+  cm: x => x / 2.54 * 72,
+  mm: x => x / (10 * 2.54) * 72,
+  in: x => x * 72,
+  px: x => x
+};
+const measurementPattern = /([+-]?\d+\.?\d*)(.*)/;
+
+function stripQuotes(str) {
+  if (str.startsWith("'") || str.startsWith('"')) {
+    return str.slice(1, str.length - 1);
+  }
+
+  return str;
+}
+
+function getInteger({
+  data,
+  defaultValue,
+  validate
+}) {
+  if (!data) {
+    return defaultValue;
+  }
+
+  data = data.trim();
+  const n = parseInt(data, 10);
+
+  if (!isNaN(n) && validate(n)) {
+    return n;
+  }
+
+  return defaultValue;
+}
+
+function getFloat({
+  data,
+  defaultValue,
+  validate
+}) {
+  if (!data) {
+    return defaultValue;
+  }
+
+  data = data.trim();
+  const n = parseFloat(data);
+
+  if (!isNaN(n) && validate(n)) {
+    return n;
+  }
+
+  return defaultValue;
+}
+
+function getKeyword({
+  data,
+  defaultValue,
+  validate
+}) {
+  if (!data) {
+    return defaultValue;
+  }
+
+  data = data.trim();
+
+  if (validate(data)) {
+    return data;
+  }
+
+  return defaultValue;
+}
+
+function getStringOption(data, options) {
+  return getKeyword({
+    data,
+    defaultValue: options[0],
+    validate: k => options.includes(k)
+  });
+}
+
+function getMeasurement(str, def = "0") {
+  def = def || "0";
+
+  if (!str) {
+    return getMeasurement(def);
+  }
+
+  const match = str.trim().match(measurementPattern);
+
+  if (!match) {
+    return getMeasurement(def);
+  }
+
+  const [, valueStr, unit] = match;
+  const value = parseFloat(valueStr);
+
+  if (isNaN(value)) {
+    return getMeasurement(def);
+  }
+
+  if (value === 0) {
+    return 0;
+  }
+
+  const conv = dimConverters[unit];
+
+  if (conv) {
+    return conv(value);
+  }
+
+  return value;
+}
+
+function getRatio(data) {
+  if (!data) {
+    return {
+      num: 1,
+      den: 1
+    };
+  }
+
+  const ratio = data.trim().split(/\s*:\s*/).map(x => parseFloat(x)).filter(x => !isNaN(x));
+
+  if (ratio.length === 1) {
+    ratio.push(1);
+  }
+
+  if (ratio.length === 0) {
+    return {
+      num: 1,
+      den: 1
+    };
+  }
+
+  const [num, den] = ratio;
+  return {
+    num,
+    den
+  };
+}
+
+function getRelevant(data) {
+  if (!data) {
+    return [];
+  }
+
+  return data.trim().split(/\s+/).map(e => {
+    return {
+      excluded: e[0] === "-",
+      viewname: e.substring(1)
+    };
+  });
+}
+
+function getColor(data, def = [0, 0, 0]) {
+  let [r, g, b] = def;
+
+  if (!data) {
+    return {
+      r,
+      g,
+      b
+    };
+  }
+
+  const color = data.trim().split(/\s*,\s*/).map(c => Math.min(Math.max(0, parseInt(c.trim(), 10)), 255)).map(c => isNaN(c) ? 0 : c);
+
+  if (color.length < 3) {
+    return {
+      r,
+      g,
+      b
+    };
+  }
+
+  [r, g, b] = color;
+  return {
+    r,
+    g,
+    b
+  };
+}
+
+function getBBox(data) {
+  const def = -1;
+
+  if (!data) {
+    return {
+      x: def,
+      y: def,
+      width: def,
+      height: def
+    };
+  }
+
+  const bbox = data.trim().split(/\s*,\s*/).map(m => getMeasurement(m, "-1"));
+
+  if (bbox.length < 4 || bbox[2] < 0 || bbox[3] < 0) {
+    return {
+      x: def,
+      y: def,
+      width: def,
+      height: def
+    };
+  }
+
+  const [x, y, width, height] = bbox;
+  return {
+    x,
+    y,
+    width,
+    height
+  };
+}
+
+class HTMLResult {
+  static get FAILURE() {
+    return (0, _util.shadow)(this, "FAILURE", new HTMLResult(false, null, null, null));
+  }
+
+  static get EMPTY() {
+    return (0, _util.shadow)(this, "EMPTY", new HTMLResult(true, null, null, null));
+  }
+
+  constructor(success, html, bbox, breakNode) {
+    this.success = success;
+    this.html = html;
+    this.bbox = bbox;
+    this.breakNode = breakNode;
+  }
+
+  isBreak() {
+    return !!this.breakNode;
+  }
+
+  static breakNode(node) {
+    return new HTMLResult(false, null, null, node);
+  }
+
+  static success(html, bbox = null) {
+    return new HTMLResult(true, html, bbox, null);
+  }
+
+}
+
+exports.HTMLResult = HTMLResult;
+
+/***/ }),
+/* 79 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.NamespaceIds = exports.$buildXFAObject = void 0;
+const $buildXFAObject = Symbol();
+exports.$buildXFAObject = $buildXFAObject;
+const NamespaceIds = {
+  config: {
+    id: 0,
+    check: ns => ns.startsWith("http://www.xfa.org/schema/xci/")
+  },
+  connectionSet: {
+    id: 1,
+    check: ns => ns.startsWith("http://www.xfa.org/schema/xfa-connection-set/")
+  },
+  datasets: {
+    id: 2,
+    check: ns => ns.startsWith("http://www.xfa.org/schema/xfa-data/")
+  },
+  form: {
+    id: 3,
+    check: ns => ns.startsWith("http://www.xfa.org/schema/xfa-form/")
+  },
+  localeSet: {
+    id: 4,
+    check: ns => ns.startsWith("http://www.xfa.org/schema/xfa-locale-set/")
+  },
+  pdf: {
+    id: 5,
+    check: ns => ns === "http://ns.adobe.com/xdp/pdf/"
+  },
+  signature: {
+    id: 6,
+    check: ns => ns === "http://www.w3.org/2000/09/xmldsig#"
+  },
+  sourceSet: {
+    id: 7,
+    check: ns => ns.startsWith("http://www.xfa.org/schema/xfa-source-set/")
+  },
+  stylesheet: {
+    id: 8,
+    check: ns => ns === "http://www.w3.org/1999/XSL/Transform"
+  },
+  template: {
+    id: 9,
+    check: ns => ns.startsWith("http://www.xfa.org/schema/xfa-template/")
+  },
+  xdc: {
+    id: 10,
+    check: ns => ns.startsWith("http://www.xfa.org/schema/xdc/")
+  },
+  xdp: {
+    id: 11,
+    check: ns => ns === "http://ns.adobe.com/xdp/"
+  },
+  xfdf: {
+    id: 12,
+    check: ns => ns === "http://ns.adobe.com/xfdf/"
+  },
+  xhtml: {
+    id: 13,
+    check: ns => ns === "http://www.w3.org/1999/xhtml"
+  },
+  xmpmeta: {
+    id: 14,
+    check: ns => ns === "http://ns.adobe.com/xmpmeta/"
+  }
+};
+exports.NamespaceIds = NamespaceIds;
+
+/***/ }),
+/* 80 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.createDataNode = createDataNode;
+exports.searchNode = searchNode;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _util = __w_pdfjs_require__(2);
+
+const namePattern = /^[^.[]+/;
+const indexPattern = /^[^\]]+/;
+const operators = {
+  dot: 0,
+  dotDot: 1,
+  dotHash: 2,
+  dotBracket: 3,
+  dotParen: 4
+};
+const shortcuts = new Map([["$data", (root, current) => root.datasets ? root.datasets.data : root], ["$record", (root, current) => (root.datasets ? root.datasets.data : root)[_xfa_object.$getChildren]()[0]], ["$template", (root, current) => root.template], ["$connectionSet", (root, current) => root.connectionSet], ["$form", (root, current) => root.form], ["$layout", (root, current) => root.layout], ["$host", (root, current) => root.host], ["$dataWindow", (root, current) => root.dataWindow], ["$event", (root, current) => root.event], ["!", (root, current) => root.datasets], ["$xfa", (root, current) => root], ["xfa", (root, current) => root], ["$", (root, current) => current]]);
+const somCache = new WeakMap();
+const NS_DATASETS = _namespaces.NamespaceIds.datasets.id;
+
+function parseIndex(index) {
+  index = index.trim();
+
+  if (index === "*") {
+    return Infinity;
+  }
+
+  return parseInt(index, 10) || 0;
+}
+
+function parseExpression(expr, dotDotAllowed, noExpr = true) {
+  let match = expr.match(namePattern);
+
+  if (!match) {
+    return null;
+  }
+
+  let [name] = match;
+  const parsed = [{
+    name,
+    cacheName: "." + name,
+    index: 0,
+    js: null,
+    formCalc: null,
+    operator: operators.dot
+  }];
+  let pos = name.length;
+
+  while (pos < expr.length) {
+    const spos = pos;
+    const char = expr.charAt(pos++);
+
+    if (char === "[") {
+      match = expr.slice(pos).match(indexPattern);
+
+      if (!match) {
+        (0, _util.warn)("XFA - Invalid index in SOM expression");
+        return null;
+      }
+
+      parsed.at(-1).index = parseIndex(match[0]);
+      pos += match[0].length + 1;
+      continue;
+    }
+
+    let operator;
+
+    switch (expr.charAt(pos)) {
+      case ".":
+        if (!dotDotAllowed) {
+          return null;
+        }
+
+        pos++;
+        operator = operators.dotDot;
+        break;
+
+      case "#":
+        pos++;
+        operator = operators.dotHash;
+        break;
+
+      case "[":
+        if (noExpr) {
+          (0, _util.warn)("XFA - SOM expression contains a FormCalc subexpression which is not supported for now.");
+          return null;
+        }
+
+        operator = operators.dotBracket;
+        break;
+
+      case "(":
+        if (noExpr) {
+          (0, _util.warn)("XFA - SOM expression contains a JavaScript subexpression which is not supported for now.");
+          return null;
+        }
+
+        operator = operators.dotParen;
+        break;
+
+      default:
+        operator = operators.dot;
+        break;
+    }
+
+    match = expr.slice(pos).match(namePattern);
+
+    if (!match) {
+      break;
+    }
+
+    [name] = match;
+    pos += name.length;
+    parsed.push({
+      name,
+      cacheName: expr.slice(spos, pos),
+      operator,
+      index: 0,
+      js: null,
+      formCalc: null
+    });
+  }
+
+  return parsed;
+}
+
+function searchNode(root, container, expr, dotDotAllowed = true, useCache = true) {
+  const parsed = parseExpression(expr, dotDotAllowed);
+
+  if (!parsed) {
+    return null;
+  }
+
+  const fn = shortcuts.get(parsed[0].name);
+  let i = 0;
+  let isQualified;
+
+  if (fn) {
+    isQualified = true;
+    root = [fn(root, container)];
+    i = 1;
+  } else {
+    isQualified = container === null;
+    root = [container || root];
+  }
+
+  for (let ii = parsed.length; i < ii; i++) {
+    const {
+      name,
+      cacheName,
+      operator,
+      index
+    } = parsed[i];
+    const nodes = [];
+
+    for (const node of root) {
+      if (!(node instanceof _xfa_object.XFAObject)) {
+        continue;
+      }
+
+      let children, cached;
+
+      if (useCache) {
+        cached = somCache.get(node);
+
+        if (!cached) {
+          cached = new Map();
+          somCache.set(node, cached);
+        }
+
+        children = cached.get(cacheName);
+      }
+
+      if (!children) {
+        switch (operator) {
+          case operators.dot:
+            children = node[_xfa_object.$getChildrenByName](name, false);
+            break;
+
+          case operators.dotDot:
+            children = node[_xfa_object.$getChildrenByName](name, true);
+            break;
+
+          case operators.dotHash:
+            children = node[_xfa_object.$getChildrenByClass](name);
+
+            if (children instanceof _xfa_object.XFAObjectArray) {
+              children = children.children;
+            } else {
+              children = [children];
+            }
+
+            break;
+
+          default:
+            break;
+        }
+
+        if (useCache) {
+          cached.set(cacheName, children);
+        }
+      }
+
+      if (children.length > 0) {
+        nodes.push(children);
+      }
+    }
+
+    if (nodes.length === 0 && !isQualified && i === 0) {
+      const parent = container[_xfa_object.$getParent]();
+
+      container = parent;
+
+      if (!container) {
+        return null;
+      }
+
+      i = -1;
+      root = [container];
+      continue;
+    }
+
+    if (isFinite(index)) {
+      root = nodes.filter(node => index < node.length).map(node => node[index]);
+    } else {
+      root = nodes.flat();
+    }
+  }
+
+  if (root.length === 0) {
+    return null;
+  }
+
+  return root;
+}
+
+function createNodes(root, path) {
+  let node = null;
+
+  for (const {
+    name,
+    index
+  } of path) {
+    for (let i = 0, ii = !isFinite(index) ? 0 : index; i <= ii; i++) {
+      const nsId = root[_xfa_object.$namespaceId] === NS_DATASETS ? -1 : root[_xfa_object.$namespaceId];
+      node = new _xfa_object.XmlObject(nsId, name);
+
+      root[_xfa_object.$appendChild](node);
+    }
+
+    root = node;
+  }
+
+  return node;
+}
+
+function createDataNode(root, container, expr) {
+  const parsed = parseExpression(expr);
+
+  if (!parsed) {
+    return null;
+  }
+
+  if (parsed.some(x => x.operator === operators.dotDot)) {
+    return null;
+  }
+
+  const fn = shortcuts.get(parsed[0].name);
+  let i = 0;
+
+  if (fn) {
+    root = fn(root, container);
+    i = 1;
+  } else {
+    root = container || root;
+  }
+
+  for (let ii = parsed.length; i < ii; i++) {
+    const {
+      name,
+      operator,
+      index
+    } = parsed[i];
+
+    if (!isFinite(index)) {
+      parsed[i].index = 0;
+      return createNodes(root, parsed.slice(i));
+    }
+
+    let children;
+
+    switch (operator) {
+      case operators.dot:
+        children = root[_xfa_object.$getChildrenByName](name, false);
+        break;
+
+      case operators.dotDot:
+        children = root[_xfa_object.$getChildrenByName](name, true);
+        break;
+
+      case operators.dotHash:
+        children = root[_xfa_object.$getChildrenByClass](name);
+
+        if (children instanceof _xfa_object.XFAObjectArray) {
+          children = children.children;
+        } else {
+          children = [children];
+        }
+
+        break;
+
+      default:
+        break;
+    }
+
+    if (children.length === 0) {
+      return createNodes(root, parsed.slice(i));
+    }
+
+    if (index < children.length) {
+      const child = children[index];
+
+      if (!(child instanceof _xfa_object.XFAObject)) {
+        (0, _util.warn)(`XFA - Cannot create a node.`);
+        return null;
+      }
+
+      root = child;
+    } else {
+      parsed[i].index = index - children.length;
+      return createNodes(root, parsed.slice(i));
+    }
+  }
+
+  return null;
+}
+
+/***/ }),
+/* 81 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Binder = void 0;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _template = __w_pdfjs_require__(82);
+
+var _som = __w_pdfjs_require__(80);
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _util = __w_pdfjs_require__(2);
+
+const NS_DATASETS = _namespaces.NamespaceIds.datasets.id;
+
+function createText(content) {
+  const node = new _template.Text({});
+  node[_xfa_object.$content] = content;
+  return node;
+}
+
+class Binder {
+  constructor(root) {
+    this.root = root;
+    this.datasets = root.datasets;
+
+    if (root.datasets && root.datasets.data) {
+      this.data = root.datasets.data;
+    } else {
+      this.data = new _xfa_object.XmlObject(_namespaces.NamespaceIds.datasets.id, "data");
+    }
+
+    this.emptyMerge = this.data[_xfa_object.$getChildren]().length === 0;
+    this.root.form = this.form = root.template[_xfa_object.$clone]();
+  }
+
+  _isConsumeData() {
+    return !this.emptyMerge && this._mergeMode;
+  }
+
+  _isMatchTemplate() {
+    return !this._isConsumeData();
+  }
+
+  bind() {
+    this._bindElement(this.form, this.data);
+
+    return this.form;
+  }
+
+  getData() {
+    return this.data;
+  }
+
+  _bindValue(formNode, data, picture) {
+    formNode[_xfa_object.$data] = data;
+
+    if (formNode[_xfa_object.$hasSettableValue]()) {
+      if (data[_xfa_object.$isDataValue]()) {
+        const value = data[_xfa_object.$getDataValue]();
+
+        formNode[_xfa_object.$setValue](createText(value));
+      } else if (formNode instanceof _template.Field && formNode.ui && formNode.ui.choiceList && formNode.ui.choiceList.open === "multiSelect") {
+        const value = data[_xfa_object.$getChildren]().map(child => child[_xfa_object.$content].trim()).join("\n");
+
+        formNode[_xfa_object.$setValue](createText(value));
+      } else if (this._isConsumeData()) {
+        (0, _util.warn)(`XFA - Nodes haven't the same type.`);
+      }
+    } else if (!data[_xfa_object.$isDataValue]() || this._isMatchTemplate()) {
+      this._bindElement(formNode, data);
+    } else {
+      (0, _util.warn)(`XFA - Nodes haven't the same type.`);
+    }
+  }
+
+  _findDataByNameToConsume(name, isValue, dataNode, global) {
+    if (!name) {
+      return null;
+    }
+
+    let generator, match;
+
+    for (let i = 0; i < 3; i++) {
+      generator = dataNode[_xfa_object.$getRealChildrenByNameIt](name, false, true);
+
+      while (true) {
+        match = generator.next().value;
+
+        if (!match) {
+          break;
+        }
+
+        if (isValue === match[_xfa_object.$isDataValue]()) {
+          return match;
+        }
+      }
+
+      if (dataNode[_xfa_object.$namespaceId] === _namespaces.NamespaceIds.datasets.id && dataNode[_xfa_object.$nodeName] === "data") {
+        break;
+      }
+
+      dataNode = dataNode[_xfa_object.$getParent]();
+    }
+
+    if (!global) {
+      return null;
+    }
+
+    generator = this.data[_xfa_object.$getRealChildrenByNameIt](name, true, false);
+    match = generator.next().value;
+
+    if (match) {
+      return match;
+    }
+
+    generator = this.data[_xfa_object.$getAttributeIt](name, true);
+    match = generator.next().value;
+
+    if (match && match[_xfa_object.$isDataValue]()) {
+      return match;
+    }
+
+    return null;
+  }
+
+  _setProperties(formNode, dataNode) {
+    if (!formNode.hasOwnProperty("setProperty")) {
+      return;
+    }
+
+    for (const {
+      ref,
+      target,
+      connection
+    } of formNode.setProperty.children) {
+      if (connection) {
+        continue;
+      }
+
+      if (!ref) {
+        continue;
+      }
+
+      const nodes = (0, _som.searchNode)(this.root, dataNode, ref, false, false);
+
+      if (!nodes) {
+        (0, _util.warn)(`XFA - Invalid reference: ${ref}.`);
+        continue;
+      }
+
+      const [node] = nodes;
+
+      if (!node[_xfa_object.$isDescendent](this.data)) {
+        (0, _util.warn)(`XFA - Invalid node: must be a data node.`);
+        continue;
+      }
+
+      const targetNodes = (0, _som.searchNode)(this.root, formNode, target, false, false);
+
+      if (!targetNodes) {
+        (0, _util.warn)(`XFA - Invalid target: ${target}.`);
+        continue;
+      }
+
+      const [targetNode] = targetNodes;
+
+      if (!targetNode[_xfa_object.$isDescendent](formNode)) {
+        (0, _util.warn)(`XFA - Invalid target: must be a property or subproperty.`);
+        continue;
+      }
+
+      const targetParent = targetNode[_xfa_object.$getParent]();
+
+      if (targetNode instanceof _template.SetProperty || targetParent instanceof _template.SetProperty) {
+        (0, _util.warn)(`XFA - Invalid target: cannot be a setProperty or one of its properties.`);
+        continue;
+      }
+
+      if (targetNode instanceof _template.BindItems || targetParent instanceof _template.BindItems) {
+        (0, _util.warn)(`XFA - Invalid target: cannot be a bindItems or one of its properties.`);
+        continue;
+      }
+
+      const content = node[_xfa_object.$text]();
+
+      const name = targetNode[_xfa_object.$nodeName];
+
+      if (targetNode instanceof _xfa_object.XFAAttribute) {
+        const attrs = Object.create(null);
+        attrs[name] = content;
+        const obj = Reflect.construct(Object.getPrototypeOf(targetParent).constructor, [attrs]);
+        targetParent[name] = obj[name];
+        continue;
+      }
+
+      if (!targetNode.hasOwnProperty(_xfa_object.$content)) {
+        (0, _util.warn)(`XFA - Invalid node to use in setProperty`);
+        continue;
+      }
+
+      targetNode[_xfa_object.$data] = node;
+      targetNode[_xfa_object.$content] = content;
+
+      targetNode[_xfa_object.$finalize]();
+    }
+  }
+
+  _bindItems(formNode, dataNode) {
+    if (!formNode.hasOwnProperty("items") || !formNode.hasOwnProperty("bindItems") || formNode.bindItems.isEmpty()) {
+      return;
+    }
+
+    for (const item of formNode.items.children) {
+      formNode[_xfa_object.$removeChild](item);
+    }
+
+    formNode.items.clear();
+    const labels = new _template.Items({});
+    const values = new _template.Items({});
+
+    formNode[_xfa_object.$appendChild](labels);
+
+    formNode.items.push(labels);
+
+    formNode[_xfa_object.$appendChild](values);
+
+    formNode.items.push(values);
+
+    for (const {
+      ref,
+      labelRef,
+      valueRef,
+      connection
+    } of formNode.bindItems.children) {
+      if (connection) {
+        continue;
+      }
+
+      if (!ref) {
+        continue;
+      }
+
+      const nodes = (0, _som.searchNode)(this.root, dataNode, ref, false, false);
+
+      if (!nodes) {
+        (0, _util.warn)(`XFA - Invalid reference: ${ref}.`);
+        continue;
+      }
+
+      for (const node of nodes) {
+        if (!node[_xfa_object.$isDescendent](this.datasets)) {
+          (0, _util.warn)(`XFA - Invalid ref (${ref}): must be a datasets child.`);
+          continue;
+        }
+
+        const labelNodes = (0, _som.searchNode)(this.root, node, labelRef, true, false);
+
+        if (!labelNodes) {
+          (0, _util.warn)(`XFA - Invalid label: ${labelRef}.`);
+          continue;
+        }
+
+        const [labelNode] = labelNodes;
+
+        if (!labelNode[_xfa_object.$isDescendent](this.datasets)) {
+          (0, _util.warn)(`XFA - Invalid label: must be a datasets child.`);
+          continue;
+        }
+
+        const valueNodes = (0, _som.searchNode)(this.root, node, valueRef, true, false);
+
+        if (!valueNodes) {
+          (0, _util.warn)(`XFA - Invalid value: ${valueRef}.`);
+          continue;
+        }
+
+        const [valueNode] = valueNodes;
+
+        if (!valueNode[_xfa_object.$isDescendent](this.datasets)) {
+          (0, _util.warn)(`XFA - Invalid value: must be a datasets child.`);
+          continue;
+        }
+
+        const label = createText(labelNode[_xfa_object.$text]());
+        const value = createText(valueNode[_xfa_object.$text]());
+
+        labels[_xfa_object.$appendChild](label);
+
+        labels.text.push(label);
+
+        values[_xfa_object.$appendChild](value);
+
+        values.text.push(value);
+      }
+    }
+  }
+
+  _bindOccurrences(formNode, matches, picture) {
+    let baseClone;
+
+    if (matches.length > 1) {
+      baseClone = formNode[_xfa_object.$clone]();
+
+      baseClone[_xfa_object.$removeChild](baseClone.occur);
+
+      baseClone.occur = null;
+    }
+
+    this._bindValue(formNode, matches[0], picture);
+
+    this._setProperties(formNode, matches[0]);
+
+    this._bindItems(formNode, matches[0]);
+
+    if (matches.length === 1) {
+      return;
+    }
+
+    const parent = formNode[_xfa_object.$getParent]();
+
+    const name = formNode[_xfa_object.$nodeName];
+
+    const pos = parent[_xfa_object.$indexOf](formNode);
+
+    for (let i = 1, ii = matches.length; i < ii; i++) {
+      const match = matches[i];
+
+      const clone = baseClone[_xfa_object.$clone]();
+
+      parent[name].push(clone);
+
+      parent[_xfa_object.$insertAt](pos + i, clone);
+
+      this._bindValue(clone, match, picture);
+
+      this._setProperties(clone, match);
+
+      this._bindItems(clone, match);
+    }
+  }
+
+  _createOccurrences(formNode) {
+    if (!this.emptyMerge) {
+      return;
+    }
+
+    const {
+      occur
+    } = formNode;
+
+    if (!occur || occur.initial <= 1) {
+      return;
+    }
+
+    const parent = formNode[_xfa_object.$getParent]();
+
+    const name = formNode[_xfa_object.$nodeName];
+
+    if (!(parent[name] instanceof _xfa_object.XFAObjectArray)) {
+      return;
+    }
+
+    let currentNumber;
+
+    if (formNode.name) {
+      currentNumber = parent[name].children.filter(e => e.name === formNode.name).length;
+    } else {
+      currentNumber = parent[name].children.length;
+    }
+
+    const pos = parent[_xfa_object.$indexOf](formNode) + 1;
+    const ii = occur.initial - currentNumber;
+
+    if (ii) {
+      const nodeClone = formNode[_xfa_object.$clone]();
+
+      nodeClone[_xfa_object.$removeChild](nodeClone.occur);
+
+      nodeClone.occur = null;
+      parent[name].push(nodeClone);
+
+      parent[_xfa_object.$insertAt](pos, nodeClone);
+
+      for (let i = 1; i < ii; i++) {
+        const clone = nodeClone[_xfa_object.$clone]();
+
+        parent[name].push(clone);
+
+        parent[_xfa_object.$insertAt](pos + i, clone);
+      }
+    }
+  }
+
+  _getOccurInfo(formNode) {
+    const {
+      name,
+      occur
+    } = formNode;
+
+    if (!occur || !name) {
+      return [1, 1];
+    }
+
+    const max = occur.max === -1 ? Infinity : occur.max;
+    return [occur.min, max];
+  }
+
+  _setAndBind(formNode, dataNode) {
+    this._setProperties(formNode, dataNode);
+
+    this._bindItems(formNode, dataNode);
+
+    this._bindElement(formNode, dataNode);
+  }
+
+  _bindElement(formNode, dataNode) {
+    const uselessNodes = [];
+
+    this._createOccurrences(formNode);
+
+    for (const child of formNode[_xfa_object.$getChildren]()) {
+      if (child[_xfa_object.$data]) {
+        continue;
+      }
+
+      if (this._mergeMode === undefined && child[_xfa_object.$nodeName] === "subform") {
+        this._mergeMode = child.mergeMode === "consumeData";
+
+        const dataChildren = dataNode[_xfa_object.$getChildren]();
+
+        if (dataChildren.length > 0) {
+          this._bindOccurrences(child, [dataChildren[0]], null);
+        } else if (this.emptyMerge) {
+          const nsId = dataNode[_xfa_object.$namespaceId] === NS_DATASETS ? -1 : dataNode[_xfa_object.$namespaceId];
+          const dataChild = child[_xfa_object.$data] = new _xfa_object.XmlObject(nsId, child.name || "root");
+
+          dataNode[_xfa_object.$appendChild](dataChild);
+
+          this._bindElement(child, dataChild);
+        }
+
+        continue;
+      }
+
+      if (!child[_xfa_object.$isBindable]()) {
+        continue;
+      }
+
+      let global = false;
+      let picture = null;
+      let ref = null;
+      let match = null;
+
+      if (child.bind) {
+        switch (child.bind.match) {
+          case "none":
+            this._setAndBind(child, dataNode);
+
+            continue;
+
+          case "global":
+            global = true;
+            break;
+
+          case "dataRef":
+            if (!child.bind.ref) {
+              (0, _util.warn)(`XFA - ref is empty in node ${child[_xfa_object.$nodeName]}.`);
+
+              this._setAndBind(child, dataNode);
+
+              continue;
+            }
+
+            ref = child.bind.ref;
+            break;
+
+          default:
+            break;
+        }
+
+        if (child.bind.picture) {
+          picture = child.bind.picture[_xfa_object.$content];
+        }
+      }
+
+      const [min, max] = this._getOccurInfo(child);
+
+      if (ref) {
+        match = (0, _som.searchNode)(this.root, dataNode, ref, true, false);
+
+        if (match === null) {
+          match = (0, _som.createDataNode)(this.data, dataNode, ref);
+
+          if (!match) {
+            continue;
+          }
+
+          if (this._isConsumeData()) {
+            match[_xfa_object.$consumed] = true;
+          }
+
+          this._setAndBind(child, match);
+
+          continue;
+        } else {
+          if (this._isConsumeData()) {
+            match = match.filter(node => !node[_xfa_object.$consumed]);
+          }
+
+          if (match.length > max) {
+            match = match.slice(0, max);
+          } else if (match.length === 0) {
+            match = null;
+          }
+
+          if (match && this._isConsumeData()) {
+            match.forEach(node => {
+              node[_xfa_object.$consumed] = true;
+            });
+          }
+        }
+      } else {
+        if (!child.name) {
+          this._setAndBind(child, dataNode);
+
+          continue;
+        }
+
+        if (this._isConsumeData()) {
+          const matches = [];
+
+          while (matches.length < max) {
+            const found = this._findDataByNameToConsume(child.name, child[_xfa_object.$hasSettableValue](), dataNode, global);
+
+            if (!found) {
+              break;
+            }
+
+            found[_xfa_object.$consumed] = true;
+            matches.push(found);
+          }
+
+          match = matches.length > 0 ? matches : null;
+        } else {
+          match = dataNode[_xfa_object.$getRealChildrenByNameIt](child.name, false, this.emptyMerge).next().value;
+
+          if (!match) {
+            if (min === 0) {
+              uselessNodes.push(child);
+              continue;
+            }
+
+            const nsId = dataNode[_xfa_object.$namespaceId] === NS_DATASETS ? -1 : dataNode[_xfa_object.$namespaceId];
+            match = child[_xfa_object.$data] = new _xfa_object.XmlObject(nsId, child.name);
+
+            if (this.emptyMerge) {
+              match[_xfa_object.$consumed] = true;
+            }
+
+            dataNode[_xfa_object.$appendChild](match);
+
+            this._setAndBind(child, match);
+
+            continue;
+          }
+
+          if (this.emptyMerge) {
+            match[_xfa_object.$consumed] = true;
+          }
+
+          match = [match];
+        }
+      }
+
+      if (match) {
+        this._bindOccurrences(child, match, picture);
+      } else if (min > 0) {
+        this._setAndBind(child, dataNode);
+      } else {
+        uselessNodes.push(child);
+      }
+    }
+
+    uselessNodes.forEach(node => node[_xfa_object.$getParent]()[_xfa_object.$removeChild](node));
+  }
+
+}
+
+exports.Binder = Binder;
+
+/***/ }),
+/* 82 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Value = exports.Text = exports.TemplateNamespace = exports.Template = exports.SetProperty = exports.Items = exports.Field = exports.BindItems = void 0;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _layout = __w_pdfjs_require__(83);
+
+var _html_utils = __w_pdfjs_require__(84);
+
+var _utils = __w_pdfjs_require__(78);
+
+var _util = __w_pdfjs_require__(2);
+
+var _fonts = __w_pdfjs_require__(85);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _som = __w_pdfjs_require__(80);
+
+const TEMPLATE_NS_ID = _namespaces.NamespaceIds.template.id;
+const SVG_NS = "http://www.w3.org/2000/svg";
+const MAX_ATTEMPTS_FOR_LRTB_LAYOUT = 2;
+const MAX_EMPTY_PAGES = 3;
+const DEFAULT_TAB_INDEX = 5000;
+const HEADING_PATTERN = /^H(\d+)$/;
+const MIMES = new Set(["image/gif", "image/jpeg", "image/jpg", "image/pjpeg", "image/png", "image/apng", "image/x-png", "image/bmp", "image/x-ms-bmp", "image/tiff", "image/tif", "application/octet-stream"]);
+const IMAGES_HEADERS = [[[0x42, 0x4d], "image/bmp"], [[0xff, 0xd8, 0xff], "image/jpeg"], [[0x49, 0x49, 0x2a, 0x00], "image/tiff"], [[0x4d, 0x4d, 0x00, 0x2a], "image/tiff"], [[0x47, 0x49, 0x46, 0x38, 0x39, 0x61], "image/gif"], [[0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a], "image/png"]];
+
+function getBorderDims(node) {
+  if (!node || !node.border) {
+    return {
+      w: 0,
+      h: 0
+    };
+  }
+
+  const borderExtra = node.border[_xfa_object.$getExtra]();
+
+  if (!borderExtra) {
+    return {
+      w: 0,
+      h: 0
+    };
+  }
+
+  return {
+    w: borderExtra.widths[0] + borderExtra.widths[2] + borderExtra.insets[0] + borderExtra.insets[2],
+    h: borderExtra.widths[1] + borderExtra.widths[3] + borderExtra.insets[1] + borderExtra.insets[3]
+  };
+}
+
+function hasMargin(node) {
+  return node.margin && (node.margin.topInset || node.margin.rightInset || node.margin.bottomInset || node.margin.leftInset);
+}
+
+function _setValue(templateNode, value) {
+  if (!templateNode.value) {
+    const nodeValue = new Value({});
+
+    templateNode[_xfa_object.$appendChild](nodeValue);
+
+    templateNode.value = nodeValue;
+  }
+
+  templateNode.value[_xfa_object.$setValue](value);
+}
+
+function* getContainedChildren(node) {
+  for (const child of node[_xfa_object.$getChildren]()) {
+    if (child instanceof SubformSet) {
+      yield* child[_xfa_object.$getContainedChildren]();
+      continue;
+    }
+
+    yield child;
+  }
+}
+
+function isRequired(node) {
+  return node.validate && node.validate.nullTest === "error";
+}
+
+function setTabIndex(node) {
+  while (node) {
+    if (!node.traversal) {
+      node[_xfa_object.$tabIndex] = node[_xfa_object.$getParent]()[_xfa_object.$tabIndex];
+      return;
+    }
+
+    if (node[_xfa_object.$tabIndex]) {
+      return;
+    }
+
+    let next = null;
+
+    for (const child of node.traversal[_xfa_object.$getChildren]()) {
+      if (child.operation === "next") {
+        next = child;
+        break;
+      }
+    }
+
+    if (!next || !next.ref) {
+      node[_xfa_object.$tabIndex] = node[_xfa_object.$getParent]()[_xfa_object.$tabIndex];
+      return;
+    }
+
+    const root = node[_xfa_object.$getTemplateRoot]();
+
+    node[_xfa_object.$tabIndex] = ++root[_xfa_object.$tabIndex];
+
+    const ref = root[_xfa_object.$searchNode](next.ref, node);
+
+    if (!ref) {
+      return;
+    }
+
+    node = ref[0];
+  }
+}
+
+function applyAssist(obj, attributes) {
+  const assist = obj.assist;
+
+  if (assist) {
+    const assistTitle = assist[_xfa_object.$toHTML]();
+
+    if (assistTitle) {
+      attributes.title = assistTitle;
+    }
+
+    const role = assist.role;
+    const match = role.match(HEADING_PATTERN);
+
+    if (match) {
+      const ariaRole = "heading";
+      const ariaLevel = match[1];
+      attributes.role = ariaRole;
+      attributes["aria-level"] = ariaLevel;
+    }
+  }
+
+  if (obj.layout === "table") {
+    attributes.role = "table";
+  } else if (obj.layout === "row") {
+    attributes.role = "row";
+  } else {
+    const parent = obj[_xfa_object.$getParent]();
+
+    if (parent.layout === "row") {
+      if (parent.assist && parent.assist.role === "TH") {
+        attributes.role = "columnheader";
+      } else {
+        attributes.role = "cell";
+      }
+    }
+  }
+}
+
+function ariaLabel(obj) {
+  if (!obj.assist) {
+    return null;
+  }
+
+  const assist = obj.assist;
+
+  if (assist.speak && assist.speak[_xfa_object.$content] !== "") {
+    return assist.speak[_xfa_object.$content];
+  }
+
+  if (assist.toolTip) {
+    return assist.toolTip[_xfa_object.$content];
+  }
+
+  return null;
+}
+
+function valueToHtml(value) {
+  return _utils.HTMLResult.success({
+    name: "div",
+    attributes: {
+      class: ["xfaRich"],
+      style: Object.create(null)
+    },
+    children: [{
+      name: "span",
+      attributes: {
+        style: Object.create(null)
+      },
+      value
+    }]
+  });
+}
+
+function setFirstUnsplittable(node) {
+  const root = node[_xfa_object.$getTemplateRoot]();
+
+  if (root[_xfa_object.$extra].firstUnsplittable === null) {
+    root[_xfa_object.$extra].firstUnsplittable = node;
+    root[_xfa_object.$extra].noLayoutFailure = true;
+  }
+}
+
+function unsetFirstUnsplittable(node) {
+  const root = node[_xfa_object.$getTemplateRoot]();
+
+  if (root[_xfa_object.$extra].firstUnsplittable === node) {
+    root[_xfa_object.$extra].noLayoutFailure = false;
+  }
+}
+
+function handleBreak(node) {
+  if (node[_xfa_object.$extra]) {
+    return false;
+  }
+
+  node[_xfa_object.$extra] = Object.create(null);
+
+  if (node.targetType === "auto") {
+    return false;
+  }
+
+  const root = node[_xfa_object.$getTemplateRoot]();
+
+  let target = null;
+
+  if (node.target) {
+    target = root[_xfa_object.$searchNode](node.target, node[_xfa_object.$getParent]());
+
+    if (!target) {
+      return false;
+    }
+
+    target = target[0];
+  }
+
+  const {
+    currentPageArea,
+    currentContentArea
+  } = root[_xfa_object.$extra];
+
+  if (node.targetType === "pageArea") {
+    if (!(target instanceof PageArea)) {
+      target = null;
+    }
+
+    if (node.startNew) {
+      node[_xfa_object.$extra].target = target || currentPageArea;
+      return true;
+    } else if (target && target !== currentPageArea) {
+      node[_xfa_object.$extra].target = target;
+      return true;
+    }
+
+    return false;
+  }
+
+  if (!(target instanceof ContentArea)) {
+    target = null;
+  }
+
+  const pageArea = target && target[_xfa_object.$getParent]();
+
+  let index;
+  let nextPageArea = pageArea;
+
+  if (node.startNew) {
+    if (target) {
+      const contentAreas = pageArea.contentArea.children;
+      const indexForCurrent = contentAreas.indexOf(currentContentArea);
+      const indexForTarget = contentAreas.indexOf(target);
+
+      if (indexForCurrent !== -1 && indexForCurrent < indexForTarget) {
+        nextPageArea = null;
+      }
+
+      index = indexForTarget - 1;
+    } else {
+      index = currentPageArea.contentArea.children.indexOf(currentContentArea);
+    }
+  } else if (target && target !== currentContentArea) {
+    const contentAreas = pageArea.contentArea.children;
+    index = contentAreas.indexOf(target) - 1;
+    nextPageArea = pageArea === currentPageArea ? null : pageArea;
+  } else {
+    return false;
+  }
+
+  node[_xfa_object.$extra].target = nextPageArea;
+  node[_xfa_object.$extra].index = index;
+  return true;
+}
+
+function handleOverflow(node, extraNode, space) {
+  const root = node[_xfa_object.$getTemplateRoot]();
+
+  const saved = root[_xfa_object.$extra].noLayoutFailure;
+  const savedMethod = extraNode[_xfa_object.$getSubformParent];
+
+  extraNode[_xfa_object.$getSubformParent] = () => node;
+
+  root[_xfa_object.$extra].noLayoutFailure = true;
+
+  const res = extraNode[_xfa_object.$toHTML](space);
+
+  node[_xfa_object.$addHTML](res.html, res.bbox);
+
+  root[_xfa_object.$extra].noLayoutFailure = saved;
+  extraNode[_xfa_object.$getSubformParent] = savedMethod;
+}
+
+class AppearanceFilter extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "appearanceFilter");
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Arc extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "arc", true);
+    this.circular = (0, _utils.getInteger)({
+      data: attributes.circular,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.hand = (0, _utils.getStringOption)(attributes.hand, ["even", "left", "right"]);
+    this.id = attributes.id || "";
+    this.startAngle = (0, _utils.getFloat)({
+      data: attributes.startAngle,
+      defaultValue: 0,
+      validate: x => true
+    });
+    this.sweepAngle = (0, _utils.getFloat)({
+      data: attributes.sweepAngle,
+      defaultValue: 360,
+      validate: x => true
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.edge = null;
+    this.fill = null;
+  }
+
+  [_xfa_object.$toHTML]() {
+    const edge = this.edge || new Edge({});
+
+    const edgeStyle = edge[_xfa_object.$toStyle]();
+
+    const style = Object.create(null);
+
+    if (this.fill && this.fill.presence === "visible") {
+      Object.assign(style, this.fill[_xfa_object.$toStyle]());
+    } else {
+      style.fill = "transparent";
+    }
+
+    style.strokeWidth = (0, _html_utils.measureToString)(edge.presence === "visible" ? edge.thickness : 0);
+    style.stroke = edgeStyle.color;
+    let arc;
+    const attributes = {
+      xmlns: SVG_NS,
+      style: {
+        width: "100%",
+        height: "100%",
+        overflow: "visible"
+      }
+    };
+
+    if (this.sweepAngle === 360) {
+      arc = {
+        name: "ellipse",
+        attributes: {
+          xmlns: SVG_NS,
+          cx: "50%",
+          cy: "50%",
+          rx: "50%",
+          ry: "50%",
+          style
+        }
+      };
+    } else {
+      const startAngle = this.startAngle * Math.PI / 180;
+      const sweepAngle = this.sweepAngle * Math.PI / 180;
+      const largeArc = this.sweepAngle > 180 ? 1 : 0;
+      const [x1, y1, x2, y2] = [50 * (1 + Math.cos(startAngle)), 50 * (1 - Math.sin(startAngle)), 50 * (1 + Math.cos(startAngle + sweepAngle)), 50 * (1 - Math.sin(startAngle + sweepAngle))];
+      arc = {
+        name: "path",
+        attributes: {
+          xmlns: SVG_NS,
+          d: `M ${x1} ${y1} A 50 50 0 ${largeArc} 0 ${x2} ${y2}`,
+          vectorEffect: "non-scaling-stroke",
+          style
+        }
+      };
+      Object.assign(attributes, {
+        viewBox: "0 0 100 100",
+        preserveAspectRatio: "none"
+      });
+    }
+
+    const svg = {
+      name: "svg",
+      children: [arc],
+      attributes
+    };
+
+    const parent = this[_xfa_object.$getParent]()[_xfa_object.$getParent]();
+
+    if (hasMargin(parent)) {
+      return _utils.HTMLResult.success({
+        name: "div",
+        attributes: {
+          style: {
+            display: "inline",
+            width: "100%",
+            height: "100%"
+          }
+        },
+        children: [svg]
+      });
+    }
+
+    svg.attributes.style.position = "absolute";
+    return _utils.HTMLResult.success(svg);
+  }
+
+}
+
+class Area extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "area", true);
+    this.colSpan = (0, _utils.getInteger)({
+      data: attributes.colSpan,
+      defaultValue: 1,
+      validate: n => n >= 1 || n === -1
+    });
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.x = (0, _utils.getMeasurement)(attributes.x, "0pt");
+    this.y = (0, _utils.getMeasurement)(attributes.y, "0pt");
+    this.desc = null;
+    this.extras = null;
+    this.area = new _xfa_object.XFAObjectArray();
+    this.draw = new _xfa_object.XFAObjectArray();
+    this.exObject = new _xfa_object.XFAObjectArray();
+    this.exclGroup = new _xfa_object.XFAObjectArray();
+    this.field = new _xfa_object.XFAObjectArray();
+    this.subform = new _xfa_object.XFAObjectArray();
+    this.subformSet = new _xfa_object.XFAObjectArray();
+  }
+
+  *[_xfa_object.$getContainedChildren]() {
+    yield* getContainedChildren(this);
+  }
+
+  [_xfa_object.$isTransparent]() {
+    return true;
+  }
+
+  [_xfa_object.$isBindable]() {
+    return true;
+  }
+
+  [_xfa_object.$addHTML](html, bbox) {
+    const [x, y, w, h] = bbox;
+    this[_xfa_object.$extra].width = Math.max(this[_xfa_object.$extra].width, x + w);
+    this[_xfa_object.$extra].height = Math.max(this[_xfa_object.$extra].height, y + h);
+
+    this[_xfa_object.$extra].children.push(html);
+  }
+
+  [_xfa_object.$getAvailableSpace]() {
+    return this[_xfa_object.$extra].availableSpace;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const style = (0, _html_utils.toStyle)(this, "position");
+    const attributes = {
+      style,
+      id: this[_xfa_object.$uid],
+      class: ["xfaArea"]
+    };
+
+    if ((0, _html_utils.isPrintOnly)(this)) {
+      attributes.class.push("xfaPrintOnly");
+    }
+
+    if (this.name) {
+      attributes.xfaName = this.name;
+    }
+
+    const children = [];
+    this[_xfa_object.$extra] = {
+      children,
+      width: 0,
+      height: 0,
+      availableSpace
+    };
+
+    const result = this[_xfa_object.$childrenToHTML]({
+      filter: new Set(["area", "draw", "field", "exclGroup", "subform", "subformSet"]),
+      include: true
+    });
+
+    if (!result.success) {
+      if (result.isBreak()) {
+        return result;
+      }
+
+      delete this[_xfa_object.$extra];
+      return _utils.HTMLResult.FAILURE;
+    }
+
+    style.width = (0, _html_utils.measureToString)(this[_xfa_object.$extra].width);
+    style.height = (0, _html_utils.measureToString)(this[_xfa_object.$extra].height);
+    const html = {
+      name: "div",
+      attributes,
+      children
+    };
+    const bbox = [this.x, this.y, this[_xfa_object.$extra].width, this[_xfa_object.$extra].height];
+    delete this[_xfa_object.$extra];
+    return _utils.HTMLResult.success(html, bbox);
+  }
+
+}
+
+class Assist extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "assist", true);
+    this.id = attributes.id || "";
+    this.role = attributes.role || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.speak = null;
+    this.toolTip = null;
+  }
+
+  [_xfa_object.$toHTML]() {
+    return this.toolTip && this.toolTip[_xfa_object.$content] ? this.toolTip[_xfa_object.$content] : null;
+  }
+
+}
+
+class Barcode extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "barcode", true);
+    this.charEncoding = (0, _utils.getKeyword)({
+      data: attributes.charEncoding ? attributes.charEncoding.toLowerCase() : "",
+      defaultValue: "",
+      validate: k => ["utf-8", "big-five", "fontspecific", "gbk", "gb-18030", "gb-2312", "ksc-5601", "none", "shift-jis", "ucs-2", "utf-16"].includes(k) || k.match(/iso-8859-\d{2}/)
+    });
+    this.checksum = (0, _utils.getStringOption)(attributes.checksum, ["none", "1mod10", "1mod10_1mod11", "2mod10", "auto"]);
+    this.dataColumnCount = (0, _utils.getInteger)({
+      data: attributes.dataColumnCount,
+      defaultValue: -1,
+      validate: x => x >= 0
+    });
+    this.dataLength = (0, _utils.getInteger)({
+      data: attributes.dataLength,
+      defaultValue: -1,
+      validate: x => x >= 0
+    });
+    this.dataPrep = (0, _utils.getStringOption)(attributes.dataPrep, ["none", "flateCompress"]);
+    this.dataRowCount = (0, _utils.getInteger)({
+      data: attributes.dataRowCount,
+      defaultValue: -1,
+      validate: x => x >= 0
+    });
+    this.endChar = attributes.endChar || "";
+    this.errorCorrectionLevel = (0, _utils.getInteger)({
+      data: attributes.errorCorrectionLevel,
+      defaultValue: -1,
+      validate: x => x >= 0 && x <= 8
+    });
+    this.id = attributes.id || "";
+    this.moduleHeight = (0, _utils.getMeasurement)(attributes.moduleHeight, "5mm");
+    this.moduleWidth = (0, _utils.getMeasurement)(attributes.moduleWidth, "0.25mm");
+    this.printCheckDigit = (0, _utils.getInteger)({
+      data: attributes.printCheckDigit,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.rowColumnRatio = (0, _utils.getRatio)(attributes.rowColumnRatio);
+    this.startChar = attributes.startChar || "";
+    this.textLocation = (0, _utils.getStringOption)(attributes.textLocation, ["below", "above", "aboveEmbedded", "belowEmbedded", "none"]);
+    this.truncate = (0, _utils.getInteger)({
+      data: attributes.truncate,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.type = (0, _utils.getStringOption)(attributes.type ? attributes.type.toLowerCase() : "", ["aztec", "codabar", "code2of5industrial", "code2of5interleaved", "code2of5matrix", "code2of5standard", "code3of9", "code3of9extended", "code11", "code49", "code93", "code128", "code128a", "code128b", "code128c", "code128sscc", "datamatrix", "ean8", "ean8add2", "ean8add5", "ean13", "ean13add2", "ean13add5", "ean13pwcd", "fim", "logmars", "maxicode", "msi", "pdf417", "pdf417macro", "plessey", "postauscust2", "postauscust3", "postausreplypaid", "postausstandard", "postukrm4scc", "postusdpbc", "postusimb", "postusstandard", "postus5zip", "qrcode", "rfid", "rss14", "rss14expanded", "rss14limited", "rss14stacked", "rss14stackedomni", "rss14truncated", "telepen", "ucc128", "ucc128random", "ucc128sscc", "upca", "upcaadd2", "upcaadd5", "upcapwcd", "upce", "upceadd2", "upceadd5", "upcean2", "upcean5", "upsmaxicode"]);
+    this.upsMode = (0, _utils.getStringOption)(attributes.upsMode, ["usCarrier", "internationalCarrier", "secureSymbol", "standardSymbol"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.wideNarrowRatio = (0, _utils.getRatio)(attributes.wideNarrowRatio);
+    this.encrypt = null;
+    this.extras = null;
+  }
+
+}
+
+class Bind extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "bind", true);
+    this.match = (0, _utils.getStringOption)(attributes.match, ["once", "dataRef", "global", "none"]);
+    this.ref = attributes.ref || "";
+    this.picture = null;
+  }
+
+}
+
+class BindItems extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "bindItems");
+    this.connection = attributes.connection || "";
+    this.labelRef = attributes.labelRef || "";
+    this.ref = attributes.ref || "";
+    this.valueRef = attributes.valueRef || "";
+  }
+
+}
+
+exports.BindItems = BindItems;
+
+class Bookend extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "bookend");
+    this.id = attributes.id || "";
+    this.leader = attributes.leader || "";
+    this.trailer = attributes.trailer || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class BooleanElement extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "boolean");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    return valueToHtml(this[_xfa_object.$content] === 1 ? "1" : "0");
+  }
+
+}
+
+class Border extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "border", true);
+    this.break = (0, _utils.getStringOption)(attributes.break, ["close", "open"]);
+    this.hand = (0, _utils.getStringOption)(attributes.hand, ["even", "left", "right"]);
+    this.id = attributes.id || "";
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.corner = new _xfa_object.XFAObjectArray(4);
+    this.edge = new _xfa_object.XFAObjectArray(4);
+    this.extras = null;
+    this.fill = null;
+    this.margin = null;
+  }
+
+  [_xfa_object.$getExtra]() {
+    if (!this[_xfa_object.$extra]) {
+      const edges = this.edge.children.slice();
+
+      if (edges.length < 4) {
+        const defaultEdge = edges.at(-1) || new Edge({});
+
+        for (let i = edges.length; i < 4; i++) {
+          edges.push(defaultEdge);
+        }
+      }
+
+      const widths = edges.map(edge => edge.thickness);
+      const insets = [0, 0, 0, 0];
+
+      if (this.margin) {
+        insets[0] = this.margin.topInset;
+        insets[1] = this.margin.rightInset;
+        insets[2] = this.margin.bottomInset;
+        insets[3] = this.margin.leftInset;
+      }
+
+      this[_xfa_object.$extra] = {
+        widths,
+        insets,
+        edges
+      };
+    }
+
+    return this[_xfa_object.$extra];
+  }
+
+  [_xfa_object.$toStyle]() {
+    const {
+      edges
+    } = this[_xfa_object.$getExtra]();
+
+    const edgeStyles = edges.map(node => {
+      const style = node[_xfa_object.$toStyle]();
+
+      style.color = style.color || "#000000";
+      return style;
+    });
+    const style = Object.create(null);
+
+    if (this.margin) {
+      Object.assign(style, this.margin[_xfa_object.$toStyle]());
+    }
+
+    if (this.fill && this.fill.presence === "visible") {
+      Object.assign(style, this.fill[_xfa_object.$toStyle]());
+    }
+
+    if (this.corner.children.some(node => node.radius !== 0)) {
+      const cornerStyles = this.corner.children.map(node => node[_xfa_object.$toStyle]());
+
+      if (cornerStyles.length === 2 || cornerStyles.length === 3) {
+        const last = cornerStyles.at(-1);
+
+        for (let i = cornerStyles.length; i < 4; i++) {
+          cornerStyles.push(last);
+        }
+      }
+
+      style.borderRadius = cornerStyles.map(s => s.radius).join(" ");
+    }
+
+    switch (this.presence) {
+      case "invisible":
+      case "hidden":
+        style.borderStyle = "";
+        break;
+
+      case "inactive":
+        style.borderStyle = "none";
+        break;
+
+      default:
+        style.borderStyle = edgeStyles.map(s => s.style).join(" ");
+        break;
+    }
+
+    style.borderWidth = edgeStyles.map(s => s.width).join(" ");
+    style.borderColor = edgeStyles.map(s => s.color).join(" ");
+    return style;
+  }
+
+}
+
+class Break extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "break", true);
+    this.after = (0, _utils.getStringOption)(attributes.after, ["auto", "contentArea", "pageArea", "pageEven", "pageOdd"]);
+    this.afterTarget = attributes.afterTarget || "";
+    this.before = (0, _utils.getStringOption)(attributes.before, ["auto", "contentArea", "pageArea", "pageEven", "pageOdd"]);
+    this.beforeTarget = attributes.beforeTarget || "";
+    this.bookendLeader = attributes.bookendLeader || "";
+    this.bookendTrailer = attributes.bookendTrailer || "";
+    this.id = attributes.id || "";
+    this.overflowLeader = attributes.overflowLeader || "";
+    this.overflowTarget = attributes.overflowTarget || "";
+    this.overflowTrailer = attributes.overflowTrailer || "";
+    this.startNew = (0, _utils.getInteger)({
+      data: attributes.startNew,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+  }
+
+}
+
+class BreakAfter extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "breakAfter", true);
+    this.id = attributes.id || "";
+    this.leader = attributes.leader || "";
+    this.startNew = (0, _utils.getInteger)({
+      data: attributes.startNew,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.target = attributes.target || "";
+    this.targetType = (0, _utils.getStringOption)(attributes.targetType, ["auto", "contentArea", "pageArea"]);
+    this.trailer = attributes.trailer || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.script = null;
+  }
+
+}
+
+class BreakBefore extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "breakBefore", true);
+    this.id = attributes.id || "";
+    this.leader = attributes.leader || "";
+    this.startNew = (0, _utils.getInteger)({
+      data: attributes.startNew,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.target = attributes.target || "";
+    this.targetType = (0, _utils.getStringOption)(attributes.targetType, ["auto", "contentArea", "pageArea"]);
+    this.trailer = attributes.trailer || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.script = null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    this[_xfa_object.$extra] = {};
+    return _utils.HTMLResult.FAILURE;
+  }
+
+}
+
+class Button extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "button", true);
+    this.highlight = (0, _utils.getStringOption)(attributes.highlight, ["inverted", "none", "outline", "push"]);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const parent = this[_xfa_object.$getParent]();
+
+    const grandpa = parent[_xfa_object.$getParent]();
+
+    const htmlButton = {
+      name: "button",
+      attributes: {
+        id: this[_xfa_object.$uid],
+        class: ["xfaButton"],
+        style: {}
+      },
+      children: []
+    };
+
+    for (const event of grandpa.event.children) {
+      if (event.activity !== "click" || !event.script) {
+        continue;
+      }
+
+      const jsURL = (0, _core_utils.recoverJsURL)(event.script[_xfa_object.$content]);
+
+      if (!jsURL) {
+        continue;
+      }
+
+      const href = (0, _html_utils.fixURL)(jsURL.url);
+
+      if (!href) {
+        continue;
+      }
+
+      htmlButton.children.push({
+        name: "a",
+        attributes: {
+          id: "link" + this[_xfa_object.$uid],
+          href,
+          newWindow: jsURL.newWindow,
+          class: ["xfaLink"],
+          style: {}
+        },
+        children: []
+      });
+    }
+
+    return _utils.HTMLResult.success(htmlButton);
+  }
+
+}
+
+class Calculate extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "calculate", true);
+    this.id = attributes.id || "";
+    this.override = (0, _utils.getStringOption)(attributes.override, ["disabled", "error", "ignore", "warning"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.message = null;
+    this.script = null;
+  }
+
+}
+
+class Caption extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "caption", true);
+    this.id = attributes.id || "";
+    this.placement = (0, _utils.getStringOption)(attributes.placement, ["left", "bottom", "inline", "right", "top"]);
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.reserve = Math.ceil((0, _utils.getMeasurement)(attributes.reserve));
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.font = null;
+    this.margin = null;
+    this.para = null;
+    this.value = null;
+  }
+
+  [_xfa_object.$setValue](value) {
+    _setValue(this, value);
+  }
+
+  [_xfa_object.$getExtra](availableSpace) {
+    if (!this[_xfa_object.$extra]) {
+      let {
+        width,
+        height
+      } = availableSpace;
+
+      switch (this.placement) {
+        case "left":
+        case "right":
+        case "inline":
+          width = this.reserve <= 0 ? width : this.reserve;
+          break;
+
+        case "top":
+        case "bottom":
+          height = this.reserve <= 0 ? height : this.reserve;
+          break;
+      }
+
+      this[_xfa_object.$extra] = (0, _html_utils.layoutNode)(this, {
+        width,
+        height
+      });
+    }
+
+    return this[_xfa_object.$extra];
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    if (!this.value) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    this[_xfa_object.$pushPara]();
+
+    const value = this.value[_xfa_object.$toHTML](availableSpace).html;
+
+    if (!value) {
+      this[_xfa_object.$popPara]();
+
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    const savedReserve = this.reserve;
+
+    if (this.reserve <= 0) {
+      const {
+        w,
+        h
+      } = this[_xfa_object.$getExtra](availableSpace);
+
+      switch (this.placement) {
+        case "left":
+        case "right":
+        case "inline":
+          this.reserve = w;
+          break;
+
+        case "top":
+        case "bottom":
+          this.reserve = h;
+          break;
+      }
+    }
+
+    const children = [];
+
+    if (typeof value === "string") {
+      children.push({
+        name: "#text",
+        value
+      });
+    } else {
+      children.push(value);
+    }
+
+    const style = (0, _html_utils.toStyle)(this, "font", "margin", "visibility");
+
+    switch (this.placement) {
+      case "left":
+      case "right":
+        if (this.reserve > 0) {
+          style.width = (0, _html_utils.measureToString)(this.reserve);
+        }
+
+        break;
+
+      case "top":
+      case "bottom":
+        if (this.reserve > 0) {
+          style.height = (0, _html_utils.measureToString)(this.reserve);
+        }
+
+        break;
+    }
+
+    (0, _html_utils.setPara)(this, null, value);
+
+    this[_xfa_object.$popPara]();
+
+    this.reserve = savedReserve;
+    return _utils.HTMLResult.success({
+      name: "div",
+      attributes: {
+        style,
+        class: ["xfaCaption"]
+      },
+      children
+    });
+  }
+
+}
+
+class Certificate extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "certificate");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Certificates extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "certificates", true);
+    this.credentialServerPolicy = (0, _utils.getStringOption)(attributes.credentialServerPolicy, ["optional", "required"]);
+    this.id = attributes.id || "";
+    this.url = attributes.url || "";
+    this.urlPolicy = attributes.urlPolicy || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.encryption = null;
+    this.issuers = null;
+    this.keyUsage = null;
+    this.oids = null;
+    this.signing = null;
+    this.subjectDNs = null;
+  }
+
+}
+
+class CheckButton extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "checkButton", true);
+    this.id = attributes.id || "";
+    this.mark = (0, _utils.getStringOption)(attributes.mark, ["default", "check", "circle", "cross", "diamond", "square", "star"]);
+    this.shape = (0, _utils.getStringOption)(attributes.shape, ["square", "round"]);
+    this.size = (0, _utils.getMeasurement)(attributes.size, "10pt");
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.border = null;
+    this.extras = null;
+    this.margin = null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const style = (0, _html_utils.toStyle)("margin");
+    const size = (0, _html_utils.measureToString)(this.size);
+    style.width = style.height = size;
+    let type;
+    let className;
+    let groupId;
+
+    const field = this[_xfa_object.$getParent]()[_xfa_object.$getParent]();
+
+    const items = field.items.children.length && field.items.children[0][_xfa_object.$toHTML]().html || [];
+    const exportedValue = {
+      on: (items[0] !== undefined ? items[0] : "on").toString(),
+      off: (items[1] !== undefined ? items[1] : "off").toString()
+    };
+    const value = field.value && field.value[_xfa_object.$text]() || "off";
+    const checked = value === exportedValue.on || undefined;
+
+    const container = field[_xfa_object.$getSubformParent]();
+
+    const fieldId = field[_xfa_object.$uid];
+    let dataId;
+
+    if (container instanceof ExclGroup) {
+      groupId = container[_xfa_object.$uid];
+      type = "radio";
+      className = "xfaRadio";
+      dataId = container[_xfa_object.$data] && container[_xfa_object.$data][_xfa_object.$uid] || container[_xfa_object.$uid];
+    } else {
+      type = "checkbox";
+      className = "xfaCheckbox";
+      dataId = field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid];
+    }
+
+    const input = {
+      name: "input",
+      attributes: {
+        class: [className],
+        style,
+        fieldId,
+        dataId,
+        type,
+        checked,
+        xfaOn: exportedValue.on,
+        xfaOff: exportedValue.off,
+        "aria-label": ariaLabel(field),
+        "aria-required": false
+      }
+    };
+
+    if (groupId) {
+      input.attributes.name = groupId;
+    }
+
+    if (isRequired(field)) {
+      input.attributes["aria-required"] = true;
+      input.attributes.required = true;
+    }
+
+    return _utils.HTMLResult.success({
+      name: "label",
+      attributes: {
+        class: ["xfaLabel"]
+      },
+      children: [input]
+    });
+  }
+
+}
+
+class ChoiceList extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "choiceList", true);
+    this.commitOn = (0, _utils.getStringOption)(attributes.commitOn, ["select", "exit"]);
+    this.id = attributes.id || "";
+    this.open = (0, _utils.getStringOption)(attributes.open, ["userControl", "always", "multiSelect", "onEntry"]);
+    this.textEntry = (0, _utils.getInteger)({
+      data: attributes.textEntry,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.border = null;
+    this.extras = null;
+    this.margin = null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const style = (0, _html_utils.toStyle)(this, "border", "margin");
+
+    const ui = this[_xfa_object.$getParent]();
+
+    const field = ui[_xfa_object.$getParent]();
+
+    const fontSize = field.font && field.font.size || 10;
+    const optionStyle = {
+      fontSize: `calc(${fontSize}px * var(--scale-factor))`
+    };
+    const children = [];
+
+    if (field.items.children.length > 0) {
+      const items = field.items;
+      let displayedIndex = 0;
+      let saveIndex = 0;
+
+      if (items.children.length === 2) {
+        displayedIndex = items.children[0].save;
+        saveIndex = 1 - displayedIndex;
+      }
+
+      const displayed = items.children[displayedIndex][_xfa_object.$toHTML]().html;
+
+      const values = items.children[saveIndex][_xfa_object.$toHTML]().html;
+
+      let selected = false;
+      const value = field.value && field.value[_xfa_object.$text]() || "";
+
+      for (let i = 0, ii = displayed.length; i < ii; i++) {
+        const option = {
+          name: "option",
+          attributes: {
+            value: values[i] || displayed[i],
+            style: optionStyle
+          },
+          value: displayed[i]
+        };
+
+        if (values[i] === value) {
+          option.attributes.selected = selected = true;
+        }
+
+        children.push(option);
+      }
+
+      if (!selected) {
+        children.splice(0, 0, {
+          name: "option",
+          attributes: {
+            hidden: true,
+            selected: true
+          },
+          value: " "
+        });
+      }
+    }
+
+    const selectAttributes = {
+      class: ["xfaSelect"],
+      fieldId: field[_xfa_object.$uid],
+      dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
+      style,
+      "aria-label": ariaLabel(field),
+      "aria-required": false
+    };
+
+    if (isRequired(field)) {
+      selectAttributes["aria-required"] = true;
+      selectAttributes.required = true;
+    }
+
+    if (this.open === "multiSelect") {
+      selectAttributes.multiple = true;
+    }
+
+    return _utils.HTMLResult.success({
+      name: "label",
+      attributes: {
+        class: ["xfaLabel"]
+      },
+      children: [{
+        name: "select",
+        children,
+        attributes: selectAttributes
+      }]
+    });
+  }
+
+}
+
+class Color extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "color", true);
+    this.cSpace = (0, _utils.getStringOption)(attributes.cSpace, ["SRGB"]);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.value = attributes.value ? (0, _utils.getColor)(attributes.value) : "";
+    this.extras = null;
+  }
+
+  [_xfa_object.$hasSettableValue]() {
+    return false;
+  }
+
+  [_xfa_object.$toStyle]() {
+    return this.value ? _util.Util.makeHexColor(this.value.r, this.value.g, this.value.b) : null;
+  }
+
+}
+
+class Comb extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "comb");
+    this.id = attributes.id || "";
+    this.numberOfCells = (0, _utils.getInteger)({
+      data: attributes.numberOfCells,
+      defaultValue: 0,
+      validate: x => x >= 0
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Connect extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "connect", true);
+    this.connection = attributes.connection || "";
+    this.id = attributes.id || "";
+    this.ref = attributes.ref || "";
+    this.usage = (0, _utils.getStringOption)(attributes.usage, ["exportAndImport", "exportOnly", "importOnly"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.picture = null;
+  }
+
+}
+
+class ContentArea extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "contentArea", true);
+    this.h = (0, _utils.getMeasurement)(attributes.h);
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.w = (0, _utils.getMeasurement)(attributes.w);
+    this.x = (0, _utils.getMeasurement)(attributes.x, "0pt");
+    this.y = (0, _utils.getMeasurement)(attributes.y, "0pt");
+    this.desc = null;
+    this.extras = null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const left = (0, _html_utils.measureToString)(this.x);
+    const top = (0, _html_utils.measureToString)(this.y);
+    const style = {
+      left,
+      top,
+      width: (0, _html_utils.measureToString)(this.w),
+      height: (0, _html_utils.measureToString)(this.h)
+    };
+    const classNames = ["xfaContentarea"];
+
+    if ((0, _html_utils.isPrintOnly)(this)) {
+      classNames.push("xfaPrintOnly");
+    }
+
+    return _utils.HTMLResult.success({
+      name: "div",
+      children: [],
+      attributes: {
+        style,
+        class: classNames,
+        id: this[_xfa_object.$uid]
+      }
+    });
+  }
+
+}
+
+class Corner extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "corner", true);
+    this.id = attributes.id || "";
+    this.inverted = (0, _utils.getInteger)({
+      data: attributes.inverted,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.join = (0, _utils.getStringOption)(attributes.join, ["square", "round"]);
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.radius = (0, _utils.getMeasurement)(attributes.radius);
+    this.stroke = (0, _utils.getStringOption)(attributes.stroke, ["solid", "dashDot", "dashDotDot", "dashed", "dotted", "embossed", "etched", "lowered", "raised"]);
+    this.thickness = (0, _utils.getMeasurement)(attributes.thickness, "0.5pt");
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.color = null;
+    this.extras = null;
+  }
+
+  [_xfa_object.$toStyle]() {
+    const style = (0, _html_utils.toStyle)(this, "visibility");
+    style.radius = (0, _html_utils.measureToString)(this.join === "square" ? 0 : this.radius);
+    return style;
+  }
+
+}
+
+class DateElement extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "date");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$finalize]() {
+    const date = this[_xfa_object.$content].trim();
+
+    this[_xfa_object.$content] = date ? new Date(date) : null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    return valueToHtml(this[_xfa_object.$content] ? this[_xfa_object.$content].toString() : "");
+  }
+
+}
+
+class DateTime extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "dateTime");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$finalize]() {
+    const date = this[_xfa_object.$content].trim();
+
+    this[_xfa_object.$content] = date ? new Date(date) : null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    return valueToHtml(this[_xfa_object.$content] ? this[_xfa_object.$content].toString() : "");
+  }
+
+}
+
+class DateTimeEdit extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "dateTimeEdit", true);
+    this.hScrollPolicy = (0, _utils.getStringOption)(attributes.hScrollPolicy, ["auto", "off", "on"]);
+    this.id = attributes.id || "";
+    this.picker = (0, _utils.getStringOption)(attributes.picker, ["host", "none"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.border = null;
+    this.comb = null;
+    this.extras = null;
+    this.margin = null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const style = (0, _html_utils.toStyle)(this, "border", "font", "margin");
+
+    const field = this[_xfa_object.$getParent]()[_xfa_object.$getParent]();
+
+    const html = {
+      name: "input",
+      attributes: {
+        type: "text",
+        fieldId: field[_xfa_object.$uid],
+        dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
+        class: ["xfaTextfield"],
+        style,
+        "aria-label": ariaLabel(field),
+        "aria-required": false
+      }
+    };
+
+    if (isRequired(field)) {
+      html.attributes["aria-required"] = true;
+      html.attributes.required = true;
+    }
+
+    return _utils.HTMLResult.success({
+      name: "label",
+      attributes: {
+        class: ["xfaLabel"]
+      },
+      children: [html]
+    });
+  }
+
+}
+
+class Decimal extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "decimal");
+    this.fracDigits = (0, _utils.getInteger)({
+      data: attributes.fracDigits,
+      defaultValue: 2,
+      validate: x => true
+    });
+    this.id = attributes.id || "";
+    this.leadDigits = (0, _utils.getInteger)({
+      data: attributes.leadDigits,
+      defaultValue: -1,
+      validate: x => true
+    });
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$finalize]() {
+    const number = parseFloat(this[_xfa_object.$content].trim());
+    this[_xfa_object.$content] = isNaN(number) ? null : number;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    return valueToHtml(this[_xfa_object.$content] !== null ? this[_xfa_object.$content].toString() : "");
+  }
+
+}
+
+class DefaultUi extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "defaultUi", true);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+  }
+
+}
+
+class Desc extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "desc", true);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.boolean = new _xfa_object.XFAObjectArray();
+    this.date = new _xfa_object.XFAObjectArray();
+    this.dateTime = new _xfa_object.XFAObjectArray();
+    this.decimal = new _xfa_object.XFAObjectArray();
+    this.exData = new _xfa_object.XFAObjectArray();
+    this.float = new _xfa_object.XFAObjectArray();
+    this.image = new _xfa_object.XFAObjectArray();
+    this.integer = new _xfa_object.XFAObjectArray();
+    this.text = new _xfa_object.XFAObjectArray();
+    this.time = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class DigestMethod extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "digestMethod", ["", "SHA1", "SHA256", "SHA512", "RIPEMD160"]);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class DigestMethods extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "digestMethods", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.digestMethod = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Draw extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "draw", true);
+    this.anchorType = (0, _utils.getStringOption)(attributes.anchorType, ["topLeft", "bottomCenter", "bottomLeft", "bottomRight", "middleCenter", "middleLeft", "middleRight", "topCenter", "topRight"]);
+    this.colSpan = (0, _utils.getInteger)({
+      data: attributes.colSpan,
+      defaultValue: 1,
+      validate: n => n >= 1 || n === -1
+    });
+    this.h = attributes.h ? (0, _utils.getMeasurement)(attributes.h) : "";
+    this.hAlign = (0, _utils.getStringOption)(attributes.hAlign, ["left", "center", "justify", "justifyAll", "radix", "right"]);
+    this.id = attributes.id || "";
+    this.locale = attributes.locale || "";
+    this.maxH = (0, _utils.getMeasurement)(attributes.maxH, "0pt");
+    this.maxW = (0, _utils.getMeasurement)(attributes.maxW, "0pt");
+    this.minH = (0, _utils.getMeasurement)(attributes.minH, "0pt");
+    this.minW = (0, _utils.getMeasurement)(attributes.minW, "0pt");
+    this.name = attributes.name || "";
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.rotate = (0, _utils.getInteger)({
+      data: attributes.rotate,
+      defaultValue: 0,
+      validate: x => x % 90 === 0
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.w = attributes.w ? (0, _utils.getMeasurement)(attributes.w) : "";
+    this.x = (0, _utils.getMeasurement)(attributes.x, "0pt");
+    this.y = (0, _utils.getMeasurement)(attributes.y, "0pt");
+    this.assist = null;
+    this.border = null;
+    this.caption = null;
+    this.desc = null;
+    this.extras = null;
+    this.font = null;
+    this.keep = null;
+    this.margin = null;
+    this.para = null;
+    this.traversal = null;
+    this.ui = null;
+    this.value = null;
+    this.setProperty = new _xfa_object.XFAObjectArray();
+  }
+
+  [_xfa_object.$setValue](value) {
+    _setValue(this, value);
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    setTabIndex(this);
+
+    if (this.presence === "hidden" || this.presence === "inactive") {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    (0, _html_utils.fixDimensions)(this);
+
+    this[_xfa_object.$pushPara]();
+
+    const savedW = this.w;
+    const savedH = this.h;
+    const {
+      w,
+      h,
+      isBroken
+    } = (0, _html_utils.layoutNode)(this, availableSpace);
+
+    if (w && this.w === "") {
+      if (isBroken && this[_xfa_object.$getSubformParent]()[_xfa_object.$isThereMoreWidth]()) {
+        this[_xfa_object.$popPara]();
+
+        return _utils.HTMLResult.FAILURE;
+      }
+
+      this.w = w;
+    }
+
+    if (h && this.h === "") {
+      this.h = h;
+    }
+
+    setFirstUnsplittable(this);
+
+    if (!(0, _layout.checkDimensions)(this, availableSpace)) {
+      this.w = savedW;
+      this.h = savedH;
+
+      this[_xfa_object.$popPara]();
+
+      return _utils.HTMLResult.FAILURE;
+    }
+
+    unsetFirstUnsplittable(this);
+    const style = (0, _html_utils.toStyle)(this, "font", "hAlign", "dimensions", "position", "presence", "rotate", "anchorType", "border", "margin");
+    (0, _html_utils.setMinMaxDimensions)(this, style);
+
+    if (style.margin) {
+      style.padding = style.margin;
+      delete style.margin;
+    }
+
+    const classNames = ["xfaDraw"];
+
+    if (this.font) {
+      classNames.push("xfaFont");
+    }
+
+    if ((0, _html_utils.isPrintOnly)(this)) {
+      classNames.push("xfaPrintOnly");
+    }
+
+    const attributes = {
+      style,
+      id: this[_xfa_object.$uid],
+      class: classNames
+    };
+
+    if (this.name) {
+      attributes.xfaName = this.name;
+    }
+
+    const html = {
+      name: "div",
+      attributes,
+      children: []
+    };
+    applyAssist(this, attributes);
+    const bbox = (0, _html_utils.computeBbox)(this, html, availableSpace);
+    const value = this.value ? this.value[_xfa_object.$toHTML](availableSpace).html : null;
+
+    if (value === null) {
+      this.w = savedW;
+      this.h = savedH;
+
+      this[_xfa_object.$popPara]();
+
+      return _utils.HTMLResult.success((0, _html_utils.createWrapper)(this, html), bbox);
+    }
+
+    html.children.push(value);
+    (0, _html_utils.setPara)(this, style, value);
+    this.w = savedW;
+    this.h = savedH;
+
+    this[_xfa_object.$popPara]();
+
+    return _utils.HTMLResult.success((0, _html_utils.createWrapper)(this, html), bbox);
+  }
+
+}
+
+class Edge extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "edge", true);
+    this.cap = (0, _utils.getStringOption)(attributes.cap, ["square", "butt", "round"]);
+    this.id = attributes.id || "";
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.stroke = (0, _utils.getStringOption)(attributes.stroke, ["solid", "dashDot", "dashDotDot", "dashed", "dotted", "embossed", "etched", "lowered", "raised"]);
+    this.thickness = (0, _utils.getMeasurement)(attributes.thickness, "0.5pt");
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.color = null;
+    this.extras = null;
+  }
+
+  [_xfa_object.$toStyle]() {
+    const style = (0, _html_utils.toStyle)(this, "visibility");
+    Object.assign(style, {
+      linecap: this.cap,
+      width: (0, _html_utils.measureToString)(this.thickness),
+      color: this.color ? this.color[_xfa_object.$toStyle]() : "#000000",
+      style: ""
+    });
+
+    if (this.presence !== "visible") {
+      style.style = "none";
+    } else {
+      switch (this.stroke) {
+        case "solid":
+          style.style = "solid";
+          break;
+
+        case "dashDot":
+          style.style = "dashed";
+          break;
+
+        case "dashDotDot":
+          style.style = "dashed";
+          break;
+
+        case "dashed":
+          style.style = "dashed";
+          break;
+
+        case "dotted":
+          style.style = "dotted";
+          break;
+
+        case "embossed":
+          style.style = "ridge";
+          break;
+
+        case "etched":
+          style.style = "groove";
+          break;
+
+        case "lowered":
+          style.style = "inset";
+          break;
+
+        case "raised":
+          style.style = "outset";
+          break;
+      }
+    }
+
+    return style;
+  }
+
+}
+
+class Encoding extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "encoding", ["adbe.x509.rsa_sha1", "adbe.pkcs7.detached", "adbe.pkcs7.sha1"]);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Encodings extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "encodings", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.encoding = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Encrypt extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "encrypt", true);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.certificate = null;
+  }
+
+}
+
+class EncryptData extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "encryptData", true);
+    this.id = attributes.id || "";
+    this.operation = (0, _utils.getStringOption)(attributes.operation, ["encrypt", "decrypt"]);
+    this.target = attributes.target || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.filter = null;
+    this.manifest = null;
+  }
+
+}
+
+class Encryption extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "encryption", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.certificate = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class EncryptionMethod extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "encryptionMethod", ["", "AES256-CBC", "TRIPLEDES-CBC", "AES128-CBC", "AES192-CBC"]);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class EncryptionMethods extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "encryptionMethods", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.encryptionMethod = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Event extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "event", true);
+    this.activity = (0, _utils.getStringOption)(attributes.activity, ["click", "change", "docClose", "docReady", "enter", "exit", "full", "indexChange", "initialize", "mouseDown", "mouseEnter", "mouseExit", "mouseUp", "postExecute", "postOpen", "postPrint", "postSave", "postSign", "postSubmit", "preExecute", "preOpen", "prePrint", "preSave", "preSign", "preSubmit", "ready", "validationState"]);
+    this.id = attributes.id || "";
+    this.listen = (0, _utils.getStringOption)(attributes.listen, ["refOnly", "refAndDescendents"]);
+    this.name = attributes.name || "";
+    this.ref = attributes.ref || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.encryptData = null;
+    this.execute = null;
+    this.script = null;
+    this.signData = null;
+    this.submit = null;
+  }
+
+}
+
+class ExData extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "exData");
+    this.contentType = attributes.contentType || "";
+    this.href = attributes.href || "";
+    this.id = attributes.id || "";
+    this.maxLength = (0, _utils.getInteger)({
+      data: attributes.maxLength,
+      defaultValue: -1,
+      validate: x => x >= -1
+    });
+    this.name = attributes.name || "";
+    this.rid = attributes.rid || "";
+    this.transferEncoding = (0, _utils.getStringOption)(attributes.transferEncoding, ["none", "base64", "package"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$isCDATAXml]() {
+    return this.contentType === "text/html";
+  }
+
+  [_xfa_object.$onChild](child) {
+    if (this.contentType === "text/html" && child[_xfa_object.$namespaceId] === _namespaces.NamespaceIds.xhtml.id) {
+      this[_xfa_object.$content] = child;
+      return true;
+    }
+
+    if (this.contentType === "text/xml") {
+      this[_xfa_object.$content] = child;
+      return true;
+    }
+
+    return false;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    if (this.contentType !== "text/html" || !this[_xfa_object.$content]) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    return this[_xfa_object.$content][_xfa_object.$toHTML](availableSpace);
+  }
+
+}
+
+class ExObject extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "exObject", true);
+    this.archive = attributes.archive || "";
+    this.classId = attributes.classId || "";
+    this.codeBase = attributes.codeBase || "";
+    this.codeType = attributes.codeType || "";
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.boolean = new _xfa_object.XFAObjectArray();
+    this.date = new _xfa_object.XFAObjectArray();
+    this.dateTime = new _xfa_object.XFAObjectArray();
+    this.decimal = new _xfa_object.XFAObjectArray();
+    this.exData = new _xfa_object.XFAObjectArray();
+    this.exObject = new _xfa_object.XFAObjectArray();
+    this.float = new _xfa_object.XFAObjectArray();
+    this.image = new _xfa_object.XFAObjectArray();
+    this.integer = new _xfa_object.XFAObjectArray();
+    this.text = new _xfa_object.XFAObjectArray();
+    this.time = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class ExclGroup extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "exclGroup", true);
+    this.access = (0, _utils.getStringOption)(attributes.access, ["open", "nonInteractive", "protected", "readOnly"]);
+    this.accessKey = attributes.accessKey || "";
+    this.anchorType = (0, _utils.getStringOption)(attributes.anchorType, ["topLeft", "bottomCenter", "bottomLeft", "bottomRight", "middleCenter", "middleLeft", "middleRight", "topCenter", "topRight"]);
+    this.colSpan = (0, _utils.getInteger)({
+      data: attributes.colSpan,
+      defaultValue: 1,
+      validate: n => n >= 1 || n === -1
+    });
+    this.h = attributes.h ? (0, _utils.getMeasurement)(attributes.h) : "";
+    this.hAlign = (0, _utils.getStringOption)(attributes.hAlign, ["left", "center", "justify", "justifyAll", "radix", "right"]);
+    this.id = attributes.id || "";
+    this.layout = (0, _utils.getStringOption)(attributes.layout, ["position", "lr-tb", "rl-row", "rl-tb", "row", "table", "tb"]);
+    this.maxH = (0, _utils.getMeasurement)(attributes.maxH, "0pt");
+    this.maxW = (0, _utils.getMeasurement)(attributes.maxW, "0pt");
+    this.minH = (0, _utils.getMeasurement)(attributes.minH, "0pt");
+    this.minW = (0, _utils.getMeasurement)(attributes.minW, "0pt");
+    this.name = attributes.name || "";
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.w = attributes.w ? (0, _utils.getMeasurement)(attributes.w) : "";
+    this.x = (0, _utils.getMeasurement)(attributes.x, "0pt");
+    this.y = (0, _utils.getMeasurement)(attributes.y, "0pt");
+    this.assist = null;
+    this.bind = null;
+    this.border = null;
+    this.calculate = null;
+    this.caption = null;
+    this.desc = null;
+    this.extras = null;
+    this.margin = null;
+    this.para = null;
+    this.traversal = null;
+    this.validate = null;
+    this.connect = new _xfa_object.XFAObjectArray();
+    this.event = new _xfa_object.XFAObjectArray();
+    this.field = new _xfa_object.XFAObjectArray();
+    this.setProperty = new _xfa_object.XFAObjectArray();
+  }
+
+  [_xfa_object.$isBindable]() {
+    return true;
+  }
+
+  [_xfa_object.$hasSettableValue]() {
+    return true;
+  }
+
+  [_xfa_object.$setValue](value) {
+    for (const field of this.field.children) {
+      if (!field.value) {
+        const nodeValue = new Value({});
+
+        field[_xfa_object.$appendChild](nodeValue);
+
+        field.value = nodeValue;
+      }
+
+      field.value[_xfa_object.$setValue](value);
+    }
+  }
+
+  [_xfa_object.$isThereMoreWidth]() {
+    return this.layout.endsWith("-tb") && this[_xfa_object.$extra].attempt === 0 && this[_xfa_object.$extra].numberInLine > 0 || this[_xfa_object.$getParent]()[_xfa_object.$isThereMoreWidth]();
+  }
+
+  [_xfa_object.$isSplittable]() {
+    const parent = this[_xfa_object.$getSubformParent]();
+
+    if (!parent[_xfa_object.$isSplittable]()) {
+      return false;
+    }
+
+    if (this[_xfa_object.$extra]._isSplittable !== undefined) {
+      return this[_xfa_object.$extra]._isSplittable;
+    }
+
+    if (this.layout === "position" || this.layout.includes("row")) {
+      this[_xfa_object.$extra]._isSplittable = false;
+      return false;
+    }
+
+    if (parent.layout && parent.layout.endsWith("-tb") && parent[_xfa_object.$extra].numberInLine !== 0) {
+      return false;
+    }
+
+    this[_xfa_object.$extra]._isSplittable = true;
+    return true;
+  }
+
+  [_xfa_object.$flushHTML]() {
+    return (0, _layout.flushHTML)(this);
+  }
+
+  [_xfa_object.$addHTML](html, bbox) {
+    (0, _layout.addHTML)(this, html, bbox);
+  }
+
+  [_xfa_object.$getAvailableSpace]() {
+    return (0, _layout.getAvailableSpace)(this);
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    setTabIndex(this);
+
+    if (this.presence === "hidden" || this.presence === "inactive" || this.h === 0 || this.w === 0) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    (0, _html_utils.fixDimensions)(this);
+    const children = [];
+    const attributes = {
+      id: this[_xfa_object.$uid],
+      class: []
+    };
+    (0, _html_utils.setAccess)(this, attributes.class);
+
+    if (!this[_xfa_object.$extra]) {
+      this[_xfa_object.$extra] = Object.create(null);
+    }
+
+    Object.assign(this[_xfa_object.$extra], {
+      children,
+      attributes,
+      attempt: 0,
+      line: null,
+      numberInLine: 0,
+      availableSpace: {
+        width: Math.min(this.w || Infinity, availableSpace.width),
+        height: Math.min(this.h || Infinity, availableSpace.height)
+      },
+      width: 0,
+      height: 0,
+      prevHeight: 0,
+      currentWidth: 0
+    });
+
+    const isSplittable = this[_xfa_object.$isSplittable]();
+
+    if (!isSplittable) {
+      setFirstUnsplittable(this);
+    }
+
+    if (!(0, _layout.checkDimensions)(this, availableSpace)) {
+      return _utils.HTMLResult.FAILURE;
+    }
+
+    const filter = new Set(["field"]);
+
+    if (this.layout.includes("row")) {
+      const columnWidths = this[_xfa_object.$getSubformParent]().columnWidths;
+
+      if (Array.isArray(columnWidths) && columnWidths.length > 0) {
+        this[_xfa_object.$extra].columnWidths = columnWidths;
+        this[_xfa_object.$extra].currentColumn = 0;
+      }
+    }
+
+    const style = (0, _html_utils.toStyle)(this, "anchorType", "dimensions", "position", "presence", "border", "margin", "hAlign");
+    const classNames = ["xfaExclgroup"];
+    const cl = (0, _html_utils.layoutClass)(this);
+
+    if (cl) {
+      classNames.push(cl);
+    }
+
+    if ((0, _html_utils.isPrintOnly)(this)) {
+      classNames.push("xfaPrintOnly");
+    }
+
+    attributes.style = style;
+    attributes.class = classNames;
+
+    if (this.name) {
+      attributes.xfaName = this.name;
+    }
+
+    this[_xfa_object.$pushPara]();
+
+    const isLrTb = this.layout === "lr-tb" || this.layout === "rl-tb";
+    const maxRun = isLrTb ? MAX_ATTEMPTS_FOR_LRTB_LAYOUT : 1;
+
+    for (; this[_xfa_object.$extra].attempt < maxRun; this[_xfa_object.$extra].attempt++) {
+      if (isLrTb && this[_xfa_object.$extra].attempt === MAX_ATTEMPTS_FOR_LRTB_LAYOUT - 1) {
+        this[_xfa_object.$extra].numberInLine = 0;
+      }
+
+      const result = this[_xfa_object.$childrenToHTML]({
+        filter,
+        include: true
+      });
+
+      if (result.success) {
+        break;
+      }
+
+      if (result.isBreak()) {
+        this[_xfa_object.$popPara]();
+
+        return result;
+      }
+
+      if (isLrTb && this[_xfa_object.$extra].attempt === 0 && this[_xfa_object.$extra].numberInLine === 0 && !this[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].noLayoutFailure) {
+        this[_xfa_object.$extra].attempt = maxRun;
+        break;
+      }
+    }
+
+    this[_xfa_object.$popPara]();
+
+    if (!isSplittable) {
+      unsetFirstUnsplittable(this);
+    }
+
+    if (this[_xfa_object.$extra].attempt === maxRun) {
+      if (!isSplittable) {
+        delete this[_xfa_object.$extra];
+      }
+
+      return _utils.HTMLResult.FAILURE;
+    }
+
+    let marginH = 0;
+    let marginV = 0;
+
+    if (this.margin) {
+      marginH = this.margin.leftInset + this.margin.rightInset;
+      marginV = this.margin.topInset + this.margin.bottomInset;
+    }
+
+    const width = Math.max(this[_xfa_object.$extra].width + marginH, this.w || 0);
+    const height = Math.max(this[_xfa_object.$extra].height + marginV, this.h || 0);
+    const bbox = [this.x, this.y, width, height];
+
+    if (this.w === "") {
+      style.width = (0, _html_utils.measureToString)(width);
+    }
+
+    if (this.h === "") {
+      style.height = (0, _html_utils.measureToString)(height);
+    }
+
+    const html = {
+      name: "div",
+      attributes,
+      children
+    };
+    applyAssist(this, attributes);
+    delete this[_xfa_object.$extra];
+    return _utils.HTMLResult.success((0, _html_utils.createWrapper)(this, html), bbox);
+  }
+
+}
+
+class Execute extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "execute");
+    this.connection = attributes.connection || "";
+    this.executeType = (0, _utils.getStringOption)(attributes.executeType, ["import", "remerge"]);
+    this.id = attributes.id || "";
+    this.runAt = (0, _utils.getStringOption)(attributes.runAt, ["client", "both", "server"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Extras extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "extras", true);
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.boolean = new _xfa_object.XFAObjectArray();
+    this.date = new _xfa_object.XFAObjectArray();
+    this.dateTime = new _xfa_object.XFAObjectArray();
+    this.decimal = new _xfa_object.XFAObjectArray();
+    this.exData = new _xfa_object.XFAObjectArray();
+    this.extras = new _xfa_object.XFAObjectArray();
+    this.float = new _xfa_object.XFAObjectArray();
+    this.image = new _xfa_object.XFAObjectArray();
+    this.integer = new _xfa_object.XFAObjectArray();
+    this.text = new _xfa_object.XFAObjectArray();
+    this.time = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Field extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "field", true);
+    this.access = (0, _utils.getStringOption)(attributes.access, ["open", "nonInteractive", "protected", "readOnly"]);
+    this.accessKey = attributes.accessKey || "";
+    this.anchorType = (0, _utils.getStringOption)(attributes.anchorType, ["topLeft", "bottomCenter", "bottomLeft", "bottomRight", "middleCenter", "middleLeft", "middleRight", "topCenter", "topRight"]);
+    this.colSpan = (0, _utils.getInteger)({
+      data: attributes.colSpan,
+      defaultValue: 1,
+      validate: n => n >= 1 || n === -1
+    });
+    this.h = attributes.h ? (0, _utils.getMeasurement)(attributes.h) : "";
+    this.hAlign = (0, _utils.getStringOption)(attributes.hAlign, ["left", "center", "justify", "justifyAll", "radix", "right"]);
+    this.id = attributes.id || "";
+    this.locale = attributes.locale || "";
+    this.maxH = (0, _utils.getMeasurement)(attributes.maxH, "0pt");
+    this.maxW = (0, _utils.getMeasurement)(attributes.maxW, "0pt");
+    this.minH = (0, _utils.getMeasurement)(attributes.minH, "0pt");
+    this.minW = (0, _utils.getMeasurement)(attributes.minW, "0pt");
+    this.name = attributes.name || "";
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.rotate = (0, _utils.getInteger)({
+      data: attributes.rotate,
+      defaultValue: 0,
+      validate: x => x % 90 === 0
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.w = attributes.w ? (0, _utils.getMeasurement)(attributes.w) : "";
+    this.x = (0, _utils.getMeasurement)(attributes.x, "0pt");
+    this.y = (0, _utils.getMeasurement)(attributes.y, "0pt");
+    this.assist = null;
+    this.bind = null;
+    this.border = null;
+    this.calculate = null;
+    this.caption = null;
+    this.desc = null;
+    this.extras = null;
+    this.font = null;
+    this.format = null;
+    this.items = new _xfa_object.XFAObjectArray(2);
+    this.keep = null;
+    this.margin = null;
+    this.para = null;
+    this.traversal = null;
+    this.ui = null;
+    this.validate = null;
+    this.value = null;
+    this.bindItems = new _xfa_object.XFAObjectArray();
+    this.connect = new _xfa_object.XFAObjectArray();
+    this.event = new _xfa_object.XFAObjectArray();
+    this.setProperty = new _xfa_object.XFAObjectArray();
+  }
+
+  [_xfa_object.$isBindable]() {
+    return true;
+  }
+
+  [_xfa_object.$setValue](value) {
+    _setValue(this, value);
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    setTabIndex(this);
+
+    if (!this.ui) {
+      this.ui = new Ui({});
+      this.ui[_xfa_object.$globalData] = this[_xfa_object.$globalData];
+
+      this[_xfa_object.$appendChild](this.ui);
+
+      let node;
+
+      switch (this.items.children.length) {
+        case 0:
+          node = new TextEdit({});
+          this.ui.textEdit = node;
+          break;
+
+        case 1:
+          node = new CheckButton({});
+          this.ui.checkButton = node;
+          break;
+
+        case 2:
+          node = new ChoiceList({});
+          this.ui.choiceList = node;
+          break;
+      }
+
+      this.ui[_xfa_object.$appendChild](node);
+    }
+
+    if (!this.ui || this.presence === "hidden" || this.presence === "inactive" || this.h === 0 || this.w === 0) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    if (this.caption) {
+      delete this.caption[_xfa_object.$extra];
+    }
+
+    this[_xfa_object.$pushPara]();
+
+    const caption = this.caption ? this.caption[_xfa_object.$toHTML](availableSpace).html : null;
+    const savedW = this.w;
+    const savedH = this.h;
+    let marginH = 0;
+    let marginV = 0;
+
+    if (this.margin) {
+      marginH = this.margin.leftInset + this.margin.rightInset;
+      marginV = this.margin.topInset + this.margin.bottomInset;
+    }
+
+    let borderDims = null;
+
+    if (this.w === "" || this.h === "") {
+      let width = null;
+      let height = null;
+      let uiW = 0;
+      let uiH = 0;
+
+      if (this.ui.checkButton) {
+        uiW = uiH = this.ui.checkButton.size;
+      } else {
+        const {
+          w,
+          h
+        } = (0, _html_utils.layoutNode)(this, availableSpace);
+
+        if (w !== null) {
+          uiW = w;
+          uiH = h;
+        } else {
+          uiH = (0, _fonts.getMetrics)(this.font, true).lineNoGap;
+        }
+      }
+
+      borderDims = getBorderDims(this.ui[_xfa_object.$getExtra]());
+      uiW += borderDims.w;
+      uiH += borderDims.h;
+
+      if (this.caption) {
+        const {
+          w,
+          h,
+          isBroken
+        } = this.caption[_xfa_object.$getExtra](availableSpace);
+
+        if (isBroken && this[_xfa_object.$getSubformParent]()[_xfa_object.$isThereMoreWidth]()) {
+          this[_xfa_object.$popPara]();
+
+          return _utils.HTMLResult.FAILURE;
+        }
+
+        width = w;
+        height = h;
+
+        switch (this.caption.placement) {
+          case "left":
+          case "right":
+          case "inline":
+            width += uiW;
+            break;
+
+          case "top":
+          case "bottom":
+            height += uiH;
+            break;
+        }
+      } else {
+        width = uiW;
+        height = uiH;
+      }
+
+      if (width && this.w === "") {
+        width += marginH;
+        this.w = Math.min(this.maxW <= 0 ? Infinity : this.maxW, this.minW + 1 < width ? width : this.minW);
+      }
+
+      if (height && this.h === "") {
+        height += marginV;
+        this.h = Math.min(this.maxH <= 0 ? Infinity : this.maxH, this.minH + 1 < height ? height : this.minH);
+      }
+    }
+
+    this[_xfa_object.$popPara]();
+
+    (0, _html_utils.fixDimensions)(this);
+    setFirstUnsplittable(this);
+
+    if (!(0, _layout.checkDimensions)(this, availableSpace)) {
+      this.w = savedW;
+      this.h = savedH;
+
+      this[_xfa_object.$popPara]();
+
+      return _utils.HTMLResult.FAILURE;
+    }
+
+    unsetFirstUnsplittable(this);
+    const style = (0, _html_utils.toStyle)(this, "font", "dimensions", "position", "rotate", "anchorType", "presence", "margin", "hAlign");
+    (0, _html_utils.setMinMaxDimensions)(this, style);
+    const classNames = ["xfaField"];
+
+    if (this.font) {
+      classNames.push("xfaFont");
+    }
+
+    if ((0, _html_utils.isPrintOnly)(this)) {
+      classNames.push("xfaPrintOnly");
+    }
+
+    const attributes = {
+      style,
+      id: this[_xfa_object.$uid],
+      class: classNames
+    };
+
+    if (style.margin) {
+      style.padding = style.margin;
+      delete style.margin;
+    }
+
+    (0, _html_utils.setAccess)(this, classNames);
+
+    if (this.name) {
+      attributes.xfaName = this.name;
+    }
+
+    const children = [];
+    const html = {
+      name: "div",
+      attributes,
+      children
+    };
+    applyAssist(this, attributes);
+    const borderStyle = this.border ? this.border[_xfa_object.$toStyle]() : null;
+    const bbox = (0, _html_utils.computeBbox)(this, html, availableSpace);
+
+    const ui = this.ui[_xfa_object.$toHTML]().html;
+
+    if (!ui) {
+      Object.assign(style, borderStyle);
+      return _utils.HTMLResult.success((0, _html_utils.createWrapper)(this, html), bbox);
+    }
+
+    if (this[_xfa_object.$tabIndex]) {
+      if (ui.children && ui.children[0]) {
+        ui.children[0].attributes.tabindex = this[_xfa_object.$tabIndex];
+      } else {
+        ui.attributes.tabindex = this[_xfa_object.$tabIndex];
+      }
+    }
+
+    if (!ui.attributes.style) {
+      ui.attributes.style = Object.create(null);
+    }
+
+    let aElement = null;
+
+    if (this.ui.button) {
+      if (ui.children.length === 1) {
+        [aElement] = ui.children.splice(0, 1);
+      }
+
+      Object.assign(ui.attributes.style, borderStyle);
+    } else {
+      Object.assign(style, borderStyle);
+    }
+
+    children.push(ui);
+
+    if (this.value) {
+      if (this.ui.imageEdit) {
+        ui.children.push(this.value[_xfa_object.$toHTML]().html);
+      } else if (!this.ui.button) {
+        let value = "";
+
+        if (this.value.exData) {
+          value = this.value.exData[_xfa_object.$text]();
+        } else if (this.value.text) {
+          value = this.value.text[_xfa_object.$getExtra]();
+        } else {
+          const htmlValue = this.value[_xfa_object.$toHTML]().html;
+
+          if (htmlValue !== null) {
+            value = htmlValue.children[0].value;
+          }
+        }
+
+        if (this.ui.textEdit && this.value.text && this.value.text.maxChars) {
+          ui.children[0].attributes.maxLength = this.value.text.maxChars;
+        }
+
+        if (value) {
+          if (this.ui.numericEdit) {
+            value = parseFloat(value);
+            value = isNaN(value) ? "" : value.toString();
+          }
+
+          if (ui.children[0].name === "textarea") {
+            ui.children[0].attributes.textContent = value;
+          } else {
+            ui.children[0].attributes.value = value;
+          }
+        }
+      }
+    }
+
+    if (!this.ui.imageEdit && ui.children && ui.children[0] && this.h) {
+      borderDims = borderDims || getBorderDims(this.ui[_xfa_object.$getExtra]());
+      let captionHeight = 0;
+
+      if (this.caption && ["top", "bottom"].includes(this.caption.placement)) {
+        captionHeight = this.caption.reserve;
+
+        if (captionHeight <= 0) {
+          captionHeight = this.caption[_xfa_object.$getExtra](availableSpace).h;
+        }
+
+        const inputHeight = this.h - captionHeight - marginV - borderDims.h;
+        ui.children[0].attributes.style.height = (0, _html_utils.measureToString)(inputHeight);
+      } else {
+        ui.children[0].attributes.style.height = "100%";
+      }
+    }
+
+    if (aElement) {
+      ui.children.push(aElement);
+    }
+
+    if (!caption) {
+      if (ui.attributes.class) {
+        ui.attributes.class.push("xfaLeft");
+      }
+
+      this.w = savedW;
+      this.h = savedH;
+      return _utils.HTMLResult.success((0, _html_utils.createWrapper)(this, html), bbox);
+    }
+
+    if (this.ui.button) {
+      if (style.padding) {
+        delete style.padding;
+      }
+
+      if (caption.name === "div") {
+        caption.name = "span";
+      }
+
+      ui.children.push(caption);
+      return _utils.HTMLResult.success(html, bbox);
+    } else if (this.ui.checkButton) {
+      caption.attributes.class[0] = "xfaCaptionForCheckButton";
+    }
+
+    if (!ui.attributes.class) {
+      ui.attributes.class = [];
+    }
+
+    ui.children.splice(0, 0, caption);
+
+    switch (this.caption.placement) {
+      case "left":
+        ui.attributes.class.push("xfaLeft");
+        break;
+
+      case "right":
+        ui.attributes.class.push("xfaRight");
+        break;
+
+      case "top":
+        ui.attributes.class.push("xfaTop");
+        break;
+
+      case "bottom":
+        ui.attributes.class.push("xfaBottom");
+        break;
+
+      case "inline":
+        ui.attributes.class.push("xfaLeft");
+        break;
+    }
+
+    this.w = savedW;
+    this.h = savedH;
+    return _utils.HTMLResult.success((0, _html_utils.createWrapper)(this, html), bbox);
+  }
+
+}
+
+exports.Field = Field;
+
+class Fill extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "fill", true);
+    this.id = attributes.id || "";
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.color = null;
+    this.extras = null;
+    this.linear = null;
+    this.pattern = null;
+    this.radial = null;
+    this.solid = null;
+    this.stipple = null;
+  }
+
+  [_xfa_object.$toStyle]() {
+    const parent = this[_xfa_object.$getParent]();
+
+    const grandpa = parent[_xfa_object.$getParent]();
+
+    const ggrandpa = grandpa[_xfa_object.$getParent]();
+
+    const style = Object.create(null);
+    let propName = "color";
+    let altPropName = propName;
+
+    if (parent instanceof Border) {
+      propName = "background-color";
+      altPropName = "background";
+
+      if (ggrandpa instanceof Ui) {
+        style.backgroundColor = "white";
+      }
+    }
+
+    if (parent instanceof Rectangle || parent instanceof Arc) {
+      propName = altPropName = "fill";
+      style.fill = "white";
+    }
+
+    for (const name of Object.getOwnPropertyNames(this)) {
+      if (name === "extras" || name === "color") {
+        continue;
+      }
+
+      const obj = this[name];
+
+      if (!(obj instanceof _xfa_object.XFAObject)) {
+        continue;
+      }
+
+      const color = obj[_xfa_object.$toStyle](this.color);
+
+      if (color) {
+        style[color.startsWith("#") ? propName : altPropName] = color;
+      }
+
+      return style;
+    }
+
+    if (this.color && this.color.value) {
+      const color = this.color[_xfa_object.$toStyle]();
+
+      style[color.startsWith("#") ? propName : altPropName] = color;
+    }
+
+    return style;
+  }
+
+}
+
+class Filter extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "filter", true);
+    this.addRevocationInfo = (0, _utils.getStringOption)(attributes.addRevocationInfo, ["", "required", "optional", "none"]);
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.version = (0, _utils.getInteger)({
+      data: this.version,
+      defaultValue: 5,
+      validate: x => x >= 1 && x <= 5
+    });
+    this.appearanceFilter = null;
+    this.certificates = null;
+    this.digestMethods = null;
+    this.encodings = null;
+    this.encryptionMethods = null;
+    this.handler = null;
+    this.lockDocument = null;
+    this.mdp = null;
+    this.reasons = null;
+    this.timeStamp = null;
+  }
+
+}
+
+class Float extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "float");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$finalize]() {
+    const number = parseFloat(this[_xfa_object.$content].trim());
+    this[_xfa_object.$content] = isNaN(number) ? null : number;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    return valueToHtml(this[_xfa_object.$content] !== null ? this[_xfa_object.$content].toString() : "");
+  }
+
+}
+
+class Font extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "font", true);
+    this.baselineShift = (0, _utils.getMeasurement)(attributes.baselineShift);
+    this.fontHorizontalScale = (0, _utils.getFloat)({
+      data: attributes.fontHorizontalScale,
+      defaultValue: 100,
+      validate: x => x >= 0
+    });
+    this.fontVerticalScale = (0, _utils.getFloat)({
+      data: attributes.fontVerticalScale,
+      defaultValue: 100,
+      validate: x => x >= 0
+    });
+    this.id = attributes.id || "";
+    this.kerningMode = (0, _utils.getStringOption)(attributes.kerningMode, ["none", "pair"]);
+    this.letterSpacing = (0, _utils.getMeasurement)(attributes.letterSpacing, "0");
+    this.lineThrough = (0, _utils.getInteger)({
+      data: attributes.lineThrough,
+      defaultValue: 0,
+      validate: x => x === 1 || x === 2
+    });
+    this.lineThroughPeriod = (0, _utils.getStringOption)(attributes.lineThroughPeriod, ["all", "word"]);
+    this.overline = (0, _utils.getInteger)({
+      data: attributes.overline,
+      defaultValue: 0,
+      validate: x => x === 1 || x === 2
+    });
+    this.overlinePeriod = (0, _utils.getStringOption)(attributes.overlinePeriod, ["all", "word"]);
+    this.posture = (0, _utils.getStringOption)(attributes.posture, ["normal", "italic"]);
+    this.size = (0, _utils.getMeasurement)(attributes.size, "10pt");
+    this.typeface = attributes.typeface || "Courier";
+    this.underline = (0, _utils.getInteger)({
+      data: attributes.underline,
+      defaultValue: 0,
+      validate: x => x === 1 || x === 2
+    });
+    this.underlinePeriod = (0, _utils.getStringOption)(attributes.underlinePeriod, ["all", "word"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.weight = (0, _utils.getStringOption)(attributes.weight, ["normal", "bold"]);
+    this.extras = null;
+    this.fill = null;
+  }
+
+  [_xfa_object.$clean](builder) {
+    super[_xfa_object.$clean](builder);
+
+    this[_xfa_object.$globalData].usedTypefaces.add(this.typeface);
+  }
+
+  [_xfa_object.$toStyle]() {
+    const style = (0, _html_utils.toStyle)(this, "fill");
+    const color = style.color;
+
+    if (color) {
+      if (color === "#000000") {
+        delete style.color;
+      } else if (!color.startsWith("#")) {
+        style.background = color;
+        style.backgroundClip = "text";
+        style.color = "transparent";
+      }
+    }
+
+    if (this.baselineShift) {
+      style.verticalAlign = (0, _html_utils.measureToString)(this.baselineShift);
+    }
+
+    style.fontKerning = this.kerningMode === "none" ? "none" : "normal";
+    style.letterSpacing = (0, _html_utils.measureToString)(this.letterSpacing);
+
+    if (this.lineThrough !== 0) {
+      style.textDecoration = "line-through";
+
+      if (this.lineThrough === 2) {
+        style.textDecorationStyle = "double";
+      }
+    }
+
+    if (this.overline !== 0) {
+      style.textDecoration = "overline";
+
+      if (this.overline === 2) {
+        style.textDecorationStyle = "double";
+      }
+    }
+
+    style.fontStyle = this.posture;
+    style.fontSize = (0, _html_utils.measureToString)(0.99 * this.size);
+    (0, _html_utils.setFontFamily)(this, this, this[_xfa_object.$globalData].fontFinder, style);
+
+    if (this.underline !== 0) {
+      style.textDecoration = "underline";
+
+      if (this.underline === 2) {
+        style.textDecorationStyle = "double";
+      }
+    }
+
+    style.fontWeight = this.weight;
+    return style;
+  }
+
+}
+
+class Format extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "format", true);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.picture = null;
+  }
+
+}
+
+class Handler extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "handler");
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Hyphenation extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "hyphenation");
+    this.excludeAllCaps = (0, _utils.getInteger)({
+      data: attributes.excludeAllCaps,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.excludeInitialCap = (0, _utils.getInteger)({
+      data: attributes.excludeInitialCap,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.hyphenate = (0, _utils.getInteger)({
+      data: attributes.hyphenate,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.id = attributes.id || "";
+    this.pushCharacterCount = (0, _utils.getInteger)({
+      data: attributes.pushCharacterCount,
+      defaultValue: 3,
+      validate: x => x >= 0
+    });
+    this.remainCharacterCount = (0, _utils.getInteger)({
+      data: attributes.remainCharacterCount,
+      defaultValue: 3,
+      validate: x => x >= 0
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.wordCharacterCount = (0, _utils.getInteger)({
+      data: attributes.wordCharacterCount,
+      defaultValue: 7,
+      validate: x => x >= 0
+    });
+  }
+
+}
+
+class Image extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "image");
+    this.aspect = (0, _utils.getStringOption)(attributes.aspect, ["fit", "actual", "height", "none", "width"]);
+    this.contentType = attributes.contentType || "";
+    this.href = attributes.href || "";
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.transferEncoding = (0, _utils.getStringOption)(attributes.transferEncoding, ["base64", "none", "package"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$toHTML]() {
+    if (this.contentType && !MIMES.has(this.contentType.toLowerCase())) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    let buffer = this[_xfa_object.$globalData].images && this[_xfa_object.$globalData].images.get(this.href);
+
+    if (!buffer && (this.href || !this[_xfa_object.$content])) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    if (!buffer && this.transferEncoding === "base64") {
+      buffer = (0, _util.stringToBytes)(atob(this[_xfa_object.$content]));
+    }
+
+    if (!buffer) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    if (!this.contentType) {
+      for (const [header, type] of IMAGES_HEADERS) {
+        if (buffer.length > header.length && header.every((x, i) => x === buffer[i])) {
+          this.contentType = type;
+          break;
+        }
+      }
+
+      if (!this.contentType) {
+        return _utils.HTMLResult.EMPTY;
+      }
+    }
+
+    const blob = new Blob([buffer], {
+      type: this.contentType
+    });
+    let style;
+
+    switch (this.aspect) {
+      case "fit":
+      case "actual":
+        break;
+
+      case "height":
+        style = {
+          height: "100%",
+          objectFit: "fill"
+        };
+        break;
+
+      case "none":
+        style = {
+          width: "100%",
+          height: "100%",
+          objectFit: "fill"
+        };
+        break;
+
+      case "width":
+        style = {
+          width: "100%",
+          objectFit: "fill"
+        };
+        break;
+    }
+
+    const parent = this[_xfa_object.$getParent]();
+
+    return _utils.HTMLResult.success({
+      name: "img",
+      attributes: {
+        class: ["xfaImage"],
+        style,
+        src: URL.createObjectURL(blob),
+        alt: parent ? ariaLabel(parent[_xfa_object.$getParent]()) : null
+      }
+    });
+  }
+
+}
+
+class ImageEdit extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "imageEdit", true);
+    this.data = (0, _utils.getStringOption)(attributes.data, ["link", "embed"]);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.border = null;
+    this.extras = null;
+    this.margin = null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    if (this.data === "embed") {
+      return _utils.HTMLResult.success({
+        name: "div",
+        children: [],
+        attributes: {}
+      });
+    }
+
+    return _utils.HTMLResult.EMPTY;
+  }
+
+}
+
+class Integer extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "integer");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$finalize]() {
+    const number = parseInt(this[_xfa_object.$content].trim(), 10);
+    this[_xfa_object.$content] = isNaN(number) ? null : number;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    return valueToHtml(this[_xfa_object.$content] !== null ? this[_xfa_object.$content].toString() : "");
+  }
+
+}
+
+class Issuers extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "issuers", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.certificate = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Items extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "items", true);
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.ref = attributes.ref || "";
+    this.save = (0, _utils.getInteger)({
+      data: attributes.save,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.boolean = new _xfa_object.XFAObjectArray();
+    this.date = new _xfa_object.XFAObjectArray();
+    this.dateTime = new _xfa_object.XFAObjectArray();
+    this.decimal = new _xfa_object.XFAObjectArray();
+    this.exData = new _xfa_object.XFAObjectArray();
+    this.float = new _xfa_object.XFAObjectArray();
+    this.image = new _xfa_object.XFAObjectArray();
+    this.integer = new _xfa_object.XFAObjectArray();
+    this.text = new _xfa_object.XFAObjectArray();
+    this.time = new _xfa_object.XFAObjectArray();
+  }
+
+  [_xfa_object.$toHTML]() {
+    const output = [];
+
+    for (const child of this[_xfa_object.$getChildren]()) {
+      output.push(child[_xfa_object.$text]());
+    }
+
+    return _utils.HTMLResult.success(output);
+  }
+
+}
+
+exports.Items = Items;
+
+class Keep extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "keep", true);
+    this.id = attributes.id || "";
+    const options = ["none", "contentArea", "pageArea"];
+    this.intact = (0, _utils.getStringOption)(attributes.intact, options);
+    this.next = (0, _utils.getStringOption)(attributes.next, options);
+    this.previous = (0, _utils.getStringOption)(attributes.previous, options);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+  }
+
+}
+
+class KeyUsage extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "keyUsage");
+    const options = ["", "yes", "no"];
+    this.crlSign = (0, _utils.getStringOption)(attributes.crlSign, options);
+    this.dataEncipherment = (0, _utils.getStringOption)(attributes.dataEncipherment, options);
+    this.decipherOnly = (0, _utils.getStringOption)(attributes.decipherOnly, options);
+    this.digitalSignature = (0, _utils.getStringOption)(attributes.digitalSignature, options);
+    this.encipherOnly = (0, _utils.getStringOption)(attributes.encipherOnly, options);
+    this.id = attributes.id || "";
+    this.keyAgreement = (0, _utils.getStringOption)(attributes.keyAgreement, options);
+    this.keyCertSign = (0, _utils.getStringOption)(attributes.keyCertSign, options);
+    this.keyEncipherment = (0, _utils.getStringOption)(attributes.keyEncipherment, options);
+    this.nonRepudiation = (0, _utils.getStringOption)(attributes.nonRepudiation, options);
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Line extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "line", true);
+    this.hand = (0, _utils.getStringOption)(attributes.hand, ["even", "left", "right"]);
+    this.id = attributes.id || "";
+    this.slope = (0, _utils.getStringOption)(attributes.slope, ["\\", "/"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.edge = null;
+  }
+
+  [_xfa_object.$toHTML]() {
+    const parent = this[_xfa_object.$getParent]()[_xfa_object.$getParent]();
+
+    const edge = this.edge || new Edge({});
+
+    const edgeStyle = edge[_xfa_object.$toStyle]();
+
+    const style = Object.create(null);
+    const thickness = edge.presence === "visible" ? edge.thickness : 0;
+    style.strokeWidth = (0, _html_utils.measureToString)(thickness);
+    style.stroke = edgeStyle.color;
+    let x1, y1, x2, y2;
+    let width = "100%";
+    let height = "100%";
+
+    if (parent.w <= thickness) {
+      [x1, y1, x2, y2] = ["50%", 0, "50%", "100%"];
+      width = style.strokeWidth;
+    } else if (parent.h <= thickness) {
+      [x1, y1, x2, y2] = [0, "50%", "100%", "50%"];
+      height = style.strokeWidth;
+    } else {
+      if (this.slope === "\\") {
+        [x1, y1, x2, y2] = [0, 0, "100%", "100%"];
+      } else {
+        [x1, y1, x2, y2] = [0, "100%", "100%", 0];
+      }
+    }
+
+    const line = {
+      name: "line",
+      attributes: {
+        xmlns: SVG_NS,
+        x1,
+        y1,
+        x2,
+        y2,
+        style
+      }
+    };
+    const svg = {
+      name: "svg",
+      children: [line],
+      attributes: {
+        xmlns: SVG_NS,
+        width,
+        height,
+        style: {
+          overflow: "visible"
+        }
+      }
+    };
+
+    if (hasMargin(parent)) {
+      return _utils.HTMLResult.success({
+        name: "div",
+        attributes: {
+          style: {
+            display: "inline",
+            width: "100%",
+            height: "100%"
+          }
+        },
+        children: [svg]
+      });
+    }
+
+    svg.attributes.style.position = "absolute";
+    return _utils.HTMLResult.success(svg);
+  }
+
+}
+
+class Linear extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "linear", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["toRight", "toBottom", "toLeft", "toTop"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.color = null;
+    this.extras = null;
+  }
+
+  [_xfa_object.$toStyle](startColor) {
+    startColor = startColor ? startColor[_xfa_object.$toStyle]() : "#FFFFFF";
+    const transf = this.type.replace(/([RBLT])/, " $1").toLowerCase();
+    const endColor = this.color ? this.color[_xfa_object.$toStyle]() : "#000000";
+    return `linear-gradient(${transf}, ${startColor}, ${endColor})`;
+  }
+
+}
+
+class LockDocument extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "lockDocument");
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$finalize]() {
+    this[_xfa_object.$content] = (0, _utils.getStringOption)(this[_xfa_object.$content], ["auto", "0", "1"]);
+  }
+
+}
+
+class Manifest extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "manifest", true);
+    this.action = (0, _utils.getStringOption)(attributes.action, ["include", "all", "exclude"]);
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.ref = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Margin extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "margin", true);
+    this.bottomInset = (0, _utils.getMeasurement)(attributes.bottomInset, "0");
+    this.id = attributes.id || "";
+    this.leftInset = (0, _utils.getMeasurement)(attributes.leftInset, "0");
+    this.rightInset = (0, _utils.getMeasurement)(attributes.rightInset, "0");
+    this.topInset = (0, _utils.getMeasurement)(attributes.topInset, "0");
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+  }
+
+  [_xfa_object.$toStyle]() {
+    return {
+      margin: (0, _html_utils.measureToString)(this.topInset) + " " + (0, _html_utils.measureToString)(this.rightInset) + " " + (0, _html_utils.measureToString)(this.bottomInset) + " " + (0, _html_utils.measureToString)(this.leftInset)
+    };
+  }
+
+}
+
+class Mdp extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "mdp");
+    this.id = attributes.id || "";
+    this.permissions = (0, _utils.getInteger)({
+      data: attributes.permissions,
+      defaultValue: 2,
+      validate: x => x === 1 || x === 3
+    });
+    this.signatureType = (0, _utils.getStringOption)(attributes.signatureType, ["filler", "author"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Medium extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "medium");
+    this.id = attributes.id || "";
+    this.imagingBBox = (0, _utils.getBBox)(attributes.imagingBBox);
+    this.long = (0, _utils.getMeasurement)(attributes.long);
+    this.orientation = (0, _utils.getStringOption)(attributes.orientation, ["portrait", "landscape"]);
+    this.short = (0, _utils.getMeasurement)(attributes.short);
+    this.stock = attributes.stock || "";
+    this.trayIn = (0, _utils.getStringOption)(attributes.trayIn, ["auto", "delegate", "pageFront"]);
+    this.trayOut = (0, _utils.getStringOption)(attributes.trayOut, ["auto", "delegate"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Message extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "message", true);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.text = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class NumericEdit extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "numericEdit", true);
+    this.hScrollPolicy = (0, _utils.getStringOption)(attributes.hScrollPolicy, ["auto", "off", "on"]);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.border = null;
+    this.comb = null;
+    this.extras = null;
+    this.margin = null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const style = (0, _html_utils.toStyle)(this, "border", "font", "margin");
+
+    const field = this[_xfa_object.$getParent]()[_xfa_object.$getParent]();
+
+    const html = {
+      name: "input",
+      attributes: {
+        type: "text",
+        fieldId: field[_xfa_object.$uid],
+        dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
+        class: ["xfaTextfield"],
+        style,
+        "aria-label": ariaLabel(field),
+        "aria-required": false
+      }
+    };
+
+    if (isRequired(field)) {
+      html.attributes["aria-required"] = true;
+      html.attributes.required = true;
+    }
+
+    return _utils.HTMLResult.success({
+      name: "label",
+      attributes: {
+        class: ["xfaLabel"]
+      },
+      children: [html]
+    });
+  }
+
+}
+
+class Occur extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "occur", true);
+    this.id = attributes.id || "";
+    this.initial = attributes.initial !== "" ? (0, _utils.getInteger)({
+      data: attributes.initial,
+      defaultValue: "",
+      validate: x => true
+    }) : "";
+    this.max = attributes.max !== "" ? (0, _utils.getInteger)({
+      data: attributes.max,
+      defaultValue: 1,
+      validate: x => true
+    }) : "";
+    this.min = attributes.min !== "" ? (0, _utils.getInteger)({
+      data: attributes.min,
+      defaultValue: 1,
+      validate: x => true
+    }) : "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+  }
+
+  [_xfa_object.$clean]() {
+    const parent = this[_xfa_object.$getParent]();
+
+    const originalMin = this.min;
+
+    if (this.min === "") {
+      this.min = parent instanceof PageArea || parent instanceof PageSet ? 0 : 1;
+    }
+
+    if (this.max === "") {
+      if (originalMin === "") {
+        this.max = parent instanceof PageArea || parent instanceof PageSet ? -1 : 1;
+      } else {
+        this.max = this.min;
+      }
+    }
+
+    if (this.max !== -1 && this.max < this.min) {
+      this.max = this.min;
+    }
+
+    if (this.initial === "") {
+      this.initial = parent instanceof Template ? 1 : this.min;
+    }
+  }
+
+}
+
+class Oid extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "oid");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Oids extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "oids", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.oid = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Overflow extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "overflow");
+    this.id = attributes.id || "";
+    this.leader = attributes.leader || "";
+    this.target = attributes.target || "";
+    this.trailer = attributes.trailer || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$getExtra]() {
+    if (!this[_xfa_object.$extra]) {
+      const parent = this[_xfa_object.$getParent]();
+
+      const root = this[_xfa_object.$getTemplateRoot]();
+
+      const target = root[_xfa_object.$searchNode](this.target, parent);
+
+      const leader = root[_xfa_object.$searchNode](this.leader, parent);
+
+      const trailer = root[_xfa_object.$searchNode](this.trailer, parent);
+
+      this[_xfa_object.$extra] = {
+        target: target && target[0] || null,
+        leader: leader && leader[0] || null,
+        trailer: trailer && trailer[0] || null,
+        addLeader: false,
+        addTrailer: false
+      };
+    }
+
+    return this[_xfa_object.$extra];
+  }
+
+}
+
+class PageArea extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "pageArea", true);
+    this.blankOrNotBlank = (0, _utils.getStringOption)(attributes.blankOrNotBlank, ["any", "blank", "notBlank"]);
+    this.id = attributes.id || "";
+    this.initialNumber = (0, _utils.getInteger)({
+      data: attributes.initialNumber,
+      defaultValue: 1,
+      validate: x => true
+    });
+    this.name = attributes.name || "";
+    this.numbered = (0, _utils.getInteger)({
+      data: attributes.numbered,
+      defaultValue: 1,
+      validate: x => true
+    });
+    this.oddOrEven = (0, _utils.getStringOption)(attributes.oddOrEven, ["any", "even", "odd"]);
+    this.pagePosition = (0, _utils.getStringOption)(attributes.pagePosition, ["any", "first", "last", "only", "rest"]);
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.desc = null;
+    this.extras = null;
+    this.medium = null;
+    this.occur = null;
+    this.area = new _xfa_object.XFAObjectArray();
+    this.contentArea = new _xfa_object.XFAObjectArray();
+    this.draw = new _xfa_object.XFAObjectArray();
+    this.exclGroup = new _xfa_object.XFAObjectArray();
+    this.field = new _xfa_object.XFAObjectArray();
+    this.subform = new _xfa_object.XFAObjectArray();
+  }
+
+  [_xfa_object.$isUsable]() {
+    if (!this[_xfa_object.$extra]) {
+      this[_xfa_object.$extra] = {
+        numberOfUse: 0
+      };
+      return true;
+    }
+
+    return !this.occur || this.occur.max === -1 || this[_xfa_object.$extra].numberOfUse < this.occur.max;
+  }
+
+  [_xfa_object.$cleanPage]() {
+    delete this[_xfa_object.$extra];
+  }
+
+  [_xfa_object.$getNextPage]() {
+    if (!this[_xfa_object.$extra]) {
+      this[_xfa_object.$extra] = {
+        numberOfUse: 0
+      };
+    }
+
+    const parent = this[_xfa_object.$getParent]();
+
+    if (parent.relation === "orderedOccurrence") {
+      if (this[_xfa_object.$isUsable]()) {
+        this[_xfa_object.$extra].numberOfUse += 1;
+        return this;
+      }
+    }
+
+    return parent[_xfa_object.$getNextPage]();
+  }
+
+  [_xfa_object.$getAvailableSpace]() {
+    return this[_xfa_object.$extra].space || {
+      width: 0,
+      height: 0
+    };
+  }
+
+  [_xfa_object.$toHTML]() {
+    if (!this[_xfa_object.$extra]) {
+      this[_xfa_object.$extra] = {
+        numberOfUse: 1
+      };
+    }
+
+    const children = [];
+    this[_xfa_object.$extra].children = children;
+    const style = Object.create(null);
+
+    if (this.medium && this.medium.short && this.medium.long) {
+      style.width = (0, _html_utils.measureToString)(this.medium.short);
+      style.height = (0, _html_utils.measureToString)(this.medium.long);
+      this[_xfa_object.$extra].space = {
+        width: this.medium.short,
+        height: this.medium.long
+      };
+
+      if (this.medium.orientation === "landscape") {
+        const x = style.width;
+        style.width = style.height;
+        style.height = x;
+        this[_xfa_object.$extra].space = {
+          width: this.medium.long,
+          height: this.medium.short
+        };
+      }
+    } else {
+      (0, _util.warn)("XFA - No medium specified in pageArea: please file a bug.");
+    }
+
+    this[_xfa_object.$childrenToHTML]({
+      filter: new Set(["area", "draw", "field", "subform"]),
+      include: true
+    });
+
+    this[_xfa_object.$childrenToHTML]({
+      filter: new Set(["contentArea"]),
+      include: true
+    });
+
+    return _utils.HTMLResult.success({
+      name: "div",
+      children,
+      attributes: {
+        class: ["xfaPage"],
+        id: this[_xfa_object.$uid],
+        style,
+        xfaName: this.name
+      }
+    });
+  }
+
+}
+
+class PageSet extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "pageSet", true);
+    this.duplexImposition = (0, _utils.getStringOption)(attributes.duplexImposition, ["longEdge", "shortEdge"]);
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.relation = (0, _utils.getStringOption)(attributes.relation, ["orderedOccurrence", "duplexPaginated", "simplexPaginated"]);
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.occur = null;
+    this.pageArea = new _xfa_object.XFAObjectArray();
+    this.pageSet = new _xfa_object.XFAObjectArray();
+  }
+
+  [_xfa_object.$cleanPage]() {
+    for (const page of this.pageArea.children) {
+      page[_xfa_object.$cleanPage]();
+    }
+
+    for (const page of this.pageSet.children) {
+      page[_xfa_object.$cleanPage]();
+    }
+  }
+
+  [_xfa_object.$isUsable]() {
+    return !this.occur || this.occur.max === -1 || this[_xfa_object.$extra].numberOfUse < this.occur.max;
+  }
+
+  [_xfa_object.$getNextPage]() {
+    if (!this[_xfa_object.$extra]) {
+      this[_xfa_object.$extra] = {
+        numberOfUse: 1,
+        pageIndex: -1,
+        pageSetIndex: -1
+      };
+    }
+
+    if (this.relation === "orderedOccurrence") {
+      if (this[_xfa_object.$extra].pageIndex + 1 < this.pageArea.children.length) {
+        this[_xfa_object.$extra].pageIndex += 1;
+        const pageArea = this.pageArea.children[this[_xfa_object.$extra].pageIndex];
+        return pageArea[_xfa_object.$getNextPage]();
+      }
+
+      if (this[_xfa_object.$extra].pageSetIndex + 1 < this.pageSet.children.length) {
+        this[_xfa_object.$extra].pageSetIndex += 1;
+        return this.pageSet.children[this[_xfa_object.$extra].pageSetIndex][_xfa_object.$getNextPage]();
+      }
+
+      if (this[_xfa_object.$isUsable]()) {
+        this[_xfa_object.$extra].numberOfUse += 1;
+        this[_xfa_object.$extra].pageIndex = -1;
+        this[_xfa_object.$extra].pageSetIndex = -1;
+        return this[_xfa_object.$getNextPage]();
+      }
+
+      const parent = this[_xfa_object.$getParent]();
+
+      if (parent instanceof PageSet) {
+        return parent[_xfa_object.$getNextPage]();
+      }
+
+      this[_xfa_object.$cleanPage]();
+
+      return this[_xfa_object.$getNextPage]();
+    }
+
+    const pageNumber = this[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].pageNumber;
+
+    const parity = pageNumber % 2 === 0 ? "even" : "odd";
+    const position = pageNumber === 0 ? "first" : "rest";
+    let page = this.pageArea.children.find(p => p.oddOrEven === parity && p.pagePosition === position);
+
+    if (page) {
+      return page;
+    }
+
+    page = this.pageArea.children.find(p => p.oddOrEven === "any" && p.pagePosition === position);
+
+    if (page) {
+      return page;
+    }
+
+    page = this.pageArea.children.find(p => p.oddOrEven === "any" && p.pagePosition === "any");
+
+    if (page) {
+      return page;
+    }
+
+    return this.pageArea.children[0];
+  }
+
+}
+
+class Para extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "para", true);
+    this.hAlign = (0, _utils.getStringOption)(attributes.hAlign, ["left", "center", "justify", "justifyAll", "radix", "right"]);
+    this.id = attributes.id || "";
+    this.lineHeight = attributes.lineHeight ? (0, _utils.getMeasurement)(attributes.lineHeight, "0pt") : "";
+    this.marginLeft = attributes.marginLeft ? (0, _utils.getMeasurement)(attributes.marginLeft, "0pt") : "";
+    this.marginRight = attributes.marginRight ? (0, _utils.getMeasurement)(attributes.marginRight, "0pt") : "";
+    this.orphans = (0, _utils.getInteger)({
+      data: attributes.orphans,
+      defaultValue: 0,
+      validate: x => x >= 0
+    });
+    this.preserve = attributes.preserve || "";
+    this.radixOffset = attributes.radixOffset ? (0, _utils.getMeasurement)(attributes.radixOffset, "0pt") : "";
+    this.spaceAbove = attributes.spaceAbove ? (0, _utils.getMeasurement)(attributes.spaceAbove, "0pt") : "";
+    this.spaceBelow = attributes.spaceBelow ? (0, _utils.getMeasurement)(attributes.spaceBelow, "0pt") : "";
+    this.tabDefault = attributes.tabDefault ? (0, _utils.getMeasurement)(this.tabDefault) : "";
+    this.tabStops = (attributes.tabStops || "").trim().split(/\s+/).map((x, i) => i % 2 === 1 ? (0, _utils.getMeasurement)(x) : x);
+    this.textIndent = attributes.textIndent ? (0, _utils.getMeasurement)(attributes.textIndent, "0pt") : "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.vAlign = (0, _utils.getStringOption)(attributes.vAlign, ["top", "bottom", "middle"]);
+    this.widows = (0, _utils.getInteger)({
+      data: attributes.widows,
+      defaultValue: 0,
+      validate: x => x >= 0
+    });
+    this.hyphenation = null;
+  }
+
+  [_xfa_object.$toStyle]() {
+    const style = (0, _html_utils.toStyle)(this, "hAlign");
+
+    if (this.marginLeft !== "") {
+      style.paddingLeft = (0, _html_utils.measureToString)(this.marginLeft);
+    }
+
+    if (this.marginRight !== "") {
+      style.paddingight = (0, _html_utils.measureToString)(this.marginRight);
+    }
+
+    if (this.spaceAbove !== "") {
+      style.paddingTop = (0, _html_utils.measureToString)(this.spaceAbove);
+    }
+
+    if (this.spaceBelow !== "") {
+      style.paddingBottom = (0, _html_utils.measureToString)(this.spaceBelow);
+    }
+
+    if (this.textIndent !== "") {
+      style.textIndent = (0, _html_utils.measureToString)(this.textIndent);
+      (0, _html_utils.fixTextIndent)(style);
+    }
+
+    if (this.lineHeight > 0) {
+      style.lineHeight = (0, _html_utils.measureToString)(this.lineHeight);
+    }
+
+    if (this.tabDefault !== "") {
+      style.tabSize = (0, _html_utils.measureToString)(this.tabDefault);
+    }
+
+    if (this.tabStops.length > 0) {}
+
+    if (this.hyphenatation) {
+      Object.assign(style, this.hyphenatation[_xfa_object.$toStyle]());
+    }
+
+    return style;
+  }
+
+}
+
+class PasswordEdit extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "passwordEdit", true);
+    this.hScrollPolicy = (0, _utils.getStringOption)(attributes.hScrollPolicy, ["auto", "off", "on"]);
+    this.id = attributes.id || "";
+    this.passwordChar = attributes.passwordChar || "*";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.border = null;
+    this.extras = null;
+    this.margin = null;
+  }
+
+}
+
+class Pattern extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "pattern", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["crossHatch", "crossDiagonal", "diagonalLeft", "diagonalRight", "horizontal", "vertical"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.color = null;
+    this.extras = null;
+  }
+
+  [_xfa_object.$toStyle](startColor) {
+    startColor = startColor ? startColor[_xfa_object.$toStyle]() : "#FFFFFF";
+    const endColor = this.color ? this.color[_xfa_object.$toStyle]() : "#000000";
+    const width = 5;
+    const cmd = "repeating-linear-gradient";
+    const colors = `${startColor},${startColor} ${width}px,${endColor} ${width}px,${endColor} ${2 * width}px`;
+
+    switch (this.type) {
+      case "crossHatch":
+        return `${cmd}(to top,${colors}) ${cmd}(to right,${colors})`;
+
+      case "crossDiagonal":
+        return `${cmd}(45deg,${colors}) ${cmd}(-45deg,${colors})`;
+
+      case "diagonalLeft":
+        return `${cmd}(45deg,${colors})`;
+
+      case "diagonalRight":
+        return `${cmd}(-45deg,${colors})`;
+
+      case "horizontal":
+        return `${cmd}(to top,${colors})`;
+
+      case "vertical":
+        return `${cmd}(to right,${colors})`;
+    }
+
+    return "";
+  }
+
+}
+
+class Picture extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "picture");
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Proto extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "proto", true);
+    this.appearanceFilter = new _xfa_object.XFAObjectArray();
+    this.arc = new _xfa_object.XFAObjectArray();
+    this.area = new _xfa_object.XFAObjectArray();
+    this.assist = new _xfa_object.XFAObjectArray();
+    this.barcode = new _xfa_object.XFAObjectArray();
+    this.bindItems = new _xfa_object.XFAObjectArray();
+    this.bookend = new _xfa_object.XFAObjectArray();
+    this.boolean = new _xfa_object.XFAObjectArray();
+    this.border = new _xfa_object.XFAObjectArray();
+    this.break = new _xfa_object.XFAObjectArray();
+    this.breakAfter = new _xfa_object.XFAObjectArray();
+    this.breakBefore = new _xfa_object.XFAObjectArray();
+    this.button = new _xfa_object.XFAObjectArray();
+    this.calculate = new _xfa_object.XFAObjectArray();
+    this.caption = new _xfa_object.XFAObjectArray();
+    this.certificate = new _xfa_object.XFAObjectArray();
+    this.certificates = new _xfa_object.XFAObjectArray();
+    this.checkButton = new _xfa_object.XFAObjectArray();
+    this.choiceList = new _xfa_object.XFAObjectArray();
+    this.color = new _xfa_object.XFAObjectArray();
+    this.comb = new _xfa_object.XFAObjectArray();
+    this.connect = new _xfa_object.XFAObjectArray();
+    this.contentArea = new _xfa_object.XFAObjectArray();
+    this.corner = new _xfa_object.XFAObjectArray();
+    this.date = new _xfa_object.XFAObjectArray();
+    this.dateTime = new _xfa_object.XFAObjectArray();
+    this.dateTimeEdit = new _xfa_object.XFAObjectArray();
+    this.decimal = new _xfa_object.XFAObjectArray();
+    this.defaultUi = new _xfa_object.XFAObjectArray();
+    this.desc = new _xfa_object.XFAObjectArray();
+    this.digestMethod = new _xfa_object.XFAObjectArray();
+    this.digestMethods = new _xfa_object.XFAObjectArray();
+    this.draw = new _xfa_object.XFAObjectArray();
+    this.edge = new _xfa_object.XFAObjectArray();
+    this.encoding = new _xfa_object.XFAObjectArray();
+    this.encodings = new _xfa_object.XFAObjectArray();
+    this.encrypt = new _xfa_object.XFAObjectArray();
+    this.encryptData = new _xfa_object.XFAObjectArray();
+    this.encryption = new _xfa_object.XFAObjectArray();
+    this.encryptionMethod = new _xfa_object.XFAObjectArray();
+    this.encryptionMethods = new _xfa_object.XFAObjectArray();
+    this.event = new _xfa_object.XFAObjectArray();
+    this.exData = new _xfa_object.XFAObjectArray();
+    this.exObject = new _xfa_object.XFAObjectArray();
+    this.exclGroup = new _xfa_object.XFAObjectArray();
+    this.execute = new _xfa_object.XFAObjectArray();
+    this.extras = new _xfa_object.XFAObjectArray();
+    this.field = new _xfa_object.XFAObjectArray();
+    this.fill = new _xfa_object.XFAObjectArray();
+    this.filter = new _xfa_object.XFAObjectArray();
+    this.float = new _xfa_object.XFAObjectArray();
+    this.font = new _xfa_object.XFAObjectArray();
+    this.format = new _xfa_object.XFAObjectArray();
+    this.handler = new _xfa_object.XFAObjectArray();
+    this.hyphenation = new _xfa_object.XFAObjectArray();
+    this.image = new _xfa_object.XFAObjectArray();
+    this.imageEdit = new _xfa_object.XFAObjectArray();
+    this.integer = new _xfa_object.XFAObjectArray();
+    this.issuers = new _xfa_object.XFAObjectArray();
+    this.items = new _xfa_object.XFAObjectArray();
+    this.keep = new _xfa_object.XFAObjectArray();
+    this.keyUsage = new _xfa_object.XFAObjectArray();
+    this.line = new _xfa_object.XFAObjectArray();
+    this.linear = new _xfa_object.XFAObjectArray();
+    this.lockDocument = new _xfa_object.XFAObjectArray();
+    this.manifest = new _xfa_object.XFAObjectArray();
+    this.margin = new _xfa_object.XFAObjectArray();
+    this.mdp = new _xfa_object.XFAObjectArray();
+    this.medium = new _xfa_object.XFAObjectArray();
+    this.message = new _xfa_object.XFAObjectArray();
+    this.numericEdit = new _xfa_object.XFAObjectArray();
+    this.occur = new _xfa_object.XFAObjectArray();
+    this.oid = new _xfa_object.XFAObjectArray();
+    this.oids = new _xfa_object.XFAObjectArray();
+    this.overflow = new _xfa_object.XFAObjectArray();
+    this.pageArea = new _xfa_object.XFAObjectArray();
+    this.pageSet = new _xfa_object.XFAObjectArray();
+    this.para = new _xfa_object.XFAObjectArray();
+    this.passwordEdit = new _xfa_object.XFAObjectArray();
+    this.pattern = new _xfa_object.XFAObjectArray();
+    this.picture = new _xfa_object.XFAObjectArray();
+    this.radial = new _xfa_object.XFAObjectArray();
+    this.reason = new _xfa_object.XFAObjectArray();
+    this.reasons = new _xfa_object.XFAObjectArray();
+    this.rectangle = new _xfa_object.XFAObjectArray();
+    this.ref = new _xfa_object.XFAObjectArray();
+    this.script = new _xfa_object.XFAObjectArray();
+    this.setProperty = new _xfa_object.XFAObjectArray();
+    this.signData = new _xfa_object.XFAObjectArray();
+    this.signature = new _xfa_object.XFAObjectArray();
+    this.signing = new _xfa_object.XFAObjectArray();
+    this.solid = new _xfa_object.XFAObjectArray();
+    this.speak = new _xfa_object.XFAObjectArray();
+    this.stipple = new _xfa_object.XFAObjectArray();
+    this.subform = new _xfa_object.XFAObjectArray();
+    this.subformSet = new _xfa_object.XFAObjectArray();
+    this.subjectDN = new _xfa_object.XFAObjectArray();
+    this.subjectDNs = new _xfa_object.XFAObjectArray();
+    this.submit = new _xfa_object.XFAObjectArray();
+    this.text = new _xfa_object.XFAObjectArray();
+    this.textEdit = new _xfa_object.XFAObjectArray();
+    this.time = new _xfa_object.XFAObjectArray();
+    this.timeStamp = new _xfa_object.XFAObjectArray();
+    this.toolTip = new _xfa_object.XFAObjectArray();
+    this.traversal = new _xfa_object.XFAObjectArray();
+    this.traverse = new _xfa_object.XFAObjectArray();
+    this.ui = new _xfa_object.XFAObjectArray();
+    this.validate = new _xfa_object.XFAObjectArray();
+    this.value = new _xfa_object.XFAObjectArray();
+    this.variables = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Radial extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "radial", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["toEdge", "toCenter"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.color = null;
+    this.extras = null;
+  }
+
+  [_xfa_object.$toStyle](startColor) {
+    startColor = startColor ? startColor[_xfa_object.$toStyle]() : "#FFFFFF";
+    const endColor = this.color ? this.color[_xfa_object.$toStyle]() : "#000000";
+    const colors = this.type === "toEdge" ? `${startColor},${endColor}` : `${endColor},${startColor}`;
+    return `radial-gradient(circle at center, ${colors})`;
+  }
+
+}
+
+class Reason extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "reason");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Reasons extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "reasons", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.reason = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Rectangle extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "rectangle", true);
+    this.hand = (0, _utils.getStringOption)(attributes.hand, ["even", "left", "right"]);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.corner = new _xfa_object.XFAObjectArray(4);
+    this.edge = new _xfa_object.XFAObjectArray(4);
+    this.fill = null;
+  }
+
+  [_xfa_object.$toHTML]() {
+    const edge = this.edge.children.length ? this.edge.children[0] : new Edge({});
+
+    const edgeStyle = edge[_xfa_object.$toStyle]();
+
+    const style = Object.create(null);
+
+    if (this.fill && this.fill.presence === "visible") {
+      Object.assign(style, this.fill[_xfa_object.$toStyle]());
+    } else {
+      style.fill = "transparent";
+    }
+
+    style.strokeWidth = (0, _html_utils.measureToString)(edge.presence === "visible" ? edge.thickness : 0);
+    style.stroke = edgeStyle.color;
+    const corner = this.corner.children.length ? this.corner.children[0] : new Corner({});
+
+    const cornerStyle = corner[_xfa_object.$toStyle]();
+
+    const rect = {
+      name: "rect",
+      attributes: {
+        xmlns: SVG_NS,
+        width: "100%",
+        height: "100%",
+        x: 0,
+        y: 0,
+        rx: cornerStyle.radius,
+        ry: cornerStyle.radius,
+        style
+      }
+    };
+    const svg = {
+      name: "svg",
+      children: [rect],
+      attributes: {
+        xmlns: SVG_NS,
+        style: {
+          overflow: "visible"
+        },
+        width: "100%",
+        height: "100%"
+      }
+    };
+
+    const parent = this[_xfa_object.$getParent]()[_xfa_object.$getParent]();
+
+    if (hasMargin(parent)) {
+      return _utils.HTMLResult.success({
+        name: "div",
+        attributes: {
+          style: {
+            display: "inline",
+            width: "100%",
+            height: "100%"
+          }
+        },
+        children: [svg]
+      });
+    }
+
+    svg.attributes.style.position = "absolute";
+    return _utils.HTMLResult.success(svg);
+  }
+
+}
+
+class RefElement extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "ref");
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Script extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "script");
+    this.binding = attributes.binding || "";
+    this.contentType = attributes.contentType || "";
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.runAt = (0, _utils.getStringOption)(attributes.runAt, ["client", "both", "server"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class SetProperty extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "setProperty");
+    this.connection = attributes.connection || "";
+    this.ref = attributes.ref || "";
+    this.target = attributes.target || "";
+  }
+
+}
+
+exports.SetProperty = SetProperty;
+
+class SignData extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "signData", true);
+    this.id = attributes.id || "";
+    this.operation = (0, _utils.getStringOption)(attributes.operation, ["sign", "clear", "verify"]);
+    this.ref = attributes.ref || "";
+    this.target = attributes.target || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.filter = null;
+    this.manifest = null;
+  }
+
+}
+
+class Signature extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "signature", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["PDF1.3", "PDF1.6"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.border = null;
+    this.extras = null;
+    this.filter = null;
+    this.manifest = null;
+    this.margin = null;
+  }
+
+}
+
+class Signing extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "signing", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.certificate = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Solid extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "solid", true);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+  }
+
+  [_xfa_object.$toStyle](startColor) {
+    return startColor ? startColor[_xfa_object.$toStyle]() : "#FFFFFF";
+  }
+
+}
+
+class Speak extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "speak");
+    this.disable = (0, _utils.getInteger)({
+      data: attributes.disable,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.id = attributes.id || "";
+    this.priority = (0, _utils.getStringOption)(attributes.priority, ["custom", "caption", "name", "toolTip"]);
+    this.rid = attributes.rid || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Stipple extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "stipple", true);
+    this.id = attributes.id || "";
+    this.rate = (0, _utils.getInteger)({
+      data: attributes.rate,
+      defaultValue: 50,
+      validate: x => x >= 0 && x <= 100
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.color = null;
+    this.extras = null;
+  }
+
+  [_xfa_object.$toStyle](bgColor) {
+    const alpha = this.rate / 100;
+    return _util.Util.makeHexColor(Math.round(bgColor.value.r * (1 - alpha) + this.value.r * alpha), Math.round(bgColor.value.g * (1 - alpha) + this.value.g * alpha), Math.round(bgColor.value.b * (1 - alpha) + this.value.b * alpha));
+  }
+
+}
+
+class Subform extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "subform", true);
+    this.access = (0, _utils.getStringOption)(attributes.access, ["open", "nonInteractive", "protected", "readOnly"]);
+    this.allowMacro = (0, _utils.getInteger)({
+      data: attributes.allowMacro,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.anchorType = (0, _utils.getStringOption)(attributes.anchorType, ["topLeft", "bottomCenter", "bottomLeft", "bottomRight", "middleCenter", "middleLeft", "middleRight", "topCenter", "topRight"]);
+    this.colSpan = (0, _utils.getInteger)({
+      data: attributes.colSpan,
+      defaultValue: 1,
+      validate: n => n >= 1 || n === -1
+    });
+    this.columnWidths = (attributes.columnWidths || "").trim().split(/\s+/).map(x => x === "-1" ? -1 : (0, _utils.getMeasurement)(x));
+    this.h = attributes.h ? (0, _utils.getMeasurement)(attributes.h) : "";
+    this.hAlign = (0, _utils.getStringOption)(attributes.hAlign, ["left", "center", "justify", "justifyAll", "radix", "right"]);
+    this.id = attributes.id || "";
+    this.layout = (0, _utils.getStringOption)(attributes.layout, ["position", "lr-tb", "rl-row", "rl-tb", "row", "table", "tb"]);
+    this.locale = attributes.locale || "";
+    this.maxH = (0, _utils.getMeasurement)(attributes.maxH, "0pt");
+    this.maxW = (0, _utils.getMeasurement)(attributes.maxW, "0pt");
+    this.mergeMode = (0, _utils.getStringOption)(attributes.mergeMode, ["consumeData", "matchTemplate"]);
+    this.minH = (0, _utils.getMeasurement)(attributes.minH, "0pt");
+    this.minW = (0, _utils.getMeasurement)(attributes.minW, "0pt");
+    this.name = attributes.name || "";
+    this.presence = (0, _utils.getStringOption)(attributes.presence, ["visible", "hidden", "inactive", "invisible"]);
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.restoreState = (0, _utils.getStringOption)(attributes.restoreState, ["manual", "auto"]);
+    this.scope = (0, _utils.getStringOption)(attributes.scope, ["name", "none"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.w = attributes.w ? (0, _utils.getMeasurement)(attributes.w) : "";
+    this.x = (0, _utils.getMeasurement)(attributes.x, "0pt");
+    this.y = (0, _utils.getMeasurement)(attributes.y, "0pt");
+    this.assist = null;
+    this.bind = null;
+    this.bookend = null;
+    this.border = null;
+    this.break = null;
+    this.calculate = null;
+    this.desc = null;
+    this.extras = null;
+    this.keep = null;
+    this.margin = null;
+    this.occur = null;
+    this.overflow = null;
+    this.pageSet = null;
+    this.para = null;
+    this.traversal = null;
+    this.validate = null;
+    this.variables = null;
+    this.area = new _xfa_object.XFAObjectArray();
+    this.breakAfter = new _xfa_object.XFAObjectArray();
+    this.breakBefore = new _xfa_object.XFAObjectArray();
+    this.connect = new _xfa_object.XFAObjectArray();
+    this.draw = new _xfa_object.XFAObjectArray();
+    this.event = new _xfa_object.XFAObjectArray();
+    this.exObject = new _xfa_object.XFAObjectArray();
+    this.exclGroup = new _xfa_object.XFAObjectArray();
+    this.field = new _xfa_object.XFAObjectArray();
+    this.proto = new _xfa_object.XFAObjectArray();
+    this.setProperty = new _xfa_object.XFAObjectArray();
+    this.subform = new _xfa_object.XFAObjectArray();
+    this.subformSet = new _xfa_object.XFAObjectArray();
+  }
+
+  [_xfa_object.$getSubformParent]() {
+    const parent = this[_xfa_object.$getParent]();
+
+    if (parent instanceof SubformSet) {
+      return parent[_xfa_object.$getSubformParent]();
+    }
+
+    return parent;
+  }
+
+  [_xfa_object.$isBindable]() {
+    return true;
+  }
+
+  [_xfa_object.$isThereMoreWidth]() {
+    return this.layout.endsWith("-tb") && this[_xfa_object.$extra].attempt === 0 && this[_xfa_object.$extra].numberInLine > 0 || this[_xfa_object.$getParent]()[_xfa_object.$isThereMoreWidth]();
+  }
+
+  *[_xfa_object.$getContainedChildren]() {
+    yield* getContainedChildren(this);
+  }
+
+  [_xfa_object.$flushHTML]() {
+    return (0, _layout.flushHTML)(this);
+  }
+
+  [_xfa_object.$addHTML](html, bbox) {
+    (0, _layout.addHTML)(this, html, bbox);
+  }
+
+  [_xfa_object.$getAvailableSpace]() {
+    return (0, _layout.getAvailableSpace)(this);
+  }
+
+  [_xfa_object.$isSplittable]() {
+    const parent = this[_xfa_object.$getSubformParent]();
+
+    if (!parent[_xfa_object.$isSplittable]()) {
+      return false;
+    }
+
+    if (this[_xfa_object.$extra]._isSplittable !== undefined) {
+      return this[_xfa_object.$extra]._isSplittable;
+    }
+
+    if (this.layout === "position" || this.layout.includes("row")) {
+      this[_xfa_object.$extra]._isSplittable = false;
+      return false;
+    }
+
+    if (this.keep && this.keep.intact !== "none") {
+      this[_xfa_object.$extra]._isSplittable = false;
+      return false;
+    }
+
+    if (parent.layout && parent.layout.endsWith("-tb") && parent[_xfa_object.$extra].numberInLine !== 0) {
+      return false;
+    }
+
+    this[_xfa_object.$extra]._isSplittable = true;
+    return true;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    setTabIndex(this);
+
+    if (this.break) {
+      if (this.break.after !== "auto" || this.break.afterTarget !== "") {
+        const node = new BreakAfter({
+          targetType: this.break.after,
+          target: this.break.afterTarget,
+          startNew: this.break.startNew.toString()
+        });
+        node[_xfa_object.$globalData] = this[_xfa_object.$globalData];
+
+        this[_xfa_object.$appendChild](node);
+
+        this.breakAfter.push(node);
+      }
+
+      if (this.break.before !== "auto" || this.break.beforeTarget !== "") {
+        const node = new BreakBefore({
+          targetType: this.break.before,
+          target: this.break.beforeTarget,
+          startNew: this.break.startNew.toString()
+        });
+        node[_xfa_object.$globalData] = this[_xfa_object.$globalData];
+
+        this[_xfa_object.$appendChild](node);
+
+        this.breakBefore.push(node);
+      }
+
+      if (this.break.overflowTarget !== "") {
+        const node = new Overflow({
+          target: this.break.overflowTarget,
+          leader: this.break.overflowLeader,
+          trailer: this.break.overflowTrailer
+        });
+        node[_xfa_object.$globalData] = this[_xfa_object.$globalData];
+
+        this[_xfa_object.$appendChild](node);
+
+        this.overflow.push(node);
+      }
+
+      this[_xfa_object.$removeChild](this.break);
+
+      this.break = null;
+    }
+
+    if (this.presence === "hidden" || this.presence === "inactive") {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    if (this.breakBefore.children.length > 1 || this.breakAfter.children.length > 1) {
+      (0, _util.warn)("XFA - Several breakBefore or breakAfter in subforms: please file a bug.");
+    }
+
+    if (this.breakBefore.children.length >= 1) {
+      const breakBefore = this.breakBefore.children[0];
+
+      if (handleBreak(breakBefore)) {
+        return _utils.HTMLResult.breakNode(breakBefore);
+      }
+    }
+
+    if (this[_xfa_object.$extra] && this[_xfa_object.$extra].afterBreakAfter) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    (0, _html_utils.fixDimensions)(this);
+    const children = [];
+    const attributes = {
+      id: this[_xfa_object.$uid],
+      class: []
+    };
+    (0, _html_utils.setAccess)(this, attributes.class);
+
+    if (!this[_xfa_object.$extra]) {
+      this[_xfa_object.$extra] = Object.create(null);
+    }
+
+    Object.assign(this[_xfa_object.$extra], {
+      children,
+      line: null,
+      attributes,
+      attempt: 0,
+      numberInLine: 0,
+      availableSpace: {
+        width: Math.min(this.w || Infinity, availableSpace.width),
+        height: Math.min(this.h || Infinity, availableSpace.height)
+      },
+      width: 0,
+      height: 0,
+      prevHeight: 0,
+      currentWidth: 0
+    });
+
+    const root = this[_xfa_object.$getTemplateRoot]();
+
+    const savedNoLayoutFailure = root[_xfa_object.$extra].noLayoutFailure;
+
+    const isSplittable = this[_xfa_object.$isSplittable]();
+
+    if (!isSplittable) {
+      setFirstUnsplittable(this);
+    }
+
+    if (!(0, _layout.checkDimensions)(this, availableSpace)) {
+      return _utils.HTMLResult.FAILURE;
+    }
+
+    const filter = new Set(["area", "draw", "exclGroup", "field", "subform", "subformSet"]);
+
+    if (this.layout.includes("row")) {
+      const columnWidths = this[_xfa_object.$getSubformParent]().columnWidths;
+
+      if (Array.isArray(columnWidths) && columnWidths.length > 0) {
+        this[_xfa_object.$extra].columnWidths = columnWidths;
+        this[_xfa_object.$extra].currentColumn = 0;
+      }
+    }
+
+    const style = (0, _html_utils.toStyle)(this, "anchorType", "dimensions", "position", "presence", "border", "margin", "hAlign");
+    const classNames = ["xfaSubform"];
+    const cl = (0, _html_utils.layoutClass)(this);
+
+    if (cl) {
+      classNames.push(cl);
+    }
+
+    attributes.style = style;
+    attributes.class = classNames;
+
+    if (this.name) {
+      attributes.xfaName = this.name;
+    }
+
+    if (this.overflow) {
+      const overflowExtra = this.overflow[_xfa_object.$getExtra]();
+
+      if (overflowExtra.addLeader) {
+        overflowExtra.addLeader = false;
+        handleOverflow(this, overflowExtra.leader, availableSpace);
+      }
+    }
+
+    this[_xfa_object.$pushPara]();
+
+    const isLrTb = this.layout === "lr-tb" || this.layout === "rl-tb";
+    const maxRun = isLrTb ? MAX_ATTEMPTS_FOR_LRTB_LAYOUT : 1;
+
+    for (; this[_xfa_object.$extra].attempt < maxRun; this[_xfa_object.$extra].attempt++) {
+      if (isLrTb && this[_xfa_object.$extra].attempt === MAX_ATTEMPTS_FOR_LRTB_LAYOUT - 1) {
+        this[_xfa_object.$extra].numberInLine = 0;
+      }
+
+      const result = this[_xfa_object.$childrenToHTML]({
+        filter,
+        include: true
+      });
+
+      if (result.success) {
+        break;
+      }
+
+      if (result.isBreak()) {
+        this[_xfa_object.$popPara]();
+
+        return result;
+      }
+
+      if (isLrTb && this[_xfa_object.$extra].attempt === 0 && this[_xfa_object.$extra].numberInLine === 0 && !root[_xfa_object.$extra].noLayoutFailure) {
+        this[_xfa_object.$extra].attempt = maxRun;
+        break;
+      }
+    }
+
+    this[_xfa_object.$popPara]();
+
+    if (!isSplittable) {
+      unsetFirstUnsplittable(this);
+    }
+
+    root[_xfa_object.$extra].noLayoutFailure = savedNoLayoutFailure;
+
+    if (this[_xfa_object.$extra].attempt === maxRun) {
+      if (this.overflow) {
+        this[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].overflowNode = this.overflow;
+      }
+
+      if (!isSplittable) {
+        delete this[_xfa_object.$extra];
+      }
+
+      return _utils.HTMLResult.FAILURE;
+    }
+
+    if (this.overflow) {
+      const overflowExtra = this.overflow[_xfa_object.$getExtra]();
+
+      if (overflowExtra.addTrailer) {
+        overflowExtra.addTrailer = false;
+        handleOverflow(this, overflowExtra.trailer, availableSpace);
+      }
+    }
+
+    let marginH = 0;
+    let marginV = 0;
+
+    if (this.margin) {
+      marginH = this.margin.leftInset + this.margin.rightInset;
+      marginV = this.margin.topInset + this.margin.bottomInset;
+    }
+
+    const width = Math.max(this[_xfa_object.$extra].width + marginH, this.w || 0);
+    const height = Math.max(this[_xfa_object.$extra].height + marginV, this.h || 0);
+    const bbox = [this.x, this.y, width, height];
+
+    if (this.w === "") {
+      style.width = (0, _html_utils.measureToString)(width);
+    }
+
+    if (this.h === "") {
+      style.height = (0, _html_utils.measureToString)(height);
+    }
+
+    if ((style.width === "0px" || style.height === "0px") && children.length === 0) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    const html = {
+      name: "div",
+      attributes,
+      children
+    };
+    applyAssist(this, attributes);
+
+    const result = _utils.HTMLResult.success((0, _html_utils.createWrapper)(this, html), bbox);
+
+    if (this.breakAfter.children.length >= 1) {
+      const breakAfter = this.breakAfter.children[0];
+
+      if (handleBreak(breakAfter)) {
+        this[_xfa_object.$extra].afterBreakAfter = result;
+        return _utils.HTMLResult.breakNode(breakAfter);
+      }
+    }
+
+    delete this[_xfa_object.$extra];
+    return result;
+  }
+
+}
+
+class SubformSet extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "subformSet", true);
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.relation = (0, _utils.getStringOption)(attributes.relation, ["ordered", "choice", "unordered"]);
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.bookend = null;
+    this.break = null;
+    this.desc = null;
+    this.extras = null;
+    this.occur = null;
+    this.overflow = null;
+    this.breakAfter = new _xfa_object.XFAObjectArray();
+    this.breakBefore = new _xfa_object.XFAObjectArray();
+    this.subform = new _xfa_object.XFAObjectArray();
+    this.subformSet = new _xfa_object.XFAObjectArray();
+  }
+
+  *[_xfa_object.$getContainedChildren]() {
+    yield* getContainedChildren(this);
+  }
+
+  [_xfa_object.$getSubformParent]() {
+    let parent = this[_xfa_object.$getParent]();
+
+    while (!(parent instanceof Subform)) {
+      parent = parent[_xfa_object.$getParent]();
+    }
+
+    return parent;
+  }
+
+  [_xfa_object.$isBindable]() {
+    return true;
+  }
+
+}
+
+class SubjectDN extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "subjectDN");
+    this.delimiter = attributes.delimiter || ",";
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$finalize]() {
+    this[_xfa_object.$content] = new Map(this[_xfa_object.$content].split(this.delimiter).map(kv => {
+      kv = kv.split("=", 2);
+      kv[0] = kv[0].trim();
+      return kv;
+    }));
+  }
+
+}
+
+class SubjectDNs extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "subjectDNs", true);
+    this.id = attributes.id || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.subjectDN = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Submit extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "submit", true);
+    this.embedPDF = (0, _utils.getInteger)({
+      data: attributes.embedPDF,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.format = (0, _utils.getStringOption)(attributes.format, ["xdp", "formdata", "pdf", "urlencoded", "xfd", "xml"]);
+    this.id = attributes.id || "";
+    this.target = attributes.target || "";
+    this.textEncoding = (0, _utils.getKeyword)({
+      data: attributes.textEncoding ? attributes.textEncoding.toLowerCase() : "",
+      defaultValue: "",
+      validate: k => ["utf-8", "big-five", "fontspecific", "gbk", "gb-18030", "gb-2312", "ksc-5601", "none", "shift-jis", "ucs-2", "utf-16"].includes(k) || k.match(/iso-8859-\d{2}/)
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.xdpContent = attributes.xdpContent || "";
+    this.encrypt = null;
+    this.encryptData = new _xfa_object.XFAObjectArray();
+    this.signData = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Template extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "template", true);
+    this.baseProfile = (0, _utils.getStringOption)(attributes.baseProfile, ["full", "interactiveForms"]);
+    this.extras = null;
+    this.subform = new _xfa_object.XFAObjectArray();
+  }
+
+  [_xfa_object.$finalize]() {
+    if (this.subform.children.length === 0) {
+      (0, _util.warn)("XFA - No subforms in template node.");
+    }
+
+    if (this.subform.children.length >= 2) {
+      (0, _util.warn)("XFA - Several subforms in template node: please file a bug.");
+    }
+
+    this[_xfa_object.$tabIndex] = DEFAULT_TAB_INDEX;
+  }
+
+  [_xfa_object.$isSplittable]() {
+    return true;
+  }
+
+  [_xfa_object.$searchNode](expr, container) {
+    if (expr.startsWith("#")) {
+      return [this[_xfa_object.$ids].get(expr.slice(1))];
+    }
+
+    return (0, _som.searchNode)(this, container, expr, true, true);
+  }
+
+  *[_xfa_object.$toPages]() {
+    if (!this.subform.children.length) {
+      return _utils.HTMLResult.success({
+        name: "div",
+        children: []
+      });
+    }
+
+    this[_xfa_object.$extra] = {
+      overflowNode: null,
+      firstUnsplittable: null,
+      currentContentArea: null,
+      currentPageArea: null,
+      noLayoutFailure: false,
+      pageNumber: 1,
+      pagePosition: "first",
+      oddOrEven: "odd",
+      blankOrNotBlank: "nonBlank",
+      paraStack: []
+    };
+    const root = this.subform.children[0];
+
+    root.pageSet[_xfa_object.$cleanPage]();
+
+    const pageAreas = root.pageSet.pageArea.children;
+    const mainHtml = {
+      name: "div",
+      children: []
+    };
+    let pageArea = null;
+    let breakBefore = null;
+    let breakBeforeTarget = null;
+
+    if (root.breakBefore.children.length >= 1) {
+      breakBefore = root.breakBefore.children[0];
+      breakBeforeTarget = breakBefore.target;
+    } else if (root.subform.children.length >= 1 && root.subform.children[0].breakBefore.children.length >= 1) {
+      breakBefore = root.subform.children[0].breakBefore.children[0];
+      breakBeforeTarget = breakBefore.target;
+    } else if (root.break && root.break.beforeTarget) {
+      breakBefore = root.break;
+      breakBeforeTarget = breakBefore.beforeTarget;
+    } else if (root.subform.children.length >= 1 && root.subform.children[0].break && root.subform.children[0].break.beforeTarget) {
+      breakBefore = root.subform.children[0].break;
+      breakBeforeTarget = breakBefore.beforeTarget;
+    }
+
+    if (breakBefore) {
+      const target = this[_xfa_object.$searchNode](breakBeforeTarget, breakBefore[_xfa_object.$getParent]());
+
+      if (target instanceof PageArea) {
+        pageArea = target;
+        breakBefore[_xfa_object.$extra] = {};
+      }
+    }
+
+    if (!pageArea) {
+      pageArea = pageAreas[0];
+    }
+
+    pageArea[_xfa_object.$extra] = {
+      numberOfUse: 1
+    };
+
+    const pageAreaParent = pageArea[_xfa_object.$getParent]();
+
+    pageAreaParent[_xfa_object.$extra] = {
+      numberOfUse: 1,
+      pageIndex: pageAreaParent.pageArea.children.indexOf(pageArea),
+      pageSetIndex: 0
+    };
+    let targetPageArea;
+    let leader = null;
+    let trailer = null;
+    let hasSomething = true;
+    let hasSomethingCounter = 0;
+    let startIndex = 0;
+
+    while (true) {
+      if (!hasSomething) {
+        mainHtml.children.pop();
+
+        if (++hasSomethingCounter === MAX_EMPTY_PAGES) {
+          (0, _util.warn)("XFA - Something goes wrong: please file a bug.");
+          return mainHtml;
+        }
+      } else {
+        hasSomethingCounter = 0;
+      }
+
+      targetPageArea = null;
+      this[_xfa_object.$extra].currentPageArea = pageArea;
+
+      const page = pageArea[_xfa_object.$toHTML]().html;
+
+      mainHtml.children.push(page);
+
+      if (leader) {
+        this[_xfa_object.$extra].noLayoutFailure = true;
+        page.children.push(leader[_xfa_object.$toHTML](pageArea[_xfa_object.$extra].space).html);
+        leader = null;
+      }
+
+      if (trailer) {
+        this[_xfa_object.$extra].noLayoutFailure = true;
+        page.children.push(trailer[_xfa_object.$toHTML](pageArea[_xfa_object.$extra].space).html);
+        trailer = null;
+      }
+
+      const contentAreas = pageArea.contentArea.children;
+      const htmlContentAreas = page.children.filter(node => node.attributes.class.includes("xfaContentarea"));
+      hasSomething = false;
+      this[_xfa_object.$extra].firstUnsplittable = null;
+      this[_xfa_object.$extra].noLayoutFailure = false;
+
+      const flush = index => {
+        const html = root[_xfa_object.$flushHTML]();
+
+        if (html) {
+          hasSomething = hasSomething || html.children && html.children.length !== 0;
+          htmlContentAreas[index].children.push(html);
+        }
+      };
+
+      for (let i = startIndex, ii = contentAreas.length; i < ii; i++) {
+        const contentArea = this[_xfa_object.$extra].currentContentArea = contentAreas[i];
+        const space = {
+          width: contentArea.w,
+          height: contentArea.h
+        };
+        startIndex = 0;
+
+        if (leader) {
+          htmlContentAreas[i].children.push(leader[_xfa_object.$toHTML](space).html);
+          leader = null;
+        }
+
+        if (trailer) {
+          htmlContentAreas[i].children.push(trailer[_xfa_object.$toHTML](space).html);
+          trailer = null;
+        }
+
+        const html = root[_xfa_object.$toHTML](space);
+
+        if (html.success) {
+          if (html.html) {
+            hasSomething = hasSomething || html.html.children && html.html.children.length !== 0;
+            htmlContentAreas[i].children.push(html.html);
+          } else if (!hasSomething && mainHtml.children.length > 1) {
+            mainHtml.children.pop();
+          }
+
+          return mainHtml;
+        }
+
+        if (html.isBreak()) {
+          const node = html.breakNode;
+          flush(i);
+
+          if (node.targetType === "auto") {
+            continue;
+          }
+
+          if (node.leader) {
+            leader = this[_xfa_object.$searchNode](node.leader, node[_xfa_object.$getParent]());
+            leader = leader ? leader[0] : null;
+          }
+
+          if (node.trailer) {
+            trailer = this[_xfa_object.$searchNode](node.trailer, node[_xfa_object.$getParent]());
+            trailer = trailer ? trailer[0] : null;
+          }
+
+          if (node.targetType === "pageArea") {
+            targetPageArea = node[_xfa_object.$extra].target;
+            i = Infinity;
+          } else if (!node[_xfa_object.$extra].target) {
+            i = node[_xfa_object.$extra].index;
+          } else {
+            targetPageArea = node[_xfa_object.$extra].target;
+            startIndex = node[_xfa_object.$extra].index + 1;
+            i = Infinity;
+          }
+
+          continue;
+        }
+
+        if (this[_xfa_object.$extra].overflowNode) {
+          const node = this[_xfa_object.$extra].overflowNode;
+          this[_xfa_object.$extra].overflowNode = null;
+
+          const overflowExtra = node[_xfa_object.$getExtra]();
+
+          const target = overflowExtra.target;
+          overflowExtra.addLeader = overflowExtra.leader !== null;
+          overflowExtra.addTrailer = overflowExtra.trailer !== null;
+          flush(i);
+          const currentIndex = i;
+          i = Infinity;
+
+          if (target instanceof PageArea) {
+            targetPageArea = target;
+          } else if (target instanceof ContentArea) {
+            const index = contentAreas.indexOf(target);
+
+            if (index !== -1) {
+              if (index > currentIndex) {
+                i = index - 1;
+              } else {
+                startIndex = index;
+              }
+            } else {
+              targetPageArea = target[_xfa_object.$getParent]();
+              startIndex = targetPageArea.contentArea.children.indexOf(target);
+            }
+          }
+
+          continue;
+        }
+
+        flush(i);
+      }
+
+      this[_xfa_object.$extra].pageNumber += 1;
+
+      if (targetPageArea) {
+        if (targetPageArea[_xfa_object.$isUsable]()) {
+          targetPageArea[_xfa_object.$extra].numberOfUse += 1;
+        } else {
+          targetPageArea = null;
+        }
+      }
+
+      pageArea = targetPageArea || pageArea[_xfa_object.$getNextPage]();
+      yield null;
+    }
+  }
+
+}
+
+exports.Template = Template;
+
+class Text extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "text");
+    this.id = attributes.id || "";
+    this.maxChars = (0, _utils.getInteger)({
+      data: attributes.maxChars,
+      defaultValue: 0,
+      validate: x => x >= 0
+    });
+    this.name = attributes.name || "";
+    this.rid = attributes.rid || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$acceptWhitespace]() {
+    return true;
+  }
+
+  [_xfa_object.$onChild](child) {
+    if (child[_xfa_object.$namespaceId] === _namespaces.NamespaceIds.xhtml.id) {
+      this[_xfa_object.$content] = child;
+      return true;
+    }
+
+    (0, _util.warn)(`XFA - Invalid content in Text: ${child[_xfa_object.$nodeName]}.`);
+    return false;
+  }
+
+  [_xfa_object.$onText](str) {
+    if (this[_xfa_object.$content] instanceof _xfa_object.XFAObject) {
+      return;
+    }
+
+    super[_xfa_object.$onText](str);
+  }
+
+  [_xfa_object.$finalize]() {
+    if (typeof this[_xfa_object.$content] === "string") {
+      this[_xfa_object.$content] = this[_xfa_object.$content].replace(/\r\n/g, "\n");
+    }
+  }
+
+  [_xfa_object.$getExtra]() {
+    if (typeof this[_xfa_object.$content] === "string") {
+      return this[_xfa_object.$content].split(/[\u2029\u2028\n]/).reduce((acc, line) => {
+        if (line) {
+          acc.push(line);
+        }
+
+        return acc;
+      }, []).join("\n");
+    }
+
+    return this[_xfa_object.$content][_xfa_object.$text]();
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    if (typeof this[_xfa_object.$content] === "string") {
+      const html = valueToHtml(this[_xfa_object.$content]).html;
+
+      if (this[_xfa_object.$content].includes("\u2029")) {
+        html.name = "div";
+        html.children = [];
+
+        this[_xfa_object.$content].split("\u2029").map(para => para.split(/[\u2028\n]/).reduce((acc, line) => {
+          acc.push({
+            name: "span",
+            value: line
+          }, {
+            name: "br"
+          });
+          return acc;
+        }, [])).forEach(lines => {
+          html.children.push({
+            name: "p",
+            children: lines
+          });
+        });
+      } else if (/[\u2028\n]/.test(this[_xfa_object.$content])) {
+        html.name = "div";
+        html.children = [];
+
+        this[_xfa_object.$content].split(/[\u2028\n]/).forEach(line => {
+          html.children.push({
+            name: "span",
+            value: line
+          }, {
+            name: "br"
+          });
+        });
+      }
+
+      return _utils.HTMLResult.success(html);
+    }
+
+    return this[_xfa_object.$content][_xfa_object.$toHTML](availableSpace);
+  }
+
+}
+
+exports.Text = Text;
+
+class TextEdit extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "textEdit", true);
+    this.allowRichText = (0, _utils.getInteger)({
+      data: attributes.allowRichText,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.hScrollPolicy = (0, _utils.getStringOption)(attributes.hScrollPolicy, ["auto", "off", "on"]);
+    this.id = attributes.id || "";
+    this.multiLine = (0, _utils.getInteger)({
+      data: attributes.multiLine,
+      defaultValue: "",
+      validate: x => x === 0 || x === 1
+    });
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.vScrollPolicy = (0, _utils.getStringOption)(attributes.vScrollPolicy, ["auto", "off", "on"]);
+    this.border = null;
+    this.comb = null;
+    this.extras = null;
+    this.margin = null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const style = (0, _html_utils.toStyle)(this, "border", "font", "margin");
+    let html;
+
+    const field = this[_xfa_object.$getParent]()[_xfa_object.$getParent]();
+
+    if (this.multiLine === "") {
+      this.multiLine = field instanceof Draw ? 1 : 0;
+    }
+
+    if (this.multiLine === 1) {
+      html = {
+        name: "textarea",
+        attributes: {
+          dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
+          fieldId: field[_xfa_object.$uid],
+          class: ["xfaTextfield"],
+          style,
+          "aria-label": ariaLabel(field),
+          "aria-required": false
+        }
+      };
+    } else {
+      html = {
+        name: "input",
+        attributes: {
+          type: "text",
+          dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
+          fieldId: field[_xfa_object.$uid],
+          class: ["xfaTextfield"],
+          style,
+          "aria-label": ariaLabel(field),
+          "aria-required": false
+        }
+      };
+    }
+
+    if (isRequired(field)) {
+      html.attributes["aria-required"] = true;
+      html.attributes.required = true;
+    }
+
+    return _utils.HTMLResult.success({
+      name: "label",
+      attributes: {
+        class: ["xfaLabel"]
+      },
+      children: [html]
+    });
+  }
+
+}
+
+class Time extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "time");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+  [_xfa_object.$finalize]() {
+    const date = this[_xfa_object.$content].trim();
+
+    this[_xfa_object.$content] = date ? new Date(date) : null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    return valueToHtml(this[_xfa_object.$content] ? this[_xfa_object.$content].toString() : "");
+  }
+
+}
+
+class TimeStamp extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "timeStamp");
+    this.id = attributes.id || "";
+    this.server = attributes.server || "";
+    this.type = (0, _utils.getStringOption)(attributes.type, ["optional", "required"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class ToolTip extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "toolTip");
+    this.id = attributes.id || "";
+    this.rid = attributes.rid || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Traversal extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "traversal", true);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.traverse = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Traverse extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "traverse", true);
+    this.id = attributes.id || "";
+    this.operation = (0, _utils.getStringOption)(attributes.operation, ["next", "back", "down", "first", "left", "right", "up"]);
+    this.ref = attributes.ref || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.script = null;
+  }
+
+  get name() {
+    return this.operation;
+  }
+
+  [_xfa_object.$isTransparent]() {
+    return false;
+  }
+
+}
+
+class Ui extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "ui", true);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.picture = null;
+    this.barcode = null;
+    this.button = null;
+    this.checkButton = null;
+    this.choiceList = null;
+    this.dateTimeEdit = null;
+    this.defaultUi = null;
+    this.imageEdit = null;
+    this.numericEdit = null;
+    this.passwordEdit = null;
+    this.signature = null;
+    this.textEdit = null;
+  }
+
+  [_xfa_object.$getExtra]() {
+    if (this[_xfa_object.$extra] === undefined) {
+      for (const name of Object.getOwnPropertyNames(this)) {
+        if (name === "extras" || name === "picture") {
+          continue;
+        }
+
+        const obj = this[name];
+
+        if (!(obj instanceof _xfa_object.XFAObject)) {
+          continue;
+        }
+
+        this[_xfa_object.$extra] = obj;
+        return obj;
+      }
+
+      this[_xfa_object.$extra] = null;
+    }
+
+    return this[_xfa_object.$extra];
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const obj = this[_xfa_object.$getExtra]();
+
+    if (obj) {
+      return obj[_xfa_object.$toHTML](availableSpace);
+    }
+
+    return _utils.HTMLResult.EMPTY;
+  }
+
+}
+
+class Validate extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "validate", true);
+    this.formatTest = (0, _utils.getStringOption)(attributes.formatTest, ["warning", "disabled", "error"]);
+    this.id = attributes.id || "";
+    this.nullTest = (0, _utils.getStringOption)(attributes.nullTest, ["disabled", "error", "warning"]);
+    this.scriptTest = (0, _utils.getStringOption)(attributes.scriptTest, ["error", "disabled", "warning"]);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.extras = null;
+    this.message = null;
+    this.picture = null;
+    this.script = null;
+  }
+
+}
+
+class Value extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "value", true);
+    this.id = attributes.id || "";
+    this.override = (0, _utils.getInteger)({
+      data: attributes.override,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.relevant = (0, _utils.getRelevant)(attributes.relevant);
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.arc = null;
+    this.boolean = null;
+    this.date = null;
+    this.dateTime = null;
+    this.decimal = null;
+    this.exData = null;
+    this.float = null;
+    this.image = null;
+    this.integer = null;
+    this.line = null;
+    this.rectangle = null;
+    this.text = null;
+    this.time = null;
+  }
+
+  [_xfa_object.$setValue](value) {
+    const parent = this[_xfa_object.$getParent]();
+
+    if (parent instanceof Field) {
+      if (parent.ui && parent.ui.imageEdit) {
+        if (!this.image) {
+          this.image = new Image({});
+
+          this[_xfa_object.$appendChild](this.image);
+        }
+
+        this.image[_xfa_object.$content] = value[_xfa_object.$content];
+        return;
+      }
+    }
+
+    const valueName = value[_xfa_object.$nodeName];
+
+    if (this[valueName] !== null) {
+      this[valueName][_xfa_object.$content] = value[_xfa_object.$content];
+      return;
+    }
+
+    for (const name of Object.getOwnPropertyNames(this)) {
+      const obj = this[name];
+
+      if (obj instanceof _xfa_object.XFAObject) {
+        this[name] = null;
+
+        this[_xfa_object.$removeChild](obj);
+      }
+    }
+
+    this[value[_xfa_object.$nodeName]] = value;
+
+    this[_xfa_object.$appendChild](value);
+  }
+
+  [_xfa_object.$text]() {
+    if (this.exData) {
+      if (typeof this.exData[_xfa_object.$content] === "string") {
+        return this.exData[_xfa_object.$content].trim();
+      }
+
+      return this.exData[_xfa_object.$content][_xfa_object.$text]().trim();
+    }
+
+    for (const name of Object.getOwnPropertyNames(this)) {
+      if (name === "image") {
+        continue;
+      }
+
+      const obj = this[name];
+
+      if (obj instanceof _xfa_object.XFAObject) {
+        return (obj[_xfa_object.$content] || "").toString().trim();
+      }
+    }
+
+    return null;
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    for (const name of Object.getOwnPropertyNames(this)) {
+      const obj = this[name];
+
+      if (!(obj instanceof _xfa_object.XFAObject)) {
+        continue;
+      }
+
+      return obj[_xfa_object.$toHTML](availableSpace);
+    }
+
+    return _utils.HTMLResult.EMPTY;
+  }
+
+}
+
+exports.Value = Value;
+
+class Variables extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(TEMPLATE_NS_ID, "variables", true);
+    this.id = attributes.id || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+    this.boolean = new _xfa_object.XFAObjectArray();
+    this.date = new _xfa_object.XFAObjectArray();
+    this.dateTime = new _xfa_object.XFAObjectArray();
+    this.decimal = new _xfa_object.XFAObjectArray();
+    this.exData = new _xfa_object.XFAObjectArray();
+    this.float = new _xfa_object.XFAObjectArray();
+    this.image = new _xfa_object.XFAObjectArray();
+    this.integer = new _xfa_object.XFAObjectArray();
+    this.manifest = new _xfa_object.XFAObjectArray();
+    this.script = new _xfa_object.XFAObjectArray();
+    this.text = new _xfa_object.XFAObjectArray();
+    this.time = new _xfa_object.XFAObjectArray();
+  }
+
+  [_xfa_object.$isTransparent]() {
+    return true;
+  }
+
+}
+
+class TemplateNamespace {
+  static [_namespaces.$buildXFAObject](name, attributes) {
+    if (TemplateNamespace.hasOwnProperty(name)) {
+      const node = TemplateNamespace[name](attributes);
+
+      node[_xfa_object.$setSetAttributes](attributes);
+
+      return node;
+    }
+
+    return undefined;
+  }
+
+  static appearanceFilter(attrs) {
+    return new AppearanceFilter(attrs);
+  }
+
+  static arc(attrs) {
+    return new Arc(attrs);
+  }
+
+  static area(attrs) {
+    return new Area(attrs);
+  }
+
+  static assist(attrs) {
+    return new Assist(attrs);
+  }
+
+  static barcode(attrs) {
+    return new Barcode(attrs);
+  }
+
+  static bind(attrs) {
+    return new Bind(attrs);
+  }
+
+  static bindItems(attrs) {
+    return new BindItems(attrs);
+  }
+
+  static bookend(attrs) {
+    return new Bookend(attrs);
+  }
+
+  static boolean(attrs) {
+    return new BooleanElement(attrs);
+  }
+
+  static border(attrs) {
+    return new Border(attrs);
+  }
+
+  static break(attrs) {
+    return new Break(attrs);
+  }
+
+  static breakAfter(attrs) {
+    return new BreakAfter(attrs);
+  }
+
+  static breakBefore(attrs) {
+    return new BreakBefore(attrs);
+  }
+
+  static button(attrs) {
+    return new Button(attrs);
+  }
+
+  static calculate(attrs) {
+    return new Calculate(attrs);
+  }
+
+  static caption(attrs) {
+    return new Caption(attrs);
+  }
+
+  static certificate(attrs) {
+    return new Certificate(attrs);
+  }
+
+  static certificates(attrs) {
+    return new Certificates(attrs);
+  }
+
+  static checkButton(attrs) {
+    return new CheckButton(attrs);
+  }
+
+  static choiceList(attrs) {
+    return new ChoiceList(attrs);
+  }
+
+  static color(attrs) {
+    return new Color(attrs);
+  }
+
+  static comb(attrs) {
+    return new Comb(attrs);
+  }
+
+  static connect(attrs) {
+    return new Connect(attrs);
+  }
+
+  static contentArea(attrs) {
+    return new ContentArea(attrs);
+  }
+
+  static corner(attrs) {
+    return new Corner(attrs);
+  }
+
+  static date(attrs) {
+    return new DateElement(attrs);
+  }
+
+  static dateTime(attrs) {
+    return new DateTime(attrs);
+  }
+
+  static dateTimeEdit(attrs) {
+    return new DateTimeEdit(attrs);
+  }
+
+  static decimal(attrs) {
+    return new Decimal(attrs);
+  }
+
+  static defaultUi(attrs) {
+    return new DefaultUi(attrs);
+  }
+
+  static desc(attrs) {
+    return new Desc(attrs);
+  }
+
+  static digestMethod(attrs) {
+    return new DigestMethod(attrs);
+  }
+
+  static digestMethods(attrs) {
+    return new DigestMethods(attrs);
+  }
+
+  static draw(attrs) {
+    return new Draw(attrs);
+  }
+
+  static edge(attrs) {
+    return new Edge(attrs);
+  }
+
+  static encoding(attrs) {
+    return new Encoding(attrs);
+  }
+
+  static encodings(attrs) {
+    return new Encodings(attrs);
+  }
+
+  static encrypt(attrs) {
+    return new Encrypt(attrs);
+  }
+
+  static encryptData(attrs) {
+    return new EncryptData(attrs);
+  }
+
+  static encryption(attrs) {
+    return new Encryption(attrs);
+  }
+
+  static encryptionMethod(attrs) {
+    return new EncryptionMethod(attrs);
+  }
+
+  static encryptionMethods(attrs) {
+    return new EncryptionMethods(attrs);
+  }
+
+  static event(attrs) {
+    return new Event(attrs);
+  }
+
+  static exData(attrs) {
+    return new ExData(attrs);
+  }
+
+  static exObject(attrs) {
+    return new ExObject(attrs);
+  }
+
+  static exclGroup(attrs) {
+    return new ExclGroup(attrs);
+  }
+
+  static execute(attrs) {
+    return new Execute(attrs);
+  }
+
+  static extras(attrs) {
+    return new Extras(attrs);
+  }
+
+  static field(attrs) {
+    return new Field(attrs);
+  }
+
+  static fill(attrs) {
+    return new Fill(attrs);
+  }
+
+  static filter(attrs) {
+    return new Filter(attrs);
+  }
+
+  static float(attrs) {
+    return new Float(attrs);
+  }
+
+  static font(attrs) {
+    return new Font(attrs);
+  }
+
+  static format(attrs) {
+    return new Format(attrs);
+  }
+
+  static handler(attrs) {
+    return new Handler(attrs);
+  }
+
+  static hyphenation(attrs) {
+    return new Hyphenation(attrs);
+  }
+
+  static image(attrs) {
+    return new Image(attrs);
+  }
+
+  static imageEdit(attrs) {
+    return new ImageEdit(attrs);
+  }
+
+  static integer(attrs) {
+    return new Integer(attrs);
+  }
+
+  static issuers(attrs) {
+    return new Issuers(attrs);
+  }
+
+  static items(attrs) {
+    return new Items(attrs);
+  }
+
+  static keep(attrs) {
+    return new Keep(attrs);
+  }
+
+  static keyUsage(attrs) {
+    return new KeyUsage(attrs);
+  }
+
+  static line(attrs) {
+    return new Line(attrs);
+  }
+
+  static linear(attrs) {
+    return new Linear(attrs);
+  }
+
+  static lockDocument(attrs) {
+    return new LockDocument(attrs);
+  }
+
+  static manifest(attrs) {
+    return new Manifest(attrs);
+  }
+
+  static margin(attrs) {
+    return new Margin(attrs);
+  }
+
+  static mdp(attrs) {
+    return new Mdp(attrs);
+  }
+
+  static medium(attrs) {
+    return new Medium(attrs);
+  }
+
+  static message(attrs) {
+    return new Message(attrs);
+  }
+
+  static numericEdit(attrs) {
+    return new NumericEdit(attrs);
+  }
+
+  static occur(attrs) {
+    return new Occur(attrs);
+  }
+
+  static oid(attrs) {
+    return new Oid(attrs);
+  }
+
+  static oids(attrs) {
+    return new Oids(attrs);
+  }
+
+  static overflow(attrs) {
+    return new Overflow(attrs);
+  }
+
+  static pageArea(attrs) {
+    return new PageArea(attrs);
+  }
+
+  static pageSet(attrs) {
+    return new PageSet(attrs);
+  }
+
+  static para(attrs) {
+    return new Para(attrs);
+  }
+
+  static passwordEdit(attrs) {
+    return new PasswordEdit(attrs);
+  }
+
+  static pattern(attrs) {
+    return new Pattern(attrs);
+  }
+
+  static picture(attrs) {
+    return new Picture(attrs);
+  }
+
+  static proto(attrs) {
+    return new Proto(attrs);
+  }
+
+  static radial(attrs) {
+    return new Radial(attrs);
+  }
+
+  static reason(attrs) {
+    return new Reason(attrs);
+  }
+
+  static reasons(attrs) {
+    return new Reasons(attrs);
+  }
+
+  static rectangle(attrs) {
+    return new Rectangle(attrs);
+  }
+
+  static ref(attrs) {
+    return new RefElement(attrs);
+  }
+
+  static script(attrs) {
+    return new Script(attrs);
+  }
+
+  static setProperty(attrs) {
+    return new SetProperty(attrs);
+  }
+
+  static signData(attrs) {
+    return new SignData(attrs);
+  }
+
+  static signature(attrs) {
+    return new Signature(attrs);
+  }
+
+  static signing(attrs) {
+    return new Signing(attrs);
+  }
+
+  static solid(attrs) {
+    return new Solid(attrs);
+  }
+
+  static speak(attrs) {
+    return new Speak(attrs);
+  }
+
+  static stipple(attrs) {
+    return new Stipple(attrs);
+  }
+
+  static subform(attrs) {
+    return new Subform(attrs);
+  }
+
+  static subformSet(attrs) {
+    return new SubformSet(attrs);
+  }
+
+  static subjectDN(attrs) {
+    return new SubjectDN(attrs);
+  }
+
+  static subjectDNs(attrs) {
+    return new SubjectDNs(attrs);
+  }
+
+  static submit(attrs) {
+    return new Submit(attrs);
+  }
+
+  static template(attrs) {
+    return new Template(attrs);
+  }
+
+  static text(attrs) {
+    return new Text(attrs);
+  }
+
+  static textEdit(attrs) {
+    return new TextEdit(attrs);
+  }
+
+  static time(attrs) {
+    return new Time(attrs);
+  }
+
+  static timeStamp(attrs) {
+    return new TimeStamp(attrs);
+  }
+
+  static toolTip(attrs) {
+    return new ToolTip(attrs);
+  }
+
+  static traversal(attrs) {
+    return new Traversal(attrs);
+  }
+
+  static traverse(attrs) {
+    return new Traverse(attrs);
+  }
+
+  static ui(attrs) {
+    return new Ui(attrs);
+  }
+
+  static validate(attrs) {
+    return new Validate(attrs);
+  }
+
+  static value(attrs) {
+    return new Value(attrs);
+  }
+
+  static variables(attrs) {
+    return new Variables(attrs);
+  }
+
+}
+
+exports.TemplateNamespace = TemplateNamespace;
+
+/***/ }),
+/* 83 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.addHTML = addHTML;
+exports.checkDimensions = checkDimensions;
+exports.flushHTML = flushHTML;
+exports.getAvailableSpace = getAvailableSpace;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _html_utils = __w_pdfjs_require__(84);
+
+function createLine(node, children) {
+  return {
+    name: "div",
+    attributes: {
+      class: [node.layout === "lr-tb" ? "xfaLr" : "xfaRl"]
+    },
+    children
+  };
+}
+
+function flushHTML(node) {
+  if (!node[_xfa_object.$extra]) {
+    return null;
+  }
+
+  const attributes = node[_xfa_object.$extra].attributes;
+  const html = {
+    name: "div",
+    attributes,
+    children: node[_xfa_object.$extra].children
+  };
+
+  if (node[_xfa_object.$extra].failingNode) {
+    const htmlFromFailing = node[_xfa_object.$extra].failingNode[_xfa_object.$flushHTML]();
+
+    if (htmlFromFailing) {
+      if (node.layout.endsWith("-tb")) {
+        html.children.push(createLine(node, [htmlFromFailing]));
+      } else {
+        html.children.push(htmlFromFailing);
+      }
+    }
+  }
+
+  if (html.children.length === 0) {
+    return null;
+  }
+
+  return html;
+}
+
+function addHTML(node, html, bbox) {
+  const extra = node[_xfa_object.$extra];
+  const availableSpace = extra.availableSpace;
+  const [x, y, w, h] = bbox;
+
+  switch (node.layout) {
+    case "position":
+      {
+        extra.width = Math.max(extra.width, x + w);
+        extra.height = Math.max(extra.height, y + h);
+        extra.children.push(html);
+        break;
+      }
+
+    case "lr-tb":
+    case "rl-tb":
+      if (!extra.line || extra.attempt === 1) {
+        extra.line = createLine(node, []);
+        extra.children.push(extra.line);
+        extra.numberInLine = 0;
+      }
+
+      extra.numberInLine += 1;
+      extra.line.children.push(html);
+
+      if (extra.attempt === 0) {
+        extra.currentWidth += w;
+        extra.height = Math.max(extra.height, extra.prevHeight + h);
+      } else {
+        extra.currentWidth = w;
+        extra.prevHeight = extra.height;
+        extra.height += h;
+        extra.attempt = 0;
+      }
+
+      extra.width = Math.max(extra.width, extra.currentWidth);
+      break;
+
+    case "rl-row":
+    case "row":
+      {
+        extra.children.push(html);
+        extra.width += w;
+        extra.height = Math.max(extra.height, h);
+        const height = (0, _html_utils.measureToString)(extra.height);
+
+        for (const child of extra.children) {
+          child.attributes.style.height = height;
+        }
+
+        break;
+      }
+
+    case "table":
+      {
+        extra.width = Math.min(availableSpace.width, Math.max(extra.width, w));
+        extra.height += h;
+        extra.children.push(html);
+        break;
+      }
+
+    case "tb":
+      {
+        extra.width = Math.min(availableSpace.width, Math.max(extra.width, w));
+        extra.height += h;
+        extra.children.push(html);
+        break;
+      }
+  }
+}
+
+function getAvailableSpace(node) {
+  const availableSpace = node[_xfa_object.$extra].availableSpace;
+  const marginV = node.margin ? node.margin.topInset + node.margin.bottomInset : 0;
+  const marginH = node.margin ? node.margin.leftInset + node.margin.rightInset : 0;
+
+  switch (node.layout) {
+    case "lr-tb":
+    case "rl-tb":
+      if (node[_xfa_object.$extra].attempt === 0) {
+        return {
+          width: availableSpace.width - marginH - node[_xfa_object.$extra].currentWidth,
+          height: availableSpace.height - marginV - node[_xfa_object.$extra].prevHeight
+        };
+      }
+
+      return {
+        width: availableSpace.width - marginH,
+        height: availableSpace.height - marginV - node[_xfa_object.$extra].height
+      };
+
+    case "rl-row":
+    case "row":
+      const width = node[_xfa_object.$extra].columnWidths.slice(node[_xfa_object.$extra].currentColumn).reduce((a, x) => a + x);
+
+      return {
+        width,
+        height: availableSpace.height - marginH
+      };
+
+    case "table":
+    case "tb":
+      return {
+        width: availableSpace.width - marginH,
+        height: availableSpace.height - marginV - node[_xfa_object.$extra].height
+      };
+
+    case "position":
+    default:
+      return availableSpace;
+  }
+}
+
+function getTransformedBBox(node) {
+  let w = node.w === "" ? NaN : node.w;
+  let h = node.h === "" ? NaN : node.h;
+  let [centerX, centerY] = [0, 0];
+
+  switch (node.anchorType || "") {
+    case "bottomCenter":
+      [centerX, centerY] = [w / 2, h];
+      break;
+
+    case "bottomLeft":
+      [centerX, centerY] = [0, h];
+      break;
+
+    case "bottomRight":
+      [centerX, centerY] = [w, h];
+      break;
+
+    case "middleCenter":
+      [centerX, centerY] = [w / 2, h / 2];
+      break;
+
+    case "middleLeft":
+      [centerX, centerY] = [0, h / 2];
+      break;
+
+    case "middleRight":
+      [centerX, centerY] = [w, h / 2];
+      break;
+
+    case "topCenter":
+      [centerX, centerY] = [w / 2, 0];
+      break;
+
+    case "topRight":
+      [centerX, centerY] = [w, 0];
+      break;
+  }
+
+  let x, y;
+
+  switch (node.rotate || 0) {
+    case 0:
+      [x, y] = [-centerX, -centerY];
+      break;
+
+    case 90:
+      [x, y] = [-centerY, centerX];
+      [w, h] = [h, -w];
+      break;
+
+    case 180:
+      [x, y] = [centerX, centerY];
+      [w, h] = [-w, -h];
+      break;
+
+    case 270:
+      [x, y] = [centerY, -centerX];
+      [w, h] = [-h, w];
+      break;
+  }
+
+  return [node.x + x + Math.min(0, w), node.y + y + Math.min(0, h), Math.abs(w), Math.abs(h)];
+}
+
+function checkDimensions(node, space) {
+  if (node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].firstUnsplittable === null) {
+    return true;
+  }
+
+  if (node.w === 0 || node.h === 0) {
+    return true;
+  }
+
+  const ERROR = 2;
+
+  const parent = node[_xfa_object.$getSubformParent]();
+
+  const attempt = parent[_xfa_object.$extra] && parent[_xfa_object.$extra].attempt || 0;
+  const [, y, w, h] = getTransformedBBox(node);
+
+  switch (parent.layout) {
+    case "lr-tb":
+    case "rl-tb":
+      if (attempt === 0) {
+        if (!node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].noLayoutFailure) {
+          if (node.h !== "" && Math.round(h - space.height) > ERROR) {
+            return false;
+          }
+
+          if (node.w !== "") {
+            if (Math.round(w - space.width) <= ERROR) {
+              return true;
+            }
+
+            if (parent[_xfa_object.$extra].numberInLine === 0) {
+              return space.height > ERROR;
+            }
+
+            return false;
+          }
+
+          return space.width > ERROR;
+        }
+
+        if (node.w !== "") {
+          return Math.round(w - space.width) <= ERROR;
+        }
+
+        return space.width > ERROR;
+      }
+
+      if (node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].noLayoutFailure) {
+        return true;
+      }
+
+      if (node.h !== "" && Math.round(h - space.height) > ERROR) {
+        return false;
+      }
+
+      if (node.w === "" || Math.round(w - space.width) <= ERROR) {
+        return space.height > ERROR;
+      }
+
+      if (parent[_xfa_object.$isThereMoreWidth]()) {
+        return false;
+      }
+
+      return space.height > ERROR;
+
+    case "table":
+    case "tb":
+      if (node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].noLayoutFailure) {
+        return true;
+      }
+
+      if (node.h !== "" && !node[_xfa_object.$isSplittable]()) {
+        return Math.round(h - space.height) <= ERROR;
+      }
+
+      if (node.w === "" || Math.round(w - space.width) <= ERROR) {
+        return space.height > ERROR;
+      }
+
+      if (parent[_xfa_object.$isThereMoreWidth]()) {
+        return false;
+      }
+
+      return space.height > ERROR;
+
+    case "position":
+      if (node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].noLayoutFailure) {
+        return true;
+      }
+
+      if (node.h === "" || Math.round(h + y - space.height) <= ERROR) {
+        return true;
+      }
+
+      const area = node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].currentContentArea;
+
+      return h + y > area.h;
+
+    case "rl-row":
+    case "row":
+      if (node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].noLayoutFailure) {
+        return true;
+      }
+
+      if (node.h !== "") {
+        return Math.round(h - space.height) <= ERROR;
+      }
+
+      return true;
+
+    default:
+      return true;
+  }
+}
+
+/***/ }),
+/* 84 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.computeBbox = computeBbox;
+exports.createWrapper = createWrapper;
+exports.fixDimensions = fixDimensions;
+exports.fixTextIndent = fixTextIndent;
+exports.fixURL = fixURL;
+exports.isPrintOnly = isPrintOnly;
+exports.layoutClass = layoutClass;
+exports.layoutNode = layoutNode;
+exports.measureToString = measureToString;
+exports.setAccess = setAccess;
+exports.setFontFamily = setFontFamily;
+exports.setMinMaxDimensions = setMinMaxDimensions;
+exports.setPara = setPara;
+exports.toStyle = toStyle;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _util = __w_pdfjs_require__(2);
+
+var _utils = __w_pdfjs_require__(78);
+
+var _fonts = __w_pdfjs_require__(85);
+
+var _text = __w_pdfjs_require__(86);
+
+function measureToString(m) {
+  if (typeof m === "string") {
+    return "0px";
+  }
+
+  return Number.isInteger(m) ? `${m}px` : `${m.toFixed(2)}px`;
+}
+
+const converters = {
+  anchorType(node, style) {
+    const parent = node[_xfa_object.$getSubformParent]();
+
+    if (!parent || parent.layout && parent.layout !== "position") {
+      return;
+    }
+
+    if (!("transform" in style)) {
+      style.transform = "";
+    }
+
+    switch (node.anchorType) {
+      case "bottomCenter":
+        style.transform += "translate(-50%, -100%)";
+        break;
+
+      case "bottomLeft":
+        style.transform += "translate(0,-100%)";
+        break;
+
+      case "bottomRight":
+        style.transform += "translate(-100%,-100%)";
+        break;
+
+      case "middleCenter":
+        style.transform += "translate(-50%,-50%)";
+        break;
+
+      case "middleLeft":
+        style.transform += "translate(0,-50%)";
+        break;
+
+      case "middleRight":
+        style.transform += "translate(-100%,-50%)";
+        break;
+
+      case "topCenter":
+        style.transform += "translate(-50%,0)";
+        break;
+
+      case "topRight":
+        style.transform += "translate(-100%,0)";
+        break;
+    }
+  },
+
+  dimensions(node, style) {
+    const parent = node[_xfa_object.$getSubformParent]();
+
+    let width = node.w;
+    const height = node.h;
+
+    if (parent.layout && parent.layout.includes("row")) {
+      const extra = parent[_xfa_object.$extra];
+      const colSpan = node.colSpan;
+      let w;
+
+      if (colSpan === -1) {
+        w = extra.columnWidths.slice(extra.currentColumn).reduce((a, x) => a + x, 0);
+        extra.currentColumn = 0;
+      } else {
+        w = extra.columnWidths.slice(extra.currentColumn, extra.currentColumn + colSpan).reduce((a, x) => a + x, 0);
+        extra.currentColumn = (extra.currentColumn + node.colSpan) % extra.columnWidths.length;
+      }
+
+      if (!isNaN(w)) {
+        width = node.w = w;
+      }
+    }
+
+    if (width !== "") {
+      style.width = measureToString(width);
+    } else {
+      style.width = "auto";
+    }
+
+    if (height !== "") {
+      style.height = measureToString(height);
+    } else {
+      style.height = "auto";
+    }
+  },
+
+  position(node, style) {
+    const parent = node[_xfa_object.$getSubformParent]();
+
+    if (parent && parent.layout && parent.layout !== "position") {
+      return;
+    }
+
+    style.position = "absolute";
+    style.left = measureToString(node.x);
+    style.top = measureToString(node.y);
+  },
+
+  rotate(node, style) {
+    if (node.rotate) {
+      if (!("transform" in style)) {
+        style.transform = "";
+      }
+
+      style.transform += `rotate(-${node.rotate}deg)`;
+      style.transformOrigin = "top left";
+    }
+  },
+
+  presence(node, style) {
+    switch (node.presence) {
+      case "invisible":
+        style.visibility = "hidden";
+        break;
+
+      case "hidden":
+      case "inactive":
+        style.display = "none";
+        break;
+    }
+  },
+
+  hAlign(node, style) {
+    if (node[_xfa_object.$nodeName] === "para") {
+      switch (node.hAlign) {
+        case "justifyAll":
+          style.textAlign = "justify-all";
+          break;
+
+        case "radix":
+          style.textAlign = "left";
+          break;
+
+        default:
+          style.textAlign = node.hAlign;
+      }
+    } else {
+      switch (node.hAlign) {
+        case "left":
+          style.alignSelf = "start";
+          break;
+
+        case "center":
+          style.alignSelf = "center";
+          break;
+
+        case "right":
+          style.alignSelf = "end";
+          break;
+      }
+    }
+  },
+
+  margin(node, style) {
+    if (node.margin) {
+      style.margin = node.margin[_xfa_object.$toStyle]().margin;
+    }
+  }
+
+};
+
+function setMinMaxDimensions(node, style) {
+  const parent = node[_xfa_object.$getSubformParent]();
+
+  if (parent.layout === "position") {
+    if (node.minW > 0) {
+      style.minWidth = measureToString(node.minW);
+    }
+
+    if (node.maxW > 0) {
+      style.maxWidth = measureToString(node.maxW);
+    }
+
+    if (node.minH > 0) {
+      style.minHeight = measureToString(node.minH);
+    }
+
+    if (node.maxH > 0) {
+      style.maxHeight = measureToString(node.maxH);
+    }
+  }
+}
+
+function layoutText(text, xfaFont, margin, lineHeight, fontFinder, width) {
+  const measure = new _text.TextMeasure(xfaFont, margin, lineHeight, fontFinder);
+
+  if (typeof text === "string") {
+    measure.addString(text);
+  } else {
+    text[_xfa_object.$pushGlyphs](measure);
+  }
+
+  return measure.compute(width);
+}
+
+function layoutNode(node, availableSpace) {
+  let height = null;
+  let width = null;
+  let isBroken = false;
+
+  if ((!node.w || !node.h) && node.value) {
+    let marginH = 0;
+    let marginV = 0;
+
+    if (node.margin) {
+      marginH = node.margin.leftInset + node.margin.rightInset;
+      marginV = node.margin.topInset + node.margin.bottomInset;
+    }
+
+    let lineHeight = null;
+    let margin = null;
+
+    if (node.para) {
+      margin = Object.create(null);
+      lineHeight = node.para.lineHeight === "" ? null : node.para.lineHeight;
+      margin.top = node.para.spaceAbove === "" ? 0 : node.para.spaceAbove;
+      margin.bottom = node.para.spaceBelow === "" ? 0 : node.para.spaceBelow;
+      margin.left = node.para.marginLeft === "" ? 0 : node.para.marginLeft;
+      margin.right = node.para.marginRight === "" ? 0 : node.para.marginRight;
+    }
+
+    let font = node.font;
+
+    if (!font) {
+      const root = node[_xfa_object.$getTemplateRoot]();
+
+      let parent = node[_xfa_object.$getParent]();
+
+      while (parent && parent !== root) {
+        if (parent.font) {
+          font = parent.font;
+          break;
+        }
+
+        parent = parent[_xfa_object.$getParent]();
+      }
+    }
+
+    const maxWidth = (node.w || availableSpace.width) - marginH;
+    const fontFinder = node[_xfa_object.$globalData].fontFinder;
+
+    if (node.value.exData && node.value.exData[_xfa_object.$content] && node.value.exData.contentType === "text/html") {
+      const res = layoutText(node.value.exData[_xfa_object.$content], font, margin, lineHeight, fontFinder, maxWidth);
+      width = res.width;
+      height = res.height;
+      isBroken = res.isBroken;
+    } else {
+      const text = node.value[_xfa_object.$text]();
+
+      if (text) {
+        const res = layoutText(text, font, margin, lineHeight, fontFinder, maxWidth);
+        width = res.width;
+        height = res.height;
+        isBroken = res.isBroken;
+      }
+    }
+
+    if (width !== null && !node.w) {
+      width += marginH;
+    }
+
+    if (height !== null && !node.h) {
+      height += marginV;
+    }
+  }
+
+  return {
+    w: width,
+    h: height,
+    isBroken
+  };
+}
+
+function computeBbox(node, html, availableSpace) {
+  let bbox;
+
+  if (node.w !== "" && node.h !== "") {
+    bbox = [node.x, node.y, node.w, node.h];
+  } else {
+    if (!availableSpace) {
+      return null;
+    }
+
+    let width = node.w;
+
+    if (width === "") {
+      if (node.maxW === 0) {
+        const parent = node[_xfa_object.$getSubformParent]();
+
+        if (parent.layout === "position" && parent.w !== "") {
+          width = 0;
+        } else {
+          width = node.minW;
+        }
+      } else {
+        width = Math.min(node.maxW, availableSpace.width);
+      }
+
+      html.attributes.style.width = measureToString(width);
+    }
+
+    let height = node.h;
+
+    if (height === "") {
+      if (node.maxH === 0) {
+        const parent = node[_xfa_object.$getSubformParent]();
+
+        if (parent.layout === "position" && parent.h !== "") {
+          height = 0;
+        } else {
+          height = node.minH;
+        }
+      } else {
+        height = Math.min(node.maxH, availableSpace.height);
+      }
+
+      html.attributes.style.height = measureToString(height);
+    }
+
+    bbox = [node.x, node.y, width, height];
+  }
+
+  return bbox;
+}
+
+function fixDimensions(node) {
+  const parent = node[_xfa_object.$getSubformParent]();
+
+  if (parent.layout && parent.layout.includes("row")) {
+    const extra = parent[_xfa_object.$extra];
+    const colSpan = node.colSpan;
+    let width;
+
+    if (colSpan === -1) {
+      width = extra.columnWidths.slice(extra.currentColumn).reduce((a, w) => a + w, 0);
+    } else {
+      width = extra.columnWidths.slice(extra.currentColumn, extra.currentColumn + colSpan).reduce((a, w) => a + w, 0);
+    }
+
+    if (!isNaN(width)) {
+      node.w = width;
+    }
+  }
+
+  if (parent.layout && parent.layout !== "position") {
+    node.x = node.y = 0;
+  }
+
+  if (node.layout === "table") {
+    if (node.w === "" && Array.isArray(node.columnWidths)) {
+      node.w = node.columnWidths.reduce((a, x) => a + x, 0);
+    }
+  }
+}
+
+function layoutClass(node) {
+  switch (node.layout) {
+    case "position":
+      return "xfaPosition";
+
+    case "lr-tb":
+      return "xfaLrTb";
+
+    case "rl-row":
+      return "xfaRlRow";
+
+    case "rl-tb":
+      return "xfaRlTb";
+
+    case "row":
+      return "xfaRow";
+
+    case "table":
+      return "xfaTable";
+
+    case "tb":
+      return "xfaTb";
+
+    default:
+      return "xfaPosition";
+  }
+}
+
+function toStyle(node, ...names) {
+  const style = Object.create(null);
+
+  for (const name of names) {
+    const value = node[name];
+
+    if (value === null) {
+      continue;
+    }
+
+    if (converters.hasOwnProperty(name)) {
+      converters[name](node, style);
+      continue;
+    }
+
+    if (value instanceof _xfa_object.XFAObject) {
+      const newStyle = value[_xfa_object.$toStyle]();
+
+      if (newStyle) {
+        Object.assign(style, newStyle);
+      } else {
+        (0, _util.warn)(`(DEBUG) - XFA - style for ${name} not implemented yet`);
+      }
+    }
+  }
+
+  return style;
+}
+
+function createWrapper(node, html) {
+  const {
+    attributes
+  } = html;
+  const {
+    style
+  } = attributes;
+  const wrapper = {
+    name: "div",
+    attributes: {
+      class: ["xfaWrapper"],
+      style: Object.create(null)
+    },
+    children: []
+  };
+  attributes.class.push("xfaWrapped");
+
+  if (node.border) {
+    const {
+      widths,
+      insets
+    } = node.border[_xfa_object.$extra];
+    let width, height;
+    let top = insets[0];
+    let left = insets[3];
+    const insetsH = insets[0] + insets[2];
+    const insetsW = insets[1] + insets[3];
+
+    switch (node.border.hand) {
+      case "even":
+        top -= widths[0] / 2;
+        left -= widths[3] / 2;
+        width = `calc(100% + ${(widths[1] + widths[3]) / 2 - insetsW}px)`;
+        height = `calc(100% + ${(widths[0] + widths[2]) / 2 - insetsH}px)`;
+        break;
+
+      case "left":
+        top -= widths[0];
+        left -= widths[3];
+        width = `calc(100% + ${widths[1] + widths[3] - insetsW}px)`;
+        height = `calc(100% + ${widths[0] + widths[2] - insetsH}px)`;
+        break;
+
+      case "right":
+        width = insetsW ? `calc(100% - ${insetsW}px)` : "100%";
+        height = insetsH ? `calc(100% - ${insetsH}px)` : "100%";
+        break;
+    }
+
+    const classNames = ["xfaBorder"];
+
+    if (isPrintOnly(node.border)) {
+      classNames.push("xfaPrintOnly");
+    }
+
+    const border = {
+      name: "div",
+      attributes: {
+        class: classNames,
+        style: {
+          top: `${top}px`,
+          left: `${left}px`,
+          width,
+          height
+        }
+      },
+      children: []
+    };
+
+    for (const key of ["border", "borderWidth", "borderColor", "borderRadius", "borderStyle"]) {
+      if (style[key] !== undefined) {
+        border.attributes.style[key] = style[key];
+        delete style[key];
+      }
+    }
+
+    wrapper.children.push(border, html);
+  } else {
+    wrapper.children.push(html);
+  }
+
+  for (const key of ["background", "backgroundClip", "top", "left", "width", "height", "minWidth", "minHeight", "maxWidth", "maxHeight", "transform", "transformOrigin", "visibility"]) {
+    if (style[key] !== undefined) {
+      wrapper.attributes.style[key] = style[key];
+      delete style[key];
+    }
+  }
+
+  if (style.position === "absolute") {
+    wrapper.attributes.style.position = "absolute";
+  } else {
+    wrapper.attributes.style.position = "relative";
+  }
+
+  delete style.position;
+
+  if (style.alignSelf) {
+    wrapper.attributes.style.alignSelf = style.alignSelf;
+    delete style.alignSelf;
+  }
+
+  return wrapper;
+}
+
+function fixTextIndent(styles) {
+  const indent = (0, _utils.getMeasurement)(styles.textIndent, "0px");
+
+  if (indent >= 0) {
+    return;
+  }
+
+  const align = styles.textAlign === "right" ? "right" : "left";
+  const name = "padding" + (align === "left" ? "Left" : "Right");
+  const padding = (0, _utils.getMeasurement)(styles[name], "0px");
+  styles[name] = `${padding - indent}px`;
+}
+
+function setAccess(node, classNames) {
+  switch (node.access) {
+    case "nonInteractive":
+      classNames.push("xfaNonInteractive");
+      break;
+
+    case "readOnly":
+      classNames.push("xfaReadOnly");
+      break;
+
+    case "protected":
+      classNames.push("xfaDisabled");
+      break;
+  }
+}
+
+function isPrintOnly(node) {
+  return node.relevant.length > 0 && !node.relevant[0].excluded && node.relevant[0].viewname === "print";
+}
+
+function getCurrentPara(node) {
+  const stack = node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].paraStack;
+
+  return stack.length ? stack.at(-1) : null;
+}
+
+function setPara(node, nodeStyle, value) {
+  if (value.attributes.class && value.attributes.class.includes("xfaRich")) {
+    if (nodeStyle) {
+      if (node.h === "") {
+        nodeStyle.height = "auto";
+      }
+
+      if (node.w === "") {
+        nodeStyle.width = "auto";
+      }
+    }
+
+    const para = getCurrentPara(node);
+
+    if (para) {
+      const valueStyle = value.attributes.style;
+      valueStyle.display = "flex";
+      valueStyle.flexDirection = "column";
+
+      switch (para.vAlign) {
+        case "top":
+          valueStyle.justifyContent = "start";
+          break;
+
+        case "bottom":
+          valueStyle.justifyContent = "end";
+          break;
+
+        case "middle":
+          valueStyle.justifyContent = "center";
+          break;
+      }
+
+      const paraStyle = para[_xfa_object.$toStyle]();
+
+      for (const [key, val] of Object.entries(paraStyle)) {
+        if (!(key in valueStyle)) {
+          valueStyle[key] = val;
+        }
+      }
+    }
+  }
+}
+
+function setFontFamily(xfaFont, node, fontFinder, style) {
+  if (!fontFinder) {
+    delete style.fontFamily;
+    return;
+  }
+
+  const name = (0, _utils.stripQuotes)(xfaFont.typeface);
+  style.fontFamily = `"${name}"`;
+  const typeface = fontFinder.find(name);
+
+  if (typeface) {
+    const {
+      fontFamily
+    } = typeface.regular.cssFontInfo;
+
+    if (fontFamily !== name) {
+      style.fontFamily = `"${fontFamily}"`;
+    }
+
+    const para = getCurrentPara(node);
+
+    if (para && para.lineHeight !== "") {
+      return;
+    }
+
+    if (style.lineHeight) {
+      return;
+    }
+
+    const pdfFont = (0, _fonts.selectFont)(xfaFont, typeface);
+
+    if (pdfFont) {
+      style.lineHeight = Math.max(1.2, pdfFont.lineHeight);
+    }
+  }
+}
+
+function fixURL(str) {
+  const absoluteUrl = (0, _util.createValidAbsoluteUrl)(str, null, {
+    addDefaultProtocol: true,
+    tryConvertEncoding: true
+  });
+  return absoluteUrl ? absoluteUrl.href : null;
+}
+
+/***/ }),
+/* 85 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.FontFinder = void 0;
+exports.getMetrics = getMetrics;
+exports.selectFont = selectFont;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _utils = __w_pdfjs_require__(78);
+
+var _util = __w_pdfjs_require__(2);
+
+class FontFinder {
+  constructor(pdfFonts) {
+    this.fonts = new Map();
+    this.cache = new Map();
+    this.warned = new Set();
+    this.defaultFont = null;
+    this.add(pdfFonts);
+  }
+
+  add(pdfFonts, reallyMissingFonts = null) {
+    for (const pdfFont of pdfFonts) {
+      this.addPdfFont(pdfFont);
+    }
+
+    for (const pdfFont of this.fonts.values()) {
+      if (!pdfFont.regular) {
+        pdfFont.regular = pdfFont.italic || pdfFont.bold || pdfFont.bolditalic;
+      }
+    }
+
+    if (!reallyMissingFonts || reallyMissingFonts.size === 0) {
+      return;
+    }
+
+    const myriad = this.fonts.get("PdfJS-Fallback-PdfJS-XFA");
+
+    for (const missing of reallyMissingFonts) {
+      this.fonts.set(missing, myriad);
+    }
+  }
+
+  addPdfFont(pdfFont) {
+    const cssFontInfo = pdfFont.cssFontInfo;
+    const name = cssFontInfo.fontFamily;
+    let font = this.fonts.get(name);
+
+    if (!font) {
+      font = Object.create(null);
+      this.fonts.set(name, font);
+
+      if (!this.defaultFont) {
+        this.defaultFont = font;
+      }
+    }
+
+    let property = "";
+    const fontWeight = parseFloat(cssFontInfo.fontWeight);
+
+    if (parseFloat(cssFontInfo.italicAngle) !== 0) {
+      property = fontWeight >= 700 ? "bolditalic" : "italic";
+    } else if (fontWeight >= 700) {
+      property = "bold";
+    }
+
+    if (!property) {
+      if (pdfFont.name.includes("Bold") || pdfFont.psName && pdfFont.psName.includes("Bold")) {
+        property = "bold";
+      }
+
+      if (pdfFont.name.includes("Italic") || pdfFont.name.endsWith("It") || pdfFont.psName && (pdfFont.psName.includes("Italic") || pdfFont.psName.endsWith("It"))) {
+        property += "italic";
+      }
+    }
+
+    if (!property) {
+      property = "regular";
+    }
+
+    font[property] = pdfFont;
+  }
+
+  getDefault() {
+    return this.defaultFont;
+  }
+
+  find(fontName, mustWarn = true) {
+    let font = this.fonts.get(fontName) || this.cache.get(fontName);
+
+    if (font) {
+      return font;
+    }
+
+    const pattern = /,|-|_| |bolditalic|bold|italic|regular|it/gi;
+    let name = fontName.replace(pattern, "");
+    font = this.fonts.get(name);
+
+    if (font) {
+      this.cache.set(fontName, font);
+      return font;
+    }
+
+    name = name.toLowerCase();
+    const maybe = [];
+
+    for (const [family, pdfFont] of this.fonts.entries()) {
+      if (family.replace(pattern, "").toLowerCase().startsWith(name)) {
+        maybe.push(pdfFont);
+      }
+    }
+
+    if (maybe.length === 0) {
+      for (const [, pdfFont] of this.fonts.entries()) {
+        if (pdfFont.regular.name && pdfFont.regular.name.replace(pattern, "").toLowerCase().startsWith(name)) {
+          maybe.push(pdfFont);
+        }
+      }
+    }
+
+    if (maybe.length === 0) {
+      name = name.replace(/psmt|mt/gi, "");
+
+      for (const [family, pdfFont] of this.fonts.entries()) {
+        if (family.replace(pattern, "").toLowerCase().startsWith(name)) {
+          maybe.push(pdfFont);
+        }
+      }
+    }
+
+    if (maybe.length === 0) {
+      for (const pdfFont of this.fonts.values()) {
+        if (pdfFont.regular.name && pdfFont.regular.name.replace(pattern, "").toLowerCase().startsWith(name)) {
+          maybe.push(pdfFont);
+        }
+      }
+    }
+
+    if (maybe.length >= 1) {
+      if (maybe.length !== 1 && mustWarn) {
+        (0, _util.warn)(`XFA - Too many choices to guess the correct font: ${fontName}`);
+      }
+
+      this.cache.set(fontName, maybe[0]);
+      return maybe[0];
+    }
+
+    if (mustWarn && !this.warned.has(fontName)) {
+      this.warned.add(fontName);
+      (0, _util.warn)(`XFA - Cannot find the font: ${fontName}`);
+    }
+
+    return null;
+  }
+
+}
+
+exports.FontFinder = FontFinder;
+
+function selectFont(xfaFont, typeface) {
+  if (xfaFont.posture === "italic") {
+    if (xfaFont.weight === "bold") {
+      return typeface.bolditalic;
+    }
+
+    return typeface.italic;
+  } else if (xfaFont.weight === "bold") {
+    return typeface.bold;
+  }
+
+  return typeface.regular;
+}
+
+function getMetrics(xfaFont, real = false) {
+  let pdfFont = null;
+
+  if (xfaFont) {
+    const name = (0, _utils.stripQuotes)(xfaFont.typeface);
+
+    const typeface = xfaFont[_xfa_object.$globalData].fontFinder.find(name);
+
+    pdfFont = selectFont(xfaFont, typeface);
+  }
+
+  if (!pdfFont) {
+    return {
+      lineHeight: 12,
+      lineGap: 2,
+      lineNoGap: 10
+    };
+  }
+
+  const size = xfaFont.size || 10;
+  const lineHeight = pdfFont.lineHeight ? Math.max(real ? 0 : 1.2, pdfFont.lineHeight) : 1.2;
+  const lineGap = pdfFont.lineGap === undefined ? 0.2 : pdfFont.lineGap;
+  return {
+    lineHeight: lineHeight * size,
+    lineGap: lineGap * size,
+    lineNoGap: Math.max(1, lineHeight - lineGap) * size
+  };
+}
+
+/***/ }),
+/* 86 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.TextMeasure = void 0;
+
+var _fonts = __w_pdfjs_require__(85);
+
+const WIDTH_FACTOR = 1.02;
+
+class FontInfo {
+  constructor(xfaFont, margin, lineHeight, fontFinder) {
+    this.lineHeight = lineHeight;
+    this.paraMargin = margin || {
+      top: 0,
+      bottom: 0,
+      left: 0,
+      right: 0
+    };
+
+    if (!xfaFont) {
+      [this.pdfFont, this.xfaFont] = this.defaultFont(fontFinder);
+      return;
+    }
+
+    this.xfaFont = {
+      typeface: xfaFont.typeface,
+      posture: xfaFont.posture,
+      weight: xfaFont.weight,
+      size: xfaFont.size,
+      letterSpacing: xfaFont.letterSpacing
+    };
+    const typeface = fontFinder.find(xfaFont.typeface);
+
+    if (!typeface) {
+      [this.pdfFont, this.xfaFont] = this.defaultFont(fontFinder);
+      return;
+    }
+
+    this.pdfFont = (0, _fonts.selectFont)(xfaFont, typeface);
+
+    if (!this.pdfFont) {
+      [this.pdfFont, this.xfaFont] = this.defaultFont(fontFinder);
+    }
+  }
+
+  defaultFont(fontFinder) {
+    const font = fontFinder.find("Helvetica", false) || fontFinder.find("Myriad Pro", false) || fontFinder.find("Arial", false) || fontFinder.getDefault();
+
+    if (font && font.regular) {
+      const pdfFont = font.regular;
+      const info = pdfFont.cssFontInfo;
+      const xfaFont = {
+        typeface: info.fontFamily,
+        posture: "normal",
+        weight: "normal",
+        size: 10,
+        letterSpacing: 0
+      };
+      return [pdfFont, xfaFont];
+    }
+
+    const xfaFont = {
+      typeface: "Courier",
+      posture: "normal",
+      weight: "normal",
+      size: 10,
+      letterSpacing: 0
+    };
+    return [null, xfaFont];
+  }
+
+}
+
+class FontSelector {
+  constructor(defaultXfaFont, defaultParaMargin, defaultLineHeight, fontFinder) {
+    this.fontFinder = fontFinder;
+    this.stack = [new FontInfo(defaultXfaFont, defaultParaMargin, defaultLineHeight, fontFinder)];
+  }
+
+  pushData(xfaFont, margin, lineHeight) {
+    const lastFont = this.stack.at(-1);
+
+    for (const name of ["typeface", "posture", "weight", "size", "letterSpacing"]) {
+      if (!xfaFont[name]) {
+        xfaFont[name] = lastFont.xfaFont[name];
+      }
+    }
+
+    for (const name of ["top", "bottom", "left", "right"]) {
+      if (isNaN(margin[name])) {
+        margin[name] = lastFont.paraMargin[name];
+      }
+    }
+
+    const fontInfo = new FontInfo(xfaFont, margin, lineHeight || lastFont.lineHeight, this.fontFinder);
+
+    if (!fontInfo.pdfFont) {
+      fontInfo.pdfFont = lastFont.pdfFont;
+    }
+
+    this.stack.push(fontInfo);
+  }
+
+  popFont() {
+    this.stack.pop();
+  }
+
+  topFont() {
+    return this.stack.at(-1);
+  }
+
+}
+
+class TextMeasure {
+  constructor(defaultXfaFont, defaultParaMargin, defaultLineHeight, fonts) {
+    this.glyphs = [];
+    this.fontSelector = new FontSelector(defaultXfaFont, defaultParaMargin, defaultLineHeight, fonts);
+    this.extraHeight = 0;
+  }
+
+  pushData(xfaFont, margin, lineHeight) {
+    this.fontSelector.pushData(xfaFont, margin, lineHeight);
+  }
+
+  popFont(xfaFont) {
+    return this.fontSelector.popFont();
+  }
+
+  addPara() {
+    const lastFont = this.fontSelector.topFont();
+    this.extraHeight += lastFont.paraMargin.top + lastFont.paraMargin.bottom;
+  }
+
+  addString(str) {
+    if (!str) {
+      return;
+    }
+
+    const lastFont = this.fontSelector.topFont();
+    const fontSize = lastFont.xfaFont.size;
+
+    if (lastFont.pdfFont) {
+      const letterSpacing = lastFont.xfaFont.letterSpacing;
+      const pdfFont = lastFont.pdfFont;
+      const fontLineHeight = pdfFont.lineHeight || 1.2;
+      const lineHeight = lastFont.lineHeight || Math.max(1.2, fontLineHeight) * fontSize;
+      const lineGap = pdfFont.lineGap === undefined ? 0.2 : pdfFont.lineGap;
+      const noGap = fontLineHeight - lineGap;
+      const firstLineHeight = Math.max(1, noGap) * fontSize;
+      const scale = fontSize / 1000;
+      const fallbackWidth = pdfFont.defaultWidth || pdfFont.charsToGlyphs(" ")[0].width;
+
+      for (const line of str.split(/[\u2029\n]/)) {
+        const encodedLine = pdfFont.encodeString(line).join("");
+        const glyphs = pdfFont.charsToGlyphs(encodedLine);
+
+        for (const glyph of glyphs) {
+          const width = glyph.width || fallbackWidth;
+          this.glyphs.push([width * scale + letterSpacing, lineHeight, firstLineHeight, glyph.unicode, false]);
+        }
+
+        this.glyphs.push([0, 0, 0, "\n", true]);
+      }
+
+      this.glyphs.pop();
+      return;
+    }
+
+    for (const line of str.split(/[\u2029\n]/)) {
+      for (const char of line.split("")) {
+        this.glyphs.push([fontSize, 1.2 * fontSize, fontSize, char, false]);
+      }
+
+      this.glyphs.push([0, 0, 0, "\n", true]);
+    }
+
+    this.glyphs.pop();
+  }
+
+  compute(maxWidth) {
+    let lastSpacePos = -1,
+        lastSpaceWidth = 0,
+        width = 0,
+        height = 0,
+        currentLineWidth = 0,
+        currentLineHeight = 0;
+    let isBroken = false;
+    let isFirstLine = true;
+
+    for (let i = 0, ii = this.glyphs.length; i < ii; i++) {
+      const [glyphWidth, lineHeight, firstLineHeight, char, isEOL] = this.glyphs[i];
+      const isSpace = char === " ";
+      const glyphHeight = isFirstLine ? firstLineHeight : lineHeight;
+
+      if (isEOL) {
+        width = Math.max(width, currentLineWidth);
+        currentLineWidth = 0;
+        height += currentLineHeight;
+        currentLineHeight = glyphHeight;
+        lastSpacePos = -1;
+        lastSpaceWidth = 0;
+        isFirstLine = false;
+        continue;
+      }
+
+      if (isSpace) {
+        if (currentLineWidth + glyphWidth > maxWidth) {
+          width = Math.max(width, currentLineWidth);
+          currentLineWidth = 0;
+          height += currentLineHeight;
+          currentLineHeight = glyphHeight;
+          lastSpacePos = -1;
+          lastSpaceWidth = 0;
+          isBroken = true;
+          isFirstLine = false;
+        } else {
+          currentLineHeight = Math.max(glyphHeight, currentLineHeight);
+          lastSpaceWidth = currentLineWidth;
+          currentLineWidth += glyphWidth;
+          lastSpacePos = i;
+        }
+
+        continue;
+      }
+
+      if (currentLineWidth + glyphWidth > maxWidth) {
+        height += currentLineHeight;
+        currentLineHeight = glyphHeight;
+
+        if (lastSpacePos !== -1) {
+          i = lastSpacePos;
+          width = Math.max(width, lastSpaceWidth);
+          currentLineWidth = 0;
+          lastSpacePos = -1;
+          lastSpaceWidth = 0;
+        } else {
+          width = Math.max(width, currentLineWidth);
+          currentLineWidth = glyphWidth;
+        }
+
+        isBroken = true;
+        isFirstLine = false;
+        continue;
+      }
+
+      currentLineWidth += glyphWidth;
+      currentLineHeight = Math.max(glyphHeight, currentLineHeight);
+    }
+
+    width = Math.max(width, currentLineWidth);
+    height += currentLineHeight + this.extraHeight;
+    return {
+      width: WIDTH_FACTOR * width,
+      height,
+      isBroken
+    };
+  }
+
+}
+
+exports.TextMeasure = TextMeasure;
+
+/***/ }),
+/* 87 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.DataHandler = void 0;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+class DataHandler {
+  constructor(root, data) {
+    this.data = data;
+    this.dataset = root.datasets || null;
+  }
+
+  serialize(storage) {
+    const stack = [[-1, this.data[_xfa_object.$getChildren]()]];
+
+    while (stack.length > 0) {
+      const last = stack.at(-1);
+      const [i, children] = last;
+
+      if (i + 1 === children.length) {
+        stack.pop();
+        continue;
+      }
+
+      const child = children[++last[0]];
+      const storageEntry = storage.get(child[_xfa_object.$uid]);
+
+      if (storageEntry) {
+        child[_xfa_object.$setValue](storageEntry);
+      } else {
+        const attributes = child[_xfa_object.$getAttributes]();
+
+        for (const value of attributes.values()) {
+          const entry = storage.get(value[_xfa_object.$uid]);
+
+          if (entry) {
+            value[_xfa_object.$setValue](entry);
+
+            break;
+          }
+        }
+      }
+
+      const nodes = child[_xfa_object.$getChildren]();
+
+      if (nodes.length > 0) {
+        stack.push([-1, nodes]);
+      }
+    }
+
+    const buf = [`<xfa:datasets xmlns:xfa="http://www.xfa.org/schema/xfa-data/1.0/">`];
+
+    if (this.dataset) {
+      for (const child of this.dataset[_xfa_object.$getChildren]()) {
+        if (child[_xfa_object.$nodeName] !== "data") {
+          child[_xfa_object.$toString](buf);
+        }
+      }
+    }
+
+    this.data[_xfa_object.$toString](buf);
+
+    buf.push("</xfa:datasets>");
+    return buf.join("");
+  }
+
+}
+
+exports.DataHandler = DataHandler;
+
+/***/ }),
+/* 88 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XFAParser = void 0;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _xml_parser = __w_pdfjs_require__(66);
+
+var _builder = __w_pdfjs_require__(89);
+
+var _util = __w_pdfjs_require__(2);
+
+class XFAParser extends _xml_parser.XMLParserBase {
+  constructor(rootNameSpace = null, richText = false) {
+    super();
+    this._builder = new _builder.Builder(rootNameSpace);
+    this._stack = [];
+    this._globalData = {
+      usedTypefaces: new Set()
+    };
+    this._ids = new Map();
+    this._current = this._builder.buildRoot(this._ids);
+    this._errorCode = _xml_parser.XMLParserErrorCode.NoError;
+    this._whiteRegex = /^\s+$/;
+    this._nbsps = /\xa0+/g;
+    this._richText = richText;
+  }
+
+  parse(data) {
+    this.parseXml(data);
+
+    if (this._errorCode !== _xml_parser.XMLParserErrorCode.NoError) {
+      return undefined;
+    }
+
+    this._current[_xfa_object.$finalize]();
+
+    return this._current.element;
+  }
+
+  onText(text) {
+    text = text.replace(this._nbsps, match => match.slice(1) + " ");
+
+    if (this._richText || this._current[_xfa_object.$acceptWhitespace]()) {
+      this._current[_xfa_object.$onText](text, this._richText);
+
+      return;
+    }
+
+    if (this._whiteRegex.test(text)) {
+      return;
+    }
+
+    this._current[_xfa_object.$onText](text.trim());
+  }
+
+  onCdata(text) {
+    this._current[_xfa_object.$onText](text);
+  }
+
+  _mkAttributes(attributes, tagName) {
+    let namespace = null;
+    let prefixes = null;
+    const attributeObj = Object.create({});
+
+    for (const {
+      name,
+      value
+    } of attributes) {
+      if (name === "xmlns") {
+        if (!namespace) {
+          namespace = value;
+        } else {
+          (0, _util.warn)(`XFA - multiple namespace definition in <${tagName}>`);
+        }
+      } else if (name.startsWith("xmlns:")) {
+        const prefix = name.substring("xmlns:".length);
+
+        if (!prefixes) {
+          prefixes = [];
+        }
+
+        prefixes.push({
+          prefix,
+          value
+        });
+      } else {
+        const i = name.indexOf(":");
+
+        if (i === -1) {
+          attributeObj[name] = value;
+        } else {
+          let nsAttrs = attributeObj[_xfa_object.$nsAttributes];
+
+          if (!nsAttrs) {
+            nsAttrs = attributeObj[_xfa_object.$nsAttributes] = Object.create(null);
+          }
+
+          const [ns, attrName] = [name.slice(0, i), name.slice(i + 1)];
+          let attrs = nsAttrs[ns];
+
+          if (!attrs) {
+            attrs = nsAttrs[ns] = Object.create(null);
+          }
+
+          attrs[attrName] = value;
+        }
+      }
+    }
+
+    return [namespace, prefixes, attributeObj];
+  }
+
+  _getNameAndPrefix(name, nsAgnostic) {
+    const i = name.indexOf(":");
+
+    if (i === -1) {
+      return [name, null];
+    }
+
+    return [name.substring(i + 1), nsAgnostic ? "" : name.substring(0, i)];
+  }
+
+  onBeginElement(tagName, attributes, isEmpty) {
+    const [namespace, prefixes, attributesObj] = this._mkAttributes(attributes, tagName);
+
+    const [name, nsPrefix] = this._getNameAndPrefix(tagName, this._builder.isNsAgnostic());
+
+    const node = this._builder.build({
+      nsPrefix,
+      name,
+      attributes: attributesObj,
+      namespace,
+      prefixes
+    });
+
+    node[_xfa_object.$globalData] = this._globalData;
+
+    if (isEmpty) {
+      node[_xfa_object.$finalize]();
+
+      if (this._current[_xfa_object.$onChild](node)) {
+        node[_xfa_object.$setId](this._ids);
+      }
+
+      node[_xfa_object.$clean](this._builder);
+
+      return;
+    }
+
+    this._stack.push(this._current);
+
+    this._current = node;
+  }
+
+  onEndElement(name) {
+    const node = this._current;
+
+    if (node[_xfa_object.$isCDATAXml]() && typeof node[_xfa_object.$content] === "string") {
+      const parser = new XFAParser();
+      parser._globalData = this._globalData;
+      const root = parser.parse(node[_xfa_object.$content]);
+      node[_xfa_object.$content] = null;
+
+      node[_xfa_object.$onChild](root);
+    }
+
+    node[_xfa_object.$finalize]();
+
+    this._current = this._stack.pop();
+
+    if (this._current[_xfa_object.$onChild](node)) {
+      node[_xfa_object.$setId](this._ids);
+    }
+
+    node[_xfa_object.$clean](this._builder);
+  }
+
+  onError(code) {
+    this._errorCode = code;
+  }
+
+}
+
+exports.XFAParser = XFAParser;
+
+/***/ }),
+/* 89 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Builder = void 0;
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _setup = __w_pdfjs_require__(90);
+
+var _template = __w_pdfjs_require__(82);
+
+var _unknown = __w_pdfjs_require__(99);
+
+var _util = __w_pdfjs_require__(2);
+
+class Root extends _xfa_object.XFAObject {
+  constructor(ids) {
+    super(-1, "root", Object.create(null));
+    this.element = null;
+    this[_xfa_object.$ids] = ids;
+  }
+
+  [_xfa_object.$onChild](child) {
+    this.element = child;
+    return true;
+  }
+
+  [_xfa_object.$finalize]() {
+    super[_xfa_object.$finalize]();
+
+    if (this.element.template instanceof _template.Template) {
+      this[_xfa_object.$ids].set(_xfa_object.$root, this.element);
+
+      this.element.template[_xfa_object.$resolvePrototypes](this[_xfa_object.$ids]);
+
+      this.element.template[_xfa_object.$ids] = this[_xfa_object.$ids];
+    }
+  }
+
+}
+
+class Empty extends _xfa_object.XFAObject {
+  constructor() {
+    super(-1, "", Object.create(null));
+  }
+
+  [_xfa_object.$onChild](_) {
+    return false;
+  }
+
+}
+
+class Builder {
+  constructor(rootNameSpace = null) {
+    this._namespaceStack = [];
+    this._nsAgnosticLevel = 0;
+    this._namespacePrefixes = new Map();
+    this._namespaces = new Map();
+    this._nextNsId = Math.max(...Object.values(_namespaces.NamespaceIds).map(({
+      id
+    }) => id));
+    this._currentNamespace = rootNameSpace || new _unknown.UnknownNamespace(++this._nextNsId);
+  }
+
+  buildRoot(ids) {
+    return new Root(ids);
+  }
+
+  build({
+    nsPrefix,
+    name,
+    attributes,
+    namespace,
+    prefixes
+  }) {
+    const hasNamespaceDef = namespace !== null;
+
+    if (hasNamespaceDef) {
+      this._namespaceStack.push(this._currentNamespace);
+
+      this._currentNamespace = this._searchNamespace(namespace);
+    }
+
+    if (prefixes) {
+      this._addNamespacePrefix(prefixes);
+    }
+
+    if (attributes.hasOwnProperty(_xfa_object.$nsAttributes)) {
+      const dataTemplate = _setup.NamespaceSetUp.datasets;
+      const nsAttrs = attributes[_xfa_object.$nsAttributes];
+      let xfaAttrs = null;
+
+      for (const [ns, attrs] of Object.entries(nsAttrs)) {
+        const nsToUse = this._getNamespaceToUse(ns);
+
+        if (nsToUse === dataTemplate) {
+          xfaAttrs = {
+            xfa: attrs
+          };
+          break;
+        }
+      }
+
+      if (xfaAttrs) {
+        attributes[_xfa_object.$nsAttributes] = xfaAttrs;
+      } else {
+        delete attributes[_xfa_object.$nsAttributes];
+      }
+    }
+
+    const namespaceToUse = this._getNamespaceToUse(nsPrefix);
+
+    const node = namespaceToUse && namespaceToUse[_namespaces.$buildXFAObject](name, attributes) || new Empty();
+
+    if (node[_xfa_object.$isNsAgnostic]()) {
+      this._nsAgnosticLevel++;
+    }
+
+    if (hasNamespaceDef || prefixes || node[_xfa_object.$isNsAgnostic]()) {
+      node[_xfa_object.$cleanup] = {
+        hasNamespace: hasNamespaceDef,
+        prefixes,
+        nsAgnostic: node[_xfa_object.$isNsAgnostic]()
+      };
+    }
+
+    return node;
+  }
+
+  isNsAgnostic() {
+    return this._nsAgnosticLevel > 0;
+  }
+
+  _searchNamespace(nsName) {
+    let ns = this._namespaces.get(nsName);
+
+    if (ns) {
+      return ns;
+    }
+
+    for (const [name, {
+      check
+    }] of Object.entries(_namespaces.NamespaceIds)) {
+      if (check(nsName)) {
+        ns = _setup.NamespaceSetUp[name];
+
+        if (ns) {
+          this._namespaces.set(nsName, ns);
+
+          return ns;
+        }
+
+        break;
+      }
+    }
+
+    ns = new _unknown.UnknownNamespace(++this._nextNsId);
+
+    this._namespaces.set(nsName, ns);
+
+    return ns;
+  }
+
+  _addNamespacePrefix(prefixes) {
+    for (const {
+      prefix,
+      value
+    } of prefixes) {
+      const namespace = this._searchNamespace(value);
+
+      let prefixStack = this._namespacePrefixes.get(prefix);
+
+      if (!prefixStack) {
+        prefixStack = [];
+
+        this._namespacePrefixes.set(prefix, prefixStack);
+      }
+
+      prefixStack.push(namespace);
+    }
+  }
+
+  _getNamespaceToUse(prefix) {
+    if (!prefix) {
+      return this._currentNamespace;
+    }
+
+    const prefixStack = this._namespacePrefixes.get(prefix);
+
+    if (prefixStack && prefixStack.length > 0) {
+      return prefixStack.at(-1);
+    }
+
+    (0, _util.warn)(`Unknown namespace prefix: ${prefix}.`);
+    return null;
+  }
+
+  clean(data) {
+    const {
+      hasNamespace,
+      prefixes,
+      nsAgnostic
+    } = data;
+
+    if (hasNamespace) {
+      this._currentNamespace = this._namespaceStack.pop();
+    }
+
+    if (prefixes) {
+      prefixes.forEach(({
+        prefix
+      }) => {
+        this._namespacePrefixes.get(prefix).pop();
+      });
+    }
+
+    if (nsAgnostic) {
+      this._nsAgnosticLevel--;
+    }
+  }
+
+}
+
+exports.Builder = Builder;
+
+/***/ }),
+/* 90 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.NamespaceSetUp = void 0;
+
+var _config = __w_pdfjs_require__(91);
+
+var _connection_set = __w_pdfjs_require__(92);
+
+var _datasets = __w_pdfjs_require__(93);
+
+var _locale_set = __w_pdfjs_require__(94);
+
+var _signature = __w_pdfjs_require__(95);
+
+var _stylesheet = __w_pdfjs_require__(96);
+
+var _template = __w_pdfjs_require__(82);
+
+var _xdp = __w_pdfjs_require__(97);
+
+var _xhtml = __w_pdfjs_require__(98);
+
+const NamespaceSetUp = {
+  config: _config.ConfigNamespace,
+  connection: _connection_set.ConnectionSetNamespace,
+  datasets: _datasets.DatasetsNamespace,
+  localeSet: _locale_set.LocaleSetNamespace,
+  signature: _signature.SignatureNamespace,
+  stylesheet: _stylesheet.StylesheetNamespace,
+  template: _template.TemplateNamespace,
+  xdp: _xdp.XdpNamespace,
+  xhtml: _xhtml.XhtmlNamespace
+};
+exports.NamespaceSetUp = NamespaceSetUp;
+
+/***/ }),
+/* 91 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.ConfigNamespace = void 0;
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _utils = __w_pdfjs_require__(78);
+
+var _util = __w_pdfjs_require__(2);
+
+const CONFIG_NS_ID = _namespaces.NamespaceIds.config.id;
+
+class Acrobat extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "acrobat", true);
+    this.acrobat7 = null;
+    this.autoSave = null;
+    this.common = null;
+    this.validate = null;
+    this.validateApprovalSignatures = null;
+    this.submitUrl = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Acrobat7 extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "acrobat7", true);
+    this.dynamicRender = null;
+  }
+
+}
+
+class ADBE_JSConsole extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "ADBE_JSConsole", ["delegate", "Enable", "Disable"]);
+  }
+
+}
+
+class ADBE_JSDebugger extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "ADBE_JSDebugger", ["delegate", "Enable", "Disable"]);
+  }
+
+}
+
+class AddSilentPrint extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "addSilentPrint");
+  }
+
+}
+
+class AddViewerPreferences extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "addViewerPreferences");
+  }
+
+}
+
+class AdjustData extends _xfa_object.Option10 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "adjustData");
+  }
+
+}
+
+class AdobeExtensionLevel extends _xfa_object.IntegerObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "adobeExtensionLevel", 0, n => n >= 1 && n <= 8);
+  }
+
+}
+
+class Agent extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "agent", true);
+    this.name = attributes.name ? attributes.name.trim() : "";
+    this.common = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class AlwaysEmbed extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "alwaysEmbed");
+  }
+
+}
+
+class Amd extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "amd");
+  }
+
+}
+
+class Area extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "area");
+    this.level = (0, _utils.getInteger)({
+      data: attributes.level,
+      defaultValue: 0,
+      validate: n => n >= 1 && n <= 3
+    });
+    this.name = (0, _utils.getStringOption)(attributes.name, ["", "barcode", "coreinit", "deviceDriver", "font", "general", "layout", "merge", "script", "signature", "sourceSet", "templateCache"]);
+  }
+
+}
+
+class Attributes extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "attributes", ["preserve", "delegate", "ignore"]);
+  }
+
+}
+
+class AutoSave extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "autoSave", ["disabled", "enabled"]);
+  }
+
+}
+
+class Base extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "base");
+  }
+
+}
+
+class BatchOutput extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "batchOutput");
+    this.format = (0, _utils.getStringOption)(attributes.format, ["none", "concat", "zip", "zipCompress"]);
+  }
+
+}
+
+class BehaviorOverride extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "behaviorOverride");
+  }
+
+  [_xfa_object.$finalize]() {
+    this[_xfa_object.$content] = new Map(this[_xfa_object.$content].trim().split(/\s+/).filter(x => x.includes(":")).map(x => x.split(":", 2)));
+  }
+
+}
+
+class Cache extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "cache", true);
+    this.templateCache = null;
+  }
+
+}
+
+class Change extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "change");
+  }
+
+}
+
+class Common extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "common", true);
+    this.data = null;
+    this.locale = null;
+    this.localeSet = null;
+    this.messaging = null;
+    this.suppressBanner = null;
+    this.template = null;
+    this.validationMessaging = null;
+    this.versionControl = null;
+    this.log = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Compress extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "compress");
+    this.scope = (0, _utils.getStringOption)(attributes.scope, ["imageOnly", "document"]);
+  }
+
+}
+
+class CompressLogicalStructure extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "compressLogicalStructure");
+  }
+
+}
+
+class CompressObjectStream extends _xfa_object.Option10 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "compressObjectStream");
+  }
+
+}
+
+class Compression extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "compression", true);
+    this.compressLogicalStructure = null;
+    this.compressObjectStream = null;
+    this.level = null;
+    this.type = null;
+  }
+
+}
+
+class Config extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "config", true);
+    this.acrobat = null;
+    this.present = null;
+    this.trace = null;
+    this.agent = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Conformance extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "conformance", ["A", "B"]);
+  }
+
+}
+
+class ContentCopy extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "contentCopy");
+  }
+
+}
+
+class Copies extends _xfa_object.IntegerObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "copies", 1, n => n >= 1);
+  }
+
+}
+
+class Creator extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "creator");
+  }
+
+}
+
+class CurrentPage extends _xfa_object.IntegerObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "currentPage", 0, n => n >= 0);
+  }
+
+}
+
+class Data extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "data", true);
+    this.adjustData = null;
+    this.attributes = null;
+    this.incrementalLoad = null;
+    this.outputXSL = null;
+    this.range = null;
+    this.record = null;
+    this.startNode = null;
+    this.uri = null;
+    this.window = null;
+    this.xsl = null;
+    this.excludeNS = new _xfa_object.XFAObjectArray();
+    this.transform = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Debug extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "debug", true);
+    this.uri = null;
+  }
+
+}
+
+class DefaultTypeface extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "defaultTypeface");
+    this.writingScript = (0, _utils.getStringOption)(attributes.writingScript, ["*", "Arabic", "Cyrillic", "EastEuropeanRoman", "Greek", "Hebrew", "Japanese", "Korean", "Roman", "SimplifiedChinese", "Thai", "TraditionalChinese", "Vietnamese"]);
+  }
+
+}
+
+class Destination extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "destination", ["pdf", "pcl", "ps", "webClient", "zpl"]);
+  }
+
+}
+
+class DocumentAssembly extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "documentAssembly");
+  }
+
+}
+
+class Driver extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "driver", true);
+    this.name = attributes.name ? attributes.name.trim() : "";
+    this.fontInfo = null;
+    this.xdc = null;
+  }
+
+}
+
+class DuplexOption extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "duplexOption", ["simplex", "duplexFlipLongEdge", "duplexFlipShortEdge"]);
+  }
+
+}
+
+class DynamicRender extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "dynamicRender", ["forbidden", "required"]);
+  }
+
+}
+
+class Embed extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "embed");
+  }
+
+}
+
+class Encrypt extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "encrypt");
+  }
+
+}
+
+class Encryption extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "encryption", true);
+    this.encrypt = null;
+    this.encryptionLevel = null;
+    this.permissions = null;
+  }
+
+}
+
+class EncryptionLevel extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "encryptionLevel", ["40bit", "128bit"]);
+  }
+
+}
+
+class Enforce extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "enforce");
+  }
+
+}
+
+class Equate extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "equate");
+    this.force = (0, _utils.getInteger)({
+      data: attributes.force,
+      defaultValue: 1,
+      validate: n => n === 0
+    });
+    this.from = attributes.from || "";
+    this.to = attributes.to || "";
+  }
+
+}
+
+class EquateRange extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "equateRange");
+    this.from = attributes.from || "";
+    this.to = attributes.to || "";
+    this._unicodeRange = attributes.unicodeRange || "";
+  }
+
+  get unicodeRange() {
+    const ranges = [];
+    const unicodeRegex = /U\+([0-9a-fA-F]+)/;
+    const unicodeRange = this._unicodeRange;
+
+    for (let range of unicodeRange.split(",").map(x => x.trim()).filter(x => !!x)) {
+      range = range.split("-", 2).map(x => {
+        const found = x.match(unicodeRegex);
+
+        if (!found) {
+          return 0;
+        }
+
+        return parseInt(found[1], 16);
+      });
+
+      if (range.length === 1) {
+        range.push(range[0]);
+      }
+
+      ranges.push(range);
+    }
+
+    return (0, _util.shadow)(this, "unicodeRange", ranges);
+  }
+
+}
+
+class Exclude extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "exclude");
+  }
+
+  [_xfa_object.$finalize]() {
+    this[_xfa_object.$content] = this[_xfa_object.$content].trim().split(/\s+/).filter(x => x && ["calculate", "close", "enter", "exit", "initialize", "ready", "validate"].includes(x));
+  }
+
+}
+
+class ExcludeNS extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "excludeNS");
+  }
+
+}
+
+class FlipLabel extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "flipLabel", ["usePrinterSetting", "on", "off"]);
+  }
+
+}
+
+class FontInfo extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "fontInfo", true);
+    this.embed = null;
+    this.map = null;
+    this.subsetBelow = null;
+    this.alwaysEmbed = new _xfa_object.XFAObjectArray();
+    this.defaultTypeface = new _xfa_object.XFAObjectArray();
+    this.neverEmbed = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class FormFieldFilling extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "formFieldFilling");
+  }
+
+}
+
+class GroupParent extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "groupParent");
+  }
+
+}
+
+class IfEmpty extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "ifEmpty", ["dataValue", "dataGroup", "ignore", "remove"]);
+  }
+
+}
+
+class IncludeXDPContent extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "includeXDPContent");
+  }
+
+}
+
+class IncrementalLoad extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "incrementalLoad", ["none", "forwardOnly"]);
+  }
+
+}
+
+class IncrementalMerge extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "incrementalMerge");
+  }
+
+}
+
+class Interactive extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "interactive");
+  }
+
+}
+
+class Jog extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "jog", ["usePrinterSetting", "none", "pageSet"]);
+  }
+
+}
+
+class LabelPrinter extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "labelPrinter", true);
+    this.name = (0, _utils.getStringOption)(attributes.name, ["zpl", "dpl", "ipl", "tcpl"]);
+    this.batchOutput = null;
+    this.flipLabel = null;
+    this.fontInfo = null;
+    this.xdc = null;
+  }
+
+}
+
+class Layout extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "layout", ["paginate", "panel"]);
+  }
+
+}
+
+class Level extends _xfa_object.IntegerObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "level", 0, n => n > 0);
+  }
+
+}
+
+class Linearized extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "linearized");
+  }
+
+}
+
+class Locale extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "locale");
+  }
+
+}
+
+class LocaleSet extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "localeSet");
+  }
+
+}
+
+class Log extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "log", true);
+    this.mode = null;
+    this.threshold = null;
+    this.to = null;
+    this.uri = null;
+  }
+
+}
+
+class MapElement extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "map", true);
+    this.equate = new _xfa_object.XFAObjectArray();
+    this.equateRange = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class MediumInfo extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "mediumInfo", true);
+    this.map = null;
+  }
+
+}
+
+class Message extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "message", true);
+    this.msgId = null;
+    this.severity = null;
+  }
+
+}
+
+class Messaging extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "messaging", true);
+    this.message = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Mode extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "mode", ["append", "overwrite"]);
+  }
+
+}
+
+class ModifyAnnots extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "modifyAnnots");
+  }
+
+}
+
+class MsgId extends _xfa_object.IntegerObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "msgId", 1, n => n >= 1);
+  }
+
+}
+
+class NameAttr extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "nameAttr");
+  }
+
+}
+
+class NeverEmbed extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "neverEmbed");
+  }
+
+}
+
+class NumberOfCopies extends _xfa_object.IntegerObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "numberOfCopies", null, n => n >= 2 && n <= 5);
+  }
+
+}
+
+class OpenAction extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "openAction", true);
+    this.destination = null;
+  }
+
+}
+
+class Output extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "output", true);
+    this.to = null;
+    this.type = null;
+    this.uri = null;
+  }
+
+}
+
+class OutputBin extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "outputBin");
+  }
+
+}
+
+class OutputXSL extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "outputXSL", true);
+    this.uri = null;
+  }
+
+}
+
+class Overprint extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "overprint", ["none", "both", "draw", "field"]);
+  }
+
+}
+
+class Packets extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "packets");
+  }
+
+  [_xfa_object.$finalize]() {
+    if (this[_xfa_object.$content] === "*") {
+      return;
+    }
+
+    this[_xfa_object.$content] = this[_xfa_object.$content].trim().split(/\s+/).filter(x => ["config", "datasets", "template", "xfdf", "xslt"].includes(x));
+  }
+
+}
+
+class PageOffset extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "pageOffset");
+    this.x = (0, _utils.getInteger)({
+      data: attributes.x,
+      defaultValue: "useXDCSetting",
+      validate: n => true
+    });
+    this.y = (0, _utils.getInteger)({
+      data: attributes.y,
+      defaultValue: "useXDCSetting",
+      validate: n => true
+    });
+  }
+
+}
+
+class PageRange extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "pageRange");
+  }
+
+  [_xfa_object.$finalize]() {
+    const numbers = this[_xfa_object.$content].trim().split(/\s+/).map(x => parseInt(x, 10));
+
+    const ranges = [];
+
+    for (let i = 0, ii = numbers.length; i < ii; i += 2) {
+      ranges.push(numbers.slice(i, i + 2));
+    }
+
+    this[_xfa_object.$content] = ranges;
+  }
+
+}
+
+class Pagination extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "pagination", ["simplex", "duplexShortEdge", "duplexLongEdge"]);
+  }
+
+}
+
+class PaginationOverride extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "paginationOverride", ["none", "forceDuplex", "forceDuplexLongEdge", "forceDuplexShortEdge", "forceSimplex"]);
+  }
+
+}
+
+class Part extends _xfa_object.IntegerObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "part", 1, n => false);
+  }
+
+}
+
+class Pcl extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "pcl", true);
+    this.name = attributes.name || "";
+    this.batchOutput = null;
+    this.fontInfo = null;
+    this.jog = null;
+    this.mediumInfo = null;
+    this.outputBin = null;
+    this.pageOffset = null;
+    this.staple = null;
+    this.xdc = null;
+  }
+
+}
+
+class Pdf extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "pdf", true);
+    this.name = attributes.name || "";
+    this.adobeExtensionLevel = null;
+    this.batchOutput = null;
+    this.compression = null;
+    this.creator = null;
+    this.encryption = null;
+    this.fontInfo = null;
+    this.interactive = null;
+    this.linearized = null;
+    this.openAction = null;
+    this.pdfa = null;
+    this.producer = null;
+    this.renderPolicy = null;
+    this.scriptModel = null;
+    this.silentPrint = null;
+    this.submitFormat = null;
+    this.tagged = null;
+    this.version = null;
+    this.viewerPreferences = null;
+    this.xdc = null;
+  }
+
+}
+
+class Pdfa extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "pdfa", true);
+    this.amd = null;
+    this.conformance = null;
+    this.includeXDPContent = null;
+    this.part = null;
+  }
+
+}
+
+class Permissions extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "permissions", true);
+    this.accessibleContent = null;
+    this.change = null;
+    this.contentCopy = null;
+    this.documentAssembly = null;
+    this.formFieldFilling = null;
+    this.modifyAnnots = null;
+    this.plaintextMetadata = null;
+    this.print = null;
+    this.printHighQuality = null;
+  }
+
+}
+
+class PickTrayByPDFSize extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "pickTrayByPDFSize");
+  }
+
+}
+
+class Picture extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "picture");
+  }
+
+}
+
+class PlaintextMetadata extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "plaintextMetadata");
+  }
+
+}
+
+class Presence extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "presence", ["preserve", "dissolve", "dissolveStructure", "ignore", "remove"]);
+  }
+
+}
+
+class Present extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "present", true);
+    this.behaviorOverride = null;
+    this.cache = null;
+    this.common = null;
+    this.copies = null;
+    this.destination = null;
+    this.incrementalMerge = null;
+    this.layout = null;
+    this.output = null;
+    this.overprint = null;
+    this.pagination = null;
+    this.paginationOverride = null;
+    this.script = null;
+    this.validate = null;
+    this.xdp = null;
+    this.driver = new _xfa_object.XFAObjectArray();
+    this.labelPrinter = new _xfa_object.XFAObjectArray();
+    this.pcl = new _xfa_object.XFAObjectArray();
+    this.pdf = new _xfa_object.XFAObjectArray();
+    this.ps = new _xfa_object.XFAObjectArray();
+    this.submitUrl = new _xfa_object.XFAObjectArray();
+    this.webClient = new _xfa_object.XFAObjectArray();
+    this.zpl = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Print extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "print");
+  }
+
+}
+
+class PrintHighQuality extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "printHighQuality");
+  }
+
+}
+
+class PrintScaling extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "printScaling", ["appdefault", "noScaling"]);
+  }
+
+}
+
+class PrinterName extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "printerName");
+  }
+
+}
+
+class Producer extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "producer");
+  }
+
+}
+
+class Ps extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "ps", true);
+    this.name = attributes.name || "";
+    this.batchOutput = null;
+    this.fontInfo = null;
+    this.jog = null;
+    this.mediumInfo = null;
+    this.outputBin = null;
+    this.staple = null;
+    this.xdc = null;
+  }
+
+}
+
+class Range extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "range");
+  }
+
+  [_xfa_object.$finalize]() {
+    this[_xfa_object.$content] = this[_xfa_object.$content].trim().split(/\s*,\s*/, 2).map(range => range.split("-").map(x => parseInt(x.trim(), 10))).filter(range => range.every(x => !isNaN(x))).map(range => {
+      if (range.length === 1) {
+        range.push(range[0]);
+      }
+
+      return range;
+    });
+  }
+
+}
+
+class Record extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "record");
+  }
+
+  [_xfa_object.$finalize]() {
+    this[_xfa_object.$content] = this[_xfa_object.$content].trim();
+    const n = parseInt(this[_xfa_object.$content], 10);
+
+    if (!isNaN(n) && n >= 0) {
+      this[_xfa_object.$content] = n;
+    }
+  }
+
+}
+
+class Relevant extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "relevant");
+  }
+
+  [_xfa_object.$finalize]() {
+    this[_xfa_object.$content] = this[_xfa_object.$content].trim().split(/\s+/);
+  }
+
+}
+
+class Rename extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "rename");
+  }
+
+  [_xfa_object.$finalize]() {
+    this[_xfa_object.$content] = this[_xfa_object.$content].trim();
+
+    if (this[_xfa_object.$content].toLowerCase().startsWith("xml") || this[_xfa_object.$content].match(new RegExp("[\\p{L}_][\\p{L}\\d._\\p{M}-]*", "u"))) {
+      (0, _util.warn)("XFA - Rename: invalid XFA name");
+    }
+  }
+
+}
+
+class RenderPolicy extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "renderPolicy", ["server", "client"]);
+  }
+
+}
+
+class RunScripts extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "runScripts", ["both", "client", "none", "server"]);
+  }
+
+}
+
+class Script extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "script", true);
+    this.currentPage = null;
+    this.exclude = null;
+    this.runScripts = null;
+  }
+
+}
+
+class ScriptModel extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "scriptModel", ["XFA", "none"]);
+  }
+
+}
+
+class Severity extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "severity", ["ignore", "error", "information", "trace", "warning"]);
+  }
+
+}
+
+class SilentPrint extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "silentPrint", true);
+    this.addSilentPrint = null;
+    this.printerName = null;
+  }
+
+}
+
+class Staple extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "staple");
+    this.mode = (0, _utils.getStringOption)(attributes.mode, ["usePrinterSetting", "on", "off"]);
+  }
+
+}
+
+class StartNode extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "startNode");
+  }
+
+}
+
+class StartPage extends _xfa_object.IntegerObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "startPage", 0, n => true);
+  }
+
+}
+
+class SubmitFormat extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "submitFormat", ["html", "delegate", "fdf", "xml", "pdf"]);
+  }
+
+}
+
+class SubmitUrl extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "submitUrl");
+  }
+
+}
+
+class SubsetBelow extends _xfa_object.IntegerObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "subsetBelow", 100, n => n >= 0 && n <= 100);
+  }
+
+}
+
+class SuppressBanner extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "suppressBanner");
+  }
+
+}
+
+class Tagged extends _xfa_object.Option01 {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "tagged");
+  }
+
+}
+
+class Template extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "template", true);
+    this.base = null;
+    this.relevant = null;
+    this.startPage = null;
+    this.uri = null;
+    this.xsl = null;
+  }
+
+}
+
+class Threshold extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "threshold", ["trace", "error", "information", "warning"]);
+  }
+
+}
+
+class To extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "to", ["null", "memory", "stderr", "stdout", "system", "uri"]);
+  }
+
+}
+
+class TemplateCache extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "templateCache");
+    this.maxEntries = (0, _utils.getInteger)({
+      data: attributes.maxEntries,
+      defaultValue: 5,
+      validate: n => n >= 0
+    });
+  }
+
+}
+
+class Trace extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "trace", true);
+    this.area = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Transform extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "transform", true);
+    this.groupParent = null;
+    this.ifEmpty = null;
+    this.nameAttr = null;
+    this.picture = null;
+    this.presence = null;
+    this.rename = null;
+    this.whitespace = null;
+  }
+
+}
+
+class Type extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "type", ["none", "ascii85", "asciiHex", "ccittfax", "flate", "lzw", "runLength", "native", "xdp", "mergedXDP"]);
+  }
+
+}
+
+class Uri extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "uri");
+  }
+
+}
+
+class Validate extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "validate", ["preSubmit", "prePrint", "preExecute", "preSave"]);
+  }
+
+}
+
+class ValidateApprovalSignatures extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "validateApprovalSignatures");
+  }
+
+  [_xfa_object.$finalize]() {
+    this[_xfa_object.$content] = this[_xfa_object.$content].trim().split(/\s+/).filter(x => ["docReady", "postSign"].includes(x));
+  }
+
+}
+
+class ValidationMessaging extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "validationMessaging", ["allMessagesIndividually", "allMessagesTogether", "firstMessageOnly", "noMessages"]);
+  }
+
+}
+
+class Version extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "version", ["1.7", "1.6", "1.5", "1.4", "1.3", "1.2"]);
+  }
+
+}
+
+class VersionControl extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "VersionControl");
+    this.outputBelow = (0, _utils.getStringOption)(attributes.outputBelow, ["warn", "error", "update"]);
+    this.sourceAbove = (0, _utils.getStringOption)(attributes.sourceAbove, ["warn", "error"]);
+    this.sourceBelow = (0, _utils.getStringOption)(attributes.sourceBelow, ["update", "maintain"]);
+  }
+
+}
+
+class ViewerPreferences extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "viewerPreferences", true);
+    this.ADBE_JSConsole = null;
+    this.ADBE_JSDebugger = null;
+    this.addViewerPreferences = null;
+    this.duplexOption = null;
+    this.enforce = null;
+    this.numberOfCopies = null;
+    this.pageRange = null;
+    this.pickTrayByPDFSize = null;
+    this.printScaling = null;
+  }
+
+}
+
+class WebClient extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "webClient", true);
+    this.name = attributes.name ? attributes.name.trim() : "";
+    this.fontInfo = null;
+    this.xdc = null;
+  }
+
+}
+
+class Whitespace extends _xfa_object.OptionObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "whitespace", ["preserve", "ltrim", "normalize", "rtrim", "trim"]);
+  }
+
+}
+
+class Window extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "window");
+  }
+
+  [_xfa_object.$finalize]() {
+    const pair = this[_xfa_object.$content].trim().split(/\s*,\s*/, 2).map(x => parseInt(x, 10));
+
+    if (pair.some(x => isNaN(x))) {
+      this[_xfa_object.$content] = [0, 0];
+      return;
+    }
+
+    if (pair.length === 1) {
+      pair.push(pair[0]);
+    }
+
+    this[_xfa_object.$content] = pair;
+  }
+
+}
+
+class Xdc extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "xdc", true);
+    this.uri = new _xfa_object.XFAObjectArray();
+    this.xsl = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Xdp extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "xdp", true);
+    this.packets = null;
+  }
+
+}
+
+class Xsl extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "xsl", true);
+    this.debug = null;
+    this.uri = null;
+  }
+
+}
+
+class Zpl extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONFIG_NS_ID, "zpl", true);
+    this.name = attributes.name ? attributes.name.trim() : "";
+    this.batchOutput = null;
+    this.flipLabel = null;
+    this.fontInfo = null;
+    this.xdc = null;
+  }
+
+}
+
+class ConfigNamespace {
+  static [_namespaces.$buildXFAObject](name, attributes) {
+    if (ConfigNamespace.hasOwnProperty(name)) {
+      return ConfigNamespace[name](attributes);
+    }
+
+    return undefined;
+  }
+
+  static acrobat(attrs) {
+    return new Acrobat(attrs);
+  }
+
+  static acrobat7(attrs) {
+    return new Acrobat7(attrs);
+  }
+
+  static ADBE_JSConsole(attrs) {
+    return new ADBE_JSConsole(attrs);
+  }
+
+  static ADBE_JSDebugger(attrs) {
+    return new ADBE_JSDebugger(attrs);
+  }
+
+  static addSilentPrint(attrs) {
+    return new AddSilentPrint(attrs);
+  }
+
+  static addViewerPreferences(attrs) {
+    return new AddViewerPreferences(attrs);
+  }
+
+  static adjustData(attrs) {
+    return new AdjustData(attrs);
+  }
+
+  static adobeExtensionLevel(attrs) {
+    return new AdobeExtensionLevel(attrs);
+  }
+
+  static agent(attrs) {
+    return new Agent(attrs);
+  }
+
+  static alwaysEmbed(attrs) {
+    return new AlwaysEmbed(attrs);
+  }
+
+  static amd(attrs) {
+    return new Amd(attrs);
+  }
+
+  static area(attrs) {
+    return new Area(attrs);
+  }
+
+  static attributes(attrs) {
+    return new Attributes(attrs);
+  }
+
+  static autoSave(attrs) {
+    return new AutoSave(attrs);
+  }
+
+  static base(attrs) {
+    return new Base(attrs);
+  }
+
+  static batchOutput(attrs) {
+    return new BatchOutput(attrs);
+  }
+
+  static behaviorOverride(attrs) {
+    return new BehaviorOverride(attrs);
+  }
+
+  static cache(attrs) {
+    return new Cache(attrs);
+  }
+
+  static change(attrs) {
+    return new Change(attrs);
+  }
+
+  static common(attrs) {
+    return new Common(attrs);
+  }
+
+  static compress(attrs) {
+    return new Compress(attrs);
+  }
+
+  static compressLogicalStructure(attrs) {
+    return new CompressLogicalStructure(attrs);
+  }
+
+  static compressObjectStream(attrs) {
+    return new CompressObjectStream(attrs);
+  }
+
+  static compression(attrs) {
+    return new Compression(attrs);
+  }
+
+  static config(attrs) {
+    return new Config(attrs);
+  }
+
+  static conformance(attrs) {
+    return new Conformance(attrs);
+  }
+
+  static contentCopy(attrs) {
+    return new ContentCopy(attrs);
+  }
+
+  static copies(attrs) {
+    return new Copies(attrs);
+  }
+
+  static creator(attrs) {
+    return new Creator(attrs);
+  }
+
+  static currentPage(attrs) {
+    return new CurrentPage(attrs);
+  }
+
+  static data(attrs) {
+    return new Data(attrs);
+  }
+
+  static debug(attrs) {
+    return new Debug(attrs);
+  }
+
+  static defaultTypeface(attrs) {
+    return new DefaultTypeface(attrs);
+  }
+
+  static destination(attrs) {
+    return new Destination(attrs);
+  }
+
+  static documentAssembly(attrs) {
+    return new DocumentAssembly(attrs);
+  }
+
+  static driver(attrs) {
+    return new Driver(attrs);
+  }
+
+  static duplexOption(attrs) {
+    return new DuplexOption(attrs);
+  }
+
+  static dynamicRender(attrs) {
+    return new DynamicRender(attrs);
+  }
+
+  static embed(attrs) {
+    return new Embed(attrs);
+  }
+
+  static encrypt(attrs) {
+    return new Encrypt(attrs);
+  }
+
+  static encryption(attrs) {
+    return new Encryption(attrs);
+  }
+
+  static encryptionLevel(attrs) {
+    return new EncryptionLevel(attrs);
+  }
+
+  static enforce(attrs) {
+    return new Enforce(attrs);
+  }
+
+  static equate(attrs) {
+    return new Equate(attrs);
+  }
+
+  static equateRange(attrs) {
+    return new EquateRange(attrs);
+  }
+
+  static exclude(attrs) {
+    return new Exclude(attrs);
+  }
+
+  static excludeNS(attrs) {
+    return new ExcludeNS(attrs);
+  }
+
+  static flipLabel(attrs) {
+    return new FlipLabel(attrs);
+  }
+
+  static fontInfo(attrs) {
+    return new FontInfo(attrs);
+  }
+
+  static formFieldFilling(attrs) {
+    return new FormFieldFilling(attrs);
+  }
+
+  static groupParent(attrs) {
+    return new GroupParent(attrs);
+  }
+
+  static ifEmpty(attrs) {
+    return new IfEmpty(attrs);
+  }
+
+  static includeXDPContent(attrs) {
+    return new IncludeXDPContent(attrs);
+  }
+
+  static incrementalLoad(attrs) {
+    return new IncrementalLoad(attrs);
+  }
+
+  static incrementalMerge(attrs) {
+    return new IncrementalMerge(attrs);
+  }
+
+  static interactive(attrs) {
+    return new Interactive(attrs);
+  }
+
+  static jog(attrs) {
+    return new Jog(attrs);
+  }
+
+  static labelPrinter(attrs) {
+    return new LabelPrinter(attrs);
+  }
+
+  static layout(attrs) {
+    return new Layout(attrs);
+  }
+
+  static level(attrs) {
+    return new Level(attrs);
+  }
+
+  static linearized(attrs) {
+    return new Linearized(attrs);
+  }
+
+  static locale(attrs) {
+    return new Locale(attrs);
+  }
+
+  static localeSet(attrs) {
+    return new LocaleSet(attrs);
+  }
+
+  static log(attrs) {
+    return new Log(attrs);
+  }
+
+  static map(attrs) {
+    return new MapElement(attrs);
+  }
+
+  static mediumInfo(attrs) {
+    return new MediumInfo(attrs);
+  }
+
+  static message(attrs) {
+    return new Message(attrs);
+  }
+
+  static messaging(attrs) {
+    return new Messaging(attrs);
+  }
+
+  static mode(attrs) {
+    return new Mode(attrs);
+  }
+
+  static modifyAnnots(attrs) {
+    return new ModifyAnnots(attrs);
+  }
+
+  static msgId(attrs) {
+    return new MsgId(attrs);
+  }
+
+  static nameAttr(attrs) {
+    return new NameAttr(attrs);
+  }
+
+  static neverEmbed(attrs) {
+    return new NeverEmbed(attrs);
+  }
+
+  static numberOfCopies(attrs) {
+    return new NumberOfCopies(attrs);
+  }
+
+  static openAction(attrs) {
+    return new OpenAction(attrs);
+  }
+
+  static output(attrs) {
+    return new Output(attrs);
+  }
+
+  static outputBin(attrs) {
+    return new OutputBin(attrs);
+  }
+
+  static outputXSL(attrs) {
+    return new OutputXSL(attrs);
+  }
+
+  static overprint(attrs) {
+    return new Overprint(attrs);
+  }
+
+  static packets(attrs) {
+    return new Packets(attrs);
+  }
+
+  static pageOffset(attrs) {
+    return new PageOffset(attrs);
+  }
+
+  static pageRange(attrs) {
+    return new PageRange(attrs);
+  }
+
+  static pagination(attrs) {
+    return new Pagination(attrs);
+  }
+
+  static paginationOverride(attrs) {
+    return new PaginationOverride(attrs);
+  }
+
+  static part(attrs) {
+    return new Part(attrs);
+  }
+
+  static pcl(attrs) {
+    return new Pcl(attrs);
+  }
+
+  static pdf(attrs) {
+    return new Pdf(attrs);
+  }
+
+  static pdfa(attrs) {
+    return new Pdfa(attrs);
+  }
+
+  static permissions(attrs) {
+    return new Permissions(attrs);
+  }
+
+  static pickTrayByPDFSize(attrs) {
+    return new PickTrayByPDFSize(attrs);
+  }
+
+  static picture(attrs) {
+    return new Picture(attrs);
+  }
+
+  static plaintextMetadata(attrs) {
+    return new PlaintextMetadata(attrs);
+  }
+
+  static presence(attrs) {
+    return new Presence(attrs);
+  }
+
+  static present(attrs) {
+    return new Present(attrs);
+  }
+
+  static print(attrs) {
+    return new Print(attrs);
+  }
+
+  static printHighQuality(attrs) {
+    return new PrintHighQuality(attrs);
+  }
+
+  static printScaling(attrs) {
+    return new PrintScaling(attrs);
+  }
+
+  static printerName(attrs) {
+    return new PrinterName(attrs);
+  }
+
+  static producer(attrs) {
+    return new Producer(attrs);
+  }
+
+  static ps(attrs) {
+    return new Ps(attrs);
+  }
+
+  static range(attrs) {
+    return new Range(attrs);
+  }
+
+  static record(attrs) {
+    return new Record(attrs);
+  }
+
+  static relevant(attrs) {
+    return new Relevant(attrs);
+  }
+
+  static rename(attrs) {
+    return new Rename(attrs);
+  }
+
+  static renderPolicy(attrs) {
+    return new RenderPolicy(attrs);
+  }
+
+  static runScripts(attrs) {
+    return new RunScripts(attrs);
+  }
+
+  static script(attrs) {
+    return new Script(attrs);
+  }
+
+  static scriptModel(attrs) {
+    return new ScriptModel(attrs);
+  }
+
+  static severity(attrs) {
+    return new Severity(attrs);
+  }
+
+  static silentPrint(attrs) {
+    return new SilentPrint(attrs);
+  }
+
+  static staple(attrs) {
+    return new Staple(attrs);
+  }
+
+  static startNode(attrs) {
+    return new StartNode(attrs);
+  }
+
+  static startPage(attrs) {
+    return new StartPage(attrs);
+  }
+
+  static submitFormat(attrs) {
+    return new SubmitFormat(attrs);
+  }
+
+  static submitUrl(attrs) {
+    return new SubmitUrl(attrs);
+  }
+
+  static subsetBelow(attrs) {
+    return new SubsetBelow(attrs);
+  }
+
+  static suppressBanner(attrs) {
+    return new SuppressBanner(attrs);
+  }
+
+  static tagged(attrs) {
+    return new Tagged(attrs);
+  }
+
+  static template(attrs) {
+    return new Template(attrs);
+  }
+
+  static templateCache(attrs) {
+    return new TemplateCache(attrs);
+  }
+
+  static threshold(attrs) {
+    return new Threshold(attrs);
+  }
+
+  static to(attrs) {
+    return new To(attrs);
+  }
+
+  static trace(attrs) {
+    return new Trace(attrs);
+  }
+
+  static transform(attrs) {
+    return new Transform(attrs);
+  }
+
+  static type(attrs) {
+    return new Type(attrs);
+  }
+
+  static uri(attrs) {
+    return new Uri(attrs);
+  }
+
+  static validate(attrs) {
+    return new Validate(attrs);
+  }
+
+  static validateApprovalSignatures(attrs) {
+    return new ValidateApprovalSignatures(attrs);
+  }
+
+  static validationMessaging(attrs) {
+    return new ValidationMessaging(attrs);
+  }
+
+  static version(attrs) {
+    return new Version(attrs);
+  }
+
+  static versionControl(attrs) {
+    return new VersionControl(attrs);
+  }
+
+  static viewerPreferences(attrs) {
+    return new ViewerPreferences(attrs);
+  }
+
+  static webClient(attrs) {
+    return new WebClient(attrs);
+  }
+
+  static whitespace(attrs) {
+    return new Whitespace(attrs);
+  }
+
+  static window(attrs) {
+    return new Window(attrs);
+  }
+
+  static xdc(attrs) {
+    return new Xdc(attrs);
+  }
+
+  static xdp(attrs) {
+    return new Xdp(attrs);
+  }
+
+  static xsl(attrs) {
+    return new Xsl(attrs);
+  }
+
+  static zpl(attrs) {
+    return new Zpl(attrs);
+  }
+
+}
+
+exports.ConfigNamespace = ConfigNamespace;
+
+/***/ }),
+/* 92 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.ConnectionSetNamespace = void 0;
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+const CONNECTION_SET_NS_ID = _namespaces.NamespaceIds.connectionSet.id;
+
+class ConnectionSet extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "connectionSet", true);
+    this.wsdlConnection = new _xfa_object.XFAObjectArray();
+    this.xmlConnection = new _xfa_object.XFAObjectArray();
+    this.xsdConnection = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class EffectiveInputPolicy extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "effectiveInputPolicy");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class EffectiveOutputPolicy extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "effectiveOutputPolicy");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Operation extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "operation");
+    this.id = attributes.id || "";
+    this.input = attributes.input || "";
+    this.name = attributes.name || "";
+    this.output = attributes.output || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class RootElement extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "rootElement");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class SoapAction extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "soapAction");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class SoapAddress extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "soapAddress");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class Uri extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "uri");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class WsdlAddress extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "wsdlAddress");
+    this.id = attributes.id || "";
+    this.name = attributes.name || "";
+    this.use = attributes.use || "";
+    this.usehref = attributes.usehref || "";
+  }
+
+}
+
+class WsdlConnection extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "wsdlConnection", true);
+    this.dataDescription = attributes.dataDescription || "";
+    this.name = attributes.name || "";
+    this.effectiveInputPolicy = null;
+    this.effectiveOutputPolicy = null;
+    this.operation = null;
+    this.soapAction = null;
+    this.soapAddress = null;
+    this.wsdlAddress = null;
+  }
+
+}
+
+class XmlConnection extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "xmlConnection", true);
+    this.dataDescription = attributes.dataDescription || "";
+    this.name = attributes.name || "";
+    this.uri = null;
+  }
+
+}
+
+class XsdConnection extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(CONNECTION_SET_NS_ID, "xsdConnection", true);
+    this.dataDescription = attributes.dataDescription || "";
+    this.name = attributes.name || "";
+    this.rootElement = null;
+    this.uri = null;
+  }
+
+}
+
+class ConnectionSetNamespace {
+  static [_namespaces.$buildXFAObject](name, attributes) {
+    if (ConnectionSetNamespace.hasOwnProperty(name)) {
+      return ConnectionSetNamespace[name](attributes);
+    }
+
+    return undefined;
+  }
+
+  static connectionSet(attrs) {
+    return new ConnectionSet(attrs);
+  }
+
+  static effectiveInputPolicy(attrs) {
+    return new EffectiveInputPolicy(attrs);
+  }
+
+  static effectiveOutputPolicy(attrs) {
+    return new EffectiveOutputPolicy(attrs);
+  }
+
+  static operation(attrs) {
+    return new Operation(attrs);
+  }
+
+  static rootElement(attrs) {
+    return new RootElement(attrs);
+  }
+
+  static soapAction(attrs) {
+    return new SoapAction(attrs);
+  }
+
+  static soapAddress(attrs) {
+    return new SoapAddress(attrs);
+  }
+
+  static uri(attrs) {
+    return new Uri(attrs);
+  }
+
+  static wsdlAddress(attrs) {
+    return new WsdlAddress(attrs);
+  }
+
+  static wsdlConnection(attrs) {
+    return new WsdlConnection(attrs);
+  }
+
+  static xmlConnection(attrs) {
+    return new XmlConnection(attrs);
+  }
+
+  static xsdConnection(attrs) {
+    return new XsdConnection(attrs);
+  }
+
+}
+
+exports.ConnectionSetNamespace = ConnectionSetNamespace;
+
+/***/ }),
+/* 93 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.DatasetsNamespace = void 0;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _namespaces = __w_pdfjs_require__(79);
+
+const DATASETS_NS_ID = _namespaces.NamespaceIds.datasets.id;
+
+class Data extends _xfa_object.XmlObject {
+  constructor(attributes) {
+    super(DATASETS_NS_ID, "data", attributes);
+  }
+
+  [_xfa_object.$isNsAgnostic]() {
+    return true;
+  }
+
+}
+
+class Datasets extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(DATASETS_NS_ID, "datasets", true);
+    this.data = null;
+    this.Signature = null;
+  }
+
+  [_xfa_object.$onChild](child) {
+    const name = child[_xfa_object.$nodeName];
+
+    if (name === "data" && child[_xfa_object.$namespaceId] === DATASETS_NS_ID || name === "Signature" && child[_xfa_object.$namespaceId] === _namespaces.NamespaceIds.signature.id) {
+      this[name] = child;
+    }
+
+    this[_xfa_object.$appendChild](child);
+  }
+
+}
+
+class DatasetsNamespace {
+  static [_namespaces.$buildXFAObject](name, attributes) {
+    if (DatasetsNamespace.hasOwnProperty(name)) {
+      return DatasetsNamespace[name](attributes);
+    }
+
+    return undefined;
+  }
+
+  static datasets(attributes) {
+    return new Datasets(attributes);
+  }
+
+  static data(attributes) {
+    return new Data(attributes);
+  }
+
+}
+
+exports.DatasetsNamespace = DatasetsNamespace;
+
+/***/ }),
+/* 94 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.LocaleSetNamespace = void 0;
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _utils = __w_pdfjs_require__(78);
+
+const LOCALE_SET_NS_ID = _namespaces.NamespaceIds.localeSet.id;
+
+class CalendarSymbols extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "calendarSymbols", true);
+    this.name = "gregorian";
+    this.dayNames = new _xfa_object.XFAObjectArray(2);
+    this.eraNames = null;
+    this.meridiemNames = null;
+    this.monthNames = new _xfa_object.XFAObjectArray(2);
+  }
+
+}
+
+class CurrencySymbol extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "currencySymbol");
+    this.name = (0, _utils.getStringOption)(attributes.name, ["symbol", "isoname", "decimal"]);
+  }
+
+}
+
+class CurrencySymbols extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "currencySymbols", true);
+    this.currencySymbol = new _xfa_object.XFAObjectArray(3);
+  }
+
+}
+
+class DatePattern extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "datePattern");
+    this.name = (0, _utils.getStringOption)(attributes.name, ["full", "long", "med", "short"]);
+  }
+
+}
+
+class DatePatterns extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "datePatterns", true);
+    this.datePattern = new _xfa_object.XFAObjectArray(4);
+  }
+
+}
+
+class DateTimeSymbols extends _xfa_object.ContentObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "dateTimeSymbols");
+  }
+
+}
+
+class Day extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "day");
+  }
+
+}
+
+class DayNames extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "dayNames", true);
+    this.abbr = (0, _utils.getInteger)({
+      data: attributes.abbr,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.day = new _xfa_object.XFAObjectArray(7);
+  }
+
+}
+
+class Era extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "era");
+  }
+
+}
+
+class EraNames extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "eraNames", true);
+    this.era = new _xfa_object.XFAObjectArray(2);
+  }
+
+}
+
+class Locale extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "locale", true);
+    this.desc = attributes.desc || "";
+    this.name = "isoname";
+    this.calendarSymbols = null;
+    this.currencySymbols = null;
+    this.datePatterns = null;
+    this.dateTimeSymbols = null;
+    this.numberPatterns = null;
+    this.numberSymbols = null;
+    this.timePatterns = null;
+    this.typeFaces = null;
+  }
+
+}
+
+class LocaleSet extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "localeSet", true);
+    this.locale = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class Meridiem extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "meridiem");
+  }
+
+}
+
+class MeridiemNames extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "meridiemNames", true);
+    this.meridiem = new _xfa_object.XFAObjectArray(2);
+  }
+
+}
+
+class Month extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "month");
+  }
+
+}
+
+class MonthNames extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "monthNames", true);
+    this.abbr = (0, _utils.getInteger)({
+      data: attributes.abbr,
+      defaultValue: 0,
+      validate: x => x === 1
+    });
+    this.month = new _xfa_object.XFAObjectArray(12);
+  }
+
+}
+
+class NumberPattern extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "numberPattern");
+    this.name = (0, _utils.getStringOption)(attributes.name, ["full", "long", "med", "short"]);
+  }
+
+}
+
+class NumberPatterns extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "numberPatterns", true);
+    this.numberPattern = new _xfa_object.XFAObjectArray(4);
+  }
+
+}
+
+class NumberSymbol extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "numberSymbol");
+    this.name = (0, _utils.getStringOption)(attributes.name, ["decimal", "grouping", "percent", "minus", "zero"]);
+  }
+
+}
+
+class NumberSymbols extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "numberSymbols", true);
+    this.numberSymbol = new _xfa_object.XFAObjectArray(5);
+  }
+
+}
+
+class TimePattern extends _xfa_object.StringObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "timePattern");
+    this.name = (0, _utils.getStringOption)(attributes.name, ["full", "long", "med", "short"]);
+  }
+
+}
+
+class TimePatterns extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "timePatterns", true);
+    this.timePattern = new _xfa_object.XFAObjectArray(4);
+  }
+
+}
+
+class TypeFace extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "typeFace", true);
+    this.name = attributes.name | "";
+  }
+
+}
+
+class TypeFaces extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(LOCALE_SET_NS_ID, "typeFaces", true);
+    this.typeFace = new _xfa_object.XFAObjectArray();
+  }
+
+}
+
+class LocaleSetNamespace {
+  static [_namespaces.$buildXFAObject](name, attributes) {
+    if (LocaleSetNamespace.hasOwnProperty(name)) {
+      return LocaleSetNamespace[name](attributes);
+    }
+
+    return undefined;
+  }
+
+  static calendarSymbols(attrs) {
+    return new CalendarSymbols(attrs);
+  }
+
+  static currencySymbol(attrs) {
+    return new CurrencySymbol(attrs);
+  }
+
+  static currencySymbols(attrs) {
+    return new CurrencySymbols(attrs);
+  }
+
+  static datePattern(attrs) {
+    return new DatePattern(attrs);
+  }
+
+  static datePatterns(attrs) {
+    return new DatePatterns(attrs);
+  }
+
+  static dateTimeSymbols(attrs) {
+    return new DateTimeSymbols(attrs);
+  }
+
+  static day(attrs) {
+    return new Day(attrs);
+  }
+
+  static dayNames(attrs) {
+    return new DayNames(attrs);
+  }
+
+  static era(attrs) {
+    return new Era(attrs);
+  }
+
+  static eraNames(attrs) {
+    return new EraNames(attrs);
+  }
+
+  static locale(attrs) {
+    return new Locale(attrs);
+  }
+
+  static localeSet(attrs) {
+    return new LocaleSet(attrs);
+  }
+
+  static meridiem(attrs) {
+    return new Meridiem(attrs);
+  }
+
+  static meridiemNames(attrs) {
+    return new MeridiemNames(attrs);
+  }
+
+  static month(attrs) {
+    return new Month(attrs);
+  }
+
+  static monthNames(attrs) {
+    return new MonthNames(attrs);
+  }
+
+  static numberPattern(attrs) {
+    return new NumberPattern(attrs);
+  }
+
+  static numberPatterns(attrs) {
+    return new NumberPatterns(attrs);
+  }
+
+  static numberSymbol(attrs) {
+    return new NumberSymbol(attrs);
+  }
+
+  static numberSymbols(attrs) {
+    return new NumberSymbols(attrs);
+  }
+
+  static timePattern(attrs) {
+    return new TimePattern(attrs);
+  }
+
+  static timePatterns(attrs) {
+    return new TimePatterns(attrs);
+  }
+
+  static typeFace(attrs) {
+    return new TypeFace(attrs);
+  }
+
+  static typeFaces(attrs) {
+    return new TypeFaces(attrs);
+  }
+
+}
+
+exports.LocaleSetNamespace = LocaleSetNamespace;
+
+/***/ }),
+/* 95 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.SignatureNamespace = void 0;
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+const SIGNATURE_NS_ID = _namespaces.NamespaceIds.signature.id;
+
+class Signature extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(SIGNATURE_NS_ID, "signature", true);
+  }
+
+}
+
+class SignatureNamespace {
+  static [_namespaces.$buildXFAObject](name, attributes) {
+    if (SignatureNamespace.hasOwnProperty(name)) {
+      return SignatureNamespace[name](attributes);
+    }
+
+    return undefined;
+  }
+
+  static signature(attributes) {
+    return new Signature(attributes);
+  }
+
+}
+
+exports.SignatureNamespace = SignatureNamespace;
+
+/***/ }),
+/* 96 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.StylesheetNamespace = void 0;
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+const STYLESHEET_NS_ID = _namespaces.NamespaceIds.stylesheet.id;
+
+class Stylesheet extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(STYLESHEET_NS_ID, "stylesheet", true);
+  }
+
+}
+
+class StylesheetNamespace {
+  static [_namespaces.$buildXFAObject](name, attributes) {
+    if (StylesheetNamespace.hasOwnProperty(name)) {
+      return StylesheetNamespace[name](attributes);
+    }
+
+    return undefined;
+  }
+
+  static stylesheet(attributes) {
+    return new Stylesheet(attributes);
+  }
+
+}
+
+exports.StylesheetNamespace = StylesheetNamespace;
+
+/***/ }),
+/* 97 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XdpNamespace = void 0;
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+const XDP_NS_ID = _namespaces.NamespaceIds.xdp.id;
+
+class Xdp extends _xfa_object.XFAObject {
+  constructor(attributes) {
+    super(XDP_NS_ID, "xdp", true);
+    this.uuid = attributes.uuid || "";
+    this.timeStamp = attributes.timeStamp || "";
+    this.config = null;
+    this.connectionSet = null;
+    this.datasets = null;
+    this.localeSet = null;
+    this.stylesheet = new _xfa_object.XFAObjectArray();
+    this.template = null;
+  }
+
+  [_xfa_object.$onChildCheck](child) {
+    const ns = _namespaces.NamespaceIds[child[_xfa_object.$nodeName]];
+    return ns && child[_xfa_object.$namespaceId] === ns.id;
+  }
+
+}
+
+class XdpNamespace {
+  static [_namespaces.$buildXFAObject](name, attributes) {
+    if (XdpNamespace.hasOwnProperty(name)) {
+      return XdpNamespace[name](attributes);
+    }
+
+    return undefined;
+  }
+
+  static xdp(attributes) {
+    return new Xdp(attributes);
+  }
+
+}
+
+exports.XdpNamespace = XdpNamespace;
+
+/***/ }),
+/* 98 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XhtmlNamespace = void 0;
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _html_utils = __w_pdfjs_require__(84);
+
+var _utils = __w_pdfjs_require__(78);
+
+const XHTML_NS_ID = _namespaces.NamespaceIds.xhtml.id;
+const $richText = Symbol();
+const VALID_STYLES = new Set(["color", "font", "font-family", "font-size", "font-stretch", "font-style", "font-weight", "margin", "margin-bottom", "margin-left", "margin-right", "margin-top", "letter-spacing", "line-height", "orphans", "page-break-after", "page-break-before", "page-break-inside", "tab-interval", "tab-stop", "text-align", "text-decoration", "text-indent", "vertical-align", "widows", "kerning-mode", "xfa-font-horizontal-scale", "xfa-font-vertical-scale", "xfa-spacerun", "xfa-tab-stops"]);
+const StyleMapping = new Map([["page-break-after", "breakAfter"], ["page-break-before", "breakBefore"], ["page-break-inside", "breakInside"], ["kerning-mode", value => value === "none" ? "none" : "normal"], ["xfa-font-horizontal-scale", value => `scaleX(${Math.max(0, Math.min(parseInt(value) / 100)).toFixed(2)})`], ["xfa-font-vertical-scale", value => `scaleY(${Math.max(0, Math.min(parseInt(value) / 100)).toFixed(2)})`], ["xfa-spacerun", ""], ["xfa-tab-stops", ""], ["font-size", (value, original) => {
+  value = original.fontSize = (0, _utils.getMeasurement)(value);
+  return (0, _html_utils.measureToString)(0.99 * value);
+}], ["letter-spacing", value => (0, _html_utils.measureToString)((0, _utils.getMeasurement)(value))], ["line-height", value => (0, _html_utils.measureToString)((0, _utils.getMeasurement)(value))], ["margin", value => (0, _html_utils.measureToString)((0, _utils.getMeasurement)(value))], ["margin-bottom", value => (0, _html_utils.measureToString)((0, _utils.getMeasurement)(value))], ["margin-left", value => (0, _html_utils.measureToString)((0, _utils.getMeasurement)(value))], ["margin-right", value => (0, _html_utils.measureToString)((0, _utils.getMeasurement)(value))], ["margin-top", value => (0, _html_utils.measureToString)((0, _utils.getMeasurement)(value))], ["text-indent", value => (0, _html_utils.measureToString)((0, _utils.getMeasurement)(value))], ["font-family", value => value], ["vertical-align", value => (0, _html_utils.measureToString)((0, _utils.getMeasurement)(value))]]);
+const spacesRegExp = /\s+/g;
+const crlfRegExp = /[\r\n]+/g;
+const crlfForRichTextRegExp = /\r\n?/g;
+
+function mapStyle(styleStr, node, richText) {
+  const style = Object.create(null);
+
+  if (!styleStr) {
+    return style;
+  }
+
+  const original = Object.create(null);
+
+  for (const [key, value] of styleStr.split(";").map(s => s.split(":", 2))) {
+    const mapping = StyleMapping.get(key);
+
+    if (mapping === "") {
+      continue;
+    }
+
+    let newValue = value;
+
+    if (mapping) {
+      if (typeof mapping === "string") {
+        newValue = mapping;
+      } else {
+        newValue = mapping(value, original);
+      }
+    }
+
+    if (key.endsWith("scale")) {
+      if (style.transform) {
+        style.transform = `${style[key]} ${newValue}`;
+      } else {
+        style.transform = newValue;
+      }
+    } else {
+      style[key.replaceAll(/-([a-zA-Z])/g, (_, x) => x.toUpperCase())] = newValue;
+    }
+  }
+
+  if (style.fontFamily) {
+    (0, _html_utils.setFontFamily)({
+      typeface: style.fontFamily,
+      weight: style.fontWeight || "normal",
+      posture: style.fontStyle || "normal",
+      size: original.fontSize || 0
+    }, node, node[_xfa_object.$globalData].fontFinder, style);
+  }
+
+  if (richText && style.verticalAlign && style.verticalAlign !== "0px" && style.fontSize) {
+    const SUB_SUPER_SCRIPT_FACTOR = 0.583;
+    const VERTICAL_FACTOR = 0.333;
+    const fontSize = (0, _utils.getMeasurement)(style.fontSize);
+    style.fontSize = (0, _html_utils.measureToString)(fontSize * SUB_SUPER_SCRIPT_FACTOR);
+    style.verticalAlign = (0, _html_utils.measureToString)(Math.sign((0, _utils.getMeasurement)(style.verticalAlign)) * fontSize * VERTICAL_FACTOR);
+  }
+
+  if (richText && style.fontSize) {
+    style.fontSize = `calc(${style.fontSize} * var(--scale-factor))`;
+  }
+
+  (0, _html_utils.fixTextIndent)(style);
+  return style;
+}
+
+function checkStyle(node) {
+  if (!node.style) {
+    return "";
+  }
+
+  return node.style.trim().split(/\s*;\s*/).filter(s => !!s).map(s => s.split(/\s*:\s*/, 2)).filter(([key, value]) => {
+    if (key === "font-family") {
+      node[_xfa_object.$globalData].usedTypefaces.add(value);
+    }
+
+    return VALID_STYLES.has(key);
+  }).map(kv => kv.join(":")).join(";");
+}
+
+const NoWhites = new Set(["body", "html"]);
+
+class XhtmlObject extends _xfa_object.XmlObject {
+  constructor(attributes, name) {
+    super(XHTML_NS_ID, name);
+    this[$richText] = false;
+    this.style = attributes.style || "";
+  }
+
+  [_xfa_object.$clean](builder) {
+    super[_xfa_object.$clean](builder);
+
+    this.style = checkStyle(this);
+  }
+
+  [_xfa_object.$acceptWhitespace]() {
+    return !NoWhites.has(this[_xfa_object.$nodeName]);
+  }
+
+  [_xfa_object.$onText](str, richText = false) {
+    if (!richText) {
+      str = str.replace(crlfRegExp, "");
+
+      if (!this.style.includes("xfa-spacerun:yes")) {
+        str = str.replace(spacesRegExp, " ");
+      }
+    } else {
+      this[$richText] = true;
+    }
+
+    if (str) {
+      this[_xfa_object.$content] += str;
+    }
+  }
+
+  [_xfa_object.$pushGlyphs](measure, mustPop = true) {
+    const xfaFont = Object.create(null);
+    const margin = {
+      top: NaN,
+      bottom: NaN,
+      left: NaN,
+      right: NaN
+    };
+    let lineHeight = null;
+
+    for (const [key, value] of this.style.split(";").map(s => s.split(":", 2))) {
+      switch (key) {
+        case "font-family":
+          xfaFont.typeface = (0, _utils.stripQuotes)(value);
+          break;
+
+        case "font-size":
+          xfaFont.size = (0, _utils.getMeasurement)(value);
+          break;
+
+        case "font-weight":
+          xfaFont.weight = value;
+          break;
+
+        case "font-style":
+          xfaFont.posture = value;
+          break;
+
+        case "letter-spacing":
+          xfaFont.letterSpacing = (0, _utils.getMeasurement)(value);
+          break;
+
+        case "margin":
+          const values = value.split(/ \t/).map(x => (0, _utils.getMeasurement)(x));
+
+          switch (values.length) {
+            case 1:
+              margin.top = margin.bottom = margin.left = margin.right = values[0];
+              break;
+
+            case 2:
+              margin.top = margin.bottom = values[0];
+              margin.left = margin.right = values[1];
+              break;
+
+            case 3:
+              margin.top = values[0];
+              margin.bottom = values[2];
+              margin.left = margin.right = values[1];
+              break;
+
+            case 4:
+              margin.top = values[0];
+              margin.left = values[1];
+              margin.bottom = values[2];
+              margin.right = values[3];
+              break;
+          }
+
+          break;
+
+        case "margin-top":
+          margin.top = (0, _utils.getMeasurement)(value);
+          break;
+
+        case "margin-bottom":
+          margin.bottom = (0, _utils.getMeasurement)(value);
+          break;
+
+        case "margin-left":
+          margin.left = (0, _utils.getMeasurement)(value);
+          break;
+
+        case "margin-right":
+          margin.right = (0, _utils.getMeasurement)(value);
+          break;
+
+        case "line-height":
+          lineHeight = (0, _utils.getMeasurement)(value);
+          break;
+      }
+    }
+
+    measure.pushData(xfaFont, margin, lineHeight);
+
+    if (this[_xfa_object.$content]) {
+      measure.addString(this[_xfa_object.$content]);
+    } else {
+      for (const child of this[_xfa_object.$getChildren]()) {
+        if (child[_xfa_object.$nodeName] === "#text") {
+          measure.addString(child[_xfa_object.$content]);
+          continue;
+        }
+
+        child[_xfa_object.$pushGlyphs](measure);
+      }
+    }
+
+    if (mustPop) {
+      measure.popFont();
+    }
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const children = [];
+    this[_xfa_object.$extra] = {
+      children
+    };
+
+    this[_xfa_object.$childrenToHTML]({});
+
+    if (children.length === 0 && !this[_xfa_object.$content]) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    let value;
+
+    if (this[$richText]) {
+      value = this[_xfa_object.$content] ? this[_xfa_object.$content].replace(crlfForRichTextRegExp, "\n") : undefined;
+    } else {
+      value = this[_xfa_object.$content] || undefined;
+    }
+
+    return _utils.HTMLResult.success({
+      name: this[_xfa_object.$nodeName],
+      attributes: {
+        href: this.href,
+        style: mapStyle(this.style, this, this[$richText])
+      },
+      children,
+      value
+    });
+  }
+
+}
+
+class A extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "a");
+    this.href = (0, _html_utils.fixURL)(attributes.href) || "";
+  }
+
+}
+
+class B extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "b");
+  }
+
+  [_xfa_object.$pushGlyphs](measure) {
+    measure.pushFont({
+      weight: "bold"
+    });
+
+    super[_xfa_object.$pushGlyphs](measure);
+
+    measure.popFont();
+  }
+
+}
+
+class Body extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "body");
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const res = super[_xfa_object.$toHTML](availableSpace);
+
+    const {
+      html
+    } = res;
+
+    if (!html) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
+    html.name = "div";
+    html.attributes.class = ["xfaRich"];
+    return res;
+  }
+
+}
+
+class Br extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "br");
+  }
+
+  [_xfa_object.$text]() {
+    return "\n";
+  }
+
+  [_xfa_object.$pushGlyphs](measure) {
+    measure.addString("\n");
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    return _utils.HTMLResult.success({
+      name: "br"
+    });
+  }
+
+}
+
+class Html extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "html");
+  }
+
+  [_xfa_object.$toHTML](availableSpace) {
+    const children = [];
+    this[_xfa_object.$extra] = {
+      children
+    };
+
+    this[_xfa_object.$childrenToHTML]({});
+
+    if (children.length === 0) {
+      return _utils.HTMLResult.success({
+        name: "div",
+        attributes: {
+          class: ["xfaRich"],
+          style: {}
+        },
+        value: this[_xfa_object.$content] || ""
+      });
+    }
+
+    if (children.length === 1) {
+      const child = children[0];
+
+      if (child.attributes && child.attributes.class.includes("xfaRich")) {
+        return _utils.HTMLResult.success(child);
+      }
+    }
+
+    return _utils.HTMLResult.success({
+      name: "div",
+      attributes: {
+        class: ["xfaRich"],
+        style: {}
+      },
+      children
+    });
+  }
+
+}
+
+class I extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "i");
+  }
+
+  [_xfa_object.$pushGlyphs](measure) {
+    measure.pushFont({
+      posture: "italic"
+    });
+
+    super[_xfa_object.$pushGlyphs](measure);
+
+    measure.popFont();
+  }
+
+}
+
+class Li extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "li");
+  }
+
+}
+
+class Ol extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "ol");
+  }
+
+}
+
+class P extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "p");
+  }
+
+  [_xfa_object.$pushGlyphs](measure) {
+    super[_xfa_object.$pushGlyphs](measure, false);
+
+    measure.addString("\n");
+    measure.addPara();
+    measure.popFont();
+  }
+
+  [_xfa_object.$text]() {
+    const siblings = this[_xfa_object.$getParent]()[_xfa_object.$getChildren]();
+
+    if (siblings.at(-1) === this) {
+      return super[_xfa_object.$text]();
+    }
+
+    return super[_xfa_object.$text]() + "\n";
+  }
+
+}
+
+class Span extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "span");
+  }
+
+}
+
+class Sub extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "sub");
+  }
+
+}
+
+class Sup extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "sup");
+  }
+
+}
+
+class Ul extends XhtmlObject {
+  constructor(attributes) {
+    super(attributes, "ul");
+  }
+
+}
+
+class XhtmlNamespace {
+  static [_namespaces.$buildXFAObject](name, attributes) {
+    if (XhtmlNamespace.hasOwnProperty(name)) {
+      return XhtmlNamespace[name](attributes);
+    }
+
+    return undefined;
+  }
+
+  static a(attributes) {
+    return new A(attributes);
+  }
+
+  static b(attributes) {
+    return new B(attributes);
+  }
+
+  static body(attributes) {
+    return new Body(attributes);
+  }
+
+  static br(attributes) {
+    return new Br(attributes);
+  }
+
+  static html(attributes) {
+    return new Html(attributes);
+  }
+
+  static i(attributes) {
+    return new I(attributes);
+  }
+
+  static li(attributes) {
+    return new Li(attributes);
+  }
+
+  static ol(attributes) {
+    return new Ol(attributes);
+  }
+
+  static p(attributes) {
+    return new P(attributes);
+  }
+
+  static span(attributes) {
+    return new Span(attributes);
+  }
+
+  static sub(attributes) {
+    return new Sub(attributes);
+  }
+
+  static sup(attributes) {
+    return new Sup(attributes);
+  }
+
+  static ul(attributes) {
+    return new Ul(attributes);
+  }
+
+}
+
+exports.XhtmlNamespace = XhtmlNamespace;
+
+/***/ }),
+/* 99 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.UnknownNamespace = void 0;
+
+var _namespaces = __w_pdfjs_require__(79);
+
+var _xfa_object = __w_pdfjs_require__(77);
+
+class UnknownNamespace {
+  constructor(nsId) {
+    this.namespaceId = nsId;
+  }
+
+  [_namespaces.$buildXFAObject](name, attributes) {
+    return new _xfa_object.XmlObject(this.namespaceId, name, attributes);
+  }
+
+}
+
+exports.UnknownNamespace = UnknownNamespace;
+
+/***/ }),
+/* 100 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.DatasetReader = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _xml_parser = __w_pdfjs_require__(66);
+
+function decodeString(str) {
+  try {
+    return (0, _util.stringToUTF8String)(str);
+  } catch (ex) {
+    (0, _util.warn)(`UTF-8 decoding failed: "${ex}".`);
+    return str;
+  }
+}
+
+class DatasetXMLParser extends _xml_parser.SimpleXMLParser {
+  constructor(options) {
+    super(options);
+    this.node = null;
+  }
+
+  onEndElement(name) {
+    const node = super.onEndElement(name);
+
+    if (node && name === "xfa:datasets") {
+      this.node = node;
+      throw new Error("Aborting DatasetXMLParser.");
+    }
+  }
+
+}
+
+class DatasetReader {
+  constructor(data) {
+    if (data.datasets) {
+      this.node = new _xml_parser.SimpleXMLParser({
+        hasAttributes: true
+      }).parseFromString(data.datasets).documentElement;
+    } else {
+      const parser = new DatasetXMLParser({
+        hasAttributes: true
+      });
+
+      try {
+        parser.parseFromString(data["xdp:xdp"]);
+      } catch (_) {}
+
+      this.node = parser.node;
+    }
+  }
+
+  getValue(path) {
+    if (!this.node || !path) {
+      return "";
+    }
+
+    const node = this.node.searchNode((0, _core_utils.parseXFAPath)(path), 0);
+
+    if (!node) {
+      return "";
+    }
+
+    const first = node.firstChild;
+
+    if (first && first.nodeName === "value") {
+      return node.children.map(child => decodeString(child.textContent));
+    }
+
+    return decodeString(node.textContent);
+  }
+
+}
+
+exports.DatasetReader = DatasetReader;
+
+/***/ }),
+/* 101 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XRef = void 0;
+
+var _util = __w_pdfjs_require__(2);
+
+var _primitives = __w_pdfjs_require__(5);
+
+var _core_utils = __w_pdfjs_require__(6);
+
+var _parser = __w_pdfjs_require__(17);
+
+var _base_stream = __w_pdfjs_require__(7);
+
+var _crypto = __w_pdfjs_require__(67);
+
+class XRef {
+  constructor(stream, pdfManager) {
+    this.stream = stream;
+    this.pdfManager = pdfManager;
+    this.entries = [];
+    this.xrefstms = Object.create(null);
+    this._cacheMap = new Map();
+    this._pendingRefs = new _primitives.RefSet();
+    this.stats = new _core_utils.DocStats(pdfManager.msgHandler);
+    this._newRefNum = null;
+  }
+
+  getNewRef() {
+    if (this._newRefNum === null) {
+      this._newRefNum = this.entries.length || 1;
+    }
+
+    return _primitives.Ref.get(this._newRefNum++, 0);
+  }
+
+  resetNewRef() {
+    this._newRefNum = null;
+  }
+
+  setStartXRef(startXRef) {
+    this.startXRefQueue = [startXRef];
+  }
+
+  parse(recoveryMode = false) {
+    let trailerDict;
+
+    if (!recoveryMode) {
+      trailerDict = this.readXRef();
+    } else {
+      (0, _util.warn)("Indexing all PDF objects");
+      trailerDict = this.indexObjects();
+    }
+
+    trailerDict.assignXref(this);
+    this.trailer = trailerDict;
+    let encrypt;
+
+    try {
+      encrypt = trailerDict.get("Encrypt");
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)(`XRef.parse - Invalid "Encrypt" reference: "${ex}".`);
+    }
+
+    if (encrypt instanceof _primitives.Dict) {
+      const ids = trailerDict.get("ID");
+      const fileId = ids && ids.length ? ids[0] : "";
+      encrypt.suppressEncryption = true;
+      this.encrypt = new _crypto.CipherTransformFactory(encrypt, fileId, this.pdfManager.password);
+    }
+
+    let root;
+
+    try {
+      root = trailerDict.get("Root");
+    } catch (ex) {
+      if (ex instanceof _core_utils.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.warn)(`XRef.parse - Invalid "Root" reference: "${ex}".`);
+    }
+
+    if (root instanceof _primitives.Dict) {
+      try {
+        const pages = root.get("Pages");
+
+        if (pages instanceof _primitives.Dict) {
+          this.root = root;
+          return;
+        }
+      } catch (ex) {
+        if (ex instanceof _core_utils.MissingDataException) {
+          throw ex;
+        }
+
+        (0, _util.warn)(`XRef.parse - Invalid "Pages" reference: "${ex}".`);
+      }
+    }
+
+    if (!recoveryMode) {
+      throw new _core_utils.XRefParseException();
+    }
+
+    throw new _util.InvalidPDFException("Invalid Root reference.");
+  }
+
+  processXRefTable(parser) {
+    if (!("tableState" in this)) {
+      this.tableState = {
+        entryNum: 0,
+        streamPos: parser.lexer.stream.pos,
+        parserBuf1: parser.buf1,
+        parserBuf2: parser.buf2
+      };
+    }
+
+    const obj = this.readXRefTable(parser);
+
+    if (!(0, _primitives.isCmd)(obj, "trailer")) {
+      throw new _util.FormatError("Invalid XRef table: could not find trailer dictionary");
+    }
+
+    let dict = parser.getObj();
+
+    if (!(dict instanceof _primitives.Dict) && dict.dict) {
+      dict = dict.dict;
+    }
+
+    if (!(dict instanceof _primitives.Dict)) {
+      throw new _util.FormatError("Invalid XRef table: could not parse trailer dictionary");
+    }
+
+    delete this.tableState;
+    return dict;
+  }
+
+  readXRefTable(parser) {
+    const stream = parser.lexer.stream;
+    const tableState = this.tableState;
+    stream.pos = tableState.streamPos;
+    parser.buf1 = tableState.parserBuf1;
+    parser.buf2 = tableState.parserBuf2;
+    let obj;
+
+    while (true) {
+      if (!("firstEntryNum" in tableState) || !("entryCount" in tableState)) {
+        if ((0, _primitives.isCmd)(obj = parser.getObj(), "trailer")) {
+          break;
+        }
+
+        tableState.firstEntryNum = obj;
+        tableState.entryCount = parser.getObj();
+      }
+
+      let first = tableState.firstEntryNum;
+      const count = tableState.entryCount;
+
+      if (!Number.isInteger(first) || !Number.isInteger(count)) {
+        throw new _util.FormatError("Invalid XRef table: wrong types in subsection header");
+      }
+
+      for (let i = tableState.entryNum; i < count; i++) {
+        tableState.streamPos = stream.pos;
+        tableState.entryNum = i;
+        tableState.parserBuf1 = parser.buf1;
+        tableState.parserBuf2 = parser.buf2;
+        const entry = {};
+        entry.offset = parser.getObj();
+        entry.gen = parser.getObj();
+        const type = parser.getObj();
+
+        if (type instanceof _primitives.Cmd) {
+          switch (type.cmd) {
+            case "f":
+              entry.free = true;
+              break;
+
+            case "n":
+              entry.uncompressed = true;
+              break;
+          }
+        }
+
+        if (!Number.isInteger(entry.offset) || !Number.isInteger(entry.gen) || !(entry.free || entry.uncompressed)) {
+          throw new _util.FormatError(`Invalid entry in XRef subsection: ${first}, ${count}`);
+        }
+
+        if (i === 0 && entry.free && first === 1) {
+          first = 0;
+        }
+
+        if (!this.entries[i + first]) {
+          this.entries[i + first] = entry;
+        }
+      }
+
+      tableState.entryNum = 0;
+      tableState.streamPos = stream.pos;
+      tableState.parserBuf1 = parser.buf1;
+      tableState.parserBuf2 = parser.buf2;
+      delete tableState.firstEntryNum;
+      delete tableState.entryCount;
+    }
+
+    if (this.entries[0] && !this.entries[0].free) {
+      throw new _util.FormatError("Invalid XRef table: unexpected first object");
+    }
+
+    return obj;
+  }
+
+  processXRefStream(stream) {
+    if (!("streamState" in this)) {
+      const streamParameters = stream.dict;
+      const byteWidths = streamParameters.get("W");
+      let range = streamParameters.get("Index");
+
+      if (!range) {
+        range = [0, streamParameters.get("Size")];
+      }
+
+      this.streamState = {
+        entryRanges: range,
+        byteWidths,
+        entryNum: 0,
+        streamPos: stream.pos
+      };
+    }
+
+    this.readXRefStream(stream);
+    delete this.streamState;
+    return stream.dict;
+  }
+
+  readXRefStream(stream) {
+    const streamState = this.streamState;
+    stream.pos = streamState.streamPos;
+    const [typeFieldWidth, offsetFieldWidth, generationFieldWidth] = streamState.byteWidths;
+    const entryRanges = streamState.entryRanges;
+
+    while (entryRanges.length > 0) {
+      const [first, n] = entryRanges;
+
+      if (!Number.isInteger(first) || !Number.isInteger(n)) {
+        throw new _util.FormatError(`Invalid XRef range fields: ${first}, ${n}`);
+      }
+
+      if (!Number.isInteger(typeFieldWidth) || !Number.isInteger(offsetFieldWidth) || !Number.isInteger(generationFieldWidth)) {
+        throw new _util.FormatError(`Invalid XRef entry fields length: ${first}, ${n}`);
+      }
+
+      for (let i = streamState.entryNum; i < n; ++i) {
+        streamState.entryNum = i;
+        streamState.streamPos = stream.pos;
+        let type = 0,
+            offset = 0,
+            generation = 0;
+
+        for (let j = 0; j < typeFieldWidth; ++j) {
+          const typeByte = stream.getByte();
+
+          if (typeByte === -1) {
+            throw new _util.FormatError("Invalid XRef byteWidths 'type'.");
+          }
+
+          type = type << 8 | typeByte;
+        }
+
+        if (typeFieldWidth === 0) {
+          type = 1;
+        }
+
+        for (let j = 0; j < offsetFieldWidth; ++j) {
+          const offsetByte = stream.getByte();
+
+          if (offsetByte === -1) {
+            throw new _util.FormatError("Invalid XRef byteWidths 'offset'.");
+          }
+
+          offset = offset << 8 | offsetByte;
+        }
+
+        for (let j = 0; j < generationFieldWidth; ++j) {
+          const generationByte = stream.getByte();
+
+          if (generationByte === -1) {
+            throw new _util.FormatError("Invalid XRef byteWidths 'generation'.");
+          }
+
+          generation = generation << 8 | generationByte;
+        }
+
+        const entry = {};
+        entry.offset = offset;
+        entry.gen = generation;
+
+        switch (type) {
+          case 0:
+            entry.free = true;
+            break;
+
+          case 1:
+            entry.uncompressed = true;
+            break;
+
+          case 2:
+            break;
+
+          default:
+            throw new _util.FormatError(`Invalid XRef entry type: ${type}`);
+        }
+
+        if (!this.entries[first + i]) {
+          this.entries[first + i] = entry;
+        }
+      }
+
+      streamState.entryNum = 0;
+      streamState.streamPos = stream.pos;
+      entryRanges.splice(0, 2);
+    }
+  }
+
+  indexObjects() {
+    const TAB = 0x9,
+          LF = 0xa,
+          CR = 0xd,
+          SPACE = 0x20;
+    const PERCENT = 0x25,
+          LT = 0x3c;
+
+    function readToken(data, offset) {
+      let token = "",
+          ch = data[offset];
+
+      while (ch !== LF && ch !== CR && ch !== LT) {
+        if (++offset >= data.length) {
+          break;
+        }
+
+        token += String.fromCharCode(ch);
+        ch = data[offset];
+      }
+
+      return token;
+    }
+
+    function skipUntil(data, offset, what) {
+      const length = what.length,
+            dataLength = data.length;
+      let skipped = 0;
+
+      while (offset < dataLength) {
+        let i = 0;
+
+        while (i < length && data[offset + i] === what[i]) {
+          ++i;
+        }
+
+        if (i >= length) {
+          break;
+        }
+
+        offset++;
+        skipped++;
+      }
+
+      return skipped;
+    }
+
+    const objRegExp = /^(\d+)\s+(\d+)\s+obj\b/;
+    const endobjRegExp = /\bendobj[\b\s]$/;
+    const nestedObjRegExp = /\s+(\d+\s+\d+\s+obj[\b\s<])$/;
+    const CHECK_CONTENT_LENGTH = 25;
+    const trailerBytes = new Uint8Array([116, 114, 97, 105, 108, 101, 114]);
+    const startxrefBytes = new Uint8Array([115, 116, 97, 114, 116, 120, 114, 101, 102]);
+    const objBytes = new Uint8Array([111, 98, 106]);
+    const xrefBytes = new Uint8Array([47, 88, 82, 101, 102]);
+    this.entries.length = 0;
+
+    this._cacheMap.clear();
+
+    const stream = this.stream;
+    stream.pos = 0;
+    const buffer = stream.getBytes(),
+          length = buffer.length;
+    let position = stream.start;
+    const trailers = [],
+          xrefStms = [];
+
+    while (position < length) {
+      let ch = buffer[position];
+
+      if (ch === TAB || ch === LF || ch === CR || ch === SPACE) {
+        ++position;
+        continue;
+      }
+
+      if (ch === PERCENT) {
+        do {
+          ++position;
+
+          if (position >= length) {
+            break;
+          }
+
+          ch = buffer[position];
+        } while (ch !== LF && ch !== CR);
+
+        continue;
+      }
+
+      const token = readToken(buffer, position);
+      let m;
+
+      if (token.startsWith("xref") && (token.length === 4 || /\s/.test(token[4]))) {
+        position += skipUntil(buffer, position, trailerBytes);
+        trailers.push(position);
+        position += skipUntil(buffer, position, startxrefBytes);
+      } else if (m = objRegExp.exec(token)) {
+        const num = m[1] | 0,
+              gen = m[2] | 0;
+        let contentLength,
+            startPos = position + token.length,
+            updateEntries = false;
+
+        if (!this.entries[num]) {
+          updateEntries = true;
+        } else if (this.entries[num].gen === gen) {
+          try {
+            const parser = new _parser.Parser({
+              lexer: new _parser.Lexer(stream.makeSubStream(startPos))
+            });
+            parser.getObj();
+            updateEntries = true;
+          } catch (ex) {
+            if (ex instanceof _core_utils.ParserEOFException) {
+              (0, _util.warn)(`indexObjects -- checking object (${token}): "${ex}".`);
+            } else {
+              updateEntries = true;
+            }
+          }
+        }
+
+        if (updateEntries) {
+          this.entries[num] = {
+            offset: position - stream.start,
+            gen,
+            uncompressed: true
+          };
+        }
+
+        while (startPos < buffer.length) {
+          const endPos = startPos + skipUntil(buffer, startPos, objBytes) + 4;
+          contentLength = endPos - position;
+          const checkPos = Math.max(endPos - CHECK_CONTENT_LENGTH, startPos);
+          const tokenStr = (0, _util.bytesToString)(buffer.subarray(checkPos, endPos));
+
+          if (endobjRegExp.test(tokenStr)) {
+            break;
+          } else {
+            const objToken = nestedObjRegExp.exec(tokenStr);
+
+            if (objToken && objToken[1]) {
+              (0, _util.warn)('indexObjects: Found new "obj" inside of another "obj", ' + 'caused by missing "endobj" -- trying to recover.');
+              contentLength -= objToken[1].length;
+              break;
+            }
+          }
+
+          startPos = endPos;
+        }
+
+        const content = buffer.subarray(position, position + contentLength);
+        const xrefTagOffset = skipUntil(content, 0, xrefBytes);
+
+        if (xrefTagOffset < contentLength && content[xrefTagOffset + 5] < 64) {
+          xrefStms.push(position - stream.start);
+          this.xrefstms[position - stream.start] = 1;
+        }
+
+        position += contentLength;
+      } else if (token.startsWith("trailer") && (token.length === 7 || /\s/.test(token[7]))) {
+        trailers.push(position);
+        position += skipUntil(buffer, position, startxrefBytes);
+      } else {
+        position += token.length + 1;
+      }
+    }
+
+    for (let i = 0, ii = xrefStms.length; i < ii; ++i) {
+      this.startXRefQueue.push(xrefStms[i]);
+      this.readXRef(true);
+    }
+
+    let trailerDict;
+
+    for (let i = 0, ii = trailers.length; i < ii; ++i) {
+      stream.pos = trailers[i];
+      const parser = new _parser.Parser({
+        lexer: new _parser.Lexer(stream),
+        xref: this,
+        allowStreams: true,
+        recoveryMode: true
+      });
+      const obj = parser.getObj();
+
+      if (!(0, _primitives.isCmd)(obj, "trailer")) {
+        continue;
+      }
+
+      const dict = parser.getObj();
+
+      if (!(dict instanceof _primitives.Dict)) {
+        continue;
+      }
+
+      try {
+        const rootDict = dict.get("Root");
+
+        if (!(rootDict instanceof _primitives.Dict)) {
+          continue;
+        }
+
+        const pagesDict = rootDict.get("Pages");
+
+        if (!(pagesDict instanceof _primitives.Dict)) {
+          continue;
+        }
+
+        const pagesCount = pagesDict.get("Count");
+
+        if (!Number.isInteger(pagesCount)) {
+          continue;
+        }
+      } catch (ex) {
+        continue;
+      }
+
+      if (dict.has("ID")) {
+        return dict;
+      }
+
+      trailerDict = dict;
+    }
+
+    if (trailerDict) {
+      return trailerDict;
+    }
+
+    if (this.topDict) {
+      return this.topDict;
+    }
+
+    throw new _util.InvalidPDFException("Invalid PDF structure.");
+  }
+
+  readXRef(recoveryMode = false) {
+    const stream = this.stream;
+    const startXRefParsedCache = new Set();
+
+    try {
+      while (this.startXRefQueue.length) {
+        const startXRef = this.startXRefQueue[0];
+
+        if (startXRefParsedCache.has(startXRef)) {
+          (0, _util.warn)("readXRef - skipping XRef table since it was already parsed.");
+          this.startXRefQueue.shift();
+          continue;
+        }
+
+        startXRefParsedCache.add(startXRef);
+        stream.pos = startXRef + stream.start;
+        const parser = new _parser.Parser({
+          lexer: new _parser.Lexer(stream),
+          xref: this,
+          allowStreams: true
+        });
+        let obj = parser.getObj();
+        let dict;
+
+        if ((0, _primitives.isCmd)(obj, "xref")) {
+          dict = this.processXRefTable(parser);
+
+          if (!this.topDict) {
+            this.topDict = dict;
+          }
+
+          obj = dict.get("XRefStm");
+
+          if (Number.isInteger(obj)) {
+            const pos = obj;
+
+            if (!(pos in this.xrefstms)) {
+              this.xrefstms[pos] = 1;
+              this.startXRefQueue.push(pos);
+            }
+          }
+        } else if (Number.isInteger(obj)) {
+          if (!Number.isInteger(parser.getObj()) || !(0, _primitives.isCmd)(parser.getObj(), "obj") || !((obj = parser.getObj()) instanceof _base_stream.BaseStream)) {
+            throw new _util.FormatError("Invalid XRef stream");
+          }
+
+          dict = this.processXRefStream(obj);
+
+          if (!this.topDict) {
+            this.topDict = dict;
+          }
+
+          if (!dict) {
+            throw new _util.FormatError("Failed to read XRef stream");
+          }
+        } else {
+          throw new _util.FormatError("Invalid XRef stream header");
+        }
+
+        obj = dict.get("Prev");
+
+        if (Number.isInteger(obj)) {
+          this.startXRefQueue.push(obj);
+        } else if (obj instanceof _primitives.Ref) {
+          this.startXRefQueue.push(obj.num);
+        }
+
+        this.startXRefQueue.shift();
+      }
+
+      return this.topDict;
+    } catch (e) {
+      if (e instanceof _core_utils.MissingDataException) {
+        throw e;
+      }
+
+      (0, _util.info)("(while reading XRef): " + e);
+      this.startXRefQueue.shift();
+    }
+
+    if (recoveryMode) {
+      return undefined;
+    }
+
+    throw new _core_utils.XRefParseException();
+  }
+
+  getEntry(i) {
+    const xrefEntry = this.entries[i];
+
+    if (xrefEntry && !xrefEntry.free && xrefEntry.offset) {
+      return xrefEntry;
+    }
+
+    return null;
+  }
+
+  fetchIfRef(obj, suppressEncryption = false) {
+    if (obj instanceof _primitives.Ref) {
+      return this.fetch(obj, suppressEncryption);
+    }
+
+    return obj;
+  }
+
+  fetch(ref, suppressEncryption = false) {
+    if (!(ref instanceof _primitives.Ref)) {
+      throw new Error("ref object is not a reference");
+    }
+
+    const num = ref.num;
+
+    const cacheEntry = this._cacheMap.get(num);
+
+    if (cacheEntry !== undefined) {
+      if (cacheEntry instanceof _primitives.Dict && !cacheEntry.objId) {
+        cacheEntry.objId = ref.toString();
+      }
+
+      return cacheEntry;
+    }
+
+    let xrefEntry = this.getEntry(num);
+
+    if (xrefEntry === null) {
+      this._cacheMap.set(num, xrefEntry);
+
+      return xrefEntry;
+    }
+
+    if (this._pendingRefs.has(ref)) {
+      this._pendingRefs.remove(ref);
+
+      (0, _util.warn)(`Ignoring circular reference: ${ref}.`);
+      return _primitives.CIRCULAR_REF;
+    }
+
+    this._pendingRefs.put(ref);
+
+    try {
+      if (xrefEntry.uncompressed) {
+        xrefEntry = this.fetchUncompressed(ref, xrefEntry, suppressEncryption);
+      } else {
+        xrefEntry = this.fetchCompressed(ref, xrefEntry, suppressEncryption);
+      }
+
+      this._pendingRefs.remove(ref);
+    } catch (ex) {
+      this._pendingRefs.remove(ref);
+
+      throw ex;
+    }
+
+    if (xrefEntry instanceof _primitives.Dict) {
+      xrefEntry.objId = ref.toString();
+    } else if (xrefEntry instanceof _base_stream.BaseStream) {
+      xrefEntry.dict.objId = ref.toString();
+    }
+
+    return xrefEntry;
+  }
+
+  fetchUncompressed(ref, xrefEntry, suppressEncryption = false) {
+    const gen = ref.gen;
+    let num = ref.num;
+
+    if (xrefEntry.gen !== gen) {
+      throw new _core_utils.XRefEntryException(`Inconsistent generation in XRef: ${ref}`);
+    }
+
+    const stream = this.stream.makeSubStream(xrefEntry.offset + this.stream.start);
+    const parser = new _parser.Parser({
+      lexer: new _parser.Lexer(stream),
+      xref: this,
+      allowStreams: true
+    });
+    const obj1 = parser.getObj();
+    const obj2 = parser.getObj();
+    const obj3 = parser.getObj();
+
+    if (obj1 !== num || obj2 !== gen || !(obj3 instanceof _primitives.Cmd)) {
+      throw new _core_utils.XRefEntryException(`Bad (uncompressed) XRef entry: ${ref}`);
+    }
+
+    if (obj3.cmd !== "obj") {
+      if (obj3.cmd.startsWith("obj")) {
+        num = parseInt(obj3.cmd.substring(3), 10);
+
+        if (!Number.isNaN(num)) {
+          return num;
+        }
+      }
+
+      throw new _core_utils.XRefEntryException(`Bad (uncompressed) XRef entry: ${ref}`);
+    }
+
+    if (this.encrypt && !suppressEncryption) {
+      xrefEntry = parser.getObj(this.encrypt.createCipherTransform(num, gen));
+    } else {
+      xrefEntry = parser.getObj();
+    }
+
+    if (!(xrefEntry instanceof _base_stream.BaseStream)) {
+      this._cacheMap.set(num, xrefEntry);
+    }
+
+    return xrefEntry;
+  }
+
+  fetchCompressed(ref, xrefEntry, suppressEncryption = false) {
+    const tableOffset = xrefEntry.offset;
+    const stream = this.fetch(_primitives.Ref.get(tableOffset, 0));
+
+    if (!(stream instanceof _base_stream.BaseStream)) {
+      throw new _util.FormatError("bad ObjStm stream");
+    }
+
+    const first = stream.dict.get("First");
+    const n = stream.dict.get("N");
+
+    if (!Number.isInteger(first) || !Number.isInteger(n)) {
+      throw new _util.FormatError("invalid first and n parameters for ObjStm stream");
+    }
+
+    let parser = new _parser.Parser({
+      lexer: new _parser.Lexer(stream),
+      xref: this,
+      allowStreams: true
+    });
+    const nums = new Array(n);
+    const offsets = new Array(n);
+
+    for (let i = 0; i < n; ++i) {
+      const num = parser.getObj();
+
+      if (!Number.isInteger(num)) {
+        throw new _util.FormatError(`invalid object number in the ObjStm stream: ${num}`);
+      }
+
+      const offset = parser.getObj();
+
+      if (!Number.isInteger(offset)) {
+        throw new _util.FormatError(`invalid object offset in the ObjStm stream: ${offset}`);
+      }
+
+      nums[i] = num;
+      offsets[i] = offset;
+    }
+
+    const start = (stream.start || 0) + first;
+    const entries = new Array(n);
+
+    for (let i = 0; i < n; ++i) {
+      const length = i < n - 1 ? offsets[i + 1] - offsets[i] : undefined;
+
+      if (length < 0) {
+        throw new _util.FormatError("Invalid offset in the ObjStm stream.");
+      }
+
+      parser = new _parser.Parser({
+        lexer: new _parser.Lexer(stream.makeSubStream(start + offsets[i], length, stream.dict)),
+        xref: this,
+        allowStreams: true
+      });
+      const obj = parser.getObj();
+      entries[i] = obj;
+
+      if (obj instanceof _base_stream.BaseStream) {
+        continue;
+      }
+
+      const num = nums[i],
+            entry = this.entries[num];
+
+      if (entry && entry.offset === tableOffset && entry.gen === i) {
+        this._cacheMap.set(num, obj);
+      }
+    }
+
+    xrefEntry = entries[xrefEntry.gen];
+
+    if (xrefEntry === undefined) {
+      throw new _core_utils.XRefEntryException(`Bad (compressed) XRef entry: ${ref}`);
+    }
+
+    return xrefEntry;
+  }
+
+  async fetchIfRefAsync(obj, suppressEncryption) {
+    if (obj instanceof _primitives.Ref) {
+      return this.fetchAsync(obj, suppressEncryption);
+    }
+
+    return obj;
+  }
+
+  async fetchAsync(ref, suppressEncryption) {
+    try {
+      return this.fetch(ref, suppressEncryption);
+    } catch (ex) {
+      if (!(ex instanceof _core_utils.MissingDataException)) {
+        throw ex;
+      }
+
+      await this.pdfManager.requestRange(ex.begin, ex.end);
+      return this.fetchAsync(ref, suppressEncryption);
+    }
+  }
+
+  getCatalogObj() {
+    return this.root;
+  }
+
+}
+
+exports.XRef = XRef;
+
+/***/ }),
+/* 102 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.MessageHandler = void 0;
 
 var _util = __w_pdfjs_require__(2);
@@ -47010,8 +74699,8 @@ const StreamKind = {
 };
 
 function wrapReason(reason) {
-  if (typeof reason !== "object" || reason === null) {
-    return reason;
+  if (!(reason instanceof Error || typeof reason === "object" && reason !== null)) {
+    (0, _util.unreachable)('wrapReason: Expected "reason" to be a (possibly cloned) Error.');
   }
 
   switch (reason.name) {
@@ -47021,6 +74710,9 @@ function wrapReason(reason) {
     case "MissingPDFException":
       return new _util.MissingPDFException(reason.message);
 
+    case "PasswordException":
+      return new _util.PasswordException(reason.message, reason.code);
+
     case "UnexpectedResponseException":
       return new _util.UnexpectedResponseException(reason.message, reason.status);
 
@@ -47039,7 +74731,6 @@ class MessageHandler {
     this.comObj = comObj;
     this.callbackId = 1;
     this.streamId = 1;
-    this.postMessageTransfers = true;
     this.streamSinks = Object.create(null);
     this.streamControllers = Object.create(null);
     this.callbackCapabilities = Object.create(null);
@@ -47133,7 +74824,7 @@ class MessageHandler {
   }
 
   send(actionName, data, transfers) {
-    this._postMessage({
+    this.comObj.postMessage({
       sourceName: this.sourceName,
       targetName: this.targetName,
       action: actionName,
@@ -47147,7 +74838,7 @@ class MessageHandler {
     this.callbackCapabilities[callbackId] = capability;
 
     try {
-      this._postMessage({
+      this.comObj.postMessage({
         sourceName: this.sourceName,
         targetName: this.targetName,
         action: actionName,
@@ -47162,10 +74853,10 @@ class MessageHandler {
   }
 
   sendWithStream(actionName, data, queueingStrategy, transfers) {
-    const streamId = this.streamId++;
-    const sourceName = this.sourceName;
-    const targetName = this.targetName;
-    const comObj = this.comObj;
+    const streamId = this.streamId++,
+          sourceName = this.sourceName,
+          targetName = this.targetName,
+          comObj = this.comObj;
     return new ReadableStream({
       start: controller => {
         const startCapability = (0, _util.createPromiseCapability)();
@@ -47176,8 +74867,7 @@ class MessageHandler {
           cancelCall: null,
           isClosed: false
         };
-
-        this._postMessage({
+        comObj.postMessage({
           sourceName,
           targetName,
           action: actionName,
@@ -47185,7 +74875,6 @@ class MessageHandler {
           data,
           desiredSize: controller.desiredSize
         }, transfers);
-
         return startCapability.promise;
       },
       pull: controller => {
@@ -47218,12 +74907,12 @@ class MessageHandler {
   }
 
   _createStreamSink(data) {
-    const self = this;
-    const action = this.actionHandler[data.action];
-    const streamId = data.streamId;
-    const sourceName = this.sourceName;
-    const targetName = data.sourceName;
-    const comObj = this.comObj;
+    const streamId = data.streamId,
+          sourceName = this.sourceName,
+          targetName = data.sourceName,
+          comObj = this.comObj;
+    const self = this,
+          action = this.actionHandler[data.action];
     const streamSink = {
       enqueue(chunk, size = 1, transfers) {
         if (this.isCancelled) {
@@ -47238,7 +74927,7 @@ class MessageHandler {
           this.ready = this.sinkCapability.promise;
         }
 
-        self._postMessage({
+        comObj.postMessage({
           sourceName,
           targetName,
           stream: StreamKind.ENQUEUE,
@@ -47311,32 +75000,34 @@ class MessageHandler {
   }
 
   _processStreamMessage(data) {
-    const streamId = data.streamId;
-    const sourceName = this.sourceName;
-    const targetName = data.sourceName;
-    const comObj = this.comObj;
+    const streamId = data.streamId,
+          sourceName = this.sourceName,
+          targetName = data.sourceName,
+          comObj = this.comObj;
+    const streamController = this.streamControllers[streamId],
+          streamSink = this.streamSinks[streamId];
 
     switch (data.stream) {
       case StreamKind.START_COMPLETE:
         if (data.success) {
-          this.streamControllers[streamId].startCall.resolve();
+          streamController.startCall.resolve();
         } else {
-          this.streamControllers[streamId].startCall.reject(wrapReason(data.reason));
+          streamController.startCall.reject(wrapReason(data.reason));
         }
 
         break;
 
       case StreamKind.PULL_COMPLETE:
         if (data.success) {
-          this.streamControllers[streamId].pullCall.resolve();
+          streamController.pullCall.resolve();
         } else {
-          this.streamControllers[streamId].pullCall.reject(wrapReason(data.reason));
+          streamController.pullCall.reject(wrapReason(data.reason));
         }
 
         break;
 
       case StreamKind.PULL:
-        if (!this.streamSinks[streamId]) {
+        if (!streamSink) {
           comObj.postMessage({
             sourceName,
             targetName,
@@ -47347,16 +75038,13 @@ class MessageHandler {
           break;
         }
 
-        if (this.streamSinks[streamId].desiredSize <= 0 && data.desiredSize > 0) {
-          this.streamSinks[streamId].sinkCapability.resolve();
+        if (streamSink.desiredSize <= 0 && data.desiredSize > 0) {
+          streamSink.sinkCapability.resolve();
         }
 
-        this.streamSinks[streamId].desiredSize = data.desiredSize;
-        const {
-          onPull
-        } = this.streamSinks[data.streamId];
+        streamSink.desiredSize = data.desiredSize;
         new Promise(function (resolve) {
-          resolve(onPull && onPull());
+          resolve(streamSink.onPull && streamSink.onPull());
         }).then(function () {
           comObj.postMessage({
             sourceName,
@@ -47377,58 +75065,55 @@ class MessageHandler {
         break;
 
       case StreamKind.ENQUEUE:
-        (0, _util.assert)(this.streamControllers[streamId], "enqueue should have stream controller");
+        (0, _util.assert)(streamController, "enqueue should have stream controller");
 
-        if (this.streamControllers[streamId].isClosed) {
+        if (streamController.isClosed) {
           break;
         }
 
-        this.streamControllers[streamId].controller.enqueue(data.chunk);
+        streamController.controller.enqueue(data.chunk);
         break;
 
       case StreamKind.CLOSE:
-        (0, _util.assert)(this.streamControllers[streamId], "close should have stream controller");
+        (0, _util.assert)(streamController, "close should have stream controller");
 
-        if (this.streamControllers[streamId].isClosed) {
+        if (streamController.isClosed) {
           break;
         }
 
-        this.streamControllers[streamId].isClosed = true;
-        this.streamControllers[streamId].controller.close();
+        streamController.isClosed = true;
+        streamController.controller.close();
 
-        this._deleteStreamController(streamId);
+        this._deleteStreamController(streamController, streamId);
 
         break;
 
       case StreamKind.ERROR:
-        (0, _util.assert)(this.streamControllers[streamId], "error should have stream controller");
-        this.streamControllers[streamId].controller.error(wrapReason(data.reason));
+        (0, _util.assert)(streamController, "error should have stream controller");
+        streamController.controller.error(wrapReason(data.reason));
 
-        this._deleteStreamController(streamId);
+        this._deleteStreamController(streamController, streamId);
 
         break;
 
       case StreamKind.CANCEL_COMPLETE:
         if (data.success) {
-          this.streamControllers[streamId].cancelCall.resolve();
+          streamController.cancelCall.resolve();
         } else {
-          this.streamControllers[streamId].cancelCall.reject(wrapReason(data.reason));
+          streamController.cancelCall.reject(wrapReason(data.reason));
         }
 
-        this._deleteStreamController(streamId);
+        this._deleteStreamController(streamController, streamId);
 
         break;
 
       case StreamKind.CANCEL:
-        if (!this.streamSinks[streamId]) {
+        if (!streamSink) {
           break;
         }
 
-        const {
-          onCancel
-        } = this.streamSinks[data.streamId];
         new Promise(function (resolve) {
-          resolve(onCancel && onCancel(wrapReason(data.reason)));
+          resolve(streamSink.onCancel && streamSink.onCancel(wrapReason(data.reason)));
         }).then(function () {
           comObj.postMessage({
             sourceName,
@@ -47446,8 +75131,8 @@ class MessageHandler {
             reason: wrapReason(reason)
           });
         });
-        this.streamSinks[streamId].sinkCapability.reject(wrapReason(data.reason));
-        this.streamSinks[streamId].isCancelled = true;
+        streamSink.sinkCapability.reject(wrapReason(data.reason));
+        streamSink.isCancelled = true;
         delete this.streamSinks[streamId];
         break;
 
@@ -47456,21 +75141,11 @@ class MessageHandler {
     }
   }
 
-  async _deleteStreamController(streamId) {
-    await Promise.allSettled([this.streamControllers[streamId].startCall, this.streamControllers[streamId].pullCall, this.streamControllers[streamId].cancelCall].map(function (capability) {
-      return capability && capability.promise;
-    }));
+  async _deleteStreamController(streamController, streamId) {
+    await Promise.allSettled([streamController.startCall && streamController.startCall.promise, streamController.pullCall && streamController.pullCall.promise, streamController.cancelCall && streamController.cancelCall.promise]);
     delete this.streamControllers[streamId];
   }
 
-  _postMessage(message, transfers) {
-    if (transfers && this.postMessageTransfers) {
-      this.comObj.postMessage(message, transfers);
-    } else {
-      this.comObj.postMessage(message);
-    }
-  }
-
   destroy() {
     this.comObj.removeEventListener("message", this._onComObjOnMessage);
   }
@@ -47480,15 +75155,14 @@ class MessageHandler {
 exports.MessageHandler = MessageHandler;
 
 /***/ }),
-/* 47 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+/* 103 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFWorkerStream = void 0;
 
 var _util = __w_pdfjs_require__(2);
@@ -47520,11 +75194,9 @@ class PDFWorkerStream {
       this._fullRequestReader.cancel(reason);
     }
 
-    const readers = this._rangeRequestReaders.slice(0);
-
-    readers.forEach(function (reader) {
+    for (const reader of this._rangeRequestReaders.slice(0)) {
       reader.cancel(reason);
-    });
+    }
   }
 
 }
@@ -47633,6 +75305,86 @@ class PDFWorkerStreamRangeReader {
 }
 
 /***/ })
-/******/ ]);
+/******/ 	]);
+/************************************************************************/
+/******/ 	// The module cache
+/******/ 	var __webpack_module_cache__ = {};
+/******/ 	
+/******/ 	// The require function
+/******/ 	function __w_pdfjs_require__(moduleId) {
+/******/ 		// Check if module is in cache
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = __webpack_module_cache__[moduleId] = {
+/******/ 			// no module.id needed
+/******/ 			// no module.loaded needed
+/******/ 			exports: {}
+/******/ 		};
+/******/ 	
+/******/ 		// Execute the module function
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __w_pdfjs_require__);
+/******/ 	
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/ 	
+/************************************************************************/
+/******/ 	/* webpack/runtime/define property getters */
+/******/ 	(() => {
+/******/ 		// define getter functions for harmony exports
+/******/ 		__w_pdfjs_require__.d = (exports, definition) => {
+/******/ 			for(var key in definition) {
+/******/ 				if(__w_pdfjs_require__.o(definition, key) && !__w_pdfjs_require__.o(exports, key)) {
+/******/ 					Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/ 				}
+/******/ 			}
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/hasOwnProperty shorthand */
+/******/ 	(() => {
+/******/ 		__w_pdfjs_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/make namespace object */
+/******/ 	(() => {
+/******/ 		// define __esModule on exports
+/******/ 		__w_pdfjs_require__.r = (exports) => {
+/******/ 			if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 				Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 			}
+/******/ 			Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/************************************************************************/
+var __webpack_exports__ = {};
+// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
+(() => {
+var exports = __webpack_exports__;
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+Object.defineProperty(exports, "WorkerMessageHandler", ({
+  enumerable: true,
+  get: function () {
+    return _worker.WorkerMessageHandler;
+  }
+}));
+
+var _worker = __w_pdfjs_require__(1);
+
+const pdfjsVersion = '2.16.105';
+const pdfjsBuild = '172ccdbe5';
+})();
+
+/******/ 	return __webpack_exports__;
+/******/ })()
+;
 });
 //# sourceMappingURL=pdf.worker.js.map
\ No newline at end of file
diff --git a/cps/static/js/libs/viewer.js b/cps/static/js/libs/viewer.js
index 26fd0f82e..bd33b5a04 100644
--- a/cps/static/js/libs/viewer.js
+++ b/cps/static/js/libs/viewer.js
@@ -1,8 +1,8 @@
 /**
  * @licstart The following is the entire license notice for the
- * Javascript code in this page
+ * JavaScript code in this page
  *
- * Copyright 2020 Mozilla Foundation
+ * Copyright 2022 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,3006 +17,49 @@
  * limitations under the License.
  *
  * @licend The above is the entire license notice for the
- * Javascript code in this page
+ * JavaScript code in this page
  */
 
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-;
-let pdfjsWebApp, pdfjsWebAppOptions;
-{
-  pdfjsWebApp = __webpack_require__(1);
-  pdfjsWebAppOptions = __webpack_require__(3);
-}
-;
-{
-  __webpack_require__(35);
-}
-;
-{
-  __webpack_require__(40);
-}
-
-function getViewerConfiguration() {
-  return {
-    appContainer: document.body,
-    mainContainer: document.getElementById("viewerContainer"),
-    viewerContainer: document.getElementById("viewer"),
-    eventBus: null,
-    toolbar: {
-      container: document.getElementById("toolbarViewer"),
-      numPages: document.getElementById("numPages"),
-      pageNumber: document.getElementById("pageNumber"),
-      scaleSelectContainer: document.getElementById("scaleSelectContainer"),
-      scaleSelect: document.getElementById("scaleSelect"),
-      customScaleOption: document.getElementById("customScaleOption"),
-      previous: document.getElementById("previous"),
-      next: document.getElementById("next"),
-      zoomIn: document.getElementById("zoomIn"),
-      zoomOut: document.getElementById("zoomOut"),
-      viewFind: document.getElementById("viewFind"),
-      openFile: document.getElementById("openFile"),
-      print: document.getElementById("print"),
-      presentationModeButton: document.getElementById("presentationMode"),
-      download: document.getElementById("download"),
-      viewBookmark: document.getElementById("viewBookmark")
-    },
-    secondaryToolbar: {
-      toolbar: document.getElementById("secondaryToolbar"),
-      toggleButton: document.getElementById("secondaryToolbarToggle"),
-      toolbarButtonContainer: document.getElementById("secondaryToolbarButtonContainer"),
-      presentationModeButton: document.getElementById("secondaryPresentationMode"),
-      openFileButton: document.getElementById("secondaryOpenFile"),
-      printButton: document.getElementById("secondaryPrint"),
-      downloadButton: document.getElementById("secondaryDownload"),
-      viewBookmarkButton: document.getElementById("secondaryViewBookmark"),
-      firstPageButton: document.getElementById("firstPage"),
-      lastPageButton: document.getElementById("lastPage"),
-      pageRotateCwButton: document.getElementById("pageRotateCw"),
-      pageRotateCcwButton: document.getElementById("pageRotateCcw"),
-      cursorSelectToolButton: document.getElementById("cursorSelectTool"),
-      cursorHandToolButton: document.getElementById("cursorHandTool"),
-      scrollVerticalButton: document.getElementById("scrollVertical"),
-      scrollHorizontalButton: document.getElementById("scrollHorizontal"),
-      scrollWrappedButton: document.getElementById("scrollWrapped"),
-      spreadNoneButton: document.getElementById("spreadNone"),
-      spreadOddButton: document.getElementById("spreadOdd"),
-      spreadEvenButton: document.getElementById("spreadEven"),
-      documentPropertiesButton: document.getElementById("documentProperties")
-    },
-    fullscreen: {
-      contextFirstPage: document.getElementById("contextFirstPage"),
-      contextLastPage: document.getElementById("contextLastPage"),
-      contextPageRotateCw: document.getElementById("contextPageRotateCw"),
-      contextPageRotateCcw: document.getElementById("contextPageRotateCcw")
-    },
-    sidebar: {
-      outerContainer: document.getElementById("outerContainer"),
-      viewerContainer: document.getElementById("viewerContainer"),
-      toggleButton: document.getElementById("sidebarToggle"),
-      thumbnailButton: document.getElementById("viewThumbnail"),
-      outlineButton: document.getElementById("viewOutline"),
-      attachmentsButton: document.getElementById("viewAttachments"),
-      layersButton: document.getElementById("viewLayers"),
-      thumbnailView: document.getElementById("thumbnailView"),
-      outlineView: document.getElementById("outlineView"),
-      attachmentsView: document.getElementById("attachmentsView"),
-      layersView: document.getElementById("layersView")
-    },
-    sidebarResizer: {
-      outerContainer: document.getElementById("outerContainer"),
-      resizer: document.getElementById("sidebarResizer")
-    },
-    findBar: {
-      bar: document.getElementById("findbar"),
-      toggleButton: document.getElementById("viewFind"),
-      findField: document.getElementById("findInput"),
-      highlightAllCheckbox: document.getElementById("findHighlightAll"),
-      caseSensitiveCheckbox: document.getElementById("findMatchCase"),
-      entireWordCheckbox: document.getElementById("findEntireWord"),
-      findMsg: document.getElementById("findMsg"),
-      findResultsCount: document.getElementById("findResultsCount"),
-      findPreviousButton: document.getElementById("findPrevious"),
-      findNextButton: document.getElementById("findNext")
-    },
-    passwordOverlay: {
-      overlayName: "passwordOverlay",
-      container: document.getElementById("passwordOverlay"),
-      label: document.getElementById("passwordText"),
-      input: document.getElementById("password"),
-      submitButton: document.getElementById("passwordSubmit"),
-      cancelButton: document.getElementById("passwordCancel")
-    },
-    documentProperties: {
-      overlayName: "documentPropertiesOverlay",
-      container: document.getElementById("documentPropertiesOverlay"),
-      closeButton: document.getElementById("documentPropertiesClose"),
-      fields: {
-        fileName: document.getElementById("fileNameField"),
-        fileSize: document.getElementById("fileSizeField"),
-        title: document.getElementById("titleField"),
-        author: document.getElementById("authorField"),
-        subject: document.getElementById("subjectField"),
-        keywords: document.getElementById("keywordsField"),
-        creationDate: document.getElementById("creationDateField"),
-        modificationDate: document.getElementById("modificationDateField"),
-        creator: document.getElementById("creatorField"),
-        producer: document.getElementById("producerField"),
-        version: document.getElementById("versionField"),
-        pageCount: document.getElementById("pageCountField"),
-        pageSize: document.getElementById("pageSizeField"),
-        linearized: document.getElementById("linearizedField")
-      }
-    },
-    errorWrapper: {
-      container: document.getElementById("errorWrapper"),
-      errorMessage: document.getElementById("errorMessage"),
-      closeButton: document.getElementById("errorClose"),
-      errorMoreInfo: document.getElementById("errorMoreInfo"),
-      moreInfoButton: document.getElementById("errorShowMore"),
-      lessInfoButton: document.getElementById("errorShowLess")
-    },
-    printContainer: document.getElementById("printContainer"),
-    openFileInputName: "fileInput",
-    debuggerScriptPath: "./debugger.js"
-  };
-}
-
-function webViewerLoad() {
-  const config = getViewerConfiguration();
-  window.PDFViewerApplication = pdfjsWebApp.PDFViewerApplication;
-  window.PDFViewerApplicationOptions = pdfjsWebAppOptions.AppOptions;
-  const event = document.createEvent("CustomEvent");
-  event.initCustomEvent("webviewerloaded", true, true, {
-    source: window
-  });
-
-  try {
-    parent.document.dispatchEvent(event);
-  } catch (ex) {
-    console.error(`webviewerloaded: ${ex}`);
-    document.dispatchEvent(event);
-  }
-
-  pdfjsWebApp.PDFViewerApplication.run(config);
-}
-
-if (document.readyState === "interactive" || document.readyState === "complete") {
-  webViewerLoad();
-} else {
-  document.addEventListener("DOMContentLoaded", webViewerLoad, true);
-}
-
-/***/ }),
+/******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	var __webpack_modules__ = ([
+/* 0 */,
 /* 1 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.PDFPrintServiceFactory = exports.DefaultExternalServices = exports.PDFViewerApplication = void 0;
-
-var _ui_utils = __webpack_require__(2);
-
-var _app_options = __webpack_require__(3);
-
-var _pdfjsLib = __webpack_require__(5);
-
-var _pdf_cursor_tools = __webpack_require__(6);
-
-var _pdf_rendering_queue = __webpack_require__(8);
-
-var _pdf_sidebar = __webpack_require__(9);
-
-var _overlay_manager = __webpack_require__(10);
-
-var _password_prompt = __webpack_require__(11);
-
-var _pdf_attachment_viewer = __webpack_require__(12);
-
-var _pdf_document_properties = __webpack_require__(14);
-
-var _pdf_find_bar = __webpack_require__(15);
-
-var _pdf_find_controller = __webpack_require__(16);
-
-var _pdf_history = __webpack_require__(18);
-
-var _pdf_layer_viewer = __webpack_require__(19);
-
-var _pdf_link_service = __webpack_require__(20);
-
-var _pdf_outline_viewer = __webpack_require__(21);
-
-var _pdf_presentation_mode = __webpack_require__(22);
-
-var _pdf_sidebar_resizer = __webpack_require__(23);
-
-var _pdf_thumbnail_viewer = __webpack_require__(24);
-
-var _pdf_viewer = __webpack_require__(26);
-
-var _secondary_toolbar = __webpack_require__(31);
-
-var _toolbar = __webpack_require__(33);
-
-var _viewer_compatibility = __webpack_require__(4);
-
-var _view_history = __webpack_require__(34);
-
-const DEFAULT_SCALE_DELTA = 1.1;
-const DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000;
-const FORCE_PAGES_LOADED_TIMEOUT = 10000;
-const WHEEL_ZOOM_DISABLED_TIMEOUT = 1000;
-const ENABLE_PERMISSIONS_CLASS = "enablePermissions";
-const ViewOnLoad = {
-  UNKNOWN: -1,
-  PREVIOUS: 0,
-  INITIAL: 1
-};
-const KNOWN_VERSIONS = ["1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "2.0", "2.1", "2.2", "2.3"];
-const KNOWN_GENERATORS = ["acrobat distiller", "acrobat pdfwriter", "adobe livecycle", "adobe pdf library", "adobe photoshop", "ghostscript", "tcpdf", "cairo", "dvipdfm", "dvips", "pdftex", "pdfkit", "itext", "prince", "quarkxpress", "mac os x", "microsoft", "openoffice", "oracle", "luradocument", "pdf-xchange", "antenna house", "aspose.cells", "fpdf"];
-
-class DefaultExternalServices {
-  constructor() {
-    throw new Error("Cannot initialize DefaultExternalServices.");
-  }
-
-  static updateFindControlState(data) {}
-
-  static updateFindMatchesCount(data) {}
-
-  static initPassiveLoading(callbacks) {}
-
-  static fallback(data, callback) {}
-
-  static reportTelemetry(data) {}
-
-  static createDownloadManager(options) {
-    throw new Error("Not implemented: createDownloadManager");
-  }
-
-  static createPreferences() {
-    throw new Error("Not implemented: createPreferences");
-  }
-
-  static createL10n(options) {
-    throw new Error("Not implemented: createL10n");
-  }
-
-  static get supportsIntegratedFind() {
-    return (0, _pdfjsLib.shadow)(this, "supportsIntegratedFind", false);
-  }
-
-  static get supportsDocumentFonts() {
-    return (0, _pdfjsLib.shadow)(this, "supportsDocumentFonts", true);
-  }
-
-  static get supportedMouseWheelZoomModifierKeys() {
-    return (0, _pdfjsLib.shadow)(this, "supportedMouseWheelZoomModifierKeys", {
-      ctrlKey: true,
-      metaKey: true
-    });
-  }
-
-  static get isInAutomation() {
-    return (0, _pdfjsLib.shadow)(this, "isInAutomation", false);
-  }
-
-}
-
-exports.DefaultExternalServices = DefaultExternalServices;
-const PDFViewerApplication = {
-  initialBookmark: document.location.hash.substring(1),
-  _initializedCapability: (0, _pdfjsLib.createPromiseCapability)(),
-  fellback: false,
-  appConfig: null,
-  pdfDocument: null,
-  pdfLoadingTask: null,
-  printService: null,
-  pdfViewer: null,
-  pdfThumbnailViewer: null,
-  pdfRenderingQueue: null,
-  pdfPresentationMode: null,
-  pdfDocumentProperties: null,
-  pdfLinkService: null,
-  pdfHistory: null,
-  pdfSidebar: null,
-  pdfSidebarResizer: null,
-  pdfOutlineViewer: null,
-  pdfAttachmentViewer: null,
-  pdfLayerViewer: null,
-  pdfCursorTools: null,
-  store: null,
-  downloadManager: null,
-  overlayManager: null,
-  preferences: null,
-  toolbar: null,
-  secondaryToolbar: null,
-  eventBus: null,
-  l10n: null,
-  isInitialViewSet: false,
-  downloadComplete: false,
-  isViewerEmbedded: window.parent !== window,
-  url: "",
-  baseUrl: "",
-  externalServices: DefaultExternalServices,
-  _boundEvents: {},
-  contentDispositionFilename: null,
-  triggerDelayedFallback: null,
-  _saveInProgress: false,
-  _wheelUnusedTicks: 0,
-
-  async initialize(appConfig) {
-    this.preferences = this.externalServices.createPreferences();
-    this.appConfig = appConfig;
-    await this._readPreferences();
-    await this._parseHashParameters();
-    await this._initializeL10n();
-
-    if (this.isViewerEmbedded && _app_options.AppOptions.get("externalLinkTarget") === _pdfjsLib.LinkTarget.NONE) {
-      _app_options.AppOptions.set("externalLinkTarget", _pdfjsLib.LinkTarget.TOP);
-    }
-
-    await this._initializeViewerComponents();
-    this.bindEvents();
-    this.bindWindowEvents();
-    const appContainer = appConfig.appContainer || document.documentElement;
-    this.l10n.translate(appContainer).then(() => {
-      this.eventBus.dispatch("localized", {
-        source: this
-      });
-    });
-
-    this._initializedCapability.resolve();
-  },
-
-  async _readPreferences() {
-    if (_app_options.AppOptions.get("disablePreferences")) {
-      return;
-    }
-
-    try {
-      const prefs = await this.preferences.getAll();
-
-      for (const name in prefs) {
-        _app_options.AppOptions.set(name, prefs[name]);
-      }
-    } catch (reason) {
-      console.error(`_readPreferences: "${reason.message}".`);
-    }
-  },
-
-  async _parseHashParameters() {
-    if (!_app_options.AppOptions.get("pdfBugEnabled")) {
-      return undefined;
-    }
-
-    const hash = document.location.hash.substring(1);
-
-    if (!hash) {
-      return undefined;
-    }
-
-    const hashParams = (0, _ui_utils.parseQueryString)(hash),
-          waitOn = [];
-
-    if ("disableworker" in hashParams && hashParams.disableworker === "true") {
-      waitOn.push(loadFakeWorker());
-    }
-
-    if ("disablerange" in hashParams) {
-      _app_options.AppOptions.set("disableRange", hashParams.disablerange === "true");
-    }
-
-    if ("disablestream" in hashParams) {
-      _app_options.AppOptions.set("disableStream", hashParams.disablestream === "true");
-    }
-
-    if ("disableautofetch" in hashParams) {
-      _app_options.AppOptions.set("disableAutoFetch", hashParams.disableautofetch === "true");
-    }
-
-    if ("disablefontface" in hashParams) {
-      _app_options.AppOptions.set("disableFontFace", hashParams.disablefontface === "true");
-    }
-
-    if ("disablehistory" in hashParams) {
-      _app_options.AppOptions.set("disableHistory", hashParams.disablehistory === "true");
-    }
-
-    if ("webgl" in hashParams) {
-      _app_options.AppOptions.set("enableWebGL", hashParams.webgl === "true");
-    }
-
-    if ("verbosity" in hashParams) {
-      _app_options.AppOptions.set("verbosity", hashParams.verbosity | 0);
-    }
-
-    if ("textlayer" in hashParams) {
-      switch (hashParams.textlayer) {
-        case "off":
-          _app_options.AppOptions.set("textLayerMode", _ui_utils.TextLayerMode.DISABLE);
-
-          break;
-
-        case "visible":
-        case "shadow":
-        case "hover":
-          const viewer = this.appConfig.viewerContainer;
-          viewer.classList.add("textLayer-" + hashParams.textlayer);
-          break;
-      }
-    }
-
-    if ("pdfbug" in hashParams) {
-      _app_options.AppOptions.set("pdfBug", true);
-
-      _app_options.AppOptions.set("fontExtraProperties", true);
-
-      const enabled = hashParams.pdfbug.split(",");
-      waitOn.push(loadAndEnablePDFBug(enabled));
-    }
-
-    if ("locale" in hashParams) {
-      _app_options.AppOptions.set("locale", hashParams.locale);
-    }
-
-    return Promise.all(waitOn).catch(reason => {
-      console.error(`_parseHashParameters: "${reason.message}".`);
-    });
-  },
-
-  async _initializeL10n() {
-    this.l10n = this.externalServices.createL10n({
-      locale: _app_options.AppOptions.get("locale")
-    });
-    const dir = await this.l10n.getDirection();
-    document.getElementsByTagName("html")[0].dir = dir;
-  },
-
-  async _initializeViewerComponents() {
-    const appConfig = this.appConfig;
-    const eventBus = appConfig.eventBus || new _ui_utils.EventBus({
-      isInAutomation: this.externalServices.isInAutomation
-    });
-    this.eventBus = eventBus;
-    this.overlayManager = new _overlay_manager.OverlayManager();
-    const pdfRenderingQueue = new _pdf_rendering_queue.PDFRenderingQueue();
-    pdfRenderingQueue.onIdle = this.cleanup.bind(this);
-    this.pdfRenderingQueue = pdfRenderingQueue;
-    const pdfLinkService = new _pdf_link_service.PDFLinkService({
-      eventBus,
-      externalLinkTarget: _app_options.AppOptions.get("externalLinkTarget"),
-      externalLinkRel: _app_options.AppOptions.get("externalLinkRel"),
-      ignoreDestinationZoom: _app_options.AppOptions.get("ignoreDestinationZoom")
-    });
-    this.pdfLinkService = pdfLinkService;
-    const downloadManager = this.externalServices.createDownloadManager();
-    this.downloadManager = downloadManager;
-    const findController = new _pdf_find_controller.PDFFindController({
-      linkService: pdfLinkService,
-      eventBus
-    });
-    this.findController = findController;
-    const container = appConfig.mainContainer;
-    const viewer = appConfig.viewerContainer;
-    this.pdfViewer = new _pdf_viewer.PDFViewer({
-      container,
-      viewer,
-      eventBus,
-      renderingQueue: pdfRenderingQueue,
-      linkService: pdfLinkService,
-      downloadManager,
-      findController,
-      renderer: _app_options.AppOptions.get("renderer"),
-      enableWebGL: _app_options.AppOptions.get("enableWebGL"),
-      l10n: this.l10n,
-      textLayerMode: _app_options.AppOptions.get("textLayerMode"),
-      imageResourcesPath: _app_options.AppOptions.get("imageResourcesPath"),
-      renderInteractiveForms: _app_options.AppOptions.get("renderInteractiveForms"),
-      enablePrintAutoRotate: _app_options.AppOptions.get("enablePrintAutoRotate"),
-      useOnlyCssZoom: _app_options.AppOptions.get("useOnlyCssZoom"),
-      maxCanvasPixels: _app_options.AppOptions.get("maxCanvasPixels")
-    });
-    pdfRenderingQueue.setViewer(this.pdfViewer);
-    pdfLinkService.setViewer(this.pdfViewer);
-    this.pdfThumbnailViewer = new _pdf_thumbnail_viewer.PDFThumbnailViewer({
-      container: appConfig.sidebar.thumbnailView,
-      eventBus,
-      renderingQueue: pdfRenderingQueue,
-      linkService: pdfLinkService,
-      l10n: this.l10n
-    });
-    pdfRenderingQueue.setThumbnailViewer(this.pdfThumbnailViewer);
-    this.pdfHistory = new _pdf_history.PDFHistory({
-      linkService: pdfLinkService,
-      eventBus
-    });
-    pdfLinkService.setHistory(this.pdfHistory);
-
-    if (!this.supportsIntegratedFind) {
-      this.findBar = new _pdf_find_bar.PDFFindBar(appConfig.findBar, eventBus, this.l10n);
-    }
-
-    this.pdfDocumentProperties = new _pdf_document_properties.PDFDocumentProperties(appConfig.documentProperties, this.overlayManager, eventBus, this.l10n);
-    this.pdfCursorTools = new _pdf_cursor_tools.PDFCursorTools({
-      container,
-      eventBus,
-      cursorToolOnLoad: _app_options.AppOptions.get("cursorToolOnLoad")
-    });
-    this.toolbar = new _toolbar.Toolbar(appConfig.toolbar, eventBus, this.l10n);
-    this.secondaryToolbar = new _secondary_toolbar.SecondaryToolbar(appConfig.secondaryToolbar, container, eventBus);
-
-    if (this.supportsFullscreen) {
-      this.pdfPresentationMode = new _pdf_presentation_mode.PDFPresentationMode({
-        container,
-        pdfViewer: this.pdfViewer,
-        eventBus,
-        contextMenuItems: appConfig.fullscreen
-      });
-    }
-
-    this.passwordPrompt = new _password_prompt.PasswordPrompt(appConfig.passwordOverlay, this.overlayManager, this.l10n);
-    this.pdfOutlineViewer = new _pdf_outline_viewer.PDFOutlineViewer({
-      container: appConfig.sidebar.outlineView,
-      eventBus,
-      linkService: pdfLinkService
-    });
-    this.pdfAttachmentViewer = new _pdf_attachment_viewer.PDFAttachmentViewer({
-      container: appConfig.sidebar.attachmentsView,
-      eventBus,
-      downloadManager
-    });
-    this.pdfLayerViewer = new _pdf_layer_viewer.PDFLayerViewer({
-      container: appConfig.sidebar.layersView,
-      eventBus,
-      l10n: this.l10n
-    });
-    this.pdfSidebar = new _pdf_sidebar.PDFSidebar({
-      elements: appConfig.sidebar,
-      pdfViewer: this.pdfViewer,
-      pdfThumbnailViewer: this.pdfThumbnailViewer,
-      eventBus,
-      l10n: this.l10n
-    });
-    this.pdfSidebar.onToggled = this.forceRendering.bind(this);
-    this.pdfSidebarResizer = new _pdf_sidebar_resizer.PDFSidebarResizer(appConfig.sidebarResizer, eventBus, this.l10n);
-  },
-
-  run(config) {
-    this.initialize(config).then(webViewerInitialized);
-  },
-
-  get initialized() {
-    return this._initializedCapability.settled;
-  },
-
-  get initializedPromise() {
-    return this._initializedCapability.promise;
-  },
-
-  zoomIn(ticks) {
-    if (this.pdfViewer.isInPresentationMode) {
-      return;
-    }
-
-    let newScale = this.pdfViewer.currentScale;
-
-    do {
-      newScale = (newScale * DEFAULT_SCALE_DELTA).toFixed(2);
-      newScale = Math.ceil(newScale * 10) / 10;
-      newScale = Math.min(_ui_utils.MAX_SCALE, newScale);
-    } while (--ticks > 0 && newScale < _ui_utils.MAX_SCALE);
-
-    this.pdfViewer.currentScaleValue = newScale;
-  },
-
-  zoomOut(ticks) {
-    if (this.pdfViewer.isInPresentationMode) {
-      return;
-    }
-
-    let newScale = this.pdfViewer.currentScale;
-
-    do {
-      newScale = (newScale / DEFAULT_SCALE_DELTA).toFixed(2);
-      newScale = Math.floor(newScale * 10) / 10;
-      newScale = Math.max(_ui_utils.MIN_SCALE, newScale);
-    } while (--ticks > 0 && newScale > _ui_utils.MIN_SCALE);
-
-    this.pdfViewer.currentScaleValue = newScale;
-  },
-
-  zoomReset() {
-    if (this.pdfViewer.isInPresentationMode) {
-      return;
-    }
-
-    this.pdfViewer.currentScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
-  },
-
-  get pagesCount() {
-    return this.pdfDocument ? this.pdfDocument.numPages : 0;
-  },
-
-  get page() {
-    return this.pdfViewer.currentPageNumber;
-  },
-
-  set page(val) {
-    this.pdfViewer.currentPageNumber = val;
-  },
-
-  get printing() {
-    return !!this.printService;
-  },
-
-  get supportsPrinting() {
-    return PDFPrintServiceFactory.instance.supportsPrinting;
-  },
-
-  get supportsFullscreen() {
-    let support;
-    const doc = document.documentElement;
-    support = !!(doc.requestFullscreen || doc.mozRequestFullScreen || doc.webkitRequestFullScreen || doc.msRequestFullscreen);
-
-    if (document.fullscreenEnabled === false || document.mozFullScreenEnabled === false || document.webkitFullscreenEnabled === false || document.msFullscreenEnabled === false) {
-      support = false;
-    }
-
-    return (0, _pdfjsLib.shadow)(this, "supportsFullscreen", support);
-  },
-
-  get supportsIntegratedFind() {
-    return this.externalServices.supportsIntegratedFind;
-  },
-
-  get supportsDocumentFonts() {
-    return this.externalServices.supportsDocumentFonts;
-  },
-
-  get loadingBar() {
-    const bar = new _ui_utils.ProgressBar("#loadingBar");
-    return (0, _pdfjsLib.shadow)(this, "loadingBar", bar);
-  },
-
-  get supportedMouseWheelZoomModifierKeys() {
-    return this.externalServices.supportedMouseWheelZoomModifierKeys;
-  },
-
-  initPassiveLoading() {
-    throw new Error("Not implemented: initPassiveLoading");
-  },
-
-  setTitleUsingUrl(url = "") {
-    this.url = url;
-    this.baseUrl = url.split("#")[0];
-    let title = (0, _ui_utils.getPDFFileNameFromURL)(url, "");
-
-    if (!title) {
-      try {
-        title = decodeURIComponent((0, _pdfjsLib.getFilenameFromUrl)(url)) || url;
-      } catch (ex) {
-        title = url;
-      }
-    }
-
-    this.setTitle(title);
-  },
-
-  setTitle(title) {
-    if (this.isViewerEmbedded) {
-      return;
-    }
-
-    document.title = title;
-  },
-
-  async close() {
-    const errorWrapper = this.appConfig.errorWrapper.container;
-    errorWrapper.setAttribute("hidden", "true");
-
-    if (!this.pdfLoadingTask) {
-      return undefined;
-    }
-
-    const promise = this.pdfLoadingTask.destroy();
-    this.pdfLoadingTask = null;
-
-    if (this.pdfDocument) {
-      this.pdfDocument = null;
-      this.pdfThumbnailViewer.setDocument(null);
-      this.pdfViewer.setDocument(null);
-      this.pdfLinkService.setDocument(null);
-      this.pdfDocumentProperties.setDocument(null);
-    }
-
-    webViewerResetPermissions();
-    this.store = null;
-    this.isInitialViewSet = false;
-    this.downloadComplete = false;
-    this.url = "";
-    this.baseUrl = "";
-    this.contentDispositionFilename = null;
-    this.triggerDelayedFallback = null;
-    this._saveInProgress = false;
-    this.pdfSidebar.reset();
-    this.pdfOutlineViewer.reset();
-    this.pdfAttachmentViewer.reset();
-    this.pdfLayerViewer.reset();
-
-    if (this.pdfHistory) {
-      this.pdfHistory.reset();
-    }
-
-    if (this.findBar) {
-      this.findBar.reset();
-    }
-
-    this.toolbar.reset();
-    this.secondaryToolbar.reset();
-
-    if (typeof PDFBug !== "undefined") {
-      PDFBug.cleanup();
-    }
-
-    return promise;
-  },
-
-  async open(file, args) {
-    if (this.pdfLoadingTask) {
-      await this.close();
-    }
-
-    const workerParameters = _app_options.AppOptions.getAll(_app_options.OptionKind.WORKER);
-
-    for (const key in workerParameters) {
-      _pdfjsLib.GlobalWorkerOptions[key] = workerParameters[key];
-    }
-
-    const parameters = Object.create(null);
-
-    if (typeof file === "string") {
-      this.setTitleUsingUrl(file);
-      parameters.url = file;
-    } else if (file && "byteLength" in file) {
-      parameters.data = file;
-    } else if (file.url && file.originalUrl) {
-      this.setTitleUsingUrl(file.originalUrl);
-      parameters.url = file.url;
-    }
-
-    const apiParameters = _app_options.AppOptions.getAll(_app_options.OptionKind.API);
-
-    for (const key in apiParameters) {
-      let value = apiParameters[key];
-
-      if (key === "docBaseUrl" && !value) {}
-
-      parameters[key] = value;
-    }
-
-    if (args) {
-      for (const key in args) {
-        const value = args[key];
-
-        if (key === "length") {
-          this.pdfDocumentProperties.setFileSize(value);
-        }
-
-        parameters[key] = value;
-      }
-    }
-
-    const loadingTask = (0, _pdfjsLib.getDocument)(parameters);
-    this.pdfLoadingTask = loadingTask;
-
-    loadingTask.onPassword = (updateCallback, reason) => {
-      this.pdfLinkService.externalLinkEnabled = false;
-      this.passwordPrompt.setUpdateCallback(updateCallback, reason);
-      this.passwordPrompt.open();
-    };
-
-    loadingTask.onProgress = ({
-      loaded,
-      total
-    }) => {
-      this.progress(loaded / total);
-    };
-
-    loadingTask.onUnsupportedFeature = this.fallback.bind(this);
-    return loadingTask.promise.then(pdfDocument => {
-      this.load(pdfDocument);
-    }, exception => {
-      if (loadingTask !== this.pdfLoadingTask) {
-        return undefined;
-      }
-
-      const message = exception && exception.message;
-      let loadingErrorMessage;
-
-      if (exception instanceof _pdfjsLib.InvalidPDFException) {
-        loadingErrorMessage = this.l10n.get("invalid_file_error", null, "Invalid or corrupted PDF file.");
-      } else if (exception instanceof _pdfjsLib.MissingPDFException) {
-        loadingErrorMessage = this.l10n.get("missing_file_error", null, "Missing PDF file.");
-      } else if (exception instanceof _pdfjsLib.UnexpectedResponseException) {
-        loadingErrorMessage = this.l10n.get("unexpected_response_error", null, "Unexpected server response.");
-      } else {
-        loadingErrorMessage = this.l10n.get("loading_error", null, "An error occurred while loading the PDF.");
-      }
-
-      return loadingErrorMessage.then(msg => {
-        this.error(msg, {
-          message
-        });
-        throw exception;
-      });
-    });
-  },
-
-  download({
-    sourceEventType = "download"
-  } = {}) {
-    function downloadByUrl() {
-      downloadManager.downloadUrl(url, filename);
-    }
-
-    const url = this.baseUrl;
-    const filename = this.contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url);
-    const downloadManager = this.downloadManager;
-
-    downloadManager.onerror = err => {
-      this.error(`PDF failed to download: ${err}`);
-    };
-
-    if (!this.pdfDocument || !this.downloadComplete) {
-      downloadByUrl();
-      return;
-    }
-
-    this.pdfDocument.getData().then(function (data) {
-      const blob = new Blob([data], {
-        type: "application/pdf"
-      });
-      downloadManager.download(blob, url, filename, sourceEventType);
-    }).catch(downloadByUrl);
-  },
-
-  save({
-    sourceEventType = "download"
-  } = {}) {
-    if (this._saveInProgress) {
-      return;
-    }
-
-    const url = this.baseUrl;
-    const filename = this.contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url);
-    const downloadManager = this.downloadManager;
-
-    downloadManager.onerror = err => {
-      this.error(`PDF failed to be saved: ${err}`);
-    };
-
-    if (!this.pdfDocument || !this.downloadComplete) {
-      this.download({
-        sourceEventType
-      });
-      return;
-    }
-
-    this._saveInProgress = true;
-    this.pdfDocument.saveDocument(this.pdfDocument.annotationStorage).then(data => {
-      const blob = new Blob([data], {
-        type: "application/pdf"
-      });
-      downloadManager.download(blob, url, filename, sourceEventType);
-    }).catch(() => {
-      this.download({
-        sourceEventType
-      });
-    }).finally(() => {
-      this._saveInProgress = false;
-    });
-  },
-
-  _delayedFallback(featureId) {
-    this.externalServices.reportTelemetry({
-      type: "unsupportedFeature",
-      featureId
-    });
-
-    if (!this.triggerDelayedFallback) {
-      this.triggerDelayedFallback = () => {
-        this.fallback(featureId);
-        this.triggerDelayedFallback = null;
-      };
-    }
-  },
-
-  fallback(featureId) {
-    this.externalServices.reportTelemetry({
-      type: "unsupportedFeature",
-      featureId
-    });
-
-    if (this.fellback) {
-      return;
-    }
-
-    this.fellback = true;
-    this.externalServices.fallback({
-      featureId,
-      url: this.baseUrl
-    }, function response(download) {
-      if (!download) {
-        return;
-      }
-
-      PDFViewerApplication.download({
-        sourceEventType: "download"
-      });
-    });
-  },
-
-  error(message, moreInfo) {
-    const moreInfoText = [this.l10n.get("error_version_info", {
-      version: _pdfjsLib.version || "?",
-      build: _pdfjsLib.build || "?"
-    }, "PDF.js v{{version}} (build: {{build}})")];
-
-    if (moreInfo) {
-      moreInfoText.push(this.l10n.get("error_message", {
-        message: moreInfo.message
-      }, "Message: {{message}}"));
-
-      if (moreInfo.stack) {
-        moreInfoText.push(this.l10n.get("error_stack", {
-          stack: moreInfo.stack
-        }, "Stack: {{stack}}"));
-      } else {
-        if (moreInfo.filename) {
-          moreInfoText.push(this.l10n.get("error_file", {
-            file: moreInfo.filename
-          }, "File: {{file}}"));
-        }
-
-        if (moreInfo.lineNumber) {
-          moreInfoText.push(this.l10n.get("error_line", {
-            line: moreInfo.lineNumber
-          }, "Line: {{line}}"));
-        }
-      }
-    }
-
-    const errorWrapperConfig = this.appConfig.errorWrapper;
-    const errorWrapper = errorWrapperConfig.container;
-    errorWrapper.removeAttribute("hidden");
-    const errorMessage = errorWrapperConfig.errorMessage;
-    errorMessage.textContent = message;
-    const closeButton = errorWrapperConfig.closeButton;
-
-    closeButton.onclick = function () {
-      errorWrapper.setAttribute("hidden", "true");
-    };
-
-    const errorMoreInfo = errorWrapperConfig.errorMoreInfo;
-    const moreInfoButton = errorWrapperConfig.moreInfoButton;
-    const lessInfoButton = errorWrapperConfig.lessInfoButton;
-
-    moreInfoButton.onclick = function () {
-      errorMoreInfo.removeAttribute("hidden");
-      moreInfoButton.setAttribute("hidden", "true");
-      lessInfoButton.removeAttribute("hidden");
-      errorMoreInfo.style.height = errorMoreInfo.scrollHeight + "px";
-    };
-
-    lessInfoButton.onclick = function () {
-      errorMoreInfo.setAttribute("hidden", "true");
-      moreInfoButton.removeAttribute("hidden");
-      lessInfoButton.setAttribute("hidden", "true");
-    };
-
-    moreInfoButton.oncontextmenu = _ui_utils.noContextMenuHandler;
-    lessInfoButton.oncontextmenu = _ui_utils.noContextMenuHandler;
-    closeButton.oncontextmenu = _ui_utils.noContextMenuHandler;
-    moreInfoButton.removeAttribute("hidden");
-    lessInfoButton.setAttribute("hidden", "true");
-    Promise.all(moreInfoText).then(parts => {
-      errorMoreInfo.value = parts.join("\n");
-    });
-  },
-
-  progress(level) {
-    if (this.downloadComplete) {
-      return;
-    }
-
-    const percent = Math.round(level * 100);
-
-    if (percent > this.loadingBar.percent || isNaN(percent)) {
-      this.loadingBar.percent = percent;
-      const disableAutoFetch = this.pdfDocument ? this.pdfDocument.loadingParams.disableAutoFetch : _app_options.AppOptions.get("disableAutoFetch");
-
-      if (disableAutoFetch && percent) {
-        if (this.disableAutoFetchLoadingBarTimeout) {
-          clearTimeout(this.disableAutoFetchLoadingBarTimeout);
-          this.disableAutoFetchLoadingBarTimeout = null;
-        }
-
-        this.loadingBar.show();
-        this.disableAutoFetchLoadingBarTimeout = setTimeout(() => {
-          this.loadingBar.hide();
-          this.disableAutoFetchLoadingBarTimeout = null;
-        }, DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT);
-      }
-    }
-  },
-
-  load(pdfDocument) {
-    this.pdfDocument = pdfDocument;
-    pdfDocument.getDownloadInfo().then(() => {
-      this.downloadComplete = true;
-      this.loadingBar.hide();
-      firstPagePromise.then(() => {
-        this.eventBus.dispatch("documentloaded", {
-          source: this
-        });
-      });
-    });
-    const pageLayoutPromise = pdfDocument.getPageLayout().catch(function () {});
-    const pageModePromise = pdfDocument.getPageMode().catch(function () {});
-    const openActionPromise = pdfDocument.getOpenAction().catch(function () {});
-    this.toolbar.setPagesCount(pdfDocument.numPages, false);
-    this.secondaryToolbar.setPagesCount(pdfDocument.numPages);
-    let baseDocumentUrl;
-    baseDocumentUrl = null;
-    this.pdfLinkService.setDocument(pdfDocument, baseDocumentUrl);
-    this.pdfDocumentProperties.setDocument(pdfDocument, this.url);
-    const annotationStorage = pdfDocument.annotationStorage;
-
-    annotationStorage.onSetModified = function () {
-      window.addEventListener("beforeunload", beforeUnload);
-    };
-
-    annotationStorage.onResetModified = function () {
-      window.removeEventListener("beforeunload", beforeUnload);
-    };
-
-    const pdfViewer = this.pdfViewer;
-    pdfViewer.setDocument(pdfDocument);
-    const {
-      firstPagePromise,
-      onePageRendered,
-      pagesPromise
-    } = pdfViewer;
-    const pdfThumbnailViewer = this.pdfThumbnailViewer;
-    pdfThumbnailViewer.setDocument(pdfDocument);
-    const storedPromise = (this.store = new _view_history.ViewHistory(pdfDocument.fingerprint)).getMultiple({
-      page: null,
-      zoom: _ui_utils.DEFAULT_SCALE_VALUE,
-      scrollLeft: "0",
-      scrollTop: "0",
-      rotation: null,
-      sidebarView: _pdf_sidebar.SidebarView.UNKNOWN,
-      scrollMode: _ui_utils.ScrollMode.UNKNOWN,
-      spreadMode: _ui_utils.SpreadMode.UNKNOWN
-    }).catch(() => {
-      return Object.create(null);
-    });
-    firstPagePromise.then(pdfPage => {
-      this.loadingBar.setWidth(this.appConfig.viewerContainer);
-      Promise.all([_ui_utils.animationStarted, storedPromise, pageLayoutPromise, pageModePromise, openActionPromise]).then(async ([timeStamp, stored, pageLayout, pageMode, openAction]) => {
-        const viewOnLoad = _app_options.AppOptions.get("viewOnLoad");
-
-        this._initializePdfHistory({
-          fingerprint: pdfDocument.fingerprint,
-          viewOnLoad,
-          initialDest: openAction && openAction.dest
-        });
-
-        const initialBookmark = this.initialBookmark;
-
-        const zoom = _app_options.AppOptions.get("defaultZoomValue");
-
-        let hash = zoom ? `zoom=${zoom}` : null;
-        let rotation = null;
-
-        let sidebarView = _app_options.AppOptions.get("sidebarViewOnLoad");
-
-        let scrollMode = _app_options.AppOptions.get("scrollModeOnLoad");
-
-        let spreadMode = _app_options.AppOptions.get("spreadModeOnLoad");
-
-        if (stored.page && viewOnLoad !== ViewOnLoad.INITIAL) {
-          hash = `page=${stored.page}&zoom=${zoom || stored.zoom},` + `${stored.scrollLeft},${stored.scrollTop}`;
-          rotation = parseInt(stored.rotation, 10);
-
-          if (sidebarView === _pdf_sidebar.SidebarView.UNKNOWN) {
-            sidebarView = stored.sidebarView | 0;
-          }
-
-          if (scrollMode === _ui_utils.ScrollMode.UNKNOWN) {
-            scrollMode = stored.scrollMode | 0;
-          }
-
-          if (spreadMode === _ui_utils.SpreadMode.UNKNOWN) {
-            spreadMode = stored.spreadMode | 0;
-          }
-        }
-
-        if (pageMode && sidebarView === _pdf_sidebar.SidebarView.UNKNOWN) {
-          sidebarView = apiPageModeToSidebarView(pageMode);
-        }
-
-        if (pageLayout && spreadMode === _ui_utils.SpreadMode.UNKNOWN) {
-          spreadMode = apiPageLayoutToSpreadMode(pageLayout);
-        }
-
-        this.setInitialView(hash, {
-          rotation,
-          sidebarView,
-          scrollMode,
-          spreadMode
-        });
-        this.eventBus.dispatch("documentinit", {
-          source: this
-        });
-
-        if (!this.isViewerEmbedded) {
-          pdfViewer.focus();
-        }
-
-        this._initializePermissions(pdfDocument);
-
-        await Promise.race([pagesPromise, new Promise(resolve => {
-          setTimeout(resolve, FORCE_PAGES_LOADED_TIMEOUT);
-        })]);
-
-        if (!initialBookmark && !hash) {
-          return;
-        }
-
-        if (pdfViewer.hasEqualPageSizes) {
-          return;
-        }
-
-        this.initialBookmark = initialBookmark;
-        pdfViewer.currentScaleValue = pdfViewer.currentScaleValue;
-        this.setInitialView(hash);
-      }).catch(() => {
-        this.setInitialView();
-      }).then(function () {
-        pdfViewer.update();
-      });
-    });
-    pagesPromise.then(() => {
-      this._initializeAutoPrint(pdfDocument, openActionPromise);
-    });
-    onePageRendered.then(() => {
-      pdfDocument.getOutline().then(outline => {
-        this.pdfOutlineViewer.render({
-          outline
-        });
-      });
-      pdfDocument.getAttachments().then(attachments => {
-        this.pdfAttachmentViewer.render({
-          attachments
-        });
-      });
-      pdfViewer.optionalContentConfigPromise.then(optionalContentConfig => {
-        this.pdfLayerViewer.render({
-          optionalContentConfig,
-          pdfDocument
-        });
-      });
-    });
-
-    this._initializePageLabels(pdfDocument);
-
-    this._initializeMetadata(pdfDocument);
-  },
-
-  async _initializeAutoPrint(pdfDocument, openActionPromise) {
-    const [openAction, javaScript] = await Promise.all([openActionPromise, pdfDocument.getJavaScript()]);
-
-    if (pdfDocument !== this.pdfDocument) {
-      return;
-    }
-
-    let triggerAutoPrint = false;
-
-    if (openAction && openAction.action === "Print") {
-      triggerAutoPrint = true;
-    }
-
-    if (javaScript) {
-      javaScript.some(js => {
-        if (!js) {
-          return false;
-        }
-
-        console.warn("Warning: JavaScript is not supported");
-
-        this._delayedFallback(_pdfjsLib.UNSUPPORTED_FEATURES.javaScript);
-
-        return true;
-      });
-
-      if (!triggerAutoPrint) {
-        for (const js of javaScript) {
-          if (js && _ui_utils.AutoPrintRegExp.test(js)) {
-            triggerAutoPrint = true;
-            break;
-          }
-        }
-      }
-    }
-
-    if (!this.supportsPrinting) {
-      return;
-    }
-
-    if (triggerAutoPrint) {
-      setTimeout(function () {
-        window.print();
-      });
-    }
-  },
-
-  async _initializeMetadata(pdfDocument) {
-    const {
-      info,
-      metadata,
-      contentDispositionFilename
-    } = await pdfDocument.getMetadata();
-
-    if (pdfDocument !== this.pdfDocument) {
-      return;
-    }
-
-    this.documentInfo = info;
-    this.metadata = metadata;
-    this.contentDispositionFilename = contentDispositionFilename;
-    console.log(`PDF ${pdfDocument.fingerprint} [${info.PDFFormatVersion} ` + `${(info.Producer || "-").trim()} / ${(info.Creator || "-").trim()}] ` + `(PDF.js: ${_pdfjsLib.version || "-"}` + `${this.pdfViewer.enableWebGL ? " [WebGL]" : ""})`);
-    let pdfTitle;
-    const infoTitle = info && info.Title;
-
-    if (infoTitle) {
-      pdfTitle = infoTitle;
-    }
-
-    const metadataTitle = metadata && metadata.get("dc:title");
-
-    if (metadataTitle) {
-      if (metadataTitle !== "Untitled" && !/[\uFFF0-\uFFFF]/g.test(metadataTitle)) {
-        pdfTitle = metadataTitle;
-      }
-    }
-
-    if (pdfTitle) {
-      this.setTitle(`${pdfTitle} - ${contentDispositionFilename || document.title}`);
-    } else if (contentDispositionFilename) {
-      this.setTitle(contentDispositionFilename);
-    }
-
-    if (info.IsXFAPresent && !info.IsAcroFormPresent) {
-      console.warn("Warning: XFA is not supported");
-
-      this._delayedFallback(_pdfjsLib.UNSUPPORTED_FEATURES.forms);
-    } else if ((info.IsAcroFormPresent || info.IsXFAPresent) && !this.pdfViewer.renderInteractiveForms) {
-      console.warn("Warning: Interactive form support is not enabled");
-
-      this._delayedFallback(_pdfjsLib.UNSUPPORTED_FEATURES.forms);
-    }
-
-    let versionId = "other";
-
-    if (KNOWN_VERSIONS.includes(info.PDFFormatVersion)) {
-      versionId = `v${info.PDFFormatVersion.replace(".", "_")}`;
-    }
-
-    let generatorId = "other";
-
-    if (info.Producer) {
-      const producer = info.Producer.toLowerCase();
-      KNOWN_GENERATORS.some(function (generator) {
-        if (!producer.includes(generator)) {
-          return false;
-        }
-
-        generatorId = generator.replace(/[ .\-]/g, "_");
-        return true;
-      });
-    }
-
-    let formType = null;
-
-    if (info.IsXFAPresent) {
-      formType = "xfa";
-    } else if (info.IsAcroFormPresent) {
-      formType = "acroform";
-    }
-
-    this.externalServices.reportTelemetry({
-      type: "documentInfo",
-      version: versionId,
-      generator: generatorId,
-      formType
-    });
-  },
-
-  async _initializePageLabels(pdfDocument) {
-    const labels = await pdfDocument.getPageLabels();
-
-    if (pdfDocument !== this.pdfDocument) {
-      return;
-    }
-
-    if (!labels || _app_options.AppOptions.get("disablePageLabels")) {
-      return;
-    }
-
-    const numLabels = labels.length;
-
-    if (numLabels !== this.pagesCount) {
-      console.error("The number of Page Labels does not match the number of pages in the document.");
-      return;
-    }
-
-    let i = 0;
-
-    while (i < numLabels && labels[i] === (i + 1).toString()) {
-      i++;
-    }
-
-    if (i === numLabels) {
-      return;
-    }
-
-    const {
-      pdfViewer,
-      pdfThumbnailViewer,
-      toolbar
-    } = this;
-    pdfViewer.setPageLabels(labels);
-    pdfThumbnailViewer.setPageLabels(labels);
-    toolbar.setPagesCount(numLabels, true);
-    toolbar.setPageNumber(pdfViewer.currentPageNumber, pdfViewer.currentPageLabel);
-  },
-
-  _initializePdfHistory({
-    fingerprint,
-    viewOnLoad,
-    initialDest = null
-  }) {
-    if (this.isViewerEmbedded || _app_options.AppOptions.get("disableHistory")) {
-      return;
-    }
-
-    this.pdfHistory.initialize({
-      fingerprint,
-      resetHistory: viewOnLoad === ViewOnLoad.INITIAL,
-      updateUrl: _app_options.AppOptions.get("historyUpdateUrl")
-    });
-
-    if (this.pdfHistory.initialBookmark) {
-      this.initialBookmark = this.pdfHistory.initialBookmark;
-      this.initialRotation = this.pdfHistory.initialRotation;
-    }
-
-    if (initialDest && !this.initialBookmark && viewOnLoad === ViewOnLoad.UNKNOWN) {
-      this.initialBookmark = JSON.stringify(initialDest);
-      this.pdfHistory.push({
-        explicitDest: initialDest,
-        pageNumber: null
-      });
-    }
-  },
-
-  async _initializePermissions(pdfDocument) {
-    const permissions = await pdfDocument.getPermissions();
-
-    if (pdfDocument !== this.pdfDocument) {
-      return;
-    }
-
-    if (!permissions || !_app_options.AppOptions.get("enablePermissions")) {
-      return;
-    }
-
-    if (!permissions.includes(_pdfjsLib.PermissionFlag.COPY)) {
-      this.appConfig.viewerContainer.classList.add(ENABLE_PERMISSIONS_CLASS);
-    }
-  },
-
-  setInitialView(storedHash, {
-    rotation,
-    sidebarView,
-    scrollMode,
-    spreadMode
-  } = {}) {
-    const setRotation = angle => {
-      if ((0, _ui_utils.isValidRotation)(angle)) {
-        this.pdfViewer.pagesRotation = angle;
-      }
-    };
-
-    const setViewerModes = (scroll, spread) => {
-      if ((0, _ui_utils.isValidScrollMode)(scroll)) {
-        this.pdfViewer.scrollMode = scroll;
-      }
-
-      if ((0, _ui_utils.isValidSpreadMode)(spread)) {
-        this.pdfViewer.spreadMode = spread;
-      }
-    };
-
-    this.isInitialViewSet = true;
-    this.pdfSidebar.setInitialView(sidebarView);
-    setViewerModes(scrollMode, spreadMode);
-
-    if (this.initialBookmark) {
-      setRotation(this.initialRotation);
-      delete this.initialRotation;
-      this.pdfLinkService.setHash(this.initialBookmark);
-      this.initialBookmark = null;
-    } else if (storedHash) {
-      setRotation(rotation);
-      this.pdfLinkService.setHash(storedHash);
-    }
-
-    this.toolbar.setPageNumber(this.pdfViewer.currentPageNumber, this.pdfViewer.currentPageLabel);
-    this.secondaryToolbar.setPageNumber(this.pdfViewer.currentPageNumber);
-
-    if (!this.pdfViewer.currentScaleValue) {
-      this.pdfViewer.currentScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
-    }
-  },
-
-  cleanup() {
-    if (!this.pdfDocument) {
-      return;
-    }
-
-    this.pdfViewer.cleanup();
-    this.pdfThumbnailViewer.cleanup();
-
-    if (this.pdfViewer.renderer !== _ui_utils.RendererType.SVG) {
-      this.pdfDocument.cleanup();
-    }
-  },
-
-  forceRendering() {
-    this.pdfRenderingQueue.printing = this.printing;
-    this.pdfRenderingQueue.isThumbnailViewEnabled = this.pdfSidebar.isThumbnailViewVisible;
-    this.pdfRenderingQueue.renderHighestPriority();
-  },
-
-  beforePrint() {
-    if (this.printService) {
-      return;
-    }
-
-    if (!this.supportsPrinting) {
-      this.l10n.get("printing_not_supported", null, "Warning: Printing is not fully supported by this browser.").then(printMessage => {
-        this.error(printMessage);
-      });
-      return;
-    }
-
-    if (!this.pdfViewer.pageViewsReady) {
-      this.l10n.get("printing_not_ready", null, "Warning: The PDF is not fully loaded for printing.").then(notReadyMessage => {
-        window.alert(notReadyMessage);
-      });
-      return;
-    }
-
-    const pagesOverview = this.pdfViewer.getPagesOverview();
-    const printContainer = this.appConfig.printContainer;
-
-    const printResolution = _app_options.AppOptions.get("printResolution");
-
-    const optionalContentConfigPromise = this.pdfViewer.optionalContentConfigPromise;
-    const printService = PDFPrintServiceFactory.instance.createPrintService(this.pdfDocument, pagesOverview, printContainer, printResolution, optionalContentConfigPromise, this.l10n);
-    this.printService = printService;
-    this.forceRendering();
-    printService.layout();
-    this.externalServices.reportTelemetry({
-      type: "print"
-    });
-  },
-
-  afterPrint() {
-    if (this.printService) {
-      this.printService.destroy();
-      this.printService = null;
-
-      if (this.pdfDocument) {
-        this.pdfDocument.annotationStorage.resetModified();
-      }
-    }
-
-    this.forceRendering();
-  },
-
-  rotatePages(delta) {
-    if (!this.pdfDocument) {
-      return;
-    }
-
-    const newRotation = (this.pdfViewer.pagesRotation + 360 + delta) % 360;
-    this.pdfViewer.pagesRotation = newRotation;
-  },
-
-  requestPresentationMode() {
-    if (!this.pdfPresentationMode) {
-      return;
-    }
-
-    this.pdfPresentationMode.request();
-  },
-
-  bindEvents() {
-    const {
-      eventBus,
-      _boundEvents
-    } = this;
-    _boundEvents.beforePrint = this.beforePrint.bind(this);
-    _boundEvents.afterPrint = this.afterPrint.bind(this);
-
-    eventBus._on("resize", webViewerResize);
-
-    eventBus._on("hashchange", webViewerHashchange);
-
-    eventBus._on("beforeprint", _boundEvents.beforePrint);
-
-    eventBus._on("afterprint", _boundEvents.afterPrint);
-
-    eventBus._on("pagerendered", webViewerPageRendered);
-
-    eventBus._on("updateviewarea", webViewerUpdateViewarea);
-
-    eventBus._on("pagechanging", webViewerPageChanging);
-
-    eventBus._on("scalechanging", webViewerScaleChanging);
-
-    eventBus._on("rotationchanging", webViewerRotationChanging);
-
-    eventBus._on("sidebarviewchanged", webViewerSidebarViewChanged);
-
-    eventBus._on("pagemode", webViewerPageMode);
-
-    eventBus._on("namedaction", webViewerNamedAction);
-
-    eventBus._on("presentationmodechanged", webViewerPresentationModeChanged);
-
-    eventBus._on("presentationmode", webViewerPresentationMode);
-
-    eventBus._on("print", webViewerPrint);
-
-    eventBus._on("download", webViewerDownload);
-
-    eventBus._on("save", webViewerSave);
-
-    eventBus._on("firstpage", webViewerFirstPage);
-
-    eventBus._on("lastpage", webViewerLastPage);
-
-    eventBus._on("nextpage", webViewerNextPage);
-
-    eventBus._on("previouspage", webViewerPreviousPage);
-
-    eventBus._on("zoomin", webViewerZoomIn);
-
-    eventBus._on("zoomout", webViewerZoomOut);
-
-    eventBus._on("zoomreset", webViewerZoomReset);
-
-    eventBus._on("pagenumberchanged", webViewerPageNumberChanged);
-
-    eventBus._on("scalechanged", webViewerScaleChanged);
-
-    eventBus._on("rotatecw", webViewerRotateCw);
-
-    eventBus._on("rotateccw", webViewerRotateCcw);
-
-    eventBus._on("optionalcontentconfig", webViewerOptionalContentConfig);
-
-    eventBus._on("switchscrollmode", webViewerSwitchScrollMode);
-
-    eventBus._on("scrollmodechanged", webViewerScrollModeChanged);
-
-    eventBus._on("switchspreadmode", webViewerSwitchSpreadMode);
-
-    eventBus._on("spreadmodechanged", webViewerSpreadModeChanged);
-
-    eventBus._on("documentproperties", webViewerDocumentProperties);
-
-    eventBus._on("find", webViewerFind);
-
-    eventBus._on("findfromurlhash", webViewerFindFromUrlHash);
-
-    eventBus._on("updatefindmatchescount", webViewerUpdateFindMatchesCount);
-
-    eventBus._on("updatefindcontrolstate", webViewerUpdateFindControlState);
-
-    eventBus._on("fileinputchange", webViewerFileInputChange);
-
-    eventBus._on("openfile", webViewerOpenFile);
-  },
-
-  bindWindowEvents() {
-    const {
-      eventBus,
-      _boundEvents
-    } = this;
-
-    _boundEvents.windowResize = () => {
-      eventBus.dispatch("resize", {
-        source: window
-      });
-    };
-
-    _boundEvents.windowHashChange = () => {
-      eventBus.dispatch("hashchange", {
-        source: window,
-        hash: document.location.hash.substring(1)
-      });
-    };
-
-    _boundEvents.windowBeforePrint = () => {
-      eventBus.dispatch("beforeprint", {
-        source: window
-      });
-    };
-
-    _boundEvents.windowAfterPrint = () => {
-      eventBus.dispatch("afterprint", {
-        source: window
-      });
-    };
-
-    window.addEventListener("visibilitychange", webViewerVisibilityChange);
-    window.addEventListener("wheel", webViewerWheel, {
-      passive: false
-    });
-    window.addEventListener("touchstart", webViewerTouchStart, {
-      passive: false
-    });
-    window.addEventListener("click", webViewerClick);
-    window.addEventListener("keydown", webViewerKeyDown);
-    window.addEventListener("keyup", webViewerKeyUp);
-    window.addEventListener("resize", _boundEvents.windowResize);
-    window.addEventListener("hashchange", _boundEvents.windowHashChange);
-    window.addEventListener("beforeprint", _boundEvents.windowBeforePrint);
-    window.addEventListener("afterprint", _boundEvents.windowAfterPrint);
-  },
-
-  unbindEvents() {
-    const {
-      eventBus,
-      _boundEvents
-    } = this;
-
-    eventBus._off("resize", webViewerResize);
-
-    eventBus._off("hashchange", webViewerHashchange);
-
-    eventBus._off("beforeprint", _boundEvents.beforePrint);
-
-    eventBus._off("afterprint", _boundEvents.afterPrint);
-
-    eventBus._off("pagerendered", webViewerPageRendered);
-
-    eventBus._off("updateviewarea", webViewerUpdateViewarea);
-
-    eventBus._off("pagechanging", webViewerPageChanging);
-
-    eventBus._off("scalechanging", webViewerScaleChanging);
-
-    eventBus._off("rotationchanging", webViewerRotationChanging);
-
-    eventBus._off("sidebarviewchanged", webViewerSidebarViewChanged);
-
-    eventBus._off("pagemode", webViewerPageMode);
-
-    eventBus._off("namedaction", webViewerNamedAction);
-
-    eventBus._off("presentationmodechanged", webViewerPresentationModeChanged);
-
-    eventBus._off("presentationmode", webViewerPresentationMode);
-
-    eventBus._off("print", webViewerPrint);
-
-    eventBus._off("download", webViewerDownload);
-
-    eventBus._off("save", webViewerSave);
-
-    eventBus._off("firstpage", webViewerFirstPage);
-
-    eventBus._off("lastpage", webViewerLastPage);
-
-    eventBus._off("nextpage", webViewerNextPage);
-
-    eventBus._off("previouspage", webViewerPreviousPage);
-
-    eventBus._off("zoomin", webViewerZoomIn);
-
-    eventBus._off("zoomout", webViewerZoomOut);
-
-    eventBus._off("zoomreset", webViewerZoomReset);
-
-    eventBus._off("pagenumberchanged", webViewerPageNumberChanged);
-
-    eventBus._off("scalechanged", webViewerScaleChanged);
-
-    eventBus._off("rotatecw", webViewerRotateCw);
-
-    eventBus._off("rotateccw", webViewerRotateCcw);
-
-    eventBus._off("optionalcontentconfig", webViewerOptionalContentConfig);
-
-    eventBus._off("switchscrollmode", webViewerSwitchScrollMode);
-
-    eventBus._off("scrollmodechanged", webViewerScrollModeChanged);
-
-    eventBus._off("switchspreadmode", webViewerSwitchSpreadMode);
-
-    eventBus._off("spreadmodechanged", webViewerSpreadModeChanged);
-
-    eventBus._off("documentproperties", webViewerDocumentProperties);
-
-    eventBus._off("find", webViewerFind);
-
-    eventBus._off("findfromurlhash", webViewerFindFromUrlHash);
-
-    eventBus._off("updatefindmatchescount", webViewerUpdateFindMatchesCount);
-
-    eventBus._off("updatefindcontrolstate", webViewerUpdateFindControlState);
-
-    eventBus._off("fileinputchange", webViewerFileInputChange);
-
-    eventBus._off("openfile", webViewerOpenFile);
-
-    _boundEvents.beforePrint = null;
-    _boundEvents.afterPrint = null;
-  },
-
-  unbindWindowEvents() {
-    const {
-      _boundEvents
-    } = this;
-    window.removeEventListener("visibilitychange", webViewerVisibilityChange);
-    window.removeEventListener("wheel", webViewerWheel, {
-      passive: false
-    });
-    window.removeEventListener("touchstart", webViewerTouchStart, {
-      passive: false
-    });
-    window.removeEventListener("click", webViewerClick);
-    window.removeEventListener("keydown", webViewerKeyDown);
-    window.removeEventListener("keyup", webViewerKeyUp);
-    window.removeEventListener("resize", _boundEvents.windowResize);
-    window.removeEventListener("hashchange", _boundEvents.windowHashChange);
-    window.removeEventListener("beforeprint", _boundEvents.windowBeforePrint);
-    window.removeEventListener("afterprint", _boundEvents.windowAfterPrint);
-    _boundEvents.windowResize = null;
-    _boundEvents.windowHashChange = null;
-    _boundEvents.windowBeforePrint = null;
-    _boundEvents.windowAfterPrint = null;
-  },
-
-  accumulateWheelTicks(ticks) {
-    if (this._wheelUnusedTicks > 0 && ticks < 0 || this._wheelUnusedTicks < 0 && ticks > 0) {
-      this._wheelUnusedTicks = 0;
-    }
-
-    this._wheelUnusedTicks += ticks;
-    const wholeTicks = Math.sign(this._wheelUnusedTicks) * Math.floor(Math.abs(this._wheelUnusedTicks));
-    this._wheelUnusedTicks -= wholeTicks;
-    return wholeTicks;
-  }
-
-};
-exports.PDFViewerApplication = PDFViewerApplication;
-let validateFileURL;
-{
-  const HOSTED_VIEWER_ORIGINS = ["null", "http://mozilla.github.io", "https://mozilla.github.io"];
-
-  validateFileURL = function (file) {
-    if (file === undefined) {
-      return;
-    }
-
-    try {
-      const viewerOrigin = new URL(window.location.href).origin || "null";
-
-      if (HOSTED_VIEWER_ORIGINS.includes(viewerOrigin)) {
-        return;
-      }
-
-      const {
-        origin,
-        protocol
-      } = new URL(file, window.location.href);
-
-      if (origin !== viewerOrigin && protocol !== "blob:") {
-        throw new Error("file origin does not match viewer's");
-      }
-    } catch (ex) {
-      const message = ex && ex.message;
-      PDFViewerApplication.l10n.get("loading_error", null, "An error occurred while loading the PDF.").then(loadingErrorMessage => {
-        PDFViewerApplication.error(loadingErrorMessage, {
-          message
-        });
-      });
-      throw ex;
-    }
-  };
-}
-
-async function loadFakeWorker() {
-  if (!_pdfjsLib.GlobalWorkerOptions.workerSrc) {
-    _pdfjsLib.GlobalWorkerOptions.workerSrc = _app_options.AppOptions.get("workerSrc");
-  }
-
-  return (0, _pdfjsLib.loadScript)(_pdfjsLib.PDFWorker.getWorkerSrc());
-}
-
-function loadAndEnablePDFBug(enabledTabs) {
-  const appConfig = PDFViewerApplication.appConfig;
-  return (0, _pdfjsLib.loadScript)(appConfig.debuggerScriptPath).then(function () {
-    PDFBug.enable(enabledTabs);
-    PDFBug.init({
-      OPS: _pdfjsLib.OPS
-    }, appConfig.mainContainer);
-  });
-}
-
-function webViewerInitialized() {
-  const appConfig = PDFViewerApplication.appConfig;
-  let file;
-  const queryString = document.location.search.substring(1);
-  const params = (0, _ui_utils.parseQueryString)(queryString);
-  file = "file" in params ? params.file : _app_options.AppOptions.get("defaultUrl");
-  validateFileURL(file);
-  const fileInput = document.createElement("input");
-  fileInput.id = appConfig.openFileInputName;
-  fileInput.className = "fileInput";
-  fileInput.setAttribute("type", "file");
-  fileInput.oncontextmenu = _ui_utils.noContextMenuHandler;
-  document.body.appendChild(fileInput);
-
-  if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
-    appConfig.toolbar.openFile.setAttribute("hidden", "true");
-    appConfig.secondaryToolbar.openFileButton.setAttribute("hidden", "true");
-  } else {
-    fileInput.value = null;
-  }
-
-  fileInput.addEventListener("change", function (evt) {
-    const files = evt.target.files;
-
-    if (!files || files.length === 0) {
-      return;
-    }
-
-    PDFViewerApplication.eventBus.dispatch("fileinputchange", {
-      source: this,
-      fileInput: evt.target
-    });
-  });
-  appConfig.mainContainer.addEventListener("dragover", function (evt) {
-    evt.preventDefault();
-    evt.dataTransfer.dropEffect = "move";
-  });
-  appConfig.mainContainer.addEventListener("drop", function (evt) {
-    evt.preventDefault();
-    const files = evt.dataTransfer.files;
-
-    if (!files || files.length === 0) {
-      return;
-    }
-
-    PDFViewerApplication.eventBus.dispatch("fileinputchange", {
-      source: this,
-      fileInput: evt.dataTransfer
-    });
-  });
-
-  if (!PDFViewerApplication.supportsDocumentFonts) {
-    _app_options.AppOptions.set("disableFontFace", true);
-
-    PDFViewerApplication.l10n.get("web_fonts_disabled", null, "Web fonts are disabled: unable to use embedded PDF fonts.").then(msg => {
-      console.warn(msg);
-    });
-  }
-
-  if (!PDFViewerApplication.supportsPrinting) {
-    appConfig.toolbar.print.classList.add("hidden");
-    appConfig.secondaryToolbar.printButton.classList.add("hidden");
-  }
-
-  if (!PDFViewerApplication.supportsFullscreen) {
-    appConfig.toolbar.presentationModeButton.classList.add("hidden");
-    appConfig.secondaryToolbar.presentationModeButton.classList.add("hidden");
-  }
-
-  if (PDFViewerApplication.supportsIntegratedFind) {
-    appConfig.toolbar.viewFind.classList.add("hidden");
-  }
-
-  appConfig.mainContainer.addEventListener("transitionend", function (evt) {
-    if (evt.target === this) {
-      PDFViewerApplication.eventBus.dispatch("resize", {
-        source: this
-      });
-    }
-  }, true);
-
-  try {
-    webViewerOpenFileViaURL(file);
-  } catch (reason) {
-    PDFViewerApplication.l10n.get("loading_error", null, "An error occurred while loading the PDF.").then(msg => {
-      PDFViewerApplication.error(msg, reason);
-    });
-  }
-}
-
-let webViewerOpenFileViaURL;
-{
-  webViewerOpenFileViaURL = function (file) {
-    if (file && file.lastIndexOf("file:", 0) === 0) {
-      PDFViewerApplication.setTitleUsingUrl(file);
-      const xhr = new XMLHttpRequest();
-
-      xhr.onload = function () {
-        PDFViewerApplication.open(new Uint8Array(xhr.response));
-      };
-
-      xhr.open("GET", file);
-      xhr.responseType = "arraybuffer";
-      xhr.send();
-      return;
-    }
-
-    if (file) {
-      PDFViewerApplication.open(file);
-    }
-  };
-}
-
-function webViewerResetPermissions() {
-  const {
-    appConfig
-  } = PDFViewerApplication;
-
-  if (!appConfig) {
-    return;
-  }
-
-  appConfig.viewerContainer.classList.remove(ENABLE_PERMISSIONS_CLASS);
-}
-
-function webViewerPageRendered(evt) {
-  const pageNumber = evt.pageNumber;
-  const pageIndex = pageNumber - 1;
-  const pageView = PDFViewerApplication.pdfViewer.getPageView(pageIndex);
-
-  if (pageNumber === PDFViewerApplication.page) {
-    PDFViewerApplication.toolbar.updateLoadingIndicatorState(false);
-  }
-
-  if (!pageView) {
-    return;
-  }
-
-  if (PDFViewerApplication.pdfSidebar.isThumbnailViewVisible) {
-    const thumbnailView = PDFViewerApplication.pdfThumbnailViewer.getThumbnail(pageIndex);
-    thumbnailView.setImage(pageView);
-  }
-
-  if (typeof Stats !== "undefined" && Stats.enabled && pageView.stats) {
-    Stats.add(pageNumber, pageView.stats);
-  }
-
-  if (pageView.error) {
-    PDFViewerApplication.l10n.get("rendering_error", null, "An error occurred while rendering the page.").then(msg => {
-      PDFViewerApplication.error(msg, pageView.error);
-    });
-  }
-
-  PDFViewerApplication.externalServices.reportTelemetry({
-    type: "pageInfo",
-    timestamp: evt.timestamp
-  });
-  PDFViewerApplication.pdfDocument.getStats().then(function (stats) {
-    PDFViewerApplication.externalServices.reportTelemetry({
-      type: "documentStats",
-      stats
-    });
-  });
-}
-
-function webViewerPageMode({
-  mode
-}) {
-  let view;
-
-  switch (mode) {
-    case "thumbs":
-      view = _pdf_sidebar.SidebarView.THUMBS;
-      break;
-
-    case "bookmarks":
-    case "outline":
-      view = _pdf_sidebar.SidebarView.OUTLINE;
-      break;
-
-    case "attachments":
-      view = _pdf_sidebar.SidebarView.ATTACHMENTS;
-      break;
-
-    case "layers":
-      view = _pdf_sidebar.SidebarView.LAYERS;
-      break;
-
-    case "none":
-      view = _pdf_sidebar.SidebarView.NONE;
-      break;
-
-    default:
-      console.error('Invalid "pagemode" hash parameter: ' + mode);
-      return;
-  }
-
-  PDFViewerApplication.pdfSidebar.switchView(view, true);
-}
-
-function webViewerNamedAction(evt) {
-  switch (evt.action) {
-    case "GoToPage":
-      PDFViewerApplication.appConfig.toolbar.pageNumber.select();
-      break;
-
-    case "Find":
-      if (!PDFViewerApplication.supportsIntegratedFind) {
-        PDFViewerApplication.findBar.toggle();
-      }
-
-      break;
-
-    case "Print":
-      if (PDFViewerApplication.supportsPrinting) {
-        webViewerPrint();
-      }
-
-      break;
-
-    case "SaveAs":
-      webViewerSave();
-      break;
-  }
-}
-
-function webViewerPresentationModeChanged({
-  active,
-  switchInProgress
-}) {
-  let state = _ui_utils.PresentationModeState.NORMAL;
-
-  if (switchInProgress) {
-    state = _ui_utils.PresentationModeState.CHANGING;
-  } else if (active) {
-    state = _ui_utils.PresentationModeState.FULLSCREEN;
-  }
-
-  PDFViewerApplication.pdfViewer.presentationModeState = state;
-}
-
-function webViewerSidebarViewChanged(evt) {
-  PDFViewerApplication.pdfRenderingQueue.isThumbnailViewEnabled = PDFViewerApplication.pdfSidebar.isThumbnailViewVisible;
-  const store = PDFViewerApplication.store;
-
-  if (store && PDFViewerApplication.isInitialViewSet) {
-    store.set("sidebarView", evt.view).catch(function () {});
-  }
-}
-
-function webViewerUpdateViewarea(evt) {
-  const location = evt.location,
-        store = PDFViewerApplication.store;
-
-  if (store && PDFViewerApplication.isInitialViewSet) {
-    store.setMultiple({
-      page: location.pageNumber,
-      zoom: location.scale,
-      scrollLeft: location.left,
-      scrollTop: location.top,
-      rotation: location.rotation
-    }).catch(function () {});
-  }
-
-  const href = PDFViewerApplication.pdfLinkService.getAnchorUrl(location.pdfOpenParams);
-  PDFViewerApplication.appConfig.toolbar.viewBookmark.href = href;
-  PDFViewerApplication.appConfig.secondaryToolbar.viewBookmarkButton.href = href;
-  const currentPage = PDFViewerApplication.pdfViewer.getPageView(PDFViewerApplication.page - 1);
-  const loading = currentPage.renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED;
-  PDFViewerApplication.toolbar.updateLoadingIndicatorState(loading);
-}
-
-function webViewerScrollModeChanged(evt) {
-  const store = PDFViewerApplication.store;
-
-  if (store && PDFViewerApplication.isInitialViewSet) {
-    store.set("scrollMode", evt.mode).catch(function () {});
-  }
-}
-
-function webViewerSpreadModeChanged(evt) {
-  const store = PDFViewerApplication.store;
-
-  if (store && PDFViewerApplication.isInitialViewSet) {
-    store.set("spreadMode", evt.mode).catch(function () {});
-  }
-}
-
-function webViewerResize() {
-  const {
-    pdfDocument,
-    pdfViewer
-  } = PDFViewerApplication;
-
-  if (!pdfDocument) {
-    return;
-  }
-
-  const currentScaleValue = pdfViewer.currentScaleValue;
-
-  if (currentScaleValue === "auto" || currentScaleValue === "page-fit" || currentScaleValue === "page-width") {
-    pdfViewer.currentScaleValue = currentScaleValue;
-  }
-
-  pdfViewer.update();
-}
-
-function webViewerHashchange(evt) {
-  const hash = evt.hash;
-
-  if (!hash) {
-    return;
-  }
-
-  if (!PDFViewerApplication.isInitialViewSet) {
-    PDFViewerApplication.initialBookmark = hash;
-  } else if (!PDFViewerApplication.pdfHistory.popStateInProgress) {
-    PDFViewerApplication.pdfLinkService.setHash(hash);
-  }
-}
-
-let webViewerFileInputChange, webViewerOpenFile;
-{
-  webViewerFileInputChange = function (evt) {
-    if (PDFViewerApplication.pdfViewer && PDFViewerApplication.pdfViewer.isInPresentationMode) {
-      return;
-    }
-
-    const file = evt.fileInput.files[0];
-
-    if (!_viewer_compatibility.viewerCompatibilityParams.disableCreateObjectURL) {
-      let url = URL.createObjectURL(file);
-
-      if (file.name) {
-        url = {
-          url,
-          originalUrl: file.name
-        };
-      }
-
-      PDFViewerApplication.open(url);
-    } else {
-      PDFViewerApplication.setTitleUsingUrl(file.name);
-      const fileReader = new FileReader();
-
-      fileReader.onload = function webViewerChangeFileReaderOnload(event) {
-        const buffer = event.target.result;
-        PDFViewerApplication.open(new Uint8Array(buffer));
-      };
-
-      fileReader.readAsArrayBuffer(file);
-    }
-
-    const appConfig = PDFViewerApplication.appConfig;
-    appConfig.toolbar.viewBookmark.setAttribute("hidden", "true");
-    appConfig.secondaryToolbar.viewBookmarkButton.setAttribute("hidden", "true");
-    appConfig.toolbar.download.setAttribute("hidden", "true");
-    appConfig.secondaryToolbar.downloadButton.setAttribute("hidden", "true");
-  };
-
-  webViewerOpenFile = function (evt) {
-    const openFileInputName = PDFViewerApplication.appConfig.openFileInputName;
-    document.getElementById(openFileInputName).click();
-  };
-}
-
-function webViewerPresentationMode() {
-  PDFViewerApplication.requestPresentationMode();
-}
-
-function webViewerPrint() {
-  window.print();
-}
-
-function webViewerDownloadOrSave(sourceEventType) {
-  if (PDFViewerApplication.pdfDocument && PDFViewerApplication.pdfDocument.annotationStorage.size > 0) {
-    PDFViewerApplication.save({
-      sourceEventType
-    });
-  } else {
-    PDFViewerApplication.download({
-      sourceEventType
-    });
-  }
-}
-
-function webViewerDownload() {
-  webViewerDownloadOrSave("download");
-}
-
-function webViewerSave() {
-  webViewerDownloadOrSave("save");
-}
-
-function webViewerFirstPage() {
-  if (PDFViewerApplication.pdfDocument) {
-    PDFViewerApplication.page = 1;
-  }
-}
-
-function webViewerLastPage() {
-  if (PDFViewerApplication.pdfDocument) {
-    PDFViewerApplication.page = PDFViewerApplication.pagesCount;
-  }
-}
-
-function webViewerNextPage() {
-  PDFViewerApplication.page++;
-}
-
-function webViewerPreviousPage() {
-  PDFViewerApplication.page--;
-}
-
-function webViewerZoomIn() {
-  PDFViewerApplication.zoomIn();
-}
-
-function webViewerZoomOut() {
-  PDFViewerApplication.zoomOut();
-}
-
-function webViewerZoomReset() {
-  PDFViewerApplication.zoomReset();
-}
-
-function webViewerPageNumberChanged(evt) {
-  const pdfViewer = PDFViewerApplication.pdfViewer;
-
-  if (evt.value !== "") {
-    pdfViewer.currentPageLabel = evt.value;
-  }
-
-  if (evt.value !== pdfViewer.currentPageNumber.toString() && evt.value !== pdfViewer.currentPageLabel) {
-    PDFViewerApplication.toolbar.setPageNumber(pdfViewer.currentPageNumber, pdfViewer.currentPageLabel);
-  }
-}
-
-function webViewerScaleChanged(evt) {
-  PDFViewerApplication.pdfViewer.currentScaleValue = evt.value;
-}
-
-function webViewerRotateCw() {
-  PDFViewerApplication.rotatePages(90);
-}
-
-function webViewerRotateCcw() {
-  PDFViewerApplication.rotatePages(-90);
-}
-
-function webViewerOptionalContentConfig(evt) {
-  PDFViewerApplication.pdfViewer.optionalContentConfigPromise = evt.promise;
-}
-
-function webViewerSwitchScrollMode(evt) {
-  PDFViewerApplication.pdfViewer.scrollMode = evt.mode;
-}
-
-function webViewerSwitchSpreadMode(evt) {
-  PDFViewerApplication.pdfViewer.spreadMode = evt.mode;
-}
-
-function webViewerDocumentProperties() {
-  PDFViewerApplication.pdfDocumentProperties.open();
-}
-
-function webViewerFind(evt) {
-  PDFViewerApplication.findController.executeCommand("find" + evt.type, {
-    query: evt.query,
-    phraseSearch: evt.phraseSearch,
-    caseSensitive: evt.caseSensitive,
-    entireWord: evt.entireWord,
-    highlightAll: evt.highlightAll,
-    findPrevious: evt.findPrevious
-  });
-}
-
-function webViewerFindFromUrlHash(evt) {
-  PDFViewerApplication.findController.executeCommand("find", {
-    query: evt.query,
-    phraseSearch: evt.phraseSearch,
-    caseSensitive: false,
-    entireWord: false,
-    highlightAll: true,
-    findPrevious: false
-  });
-}
-
-function webViewerUpdateFindMatchesCount({
-  matchesCount
-}) {
-  if (PDFViewerApplication.supportsIntegratedFind) {
-    PDFViewerApplication.externalServices.updateFindMatchesCount(matchesCount);
-  } else {
-    PDFViewerApplication.findBar.updateResultsCount(matchesCount);
-  }
-}
-
-function webViewerUpdateFindControlState({
-  state,
-  previous,
-  matchesCount,
-  rawQuery
-}) {
-  if (PDFViewerApplication.supportsIntegratedFind) {
-    PDFViewerApplication.externalServices.updateFindControlState({
-      result: state,
-      findPrevious: previous,
-      matchesCount,
-      rawQuery
-    });
-  } else {
-    PDFViewerApplication.findBar.updateUIState(state, previous, matchesCount);
-  }
-}
-
-function webViewerScaleChanging(evt) {
-  PDFViewerApplication.toolbar.setPageScale(evt.presetValue, evt.scale);
-  PDFViewerApplication.pdfViewer.update();
-}
-
-function webViewerRotationChanging(evt) {
-  PDFViewerApplication.pdfThumbnailViewer.pagesRotation = evt.pagesRotation;
-  PDFViewerApplication.forceRendering();
-  PDFViewerApplication.pdfViewer.currentPageNumber = evt.pageNumber;
-}
-
-function webViewerPageChanging(evt) {
-  const page = evt.pageNumber;
-  PDFViewerApplication.toolbar.setPageNumber(page, evt.pageLabel || null);
-  PDFViewerApplication.secondaryToolbar.setPageNumber(page);
-
-  if (PDFViewerApplication.pdfSidebar.isThumbnailViewVisible) {
-    PDFViewerApplication.pdfThumbnailViewer.scrollThumbnailIntoView(page);
-  }
-
-  if (typeof Stats !== "undefined" && Stats.enabled) {
-    const pageView = PDFViewerApplication.pdfViewer.getPageView(page - 1);
-
-    if (pageView && pageView.stats) {
-      Stats.add(page, pageView.stats);
-    }
-  }
-}
-
-function webViewerVisibilityChange(evt) {
-  if (document.visibilityState === "visible") {
-    setZoomDisabledTimeout();
-  }
-}
-
-let zoomDisabledTimeout = null;
-
-function setZoomDisabledTimeout() {
-  if (zoomDisabledTimeout) {
-    clearTimeout(zoomDisabledTimeout);
-  }
-
-  zoomDisabledTimeout = setTimeout(function () {
-    zoomDisabledTimeout = null;
-  }, WHEEL_ZOOM_DISABLED_TIMEOUT);
-}
-
-function webViewerWheel(evt) {
-  const {
-    pdfViewer,
-    supportedMouseWheelZoomModifierKeys
-  } = PDFViewerApplication;
-
-  if (pdfViewer.isInPresentationMode) {
-    return;
-  }
-
-  if (evt.ctrlKey && supportedMouseWheelZoomModifierKeys.ctrlKey || evt.metaKey && supportedMouseWheelZoomModifierKeys.metaKey) {
-    evt.preventDefault();
-
-    if (zoomDisabledTimeout || document.visibilityState === "hidden") {
-      return;
-    }
-
-    const previousScale = pdfViewer.currentScale;
-    const delta = (0, _ui_utils.normalizeWheelEventDirection)(evt);
-    let ticks = 0;
-
-    if (evt.deltaMode === WheelEvent.DOM_DELTA_LINE || evt.deltaMode === WheelEvent.DOM_DELTA_PAGE) {
-      if (Math.abs(delta) >= 1) {
-        ticks = Math.sign(delta);
-      } else {
-        ticks = PDFViewerApplication.accumulateWheelTicks(delta);
-      }
-    } else {
-      const PIXELS_PER_LINE_SCALE = 30;
-      ticks = PDFViewerApplication.accumulateWheelTicks(delta / PIXELS_PER_LINE_SCALE);
-    }
-
-    if (ticks < 0) {
-      PDFViewerApplication.zoomOut(-ticks);
-    } else if (ticks > 0) {
-      PDFViewerApplication.zoomIn(ticks);
-    }
-
-    const currentScale = pdfViewer.currentScale;
-
-    if (previousScale !== currentScale) {
-      const scaleCorrectionFactor = currentScale / previousScale - 1;
-      const rect = pdfViewer.container.getBoundingClientRect();
-      const dx = evt.clientX - rect.left;
-      const dy = evt.clientY - rect.top;
-      pdfViewer.container.scrollLeft += dx * scaleCorrectionFactor;
-      pdfViewer.container.scrollTop += dy * scaleCorrectionFactor;
-    }
-  } else {
-    setZoomDisabledTimeout();
-  }
-}
-
-function webViewerTouchStart(evt) {
-  if (evt.touches.length > 1) {
-    evt.preventDefault();
-  }
-}
-
-function webViewerClick(evt) {
-  if (PDFViewerApplication.triggerDelayedFallback && PDFViewerApplication.pdfViewer.containsElement(evt.target)) {
-    PDFViewerApplication.triggerDelayedFallback();
-  }
-
-  if (!PDFViewerApplication.secondaryToolbar.isOpen) {
-    return;
-  }
-
-  const appConfig = PDFViewerApplication.appConfig;
-
-  if (PDFViewerApplication.pdfViewer.containsElement(evt.target) || appConfig.toolbar.container.contains(evt.target) && evt.target !== appConfig.secondaryToolbar.toggleButton) {
-    PDFViewerApplication.secondaryToolbar.close();
-  }
-}
-
-function webViewerKeyUp(evt) {
-  if (evt.keyCode === 9) {
-    if (PDFViewerApplication.triggerDelayedFallback) {
-      PDFViewerApplication.triggerDelayedFallback();
-    }
-  }
-}
-
-function webViewerKeyDown(evt) {
-  if (PDFViewerApplication.overlayManager.active) {
-    return;
-  }
-
-  let handled = false,
-      ensureViewerFocused = false;
-  const cmd = (evt.ctrlKey ? 1 : 0) | (evt.altKey ? 2 : 0) | (evt.shiftKey ? 4 : 0) | (evt.metaKey ? 8 : 0);
-  const pdfViewer = PDFViewerApplication.pdfViewer;
-  const isViewerInPresentationMode = pdfViewer && pdfViewer.isInPresentationMode;
-
-  if (cmd === 1 || cmd === 8 || cmd === 5 || cmd === 12) {
-    switch (evt.keyCode) {
-      case 70:
-        if (!PDFViewerApplication.supportsIntegratedFind) {
-          PDFViewerApplication.findBar.open();
-          handled = true;
-        }
-
-        break;
-
-      case 71:
-        if (!PDFViewerApplication.supportsIntegratedFind) {
-          const findState = PDFViewerApplication.findController.state;
-
-          if (findState) {
-            PDFViewerApplication.findController.executeCommand("findagain", {
-              query: findState.query,
-              phraseSearch: findState.phraseSearch,
-              caseSensitive: findState.caseSensitive,
-              entireWord: findState.entireWord,
-              highlightAll: findState.highlightAll,
-              findPrevious: cmd === 5 || cmd === 12
-            });
-          }
-
-          handled = true;
-        }
-
-        break;
-
-      case 61:
-      case 107:
-      case 187:
-      case 171:
-        if (!isViewerInPresentationMode) {
-          PDFViewerApplication.zoomIn();
-        }
-
-        handled = true;
-        break;
-
-      case 173:
-      case 109:
-      case 189:
-        if (!isViewerInPresentationMode) {
-          PDFViewerApplication.zoomOut();
-        }
-
-        handled = true;
-        break;
-
-      case 48:
-      case 96:
-        if (!isViewerInPresentationMode) {
-          setTimeout(function () {
-            PDFViewerApplication.zoomReset();
-          });
-          handled = false;
-        }
-
-        break;
-
-      case 38:
-        if (isViewerInPresentationMode || PDFViewerApplication.page > 1) {
-          PDFViewerApplication.page = 1;
-          handled = true;
-          ensureViewerFocused = true;
-        }
-
-        break;
-
-      case 40:
-        if (isViewerInPresentationMode || PDFViewerApplication.page < PDFViewerApplication.pagesCount) {
-          PDFViewerApplication.page = PDFViewerApplication.pagesCount;
-          handled = true;
-          ensureViewerFocused = true;
-        }
-
-        break;
-    }
-  }
-
-  const {
-    eventBus
-  } = PDFViewerApplication;
-
-  if (cmd === 1 || cmd === 8) {
-    switch (evt.keyCode) {
-      case 83:
-        eventBus.dispatch("download", {
-          source: window
-        });
-        handled = true;
-        break;
-
-      case 79:
-        {
-          eventBus.dispatch("openfile", {
-            source: window
-          });
-          handled = true;
-        }
-        break;
-    }
-  }
-
-  if (cmd === 3 || cmd === 10) {
-    switch (evt.keyCode) {
-      case 80:
-        PDFViewerApplication.requestPresentationMode();
-        handled = true;
-        break;
-
-      case 71:
-        PDFViewerApplication.appConfig.toolbar.pageNumber.select();
-        handled = true;
-        break;
-    }
-  }
-
-  if (handled) {
-    if (ensureViewerFocused && !isViewerInPresentationMode) {
-      pdfViewer.focus();
-    }
-
-    evt.preventDefault();
-    return;
-  }
-
-  const curElement = document.activeElement || document.querySelector(":focus");
-  const curElementTagName = curElement && curElement.tagName.toUpperCase();
-
-  if (curElementTagName === "INPUT" || curElementTagName === "TEXTAREA" || curElementTagName === "SELECT" || curElement && curElement.isContentEditable) {
-    if (evt.keyCode !== 27) {
-      return;
-    }
-  }
-
-  if (cmd === 0) {
-    let turnPage = 0,
-        turnOnlyIfPageFit = false;
-
-    switch (evt.keyCode) {
-      case 38:
-      case 33:
-        if (pdfViewer.isVerticalScrollbarEnabled) {
-          turnOnlyIfPageFit = true;
-        }
-
-        turnPage = -1;
-        break;
-
-      case 8:
-        if (!isViewerInPresentationMode) {
-          turnOnlyIfPageFit = true;
-        }
-
-        turnPage = -1;
-        break;
-
-      case 37:
-        if (pdfViewer.isHorizontalScrollbarEnabled) {
-          turnOnlyIfPageFit = true;
-        }
-
-      case 75:
-      case 80:
-        turnPage = -1;
-        break;
-
-      case 27:
-        if (PDFViewerApplication.secondaryToolbar.isOpen) {
-          PDFViewerApplication.secondaryToolbar.close();
-          handled = true;
-        }
-
-        if (!PDFViewerApplication.supportsIntegratedFind && PDFViewerApplication.findBar.opened) {
-          PDFViewerApplication.findBar.close();
-          handled = true;
-        }
-
-        break;
-
-      case 40:
-      case 34:
-        if (pdfViewer.isVerticalScrollbarEnabled) {
-          turnOnlyIfPageFit = true;
-        }
-
-        turnPage = 1;
-        break;
-
-      case 13:
-      case 32:
-        if (!isViewerInPresentationMode) {
-          turnOnlyIfPageFit = true;
-        }
-
-        turnPage = 1;
-        break;
-
-      case 39:
-        if (pdfViewer.isHorizontalScrollbarEnabled) {
-          turnOnlyIfPageFit = true;
-        }
-
-      case 74:
-      case 78:
-        turnPage = 1;
-        break;
-
-      case 36:
-        if (isViewerInPresentationMode || PDFViewerApplication.page > 1) {
-          PDFViewerApplication.page = 1;
-          handled = true;
-          ensureViewerFocused = true;
-        }
-
-        break;
-
-      case 35:
-        if (isViewerInPresentationMode || PDFViewerApplication.page < PDFViewerApplication.pagesCount) {
-          PDFViewerApplication.page = PDFViewerApplication.pagesCount;
-          handled = true;
-          ensureViewerFocused = true;
-        }
-
-        break;
-
-      case 83:
-        PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool.SELECT);
-        break;
-
-      case 72:
-        PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool.HAND);
-        break;
-
-      case 82:
-        PDFViewerApplication.rotatePages(90);
-        break;
-
-      case 115:
-        PDFViewerApplication.pdfSidebar.toggle();
-        break;
-    }
-
-    if (turnPage !== 0 && (!turnOnlyIfPageFit || pdfViewer.currentScaleValue === "page-fit")) {
-      if (turnPage > 0) {
-        if (PDFViewerApplication.page < PDFViewerApplication.pagesCount) {
-          PDFViewerApplication.page++;
-        }
-      } else {
-        if (PDFViewerApplication.page > 1) {
-          PDFViewerApplication.page--;
-        }
-      }
-
-      handled = true;
-    }
-  }
-
-  if (cmd === 4) {
-    switch (evt.keyCode) {
-      case 13:
-      case 32:
-        if (!isViewerInPresentationMode && pdfViewer.currentScaleValue !== "page-fit") {
-          break;
-        }
-
-        if (PDFViewerApplication.page > 1) {
-          PDFViewerApplication.page--;
-        }
-
-        handled = true;
-        break;
-
-      case 82:
-        PDFViewerApplication.rotatePages(-90);
-        break;
-    }
-  }
-
-  if (!handled && !isViewerInPresentationMode) {
-    if (evt.keyCode >= 33 && evt.keyCode <= 40 || evt.keyCode === 32 && curElementTagName !== "BUTTON") {
-      ensureViewerFocused = true;
-    }
-  }
-
-  if (ensureViewerFocused && !pdfViewer.containsElement(curElement)) {
-    pdfViewer.focus();
-  }
-
-  if (handled) {
-    evt.preventDefault();
-  }
-}
-
-function beforeUnload(evt) {
-  evt.preventDefault();
-  evt.returnValue = "";
-  return false;
-}
-
-function apiPageLayoutToSpreadMode(layout) {
-  switch (layout) {
-    case "SinglePage":
-    case "OneColumn":
-      return _ui_utils.SpreadMode.NONE;
-
-    case "TwoColumnLeft":
-    case "TwoPageLeft":
-      return _ui_utils.SpreadMode.ODD;
-
-    case "TwoColumnRight":
-    case "TwoPageRight":
-      return _ui_utils.SpreadMode.EVEN;
-  }
-
-  return _ui_utils.SpreadMode.NONE;
-}
-
-function apiPageModeToSidebarView(mode) {
-  switch (mode) {
-    case "UseNone":
-      return _pdf_sidebar.SidebarView.NONE;
-
-    case "UseThumbs":
-      return _pdf_sidebar.SidebarView.THUMBS;
-
-    case "UseOutlines":
-      return _pdf_sidebar.SidebarView.OUTLINE;
-
-    case "UseAttachments":
-      return _pdf_sidebar.SidebarView.ATTACHMENTS;
-
-    case "UseOC":
-      return _pdf_sidebar.SidebarView.LAYERS;
-  }
-
-  return _pdf_sidebar.SidebarView.NONE;
-}
-
-const PDFPrintServiceFactory = {
-  instance: {
-    supportsPrinting: false,
-
-    createPrintService() {
-      throw new Error("Not implemented: createPrintService");
-    }
-
-  }
-};
-exports.PDFPrintServiceFactory = PDFPrintServiceFactory;
-
-/***/ }),
-/* 2 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+}));
+exports.animationStarted = exports.VERTICAL_PADDING = exports.UNKNOWN_SCALE = exports.TextLayerMode = exports.SpreadMode = exports.SidebarView = exports.ScrollMode = exports.SCROLLBAR_PADDING = exports.RenderingStates = exports.RendererType = exports.ProgressBar = exports.PresentationModeState = exports.OutputScale = exports.MIN_SCALE = exports.MAX_SCALE = exports.MAX_AUTO_SCALE = exports.DEFAULT_SCALE_VALUE = exports.DEFAULT_SCALE_DELTA = exports.DEFAULT_SCALE = exports.AutoPrintRegExp = void 0;
+exports.apiPageLayoutToViewerModes = apiPageLayoutToViewerModes;
+exports.apiPageModeToSidebarView = apiPageModeToSidebarView;
+exports.approximateFraction = approximateFraction;
+exports.backtrackBeforeAllVisibleElements = backtrackBeforeAllVisibleElements;
+exports.binarySearchFirstItem = binarySearchFirstItem;
+exports.docStyle = void 0;
+exports.getActiveOrFocusedElement = getActiveOrFocusedElement;
+exports.getPageSizeInches = getPageSizeInches;
+exports.getVisibleElements = getVisibleElements;
+exports.isPortraitOrientation = isPortraitOrientation;
 exports.isValidRotation = isValidRotation;
 exports.isValidScrollMode = isValidScrollMode;
 exports.isValidSpreadMode = isValidSpreadMode;
-exports.isPortraitOrientation = isPortraitOrientation;
-exports.clamp = clamp;
-exports.getPDFFileNameFromURL = getPDFFileNameFromURL;
 exports.noContextMenuHandler = noContextMenuHandler;
+exports.normalizeWheelEventDelta = normalizeWheelEventDelta;
+exports.normalizeWheelEventDirection = normalizeWheelEventDirection;
 exports.parseQueryString = parseQueryString;
-exports.backtrackBeforeAllVisibleElements = backtrackBeforeAllVisibleElements;
-exports.getVisibleElements = getVisibleElements;
+exports.removeNullCharacters = removeNullCharacters;
 exports.roundToDivide = roundToDivide;
-exports.getPageSizeInches = getPageSizeInches;
-exports.approximateFraction = approximateFraction;
-exports.getOutputScale = getOutputScale;
 exports.scrollIntoView = scrollIntoView;
 exports.watchScroll = watchScroll;
-exports.binarySearchFirstItem = binarySearchFirstItem;
-exports.normalizeWheelEventDirection = normalizeWheelEventDirection;
-exports.normalizeWheelEventDelta = normalizeWheelEventDelta;
-exports.waitOnEventOrTimeout = waitOnEventOrTimeout;
-exports.moveToEndOfArray = moveToEndOfArray;
-exports.WaitOnType = exports.animationStarted = exports.ProgressBar = exports.EventBus = exports.NullL10n = exports.SpreadMode = exports.ScrollMode = exports.TextLayerMode = exports.RendererType = exports.PresentationModeState = exports.VERTICAL_PADDING = exports.SCROLLBAR_PADDING = exports.MAX_AUTO_SCALE = exports.UNKNOWN_SCALE = exports.MAX_SCALE = exports.MIN_SCALE = exports.DEFAULT_SCALE = exports.DEFAULT_SCALE_VALUE = exports.CSS_UNITS = exports.AutoPrintRegExp = void 0;
-const CSS_UNITS = 96.0 / 72.0;
-exports.CSS_UNITS = CSS_UNITS;
 const DEFAULT_SCALE_VALUE = "auto";
 exports.DEFAULT_SCALE_VALUE = DEFAULT_SCALE_VALUE;
 const DEFAULT_SCALE = 1.0;
 exports.DEFAULT_SCALE = DEFAULT_SCALE;
+const DEFAULT_SCALE_DELTA = 1.1;
+exports.DEFAULT_SCALE_DELTA = DEFAULT_SCALE_DELTA;
 const MIN_SCALE = 0.1;
 exports.MIN_SCALE = MIN_SCALE;
 const MAX_SCALE = 10.0;
@@ -3029,6 +72,13 @@ const SCROLLBAR_PADDING = 40;
 exports.SCROLLBAR_PADDING = SCROLLBAR_PADDING;
 const VERTICAL_PADDING = 5;
 exports.VERTICAL_PADDING = VERTICAL_PADDING;
+const RenderingStates = {
+  INITIAL: 0,
+  RUNNING: 1,
+  PAUSED: 2,
+  FINISHED: 3
+};
+exports.RenderingStates = RenderingStates;
 const PresentationModeState = {
   UNKNOWN: 0,
   NORMAL: 1,
@@ -3036,6 +86,15 @@ const PresentationModeState = {
   FULLSCREEN: 3
 };
 exports.PresentationModeState = PresentationModeState;
+const SidebarView = {
+  UNKNOWN: -1,
+  NONE: 0,
+  THUMBS: 1,
+  OUTLINE: 2,
+  ATTACHMENTS: 3,
+  LAYERS: 4
+};
+exports.SidebarView = SidebarView;
 const RendererType = {
   CANVAS: "canvas",
   SVG: "svg"
@@ -3051,7 +110,8 @@ const ScrollMode = {
   UNKNOWN: -1,
   VERTICAL: 0,
   HORIZONTAL: 1,
-  WRAPPED: 2
+  WRAPPED: 2,
+  PAGE: 3
 };
 exports.ScrollMode = ScrollMode;
 const SpreadMode = {
@@ -3064,46 +124,22 @@ exports.SpreadMode = SpreadMode;
 const AutoPrintRegExp = /\bprint\s*\(/;
 exports.AutoPrintRegExp = AutoPrintRegExp;
 
-function formatL10nValue(text, args) {
-  if (!args) {
-    return text;
+class OutputScale {
+  constructor() {
+    const pixelRatio = window.devicePixelRatio || 1;
+    this.sx = pixelRatio;
+    this.sy = pixelRatio;
+  }
+
+  get scaled() {
+    return this.sx !== 1 || this.sy !== 1;
   }
 
-  return text.replace(/\{\{\s*(\w+)\s*\}\}/g, (all, name) => {
-    return name in args ? args[name] : "{{" + name + "}}";
-  });
 }
 
-const NullL10n = {
-  async getLanguage() {
-    return "en-us";
-  },
+exports.OutputScale = OutputScale;
 
-  async getDirection() {
-    return "ltr";
-  },
-
-  async get(property, args, fallback) {
-    return formatL10nValue(fallback, args);
-  },
-
-  async translate(element) {}
-
-};
-exports.NullL10n = NullL10n;
-
-function getOutputScale(ctx) {
-  const devicePixelRatio = window.devicePixelRatio || 1;
-  const backingStoreRatio = ctx.webkitBackingStorePixelRatio || ctx.mozBackingStorePixelRatio || ctx.msBackingStorePixelRatio || ctx.oBackingStorePixelRatio || ctx.backingStorePixelRatio || 1;
-  const pixelRatio = devicePixelRatio / backingStoreRatio;
-  return {
-    sx: pixelRatio,
-    sy: pixelRatio,
-    scaled: pixelRatio !== 1
-  };
-}
-
-function scrollIntoView(element, spot, skipOverflowHiddenElements = false) {
+function scrollIntoView(element, spot, scrollMatches = false) {
   let parent = element.offsetParent;
 
   if (!parent) {
@@ -3114,12 +150,7 @@ function scrollIntoView(element, spot, skipOverflowHiddenElements = false) {
   let offsetY = element.offsetTop + element.clientTop;
   let offsetX = element.offsetLeft + element.clientLeft;
 
-  while (parent.clientHeight === parent.scrollHeight && parent.clientWidth === parent.scrollWidth || skipOverflowHiddenElements && getComputedStyle(parent).overflow === "hidden") {
-    if (parent.dataset._scaleY) {
-      offsetY /= parent.dataset._scaleY;
-      offsetX /= parent.dataset._scaleX;
-    }
-
+  while (parent.clientHeight === parent.scrollHeight && parent.clientWidth === parent.scrollWidth || scrollMatches && (parent.classList.contains("markedContent") || getComputedStyle(parent).overflow === "hidden")) {
     offsetY += parent.offsetTop;
     offsetX += parent.offsetLeft;
     parent = parent.offsetParent;
@@ -3184,21 +215,33 @@ function watchScroll(viewAreaElement, callback) {
 }
 
 function parseQueryString(query) {
-  const parts = query.split("&");
-  const params = Object.create(null);
+  const params = new Map();
 
-  for (let i = 0, ii = parts.length; i < ii; ++i) {
-    const param = parts[i].split("=");
-    const key = param[0].toLowerCase();
-    const value = param.length > 1 ? param[1] : null;
-    params[decodeURIComponent(key)] = decodeURIComponent(value);
+  for (const [key, value] of new URLSearchParams(query)) {
+    params.set(key.toLowerCase(), value);
   }
 
   return params;
 }
 
-function binarySearchFirstItem(items, condition) {
-  let minIndex = 0;
+const NullCharactersRegExp = /\x00/g;
+const InvisibleCharactersRegExp = /[\x01-\x1F]/g;
+
+function removeNullCharacters(str, replaceInvisible = false) {
+  if (typeof str !== "string") {
+    console.error(`The argument must be a string.`);
+    return str;
+  }
+
+  if (replaceInvisible) {
+    str = str.replace(InvisibleCharactersRegExp, " ");
+  }
+
+  return str.replace(NullCharactersRegExp, "");
+}
+
+function binarySearchFirstItem(items, condition, start = 0) {
+  let minIndex = start;
   let maxIndex = items.length - 1;
 
   if (maxIndex < 0 || !condition(items[maxIndex])) {
@@ -3317,7 +360,13 @@ function backtrackBeforeAllVisibleElements(index, views, top) {
   return index;
 }
 
-function getVisibleElements(scrollEl, views, sortByVisibility = false, horizontal = false) {
+function getVisibleElements({
+  scrollEl,
+  views,
+  sortByVisibility = false,
+  horizontal = false,
+  rtl = false
+}) {
   const top = scrollEl.scrollTop,
         bottom = top + scrollEl.clientHeight;
   const left = scrollEl.scrollLeft,
@@ -3329,15 +378,17 @@ function getVisibleElements(scrollEl, views, sortByVisibility = false, horizonta
     return elementBottom > top;
   }
 
-  function isElementRightAfterViewLeft(view) {
+  function isElementNextAfterViewHorizontally(view) {
     const element = view.div;
-    const elementRight = element.offsetLeft + element.clientLeft + element.clientWidth;
-    return elementRight > left;
+    const elementLeft = element.offsetLeft + element.clientLeft;
+    const elementRight = elementLeft + element.clientWidth;
+    return rtl ? elementLeft < right : elementRight > left;
   }
 
   const visible = [],
+        ids = new Set(),
         numViews = views.length;
-  let firstVisibleElementInd = numViews === 0 ? 0 : binarySearchFirstItem(views, horizontal ? isElementRightAfterViewLeft : isElementBottomAfterViewTop);
+  let firstVisibleElementInd = binarySearchFirstItem(views, horizontal ? isElementNextAfterViewHorizontally : isElementBottomAfterViewTop);
 
   if (firstVisibleElementInd > 0 && firstVisibleElementInd < numViews && !horizontal) {
     firstVisibleElementInd = backtrackBeforeAllVisibleElements(firstVisibleElementInd, views, top);
@@ -3369,18 +420,22 @@ function getVisibleElements(scrollEl, views, sortByVisibility = false, horizonta
 
     const hiddenHeight = Math.max(0, top - currentHeight) + Math.max(0, viewBottom - bottom);
     const hiddenWidth = Math.max(0, left - currentWidth) + Math.max(0, viewRight - right);
-    const percent = (viewHeight - hiddenHeight) * (viewWidth - hiddenWidth) * 100 / viewHeight / viewWidth | 0;
+    const fractionHeight = (viewHeight - hiddenHeight) / viewHeight,
+          fractionWidth = (viewWidth - hiddenWidth) / viewWidth;
+    const percent = fractionHeight * fractionWidth * 100 | 0;
     visible.push({
       id: view.id,
       x: currentWidth,
       y: currentHeight,
       view,
-      percent
+      percent,
+      widthPercent: fractionWidth * 100 | 0
     });
+    ids.add(view.id);
   }
 
   const first = visible[0],
-        last = visible[visible.length - 1];
+        last = visible.at(-1);
 
   if (sortByVisibility) {
     visible.sort(function (a, b) {
@@ -3397,7 +452,8 @@ function getVisibleElements(scrollEl, views, sortByVisibility = false, horizonta
   return {
     first,
     last,
-    views: visible
+    views: visible,
+    ids
   };
 }
 
@@ -3405,47 +461,8 @@ function noContextMenuHandler(evt) {
   evt.preventDefault();
 }
 
-function isDataSchema(url) {
-  let i = 0;
-  const ii = url.length;
-
-  while (i < ii && url[i].trim() === "") {
-    i++;
-  }
-
-  return url.substring(i, i + 5).toLowerCase() === "data:";
-}
-
-function getPDFFileNameFromURL(url, defaultFilename = "document.pdf") {
-  if (typeof url !== "string") {
-    return defaultFilename;
-  }
-
-  if (isDataSchema(url)) {
-    console.warn("getPDFFileNameFromURL: " + 'ignoring "data:" URL for performance reasons.');
-    return defaultFilename;
-  }
-
-  const reURI = /^(?:(?:[^:]+:)?\/\/[^\/]+)?([^?#]*)(\?[^#]*)?(#.*)?$/;
-  const reFilename = /[^\/?#=]+\.pdf\b(?!.*\.pdf\b)/i;
-  const splitURI = reURI.exec(url);
-  let suggestedFilename = reFilename.exec(splitURI[1]) || reFilename.exec(splitURI[2]) || reFilename.exec(splitURI[3]);
-
-  if (suggestedFilename) {
-    suggestedFilename = suggestedFilename[0];
-
-    if (suggestedFilename.includes("%")) {
-      try {
-        suggestedFilename = reFilename.exec(decodeURIComponent(suggestedFilename))[0];
-      } catch (ex) {}
-    }
-  }
-
-  return suggestedFilename || defaultFilename;
-}
-
 function normalizeWheelEventDirection(evt) {
-  let delta = Math.sqrt(evt.deltaX * evt.deltaX + evt.deltaY * evt.deltaY);
+  let delta = Math.hypot(evt.deltaX, evt.deltaY);
   const angle = Math.atan2(evt.deltaY, evt.deltaX);
 
   if (-0.25 * Math.PI < angle && angle < 0.75 * Math.PI) {
@@ -3487,6 +504,3848 @@ function isPortraitOrientation(size) {
   return size.width <= size.height;
 }
 
+const animationStarted = new Promise(function (resolve) {
+  window.requestAnimationFrame(resolve);
+});
+exports.animationStarted = animationStarted;
+const docStyle = document.documentElement.style;
+exports.docStyle = docStyle;
+
+function clamp(v, min, max) {
+  return Math.min(Math.max(v, min), max);
+}
+
+class ProgressBar {
+  #classList = null;
+  #percent = 0;
+  #visible = true;
+
+  constructor(id) {
+    if (arguments.length > 1) {
+      throw new Error("ProgressBar no longer accepts any additional options, " + "please use CSS rules to modify its appearance instead.");
+    }
+
+    const bar = document.getElementById(id);
+    this.#classList = bar.classList;
+  }
+
+  get percent() {
+    return this.#percent;
+  }
+
+  set percent(val) {
+    this.#percent = clamp(val, 0, 100);
+
+    if (isNaN(val)) {
+      this.#classList.add("indeterminate");
+      return;
+    }
+
+    this.#classList.remove("indeterminate");
+    docStyle.setProperty("--progressBar-percent", `${this.#percent}%`);
+  }
+
+  setWidth(viewer) {
+    if (!viewer) {
+      return;
+    }
+
+    const container = viewer.parentNode;
+    const scrollbarWidth = container.offsetWidth - viewer.offsetWidth;
+
+    if (scrollbarWidth > 0) {
+      docStyle.setProperty("--progressBar-end-offset", `${scrollbarWidth}px`);
+    }
+  }
+
+  hide() {
+    if (!this.#visible) {
+      return;
+    }
+
+    this.#visible = false;
+    this.#classList.add("hidden");
+  }
+
+  show() {
+    if (this.#visible) {
+      return;
+    }
+
+    this.#visible = true;
+    this.#classList.remove("hidden");
+  }
+
+}
+
+exports.ProgressBar = ProgressBar;
+
+function getActiveOrFocusedElement() {
+  let curRoot = document;
+  let curActiveOrFocused = curRoot.activeElement || curRoot.querySelector(":focus");
+
+  while (curActiveOrFocused?.shadowRoot) {
+    curRoot = curActiveOrFocused.shadowRoot;
+    curActiveOrFocused = curRoot.activeElement || curRoot.querySelector(":focus");
+  }
+
+  return curActiveOrFocused;
+}
+
+function apiPageLayoutToViewerModes(layout) {
+  let scrollMode = ScrollMode.VERTICAL,
+      spreadMode = SpreadMode.NONE;
+
+  switch (layout) {
+    case "SinglePage":
+      scrollMode = ScrollMode.PAGE;
+      break;
+
+    case "OneColumn":
+      break;
+
+    case "TwoPageLeft":
+      scrollMode = ScrollMode.PAGE;
+
+    case "TwoColumnLeft":
+      spreadMode = SpreadMode.ODD;
+      break;
+
+    case "TwoPageRight":
+      scrollMode = ScrollMode.PAGE;
+
+    case "TwoColumnRight":
+      spreadMode = SpreadMode.EVEN;
+      break;
+  }
+
+  return {
+    scrollMode,
+    spreadMode
+  };
+}
+
+function apiPageModeToSidebarView(mode) {
+  switch (mode) {
+    case "UseNone":
+      return SidebarView.NONE;
+
+    case "UseThumbs":
+      return SidebarView.THUMBS;
+
+    case "UseOutlines":
+      return SidebarView.OUTLINE;
+
+    case "UseAttachments":
+      return SidebarView.ATTACHMENTS;
+
+    case "UseOC":
+      return SidebarView.LAYERS;
+  }
+
+  return SidebarView.NONE;
+}
+
+/***/ }),
+/* 2 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.compatibilityParams = exports.OptionKind = exports.AppOptions = void 0;
+const compatibilityParams = Object.create(null);
+exports.compatibilityParams = compatibilityParams;
+{
+  const userAgent = navigator.userAgent || "";
+  const platform = navigator.platform || "";
+  const maxTouchPoints = navigator.maxTouchPoints || 1;
+  const isAndroid = /Android/.test(userAgent);
+  const isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent) || platform === "MacIntel" && maxTouchPoints > 1;
+
+  (function checkCanvasSizeLimitation() {
+    if (isIOS || isAndroid) {
+      compatibilityParams.maxCanvasPixels = 5242880;
+    }
+  })();
+}
+const OptionKind = {
+  VIEWER: 0x02,
+  API: 0x04,
+  WORKER: 0x08,
+  PREFERENCE: 0x80
+};
+exports.OptionKind = OptionKind;
+const defaultOptions = {
+  annotationEditorMode: {
+    value: -1,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  annotationMode: {
+    value: 2,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  cursorToolOnLoad: {
+    value: 0,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  defaultZoomValue: {
+    value: "",
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  disableHistory: {
+    value: false,
+    kind: OptionKind.VIEWER
+  },
+  disablePageLabels: {
+    value: false,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  enablePermissions: {
+    value: false,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  enablePrintAutoRotate: {
+    value: true,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  enableScripting: {
+    value: true,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  externalLinkRel: {
+    value: "noopener noreferrer nofollow",
+    kind: OptionKind.VIEWER
+  },
+  externalLinkTarget: {
+    value: 0,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  historyUpdateUrl: {
+    value: false,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  ignoreDestinationZoom: {
+    value: false,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  imageResourcesPath: {
+    value: "./images/",
+    kind: OptionKind.VIEWER
+  },
+  maxCanvasPixels: {
+    value: 16777216,
+    kind: OptionKind.VIEWER
+  },
+  forcePageColors: {
+    value: false,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  pageColorsBackground: {
+    value: "Canvas",
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  pageColorsForeground: {
+    value: "CanvasText",
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  pdfBugEnabled: {
+    value: false,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  printResolution: {
+    value: 150,
+    kind: OptionKind.VIEWER
+  },
+  sidebarViewOnLoad: {
+    value: -1,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  scrollModeOnLoad: {
+    value: -1,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  spreadModeOnLoad: {
+    value: -1,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  textLayerMode: {
+    value: 1,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  useOnlyCssZoom: {
+    value: false,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  viewerCssTheme: {
+    value: 0,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  viewOnLoad: {
+    value: 0,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
+  cMapPacked: {
+    value: true,
+    kind: OptionKind.API
+  },
+  cMapUrl: {
+    value: "../web/cmaps/",
+    kind: OptionKind.API
+  },
+  disableAutoFetch: {
+    value: false,
+    kind: OptionKind.API + OptionKind.PREFERENCE
+  },
+  disableFontFace: {
+    value: false,
+    kind: OptionKind.API + OptionKind.PREFERENCE
+  },
+  disableRange: {
+    value: false,
+    kind: OptionKind.API + OptionKind.PREFERENCE
+  },
+  disableStream: {
+    value: false,
+    kind: OptionKind.API + OptionKind.PREFERENCE
+  },
+  docBaseUrl: {
+    value: "",
+    kind: OptionKind.API
+  },
+  enableXfa: {
+    value: true,
+    kind: OptionKind.API + OptionKind.PREFERENCE
+  },
+  fontExtraProperties: {
+    value: false,
+    kind: OptionKind.API
+  },
+  isEvalSupported: {
+    value: true,
+    kind: OptionKind.API
+  },
+  maxImageSize: {
+    value: -1,
+    kind: OptionKind.API
+  },
+  pdfBug: {
+    value: false,
+    kind: OptionKind.API
+  },
+  standardFontDataUrl: {
+    value: "../web/standard_fonts/",
+    kind: OptionKind.API
+  },
+  verbosity: {
+    value: 1,
+    kind: OptionKind.API
+  },
+  workerPort: {
+    value: null,
+    kind: OptionKind.WORKER
+  },
+  workerSrc: {
+    value: "../build/pdf.worker.js",
+    kind: OptionKind.WORKER
+  }
+};
+{
+  defaultOptions.defaultUrl = {
+    value: "compressed.tracemonkey-pldi-09.pdf",
+    kind: OptionKind.VIEWER
+  };
+  defaultOptions.disablePreferences = {
+    value: false,
+    kind: OptionKind.VIEWER
+  };
+  defaultOptions.locale = {
+    value: navigator.language || "en-US",
+    kind: OptionKind.VIEWER
+  };
+  defaultOptions.renderer = {
+    value: "canvas",
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  };
+  defaultOptions.sandboxBundleSrc = {
+    value: "../build/pdf.sandbox.js",
+    kind: OptionKind.VIEWER
+  };
+}
+const userOptions = Object.create(null);
+
+class AppOptions {
+  constructor() {
+    throw new Error("Cannot initialize AppOptions.");
+  }
+
+  static get(name) {
+    const userOption = userOptions[name];
+
+    if (userOption !== undefined) {
+      return userOption;
+    }
+
+    const defaultOption = defaultOptions[name];
+
+    if (defaultOption !== undefined) {
+      return compatibilityParams[name] ?? defaultOption.value;
+    }
+
+    return undefined;
+  }
+
+  static getAll(kind = null) {
+    const options = Object.create(null);
+
+    for (const name in defaultOptions) {
+      const defaultOption = defaultOptions[name];
+
+      if (kind) {
+        if ((kind & defaultOption.kind) === 0) {
+          continue;
+        }
+
+        if (kind === OptionKind.PREFERENCE) {
+          const value = defaultOption.value,
+                valueType = typeof value;
+
+          if (valueType === "boolean" || valueType === "string" || valueType === "number" && Number.isInteger(value)) {
+            options[name] = value;
+            continue;
+          }
+
+          throw new Error(`Invalid type for preference: ${name}`);
+        }
+      }
+
+      const userOption = userOptions[name];
+      options[name] = userOption !== undefined ? userOption : compatibilityParams[name] ?? defaultOption.value;
+    }
+
+    return options;
+  }
+
+  static set(name, value) {
+    userOptions[name] = value;
+  }
+
+  static setAll(options) {
+    for (const name in options) {
+      userOptions[name] = options[name];
+    }
+  }
+
+  static remove(name) {
+    delete userOptions[name];
+  }
+
+  static _hasUserOptions() {
+    return Object.keys(userOptions).length > 0;
+  }
+
+}
+
+exports.AppOptions = AppOptions;
+
+/***/ }),
+/* 3 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.SimpleLinkService = exports.PDFLinkService = exports.LinkTarget = void 0;
+
+var _ui_utils = __webpack_require__(1);
+
+const DEFAULT_LINK_REL = "noopener noreferrer nofollow";
+const LinkTarget = {
+  NONE: 0,
+  SELF: 1,
+  BLANK: 2,
+  PARENT: 3,
+  TOP: 4
+};
+exports.LinkTarget = LinkTarget;
+
+function addLinkAttributes(link, {
+  url,
+  target,
+  rel,
+  enabled = true
+} = {}) {
+  if (!url || typeof url !== "string") {
+    throw new Error('A valid "url" parameter must provided.');
+  }
+
+  const urlNullRemoved = (0, _ui_utils.removeNullCharacters)(url);
+
+  if (enabled) {
+    link.href = link.title = urlNullRemoved;
+  } else {
+    link.href = "";
+    link.title = `Disabled: ${urlNullRemoved}`;
+
+    link.onclick = () => {
+      return false;
+    };
+  }
+
+  let targetStr = "";
+
+  switch (target) {
+    case LinkTarget.NONE:
+      break;
+
+    case LinkTarget.SELF:
+      targetStr = "_self";
+      break;
+
+    case LinkTarget.BLANK:
+      targetStr = "_blank";
+      break;
+
+    case LinkTarget.PARENT:
+      targetStr = "_parent";
+      break;
+
+    case LinkTarget.TOP:
+      targetStr = "_top";
+      break;
+  }
+
+  link.target = targetStr;
+  link.rel = typeof rel === "string" ? rel : DEFAULT_LINK_REL;
+}
+
+class PDFLinkService {
+  #pagesRefCache = new Map();
+
+  constructor({
+    eventBus,
+    externalLinkTarget = null,
+    externalLinkRel = null,
+    ignoreDestinationZoom = false
+  } = {}) {
+    this.eventBus = eventBus;
+    this.externalLinkTarget = externalLinkTarget;
+    this.externalLinkRel = externalLinkRel;
+    this.externalLinkEnabled = true;
+    this._ignoreDestinationZoom = ignoreDestinationZoom;
+    this.baseUrl = null;
+    this.pdfDocument = null;
+    this.pdfViewer = null;
+    this.pdfHistory = null;
+  }
+
+  setDocument(pdfDocument, baseUrl = null) {
+    this.baseUrl = baseUrl;
+    this.pdfDocument = pdfDocument;
+    this.#pagesRefCache.clear();
+  }
+
+  setViewer(pdfViewer) {
+    this.pdfViewer = pdfViewer;
+  }
+
+  setHistory(pdfHistory) {
+    this.pdfHistory = pdfHistory;
+  }
+
+  get pagesCount() {
+    return this.pdfDocument ? this.pdfDocument.numPages : 0;
+  }
+
+  get page() {
+    return this.pdfViewer.currentPageNumber;
+  }
+
+  set page(value) {
+    this.pdfViewer.currentPageNumber = value;
+  }
+
+  get rotation() {
+    return this.pdfViewer.pagesRotation;
+  }
+
+  set rotation(value) {
+    this.pdfViewer.pagesRotation = value;
+  }
+
+  #goToDestinationHelper(rawDest, namedDest = null, explicitDest) {
+    const destRef = explicitDest[0];
+    let pageNumber;
+
+    if (typeof destRef === "object" && destRef !== null) {
+      pageNumber = this._cachedPageNumber(destRef);
+
+      if (!pageNumber) {
+        this.pdfDocument.getPageIndex(destRef).then(pageIndex => {
+          this.cachePageRef(pageIndex + 1, destRef);
+          this.#goToDestinationHelper(rawDest, namedDest, explicitDest);
+        }).catch(() => {
+          console.error(`PDFLinkService.#goToDestinationHelper: "${destRef}" is not ` + `a valid page reference, for dest="${rawDest}".`);
+        });
+        return;
+      }
+    } else if (Number.isInteger(destRef)) {
+      pageNumber = destRef + 1;
+    } else {
+      console.error(`PDFLinkService.#goToDestinationHelper: "${destRef}" is not ` + `a valid destination reference, for dest="${rawDest}".`);
+      return;
+    }
+
+    if (!pageNumber || pageNumber < 1 || pageNumber > this.pagesCount) {
+      console.error(`PDFLinkService.#goToDestinationHelper: "${pageNumber}" is not ` + `a valid page number, for dest="${rawDest}".`);
+      return;
+    }
+
+    if (this.pdfHistory) {
+      this.pdfHistory.pushCurrentPosition();
+      this.pdfHistory.push({
+        namedDest,
+        explicitDest,
+        pageNumber
+      });
+    }
+
+    this.pdfViewer.scrollPageIntoView({
+      pageNumber,
+      destArray: explicitDest,
+      ignoreDestinationZoom: this._ignoreDestinationZoom
+    });
+  }
+
+  async goToDestination(dest) {
+    if (!this.pdfDocument) {
+      return;
+    }
+
+    let namedDest, explicitDest;
+
+    if (typeof dest === "string") {
+      namedDest = dest;
+      explicitDest = await this.pdfDocument.getDestination(dest);
+    } else {
+      namedDest = null;
+      explicitDest = await dest;
+    }
+
+    if (!Array.isArray(explicitDest)) {
+      console.error(`PDFLinkService.goToDestination: "${explicitDest}" is not ` + `a valid destination array, for dest="${dest}".`);
+      return;
+    }
+
+    this.#goToDestinationHelper(dest, namedDest, explicitDest);
+  }
+
+  goToPage(val) {
+    if (!this.pdfDocument) {
+      return;
+    }
+
+    const pageNumber = typeof val === "string" && this.pdfViewer.pageLabelToPageNumber(val) || val | 0;
+
+    if (!(Number.isInteger(pageNumber) && pageNumber > 0 && pageNumber <= this.pagesCount)) {
+      console.error(`PDFLinkService.goToPage: "${val}" is not a valid page.`);
+      return;
+    }
+
+    if (this.pdfHistory) {
+      this.pdfHistory.pushCurrentPosition();
+      this.pdfHistory.pushPage(pageNumber);
+    }
+
+    this.pdfViewer.scrollPageIntoView({
+      pageNumber
+    });
+  }
+
+  addLinkAttributes(link, url, newWindow = false) {
+    addLinkAttributes(link, {
+      url,
+      target: newWindow ? LinkTarget.BLANK : this.externalLinkTarget,
+      rel: this.externalLinkRel,
+      enabled: this.externalLinkEnabled
+    });
+  }
+
+  getDestinationHash(dest) {
+    if (typeof dest === "string") {
+      if (dest.length > 0) {
+        return this.getAnchorUrl("#" + escape(dest));
+      }
+    } else if (Array.isArray(dest)) {
+      const str = JSON.stringify(dest);
+
+      if (str.length > 0) {
+        return this.getAnchorUrl("#" + escape(str));
+      }
+    }
+
+    return this.getAnchorUrl("");
+  }
+
+  getAnchorUrl(anchor) {
+    return (this.baseUrl || "") + anchor;
+  }
+
+  setHash(hash) {
+    if (!this.pdfDocument) {
+      return;
+    }
+
+    let pageNumber, dest;
+
+    if (hash.includes("=")) {
+      const params = (0, _ui_utils.parseQueryString)(hash);
+
+      if (params.has("search")) {
+        this.eventBus.dispatch("findfromurlhash", {
+          source: this,
+          query: params.get("search").replace(/"/g, ""),
+          phraseSearch: params.get("phrase") === "true"
+        });
+      }
+
+      if (params.has("page")) {
+        pageNumber = params.get("page") | 0 || 1;
+      }
+
+      if (params.has("zoom")) {
+        const zoomArgs = params.get("zoom").split(",");
+        const zoomArg = zoomArgs[0];
+        const zoomArgNumber = parseFloat(zoomArg);
+
+        if (!zoomArg.includes("Fit")) {
+          dest = [null, {
+            name: "XYZ"
+          }, zoomArgs.length > 1 ? zoomArgs[1] | 0 : null, zoomArgs.length > 2 ? zoomArgs[2] | 0 : null, zoomArgNumber ? zoomArgNumber / 100 : zoomArg];
+        } else {
+          if (zoomArg === "Fit" || zoomArg === "FitB") {
+            dest = [null, {
+              name: zoomArg
+            }];
+          } else if (zoomArg === "FitH" || zoomArg === "FitBH" || zoomArg === "FitV" || zoomArg === "FitBV") {
+            dest = [null, {
+              name: zoomArg
+            }, zoomArgs.length > 1 ? zoomArgs[1] | 0 : null];
+          } else if (zoomArg === "FitR") {
+            if (zoomArgs.length !== 5) {
+              console.error('PDFLinkService.setHash: Not enough parameters for "FitR".');
+            } else {
+              dest = [null, {
+                name: zoomArg
+              }, zoomArgs[1] | 0, zoomArgs[2] | 0, zoomArgs[3] | 0, zoomArgs[4] | 0];
+            }
+          } else {
+            console.error(`PDFLinkService.setHash: "${zoomArg}" is not a valid zoom value.`);
+          }
+        }
+      }
+
+      if (dest) {
+        this.pdfViewer.scrollPageIntoView({
+          pageNumber: pageNumber || this.page,
+          destArray: dest,
+          allowNegativeOffset: true
+        });
+      } else if (pageNumber) {
+        this.page = pageNumber;
+      }
+
+      if (params.has("pagemode")) {
+        this.eventBus.dispatch("pagemode", {
+          source: this,
+          mode: params.get("pagemode")
+        });
+      }
+
+      if (params.has("nameddest")) {
+        this.goToDestination(params.get("nameddest"));
+      }
+    } else {
+      dest = unescape(hash);
+
+      try {
+        dest = JSON.parse(dest);
+
+        if (!Array.isArray(dest)) {
+          dest = dest.toString();
+        }
+      } catch (ex) {}
+
+      if (typeof dest === "string" || PDFLinkService.#isValidExplicitDestination(dest)) {
+        this.goToDestination(dest);
+        return;
+      }
+
+      console.error(`PDFLinkService.setHash: "${unescape(hash)}" is not a valid destination.`);
+    }
+  }
+
+  executeNamedAction(action) {
+    switch (action) {
+      case "GoBack":
+        this.pdfHistory?.back();
+        break;
+
+      case "GoForward":
+        this.pdfHistory?.forward();
+        break;
+
+      case "NextPage":
+        this.pdfViewer.nextPage();
+        break;
+
+      case "PrevPage":
+        this.pdfViewer.previousPage();
+        break;
+
+      case "LastPage":
+        this.page = this.pagesCount;
+        break;
+
+      case "FirstPage":
+        this.page = 1;
+        break;
+
+      default:
+        break;
+    }
+
+    this.eventBus.dispatch("namedaction", {
+      source: this,
+      action
+    });
+  }
+
+  cachePageRef(pageNum, pageRef) {
+    if (!pageRef) {
+      return;
+    }
+
+    const refStr = pageRef.gen === 0 ? `${pageRef.num}R` : `${pageRef.num}R${pageRef.gen}`;
+    this.#pagesRefCache.set(refStr, pageNum);
+  }
+
+  _cachedPageNumber(pageRef) {
+    if (!pageRef) {
+      return null;
+    }
+
+    const refStr = pageRef.gen === 0 ? `${pageRef.num}R` : `${pageRef.num}R${pageRef.gen}`;
+    return this.#pagesRefCache.get(refStr) || null;
+  }
+
+  isPageVisible(pageNumber) {
+    return this.pdfViewer.isPageVisible(pageNumber);
+  }
+
+  isPageCached(pageNumber) {
+    return this.pdfViewer.isPageCached(pageNumber);
+  }
+
+  static #isValidExplicitDestination(dest) {
+    if (!Array.isArray(dest)) {
+      return false;
+    }
+
+    const destLength = dest.length;
+
+    if (destLength < 2) {
+      return false;
+    }
+
+    const page = dest[0];
+
+    if (!(typeof page === "object" && Number.isInteger(page.num) && Number.isInteger(page.gen)) && !(Number.isInteger(page) && page >= 0)) {
+      return false;
+    }
+
+    const zoom = dest[1];
+
+    if (!(typeof zoom === "object" && typeof zoom.name === "string")) {
+      return false;
+    }
+
+    let allowNull = true;
+
+    switch (zoom.name) {
+      case "XYZ":
+        if (destLength !== 5) {
+          return false;
+        }
+
+        break;
+
+      case "Fit":
+      case "FitB":
+        return destLength === 2;
+
+      case "FitH":
+      case "FitBH":
+      case "FitV":
+      case "FitBV":
+        if (destLength !== 3) {
+          return false;
+        }
+
+        break;
+
+      case "FitR":
+        if (destLength !== 6) {
+          return false;
+        }
+
+        allowNull = false;
+        break;
+
+      default:
+        return false;
+    }
+
+    for (let i = 2; i < destLength; i++) {
+      const param = dest[i];
+
+      if (!(typeof param === "number" || allowNull && param === null)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+}
+
+exports.PDFLinkService = PDFLinkService;
+
+class SimpleLinkService {
+  constructor() {
+    this.externalLinkEnabled = true;
+  }
+
+  get pagesCount() {
+    return 0;
+  }
+
+  get page() {
+    return 0;
+  }
+
+  set page(value) {}
+
+  get rotation() {
+    return 0;
+  }
+
+  set rotation(value) {}
+
+  async goToDestination(dest) {}
+
+  goToPage(val) {}
+
+  addLinkAttributes(link, url, newWindow = false) {
+    addLinkAttributes(link, {
+      url,
+      enabled: this.externalLinkEnabled
+    });
+  }
+
+  getDestinationHash(dest) {
+    return "#";
+  }
+
+  getAnchorUrl(hash) {
+    return "#";
+  }
+
+  setHash(hash) {}
+
+  executeNamedAction(action) {}
+
+  cachePageRef(pageNum, pageRef) {}
+
+  isPageVisible(pageNumber) {
+    return true;
+  }
+
+  isPageCached(pageNumber) {
+    return true;
+  }
+
+}
+
+exports.SimpleLinkService = SimpleLinkService;
+
+/***/ }),
+/* 4 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.PDFViewerApplication = exports.PDFPrintServiceFactory = exports.DefaultExternalServices = void 0;
+
+var _ui_utils = __webpack_require__(1);
+
+var _pdfjsLib = __webpack_require__(5);
+
+var _app_options = __webpack_require__(2);
+
+var _event_utils = __webpack_require__(6);
+
+var _pdf_cursor_tools = __webpack_require__(7);
+
+var _pdf_link_service = __webpack_require__(3);
+
+var _annotation_editor_params = __webpack_require__(9);
+
+var _overlay_manager = __webpack_require__(10);
+
+var _password_prompt = __webpack_require__(11);
+
+var _pdf_attachment_viewer = __webpack_require__(12);
+
+var _pdf_document_properties = __webpack_require__(14);
+
+var _pdf_find_bar = __webpack_require__(15);
+
+var _pdf_find_controller = __webpack_require__(16);
+
+var _pdf_history = __webpack_require__(18);
+
+var _pdf_layer_viewer = __webpack_require__(19);
+
+var _pdf_outline_viewer = __webpack_require__(20);
+
+var _pdf_presentation_mode = __webpack_require__(21);
+
+var _pdf_rendering_queue = __webpack_require__(22);
+
+var _pdf_scripting_manager = __webpack_require__(23);
+
+var _pdf_sidebar = __webpack_require__(24);
+
+var _pdf_sidebar_resizer = __webpack_require__(25);
+
+var _pdf_thumbnail_viewer = __webpack_require__(26);
+
+var _pdf_viewer = __webpack_require__(28);
+
+var _secondary_toolbar = __webpack_require__(39);
+
+var _toolbar = __webpack_require__(40);
+
+var _view_history = __webpack_require__(41);
+
+const DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000;
+const FORCE_PAGES_LOADED_TIMEOUT = 10000;
+const WHEEL_ZOOM_DISABLED_TIMEOUT = 1000;
+const ViewOnLoad = {
+  UNKNOWN: -1,
+  PREVIOUS: 0,
+  INITIAL: 1
+};
+const ViewerCssTheme = {
+  AUTOMATIC: 0,
+  LIGHT: 1,
+  DARK: 2
+};
+const KNOWN_VERSIONS = ["1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "2.0", "2.1", "2.2", "2.3"];
+const KNOWN_GENERATORS = ["acrobat distiller", "acrobat pdfwriter", "adobe livecycle", "adobe pdf library", "adobe photoshop", "ghostscript", "tcpdf", "cairo", "dvipdfm", "dvips", "pdftex", "pdfkit", "itext", "prince", "quarkxpress", "mac os x", "microsoft", "openoffice", "oracle", "luradocument", "pdf-xchange", "antenna house", "aspose.cells", "fpdf"];
+
+class DefaultExternalServices {
+  constructor() {
+    throw new Error("Cannot initialize DefaultExternalServices.");
+  }
+
+  static updateFindControlState(data) {}
+
+  static updateFindMatchesCount(data) {}
+
+  static initPassiveLoading(callbacks) {}
+
+  static reportTelemetry(data) {}
+
+  static createDownloadManager(options) {
+    throw new Error("Not implemented: createDownloadManager");
+  }
+
+  static createPreferences() {
+    throw new Error("Not implemented: createPreferences");
+  }
+
+  static createL10n(options) {
+    throw new Error("Not implemented: createL10n");
+  }
+
+  static createScripting(options) {
+    throw new Error("Not implemented: createScripting");
+  }
+
+  static get supportsIntegratedFind() {
+    return (0, _pdfjsLib.shadow)(this, "supportsIntegratedFind", false);
+  }
+
+  static get supportsDocumentFonts() {
+    return (0, _pdfjsLib.shadow)(this, "supportsDocumentFonts", true);
+  }
+
+  static get supportedMouseWheelZoomModifierKeys() {
+    return (0, _pdfjsLib.shadow)(this, "supportedMouseWheelZoomModifierKeys", {
+      ctrlKey: true,
+      metaKey: true
+    });
+  }
+
+  static get isInAutomation() {
+    return (0, _pdfjsLib.shadow)(this, "isInAutomation", false);
+  }
+
+  static updateEditorStates(data) {
+    throw new Error("Not implemented: updateEditorStates");
+  }
+
+}
+
+exports.DefaultExternalServices = DefaultExternalServices;
+const PDFViewerApplication = {
+  initialBookmark: document.location.hash.substring(1),
+  _initializedCapability: (0, _pdfjsLib.createPromiseCapability)(),
+  appConfig: null,
+  pdfDocument: null,
+  pdfLoadingTask: null,
+  printService: null,
+  pdfViewer: null,
+  pdfThumbnailViewer: null,
+  pdfRenderingQueue: null,
+  pdfPresentationMode: null,
+  pdfDocumentProperties: null,
+  pdfLinkService: null,
+  pdfHistory: null,
+  pdfSidebar: null,
+  pdfSidebarResizer: null,
+  pdfOutlineViewer: null,
+  pdfAttachmentViewer: null,
+  pdfLayerViewer: null,
+  pdfCursorTools: null,
+  pdfScriptingManager: null,
+  store: null,
+  downloadManager: null,
+  overlayManager: null,
+  preferences: null,
+  toolbar: null,
+  secondaryToolbar: null,
+  eventBus: null,
+  l10n: null,
+  annotationEditorParams: null,
+  isInitialViewSet: false,
+  downloadComplete: false,
+  isViewerEmbedded: window.parent !== window,
+  url: "",
+  baseUrl: "",
+  _downloadUrl: "",
+  externalServices: DefaultExternalServices,
+  _boundEvents: Object.create(null),
+  documentInfo: null,
+  metadata: null,
+  _contentDispositionFilename: null,
+  _contentLength: null,
+  _saveInProgress: false,
+  _docStats: null,
+  _wheelUnusedTicks: 0,
+  _idleCallbacks: new Set(),
+  _PDFBug: null,
+  _hasAnnotationEditors: false,
+  _title: document.title,
+  _printAnnotationStoragePromise: null,
+
+  async initialize(appConfig) {
+    this.preferences = this.externalServices.createPreferences();
+    this.appConfig = appConfig;
+    await this._readPreferences();
+    await this._parseHashParameters();
+
+    this._forceCssTheme();
+
+    await this._initializeL10n();
+
+    if (this.isViewerEmbedded && _app_options.AppOptions.get("externalLinkTarget") === _pdf_link_service.LinkTarget.NONE) {
+      _app_options.AppOptions.set("externalLinkTarget", _pdf_link_service.LinkTarget.TOP);
+    }
+
+    await this._initializeViewerComponents();
+    this.bindEvents();
+    this.bindWindowEvents();
+    const appContainer = appConfig.appContainer || document.documentElement;
+    this.l10n.translate(appContainer).then(() => {
+      this.eventBus.dispatch("localized", {
+        source: this
+      });
+    });
+
+    this._initializedCapability.resolve();
+  },
+
+  async _readPreferences() {
+    if (_app_options.AppOptions.get("disablePreferences")) {
+      return;
+    }
+
+    if (_app_options.AppOptions._hasUserOptions()) {
+      console.warn("_readPreferences: The Preferences may override manually set AppOptions; " + 'please use the "disablePreferences"-option in order to prevent that.');
+    }
+
+    try {
+      _app_options.AppOptions.setAll(await this.preferences.getAll());
+    } catch (reason) {
+      console.error(`_readPreferences: "${reason?.message}".`);
+    }
+  },
+
+  async _parseHashParameters() {
+    if (!_app_options.AppOptions.get("pdfBugEnabled")) {
+      return;
+    }
+
+    const hash = document.location.hash.substring(1);
+
+    if (!hash) {
+      return;
+    }
+
+    const {
+      mainContainer,
+      viewerContainer
+    } = this.appConfig,
+          params = (0, _ui_utils.parseQueryString)(hash);
+
+    if (params.get("disableworker") === "true") {
+      try {
+        await loadFakeWorker();
+      } catch (ex) {
+        console.error(`_parseHashParameters: "${ex.message}".`);
+      }
+    }
+
+    if (params.has("disablerange")) {
+      _app_options.AppOptions.set("disableRange", params.get("disablerange") === "true");
+    }
+
+    if (params.has("disablestream")) {
+      _app_options.AppOptions.set("disableStream", params.get("disablestream") === "true");
+    }
+
+    if (params.has("disableautofetch")) {
+      _app_options.AppOptions.set("disableAutoFetch", params.get("disableautofetch") === "true");
+    }
+
+    if (params.has("disablefontface")) {
+      _app_options.AppOptions.set("disableFontFace", params.get("disablefontface") === "true");
+    }
+
+    if (params.has("disablehistory")) {
+      _app_options.AppOptions.set("disableHistory", params.get("disablehistory") === "true");
+    }
+
+    if (params.has("verbosity")) {
+      _app_options.AppOptions.set("verbosity", params.get("verbosity") | 0);
+    }
+
+    if (params.has("textlayer")) {
+      switch (params.get("textlayer")) {
+        case "off":
+          _app_options.AppOptions.set("textLayerMode", _ui_utils.TextLayerMode.DISABLE);
+
+          break;
+
+        case "visible":
+        case "shadow":
+        case "hover":
+          viewerContainer.classList.add(`textLayer-${params.get("textlayer")}`);
+
+          try {
+            await loadPDFBug(this);
+
+            this._PDFBug.loadCSS();
+          } catch (ex) {
+            console.error(`_parseHashParameters: "${ex.message}".`);
+          }
+
+          break;
+      }
+    }
+
+    if (params.has("pdfbug")) {
+      _app_options.AppOptions.set("pdfBug", true);
+
+      _app_options.AppOptions.set("fontExtraProperties", true);
+
+      const enabled = params.get("pdfbug").split(",");
+
+      try {
+        await loadPDFBug(this);
+
+        this._PDFBug.init({
+          OPS: _pdfjsLib.OPS
+        }, mainContainer, enabled);
+      } catch (ex) {
+        console.error(`_parseHashParameters: "${ex.message}".`);
+      }
+    }
+
+    if (params.has("locale")) {
+      _app_options.AppOptions.set("locale", params.get("locale"));
+    }
+  },
+
+  async _initializeL10n() {
+    this.l10n = this.externalServices.createL10n({
+      locale: _app_options.AppOptions.get("locale")
+    });
+    const dir = await this.l10n.getDirection();
+    document.getElementsByTagName("html")[0].dir = dir;
+  },
+
+  _forceCssTheme() {
+    const cssTheme = _app_options.AppOptions.get("viewerCssTheme");
+
+    if (cssTheme === ViewerCssTheme.AUTOMATIC || !Object.values(ViewerCssTheme).includes(cssTheme)) {
+      return;
+    }
+
+    try {
+      const styleSheet = document.styleSheets[0];
+      const cssRules = styleSheet?.cssRules || [];
+
+      for (let i = 0, ii = cssRules.length; i < ii; i++) {
+        const rule = cssRules[i];
+
+        if (rule instanceof CSSMediaRule && rule.media?.[0] === "(prefers-color-scheme: dark)") {
+          if (cssTheme === ViewerCssTheme.LIGHT) {
+            styleSheet.deleteRule(i);
+            return;
+          }
+
+          const darkRules = /^@media \(prefers-color-scheme: dark\) {\n\s*([\w\s-.,:;/\\{}()]+)\n}$/.exec(rule.cssText);
+
+          if (darkRules?.[1]) {
+            styleSheet.deleteRule(i);
+            styleSheet.insertRule(darkRules[1], i);
+          }
+
+          return;
+        }
+      }
+    } catch (reason) {
+      console.error(`_forceCssTheme: "${reason?.message}".`);
+    }
+  },
+
+  async _initializeViewerComponents() {
+    const {
+      appConfig,
+      externalServices
+    } = this;
+    const eventBus = externalServices.isInAutomation ? new _event_utils.AutomationEventBus() : new _event_utils.EventBus();
+    this.eventBus = eventBus;
+    this.overlayManager = new _overlay_manager.OverlayManager();
+    const pdfRenderingQueue = new _pdf_rendering_queue.PDFRenderingQueue();
+    pdfRenderingQueue.onIdle = this._cleanup.bind(this);
+    this.pdfRenderingQueue = pdfRenderingQueue;
+    const pdfLinkService = new _pdf_link_service.PDFLinkService({
+      eventBus,
+      externalLinkTarget: _app_options.AppOptions.get("externalLinkTarget"),
+      externalLinkRel: _app_options.AppOptions.get("externalLinkRel"),
+      ignoreDestinationZoom: _app_options.AppOptions.get("ignoreDestinationZoom")
+    });
+    this.pdfLinkService = pdfLinkService;
+    const downloadManager = externalServices.createDownloadManager();
+    this.downloadManager = downloadManager;
+    const findController = new _pdf_find_controller.PDFFindController({
+      linkService: pdfLinkService,
+      eventBus
+    });
+    this.findController = findController;
+    const pdfScriptingManager = new _pdf_scripting_manager.PDFScriptingManager({
+      eventBus,
+      sandboxBundleSrc: _app_options.AppOptions.get("sandboxBundleSrc"),
+      scriptingFactory: externalServices,
+      docPropertiesLookup: this._scriptingDocProperties.bind(this)
+    });
+    this.pdfScriptingManager = pdfScriptingManager;
+    const container = appConfig.mainContainer,
+          viewer = appConfig.viewerContainer;
+
+    const annotationEditorMode = _app_options.AppOptions.get("annotationEditorMode");
+
+    const pageColors = _app_options.AppOptions.get("forcePageColors") || window.matchMedia("(forced-colors: active)").matches ? {
+      background: _app_options.AppOptions.get("pageColorsBackground"),
+      foreground: _app_options.AppOptions.get("pageColorsForeground")
+    } : null;
+    this.pdfViewer = new _pdf_viewer.PDFViewer({
+      container,
+      viewer,
+      eventBus,
+      renderingQueue: pdfRenderingQueue,
+      linkService: pdfLinkService,
+      downloadManager,
+      findController,
+      scriptingManager: _app_options.AppOptions.get("enableScripting") && pdfScriptingManager,
+      renderer: _app_options.AppOptions.get("renderer"),
+      l10n: this.l10n,
+      textLayerMode: _app_options.AppOptions.get("textLayerMode"),
+      annotationMode: _app_options.AppOptions.get("annotationMode"),
+      annotationEditorMode,
+      imageResourcesPath: _app_options.AppOptions.get("imageResourcesPath"),
+      enablePrintAutoRotate: _app_options.AppOptions.get("enablePrintAutoRotate"),
+      useOnlyCssZoom: _app_options.AppOptions.get("useOnlyCssZoom"),
+      maxCanvasPixels: _app_options.AppOptions.get("maxCanvasPixels"),
+      enablePermissions: _app_options.AppOptions.get("enablePermissions"),
+      pageColors
+    });
+    pdfRenderingQueue.setViewer(this.pdfViewer);
+    pdfLinkService.setViewer(this.pdfViewer);
+    pdfScriptingManager.setViewer(this.pdfViewer);
+    this.pdfThumbnailViewer = new _pdf_thumbnail_viewer.PDFThumbnailViewer({
+      container: appConfig.sidebar.thumbnailView,
+      eventBus,
+      renderingQueue: pdfRenderingQueue,
+      linkService: pdfLinkService,
+      l10n: this.l10n,
+      pageColors
+    });
+    pdfRenderingQueue.setThumbnailViewer(this.pdfThumbnailViewer);
+
+    if (!this.isViewerEmbedded && !_app_options.AppOptions.get("disableHistory")) {
+      this.pdfHistory = new _pdf_history.PDFHistory({
+        linkService: pdfLinkService,
+        eventBus
+      });
+      pdfLinkService.setHistory(this.pdfHistory);
+    }
+
+    if (!this.supportsIntegratedFind) {
+      this.findBar = new _pdf_find_bar.PDFFindBar(appConfig.findBar, eventBus, this.l10n);
+    }
+
+    if (annotationEditorMode !== _pdfjsLib.AnnotationEditorType.DISABLE) {
+      this.annotationEditorParams = new _annotation_editor_params.AnnotationEditorParams(appConfig.annotationEditorParams, eventBus);
+
+      for (const element of [document.getElementById("editorModeButtons"), document.getElementById("editorModeSeparator")]) {
+        element.classList.remove("hidden");
+      }
+    }
+
+    this.pdfDocumentProperties = new _pdf_document_properties.PDFDocumentProperties(appConfig.documentProperties, this.overlayManager, eventBus, this.l10n, () => {
+      return this._docFilename;
+    });
+    this.pdfCursorTools = new _pdf_cursor_tools.PDFCursorTools({
+      container,
+      eventBus,
+      cursorToolOnLoad: _app_options.AppOptions.get("cursorToolOnLoad")
+    });
+    this.toolbar = new _toolbar.Toolbar(appConfig.toolbar, eventBus, this.l10n);
+    this.secondaryToolbar = new _secondary_toolbar.SecondaryToolbar(appConfig.secondaryToolbar, eventBus);
+
+    if (this.supportsFullscreen) {
+      this.pdfPresentationMode = new _pdf_presentation_mode.PDFPresentationMode({
+        container,
+        pdfViewer: this.pdfViewer,
+        eventBus
+      });
+    }
+
+    this.passwordPrompt = new _password_prompt.PasswordPrompt(appConfig.passwordOverlay, this.overlayManager, this.l10n, this.isViewerEmbedded);
+    this.pdfOutlineViewer = new _pdf_outline_viewer.PDFOutlineViewer({
+      container: appConfig.sidebar.outlineView,
+      eventBus,
+      linkService: pdfLinkService
+    });
+    this.pdfAttachmentViewer = new _pdf_attachment_viewer.PDFAttachmentViewer({
+      container: appConfig.sidebar.attachmentsView,
+      eventBus,
+      downloadManager
+    });
+    this.pdfLayerViewer = new _pdf_layer_viewer.PDFLayerViewer({
+      container: appConfig.sidebar.layersView,
+      eventBus,
+      l10n: this.l10n
+    });
+    this.pdfSidebar = new _pdf_sidebar.PDFSidebar({
+      elements: appConfig.sidebar,
+      pdfViewer: this.pdfViewer,
+      pdfThumbnailViewer: this.pdfThumbnailViewer,
+      eventBus,
+      l10n: this.l10n
+    });
+    this.pdfSidebar.onToggled = this.forceRendering.bind(this);
+    this.pdfSidebarResizer = new _pdf_sidebar_resizer.PDFSidebarResizer(appConfig.sidebarResizer, eventBus, this.l10n);
+  },
+
+  run(config) {
+    this.initialize(config).then(webViewerInitialized);
+  },
+
+  get initialized() {
+    return this._initializedCapability.settled;
+  },
+
+  get initializedPromise() {
+    return this._initializedCapability.promise;
+  },
+
+  zoomIn(steps) {
+    if (this.pdfViewer.isInPresentationMode) {
+      return;
+    }
+
+    this.pdfViewer.increaseScale(steps);
+  },
+
+  zoomOut(steps) {
+    if (this.pdfViewer.isInPresentationMode) {
+      return;
+    }
+
+    this.pdfViewer.decreaseScale(steps);
+  },
+
+  zoomReset() {
+    if (this.pdfViewer.isInPresentationMode) {
+      return;
+    }
+
+    this.pdfViewer.currentScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
+  },
+
+  get pagesCount() {
+    return this.pdfDocument ? this.pdfDocument.numPages : 0;
+  },
+
+  get page() {
+    return this.pdfViewer.currentPageNumber;
+  },
+
+  set page(val) {
+    this.pdfViewer.currentPageNumber = val;
+  },
+
+  get supportsPrinting() {
+    return PDFPrintServiceFactory.instance.supportsPrinting;
+  },
+
+  get supportsFullscreen() {
+    return (0, _pdfjsLib.shadow)(this, "supportsFullscreen", document.fullscreenEnabled);
+  },
+
+  get supportsIntegratedFind() {
+    return this.externalServices.supportsIntegratedFind;
+  },
+
+  get supportsDocumentFonts() {
+    return this.externalServices.supportsDocumentFonts;
+  },
+
+  get loadingBar() {
+    const bar = new _ui_utils.ProgressBar("loadingBar");
+    return (0, _pdfjsLib.shadow)(this, "loadingBar", bar);
+  },
+
+  get supportedMouseWheelZoomModifierKeys() {
+    return this.externalServices.supportedMouseWheelZoomModifierKeys;
+  },
+
+  initPassiveLoading() {
+    throw new Error("Not implemented: initPassiveLoading");
+  },
+
+  setTitleUsingUrl(url = "", downloadUrl = null) {
+    this.url = url;
+    this.baseUrl = url.split("#")[0];
+
+    if (downloadUrl) {
+      this._downloadUrl = downloadUrl === url ? this.baseUrl : downloadUrl.split("#")[0];
+    }
+
+    let title = (0, _pdfjsLib.getPdfFilenameFromUrl)(url, "");
+
+    if (!title) {
+      try {
+        title = decodeURIComponent((0, _pdfjsLib.getFilenameFromUrl)(url)) || url;
+      } catch (ex) {
+        title = url;
+      }
+    }
+
+    this.setTitle(title);
+  },
+
+  setTitle(title = this._title) {
+    this._title = title;
+
+    if (this.isViewerEmbedded) {
+      return;
+    }
+
+    document.title = `${this._hasAnnotationEditors ? "* " : ""}${title}`;
+  },
+
+  get _docFilename() {
+    return this._contentDispositionFilename || (0, _pdfjsLib.getPdfFilenameFromUrl)(this.url);
+  },
+
+  _hideViewBookmark() {
+    const {
+      toolbar,
+      secondaryToolbar
+    } = this.appConfig;
+    toolbar.viewBookmark.hidden = true;
+    secondaryToolbar.viewBookmarkButton.hidden = true;
+  },
+
+  _cancelIdleCallbacks() {
+    if (!this._idleCallbacks.size) {
+      return;
+    }
+
+    for (const callback of this._idleCallbacks) {
+      window.cancelIdleCallback(callback);
+    }
+
+    this._idleCallbacks.clear();
+  },
+
+  async close() {
+    this._unblockDocumentLoadEvent();
+
+    this._hideViewBookmark();
+
+    const {
+      container
+    } = this.appConfig.errorWrapper;
+    container.hidden = true;
+
+    if (!this.pdfLoadingTask) {
+      return;
+    }
+
+    if (this.pdfDocument?.annotationStorage.size > 0 && this._annotationStorageModified) {
+      try {
+        await this.save();
+      } catch (reason) {}
+    }
+
+    const promises = [];
+    promises.push(this.pdfLoadingTask.destroy());
+    this.pdfLoadingTask = null;
+
+    if (this.pdfDocument) {
+      this.pdfDocument = null;
+      this.pdfThumbnailViewer.setDocument(null);
+      this.pdfViewer.setDocument(null);
+      this.pdfLinkService.setDocument(null);
+      this.pdfDocumentProperties.setDocument(null);
+    }
+
+    this.pdfLinkService.externalLinkEnabled = true;
+    this.store = null;
+    this.isInitialViewSet = false;
+    this.downloadComplete = false;
+    this.url = "";
+    this.baseUrl = "";
+    this._downloadUrl = "";
+    this.documentInfo = null;
+    this.metadata = null;
+    this._contentDispositionFilename = null;
+    this._contentLength = null;
+    this._saveInProgress = false;
+    this._docStats = null;
+    this._hasAnnotationEditors = false;
+
+    this._cancelIdleCallbacks();
+
+    promises.push(this.pdfScriptingManager.destroyPromise);
+    this.setTitle();
+    this.pdfSidebar.reset();
+    this.pdfOutlineViewer.reset();
+    this.pdfAttachmentViewer.reset();
+    this.pdfLayerViewer.reset();
+    this.pdfHistory?.reset();
+    this.findBar?.reset();
+    this.toolbar.reset();
+    this.secondaryToolbar.reset();
+    this._PDFBug?.cleanup();
+    await Promise.all(promises);
+  },
+
+  async open(file, args) {
+    if (this.pdfLoadingTask) {
+      await this.close();
+    }
+
+    const workerParameters = _app_options.AppOptions.getAll(_app_options.OptionKind.WORKER);
+
+    for (const key in workerParameters) {
+      _pdfjsLib.GlobalWorkerOptions[key] = workerParameters[key];
+    }
+
+    const parameters = Object.create(null);
+
+    if (typeof file === "string") {
+      this.setTitleUsingUrl(file, file);
+      parameters.url = file;
+    } else if (file && "byteLength" in file) {
+      parameters.data = file;
+    } else if (file.url && file.originalUrl) {
+      this.setTitleUsingUrl(file.originalUrl, file.url);
+      parameters.url = file.url;
+    }
+
+    const apiParameters = _app_options.AppOptions.getAll(_app_options.OptionKind.API);
+
+    for (const key in apiParameters) {
+      let value = apiParameters[key];
+
+      if (key === "docBaseUrl" && !value) {}
+
+      parameters[key] = value;
+    }
+
+    if (args) {
+      for (const key in args) {
+        parameters[key] = args[key];
+      }
+    }
+
+    const loadingTask = (0, _pdfjsLib.getDocument)(parameters);
+    this.pdfLoadingTask = loadingTask;
+
+    loadingTask.onPassword = (updateCallback, reason) => {
+      this.pdfLinkService.externalLinkEnabled = false;
+      this.passwordPrompt.setUpdateCallback(updateCallback, reason);
+      this.passwordPrompt.open();
+    };
+
+    loadingTask.onProgress = ({
+      loaded,
+      total
+    }) => {
+      this.progress(loaded / total);
+    };
+
+    loadingTask.onUnsupportedFeature = this.fallback.bind(this);
+    return loadingTask.promise.then(pdfDocument => {
+      this.load(pdfDocument);
+    }, reason => {
+      if (loadingTask !== this.pdfLoadingTask) {
+        return undefined;
+      }
+
+      let key = "loading_error";
+
+      if (reason instanceof _pdfjsLib.InvalidPDFException) {
+        key = "invalid_file_error";
+      } else if (reason instanceof _pdfjsLib.MissingPDFException) {
+        key = "missing_file_error";
+      } else if (reason instanceof _pdfjsLib.UnexpectedResponseException) {
+        key = "unexpected_response_error";
+      }
+
+      return this.l10n.get(key).then(msg => {
+        this._documentError(msg, {
+          message: reason?.message
+        });
+
+        throw reason;
+      });
+    });
+  },
+
+  _ensureDownloadComplete() {
+    if (this.pdfDocument && this.downloadComplete) {
+      return;
+    }
+
+    throw new Error("PDF document not downloaded.");
+  },
+
+  async download() {
+    const url = this._downloadUrl,
+          filename = this._docFilename;
+
+    try {
+      this._ensureDownloadComplete();
+
+      const data = await this.pdfDocument.getData();
+      const blob = new Blob([data], {
+        type: "application/pdf"
+      });
+      await this.downloadManager.download(blob, url, filename);
+    } catch (reason) {
+      await this.downloadManager.downloadUrl(url, filename);
+    }
+  },
+
+  async save() {
+    if (this._saveInProgress) {
+      return;
+    }
+
+    this._saveInProgress = true;
+    await this.pdfScriptingManager.dispatchWillSave();
+    const url = this._downloadUrl,
+          filename = this._docFilename;
+
+    try {
+      this._ensureDownloadComplete();
+
+      const data = await this.pdfDocument.saveDocument();
+      const blob = new Blob([data], {
+        type: "application/pdf"
+      });
+      await this.downloadManager.download(blob, url, filename);
+    } catch (reason) {
+      console.error(`Error when saving the document: ${reason.message}`);
+      await this.download();
+    } finally {
+      await this.pdfScriptingManager.dispatchDidSave();
+      this._saveInProgress = false;
+    }
+
+    if (this._hasAnnotationEditors) {
+      this.externalServices.reportTelemetry({
+        type: "editing",
+        data: {
+          type: "save"
+        }
+      });
+    }
+  },
+
+  downloadOrSave() {
+    if (this.pdfDocument?.annotationStorage.size > 0) {
+      this.save();
+    } else {
+      this.download();
+    }
+  },
+
+  fallback(featureId) {
+    this.externalServices.reportTelemetry({
+      type: "unsupportedFeature",
+      featureId
+    });
+  },
+
+  _documentError(message, moreInfo = null) {
+    this._unblockDocumentLoadEvent();
+
+    this._otherError(message, moreInfo);
+
+    this.eventBus.dispatch("documenterror", {
+      source: this,
+      message,
+      reason: moreInfo?.message ?? null
+    });
+  },
+
+  _otherError(message, moreInfo = null) {
+    const moreInfoText = [this.l10n.get("error_version_info", {
+      version: _pdfjsLib.version || "?",
+      build: _pdfjsLib.build || "?"
+    })];
+
+    if (moreInfo) {
+      moreInfoText.push(this.l10n.get("error_message", {
+        message: moreInfo.message
+      }));
+
+      if (moreInfo.stack) {
+        moreInfoText.push(this.l10n.get("error_stack", {
+          stack: moreInfo.stack
+        }));
+      } else {
+        if (moreInfo.filename) {
+          moreInfoText.push(this.l10n.get("error_file", {
+            file: moreInfo.filename
+          }));
+        }
+
+        if (moreInfo.lineNumber) {
+          moreInfoText.push(this.l10n.get("error_line", {
+            line: moreInfo.lineNumber
+          }));
+        }
+      }
+    }
+
+    const errorWrapperConfig = this.appConfig.errorWrapper;
+    const errorWrapper = errorWrapperConfig.container;
+    errorWrapper.hidden = false;
+    const errorMessage = errorWrapperConfig.errorMessage;
+    errorMessage.textContent = message;
+    const closeButton = errorWrapperConfig.closeButton;
+
+    closeButton.onclick = function () {
+      errorWrapper.hidden = true;
+    };
+
+    const errorMoreInfo = errorWrapperConfig.errorMoreInfo;
+    const moreInfoButton = errorWrapperConfig.moreInfoButton;
+    const lessInfoButton = errorWrapperConfig.lessInfoButton;
+
+    moreInfoButton.onclick = function () {
+      errorMoreInfo.hidden = false;
+      moreInfoButton.hidden = true;
+      lessInfoButton.hidden = false;
+      errorMoreInfo.style.height = errorMoreInfo.scrollHeight + "px";
+    };
+
+    lessInfoButton.onclick = function () {
+      errorMoreInfo.hidden = true;
+      moreInfoButton.hidden = false;
+      lessInfoButton.hidden = true;
+    };
+
+    moreInfoButton.oncontextmenu = _ui_utils.noContextMenuHandler;
+    lessInfoButton.oncontextmenu = _ui_utils.noContextMenuHandler;
+    closeButton.oncontextmenu = _ui_utils.noContextMenuHandler;
+    moreInfoButton.hidden = false;
+    lessInfoButton.hidden = true;
+    Promise.all(moreInfoText).then(parts => {
+      errorMoreInfo.value = parts.join("\n");
+    });
+  },
+
+  progress(level) {
+    if (this.downloadComplete) {
+      return;
+    }
+
+    const percent = Math.round(level * 100);
+
+    if (percent <= this.loadingBar.percent) {
+      return;
+    }
+
+    this.loadingBar.percent = percent;
+
+    const disableAutoFetch = this.pdfDocument?.loadingParams.disableAutoFetch ?? _app_options.AppOptions.get("disableAutoFetch");
+
+    if (!disableAutoFetch || isNaN(percent)) {
+      return;
+    }
+
+    if (this.disableAutoFetchLoadingBarTimeout) {
+      clearTimeout(this.disableAutoFetchLoadingBarTimeout);
+      this.disableAutoFetchLoadingBarTimeout = null;
+    }
+
+    this.loadingBar.show();
+    this.disableAutoFetchLoadingBarTimeout = setTimeout(() => {
+      this.loadingBar.hide();
+      this.disableAutoFetchLoadingBarTimeout = null;
+    }, DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT);
+  },
+
+  load(pdfDocument) {
+    this.pdfDocument = pdfDocument;
+    pdfDocument.getDownloadInfo().then(({
+      length
+    }) => {
+      this._contentLength = length;
+      this.downloadComplete = true;
+      this.loadingBar.hide();
+      firstPagePromise.then(() => {
+        this.eventBus.dispatch("documentloaded", {
+          source: this
+        });
+      });
+    });
+    const pageLayoutPromise = pdfDocument.getPageLayout().catch(function () {});
+    const pageModePromise = pdfDocument.getPageMode().catch(function () {});
+    const openActionPromise = pdfDocument.getOpenAction().catch(function () {});
+    this.toolbar.setPagesCount(pdfDocument.numPages, false);
+    this.secondaryToolbar.setPagesCount(pdfDocument.numPages);
+    let baseDocumentUrl;
+    baseDocumentUrl = null;
+    this.pdfLinkService.setDocument(pdfDocument, baseDocumentUrl);
+    this.pdfDocumentProperties.setDocument(pdfDocument);
+    const pdfViewer = this.pdfViewer;
+    pdfViewer.setDocument(pdfDocument);
+    const {
+      firstPagePromise,
+      onePageRendered,
+      pagesPromise
+    } = pdfViewer;
+    const pdfThumbnailViewer = this.pdfThumbnailViewer;
+    pdfThumbnailViewer.setDocument(pdfDocument);
+    const storedPromise = (this.store = new _view_history.ViewHistory(pdfDocument.fingerprints[0])).getMultiple({
+      page: null,
+      zoom: _ui_utils.DEFAULT_SCALE_VALUE,
+      scrollLeft: "0",
+      scrollTop: "0",
+      rotation: null,
+      sidebarView: _ui_utils.SidebarView.UNKNOWN,
+      scrollMode: _ui_utils.ScrollMode.UNKNOWN,
+      spreadMode: _ui_utils.SpreadMode.UNKNOWN
+    }).catch(() => {
+      return Object.create(null);
+    });
+    firstPagePromise.then(pdfPage => {
+      this.loadingBar.setWidth(this.appConfig.viewerContainer);
+
+      this._initializeAnnotationStorageCallbacks(pdfDocument);
+
+      Promise.all([_ui_utils.animationStarted, storedPromise, pageLayoutPromise, pageModePromise, openActionPromise]).then(async ([timeStamp, stored, pageLayout, pageMode, openAction]) => {
+        const viewOnLoad = _app_options.AppOptions.get("viewOnLoad");
+
+        this._initializePdfHistory({
+          fingerprint: pdfDocument.fingerprints[0],
+          viewOnLoad,
+          initialDest: openAction?.dest
+        });
+
+        const initialBookmark = this.initialBookmark;
+
+        const zoom = _app_options.AppOptions.get("defaultZoomValue");
+
+        let hash = zoom ? `zoom=${zoom}` : null;
+        let rotation = null;
+
+        let sidebarView = _app_options.AppOptions.get("sidebarViewOnLoad");
+
+        let scrollMode = _app_options.AppOptions.get("scrollModeOnLoad");
+
+        let spreadMode = _app_options.AppOptions.get("spreadModeOnLoad");
+
+        if (stored.page && viewOnLoad !== ViewOnLoad.INITIAL) {
+          hash = `page=${stored.page}&zoom=${zoom || stored.zoom},` + `${stored.scrollLeft},${stored.scrollTop}`;
+          rotation = parseInt(stored.rotation, 10);
+
+          if (sidebarView === _ui_utils.SidebarView.UNKNOWN) {
+            sidebarView = stored.sidebarView | 0;
+          }
+
+          if (scrollMode === _ui_utils.ScrollMode.UNKNOWN) {
+            scrollMode = stored.scrollMode | 0;
+          }
+
+          if (spreadMode === _ui_utils.SpreadMode.UNKNOWN) {
+            spreadMode = stored.spreadMode | 0;
+          }
+        }
+
+        if (pageMode && sidebarView === _ui_utils.SidebarView.UNKNOWN) {
+          sidebarView = (0, _ui_utils.apiPageModeToSidebarView)(pageMode);
+        }
+
+        if (pageLayout && scrollMode === _ui_utils.ScrollMode.UNKNOWN && spreadMode === _ui_utils.SpreadMode.UNKNOWN) {
+          const modes = (0, _ui_utils.apiPageLayoutToViewerModes)(pageLayout);
+          spreadMode = modes.spreadMode;
+        }
+
+        this.setInitialView(hash, {
+          rotation,
+          sidebarView,
+          scrollMode,
+          spreadMode
+        });
+        this.eventBus.dispatch("documentinit", {
+          source: this
+        });
+
+        if (!this.isViewerEmbedded) {
+          pdfViewer.focus();
+        }
+
+        await Promise.race([pagesPromise, new Promise(resolve => {
+          setTimeout(resolve, FORCE_PAGES_LOADED_TIMEOUT);
+        })]);
+
+        if (!initialBookmark && !hash) {
+          return;
+        }
+
+        if (pdfViewer.hasEqualPageSizes) {
+          return;
+        }
+
+        this.initialBookmark = initialBookmark;
+        pdfViewer.currentScaleValue = pdfViewer.currentScaleValue;
+        this.setInitialView(hash);
+      }).catch(() => {
+        this.setInitialView();
+      }).then(function () {
+        pdfViewer.update();
+      });
+    });
+    pagesPromise.then(() => {
+      this._unblockDocumentLoadEvent();
+
+      this._initializeAutoPrint(pdfDocument, openActionPromise);
+    }, reason => {
+      this.l10n.get("loading_error").then(msg => {
+        this._documentError(msg, {
+          message: reason?.message
+        });
+      });
+    });
+    onePageRendered.then(data => {
+      this.externalServices.reportTelemetry({
+        type: "pageInfo",
+        timestamp: data.timestamp
+      });
+      pdfDocument.getOutline().then(outline => {
+        if (pdfDocument !== this.pdfDocument) {
+          return;
+        }
+
+        this.pdfOutlineViewer.render({
+          outline,
+          pdfDocument
+        });
+      });
+      pdfDocument.getAttachments().then(attachments => {
+        if (pdfDocument !== this.pdfDocument) {
+          return;
+        }
+
+        this.pdfAttachmentViewer.render({
+          attachments
+        });
+      });
+      pdfViewer.optionalContentConfigPromise.then(optionalContentConfig => {
+        if (pdfDocument !== this.pdfDocument) {
+          return;
+        }
+
+        this.pdfLayerViewer.render({
+          optionalContentConfig,
+          pdfDocument
+        });
+      });
+
+      if ("requestIdleCallback" in window) {
+        const callback = window.requestIdleCallback(() => {
+          this._collectTelemetry(pdfDocument);
+
+          this._idleCallbacks.delete(callback);
+        }, {
+          timeout: 1000
+        });
+
+        this._idleCallbacks.add(callback);
+      }
+    });
+
+    this._initializePageLabels(pdfDocument);
+
+    this._initializeMetadata(pdfDocument);
+  },
+
+  async _scriptingDocProperties(pdfDocument) {
+    if (!this.documentInfo) {
+      await new Promise(resolve => {
+        this.eventBus._on("metadataloaded", resolve, {
+          once: true
+        });
+      });
+
+      if (pdfDocument !== this.pdfDocument) {
+        return null;
+      }
+    }
+
+    if (!this._contentLength) {
+      await new Promise(resolve => {
+        this.eventBus._on("documentloaded", resolve, {
+          once: true
+        });
+      });
+
+      if (pdfDocument !== this.pdfDocument) {
+        return null;
+      }
+    }
+
+    return { ...this.documentInfo,
+      baseURL: this.baseUrl,
+      filesize: this._contentLength,
+      filename: this._docFilename,
+      metadata: this.metadata?.getRaw(),
+      authors: this.metadata?.get("dc:creator"),
+      numPages: this.pagesCount,
+      URL: this.url
+    };
+  },
+
+  async _collectTelemetry(pdfDocument) {
+    const markInfo = await this.pdfDocument.getMarkInfo();
+
+    if (pdfDocument !== this.pdfDocument) {
+      return;
+    }
+
+    const tagged = markInfo?.Marked || false;
+    this.externalServices.reportTelemetry({
+      type: "tagged",
+      tagged
+    });
+  },
+
+  async _initializeAutoPrint(pdfDocument, openActionPromise) {
+    const [openAction, javaScript] = await Promise.all([openActionPromise, !this.pdfViewer.enableScripting ? pdfDocument.getJavaScript() : null]);
+
+    if (pdfDocument !== this.pdfDocument) {
+      return;
+    }
+
+    let triggerAutoPrint = false;
+
+    if (openAction?.action === "Print") {
+      triggerAutoPrint = true;
+    }
+
+    if (javaScript) {
+      javaScript.some(js => {
+        if (!js) {
+          return false;
+        }
+
+        console.warn("Warning: JavaScript support is not enabled");
+        this.fallback(_pdfjsLib.UNSUPPORTED_FEATURES.javaScript);
+        return true;
+      });
+
+      if (!triggerAutoPrint) {
+        for (const js of javaScript) {
+          if (js && _ui_utils.AutoPrintRegExp.test(js)) {
+            triggerAutoPrint = true;
+            break;
+          }
+        }
+      }
+    }
+
+    if (triggerAutoPrint) {
+      this.triggerPrinting();
+    }
+  },
+
+  async _initializeMetadata(pdfDocument) {
+    const {
+      info,
+      metadata,
+      contentDispositionFilename,
+      contentLength
+    } = await pdfDocument.getMetadata();
+
+    if (pdfDocument !== this.pdfDocument) {
+      return;
+    }
+
+    this.documentInfo = info;
+    this.metadata = metadata;
+    this._contentDispositionFilename ??= contentDispositionFilename;
+    this._contentLength ??= contentLength;
+    console.log(`PDF ${pdfDocument.fingerprints[0]} [${info.PDFFormatVersion} ` + `${(info.Producer || "-").trim()} / ${(info.Creator || "-").trim()}] ` + `(PDF.js: ${_pdfjsLib.version || "-"})`);
+    let pdfTitle = info.Title;
+    const metadataTitle = metadata?.get("dc:title");
+
+    if (metadataTitle) {
+      if (metadataTitle !== "Untitled" && !/[\uFFF0-\uFFFF]/g.test(metadataTitle)) {
+        pdfTitle = metadataTitle;
+      }
+    }
+
+    if (pdfTitle) {
+      this.setTitle(`${pdfTitle} - ${this._contentDispositionFilename || this._title}`);
+    } else if (this._contentDispositionFilename) {
+      this.setTitle(this._contentDispositionFilename);
+    }
+
+    if (info.IsXFAPresent && !info.IsAcroFormPresent && !pdfDocument.isPureXfa) {
+      if (pdfDocument.loadingParams.enableXfa) {
+        console.warn("Warning: XFA Foreground documents are not supported");
+      } else {
+        console.warn("Warning: XFA support is not enabled");
+      }
+
+      this.fallback(_pdfjsLib.UNSUPPORTED_FEATURES.forms);
+    } else if ((info.IsAcroFormPresent || info.IsXFAPresent) && !this.pdfViewer.renderForms) {
+      console.warn("Warning: Interactive form support is not enabled");
+      this.fallback(_pdfjsLib.UNSUPPORTED_FEATURES.forms);
+    }
+
+    if (info.IsSignaturesPresent) {
+      console.warn("Warning: Digital signatures validation is not supported");
+      this.fallback(_pdfjsLib.UNSUPPORTED_FEATURES.signatures);
+    }
+
+    let versionId = "other";
+
+    if (KNOWN_VERSIONS.includes(info.PDFFormatVersion)) {
+      versionId = `v${info.PDFFormatVersion.replace(".", "_")}`;
+    }
+
+    let generatorId = "other";
+
+    if (info.Producer) {
+      const producer = info.Producer.toLowerCase();
+      KNOWN_GENERATORS.some(function (generator) {
+        if (!producer.includes(generator)) {
+          return false;
+        }
+
+        generatorId = generator.replace(/[ .-]/g, "_");
+        return true;
+      });
+    }
+
+    let formType = null;
+
+    if (info.IsXFAPresent) {
+      formType = "xfa";
+    } else if (info.IsAcroFormPresent) {
+      formType = "acroform";
+    }
+
+    this.externalServices.reportTelemetry({
+      type: "documentInfo",
+      version: versionId,
+      generator: generatorId,
+      formType
+    });
+    this.eventBus.dispatch("metadataloaded", {
+      source: this
+    });
+  },
+
+  async _initializePageLabels(pdfDocument) {
+    const labels = await pdfDocument.getPageLabels();
+
+    if (pdfDocument !== this.pdfDocument) {
+      return;
+    }
+
+    if (!labels || _app_options.AppOptions.get("disablePageLabels")) {
+      return;
+    }
+
+    const numLabels = labels.length;
+    let standardLabels = 0,
+        emptyLabels = 0;
+
+    for (let i = 0; i < numLabels; i++) {
+      const label = labels[i];
+
+      if (label === (i + 1).toString()) {
+        standardLabels++;
+      } else if (label === "") {
+        emptyLabels++;
+      } else {
+        break;
+      }
+    }
+
+    if (standardLabels >= numLabels || emptyLabels >= numLabels) {
+      return;
+    }
+
+    const {
+      pdfViewer,
+      pdfThumbnailViewer,
+      toolbar
+    } = this;
+    pdfViewer.setPageLabels(labels);
+    pdfThumbnailViewer.setPageLabels(labels);
+    toolbar.setPagesCount(numLabels, true);
+    toolbar.setPageNumber(pdfViewer.currentPageNumber, pdfViewer.currentPageLabel);
+  },
+
+  _initializePdfHistory({
+    fingerprint,
+    viewOnLoad,
+    initialDest = null
+  }) {
+    if (!this.pdfHistory) {
+      return;
+    }
+
+    this.pdfHistory.initialize({
+      fingerprint,
+      resetHistory: viewOnLoad === ViewOnLoad.INITIAL,
+      updateUrl: _app_options.AppOptions.get("historyUpdateUrl")
+    });
+
+    if (this.pdfHistory.initialBookmark) {
+      this.initialBookmark = this.pdfHistory.initialBookmark;
+      this.initialRotation = this.pdfHistory.initialRotation;
+    }
+
+    if (initialDest && !this.initialBookmark && viewOnLoad === ViewOnLoad.UNKNOWN) {
+      this.initialBookmark = JSON.stringify(initialDest);
+      this.pdfHistory.push({
+        explicitDest: initialDest,
+        pageNumber: null
+      });
+    }
+  },
+
+  _initializeAnnotationStorageCallbacks(pdfDocument) {
+    if (pdfDocument !== this.pdfDocument) {
+      return;
+    }
+
+    const {
+      annotationStorage
+    } = pdfDocument;
+
+    annotationStorage.onSetModified = () => {
+      window.addEventListener("beforeunload", beforeUnload);
+      this._annotationStorageModified = true;
+    };
+
+    annotationStorage.onResetModified = () => {
+      window.removeEventListener("beforeunload", beforeUnload);
+      delete this._annotationStorageModified;
+    };
+
+    annotationStorage.onAnnotationEditor = typeStr => {
+      this._hasAnnotationEditors = !!typeStr;
+      this.setTitle();
+
+      if (typeStr) {
+        this.externalServices.reportTelemetry({
+          type: "editing",
+          data: {
+            type: typeStr
+          }
+        });
+      }
+    };
+  },
+
+  setInitialView(storedHash, {
+    rotation,
+    sidebarView,
+    scrollMode,
+    spreadMode
+  } = {}) {
+    const setRotation = angle => {
+      if ((0, _ui_utils.isValidRotation)(angle)) {
+        this.pdfViewer.pagesRotation = angle;
+      }
+    };
+
+    const setViewerModes = (scroll, spread) => {
+      if ((0, _ui_utils.isValidScrollMode)(scroll)) {
+        this.pdfViewer.scrollMode = scroll;
+      }
+
+      if ((0, _ui_utils.isValidSpreadMode)(spread)) {
+        this.pdfViewer.spreadMode = spread;
+      }
+    };
+
+    this.isInitialViewSet = true;
+    this.pdfSidebar.setInitialView(sidebarView);
+    setViewerModes(scrollMode, spreadMode);
+
+    if (this.initialBookmark) {
+      setRotation(this.initialRotation);
+      delete this.initialRotation;
+      this.pdfLinkService.setHash(this.initialBookmark);
+      this.initialBookmark = null;
+    } else if (storedHash) {
+      setRotation(rotation);
+      this.pdfLinkService.setHash(storedHash);
+    }
+
+    this.toolbar.setPageNumber(this.pdfViewer.currentPageNumber, this.pdfViewer.currentPageLabel);
+    this.secondaryToolbar.setPageNumber(this.pdfViewer.currentPageNumber);
+
+    if (!this.pdfViewer.currentScaleValue) {
+      this.pdfViewer.currentScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
+    }
+  },
+
+  _cleanup() {
+    if (!this.pdfDocument) {
+      return;
+    }
+
+    this.pdfViewer.cleanup();
+    this.pdfThumbnailViewer.cleanup();
+    this.pdfDocument.cleanup(this.pdfViewer.renderer === _ui_utils.RendererType.SVG);
+  },
+
+  forceRendering() {
+    this.pdfRenderingQueue.printing = !!this.printService;
+    this.pdfRenderingQueue.isThumbnailViewEnabled = this.pdfSidebar.visibleView === _ui_utils.SidebarView.THUMBS;
+    this.pdfRenderingQueue.renderHighestPriority();
+  },
+
+  beforePrint() {
+    this._printAnnotationStoragePromise = this.pdfScriptingManager.dispatchWillPrint().catch(() => {}).then(() => {
+      return this.pdfDocument?.annotationStorage.print;
+    });
+
+    if (this.printService) {
+      return;
+    }
+
+    if (!this.supportsPrinting) {
+      this.l10n.get("printing_not_supported").then(msg => {
+        this._otherError(msg);
+      });
+      return;
+    }
+
+    if (!this.pdfViewer.pageViewsReady) {
+      this.l10n.get("printing_not_ready").then(msg => {
+        window.alert(msg);
+      });
+      return;
+    }
+
+    const pagesOverview = this.pdfViewer.getPagesOverview();
+    const printContainer = this.appConfig.printContainer;
+
+    const printResolution = _app_options.AppOptions.get("printResolution");
+
+    const optionalContentConfigPromise = this.pdfViewer.optionalContentConfigPromise;
+    const printService = PDFPrintServiceFactory.instance.createPrintService(this.pdfDocument, pagesOverview, printContainer, printResolution, optionalContentConfigPromise, this._printAnnotationStoragePromise, this.l10n);
+    this.printService = printService;
+    this.forceRendering();
+    printService.layout();
+    this.externalServices.reportTelemetry({
+      type: "print"
+    });
+
+    if (this._hasAnnotationEditors) {
+      this.externalServices.reportTelemetry({
+        type: "editing",
+        data: {
+          type: "print"
+        }
+      });
+    }
+  },
+
+  afterPrint() {
+    if (this._printAnnotationStoragePromise) {
+      this._printAnnotationStoragePromise.then(() => {
+        this.pdfScriptingManager.dispatchDidPrint();
+      });
+
+      this._printAnnotationStoragePromise = null;
+    }
+
+    if (this.printService) {
+      this.printService.destroy();
+      this.printService = null;
+      this.pdfDocument?.annotationStorage.resetModified();
+    }
+
+    this.forceRendering();
+  },
+
+  rotatePages(delta) {
+    this.pdfViewer.pagesRotation += delta;
+  },
+
+  requestPresentationMode() {
+    this.pdfPresentationMode?.request();
+  },
+
+  triggerPrinting() {
+    if (!this.supportsPrinting) {
+      return;
+    }
+
+    window.print();
+  },
+
+  bindEvents() {
+    const {
+      eventBus,
+      _boundEvents
+    } = this;
+    _boundEvents.beforePrint = this.beforePrint.bind(this);
+    _boundEvents.afterPrint = this.afterPrint.bind(this);
+
+    eventBus._on("resize", webViewerResize);
+
+    eventBus._on("hashchange", webViewerHashchange);
+
+    eventBus._on("beforeprint", _boundEvents.beforePrint);
+
+    eventBus._on("afterprint", _boundEvents.afterPrint);
+
+    eventBus._on("pagerendered", webViewerPageRendered);
+
+    eventBus._on("updateviewarea", webViewerUpdateViewarea);
+
+    eventBus._on("pagechanging", webViewerPageChanging);
+
+    eventBus._on("scalechanging", webViewerScaleChanging);
+
+    eventBus._on("rotationchanging", webViewerRotationChanging);
+
+    eventBus._on("sidebarviewchanged", webViewerSidebarViewChanged);
+
+    eventBus._on("pagemode", webViewerPageMode);
+
+    eventBus._on("namedaction", webViewerNamedAction);
+
+    eventBus._on("presentationmodechanged", webViewerPresentationModeChanged);
+
+    eventBus._on("presentationmode", webViewerPresentationMode);
+
+    eventBus._on("switchannotationeditormode", webViewerSwitchAnnotationEditorMode);
+
+    eventBus._on("switchannotationeditorparams", webViewerSwitchAnnotationEditorParams);
+
+    eventBus._on("print", webViewerPrint);
+
+    eventBus._on("download", webViewerDownload);
+
+    eventBus._on("firstpage", webViewerFirstPage);
+
+    eventBus._on("lastpage", webViewerLastPage);
+
+    eventBus._on("nextpage", webViewerNextPage);
+
+    eventBus._on("previouspage", webViewerPreviousPage);
+
+    eventBus._on("zoomin", webViewerZoomIn);
+
+    eventBus._on("zoomout", webViewerZoomOut);
+
+    eventBus._on("zoomreset", webViewerZoomReset);
+
+    eventBus._on("pagenumberchanged", webViewerPageNumberChanged);
+
+    eventBus._on("scalechanged", webViewerScaleChanged);
+
+    eventBus._on("rotatecw", webViewerRotateCw);
+
+    eventBus._on("rotateccw", webViewerRotateCcw);
+
+    eventBus._on("optionalcontentconfig", webViewerOptionalContentConfig);
+
+    eventBus._on("switchscrollmode", webViewerSwitchScrollMode);
+
+    eventBus._on("scrollmodechanged", webViewerScrollModeChanged);
+
+    eventBus._on("switchspreadmode", webViewerSwitchSpreadMode);
+
+    eventBus._on("spreadmodechanged", webViewerSpreadModeChanged);
+
+    eventBus._on("documentproperties", webViewerDocumentProperties);
+
+    eventBus._on("findfromurlhash", webViewerFindFromUrlHash);
+
+    eventBus._on("updatefindmatchescount", webViewerUpdateFindMatchesCount);
+
+    eventBus._on("updatefindcontrolstate", webViewerUpdateFindControlState);
+
+    if (_app_options.AppOptions.get("pdfBug")) {
+      _boundEvents.reportPageStatsPDFBug = reportPageStatsPDFBug;
+
+      eventBus._on("pagerendered", _boundEvents.reportPageStatsPDFBug);
+
+      eventBus._on("pagechanging", _boundEvents.reportPageStatsPDFBug);
+    }
+
+    // eventBus._on("fileinputchange", webViewerFileInputChange);
+
+    // eventBus._on("openfile", webViewerOpenFile);
+  },
+
+  bindWindowEvents() {
+    const {
+      eventBus,
+      _boundEvents
+    } = this;
+
+    function addWindowResolutionChange(evt = null) {
+      if (evt) {
+        webViewerResolutionChange(evt);
+      }
+
+      const mediaQueryList = window.matchMedia(`(resolution: ${window.devicePixelRatio || 1}dppx)`);
+      mediaQueryList.addEventListener("change", addWindowResolutionChange, {
+        once: true
+      });
+
+      _boundEvents.removeWindowResolutionChange ||= function () {
+        mediaQueryList.removeEventListener("change", addWindowResolutionChange);
+        _boundEvents.removeWindowResolutionChange = null;
+      };
+    }
+
+    addWindowResolutionChange();
+
+    _boundEvents.windowResize = () => {
+      eventBus.dispatch("resize", {
+        source: window
+      });
+    };
+
+    _boundEvents.windowHashChange = () => {
+      eventBus.dispatch("hashchange", {
+        source: window,
+        hash: document.location.hash.substring(1)
+      });
+    };
+
+    _boundEvents.windowBeforePrint = () => {
+      eventBus.dispatch("beforeprint", {
+        source: window
+      });
+    };
+
+    _boundEvents.windowAfterPrint = () => {
+      eventBus.dispatch("afterprint", {
+        source: window
+      });
+    };
+
+    _boundEvents.windowUpdateFromSandbox = event => {
+      eventBus.dispatch("updatefromsandbox", {
+        source: window,
+        detail: event.detail
+      });
+    };
+
+    window.addEventListener("visibilitychange", webViewerVisibilityChange);
+    window.addEventListener("wheel", webViewerWheel, {
+      passive: false
+    });
+    window.addEventListener("touchstart", webViewerTouchStart, {
+      passive: false
+    });
+    window.addEventListener("click", webViewerClick);
+    window.addEventListener("keydown", webViewerKeyDown);
+    window.addEventListener("resize", _boundEvents.windowResize);
+    window.addEventListener("hashchange", _boundEvents.windowHashChange);
+    window.addEventListener("beforeprint", _boundEvents.windowBeforePrint);
+    window.addEventListener("afterprint", _boundEvents.windowAfterPrint);
+    window.addEventListener("updatefromsandbox", _boundEvents.windowUpdateFromSandbox);
+  },
+
+  unbindEvents() {
+    const {
+      eventBus,
+      _boundEvents
+    } = this;
+
+    eventBus._off("resize", webViewerResize);
+
+    eventBus._off("hashchange", webViewerHashchange);
+
+    eventBus._off("beforeprint", _boundEvents.beforePrint);
+
+    eventBus._off("afterprint", _boundEvents.afterPrint);
+
+    eventBus._off("pagerendered", webViewerPageRendered);
+
+    eventBus._off("updateviewarea", webViewerUpdateViewarea);
+
+    eventBus._off("pagechanging", webViewerPageChanging);
+
+    eventBus._off("scalechanging", webViewerScaleChanging);
+
+    eventBus._off("rotationchanging", webViewerRotationChanging);
+
+    eventBus._off("sidebarviewchanged", webViewerSidebarViewChanged);
+
+    eventBus._off("pagemode", webViewerPageMode);
+
+    eventBus._off("namedaction", webViewerNamedAction);
+
+    eventBus._off("presentationmodechanged", webViewerPresentationModeChanged);
+
+    eventBus._off("presentationmode", webViewerPresentationMode);
+
+    eventBus._off("print", webViewerPrint);
+
+    eventBus._off("download", webViewerDownload);
+
+    eventBus._off("firstpage", webViewerFirstPage);
+
+    eventBus._off("lastpage", webViewerLastPage);
+
+    eventBus._off("nextpage", webViewerNextPage);
+
+    eventBus._off("previouspage", webViewerPreviousPage);
+
+    eventBus._off("zoomin", webViewerZoomIn);
+
+    eventBus._off("zoomout", webViewerZoomOut);
+
+    eventBus._off("zoomreset", webViewerZoomReset);
+
+    eventBus._off("pagenumberchanged", webViewerPageNumberChanged);
+
+    eventBus._off("scalechanged", webViewerScaleChanged);
+
+    eventBus._off("rotatecw", webViewerRotateCw);
+
+    eventBus._off("rotateccw", webViewerRotateCcw);
+
+    eventBus._off("optionalcontentconfig", webViewerOptionalContentConfig);
+
+    eventBus._off("switchscrollmode", webViewerSwitchScrollMode);
+
+    eventBus._off("scrollmodechanged", webViewerScrollModeChanged);
+
+    eventBus._off("switchspreadmode", webViewerSwitchSpreadMode);
+
+    eventBus._off("spreadmodechanged", webViewerSpreadModeChanged);
+
+    eventBus._off("documentproperties", webViewerDocumentProperties);
+
+    eventBus._off("findfromurlhash", webViewerFindFromUrlHash);
+
+    eventBus._off("updatefindmatchescount", webViewerUpdateFindMatchesCount);
+
+    eventBus._off("updatefindcontrolstate", webViewerUpdateFindControlState);
+
+    if (_boundEvents.reportPageStatsPDFBug) {
+      eventBus._off("pagerendered", _boundEvents.reportPageStatsPDFBug);
+
+      eventBus._off("pagechanging", _boundEvents.reportPageStatsPDFBug);
+
+      _boundEvents.reportPageStatsPDFBug = null;
+    }
+
+    eventBus._off("fileinputchange", webViewerFileInputChange);
+
+    eventBus._off("openfile", webViewerOpenFile);
+
+    _boundEvents.beforePrint = null;
+    _boundEvents.afterPrint = null;
+  },
+
+  unbindWindowEvents() {
+    const {
+      _boundEvents
+    } = this;
+    window.removeEventListener("visibilitychange", webViewerVisibilityChange);
+    window.removeEventListener("wheel", webViewerWheel, {
+      passive: false
+    });
+    window.removeEventListener("touchstart", webViewerTouchStart, {
+      passive: false
+    });
+    window.removeEventListener("click", webViewerClick);
+    window.removeEventListener("keydown", webViewerKeyDown);
+    window.removeEventListener("resize", _boundEvents.windowResize);
+    window.removeEventListener("hashchange", _boundEvents.windowHashChange);
+    window.removeEventListener("beforeprint", _boundEvents.windowBeforePrint);
+    window.removeEventListener("afterprint", _boundEvents.windowAfterPrint);
+    window.removeEventListener("updatefromsandbox", _boundEvents.windowUpdateFromSandbox);
+    _boundEvents.removeWindowResolutionChange?.();
+    _boundEvents.windowResize = null;
+    _boundEvents.windowHashChange = null;
+    _boundEvents.windowBeforePrint = null;
+    _boundEvents.windowAfterPrint = null;
+    _boundEvents.windowUpdateFromSandbox = null;
+  },
+
+  accumulateWheelTicks(ticks) {
+    if (this._wheelUnusedTicks > 0 && ticks < 0 || this._wheelUnusedTicks < 0 && ticks > 0) {
+      this._wheelUnusedTicks = 0;
+    }
+
+    this._wheelUnusedTicks += ticks;
+    const wholeTicks = Math.sign(this._wheelUnusedTicks) * Math.floor(Math.abs(this._wheelUnusedTicks));
+    this._wheelUnusedTicks -= wholeTicks;
+    return wholeTicks;
+  },
+
+  _unblockDocumentLoadEvent() {
+    document.blockUnblockOnload?.(false);
+
+    this._unblockDocumentLoadEvent = () => {};
+  },
+
+  _reportDocumentStatsTelemetry() {
+    const {
+      stats
+    } = this.pdfDocument;
+
+    if (stats !== this._docStats) {
+      this._docStats = stats;
+      this.externalServices.reportTelemetry({
+        type: "documentStats",
+        stats
+      });
+    }
+  },
+
+  get scriptingReady() {
+    return this.pdfScriptingManager.ready;
+  }
+
+};
+exports.PDFViewerApplication = PDFViewerApplication;
+let validateFileURL;
+{
+  const HOSTED_VIEWER_ORIGINS = ["null", "http://mozilla.github.io", "https://mozilla.github.io"];
+
+  validateFileURL = function (file) {
+    if (!file) {
+      return;
+    }
+
+    try {
+      const viewerOrigin = new URL(window.location.href).origin || "null";
+
+      if (HOSTED_VIEWER_ORIGINS.includes(viewerOrigin)) {
+        return;
+      }
+
+      const fileOrigin = new URL(file, window.location.href).origin;
+
+      if (fileOrigin !== viewerOrigin) {
+        throw new Error("file origin does not match viewer's");
+      }
+    } catch (ex) {
+      PDFViewerApplication.l10n.get("loading_error").then(msg => {
+        PDFViewerApplication._documentError(msg, {
+          message: ex?.message
+        });
+      });
+      throw ex;
+    }
+  };
+}
+
+async function loadFakeWorker() {
+  _pdfjsLib.GlobalWorkerOptions.workerSrc ||= _app_options.AppOptions.get("workerSrc");
+  await (0, _pdfjsLib.loadScript)(_pdfjsLib.PDFWorker.workerSrc);
+}
+
+async function loadPDFBug(self) {
+  const {
+    debuggerScriptPath
+  } = self.appConfig;
+  const {
+    PDFBug
+  } = await import(debuggerScriptPath);
+  self._PDFBug = PDFBug;
+}
+
+function reportPageStatsPDFBug({
+  pageNumber
+}) {
+  if (!globalThis.Stats?.enabled) {
+    return;
+  }
+
+  const pageView = PDFViewerApplication.pdfViewer.getPageView(pageNumber - 1);
+  globalThis.Stats.add(pageNumber, pageView?.pdfPage?.stats);
+}
+
+function webViewerInitialized() {
+  const {
+    appConfig,
+    eventBus
+  } = PDFViewerApplication;
+  let file;
+  const queryString = document.location.search.substring(1);
+  const params = (0, _ui_utils.parseQueryString)(queryString);
+  file = params.get("file") ?? _app_options.AppOptions.get("defaultUrl");
+  validateFileURL(file);
+  /*const fileInput = appConfig.openFileInput;
+  fileInput.value = null;
+  fileInput.addEventListener("change", function (evt) {
+    const {
+      files
+    } = evt.target;
+
+    if (!files || files.length === 0) {
+      return;
+    }
+
+    eventBus.dispatch("fileinputchange", {
+      source: this,
+      fileInput: evt.target
+    });
+  });*/
+  appConfig.mainContainer.addEventListener("dragover", function (evt) {
+    evt.preventDefault();
+    evt.dataTransfer.dropEffect = evt.dataTransfer.effectAllowed === "copy" ? "copy" : "move";
+  });
+  appConfig.mainContainer.addEventListener("drop", function (evt) {
+    evt.preventDefault();
+    const {
+      files
+    } = evt.dataTransfer;
+
+    if (!files || files.length === 0) {
+      return;
+    }
+
+    /*eventBus.dispatch("fileinputchange", {
+      source: this,
+      fileInput: evt.dataTransfer
+    });*/
+  });
+
+  if (!PDFViewerApplication.supportsDocumentFonts) {
+    _app_options.AppOptions.set("disableFontFace", true);
+
+    PDFViewerApplication.l10n.get("web_fonts_disabled").then(msg => {
+      console.warn(msg);
+    });
+  }
+
+  if (!PDFViewerApplication.supportsPrinting) {
+    appConfig.toolbar.print.classList.add("hidden");
+    appConfig.secondaryToolbar.printButton.classList.add("hidden");
+  }
+
+  if (!PDFViewerApplication.supportsFullscreen) {
+    appConfig.toolbar.presentationModeButton.classList.add("hidden");
+    appConfig.secondaryToolbar.presentationModeButton.classList.add("hidden");
+  }
+
+  if (PDFViewerApplication.supportsIntegratedFind) {
+    appConfig.toolbar.viewFind.classList.add("hidden");
+  }
+
+  appConfig.mainContainer.addEventListener("transitionend", function (evt) {
+    if (evt.target === this) {
+      eventBus.dispatch("resize", {
+        source: this
+      });
+    }
+  }, true);
+
+  try {
+    if (file) {
+      PDFViewerApplication.open(file);
+    } else {
+      PDFViewerApplication._hideViewBookmark();
+    }
+  } catch (reason) {
+    PDFViewerApplication.l10n.get("loading_error").then(msg => {
+      PDFViewerApplication._documentError(msg, reason);
+    });
+  }
+}
+
+function webViewerPageRendered({
+  pageNumber,
+  error
+}) {
+  if (pageNumber === PDFViewerApplication.page) {
+    PDFViewerApplication.toolbar.updateLoadingIndicatorState(false);
+  }
+
+  if (PDFViewerApplication.pdfSidebar.visibleView === _ui_utils.SidebarView.THUMBS) {
+    const pageView = PDFViewerApplication.pdfViewer.getPageView(pageNumber - 1);
+    const thumbnailView = PDFViewerApplication.pdfThumbnailViewer.getThumbnail(pageNumber - 1);
+
+    if (pageView && thumbnailView) {
+      thumbnailView.setImage(pageView);
+    }
+  }
+
+  if (error) {
+    PDFViewerApplication.l10n.get("rendering_error").then(msg => {
+      PDFViewerApplication._otherError(msg, error);
+    });
+  }
+
+  PDFViewerApplication._reportDocumentStatsTelemetry();
+}
+
+function webViewerPageMode({
+  mode
+}) {
+  let view;
+
+  switch (mode) {
+    case "thumbs":
+      view = _ui_utils.SidebarView.THUMBS;
+      break;
+
+    case "bookmarks":
+    case "outline":
+      view = _ui_utils.SidebarView.OUTLINE;
+      break;
+
+    case "attachments":
+      view = _ui_utils.SidebarView.ATTACHMENTS;
+      break;
+
+    case "layers":
+      view = _ui_utils.SidebarView.LAYERS;
+      break;
+
+    case "none":
+      view = _ui_utils.SidebarView.NONE;
+      break;
+
+    default:
+      console.error('Invalid "pagemode" hash parameter: ' + mode);
+      return;
+  }
+
+  PDFViewerApplication.pdfSidebar.switchView(view, true);
+}
+
+function webViewerNamedAction(evt) {
+  switch (evt.action) {
+    case "GoToPage":
+      PDFViewerApplication.appConfig.toolbar.pageNumber.select();
+      break;
+
+    case "Find":
+      if (!PDFViewerApplication.supportsIntegratedFind) {
+        PDFViewerApplication.findBar.toggle();
+      }
+
+      break;
+
+    case "Print":
+      PDFViewerApplication.triggerPrinting();
+      break;
+
+    case "SaveAs":
+      PDFViewerApplication.downloadOrSave();
+      break;
+  }
+}
+
+function webViewerPresentationModeChanged(evt) {
+  PDFViewerApplication.pdfViewer.presentationModeState = evt.state;
+}
+
+function webViewerSidebarViewChanged({
+  view
+}) {
+  PDFViewerApplication.pdfRenderingQueue.isThumbnailViewEnabled = view === _ui_utils.SidebarView.THUMBS;
+
+  if (PDFViewerApplication.isInitialViewSet) {
+    PDFViewerApplication.store?.set("sidebarView", view).catch(() => {});
+  }
+}
+
+function webViewerUpdateViewarea({
+  location
+}) {
+  if (PDFViewerApplication.isInitialViewSet) {
+    PDFViewerApplication.store?.setMultiple({
+      page: location.pageNumber,
+      zoom: location.scale,
+      scrollLeft: location.left,
+      scrollTop: location.top,
+      rotation: location.rotation
+    }).catch(() => {});
+  }
+
+  const href = PDFViewerApplication.pdfLinkService.getAnchorUrl(location.pdfOpenParams);
+  PDFViewerApplication.appConfig.toolbar.viewBookmark.href = href;
+  PDFViewerApplication.appConfig.secondaryToolbar.viewBookmarkButton.href = href;
+  const currentPage = PDFViewerApplication.pdfViewer.getPageView(PDFViewerApplication.page - 1);
+  const loading = currentPage?.renderingState !== _ui_utils.RenderingStates.FINISHED;
+  PDFViewerApplication.toolbar.updateLoadingIndicatorState(loading);
+}
+
+function webViewerScrollModeChanged(evt) {
+  if (PDFViewerApplication.isInitialViewSet) {
+    PDFViewerApplication.store?.set("scrollMode", evt.mode).catch(() => {});
+  }
+}
+
+function webViewerSpreadModeChanged(evt) {
+  if (PDFViewerApplication.isInitialViewSet) {
+    PDFViewerApplication.store?.set("spreadMode", evt.mode).catch(() => {});
+  }
+}
+
+function webViewerResize() {
+  const {
+    pdfDocument,
+    pdfViewer,
+    pdfRenderingQueue
+  } = PDFViewerApplication;
+
+  if (pdfRenderingQueue.printing && window.matchMedia("print").matches) {
+    return;
+  }
+
+  pdfViewer.updateContainerHeightCss();
+
+  if (!pdfDocument) {
+    return;
+  }
+
+  const currentScaleValue = pdfViewer.currentScaleValue;
+
+  if (currentScaleValue === "auto" || currentScaleValue === "page-fit" || currentScaleValue === "page-width") {
+    pdfViewer.currentScaleValue = currentScaleValue;
+  }
+
+  pdfViewer.update();
+}
+
+function webViewerHashchange(evt) {
+  const hash = evt.hash;
+
+  if (!hash) {
+    return;
+  }
+
+  if (!PDFViewerApplication.isInitialViewSet) {
+    PDFViewerApplication.initialBookmark = hash;
+  } else if (!PDFViewerApplication.pdfHistory?.popStateInProgress) {
+    PDFViewerApplication.pdfLinkService.setHash(hash);
+  }
+}
+
+{
+  /*var webViewerFileInputChange = function (evt) {
+    if (PDFViewerApplication.pdfViewer?.isInPresentationMode) {
+      return;
+    }
+
+    const file = evt.fileInput.files[0];
+    let url = URL.createObjectURL(file);
+
+    if (file.name) {
+      url = {
+        url,
+        originalUrl: file.name
+      };
+    }
+
+    PDFViewerApplication.open(url);
+  };
+
+  var webViewerOpenFile = function (evt) {
+    const fileInput = PDFViewerApplication.appConfig.openFileInput;
+    fileInput.click();
+  };*/
+}
+
+function webViewerPresentationMode() {
+  PDFViewerApplication.requestPresentationMode();
+}
+
+function webViewerSwitchAnnotationEditorMode(evt) {
+  PDFViewerApplication.pdfViewer.annotationEditorMode = evt.mode;
+}
+
+function webViewerSwitchAnnotationEditorParams(evt) {
+  PDFViewerApplication.pdfViewer.annotationEditorParams = evt;
+}
+
+function webViewerPrint() {
+  PDFViewerApplication.triggerPrinting();
+}
+
+function webViewerDownload() {
+  PDFViewerApplication.downloadOrSave();
+}
+
+function webViewerFirstPage() {
+  if (PDFViewerApplication.pdfDocument) {
+    PDFViewerApplication.page = 1;
+  }
+}
+
+function webViewerLastPage() {
+  if (PDFViewerApplication.pdfDocument) {
+    PDFViewerApplication.page = PDFViewerApplication.pagesCount;
+  }
+}
+
+function webViewerNextPage() {
+  PDFViewerApplication.pdfViewer.nextPage();
+}
+
+function webViewerPreviousPage() {
+  PDFViewerApplication.pdfViewer.previousPage();
+}
+
+function webViewerZoomIn() {
+  PDFViewerApplication.zoomIn();
+}
+
+function webViewerZoomOut() {
+  PDFViewerApplication.zoomOut();
+}
+
+function webViewerZoomReset() {
+  PDFViewerApplication.zoomReset();
+}
+
+function webViewerPageNumberChanged(evt) {
+  const pdfViewer = PDFViewerApplication.pdfViewer;
+
+  if (evt.value !== "") {
+    PDFViewerApplication.pdfLinkService.goToPage(evt.value);
+  }
+
+  if (evt.value !== pdfViewer.currentPageNumber.toString() && evt.value !== pdfViewer.currentPageLabel) {
+    PDFViewerApplication.toolbar.setPageNumber(pdfViewer.currentPageNumber, pdfViewer.currentPageLabel);
+  }
+}
+
+function webViewerScaleChanged(evt) {
+  PDFViewerApplication.pdfViewer.currentScaleValue = evt.value;
+}
+
+function webViewerRotateCw() {
+  PDFViewerApplication.rotatePages(90);
+}
+
+function webViewerRotateCcw() {
+  PDFViewerApplication.rotatePages(-90);
+}
+
+function webViewerOptionalContentConfig(evt) {
+  PDFViewerApplication.pdfViewer.optionalContentConfigPromise = evt.promise;
+}
+
+function webViewerSwitchScrollMode(evt) {
+  PDFViewerApplication.pdfViewer.scrollMode = evt.mode;
+}
+
+function webViewerSwitchSpreadMode(evt) {
+  PDFViewerApplication.pdfViewer.spreadMode = evt.mode;
+}
+
+function webViewerDocumentProperties() {
+  PDFViewerApplication.pdfDocumentProperties.open();
+}
+
+function webViewerFindFromUrlHash(evt) {
+  PDFViewerApplication.eventBus.dispatch("find", {
+    source: evt.source,
+    type: "",
+    query: evt.query,
+    phraseSearch: evt.phraseSearch,
+    caseSensitive: false,
+    entireWord: false,
+    highlightAll: true,
+    findPrevious: false,
+    matchDiacritics: true
+  });
+}
+
+function webViewerUpdateFindMatchesCount({
+  matchesCount
+}) {
+  if (PDFViewerApplication.supportsIntegratedFind) {
+    PDFViewerApplication.externalServices.updateFindMatchesCount(matchesCount);
+  } else {
+    PDFViewerApplication.findBar.updateResultsCount(matchesCount);
+  }
+}
+
+function webViewerUpdateFindControlState({
+  state,
+  previous,
+  matchesCount,
+  rawQuery
+}) {
+  if (PDFViewerApplication.supportsIntegratedFind) {
+    PDFViewerApplication.externalServices.updateFindControlState({
+      result: state,
+      findPrevious: previous,
+      matchesCount,
+      rawQuery
+    });
+  } else {
+    PDFViewerApplication.findBar.updateUIState(state, previous, matchesCount);
+  }
+}
+
+function webViewerScaleChanging(evt) {
+  PDFViewerApplication.toolbar.setPageScale(evt.presetValue, evt.scale);
+  PDFViewerApplication.pdfViewer.update();
+}
+
+function webViewerRotationChanging(evt) {
+  PDFViewerApplication.pdfThumbnailViewer.pagesRotation = evt.pagesRotation;
+  PDFViewerApplication.forceRendering();
+  PDFViewerApplication.pdfViewer.currentPageNumber = evt.pageNumber;
+}
+
+function webViewerPageChanging({
+  pageNumber,
+  pageLabel
+}) {
+  PDFViewerApplication.toolbar.setPageNumber(pageNumber, pageLabel);
+  PDFViewerApplication.secondaryToolbar.setPageNumber(pageNumber);
+
+  if (PDFViewerApplication.pdfSidebar.visibleView === _ui_utils.SidebarView.THUMBS) {
+    PDFViewerApplication.pdfThumbnailViewer.scrollThumbnailIntoView(pageNumber);
+  }
+}
+
+function webViewerResolutionChange(evt) {
+  PDFViewerApplication.pdfViewer.refresh();
+}
+
+function webViewerVisibilityChange(evt) {
+  if (document.visibilityState === "visible") {
+    setZoomDisabledTimeout();
+  }
+}
+
+let zoomDisabledTimeout = null;
+
+function setZoomDisabledTimeout() {
+  if (zoomDisabledTimeout) {
+    clearTimeout(zoomDisabledTimeout);
+  }
+
+  zoomDisabledTimeout = setTimeout(function () {
+    zoomDisabledTimeout = null;
+  }, WHEEL_ZOOM_DISABLED_TIMEOUT);
+}
+
+function webViewerWheel(evt) {
+  const {
+    pdfViewer,
+    supportedMouseWheelZoomModifierKeys
+  } = PDFViewerApplication;
+
+  if (pdfViewer.isInPresentationMode) {
+    return;
+  }
+
+  if (evt.ctrlKey && supportedMouseWheelZoomModifierKeys.ctrlKey || evt.metaKey && supportedMouseWheelZoomModifierKeys.metaKey) {
+    evt.preventDefault();
+
+    if (zoomDisabledTimeout || document.visibilityState === "hidden") {
+      return;
+    }
+
+    const deltaMode = evt.deltaMode;
+    const delta = (0, _ui_utils.normalizeWheelEventDirection)(evt);
+    const previousScale = pdfViewer.currentScale;
+    let ticks = 0;
+
+    if (deltaMode === WheelEvent.DOM_DELTA_LINE || deltaMode === WheelEvent.DOM_DELTA_PAGE) {
+      if (Math.abs(delta) >= 1) {
+        ticks = Math.sign(delta);
+      } else {
+        ticks = PDFViewerApplication.accumulateWheelTicks(delta);
+      }
+    } else {
+      const PIXELS_PER_LINE_SCALE = 30;
+      ticks = PDFViewerApplication.accumulateWheelTicks(delta / PIXELS_PER_LINE_SCALE);
+    }
+
+    if (ticks < 0) {
+      PDFViewerApplication.zoomOut(-ticks);
+    } else if (ticks > 0) {
+      PDFViewerApplication.zoomIn(ticks);
+    }
+
+    const currentScale = pdfViewer.currentScale;
+
+    if (previousScale !== currentScale) {
+      const scaleCorrectionFactor = currentScale / previousScale - 1;
+      const rect = pdfViewer.container.getBoundingClientRect();
+      const dx = evt.clientX - rect.left;
+      const dy = evt.clientY - rect.top;
+      pdfViewer.container.scrollLeft += dx * scaleCorrectionFactor;
+      pdfViewer.container.scrollTop += dy * scaleCorrectionFactor;
+    }
+  } else {
+    setZoomDisabledTimeout();
+  }
+}
+
+function webViewerTouchStart(evt) {
+  if (evt.touches.length > 1) {
+    evt.preventDefault();
+  }
+}
+
+function webViewerClick(evt) {
+  if (!PDFViewerApplication.secondaryToolbar.isOpen) {
+    return;
+  }
+
+  const appConfig = PDFViewerApplication.appConfig;
+
+  if (PDFViewerApplication.pdfViewer.containsElement(evt.target) || appConfig.toolbar.container.contains(evt.target) && evt.target !== appConfig.secondaryToolbar.toggleButton) {
+    PDFViewerApplication.secondaryToolbar.close();
+  }
+}
+
+function webViewerKeyDown(evt) {
+  if (PDFViewerApplication.overlayManager.active) {
+    return;
+  }
+
+  const {
+    eventBus,
+    pdfViewer
+  } = PDFViewerApplication;
+  const isViewerInPresentationMode = pdfViewer.isInPresentationMode;
+  let handled = false,
+      ensureViewerFocused = false;
+  const cmd = (evt.ctrlKey ? 1 : 0) | (evt.altKey ? 2 : 0) | (evt.shiftKey ? 4 : 0) | (evt.metaKey ? 8 : 0);
+
+  if (cmd === 1 || cmd === 8 || cmd === 5 || cmd === 12) {
+    switch (evt.keyCode) {
+      case 70:
+        if (!PDFViewerApplication.supportsIntegratedFind && !evt.shiftKey) {
+          PDFViewerApplication.findBar.open();
+          handled = true;
+        }
+
+        break;
+
+      case 71:
+        if (!PDFViewerApplication.supportsIntegratedFind) {
+          const {
+            state
+          } = PDFViewerApplication.findController;
+
+          if (state) {
+            const eventState = Object.assign(Object.create(null), state, {
+              source: window,
+              type: "again",
+              findPrevious: cmd === 5 || cmd === 12
+            });
+            eventBus.dispatch("find", eventState);
+          }
+
+          handled = true;
+        }
+
+        break;
+
+      case 61:
+      case 107:
+      case 187:
+      case 171:
+        if (!isViewerInPresentationMode) {
+          PDFViewerApplication.zoomIn();
+        }
+
+        handled = true;
+        break;
+
+      case 173:
+      case 109:
+      case 189:
+        if (!isViewerInPresentationMode) {
+          PDFViewerApplication.zoomOut();
+        }
+
+        handled = true;
+        break;
+
+      case 48:
+      case 96:
+        if (!isViewerInPresentationMode) {
+          setTimeout(function () {
+            PDFViewerApplication.zoomReset();
+          });
+          handled = false;
+        }
+
+        break;
+
+      case 38:
+        if (isViewerInPresentationMode || PDFViewerApplication.page > 1) {
+          PDFViewerApplication.page = 1;
+          handled = true;
+          ensureViewerFocused = true;
+        }
+
+        break;
+
+      case 40:
+        if (isViewerInPresentationMode || PDFViewerApplication.page < PDFViewerApplication.pagesCount) {
+          PDFViewerApplication.page = PDFViewerApplication.pagesCount;
+          handled = true;
+          ensureViewerFocused = true;
+        }
+
+        break;
+    }
+  }
+
+  if (cmd === 1 || cmd === 8) {
+    switch (evt.keyCode) {
+      case 83:
+        eventBus.dispatch("download", {
+          source: window
+        });
+        handled = true;
+        break;
+
+      case 79:
+        {
+          eventBus.dispatch("openfile", {
+            source: window
+          });
+          handled = true;
+        }
+        break;
+    }
+  }
+
+  if (cmd === 3 || cmd === 10) {
+    switch (evt.keyCode) {
+      case 80:
+        PDFViewerApplication.requestPresentationMode();
+        handled = true;
+        break;
+
+      case 71:
+        PDFViewerApplication.appConfig.toolbar.pageNumber.select();
+        handled = true;
+        break;
+    }
+  }
+
+  if (handled) {
+    if (ensureViewerFocused && !isViewerInPresentationMode) {
+      pdfViewer.focus();
+    }
+
+    evt.preventDefault();
+    return;
+  }
+
+  const curElement = (0, _ui_utils.getActiveOrFocusedElement)();
+  const curElementTagName = curElement?.tagName.toUpperCase();
+
+  if (curElementTagName === "INPUT" || curElementTagName === "TEXTAREA" || curElementTagName === "SELECT" || curElement?.isContentEditable) {
+    if (evt.keyCode !== 27) {
+      return;
+    }
+  }
+
+  if (cmd === 0) {
+    let turnPage = 0,
+        turnOnlyIfPageFit = false;
+
+    switch (evt.keyCode) {
+      case 38:
+      case 33:
+        if (pdfViewer.isVerticalScrollbarEnabled) {
+          turnOnlyIfPageFit = true;
+        }
+
+        turnPage = -1;
+        break;
+
+      case 8:
+        if (!isViewerInPresentationMode) {
+          turnOnlyIfPageFit = true;
+        }
+
+        turnPage = -1;
+        break;
+
+      case 37:
+        if (pdfViewer.isHorizontalScrollbarEnabled) {
+          turnOnlyIfPageFit = true;
+        }
+
+      case 75:
+      case 80:
+        turnPage = -1;
+        break;
+
+      case 27:
+        if (PDFViewerApplication.secondaryToolbar.isOpen) {
+          PDFViewerApplication.secondaryToolbar.close();
+          handled = true;
+        }
+
+        if (!PDFViewerApplication.supportsIntegratedFind && PDFViewerApplication.findBar.opened) {
+          PDFViewerApplication.findBar.close();
+          handled = true;
+        }
+
+        break;
+
+      case 40:
+      case 34:
+        if (pdfViewer.isVerticalScrollbarEnabled) {
+          turnOnlyIfPageFit = true;
+        }
+
+        turnPage = 1;
+        break;
+
+      case 13:
+      case 32:
+        if (!isViewerInPresentationMode) {
+          turnOnlyIfPageFit = true;
+        }
+
+        turnPage = 1;
+        break;
+
+      case 39:
+        if (pdfViewer.isHorizontalScrollbarEnabled) {
+          turnOnlyIfPageFit = true;
+        }
+
+      case 74:
+      case 78:
+        turnPage = 1;
+        break;
+
+      case 36:
+        if (isViewerInPresentationMode || PDFViewerApplication.page > 1) {
+          PDFViewerApplication.page = 1;
+          handled = true;
+          ensureViewerFocused = true;
+        }
+
+        break;
+
+      case 35:
+        if (isViewerInPresentationMode || PDFViewerApplication.page < PDFViewerApplication.pagesCount) {
+          PDFViewerApplication.page = PDFViewerApplication.pagesCount;
+          handled = true;
+          ensureViewerFocused = true;
+        }
+
+        break;
+
+      case 83:
+        PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool.SELECT);
+        break;
+
+      case 72:
+        PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool.HAND);
+        break;
+
+      case 82:
+        PDFViewerApplication.rotatePages(90);
+        break;
+
+      case 115:
+        PDFViewerApplication.pdfSidebar.toggle();
+        break;
+    }
+
+    if (turnPage !== 0 && (!turnOnlyIfPageFit || pdfViewer.currentScaleValue === "page-fit")) {
+      if (turnPage > 0) {
+        pdfViewer.nextPage();
+      } else {
+        pdfViewer.previousPage();
+      }
+
+      handled = true;
+    }
+  }
+
+  if (cmd === 4) {
+    switch (evt.keyCode) {
+      case 13:
+      case 32:
+        if (!isViewerInPresentationMode && pdfViewer.currentScaleValue !== "page-fit") {
+          break;
+        }
+
+        pdfViewer.previousPage();
+        handled = true;
+        break;
+
+      case 82:
+        PDFViewerApplication.rotatePages(-90);
+        break;
+    }
+  }
+
+  if (!handled && !isViewerInPresentationMode) {
+    if (evt.keyCode >= 33 && evt.keyCode <= 40 || evt.keyCode === 32 && curElementTagName !== "BUTTON") {
+      ensureViewerFocused = true;
+    }
+  }
+
+  if (ensureViewerFocused && !pdfViewer.containsElement(curElement)) {
+    pdfViewer.focus();
+  }
+
+  if (handled) {
+    evt.preventDefault();
+  }
+}
+
+function beforeUnload(evt) {
+  evt.preventDefault();
+  evt.returnValue = "";
+  return false;
+}
+
+function webViewerAnnotationEditorStatesChanged(data) {
+  PDFViewerApplication.externalServices.updateEditorStates(data);
+}
+
+const PDFPrintServiceFactory = {
+  instance: {
+    supportsPrinting: false,
+
+    createPrintService() {
+      throw new Error("Not implemented: createPrintService");
+    }
+
+  }
+};
+exports.PDFPrintServiceFactory = PDFPrintServiceFactory;
+
+/***/ }),
+/* 5 */
+/***/ ((module) => {
+
+
+
+let pdfjsLib;
+
+if (typeof window !== "undefined" && window["pdfjs-dist/build/pdf"]) {
+  pdfjsLib = window["pdfjs-dist/build/pdf"];
+} else {
+  pdfjsLib = require("../build/pdf.js");
+}
+
+module.exports = pdfjsLib;
+
+/***/ }),
+/* 6 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.WaitOnType = exports.EventBus = exports.AutomationEventBus = void 0;
+exports.waitOnEventOrTimeout = waitOnEventOrTimeout;
 const WaitOnType = {
   EVENT: "event",
   TIMEOUT: "timeout"
@@ -3530,75 +4389,66 @@ function waitOnEventOrTimeout({
   });
 }
 
-const animationStarted = new Promise(function (resolve) {
-  window.requestAnimationFrame(resolve);
-});
-exports.animationStarted = animationStarted;
-
-function dispatchDOMEvent(eventName, args = null) {
-  throw new Error("Not implemented: dispatchDOMEvent");
-}
-
 class EventBus {
-  constructor(options) {
+  constructor() {
     this._listeners = Object.create(null);
   }
 
-  on(eventName, listener) {
+  on(eventName, listener, options = null) {
     this._on(eventName, listener, {
-      external: true
+      external: true,
+      once: options?.once
     });
   }
 
-  off(eventName, listener) {
+  off(eventName, listener, options = null) {
     this._off(eventName, listener, {
-      external: true
+      external: true,
+      once: options?.once
     });
   }
 
-  dispatch(eventName) {
+  dispatch(eventName, data) {
     const eventListeners = this._listeners[eventName];
 
     if (!eventListeners || eventListeners.length === 0) {
       return;
     }
 
-    const args = Array.prototype.slice.call(arguments, 1);
     let externalListeners;
-    eventListeners.slice(0).forEach(function ({
-      listener,
-      external
-    }) {
-      if (external) {
-        if (!externalListeners) {
-          externalListeners = [];
-        }
 
-        externalListeners.push(listener);
-        return;
+    for (const {
+      listener,
+      external,
+      once
+    } of eventListeners.slice(0)) {
+      if (once) {
+        this._off(eventName, listener);
       }
 
-      listener.apply(null, args);
-    });
+      if (external) {
+        (externalListeners ||= []).push(listener);
+        continue;
+      }
+
+      listener(data);
+    }
 
     if (externalListeners) {
-      externalListeners.forEach(function (listener) {
-        listener.apply(null, args);
-      });
+      for (const listener of externalListeners) {
+        listener(data);
+      }
+
       externalListeners = null;
     }
   }
 
   _on(eventName, listener, options = null) {
-    let eventListeners = this._listeners[eventName];
-
-    if (!eventListeners) {
-      this._listeners[eventName] = eventListeners = [];
-    }
-
+    const eventListeners = this._listeners[eventName] ||= [];
     eventListeners.push({
       listener,
-      external: (options && options.external) === true
+      external: options?.external === true,
+      once: options?.once === true
     });
   }
 
@@ -3621,423 +4471,29 @@ class EventBus {
 
 exports.EventBus = EventBus;
 
-function clamp(v, min, max) {
-  return Math.min(Math.max(v, min), max);
-}
-
-class ProgressBar {
-  constructor(id, {
-    height,
-    width,
-    units
-  } = {}) {
-    this.visible = true;
-    this.div = document.querySelector(id + " .progress");
-    this.bar = this.div.parentNode;
-    this.height = height || 100;
-    this.width = width || 100;
-    this.units = units || "%";
-    this.div.style.height = this.height + this.units;
-    this.percent = 0;
-  }
-
-  _updateBar() {
-    if (this._indeterminate) {
-      this.div.classList.add("indeterminate");
-      this.div.style.width = this.width + this.units;
-      return;
-    }
-
-    this.div.classList.remove("indeterminate");
-    const progressSize = this.width * this._percent / 100;
-    this.div.style.width = progressSize + this.units;
-  }
-
-  get percent() {
-    return this._percent;
-  }
-
-  set percent(val) {
-    this._indeterminate = isNaN(val);
-    this._percent = clamp(val, 0, 100);
-
-    this._updateBar();
-  }
-
-  setWidth(viewer) {
-    if (!viewer) {
-      return;
-    }
-
-    const container = viewer.parentNode;
-    const scrollbarWidth = container.offsetWidth - viewer.offsetWidth;
-
-    if (scrollbarWidth > 0) {
-      this.bar.style.width = `calc(100% - ${scrollbarWidth}px)`;
-    }
-  }
-
-  hide() {
-    if (!this.visible) {
-      return;
-    }
-
-    this.visible = false;
-    this.bar.classList.add("hidden");
-    document.body.classList.remove("loadingInProgress");
-  }
-
-  show() {
-    if (this.visible) {
-      return;
-    }
-
-    this.visible = true;
-    document.body.classList.add("loadingInProgress");
-    this.bar.classList.remove("hidden");
+class AutomationEventBus extends EventBus {
+  dispatch(eventName, data) {
+    throw new Error("Not implemented: AutomationEventBus.dispatch");
   }
 
 }
 
-exports.ProgressBar = ProgressBar;
-
-function moveToEndOfArray(arr, condition) {
-  const moved = [],
-        len = arr.length;
-  let write = 0;
-
-  for (let read = 0; read < len; ++read) {
-    if (condition(arr[read])) {
-      moved.push(arr[read]);
-    } else {
-      arr[write] = arr[read];
-      ++write;
-    }
-  }
-
-  for (let read = 0; write < len; ++read, ++write) {
-    arr[write] = moved[read];
-  }
-}
+exports.AutomationEventBus = AutomationEventBus;
 
 /***/ }),
-/* 3 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 7 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.OptionKind = exports.AppOptions = void 0;
-
-var _viewer_compatibility = __webpack_require__(4);
-
-const OptionKind = {
-  VIEWER: 0x02,
-  API: 0x04,
-  WORKER: 0x08,
-  PREFERENCE: 0x80
-};
-exports.OptionKind = OptionKind;
-const defaultOptions = {
-  cursorToolOnLoad: {
-    value: 0,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  defaultUrl: {
-    value: "compressed.tracemonkey-pldi-09.pdf",
-    kind: OptionKind.VIEWER
-  },
-  defaultZoomValue: {
-    value: "",
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  disableHistory: {
-    value: false,
-    kind: OptionKind.VIEWER
-  },
-  disablePageLabels: {
-    value: false,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  enablePermissions: {
-    value: false,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  enablePrintAutoRotate: {
-    value: false,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  enableWebGL: {
-    value: false,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  externalLinkRel: {
-    value: "noopener noreferrer nofollow",
-    kind: OptionKind.VIEWER
-  },
-  externalLinkTarget: {
-    value: 0,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  historyUpdateUrl: {
-    value: false,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  ignoreDestinationZoom: {
-    value: false,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  imageResourcesPath: {
-    value: "./images/",
-    kind: OptionKind.VIEWER
-  },
-  maxCanvasPixels: {
-    value: 16777216,
-    compatibility: _viewer_compatibility.viewerCompatibilityParams.maxCanvasPixels,
-    kind: OptionKind.VIEWER
-  },
-  pdfBugEnabled: {
-    value: false,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  printResolution: {
-    value: 150,
-    kind: OptionKind.VIEWER
-  },
-  renderer: {
-    value: "canvas",
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  renderInteractiveForms: {
-    value: true,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  sidebarViewOnLoad: {
-    value: -1,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  scrollModeOnLoad: {
-    value: -1,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  spreadModeOnLoad: {
-    value: -1,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  textLayerMode: {
-    value: 1,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  useOnlyCssZoom: {
-    value: false,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  viewOnLoad: {
-    value: 0,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
-  cMapPacked: {
-    value: true,
-    kind: OptionKind.API
-  },
-  cMapUrl: {
-    value: "../web/cmaps/",
-    kind: OptionKind.API
-  },
-  disableAutoFetch: {
-    value: false,
-    kind: OptionKind.API + OptionKind.PREFERENCE
-  },
-  disableFontFace: {
-    value: false,
-    kind: OptionKind.API + OptionKind.PREFERENCE
-  },
-  disableRange: {
-    value: false,
-    kind: OptionKind.API + OptionKind.PREFERENCE
-  },
-  disableStream: {
-    value: false,
-    kind: OptionKind.API + OptionKind.PREFERENCE
-  },
-  docBaseUrl: {
-    value: "",
-    kind: OptionKind.API
-  },
-  fontExtraProperties: {
-    value: false,
-    kind: OptionKind.API
-  },
-  isEvalSupported: {
-    value: true,
-    kind: OptionKind.API
-  },
-  maxImageSize: {
-    value: -1,
-    kind: OptionKind.API
-  },
-  pdfBug: {
-    value: false,
-    kind: OptionKind.API
-  },
-  verbosity: {
-    value: 1,
-    kind: OptionKind.API
-  },
-  workerPort: {
-    value: null,
-    kind: OptionKind.WORKER
-  },
-  workerSrc: {
-    value: "../build/pdf.worker.js",
-    kind: OptionKind.WORKER
-  }
-};
-{
-  defaultOptions.disablePreferences = {
-    value: false,
-    kind: OptionKind.VIEWER
-  };
-  defaultOptions.locale = {
-    value: typeof navigator !== "undefined" ? navigator.language : "en-US",
-    kind: OptionKind.VIEWER
-  };
-}
-const userOptions = Object.create(null);
-
-class AppOptions {
-  constructor() {
-    throw new Error("Cannot initialize AppOptions.");
-  }
-
-  static get(name) {
-    const userOption = userOptions[name];
-
-    if (userOption !== undefined) {
-      return userOption;
-    }
-
-    const defaultOption = defaultOptions[name];
-
-    if (defaultOption !== undefined) {
-      return defaultOption.compatibility || defaultOption.value;
-    }
-
-    return undefined;
-  }
-
-  static getAll(kind = null) {
-    const options = Object.create(null);
-
-    for (const name in defaultOptions) {
-      const defaultOption = defaultOptions[name];
-
-      if (kind) {
-        if ((kind & defaultOption.kind) === 0) {
-          continue;
-        }
-
-        if (kind === OptionKind.PREFERENCE) {
-          const value = defaultOption.value,
-                valueType = typeof value;
-
-          if (valueType === "boolean" || valueType === "string" || valueType === "number" && Number.isInteger(value)) {
-            options[name] = value;
-            continue;
-          }
-
-          throw new Error(`Invalid type for preference: ${name}`);
-        }
-      }
-
-      const userOption = userOptions[name];
-      options[name] = userOption !== undefined ? userOption : defaultOption.compatibility || defaultOption.value;
-    }
-
-    return options;
-  }
-
-  static set(name, value) {
-    userOptions[name] = value;
-  }
-
-  static remove(name) {
-    delete userOptions[name];
-  }
-
-}
-
-exports.AppOptions = AppOptions;
-
-/***/ }),
-/* 4 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.viewerCompatibilityParams = void 0;
-const compatibilityParams = Object.create(null);
-{
-  const userAgent = typeof navigator !== "undefined" && navigator.userAgent || "";
-  const platform = typeof navigator !== "undefined" && navigator.platform || "";
-  const maxTouchPoints = typeof navigator !== "undefined" && navigator.maxTouchPoints || 1;
-  const isAndroid = /Android/.test(userAgent);
-  const isIE = /Trident/.test(userAgent);
-  const isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent) || platform === "MacIntel" && maxTouchPoints > 1;
-  const isIOSChrome = /CriOS/.test(userAgent);
-
-  (function checkOnBlobSupport() {
-    if (isIE || isIOSChrome) {
-      compatibilityParams.disableCreateObjectURL = true;
-    }
-  })();
-
-  (function checkCanvasSizeLimitation() {
-    if (isIOS || isAndroid) {
-      compatibilityParams.maxCanvasPixels = 5242880;
-    }
-  })();
-}
-const viewerCompatibilityParams = Object.freeze(compatibilityParams);
-exports.viewerCompatibilityParams = viewerCompatibilityParams;
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-let pdfjsLib;
-
-if (typeof window !== "undefined" && window["pdfjs-dist/build/pdf"]) {
-  pdfjsLib = window["pdfjs-dist/build/pdf"];
-} else {
-  pdfjsLib = require("../build/pdf.js");
-}
-
-module.exports = pdfjsLib;
-
-/***/ }),
-/* 6 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+}));
 exports.PDFCursorTools = exports.CursorTool = void 0;
 
-var _grab_to_pan = __webpack_require__(7);
+var _grab_to_pan = __webpack_require__(8);
+
+var _ui_utils = __webpack_require__(1);
 
 const CursorTool = {
   SELECT: 0,
@@ -4059,9 +4515,7 @@ class PDFCursorTools {
     this.handTool = new _grab_to_pan.GrabToPan({
       element: this.container
     });
-
-    this._addEventListeners();
-
+    this.#addEventListeners();
     Promise.resolve().then(() => {
       this.switchTool(cursorToolOnLoad);
     });
@@ -4110,37 +4564,38 @@ class PDFCursorTools {
     }
 
     this.active = tool;
-
-    this._dispatchEvent();
+    this.#dispatchEvent();
   }
 
-  _dispatchEvent() {
+  #dispatchEvent() {
     this.eventBus.dispatch("cursortoolchanged", {
       source: this,
       tool: this.active
     });
   }
 
-  _addEventListeners() {
+  #addEventListeners() {
     this.eventBus._on("switchcursortool", evt => {
       this.switchTool(evt.tool);
     });
 
     this.eventBus._on("presentationmodechanged", evt => {
-      if (evt.switchInProgress) {
-        return;
-      }
+      switch (evt.state) {
+        case _ui_utils.PresentationModeState.FULLSCREEN:
+          {
+            const previouslyActive = this.active;
+            this.switchTool(CursorTool.SELECT);
+            this.activeBeforePresentationMode = previouslyActive;
+            break;
+          }
 
-      let previouslyActive;
-
-      if (evt.active) {
-        previouslyActive = this.active;
-        this.switchTool(CursorTool.SELECT);
-        this.activeBeforePresentationMode = previouslyActive;
-      } else {
-        previouslyActive = this.activeBeforePresentationMode;
-        this.activeBeforePresentationMode = null;
-        this.switchTool(previouslyActive);
+        case _ui_utils.PresentationModeState.NORMAL:
+          {
+            const previouslyActive = this.activeBeforePresentationMode;
+            this.activeBeforePresentationMode = null;
+            this.switchTool(previouslyActive);
+            break;
+          }
       }
     });
   }
@@ -4150,74 +4605,71 @@ class PDFCursorTools {
 exports.PDFCursorTools = PDFCursorTools;
 
 /***/ }),
-/* 7 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 8 */
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.GrabToPan = GrabToPan;
+}));
+exports.GrabToPan = void 0;
+const CSS_CLASS_GRAB = "grab-to-pan-grab";
 
-function GrabToPan(options) {
-  this.element = options.element;
-  this.document = options.element.ownerDocument;
+class GrabToPan {
+  constructor(options) {
+    this.element = options.element;
+    this.document = options.element.ownerDocument;
 
-  if (typeof options.ignoreTarget === "function") {
-    this.ignoreTarget = options.ignoreTarget;
+    if (typeof options.ignoreTarget === "function") {
+      this.ignoreTarget = options.ignoreTarget;
+    }
+
+    this.onActiveChanged = options.onActiveChanged;
+    this.activate = this.activate.bind(this);
+    this.deactivate = this.deactivate.bind(this);
+    this.toggle = this.toggle.bind(this);
+    this._onMouseDown = this.#onMouseDown.bind(this);
+    this._onMouseMove = this.#onMouseMove.bind(this);
+    this._endPan = this.#endPan.bind(this);
+    const overlay = this.overlay = document.createElement("div");
+    overlay.className = "grab-to-pan-grabbing";
   }
 
-  this.onActiveChanged = options.onActiveChanged;
-  this.activate = this.activate.bind(this);
-  this.deactivate = this.deactivate.bind(this);
-  this.toggle = this.toggle.bind(this);
-  this._onmousedown = this._onmousedown.bind(this);
-  this._onmousemove = this._onmousemove.bind(this);
-  this._endPan = this._endPan.bind(this);
-  const overlay = this.overlay = document.createElement("div");
-  overlay.className = "grab-to-pan-grabbing";
-}
-
-GrabToPan.prototype = {
-  CSS_CLASS_GRAB: "grab-to-pan-grab",
-  activate: function GrabToPan_activate() {
+  activate() {
     if (!this.active) {
       this.active = true;
-      this.element.addEventListener("mousedown", this._onmousedown, true);
-      this.element.classList.add(this.CSS_CLASS_GRAB);
-
-      if (this.onActiveChanged) {
-        this.onActiveChanged(true);
-      }
+      this.element.addEventListener("mousedown", this._onMouseDown, true);
+      this.element.classList.add(CSS_CLASS_GRAB);
+      this.onActiveChanged?.(true);
     }
-  },
-  deactivate: function GrabToPan_deactivate() {
+  }
+
+  deactivate() {
     if (this.active) {
       this.active = false;
-      this.element.removeEventListener("mousedown", this._onmousedown, true);
+      this.element.removeEventListener("mousedown", this._onMouseDown, true);
 
       this._endPan();
 
-      this.element.classList.remove(this.CSS_CLASS_GRAB);
-
-      if (this.onActiveChanged) {
-        this.onActiveChanged(false);
-      }
+      this.element.classList.remove(CSS_CLASS_GRAB);
+      this.onActiveChanged?.(false);
     }
-  },
-  toggle: function GrabToPan_toggle() {
+  }
+
+  toggle() {
     if (this.active) {
       this.deactivate();
     } else {
       this.activate();
     }
-  },
-  ignoreTarget: function GrabToPan_ignoreTarget(node) {
-    return node[matchesSelector]("a[href], a[href] *, input, textarea, button, button *, select, option");
-  },
-  _onmousedown: function GrabToPan__onmousedown(event) {
+  }
+
+  ignoreTarget(node) {
+    return node.matches("a[href], a[href] *, input, textarea, button, button *, select, option");
+  }
+
+  #onMouseDown(event) {
     if (event.button !== 0 || this.ignoreTarget(event.target)) {
       return;
     }
@@ -4234,7 +4686,7 @@ GrabToPan.prototype = {
     this.scrollTopStart = this.element.scrollTop;
     this.clientXStart = event.clientX;
     this.clientYStart = event.clientY;
-    this.document.addEventListener("mousemove", this._onmousemove, true);
+    this.document.addEventListener("mousemove", this._onMouseMove, true);
     this.document.addEventListener("mouseup", this._endPan, true);
     this.element.addEventListener("scroll", this._endPan, true);
     event.preventDefault();
@@ -4244,11 +4696,12 @@ GrabToPan.prototype = {
     if (focusedElement && !focusedElement.contains(event.target)) {
       focusedElement.blur();
     }
-  },
-  _onmousemove: function GrabToPan__onmousemove(event) {
+  }
+
+  #onMouseMove(event) {
     this.element.removeEventListener("scroll", this._endPan, true);
 
-    if (isLeftMouseReleased(event)) {
+    if (!(event.buttons & 1)) {
       this._endPan();
 
       return;
@@ -4271,693 +4724,186 @@ GrabToPan.prototype = {
     }
 
     if (!this.overlay.parentNode) {
-      document.body.appendChild(this.overlay);
+      document.body.append(this.overlay);
     }
-  },
-  _endPan: function GrabToPan__endPan() {
+  }
+
+  #endPan() {
     this.element.removeEventListener("scroll", this._endPan, true);
-    this.document.removeEventListener("mousemove", this._onmousemove, true);
+    this.document.removeEventListener("mousemove", this._onMouseMove, true);
     this.document.removeEventListener("mouseup", this._endPan, true);
     this.overlay.remove();
   }
-};
-let matchesSelector;
-["webkitM", "mozM", "msM", "oM", "m"].some(function (prefix) {
-  let name = prefix + "atches";
-
-  if (name in document.documentElement) {
-    matchesSelector = name;
-  }
-
-  name += "Selector";
-
-  if (name in document.documentElement) {
-    matchesSelector = name;
-  }
-
-  return matchesSelector;
-});
-const isNotIEorIsIE10plus = !document.documentMode || document.documentMode > 9;
-const chrome = window.chrome;
-const isChrome15OrOpera15plus = chrome && (chrome.webstore || chrome.app);
-const isSafari6plus = /Apple/.test(navigator.vendor) && /Version\/([6-9]\d*|[1-5]\d+)/.test(navigator.userAgent);
-
-function isLeftMouseReleased(event) {
-  if ("buttons" in event && isNotIEorIsIE10plus) {
-    return !(event.buttons & 1);
-  }
-
-  if (isChrome15OrOpera15plus || isSafari6plus) {
-    return event.which === 0;
-  }
-
-  return false;
-}
-
-/***/ }),
-/* 8 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.PDFRenderingQueue = exports.RenderingStates = void 0;
-const CLEANUP_TIMEOUT = 30000;
-const RenderingStates = {
-  INITIAL: 0,
-  RUNNING: 1,
-  PAUSED: 2,
-  FINISHED: 3
-};
-exports.RenderingStates = RenderingStates;
-
-class PDFRenderingQueue {
-  constructor() {
-    this.pdfViewer = null;
-    this.pdfThumbnailViewer = null;
-    this.onIdle = null;
-    this.highestPriorityPage = null;
-    this.idleTimeout = null;
-    this.printing = false;
-    this.isThumbnailViewEnabled = false;
-  }
-
-  setViewer(pdfViewer) {
-    this.pdfViewer = pdfViewer;
-  }
-
-  setThumbnailViewer(pdfThumbnailViewer) {
-    this.pdfThumbnailViewer = pdfThumbnailViewer;
-  }
-
-  isHighestPriority(view) {
-    return this.highestPriorityPage === view.renderingId;
-  }
-
-  renderHighestPriority(currentlyVisiblePages) {
-    if (this.idleTimeout) {
-      clearTimeout(this.idleTimeout);
-      this.idleTimeout = null;
-    }
-
-    if (this.pdfViewer.forceRendering(currentlyVisiblePages)) {
-      return;
-    }
-
-    if (this.pdfThumbnailViewer && this.isThumbnailViewEnabled) {
-      if (this.pdfThumbnailViewer.forceRendering()) {
-        return;
-      }
-    }
-
-    if (this.printing) {
-      return;
-    }
-
-    if (this.onIdle) {
-      this.idleTimeout = setTimeout(this.onIdle.bind(this), CLEANUP_TIMEOUT);
-    }
-  }
-
-  getHighestPriority(visible, views, scrolledDown) {
-    const visibleViews = visible.views;
-    const numVisible = visibleViews.length;
-
-    if (numVisible === 0) {
-      return null;
-    }
-
-    for (let i = 0; i < numVisible; ++i) {
-      const view = visibleViews[i].view;
-
-      if (!this.isViewFinished(view)) {
-        return view;
-      }
-    }
-
-    if (scrolledDown) {
-      const nextPageIndex = visible.last.id;
-
-      if (views[nextPageIndex] && !this.isViewFinished(views[nextPageIndex])) {
-        return views[nextPageIndex];
-      }
-    } else {
-      const previousPageIndex = visible.first.id - 2;
-
-      if (views[previousPageIndex] && !this.isViewFinished(views[previousPageIndex])) {
-        return views[previousPageIndex];
-      }
-    }
-
-    return null;
-  }
-
-  isViewFinished(view) {
-    return view.renderingState === RenderingStates.FINISHED;
-  }
-
-  renderView(view) {
-    switch (view.renderingState) {
-      case RenderingStates.FINISHED:
-        return false;
-
-      case RenderingStates.PAUSED:
-        this.highestPriorityPage = view.renderingId;
-        view.resume();
-        break;
-
-      case RenderingStates.RUNNING:
-        this.highestPriorityPage = view.renderingId;
-        break;
-
-      case RenderingStates.INITIAL:
-        this.highestPriorityPage = view.renderingId;
-        view.draw().finally(() => {
-          this.renderHighestPriority();
-        }).catch(reason => {
-          console.error(`renderView: "${reason}"`);
-        });
-        break;
-    }
-
-    return true;
-  }
 
 }
 
-exports.PDFRenderingQueue = PDFRenderingQueue;
+exports.GrabToPan = GrabToPan;
 
 /***/ }),
 /* 9 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.PDFSidebar = exports.SidebarView = void 0;
+}));
+exports.AnnotationEditorParams = void 0;
 
-var _ui_utils = __webpack_require__(2);
+var _pdfjsLib = __webpack_require__(5);
 
-var _pdf_rendering_queue = __webpack_require__(8);
-
-const UI_NOTIFICATION_CLASS = "pdfSidebarNotification";
-const SidebarView = {
-  UNKNOWN: -1,
-  NONE: 0,
-  THUMBS: 1,
-  OUTLINE: 2,
-  ATTACHMENTS: 3,
-  LAYERS: 4
-};
-exports.SidebarView = SidebarView;
-
-class PDFSidebar {
-  constructor({
-    elements,
-    pdfViewer,
-    pdfThumbnailViewer,
-    eventBus,
-    l10n = _ui_utils.NullL10n,
-    disableNotification = false
-  }) {
-    this.isOpen = false;
-    this.active = SidebarView.THUMBS;
-    this.isInitialViewSet = false;
-    this.onToggled = null;
-    this.pdfViewer = pdfViewer;
-    this.pdfThumbnailViewer = pdfThumbnailViewer;
-    this.outerContainer = elements.outerContainer;
-    this.viewerContainer = elements.viewerContainer;
-    this.toggleButton = elements.toggleButton;
-    this.thumbnailButton = elements.thumbnailButton;
-    this.outlineButton = elements.outlineButton;
-    this.attachmentsButton = elements.attachmentsButton;
-    this.layersButton = elements.layersButton;
-    this.thumbnailView = elements.thumbnailView;
-    this.outlineView = elements.outlineView;
-    this.attachmentsView = elements.attachmentsView;
-    this.layersView = elements.layersView;
+class AnnotationEditorParams {
+  constructor(options, eventBus) {
     this.eventBus = eventBus;
-    this.l10n = l10n;
-    this._disableNotification = disableNotification;
-
-    this._addEventListeners();
+    this.#bindListeners(options);
   }
 
-  reset() {
-    this.isInitialViewSet = false;
-
-    this._hideUINotification(null);
-
-    this.switchView(SidebarView.THUMBS);
-    this.outlineButton.disabled = false;
-    this.attachmentsButton.disabled = false;
-    this.layersButton.disabled = false;
-  }
-
-  get visibleView() {
-    return this.isOpen ? this.active : SidebarView.NONE;
-  }
-
-  get isThumbnailViewVisible() {
-    return this.isOpen && this.active === SidebarView.THUMBS;
-  }
-
-  get isOutlineViewVisible() {
-    return this.isOpen && this.active === SidebarView.OUTLINE;
-  }
-
-  get isAttachmentsViewVisible() {
-    return this.isOpen && this.active === SidebarView.ATTACHMENTS;
-  }
-
-  get isLayersViewVisible() {
-    return this.isOpen && this.active === SidebarView.LAYERS;
-  }
-
-  setInitialView(view = SidebarView.NONE) {
-    if (this.isInitialViewSet) {
-      return;
-    }
-
-    this.isInitialViewSet = true;
-
-    if (view === SidebarView.NONE || view === SidebarView.UNKNOWN) {
-      this._dispatchEvent();
-
-      return;
-    }
-
-    if (!this._switchView(view, true)) {
-      this._dispatchEvent();
-    }
-  }
-
-  switchView(view, forceOpen = false) {
-    this._switchView(view, forceOpen);
-  }
-
-  _switchView(view, forceOpen = false) {
-    const isViewChanged = view !== this.active;
-    let shouldForceRendering = false;
-
-    switch (view) {
-      case SidebarView.NONE:
-        if (this.isOpen) {
-          this.close();
-          return true;
-        }
-
-        return false;
-
-      case SidebarView.THUMBS:
-        if (this.isOpen && isViewChanged) {
-          shouldForceRendering = true;
-        }
-
-        break;
-
-      case SidebarView.OUTLINE:
-        if (this.outlineButton.disabled) {
-          return false;
-        }
-
-        break;
-
-      case SidebarView.ATTACHMENTS:
-        if (this.attachmentsButton.disabled) {
-          return false;
-        }
-
-        break;
-
-      case SidebarView.LAYERS:
-        if (this.layersButton.disabled) {
-          return false;
-        }
-
-        break;
-
-      default:
-        console.error(`PDFSidebar._switchView: "${view}" is not a valid view.`);
-        return false;
-    }
-
-    this.active = view;
-    this.thumbnailButton.classList.toggle("toggled", view === SidebarView.THUMBS);
-    this.outlineButton.classList.toggle("toggled", view === SidebarView.OUTLINE);
-    this.attachmentsButton.classList.toggle("toggled", view === SidebarView.ATTACHMENTS);
-    this.layersButton.classList.toggle("toggled", view === SidebarView.LAYERS);
-    this.thumbnailView.classList.toggle("hidden", view !== SidebarView.THUMBS);
-    this.outlineView.classList.toggle("hidden", view !== SidebarView.OUTLINE);
-    this.attachmentsView.classList.toggle("hidden", view !== SidebarView.ATTACHMENTS);
-    this.layersView.classList.toggle("hidden", view !== SidebarView.LAYERS);
-
-    if (forceOpen && !this.isOpen) {
-      this.open();
-      return true;
-    }
-
-    if (shouldForceRendering) {
-      this._updateThumbnailViewer();
-
-      this._forceRendering();
-    }
-
-    if (isViewChanged) {
-      this._dispatchEvent();
-    }
-
-    this._hideUINotification(this.active);
-
-    return isViewChanged;
-  }
-
-  open() {
-    if (this.isOpen) {
-      return;
-    }
-
-    this.isOpen = true;
-    this.toggleButton.classList.add("toggled");
-    this.outerContainer.classList.add("sidebarMoving", "sidebarOpen");
-
-    if (this.active === SidebarView.THUMBS) {
-      this._updateThumbnailViewer();
-    }
-
-    this._forceRendering();
-
-    this._dispatchEvent();
-
-    this._hideUINotification(this.active);
-  }
-
-  close() {
-    if (!this.isOpen) {
-      return;
-    }
-
-    this.isOpen = false;
-    this.toggleButton.classList.remove("toggled");
-    this.outerContainer.classList.add("sidebarMoving");
-    this.outerContainer.classList.remove("sidebarOpen");
-
-    this._forceRendering();
-
-    this._dispatchEvent();
-  }
-
-  toggle() {
-    if (this.isOpen) {
-      this.close();
-    } else {
-      this.open();
-    }
-  }
-
-  _dispatchEvent() {
-    this.eventBus.dispatch("sidebarviewchanged", {
-      source: this,
-      view: this.visibleView
-    });
-  }
-
-  _forceRendering() {
-    if (this.onToggled) {
-      this.onToggled();
-    } else {
-      this.pdfViewer.forceRendering();
-      this.pdfThumbnailViewer.forceRendering();
-    }
-  }
-
-  _updateThumbnailViewer() {
-    const {
-      pdfViewer,
-      pdfThumbnailViewer
-    } = this;
-    const pagesCount = pdfViewer.pagesCount;
-
-    for (let pageIndex = 0; pageIndex < pagesCount; pageIndex++) {
-      const pageView = pdfViewer.getPageView(pageIndex);
-
-      if (pageView && pageView.renderingState === _pdf_rendering_queue.RenderingStates.FINISHED) {
-        const thumbnailView = pdfThumbnailViewer.getThumbnail(pageIndex);
-        thumbnailView.setImage(pageView);
-      }
-    }
-
-    pdfThumbnailViewer.scrollThumbnailIntoView(pdfViewer.currentPageNumber);
-  }
-
-  _showUINotification(view) {
-    if (this._disableNotification) {
-      return;
-    }
-
-    this.l10n.get("toggle_sidebar_notification2.title", null, "Toggle Sidebar (document contains outline/attachments/layers)").then(msg => {
-      this.toggleButton.title = msg;
-    });
-
-    if (!this.isOpen) {
-      this.toggleButton.classList.add(UI_NOTIFICATION_CLASS);
-    } else if (view === this.active) {
-      return;
-    }
-
-    switch (view) {
-      case SidebarView.OUTLINE:
-        this.outlineButton.classList.add(UI_NOTIFICATION_CLASS);
-        break;
-
-      case SidebarView.ATTACHMENTS:
-        this.attachmentsButton.classList.add(UI_NOTIFICATION_CLASS);
-        break;
-
-      case SidebarView.LAYERS:
-        this.layersButton.classList.add(UI_NOTIFICATION_CLASS);
-        break;
-    }
-  }
-
-  _hideUINotification(view) {
-    if (this._disableNotification) {
-      return;
-    }
-
-    const removeNotification = sidebarView => {
-      switch (sidebarView) {
-        case SidebarView.OUTLINE:
-          this.outlineButton.classList.remove(UI_NOTIFICATION_CLASS);
-          break;
-
-        case SidebarView.ATTACHMENTS:
-          this.attachmentsButton.classList.remove(UI_NOTIFICATION_CLASS);
-          break;
-
-        case SidebarView.LAYERS:
-          this.layersButton.classList.remove(UI_NOTIFICATION_CLASS);
-          break;
-      }
-    };
-
-    if (!this.isOpen && view !== null) {
-      return;
-    }
-
-    this.toggleButton.classList.remove(UI_NOTIFICATION_CLASS);
-
-    if (view !== null) {
-      removeNotification(view);
-      return;
-    }
-
-    for (view in SidebarView) {
-      removeNotification(SidebarView[view]);
-    }
-
-    this.l10n.get("toggle_sidebar.title", null, "Toggle Sidebar").then(msg => {
-      this.toggleButton.title = msg;
-    });
-  }
-
-  _addEventListeners() {
-    this.viewerContainer.addEventListener("transitionend", evt => {
-      if (evt.target === this.viewerContainer) {
-        this.outerContainer.classList.remove("sidebarMoving");
-      }
-    });
-    this.toggleButton.addEventListener("click", () => {
-      this.toggle();
-    });
-    this.thumbnailButton.addEventListener("click", () => {
-      this.switchView(SidebarView.THUMBS);
-    });
-    this.outlineButton.addEventListener("click", () => {
-      this.switchView(SidebarView.OUTLINE);
-    });
-    this.outlineButton.addEventListener("dblclick", () => {
-      this.eventBus.dispatch("toggleoutlinetree", {
-        source: this
+  #bindListeners({
+    editorFreeTextFontSize,
+    editorFreeTextColor,
+    editorInkColor,
+    editorInkThickness,
+    editorInkOpacity
+  }) {
+    editorFreeTextFontSize.addEventListener("input", evt => {
+      this.eventBus.dispatch("switchannotationeditorparams", {
+        source: this,
+        type: _pdfjsLib.AnnotationEditorParamsType.FREETEXT_SIZE,
+        value: editorFreeTextFontSize.valueAsNumber
       });
     });
-    this.attachmentsButton.addEventListener("click", () => {
-      this.switchView(SidebarView.ATTACHMENTS);
+    editorFreeTextColor.addEventListener("input", evt => {
+      this.eventBus.dispatch("switchannotationeditorparams", {
+        source: this,
+        type: _pdfjsLib.AnnotationEditorParamsType.FREETEXT_COLOR,
+        value: editorFreeTextColor.value
+      });
     });
-    this.layersButton.addEventListener("click", () => {
-      this.switchView(SidebarView.LAYERS);
+    editorInkColor.addEventListener("input", evt => {
+      this.eventBus.dispatch("switchannotationeditorparams", {
+        source: this,
+        type: _pdfjsLib.AnnotationEditorParamsType.INK_COLOR,
+        value: editorInkColor.value
+      });
     });
-    this.layersButton.addEventListener("dblclick", () => {
-      this.eventBus.dispatch("resetlayers", {
-        source: this
+    editorInkThickness.addEventListener("input", evt => {
+      this.eventBus.dispatch("switchannotationeditorparams", {
+        source: this,
+        type: _pdfjsLib.AnnotationEditorParamsType.INK_THICKNESS,
+        value: editorInkThickness.valueAsNumber
+      });
+    });
+    editorInkOpacity.addEventListener("input", evt => {
+      this.eventBus.dispatch("switchannotationeditorparams", {
+        source: this,
+        type: _pdfjsLib.AnnotationEditorParamsType.INK_OPACITY,
+        value: editorInkOpacity.valueAsNumber
       });
     });
 
-    const onTreeLoaded = (count, button, view) => {
-      button.disabled = !count;
+    this.eventBus._on("annotationeditorparamschanged", evt => {
+      for (const [type, value] of evt.details) {
+        switch (type) {
+          case _pdfjsLib.AnnotationEditorParamsType.FREETEXT_SIZE:
+            editorFreeTextFontSize.value = value;
+            break;
 
-      if (count) {
-        this._showUINotification(view);
-      } else if (this.active === view) {
-        this.switchView(SidebarView.THUMBS);
-      }
-    };
+          case _pdfjsLib.AnnotationEditorParamsType.FREETEXT_COLOR:
+            editorFreeTextColor.value = value;
+            break;
 
-    this.eventBus._on("outlineloaded", evt => {
-      onTreeLoaded(evt.outlineCount, this.outlineButton, SidebarView.OUTLINE);
-    });
+          case _pdfjsLib.AnnotationEditorParamsType.INK_COLOR:
+            editorInkColor.value = value;
+            break;
 
-    this.eventBus._on("attachmentsloaded", evt => {
-      onTreeLoaded(evt.attachmentsCount, this.attachmentsButton, SidebarView.ATTACHMENTS);
-    });
+          case _pdfjsLib.AnnotationEditorParamsType.INK_THICKNESS:
+            editorInkThickness.value = value;
+            break;
 
-    this.eventBus._on("layersloaded", evt => {
-      onTreeLoaded(evt.layersCount, this.layersButton, SidebarView.LAYERS);
-    });
-
-    this.eventBus._on("presentationmodechanged", evt => {
-      if (!evt.active && !evt.switchInProgress && this.isThumbnailViewVisible) {
-        this._updateThumbnailViewer();
+          case _pdfjsLib.AnnotationEditorParamsType.INK_OPACITY:
+            editorInkOpacity.value = value;
+            break;
+        }
       }
     });
   }
 
 }
 
-exports.PDFSidebar = PDFSidebar;
+exports.AnnotationEditorParams = AnnotationEditorParams;
 
 /***/ }),
 /* 10 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.OverlayManager = void 0;
 
 class OverlayManager {
-  constructor() {
-    this._overlays = {};
-    this._active = null;
-    this._keyDownBound = this._keyDown.bind(this);
-  }
+  #overlays = new WeakMap();
+  #active = null;
 
   get active() {
-    return this._active;
+    return this.#active;
   }
 
-  async register(name, element, callerCloseMethod = null, canForceClose = false) {
-    let container;
-
-    if (!name || !element || !(container = element.parentNode)) {
+  async register(dialog, canForceClose = false) {
+    if (typeof dialog !== "object") {
       throw new Error("Not enough parameters.");
-    } else if (this._overlays[name]) {
+    } else if (this.#overlays.has(dialog)) {
       throw new Error("The overlay is already registered.");
     }
 
-    this._overlays[name] = {
-      element,
-      container,
-      callerCloseMethod,
+    this.#overlays.set(dialog, {
       canForceClose
-    };
+    });
+    dialog.addEventListener("cancel", evt => {
+      this.#active = null;
+    });
   }
 
-  async unregister(name) {
-    if (!this._overlays[name]) {
+  async unregister(dialog) {
+    if (!this.#overlays.has(dialog)) {
       throw new Error("The overlay does not exist.");
-    } else if (this._active === name) {
+    } else if (this.#active === dialog) {
       throw new Error("The overlay cannot be removed while it is active.");
     }
 
-    delete this._overlays[name];
+    this.#overlays.delete(dialog);
   }
 
-  async open(name) {
-    if (!this._overlays[name]) {
+  async open(dialog) {
+    if (!this.#overlays.has(dialog)) {
       throw new Error("The overlay does not exist.");
-    } else if (this._active) {
-      if (this._overlays[name].canForceClose) {
-        this._closeThroughCaller();
-      } else if (this._active === name) {
+    } else if (this.#active) {
+      if (this.#active === dialog) {
         throw new Error("The overlay is already active.");
+      } else if (this.#overlays.get(dialog).canForceClose) {
+        await this.close();
       } else {
         throw new Error("Another overlay is currently active.");
       }
     }
 
-    this._active = name;
-
-    this._overlays[this._active].element.classList.remove("hidden");
-
-    this._overlays[this._active].container.classList.remove("hidden");
-
-    window.addEventListener("keydown", this._keyDownBound);
+    this.#active = dialog;
+    dialog.showModal();
   }
 
-  async close(name) {
-    if (!this._overlays[name]) {
+  async close(dialog = this.#active) {
+    if (!this.#overlays.has(dialog)) {
       throw new Error("The overlay does not exist.");
-    } else if (!this._active) {
+    } else if (!this.#active) {
       throw new Error("The overlay is currently not active.");
-    } else if (this._active !== name) {
+    } else if (this.#active !== dialog) {
       throw new Error("Another overlay is currently active.");
     }
 
-    this._overlays[this._active].container.classList.add("hidden");
-
-    this._overlays[this._active].element.classList.add("hidden");
-
-    this._active = null;
-    window.removeEventListener("keydown", this._keyDownBound);
-  }
-
-  _keyDown(evt) {
-    if (this._active && evt.keyCode === 27) {
-      this._closeThroughCaller();
-
-      evt.preventDefault();
-    }
-  }
-
-  _closeThroughCaller() {
-    if (this._overlays[this._active].callerCloseMethod) {
-      this._overlays[this._active].callerCloseMethod();
-    }
-
-    if (this._active) {
-      this.close(this._active);
-    }
+    dialog.close();
+    this.#active = null;
   }
 
 }
@@ -4966,77 +4912,102 @@ exports.OverlayManager = OverlayManager;
 
 /***/ }),
 /* 11 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PasswordPrompt = void 0;
 
-var _ui_utils = __webpack_require__(2);
-
 var _pdfjsLib = __webpack_require__(5);
 
 class PasswordPrompt {
-  constructor(options, overlayManager, l10n = _ui_utils.NullL10n) {
-    this.overlayName = options.overlayName;
-    this.container = options.container;
+  #activeCapability = null;
+  #updateCallback = null;
+  #reason = null;
+
+  constructor(options, overlayManager, l10n, isViewerEmbedded = false) {
+    this.dialog = options.dialog;
     this.label = options.label;
     this.input = options.input;
     this.submitButton = options.submitButton;
     this.cancelButton = options.cancelButton;
     this.overlayManager = overlayManager;
     this.l10n = l10n;
-    this.updateCallback = null;
-    this.reason = null;
-    this.submitButton.addEventListener("click", this.verify.bind(this));
+    this._isViewerEmbedded = isViewerEmbedded;
+    this.submitButton.addEventListener("click", this.#verify.bind(this));
     this.cancelButton.addEventListener("click", this.close.bind(this));
     this.input.addEventListener("keydown", e => {
       if (e.keyCode === 13) {
-        this.verify();
+        this.#verify();
       }
     });
-    this.overlayManager.register(this.overlayName, this.container, this.close.bind(this), true);
+    this.overlayManager.register(this.dialog, true);
+    this.dialog.addEventListener("close", this.#cancel.bind(this));
   }
 
-  open() {
-    this.overlayManager.open(this.overlayName).then(() => {
+  async open() {
+    if (this.#activeCapability) {
+      await this.#activeCapability.promise;
+    }
+
+    this.#activeCapability = (0, _pdfjsLib.createPromiseCapability)();
+
+    try {
+      await this.overlayManager.open(this.dialog);
+    } catch (ex) {
+      this.#activeCapability = null;
+      throw ex;
+    }
+
+    const passwordIncorrect = this.#reason === _pdfjsLib.PasswordResponses.INCORRECT_PASSWORD;
+
+    if (!this._isViewerEmbedded || passwordIncorrect) {
       this.input.focus();
-      let promptString;
+    }
 
-      if (this.reason === _pdfjsLib.PasswordResponses.INCORRECT_PASSWORD) {
-        promptString = this.l10n.get("password_invalid", null, "Invalid password. Please try again.");
-      } else {
-        promptString = this.l10n.get("password_label", null, "Enter the password to open this PDF file.");
-      }
-
-      promptString.then(msg => {
-        this.label.textContent = msg;
-      });
-    });
+    this.label.textContent = await this.l10n.get(`password_${passwordIncorrect ? "invalid" : "label"}`);
   }
 
-  close() {
-    this.overlayManager.close(this.overlayName).then(() => {
-      this.input.value = "";
-    });
-  }
-
-  verify() {
-    const password = this.input.value;
-
-    if (password && password.length > 0) {
-      this.close();
-      this.updateCallback(password);
+  async close() {
+    if (this.overlayManager.active === this.dialog) {
+      this.overlayManager.close(this.dialog);
     }
   }
 
-  setUpdateCallback(updateCallback, reason) {
-    this.updateCallback = updateCallback;
-    this.reason = reason;
+  #verify() {
+    const password = this.input.value;
+
+    if (password?.length > 0) {
+      this.#invokeCallback(password);
+    }
+  }
+
+  #cancel() {
+    this.#invokeCallback(new Error("PasswordPrompt cancelled."));
+    this.#activeCapability.resolve();
+  }
+
+  #invokeCallback(password) {
+    if (!this.#updateCallback) {
+      return;
+    }
+
+    this.close();
+    this.input.value = "";
+    this.#updateCallback(password);
+    this.#updateCallback = null;
+  }
+
+  async setUpdateCallback(updateCallback, reason) {
+    if (this.#activeCapability) {
+      await this.#activeCapability.promise;
+    }
+
+    this.#updateCallback = updateCallback;
+    this.#reason = reason;
   }
 
 }
@@ -5045,30 +5016,27 @@ exports.PasswordPrompt = PasswordPrompt;
 
 /***/ }),
 /* 12 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFAttachmentViewer = void 0;
 
 var _pdfjsLib = __webpack_require__(5);
 
 var _base_tree_viewer = __webpack_require__(13);
 
-var _viewer_compatibility = __webpack_require__(4);
-
-const PdfFileRegExp = /\.pdf$/i;
+var _event_utils = __webpack_require__(6);
 
 class PDFAttachmentViewer extends _base_tree_viewer.BaseTreeViewer {
   constructor(options) {
     super(options);
     this.downloadManager = options.downloadManager;
 
-    this.eventBus._on("fileattachmentannotation", this._appendAttachment.bind(this));
+    this.eventBus._on("fileattachmentannotation", this.#appendAttachment.bind(this));
   }
 
   reset(keepRenderedCapability = false) {
@@ -5079,74 +5047,38 @@ class PDFAttachmentViewer extends _base_tree_viewer.BaseTreeViewer {
       this._renderedCapability = (0, _pdfjsLib.createPromiseCapability)();
     }
 
-    if (this._pendingDispatchEvent) {
-      clearTimeout(this._pendingDispatchEvent);
-    }
-
-    this._pendingDispatchEvent = null;
+    this._pendingDispatchEvent = false;
   }
 
-  _dispatchEvent(attachmentsCount) {
+  async _dispatchEvent(attachmentsCount) {
     this._renderedCapability.resolve();
 
-    if (this._pendingDispatchEvent) {
-      clearTimeout(this._pendingDispatchEvent);
-      this._pendingDispatchEvent = null;
-    }
-
-    if (attachmentsCount === 0) {
-      this._pendingDispatchEvent = setTimeout(() => {
-        this.eventBus.dispatch("attachmentsloaded", {
-          source: this,
-          attachmentsCount: 0
-        });
-        this._pendingDispatchEvent = null;
+    if (attachmentsCount === 0 && !this._pendingDispatchEvent) {
+      this._pendingDispatchEvent = true;
+      await (0, _event_utils.waitOnEventOrTimeout)({
+        target: this.eventBus,
+        name: "annotationlayerrendered",
+        delay: 1000
       });
-      return;
+
+      if (!this._pendingDispatchEvent) {
+        return;
+      }
     }
 
+    this._pendingDispatchEvent = false;
     this.eventBus.dispatch("attachmentsloaded", {
       source: this,
       attachmentsCount
     });
   }
 
-  _bindPdfLink(element, {
-    content,
-    filename
-  }) {
-    let blobUrl;
-
-    element.onclick = () => {
-      if (!blobUrl) {
-        blobUrl = URL.createObjectURL(new Blob([content], {
-          type: "application/pdf"
-        }));
-      }
-
-      let viewerUrl;
-      viewerUrl = "?file=" + encodeURIComponent(blobUrl + "#" + filename);
-
-      try {
-        window.open(viewerUrl);
-      } catch (ex) {
-        console.error(`_bindPdfLink: ${ex}`);
-        URL.revokeObjectURL(blobUrl);
-        blobUrl = null;
-        this.downloadManager.downloadData(content, filename, "application/pdf");
-      }
-
-      return false;
-    };
-  }
-
   _bindLink(element, {
     content,
     filename
   }) {
     element.onclick = () => {
-      const contentType = PdfFileRegExp.test(filename) ? "application/pdf" : "";
-      this.downloadManager.downloadData(content, filename, contentType);
+      this.downloadManager.openOrDownloadData(element, content, filename);
       return false;
     };
   }
@@ -5175,36 +5107,27 @@ class PDFAttachmentViewer extends _base_tree_viewer.BaseTreeViewer {
 
     for (const name of names) {
       const item = attachments[name];
-      const filename = (0, _pdfjsLib.getFilenameFromUrl)(item.filename);
+      const content = item.content,
+            filename = (0, _pdfjsLib.getFilenameFromUrl)(item.filename);
       const div = document.createElement("div");
       div.className = "treeItem";
       const element = document.createElement("a");
 
-      if (PdfFileRegExp.test(filename) && !_viewer_compatibility.viewerCompatibilityParams.disableCreateObjectURL) {
-        this._bindPdfLink(element, {
-          content: item.content,
-          filename
-        });
-      } else {
-        this._bindLink(element, {
-          content: item.content,
-          filename
-        });
-      }
+      this._bindLink(element, {
+        content,
+        filename
+      });
 
       element.textContent = this._normalizeTextContent(filename);
-      div.appendChild(element);
-      fragment.appendChild(div);
+      div.append(element);
+      fragment.append(div);
       attachmentsCount++;
     }
 
-    this.container.appendChild(fragment);
-
-    this._dispatchEvent(attachmentsCount);
+    this._finishRendering(fragment, attachmentsCount);
   }
 
-  _appendAttachment({
-    id,
+  #appendAttachment({
     filename,
     content
   }) {
@@ -5214,19 +5137,15 @@ class PDFAttachmentViewer extends _base_tree_viewer.BaseTreeViewer {
         return;
       }
 
-      let attachments = this._attachments;
+      const attachments = this._attachments || Object.create(null);
 
-      if (!attachments) {
-        attachments = Object.create(null);
-      } else {
-        for (const name in attachments) {
-          if (id === name) {
-            return;
-          }
+      for (const name in attachments) {
+        if (filename === name) {
+          return;
         }
       }
 
-      attachments[id] = {
+      attachments[filename] = {
         filename,
         content
       };
@@ -5243,17 +5162,19 @@ exports.PDFAttachmentViewer = PDFAttachmentViewer;
 
 /***/ }),
 /* 13 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.BaseTreeViewer = void 0;
 
-var _pdfjsLib = __webpack_require__(5);
+var _ui_utils = __webpack_require__(1);
+
+const TREEITEM_OFFSET_TOP = -100;
+const TREEITEM_SELECTED_CLASS = "selected";
 
 class BaseTreeViewer {
   constructor(options) {
@@ -5267,7 +5188,9 @@ class BaseTreeViewer {
   }
 
   reset() {
+    this._pdfDocument = null;
     this._lastToggleIsShow = true;
+    this._currentTreeItem = null;
     this.container.textContent = "";
     this.container.classList.remove("treeWithDeepNesting");
   }
@@ -5281,7 +5204,7 @@ class BaseTreeViewer {
   }
 
   _normalizeTextContent(str) {
-    return (0, _pdfjsLib.removeNullCharacters)(str) || "\u2013";
+    return (0, _ui_utils.removeNullCharacters)(str, true) || "\u2013";
   }
 
   _addToggleButton(div, hidden = false) {
@@ -5303,7 +5226,7 @@ class BaseTreeViewer {
       }
     };
 
-    div.insertBefore(toggler, div.firstChild);
+    div.prepend(toggler);
   }
 
   _toggleTreeItem(root, show = false) {
@@ -5318,29 +5241,73 @@ class BaseTreeViewer {
     this._toggleTreeItem(this.container, !this._lastToggleIsShow);
   }
 
+  _finishRendering(fragment, count, hasAnyNesting = false) {
+    if (hasAnyNesting) {
+      this.container.classList.add("treeWithDeepNesting");
+      this._lastToggleIsShow = !fragment.querySelector(".treeItemsHidden");
+    }
+
+    this.container.append(fragment);
+
+    this._dispatchEvent(count);
+  }
+
   render(params) {
     throw new Error("Not implemented: render");
   }
 
+  _updateCurrentTreeItem(treeItem = null) {
+    if (this._currentTreeItem) {
+      this._currentTreeItem.classList.remove(TREEITEM_SELECTED_CLASS);
+
+      this._currentTreeItem = null;
+    }
+
+    if (treeItem) {
+      treeItem.classList.add(TREEITEM_SELECTED_CLASS);
+      this._currentTreeItem = treeItem;
+    }
+  }
+
+  _scrollToCurrentTreeItem(treeItem) {
+    if (!treeItem) {
+      return;
+    }
+
+    let currentNode = treeItem.parentNode;
+
+    while (currentNode && currentNode !== this.container) {
+      if (currentNode.classList.contains("treeItem")) {
+        const toggler = currentNode.firstElementChild;
+        toggler?.classList.remove("treeItemsHidden");
+      }
+
+      currentNode = currentNode.parentNode;
+    }
+
+    this._updateCurrentTreeItem(treeItem);
+
+    this.container.scrollTo(treeItem.offsetLeft, treeItem.offsetTop + TREEITEM_OFFSET_TOP);
+  }
+
 }
 
 exports.BaseTreeViewer = BaseTreeViewer;
 
 /***/ }),
 /* 14 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFDocumentProperties = void 0;
 
 var _pdfjsLib = __webpack_require__(5);
 
-var _ui_utils = __webpack_require__(2);
+var _ui_utils = __webpack_require__(1);
 
 const DEFAULT_FIELD_CONTENT = "-";
 const NON_METRIC_LOCALES = ["en-us", "en-lr", "my"];
@@ -5360,22 +5327,21 @@ function getPageName(size, isPortrait, pageNames) {
 }
 
 class PDFDocumentProperties {
+  #fieldData = null;
+
   constructor({
-    overlayName,
+    dialog,
     fields,
-    container,
     closeButton
-  }, overlayManager, eventBus, l10n = _ui_utils.NullL10n) {
-    this.overlayName = overlayName;
+  }, overlayManager, eventBus, l10n, fileNameLookup) {
+    this.dialog = dialog;
     this.fields = fields;
-    this.container = container;
     this.overlayManager = overlayManager;
     this.l10n = l10n;
-
-    this._reset();
-
+    this._fileNameLookup = fileNameLookup;
+    this.#reset();
     closeButton.addEventListener("click", this.close.bind(this));
-    this.overlayManager.register(this.overlayName, this.container, this.close.bind(this));
+    this.overlayManager.register(this.dialog);
 
     eventBus._on("pagechanging", evt => {
       this._currentPageNumber = evt.pageNumber;
@@ -5391,85 +5357,64 @@ class PDFDocumentProperties {
     });
   }
 
-  open() {
-    const freezeFieldData = data => {
-      Object.defineProperty(this, "fieldData", {
-        value: Object.freeze(data),
-        writable: false,
-        enumerable: true,
-        configurable: true
-      });
-    };
+  async open() {
+    await Promise.all([this.overlayManager.open(this.dialog), this._dataAvailableCapability.promise]);
+    const currentPageNumber = this._currentPageNumber;
+    const pagesRotation = this._pagesRotation;
 
-    Promise.all([this.overlayManager.open(this.overlayName), this._dataAvailableCapability.promise]).then(() => {
-      const currentPageNumber = this._currentPageNumber;
-      const pagesRotation = this._pagesRotation;
+    if (this.#fieldData && currentPageNumber === this.#fieldData._currentPageNumber && pagesRotation === this.#fieldData._pagesRotation) {
+      this.#updateUI();
+      return;
+    }
 
-      if (this.fieldData && currentPageNumber === this.fieldData._currentPageNumber && pagesRotation === this.fieldData._pagesRotation) {
-        this._updateUI();
-
-        return;
-      }
-
-      this.pdfDocument.getMetadata().then(({
-        info,
-        metadata,
-        contentDispositionFilename
-      }) => {
-        return Promise.all([info, metadata, contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url), this._parseFileSize(this.maybeFileSize), this._parseDate(info.CreationDate), this._parseDate(info.ModDate), this.pdfDocument.getPage(currentPageNumber).then(pdfPage => {
-          return this._parsePageSize((0, _ui_utils.getPageSizeInches)(pdfPage), pagesRotation);
-        }), this._parseLinearization(info.IsLinearized)]);
-      }).then(([info, metadata, fileName, fileSize, creationDate, modDate, pageSize, isLinearized]) => {
-        freezeFieldData({
-          fileName,
-          fileSize,
-          title: info.Title,
-          author: info.Author,
-          subject: info.Subject,
-          keywords: info.Keywords,
-          creationDate,
-          modificationDate: modDate,
-          creator: info.Creator,
-          producer: info.Producer,
-          version: info.PDFFormatVersion,
-          pageCount: this.pdfDocument.numPages,
-          pageSize,
-          linearized: isLinearized,
-          _currentPageNumber: currentPageNumber,
-          _pagesRotation: pagesRotation
-        });
-
-        this._updateUI();
-
-        return this.pdfDocument.getDownloadInfo();
-      }).then(({
-        length
-      }) => {
-        this.maybeFileSize = length;
-        return this._parseFileSize(length);
-      }).then(fileSize => {
-        if (fileSize === this.fieldData.fileSize) {
-          return;
-        }
-
-        const data = Object.assign(Object.create(null), this.fieldData);
-        data.fileSize = fileSize;
-        freezeFieldData(data);
-
-        this._updateUI();
-      });
+    const {
+      info,
+      contentLength
+    } = await this.pdfDocument.getMetadata();
+    const [fileName, fileSize, creationDate, modificationDate, pageSize, isLinearized] = await Promise.all([this._fileNameLookup(), this.#parseFileSize(contentLength), this.#parseDate(info.CreationDate), this.#parseDate(info.ModDate), this.pdfDocument.getPage(currentPageNumber).then(pdfPage => {
+      return this.#parsePageSize((0, _ui_utils.getPageSizeInches)(pdfPage), pagesRotation);
+    }), this.#parseLinearization(info.IsLinearized)]);
+    this.#fieldData = Object.freeze({
+      fileName,
+      fileSize,
+      title: info.Title,
+      author: info.Author,
+      subject: info.Subject,
+      keywords: info.Keywords,
+      creationDate,
+      modificationDate,
+      creator: info.Creator,
+      producer: info.Producer,
+      version: info.PDFFormatVersion,
+      pageCount: this.pdfDocument.numPages,
+      pageSize,
+      linearized: isLinearized,
+      _currentPageNumber: currentPageNumber,
+      _pagesRotation: pagesRotation
     });
+    this.#updateUI();
+    const {
+      length
+    } = await this.pdfDocument.getDownloadInfo();
+
+    if (contentLength === length) {
+      return;
+    }
+
+    const data = Object.assign(Object.create(null), this.#fieldData);
+    data.fileSize = await this.#parseFileSize(length);
+    this.#fieldData = Object.freeze(data);
+    this.#updateUI();
   }
 
-  close() {
-    this.overlayManager.close(this.overlayName);
+  async close() {
+    this.overlayManager.close(this.dialog);
   }
 
-  setDocument(pdfDocument, url = null) {
+  setDocument(pdfDocument) {
     if (this.pdfDocument) {
-      this._reset();
-
-      this._updateUI(true);
+      this.#reset();
+      this.#updateUI(true);
     }
 
     if (!pdfDocument) {
@@ -5477,29 +5422,20 @@ class PDFDocumentProperties {
     }
 
     this.pdfDocument = pdfDocument;
-    this.url = url;
 
     this._dataAvailableCapability.resolve();
   }
 
-  setFileSize(fileSize) {
-    if (Number.isInteger(fileSize) && fileSize > 0) {
-      this.maybeFileSize = fileSize;
-    }
-  }
-
-  _reset() {
+  #reset() {
     this.pdfDocument = null;
-    this.url = null;
-    this.maybeFileSize = 0;
-    delete this.fieldData;
+    this.#fieldData = null;
     this._dataAvailableCapability = (0, _pdfjsLib.createPromiseCapability)();
     this._currentPageNumber = 1;
     this._pagesRotation = 0;
   }
 
-  _updateUI(reset = false) {
-    if (reset || !this.fieldData) {
+  #updateUI(reset = false) {
+    if (reset || !this.#fieldData) {
       for (const id in this.fields) {
         this.fields[id].textContent = DEFAULT_FIELD_CONTENT;
       }
@@ -5507,35 +5443,32 @@ class PDFDocumentProperties {
       return;
     }
 
-    if (this.overlayManager.active !== this.overlayName) {
+    if (this.overlayManager.active !== this.dialog) {
       return;
     }
 
     for (const id in this.fields) {
-      const content = this.fieldData[id];
+      const content = this.#fieldData[id];
       this.fields[id].textContent = content || content === 0 ? content : DEFAULT_FIELD_CONTENT;
     }
   }
 
-  async _parseFileSize(fileSize = 0) {
-    const kb = fileSize / 1024;
+  async #parseFileSize(fileSize = 0) {
+    const kb = fileSize / 1024,
+          mb = kb / 1024;
 
     if (!kb) {
       return undefined;
-    } else if (kb < 1024) {
-      return this.l10n.get("document_properties_kb", {
-        size_kb: (+kb.toPrecision(3)).toLocaleString(),
-        size_b: fileSize.toLocaleString()
-      }, "{{size_kb}} KB ({{size_b}} bytes)");
     }
 
-    return this.l10n.get("document_properties_mb", {
-      size_mb: (+(kb / 1024).toPrecision(3)).toLocaleString(),
+    return this.l10n.get(`document_properties_${mb >= 1 ? "mb" : "kb"}`, {
+      size_mb: mb >= 1 && (+mb.toPrecision(3)).toLocaleString(),
+      size_kb: mb < 1 && (+kb.toPrecision(3)).toLocaleString(),
       size_b: fileSize.toLocaleString()
-    }, "{{size_mb}} MB ({{size_b}} bytes)");
+    });
   }
 
-  async _parsePageSize(pageSizeInches, pagesRotation) {
+  async #parsePageSize(pageSizeInches, pagesRotation) {
     if (!pageSizeInches) {
       return undefined;
     }
@@ -5556,7 +5489,6 @@ class PDFDocumentProperties {
       width: Math.round(pageSizeInches.width * 25.4 * 10) / 10,
       height: Math.round(pageSizeInches.height * 25.4 * 10) / 10
     };
-    let pageName = null;
     let rawName = getPageName(sizeInches, isPortrait, US_PAGE_NAMES) || getPageName(sizeMillimeters, isPortrait, METRIC_PAGE_NAMES);
 
     if (!rawName && !(Number.isInteger(sizeMillimeters.width) && Number.isInteger(sizeMillimeters.height))) {
@@ -5582,25 +5514,20 @@ class PDFDocumentProperties {
       }
     }
 
-    if (rawName) {
-      pageName = this.l10n.get("document_properties_page_size_name_" + rawName.toLowerCase(), null, rawName);
-    }
-
-    return Promise.all([this._isNonMetricLocale ? sizeInches : sizeMillimeters, this.l10n.get("document_properties_page_size_unit_" + (this._isNonMetricLocale ? "inches" : "millimeters"), null, this._isNonMetricLocale ? "in" : "mm"), pageName, this.l10n.get("document_properties_page_size_orientation_" + (isPortrait ? "portrait" : "landscape"), null, isPortrait ? "portrait" : "landscape")]).then(([{
+    const [{
       width,
       height
-    }, unit, name, orientation]) => {
-      return this.l10n.get("document_properties_page_size_dimension_" + (name ? "name_" : "") + "string", {
-        width: width.toLocaleString(),
-        height: height.toLocaleString(),
-        unit,
-        name,
-        orientation
-      }, "{{width}} × {{height}} {{unit}} (" + (name ? "{{name}}, " : "") + "{{orientation}})");
+    }, unit, name, orientation] = await Promise.all([this._isNonMetricLocale ? sizeInches : sizeMillimeters, this.l10n.get(`document_properties_page_size_unit_${this._isNonMetricLocale ? "inches" : "millimeters"}`), rawName && this.l10n.get(`document_properties_page_size_name_${rawName.toLowerCase()}`), this.l10n.get(`document_properties_page_size_orientation_${isPortrait ? "portrait" : "landscape"}`)]);
+    return this.l10n.get(`document_properties_page_size_dimension_${name ? "name_" : ""}string`, {
+      width: width.toLocaleString(),
+      height: height.toLocaleString(),
+      unit,
+      name,
+      orientation
     });
   }
 
-  async _parseDate(inputDate) {
+  async #parseDate(inputDate) {
     const dateObject = _pdfjsLib.PDFDateString.toDateObject(inputDate);
 
     if (!dateObject) {
@@ -5610,11 +5537,11 @@ class PDFDocumentProperties {
     return this.l10n.get("document_properties_date_string", {
       date: dateObject.toLocaleDateString(),
       time: dateObject.toLocaleTimeString()
-    }, "{{date}}, {{time}}");
+    });
   }
 
-  _parseLinearization(isLinearized) {
-    return this.l10n.get("document_properties_linearized_" + (isLinearized ? "yes" : "no"), null, isLinearized ? "Yes" : "No");
+  #parseLinearization(isLinearized) {
+    return this.l10n.get(`document_properties_linearized_${isLinearized ? "yes" : "no"}`);
   }
 
 }
@@ -5623,35 +5550,33 @@ exports.PDFDocumentProperties = PDFDocumentProperties;
 
 /***/ }),
 /* 15 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFFindBar = void 0;
 
 var _pdf_find_controller = __webpack_require__(16);
 
-var _ui_utils = __webpack_require__(2);
-
 const MATCHES_COUNT_LIMIT = 1000;
 
 class PDFFindBar {
-  constructor(options, eventBus, l10n = _ui_utils.NullL10n) {
+  constructor(options, eventBus, l10n) {
     this.opened = false;
-    this.bar = options.bar || null;
-    this.toggleButton = options.toggleButton || null;
-    this.findField = options.findField || null;
-    this.highlightAll = options.highlightAllCheckbox || null;
-    this.caseSensitive = options.caseSensitiveCheckbox || null;
-    this.entireWord = options.entireWordCheckbox || null;
-    this.findMsg = options.findMsg || null;
-    this.findResultsCount = options.findResultsCount || null;
-    this.findPreviousButton = options.findPreviousButton || null;
-    this.findNextButton = options.findNextButton || null;
+    this.bar = options.bar;
+    this.toggleButton = options.toggleButton;
+    this.findField = options.findField;
+    this.highlightAll = options.highlightAllCheckbox;
+    this.caseSensitive = options.caseSensitiveCheckbox;
+    this.matchDiacritics = options.matchDiacriticsCheckbox;
+    this.entireWord = options.entireWordCheckbox;
+    this.findMsg = options.findMsg;
+    this.findResultsCount = options.findResultsCount;
+    this.findPreviousButton = options.findPreviousButton;
+    this.findNextButton = options.findNextButton;
     this.eventBus = eventBus;
     this.l10n = l10n;
     this.toggleButton.addEventListener("click", () => {
@@ -5689,15 +5614,18 @@ class PDFFindBar {
     this.entireWord.addEventListener("click", () => {
       this.dispatchEvent("entirewordchange");
     });
+    this.matchDiacritics.addEventListener("click", () => {
+      this.dispatchEvent("diacriticmatchingchange");
+    });
 
-    this.eventBus._on("resize", this._adjustWidth.bind(this));
+    this.eventBus._on("resize", this.#adjustWidth.bind(this));
   }
 
   reset() {
     this.updateUIState();
   }
 
-  dispatchEvent(type, findPrev) {
+  dispatchEvent(type, findPrev = false) {
     this.eventBus.dispatch("find", {
       source: this,
       type,
@@ -5706,13 +5634,13 @@ class PDFFindBar {
       caseSensitive: this.caseSensitive.checked,
       entireWord: this.entireWord.checked,
       highlightAll: this.highlightAll.checked,
-      findPrevious: findPrev
+      findPrevious: findPrev,
+      matchDiacritics: this.matchDiacritics.checked
     });
   }
 
   updateUIState(state, previous, matchesCount) {
-    let notFound = false;
-    let findMsg = "";
+    let findMsg = Promise.resolve("");
     let status = "";
 
     switch (state) {
@@ -5724,26 +5652,20 @@ class PDFFindBar {
         break;
 
       case _pdf_find_controller.FindState.NOT_FOUND:
-        findMsg = this.l10n.get("find_not_found", null, "Phrase not found");
-        notFound = true;
+        findMsg = this.l10n.get("find_not_found");
+        status = "notFound";
         break;
 
       case _pdf_find_controller.FindState.WRAPPED:
-        if (previous) {
-          findMsg = this.l10n.get("find_reached_top", null, "Reached top of document, continued from bottom");
-        } else {
-          findMsg = this.l10n.get("find_reached_bottom", null, "Reached end of document, continued from top");
-        }
-
+        findMsg = this.l10n.get(`find_reached_${previous ? "top" : "bottom"}`);
         break;
     }
 
-    this.findField.classList.toggle("notFound", notFound);
     this.findField.setAttribute("data-status", status);
-    Promise.resolve(findMsg).then(msg => {
+    this.findField.setAttribute("aria-invalid", state === _pdf_find_controller.FindState.NOT_FOUND);
+    findMsg.then(msg => {
       this.findMsg.textContent = msg;
-
-      this._adjustWidth();
+      this.#adjustWidth();
     });
     this.updateResultsCount(matchesCount);
   }
@@ -5752,31 +5674,27 @@ class PDFFindBar {
     current = 0,
     total = 0
   } = {}) {
-    if (!this.findResultsCount) {
-      return;
-    }
-
     const limit = MATCHES_COUNT_LIMIT;
-    let matchesCountMsg = "";
+    let matchCountMsg = Promise.resolve("");
 
     if (total > 0) {
       if (total > limit) {
-        matchesCountMsg = this.l10n.get("find_match_count_limit", {
+        let key = "find_match_count_limit";
+        matchCountMsg = this.l10n.get(key, {
           limit
-        }, "More than {{limit}} match" + (limit !== 1 ? "es" : ""));
+        });
       } else {
-        matchesCountMsg = this.l10n.get("find_match_count", {
+        let key = "find_match_count";
+        matchCountMsg = this.l10n.get(key, {
           current,
           total
-        }, "{{current}} of {{total}} match" + (total !== 1 ? "es" : ""));
+        });
       }
     }
 
-    Promise.resolve(matchesCountMsg).then(msg => {
+    matchCountMsg.then(msg => {
       this.findResultsCount.textContent = msg;
-      this.findResultsCount.classList.toggle("hidden", !total);
-
-      this._adjustWidth();
+      this.#adjustWidth();
     });
   }
 
@@ -5784,13 +5702,13 @@ class PDFFindBar {
     if (!this.opened) {
       this.opened = true;
       this.toggleButton.classList.add("toggled");
+      this.toggleButton.setAttribute("aria-expanded", "true");
       this.bar.classList.remove("hidden");
     }
 
     this.findField.select();
     this.findField.focus();
-
-    this._adjustWidth();
+    this.#adjustWidth();
   }
 
   close() {
@@ -5800,6 +5718,7 @@ class PDFFindBar {
 
     this.opened = false;
     this.toggleButton.classList.remove("toggled");
+    this.toggleButton.setAttribute("aria-expanded", "false");
     this.bar.classList.add("hidden");
     this.eventBus.dispatch("findbarclose", {
       source: this
@@ -5814,7 +5733,7 @@ class PDFFindBar {
     }
   }
 
-  _adjustWidth() {
+  #adjustWidth() {
     if (!this.opened) {
       return;
     }
@@ -5834,22 +5753,21 @@ exports.PDFFindBar = PDFFindBar;
 
 /***/ }),
 /* 16 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFFindController = exports.FindState = void 0;
 
+var _ui_utils = __webpack_require__(1);
+
 var _pdfjsLib = __webpack_require__(5);
 
 var _pdf_find_utils = __webpack_require__(17);
 
-var _ui_utils = __webpack_require__(2);
-
 const FindState = {
   FOUND: 0,
   NOT_FOUND: 1,
@@ -5861,6 +5779,7 @@ const FIND_TIMEOUT = 250;
 const MATCH_SCROLL_OFFSET_TOP = -50;
 const MATCH_SCROLL_OFFSET_LEFT = -400;
 const CHARACTERS_TO_NORMALIZE = {
+  "\u2010": "-",
   "\u2018": "'",
   "\u2019": "'",
   "\u201A": "'",
@@ -5873,17 +5792,169 @@ const CHARACTERS_TO_NORMALIZE = {
   "\u00BD": "1/2",
   "\u00BE": "3/4"
 };
-let normalizationRegex = null;
+const DIACRITICS_EXCEPTION = new Set([0x3099, 0x309a, 0x094d, 0x09cd, 0x0a4d, 0x0acd, 0x0b4d, 0x0bcd, 0x0c4d, 0x0ccd, 0x0d3b, 0x0d3c, 0x0d4d, 0x0dca, 0x0e3a, 0x0eba, 0x0f84, 0x1039, 0x103a, 0x1714, 0x1734, 0x17d2, 0x1a60, 0x1b44, 0x1baa, 0x1bab, 0x1bf2, 0x1bf3, 0x2d7f, 0xa806, 0xa82c, 0xa8c4, 0xa953, 0xa9c0, 0xaaf6, 0xabed, 0x0c56, 0x0f71, 0x0f72, 0x0f7a, 0x0f7b, 0x0f7c, 0x0f7d, 0x0f80, 0x0f74]);
+const DIACRITICS_EXCEPTION_STR = [...DIACRITICS_EXCEPTION.values()].map(x => String.fromCharCode(x)).join("");
+const DIACRITICS_REG_EXP = /\p{M}+/gu;
+const SPECIAL_CHARS_REG_EXP = /([.*+?^${}()|[\]\\])|(\p{P})|(\s+)|(\p{M})|(\p{L})/gu;
+const NOT_DIACRITIC_FROM_END_REG_EXP = /([^\p{M}])\p{M}*$/u;
+const NOT_DIACRITIC_FROM_START_REG_EXP = /^\p{M}*([^\p{M}])/u;
+const SYLLABLES_REG_EXP = /[\uAC00-\uD7AF\uFA6C\uFACF-\uFAD1\uFAD5-\uFAD7]+/g;
+const SYLLABLES_LENGTHS = new Map();
+const FIRST_CHAR_SYLLABLES_REG_EXP = "[\\u1100-\\u1112\\ud7a4-\\ud7af\\ud84a\\ud84c\\ud850\\ud854\\ud857\\ud85f]";
+let noSyllablesRegExp = null;
+let withSyllablesRegExp = null;
 
 function normalize(text) {
-  if (!normalizationRegex) {
-    const replace = Object.keys(CHARACTERS_TO_NORMALIZE).join("");
-    normalizationRegex = new RegExp(`[${replace}]`, "g");
+  const syllablePositions = [];
+  let m;
+
+  while ((m = SYLLABLES_REG_EXP.exec(text)) !== null) {
+    let {
+      index
+    } = m;
+
+    for (const char of m[0]) {
+      let len = SYLLABLES_LENGTHS.get(char);
+
+      if (!len) {
+        len = char.normalize("NFD").length;
+        SYLLABLES_LENGTHS.set(char, len);
+      }
+
+      syllablePositions.push([len, index++]);
+    }
   }
 
-  return text.replace(normalizationRegex, function (ch) {
-    return CHARACTERS_TO_NORMALIZE[ch];
+  let normalizationRegex;
+
+  if (syllablePositions.length === 0 && noSyllablesRegExp) {
+    normalizationRegex = noSyllablesRegExp;
+  } else if (syllablePositions.length > 0 && withSyllablesRegExp) {
+    normalizationRegex = withSyllablesRegExp;
+  } else {
+    const replace = Object.keys(CHARACTERS_TO_NORMALIZE).join("");
+    const regexp = `([${replace}])|(\\p{M}+(?:-\\n)?)|(\\S-\\n)|(\\n)`;
+
+    if (syllablePositions.length === 0) {
+      normalizationRegex = noSyllablesRegExp = new RegExp(regexp + "|(\\u0000)", "gum");
+    } else {
+      normalizationRegex = withSyllablesRegExp = new RegExp(regexp + `|(${FIRST_CHAR_SYLLABLES_REG_EXP})`, "gum");
+    }
+  }
+
+  const rawDiacriticsPositions = [];
+
+  while ((m = DIACRITICS_REG_EXP.exec(text)) !== null) {
+    rawDiacriticsPositions.push([m[0].length, m.index]);
+  }
+
+  let normalized = text.normalize("NFD");
+  const positions = [[0, 0]];
+  let rawDiacriticsIndex = 0;
+  let syllableIndex = 0;
+  let shift = 0;
+  let shiftOrigin = 0;
+  let eol = 0;
+  let hasDiacritics = false;
+  normalized = normalized.replace(normalizationRegex, (match, p1, p2, p3, p4, p5, i) => {
+    i -= shiftOrigin;
+
+    if (p1) {
+      const replacement = CHARACTERS_TO_NORMALIZE[match];
+      const jj = replacement.length;
+
+      for (let j = 1; j < jj; j++) {
+        positions.push([i - shift + j, shift - j]);
+      }
+
+      shift -= jj - 1;
+      return replacement;
+    }
+
+    if (p2) {
+      const hasTrailingDashEOL = p2.endsWith("\n");
+      const len = hasTrailingDashEOL ? p2.length - 2 : p2.length;
+      hasDiacritics = true;
+      let jj = len;
+
+      if (i + eol === rawDiacriticsPositions[rawDiacriticsIndex]?.[1]) {
+        jj -= rawDiacriticsPositions[rawDiacriticsIndex][0];
+        ++rawDiacriticsIndex;
+      }
+
+      for (let j = 1; j <= jj; j++) {
+        positions.push([i - 1 - shift + j, shift - j]);
+      }
+
+      shift -= jj;
+      shiftOrigin += jj;
+
+      if (hasTrailingDashEOL) {
+        i += len - 1;
+        positions.push([i - shift + 1, 1 + shift]);
+        shift += 1;
+        shiftOrigin += 1;
+        eol += 1;
+        return p2.slice(0, len);
+      }
+
+      return p2;
+    }
+
+    if (p3) {
+      positions.push([i - shift + 1, 1 + shift]);
+      shift += 1;
+      shiftOrigin += 1;
+      eol += 1;
+      return p3.charAt(0);
+    }
+
+    if (p4) {
+      positions.push([i - shift + 1, shift - 1]);
+      shift -= 1;
+      shiftOrigin += 1;
+      eol += 1;
+      return " ";
+    }
+
+    if (i + eol === syllablePositions[syllableIndex]?.[1]) {
+      const newCharLen = syllablePositions[syllableIndex][0] - 1;
+      ++syllableIndex;
+
+      for (let j = 1; j <= newCharLen; j++) {
+        positions.push([i - (shift - j), shift - j]);
+      }
+
+      shift -= newCharLen;
+      shiftOrigin += newCharLen;
+    }
+
+    return p5;
   });
+  positions.push([normalized.length, shift]);
+  return [normalized, positions, hasDiacritics];
+}
+
+function getOriginalIndex(diffs, pos, len) {
+  if (!diffs) {
+    return [pos, len];
+  }
+
+  const start = pos;
+  const end = pos + len;
+  let i = (0, _ui_utils.binarySearchFirstItem)(diffs, x => x[0] >= start);
+
+  if (diffs[i][0] > start) {
+    --i;
+  }
+
+  let j = (0, _ui_utils.binarySearchFirstItem)(diffs, x => x[0] >= end, i);
+
+  if (diffs[j][0] > end) {
+    --j;
+  }
+
+  return [start + diffs[i][1], len + diffs[j][1] - diffs[i][1]];
 }
 
 class PDFFindController {
@@ -5893,10 +5964,11 @@ class PDFFindController {
   }) {
     this._linkService = linkService;
     this._eventBus = eventBus;
+    this.#reset();
 
-    this._reset();
+    eventBus._on("find", this.#onFind.bind(this));
 
-    eventBus._on("findbarclose", this._onFindBarClose.bind(this));
+    eventBus._on("findbarclose", this.#onFindBarClose.bind(this));
   }
 
   get highlightMatches() {
@@ -5921,7 +5993,7 @@ class PDFFindController {
 
   setDocument(pdfDocument) {
     if (this._pdfDocument) {
-      this._reset();
+      this.#reset();
     }
 
     if (!pdfDocument) {
@@ -5933,21 +6005,24 @@ class PDFFindController {
     this._firstPageCapability.resolve();
   }
 
-  executeCommand(cmd, state) {
+  #onFind(state) {
     if (!state) {
       return;
     }
 
     const pdfDocument = this._pdfDocument;
+    const {
+      type
+    } = state;
 
-    if (this._state === null || this._shouldDirtyMatch(cmd, state)) {
+    if (this._state === null || this.#shouldDirtyMatch(state)) {
       this._dirtyMatch = true;
     }
 
     this._state = state;
 
-    if (cmd !== "findhighlightallchange") {
-      this._updateUIState(FindState.PENDING);
+    if (type !== "highlightallchange") {
+      this.#updateUIState(FindState.PENDING);
     }
 
     this._firstPageCapability.promise.then(() => {
@@ -5955,8 +6030,7 @@ class PDFFindController {
         return;
       }
 
-      this._extractText();
-
+      this.#extractText();
       const findbarClosed = !this._highlightMatches;
       const pendingTimeout = !!this._findTimeout;
 
@@ -5965,36 +6039,36 @@ class PDFFindController {
         this._findTimeout = null;
       }
 
-      if (cmd === "find") {
+      if (!type) {
         this._findTimeout = setTimeout(() => {
-          this._nextMatch();
-
+          this.#nextMatch();
           this._findTimeout = null;
         }, FIND_TIMEOUT);
       } else if (this._dirtyMatch) {
-        this._nextMatch();
-      } else if (cmd === "findagain") {
-        this._nextMatch();
+        this.#nextMatch();
+      } else if (type === "again") {
+        this.#nextMatch();
 
         if (findbarClosed && this._state.highlightAll) {
-          this._updateAllPages();
+          this.#updateAllPages();
         }
-      } else if (cmd === "findhighlightallchange") {
+      } else if (type === "highlightallchange") {
         if (pendingTimeout) {
-          this._nextMatch();
+          this.#nextMatch();
         } else {
           this._highlightMatches = true;
         }
 
-        this._updateAllPages();
+        this.#updateAllPages();
       } else {
-        this._nextMatch();
+        this.#nextMatch();
       }
     });
   }
 
   scrollMatchIntoView({
     element = null,
+    selectedLeft = 0,
     pageIndex = -1,
     matchIndex = -1
   }) {
@@ -6009,12 +6083,12 @@ class PDFFindController {
     this._scrollMatches = false;
     const spot = {
       top: MATCH_SCROLL_OFFSET_TOP,
-      left: MATCH_SCROLL_OFFSET_LEFT
+      left: selectedLeft + MATCH_SCROLL_OFFSET_LEFT
     };
     (0, _ui_utils.scrollIntoView)(element, spot, true);
   }
 
-  _reset() {
+  #reset() {
     this._highlightMatches = false;
     this._scrollMatches = false;
     this._pdfDocument = null;
@@ -6032,9 +6106,11 @@ class PDFFindController {
     };
     this._extractTextPromises = [];
     this._pageContents = [];
+    this._pageDiffs = [];
+    this._hasDiacritics = [];
     this._matchesCountTotal = 0;
     this._pagesToSearch = null;
-    this._pendingFindMatches = Object.create(null);
+    this._pendingFindMatches = new Set();
     this._resumePageIdx = null;
     this._dirtyMatch = false;
     clearTimeout(this._findTimeout);
@@ -6042,22 +6118,22 @@ class PDFFindController {
     this._firstPageCapability = (0, _pdfjsLib.createPromiseCapability)();
   }
 
-  get _query() {
+  get #query() {
     if (this._state.query !== this._rawQuery) {
       this._rawQuery = this._state.query;
-      this._normalizedQuery = normalize(this._state.query);
+      [this._normalizedQuery] = normalize(this._state.query);
     }
 
     return this._normalizedQuery;
   }
 
-  _shouldDirtyMatch(cmd, state) {
+  #shouldDirtyMatch(state) {
     if (state.query !== this._state.query) {
       return true;
     }
 
-    switch (cmd) {
-      case "findagain":
+    switch (state.type) {
+      case "again":
         const pageNumber = this._selected.pageIdx + 1;
         const linkService = this._linkService;
 
@@ -6067,72 +6143,30 @@ class PDFFindController {
 
         return false;
 
-      case "findhighlightallchange":
+      case "highlightallchange":
         return false;
     }
 
     return true;
   }
 
-  _prepareMatches(matchesWithLength, matches, matchesLength) {
-    function isSubTerm(currentIndex) {
-      const currentElem = matchesWithLength[currentIndex];
-      const nextElem = matchesWithLength[currentIndex + 1];
+  #isEntireWord(content, startIdx, length) {
+    let match = content.slice(0, startIdx).match(NOT_DIACRITIC_FROM_END_REG_EXP);
 
-      if (currentIndex < matchesWithLength.length - 1 && currentElem.match === nextElem.match) {
-        currentElem.skipped = true;
-        return true;
-      }
-
-      for (let i = currentIndex - 1; i >= 0; i--) {
-        const prevElem = matchesWithLength[i];
-
-        if (prevElem.skipped) {
-          continue;
-        }
-
-        if (prevElem.match + prevElem.matchLength < currentElem.match) {
-          break;
-        }
-
-        if (prevElem.match + prevElem.matchLength >= currentElem.match + currentElem.matchLength) {
-          currentElem.skipped = true;
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    matchesWithLength.sort(function (a, b) {
-      return a.match === b.match ? a.matchLength - b.matchLength : a.match - b.match;
-    });
-
-    for (let i = 0, len = matchesWithLength.length; i < len; i++) {
-      if (isSubTerm(i)) {
-        continue;
-      }
-
-      matches.push(matchesWithLength[i].match);
-      matchesLength.push(matchesWithLength[i].matchLength);
-    }
-  }
-
-  _isEntireWord(content, startIdx, length) {
-    if (startIdx > 0) {
+    if (match) {
       const first = content.charCodeAt(startIdx);
-      const limit = content.charCodeAt(startIdx - 1);
+      const limit = match[1].charCodeAt(0);
 
       if ((0, _pdf_find_utils.getCharacterType)(first) === (0, _pdf_find_utils.getCharacterType)(limit)) {
         return false;
       }
     }
 
-    const endIdx = startIdx + length - 1;
+    match = content.slice(startIdx + length).match(NOT_DIACRITIC_FROM_START_REG_EXP);
 
-    if (endIdx < content.length - 1) {
-      const last = content.charCodeAt(endIdx);
-      const limit = content.charCodeAt(endIdx + 1);
+    if (match) {
+      const last = content.charCodeAt(startIdx + length - 1);
+      const limit = match[1].charCodeAt(0);
 
       if ((0, _pdf_find_utils.getCharacterType)(last) === (0, _pdf_find_utils.getCharacterType)(limit)) {
         return false;
@@ -6142,106 +6176,130 @@ class PDFFindController {
     return true;
   }
 
-  _calculatePhraseMatch(query, pageIndex, pageContent, entireWord) {
-    const matches = [];
-    const queryLen = query.length;
-    let matchIdx = -queryLen;
+  #calculateRegExpMatch(query, entireWord, pageIndex, pageContent) {
+    const matches = [],
+          matchesLength = [];
+    const diffs = this._pageDiffs[pageIndex];
+    let match;
 
-    while (true) {
-      matchIdx = pageContent.indexOf(query, matchIdx + queryLen);
-
-      if (matchIdx === -1) {
-        break;
-      }
-
-      if (entireWord && !this._isEntireWord(pageContent, matchIdx, queryLen)) {
+    while ((match = query.exec(pageContent)) !== null) {
+      if (entireWord && !this.#isEntireWord(pageContent, match.index, match[0].length)) {
         continue;
       }
 
-      matches.push(matchIdx);
-    }
+      const [matchPos, matchLen] = getOriginalIndex(diffs, match.index, match[0].length);
 
-    this._pageMatches[pageIndex] = matches;
-  }
-
-  _calculateWordMatch(query, pageIndex, pageContent, entireWord) {
-    const matchesWithLength = [];
-    const queryArray = query.match(/\S+/g);
-
-    for (let i = 0, len = queryArray.length; i < len; i++) {
-      const subquery = queryArray[i];
-      const subqueryLen = subquery.length;
-      let matchIdx = -subqueryLen;
-
-      while (true) {
-        matchIdx = pageContent.indexOf(subquery, matchIdx + subqueryLen);
-
-        if (matchIdx === -1) {
-          break;
-        }
-
-        if (entireWord && !this._isEntireWord(pageContent, matchIdx, subqueryLen)) {
-          continue;
-        }
-
-        matchesWithLength.push({
-          match: matchIdx,
-          matchLength: subqueryLen,
-          skipped: false
-        });
+      if (matchLen) {
+        matches.push(matchPos);
+        matchesLength.push(matchLen);
       }
     }
 
-    this._pageMatchesLength[pageIndex] = [];
-    this._pageMatches[pageIndex] = [];
-
-    this._prepareMatches(matchesWithLength, this._pageMatches[pageIndex], this._pageMatchesLength[pageIndex]);
+    this._pageMatches[pageIndex] = matches;
+    this._pageMatchesLength[pageIndex] = matchesLength;
   }
 
-  _calculateMatch(pageIndex) {
-    let pageContent = this._pageContents[pageIndex];
-    let query = this._query;
+  #convertToRegExpString(query, hasDiacritics) {
     const {
-      caseSensitive,
-      entireWord,
-      phraseSearch
+      matchDiacritics
     } = this._state;
+    let isUnicode = false;
+    query = query.replace(SPECIAL_CHARS_REG_EXP, (match, p1, p2, p3, p4, p5) => {
+      if (p1) {
+        return `[ ]*\\${p1}[ ]*`;
+      }
+
+      if (p2) {
+        return `[ ]*${p2}[ ]*`;
+      }
+
+      if (p3) {
+        return "[ ]+";
+      }
+
+      if (matchDiacritics) {
+        return p4 || p5;
+      }
+
+      if (p4) {
+        return DIACRITICS_EXCEPTION.has(p4.charCodeAt(0)) ? p4 : "";
+      }
+
+      if (hasDiacritics) {
+        isUnicode = true;
+        return `${p5}\\p{M}*`;
+      }
+
+      return p5;
+    });
+    const trailingSpaces = "[ ]*";
+
+    if (query.endsWith(trailingSpaces)) {
+      query = query.slice(0, query.length - trailingSpaces.length);
+    }
+
+    if (matchDiacritics) {
+      if (hasDiacritics) {
+        isUnicode = true;
+        query = `${query}(?=[${DIACRITICS_EXCEPTION_STR}]|[^\\p{M}]|$)`;
+      }
+    }
+
+    return [isUnicode, query];
+  }
+
+  #calculateMatch(pageIndex) {
+    let query = this.#query;
 
     if (query.length === 0) {
       return;
     }
 
-    if (!caseSensitive) {
-      pageContent = pageContent.toLowerCase();
-      query = query.toLowerCase();
-    }
+    const {
+      caseSensitive,
+      entireWord,
+      phraseSearch
+    } = this._state;
+    const pageContent = this._pageContents[pageIndex];
+    const hasDiacritics = this._hasDiacritics[pageIndex];
+    let isUnicode = false;
 
     if (phraseSearch) {
-      this._calculatePhraseMatch(query, pageIndex, pageContent, entireWord);
+      [isUnicode, query] = this.#convertToRegExpString(query, hasDiacritics);
     } else {
-      this._calculateWordMatch(query, pageIndex, pageContent, entireWord);
+      const match = query.match(/\S+/g);
+
+      if (match) {
+        query = match.sort().reverse().map(q => {
+          const [isUnicodePart, queryPart] = this.#convertToRegExpString(q, hasDiacritics);
+          isUnicode ||= isUnicodePart;
+          return `(${queryPart})`;
+        }).join("|");
+      }
     }
 
+    const flags = `g${isUnicode ? "u" : ""}${caseSensitive ? "" : "i"}`;
+    query = new RegExp(query, flags);
+    this.#calculateRegExpMatch(query, entireWord, pageIndex, pageContent);
+
     if (this._state.highlightAll) {
-      this._updatePage(pageIndex);
+      this.#updatePage(pageIndex);
     }
 
     if (this._resumePageIdx === pageIndex) {
       this._resumePageIdx = null;
-
-      this._nextPageMatch();
+      this.#nextPageMatch();
     }
 
     const pageMatchesCount = this._pageMatches[pageIndex].length;
 
     if (pageMatchesCount > 0) {
       this._matchesCountTotal += pageMatchesCount;
-
-      this._updateUIResultsCount();
+      this.#updateUIResultsCount();
     }
   }
 
-  _extractText() {
+  #extractText() {
     if (this._extractTextPromises.length > 0) {
       return;
     }
@@ -6253,29 +6311,32 @@ class PDFFindController {
       this._extractTextPromises[i] = extractTextCapability.promise;
       promise = promise.then(() => {
         return this._pdfDocument.getPage(i + 1).then(pdfPage => {
-          return pdfPage.getTextContent({
-            normalizeWhitespace: true
-          });
+          return pdfPage.getTextContent();
         }).then(textContent => {
-          const textItems = textContent.items;
           const strBuf = [];
 
-          for (let j = 0, jj = textItems.length; j < jj; j++) {
-            strBuf.push(textItems[j].str);
+          for (const textItem of textContent.items) {
+            strBuf.push(textItem.str);
+
+            if (textItem.hasEOL) {
+              strBuf.push("\n");
+            }
           }
 
-          this._pageContents[i] = normalize(strBuf.join(""));
-          extractTextCapability.resolve(i);
+          [this._pageContents[i], this._pageDiffs[i], this._hasDiacritics[i]] = normalize(strBuf.join(""));
+          extractTextCapability.resolve();
         }, reason => {
           console.error(`Unable to get text content for page ${i + 1}`, reason);
           this._pageContents[i] = "";
-          extractTextCapability.resolve(i);
+          this._pageDiffs[i] = null;
+          this._hasDiacritics[i] = false;
+          extractTextCapability.resolve();
         });
       });
     }
   }
 
-  _updatePage(index) {
+  #updatePage(index) {
     if (this._scrollMatches && this._selected.pageIdx === index) {
       this._linkService.page = index + 1;
     }
@@ -6286,14 +6347,14 @@ class PDFFindController {
     });
   }
 
-  _updateAllPages() {
+  #updateAllPages() {
     this._eventBus.dispatch("updatetextlayermatches", {
       source: this,
       pageIndex: -1
     });
   }
 
-  _nextMatch() {
+  #nextMatch() {
     const previous = this._state.findPrevious;
     const currentPageIndex = this._linkService.page - 1;
     const numPages = this._linkService.pagesCount;
@@ -6309,27 +6370,25 @@ class PDFFindController {
       this._pageMatches.length = 0;
       this._pageMatchesLength.length = 0;
       this._matchesCountTotal = 0;
-
-      this._updateAllPages();
+      this.#updateAllPages();
 
       for (let i = 0; i < numPages; i++) {
-        if (this._pendingFindMatches[i] === true) {
+        if (this._pendingFindMatches.has(i)) {
           continue;
         }
 
-        this._pendingFindMatches[i] = true;
+        this._pendingFindMatches.add(i);
 
-        this._extractTextPromises[i].then(pageIdx => {
-          delete this._pendingFindMatches[pageIdx];
+        this._extractTextPromises[i].then(() => {
+          this._pendingFindMatches.delete(i);
 
-          this._calculateMatch(pageIdx);
+          this.#calculateMatch(i);
         });
       }
     }
 
-    if (this._query === "") {
-      this._updateUIState(FindState.FOUND);
-
+    if (this.#query === "") {
+      this.#updateUIState(FindState.FOUND);
       return;
     }
 
@@ -6345,39 +6404,34 @@ class PDFFindController {
 
       if (!previous && offset.matchIdx + 1 < numPageMatches || previous && offset.matchIdx > 0) {
         offset.matchIdx = previous ? offset.matchIdx - 1 : offset.matchIdx + 1;
-
-        this._updateMatch(true);
-
+        this.#updateMatch(true);
         return;
       }
 
-      this._advanceOffsetPage(previous);
+      this.#advanceOffsetPage(previous);
     }
 
-    this._nextPageMatch();
+    this.#nextPageMatch();
   }
 
-  _matchesReady(matches) {
+  #matchesReady(matches) {
     const offset = this._offset;
     const numMatches = matches.length;
     const previous = this._state.findPrevious;
 
     if (numMatches) {
       offset.matchIdx = previous ? numMatches - 1 : 0;
-
-      this._updateMatch(true);
-
+      this.#updateMatch(true);
       return true;
     }
 
-    this._advanceOffsetPage(previous);
+    this.#advanceOffsetPage(previous);
 
     if (offset.wrapped) {
       offset.matchIdx = null;
 
       if (this._pagesToSearch < 0) {
-        this._updateMatch(false);
-
+        this.#updateMatch(false);
         return true;
       }
     }
@@ -6385,7 +6439,7 @@ class PDFFindController {
     return false;
   }
 
-  _nextPageMatch() {
+  #nextPageMatch() {
     if (this._resumePageIdx !== null) {
       console.error("There can only be one pending page.");
     }
@@ -6400,10 +6454,10 @@ class PDFFindController {
         this._resumePageIdx = pageIdx;
         break;
       }
-    } while (!this._matchesReady(matches));
+    } while (!this.#matchesReady(matches));
   }
 
-  _advanceOffsetPage(previous) {
+  #advanceOffsetPage(previous) {
     const offset = this._offset;
     const numPages = this._linkService.pagesCount;
     offset.pageIdx = previous ? offset.pageIdx - 1 : offset.pageIdx + 1;
@@ -6416,7 +6470,7 @@ class PDFFindController {
     }
   }
 
-  _updateMatch(found = false) {
+  #updateMatch(found = false) {
     let state = FindState.NOT_FOUND;
     const wrapped = this._offset.wrapped;
     this._offset.wrapped = false;
@@ -6428,20 +6482,19 @@ class PDFFindController {
       state = wrapped ? FindState.WRAPPED : FindState.FOUND;
 
       if (previousPage !== -1 && previousPage !== this._selected.pageIdx) {
-        this._updatePage(previousPage);
+        this.#updatePage(previousPage);
       }
     }
 
-    this._updateUIState(state, this._state.findPrevious);
+    this.#updateUIState(state, this._state.findPrevious);
 
     if (this._selected.pageIdx !== -1) {
       this._scrollMatches = true;
-
-      this._updatePage(this._selected.pageIdx);
+      this.#updatePage(this._selected.pageIdx);
     }
   }
 
-  _onFindBarClose(evt) {
+  #onFindBarClose(evt) {
     const pdfDocument = this._pdfDocument;
 
     this._firstPageCapability.promise.then(() => {
@@ -6459,15 +6512,13 @@ class PDFFindController {
         this._dirtyMatch = true;
       }
 
-      this._updateUIState(FindState.FOUND);
-
+      this.#updateUIState(FindState.FOUND);
       this._highlightMatches = false;
-
-      this._updateAllPages();
+      this.#updateAllPages();
     });
   }
 
-  _requestMatchesCount() {
+  #requestMatchesCount() {
     const {
       pageIdx,
       matchIdx
@@ -6477,7 +6528,7 @@ class PDFFindController {
 
     if (matchIdx !== -1) {
       for (let i = 0; i < pageIdx; i++) {
-        current += this._pageMatches[i] && this._pageMatches[i].length || 0;
+        current += this._pageMatches[i]?.length || 0;
       }
 
       current += matchIdx + 1;
@@ -6493,20 +6544,20 @@ class PDFFindController {
     };
   }
 
-  _updateUIResultsCount() {
+  #updateUIResultsCount() {
     this._eventBus.dispatch("updatefindmatchescount", {
       source: this,
-      matchesCount: this._requestMatchesCount()
+      matchesCount: this.#requestMatchesCount()
     });
   }
 
-  _updateUIState(state, previous) {
+  #updateUIState(state, previous = false) {
     this._eventBus.dispatch("updatefindcontrolstate", {
       source: this,
       state,
       previous,
-      matchesCount: this._requestMatchesCount(),
-      rawQuery: this._state ? this._state.query : null
+      matchesCount: this.#requestMatchesCount(),
+      rawQuery: this._state?.query ?? null
     });
   }
 
@@ -6516,16 +6567,15 @@ exports.PDFFindController = PDFFindController;
 
 /***/ }),
 /* 17 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.getCharacterType = getCharacterType;
+}));
 exports.CharacterType = void 0;
+exports.getCharacterType = getCharacterType;
 const CharacterType = {
   SPACE: 0,
   ALPHA_LETTER: 1,
@@ -6612,19 +6662,20 @@ function getCharacterType(charCode) {
 
 /***/ }),
 /* 18 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.isDestHashesEqual = isDestHashesEqual;
-exports.isDestArraysEqual = isDestArraysEqual;
+}));
 exports.PDFHistory = void 0;
+exports.isDestArraysEqual = isDestArraysEqual;
+exports.isDestHashesEqual = isDestHashesEqual;
 
-var _ui_utils = __webpack_require__(2);
+var _ui_utils = __webpack_require__(1);
+
+var _event_utils = __webpack_require__(6);
 
 const HASH_CHANGE_TIMEOUT = 1000;
 const POSITION_UPDATED_THRESHOLD = 50;
@@ -6645,22 +6696,15 @@ class PDFHistory {
     this._fingerprint = "";
     this.reset();
     this._boundEvents = null;
-    this._isViewerInPresentationMode = false;
-
-    this.eventBus._on("presentationmodechanged", evt => {
-      this._isViewerInPresentationMode = evt.active || evt.switchInProgress;
-    });
 
     this.eventBus._on("pagesinit", () => {
       this._isPagesLoaded = false;
 
-      const onPagesLoaded = evt => {
-        this.eventBus._off("pagesloaded", onPagesLoaded);
-
+      this.eventBus._on("pagesloaded", evt => {
         this._isPagesLoaded = !!evt.pagesCount;
-      };
-
-      this.eventBus._on("pagesloaded", onPagesLoaded);
+      }, {
+        once: true
+      });
     });
   }
 
@@ -6720,10 +6764,6 @@ class PDFHistory {
 
     this._updateInternalState(destination, state.uid, true);
 
-    if (this._uid > this._maxUid) {
-      this._maxUid = this._uid;
-    }
-
     if (destination.rotation !== undefined) {
       this._initialRotation = destination.rotation;
     }
@@ -6771,7 +6811,7 @@ class PDFHistory {
     } else if (!Array.isArray(explicitDest)) {
       console.error("PDFHistory.push: " + `"${explicitDest}" is not a valid explicitDest parameter.`);
       return;
-    } else if (!(Number.isInteger(pageNumber) && pageNumber > 0 && pageNumber <= this.linkService.pagesCount)) {
+    } else if (!this._isValidPage(pageNumber)) {
       if (pageNumber !== null || this._destination) {
         console.error("PDFHistory.push: " + `"${pageNumber}" is not a valid pageNumber parameter.`);
         return;
@@ -6813,6 +6853,39 @@ class PDFHistory {
     }
   }
 
+  pushPage(pageNumber) {
+    if (!this._initialized) {
+      return;
+    }
+
+    if (!this._isValidPage(pageNumber)) {
+      console.error(`PDFHistory.pushPage: "${pageNumber}" is not a valid page number.`);
+      return;
+    }
+
+    if (this._destination?.page === pageNumber) {
+      return;
+    }
+
+    if (this._popStateInProgress) {
+      return;
+    }
+
+    this._pushOrReplaceState({
+      dest: null,
+      hash: `page=${pageNumber}`,
+      page: pageNumber,
+      rotation: this.linkService.rotation
+    });
+
+    if (!this._popStateInProgress) {
+      this._popStateInProgress = true;
+      Promise.resolve().then(() => {
+        this._popStateInProgress = false;
+      });
+    }
+  }
+
   pushCurrentPosition() {
     if (!this._initialized || this._popStateInProgress) {
       return;
@@ -6869,7 +6942,7 @@ class PDFHistory {
 
     let newUrl;
 
-    if (this._updateUrl && destination && destination.hash) {
+    if (this._updateUrl && destination?.hash) {
       const baseUrl = document.location.href.split("#")[0];
 
       if (!baseUrl.startsWith("file://")) {
@@ -6880,7 +6953,6 @@ class PDFHistory {
     if (shouldReplace) {
       window.history.replaceState(newState, "", newUrl);
     } else {
-      this._maxUid = this._uid;
       window.history.pushState(newState, "", newUrl);
     }
   }
@@ -6920,7 +6992,7 @@ class PDFHistory {
     let forceReplace = false;
 
     if (this._destination.page >= position.first && this._destination.page <= position.page) {
-      if (this._destination.dest || !this._destination.first) {
+      if (this._destination.dest !== undefined || !this._destination.first) {
         return;
       }
 
@@ -6930,6 +7002,10 @@ class PDFHistory {
     this._pushOrReplaceState(position, forceReplace);
   }
 
+  _isValidPage(val) {
+    return Number.isInteger(val) && val > 0 && val <= this.linkService.pagesCount;
+  }
+
   _isValidState(state, checkReload = false) {
     if (!state) {
       return false;
@@ -6943,7 +7019,7 @@ class PDFHistory {
 
         const [perfEntry] = performance.getEntriesByType("navigation");
 
-        if (!perfEntry || perfEntry.type !== "reload") {
+        if (perfEntry?.type !== "reload") {
           return false;
         }
       } else {
@@ -6968,22 +7044,23 @@ class PDFHistory {
       this._updateViewareaTimeout = null;
     }
 
-    if (removeTemporary && destination && destination.temporary) {
+    if (removeTemporary && destination?.temporary) {
       delete destination.temporary;
     }
 
     this._destination = destination;
     this._uid = uid;
+    this._maxUid = Math.max(this._maxUid, uid);
     this._numPositionUpdates = 0;
   }
 
   _parseCurrentHash(checkNameddest = false) {
     const hash = unescape(getCurrentHash()).substring(1);
     const params = (0, _ui_utils.parseQueryString)(hash);
-    const nameddest = params.nameddest || "";
-    let page = params.page | 0;
+    const nameddest = params.get("nameddest") || "";
+    let page = params.get("page") | 0;
 
-    if (!(Number.isInteger(page) && page > 0 && page <= this.linkService.pagesCount) || checkNameddest && nameddest.length > 0) {
+    if (!this._isValidPage(page) || checkNameddest && nameddest.length > 0) {
       page = null;
     }
 
@@ -7003,7 +7080,7 @@ class PDFHistory {
     }
 
     this._position = {
-      hash: this._isViewerInPresentationMode ? `page=${location.pageNumber}` : location.pdfOpenParams.substring(1),
+      hash: location.pdfOpenParams.substring(1),
       page: this.linkService.page,
       first: location.pageNumber,
       rotation: location.rotation
@@ -7061,7 +7138,7 @@ class PDFHistory {
 
     if (hashChanged) {
       this._blockHashChange++;
-      (0, _ui_utils.waitOnEventOrTimeout)({
+      (0, _event_utils.waitOnEventOrTimeout)({
         target: window,
         name: "hashchange",
         delay: HASH_CHANGE_TIMEOUT
@@ -7074,16 +7151,12 @@ class PDFHistory {
 
     this._updateInternalState(destination, state.uid, true);
 
-    if (this._uid > this._maxUid) {
-      this._maxUid = this._uid;
-    }
-
     if ((0, _ui_utils.isValidRotation)(destination.rotation)) {
       this.linkService.rotation = destination.rotation;
     }
 
     if (destination.dest) {
-      this.linkService.navigateTo(destination.dest);
+      this.linkService.goToDestination(destination.dest);
     } else if (destination.hash) {
       this.linkService.setHash(destination.hash);
     } else if (destination.page) {
@@ -7143,9 +7216,7 @@ function isDestHashesEqual(destHash, pushHash) {
     return true;
   }
 
-  const {
-    nameddest
-  } = (0, _ui_utils.parseQueryString)(destHash);
+  const nameddest = (0, _ui_utils.parseQueryString)(destHash).get("nameddest");
 
   if (nameddest === pushHash) {
     return true;
@@ -7200,14 +7271,13 @@ function isDestArraysEqual(firstDest, secondDest) {
 
 /***/ }),
 /* 19 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFLayerViewer = void 0;
 
 var _base_tree_viewer = __webpack_require__(13);
@@ -7225,7 +7295,6 @@ class PDFLayerViewer extends _base_tree_viewer.BaseTreeViewer {
   reset() {
     super.reset();
     this._optionalContentConfig = null;
-    this._pdfDocument = null;
   }
 
   _dispatchEvent(layersCount) {
@@ -7270,7 +7339,7 @@ class PDFLayerViewer extends _base_tree_viewer.BaseTreeViewer {
       return;
     }
 
-    element.textContent = await this.l10n.get("additional_layers", null, "Additional Layers");
+    element.textContent = await this.l10n.get("additional_layers");
     element.style.fontStyle = "italic";
   }
 
@@ -7298,7 +7367,7 @@ class PDFLayerViewer extends _base_tree_viewer.BaseTreeViewer {
 
     this._optionalContentConfig = optionalContentConfig || null;
     this._pdfDocument = pdfDocument || null;
-    const groups = optionalContentConfig && optionalContentConfig.getOrder();
+    const groups = optionalContentConfig?.getOrder();
 
     if (!groups) {
       this._dispatchEvent(0);
@@ -7321,7 +7390,7 @@ class PDFLayerViewer extends _base_tree_viewer.BaseTreeViewer {
         const div = document.createElement("div");
         div.className = "treeItem";
         const element = document.createElement("a");
-        div.appendChild(element);
+        div.append(element);
 
         if (typeof groupId === "object") {
           hasAnyNesting = true;
@@ -7332,7 +7401,7 @@ class PDFLayerViewer extends _base_tree_viewer.BaseTreeViewer {
 
           const itemsDiv = document.createElement("div");
           itemsDiv.className = "treeItems";
-          div.appendChild(itemsDiv);
+          div.append(itemsDiv);
           queue.push({
             parent: itemsDiv,
             groups: groupId.order
@@ -7347,28 +7416,19 @@ class PDFLayerViewer extends _base_tree_viewer.BaseTreeViewer {
           });
 
           input.type = "checkbox";
-          input.id = groupId;
           input.checked = group.visible;
           const label = document.createElement("label");
-          label.setAttribute("for", groupId);
           label.textContent = this._normalizeTextContent(group.name);
-          element.appendChild(input);
-          element.appendChild(label);
+          label.append(input);
+          element.append(label);
           layersCount++;
         }
 
-        levelData.parent.appendChild(div);
+        levelData.parent.append(div);
       }
     }
 
-    if (hasAnyNesting) {
-      this.container.classList.add("treeWithDeepNesting");
-      this._lastToggleIsShow = fragment.querySelectorAll(".treeItemsHidden").length === 0;
-    }
-
-    this.container.appendChild(fragment);
-
-    this._dispatchEvent(layersCount);
+    this._finishRendering(fragment, layersCount, hasAnyNesting);
   }
 
   async _resetLayers() {
@@ -7393,458 +7453,20 @@ exports.PDFLayerViewer = PDFLayerViewer;
 
 /***/ }),
 /* 20 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.SimpleLinkService = exports.PDFLinkService = void 0;
-
-var _ui_utils = __webpack_require__(2);
-
-class PDFLinkService {
-  constructor({
-    eventBus,
-    externalLinkTarget = null,
-    externalLinkRel = null,
-    externalLinkEnabled = true,
-    ignoreDestinationZoom = false
-  } = {}) {
-    this.eventBus = eventBus;
-    this.externalLinkTarget = externalLinkTarget;
-    this.externalLinkRel = externalLinkRel;
-    this.externalLinkEnabled = externalLinkEnabled;
-    this._ignoreDestinationZoom = ignoreDestinationZoom;
-    this.baseUrl = null;
-    this.pdfDocument = null;
-    this.pdfViewer = null;
-    this.pdfHistory = null;
-    this._pagesRefCache = null;
-  }
-
-  setDocument(pdfDocument, baseUrl = null) {
-    this.baseUrl = baseUrl;
-    this.pdfDocument = pdfDocument;
-    this._pagesRefCache = Object.create(null);
-  }
-
-  setViewer(pdfViewer) {
-    this.pdfViewer = pdfViewer;
-  }
-
-  setHistory(pdfHistory) {
-    this.pdfHistory = pdfHistory;
-  }
-
-  get pagesCount() {
-    return this.pdfDocument ? this.pdfDocument.numPages : 0;
-  }
-
-  get page() {
-    return this.pdfViewer.currentPageNumber;
-  }
-
-  set page(value) {
-    this.pdfViewer.currentPageNumber = value;
-  }
-
-  get rotation() {
-    return this.pdfViewer.pagesRotation;
-  }
-
-  set rotation(value) {
-    this.pdfViewer.pagesRotation = value;
-  }
-
-  navigateTo(dest) {
-    const goToDestination = ({
-      namedDest,
-      explicitDest
-    }) => {
-      const destRef = explicitDest[0];
-      let pageNumber;
-
-      if (destRef instanceof Object) {
-        pageNumber = this._cachedPageNumber(destRef);
-
-        if (pageNumber === null) {
-          this.pdfDocument.getPageIndex(destRef).then(pageIndex => {
-            this.cachePageRef(pageIndex + 1, destRef);
-            goToDestination({
-              namedDest,
-              explicitDest
-            });
-          }).catch(() => {
-            console.error(`PDFLinkService.navigateTo: "${destRef}" is not ` + `a valid page reference, for dest="${dest}".`);
-          });
-          return;
-        }
-      } else if (Number.isInteger(destRef)) {
-        pageNumber = destRef + 1;
-      } else {
-        console.error(`PDFLinkService.navigateTo: "${destRef}" is not ` + `a valid destination reference, for dest="${dest}".`);
-        return;
-      }
-
-      if (!pageNumber || pageNumber < 1 || pageNumber > this.pagesCount) {
-        console.error(`PDFLinkService.navigateTo: "${pageNumber}" is not ` + `a valid page number, for dest="${dest}".`);
-        return;
-      }
-
-      if (this.pdfHistory) {
-        this.pdfHistory.pushCurrentPosition();
-        this.pdfHistory.push({
-          namedDest,
-          explicitDest,
-          pageNumber
-        });
-      }
-
-      this.pdfViewer.scrollPageIntoView({
-        pageNumber,
-        destArray: explicitDest,
-        ignoreDestinationZoom: this._ignoreDestinationZoom
-      });
-    };
-
-    new Promise((resolve, reject) => {
-      if (typeof dest === "string") {
-        this.pdfDocument.getDestination(dest).then(destArray => {
-          resolve({
-            namedDest: dest,
-            explicitDest: destArray
-          });
-        });
-        return;
-      }
-
-      resolve({
-        namedDest: "",
-        explicitDest: dest
-      });
-    }).then(data => {
-      if (!Array.isArray(data.explicitDest)) {
-        console.error(`PDFLinkService.navigateTo: "${data.explicitDest}" is` + ` not a valid destination array, for dest="${dest}".`);
-        return;
-      }
-
-      goToDestination(data);
-    });
-  }
-
-  getDestinationHash(dest) {
-    if (typeof dest === "string") {
-      return this.getAnchorUrl("#" + escape(dest));
-    }
-
-    if (Array.isArray(dest)) {
-      const str = JSON.stringify(dest);
-      return this.getAnchorUrl("#" + escape(str));
-    }
-
-    return this.getAnchorUrl("");
-  }
-
-  getAnchorUrl(anchor) {
-    return (this.baseUrl || "") + anchor;
-  }
-
-  setHash(hash) {
-    let pageNumber, dest;
-
-    if (hash.includes("=")) {
-      const params = (0, _ui_utils.parseQueryString)(hash);
-
-      if ("search" in params) {
-        this.eventBus.dispatch("findfromurlhash", {
-          source: this,
-          query: params.search.replace(/"/g, ""),
-          phraseSearch: params.phrase === "true"
-        });
-      }
-
-      if ("page" in params) {
-        pageNumber = params.page | 0 || 1;
-      }
-
-      if ("zoom" in params) {
-        const zoomArgs = params.zoom.split(",");
-        const zoomArg = zoomArgs[0];
-        const zoomArgNumber = parseFloat(zoomArg);
-
-        if (!zoomArg.includes("Fit")) {
-          dest = [null, {
-            name: "XYZ"
-          }, zoomArgs.length > 1 ? zoomArgs[1] | 0 : null, zoomArgs.length > 2 ? zoomArgs[2] | 0 : null, zoomArgNumber ? zoomArgNumber / 100 : zoomArg];
-        } else {
-          if (zoomArg === "Fit" || zoomArg === "FitB") {
-            dest = [null, {
-              name: zoomArg
-            }];
-          } else if (zoomArg === "FitH" || zoomArg === "FitBH" || zoomArg === "FitV" || zoomArg === "FitBV") {
-            dest = [null, {
-              name: zoomArg
-            }, zoomArgs.length > 1 ? zoomArgs[1] | 0 : null];
-          } else if (zoomArg === "FitR") {
-            if (zoomArgs.length !== 5) {
-              console.error('PDFLinkService.setHash: Not enough parameters for "FitR".');
-            } else {
-              dest = [null, {
-                name: zoomArg
-              }, zoomArgs[1] | 0, zoomArgs[2] | 0, zoomArgs[3] | 0, zoomArgs[4] | 0];
-            }
-          } else {
-            console.error(`PDFLinkService.setHash: "${zoomArg}" is not ` + "a valid zoom value.");
-          }
-        }
-      }
-
-      if (dest) {
-        this.pdfViewer.scrollPageIntoView({
-          pageNumber: pageNumber || this.page,
-          destArray: dest,
-          allowNegativeOffset: true
-        });
-      } else if (pageNumber) {
-        this.page = pageNumber;
-      }
-
-      if ("pagemode" in params) {
-        this.eventBus.dispatch("pagemode", {
-          source: this,
-          mode: params.pagemode
-        });
-      }
-
-      if ("nameddest" in params) {
-        this.navigateTo(params.nameddest);
-      }
-    } else {
-      dest = unescape(hash);
-
-      try {
-        dest = JSON.parse(dest);
-
-        if (!Array.isArray(dest)) {
-          dest = dest.toString();
-        }
-      } catch (ex) {}
-
-      if (typeof dest === "string" || isValidExplicitDestination(dest)) {
-        this.navigateTo(dest);
-        return;
-      }
-
-      console.error(`PDFLinkService.setHash: "${unescape(hash)}" is not ` + "a valid destination.");
-    }
-  }
-
-  executeNamedAction(action) {
-    switch (action) {
-      case "GoBack":
-        if (this.pdfHistory) {
-          this.pdfHistory.back();
-        }
-
-        break;
-
-      case "GoForward":
-        if (this.pdfHistory) {
-          this.pdfHistory.forward();
-        }
-
-        break;
-
-      case "NextPage":
-        if (this.page < this.pagesCount) {
-          this.page++;
-        }
-
-        break;
-
-      case "PrevPage":
-        if (this.page > 1) {
-          this.page--;
-        }
-
-        break;
-
-      case "LastPage":
-        this.page = this.pagesCount;
-        break;
-
-      case "FirstPage":
-        this.page = 1;
-        break;
-
-      default:
-        break;
-    }
-
-    this.eventBus.dispatch("namedaction", {
-      source: this,
-      action
-    });
-  }
-
-  cachePageRef(pageNum, pageRef) {
-    if (!pageRef) {
-      return;
-    }
-
-    const refStr = pageRef.gen === 0 ? `${pageRef.num}R` : `${pageRef.num}R${pageRef.gen}`;
-    this._pagesRefCache[refStr] = pageNum;
-  }
-
-  _cachedPageNumber(pageRef) {
-    const refStr = pageRef.gen === 0 ? `${pageRef.num}R` : `${pageRef.num}R${pageRef.gen}`;
-    return this._pagesRefCache && this._pagesRefCache[refStr] || null;
-  }
-
-  isPageVisible(pageNumber) {
-    return this.pdfViewer.isPageVisible(pageNumber);
-  }
-
-}
-
-exports.PDFLinkService = PDFLinkService;
-
-function isValidExplicitDestination(dest) {
-  if (!Array.isArray(dest)) {
-    return false;
-  }
-
-  const destLength = dest.length;
-
-  if (destLength < 2) {
-    return false;
-  }
-
-  const page = dest[0];
-
-  if (!(typeof page === "object" && Number.isInteger(page.num) && Number.isInteger(page.gen)) && !(Number.isInteger(page) && page >= 0)) {
-    return false;
-  }
-
-  const zoom = dest[1];
-
-  if (!(typeof zoom === "object" && typeof zoom.name === "string")) {
-    return false;
-  }
-
-  let allowNull = true;
-
-  switch (zoom.name) {
-    case "XYZ":
-      if (destLength !== 5) {
-        return false;
-      }
-
-      break;
-
-    case "Fit":
-    case "FitB":
-      return destLength === 2;
-
-    case "FitH":
-    case "FitBH":
-    case "FitV":
-    case "FitBV":
-      if (destLength !== 3) {
-        return false;
-      }
-
-      break;
-
-    case "FitR":
-      if (destLength !== 6) {
-        return false;
-      }
-
-      allowNull = false;
-      break;
-
-    default:
-      return false;
-  }
-
-  for (let i = 2; i < destLength; i++) {
-    const param = dest[i];
-
-    if (!(typeof param === "number" || allowNull && param === null)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-class SimpleLinkService {
-  constructor() {
-    this.externalLinkTarget = null;
-    this.externalLinkRel = null;
-    this.externalLinkEnabled = true;
-    this._ignoreDestinationZoom = false;
-  }
-
-  get pagesCount() {
-    return 0;
-  }
-
-  get page() {
-    return 0;
-  }
-
-  set page(value) {}
-
-  get rotation() {
-    return 0;
-  }
-
-  set rotation(value) {}
-
-  navigateTo(dest) {}
-
-  getDestinationHash(dest) {
-    return "#";
-  }
-
-  getAnchorUrl(hash) {
-    return "#";
-  }
-
-  setHash(hash) {}
-
-  executeNamedAction(action) {}
-
-  cachePageRef(pageNum, pageRef) {}
-
-  isPageVisible(pageNumber) {
-    return true;
-  }
-
-}
-
-exports.SimpleLinkService = SimpleLinkService;
-
-/***/ }),
-/* 21 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+}));
 exports.PDFOutlineViewer = void 0;
 
+var _base_tree_viewer = __webpack_require__(13);
+
 var _pdfjsLib = __webpack_require__(5);
 
-var _base_tree_viewer = __webpack_require__(13);
+var _ui_utils = __webpack_require__(1);
 
 class PDFOutlineViewer extends _base_tree_viewer.BaseTreeViewer {
   constructor(options) {
@@ -7852,17 +7474,53 @@ class PDFOutlineViewer extends _base_tree_viewer.BaseTreeViewer {
     this.linkService = options.linkService;
 
     this.eventBus._on("toggleoutlinetree", this._toggleAllTreeItems.bind(this));
+
+    this.eventBus._on("currentoutlineitem", this._currentOutlineItem.bind(this));
+
+    this.eventBus._on("pagechanging", evt => {
+      this._currentPageNumber = evt.pageNumber;
+    });
+
+    this.eventBus._on("pagesloaded", evt => {
+      this._isPagesLoaded = !!evt.pagesCount;
+
+      if (this._currentOutlineItemCapability && !this._currentOutlineItemCapability.settled) {
+        this._currentOutlineItemCapability.resolve(this._isPagesLoaded);
+      }
+    });
+
+    this.eventBus._on("sidebarviewchanged", evt => {
+      this._sidebarView = evt.view;
+    });
   }
 
   reset() {
     super.reset();
     this._outline = null;
+    this._pageNumberToDestHashCapability = null;
+    this._currentPageNumber = 1;
+    this._isPagesLoaded = null;
+
+    if (this._currentOutlineItemCapability && !this._currentOutlineItemCapability.settled) {
+      this._currentOutlineItemCapability.resolve(false);
+    }
+
+    this._currentOutlineItemCapability = null;
   }
 
   _dispatchEvent(outlineCount) {
+    this._currentOutlineItemCapability = (0, _pdfjsLib.createPromiseCapability)();
+
+    if (outlineCount === 0 || this._pdfDocument?.loadingParams.disableAutoFetch) {
+      this._currentOutlineItemCapability.resolve(false);
+    } else if (this._isPagesLoaded !== null) {
+      this._currentOutlineItemCapability.resolve(this._isPagesLoaded);
+    }
+
     this.eventBus.dispatch("outlineloaded", {
       source: this,
-      outlineCount
+      outlineCount,
+      currentOutlineItemPromise: this._currentOutlineItemCapability.promise
     });
   }
 
@@ -7876,20 +7534,17 @@ class PDFOutlineViewer extends _base_tree_viewer.BaseTreeViewer {
     } = this;
 
     if (url) {
-      (0, _pdfjsLib.addLinkAttributes)(element, {
-        url,
-        target: newWindow ? _pdfjsLib.LinkTarget.BLANK : linkService.externalLinkTarget,
-        rel: linkService.externalLinkRel,
-        enabled: linkService.externalLinkEnabled
-      });
+      linkService.addLinkAttributes(element, url, newWindow);
       return;
     }
 
     element.href = linkService.getDestinationHash(dest);
 
-    element.onclick = () => {
+    element.onclick = evt => {
+      this._updateCurrentTreeItem(evt.target.parentNode);
+
       if (dest) {
-        linkService.navigateTo(dest);
+        linkService.goToDestination(dest);
       }
 
       return false;
@@ -7913,7 +7568,31 @@ class PDFOutlineViewer extends _base_tree_viewer.BaseTreeViewer {
     count,
     items
   }) {
-    const hidden = count < 0 && Math.abs(count) === items.length;
+    let hidden = false;
+
+    if (count < 0) {
+      let totalCount = items.length;
+
+      if (totalCount > 0) {
+        const queue = [...items];
+
+        while (queue.length > 0) {
+          const {
+            count: nestedCount,
+            items: nestedItems
+          } = queue.shift();
+
+          if (nestedCount > 0 && nestedItems.length > 0) {
+            totalCount += nestedItems.length;
+            queue.push(...nestedItems);
+          }
+        }
+      }
+
+      if (Math.abs(count) === totalCount) {
+        hidden = true;
+      }
+    }
 
     super._addToggleButton(div, hidden);
   }
@@ -7927,13 +7606,15 @@ class PDFOutlineViewer extends _base_tree_viewer.BaseTreeViewer {
   }
 
   render({
-    outline
+    outline,
+    pdfDocument
   }) {
     if (this._outline) {
       this.reset();
     }
 
     this._outline = outline || null;
+    this._pdfDocument = pdfDocument || null;
 
     if (!outline) {
       this._dispatchEvent(0);
@@ -7962,7 +7643,7 @@ class PDFOutlineViewer extends _base_tree_viewer.BaseTreeViewer {
         this._setStyles(element, item);
 
         element.textContent = this._normalizeTextContent(item.title);
-        div.appendChild(element);
+        div.append(element);
 
         if (item.items.length > 0) {
           hasAnyNesting = true;
@@ -7971,26 +7652,134 @@ class PDFOutlineViewer extends _base_tree_viewer.BaseTreeViewer {
 
           const itemsDiv = document.createElement("div");
           itemsDiv.className = "treeItems";
-          div.appendChild(itemsDiv);
+          div.append(itemsDiv);
           queue.push({
             parent: itemsDiv,
             items: item.items
           });
         }
 
-        levelData.parent.appendChild(div);
+        levelData.parent.append(div);
         outlineCount++;
       }
     }
 
-    if (hasAnyNesting) {
-      this.container.classList.add("treeWithDeepNesting");
-      this._lastToggleIsShow = fragment.querySelectorAll(".treeItemsHidden").length === 0;
+    this._finishRendering(fragment, outlineCount, hasAnyNesting);
+  }
+
+  async _currentOutlineItem() {
+    if (!this._isPagesLoaded) {
+      throw new Error("_currentOutlineItem: All pages have not been loaded.");
     }
 
-    this.container.appendChild(fragment);
+    if (!this._outline || !this._pdfDocument) {
+      return;
+    }
 
-    this._dispatchEvent(outlineCount);
+    const pageNumberToDestHash = await this._getPageNumberToDestHash(this._pdfDocument);
+
+    if (!pageNumberToDestHash) {
+      return;
+    }
+
+    this._updateCurrentTreeItem(null);
+
+    if (this._sidebarView !== _ui_utils.SidebarView.OUTLINE) {
+      return;
+    }
+
+    for (let i = this._currentPageNumber; i > 0; i--) {
+      const destHash = pageNumberToDestHash.get(i);
+
+      if (!destHash) {
+        continue;
+      }
+
+      const linkElement = this.container.querySelector(`a[href="${destHash}"]`);
+
+      if (!linkElement) {
+        continue;
+      }
+
+      this._scrollToCurrentTreeItem(linkElement.parentNode);
+
+      break;
+    }
+  }
+
+  async _getPageNumberToDestHash(pdfDocument) {
+    if (this._pageNumberToDestHashCapability) {
+      return this._pageNumberToDestHashCapability.promise;
+    }
+
+    this._pageNumberToDestHashCapability = (0, _pdfjsLib.createPromiseCapability)();
+    const pageNumberToDestHash = new Map(),
+          pageNumberNesting = new Map();
+    const queue = [{
+      nesting: 0,
+      items: this._outline
+    }];
+
+    while (queue.length > 0) {
+      const levelData = queue.shift(),
+            currentNesting = levelData.nesting;
+
+      for (const {
+        dest,
+        items
+      } of levelData.items) {
+        let explicitDest, pageNumber;
+
+        if (typeof dest === "string") {
+          explicitDest = await pdfDocument.getDestination(dest);
+
+          if (pdfDocument !== this._pdfDocument) {
+            return null;
+          }
+        } else {
+          explicitDest = dest;
+        }
+
+        if (Array.isArray(explicitDest)) {
+          const [destRef] = explicitDest;
+
+          if (typeof destRef === "object" && destRef !== null) {
+            pageNumber = this.linkService._cachedPageNumber(destRef);
+
+            if (!pageNumber) {
+              try {
+                pageNumber = (await pdfDocument.getPageIndex(destRef)) + 1;
+
+                if (pdfDocument !== this._pdfDocument) {
+                  return null;
+                }
+
+                this.linkService.cachePageRef(pageNumber, destRef);
+              } catch (ex) {}
+            }
+          } else if (Number.isInteger(destRef)) {
+            pageNumber = destRef + 1;
+          }
+
+          if (Number.isInteger(pageNumber) && (!pageNumberToDestHash.has(pageNumber) || currentNesting > pageNumberNesting.get(pageNumber))) {
+            const destHash = this.linkService.getDestinationHash(dest);
+            pageNumberToDestHash.set(pageNumber, destHash);
+            pageNumberNesting.set(pageNumber, currentNesting);
+          }
+        }
+
+        if (items.length > 0) {
+          queue.push({
+            nesting: currentNesting + 1,
+            items
+          });
+        }
+      }
+    }
+
+    this._pageNumberToDestHashCapability.resolve(pageNumberToDestHash.size > 0 ? pageNumberToDestHash : null);
+
+    return this._pageNumberToDestHashCapability.promise;
   }
 
 }
@@ -7998,20 +7787,20 @@ class PDFOutlineViewer extends _base_tree_viewer.BaseTreeViewer {
 exports.PDFOutlineViewer = PDFOutlineViewer;
 
 /***/ }),
-/* 22 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 21 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFPresentationMode = void 0;
 
-var _ui_utils = __webpack_require__(2);
+var _ui_utils = __webpack_require__(1);
+
+var _pdfjsLib = __webpack_require__(5);
 
-const DELAY_BEFORE_RESETTING_SWITCH_IN_PROGRESS = 1500;
 const DELAY_BEFORE_HIDING_CONTROLS = 3000;
 const ACTIVE_SELECTOR = "pdfPresentationMode";
 const CONTROLS_SELECTOR = "pdfPresentationModeControls";
@@ -8021,88 +7810,77 @@ const SWIPE_MIN_DISTANCE_THRESHOLD = 50;
 const SWIPE_ANGLE_THRESHOLD = Math.PI / 6;
 
 class PDFPresentationMode {
+  #state = _ui_utils.PresentationModeState.UNKNOWN;
+  #args = null;
+
   constructor({
     container,
     pdfViewer,
-    eventBus,
-    contextMenuItems = null
+    eventBus
   }) {
     this.container = container;
     this.pdfViewer = pdfViewer;
     this.eventBus = eventBus;
-    this.active = false;
-    this.args = null;
     this.contextMenuOpen = false;
     this.mouseScrollTimeStamp = 0;
     this.mouseScrollDelta = 0;
     this.touchSwipeState = null;
-
-    if (contextMenuItems) {
-      contextMenuItems.contextFirstPage.addEventListener("click", () => {
-        this.contextMenuOpen = false;
-        this.eventBus.dispatch("firstpage", {
-          source: this
-        });
-      });
-      contextMenuItems.contextLastPage.addEventListener("click", () => {
-        this.contextMenuOpen = false;
-        this.eventBus.dispatch("lastpage", {
-          source: this
-        });
-      });
-      contextMenuItems.contextPageRotateCw.addEventListener("click", () => {
-        this.contextMenuOpen = false;
-        this.eventBus.dispatch("rotatecw", {
-          source: this
-        });
-      });
-      contextMenuItems.contextPageRotateCcw.addEventListener("click", () => {
-        this.contextMenuOpen = false;
-        this.eventBus.dispatch("rotateccw", {
-          source: this
-        });
-      });
-    }
   }
 
-  request() {
-    if (this.switchInProgress || this.active || !this.pdfViewer.pagesCount) {
+  async request() {
+    const {
+      container,
+      pdfViewer
+    } = this;
+
+    if (this.active || !pdfViewer.pagesCount || !container.requestFullscreen) {
       return false;
     }
 
-    this._addFullscreenChangeListeners();
-
-    this._setSwitchInProgress();
-
-    this._notifyStateChange();
-
-    if (this.container.requestFullscreen) {
-      this.container.requestFullscreen();
-    } else if (this.container.mozRequestFullScreen) {
-      this.container.mozRequestFullScreen();
-    } else if (this.container.webkitRequestFullscreen) {
-      this.container.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
-    } else if (this.container.msRequestFullscreen) {
-      this.container.msRequestFullscreen();
-    } else {
-      return false;
-    }
-
-    this.args = {
-      page: this.pdfViewer.currentPageNumber,
-      previousScale: this.pdfViewer.currentScaleValue
+    this.#addFullscreenChangeListeners();
+    this.#notifyStateChange(_ui_utils.PresentationModeState.CHANGING);
+    const promise = container.requestFullscreen();
+    this.#args = {
+      pageNumber: pdfViewer.currentPageNumber,
+      scaleValue: pdfViewer.currentScaleValue,
+      scrollMode: pdfViewer.scrollMode,
+      spreadMode: null,
+      annotationEditorMode: null
     };
-    return true;
+
+    if (pdfViewer.spreadMode !== _ui_utils.SpreadMode.NONE && !(pdfViewer.pageViewsReady && pdfViewer.hasEqualPageSizes)) {
+      console.warn("Ignoring Spread modes when entering PresentationMode, " + "since the document may contain varying page sizes.");
+      this.#args.spreadMode = pdfViewer.spreadMode;
+    }
+
+    if (pdfViewer.annotationEditorMode !== _pdfjsLib.AnnotationEditorType.DISABLE) {
+      this.#args.annotationEditorMode = pdfViewer.annotationEditorMode;
+    }
+
+    try {
+      await promise;
+      pdfViewer.focus();
+      return true;
+    } catch (reason) {
+      this.#removeFullscreenChangeListeners();
+      this.#notifyStateChange(_ui_utils.PresentationModeState.NORMAL);
+    }
+
+    return false;
   }
 
-  _mouseWheel(evt) {
+  get active() {
+    return this.#state === _ui_utils.PresentationModeState.CHANGING || this.#state === _ui_utils.PresentationModeState.FULLSCREEN;
+  }
+
+  #mouseWheel(evt) {
     if (!this.active) {
       return;
     }
 
     evt.preventDefault();
     const delta = (0, _ui_utils.normalizeWheelEventDelta)(evt);
-    const currentTime = new Date().getTime();
+    const currentTime = Date.now();
     const storedTime = this.mouseScrollTimeStamp;
 
     if (currentTime > storedTime && currentTime - storedTime < MOUSE_SCROLL_COOLDOWN_TIME) {
@@ -8110,17 +7888,15 @@ class PDFPresentationMode {
     }
 
     if (this.mouseScrollDelta > 0 && delta < 0 || this.mouseScrollDelta < 0 && delta > 0) {
-      this._resetMouseScrollState();
+      this.#resetMouseScrollState();
     }
 
     this.mouseScrollDelta += delta;
 
     if (Math.abs(this.mouseScrollDelta) >= PAGE_SWITCH_THRESHOLD) {
       const totalDelta = this.mouseScrollDelta;
-
-      this._resetMouseScrollState();
-
-      const success = totalDelta > 0 ? this._goToPreviousPage() : this._goToNextPage();
+      this.#resetMouseScrollState();
+      const success = totalDelta > 0 ? this.pdfViewer.previousPage() : this.pdfViewer.nextPage();
 
       if (success) {
         this.mouseScrollTimeStamp = currentTime;
@@ -8128,109 +7904,65 @@ class PDFPresentationMode {
     }
   }
 
-  get isFullscreen() {
-    return !!(document.fullscreenElement || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement);
-  }
-
-  _goToPreviousPage() {
-    const page = this.pdfViewer.currentPageNumber;
-
-    if (page <= 1) {
-      return false;
-    }
-
-    this.pdfViewer.currentPageNumber = page - 1;
-    return true;
-  }
-
-  _goToNextPage() {
-    const page = this.pdfViewer.currentPageNumber;
-
-    if (page >= this.pdfViewer.pagesCount) {
-      return false;
-    }
-
-    this.pdfViewer.currentPageNumber = page + 1;
-    return true;
-  }
-
-  _notifyStateChange() {
+  #notifyStateChange(state) {
+    this.#state = state;
     this.eventBus.dispatch("presentationmodechanged", {
       source: this,
-      active: this.active,
-      switchInProgress: !!this.switchInProgress
+      state
     });
   }
 
-  _setSwitchInProgress() {
-    if (this.switchInProgress) {
-      clearTimeout(this.switchInProgress);
-    }
-
-    this.switchInProgress = setTimeout(() => {
-      this._removeFullscreenChangeListeners();
-
-      delete this.switchInProgress;
-
-      this._notifyStateChange();
-    }, DELAY_BEFORE_RESETTING_SWITCH_IN_PROGRESS);
-  }
-
-  _resetSwitchInProgress() {
-    if (this.switchInProgress) {
-      clearTimeout(this.switchInProgress);
-      delete this.switchInProgress;
-    }
-  }
-
-  _enter() {
-    this.active = true;
-
-    this._resetSwitchInProgress();
-
-    this._notifyStateChange();
-
+  #enter() {
+    this.#notifyStateChange(_ui_utils.PresentationModeState.FULLSCREEN);
     this.container.classList.add(ACTIVE_SELECTOR);
     setTimeout(() => {
-      this.pdfViewer.currentPageNumber = this.args.page;
+      this.pdfViewer.scrollMode = _ui_utils.ScrollMode.PAGE;
+
+      if (this.#args.spreadMode !== null) {
+        this.pdfViewer.spreadMode = _ui_utils.SpreadMode.NONE;
+      }
+
+      this.pdfViewer.currentPageNumber = this.#args.pageNumber;
       this.pdfViewer.currentScaleValue = "page-fit";
+
+      if (this.#args.annotationEditorMode !== null) {
+        this.pdfViewer.annotationEditorMode = _pdfjsLib.AnnotationEditorType.NONE;
+      }
     }, 0);
-
-    this._addWindowListeners();
-
-    this._showControls();
-
+    this.#addWindowListeners();
+    this.#showControls();
     this.contextMenuOpen = false;
-    this.container.setAttribute("contextmenu", "viewerContextMenu");
     window.getSelection().removeAllRanges();
   }
 
-  _exit() {
-    const page = this.pdfViewer.currentPageNumber;
+  #exit() {
+    const pageNumber = this.pdfViewer.currentPageNumber;
     this.container.classList.remove(ACTIVE_SELECTOR);
     setTimeout(() => {
-      this.active = false;
+      this.#removeFullscreenChangeListeners();
+      this.#notifyStateChange(_ui_utils.PresentationModeState.NORMAL);
+      this.pdfViewer.scrollMode = this.#args.scrollMode;
 
-      this._removeFullscreenChangeListeners();
+      if (this.#args.spreadMode !== null) {
+        this.pdfViewer.spreadMode = this.#args.spreadMode;
+      }
 
-      this._notifyStateChange();
+      this.pdfViewer.currentScaleValue = this.#args.scaleValue;
+      this.pdfViewer.currentPageNumber = pageNumber;
 
-      this.pdfViewer.currentScaleValue = this.args.previousScale;
-      this.pdfViewer.currentPageNumber = page;
-      this.args = null;
+      if (this.#args.annotationEditorMode !== null) {
+        this.pdfViewer.annotationEditorMode = this.#args.annotationEditorMode;
+      }
+
+      this.#args = null;
     }, 0);
-
-    this._removeWindowListeners();
-
-    this._hideControls();
-
-    this._resetMouseScrollState();
-
-    this.container.removeAttribute("contextmenu");
+    this.#removeWindowListeners();
+    this.#hideControls();
+    this.#resetMouseScrollState();
     this.contextMenuOpen = false;
   }
 
-  _mouseDown(evt) {
+  #mouseDown(evt) {
     if (this.contextMenuOpen) {
       this.contextMenuOpen = false;
       evt.preventDefault();
@@ -8244,19 +7976,19 @@ class PDFPresentationMode {
         evt.preventDefault();
 
         if (evt.shiftKey) {
-          this._goToPreviousPage();
+          this.pdfViewer.previousPage();
         } else {
-          this._goToNextPage();
+          this.pdfViewer.nextPage();
         }
       }
     }
   }
 
-  _contextMenu() {
+  #contextMenu() {
     this.contextMenuOpen = true;
   }
 
-  _showControls() {
+  #showControls() {
     if (this.controlsTimeout) {
       clearTimeout(this.controlsTimeout);
     } else {
@@ -8269,7 +8001,7 @@ class PDFPresentationMode {
     }, DELAY_BEFORE_HIDING_CONTROLS);
   }
 
-  _hideControls() {
+  #hideControls() {
     if (!this.controlsTimeout) {
       return;
     }
@@ -8279,12 +8011,12 @@ class PDFPresentationMode {
     delete this.controlsTimeout;
   }
 
-  _resetMouseScrollState() {
+  #resetMouseScrollState() {
     this.mouseScrollTimeStamp = 0;
     this.mouseScrollDelta = 0;
   }
 
-  _touchSwipe(evt) {
+  #touchSwipe(evt) {
     if (!this.active) {
       return;
     }
@@ -8331,22 +8063,22 @@ class PDFPresentationMode {
         }
 
         if (delta > 0) {
-          this._goToPreviousPage();
+          this.pdfViewer.previousPage();
         } else if (delta < 0) {
-          this._goToNextPage();
+          this.pdfViewer.nextPage();
         }
 
         break;
     }
   }
 
-  _addWindowListeners() {
-    this.showControlsBind = this._showControls.bind(this);
-    this.mouseDownBind = this._mouseDown.bind(this);
-    this.mouseWheelBind = this._mouseWheel.bind(this);
-    this.resetMouseScrollStateBind = this._resetMouseScrollState.bind(this);
-    this.contextMenuBind = this._contextMenu.bind(this);
-    this.touchSwipeBind = this._touchSwipe.bind(this);
+  #addWindowListeners() {
+    this.showControlsBind = this.#showControls.bind(this);
+    this.mouseDownBind = this.#mouseDown.bind(this);
+    this.mouseWheelBind = this.#mouseWheel.bind(this);
+    this.resetMouseScrollStateBind = this.#resetMouseScrollState.bind(this);
+    this.contextMenuBind = this.#contextMenu.bind(this);
+    this.touchSwipeBind = this.#touchSwipe.bind(this);
     window.addEventListener("mousemove", this.showControlsBind);
     window.addEventListener("mousedown", this.mouseDownBind);
     window.addEventListener("wheel", this.mouseWheelBind, {
@@ -8359,7 +8091,7 @@ class PDFPresentationMode {
     window.addEventListener("touchend", this.touchSwipeBind);
   }
 
-  _removeWindowListeners() {
+  #removeWindowListeners() {
     window.removeEventListener("mousemove", this.showControlsBind);
     window.removeEventListener("mousedown", this.mouseDownBind);
     window.removeEventListener("wheel", this.mouseWheelBind, {
@@ -8378,27 +8110,21 @@ class PDFPresentationMode {
     delete this.touchSwipeBind;
   }
 
-  _fullscreenChange() {
-    if (this.isFullscreen) {
-      this._enter();
+  #fullscreenChange() {
+    if (document.fullscreenElement) {
+      this.#enter();
     } else {
-      this._exit();
+      this.#exit();
     }
   }
 
-  _addFullscreenChangeListeners() {
-    this.fullscreenChangeBind = this._fullscreenChange.bind(this);
+  #addFullscreenChangeListeners() {
+    this.fullscreenChangeBind = this.#fullscreenChange.bind(this);
     window.addEventListener("fullscreenchange", this.fullscreenChangeBind);
-    window.addEventListener("mozfullscreenchange", this.fullscreenChangeBind);
-    window.addEventListener("webkitfullscreenchange", this.fullscreenChangeBind);
-    window.addEventListener("MSFullscreenChange", this.fullscreenChangeBind);
   }
 
-  _removeFullscreenChangeListeners() {
+  #removeFullscreenChangeListeners() {
     window.removeEventListener("fullscreenchange", this.fullscreenChangeBind);
-    window.removeEventListener("mozfullscreenchange", this.fullscreenChangeBind);
-    window.removeEventListener("webkitfullscreenchange", this.fullscreenChangeBind);
-    window.removeEventListener("MSFullscreenChange", this.fullscreenChangeBind);
     delete this.fullscreenChangeBind;
   }
 
@@ -8407,45 +8133,1031 @@ class PDFPresentationMode {
 exports.PDFPresentationMode = PDFPresentationMode;
 
 /***/ }),
-/* 23 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 22 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.PDFRenderingQueue = void 0;
+
+var _pdfjsLib = __webpack_require__(5);
+
+var _ui_utils = __webpack_require__(1);
+
+const CLEANUP_TIMEOUT = 30000;
+
+class PDFRenderingQueue {
+  constructor() {
+    this.pdfViewer = null;
+    this.pdfThumbnailViewer = null;
+    this.onIdle = null;
+    this.highestPriorityPage = null;
+    this.idleTimeout = null;
+    this.printing = false;
+    this.isThumbnailViewEnabled = false;
+  }
+
+  setViewer(pdfViewer) {
+    this.pdfViewer = pdfViewer;
+  }
+
+  setThumbnailViewer(pdfThumbnailViewer) {
+    this.pdfThumbnailViewer = pdfThumbnailViewer;
+  }
+
+  isHighestPriority(view) {
+    return this.highestPriorityPage === view.renderingId;
+  }
+
+  hasViewer() {
+    return !!this.pdfViewer;
+  }
+
+  renderHighestPriority(currentlyVisiblePages) {
+    if (this.idleTimeout) {
+      clearTimeout(this.idleTimeout);
+      this.idleTimeout = null;
+    }
+
+    if (this.pdfViewer.forceRendering(currentlyVisiblePages)) {
+      return;
+    }
+
+    if (this.isThumbnailViewEnabled && this.pdfThumbnailViewer?.forceRendering()) {
+      return;
+    }
+
+    if (this.printing) {
+      return;
+    }
+
+    if (this.onIdle) {
+      this.idleTimeout = setTimeout(this.onIdle.bind(this), CLEANUP_TIMEOUT);
+    }
+  }
+
+  getHighestPriority(visible, views, scrolledDown, preRenderExtra = false) {
+    const visibleViews = visible.views,
+          numVisible = visibleViews.length;
+
+    if (numVisible === 0) {
+      return null;
+    }
+
+    for (let i = 0; i < numVisible; i++) {
+      const view = visibleViews[i].view;
+
+      if (!this.isViewFinished(view)) {
+        return view;
+      }
+    }
+
+    const firstId = visible.first.id,
+          lastId = visible.last.id;
+
+    if (lastId - firstId + 1 > numVisible) {
+      const visibleIds = visible.ids;
+
+      for (let i = 1, ii = lastId - firstId; i < ii; i++) {
+        const holeId = scrolledDown ? firstId + i : lastId - i;
+
+        if (visibleIds.has(holeId)) {
+          continue;
+        }
+
+        const holeView = views[holeId - 1];
+
+        if (!this.isViewFinished(holeView)) {
+          return holeView;
+        }
+      }
+    }
+
+    let preRenderIndex = scrolledDown ? lastId : firstId - 2;
+    let preRenderView = views[preRenderIndex];
+
+    if (preRenderView && !this.isViewFinished(preRenderView)) {
+      return preRenderView;
+    }
+
+    if (preRenderExtra) {
+      preRenderIndex += scrolledDown ? 1 : -1;
+      preRenderView = views[preRenderIndex];
+
+      if (preRenderView && !this.isViewFinished(preRenderView)) {
+        return preRenderView;
+      }
+    }
+
+    return null;
+  }
+
+  isViewFinished(view) {
+    return view.renderingState === _ui_utils.RenderingStates.FINISHED;
+  }
+
+  renderView(view) {
+    switch (view.renderingState) {
+      case _ui_utils.RenderingStates.FINISHED:
+        return false;
+
+      case _ui_utils.RenderingStates.PAUSED:
+        this.highestPriorityPage = view.renderingId;
+        view.resume();
+        break;
+
+      case _ui_utils.RenderingStates.RUNNING:
+        this.highestPriorityPage = view.renderingId;
+        break;
+
+      case _ui_utils.RenderingStates.INITIAL:
+        this.highestPriorityPage = view.renderingId;
+        view.draw().finally(() => {
+          this.renderHighestPriority();
+        }).catch(reason => {
+          if (reason instanceof _pdfjsLib.RenderingCancelledException) {
+            return;
+          }
+
+          console.error(`renderView: "${reason}"`);
+        });
+        break;
+    }
+
+    return true;
+  }
+
+}
+
+exports.PDFRenderingQueue = PDFRenderingQueue;
+
+/***/ }),
+/* 23 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.PDFScriptingManager = void 0;
+
+var _ui_utils = __webpack_require__(1);
+
+var _pdfjsLib = __webpack_require__(5);
+
+class PDFScriptingManager {
+  constructor({
+    eventBus,
+    sandboxBundleSrc = null,
+    scriptingFactory = null,
+    docPropertiesLookup = null
+  }) {
+    this._pdfDocument = null;
+    this._pdfViewer = null;
+    this._closeCapability = null;
+    this._destroyCapability = null;
+    this._scripting = null;
+    this._mouseState = Object.create(null);
+    this._ready = false;
+    this._eventBus = eventBus;
+    this._sandboxBundleSrc = sandboxBundleSrc;
+    this._scriptingFactory = scriptingFactory;
+    this._docPropertiesLookup = docPropertiesLookup;
+  }
+
+  setViewer(pdfViewer) {
+    this._pdfViewer = pdfViewer;
+  }
+
+  async setDocument(pdfDocument) {
+    if (this._pdfDocument) {
+      await this._destroyScripting();
+    }
+
+    this._pdfDocument = pdfDocument;
+
+    if (!pdfDocument) {
+      return;
+    }
+
+    const [objects, calculationOrder, docActions] = await Promise.all([pdfDocument.getFieldObjects(), pdfDocument.getCalculationOrderIds(), pdfDocument.getJSActions()]);
+
+    if (!objects && !docActions) {
+      await this._destroyScripting();
+      return;
+    }
+
+    if (pdfDocument !== this._pdfDocument) {
+      return;
+    }
+
+    try {
+      this._scripting = this._createScripting();
+    } catch (error) {
+      console.error(`PDFScriptingManager.setDocument: "${error?.message}".`);
+      await this._destroyScripting();
+      return;
+    }
+
+    this._internalEvents.set("updatefromsandbox", event => {
+      if (event?.source !== window) {
+        return;
+      }
+
+      this._updateFromSandbox(event.detail);
+    });
+
+    this._internalEvents.set("dispatcheventinsandbox", event => {
+      this._scripting?.dispatchEventInSandbox(event.detail);
+    });
+
+    this._internalEvents.set("pagechanging", ({
+      pageNumber,
+      previous
+    }) => {
+      if (pageNumber === previous) {
+        return;
+      }
+
+      this._dispatchPageClose(previous);
+
+      this._dispatchPageOpen(pageNumber);
+    });
+
+    this._internalEvents.set("pagerendered", ({
+      pageNumber
+    }) => {
+      if (!this._pageOpenPending.has(pageNumber)) {
+        return;
+      }
+
+      if (pageNumber !== this._pdfViewer.currentPageNumber) {
+        return;
+      }
+
+      this._dispatchPageOpen(pageNumber);
+    });
+
+    this._internalEvents.set("pagesdestroy", async event => {
+      await this._dispatchPageClose(this._pdfViewer.currentPageNumber);
+      await this._scripting?.dispatchEventInSandbox({
+        id: "doc",
+        name: "WillClose"
+      });
+      this._closeCapability?.resolve();
+    });
+
+    this._domEvents.set("mousedown", event => {
+      this._mouseState.isDown = true;
+    });
+
+    this._domEvents.set("mouseup", event => {
+      this._mouseState.isDown = false;
+    });
+
+    for (const [name, listener] of this._internalEvents) {
+      this._eventBus._on(name, listener);
+    }
+
+    for (const [name, listener] of this._domEvents) {
+      window.addEventListener(name, listener, true);
+    }
+
+    try {
+      const docProperties = await this._getDocProperties();
+
+      if (pdfDocument !== this._pdfDocument) {
+        return;
+      }
+
+      await this._scripting.createSandbox({
+        objects,
+        calculationOrder,
+        appInfo: {
+          platform: navigator.platform,
+          language: navigator.language
+        },
+        docInfo: { ...docProperties,
+          actions: docActions
+        }
+      });
+
+      this._eventBus.dispatch("sandboxcreated", {
+        source: this
+      });
+    } catch (error) {
+      console.error(`PDFScriptingManager.setDocument: "${error?.message}".`);
+      await this._destroyScripting();
+      return;
+    }
+
+    await this._scripting?.dispatchEventInSandbox({
+      id: "doc",
+      name: "Open"
+    });
+    await this._dispatchPageOpen(this._pdfViewer.currentPageNumber, true);
+    Promise.resolve().then(() => {
+      if (pdfDocument === this._pdfDocument) {
+        this._ready = true;
+      }
+    });
+  }
+
+  async dispatchWillSave(detail) {
+    return this._scripting?.dispatchEventInSandbox({
+      id: "doc",
+      name: "WillSave"
+    });
+  }
+
+  async dispatchDidSave(detail) {
+    return this._scripting?.dispatchEventInSandbox({
+      id: "doc",
+      name: "DidSave"
+    });
+  }
+
+  async dispatchWillPrint(detail) {
+    return this._scripting?.dispatchEventInSandbox({
+      id: "doc",
+      name: "WillPrint"
+    });
+  }
+
+  async dispatchDidPrint(detail) {
+    return this._scripting?.dispatchEventInSandbox({
+      id: "doc",
+      name: "DidPrint"
+    });
+  }
+
+  get mouseState() {
+    return this._mouseState;
+  }
+
+  get destroyPromise() {
+    return this._destroyCapability?.promise || null;
+  }
+
+  get ready() {
+    return this._ready;
+  }
+
+  get _internalEvents() {
+    return (0, _pdfjsLib.shadow)(this, "_internalEvents", new Map());
+  }
+
+  get _domEvents() {
+    return (0, _pdfjsLib.shadow)(this, "_domEvents", new Map());
+  }
+
+  get _pageOpenPending() {
+    return (0, _pdfjsLib.shadow)(this, "_pageOpenPending", new Set());
+  }
+
+  get _visitedPages() {
+    return (0, _pdfjsLib.shadow)(this, "_visitedPages", new Map());
+  }
+
+  async _updateFromSandbox(detail) {
+    const isInPresentationMode = this._pdfViewer.isInPresentationMode || this._pdfViewer.isChangingPresentationMode;
+    const {
+      id,
+      siblings,
+      command,
+      value
+    } = detail;
+
+    if (!id) {
+      switch (command) {
+        case "clear":
+          console.clear();
+          break;
+
+        case "error":
+          console.error(value);
+          break;
+
+        case "layout":
+          if (isInPresentationMode) {
+            return;
+          }
+
+          const modes = (0, _ui_utils.apiPageLayoutToViewerModes)(value);
+          this._pdfViewer.spreadMode = modes.spreadMode;
+          break;
+
+        case "page-num":
+          this._pdfViewer.currentPageNumber = value + 1;
+          break;
+
+        case "print":
+          await this._pdfViewer.pagesPromise;
+
+          this._eventBus.dispatch("print", {
+            source: this
+          });
+
+          break;
+
+        case "println":
+          console.log(value);
+          break;
+
+        case "zoom":
+          if (isInPresentationMode) {
+            return;
+          }
+
+          this._pdfViewer.currentScaleValue = value;
+          break;
+
+        case "SaveAs":
+          this._eventBus.dispatch("download", {
+            source: this
+          });
+
+          break;
+
+        case "FirstPage":
+          this._pdfViewer.currentPageNumber = 1;
+          break;
+
+        case "LastPage":
+          this._pdfViewer.currentPageNumber = this._pdfViewer.pagesCount;
+          break;
+
+        case "NextPage":
+          this._pdfViewer.nextPage();
+
+          break;
+
+        case "PrevPage":
+          this._pdfViewer.previousPage();
+
+          break;
+
+        case "ZoomViewIn":
+          if (isInPresentationMode) {
+            return;
+          }
+
+          this._pdfViewer.increaseScale();
+
+          break;
+
+        case "ZoomViewOut":
+          if (isInPresentationMode) {
+            return;
+          }
+
+          this._pdfViewer.decreaseScale();
+
+          break;
+      }
+
+      return;
+    }
+
+    if (isInPresentationMode) {
+      if (detail.focus) {
+        return;
+      }
+    }
+
+    delete detail.id;
+    delete detail.siblings;
+    const ids = siblings ? [id, ...siblings] : [id];
+
+    for (const elementId of ids) {
+      const element = document.querySelector(`[data-element-id="${elementId}"]`);
+
+      if (element) {
+        element.dispatchEvent(new CustomEvent("updatefromsandbox", {
+          detail
+        }));
+      } else {
+        this._pdfDocument?.annotationStorage.setValue(elementId, detail);
+      }
+    }
+  }
+
+  async _dispatchPageOpen(pageNumber, initialize = false) {
+    const pdfDocument = this._pdfDocument,
+          visitedPages = this._visitedPages;
+
+    if (initialize) {
+      this._closeCapability = (0, _pdfjsLib.createPromiseCapability)();
+    }
+
+    if (!this._closeCapability) {
+      return;
+    }
+
+    const pageView = this._pdfViewer.getPageView(pageNumber - 1);
+
+    if (pageView?.renderingState !== _ui_utils.RenderingStates.FINISHED) {
+      this._pageOpenPending.add(pageNumber);
+
+      return;
+    }
+
+    this._pageOpenPending.delete(pageNumber);
+
+    const actionsPromise = (async () => {
+      const actions = await (!visitedPages.has(pageNumber) ? pageView.pdfPage?.getJSActions() : null);
+
+      if (pdfDocument !== this._pdfDocument) {
+        return;
+      }
+
+      await this._scripting?.dispatchEventInSandbox({
+        id: "page",
+        name: "PageOpen",
+        pageNumber,
+        actions
+      });
+    })();
+
+    visitedPages.set(pageNumber, actionsPromise);
+  }
+
+  async _dispatchPageClose(pageNumber) {
+    const pdfDocument = this._pdfDocument,
+          visitedPages = this._visitedPages;
+
+    if (!this._closeCapability) {
+      return;
+    }
+
+    if (this._pageOpenPending.has(pageNumber)) {
+      return;
+    }
+
+    const actionsPromise = visitedPages.get(pageNumber);
+
+    if (!actionsPromise) {
+      return;
+    }
+
+    visitedPages.set(pageNumber, null);
+    await actionsPromise;
+
+    if (pdfDocument !== this._pdfDocument) {
+      return;
+    }
+
+    await this._scripting?.dispatchEventInSandbox({
+      id: "page",
+      name: "PageClose",
+      pageNumber
+    });
+  }
+
+  async _getDocProperties() {
+    if (this._docPropertiesLookup) {
+      return this._docPropertiesLookup(this._pdfDocument);
+    }
+
+    throw new Error("_getDocProperties: Unable to lookup properties.");
+  }
+
+  _createScripting() {
+    this._destroyCapability = (0, _pdfjsLib.createPromiseCapability)();
+
+    if (this._scripting) {
+      throw new Error("_createScripting: Scripting already exists.");
+    }
+
+    if (this._scriptingFactory) {
+      return this._scriptingFactory.createScripting({
+        sandboxBundleSrc: this._sandboxBundleSrc
+      });
+    }
+
+    throw new Error("_createScripting: Cannot create scripting.");
+  }
+
+  async _destroyScripting() {
+    if (!this._scripting) {
+      this._pdfDocument = null;
+      this._destroyCapability?.resolve();
+      return;
+    }
+
+    if (this._closeCapability) {
+      await Promise.race([this._closeCapability.promise, new Promise(resolve => {
+        setTimeout(resolve, 1000);
+      })]).catch(reason => {});
+      this._closeCapability = null;
+    }
+
+    this._pdfDocument = null;
+
+    try {
+      await this._scripting.destroySandbox();
+    } catch (ex) {}
+
+    for (const [name, listener] of this._internalEvents) {
+      this._eventBus._off(name, listener);
+    }
+
+    this._internalEvents.clear();
+
+    for (const [name, listener] of this._domEvents) {
+      window.removeEventListener(name, listener, true);
+    }
+
+    this._domEvents.clear();
+
+    this._pageOpenPending.clear();
+
+    this._visitedPages.clear();
+
+    this._scripting = null;
+    delete this._mouseState.isDown;
+    this._ready = false;
+    this._destroyCapability?.resolve();
+  }
+
+}
+
+exports.PDFScriptingManager = PDFScriptingManager;
+
+/***/ }),
+/* 24 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.PDFSidebar = void 0;
+
+var _ui_utils = __webpack_require__(1);
+
+const UI_NOTIFICATION_CLASS = "pdfSidebarNotification";
+
+class PDFSidebar {
+  constructor({
+    elements,
+    pdfViewer,
+    pdfThumbnailViewer,
+    eventBus,
+    l10n
+  }) {
+    this.isOpen = false;
+    this.active = _ui_utils.SidebarView.THUMBS;
+    this.isInitialViewSet = false;
+    this.isInitialEventDispatched = false;
+    this.onToggled = null;
+    this.pdfViewer = pdfViewer;
+    this.pdfThumbnailViewer = pdfThumbnailViewer;
+    this.outerContainer = elements.outerContainer;
+    this.sidebarContainer = elements.sidebarContainer;
+    this.toggleButton = elements.toggleButton;
+    this.thumbnailButton = elements.thumbnailButton;
+    this.outlineButton = elements.outlineButton;
+    this.attachmentsButton = elements.attachmentsButton;
+    this.layersButton = elements.layersButton;
+    this.thumbnailView = elements.thumbnailView;
+    this.outlineView = elements.outlineView;
+    this.attachmentsView = elements.attachmentsView;
+    this.layersView = elements.layersView;
+    this._outlineOptionsContainer = elements.outlineOptionsContainer;
+    this._currentOutlineItemButton = elements.currentOutlineItemButton;
+    this.eventBus = eventBus;
+    this.l10n = l10n;
+    this.#addEventListeners();
+  }
+
+  reset() {
+    this.isInitialViewSet = false;
+    this.isInitialEventDispatched = false;
+    this.#hideUINotification(true);
+    this.switchView(_ui_utils.SidebarView.THUMBS);
+    this.outlineButton.disabled = false;
+    this.attachmentsButton.disabled = false;
+    this.layersButton.disabled = false;
+    this._currentOutlineItemButton.disabled = true;
+  }
+
+  get visibleView() {
+    return this.isOpen ? this.active : _ui_utils.SidebarView.NONE;
+  }
+
+  setInitialView(view = _ui_utils.SidebarView.NONE) {
+    if (this.isInitialViewSet) {
+      return;
+    }
+
+    this.isInitialViewSet = true;
+
+    if (view === _ui_utils.SidebarView.NONE || view === _ui_utils.SidebarView.UNKNOWN) {
+      this.#dispatchEvent();
+      return;
+    }
+
+    this.switchView(view, true);
+
+    if (!this.isInitialEventDispatched) {
+      this.#dispatchEvent();
+    }
+  }
+
+  switchView(view, forceOpen = false) {
+    const isViewChanged = view !== this.active;
+    let shouldForceRendering = false;
+
+    switch (view) {
+      case _ui_utils.SidebarView.NONE:
+        if (this.isOpen) {
+          this.close();
+        }
+
+        return;
+
+      case _ui_utils.SidebarView.THUMBS:
+        if (this.isOpen && isViewChanged) {
+          shouldForceRendering = true;
+        }
+
+        break;
+
+      case _ui_utils.SidebarView.OUTLINE:
+        if (this.outlineButton.disabled) {
+          return;
+        }
+
+        break;
+
+      case _ui_utils.SidebarView.ATTACHMENTS:
+        if (this.attachmentsButton.disabled) {
+          return;
+        }
+
+        break;
+
+      case _ui_utils.SidebarView.LAYERS:
+        if (this.layersButton.disabled) {
+          return;
+        }
+
+        break;
+
+      default:
+        console.error(`PDFSidebar.switchView: "${view}" is not a valid view.`);
+        return;
+    }
+
+    this.active = view;
+    const isThumbs = view === _ui_utils.SidebarView.THUMBS,
+          isOutline = view === _ui_utils.SidebarView.OUTLINE,
+          isAttachments = view === _ui_utils.SidebarView.ATTACHMENTS,
+          isLayers = view === _ui_utils.SidebarView.LAYERS;
+    this.thumbnailButton.classList.toggle("toggled", isThumbs);
+    this.outlineButton.classList.toggle("toggled", isOutline);
+    this.attachmentsButton.classList.toggle("toggled", isAttachments);
+    this.layersButton.classList.toggle("toggled", isLayers);
+    this.thumbnailButton.setAttribute("aria-checked", isThumbs);
+    this.outlineButton.setAttribute("aria-checked", isOutline);
+    this.attachmentsButton.setAttribute("aria-checked", isAttachments);
+    this.layersButton.setAttribute("aria-checked", isLayers);
+    this.thumbnailView.classList.toggle("hidden", !isThumbs);
+    this.outlineView.classList.toggle("hidden", !isOutline);
+    this.attachmentsView.classList.toggle("hidden", !isAttachments);
+    this.layersView.classList.toggle("hidden", !isLayers);
+
+    this._outlineOptionsContainer.classList.toggle("hidden", !isOutline);
+
+    if (forceOpen && !this.isOpen) {
+      this.open();
+      return;
+    }
+
+    if (shouldForceRendering) {
+      this.#updateThumbnailViewer();
+      this.#forceRendering();
+    }
+
+    if (isViewChanged) {
+      this.#dispatchEvent();
+    }
+  }
+
+  open() {
+    if (this.isOpen) {
+      return;
+    }
+
+    this.isOpen = true;
+    this.toggleButton.classList.add("toggled");
+    this.toggleButton.setAttribute("aria-expanded", "true");
+    this.outerContainer.classList.add("sidebarMoving", "sidebarOpen");
+
+    if (this.active === _ui_utils.SidebarView.THUMBS) {
+      this.#updateThumbnailViewer();
+    }
+
+    this.#forceRendering();
+    this.#dispatchEvent();
+    this.#hideUINotification();
+  }
+
+  close() {
+    if (!this.isOpen) {
+      return;
+    }
+
+    this.isOpen = false;
+    this.toggleButton.classList.remove("toggled");
+    this.toggleButton.setAttribute("aria-expanded", "false");
+    this.outerContainer.classList.add("sidebarMoving");
+    this.outerContainer.classList.remove("sidebarOpen");
+    this.#forceRendering();
+    this.#dispatchEvent();
+  }
+
+  toggle() {
+    if (this.isOpen) {
+      this.close();
+    } else {
+      this.open();
+    }
+  }
+
+  #dispatchEvent() {
+    if (this.isInitialViewSet && !this.isInitialEventDispatched) {
+      this.isInitialEventDispatched = true;
+    }
+
+    this.eventBus.dispatch("sidebarviewchanged", {
+      source: this,
+      view: this.visibleView
+    });
+  }
+
+  #forceRendering() {
+    if (this.onToggled) {
+      this.onToggled();
+    } else {
+      this.pdfViewer.forceRendering();
+      this.pdfThumbnailViewer.forceRendering();
+    }
+  }
+
+  #updateThumbnailViewer() {
+    const {
+      pdfViewer,
+      pdfThumbnailViewer
+    } = this;
+    const pagesCount = pdfViewer.pagesCount;
+
+    for (let pageIndex = 0; pageIndex < pagesCount; pageIndex++) {
+      const pageView = pdfViewer.getPageView(pageIndex);
+
+      if (pageView?.renderingState === _ui_utils.RenderingStates.FINISHED) {
+        const thumbnailView = pdfThumbnailViewer.getThumbnail(pageIndex);
+        thumbnailView.setImage(pageView);
+      }
+    }
+
+    pdfThumbnailViewer.scrollThumbnailIntoView(pdfViewer.currentPageNumber);
+  }
+
+  #showUINotification() {
+    this.l10n.get("toggle_sidebar_notification2.title").then(msg => {
+      this.toggleButton.title = msg;
+    });
+
+    if (!this.isOpen) {
+      this.toggleButton.classList.add(UI_NOTIFICATION_CLASS);
+    }
+  }
+
+  #hideUINotification(reset = false) {
+    if (this.isOpen || reset) {
+      this.toggleButton.classList.remove(UI_NOTIFICATION_CLASS);
+    }
+
+    if (reset) {
+      this.l10n.get("toggle_sidebar.title").then(msg => {
+        this.toggleButton.title = msg;
+      });
+    }
+  }
+
+  #addEventListeners() {
+    this.sidebarContainer.addEventListener("transitionend", evt => {
+      if (evt.target === this.sidebarContainer) {
+        this.outerContainer.classList.remove("sidebarMoving");
+      }
+    });
+    this.toggleButton.addEventListener("click", () => {
+      this.toggle();
+    });
+    this.thumbnailButton.addEventListener("click", () => {
+      this.switchView(_ui_utils.SidebarView.THUMBS);
+    });
+    this.outlineButton.addEventListener("click", () => {
+      this.switchView(_ui_utils.SidebarView.OUTLINE);
+    });
+    this.outlineButton.addEventListener("dblclick", () => {
+      this.eventBus.dispatch("toggleoutlinetree", {
+        source: this
+      });
+    });
+    this.attachmentsButton.addEventListener("click", () => {
+      this.switchView(_ui_utils.SidebarView.ATTACHMENTS);
+    });
+    this.layersButton.addEventListener("click", () => {
+      this.switchView(_ui_utils.SidebarView.LAYERS);
+    });
+    this.layersButton.addEventListener("dblclick", () => {
+      this.eventBus.dispatch("resetlayers", {
+        source: this
+      });
+    });
+
+    this._currentOutlineItemButton.addEventListener("click", () => {
+      this.eventBus.dispatch("currentoutlineitem", {
+        source: this
+      });
+    });
+
+    const onTreeLoaded = (count, button, view) => {
+      button.disabled = !count;
+
+      if (count) {
+        this.#showUINotification();
+      } else if (this.active === view) {
+        this.switchView(_ui_utils.SidebarView.THUMBS);
+      }
+    };
+
+    this.eventBus._on("outlineloaded", evt => {
+      onTreeLoaded(evt.outlineCount, this.outlineButton, _ui_utils.SidebarView.OUTLINE);
+      evt.currentOutlineItemPromise.then(enabled => {
+        if (!this.isInitialViewSet) {
+          return;
+        }
+
+        this._currentOutlineItemButton.disabled = !enabled;
+      });
+    });
+
+    this.eventBus._on("attachmentsloaded", evt => {
+      onTreeLoaded(evt.attachmentsCount, this.attachmentsButton, _ui_utils.SidebarView.ATTACHMENTS);
+    });
+
+    this.eventBus._on("layersloaded", evt => {
+      onTreeLoaded(evt.layersCount, this.layersButton, _ui_utils.SidebarView.LAYERS);
+    });
+
+    this.eventBus._on("presentationmodechanged", evt => {
+      if (evt.state === _ui_utils.PresentationModeState.NORMAL && this.visibleView === _ui_utils.SidebarView.THUMBS) {
+        this.#updateThumbnailViewer();
+      }
+    });
+  }
+
+}
+
+exports.PDFSidebar = PDFSidebar;
+
+/***/ }),
+/* 25 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.PDFSidebarResizer = void 0;
 
-var _ui_utils = __webpack_require__(2);
+var _ui_utils = __webpack_require__(1);
 
 const SIDEBAR_WIDTH_VAR = "--sidebar-width";
 const SIDEBAR_MIN_WIDTH = 200;
 const SIDEBAR_RESIZING_CLASS = "sidebarResizing";
 
 class PDFSidebarResizer {
-  constructor(options, eventBus, l10n = _ui_utils.NullL10n) {
-    this.enabled = false;
+  constructor(options, eventBus, l10n) {
     this.isRTL = false;
     this.sidebarOpen = false;
-    this.doc = document.documentElement;
     this._width = null;
     this._outerContainerWidth = null;
     this._boundEvents = Object.create(null);
     this.outerContainer = options.outerContainer;
     this.resizer = options.resizer;
     this.eventBus = eventBus;
-    this.l10n = l10n;
-
-    if (typeof CSS === "undefined" || typeof CSS.supports !== "function" || !CSS.supports(SIDEBAR_WIDTH_VAR, `calc(-1 * ${SIDEBAR_MIN_WIDTH}px)`)) {
-      console.warn("PDFSidebarResizer: " + "The browser does not support resizing of the sidebar.");
-      return;
-    }
-
-    this.enabled = true;
-    this.resizer.classList.remove("hidden");
-    this.l10n.getDirection().then(dir => {
+    l10n.getDirection().then(dir => {
       this.isRTL = dir === "rtl";
     });
 
@@ -8453,26 +9165,28 @@ class PDFSidebarResizer {
   }
 
   get outerContainerWidth() {
-    if (!this._outerContainerWidth) {
-      this._outerContainerWidth = this.outerContainer.clientWidth;
-    }
-
-    return this._outerContainerWidth;
+    return this._outerContainerWidth ||= this.outerContainer.clientWidth;
   }
 
   _updateWidth(width = 0) {
-    if (!this.enabled) {
+    const maxWidth = Math.floor(this.outerContainerWidth / 2);
+
+    if (width > maxWidth) {
+      width = maxWidth;
+    }
+
+    if (width < SIDEBAR_MIN_WIDTH) {
+      width = SIDEBAR_MIN_WIDTH;
+    }
+
+    if (width === this._width) {
       return false;
     }
 
-    const newWidth = (0, _ui_utils.clamp)(width, SIDEBAR_MIN_WIDTH, Math.floor(this.outerContainerWidth / 2));
+    this._width = width;
 
-    if (newWidth === this._width) {
-      return false;
-    }
+    _ui_utils.docStyle.setProperty(SIDEBAR_WIDTH_VAR, `${width}px`);
 
-    this._width = newWidth;
-    this.doc.style.setProperty(SIDEBAR_WIDTH_VAR, `${newWidth}px`);
     return true;
   }
 
@@ -8497,10 +9211,6 @@ class PDFSidebarResizer {
   }
 
   _addEventListeners() {
-    if (!this.enabled) {
-      return;
-    }
-
     const _boundEvents = this._boundEvents;
     _boundEvents.mouseMove = this._mouseMove.bind(this);
     _boundEvents.mouseUp = this._mouseUp.bind(this);
@@ -8515,11 +9225,11 @@ class PDFSidebarResizer {
     });
 
     this.eventBus._on("sidebarviewchanged", evt => {
-      this.sidebarOpen = !!(evt && evt.view);
+      this.sidebarOpen = !!evt?.view;
     });
 
     this.eventBus._on("resize", evt => {
-      if (!evt || evt.source !== window) {
+      if (evt?.source !== window) {
         return;
       }
 
@@ -8556,20 +9266,19 @@ class PDFSidebarResizer {
 exports.PDFSidebarResizer = PDFSidebarResizer;
 
 /***/ }),
-/* 24 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 26 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFThumbnailViewer = void 0;
 
-var _ui_utils = __webpack_require__(2);
+var _ui_utils = __webpack_require__(1);
 
-var _pdf_thumbnail_view = __webpack_require__(25);
+var _pdf_thumbnail_view = __webpack_require__(27);
 
 const THUMBNAIL_SCROLL_MARGIN = -19;
 const THUMBNAIL_SELECTED_CLASS = "selected";
@@ -8580,19 +9289,26 @@ class PDFThumbnailViewer {
     eventBus,
     linkService,
     renderingQueue,
-    l10n = _ui_utils.NullL10n
+    l10n,
+    pageColors
   }) {
     this.container = container;
     this.linkService = linkService;
     this.renderingQueue = renderingQueue;
     this.l10n = l10n;
+    this.pageColors = pageColors || null;
+
+    if (this.pageColors && !(CSS.supports("color", this.pageColors.background) && CSS.supports("color", this.pageColors.foreground))) {
+      if (this.pageColors.background || this.pageColors.foreground) {
+        console.warn("PDFThumbnailViewer: Ignoring `pageColors`-option, since the browser doesn't support the values used.");
+      }
+
+      this.pageColors = null;
+    }
+
     this.scroll = (0, _ui_utils.watchScroll)(this.container, this._scrollUpdated.bind(this));
 
     this._resetView();
-
-    eventBus._on("optionalcontentconfigchanged", () => {
-      this._setImageDisabled = true;
-    });
   }
 
   _scrollUpdated() {
@@ -8604,7 +9320,10 @@ class PDFThumbnailViewer {
   }
 
   _getVisibleThumbs() {
-    return (0, _ui_utils.getVisibleElements)(this.container, this._thumbnails);
+    return (0, _ui_utils.getVisibleElements)({
+      scrollEl: this.container,
+      views: this._thumbnails
+    });
   }
 
   scrollThumbnailIntoView(pageNumber) {
@@ -8625,26 +9344,29 @@ class PDFThumbnailViewer {
       thumbnailView.div.classList.add(THUMBNAIL_SELECTED_CLASS);
     }
 
-    const visibleThumbs = this._getVisibleThumbs();
+    const {
+      first,
+      last,
+      views
+    } = this._getVisibleThumbs();
 
-    const numVisibleThumbs = visibleThumbs.views.length;
-
-    if (numVisibleThumbs > 0) {
-      const first = visibleThumbs.first.id;
-      const last = numVisibleThumbs > 1 ? visibleThumbs.last.id : first;
+    if (views.length > 0) {
       let shouldScroll = false;
 
-      if (pageNumber <= first || pageNumber >= last) {
+      if (pageNumber <= first.id || pageNumber >= last.id) {
         shouldScroll = true;
       } else {
-        visibleThumbs.views.some(function (view) {
-          if (view.id !== pageNumber) {
-            return false;
+        for (const {
+          id,
+          percent
+        } of views) {
+          if (id !== pageNumber) {
+            continue;
           }
 
-          shouldScroll = view.percent < 100;
-          return true;
-        });
+          shouldScroll = percent < 100;
+          break;
+        }
       }
 
       if (shouldScroll) {
@@ -8675,14 +9397,23 @@ class PDFThumbnailViewer {
     }
 
     this._pagesRotation = rotation;
+    const updateArgs = {
+      rotation
+    };
 
-    for (let i = 0, ii = this._thumbnails.length; i < ii; i++) {
-      this._thumbnails[i].update(rotation);
+    for (const thumbnail of this._thumbnails) {
+      thumbnail.update(updateArgs);
     }
   }
 
   cleanup() {
-    _pdf_thumbnail_view.PDFThumbnailView.cleanup();
+    for (const thumbnail of this._thumbnails) {
+      if (thumbnail.renderingState !== _ui_utils.RenderingStates.FINISHED) {
+        thumbnail.reset();
+      }
+    }
+
+    _pdf_thumbnail_view.TempImageFactory.destroyCanvas();
   }
 
   _resetView() {
@@ -8690,9 +9421,6 @@ class PDFThumbnailViewer {
     this._currentPageNumber = 1;
     this._pageLabels = null;
     this._pagesRotation = 0;
-    this._optionalContentConfigPromise = null;
-    this._pagesRequests = new WeakMap();
-    this._setImageDisabled = false;
     this.container.textContent = "";
   }
 
@@ -8712,16 +9440,11 @@ class PDFThumbnailViewer {
     const firstPagePromise = pdfDocument.getPage(1);
     const optionalContentConfigPromise = pdfDocument.getOptionalContentConfig();
     firstPagePromise.then(firstPdfPage => {
-      this._optionalContentConfigPromise = optionalContentConfigPromise;
       const pagesCount = pdfDocument.numPages;
       const viewport = firstPdfPage.getViewport({
         scale: 1
       });
 
-      const checkSetImageDisabled = () => {
-        return this._setImageDisabled;
-      };
-
       for (let pageNum = 1; pageNum <= pagesCount; ++pageNum) {
         const thumbnail = new _pdf_thumbnail_view.PDFThumbnailView({
           container: this.container,
@@ -8730,9 +9453,8 @@ class PDFThumbnailViewer {
           optionalContentConfigPromise,
           linkService: this.linkService,
           renderingQueue: this.renderingQueue,
-          checkSetImageDisabled,
-          disableCanvasToImageConversion: false,
-          l10n: this.l10n
+          l10n: this.l10n,
+          pageColors: this.pageColors
         });
 
         this._thumbnails.push(thumbnail);
@@ -8752,10 +9474,8 @@ class PDFThumbnailViewer {
   }
 
   _cancelRendering() {
-    for (let i = 0, ii = this._thumbnails.length; i < ii; i++) {
-      if (this._thumbnails[i]) {
-        this._thumbnails[i].cancelRendering();
-      }
+    for (const thumbnail of this._thumbnails) {
+      thumbnail.cancelRendering();
     }
   }
 
@@ -8774,50 +9494,49 @@ class PDFThumbnailViewer {
     }
 
     for (let i = 0, ii = this._thumbnails.length; i < ii; i++) {
-      const label = this._pageLabels && this._pageLabels[i];
-
-      this._thumbnails[i].setPageLabel(label);
+      this._thumbnails[i].setPageLabel(this._pageLabels?.[i] ?? null);
     }
   }
 
-  _ensurePdfPageLoaded(thumbView) {
+  async #ensurePdfPageLoaded(thumbView) {
     if (thumbView.pdfPage) {
-      return Promise.resolve(thumbView.pdfPage);
+      return thumbView.pdfPage;
     }
 
-    if (this._pagesRequests.has(thumbView)) {
-      return this._pagesRequests.get(thumbView);
-    }
+    try {
+      const pdfPage = await this.pdfDocument.getPage(thumbView.id);
 
-    const promise = this.pdfDocument.getPage(thumbView.id).then(pdfPage => {
       if (!thumbView.pdfPage) {
         thumbView.setPdfPage(pdfPage);
       }
 
-      this._pagesRequests.delete(thumbView);
-
       return pdfPage;
-    }).catch(reason => {
+    } catch (reason) {
       console.error("Unable to get page for thumb view", reason);
+      return null;
+    }
+  }
 
-      this._pagesRequests.delete(thumbView);
-    });
+  #getScrollAhead(visible) {
+    if (visible.first?.id === 1) {
+      return true;
+    } else if (visible.last?.id === this._thumbnails.length) {
+      return false;
+    }
 
-    this._pagesRequests.set(thumbView, promise);
-
-    return promise;
+    return this.scroll.down;
   }
 
   forceRendering() {
     const visibleThumbs = this._getVisibleThumbs();
 
-    const thumbView = this.renderingQueue.getHighestPriority(visibleThumbs, this._thumbnails, this.scroll.down);
+    const scrollAhead = this.#getScrollAhead(visibleThumbs);
+    const thumbView = this.renderingQueue.getHighestPriority(visibleThumbs, this._thumbnails, scrollAhead);
 
     if (thumbView) {
-      this._ensurePdfPageLoaded(thumbView).then(() => {
+      this.#ensurePdfPageLoaded(thumbView).then(() => {
         this.renderingQueue.renderView(thumbView);
       });
-
       return true;
     }
 
@@ -8829,64 +9548,56 @@ class PDFThumbnailViewer {
 exports.PDFThumbnailViewer = PDFThumbnailViewer;
 
 /***/ }),
-/* 25 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 27 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.PDFThumbnailView = void 0;
+}));
+exports.TempImageFactory = exports.PDFThumbnailView = void 0;
+
+var _ui_utils = __webpack_require__(1);
 
 var _pdfjsLib = __webpack_require__(5);
 
-var _ui_utils = __webpack_require__(2);
-
-var _pdf_rendering_queue = __webpack_require__(8);
-
+const DRAW_UPSCALE_FACTOR = 2;
 const MAX_NUM_SCALING_STEPS = 3;
 const THUMBNAIL_CANVAS_BORDER_WIDTH = 1;
 const THUMBNAIL_WIDTH = 98;
 
-const TempImageFactory = function TempImageFactoryClosure() {
-  let tempCanvasCache = null;
-  return {
-    getCanvas(width, height) {
-      let tempCanvas = tempCanvasCache;
+class TempImageFactory {
+  static #tempCanvas = null;
 
-      if (!tempCanvas) {
-        tempCanvas = document.createElement("canvas");
-        tempCanvasCache = tempCanvas;
-      }
+  static getCanvas(width, height) {
+    const tempCanvas = this.#tempCanvas ||= document.createElement("canvas");
+    tempCanvas.width = width;
+    tempCanvas.height = height;
+    const ctx = tempCanvas.getContext("2d", {
+      alpha: false
+    });
+    ctx.save();
+    ctx.fillStyle = "rgb(255, 255, 255)";
+    ctx.fillRect(0, 0, width, height);
+    ctx.restore();
+    return [tempCanvas, tempCanvas.getContext("2d")];
+  }
 
-      tempCanvas.width = width;
-      tempCanvas.height = height;
-      tempCanvas.mozOpaque = true;
-      const ctx = tempCanvas.getContext("2d", {
-        alpha: false
-      });
-      ctx.save();
-      ctx.fillStyle = "rgb(255, 255, 255)";
-      ctx.fillRect(0, 0, width, height);
-      ctx.restore();
-      return tempCanvas;
-    },
+  static destroyCanvas() {
+    const tempCanvas = this.#tempCanvas;
 
-    destroyCanvas() {
-      const tempCanvas = tempCanvasCache;
-
-      if (tempCanvas) {
-        tempCanvas.width = 0;
-        tempCanvas.height = 0;
-      }
-
-      tempCanvasCache = null;
+    if (tempCanvas) {
+      tempCanvas.width = 0;
+      tempCanvas.height = 0;
     }
 
-  };
-}();
+    this.#tempCanvas = null;
+  }
+
+}
+
+exports.TempImageFactory = TempImageFactory;
 
 class PDFThumbnailView {
   constructor({
@@ -8896,9 +9607,8 @@ class PDFThumbnailView {
     optionalContentConfigPromise,
     linkService,
     renderingQueue,
-    checkSetImageDisabled,
-    disableCanvasToImageConversion = false,
-    l10n = _ui_utils.NullL10n
+    l10n,
+    pageColors
   }) {
     this.id = id;
     this.renderingId = "thumbnail" + id;
@@ -8908,23 +9618,18 @@ class PDFThumbnailView {
     this.viewport = defaultViewport;
     this.pdfPageRotate = defaultViewport.rotation;
     this._optionalContentConfigPromise = optionalContentConfigPromise || null;
+    this.pageColors = pageColors || null;
     this.linkService = linkService;
     this.renderingQueue = renderingQueue;
     this.renderTask = null;
-    this.renderingState = _pdf_rendering_queue.RenderingStates.INITIAL;
+    this.renderingState = _ui_utils.RenderingStates.INITIAL;
     this.resume = null;
-
-    this._checkSetImageDisabled = checkSetImageDisabled || function () {
-      return false;
-    };
-
-    this.disableCanvasToImageConversion = disableCanvasToImageConversion;
-    this.pageWidth = this.viewport.width;
-    this.pageHeight = this.viewport.height;
-    this.pageRatio = this.pageWidth / this.pageHeight;
+    const pageWidth = this.viewport.width,
+          pageHeight = this.viewport.height,
+          pageRatio = pageWidth / pageHeight;
     this.canvasWidth = THUMBNAIL_WIDTH;
-    this.canvasHeight = this.canvasWidth / this.pageRatio | 0;
-    this.scale = this.canvasWidth / this.pageWidth;
+    this.canvasHeight = this.canvasWidth / pageRatio | 0;
+    this.scale = this.canvasWidth / pageWidth;
     this.l10n = l10n;
     const anchor = document.createElement("a");
     anchor.href = linkService.getAnchorUrl("#page=" + id);
@@ -8934,7 +9639,7 @@ class PDFThumbnailView {
     });
 
     anchor.onclick = function () {
-      linkService.page = id;
+      linkService.goToPage(id);
       return false;
     };
 
@@ -8949,9 +9654,9 @@ class PDFThumbnailView {
     ring.style.width = this.canvasWidth + borderAdjustment + "px";
     ring.style.height = this.canvasHeight + borderAdjustment + "px";
     this.ring = ring;
-    div.appendChild(ring);
-    anchor.appendChild(div);
-    container.appendChild(anchor);
+    div.append(ring);
+    anchor.append(div);
+    container.append(anchor);
   }
 
   setPdfPage(pdfPage) {
@@ -8967,20 +9672,15 @@ class PDFThumbnailView {
 
   reset() {
     this.cancelRendering();
-    this.renderingState = _pdf_rendering_queue.RenderingStates.INITIAL;
-    this.pageWidth = this.viewport.width;
-    this.pageHeight = this.viewport.height;
-    this.pageRatio = this.pageWidth / this.pageHeight;
-    this.canvasHeight = this.canvasWidth / this.pageRatio | 0;
-    this.scale = this.canvasWidth / this.pageWidth;
+    this.renderingState = _ui_utils.RenderingStates.INITIAL;
+    const pageWidth = this.viewport.width,
+          pageHeight = this.viewport.height,
+          pageRatio = pageWidth / pageHeight;
+    this.canvasHeight = this.canvasWidth / pageRatio | 0;
+    this.scale = this.canvasWidth / pageWidth;
     this.div.removeAttribute("data-loaded");
     const ring = this.ring;
-    const childNodes = ring.childNodes;
-
-    for (let i = childNodes.length - 1; i >= 0; i--) {
-      ring.removeChild(childNodes[i]);
-    }
-
+    ring.textContent = "";
     const borderAdjustment = 2 * THUMBNAIL_CANVAS_BORDER_WIDTH;
     ring.style.width = this.canvasWidth + borderAdjustment + "px";
     ring.style.height = this.canvasHeight + borderAdjustment + "px";
@@ -8997,8 +9697,10 @@ class PDFThumbnailView {
     }
   }
 
-  update(rotation) {
-    if (typeof rotation !== "undefined") {
+  update({
+    rotation = null
+  }) {
+    if (typeof rotation === "number") {
       this.rotation = rotation;
     }
 
@@ -9019,51 +9721,31 @@ class PDFThumbnailView {
     this.resume = null;
   }
 
-  _getPageDrawContext(noCtxScale = false) {
+  _getPageDrawContext(upscaleFactor = 1) {
     const canvas = document.createElement("canvas");
-    this.canvas = canvas;
-    canvas.mozOpaque = true;
     const ctx = canvas.getContext("2d", {
       alpha: false
     });
-    const outputScale = (0, _ui_utils.getOutputScale)(ctx);
-    canvas.width = this.canvasWidth * outputScale.sx | 0;
-    canvas.height = this.canvasHeight * outputScale.sy | 0;
-    canvas.style.width = this.canvasWidth + "px";
-    canvas.style.height = this.canvasHeight + "px";
-
-    if (!noCtxScale && outputScale.scaled) {
-      ctx.scale(outputScale.sx, outputScale.sy);
-    }
-
-    return ctx;
+    const outputScale = new _ui_utils.OutputScale();
+    canvas.width = upscaleFactor * this.canvasWidth * outputScale.sx | 0;
+    canvas.height = upscaleFactor * this.canvasHeight * outputScale.sy | 0;
+    const transform = outputScale.scaled ? [outputScale.sx, 0, 0, outputScale.sy, 0, 0] : null;
+    return {
+      ctx,
+      canvas,
+      transform
+    };
   }
 
-  _convertCanvasToImage() {
-    if (!this.canvas) {
-      return;
+  _convertCanvasToImage(canvas) {
+    if (this.renderingState !== _ui_utils.RenderingStates.FINISHED) {
+      throw new Error("_convertCanvasToImage: Rendering has not finished.");
     }
 
-    if (this.renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED) {
-      return;
-    }
-
-    const className = "thumbnailImage";
-
-    if (this.disableCanvasToImageConversion) {
-      this.canvas.className = className;
-
-      this._thumbPageCanvas.then(msg => {
-        this.canvas.setAttribute("aria-label", msg);
-      });
-
-      this.div.setAttribute("data-loaded", true);
-      this.ring.appendChild(this.canvas);
-      return;
-    }
+    const reducedCanvas = this._reduceImage(canvas);
 
     const image = document.createElement("img");
-    image.className = className;
+    image.className = "thumbnailImage";
 
     this._thumbPageCanvas.then(msg => {
       image.setAttribute("aria-label", msg);
@@ -9071,19 +9753,18 @@ class PDFThumbnailView {
 
     image.style.width = this.canvasWidth + "px";
     image.style.height = this.canvasHeight + "px";
-    image.src = this.canvas.toDataURL();
+    image.src = reducedCanvas.toDataURL();
     this.image = image;
     this.div.setAttribute("data-loaded", true);
-    this.ring.appendChild(image);
-    this.canvas.width = 0;
-    this.canvas.height = 0;
-    delete this.canvas;
+    this.ring.append(image);
+    reducedCanvas.width = 0;
+    reducedCanvas.height = 0;
   }
 
   draw() {
-    if (this.renderingState !== _pdf_rendering_queue.RenderingStates.INITIAL) {
+    if (this.renderingState !== _ui_utils.RenderingStates.INITIAL) {
       console.error("Must be in new state before drawing");
-      return Promise.resolve(undefined);
+      return Promise.resolve();
     }
 
     const {
@@ -9091,46 +9772,46 @@ class PDFThumbnailView {
     } = this;
 
     if (!pdfPage) {
-      this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+      this.renderingState = _ui_utils.RenderingStates.FINISHED;
       return Promise.reject(new Error("pdfPage is not loaded"));
     }
 
-    this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
-    const renderCapability = (0, _pdfjsLib.createPromiseCapability)();
+    this.renderingState = _ui_utils.RenderingStates.RUNNING;
 
-    const finishRenderTask = error => {
+    const finishRenderTask = async (error = null) => {
       if (renderTask === this.renderTask) {
         this.renderTask = null;
       }
 
       if (error instanceof _pdfjsLib.RenderingCancelledException) {
-        renderCapability.resolve(undefined);
         return;
       }
 
-      this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+      this.renderingState = _ui_utils.RenderingStates.FINISHED;
 
-      this._convertCanvasToImage();
+      this._convertCanvasToImage(canvas);
 
-      if (!error) {
-        renderCapability.resolve(undefined);
-      } else {
-        renderCapability.reject(error);
+      if (error) {
+        throw error;
       }
     };
 
-    const ctx = this._getPageDrawContext();
+    const {
+      ctx,
+      canvas,
+      transform
+    } = this._getPageDrawContext(DRAW_UPSCALE_FACTOR);
 
     const drawViewport = this.viewport.clone({
-      scale: this.scale
+      scale: DRAW_UPSCALE_FACTOR * this.scale
     });
 
     const renderContinueCallback = cont => {
       if (!this.renderingQueue.isHighestPriority(this)) {
-        this.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
+        this.renderingState = _ui_utils.RenderingStates.PAUSED;
 
         this.resume = () => {
-          this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
+          this.renderingState = _ui_utils.RenderingStates.RUNNING;
           cont();
         };
 
@@ -9142,56 +9823,72 @@ class PDFThumbnailView {
 
     const renderContext = {
       canvasContext: ctx,
+      transform,
       viewport: drawViewport,
-      optionalContentConfigPromise: this._optionalContentConfigPromise
+      optionalContentConfigPromise: this._optionalContentConfigPromise,
+      pageColors: this.pageColors
     };
     const renderTask = this.renderTask = pdfPage.render(renderContext);
     renderTask.onContinue = renderContinueCallback;
-    renderTask.promise.then(function () {
-      finishRenderTask(null);
+    const resultPromise = renderTask.promise.then(function () {
+      return finishRenderTask(null);
     }, function (error) {
-      finishRenderTask(error);
+      return finishRenderTask(error);
     });
-    return renderCapability.promise;
+    resultPromise.finally(() => {
+      canvas.width = 0;
+      canvas.height = 0;
+      const pageCached = this.linkService.isPageCached(this.id);
+
+      if (!pageCached) {
+        this.pdfPage?.cleanup();
+      }
+    });
+    return resultPromise;
   }
 
   setImage(pageView) {
-    if (this._checkSetImageDisabled()) {
+    if (this.renderingState !== _ui_utils.RenderingStates.INITIAL) {
       return;
     }
 
-    if (this.renderingState !== _pdf_rendering_queue.RenderingStates.INITIAL) {
-      return;
-    }
+    const {
+      thumbnailCanvas: canvas,
+      pdfPage,
+      scale
+    } = pageView;
 
-    const img = pageView.canvas;
-
-    if (!img) {
+    if (!canvas) {
       return;
     }
 
     if (!this.pdfPage) {
-      this.setPdfPage(pageView.pdfPage);
+      this.setPdfPage(pdfPage);
     }
 
-    this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+    if (scale < this.scale) {
+      return;
+    }
 
-    const ctx = this._getPageDrawContext(true);
+    this.renderingState = _ui_utils.RenderingStates.FINISHED;
 
-    const canvas = ctx.canvas;
+    this._convertCanvasToImage(canvas);
+  }
+
+  _reduceImage(img) {
+    const {
+      ctx,
+      canvas
+    } = this._getPageDrawContext();
 
     if (img.width <= 2 * canvas.width) {
       ctx.drawImage(img, 0, 0, img.width, img.height, 0, 0, canvas.width, canvas.height);
-
-      this._convertCanvasToImage();
-
-      return;
+      return canvas;
     }
 
     let reducedWidth = canvas.width << MAX_NUM_SCALING_STEPS;
     let reducedHeight = canvas.height << MAX_NUM_SCALING_STEPS;
-    const reducedImage = TempImageFactory.getCanvas(reducedWidth, reducedHeight);
-    const reducedImageCtx = reducedImage.getContext("2d");
+    const [reducedImage, reducedImageCtx] = TempImageFactory.getCanvas(reducedWidth, reducedHeight);
 
     while (reducedWidth > img.width || reducedHeight > img.height) {
       reducedWidth >>= 1;
@@ -9207,24 +9904,19 @@ class PDFThumbnailView {
     }
 
     ctx.drawImage(reducedImage, 0, 0, reducedWidth, reducedHeight, 0, 0, canvas.width, canvas.height);
-
-    this._convertCanvasToImage();
+    return canvas;
   }
 
   get _thumbPageTitle() {
-    var _this$pageLabel;
-
     return this.l10n.get("thumb_page_title", {
-      page: (_this$pageLabel = this.pageLabel) != null ? _this$pageLabel : this.id
-    }, "Page {{page}}");
+      page: this.pageLabel ?? this.id
+    });
   }
 
   get _thumbPageCanvas() {
-    var _this$pageLabel2;
-
     return this.l10n.get("thumb_page_canvas", {
-      page: (_this$pageLabel2 = this.pageLabel) != null ? _this$pageLabel2 : this.id
-    }, "Thumbnail of Page {{page}}");
+      page: this.pageLabel ?? this.id
+    });
   }
 
   setPageLabel(label) {
@@ -9234,220 +9926,229 @@ class PDFThumbnailView {
       this.anchor.title = msg;
     });
 
-    if (this.renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED) {
+    if (this.renderingState !== _ui_utils.RenderingStates.FINISHED) {
       return;
     }
 
     this._thumbPageCanvas.then(msg => {
-      if (this.image) {
-        this.image.setAttribute("aria-label", msg);
-      } else if (this.disableCanvasToImageConversion && this.canvas) {
-        this.canvas.setAttribute("aria-label", msg);
-      }
+      this.image?.setAttribute("aria-label", msg);
     });
   }
 
-  static cleanup() {
-    TempImageFactory.destroyCanvas();
-  }
-
 }
 
 exports.PDFThumbnailView = PDFThumbnailView;
 
 /***/ }),
-/* 26 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 28 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.PDFViewer = void 0;
+}));
+exports.PDFViewer = exports.PDFSinglePageViewer = void 0;
 
-var _base_viewer = __webpack_require__(27);
+var _ui_utils = __webpack_require__(1);
 
-var _pdfjsLib = __webpack_require__(5);
+var _base_viewer = __webpack_require__(29);
 
-class PDFViewer extends _base_viewer.BaseViewer {
-  get _viewerElement() {
-    return (0, _pdfjsLib.shadow)(this, "_viewerElement", this.viewer);
-  }
-
-  _scrollIntoView({
-    pageDiv,
-    pageSpot = null,
-    pageNumber = null
-  }) {
-    if (!pageSpot && !this.isInPresentationMode) {
-      const left = pageDiv.offsetLeft + pageDiv.clientLeft;
-      const right = left + pageDiv.clientWidth;
-      const {
-        scrollLeft,
-        clientWidth
-      } = this.container;
-
-      if (this._isScrollModeHorizontal || left < scrollLeft || right > scrollLeft + clientWidth) {
-        pageSpot = {
-          left: 0,
-          top: 0
-        };
-      }
-    }
-
-    super._scrollIntoView({
-      pageDiv,
-      pageSpot,
-      pageNumber
-    });
-  }
-
-  _getVisiblePages() {
-    if (this.isInPresentationMode) {
-      return this._getCurrentVisiblePage();
-    }
-
-    return super._getVisiblePages();
-  }
-
-  _updateHelper(visiblePages) {
-    if (this.isInPresentationMode) {
-      return;
-    }
-
-    let currentId = this._currentPageNumber;
-    let stillFullyVisible = false;
-
-    for (const page of visiblePages) {
-      if (page.percent < 100) {
-        break;
-      }
-
-      if (page.id === currentId) {
-        stillFullyVisible = true;
-        break;
-      }
-    }
-
-    if (!stillFullyVisible) {
-      currentId = visiblePages[0].id;
-    }
-
-    this._setCurrentPageNumber(currentId);
-  }
-
-}
+class PDFViewer extends _base_viewer.BaseViewer {}
 
 exports.PDFViewer = PDFViewer;
 
+class PDFSinglePageViewer extends _base_viewer.BaseViewer {
+  _resetView() {
+    super._resetView();
+
+    this._scrollMode = _ui_utils.ScrollMode.PAGE;
+    this._spreadMode = _ui_utils.SpreadMode.NONE;
+  }
+
+  set scrollMode(mode) {}
+
+  _updateScrollMode() {}
+
+  set spreadMode(mode) {}
+
+  _updateSpreadMode() {}
+
+}
+
+exports.PDFSinglePageViewer = PDFSinglePageViewer;
+
 /***/ }),
-/* 27 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 29 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.BaseViewer = void 0;
-
-var _ui_utils = __webpack_require__(2);
-
-var _pdf_rendering_queue = __webpack_require__(8);
-
-var _annotation_layer_builder = __webpack_require__(28);
+}));
+exports.PagesCountLimit = exports.PDFPageViewBuffer = exports.BaseViewer = void 0;
 
 var _pdfjsLib = __webpack_require__(5);
 
-var _pdf_page_view = __webpack_require__(29);
+var _ui_utils = __webpack_require__(1);
 
-var _pdf_link_service = __webpack_require__(20);
+var _annotation_editor_layer_builder = __webpack_require__(30);
 
-var _text_layer_builder = __webpack_require__(30);
+var _annotation_layer_builder = __webpack_require__(32);
+
+var _l10n_utils = __webpack_require__(31);
+
+var _pdf_page_view = __webpack_require__(33);
+
+var _pdf_rendering_queue = __webpack_require__(22);
+
+var _pdf_link_service = __webpack_require__(3);
+
+var _struct_tree_layer_builder = __webpack_require__(35);
+
+var _text_highlighter = __webpack_require__(36);
+
+var _text_layer_builder = __webpack_require__(37);
+
+var _xfa_layer_builder = __webpack_require__(38);
 
 const DEFAULT_CACHE_SIZE = 10;
+const ENABLE_PERMISSIONS_CLASS = "enablePermissions";
+const PagesCountLimit = {
+  FORCE_SCROLL_MODE_PAGE: 15000,
+  FORCE_LAZY_PAGE_INIT: 7500,
+  PAUSE_EAGER_PAGE_INIT: 250
+};
+exports.PagesCountLimit = PagesCountLimit;
 
-function PDFPageViewBuffer(size) {
-  const data = [];
+function isValidAnnotationEditorMode(mode) {
+  return Object.values(_pdfjsLib.AnnotationEditorType).includes(mode) && mode !== _pdfjsLib.AnnotationEditorType.DISABLE;
+}
 
-  this.push = function (view) {
-    const i = data.indexOf(view);
+class PDFPageViewBuffer {
+  #buf = new Set();
+  #size = 0;
 
-    if (i >= 0) {
-      data.splice(i, 1);
+  constructor(size) {
+    this.#size = size;
+  }
+
+  push(view) {
+    const buf = this.#buf;
+
+    if (buf.has(view)) {
+      buf.delete(view);
     }
 
-    data.push(view);
+    buf.add(view);
 
-    if (data.length > size) {
-      data.shift().destroy();
+    if (buf.size > this.#size) {
+      this.#destroyFirstView();
     }
-  };
+  }
 
-  this.resize = function (newSize, pagesToKeep) {
-    size = newSize;
+  resize(newSize, idsToKeep = null) {
+    this.#size = newSize;
+    const buf = this.#buf;
 
-    if (pagesToKeep) {
-      const pageIdsToKeep = new Set();
+    if (idsToKeep) {
+      const ii = buf.size;
+      let i = 1;
 
-      for (let i = 0, iMax = pagesToKeep.length; i < iMax; ++i) {
-        pageIdsToKeep.add(pagesToKeep[i].id);
+      for (const view of buf) {
+        if (idsToKeep.has(view.id)) {
+          buf.delete(view);
+          buf.add(view);
+        }
+
+        if (++i > ii) {
+          break;
+        }
       }
-
-      (0, _ui_utils.moveToEndOfArray)(data, function (page) {
-        return pageIdsToKeep.has(page.id);
-      });
     }
 
-    while (data.length > size) {
-      data.shift().destroy();
+    while (buf.size > this.#size) {
+      this.#destroyFirstView();
     }
-  };
-}
-
-function isSameScale(oldScale, newScale) {
-  if (newScale === oldScale) {
-    return true;
   }
 
-  if (Math.abs(newScale - oldScale) < 1e-15) {
-    return true;
+  has(view) {
+    return this.#buf.has(view);
+  }
+
+  [Symbol.iterator]() {
+    return this.#buf.keys();
+  }
+
+  #destroyFirstView() {
+    const firstView = this.#buf.keys().next().value;
+    firstView?.destroy();
+    this.#buf.delete(firstView);
   }
 
-  return false;
 }
 
+exports.PDFPageViewBuffer = PDFPageViewBuffer;
+
 class BaseViewer {
+  #buffer = null;
+  #annotationEditorMode = _pdfjsLib.AnnotationEditorType.DISABLE;
+  #annotationEditorUIManager = null;
+  #annotationMode = _pdfjsLib.AnnotationMode.ENABLE_FORMS;
+  #enablePermissions = false;
+  #previousContainerHeight = 0;
+  #scrollModePageState = null;
+  #onVisibilityChange = null;
+
   constructor(options) {
     if (this.constructor === BaseViewer) {
       throw new Error("Cannot initialize BaseViewer.");
     }
 
-    this._name = this.constructor.name;
+    const viewerVersion = '2.16.105';
+
+    if (_pdfjsLib.version !== viewerVersion) {
+      throw new Error(`The API version "${_pdfjsLib.version}" does not match the Viewer version "${viewerVersion}".`);
+    }
+
     this.container = options.container;
     this.viewer = options.viewer || options.container.firstElementChild;
 
-    if (!(this.container instanceof HTMLDivElement && this.viewer instanceof HTMLDivElement)) {
+    if (!(this.container?.tagName.toUpperCase() === "DIV" && this.viewer?.tagName.toUpperCase() === "DIV")) {
       throw new Error("Invalid `container` and/or `viewer` option.");
     }
 
+    if (this.container.offsetParent && getComputedStyle(this.container).position !== "absolute") {
+      throw new Error("The `container` must be absolutely positioned.");
+    }
+
     this.eventBus = options.eventBus;
     this.linkService = options.linkService || new _pdf_link_service.SimpleLinkService();
     this.downloadManager = options.downloadManager || null;
     this.findController = options.findController || null;
+    this._scriptingManager = options.scriptingManager || null;
     this.removePageBorders = options.removePageBorders || false;
-    this.textLayerMode = Number.isInteger(options.textLayerMode) ? options.textLayerMode : _ui_utils.TextLayerMode.ENABLE;
+    this.textLayerMode = options.textLayerMode ?? _ui_utils.TextLayerMode.ENABLE;
+    this.#annotationMode = options.annotationMode ?? _pdfjsLib.AnnotationMode.ENABLE_FORMS;
+    this.#annotationEditorMode = options.annotationEditorMode ?? _pdfjsLib.AnnotationEditorType.DISABLE;
     this.imageResourcesPath = options.imageResourcesPath || "";
-    this.renderInteractiveForms = typeof options.renderInteractiveForms === "boolean" ? options.renderInteractiveForms : true;
     this.enablePrintAutoRotate = options.enablePrintAutoRotate || false;
     this.renderer = options.renderer || _ui_utils.RendererType.CANVAS;
-    this.enableWebGL = options.enableWebGL || false;
     this.useOnlyCssZoom = options.useOnlyCssZoom || false;
     this.maxCanvasPixels = options.maxCanvasPixels;
-    this.l10n = options.l10n || _ui_utils.NullL10n;
+    this.l10n = options.l10n || _l10n_utils.NullL10n;
+    this.#enablePermissions = options.enablePermissions || false;
+    this.pageColors = options.pageColors || null;
+
+    if (this.pageColors && !(CSS.supports("color", this.pageColors.background) && CSS.supports("color", this.pageColors.foreground))) {
+      if (this.pageColors.background || this.pageColors.foreground) {
+        console.warn("BaseViewer: Ignoring `pageColors`-option, since the browser doesn't support the values used.");
+      }
+
+      this.pageColors = null;
+    }
+
     this.defaultRenderingQueue = !options.renderingQueue;
 
     if (this.defaultRenderingQueue) {
@@ -9467,11 +10168,7 @@ class BaseViewer {
       this.viewer.classList.add("removePageBorders");
     }
 
-    Promise.resolve().then(() => {
-      this.eventBus.dispatch("baseviewerinit", {
-        source: this
-      });
-    });
+    this.updateContainerHeightCss();
   }
 
   get pagesCount() {
@@ -9488,10 +10185,18 @@ class BaseViewer {
     }
 
     return this._pages.every(function (pageView) {
-      return pageView && pageView.pdfPage;
+      return pageView?.pdfPage;
     });
   }
 
+  get renderForms() {
+    return this.#annotationMode === _pdfjsLib.AnnotationMode.ENABLE_FORMS;
+  }
+
+  get enableScripting() {
+    return !!this._scriptingManager;
+  }
+
   get currentPageNumber() {
     return this._currentPageNumber;
   }
@@ -9506,14 +10211,14 @@ class BaseViewer {
     }
 
     if (!this._setCurrentPageNumber(val, true)) {
-      console.error(`${this._name}.currentPageNumber: "${val}" is not a valid page.`);
+      console.error(`currentPageNumber: "${val}" is not a valid page.`);
     }
   }
 
   _setCurrentPageNumber(val, resetCurrentPageView = false) {
     if (this._currentPageNumber === val) {
       if (resetCurrentPageView) {
-        this._resetCurrentPageView();
+        this.#resetCurrentPageView();
       }
 
       return true;
@@ -9523,22 +10228,24 @@ class BaseViewer {
       return false;
     }
 
+    const previous = this._currentPageNumber;
     this._currentPageNumber = val;
     this.eventBus.dispatch("pagechanging", {
       source: this,
       pageNumber: val,
-      pageLabel: this._pageLabels && this._pageLabels[val - 1]
+      pageLabel: this._pageLabels?.[val - 1] ?? null,
+      previous
     });
 
     if (resetCurrentPageView) {
-      this._resetCurrentPageView();
+      this.#resetCurrentPageView();
     }
 
     return true;
   }
 
   get currentPageLabel() {
-    return this._pageLabels && this._pageLabels[this._currentPageNumber - 1];
+    return this._pageLabels?.[this._currentPageNumber - 1] ?? null;
   }
 
   set currentPageLabel(val) {
@@ -9557,7 +10264,7 @@ class BaseViewer {
     }
 
     if (!this._setCurrentPageNumber(page, true)) {
-      console.error(`${this._name}.currentPageLabel: "${val}" is not a valid page.`);
+      console.error(`currentPageLabel: "${val}" is not a valid page.`);
     }
   }
 
@@ -9602,16 +10309,24 @@ class BaseViewer {
       return;
     }
 
+    rotation %= 360;
+
+    if (rotation < 0) {
+      rotation += 360;
+    }
+
     if (this._pagesRotation === rotation) {
       return;
     }
 
     this._pagesRotation = rotation;
     const pageNumber = this._currentPageNumber;
+    const updateArgs = {
+      rotation
+    };
 
-    for (let i = 0, ii = this._pages.length; i < ii; i++) {
-      const pageView = this._pages[i];
-      pageView.update(pageView.scale, rotation);
+    for (const pageView of this._pages) {
+      pageView.update(updateArgs);
     }
 
     if (this._currentScaleValue) {
@@ -9641,20 +10356,59 @@ class BaseViewer {
     return this.pdfDocument ? this._pagesCapability.promise : null;
   }
 
-  get _viewerElement() {
-    throw new Error("Not implemented: _viewerElement");
+  #initializePermissions(permissions) {
+    const params = {
+      annotationEditorMode: this.#annotationEditorMode,
+      annotationMode: this.#annotationMode,
+      textLayerMode: this.textLayerMode
+    };
+
+    if (!permissions) {
+      return params;
+    }
+
+    if (!permissions.includes(_pdfjsLib.PermissionFlag.COPY)) {
+      this.viewer.classList.add(ENABLE_PERMISSIONS_CLASS);
+    }
+
+    if (!permissions.includes(_pdfjsLib.PermissionFlag.MODIFY_CONTENTS)) {
+      params.annotationEditorMode = _pdfjsLib.AnnotationEditorType.DISABLE;
+    }
+
+    if (!permissions.includes(_pdfjsLib.PermissionFlag.MODIFY_ANNOTATIONS) && !permissions.includes(_pdfjsLib.PermissionFlag.FILL_INTERACTIVE_FORMS) && this.#annotationMode === _pdfjsLib.AnnotationMode.ENABLE_FORMS) {
+      params.annotationMode = _pdfjsLib.AnnotationMode.ENABLE;
+    }
+
+    return params;
   }
 
-  _onePageRenderedOrForceFetch() {
-    if (!this.container.offsetParent || this._getVisiblePages().views.length === 0) {
+  #onePageRenderedOrForceFetch() {
+    if (document.visibilityState === "hidden" || !this.container.offsetParent || this._getVisiblePages().views.length === 0) {
       return Promise.resolve();
     }
 
-    return this._onePageRenderedCapability.promise;
+    const visibilityChangePromise = new Promise(resolve => {
+      this.#onVisibilityChange = () => {
+        if (document.visibilityState !== "hidden") {
+          return;
+        }
+
+        resolve();
+        document.removeEventListener("visibilitychange", this.#onVisibilityChange);
+        this.#onVisibilityChange = null;
+      };
+
+      document.addEventListener("visibilitychange", this.#onVisibilityChange);
+    });
+    return Promise.race([this._onePageRenderedCapability.promise, visibilityChangePromise]);
   }
 
   setDocument(pdfDocument) {
     if (this.pdfDocument) {
+      this.eventBus.dispatch("pagesdestroy", {
+        source: this
+      });
+
       this._cancelRendering();
 
       this._resetView();
@@ -9662,6 +10416,15 @@ class BaseViewer {
       if (this.findController) {
         this.findController.setDocument(null);
       }
+
+      if (this._scriptingManager) {
+        this._scriptingManager.setDocument(null);
+      }
+
+      if (this.#annotationEditorUIManager) {
+        this.#annotationEditorUIManager.destroy();
+        this.#annotationEditorUIManager = null;
+      }
     }
 
     this.pdfDocument = pdfDocument;
@@ -9670,17 +10433,27 @@ class BaseViewer {
       return;
     }
 
+    const isPureXfa = pdfDocument.isPureXfa;
     const pagesCount = pdfDocument.numPages;
     const firstPagePromise = pdfDocument.getPage(1);
-    const annotationStorage = pdfDocument.annotationStorage;
     const optionalContentConfigPromise = pdfDocument.getOptionalContentConfig();
+    const permissionsPromise = this.#enablePermissions ? pdfDocument.getPermissions() : Promise.resolve();
+
+    if (pagesCount > PagesCountLimit.FORCE_SCROLL_MODE_PAGE) {
+      console.warn("Forcing PAGE-scrolling for performance reasons, given the length of the document.");
+      const mode = this._scrollMode = _ui_utils.ScrollMode.PAGE;
+      this.eventBus.dispatch("scrollmodechanged", {
+        source: this,
+        mode
+      });
+    }
 
     this._pagesCapability.promise.then(() => {
       this.eventBus.dispatch("pagesloaded", {
         source: this,
         pagesCount
       });
-    });
+    }, () => {});
 
     this._onBeforeDraw = evt => {
       const pageView = this._pages[evt.pageNumber - 1];
@@ -9689,7 +10462,7 @@ class BaseViewer {
         return;
       }
 
-      this._buffer.push(pageView);
+      this.#buffer.push(pageView);
     };
 
     this.eventBus._on("pagerender", this._onBeforeDraw);
@@ -9699,44 +10472,84 @@ class BaseViewer {
         return;
       }
 
-      this._onePageRenderedCapability.resolve();
+      this._onePageRenderedCapability.resolve({
+        timestamp: evt.timestamp
+      });
 
       this.eventBus._off("pagerendered", this._onAfterDraw);
 
       this._onAfterDraw = null;
+
+      if (this.#onVisibilityChange) {
+        document.removeEventListener("visibilitychange", this.#onVisibilityChange);
+        this.#onVisibilityChange = null;
+      }
     };
 
     this.eventBus._on("pagerendered", this._onAfterDraw);
 
-    firstPagePromise.then(firstPdfPage => {
+    Promise.all([firstPagePromise, permissionsPromise]).then(([firstPdfPage, permissions]) => {
+      if (pdfDocument !== this.pdfDocument) {
+        return;
+      }
+
       this._firstPageCapability.resolve(firstPdfPage);
 
       this._optionalContentConfigPromise = optionalContentConfigPromise;
+      const {
+        annotationEditorMode,
+        annotationMode,
+        textLayerMode
+      } = this.#initializePermissions(permissions);
+
+      if (annotationEditorMode !== _pdfjsLib.AnnotationEditorType.DISABLE) {
+        const mode = annotationEditorMode;
+
+        if (isPureXfa) {
+          console.warn("Warning: XFA-editing is not implemented.");
+        } else if (isValidAnnotationEditorMode(mode)) {
+          this.#annotationEditorUIManager = new _pdfjsLib.AnnotationEditorUIManager(this.container, this.eventBus);
+
+          if (mode !== _pdfjsLib.AnnotationEditorType.NONE) {
+            this.#annotationEditorUIManager.updateMode(mode);
+          }
+        } else {
+          console.error(`Invalid AnnotationEditor mode: ${mode}`);
+        }
+      }
+
+      const viewerElement = this._scrollMode === _ui_utils.ScrollMode.PAGE ? null : this.viewer;
       const scale = this.currentScale;
       const viewport = firstPdfPage.getViewport({
-        scale: scale * _ui_utils.CSS_UNITS
+        scale: scale * _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS
       });
-      const textLayerFactory = this.textLayerMode !== _ui_utils.TextLayerMode.DISABLE ? this : null;
+      const textLayerFactory = textLayerMode !== _ui_utils.TextLayerMode.DISABLE && !isPureXfa ? this : null;
+      const annotationLayerFactory = annotationMode !== _pdfjsLib.AnnotationMode.DISABLE ? this : null;
+      const xfaLayerFactory = isPureXfa ? this : null;
+      const annotationEditorLayerFactory = this.#annotationEditorUIManager ? this : null;
 
       for (let pageNum = 1; pageNum <= pagesCount; ++pageNum) {
         const pageView = new _pdf_page_view.PDFPageView({
-          container: this._viewerElement,
+          container: viewerElement,
           eventBus: this.eventBus,
           id: pageNum,
           scale,
           defaultViewport: viewport.clone(),
-          annotationStorage,
           optionalContentConfigPromise,
           renderingQueue: this.renderingQueue,
           textLayerFactory,
-          textLayerMode: this.textLayerMode,
-          annotationLayerFactory: this,
+          textLayerMode,
+          annotationLayerFactory,
+          annotationMode,
+          xfaLayerFactory,
+          annotationEditorLayerFactory,
+          textHighlighterFactory: this,
+          structTreeLayerFactory: this,
           imageResourcesPath: this.imageResourcesPath,
-          renderInteractiveForms: this.renderInteractiveForms,
           renderer: this.renderer,
-          enableWebGL: this.enableWebGL,
           useOnlyCssZoom: this.useOnlyCssZoom,
           maxCanvasPixels: this.maxCanvasPixels,
+          pageColors: this.pageColors,
           l10n: this.l10n
         });
 
@@ -9750,16 +10563,29 @@ class BaseViewer {
         this.linkService.cachePageRef(1, firstPdfPage.ref);
       }
 
-      if (this._spreadMode !== _ui_utils.SpreadMode.NONE) {
+      if (this._scrollMode === _ui_utils.ScrollMode.PAGE) {
+        this.#ensurePageViewVisible();
+      } else if (this._spreadMode !== _ui_utils.SpreadMode.NONE) {
         this._updateSpreadMode();
       }
 
-      this._onePageRenderedOrForceFetch().then(() => {
+      this.#onePageRenderedOrForceFetch().then(async () => {
         if (this.findController) {
           this.findController.setDocument(pdfDocument);
         }
 
-        if (pdfDocument.loadingParams.disableAutoFetch || pagesCount > 7500) {
+        if (this._scriptingManager) {
+          this._scriptingManager.setDocument(pdfDocument);
+        }
+
+        if (this.#annotationEditorUIManager) {
+          this.eventBus.dispatch("annotationeditormodechanged", {
+            source: this,
+            mode: this.#annotationEditorMode
+          });
+        }
+
+        if (pdfDocument.loadingParams.disableAutoFetch || pagesCount > PagesCountLimit.FORCE_LAZY_PAGE_INIT) {
           this._pagesCapability.resolve();
 
           return;
@@ -9774,7 +10600,7 @@ class BaseViewer {
         }
 
         for (let pageNum = 2; pageNum <= pagesCount; ++pageNum) {
-          pdfDocument.getPage(pageNum).then(pdfPage => {
+          const promise = pdfDocument.getPage(pageNum).then(pdfPage => {
             const pageView = this._pages[pageNum - 1];
 
             if (!pageView.pdfPage) {
@@ -9793,18 +10619,34 @@ class BaseViewer {
               this._pagesCapability.resolve();
             }
           });
+
+          if (pageNum % PagesCountLimit.PAUSE_EAGER_PAGE_INIT === 0) {
+            await promise;
+          }
         }
       });
-
       this.eventBus.dispatch("pagesinit", {
         source: this
       });
+      pdfDocument.getMetadata().then(({
+        info
+      }) => {
+        if (pdfDocument !== this.pdfDocument) {
+          return;
+        }
+
+        if (info.Language) {
+          this.viewer.lang = info.Language;
+        }
+      });
 
       if (this.defaultRenderingQueue) {
         this.update();
       }
     }).catch(reason => {
       console.error("Unable to initialize viewer", reason);
+
+      this._pagesCapability.reject(reason);
     });
   }
 
@@ -9817,15 +10659,13 @@ class BaseViewer {
       this._pageLabels = null;
     } else if (!(Array.isArray(labels) && this.pdfDocument.numPages === labels.length)) {
       this._pageLabels = null;
-      console.error(`${this._name}.setPageLabels: Invalid page labels.`);
+      console.error(`setPageLabels: Invalid page labels.`);
     } else {
       this._pageLabels = labels;
     }
 
     for (let i = 0, ii = this._pages.length; i < ii; i++) {
-      const pageView = this._pages[i];
-      const label = this._pageLabels && this._pageLabels[i];
-      pageView.setPageLabel(label);
+      this._pages[i].setPageLabel(this._pageLabels?.[i] ?? null);
     }
   }
 
@@ -9835,16 +10675,21 @@ class BaseViewer {
     this._currentScale = _ui_utils.UNKNOWN_SCALE;
     this._currentScaleValue = null;
     this._pageLabels = null;
-    this._buffer = new PDFPageViewBuffer(DEFAULT_CACHE_SIZE);
+    this.#buffer = new PDFPageViewBuffer(DEFAULT_CACHE_SIZE);
     this._location = null;
     this._pagesRotation = 0;
     this._optionalContentConfigPromise = null;
-    this._pagesRequests = new WeakMap();
     this._firstPageCapability = (0, _pdfjsLib.createPromiseCapability)();
     this._onePageRenderedCapability = (0, _pdfjsLib.createPromiseCapability)();
     this._pagesCapability = (0, _pdfjsLib.createPromiseCapability)();
     this._scrollMode = _ui_utils.ScrollMode.VERTICAL;
+    this._previousScrollMode = _ui_utils.ScrollMode.UNKNOWN;
     this._spreadMode = _ui_utils.SpreadMode.NONE;
+    this.#scrollModePageState = {
+      previousPageNumber: 1,
+      scrollDown: true,
+      pages: []
+    };
 
     if (this._onBeforeDraw) {
       this.eventBus._off("pagerender", this._onBeforeDraw);
@@ -9858,9 +10703,73 @@ class BaseViewer {
       this._onAfterDraw = null;
     }
 
+    if (this.#onVisibilityChange) {
+      document.removeEventListener("visibilitychange", this.#onVisibilityChange);
+      this.#onVisibilityChange = null;
+    }
+
     this.viewer.textContent = "";
 
     this._updateScrollMode();
+
+    this.viewer.removeAttribute("lang");
+    this.viewer.classList.remove(ENABLE_PERMISSIONS_CLASS);
+  }
+
+  #ensurePageViewVisible() {
+    if (this._scrollMode !== _ui_utils.ScrollMode.PAGE) {
+      throw new Error("#ensurePageViewVisible: Invalid scrollMode value.");
+    }
+
+    const pageNumber = this._currentPageNumber,
+          state = this.#scrollModePageState,
+          viewer = this.viewer;
+    viewer.textContent = "";
+    state.pages.length = 0;
+
+    if (this._spreadMode === _ui_utils.SpreadMode.NONE && !this.isInPresentationMode) {
+      const pageView = this._pages[pageNumber - 1];
+      viewer.append(pageView.div);
+      state.pages.push(pageView);
+    } else {
+      const pageIndexSet = new Set(),
+            parity = this._spreadMode - 1;
+
+      if (parity === -1) {
+        pageIndexSet.add(pageNumber - 1);
+      } else if (pageNumber % 2 !== parity) {
+        pageIndexSet.add(pageNumber - 1);
+        pageIndexSet.add(pageNumber);
+      } else {
+        pageIndexSet.add(pageNumber - 2);
+        pageIndexSet.add(pageNumber - 1);
+      }
+
+      const spread = document.createElement("div");
+      spread.className = "spread";
+
+      if (this.isInPresentationMode) {
+        const dummyPage = document.createElement("div");
+        dummyPage.className = "dummyPage";
+        spread.append(dummyPage);
+      }
+
+      for (const i of pageIndexSet) {
+        const pageView = this._pages[i];
+
+        if (!pageView) {
+          continue;
+        }
+
+        spread.append(pageView.div);
+        state.pages.push(pageView);
+      }
+
+      viewer.append(spread);
+    }
+
+    state.scrollDown = pageNumber >= state.previousPageNumber;
+    state.previousPageNumber = pageNumber;
   }
 
   _scrollUpdate() {
@@ -9871,18 +10780,46 @@ class BaseViewer {
     this.update();
   }
 
-  _scrollIntoView({
-    pageDiv,
-    pageSpot = null,
-    pageNumber = null
-  }) {
-    (0, _ui_utils.scrollIntoView)(pageDiv, pageSpot);
+  #scrollIntoView(pageView, pageSpot = null) {
+    const {
+      div,
+      id
+    } = pageView;
+
+    if (this._scrollMode === _ui_utils.ScrollMode.PAGE) {
+      this._setCurrentPageNumber(id);
+
+      this.#ensurePageViewVisible();
+      this.update();
+    }
+
+    if (!pageSpot && !this.isInPresentationMode) {
+      const left = div.offsetLeft + div.clientLeft,
+            right = left + div.clientWidth;
+      const {
+        scrollLeft,
+        clientWidth
+      } = this.container;
+
+      if (this._scrollMode === _ui_utils.ScrollMode.HORIZONTAL || left < scrollLeft || right > scrollLeft + clientWidth) {
+        pageSpot = {
+          left: 0,
+          top: 0
+        };
+      }
+    }
+
+    (0, _ui_utils.scrollIntoView)(div, pageSpot);
+  }
+
+  #isSameScale(newScale) {
+    return newScale === this._currentScale || Math.abs(newScale - this._currentScale) < 1e-15;
   }
 
   _setScaleUpdatePages(newScale, newValue, noScroll = false, preset = false) {
     this._currentScaleValue = newValue.toString();
 
-    if (isSameScale(this._currentScale, newScale)) {
+    if (this.#isSameScale(newScale)) {
       if (preset) {
         this.eventBus.dispatch("scalechanging", {
           source: this,
@@ -9894,8 +10831,14 @@ class BaseViewer {
       return;
     }
 
-    for (let i = 0, ii = this._pages.length; i < ii; i++) {
-      this._pages[i].update(newScale);
+    _ui_utils.docStyle.setProperty("--scale-factor", newScale * _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS);
+
+    const updateArgs = {
+      scale: newScale
+    };
+
+    for (const pageView of this._pages) {
+      pageView.update(updateArgs);
     }
 
     this._currentScale = newScale;
@@ -9927,6 +10870,16 @@ class BaseViewer {
     if (this.defaultRenderingQueue) {
       this.update();
     }
+
+    this.updateContainerHeightCss();
+  }
+
+  get _pageWidthScaleFactor() {
+    if (this._spreadMode !== _ui_utils.SpreadMode.NONE && this._scrollMode !== _ui_utils.ScrollMode.HORIZONTAL) {
+      return 2;
+    }
+
+    return 1;
   }
 
   _setScale(value, noScroll = false) {
@@ -9941,15 +10894,18 @@ class BaseViewer {
         return;
       }
 
-      const noPadding = this.isInPresentationMode || this.removePageBorders;
-      let hPadding = noPadding ? 0 : _ui_utils.SCROLLBAR_PADDING;
-      let vPadding = noPadding ? 0 : _ui_utils.VERTICAL_PADDING;
+      let hPadding = _ui_utils.SCROLLBAR_PADDING,
+          vPadding = _ui_utils.VERTICAL_PADDING;
 
-      if (!noPadding && this._isScrollModeHorizontal) {
+      if (this.isInPresentationMode) {
+        hPadding = vPadding = 4;
+      } else if (this.removePageBorders) {
+        hPadding = vPadding = 0;
+      } else if (this._scrollMode === _ui_utils.ScrollMode.HORIZONTAL) {
         [hPadding, vPadding] = [vPadding, hPadding];
       }
 
-      const pageWidthScale = (this.container.clientWidth - hPadding) / currentPage.width * currentPage.scale;
+      const pageWidthScale = (this.container.clientWidth - hPadding) / currentPage.width * currentPage.scale / this._pageWidthScaleFactor;
       const pageHeightScale = (this.container.clientHeight - vPadding) / currentPage.height * currentPage.scale;
 
       switch (value) {
@@ -9975,7 +10931,7 @@ class BaseViewer {
           break;
 
         default:
-          console.error(`${this._name}._setScale: "${value}" is an unknown zoom value.`);
+          console.error(`_setScale: "${value}" is an unknown zoom value.`);
           return;
       }
 
@@ -9983,16 +10939,28 @@ class BaseViewer {
     }
   }
 
-  _resetCurrentPageView() {
+  #resetCurrentPageView() {
+    const pageView = this._pages[this._currentPageNumber - 1];
+
     if (this.isInPresentationMode) {
       this._setScale(this._currentScaleValue, true);
     }
 
-    const pageView = this._pages[this._currentPageNumber - 1];
+    this.#scrollIntoView(pageView);
+  }
 
-    this._scrollIntoView({
-      pageDiv: pageView.div
-    });
+  pageLabelToPageNumber(label) {
+    if (!this._pageLabels) {
+      return null;
+    }
+
+    const i = this._pageLabels.indexOf(label);
+
+    if (i < 0) {
+      return null;
+    }
+
+    return i + 1;
   }
 
   scrollPageIntoView({
@@ -10008,7 +10976,7 @@ class BaseViewer {
     const pageView = Number.isInteger(pageNumber) && this._pages[pageNumber - 1];
 
     if (!pageView) {
-      console.error(`${this._name}.scrollPageIntoView: ` + `"${pageNumber}" is not a valid pageNumber parameter.`);
+      console.error(`scrollPageIntoView: "${pageNumber}" is not a valid pageNumber parameter.`);
       return;
     }
 
@@ -10025,8 +10993,8 @@ class BaseViewer {
         widthScale,
         heightScale;
     const changeOrientation = pageView.rotation % 180 !== 0;
-    const pageWidth = (changeOrientation ? pageView.height : pageView.width) / pageView.scale / _ui_utils.CSS_UNITS;
-    const pageHeight = (changeOrientation ? pageView.width : pageView.height) / pageView.scale / _ui_utils.CSS_UNITS;
+    const pageWidth = (changeOrientation ? pageView.height : pageView.width) / pageView.scale / _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS;
+    const pageHeight = (changeOrientation ? pageView.width : pageView.height) / pageView.scale / _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS;
     let scale = 0;
 
     switch (destArray[1].name) {
@@ -10051,6 +11019,8 @@ class BaseViewer {
         if (y === null && this._location) {
           x = this._location.left;
           y = this._location.top;
+        } else if (typeof y !== "number" || y < 0) {
+          y = pageHeight;
         }
 
         break;
@@ -10070,13 +11040,13 @@ class BaseViewer {
         height = destArray[5] - y;
         const hPadding = this.removePageBorders ? 0 : _ui_utils.SCROLLBAR_PADDING;
         const vPadding = this.removePageBorders ? 0 : _ui_utils.VERTICAL_PADDING;
-        widthScale = (this.container.clientWidth - hPadding) / width / _ui_utils.CSS_UNITS;
-        heightScale = (this.container.clientHeight - vPadding) / height / _ui_utils.CSS_UNITS;
+        widthScale = (this.container.clientWidth - hPadding) / width / _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS;
+        heightScale = (this.container.clientHeight - vPadding) / height / _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS;
         scale = Math.min(Math.abs(widthScale), Math.abs(heightScale));
         break;
 
       default:
-        console.error(`${this._name}.scrollPageIntoView: ` + `"${destArray[1].name}" is not a valid destination type.`);
+        console.error(`scrollPageIntoView: "${destArray[1].name}" is not a valid destination type.`);
         return;
     }
 
@@ -10089,11 +11059,7 @@ class BaseViewer {
     }
 
     if (scale === "page-fit" && !destArray[4]) {
-      this._scrollIntoView({
-        pageDiv: pageView.div,
-        pageNumber
-      });
-
+      this.#scrollIntoView(pageView);
       return;
     }
 
@@ -10106,13 +11072,9 @@ class BaseViewer {
       top = Math.max(top, 0);
     }
 
-    this._scrollIntoView({
-      pageDiv: pageView.div,
-      pageSpot: {
-        left,
-        top
-      },
-      pageNumber
+    this.#scrollIntoView(pageView, {
+      left,
+      top
     });
   }
 
@@ -10121,14 +11083,17 @@ class BaseViewer {
     const currentScaleValue = this._currentScaleValue;
     const normalizedScaleValue = parseFloat(currentScaleValue) === currentScale ? Math.round(currentScale * 10000) / 100 : currentScaleValue;
     const pageNumber = firstPage.id;
-    let pdfOpenParams = "#page=" + pageNumber;
-    pdfOpenParams += "&zoom=" + normalizedScaleValue;
     const currentPageView = this._pages[pageNumber - 1];
     const container = this.container;
     const topLeft = currentPageView.getPagePoint(container.scrollLeft - firstPage.x, container.scrollTop - firstPage.y);
     const intLeft = Math.round(topLeft[0]);
     const intTop = Math.round(topLeft[1]);
-    pdfOpenParams += "," + intLeft + "," + intTop;
+    let pdfOpenParams = `#page=${pageNumber}`;
+
+    if (!this.isInPresentationMode) {
+      pdfOpenParams += `&zoom=${normalizedScaleValue},${intLeft},${intTop}`;
+    }
+
     this._location = {
       pageNumber,
       scale: normalizedScaleValue,
@@ -10139,10 +11104,6 @@ class BaseViewer {
     };
   }
 
-  _updateHelper(visiblePages) {
-    throw new Error("Not implemented: _updateHelper");
-  }
-
   update() {
     const visible = this._getVisiblePages();
 
@@ -10154,12 +11115,24 @@ class BaseViewer {
     }
 
     const newCacheSize = Math.max(DEFAULT_CACHE_SIZE, 2 * numVisiblePages + 1);
-
-    this._buffer.resize(newCacheSize, visiblePages);
-
+    this.#buffer.resize(newCacheSize, visible.ids);
     this.renderingQueue.renderHighestPriority(visible);
+    const isSimpleLayout = this._spreadMode === _ui_utils.SpreadMode.NONE && (this._scrollMode === _ui_utils.ScrollMode.PAGE || this._scrollMode === _ui_utils.ScrollMode.VERTICAL);
+    const currentId = this._currentPageNumber;
+    let stillFullyVisible = false;
 
-    this._updateHelper(visiblePages);
+    for (const page of visiblePages) {
+      if (page.percent < 100) {
+        break;
+      }
+
+      if (page.id === currentId && isSimpleLayout) {
+        stillFullyVisible = true;
+        break;
+      }
+    }
+
+    this._setCurrentPageNumber(stillFullyVisible ? currentId : visiblePages[0].id);
 
     this._updateLocation(visible.first);
 
@@ -10177,8 +11150,8 @@ class BaseViewer {
     this.container.focus();
   }
 
-  get _isScrollModeHorizontal() {
-    return this.isInPresentationMode ? false : this._scrollMode === _ui_utils.ScrollMode.HORIZONTAL;
+  get _isContainerRtl() {
+    return getComputedStyle(this.container).direction === "rtl";
   }
 
   get isInPresentationMode() {
@@ -10197,30 +11170,17 @@ class BaseViewer {
     return this.isInPresentationMode ? false : this.container.scrollHeight > this.container.clientHeight;
   }
 
-  _getCurrentVisiblePage() {
-    if (!this.pagesCount) {
-      return {
-        views: []
-      };
-    }
-
-    const pageView = this._pages[this._currentPageNumber - 1];
-    const element = pageView.div;
-    const view = {
-      id: pageView.id,
-      x: element.offsetLeft + element.clientLeft,
-      y: element.offsetTop + element.clientTop,
-      view: pageView
-    };
-    return {
-      first: view,
-      last: view,
-      views: [view]
-    };
-  }
-
   _getVisiblePages() {
-    return (0, _ui_utils.getVisibleElements)(this.container, this._pages, true, this._isScrollModeHorizontal);
+    const views = this._scrollMode === _ui_utils.ScrollMode.PAGE ? this.#scrollModePageState.pages : this._pages,
+          horizontal = this._scrollMode === _ui_utils.ScrollMode.HORIZONTAL,
+          rtl = horizontal && this._isContainerRtl;
+    return (0, _ui_utils.getVisibleElements)({
+      scrollEl: this.container,
+      views,
+      sortByVisibility: true,
+      horizontal,
+      rtl
+    });
   }
 
   isPageVisible(pageNumber) {
@@ -10228,101 +11188,218 @@ class BaseViewer {
       return false;
     }
 
-    if (pageNumber < 1 || pageNumber > this.pagesCount) {
-      console.error(`${this._name}.isPageVisible: "${pageNumber}" is out of bounds.`);
+    if (!(Number.isInteger(pageNumber) && pageNumber > 0 && pageNumber <= this.pagesCount)) {
+      console.error(`isPageVisible: "${pageNumber}" is not a valid page.`);
       return false;
     }
 
-    return this._getVisiblePages().views.some(function (view) {
-      return view.id === pageNumber;
-    });
+    return this._getVisiblePages().ids.has(pageNumber);
+  }
+
+  isPageCached(pageNumber) {
+    if (!this.pdfDocument) {
+      return false;
+    }
+
+    if (!(Number.isInteger(pageNumber) && pageNumber > 0 && pageNumber <= this.pagesCount)) {
+      console.error(`isPageCached: "${pageNumber}" is not a valid page.`);
+      return false;
+    }
+
+    const pageView = this._pages[pageNumber - 1];
+    return this.#buffer.has(pageView);
   }
 
   cleanup() {
-    for (let i = 0, ii = this._pages.length; i < ii; i++) {
-      if (this._pages[i] && this._pages[i].renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED) {
-        this._pages[i].reset();
+    for (const pageView of this._pages) {
+      if (pageView.renderingState !== _ui_utils.RenderingStates.FINISHED) {
+        pageView.reset();
       }
     }
   }
 
   _cancelRendering() {
-    for (let i = 0, ii = this._pages.length; i < ii; i++) {
-      if (this._pages[i]) {
-        this._pages[i].cancelRendering();
-      }
+    for (const pageView of this._pages) {
+      pageView.cancelRendering();
     }
   }
 
-  _ensurePdfPageLoaded(pageView) {
+  async #ensurePdfPageLoaded(pageView) {
     if (pageView.pdfPage) {
-      return Promise.resolve(pageView.pdfPage);
+      return pageView.pdfPage;
     }
 
-    if (this._pagesRequests.has(pageView)) {
-      return this._pagesRequests.get(pageView);
-    }
+    try {
+      const pdfPage = await this.pdfDocument.getPage(pageView.id);
 
-    const promise = this.pdfDocument.getPage(pageView.id).then(pdfPage => {
       if (!pageView.pdfPage) {
         pageView.setPdfPage(pdfPage);
       }
 
-      this._pagesRequests.delete(pageView);
+      if (!this.linkService._cachedPageNumber?.(pdfPage.ref)) {
+        this.linkService.cachePageRef(pageView.id, pdfPage.ref);
+      }
 
       return pdfPage;
-    }).catch(reason => {
+    } catch (reason) {
       console.error("Unable to get page for page view", reason);
+      return null;
+    }
+  }
 
-      this._pagesRequests.delete(pageView);
-    });
+  #getScrollAhead(visible) {
+    if (visible.first?.id === 1) {
+      return true;
+    } else if (visible.last?.id === this.pagesCount) {
+      return false;
+    }
 
-    this._pagesRequests.set(pageView, promise);
+    switch (this._scrollMode) {
+      case _ui_utils.ScrollMode.PAGE:
+        return this.#scrollModePageState.scrollDown;
 
-    return promise;
+      case _ui_utils.ScrollMode.HORIZONTAL:
+        return this.scroll.right;
+    }
+
+    return this.scroll.down;
+  }
+
+  #toggleLoadingIconSpinner(visibleIds) {
+    for (const id of visibleIds) {
+      const pageView = this._pages[id - 1];
+      pageView?.toggleLoadingIconSpinner(true);
+    }
+
+    for (const pageView of this.#buffer) {
+      if (visibleIds.has(pageView.id)) {
+        continue;
+      }
+
+      pageView.toggleLoadingIconSpinner(false);
+    }
   }
 
   forceRendering(currentlyVisiblePages) {
     const visiblePages = currentlyVisiblePages || this._getVisiblePages();
 
-    const scrollAhead = this._isScrollModeHorizontal ? this.scroll.right : this.scroll.down;
-    const pageView = this.renderingQueue.getHighestPriority(visiblePages, this._pages, scrollAhead);
+    const scrollAhead = this.#getScrollAhead(visiblePages);
+    const preRenderExtra = this._spreadMode !== _ui_utils.SpreadMode.NONE && this._scrollMode !== _ui_utils.ScrollMode.HORIZONTAL;
+    const pageView = this.renderingQueue.getHighestPriority(visiblePages, this._pages, scrollAhead, preRenderExtra);
+    this.#toggleLoadingIconSpinner(visiblePages.ids);
 
     if (pageView) {
-      this._ensurePdfPageLoaded(pageView).then(() => {
+      this.#ensurePdfPageLoaded(pageView).then(() => {
         this.renderingQueue.renderView(pageView);
       });
-
       return true;
     }
 
     return false;
   }
 
-  createTextLayerBuilder(textLayerDiv, pageIndex, viewport, enhanceTextSelection = false, eventBus) {
+  createTextLayerBuilder({
+    textLayerDiv,
+    pageIndex,
+    viewport,
+    enhanceTextSelection = false,
+    eventBus,
+    highlighter,
+    accessibilityManager = null
+  }) {
     return new _text_layer_builder.TextLayerBuilder({
       textLayerDiv,
       eventBus,
       pageIndex,
       viewport,
-      findController: this.isInPresentationMode ? null : this.findController,
-      enhanceTextSelection: this.isInPresentationMode ? false : enhanceTextSelection
+      enhanceTextSelection: this.isInPresentationMode ? false : enhanceTextSelection,
+      highlighter,
+      accessibilityManager
     });
   }
 
-  createAnnotationLayerBuilder(pageDiv, pdfPage, annotationStorage = null, imageResourcesPath = "", renderInteractiveForms = false, l10n = _ui_utils.NullL10n) {
+  createTextHighlighter({
+    pageIndex,
+    eventBus
+  }) {
+    return new _text_highlighter.TextHighlighter({
+      eventBus,
+      pageIndex,
+      findController: this.isInPresentationMode ? null : this.findController
+    });
+  }
+
+  createAnnotationLayerBuilder({
+    pageDiv,
+    pdfPage,
+    annotationStorage = this.pdfDocument?.annotationStorage,
+    imageResourcesPath = "",
+    renderForms = true,
+    l10n = _l10n_utils.NullL10n,
+    enableScripting = this.enableScripting,
+    hasJSActionsPromise = this.pdfDocument?.hasJSActions(),
+    mouseState = this._scriptingManager?.mouseState,
+    fieldObjectsPromise = this.pdfDocument?.getFieldObjects(),
+    annotationCanvasMap = null,
+    accessibilityManager = null
+  }) {
     return new _annotation_layer_builder.AnnotationLayerBuilder({
       pageDiv,
       pdfPage,
       annotationStorage,
       imageResourcesPath,
-      renderInteractiveForms,
+      renderForms,
       linkService: this.linkService,
       downloadManager: this.downloadManager,
+      l10n,
+      enableScripting,
+      hasJSActionsPromise,
+      mouseState,
+      fieldObjectsPromise,
+      annotationCanvasMap,
+      accessibilityManager
+    });
+  }
+
+  createAnnotationEditorLayerBuilder({
+    uiManager = this.#annotationEditorUIManager,
+    pageDiv,
+    pdfPage,
+    accessibilityManager = null,
+    l10n,
+    annotationStorage = this.pdfDocument?.annotationStorage
+  }) {
+    return new _annotation_editor_layer_builder.AnnotationEditorLayerBuilder({
+      uiManager,
+      pageDiv,
+      pdfPage,
+      annotationStorage,
+      accessibilityManager,
       l10n
     });
   }
 
+  createXfaLayerBuilder({
+    pageDiv,
+    pdfPage,
+    annotationStorage = this.pdfDocument?.annotationStorage
+  }) {
+    return new _xfa_layer_builder.XfaLayerBuilder({
+      pageDiv,
+      pdfPage,
+      annotationStorage,
+      linkService: this.linkService
+    });
+  }
+
+  createStructTreeLayerBuilder({
+    pdfPage
+  }) {
+    return new _struct_tree_layer_builder.StructTreeLayerBuilder({
+      pdfPage
+    });
+  }
+
   get hasEqualPageSizes() {
     const firstPageView = this._pages[0];
 
@@ -10338,30 +11415,23 @@ class BaseViewer {
   }
 
   getPagesOverview() {
-    const pagesOverview = this._pages.map(function (pageView) {
+    return this._pages.map(pageView => {
       const viewport = pageView.pdfPage.getViewport({
         scale: 1
       });
-      return {
-        width: viewport.width,
-        height: viewport.height,
-        rotation: viewport.rotation
-      };
-    });
 
-    if (!this.enablePrintAutoRotate) {
-      return pagesOverview;
-    }
-
-    return pagesOverview.map(function (size) {
-      if ((0, _ui_utils.isPortraitOrientation)(size)) {
-        return size;
+      if (!this.enablePrintAutoRotate || (0, _ui_utils.isPortraitOrientation)(viewport)) {
+        return {
+          width: viewport.width,
+          height: viewport.height,
+          rotation: viewport.rotation
+        };
       }
 
       return {
-        width: size.height,
-        height: size.width,
-        rotation: (size.rotation + 90) % 360
+        width: viewport.height,
+        height: viewport.width,
+        rotation: (viewport.rotation - 90) % 360
       };
     });
   }
@@ -10372,6 +11442,7 @@ class BaseViewer {
     }
 
     if (!this._optionalContentConfigPromise) {
+      console.error("optionalContentConfigPromise: Not initialized yet.");
       return this.pdfDocument.getOptionalContentConfig();
     }
 
@@ -10392,9 +11463,12 @@ class BaseViewer {
     }
 
     this._optionalContentConfigPromise = promise;
+    const updateArgs = {
+      optionalContentConfigPromise: promise
+    };
 
     for (const pageView of this._pages) {
-      pageView.update(pageView.scale, pageView.rotation, promise);
+      pageView.update(updateArgs);
     }
 
     this.update();
@@ -10417,6 +11491,11 @@ class BaseViewer {
       throw new Error(`Invalid scroll mode: ${mode}`);
     }
 
+    if (this.pagesCount > PagesCountLimit.FORCE_SCROLL_MODE_PAGE) {
+      return;
+    }
+
+    this._previousScrollMode = this._scrollMode;
     this._scrollMode = mode;
     this.eventBus.dispatch("scrollmodechanged", {
       source: this,
@@ -10436,6 +11515,12 @@ class BaseViewer {
       return;
     }
 
+    if (scrollMode === _ui_utils.ScrollMode.PAGE) {
+      this.#ensurePageViewVisible();
+    } else if (this._previousScrollMode === _ui_utils.ScrollMode.PAGE) {
+      this._updateSpreadMode();
+    }
+
     if (this._currentScaleValue && isNaN(this._currentScaleValue)) {
       this._setScale(this._currentScaleValue, true);
     }
@@ -10474,27 +11559,32 @@ class BaseViewer {
 
     const viewer = this.viewer,
           pages = this._pages;
-    viewer.textContent = "";
 
-    if (this._spreadMode === _ui_utils.SpreadMode.NONE) {
-      for (let i = 0, iMax = pages.length; i < iMax; ++i) {
-        viewer.appendChild(pages[i].div);
-      }
+    if (this._scrollMode === _ui_utils.ScrollMode.PAGE) {
+      this.#ensurePageViewVisible();
     } else {
-      const parity = this._spreadMode - 1;
-      let spread = null;
+      viewer.textContent = "";
 
-      for (let i = 0, iMax = pages.length; i < iMax; ++i) {
-        if (spread === null) {
-          spread = document.createElement("div");
-          spread.className = "spread";
-          viewer.appendChild(spread);
-        } else if (i % 2 === parity) {
-          spread = spread.cloneNode(false);
-          viewer.appendChild(spread);
+      if (this._spreadMode === _ui_utils.SpreadMode.NONE) {
+        for (const pageView of this._pages) {
+          viewer.append(pageView.div);
         }
+      } else {
+        const parity = this._spreadMode - 1;
+        let spread = null;
 
-        spread.appendChild(pages[i].div);
+        for (let i = 0, ii = pages.length; i < ii; ++i) {
+          if (spread === null) {
+            spread = document.createElement("div");
+            spread.className = "spread";
+            viewer.append(spread);
+          } else if (i % 2 === parity) {
+            spread = spread.cloneNode(false);
+            viewer.append(spread);
+          }
+
+          spread.append(pages[i].div);
+        }
       }
     }
 
@@ -10502,32 +11592,515 @@ class BaseViewer {
       return;
     }
 
+    if (this._currentScaleValue && isNaN(this._currentScaleValue)) {
+      this._setScale(this._currentScaleValue, true);
+    }
+
     this._setCurrentPageNumber(pageNumber, true);
 
     this.update();
   }
 
+  _getPageAdvance(currentPageNumber, previous = false) {
+    switch (this._scrollMode) {
+      case _ui_utils.ScrollMode.WRAPPED:
+        {
+          const {
+            views
+          } = this._getVisiblePages(),
+                pageLayout = new Map();
+
+          for (const {
+            id,
+            y,
+            percent,
+            widthPercent
+          } of views) {
+            if (percent === 0 || widthPercent < 100) {
+              continue;
+            }
+
+            let yArray = pageLayout.get(y);
+
+            if (!yArray) {
+              pageLayout.set(y, yArray ||= []);
+            }
+
+            yArray.push(id);
+          }
+
+          for (const yArray of pageLayout.values()) {
+            const currentIndex = yArray.indexOf(currentPageNumber);
+
+            if (currentIndex === -1) {
+              continue;
+            }
+
+            const numPages = yArray.length;
+
+            if (numPages === 1) {
+              break;
+            }
+
+            if (previous) {
+              for (let i = currentIndex - 1, ii = 0; i >= ii; i--) {
+                const currentId = yArray[i],
+                      expectedId = yArray[i + 1] - 1;
+
+                if (currentId < expectedId) {
+                  return currentPageNumber - expectedId;
+                }
+              }
+            } else {
+              for (let i = currentIndex + 1, ii = numPages; i < ii; i++) {
+                const currentId = yArray[i],
+                      expectedId = yArray[i - 1] + 1;
+
+                if (currentId > expectedId) {
+                  return expectedId - currentPageNumber;
+                }
+              }
+            }
+
+            if (previous) {
+              const firstId = yArray[0];
+
+              if (firstId < currentPageNumber) {
+                return currentPageNumber - firstId + 1;
+              }
+            } else {
+              const lastId = yArray[numPages - 1];
+
+              if (lastId > currentPageNumber) {
+                return lastId - currentPageNumber + 1;
+              }
+            }
+
+            break;
+          }
+
+          break;
+        }
+
+      case _ui_utils.ScrollMode.HORIZONTAL:
+        {
+          break;
+        }
+
+      case _ui_utils.ScrollMode.PAGE:
+      case _ui_utils.ScrollMode.VERTICAL:
+        {
+          if (this._spreadMode === _ui_utils.SpreadMode.NONE) {
+            break;
+          }
+
+          const parity = this._spreadMode - 1;
+
+          if (previous && currentPageNumber % 2 !== parity) {
+            break;
+          } else if (!previous && currentPageNumber % 2 === parity) {
+            break;
+          }
+
+          const {
+            views
+          } = this._getVisiblePages(),
+                expectedId = previous ? currentPageNumber - 1 : currentPageNumber + 1;
+
+          for (const {
+            id,
+            percent,
+            widthPercent
+          } of views) {
+            if (id !== expectedId) {
+              continue;
+            }
+
+            if (percent > 0 && widthPercent === 100) {
+              return 2;
+            }
+
+            break;
+          }
+
+          break;
+        }
+    }
+
+    return 1;
+  }
+
+  nextPage() {
+    const currentPageNumber = this._currentPageNumber,
+          pagesCount = this.pagesCount;
+
+    if (currentPageNumber >= pagesCount) {
+      return false;
+    }
+
+    const advance = this._getPageAdvance(currentPageNumber, false) || 1;
+    this.currentPageNumber = Math.min(currentPageNumber + advance, pagesCount);
+    return true;
+  }
+
+  previousPage() {
+    const currentPageNumber = this._currentPageNumber;
+
+    if (currentPageNumber <= 1) {
+      return false;
+    }
+
+    const advance = this._getPageAdvance(currentPageNumber, true) || 1;
+    this.currentPageNumber = Math.max(currentPageNumber - advance, 1);
+    return true;
+  }
+
+  increaseScale(steps = 1) {
+    let newScale = this._currentScale;
+
+    do {
+      newScale = (newScale * _ui_utils.DEFAULT_SCALE_DELTA).toFixed(2);
+      newScale = Math.ceil(newScale * 10) / 10;
+      newScale = Math.min(_ui_utils.MAX_SCALE, newScale);
+    } while (--steps > 0 && newScale < _ui_utils.MAX_SCALE);
+
+    this.currentScaleValue = newScale;
+  }
+
+  decreaseScale(steps = 1) {
+    let newScale = this._currentScale;
+
+    do {
+      newScale = (newScale / _ui_utils.DEFAULT_SCALE_DELTA).toFixed(2);
+      newScale = Math.floor(newScale * 10) / 10;
+      newScale = Math.max(_ui_utils.MIN_SCALE, newScale);
+    } while (--steps > 0 && newScale > _ui_utils.MIN_SCALE);
+
+    this.currentScaleValue = newScale;
+  }
+
+  updateContainerHeightCss() {
+    const height = this.container.clientHeight;
+
+    if (height !== this.#previousContainerHeight) {
+      this.#previousContainerHeight = height;
+
+      _ui_utils.docStyle.setProperty("--viewer-container-height", `${height}px`);
+    }
+  }
+
+  get annotationEditorMode() {
+    return this.#annotationEditorUIManager ? this.#annotationEditorMode : _pdfjsLib.AnnotationEditorType.DISABLE;
+  }
+
+  set annotationEditorMode(mode) {
+    if (!this.#annotationEditorUIManager) {
+      throw new Error(`The AnnotationEditor is not enabled.`);
+    }
+
+    if (this.#annotationEditorMode === mode) {
+      return;
+    }
+
+    if (!isValidAnnotationEditorMode(mode)) {
+      throw new Error(`Invalid AnnotationEditor mode: ${mode}`);
+    }
+
+    if (!this.pdfDocument) {
+      return;
+    }
+
+    this.#annotationEditorMode = mode;
+    this.eventBus.dispatch("annotationeditormodechanged", {
+      source: this,
+      mode
+    });
+    this.#annotationEditorUIManager.updateMode(mode);
+  }
+
+  set annotationEditorParams({
+    type,
+    value
+  }) {
+    if (!this.#annotationEditorUIManager) {
+      throw new Error(`The AnnotationEditor is not enabled.`);
+    }
+
+    this.#annotationEditorUIManager.updateParams(type, value);
+  }
+
+  refresh() {
+    if (!this.pdfDocument) {
+      return;
+    }
+
+    const updateArgs = {};
+
+    for (const pageView of this._pages) {
+      pageView.update(updateArgs);
+    }
+
+    this.update();
+  }
+
 }
 
 exports.BaseViewer = BaseViewer;
 
 /***/ }),
-/* 28 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 30 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.DefaultAnnotationLayerFactory = exports.AnnotationLayerBuilder = void 0;
+}));
+exports.AnnotationEditorLayerBuilder = void 0;
 
 var _pdfjsLib = __webpack_require__(5);
 
-var _ui_utils = __webpack_require__(2);
+var _l10n_utils = __webpack_require__(31);
 
-var _pdf_link_service = __webpack_require__(20);
+class AnnotationEditorLayerBuilder {
+  #uiManager;
+
+  constructor(options) {
+    this.pageDiv = options.pageDiv;
+    this.pdfPage = options.pdfPage;
+    this.annotationStorage = options.annotationStorage || null;
+    this.accessibilityManager = options.accessibilityManager;
+    this.l10n = options.l10n || _l10n_utils.NullL10n;
+    this.annotationEditorLayer = null;
+    this.div = null;
+    this._cancelled = false;
+    this.#uiManager = options.uiManager;
+  }
+
+  async render(viewport, intent = "display") {
+    if (intent !== "display") {
+      return;
+    }
+
+    if (this._cancelled) {
+      return;
+    }
+
+    const clonedViewport = viewport.clone({
+      dontFlip: true
+    });
+
+    if (this.div) {
+      this.annotationEditorLayer.update({
+        viewport: clonedViewport
+      });
+      this.show();
+      return;
+    }
+
+    this.div = document.createElement("div");
+    this.div.className = "annotationEditorLayer";
+    this.div.tabIndex = 0;
+    this.pageDiv.append(this.div);
+    this.annotationEditorLayer = new _pdfjsLib.AnnotationEditorLayer({
+      uiManager: this.#uiManager,
+      div: this.div,
+      annotationStorage: this.annotationStorage,
+      accessibilityManager: this.accessibilityManager,
+      pageIndex: this.pdfPage._pageIndex,
+      l10n: this.l10n,
+      viewport: clonedViewport
+    });
+    const parameters = {
+      viewport: clonedViewport,
+      div: this.div,
+      annotations: null,
+      intent
+    };
+    this.annotationEditorLayer.render(parameters);
+  }
+
+  cancel() {
+    this._cancelled = true;
+    this.destroy();
+  }
+
+  hide() {
+    if (!this.div) {
+      return;
+    }
+
+    this.div.hidden = true;
+  }
+
+  show() {
+    if (!this.div) {
+      return;
+    }
+
+    this.div.hidden = false;
+  }
+
+  destroy() {
+    if (!this.div) {
+      return;
+    }
+
+    this.pageDiv = null;
+    this.annotationEditorLayer.destroy();
+    this.div.remove();
+  }
+
+}
+
+exports.AnnotationEditorLayerBuilder = AnnotationEditorLayerBuilder;
+
+/***/ }),
+/* 31 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.NullL10n = void 0;
+exports.fixupLangCode = fixupLangCode;
+exports.getL10nFallback = getL10nFallback;
+const DEFAULT_L10N_STRINGS = {
+  of_pages: "of {{pagesCount}}",
+  page_of_pages: "({{pageNumber}} of {{pagesCount}})",
+  document_properties_kb: "{{size_kb}} KB ({{size_b}} bytes)",
+  document_properties_mb: "{{size_mb}} MB ({{size_b}} bytes)",
+  document_properties_date_string: "{{date}}, {{time}}",
+  document_properties_page_size_unit_inches: "in",
+  document_properties_page_size_unit_millimeters: "mm",
+  document_properties_page_size_orientation_portrait: "portrait",
+  document_properties_page_size_orientation_landscape: "landscape",
+  document_properties_page_size_name_a3: "A3",
+  document_properties_page_size_name_a4: "A4",
+  document_properties_page_size_name_letter: "Letter",
+  document_properties_page_size_name_legal: "Legal",
+  document_properties_page_size_dimension_string: "{{width}} × {{height}} {{unit}} ({{orientation}})",
+  document_properties_page_size_dimension_name_string: "{{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})",
+  document_properties_linearized_yes: "Yes",
+  document_properties_linearized_no: "No",
+  print_progress_percent: "{{progress}}%",
+  "toggle_sidebar.title": "Toggle Sidebar",
+  "toggle_sidebar_notification2.title": "Toggle Sidebar (document contains outline/attachments/layers)",
+  additional_layers: "Additional Layers",
+  page_landmark: "Page {{page}}",
+  thumb_page_title: "Page {{page}}",
+  thumb_page_canvas: "Thumbnail of Page {{page}}",
+  find_reached_top: "Reached top of document, continued from bottom",
+  find_reached_bottom: "Reached end of document, continued from top",
+  "find_match_count[one]": "{{current}} of {{total}} match",
+  "find_match_count[other]": "{{current}} of {{total}} matches",
+  "find_match_count_limit[one]": "More than {{limit}} match",
+  "find_match_count_limit[other]": "More than {{limit}} matches",
+  find_not_found: "Phrase not found",
+  error_version_info: "PDF.js v{{version}} (build: {{build}})",
+  error_message: "Message: {{message}}",
+  error_stack: "Stack: {{stack}}",
+  error_file: "File: {{file}}",
+  error_line: "Line: {{line}}",
+  rendering_error: "An error occurred while rendering the page.",
+  page_scale_width: "Page Width",
+  page_scale_fit: "Page Fit",
+  page_scale_auto: "Automatic Zoom",
+  page_scale_actual: "Actual Size",
+  page_scale_percent: "{{scale}}%",
+  loading: "Loading…",
+  loading_error: "An error occurred while loading the PDF.",
+  invalid_file_error: "Invalid or corrupted PDF file.",
+  missing_file_error: "Missing PDF file.",
+  unexpected_response_error: "Unexpected server response.",
+  printing_not_supported: "Warning: Printing is not fully supported by this browser.",
+  printing_not_ready: "Warning: The PDF is not fully loaded for printing.",
+  web_fonts_disabled: "Web fonts are disabled: unable to use embedded PDF fonts.",
+  free_text_default_content: "Enter text…",
+  editor_free_text_aria_label: "FreeText Editor",
+  editor_ink_aria_label: "Ink Editor",
+  editor_ink_canvas_aria_label: "User-created image"
+};
+
+function getL10nFallback(key, args) {
+  switch (key) {
+    case "find_match_count":
+      key = `find_match_count[${args.total === 1 ? "one" : "other"}]`;
+      break;
+
+    case "find_match_count_limit":
+      key = `find_match_count_limit[${args.limit === 1 ? "one" : "other"}]`;
+      break;
+  }
+
+  return DEFAULT_L10N_STRINGS[key] || "";
+}
+
+const PARTIAL_LANG_CODES = {
+  en: "en-US",
+  es: "es-ES",
+  fy: "fy-NL",
+  ga: "ga-IE",
+  gu: "gu-IN",
+  hi: "hi-IN",
+  hy: "hy-AM",
+  nb: "nb-NO",
+  ne: "ne-NP",
+  nn: "nn-NO",
+  pa: "pa-IN",
+  pt: "pt-PT",
+  sv: "sv-SE",
+  zh: "zh-CN"
+};
+
+function fixupLangCode(langCode) {
+  return PARTIAL_LANG_CODES[langCode?.toLowerCase()] || langCode;
+}
+
+function formatL10nValue(text, args) {
+  if (!args) {
+    return text;
+  }
+
+  return text.replace(/\{\{\s*(\w+)\s*\}\}/g, (all, name) => {
+    return name in args ? args[name] : "{{" + name + "}}";
+  });
+}
+
+const NullL10n = {
+  async getLanguage() {
+    return "en-us";
+  },
+
+  async getDirection() {
+    return "ltr";
+  },
+
+  async get(key, args = null, fallback = getL10nFallback(key, args)) {
+    return formatL10nValue(fallback, args);
+  },
+
+  async translate(element) {}
+
+};
+exports.NullL10n = NullL10n;
+
+/***/ }),
+/* 32 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.AnnotationLayerBuilder = void 0;
+
+var _pdfjsLib = __webpack_require__(5);
+
+var _l10n_utils = __webpack_require__(31);
 
 class AnnotationLayerBuilder {
   constructor({
@@ -10537,60 +12110,74 @@ class AnnotationLayerBuilder {
     downloadManager,
     annotationStorage = null,
     imageResourcesPath = "",
-    renderInteractiveForms = true,
-    l10n = _ui_utils.NullL10n
+    renderForms = true,
+    l10n = _l10n_utils.NullL10n,
+    enableScripting = false,
+    hasJSActionsPromise = null,
+    fieldObjectsPromise = null,
+    mouseState = null,
+    annotationCanvasMap = null,
+    accessibilityManager = null
   }) {
     this.pageDiv = pageDiv;
     this.pdfPage = pdfPage;
     this.linkService = linkService;
     this.downloadManager = downloadManager;
     this.imageResourcesPath = imageResourcesPath;
-    this.renderInteractiveForms = renderInteractiveForms;
+    this.renderForms = renderForms;
     this.l10n = l10n;
     this.annotationStorage = annotationStorage;
+    this.enableScripting = enableScripting;
+    this._hasJSActionsPromise = hasJSActionsPromise;
+    this._fieldObjectsPromise = fieldObjectsPromise;
+    this._mouseState = mouseState;
+    this._annotationCanvasMap = annotationCanvasMap;
+    this._accessibilityManager = accessibilityManager;
     this.div = null;
     this._cancelled = false;
   }
 
-  render(viewport, intent = "display") {
-    return this.pdfPage.getAnnotations({
+  async render(viewport, intent = "display") {
+    const [annotations, hasJSActions = false, fieldObjects = null] = await Promise.all([this.pdfPage.getAnnotations({
       intent
-    }).then(annotations => {
-      if (this._cancelled) {
-        return;
-      }
+    }), this._hasJSActionsPromise, this._fieldObjectsPromise]);
 
-      if (annotations.length === 0) {
-        return;
-      }
+    if (this._cancelled || annotations.length === 0) {
+      return;
+    }
 
-      const parameters = {
-        viewport: viewport.clone({
-          dontFlip: true
-        }),
-        div: this.div,
-        annotations,
-        page: this.pdfPage,
-        imageResourcesPath: this.imageResourcesPath,
-        renderInteractiveForms: this.renderInteractiveForms,
-        linkService: this.linkService,
-        downloadManager: this.downloadManager,
-        annotationStorage: this.annotationStorage
-      };
+    const parameters = {
+      viewport: viewport.clone({
+        dontFlip: true
+      }),
+      div: this.div,
+      annotations,
+      page: this.pdfPage,
+      imageResourcesPath: this.imageResourcesPath,
+      renderForms: this.renderForms,
+      linkService: this.linkService,
+      downloadManager: this.downloadManager,
+      annotationStorage: this.annotationStorage,
+      enableScripting: this.enableScripting,
+      hasJSActions,
+      fieldObjects,
+      mouseState: this._mouseState,
+      annotationCanvasMap: this._annotationCanvasMap,
+      accessibilityManager: this._accessibilityManager
+    };
 
-      if (this.div) {
-        _pdfjsLib.AnnotationLayer.update(parameters);
-      } else {
-        this.div = document.createElement("div");
-        this.div.className = "annotationLayer";
-        this.pageDiv.appendChild(this.div);
-        parameters.div = this.div;
+    if (this.div) {
+      _pdfjsLib.AnnotationLayer.update(parameters);
+    } else {
+      this.div = document.createElement("div");
+      this.div.className = "annotationLayer";
+      this.pageDiv.append(this.div);
+      parameters.div = this.div;
 
-        _pdfjsLib.AnnotationLayer.render(parameters);
+      _pdfjsLib.AnnotationLayer.render(parameters);
 
-        this.l10n.translate(this.div);
-      }
-    });
+      this.l10n.translate(this.div);
+    }
   }
 
   cancel() {
@@ -10602,53 +12189,43 @@ class AnnotationLayerBuilder {
       return;
     }
 
-    this.div.setAttribute("hidden", "true");
+    this.div.hidden = true;
   }
 
 }
 
 exports.AnnotationLayerBuilder = AnnotationLayerBuilder;
 
-class DefaultAnnotationLayerFactory {
-  createAnnotationLayerBuilder(pageDiv, pdfPage, annotationStorage = null, imageResourcesPath = "", renderInteractiveForms = true, l10n = _ui_utils.NullL10n) {
-    return new AnnotationLayerBuilder({
-      pageDiv,
-      pdfPage,
-      imageResourcesPath,
-      renderInteractiveForms,
-      linkService: new _pdf_link_service.SimpleLinkService(),
-      l10n,
-      annotationStorage
-    });
-  }
-
-}
-
-exports.DefaultAnnotationLayerFactory = DefaultAnnotationLayerFactory;
-
 /***/ }),
-/* 29 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 33 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.PDFPageView = void 0;
 
-var _ui_utils = __webpack_require__(2);
-
 var _pdfjsLib = __webpack_require__(5);
 
-var _pdf_rendering_queue = __webpack_require__(8);
+var _ui_utils = __webpack_require__(1);
 
-var _viewer_compatibility = __webpack_require__(4);
+var _app_options = __webpack_require__(2);
 
-const MAX_CANVAS_PIXELS = _viewer_compatibility.viewerCompatibilityParams.maxCanvasPixels || 16777216;
+var _l10n_utils = __webpack_require__(31);
+
+var _text_accessibility = __webpack_require__(34);
+
+const MAX_CANVAS_PIXELS = _app_options.compatibilityParams.maxCanvasPixels || 16777216;
 
 class PDFPageView {
+  #annotationMode = _pdfjsLib.AnnotationMode.ENABLE_FORMS;
+  #useThumbnailCanvas = {
+    initialOptionalContent: true,
+    regularAnnotations: true
+  };
+
   constructor(options) {
     const container = options.container;
     const defaultViewport = options.defaultViewport;
@@ -10660,36 +12237,69 @@ class PDFPageView {
     this.scale = options.scale || _ui_utils.DEFAULT_SCALE;
     this.viewport = defaultViewport;
     this.pdfPageRotate = defaultViewport.rotation;
-    this._annotationStorage = options.annotationStorage || null;
     this._optionalContentConfigPromise = options.optionalContentConfigPromise || null;
     this.hasRestrictedScaling = false;
-    this.textLayerMode = Number.isInteger(options.textLayerMode) ? options.textLayerMode : _ui_utils.TextLayerMode.ENABLE;
+    this.textLayerMode = options.textLayerMode ?? _ui_utils.TextLayerMode.ENABLE;
+    this.#annotationMode = options.annotationMode ?? _pdfjsLib.AnnotationMode.ENABLE_FORMS;
     this.imageResourcesPath = options.imageResourcesPath || "";
-    this.renderInteractiveForms = typeof options.renderInteractiveForms === "boolean" ? options.renderInteractiveForms : true;
     this.useOnlyCssZoom = options.useOnlyCssZoom || false;
     this.maxCanvasPixels = options.maxCanvasPixels || MAX_CANVAS_PIXELS;
+    this.pageColors = options.pageColors || null;
     this.eventBus = options.eventBus;
     this.renderingQueue = options.renderingQueue;
     this.textLayerFactory = options.textLayerFactory;
     this.annotationLayerFactory = options.annotationLayerFactory;
+    this.annotationEditorLayerFactory = options.annotationEditorLayerFactory;
+    this.xfaLayerFactory = options.xfaLayerFactory;
+    this.textHighlighter = options.textHighlighterFactory?.createTextHighlighter({
+      pageIndex: this.id - 1,
+      eventBus: this.eventBus
+    });
+    this.structTreeLayerFactory = options.structTreeLayerFactory;
     this.renderer = options.renderer || _ui_utils.RendererType.CANVAS;
-    this.enableWebGL = options.enableWebGL || false;
-    this.l10n = options.l10n || _ui_utils.NullL10n;
+    this.l10n = options.l10n || _l10n_utils.NullL10n;
     this.paintTask = null;
     this.paintedViewportMap = new WeakMap();
-    this.renderingState = _pdf_rendering_queue.RenderingStates.INITIAL;
+    this.renderingState = _ui_utils.RenderingStates.INITIAL;
     this.resume = null;
-    this.error = null;
+    this._renderError = null;
+    this._isStandalone = !this.renderingQueue?.hasViewer();
+    this._annotationCanvasMap = null;
     this.annotationLayer = null;
+    this.annotationEditorLayer = null;
     this.textLayer = null;
     this.zoomLayer = null;
+    this.xfaLayer = null;
+    this.structTreeLayer = null;
     const div = document.createElement("div");
     div.className = "page";
     div.style.width = Math.floor(this.viewport.width) + "px";
     div.style.height = Math.floor(this.viewport.height) + "px";
     div.setAttribute("data-page-number", this.id);
+    div.setAttribute("role", "region");
+    this.l10n.get("page_landmark", {
+      page: this.id
+    }).then(msg => {
+      div.setAttribute("aria-label", msg);
+    });
     this.div = div;
-    container.appendChild(div);
+    container?.append(div);
+
+    if (this._isStandalone) {
+      const {
+        optionalContentConfigPromise
+      } = options;
+
+      if (optionalContentConfigPromise) {
+        optionalContentConfigPromise.then(optionalContentConfig => {
+          if (optionalContentConfigPromise !== this._optionalContentConfigPromise) {
+            return;
+          }
+
+          this.#useThumbnailCanvas.initialOptionalContent = optionalContentConfig.hasInitialVisibility;
+        });
+      }
+    }
   }
 
   setPdfPage(pdfPage) {
@@ -10697,10 +12307,9 @@ class PDFPageView {
     this.pdfPageRotate = pdfPage.rotate;
     const totalRotation = (this.rotation + this.pdfPageRotate) % 360;
     this.viewport = pdfPage.getViewport({
-      scale: this.scale * _ui_utils.CSS_UNITS,
+      scale: this.scale * _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS,
       rotation: totalRotation
     });
-    this.stats = pdfPage.stats;
     this.reset();
   }
 
@@ -10718,6 +12327,7 @@ class PDFPageView {
     try {
       await this.annotationLayer.render(this.viewport, "display");
     } catch (ex) {
+      console.error(`_renderAnnotationLayer: "${ex}".`);
       error = ex;
     } finally {
       this.eventBus.dispatch("annotationlayerrendered", {
@@ -10728,6 +12338,56 @@ class PDFPageView {
     }
   }
 
+  async _renderAnnotationEditorLayer() {
+    let error = null;
+
+    try {
+      await this.annotationEditorLayer.render(this.viewport, "display");
+    } catch (ex) {
+      console.error(`_renderAnnotationEditorLayer: "${ex}".`);
+      error = ex;
+    } finally {
+      this.eventBus.dispatch("annotationeditorlayerrendered", {
+        source: this,
+        pageNumber: this.id,
+        error
+      });
+    }
+  }
+
+  async _renderXfaLayer() {
+    let error = null;
+
+    try {
+      const result = await this.xfaLayer.render(this.viewport, "display");
+
+      if (this.textHighlighter) {
+        this._buildXfaTextContentItems(result.textDivs);
+      }
+    } catch (ex) {
+      console.error(`_renderXfaLayer: "${ex}".`);
+      error = ex;
+    } finally {
+      this.eventBus.dispatch("xfalayerrendered", {
+        source: this,
+        pageNumber: this.id,
+        error
+      });
+    }
+  }
+
+  async _buildXfaTextContentItems(textDivs) {
+    const text = await this.pdfPage.getTextContent();
+    const items = [];
+
+    for (const item of text.items) {
+      items.push(item.str);
+    }
+
+    this.textHighlighter.setTextMapping(textDivs, items);
+    this.textHighlighter.enable();
+  }
+
   _resetZoomLayer(removeFromDOM = false) {
     if (!this.zoomLayer) {
       return;
@@ -10745,36 +12405,58 @@ class PDFPageView {
     this.zoomLayer = null;
   }
 
-  reset(keepZoomLayer = false, keepAnnotations = false) {
-    this.cancelRendering(keepAnnotations);
-    this.renderingState = _pdf_rendering_queue.RenderingStates.INITIAL;
+  reset({
+    keepZoomLayer = false,
+    keepAnnotationLayer = false,
+    keepAnnotationEditorLayer = false,
+    keepXfaLayer = false
+  } = {}) {
+    this.cancelRendering({
+      keepAnnotationLayer,
+      keepAnnotationEditorLayer,
+      keepXfaLayer
+    });
+    this.renderingState = _ui_utils.RenderingStates.INITIAL;
     const div = this.div;
     div.style.width = Math.floor(this.viewport.width) + "px";
     div.style.height = Math.floor(this.viewport.height) + "px";
-    const childNodes = div.childNodes;
-    const currentZoomLayerNode = keepZoomLayer && this.zoomLayer || null;
-    const currentAnnotationNode = keepAnnotations && this.annotationLayer && this.annotationLayer.div || null;
+    const childNodes = div.childNodes,
+          zoomLayerNode = keepZoomLayer && this.zoomLayer || null,
+          annotationLayerNode = keepAnnotationLayer && this.annotationLayer?.div || null,
+          annotationEditorLayerNode = keepAnnotationEditorLayer && this.annotationEditorLayer?.div || null,
+          xfaLayerNode = keepXfaLayer && this.xfaLayer?.div || null;
 
     for (let i = childNodes.length - 1; i >= 0; i--) {
       const node = childNodes[i];
 
-      if (currentZoomLayerNode === node || currentAnnotationNode === node) {
-        continue;
+      switch (node) {
+        case zoomLayerNode:
+        case annotationLayerNode:
+        case annotationEditorLayerNode:
+        case xfaLayerNode:
+          continue;
       }
 
-      div.removeChild(node);
+      node.remove();
     }
 
     div.removeAttribute("data-loaded");
 
-    if (currentAnnotationNode) {
+    if (annotationLayerNode) {
       this.annotationLayer.hide();
-    } else if (this.annotationLayer) {
-      this.annotationLayer.cancel();
-      this.annotationLayer = null;
     }
 
-    if (!currentZoomLayerNode) {
+    if (annotationEditorLayerNode) {
+      this.annotationEditorLayer.hide();
+    } else {
+      this.annotationEditorLayer?.destroy();
+    }
+
+    if (xfaLayerNode) {
+      this.xfaLayer.hide();
+    }
+
+    if (!zoomLayerNode) {
       if (this.canvas) {
         this.paintedViewportMap.delete(this.canvas);
         this.canvas.width = 0;
@@ -10791,34 +12473,64 @@ class PDFPageView {
     }
 
     this.loadingIconDiv = document.createElement("div");
-    this.loadingIconDiv.className = "loadingIcon";
-    div.appendChild(this.loadingIconDiv);
+    this.loadingIconDiv.className = "loadingIcon notVisible";
+
+    if (this._isStandalone) {
+      this.toggleLoadingIconSpinner(true);
+    }
+
+    this.loadingIconDiv.setAttribute("role", "img");
+    this.l10n.get("loading").then(msg => {
+      this.loadingIconDiv?.setAttribute("aria-label", msg);
+    });
+    div.append(this.loadingIconDiv);
   }
 
-  update(scale, rotation, optionalContentConfigPromise = null) {
+  update({
+    scale = 0,
+    rotation = null,
+    optionalContentConfigPromise = null
+  }) {
     this.scale = scale || this.scale;
 
-    if (typeof rotation !== "undefined") {
+    if (typeof rotation === "number") {
       this.rotation = rotation;
     }
 
     if (optionalContentConfigPromise instanceof Promise) {
       this._optionalContentConfigPromise = optionalContentConfigPromise;
+      optionalContentConfigPromise.then(optionalContentConfig => {
+        if (optionalContentConfigPromise !== this._optionalContentConfigPromise) {
+          return;
+        }
+
+        this.#useThumbnailCanvas.initialOptionalContent = optionalContentConfig.hasInitialVisibility;
+      });
     }
 
     const totalRotation = (this.rotation + this.pdfPageRotate) % 360;
     this.viewport = this.viewport.clone({
-      scale: this.scale * _ui_utils.CSS_UNITS,
+      scale: this.scale * _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS,
       rotation: totalRotation
     });
 
+    if (this._isStandalone) {
+      _ui_utils.docStyle.setProperty("--scale-factor", this.viewport.scale);
+    }
+
     if (this.svg) {
-      this.cssTransform(this.svg, true);
+      this.cssTransform({
+        target: this.svg,
+        redrawAnnotationLayer: true,
+        redrawAnnotationEditorLayer: true,
+        redrawXfaLayer: true
+      });
       this.eventBus.dispatch("pagerendered", {
         source: this,
         pageNumber: this.id,
         cssTransform: true,
-        timestamp: performance.now()
+        timestamp: performance.now(),
+        error: this._renderError
       });
       return;
     }
@@ -10835,30 +12547,47 @@ class PDFPageView {
 
     if (this.canvas) {
       if (this.useOnlyCssZoom || this.hasRestrictedScaling && isScalingRestricted) {
-        this.cssTransform(this.canvas, true);
+        this.cssTransform({
+          target: this.canvas,
+          redrawAnnotationLayer: true,
+          redrawAnnotationEditorLayer: true,
+          redrawXfaLayer: true
+        });
         this.eventBus.dispatch("pagerendered", {
           source: this,
           pageNumber: this.id,
           cssTransform: true,
-          timestamp: performance.now()
+          timestamp: performance.now(),
+          error: this._renderError
         });
         return;
       }
 
-      if (!this.zoomLayer && !this.canvas.hasAttribute("hidden")) {
+      if (!this.zoomLayer && !this.canvas.hidden) {
         this.zoomLayer = this.canvas.parentNode;
         this.zoomLayer.style.position = "absolute";
       }
     }
 
     if (this.zoomLayer) {
-      this.cssTransform(this.zoomLayer.firstChild);
+      this.cssTransform({
+        target: this.zoomLayer.firstChild
+      });
     }
 
-    this.reset(true, true);
+    this.reset({
+      keepZoomLayer: true,
+      keepAnnotationLayer: true,
+      keepAnnotationEditorLayer: true,
+      keepXfaLayer: true
+    });
   }
 
-  cancelRendering(keepAnnotations = false) {
+  cancelRendering({
+    keepAnnotationLayer = false,
+    keepAnnotationEditorLayer = false,
+    keepXfaLayer = false
+  } = {}) {
     if (this.paintTask) {
       this.paintTask.cancel();
       this.paintTask = null;
@@ -10871,13 +12600,36 @@ class PDFPageView {
       this.textLayer = null;
     }
 
-    if (!keepAnnotations && this.annotationLayer) {
+    if (this.annotationLayer && (!keepAnnotationLayer || !this.annotationLayer.div)) {
       this.annotationLayer.cancel();
       this.annotationLayer = null;
+      this._annotationCanvasMap = null;
+    }
+
+    if (this.annotationEditorLayer && (!keepAnnotationEditorLayer || !this.annotationEditorLayer.div)) {
+      this.annotationEditorLayer.cancel();
+      this.annotationEditorLayer = null;
+    }
+
+    if (this.xfaLayer && (!keepXfaLayer || !this.xfaLayer.div)) {
+      this.xfaLayer.cancel();
+      this.xfaLayer = null;
+      this.textHighlighter?.disable();
+    }
+
+    if (this._onTextLayerRendered) {
+      this.eventBus._off("textlayerrendered", this._onTextLayerRendered);
+
+      this._onTextLayerRendered = null;
     }
   }
 
-  cssTransform(target, redrawAnnotations = false) {
+  cssTransform({
+    target,
+    redrawAnnotationLayer = false,
+    redrawAnnotationEditorLayer = false,
+    redrawXfaLayer = false
+  }) {
     const width = this.viewport.width;
     const height = this.viewport.height;
     const div = this.div;
@@ -10893,8 +12645,7 @@ class PDFPageView {
       scaleY = width / height;
     }
 
-    const cssTransform = "rotate(" + relativeRotation + "deg) " + "scale(" + scaleX + "," + scaleY + ")";
-    target.style.transform = cssTransform;
+    target.style.transform = `rotate(${relativeRotation}deg) scale(${scaleX}, ${scaleY})`;
 
     if (this.textLayer) {
       const textLayerViewport = this.textLayer.viewport;
@@ -10934,13 +12685,21 @@ class PDFPageView {
           break;
       }
 
-      textLayerDiv.style.transform = "rotate(" + textAbsRotation + "deg) " + "scale(" + scale + ", " + scale + ") " + "translate(" + transX + ", " + transY + ")";
+      textLayerDiv.style.transform = `rotate(${textAbsRotation}deg) ` + `scale(${scale}) ` + `translate(${transX}, ${transY})`;
       textLayerDiv.style.transformOrigin = "0% 0%";
     }
 
-    if (redrawAnnotations && this.annotationLayer) {
+    if (redrawAnnotationLayer && this.annotationLayer) {
       this._renderAnnotationLayer();
     }
+
+    if (redrawAnnotationEditorLayer && this.annotationEditorLayer) {
+      this._renderAnnotationEditorLayer();
+    }
+
+    if (redrawXfaLayer && this.xfaLayer) {
+      this._renderXfaLayer();
+    }
   }
 
   get width() {
@@ -10955,8 +12714,12 @@ class PDFPageView {
     return this.viewport.convertToPdfPoint(x, y);
   }
 
+  toggleLoadingIconSpinner(viewVisible = false) {
+    this.loadingIconDiv?.classList.toggle("notVisible", !viewVisible);
+  }
+
   draw() {
-    if (this.renderingState !== _pdf_rendering_queue.RenderingStates.INITIAL) {
+    if (this.renderingState !== _ui_utils.RenderingStates.INITIAL) {
       console.error("Must be in new state before drawing");
       this.reset();
     }
@@ -10967,55 +12730,83 @@ class PDFPageView {
     } = this;
 
     if (!pdfPage) {
-      this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+      this.renderingState = _ui_utils.RenderingStates.FINISHED;
 
       if (this.loadingIconDiv) {
-        div.removeChild(this.loadingIconDiv);
+        this.loadingIconDiv.remove();
         delete this.loadingIconDiv;
       }
 
       return Promise.reject(new Error("pdfPage is not loaded"));
     }
 
-    this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
+    this.renderingState = _ui_utils.RenderingStates.RUNNING;
     const canvasWrapper = document.createElement("div");
     canvasWrapper.style.width = div.style.width;
     canvasWrapper.style.height = div.style.height;
     canvasWrapper.classList.add("canvasWrapper");
+    const lastDivBeforeTextDiv = this.annotationLayer?.div || this.annotationEditorLayer?.div;
 
-    if (this.annotationLayer && this.annotationLayer.div) {
-      div.insertBefore(canvasWrapper, this.annotationLayer.div);
+    if (lastDivBeforeTextDiv) {
+      lastDivBeforeTextDiv.before(canvasWrapper);
     } else {
-      div.appendChild(canvasWrapper);
+      div.append(canvasWrapper);
     }
 
     let textLayer = null;
 
     if (this.textLayerMode !== _ui_utils.TextLayerMode.DISABLE && this.textLayerFactory) {
+      this._accessibilityManager ||= new _text_accessibility.TextAccessibilityManager();
       const textLayerDiv = document.createElement("div");
       textLayerDiv.className = "textLayer";
       textLayerDiv.style.width = canvasWrapper.style.width;
       textLayerDiv.style.height = canvasWrapper.style.height;
 
-      if (this.annotationLayer && this.annotationLayer.div) {
-        div.insertBefore(textLayerDiv, this.annotationLayer.div);
+      if (lastDivBeforeTextDiv) {
+        lastDivBeforeTextDiv.before(textLayerDiv);
       } else {
-        div.appendChild(textLayerDiv);
+        div.append(textLayerDiv);
       }
 
-      textLayer = this.textLayerFactory.createTextLayerBuilder(textLayerDiv, this.id - 1, this.viewport, this.textLayerMode === _ui_utils.TextLayerMode.ENABLE_ENHANCE, this.eventBus);
+      textLayer = this.textLayerFactory.createTextLayerBuilder({
+        textLayerDiv,
+        pageIndex: this.id - 1,
+        viewport: this.viewport,
+        enhanceTextSelection: this.textLayerMode === _ui_utils.TextLayerMode.ENABLE_ENHANCE,
+        eventBus: this.eventBus,
+        highlighter: this.textHighlighter,
+        accessibilityManager: this._accessibilityManager
+      });
     }
 
     this.textLayer = textLayer;
+
+    if (this.#annotationMode !== _pdfjsLib.AnnotationMode.DISABLE && this.annotationLayerFactory) {
+      this._annotationCanvasMap ||= new Map();
+      this.annotationLayer ||= this.annotationLayerFactory.createAnnotationLayerBuilder({
+        pageDiv: div,
+        pdfPage,
+        imageResourcesPath: this.imageResourcesPath,
+        renderForms: this.#annotationMode === _pdfjsLib.AnnotationMode.ENABLE_FORMS,
+        l10n: this.l10n,
+        annotationCanvasMap: this._annotationCanvasMap,
+        accessibilityManager: this._accessibilityManager
+      });
+    }
+
+    if (this.xfaLayer?.div) {
+      div.append(this.xfaLayer.div);
+    }
+
     let renderContinueCallback = null;
 
     if (this.renderingQueue) {
       renderContinueCallback = cont => {
         if (!this.renderingQueue.isHighestPriority(this)) {
-          this.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
+          this.renderingState = _ui_utils.RenderingStates.PAUSED;
 
           this.resume = () => {
-            this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
+            this.renderingState = _ui_utils.RenderingStates.RUNNING;
             cont();
           };
 
@@ -11026,32 +12817,33 @@ class PDFPageView {
       };
     }
 
-    const finishPaintTask = async error => {
+    const finishPaintTask = async (error = null) => {
       if (paintTask === this.paintTask) {
         this.paintTask = null;
       }
 
       if (error instanceof _pdfjsLib.RenderingCancelledException) {
-        this.error = null;
+        this._renderError = null;
         return;
       }
 
-      this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+      this._renderError = error;
+      this.renderingState = _ui_utils.RenderingStates.FINISHED;
 
       if (this.loadingIconDiv) {
-        div.removeChild(this.loadingIconDiv);
+        this.loadingIconDiv.remove();
         delete this.loadingIconDiv;
       }
 
       this._resetZoomLayer(true);
 
-      this.error = error;
-      this.stats = pdfPage.stats;
+      this.#useThumbnailCanvas.regularAnnotations = !paintTask.separateAnnots;
       this.eventBus.dispatch("pagerendered", {
         source: this,
         pageNumber: this.id,
         cssTransform: false,
-        timestamp: performance.now()
+        timestamp: performance.now(),
+        error: this._renderError
       });
 
       if (error) {
@@ -11062,26 +12854,78 @@ class PDFPageView {
     const paintTask = this.renderer === _ui_utils.RendererType.SVG ? this.paintOnSvg(canvasWrapper) : this.paintOnCanvas(canvasWrapper);
     paintTask.onRenderContinue = renderContinueCallback;
     this.paintTask = paintTask;
-    const resultPromise = paintTask.promise.then(function () {
-      return finishPaintTask(null).then(function () {
+    const resultPromise = paintTask.promise.then(() => {
+      return finishPaintTask(null).then(() => {
         if (textLayer) {
           const readableStream = pdfPage.streamTextContent({
-            normalizeWhitespace: true
+            includeMarkedContent: true
           });
           textLayer.setTextContentStream(readableStream);
           textLayer.render();
         }
+
+        if (this.annotationLayer) {
+          this._renderAnnotationLayer().then(() => {
+            if (this.annotationEditorLayerFactory) {
+              this.annotationEditorLayer ||= this.annotationEditorLayerFactory.createAnnotationEditorLayerBuilder({
+                pageDiv: div,
+                pdfPage,
+                l10n: this.l10n,
+                accessibilityManager: this._accessibilityManager
+              });
+
+              this._renderAnnotationEditorLayer();
+            }
+          });
+        }
       });
     }, function (reason) {
       return finishPaintTask(reason);
     });
 
-    if (this.annotationLayerFactory) {
-      if (!this.annotationLayer) {
-        this.annotationLayer = this.annotationLayerFactory.createAnnotationLayerBuilder(div, pdfPage, this._annotationStorage, this.imageResourcesPath, this.renderInteractiveForms, this.l10n);
-      }
+    if (this.xfaLayerFactory) {
+      this.xfaLayer ||= this.xfaLayerFactory.createXfaLayerBuilder({
+        pageDiv: div,
+        pdfPage
+      });
 
-      this._renderAnnotationLayer();
+      this._renderXfaLayer();
+    }
+
+    if (this.structTreeLayerFactory && this.textLayer && this.canvas) {
+      this._onTextLayerRendered = event => {
+        if (event.pageNumber !== this.id) {
+          return;
+        }
+
+        this.eventBus._off("textlayerrendered", this._onTextLayerRendered);
+
+        this._onTextLayerRendered = null;
+
+        if (!this.canvas) {
+          return;
+        }
+
+        this.pdfPage.getStructTree().then(tree => {
+          if (!tree) {
+            return;
+          }
+
+          if (!this.canvas) {
+            return;
+          }
+
+          const treeDom = this.structTreeLayer.render(tree);
+          treeDom.classList.add("structTree");
+          this.canvas.append(treeDom);
+        });
+      };
+
+      this.eventBus._on("textlayerrendered", this._onTextLayerRendered);
+
+      this.structTreeLayer = this.structTreeLayerFactory.createStructTreeLayerBuilder({
+        pdfPage
+      });
     }
 
     div.setAttribute("data-loaded", true);
@@ -11103,42 +12947,39 @@ class PDFPageView {
 
       cancel() {
         renderTask.cancel();
+      },
+
+      get separateAnnots() {
+        return renderTask.separateAnnots;
       }
 
     };
     const viewport = this.viewport;
     const canvas = document.createElement("canvas");
-    this.l10n.get("page_canvas", {
-      page: this.id
-    }, "Page {{page}}").then(msg => {
-      canvas.setAttribute("aria-label", msg);
-    });
-    canvas.setAttribute("hidden", "hidden");
+    canvas.setAttribute("role", "presentation");
+    canvas.hidden = true;
     let isCanvasHidden = true;
 
     const showCanvas = function () {
       if (isCanvasHidden) {
-        canvas.removeAttribute("hidden");
+        canvas.hidden = false;
         isCanvasHidden = false;
       }
     };
 
-    canvasWrapper.appendChild(canvas);
+    canvasWrapper.append(canvas);
     this.canvas = canvas;
-    canvas.mozOpaque = true;
     const ctx = canvas.getContext("2d", {
       alpha: false
     });
-    const outputScale = (0, _ui_utils.getOutputScale)(ctx);
-    this.outputScale = outputScale;
+    const outputScale = this.outputScale = new _ui_utils.OutputScale();
 
     if (this.useOnlyCssZoom) {
       const actualSizeViewport = viewport.clone({
-        scale: _ui_utils.CSS_UNITS
+        scale: _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS
       });
       outputScale.sx *= actualSizeViewport.width / viewport.width;
       outputScale.sy *= actualSizeViewport.height / viewport.height;
-      outputScale.scaled = true;
     }
 
     if (this.maxCanvasPixels > 0) {
@@ -11148,7 +12989,6 @@ class PDFPageView {
       if (outputScale.sx > maxScale || outputScale.sy > maxScale) {
         outputScale.sx = maxScale;
         outputScale.sy = maxScale;
-        outputScale.scaled = true;
         this.hasRestrictedScaling = true;
       } else {
         this.hasRestrictedScaling = false;
@@ -11162,14 +13002,15 @@ class PDFPageView {
     canvas.style.width = (0, _ui_utils.roundToDivide)(viewport.width, sfx[1]) + "px";
     canvas.style.height = (0, _ui_utils.roundToDivide)(viewport.height, sfy[1]) + "px";
     this.paintedViewportMap.set(canvas, viewport);
-    const transform = !outputScale.scaled ? null : [outputScale.sx, 0, 0, outputScale.sy, 0, 0];
+    const transform = outputScale.scaled ? [outputScale.sx, 0, 0, outputScale.sy, 0, 0] : null;
     const renderContext = {
       canvasContext: ctx,
       transform,
       viewport: this.viewport,
-      enableWebGL: this.enableWebGL,
-      renderInteractiveForms: this.renderInteractiveForms,
-      optionalContentConfigPromise: this._optionalContentConfigPromise
+      annotationMode: this.#annotationMode,
+      optionalContentConfigPromise: this._optionalContentConfigPromise,
+      annotationCanvasMap: this._annotationCanvasMap,
+      pageColors: this.pageColors
     };
     const renderTask = this.pdfPage.render(renderContext);
 
@@ -11185,7 +13026,7 @@ class PDFPageView {
 
     renderTask.promise.then(function () {
       showCanvas();
-      renderCapability.resolve(undefined);
+      renderCapability.resolve();
     }, function (error) {
       showCanvas();
       renderCapability.reject(error);
@@ -11204,9 +13045,11 @@ class PDFPageView {
 
     const pdfPage = this.pdfPage;
     const actualSizeViewport = this.viewport.clone({
-      scale: _ui_utils.CSS_UNITS
+      scale: _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS
     });
-    const promise = pdfPage.getOperatorList().then(opList => {
+    const promise = pdfPage.getOperatorList({
+      annotationMode: this.#annotationMode
+    }).then(opList => {
       ensureNotCancelled();
       const svgGfx = new _pdfjsLib.SVGGraphics(pdfPage.commonObjs, pdfPage.objs);
       return svgGfx.getSVG(opList, actualSizeViewport).then(svg => {
@@ -11215,8 +13058,8 @@ class PDFPageView {
         this.paintedViewportMap.set(svg, actualSizeViewport);
         svg.style.width = wrapper.style.width;
         svg.style.height = wrapper.style.height;
-        this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
-        wrapper.appendChild(svg);
+        this.renderingState = _ui_utils.RenderingStates.FINISHED;
+        wrapper.append(svg);
       });
     });
     return {
@@ -11228,6 +13071,10 @@ class PDFPageView {
 
       cancel() {
         cancelled = true;
+      },
+
+      get separateAnnots() {
+        return false;
       }
 
     };
@@ -11243,95 +13090,384 @@ class PDFPageView {
     }
   }
 
+  get thumbnailCanvas() {
+    const {
+      initialOptionalContent,
+      regularAnnotations
+    } = this.#useThumbnailCanvas;
+    return initialOptionalContent && regularAnnotations ? this.canvas : null;
+  }
+
 }
 
 exports.PDFPageView = PDFPageView;
 
 /***/ }),
-/* 30 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 34 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.DefaultTextLayerFactory = exports.TextLayerBuilder = void 0;
+}));
+exports.TextAccessibilityManager = void 0;
 
-var _pdfjsLib = __webpack_require__(5);
+var _ui_utils = __webpack_require__(1);
 
-const EXPAND_DIVS_TIMEOUT = 300;
+class TextAccessibilityManager {
+  #enabled = false;
+  #textChildren = null;
+  #textNodes = new Map();
+  #waitingElements = new Map();
 
-class TextLayerBuilder {
-  constructor({
-    textLayerDiv,
-    eventBus,
-    pageIndex,
-    viewport,
-    findController = null,
-    enhanceTextSelection = false
-  }) {
-    this.textLayerDiv = textLayerDiv;
-    this.eventBus = eventBus;
-    this.textContent = null;
-    this.textContentItemsStr = [];
-    this.textContentStream = null;
-    this.renderingDone = false;
-    this.pageIdx = pageIndex;
-    this.pageNumber = this.pageIdx + 1;
-    this.matches = [];
-    this.viewport = viewport;
-    this.textDivs = [];
-    this.findController = findController;
-    this.textLayerRenderTask = null;
-    this.enhanceTextSelection = enhanceTextSelection;
-    this._onUpdateTextLayerMatches = null;
-
-    this._bindMouse();
+  setTextMapping(textDivs) {
+    this.#textChildren = textDivs;
   }
 
-  _finishRendering() {
-    this.renderingDone = true;
+  static #compareElementPositions(e1, e2) {
+    const rect1 = e1.getBoundingClientRect();
+    const rect2 = e2.getBoundingClientRect();
 
-    if (!this.enhanceTextSelection) {
-      const endOfContent = document.createElement("div");
-      endOfContent.className = "endOfContent";
-      this.textLayerDiv.appendChild(endOfContent);
+    if (rect1.width === 0 && rect1.height === 0) {
+      return +1;
     }
 
-    this.eventBus.dispatch("textlayerrendered", {
-      source: this,
-      pageNumber: this.pageNumber,
-      numTextDivs: this.textDivs.length
-    });
+    if (rect2.width === 0 && rect2.height === 0) {
+      return -1;
+    }
+
+    const top1 = rect1.y;
+    const bot1 = rect1.y + rect1.height;
+    const mid1 = rect1.y + rect1.height / 2;
+    const top2 = rect2.y;
+    const bot2 = rect2.y + rect2.height;
+    const mid2 = rect2.y + rect2.height / 2;
+
+    if (mid1 <= top2 && mid2 >= bot1) {
+      return -1;
+    }
+
+    if (mid2 <= top1 && mid1 >= bot2) {
+      return +1;
+    }
+
+    const centerX1 = rect1.x + rect1.width / 2;
+    const centerX2 = rect2.x + rect2.width / 2;
+    return centerX1 - centerX2;
   }
 
-  render(timeout = 0) {
-    if (!(this.textContent || this.textContentStream) || this.renderingDone) {
+  enable() {
+    if (this.#enabled) {
+      throw new Error("TextAccessibilityManager is already enabled.");
+    }
+
+    if (!this.#textChildren) {
+      throw new Error("Text divs and strings have not been set.");
+    }
+
+    this.#enabled = true;
+    this.#textChildren = this.#textChildren.slice();
+    this.#textChildren.sort(TextAccessibilityManager.#compareElementPositions);
+
+    if (this.#textNodes.size > 0) {
+      const textChildren = this.#textChildren;
+
+      for (const [id, nodeIndex] of this.#textNodes) {
+        const element = document.getElementById(id);
+
+        if (!element) {
+          this.#textNodes.delete(id);
+          continue;
+        }
+
+        this.#addIdToAriaOwns(id, textChildren[nodeIndex]);
+      }
+    }
+
+    for (const [element, isRemovable] of this.#waitingElements) {
+      this.addPointerInTextLayer(element, isRemovable);
+    }
+
+    this.#waitingElements.clear();
+  }
+
+  disable() {
+    if (!this.#enabled) {
       return;
     }
 
-    this.cancel();
-    this.textDivs = [];
-    const textLayerFrag = document.createDocumentFragment();
-    this.textLayerRenderTask = (0, _pdfjsLib.renderTextLayer)({
-      textContent: this.textContent,
-      textContentStream: this.textContentStream,
-      container: textLayerFrag,
-      viewport: this.viewport,
-      textDivs: this.textDivs,
-      textContentItemsStr: this.textContentItemsStr,
-      timeout,
-      enhanceTextSelection: this.enhanceTextSelection
-    });
-    this.textLayerRenderTask.promise.then(() => {
-      this.textLayerDiv.appendChild(textLayerFrag);
+    this.#waitingElements.clear();
+    this.#textChildren = null;
+    this.#enabled = false;
+  }
 
-      this._finishRendering();
+  removePointerInTextLayer(element) {
+    if (!this.#enabled) {
+      this.#waitingElements.delete(element);
+      return;
+    }
 
-      this._updateMatches();
-    }, function (reason) {});
+    const children = this.#textChildren;
+
+    if (!children || children.length === 0) {
+      return;
+    }
+
+    const {
+      id
+    } = element;
+    const nodeIndex = this.#textNodes.get(id);
+
+    if (nodeIndex === undefined) {
+      return;
+    }
+
+    const node = children[nodeIndex];
+    this.#textNodes.delete(id);
+    let owns = node.getAttribute("aria-owns");
+
+    if (owns?.includes(id)) {
+      owns = owns.split(" ").filter(x => x !== id).join(" ");
+
+      if (owns) {
+        node.setAttribute("aria-owns", owns);
+      } else {
+        node.removeAttribute("aria-owns");
+        node.setAttribute("role", "presentation");
+      }
+    }
+  }
+
+  #addIdToAriaOwns(id, node) {
+    const owns = node.getAttribute("aria-owns");
+
+    if (!owns?.includes(id)) {
+      node.setAttribute("aria-owns", owns ? `${owns} ${id}` : id);
+    }
+
+    node.removeAttribute("role");
+  }
+
+  addPointerInTextLayer(element, isRemovable) {
+    const {
+      id
+    } = element;
+
+    if (!id) {
+      return;
+    }
+
+    if (!this.#enabled) {
+      this.#waitingElements.set(element, isRemovable);
+      return;
+    }
+
+    if (isRemovable) {
+      this.removePointerInTextLayer(element);
+    }
+
+    const children = this.#textChildren;
+
+    if (!children || children.length === 0) {
+      return;
+    }
+
+    const index = (0, _ui_utils.binarySearchFirstItem)(children, node => TextAccessibilityManager.#compareElementPositions(element, node) < 0);
+    const nodeIndex = Math.max(0, index - 1);
+    this.#addIdToAriaOwns(id, children[nodeIndex]);
+    this.#textNodes.set(id, nodeIndex);
+  }
+
+  moveElementInDOM(container, element, contentElement, isRemovable) {
+    this.addPointerInTextLayer(contentElement, isRemovable);
+
+    if (!container.hasChildNodes()) {
+      container.append(element);
+      return;
+    }
+
+    const children = Array.from(container.childNodes).filter(node => node !== element);
+
+    if (children.length === 0) {
+      return;
+    }
+
+    const elementToCompare = contentElement || element;
+    const index = (0, _ui_utils.binarySearchFirstItem)(children, node => TextAccessibilityManager.#compareElementPositions(elementToCompare, node) < 0);
+
+    if (index === 0) {
+      children[0].before(element);
+    } else {
+      children[index - 1].after(element);
+    }
+  }
+
+}
+
+exports.TextAccessibilityManager = TextAccessibilityManager;
+
+/***/ }),
+/* 35 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.StructTreeLayerBuilder = void 0;
+const PDF_ROLE_TO_HTML_ROLE = {
+  Document: null,
+  DocumentFragment: null,
+  Part: "group",
+  Sect: "group",
+  Div: "group",
+  Aside: "note",
+  NonStruct: "none",
+  P: null,
+  H: "heading",
+  Title: null,
+  FENote: "note",
+  Sub: "group",
+  Lbl: null,
+  Span: null,
+  Em: null,
+  Strong: null,
+  Link: "link",
+  Annot: "note",
+  Form: "form",
+  Ruby: null,
+  RB: null,
+  RT: null,
+  RP: null,
+  Warichu: null,
+  WT: null,
+  WP: null,
+  L: "list",
+  LI: "listitem",
+  LBody: null,
+  Table: "table",
+  TR: "row",
+  TH: "columnheader",
+  TD: "cell",
+  THead: "columnheader",
+  TBody: null,
+  TFoot: null,
+  Caption: null,
+  Figure: "figure",
+  Formula: null,
+  Artifact: null
+};
+const HEADING_PATTERN = /^H(\d+)$/;
+
+class StructTreeLayerBuilder {
+  constructor({
+    pdfPage
+  }) {
+    this.pdfPage = pdfPage;
+  }
+
+  render(structTree) {
+    return this._walk(structTree);
+  }
+
+  _setAttributes(structElement, htmlElement) {
+    if (structElement.alt !== undefined) {
+      htmlElement.setAttribute("aria-label", structElement.alt);
+    }
+
+    if (structElement.id !== undefined) {
+      htmlElement.setAttribute("aria-owns", structElement.id);
+    }
+
+    if (structElement.lang !== undefined) {
+      htmlElement.setAttribute("lang", structElement.lang);
+    }
+  }
+
+  _walk(node) {
+    if (!node) {
+      return null;
+    }
+
+    const element = document.createElement("span");
+
+    if ("role" in node) {
+      const {
+        role
+      } = node;
+      const match = role.match(HEADING_PATTERN);
+
+      if (match) {
+        element.setAttribute("role", "heading");
+        element.setAttribute("aria-level", match[1]);
+      } else if (PDF_ROLE_TO_HTML_ROLE[role]) {
+        element.setAttribute("role", PDF_ROLE_TO_HTML_ROLE[role]);
+      }
+    }
+
+    this._setAttributes(node, element);
+
+    if (node.children) {
+      if (node.children.length === 1 && "id" in node.children[0]) {
+        this._setAttributes(node.children[0], element);
+      } else {
+        for (const kid of node.children) {
+          element.append(this._walk(kid));
+        }
+      }
+    }
+
+    return element;
+  }
+
+}
+
+exports.StructTreeLayerBuilder = StructTreeLayerBuilder;
+
+/***/ }),
+/* 36 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.TextHighlighter = void 0;
+
+class TextHighlighter {
+  constructor({
+    findController,
+    eventBus,
+    pageIndex
+  }) {
+    this.findController = findController;
+    this.matches = [];
+    this.eventBus = eventBus;
+    this.pageIdx = pageIndex;
+    this._onUpdateTextLayerMatches = null;
+    this.textDivs = null;
+    this.textContentItemsStr = null;
+    this.enabled = false;
+  }
+
+  setTextMapping(divs, texts) {
+    this.textDivs = divs;
+    this.textContentItemsStr = texts;
+  }
+
+  enable() {
+    if (!this.textDivs || !this.textContentItemsStr) {
+      throw new Error("Text divs and strings have not been set.");
+    }
+
+    if (this.enabled) {
+      throw new Error("TextHighlighter is already enabled.");
+    }
+
+    this.enabled = true;
 
     if (!this._onUpdateTextLayerMatches) {
       this._onUpdateTextLayerMatches = evt => {
@@ -11342,14 +13478,17 @@ class TextLayerBuilder {
 
       this.eventBus._on("updatetextlayermatches", this._onUpdateTextLayerMatches);
     }
+
+    this._updateMatches();
   }
 
-  cancel() {
-    if (this.textLayerRenderTask) {
-      this.textLayerRenderTask.cancel();
-      this.textLayerRenderTask = null;
+  disable() {
+    if (!this.enabled) {
+      return;
     }
 
+    this.enabled = false;
+
     if (this._onUpdateTextLayerMatches) {
       this.eventBus._off("updatetextlayermatches", this._onUpdateTextLayerMatches);
 
@@ -11357,29 +13496,17 @@ class TextLayerBuilder {
     }
   }
 
-  setTextContentStream(readableStream) {
-    this.cancel();
-    this.textContentStream = readableStream;
-  }
-
-  setTextContent(textContent) {
-    this.cancel();
-    this.textContent = textContent;
-  }
-
   _convertMatches(matches, matchesLength) {
     if (!matches) {
       return [];
     }
 
     const {
-      findController,
       textContentItemsStr
     } = this;
     let i = 0,
         iIndex = 0;
     const end = textContentItemsStr.length - 1;
-    const queryLen = findController.state.query.length;
     const result = [];
 
     for (let m = 0, mm = matches.length; m < mm; m++) {
@@ -11400,12 +13527,7 @@ class TextLayerBuilder {
           offset: matchIdx - iIndex
         }
       };
-
-      if (matchesLength) {
-        matchIdx += matchesLength[m];
-      } else {
-        matchIdx += queryLen;
-      }
+      matchIdx += matchesLength[m];
 
       while (i !== end && matchIdx > iIndex + textContentItemsStr[i].length) {
         iIndex += textContentItemsStr[i].length;
@@ -11429,7 +13551,9 @@ class TextLayerBuilder {
 
     const {
       findController,
-      pageIdx,
+      pageIdx
+    } = this;
+    const {
       textContentItemsStr,
       textDivs
     } = this;
@@ -11445,23 +13569,33 @@ class TextLayerBuilder {
     function beginText(begin, className) {
       const divIdx = begin.divIdx;
       textDivs[divIdx].textContent = "";
-      appendTextToDiv(divIdx, 0, begin.offset, className);
+      return appendTextToDiv(divIdx, 0, begin.offset, className);
     }
 
     function appendTextToDiv(divIdx, fromOffset, toOffset, className) {
-      const div = textDivs[divIdx];
+      let div = textDivs[divIdx];
+
+      if (div.nodeType === Node.TEXT_NODE) {
+        const span = document.createElement("span");
+        div.before(span);
+        span.append(div);
+        textDivs[divIdx] = span;
+        div = span;
+      }
+
       const content = textContentItemsStr[divIdx].substring(fromOffset, toOffset);
       const node = document.createTextNode(content);
 
       if (className) {
         const span = document.createElement("span");
-        span.className = className;
-        span.appendChild(node);
-        div.appendChild(span);
-        return;
+        span.className = `${className} appended`;
+        span.append(node);
+        div.append(span);
+        return className.includes("selected") ? span.offsetLeft : 0;
       }
 
-      div.appendChild(node);
+      div.append(node);
+      return 0;
     }
 
     let i0 = selectedMatchIdx,
@@ -11480,14 +13614,7 @@ class TextLayerBuilder {
       const end = match.end;
       const isSelected = isSelectedPage && i === selectedMatchIdx;
       const highlightSuffix = isSelected ? " selected" : "";
-
-      if (isSelected) {
-        findController.scrollMatchIntoView({
-          element: textDivs[begin.divIdx],
-          pageIndex: pageIdx,
-          matchIndex: selectedMatchIdx
-        });
-      }
+      let selectedLeft = 0;
 
       if (!prevEnd || begin.divIdx !== prevEnd.divIdx) {
         if (prevEnd !== null) {
@@ -11500,9 +13627,9 @@ class TextLayerBuilder {
       }
 
       if (begin.divIdx === end.divIdx) {
-        appendTextToDiv(begin.divIdx, begin.offset, end.offset, "highlight" + highlightSuffix);
+        selectedLeft = appendTextToDiv(begin.divIdx, begin.offset, end.offset, "highlight" + highlightSuffix);
       } else {
-        appendTextToDiv(begin.divIdx, begin.offset, infinity.offset, "highlight begin" + highlightSuffix);
+        selectedLeft = appendTextToDiv(begin.divIdx, begin.offset, infinity.offset, "highlight begin" + highlightSuffix);
 
         for (let n0 = begin.divIdx + 1, n1 = end.divIdx; n0 < n1; n0++) {
           textDivs[n0].className = "highlight middle" + highlightSuffix;
@@ -11512,6 +13639,15 @@ class TextLayerBuilder {
       }
 
       prevEnd = end;
+
+      if (isSelected) {
+        findController.scrollMatchIntoView({
+          element: textDivs[begin.divIdx],
+          selectedLeft,
+          pageIndex: pageIdx,
+          matchIndex: selectedMatchIdx
+        });
+      }
     }
 
     if (prevEnd) {
@@ -11520,14 +13656,16 @@ class TextLayerBuilder {
   }
 
   _updateMatches() {
-    if (!this.renderingDone) {
+    if (!this.enabled) {
       return;
     }
 
     const {
       findController,
       matches,
-      pageIdx,
+      pageIdx
+    } = this;
+    const {
       textContentItemsStr,
       textDivs
     } = this;
@@ -11546,7 +13684,7 @@ class TextLayerBuilder {
       clearedUntilDivIdx = match.end.divIdx + 1;
     }
 
-    if (!findController || !findController.highlightMatches) {
+    if (!findController?.highlightMatches) {
       return;
     }
 
@@ -11557,6 +13695,118 @@ class TextLayerBuilder {
     this._renderMatches(this.matches);
   }
 
+}
+
+exports.TextHighlighter = TextHighlighter;
+
+/***/ }),
+/* 37 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.TextLayerBuilder = void 0;
+
+var _pdfjsLib = __webpack_require__(5);
+
+const EXPAND_DIVS_TIMEOUT = 300;
+
+class TextLayerBuilder {
+  constructor({
+    textLayerDiv,
+    eventBus,
+    pageIndex,
+    viewport,
+    highlighter = null,
+    enhanceTextSelection = false,
+    accessibilityManager = null
+  }) {
+    this.textLayerDiv = textLayerDiv;
+    this.eventBus = eventBus;
+    this.textContent = null;
+    this.textContentItemsStr = [];
+    this.textContentStream = null;
+    this.renderingDone = false;
+    this.pageNumber = pageIndex + 1;
+    this.viewport = viewport;
+    this.textDivs = [];
+    this.textLayerRenderTask = null;
+    this.highlighter = highlighter;
+    this.enhanceTextSelection = enhanceTextSelection;
+    this.accessibilityManager = accessibilityManager;
+
+    this._bindMouse();
+  }
+
+  _finishRendering() {
+    this.renderingDone = true;
+
+    if (!this.enhanceTextSelection) {
+      const endOfContent = document.createElement("div");
+      endOfContent.className = "endOfContent";
+      this.textLayerDiv.append(endOfContent);
+    }
+
+    this.eventBus.dispatch("textlayerrendered", {
+      source: this,
+      pageNumber: this.pageNumber,
+      numTextDivs: this.textDivs.length
+    });
+  }
+
+  render(timeout = 0) {
+    if (!(this.textContent || this.textContentStream) || this.renderingDone) {
+      return;
+    }
+
+    this.cancel();
+    this.textDivs.length = 0;
+    this.highlighter?.setTextMapping(this.textDivs, this.textContentItemsStr);
+    this.accessibilityManager?.setTextMapping(this.textDivs);
+    const textLayerFrag = document.createDocumentFragment();
+    this.textLayerRenderTask = (0, _pdfjsLib.renderTextLayer)({
+      textContent: this.textContent,
+      textContentStream: this.textContentStream,
+      container: textLayerFrag,
+      viewport: this.viewport,
+      textDivs: this.textDivs,
+      textContentItemsStr: this.textContentItemsStr,
+      timeout,
+      enhanceTextSelection: this.enhanceTextSelection
+    });
+    this.textLayerRenderTask.promise.then(() => {
+      this.textLayerDiv.append(textLayerFrag);
+
+      this._finishRendering();
+
+      this.highlighter?.enable();
+      this.accessibilityManager?.enable();
+    }, function (reason) {});
+  }
+
+  cancel() {
+    if (this.textLayerRenderTask) {
+      this.textLayerRenderTask.cancel();
+      this.textLayerRenderTask = null;
+    }
+
+    this.highlighter?.disable();
+    this.accessibilityManager?.disable();
+  }
+
+  setTextContentStream(readableStream) {
+    this.cancel();
+    this.textContentStream = readableStream;
+  }
+
+  setTextContent(textContent) {
+    this.cancel();
+    this.textContent = textContent;
+  }
+
   _bindMouse() {
     const div = this.textLayerDiv;
     let expandDivsTimer = null;
@@ -11616,52 +13866,129 @@ class TextLayerBuilder {
 
 exports.TextLayerBuilder = TextLayerBuilder;
 
-class DefaultTextLayerFactory {
-  createTextLayerBuilder(textLayerDiv, pageIndex, viewport, enhanceTextSelection = false, eventBus) {
-    return new TextLayerBuilder({
-      textLayerDiv,
-      pageIndex,
-      viewport,
-      enhanceTextSelection,
-      eventBus
+/***/ }),
+/* 38 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XfaLayerBuilder = void 0;
+
+var _pdfjsLib = __webpack_require__(5);
+
+class XfaLayerBuilder {
+  constructor({
+    pageDiv,
+    pdfPage,
+    annotationStorage = null,
+    linkService,
+    xfaHtml = null
+  }) {
+    this.pageDiv = pageDiv;
+    this.pdfPage = pdfPage;
+    this.annotationStorage = annotationStorage;
+    this.linkService = linkService;
+    this.xfaHtml = xfaHtml;
+    this.div = null;
+    this._cancelled = false;
+  }
+
+  render(viewport, intent = "display") {
+    if (intent === "print") {
+      const parameters = {
+        viewport: viewport.clone({
+          dontFlip: true
+        }),
+        div: this.div,
+        xfaHtml: this.xfaHtml,
+        annotationStorage: this.annotationStorage,
+        linkService: this.linkService,
+        intent
+      };
+      const div = document.createElement("div");
+      this.pageDiv.append(div);
+      parameters.div = div;
+
+      const result = _pdfjsLib.XfaLayer.render(parameters);
+
+      return Promise.resolve(result);
+    }
+
+    return this.pdfPage.getXfa().then(xfaHtml => {
+      if (this._cancelled || !xfaHtml) {
+        return {
+          textDivs: []
+        };
+      }
+
+      const parameters = {
+        viewport: viewport.clone({
+          dontFlip: true
+        }),
+        div: this.div,
+        xfaHtml,
+        annotationStorage: this.annotationStorage,
+        linkService: this.linkService,
+        intent
+      };
+
+      if (this.div) {
+        return _pdfjsLib.XfaLayer.update(parameters);
+      }
+
+      this.div = document.createElement("div");
+      this.pageDiv.append(this.div);
+      parameters.div = this.div;
+      return _pdfjsLib.XfaLayer.render(parameters);
+    }).catch(error => {
+      console.error(error);
     });
   }
 
+  cancel() {
+    this._cancelled = true;
+  }
+
+  hide() {
+    if (!this.div) {
+      return;
+    }
+
+    this.div.hidden = true;
+  }
+
 }
 
-exports.DefaultTextLayerFactory = DefaultTextLayerFactory;
+exports.XfaLayerBuilder = XfaLayerBuilder;
 
 /***/ }),
-/* 31 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 39 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.SecondaryToolbar = void 0;
 
-var _ui_utils = __webpack_require__(2);
+var _ui_utils = __webpack_require__(1);
 
-var _pdf_cursor_tools = __webpack_require__(6);
+var _pdf_cursor_tools = __webpack_require__(7);
 
-var _pdf_single_page_viewer = __webpack_require__(32);
+var _base_viewer = __webpack_require__(29);
 
 class SecondaryToolbar {
-  constructor(options, mainContainer, eventBus) {
+  constructor(options, eventBus) {
     this.toolbar = options.toolbar;
     this.toggleButton = options.toggleButton;
-    this.toolbarButtonContainer = options.toolbarButtonContainer;
     this.buttons = [{
       element: options.presentationModeButton,
       eventName: "presentationmode",
       close: true
-    }, {
-      element: options.openFileButton,
-      eventName: "openfile",
-      close: true
     }, {
       element: options.printButton,
       eventName: "print",
@@ -11704,6 +14031,13 @@ class SecondaryToolbar {
         tool: _pdf_cursor_tools.CursorTool.HAND
       },
       close: true
+    }, {
+      element: options.scrollPageButton,
+      eventName: "switchscrollmode",
+      eventDetails: {
+        mode: _ui_utils.ScrollMode.PAGE
+      },
+      close: true
     }, {
       element: options.scrollVerticalButton,
       eventName: "switchscrollmode",
@@ -11751,36 +14085,24 @@ class SecondaryToolbar {
       eventName: "documentproperties",
       close: true
     }];
+    this.buttons.push({
+      element: options.openFileButton,
+      eventName: "openfile",
+      close: true
+    });
     this.items = {
       firstPage: options.firstPageButton,
       lastPage: options.lastPageButton,
       pageRotateCw: options.pageRotateCwButton,
       pageRotateCcw: options.pageRotateCcwButton
     };
-    this.mainContainer = mainContainer;
     this.eventBus = eventBus;
     this.opened = false;
-    this.containerHeight = null;
-    this.previousContainerHeight = null;
+    this.#bindClickListeners();
+    this.#bindCursorToolsListener(options);
+    this.#bindScrollModeListener(options);
+    this.#bindSpreadModeListener(options);
     this.reset();
-
-    this._bindClickListeners();
-
-    this._bindCursorToolsListener(options);
-
-    this._bindScrollModeListener(options);
-
-    this._bindSpreadModeListener(options);
-
-    this.eventBus._on("resize", this._setMaxHeight.bind(this));
-
-    this.eventBus._on("baseviewerinit", evt => {
-      if (evt.source instanceof _pdf_single_page_viewer.PDFSinglePageViewer) {
-        this.toolbarButtonContainer.classList.add("hiddenScrollModeButtons", "hiddenSpreadModeButtons");
-      } else {
-        this.toolbarButtonContainer.classList.remove("hiddenScrollModeButtons", "hiddenSpreadModeButtons");
-      }
-    });
   }
 
   get isOpen() {
@@ -11789,35 +14111,31 @@ class SecondaryToolbar {
 
   setPageNumber(pageNumber) {
     this.pageNumber = pageNumber;
-
-    this._updateUIState();
+    this.#updateUIState();
   }
 
   setPagesCount(pagesCount) {
     this.pagesCount = pagesCount;
-
-    this._updateUIState();
+    this.#updateUIState();
   }
 
   reset() {
     this.pageNumber = 0;
     this.pagesCount = 0;
-
-    this._updateUIState();
-
+    this.#updateUIState();
     this.eventBus.dispatch("secondarytoolbarreset", {
       source: this
     });
   }
 
-  _updateUIState() {
+  #updateUIState() {
     this.items.firstPage.disabled = this.pageNumber <= 1;
     this.items.lastPage.disabled = this.pageNumber >= this.pagesCount;
     this.items.pageRotateCw.disabled = this.pagesCount === 0;
     this.items.pageRotateCcw.disabled = this.pagesCount === 0;
   }
 
-  _bindClickListeners() {
+  #bindClickListeners() {
     this.toggleButton.addEventListener("click", this.toggle.bind(this));
 
     for (const {
@@ -11826,49 +14144,77 @@ class SecondaryToolbar {
       close,
       eventDetails
     } of this.buttons) {
-      if (element) {
-	      element.addEventListener("click", evt => {
-	        if (eventName !== null) {
-	          const details = {
-	            source: this
-	          };
+        if ( element !== null ) {
+            element.addEventListener("click", evt => {
+                if (eventName !== null) {
+                    const details = {
+                        source: this
+                    };
 
-	          for (const property in eventDetails) {
-	            details[property] = eventDetails[property];
-	          }
+                    for (const property in eventDetails) {
+                        details[property] = eventDetails[property];
+                    }
 
-	          this.eventBus.dispatch(eventName, details);
-	        }
+                    this.eventBus.dispatch(eventName, details);
+                }
 
-	        if (close) {
-	          this.close();
-	        }
-	      });
-	   }
+                if (close) {
+                    this.close();
+                }
+            });
+        }
     }
   }
 
-  _bindCursorToolsListener(buttons) {
+  #bindCursorToolsListener({
+    cursorSelectToolButton,
+    cursorHandToolButton
+  }) {
     this.eventBus._on("cursortoolchanged", function ({
       tool
     }) {
-      buttons.cursorSelectToolButton.classList.toggle("toggled", tool === _pdf_cursor_tools.CursorTool.SELECT);
-      buttons.cursorHandToolButton.classList.toggle("toggled", tool === _pdf_cursor_tools.CursorTool.HAND);
+      const isSelect = tool === _pdf_cursor_tools.CursorTool.SELECT,
+            isHand = tool === _pdf_cursor_tools.CursorTool.HAND;
+      cursorSelectToolButton.classList.toggle("toggled", isSelect);
+      cursorHandToolButton.classList.toggle("toggled", isHand);
+      cursorSelectToolButton.setAttribute("aria-checked", isSelect);
+      cursorHandToolButton.setAttribute("aria-checked", isHand);
     });
   }
 
-  _bindScrollModeListener(buttons) {
-    function scrollModeChanged({
+  #bindScrollModeListener({
+    scrollPageButton,
+    scrollVerticalButton,
+    scrollHorizontalButton,
+    scrollWrappedButton,
+    spreadNoneButton,
+    spreadOddButton,
+    spreadEvenButton
+  }) {
+    const scrollModeChanged = ({
       mode
-    }) {
-      buttons.scrollVerticalButton.classList.toggle("toggled", mode === _ui_utils.ScrollMode.VERTICAL);
-      buttons.scrollHorizontalButton.classList.toggle("toggled", mode === _ui_utils.ScrollMode.HORIZONTAL);
-      buttons.scrollWrappedButton.classList.toggle("toggled", mode === _ui_utils.ScrollMode.WRAPPED);
-      const isScrollModeHorizontal = mode === _ui_utils.ScrollMode.HORIZONTAL;
-      buttons.spreadNoneButton.disabled = isScrollModeHorizontal;
-      buttons.spreadOddButton.disabled = isScrollModeHorizontal;
-      buttons.spreadEvenButton.disabled = isScrollModeHorizontal;
-    }
+    }) => {
+      const isPage = mode === _ui_utils.ScrollMode.PAGE,
+            isVertical = mode === _ui_utils.ScrollMode.VERTICAL,
+            isHorizontal = mode === _ui_utils.ScrollMode.HORIZONTAL,
+            isWrapped = mode === _ui_utils.ScrollMode.WRAPPED;
+      scrollPageButton.classList.toggle("toggled", isPage);
+      scrollVerticalButton.classList.toggle("toggled", isVertical);
+      scrollHorizontalButton.classList.toggle("toggled", isHorizontal);
+      scrollWrappedButton.classList.toggle("toggled", isWrapped);
+      scrollPageButton.setAttribute("aria-checked", isPage);
+      scrollVerticalButton.setAttribute("aria-checked", isVertical);
+      scrollHorizontalButton.setAttribute("aria-checked", isHorizontal);
+      scrollWrappedButton.setAttribute("aria-checked", isWrapped);
+      const forceScrollModePage = this.pagesCount > _base_viewer.PagesCountLimit.FORCE_SCROLL_MODE_PAGE;
+      scrollPageButton.disabled = forceScrollModePage;
+      scrollVerticalButton.disabled = forceScrollModePage;
+      scrollHorizontalButton.disabled = forceScrollModePage;
+      scrollWrappedButton.disabled = forceScrollModePage;
+      spreadNoneButton.disabled = isHorizontal;
+      spreadOddButton.disabled = isHorizontal;
+      spreadEvenButton.disabled = isHorizontal;
+    };
 
     this.eventBus._on("scrollmodechanged", scrollModeChanged);
 
@@ -11881,13 +14227,23 @@ class SecondaryToolbar {
     });
   }
 
-  _bindSpreadModeListener(buttons) {
+  #bindSpreadModeListener({
+    spreadNoneButton,
+    spreadOddButton,
+    spreadEvenButton
+  }) {
     function spreadModeChanged({
       mode
     }) {
-      buttons.spreadNoneButton.classList.toggle("toggled", mode === _ui_utils.SpreadMode.NONE);
-      buttons.spreadOddButton.classList.toggle("toggled", mode === _ui_utils.SpreadMode.ODD);
-      buttons.spreadEvenButton.classList.toggle("toggled", mode === _ui_utils.SpreadMode.EVEN);
+      const isNone = mode === _ui_utils.SpreadMode.NONE,
+            isOdd = mode === _ui_utils.SpreadMode.ODD,
+            isEven = mode === _ui_utils.SpreadMode.EVEN;
+      spreadNoneButton.classList.toggle("toggled", isNone);
+      spreadOddButton.classList.toggle("toggled", isOdd);
+      spreadEvenButton.classList.toggle("toggled", isEven);
+      spreadNoneButton.setAttribute("aria-checked", isNone);
+      spreadOddButton.setAttribute("aria-checked", isOdd);
+      spreadEvenButton.setAttribute("aria-checked", isEven);
     }
 
     this.eventBus._on("spreadmodechanged", spreadModeChanged);
@@ -11907,10 +14263,8 @@ class SecondaryToolbar {
     }
 
     this.opened = true;
-
-    this._setMaxHeight();
-
     this.toggleButton.classList.add("toggled");
+    this.toggleButton.setAttribute("aria-expanded", "true");
     this.toolbar.classList.remove("hidden");
   }
 
@@ -11922,6 +14276,7 @@ class SecondaryToolbar {
     this.opened = false;
     this.toolbar.classList.add("hidden");
     this.toggleButton.classList.remove("toggled");
+    this.toggleButton.setAttribute("aria-expanded", "false");
   }
 
   toggle() {
@@ -11932,167 +14287,31 @@ class SecondaryToolbar {
     }
   }
 
-  _setMaxHeight() {
-    if (!this.opened) {
-      return;
-    }
-
-    this.containerHeight = this.mainContainer.clientHeight;
-
-    if (this.containerHeight === this.previousContainerHeight) {
-      return;
-    }
-
-    this.toolbarButtonContainer.style.maxHeight = `${this.containerHeight - _ui_utils.SCROLLBAR_PADDING}px`;
-    this.previousContainerHeight = this.containerHeight;
-  }
-
 }
 
 exports.SecondaryToolbar = SecondaryToolbar;
 
 /***/ }),
-/* 32 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 40 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
-exports.PDFSinglePageViewer = void 0;
+}));
+exports.Toolbar = void 0;
 
-var _base_viewer = __webpack_require__(27);
+var _ui_utils = __webpack_require__(1);
 
 var _pdfjsLib = __webpack_require__(5);
 
-class PDFSinglePageViewer extends _base_viewer.BaseViewer {
-  constructor(options) {
-    super(options);
-
-    this.eventBus._on("pagesinit", evt => {
-      this._ensurePageViewVisible();
-    });
-  }
-
-  get _viewerElement() {
-    return (0, _pdfjsLib.shadow)(this, "_viewerElement", this._shadowViewer);
-  }
-
-  _resetView() {
-    super._resetView();
-
-    this._previousPageNumber = 1;
-    this._shadowViewer = document.createDocumentFragment();
-    this._updateScrollDown = null;
-  }
-
-  _ensurePageViewVisible() {
-    const pageView = this._pages[this._currentPageNumber - 1];
-    const previousPageView = this._pages[this._previousPageNumber - 1];
-    const viewerNodes = this.viewer.childNodes;
-
-    switch (viewerNodes.length) {
-      case 0:
-        this.viewer.appendChild(pageView.div);
-        break;
-
-      case 1:
-        if (viewerNodes[0] !== previousPageView.div) {
-          throw new Error("_ensurePageViewVisible: Unexpected previously visible page.");
-        }
-
-        if (pageView === previousPageView) {
-          break;
-        }
-
-        this._shadowViewer.appendChild(previousPageView.div);
-
-        this.viewer.appendChild(pageView.div);
-        this.container.scrollTop = 0;
-        break;
-
-      default:
-        throw new Error("_ensurePageViewVisible: Only one page should be visible at a time.");
-    }
-
-    this._previousPageNumber = this._currentPageNumber;
-  }
-
-  _scrollUpdate() {
-    if (this._updateScrollDown) {
-      this._updateScrollDown();
-    }
-
-    super._scrollUpdate();
-  }
-
-  _scrollIntoView({
-    pageDiv,
-    pageSpot = null,
-    pageNumber = null
-  }) {
-    if (pageNumber) {
-      this._setCurrentPageNumber(pageNumber);
-    }
-
-    const scrolledDown = this._currentPageNumber >= this._previousPageNumber;
-
-    this._ensurePageViewVisible();
-
-    this.update();
-
-    super._scrollIntoView({
-      pageDiv,
-      pageSpot,
-      pageNumber
-    });
-
-    this._updateScrollDown = () => {
-      this.scroll.down = scrolledDown;
-      this._updateScrollDown = null;
-    };
-  }
-
-  _getVisiblePages() {
-    return this._getCurrentVisiblePage();
-  }
-
-  _updateHelper(visiblePages) {}
-
-  get _isScrollModeHorizontal() {
-    return (0, _pdfjsLib.shadow)(this, "_isScrollModeHorizontal", false);
-  }
-
-  _updateScrollMode() {}
-
-  _updateSpreadMode() {}
-
-}
-
-exports.PDFSinglePageViewer = PDFSinglePageViewer;
-
-/***/ }),
-/* 33 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Toolbar = void 0;
-
-var _ui_utils = __webpack_require__(2);
-
 const PAGE_NUMBER_LOADING_INDICATOR = "visiblePageIsLoading";
-const SCALE_SELECT_CONTAINER_WIDTH = 140;
-const SCALE_SELECT_WIDTH = 162;
 
 class Toolbar {
-  constructor(options, eventBus, l10n = _ui_utils.NullL10n) {
+  #wasLocalized = false;
+
+  constructor(options, eventBus, l10n) {
     this.toolbar = options.container;
     this.eventBus = eventBus;
     this.l10n = l10n;
@@ -12108,9 +14327,6 @@ class Toolbar {
     }, {
       element: options.zoomOut,
       eventName: "zoomout"
-    }, {
-      element: options.openFile,
-      eventName: "openfile"
     }, {
       element: options.print,
       eventName: "print"
@@ -12123,11 +14339,38 @@ class Toolbar {
     }, {
       element: options.viewBookmark,
       eventName: null
+    }, {
+      element: options.editorFreeTextButton,
+      eventName: "switchannotationeditormode",
+      eventDetails: {
+        get mode() {
+          const {
+            classList
+          } = options.editorFreeTextButton;
+          return classList.contains("toggled") ? _pdfjsLib.AnnotationEditorType.NONE : _pdfjsLib.AnnotationEditorType.FREETEXT;
+        }
+
+      }
+    }, {
+      element: options.editorInkButton,
+      eventName: "switchannotationeditormode",
+      eventDetails: {
+        get mode() {
+          const {
+            classList
+          } = options.editorInkButton;
+          return classList.contains("toggled") ? _pdfjsLib.AnnotationEditorType.NONE : _pdfjsLib.AnnotationEditorType.INK;
+        }
+
+      }
     }];
+    this.buttons.push({
+      element: options.openFile,
+      eventName: "openfile"
+    });
     this.items = {
       numPages: options.numPages,
       pageNumber: options.pageNumber,
-      scaleSelectContainer: options.scaleSelectContainer,
       scaleSelect: options.scaleSelect,
       customScaleOption: options.customScaleOption,
       previous: options.previous,
@@ -12135,31 +14378,26 @@ class Toolbar {
       zoomIn: options.zoomIn,
       zoomOut: options.zoomOut
     };
-    this._wasLocalized = false;
+    this.#bindListeners(options);
     this.reset();
-
-    this._bindListeners();
   }
 
   setPageNumber(pageNumber, pageLabel) {
     this.pageNumber = pageNumber;
     this.pageLabel = pageLabel;
-
-    this._updateUIState(false);
+    this.#updateUIState(false);
   }
 
   setPagesCount(pagesCount, hasPageLabels) {
     this.pagesCount = pagesCount;
     this.hasPageLabels = hasPageLabels;
-
-    this._updateUIState(true);
+    this.#updateUIState(true);
   }
 
   setPageScale(pageScaleValue, pageScale) {
     this.pageScaleValue = (pageScaleValue || pageScale).toString();
     this.pageScale = pageScale;
-
-    this._updateUIState(false);
+    this.#updateUIState(false);
   }
 
   reset() {
@@ -12169,13 +14407,14 @@ class Toolbar {
     this.pagesCount = 0;
     this.pageScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
     this.pageScale = _ui_utils.DEFAULT_SCALE;
-
-    this._updateUIState(true);
-
+    this.#updateUIState(true);
     this.updateLoadingIndicatorState();
+    this.eventBus.dispatch("toolbarreset", {
+      source: this
+    });
   }
 
-  _bindListeners() {
+  #bindListeners(options) {
     const {
       pageNumber,
       scaleSelect
@@ -12184,14 +14423,23 @@ class Toolbar {
 
     for (const {
       element,
-      eventName
+      eventName,
+      eventDetails
     } of this.buttons) {
-        if (element) {
+        if ( element !== null ) {
             element.addEventListener("click", evt => {
                 if (eventName !== null) {
-                    this.eventBus.dispatch(eventName, {
+                    const details = {
                         source: this
-                    });
+                    };
+
+                    if (eventDetails) {
+                        for (const property in eventDetails) {
+                            details[property] = eventDetails[property];
+                        }
+                    }
+
+                    this.eventBus.dispatch(eventName, details);
                 }
             });
         }
@@ -12216,19 +14464,67 @@ class Toolbar {
         value: this.value
       });
     });
+    scaleSelect.addEventListener("click", function (evt) {
+      const target = evt.target;
+
+      if (this.value === self.pageScaleValue && target.tagName.toUpperCase() === "OPTION") {
+        this.blur();
+      }
+    });
     scaleSelect.oncontextmenu = _ui_utils.noContextMenuHandler;
 
     this.eventBus._on("localized", () => {
-      this._wasLocalized = true;
+      this.#wasLocalized = true;
+      this.#adjustScaleWidth();
+      this.#updateUIState(true);
+    });
 
-      this._adjustScaleWidth();
+    this.#bindEditorToolsListener(options);
+  }
 
-      this._updateUIState(true);
+  #bindEditorToolsListener({
+    editorFreeTextButton,
+    editorFreeTextParamsToolbar,
+    editorInkButton,
+    editorInkParamsToolbar
+  }) {
+    const editorModeChanged = (evt, disableButtons = false) => {
+      const editorButtons = [{
+        mode: _pdfjsLib.AnnotationEditorType.FREETEXT,
+        button: editorFreeTextButton,
+        toolbar: editorFreeTextParamsToolbar
+      }, {
+        mode: _pdfjsLib.AnnotationEditorType.INK,
+        button: editorInkButton,
+        toolbar: editorInkParamsToolbar
+      }];
+
+      for (const {
+        mode,
+        button,
+        toolbar
+      } of editorButtons) {
+        const checked = mode === evt.mode;
+        button.classList.toggle("toggled", checked);
+        button.setAttribute("aria-checked", checked);
+        button.disabled = disableButtons;
+        toolbar?.classList.toggle("hidden", !checked);
+      }
+    };
+
+    this.eventBus._on("annotationeditormodechanged", editorModeChanged);
+
+    this.eventBus._on("toolbarreset", evt => {
+      if (evt.source === this) {
+        editorModeChanged({
+          mode: _pdfjsLib.AnnotationEditorType.NONE
+        }, true);
+      }
     });
   }
 
-  _updateUIState(resetNumPages = false) {
-    if (!this._wasLocalized) {
+  #updateUIState(resetNumPages = false) {
+    if (!this.#wasLocalized) {
       return;
     }
 
@@ -12247,7 +14543,7 @@ class Toolbar {
         items.pageNumber.type = "number";
         this.l10n.get("of_pages", {
           pagesCount
-        }, "of {{pagesCount}}").then(msg => {
+        }).then(msg => {
           items.numPages.textContent = msg;
         });
       }
@@ -12260,7 +14556,7 @@ class Toolbar {
       this.l10n.get("page_of_pages", {
         pageNumber,
         pagesCount
-      }, "({{pageNumber}} of {{pagesCount}})").then(msg => {
+      }).then(msg => {
         items.numPages.textContent = msg;
       });
     } else {
@@ -12271,10 +14567,9 @@ class Toolbar {
     items.next.disabled = pageNumber >= pagesCount;
     items.zoomOut.disabled = pageScale <= _ui_utils.MIN_SCALE;
     items.zoomIn.disabled = pageScale >= _ui_utils.MAX_SCALE;
-    const customScale = Math.round(pageScale * 10000) / 100;
     this.l10n.get("page_scale_percent", {
-      scale: customScale
-    }, "{{scale}}%").then(msg => {
+      scale: Math.round(pageScale * 10000) / 100
+    }).then(msg => {
       let predefinedValueFound = false;
 
       for (const option of items.scaleSelect.options) {
@@ -12295,27 +14590,27 @@ class Toolbar {
   }
 
   updateLoadingIndicatorState(loading = false) {
-    const pageNumberInput = this.items.pageNumber;
-    pageNumberInput.classList.toggle(PAGE_NUMBER_LOADING_INDICATOR, loading);
+    const {
+      pageNumber
+    } = this.items;
+    pageNumber.classList.toggle(PAGE_NUMBER_LOADING_INDICATOR, loading);
   }
 
-  async _adjustScaleWidth() {
+  async #adjustScaleWidth() {
     const {
       items,
       l10n
     } = this;
-    const predefinedValuesPromise = Promise.all([l10n.get("page_scale_auto", null, "Automatic Zoom"), l10n.get("page_scale_actual", null, "Actual Size"), l10n.get("page_scale_fit", null, "Page Fit"), l10n.get("page_scale_width", null, "Page Width")]);
-    let canvas = document.createElement("canvas");
-    canvas.mozOpaque = true;
-    let ctx = canvas.getContext("2d", {
+    const predefinedValuesPromise = Promise.all([l10n.get("page_scale_auto"), l10n.get("page_scale_actual"), l10n.get("page_scale_fit"), l10n.get("page_scale_width")]);
+    await _ui_utils.animationStarted;
+    const style = getComputedStyle(items.scaleSelect),
+          scaleSelectContainerWidth = parseInt(style.getPropertyValue("--scale-select-container-width"), 10),
+          scaleSelectOverflow = parseInt(style.getPropertyValue("--scale-select-overflow"), 10);
+    const canvas = document.createElement("canvas");
+    const ctx = canvas.getContext("2d", {
       alpha: false
     });
-    await _ui_utils.animationStarted;
-    const {
-      fontSize,
-      fontFamily
-    } = getComputedStyle(items.scaleSelect);
-    ctx.font = `${fontSize} ${fontFamily}`;
+    ctx.font = `${style.fontSize} ${style.fontFamily}`;
     let maxWidth = 0;
 
     for (const predefinedValue of await predefinedValuesPromise) {
@@ -12328,17 +14623,14 @@ class Toolbar {
       }
     }
 
-    const overflow = SCALE_SELECT_WIDTH - SCALE_SELECT_CONTAINER_WIDTH;
-    maxWidth += 2 * overflow;
+    maxWidth += 2 * scaleSelectOverflow;
 
-    if (maxWidth > SCALE_SELECT_CONTAINER_WIDTH) {
-      items.scaleSelect.style.width = `${maxWidth + overflow}px`;
-      items.scaleSelectContainer.style.width = `${maxWidth}px`;
+    if (maxWidth > scaleSelectContainerWidth) {
+      _ui_utils.docStyle.setProperty("--scale-select-container-width", `${maxWidth}px`);
     }
 
     canvas.width = 0;
     canvas.height = 0;
-    canvas = ctx = null;
   }
 
 }
@@ -12346,15 +14638,14 @@ class Toolbar {
 exports.Toolbar = Toolbar;
 
 /***/ }),
-/* 34 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 41 */
+/***/ ((__unused_webpack_module, exports) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.ViewHistory = void 0;
 const DEFAULT_VIEW_HISTORY_CACHE_SIZE = 20;
 
@@ -12442,24 +14733,25 @@ class ViewHistory {
 exports.ViewHistory = ViewHistory;
 
 /***/ }),
-/* 35 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 42 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.GenericCom = void 0;
 
-var _app = __webpack_require__(1);
+var _app = __webpack_require__(4);
 
-var _preferences = __webpack_require__(36);
+var _preferences = __webpack_require__(43);
 
-var _download_manager = __webpack_require__(37);
+var _download_manager = __webpack_require__(44);
 
-var _genericl10n = __webpack_require__(38);
+var _genericl10n = __webpack_require__(45);
+
+var _generic_scripting = __webpack_require__(47);
 
 ;
 const GenericCom = {};
@@ -12478,7 +14770,7 @@ class GenericPreferences extends _preferences.BasePreferences {
 
 class GenericExternalServices extends _app.DefaultExternalServices {
   static createDownloadManager(options) {
-    return new _download_manager.DownloadManager(options);
+    return new _download_manager.DownloadManager();
   }
 
   static createPreferences() {
@@ -12491,87 +14783,75 @@ class GenericExternalServices extends _app.DefaultExternalServices {
     return new _genericl10n.GenericL10n(locale);
   }
 
+  static createScripting({
+    sandboxBundleSrc
+  }) {
+    return new _generic_scripting.GenericScripting(sandboxBundleSrc);
+  }
+
 }
 
 _app.PDFViewerApplication.externalServices = GenericExternalServices;
 
 /***/ }),
-/* 36 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 43 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.BasePreferences = void 0;
 
-var _app_options = __webpack_require__(3);
-
-let defaultPreferences = null;
-
-function getDefaultPreferences() {
-  if (!defaultPreferences) {
-    defaultPreferences = Promise.resolve({
-      "cursorToolOnLoad": 0,
-      "defaultZoomValue": "",
-      "disablePageLabels": false,
-      "enablePermissions": false,
-      "enablePrintAutoRotate": false,
-      "enableWebGL": false,
-      "externalLinkTarget": 0,
-      "historyUpdateUrl": false,
-      "ignoreDestinationZoom": false,
-      "pdfBugEnabled": false,
-      "renderer": "canvas",
-      "renderInteractiveForms": true,
-      "sidebarViewOnLoad": -1,
-      "scrollModeOnLoad": -1,
-      "spreadModeOnLoad": -1,
-      "textLayerMode": 1,
-      "useOnlyCssZoom": false,
-      "viewOnLoad": 0,
-      "disableAutoFetch": false,
-      "disableFontFace": false,
-      "disableRange": false,
-      "disableStream": false
-    });
-  }
-
-  return defaultPreferences;
-}
+var _app_options = __webpack_require__(2);
 
 class BasePreferences {
+  #defaults = Object.freeze({
+    "annotationEditorMode": -1,
+    "annotationMode": 2,
+    "cursorToolOnLoad": 0,
+    "defaultZoomValue": "",
+    "disablePageLabels": false,
+    "enablePermissions": false,
+    "enablePrintAutoRotate": true,
+    "enableScripting": true,
+    "externalLinkTarget": 0,
+    "historyUpdateUrl": false,
+    "ignoreDestinationZoom": false,
+    "forcePageColors": false,
+    "pageColorsBackground": "Canvas",
+    "pageColorsForeground": "CanvasText",
+    "pdfBugEnabled": false,
+    "sidebarViewOnLoad": -1,
+    "scrollModeOnLoad": -1,
+    "spreadModeOnLoad": -1,
+    "textLayerMode": 1,
+    "useOnlyCssZoom": false,
+    "viewerCssTheme": 0,
+    "viewOnLoad": 0,
+    "disableAutoFetch": false,
+    "disableFontFace": false,
+    "disableRange": false,
+    "disableStream": false,
+    "enableXfa": true,
+    "renderer": "canvas"
+  });
+  #prefs = Object.create(null);
+  #initializedPromise = null;
+
   constructor() {
     if (this.constructor === BasePreferences) {
       throw new Error("Cannot initialize BasePreferences.");
     }
 
-    this.prefs = null;
-    this._initializedPromise = getDefaultPreferences().then(defaults => {
-      Object.defineProperty(this, "defaults", {
-        value: Object.freeze(defaults),
-        writable: false,
-        enumerable: true,
-        configurable: false
-      });
-      this.prefs = Object.assign(Object.create(null), defaults);
-      return this._readFromStorage(defaults);
-    }).then(prefs => {
-      if (!prefs) {
-        return;
-      }
+    this.#initializedPromise = this._readFromStorage(this.#defaults).then(prefs => {
+      for (const name in this.#defaults) {
+        const prefValue = prefs?.[name];
 
-      for (const name in prefs) {
-        const defaultValue = this.defaults[name],
-              prefValue = prefs[name];
-
-        if (defaultValue === undefined || typeof prefValue !== typeof defaultValue) {
-          continue;
+        if (typeof prefValue === typeof this.#defaults[name]) {
+          this.#prefs[name] = prefValue;
         }
-
-        this.prefs[name] = prefValue;
       }
     });
   }
@@ -12585,14 +14865,19 @@ class BasePreferences {
   }
 
   async reset() {
-    await this._initializedPromise;
-    this.prefs = Object.assign(Object.create(null), this.defaults);
-    return this._writeToStorage(this.defaults);
+    await this.#initializedPromise;
+    const prefs = this.#prefs;
+    this.#prefs = Object.create(null);
+    return this._writeToStorage(this.#defaults).catch(reason => {
+      this.#prefs = prefs;
+      throw reason;
+    });
   }
 
   async set(name, value) {
-    await this._initializedPromise;
-    const defaultValue = this.defaults[name];
+    await this.#initializedPromise;
+    const defaultValue = this.#defaults[name],
+          prefs = this.#prefs;
 
     if (defaultValue === undefined) {
       throw new Error(`Set preference: "${name}" is undefined.`);
@@ -12600,14 +14885,14 @@ class BasePreferences {
       throw new Error("Set preference: no value is specified.");
     }
 
-    const valueType = typeof value;
-    const defaultType = typeof defaultValue;
+    const valueType = typeof value,
+          defaultType = typeof defaultValue;
 
     if (valueType !== defaultType) {
       if (valueType === "number" && defaultType === "string") {
         value = value.toString();
       } else {
-        throw new Error(`Set preference: "${value}" is a ${valueType}, ` + `expected a ${defaultType}.`);
+        throw new Error(`Set preference: "${value}" is a ${valueType}, expected a ${defaultType}.`);
       }
     } else {
       if (valueType === "number" && !Number.isInteger(value)) {
@@ -12615,30 +14900,33 @@ class BasePreferences {
       }
     }
 
-    this.prefs[name] = value;
-    return this._writeToStorage(this.prefs);
+    this.#prefs[name] = value;
+    return this._writeToStorage(this.#prefs).catch(reason => {
+      this.#prefs = prefs;
+      throw reason;
+    });
   }
 
   async get(name) {
-    await this._initializedPromise;
-    const defaultValue = this.defaults[name];
+    await this.#initializedPromise;
+    const defaultValue = this.#defaults[name];
 
     if (defaultValue === undefined) {
       throw new Error(`Get preference: "${name}" is undefined.`);
-    } else {
-      const prefValue = this.prefs[name];
-
-      if (prefValue !== undefined) {
-        return prefValue;
-      }
     }
 
-    return defaultValue;
+    return this.#prefs[name] ?? defaultValue;
   }
 
   async getAll() {
-    await this._initializedPromise;
-    return Object.assign(Object.create(null), this.defaults, this.prefs);
+    await this.#initializedPromise;
+    const obj = Object.create(null);
+
+    for (const name in this.#defaults) {
+      obj[name] = this.#prefs[name] ?? this.#defaults[name];
+    }
+
+    return obj;
   }
 
 }
@@ -12646,21 +14934,18 @@ class BasePreferences {
 exports.BasePreferences = BasePreferences;
 
 /***/ }),
-/* 37 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 44 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.DownloadManager = void 0;
 
 var _pdfjsLib = __webpack_require__(5);
 
-var _viewer_compatibility = __webpack_require__(4);
-
 ;
 
 function download(blobUrl, filename) {
@@ -12677,14 +14962,19 @@ function download(blobUrl, filename) {
     a.download = filename;
   }
 
-  (document.body || document.documentElement).appendChild(a);
+  (document.body || document.documentElement).append(a);
   a.click();
   a.remove();
 }
 
 class DownloadManager {
+  constructor() {
+    this._openBlobUrls = new WeakMap();
+  }
+
   downloadUrl(url, filename) {
     if (!(0, _pdfjsLib.createValidAbsoluteUrl)(url, "http://example.com")) {
+      console.error(`downloadUrl - not a valid URL: ${url}`);
       return;
     }
 
@@ -12692,31 +14982,46 @@ class DownloadManager {
   }
 
   downloadData(data, filename, contentType) {
-    if (navigator.msSaveBlob) {
-      navigator.msSaveBlob(new Blob([data], {
-        type: contentType
-      }), filename);
-      return;
-    }
-
-    const blobUrl = (0, _pdfjsLib.createObjectURL)(data, contentType, _viewer_compatibility.viewerCompatibilityParams.disableCreateObjectURL);
+    const blobUrl = URL.createObjectURL(new Blob([data], {
+      type: contentType
+    }));
     download(blobUrl, filename);
   }
 
-  download(blob, url, filename, sourceEventType = "download") {
-    if (navigator.msSaveBlob) {
-      if (!navigator.msSaveBlob(blob, filename)) {
-        this.downloadUrl(url, filename);
+  openOrDownloadData(element, data, filename) {
+    const isPdfData = (0, _pdfjsLib.isPdfFile)(filename);
+    const contentType = isPdfData ? "application/pdf" : "";
+
+    if (isPdfData) {
+      let blobUrl = this._openBlobUrls.get(element);
+
+      if (!blobUrl) {
+        blobUrl = URL.createObjectURL(new Blob([data], {
+          type: contentType
+        }));
+
+        this._openBlobUrls.set(element, blobUrl);
       }
 
-      return;
+      let viewerUrl;
+      viewerUrl = "?file=" + encodeURIComponent(blobUrl + "#" + filename);
+
+      try {
+        window.open(viewerUrl);
+        return true;
+      } catch (ex) {
+        console.error(`openOrDownloadData: ${ex}`);
+        URL.revokeObjectURL(blobUrl);
+
+        this._openBlobUrls.delete(element);
+      }
     }
 
-    if (_viewer_compatibility.viewerCompatibilityParams.disableCreateObjectURL) {
-      this.downloadUrl(url, filename);
-      return;
-    }
+    this.downloadData(data, filename, contentType);
+    return false;
+  }
 
+  download(blob, url, filename) {
     const blobUrl = URL.createObjectURL(blob);
     download(blobUrl, filename);
   }
@@ -12726,18 +15031,19 @@ class DownloadManager {
 exports.DownloadManager = DownloadManager;
 
 /***/ }),
-/* 38 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 45 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
 exports.GenericL10n = void 0;
 
-__webpack_require__(39);
+__webpack_require__(46);
+
+var _l10n_utils = __webpack_require__(31);
 
 const webL10n = document.webL10n;
 
@@ -12745,7 +15051,7 @@ class GenericL10n {
   constructor(lang) {
     this._lang = lang;
     this._ready = new Promise((resolve, reject) => {
-      webL10n.setLanguage(lang, () => {
+      webL10n.setLanguage((0, _l10n_utils.fixupLangCode)(lang), () => {
         resolve(webL10n);
       });
     });
@@ -12761,9 +15067,9 @@ class GenericL10n {
     return l10n.getDirection();
   }
 
-  async get(property, args, fallback) {
+  async get(key, args = null, fallback = (0, _l10n_utils.getL10nFallback)(key, args)) {
     const l10n = await this._ready;
-    return l10n.get(property, args, fallback);
+    return l10n.get(key, args, fallback);
   }
 
   async translate(element) {
@@ -12776,10 +15082,9 @@ class GenericL10n {
 exports.GenericL10n = GenericL10n;
 
 /***/ }),
-/* 39 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 46 */
+/***/ (() => {
 
-"use strict";
 
 
 document.webL10n = function (window, document, undefined) {
@@ -13491,7 +15796,7 @@ document.webL10n = function (window, document, undefined) {
 
         if (!found) {
           var textNode = document.createTextNode(data[gTextProp]);
-          element.insertBefore(textNode, element.firstChild);
+          element.prepend(textNode);
         }
       }
 
@@ -13599,39 +15904,105 @@ document.webL10n = function (window, document, undefined) {
 }(window, document);
 
 /***/ }),
-/* 40 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 47 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
-Object.defineProperty(exports, "__esModule", {
+
+Object.defineProperty(exports, "__esModule", ({
   value: true
-});
+}));
+exports.GenericScripting = void 0;
+exports.docPropertiesLookup = docPropertiesLookup;
+
+var _pdfjsLib = __webpack_require__(5);
+
+async function docPropertiesLookup(pdfDocument) {
+  const url = "",
+        baseUrl = url.split("#")[0];
+  let {
+    info,
+    metadata,
+    contentDispositionFilename,
+    contentLength
+  } = await pdfDocument.getMetadata();
+
+  if (!contentLength) {
+    const {
+      length
+    } = await pdfDocument.getDownloadInfo();
+    contentLength = length;
+  }
+
+  return { ...info,
+    baseURL: baseUrl,
+    filesize: contentLength,
+    filename: contentDispositionFilename || (0, _pdfjsLib.getPdfFilenameFromUrl)(url),
+    metadata: metadata?.getRaw(),
+    authors: metadata?.get("dc:creator"),
+    numPages: pdfDocument.numPages,
+    URL: url
+  };
+}
+
+class GenericScripting {
+  constructor(sandboxBundleSrc) {
+    this._ready = (0, _pdfjsLib.loadScript)(sandboxBundleSrc, true).then(() => {
+      return window.pdfjsSandbox.QuickJSSandbox();
+    });
+  }
+
+  async createSandbox(data) {
+    const sandbox = await this._ready;
+    sandbox.create(data);
+  }
+
+  async dispatchEventInSandbox(event) {
+    const sandbox = await this._ready;
+    setTimeout(() => sandbox.dispatchEvent(event), 0);
+  }
+
+  async destroySandbox() {
+    const sandbox = await this._ready;
+    sandbox.nukeSandbox();
+  }
+
+}
+
+exports.GenericScripting = GenericScripting;
+
+/***/ }),
+/* 48 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
 exports.PDFPrintService = PDFPrintService;
 
-var _ui_utils = __webpack_require__(2);
+var _pdfjsLib = __webpack_require__(5);
 
-var _app = __webpack_require__(1);
+var _app = __webpack_require__(4);
 
-var _viewer_compatibility = __webpack_require__(4);
+var _print_utils = __webpack_require__(49);
 
 let activeService = null;
+let dialog = null;
 let overlayManager = null;
 
-function renderPage(activeServiceOnEntry, pdfDocument, pageNumber, size, printResolution, optionalContentConfigPromise) {
+function renderPage(activeServiceOnEntry, pdfDocument, pageNumber, size, printResolution, optionalContentConfigPromise, printAnnotationStoragePromise) {
   const scratchCanvas = activeService.scratchCanvas;
-  const PRINT_UNITS = printResolution / 72.0;
+  const PRINT_UNITS = printResolution / _pdfjsLib.PixelsPerInch.PDF;
   scratchCanvas.width = Math.floor(size.width * PRINT_UNITS);
   scratchCanvas.height = Math.floor(size.height * PRINT_UNITS);
-  const width = Math.floor(size.width * _ui_utils.CSS_UNITS) + "px";
-  const height = Math.floor(size.height * _ui_utils.CSS_UNITS) + "px";
   const ctx = scratchCanvas.getContext("2d");
   ctx.save();
   ctx.fillStyle = "rgb(255, 255, 255)";
   ctx.fillRect(0, 0, scratchCanvas.width, scratchCanvas.height);
   ctx.restore();
-  return pdfDocument.getPage(pageNumber).then(function (pdfPage) {
+  return Promise.all([pdfDocument.getPage(pageNumber), printAnnotationStoragePromise]).then(function ([pdfPage, printAnnotationStorage]) {
     const renderContext = {
       canvasContext: ctx,
       transform: [PRINT_UNITS, 0, 0, PRINT_UNITS, 0, 0],
@@ -13640,25 +16011,22 @@ function renderPage(activeServiceOnEntry, pdfDocument, pageNumber, size, printRe
         rotation: size.rotation
       }),
       intent: "print",
-      annotationStorage: pdfDocument.annotationStorage,
-      optionalContentConfigPromise
+      annotationMode: _pdfjsLib.AnnotationMode.ENABLE_STORAGE,
+      optionalContentConfigPromise,
+      printAnnotationStorage
     };
     return pdfPage.render(renderContext).promise;
-  }).then(function () {
-    return {
-      width,
-      height
-    };
   });
 }
 
-function PDFPrintService(pdfDocument, pagesOverview, printContainer, printResolution, optionalContentConfigPromise = null, l10n) {
+function PDFPrintService(pdfDocument, pagesOverview, printContainer, printResolution, optionalContentConfigPromise = null, printAnnotationStoragePromise = null, l10n) {
   this.pdfDocument = pdfDocument;
   this.pagesOverview = pagesOverview;
   this.printContainer = printContainer;
   this._printResolution = printResolution || 150;
   this._optionalContentConfigPromise = optionalContentConfigPromise || pdfDocument.getOptionalContentConfig();
-  this.l10n = l10n || _ui_utils.NullL10n;
+  this._printAnnotationStoragePromise = printAnnotationStoragePromise || Promise.resolve();
+  this.l10n = l10n;
   this.currentPage = -1;
   this.scratchCanvas = document.createElement("canvas");
 }
@@ -13678,8 +16046,8 @@ PDFPrintService.prototype = {
 
     this.pageStyleSheet = document.createElement("style");
     const pageSize = this.pagesOverview[0];
-    this.pageStyleSheet.textContent = "@supports ((size:A4) and (size:1pt 1pt)) {" + "@page { size: " + pageSize.width + "pt " + pageSize.height + "pt;}" + "}";
-    body.appendChild(this.pageStyleSheet);
+    this.pageStyleSheet.textContent = "@page { size: " + pageSize.width + "pt " + pageSize.height + "pt;}";
+    body.append(this.pageStyleSheet);
   },
 
   destroy() {
@@ -13700,15 +16068,18 @@ PDFPrintService.prototype = {
     this.scratchCanvas = null;
     activeService = null;
     ensureOverlay().then(function () {
-      if (overlayManager.active !== "printServiceOverlay") {
-        return;
+      if (overlayManager.active === dialog) {
+        overlayManager.close(dialog);
       }
-
-      overlayManager.close("printServiceOverlay");
     });
   },
 
   renderPages() {
+    if (this.pdfDocument.isPureXfa) {
+      (0, _print_utils.getXfaHtmlForPrinting)(this.printContainer, this.pdfDocument);
+      return Promise.resolve();
+    }
+
     const pageCount = this.pagesOverview.length;
 
     const renderNextPage = (resolve, reject) => {
@@ -13722,7 +16093,7 @@ PDFPrintService.prototype = {
 
       const index = this.currentPage;
       renderProgress(index, pageCount, this.l10n);
-      renderPage(this, this.pdfDocument, index + 1, this.pagesOverview[index], this._printResolution, this._optionalContentConfigPromise).then(this.useRenderedPage.bind(this)).then(function () {
+      renderPage(this, this.pdfDocument, index + 1, this.pagesOverview[index], this._printResolution, this._optionalContentConfigPromise, this._printAnnotationStoragePromise).then(this.useRenderedPage.bind(this)).then(function () {
         renderNextPage(resolve, reject);
       }, reject);
     };
@@ -13730,14 +16101,12 @@ PDFPrintService.prototype = {
     return new Promise(renderNextPage);
   },
 
-  useRenderedPage(printItem) {
+  useRenderedPage() {
     this.throwIfInactive();
     const img = document.createElement("img");
-    img.style.width = printItem.width;
-    img.style.height = printItem.height;
     const scratchCanvas = this.scratchCanvas;
 
-    if ("toBlob" in scratchCanvas && !_viewer_compatibility.viewerCompatibilityParams.disableCreateObjectURL) {
+    if ("toBlob" in scratchCanvas) {
       scratchCanvas.toBlob(function (blob) {
         img.src = URL.createObjectURL(blob);
       });
@@ -13746,8 +16115,9 @@ PDFPrintService.prototype = {
     }
 
     const wrapper = document.createElement("div");
-    wrapper.appendChild(img);
-    this.printContainer.appendChild(wrapper);
+    wrapper.className = "printedPage";
+    wrapper.append(img);
+    this.printContainer.append(wrapper);
     return new Promise(function (resolve, reject) {
       img.onload = resolve;
       img.onerror = reject;
@@ -13790,7 +16160,7 @@ window.print = function () {
 
   ensureOverlay().then(function () {
     if (activeService) {
-      overlayManager.open("printServiceOverlay");
+      overlayManager.open(dialog);
     }
   });
 
@@ -13800,8 +16170,8 @@ window.print = function () {
     if (!activeService) {
       console.error("Expected print service to be initialized.");
       ensureOverlay().then(function () {
-        if (overlayManager.active === "printServiceOverlay") {
-          overlayManager.close("printServiceOverlay");
+        if (overlayManager.active === dialog) {
+          overlayManager.close(dialog);
         }
       });
       return;
@@ -13832,14 +16202,14 @@ function abort() {
 }
 
 function renderProgress(index, total, l10n) {
-  const progressContainer = document.getElementById("printServiceOverlay");
+  dialog ||= document.getElementById("printServiceDialog");
   const progress = Math.round(100 * index / total);
-  const progressBar = progressContainer.querySelector("progress");
-  const progressPerc = progressContainer.querySelector(".relative-progress");
+  const progressBar = dialog.querySelector("progress");
+  const progressPerc = dialog.querySelector(".relative-progress");
   progressBar.value = progress;
   l10n.get("print_progress_percent", {
     progress
-  }, progress + "%").then(msg => {
+  }).then(msg => {
     progressPerc.textContent = msg;
   });
 }
@@ -13878,8 +16248,10 @@ function ensureOverlay() {
       throw new Error("The overlay manager has not yet been initialized.");
     }
 
-    overlayPromise = overlayManager.register("printServiceOverlay", document.getElementById("printServiceOverlay"), abort, true);
+    dialog ||= document.getElementById("printServiceDialog");
+    overlayPromise = overlayManager.register(dialog, true);
     document.getElementById("printCancel").onclick = abort;
+    dialog.addEventListener("close", abort);
   }
 
   return overlayPromise;
@@ -13888,17 +16260,295 @@ function ensureOverlay() {
 _app.PDFPrintServiceFactory.instance = {
   supportsPrinting: true,
 
-  createPrintService(pdfDocument, pagesOverview, printContainer, printResolution, optionalContentConfigPromise, l10n) {
+  createPrintService(pdfDocument, pagesOverview, printContainer, printResolution, optionalContentConfigPromise, printAnnotationStoragePromise, l10n) {
     if (activeService) {
       throw new Error("The print service is created and active.");
     }
 
-    activeService = new PDFPrintService(pdfDocument, pagesOverview, printContainer, printResolution, optionalContentConfigPromise, l10n);
+    activeService = new PDFPrintService(pdfDocument, pagesOverview, printContainer, printResolution, optionalContentConfigPromise, printAnnotationStoragePromise, l10n);
     return activeService;
   }
 
 };
 
+/***/ }),
+/* 49 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.getXfaHtmlForPrinting = getXfaHtmlForPrinting;
+
+var _pdfjsLib = __webpack_require__(5);
+
+var _pdf_link_service = __webpack_require__(3);
+
+var _xfa_layer_builder = __webpack_require__(38);
+
+function getXfaHtmlForPrinting(printContainer, pdfDocument) {
+  const xfaHtml = pdfDocument.allXfaHtml;
+  const linkService = new _pdf_link_service.SimpleLinkService();
+  const scale = Math.round(_pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS * 100) / 100;
+
+  for (const xfaPage of xfaHtml.children) {
+    const page = document.createElement("div");
+    page.className = "xfaPrintedPage";
+    printContainer.append(page);
+    const builder = new _xfa_layer_builder.XfaLayerBuilder({
+      pageDiv: page,
+      pdfPage: null,
+      annotationStorage: pdfDocument.annotationStorage,
+      linkService,
+      xfaHtml: xfaPage
+    });
+    const viewport = (0, _pdfjsLib.getXfaPageViewport)(xfaPage, {
+      scale
+    });
+    builder.render(viewport, "print");
+  }
+}
+
 /***/ })
-/******/ ]);
+/******/ 	]);
+/************************************************************************/
+/******/ 	// The module cache
+/******/ 	var __webpack_module_cache__ = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/ 		// Check if module is in cache
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = __webpack_module_cache__[moduleId] = {
+/******/ 			// no module.id needed
+/******/ 			// no module.loaded needed
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/************************************************************************/
+var __webpack_exports__ = {};
+// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
+(() => {
+var exports = __webpack_exports__;
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+Object.defineProperty(exports, "PDFViewerApplication", ({
+  enumerable: true,
+  get: function () {
+    return _app.PDFViewerApplication;
+  }
+}));
+exports.PDFViewerApplicationConstants = void 0;
+Object.defineProperty(exports, "PDFViewerApplicationOptions", ({
+  enumerable: true,
+  get: function () {
+    return _app_options.AppOptions;
+  }
+}));
+
+var _ui_utils = __webpack_require__(1);
+
+var _app_options = __webpack_require__(2);
+
+var _pdf_link_service = __webpack_require__(3);
+
+var _app = __webpack_require__(4);
+
+const pdfjsVersion = '2.16.105';
+const pdfjsBuild = '172ccdbe5';
+const AppConstants = {
+  LinkTarget: _pdf_link_service.LinkTarget,
+  RenderingStates: _ui_utils.RenderingStates,
+  ScrollMode: _ui_utils.ScrollMode,
+  SpreadMode: _ui_utils.SpreadMode
+};
+exports.PDFViewerApplicationConstants = AppConstants;
+window.PDFViewerApplication = _app.PDFViewerApplication;
+window.PDFViewerApplicationConstants = AppConstants;
+window.PDFViewerApplicationOptions = _app_options.AppOptions;
+;
+;
+{
+  __webpack_require__(42);
+}
+;
+{
+  __webpack_require__(48);
+}
+
+function getViewerConfiguration() {
+  let errorWrapper = null;
+  errorWrapper = {
+    container: document.getElementById("errorWrapper"),
+    errorMessage: document.getElementById("errorMessage"),
+    closeButton: document.getElementById("errorClose"),
+    errorMoreInfo: document.getElementById("errorMoreInfo"),
+    moreInfoButton: document.getElementById("errorShowMore"),
+    lessInfoButton: document.getElementById("errorShowLess")
+  };
+  return {
+    appContainer: document.body,
+    mainContainer: document.getElementById("viewerContainer"),
+    viewerContainer: document.getElementById("viewer"),
+    toolbar: {
+      container: document.getElementById("toolbarViewer"),
+      numPages: document.getElementById("numPages"),
+      pageNumber: document.getElementById("pageNumber"),
+      scaleSelect: document.getElementById("scaleSelect"),
+      customScaleOption: document.getElementById("customScaleOption"),
+      previous: document.getElementById("previous"),
+      next: document.getElementById("next"),
+      zoomIn: document.getElementById("zoomIn"),
+      zoomOut: document.getElementById("zoomOut"),
+      viewFind: document.getElementById("viewFind"),
+      openFile: document.getElementById("openFile"),
+      print: document.getElementById("print"),
+      editorFreeTextButton: document.getElementById("editorFreeText"),
+      editorFreeTextParamsToolbar: document.getElementById("editorFreeTextParamsToolbar"),
+      editorInkButton: document.getElementById("editorInk"),
+      editorInkParamsToolbar: document.getElementById("editorInkParamsToolbar"),
+      presentationModeButton: document.getElementById("presentationMode"),
+      download: document.getElementById("download"),
+      viewBookmark: document.getElementById("viewBookmark")
+    },
+    secondaryToolbar: {
+      toolbar: document.getElementById("secondaryToolbar"),
+      toggleButton: document.getElementById("secondaryToolbarToggle"),
+      presentationModeButton: document.getElementById("secondaryPresentationMode"),
+      openFileButton: document.getElementById("secondaryOpenFile"),
+      printButton: document.getElementById("secondaryPrint"),
+      downloadButton: document.getElementById("secondaryDownload"),
+      viewBookmarkButton: document.getElementById("secondaryViewBookmark"),
+      firstPageButton: document.getElementById("firstPage"),
+      lastPageButton: document.getElementById("lastPage"),
+      pageRotateCwButton: document.getElementById("pageRotateCw"),
+      pageRotateCcwButton: document.getElementById("pageRotateCcw"),
+      cursorSelectToolButton: document.getElementById("cursorSelectTool"),
+      cursorHandToolButton: document.getElementById("cursorHandTool"),
+      scrollPageButton: document.getElementById("scrollPage"),
+      scrollVerticalButton: document.getElementById("scrollVertical"),
+      scrollHorizontalButton: document.getElementById("scrollHorizontal"),
+      scrollWrappedButton: document.getElementById("scrollWrapped"),
+      spreadNoneButton: document.getElementById("spreadNone"),
+      spreadOddButton: document.getElementById("spreadOdd"),
+      spreadEvenButton: document.getElementById("spreadEven"),
+      documentPropertiesButton: document.getElementById("documentProperties")
+    },
+    sidebar: {
+      outerContainer: document.getElementById("outerContainer"),
+      sidebarContainer: document.getElementById("sidebarContainer"),
+      toggleButton: document.getElementById("sidebarToggle"),
+      thumbnailButton: document.getElementById("viewThumbnail"),
+      outlineButton: document.getElementById("viewOutline"),
+      attachmentsButton: document.getElementById("viewAttachments"),
+      layersButton: document.getElementById("viewLayers"),
+      thumbnailView: document.getElementById("thumbnailView"),
+      outlineView: document.getElementById("outlineView"),
+      attachmentsView: document.getElementById("attachmentsView"),
+      layersView: document.getElementById("layersView"),
+      outlineOptionsContainer: document.getElementById("outlineOptionsContainer"),
+      currentOutlineItemButton: document.getElementById("currentOutlineItem")
+    },
+    sidebarResizer: {
+      outerContainer: document.getElementById("outerContainer"),
+      resizer: document.getElementById("sidebarResizer")
+    },
+    findBar: {
+      bar: document.getElementById("findbar"),
+      toggleButton: document.getElementById("viewFind"),
+      findField: document.getElementById("findInput"),
+      highlightAllCheckbox: document.getElementById("findHighlightAll"),
+      caseSensitiveCheckbox: document.getElementById("findMatchCase"),
+      matchDiacriticsCheckbox: document.getElementById("findMatchDiacritics"),
+      entireWordCheckbox: document.getElementById("findEntireWord"),
+      findMsg: document.getElementById("findMsg"),
+      findResultsCount: document.getElementById("findResultsCount"),
+      findPreviousButton: document.getElementById("findPrevious"),
+      findNextButton: document.getElementById("findNext")
+    },
+    passwordOverlay: {
+      dialog: document.getElementById("passwordDialog"),
+      label: document.getElementById("passwordText"),
+      input: document.getElementById("password"),
+      submitButton: document.getElementById("passwordSubmit"),
+      cancelButton: document.getElementById("passwordCancel")
+    },
+    documentProperties: {
+      dialog: document.getElementById("documentPropertiesDialog"),
+      closeButton: document.getElementById("documentPropertiesClose"),
+      fields: {
+        fileName: document.getElementById("fileNameField"),
+        fileSize: document.getElementById("fileSizeField"),
+        title: document.getElementById("titleField"),
+        author: document.getElementById("authorField"),
+        subject: document.getElementById("subjectField"),
+        keywords: document.getElementById("keywordsField"),
+        creationDate: document.getElementById("creationDateField"),
+        modificationDate: document.getElementById("modificationDateField"),
+        creator: document.getElementById("creatorField"),
+        producer: document.getElementById("producerField"),
+        version: document.getElementById("versionField"),
+        pageCount: document.getElementById("pageCountField"),
+        pageSize: document.getElementById("pageSizeField"),
+        linearized: document.getElementById("linearizedField")
+      }
+    },
+    annotationEditorParams: {
+      editorFreeTextFontSize: document.getElementById("editorFreeTextFontSize"),
+      editorFreeTextColor: document.getElementById("editorFreeTextColor"),
+      editorInkColor: document.getElementById("editorInkColor"),
+      editorInkThickness: document.getElementById("editorInkThickness"),
+      editorInkOpacity: document.getElementById("editorInkOpacity")
+    },
+    errorWrapper,
+    printContainer: document.getElementById("printContainer"),
+    openFileInput: document.getElementById("fileInput"),
+    debuggerScriptPath: "./debugger.js"
+  };
+}
+
+function webViewerLoad() {
+  const config = getViewerConfiguration();
+  const event = document.createEvent("CustomEvent");
+  event.initCustomEvent("webviewerloaded", true, true, {
+    source: window
+  });
+
+  try {
+    parent.document.dispatchEvent(event);
+  } catch (ex) {
+    console.error(`webviewerloaded: ${ex}`);
+    document.dispatchEvent(event);
+  }
+
+  _app.PDFViewerApplication.run(config);
+}
+
+document.blockUnblockOnload?.(true);
+
+if (document.readyState === "interactive" || document.readyState === "complete") {
+  webViewerLoad();
+} else {
+  document.addEventListener("DOMContentLoaded", webViewerLoad, true);
+}
+})();
+
+/******/ })()
+;
 //# sourceMappingURL=viewer.js.map
diff --git a/cps/static/locale/ach/viewer.properties b/cps/static/locale/ach/viewer.properties
index 46e36fb7e..3a74d767b 100644
--- a/cps/static/locale/ach/viewer.properties
+++ b/cps/static/locale/ach/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Neno ma kombedi
 tools.title=Gintic
 tools_label=Gintic
 first_page.title=Cit i pot buk mukwongo
-first_page.label=Cit i pot buk mukwongo
 first_page_label=Cit i pot buk mukwongo
 last_page.title=Cit i pot buk magiko
-last_page.label=Cit i pot buk magiko
 last_page_label=Cit i pot buk magiko
 page_rotate_cw.title=Wire i tung lacuc
-page_rotate_cw.label=Wire i tung lacuc
 page_rotate_cw_label=Wire i tung lacuc
 page_rotate_ccw.title=Wire i tung lacam
-page_rotate_ccw.label=Wire i tung lacam
 page_rotate_ccw_label=Wire i tung lacam
 
 cursor_text_select_tool.title=Cak gitic me yero coc
@@ -124,7 +120,6 @@ print_progress_close=Juki
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Lok gintic ma inget
-toggle_sidebar_notification.title=Lok lanyut me nget (wiyewiye tye i gin acoya/attachments)
 toggle_sidebar_label=Lok gintic ma inget
 document_outline.title=Nyut Wiyewiye me Gin acoya (dii-kiryo me yaro/kano jami weng)
 document_outline_label=Pek pa gin acoya
@@ -184,8 +179,6 @@ page_scale_actual=Dite kikome
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Bal
 loading_error=Bal otime kun cano PDF.
 invalid_file_error=Pwail me PDF ma pe atir onyo obale woko.
 missing_file_error=Pwail me PDF tye ka rem.
diff --git a/cps/static/locale/af/viewer.properties b/cps/static/locale/af/viewer.properties
index c7d6c42b4..9bd5476da 100644
--- a/cps/static/locale/af/viewer.properties
+++ b/cps/static/locale/af/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Huidige aansig
 tools.title=Nutsgoed
 tools_label=Nutsgoed
 first_page.title=Gaan na eerste bladsy
-first_page.label=Gaan na eerste bladsy
 first_page_label=Gaan na eerste bladsy
 last_page.title=Gaan na laaste bladsy
-last_page.label=Gaan na laaste bladsy
 last_page_label=Gaan na laaste bladsy
 page_rotate_cw.title=Roteer kloksgewys
-page_rotate_cw.label=Roteer kloksgewys
 page_rotate_cw_label=Roteer kloksgewys
 page_rotate_ccw.title=Roteer anti-kloksgewys
-page_rotate_ccw.label=Roteer anti-kloksgewys
 page_rotate_ccw_label=Roteer anti-kloksgewys
 
 cursor_text_select_tool.title=Aktiveer gereedskap om teks te merk
@@ -101,7 +97,6 @@ print_progress_close=Kanselleer
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Sypaneel aan/af
-toggle_sidebar_notification.title=Sypaneel aan/af (dokument bevat skema/aanhegsels)
 toggle_sidebar_label=Sypaneel aan/af
 document_outline.title=Wys dokumentskema (dubbelklik om alle items oop/toe te vou)
 document_outline_label=Dokumentoorsig
@@ -161,8 +156,6 @@ page_scale_actual=Werklike grootte
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Fout
 loading_error='n Fout het voorgekom met die laai van die PDF.
 invalid_file_error=Ongeldige of korrupte PDF-lêer.
 missing_file_error=PDF-lêer is weg.
diff --git a/cps/static/locale/an/viewer.properties b/cps/static/locale/an/viewer.properties
index 7e3504c77..16028f372 100644
--- a/cps/static/locale/an/viewer.properties
+++ b/cps/static/locale/an/viewer.properties
@@ -42,22 +42,18 @@ print_label=Imprentar
 download.title=Descargar
 download_label=Descargar
 bookmark.title=Vista actual (copiar u ubrir en una nueva finestra)
-bookmark_label=Anvista actual
+bookmark_label=Vista actual
 
 # Secondary toolbar and context menu
 tools.title=Ferramientas
 tools_label=Ferramientas
 first_page.title=Ir ta la primer pachina
-first_page.label=Ir ta la primer pachina
 first_page_label=Ir ta la primer pachina
 last_page.title=Ir ta la zaguer pachina
-last_page.label=Ir ta la zaguera pachina
 last_page_label=Ir ta la zaguer pachina
 page_rotate_cw.title=Chirar enta la dreita
-page_rotate_cw.label=Chirar enta la dreita
 page_rotate_cw_label=Chira enta la dreita
 page_rotate_ccw.title=Chirar enta la zurda
-page_rotate_ccw.label=Chirar en sentiu antihorario
 page_rotate_ccw_label=Chirar enta la zurda
 
 cursor_text_select_tool.title=Activar la ferramienta de selección de texto
@@ -65,6 +61,20 @@ cursor_text_select_tool_label=Ferramienta de selección de texto
 cursor_hand_tool.title=Activar la ferramienta man
 cursor_hand_tool_label=Ferramienta man
 
+scroll_vertical.title=Usar lo desplazamiento vertical
+scroll_vertical_label=Desplazamiento vertical
+scroll_horizontal.title=Usar lo desplazamiento horizontal
+scroll_horizontal_label=Desplazamiento horizontal
+scroll_wrapped.title=Activaar lo desplazamiento contino
+scroll_wrapped_label=Desplazamiento contino
+
+spread_none.title=No unir vistas de pachinas
+spread_none_label=Una pachina nomás
+spread_odd.title=Mostrar vista de pachinas, con as impars a la zurda
+spread_odd_label=Doble pachina, impar a la zurda
+spread_even.title=Amostrar vista de pachinas, con as pars a la zurda
+spread_even_label=Doble pachina, para a la zurda
+
 # Document properties dialog box
 document_properties.title=Propiedatz d'o documento...
 document_properties_label=Propiedatz d'o documento...
@@ -89,6 +99,28 @@ document_properties_creator=Creyador:
 document_properties_producer=Creyador de PDF:
 document_properties_version=Versión de PDF:
 document_properties_page_count=Numero de pachinas:
+document_properties_page_size=Mida de pachina:
+document_properties_page_size_unit_inches=pulgadas
+document_properties_page_size_unit_millimeters=mm
+document_properties_page_size_orientation_portrait=vertical
+document_properties_page_size_orientation_landscape=horizontal
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=Carta
+document_properties_page_size_name_legal=Legal
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} x {{height}} {{unit}} {{orientation}}
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} x {{height}} {{unit}} {{name}}, {{orientation}}
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Vista web rapida:
+document_properties_linearized_yes=Sí
+document_properties_linearized_no=No
 document_properties_close=Zarrar
 
 print_progress_message=Se ye preparando la documentación pa imprentar…
@@ -101,17 +133,20 @@ print_progress_close=Cancelar
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Amostrar u amagar a barra lateral
-toggle_sidebar_notification.title=Cambiar barra lateral (lo documento contiene esquema/adchuntos)
+toggle_sidebar_notification2.title=Cambiar barra lateral (lo documento contiene esquema/adchuntos/capas)
 toggle_sidebar_label=Amostrar a barra lateral
 document_outline.title=Amostrar esquema d'o documento (fer doble clic pa expandir/compactar totz los items)
 document_outline_label=Esquema d'o documento
 attachments.title=Amostrar os adchuntos
 attachments_label=Adchuntos
+layers.title=Amostrar capas (doble clic para reiniciar totas las capas a lo estau per defecto)
+layers_label=Capas
 thumbs.title=Amostrar as miniaturas
 thumbs_label=Miniaturas
 findbar.title=Trobar en o documento
 findbar_label=Trobar
 
+additional_layers=Capas adicionals
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -129,8 +164,30 @@ find_next.title=Trobar a siguient coincidencia d'a frase
 find_next_label=Siguient
 find_highlight=Resaltar-lo tot
 find_match_case_label=Coincidencia de mayusclas/minusclas
+find_entire_word_label=Parolas completas
 find_reached_top=S'ha plegau a l'inicio d'o documento, se contina dende baixo
 find_reached_bottom=S'ha plegau a la fin d'o documento, se contina dende alto
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} de {{total}} coincidencia
+find_match_count[two]={{current}} de {{total}} coincidencias
+find_match_count[few]={{current}} de {{total}} coincidencias
+find_match_count[many]={{current}} de {{total}} coincidencias
+find_match_count[other]={{current}} de {{total}} coincidencias
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Mas de {{limit}} coincidencias
+find_match_count_limit[one]=Mas de {{limit}} coincidencias
+find_match_count_limit[two]=Mas que {{limit}} coincidencias
+find_match_count_limit[few]=Mas que {{limit}} coincidencias
+find_match_count_limit[many]=Mas que {{limit}} coincidencias
+find_match_count_limit[other]=Mas que {{limit}} coincidencias
 find_not_found=No s'ha trobau a frase
 
 # Error panel labels
@@ -161,13 +218,15 @@ page_scale_actual=Grandaria actual
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Error
 loading_error=S'ha produciu una error en cargar o PDF.
 invalid_file_error=O PDF no ye valido u ye estorbau.
 missing_file_error=No i ha fichero PDF.
 unexpected_response_error=Respuesta a lo servicio inasperada.
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
+
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
diff --git a/cps/static/locale/ar/viewer.properties b/cps/static/locale/ar/viewer.properties
index cffa8bec5..082816fb6 100644
--- a/cps/static/locale/ar/viewer.properties
+++ b/cps/static/locale/ar/viewer.properties
@@ -47,17 +47,13 @@ bookmark_label=المنظور الحالي
 # Secondary toolbar and context menu
 tools.title=الأدوات
 tools_label=الأدوات
-first_page.title=اذهب إلى الصفحة الأولى
-first_page.label=اذهب إلى الصفحة الأولى
-first_page_label=اذهب إلى الصفحة الأولى
-last_page.title=اذهب إلى الصفحة الأخيرة
-last_page.label=اذهب إلى الصفحة الأخيرة
-last_page_label=اذهب إلى الصفحة الأخيرة
+first_page.title=انتقل إلى الصفحة الأولى
+first_page_label=انتقل إلى الصفحة الأولى
+last_page.title=انتقل إلى الصفحة الأخيرة
+last_page_label=انتقل إلى الصفحة الأخيرة
 page_rotate_cw.title=أدر باتجاه عقارب الساعة
-page_rotate_cw.label=أدر باتجاه عقارب الساعة
 page_rotate_cw_label=أدر باتجاه عقارب الساعة
 page_rotate_ccw.title=أدر بعكس اتجاه عقارب الساعة
-page_rotate_ccw.label=أدر بعكس اتجاه عقارب الساعة
 page_rotate_ccw_label=أدر بعكس اتجاه عقارب الساعة
 
 cursor_text_select_tool.title=فعّل أداة اختيار النص
@@ -137,17 +133,22 @@ print_progress_close=ألغِ
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=بدّل ظهور الشريط الجانبي
-toggle_sidebar_notification.title=بدّل ظهور الشريط الجانبي (يحتوي المستند على مخطط أو مرفقات)
+toggle_sidebar_notification2.title=بدّل ظهور الشريط الجانبي (يحتوي المستند على مخطط أو مرفقات أو طبقات)
 toggle_sidebar_label=بدّل ظهور الشريط الجانبي
 document_outline.title=اعرض فهرس المستند (نقر مزدوج لتمديد أو تقليص كل العناصر)
 document_outline_label=مخطط المستند
 attachments.title=اعرض المرفقات
 attachments_label=المُرفقات
+layers.title=اعرض الطبقات (انقر مرتين لتصفير كل الطبقات إلى الحالة المبدئية)
+layers_label=‏‏الطبقات
 thumbs.title=اعرض مُصغرات
 thumbs_label=مُصغّرات
 findbar.title=ابحث في المستند
 findbar_label=ابحث
 
+additional_layers=الطبقات الإضافية
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=صفحة {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -220,7 +221,7 @@ page_scale_actual=الحجم الفعلي
 page_scale_percent={{scale}}٪
 
 # Loading indicator messages
-loading_error_indicator=عطل
+loading=يحمّل…
 loading_error=حدث عطل أثناء تحميل ملف PDF.
 invalid_file_error=ملف PDF تالف أو غير صحيح.
 missing_file_error=ملف PDF غير موجود.
diff --git a/cps/static/locale/ast/viewer.properties b/cps/static/locale/ast/viewer.properties
index 5f6d5e7c0..1f8bb2e57 100644
--- a/cps/static/locale/ast/viewer.properties
+++ b/cps/static/locale/ast/viewer.properties
@@ -28,44 +28,51 @@ of_pages=de {{pagesCount}}
 # respectively a number representing the total number of pages in the document.
 page_of_pages=({{pageNumber}} de {{pagesCount}})
 
-zoom_out.title=Reducir
-zoom_out_label=Reducir
-zoom_in.title=Aumentar
-zoom_in_label=Aumentar
-zoom.title=Tamañu
-open_file.title=Abrir ficheru
+zoom_out.title=Alloñar
+zoom_out_label=Alloña
+zoom_in.title=Averar
+zoom_in_label=Avera
+zoom.title=Zoom
+presentation_mode.title=Cambiar al mou de presentación
+presentation_mode_label=Mou de presentación
 open_file_label=Abrir
 print.title=Imprentar
 print_label=Imprentar
-download.title=Descargar
-download_label=Descargar
-bookmark.title=Vista actual (copiar o abrir nuna nueva ventana)
+download.title=Baxar
+download_label=Baxar
 bookmark_label=Vista actual
 
 # Secondary toolbar and context menu
 tools.title=Ferramientes
 tools_label=Ferramientes
-first_page.title=Dir a la primer páxina
-first_page.label=Dir a la primer páxina
 first_page_label=Dir a la primer páxina
-last_page.title=Dir a la postrer páxina
-last_page.label=Dir a la cabera páxina
-last_page_label=Dir a la postrer páxina
-page_rotate_cw.title=Xirar en sen horariu
-page_rotate_cw_label=Xirar en sen horariu
-page_rotate_ccw.title=Xirar en sen antihorariu
-page_rotate_ccw_label=Xirar en sen antihorariu
+last_page_label=Dir a la última páxina
+page_rotate_cw.title=Voltia a la derecha
+page_rotate_cw_label=Voltiar a la derecha
+page_rotate_ccw.title=Voltia a la esquierda
+page_rotate_ccw_label=Voltiar a la esquierda
 
+cursor_text_select_tool.title=Activa la ferramienta d'esbilla de testu
+cursor_text_select_tool_label=Ferramienta d'esbilla de testu
+cursor_hand_tool.title=Activa la ferramienta de mano
+cursor_hand_tool_label=Ferramienta de mano
 
+scroll_vertical.title=Usa'l desplazamientu vertical
 scroll_vertical_label=Desplazamientu vertical
+scroll_horizontal.title=Usa'l desplazamientu horizontal
 scroll_horizontal_label=Desplazamientu horizontal
+scroll_wrapped.title=Usa'l desplazamientu continuu
+scroll_wrapped_label=Desplazamientu continuu
 
+spread_none_label=Fueyes individuales
+spread_odd_label=Fueyes pares
+spread_even_label=Fueyes impares
 
 # Document properties dialog box
 document_properties.title=Propiedaes del documentu…
 document_properties_label=Propiedaes del documentu…
-document_properties_file_name=Nome de ficheru:
-document_properties_file_size=Tamañu de ficheru:
+document_properties_file_name=Nome del ficheru:
+document_properties_file_size=Tamañu del ficheru:
 # LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in kilobytes, respectively in bytes.
 document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
@@ -73,20 +80,20 @@ document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
 # will be replaced by the PDF file size in megabytes, respectively in bytes.
 document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
 document_properties_title=Títulu:
-document_properties_author=Autor:
-document_properties_subject=Asuntu:
 document_properties_keywords=Pallabres clave:
 document_properties_creation_date=Data de creación:
 document_properties_modification_date=Data de modificación:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
 # will be replaced by the creation/modification date, and time, of the PDF file.
 document_properties_date_string={{date}}, {{time}}
-document_properties_creator=Creador:
-document_properties_producer=Productor PDF:
-document_properties_version=Versión PDF:
+document_properties_producer=Productor del PDF:
+document_properties_version=Versión del PDF:
 document_properties_page_count=Númberu de páxines:
+document_properties_page_size=Tamañu de páxina:
 document_properties_page_size_unit_inches=in
 document_properties_page_size_unit_millimeters=mm
+document_properties_page_size_orientation_portrait=vertical
+document_properties_page_size_orientation_landscape=horizontal
 document_properties_page_size_name_a3=A3
 document_properties_page_size_name_a4=A4
 # LOCALIZATION NOTE (document_properties_page_size_dimension_string):
@@ -99,11 +106,11 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Vista web rápida:
 document_properties_linearized_yes=Sí
 document_properties_linearized_no=Non
 document_properties_close=Zarrar
 
-print_progress_message=Tresnando documentu pa imprentar…
 # LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
 # a numerical per cent value.
 print_progress_percent={{progress}}%
@@ -112,54 +119,56 @@ print_progress_close=Encaboxar
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
-toggle_sidebar.title=Camudar barra llateral
-toggle_sidebar_label=Camudar barra llateral
-document_outline.title=Amosar esquema del documentu (duble clic pa espander/contrayer tolos elementos)
-document_outline_label=Esquema del documentu
-attachments.title=Amosar axuntos
+toggle_sidebar.title=Alternar la barra llateral
+attachments.title=Amosar los axuntos
 attachments_label=Axuntos
-thumbs.title=Amosar miniatures
+layers_label=Capes
+thumbs.title=Amosar les miniatures
 thumbs_label=Miniatures
-findbar.title=Guetar nel documentu
-findbar_label=Guetar
+findbar_label=Atopar
 
+additional_layers=Capes adicionales
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Páxina {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
 thumb_page_title=Páxina {{page}}
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
-thumb_page_canvas=Miniatura de la páxina {{page}}
 
 # Find panel button title and messages
-find_input.title=Guetar
-find_input.placeholder=Guetar nel documentu…
-find_previous.title=Alcontrar l'anterior apaición de la fras
 find_previous_label=Anterior
-find_next.title=Alcontrar la siguiente apaición d'esta fras
 find_next_label=Siguiente
-find_highlight=Remarcar toos
-find_match_case_label=Coincidencia de mayús./minús.
-find_entire_word_label=Pallabres enteres
-find_reached_top=Algamóse'l principiu del documentu, siguir dende'l final
-find_reached_bottom=Algamóse'l final del documentu, siguir dende'l principiu
+find_entire_word_label=Pallabres completes
+find_reached_top=Algamóse'l comienzu de la páxina, síguese dende abaxo
+find_reached_bottom=Algamóse la fin del documentu, síguese dende arriba
 # LOCALIZATION NOTE (find_match_count): The supported plural forms are
 # [one|two|few|many|other], with [other] as the default value.
 # "{{current}}" and "{{total}}" will be replaced by a number representing the
 # index of the currently active find result, respectively a number representing
 # the total number of matches in the document.
+find_match_count[one]={{current}} de {{total}} coincidencia
+find_match_count[two]={{current}} de {{total}} coincidencies
+find_match_count[few]={{current}} de {{total}} coincidencies
+find_match_count[many]={{current}} de {{total}} coincidencies
+find_match_count[other]={{current}} de {{total}} coincidencies
 # LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
 # [zero|one|two|few|many|other], with [other] as the default value.
 # "{{limit}}" will be replaced by a numerical value.
-find_not_found=Frase non atopada
+find_match_count_limit[zero]=Más de {{limit}} coincidencies
+find_match_count_limit[one]=Más de {{limit}} coincidencia
+find_match_count_limit[two]=Más de {{limit}} coincidencies
+find_match_count_limit[few]=Más de {{limit}} coincidencies
+find_match_count_limit[many]=Más de {{limit}} coincidencies
+find_match_count_limit[other]=Más de {{limit}} coincidencies
 
 # Error panel labels
 error_more_info=Más información
 error_less_info=Menos información
-error_close=Zarrar
 # LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
 # replaced by the PDF.JS version and build ID.
-error_version_info=PDF.js v{{version}} (build: {{build}})
+error_version_info=PDF.js v{{version}} (compilación: {{build}})
 # LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
 # english string describing the error.
 error_message=Mensaxe: {{message}}
@@ -170,37 +179,29 @@ error_stack=Pila: {{stack}}
 error_file=Ficheru: {{file}}
 # LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
 error_line=Llinia: {{line}}
-rendering_error=Hebo un fallu al renderizar la páxina.
 
 # Predefined zoom values
-page_scale_width=Anchor de la páxina
-page_scale_fit=Axuste de la páxina
-page_scale_auto=Tamañu automáticu
-page_scale_actual=Tamañu actual
+page_scale_auto=Zoom automáticu
+page_scale_actual=Tamañu real
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Fallu
-loading_error=Hebo un fallu al cargar el PDF.
-invalid_file_error=Ficheru PDF inválidu o corruptu.
-missing_file_error=Nun hai ficheru PDF.
-unexpected_response_error=Rempuesta inesperada del sirvidor.
+loading=Cargando…
+loading_error=Asocedió un fallu mentanto se cargaba'l PDF.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
 # replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
 
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
-text_annotation_type.alt=[Anotación {{type}}]
-password_label=Introduz la contraseña p'abrir esti ficheru PDF
-password_invalid=Contraseña non válida. Vuelvi a intentalo.
-password_ok=Aceutar
+password_ok=Aceptar
 password_cancel=Encaboxar
 
-printing_not_supported=Alvertencia: La imprentación entá nun ta sofitada dafechu nesti restolador.
-printing_not_ready=Avisu: Esti PDF nun se cargó completamente pa poder imprentase.
-web_fonts_disabled=Les fontes web tán desactivaes: ye imposible usar les fontes PDF embebíes.
+# LOCALIZATION NOTE (unsupported_feature_signatures): Should contain the same
+# exact string as in the `chrome.properties` file.
+
diff --git a/cps/static/locale/az/viewer.properties b/cps/static/locale/az/viewer.properties
index 8f61d9641..bdc0ce615 100644
--- a/cps/static/locale/az/viewer.properties
+++ b/cps/static/locale/az/viewer.properties
@@ -39,8 +39,8 @@ open_file.title=Fayl Aç
 open_file_label=Aç
 print.title=Yazdır
 print_label=Yazdır
-download.title=Yüklə
-download_label=Yüklə
+download.title=Endir
+download_label=Endir
 bookmark.title=Hazırkı görünüş (köçür və ya yeni pəncərədə aç)
 bookmark_label=Hazırkı görünüş
 
@@ -48,16 +48,12 @@ bookmark_label=Hazırkı görünüş
 tools.title=Alətlər
 tools_label=Alətlər
 first_page.title=İlk Səhifəyə get
-first_page.label=İlk Səhifəyə get
 first_page_label=İlk Səhifəyə get
 last_page.title=Son Səhifəyə get
-last_page.label=Son Səhifəyə get
 last_page_label=Son Səhifəyə get
 page_rotate_cw.title=Saat İstiqamətində Fırlat
-page_rotate_cw.label=Saat İstiqamətində Fırlat
 page_rotate_cw_label=Saat İstiqamətində Fırlat
 page_rotate_ccw.title=Saat İstiqamətinin Əksinə Fırlat
-page_rotate_ccw.label=Saat İstiqamətinin Əksinə Fırlat
 page_rotate_ccw_label=Saat İstiqamətinin Əksinə Fırlat
 
 cursor_text_select_tool.title=Yazı seçmə alətini aktivləşdir
@@ -137,19 +133,20 @@ print_progress_close=Ləğv et
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Yan Paneli Aç/Bağla
-toggle_sidebar_notification.title=Yan paneli çevir (sənəddə icmal/bağlama var)
+toggle_sidebar_notification2.title=Yan paneli çevir (sənəddə icmal/bağlamalar/laylar mövcuddur)
 toggle_sidebar_label=Yan Paneli Aç/Bağla
 document_outline.title=Sənədin eskizini göstər (bütün bəndləri açmaq/yığmaq üçün iki dəfə klikləyin)
 document_outline_label=Sənəd strukturu
 attachments.title=Bağlamaları göstər
 attachments_label=Bağlamalar
+layers.title=Layları göstər (bütün layları ilkin halına sıfırlamaq üçün iki dəfə klikləyin)
+layers_label=Laylar
 thumbs.title=Kiçik şəkilləri göstər
 thumbs_label=Kiçik şəkillər
 findbar.title=Sənəddə Tap
 findbar_label=Tap
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Səhifə {{page}}
+additional_layers=Əlavə laylar
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -221,8 +218,6 @@ page_scale_actual=Hazırkı Həcm
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Səhv
 loading_error=PDF yüklenərkən bir səhv yarandı.
 invalid_file_error=Səhv və ya zədələnmiş olmuş PDF fayl.
 missing_file_error=PDF fayl yoxdur.
diff --git a/cps/static/locale/be/viewer.properties b/cps/static/locale/be/viewer.properties
index 6ac719288..5c006b96c 100644
--- a/cps/static/locale/be/viewer.properties
+++ b/cps/static/locale/be/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Цяперашняя праява
 tools.title=Прылады
 tools_label=Прылады
 first_page.title=Перайсці на першую старонку
-first_page.label=Перайсці на першую старонку
 first_page_label=Перайсці на першую старонку
 last_page.title=Перайсці на апошнюю старонку
-last_page.label=Перайсці на апошнюю старонку
 last_page_label=Перайсці на апошнюю старонку
 page_rotate_cw.title=Павярнуць па сонцу
-page_rotate_cw.label=Павярнуць па сонцу
 page_rotate_cw_label=Павярнуць па сонцу
 page_rotate_ccw.title=Павярнуць супраць сонца
-page_rotate_ccw.label=Павярнуць супраць сонца
 page_rotate_ccw_label=Павярнуць супраць сонца
 
 cursor_text_select_tool.title=Уключыць прыладу выбару тэксту
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Прылада выбару тэксту
 cursor_hand_tool.title=Уключыць ручную прыладу
 cursor_hand_tool_label=Ручная прылада
 
+scroll_page.title=Выкарыстоўваць пракрутку старонкi
+scroll_page_label=Пракрутка старонкi
 scroll_vertical.title=Ужываць вертыкальную пракрутку
 scroll_vertical_label=Вертыкальная пракрутка
 scroll_horizontal.title=Ужываць гарызантальную пракрутку
@@ -137,19 +135,24 @@ print_progress_close=Скасаваць
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Паказаць/схаваць бакавую панэль
-toggle_sidebar_notification.title=Паказаць/схаваць бакавую панэль (дакумент мае змест/укладанні)
+toggle_sidebar_notification2.title=Паказаць/схаваць бакавую панэль (дакумент мае змест/укладанні/пласты)
 toggle_sidebar_label=Паказаць/схаваць бакавую панэль
 document_outline.title=Паказаць структуру дакумента (двайная пстрычка, каб разгарнуць /згарнуць усе элементы)
 document_outline_label=Структура дакумента
 attachments.title=Паказаць далучэнні
 attachments_label=Далучэнні
+layers.title=Паказаць пласты (двойчы пстрыкніце, каб скінуць усе пласты да прадвызначанага стану)
+layers_label=Пласты
 thumbs.title=Паказ мініяцюр
 thumbs_label=Мініяцюры
+current_outline_item.title=Знайсці бягучы элемент структуры
+current_outline_item_label=Бягучы элемент структуры
 findbar.title=Пошук у дакуменце
 findbar_label=Знайсці
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Старонка {{page}}
+additional_layers=Дадатковыя пласты
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Старонка {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Знайсці наступны выпадак выразу
 find_next_label=Наступны
 find_highlight=Падфарбаваць усе
 find_match_case_label=Адрозніваць вялікія/малыя літары
+find_match_diacritics_label=З улікам дыякрытык
 find_entire_word_label=Словы цалкам
 find_reached_top=Дасягнуты пачатак дакумента, працяг з канца
 find_reached_bottom=Дасягнуты канец дакумента, працяг з пачатку
@@ -222,8 +226,8 @@ page_scale_actual=Сапраўдны памер
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Памылка
-loading_error=Здарылася памылка падчас загрузкі PDF.
+loading=Чытаецца…
+loading_error=Здарылася памылка ў часе загрузкі PDF.
 invalid_file_error=Няспраўны або пашкоджаны файл PDF.
 missing_file_error=Адсутны файл PDF.
 unexpected_response_error=Нечаканы адказ сервера.
@@ -245,3 +249,33 @@ password_cancel=Скасаваць
 printing_not_supported=Папярэджанне: друк не падтрымліваецца цалкам гэтым браўзерам.
 printing_not_ready=Увага: PDF не сцягнуты цалкам для друкавання.
 web_fonts_disabled=Шрыфты Сеціва забаронены: немагчыма ўжываць укладзеныя шрыфты PDF.
+
+# Editor
+editor_none.title=Адключыць рэдагаванне анатацый
+editor_none_label=Адключыць рэдагаванне
+editor_free_text.title=Дадаць анатацыю FreeText
+editor_free_text_label=Анатацыя FreeText
+editor_ink.title=Дадаць анатацыю чарнілам
+editor_ink_label=Анатацыя чарнілам
+
+freetext_default_content=Увядзіце тэкст…
+
+free_text_default_content=Увядзіце тэкст…
+
+# Editor Parameters
+editor_free_text_font_color=Колер шрыфту
+editor_free_text_font_size=Памер шрыфту
+editor_ink_line_color=Колер лініі
+editor_ink_line_thickness=Таўшчыня лініі
+
+# Editor Parameters
+editor_free_text_color=Колер
+editor_free_text_size=Памер
+editor_ink_color=Колер
+editor_ink_thickness=Таўшчыня
+editor_ink_opacity=Непразрыстасць
+
+# Editor aria
+editor_free_text_aria_label=Рэдактар FreeText
+editor_ink_aria_label=Рэдактар чарнілаў
+editor_ink_canvas_aria_label=Відарыс, створаны карыстальнікам
diff --git a/cps/static/locale/bg/viewer.properties b/cps/static/locale/bg/viewer.properties
index b93e3d1e4..0ec7649c6 100644
--- a/cps/static/locale/bg/viewer.properties
+++ b/cps/static/locale/bg/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Текущ изглед
 tools.title=Инструменти
 tools_label=Инструменти
 first_page.title=Към първата страница
-first_page.label=Към първата страница
 first_page_label=Към първата страница
 last_page.title=Към последната страница
-last_page.label=Към последната страница
 last_page_label=Към последната страница
 page_rotate_cw.title=Завъртане по час. стрелка
-page_rotate_cw.label=Завъртане по часовниковата стрелка
 page_rotate_cw_label=Завъртане по часовниковата стрелка
 page_rotate_ccw.title=Завъртане обратно на час. стрелка
-page_rotate_ccw.label=Завъртане обратно на часовниковата стрелка
 page_rotate_ccw_label=Завъртане обратно на часовниковата стрелка
 
 cursor_text_select_tool.title=Включване на инструмента за избор на текст
@@ -137,7 +133,6 @@ print_progress_close=Отказ
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Превключване на страничната лента
-toggle_sidebar_notification.title=Превключване на страничната лента (документи със структура/прикачени файлове)
 toggle_sidebar_label=Превключване на страничната лента
 document_outline.title=Показване на структурата на документа (двукратно щракване за свиване/разгъване на всичко)
 document_outline_label=Структура на документа
@@ -219,8 +214,6 @@ page_scale_actual=Действителен размер
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Грешка
 loading_error=Получи се грешка при зареждане на PDF-а.
 invalid_file_error=Невалиден или повреден PDF файл.
 missing_file_error=Липсващ PDF файл.
diff --git a/cps/static/locale/bn/viewer.properties b/cps/static/locale/bn/viewer.properties
index c106df10c..e31c135fd 100644
--- a/cps/static/locale/bn/viewer.properties
+++ b/cps/static/locale/bn/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=বর্তমান অবস্থা
 tools.title=টুল
 tools_label=টুল
 first_page.title=প্রথম পাতায় যাও
-first_page.label=প্রথম পাতায় যাও
 first_page_label=প্রথম পাতায় যাও
 last_page.title=শেষ পাতায় যাও
-last_page.label=শেষ পাতায় যাও
 last_page_label=শেষ পাতায় যাও
 page_rotate_cw.title=ঘড়ির কাঁটার দিকে ঘোরাও
-page_rotate_cw.label=ঘড়ির কাঁটার দিকে ঘোরাও
 page_rotate_cw_label=ঘড়ির কাঁটার দিকে ঘোরাও
 page_rotate_ccw.title=ঘড়ির কাঁটার বিপরীতে ঘোরাও
-page_rotate_ccw.label=ঘড়ির কাঁটার বিপরীতে ঘোরাও
 page_rotate_ccw_label=ঘড়ির কাঁটার বিপরীতে ঘোরাও
 
 cursor_text_select_tool.title=লেখা নির্বাচক টুল সক্রিয় করুন
@@ -135,7 +131,6 @@ print_progress_close=বাতিল
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=সাইডবার টগল করুন
-toggle_sidebar_notification.title=সাইডবার টগল (নথিতে আউটলাইন/এটাচমেন্ট রয়েছে)
 toggle_sidebar_label=সাইডবার টগল করুন
 document_outline.title=নথির আউটলাইন দেখাও (সব আইটেম প্রসারিত/সঙ্কুচিত করতে ডবল ক্লিক করুন)
 document_outline_label=নথির রূপরেখা
@@ -146,8 +141,7 @@ thumbs_label=থাম্বনেইল সমূহ
 findbar.title=নথির মধ্যে খুঁজুন
 findbar_label=খুঁজুন
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=পাতা {{page}}
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -163,7 +157,7 @@ find_previous.title=বাক্যাংশের পূর্ববর্ত
 find_previous_label=পূর্ববর্তী
 find_next.title=বাক্যাংশের পরবর্তী উপস্থিতি অনুসন্ধান
 find_next_label=পরবর্তী
-find_highlight=সব হাইলাইট করা হবে
+find_highlight=সব হাইলাইট করুন
 find_match_case_label=অক্ষরের ছাঁদ মেলানো
 find_entire_word_label=সম্পূর্ণ শব্দ
 find_reached_top=পাতার শুরুতে পৌছে গেছে, নীচ থেকে আরম্ভ করা হয়েছে
@@ -220,7 +214,6 @@ page_scale_actual=প্রকৃত আকার
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=ত্রুটি
 loading_error=পিডিএফ লোড করার সময় ত্রুটি দেখা দিয়েছে।
 invalid_file_error=অকার্যকর অথবা ক্ষতিগ্রস্ত পিডিএফ ফাইল।
 missing_file_error=নিখোঁজ PDF ফাইল।
diff --git a/cps/static/locale/bo/viewer.properties b/cps/static/locale/bo/viewer.properties
index 3ffa84819..bba049082 100644
--- a/cps/static/locale/bo/viewer.properties
+++ b/cps/static/locale/bo/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Current View
 tools.title=Tools
 tools_label=Tools
 first_page.title=Go to First Page
-first_page.label=Go to First Page
 first_page_label=Go to First Page
 last_page.title=Go to Last Page
-last_page.label=Go to Last Page
 last_page_label=Go to Last Page
 page_rotate_cw.title=Rotate Clockwise
-page_rotate_cw.label=Rotate Clockwise
 page_rotate_cw_label=Rotate Clockwise
 page_rotate_ccw.title=Rotate Counterclockwise
-page_rotate_ccw.label=Rotate Counterclockwise
 page_rotate_ccw_label=Rotate Counterclockwise
 
 cursor_text_select_tool.title=Enable Text Selection Tool
@@ -137,7 +133,6 @@ print_progress_close=Cancel
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Toggle Sidebar
-toggle_sidebar_notification.title=Toggle Sidebar (document contains outline/attachments)
 toggle_sidebar_label=Toggle Sidebar
 document_outline.title=Show Document Outline (double-click to expand/collapse all items)
 document_outline_label=Document Outline
@@ -219,8 +214,6 @@ page_scale_actual=Actual Size
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Error
 loading_error=An error occurred while loading the PDF.
 invalid_file_error=Invalid or corrupted PDF file.
 missing_file_error=Missing PDF file.
diff --git a/cps/static/locale/br/viewer.properties b/cps/static/locale/br/viewer.properties
index 9add9a432..c26ca6810 100644
--- a/cps/static/locale/br/viewer.properties
+++ b/cps/static/locale/br/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Gwel bremanel
 tools.title=Ostilhoù
 tools_label=Ostilhoù
 first_page.title=Mont d'ar bajenn gentañ
-first_page.label=Mont d'ar bajenn gentañ
 first_page_label=Mont d'ar bajenn gentañ
 last_page.title=Mont d'ar bajenn diwezhañ
-last_page.label=Mont d'ar bajenn diwezhañ
 last_page_label=Mont d'ar bajenn diwezhañ
 page_rotate_cw.title=C'hwelañ gant roud ar bizied
-page_rotate_cw.label=C'hwelañ gant roud ar bizied
 page_rotate_cw_label=C'hwelañ gant roud ar bizied
 page_rotate_ccw.title=C'hwelañ gant roud gin ar bizied
-page_rotate_ccw.label=C'hwelañ gant roud gin ar bizied
 page_rotate_ccw_label=C'hwelañ gant roud gin ar bizied
 
 cursor_text_select_tool.title=Gweredekaat an ostilh diuzañ testenn
@@ -82,27 +78,27 @@ spread_even_label=Pajennoù par
 # Document properties dialog box
 document_properties.title=Perzhioù an teul…
 document_properties_label=Perzhioù an teul…
-document_properties_file_name=Anv restr :
-document_properties_file_size=Ment ar restr :
+document_properties_file_name=Anv restr:
+document_properties_file_size=Ment ar restr:
 # LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in kilobytes, respectively in bytes.
 document_properties_kb={{size_kb}} Ke ({{size_b}} eizhbit)
 # LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in megabytes, respectively in bytes.
 document_properties_mb={{size_mb}} Me ({{size_b}} eizhbit)
-document_properties_title=Titl :
-document_properties_author=Aozer :
-document_properties_subject=Danvez :
-document_properties_keywords=Gerioù-alc'hwez :
-document_properties_creation_date=Deiziad krouiñ :
-document_properties_modification_date=Deiziad kemmañ :
+document_properties_title=Titl:
+document_properties_author=Aozer:
+document_properties_subject=Danvez:
+document_properties_keywords=Gerioù-alc'hwez:
+document_properties_creation_date=Deiziad krouiñ:
+document_properties_modification_date=Deiziad kemmañ:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
 # will be replaced by the creation/modification date, and time, of the PDF file.
 document_properties_date_string={{date}}, {{time}}
-document_properties_creator=Krouer :
-document_properties_producer=Kenderc'her PDF :
-document_properties_version=Handelv PDF :
-document_properties_page_count=Niver a bajennoù :
+document_properties_creator=Krouer:
+document_properties_producer=Kenderc'her PDF:
+document_properties_version=Handelv PDF:
+document_properties_page_count=Niver a bajennoù:
 document_properties_page_size=Ment ar bajenn:
 document_properties_page_size_unit_inches=in
 document_properties_page_size_unit_millimeters=mm
@@ -137,19 +133,22 @@ print_progress_close=Nullañ
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Diskouez/kuzhat ar varrenn gostez
-toggle_sidebar_notification.title=Trec'haoliñ ar verrenn-gostez (ur steuñv pe stagadennoù a zo en teul)
+toggle_sidebar_notification2.title=Trec'haoliñ ar varrenn-gostez (ur steuñv pe stagadennoù a zo en teul)
 toggle_sidebar_label=Diskouez/kuzhat ar varrenn gostez
 document_outline.title=Diskouez steuñv an teul (daouglikit evit brasaat/bihanaat an holl elfennoù)
 document_outline_label=Sinedoù an teuliad
 attachments.title=Diskouez ar c'henstagadurioù
 attachments_label=Kenstagadurioù
+layers.title=Diskouez ar gwiskadoù (daou-glikañ evit adderaouekaat an holl gwiskadoù d'o stad dre ziouer)
+layers_label=Gwiskadoù
 thumbs.title=Diskouez ar melvennoù
 thumbs_label=Melvennoù
 findbar.title=Klask e-barzh an teuliad
 findbar_label=Klask
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Pajenn {{page}}
+additional_layers=Gwiskadoù ouzhpenn
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Pajenn {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -199,17 +198,17 @@ error_less_info=Nebeutoc'h a ditouroù
 error_close=Serriñ
 # LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
 # replaced by the PDF.JS version and build ID.
-error_version_info=PDF.js handelv {{version}} (kempunadur : {{build}})
+error_version_info=PDF.js handelv {{version}} (kempunadur: {{build}})
 # LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
 # english string describing the error.
-error_message=Kemennadenn : {{message}}
+error_message=Kemennadenn: {{message}}
 # LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
 # trace.
-error_stack=Torn : {{stack}}
+error_stack=Torn: {{stack}}
 # LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
-error_file=Restr : {{file}}
+error_file=Restr: {{file}}
 # LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
-error_line=Linenn : {{line}}
+error_line=Linenn: {{line}}
 rendering_error=Degouezhet ez eus bet ur fazi e-pad skrammañ ar bajennad.
 
 # Predefined zoom values
@@ -222,7 +221,7 @@ page_scale_actual=Ment wir
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Fazi
+loading=O kargañ…
 loading_error=Degouezhet ez eus bet ur fazi e-pad kargañ ar PDF.
 invalid_file_error=Restr PDF didalvoudek pe kontronet.
 missing_file_error=Restr PDF o vankout.
@@ -242,6 +241,6 @@ password_invalid=Ger-tremen didalvoudek. Klaskit en-dro mar plij.
 password_ok=Mat eo
 password_cancel=Nullañ
 
-printing_not_supported=Kemenn : N'eo ket skoret penn-da-benn ar moullañ gant ar merdeer-mañ.
-printing_not_ready=Kemenn : N'hall ket bezañ moullet ar restr PDF rak n'eo ket karget penn-da-benn.
-web_fonts_disabled=Diweredekaet eo an nodrezhoù web : n'haller ket arverañ an nodrezhoù PDF enframmet.
+printing_not_supported=Kemenn: N'eo ket skoret penn-da-benn ar moullañ gant ar merdeer-mañ.
+printing_not_ready=Kemenn: N'hall ket bezañ moullet ar restr PDF rak n'eo ket karget penn-da-benn.
+web_fonts_disabled=Diweredekaet eo an nodrezhoù web: n'haller ket arverañ an nodrezhoù PDF enframmet.
diff --git a/cps/static/locale/brx/viewer.properties b/cps/static/locale/brx/viewer.properties
index cd3656380..3d1c92ddd 100644
--- a/cps/static/locale/brx/viewer.properties
+++ b/cps/static/locale/brx/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=दानि नुथाय
 tools.title=टुल
 tools_label=टुल
 first_page.title=गिबि बिलाइआव थां
-first_page.label=गिबि बिलाइआव थां
 first_page_label=गिबि बिलाइआव थां
 last_page.title=जोबथा बिलाइआव थां
-last_page.label=जोबथा बिलाइआव थां
 last_page_label=जोबथा बिलाइआव थां
 page_rotate_cw.title=घरि गिदिंनाय फार्से फिदिं
-page_rotate_cw.label=घरि गिदिंनाय फार्से फिदिं
 page_rotate_cw_label=घरि गिदिंनाय फार्से फिदिं
 page_rotate_ccw.title=घरि गिदिंनाय उल्था फार्से फिदिं
-page_rotate_ccw.label=घरि गिदिंनाय उल्था फार्से फिदिं
 page_rotate_ccw_label=घरि गिदिंनाय उल्था फार्से फिदिं
 
 
@@ -184,8 +180,6 @@ page_scale_actual=थार महर
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=गोरोन्थि
 loading_error=PDF ल'ड खालामनाय समाव मोनसे गोरोन्थि जाबाय।
 invalid_file_error=बाहायजायै एबा गाज्रि जानाय PDF फाइल
 missing_file_error=गोमानाय PDF फाइल
diff --git a/cps/static/locale/bs/viewer.properties b/cps/static/locale/bs/viewer.properties
index e5346cb0c..ec115d03c 100644
--- a/cps/static/locale/bs/viewer.properties
+++ b/cps/static/locale/bs/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Trenutni prikaz
 tools.title=Alati
 tools_label=Alati
 first_page.title=Idi na prvu stranu
-first_page.label=Idi na prvu stranu
 first_page_label=Idi na prvu stranu
 last_page.title=Idi na zadnju stranu
-last_page.label=Idi na zadnju stranu
 last_page_label=Idi na zadnju stranu
 page_rotate_cw.title=Rotiraj u smjeru kazaljke na satu
-page_rotate_cw.label=Rotiraj u smjeru kazaljke na satu
 page_rotate_cw_label=Rotiraj u smjeru kazaljke na satu
 page_rotate_ccw.title=Rotiraj suprotno smjeru kazaljke na satu
-page_rotate_ccw.label=Rotiraj suprotno smjeru kazaljke na satu
 page_rotate_ccw_label=Rotiraj suprotno smjeru kazaljke na satu
 
 cursor_text_select_tool.title=Omogući alat za označavanje teksta
@@ -118,7 +114,6 @@ print_progress_close=Otkaži
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Uključi/isključi bočnu traku
-toggle_sidebar_notification.title=Uključi/isključi sidebar (dokument sadrži outline/priloge)
 toggle_sidebar_label=Uključi/isključi bočnu traku
 document_outline.title=Prikaži outline dokumenta (dvoklik za skupljanje/širenje svih stavki)
 document_outline_label=Konture dokumenta
@@ -178,8 +173,6 @@ page_scale_actual=Stvarna veličina
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Greška
 loading_error=Došlo je do greške prilikom učitavanja PDF-a.
 invalid_file_error=Neispravan ili oštećen PDF fajl.
 missing_file_error=Nedostaje PDF fajl.
diff --git a/cps/static/locale/ca/viewer.properties b/cps/static/locale/ca/viewer.properties
index ac6fb779f..21e7dff92 100644
--- a/cps/static/locale/ca/viewer.properties
+++ b/cps/static/locale/ca/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vista actual
 tools.title=Eines
 tools_label=Eines
 first_page.title=Vés a la primera pàgina
-first_page.label=Vés a la primera pàgina
 first_page_label=Vés a la primera pàgina
 last_page.title=Vés a l'última pàgina
-last_page.label=Vés a l'última pàgina
 last_page_label=Vés a l'última pàgina
 page_rotate_cw.title=Gira cap a la dreta
-page_rotate_cw.label=Gira cap a la dreta
 page_rotate_cw_label=Gira cap a la dreta
 page_rotate_ccw.title=Gira cap a l'esquerra
-page_rotate_ccw.label=Gira cap a l'esquerra
 page_rotate_ccw_label=Gira cap a l'esquerra
 
 cursor_text_select_tool.title=Habilita l'eina de selecció de text
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Eina de selecció de text
 cursor_hand_tool.title=Habilita l'eina de mà
 cursor_hand_tool_label=Eina de mà
 
+scroll_page.title=Usa el desplaçament de pàgina
+scroll_page_label=Desplaçament de pàgina
 scroll_vertical.title=Utilitza el desplaçament vertical
 scroll_vertical_label=Desplaçament vertical
 scroll_horizontal.title=Utilitza el desplaçament horitzontal
@@ -137,19 +135,24 @@ print_progress_close=Cancel·la
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Mostra/amaga la barra lateral
-toggle_sidebar_notification.title=Mostra/amaga la barra lateral (el document conté un esquema o adjuncions)
+toggle_sidebar_notification2.title=Mostra/amaga la barra lateral (el document conté un esquema, adjuncions o capes)
 toggle_sidebar_label=Mostra/amaga la barra lateral
 document_outline.title=Mostra l'esquema del document (doble clic per ampliar/reduir tots els elements)
-document_outline_label=Contorn del document
+document_outline_label=Esquema del document
 attachments.title=Mostra les adjuncions
 attachments_label=Adjuncions
+layers.title=Mostra les capes (doble clic per restablir totes les capes al seu estat per defecte)
+layers_label=Capes
 thumbs.title=Mostra les miniatures
 thumbs_label=Miniatures
+current_outline_item.title=Cerca l'element d'esquema actual
+current_outline_item_label=Element d'esquema actual
 findbar.title=Cerca al document
 findbar_label=Cerca
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Pàgina {{page}}
+additional_layers=Capes addicionals
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Pàgina {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -213,7 +216,7 @@ error_line=Línia: {{line}}
 rendering_error=S'ha produït un error mentre es renderitzava la pàgina.
 
 # Predefined zoom values
-page_scale_width=Amplària de la pàgina
+page_scale_width=Amplada de la pàgina
 page_scale_fit=Ajusta la pàgina
 page_scale_auto=Zoom automàtic
 page_scale_actual=Mida real
@@ -222,7 +225,7 @@ page_scale_actual=Mida real
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=S'està carregant…
 loading_error=S'ha produït un error en carregar el PDF.
 invalid_file_error=El fitxer PDF no és vàlid o està malmès.
 missing_file_error=Falta el fitxer PDF.
diff --git a/cps/static/locale/cak/viewer.properties b/cps/static/locale/cak/viewer.properties
index d4eae51a8..1828641ea 100644
--- a/cps/static/locale/cak/viewer.properties
+++ b/cps/static/locale/cak/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Rutzub'al wakami
 tools.title=Samajib'äl
 tools_label=Samajib'äl
 first_page.title=Tib'e pa nab'ey ruxaq
-first_page.label=Tib'e pa nab'ey ruxaq
 first_page_label=Tib'e pa nab'ey ruxaq
 last_page.title=Tib'e pa ruk'isib'äl ruxaq
-last_page.label=Tib'e pa ruk'isib'äl ruxaq
 last_page_label=Tib'e pa ruk'isib'äl ruxaq
 page_rotate_cw.title=Tisutïx pan ajkiq'a'
-page_rotate_cw.label=Tisutïx pan ajkiq'a'
 page_rotate_cw_label=Tisutïx pan ajkiq'a'
 page_rotate_ccw.title=Tisutïx pan ajxokon
-page_rotate_ccw.label=Tisutïx pan ajxokon
 page_rotate_ccw_label=Tisutïx pan ajxokon
 
 cursor_text_select_tool.title=Titzij ri rusamajib'al Rucha'ik Rucholajem Tzij
@@ -137,19 +133,24 @@ print_progress_close=Tiq'at
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Tijal ri ajxikin kajtz'ik
-toggle_sidebar_notification.title=Tik'ex ri ajxikin yuqkajtz'ik (ri wuj eruk'wan taq ruchi'/taqoj taq yakb'äl)
+toggle_sidebar_notification2.title=Tik'ex ri ajxikin yuqkajtz'ik (ri wuj eruk'wan taq ruchi'/taqo/kuchuj)
 toggle_sidebar_label=Tijal ri ajxikin kajtz'ik
 document_outline.title=Tik'ut pe ruch'akulal wuj (kamul-pitz'oj richin nirik'/nich'utinirisäx ronojel ruch'akulal)
 document_outline_label=Ruch'akulal wuj
 attachments.title=Kek'ut pe ri taq taqoj
 attachments_label=Taq taqoj
+layers.title=Kek'ut taq Kuchuj (ka'i'-pitz' richin yetzolïx ronojel ri taq kuchuj e k'o wi)
+layers_label=Taq kuchuj
 thumbs.title=Kek'ut pe taq ch'utiq
 thumbs_label=Koköj
+current_outline_item.title=Kekanöx  Taq Ch'akulal Kik'wan Chib'äl
+current_outline_item_label=Taq Ch'akulal Kik'wan Chib'äl
 findbar.title=Tikanöx chupam ri wuj
 findbar_label=Tikanöx
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Ruxaq {{page}}
+additional_layers=Tz'aqat ta Kuchuj
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Ruxaq {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -222,7 +223,7 @@ page_scale_actual=Runimilem Wakami
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Sachoj
+loading=Nisamäj…
 loading_error=\u0020Xk'ulwachitäj jun sach'oj toq xnuk'ux ri PDF .
 invalid_file_error=Man oke ta o yujtajinäq ri PDF yakb'äl.
 missing_file_error=Man xilitäj ta ri PDF yakb'äl.
diff --git a/cps/static/locale/ckb/viewer.properties b/cps/static/locale/ckb/viewer.properties
index d1bed431b..b30cb7672 100644
--- a/cps/static/locale/ckb/viewer.properties
+++ b/cps/static/locale/ckb/viewer.properties
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 # Main toolbar buttons (tooltips and alt text for images)
+previous.title=پەڕەی پێشوو
+previous_label=پێشوو
 next.title=پەڕەی دوواتر
 next_label=دوواتر
 
@@ -20,92 +22,212 @@ next_label=دوواتر
 page.title=پەرە
 # LOCALIZATION NOTE (of_pages): "{{pagesCount}}" will be replaced by a number
 # representing the total number of pages in the document.
+of_pages=لە {{pagesCount}}
 # LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
 # will be replaced by a number representing the currently visible page,
 # respectively a number representing the total number of pages in the document.
+page_of_pages=({{pageNumber}} لە {{pagesCount}})
 
+zoom_out.title=ڕۆچوونی
+zoom_out_label=ڕۆچوونی
+zoom_in.title=هێنانەپێش
+zoom_in_label=هێنانەپێش
+zoom.title=زووم
+presentation_mode.title=گۆڕین بۆ دۆخی پێشکەشکردن
+presentation_mode_label=دۆخی پێشکەشکردن
 open_file.title=پەڕگە بکەرەوە
 open_file_label=کردنەوە
 print.title=چاپکردن
+print_label=چاپکردن
 download.title=داگرتن
+download_label=داگرتن
+bookmark.title=پێشبینینی ئێستا(لەبەریبگرەوە یان پەنجەرەیەکی نوێ بکەرەوە)
+bookmark_label=پیشبینینی ئێستا
 
 # Secondary toolbar and context menu
 tools.title=ئامرازەکان
+tools_label=ئامرازەکان
 first_page.title=برۆ بۆ یەکەم پەڕە
+first_page_label=بڕۆ بۆ یەکەم پەڕە
+last_page.title=بڕۆ بۆ کۆتا پەڕە
+last_page_label=بڕۆ بۆ کۆتا پەڕە
+page_rotate_cw.title=ئاڕاستەی میلی کاتژمێر
+page_rotate_cw_label=ئاڕاستەی میلی کاتژمێر
+page_rotate_ccw.title=پێچەوانەی میلی کاتژمێر
+page_rotate_ccw_label=پێچەوانەی میلی کاتژمێر
 
+cursor_text_select_tool.title=توڵامرازی نیشانکەری دەق چالاک بکە
+cursor_text_select_tool_label=توڵامرازی نیشانکەری دەق
+cursor_hand_tool.title=توڵامرازی دەستی چالاک بکە
+cursor_hand_tool_label=توڵامرازی دەستی
 
+scroll_vertical.title=ناردنی ئەستوونی بەکاربێنە
+scroll_vertical_label=ناردنی ئەستوونی
+scroll_horizontal.title=ناردنی ئاسۆیی بەکاربێنە
+scroll_horizontal_label=ناردنی ئاسۆیی 
+scroll_wrapped.title=ناردنی لوولکراو بەکاربێنە
+scroll_wrapped_label=ناردنی لوولکراو 
 
 
 # Document properties dialog box
+document_properties.title=تایبەتمەندییەکانی بەڵگەنامە...
+document_properties_label=تایبەتمەندییەکانی بەڵگەنامە...
 document_properties_file_name=ناوی پەڕگە:
 document_properties_file_size=قەبارەی پەڕگە:
 # LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in kilobytes, respectively in bytes.
+document_properties_kb={{size_kb}} کب ({{size_b}} بایت)
 # LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in megabytes, respectively in bytes.
+document_properties_mb={{size_mb}} مب ({{size_b}} بایت)
 document_properties_title=سەردێڕ:
 document_properties_author=نووسەر
+document_properties_subject=بابەت:
 document_properties_keywords=کلیلەوشە:
+document_properties_creation_date=بەرواری درووستکردن:
+document_properties_modification_date=بەرواری دەستکاریکردن:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
 # will be replaced by the creation/modification date, and time, of the PDF file.
+document_properties_date_string={{date}}, {{time}}
+document_properties_creator=درووستکەر:
+document_properties_producer=بەرهەمهێنەری PDF:
+document_properties_version=وەشانی PDF:
+document_properties_page_count=ژمارەی پەرەکان:
+document_properties_page_size=قەبارەی پەڕە:
+document_properties_page_size_unit_inches=ئینچ
+document_properties_page_size_unit_millimeters=ملم
+document_properties_page_size_orientation_portrait=پۆرترەیت(درێژ)
+document_properties_page_size_orientation_landscape=پانیی
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=نامە
+document_properties_page_size_name_legal=یاسایی
 # LOCALIZATION NOTE (document_properties_page_size_dimension_string):
 # "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
 # the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
 # LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
 # "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
 # the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=پیشاندانی وێبی خێرا:
+document_properties_linearized_yes=بەڵێ
+document_properties_linearized_no=نەخێر
 document_properties_close=داخستن
 
+print_progress_message=بەڵگەنامە ئامادەدەکرێت بۆ چاپکردن...
 # LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
 # a numerical per cent value.
+print_progress_percent={{progress}}%
 print_progress_close=پاشگەزبوونەوە
 
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
+toggle_sidebar.title=لاتەنیشت پیشاندان/شاردنەوە
+toggle_sidebar_label=لاتەنیشت پیشاندان/شاردنەوە
+document_outline_label=سنووری چوارچێوە
+attachments.title=پاشکۆکان پیشان بدە
+attachments_label=پاشکۆکان
+layers_label=چینەکان
+thumbs.title=وێنۆچکە پیشان بدە
+thumbs_label=وێنۆچکە
+findbar.title=لە بەڵگەنامە بگەرێ
 findbar_label=دۆزینەوە
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
+additional_layers=چینی زیاتر
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
+thumb_page_title=پەڕەی {{page}}
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
+thumb_page_canvas=وێنۆچکەی پەڕەی {{page}}
 
 # Find panel button title and messages
 find_input.title=دۆزینەوە
+find_input.placeholder=لە بەڵگەنامە بگەرێ...
+find_previous.title=هەبوونی پێشوو بدۆزرەوە لە ڕستەکەدا
+find_previous_label=پێشوو
+find_next.title=هەبوونی داهاتوو بدۆزەرەوە لە ڕستەکەدا
+find_next_label=دوواتر
+find_highlight=هەمووی نیشانە بکە
+find_match_case_label=دۆخی لەیەکچوون
+find_entire_word_label=هەموو وشەکان
+find_reached_top=گەشتیتە سەرەوەی بەڵگەنامە، لە خوارەوە دەستت پێکرد
+find_reached_bottom=گەشتیتە کۆتایی بەڵگەنامە. لەسەرەوە دەستت پێکرد
 # LOCALIZATION NOTE (find_match_count): The supported plural forms are
 # [one|two|few|many|other], with [other] as the default value.
 # "{{current}}" and "{{total}}" will be replaced by a number representing the
 # index of the currently active find result, respectively a number representing
 # the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} لە کۆی {{total}} لەیەکچوو
+find_match_count[two]={{current}} لە کۆی {{total}} لەیەکچوو
+find_match_count[few]={{current}} لە کۆی {{total}} لەیەکچوو
+find_match_count[many]={{current}} لە کۆی {{total}} لەیەکچوو
+find_match_count[other]={{current}} لە کۆی {{total}} لەیەکچوو
 # LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
 # [zero|one|two|few|many|other], with [other] as the default value.
 # "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=زیاتر لە {{limit}} لەیەکچوو
+find_match_count_limit[one]=زیاتر لە {{limit}} لەیەکچوو
+find_match_count_limit[two]=زیاتر لە {{limit}} لەیەکچوو
+find_match_count_limit[few]=زیاتر لە {{limit}} لەیەکچوو
+find_match_count_limit[many]=زیاتر لە {{limit}} لەیەکچوو
+find_match_count_limit[other]=زیاتر لە {{limit}} لەیەکچوو
+find_not_found=نووسین نەدۆزرایەوە
 
 # Error panel labels
+error_more_info=زانیاری زیاتر
+error_less_info=زانیاری کەمتر
+error_close=داخستن
 # LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
 # replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (build: {{build}})
 # LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
 # english string describing the error.
+error_message=پەیام: {{message}}
 # LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
 # trace.
+error_stack=لەسەریەک: {{stack}}
 # LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=پەڕگە: {{file}}
 # LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=هێڵ: {{line}}
+rendering_error=هەڵەیەک ڕوویدا لە کاتی پوختەکردنی (ڕێندەر) پەڕە.
 
 # Predefined zoom values
+page_scale_width=پانی پەڕە
+page_scale_fit=پڕبوونی پەڕە
+page_scale_auto=زوومی خۆکار
+page_scale_actual=قەبارەی ڕاستی
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
+page_scale_percent={{scale}}%
 
-# Loading indicator messages
+loading_error=هەڵەیەک ڕوویدا لە کاتی بارکردنی  PDF.
+invalid_file_error=پەڕگەی pdf تێکچووە یان نەگونجاوە.
+missing_file_error=پەڕگەی pdf بوونی نیە.
+unexpected_response_error=وەڵامی ڕاژەخوازی نەخوازراو.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
 # replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
 
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type.alt=[{{type}} سەرنج]
+password_label=وشەی تێپەڕ بنووسە بۆ کردنەوەی پەڕگەی pdf.
+password_invalid=وشەی تێپەڕ هەڵەیە. تکایە دووبارە هەوڵ بدەرەوە.
+password_ok=باشە
+password_cancel=پاشگەزبوونەوە
 
+printing_not_supported=ئاگاداربە: چاپکردن بە تەواوی پشتگیر ناکرێت لەم وێبگەڕە.
+printing_not_ready=ئاگاداربە: PDF بە تەواوی بارنەبووە بۆ چاپکردن.
+web_fonts_disabled=جۆرەپیتی وێب ناچالاکە: نەتوانی جۆرەپیتی تێخراوی ناو pdfـەکە بەکاربێت.
diff --git a/cps/static/locale/cs/viewer.properties b/cps/static/locale/cs/viewer.properties
index 646f410bb..1bf8f00b3 100644
--- a/cps/static/locale/cs/viewer.properties
+++ b/cps/static/locale/cs/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Současný pohled
 tools.title=Nástroje
 tools_label=Nástroje
 first_page.title=Přejde na první stránku
-first_page.label=Přejít na první stránku
 first_page_label=Přejít na první stránku
 last_page.title=Přejde na poslední stránku
-last_page.label=Přejít na poslední stránku
 last_page_label=Přejít na poslední stránku
 page_rotate_cw.title=Otočí po směru hodin
-page_rotate_cw.label=Otočit po směru hodin
 page_rotate_cw_label=Otočit po směru hodin
 page_rotate_ccw.title=Otočí proti směru hodin
-page_rotate_ccw.label=Otočit proti směru hodin
 page_rotate_ccw_label=Otočit proti směru hodin
 
 cursor_text_select_tool.title=Povolí výběr textu
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Výběr textu
 cursor_hand_tool.title=Povolí nástroj ručička
 cursor_hand_tool_label=Nástroj ručička
 
+scroll_page.title=Posouvat po stránkách
+scroll_page_label=Posouvání po stránkách
 scroll_vertical.title=Použít svislé posouvání
 scroll_vertical_label=Svislé posouvání
 scroll_horizontal.title=Použít vodorovné posouvání
@@ -137,19 +135,24 @@ print_progress_close=Zrušit
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Postranní lišta
-toggle_sidebar_notification.title=Přepne postranní lištu (dokument obsahuje osnovu/přílohy)
+toggle_sidebar_notification2.title=Přepnout postranní lištu (dokument obsahuje osnovu/přílohy/vrstvy)
 toggle_sidebar_label=Postranní lišta
-document_outline.title=Zobrazí osnovu dokumentu (dvojité klepnutí rozbalí/sbalí všechny položky)
+document_outline.title=Zobrazí osnovu dokumentu (poklepání přepne zobrazení všech položek)
 document_outline_label=Osnova dokumentu
 attachments.title=Zobrazí přílohy
 attachments_label=Přílohy
+layers.title=Zobrazit vrstvy (poklepáním obnovíte všechny vrstvy do výchozího stavu)
+layers_label=Vrstvy
 thumbs.title=Zobrazí náhledy
 thumbs_label=Náhledy
+current_outline_item.title=Najít aktuální položku v osnově
+current_outline_item_label=Aktuální položka v osnově
 findbar.title=Najde v dokumentu
 findbar_label=Najít
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Strana {{page}}
+additional_layers=Další vrstvy
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Strana {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Najde další výskyt hledaného textu
 find_next_label=Další
 find_highlight=Zvýraznit
 find_match_case_label=Rozlišovat velikost
+find_match_diacritics_label=Rozlišovat diakritiku
 find_entire_word_label=Celá slova
 find_reached_top=Dosažen začátek dokumentu, pokračuje se od konce
 find_reached_bottom=Dosažen konec dokumentu, pokračuje se od začátku
@@ -222,7 +226,7 @@ page_scale_actual=Skutečná velikost
 page_scale_percent={{scale}} %
 
 # Loading indicator messages
-loading_error_indicator=Chyba
+loading=Načítání…
 loading_error=Při nahrávání PDF nastala chyba.
 invalid_file_error=Neplatný nebo chybný soubor PDF.
 missing_file_error=Chybí soubor PDF.
@@ -245,3 +249,31 @@ password_cancel=Zrušit
 printing_not_supported=Upozornění: Tisk není v tomto prohlížeči plně podporován.
 printing_not_ready=Upozornění: Dokument PDF není kompletně načten.
 web_fonts_disabled=Webová písma jsou zakázána, proto není možné použít vložená písma PDF.
+
+# Editor
+editor_none.title=Zakázat úpravy anotací
+editor_none_label=Zakázat úpravy
+editor_free_text.title=Přidat textovou anotaci
+editor_free_text_label=Textová anotace
+editor_ink.title=Přidat psanou anotaci
+editor_ink_label=Psaná anotace
+
+free_text_default_content=Zadejte text…
+
+# Editor Parameters
+editor_free_text_font_color=Barva písma
+editor_free_text_font_size=Velikost písma
+editor_ink_line_color=Barva čáry
+editor_ink_line_thickness=Tloušťka čáry
+
+# Editor Parameters
+editor_free_text_color=Barva
+editor_free_text_size=Velikost
+editor_ink_color=Barva
+editor_ink_thickness=Tloušťka
+editor_ink_opacity=Průhlednost
+
+# Editor aria
+editor_free_text_aria_label=Editor textu
+editor_ink_aria_label=Editor psaní rukou
+editor_ink_canvas_aria_label=Uživatelem vytvořený obrázek
diff --git a/cps/static/locale/cy/viewer.properties b/cps/static/locale/cy/viewer.properties
index 16cda5fd7..b5d064709 100644
--- a/cps/static/locale/cy/viewer.properties
+++ b/cps/static/locale/cy/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Golwg Gyfredol
 tools.title=Offer
 tools_label=Offer
 first_page.title=Mynd i'r Dudalen Gyntaf
-first_page.label=Mynd i'r Dudalen Gyntaf
 first_page_label=Mynd i'r Dudalen Gyntaf
 last_page.title=Mynd i'r Dudalen Olaf
-last_page.label=Mynd i'r Dudalen Olaf
 last_page_label=Mynd i'r Dudalen Olaf
 page_rotate_cw.title=Cylchdroi Clocwedd
-page_rotate_cw.label=Cylchdroi Clocwedd
 page_rotate_cw_label=Cylchdroi Clocwedd
 page_rotate_ccw.title=Cylchdroi Gwrthglocwedd
-page_rotate_ccw.label=Cylchdroi Gwrthglocwedd
 page_rotate_ccw_label=Cylchdroi Gwrthglocwedd
 
 cursor_text_select_tool.title=Galluogi Dewis Offeryn Testun
@@ -65,19 +61,21 @@ cursor_text_select_tool_label=Offeryn Dewis Testun
 cursor_hand_tool.title=Galluogi Offeryn Llaw
 cursor_hand_tool_label=Offeryn Llaw
 
+scroll_page.title=Defnyddio Sgrolio Tudalen
+scroll_page_label=Sgrolio Tudalen
 scroll_vertical.title=Defnyddio Sgrolio Fertigol
 scroll_vertical_label=Sgrolio Fertigol
-scroll_horizontal.title=Defnyddio Sgrolio Fertigol
-scroll_horizontal_label=Sgrolio Fertigol
+scroll_horizontal.title=Defnyddio Sgrolio Llorweddol
+scroll_horizontal_label=Sgrolio Llorweddol
 scroll_wrapped.title=Defnyddio Sgrolio Amlapio
 scroll_wrapped_label=Sgrolio Amlapio
 
-spread_none.title=Peidio uno taeniadau canol
-spread_none_label=Dim Taeniadau
-spread_odd.title=Uno taeniadau tudalen yn cychwyn gyda thudalennau odrif
-spread_odd_label=Taeniadau Odrifau
-spread_even.title=Uno taeniadau tudalen yn cychwyn gyda thudalennau eilrif
-spread_even_label=Taeniadau Eilrif
+spread_none.title=Peidio uno trawsdaleniadau
+spread_none_label=Dim Trawsdaleniadau
+spread_odd.title=Uno trawsdaleniadau gan gychwyn gyda thudalennau odrif
+spread_odd_label=Trawsdaleniadau Odrif
+spread_even.title=Uno trawsdaleniadau gan gychwyn gyda thudalennau eilrif
+spread_even_label=Trawsdaleniadau Eilrif
 
 # Document properties dialog box
 document_properties.title=Priodweddau Dogfen…
@@ -137,19 +135,24 @@ print_progress_close=Diddymu
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Toglo'r Bar Ochr
-toggle_sidebar_notification.title=Toglo'r Bar Ochr (mae'r ddogfen yn cynnwys outline/attachments)
+toggle_sidebar_notification2.title=Toglo'r Bar Ochr (mae'r ddogfen yn cynnwys amlinelliadau/atodiadau/haenau)
 toggle_sidebar_label=Toglo'r Bar Ochr
 document_outline.title=Dangos Amlinell Dogfen (clic dwbl i ymestyn/cau pob eitem)
 document_outline_label=Amlinelliad Dogfen
 attachments.title=Dangos Atodiadau
 attachments_label=Atodiadau
+layers.title=Dangos Haenau (cliciwch ddwywaith i ailosod yr holl haenau i'r cyflwr rhagosodedig)
+layers_label=Haenau
 thumbs.title=Dangos Lluniau Bach
 thumbs_label=Lluniau Bach
+current_outline_item.title=Canfod yr Eitem Amlinellol Gyfredol
+current_outline_item_label=Yr Eitem Amlinellol Gyfredol
 findbar.title=Canfod yn y Ddogfen
 findbar_label=Canfod
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Tudalen {{page}}
+additional_layers=Haenau Ychwanegol
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Tudalen {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Canfod enghraifft nesaf yr ymadrodd
 find_next_label=Nesaf
 find_highlight=Amlygu popeth
 find_match_case_label=Cydweddu maint
+find_match_diacritics_label=Diacritigau Cyfatebol
 find_entire_word_label=Geiriau cyfan
 find_reached_top=Wedi cyrraedd brig y dudalen, parhau o'r gwaelod
 find_reached_bottom=Wedi cyrraedd diwedd y dudalen, parhau o'r brig
@@ -222,7 +226,7 @@ page_scale_actual=Maint Gwirioneddol
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Gwall
+loading=Yn llwytho…
 loading_error=Digwyddodd gwall wrth lwytho'r PDF.
 invalid_file_error=Ffeil PDF annilys neu llwgr.
 missing_file_error=Ffeil PDF coll.
@@ -245,3 +249,33 @@ password_cancel=Diddymu
 printing_not_supported=Rhybudd: Nid yw argraffu yn cael ei gynnal yn llawn gan y porwr.
 printing_not_ready=Rhybudd: Nid yw'r PDF wedi ei lwytho'n llawn ar gyfer argraffu.
 web_fonts_disabled=Ffontiau gwe wedi eu hanalluogi: methu defnyddio ffontiau PDF mewnblanedig.
+
+# Editor
+editor_none.title=Analluogi Golygu Anodi
+editor_none_label=Analluogi Golygu
+editor_free_text.title=Ychwanegu Anodiad Testun Rhydd
+editor_free_text_label=Anodi Testun Rhydd
+editor_ink.title=Ychwanegu Anodiad Inc
+editor_ink_label=Ychwanegu Anodiad Inc
+
+freetext_default_content=Rhowch ychydig o destun…
+
+free_text_default_content=Rhowch destun…
+
+# Editor Parameters
+editor_free_text_font_color=Lliw Ffont
+editor_free_text_font_size=Maint Ffont
+editor_ink_line_color=Lliw Llinell
+editor_ink_line_thickness=Trwch Llinell
+
+# Editor Parameters
+editor_free_text_color=Lliw
+editor_free_text_size=Maint
+editor_ink_color=Lliw
+editor_ink_thickness=Trwch
+editor_ink_opacity=Didreiddedd
+
+# Editor aria
+editor_free_text_aria_label=Golygydd FreeText
+editor_ink_aria_label=Golygydd Inc
+editor_ink_canvas_aria_label=Delwedd wedi'i chreu gan ddefnyddwyr
diff --git a/cps/static/locale/da/viewer.properties b/cps/static/locale/da/viewer.properties
index 38ed99d0b..213f4314f 100644
--- a/cps/static/locale/da/viewer.properties
+++ b/cps/static/locale/da/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Aktuel visning
 tools.title=Funktioner
 tools_label=Funktioner
 first_page.title=Gå til første side
-first_page.label=Gå til første side
 first_page_label=Gå til første side
 last_page.title=Gå til sidste side
-last_page.label=Gå til sidste side
 last_page_label=Gå til sidste side
 page_rotate_cw.title=Roter med uret
-page_rotate_cw.label=Roter med uret
 page_rotate_cw_label=Roter med uret
 page_rotate_ccw.title=Roter mod uret
-page_rotate_ccw.label=Roter mod uret
 page_rotate_ccw_label=Roter mod uret
 
 cursor_text_select_tool.title=Aktiver markeringsværktøj
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Markeringsværktøj
 cursor_hand_tool.title=Aktiver håndværktøj
 cursor_hand_tool_label=Håndværktøj
 
+scroll_page.title=Brug sidescrolling
+scroll_page_label=Sidescrolling
 scroll_vertical.title=Brug vertikal scrolling
 scroll_vertical_label=Vertikal scrolling
 scroll_horizontal.title=Brug horisontal scrolling
@@ -137,19 +135,24 @@ print_progress_close=Annuller
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Slå sidepanel til eller fra
-toggle_sidebar_notification.title=Slå sidepanel til eller fra (dokumentet indeholder disposition/vedhæftede filer)
+toggle_sidebar_notification2.title=Slå sidepanel til eller fra (dokumentet indeholder disposition/vedhæftede filer/lag)
 toggle_sidebar_label=Slå sidepanel til eller fra
 document_outline.title=Vis dokumentets disposition (dobbeltklik for at vise/skjule alle elementer)
 document_outline_label=Dokument-disposition
 attachments.title=Vis vedhæftede filer
 attachments_label=Vedhæftede filer
+layers.title=Vis lag (dobbeltklik for at nulstille alle lag til standard-tilstanden)
+layers_label=Lag
 thumbs.title=Vis miniaturer
 thumbs_label=Miniaturer
+current_outline_item.title=Find det aktuelle dispositions-element
+current_outline_item_label=Aktuelt dispositions-element
 findbar.title=Find i dokument
 findbar_label=Find
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Side {{page}}
+additional_layers=Yderligere lag
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Side {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Find den næste forekomst
 find_next_label=Næste
 find_highlight=Fremhæv alle
 find_match_case_label=Forskel på store og små bogstaver
+find_match_diacritics_label=Diakritiske tegn
 find_entire_word_label=Hele ord
 find_reached_top=Toppen af siden blev nået, fortsatte fra bunden
 find_reached_bottom=Bunden af siden blev nået, fortsatte fra toppen
@@ -222,7 +226,7 @@ page_scale_actual=Faktisk størrelse
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Fejl
+loading=Indlæser…
 loading_error=Der opstod en fejl ved indlæsning af PDF-filen.
 invalid_file_error=PDF-filen er ugyldig eller ødelagt.
 missing_file_error=Manglende PDF-fil.
@@ -245,3 +249,19 @@ password_cancel=Fortryd
 printing_not_supported=Advarsel: Udskrivning er ikke fuldt understøttet af browseren.
 printing_not_ready=Advarsel: PDF-filen er ikke fuldt indlæst til udskrivning.
 web_fonts_disabled=Webskrifttyper er deaktiverede. De indlejrede skrifttyper i PDF-filen kan ikke anvendes.
+
+# Editor
+editor_none.title=Deaktiver redigering af anmærkninger
+editor_none_label=Deaktiver redigering
+editor_ink.title=Tilføj håndskreven anmærkning
+editor_ink_label=Håndskreven anmærkning
+
+freetext_default_content=Indtast noget tekst…
+
+free_text_default_content=Indtast tekst…
+
+# Editor Parameters
+editor_free_text_font_color=Skriftfarve
+editor_free_text_font_size=Skriftstørrelse
+editor_ink_line_color=Linjefarve
+editor_ink_line_thickness=Linjetykkelse
diff --git a/cps/static/locale/de/viewer.properties b/cps/static/locale/de/viewer.properties
index 26b682ebe..5afa6db26 100644
--- a/cps/static/locale/de/viewer.properties
+++ b/cps/static/locale/de/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Aktuelle Ansicht
 tools.title=Werkzeuge
 tools_label=Werkzeuge
 first_page.title=Erste Seite anzeigen
-first_page.label=Erste Seite anzeigen
 first_page_label=Erste Seite anzeigen
 last_page.title=Letzte Seite anzeigen
-last_page.label=Letzte Seite anzeigen
 last_page_label=Letzte Seite anzeigen
 page_rotate_cw.title=Im Uhrzeigersinn drehen
-page_rotate_cw.label=Im Uhrzeigersinn drehen
 page_rotate_cw_label=Im Uhrzeigersinn drehen
 page_rotate_ccw.title=Gegen Uhrzeigersinn drehen
-page_rotate_ccw.label=Gegen Uhrzeigersinn drehen
 page_rotate_ccw_label=Gegen Uhrzeigersinn drehen
 
 cursor_text_select_tool.title=Textauswahl-Werkzeug aktivieren
@@ -65,11 +61,13 @@ cursor_text_select_tool_label=Textauswahl-Werkzeug
 cursor_hand_tool.title=Hand-Werkzeug aktivieren
 cursor_hand_tool_label=Hand-Werkzeug
 
+scroll_page.title=Seiten einzeln anordnen
+scroll_page_label=Einzelseitenanordnung
 scroll_vertical.title=Seiten übereinander anordnen
 scroll_vertical_label=Vertikale Seitenanordnung
 scroll_horizontal.title=Seiten nebeneinander anordnen
 scroll_horizontal_label=Horizontale Seitenanordnung
-scroll_wrapped.title=Seiten neben- und übereinander anordnen, anhängig vom Platz
+scroll_wrapped.title=Seiten neben- und übereinander anordnen, abhängig vom Platz
 scroll_wrapped_label=Kombinierte Seitenanordnung
 
 spread_none.title=Seiten nicht nebeneinander anzeigen
@@ -137,19 +135,24 @@ print_progress_close=Abbrechen
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Sidebar umschalten
-toggle_sidebar_notification.title=Sidebar umschalten (Dokument enthält Dokumentstruktur/Anhänge)
+toggle_sidebar_notification2.title=Sidebar umschalten (Dokument enthält Dokumentstruktur/Anhänge/Ebenen)
 toggle_sidebar_label=Sidebar umschalten
 document_outline.title=Dokumentstruktur anzeigen (Doppelklicken, um alle Einträge aus- bzw. einzuklappen)
 document_outline_label=Dokumentstruktur
 attachments.title=Anhänge anzeigen
 attachments_label=Anhänge
+layers.title=Ebenen anzeigen (Doppelklicken, um alle Ebenen auf den Standardzustand zurückzusetzen)
+layers_label=Ebenen
 thumbs.title=Miniaturansichten anzeigen
 thumbs_label=Miniaturansichten
+current_outline_item.title=Aktuelles Struktur-Element finden
+current_outline_item_label=Aktuelles Struktur-Element
 findbar.title=Dokument durchsuchen
 findbar_label=Suchen
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Seite {{page}}
+additional_layers=Zusätzliche Ebenen
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Seite {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Nächstes Vorkommen des Suchbegriffs finden
 find_next_label=Weiter
 find_highlight=Alle hervorheben
 find_match_case_label=Groß-/Kleinschreibung beachten
+find_match_diacritics_label=Akzente
 find_entire_word_label=Ganze Wörter
 find_reached_top=Anfang des Dokuments erreicht, fahre am Ende fort
 find_reached_bottom=Ende des Dokuments erreicht, fahre am Anfang fort
@@ -222,7 +226,7 @@ page_scale_actual=Originalgröße
 page_scale_percent={{scale}} %
 
 # Loading indicator messages
-loading_error_indicator=Fehler
+loading=Wird geladen…
 loading_error=Beim Laden der PDF-Datei trat ein Fehler auf.
 invalid_file_error=Ungültige oder beschädigte PDF-Datei
 missing_file_error=Fehlende PDF-Datei
@@ -245,3 +249,33 @@ password_cancel=Abbrechen
 printing_not_supported=Warnung: Die Drucken-Funktion wird durch diesen Browser nicht vollständig unterstützt.
 printing_not_ready=Warnung: Die PDF-Datei ist nicht vollständig geladen, dies ist für das Drucken aber empfohlen.
 web_fonts_disabled=Web-Schriftarten sind deaktiviert: Eingebettete PDF-Schriftarten konnten nicht geladen werden.
+
+# Editor
+editor_none.title=Bearbeiten von Annotationen deaktivieren
+editor_none_label=Bearbeiten deaktivieren
+editor_free_text.title=FreeText-Annotation hinzufügen
+editor_free_text_label=FreeText-Annotation
+editor_ink.title=Ink-Annotation hinzufügen
+editor_ink_label=Ink-Annotation
+
+freetext_default_content=Text eingeben…
+
+free_text_default_content=Text eingeben…
+
+# Editor Parameters
+editor_free_text_font_color=Schriftfarbe
+editor_free_text_font_size=Schriftgröße
+editor_ink_line_color=Linienfarbe
+editor_ink_line_thickness=Liniendicke
+
+# Editor Parameters
+editor_free_text_color=Farbe
+editor_free_text_size=Größe
+editor_ink_color=Farbe
+editor_ink_thickness=Dicke
+editor_ink_opacity=Deckkraft
+
+# Editor aria
+editor_free_text_aria_label=FreeText-Editor
+editor_ink_aria_label=Ink-Editor
+editor_ink_canvas_aria_label=Vom Benutzer erstelltes Bild
diff --git a/cps/static/locale/dsb/viewer.properties b/cps/static/locale/dsb/viewer.properties
index 468ccd745..d7e5f1a4f 100644
--- a/cps/static/locale/dsb/viewer.properties
+++ b/cps/static/locale/dsb/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Aktualny naglěd
 tools.title=Rědy
 tools_label=Rědy
 first_page.title=K prědnemu bokoju
-first_page.label=K prědnemu bokoju
 first_page_label=K prědnemu bokoju
 last_page.title=K slědnemu bokoju
-last_page.label=K slědnemu bokoju
 last_page_label=K slědnemu bokoju
 page_rotate_cw.title=Wobwjertnuś ako špěra źo
-page_rotate_cw.label=Wobwjertnuś ako špěra źo
 page_rotate_cw_label=Wobwjertnuś ako špěra źo
 page_rotate_ccw.title=Wobwjertnuś nawopaki ako špěra źo
-page_rotate_ccw.label=Wobwjertnuś nawopaki ako špěra źo
 page_rotate_ccw_label=Wobwjertnuś nawopaki ako špěra źo
 
 cursor_text_select_tool.title=Rěd za wuběranje teksta zmóžniś
@@ -65,8 +61,10 @@ cursor_text_select_tool_label=Rěd za wuběranje teksta
 cursor_hand_tool.title=Rucny rěd zmóžniś
 cursor_hand_tool_label=Rucny rěd
 
+scroll_page.title=Kulanje boka wužywaś
+scroll_page_label=Kulanje boka
 scroll_vertical.title=Wertikalne suwanje wužywaś
-scroll_vertical_label=Wertikalnje suwanje
+scroll_vertical_label=Wertikalne suwanje
 scroll_horizontal.title=Horicontalne suwanje wužywaś
 scroll_horizontal_label=Horicontalne suwanje
 scroll_wrapped.title=Pózlažke suwanje wužywaś
@@ -137,19 +135,24 @@ print_progress_close=Pśetergnuś
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Bócnicu pokazaś/schowaś
-toggle_sidebar_notification.title=Bocnicu pśešaltowaś (dokument wopśimujo pśeglěd/pśipiski)
+toggle_sidebar_notification2.title=Bocnicu pśešaltowaś (dokument rozrědowanje/pśipiski/warstwy wopśimujo)
 toggle_sidebar_label=Bócnicu pokazaś/schowaś
 document_outline.title=Dokumentowe naraźenje pokazaś (dwójne kliknjenje, aby se wšykne zapiski pokazali/schowali)
 document_outline_label=Dokumentowa struktura
 attachments.title=Pśidanki pokazaś
 attachments_label=Pśidanki
+layers.title=Warstwy pokazaś (klikniśo dwójcy, aby wšykne warstwy na standardny staw slědk stajił)
+layers_label=Warstwy
 thumbs.title=Miniatury pokazaś
 thumbs_label=Miniatury
+current_outline_item.title=Aktualny rozrědowański zapisk pytaś
+current_outline_item_label=Aktualny rozrědowański zapisk
 findbar.title=W dokumenśe pytaś
 findbar_label=Pytaś
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Bok {{page}}
+additional_layers=Dalšne warstwy
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Bok {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Pśidujuce wustupowanje pytańskego wuraza pytaś
 find_next_label=Dalej
 find_highlight=Wšykne wuzwignuś
 find_match_case_label=Na wjelikopisanje źiwaś
+find_match_diacritics_label=Diakritiske znamuška wužywaś
 find_entire_word_label=Cełe słowa
 find_reached_top=Zachopjeńk dokumenta dostany, pókšacujo se z kóńcom
 find_reached_bottom=Kóńc dokumenta dostany, pókšacujo se ze zachopjeńkom
@@ -222,7 +226,7 @@ page_scale_actual=Aktualna wjelikosć
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Zmólka
+loading=Zacytujo se…
 loading_error=Pśi zacytowanju PDF jo zmólka nastała.
 invalid_file_error=Njepłaśiwa abo wobškóźona PDF-dataja.
 missing_file_error=Felujuca PDF-dataja.
@@ -245,3 +249,33 @@ password_cancel=Pśetergnuś
 printing_not_supported=Warnowanje: Śišćanje njepódpěra se połnje pśez toś ten wobglědowak.
 printing_not_ready=Warnowanje: PDF njejo se za śišćanje dopołnje zacytał.
 web_fonts_disabled=Webpisma su znjemóžnjone: njejo móžno, zasajźone PDF-pisma wužywaś.
+
+# Editor
+editor_none.title=Wobźěłowanje anotacijow znjemóžniś
+editor_none_label=Wobźěłowanje znjemóžniś
+editor_free_text.title=Anotaciju FreeText pśidaś
+editor_free_text_label=Anotacija FreeText
+editor_ink.title=Tintowu anotaciju pśidaś
+editor_ink_label=Tintowa anotacija
+
+freetext_default_content=Zapódajśo pitśku teksta…
+
+free_text_default_content=Tekst zapódaś…
+
+# Editor Parameters
+editor_free_text_font_color=Pismowa barwa
+editor_free_text_font_size=Pismowe wjelikosć
+editor_ink_line_color=Linijowa barwa
+editor_ink_line_thickness=Linijowa tłustosć
+
+# Editor Parameters
+editor_free_text_color=Barwa
+editor_free_text_size=Wjelikosć
+editor_ink_color=Barwa
+editor_ink_thickness=Tłustosć
+editor_ink_opacity=Opacita
+
+# Editor aria
+editor_free_text_aria_label=Dermotny tekstowy editor
+editor_ink_aria_label=Tintowy editor
+editor_ink_canvas_aria_label=Wobraz napórany wót wužywarja
diff --git a/cps/static/locale/el/viewer.properties b/cps/static/locale/el/viewer.properties
index 896bbeefc..cf60407f6 100644
--- a/cps/static/locale/el/viewer.properties
+++ b/cps/static/locale/el/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Τρέχουσα προβολή
 tools.title=Εργαλεία
 tools_label=Εργαλεία
 first_page.title=Μετάβαση στην πρώτη σελίδα
-first_page.label=Μετάβαση στην πρώτη σελίδα
 first_page_label=Μετάβαση στην πρώτη σελίδα
 last_page.title=Μετάβαση στην τελευταία σελίδα
-last_page.label=Μετάβαση στην τελευταία σελίδα
 last_page_label=Μετάβαση στην τελευταία σελίδα
 page_rotate_cw.title=Δεξιόστροφη περιστροφή
-page_rotate_cw.label=Δεξιόστροφη περιστροφή
 page_rotate_cw_label=Δεξιόστροφη περιστροφή
 page_rotate_ccw.title=Αριστερόστροφη περιστροφή
-page_rotate_ccw.label=Αριστερόστροφη περιστροφή
 page_rotate_ccw_label=Αριστερόστροφη περιστροφή
 
 cursor_text_select_tool.title=Ενεργοποίηση εργαλείου επιλογής κειμένου
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Εργαλείο επιλογής κειμένου
 cursor_hand_tool.title=Ενεργοποίηση εργαλείου χεριού
 cursor_hand_tool_label=Εργαλείο χεριού
 
+scroll_page.title=Χρήση κύλισης σελίδας
+scroll_page_label=Κύλιση σελίδας
 scroll_vertical.title=Χρήση κάθετης κύλισης
 scroll_vertical_label=Κάθετη κύλιση
 scroll_horizontal.title=Χρήση οριζόντιας κύλισης
@@ -93,7 +91,7 @@ document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
 document_properties_title=Τίτλος:
 document_properties_author=Συγγραφέας:
 document_properties_subject=Θέμα:
-document_properties_keywords=Λέξεις κλειδιά:
+document_properties_keywords=Λέξεις-κλειδιά:
 document_properties_creation_date=Ημερομηνία δημιουργίας:
 document_properties_modification_date=Ημερομηνία τροποποίησης:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
@@ -105,7 +103,7 @@ document_properties_version=Έκδοση PDF:
 document_properties_page_count=Αριθμός σελίδων:
 document_properties_page_size=Μέγεθος σελίδας:
 document_properties_page_size_unit_inches=ίντσες
-document_properties_page_size_unit_millimeters=χιλιοστά
+document_properties_page_size_unit_millimeters=mm
 document_properties_page_size_orientation_portrait=κατακόρυφα
 document_properties_page_size_orientation_landscape=οριζόντια
 document_properties_page_size_name_a3=A3
@@ -131,32 +129,37 @@ print_progress_message=Προετοιμασία του εγγράφου για 
 # LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
 # a numerical per cent value.
 print_progress_percent={{progress}}%
-print_progress_close=Άκυρο
+print_progress_close=Ακύρωση
 
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
-toggle_sidebar.title=(Απ)ενεργοποίηση πλευρικής στήλης
-toggle_sidebar_notification.title=(Απ)ενεργοποίηση πλευρικής στήλης (το έγγραφο περιέχει περίγραμμα/συνημμένα)
-toggle_sidebar_label=(Απ)ενεργοποίηση πλευρικής στήλης
+toggle_sidebar.title=(Απ)ενεργοποίηση πλαϊνής γραμμής
+toggle_sidebar_notification2.title=(Απ)ενεργοποίηση πλαϊνής γραμμής (το έγγραφο περιέχει περίγραμμα/συνημμένα/επίπεδα)
+toggle_sidebar_label=(Απ)ενεργοποίηση πλαϊνής γραμμής
 document_outline.title=Εμφάνιση διάρθρωσης εγγράφου (διπλό κλικ για ανάπτυξη/σύμπτυξη όλων των στοιχείων)
 document_outline_label=Διάρθρωση εγγράφου
-attachments.title=Προβολή συνημμένων
+attachments.title=Εμφάνιση συνημμένων
 attachments_label=Συνημμένα
-thumbs.title=Προβολή μικρογραφιών
+layers.title=Εμφάνιση επιπέδων (διπλό κλικ για επαναφορά όλων των επιπέδων στην προεπιλεγμένη κατάσταση)
+layers_label=Επίπεδα
+thumbs.title=Εμφάνιση μικρογραφιών
 thumbs_label=Μικρογραφίες
+current_outline_item.title=Εύρεση τρέχοντος στοιχείου διάρθρωσης
+current_outline_item_label=Τρέχον στοιχείο διάρθρωσης
 findbar.title=Εύρεση στο έγγραφο
 findbar_label=Εύρεση
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Σελίδα {{page}}
+additional_layers=Επιπρόσθετα επίπεδα
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Σελίδα {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
 thumb_page_title=Σελίδα {{page}}
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
-thumb_page_canvas=Μικρογραφία της σελίδας {{page}}
+thumb_page_canvas=Μικρογραφία σελίδας {{page}}
 
 # Find panel button title and messages
 find_input.title=Εύρεση
@@ -166,10 +169,11 @@ find_previous_label=Προηγούμενο
 find_next.title=Εύρεση της επόμενης εμφάνισης της φράσης
 find_next_label=Επόμενο
 find_highlight=Επισήμανση όλων
-find_match_case_label=Ταίριασμα χαρακτήρα
+find_match_case_label=Συμφωνία πεζών/κεφαλαίων
+find_match_diacritics_label=Αντιστοίχιση διακριτικών
 find_entire_word_label=Ολόκληρες λέξεις
-find_reached_top=Έλευση στην αρχή του εγγράφου, συνέχεια από το τέλος
-find_reached_bottom=Έλευση στο τέλος του εγγράφου, συνέχεια από την αρχή
+find_reached_top=Φτάσατε στην αρχή του εγγράφου, συνέχεια από το τέλος
+find_reached_bottom=Φτάσατε στο τέλος του εγγράφου, συνέχεια από την αρχή
 # LOCALIZATION NOTE (find_match_count): The supported plural forms are
 # [one|two|few|many|other], with [other] as the default value.
 # "{{current}}" and "{{total}}" will be replaced by a number representing the
@@ -199,7 +203,7 @@ error_less_info=Λιγότερες πληροφορίες
 error_close=Κλείσιμο
 # LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
 # replaced by the PDF.JS version and build ID.
-error_version_info=PDF.js v{{version}} (build: {{build}})
+error_version_info=PDF.js v{{version}} (έκδοση: {{build}})
 # LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
 # english string describing the error.
 error_message=Μήνυμα: {{message}}
@@ -210,7 +214,7 @@ error_stack=Στοίβα: {{stack}}
 error_file=Αρχείο: {{file}}
 # LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
 error_line=Γραμμή: {{line}}
-rendering_error=Προέκυψε σφάλμα κατά την ανάλυση της σελίδας.
+rendering_error=Προέκυψε σφάλμα κατά την εμφάνιση της σελίδας.
 
 # Predefined zoom values
 page_scale_width=Πλάτος σελίδας
@@ -222,8 +226,8 @@ page_scale_actual=Πραγματικό μέγεθος
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Σφάλμα
-loading_error=Προέκυψε ένα σφάλμα κατά τη φόρτωση του PDF.
+loading=Φόρτωση…
+loading_error=Προέκυψε σφάλμα κατά τη φόρτωση του PDF.
 invalid_file_error=Μη έγκυρο ή κατεστραμμένο αρχείο PDF.
 missing_file_error=Λείπει αρχείο PDF.
 unexpected_response_error=Μη αναμενόμενη απόκριση από το διακομιστή.
@@ -236,12 +240,42 @@ annotation_date_string={{date}}, {{time}}
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
-text_annotation_type.alt=[{{type}} Σχόλιο]
-password_label=Εισαγωγή κωδικού για το άνοιγμα του PDF αρχείου.
-password_invalid=Μη έγκυρος κωδικός. Προσπαθείστε ξανά.
-password_ok=ΟΚ
+text_annotation_type.alt=[Σχόλιο «{{type}}»]
+password_label=Εισαγάγετε τον κωδικό πρόσβασης για να ανοίξετε αυτό το αρχείο PDF.
+password_invalid=Μη έγκυρος κωδικός πρόσβασης. Παρακαλώ δοκιμάστε ξανά.
+password_ok=OK
 password_cancel=Ακύρωση
 
-printing_not_supported=Προειδοποίηση: Η εκτύπωση δεν υποστηρίζεται πλήρως από αυτόν τον περιηγητή.
+printing_not_supported=Προειδοποίηση: Η εκτύπωση δεν υποστηρίζεται πλήρως από το πρόγραμμα περιήγησης.
 printing_not_ready=Προειδοποίηση: Το PDF δεν φορτώθηκε πλήρως για εκτύπωση.
-web_fonts_disabled=Οι γραμματοσειρές Web απενεργοποιημένες: αδυναμία χρήσης των ενσωματωμένων γραμματοσειρών PDF.
+web_fonts_disabled=Οι γραμματοσειρές ιστού είναι ανενεργές: δεν είναι δυνατή η χρήση των ενσωματωμένων γραμματοσειρών PDF.
+
+# Editor
+editor_none.title=Απενεργοποίηση επεξεργασίας σχολίων
+editor_none_label=Απενεργοποίηση επεξεργασίας
+editor_free_text.title=Προσθήκη σχολίου ελεύθερου κειμένου
+editor_free_text_label=Σχόλιο ελεύθερου κειμένου
+editor_ink.title=Προσθήκη σχολίου με μελάνι
+editor_ink_label=Σχόλιο με μελάνι
+
+freetext_default_content=Εισαγάγετε κάποιο κείμενο…
+
+free_text_default_content=Εισαγάγετε κείμενο…
+
+# Editor Parameters
+editor_free_text_font_color=Χρώμα γραμματοσειράς
+editor_free_text_font_size=Μέγεθος γραμματοσειράς
+editor_ink_line_color=Χρώμα γραμμής
+editor_ink_line_thickness=Πάχος γραμμής
+
+# Editor Parameters
+editor_free_text_color=Χρώμα
+editor_free_text_size=Μέγεθος
+editor_ink_color=Χρώμα
+editor_ink_thickness=Πάχος
+editor_ink_opacity=Αδιαφάνεια
+
+# Editor aria
+editor_free_text_aria_label=Επεξεργασία ελεύθερου κειμένου
+editor_ink_aria_label=Επεξεργασία γραφής μελανιού
+editor_ink_canvas_aria_label=Εικόνα από τον χρήστη
diff --git a/cps/static/locale/en-CA/viewer.properties b/cps/static/locale/en-CA/viewer.properties
index 554a0e176..786ad3a4b 100644
--- a/cps/static/locale/en-CA/viewer.properties
+++ b/cps/static/locale/en-CA/viewer.properties
@@ -48,23 +48,21 @@ bookmark_label=Current View
 tools.title=Tools
 tools_label=Tools
 first_page.title=Go to First Page
-first_page.label=Go to First Page
 first_page_label=Go to First Page
 last_page.title=Go to Last Page
-last_page.label=Go to Last Page
 last_page_label=Go to Last Page
 page_rotate_cw.title=Rotate Clockwise
-page_rotate_cw.label=Rotate Clockwise
 page_rotate_cw_label=Rotate Clockwise
-page_rotate_ccw.title=Rotate Anti-Clockwise
-page_rotate_ccw.label=Rotate Anti-Clockwise
-page_rotate_ccw_label=Rotate Anti-Clockwise
+page_rotate_ccw.title=Rotate Counterclockwise
+page_rotate_ccw_label=Rotate Counterclockwise
 
 cursor_text_select_tool.title=Enable Text Selection Tool
 cursor_text_select_tool_label=Text Selection Tool
 cursor_hand_tool.title=Enable Hand Tool
 cursor_hand_tool_label=Hand Tool
 
+scroll_page.title=Use Page Scrolling
+scroll_page_label=Page Scrolling
 scroll_vertical.title=Use Vertical Scrolling
 scroll_vertical_label=Vertical Scrolling
 scroll_horizontal.title=Use Horizontal Scrolling
@@ -137,19 +135,24 @@ print_progress_close=Cancel
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Toggle Sidebar
-toggle_sidebar_notification.title=Toggle Sidebar (document contains outline/attachments)
+toggle_sidebar_notification2.title=Toggle Sidebar (document contains outline/attachments/layers)
 toggle_sidebar_label=Toggle Sidebar
 document_outline.title=Show Document Outline (double-click to expand/collapse all items)
 document_outline_label=Document Outline
 attachments.title=Show Attachments
 attachments_label=Attachments
+layers.title=Show Layers (double-click to reset all layers to the default state)
+layers_label=Layers
 thumbs.title=Show Thumbnails
 thumbs_label=Thumbnails
+current_outline_item.title=Find Current Outline Item
+current_outline_item_label=Current Outline Item
 findbar.title=Find in Document
 findbar_label=Find
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Page {{page}}
+additional_layers=Additional Layers
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Page {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -165,9 +168,10 @@ find_previous.title=Find the previous occurrence of the phrase
 find_previous_label=Previous
 find_next.title=Find the next occurrence of the phrase
 find_next_label=Next
-find_highlight=Highlight all
-find_match_case_label=Match case
-find_entire_word_label=Whole words
+find_highlight=Highlight All
+find_match_case_label=Match Case
+find_match_diacritics_label=Match Diacritics
+find_entire_word_label=Whole Words
 find_reached_top=Reached top of document, continued from bottom
 find_reached_bottom=Reached end of document, continued from top
 # LOCALIZATION NOTE (find_match_count): The supported plural forms are
@@ -222,7 +226,7 @@ page_scale_actual=Actual Size
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=Loading…
 loading_error=An error occurred while loading the PDF.
 invalid_file_error=Invalid or corrupted PDF file.
 missing_file_error=Missing PDF file.
@@ -245,3 +249,21 @@ password_cancel=Cancel
 printing_not_supported=Warning: Printing is not fully supported by this browser.
 printing_not_ready=Warning: The PDF is not fully loaded for printing.
 web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
+
+# Editor
+editor_none.title=Disable Annotation Editing
+editor_none_label=Disable Editing
+editor_free_text.title=Add FreeText Annotation
+editor_free_text_label=FreeText Annotation
+editor_ink.title=Add Ink Annotation
+editor_ink_label=Ink Annotation
+
+freetext_default_content=Enter some text…
+
+free_text_default_content=Enter text…
+
+# Editor Parameters
+editor_free_text_font_color=Font Colour
+editor_free_text_font_size=Font Size
+editor_ink_line_color=Line Colour
+editor_ink_line_thickness=Line Thickness
diff --git a/cps/static/locale/en-GB/viewer.properties b/cps/static/locale/en-GB/viewer.properties
index 554a0e176..c8cdaeeee 100644
--- a/cps/static/locale/en-GB/viewer.properties
+++ b/cps/static/locale/en-GB/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Current View
 tools.title=Tools
 tools_label=Tools
 first_page.title=Go to First Page
-first_page.label=Go to First Page
 first_page_label=Go to First Page
 last_page.title=Go to Last Page
-last_page.label=Go to Last Page
 last_page_label=Go to Last Page
 page_rotate_cw.title=Rotate Clockwise
-page_rotate_cw.label=Rotate Clockwise
 page_rotate_cw_label=Rotate Clockwise
 page_rotate_ccw.title=Rotate Anti-Clockwise
-page_rotate_ccw.label=Rotate Anti-Clockwise
 page_rotate_ccw_label=Rotate Anti-Clockwise
 
 cursor_text_select_tool.title=Enable Text Selection Tool
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Text Selection Tool
 cursor_hand_tool.title=Enable Hand Tool
 cursor_hand_tool_label=Hand Tool
 
+scroll_page.title=Use Page Scrolling
+scroll_page_label=Page Scrolling
 scroll_vertical.title=Use Vertical Scrolling
 scroll_vertical_label=Vertical Scrolling
 scroll_horizontal.title=Use Horizontal Scrolling
@@ -137,19 +135,24 @@ print_progress_close=Cancel
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Toggle Sidebar
-toggle_sidebar_notification.title=Toggle Sidebar (document contains outline/attachments)
+toggle_sidebar_notification2.title=Toggle Sidebar (document contains outline/attachments/layers)
 toggle_sidebar_label=Toggle Sidebar
 document_outline.title=Show Document Outline (double-click to expand/collapse all items)
 document_outline_label=Document Outline
 attachments.title=Show Attachments
 attachments_label=Attachments
+layers.title=Show Layers (double-click to reset all layers to the default state)
+layers_label=Layers
 thumbs.title=Show Thumbnails
 thumbs_label=Thumbnails
+current_outline_item.title=Find Current Outline Item
+current_outline_item_label=Current Outline Item
 findbar.title=Find in Document
 findbar_label=Find
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Page {{page}}
+additional_layers=Additional Layers
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Page {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -165,9 +168,10 @@ find_previous.title=Find the previous occurrence of the phrase
 find_previous_label=Previous
 find_next.title=Find the next occurrence of the phrase
 find_next_label=Next
-find_highlight=Highlight all
-find_match_case_label=Match case
-find_entire_word_label=Whole words
+find_highlight=Highlight All
+find_match_case_label=Match Case
+find_match_diacritics_label=Match Diacritics
+find_entire_word_label=Whole Words
 find_reached_top=Reached top of document, continued from bottom
 find_reached_bottom=Reached end of document, continued from top
 # LOCALIZATION NOTE (find_match_count): The supported plural forms are
@@ -222,7 +226,7 @@ page_scale_actual=Actual Size
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=Loading…
 loading_error=An error occurred while loading the PDF.
 invalid_file_error=Invalid or corrupted PDF file.
 missing_file_error=Missing PDF file.
@@ -245,3 +249,33 @@ password_cancel=Cancel
 printing_not_supported=Warning: Printing is not fully supported by this browser.
 printing_not_ready=Warning: The PDF is not fully loaded for printing.
 web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
+
+# Editor
+editor_none.title=Disable Annotation Editing
+editor_none_label=Disable Editing
+editor_free_text.title=Add FreeText Annotation
+editor_free_text_label=FreeText Annotation
+editor_ink.title=Add Ink Annotation
+editor_ink_label=Ink Annotation
+
+freetext_default_content=Enter some text…
+
+free_text_default_content=Enter text…
+
+# Editor Parameters
+editor_free_text_font_color=Font Colour
+editor_free_text_font_size=Font Size
+editor_ink_line_color=Line Colour
+editor_ink_line_thickness=Line Thickness
+
+# Editor Parameters
+editor_free_text_color=Colour
+editor_free_text_size=Size
+editor_ink_color=Colour
+editor_ink_thickness=Thickness
+editor_ink_opacity=Opacity
+
+# Editor aria
+editor_free_text_aria_label=FreeText Editor
+editor_ink_aria_label=Ink Editor
+editor_ink_canvas_aria_label=User-created image
diff --git a/cps/static/locale/en-US/viewer.properties b/cps/static/locale/en-US/viewer.properties
index d31103c00..4a95b937d 100644
--- a/cps/static/locale/en-US/viewer.properties
+++ b/cps/static/locale/en-US/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Current View
 tools.title=Tools
 tools_label=Tools
 first_page.title=Go to First Page
-first_page.label=Go to First Page
 first_page_label=Go to First Page
 last_page.title=Go to Last Page
-last_page.label=Go to Last Page
 last_page_label=Go to Last Page
 page_rotate_cw.title=Rotate Clockwise
-page_rotate_cw.label=Rotate Clockwise
 page_rotate_cw_label=Rotate Clockwise
 page_rotate_ccw.title=Rotate Counterclockwise
-page_rotate_ccw.label=Rotate Counterclockwise
 page_rotate_ccw_label=Rotate Counterclockwise
 
 cursor_text_select_tool.title=Enable Text Selection Tool
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Text Selection Tool
 cursor_hand_tool.title=Enable Hand Tool
 cursor_hand_tool_label=Hand Tool
 
+scroll_page.title=Use Page Scrolling
+scroll_page_label=Page Scrolling
 scroll_vertical.title=Use Vertical Scrolling
 scroll_vertical_label=Vertical Scrolling
 scroll_horizontal.title=Use Horizontal Scrolling
@@ -147,12 +145,14 @@ layers.title=Show Layers (double-click to reset all layers to the default state)
 layers_label=Layers
 thumbs.title=Show Thumbnails
 thumbs_label=Thumbnails
+current_outline_item.title=Find Current Outline Item
+current_outline_item_label=Current Outline Item
 findbar.title=Find in Document
 findbar_label=Find
 
 additional_layers=Additional Layers
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Page {{page}}
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Page {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -168,9 +168,10 @@ find_previous.title=Find the previous occurrence of the phrase
 find_previous_label=Previous
 find_next.title=Find the next occurrence of the phrase
 find_next_label=Next
-find_highlight=Highlight all
-find_match_case_label=Match case
-find_entire_word_label=Whole words
+find_highlight=Highlight All
+find_match_case_label=Match Case
+find_match_diacritics_label=Match Diacritics
+find_entire_word_label=Whole Words
 find_reached_top=Reached top of document, continued from bottom
 find_reached_bottom=Reached end of document, continued from top
 # LOCALIZATION NOTE (find_match_count): The supported plural forms are
@@ -225,7 +226,7 @@ page_scale_actual=Actual Size
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=Loading…
 loading_error=An error occurred while loading the PDF.
 invalid_file_error=Invalid or corrupted PDF file.
 missing_file_error=Missing PDF file.
@@ -248,3 +249,23 @@ password_cancel=Cancel
 printing_not_supported=Warning: Printing is not fully supported by this browser.
 printing_not_ready=Warning: The PDF is not fully loaded for printing.
 web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
+
+# Editor
+editor_free_text.title=Add FreeText Annotation
+editor_free_text_label=FreeText Annotation
+editor_ink.title=Add Ink Annotation
+editor_ink_label=Ink Annotation
+
+free_text_default_content=Enter text…
+
+# Editor Parameters
+editor_free_text_color=Color
+editor_free_text_size=Size
+editor_ink_color=Color
+editor_ink_thickness=Thickness
+editor_ink_opacity=Opacity
+
+# Editor aria
+editor_free_text_aria_label=FreeText Editor
+editor_ink_aria_label=Ink Editor
+editor_ink_canvas_aria_label=User-created image
diff --git a/cps/static/locale/eo/viewer.properties b/cps/static/locale/eo/viewer.properties
index 804bd9842..77f8b9af7 100644
--- a/cps/static/locale/eo/viewer.properties
+++ b/cps/static/locale/eo/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Nuna vido
 tools.title=Iloj
 tools_label=Iloj
 first_page.title=Iri al la unua paĝo
-first_page.label=Iri al la unua paĝo
 first_page_label=Iri al la unua paĝo
 last_page.title=Iri al la lasta paĝo
-last_page.label=Iri al la lasta paĝo
 last_page_label=Iri al la lasta paĝo
 page_rotate_cw.title=Rotaciigi dekstrume
-page_rotate_cw.label=Rotaciigi dekstrume
 page_rotate_cw_label=Rotaciigi dekstrume
 page_rotate_ccw.title=Rotaciigi maldekstrume
-page_rotate_ccw.label=Rotaciigi maldekstrume
 page_rotate_ccw_label=Rotaciigi maldekstrume
 
 cursor_text_select_tool.title=Aktivigi tekstan elektilon
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Teksta elektilo
 cursor_hand_tool.title=Aktivigi ilon de mano
 cursor_hand_tool_label=Ilo de mano
 
+scroll_page.title=Uzi ŝovadon de paĝo
+scroll_page_label=Ŝovado de paĝo
 scroll_vertical.title=Uzi vertikalan ŝovadon
 scroll_vertical_label=Vertikala ŝovado
 scroll_horizontal.title=Uzi horizontalan ŝovadon
@@ -137,19 +135,24 @@ print_progress_close=Nuligi
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Montri/kaŝi flankan strion
-toggle_sidebar_notification.title=Montri/kaŝi flankan strion (la dokumento enhavas konturon/aneksaĵojn)
+toggle_sidebar_notification2.title=Montri/kaŝi flankan strion (la dokumento enhavas konturon/kunsendaĵojn/tavolojn)
 toggle_sidebar_label=Montri/kaŝi flankan strion
 document_outline.title=Montri la konturon de dokumento (alklaku duoble por faldi/malfaldi ĉiujn elementojn)
 document_outline_label=Konturo de dokumento
 attachments.title=Montri kunsendaĵojn
 attachments_label=Kunsendaĵojn
+layers.title=Montri tavolojn (duoble alklaku por remeti ĉiujn tavolojn en la norman staton)
+layers_label=Tavoloj
 thumbs.title=Montri miniaturojn
 thumbs_label=Miniaturoj
+current_outline_item.title=Trovi nunan konturan elementon
+current_outline_item_label=Nuna kontura elemento
 findbar.title=Serĉi en dokumento
 findbar_label=Serĉi
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Paĝo {{page}}
+additional_layers=Aldonaj tavoloj
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Paĝo {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Serĉi la venontan aperon de la frazo
 find_next_label=Antaŭen
 find_highlight=Elstarigi ĉiujn
 find_match_case_label=Distingi inter majuskloj kaj minuskloj
+find_match_diacritics_label=Respekti supersignojn
 find_entire_word_label=Tutaj vortoj
 find_reached_top=Komenco de la dokumento atingita, daŭrigado ekde la fino
 find_reached_bottom=Fino de la dokumento atingita, daŭrigado ekde la komenco
@@ -222,7 +226,7 @@ page_scale_actual=Reala grando
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Eraro
+loading=Ŝargado…
 loading_error=Okazis eraro dum la ŝargado de la PDF dosiero.
 invalid_file_error=Nevalida aŭ difektita PDF dosiero.
 missing_file_error=Mankas dosiero PDF.
@@ -245,3 +249,33 @@ password_cancel=Nuligi
 printing_not_supported=Averto: tiu ĉi retumilo ne plene subtenas presadon.
 printing_not_ready=Averto: la PDF dosiero ne estas plene ŝargita por presado.
 web_fonts_disabled=Neaktivaj teksaĵaj tiparoj: ne elbas uzi enmetitajn tiparojn de PDF.
+
+# Editor
+editor_none.title=Malaktivigi modifon de notoj
+editor_none_label=Malaktivigi modifon
+editor_free_text.title=Aldoni tekstan noton
+editor_free_text_label=Teksta noto
+editor_ink.title=Aldoni desegnan noton
+editor_ink_label=Desegna noto
+
+freetext_default_content=Tajpu tekston…
+
+free_text_default_content=Tajpu tekston…
+
+# Editor Parameters
+editor_free_text_font_color=Tipara koloro
+editor_free_text_font_size=Tipara grando
+editor_ink_line_color=Linia koloro
+editor_ink_line_thickness=Linia larĝo
+
+# Editor Parameters
+editor_free_text_color=Koloro
+editor_free_text_size=Grando
+editor_ink_color=Koloro
+editor_ink_thickness=Dikeco
+editor_ink_opacity=Maldiafaneco
+
+# Editor aria
+editor_free_text_aria_label=Teksta redaktilo
+editor_ink_aria_label=Inka redaktilo
+editor_ink_canvas_aria_label=Bildo kreita de uzanto
diff --git a/cps/static/locale/es-AR/viewer.properties b/cps/static/locale/es-AR/viewer.properties
index ca2c87ba6..6782eb869 100644
--- a/cps/static/locale/es-AR/viewer.properties
+++ b/cps/static/locale/es-AR/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vista actual
 tools.title=Herramientas
 tools_label=Herramientas
 first_page.title=Ir a primera página
-first_page.label=Ir a primera página
 first_page_label=Ir a primera página
 last_page.title=Ir a última página
-last_page.label=Ir a última página
 last_page_label=Ir a última página
 page_rotate_cw.title=Rotar horario
-page_rotate_cw.label=Rotar horario
 page_rotate_cw_label=Rotar horario
 page_rotate_ccw.title=Rotar antihorario
-page_rotate_ccw.label=Rotar antihorario
 page_rotate_ccw_label=Rotar antihorario
 
 cursor_text_select_tool.title=Habilitar herramienta de selección de texto
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Herramienta de selección de texto
 cursor_hand_tool.title=Habilitar herramienta mano
 cursor_hand_tool_label=Herramienta mano
 
+scroll_page.title=Usar desplazamiento de página
+scroll_page_label=Desplazamiento de página
 scroll_vertical.title=Usar desplazamiento vertical
 scroll_vertical_label=Desplazamiento vertical
 scroll_horizontal.title=Usar desplazamiento vertical
@@ -137,19 +135,24 @@ print_progress_close=Cancelar
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Alternar barra lateral
-toggle_sidebar_notification.title=Intercambiar barra lateral (el documento contiene esquema/adjuntos)
+toggle_sidebar_notification2.title=Alternar barra lateral (el documento contiene esquemas/adjuntos/capas)
 toggle_sidebar_label=Alternar barra lateral
 document_outline.title=Mostrar esquema del documento (doble clic para expandir/colapsar todos los ítems)
 document_outline_label=Esquema del documento
 attachments.title=Mostrar adjuntos
 attachments_label=Adjuntos
+layers.title=Mostrar capas (doble clic para restablecer todas las capas al estado predeterminado)
+layers_label=Capas
 thumbs.title=Mostrar miniaturas
 thumbs_label=Miniaturas
+current_outline_item.title=Buscar elemento de esquema actual
+current_outline_item_label=Elemento de esquema actual
 findbar.title=Buscar en documento
 findbar_label=Buscar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Página {{page}}
+additional_layers=Capas adicionales
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Página {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Buscar la siguiente aparición de la frase
 find_next_label=Siguiente
 find_highlight=Resaltar todo
 find_match_case_label=Coincidir mayúsculas
+find_match_diacritics_label=Coincidir diacríticos
 find_entire_word_label=Palabras completas
 find_reached_top=Inicio de documento alcanzado, continuando desde abajo
 find_reached_bottom=Fin de documento alcanzando, continuando desde arriba
@@ -222,7 +226,7 @@ page_scale_actual=Tamaño real
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=Cargando…
 loading_error=Ocurrió un error al cargar el PDF.
 invalid_file_error=Archivo PDF no válido o cocrrupto.
 missing_file_error=Archivo PDF faltante.
@@ -245,3 +249,33 @@ password_cancel=Cancelar
 printing_not_supported=Advertencia: La impresión no está totalmente soportada por este navegador.
 printing_not_ready=Advertencia: El PDF no está completamente cargado para impresión.
 web_fonts_disabled=Tipografía web deshabilitada: no se pueden usar tipos incrustados en PDF.
+
+# Editor
+editor_none.title=Deshabilitar la edición de anotaciones
+editor_none_label=Deshabilitar edición
+editor_free_text.title=Agregar anotación FreeText
+editor_free_text_label=Anotación FreeText
+editor_ink.title=Agregar anotación de tinta
+editor_ink_label=Anotación de tinta
+
+freetext_default_content=Ingresar algún texto…
+
+free_text_default_content=Ingresar texto…
+
+# Editor Parameters
+editor_free_text_font_color=Color de letra
+editor_free_text_font_size=Tamaño de letra
+editor_ink_line_color=Color de linea
+editor_ink_line_thickness=Grosor de línea
+
+# Editor Parameters
+editor_free_text_color=Color
+editor_free_text_size=Tamaño
+editor_ink_color=Color
+editor_ink_thickness=Espesor
+editor_ink_opacity=Opacidad
+
+# Editor aria
+editor_free_text_aria_label=Editor de FreeText
+editor_ink_aria_label=Editor de tinta
+editor_ink_canvas_aria_label=Imagen creada por el usuario
diff --git a/cps/static/locale/es-CL/viewer.properties b/cps/static/locale/es-CL/viewer.properties
index b6ac40939..7f375f4d2 100644
--- a/cps/static/locale/es-CL/viewer.properties
+++ b/cps/static/locale/es-CL/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vista actual
 tools.title=Herramientas
 tools_label=Herramientas
 first_page.title=Ir a la primera página
-first_page.label=Ir a la primera página
 first_page_label=Ir a la primera página
 last_page.title=Ir a la última página
-last_page.label=Ir a la última página
 last_page_label=Ir a la última página
 page_rotate_cw.title=Girar a la derecha
-page_rotate_cw.label=Girar a la derecha
 page_rotate_cw_label=Girar a la derecha
 page_rotate_ccw.title=Girar a la izquierda
-page_rotate_ccw.label=Girar a la izquierda
 page_rotate_ccw_label=Girar a la izquierda
 
 cursor_text_select_tool.title=Activar la herramienta de selección de texto
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Herramienta de selección de texto
 cursor_hand_tool.title=Activar la herramienta de mano
 cursor_hand_tool_label=Herramienta de mano
 
+scroll_page.title=Usar desplazamiento de página
+scroll_page_label=Desplazamiento de página
 scroll_vertical.title=Usar desplazamiento vertical
 scroll_vertical_label=Desplazamiento vertical
 scroll_horizontal.title=Usar desplazamiento horizontal
@@ -137,19 +135,24 @@ print_progress_close=Cancelar
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Barra lateral
-toggle_sidebar_notification.title=Cambiar barra lateral (índice de contenidos del documento/adjuntos)
+toggle_sidebar_notification2.title=Cambiar barra lateral (índice de contenidos del documento/adjuntos/capas)
 toggle_sidebar_label=Mostrar u ocultar la barra lateral
 document_outline.title=Mostrar esquema del documento (doble clic para expandir/contraer todos los elementos)
 document_outline_label=Esquema del documento
 attachments.title=Mostrar adjuntos
 attachments_label=Adjuntos
+layers.title=Mostrar capas (doble clic para restablecer todas las capas al estado predeterminado)
+layers_label=Capas
 thumbs.title=Mostrar miniaturas
 thumbs_label=Miniaturas
+current_outline_item.title=Buscar elemento de esquema actual
+current_outline_item_label=Elemento de esquema actual
 findbar.title=Buscar en el documento
 findbar_label=Buscar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Página {{page}}
+additional_layers=Capas adicionales
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Página {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Buscar la siguiente aparición de la frase
 find_next_label=Siguiente
 find_highlight=Destacar todos
 find_match_case_label=Coincidir mayús./minús.
+find_match_diacritics_label=Coincidir diacríticos
 find_entire_word_label=Palabras completas
 find_reached_top=Se alcanzó el inicio del documento, continuando desde el final
 find_reached_bottom=Se alcanzó el final del documento, continuando desde el inicio
@@ -176,11 +180,11 @@ find_reached_bottom=Se alcanzó el final del documento, continuando desde el ini
 # index of the currently active find result, respectively a number representing
 # the total number of matches in the document.
 find_match_count={[ plural(total) ]}
-find_match_count[one]={{current}} de {{total}} coincidencia
-find_match_count[two]={{current}} de {{total}} coincidencias
-find_match_count[few]={{current}} de {{total}} coincidencias
-find_match_count[many]={{current}} de {{total}} coincidencias
-find_match_count[other]={{current}} de {{total}} coincidencias
+find_match_count[one]=Coincidencia {{current}} de {{total}}
+find_match_count[two]=Coincidencia {{current}} de {{total}}
+find_match_count[few]=Coincidencia {{current}} de {{total}}
+find_match_count[many]=Coincidencia {{current}} de {{total}}
+find_match_count[other]=Coincidencia {{current}} de {{total}}
 # LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
 # [zero|one|two|few|many|other], with [other] as the default value.
 # "{{limit}}" will be replaced by a numerical value.
@@ -222,7 +226,7 @@ page_scale_actual=Tamaño actual
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=Cargando…
 loading_error=Ocurrió un error al cargar el PDF.
 invalid_file_error=Archivo PDF inválido o corrupto.
 missing_file_error=Falta el archivo PDF.
@@ -245,3 +249,33 @@ password_cancel=Cancelar
 printing_not_supported=Advertencia: Imprimir no está soportado completamente por este navegador.
 printing_not_ready=Advertencia: El PDF no está completamente cargado para ser impreso.
 web_fonts_disabled=Las tipografías web están desactivadas: imposible usar las fuentes PDF embebidas.
+
+# Editor
+editor_none.title=Deshabilitar la edición de anotaciones
+editor_none_label=Deshabilitar edición
+editor_free_text.title=Agregar anotación FreeText
+editor_free_text_label=Anotación FreeText
+editor_ink.title=Agregar anotación de tinta
+editor_ink_label=Anotación de tinta
+
+freetext_default_content=Ingresar algún texto…
+
+free_text_default_content=Ingresar texto…
+
+# Editor Parameters
+editor_free_text_font_color=Color de la fuente
+editor_free_text_font_size=Tamaño de la fuente
+editor_ink_line_color=Color de la línea
+editor_ink_line_thickness=Grosor de la línea
+
+# Editor Parameters
+editor_free_text_color=Color
+editor_free_text_size=Tamaño
+editor_ink_color=Color
+editor_ink_thickness=Grosor
+editor_ink_opacity=Opacidad
+
+# Editor aria
+editor_free_text_aria_label=Editor FreeText
+editor_ink_aria_label=Editor de tinta
+editor_ink_canvas_aria_label=Imagen creada por el usuario
diff --git a/cps/static/locale/es-ES/viewer.properties b/cps/static/locale/es-ES/viewer.properties
index 75e5f0ad4..9bc7d607b 100644
--- a/cps/static/locale/es-ES/viewer.properties
+++ b/cps/static/locale/es-ES/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vista actual
 tools.title=Herramientas
 tools_label=Herramientas
 first_page.title=Ir a la primera página
-first_page.label=Ir a la primera página
 first_page_label=Ir a la primera página
 last_page.title=Ir a la última página
-last_page.label=Ir a la última página
 last_page_label=Ir a la última página
 page_rotate_cw.title=Rotar en sentido horario
-page_rotate_cw.label=Rotar en sentido horario
 page_rotate_cw_label=Rotar en sentido horario
 page_rotate_ccw.title=Rotar en sentido antihorario
-page_rotate_ccw.label=Rotar en sentido antihorario
 page_rotate_ccw_label=Rotar en sentido antihorario
 
 cursor_text_select_tool.title=Activar herramienta de selección de texto
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Herramienta de selección de texto
 cursor_hand_tool.title=Activar herramienta de mano
 cursor_hand_tool_label=Herramienta de mano
 
+scroll_page.title=Usar desplazamiento de página
+scroll_page_label=Desplazamiento de página
 scroll_vertical.title=Usar desplazamiento vertical
 scroll_vertical_label=Desplazamiento vertical
 scroll_horizontal.title=Usar desplazamiento horizontal
@@ -137,19 +135,24 @@ print_progress_close=Cancelar
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Cambiar barra lateral
-toggle_sidebar_notification.title=Alternar panel lateral (el documento contiene un esquema o adjuntos)
+toggle_sidebar_notification2.title=Alternar barra lateral (el documento contiene esquemas/adjuntos/capas)
 toggle_sidebar_label=Cambiar barra lateral
 document_outline.title=Mostrar resumen del documento (doble clic para expandir/contraer todos los elementos)
 document_outline_label=Resumen de documento
 attachments.title=Mostrar adjuntos
 attachments_label=Adjuntos
+layers.title=Mostrar capas (doble clic para restablecer todas las capas al estado predeterminado)
+layers_label=Capas
 thumbs.title=Mostrar miniaturas
 thumbs_label=Miniaturas
+current_outline_item.title=Encontrar elemento de esquema actual
+current_outline_item_label=Elemento de esquema actual
 findbar.title=Buscar en el documento
 findbar_label=Buscar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Página {{page}}
+additional_layers=Capas adicionales
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Página {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Encontrar la siguiente aparición de esta frase
 find_next_label=Siguiente
 find_highlight=Resaltar todos
 find_match_case_label=Coincidencia de mayús./minús.
+find_match_diacritics_label=Coincidir diacríticos
 find_entire_word_label=Palabras completas
 find_reached_top=Se alcanzó el inicio del documento, se continúa desde el final
 find_reached_bottom=Se alcanzó el final del documento, se continúa desde el inicio
@@ -222,7 +226,7 @@ page_scale_actual=Tamaño real
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=Cargando…
 loading_error=Ocurrió un error al cargar el PDF.
 invalid_file_error=Fichero PDF no válido o corrupto.
 missing_file_error=No hay fichero PDF.
@@ -245,3 +249,21 @@ password_cancel=Cancelar
 printing_not_supported=Advertencia: Imprimir no está totalmente soportado por este navegador.
 printing_not_ready=Advertencia: Este PDF no se ha cargado completamente para poder imprimirse.
 web_fonts_disabled=Las tipografías web están desactivadas: es imposible usar las tipografías PDF embebidas.
+
+# Editor
+editor_none.title=Desactivar la edición de anotaciones
+editor_none_label=Desactivar edición
+editor_free_text.title=Añadir anotación FreeText
+editor_free_text_label=Anotación FreeText
+editor_ink.title=Añadir anotación de tinta
+editor_ink_label=Anotación de tinta
+
+freetext_default_content=Introduzca algún texto…
+
+free_text_default_content=Introducir texto…
+
+# Editor Parameters
+editor_free_text_font_color=Color de la fuente
+editor_free_text_font_size=Tamaño de la fuente
+editor_ink_line_color=Color de la línea
+editor_ink_line_thickness=Grosor de la línea
diff --git a/cps/static/locale/es-MX/viewer.properties b/cps/static/locale/es-MX/viewer.properties
index 5098ad195..03dfaa114 100644
--- a/cps/static/locale/es-MX/viewer.properties
+++ b/cps/static/locale/es-MX/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vista actual
 tools.title=Herramientas
 tools_label=Herramientas
 first_page.title=Ir a la primera página
-first_page.label=Ir a la primera página
 first_page_label=Ir a la primera página
 last_page.title=Ir a la última página
-last_page.label=Ir a la última página
 last_page_label=Ir a la última página
 page_rotate_cw.title=Girar a la derecha
-page_rotate_cw.label=Girar a la derecha
 page_rotate_cw_label=Girar a la derecha
 page_rotate_ccw.title=Girar a la izquierda
-page_rotate_ccw.label=Girar a la izquierda
 page_rotate_ccw_label=Girar a la izquierda
 
 cursor_text_select_tool.title=Activar la herramienta de selección de texto
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Herramienta de selección de texto
 cursor_hand_tool.title=Activar la herramienta de mano
 cursor_hand_tool_label=Herramienta de mano
 
+scroll_page.title=Usar desplazamiento de página
+scroll_page_label=Desplazamiento de página
 scroll_vertical.title=Usar desplazamiento vertical
 scroll_vertical_label=Desplazamiento vertical
 scroll_horizontal.title=Usar desplazamiento horizontal
@@ -137,19 +135,24 @@ print_progress_close=Cancelar
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Cambiar barra lateral
-toggle_sidebar_notification.title=Cambiar barra lateral (índice de contenidos del documento/adjuntos)
+toggle_sidebar_notification2.title=Alternar barra lateral (el documento contiene esquemas/adjuntos/capas)
 toggle_sidebar_label=Cambiar barra lateral
 document_outline.title=Mostrar esquema del documento (doble clic para expandir/contraer todos los elementos)
 document_outline_label=Esquema del documento
 attachments.title=Mostrar adjuntos
 attachments_label=Adjuntos
+layers.title=Mostrar capas (doble clic para restablecer todas las capas al estado predeterminado)
+layers_label=Capas
 thumbs.title=Mostrar miniaturas
 thumbs_label=Miniaturas
+current_outline_item.title=Buscar elemento de esquema actual
+current_outline_item_label=Elemento de esquema actual
 findbar.title=Buscar en el documento
 findbar_label=Buscar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Página {{page}}
+additional_layers=Capas adicionales
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Página {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Ir a la siguiente frase encontrada
 find_next_label=Siguiente
 find_highlight=Resaltar todo
 find_match_case_label=Coincidir con mayúsculas y minúsculas
+find_match_diacritics_label=Coincidir diacríticos
 find_entire_word_label=Palabras completas
 find_reached_top=Se alcanzó el inicio del documento, se buscará al final
 find_reached_bottom=Se alcanzó el final del documento, se buscará al inicio
@@ -222,7 +226,7 @@ page_scale_actual=Tamaño real
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=Cargando…
 loading_error=Un error ocurrió al cargar el PDF.
 invalid_file_error=Archivo PDF invalido o dañado.
 missing_file_error=Archivo PDF no encontrado.
@@ -245,3 +249,33 @@ password_cancel=Cancelar
 printing_not_supported=Advertencia: La impresión no esta completamente soportada por este navegador.
 printing_not_ready=Advertencia: El PDF no cargo completamente para impresión.
 web_fonts_disabled=Las fuentes web están desactivadas: es imposible usar las fuentes PDF embebidas.
+
+# Editor
+editor_none.title=Deshabilitar la edición de anotaciones
+editor_none_label=Deshabilitar edición
+editor_free_text.title=Agregar anotación FreeText
+editor_free_text_label=Anotación FreeText
+editor_ink.title=Agregar anotación de tinta
+editor_ink_label=Anotación de tinta
+
+freetext_default_content=Ingresar algún texto…
+
+free_text_default_content=Ingresar texto…
+
+# Editor Parameters
+editor_free_text_font_color=Color de fuente
+editor_free_text_font_size=Tamaño de la fuente
+editor_ink_line_color=Color de línea
+editor_ink_line_thickness=Grosor de la línea
+
+# Editor Parameters
+editor_free_text_color=Color
+editor_free_text_size=Tamaño
+editor_ink_color=Color
+editor_ink_thickness=Grossor
+editor_ink_opacity=Opacidad
+
+# Editor aria
+editor_free_text_aria_label=Editor de FreeText
+editor_ink_aria_label=Editor de tinta
+editor_ink_canvas_aria_label=Imagen creada por el usuario
diff --git a/cps/static/locale/et/viewer.properties b/cps/static/locale/et/viewer.properties
index 97f2c9bd7..2d2f7da5c 100644
--- a/cps/static/locale/et/viewer.properties
+++ b/cps/static/locale/et/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Praegune vaade
 tools.title=Tööriistad
 tools_label=Tööriistad
 first_page.title=Mine esimesele leheküljele
-first_page.label=Mine esimesele leheküljele
 first_page_label=Mine esimesele leheküljele
 last_page.title=Mine viimasele leheküljele
-last_page.label=Mine viimasele leheküljele
 last_page_label=Mine viimasele leheküljele
 page_rotate_cw.title=Pööra päripäeva
-page_rotate_cw.label=Pööra päripäeva
 page_rotate_cw_label=Pööra päripäeva
 page_rotate_ccw.title=Pööra vastupäeva
-page_rotate_ccw.label=Pööra vastupäeva
 page_rotate_ccw_label=Pööra vastupäeva
 
 cursor_text_select_tool.title=Luba teksti valimise tööriist
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Teksti valimise tööriist
 cursor_hand_tool.title=Luba sirvimistööriist
 cursor_hand_tool_label=Sirvimistööriist
 
+scroll_page.title=Kasutatakse lehe kaupa kerimist
+scroll_page_label=Lehe kaupa kerimine
 scroll_vertical.title=Kasuta vertikaalset kerimist
 scroll_vertical_label=Vertikaalne kerimine
 scroll_horizontal.title=Kasuta horisontaalset kerimist
@@ -137,17 +135,24 @@ print_progress_close=Loobu
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Näita külgriba
-toggle_sidebar_notification.title=Näita külgriba (dokument sisaldab sisukorda/manuseid)
+toggle_sidebar_notification2.title=Näita külgriba (dokument sisaldab sisukorda/manuseid/kihte)
 toggle_sidebar_label=Näita külgriba
 document_outline.title=Näita sisukorda (kõigi punktide laiendamiseks/ahendamiseks topeltklõpsa)
 document_outline_label=Näita sisukorda
 attachments.title=Näita manuseid
 attachments_label=Manused
+layers.title=Näita kihte (kõikide kihtide vaikeolekusse lähtestamiseks topeltklõpsa)
+layers_label=Kihid
 thumbs.title=Näita pisipilte
 thumbs_label=Pisipildid
+current_outline_item.title=Otsi üles praegune kontuuriüksus
+current_outline_item_label=Praegune kontuuriüksus
 findbar.title=Otsi dokumendist
 findbar_label=Otsi
 
+additional_layers=Täiendavad kihid
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Lehekülg {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -165,6 +170,7 @@ find_next.title=Otsi fraasi järgmine esinemiskoht
 find_next_label=Järgmine
 find_highlight=Too kõik esile
 find_match_case_label=Tõstutundlik
+find_match_diacritics_label=Otsitakse diakriitiliselt
 find_entire_word_label=Täissõnad
 find_reached_top=Jõuti dokumendi algusesse, jätkati lõpust
 find_reached_bottom=Jõuti dokumendi lõppu, jätkati algusest
@@ -220,7 +226,7 @@ page_scale_actual=Tegelik suurus
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Viga
+loading=Laadimine…
 loading_error=PDFi laadimisel esines viga.
 invalid_file_error=Vigane või rikutud PDF-fail.
 missing_file_error=PDF-fail puudub.
@@ -243,3 +249,21 @@ password_cancel=Loobu
 printing_not_supported=Hoiatus: printimine pole selle brauseri poolt täielikult toetatud.
 printing_not_ready=Hoiatus: PDF pole printimiseks täielikult laaditud.
 web_fonts_disabled=Veebifondid on keelatud: PDFiga kaasatud fonte pole võimalik kasutada.
+
+# Editor
+editor_none.title=Keela annotatsioonide muutmine
+editor_none_label=Keela muutmine
+editor_free_text.title=Lisa vabateksti annotatsioon
+editor_free_text_label=Vabateksti annotatsioon
+editor_ink.title=Lisa tindiannotatsioon
+editor_ink_label=Tindiannotatsioon
+
+freetext_default_content=Sisesta mingi tekst…
+
+free_text_default_content=Sisesta tekst…
+
+# Editor Parameters
+editor_free_text_font_color=Fondi värv
+editor_free_text_font_size=Fondi suurus
+editor_ink_line_color=Joone värv
+editor_ink_line_thickness=Joone paksus
diff --git a/cps/static/locale/eu/viewer.properties b/cps/static/locale/eu/viewer.properties
index 5700d6019..664445935 100644
--- a/cps/static/locale/eu/viewer.properties
+++ b/cps/static/locale/eu/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Uneko ikuspegia
 tools.title=Tresnak
 tools_label=Tresnak
 first_page.title=Joan lehen orrira
-first_page.label=Joan lehen orrira
 first_page_label=Joan lehen orrira
 last_page.title=Joan azken orrira
-last_page.label=Joan azken orrira
 last_page_label=Joan azken orrira
 page_rotate_cw.title=Biratu erlojuaren norantzan
-page_rotate_cw.label=Biratu erlojuaren norantzan
 page_rotate_cw_label=Biratu erlojuaren norantzan
 page_rotate_ccw.title=Biratu erlojuaren aurkako norantzan
-page_rotate_ccw.label=Biratu erlojuaren aurkako norantzan
 page_rotate_ccw_label=Biratu erlojuaren aurkako norantzan
 
 cursor_text_select_tool.title=Gaitu testuaren hautapen tresna
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Testuaren hautapen tresna
 cursor_hand_tool.title=Gaitu eskuaren tresna
 cursor_hand_tool_label=Eskuaren tresna
 
+scroll_page.title=Erabili orriaren korritzea
+scroll_page_label=Orriaren korritzea
 scroll_vertical.title=Erabili korritze bertikala
 scroll_vertical_label=Korritze bertikala
 scroll_horizontal.title=Erabili korritze horizontala
@@ -137,19 +135,24 @@ print_progress_close=Utzi
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Txandakatu alboko barra
-toggle_sidebar_notification.title=Txandakatu alboko barra (dokumentuak eskema/eranskinak ditu)
+toggle_sidebar_notification2.title=Txandakatu alboko barra (dokumentuak eskema/eranskinak/geruzak ditu)
 toggle_sidebar_label=Txandakatu alboko barra
 document_outline.title=Erakutsi dokumentuaren eskema (klik bikoitza elementu guztiak zabaltzeko/tolesteko)
 document_outline_label=Dokumentuaren eskema
 attachments.title=Erakutsi eranskinak
 attachments_label=Eranskinak
+layers.title=Erakutsi geruzak (klik bikoitza geruza guztiak egoera lehenetsira berrezartzeko)
+layers_label=Geruzak
 thumbs.title=Erakutsi koadro txikiak
 thumbs_label=Koadro txikiak
+current_outline_item.title=Bilatu uneko eskemaren elementua
+current_outline_item_label=Uneko eskemaren elementua
 findbar.title=Bilatu dokumentuan
 findbar_label=Bilatu
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas={{page}}. orria
+additional_layers=Geruza gehigarriak
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark={{page}}. orria
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Bilatu esaldiaren hurrengo parekatzea
 find_next_label=Hurrengoa
 find_highlight=Nabarmendu guztia
 find_match_case_label=Bat etorri maiuskulekin/minuskulekin
+find_match_diacritics_label=Bereizi diakritikoak
 find_entire_word_label=Hitz osoak
 find_reached_top=Dokumentuaren hasierara heldu da, bukaeratik jarraitzen
 find_reached_bottom=Dokumentuaren bukaerara heldu da, hasieratik jarraitzen
@@ -222,7 +226,7 @@ page_scale_actual=Benetako tamaina
 page_scale_percent=%{{scale}}
 
 # Loading indicator messages
-loading_error_indicator=Errorea
+loading=Kargatzen…
 loading_error=Errorea gertatu da PDFa kargatzean.
 invalid_file_error=PDF fitxategi baliogabe edo hondatua.
 missing_file_error=PDF fitxategia falta da.
@@ -245,3 +249,21 @@ password_cancel=Utzi
 printing_not_supported=Abisua: inprimatzeko euskarria ez da erabatekoa nabigatzaile honetan.
 printing_not_ready=Abisua: PDFa ez dago erabat kargatuta inprimatzeko.
 web_fonts_disabled=Webeko letra-tipoak desgaituta daude: ezin dira kapsulatutako PDF letra-tipoak erabili.
+
+# Editor
+editor_none.title=Desgaitu oharren edizioa
+editor_none_label=Desgaitu edizioa
+editor_free_text.title=Gehitu testu-oharra
+editor_free_text_label=Testu-oharra
+editor_ink.title=Gehitu esku-oharra
+editor_ink_label=Esku-oharra
+
+freetext_default_content=Idatzi testua…
+
+free_text_default_content=Idatzi testua…
+
+# Editor Parameters
+editor_free_text_font_color=Letra-kolorea
+editor_free_text_font_size=Letra-tamaina
+editor_ink_line_color=Lerroaren kolorea
+editor_ink_line_thickness=Lerroaren lodiera
diff --git a/cps/static/locale/fa/viewer.properties b/cps/static/locale/fa/viewer.properties
index 9886b39d2..2c28f01b5 100644
--- a/cps/static/locale/fa/viewer.properties
+++ b/cps/static/locale/fa/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=نمای فعلی
 tools.title=ابزارها
 tools_label=ابزارها
 first_page.title=برو به اولین صفحه
-first_page.label=برو یه اولین صفحه
 first_page_label=برو به اولین صفحه
 last_page.title=برو به آخرین صفحه
-last_page.label=برو به آخرین صفحه
 last_page_label=برو به آخرین صفحه
 page_rotate_cw.title=چرخش ساعتگرد
-page_rotate_cw.label=چرخش ساعتگرد
 page_rotate_cw_label=چرخش ساعتگرد
 page_rotate_ccw.title=چرخش پاد ساعتگرد
-page_rotate_ccw.label=چرخش پاد ساعتگرد
 page_rotate_ccw_label=چرخش پاد ساعتگرد
 
 cursor_text_select_tool.title=فعال کردن ابزارِ انتخابِ متن
@@ -126,7 +122,6 @@ print_progress_close=لغو
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=باز و بسته کردن نوار کناری
-toggle_sidebar_notification.title=تغییر وضعیت نوار کناری (سند حاوی طرح/پیوست است)
 toggle_sidebar_label=تغییرحالت نوارکناری
 document_outline.title=نمایش رئوس مطالب مدارک(برای بازشدن/جمع شدن همه موارد دوبار کلیک کنید)
 document_outline_label=طرح نوشتار
@@ -200,8 +195,6 @@ page_scale_actual=اندازه واقعی‌
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=خطا
 loading_error=هنگام بارگیری پرونده PDF خطایی رخ داد.
 invalid_file_error=پرونده PDF نامعتبر یامعیوب می‌باشد.
 missing_file_error=پرونده PDF یافت نشد.
diff --git a/cps/static/locale/ff/viewer.properties b/cps/static/locale/ff/viewer.properties
index 0a081021b..bc954578d 100644
--- a/cps/static/locale/ff/viewer.properties
+++ b/cps/static/locale/ff/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Jiytol Gonangol
 tools.title=Kuutorɗe
 tools_label=Kuutorɗe
 first_page.title=Yah to hello adanngo
-first_page.label=Yah to hello adanngo
 first_page_label=Yah to hello adanngo
 last_page.title=Yah to hello wattindiingo
-last_page.label=Yah to hello wattindiingo
 last_page_label=Yah to hello wattindiingo
 page_rotate_cw.title=Yiiltu Faya Ñaamo
-page_rotate_cw.label=Yiiltu Faya Ñaamo
 page_rotate_cw_label=Yiiltu Faya Ñaamo
 page_rotate_ccw.title=Yiiltu Faya Nano
-page_rotate_ccw.label=Yiiltu Faya Nano
 page_rotate_ccw_label=Yiiltu Faya Nano
 
 cursor_text_select_tool.title=Gollin kaɓirgel cuɓirgel binndi
@@ -137,7 +133,6 @@ print_progress_close=Haaytu
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Toggilo Palal Sawndo
-toggle_sidebar_notification.title=Palal sawndo (dokimaa oo ina waɗi taarngo/cinnde)
 toggle_sidebar_label=Toggilo Palal Sawndo
 document_outline.title=Hollu Ƴiyal Fiilannde (dobdobo ngam wertude/taggude teme fof)
 document_outline_label=Toɓɓe Fiilannde
@@ -219,8 +214,6 @@ page_scale_actual=Ɓetol Jaati
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Juumre
 loading_error=Juumre waɗii tuma nde loowata PDF oo.
 invalid_file_error=Fiilde PDF moƴƴaani walla jiibii.
 missing_file_error=Fiilde PDF ena ŋakki.
diff --git a/cps/static/locale/fi/viewer.properties b/cps/static/locale/fi/viewer.properties
index 38c40a395..77123edef 100644
--- a/cps/static/locale/fi/viewer.properties
+++ b/cps/static/locale/fi/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Avoin ikkuna
 tools.title=Tools
 tools_label=Tools
 first_page.title=Siirry ensimmäiselle sivulle
-first_page.label=Siirry ensimmäiselle sivulle
 first_page_label=Siirry ensimmäiselle sivulle
 last_page.title=Siirry viimeiselle sivulle
-last_page.label=Siirry viimeiselle sivulle
 last_page_label=Siirry viimeiselle sivulle
 page_rotate_cw.title=Kierrä oikealle
-page_rotate_cw.label=Kierrä oikealle
 page_rotate_cw_label=Kierrä oikealle
 page_rotate_ccw.title=Kierrä vasemmalle
-page_rotate_ccw.label=Kierrä vasemmalle
 page_rotate_ccw_label=Kierrä vasemmalle
 
 cursor_text_select_tool.title=Käytä tekstinvalintatyökalua
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Tekstinvalintatyökalu
 cursor_hand_tool.title=Käytä käsityökalua
 cursor_hand_tool_label=Käsityökalu
 
+scroll_page.title=Käytä sivun vieritystä
+scroll_page_label=Sivun vieritys
 scroll_vertical.title=Käytä pystysuuntaista vieritystä
 scroll_vertical_label=Pystysuuntainen vieritys
 scroll_horizontal.title=Käytä vaakasuuntaista vieritystä
@@ -137,19 +135,24 @@ print_progress_close=Peruuta
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Näytä/piilota sivupaneeli
-toggle_sidebar_notification.title=Näytä/piilota sivupaneeli (dokumentissa on sisällys tai liitteitä)
+toggle_sidebar_notification2.title=Näytä/piilota sivupaneeli (dokumentissa on sisällys/liitteitä/tasoja)
 toggle_sidebar_label=Näytä/piilota sivupaneeli
 document_outline.title=Näytä dokumentin sisällys (laajenna tai kutista kohdat kaksoisnapsauttamalla)
 document_outline_label=Dokumentin sisällys
 attachments.title=Näytä liitteet
 attachments_label=Liitteet
+layers.title=Näytä tasot (kaksoisnapsauta palauttaaksesi kaikki tasot oletustilaan)
+layers_label=Tasot
 thumbs.title=Näytä pienoiskuvat
 thumbs_label=Pienoiskuvat
+current_outline_item.title=Etsi nykyinen sisällyksen kohta
+current_outline_item_label=Nykyinen sisällyksen kohta
 findbar.title=Etsi dokumentista
 findbar_label=Etsi
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Sivu {{page}}
+additional_layers=Lisätasot
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Sivu {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Etsi hakusanan seuraava osuma
 find_next_label=Seuraava
 find_highlight=Korosta kaikki
 find_match_case_label=Huomioi kirjainkoko
+find_match_diacritics_label=Erota tarkkeet
 find_entire_word_label=Kokonaiset sanat
 find_reached_top=Päästiin dokumentin alkuun, jatketaan lopusta
 find_reached_bottom=Päästiin dokumentin loppuun, jatketaan alusta
@@ -222,7 +226,7 @@ page_scale_actual=Todellinen koko
 page_scale_percent={{scale}} %
 
 # Loading indicator messages
-loading_error_indicator=Virhe
+loading=Ladataan…
 loading_error=Tapahtui virhe ladattaessa PDF-tiedostoa.
 invalid_file_error=Virheellinen tai vioittunut PDF-tiedosto.
 missing_file_error=Puuttuva PDF-tiedosto.
@@ -245,3 +249,19 @@ password_cancel=Peruuta
 printing_not_supported=Varoitus: Selain ei tue kaikkia tulostustapoja.
 printing_not_ready=Varoitus: PDF-tiedosto ei ole vielä latautunut kokonaan, eikä sitä voi vielä tulostaa.
 web_fonts_disabled=Verkkosivujen omat kirjasinlajit on estetty: ei voida käyttää upotettuja PDF-kirjasinlajeja.
+
+# Editor
+editor_none_label=Poista muokkaus käytöstä
+
+
+free_text_default_content=Kirjoita tekstiä…
+
+# Editor Parameters
+
+# Editor Parameters
+editor_free_text_color=Väri
+editor_free_text_size=Koko
+editor_ink_color=Väri
+
+# Editor aria
+editor_ink_canvas_aria_label=Käyttäjän luoma kuva
diff --git a/cps/static/locale/fr/viewer.properties b/cps/static/locale/fr/viewer.properties
index 589a4185c..1d358c2fe 100644
--- a/cps/static/locale/fr/viewer.properties
+++ b/cps/static/locale/fr/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Affichage actuel
 tools.title=Outils
 tools_label=Outils
 first_page.title=Aller à la première page
-first_page.label=Aller à la première page
 first_page_label=Aller à la première page
 last_page.title=Aller à la dernière page
-last_page.label=Aller à la dernière page
 last_page_label=Aller à la dernière page
 page_rotate_cw.title=Rotation horaire
-page_rotate_cw.label=Rotation horaire
 page_rotate_cw_label=Rotation horaire
 page_rotate_ccw.title=Rotation antihoraire
-page_rotate_ccw.label=Rotation antihoraire
 page_rotate_ccw_label=Rotation antihoraire
 
 cursor_text_select_tool.title=Activer l’outil de sélection de texte
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Outil de sélection de texte
 cursor_hand_tool.title=Activer l’outil main
 cursor_hand_tool_label=Outil main
 
+scroll_page.title=Utiliser le défilement par page
+scroll_page_label=Défilement par page
 scroll_vertical.title=Utiliser le défilement vertical
 scroll_vertical_label=Défilement vertical
 scroll_horizontal.title=Utiliser le défilement horizontal
@@ -137,19 +135,24 @@ print_progress_close=Annuler
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Afficher/Masquer le panneau latéral
-toggle_sidebar_notification.title=Afficher/Masquer le panneau latéral (le document contient des signets/pièces jointes)
+toggle_sidebar_notification2.title=Afficher/Masquer le panneau latéral (le document contient des signets/pièces jointes/calques)
 toggle_sidebar_label=Afficher/Masquer le panneau latéral
 document_outline.title=Afficher les signets du document (double-cliquer pour développer/réduire tous les éléments)
 document_outline_label=Signets du document
 attachments.title=Afficher les pièces jointes
 attachments_label=Pièces jointes
+layers.title=Afficher les calques (double-cliquer pour réinitialiser tous les calques à l’état par défaut)
+layers_label=Calques
 thumbs.title=Afficher les vignettes
 thumbs_label=Vignettes
+current_outline_item.title=Trouver l’élément de plan actuel
+current_outline_item_label=Élément de plan actuel
 findbar.title=Rechercher dans le document
 findbar_label=Rechercher
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Page {{page}}
+additional_layers=Calques additionnels
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Page {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Trouver la prochaine occurrence de l’expression
 find_next_label=Suivant
 find_highlight=Tout surligner
 find_match_case_label=Respecter la casse
+find_match_diacritics_label=Respecter les accents et diacritiques
 find_entire_word_label=Mots entiers
 find_reached_top=Haut de la page atteint, poursuite depuis la fin
 find_reached_bottom=Bas de la page atteint, poursuite au début
@@ -222,7 +226,7 @@ page_scale_actual=Taille réelle
 page_scale_percent={{scale}} %
 
 # Loading indicator messages
-loading_error_indicator=Erreur
+loading=Chargement…
 loading_error=Une erreur s’est produite lors du chargement du fichier PDF.
 invalid_file_error=Fichier PDF invalide ou corrompu.
 missing_file_error=Fichier PDF manquant.
@@ -245,3 +249,31 @@ password_cancel=Annuler
 printing_not_supported=Attention : l’impression n’est pas totalement prise en charge par ce navigateur.
 printing_not_ready=Attention : le PDF n’est pas entièrement chargé pour pouvoir l’imprimer.
 web_fonts_disabled=Les polices web sont désactivées : impossible d’utiliser les polices intégrées au PDF.
+
+# Editor
+editor_none.title=Désactiver l’édition d’annotations
+editor_none_label=Désactiver l’édition
+editor_free_text.title=Ajouter du texte
+editor_free_text_label=Texte
+editor_ink.title=Dessiner
+editor_ink_label=Dessin
+
+free_text_default_content=Saisissez du texte…
+
+# Editor Parameters
+editor_free_text_font_color=Couleur de police
+editor_free_text_font_size=Taille de police
+editor_ink_line_color=Couleur de la ligne
+editor_ink_line_thickness=Épaisseur de la ligne
+
+# Editor Parameters
+editor_free_text_color=Couleur
+editor_free_text_size=Taille
+editor_ink_color=Couleur
+editor_ink_thickness=Épaisseur
+editor_ink_opacity=Opacité
+
+# Editor aria
+editor_free_text_aria_label=Éditeur de texte
+editor_ink_aria_label=Dessin
+editor_ink_canvas_aria_label=Image créée par l’utilisateur·trice
diff --git a/cps/static/locale/fy-NL/viewer.properties b/cps/static/locale/fy-NL/viewer.properties
index 5a506540b..d6ecbb6e9 100644
--- a/cps/static/locale/fy-NL/viewer.properties
+++ b/cps/static/locale/fy-NL/viewer.properties
@@ -22,7 +22,7 @@ next_label=Folgjende
 page.title=Side
 # LOCALIZATION NOTE (of_pages): "{{pagesCount}}" will be replaced by a number
 # representing the total number of pages in the document.
-of_pages=fa {{pagesCount}}
+of_pages=fan {{pagesCount}}
 # LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
 # will be replaced by a number representing the currently visible page,
 # respectively a number representing the total number of pages in the document.
@@ -48,16 +48,12 @@ bookmark_label=Aktuele finster
 tools.title=Ark
 tools_label=Ark
 first_page.title=Gean nei earste side
-first_page.label=Nei earste side gean
 first_page_label=Gean nei earste side
 last_page.title=Gean nei lêste side
-last_page.label=Nei lêste side gean
 last_page_label=Gean nei lêste side
 page_rotate_cw.title=Rjochtsom draaie
-page_rotate_cw.label=Rjochtsom draaie
 page_rotate_cw_label=Rjochtsom draaie
 page_rotate_ccw.title=Loftsom draaie
-page_rotate_ccw.label=Loftsom draaie
 page_rotate_ccw_label=Loftsom draaie
 
 cursor_text_select_tool.title=Tekstseleksjehelpmiddel ynskeakelje
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Tekstseleksjehelpmiddel
 cursor_hand_tool.title=Hânhelpmiddel ynskeakelje
 cursor_hand_tool_label=Hânhelpmiddel
 
+scroll_page.title=Sideskowen brûke
+scroll_page_label=Sideskowen
 scroll_vertical.title=Fertikaal skowe brûke
 scroll_vertical_label=Fertikaal skowe
 scroll_horizontal.title=Horizontaal skowe brûke
@@ -137,19 +135,24 @@ print_progress_close=Annulearje
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Sidebalke yn-/útskeakelje
-toggle_sidebar_notification.title=Sidebalke yn-/útskeakelje (dokumint befettet outline/bylagen)
+toggle_sidebar_notification2.title=Sidebalke yn-/útskeakelje (dokumint befettet oersjoch/bylagen/lagen)
 toggle_sidebar_label=Sidebalke yn-/útskeakelje
 document_outline.title=Dokumintoersjoch toane (dûbelklik om alle items út/yn te klappen)
 document_outline_label=Dokumintoersjoch
 attachments.title=Bylagen toane
 attachments_label=Bylagen
+layers.title=Lagen toane (dûbelklik om alle lagen nei de standertsteat werom te setten)
+layers_label=Lagen
 thumbs.title=Foarbylden toane
 thumbs_label=Foarbylden
+current_outline_item.title=Aktueel item yn ynhâldsopjefte sykje
+current_outline_item_label=Aktueel item yn ynhâldsopjefte
 findbar.title=Sykje yn dokumint
 findbar_label=Sykje
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Side {{page}}
+additional_layers=Oanfoljende lagen
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Side {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=It folgjende foarkommen fan de tekst sykje
 find_next_label=Folgjende
 find_highlight=Alles markearje
 find_match_case_label=Haadlettergefoelich
+find_match_diacritics_label=Diakrityske tekens brûke
 find_entire_word_label=Hiele wurden
 find_reached_top=Boppekant fan dokumint berikt, trochgien fan ûnder ôf
 find_reached_bottom=Ein fan dokumint berikt, trochgien fan boppe ôf
@@ -222,7 +226,7 @@ page_scale_actual=Werklike grutte
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Flater
+loading=Lade…
 loading_error=Der is in flater bard by it laden fan de PDF.
 invalid_file_error=Ynfalide of korruptearre PDF-bestân.
 missing_file_error=PDF-bestân ûntbrekt.
@@ -245,3 +249,33 @@ password_cancel=Annulearje
 printing_not_supported=Warning: Printen is net folslein stipe troch dizze browser.
 printing_not_ready=Warning: PDF is net folslein laden om ôf te drukken.
 web_fonts_disabled=Weblettertypen binne útskeakele: gebrûk fan ynsluten PDF-lettertypen is net mooglik.
+
+# Editor
+editor_none.title=Bewurkjen fan annotaasjes útskeakelje
+editor_none_label=Bewurkjen útskeakelje
+editor_free_text.title=FreeText-annotaasje tafoegje
+editor_free_text_label=FreeText-annotaasje
+editor_ink.title=Ink-annotaasje tafoegje
+editor_ink_label=Ink-annotaasje
+
+freetext_default_content=Fier wat tekst yn…
+
+free_text_default_content=Fier tekst yn…
+
+# Editor Parameters
+editor_free_text_font_color=Letterkleur
+editor_free_text_font_size=Lettergrutte
+editor_ink_line_color=Linekleur
+editor_ink_line_thickness=Linedikte
+
+# Editor Parameters
+editor_free_text_color=Kleur
+editor_free_text_size=Grutte
+editor_ink_color=Kleur
+editor_ink_thickness=Tsjokte
+editor_ink_opacity=Transparânsje
+
+# Editor aria
+editor_free_text_aria_label=FreeText-bewurker
+editor_ink_aria_label=Ink-bewurker
+editor_ink_canvas_aria_label=Troch brûker makke ôfbylding
diff --git a/cps/static/locale/ga-IE/viewer.properties b/cps/static/locale/ga-IE/viewer.properties
index f606e81b0..e82e55b14 100644
--- a/cps/static/locale/ga-IE/viewer.properties
+++ b/cps/static/locale/ga-IE/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=An tAmharc Reatha
 tools.title=Uirlisí
 tools_label=Uirlisí
 first_page.title=Go dtí an chéad leathanach
-first_page.label=Go dtí an chéad leathanach
 first_page_label=Go dtí an chéad leathanach
 last_page.title=Go dtí an leathanach deiridh
-last_page.label=Go dtí an leathanach deiridh
 last_page_label=Go dtí an leathanach deiridh
 page_rotate_cw.title=Rothlaigh ar deiseal
-page_rotate_cw.label=Rothlaigh ar deiseal
 page_rotate_cw_label=Rothlaigh ar deiseal
 page_rotate_ccw.title=Rothlaigh ar tuathal
-page_rotate_ccw.label=Rothlaigh ar tuathal
 page_rotate_ccw_label=Rothlaigh ar tuathal
 
 cursor_text_select_tool.title=Cumasaigh an Uirlis Roghnaithe Téacs
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Uirlis Roghnaithe Téacs
 cursor_hand_tool.title=Cumasaigh an Uirlis Láimhe
 cursor_hand_tool_label=Uirlis Láimhe
 
+
+
 # Document properties dialog box
 document_properties.title=Airíonna na Cáipéise…
 document_properties_label=Airíonna na Cáipéise…
@@ -89,6 +87,14 @@ document_properties_creator=Cruthaitheoir:
 document_properties_producer=Cruthaitheoir an PDF:
 document_properties_version=Leagan PDF:
 document_properties_page_count=Líon Leathanach:
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
 document_properties_close=Dún
 
 print_progress_message=Cáipéis á hullmhú le priontáil…
@@ -101,7 +107,6 @@ print_progress_close=Cealaigh
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Scoránaigh an Barra Taoibh
-toggle_sidebar_notification.title=Scoránaigh an Barra Taoibh (achoimre/iatáin sa cháipéis)
 toggle_sidebar_label=Scoránaigh an Barra Taoibh
 document_outline.title=Taispeáin Imlíne na Cáipéise (déchliceáil chun chuile rud a leathnú nó a laghdú)
 document_outline_label=Creatlach na Cáipéise
@@ -112,6 +117,7 @@ thumbs_label=Mionsamhlacha
 findbar.title=Aimsigh sa Cháipéis
 findbar_label=Aimsigh
 
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -129,8 +135,18 @@ find_next.title=Aimsigh an chéad sampla eile den nath sin
 find_next_label=Ar aghaidh
 find_highlight=Aibhsigh uile
 find_match_case_label=Cásíogair
+find_entire_word_label=Focail iomlána
 find_reached_top=Ag barr na cáipéise, ag leanúint ón mbun
 find_reached_bottom=Ag bun na cáipéise, ag leanúint ón mbarr
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
 find_not_found=Frása gan aimsiú
 
 # Error panel labels
@@ -162,12 +178,14 @@ page_scale_actual=Fíormhéid
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Earráid
 loading_error=Tharla earráid agus an cháipéis PDF á lódáil.
 invalid_file_error=Comhad neamhbhailí nó truaillithe PDF.
 missing_file_error=Comhad PDF ar iarraidh.
 unexpected_response_error=Freagra ón bhfreastalaí nach rabhthas ag súil leis.
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
diff --git a/cps/static/locale/gd/viewer.properties b/cps/static/locale/gd/viewer.properties
index af4433e3f..4f056b1e0 100644
--- a/cps/static/locale/gd/viewer.properties
+++ b/cps/static/locale/gd/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=An sealladh làithreach
 tools.title=Innealan
 tools_label=Innealan
 first_page.title=Rach gun chiad duilleag
-first_page.label=Rach gun chiad duilleag
 first_page_label=Rach gun chiad duilleag
 last_page.title=Rach gun duilleag mu dheireadh
-last_page.label=Rach gun duilleag mu dheireadh
 last_page_label=Rach gun duilleag mu dheireadh
 page_rotate_cw.title=Cuairtich gu deiseil
-page_rotate_cw.label=Cuairtich gu deiseil
 page_rotate_cw_label=Cuairtich gu deiseil
 page_rotate_ccw.title=Cuairtich gu tuathail
-page_rotate_ccw.label=Cuairtich gu tuathail
 page_rotate_ccw_label=Cuairtich gu tuathail
 
 cursor_text_select_tool.title=Cuir an comas inneal taghadh an teacsa
@@ -137,17 +133,24 @@ print_progress_close=Sguir dheth
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Toglaich am bàr-taoibh
-toggle_sidebar_notification.title=Toglaich am bàr-taoibh (tha oir-loidhne/ceanglachain aig an sgrìobhainn)
+toggle_sidebar_notification2.title=Toglaich am bàr-taoibh (tha oir-loidhne/ceanglachain/breathan aig an sgrìobhainn)
 toggle_sidebar_label=Toglaich am bàr-taoibh
 document_outline.title=Seall oir-loidhne na sgrìobhainn (dèan briogadh dùbailte airson a h-uile nì a leudachadh/a cho-theannadh)
 document_outline_label=Oir-loidhne na sgrìobhainne
 attachments.title=Seall na ceanglachain
 attachments_label=Ceanglachain
+layers.title=Seall na breathan (dèan briogadh dùbailte airson a h-uile breath ath-shuidheachadh dhan staid bhunaiteach)
+layers_label=Breathan
 thumbs.title=Seall na dealbhagan
 thumbs_label=Dealbhagan
+current_outline_item.title=Lorg nì làithreach na h-oir-loidhne
+current_outline_item_label=Nì làithreach na h-oir-loidhne
 findbar.title=Lorg san sgrìobhainn
 findbar_label=Lorg
 
+additional_layers=Barrachd breathan
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Duilleag {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -220,12 +223,16 @@ page_scale_actual=Am fìor-mheud
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Mearachd
+loading=’Ga luchdadh…
 loading_error=Thachair mearachd rè luchdadh a' PDF.
 invalid_file_error=Faidhle PDF a tha mì-dhligheach no coirbte.
 missing_file_error=Faidhle PDF a tha a dhìth.
 unexpected_response_error=Freagairt on fhrithealaiche ris nach robh dùil.
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
+
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
@@ -233,7 +240,7 @@ unexpected_response_error=Freagairt on fhrithealaiche ris nach robh dùil.
 text_annotation_type.alt=[Nòtachadh {{type}}]
 password_label=Cuir a-steach am facal-faire gus am faidhle PDF seo fhosgladh.
 password_invalid=Tha am facal-faire cearr. Nach fheuch thu ris a-rithist?
-password_ok=Ceart ma-tha
+password_ok=Ceart ma-thà
 password_cancel=Sguir dheth
 
 printing_not_supported=Rabhadh: Chan eil am brabhsair seo a' cur làn-taic ri clò-bhualadh.
diff --git a/cps/static/locale/gl/viewer.properties b/cps/static/locale/gl/viewer.properties
index c3a30fecd..d4ea8174f 100644
--- a/cps/static/locale/gl/viewer.properties
+++ b/cps/static/locale/gl/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vista actual
 tools.title=Ferramentas
 tools_label=Ferramentas
 first_page.title=Ir á primeira páxina
-first_page.label=Ir á primeira páxina
 first_page_label=Ir á primeira páxina
 last_page.title=Ir á última páxina
-last_page.label=Ir á última páxina
 last_page_label=Ir á última páxina
 page_rotate_cw.title=Rotar no sentido das agullas do reloxo
-page_rotate_cw.label=Rotar no sentido das agullas do reloxo
 page_rotate_cw_label=Rotar no sentido das agullas do reloxo
 page_rotate_ccw.title=Rotar no sentido contrario ás agullas do reloxo
-page_rotate_ccw.label=Rotar no sentido contrario ás agullas do reloxo
 page_rotate_ccw_label=Rotar no sentido contrario ás agullas do reloxo
 
 cursor_text_select_tool.title=Activar a ferramenta de selección de texto
@@ -137,19 +133,24 @@ print_progress_close=Cancelar
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Amosar/agochar a barra lateral
-toggle_sidebar_notification.title=Amosar/agochar a barra lateral (o documento contén un esquema ou anexos)
+toggle_sidebar_notification2.title=Alternar barra lateral (o documento contén esquema/anexos/capas)
 toggle_sidebar_label=Amosar/agochar a barra lateral
 document_outline.title=Amosar o esquema do documento (prema dúas veces para expandir/contraer todos os elementos)
 document_outline_label=Esquema do documento
 attachments.title=Amosar anexos
 attachments_label=Anexos
+layers.title=Mostrar capas (prema dúas veces para restaurar todas as capas o estado predeterminado)
+layers_label=Capas
 thumbs.title=Amosar miniaturas
 thumbs_label=Miniaturas
+current_outline_item.title=Atopar o elemento delimitado actualmente
+current_outline_item_label=Elemento delimitado actualmente
 findbar.title=Atopar no documento
 findbar_label=Atopar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Páxina {{page}}
+additional_layers=Capas adicionais
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Páxina {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -222,7 +223,7 @@ page_scale_actual=Tamaño actual
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Erro
+loading=A cargar…
 loading_error=Produciuse un erro ao cargar o PDF.
 invalid_file_error=Ficheiro PDF danado ou non válido.
 missing_file_error=Falta o ficheiro PDF.
diff --git a/cps/static/locale/gn/viewer.properties b/cps/static/locale/gn/viewer.properties
index 4b893971d..566e361bb 100644
--- a/cps/static/locale/gn/viewer.properties
+++ b/cps/static/locale/gn/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Ag̃agua jehecha
 tools.title=Tembipuru
 tools_label=Tembipuru
 first_page.title=Kuatiarogue ñepyrũme jeho
-first_page.label=Kuatiarogue ñepyrũme jeho
 first_page_label=Kuatiarogue ñepyrũme jeho
 last_page.title=Kuatiarogue pahápe jeho
-last_page.label=Kuatiarogue pahápe jeho
 last_page_label=Kuatiarogue pahápe jeho
 page_rotate_cw.title=Aravóicha mbojere
-page_rotate_cw.label=Aravóicha mbojere
 page_rotate_cw_label=Aravóicha mbojere
 page_rotate_ccw.title=Aravo rapykue gotyo mbojere
-page_rotate_ccw.label=Aravo rapykue gotyo mbojere
 page_rotate_ccw_label=Aravo rapykue gotyo mbojere
 
 cursor_text_select_tool.title=Emyandy moñe’ẽrã jeporavo rembipuru
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Moñe’ẽrã jeporavo rembipuru
 cursor_hand_tool.title=Tembipuru po pegua myandy
 cursor_hand_tool_label=Tembipuru po pegua
 
+scroll_page.title=Eipuru kuatiarogue jeku’e
+scroll_page_label=Kuatiarogue jeku’e
 scroll_vertical.title=Eipuru jeku’e ykeguáva
 scroll_vertical_label=Jeku’e ykeguáva
 scroll_horizontal.title=Eipuru jeku’e yvate gotyo
@@ -137,19 +135,24 @@ print_progress_close=Heja
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Tenda yke moambue
-toggle_sidebar_notification.title=Embojopyru tenda ykegua (kuatia oguereko kora/marandurenda moirũha)
+toggle_sidebar_notification2.title=Embojopyru tenda ykegua (kuatia oguereko kuaakaha/moirũha/ñuãha)
 toggle_sidebar_label=Tenda yke moambue
 document_outline.title=Ehechauka kuatia rape (eikutu mokõi jey embotuicha/emomichĩ hag̃ua opavavete mba’epuru)
 document_outline_label=Kuatia apopyre
 attachments.title=Moirũha jehechauka
 attachments_label=Moirũha
+layers.title=Ehechauka ñuãha (eikutu jo’a emomba’apo hag̃ua opaite ñuãha tekoypýpe)
+layers_label=Ñuãha
 thumbs.title=Mba’emirĩ jehechauka
 thumbs_label=Mba’emirĩ
+current_outline_item.title=Eheka mba’epuru ag̃aguaitéva
+current_outline_item_label=Mba’epuru ag̃aguaitéva
 findbar.title=Kuatiápe jeheka
 findbar_label=Juhu
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Kuatiarogue {{page}}
+additional_layers=Ñuãha moirũguáva
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Kuatiarogue {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Eho ñe’ẽ juhupyre upeiguávape
 find_next_label=Upeigua
 find_highlight=Embojekuaavepa
 find_match_case_label=Ejesareko taiguasu/taimichĩre
+find_match_diacritics_label=Diacrítico moñondive
 find_entire_word_label=Ñe’ẽ oĩmbáva 
 find_reached_top=Ojehupyty kuatia ñepyrũ, oku’ejeýta kuatia paha guive
 find_reached_bottom=Ojehupyty kuatia paha, oku’ejeýta kuatia ñepyrũ guive
@@ -222,7 +226,7 @@ page_scale_actual=Tuichakue ag̃agua
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Oĩvaíva
+loading=Henyhẽhína…
 loading_error=Oiko jejavy PDF oñemyeñyhẽnguévo.
 invalid_file_error=PDF marandurenda ndoikóiva térã ivaipyréva.
 missing_file_error=Ndaipóri PDF marandurenda
@@ -245,3 +249,33 @@ password_cancel=Heja
 printing_not_supported=Kyhyjerã: Ñembokuatia ndojokupytypái ko kundahára ndive.
 printing_not_ready=Kyhyjerã: Ko PDF nahenyhẽmbái oñembokuatia hag̃uáicha.
 web_fonts_disabled=Ñanduti taity oñemongéma: ndaikatumo’ãi eipuru PDF jehai’íva taity.
+
+# Editor
+editor_none.title=Eipe’a jehaiha ñembosako’i
+editor_none_label=Eipe’a ñembosako’i
+editor_free_text.title=Embojuaju FreeText jehaiha
+editor_free_text_label=FreeTextjehaiha
+editor_ink.title=Embojuaju mbokuatiarã jehaiha
+editor_ink_label=Mbokuatiarã jehaiha
+
+freetext_default_content=Emoinge moñe’ẽrã…
+
+free_text_default_content=Emoinge moñe’ẽrã…
+
+# Editor Parameters
+editor_free_text_font_color=Teñoiha Sa’y
+editor_free_text_font_size=Tai tuichakue
+editor_ink_line_color=Tairenda sa’y
+editor_ink_line_thickness=Tairenda poguasukue
+
+# Editor Parameters
+editor_free_text_color=Sa’y
+editor_free_text_size=Tuichakue
+editor_ink_color=Sa’y
+editor_ink_thickness=Anambusu
+editor_ink_opacity=Pytũngy
+
+# Editor aria
+editor_free_text_aria_label=FreeText Moheñoiha
+editor_ink_aria_label=Jehaiha moheñoiha
+editor_ink_canvas_aria_label=Ta’ãnga omoheñóiva puruhára
diff --git a/cps/static/locale/gu-IN/viewer.properties b/cps/static/locale/gu-IN/viewer.properties
index 579c068d9..174d4648c 100644
--- a/cps/static/locale/gu-IN/viewer.properties
+++ b/cps/static/locale/gu-IN/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=વર્તમાન દૃશ્ય
 tools.title=સાધનો
 tools_label=સાધનો
 first_page.title=પહેલાં પાનામાં જાવ
-first_page.label=પહેલાં પાનામાં જાવ
 first_page_label=પ્રથમ પાનાં પર જાવ
 last_page.title=છેલ્લા પાનાં પર જાવ
-last_page.label=છેલ્લા પાનામાં જાવ
 last_page_label=છેલ્લા પાનાં પર જાવ
 page_rotate_cw.title=ઘડિયાળનાં કાંટા તરફ ફેરવો
-page_rotate_cw.label=ઘડિયાળનાં કાંટાની જેમ ફેરવો
 page_rotate_cw_label=ઘડિયાળનાં કાંટા તરફ ફેરવો
 page_rotate_ccw.title=ઘડિયાળનાં કાંટાની ઉલટી દિશામાં ફેરવો
-page_rotate_ccw.label=ઘડિયાળનાં કાંટાની ઉલટી દિશામાં ફેરવો
 page_rotate_ccw_label=ઘડિયાળનાં કાંટાની વિરુદ્દ ફેરવો
 
 cursor_text_select_tool.title=ટેક્સ્ટ પસંદગી ટૂલ સક્ષમ કરો
@@ -137,7 +133,6 @@ print_progress_close=રદ કરો
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=ટૉગલ બાજુપટ્ટી
-toggle_sidebar_notification.title=સાઇડબારને ટૉગલ કરો(દસ્તાવેજની રૂપરેખા/જોડાણો શામેલ છે)
 toggle_sidebar_label=ટૉગલ બાજુપટ્ટી
 document_outline.title=દસ્તાવેજની રૂપરેખા બતાવો(બધી આઇટમ્સને વિસ્તૃત/સંકુચિત કરવા માટે ડબલ-ક્લિક કરો)
 document_outline_label=દસ્તાવેજ રૂપરેખા
@@ -219,8 +214,6 @@ page_scale_actual=ચોક્કસ માપ
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=ભૂલ
 loading_error=ભૂલ ઉદ્ભવી જ્યારે PDF ને લાવી રહ્યા હોય.
 invalid_file_error=અયોગ્ય અથવા ભાંગેલ PDF ફાઇલ.
 missing_file_error=ગુમ થયેલ PDF ફાઇલ.
diff --git a/cps/static/locale/he/viewer.properties b/cps/static/locale/he/viewer.properties
index 066478921..65f35edef 100644
--- a/cps/static/locale/he/viewer.properties
+++ b/cps/static/locale/he/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=תצוגה נוכחית
 tools.title=כלים
 tools_label=כלים
 first_page.title=מעבר לעמוד הראשון
-first_page.label=מעבר לעמוד הראשון
 first_page_label=מעבר לעמוד הראשון
 last_page.title=מעבר לעמוד האחרון
-last_page.label=מעבר לעמוד האחרון
 last_page_label=מעבר לעמוד האחרון
 page_rotate_cw.title=הטיה עם כיוון השעון
-page_rotate_cw.label=הטיה עם כיוון השעון
 page_rotate_cw_label=הטיה עם כיוון השעון
 page_rotate_ccw.title=הטיה כנגד כיוון השעון
-page_rotate_ccw.label=הטיה כנגד כיוון השעון
 page_rotate_ccw_label=הטיה כנגד כיוון השעון
 
 cursor_text_select_tool.title=הפעלת כלי בחירת טקסט
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=כלי בחירת טקסט
 cursor_hand_tool.title=הפעלת כלי היד
 cursor_hand_tool_label=כלי יד
 
+scroll_page.title=שימוש בגלילת עמוד
+scroll_page_label=גלילת עמוד
 scroll_vertical.title=שימוש בגלילה אנכית
 scroll_vertical_label=גלילה אנכית
 scroll_horizontal.title=שימוש בגלילה אופקית
@@ -137,19 +135,24 @@ print_progress_close=ביטול
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=הצגה/הסתרה של סרגל הצד
-toggle_sidebar_notification.title=החלפת תצוגת סרגל צד (מסמך שמכיל מתאר/צרופות)
+toggle_sidebar_notification2.title=החלפת תצוגת סרגל צד (מסמך שמכיל תוכן עניינים/קבצים מצורפים/שכבות)
 toggle_sidebar_label=הצגה/הסתרה של סרגל הצד
-document_outline.title=הצגת מתאר מסמך (לחיצה כפולה כדי להרחיב או לצמצם את כל הפריטים)
-document_outline_label=מתאר מסמך
+document_outline.title=הצגת תוכן העניינים של המסמך (לחיצה כפולה כדי להרחיב או לצמצם את כל הפריטים)
+document_outline_label=תוכן העניינים של המסמך
 attachments.title=הצגת צרופות
 attachments_label=צרופות
+layers.title=הצגת שכבות (יש ללחוץ לחיצה כפולה כדי לאפס את כל השכבות למצב ברירת המחדל)
+layers_label=שכבות
 thumbs.title=הצגת תצוגה מקדימה
 thumbs_label=תצוגה מקדימה
+current_outline_item.title=מציאת פריט תוכן העניינים הנוכחי
+current_outline_item_label=פריט תוכן העניינים הנוכחי
 findbar.title=חיפוש במסמך
 findbar_label=חיפוש
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=עמוד {{page}}
+additional_layers=שכבות נוספות
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=עמוד {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=מציאת המופע הבא של הביטוי
 find_next_label=הבא
 find_highlight=הדגשת הכול
 find_match_case_label=התאמת אותיות
+find_match_diacritics_label=התאמה דיאקריטית
 find_entire_word_label=מילים שלמות
 find_reached_top=הגיע לראש הדף, ממשיך מלמטה
 find_reached_bottom=הגיע לסוף הדף, ממשיך מלמעלה
@@ -222,7 +226,7 @@ page_scale_actual=גודל אמיתי
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=שגיאה
+loading=בטעינה…
 loading_error=אירעה שגיאה בעת טעינת ה־PDF.
 invalid_file_error=קובץ PDF פגום או לא תקין.
 missing_file_error=קובץ PDF חסר.
@@ -243,5 +247,35 @@ password_ok=אישור
 password_cancel=ביטול
 
 printing_not_supported=אזהרה: הדפסה אינה נתמכת במלואה בדפדפן זה.
-printing_not_ready=אזהרה: ה־PDF לא ניתן לחלוטין עד מצב שמאפשר הדפסה.
+printing_not_ready=אזהרה: מסמך ה־PDF לא נטען לחלוטין עד מצב שמאפשר הדפסה.
 web_fonts_disabled=גופני רשת מנוטרלים: לא ניתן להשתמש בגופני PDF מוטבעים.
+
+# Editor
+editor_none.title=השבתת עריכת ההערות
+editor_none_label=השבתת עריכה
+editor_free_text.title=הוספת הערת FreeText
+editor_free_text_label=הערת FreeText
+editor_ink.title=הוספת הערת דיו
+editor_ink_label=הערת דיו
+
+freetext_default_content=נא להזין טקסט…
+
+free_text_default_content=נא להקליד טקסט…
+
+# Editor Parameters
+editor_free_text_font_color=צבע גופן
+editor_free_text_font_size=גודל גופן
+editor_ink_line_color=צבע קו
+editor_ink_line_thickness=עובי קו
+
+# Editor Parameters
+editor_free_text_color=צבע
+editor_free_text_size=גודל
+editor_ink_color=צבע
+editor_ink_thickness=עובי
+editor_ink_opacity=אטימות
+
+# Editor aria
+editor_free_text_aria_label=עורך FreeText
+editor_ink_aria_label=עורך דיו
+editor_ink_canvas_aria_label=תמונה שנוצרה על־ידי משתמש
diff --git a/cps/static/locale/hi-IN/viewer.properties b/cps/static/locale/hi-IN/viewer.properties
index 6a49a9a98..27064ee93 100644
--- a/cps/static/locale/hi-IN/viewer.properties
+++ b/cps/static/locale/hi-IN/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=\u0020मौजूदा दृश्य
 tools.title=औज़ार
 tools_label=औज़ार
 first_page.title=प्रथम पृष्ठ पर जाएँ
-first_page.label=\u0020प्रथम पृष्ठ पर जाएँ
 first_page_label=प्रथम पृष्ठ पर जाएँ
 last_page.title=अंतिम पृष्ठ पर जाएँ
-last_page.label=\u0020अंतिम पृष्ठ पर जाएँ
 last_page_label=\u0020अंतिम पृष्ठ पर जाएँ
 page_rotate_cw.title=घड़ी की दिशा में घुमाएँ
-page_rotate_cw.label=घड़ी की दिशा में घुमाएँ
 page_rotate_cw_label=घड़ी की दिशा में घुमाएँ
 page_rotate_ccw.title=घड़ी की दिशा से उल्टा घुमाएँ
-page_rotate_ccw.label=घड़ी की दिशा से उल्टा घुमाएँ
 page_rotate_ccw_label=\u0020घड़ी की दिशा से उल्टा घुमाएँ
 
 cursor_text_select_tool.title=पाठ चयन उपकरण सक्षम करें
@@ -133,7 +129,6 @@ print_progress_close=रद्द करें
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=\u0020स्लाइडर टॉगल करें
-toggle_sidebar_notification.title=साइडबार टॉगल करें (दस्तावेज़ में रूपरेखा शामिल है/attachments)
 toggle_sidebar_label=स्लाइडर टॉगल करें
 document_outline.title=दस्तावेज़ की रूपरेखा दिखाइए (सारी वस्तुओं को फलने अथवा समेटने के लिए दो बार क्लिक करें)
 document_outline_label=दस्तावेज़ आउटलाइन
@@ -144,8 +139,6 @@ thumbs_label=लघु छवि
 findbar.title=\u0020दस्तावेज़ में ढूँढ़ें
 findbar_label=ढूँढें
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=पृष्ठ {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -217,8 +210,6 @@ page_scale_actual=वास्तविक आकार
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=त्रुटि
 loading_error=PDF लोड करते समय एक त्रुटि हुई.
 invalid_file_error=अमान्य या भ्रष्ट PDF फ़ाइल.
 missing_file_error=\u0020अनुपस्थित PDF फ़ाइल.
diff --git a/cps/static/locale/hr/viewer.properties b/cps/static/locale/hr/viewer.properties
index bfe10f808..1ccf441cb 100644
--- a/cps/static/locale/hr/viewer.properties
+++ b/cps/static/locale/hr/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Trenutačni prikaz
 tools.title=Alati
 tools_label=Alati
 first_page.title=Idi na prvu stranicu
-first_page.label=Idi na prvu stranicu
 first_page_label=Idi na prvu stranicu
 last_page.title=Idi na posljednju stranicu
-last_page.label=Idi na posljednju stranicu
 last_page_label=Idi na posljednju stranicu
 page_rotate_cw.title=Rotiraj u smjeru kazaljke na satu
-page_rotate_cw.label=Rotiraj u smjeru kazaljke na satu
 page_rotate_cw_label=Rotiraj u smjeru kazaljke na satu
 page_rotate_ccw.title=Rotiraj obrnutno od smjera kazaljke na satu
-page_rotate_ccw.label=Rotiraj obrnutno od smjera kazaljke na satu
 page_rotate_ccw_label=Rotiraj obrnutno od smjera kazaljke na satu
 
 cursor_text_select_tool.title=Omogući alat za označavanje teksta
@@ -80,8 +76,8 @@ spread_even.title=Izradi duplerice koje počinju s parnim stranicama
 spread_even_label=Parne duplerice
 
 # Document properties dialog box
-document_properties.title=Svojstva dokumenta...
-document_properties_label=Svojstva dokumenta...
+document_properties.title=Svojstva dokumenta …
+document_properties_label=Svojstva dokumenta …
 document_properties_file_name=Naziv datoteke:
 document_properties_file_size=Veličina datoteke:
 # LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
@@ -137,19 +133,24 @@ print_progress_close=Odustani
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Prikaži/sakrij bočnu traku
-toggle_sidebar_notification.title=Prikazivanje i sklanjanje bočne trake (dokument sadrži konturu/privitke)
+toggle_sidebar_notification2.title=Prikazivanje i sklanjanje bočne trake (dokument sadrži strukturu/privitke/slojeve)
 toggle_sidebar_label=Prikaži/sakrij bočnu traku
 document_outline.title=Prikaži strukturu dokumenta (dvostruki klik za rasklapanje/sklapanje svih stavki)
 document_outline_label=Struktura dokumenta
 attachments.title=Prikaži privitke
 attachments_label=Privitci
+layers.title=Prikaži slojeve (dvoklik za vraćanje svih slojeva u zadano stanje)
+layers_label=Slojevi
 thumbs.title=Prikaži minijature
 thumbs_label=Minijature
-findbar.title=Traži u dokumentu
-findbar_label=Traži
+current_outline_item.title=Pronađi trenutačni element strukture
+current_outline_item_label=Trenutačni element strukture
+findbar.title=Pronađi u dokumentu
+findbar_label=Pronađi
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Stranica br. {{page}}
+additional_layers=Dodatni slojevi
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Stranica {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -159,8 +160,8 @@ thumb_page_title=Stranica {{page}}
 thumb_page_canvas=Minijatura stranice {{page}}
 
 # Find panel button title and messages
-find_input.title=Traži
-find_input.placeholder=Traži u dokumentu…
+find_input.title=Pronađi
+find_input.placeholder=Pronađi u dokumentu …
 find_previous.title=Pronađi prethodno pojavljivanje ovog izraza
 find_previous_label=Prethodno
 find_next.title=Pronađi sljedeće pojavljivanje ovog izraza
@@ -222,7 +223,7 @@ page_scale_actual=Stvarna veličina
 page_scale_percent={{scale}} %
 
 # Loading indicator messages
-loading_error_indicator=Greška
+loading=Učitavanje…
 loading_error=Došlo je do greške pri učitavanju PDF-a.
 invalid_file_error=Neispravna ili oštećena PDF datoteka.
 missing_file_error=Nedostaje PDF datoteka.
diff --git a/cps/static/locale/hsb/viewer.properties b/cps/static/locale/hsb/viewer.properties
index 9ba3c15a2..86c2d79f0 100644
--- a/cps/static/locale/hsb/viewer.properties
+++ b/cps/static/locale/hsb/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Aktualny napohlad
 tools.title=Nastroje
 tools_label=Nastroje
 first_page.title=K prěnjej stronje
-first_page.label=K prěnjej stronje
 first_page_label=K prěnjej stronje
 last_page.title=K poslednjej stronje
-last_page.label=K poslednjej stronje
 last_page_label=K poslednjej stronje
 page_rotate_cw.title=K směrej časnika wjerćeć
-page_rotate_cw.label=K směrej časnika wjerćeć
 page_rotate_cw_label=K směrej časnika wjerćeć
 page_rotate_ccw.title=Přećiwo směrej časnika wjerćeć
-page_rotate_ccw.label=Přećiwo směrej časnika wjerćeć
 page_rotate_ccw_label=Přećiwo směrej časnika wjerćeć
 
 cursor_text_select_tool.title=Nastroj za wuběranje teksta zmóžnić
@@ -65,8 +61,10 @@ cursor_text_select_tool_label=Nastroj za wuběranje teksta
 cursor_hand_tool.title=Ručny nastroj zmóžnić
 cursor_hand_tool_label=Ručny nastroj
 
+scroll_page.title=Kulenje strony wužiwać
+scroll_page_label=Kulenje strony
 scroll_vertical.title=Wertikalne suwanje wužiwać
-scroll_vertical_label=Wertikalnje suwanje
+scroll_vertical_label=Wertikalne suwanje
 scroll_horizontal.title=Horicontalne suwanje wužiwać
 scroll_horizontal_label=Horicontalne suwanje
 scroll_wrapped.title=Postupne suwanje wužiwać
@@ -137,19 +135,24 @@ print_progress_close=Přetorhnyć
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Bóčnicu pokazać/schować
-toggle_sidebar_notification.title=Bóčnicu přepinać (dokument wobsahuje wobrys/přiwěški)
+toggle_sidebar_notification2.title=Bóčnicu přepinać (dokument rozrjad/přiwěški/woršty wobsahuje)
 toggle_sidebar_label=Bóčnicu pokazać/schować
 document_outline.title=Dokumentowy naćisk pokazać (dwójne kliknjenje, zo bychu so wšě zapiski pokazali/schowali)
 document_outline_label=Dokumentowa struktura
 attachments.title=Přiwěški pokazać
 attachments_label=Přiwěški
+layers.title=Woršty pokazać (klikńće dwójce, zo byšće wšě woršty na standardny staw wróćo stajił)
+layers_label=Woršty
 thumbs.title=Miniatury pokazać
 thumbs_label=Miniatury
+current_outline_item.title=Aktualny rozrjadowy zapisk pytać
+current_outline_item_label=Aktualny rozrjadowy zapisk
 findbar.title=W dokumenće pytać
 findbar_label=Pytać
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Strona {{page}}
+additional_layers=Dalše woršty
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Strona {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Přichodne wustupowanje pytanskeho wuraza pytać
 find_next_label=Dale
 find_highlight=Wšě wuzběhnyć
 find_match_case_label=Wulkopisanje wobkedźbować
+find_match_diacritics_label=Diakritiske znamješka wužiwać
 find_entire_word_label=Cyłe słowa
 find_reached_top=Spočatk dokumenta docpěty, pokročuje so z kóncom
 find_reached_bottom=Kónc dokument docpěty, pokročuje so ze spočatkom
@@ -222,7 +226,7 @@ page_scale_actual=Aktualna wulkosć
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Zmylk
+loading=Začituje so…
 loading_error=Při začitowanju PDF je zmylk wustupił.
 invalid_file_error=Njepłaćiwa abo wobškodźena PDF-dataja.
 missing_file_error=Falowaca PDF-dataja.
@@ -245,3 +249,33 @@ password_cancel=Přetorhnyć
 printing_not_supported=Warnowanje: Ćišćenje so přez tutón wobhladowak połnje njepodpěruje.
 printing_not_ready=Warnowanje: PDF njeje so za ćišćenje dospołnje začitał.
 web_fonts_disabled=Webpisma su znjemóžnjene: njeje móžno, zasadźene PDF-pisma wužiwać.
+
+# Editor
+editor_none.title=Wobdźěłowanje anotacijow znjemóžnić
+editor_none_label=Wobdźěłowanje znjemóžnić
+editor_free_text.title=Anotaciju FreeText přidać
+editor_free_text_label=Anotacija FreeText
+editor_ink.title=Tintowu anotaciju přidać
+editor_ink_label=Tintowa anotacija
+
+freetext_default_content=Zapodajće trochu teksta…
+
+free_text_default_content=Tekst zapodać…
+
+# Editor Parameters
+editor_free_text_font_color=Pismowa barba
+editor_free_text_font_size=Pismowa wulkosć
+editor_ink_line_color=Linijowa barba
+editor_ink_line_thickness=Linijowa tołstosć
+
+# Editor Parameters
+editor_free_text_color=Barba
+editor_free_text_size=Wulkosć
+editor_ink_color=Barba
+editor_ink_thickness=Tołstosć
+editor_ink_opacity=Opacita
+
+# Editor aria
+editor_free_text_aria_label=Darmotny tekstowy editor
+editor_ink_aria_label=Tintowy editor
+editor_ink_canvas_aria_label=Wobraz wutworjeny wot wužiwarja
diff --git a/cps/static/locale/hu/viewer.properties b/cps/static/locale/hu/viewer.properties
index 88c1d0796..f7a48511f 100644
--- a/cps/static/locale/hu/viewer.properties
+++ b/cps/static/locale/hu/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Aktuális nézet
 tools.title=Eszközök
 tools_label=Eszközök
 first_page.title=Ugrás az első oldalra
-first_page.label=Ugrás az első oldalra
 first_page_label=Ugrás az első oldalra
 last_page.title=Ugrás az utolsó oldalra
-last_page.label=Ugrás az utolsó oldalra
 last_page_label=Ugrás az utolsó oldalra
 page_rotate_cw.title=Forgatás az óramutató járásával egyezően
-page_rotate_cw.label=Forgatás az óramutató járásával egyezően
 page_rotate_cw_label=Forgatás az óramutató járásával egyezően
 page_rotate_ccw.title=Forgatás az óramutató járásával ellentétesen
-page_rotate_ccw.label=Forgatás az óramutató járásával ellentétesen
 page_rotate_ccw_label=Forgatás az óramutató járásával ellentétesen
 
 cursor_text_select_tool.title=Szövegkijelölő eszköz bekapcsolása
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Szövegkijelölő eszköz
 cursor_hand_tool.title=Kéz eszköz bekapcsolása
 cursor_hand_tool_label=Kéz eszköz
 
+scroll_page.title=Oldalgörgetés használata
+scroll_page_label=Oldalgörgetés
 scroll_vertical.title=Függőleges görgetés használata
 scroll_vertical_label=Függőleges görgetés
 scroll_horizontal.title=Vízszintes görgetés használata
@@ -137,19 +135,24 @@ print_progress_close=Mégse
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Oldalsáv be/ki
-toggle_sidebar_notification.title=Oldalsáv be/ki (a dokumentum vázlatot/mellékleteket tartalmaz)
+toggle_sidebar_notification2.title=Oldalsáv be/ki (a dokumentum vázlatot/mellékleteket/rétegeket tartalmaz)
 toggle_sidebar_label=Oldalsáv be/ki
 document_outline.title=Dokumentum megjelenítése online (dupla kattintás minden elem kinyitásához/összecsukásához)
 document_outline_label=Dokumentumvázlat
 attachments.title=Mellékletek megjelenítése
 attachments_label=Van melléklet
+layers.title=Rétegek megjelenítése (dupla kattintás az összes réteg alapértelmezett állapotra visszaállításához)
+layers_label=Rétegek
 thumbs.title=Bélyegképek megjelenítése
 thumbs_label=Bélyegképek
+current_outline_item.title=Jelenlegi vázlatelem megkeresése
+current_outline_item_label=Jelenlegi vázlatelem
 findbar.title=Keresés a dokumentumban
 findbar_label=Keresés
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas={{page}}. oldal
+additional_layers=További rétegek
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark={{page}}. oldal
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=A kifejezés következő előfordulásának keresése
 find_next_label=Tovább
 find_highlight=Összes kiemelése
 find_match_case_label=Kis- és nagybetűk megkülönböztetése
+find_match_diacritics_label=Diakritikus jelek
 find_entire_word_label=Teljes szavak
 find_reached_top=A dokumentum eleje elérve, folytatás a végétől
 find_reached_bottom=A dokumentum vége elérve, folytatás az elejétől
@@ -222,7 +226,7 @@ page_scale_actual=Valódi méret
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Hiba
+loading=Betöltés…
 loading_error=Hiba történt a PDF betöltésekor.
 invalid_file_error=Érvénytelen vagy sérült PDF fájl.
 missing_file_error=Hiányzó PDF fájl.
@@ -245,3 +249,33 @@ password_cancel=Mégse
 printing_not_supported=Figyelmeztetés: Ez a böngésző nem teljesen támogatja a nyomtatást.
 printing_not_ready=Figyelmeztetés: A PDF nincs teljesen betöltve a nyomtatáshoz.
 web_fonts_disabled=Webes betűkészletek letiltva: nem használhatók a beágyazott PDF betűkészletek.
+
+# Editor
+editor_none.title=Kommentárszerkesztés letiltása
+editor_none_label=Szerkesztés letiltása
+editor_free_text.title=FreeText kommentár hozzáadása
+editor_free_text_label=FreeText kommentár
+editor_ink.title=Tintajegyzet hozzáadása
+editor_ink_label=Tintajegyzet
+
+freetext_default_content=Írj be egy szöveget…
+
+free_text_default_content=Írjon be szöveget…
+
+# Editor Parameters
+editor_free_text_font_color=Betűszín
+editor_free_text_font_size=Betűméret
+editor_ink_line_color=Vonalszín
+editor_ink_line_thickness=Vonalvastagság
+
+# Editor Parameters
+editor_free_text_color=Szín
+editor_free_text_size=Méret
+editor_ink_color=Szín
+editor_ink_thickness=Vastagság
+editor_ink_opacity=Átlátszatlanság
+
+# Editor aria
+editor_free_text_aria_label=Szabad szöveges szerkesztő
+editor_ink_aria_label=Tollat használó szerkesztő
+editor_ink_canvas_aria_label=Felhasználó által készített kép
diff --git a/cps/static/locale/hy-AM/viewer.properties b/cps/static/locale/hy-AM/viewer.properties
index 09394f7d8..a97ae3cef 100644
--- a/cps/static/locale/hy-AM/viewer.properties
+++ b/cps/static/locale/hy-AM/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Ընթացիկ տեսքը
 tools.title=Գործիքներ
 tools_label=Գործիքներ
 first_page.title=Անցնել առաջին էջին
-first_page.label=Անցնել առաջին էջին
 first_page_label=Անցնել առաջին էջին
 last_page.title=Անցնել վերջին էջին
-last_page.label=Անցնել վերջին էջին
 last_page_label=Անցնել վերջին էջին
 page_rotate_cw.title=Պտտել ըստ ժամացույցի սլաքի
-page_rotate_cw.label=Պտտել ըստ ժամացույցի սլաքի
 page_rotate_cw_label=Պտտել ըստ ժամացույցի սլաքի
 page_rotate_ccw.title=Պտտել հակառակ ժամացույցի սլաքի
-page_rotate_ccw.label=Պտտել հակառակ ժամացույցի սլաքի
 page_rotate_ccw_label=Պտտել հակառակ ժամացույցի սլաքի
 
 cursor_text_select_tool.title=Միացնել գրույթ ընտրելու գործիքը
@@ -137,7 +133,6 @@ print_progress_close=Չեղարկել
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Բացել/Փակել Կողային վահանակը
-toggle_sidebar_notification.title=Փոխարկել Կողային փեղկը (փաստաթուղթը պարունակում է ուրվագիծ/կցորդներ)
 toggle_sidebar_label=Բացել/Փակել Կողային վահանակը
 document_outline.title=Ցուցադրել փաստաթղթի ուրվագիծը (կրկնակի սեղմեք՝ միավորները ընդարձակելու/կոծկելու համար)
 document_outline_label=Փաստաթղթի բովանդակությունը
@@ -148,8 +143,6 @@ thumbs_label=Մանրապատկերը
 findbar.title=Գտնել փաստաթղթում
 findbar_label=Որոնում
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Էջ {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -221,8 +214,6 @@ page_scale_actual=Իրական չափը
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Սխալ
 loading_error=Սխալ՝ PDF ֆայլը բացելիս։
 invalid_file_error=Սխալ կամ վնասված PDF ֆայլ:
 missing_file_error=PDF ֆայլը բացակայում է:
diff --git a/cps/static/locale/hye/viewer.properties b/cps/static/locale/hye/viewer.properties
index 80d43019e..d531b9d28 100644
--- a/cps/static/locale/hye/viewer.properties
+++ b/cps/static/locale/hye/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Ընթացիկ տեսք
 tools.title=Գործիքներ
 tools_label=Գործիքներ
 first_page.title=Գնալ դէպի առաջին էջ
-first_page.label=Գնալ դէպի առաջին էջ
 first_page_label=Գնալ դէպի առաջին էջ
 last_page.title=Գնալ դէպի վերջին էջ
-last_page.label=Գնալ դէպի վերջին էջ
 last_page_label=Գնալ դէպի վերջին էջ
 page_rotate_cw.title=Պտտել ժամացոյցի սլաքի ուղղութեամբ
-page_rotate_cw.label=Պտտել ժամացոյցի սլաքի ուղղութեամբ
 page_rotate_cw_label=Պտտել ժամացոյցի սլաքի ուղղութեամբ
 page_rotate_ccw.title=Պտտել ժամացոյցի սլաքի հակառակ ուղղութեամբ
-page_rotate_ccw.label=Պտտել ժամացոյցի սլաքի հակառակ ուղղութեամբ
 page_rotate_ccw_label=Պտտել ժամացոյցի սլաքի հակառակ ուղղութեամբ
 
 cursor_text_select_tool.title=Միացնել գրոյթ ընտրելու գործիքը
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Գրուածք ընտրելու գործիք
 cursor_hand_tool.title=Միացնել ձեռքի գործիքը
 cursor_hand_tool_label=Ձեռքի գործիք
 
+scroll_page.title=Աւգտագործել էջի ոլորում
+scroll_page_label=Էջի ոլորում
 scroll_vertical.title=Աւգտագործել ուղղահայեաց ոլորում
 scroll_vertical_label=Ուղղահայեաց ոլորում
 scroll_horizontal.title=Աւգտագործել հորիզոնական ոլորում
@@ -77,6 +75,7 @@ spread_none_label=Չկայ կոնտեքստ
 spread_odd.title=Միացէք էջի կոնտեքստին սկսելով՝ կենտ համարակալուած էջերով
 spread_odd_label=Տարաւրինակ կոնտեքստ
 spread_even.title=Միացէք էջի կոնտեքստին սկսելով՝ զոյգ համարակալուած էջերով
+spread_even_label=Հաւասար վերածածկեր
 
 # Document properties dialog box
 document_properties.title=Փաստաթղթի հատկութիւնները…
@@ -136,19 +135,24 @@ print_progress_close=Չեղարկել
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Փոխարկել կողային վահանակը
-toggle_sidebar_notification.title=Փոխարկել կողային վահանակը (փաստաթուղթը պարունակում է ուրուագիծ/կցորդ)
+toggle_sidebar_notification2.title=Փոխանջատել կողմնասիւնը (փաստաթուղթը պարունակում է ուրուագիծ/կցորդներ/շերտեր)
 toggle_sidebar_label=Փոխարկել կողային վահանակը
 document_outline.title=Ցուցադրել փաստաթղթի ուրուագիծը (կրկնակի սեղմէք՝ միաւորները ընդարձակելու/կոծկելու համար)
 document_outline_label=Փաստաթղթի ուրուագիծ
 attachments.title=Ցուցադրել կցորդները
 attachments_label=Կցորդներ
+layers.title=Ցուցադրել շերտերը (կրկնահպել վերակայելու բոլոր շերտերը սկզբնադիր վիճակի)
+layers_label=Շերտեր
 thumbs.title=Ցուցադրել մանրապատկերը
 thumbs_label=Մանրապատկեր
+current_outline_item.title=Գտէք ընթացիկ գծագրման տարրը
+current_outline_item_label=Ընթացիկ գծագրման տարր
 findbar.title=Գտնել փաստաթղթում
 findbar_label=Որոնում
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Էջ {{page}}
+additional_layers=Լրացուցիչ շերտեր
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Էջ {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -166,6 +170,7 @@ find_next.title=Գտիր արտայայտութեան յաջորդ արտայա
 find_next_label=Հաջորդը
 find_highlight=Գունանշել բոլորը
 find_match_case_label=Հաշուի առնել հանգամանքը
+find_match_diacritics_label=Հնչիւնատարբերիչ նշանների համապատասխանեցում
 find_entire_word_label=Ամբողջ բառերը
 find_reached_top=Հասել եք փաստաթղթի վերեւին,շարունակել ներքեւից
 find_reached_bottom=Հասել էք փաստաթղթի վերջին, շարունակել վերեւից
@@ -174,7 +179,7 @@ find_reached_bottom=Հասել էք փաստաթղթի վերջին, շարու
 # "{{current}}" and "{{total}}" will be replaced by a number representing the
 # index of the currently active find result, respectively a number representing
 # the total number of matches in the document.
-find_match_count={[ հոգնակի(ընդհանուր) ]}
+find_match_count={[ plural(total) ]}
 find_match_count[one]={{current}} {{total}}-ի համընկնումից
 find_match_count[two]={{current}} {{total}}-ի համընկնումներից
 find_match_count[few]={{current}} {{total}}-ի համընկնումներից
@@ -183,7 +188,7 @@ find_match_count[other]={{current}} {{total}}-ի համընկնումներից
 # LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
 # [zero|one|two|few|many|other], with [other] as the default value.
 # "{{limit}}" will be replaced by a numerical value.
-find_match_count_limit={[ հոգնակի (սահմանը) ]}
+find_match_count_limit={[ plural(limit) ]}
 find_match_count_limit[zero]=Աւելին քան {{limit}} համընկնումները
 find_match_count_limit[one]=Աւելին քան {{limit}} համընկնումը
 find_match_count_limit[two]=Աւելին քան {{limit}} համընկնումները
@@ -212,7 +217,7 @@ error_line=Տողը. {{line}}
 rendering_error=Սխալ է տեղի ունեցել էջի մեկնաբանման ժամանակ
 
 # Predefined zoom values
-page_scale_width=Էջի լայնքը
+page_scale_width=Էջի լայնութիւն
 page_scale_fit=Հարմարեցնել էջը
 page_scale_auto=Ինքնաշխատ խոշորացում
 page_scale_actual=Իրական չափը
@@ -221,7 +226,7 @@ page_scale_actual=Իրական չափը
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Սխալ
+loading=Բեռնում…
 loading_error=PDF նիշքը բացելիս սխալ է տեղի ունեցել։
 invalid_file_error=Սխալ կամ վնասուած PDF նիշք։
 missing_file_error=PDF նիշքը բացակաիւմ է։
diff --git a/cps/static/locale/ia/viewer.properties b/cps/static/locale/ia/viewer.properties
index 167547adc..d64acf6ff 100644
--- a/cps/static/locale/ia/viewer.properties
+++ b/cps/static/locale/ia/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vista actual
 tools.title=Instrumentos
 tools_label=Instrumentos
 first_page.title=Ir al prime pagina
-first_page.label=Ir al prime pagina
 first_page_label=Ir al prime pagina
 last_page.title=Ir al prime pagina
-last_page.label=Ir al prime pagina
 last_page_label=Ir al prime pagina
 page_rotate_cw.title=Rotar in senso horari
-page_rotate_cw.label=Rotar in senso horari
 page_rotate_cw_label=Rotar in senso horari
 page_rotate_ccw.title=Rotar in senso antihorari
-page_rotate_ccw.label=Rotar in senso antihorari
 page_rotate_ccw_label=Rotar in senso antihorari
 
 cursor_text_select_tool.title=Activar le instrumento de selection de texto
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Instrumento de selection de texto
 cursor_hand_tool.title=Activar le instrumento mano
 cursor_hand_tool_label=Instrumento mano
 
+scroll_page.title=Usar rolamento de pagina
+scroll_page_label=Rolamento de pagina
 scroll_vertical.title=Usar rolamento vertical
 scroll_vertical_label=Rolamento vertical
 scroll_horizontal.title=Usar rolamento horizontal
@@ -137,19 +135,24 @@ print_progress_close=Cancellar
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Monstrar/celar le barra lateral
-toggle_sidebar_notification.title=Monstrar/celar le barra lateral (le documento contine structura/attachamentos)
+toggle_sidebar_notification2.title=Monstrar/celar le barra lateral (le documento contine structura/attachamentos/stratos)
 toggle_sidebar_label=Monstrar/celar le barra lateral
 document_outline.title=Monstrar le schema del documento (clic duple pro expander/contraher tote le elementos)
 document_outline_label=Schema del documento
 attachments.title=Monstrar le annexos
 attachments_label=Annexos
+layers.title=Monstrar stratos (clicca duple pro remontar tote le stratos al stato predefinite)
+layers_label=Stratos
 thumbs.title=Monstrar le vignettes
 thumbs_label=Vignettes
+current_outline_item.title=Trovar le elemento de structura actual
+current_outline_item_label=Elemento de structura actual
 findbar.title=Cercar in le documento
 findbar_label=Cercar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Pagina {{page}}
+additional_layers=Altere stratos
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Pagina {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Trovar le successive occurrentia del phrase
 find_next_label=Sequente
 find_highlight=Evidentiar toto
 find_match_case_label=Distinguer majusculas/minusculas
+find_match_diacritics_label=Differentiar diacriticos
 find_entire_word_label=Parolas integre
 find_reached_top=Initio del documento attingite, continuation ab fin
 find_reached_bottom=Fin del documento attingite, continuation ab initio
@@ -213,16 +217,16 @@ error_line=Linea: {{line}}
 rendering_error=Un error occurreva durante que on processava le pagina.
 
 # Predefined zoom values
-page_scale_width=Largessa pagina plen
+page_scale_width=Plen largor del pagina
 page_scale_fit=Pagina integre
 page_scale_auto=Zoom automatic
-page_scale_actual=Dimension actual
+page_scale_actual=Dimension real
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=Cargante…
 loading_error=Un error occurreva durante que on cargava le file PDF.
 invalid_file_error=File PDF corrumpite o non valide.
 missing_file_error=File PDF mancante.
@@ -245,3 +249,33 @@ password_cancel=Cancellar
 printing_not_supported=Attention : le impression non es totalmente supportate per ce navigator.
 printing_not_ready=Attention: le file PDF non es integremente cargate pro lo poter imprimer.
 web_fonts_disabled=Le typos de litteras web es disactivate: impossibile usar le typos de litteras PDF incorporate.
+
+# Editor
+editor_none.title=Disactivar modificationes del annotationes
+editor_none_label=Disactivar redaction
+editor_free_text.title=Add annotation FreeText
+editor_free_text_label=Annotation FreeText
+editor_ink.title=Adder annotation Ink
+editor_ink_label=Annotation Ink
+
+freetext_default_content=Scribe alcun texto…
+
+free_text_default_content=Insere le texto…
+
+# Editor Parameters
+editor_free_text_font_color=Color de character
+editor_free_text_font_size=Dimension del characteres
+editor_ink_line_color=Colores del linea
+editor_ink_line_thickness=Spissor del linea
+
+# Editor Parameters
+editor_free_text_color=Color
+editor_free_text_size=Dimension
+editor_ink_color=Color
+editor_ink_thickness=Spissor
+editor_ink_opacity=Opacitate
+
+# Editor aria
+editor_free_text_aria_label=Redactor de texto libere
+editor_ink_aria_label=Editor penna
+editor_ink_canvas_aria_label=Imagine create per le usator
diff --git a/cps/static/locale/id/viewer.properties b/cps/static/locale/id/viewer.properties
index b9b9a730b..83ab35324 100644
--- a/cps/static/locale/id/viewer.properties
+++ b/cps/static/locale/id/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Tampilan Sekarang
 tools.title=Alat
 tools_label=Alat
 first_page.title=Buka Halaman Pertama
-first_page.label=Ke Halaman Pertama
 first_page_label=Buka Halaman Pertama
 last_page.title=Buka Halaman Terakhir
-last_page.label=Ke Halaman Terakhir
 last_page_label=Buka Halaman Terakhir
 page_rotate_cw.title=Putar Searah Jarum Jam
-page_rotate_cw.label=Putar Searah Jarum Jam
 page_rotate_cw_label=Putar Searah Jarum Jam
 page_rotate_ccw.title=Putar Berlawanan Arah Jarum Jam
-page_rotate_ccw.label=Putar Berlawanan Arah Jarum Jam
 page_rotate_ccw_label=Putar Berlawanan Arah Jarum Jam
 
 cursor_text_select_tool.title=Aktifkan Alat Seleksi Teks
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Alat Seleksi Teks
 cursor_hand_tool.title=Aktifkan Alat Tangan
 cursor_hand_tool_label=Alat Tangan
 
+scroll_page.title=Gunakan Pengguliran Laman
+scroll_page_label=Pengguliran Laman
 scroll_vertical.title=Gunakan Penggeseran Vertikal
 scroll_vertical_label=Penggeseran Vertikal
 scroll_horizontal.title=Gunakan Penggeseran Horizontal
@@ -137,19 +135,24 @@ print_progress_close=Batalkan
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Aktif/Nonaktifkan Bilah Samping
-toggle_sidebar_notification.title=Aktif/Nonaktifkan Bilah Samping (dokumen berisi kerangka/lampiran)
+toggle_sidebar_notification2.title=Aktif/Nonaktifkan Bilah Samping (dokumen berisi kerangka/lampiran/lapisan)
 toggle_sidebar_label=Aktif/Nonaktifkan Bilah Samping
 document_outline.title=Tampilkan Kerangka Dokumen (klik ganda untuk membentangkan/menciutkan semua item)
 document_outline_label=Kerangka Dokumen
 attachments.title=Tampilkan Lampiran
 attachments_label=Lampiran
+layers.title=Tampilkan Lapisan (klik ganda untuk mengatur ulang semua lapisan ke keadaan baku)
+layers_label=Lapisan
 thumbs.title=Tampilkan Miniatur
 thumbs_label=Miniatur
+current_outline_item.title=Cari Butir Ikhtisar Saat Ini
+current_outline_item_label=Butir Ikhtisar Saat Ini
 findbar.title=Temukan di Dokumen
 findbar_label=Temukan
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Laman {{page}}
+additional_layers=Lapisan Tambahan
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Halaman {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Temukan lebih lanjut
 find_next_label=Selanjutnya
 find_highlight=Sorot semuanya
 find_match_case_label=Cocokkan BESAR/kecil
+find_match_diacritics_label=Pencocokan Diakritik
 find_entire_word_label=Seluruh teks
 find_reached_top=Sampai di awal dokumen, dilanjutkan dari bawah
 find_reached_bottom=Sampai di akhir dokumen, dilanjutkan dari atas
@@ -222,7 +226,7 @@ page_scale_actual=Ukuran Asli
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Galat
+loading=Memuat…
 loading_error=Galat terjadi saat memuat PDF.
 invalid_file_error=Berkas PDF tidak valid atau rusak.
 missing_file_error=Berkas PDF tidak ada.
@@ -245,3 +249,33 @@ password_cancel=Batal
 printing_not_supported=Peringatan: Pencetakan tidak didukung secara lengkap pada peramban ini.
 printing_not_ready=Peringatan: Berkas PDF masih belum dimuat secara lengkap untuk dapat dicetak.
 web_fonts_disabled=Font web dinonaktifkan: tidak dapat menggunakan font PDF yang tersemat.
+
+# Editor
+editor_none.title=Nonaktifkan Penyuntingan Anotasi
+editor_none_label=Nonaktifkan Penyuntingan
+editor_free_text.title=Tambahkan Notasi FreeText
+editor_free_text_label=Notasi FreeText
+editor_ink.title=Tambahkan Notasi Tinta
+editor_ink_label=Notasi Tinta
+
+freetext_default_content=Masukkan beberapa teks…
+
+free_text_default_content=Masukkan teks…
+
+# Editor Parameters
+editor_free_text_font_color=Warna Fon
+editor_free_text_font_size=Ukuran Fon
+editor_ink_line_color=Warna Garis
+editor_ink_line_thickness=Ketebalan Garis
+
+# Editor Parameters
+editor_free_text_color=Warna
+editor_free_text_size=Ukuran
+editor_ink_color=Warna
+editor_ink_thickness=Ketebalan
+editor_ink_opacity=Opasitas
+
+# Editor aria
+editor_free_text_aria_label=Editor FreeText
+editor_ink_aria_label=Editor Tinta
+editor_ink_canvas_aria_label=Gambar yang dibuat pengguna
diff --git a/cps/static/locale/is/viewer.properties b/cps/static/locale/is/viewer.properties
index 72dc8acd6..b150f2eac 100644
--- a/cps/static/locale/is/viewer.properties
+++ b/cps/static/locale/is/viewer.properties
@@ -28,10 +28,10 @@ of_pages=af {{pagesCount}}
 # respectively a number representing the total number of pages in the document.
 page_of_pages=({{pageNumber}} af {{pagesCount}})
 
-zoom_out.title=Minnka
-zoom_out_label=Minnka
-zoom_in.title=Stækka
-zoom_in_label=Stækka
+zoom_out.title=Minnka aðdrátt
+zoom_out_label=Minnka aðdrátt
+zoom_in.title=Auka aðdrátt
+zoom_in_label=Auka aðdrátt
 zoom.title=Aðdráttur
 presentation_mode.title=Skipta yfir á kynningarham
 presentation_mode_label=Kynningarhamur
@@ -48,16 +48,12 @@ bookmark_label=Núverandi sýn
 tools.title=Verkfæri
 tools_label=Verkfæri
 first_page.title=Fara á fyrstu síðu
-first_page.label=Fara á fyrstu síðu
 first_page_label=Fara á fyrstu síðu
 last_page.title=Fara á síðustu síðu
-last_page.label=Fara á síðustu síðu
 last_page_label=Fara á síðustu síðu
 page_rotate_cw.title=Snúa réttsælis
-page_rotate_cw.label=Snúa réttsælis
 page_rotate_cw_label=Snúa réttsælis
 page_rotate_ccw.title=Snúa rangsælis
-page_rotate_ccw.label=Snúa rangsælis
 page_rotate_ccw_label=Snúa rangsælis
 
 cursor_text_select_tool.title=Virkja textavalsáhald
@@ -65,10 +61,14 @@ cursor_text_select_tool_label=Textavalsáhald
 cursor_hand_tool.title=Virkja handarverkfæri
 cursor_hand_tool_label=Handarverkfæri
 
+scroll_page.title=Nota síðuskrun
+scroll_page_label=Síðuskrun
 scroll_vertical.title=Nota lóðrétt skrun
 scroll_vertical_label=Lóðrétt skrun
 scroll_horizontal.title=Nota lárétt skrun
 scroll_horizontal_label=Lárétt skrun
+scroll_wrapped.title=Nota línuskipt síðuskrun
+scroll_wrapped_label=Línuskipt síðuskrun
 
 spread_none.title=Ekki taka þátt í dreifingu síðna
 spread_none_label=Engin dreifing
@@ -120,6 +120,7 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Fljótleg vefskoðun:
 document_properties_linearized_yes=Já
 document_properties_linearized_no=Nei
 document_properties_close=Loka
@@ -133,18 +134,25 @@ print_progress_close=Hætta við
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
-toggle_sidebar.title=Víxla hliðslá
-toggle_sidebar_notification.title=Víxla hliðarslá (skjal inniheldur yfirlit/viðhengi)
-toggle_sidebar_label=Víxla hliðslá
+toggle_sidebar.title=Víxla hliðarspjaldi af/á
+toggle_sidebar_notification2.title=Víxla hliðarslá (skjal inniheldur yfirlit/viðhengi/lög)
+toggle_sidebar_label=Víxla hliðarspjaldi af/á
 document_outline.title=Sýna yfirlit skjals (tvísmelltu til að opna/loka öllum hlutum)
 document_outline_label=Efnisskipan skjals
 attachments.title=Sýna viðhengi
 attachments_label=Viðhengi
+layers.title=Birta lög (tvísmelltu til að endurstilla öll lög í sjálfgefna stöðu)
+layers_label=Lög
 thumbs.title=Sýna smámyndir
 thumbs_label=Smámyndir
+current_outline_item.title=Finna núverandi atriði efnisskipunar
+current_outline_item_label=Núverandi atriði efnisskipunar
 findbar.title=Leita í skjali
 findbar_label=Leita
 
+additional_layers=Viðbótarlög
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Síða {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -162,6 +170,7 @@ find_next.title=Leita að næsta tilfelli þessara orða
 find_next_label=Næsti
 find_highlight=Lita allt
 find_match_case_label=Passa við stafstöðu
+find_match_diacritics_label=Passa við broddstafi
 find_entire_word_label=Heil orð
 find_reached_top=Náði efst í skjal, held áfram neðst
 find_reached_bottom=Náði enda skjals, held áfram efst
@@ -217,12 +226,16 @@ page_scale_actual=Raunstærð
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Villa
+loading=Hleður…
 loading_error=Villa kom upp við að hlaða inn PDF.
 invalid_file_error=Ógild eða skemmd PDF skrá.
 missing_file_error=Vantar PDF skrá.
 unexpected_response_error=Óvænt svar frá netþjóni.
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
+
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
@@ -236,3 +249,33 @@ password_cancel=Hætta við
 printing_not_supported=Aðvörun: Prentun er ekki með fyllilegan stuðning á þessum vafra.
 printing_not_ready=Aðvörun: Ekki er búið að hlaða inn allri PDF skránni fyrir prentun.
 web_fonts_disabled=Vef leturgerðir eru óvirkar: get ekki notað innbyggðar PDF leturgerðir.
+
+# Editor
+editor_none.title=Gera breytingar á glósum óvirkar
+editor_none_label=Gera breytingar óvirkar
+editor_free_text.title=Bæta við FreeText-glósu
+editor_free_text_label=FreeText-glósa
+editor_ink.title=Bæta við Ink-glósu
+editor_ink_label=Ink-glósa
+
+freetext_default_content=Settu inn einhvern texta…
+
+free_text_default_content=Settu inn texta…
+
+# Editor Parameters
+editor_free_text_font_color=Litur leturs
+editor_free_text_font_size=Leturstærð
+editor_ink_line_color=Línulitur
+editor_ink_line_thickness=Línubreidd
+
+# Editor Parameters
+editor_free_text_color=Litur
+editor_free_text_size=Stærð
+editor_ink_color=Litur
+editor_ink_thickness=Þykkt
+editor_ink_opacity=Ógegnsæi
+
+# Editor aria
+editor_free_text_aria_label=FreeText-ritill
+editor_ink_aria_label=Ink-ritill
+editor_ink_canvas_aria_label=Mynd gerð af notanda
diff --git a/cps/static/locale/it/viewer.properties b/cps/static/locale/it/viewer.properties
index 87c4050d8..6a2ef4d7f 100644
--- a/cps/static/locale/it/viewer.properties
+++ b/cps/static/locale/it/viewer.properties
@@ -44,16 +44,12 @@ bookmark_label = Visualizzazione corrente
 tools.title = Strumenti
 tools_label = Strumenti
 first_page.title = Vai alla prima pagina
-first_page.label = Vai alla prima pagina
 first_page_label = Vai alla prima pagina
 last_page.title = Vai all’ultima pagina
-last_page.label = Vai all’ultima pagina
 last_page_label = Vai all’ultima pagina
 page_rotate_cw.title = Ruota in senso orario
-page_rotate_cw.label = Ruota in senso orario
 page_rotate_cw_label = Ruota in senso orario
 page_rotate_ccw.title = Ruota in senso antiorario
-page_rotate_ccw.label = Ruota in senso antiorario
 page_rotate_ccw_label = Ruota in senso antiorario
 
 cursor_text_select_tool.title = Attiva strumento di selezione testo
@@ -61,6 +57,8 @@ cursor_text_select_tool_label = Strumento di selezione testo
 cursor_hand_tool.title = Attiva strumento mano
 cursor_hand_tool_label = Strumento mano
 
+scroll_page.title = Utilizza scorrimento pagine
+scroll_page_label = Scorrimento pagine
 scroll_vertical.title = Scorri le pagine in verticale
 scroll_vertical_label = Scorrimento verticale
 scroll_horizontal.title = Scorri le pagine in orizzontale
@@ -113,18 +111,23 @@ print_progress_percent = {{progress}}%
 print_progress_close = Annulla
 
 toggle_sidebar.title = Attiva/disattiva barra laterale
-toggle_sidebar_notification.title = Attiva/disattiva barra laterale (il documento contiene struttura/allegati)
+toggle_sidebar_notification2.title = Attiva/disattiva barra laterale (il documento contiene struttura/allegati/livelli)
 toggle_sidebar_label = Attiva/disattiva barra laterale
 document_outline.title = Visualizza la struttura del documento (doppio clic per visualizzare/comprimere tutti gli elementi)
 document_outline_label = Struttura documento
 attachments.title = Visualizza allegati
 attachments_label = Allegati
+layers.title = Visualizza livelli (doppio clic per ripristinare tutti i livelli allo stato predefinito)
+layers_label = Livelli
 thumbs.title = Mostra le miniature
 thumbs_label = Miniature
+current_outline_item.title = Trova elemento struttura corrente
+current_outline_item_label = Elemento struttura corrente
 findbar.title = Trova nel documento
 findbar_label = Trova
 
-page_canvas = Pagina {{page}}
+additional_layers = Livelli aggiuntivi
+page_landmark = Pagina {{page}}
 thumb_page_title = Pagina {{page}}
 thumb_page_canvas = Miniatura della pagina {{page}}
 
@@ -136,6 +139,7 @@ find_next.title = Trova l’occorrenza successiva del testo da cercare
 find_next_label = Successivo
 find_highlight = Evidenzia
 find_match_case_label = Maiuscole/minuscole
+find_match_diacritics_label = Segni diacritici
 find_entire_word_label = Parole intere
 find_reached_top = Raggiunto l’inizio della pagina, continua dalla fine
 find_reached_bottom = Raggiunta la fine della pagina, continua dall’inizio
@@ -170,7 +174,7 @@ page_scale_auto = Zoom automatico
 page_scale_actual = Dimensioni effettive
 page_scale_percent = {{scale}}%
 
-loading_error_indicator = Errore
+loading = Caricamento in corso…
 loading_error = Si è verificato un errore durante il caricamento del PDF.
 invalid_file_error = File PDF non valido o danneggiato.
 missing_file_error = File PDF non disponibile.
@@ -187,3 +191,29 @@ password_cancel = Annulla
 printing_not_supported = Attenzione: la stampa non è completamente supportata da questo browser.
 printing_not_ready = Attenzione: il PDF non è ancora stato caricato completamente per la stampa.
 web_fonts_disabled = I web font risultano disattivati: impossibile utilizzare i caratteri incorporati nel PDF.
+
+# Editor
+editor_none.title = Disattiva modifica annotazioni
+editor_none_label = Disattiva modifica
+editor_free_text.title = Aggiungi annotazione testo libero
+editor_free_text_label = Annotazione testo libero
+editor_ink.title = Aggiungi annotazione a penna
+editor_ink_label = Annotazione a penna
+
+free_text_default_content = Inserisci testo…
+
+# Editor Parameters
+editor_free_text_font_color = Colore carattere
+editor_free_text_font_size = Dimensione carattere
+editor_ink_line_color = Colore linea
+editor_ink_line_thickness = Spessore linea
+editor_free_text_color = Colore
+editor_free_text_size = Dimensione
+editor_ink_color = Colore
+editor_ink_thickness = Spessore
+editor_ink_opacity = Opacità
+
+# Editor aria
+editor_free_text_aria_label = Editor testo libero
+editor_ink_aria_label = Editor penna
+editor_ink_canvas_aria_label = Immagine creata dall’utente
diff --git a/cps/static/locale/ja/viewer.properties b/cps/static/locale/ja/viewer.properties
index 95732a07f..88a9de2a8 100644
--- a/cps/static/locale/ja/viewer.properties
+++ b/cps/static/locale/ja/viewer.properties
@@ -48,35 +48,33 @@ bookmark_label=現在のビュー
 tools.title=ツール
 tools_label=ツール
 first_page.title=最初のページへ移動します
-first_page.label=最初のページへ移動
 first_page_label=最初のページへ移動
 last_page.title=最後のページへ移動します
-last_page.label=最後のページへ移動
 last_page_label=最後のページへ移動
 page_rotate_cw.title=ページを右へ回転します
-page_rotate_cw.label=右回転
 page_rotate_cw_label=右回転
 page_rotate_ccw.title=ページを左へ回転します
-page_rotate_ccw.label=左回転
 page_rotate_ccw_label=左回転
 
-cursor_text_select_tool.title=テキスト選択ツールを有効にする
+cursor_text_select_tool.title=テキスト選択ツールを有効にします
 cursor_text_select_tool_label=テキスト選択ツール
-cursor_hand_tool.title=手のひらツールを有効にする
+cursor_hand_tool.title=手のひらツールを有効にします
 cursor_hand_tool_label=手のひらツール
 
-scroll_vertical.title=縦スクロールにする
+scroll_page.title=ページ単位でスクロールします
+scroll_page_label=ページ単位でスクロール
+scroll_vertical.title=縦スクロールにします
 scroll_vertical_label=縦スクロール
-scroll_horizontal.title=横スクロールにする
+scroll_horizontal.title=横スクロールにします
 scroll_horizontal_label=横スクロール
-scroll_wrapped.title=折り返しスクロールにする
+scroll_wrapped.title=折り返しスクロールにします
 scroll_wrapped_label=折り返しスクロール
 
-spread_none.title=見開きにしない
+spread_none.title=見開きにしません
 spread_none_label=見開きにしない
-spread_odd.title=奇数ページ開始で見開きにする
+spread_odd.title=奇数ページ開始で見開きにします
 spread_odd_label=奇数ページ見開き
-spread_even.title=偶数ページ開始で見開きにする
+spread_even.title=偶数ページ開始で見開きにします
 spread_even_label=偶数ページ見開き
 
 # Document properties dialog box
@@ -86,10 +84,10 @@ document_properties_file_name=ファイル名:
 document_properties_file_size=ファイルサイズ:
 # LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in kilobytes, respectively in bytes.
-document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
+document_properties_kb={{size_kb}} KB ({{size_b}} バイト)
 # LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in megabytes, respectively in bytes.
-document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
+document_properties_mb={{size_mb}} MB ({{size_b}} バイト)
 document_properties_title=タイトル:
 document_properties_author=作成者:
 document_properties_subject=件名:
@@ -137,19 +135,24 @@ print_progress_close=キャンセル
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=サイドバー表示を切り替えます
-toggle_sidebar_notification.title=サイドバー表示を切り替えます (文書に含まれるアウトライン / 添付)
+toggle_sidebar_notification2.title=サイドバー表示を切り替えます (文書に含まれるアウトライン / 添付 / レイヤー)
 toggle_sidebar_label=サイドバーの切り替え
 document_outline.title=文書の目次を表示します (ダブルクリックで項目を開閉します)
 document_outline_label=文書の目次
 attachments.title=添付ファイルを表示します
 attachments_label=添付ファイル
+layers.title=レイヤーを表示します (ダブルクリックですべてのレイヤーが初期状態に戻ります)
+layers_label=レイヤー
 thumbs.title=縮小版を表示します
 thumbs_label=縮小版
+current_outline_item.title=現在のアウトライン項目を検索
+current_outline_item_label=現在のアウトライン項目
 findbar.title=文書内を検索します
 findbar_label=検索
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas={{page}} ページ
+additional_layers=追加レイヤー
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark={{page}} ページ
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=現在より後の位置で指定文字列が現れる部分を
 find_next_label=次へ
 find_highlight=すべて強調表示
 find_match_case_label=大文字/小文字を区別
+find_match_diacritics_label=発音区別符号を区別
 find_entire_word_label=単語一致
 find_reached_top=文書先頭に到達したので末尾から続けて検索します
 find_reached_bottom=文書末尾に到達したので先頭から続けて検索します
@@ -222,7 +226,7 @@ page_scale_actual=実際のサイズ
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=エラー
+loading=読み込み中...
 loading_error=PDF の読み込み中にエラーが発生しました。
 invalid_file_error=無効または破損した PDF ファイル。
 missing_file_error=PDF ファイルが見つかりません。
@@ -245,4 +249,33 @@ password_cancel=キャンセル
 printing_not_supported=警告: このブラウザーでは印刷が完全にサポートされていません。
 printing_not_ready=警告: PDF を印刷するための読み込みが終了していません。
 web_fonts_disabled=ウェブフォントが無効になっています: 埋め込まれた PDF のフォントを使用できません。
-document_colors_not_allowed=PDF 文書は、ウェブページが指定した配色を使用することができません: 'ウェブページが指定した配色' はブラウザーで無効になっています。
+
+# Editor
+editor_none.title=注釈の編集を無効にする
+editor_none_label=編集を無効にする
+editor_free_text.title=フリーテキスト注釈を追加
+editor_free_text_label=フリーテキスト注釈
+editor_ink.title=インク注釈を追加
+editor_ink_label=インク注釈
+
+freetext_default_content=テキストを入力してください...
+
+free_text_default_content=テキストを入力してください...
+
+# Editor Parameters
+editor_free_text_font_color=フォントの色
+editor_free_text_font_size=フォントサイズ
+editor_ink_line_color=線の色
+editor_ink_line_thickness=線の太さ
+
+# Editor Parameters
+editor_free_text_color=色
+editor_free_text_size=サイズ
+editor_ink_color=色
+editor_ink_thickness=太さ
+editor_ink_opacity=不透明度
+
+# Editor aria
+editor_free_text_aria_label=フリーテキスト注釈エディター
+editor_ink_aria_label=インク注釈エディター
+editor_ink_canvas_aria_label=ユーザー作成画像
diff --git a/cps/static/locale/ka/viewer.properties b/cps/static/locale/ka/viewer.properties
index 86e91bbd1..14bddd42d 100644
--- a/cps/static/locale/ka/viewer.properties
+++ b/cps/static/locale/ka/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=მიმდინარე ხედი
 tools.title=ხელსაწყოები
 tools_label=ხელსაწყოები
 first_page.title=პირველ გვერდზე გადასვლა
-first_page.label=პირველ გვერდზე გადასვლა
 first_page_label=პირველ გვერდზე გადასვლა
 last_page.title=ბოლო გვერდზე გადასვლა
-last_page.label=ბოლო გვერდზე გადასვლა
 last_page_label=ბოლო გვერდზე გადასვლა
 page_rotate_cw.title=საათის ისრის მიმართულებით შებრუნება
-page_rotate_cw.label=მარჯვნივ გადაბრუნება
 page_rotate_cw_label=მარჯვნივ გადაბრუნება
 page_rotate_ccw.title=საათის ისრის საპირისპიროდ შებრუნება
-page_rotate_ccw.label=მარცხნივ გადაბრუნება
 page_rotate_ccw_label=მარცხნივ გადაბრუნება
 
 cursor_text_select_tool.title=მოსანიშნი მაჩვენებლის გამოყენება
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=მოსანიშნი მაჩვენე
 cursor_hand_tool.title=გადასაადგილებელი მაჩვენებლის გამოყენება
 cursor_hand_tool_label=გადასაადგილებელი
 
+scroll_page.title=გვერდზე გადაადგილების გამოყენება
+scroll_page_label=გვერდზე გადაადგილება
 scroll_vertical.title=გვერდების შვეულად ჩვენება
 scroll_vertical_label=შვეული გადაადგილება
 scroll_horizontal.title=გვერდების თარაზულად ჩვენება
@@ -91,18 +89,18 @@ document_properties_kb={{size_kb}} კბ ({{size_b}} ბაიტი)
 # will be replaced by the PDF file size in megabytes, respectively in bytes.
 document_properties_mb={{size_mb}} მბ ({{size_b}} ბაიტი)
 document_properties_title=სათაური:
-document_properties_author=შემდგენი:
+document_properties_author=შემქმნელი:
 document_properties_subject=თემა:
 document_properties_keywords=საკვანძო სიტყვები:
-document_properties_creation_date=შექმნის თარიღი:
-document_properties_modification_date=ჩასწორების თარიღი:
+document_properties_creation_date=შექმნის დრო:
+document_properties_modification_date=ჩასწორების დრო:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
 # will be replaced by the creation/modification date, and time, of the PDF file.
 document_properties_date_string={{date}}, {{time}}
-document_properties_creator=შემქმნელი:
-document_properties_producer=PDF-შემქმნელი:
+document_properties_creator=გამომშვები:
+document_properties_producer=PDF-გამომშვები:
 document_properties_version=PDF-ვერსია:
-document_properties_page_count=გვერდების რაოდენობა:
+document_properties_page_count=გვერდები:
 document_properties_page_size=გვერდის ზომა:
 document_properties_page_size_unit_inches=დუიმი
 document_properties_page_size_unit_millimeters=მმ
@@ -137,19 +135,24 @@ print_progress_close=გაუქმება
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=გვერდითა ზოლის გამოჩენა/დამალვა
-toggle_sidebar_notification.title=გვერდითა ზოლის ჩართვა/გამორთვა (დოკუმენტი შეიცავს სარჩევს/დანართს)
+toggle_sidebar_notification2.title=გვერდითი ზოლის გამოჩენა (შეიცავს სარჩევს/დანართს/ფენებს)
 toggle_sidebar_label=გვერდითა ზოლის გამოჩენა/დამალვა
-document_outline.title=დოკუმენტის სარჩევის ჩვენება (ორჯერ დაწკაპებით ყველა ელემენტის ჩამოშლა/აკეცვა)
+document_outline.title=დოკუმენტის სარჩევის ჩვენება (ორმაგი წკაპით თითოეულის ჩამოშლა/აკეცვა)
 document_outline_label=დოკუმენტის სარჩევი
 attachments.title=დანართების ჩვენება
 attachments_label=დანართები
+layers.title=ფენების გამოჩენა (ორმაგი წკაპით ყველა ფენის ნაგულისხმევზე დაბრუნება)
+layers_label=ფენები
 thumbs.title=შეთვალიერება
 thumbs_label=ესკიზები
+current_outline_item.title=მიმდინარე გვერდის მონახვა სარჩევში
+current_outline_item_label=მიმდინარე გვერდი სარჩევში
 findbar.title=პოვნა დოკუმენტში
 findbar_label=ძიება
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=გვერდი {{page}}
+additional_layers=დამატებითი ფენები
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=გვერდი {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -166,7 +169,8 @@ find_previous_label=წინა
 find_next.title=ფრაზის შემდეგი კონტექსტის პოვნა
 find_next_label=შემდეგი
 find_highlight=ყველას მონიშვნა
-find_match_case_label=ემთხვევა მთავრული
+find_match_case_label=მთავრულით
+find_match_diacritics_label=ნიშნებით
 find_entire_word_label=მთლიანი სიტყვები
 find_reached_top=მიღწეულია დოკუმენტის დასაწყისი, გრძელდება ბოლოდან
 find_reached_bottom=მიღწეულია დოკუმენტის ბოლო, გრძელდება დასაწყისიდან
@@ -185,12 +189,12 @@ find_match_count[other]={{current}} / {{total}} თანხვედრიდ
 # [zero|one|two|few|many|other], with [other] as the default value.
 # "{{limit}}" will be replaced by a numerical value.
 find_match_count_limit={[ plural(limit) ]}
-find_match_count_limit[zero]={{limit}}-ზე მეტი თანხვედრა
-find_match_count_limit[one]={{limit}}-ზე მეტი თანხვედრა
-find_match_count_limit[two]={{limit}}-ზე მეტი თანხვედრა
-find_match_count_limit[few]={{limit}}-ზე მეტი თანხვედრა
-find_match_count_limit[many]={{limit}}-ზე მეტი თანხვედრა
-find_match_count_limit[other]={{limit}}-ზე მეტი თანხვედრა
+find_match_count_limit[zero]=არანაკლებ {{limit}} თანხვედრა
+find_match_count_limit[one]=არანაკლებ {{limit}} თანხვედრა
+find_match_count_limit[two]=არანაკლებ {{limit}} თანხვედრა
+find_match_count_limit[few]=არანაკლებ {{limit}} თანხვედრა
+find_match_count_limit[many]=არანაკლებ {{limit}} თანხვედრა
+find_match_count_limit[other]=არანაკლებ {{limit}} თანხვედრა
 find_not_found=ფრაზა ვერ მოიძებნა
 
 # Error panel labels
@@ -222,7 +226,7 @@ page_scale_actual=საწყისი ზომა
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=შეცდომა
+loading=ჩატვირთვა…
 loading_error=შეცდომა, PDF-ფაილის ჩატვირთვისას.
 invalid_file_error=არამართებული ან დაზიანებული PDF-ფაილი.
 missing_file_error=ნაკლული PDF-ფაილი.
@@ -245,3 +249,33 @@ password_cancel=გაუქმება
 printing_not_supported=გაფრთხილება: ამობეჭდვა ამ ბრაუზერში არაა სრულად მხარდაჭერილი.
 printing_not_ready=გაფრთხილება: PDF სრულად ჩატვირთული არაა, ამობეჭდვის დასაწყებად.
 web_fonts_disabled=ვებშრიფტები გამორთულია: ჩაშენებული PDF-შრიფტების გამოყენება ვერ ხერხდება.
+
+# Editor
+editor_none.title=შენიშვნის ჩასწორების გათიშვა
+editor_none_label=ჩასწორების გათიშვა
+editor_free_text.title=FreeText-სახის შენიშვნის დართვა
+editor_free_text_label=FreeText-სახის შენიშვნა
+editor_ink.title=ხელნაწერი შენიშვნის დართვა
+editor_ink_label=ხელნაწერი შენიშვნა
+
+freetext_default_content=შეიყვანეთ რამე ტექსტი…
+
+free_text_default_content=შეიყვანეთ ტექსტი…
+
+# Editor Parameters
+editor_free_text_font_color=შრიფტის ფერი
+editor_free_text_font_size=შრიფტის ზომა
+editor_ink_line_color=ხაზის ფერი
+editor_ink_line_thickness=ხაზის სისქე
+
+# Editor Parameters
+editor_free_text_color=ფერი
+editor_free_text_size=ზომა
+editor_ink_color=ფერი
+editor_ink_thickness=სისქე
+editor_ink_opacity=გაუმჭვირვალობა
+
+# Editor aria
+editor_free_text_aria_label=FreeText-ჩამსწორებელი
+editor_ink_aria_label=ხელნაწერის ჩამსწორებელი
+editor_ink_canvas_aria_label=მომხმარებლის შექმნილი სურათი
diff --git a/cps/static/locale/kab/viewer.properties b/cps/static/locale/kab/viewer.properties
index a6f07f169..1b5385517 100644
--- a/cps/static/locale/kab/viewer.properties
+++ b/cps/static/locale/kab/viewer.properties
@@ -39,7 +39,7 @@ open_file.title=Ldi Afaylu
 open_file_label=Ldi
 print.title=Siggez
 print_label=Siggez
-download.title=Sider
+download.title=Sader
 download_label=Azdam
 bookmark.title=Timeẓri tamirant (nɣel neɣ ldi ɣef usfaylu amaynut)
 bookmark_label=Askan amiran
@@ -48,16 +48,12 @@ bookmark_label=Askan amiran
 tools.title=Ifecka
 tools_label=Ifecka
 first_page.title=Ddu ɣer usebter amezwaru
-first_page.label=Ddu ɣer usebter amezwaru
 first_page_label=Ddu ɣer usebter amezwaru
 last_page.title=Ddu ɣer usebter aneggaru
-last_page.label=Ddu ɣer usebter aneggaru
 last_page_label=Ddu ɣer usebter aneggaru
 page_rotate_cw.title=Tuzzya tusrigt
-page_rotate_cw.label=Tuzzya tusrigt
 page_rotate_cw_label=Tuzzya tusrigt
 page_rotate_ccw.title=Tuzzya amgal-usrig
-page_rotate_ccw.label=Tuzzya amgal-usrig
 page_rotate_ccw_label=Tuzzya amgal-usrig
 
 cursor_text_select_tool.title=Rmed afecku n tefrant n uḍris
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Afecku n tefrant n uḍris
 cursor_hand_tool.title=Rmed afecku afus
 cursor_hand_tool_label=Afecku afus
 
+scroll_page.title=Seqdec adrurem n usebter
+scroll_page_label=Adrurem n usebter
 scroll_vertical.title=Seqdec adrurem ubdid
 scroll_vertical_label=Adrurem ubdid
 scroll_horizontal.title=Seqdec adrurem aglawan
@@ -102,7 +100,7 @@ document_properties_date_string={{date}}, {{time}}
 document_properties_creator=Yerna-t:
 document_properties_producer=Afecku n uselket PDF:
 document_properties_version=Lqem PDF:
-document_properties_page_count=Amḍan n isebtar:
+document_properties_page_count=Amḍan n yisebtar:
 document_properties_page_size=Tuγzi n usebter:
 document_properties_page_size_unit_inches=deg
 document_properties_page_size_unit_millimeters=mm
@@ -137,19 +135,24 @@ print_progress_close=Sefsex
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Sken/Fer agalis adisan
-toggle_sidebar_notification.title=Ffer/Sken agalis adisan (isemli yegber aɣawas/imeddayen)
+toggle_sidebar_notification2.title=Ffer/Sekn agalis adisan (isemli yegber aɣawas/ticeqqufin yeddan/tissiwin)
 toggle_sidebar_label=Sken/Fer agalis adisan
 document_outline.title=Sken isemli (Senned snat tikal i wesemɣer/Afneẓ n iferdisen meṛṛa)
 document_outline_label=Isɣalen n isebtar
 attachments.title=Sken ticeqqufin yeddan
 attachments_label=Ticeqqufin yeddan
+layers.title=Skeen tissiwin (sit sin yiberdan i uwennez n meṛṛa tissiwin ɣer waddad amezwer)
+layers_label=Tissiwin
 thumbs.title=Sken tanfult.
 thumbs_label=Tinfulin
+current_outline_item.title=Af-d aferdis n uɣawas amiran
+current_outline_item_label=Aferdis n uɣawas amiran
 findbar.title=Nadi deg isemli
 findbar_label=Nadi
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Asebter {{page}}
+additional_layers=Tissiwin-nniḍen
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Asebter {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Aff-d timseḍriwt n twinest d-iteddun
 find_next_label=Ddu ɣer zdat
 find_highlight=Err izirig imaṛṛa
 find_match_case_label=Qadeṛ amasal n isekkilen
+find_match_diacritics_label=Qadeṛ ifeskilen
 find_entire_word_label=Awalen iččuranen
 find_reached_top=Yabbeḍ s afella n usebter, tuɣalin s wadda
 find_reached_bottom=Tebḍeḍ s adda n usebter, tuɣalin s afella
@@ -222,7 +226,7 @@ page_scale_actual=Teɣzi tilawt
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
+loading=Asali…
 loading_error=Teḍra-d tuccḍa deg alluy n PDF:
 invalid_file_error=Afaylu PDF arameɣtu neɣ yexṣeṛ.
 missing_file_error=Ulac afaylu PDF.
@@ -245,3 +249,33 @@ password_cancel=Sefsex
 printing_not_supported=Ɣuṛ-k: Asiggez ur ittusefrak ara yakan imaṛṛa deg iminig-a.
 printing_not_ready=Ɣuṛ-k: Afaylu PDF ur d-yuli ara imeṛṛa akken ad ittusiggez.
 web_fonts_disabled=Tisefsiyin web ttwassensent; D awezɣi useqdec n tsefsiyin yettwarnan ɣer PDF.
+
+# Editor
+editor_none.title=Sens aseẓreg n telɣut
+editor_none_label=Sens aseẓreg
+editor_free_text.title=Rnu talɣut i FreeText
+editor_free_text_label=Talɣut n FreeText
+editor_ink.title=Suneɣ
+editor_ink_label=Asuneɣ
+
+freetext_default_content=Sekcem kra n uḍris…
+
+free_text_default_content=Sekcem aḍris…
+
+# Editor Parameters
+editor_free_text_font_color=Ini n tsefsit
+editor_free_text_font_size=Teɣzi n tsefsit
+editor_ink_line_color=Ini n yizirig
+editor_ink_line_thickness=Tuzert n yizirig
+
+# Editor Parameters
+editor_free_text_color=Initen
+editor_free_text_size=Teɣzi
+editor_ink_color=Ini
+editor_ink_thickness=Tuzert
+editor_ink_opacity=Tebrek
+
+# Editor aria
+editor_free_text_aria_label=Amaẓrag n FreeText
+editor_ink_aria_label=Amaẓrag n lmidad
+editor_ink_canvas_aria_label=Tugna yettwarnan sɣur useqdac
diff --git a/cps/static/locale/kk/viewer.properties b/cps/static/locale/kk/viewer.properties
index afd679ac7..7c9876d96 100644
--- a/cps/static/locale/kk/viewer.properties
+++ b/cps/static/locale/kk/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Ағымдағы көрініс
 tools.title=Құралдар
 tools_label=Құралдар
 first_page.title=Алғашқы параққа өту
-first_page.label=Алғашқы параққа өту
 first_page_label=Алғашқы параққа өту
 last_page.title=Соңғы параққа өту
-last_page.label=Соңғы параққа өту
 last_page_label=Соңғы параққа өту
 page_rotate_cw.title=Сағат тілі бағытымен айналдыру
-page_rotate_cw.label=Сағат тілі бағытымен бұру
 page_rotate_cw_label=Сағат тілі бағытымен бұру
 page_rotate_ccw.title=Сағат тілі бағытына қарсы бұру
-page_rotate_ccw.label=Сағат тілі бағытына қарсы бұру
 page_rotate_ccw_label=Сағат тілі бағытына қарсы бұру
 
 cursor_text_select_tool.title=Мәтінді таңдау құралын іске қосу
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Мәтінді таңдау құралы
 cursor_hand_tool.title=Қол құралын іске қосу
 cursor_hand_tool_label=Қол құралы
 
+scroll_page.title=Беттерді айналдыруды пайдалану
+scroll_page_label=Беттерді айналдыру
 scroll_vertical.title=Вертикалды айналдыруды қолдану
 scroll_vertical_label=Вертикалды айналдыру
 scroll_horizontal.title=Горизонталды айналдыруды қолдану
@@ -137,19 +135,24 @@ print_progress_close=Бас тарту
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Бүйір панелін көрсету/жасыру
-toggle_sidebar_notification.title=Бүйір панелін көрсету/жасыру (құжатта құрылымы/салынымдар бар)
+toggle_sidebar_notification2.title=Бүйір панелін көрсету/жасыру (құжатта құрылымы/салынымдар/қабаттар бар)
 toggle_sidebar_label=Бүйір панелін көрсету/жасыру
 document_outline.title=Құжат құрылымын көрсету (барлық нәрселерді жазық қылу/жинау үшін қос шерту керек)
 document_outline_label=Құжат құрамасы
 attachments.title=Салынымдарды көрсету
 attachments_label=Салынымдар
+layers.title=Қабаттарды көрсету (барлық қабаттарды бастапқы күйге келтіру үшін екі рет шертіңіз)
+layers_label=Қабаттар
 thumbs.title=Кіші көріністерді көрсету
 thumbs_label=Кіші көріністер
+current_outline_item.title=Құрылымның ағымдағы элементін табу
+current_outline_item_label=Құрылымның ағымдағы элементі
 findbar.title=Құжаттан табу
 findbar_label=Табу
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Бет {{page}}
+additional_layers=Қосымша қабаттар
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Бет {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Осы сөздердің мәтіннен келесі кезд
 find_next_label=Келесі
 find_highlight=Барлығын түспен ерекшелеу
 find_match_case_label=Регистрді ескеру
+find_match_diacritics_label=Диакритиканы ескеру
 find_entire_word_label=Сөздер толығымен
 find_reached_top=Құжаттың басына жеттік, соңынан бастап жалғастырамыз
 find_reached_bottom=Құжаттың соңына жеттік, басынан бастап жалғастырамыз
@@ -222,7 +226,7 @@ page_scale_actual=Нақты өлшемі
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Қате
+loading=Жүктелуде…
 loading_error=PDF жүктеу кезінде қате кетті.
 invalid_file_error=Зақымдалған немесе қате PDF файл.
 missing_file_error=PDF файлы жоқ.
@@ -245,3 +249,32 @@ password_cancel=Бас тарту
 printing_not_supported=Ескерту: Баспаға шығаруды бұл браузер толығымен қолдамайды.
 printing_not_ready=Ескерту: Баспаға шығару үшін, бұл PDF толығымен жүктеліп алынбады.
 web_fonts_disabled=Веб қаріптері сөндірілген: құрамына енгізілген PDF қаріптерін қолдану мүмкін емес.
+
+# Editor
+editor_none.title=Аңдатпаларды түзету мүмкіндігін сөндіру
+editor_none_label=Түзету мүмкіндігін сөндіру
+editor_free_text.title=FreeText аңдатпасын қосу
+editor_free_text_label=FreeText аңдатпасы
+editor_ink.title=Қолдан аңдатпаны қосу
+editor_ink_label=Қолдан аңдатпа
+
+freetext_default_content=Мәтінді енгізіңіз…
+
+free_text_default_content=Мәтінді енгізу…
+
+# Editor Parameters
+editor_free_text_font_color=Қаріп түсі
+editor_free_text_font_size=Қаріп өлшемі
+editor_ink_line_color=Сызық түсі
+editor_ink_line_thickness=Сызық қалыңдығы
+
+# Editor Parameters
+editor_free_text_color=Түс
+editor_free_text_size=Өлшемі
+editor_ink_color=Түс
+editor_ink_thickness=Қалыңдығы
+editor_ink_opacity=Мөлдірсіздігі
+
+# Editor aria
+editor_free_text_aria_label=FreeText түзеткіші
+editor_ink_aria_label=Сия түзеткіші
diff --git a/cps/static/locale/km/viewer.properties b/cps/static/locale/km/viewer.properties
index 8615e8389..3dcac78d7 100644
--- a/cps/static/locale/km/viewer.properties
+++ b/cps/static/locale/km/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=ទិដ្ឋភាព​បច្ចុប្បន្ន
 tools.title=ឧបករណ៍
 tools_label=ឧបករណ៍
 first_page.title=ទៅកាន់​ទំព័រ​ដំបូង​
-first_page.label=ទៅកាន់​ទំព័រ​ដំបូង​
 first_page_label=ទៅកាន់​ទំព័រ​ដំបូង​
 last_page.title=ទៅកាន់​ទំព័រ​ចុងក្រោយ​
-last_page.label=ទៅកាន់​ទំព័រ​ចុងក្រោយ​
 last_page_label=ទៅកាន់​ទំព័រ​ចុងក្រោយ
 page_rotate_cw.title=បង្វិល​ស្រប​ទ្រនិច​នាឡិកា
-page_rotate_cw.label=បង្វិល​ស្រប​ទ្រនិច​នាឡិកា
 page_rotate_cw_label=បង្វិល​ស្រប​ទ្រនិច​នាឡិកា
 page_rotate_ccw.title=បង្វិល​ច្រាស​ទ្រនិច​នាឡិកា​​
-page_rotate_ccw.label=បង្វិល​ច្រាស​ទ្រនិច​នាឡិកា​​
 page_rotate_ccw_label=បង្វិល​ច្រាស​ទ្រនិច​នាឡិកា​​
 
 cursor_text_select_tool.title=បើក​ឧបករណ៍​ជ្រើស​អត្ថបទ
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=ឧបករណ៍​ជ្រើស​អត្
 cursor_hand_tool.title=បើក​ឧបករណ៍​ដៃ
 cursor_hand_tool_label=ឧបករណ៍​ដៃ
 
+
+
 # Document properties dialog box
 document_properties.title=លក្ខណ​សម្បត្តិ​ឯកសារ…
 document_properties_label=លក្ខណ​សម្បត្តិ​ឯកសារ…
@@ -89,6 +87,25 @@ document_properties_creator=អ្នក​បង្កើត៖
 document_properties_producer=កម្មវិធី​បង្កើត PDF ៖
 document_properties_version=កំណែ PDF ៖
 document_properties_page_count=ចំនួន​ទំព័រ៖
+document_properties_page_size_unit_inches=អ៊ីញ
+document_properties_page_size_unit_millimeters=មម
+document_properties_page_size_orientation_portrait=បញ្ឈរ
+document_properties_page_size_orientation_landscape=ផ្តេក
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=សំបុត្រ
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized_yes=បាទ/ចាស
+document_properties_linearized_no=ទេ
 document_properties_close=បិទ
 
 print_progress_message=កំពុង​រៀបចំ​ឯកសារ​សម្រាប់​បោះពុម្ព…
@@ -101,7 +118,6 @@ print_progress_close=បោះបង់
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=បិទ/បើក​គ្រាប់​រំកិល
-toggle_sidebar_notification.title=បិទ/បើក​របារ​ចំហៀង (ឯកសារ​មាន​មាតិកា​នៅ​ក្រៅ/attachments)
 toggle_sidebar_label=បិទ/បើក​គ្រាប់​រំកិល
 document_outline.title=បង្ហាញ​គ្រោង​ឯកសារ (ចុច​ទ្វេ​ដង​ដើម្បី​ពង្រីក/បង្រួម​ធាតុ​ទាំងអស់)
 document_outline_label=គ្រោង​ឯកសារ
@@ -112,6 +128,7 @@ thumbs_label=រួបភាព​តូចៗ
 findbar.title=រក​នៅ​ក្នុង​ឯកសារ
 findbar_label=រក
 
+# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -131,6 +148,14 @@ find_highlight=បន្លិច​ទាំងអស់
 find_match_case_label=ករណី​ដំណូច
 find_reached_top=បាន​បន្ត​ពី​ខាង​ក្រោម ទៅ​ដល់​ខាង​​លើ​នៃ​ឯកសារ
 find_reached_bottom=បាន​បន្ត​ពី​ខាងលើ ទៅដល់​ចុង​​នៃ​ឯកសារ
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
 find_not_found=រក​មិន​ឃើញ​ពាក្យ ឬ​ឃ្លា
 
 # Error panel labels
@@ -161,13 +186,14 @@ page_scale_actual=ទំហំ​ជាក់ស្ដែង
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=កំហុស
 loading_error=មាន​កំហុស​បាន​កើតឡើង​ពេល​កំពុង​ផ្ទុក PDF ។
 invalid_file_error=ឯកសារ PDF ខូច ឬ​មិន​ត្រឹមត្រូវ ។
 missing_file_error=បាត់​ឯកសារ PDF
 unexpected_response_error=ការ​ឆ្លើយ​តម​ម៉ាស៊ីន​មេ​ដែល​មិន​បាន​រំពឹង។
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
diff --git a/cps/static/locale/kn/viewer.properties b/cps/static/locale/kn/viewer.properties
index b37a71c2e..79c043753 100644
--- a/cps/static/locale/kn/viewer.properties
+++ b/cps/static/locale/kn/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=ಪ್ರಸಕ್ತ ನೋಟ
 tools.title=ಉಪಕರಣಗಳು
 tools_label=ಉಪಕರಣಗಳು
 first_page.title=ಮೊದಲ ಪುಟಕ್ಕೆ ತೆರಳು
-first_page.label=ಮೊದಲ ಪುಟಕ್ಕೆ ತೆರಳು
 first_page_label=ಮೊದಲ ಪುಟಕ್ಕೆ ತೆರಳು
 last_page.title=ಕೊನೆಯ ಪುಟಕ್ಕೆ ತೆರಳು
-last_page.label=ಕೊನೆಯ ಪುಟಕ್ಕೆ ತೆರಳು
 last_page_label=ಕೊನೆಯ ಪುಟಕ್ಕೆ ತೆರಳು
 page_rotate_cw.title=ಪ್ರದಕ್ಷಿಣೆಯಲ್ಲಿ ತಿರುಗಿಸು
-page_rotate_cw.label=ಪ್ರದಕ್ಷಿಣೆಯಲ್ಲಿ ತಿರುಗಿಸು
 page_rotate_cw_label=ಪ್ರದಕ್ಷಿಣೆಯಲ್ಲಿ ತಿರುಗಿಸು
 page_rotate_ccw.title=ಅಪ್ರದಕ್ಷಿಣೆಯಲ್ಲಿ ತಿರುಗಿಸು
-page_rotate_ccw.label=ಅಪ್ರದಕ್ಷಿಣೆಯಲ್ಲಿ ತಿರುಗಿಸು
 page_rotate_ccw_label=ಅಪ್ರದಕ್ಷಿಣೆಯಲ್ಲಿ ತಿರುಗಿಸು
 
 cursor_text_select_tool.title=ಪಠ್ಯ ಆಯ್ಕೆ ಉಪಕರಣವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
@@ -170,8 +166,6 @@ page_scale_actual=ನಿಜವಾದ ಗಾತ್ರ
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=ದೋಷ
 loading_error=PDF ಅನ್ನು ಲೋಡ್ ಮಾಡುವಾಗ ಒಂದು ದೋಷ ಎದುರಾಗಿದೆ.
 invalid_file_error=ಅಮಾನ್ಯವಾದ ಅಥವ ಹಾಳಾದ PDF ಕಡತ.
 missing_file_error=PDF ಕಡತ ಇಲ್ಲ.
diff --git a/cps/static/locale/ko/viewer.properties b/cps/static/locale/ko/viewer.properties
index 727f8d5c9..218dd73b0 100644
--- a/cps/static/locale/ko/viewer.properties
+++ b/cps/static/locale/ko/viewer.properties
@@ -41,23 +41,19 @@ print.title=인쇄
 print_label=인쇄
 download.title=다운로드
 download_label=다운로드
-bookmark.title=현재 보기 (복사 또는 새 창에 열기)
+bookmark.title=현재 보기 (복사 또는 새 창에서 열기)
 bookmark_label=현재 보기
 
 # Secondary toolbar and context menu
 tools.title=도구
 tools_label=도구
 first_page.title=첫 페이지로 이동
-first_page.label=첫 페이지로 이동
 first_page_label=첫 페이지로 이동
 last_page.title=마지막 페이지로 이동
-last_page.label=마지막 페이지로 이동
 last_page_label=마지막 페이지로 이동
 page_rotate_cw.title=시계방향으로 회전
-page_rotate_cw.label=시계방향으로 회전
 page_rotate_cw_label=시계방향으로 회전
 page_rotate_ccw.title=시계 반대방향으로 회전
-page_rotate_ccw.label=시계 반대방향으로 회전
 page_rotate_ccw_label=시계 반대방향으로 회전
 
 cursor_text_select_tool.title=텍스트 선택 도구 활성화
@@ -65,18 +61,20 @@ cursor_text_select_tool_label=텍스트 선택 도구
 cursor_hand_tool.title=손 도구 활성화
 cursor_hand_tool_label=손 도구
 
+scroll_page.title=페이지 스크롤 사용
+scroll_page_label=페이지 스크롤
 scroll_vertical.title=세로 스크롤 사용
 scroll_vertical_label=세로 스크롤
 scroll_horizontal.title=가로 스크롤 사용
 scroll_horizontal_label=가로 스크롤
-scroll_wrapped.title=감싼 스크롤 사용
-scroll_wrapped_label=감싼 스크롤
+scroll_wrapped.title=래핑(자동 줄 바꿈) 스크롤 사용
+scroll_wrapped_label=래핑 스크롤
 
-spread_none.title=펼쳐진 페이지를 합치지 않음
+spread_none.title=한 페이지 보기
 spread_none_label=펼쳐짐 없음
-spread_odd.title=홀수 페이지로 시작하게 펼쳐진 페이지 합침
+spread_odd.title=홀수 페이지로 시작하는 두 페이지 보기
 spread_odd_label=홀수 펼쳐짐
-spread_even.title=짝수 페이지로 시작하게 펼쳐진 페이지 합침
+spread_even.title=짝수 페이지로 시작하는 두 페이지 보기
 spread_even_label=짝수 펼쳐짐
 
 # Document properties dialog box
@@ -137,19 +135,24 @@ print_progress_close=취소
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=탐색창 표시/숨기기
-toggle_sidebar_notification.title=탐색창 표시/숨기기 (문서에 아웃라인/첨부파일 포함됨)
+toggle_sidebar_notification2.title=탐색창 표시/숨기기 (문서에 아웃라인/첨부파일/레이어 포함됨)
 toggle_sidebar_label=탐색창 표시/숨기기
-document_outline.title=문서 아웃라인 보기(더블 클릭해서 모든 항목 펼치기/접기)
+document_outline.title=문서 아웃라인 보기 (더블 클릭해서 모든 항목 펼치기/접기)
 document_outline_label=문서 아웃라인
 attachments.title=첨부파일 보기
 attachments_label=첨부파일
+layers.title=레이어 보기 (더블 클릭해서 모든 레이어를 기본 상태로 재설정)
+layers_label=레이어
 thumbs.title=미리보기
 thumbs_label=미리보기
+current_outline_item.title=현재 아웃라인 항목 찾기
+current_outline_item_label=현재 아웃라인 항목
 findbar.title=검색
 findbar_label=검색
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas={{page}} 페이지
+additional_layers=추가 레이어
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark={{page}} 페이지
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=지정 문자열에 일치하는 다음 부분을 검색
 find_next_label=다음
 find_highlight=모두 강조 표시
 find_match_case_label=대/소문자 구분
+find_match_diacritics_label=분음 부호 일치
 find_entire_word_label=단어 단위로
 find_reached_top=문서 처음까지 검색하고 끝으로 돌아와 검색했습니다.
 find_reached_bottom=문서 끝까지 검색하고 앞으로 돌아와 검색했습니다.
@@ -194,7 +198,7 @@ find_match_count_limit[other]={{limit}} 이상 일치
 find_not_found=검색 결과 없음
 
 # Error panel labels
-error_more_info=정보 더 보기
+error_more_info=자세한 정보
 error_less_info=정보 간단히 보기
 error_close=닫기
 # LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
@@ -213,16 +217,16 @@ error_line=줄 번호: {{line}}
 rendering_error=페이지를 렌더링하는 동안 오류가 발생했습니다.
 
 # Predefined zoom values
-page_scale_width=페이지 너비에 맞춤
-page_scale_fit=페이지에 맞춤
-page_scale_auto=자동 맞춤
-page_scale_actual=실제 크기에 맞춤
+page_scale_width=페이지 너비에 맞추기
+page_scale_fit=페이지에 맞추기
+page_scale_auto=자동
+page_scale_actual=실제 크기
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=오류
+loading=로드 중…
 loading_error=PDF를 로드하는 동안 오류가 발생했습니다.
 invalid_file_error=잘못되었거나 손상된 PDF 파일.
 missing_file_error=PDF 파일 없음.
@@ -245,3 +249,31 @@ password_cancel=취소
 printing_not_supported=경고: 이 브라우저는 인쇄를 완전히 지원하지 않습니다.
 printing_not_ready=경고: 이 PDF를 인쇄를 할 수 있을 정도로 읽어들이지 못했습니다.
 web_fonts_disabled=웹 폰트가 비활성화됨: 내장된 PDF 글꼴을 사용할 수 없습니다.
+
+# Editor
+editor_none.title=주석 편집 사용 안 함
+editor_none_label=편집 비활성화
+editor_free_text.title=텍스트 주석 추가
+editor_free_text_label=텍스트 주석
+editor_ink.title=잉크 주석 추가
+editor_ink_label=잉크 주석
+
+free_text_default_content=텍스트를 입력하세요…
+
+# Editor Parameters
+editor_free_text_font_color=글꼴 색상
+editor_free_text_font_size=글꼴 크기
+editor_ink_line_color=선 색상
+editor_ink_line_thickness=선 두께
+
+# Editor Parameters
+editor_free_text_color=색상
+editor_free_text_size=크기
+editor_ink_color=색상
+editor_ink_thickness=두께
+editor_ink_opacity=불투명도
+
+# Editor aria
+editor_free_text_aria_label=텍스트 편집기
+editor_ink_aria_label=잉크 편집기
+editor_ink_canvas_aria_label=사용자 생성 이미지
diff --git a/cps/static/locale/lij/viewer.properties b/cps/static/locale/lij/viewer.properties
index 0cfa7d27f..b89981c28 100644
--- a/cps/static/locale/lij/viewer.properties
+++ b/cps/static/locale/lij/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vixon corente
 tools.title=Atressi
 tools_label=Atressi
 first_page.title=Vanni a-a primma pagina
-first_page.label=Vanni a-a primma pagina
 first_page_label=Vanni a-a primma pagina
 last_page.title=Vanni a l'urtima pagina
-last_page.label=Vanni a l'urtima pagina
 last_page_label=Vanni a l'urtima pagina
 page_rotate_cw.title=Gia into verso oraio
-page_rotate_cw.label=Gia in senso do releuio
 page_rotate_cw_label=Gia into verso oraio
 page_rotate_ccw.title=Gia into verso antioraio
-page_rotate_ccw.label=Gia in senso do releuio a-a reversa
 page_rotate_ccw_label=Gia into verso antioraio
 
 cursor_text_select_tool.title=Abilita strumento de seleçion do testo
@@ -137,7 +133,6 @@ print_progress_close=Anulla
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Ativa/dizativa bara de scianco
-toggle_sidebar_notification.title=Cangia bara de löo (o documento o contegne di alegæ)
 toggle_sidebar_label=Ativa/dizativa bara de scianco
 document_outline.title=Fanni vedde o contorno do documento (scicca doggio pe espande/ridue tutti i elementi)
 document_outline_label=Contorno do documento
@@ -219,8 +214,6 @@ page_scale_actual=Dimenscioin efetive
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Erô
 loading_error=S'é verificou 'n'erô itno caregamento do PDF.
 invalid_file_error=O schedaio PDF o l'é no valido ò aroinou.
 missing_file_error=O schedaio PDF o no gh'é.
diff --git a/cps/static/locale/lo/viewer.properties b/cps/static/locale/lo/viewer.properties
index 00d3309c0..8b877d00a 100644
--- a/cps/static/locale/lo/viewer.properties
+++ b/cps/static/locale/lo/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=ມຸມມອງປະຈຸບັນ
 tools.title=ເຄື່ອງມື
 tools_label=ເຄື່ອງມື
 first_page.title=ໄປທີ່ຫນ້າທຳອິດ
-first_page.label=ໄປທີ່ຫນ້າທຳອິດ
 first_page_label=ໄປທີ່ຫນ້າທຳອິດ
 last_page.title=ໄປທີ່ຫນ້າສຸດທ້າຍ
-last_page.label=ໄປທີ່ຫນ້າສຸດທ້າຍ
 last_page_label=ໄປທີ່ຫນ້າສຸດທ້າຍ
 page_rotate_cw.title=ຫມູນຕາມເຂັມໂມງ
-page_rotate_cw.label=ຫມູນຕາມເຂັມໂມງ
 page_rotate_cw_label=ຫມູນຕາມເຂັມໂມງ
 page_rotate_ccw.title=ຫມູນທວນເຂັມໂມງ
-page_rotate_ccw.label=ຫມູນທວນເຂັມໂມງ
 page_rotate_ccw_label=ຫມູນທວນເຂັມໂມງ
 
 
@@ -98,7 +94,6 @@ print_progress_close=ຍົກເລີກ
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=ເປີດ/ປິດແຖບຂ້າງ
-toggle_sidebar_notification.title=ເປີດ/ປິດແຖບຂ້າງ (ເອກະສານມີເຄົ້າຮ່າງ/ໄຟລ໌ແນບ)
 toggle_sidebar_label=ເປີດ/ປິດແຖບຂ້າງ
 document_outline_label=ເຄົ້າຮ່າງເອກະສານ
 findbar_label=ຄົ້ນຫາ
@@ -138,8 +133,6 @@ rendering_error=ມີຂໍ້ຜິດພາດເກີດຂື້ນຂະ
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
 
-# Loading indicator messages
-loading_error_indicator=ຂໍ້ຜິດພາດ
 loading_error=ມີຂໍ້ຜິດພາດເກີດຂື້ນຂະນະທີ່ກຳລັງໂຫລດ PDF.
 invalid_file_error=ໄຟລ໌ PDF ບໍ່ຖືກຕ້ອງຫລືເສຍຫາຍ.
 
diff --git a/cps/static/locale/locale.properties b/cps/static/locale/locale.properties
index 372dd5d32..ae79f4739 100644
--- a/cps/static/locale/locale.properties
+++ b/cps/static/locale/locale.properties
@@ -244,9 +244,18 @@
 [ru]
 @import url(ru/viewer.properties)
 
+[sat]
+@import url(sat/viewer.properties)
+
+[sc]
+@import url(sc/viewer.properties)
+
 [scn]
 @import url(scn/viewer.properties)
 
+[sco]
+@import url(sco/viewer.properties)
+
 [si]
 @import url(si/viewer.properties)
 
@@ -277,6 +286,9 @@
 [te]
 @import url(te/viewer.properties)
 
+[tg]
+@import url(tg/viewer.properties)
+
 [th]
 @import url(th/viewer.properties)
 
diff --git a/cps/static/locale/lt/viewer.properties b/cps/static/locale/lt/viewer.properties
index daa76787c..390fa092c 100644
--- a/cps/static/locale/lt/viewer.properties
+++ b/cps/static/locale/lt/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Esamasis rodinys
 tools.title=Priemonės
 tools_label=Priemonės
 first_page.title=Eiti į pirmą puslapį
-first_page.label=Eiti į pirmą puslapį
 first_page_label=Eiti į pirmą puslapį
 last_page.title=Eiti į paskutinį puslapį
-last_page.label=Eiti į paskutinį puslapį
 last_page_label=Eiti į paskutinį puslapį
 page_rotate_cw.title=Pasukti pagal laikrodžio rodyklę
-page_rotate_cw.label=Pasukti pagal laikrodžio rodyklę
 page_rotate_cw_label=Pasukti pagal laikrodžio rodyklę
 page_rotate_ccw.title=Pasukti prieš laikrodžio rodyklę
-page_rotate_ccw.label=Pasukti prieš laikrodžio rodyklę
 page_rotate_ccw_label=Pasukti prieš laikrodžio rodyklę
 
 cursor_text_select_tool.title=Įjungti teksto žymėjimo įrankį
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Teksto žymėjimo įrankis
 cursor_hand_tool.title=Įjungti vilkimo įrankį
 cursor_hand_tool_label=Vilkimo įrankis
 
+scroll_page.title=Naudoti puslapio slinkimą
+scroll_page_label=Puslapio slinkimas
 scroll_vertical.title=Naudoti vertikalų slinkimą
 scroll_vertical_label=Vertikalus slinkimas
 scroll_horizontal.title=Naudoti horizontalų slinkimą
@@ -72,12 +70,12 @@ scroll_horizontal_label=Horizontalus slinkimas
 scroll_wrapped.title=Naudoti išklotą slinkimą
 scroll_wrapped_label=Išklotas slinkimas
 
-spread_none.title=Nesujungti puslapių sklaidų
-spread_none_label=Be sklaidų
-spread_odd.title=Sujungti puslapių sklaidas pradedant nelyginiais puslapiais
-spread_odd_label=Nelyginės sklaidos
-spread_even.title=Sujungti puslapių sklaidas pradedant lyginiais puslapiais
-spread_even_label=Lyginės sklaidos
+spread_none.title=Nejungti puslapių į dvilapius
+spread_none_label=Be dvilapių
+spread_odd.title=Sujungti į dvilapius pradedant nelyginiais puslapiais
+spread_odd_label=Nelyginiai dvilapiai
+spread_even.title=Sujungti į dvilapius pradedant lyginiais puslapiais
+spread_even_label=Lyginiai dvilapiai
 
 # Document properties dialog box
 document_properties.title=Dokumento savybės…
@@ -137,19 +135,24 @@ print_progress_close=Atsisakyti
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Rodyti / slėpti šoninį polangį
-toggle_sidebar_notification.title=Parankinė (dokumentas turi struktūrą / priedų)
+toggle_sidebar_notification2.title=Parankinė (dokumentas turi struktūrą / priedų / sluoksnių)
 toggle_sidebar_label=Šoninis polangis
 document_outline.title=Rodyti dokumento struktūrą (spustelėkite dukart norėdami išplėsti/suskleisti visus elementus)
 document_outline_label=Dokumento struktūra
 attachments.title=Rodyti priedus
 attachments_label=Priedai
+layers.title=Rodyti sluoksnius (spustelėkite dukart, norėdami atstatyti visus sluoksnius į numatytąją būseną)
+layers_label=Sluoksniai
 thumbs.title=Rodyti puslapių miniatiūras
 thumbs_label=Miniatiūros
+current_outline_item.title=Rasti dabartinį struktūros elementą
+current_outline_item_label=Dabartinis struktūros elementas
 findbar.title=Ieškoti dokumente
 findbar_label=Rasti
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas={{page}} puslapis
+additional_layers=Papildomi sluoksniai
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark={{page}} puslapis
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Ieškoti tolesnio frazės egzemplioriaus
 find_next_label=Tolesnis
 find_highlight=Viską paryškinti
 find_match_case_label=Skirti didžiąsias ir mažąsias raides
+find_match_diacritics_label=Skirti diakritinius ženklus
 find_entire_word_label=Ištisi žodžiai
 find_reached_top=Pasiekus dokumento pradžią, paieška pratęsta nuo pabaigos
 find_reached_bottom=Pasiekus dokumento pabaigą, paieška pratęsta nuo pradžios
@@ -222,7 +226,7 @@ page_scale_actual=Tikras dydis
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Klaida
+loading=Įkeliama…
 loading_error=Įkeliant PDF failą įvyko klaida.
 invalid_file_error=Tai nėra PDF failas arba jis yra sugadintas.
 missing_file_error=PDF failas nerastas.
@@ -245,3 +249,13 @@ password_cancel=Atsisakyti
 printing_not_supported=Dėmesio! Spausdinimas šioje naršyklėje nėra pilnai realizuotas.
 printing_not_ready=Dėmesio! PDF failas dar nėra pilnai įkeltas spausdinimui.
 web_fonts_disabled=Saityno šriftai išjungti – PDF faile esančių šriftų naudoti negalima.
+
+# Editor
+editor_none.title=Išjungti komentarų redagavimą
+editor_none_label=Išjungti redagavimą
+editor_free_text.title=Pridėti „FreeText“ komentarą
+editor_free_text_label=„FreeText“ komentaras
+editor_ink.title=Pridėti laisvo stiliaus komentarą
+editor_ink_label=Laisvo stiliaus komentaras
+
+freetext_default_content=Įveskite tekstą…
diff --git a/cps/static/locale/ltg/viewer.properties b/cps/static/locale/ltg/viewer.properties
index 4fffa864d..b0e202d2e 100644
--- a/cps/static/locale/ltg/viewer.properties
+++ b/cps/static/locale/ltg/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Pošreizejais skots
 tools.title=Reiki
 tools_label=Reiki
 first_page.title=Īt iz pyrmū lopu
-first_page.label=Īt iz pyrmū lopu
 first_page_label=Īt iz pyrmū lopu
 last_page.title=Īt iz piedejū lopu
-last_page.label=Īt iz piedejū lopu
 last_page_label=Īt iz piedejū lopu
 page_rotate_cw.title=Pagrīzt pa pulksteni
-page_rotate_cw.label=Pagrīzt pa pulksteni
 page_rotate_cw_label=Pagrīzt pa pulksteni
 page_rotate_ccw.title=Pagrīzt pret pulksteni
-page_rotate_ccw.label=Pagrīzt pret pulksteni
 page_rotate_ccw_label=Pagrīzt pret pulksteni
 
 cursor_text_select_tool.title=Aktivizēt teksta izvieles reiku
@@ -137,7 +133,6 @@ print_progress_close=Atceļt
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Puorslēgt suonu jūslu
-toggle_sidebar_notification.title=Toggle Sidebar (document contains outline/attachments)
 toggle_sidebar_label=Puorslēgt suonu jūslu
 document_outline.title=Show Document Outline (double-click to expand/collapse all items)
 document_outline_label=Dokumenta saturs
@@ -197,8 +192,6 @@ page_scale_actual=Patīsais izmārs
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Klaida
 loading_error=Īluodejūt PDF nūtyka klaida.
 invalid_file_error=Nadereigs voi būjuots PDF fails.
 missing_file_error=PDF fails nav atrosts.
diff --git a/cps/static/locale/lv/viewer.properties b/cps/static/locale/lv/viewer.properties
index b6d6ad38f..b9b5c0336 100644
--- a/cps/static/locale/lv/viewer.properties
+++ b/cps/static/locale/lv/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Pašreizējais skats
 tools.title=Rīki
 tools_label=Rīki
 first_page.title=Iet uz pirmo lapu
-first_page.label=Iet uz pirmo lapu
 first_page_label=Iet uz pirmo lapu
 last_page.title=Iet uz pēdējo lapu
-last_page.label=Iet uz pēdējo lapu
 last_page_label=Iet uz pēdējo lapu
 page_rotate_cw.title=Pagriezt pa pulksteni
-page_rotate_cw.label=Pagriezt pa pulksteni
 page_rotate_cw_label=Pagriezt pa pulksteni
 page_rotate_ccw.title=Pagriezt pret pulksteni
-page_rotate_ccw.label=Pagriezt pret pulksteni
 page_rotate_ccw_label=Pagriezt pret pulksteni
 
 cursor_text_select_tool.title=Aktivizēt teksta izvēles rīku
@@ -137,7 +133,6 @@ print_progress_close=Atcelt
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Pārslēgt sānu joslu
-toggle_sidebar_notification.title=Pārslēgt sānu joslu (dokumenta saturu un pielikumus)
 toggle_sidebar_label=Pārslēgt sānu joslu
 document_outline.title=Rādīt dokumenta struktūru (veiciet dubultklikšķi lai izvērstu/sakļautu visus vienumus)
 document_outline_label=Dokumenta saturs
@@ -219,8 +214,6 @@ page_scale_actual=Patiesais izmērs
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Kļūda
 loading_error=Ielādējot PDF notika kļūda.
 invalid_file_error=Nederīgs vai bojāts PDF fails.
 missing_file_error=PDF fails nav atrasts.
diff --git a/cps/static/locale/mk/viewer.properties b/cps/static/locale/mk/viewer.properties
index c1b091ed6..24ff730b6 100644
--- a/cps/static/locale/mk/viewer.properties
+++ b/cps/static/locale/mk/viewer.properties
@@ -43,10 +43,6 @@ bookmark_label=Овој преглед
 
 # Secondary toolbar and context menu
 tools.title=Алатки
-first_page.label=Оди до првата страница
-last_page.label=Оди до последната страница
-page_rotate_cw.label=Ротирај по стрелките на часовникот
-page_rotate_ccw.label=Ротирај спротивно од стрелките на часовникот
 
 
 
@@ -127,8 +123,6 @@ page_scale_actual=Вистинска големина
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
 
-# Loading indicator messages
-loading_error_indicator=Грешка
 loading_error=Настана грешка при вчитувањето на PDF-от.
 invalid_file_error=Невалидна или корумпирана PDF датотека.
 missing_file_error=Недостасува PDF документ.
diff --git a/cps/static/locale/mr/viewer.properties b/cps/static/locale/mr/viewer.properties
index b33646f51..697c2a3f3 100644
--- a/cps/static/locale/mr/viewer.properties
+++ b/cps/static/locale/mr/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=सध्याचे अवलोकन
 tools.title=साधने
 tools_label=साधने
 first_page.title=पहिल्या पृष्ठावर जा
-first_page.label=पहिल्या पृष्ठावर जा
 first_page_label=पहिल्या पृष्ठावर जा
 last_page.title=शेवटच्या पृष्ठावर जा
-last_page.label=शेवटच्या पृष्ठावर जा
 last_page_label=शेवटच्या पृष्ठावर जा
 page_rotate_cw.title=घड्याळाच्या काट्याच्या दिशेने फिरवा
-page_rotate_cw.label=घड्याळाच्या काट्याच्या दिशेने फिरवा
 page_rotate_cw_label=घड्याळाच्या काट्याच्या दिशेने फिरवा
 page_rotate_ccw.title=घड्याळाच्या काट्याच्या उलट दिशेने फिरवा
-page_rotate_ccw.label=घड्याळाच्या काट्याच्या उलट दिशेने फिरवा
 page_rotate_ccw_label=घड्याळाच्या काट्याच्या उलट दिशेने फिरवा
 
 cursor_text_select_tool.title=मजकूर निवड साधन कार्यान्वयीत करा
@@ -129,7 +125,6 @@ print_progress_close=रद्द करा
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=बाजूचीपट्टी टॉगल करा
-toggle_sidebar_notification.title=बाजूची पट्टी टॉगल करा (दस्तऐवजामध्ये रुपरेषा/जोडण्या आहेत)
 toggle_sidebar_label=बाजूचीपट्टी टॉगल करा
 document_outline.title=दस्तऐवज बाह्यरेखा दर्शवा (विस्तृत करण्यासाठी दोनवेळा क्लिक करा /सर्व घटक दाखवा)
 document_outline_label=दस्तऐवज रूपरेषा
@@ -211,8 +206,6 @@ page_scale_actual=प्रत्यक्ष आकार
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=त्रुटी
 loading_error=PDF लोड करतेवेळी त्रुटी आढळली.
 invalid_file_error=अवैध किंवा दोषीत PDF फाइल.
 missing_file_error=न आढळणारी PDF फाइल.
diff --git a/cps/static/locale/ms/viewer.properties b/cps/static/locale/ms/viewer.properties
index 61f155397..a6d4ce8b6 100644
--- a/cps/static/locale/ms/viewer.properties
+++ b/cps/static/locale/ms/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Paparan Semasa
 tools.title=Alatan
 tools_label=Alatan
 first_page.title=Pergi ke Halaman Pertama
-first_page.label=Pergi ke Halaman Pertama
 first_page_label=Pergi ke Halaman Pertama
 last_page.title=Pergi ke Halaman Terakhir
-last_page.label=Pergi ke Halaman Terakhir
 last_page_label=Pergi ke Halaman Terakhir
 page_rotate_cw.title=Berputar ikut arah Jam
-page_rotate_cw.label=Berputar ikut arah Jam
 page_rotate_cw_label=Berputar ikut arah Jam
 page_rotate_ccw.title=Pusing berlawan arah jam
-page_rotate_ccw.label=Pusing berlawan arah jam
 page_rotate_ccw_label=Pusing berlawan arah jam
 
 cursor_text_select_tool.title=Dayakan Alatan Pilihan Teks
@@ -137,7 +133,6 @@ print_progress_close=Batal
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Togol Bar Sisi
-toggle_sidebar_notification.title=Togol Sidebar (dokumen mengandungi rangka/attachments)
 toggle_sidebar_label=Togol Bar Sisi
 document_outline.title=Papar Rangka Dokumen (klik-dua-kali untuk kembangkan/kolaps semua item)
 document_outline_label=Rangka Dokumen
@@ -219,8 +214,6 @@ page_scale_actual=Saiz Sebenar
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Ralat
 loading_error=Masalah berlaku semasa menuatkan sebuah PDF.
 invalid_file_error=Tidak sah atau fail PDF rosak.
 missing_file_error=Fail PDF Hilang.
diff --git a/cps/static/locale/my/viewer.properties b/cps/static/locale/my/viewer.properties
index 3e6f2c305..39944cdde 100644
--- a/cps/static/locale/my/viewer.properties
+++ b/cps/static/locale/my/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=လက်ရှိ မြင်ကွင်း
 tools.title=ကိရိယာများ
 tools_label=ကိရိယာများ
 first_page.title=ပထမ စာမျက်နှာသို့
-first_page.label=ပထမ စာမျက်နှာသို့
 first_page_label=ပထမ စာမျက်နှာသို့
 last_page.title=နောက်ဆုံး စာမျက်နှာသို့
-last_page.label=နောက်ဆုံး စာမျက်နှာသို့
 last_page_label=နောက်ဆုံး စာမျက်နှာသို့
 page_rotate_cw.title=နာရီလက်တံ အတိုင်း
-page_rotate_cw.label=နာရီလက်တံ အတိုင်း
 page_rotate_cw_label=နာရီလက်တံ အတိုင်း
 page_rotate_ccw.title=နာရီလက်တံ ပြောင်းပြန်
-page_rotate_ccw.label=နာရီလက်တံ ပြောင်းပြန်
 page_rotate_ccw_label=နာရီလက်တံ ပြောင်းပြန်
 
 
@@ -107,7 +103,6 @@ print_progress_close=ပယ်​ဖျက်ပါ
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=ဘေးတန်းဖွင့်ပိတ်
-toggle_sidebar_notification.title=ဘေးဘားတန်းကို အဖွင့်/အပိတ် လုပ်ရန် (စာတမ်းတွင် outline/attachments ပါဝင်နိုင်သည်)
 toggle_sidebar_label=ဖွင့်ပိတ် ဆလိုက်ဒါ
 document_outline.title=စာတမ်းအကျဉ်းချုပ်ကို ပြပါ (စာရင်းအားလုံးကို ချုံ့/ချဲ့ရန် ကလစ်နှစ်ချက်နှိပ်ပါ)
 document_outline_label=စာတမ်းအကျဉ်းချုပ်
@@ -175,8 +170,6 @@ page_scale_actual=အမှန်တကယ်ရှိတဲ့ အရွယ်
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=အမှား
 loading_error=PDF ဖိုင် ကိုဆွဲတင်နေချိန်မှာ အမှားတစ်ခုတွေ့ရပါတယ်။
 invalid_file_error=မရသော သို့ ပျက်နေသော PDF ဖိုင်
 missing_file_error=PDF ပျောက်ဆုံး
diff --git a/cps/static/locale/nb-NO/viewer.properties b/cps/static/locale/nb-NO/viewer.properties
index 47b209048..5a72650a1 100644
--- a/cps/static/locale/nb-NO/viewer.properties
+++ b/cps/static/locale/nb-NO/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Nåværende visning
 tools.title=Verktøy
 tools_label=Verktøy
 first_page.title=Gå til første side
-first_page.label=Gå til første side
 first_page_label=Gå til første side
 last_page.title=Gå til siste side
-last_page.label=Gå til siste side
 last_page_label=Gå til siste side
 page_rotate_cw.title=Roter med klokken
-page_rotate_cw.label=Roter med klokken
 page_rotate_cw_label=Roter med klokken
 page_rotate_ccw.title=Roter mot klokken
-page_rotate_ccw.label=Roter mot klokken
 page_rotate_ccw_label=Roter mot klokken
 
 cursor_text_select_tool.title=Aktiver tekstmarkeringsverktøy
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Tekstmarkeringsverktøy
 cursor_hand_tool.title=Aktiver handverktøy
 cursor_hand_tool_label=Handverktøy
 
+scroll_page.title=Bruk siderulling
+scroll_page_label=Siderulling
 scroll_vertical.title=Bruk vertikal rulling
 scroll_vertical_label=Vertikal rulling
 scroll_horizontal.title=Bruk horisontal rulling
@@ -137,19 +135,24 @@ print_progress_close=Avbryt
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Slå av/på sidestolpe
-toggle_sidebar_notification.title=Vis/gjem sidestolpe (dokumentet inneholder oversikt/vedlegg)
+toggle_sidebar_notification2.title=Vis/gjem sidestolpe (dokumentet inneholder oversikt/vedlegg/lag)
 toggle_sidebar_label=Slå av/på sidestolpe
 document_outline.title=Vis dokumentdisposisjonen (dobbeltklikk for å utvide/skjule alle elementer)
 document_outline_label=Dokumentdisposisjon
 attachments.title=Vis vedlegg
 attachments_label=Vedlegg
+layers.title=Vis lag (dobbeltklikk for å tilbakestille alle lag til standardtilstand)
+layers_label=Lag
 thumbs.title=Vis miniatyrbilde
 thumbs_label=Miniatyrbilde
+current_outline_item.title=Finn gjeldende disposisjonselement
+current_outline_item_label=Gjeldende disposisjonselement
 findbar.title=Finn i dokumentet
 findbar_label=Finn
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Side {{page}}
+additional_layers=Ytterligere lag
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Side {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Finn neste forekomst av frasen
 find_next_label=Neste
 find_highlight=Uthev alle
 find_match_case_label=Skill store/små bokstaver
+find_match_diacritics_label=Samsvar diakritiske tegn
 find_entire_word_label=Hele ord
 find_reached_top=Nådde toppen av dokumentet, fortsetter fra bunnen
 find_reached_bottom=Nådde bunnen av dokumentet, fortsetter fra toppen
@@ -222,7 +226,7 @@ page_scale_actual=Virkelig størrelse
 page_scale_percent={{scale}} %
 
 # Loading indicator messages
-loading_error_indicator=Feil
+loading=Laster…
 loading_error=En feil oppstod ved lasting av PDF.
 invalid_file_error=Ugyldig eller skadet PDF-fil.
 missing_file_error=Manglende PDF-fil.
@@ -245,3 +249,33 @@ password_cancel=Avbryt
 printing_not_supported=Advarsel: Utskrift er ikke fullstendig støttet av denne nettleseren.
 printing_not_ready=Advarsel: PDF er ikke fullstendig innlastet for utskrift.
 web_fonts_disabled=Web-fonter er avslått: Kan ikke bruke innbundne PDF-fonter.
+
+# Editor
+editor_none.title=Slå av kommentarredigering
+editor_none_label=Slå av redigering
+editor_free_text.title=Legg til fritekstkommentar
+editor_free_text_label=Fritekstkommentar
+editor_ink.title=Legg til håndskreven kommentar
+editor_ink_label=Håndskreven kommentar
+
+freetext_default_content=Skriv inn litt tekst…
+
+free_text_default_content=Skriv inn tekst…
+
+# Editor Parameters
+editor_free_text_font_color=Skriftfarge
+editor_free_text_font_size=Skriftstørrelse
+editor_ink_line_color=Linjefarge
+editor_ink_line_thickness=Linjetykkelse
+
+# Editor Parameters
+editor_free_text_color=Farge
+editor_free_text_size=Størrelse
+editor_ink_color=Farge
+editor_ink_thickness=Tykkelse
+editor_ink_opacity=Ugjennomsiktighet
+
+# Editor aria
+editor_free_text_aria_label=FreeText-redigerer
+editor_ink_aria_label=Ink-redigerer
+editor_ink_canvas_aria_label=Brukerskapt bilde
diff --git a/cps/static/locale/ne-NP/viewer.properties b/cps/static/locale/ne-NP/viewer.properties
index 3bf8ed8f3..004416745 100644
--- a/cps/static/locale/ne-NP/viewer.properties
+++ b/cps/static/locale/ne-NP/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=हालको दृश्य
 tools.title=औजारहरू
 tools_label=औजारहरू
 first_page.title=पहिलो पृष्ठमा जानुहोस्
-first_page.label=पहिलो पृष्ठमा जानुहोस्
 first_page_label=पहिलो पृष्ठमा जानुहोस्
 last_page.title=पछिल्लो पृष्ठमा जानुहोस्
-last_page.label=पछिल्लो पृष्ठमा जानुहोस्
 last_page_label=पछिल्लो पृष्ठमा जानुहोस्
 page_rotate_cw.title=घडीको दिशामा घुमाउनुहोस्
-page_rotate_cw.label=घडीको दिशामा घुमाउनुहोस्
 page_rotate_cw_label=घडीको दिशामा घुमाउनुहोस्
 page_rotate_ccw.title=घडीको विपरित दिशामा घुमाउनुहोस्
-page_rotate_ccw.label=घडीको विपरित दिशामा घुमाउनुहोस्
 page_rotate_ccw_label=घडीको विपरित दिशामा घुमाउनुहोस्
 
 cursor_text_select_tool.title=पाठ चयन उपकरण सक्षम गर्नुहोस्
@@ -65,6 +61,16 @@ cursor_text_select_tool_label=पाठ चयन उपकरण
 cursor_hand_tool.title=हाते उपकरण सक्षम गर्नुहोस्
 cursor_hand_tool_label=हाते उपकरण
 
+scroll_vertical.title=ठाडो स्क्रोलिङ्ग प्रयोग गर्नुहोस्
+scroll_vertical_label=ठाडो स्क्र्रोलिङ्ग
+scroll_horizontal.title=तेर्सो स्क्रोलिङ्ग प्रयोग गर्नुहोस्
+scroll_horizontal_label=तेर्सो स्क्रोलिङ्ग
+scroll_wrapped.title=लिपि स्क्रोलिङ्ग प्रयोग गर्नुहोस्
+scroll_wrapped_label=लिपि स्क्रोलिङ्ग
+
+spread_none.title=पृष्ठ स्प्रेडमा सामेल हुनुहुन्न
+spread_none_label=स्प्रेड छैन
+
 # Document properties dialog box
 document_properties.title=कागजात विशेषताहरू...
 document_properties_label=कागजात विशेषताहरू...
@@ -89,6 +95,23 @@ document_properties_creator=सर्जक:
 document_properties_producer=PDF निर्माता:
 document_properties_version=PDF संस्करण
 document_properties_page_count=पृष्ठ गणना:
+document_properties_page_size=पृष्ठ आकार:
+document_properties_page_size_unit_inches=इन्च
+document_properties_page_size_unit_millimeters=मि.मि.
+document_properties_page_size_orientation_portrait=पोट्रेट
+document_properties_page_size_orientation_landscape=परिदृश्य
+document_properties_page_size_name_letter=अक्षर
+document_properties_page_size_name_legal=कानूनी
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized_yes=हो
+document_properties_linearized_no=होइन
 document_properties_close=बन्द गर्नुहोस्
 
 print_progress_message=मुद्रणका लागि कागजात तयारी गरिदै…
@@ -101,7 +124,6 @@ print_progress_close=रद्द गर्नुहोस्
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=टगल साइडबार
-toggle_sidebar_notification.title=साइडबार टगल गर्नुहोस् (कागजातमा समावेश भएको कुराहरू रूपरेखा/attachments)
 toggle_sidebar_label=टगल साइडबार
 document_outline.title=कागजातको रूपरेखा देखाउनुहोस् (सबै वस्तुहरू विस्तार/पतन गर्न डबल-क्लिक गर्नुहोस्)
 document_outline_label=दस्तावेजको रूपरेखा
@@ -112,6 +134,7 @@ thumbs_label=थम्बनेलहरू
 findbar.title=कागजातमा फेला पार्नुहोस्
 findbar_label=फेला पार्नुहोस्
 
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -129,8 +152,17 @@ find_next.title=यस वाक्यांशको पछिल्लो घ
 find_next_label=अर्को
 find_highlight=सबै हाइलाइट गर्ने
 find_match_case_label=केस जोडा मिलाउनुहोस्
+find_entire_word_label=पुरा शब्दहरु
 find_reached_top=पृष्ठको शिर्षमा पुगीयो, तलबाट जारी गरिएको थियो
 find_reached_bottom=पृष्ठको अन्त्यमा पुगीयो, शिर्षबाट जारी गरिएको थियो
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
 find_not_found=वाक्यांश फेला परेन
 
 # Error panel labels
@@ -162,12 +194,14 @@ page_scale_actual=वास्तविक आकार
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=त्रुटि
 loading_error=यो PDF लोड गर्दा एउटा त्रुटि देखापर्‍यो।
 invalid_file_error=अवैध वा दुषित PDF फाइल।
 missing_file_error=हराईरहेको PDF फाइल।
 unexpected_response_error=अप्रत्याशित सर्भर प्रतिक्रिया।
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
diff --git a/cps/static/locale/nl/viewer.properties b/cps/static/locale/nl/viewer.properties
index b37f1abf5..eb659b6f1 100644
--- a/cps/static/locale/nl/viewer.properties
+++ b/cps/static/locale/nl/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Huidige weergave
 tools.title=Hulpmiddelen
 tools_label=Hulpmiddelen
 first_page.title=Naar eerste pagina gaan
-first_page.label=Naar eerste pagina gaan
 first_page_label=Naar eerste pagina gaan
 last_page.title=Naar laatste pagina gaan
-last_page.label=Naar laatste pagina gaan
 last_page_label=Naar laatste pagina gaan
 page_rotate_cw.title=Rechtsom draaien
-page_rotate_cw.label=Rechtsom draaien
 page_rotate_cw_label=Rechtsom draaien
 page_rotate_ccw.title=Linksom draaien
-page_rotate_ccw.label=Linksom draaien
 page_rotate_ccw_label=Linksom draaien
 
 cursor_text_select_tool.title=Tekstselectiehulpmiddel inschakelen
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Tekstselectiehulpmiddel
 cursor_hand_tool.title=Handhulpmiddel inschakelen
 cursor_hand_tool_label=Handhulpmiddel
 
+scroll_page.title=Paginascrollen gebruiken
+scroll_page_label=Paginascrollen
 scroll_vertical.title=Verticaal scrollen gebruiken
 scroll_vertical_label=Verticaal scrollen
 scroll_horizontal.title=Horizontaal scrollen gebruiken
@@ -93,7 +91,7 @@ document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
 document_properties_title=Titel:
 document_properties_author=Auteur:
 document_properties_subject=Onderwerp:
-document_properties_keywords=Trefwoorden:
+document_properties_keywords=Sleutelwoorden:
 document_properties_creation_date=Aanmaakdatum:
 document_properties_modification_date=Wijzigingsdatum:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
@@ -137,19 +135,24 @@ print_progress_close=Annuleren
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Zijbalk in-/uitschakelen
-toggle_sidebar_notification.title=Zijbalk in-/uitschakelen (document bevat overzicht/bijlagen)
+toggle_sidebar_notification2.title=Zijbalk in-/uitschakelen (document bevat overzicht/bijlagen/lagen)
 toggle_sidebar_label=Zijbalk in-/uitschakelen
 document_outline.title=Documentoverzicht tonen (dubbelklik om alle items uit/samen te vouwen)
 document_outline_label=Documentoverzicht
 attachments.title=Bijlagen tonen
 attachments_label=Bijlagen
+layers.title=Lagen tonen (dubbelklik om alle lagen naar de standaardstatus terug te zetten)
+layers_label=Lagen
 thumbs.title=Miniaturen tonen
 thumbs_label=Miniaturen
+current_outline_item.title=Huidig item in inhoudsopgave zoeken
+current_outline_item_label=Huidig item in inhoudsopgave
 findbar.title=Zoeken in document
 findbar_label=Zoeken
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Pagina {{page}}
+additional_layers=Aanvullende lagen
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Pagina {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=De volgende overeenkomst van de tekst zoeken
 find_next_label=Volgende
 find_highlight=Alles markeren
 find_match_case_label=Hoofdlettergevoelig
+find_match_diacritics_label=Diakritische tekens gebruiken
 find_entire_word_label=Hele woorden
 find_reached_top=Bovenkant van document bereikt, doorgegaan vanaf onderkant
 find_reached_bottom=Onderkant van document bereikt, doorgegaan vanaf bovenkant
@@ -222,7 +226,7 @@ page_scale_actual=Werkelijke grootte
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Fout
+loading=Laden…
 loading_error=Er is een fout opgetreden bij het laden van de PDF.
 invalid_file_error=Ongeldig of beschadigd PDF-bestand.
 missing_file_error=PDF-bestand ontbreekt. 
@@ -245,3 +249,26 @@ password_cancel=Annuleren
 printing_not_supported=Waarschuwing: afdrukken wordt niet volledig ondersteund door deze browser.
 printing_not_ready=Waarschuwing: de PDF is niet volledig geladen voor afdrukken.
 web_fonts_disabled=Weblettertypen zijn uitgeschakeld: gebruik van ingebedde PDF-lettertypen is niet mogelijk.
+
+# Editor
+editor_none.title=Bewerken van annotaties uitschakelen
+editor_none_label=Bewerken uitschakelen
+editor_free_text.title=FreeText-annotatie toevoegen
+editor_free_text_label=FreeText-annotatie
+editor_ink.title=Ink-annotatie toevoegen
+editor_ink_label=Ink-annotatie
+
+freetext_default_content=Voer wat tekst in…
+
+free_text_default_content=Voer tekst in…
+
+# Editor Parameters
+editor_free_text_font_color=Letterkleur
+editor_free_text_font_size=Lettergrootte
+editor_ink_line_color=Lijnkleur
+editor_ink_line_thickness=Lijndikte
+
+# Editor aria
+editor_free_text_aria_label=FreeText-bewerker
+editor_ink_aria_label=Ink-bewerker
+editor_ink_canvas_aria_label=Door gebruiker gemaakte afbeelding
diff --git a/cps/static/locale/nn-NO/viewer.properties b/cps/static/locale/nn-NO/viewer.properties
index c9bac1010..e93a7adb4 100644
--- a/cps/static/locale/nn-NO/viewer.properties
+++ b/cps/static/locale/nn-NO/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Gjeldande vising
 tools.title=Verktøy
 tools_label=Verktøy
 first_page.title=Gå til første side
-first_page.label=Gå til første side
 first_page_label=Gå til første side
 last_page.title=Gå til siste side
-last_page.label=Gå til siste side
 last_page_label=Gå til siste side
 page_rotate_cw.title=Roter med klokka
-page_rotate_cw.label=Roter med klokka
 page_rotate_cw_label=Roter med klokka
 page_rotate_ccw.title=Roter mot klokka
-page_rotate_ccw.label=Roter mot klokka
 page_rotate_ccw_label=Roter mot klokka
 
 cursor_text_select_tool.title=Aktiver tekstmarkeringsverktøy
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Tekstmarkeringsverktøy
 cursor_hand_tool.title=Aktiver handverktøy
 cursor_hand_tool_label=Handverktøy
 
+scroll_page.title=Bruk siderulling
+scroll_page_label=Siderulling
 scroll_vertical.title=Bruk vertikal rulling
 scroll_vertical_label=Vertikal rulling
 scroll_horizontal.title=Bruk horisontal rulling
@@ -137,19 +135,24 @@ print_progress_close=Avbryt
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Slå av/på sidestolpe
-toggle_sidebar_notification.title=Vis/gøym sidestolpen (dokumentet inneheld oversikt/vedlegg)
+toggle_sidebar_notification2.title=Vis/gøym sidestolpe (dokumentet inneheld oversikt/vedlegg/lag)
 toggle_sidebar_label=Slå av/på sidestolpe
 document_outline.title=Vis dokumentdisposisjonen (dobbelklikk for å utvide/gøyme alle elementa)
 document_outline_label=Dokumentdisposisjon
 attachments.title=Vis vedlegg
 attachments_label=Vedlegg
+layers.title=Vis lag (dobbeltklikk for å tilbakestille alle lag til standardtilstand)
+layers_label=Lag
 thumbs.title=Vis miniatyrbilde
 thumbs_label=Miniatyrbilde
+current_outline_item.title=Finn gjeldande disposisjonselement
+current_outline_item_label=Gjeldande disposisjonselement
 findbar.title=Finn i dokumentet
 findbar_label=Finn
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Side {{page}}
+additional_layers=Ytterlegare lag
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Side {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Finn neste førekomst av frasen
 find_next_label=Neste
 find_highlight=Uthev alle
 find_match_case_label=Skil store/små bokstavar
+find_match_diacritics_label=Samsvar diakritiske teikn
 find_entire_word_label=Heile ord
 find_reached_top=Nådde toppen av dokumentet, fortset frå botnen
 find_reached_bottom=Nådde botnen av dokumentet, fortset frå toppen
@@ -222,7 +226,7 @@ page_scale_actual=Verkeleg storleik
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Feil
+loading=Lastar…
 loading_error=Ein feil oppstod ved lasting av PDF.
 invalid_file_error=Ugyldig eller korrupt PDF-fil.
 missing_file_error=Manglande PDF-fil.
@@ -245,3 +249,33 @@ password_cancel=Avbryt
 printing_not_supported=Åtvaring: Utskrift er ikkje fullstendig støtta av denne nettlesaren.
 printing_not_ready=Åtvaring: PDF ikkje fullstendig innlasta for utskrift.
 web_fonts_disabled=Web-skrifter er slått av: Kan ikkje bruke innbundne PDF-skrifter.
+
+# Editor
+editor_none.title=Slå av kommentarredigering
+editor_none_label=Slå av redigering
+editor_free_text.title=Legg til fritekstkommentar
+editor_free_text_label=Fritekstkommentar
+editor_ink.title=Legg til handskriven kommentar
+editor_ink_label=Handskriven kommentar
+
+freetext_default_content=Skriv inn litt tekst…
+
+free_text_default_content=Skriv inn tekst…
+
+# Editor Parameters
+editor_free_text_font_color=Skriftfarge
+editor_free_text_font_size=Skriftstorleik
+editor_ink_line_color=Linjefarge
+editor_ink_line_thickness=Linjetjukkleik
+
+# Editor Parameters
+editor_free_text_color=Farge
+editor_free_text_size=Storleik
+editor_ink_color=Farge
+editor_ink_thickness=Tjukkleik
+editor_ink_opacity=Ugjennomskinleg
+
+# Editor aria
+editor_free_text_aria_label=FreeText-redigerar
+editor_ink_aria_label=Ink-redigerar
+editor_ink_canvas_aria_label=Brukarskapt bilde
diff --git a/cps/static/locale/oc/viewer.properties b/cps/static/locale/oc/viewer.properties
index b1c6a3a0c..c3356a4c4 100644
--- a/cps/static/locale/oc/viewer.properties
+++ b/cps/static/locale/oc/viewer.properties
@@ -26,7 +26,7 @@ of_pages=sus {{pagesCount}}
 # LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
 # will be replaced by a number representing the currently visible page,
 # respectively a number representing the total number of pages in the document.
-page_of_pages=({{pageNumber}} sus {{pagesCount}})
+page_of_pages=({{pageNumber}} de {{pagesCount}})
 
 zoom_out.title=Zoom arrièr
 zoom_out_label=Zoom arrièr
@@ -48,16 +48,12 @@ bookmark_label=Afichatge actual
 tools.title=Aisinas
 tools_label=Aisinas
 first_page.title=Anar a la primièra pagina
-first_page.label=Anar a la primièra pagina
 first_page_label=Anar a la primièra pagina
 last_page.title=Anar a la darrièra pagina
-last_page.label=Anar a la darrièra pagina
 last_page_label=Anar a la darrièra pagina
 page_rotate_cw.title=Rotacion orària
-page_rotate_cw.label=Rotacion orària
 page_rotate_cw_label=Rotacion orària
 page_rotate_ccw.title=Rotacion antiorària
-page_rotate_ccw.label=Rotacion antiorària
 page_rotate_ccw_label=Rotacion antiorària
 
 cursor_text_select_tool.title=Activar l'aisina de seleccion de tèxte
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Aisina de seleccion de tèxte
 cursor_hand_tool.title=Activar l’aisina man
 cursor_hand_tool_label=Aisina man
 
+scroll_page.title=Activar lo desfilament per pagina
+scroll_page_label=Desfilament per pagina
 scroll_vertical.title=Utilizar lo desfilament vertical
 scroll_vertical_label=Desfilament vertical
 scroll_horizontal.title=Utilizar lo desfilament orizontal
@@ -106,7 +104,7 @@ document_properties_page_count=Nombre de paginas :
 document_properties_page_size=Talha de la pagina :
 document_properties_page_size_unit_inches=in
 document_properties_page_size_unit_millimeters=mm
-document_properties_page_size_orientation_portrait=retrait
+document_properties_page_size_orientation_portrait=retrach
 document_properties_page_size_orientation_landscape=païsatge
 document_properties_page_size_name_a3=A3
 document_properties_page_size_name_a4=A4
@@ -137,19 +135,24 @@ print_progress_close=Anullar
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Afichar/amagar lo panèl lateral
-toggle_sidebar_notification.title=Afichar/amagar lo panèl lateral (lo document conten esquèmas/pèças juntas)
+toggle_sidebar_notification2.title=Afichar/amagar lo panèl lateral (lo document conten esquèmas/pèças juntas/calques)
 toggle_sidebar_label=Afichar/amagar lo panèl lateral
 document_outline.title=Mostrar los esquèmas del document (dobleclicar per espandre/reduire totes los elements)
 document_outline_label=Marcapaginas del document
 attachments.title=Visualizar las pèças juntas
 attachments_label=Pèças juntas
+layers.title=Afichar los calques (doble-clicar per reïnicializar totes los calques a l’estat per defaut)
+layers_label=Calques
 thumbs.title=Afichar las vinhetas
 thumbs_label=Vinhetas
+current_outline_item.title=Trobar l’element de plan actual
+current_outline_item_label=Element de plan actual
 findbar.title=Cercar dins lo document
 findbar_label=Recercar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Pagina {{page}}
+additional_layers=Calques suplementaris
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Pagina {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Tròba l'ocurréncia venenta de la frasa
 find_next_label=Seguent
 find_highlight=Suslinhar tot
 find_match_case_label=Respectar la cassa
+find_match_diacritics_label=Respectar los diacritics
 find_entire_word_label=Mots entièrs
 find_reached_top=Naut de la pagina atenh, perseguida del bas
 find_reached_bottom=Bas de la pagina atench, perseguida al començament
@@ -176,21 +180,21 @@ find_reached_bottom=Bas de la pagina atench, perseguida al començament
 # index of the currently active find result, respectively a number representing
 # the total number of matches in the document.
 find_match_count={[ plural(total) ]}
-find_match_count[one]=Occuréncia {{current}} sus {{total}}
-find_match_count[two]=Occuréncia {{current}} sus {{total}}
-find_match_count[few]=Occuréncia {{current}} sus {{total}}
-find_match_count[many]=Occuréncia {{current}} sus {{total}}
-find_match_count[other]=Occuréncia {{current}} sus {{total}}
+find_match_count[one]=Ocuréncia {{current}} sus {{total}}
+find_match_count[two]=Ocuréncia {{current}} sus {{total}}
+find_match_count[few]=Ocuréncia {{current}} sus {{total}}
+find_match_count[many]=Ocuréncia {{current}} sus {{total}}
+find_match_count[other]=Ocuréncia {{current}} sus {{total}}
 # LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
 # [zero|one|two|few|many|other], with [other] as the default value.
 # "{{limit}}" will be replaced by a numerical value.
 find_match_count_limit={[ plural(limit) ]}
-find_match_count_limit[zero]=Mai de {{limit}} occuréncias
-find_match_count_limit[one]=Mai de {{limit}} occuréncia
-find_match_count_limit[two]=Mai de {{limit}} occuréncias
-find_match_count_limit[few]=Mai de {{limit}} occuréncias
-find_match_count_limit[many]=Mai de {{limit}} occuréncias
-find_match_count_limit[other]=Mai de {{limit}} occuréncias
+find_match_count_limit[zero]=Mai de {{limit}} ocuréncias
+find_match_count_limit[one]=Mai de {{limit}} ocuréncia
+find_match_count_limit[two]=Mai de {{limit}} ocuréncias
+find_match_count_limit[few]=Mai de {{limit}} ocuréncias
+find_match_count_limit[many]=Mai de {{limit}} ocuréncias
+find_match_count_limit[other]=Mai de {{limit}} ocuréncias
 find_not_found=Frasa pas trobada
 
 # Error panel labels
@@ -210,7 +214,7 @@ error_stack=Pila : {{stack}}
 error_file=Fichièr : {{file}}
 # LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
 error_line=Linha : {{line}}
-rendering_error=Una error s'es produita pendent l'afichatge de la pagina.
+rendering_error=Una error s'es producha pendent l'afichatge de la pagina.
 
 # Predefined zoom values
 page_scale_width=Largor plena
@@ -222,8 +226,8 @@ page_scale_actual=Talha vertadièra
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Error
-loading_error=Una error s'es produita pendent lo cargament del fichièr PDF.
+loading=Cargament…
+loading_error=Una error s'es producha pendent lo cargament del fichièr PDF.
 invalid_file_error=Fichièr PDF invalid o corromput.
 missing_file_error=Fichièr PDF mancant.
 unexpected_response_error=Responsa de servidor imprevista.
@@ -244,4 +248,30 @@ password_cancel=Anullar
 
 printing_not_supported=Atencion : l'impression es pas completament gerida per aqueste navegador.
 printing_not_ready=Atencion : lo PDF es pas entièrament cargat per lo poder imprimir.
-web_fonts_disabled=Las poliças web son desactivadas : impossible d'utilizar las poliças integradas al PDF.
+web_fonts_disabled=Las polissas web son desactivadas : impossible d'utilizar las polissas integradas al PDF.
+
+# Editor
+editor_none.title=Desactivar l’edicion d’anotacions
+editor_none_label=Desactivar l’edicion
+editor_free_text.title=Apondre de tèxte
+editor_free_text_label=Tèxte
+editor_ink.title=Dessenhar
+editor_ink_label=Dessenh
+
+freetext_default_content=Picatz de tèxte…
+
+free_text_default_content=Picatz de tèxt…
+
+# Editor Parameters
+editor_free_text_font_color=Color de polissa
+editor_free_text_font_size=Talha de polissa
+editor_ink_line_color=Color de linha
+editor_ink_line_thickness=Espessor de la linha
+
+# Editor Parameters
+editor_free_text_color=Color
+editor_free_text_size=Talha
+editor_ink_color=Color
+editor_ink_opacity=Opacitat
+
+# Editor aria
diff --git a/cps/static/locale/pa-IN/viewer.properties b/cps/static/locale/pa-IN/viewer.properties
index 0ab56319e..153bf5c4f 100644
--- a/cps/static/locale/pa-IN/viewer.properties
+++ b/cps/static/locale/pa-IN/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=ਮੌਜੂਦਾ ਝਲਕ
 tools.title=ਟੂਲ
 tools_label=ਟੂਲ
 first_page.title=ਪਹਿਲੇ ਸਫ਼ੇ ਉੱਤੇ ਜਾਓ
-first_page.label=ਪਹਿਲੇ ਸਫ਼ੇ ਉੱਤੇ ਜਾਓ
 first_page_label=ਪਹਿਲੇ ਸਫ਼ੇ ਉੱਤੇ ਜਾਓ
 last_page.title=ਆਖਰੀ ਸਫ਼ੇ ਉੱਤੇ ਜਾਓ
-last_page.label=ਆਖਰੀ ਸਫ਼ੇ ਉੱਤੇ ਜਾਓ
 last_page_label=ਆਖਰੀ ਸਫ਼ੇ ਉੱਤੇ ਜਾਓ
 page_rotate_cw.title=ਸੱਜੇ ਦਾਅ ਘੁੰਮਾਓ
-page_rotate_cw.label=ਸੱਜੇ ਦਾਅ ਘੁੰਮਾਉ
 page_rotate_cw_label=ਸੱਜੇ ਦਾਅ ਘੁੰਮਾਓ
 page_rotate_ccw.title=ਖੱਬੇ ਦਾਅ ਘੁੰਮਾਓ
-page_rotate_ccw.label=ਖੱਬੇ ਦਾਅ ਘੁੰਮਾਉ
 page_rotate_ccw_label=ਖੱਬੇ ਦਾਅ ਘੁੰਮਾਓ
 
 cursor_text_select_tool.title=ਲਿਖਤ ਚੋਣ ਟੂਲ ਸਮਰੱਥ ਕਰੋ
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=ਲਿਖਤ ਚੋਣ ਟੂਲ
 cursor_hand_tool.title=ਹੱਥ ਟੂਲ ਸਮਰੱਥ ਕਰੋ
 cursor_hand_tool_label=ਹੱਥ ਟੂਲ
 
+scroll_page.title=ਸਫ਼ਾ ਖਿਸਕਾਉਣ ਨੂੰ ਵਰਤੋਂ
+scroll_page_label=ਸਫ਼ਾ ਖਿਸਕਾਉਣਾ
 scroll_vertical.title=ਖੜ੍ਹਵੇਂ ਸਕਰਾਉਣ ਨੂੰ ਵਰਤੋਂ
 scroll_vertical_label=ਖੜ੍ਹਵਾਂ ਸਰਕਾਉਣਾ
 scroll_horizontal.title=ਲੇਟਵੇਂ ਸਰਕਾਉਣ ਨੂੰ ਵਰਤੋਂ
@@ -74,8 +72,10 @@ scroll_wrapped_label=ਸਮੇਟਿਆ ਸਰਕਾਉਣਾ
 
 spread_none.title=ਸਫ਼ਾ ਫੈਲਾਅ ਵਿੱਚ ਸ਼ਾਮਲ ਨਾ ਹੋਵੋ
 spread_none_label=ਕੋਈ ਫੈਲਾਅ ਨਹੀਂ
-spread_odd.title=ਅਜੀਬ-ਨੰਬਰ ਵਾਲੇ ਪੰਨਿਆਂ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣ ਵਾਲੇ ਪੰਨੇ ਸਪਰਸ਼ਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ
-spread_even.title=ਜਿਸਤ ਨੰਬਰ ਵਾਲੇ ਸਫ਼ਿਆਂ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣ ਵਾਲੇ ਸਫਿਆਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ
+spread_odd.title=ਟਾਂਕ ਅੰਕ ਵਾਲੇ ਸਫ਼ਿਆਂ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣ ਵਾਲੇ ਸਫਿਆਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ
+spread_odd_label=ਟਾਂਕ ਫੈਲਾਅ
+spread_even.title=ਜਿਸਤ ਅੰਕ ਵਾਲੇ ਸਫ਼ਿਆਂ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣ ਵਾਲੇ ਸਫਿਆਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ
+spread_even_label=ਜਿਸਤ ਫੈਲਾਅ
 
 # Document properties dialog box
 document_properties.title=…ਦਸਤਾਵੇਜ਼ ਦੀ ਵਿਸ਼ੇਸ਼ਤਾ
@@ -135,19 +135,24 @@ print_progress_close=ਰੱਦ ਕਰੋ
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=ਬਾਹੀ ਬਦਲੋ
-toggle_sidebar_notification.title=ਬਾਹੀ ਨੂੰ ਬਦਲੋ (ਦਸਤਾਵੇਜ਼ ਖਾਕਾ/ਅਟੈਚਮੈਂਟਾਂ ਰੱਖਦਾ ਹੈ)
+toggle_sidebar_notification2.title=ਬਾਹੀ ਨੂੰ ਬਦਲੋ (ਦਸਤਾਵੇਜ਼ ਖਾਕਾ/ਅਟੈਚਮੈਂਟ/ਪਰਤਾਂ ਰੱਖਦਾ ਹੈ)
 toggle_sidebar_label=ਬਾਹੀ ਬਦਲੋ
 document_outline.title=ਦਸਤਾਵੇਜ਼ ਖਾਕਾ ਦਿਖਾਓ (ਸਾਰੀਆਂ ਆਈਟਮਾਂ ਨੂੰ ਫੈਲਾਉਣ/ਸਮੇਟਣ ਲਈ ਦੋ ਵਾਰ ਕਲਿੱਕ ਕਰੋ)
 document_outline_label=ਦਸਤਾਵੇਜ਼ ਖਾਕਾ
 attachments.title=ਅਟੈਚਮੈਂਟ ਵੇਖਾਓ
 attachments_label=ਅਟੈਚਮੈਂਟਾਂ
+layers.title=ਪਰਤਾਂ ਵੇਖਾਓ (ਸਾਰੀਆਂ ਪਰਤਾਂ ਨੂੰ ਮੂਲ ਹਾਲਤ ਉੱਤੇ ਮੁੜ-ਸੈੱਟ ਕਰਨ ਲਈ ਦੋ ਵਾਰ ਕਲਿੱਕ ਕਰੋ)
+layers_label=ਪਰਤਾਂ
 thumbs.title=ਥੰਮਨੇਲ ਨੂੰ ਵੇਖਾਓ
 thumbs_label=ਥੰਮਨੇਲ
+current_outline_item.title=ਮੌੌਜੂਦਾ ਖਾਕਾ ਚੀਜ਼ ਲੱਭੋ
+current_outline_item_label=ਮੌਜੂਦਾ ਖਾਕਾ ਚੀਜ਼
 findbar.title=ਦਸਤਾਵੇਜ਼ ਵਿੱਚ ਲੱਭੋ
 findbar_label=ਲੱਭੋ
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=ਸਫ਼ਾ {{page}}
+additional_layers=ਵਾਧੂ ਪਰਤਾਂ
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=ਸਫ਼ਾ {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -165,6 +170,7 @@ find_next.title=ਵਾਕ ਦੀ ਅਗਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ
 find_next_label=ਅੱਗੇ
 find_highlight=ਸਭ ਉਭਾਰੋ
 find_match_case_label=ਅੱਖਰ ਆਕਾਰ ਨੂੰ ਮਿਲਾਉ
+find_match_diacritics_label=ਭੇਦਸੂਚਕ ਮੇਲ
 find_entire_word_label=ਪੂਰੇ ਸ਼ਬਦ
 find_reached_top=ਦਸਤਾਵੇਜ਼ ਦੇ ਉੱਤੇ ਆ ਗਏ ਹਾਂ, ਥੱਲੇ ਤੋਂ ਜਾਰੀ ਰੱਖਿਆ ਹੈ
 find_reached_bottom=ਦਸਤਾਵੇਜ਼ ਦੇ ਅੰਤ ਉੱਤੇ ਆ ਗਏ ਹਾਂ, ਉੱਤੇ ਤੋਂ ਜਾਰੀ ਰੱਖਿਆ ਹੈ
@@ -220,7 +226,7 @@ page_scale_actual=ਆਟੋਮੈਟਿਕ ਆਕਾਰ
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=ਗਲਤੀ
+loading=…ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ
 loading_error=PDF ਲੋਡ ਕਰਨ ਦੇ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।
 invalid_file_error=ਗਲਤ ਜਾਂ ਨਿਕਾਰਾ PDF ਫਾਈਲ ਹੈ।
 missing_file_error=ਨਾ-ਮੌਜੂਦ PDF ਫਾਈਲ।
@@ -243,3 +249,33 @@ password_cancel=ਰੱਦ ਕਰੋ
 printing_not_supported=ਸਾਵਧਾਨ: ਇਹ ਬਰਾਊਜ਼ਰ ਪਰਿੰਟ ਕਰਨ ਲਈ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।
 printing_not_ready=ਸਾਵਧਾਨ: PDF ਨੂੰ ਪਰਿੰਟ ਕਰਨ ਲਈ ਪੂਰੀ ਤਰ੍ਹਾਂ ਲੋਡ ਨਹੀਂ ਹੈ।
 web_fonts_disabled=ਵੈਬ ਫੋਂਟ ਬੰਦ ਹਨ: ਇੰਬੈਡ PDF ਫੋਂਟ ਨੂੰ ਵਰਤਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।
+
+# Editor
+editor_none.title=ਟਿੱਪਣੀ ਸੋਧਣਾ ਅਸਮਰੱਥ
+editor_none_label=ਸੋਧਣਾ ਅਸਮਰੱਥ
+editor_free_text.title=FreeText ਟਿੱਪਣੀ ਜੋੜੋ
+editor_free_text_label=FreeText ਟਿੱਪਣੀ
+editor_ink.title=ਸਿਆਹੀ ਟਿੱਪਣੀ ਜੋੜੋ
+editor_ink_label=ਸਿਆਹੀ ਟਿੱਪਣੀ
+
+freetext_default_content=…ਕੁਝ ਲਿਖੋ
+
+free_text_default_content=…ਲਿਖੋ
+
+# Editor Parameters
+editor_free_text_font_color=ਫੌਂਟ ਦਾ ਰੰਗ
+editor_free_text_font_size=ਫ਼ੋਂਟ ਦਾ ਆਕਾਰ
+editor_ink_line_color=ਲਾਈਨ ਦਾ ਰੰਗ
+editor_ink_line_thickness=ਲਾਈਨ ਦੀ ਮੋਟਾਈ
+
+# Editor Parameters
+editor_free_text_color=ਰੰਗ
+editor_free_text_size=ਆਕਾਰ
+editor_ink_color=ਰੰਗ
+editor_ink_thickness=ਮੋਟਾਈ
+editor_ink_opacity=ਧੁੰਦਲਾਪਨ
+
+# Editor aria
+editor_free_text_aria_label=FreeText ਸੰਪਾਦਕ
+editor_ink_aria_label=ਸਿਆਹੀ ਸੰਪਾਦਕ
+editor_ink_canvas_aria_label=ਵਰਤੋਂਕਾਰ ਵਲੋਂ ਬਣਾਇਆ ਚਿੱਤਰ
diff --git a/cps/static/locale/pl/viewer.properties b/cps/static/locale/pl/viewer.properties
index cf170c8d2..9df1996d7 100644
--- a/cps/static/locale/pl/viewer.properties
+++ b/cps/static/locale/pl/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Bieżąca pozycja
 tools.title=Narzędzia
 tools_label=Narzędzia
 first_page.title=Przejdź do pierwszej strony
-first_page.label=Przejdź do pierwszej strony
 first_page_label=Przejdź do pierwszej strony
 last_page.title=Przejdź do ostatniej strony
-last_page.label=Przejdź do ostatniej strony
 last_page_label=Przejdź do ostatniej strony
 page_rotate_cw.title=Obróć zgodnie z ruchem wskazówek zegara
-page_rotate_cw.label=Obróć zgodnie z ruchem wskazówek zegara
 page_rotate_cw_label=Obróć zgodnie z ruchem wskazówek zegara
 page_rotate_ccw.title=Obróć przeciwnie do ruchu wskazówek zegara
-page_rotate_ccw.label=Obróć przeciwnie do ruchu wskazówek zegara
 page_rotate_ccw_label=Obróć przeciwnie do ruchu wskazówek zegara
 
 cursor_text_select_tool.title=Włącz narzędzie zaznaczania tekstu
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Narzędzie zaznaczania tekstu
 cursor_hand_tool.title=Włącz narzędzie rączka
 cursor_hand_tool_label=Narzędzie rączka
 
+scroll_page.title=Przewijaj strony
+scroll_page_label=Przewijanie stron
 scroll_vertical.title=Przewijaj dokument w pionie
 scroll_vertical_label=Przewijanie pionowe
 scroll_horizontal.title=Przewijaj dokument w poziomie
@@ -137,19 +135,24 @@ print_progress_close=Anuluj
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Przełącz panel boczny
-toggle_sidebar_notification.title=Przełącz panel boczny (dokument zawiera konspekt/załączniki)
+toggle_sidebar_notification2.title=Przełącz panel boczny (dokument zawiera konspekt/załączniki/warstwy)
 toggle_sidebar_label=Przełącz panel boczny
 document_outline.title=Konspekt dokumentu (podwójne kliknięcie rozwija lub zwija wszystkie pozycje)
 document_outline_label=Konspekt dokumentu
 attachments.title=Załączniki
 attachments_label=Załączniki
+layers.title=Warstwy (podwójne kliknięcie przywraca wszystkie warstwy do stanu domyślnego)
+layers_label=Warstwy
 thumbs.title=Miniatury
 thumbs_label=Miniatury
+current_outline_item.title=Znajdź bieżący element konspektu
+current_outline_item_label=Bieżący element konspektu
 findbar.title=Znajdź w dokumencie
 findbar_label=Znajdź
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas={{page}}. strona
+additional_layers=Dodatkowe warstwy
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark={{page}}. strona
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Znajdź następne wystąpienie tekstu
 find_next_label=Następne
 find_highlight=Wyróżnianie wszystkich
 find_match_case_label=Rozróżnianie wielkości liter
+find_match_diacritics_label=Rozróżnianie liter diakrytyzowanych
 find_entire_word_label=Całe słowa
 find_reached_top=Początek dokumentu. Wyszukiwanie od końca.
 find_reached_bottom=Koniec dokumentu. Wyszukiwanie od początku.
@@ -222,7 +226,7 @@ page_scale_actual=Rozmiar oryginalny
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Błąd
+loading=Wczytywanie…
 loading_error=Podczas wczytywania dokumentu PDF wystąpił błąd.
 invalid_file_error=Nieprawidłowy lub uszkodzony plik PDF.
 missing_file_error=Brak pliku PDF.
@@ -236,7 +240,7 @@ annotation_date_string={{date}}, {{time}}
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
-text_annotation_type.alt=[Adnotacja: {{type}}]
+text_annotation_type.alt=[Przypis: {{type}}]
 password_label=Wprowadź hasło, aby otworzyć ten dokument PDF.
 password_invalid=Nieprawidłowe hasło. Proszę spróbować ponownie.
 password_ok=OK
@@ -245,3 +249,33 @@ password_cancel=Anuluj
 printing_not_supported=Ostrzeżenie: drukowanie nie jest w pełni obsługiwane przez tę przeglądarkę.
 printing_not_ready=Ostrzeżenie: dokument PDF nie jest całkowicie wczytany, więc nie można go wydrukować.
 web_fonts_disabled=Czcionki sieciowe są wyłączone: nie można użyć osadzonych czcionek PDF.
+
+# Editor
+editor_none.title=Wyłącz edycję przypisów
+editor_none_label=Wyłącz edycję
+editor_free_text.title=Dodaj przypis tekstowy
+editor_free_text_label=Przypis tekstowy
+editor_ink.title=Dodaj zakreślenie
+editor_ink_label=Zakreślenie
+
+freetext_default_content=Wpisz tekst…
+
+free_text_default_content=Wpisz tekst…
+
+# Editor Parameters
+editor_free_text_font_color=Kolor czcionki
+editor_free_text_font_size=Rozmiar czcionki
+editor_ink_line_color=Kolor zakreślenia
+editor_ink_line_thickness=Grubość zakreślenia
+
+# Editor Parameters
+editor_free_text_color=Kolor
+editor_free_text_size=Rozmiar
+editor_ink_color=Kolor
+editor_ink_thickness=Grubość
+editor_ink_opacity=Nieprzezroczystość
+
+# Editor aria
+editor_free_text_aria_label=Edytor tekstu
+editor_ink_aria_label=Edytor zakreślenia
+editor_ink_canvas_aria_label=Obraz utworzony przez użytkownika
diff --git a/cps/static/locale/pt-BR/viewer.properties b/cps/static/locale/pt-BR/viewer.properties
index ca592b8f1..7b4727beb 100644
--- a/cps/static/locale/pt-BR/viewer.properties
+++ b/cps/static/locale/pt-BR/viewer.properties
@@ -33,14 +33,14 @@ zoom_out_label=Reduzir
 zoom_in.title=Ampliar
 zoom_in_label=Ampliar
 zoom.title=Zoom
-presentation_mode.title=Alternar para o modo de apresentação
+presentation_mode.title=Mudar para o modo de apresentação
 presentation_mode_label=Modo de apresentação
 open_file.title=Abrir arquivo
 open_file_label=Abrir
 print.title=Imprimir
 print_label=Imprimir
-download.title=Download
-download_label=Download
+download.title=Baixar
+download_label=Baixar
 bookmark.title=Visão atual (copiar ou abrir em nova janela)
 bookmark_label=Visualização atual
 
@@ -48,29 +48,27 @@ bookmark_label=Visualização atual
 tools.title=Ferramentas
 tools_label=Ferramentas
 first_page.title=Ir para a primeira página
-first_page.label=Ir para a primeira página
 first_page_label=Ir para a primeira página
 last_page.title=Ir para a última página
-last_page.label=Ir para a última página
 last_page_label=Ir para a última página
 page_rotate_cw.title=Girar no sentido horário
-page_rotate_cw.label=Girar no sentido horário
 page_rotate_cw_label=Girar no sentido horário
 page_rotate_ccw.title=Girar no sentido anti-horário
-page_rotate_ccw.label=Girar no sentido anti-horário
 page_rotate_ccw_label=Girar no sentido anti-horário
 
 cursor_text_select_tool.title=Ativar a ferramenta de seleção de texto
 cursor_text_select_tool_label=Ferramenta de seleção de texto
-cursor_hand_tool.title=Ativar ferramenta de mão
-cursor_hand_tool_label=Ferramenta de mão
+cursor_hand_tool.title=Ativar ferramenta de deslocamento
+cursor_hand_tool_label=Ferramenta de deslocamento
 
-scroll_vertical.title=Usar rolagem vertical
-scroll_vertical_label=Rolagem vertical
-scroll_horizontal.title=Usar rolagem horizontal
-scroll_horizontal_label=Rolagem horizontal
-scroll_wrapped.title=Usar rolagem contida
-scroll_wrapped_label=Rolagem contida
+scroll_page.title=Usar rolagem de página
+scroll_page_label=Rolagem de página
+scroll_vertical.title=Usar deslocamento vertical
+scroll_vertical_label=Deslocamento vertical
+scroll_horizontal.title=Usar deslocamento horizontal
+scroll_horizontal_label=Deslocamento horizontal
+scroll_wrapped.title=Usar deslocamento contido
+scroll_wrapped_label=Deslocamento contido
 
 spread_none.title=Não reagrupar páginas
 spread_none_label=Não estender
@@ -122,7 +120,7 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
-document_properties_linearized=Visualização rápida da Web:
+document_properties_linearized=Exibição web rápida:
 document_properties_linearized_yes=Sim
 document_properties_linearized_no=Não
 document_properties_close=Fechar
@@ -136,20 +134,25 @@ print_progress_close=Cancelar
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
-toggle_sidebar.title=Alternar painel
-toggle_sidebar_notification.title=Alternar o painel (documento contém marcadores e anexos)
-toggle_sidebar_label=Alternar painel
-document_outline.title=Mostrar a estrutura do documento (duplo-clique para expandir/recolher todos os ítens)
+toggle_sidebar.title=Exibir/ocultar painel lateral
+toggle_sidebar_notification2.title=Exibir/ocultar painel (documento contém estrutura/anexos/camadas)
+toggle_sidebar_label=Exibir/ocultar painel
+document_outline.title=Mostrar a estrutura do documento (dê um duplo-clique para expandir/recolher todos os itens)
 document_outline_label=Estrutura do documento
 attachments.title=Mostrar anexos
 attachments_label=Anexos
+layers.title=Exibir camadas (duplo-clique para redefinir todas as camadas ao estado predefinido)
+layers_label=Camadas
 thumbs.title=Mostrar miniaturas
 thumbs_label=Miniaturas
+current_outline_item.title=Encontrar item atual da estrutura
+current_outline_item_label=Item atual da estrutura
 findbar.title=Procurar no documento
 findbar_label=Procurar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Página {{page}}
+additional_layers=Camadas adicionais
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Página {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Procurar a próxima ocorrência da frase
 find_next_label=Próxima
 find_highlight=Destacar tudo
 find_match_case_label=Diferenciar maiúsculas/minúsculas
+find_match_diacritics_label=Considerar acentuação
 find_entire_word_label=Palavras completas
 find_reached_top=Início do documento alcançado, continuando do fim
 find_reached_bottom=Fim do documento alcançado, continuando do início
@@ -222,7 +226,7 @@ page_scale_actual=Tamanho real
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Erro
+loading=Carregando…
 loading_error=Ocorreu um erro ao carregar o PDF.
 invalid_file_error=Arquivo PDF corrompido ou inválido.
 missing_file_error=Arquivo PDF ausente.
@@ -245,3 +249,33 @@ password_cancel=Cancelar
 printing_not_supported=Aviso: a impressão não é totalmente suportada neste navegador.
 printing_not_ready=Aviso: o PDF não está totalmente carregado para impressão.
 web_fonts_disabled=As fontes web estão desativadas: não foi possível usar fontes incorporadas do PDF.
+
+# Editor
+editor_none.title=Desativar edição de anotações
+editor_none_label=Desativar edição
+editor_free_text.title=Adicionar anotação FreeText
+editor_free_text_label=Anotação FreeText
+editor_ink.title=Adicionar anotação à tinta
+editor_ink_label=Anotação à tinta
+
+freetext_default_content=Digite algum texto…
+
+free_text_default_content=Digite o texto…
+
+# Editor Parameters
+editor_free_text_font_color=Cor da fonte
+editor_free_text_font_size=Tamanho da fonte
+editor_ink_line_color=Cor da linha
+editor_ink_line_thickness=Espessura da linha
+
+# Editor Parameters
+editor_free_text_color=Cor
+editor_free_text_size=Tamanho
+editor_ink_color=Cor
+editor_ink_thickness=Espessura
+editor_ink_opacity=Opacidade
+
+# Editor aria
+editor_free_text_aria_label=Editor FreeText
+editor_ink_aria_label=Editor de tinta
+editor_ink_canvas_aria_label=Imagem criada pelo usuário
diff --git a/cps/static/locale/pt-PT/viewer.properties b/cps/static/locale/pt-PT/viewer.properties
index 57f481416..9fcfdf394 100644
--- a/cps/static/locale/pt-PT/viewer.properties
+++ b/cps/static/locale/pt-PT/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Visão atual
 tools.title=Ferramentas
 tools_label=Ferramentas
 first_page.title=Ir para a primeira página
-first_page.label=Ir para a primeira página
 first_page_label=Ir para a primeira página
 last_page.title=Ir para a última página
-last_page.label=Ir para a última página
 last_page_label=Ir para a última página
 page_rotate_cw.title=Rodar à direita
-page_rotate_cw.label=Rodar à direita
 page_rotate_cw_label=Rodar à direita
 page_rotate_ccw.title=Rodar à esquerda
-page_rotate_ccw.label=Rodar à esquerda
 page_rotate_ccw_label=Rodar à esquerda
 
 cursor_text_select_tool.title=Ativar ferramenta de seleção de texto
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Ferramenta de seleção de texto
 cursor_hand_tool.title=Ativar ferramenta de mão
 cursor_hand_tool_label=Ferramenta de mão
 
+scroll_page.title=Utilizar deslocamento da página
+scroll_page_label=Deslocamento da página
 scroll_vertical.title=Utilizar deslocação vertical
 scroll_vertical_label=Deslocação vertical
 scroll_horizontal.title=Utilizar deslocação horizontal
@@ -137,19 +135,24 @@ print_progress_close=Cancelar
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Alternar barra lateral
-toggle_sidebar_notification.title=Alternar barra lateral (documento contém contorno/anexos)
+toggle_sidebar_notification2.title=Alternar barra lateral (o documento contém contornos/anexos/camadas)
 toggle_sidebar_label=Alternar barra lateral
 document_outline.title=Mostrar esquema do documento (duplo clique para expandir/colapsar todos os itens)
 document_outline_label=Esquema do documento
 attachments.title=Mostrar anexos
 attachments_label=Anexos
+layers.title=Mostrar camadas (clique duas vezes para repor todas as camadas para o estado predefinido)
+layers_label=Camadas
 thumbs.title=Mostrar miniaturas
 thumbs_label=Miniaturas
+current_outline_item.title=Encontrar o item atualmente destacado
+current_outline_item_label=Item atualmente destacado
 findbar.title=Localizar em documento
 findbar_label=Localizar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Página {{page}}
+additional_layers=Camadas adicionais
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Página {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Localizar ocorrência seguinte da frase
 find_next_label=Seguinte
 find_highlight=Destacar tudo
 find_match_case_label=Correspondência
+find_match_diacritics_label=Corresponder diacríticos
 find_entire_word_label=Palavras completas
 find_reached_top=Topo do documento atingido, a continuar a partir do fundo
 find_reached_bottom=Fim do documento atingido, a continuar a partir do topo
@@ -222,7 +226,7 @@ page_scale_actual=Tamanho real
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Erro
+loading=A carregar…
 loading_error=Ocorreu um erro ao carregar o PDF.
 invalid_file_error=Ficheiro PDF inválido ou danificado.
 missing_file_error=Ficheiro PDF inexistente.
@@ -245,3 +249,33 @@ password_cancel=Cancelar
 printing_not_supported=Aviso: a impressão não é totalmente suportada por este navegador.
 printing_not_ready=Aviso: o PDF ainda não está totalmente carregado.
 web_fonts_disabled=Os tipos de letra web estão desativados: não é possível utilizar os tipos de letra PDF embutidos.
+
+# Editor
+editor_none.title=Desativar Edição de Anotações
+editor_none_label=Desativar Edição
+editor_free_text.title=Adicionar Anotação FreeText
+editor_free_text_label=Anotação FreeText
+editor_ink.title=Adicionar Anotação a Tinta
+editor_ink_label=Anotação a Tinta
+
+freetext_default_content=Introduza algum texto…
+
+free_text_default_content=Introduza o texto…
+
+# Editor Parameters
+editor_free_text_font_color=Cor da Fonte
+editor_free_text_font_size=Tamanho da Fonte
+editor_ink_line_color=Cor da Linha
+editor_ink_line_thickness=Espessura da Linha
+
+# Editor Parameters
+editor_free_text_color=Cor
+editor_free_text_size=Tamanho
+editor_ink_color=Cor
+editor_ink_thickness=Espessura
+editor_ink_opacity=Opacidade
+
+# Editor aria
+editor_free_text_aria_label=Editor de texto livre
+editor_ink_aria_label=Editor de tinta
+editor_ink_canvas_aria_label=Imagem criada pelo utilizador
diff --git a/cps/static/locale/rm/viewer.properties b/cps/static/locale/rm/viewer.properties
index 8c8cab892..5f1954a28 100644
--- a/cps/static/locale/rm/viewer.properties
+++ b/cps/static/locale/rm/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vista actuala
 tools.title=Utensils
 tools_label=Utensils
 first_page.title=Siglir a l'emprima pagina
-first_page.label=Siglir a l'emprima pagina
 first_page_label=Siglir a l'emprima pagina
 last_page.title=Siglir a la davosa pagina
-last_page.label=Siglir a la davosa pagina
 last_page_label=Siglir a la davosa pagina
 page_rotate_cw.title=Rotar en direcziun da l'ura
-page_rotate_cw.label=Rotar en direcziun da l'ura
 page_rotate_cw_label=Rotar en direcziun da l'ura
 page_rotate_ccw.title=Rotar en direcziun cuntraria a l'ura
-page_rotate_ccw.label=Rotar en direcziun cuntraria a l'ura
 page_rotate_ccw_label=Rotar en direcziun cuntraria a l'ura
 
 cursor_text_select_tool.title=Activar l'utensil per selecziunar text
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Utensil per selecziunar text
 cursor_hand_tool.title=Activar l'utensil da maun
 cursor_hand_tool_label=Utensil da maun
 
+scroll_page.title=Utilisar la defilada per pagina
+scroll_page_label=Defilada per pagina
 scroll_vertical.title=Utilisar il defilar vertical
 scroll_vertical_label=Defilar vertical
 scroll_horizontal.title=Utilisar il defilar orizontal
@@ -137,19 +135,24 @@ print_progress_close=Interrumper
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Activar/deactivar la trav laterala
-toggle_sidebar_notification.title=Activar/deactivar la trav laterala (structura dal document/agiuntas)
+toggle_sidebar_notification2.title=Activar/deactivar la trav laterala (il document cuntegna structura dal document/agiuntas/nivels)
 toggle_sidebar_label=Activar/deactivar la trav laterala
 document_outline.title=Mussar la structura dal document (cliccar duas giadas per extender/cumprimer tut ils elements)
 document_outline_label=Structura dal document
 attachments.title=Mussar agiuntas
 attachments_label=Agiuntas
+layers.title=Mussar ils nivels (cliccar dubel per restaurar il stadi da standard da tut ils nivels)
+layers_label=Nivels
 thumbs.title=Mussar las miniaturas
 thumbs_label=Miniaturas
+current_outline_item.title=Tschertgar l'element da structura actual
+current_outline_item_label=Element da structura actual
 findbar.title=Tschertgar en il document
 findbar_label=Tschertgar
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Pagina {{page}}
+additional_layers=Nivels supplementars
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Pagina {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Tschertgar la proxima posiziun da l'expressiun
 find_next_label=Enavant
 find_highlight=Relevar tuts
 find_match_case_label=Resguardar maiusclas/minusclas
+find_match_diacritics_label=Resguardar ils segns diacritics
 find_entire_word_label=Pleds entirs
 find_reached_top=Il cumenzament dal document è cuntanschì, la tschertga cuntinuescha a la fin dal document
 find_reached_bottom=La fin dal document è cuntanschì, la tschertga cuntinuescha al cumenzament dal document
@@ -222,7 +226,7 @@ page_scale_actual=Grondezza actuala
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Errur
+loading=Chargiar…
 loading_error=Ina errur è cumparida cun chargiar il PDF.
 invalid_file_error=Datoteca PDF nunvalida u donnegiada.
 missing_file_error=Datoteca PDF manconta.
@@ -245,3 +249,13 @@ password_cancel=Interrumper
 printing_not_supported=Attenziun: Il stampar na funcziunescha anc betg dal tut en quest navigatur.
 printing_not_ready=Attenziun: Il PDF n'è betg chargià cumplettamain per stampar.
 web_fonts_disabled=Scrittiras dal web èn deactivadas: impussibel dad utilisar las scrittiras integradas en il PDF.
+
+# Editor
+editor_none.title=Deactivar la modificaziun dad annotaziuns
+editor_none_label=Deactivar la modificaziun
+editor_free_text.title=Agiuntar ina annotaziun da text liber
+editor_free_text_label=Annotaziun da text liber
+editor_ink.title=Agiuntar ina annotaziun stilograf
+editor_ink_label=Annotaziun stilograf
+
+freetext_default_content=Endatar text…
diff --git a/cps/static/locale/ro/viewer.properties b/cps/static/locale/ro/viewer.properties
index 0e4fbf70e..7c4ed2836 100644
--- a/cps/static/locale/ro/viewer.properties
+++ b/cps/static/locale/ro/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Vizualizare actuală
 tools.title=Instrumente
 tools_label=Instrumente
 first_page.title=Mergi la prima pagină
-first_page.label=Mergi la prima pagină
 first_page_label=Mergi la prima pagină
 last_page.title=Mergi la ultima pagină
-last_page.label=Mergi la ultima pagină
 last_page_label=Mergi la ultima pagină
 page_rotate_cw.title=Rotește în sensul acelor de ceas
-page_rotate_cw.label=Rotește în sensul acelor de ceas
 page_rotate_cw_label=Rotește în sensul acelor de ceas
 page_rotate_ccw.title=Rotește în sens invers al acelor de ceas
-page_rotate_ccw.label=Rotește în sens invers al acelor de ceas
 page_rotate_ccw_label=Rotește în sens invers al acelor de ceas
 
 cursor_text_select_tool.title=Activează instrumentul de selecție a textului
@@ -137,7 +133,6 @@ print_progress_close=Renunță
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Comută bara laterală
-toggle_sidebar_notification.title=Comută bara laterală (documentul conține schițe/atașamente)
 toggle_sidebar_label=Comută bara laterală
 document_outline.title=Afișează schița documentului (dublu-clic pentru a extinde/restrânge toate elementele)
 document_outline_label=Schița documentului
@@ -148,8 +143,7 @@ thumbs_label=Miniaturi
 findbar.title=Caută în document
 findbar_label=Caută
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Pagina {{page}}
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -222,7 +216,6 @@ page_scale_actual=Mărime reală
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Eroare
 loading_error=A intervenit o eroare la încărcarea PDF-ului.
 invalid_file_error=Fișier PDF nevalid sau corupt.
 missing_file_error=Fișier PDF lipsă.
@@ -239,7 +232,7 @@ annotation_date_string={{date}}, {{time}}
 text_annotation_type.alt=[Adnotare {{type}}]
 password_label=Introdu parola pentru a deschide acest fișier PDF.
 password_invalid=Parolă nevalidă. Te rugăm să încerci din nou.
-password_ok=Ok
+password_ok=OK
 password_cancel=Renunță
 
 printing_not_supported=Avertisment: Tipărirea nu este suportată în totalitate de acest browser.
diff --git a/cps/static/locale/ru/viewer.properties b/cps/static/locale/ru/viewer.properties
index dd4ee4810..70c898a52 100644
--- a/cps/static/locale/ru/viewer.properties
+++ b/cps/static/locale/ru/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Текущий вид
 tools.title=Инструменты
 tools_label=Инструменты
 first_page.title=Перейти на первую страницу
-first_page.label=Перейти на первую страницу
 first_page_label=Перейти на первую страницу
 last_page.title=Перейти на последнюю страницу
-last_page.label=Перейти на последнюю страницу
 last_page_label=Перейти на последнюю страницу
 page_rotate_cw.title=Повернуть по часовой стрелке
-page_rotate_cw.label=Повернуть по часовой стрелке
 page_rotate_cw_label=Повернуть по часовой стрелке
 page_rotate_ccw.title=Повернуть против часовой стрелки
-page_rotate_ccw.label=Повернуть против часовой стрелки
 page_rotate_ccw_label=Повернуть против часовой стрелки
 
 cursor_text_select_tool.title=Включить Инструмент «Выделение текста»
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Инструмент «Выделение текс
 cursor_hand_tool.title=Включить Инструмент «Рука»
 cursor_hand_tool_label=Инструмент «Рука»
 
+scroll_page.title=Использовать прокрутку страниц
+scroll_page_label=Прокрутка страниц
 scroll_vertical.title=Использовать вертикальную прокрутку
 scroll_vertical_label=Вертикальная прокрутка
 scroll_horizontal.title=Использовать горизонтальную прокрутку
@@ -137,19 +135,24 @@ print_progress_close=Отмена
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Показать/скрыть боковую панель
-toggle_sidebar_notification.title=Показать/скрыть боковую панель (документ имеет содержание/вложения)
+toggle_sidebar_notification2.title=Показать/скрыть боковую панель (документ имеет содержание/вложения/слои)
 toggle_sidebar_label=Показать/скрыть боковую панель
 document_outline.title=Показать содержание документа (двойной щелчок, чтобы развернуть/свернуть все элементы)
 document_outline_label=Содержание документа
 attachments.title=Показать вложения
 attachments_label=Вложения
+layers.title=Показать слои (дважды щёлкните, чтобы сбросить все слои к состоянию по умолчанию)
+layers_label=Слои
 thumbs.title=Показать миниатюры
 thumbs_label=Миниатюры
+current_outline_item.title=Найти текущий элемент структуры
+current_outline_item_label=Текущий элемент структуры
 findbar.title=Найти в документе
 findbar_label=Найти
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Страница {{page}}
+additional_layers=Дополнительные слои
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Страница {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Найти следующее вхождение фразы в 
 find_next_label=Далее
 find_highlight=Подсветить все
 find_match_case_label=С учётом регистра
+find_match_diacritics_label=С учётом диакритических знаков
 find_entire_word_label=Слова целиком
 find_reached_top=Достигнут верх документа, продолжено снизу
 find_reached_bottom=Достигнут конец документа, продолжено сверху
@@ -222,7 +226,7 @@ page_scale_actual=Реальный размер
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Ошибка
+loading=Загрузка…
 loading_error=При загрузке PDF произошла ошибка.
 invalid_file_error=Некорректный или повреждённый PDF-файл.
 missing_file_error=PDF-файл отсутствует.
@@ -244,4 +248,34 @@ password_cancel=Отмена
 
 printing_not_supported=Предупреждение: В этом браузере не полностью поддерживается печать.
 printing_not_ready=Предупреждение: PDF не полностью загружен для печати.
-web_fonts_disabled=Веб-шрифты отключены: невозможно использовать встроенные PDF-шрифты.
+web_fonts_disabled=Веб-шрифты отключены: не удалось задействовать встроенные PDF-шрифты.
+
+# Editor
+editor_none.title=Отключить редактирование аннотаций
+editor_none_label=Отключить редактирование
+editor_free_text.title=Добавить аннотацию FreeText
+editor_free_text_label=Аннотация FreeText
+editor_ink.title=Добавить рукописную аннотацию
+editor_ink_label=Рукописная аннотация
+
+freetext_default_content=Введите текст…
+
+free_text_default_content=Введите текст…
+
+# Editor Parameters
+editor_free_text_font_color=Цвет шрифта
+editor_free_text_font_size=Размер шрифта
+editor_ink_line_color=Цвет линии
+editor_ink_line_thickness=Толщина линии
+
+# Editor Parameters
+editor_free_text_color=Цвет
+editor_free_text_size=Размер
+editor_ink_color=Цвет
+editor_ink_thickness=Толщина
+editor_ink_opacity=Прозрачность
+
+# Editor aria
+editor_free_text_aria_label=Редактор FreeText
+editor_ink_aria_label=Редактор чернил
+editor_ink_canvas_aria_label=Созданное пользователем изображение
diff --git a/cps/static/locale/sat/viewer.properties b/cps/static/locale/sat/viewer.properties
new file mode 100644
index 000000000..9cfa1f5a8
--- /dev/null
+++ b/cps/static/locale/sat/viewer.properties
@@ -0,0 +1,197 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=ᱢᱟᱲᱟᱝ ᱥᱟᱦᱴᱟ
+previous_label=ᱢᱟᱲᱟᱝᱟᱜ
+next.title=ᱤᱱᱟᱹ ᱛᱟᱭᱚᱢ ᱥᱟᱦᱴᱟ
+next_label=ᱤᱱᱟᱹ ᱛᱟᱭᱚᱢ
+
+# LOCALIZATION NOTE (page.title): The tooltip for the pageNumber input.
+page.title=ᱥᱟᱦᱴᱟ
+# LOCALIZATION NOTE (of_pages): "{{pagesCount}}" will be replaced by a number
+# representing the total number of pages in the document.
+of_pages=ᱨᱮᱭᱟᱜ {{pagesCount}}
+# LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
+# will be replaced by a number representing the currently visible page,
+# respectively a number representing the total number of pages in the document.
+page_of_pages=({{pageNumber}} ᱠᱷᱚᱱ {{pagesCount}})
+
+zoom_out.title=ᱦᱤᱲᱤᱧ ᱛᱮᱭᱟᱨ
+zoom_out_label=ᱦᱤᱲᱤᱧ ᱛᱮᱭᱟᱨ
+zoom_in.title=ᱢᱟᱨᱟᱝ ᱛᱮᱭᱟᱨ
+zoom_in_label=ᱢᱟᱨᱟᱝ ᱛᱮᱭᱟᱨ
+zoom.title=ᱡᱩᱢ
+presentation_mode.title=ᱩᱫᱩᱜ ᱥᱚᱫᱚᱨ ᱚᱵᱚᱥᱛᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ
+presentation_mode_label=ᱩᱫᱩᱜ ᱥᱚᱫᱚᱨ ᱚᱵᱚᱥᱛᱟ ᱨᱮ
+open_file.title=ᱨᱮᱫ ᱡᱷᱤᱡᱽ ᱢᱮ
+open_file_label=ᱡᱷᱤᱡᱽ ᱢᱮ
+print.title=ᱪᱷᱟᱯᱟ
+print_label=ᱪᱷᱟᱯᱟ
+download.title=ᱰᱟᱩᱱᱞᱚᱰ
+download_label=ᱰᱟᱩᱱᱞᱚᱰ
+bookmark.title=ᱱᱤᱛᱚᱜᱟᱜ ᱧᱮᱞ (ᱱᱚᱶᱟ ᱡᱷᱚᱨᱠᱟ ᱨᱮ ᱱᱚᱠᱚᱞ ᱟᱨ ᱵᱟᱝ ᱡᱷᱤᱡᱽ ᱢᱮ )
+bookmark_label=ᱱᱤᱛᱚᱜᱟᱜ ᱧᱮᱞ
+
+# Secondary toolbar and context menu
+tools.title=ᱦᱟᱹᱛᱤᱭᱟᱹᱨ ᱠᱚ
+tools_label=ᱦᱟᱹᱛᱤᱭᱟᱹᱨ ᱠᱚ
+first_page.title=ᱯᱩᱭᱞᱩ ᱥᱟᱦᱴᱟ ᱥᱮᱫ ᱪᱟᱞᱟᱜ ᱢᱮ
+first_page_label=ᱯᱩᱭᱞᱩ ᱥᱟᱦᱴᱟ ᱥᱮᱫ ᱪᱟᱞᱟᱜ ᱢᱮ
+last_page.title=ᱢᱩᱪᱟᱹᱫ ᱥᱟᱦᱴᱟ ᱥᱮᱫ ᱪᱟᱞᱟᱜ ᱢᱮ
+last_page_label=ᱢᱩᱪᱟᱹᱫ ᱥᱟᱦᱴᱟ ᱥᱮᱫ ᱪᱟᱞᱟᱜ ᱢᱮ
+page_rotate_cw.title=ᱜᱷᱚᱰᱤ ᱦᱤᱥᱟᱹᱵ ᱛᱮ ᱟᱹᱪᱩᱨ
+page_rotate_cw_label=ᱜᱷᱚᱰᱤ ᱦᱤᱥᱟᱹᱵ ᱛᱮ ᱟᱹᱪᱩᱨ
+page_rotate_ccw.title=ᱜᱷᱚᱰᱤ ᱦᱤᱥᱟᱹᱵ ᱛᱮ ᱩᱞᱴᱟᱹ ᱟᱹᱪᱩᱨ
+page_rotate_ccw_label=ᱜᱷᱚᱰᱤ ᱦᱤᱥᱟᱹᱵ ᱛᱮ ᱩᱞᱴᱟᱹ ᱟᱹᱪᱩᱨ
+
+cursor_text_select_tool.title=ᱚᱞ ᱵᱟᱪᱷᱟᱣ ᱦᱟᱹᱛᱤᱭᱟᱨ ᱮᱢ ᱪᱷᱚᱭ ᱢᱮ
+cursor_text_select_tool_label=ᱚᱞ ᱵᱟᱪᱷᱟᱣ ᱦᱟᱹᱛᱤᱭᱟᱨ
+cursor_hand_tool.title=ᱛᱤ ᱦᱟᱹᱛᱤᱭᱟᱨ ᱮᱢ ᱪᱷᱚᱭ ᱢᱮ
+cursor_hand_tool_label=ᱛᱤ ᱦᱟᱹᱛᱤᱭᱟᱨ
+
+scroll_page.title=ᱥᱟᱦᱴᱟ ᱜᱩᱲᱟᱹᱣ ᱵᱮᱵᱷᱟᱨ ᱢᱮ
+scroll_page_label=ᱥᱟᱦᱴᱟ ᱜᱩᱲᱟᱹᱣ
+scroll_vertical.title=ᱥᱤᱫᱽ ᱜᱩᱲᱟᱹᱣ ᱵᱮᱵᱷᱟᱨ ᱢᱮ
+scroll_vertical_label=ᱥᱤᱫᱽ ᱜᱩᱲᱟᱹᱣ
+scroll_horizontal.title=ᱜᱤᱛᱤᱡ ᱛᱮ ᱜᱩᱲᱟᱹᱣ ᱵᱮᱵᱷᱟᱨ ᱢᱮ
+
+
+# Document properties dialog box
+document_properties_file_name=ᱨᱮᱫᱽ ᱧᱩᱛᱩᱢ :
+document_properties_file_size=ᱨᱮᱫᱽ ᱢᱟᱯ :
+# LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
+# will be replaced by the PDF file size in kilobytes, respectively in bytes.
+document_properties_kb={{size_kb}} KB ({{size_b}} ᱵᱟᱭᱤᱴ ᱠᱚ)
+# LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
+# will be replaced by the PDF file size in megabytes, respectively in bytes.
+document_properties_mb={{size_mb}} MB ({{size_b}} ᱵᱟᱭᱤᱴ ᱠᱚ)
+document_properties_title=ᱧᱩᱛᱩᱢ :
+document_properties_author=ᱚᱱᱚᱞᱤᱭᱟᱹ :
+document_properties_subject=ᱵᱤᱥᱚᱭ :
+document_properties_keywords=ᱠᱟᱹᱴᱷᱤ ᱥᱟᱵᱟᱫᱽ :
+document_properties_creation_date=ᱛᱮᱭᱟᱨ ᱢᱟᱸᱦᱤᱛ :
+document_properties_modification_date=ᱵᱚᱫᱚᱞ ᱦᱚᱪᱚ ᱢᱟᱹᱦᱤᱛ :
+# LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
+# will be replaced by the creation/modification date, and time, of the PDF file.
+document_properties_date_string={{date}}, {{time}}
+document_properties_creator=ᱵᱮᱱᱟᱣᱤᱡ :
+document_properties_producer=PDF ᱛᱮᱭᱟᱨ ᱚᱰᱚᱠᱤᱡ :
+document_properties_version=PDF ᱵᱷᱟᱹᱨᱥᱚᱱ :
+document_properties_page_count=ᱥᱟᱦᱴᱟ ᱞᱮᱠᱷᱟ :
+document_properties_page_size=ᱥᱟᱦᱴᱟ ᱢᱟᱯ :
+document_properties_page_size_unit_inches=ᱤᱧᱪ
+document_properties_page_size_unit_millimeters=ᱢᱤᱢᱤ
+document_properties_page_size_orientation_portrait=ᱯᱚᱴᱨᱮᱴ
+document_properties_page_size_orientation_landscape=ᱞᱮᱱᱰᱥᱠᱮᱯ
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=ᱪᱤᱴᱷᱤ
+document_properties_page_size_name_legal=ᱠᱟᱹᱱᱩᱱᱤ
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+
+# LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
+# a numerical per cent value.
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+document_outline_label=ᱫᱚᱞᱤᱞ ᱛᱮᱭᱟᱨ ᱛᱮᱫ
+attachments.title=ᱞᱟᱴᱷᱟ ᱥᱮᱞᱮᱫ ᱠᱚ ᱩᱫᱩᱜᱽ ᱢᱮ
+attachments_label=ᱞᱟᱴᱷᱟ ᱥᱮᱞᱮᱫ ᱠᱚ
+thumbs.title=ᱪᱤᱛᱟᱹᱨ ᱟᱦᱞᱟ ᱠᱚ ᱩᱫᱩᱜᱽ ᱢᱮ
+thumbs_label=ᱪᱤᱛᱟᱹᱨ ᱟᱦᱞᱟ ᱠᱚ
+findbar.title=ᱫᱚᱞᱤᱞ ᱨᱮ ᱯᱟᱱᱛᱮ
+findbar_label=ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ
+
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title={{page}} ᱥᱟᱦᱴᱟ
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas={{page}} ᱥᱟᱦᱴᱟ ᱨᱮᱭᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱟᱦᱞᱟ
+
+# Find panel button title and messages
+find_previous.title=ᱟᱭᱟᱛ ᱦᱤᱸᱥ ᱨᱮᱭᱟᱜ ᱯᱟᱹᱦᱤᱞ ᱥᱮᱫᱟᱜ ᱚᱰᱚᱠ ᱧᱟᱢ ᱢᱮ
+find_next.title=ᱟᱭᱟᱛ ᱦᱤᱸᱥ ᱨᱮᱭᱟᱜ ᱤᱱᱟᱹ ᱛᱟᱭᱚᱢ ᱚᱰᱚᱠ ᱧᱟᱢ ᱢᱮ
+find_highlight=ᱡᱷᱚᱛᱚ ᱩᱫᱩᱜ ᱨᱟᱠᱟᱵ
+find_match_case_label=ᱡᱚᱲ ᱠᱟᱛᱷᱟ
+find_reached_top=ᱫᱚᱞᱤᱞ ᱨᱮᱭᱟᱜ ᱪᱤᱴ ᱨᱮ ᱥᱮᱴᱮᱨ, ᱞᱟᱛᱟᱨ ᱠᱷᱚᱱ ᱞᱮᱛᱟᱲ
+find_reached_bottom=ᱫᱚᱞᱤᱞ ᱨᱮᱭᱟᱜ ᱢᱩᱪᱟᱹᱫ ᱨᱮ ᱥᱮᱴᱮᱨ, ᱪᱚᱴ ᱠᱷᱚᱱ ᱞᱮᱛᱟᱲ
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_not_found=ᱛᱚᱯᱚᱞ ᱫᱚᱱᱚᱲ ᱵᱟᱝ ᱧᱟᱢ ᱞᱮᱱᱟ
+
+# Error panel labels
+error_more_info=ᱵᱟᱹᱲᱛᱤ ᱞᱟᱹᱭ ᱥᱚᱫᱚᱨ
+error_less_info=ᱠᱚᱢ ᱞᱟᱹᱭ ᱥᱚᱫᱚᱨ
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (build: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=ᱠᱷᱚᱵᱚᱨ : {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=ᱵᱟᱝ : {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=ᱨᱮᱫᱽ : {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=ᱜᱟᱨ : {{line}}
+rendering_error=ᱥᱟᱦᱴᱟ ᱮᱢ ᱡᱚᱦᱚᱠ ᱢᱤᱫ ᱵᱷᱩᱞ ᱦᱩᱭ ᱮᱱᱟ ᱾
+
+# Predefined zoom values
+page_scale_width=ᱥᱟᱦᱴᱟ ᱚᱥᱟᱨ
+page_scale_fit=ᱥᱟᱦᱴᱟ ᱠᱷᱟᱯ
+page_scale_auto=ᱟᱡᱼᱟᱡ ᱛᱮ ᱦᱩᱰᱤᱧ ᱞᱟᱹᱴᱩ ᱛᱮᱭᱟᱨ
+page_scale_actual=ᱴᱷᱤᱠ ᱢᱟᱨᱟᱝ ᱛᱮᱫ
+# LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
+# numerical scale value.
+
+# Loading indicator messages
+loading_error=PDF ᱞᱟᱫᱮ ᱡᱚᱦᱚᱜ ᱢᱤᱫ ᱵᱷᱩᱞ ᱦᱩᱭ ᱮᱱᱟ ᱾
+invalid_file_error=ᱵᱟᱝ ᱵᱟᱛᱟᱣ ᱟᱨᱵᱟᱝᱠᱷᱟᱱ ᱰᱤᱜᱟᱹᱣ PDF ᱨᱮᱫᱽ ᱾
+missing_file_error=ᱟᱫᱟᱜ PDF ᱨᱮᱫᱽ ᱾
+
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+
+# LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type.alt=[{{type}} ᱢᱚᱱᱛᱚ ᱮᱢ]
+password_label=ᱱᱚᱶᱟ PDF ᱨᱮᱫᱽ ᱡᱷᱤᱡᱽ ᱞᱟᱹᱜᱤᱫ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱮᱨ ᱢᱮ ᱾
+password_invalid=ᱵᱷᱩᱞ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱾ ᱫᱟᱭᱟᱠᱟᱛᱮ ᱫᱩᱦᱲᱟᱹ ᱪᱮᱥᱴᱟᱭ ᱢᱮ ᱾
+password_ok=ᱴᱷᱤᱠ
+
+printing_not_supported=ᱦᱚᱥᱤᱭᱟᱨ : ᱪᱷᱟᱯᱟ ᱱᱚᱣᱟ ᱯᱟᱱᱛᱮᱭᱟᱜ ᱫᱟᱨᱟᱭ ᱛᱮ ᱯᱩᱨᱟᱹᱣ ᱵᱟᱭ ᱜᱚᱲᱚᱣᱟᱠᱟᱱᱟ ᱾
+printing_not_ready=ᱦᱩᱥᱤᱭᱟᱹᱨ : ᱪᱷᱟᱯᱟ ᱞᱟᱹᱜᱤᱫ PDF ᱯᱩᱨᱟᱹ ᱵᱟᱭ ᱞᱟᱫᱮ ᱟᱠᱟᱱᱟ ᱾
+web_fonts_disabled=ᱣᱮᱵᱽ ᱪᱤᱠᱤ ᱵᱟᱝ ᱦᱩᱭ ᱦᱚᱪᱚ ᱠᱟᱱᱟ : ᱵᱷᱤᱛᱤᱨ ᱛᱷᱟᱯᱚᱱ PDF ᱪᱤᱠᱤ ᱵᱮᱵᱷᱟᱨ ᱵᱟᱝ ᱦᱩᱭ ᱠᱮᱭᱟ ᱾
diff --git a/cps/static/locale/sc/viewer.properties b/cps/static/locale/sc/viewer.properties
new file mode 100644
index 000000000..5a6f46cfe
--- /dev/null
+++ b/cps/static/locale/sc/viewer.properties
@@ -0,0 +1,239 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Pàgina anteriore
+previous_label=S'ischeda chi b'est primu
+next.title=Pàgina imbeniente
+next_label=Imbeniente
+
+# LOCALIZATION NOTE (page.title): The tooltip for the pageNumber input.
+page.title=Pàgina
+# LOCALIZATION NOTE (of_pages): "{{pagesCount}}" will be replaced by a number
+# representing the total number of pages in the document.
+of_pages=de {{pagesCount}}
+# LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
+# will be replaced by a number representing the currently visible page,
+# respectively a number representing the total number of pages in the document.
+page_of_pages=({{pageNumber}} de {{pagesCount}})
+
+zoom_out.title=Impitica
+zoom_out_label=Impitica
+zoom_in.title=Ismànnia
+zoom_in_label=Ismànnia
+zoom.title=Ismànnia
+presentation_mode.title=Cola a sa modalidade de presentatzione
+presentation_mode_label=Modalidade de presentatzione
+open_file.title=Aberi s'archìviu
+open_file_label=Abertu
+print.title=Imprenta
+print_label=Imprenta
+download.title=Iscàrriga
+download_label=Iscàrriga
+bookmark.title=Visualizatzione atuale (còpia o aberi in una ventana noa)
+bookmark_label=Visualizatzione atuale
+
+# Secondary toolbar and context menu
+tools.title=Istrumentos
+tools_label=Istrumentos
+first_page.title=Bae a sa prima pàgina
+first_page_label=Bae a sa prima pàgina
+last_page.title=Bae a s'ùrtima pàgina
+last_page_label=Bae a s'ùrtima pàgina
+page_rotate_cw.title=Gira in sensu oràriu
+page_rotate_cw_label=Gira in sensu oràriu
+page_rotate_ccw.title=Gira in sensu anti-oràriu
+page_rotate_ccw_label=Gira in sensu anti-oràriu
+
+cursor_text_select_tool.title=Ativa s'aina de seletzione de testu
+cursor_text_select_tool_label=Aina de seletzione de testu
+cursor_hand_tool.title=Ativa s'aina de manu
+cursor_hand_tool_label=Aina de manu
+
+scroll_page.title=Imprea s'iscurrimentu de pàgina
+scroll_page_label=Iscurrimentu de pàgina
+scroll_vertical.title=Imprea s'iscurrimentu verticale
+scroll_vertical_label=Iscurrimentu verticale
+scroll_horizontal.title=Imprea s'iscurrimentu orizontale
+scroll_horizontal_label=Iscurrimentu orizontale
+scroll_wrapped.title=Imprea s'iscurrimentu continu
+scroll_wrapped_label=Iscurrimentu continu
+
+
+# Document properties dialog box
+document_properties.title=Propiedades de su documentu…
+document_properties_label=Propiedades de su documentu…
+document_properties_file_name=Nòmine de s'archìviu:
+document_properties_file_size=Mannària de s'archìviu:
+# LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
+# will be replaced by the PDF file size in kilobytes, respectively in bytes.
+document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
+# LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
+# will be replaced by the PDF file size in megabytes, respectively in bytes.
+document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
+document_properties_title=Tìtulu:
+document_properties_author=Autoria:
+document_properties_subject=Ogetu:
+document_properties_keywords=Faeddos crae:
+document_properties_creation_date=Data de creatzione:
+document_properties_modification_date=Data de modìfica:
+# LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
+# will be replaced by the creation/modification date, and time, of the PDF file.
+document_properties_date_string={{date}}, {{time}}
+document_properties_creator=Creatzione:
+document_properties_producer=Produtore de PDF:
+document_properties_version=Versione de PDF:
+document_properties_page_count=Contu de pàginas:
+document_properties_page_size=Mannària de sa pàgina:
+document_properties_page_size_unit_inches=pòddighes
+document_properties_page_size_unit_millimeters=mm
+document_properties_page_size_orientation_portrait=verticale
+document_properties_page_size_orientation_landscape=orizontale
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=Lìtera
+document_properties_page_size_name_legal=Legale
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Visualizatzione web lestra:
+document_properties_linearized_yes=Eja
+document_properties_linearized_no=Nono
+document_properties_close=Serra
+
+print_progress_message=Aparitzende s'imprenta de su documentu…
+# LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
+# a numerical per cent value.
+print_progress_percent={{progress}}%
+print_progress_close=Cantzella
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=Ativa/disativa sa barra laterale
+toggle_sidebar_notification2.title=Ativa/disativa sa barra laterale (su documentu cuntenet un'ischema, alligongiados o livellos)
+toggle_sidebar_label=Ativa/disativa sa barra laterale
+document_outline_label=Ischema de su documentu
+attachments.title=Ammustra alligongiados
+attachments_label=Alliongiados
+layers.title=Ammustra livellos (clic dòpiu pro ripristinare totu is livellos a s'istadu predefinidu)
+layers_label=Livellos
+thumbs.title=Ammustra miniaturas
+thumbs_label=Miniaturas
+current_outline_item.title=Agata s'elementu atuale de s'ischema
+current_outline_item_label=Elementu atuale de s'ischema
+findbar.title=Agata in su documentu
+findbar_label=Agata
+
+additional_layers=Livellos additzionales
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Pàgina {{page}}
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Pàgina {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Miniatura de sa pàgina {{page}}
+
+# Find panel button title and messages
+find_input.title=Agata
+find_input.placeholder=Agata in su documentu…
+find_previous.title=Agata s'ocurrèntzia pretzedente de sa fràsia
+find_previous_label=S'ischeda chi b'est primu
+find_next.title=Agata s'ocurrèntzia imbeniente de sa fràsia
+find_next_label=Imbeniente
+find_highlight=Evidèntzia totu
+find_match_case_label=Distinghe intre majùsculas e minùsculas
+find_match_diacritics_label=Respeta is diacrìticos
+find_entire_word_label=Faeddos intreos
+find_reached_top=S'est lòmpidu a su cumintzu de su documentu, si sighit dae su bàsciu
+find_reached_bottom=S'est lòmpidu a s'acabbu de su documentu, si sighit dae s'artu
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} dae {{total}} currispondèntzia
+find_match_count[two]={{current}} dae {{total}} currispondèntzias
+find_match_count[few]={{current}} dae {{total}} currispondèntzias
+find_match_count[many]={{current}} dae {{total}} currispondèntzias
+find_match_count[other]={{current}} dae {{total}} currispondèntzias
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Prus de {{limit}} currispondèntzias
+find_match_count_limit[one]=Prus de {{limit}} currispondèntzia
+find_match_count_limit[two]=Prus de {{limit}} currispondèntzias
+find_match_count_limit[few]=Prus de {{limit}} currispondèntzias
+find_match_count_limit[many]=Prus de {{limit}} currispondèntzias
+find_match_count_limit[other]=Prus de {{limit}} currispondèntzias
+find_not_found=Testu no agatadu
+
+# Error panel labels
+error_more_info=Àteras informatziones
+error_less_info=Prus pagu informatziones
+error_close=Serra
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (build: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Messàgiu: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Archìviu: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Lìnia: {{line}}
+rendering_error=Faddina in sa visualizatzione de sa pàgina.
+
+# Predefined zoom values
+page_scale_auto=Ingrandimentu automàticu
+page_scale_actual=Mannària reale
+# LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
+# numerical scale value.
+page_scale_percent={{scale}}%
+
+# Loading indicator messages
+loading=Carrighende…
+loading_error=Faddina in sa càrriga de su PDF.
+invalid_file_error=Archìviu PDF non vàlidu o corrùmpidu.
+missing_file_error=Ammancat s'archìviu PDF.
+
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
+
+# LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+password_label=Inserta sa crae pro abèrrere custu archìviu PDF.
+password_invalid=Sa crae no est curreta. Torra·bi a proare.
+password_ok=Andat bene
+password_cancel=Cantzella
+
+printing_not_supported=Atentzione: s'imprenta no est funtzionende de su totu in custu navigadore.
+printing_not_ready=Atentzione: su PDF no est istadu carrigadu de su totu pro s'imprenta.
+web_fonts_disabled=Is tipografias web sunt disativadas: is tipografias incrustadas a su PDF non podent èssere impreadas.
diff --git a/cps/static/locale/sco/viewer.properties b/cps/static/locale/sco/viewer.properties
new file mode 100644
index 000000000..656f9950b
--- /dev/null
+++ b/cps/static/locale/sco/viewer.properties
@@ -0,0 +1,248 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Page Afore
+previous_label=Previous
+next.title=Page Efter
+next_label=Neist
+
+# LOCALIZATION NOTE (page.title): The tooltip for the pageNumber input.
+page.title=Page
+# LOCALIZATION NOTE (of_pages): "{{pagesCount}}" will be replaced by a number
+# representing the total number of pages in the document.
+of_pages=o {{pagesCount}}
+# LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
+# will be replaced by a number representing the currently visible page,
+# respectively a number representing the total number of pages in the document.
+page_of_pages=({{pageNumber}} o {{pagesCount}})
+
+zoom_out.title=Zoom Oot
+zoom_out_label=Zoom Oot
+zoom_in.title=Zoom In
+zoom_in_label=Zoom In
+zoom.title=Zoom
+presentation_mode.title=Flit tae Presentation Mode
+presentation_mode_label=Presentation Mode
+open_file.title=Open File
+open_file_label=Open
+print.title=Prent
+print_label=Prent
+download.title=Doonload
+download_label=Doonload
+bookmark.title=View the noo (copy or open in new windae)
+bookmark_label=View The Noo
+
+# Secondary toolbar and context menu
+tools.title=Tools
+tools_label=Tools
+first_page.title=Gang tae First Page
+first_page_label=Gang tae First Page
+last_page.title=Gang tae Lest Page
+last_page_label=Gang tae Lest Page
+page_rotate_cw.title=Rotate Clockwise
+page_rotate_cw_label=Rotate Clockwise
+page_rotate_ccw.title=Rotate Coonterclockwise
+page_rotate_ccw_label=Rotate Coonterclockwise
+
+cursor_text_select_tool.title=Enable Text Walin Tool
+cursor_text_select_tool_label=Text Walin Tool
+cursor_hand_tool.title=Enable Haun Tool
+cursor_hand_tool_label=Haun Tool
+
+scroll_vertical.title=Yaise Vertical Scrollin
+scroll_vertical_label=Vertical Scrollin
+scroll_horizontal.title=Yaise Horizontal Scrollin
+scroll_horizontal_label=Horizontal Scrollin
+scroll_wrapped.title=Yaise Wrapped Scrollin
+scroll_wrapped_label=Wrapped Scrollin
+
+spread_none.title=Dinnae jyn page spreids
+spread_none_label=Nae Spreids
+spread_odd.title=Jyn page spreids stertin wi odd-numbered pages
+spread_odd_label=Odd Spreids
+spread_even.title=Jyn page spreids stertin wi even-numbered pages
+spread_even_label=Even Spreids
+
+# Document properties dialog box
+document_properties.title=Document Properties…
+document_properties_label=Document Properties…
+document_properties_file_name=File nemme:
+document_properties_file_size=File size:
+# LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
+# will be replaced by the PDF file size in kilobytes, respectively in bytes.
+document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
+# LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
+# will be replaced by the PDF file size in megabytes, respectively in bytes.
+document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
+document_properties_title=Title:
+document_properties_author=Author:
+document_properties_subject=Subjeck:
+document_properties_keywords=Keywirds:
+document_properties_creation_date=Date o Makkin:
+document_properties_modification_date=Date o Chynges:
+# LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
+# will be replaced by the creation/modification date, and time, of the PDF file.
+document_properties_date_string={{date}}, {{time}}
+document_properties_creator=Makker:
+document_properties_producer=PDF Producer:
+document_properties_version=PDF Version:
+document_properties_page_count=Page Coont:
+document_properties_page_size=Page Size:
+document_properties_page_size_unit_inches=in
+document_properties_page_size_unit_millimeters=mm
+document_properties_page_size_orientation_portrait=portrait
+document_properties_page_size_orientation_landscape=landscape
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=Letter
+document_properties_page_size_name_legal=Legal
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Fast Wab View:
+document_properties_linearized_yes=Aye
+document_properties_linearized_no=Naw
+document_properties_close=Sneck
+
+print_progress_message=Reddin document fur prentin…
+# LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
+# a numerical per cent value.
+print_progress_percent={{progress}}%
+print_progress_close=Stap
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=Toggle Sidebaur
+toggle_sidebar_notification2.title=Toggle Sidebaur (document conteens ootline/attachments/layers)
+toggle_sidebar_label=Toggle Sidebaur
+document_outline.title=Kythe Document Ootline (double-click fur tae oot-fauld/in-fauld aw items)
+document_outline_label=Document Ootline
+attachments.title=Kythe Attachments
+attachments_label=Attachments
+layers.title=Kythe Layers (double-click fur tae reset aw layers tae the staunart state)
+layers_label=Layers
+thumbs.title=Kythe Thumbnails
+thumbs_label=Thumbnails
+current_outline_item.title=Find Current Ootline Item
+current_outline_item_label=Current Ootline Item
+findbar.title=Find in Document
+findbar_label=Find
+
+additional_layers=Mair Layers
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Page {{page}}
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Page {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Thumbnail o Page {{page}}
+
+# Find panel button title and messages
+find_input.title=Find
+find_input.placeholder=Find in document…
+find_previous.title=Airt oot the last time this phrase occurred
+find_previous_label=Previous
+find_next.title=Airt oot the neist time this phrase occurs
+find_next_label=Neist
+find_highlight=Highlicht aw
+find_match_case_label=Match case
+find_entire_word_label=Hale Wirds
+find_reached_top=Raxed tap o document, went on fae the dowp end
+find_reached_bottom=Raxed end o document, went on fae the tap
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} o {{total}} match
+find_match_count[two]={{current}} o {{total}} matches
+find_match_count[few]={{current}} o {{total}} matches
+find_match_count[many]={{current}} o {{total}} matches
+find_match_count[other]={{current}} o {{total}} matches
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Mair nor {{limit}} matches
+find_match_count_limit[one]=Mair nor {{limit}} match
+find_match_count_limit[two]=Mair nor {{limit}} matches
+find_match_count_limit[few]=Mair nor {{limit}} matches
+find_match_count_limit[many]=Mair nor {{limit}} matches
+find_match_count_limit[other]=Mair nor {{limit}} matches
+find_not_found=Phrase no fund
+
+# Error panel labels
+error_more_info=Mair Information
+error_less_info=Less Information
+error_close=Sneck
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (build: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Message: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Stack: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=File: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Line: {{line}}
+rendering_error=A mishanter tuik place while renderin the page.
+
+# Predefined zoom values
+page_scale_width=Page Width
+page_scale_fit=Page Fit
+page_scale_auto=Automatic Zoom
+page_scale_actual=Actual Size
+# LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
+# numerical scale value.
+page_scale_percent={{scale}}%
+
+# Loading indicator messages
+loading=Loadin…
+loading_error=An mishanter tuik place while loadin the PDF.
+invalid_file_error=No suithfest or camshauchlet PDF file.
+missing_file_error=PDF file tint.
+unexpected_response_error=Unexpectit server repone.
+
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
+
+# LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type.alt=[{{type}} Annotation]
+password_label=Inpit the passwird fur tae open this PDF file.
+password_invalid=Passwird no suithfest. Gonnae gie it anither shot.
+password_ok=OK
+password_cancel=Stap
+
+printing_not_supported=Tak tent: Prentin isnae richt supportit by this stravaiger.
+printing_not_ready=Tak tent: The PDF isnae richt loadit fur prentin.
+web_fonts_disabled=Wab fonts are disabled: cannae yaise embeddit PDF fonts.
diff --git a/cps/static/locale/si/viewer.properties b/cps/static/locale/si/viewer.properties
index 9a1d1e8bc..88e6efb21 100644
--- a/cps/static/locale/si/viewer.properties
+++ b/cps/static/locale/si/viewer.properties
@@ -13,10 +13,10 @@
 # limitations under the License.
 
 # Main toolbar buttons (tooltips and alt text for images)
-previous.title=මීට පෙර පිටුව
-previous_label=පෙර
-next.title=මීළඟ පිටුව
-next_label=මීළඟ
+previous.title=කලින් පිටුව
+previous_label=කලින්
+next.title=ඊළඟ පිටුව
+next_label=ඊළඟ
 
 # LOCALIZATION NOTE (page.title): The tooltip for the pageNumber input.
 page.title=පිටුව
@@ -26,69 +26,61 @@ page.title=පිටුව
 # will be replaced by a number representing the currently visible page,
 # respectively a number representing the total number of pages in the document.
 
-zoom_out.title=කුඩා කරන්න
-zoom_out_label=කුඩා කරන්න
-zoom_in.title=විශාල කරන්න
-zoom_in_label=විශාල කරන්න
-zoom.title=විශාලණය
-presentation_mode.title=ඉදිරිපත්කිරීම් ප්‍රකාරය වෙත මාරුවන්න
-presentation_mode_label=ඉදිරිපත්කිරීම් ප්‍රකාරය
-open_file.title=ගොනුව විවෘත කරන්න
-open_file_label=විවෘත කරන්න
+zoom_out.title=කුඩාලනය
+zoom_out_label=කුඩාලනය
+zoom_in.title=විශාලනය
+zoom_in_label=විශාලනය
+zoom.title=විශාල කරන්න
+presentation_mode.title=සමර්පණ ප්‍රකාරය වෙත මාරුවන්න
+presentation_mode_label=සමර්පණ ප්‍රකාරය
+open_file.title=ගොනුව අරින්න
+open_file_label=අරින්න
 print.title=මුද්‍රණය
 print_label=මුද්‍රණය
 download.title=බාගන්න
 download_label=බාගන්න
-bookmark.title=දැනට ඇති දසුන (පිටපත් කරන්න හෝ නව කවුළුවක විවෘත කරන්න)
-bookmark_label=දැනට ඇති දසුන
+bookmark.title=වත්මන් දැක්ම (පිටපත් කරන්න හෝ නව කවුළුවක අරින්න)
+bookmark_label=වත්මන් දැක්ම
 
 # Secondary toolbar and context menu
 tools.title=මෙවලම්
 tools_label=මෙවලම්
 first_page.title=මුල් පිටුවට යන්න
-first_page.label=මුල් පිටුවට යන්න
 first_page_label=මුල් පිටුවට යන්න
 last_page.title=අවසන් පිටුවට යන්න
-last_page.label=අවසන් පිටුවට යන්න
 last_page_label=අවසන් පිටුවට යන්න
-page_rotate_cw.title=දක්ශිණාවර්තව භ්‍රමණය
-page_rotate_cw.label=දක්ශිණාවර්තව භ්‍රමණය
-page_rotate_cw_label=දක්ශිණාවර්තව භ්‍රමණය
-page_rotate_ccw.title=වාමාවර්තව භ්‍රමණය
-page_rotate_ccw.label=වාමාවර්තව භ්‍රමණය
-page_rotate_ccw_label=වාමාවර්තව භ්‍රමණය
 
 cursor_hand_tool_label=අත් මෙවලම
 
 
 
 # Document properties dialog box
-document_properties.title=ලේඛන වත්කම්...
-document_properties_label=ලේඛන වත්කම්...
-document_properties_file_name=ගොනු නම:
-document_properties_file_size=ගොනු ප්‍රමාණය:
+document_properties.title=ලේඛනයේ ගුණාංග…
+document_properties_label=ලේඛනයේ ගුණාංග…
+document_properties_file_name=ගොනුවේ නම:
+document_properties_file_size=ගොනුවේ ප්‍රමාණය:
 # LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in kilobytes, respectively in bytes.
-document_properties_kb={{size_kb}} KB ({{size_b}} බයිට)
+document_properties_kb=කි.බ. {{size_kb}} (බයිට {{size_b}})
 # LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in megabytes, respectively in bytes.
-document_properties_mb={{size_mb}} MB ({{size_b}} බයිට)
-document_properties_title=සිරස්තලය:
-document_properties_author=කතෲ
+document_properties_mb=මෙ.බ. {{size_mb}} (බයිට {{size_b}})
+document_properties_title=සිරැසිය:
+document_properties_author=කතෘ:
 document_properties_subject=මාතෘකාව:
-document_properties_keywords=යතුරු වදන්:
-document_properties_creation_date=නිර්මිත දිනය:
-document_properties_modification_date=වෙනස්කල දිනය:
+document_properties_keywords=මූල පද:
+document_properties_creation_date=සෑදූ දිනය:
+document_properties_modification_date=සංශෝධිත දිනය:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
 # will be replaced by the creation/modification date, and time, of the PDF file.
 document_properties_date_string={{date}}, {{time}}
-document_properties_creator=නිර්මාපක:
-document_properties_producer=PDF නිශ්පාදක:
-document_properties_version=PDF නිකුතුව:
+document_properties_creator=නිර්මාතෘ:
+document_properties_producer=පීඩීඑෆ් සම්පාදක:
+document_properties_version=පීඩීඑෆ් අනුවාදය:
 document_properties_page_count=පිටු ගණන:
-document_properties_page_size=පිටුවේ විශාලත්වය:
+document_properties_page_size=පිටුවේ තරම:
 document_properties_page_size_unit_inches=අඟල්
-document_properties_page_size_unit_millimeters=මිමි
+document_properties_page_size_unit_millimeters=මි.මී.
 document_properties_page_size_orientation_portrait=සිරස්
 document_properties_page_size_orientation_landscape=තිරස්
 document_properties_page_size_name_a3=A3
@@ -103,12 +95,12 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 document_properties_page_size_dimension_name_string={{width}}×{{height}}{{unit}}{{name}}{{orientation}}
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
-document_properties_linearized=වේගවත් ජාල දසුන:
+document_properties_linearized=වේගවත් වියමන දැක්ම:
 document_properties_linearized_yes=ඔව්
 document_properties_linearized_no=නැහැ
 document_properties_close=වසන්න
 
-print_progress_message=ලේඛනය මුද්‍රණය සඳහා සූදානම් කරමින්…
+print_progress_message=මුද්‍රණය සඳහා ලේඛනය සූදානම් වෙමින්…
 # LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
 # a numerical per cent value.
 print_progress_percent={{progress}}%
@@ -117,35 +109,33 @@ print_progress_close=අවලංගු කරන්න
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
-toggle_sidebar.title=පැති තීරුවට මාරුවන්න
-toggle_sidebar_label=පැති තීරුවට මාරුවන්න
-document_outline_label=ලේඛනයේ පිට මායිම
-attachments.title=ඇමිණුම් පෙන්වන්න
-attachments_label=ඇමිණුම්
+document_outline_label=ලේඛනයේ වටසන
+attachments.title=ඇමුණුම් පෙන්වන්න
+attachments_label=ඇමුණුම්
 thumbs.title=සිඟිති රූ පෙන්වන්න
 thumbs_label=සිඟිති රූ
-findbar.title=ලේඛනය තුළ සොයන්න
+findbar.title=ලේඛනයෙහි සොයන්න
 findbar_label=සොයන්න
 
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
 thumb_page_title=පිටුව {{page}}
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
-thumb_page_canvas=පිටුවෙ සිඟිත රූව {{page}}
+thumb_page_canvas=පිටුවේ සිඟිත රූව {{page}}
 
 # Find panel button title and messages
 find_input.title=සොයන්න
-find_previous.title=මේ වාක්‍ය ඛණ්ඩය මීට පෙර යෙදුණු ස්ථානය සොයන්න
-find_previous_label=පෙර:
-find_next.title=මේ වාක්‍ය ඛණ්ඩය මීළඟට යෙදෙන ස්ථානය සොයන්න
-find_next_label=මීළඟ
+find_previous.title=මෙම වැකිකඩ කලින් යෙදුණු ස්ථානය සොයන්න
+find_previous_label=කලින්
+find_next.title=මෙම වැකිකඩ ඊළඟට යෙදෙන ස්ථානය සොයන්න
+find_next_label=ඊළඟ
 find_highlight=සියල්ල උද්දීපනය
-find_match_case_label=අකුරු ගළපන්න
-find_entire_word_label=සම්පූර්ණ වචන
-find_reached_top=පිටුවේ ඉහළ කෙළවරට ලගාවිය, පහළ සිට ඉදිරියට යමින්
-find_reached_bottom=පිටුවේ පහළ කෙළවරට ලගාවිය, ඉහළ සිට ඉදිරියට යමින්
+find_entire_word_label=සමස්ත වචන
+find_reached_top=ලේඛනයේ මුදුනට ළඟා විය, පහළ සිට ඉහළට
+find_reached_bottom=ලේඛනයේ අවසානයට ළඟා විය, ඉහළ සිට පහළට
 # LOCALIZATION NOTE (find_match_count): The supported plural forms are
 # [one|two|few|many|other], with [other] as the default value.
 # "{{current}}" and "{{total}}" will be replaced by a number representing the
@@ -154,54 +144,61 @@ find_reached_bottom=පිටුවේ පහළ කෙළවරට ලගාව
 # LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
 # [zero|one|two|few|many|other], with [other] as the default value.
 # "{{limit}}" will be replaced by a numerical value.
-find_match_count_limit[zero]=ගැලපුම් {{limit}} ට වඩා
-find_not_found=ඔබ සෙව් වචන හමු නොවීය
+find_match_count_limit[zero]=ගැළපීම් {{limit}} කට වඩා
+find_not_found=වැකිකඩ හමු නොවිණි
 
 # Error panel labels
-error_more_info=බොහෝ තොරතුරු
+error_more_info=තව තොරතුරු
 error_less_info=අවම තොරතුරු
 error_close=වසන්න
 # LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
 # replaced by the PDF.JS version and build ID.
-error_version_info=PDF.js v{{version}} (නිකුතුව: {{build}})
+error_version_info=පීඩීඑෆ්.js v{{version}} (තැනීම: {{build}})
 # LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
 # english string describing the error.
 error_message=පණිවිඩය: {{message}}
 # LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
 # trace.
-error_stack=Stack: {{stack}}
 # LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
 error_file=ගොනුව: {{file}}
 # LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
 error_line=පේළිය: {{line}}
-rendering_error=පිටුව රෙන්ඩර් විමේදි ගැටලුවක් හට ගැනුණි.
 
 # Predefined zoom values
 page_scale_width=පිටුවේ පළල
-page_scale_fit=පිටුවට සුදුසු ලෙස
-page_scale_auto=ස්වයංක්‍රීය විශාලණය
-page_scale_actual=නියමිත ප්‍රමාණය
+page_scale_auto=ස්වයංක්‍රීය විශාලනය
+page_scale_actual=සැබෑ ප්‍රමාණය
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=දෝෂය
-loading_error=PDF පූරණය විමේදි දෝෂයක් හට ගැනුණි.
-invalid_file_error=දූශිත හෝ සාවද්‍ය PDF ගොනුව.
-missing_file_error=නැතිවූ PDF ගොනුව.
-unexpected_response_error=බලාපොරොත්තු නොවූ සේවාදායක ප්‍රතිචාරය.
+loading_error=පීඩීඑෆ් පූරණය කිරීමේදී දෝෂයක් සිදු විය.
+invalid_file_error=වලංගු නොවන හෝ හානිවූ පීඩීඑෆ් ගොනුවකි.
+missing_file_error=මඟහැරුණු පීඩීඑෆ් ගොනුවකි.
+unexpected_response_error=අනපේක්‍ෂිත සේවාදායක ප්‍රතිචාරයකි.
+
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
 
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
-text_annotation_type.alt=[{{type}} විස්තරය]
-password_label=මෙම PDF ගොනුව විවෘත කිරීමට මුරපදය ඇතුළත් කරන්න.
-password_invalid=වැරදි මුරපදයක්. කරුණාකර නැවත උත්සහ කරන්න.
+password_label=මෙම පීඩීඑෆ් ගොනුව විවෘත කිරීමට මුරපදය යොදන්න.
+password_invalid=වැරදි මුරපදයකි. නැවත උත්සාහ කරන්න.
 password_ok=හරි
-password_cancel=එපා
+password_cancel=අවලංගු
 
-printing_not_supported=අවවාදයයි: මෙම ගවේශකය මුද්‍රණය සඳහා සම්පූර්ණයෙන් සහය නොදක්වයි.
-printing_not_ready=අවවාදයයි: මුද්‍රණය සඳහා PDF සම්පූර්ණයෙන් පූර්ණය වී නොමැත.
-web_fonts_disabled=ජාල අකුරු අක්‍රීයයි: තිළැලි PDF අකුරු භාවිත කළ නොහැක.
+printing_not_supported=අවවාදයයි: මෙම අතිරික්සුව මුද්‍රණය සඳහා හොඳින් සහාය නොදක්වයි.
+printing_not_ready=අවවාදයයි: මුද්‍රණයට පීඩීඑෆ් ගොනුව සම්පූර්ණයෙන් පූරණය වී නැත.
+web_fonts_disabled=වියමන අකුරු අබලයි: පීඩීඑෆ් වෙත කාවැද්දූ අකුරු භාවිතා කළ නොහැකිය.
+
+# Editor
+
+
+# Editor Parameters
+
+# Editor Parameters
+
+# Editor aria
diff --git a/cps/static/locale/sk/viewer.properties b/cps/static/locale/sk/viewer.properties
index d86d77cfa..854496849 100644
--- a/cps/static/locale/sk/viewer.properties
+++ b/cps/static/locale/sk/viewer.properties
@@ -39,8 +39,8 @@ open_file.title=Otvoriť súbor
 open_file_label=Otvoriť
 print.title=Tlačiť
 print_label=Tlačiť
-download.title=Prevziať
-download_label=Prevziať
+download.title=Stiahnuť
+download_label=Stiahnuť
 bookmark.title=Aktuálne zobrazenie (kopírovať alebo otvoriť v novom okne)
 bookmark_label=Aktuálne zobrazenie
 
@@ -48,16 +48,12 @@ bookmark_label=Aktuálne zobrazenie
 tools.title=Nástroje
 tools_label=Nástroje
 first_page.title=Prejsť na prvú stranu
-first_page.label=Prejsť na prvú stranu
 first_page_label=Prejsť na prvú stranu
 last_page.title=Prejsť na poslednú stranu
-last_page.label=Prejsť na poslednú stranu
 last_page_label=Prejsť na poslednú stranu
 page_rotate_cw.title=Otočiť v smere hodinových ručičiek
-page_rotate_cw.label=Otočiť v smere hodinových ručičiek
 page_rotate_cw_label=Otočiť v smere hodinových ručičiek
 page_rotate_ccw.title=Otočiť proti smeru hodinových ručičiek
-page_rotate_ccw.label=Otočiť proti smeru hodinových ručičiek
 page_rotate_ccw_label=Otočiť proti smeru hodinových ručičiek
 
 cursor_text_select_tool.title=Povoliť výber textu
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Výber textu
 cursor_hand_tool.title=Povoliť nástroj ruka
 cursor_hand_tool_label=Nástroj ruka
 
+scroll_page.title=Použiť rolovanie po stránkach
+scroll_page_label=Rolovanie po stránkach
 scroll_vertical.title=Používať zvislé posúvanie
 scroll_vertical_label=Zvislé posúvanie
 scroll_horizontal.title=Používať vodorovné posúvanie
@@ -137,19 +135,24 @@ print_progress_close=Zrušiť
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Prepnúť bočný panel
-toggle_sidebar_notification.title=Prepnúť bočný panel (dokument obsahuje osnovu/prílohy)
+toggle_sidebar_notification2.title=Prepnúť bočný panel (dokument obsahuje osnovu/prílohy/vrstvy)
 toggle_sidebar_label=Prepnúť bočný panel
 document_outline.title=Zobraziť osnovu dokumentu (dvojitým kliknutím rozbalíte/zbalíte všetky položky)
 document_outline_label=Osnova dokumentu
 attachments.title=Zobraziť prílohy
 attachments_label=Prílohy
+layers.title=Zobraziť vrstvy (dvojitým kliknutím uvediete všetky vrstvy do pôvodného stavu)
+layers_label=Vrstvy
 thumbs.title=Zobraziť miniatúry
 thumbs_label=Miniatúry
+current_outline_item.title=Nájsť aktuálnu položku v osnove
+current_outline_item_label=Aktuálna položka v osnove
 findbar.title=Hľadať v dokumente
 findbar_label=Hľadať
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Strana {{page}}
+additional_layers=Ďalšie vrstvy
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Strana {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Vyhľadať ďalší výskyt reťazca
 find_next_label=Ďalšie
 find_highlight=Zvýrazniť všetky
 find_match_case_label=Rozlišovať veľkosť písmen
+find_match_diacritics_label=Rozlišovať diakritiku
 find_entire_word_label=Celé slová
 find_reached_top=Bol dosiahnutý začiatok stránky, pokračuje sa od konca
 find_reached_bottom=Bol dosiahnutý koniec stránky, pokračuje sa od začiatku
@@ -194,7 +198,7 @@ find_match_count_limit[other]=Viac než {{limit}} výsledkov
 find_not_found=Výraz nebol nájdený
 
 # Error panel labels
-error_more_info=Viac informácií
+error_more_info=Ďalšie informácie
 error_less_info=Menej informácií
 error_close=Zavrieť
 # LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
@@ -222,7 +226,7 @@ page_scale_actual=Skutočná veľkosť
 page_scale_percent={{scale}} %
 
 # Loading indicator messages
-loading_error_indicator=Chyba
+loading=Načítava sa…
 loading_error=Počas načítavania dokumentu PDF sa vyskytla chyba.
 invalid_file_error=Neplatný alebo poškodený súbor PDF.
 missing_file_error=Chýbajúci súbor PDF.
@@ -245,3 +249,33 @@ password_cancel=Zrušiť
 printing_not_supported=Upozornenie: tlač nie je v tomto prehliadači plne podporovaná.
 printing_not_ready=Upozornenie: súbor PDF nie je plne načítaný pre tlač.
 web_fonts_disabled=Webové písma sú vypnuté: nie je možné použiť písma vložené do súboru PDF.
+
+# Editor
+editor_none.title=Zakázať úpravu poznámok
+editor_none_label=Zakázať úpravy
+editor_free_text.title=Pridať textovú poznámku
+editor_free_text_label=Textová poznámka
+editor_ink.title=Pridať poznámku písanú rukou
+editor_ink_label=Poznámka písaná rukou
+
+freetext_default_content=Zadajte nejaký text…
+
+free_text_default_content=Zadajte text…
+
+# Editor Parameters
+editor_free_text_font_color=Farba písma
+editor_free_text_font_size=Veľkosť písma
+editor_ink_line_color=Farba čiary
+editor_ink_line_thickness=Hrúbka čiary
+
+# Editor Parameters
+editor_free_text_color=Farba
+editor_free_text_size=Veľkosť
+editor_ink_color=Farba
+editor_ink_thickness=Hrúbka
+editor_ink_opacity=Priehľadnosť
+
+# Editor aria
+editor_free_text_aria_label=Textový editor
+editor_ink_aria_label=Editor pre písanie rukou
+editor_ink_canvas_aria_label=Obrázok vytvorený používateľom
diff --git a/cps/static/locale/sl/viewer.properties b/cps/static/locale/sl/viewer.properties
index 25a5e9c50..3b0052ceb 100644
--- a/cps/static/locale/sl/viewer.properties
+++ b/cps/static/locale/sl/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Trenutni pogled
 tools.title=Orodja
 tools_label=Orodja
 first_page.title=Pojdi na prvo stran
-first_page.label=Pojdi na prvo stran
 first_page_label=Pojdi na prvo stran
 last_page.title=Pojdi na zadnjo stran
-last_page.label=Pojdi na zadnjo stran
 last_page_label=Pojdi na zadnjo stran
 page_rotate_cw.title=Zavrti v smeri urnega kazalca
-page_rotate_cw.label=Zavrti v smeri urnega kazalca
 page_rotate_cw_label=Zavrti v smeri urnega kazalca
 page_rotate_ccw.title=Zavrti v nasprotni smeri urnega kazalca
-page_rotate_ccw.label=Zavrti v nasprotni smeri urnega kazalca
 page_rotate_ccw_label=Zavrti v nasprotni smeri urnega kazalca
 
 cursor_text_select_tool.title=Omogoči orodje za izbor besedila
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Orodje za izbor besedila
 cursor_hand_tool.title=Omogoči roko
 cursor_hand_tool_label=Roka
 
+scroll_page.title=Uporabi drsenje po strani
+scroll_page_label=Drsenje po strani
 scroll_vertical.title=Uporabi navpično drsenje
 scroll_vertical_label=Navpično drsenje
 scroll_horizontal.title=Uporabi vodoravno drsenje
@@ -137,19 +135,24 @@ print_progress_close=Prekliči
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Preklopi stransko vrstico
-toggle_sidebar_notification.title=Preklopi stransko vrstico (dokument vsebuje oris/priponke)
+toggle_sidebar_notification2.title=Preklopi stransko vrstico (dokument vsebuje oris/priponke/plasti)
 toggle_sidebar_label=Preklopi stransko vrstico
 document_outline.title=Prikaži oris dokumenta (dvokliknite za razširitev/strnitev vseh predmetov)
 document_outline_label=Oris dokumenta
 attachments.title=Prikaži priponke
 attachments_label=Priponke
+layers.title=Prikaži plasti (dvokliknite za ponastavitev vseh plasti na privzeto stanje)
+layers_label=Plasti
 thumbs.title=Prikaži sličice
 thumbs_label=Sličice
+current_outline_item.title=Najdi trenutni predmet orisa
+current_outline_item_label=Trenutni predmet orisa
 findbar.title=Iskanje po dokumentu
 findbar_label=Najdi
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Stran {{page}}
+additional_layers=Dodatne plasti
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Stran {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Najdi naslednjo ponovitev iskanega
 find_next_label=Najdi naprej
 find_highlight=Označi vse
 find_match_case_label=Razlikuj velike/male črke
+find_match_diacritics_label=Razlikuj diakritične znake
 find_entire_word_label=Cele besede
 find_reached_top=Dosežen začetek dokumenta iz smeri konca
 find_reached_bottom=Doseženo konec dokumenta iz smeri začetka
@@ -222,7 +226,7 @@ page_scale_actual=Dejanska velikost
 page_scale_percent={{scale}} %
 
 # Loading indicator messages
-loading_error_indicator=Napaka
+loading=Nalaganje …
 loading_error=Med nalaganjem datoteke PDF je prišlo do napake.
 invalid_file_error=Neveljavna ali pokvarjena datoteka PDF.
 missing_file_error=Ni datoteke PDF.
@@ -245,3 +249,33 @@ password_cancel=Prekliči
 printing_not_supported=Opozorilo: ta brskalnik ne podpira vseh možnosti tiskanja.
 printing_not_ready=Opozorilo: PDF ni v celoti naložen za tiskanje.
 web_fonts_disabled=Spletne pisave so onemogočene: vgradnih pisav za PDF ni mogoče uporabiti.
+
+# Editor
+editor_none.title=Onemogoči urejanje pripomb
+editor_none_label=Onemogoči urejanje
+editor_free_text.title=Dodaj opombo FreeText
+editor_free_text_label=Opomba FreeText
+editor_ink.title=Dodaj opombo z rokopisom
+editor_ink_label=Opomba z rokopisom
+
+freetext_default_content=Vnesite besedilo …
+
+free_text_default_content=Vnesite besedilo …
+
+# Editor Parameters
+editor_free_text_font_color=Barva pisave
+editor_free_text_font_size=Velikost pisave
+editor_ink_line_color=Barva črte
+editor_ink_line_thickness=Debelina črte
+
+# Editor Parameters
+editor_free_text_color=Barva
+editor_free_text_size=Velikost
+editor_ink_color=Barva
+editor_ink_thickness=Debelina
+editor_ink_opacity=Neprosojnost
+
+# Editor aria
+editor_free_text_aria_label=Urejevalnik FreeText
+editor_ink_aria_label=Urejevalnik s črnilom
+editor_ink_canvas_aria_label=Uporabnikova slika
diff --git a/cps/static/locale/son/viewer.properties b/cps/static/locale/son/viewer.properties
index 683ed14d4..bd5e5ac7e 100644
--- a/cps/static/locale/son/viewer.properties
+++ b/cps/static/locale/son/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Sohõ gunaroo
 tools.title=Goyjinawey
 tools_label=Goyjinawey
 first_page.title=Koy moo jinaa ga
-first_page.label=Koy moo jinaa ga
 first_page_label=Koy moo jinaa ga
 last_page.title=Koy moo koraa ga
-last_page.label=Koy moo koraa ga
 last_page_label=Koy moo koraa ga
 page_rotate_cw.title=Kuubi kanbe guma here
-page_rotate_cw.label=Kuubi kanbe guma here
 page_rotate_cw_label=Kuubi kanbe guma here
 page_rotate_ccw.title=Kuubi kanbe wowa here
-page_rotate_ccw.label=Kuubi kanbe wowa here
 page_rotate_ccw_label=Kuubi kanbe wowa here
 
 
@@ -97,7 +93,6 @@ print_progress_close=Naŋ
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Kanjari ceraw zuu
-toggle_sidebar_notification.title=Kanjari ceraw-zuu (takaddaa goo nda filla-boŋ/hangandiyaŋ)
 toggle_sidebar_label=Kanjari ceraw zuu
 document_outline.title=Takaddaa korfur alhaaloo cebe (naagu cee hinka ka haya-izey kul hayandi/kankamandi)
 document_outline_label=Takadda filla-boŋ
@@ -157,8 +152,6 @@ page_scale_actual=Adadu cimi
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Firka
 loading_error=Firka bangay kaŋ PDF goo ma zumandi.
 invalid_file_error=PDF tuku laala wala laybante.
 missing_file_error=PDF tuku kumante.
diff --git a/cps/static/locale/sq/viewer.properties b/cps/static/locale/sq/viewer.properties
index f0710af5f..3ff4e4d24 100644
--- a/cps/static/locale/sq/viewer.properties
+++ b/cps/static/locale/sq/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Pamja e Tanishme
 tools.title=Mjete
 tools_label=Mjete
 first_page.title=Kaloni te Faqja e Parë
-first_page.label=Kaloni te Faqja e Parë
 first_page_label=Kaloni te Faqja e Parë
 last_page.title=Kaloni te Faqja e Fundit
-last_page.label=Kaloni te Faqja e Fundit
 last_page_label=Kaloni te Faqja e Fundit
 page_rotate_cw.title=Rrotullojeni Në Kahun Orar
-page_rotate_cw.label=Rrotulloje Në Kahun Orar
 page_rotate_cw_label=Rrotulloje Në Kahun Orar
 page_rotate_ccw.title=Rrotullojeni Në Kahun Kundërorar
-page_rotate_ccw.label=Rrotulloje Në Kahun Kundërorar
 page_rotate_ccw_label=Rrotulloje Në Kahun Kundërorar
 
 cursor_text_select_tool.title=Aktivizo Mjet Përzgjedhjeje Teksti
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Mjet Përzgjedhjeje Teksti
 cursor_hand_tool.title=Aktivizo Mjetin Dorë
 cursor_hand_tool_label=Mjeti Dorë
 
+scroll_page.title=Përdor Rrëshqitje Në Faqe
+scroll_page_label=Rrëshqitje Në Faqe
 scroll_vertical.title=Përdor Rrëshqitje Vertikale
 scroll_vertical_label=Rrëshqitje Vertikale
 scroll_horizontal.title=Përdor Rrëshqitje Horizontale
@@ -116,6 +114,7 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Parje e Shpjetë në Web:
 document_properties_linearized_yes=Po
 document_properties_linearized_no=Jo
 document_properties_close=Mbylleni
@@ -130,19 +129,24 @@ print_progress_close=Anuloje
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Shfaqni/Fshihni Anështyllën
-toggle_sidebar_notification.title=Shfaqni Anështyllën (dokumenti përmban përvijim/bashkëngjitje)
+toggle_sidebar_notification2.title=Hap/Mbyll Anështylë (dokumenti përmban përvijim/nashkëngjitje/shtresa)
 toggle_sidebar_label=Shfaq/Fshih Anështyllën
 document_outline.title=Shfaqni Përvijim Dokumenti (dyklikoni që të shfaqen/fshihen krejt elementët)
 document_outline_label=Përvijim Dokumenti
 attachments.title=Shfaqni Bashkëngjitje
 attachments_label=Bashkëngjitje
+layers.title=Shfaq Shtresa (dyklikoni që të rikthehen krejt shtresat në gjendjen e tyre parazgjedhje)
+layers_label=Shtresa
 thumbs.title=Shfaqni Miniatura
 thumbs_label=Miniatura
+current_outline_item.title=Gjej Objektin e Tanishëm të Përvijuar
+current_outline_item_label=Objekt i Tanishëm i Përvijuar
 findbar.title=Gjeni në Dokument
 findbar_label=Gjej
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Faqja {{page}}
+additional_layers=Shtresa Shtesë
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Faqja {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -215,7 +219,7 @@ page_scale_actual=Madhësia Faktike
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Gabim
+loading=Po ngarkohet…
 loading_error=Ndodhi një gabim gjatë ngarkimit të PDF-së.
 invalid_file_error=Kartelë PDF e pavlefshme ose e dëmtuar.
 missing_file_error=Kartelë PDF që mungon.
diff --git a/cps/static/locale/sr/viewer.properties b/cps/static/locale/sr/viewer.properties
index 8c4e92411..3f38aebd0 100644
--- a/cps/static/locale/sr/viewer.properties
+++ b/cps/static/locale/sr/viewer.properties
@@ -41,23 +41,19 @@ print.title=Штампај
 print_label=Штампај
 download.title=Преузми
 download_label=Преузми
-bookmark.title=Тренутни приказ (копирај или отвори нови прозор)
+bookmark.title=Тренутни приказ (копирај или отвори у новом прозору)
 bookmark_label=Тренутни приказ
 
 # Secondary toolbar and context menu
 tools.title=Алатке
 tools_label=Алатке
 first_page.title=Иди на прву страницу
-first_page.label=Иди на прву страницу
 first_page_label=Иди на прву страницу
 last_page.title=Иди на последњу страницу
-last_page.label=Иди на последњу страницу
 last_page_label=Иди на последњу страницу
 page_rotate_cw.title=Ротирај у смеру казаљке на сату
-page_rotate_cw.label=Ротирај у смеру казаљке на сату
 page_rotate_cw_label=Ротирај у смеру казаљке на сату
 page_rotate_ccw.title=Ротирај у смеру супротном од казаљке на сату
-page_rotate_ccw.label=Ротирај у смеру супротном од казаљке на сату
 page_rotate_ccw_label=Ротирај у смеру супротном од казаљке на сату
 
 cursor_text_select_tool.title=Омогући алат за селектовање текста
@@ -137,19 +133,24 @@ print_progress_close=Откажи
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Прикажи додатну палету
-toggle_sidebar_notification.title=Прикажи додатну траку (докуменат садржи оквире/прилоге)
+toggle_sidebar_notification2.title=Прикажи/сакриј бочну траку (документ садржи контуру/прилоге/слојеве)
 toggle_sidebar_label=Прикажи додатну палету
-document_outline.title=Прикажи контуру документа (дупли клик за проширење/скупљање елемената)
+document_outline.title=Прикажи структуру документа (двоструким кликом проширујете/скупљате све ставке)
 document_outline_label=Контура документа
 attachments.title=Прикажи прилоге
 attachments_label=Прилози
+layers.title=Прикажи слојеве (дупли клик за враћање свих слојева у подразумевано стање)
+layers_label=Слојеви
 thumbs.title=Прикажи сличице
 thumbs_label=Сличице
+current_outline_item.title=Пронађите тренутни елемент структуре
+current_outline_item_label=Тренутна контура
 findbar.title=Пронађи у документу
 findbar_label=Пронађи
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Страница {{page}}
+additional_layers=Додатни слојеви
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Страница {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -161,9 +162,9 @@ thumb_page_canvas=Сличица од странице {{page}}
 # Find panel button title and messages
 find_input.title=Пронађи
 find_input.placeholder=Пронађи у документу…
-find_previous.title=Пронађи претходну појаву фразе
+find_previous.title=Пронађи претходно појављивање фразе
 find_previous_label=Претходна
-find_next.title=Пронађи следећу појаву фразе
+find_next.title=Пронађи следеће појављивање фразе
 find_next_label=Следећа
 find_highlight=Истакнути све
 find_match_case_label=Подударања
@@ -222,10 +223,10 @@ page_scale_actual=Стварна величина
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Грешка
+loading=Учитавање…
 loading_error=Дошло је до грешке приликом учитавања PDF-а.
-invalid_file_error=PDF датотека је оштећена или је неисправна.
-missing_file_error=PDF датотека није пронађена.
+invalid_file_error=PDF датотека је неважећа или је оштећена.
+missing_file_error=Недостаје PDF датотека.
 unexpected_response_error=Неочекиван одговор од сервера.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -245,3 +246,10 @@ password_cancel=Откажи
 printing_not_supported=Упозорење: Штампање није у потпуности подржано у овом прегледачу.
 printing_not_ready=Упозорење: PDF није у потпуности учитан за штампу.
 web_fonts_disabled=Веб фонтови су онемогућени: не могу користити уграђене PDF фонтове.
+
+# Editor
+
+
+
+# Editor Parameters
+editor_free_text_font_size=Величина фонта
diff --git a/cps/static/locale/sv-SE/viewer.properties b/cps/static/locale/sv-SE/viewer.properties
index 7c75281c3..94c077434 100644
--- a/cps/static/locale/sv-SE/viewer.properties
+++ b/cps/static/locale/sv-SE/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Aktuell vy
 tools.title=Verktyg
 tools_label=Verktyg
 first_page.title=Gå till första sidan
-first_page.label=Gå till första sidan
 first_page_label=Gå till första sidan
 last_page.title=Gå till sista sidan
-last_page.label=Gå till sista sidan
 last_page_label=Gå till sista sidan
 page_rotate_cw.title=Rotera medurs
-page_rotate_cw.label=Rotera medurs
 page_rotate_cw_label=Rotera medurs
 page_rotate_ccw.title=Rotera moturs
-page_rotate_ccw.label=Rotera moturs
 page_rotate_ccw_label=Rotera moturs
 
 cursor_text_select_tool.title=Aktivera textmarkeringsverktyg
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Textmarkeringsverktyg
 cursor_hand_tool.title=Aktivera handverktyg
 cursor_hand_tool_label=Handverktyg
 
+scroll_page.title=Använd sidrullning
+scroll_page_label=Sidrullning
 scroll_vertical.title=Använd vertikal rullning
 scroll_vertical_label=Vertikal rullning
 scroll_horizontal.title=Använd horisontell rullning
@@ -137,22 +135,24 @@ print_progress_close=Avbryt
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Visa/dölj sidofält
-toggle_sidebar_notification2.title=Visa/dölj sidofält (dokument innehåller översikt/bilagor/lager)
+toggle_sidebar_notification2.title=Växla sidofält (dokumentet innehåller dokumentstruktur/bilagor/lager)
 toggle_sidebar_label=Visa/dölj sidofält
 document_outline.title=Visa dokumentdisposition (dubbelklicka för att expandera/komprimera alla objekt)
 document_outline_label=Dokumentöversikt
 attachments.title=Visa Bilagor
 attachments_label=Bilagor
-layers.title=Visa lager (dubbelklicka för att återställa alla lager till ursrungligt läge)
+layers.title=Visa lager (dubbelklicka för att återställa alla lager till standardläge)
 layers_label=Lager
 thumbs.title=Visa miniatyrer
 thumbs_label=Miniatyrer
+current_outline_item.title=Hitta aktuellt dispositionsobjekt
+current_outline_item_label=Aktuellt dispositionsobjekt
 findbar.title=Sök i dokument
 findbar_label=Sök
 
 additional_layers=Ytterligare lager
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Sida {{page}}
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Sida {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -170,6 +170,7 @@ find_next.title=Hitta nästa förekomst av frasen
 find_next_label=Nästa
 find_highlight=Markera alla
 find_match_case_label=Matcha versal/gemen
+find_match_diacritics_label=Matcha diakritiska tecken
 find_entire_word_label=Hela ord
 find_reached_top=Nådde början av dokumentet, började från slutet
 find_reached_bottom=Nådde slutet på dokumentet, började från början
@@ -225,7 +226,7 @@ page_scale_actual=Verklig storlek
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Fel
+loading=Laddar…
 loading_error=Ett fel uppstod vid laddning av PDF-filen.
 invalid_file_error=Ogiltig eller korrupt PDF-fil.
 missing_file_error=Saknad PDF-fil.
@@ -248,3 +249,33 @@ password_cancel=Avbryt
 printing_not_supported=Varning: Utskrifter stöds inte helt av den här webbläsaren.
 printing_not_ready=Varning: PDF:en är inte klar för utskrift.
 web_fonts_disabled=Webbtypsnitt är inaktiverade: kan inte använda inbäddade PDF-typsnitt.
+
+# Editor
+editor_none.title=Inaktivera redigering av anteckningar
+editor_none_label=Inaktivera redigering
+editor_free_text.title=Lägg till FreeText-kommentar
+editor_free_text_label=FreeText-kommentar
+editor_ink.title=Lägg till bläckanteckning
+editor_ink_label=Bläckanteckning
+
+freetext_default_content=Skriv in lite text…
+
+free_text_default_content=Ange text…
+
+# Editor Parameters
+editor_free_text_font_color=Textfärg
+editor_free_text_font_size=Textstorlek
+editor_ink_line_color=Linjefärg
+editor_ink_line_thickness=Linjetjocklek
+
+# Editor Parameters
+editor_free_text_color=Färg
+editor_free_text_size=Storlek
+editor_ink_color=Färg
+editor_ink_thickness=Tjocklek
+editor_ink_opacity=Opacitet
+
+# Editor aria
+editor_free_text_aria_label=FreeText-redigerare
+editor_ink_aria_label=Ink-redigerare
+editor_ink_canvas_aria_label=Användarskapad bild
diff --git a/cps/static/locale/szl/viewer.properties b/cps/static/locale/szl/viewer.properties
index 282c59509..6706afc34 100644
--- a/cps/static/locale/szl/viewer.properties
+++ b/cps/static/locale/szl/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Aktualny widok
 tools.title=Noczynia
 tools_label=Noczynia
 first_page.title=Idź ku piyrszyj strōnie
-first_page.label=Idź ku piyrszyj strōnie
 first_page_label=Idź ku piyrszyj strōnie
 last_page.title=Idź ku ôstatnij strōnie
-last_page.label=Idź ku ôstatnij strōnie
 last_page_label=Idź ku ôstatnij strōnie
 page_rotate_cw.title=Zwyrtnij w prawo
-page_rotate_cw.label=Zwyrtnij w prawo
 page_rotate_cw_label=Zwyrtnij w prawo
 page_rotate_ccw.title=Zwyrtnij w lewo
-page_rotate_ccw.label=Zwyrtnij w lewo
 page_rotate_ccw_label=Zwyrtnij w lewo
 
 cursor_text_select_tool.title=Załōncz noczynie ôbiyranio tekstu
@@ -74,10 +70,10 @@ scroll_wrapped_label=Szichtowe przewijanie
 
 spread_none.title=Niy dowej strōn w widoku po dwie
 spread_none_label=Po jednyj strōnie
-spread_odd.title=Dej strōny po dwie: niyparzysto i parzysto
-spread_odd_label=Niyparzysto i parzysto
-spread_even.title=Dej strōny po dwie: parzysto i niyparzysto
-spread_even_label=Parzysto i niyparzysto
+spread_odd.title=Pokoż strōny po dwie; niyporziste po lewyj
+spread_odd_label=Niyporziste po lewyj
+spread_even.title=Pokoż strōny po dwie; porziste po lewyj
+spread_even_label=Porziste po lewyj
 
 # Document properties dialog box
 document_properties.title=Włosności dokumyntu…
@@ -137,19 +133,21 @@ print_progress_close=Pociep
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Przełōncz posek na rancie
-toggle_sidebar_notification.title=Przełōncz posek na rancie (dokumynt mo struktura/przidowki)
+toggle_sidebar_notification2.title=Przełōncz posek na rancie (dokumynt mo struktura/przidowki/warstwy)
 toggle_sidebar_label=Przełōncz posek na rancie
-document_outline.title=Pokoż struktura dokumyntu (tuplowane klikniyncie rozszyrzo/swijo wszyskie elymynty)
+document_outline.title=Pokoż struktura dokumyntu (tuplowane klikniyncie rozszyrzo/swijo wszyskie elymynta)
 document_outline_label=Struktura dokumyntu
 attachments.title=Pokoż przidowki
 attachments_label=Przidowki
+layers.title=Pokoż warstwy (tuplowane klikniyncie resetuje wszyskie warstwy do bazowego stanu)
+layers_label=Warstwy
 thumbs.title=Pokoż miniatury
 thumbs_label=Miniatury
 findbar.title=Znojdź w dokumyncie
 findbar_label=Znojdź
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Strōna {{page}}
+additional_layers=Nadbytnie warstwy
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -165,7 +163,7 @@ find_previous.title=Znojdź piyrwyjsze pokozanie sie tyj frazy
 find_previous_label=Piyrwyjszo
 find_next.title=Znojdź nastympne pokozanie sie tyj frazy
 find_next_label=Dalij
-find_highlight=Ôbznocz wszysko
+find_highlight=Zaznacz wszysko
 find_match_case_label=Poznowej srogość liter
 find_entire_word_label=Cołke słowa
 find_reached_top=Doszło do samego wiyrchu strōny, dalij ôd spodku
@@ -191,7 +189,7 @@ find_match_count_limit[two]=Wiyncyj jak {{limit}}, co pasujōm
 find_match_count_limit[few]=Wiyncyj jak {{limit}}, co pasujōm
 find_match_count_limit[many]=Wiyncyj jak {{limit}}, co pasujōm
 find_match_count_limit[other]=Wiyncyj jak {{limit}}, co pasujōm
-find_not_found=Fraza niy ma znodniynto
+find_not_found=Fraza niy znaleziōno
 
 # Error panel labels
 error_more_info=Wiyncyj informacyji
@@ -222,7 +220,6 @@ page_scale_actual=Aktualno srogość
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Feler
 loading_error=Przi ladowaniu PDFa pokozoł sie feler.
 invalid_file_error=Zły abo felerny zbiōr PDF.
 missing_file_error=Chybio zbioru PDF.
diff --git a/cps/static/locale/ta/viewer.properties b/cps/static/locale/ta/viewer.properties
index 669ba0c56..d07a337d0 100644
--- a/cps/static/locale/ta/viewer.properties
+++ b/cps/static/locale/ta/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=தற்போதைய காட்சி
 tools.title=கருவிகள்
 tools_label=கருவிகள்
 first_page.title=முதல் பக்கத்திற்கு செல்லவும்
-first_page.label=முதல் பக்கத்திற்கு செல்லவும்
 first_page_label=முதல் பக்கத்திற்கு செல்லவும்
 last_page.title=கடைசி பக்கத்திற்கு செல்லவும்
-last_page.label=கடைசி பக்கத்திற்கு செல்லவும்
 last_page_label=கடைசி பக்கத்திற்கு செல்லவும்
 page_rotate_cw.title=வலஞ்சுழியாக சுழற்று
-page_rotate_cw.label=வலஞ்சுழியாக சுழற்று
 page_rotate_cw_label=வலஞ்சுழியாக சுழற்று
 page_rotate_ccw.title=இடஞ்சுழியாக சுழற்று
-page_rotate_ccw.label=இடஞ்சுழியாக சுழற்று
 page_rotate_ccw_label=இடஞ்சுழியாக சுழற்று
 
 cursor_text_select_tool.title=உரைத் தெரிவு கருவியைச் செயல்படுத்து
@@ -118,7 +114,6 @@ print_progress_close=ரத்து
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=பக்கப் பட்டியை நிலைமாற்று
-toggle_sidebar_notification.title=பக்கப்பட்டையை நிலைமாற்று (வெளிக்கோடு/இணைப்புகளை ஆவணம் கொண்டுள்ளது)
 toggle_sidebar_label=பக்கப் பட்டியை நிலைமாற்று
 document_outline.title=ஆவண அடக்கத்தைக் காட்டு (இருமுறைச் சொடுக்கி அனைத்து உறுப்பிடிகளையும் விரி/சேர்)
 document_outline_label=ஆவண வெளிவரை
@@ -178,8 +173,6 @@ page_scale_actual=உண்மையான அளவு
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=பிழை
 loading_error=PDF ஐ ஏற்றும் போது ஒரு பிழை ஏற்பட்டது.
 invalid_file_error=செல்லுபடியாகாத அல்லது சிதைந்த PDF கோப்பு.
 missing_file_error=PDF கோப்பு காணவில்லை.
diff --git a/cps/static/locale/te/viewer.properties b/cps/static/locale/te/viewer.properties
index 498b64c8d..6cd691a01 100644
--- a/cps/static/locale/te/viewer.properties
+++ b/cps/static/locale/te/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=ప్రస్తుత దర్శనం
 tools.title=పనిముట్లు
 tools_label=పనిముట్లు
 first_page.title=మొదటి పేజీకి వెళ్ళు
-first_page.label=మొదటి పేజీకి వెళ్ళు
 first_page_label=మొదటి పేజీకి వెళ్ళు
 last_page.title=చివరి పేజీకి వెళ్ళు
-last_page.label=చివరి పేజీకి వెళ్ళు
 last_page_label=చివరి పేజీకి వెళ్ళు
 page_rotate_cw.title=సవ్యదిశలో తిప్పు
-page_rotate_cw.label=సవ్యదిశలో తిప్పు
 page_rotate_cw_label=సవ్యదిశలో తిప్పు
 page_rotate_ccw.title=అపసవ్యదిశలో తిప్పు
-page_rotate_ccw.label=అపసవ్యదిశలో తిప్పు
 page_rotate_ccw_label=అపసవ్యదిశలో తిప్పు
 
 cursor_text_select_tool.title=టెక్స్ట్ ఎంపిక సాధనాన్ని ప్రారంభించండి
@@ -130,11 +126,13 @@ document_outline.title=పత్రము రూపము చూపించు
 document_outline_label=పత్రము అవుట్‌లైన్
 attachments.title=అనుబంధాలు చూపు
 attachments_label=అనుబంధాలు
+layers_label=పొరలు
 thumbs.title=థంబ్‌నైల్స్ చూపు
 thumbs_label=థంబ్‌నైల్స్
 findbar.title=పత్రములో కనుగొనుము
 findbar_label=కనుగొను
 
+additional_layers=అదనపు పొరలు
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -195,8 +193,6 @@ page_scale_actual=యథార్ధ పరిమాణం
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=దోషం
 loading_error=PDF లోడవుచున్నప్పుడు ఒక దోషం ఎదురైంది.
 invalid_file_error=చెల్లని లేదా పాడైన PDF ఫైలు.
 missing_file_error=దొరకని PDF ఫైలు.
diff --git a/cps/static/locale/tg/viewer.properties b/cps/static/locale/tg/viewer.properties
new file mode 100644
index 000000000..cac204774
--- /dev/null
+++ b/cps/static/locale/tg/viewer.properties
@@ -0,0 +1,281 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Саҳифаи қаблӣ
+previous_label=Қаблӣ
+next.title=Саҳифаи навбатӣ
+next_label=Навбатӣ
+
+# LOCALIZATION NOTE (page.title): The tooltip for the pageNumber input.
+page.title=Саҳифа
+# LOCALIZATION NOTE (of_pages): "{{pagesCount}}" will be replaced by a number
+# representing the total number of pages in the document.
+of_pages=аз {{pagesCount}}
+# LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
+# will be replaced by a number representing the currently visible page,
+# respectively a number representing the total number of pages in the document.
+page_of_pages=({{pageNumber}} аз {{pagesCount}})
+
+zoom_out.title=Хурд кардан
+zoom_out_label=Хурд кардан
+zoom_in.title=Калон кардан
+zoom_in_label=Калон кардан
+zoom.title=Танзими андоза
+presentation_mode.title=Гузариш ба реҷаи тақдим
+presentation_mode_label=Реҷаи тақдим
+open_file.title=Кушодани файл
+open_file_label=Кушодан
+print.title=Чоп кардан
+print_label=Чоп кардан
+download.title=Боргирӣ кардан
+download_label=Боргирӣ кардан
+bookmark.title=Намуди ҷорӣ (нусха бардоштан ё кушодан дар равзанаи нав)
+bookmark_label=Намуди ҷорӣ
+
+# Secondary toolbar and context menu
+tools.title=Абзорҳо
+tools_label=Абзорҳо
+first_page.title=Ба саҳифаи аввал гузаред
+first_page_label=Ба саҳифаи аввал гузаред
+last_page.title=Ба саҳифаи охирин гузаред
+last_page_label=Ба саҳифаи охирин гузаред
+page_rotate_cw.title=Ба самти ҳаракати ақрабаки соат давр задан
+page_rotate_cw_label=Ба самти ҳаракати ақрабаки соат давр задан
+page_rotate_ccw.title=Ба муқобили самти ҳаракати ақрабаки соат давр задан
+page_rotate_ccw_label=Ба муқобили самти ҳаракати ақрабаки соат давр задан
+
+cursor_text_select_tool.title=Фаъол кардани «Абзори интихоби матн»
+cursor_text_select_tool_label=Абзори интихоби матн
+cursor_hand_tool.title=Фаъол кардани «Абзори даст»
+cursor_hand_tool_label=Абзори даст
+
+scroll_page.title=Истифодаи варақзанӣ
+scroll_page_label=Варақзанӣ
+scroll_vertical.title=Истифодаи варақзании амудӣ
+scroll_vertical_label=Варақзании амудӣ
+scroll_horizontal.title=Истифодаи варақзании уфуқӣ
+scroll_horizontal_label=Варақзании уфуқӣ
+scroll_wrapped.title=Истифодаи варақзании миқёсбандӣ
+scroll_wrapped_label=Варақзании миқёсбандӣ
+
+spread_none.title=Густариши саҳифаҳо истифода бурда нашавад
+spread_none_label=Бе густурдани саҳифаҳо
+spread_odd.title=Густариши саҳифаҳо аз саҳифаҳо бо рақамҳои тоқ оғоз карда мешавад
+spread_odd_label=Саҳифаҳои тоқ аз тарафи чап
+spread_even.title=Густариши саҳифаҳо аз саҳифаҳо бо рақамҳои ҷуфт оғоз карда мешавад
+spread_even_label=Саҳифаҳои ҷуфт аз тарафи чап
+
+# Document properties dialog box
+document_properties.title=Хусусиятҳои ҳуҷҷат…
+document_properties_label=Хусусиятҳои ҳуҷҷат…
+document_properties_file_name=Номи файл:
+document_properties_file_size=Андозаи файл:
+# LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
+# will be replaced by the PDF file size in kilobytes, respectively in bytes.
+document_properties_kb={{size_kb}} КБ ({{size_b}} байт)
+# LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
+# will be replaced by the PDF file size in megabytes, respectively in bytes.
+document_properties_mb={{size_mb}} МБ ({{size_b}} байт)
+document_properties_title=Сарлавҳа:
+document_properties_author=Муаллиф:
+document_properties_subject=Мавзуъ:
+document_properties_keywords=Калимаҳои калидӣ:
+document_properties_creation_date=Санаи эҷод:
+document_properties_modification_date=Санаи тағйирот:
+# LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
+# will be replaced by the creation/modification date, and time, of the PDF file.
+document_properties_date_string={{date}}, {{time}}
+document_properties_creator=Эҷодкунанда:
+document_properties_producer=Таҳиякунандаи PDF:
+document_properties_version=Версияи PDF:
+document_properties_page_count=Шумораи саҳифаҳо:
+document_properties_page_size=Андозаи саҳифа:
+document_properties_page_size_unit_inches=дюйм
+document_properties_page_size_unit_millimeters=мм
+document_properties_page_size_orientation_portrait=амудӣ
+document_properties_page_size_orientation_landscape=уфуқӣ
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=Мактуб
+document_properties_page_size_name_legal=Ҳуқуқӣ
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Намоиши тез дар Интернет:
+document_properties_linearized_yes=Ҳа
+document_properties_linearized_no=Не
+document_properties_close=Пӯшидан
+
+print_progress_message=Омодасозии ҳуҷҷат барои чоп…
+# LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
+# a numerical per cent value.
+print_progress_percent={{progress}}%
+print_progress_close=Бекор кардан
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=Фаъол кардани навори ҷонибӣ
+toggle_sidebar_notification2.title=Фаъол кардани навори ҷонибӣ (ҳуҷҷат дорои сохтор/замимаҳо/қабатҳо мебошад)
+toggle_sidebar_label=Фаъол кардани навори ҷонибӣ
+document_outline.title=Намоиш додани сохтори ҳуҷҷат (барои баркушодан/пеҷондани ҳамаи унсурҳо дубора зер кунед)
+document_outline_label=Сохтори ҳуҷҷат
+attachments.title=Намоиш додани замимаҳо
+attachments_label=Замимаҳо
+layers.title=Намоиш додани қабатҳо (барои барқарор кардани ҳамаи қабатҳо ба вазъияти пешфарз дубора зер кунед)
+layers_label=Қабатҳо
+thumbs.title=Намоиш додани тасвирчаҳо
+thumbs_label=Тасвирчаҳо
+current_outline_item.title=Ёфтани унсури сохтори ҷорӣ
+current_outline_item_label=Унсури сохтори ҷорӣ
+findbar.title=Ёфтан дар ҳуҷҷат
+findbar_label=Ёфтан
+
+additional_layers=Қабатҳои иловагӣ
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Саҳифаи {{page}}
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Саҳифаи {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Тасвирчаи саҳифаи {{page}}
+
+# Find panel button title and messages
+find_input.title=Ёфтан
+find_input.placeholder=Ёфтан дар ҳуҷҷат…
+find_previous.title=Ҷустуҷӯи мавриди қаблии ибораи пешниҳодшуда
+find_previous_label=Қаблӣ
+find_next.title=Ҷустуҷӯи мавриди навбатии ибораи пешниҳодшуда
+find_next_label=Навбатӣ
+find_highlight=Ҳамаашро бо ранг ҷудо кардан
+find_match_case_label=Бо дарназардошти ҳарфҳои хурду калон
+find_match_diacritics_label=Бо дарназардошти аломатҳои диакритикӣ
+find_entire_word_label=Калимаҳои пурра
+find_reached_top=Ба болои ҳуҷҷат расид, аз поён идома ёфт
+find_reached_bottom=Ба поёни ҳуҷҷат расид, аз боло идома ёфт
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} аз {{total}} мувофиқат
+find_match_count[two]={{current}} аз {{total}} мувофиқат
+find_match_count[few]={{current}} аз {{total}} мувофиқат
+find_match_count[many]={{current}} аз {{total}} мувофиқат
+find_match_count[other]={{current}} аз {{total}} мувофиқат
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Зиёда аз {{limit}} мувофиқат
+find_match_count_limit[one]=Зиёда аз {{limit}} мувофиқат
+find_match_count_limit[two]=Зиёда аз {{limit}} мувофиқат
+find_match_count_limit[few]=Зиёда аз {{limit}} мувофиқат
+find_match_count_limit[many]=Зиёда аз {{limit}} мувофиқат
+find_match_count_limit[other]=Зиёда аз {{limit}} мувофиқат
+find_not_found=Ибора ёфт нашуд
+
+# Error panel labels
+error_more_info=Маълумоти бештар
+error_less_info=Маълумоти камтар
+error_close=Пӯшидан
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (сохт: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Паём: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Даста: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Файл: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Сатр: {{line}}
+rendering_error=Ҳангоми шаклсозии саҳифа хато ба миён омад.
+
+# Predefined zoom values
+page_scale_width=Аз рӯи паҳнои саҳифа
+page_scale_fit=Аз рӯи андозаи саҳифа
+page_scale_auto=Андозаи худкор
+page_scale_actual=Андозаи воқеӣ
+# LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
+# numerical scale value.
+page_scale_percent={{scale}}%
+
+# Loading indicator messages
+loading=Бор шуда истодааст…
+loading_error=Ҳангоми боркунии PDF хато ба миён омад.
+invalid_file_error=Файли PDF нодуруст ё вайроншуда мебошад.
+missing_file_error=Файли PDF ғоиб аст.
+unexpected_response_error=Ҷавоби ногаҳон аз сервер.
+
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
+
+# LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type.alt=[Ҳошиянависӣ - {{type}}]
+password_label=Барои кушодани ин файли PDF ниҳонвожаро ворид кунед.
+password_invalid=Ниҳонвожаи нодуруст. Лутфан, аз нав кӯшиш кунед.
+password_ok=ХУБ
+password_cancel=Бекор кардан
+
+printing_not_supported=Диққат: Чопкунӣ аз тарафи ин браузер ба таври пурра дастгирӣ намешавад.
+printing_not_ready=Диққат: Файли PDF барои чопкунӣ пурра бор карда нашуд.
+web_fonts_disabled=Шрифтҳои интернетӣ ғайрифаъоланд: истифодаи шрифтҳои дарунсохти PDF ғайриимкон аст.
+
+# Editor
+editor_none.title=Ғайрифаъол кардани таҳрири ҳошиянависӣ
+editor_none_label=Ғайрифаъл кардани таҳрири матн
+editor_free_text.title=Илова кардани ҳошиянависии «FreeText»
+editor_free_text_label=Ҳошиянависии «FreeText»
+editor_ink.title=Илова кардани ҳошиянависии дастнавис
+editor_ink_label=Ҳошиянависии дастнавис
+
+freetext_default_content=Ягон матнро ворид намоед…
+
+free_text_default_content=Матнро ворид намоед…
+
+# Editor Parameters
+editor_free_text_font_color=Ранги ҳуруф
+editor_free_text_font_size=Андозаи ҳуруф
+editor_ink_line_color=Ранги сатр
+editor_ink_line_thickness=Ғафсии сатр
+
+# Editor Parameters
+editor_free_text_color=Ранг
+editor_free_text_size=Андоза
+editor_ink_color=Ранг
+editor_ink_thickness=Ғафсӣ
+editor_ink_opacity=Шаффофӣ
+
+# Editor aria
+editor_free_text_aria_label=Муҳаррири «FreeText»
+editor_ink_aria_label=Муҳаррири ранг
+editor_ink_canvas_aria_label=Тасвири эҷодкардаи корбар
diff --git a/cps/static/locale/th/viewer.properties b/cps/static/locale/th/viewer.properties
index a4ef7db14..7612bedd4 100644
--- a/cps/static/locale/th/viewer.properties
+++ b/cps/static/locale/th/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=มุมมองปัจจุบัน
 tools.title=เครื่องมือ
 tools_label=เครื่องมือ
 first_page.title=ไปยังหน้าแรก
-first_page.label=ไปยังหน้าแรก
 first_page_label=ไปยังหน้าแรก
 last_page.title=ไปยังหน้าสุดท้าย
-last_page.label=ไปยังหน้าสุดท้าย
 last_page_label=ไปยังหน้าสุดท้าย
 page_rotate_cw.title=หมุนตามเข็มนาฬิกา
-page_rotate_cw.label=หมุนตามเข็มนาฬิกา
 page_rotate_cw_label=หมุนตามเข็มนาฬิกา
 page_rotate_ccw.title=หมุนทวนเข็มนาฬิกา
-page_rotate_ccw.label=หมุนทวนเข็มนาฬิกา
 page_rotate_ccw_label=หมุนทวนเข็มนาฬิกา
 
 cursor_text_select_tool.title=เปิดใช้งานเครื่องมือการเลือกข้อความ
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=เครื่องมือการเลื
 cursor_hand_tool.title=เปิดใช้งานเครื่องมือมือ
 cursor_hand_tool_label=เครื่องมือมือ
 
+scroll_page.title=ใช้การเลื่อนหน้า
+scroll_page_label=การเลื่อนหน้า
 scroll_vertical.title=ใช้การเลื่อนแนวตั้ง
 scroll_vertical_label=การเลื่อนแนวตั้ง
 scroll_horizontal.title=ใช้การเลื่อนแนวนอน
@@ -137,19 +135,24 @@ print_progress_close=ยกเลิก
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=เปิด/ปิดแถบข้าง
-toggle_sidebar_notification.title=เปิด/ปิดแถบข้าง (เอกสารมีเค้าร่าง/ไฟล์แนบ)
+toggle_sidebar_notification2.title=เปิด/ปิดแถบข้าง (เอกสารมีเค้าร่าง/ไฟล์แนบ/เลเยอร์)
 toggle_sidebar_label=เปิด/ปิดแถบข้าง
 document_outline.title=แสดงเค้าร่างเอกสาร (คลิกสองครั้งเพื่อขยาย/ยุบรายการทั้งหมด)
 document_outline_label=เค้าร่างเอกสาร
 attachments.title=แสดงไฟล์แนบ
 attachments_label=ไฟล์แนบ
+layers.title=แสดงเลเยอร์ (คลิกสองครั้งเพื่อรีเซ็ตเลเยอร์ทั้งหมดเป็นสถานะเริ่มต้น)
+layers_label=เลเยอร์
 thumbs.title=แสดงภาพขนาดย่อ
 thumbs_label=ภาพขนาดย่อ
+current_outline_item.title=ค้นหารายการเค้าร่างปัจจุบัน
+current_outline_item_label=รายการเค้าร่างปัจจุบัน
 findbar.title=ค้นหาในเอกสาร
 findbar_label=ค้นหา
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=หน้า {{page}}
+additional_layers=เลเยอร์เพิ่มเติม
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=หน้า {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=หาตำแหน่งถัดไปของวลี
 find_next_label=ถัดไป
 find_highlight=เน้นสีทั้งหมด
 find_match_case_label=ตัวพิมพ์ใหญ่เล็กตรงกัน
+find_match_diacritics_label=เครื่องหมายกำกับการออกเสียงตรงกัน
 find_entire_word_label=ทั้งคำ
 find_reached_top=ค้นหาถึงจุดเริ่มต้นของหน้า เริ่มค้นต่อจากด้านล่าง
 find_reached_bottom=ค้นหาถึงจุดสิ้นสุดหน้า เริ่มค้นต่อจากด้านบน
@@ -222,7 +226,7 @@ page_scale_actual=ขนาดจริง
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=ข้อผิดพลาด
+loading=กำลังโหลด…
 loading_error=เกิดข้อผิดพลาดขณะโหลด PDF
 invalid_file_error=ไฟล์ PDF ไม่ถูกต้องหรือเสียหาย
 missing_file_error=ไฟล์ PDF หายไป
@@ -245,3 +249,18 @@ password_cancel=ยกเลิก
 printing_not_supported=คำเตือน: เบราว์เซอร์นี้ไม่ได้สนับสนุนการพิมพ์อย่างเต็มที่
 printing_not_ready=คำเตือน: PDF ไม่ได้รับการโหลดอย่างเต็มที่สำหรับการพิมพ์
 web_fonts_disabled=แบบอักษรเว็บถูกปิดใช้งาน: ไม่สามารถใช้แบบอักษร PDF ฝังตัว
+
+# Editor
+editor_none_label=ปิดใช้งานการแก้ไข
+
+
+free_text_default_content=ป้อนข้อความ…
+
+# Editor Parameters
+editor_free_text_font_color=สีตัวอักษร
+editor_free_text_font_size=ขนาดแบบอักษร
+
+# Editor Parameters
+editor_ink_opacity=ความทึบ
+
+# Editor aria
diff --git a/cps/static/locale/tl/viewer.properties b/cps/static/locale/tl/viewer.properties
index 0209da154..1e988e75e 100644
--- a/cps/static/locale/tl/viewer.properties
+++ b/cps/static/locale/tl/viewer.properties
@@ -33,14 +33,14 @@ zoom_out_label=Paliitin
 zoom_in.title=Palakihin
 zoom_in_label=Palakihin
 zoom.title=Mag-zoom
-presentation_mode.title=Switch to Presentation Mode
+presentation_mode.title=Lumipat sa Presentation Mode
 presentation_mode_label=Presentation Mode
 open_file.title=Magbukas ng file
 open_file_label=Buksan
 print.title=i-Print
 print_label=i-Print
-download.title=Download
-download_label=Download
+download.title=i-Download
+download_label=i-Download
 bookmark.title=Kasalukuyang tingin (kopyahin o buksan sa bagong window)
 bookmark_label=Kasalukuyang tingin
 
@@ -48,40 +48,36 @@ bookmark_label=Kasalukuyang tingin
 tools.title=Mga Kagamitan
 tools_label=Mga Kagamitan
 first_page.title=Pumunta sa Unang Pahina
-first_page.label=Pumunta sa Unang Pahina
 first_page_label=Pumunta sa Unang Pahina
 last_page.title=Pumunta sa Huling Pahina
-last_page.label=Pumunta sa Huling Pahina
 last_page_label=Pumunta sa Huling Pahina
-page_rotate_cw.title=Paikutin ang Clockwise
-page_rotate_cw.label=Paikutin ang Clockwise
-page_rotate_cw_label=Paikutin ang Clockwise
-page_rotate_ccw.title=Paikutin ang Counterclockwise
-page_rotate_ccw.label=Paikutin ang Counterclockwise
-page_rotate_ccw_label=Paikutin ang Counterclockwise
+page_rotate_cw.title=Paikutin Pakanan
+page_rotate_cw_label=Paikutin Pakanan
+page_rotate_ccw.title=Paikutin Pakaliwa
+page_rotate_ccw_label=Paikutin Pakaliwa
 
-cursor_text_select_tool.title=Enable Text Selection Tool
+cursor_text_select_tool.title=I-enable ang Text Selection Tool
 cursor_text_select_tool_label=Text Selection Tool
-cursor_hand_tool.title=Enable Hand Tool
+cursor_hand_tool.title=I-enable ang Hand Tool
 cursor_hand_tool_label=Hand Tool
 
-scroll_vertical.title=Use Vertical Scrolling
+scroll_vertical.title=Gumamit ng Vertical Scrolling
 scroll_vertical_label=Vertical Scrolling
-scroll_horizontal.title=Use Horizontal Scrolling
+scroll_horizontal.title=Gumamit ng Horizontal Scrolling
 scroll_horizontal_label=Horizontal Scrolling
-scroll_wrapped.title=Use Wrapped Scrolling
+scroll_wrapped.title=Gumamit ng Wrapped Scrolling
 scroll_wrapped_label=Wrapped Scrolling
 
-spread_none.title=Do not join page spreads
+spread_none.title=Huwag pagsamahin ang mga page spread
 spread_none_label=No Spreads
 spread_odd.title=Join page spreads starting with odd-numbered pages
-spread_odd_label=Odd Spreads
-spread_even.title=Join page spreads starting with even-numbered pages
-spread_even_label=Even Spreads
+spread_odd_label=Mga Odd Spread
+spread_even.title=Pagsamahin ang mga page spread na nagsisimula sa mga even-numbered na pahina
+spread_even_label=Mga Even Spread
 
 # Document properties dialog box
-document_properties.title=Document Properties…
-document_properties_label=Document Properties…
+document_properties.title=Mga Katangian ng Dokumento…
+document_properties_label=Mga Katangian ng Dokumento…
 document_properties_file_name=File name:
 document_properties_file_size=File size:
 # LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
@@ -91,23 +87,23 @@ document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
 # will be replaced by the PDF file size in megabytes, respectively in bytes.
 document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
 document_properties_title=Pamagat:
-document_properties_author=May Akda:
-document_properties_subject=Subject:
+document_properties_author=May-akda:
+document_properties_subject=Paksa:
 document_properties_keywords=Mga keyword:
-document_properties_creation_date=Creation Date:
-document_properties_modification_date=Modification Date:
+document_properties_creation_date=Petsa ng Pagkakagawa:
+document_properties_modification_date=Petsa ng Pagkakabago:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
 # will be replaced by the creation/modification date, and time, of the PDF file.
 document_properties_date_string={{date}}, {{time}}
-document_properties_creator=Creator:
+document_properties_creator=Tagalikha:
 document_properties_producer=PDF Producer:
 document_properties_version=PDF Version:
-document_properties_page_count=Page Count:
-document_properties_page_size=Page Size:
-document_properties_page_size_unit_inches=in
+document_properties_page_count=Bilang ng Pahina:
+document_properties_page_size=Laki ng Pahina:
+document_properties_page_size_unit_inches=pulgada
 document_properties_page_size_unit_millimeters=mm
-document_properties_page_size_orientation_portrait=portrait
-document_properties_page_size_orientation_landscape=landscape
+document_properties_page_size_orientation_portrait=patayo
+document_properties_page_size_orientation_landscape=pahiga
 document_properties_page_size_name_a3=A3
 document_properties_page_size_name_a4=A4
 document_properties_page_size_name_letter=Letter
@@ -127,7 +123,7 @@ document_properties_linearized_yes=Oo
 document_properties_linearized_no=Hindi
 document_properties_close=Isara
 
-print_progress_message=Preparing document for printing…
+print_progress_message=Inihahanda ang dokumento para sa pag-print…
 # LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
 # a numerical per cent value.
 print_progress_percent={{progress}}%
@@ -136,20 +132,21 @@ print_progress_close=Kanselahin
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
-toggle_sidebar.title=Toggle Sidebar
-toggle_sidebar_notification.title=Toggle Sidebar (document contains outline/attachments)
-toggle_sidebar_label=Toggle Sidebar
-document_outline.title=Show Document Outline (double-click to expand/collapse all items)
-document_outline_label=Document Outline
-attachments.title=Show Attachments
-attachments_label=Attachments
-thumbs.title=Ipakita ang mga Thumbnails
-thumbs_label=Thumbnails
-findbar.title=Find in Document
+toggle_sidebar.title=Ipakita/Itago ang Sidebar
+toggle_sidebar_notification2.title=Ipakita/Itago ang Sidebar (nagtataglay ang dokumento ng balangkas/mga attachment/mga layer)
+toggle_sidebar_label=Ipakita/Itago ang Sidebar
+document_outline.title=Ipakita ang Document Outline (mag-double-click para i-expand/collapse ang laman)
+document_outline_label=Balangkas ng Dokumento
+attachments.title=Ipakita ang mga Attachment
+attachments_label=Mga attachment
+layers.title=Ipakita ang mga Layer (mag-double click para mareset ang lahat ng layer sa orihinal na estado)
+layers_label=Mga layer
+thumbs.title=Ipakita ang mga Thumbnail
+thumbs_label=Mga thumbnail
+findbar.title=Hanapin sa Dokumento
 findbar_label=Hanapin
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Pahina {{page}}
+additional_layers=Mga Karagdagang Layer
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -160,43 +157,43 @@ thumb_page_canvas=Thumbnail ng Pahina {{page}}
 
 # Find panel button title and messages
 find_input.title=Hanapin
-find_input.placeholder=Find in document…
+find_input.placeholder=Hanapin sa dokumento…
 find_previous.title=Hanapin ang nakaraang pangyayari ng parirala
-find_previous_label=Nakaraang
+find_previous_label=Nakaraan
 find_next.title=Hanapin ang susunod na pangyayari ng parirala
 find_next_label=Susunod
 find_highlight=I-highlight lahat
-find_match_case_label=Match case
-find_entire_word_label=Whole words
-find_reached_top=Reached top of document, continued from bottom
-find_reached_bottom=Reached end of document, continued from top
+find_match_case_label=Itugma ang case
+find_entire_word_label=Buong salita
+find_reached_top=Naabot na ang tuktok ng dokumento, ipinagpatuloy mula sa ilalim
+find_reached_bottom=Naabot na ang dulo ng dokumento, ipinagpatuloy mula sa tuktok
 # LOCALIZATION NOTE (find_match_count): The supported plural forms are
 # [one|two|few|many|other], with [other] as the default value.
 # "{{current}}" and "{{total}}" will be replaced by a number representing the
 # index of the currently active find result, respectively a number representing
 # the total number of matches in the document.
 find_match_count={[ plural(total) ]}
-find_match_count[one]={{current}} of {{total}} match
-find_match_count[two]={{current}} of {{total}} matches
-find_match_count[few]={{current}} of {{total}} matches
-find_match_count[many]={{current}} of {{total}} matches
-find_match_count[other]={{current}} of {{total}} matches
+find_match_count[one]={{current}} ng {{total}} tugma
+find_match_count[two]={{current}} ng {{total}} tugma
+find_match_count[few]={{current}} ng {{total}} tugma
+find_match_count[many]={{current}} ng {{total}} tugma
+find_match_count[other]={{current}} ng {{total}} tugma
 # LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
 # [zero|one|two|few|many|other], with [other] as the default value.
 # "{{limit}}" will be replaced by a numerical value.
 find_match_count_limit={[ plural(limit) ]}
-find_match_count_limit[zero]=More than {{limit}} matches
-find_match_count_limit[one]=More than {{limit}} match
-find_match_count_limit[two]=More than {{limit}} matches
-find_match_count_limit[few]=More than {{limit}} matches
-find_match_count_limit[many]=More than {{limit}} matches
-find_match_count_limit[other]=More than {{limit}} matches
-find_not_found=Hindi nakita ang prasko
+find_match_count_limit[zero]=Higit sa {{limit}} tugma
+find_match_count_limit[one]=Higit sa {{limit}} tugma
+find_match_count_limit[two]=Higit sa {{limit}} tugma
+find_match_count_limit[few]=Higit sa {{limit}} tugma
+find_match_count_limit[many]=Higit sa {{limit}} tugma
+find_match_count_limit[other]=Higit sa {{limit}} tugma
+find_not_found=Hindi natagpuan ang parirala
 
 # Error panel labels
 error_more_info=Karagdagang Impormasyon
 error_less_info=Mas Kaunting Impormasyon
-error_close=Sarado
+error_close=Isara
 # LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
 # replaced by the PDF.JS version and build ID.
 error_version_info=PDF.js v{{version}} (build: {{build}})
@@ -210,21 +207,19 @@ error_stack=Stack: {{stack}}
 error_file=File: {{file}}
 # LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
 error_line=Linya: {{line}}
-rendering_error=May naganap na pagkakamali habang pagsasalin sa pahina.
+rendering_error=Nagkaproblema habang nirerender ang pahina.
 
 # Predefined zoom values
 page_scale_width=Lapad ng Pahina
-page_scale_fit=ang pahina ay angkop
+page_scale_fit=Pagkasyahin ang Pahina
 page_scale_auto=Automatic Zoom
 page_scale_actual=Totoong sukat
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Error
-loading_error=May maling nangyari habang kinakarga ang PDF.
-invalid_file_error=Di-wasto o masira ang PDF file.
+loading_error=Nagkaproblema habang niloload ang PDF.
+invalid_file_error=Di-wasto o sira ang PDF file.
 missing_file_error=Nawawalang PDF file.
 unexpected_response_error=Hindi inaasahang tugon ng server.
 
@@ -238,10 +233,10 @@ annotation_date_string={{date}}, {{time}}
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type.alt=[{{type}} Annotation]
 password_label=Ipasok ang password upang buksan ang PDF file na ito.
-password_invalid=Invalid password. Please try again.
+password_invalid=Maling password. Subukan uli.
 password_ok=OK
 password_cancel=Kanselahin
 
-printing_not_supported=Warning: Printing is not fully supported by this browser.
-printing_not_ready=Warning: The PDF is not fully loaded for printing.
-web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
+printing_not_supported=Babala: Hindi pa ganap na suportado ang pag-print sa browser na ito.
+printing_not_ready=Babala: Hindi ganap na nabuksan ang PDF para sa pag-print.
+web_fonts_disabled=Naka-disable ang mga Web font: hindi kayang gamitin ang mga naka-embed na PDF font.
diff --git a/cps/static/locale/tr/viewer.properties b/cps/static/locale/tr/viewer.properties
index b189186c2..09d5e72ea 100644
--- a/cps/static/locale/tr/viewer.properties
+++ b/cps/static/locale/tr/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Geçerli görünüm
 tools.title=Araçlar
 tools_label=Araçlar
 first_page.title=İlk sayfaya git
-first_page.label=İlk sayfaya git
 first_page_label=İlk sayfaya git
 last_page.title=Son sayfaya git
-last_page.label=Son sayfaya git
 last_page_label=Son sayfaya git
 page_rotate_cw.title=Saat yönünde döndür
-page_rotate_cw.label=Saat yönünde döndür
 page_rotate_cw_label=Saat yönünde döndür
 page_rotate_ccw.title=Saat yönünün tersine döndür
-page_rotate_ccw.label=Saat yönünün tersine döndür
 page_rotate_ccw_label=Saat yönünün tersine döndür
 
 cursor_text_select_tool.title=Metin seçme aracını etkinleştir
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Metin seçme aracı
 cursor_hand_tool.title=El aracını etkinleştir
 cursor_hand_tool_label=El aracı
 
+scroll_page.title=Sayfa kaydırmayı kullan
+scroll_page_label=Sayfa kaydırma
 scroll_vertical.title=Dikey kaydırma kullan
 scroll_vertical_label=Dikey kaydırma
 scroll_horizontal.title=Yatay kaydırma kullan
@@ -137,19 +135,24 @@ print_progress_close=İptal
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Kenar çubuğunu aç/kapat
-toggle_sidebar_notification.title=Kenar çubuğunu aç/kapat (Belge ana hat/ekler içeriyor)
+toggle_sidebar_notification2.title=Kenar çubuğunu aç/kapat (Belge ana hat/ekler/katmanlar içeriyor)
 toggle_sidebar_label=Kenar çubuğunu aç/kapat
 document_outline.title=Belge ana hatlarını göster (Tüm öğeleri genişletmek/daraltmak için çift tıklayın)
 document_outline_label=Belge ana hatları
 attachments.title=Ekleri göster
 attachments_label=Ekler
+layers.title=Katmanları göster (tüm katmanları varsayılan duruma sıfırlamak için çift tıklayın)
+layers_label=Katmanlar
 thumbs.title=Küçük resimleri göster
 thumbs_label=Küçük resimler
+current_outline_item.title=Mevcut ana hat öğesini bul
+current_outline_item_label=Mevcut ana hat öğesi
 findbar.title=Belgede bul
 findbar_label=Bul
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Sayfa {{page}}
+additional_layers=Ek katmanlar
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Sayfa {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Sonraki eşleşmeyi bul
 find_next_label=Sonraki
 find_highlight=Tümünü vurgula
 find_match_case_label=Büyük-küçük harfe duyarlı
+find_match_diacritics_label=Fonetik işaretleri bul
 find_entire_word_label=Tam sözcükler
 find_reached_top=Belgenin başına ulaşıldı, sonundan devam edildi
 find_reached_bottom=Belgenin sonuna ulaşıldı, başından devam edildi
@@ -222,7 +226,7 @@ page_scale_actual=Gerçek boyut
 page_scale_percent=%{{scale}}
 
 # Loading indicator messages
-loading_error_indicator=Hata
+loading=Yükleniyor…
 loading_error=PDF yüklenirken bir hata oluştu.
 invalid_file_error=Geçersiz veya bozulmuş PDF dosyası.
 missing_file_error=PDF dosyası eksik.
@@ -245,3 +249,33 @@ password_cancel=İptal
 printing_not_supported=Uyarı: Yazdırma bu tarayıcı tarafından tam olarak desteklenmemektedir.
 printing_not_ready=Uyarı: PDF tamamen yüklenmedi ve yazdırmaya hazır değil.
 web_fonts_disabled=Web fontları devre dışı: Gömülü PDF fontları kullanılamıyor.
+
+# Editor
+editor_none.title=Açıklama düzenlemeyi kapat
+editor_none_label=Düzenlemeyi kapat
+editor_free_text.title=FreeText açıklaması ekle
+editor_free_text_label=FreeText açıklaması
+editor_ink.title=Mürekkep açıklaması ekle
+editor_ink_label=Mürekkep açıklaması
+
+freetext_default_content=Bir metin girin…
+
+free_text_default_content=Metni girin…
+
+# Editor Parameters
+editor_free_text_font_color=Yazı tipi rengi
+editor_free_text_font_size=Yazı tipi boyutu
+editor_ink_line_color=Çizgi rengi
+editor_ink_line_thickness=Çizgi kalınlığı
+
+# Editor Parameters
+editor_free_text_color=Renk
+editor_free_text_size=Boyut
+editor_ink_color=Renk
+editor_ink_thickness=Kalınlık
+editor_ink_opacity=Saydamlık
+
+# Editor aria
+editor_free_text_aria_label=Serbest metin düzenleyici
+editor_ink_aria_label=Mürekkep düzenleyici
+editor_ink_canvas_aria_label=Kullanıcı tarafından oluşturulan resim
diff --git a/cps/static/locale/trs/viewer.properties b/cps/static/locale/trs/viewer.properties
index 65252f7fe..8bd1fe1db 100644
--- a/cps/static/locale/trs/viewer.properties
+++ b/cps/static/locale/trs/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Daj hua ma
 tools.title=Rasun
 tools_label=Nej rasùun
 first_page.title=gun' riña pajina asiniin
-first_page.label=Gun' riña pajina asiniin
 first_page_label=Gun' riña pajina asiniin
 last_page.title=Gun' riña pajina rukù ni'in
-last_page.label=Gun' riña pajina rukù ni'inj
 last_page_label=Gun' riña pajina rukù ni'inj
 page_rotate_cw.title=Tanikaj ne' huat
-page_rotate_cw.label=Tanikaj ne' huat
 page_rotate_cw_label=Tanikaj ne' huat
 page_rotate_ccw.title=Tanikaj ne' chînt'
-page_rotate_ccw.label=Tanikaj ne' chint
 page_rotate_ccw_label=Tanikaj ne' chint
 
 cursor_text_select_tool.title=Dugi'iaj sun' sa ganahui texto
@@ -198,9 +194,6 @@ page_scale_actual=Dàj yàchi akuan' nín
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Nitaj si hua hue'ej
-
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
 # replaced by the modification date, and time, of the annotation.
 
diff --git a/cps/static/locale/uk/viewer.properties b/cps/static/locale/uk/viewer.properties
index 7b3a69c55..e981adf73 100644
--- a/cps/static/locale/uk/viewer.properties
+++ b/cps/static/locale/uk/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Поточний вигляд
 tools.title=Інструменти
 tools_label=Інструменти
 first_page.title=На першу сторінку
-first_page.label=На першу сторінку
 first_page_label=На першу сторінку
 last_page.title=На останню сторінку
-last_page.label=На останню сторінку
 last_page_label=На останню сторінку
 page_rotate_cw.title=Повернути за годинниковою стрілкою
-page_rotate_cw.label=Повернути за годинниковою стрілкою
 page_rotate_cw_label=Повернути за годинниковою стрілкою
 page_rotate_ccw.title=Повернути проти годинникової стрілки
-page_rotate_ccw.label=Повернути проти годинникової стрілки
 page_rotate_ccw_label=Повернути проти годинникової стрілки
 
 cursor_text_select_tool.title=Увімкнути інструмент вибору тексту
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Інструмент вибору тексту
 cursor_hand_tool.title=Увімкнути інструмент "Рука"
 cursor_hand_tool_label=Інструмент "Рука"
 
+scroll_page.title=Використовувати прокручування сторінки
+scroll_page_label=Прокручування сторінки
 scroll_vertical.title=Використовувати вертикальне прокручування
 scroll_vertical_label=Вертикальне прокручування
 scroll_horizontal.title=Використовувати горизонтальне прокручування
@@ -137,19 +135,24 @@ print_progress_close=Скасувати
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Бічна панель
-toggle_sidebar_notification.title=Перемкнути бічну панель (документ має вміст/вкладення)
+toggle_sidebar_notification2.title=Перемкнути бічну панель (документ містить ескіз/вкладення/шари)
 toggle_sidebar_label=Перемкнути бічну панель
 document_outline.title=Показати схему документу (подвійний клік для розгортання/згортання елементів)
 document_outline_label=Схема документа
 attachments.title=Показати прикріплення
 attachments_label=Прикріплення
+layers.title=Показати шари (двічі клацніть, щоб скинути всі шари до типового стану)
+layers_label=Шари
 thumbs.title=Показувати ескізи
 thumbs_label=Ескізи
+current_outline_item.title=Знайти поточний елемент змісту
+current_outline_item_label=Поточний елемент змісту
 findbar.title=Знайти в документі
-findbar_label=Пошук
+findbar_label=Знайти
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Сторінка {{page}}
+additional_layers=Додаткові шари
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Сторінка {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Знайти наступне входження фрази
 find_next_label=Наступне
 find_highlight=Підсвітити все
 find_match_case_label=З урахуванням регістру
+find_match_diacritics_label=Відповідність діакритичних знаків
 find_entire_word_label=Цілі слова
 find_reached_top=Досягнуто початку документу, продовжено з кінця
 find_reached_bottom=Досягнуто кінця документу, продовжено з початку
@@ -222,7 +226,7 @@ page_scale_actual=Дійсний розмір
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Помилка
+loading=Завантаження…
 loading_error=Під час завантаження PDF сталася помилка.
 invalid_file_error=Недійсний або пошкоджений PDF-файл.
 missing_file_error=Відсутній PDF-файл.
@@ -236,7 +240,7 @@ annotation_date_string={{date}}, {{time}}
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
-text_annotation_type.alt=[{{type}}-аннотація]
+text_annotation_type.alt=[{{type}}-анотація]
 password_label=Введіть пароль для відкриття цього PDF-файла.
 password_invalid=Невірний пароль. Спробуйте ще.
 password_ok=Гаразд
@@ -245,3 +249,33 @@ password_cancel=Скасувати
 printing_not_supported=Попередження: Цей браузер не повністю підтримує друк.
 printing_not_ready=Попередження: PDF не повністю завантажений для друку.
 web_fonts_disabled=Веб-шрифти вимкнено: неможливо використати вбудовані у PDF шрифти.
+
+# Editor
+editor_none.title=Вимкнути редагування анотацій
+editor_none_label=Вимкнути редагування
+editor_free_text.title=Додати анотацію FreeText
+editor_free_text_label=Анотація FreeText
+editor_ink.title=Додати анотацію чорнилом
+editor_ink_label=Анотація чорнилом
+
+freetext_default_content=Введіть текст…
+
+free_text_default_content=Уведіть текст…
+
+# Editor Parameters
+editor_free_text_font_color=Колір шрифту
+editor_free_text_font_size=Розмір шрифту
+editor_ink_line_color=Колір лінії
+editor_ink_line_thickness=Товщина лінії
+
+# Editor Parameters
+editor_free_text_color=Колір
+editor_free_text_size=Розмір
+editor_ink_color=Колір
+editor_ink_thickness=Товщина
+editor_ink_opacity=Прозорість
+
+# Editor aria
+editor_free_text_aria_label=Редактор FreeText
+editor_ink_aria_label=Рукописний редактор
+editor_ink_canvas_aria_label=Зображення, створене користувачем
diff --git a/cps/static/locale/ur/viewer.properties b/cps/static/locale/ur/viewer.properties
index 162ca1475..6235c159f 100644
--- a/cps/static/locale/ur/viewer.properties
+++ b/cps/static/locale/ur/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=حالیہ نظارہ
 tools.title=آلات
 tools_label=آلات
 first_page.title=پہلے صفحہ پر جائیں
-first_page.label=پہلے صفحہ پر جائیں
 first_page_label=پہلے صفحہ پر جائیں
 last_page.title=آخری صفحہ پر جائیں
-last_page.label=آخری صفحہ پر جائیں
 last_page_label=آخری صفحہ پر جائیں
 page_rotate_cw.title=گھڑی وار گھمائیں
-page_rotate_cw.label=گھڑی وار گھمائیں
 page_rotate_cw_label=گھڑی وار گھمائیں
 page_rotate_ccw.title=ضد گھڑی وار گھمائیں
-page_rotate_ccw.label=ضد گھڑی وار گھمائیں
 page_rotate_ccw_label=ضد گھڑی وار گھمائیں
 
 cursor_text_select_tool.title=متن کے انتخاب کے ٹول کو فعال بناے
@@ -143,8 +139,8 @@ thumbs_label=مجمل
 findbar.title=دستاویز میں ڈھونڈیں
 findbar_label=ڈھونڈیں
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=صفحہ {{page}}
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=صفحہ {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -216,7 +212,6 @@ page_scale_actual=اصل سائز
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=نقص
 loading_error=PDF لوڈ کرتے وقت نقص آ گیا۔
 invalid_file_error=ناجائز یا خراب PDF مسل
 missing_file_error=PDF مسل غائب ہے۔
@@ -239,3 +234,5 @@ password_cancel=منسوخ کریں
 printing_not_supported=تنبیہ:چھاپنا اس براؤزر پر پوری طرح معاونت شدہ نہیں ہے۔
 printing_not_ready=تنبیہ: PDF چھپائی کے لیے پوری طرح لوڈ نہیں ہوئی۔
 web_fonts_disabled=ویب فانٹ نا اہل ہیں: شامل PDF فانٹ استعمال کرنے میں ناکام۔
+# LOCALIZATION NOTE (unsupported_feature_signatures): Should contain the same
+# exact string as in the `chrome.properties` file.
diff --git a/cps/static/locale/uz/viewer.properties b/cps/static/locale/uz/viewer.properties
index 6ad24319e..a17eb6b3b 100644
--- a/cps/static/locale/uz/viewer.properties
+++ b/cps/static/locale/uz/viewer.properties
@@ -46,16 +46,12 @@ bookmark_label=Joriy koʻrinish
 tools.title=Vositalar
 tools_label=Vositalar
 first_page.title=Birinchi sahifaga oʻtish
-first_page.label=Birinchi sahifaga oʻtish
 first_page_label=Birinchi sahifaga oʻtish
 last_page.title=Soʻnggi sahifaga oʻtish
-last_page.label=Soʻnggi sahifaga oʻtish
 last_page_label=Soʻnggi sahifaga oʻtish
 page_rotate_cw.title=Soat yoʻnalishi boʻyicha burish
-page_rotate_cw.label=Soat yoʻnalishi boʻyicha burish
 page_rotate_cw_label=Soat yoʻnalishi boʻyicha burish
 page_rotate_ccw.title=Soat yoʻnalishiga qarshi burish
-page_rotate_ccw.label=Soat yoʻnalishiga qarshi burish
 page_rotate_ccw_label=Soat yoʻnalishiga qarshi burish
 
 
@@ -147,8 +143,6 @@ page_scale_actual=Haqiqiy hajmi
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Xato
 loading_error=PDF yuklanayotganda xato yuz berdi.
 invalid_file_error=Xato yoki buzuq PDF fayli.
 missing_file_error=PDF fayl kerak.
diff --git a/cps/static/locale/vi/viewer.properties b/cps/static/locale/vi/viewer.properties
index 64ae6e3a2..18ef487d3 100644
--- a/cps/static/locale/vi/viewer.properties
+++ b/cps/static/locale/vi/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Chế độ xem hiện tại
 tools.title=Công cụ
 tools_label=Công cụ
 first_page.title=Về trang đầu
-first_page.label=Về trang đầu
 first_page_label=Về trang đầu
 last_page.title=Đến trang cuối
-last_page.label=Đến trang cuối
 last_page_label=Đến trang cuối
 page_rotate_cw.title=Xoay theo chiều kim đồng hồ
-page_rotate_cw.label=Xoay theo chiều kim đồng hồ
 page_rotate_cw_label=Xoay theo chiều kim đồng hồ
 page_rotate_ccw.title=Xoay ngược chiều kim đồng hồ
-page_rotate_ccw.label=Xoay ngược chiều kim đồng hồ
 page_rotate_ccw_label=Xoay ngược chiều kim đồng hồ
 
 cursor_text_select_tool.title=Kích hoạt công cụ chọn vùng văn bản
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=Công cụ chọn vùng văn bản
 cursor_hand_tool.title=Kích hoạt công cụ con trỏ
 cursor_hand_tool_label=Công cụ con trỏ
 
+scroll_page.title=Sử dụng cuộn trang hiện tại
+scroll_page_label=Cuộn trang hiện tại
 scroll_vertical.title=Sử dụng cuộn dọc
 scroll_vertical_label=Cuộn dọc
 scroll_horizontal.title=Sử dụng cuộn ngang
@@ -137,19 +135,24 @@ print_progress_close=Hủy bỏ
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Bật/Tắt thanh lề
-toggle_sidebar_notification.title=Bật tắt thanh lề (tài liệu bao gồm bản phác thảo/tập tin đính kèm)
+toggle_sidebar_notification2.title=Bật tắt thanh lề (tài liệu bao gồm bản phác thảo/tập tin đính kèm/lớp)
 toggle_sidebar_label=Bật/Tắt thanh lề
-document_outline.title=Hiện tài liệu phác thảo (nhấp đúp vào để mở rộng/thu gọn tất cả các mục)
+document_outline.title=Hiển thị tài liệu phác thảo (nhấp đúp vào để mở rộng/thu gọn tất cả các mục)
 document_outline_label=Bản phác tài liệu
 attachments.title=Hiện nội dung đính kèm
 attachments_label=Nội dung đính kèm
+layers.title=Hiển thị các lớp (nhấp đúp để đặt lại tất cả các lớp về trạng thái mặc định)
+layers_label=Lớp
 thumbs.title=Hiển thị ảnh thu nhỏ
 thumbs_label=Ảnh thu nhỏ
+current_outline_item.title=Tìm mục phác thảo hiện tại
+current_outline_item_label=Mục phác thảo hiện tại
 findbar.title=Tìm trong tài liệu
 findbar_label=Tìm
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=Trang {{page}}
+additional_layers=Các lớp bổ sung
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=Trang {{page}}
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=Tìm cụm từ ở phần sau
 find_next_label=Tiếp
 find_highlight=Tô sáng tất cả
 find_match_case_label=Phân biệt hoa, thường
+find_match_diacritics_label=Khớp dấu phụ
 find_entire_word_label=Toàn bộ từ
 find_reached_top=Đã đến phần đầu tài liệu, quay trở lại từ cuối
 find_reached_bottom=Đã đến phần cuối của tài liệu, quay trở lại từ đầu
@@ -222,7 +226,7 @@ page_scale_actual=Kích thước thực
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=Lỗi
+loading=Đang tải…
 loading_error=Lỗi khi tải tài liệu PDF.
 invalid_file_error=Tập tin PDF hỏng hoặc không hợp lệ.
 missing_file_error=Thiếu tập tin PDF.
@@ -245,3 +249,33 @@ password_cancel=Hủy bỏ
 printing_not_supported=Cảnh báo: In ấn không được hỗ trợ đầy đủ ở trình duyệt này.
 printing_not_ready=Cảnh báo: PDF chưa được tải hết để in.
 web_fonts_disabled=Phông chữ Web bị vô hiệu hóa: không thể sử dụng các phông chữ PDF được nhúng.
+
+# Editor
+editor_none.title=Tắt chỉnh sửa chú thích
+editor_none_label=Tắt chỉnh sửa
+editor_free_text.title=Thêm chú thích FreeText
+editor_free_text_label=Chú thích FreeText
+editor_ink.title=Thêm chú thích mực
+editor_ink_label=Chú thích mực
+
+freetext_default_content=Nhập vài văn bản…
+
+free_text_default_content=Nhập văn bản…
+
+# Editor Parameters
+editor_free_text_font_color=Màu chữ
+editor_free_text_font_size=Cỡ chữ
+editor_ink_line_color=Màu đường kẻ
+editor_ink_line_thickness=Độ dày đường kẻ
+
+# Editor Parameters
+editor_free_text_color=Màu
+editor_free_text_size=Kích cỡ
+editor_ink_color=Màu
+editor_ink_thickness=Độ dày
+editor_ink_opacity=Độ mờ
+
+# Editor aria
+editor_free_text_aria_label=Trình chỉnh sửa FreeText
+editor_ink_aria_label=Trình chỉnh sửa mực
+editor_ink_canvas_aria_label=Hình ảnh do người dùng tạo
diff --git a/cps/static/locale/wo/viewer.properties b/cps/static/locale/wo/viewer.properties
index 38c7bc184..ca3f4c316 100644
--- a/cps/static/locale/wo/viewer.properties
+++ b/cps/static/locale/wo/viewer.properties
@@ -108,8 +108,6 @@ page_scale_actual=Dayo bi am
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
 
-# Loading indicator messages
-loading_error_indicator=Njumte
 loading_error=Am na njumte ci yebum dencukaay PDF bi.
 invalid_file_error=Dencukaay PDF bi baaxul walla mu sankar.
 
diff --git a/cps/static/locale/xh/viewer.properties b/cps/static/locale/xh/viewer.properties
index 52cd75e5b..541ddbfc9 100644
--- a/cps/static/locale/xh/viewer.properties
+++ b/cps/static/locale/xh/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=Imbonakalo ekhoyo
 tools.title=Izixhobo zemiyalelo
 tools_label=Izixhobo zemiyalelo
 first_page.title=Yiya kwiphepha lokuqala
-first_page.label=Yiya kwiphepha lokuqala
 first_page_label=Yiya kwiphepha lokuqala
 last_page.title=Yiya kwiphepha lokugqibela
-last_page.label=Yiya kwiphepha lokugqibela
 last_page_label=Yiya kwiphepha lokugqibela
 page_rotate_cw.title=Jikelisa ngasekunene
-page_rotate_cw.label=Jikelisa ngasekunene
 page_rotate_cw_label=Jikelisa ngasekunene
 page_rotate_ccw.title=Jikelisa ngasekhohlo
-page_rotate_ccw.label=Jikelisa ngasekhohlo
 page_rotate_ccw_label=Jikelisa ngasekhohlo
 
 cursor_text_select_tool.title=Vumela iSixhobo sokuKhetha iTeksti
@@ -101,7 +97,6 @@ print_progress_close=Rhoxisa
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Togola ngebha eseCaleni
-toggle_sidebar_notification.title=ISidebar yeQhosha (uxwebhu lunolwandlalo/iziqhotyoshelwa)
 toggle_sidebar_label=Togola ngebha eseCaleni
 document_outline.title=Bonisa uLwandlalo loXwebhu (cofa kabini ukuze wandise/diliza zonke izinto)
 document_outline_label=Isishwankathelo soxwebhu
@@ -161,8 +156,6 @@ page_scale_actual=Ubungakanani bokwenene
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading_error_indicator=Imposiso
 loading_error=Imposiso yenzekile xa kulayishwa i-PDF.
 invalid_file_error=Ifayile ye-PDF engeyiyo okanye eyonakalisiweyo.
 missing_file_error=Ifayile ye-PDF edukileyo.
diff --git a/cps/static/locale/zh-CN/viewer.properties b/cps/static/locale/zh-CN/viewer.properties
index 214c746f1..5a33d65b9 100644
--- a/cps/static/locale/zh-CN/viewer.properties
+++ b/cps/static/locale/zh-CN/viewer.properties
@@ -48,16 +48,12 @@ bookmark_label=当前在看
 tools.title=工具
 tools_label=工具
 first_page.title=转到第一页
-first_page.label=转到第一页
 first_page_label=转到第一页
 last_page.title=转到最后一页
-last_page.label=转到最后一页
 last_page_label=转到最后一页
 page_rotate_cw.title=顺时针旋转
-page_rotate_cw.label=顺时针旋转
 page_rotate_cw_label=顺时针旋转
 page_rotate_ccw.title=逆时针旋转
-page_rotate_ccw.label=逆时针旋转
 page_rotate_ccw_label=逆时针旋转
 
 cursor_text_select_tool.title=启用文本选择工具
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=文本选择工具
 cursor_hand_tool.title=启用手形工具
 cursor_hand_tool_label=手形工具
 
+scroll_page.title=使用页面滚动
+scroll_page_label=页面滚动
 scroll_vertical.title=使用垂直滚动
 scroll_vertical_label=垂直滚动
 scroll_horizontal.title=使用水平滚动
@@ -137,23 +135,28 @@ print_progress_close=取消
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=切换侧栏
-toggle_sidebar_notification.title=切换侧栏（文档所含的大纲/附件）
+toggle_sidebar_notification2.title=切换侧栏（文档所含的大纲/附件/图层）
 toggle_sidebar_label=切换侧栏
 document_outline.title=显示文档大纲（双击展开/折叠所有项）
 document_outline_label=文档大纲
 attachments.title=显示附件
 attachments_label=附件
+layers.title=显示图层（双击即可将所有图层重置为默认状态）
+layers_label=图层
 thumbs.title=显示缩略图
 thumbs_label=缩略图
+current_outline_item.title=查找当前大纲项目
+current_outline_item_label=当前大纲项目
 findbar.title=在文档中查找
 findbar_label=查找
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=页码 {{page}}
+additional_layers=其他图层
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=第 {{page}} 页
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
-thumb_page_title=页码 {{page}}
+thumb_page_title=第 {{page}} 页
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
 thumb_page_canvas=页面 {{page}} 的缩略图
@@ -167,6 +170,7 @@ find_next.title=查找词语后一次出现的位置
 find_next_label=下一页
 find_highlight=全部高亮显示
 find_match_case_label=区分大小写
+find_match_diacritics_label=匹配变音符号
 find_entire_word_label=字词匹配
 find_reached_top=到达文档开头，从末尾继续
 find_reached_bottom=到达文档末尾，从开头继续
@@ -222,7 +226,7 @@ page_scale_actual=实际大小
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=错误
+loading=正在载入…
 loading_error=载入 PDF 时发生错误。
 invalid_file_error=无效或损坏的 PDF 文件。
 missing_file_error=缺少 PDF 文件。
@@ -245,3 +249,33 @@ password_cancel=取消
 printing_not_supported=警告：此浏览器尚未完整支持打印功能。
 printing_not_ready=警告：此 PDF 未完成载入，无法打印。
 web_fonts_disabled=Web 字体已被禁用：无法使用嵌入的 PDF 字体。
+
+# Editor
+editor_none.title=禁用编辑注释
+editor_none_label=禁用编辑
+editor_free_text.title=添加文本注释
+editor_free_text_label=文本注释
+editor_ink.title=添加墨迹注释
+editor_ink_label=墨迹注释
+
+freetext_default_content=输入一段文本…
+
+free_text_default_content=输入文本…
+
+# Editor Parameters
+editor_free_text_font_color=字体颜色
+editor_free_text_font_size=字体大小
+editor_ink_line_color=线条颜色
+editor_ink_line_thickness=线条粗细
+
+# Editor Parameters
+editor_free_text_color=颜色
+editor_free_text_size=字号
+editor_ink_color=颜色
+editor_ink_thickness=粗细
+editor_ink_opacity=不透明度
+
+# Editor aria
+editor_free_text_aria_label=文本编辑器
+editor_ink_aria_label=墨迹编辑器
+editor_ink_canvas_aria_label=用户创建图像
diff --git a/cps/static/locale/zh-TW/viewer.properties b/cps/static/locale/zh-TW/viewer.properties
index 55626cabd..b673653e6 100644
--- a/cps/static/locale/zh-TW/viewer.properties
+++ b/cps/static/locale/zh-TW/viewer.properties
@@ -41,23 +41,19 @@ print.title=列印
 print_label=列印
 download.title=下載
 download_label=下載
-bookmark.title=目前檢視的內容（複製或開啟於新視窗）
+bookmark.title=目前畫面（複製或開啟於新視窗）
 bookmark_label=目前檢視
 
 # Secondary toolbar and context menu
 tools.title=工具
 tools_label=工具
 first_page.title=跳到第一頁
-first_page.label=跳到第一頁
 first_page_label=跳到第一頁
 last_page.title=跳到最後一頁
-last_page.label=跳到最後一頁
 last_page_label=跳到最後一頁
 page_rotate_cw.title=順時針旋轉
-page_rotate_cw.label=順時針旋轉
 page_rotate_cw_label=順時針旋轉
 page_rotate_ccw.title=逆時針旋轉
-page_rotate_ccw.label=逆時針旋轉
 page_rotate_ccw_label=逆時針旋轉
 
 cursor_text_select_tool.title=開啟文字選擇工具
@@ -65,6 +61,8 @@ cursor_text_select_tool_label=文字選擇工具
 cursor_hand_tool.title=開啟頁面移動工具
 cursor_hand_tool_label=頁面移動工具
 
+scroll_page.title=使用頁面捲動功能
+scroll_page_label=頁面捲動功能
 scroll_vertical.title=使用垂直捲動版面
 scroll_vertical_label=垂直捲動
 scroll_horizontal.title=使用水平捲動版面
@@ -137,19 +135,24 @@ print_progress_close=取消
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=切換側邊欄
-toggle_sidebar_notification.title=切換側邊攔（文件包含大綱或附件）
+toggle_sidebar_notification2.title=切換側邊欄（包含大綱、附件、圖層的文件）
 toggle_sidebar_label=切換側邊欄
 document_outline.title=顯示文件大綱（雙擊展開/摺疊所有項目）
 document_outline_label=文件大綱
 attachments.title=顯示附件
 attachments_label=附件
+layers.title=顯示圖層（滑鼠雙擊即可將所有圖層重設為預設狀態）
+layers_label=圖層
 thumbs.title=顯示縮圖
 thumbs_label=縮圖
+current_outline_item.title=尋找目前的大綱項目
+current_outline_item_label=目前的大綱項目
 findbar.title=在文件中尋找
 findbar_label=尋找
 
-# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
-page_canvas=第 {{page}} 頁
+additional_layers=其他圖層
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
+page_landmark=第 {{page}} 頁
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -167,6 +170,7 @@ find_next.title=尋找文字下次出現的位置
 find_next_label=下一個
 find_highlight=全部強調標示
 find_match_case_label=區分大小寫
+find_match_diacritics_label=符合變音符號
 find_entire_word_label=符合整個字
 find_reached_top=已搜尋至文件頂端，自底端繼續搜尋
 find_reached_bottom=已搜尋至文件底端，自頂端繼續搜尋
@@ -222,7 +226,7 @@ page_scale_actual=實際大小
 page_scale_percent={{scale}}%
 
 # Loading indicator messages
-loading_error_indicator=錯誤
+loading=載入中…
 loading_error=載入 PDF 時發生錯誤。
 invalid_file_error=無效或毀損的 PDF 檔案。
 missing_file_error=找不到 PDF 檔案。
@@ -245,3 +249,33 @@ password_cancel=取消
 printing_not_supported=警告: 此瀏覽器未完整支援列印功能。
 printing_not_ready=警告: 此 PDF 未完成下載以供列印。
 web_fonts_disabled=已停用網路字型 (Web fonts): 無法使用 PDF 內嵌字型。
+
+# Editor
+editor_none.title=停用編輯注釋
+editor_none_label=停用編輯
+editor_free_text.title=新增文字注釋
+editor_free_text_label=文字注釋
+editor_ink.title=新增圖形注釋
+editor_ink_label=圖形注釋
+
+freetext_default_content=輸入一些文字…
+
+free_text_default_content=請輸入文字…
+
+# Editor Parameters
+editor_free_text_font_color=字型顏色
+editor_free_text_font_size=字型大小
+editor_ink_line_color=線條色彩
+editor_ink_line_thickness=線條粗細
+
+# Editor Parameters
+editor_free_text_color=色彩
+editor_free_text_size=大小
+editor_ink_color=色彩
+editor_ink_thickness=線條粗細
+editor_ink_opacity=透​明度
+
+# Editor aria
+editor_free_text_aria_label=FreeText 編輯器
+editor_ink_aria_label=筆跡編輯器
+editor_ink_canvas_aria_label=使用者建立的圖片
diff --git a/cps/static/standard_fonts/FoxitDingbats.pfb b/cps/static/standard_fonts/FoxitDingbats.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..30d52963e281dcd7e6dd70555340fc987d3568ef
GIT binary patch
literal 29513
zcma&NcVH7ow>~V{tfVN3lb|fY64|9Dfe@PMB@lWu#TYPPim`F;MUuOURV=F)cU!V8
z_ueoV+ki2>C-fwQ00EK^64H+Rj`QAclzV^we~6J+yU)&?d1mI!nKNgYj8Ps8CX@Nz
zs_?|PnAH)nVTXf~leYS=b>E!gdY9pP%5?qU;rhYT^=y;|E&NZ!@HJxGsBhjGH|oiI
zwc}!!k7iuK88AE<EC!e1#Td;P!{9S0#ze+PjA@J+jM<ENj75xPj4v2#7#kRy8QU2C
zi~vR;;}9c+5zdHa#50l^B1SqRn;~bY7<mi>!@?+FlrZd!N=6N%fziU~U>s%iG6oof
zjB|`jjH`^BjN6R+jBgp=Gk#$F$oPfvn(-II#Ta2Sn4_2+=3C5nneQ{lGRHB;Gbb@W
zW`4??$@F0^U@l=UXRczdV{T$@Vfrz5G50bLFb^|BnUTy`W+GF_Ol4*=rA!4gm#Jf#
zm^Nk+vy556tYX$M8<;K34(3s2FLQu7$UMuuz`V@7#=ObA#k|XW!2Fi^9rH2s2j&ar
z&&*fM*UUee!2A#MALjpfcz6&V9FI3Wygc6Xc;Dj#55C8T9<;|qk0~CXczo(H!(+C`
zT#p4Fi#?WkEcaOHvBqP)$0m<09@{<qJ$8HS_1N!m(BrVj5sz?>D34f=1dn77kw=<G
zrbo7i%tPU!_Q><ldzd_|9t9r79;F_3k4lefk2;S=j~0)1k1mfMk6w?b9)Ej`1kDbb
zJq!PLC->zXoP2Pai_<)u=Hs*gr-e8z3Yv`}Zuq}{F?2S5G#fvfjUVBkbMT`%7&6Cw
zjdPiUbD4v4nS*nggQ0UUbPk5%M?M(pgP}ec>f`>6p*|SugP}ec>Vu&^7>aMt#n8DJ
zIu}FdV(47=Jq(?Tp>r{GE{4v<P<(41hR(y#c^EnmL+4@WJokMJorj_GFmxV<;-B*|
zbUud8$I$s0Iv+#lW9WSMGYp-Nq4O~mUoODV1sJ*jLl<D^0t{V%p$jl{f%`dzF2GRy
zXCa0z#L$Hpx)4JbV(3B)U5KFzF?69DgQ4#K7`g~U7h&ik3|)kwi!gK%hAzU;MHsqh
zQP7+q%<3H6K67yU%)#w52e;20+&*(~`^>@Zg9*ocW4bZhm~6~7rW!MiiS`M?G-H-A
z$(UnIF=iMOjQPd%Vs_^SVQw+Cm|09L<`vV5S;eGcPBEqPf-s?&PfRCf6O)O##8hG?
zF_D<Z`9YXPOd{qGQ-~SF1Y-U$eV9E=-hv=Z9cB&_hk3)aVb(Bdm@`ZnW^7>)<_c4V
znZiV2o-j?AB}@|L2!Cb;VS+F}m>$dyCI@qaslm)FS~ULu_rHG?*ZBXZxyEDFwIwbw
zCMcSLHJIuGR!xk{ZUr@p>4}H-e>^sN*gT$iPVr3eyg2F+YbMLizQTEfvxRf*js0(a
z_?FA-W3Obd=kM%%r}o|X?;78I_+G;3iK83dpYZ;H_b-ug<h3ye#{BrfXCG9K9XGat
zPxIICZT$ZV<_b*XxZ^$_ck;t|9~ON0gkn;=s6OgH^cuQ~zB+#8`1%R&PuM*{HKAw1
zm5JoUgA)yt$Vm~C43mydJ~+8zGE5me<<luErX)_OoH8`!&yN;<RQu7$$4ft!eSG1Q
ziJydha%t-Fsnt_2Py1w=?=<POwrPKSy5-ZpPhU=7H@*9_w?4Z%W5EpZjFU5SW*(dQ
z-K=+KeKxBV52xSfT=n7mto6zAIXa&+|M!J{i<U1bSjt~2TiU*iwd~Ncwq@V0*t9~p
zqWufO7t$|It`w}ST;;K*b<Gd!-dcBT-N^c#8%!G?Y<ji1eM{KZ`P(;akMn=H^FYA;
zJ?Hlx-&Y;jzW?|E+o4~B)*OEO@WR7+hl>wiKKxhk8^Pm)=LhS9A>@OQ$suz>R)!>o
zXhRx8E*<eWl6<83$k`)bhrSuQB-9Z4L)g@?=&+MvgCl3XKmcRyWi2O<t7{T!AhI*0
zbF}L}O_l9OfJ8hPZSOwZJ#ZrM1n-Br!#-dmPvn-$TOv70&L&Z-fcL|k<NfV@H1F!%
z-r%Z3yZpo|e=0;xVDLx?`kZvFw4;SASoW7;u)Cw9wXdSP(VO?f^or85syaUJ$=sty
zY7bMqAFOM_w)!e)#kRPFLt#jWwv9!zS?JJZ(zT}SkH>_TJ<>Lv7~Y9X$L}<>)z;y6
zraSGz#OUyZSQ@{dlw9t_Lij&J60)huUXP#8si{hfjf_r<p?SCc6XFZ&X%y2+T8tK}
z)tV!d%W~v0g~>{Jp^wc%*wg}Tt+2tL3(H6dV*Q0S{RNu{d^H8uyoR*|3Sv!w4HM7?
z_tkG`E#aEfL2mw?052AL3$>9K{x~~{7*US7^vA_XgfDC$x8i4SvyS3Ni(ulnFp+>|
ztZ&i8MQ9>{rot`qGI(A>o&<Uu0SWK2HXsJ!g_b9AU9Uza{|rZd;<bGZViMj8=Tf{=
zv;9}D-r<b2XVdwLVpXY;V=T29odRB4dzCO~Pvk~4CW<x)2{=0j-VEpdAKH;k<tvK*
zMVDEP)q*xB#zy>$H3|u@@o3?l;RX>*5iwobT2HXfB#)FeMjRE~2IdLS(XK1(9(Zp>
zrV>k;$U<MBi9Tp0@`c6AfHc|kMQ!v!HVVKRF+Iv?%EUCDFbju6L`-mkleB-?kbk9)
z^HqKA*>CvpF=Cn#F$FQih+N>@ekYQ;8e1>1ujZh4(L8e9kl*#2gG1ME`VX#I=jXr1
zoz-G4R6!l-ygE>Kp_+5GuKC^_{>{Tf%Qpt^^vj@zvJal#ELa@6W#yW#W#<#<3-JSS
zRU0^HG+IcmJ>z%t=9!@zU+x%Ov)0dlHRbi?1)&RYCHHlbZI7P}JZj{?XJ>}KdC7-2
z7d^rJd#;#1C7OC2xA-T-6ri^k&p~g_I5+QcG!0YzpX_P#;dp%&B)lSYb%~zgTps3o
z!lYBABgM7YwMZK`GJRxvzSK3%HLW#sWZuZU6MJ2&T&sSEL`gnMM(+}Bfuy<-KDcL-
z%|#zd9Jq~F;NJFAEBxrsb^YWCd*B&4KmGI7bNHX$Tk^8AHNUEndT>q+qrSY(X=>?f
z=@Yc(5}oX@++clBb%fJ<@i{FpH(uv7Mja|YAoyg_ijRHnt$dV0do7hVzH%BL!bYnM
zMggO8blGwE6y7~l24h;YVE&igykED$HJD54SUF~EZlR#`k?q`FdhqDLx%>Q%#GYM;
zq7tGKD3y+|w-!}*^N%GwL~o#N=mVTqqt70r=@118upbUUJaE_F-IJZ2la)gm)di~j
z98OPk^9CP2I*2|-^U-0nW&(T&ODW#pZ7}f(EP>g7G%ValX;V~*iZo6xt4${C-zZqI
zZ{?a0o46{HZr@#yst)BusAF<+1YyZXt8}zBU!|8zInr!Zb_PGfncUjtEU7G{c(Bb0
zlgQKcr_ULwd~IH?QNiKCtilXiavXn8*uFgyDqF45=2$q{MN&sC-)rf0Sb!G5!cCWe
z3#%`QM(00DzJA`3_g#4t{L;xQc?6fCn^Y)MG9>AoOtDgw&QCWV=?tSH+q!cq1idF~
z+8gK-XN#@J@|!JnWo1R2;zEm~kYAZyDo&GT$W@d&N3SqwI2N@nC!3#|nI%e%)c+nr
zDN69Ch;ut8W?+dRE;1`Ag%+h`$Heesi=zz+O0URMtJDfjj#i<~(ni{%DmcZmQh5O-
z&sP|d6dZ9;c3A_z!Bk`_ri?bdQI^jsl4jXtf_TxM6q!NXc!;hIYmTZ<)+H&z(_%Qu
zSt5y8z+3hxF~?qH&CAWz)5aXBDN7KSm>3n_n9$~M7|Wb=Ph;a{%|My-gvh2YRH||e
zDo($iRORRCOlD4biM^~#(AN+YRzU0J8nr^j;q8BvnHD3B5(LDyRmy2E6yXpKr{O`~
z+wKXmV}4@&l+QYNCH^lZjOSQbh7@8`L4U{z!HKJN&%2Ua;%e!b`tZtBM^NwXd#Ui2
zOgC1Rn~L7r{drKJw^(>2F(!(W5GRZZ=Fhwud*VcY$K?XbP(fH&N;E!x!oiIkFL)bf
z2%+b}s;}xrqj@)6Q{XNMu`9bxZKsK5w%@JeI{eXl^V(W<t@>6Sr&3pLbMmW&wj^rA
zQ}g9=La)}PtN8L<sX{>w#^p+vSkiSeO@`h(*>I#V$;3%kOH+k>Rh~+#qVzr_Ox#(f
zZ#atruMtwELMGv-6^Zk+DD-C-epFa4yAxKd@;2q($;sDnvI{cG%J_vATfT|PF3Gk#
z_-371Z=y2eqI04J=@~kG2CXk4)WyY`5<z>j&Cx(N+AA9k)YmC<FKkIw6%Uo#x=WPO
z&?mk`uC7>P5R?_@%W0#=XylIvCh{@i!S@dOz(9y&W#Qrc!v(>PaLP3*fb7qxFL6{M
zuU<l~R_4g~VtYzaHddQcum<+Ujq__JS@*~9Fy-D$&ftv`mtXK7ZMZmp@#baA)2IhR
zzdJsH#Tz#)@)=rrY9sw<(hKxq)g+D=Qd@<?N)hw2E7TLZq@*?1s;h=YuVLbk=e%|J
z*JtOZz{CVt<So<5aud*^DQMzn+q`q}uOGL)MiZ;iB5$wF4k6rVhTlb_T||3mEAKZr
z{(pVsa>5@9_>fb~T5lN&xFNW6{`{RgThFgp>ld(IPV-)*v#fbmEB`e6s&!!KI^X?h
z#n!DW)(!Ywl~Fs{vOJlLpU%1__ZwI%a6edae(RkZLj%_=H1D@!mI8g4FzMhXT#2dR
zBkY8y$N-DrJ<;gXE-qT&;-f2Yh1byn6gkXr`TWCR@$R`kM6qNg8$w_ffu6EQ9tcTZ
z7lgrFBD|<x+%9OXt!ONyAr#Fec*l5MBLu{fykjT~<`b?5EEIv}6TFV*teEmp0q<61
zL`t-T=G{YKXb%Zb*$|9o5y@<?eK5&>#-3B8vDeydc7y$wsy{@dfwoKRaImP+o?rjK
zZmH&d_npo)n!J`sq-$-d6@nt0(PXAg8X~DUy)xgbH(DvJMwFSIrbzMTeRootB}o_Z
z!)j8U&28n?jnuu%ZDt}xUz}Pi;I)3|C@U%~r0W|BbOgo<4dq$og4&t}dl}to`gV{g
zVx!cYxkhWTwa8rJeZ8iyPh*%WYy3;4TXraP{eJ77WJ1lp8X-=O%}7l5Mim1)q6lT4
zQptCHHJh|(iEM+yYBAahs7@o1o*@*b3(|55igh&d7n92B`pS-47^N5sn@oW*s5mSu
zSENi+c{jrfGN{68I4UPB$dAm&+2k4|`GNvdeu;)YVNOgWq_|cYf@Eb`3C>F!MJmnt
zsxm=Ej@20>O|Z%J-UW3v1vRBVpC4P6Us_OH<Z#%kimMyXjBP28n|a?Xk*tc7#HS~v
zCwT|QhsKy=muwg-P7W7Fx+zJ^D0GzP7uoXZvv)`odAGI%Ec*yFJBjShAe1?BwM>wy
z$S=^*YpTcw387LdbL9f5+G3@>_O{yl&z|~gDtHDxFZ-#?Zn>IsY4pV^$x)%hb<@s!
zcJGR-f^01~cJyb#>8lx;S7_ezfQ)O`GWrA;2Amc3wD>C`Atoq(x4?gEVbK;EzfiP!
zQ}Gr7Vh3*9Av55iLmx$QQjxBd#Per@=OhS#<uL9cyiuvlSCmkB`3;qPtO>?GL8~V&
zjtUK=B5a2%Wz8Jk^G_5?WwwNWpggHAjl#vICCJ2K{6u}WC5^J3CVv6m1DJz9W0p>x
zhQ=&KbMS}v;3Z{QPZo%r3FTRwR8_V{&X2vhxyEWW=jT)M+Ot`Mf>Wo<3hcC5Q7$U7
zVy=sd?VO@=OKBnBs4&TmRH3cZZYkmz<@!u9|5L<Ug61I~^xiiw$_*t33k5P5N9vVU
zjY*fUtI?LI3e*O@!FcleSfg2?lj?RBgc?>$WEzD+uj1f|c`x~mzg1z<nT_7<)#diW
z9*#+;G|B|Ly8-B3BOz6(RJ2Ae%gmC=lzNp(#X+;rki6>wiOs^Uu4aeR8R0m5I6|06
z%|vgJ7L_f}V7PN(tjVY{DD*O8dZEguwkWhR4SFkkY?kKHY@MPwV(sPAF&wX7VY={U
zH7u(ZJNv7QPJ?K)-O2l95O$M57rqXBnDZdHxuo2AG{5oe1xv>{Y=Z4S1#ANlCc>$;
z+bj81$>ot+3V|u9is1c>)|!zQ;v$}rNQsbz9^q>b7X(#=ao`6SL#ir_RdvR%Q^o?3
zt+VZ}vDtDfl{W8PXW<7mQCT3(%9cx0H1rfDnv-*R3054j2e--zv^JR(SBe|!i($?7
zv59+Q6~xHqDl)xJ-sm<A>I<tVcvk^l*shr;|89;^o|~@9_0E=N=7|jp&W^RUW*B6_
zJ2MO!1n=9SvTwI7cf_bgN!mE?L$L>PcH43@#`eg2^qqF8*c|6bOiVYX6pGiH#!l)b
zV9$0kvnZ|Bng2R?Y???cCA>0QerSXzrLbx<7doCpRm%r0@M-~<7wyBP;Xo7@O6ys>
z4a5<>uAr9h`fwLJY;Q=MuZ)v+mffA38$=@wJ6W2Vm`m+dxibrg_gvVD4ByNRhaK<@
z1fuP*J-mfiD4EFRg)(4P6t|LntN-+17j?Sx@`*eA&WvM$>5=JTD%&K@<|hb63DM%J
z`r4ujM=9lO=rFYl?mZ5ljb@;j;sEpx4To60`u5ZLH17zb2yI~DB8T}R=0q+SOr*9k
zuk?IN_*VbWwOhq8WmQzZDL<cIn_3YaE)s=@S0~h_Q)vxtIn9D+e;of4Jdn3pZK87x
zf3{!cf3wuFe&@8*HF5UTnreGhm04p}nW#!^7@lzKKeTOMq(7D7F6{?cwztp4$7~Hg
zh5Q!Y04|z|*d*)}v(~5Q#i}V$F2Q>k3kh}XR6XHuHRWF9^9IUa^?d@Teb{Ihx<y<o
zCt)-M6DXMNmDTcXD@1pH_x)>}<*F|50T#?{`Ct;aWy}ih7kG*IhvXA3nvB-dJP`w}
zLsMWftfyg>knBn$oMp9@je;}IU3+&&`ff{&vQ*NAHfssLA)z=fDm5`?)vrlIFMb_*
z{bWh+lF<Fq#25<RX8))r+Ak@cjdWR2X^*jrlYJyu9U|Di+Fa;MyXpL}#Z705nCz)L
zTYpOM;QX#dpDf%w9eub3nD8FFcMX4yJN+zqU2J+nbb_e7n$9;C+W1vR^2O67=#4KZ
z6Y?T=wg;R$=NvlOD?IPFIe7Or3g_&KdioSsG7(0hQScU=Z{huo3;OsfX=fd?>smSl
zu#GhyO(wzu1J?TTk5t5Uwp3QOQoR3E$}21R*G}AM9HgGZ90L9AZit8Nu363B;{0Zu
zO}Gyq_8)ozpSAEtPQhLHFS#@NK;&Bf%!iTppS(Er^X<UaE!b~xVnw^t>Fnp<+~C|!
ztz5T%>E627_GJ3E6XZT;P+1qhrOw$*@rqV-H6<U4NR5k4r`NA1dEcCJWS2{erJQ4N
z4q+tU|8Ugq9f3y&yE?jC?G(DB$76-Vz=OptQd1;+)YV%kg2WcLWS@Pr`2}t+=A=KS
zyoRwYyzAB(T-XPDr*P3;v~SwKO$<|DJ*=C_#Z9|@K9_RMHexlnS;v~FPeaT(0#Ssm
zinf~a3;Dbrf2Y`y7$Z)MUH>@o^ws{7p$@9$Wbw6&eBf@toQ|P*cb(H#Z=JNLFW_q$
z7k09*^eA?Xtb0ZdR-L)zetNoT_ud`x+c$4ZJT>4J_-QM=DrswehGkv(UGLAo|J>K|
zf$L59iRAsysflISMMT1wGI$plKc>MX^d1tVqA}yCpT~4+V8N-=YP2vUREvCe@6^GZ
zc4}n3VFDL8SY-q@vm{z#uR&)j<GVifXUFY}NC{AL(yQ4#4@P6PA%sS)Y@u8!)=<&8
zc;S3Bpz4?qGK$T`z%4#n1-qTfs?k6>2a8&Y^GYg8>YYtaNfqy(|Nf*VBb_Z7t%Alz
zTX_xL2UL4|&#e<R#*UPuhEC&9Y(ummIlBV(5se06S+YPR%#P2Y_n}=0&r-i8c>n#!
zsgRY$2%=PxX<E7v<t3{Vlf`I4FJcoA4pYhAhLp_ua;I&qwYWG|EtV>eWbG3wtG!Va
zGL!Xx?*&dNj4mnwzN0YLk}1vfPE8C-kChy%9IMFe6jdf#qfJ5HMS4Z2qE1xp-H_i|
zQeMq5S#&lFzgSWz(o$11vcOD~X-r0=punIO8R)Vl?Z}&`VVwgBfooW(x0<a2n^m5X
zOUEP4*@mLrl2qk>Wl)w7G4?663Vp80TT#|sSz6e3d2F_6S71p7A<YR)NaU;Y)LJzq
zF%-!P1r-)Ts4bM032X&ALm?fqA^1ojqKIs9f;>?WpJ278;pYF<Rr-nvfByCn7m`sS
z*~C7rZ`PTbH8tK)$nMeV4^SKJtQ$6GUB@8j-pC@>#uDR2C1uwTk!<(NRnJGaz$&x~
zn>H_C6Iu?-c`qhm9fq^Y{d@4-g=3ua$8Mf_$nVMM-<5tORYYZ(C7Jx#q~utNcP~O%
z({%qy!<EOshE18dDtKi$?Vq?ZIC(n<QdlLL(mZpi^U+w|(=rr@$NDp<7xg||2s=C6
zMJ`24VaIcrfhNN{zvBsJ0W83S6qnp!C9A907f*IwIg#A4Ga^kWqvb}8n9uv^RD5z`
ze6-L}fA4R{x!X^YXKxIO*^x%6HCeeTzQUq06m@4Q3Mk&U<Btie5AWq80uehuITB(j
zji4e+qZ+#S?T(7hCP#7<m6apO;wLo899O%pUbuRsV|{9>QI(3-+pl?Fx%^*^ZgF)Y
z59r|iHWlmc7n8Yo8S^ooN#901Ofba2-vsZ)Pw0CVUO{>6Wbs}gkIgKxC8tD94akTn
z<Y;7nX(b$by~E7Ez(${*Cb6%lfaR6`eD-r_6kU7qBd{<BGtdm!eH%W))5uz0zhnuQ
zmnoUf<(-hg?qpI6Jw)b}2eJ!-W5@MHM`=Z3YJfPC6BoM9cu+9OKp;N5w&`Skm!PXl
zme@qMB~%6N=i>|z8w)eZ7kSov-DIzAZKzF)pv2gK=O?tt>{nWE44sZY=NlH25HG~l
zeU97YtK<7&d5gPErUDywM*f}${%A2Q=Dk{ho1;KT_BEVoIxBc`VZ&_XIoEgM20zEC
zVEV{_<jN)fWy|&ELF#(<P|X7Y?-$AWUlLbDrNxEErr7J~LQ_#bpZ9P@b#Q@jS4PYM
zF_p15Z;gB#$LK?Dso8q-YW?N2Cljx1Ss%P}6Bgx#%lQkl1s39dyzn-z{Z_(7v8JHa
zMEI6n%U32?qec9X#DtK8Ne$iC2k&;Bq_AN%mq1Z0p(H0Ehfej!hRbtTqq`o<??Moo
z3)BCE&v`F#9h%F?L)9sbgZ%HW_J4i(cJ${v;*x^mscVrZgBSD1Pu(_c-n6#Ycl+8d
zG*d9@B-v1IZ)oG62(3O48X0=zU{7{a8Wk{?<oy|x61#sNe_MCp`Jv;j=lc#-hdSIG
zw!!BIj=?wXlINrOu>B_N#MA$0yc3hSt^-E$K%~FWUogw}s~>^!^z<L_@n!5a7`INg
z@rWP2A!xg3xq#QR^|RXBjgH#p8b?w*ovFx{@_Ap!H%c6@>>#*Hp?$z3{c5*ezS(g3
z!eHpxt!omtY;l)7^H<kqSog`RneMW8z8HE9#LriFVG>+t5)a@ucC(&n)8$mu^P!vF
zou~?<qRLsk-I5`FNmaus&bK3<vv#TVgG#C}mk4Fc!9wy365v{3222C07%iQI7+Gj0
zqR~_-OoX?o*JBRlqV?y7G_a|Yf;AH9P?*49gLa3|UL`HUGfri7V{t)Mei^R+vassZ
zx_Fo~y4>knQVi)Oolag~-}P>6zz-6<Z~7z+o#{=2?(VY6F8W6N#pa=cny?n}(Ry#K
zUa$OSj@1+nL{fLLzR+qc^;W`U^cIZuw+HD7USGyy7*DKVJwSpfrhqi0LURKoL{g}H
z$3cFeeN$Z+#T!`adI_h<Wgu{9dQ-8D_?8}xQOe{Rxz;=4EMc`73Jds^VtbN-+JiQc
z;;%X^XQnFCqEeF^(kr~tcr7Wls4QlFQGP+WmC8GBsy9;QtNpWyk+juhN^53Y5C53H
zwY-TsZX<a8OF;$mj}-!;xQ*W5YgyE6Zc5dsuSSzIwHXj;ht2Usx!RVV&X=mCvK&gZ
za$4qAK}_M1J*y%%=6+u0t<JccdP#S)&bubq%}i=!u=t1|`e2zYmWK2qGOkOnbJPr&
z3A`yH#r{uQcA<<qDGkA!1lSz&bHK)AE(~0R?iNpMi48<?FS;VPv$8fO#QSPE!k1Xh
zxBM{Rdb9r_hAlr2>#o4cf01kPBtI~KvRK6}EslCS=kCD06TkDHu0A_&;YMG?)Kce_
z#O<n+7tb{x@LRSmbo&v?KYUBT8ot{`I_V;Nv2o;@a&g}U_@ae}aLJoyk;qeXJ@_lZ
z*SAl7H<)nTzlhecdH?j5IqC-ZU#~m4V#T(=<vQxLg6PYwZaO76T^qG)$AN?ZI#Ejm
zvw7%(`F7k&zF%nEj$I)=gJ#^rTOj0=Yb=)g*&tZ|6?zPMgM<*o9R%)!Q%m72D?p3F
z(K+JG7?=(z1WIvN_hCQ85579(wp0C29vFZxF2RBp-hWSFA^ovgyV7tr@GHUZL$_Xj
zv-9>mn)lDC&|q1Fn8saPcnZ~{MmEMCV;#5DSN97p)*bR+FY;e@Fr@96?qB=xIE0;q
zcL&_I;es<euELr#u=W3PkJFIP?7w~AR}vp&rTPnr>(YZAYXv)Y90^FGQ}!wSck}lc
zHdh>=0;>9>hXhYgJ$QJ3?~R2?$;xaoEs|uUNs~EP8ru@`WK+-JW#|4KyM#M@H^rPe
z=jOttKm8O_u>`Kb=l^n%7{$HDa>9(eKtBZ@rypI}3Aya4=*{(LQX-nc!SB2{2@6ic
z9Cus6>N6o{VBX0CXJ9oJ_Ygb*MDEN8581|FbaBr&-`qO-{ZPzN{}RgGW{$pMXUi%6
z?QQ+5R&Ch#d0=gDPX?9#JK5V<-`n39w>KavCSX@$LqCNxN<+!yKy&-4p|0euei6yr
zcLh66QON$+1n&Pf1@9z;^|%FCc_yq67G2$O23EE3{yBtOV;34vZnPW?y(YMLx_hva
zF6}hk?BTyofDh37?yTqdeKCJY@483*M=Oq()2rm@ov9QSE-b#bSwY{0H%Q)p9b4i$
z&s=bvzByFCBfu{{@ZaUnx5r%6F?WAoe4!6l_spXfPuEAj+#w6l-#*qL!Im8gG;zs1
z6?}Ms+A(HsBbtRZ)(818>DQlAVG7>%8k>nGd`zLsW5(k=qPQ1akpV2lt|Jlqw49i4
z*<N2^N9x{u*LD%}kKyT_u7=-9NSd6VkKTpkkp->=DJiZ+Ba7m4N2a@`OQfz(M?TFA
zADQo(w{I`u3LN=>bQBbKH0kf54`ebth7-9=`1=Pu?|p>_q-$CW`%7(IMZrzZoe?oM
zoA6RR>kq8n{gFQeeht%~!*2Ja#>1=fC~oe{YbVdPaRysXx8CCSC${_hryf|VrFbuW
zECg_FUwrcH!N%zm7X&WbO(kbUiX;gfNZaVnlzSECpMfbierLih`1A?v#>F36L4Knp
zwitr0YpIjkn#O+qnb67rDo{;aWOt~E{wC+i&eYn2+p?ne=;%dO;zjPYz9)jaw|6ZL
zObtJjLiZ(9#ct)#`h4g7<%_z$$2}H{E_po~wm=U$0B`bcV5uL$r+5ILXTw3bMm$01
zzgxcmaap_@3ju#W;@v=RUL)a6*!8cB@cPa*@L;;G!DcL81o9vslo3Iy>d@nY8zmRc
zo=EQU-z$m@%Ar?7E1X=9;y+^*I4jMyf?v<Cp7!y|#UCx*(EqI(k6GZ}ge}+p!nJLI
z%|E~loSWk~>8!7{bqJmgt(!aBciCrXd^GTZfKeSl19kUg&<Y#9Tu8J@m5qA^YsB++
z<kBYW#R{knJUdu?{Md=q-tBwh4j#nSbhlp;yug_jW4{PYKMfOpfp<7acO72%vgV)<
zmZ7mp2=7y3Ic~tT2QcP_yFvFn1Rreuj(Y}scnHtfjSe!TG_kvj|J|+r`*&~bTD(sf
ziH)X#xat^R{@i6d7Wypj`|)(ciGebz<X7@=Wm3=a%8H}iDU}EI2~!T?VUdC2$-svA
zzEjoCz7uh^dw0bq2Dn>+d-Lz>;Ct;4T>0JK!JJ312a6hs-Y4%C5z)qy_*TKKqDO;z
zIw>(s7A~0Of9=WhE4O~aOI_?T^9)cfNjyONMf*o@60F(Xb5lWIfp9XgDq`SFMOR;6
z!totjq}%tqi+KaRk;t9ouGv=XG@AMyFnF=pP2fqw-;0{rr!~!O#`B!}xKE=x$R?+A
z;Y0z+D+iA<@P-M%uS6eCKptsm3L1~RLc!-}>fx9@di2q)YbKa>{G=AfeX%wN(R(Sc
zA0hX~26!|2T1Er2611f2FBYUdB8u5a^CdCzL$vD!ODrTtZfCf@VikuIBad0G7b4PJ
znbzTO!pBF5EVkERl@N|UhF%f#^zd=d(|C&!hKdPvimlVQRPZ!~JA%J+HSRkIKk(AP
z7dQr?5;ppC;R)#)U<K_y;;UbK=`oDH`MPaN8+!NV#>bk?jh`P6;*1Qiyf$#57ikH!
z39TkU466y(B9<4d`G2{Hn9aW2-;eyV=E^+nrKmgmk8xbraF!vy2At(@H-BrJ(mM4^
zcZLnidJl6(uCcoN+b^nbZua?T&6F^X*T{R5g#THCH<Ds1J>9z|k2l}^r0t{D*I)kp
z{S{yBvgn{doF982=;DzZ`ni|Z{1*25$mBIs=WV>CxzpHl9OuUl==SYctKxV)x-5i(
z+fXQCo*BO4c?SAO*XTk5m9e!NmoM~T9(>`12J=wH9>EX19>CYt2{qZ)(f0p%@{DKT
zJ~=$jurv)ZcBce*XJS{bL7+3}^*Z{}BiP&ZM=?jI)#|h~Z<b!C*V_bUtyQn*Yuzhc
z<ZVMU+t)th=<r^sMv$wMN(^-6j&H;6#&CGsMnFfzhgx-FTCG*(s`+ZY+Nh+AN?TTO
z4#(@sDePx}g^(c{-7@^k2d)QDO8WW|!sN{4NdE55kbzcbmD54-W<eH|At_W4RiZ=(
z-fh^nD<o)FTt$4jm_D<a7+KHSzAJ6xx|5mbXs@R*O$dQa5a`bxeu-KAmUR6OUbcc1
zVsH-81PUDaA2vo!6~bKLfDeYf!mutkY%UAr5R2pxLm(eF?5|bA;X5McT<%Eb$QiOb
z1m3y>Q(A#8^6rCx%lEPCZ3ahg)mg0kqd~{^r>85k(lH^3nlK-4127_I`y%$1FF5Ts
z68lg)OX_O-ode}3ADw-8;oh}@p5ETx6C9h(U@Q^TH^;<CRSIPeofs7#l@z&ba?rv^
z?BQW#BW~<R`_gm75^0V`I~I?xX+&LPORYJ_B9A>19%H1@hiE$CrG(YO-(mId{#@tf
z-q!n`a0&8BD4NW|opuMpiI|Lv*pqQDz7MOHu@>TsURWK7mD+0339A!XUd_M~y7d0s
z%C8#F4Yc3(bWMkSBrKj_X7#|Ee?9@mapcj97|%k0&B>X77PF?JUh+2deu4AoB?q84
zfHezWG(v9_YdXHDgx+M9mjvDuy2O}cHRgCf>B^hN0uv|^PQ<j4Jhpp)_2B__Yz&Hr
z)x$izO!T_Hj63`!4JUZ@4^9w<UJ+i;{uDy%Jy__^?euhYe@6<rlh9@M6pddUjN=C*
z1xvdnFYZ_%=WzRR)hPjd&GLGV-&g<zuibC7d`EV&VBFc-*BS~gO=bzXQ_$D!T?dqh
zL+FG1HL;qlcrd=TO!yx!94$h5whWT+KAORTa@Tf*6M-Gx@3Xyno(o-lI5cHtKCa9{
z(nZh6XSIBZ`(^@AB94`fmf6wNzvsYYj^wiun&qYLaR{TiLdWQqYIs`B>v1yx|7Gzu
zq1o^W8*DI$a3atrEM5<qjsDB7Mr9=Az<*&L8}z6d=`*<?*d}!ChIM(Jc@7vOVxAj*
z=!v^y+{kG%Uyhv-ONe@9drO_bVwUH`MTN)GXck&*kpt^X__PhkBJX3c@zS^O1{Nxp
z)o+UH_Y=tFxf(eg6@i%8vGVQ=MEZEgeZCpJvu!oUtJXNYg?V;3$@32wAp2l77($4=
z3$PuJTn*GBWgcJ6){lIGQt~Lxaaf;6q1$K-3FfXSG)9dWu0m)g{$it7aCtR~MWzm4
zgcmnx(iP#;r*N$9Pk(MLh^swuw1GDXpC_>HZiZfH8)3mMVj{AlXYATi5{`lS4jb}O
zBFaZ<;uYJg<rm@4*P*D|9Ts%73XApy>Dm&?y0{H14-M*tK4R90iG2^vUW&#LwPWtX
zm`(5j;gX(b!4|XwZ9$ueQ*5uLrNZG=BIZ$8>Uk7ikjM{PFf*`Cvjwv_1N^`beF~pp
z@D}tb`V9F|*t3O|!Y#H|>r$aE37$z%7vc3cyeWjYo4;)QvKihMF^3m7d3Hb?3BRyj
z{)snqkdOtLxPRkB;PARV>}h`z=oc2S(A$J-5G^6$F&pNfCB#2@bII=>FL+FVo%LYu
z(z%3JHJ-2@knkBRAtEoZA+q!QwXUlj>uWZ2249GX)%#b+aL{Kg9P5XJCtk3yY4s+7
zp0PSd!84W-y$9?(8a-!u!TT^p2tmydglCnFt|Z)1Cy^LpI_3ECXalFd`<}L6@SL@4
zhkAD5w%gAhKL(E;<Z*n~w`+dP3Na$~KmcbZYwMQ0?tS!;#`p`$0S+#tVAhFck0a(q
z?^+<o#*f_1K*(47D%@(jYPgDbY&Z)Zl7|uyYt5R&oZw`6dI~?WN@gp!SZk}Pt2h7r
z@%~XxE?dW5a&*$O4PSC<6J%DgK$;>;OtGeSCet^AfxWsbfrIz;TTyrQOhJe^Gda;A
zZKrw1euBO#a0<MdzY&7H3aT;Vjqo*jAOW#=&P(9<iuD1Z{KKcSx=QOS$_lBAkIsST
zw>=Awt%P?rf6pn+jw?(P1Rjh(9PA7_nnpj22JYUT1P(fZ@}GYy@b~*7CgjYfA^H{A
zpFyj@>j}1IYnb)JF3);6NDh0musJv`g^Tbv@elqr7LAi|y%t!6!-w(AKfKD*73w-l
zqTf+=da_g?k=0t%^reK{Qjs7bCM`oqXUU}UH2$8Bk1O_5=1gOzEr+8t7w0t!ifXk+
zGu}vmKU_C(QxX-9u{(W4!C|x)d~nOv@V_G5`acQE|CONp|0F2K5<D;s&tg6uuJn9r
zB8MyC`xNd!_?uYBc0EUW+*9#4VZ$4u@IAbRU&h~r*Q^slmrBIE<@(hVMt@5}FrIg3
zqFAj4wz^b=hBZ<z#n+$VQJaKl0_(15F17$i;d%2-Ui813>otp4iZvIX4Q*I+;e=h6
zEM61VT(8-9!{cAo<#Ma8Qmnd4Gr8-|3SFk3ig1j|t4F*xSC(rT38S7Hg1cfmCEn^E
z8m>DoaCkS?h?Zomc4$LucQq@~sF`C&R-<4NmSsT!o{5(f5%WjBAfXUqiL2(5);<aq
zqFBPKPbY-eIP@e&G<taLOI}+u93v0(o{zmMsH!qpD`|1KJUoQIw`@;!5QQ^}A$T_u
zJ2HEZ^Y5POIeCn_Iiy+Kx1lf88$Ky{)&G)0tZ?+U4RIU|TZgvXm#x}9HvI7J;2na1
zjdd+YXs=nn2wlFS`y%Ew*K1E0|B!UmDKM@6E`@}PrenrJVE(QZkb>Q7(@{L(g)3h5
zjmw6$)sOfrNhrw3zdwyoChygRdRv^ex*EZWeo59*T6iJ)y8ee?$^Hmc@c5s{qTPo{
zSW<-C^<I`mfd5fkZ(LctF9DzD@sXPYcf~7#?fL<agXMpC!g1J4wzOZV8xWj1864h4
zU)i}#wtIc-cJKUi7cJ)nXU{0o&d_^aroVzu_y^;+tkN#td}{3OW4n6p@{bqwIy)#_
zS`3j8l)7gxKg1GV9!^=4lMG3M4O?Rm1kzr$PN6GTgjr^u7%uUIv5-jy<2j)@g2>ws
z>os{exF<!AXM{Y|fRuU-r9KGT@suz)hXiNGDHIET!sXtVBWZBd7cpAV7_`63_fx_P
zyk2$w2HRGPU}xv(;e6oco#1^lya;|Fd&>J9r!D<<@20{!X9vG;f5ZOm;Rp7JskHr)
z^n*#9e<=8nbp3`Dr&HR~s{FhID%wNN3Xb<Q^mRnnL=@1w%l*xJDt1<lO*#D!2WAtN
zk-4O+2VZE}h;?ja9r7oJbFlJnY^kiTuE9~uk;&2V@nv<C4z-f?c>lJ(RU8>B6vf5{
z+nXq~4L%`xeO3#OWVXm<GPyfha3r&NF}D>HGWZ9nil|Sn6mz77T~Td<>YtueI%(Hd
z*M6d+!kAabzrwD|GexD!RZ<+<mVgct_)934%kh?1Q<aLAohH=woMt<Jz*iBGO$l?v
ziCO8K$dEkqZvMf%NaG<KYKEuIKkMMw)2IJ8bz<i}3D$`$7YpvA<Iwo|W+DN7&Yri5
zs6`k5ojYH-=T0@AI}?dJc<%gB_^cX=uK$dC<FP8wHn-hknZ?4BY%j_H?bcnyp^<Iu
zwd-!+sWTpZK%RyV*1;IUWjf`aJU8Lla0hXojYHR8c0yFm&n@kE#LaO>tlPU!p5Vdo
ze3uuAeG00<A@M1}(ax&gzCG>x!y-jViF9~mntWd_XC&xP5@xdi2b&)at4%O%^Y%5h
zZoMh!YOg(7ms*ulN(VLWtq5ri>KLmUM9cmnV4;0vB?|>lCtWxgUCW;Icw|i(G29$Q
z*4GqP*Egg^#wMl3$3(hYC^n3=noU-V6$hEia%3`v#X|8A@K7M>tSqmpYe|Ss6bTb!
zLu(r-ug~-9U5&MIz#H9C=c>mSV|e#k#<(8;#o~3nc0C;V8po@Bf|%^Ok@KXh(N#av
z$o5*2*XU}7cbF{=t~%hQaa~tg*m`-BaNQg^$42ktt;&Xx?ig+;7e^YC&-`IIqG2xD
zSDZigAiU`V%hvsP>AM$jr1_zwa4cGg;|*4#kC*Mk*5(%rv2B;<34$?@!}=Ir{R*!L
zgs<Gj?&pT#<;=$6EuQTb(rLWoD6>@++`940UnWx-4#d6o#e)@9Nt}?*#;huV^|H-m
zq4fn3)o3NGS@GN(mcr(H;AwBqDH^*^u`p9558kr;qos@XbfTHCEpCV-VP(t04@kv1
z;yk(INLlp#xv!9iF(*%=%n3Vyd{JObJjZKUwQzVs5uR@AhIe?jSjk%bPsOd3_JWR@
zM}Hg5rMXsFZ@}p-&SXx=(RwUJ0dTBF8?7r2ZANoo>xLh^A3cWI;9JrqD;gWDM!Ymt
zPW0ZD({}D$dt(N?AA5$A$x4zeStw7<N!6t}Ld&Agta~=usL0JwD#P~UwbM4Y5XccI
z9LCBAwm~6|mBcF=H20M~tWZ!;UWnt!at&&efp01?84Q$#ZPptMdNX1|>ewg1d-6xV
zjbkvFO(woMJzr&`bedd~TA)_ssB>wFlrSp7lnMc!y1rPBS5y|2+9nZ5<mpmbF2|r$
z8FK`wnYcgkWtKF(oVttrH!NK?<?t%+=v`?^S$GkftIMU#3Y8*P&dF71R0_VtDly3@
zsYxd-6cknKtpzxQcmDs{3D~9x@%+O=mJ5kOmf4DT2?N^q*6-*!;H}5`lsKA=0=-49
z(a~yyNnsS=V-tEkjr+7-W#gD~^NVx>3(H#IG~t^Cc^X|I`UE!N&_9Sjk=xDBXi=K;
zv^h8)Nv&!$^7T6WkIFaiG3N@h(LQt}KAA>bSVNdq@_d;fD^rrCrDbZVM4eftRZ^K*
zS(&o5nwdTGjx9h-(7v%*CFwXyN|D1?S!6mjWyVo%g$j<|Vm4X@I(@F1#-Y?IzSnYP
z8>F><(*~k8W?vgbw>)Wss5Z|&C?>&#?08{q2P57UHL<i%O5o77Qe<ScAujn1zFqnl
zm4b0GGNN)HD93g=cEM&q8n~mKOCSSVtQpwVf|Zl|lMZRfoib1w!cNpB7~6q^RXQ;C
zHoSqcbtKebKh%d%2lX%>)#G0uB7BF1FUFHF9zI0l*<SPUd)auqHwV904)OTCY!cE@
zHeR`9V|zUY+v_=4H|L;q7QP)rVrV>yVSDXL$L^)3$mZ7i))qJ_8V#45E9;N7Ml|!j
zleoO#45{3a9-JP*Njs7j9m0<;6j!HGh4M0~Nx{k08RQ0m!C=wpXgqFhg%(bASz&nt
zzbCaZwS&rN%4k=fv>7cHWB!1$J+m=`Bkpb#bqgBG3#-d$OQEgIWa8*_7K4G0Gs@Lb
z3X`-<UdX9VO(}{N?2Swo?Wbe2A|wY?Dy!Tg(;NB=+lm@E<vot39)3esc|sYLWl6Ou
za3;Abi%OtU$#ZjQg(6j&CFdlhW{IP5P-A5IVX7#qIMfgzRpsQUWIK!@B@xA(vXJP~
zU_rDvGa;3hXGv2PxH`FVl?rzY74G>ag)P;R#Yrf$OX>yPjU}aRbaQcg>7dadwa9Hs
zPCjNg*O8qsv2wC)5=#lc)S6$CPniw*W`lu~XRv4~U9Lf;)#&k&29uIgA~DO-_@Z=q
zW+sJaSZQt=2d|{|kQzg|KHqA!c^4K~3QGm01@iQKTAyQ)y5BWmNjMsXI#)xfRElgR
zKA&)MMY=?ulPXA+7ZplqS-!+3(s4#;6`87*;^~2d<Nq>K1!AeCL_({~Ir%Cqj6$!~
zQ5u~|pT{>C%{GIX!~1SUNxs#L%d=!<=hHSxfyANyUx5rdeX2!bm3bFt70WcKoK(3q
zT|(ukB{H=dGo)5&1RA9&k5(FF7P*m=VUt@*`DI0x!U8JaYQsV2IM9B=tIl7+Z>0zV
zIz|tdVB4n;+dfO-S8V(AR}32a9o|hv_0`z+39LJ?J?tR1eNy*lryWe@{4);5ldjh&
z?{rFQn$vCjv>iDoIDV|5uRXFR65Bpy{+54jAEDd!nNOHU7L%@H;G@wZkDifDXs6rs
z`5Bu&RsWhk5z)z!331r;(WCbNHGNvJ=_3+j)2FPN8u{JrLfnhqE!%fGIW0R4H+ZVq
zdt^UsAdComM>@f)KLtJgh;Yq@*`&;zgJWCGRtg(SIcBUlb7YiP`QT530l<9;9(xD<
z&-^$z`p)34Q$OQdte=3h_l*DGkAu9g{IK^VgtVoJO(KEc{{4P_#}5n*9X~!~SC&gk
z===AqN~_A2>&@%9RJevHV-?=a*VznKllT2)gd|NN7V&o++yCzi6z|fPXZ9c8Ar>p7
z>D03OSby5|Ht(wiL>YTiL2kY(Ut#mUbC-~omMiQ6cM(JTkNMHOFVF1=Jm4obiEU~0
z=PRUUsWDsUoqdr=Wo2)csHG~Y!uyLmgssF_Ud|udf85XSzyUvscdo_{ms@T(*-EH8
z%N0_UBv<0SKAT8o-^kKS^)i#p8w^lR*4XVeHFi;ayvUvGHP~Q5;Uur4quNnXU0soq
zkdTs`kRYsbQdkGYk+=@k75ISzKM)G>Lq|0=f{!_o)fJ8iZiV~DC=7_;;`?59yc``R
z1kr_PAR}(9zxETni?^-b8+{vFKcivvPggfwi-h;1F8f~m2?r72&@o<hr38kcfh<pq
zu|*4(ZrrqV>6MKS9$dNjb%UfK6(8%{zLQ}ut}s^#YD(qeGFqG{iH_zky|(H8gUgp6
zJlJ?;DfUvPCQ-bG^%7xuPEj4-X)P-&qr^`9zTm;-Yxf^)y1bO;nfxS6H*Q!OV~Z(E
zqQ$9ciUdKD$W)$2mpSw68~E;w+=WxT>h+SPS2sSWueago(6UrZdICRAks%V{Cw>y_
zm^reNi@Kp}CD&_j9=sLv_r%(hSiy9>nDt{QK2z2o>`a6YW;R9tP*ofE_w4*rRnM`8
zp4=GwXM(Nk#Vi=V5XZm1Ij?^Ye1yh23!Yd1HM4M_K8x$}b-ka;wUjE2O0!s+k)EC=
zPctex<>-AeS6-T4no%OQDwRrwC9Nc#gJ;`M#9Z0`-nJ=oluE1n_Lq38l(*Xdr#G$H
zVoRnVG6An6><NuDZ?69fxzVK68fmRAPb*L<BoYyyXT^78Y7!fpYMk{BxmjhQEV)Fk
z#hhmr;9Oozsx7Lmqup2XhWLs|il>?Ua$IJzLMElP-MQy0DxA)tydD)tD$NmQ@*}Gf
z8l2URI+F%}C~clz%jcO!y%eY{w(K%NgR{1=DX}_Qq?D`VwAM;!jd}Q>3(tzPY)UGM
zj7dqv1z5Mg6r>wP)@;gOb09CdGNIaZLDSCRS^c5~GMhtQC}^swY^V`dN7GpN9|cOK
zMx&tBnmmobfP>h}`Sl6T$f)?l7@;}GAgAOyLYJe+Qwp-UF`4l((aw~n61xdoL7E8j
zmbkdIv^9z&S`L=-mcUwIE-&IYC0EBJ#;3;RXmWIN3TLavvz)v@B#2IokBoFCG&oEa
zgNe@KYGi~)nTMyIh{_Bc4r=zlC1`Lsn@W^+SpnUtAJSDPaGZ(i4dMJ*XHvP=Ql&|0
z6wBO=Dswj~RR6UNM}AqgFE(xGq5#;nnu~4lfYn?)!QgAJ{Ut)Uc?NFc)e-9?KAY)|
zOCOH{vE2{|ad-pSo$xi@$_hkrXbRyXo5`xd3r?d!txVjyJxQg}87MymnY8sRzNa@j
z2e;sRxhi_dmo#W~hN|=16O}5A^}kR>p$VUp&huxh4BA{(lK&R`KyReH4v2^SneD@e
zJ)sB!NEnBr;A8A}3ddKmFcD3FgNVWh{u1zkR>(qpviuU7-)An9mx0gu)N@1PK3GtZ
z<tRFdd@dBH`oX-NIarq=pPl8tTPwDr1tLqTED(q3dL`qto_9d(32QR3?E}jo11+14
zjiwCvf<WD@`A{(rRS*dK$+OTGgjc#*=-ONZM(n%K@r1SbolN))GSO#i@QKj~*ox}P
zKL+K;NQvsia0qQBf{~JZhTYZ)IIy8Yatn;NkP#~Kkr*v`iS+nH4|eVE!3U?-)aUtg
zj}O0%z4Gvq#34}&kPkkdxer^7^I<RS#Q|UQa6s;UG#49=ffV+ZR*?^|OgmsQftN~m
zAo(szCP2wTd(h-tC=2a^DTJ2}pZ46*oQJn8&tn^}y(tg2<+Xak1}t|L-o?zpeqaLo
zt;(=2xRN^`dX}IbbV7&4{fKDlBu^e~J=uRWG+<Bg-dzC)kDsEv(mRBhq>b3nt;I^^
z7Hs4lgEjNGFG=3LJza<U`@6dO`ww^R*>m{t9=u9_>s%cKo-hBtvo%Eoi?GM5rSe)e
z?^jogE0Q$o3XFJdQk++zDNRpLl4YqmdG-XGgc^CPfGo(r(fxJniHh@;HC9fk$*ME*
zt$xO=EZ?N?CDfAexd*fP5~sXKK@};?I-8Y)yf%|5w$_+dL2G|&zJ)dw+A7P7$_qOx
z8cQk*I_>S+Qf-BzR9tClE7jOIRhqc|EP?E!(8!ha%E)zrawSJ8PfwK!q^VY87A@DO
z7RYT`_$-4YkOS|asbn7R6}|;hN?K5?Fbm8^y*Z!GH{%Grd@Cp4YA7o#)LP5<Wy+GY
zDk`mND!d^nl-sf$X;yqXRBn(NGBqMiXjV+RSQ;cs6pPYx64l8${;Jd*xg;woQ;ZLm
zknkR<P18jgQ#hi6PEoy}zRp@+PMa$X_4-PVL>d;gU$8&AwK$7*t=5ym$`*$`nNazY
zsg5Q`sgO|bBvZ>9D#}E}j!~k@dWT&^pcTi-l*-nsiX=k0ofJ7*svIeVavLeOw>rzj
z?kizcv(u48Ak%BIzycrKx8j4{R;vM5P^(rdbJSUKIyP;huT;Uo;iOp-fkK^UvKaMc
z1@zqjd^V)fjz!RK$HLS(Dv}B94lGPvInG++PhuG=DiVp6>q)t7=ARj*8Kqh))&qvp
z42#Src{bjh!^tsQRCpy|Ghvsn*$AwAW?a14YR30WxOnWgP|`9b8sn3Lr<dH^Tt%)z
z8?TXZ#Ol0Mr9i2+l~~l}nlf5rQ(EOVj+dfC=<?{!bN5W_<DbWkC7<1Ww)`M?{&oqy
zDUStqEDjxg)AHM9JmzsPPN@g)YQ?|(nD+u!ZsiiZdvmzx-Ie$_{O|DY<gGYdblmr7
zt~3~C;q!E8t_{Y`BfR8z{4aMv71oRk@qXfRJdkwQ_h&<^r$7r{H!UVmGiy3jO+!@#
z>cYDoXfXlPd&z~rJj8px=+{yAe<8rk8VN!)i6U^^{ZEsLyiwqN_;+L{MuKc4q(DD`
z#<0D<!zHbAKnbqRSMZA`tTL1Ewh-3A2Urn|hIf?Hv6f1PIa?eAN@6X5|F5R+0B_<-
z*9MGiWt4SxQN)jCa%a*TA%WzkkOV>+JrE!^7z4(*;ciK`dbh3Kd$+7&*|IHnW7As#
zq5LF-O*SN(ve|61se7}#_n2qcd;d>lf9sJfjn14o^PQtpzVChCW26^GpQOVKdNl7;
zdYMr|%Q>Gw%w<QO{NGjhDKh_&HZzc=5PHpfuhUNY0D6v5{8&_YW0Pq9i5qtoT+L${
zv=9?pM$6)XgD8#+A2O0fv}GcJVr?GiZgsFUyi+bj&q25Q480dZSj><R`sbH!m9pDs
zh9J_}d@fEHDW0IcvEWuTgu?GKGDUPEHiHIR1K{n913mI_DTHGnm)-Op2C9L%?(FFJ
zk;5a^d-v2;?<ubxKTH;{0IKhD(fo-UD+<8h{#y>jpkIf`T>rQ!)jcNRPJ*xQHaeY2
zC&FW1F1;Q~K0p^3vcd6SKbM}JLVf7A_M~uB+sCD~^y`pCf0N~auQkBkPtVXW0*WNS
z&{J|Pg^;Zl*2)EpYIU2ufkd<W=`_tuwFcUQwcO&}J;FJ=C?`T|MT<_~c#-{w?_p+-
z%&2e=-5WK0gWPBZEeLw(A~=@VV++&nzrrxJ9B7;B5N)Ij52Id*Z5izbH<LiFMNHaE
zCk`8A$h{0A3d<SAd&K)O+i_(b<`vCcS%2lDj779)bU)@jE~>+Fw+^s>*gjdZ2AO&}
zf<D!34xfom4GzLmk)e@x3&nV4vT0IFZt$Pja+OFYz0nvYu}EAp_tt@$Go~vx%aUr(
zNcA)k4m;feN}L&14-@a69KQs3n6|yDgT%hd=wPD?W52(B_MSDGNW42nOl6ak9_q6H
z{E4f0T9cH-NE0}uI%UmUchsyinQTkOJ>w(OI55mRffE1q_Sv^i#xlO)VLbo-o;B}Q
zpWJBs_wi(#fA2wjpQN&}ku(A+^v~Ma4Qsp+XFP^a39<)ZY4r74$%ZwTRXfkWM(_k0
ziI|F-qFv$6bIoHrEb9!WCF9z<@%@BM*4?QDp^a^`C2L}>^}c$d1$(2kdZXdr$C7=s
z{v0tgC21U_j6iMr_FhQnl?t6=qOwVFKuc{<ZQ1!6&hrYQV$u?IMcv_nb7#h`SS*Gm
z)!OR1{kY62b1O-4tGd1(e`CD#l7V~&6>>CTJ*;rpUu}o%rhAW0MqyFRu&I<*6;ZQU
z($Yq?V8;Td$Bq#`pHc6H$*o}em6<XVXpC$e=dAIDWA+$mlx&~*{hH~c9S5S6)xxm(
ztpLs)lU!)&yJe(%)*Mrgy;X+8T1l?~hum~>=9=jkmwjG4yJL-4W*3X`{T;gxNJxv3
zVekixeq!uGw7-ukQ@&MGMyS<RyM{8sErab#)+F~|+jk76lwWTjhuV~h^<rZG?%qiW
z1z;b8%BWP~HPOxeZDd)X=JYY#XZ6{=q|x&4llKeuy<#b2zK>RNQvN=jzAun!vx|F_
z0!9nQSHX}{OyB>j$j12GzaYN58v4GE-k}5MAP{9;P49+&umZhCyI$OeB3r<@<-Cse
z<&g_zn-i#^f6fFw*|y6Zja)C0;N_|2qnUoMKTV!Y9UhySU`|eda`gg{h-oE3${vZ@
z7)dGL-$HC&TUuE`?cPN%cz6xb(%hT%+x-q7)#VB*yoAFBXdLQW#Aeu?mVgWQ7<;;$
zq{br(hw$OEU-V?ibnMXiv7s~%(%QihN_~@0>oEJBxZ50sv~j^(;U+?^Fm$S@jr*UZ
z8GAOCt$mrE$6v`bsDCwAU805TpWyJL?PFQ|2w-Dg%1)DqFMa%vOEXLtFjxFUYFI7r
zp=<`2{NkN&Jg-%e1|v{MyChKwAyam1mDF3c&(e!qHZ%2FMT<r`D(J*D8=r;fhrtLb
z3BAE;1sLDvknlzc%qvR^&@j?*4$umQ(r7VS2q!pTY!q6IHX{P!4&4rm$x7I5R=1Jb
z2i=~mf)O=<zXo@x+(rut9X^4!L8RZ~bh+)gLvGdp97%Lw5&~sCcC+0`XtXkui2}Kj
z4K(D*u$sF3dP3ur>ZwWSlG`U4I*Zhy#k>98;MGEJ(m1`9Uc}HF)LnYKD`K--$l}+6
z!W*Sf)~zsGh1q#ie;arvpM=@-lk_S+%$-{ySO=c&mC!jhwxl3*2gkt$zN!ya`c3_S
zAy@%D-}Bh#H;M{AM^AIm`XlA^%MeLhe2!i}g<b}j$sOe|tZb;F?}VeT%+fC(hH>w=
z^qU7}(K;yko#klVZu(W2HZ7Wg+t_#*aRFeou@t~NjN%s}LcqVJ<k(+CaS^J>`zPfX
zyX6l+|6p-~+PKi8KpRli5{n5CfaZvyPZLygzd}KVwUC|rgM`jR>=|=J&y}DI!&3NX
zIvDh&y%8IiE=Fdn1#O_KJU{^tdbo5I+F-FDGhJ+pc>8=oE*<=;149{!K4Q+;BV0No
zfj|uk{#hN=qz&*HQktv~W8R?f2;*8v4|$m^2=bNM+Pn%M_bEEaFcwBpMyhW$OYPh!
zoq-_qlTbE=lBban2nuX8(NKD=LMT*#Kc$M^001_2$G5Z@6&s|QHnoC_f=@vRHWRf=
z&8>PV7iFRhQxP3}(x>q9Z15RULT6%|00&oUU?9bBZszBosR5X?FBuY|^KoMwod>&p
z32)dlDHP<aL(FV8NG5%$VE&N~#{EqA@mZiDf+N*vf_6-)+T}cX8<V%MdG}7d#a%g^
z>pPxtk)9#z>}<a!lfvCF1GK@f#6|`?LcDNWq9$40+mYg*YVL!-=2QHXAX%NNO7KJc
zkkHT6!B5Ht{zsdew4?{jSz^X=$eMLC2i!+fBRKn75a!q}vaWZhvQ8#Yw<&mXzJjml
zP%({qgULwf!PjiHKo>#z6QOjdFO&}Ud6Ud+FoouCB5K=rH)|<vgK_WP7E>!92Pq4^
z0al&{Qqe0<%lg{K1mhjO{8Y(68~hEFr1(j}IDeu&B~QuYDyG9=(;INT&H&4FUbDH0
z*k`IRHgy78qp7o;cMvb8|4$C^Ac$Et;Q=O36&MqkCsA}e`?D0p0~(KaCV|Fr{q#rE
zL^Pz3P%SUL{vs}Ll?@GNj%D1Wv&R~bCk*ifp0K8~ez#8JBKs@7l@nD=QO^*FE%XNc
ziHvAi9HXko5BMrFObs|219+;}87C77V}eK|tj=C4<35%d#)ry0d~)?`FE$ZUMJPfI
zeEi{ucv5?;vA(&iwTtZHnRspO*7gouqLGM{8jrV&?Dls1bw25kWQdn$#>9=WR-#>@
zXm5=*0=96pc1AYMV|u$iK)VtGv6|!ytbC%Q-PA3lT03{P)Z-|9os&(ave^{BsfnL|
zrXbQtuXqVt1dGilo=CFa%YjPO>Fpo-#?La@U*wLAo;oqWES2q*Rgr=>x`YC}Jl8m_
zBH8a9@(&Fi$Lszn&q<D2PH>O6jO-lVo7wn7=h4&551Pl;d&s*(`vcWICkNkko%1k%
z?-?Ea65lwvNw#mt3rk!1N}cgypg(z*>4_)KCh)1MY@MI1P}Mf=#+#ybzBV#+uy@Cs
z_`Z1E@z#mTb8n73SH`4of3NG3hCJSNLUXvSu4A9-Q3dmLZJlHVR4eH{qo4daBfqrs
zleo|5bBac;@4PJUON+jn(4Sf4xHLLAp8CuCwNo`y2d{ja7#kY9$WDbbh*^#u&;{v5
zyD)Zj*j|PWYjUbVn08s7^}mYoFzyx%lAYU$)q4-Vh{44E1jp{P`u%uJC&T<WBs-TL
z4)u;sHB}#MaCE524z;+wvz>WmImcBr<B9eKdYNIbI~XQ%iOMFvbbqr%nefOcc5nEc
zS0Z$Xz*S{7=_udV99f;P;((ILc7-!0aLwz95^NpD-d^sn!~hX_A15Jd2{sc-mD#GH
zls2s=flp5iO~z81c2d!)l;eC)TUZQ$1K<@o?Tq%Geg!O6`)pPFs~Qf7`Q8Ktj{Ojx
z()P(>5Zy-)a;%}SHAFy3GKupFP)kdN{UVH9kA+9#hb99|3k)cBVlU?ZoKxE+5i7;a
z4tbYQL>z3N&ZZ($0|Bp68KKm{m?ld&9cGJ@dhZF26C~bJVY~j;l%~TacPUA?+@n_G
zyn1;@ZDn>mH`LwhC*!`Jgge13R%V5$^~6!AucIeUh|pGWMc`0FoiIEt^0I%v8?7tH
zOr7S=PP`^`@9{&Yjt`~C9hg00ja6Z%I}Q=k-t6eGW<-@$VS6x9P_z<Oi$AU5Vay4;
z3b7Ah?9bxcF}>6%uEyT#tswSmnriF4b^fM}SdXGd!>p0M@Hz(g#UmVPjku~(&NM*>
zr6=IRB^cxb=Km}X)_(^r`2WWG`R=@}L>RRmi;Tr4rb0{$bhdVa{Zo7|RxI#N_y^D(
zS!v|dCmo{iBhu`c=pO_AiA5Kt&Sj<(Cr0fNT~zUjBC3nnM{CihWr^v`xheMb|GiU<
zUMa__pdqq%VP#lOGn{XPufpAY_`gfla6enHo!CKdJv707bSmEjeSSQumtj79@K`!C
z7Tedr({u@RWMfxri@KTl!4n*lYuJ(Q4GnNzL5DYNgX*-JZN%VAQ+-QqMYBp9@XIN`
zLhNfGy1VnvQo7^=4*RcgwWPQy(A2FncN2}BnZD6*b}})mYN6zvav3i0@Su&+Y}&!e
zUg$q{C2O)SdDXLby8IZ^5{+4+#PLJg<|&wNGt?=4CWDWAM}1@D@UHCcO?a0Xyr-nK
z@X*`mWB)hYw7I2ZU6aMQ<OA*O{v%~flSFKi5W6Zo1C{w%vyX3YZ3XV_|Af`mnp$-Y
zS%19g=tUen&=wbIEUehJMZ8|dM9C{0hn*paWtCZIf=*)4-P%?wYdX-r*WXWt+@UaZ
zr|Eoq-})Y>UdQW@H+Ly?8kvFFpx!w>i1&{k8t}Nfv>s9sic2O5CwRi06c~?v{eK44
z(3bOo5*6OzlDQPnj@@c4-dM(Ktr5=*rM<4CgB)~a`h5dTNWMvJNAoxxQAuxaG}_xM
ziFR~IBpuMT{umd|J@Xw}2b1hQ-xr`gi@%?H20iy3{Ty1i6lnV^A434qFY7GDtfI+%
z*rM4|EU^z`kB5A|`0N~)vva)d2<S;T5~QOqWA7tey=D!?ZV!2}c$ZY$Z6w<@f=+%H
zvsCet`c=Ggq<-o|`uJ#y4D^Je;V9GP42Hb~dotuJ-EW5xzFV&`c2in`x?S196gTi1
zs_@F8hN%;M<42NRNnL`}_31Nxc>emO2A8?lOS1bP^_9k59%;9g^0vDLE<UpcD-HTy
z`haM|riMqRPV7q8rYKQB5|V_Ow@!5E9FnjbG6}+&cDuvw^y-aHGO10ddzDP_&=7Be
zm>L?II#JzMPPJhIL6@$b(zUhf+Xy)SnbLSyhuKTzv)UhbMLbR`neZmvDHro(@FU*`
zcq=wlH(a@sx2u*<Dn)XMOp?EBDV)}=kZB-tY;!p6UaOPxBz+0!e`7=Gp$UAdVW@Iv
zTXi|viV0i-M?2|gv$wWEtL)H_?1=?7U%X2jaT+O2qBGf*VxCl}KYEp@tgoxwd7L-O
zr+So8c~r)9c1Pq|JU=7p*4VAxq`=ee>j*Go4GrlkqOzf(lA3$W!b!#x@mLB<l{Y{t
zmKp~^%)CV%v4~V$vrXEfp_();idH#u>nO*XwG8UBOk>y(3Fi$D_n-ER43ceF$}bZ%
zD}_oPrD#z#YnzyFFXLE!S>vE7Yv)?S5nK4znl+?Hw2ge3O3*9}1b7q-6aFUfy)OC~
zJc+^tKgQ(8s`C@GTSkgSBC)Z^wiYkxZ3?!8TA6V3P)g&Y99x`GgQ=pC07zKnP49@u
z4N-qU%J{Vj#C7nsLFkuAmH7nF0Chs4O`=jp7{6w5p%K7MaY4L2CFZjE`4*QFkMrwr
zu@r7v`gT9KX|sxcd4@@|e$T1FEHarzM#yC*qnt9zqy`zmtMd#}tr(0$$$_|1nI>Tf
zQ)RXJ+x8iaO{PYB6W1!UNoDz4fePbk>l*p0aB?6J52VRpzkk4!W$w;#Tv~y!T`1;r
z`C@)`9U+#&9lssv_flDJe=rkb7MFR1147gsL-jGhaV$c~FlvmjkE6#v2PGD?cm`15
zY-Pm5(9fb4GX*QH-vvN)4ZVdrW}N|A2Ktw1t1beOnZ<jNRN1|c?x44z-^#mzKKK^R
zt57SDd>@ecKq&NXq~^SH^zb|H9NF{co4d>3e6#!ra4P8~{xhx*b3+Y(5%u^_RriEW
z9qfU)>t7m%Jfcxi|A($Ki{kHFC(rkGUl#NvrfSmaY%tqC)tpXTexqlk_xz;wefAF@
z{qWQrb8b1uW_JPA#TyBPLV<uk<O#cg{o(+=3;Vl^-|YZFL1R^E-F~B4Z6{Ce;(!>E
zwI`<Uj**e>P-jpBzz>_rMp!Lo0L%bxgGx&e_B0WljoliGW)E;6Drlwh7jx&owvn1h
zcaJ{CH2O?Fzsuru;a0N)7NGmIZQhoooHW8j-9|wAYfk~8bs=Z-m8Me{Pmdm&Cf#nY
z%TI(oN;$>;e&-K%fx1a9A;s-{Ws9C!uaof_@Tvj9_=TgF&U#5($O3(LraRr$N17Za
zfJKEpfe6X|{-M9_aN11<2Q?&2)>gGDAf(<f+B|qDb!7Zd`%Ha?tjpF1_W79#yVMiG
z2abCZ<aOJIBSdZ_J$hkXwq(;=wH5pG_w${*vs2ThB4pY?DF6Ad?xZgpijuKJD$s9d
z4m-l>A$+1aS-pAp#_bx?AUDDA*XrcC+DMDe(%p^Av`SFey7tjEcembR(@_m^!RSOL
z80*1@Y6luC_~q3ViG9PZ<Ve%7az@1j!Bqf_H1E>3mx>2^grrBKcFBl?b-dbJ)_rP@
z<KpDaywzaU1C+@tb&Bj_rd4fGtGY~pa59>8HlJ(8)2Hbdgh(r_)eHptJ211+Y%+p4
z+64|Tk`rYK_n^~j*O-kWvE3=Aq)xe8;RQ$yP@f2+$!yH$Zltb*0<XbowoaTJnYNmJ
zdNAzH@18Q~yNo7EBUQ@fN~KD!m31+VCY`~6LvYW)>Fb~Hj}ysZO|wL$l4!eZjxMS>
zxzAarf+){nj?ruKc=6HXr?cURQmRxb)jG04Szn_Au`7yxo-?U@d)FRZq>>6HstD91
z-0BlfD^zS&HpPblTJsg>Kw#VP!+4KB5|8?&QWD|{-FQ>DG6j>`d+3)qR*glg!D|K2
z@6Dfm)h&|-A_0HE2W=rRJmwf-(nXV;ww5YYH6f_?4n+O_sK;f{xhQEo)73}#{TA>~
z71NJ_hh!rR#@9y*-bcUT<TT08&kVLL&1pu_l1~qZw2a4#mOhf^z5fAYW6_q)Y5vJm
zCri?)Ef*M<ir#-UonHDQ<J+Q;=hHo-^pc#n?fWy0$!Bw3(Y0$)ZSEQ2j-elt+7X&t
z|NJZfIX<05+<MQ*qscQvUkE+9S7JRM9P|pF-2uSVgWg(t$@6>Uz-BG_{zqQ=^;aSP
z^A~uj(vs3sJpTF3aP`+e;PJkH1j-}VK7Y6tEjg&^Te@RV@cBVa&#SM9JqN#tpJ{kh
z;Hg90;ZOGhmgD)oG<R5A_k&<Z!!vR1!E53?l_e&;u?BiL-spRv-+X1XZj}AYC+K$0
zm@4`89}nvuN+}rZ?>;}pSXQ)QLx0=ZvuC&W_ieb$_-oPUC8?n9=RfXAt{C$RKmNE!
zJHA4&^6;N$A!P96>>m$*E%1!5ipT#@;}@)0xySJ{Klp43oOStfOW*eG+t0SNUETnB
zK6{F<a6Gi~u;A+&Rebd-p{M%m<RAAuxtGye^yj@R_pC^2t3L*L;vTe?^KsGDLk#vm
z49`J%%3tPO8UKCt%he3}&fjy^jT=6@TEUp0g^-B-k1N%-d>RPEVw{)9e?NYunz4&s
z!LfaIWt_39sF;2<EWEK6>i6o2f)7wJ=a?e-r=eK;(?^w~=&oy1HWTBSqK6+Esk?B2
zQB$;O(`fC<6DN0$j&8ch7%RH4d1U0_pBY~i*(}#8N9ntc2HL+I5-0!jSWxo8)tK`5
zQ|%40FB8h6^j&qYOm|?{rqNw>fum0+hGJi}2adni6TMm%6#Qp{IPvA~KrMaOE0qQd
zWcJg~bt9WML-rRh){d6$EIm<MdvOz7eDj66x}P3`;uuV?Ox2>hb}JK4H^c;gDpN#X
zdrcJB^;Kd>{B(O@H@a)&+I}_m%6|H;5#{bL+Z)7BC6v3ag4egyFH8&3r&;tTSU3G9
z%buBAKF8*Gbl~o@3+)=GBFqKS)KNgUBd#pi?bXM*w4GkX*dOC~3*$hDFlakL)UdPD
zVpmhw=>O)R(?W*cYjV4Bx5W(}Xc|7R8RB>xG#8~{Zq+T+bCHUEpMxM9dmP|I;3|X6
z8BdRK93BWCt<nnt&jgOHKhc0pfbU@T>5SXC;B>SzZvMs(SBNvbMKrwH)fSK_h3gx%
zB>IT{h{G1!yl$(TV9&VSMuV3ULIE{}^eFu(Tn??$dFT|)4J(`)yO8_M6P&o-+Z~hv
zhc~rE>tGb`%-iC|2GOEJH?{zK<LSA)s2VbhZ6#S%hzpX%hZu1o2OUDU$^A{I46(e=
zuY^$-0!ti17Z`f2$Rr{}B8y#1eU-Pwg$jn=V~Y3SJ=U1bL(=ehb2@K{+t4AEyrfBN
z;37*NS_awJV%bw6KbMBg8LtlHEn!9_260n~T*aNMxLLvRhfZZ<HX6#aM5|-moTr5R
z59RFuuXe3PD8fZXao!Fm>609Go6Qrm_JE3aPu!&UP!&)-utS<&3l~ErV24BWZ6Q^*
z#3tsR-@=I*PBr=E5FI>p%MSD+mk@~Lul@zSf;hlaMX$e&Ub#01M61`>H2Ma7y0xmt
z#!9?wr26==(TStejoBJMiIx|kC94@ms17Z@d*Z-RpmiS`9XoosW^#9{P$d>oY?@yD
z5nB8aLm2PT4iHC2rVk%GFkHT`vTC2kqPBHX^paH!w4!LtH#j(jAFG`xE32(4tIRfz
zsY!Z85xwMNhRtPld-0=H6T2bzvYOhmJ>v(C^vC_N9>^Uneu-ZE5~Eir@&H`4u3}Hw
zRQ-`d(-Sj3Wzg-Q(2_qeip%{%2sYlqLwBG~=+nk;y=7mUTZ#UQb7JI3&$)2Fd%%^7
zhP>vOC1&xOeRdBMa7|V#?(VX5X*4#Qmb7U!b`8;5S1OcKtyL`tYnmXU-K_;_WhW<K
z@Vy&9l0C%@BoY&Sc%akW=^-_~PES{WX@gmZp3uP%3Jz7ZTCdeHMH*#yCEfwQH6iJ2
zv^O^3JR?uXBhxjUchyIPr<$0`#6)`^5dcbtoAP-*?tqJFgSi=a|BYsYoz(ieJ$etb
zSFI0L5FJ9jUPyH}g1#8R<5?X%syqbo|GE>RBeHYc&i<|eNlF`#TV)^&tu(9bOpDQI
zHWHntt}e9!LR6GNYXCXi){}K{IXTgqYsuEQ0NLl%G6yO-BRhM_!&}`guI4D;qllOy
zCcnuKBR|t*1^W<g3&0_*Zkva)`|Nqu!_pC9h^)#S>~9+D@^r(435Br*-td*jOR`+{
zOrX6g(MBkNW6}xubZw`yi)nzlf*#j_mqAZ@)lRit%M^MY%4wn()_`%!IXGw^BGPH2
zE=`3yIO;cq<xM3_WqW&78?JN%02NMhYh6mF0cKNn!U6M9I|YVwxb4iOKWsgW_v+*N
zIN3d@9~{Ed*0du{LX~y;ch;4Qw#v9Ioy}c*iBfBnnWQF_S*ceuO<*4*-U(uiUa!I6
zB@JFcXA+r_lkpIhndr}rWkD{@>2U&df5LnjO~3z53f+;OpM%%FZ$G&9UIE&4p7ZA|
zj9<_kNVMEmxaobys*eiSUSoie(j)Z4^lu9PvVn27u#cYRpquog-+*}0!`}h|?|~;k
zP2grxaS1?}K1c6zKnk^hFI7l&0&aa*U-K}L3?;HD3N1j7$2zO&T1HJ*Z{;*`I6OJt
zN!6g*s2licPcqti0_|hOQ13uCr3i`w6ulPR?(RX`ni-SbZ|mO1FKjdJ?*i9GU1twO
z_<qAM4}vRyfIraGq?ES<u^Xe;NIZk+4aStqbpB0Zueg4#pBkgz5NknW>=8z<OfuL+
zG_<zY*JPA^phC0!!A>!~WrVTcz0I@*-|~)U(n+GN8Tj2jkL7OE7QBD~((GBlJAnux
zV4r?PKRt5`{Zvi^Dhkj~#ls*0dDqDNT+a;>aeqZjbwFT-iyA;Cz67xWq$C0=D-KG@
z^$@)xXd&6N7&HtYei=h+0lfAQy%ru1ti~V$^8mUJttX3D0l#`3@T=F|SpTneg}{nI
zi(2~Uh6Zl2V*1(Q+z%WC(#<oE&V4%f*@OSQ`Bf2H+<)@|XKn~6F+)W_i9vVF4G;dC
z5(8y|kpTlD%-nl(=YZ#mIE<T@3$r&bH)AIO*^m$PU4*M$EWEk=MhT<%Bm`FT0kw+-
zbK4c1x#c%X8UMOiSo}Peyio-fK{S06!2@1tM)6zVMjyGc_ofZK1ES=2&D{h1SU_zo
z1I)!T`f&z8<0?4lF(AN$9?27Mx69De4EhEQ(XwU0R9p^T&*kU|23_$${=CNkneaG}
zdmo2s+-Y+PeUivt&!*6#)cjl$6{fPE4&?t8pqCc|VC)~z=Whcp&r$%6Ed@l#HbfSt
z=ubH47dUtie7O{`c}o#s`ryl7is*s?AUFIS{l|6sKhUGk(~r{BiwG#-Hy?nio?BRu
z1NclW#0{SYTwz`#?@79n`WNVp{%hMR>^&*=-i`HZA@MuAL4*=j-B?do!KW8jVdzIG
zJmK??g~helY&FNH1lndP3`Gxpe1yCFG|2o>`Sv4MFF8cBzM@xMS+@Dv$LX5-=kg3A
zIR9HXzpD_qMZhr1(~Ex2(~EBY7ZmDTLGA<4T7SAXe&1Eb+(^;iuXOal))T*ei^%f@
zIX7&+fbRQ}F*j92-}jYJ^vgQN&0JCOP52e&&~FRSFA9#+$DkiLx)W~f9vqQppltUX
z24#H)z5Olvj=O1)?kk6;xd3g*gXBVgPXOT$)hFiX5~y|()h6z|>mPsT%q=X`BpCOU
z{|POm5cbWUyQzeRF}DzOY;AyonOAeKf&0re{Im<YNpFI2b77&ko$=p>*%fpl<b3au
ze>$jkFB~pPcrE{p=AHeUhI?<-BQ(QK-YO}CXzwV<88|LA1HE|y{0#F@IS$~@JJ39O
z`)RTZ4&PmV7Jh9cPTx}s(cAk$nB?ZU-5BC7M)M0FL_huw{mi%*1nhnW)4=iE;(r$Y
z4gGjO9K8?BnLio>L;q(1+PwIu!ne@E20-Ba4o8ayemsU)<kG_DAK45$m)wcdi!RaZ
z&mV`}V?h179X%_>ek%Ozo69hhfaE|~zwL#e$%hM1(zo|LN-x6c-!_5jA-xdNTc5+e
zL_`5Pu{c<?%6#e+dfa~Uxd`=HRR0dTAOFZa@-Z2xEUH^+2Fh_$hraC~?xa^Us#VRE
zo#a%fzqJbQhDqu{OZ|w1R3)z(f$5yj6Et!NDR!iA<WqAnNR31-!#TVgtujpp`lj66
zO1C0zJ>o>Gm*fnY#yA;jf5BWwR4NNUHosL$JzMm;zVwe0a;4N>`a1q>QHi-^6_j*`
z0Q=j6=sk8EUApl+M+bl{wv@ha6J3r!^UgiLeE;^ft7mva9ez^jl-lKhMFdSxa8aJD
z;>D+qja)+HAayGb^xlJiW1svizb^|rg6_KrRrbZ3|Ga<cHrSmd-O#Hd{jfVr6i{?A
zucMD($0yRT<4WB|nrx)<JFd_#&HVtE*Tdy+ufPODLO-c?%I#9Ppj4yd6Ey<3+|VVo
zc#xvcF3y*dRe|w;O$L4rNG8$hctkB9k`3QVRt&rMD1zvx0QxdeNXA!I{qOC!Ww5VV
zH~R0q@d+oxo>!UQcd2L|Yu@kXEtyBndu-lv*a~j-yjSOKnzw!4?s*lk1zi0+F>L*I
zc;1Qmtogr#ZQK51{{8b;&wpk9+W95(%V3MP>iPAsL0dQM+~k^{hOOAn!DeeWVN<om
z3kcXu?Ge~O?Pb_DZ5M2mRu5aFc^9M>j4U|5;Ov4c3$8EtVZr|t+);3M!4n0~6}()q
zv0z)lzJkUAQ9);cvA|joDCjNdFBmD9E;v?jw%}sHdj;1DJ}daP;Fp4%3+FAoZQ-JY
z+=bM_`xidE9D52QS)98u7N}0&bL$oKeORa*By!7H(0M(bAF62h&nmbNV*#k`X?W~r
zq4mo!7KrKYX8n4AWWnzqzGAJ#?#CX2EYSliFxCs$QjE0>qaR>B_HQ|5v>udp*Rx=7
zS`SA7sJl9kM1B%wo&+=iyaUwlYQ{mjobx4W0`T^4kz9Tjb)2O;K%JHb<?=7-CVCx=
zyexX%GZ<?wJ7?vL<QR#-K;IB?`0a`}cpZ&xQmUoqlx^a;dzy<D{gnqJz<o5K2uQsm
z7Z-j3iy6`yeW!wYf?mkj-c|YLK|Smjg0r?_Ph!hiFk*rpFpIMsZUKg}^`iMKFLOL{
z{p?}<*n^pB2WhhT!~Tdj!qwYYFJbdpxi>JDzi}fLQ^YmQYUzuwW31<}9OOf<W5Kvr
zC1L@r5$^N>w2lSjka%BTT(}9NCl}r#io`{mFxDPS92Bm^SZ`w6FxK`xc-h}t$91H|
zppvPi8Y!2xG;ikKmfq$XTxAf*_}VkE9tWVW$Og<Pml@>*s{!li?-&@v{kCK{<=G(?
z=>Q!?(#uYBSYPC|8!RFehXMGzg4~as8{Z+zzu?KrgUM_np#|cnMG-lxtxfoE#tJL9
zD3@cQpE#^Z2mvlSfNjTE(LAVnb-s31pbU$n@Tmbg;tR5ZYM(-(Rx3!B!O|7eL^WU-
zBZFl#xx`+HSIV_p87$HK9ILa_0YM0d%|Rt5M*I*Oy;ZnNqVuj(XJ__770n-Q%K>(h
zCZa68#3-r8N_zL*3O2IN5VwMs)DDbgk6NQu*r|@0TTx3Ebi!2yEc6hk*A@510!)?x
zmU}&fqevQJx!pPl?dS|Ts=caC1wmm}u5Hvjb71D=sj^eH^V`phF0rIEajT;`bI%W7
zpN5W#mHES!5hx7?1j>7#d#BUIYTpv<4+O2=BT0VCFvZ$VRFv#$;8U#Vt*u0OBP@x|
z0(&^5>sajZ-4Fs`(VsO5ZzM$XN9Hy_$?m0D?`%WZ-kFLSRs<2ZdbJ(@e3S)5pgh+n
zPX=P4jdUZ2MXNaQj-NtZDL&fB;>-=t_1_#WD$b({OV&W{zI^Waph8KU)zKx?h?OkR
zXcMCaEF_+5Tr|qc&4)^3Sc_ONCy~?eWU!P9qo!Pt>aS;U!m_B=0e>uxLl^ag;g402
qTg(c9=&m-Z4zPk|v|#n2p&*MMW`LkWF;GB$AXt<Ys*hnTV*NiDA4KW^

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitFixed.pfb b/cps/static/standard_fonts/FoxitFixed.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..f12dcbce52babb40fb61765aa46ddf47e3846511
GIT binary patch
literal 17597
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
DiyeX$

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitFixedBold.pfb b/cps/static/standard_fonts/FoxitFixedBold.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..cf8e24aee5962ebcf7e4d58d932cc3321f3cdd38
GIT binary patch
literal 18055
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
aP{6{BWwy2LU5CmZYCDT$C?nq``+oq(ZGoi#

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitFixedBoldItalic.pfb b/cps/static/standard_fonts/FoxitFixedBoldItalic.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..d2880017c25716417f837a1c26044a0342fa3f9a
GIT binary patch
literal 19151
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
M96+?GEz$me0Iy=aZvX%Q

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitFixedItalic.pfb b/cps/static/standard_fonts/FoxitFixedItalic.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..d71697d4b638737a5545dd0cb28cba8f613e4eec
GIT binary patch
literal 18746
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

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitSans.pfb b/cps/static/standard_fonts/FoxitSans.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..37f244bd9cf3c60686c11ab9723278040e3675ac
GIT binary patch
literal 15025
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
GsQw?nq=@hU

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitSansBold.pfb b/cps/static/standard_fonts/FoxitSansBold.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..affcf316dc61f489af93f38362d6cc97dd66e211
GIT binary patch
literal 16344
zcma)jcR<wG7jA}`WH19GFa~j=6S|04v5TVEup$;L*hOp<0hs}$s;D$UrC700L=mu|
zDE5Mi4He5O>e{=qwiCR#@15ZO{&@erb%D&y&CM;Re&-t*r7)soGMUAo1);%#<7Wqj
zc}*DF!6P`pPinOn%_y<8Ol)H$>f~Yz1?f*Be#QRsp`lZAG2Ohpb#H?OrI5+!P99^2
zgog%O|9}72^g3(leb)FwYw3mmZxcny@E?^RqgGPXDkEwgMa`wCKpB-vQR^w{5=FhF
zC?lF$KvB(lQqdIU(MGnKqQWU^9!2RXDw3j>$f#I~ilV496t$S5)>70!iZZ6Cg%o9=
zsHGGYOi@V`6-QB<DC#jq1yEEbMO9JMEF)?@Mfp+G4vO-ps1+2om!eWAY7s@{P*fpB
z6;M<>MeU@htrV3{QF|yVhN3o7R2W5tQdA;EWm8l-MMY3lE=6sjs62{VMp2~{RV<_S
zQ&b5>l~GhOMIE51a*8@=L>;53BSzF_iaJhFrzomYMxCaplN41%QE3!)fuhbDQ5Pv{
z8%1SN)K!YQETgVdR5e9iqo@pux<OI5De9&Xb&sO%7*V?^>OMt1qNoQls*a)_Qq*>e
z+CWjyDC&t3^_-%1QPc~HdW|PfDJUi7f*TW#`+Nuo`iuHU)>*b#wpn&w_K#6lqZvlY
zMxW$*g;G(VxS$}kEA3CG(v|cz`YHW`ac34XCzLwnMCEQ{*0{fMS+f?+x-|=ImfEbi
z*%h`U`%q=73Q(O;5fgh8Pm}W|UrdcmT}}N=BTOqyAF0Qw*EH8Q4{Ki6oS1br8*8?~
z?4sFIvj%gGxwH9T^Lgf>=4;G9S$JBkxA>$Pq>0qLX<^sGtwnr`vKGg=R@`K67x%?-
zkmYjAmo0TIXSGahdA8*@D_bj1t5mCetM{#3TJ3IiQ|qc-qRrD@=V`tbf3x-Q)-zi_
zY(ux{*e0$`MVm)$-naRs>#s`{6hbSZOn7L`TCcHbVYAlej?GuwEw;sWyj_-Ep4~~i
zoA#saXW4JEzvR%&VYb6khvN<(9Tkp!9cMe{J057;s%^GYC#OWGZB9p=?zZFG^=lW>
zuEKe^^AzVr&g+~joUc1Sb8c+UwV&I*vi&<3Q<pw2t6j=mo_3hoA-coH4yQZ3@2KrK
zz2mixFFO9}#CI}u+TQ6^=kzYEyY%Sd-6gC`PM6Xy7rVUdD(@QI^}DONtG%m-YrJcb
z>-}yMyDjdP(5<N3z3!Us^SkeB<ka}TSbz1gL6+38oU_gPYtAG7;iE%8vV@ULMDnsx
zuKb8a2ahBQYVj8+W#7O;{!RSFfdwdu1)~<PU3hmvR#o+>N?z5_o%231?b3yl6_=`}
z9`znQZHBk5%Cca`_M(EF5lfbY>qCOWcNFUIZ7bPKv3@c8g*Yx|)g<Bpv^U6ZKbOC<
zjGw(?(R^+9#{t*27OdTRL|3C+Ej97uSMRIHTf2M14xC2)E!iiro&%l%qZKS+nQ`u8
z?$e|hgDVMR@62VzqCmEBWtzSr&>-s+!HEMJ0_lEC<AC3Rw0e@By$u@KbFhX%G3;|o
zuohjugUpuselfc`Lbv?`y>Vt(dN5CV2D5Op(S^efn-;LQ75IQAkj2Nr-_Z2<U=ZYD
zTT2icW)guRHNR&{eO<nR%#L|_p!i9IE>{|CX?hS(dIYoTRqSrClvi1bJ3!s2gJ=f&
zf|dpoCFx6A(~wLoNrTdD1TIAR@G6aKac6G<E5Bt4Ec{}CdO*KZ5~?2!+X+j4DqTJ4
z4$2odaYZR$Dh4fQ^DV`TV7i(Gx^XQrO=Tgdp#ulana^NDTQieACe+e4jGFYs?obBI
zE3lPqw-jfADJfxK8=Rp(HufWo64s=WE#wppeZ?d^W#%8SrHK*a<1xOLCNf5y0&T><
z3>L4zi8w(=&EIb=!2#M32d4N0_n6Vt>=!8-+(<{_rc@Jeae*H43^F(*j_2+$Tj#UT
zg2+e<C2=NpTrIPuse!@<we=1?4EqYLzrqlMtitjqvmb`h-<kPD`h5Veq0LvKWOhSq
z`uW%4*fK<#mOmLn+cRbO!Iqha*MzqRh6%zA?O}hFffipm>4EP|Ft(_zJLrF@4Hl4C
z`xMMu?tuy17W;F~V7<(^bM0Ft49?#N${H<nBdyN3@6dsdveJ+_XKf^CwpfKgN21xh
zFx^<Q<fPJL3S*zpZ75M|Nmpn&t!kN$_$ilW&nk|+X$&re<?zv+iB}>AYi9*dAD^J}
zfCg^F?&R`JZOP7~M>pxzppUo<3-4w~ztRjAyFu{{6fmUej|SpVjPkkL8%qx!%9%gJ
zBW~f`xp8H;bwpv=p{yIUfOea~^wQ56wM0dnmJ!pjI_TSYl>5nOzQl_Hin={Brtvt}
zVSf+cpzUT*U6J~-#5tOnj?sZ)Eq5np-=RY}3x*7en~y{9zpYbO#e%|F-@tvaI19Qd
z&{DHNTwBc*gqANnwzTetRe0vOLjilX?%cY&-~%x&v|1gNurNBX9avgDJawX?R{P51
zHZdh?j{)5$?VfRTicYhCK_oFBMOteo6q5F^7!;Qdmmbjdc*W^M{1$ofgBDkuD9<}{
zvs5?<?YMw4T2qv?HaNXpTabIO;&h&W@Y3kms2E*Tv>`TOrLnrP-+y8ho5-F=K>}lD
z3rZz$#EEbyWnTJU9tK%yA`5egANPZq{m2!1LzouEodL_gprg)~=|&XYNN+MlOZwK3
z?q7+u?thO#J7_1*#pk{=&q47Vy2BJL^c@Pl?ZH}S!<6@ZPWq8BEg3h7So9+u@wvj$
zEOfpt2aVX0y9Tl=Hn%GKd;rz1&}YPWQVwY7-b^;JAhL5Iy`WiOw@$R$4P|>Ao`zQj
z3*$H#OU8i)8@zD^-rz+v#EXoTtQTpk2X8$%8Z7REZt!hQ{e4T#+Z#+$ugTFN%L~U?
zLG$A&AFpe_DK+&8EN-i%tPmD+Pz;u&Sb9EXC3_W|<yS4i861hT)U-<9kZzFa!Cby5
zf&+5~f;X^{te6ChtQcHiEV#&v;Ri=-c9CVU6asfc47363PzWZWWJxFqCORFspd}ce
zfA;3B{0U?n85cTy$gt3BFkUAqZNpSl@72J|VYMaj4O3AmXA=`*=M%Han5dP{c3(Wc
zXScE1It47m#X!r-K?f5-CoixRBf)~~W^#*n?YMo__*V6syI`h$F#=dLh%Ie85Ty=u
zG4!2`JqNDxm-o%}8RYBN-c=wvVli=Gysfbsm$3qu0k6S9UI-&Nhn$B_;LPLn<sZQE
zna}m^TZJ@bLC(X{ciN|Ye-c~b6-sPp#_OPEI9;20Y{!27<lcbkgGPl<OckPuoPJ#L
z$fv7zVu1G`&ww*06PuO?c3>io$0c5a7WfuB4h|4IR6@IFVA5S2AI*}pjT2}vPvxL1
ztfJG%Dn^=E9GJ^Qcd)}pJUL>%<>Nrm@X-GuE?y}l!wk~vEpZvT6Ixlp7BFw5nZb?b
zKrgF2eKz}WRI4LVd&YZd?ItXkJZ)Ctop>FN2%Em32V!J<p^F>_i+0@IjBIHBnZLb$
z^s+Po_)YXrgZpiw;z@E0xiEr^eoY2JKd^rJ8EnCpFmH%*+>GF$SRscD;XwH`H}_*A
zX%=Njw(jCN|H7@NwTjQc%mUYD+Y(w>f-R%@8-mc!Zv`tb)xB>_A!hJGiB_i#p;0b^
zv})@JFcQ<i2t~;b=HP0fi>T)ME}Ai^hnCoYqB}mR1EUupTnfGAa7cG+Pw|;6+SemK
zkglZLsP>(EobfxQ*A;;ScPM}VwG)SzPIMa<9c~!1>5(p;+~oFbu6tHn?Cs;?89r~y
z<b6+@_QCoKY{Grm0|E>LSNTzJ<s8;Nb_X*acBa6EYcOUgc#w(2rmGX4xGflU0^`Dp
zjI+mtv?O}qstD5Di65MDWlNF}4=1?oDL-G|C>u7IC|y@ZIA=k#tvd8@tsn`svNxzo
zZzNS}g{lNe3cS)vN+oIO2)$?lZ7jb1QPXcLIZ01ld{RP|>k7xw(EMo1yDQpHsHa5N
z^r#NnB(UpPn9PY8WEKrpO7atT`X_KSv{E)^kU3~2o`d@3a`upzDnIm`6H_rvNM&9s
z@WK=?)a%$4_%O_&L4gmzESgv;;Rk6!eh{uH3ebs$9~P*JCd33<odTQ^ei*}nDU-ZD
zWkb65^t#;h$8~QX9XNhl3$(*q(w6k>M-=T6b)a5G-`{-T=pFt-_2Ln;!Xt-|6FT%;
zJtNK8n2b?q9^i)PNGlBXIt+aX)I+F#^zoq#EFaW?OdNk-E?$PdTx7<EfU7(V_z6A1
z2}Y5Y;7lUPWuhiY#Fykk3{k^0l!t+bq2pblE8`zL%#HZ)WRDx3V{0(K1S{bfgkB+?
zok$z&?sLM|?J3F-s^O~S<`aDBGmCuIh4Q3*KhlSow!PfD{`&p{+1Uc=3$3`zJHYXC
z&9*_o-iwKg)7YppCw1zDEKWo%Vlc72p}%~)B{(wYp(hP_OclXD&J4+Km@|OYHxA+6
zK<+z|ORKAJr_m^@q1Q4NwFX5@em{+a-3)Yw9!W6saBMv>Js?~!+IPHK3$Da=Ke5rF
z1w;Khz(FrO$jeVs-QAsIrwODLxys>Kt(0GGFLxT&FSetgu8KgHk&MCTQRpBS_rqqc
zZ{+lW?Ql(jU;^gHlfWNF-mjkJwoQPxB{Z-hq~%A_mM1G*$Z#@~L;z3h!53DZf?*dn
z<9Jfww*;r^h{mbC{Jy0WQ|5vkb#Wf-Cp{jM#R9=5$HsS@xa64<)ZY@x3bKsQDTEf(
z=~5s#34glb5cc@ESdN0`fKA^pCj187L{$66B1Sz4y%$E7;Ew&ArPny)$8*@{9Js@8
z?6ZMUgAx}99l;D{;Q}wBQ*8uCxoC@vgnpfvn26!NJ$d5hkFg@PBRxNJkC3@Hr(o+&
z<BHN#MK}2)ucF%)31DAHgXdh*u9P(63D<S%pz%WRe8b$>8OE_Q66XbI$%OZ0Eac#V
zEou)P(Ln{dsgw@-CZ1UdW)OJeFuwLS9yYceCO5&cVGeO5CFC%a5J$-$y0bXPKQ0n)
zp*CBi7ZQJ>fq#Q;WG5`)NUui&aSI1t2Nkr}iT=c)(O)@ul}Fbe=}(WX##qUneGayA
zOdV_?hyi0fyNTpA4Wk%RERI5JxtAv67;>20qTv>?Rbt?OABV>MO$RmkSA2`HvKspD
z(2G}~gRBO4u|Imx8g!oGl{A#4#w#>fGZ+J2q0<_#pi7-Yf*GP|jHcHxgcGA_62z#h
z(DBZh#)|XtiOR<LD9_kU*BF|_kh5YaP3-?W5>b!GQG*I8CbCE2Jr|u8o)M_a^x84L
zbh7b)Q?Dk06%S_5kKaBg6qap2ys^S~<FR#zO0}@CA4{xBoDQ5Uf!c?zrxy&~L3;Pn
zuMS-qpj#Obza)C8@w9*`L4$brse6*xy~c@q*A(o~s?$+g_Mx;)2GdzA?0dvO7w8uY
zQ4l~JGl-`^!WnQNw>X&mNcsJCQd@h+%mD(*Pk_D(nv21pmfgbLe}m3MEZWaq@GD<%
zF8WlxmDjEX1<SIH3wK|{)J+TXi5w&CFtQi}TWb>5Ylq9}VLHz<PiCSYxN|8tdzXNM
zV#gK79n^1*H(nDTzb1emJgq2+-DjM*Z%ux#7L@zYwRM56`-n~3MG0f$f^_l0u~93R
zFUp@@<dbVGiPafkU?d7X4+WAbz!QQqh0Lp+3B<BacuKm_(1Ym%*2BO!q+onWt2AZ(
z`umSSj&Ud9(aq{e9D^!*frF7>ls|4{I=OUC>y3IBffDG4WA(+gUIQD*Mv*-T%Q&(+
zlsyF=;7OcIiM&uC%?f8^AJ<kr+;s$uvxm)FhljC_hCYeJ>O8UI$-*hb+>P{r?sM-%
z3ZPwdDt3%^+U$uA#46&S11ois-imMW9T1I?akM2k;in*UDs^ayB@v21!3To}d#7Oz
z*J!IGZbykbq(NW}$RJ85+7d^p)jY)&ci1wj4y>?EsZK`?+9+95SS8s{(z|hY5KH=r
zyJ_NtLRW$>Ei-^GD%1!|=)hpMSVpJfpT;uD=t94SIW)0lY#Z0$Q>Nk?n)GFeMPqyr
zYbVAx$t}KMlO^<JFgi_x4kQgTQHI2cN>~J6Xwsb_Jc%ZlKhvZK0}IJJx@k(=pp6{1
zSz_>aj)8Qsn-|;Y+T<10BCc81lpL!uIc6|9R;RM+IJO#E$zif9*Dwxfph)t+&X5e0
z5^V$`2Wt$nG4N3iW150y61ahlV{z<O@;q0LP>}q~nIz+1`u8}c+6_MHA#x>q1@3du
znt2D2?@1($@C5M?RhW9Kt%><b*#N~9@ytnO6Zo+dQl<2vp8LeOBZ4siyTp9))T8yF
zEQ&yjy3<AzAu<;_vxbTldA-;Y?T6&=DD7Q+hj$OtfhLSD?7+qat#FGm9vDqb!bnT4
zrlRAm5j|P(<${%NInzh=<0l60-gB~gPkx55XZ_`@ty#wENiks5UoQ^)0iz8TPf(|)
zg1sjCG6wf8AEYsw6aCIUh~LYD^5@@}7mTufMcD4XQ<oY9$RgHCO*9CN<G3HEPh9)9
zkr;XFG$)AVs71bA7Crok(PIo6!e=0t9RnM=sD&9^K%#zVU*0XK3g~^SFw~)M<WKWo
zkCAFVecLegGwIEfDU&dPGwV`HrsCPQth)kMMZ*6k>HY(}3>GC|4}oB<i57cFvuyA~
zQOsd>8GKK4=Lu`ugNzbz8e@ODg7RJI(W9k0O*B~rW4VhPzkj=S+S?W<>AYxY7vE9)
zfoqy11udUJd!R6WbV4Pxm4h4TIcQ|SbrN(ZGf4kFm|!@NzW)#-bYer#gT=la9kI=$
zLstY&8P4}vdh=?Mu=W{uqpa%2okOEX>ePDn`*+y`%nlw{LJQI53CMcwXZEBVIJseK
zQsPeC76gIj>C?k_ViQGVV}!Y$M0P`|o<stHLPb-;eVol9G<nO=#$24wkpW<~9Q|43
zc4!VxI&mqn9FU~Ui=I~P%y%cPCz2(^<q1Z3+Ug6Xr%Hvie$42U2}C(IX6ydtx`ptF
zJCq3)Ki=<bH;f3qBK^BAeOmj+6!ia&JBkL!8m7mv*AV!EP0WQ9oCNbcrN66=Y?4|K
z1@U@EOoE2388A`@+wk1gqgZjL;T>4Wz!sskoeS8z5*B8G5F1Apfu;E4&rM@=V!Qit
zVMIl*$vGT%hzHvoXa=+(t|NS7lF}n}!MNzSwW+IgFB<wHc!#+kk8<zM)}X|o_p?DY
zzkU-V>^K@+7%~Z-!bliT6AuOhzEQMjMr<VA#Qt;HhB<*O=+V-Q04mO4QHPr8iZSG1
zRGT_Xe%rtS=Joa~f8R;=>Z~J&@XjISgS@*BYg1fDNuS%mQRT%Hm_qvZm@+<iscvWN
z!YfX^|LDYiUMNmUcZjAb=n+SJKuNKP!qt|c3|2JlSvvC~^YhQYQ=D+e((z8Z60Aa@
zCuu*?Gh)yro#sK(Lt=@KOZrd;#<G2QvRUZNN?<2P*236DPoV!-RPlDux+~a_QN*h!
zVqqE`*jWO7x$?%Hi#~)RCc~$V96tIqD0S+o>?>%AQI);sBh0Ac!nRjVdB#Jt?@uwh
zoM`=?FpJ&e`%V;+7){+n((-pCSSypod7S3s=i>XXDywIcR$j5T_9G^p2bnaOq*1Y8
zjp2DqO`X`eio?*{x*<}j!H3;&kdKch_Rn6-6Q#8aCQ;tsdjk8c@?_o)fyAP1fmT<`
zD_`w%cOtS$<A>YFe7_{&A$Sly5e-&?#^M+{)$WHh6?h63(3=6L>>rQwwnVSY(j5X5
zdUN=kO-uNRe*TkJ3Ywav`x0hr9a9g#>Sb5aM0g`Cum{?6#5otbM%Q98apV3|V6BgL
z+9mjB+H5+aJ$f^BSAJE}sI8d8=g~g{`;`(i9sxz8Iixw!{4_w<1w!%4(q#c!@2<&l
zGbV4oy-cUxtQQ@>!C-^zC1~YvWfK=yPY(?VPkp6@fY;wT!(b)R_NSdj+g%|6xQeX7
zV7jR?ZQD^)n;4+le-K9)Ebd~uIS~Z3%H7ZqapGPgkV<A+T6?1Gl>X$B4l1PvrKW=P
zJnjlDZr&)VI-pC#)rGMe#X>m*TVfgpGsPlW!ivqwZ#tPF&EdD?3o-Z!W3w7k<S@Vz
zS~7pbM>>spMn2MD$v{u(kycE5QXj<jf_j>?WV%b&9i(fkrWb4$cgZ(fLTBb1^!ZBq
z(9n}1UQmL;c{)uxGaZOSS8$+7PX_biEJQ)cM14c7L3X4)mqU!kv1o)WE(<V1+z`Pw
znxa=$i>3oGQ*A7w+j$~7kASfm9EE0o&|))EDkT}0=`V;DH-j}w1dA`yYF|tZz@)|B
zl`xxoo9Rvzq|-@nuom(`$qZYv_8NFaobWs(RG056hUwa?xf%Bn2nkh^aVcGi9Wjpa
zaTU~!8ZuS?Ypg-`6cqBOB$xxmud&grG`30_JFgE%l=(^+m+}&o%6R>m_W~Fz+pWHj
z*lDLJ7m2kHiU9G=!Zjm^SMJmsbA?f}mo6sLwId@|x$DqNhk=RghB!xl8G3T(P9IuV
z$R93Uwyac$*;gF1pRYN6A}dosIDYhapQHpnbn&K*3xzFyv$xLT^*$+MCN||;D#*W!
z$*_rRJ8a-U#*mJs(B2Wo^Vh4gcAOBvLFqr!+c1E4BJ8=kC_!w_<ldzlJ2SaS1!-G#
zqC2x4KMrLcZ3oqvFMRd!*d_afQfNu%`i{sN!IR0vrXA_zCv;>Y2hyLJ<Ymc0X;H>~
znxH{*y~QKoJa1^uJWA#?JFYNEgQmrWt;qMW0_6}^sX0S9lm_Atthnxb9Rh7z`f?!%
zYQ>Znt=hwb>PYQh8->5bCG;C+>vy^Xld+pVus);cD8GA8!s?B9P&A!8E;ucoCoSfC
z5~nbsGZSS?zh;Ity3t<CSBK8x4a?H9`~(yTVy?#oOM@V#c4*BT&<?qUP{TP(&C9FI
zMmBUs0Zz$eHcRwG!)YE|!?utWh1jN=&8p!QVw7)CnS9Z9`hw76NkbNvP!O#YnBTpL
zBlq7myq2!5!7-4vCeC{CAv($l7*j3=P7aHSyQG5;m$EQ{aAX1*hPG#zw0dVf^v9le
z@TdQOy~~n07)JUd`r04+-@%{$_)Pyl&yYI=pKIt{D@zdTv)J0p9tIWzGIUJvDx!9(
z9*S!>)q-E`I)lZU53fIf?8BS)$MHh5tp2T7#9iA^vcD{Qv1hW*GkN*!`Mm#%qt}G?
zmfq_TDbs>g7MNYU75WcpM$DoJjW~Uq#tQBuqcPOO*@i{5Gc&#MAg8IUAG?mUK!@0R
z9SD^*p`S^!5H@p9*})BgBRp43_nW``*bN=TT8>?hy|loumwJVLCTs}1VbA`utiTat
z5`E^*NV#%aC*>Au#EVo-dBvWlydr`lD?{0nFaU-$<rM{(SL~jVbxeElVO~>S;s0M=
z(G&BEbN}TPYB%Bv-Tm%FU|zBKRIC@~6+Tj4QNMqs?uB@ggBHwpsV+n_J_Eh)(x{}<
zSr~qwt6_SB-(#3Y4`tesX|%M9puxj2gDLpa6U>^N#C~WC*P)e0FRoq5iN4tS6z`Yd
z-xBO|3(Oiv_d!=wdd_dg0YnWv5pr}SAtd?(=>ikaJlgd1xS$Cl_uwc8Hf5jD(NbsJ
zNOzs)2=VPVs$;vEH^E1Tp@JB!hXR8|4R9@M#HlDTV1|(9XeO=p_~yI~p=Yd!a!yKj
zZ>`kTzp3jV1^fG*=#3ER5EkV`qtw)(s(DDNW{jdQPQ`V!Ggw@`H3YP8YKDSV^Wds9
zxK<jxb|emdVsrk65FFfOPD;0NTF|@xck|_lrke#Dmf%fQ(@kkWd^75j40Q=LNe(sA
zyG`)jTB5nCl+?+X`1)|5`qOj`n?j_ST!+Pacw&%c!4r8F5U%sxfv;ZQt9|o!z@5&W
zJv=&Lv<rqGGB7B_Gd~*7NCN%e=U>r3{*6W~PXu!t{n01M1`ExsDDfwEa~@k<#upbR
z#1{&h_=LiO_#*yY%I5-MXcQah&&P#iWd{nHvDtwOvqSj7AyeEjYkvig^zf!u2EH#~
z!c(YzB1fgJ;$C3>-oCaG3tycW*hk)QPoWNh3Yyf>5AhGw(Q8TF6R|UbqfVqOh;0jH
zbOLJ~^GVzZHnJ0VQZt)E0Y{Fs&IQ*nDHOQ=whkEE!j3zoP+()Zw){4R0_T&)U?^af
zM}H0MS3=BrVnmGQqPR5w8V;@tF%&ou7pNWYDun`@YNB-IBEq39&`;W+$ohDAV?|TW
zpy)oi&)vj2=}ae>O%G%0$ZV9{67>C;;Tc2om-x%r{%cb*l7cb75i$A_H?a0a%2xg*
z$Pa+oL4ma1MF%G=nL3;wxv28VDgo*lSl;dlrZ?22aZypanxWk@0(dg22eBgd#QF{5
zctgHiJduw{el_^xfuA{a=f=75b~==6myXMVTmr%Pv`%b!lq*bI_s?6tK9f-TRKyMt
z_Bja6EU;EcheDe$pfxp1SkV=;-LACet*e-r!oqaYECu~`Z@u^zLe#IYa_I!Nnwk%y
zz#(MS1|ts5--%cuByI@Uxhdyi!L}C~PiH-ruHohnP#9z-k|=s)Z~-<|QN=*fNts)c
z@_Dd&bQ#pU1;X#5gH{=a_2uJ|Q&U$9ui)^uh>WFaajk&gwdC#Ol4;vo9R!8fRzISo
zQxjs+!g(@hI_d7v=O}Ub5H1`56K?+D6*snPi`PrgFBUkgmtnRu7T-Syv!TbBO#QWt
z+p=qa!Fj&8VtK-0A^zCmxE%h($!%Nr3X?%eCoG*G<<Eyku3sN6tTTkIo6oNZNQns(
zlF|+wK74Y;lU863GSZe=o*#3rRC}=C^yS)(9$^`nJLl5i9!B`hV|mirt)p#h>eOu$
z1rH+o$ZYKAJ7n~9ELDBfmxCn)fMvNsb`XQ_AgtTJe!$(nO-Ga-ia*RBEzil_E8O*X
z^?J}9I=3|EP`S2vMfuVrx;u9|zxME;vm*R=jN!-3)h9#=9<^QC-yTXwEJ*O1qYX))
zRp_f5JOrlzUfiY1%1f6{`g(ay!5`mB45g)V+8Fd(voT@V0?r5^6K4!{oMFNbGNDHL
z%`*6Tdp3(?fgKpCwSXPj2vw8q$QrN#@1evSV+GA0{Gus}Lij=fSECWbQs6~38ft4Y
z>Ys*5|DZIR^}@|>3)-%r(!9MKhr!jB*W<vLhYsgn+%JngI-^|B)b7c>c=T^=&HOWV
z*L9PMiR$Wc?e?s^%Hw-Orl;wk)n@wQidprf2T#<4hIb!dGJjLFpm{rZcBJPlt^JWe
z(Dl%r40t<pigw=IsD+~p6^B;nFyrpb5#bFzyC}S9pSEmIUN)YKRR>!0vSLwT#A0n|
zRCwr8WQj<0lXakc4NCdC!L0gj#JxASq4@UOd$Ra@pn5Jk-IHHM%ZKB&LGRgbGNMpK
zx^hFDYCNZ388K=IKVx#qkCU5TzPys_YgjKl%B9O<{htz+CuYNYU>M%%!}#ad>h^pp
z5*klD;mACU4f?_SNi3Nk&yr(M^act($aa1K#V0vzfJ59HCb}$T#~m%SRo17}l6HNj
zF76bidmTonrlqH@)fH^mu<ZbUJT-D^nh>!fEHQGGardPo;s~W3SU&pR*|O5y&APPs
zwaeBmGuFc#E>zih>hkD?G5NWN_HI6zquZX5p1wW<1#mhmn%y7I&L)22Sqxk`y-Y;*
ziTn_nR%k%9L<3hFBN)6h1r&%KOp%I33aLhfdjz@FAiMglX_H#jLD%Qtd{2%YyKr^T
zyO=qgo7k~Z*gc%CXQtK7zZAFKe-i?ikFyKTS7__IWn(59&DN2D7~Jkt-aeb+Gk#Kv
zhd@$7{<qC;xXo_=ZSw%j|8~qDcg#PY73=TH65*3PQDWzOx=TJ`t!#_f{~olyC%bSL
zba&+!#G72->JbkgUc2__(TK}#ZllKZ)!j|z4(u&DaA0q+-@Jf;dGiAH9>8!t<uyW~
z3}`Y~OEL8|E)K?`zt^B*dIN)Ha}AcwHDoNoc64rKb+D~Y2KrC(Oeo{vW*r&IK(m*Z
zPt<8o`aQsO#AZd?`KxuGmeae_GRi9X^~X}C&ku_jIYDsh5x8)$Rt<TNVfSNHz0dLu
zVq1<h-wZ~}i}`mqs_&g#QaWRsP_lDN;U4Yf@fW)h^|GFGm+Rig&^yx7OONrn`745^
zjZKXa;(E~)+b>2=&;~~Z&zZEkd>d8^B(4)sO;8^=|H1kukuiE04|Llv;xNN-R#OMF
zuW)J1f~~o;uJR`il$GxgBs6XWqDjS=RjyX{Urm%QE-S(KFC8Qj;kN+<<jau$`iAvV
znVA7b4kO5Tj9D7i*Zy7)OvCzfU``HWdSW}1beOu6v;{ZJuQ&_>d&tn6^^jkL0UY#z
z9*ChL|ElKmC0SK87dL^<*p!#Coj;x#6uB@ca@PEiwds1nQ@L{I(WG4d?xTILZci%l
zidwiTVJSNQ3wqHVjg{`R9E-eV+-K3fFB9z1B{+7CaW`eb`htv0<rt`(f}-!R{vXt2
z3cFGAbz&w*w3i$(L^rOkmvA8O&qy9&#&jlHyl+{#;a*i$j@PIO@$O#U%O7G;i|X*=
z{#f=ZnK>2{2=_GoZhg&7vCgo=U{L^*M3-lpAki05c8{UYYEIpp3?c3e;wqu^vsCWc
zPdd#SBgsYsvFGkHVlSk}xHFBO<QMmv(deOJpfYq!&!ur|j6Ia;sq0eHQnS~VW**yP
zjPHrLH&%~`uu7z)_xOq-Zx8})7r{MXM0XsfKhrpt5biCA1DKF8-Stgl<gLrkxKL`W
zIU!PwKR7sbk91@*GuN%l%rO2@o45bCwtV4r8)6mTGhnsu%}P2iEn`mwzy4^lUtriW
zuNgw8f#Crw#!D|x(-+_(A><}R-b^)Ez_hob(R0l*G5j0{Lx(=EIdjtoLi#f(|Dp7Y
zRPM!}bsoia+H!v}q6bb88E?-?Cg-r}>xv@&MfK_G!=Xj9HVgZ<ZO+fvYL=b!Io_Ml
z(L)xk(7lMGx22^QmGil~R)zUZNRAcahte6j*=d{kecM7p!<H@e^IcuKc@2WIWYQ1O
z(;zzs+$jk@Pk}Go+L6inQIm{2_L(<ru$IstJEBkN`2<boIvp|DO81YRIn#q5=Usg5
z=+14|&kOG!rdK3=G$ySo5lzBq1k1|Z**oAQgRc!m+!JO5IAK*`=D%)E?0@Y?o7z$J
zr5i8*+_;NcHM?Oil6Fqjp7o%=G3`;eOc+x3=QcEdD#f++Fr%T2tHQu`FJHKG`SR^T
zd|_T}A^$k#OM&2pVeMi*AtEa)3|&@EXkc~_KRRS;zqJAx@w-fV`$J6hVGfRfuG0j4
z=rm&T-({oazip)+XJ8`2B5heROuWPS9G-ddM0xqS^K%YOnLKyS1l>u?{B7HI?aYk|
z35zg<hevGBL+aP76i^=r3nT#|)kq~1{jqS7AyrCl0do5iu#yskWx{XZgC$lqmRP%E
zEUjw%mzmMnS4t#m=rg1Si#H_V%F9z}SVUM0Eu?}nEO;-6XwseYQYP*`nVio5d~)FS
z{)pq9Gm!%W^QvLMwQT~iKSuY7oIU_+&W;N(LQ+?zz<jJZU!K)hsyUa^Fkm#{kJ@6%
z*_n(Wvk79KQm85<DN~i<$@(>+%VVZmrEe)*w~IfM9UL=z!m7D}t5Pzi32Ijsk}J6v
z%usNmNe4#yJgSm=js-BOp(CU2!=7A;g;0ArmVowhAZO0hUi6^Bh;hV|Yr&Ao|GIG<
zS?qQmRER9tPXYEFu$rIHzhVDc78VfIT2}LmRQ=ml>NbjPC;_`n_FY2>zNB9`LPSH^
zQS2`_LneE*sSSpPv({2uLmAj)vi=QaS?sOLLkuhi|Cr#fZn|{{5n2gPp0$AO@?<>=
zbBOVJ_P@gVawLkj#magoIR=2HNZx`jUoZjn#u^dWUrHgXNL0twgc3+L!MoWEto;E<
zJwec1R!>lfHjrxfw)Yt<BsMHHfK;qqiaAha<5H<uyA+GHaZSbAIH~9bsw(a(ifIYI
zcUOEuo{*5AA79MBki>KZis=GA-jJ0QBIJZD%wEKME|G*(Jq78ZcCsog>rql|_j@~*
z*m~Qd!*H2_^2+OAv^bi3#tfU!5*J22lNFbP89ot<<#ODhXAEeY?vOWK*a?_2*$!m?
z^tl5z*k`FE_IOCQ&SSKSha~Nq1?pE9)(bng8OTmyANb)6oZugD(%gfPhJ)OdMeKG#
z^Ey6nXM73&Eag+aFe-`-TF56vZpaK5G&gdV%-<Nmk67aCj@vV&aU9Or#mnW-VD}JU
zl-44{T4i{{!8D}Vl4faaBj0!lyO~cw9tqCSZKqyLHOLNs<lea;DFe&5r0a)|$inP`
zpE`AXPr69|piBGqc&9UFamqw}AwnWcLA}F(iDg?XBes?AE9P#F{p&eB^~T-!>pUcX
zLS-9NoCHQAo(Xj?J*(V%(Az^s9VHe#S>sFwkdegdz~JIp!e=nzVoFw=IHLuNs-M7D
z9FGqw(UH}S4jfd%Lpm!o({G}d409gVHfZkJGGCo~0v1<i%wWrjC!|Bv`SvVW{l&dx
zhJbwzi#Op=!#>m*48!p=*-t`eusgA9UMCidv*rzh!PbL?Ne!iFb(piaF5*eZ83ze>
z;TU2dq22y;^TdSk4mgH`>OH8!z!CX6lN%1Ev#^LXOJ_AN$!jvb8;hx<3~9b?<d`pZ
zqe)kWxRNr`4Kr`7slr;UmL`euXn&yviUm?7q&hy2Mrs!R@CGd9^S795|D@)f5{~V>
za~dqP5Jozskm0%^SmSoUnttPK4rbj_ey>~8&Ys9qu&6(2y}rR5^SK&y{IQtO*R13~
zCoX1Qq};yudO?p-fx7S+34x(nzrvvNKDwL3H^l^M7llQJ>h(E=D|GG0(_@OR2VLV|
z{Cyq~9)0<U>%ycn;al^xTXVMWJdC`uswku-&Br=oB<a^qQ1@mpKs#?1wuqma_P8CU
zMoG48Z}uWMVY9FJ8Jlq`PT6d|)LaE^z1bh)7Y-T2XPb->&DcX*31SCVsl#>9^h7`6
z&knziY|S>BJ@H?~?_4#rF*OA>b$@<re4d~=7{7eyj)Xm^tn~%Rn2%YrI&dK$ACW0}
zm3i?wOBUobX{_5?0k$_*+OYUQR~-8Wu>S05FntfEJ#c9KPZ5$?<Vdi|?D5~-I<uN%
z)~wX;0QmUe402&I=KGo>FcynvK1XMsJ$(!v&5Xl76K2hxpgUu!3C!P~o1eEmG9=7k
z2n*Ars{!t}kv*#^cf?W|Vj0l#B|=w}tOzlHu~=;jz~ZOa`w}<qa&^>Y9)_I;lY^TC
zBIMCgD?_~p^6giC-MvOY=J|I6PAhuU)QEt&y3NbHN^N-3VfGZqMFMbP^tO!6Cm!P3
z$A=5C%BaMMq$x4R_CdsU4QZzxRM{Q0^?x1Py;nCHCUG7qa|1$jJ~Qn$+}9o}-&B#K
zgEh~%Ey?SF`o!0-@3c5gz@Rqb+)EfhSmeBa1O}5-8?bwf5%Sbd-1@y+Q`hqsHU!2_
zACeNVC~|G;3c*L2cyL=v8V}|dFC9DUyLV;=7VyyDxvwjO_L=2`&$C*X7(2KR-y`Vy
zw~{0Tl<9|?hDG36U>UmBFaygaJee^C38$ug3WyKPj73)$ogAASo@lIgV=sf#AQrZv
z;JjuAOMc9iInubxfpudqK|8!N4JGY0QgxsmO}a4-e{NlYwu9L3l2{ot=WDCb$0->b
zNvy1xnSXj9t$z>-o&-n&OUxJukvQYc@wz!fx;Cacuya_j6ThO7wg!6|&G(Pr%ejfH
zdJcO+{6})C1EqqF3)AOMGgfH7p)0tLDdK(0i7cU?WwCcI4>GW*$p~fRZA_&t^q@p4
zdn70|Z}o#&O%0L#4wMFMDpl4ZZETi=`#3@d!p1O9yu^K|*zcRQEPqz3q$GOFlEvGm
zN|iP<Tih(ikC=83K%>jP2TyS94|a}Uh1(_JCp*sy-<Fsjx}z0ZkW>Df6UyiInP-(q
zzM%oTcH-iVD-&$mjvG68oaaF>`BRks<;PwF%gL8vI#yV#uUTrUa5v+a=NVr?{&$LP
z59H8b!#yQ1{ogrF^o$&WCDv*z99lA(!iVp;>Ur$m5`GVcb~^-3b$mfyTq*xF9UV`T
zBBJZjWXFePXD<=5LV~ga_~D_8It%Ll5+6(E!^+_p?&eDjS#UEuV>zxd%8nhzf<gQy
z?XfnTC7b?h(qR+O%$eI42P6HGalnnWWQd=1w?F&0AM3-S3*<$St6s#SO?VxjpNC9}
z=aLH?+2jH>H{!yxvqNwmfmw_B;bBt;2#%z_>1jL~3}xnl$vZHa2X<KI6~td7B<rml
z!D_yeJB{<~Shv|AyaUZUXf4A!mJXqS@lw*Sk@Dh^@6fD5YXnmppDXZ6NMI+e(C1<D
zd>5E428)Aus7Y8qt}D*vF8E%!N{3WljycJr5FrT#oN5DW7918XUKv|4!Hd>>%!-;=
z(upU->=6BS7??Zegpcq6C~nz-q<xvlnz~(a{m8E9<=HyYj_k%SI>17D-Ljm3CEA|T
z`*)bNY}1BVoq7y<m?URbgIrtuB7+nYI-t87!$K79cayur&(Q4mN@rFbz=}Cwhgon0
zGKHEp`Rsq2Y>%7FVa@V?-EwiGu7ltSChx(-6LHu8bSBb9EtWQ_`gbs=33XvL`+7(i
z7nV3LgT3sC6PIH>j{O16n<|`1SmC6bDx7pvg>xI--jjvy4HKnssMQ};!yLy;j}}r6
z&wm1faaU0OqNT8P#zih*cg3{F$d~*01qQ)zn-4_U+s|*|LIHA!^}k)4D(`c-pQo#@
zecedpW04-S(6@*Gt#_EhN)x(?!6qI`v$xPp4vg5aMv8Ha*RZ7I_f0ItQsda4VAeFx
zG@Pe#(>#rv=DCx0#!9Syhq!$+c;+%>$wsAaNAJ1+$D|pUvtX?PYO9G!s)-t&wP<M1
zm20R->05esloQn%zuCA5zlm5)eZuePwUXJ$`pbM}3uOti)v^t;OR}r7hq4#4PqIcM
z+DL6=W#nMg(Wtl4V58AS<BTR5%`#eKwA3ihXq8dA(I%q;qf(=zMrVvJ8dV$JHF|4A
z<O+FnxsBXK-c9Z%A1$9DpC=EOC(1MBTjaasMe-x^)ADNhE%{&aC-N8aH}VhiFY*S3
zLcuCb73PZ8infZbihhd0ijfL$#bm`yg}-94Vu@m@B0>?ZNK~XNauiz>+ZB0=-HKwx
zVZ}*BmExx2f#R9sz2cjqk)~-i-IBJZ+tMy{SGp(dMh`@?)UICaKJAD2CbHDLKV+$;
zbU_C;K4`gHjIpXSYt5>D4@b9n!jZ+o7>u3Q#K+(fRkiAhMDHd(h7B=m;$s+HK7xD<
zUt6LaJ{jp4=fOy)wqg6SDh?2K>NXX+kXgjN5AxydhzD3ZVx%;z0?Z}CklijiY(?Z$
zPrlEh>wgGCx03gty}>^$o;XBMcf2(OsajLGCCYxGqq<ED+qdV$h5Y;sT@z6&6Z3zG
ztK9bwR~i2_ag~=!TxD<MDi^#X1+<E5%c?oj=K+}wJ0R@?a%INCJmhTJl1PcO`F$UH
z&R#HRC+Xcs#i3eM^k7ve)A2gd5_x@=O42;V3CUF2*q6`>+mtFSsODnwFdsRlX|6=+
zocRn|>X2tCkjF|@)~3TX{D+k33xws$U=<RD&5<ZP4avXAWPsjC6gEequnHnCw8vR(
zoVj-8+7-s2V^ocG9O?al%=t6NQJ6#d6B>C|(fH+(=ER0X{Wn+JKXdKVhqO@jWgXc*
zY$YNBQnq;CvLmaS!RBLFyrUC~q|ClxCVCrG#Q1nuiD$9zqQtXM{djiz$nHX2ylTxY
z<K#VQV6Xbas6&E~3W?6<I9YT2PLR23U<@&dAeLIZk1>%Ye&gY%3a8ZL&y-Z?3>8>D
zR;YI9N3$v#16!4pPtl;&sbv^s!y)vJD%mdN?<~RqN+tdpDP@hyk*w-)%9D%Q*D6e7
zkx(-$5FNu`=#<gTsFwJy4&e21sTpB{N-|;S>;#k{6XeX8FnFPq$TPTE+z!2}VU9tj
zLZg@k4w6yCDKtgur5LG~{)yC8k_k13nZz8cRj$letX8S~@q0xW9!9I^)w#=8m!fUo
zC3Uk0zpq$~b(I(=(`Z#wQsDvi9w-VLaU0T{ROoq-e`=>f>Ulr>HxK3^0N#)Is}NOh
zjZ8~7{MYnXg~?$8?q3slIRUrsEzn54QjtP}^%yvasNzAy>s5xPX#a{7?OTFQ^-(Xn
z;DR_w;`*v2mbjS;&(#4kk%WzmS_iCaVn9N)j0!XL<%XspMis;2!)Vr;_kN5pj*7`i
zO;K4CNiBA?idZu$q(7_B_3y)Ud3l10d&j^KL=k#3cz!=Ryi+Y;)pQc03MVp0p+Av5
zK+$ZXhMqxcs7flv%g5<HSYA`@hKVa5@?Z-6@Vvz$oG5b0lw`09T~7x_YI6aZiiTzk
zq3|SZ7@|_)cU~A36O*)BwVb`LA_^Sa8YSW?X2Ok$tO|F7Y8Z!cwhB20{m4AzN9hos
zHpQVGY5c*zPIA>G1cAi2_`b$AjM!Y%qdp^7&KUVns)_(1dRIc>N^CL3h|p9L5S#&)
z+Eo|_k^j>;PwI^B6Kg?D7pgxODr`|Pxc`79cljZe+eW>ZYmgnlK8UnR^3|}0mY8j_
Zni$D~vCIWrQWpk)bz)RW9#i8~{}=hLJf;8u

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitSansBoldItalic.pfb b/cps/static/standard_fonts/FoxitSansBoldItalic.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..e1f60b75465d49e186d9109c9082f56d2c66f806
GIT binary patch
literal 16418
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
DGeh_F

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitSansItalic.pfb b/cps/static/standard_fonts/FoxitSansItalic.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..c04b0a5aec805a5354413e45a2122fa0b6001789
GIT binary patch
literal 16339
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
N7bK$*2^DCg{|n^Hp&tMM

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitSerif.pfb b/cps/static/standard_fonts/FoxitSerif.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..3fa682efbb4b1d1941194a5dd8b78f39b33b72b0
GIT binary patch
literal 19469
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

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitSerifBold.pfb b/cps/static/standard_fonts/FoxitSerifBold.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..ff7c6ddecf6b689d93823c4c2a8c41e6e058de46
GIT binary patch
literal 19395
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
RerE%ngd@-Wy?HGgHvoHI9|iyb

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitSerifBoldItalic.pfb b/cps/static/standard_fonts/FoxitSerifBoldItalic.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..460231fb88a0083e577ed534760307d7779fd82f
GIT binary patch
literal 20733
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

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitSerifItalic.pfb b/cps/static/standard_fonts/FoxitSerifItalic.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..d03a7c781e1a2b91481103dc3227a6bdca4a461c
GIT binary patch
literal 21227
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

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/FoxitSymbol.pfb b/cps/static/standard_fonts/FoxitSymbol.pfb
new file mode 100644
index 0000000000000000000000000000000000000000..c8f9bca78c2f89ce40dff0afe6cdd7068061b3e6
GIT binary patch
literal 16729
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

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/LICENSE_FOXIT b/cps/static/standard_fonts/LICENSE_FOXIT
new file mode 100644
index 000000000..8b4ed6ddd
--- /dev/null
+++ b/cps/static/standard_fonts/LICENSE_FOXIT
@@ -0,0 +1,27 @@
+// Copyright 2014 PDFium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cps/static/standard_fonts/LICENSE_LIBERATION b/cps/static/standard_fonts/LICENSE_LIBERATION
new file mode 100644
index 000000000..aba73e8a4
--- /dev/null
+++ b/cps/static/standard_fonts/LICENSE_LIBERATION
@@ -0,0 +1,102 @@
+Digitized data copyright (c) 2010 Google Corporation
+	with Reserved Font Arimo, Tinos and Cousine.
+Copyright (c) 2012 Red Hat, Inc.
+	with Reserved Font Name Liberation.
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+
+PREAMBLE The goals of the Open Font License (OFL) are to stimulate
+worldwide development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to provide
+a free and open framework in which fonts may be shared and improved in
+partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves.
+The fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works.  The fonts and derivatives,
+however, cannot be released under any other type of license.  The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+ 
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such.
+This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components
+as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting ? in part or in whole ?
+any of the components of the Original Version, by changing formats or
+by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer
+or other person who contributed to the Font Software.
+
+
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,in
+   Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the
+   corresponding Copyright Holder. This restriction only applies to the
+   primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must
+   be distributed entirely under this license, and must not be distributed
+   under any other license. The requirement for fonts to remain under
+   this license does not apply to any document created using the Font
+   Software.
+
+
+ 
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+ 
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
+
diff --git a/cps/static/standard_fonts/LiberationSans-Bold.ttf b/cps/static/standard_fonts/LiberationSans-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ee2371540417ffbc652745b059effa260430179f
GIT binary patch
literal 137052
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%0AxaXreK_|l;-0=a=dw_(;$9Q}a
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

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/LiberationSans-BoldItalic.ttf b/cps/static/standard_fonts/LiberationSans-BoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..42b5717ddb92dc6e85edc72fb5c3a798b380902e
GIT binary patch
literal 135124
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
Y(69aAo~sa8j~?;H6%7CW#+m&80ZRF%Gynhq

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/LiberationSans-Italic.ttf b/cps/static/standard_fonts/LiberationSans-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0cf61263494608cbf1fccecce606bc01a247d1e4
GIT binary patch
literal 162036
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
M!}r?X>uyqf04avO)&Kwi

literal 0
HcmV?d00001

diff --git a/cps/static/standard_fonts/LiberationSans-Regular.ttf b/cps/static/standard_fonts/LiberationSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..366d1489cdde3523e488ed1ee85583618fb0c120
GIT binary patch
literal 139512
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
a!I)3b-v8Gh+`}J-#|&)Z@#Ld7T>RftGoMcY

literal 0
HcmV?d00001

diff --git a/cps/templates/readpdf.html b/cps/templates/readpdf.html
index 4bf025a31..ca3f23894 100644
--- a/cps/templates/readpdf.html
+++ b/cps/templates/readpdf.html
@@ -53,24 +53,36 @@ See https://github.com/adobe-type-tools/cmap-resources
 
   </head>
 
-  <body tabindex="1" class="loadingInProgress">
+  <body tabindex="1">
     <div id="outerContainer">
 
       <div id="sidebarContainer">
         <div id="toolbarSidebar">
-          <div class="splitToolbarButton toggled">
-            <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
-               <span data-l10n-id="thumbs_label">Thumbnails</span>
-            </button>
-            <button id="viewOutline" class="toolbarButton" title="Show Document Outline (double-click to expand/collapse all items)" tabindex="3" data-l10n-id="document_outline">
-               <span data-l10n-id="document_outline_label">Document Outline</span>
-            </button>
-            <button id="viewAttachments" class="toolbarButton" title="Show Attachments" tabindex="4" data-l10n-id="attachments">
-               <span data-l10n-id="attachments_label">Attachments</span>
-            </button>
-            <button id="viewLayers" class="toolbarButton" title="Show Layers (double-click to reset all layers to the default state)" tabindex="5" data-l10n-id="layers">
-               <span data-l10n-id="layers_label">Layers</span>
-            </button>
+          <div id="toolbarSidebarLeft">
+            <div id="sidebarViewButtons" class="splitToolbarButton toggled" role="radiogroup">
+              <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs" role="radio" aria-checked="true" aria-controls="thumbnailView">
+                 <span data-l10n-id="thumbs_label">Thumbnails</span>
+              </button>
+              <button id="viewOutline" class="toolbarButton" title="Show Document Outline (double-click to expand/collapse all items)" tabindex="3" data-l10n-id="document_outline" role="radio" aria-checked="false" aria-controls="outlineView">
+                 <span data-l10n-id="document_outline_label">Document Outline</span>
+              </button>
+              <button id="viewAttachments" class="toolbarButton" title="Show Attachments" tabindex="4" data-l10n-id="attachments" role="radio" aria-checked="false" aria-controls="attachmentsView">
+                 <span data-l10n-id="attachments_label">Attachments</span>
+              </button>
+              <button id="viewLayers" class="toolbarButton" title="Show Layers (double-click to reset all layers to the default state)" tabindex="5" data-l10n-id="layers" role="radio" aria-checked="false" aria-controls="layersView">
+                 <span data-l10n-id="layers_label">Layers</span>
+              </button>
+            </div>
+          </div>
+
+          <div id="toolbarSidebarRight">
+            <div id="outlineOptionsContainer" class="hidden">
+              <div class="verticalToolbarSeparator"></div>
+
+              <button id="currentOutlineItem" class="toolbarButton" disabled="disabled" title="Find Current Outline Item" tabindex="6" data-l10n-id="current_outline_item">
+                <span data-l10n-id="current_outline_item_label">Current Outline Item</span>
+              </button>
+            </div>
           </div>
         </div>
         <div id="sidebarContent">
@@ -83,19 +95,19 @@ See https://github.com/adobe-type-tools/cmap-resources
           <div id="layersView" class="hidden">
           </div>
         </div>
-        <div id="sidebarResizer" class="hidden"></div>
+        <div id="sidebarResizer"></div>
       </div>  <!-- sidebarContainer -->
 
       <div id="mainContainer">
         <div class="findbar hidden doorHanger" id="findbar">
           <div id="findbarInputContainer">
-            <input id="findInput" class="toolbarField" title="Find" placeholder="Find in document…" tabindex="91" data-l10n-id="find_input">
+            <input id="findInput" class="toolbarField" title="Find" placeholder="Find in document…" tabindex="91" data-l10n-id="find_input" aria-invalid="false">
             <div class="splitToolbarButton">
-              <button id="findPrevious" class="toolbarButton findPrevious" title="Find the previous occurrence of the phrase" tabindex="92" data-l10n-id="find_previous">
+              <button id="findPrevious" class="toolbarButton" title="Find the previous occurrence of the phrase" tabindex="92" data-l10n-id="find_previous">
                 <span data-l10n-id="find_previous_label">Previous</span>
               </button>
               <div class="splitToolbarButtonSeparator"></div>
-              <button id="findNext" class="toolbarButton findNext" title="Find the next occurrence of the phrase" tabindex="93" data-l10n-id="find_next">
+              <button id="findNext" class="toolbarButton" title="Find the next occurrence of the phrase" tabindex="93" data-l10n-id="find_next">
                 <span data-l10n-id="find_next_label">Next</span>
               </button>
             </div>
@@ -103,97 +115,135 @@ See https://github.com/adobe-type-tools/cmap-resources
 
           <div id="findbarOptionsOneContainer">
             <input type="checkbox" id="findHighlightAll" class="toolbarField" tabindex="94">
-            <label for="findHighlightAll" class="toolbarLabel" data-l10n-id="find_highlight">Highlight all</label>
+            <label for="findHighlightAll" class="toolbarLabel" data-l10n-id="find_highlight">Highlight All</label>
             <input type="checkbox" id="findMatchCase" class="toolbarField" tabindex="95">
-            <label for="findMatchCase" class="toolbarLabel" data-l10n-id="find_match_case_label">Match case</label>
+            <label for="findMatchCase" class="toolbarLabel" data-l10n-id="find_match_case_label">Match Case</label>
           </div>
           <div id="findbarOptionsTwoContainer">
-            <input type="checkbox" id="findEntireWord" class="toolbarField" tabindex="96">
-            <label for="findEntireWord" class="toolbarLabel" data-l10n-id="find_entire_word_label">Whole words</label>
-            <span id="findResultsCount" class="toolbarLabel hidden"></span>
+            <input type="checkbox" id="findMatchDiacritics" class="toolbarField" tabindex="96">
+            <label for="findMatchDiacritics" class="toolbarLabel" data-l10n-id="find_match_diacritics_label">Match Diacritics</label>
+            <input type="checkbox" id="findEntireWord" class="toolbarField" tabindex="97">
+            <label for="findEntireWord" class="toolbarLabel" data-l10n-id="find_entire_word_label">Whole Words</label>
           </div>
 
-          <div id="findbarMessageContainer">
+          <div id="findbarMessageContainer" aria-live="polite">
+            <span id="findResultsCount" class="toolbarLabel"></span>
             <span id="findMsg" class="toolbarLabel"></span>
           </div>
         </div>  <!-- findbar -->
 
+        <div class="editorParamsToolbar hidden doorHangerRight" id="editorFreeTextParamsToolbar">
+          <div class="editorParamsToolbarContainer">
+            <div class="editorParamsSetter">
+              <label for="editorFreeTextColor" class="editorParamsLabel" data-l10n-id="editor_free_text_color">Color</label>
+              <input type="color" id="editorFreeTextColor" class="editorParamsColor" tabindex="100">
+            </div>
+            <div class="editorParamsSetter">
+              <label for="editorFreeTextFontSize" class="editorParamsLabel" data-l10n-id="editor_free_text_size">Size</label>
+              <input type="range" id="editorFreeTextFontSize" class="editorParamsSlider" value="10" min="5" max="100" step="1" tabindex="101">
+            </div>
+          </div>
+        </div>
+
+        <div class="editorParamsToolbar hidden doorHangerRight" id="editorInkParamsToolbar">
+          <div class="editorParamsToolbarContainer">
+            <div class="editorParamsSetter">
+              <label for="editorInkColor" class="editorParamsLabel" data-l10n-id="editor_ink_color">Color</label>
+              <input type="color" id="editorInkColor" class="editorParamsColor" tabindex="102">
+            </div>
+            <div class="editorParamsSetter">
+              <label for="editorInkThickness" class="editorParamsLabel" data-l10n-id="editor_ink_thickness">Thickness</label>
+              <input type="range" id="editorInkThickness" class="editorParamsSlider" value="1" min="1" max="20" step="1" tabindex="103">
+            </div>
+            <div class="editorParamsSetter">
+              <label for="editorInkOpacity" class="editorParamsLabel" data-l10n-id="editor_ink_opacity">Opacity</label>
+              <input type="range" id="editorInkOpacity" class="editorParamsSlider" value="100" min="1" max="100" step="1" tabindex="104">
+            </div>
+          </div>
+        </div>
+
         <div id="secondaryToolbar" class="secondaryToolbar hidden doorHangerRight">
           <div id="secondaryToolbarButtonContainer">
-            <button id="secondaryPresentationMode" class="secondaryToolbarButton presentationMode visibleLargeView" title="Switch to Presentation Mode" tabindex="51" data-l10n-id="presentation_mode">
+            <button id="secondaryPresentationMode" class="secondaryToolbarButton visibleLargeView" title="Switch to Presentation Mode" tabindex="51" data-l10n-id="presentation_mode">
               <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
             </button>
 
-            <button id="secondaryOpenFile" class="secondaryToolbarButton openFile visibleLargeView" title="Open File" tabindex="52" data-l10n-id="open_file">
-              <span data-l10n-id="open_file_label">Open</span>
-            </button>
 {% if  g.user.role_download() %}
-            <button id="secondaryPrint" class="secondaryToolbarButton print visibleMediumView" title="Print" tabindex="53" data-l10n-id="print">
+            <button id="secondaryPrint" class="secondaryToolbarButton visibleMediumView" title="Print" tabindex="53" data-l10n-id="print">
               <span data-l10n-id="print_label">Print</span>
             </button>
 
-            <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView" title="Download" tabindex="54" data-l10n-id="download">
+            <button id="secondaryDownload" class="secondaryToolbarButton visibleMediumView" title="Download" tabindex="54" data-l10n-id="download">
               <span data-l10n-id="download_label">Download</span>
             </button>
 {% endif %}
-            <a href="#" id="secondaryViewBookmark" class="secondaryToolbarButton bookmark visibleSmallView" title="Current view (copy or open in new window)" tabindex="55" data-l10n-id="bookmark">
+            <a href="#" id="secondaryViewBookmark" class="secondaryToolbarButton visibleSmallView" title="Current view (copy or open in new window)" tabindex="55" data-l10n-id="bookmark">
               <span data-l10n-id="bookmark_label">Current View</span>
             </a>
 
             <div class="horizontalToolbarSeparator visibleLargeView"></div>
 
-            <button id="firstPage" class="secondaryToolbarButton firstPage" title="Go to First Page" tabindex="56" data-l10n-id="first_page">
+            <button id="firstPage" class="secondaryToolbarButton" title="Go to First Page" tabindex="56" data-l10n-id="first_page">
               <span data-l10n-id="first_page_label">Go to First Page</span>
             </button>
-            <button id="lastPage" class="secondaryToolbarButton lastPage" title="Go to Last Page" tabindex="57" data-l10n-id="last_page">
+            <button id="lastPage" class="secondaryToolbarButton" title="Go to Last Page" tabindex="57" data-l10n-id="last_page">
               <span data-l10n-id="last_page_label">Go to Last Page</span>
             </button>
 
             <div class="horizontalToolbarSeparator"></div>
 
-            <button id="pageRotateCw" class="secondaryToolbarButton rotateCw" title="Rotate Clockwise" tabindex="58" data-l10n-id="page_rotate_cw">
+            <button id="pageRotateCw" class="secondaryToolbarButton" title="Rotate Clockwise" tabindex="58" data-l10n-id="page_rotate_cw">
               <span data-l10n-id="page_rotate_cw_label">Rotate Clockwise</span>
             </button>
-            <button id="pageRotateCcw" class="secondaryToolbarButton rotateCcw" title="Rotate Counterclockwise" tabindex="59" data-l10n-id="page_rotate_ccw">
+            <button id="pageRotateCcw" class="secondaryToolbarButton" title="Rotate Counterclockwise" tabindex="59" data-l10n-id="page_rotate_ccw">
               <span data-l10n-id="page_rotate_ccw_label">Rotate Counterclockwise</span>
             </button>
 
             <div class="horizontalToolbarSeparator"></div>
 
-            <button id="cursorSelectTool" class="secondaryToolbarButton selectTool toggled" title="Enable Text Selection Tool" tabindex="60" data-l10n-id="cursor_text_select_tool">
-              <span data-l10n-id="cursor_text_select_tool_label">Text Selection Tool</span>
-            </button>
-            <button id="cursorHandTool" class="secondaryToolbarButton handTool" title="Enable Hand Tool" tabindex="61" data-l10n-id="cursor_hand_tool">
-              <span data-l10n-id="cursor_hand_tool_label">Hand Tool</span>
-            </button>
+            <div id="cursorToolButtons" role="radiogroup">
+              <button id="cursorSelectTool" class="secondaryToolbarButton toggled" title="Enable Text Selection Tool" tabindex="60" data-l10n-id="cursor_text_select_tool" role="radio" aria-checked="true">
+                <span data-l10n-id="cursor_text_select_tool_label">Text Selection Tool</span>
+              </button>
+              <button id="cursorHandTool" class="secondaryToolbarButton" title="Enable Hand Tool" tabindex="61" data-l10n-id="cursor_hand_tool" role="radio" aria-checked="false">
+                <span data-l10n-id="cursor_hand_tool_label">Hand Tool</span>
+              </button>
+            </div>
 
             <div class="horizontalToolbarSeparator"></div>
 
-            <button id="scrollVertical" class="secondaryToolbarButton scrollModeButtons scrollVertical toggled" title="Use Vertical Scrolling" tabindex="62" data-l10n-id="scroll_vertical">
-              <span data-l10n-id="scroll_vertical_label">Vertical Scrolling</span>
-            </button>
-            <button id="scrollHorizontal" class="secondaryToolbarButton scrollModeButtons scrollHorizontal" title="Use Horizontal Scrolling" tabindex="63" data-l10n-id="scroll_horizontal">
-              <span data-l10n-id="scroll_horizontal_label">Horizontal Scrolling</span>
-            </button>
-            <button id="scrollWrapped" class="secondaryToolbarButton scrollModeButtons scrollWrapped" title="Use Wrapped Scrolling" tabindex="64" data-l10n-id="scroll_wrapped">
-              <span data-l10n-id="scroll_wrapped_label">Wrapped Scrolling</span>
-            </button>
+            <div id="scrollModeButtons" role="radiogroup">
+              <button id="scrollPage" class="secondaryToolbarButton" title="Use Page Scrolling" tabindex="62" data-l10n-id="scroll_page" role="radio" aria-checked="false">
+                <span data-l10n-id="scroll_page_label">Page Scrolling</span>
+              </button>
+              <button id="scrollVertical" class="secondaryToolbarButton toggled" title="Use Vertical Scrolling" tabindex="63" data-l10n-id="scroll_vertical" role="radio" aria-checked="true">
+                <span data-l10n-id="scroll_vertical_label" >Vertical Scrolling</span>
+              </button>
+              <button id="scrollHorizontal" class="secondaryToolbarButton" title="Use Horizontal Scrolling" tabindex="64" data-l10n-id="scroll_horizontal" role="radio" aria-checked="false">
+                <span data-l10n-id="scroll_horizontal_label">Horizontal Scrolling</span>
+              </button>
+              <button id="scrollWrapped" class="secondaryToolbarButton" title="Use Wrapped Scrolling" tabindex="65" data-l10n-id="scroll_wrapped" role="radio" aria-checked="false">
+                <span data-l10n-id="scroll_wrapped_label">Wrapped Scrolling</span>
+              </button>
+            </div>
 
-            <div class="horizontalToolbarSeparator scrollModeButtons"></div>
+            <div class="horizontalToolbarSeparator"></div>
 
-            <button id="spreadNone" class="secondaryToolbarButton spreadModeButtons spreadNone toggled" title="Do not join page spreads" tabindex="65" data-l10n-id="spread_none">
-              <span data-l10n-id="spread_none_label">No Spreads</span>
-            </button>
-            <button id="spreadOdd" class="secondaryToolbarButton spreadModeButtons spreadOdd" title="Join page spreads starting with odd-numbered pages" tabindex="66" data-l10n-id="spread_odd">
-              <span data-l10n-id="spread_odd_label">Odd Spreads</span>
-            </button>
-            <button id="spreadEven" class="secondaryToolbarButton spreadModeButtons spreadEven" title="Join page spreads starting with even-numbered pages" tabindex="67" data-l10n-id="spread_even">
-              <span data-l10n-id="spread_even_label">Even Spreads</span>
-            </button>
+            <div id="spreadModeButtons" role="radiogroup">
+              <button id="spreadNone" class="secondaryToolbarButton toggled" title="Do not join page spreads" tabindex="66" data-l10n-id="spread_none" role="radio" aria-checked="true">
+                <span data-l10n-id="spread_none_label">No Spreads</span>
+              </button>
+              <button id="spreadOdd" class="secondaryToolbarButton" title="Join page spreads starting with odd-numbered pages" tabindex="67" data-l10n-id="spread_odd" role="radio" aria-checked="false">
+                <span data-l10n-id="spread_odd_label">Odd Spreads</span>
+              </button>
+              <button id="spreadEven" class="secondaryToolbarButton" title="Join page spreads starting with even-numbered pages" tabindex="68" data-l10n-id="spread_even" role="radio" aria-checked="false">
+                <span data-l10n-id="spread_even_label">Even Spreads</span>
+              </button>
+            </div>
 
-            <div class="horizontalToolbarSeparator spreadModeButtons"></div>
+            <div class="horizontalToolbarSeparator"></div>
 
-            <button id="documentProperties" class="secondaryToolbarButton documentProperties" title="Document Properties…" tabindex="68" data-l10n-id="document_properties">
+            <button id="documentProperties" class="secondaryToolbarButton" title="Document Properties…" tabindex="69" data-l10n-id="document_properties" aria-controls="documentPropertiesDialog">
               <span data-l10n-id="document_properties_label">Document Properties…</span>
             </button>
           </div>
@@ -203,59 +253,68 @@ See https://github.com/adobe-type-tools/cmap-resources
           <div id="toolbarContainer">
             <div id="toolbarViewer">
               <div id="toolbarViewerLeft">
-                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="11" data-l10n-id="toggle_sidebar">
+                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="11" data-l10n-id="toggle_sidebar" aria-expanded="false" aria-controls="sidebarContainer">
                   <span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>
                 </button>
                 <div class="toolbarButtonSpacer"></div>
-                <button id="viewFind" class="toolbarButton" title="Find in Document" tabindex="12" data-l10n-id="findbar">
+                <button id="viewFind" class="toolbarButton" title="Find in Document" tabindex="12" data-l10n-id="findbar" aria-expanded="false" aria-controls="findbar">
                   <span data-l10n-id="findbar_label">Find</span>
                 </button>
                 <div class="splitToolbarButton hiddenSmallView">
-                  <button class="toolbarButton pageUp" title="Previous Page" id="previous" tabindex="13" data-l10n-id="previous">
+                  <button class="toolbarButton" title="Previous Page" id="previous" tabindex="13" data-l10n-id="previous">
                     <span data-l10n-id="previous_label">Previous</span>
                   </button>
                   <div class="splitToolbarButtonSeparator"></div>
-                  <button class="toolbarButton pageDown" title="Next Page" id="next" tabindex="14" data-l10n-id="next">
+                  <button class="toolbarButton" title="Next Page" id="next" tabindex="14" data-l10n-id="next">
                     <span data-l10n-id="next_label">Next</span>
                   </button>
                 </div>
-                <input type="number" id="pageNumber" class="toolbarField pageNumber" title="Page" value="1" size="4" min="1" tabindex="15" data-l10n-id="page" autocomplete="off">
+                <input type="number" id="pageNumber" class="toolbarField" title="Page" value="1" size="4" min="1" tabindex="15" data-l10n-id="page" autocomplete="off">
                 <span id="numPages" class="toolbarLabel"></span>
               </div>
               <div id="toolbarViewerRight">
-                <button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView" title="Switch to Presentation Mode" tabindex="31" data-l10n-id="presentation_mode">
+                <button id="presentationMode" class="toolbarButton hiddenLargeView" title="Switch to Presentation Mode" tabindex="31" data-l10n-id="presentation_mode">
                   <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
                 </button>
 
-                <button id="openFile" class="toolbarButton openFile hiddenLargeView" title="Open File" tabindex="32" data-l10n-id="open_file">
-                  <span data-l10n-id="open_file_label">Open</span>
-                </button>
 {% if  g.user.role_download() %}
-                <button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="33" data-l10n-id="print">
+                <button id="print" class="toolbarButton hiddenMediumView" title="Print" tabindex="33" data-l10n-id="print">
                   <span data-l10n-id="print_label">Print</span>
                 </button>
 
-                <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download">
+                <button id="download" class="toolbarButton hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download">
                   <span data-l10n-id="download_label">Download</span>
                 </button>
 {% endif %}
-                <a href="#" id="viewBookmark" class="toolbarButton bookmark hiddenSmallView" title="Current view (copy or open in new window)" tabindex="35" data-l10n-id="bookmark">
+                <a href="#" id="viewBookmark" class="toolbarButton hiddenSmallView" title="Current view (copy or open in new window)" tabindex="35" data-l10n-id="bookmark">
                   <span data-l10n-id="bookmark_label">Current View</span>
                 </a>
 
                 <div class="verticalToolbarSeparator hiddenSmallView"></div>
 
-                <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="36" data-l10n-id="tools">
+                <div id="editorModeButtons" class="splitToolbarButton toggled hidden" role="radiogroup">
+                  <button id="editorFreeText" class="toolbarButton" disabled="disabled" title="Add FreeText Annotation" role="radio" aria-checked="false" tabindex="36" data-l10n-id="editor_free_text">
+                    <span data-l10n-id="editor_free_text_label">FreeText Annotation</span>
+                  </button>
+                  <button id="editorInk" class="toolbarButton" disabled="disabled" title="Add Ink Annotation" role="radio" aria-checked="false" tabindex="37" data-l10n-id="editor_ink">
+                    <span data-l10n-id="editor_ink_label">Ink Annotation</span>
+                  </button>
+                </div>
+
+                <!-- Should be visible when the "editorModeButtons" are visible. -->
+                <div id="editorModeSeparator" class="verticalToolbarSeparator hidden"></div>
+
+                <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="48" data-l10n-id="tools" aria-expanded="false" aria-controls="secondaryToolbar">
                   <span data-l10n-id="tools_label">Tools</span>
                 </button>
               </div>
               <div id="toolbarViewerMiddle">
                 <div class="splitToolbarButton">
-                  <button id="zoomOut" class="toolbarButton zoomOut" title="Zoom Out" tabindex="21" data-l10n-id="zoom_out">
+                  <button id="zoomOut" class="toolbarButton" title="Zoom Out" tabindex="21" data-l10n-id="zoom_out">
                     <span data-l10n-id="zoom_out_label">Zoom Out</span>
                   </button>
                   <div class="splitToolbarButtonSeparator"></div>
-                  <button id="zoomIn" class="toolbarButton zoomIn" title="Zoom In" tabindex="22" data-l10n-id="zoom_in">
+                  <button id="zoomIn" class="toolbarButton" title="Zoom In" tabindex="22" data-l10n-id="zoom_in">
                     <span data-l10n-id="zoom_in_label">Zoom In</span>
                    </button>
                 </div>
@@ -287,17 +346,6 @@ See https://github.com/adobe-type-tools/cmap-resources
           </div>
         </div>
 
-        <menu type="context" id="viewerContextMenu">
-          <menuitem id="contextFirstPage" label="First Page"
-                    data-l10n-id="first_page"></menuitem>
-          <menuitem id="contextLastPage" label="Last Page"
-                    data-l10n-id="last_page"></menuitem>
-          <menuitem id="contextPageRotateCw" label="Rotate Clockwise"
-                    data-l10n-id="page_rotate_cw"></menuitem>
-          <menuitem id="contextPageRotateCcw" label="Rotate Counter-Clockwise"
-                    data-l10n-id="page_rotate_ccw"></menuitem>
-        </menu>
-
         <div id="viewerContainer" tabindex="0">
           <div id="viewer" class="pdfViewer"></div>
         </div>
@@ -317,93 +365,101 @@ See https://github.com/adobe-type-tools/cmap-resources
               Close
             </button>
           </div>
-          <div class="clearBoth"></div>
+          <div id="errorSpacer"></div>
           <textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
         </div>
       </div> <!-- mainContainer -->
 
-      <div id="overlayContainer" class="hidden">
-        <div id="passwordOverlay" class="container hidden">
-          <div class="dialog">
-            <div class="row">
-              <p id="passwordText" data-l10n-id="password_label">Enter the password to open this PDF file:</p>
-            </div>
-            <div class="row">
-              <input type="password" id="password" class="toolbarField">
-            </div>
-            <div class="buttonRow">
-              <button id="passwordCancel" class="overlayButton"><span data-l10n-id="password_cancel">Cancel</span></button>
-              <button id="passwordSubmit" class="overlayButton"><span data-l10n-id="password_ok">OK</span></button>
-            </div>
+      <div id="dialogContainer">
+        <dialog id="passwordDialog">
+          <div class="row">
+            <label for="password" id="passwordText" data-l10n-id="password_label">Enter the password to open this PDF file:</label>
           </div>
-        </div>
-        <div id="documentPropertiesOverlay" class="container hidden">
-          <div class="dialog">
-            <div class="row">
-              <span data-l10n-id="document_properties_file_name">File name:</span> <p id="fileNameField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_file_size">File size:</span> <p id="fileSizeField">-</p>
-            </div>
-            <div class="separator"></div>
-            <div class="row">
-              <span data-l10n-id="document_properties_title">Title:</span> <p id="titleField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_author">Author:</span> <p id="authorField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_subject">Subject:</span> <p id="subjectField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_keywords">Keywords:</span> <p id="keywordsField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_creation_date">Creation Date:</span> <p id="creationDateField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_modification_date">Modification Date:</span> <p id="modificationDateField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_creator">Creator:</span> <p id="creatorField">-</p>
-            </div>
-            <div class="separator"></div>
-            <div class="row">
-              <span data-l10n-id="document_properties_producer">PDF Producer:</span> <p id="producerField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_version">PDF Version:</span> <p id="versionField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_page_count">Page Count:</span> <p id="pageCountField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_page_size">Page Size:</span> <p id="pageSizeField">-</p>
-            </div>
-            <div class="separator"></div>
-            <div class="row">
-              <span data-l10n-id="document_properties_linearized">Fast Web View:</span> <p id="linearizedField">-</p>
-            </div>
-            <div class="buttonRow">
-              <button id="documentPropertiesClose" class="overlayButton"><span data-l10n-id="document_properties_close">Close</span></button>
-            </div>
+          <div class="row">
+            <input type="password" id="password" class="toolbarField">
           </div>
-        </div>
-        <div id="printServiceOverlay" class="container hidden">
-          <div class="dialog">
-            <div class="row">
-              <span data-l10n-id="print_progress_message">Preparing document for printing…</span>
-            </div>
-            <div class="row">
-              <progress value="0" max="100"></progress>
-              <span data-l10n-id="print_progress_percent" data-l10n-args='{ "progress": 0 }' class="relative-progress">0%</span>
-            </div>
-            <div class="buttonRow">
-              <button id="printCancel" class="overlayButton"><span data-l10n-id="print_progress_close">Cancel</span></button>
-            </div>
+          <div class="buttonRow">
+            <button id="passwordCancel" class="dialogButton"><span data-l10n-id="password_cancel">Cancel</span></button>
+            <button id="passwordSubmit" class="dialogButton"><span data-l10n-id="password_ok">OK</span></button>
           </div>
-        </div>
-      </div>  <!-- overlayContainer -->
+        </dialog>
+        <dialog id="documentPropertiesDialog">
+          <div class="row">
+            <span id="fileNameLabel" data-l10n-id="document_properties_file_name">File name:</span>
+            <p id="fileNameField" aria-labelledby="fileNameLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="fileSizeLabel" data-l10n-id="document_properties_file_size">File size:</span>
+            <p id="fileSizeField" aria-labelledby="fileSizeLabel">-</p>
+          </div>
+          <div class="separator"></div>
+          <div class="row">
+            <span id="titleLabel" data-l10n-id="document_properties_title">Title:</span>
+            <p id="titleField" aria-labelledby="titleLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="authorLabel" data-l10n-id="document_properties_author">Author:</span>
+            <p id="authorField" aria-labelledby="authorLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="subjectLabel" data-l10n-id="document_properties_subject">Subject:</span>
+            <p id="subjectField" aria-labelledby="subjectLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="keywordsLabel" data-l10n-id="document_properties_keywords">Keywords:</span>
+            <p id="keywordsField" aria-labelledby="keywordsLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="creationDateLabel" data-l10n-id="document_properties_creation_date">Creation Date:</span>
+            <p id="creationDateField" aria-labelledby="creationDateLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="modificationDateLabel" data-l10n-id="document_properties_modification_date">Modification Date:</span>
+            <p id="modificationDateField" aria-labelledby="modificationDateLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="creatorLabel" data-l10n-id="document_properties_creator">Creator:</span>
+            <p id="creatorField" aria-labelledby="creatorLabel">-</p>
+          </div>
+          <div class="separator"></div>
+          <div class="row">
+            <span id="producerLabel" data-l10n-id="document_properties_producer">PDF Producer:</span>
+            <p id="producerField" aria-labelledby="producerLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="versionLabel" data-l10n-id="document_properties_version">PDF Version:</span>
+            <p id="versionField" aria-labelledby="versionLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="pageCountLabel" data-l10n-id="document_properties_page_count">Page Count:</span>
+            <p id="pageCountField" aria-labelledby="pageCountLabel">-</p>
+          </div>
+          <div class="row">
+            <span id="pageSizeLabel" data-l10n-id="document_properties_page_size">Page Size:</span>
+            <p id="pageSizeField" aria-labelledby="pageSizeLabel">-</p>
+          </div>
+          <div class="separator"></div>
+          <div class="row">
+            <span id="linearizedLabel" data-l10n-id="document_properties_linearized">Fast Web View:</span>
+            <p id="linearizedField" aria-labelledby="linearizedLabel">-</p>
+          </div>
+          <div class="buttonRow">
+            <button id="documentPropertiesClose" class="dialogButton"><span data-l10n-id="document_properties_close">Close</span></button>
+          </div>
+        </dialog>
+        <dialog id="printServiceDialog" style="min-width: 200px;">
+          <div class="row">
+            <span data-l10n-id="print_progress_message">Preparing document for printing…</span>
+          </div>
+          <div class="row">
+            <progress value="0" max="100"></progress>
+            <span data-l10n-id="print_progress_percent" data-l10n-args='{ "progress": 0 }' class="relative-progress">0%</span>
+          </div>
+          <div class="buttonRow">
+            <button id="printCancel" class="dialogButton"><span data-l10n-id="print_progress_close">Cancel</span></button>
+          </div>
+        </dialog>
+      </div>  <!-- dialogContainer -->
 
     </div> <!-- outerContainer -->
     <div id="printContainer"></div>

From 452093db4714eef03a990508bd2337e40b66fca3 Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <github@depasquale.giugl.io>
Date: Thu, 8 Sep 2022 17:23:53 +0200
Subject: [PATCH 322/412] Google Covers: strip curl in thumbnail and request
 higher resolution image

---
 cps/metadata_provider/google.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index 98fadd372..10a3eeb0e 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -103,6 +103,14 @@ class Google(Metadata):
     def _parse_cover(result: Dict, generic_cover: str) -> str:
         if result["volumeInfo"].get("imageLinks"):
             cover_url = result["volumeInfo"]["imageLinks"]["thumbnail"]
+            
+            # strip curl in cover
+            cover_url = cover_url.replace("&edge=curl", "")
+            
+            # request 800x900 cover image (higher resolution)
+            cover_url += "&fife=w800-h900"
+            
+
             return cover_url.replace("http://", "https://")
         return generic_cover
 

From f6a9030c334b084f269b526825332641f75d4ae4 Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <github@depasquale.giugl.io>
Date: Thu, 8 Sep 2022 17:26:34 +0200
Subject: [PATCH 323/412] Removed extra space

---
 cps/metadata_provider/google.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index 10a3eeb0e..c5522533a 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -110,7 +110,6 @@ class Google(Metadata):
             # request 800x900 cover image (higher resolution)
             cover_url += "&fife=w800-h900"
             
-
             return cover_url.replace("http://", "https://")
         return generic_cover
 

From 110d283a50bd56cdccbccf4b4b9c90a4051255be Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 10 Sep 2022 17:17:20 +0200
Subject: [PATCH 324/412] Enable series type custom column

---
 cps/db.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index d1c5ec71c..9136675a9 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -53,7 +53,7 @@ from weakref import WeakSet
 
 log = logger.create()
 
-cc_exceptions = ['composite', 'series']
+cc_exceptions = ['composite']
 cc_classes = {}
 
 Base = declarative_base()
@@ -439,6 +439,7 @@ class CalibreDB:
     # 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()
+    series = False
 
     def __init__(self, expire_on_commit=True, init=False):
         """ Initialize a new CalibreDB session
@@ -466,6 +467,7 @@ class CalibreDB:
         for row in cc:
             if row.datatype not in cc_exceptions:
                 if row.datatype == 'series':
+                    cls.series = True
                     dicttable = {'__tablename__': 'books_custom_column_' + str(row.id) + '_link',
                                  'id': Column(Integer, primary_key=True),
                                  'book': Column(Integer, ForeignKey('books.id'),
@@ -982,10 +984,14 @@ class CalibreDB:
                     Base.metadata.remove(table)
 
     def reconnect_db(self, config, app_db_path):
-        self.dispose()
-        self.engine.dispose()
-        self.setup_db(config.config_calibre_dir, app_db_path)
-        self.update_config(config)
+        if self.series:
+            from . import isoLanguages, web_server
+            web_server.stop(True)
+        else:
+            self.dispose()
+            self.engine.dispose()
+            self.setup_db(config.config_calibre_dir, app_db_path)
+            self.update_config(config)
 
 
 def lcase(s):

From ca0ee5d391655db413e49fd3fcf90ac4883ddd61 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 10 Sep 2022 18:26:52 +0200
Subject: [PATCH 325/412] backup metadata first step

---
 cps/db.py                    |  22 +++++
 cps/editbooks.py             |   4 +
 cps/gdriveutils.py           |  24 +++++
 cps/helper.py                |   4 +-
 cps/schedule.py              |   7 +-
 cps/tasks/metadata_backup.py | 174 +++++++++++++++++++++++++++++++++++
 6 files changed, 232 insertions(+), 3 deletions(-)
 create mode 100644 cps/tasks/metadata_backup.py

diff --git a/cps/db.py b/cps/db.py
index 9136675a9..f276e5c8a 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -322,6 +322,15 @@ class Data(Base):
         return u"<Data('{0},{1}{2}{3}')>".format(self.book, self.format, self.uncompressed_size, self.name)
 
 
+class Metadata_Dirtied(Base):
+    __tablename__ = 'metadata_dirtied'
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    book = Column(Integer, ForeignKey('books.id'), nullable=False, unique=True)
+
+    def __init__(self, book):
+        self.book = book
+
+
 class Books(Base):
     __tablename__ = 'books'
 
@@ -390,6 +399,9 @@ class CustomColumns(Base):
         display_dict = json.loads(self.display)
         return display_dict
 
+    def to_json(self):
+        pass
+
 
 class AlchemyEncoder(json.JSONEncoder):
 
@@ -642,6 +654,16 @@ class CalibreDB:
 
     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()
+    def set_metadata_dirty(self, book_id):
+        if not self.session.query(Metadata_Dirtied).filter(Metadata_Dirtied.book==book_id).one_or_none():
+            self.session.add(Metadata_Dirtied(book_id))
+    def delete_dirty_metadata(self, book_id):
+        try:
+            self.session.query(Metadata_Dirtied).filter(Metadata_Dirtied.book==book_id).delete()
+            self.session.commit()
+        except (OperationalError) as e:
+            self.session.rollback()
+            log.error("Database error: {}".format(e))
 
     # Language and content filters for displaying in the UI
     def common_filters(self, allow_show_archived=False, return_all_languages=False):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 0e7588ea8..a22664f47 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -203,6 +203,7 @@ def edit_book(book_id):
         if modify_date:
             book.last_modified = datetime.utcnow()
             kobo_sync_status.remove_synced_book(edited_books_id, all=True)
+            calibre_db.set_metadata_dirty(book.id)
 
         calibre_db.session.merge(book)
         calibre_db.session.commit()
@@ -277,6 +278,8 @@ def upload():
 
                 move_coverfile(meta, db_book)
 
+                if modify_date:
+                    calibre_db.set_metadata_dirty(book_id)
                 # save data to database, reread data
                 calibre_db.session.commit()
 
@@ -555,6 +558,7 @@ def table_xchange_author_title():
                                                          renamed_author=renamed)
             if modify_date:
                 book.last_modified = datetime.utcnow()
+                calibre_db.set_metadata_dirty(book.id)
             try:
                 calibre_db.session.commit()
             except (OperationalError, IntegrityError, StaleDataError) as e:
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 866defaa1..f83bf775c 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -578,6 +578,7 @@ def deleteDatabaseEntry(ID):
 
 
 # Gets cover file from gdrive
+# ToDo: Check is this right everyone get read permissions on cover files?
 def get_cover_via_gdrive(cover_path):
     df = getFileFromEbooksFolder(cover_path, 'cover.jpg')
     if df:
@@ -600,6 +601,29 @@ def get_cover_via_gdrive(cover_path):
     else:
         return None
 
+# Gets cover file from gdrive
+def get_metadata_backup_via_gdrive(metadata_path):
+    df = getFileFromEbooksFolder(metadata_path, 'metadata.opf')
+    if df:
+        if not session.query(PermissionAdded).filter(PermissionAdded.gdrive_id == df['id']).first():
+            df.GetPermissions()
+            df.InsertPermission({
+                            'type': 'anyone',
+                            'value': 'anyone',
+                            'role': 'writer',       # ToDo needs write access
+                            'withLink': True})
+            permissionAdded = PermissionAdded()
+            permissionAdded.gdrive_id = df['id']
+            session.add(permissionAdded)
+            try:
+                session.commit()
+            except OperationalError as ex:
+                log.error_or_exception('Database error: {}'.format(ex))
+                session.rollback()
+        return df.metadata.get('webContentLink')
+    else:
+        return None
+
 # Creates chunks for downloading big files
 def partial(total_byte_len, part_size_limit):
     s = []
diff --git a/cps/helper.py b/cps/helper.py
index 5c929944a..be15d4043 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -19,7 +19,6 @@
 
 import os
 import io
-import sys
 import mimetypes
 import re
 import shutil
@@ -685,7 +684,8 @@ def update_dir_structure(book_id,
 
 def delete_book(book, calibrepath, book_format):
     if not book_format:
-        clear_cover_thumbnail_cache(book.id)        ## here it breaks
+        clear_cover_thumbnail_cache(book.id) ## here it breaks
+        calibre_db.delete_dirty_metadata(book.id)
     if config.config_use_google_drive:
         return delete_book_gdrive(book, book_format)
     else:
diff --git a/cps/schedule.py b/cps/schedule.py
index faadfb7ee..228a7f5d6 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -23,7 +23,7 @@ from .services.background_scheduler import BackgroundScheduler, use_APScheduler
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails, TaskClearCoverThumbnailCache
 from .services.worker import WorkerThread
-
+from .tasks.metadata_backup import TaskBackupMetadata
 
 def get_scheduled_tasks(reconnect=True):
     tasks = list()
@@ -32,6 +32,10 @@ def get_scheduled_tasks(reconnect=True):
     if reconnect:
         tasks.append([lambda: TaskReconnectDatabase(), 'reconnect', False])
 
+    # ToDo make configurable. Generate metadata.opf file for each changed book
+    if True:
+        tasks.append([lambda: TaskBackupMetadata(), 'backup metadata', False])
+
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
         tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers', True])
@@ -91,6 +95,7 @@ def should_task_be_running(start, duration):
     end_time = start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
     return start_time < now < end_time
 
+
 def calclulate_end_time(start, duration):
     start_time = datetime.datetime.now().replace(hour=start, minute=0)
     return start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
diff --git a/cps/tasks/metadata_backup.py b/cps/tasks/metadata_backup.py
new file mode 100644
index 000000000..4cb7a79d6
--- /dev/null
+++ b/cps/tasks/metadata_backup.py
@@ -0,0 +1,174 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 monkey
+#
+#   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 datetime
+import os
+import json
+from urllib.request import urlopen
+from lxml import etree
+from html import escape
+
+from cps import config, db, fs, gdriveutils, logger, ub
+from cps.services.worker import CalibreTask, STAT_CANCELLED, STAT_ENDED
+from flask_babel import lazy_gettext as N_
+
+OPF_NAMESPACE = "http://www.idpf.org/2007/opf"
+PURL_NAMESPACE = "http://purl.org/dc/elements/1.1/"
+
+OPF = "{%s}" % OPF_NAMESPACE
+PURL = "{%s}" % PURL_NAMESPACE
+
+etree.register_namespace("opf", OPF_NAMESPACE)
+etree.register_namespace("dc", PURL_NAMESPACE)
+
+OPF_NS = {None: OPF_NAMESPACE}  # the default namespace (no prefix)
+NSMAP = {'dc': PURL_NAMESPACE, 'opf': OPF_NAMESPACE}
+
+
+class TaskBackupMetadata(CalibreTask):
+
+    def __init__(self, task_message=N_('Backing up Metadata')):
+        super(TaskBackupMetadata, self).__init__(task_message)
+        self.log = logger.create()
+        self.db_session = db.CalibreDB(expire_on_commit=False, init=True).session
+
+    def run(self, worker_thread):
+        try:
+            metadata_backup = self.db_session.query(db.Metadata_Dirtied).all()
+            custom_columns = self.db_session.query(db.CustomColumns).all()
+            for backup in metadata_backup:
+                book = self.db_session.query(db.Books).filter(db.Books.id == backup.book).one_or_none()
+                # self.db_session.query(db.Metadata_Dirtied).filter(db.Metadata_Dirtied == backup.id).delete()
+                # self.db_session.commit()
+                if book:
+                    metadata_file = self.open_metadata(book, custom_columns)
+                    self._handleSuccess()
+                    self.db_session.remove()
+                else:
+                    self.log.error("Book {} not found in database".format(backup.book))
+                    self._handleError("Book {} not found in database".format(backup.book))
+                    self.db_session.remove()
+
+        except Exception as ex:
+            self.log.debug('Error creating metadata backup: ' + str(ex))
+            self._handleError('Error creating metadata backup: ' + str(ex))
+            self.db_session.rollback()
+            self.db_session.remove()
+
+    def open_metadata(self, book, custom_columns):
+        if config.config_use_google_drive:
+            if not gdriveutils.is_gdrive_ready():
+                raise Exception('Google Drive is configured but not ready')
+
+            web_content_link = gdriveutils.get_metadata_backup_via_gdrive(book.path)
+            if not web_content_link:
+                raise Exception('Google Drive cover url not found')
+
+            stream = None
+            try:
+                stream = urlopen(web_content_link)
+            except Exception as ex:
+                # Bubble exception to calling function
+                self.log.debug('Error reading metadata.opf: ' + str(ex))       # ToDo Chek whats going on
+                raise ex
+            finally:
+                if stream is not None:
+                    stream.close()
+        else:
+            book_metadata_filepath = os.path.join(config.config_calibre_dir, book.path, 'metadata.opf')
+            if not os.path.isfile(book_metadata_filepath):
+                self.create_new_metadata_backup(book,  custom_columns, book_metadata_filepath)
+                # ToDo What to do
+                return open(book_metadata_filepath, "w")
+            else:
+                etree.parse(book_metadata_filepath)
+                # backup not found has to be created
+                #raise Exception('Book cover file not found')
+
+    def create_new_metadata_backup(self, book,  custom_columns, book_metadata_filepath):
+        # generate root package element
+        package = etree.Element(OPF + "package", nsmap=OPF_NS)
+        package.set("unique-identifier", "uuid_id")
+        package.set("version", "2.0")
+
+        # generate metadata element and all subelements of it
+        metadata = etree.SubElement(package, "metadata", nsmap=NSMAP)
+        identifier = etree.SubElement(metadata, PURL + "identifier", id="calibre_id", nsmap=NSMAP)
+        identifier.set(OPF + "scheme", "calibre")
+        identifier.text = str(book.id)
+        identifier2 = etree.SubElement(metadata, PURL + "identifier", id="uuid_id", nsmap=NSMAP)
+        identifier2.set(OPF + "scheme", "uuid")
+        identifier2.text = book.uuid
+        title = etree.SubElement(metadata, PURL + "title", nsmap=NSMAP)
+        title.text = book.title
+        for author in book.authors:
+            creator = etree.SubElement(metadata, PURL + "creator", nsmap=NSMAP)
+            creator.text = str(author)
+            creator.set(OPF + "file-as", book.author_sort)     # ToDo Check
+            creator.set(OPF + "role", "aut")
+        contributor = etree.SubElement(metadata, PURL + "contributor", nsmap=NSMAP)
+        contributor.text = "calibre (5.7.2) [https://calibre-ebook.com]"
+        contributor.set(OPF + "file-as", "calibre")     # ToDo Check
+        contributor.set(OPF + "role", "bpk")
+        date = etree.SubElement(metadata, PURL + "date", nsmap=NSMAP)
+        date.text = datetime.datetime.strftime(book.pubdate, "%Y-%m-%dT%H:%M:%S+00:00")
+        language = etree.SubElement(metadata, PURL + "language", nsmap=NSMAP)
+        if book.languages:
+            language.text = str(book.languages)
+        else:
+            language.text = ""  # ToDo: insert locale (2 letter code)
+        if book.tags:
+            subject = etree.SubElement(metadata, PURL + "subject", nsmap=NSMAP)
+            subject.text = str(book.tags)
+        etree.SubElement(metadata, "meta", name="calibre:author_link_map",
+                         content="{" + escape(",".join(['"' + str(a) + '":""' for a in book.authors])) + "}",
+                         nsmap=NSMAP)
+        etree.SubElement(metadata, "meta", name="calibre:series",
+                         content=str(book.series),
+                         nsmap=NSMAP)
+        etree.SubElement(metadata, "meta", name="calibre:series_index",
+                         content=str(book.series_index),
+                         nsmap=NSMAP)
+        etree.SubElement(metadata, "meta", name="calibre:timestamp",
+                         content=datetime.datetime.strftime(book.timestamp, "%Y-%m-%dT%H:%M:%S+00:00"),
+                         nsmap=NSMAP)
+        etree.SubElement(metadata, "meta", name="calibre:title_sort",
+                         content=book.sort,
+                         nsmap=NSMAP)
+        for cc in custom_columns:
+            etree.SubElement(metadata, "meta", name="calibre:user_metadata:#{}".format(cc.label),
+                             content=escape(cc.get_display_dict()),
+                             nsmap=NSMAP)
+
+            pass
+
+        # generate guide element and all sub elements of it
+        guide = etree.SubElement(package, "guide")
+        etree.SubElement(guide, "reference", type="cover", title="Titelbild", href="cover.jpg")
+
+        # prepare finalize everything and output
+        doc = etree.ElementTree(package)
+        with open(book_metadata_filepath, 'wb') as f:
+            doc.write(f, xml_declaration=True, encoding='utf-8', pretty_print=True)
+
+    @property
+    def name(self):
+        return "Backing up Metadata"
+
+    @property
+    def is_cancellable(self):
+        return True

From 241aa77d410e998923aca812e1d10349bd37616f Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 14 Sep 2022 17:03:48 +0200
Subject: [PATCH 326/412] backup metadata second step

---
 cps/db.py                    |  25 ++++++++-
 cps/schedule.py              |   2 +-
 cps/tasks/metadata_backup.py | 102 +++++++++++++++++++++++------------
 3 files changed, 91 insertions(+), 38 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index f276e5c8a..20975b77d 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -399,8 +399,29 @@ class CustomColumns(Base):
         display_dict = json.loads(self.display)
         return display_dict
 
-    def to_json(self):
-        pass
+    def to_json(self, value, extra):
+        content = dict()
+        content['table'] = "custom_column_" + str(self.id)
+        content['column'] = "value"
+        content['datatype'] = self.datatype
+        content['is_multiple'] = None if not self.is_multiple else self.is_multiple
+        content['kind'] = "field"
+        content['name'] = self.name
+        content['search_terms'] = ['#' + self.label]
+        content['label'] = self.label
+        content['colnum'] = self.id
+        content['display'] = self.get_display_dict()
+        content['is_custom'] = True
+        content['is_category'] = self.datatype in ['text', 'rating', 'enumeration', 'series']
+        content['link_column'] = "value"
+        content['category_sort'] = "value"
+        content['is_csp'] = False
+        content['is_editable'] = self.editable
+        content['rec_index'] = self.id + 22     # toDo why ??
+        content['#value#'] = value
+        content['#extra#'] = extra
+        content['is_multiple2'] = {}
+        return json.dumps(content, ensure_ascii=False)
 
 
 class AlchemyEncoder(json.JSONEncoder):
diff --git a/cps/schedule.py b/cps/schedule.py
index 228a7f5d6..ab4475705 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -34,7 +34,7 @@ def get_scheduled_tasks(reconnect=True):
 
     # ToDo make configurable. Generate metadata.opf file for each changed book
     if True:
-        tasks.append([lambda: TaskBackupMetadata(), 'backup metadata', False])
+        tasks.append([lambda: TaskBackupMetadata(), "en", 'backup metadata', False])
 
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
diff --git a/cps/tasks/metadata_backup.py b/cps/tasks/metadata_backup.py
index 4cb7a79d6..a50dfcfa7 100644
--- a/cps/tasks/metadata_backup.py
+++ b/cps/tasks/metadata_backup.py
@@ -15,9 +15,9 @@
 #
 #   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 datetime
+
 import os
-import json
+from lxml import objectify
 from urllib.request import urlopen
 from lxml import etree
 from html import escape
@@ -41,33 +41,35 @@ NSMAP = {'dc': PURL_NAMESPACE, 'opf': OPF_NAMESPACE}
 
 class TaskBackupMetadata(CalibreTask):
 
-    def __init__(self, task_message=N_('Backing up Metadata')):
+    def __init__(self, export_language="en", translated_title="cover", task_message=N_('Backing up Metadata')):
         super(TaskBackupMetadata, self).__init__(task_message)
         self.log = logger.create()
-        self.db_session = db.CalibreDB(expire_on_commit=False, init=True).session
+        self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
+        self.export_language = export_language
+        self.translated_title = translated_title
 
     def run(self, worker_thread):
         try:
-            metadata_backup = self.db_session.query(db.Metadata_Dirtied).all()
-            custom_columns = self.db_session.query(db.CustomColumns).all()
+            metadata_backup = self.calibre_db.session.query(db.Metadata_Dirtied).all()
+            custom_columns = self.calibre_db.session.query(db.CustomColumns).order_by(db.CustomColumns.label).all()
             for backup in metadata_backup:
-                book = self.db_session.query(db.Books).filter(db.Books.id == backup.book).one_or_none()
-                # self.db_session.query(db.Metadata_Dirtied).filter(db.Metadata_Dirtied == backup.id).delete()
-                # self.db_session.commit()
+                book = self.calibre_db.session.query(db.Books).filter(db.Books.id == backup.book).one_or_none()
+                # self.calibre_db.session.query(db.Metadata_Dirtied).filter(db.Metadata_Dirtied == backup.id).delete()
+                # self.calibre_db.session.commit()
                 if book:
-                    metadata_file = self.open_metadata(book, custom_columns)
+                    self.open_metadata(book, custom_columns)
                     self._handleSuccess()
-                    self.db_session.remove()
+                    self.calibre_db.session.close()
                 else:
                     self.log.error("Book {} not found in database".format(backup.book))
                     self._handleError("Book {} not found in database".format(backup.book))
-                    self.db_session.remove()
+                    self.calibre_db.session.close()
 
         except Exception as ex:
             self.log.debug('Error creating metadata backup: ' + str(ex))
             self._handleError('Error creating metadata backup: ' + str(ex))
-            self.db_session.rollback()
-            self.db_session.remove()
+            self.calibre_db.session.rollback()
+            self.calibre_db.session.close()
 
     def open_metadata(self, book, custom_columns):
         if config.config_use_google_drive:
@@ -89,13 +91,27 @@ class TaskBackupMetadata(CalibreTask):
                 if stream is not None:
                     stream.close()
         else:
+            # ToDo: Handle book folder not found or not readable
             book_metadata_filepath = os.path.join(config.config_calibre_dir, book.path, 'metadata.opf')
-            if not os.path.isfile(book_metadata_filepath):
-                self.create_new_metadata_backup(book,  custom_columns, book_metadata_filepath)
-                # ToDo What to do
-                return open(book_metadata_filepath, "w")
-            else:
-                etree.parse(book_metadata_filepath)
+            #if not os.path.isfile(book_metadata_filepath):
+            self.create_new_metadata_backup(book,  custom_columns, book_metadata_filepath)
+            # else:
+                '''namespaces = {'dc': PURL_NAMESPACE, 'opf': OPF_NAMESPACE}
+                test = etree.parse(book_metadata_filepath)
+                root = test.getroot()
+                for i in root.iter():
+                    self.log.info(i)
+                title = root.find("dc:metadata", namespaces)
+                pass'''
+                with open(book_metadata_filepath, "rb") as f:
+                    xml = f.read()
+
+                root = objectify.fromstring(xml)
+                # root.metadata['{http://purl.org/dc/elements/1.1/}title']
+                # root.metadata[PURL + 'title']
+                # getattr(root.metadata, PURL +'title')
+                # test = objectify.parse()
+                pass
                 # backup not found has to be created
                 #raise Exception('Book cover file not found')
 
@@ -124,16 +140,23 @@ class TaskBackupMetadata(CalibreTask):
         contributor.text = "calibre (5.7.2) [https://calibre-ebook.com]"
         contributor.set(OPF + "file-as", "calibre")     # ToDo Check
         contributor.set(OPF + "role", "bpk")
+
         date = etree.SubElement(metadata, PURL + "date", nsmap=NSMAP)
-        date.text = datetime.datetime.strftime(book.pubdate, "%Y-%m-%dT%H:%M:%S+00:00")
-        language = etree.SubElement(metadata, PURL + "language", nsmap=NSMAP)
-        if book.languages:
-            language.text = str(book.languages)
+        date.text = '{d.year:04}-{d.month:02}-{d.day:02}T{d.hour:02}:{d.minute:02}:{d.second:02}'.format(d=book.pubdate)
+
+        if not book.languages:
+            language = etree.SubElement(metadata, PURL + "language", nsmap=NSMAP)
+            language.text = self.export_language
         else:
-            language.text = ""  # ToDo: insert locale (2 letter code)
-        if book.tags:
+            for b in book.languages:
+                language = etree.SubElement(metadata, PURL + "language", nsmap=NSMAP)
+                language.text = str(b.languages)
+        for b in book.tags:
             subject = etree.SubElement(metadata, PURL + "subject", nsmap=NSMAP)
-            subject.text = str(book.tags)
+            subject.text = str(b.tags)
+        if book.comments:
+            description = etree.SubElement(metadata, PURL + "description", nsmap=NSMAP)
+            description.text = escape(str(book.comments))
         etree.SubElement(metadata, "meta", name="calibre:author_link_map",
                          content="{" + escape(",".join(['"' + str(a) + '":""' for a in book.authors])) + "}",
                          nsmap=NSMAP)
@@ -144,27 +167,36 @@ class TaskBackupMetadata(CalibreTask):
                          content=str(book.series_index),
                          nsmap=NSMAP)
         etree.SubElement(metadata, "meta", name="calibre:timestamp",
-                         content=datetime.datetime.strftime(book.timestamp, "%Y-%m-%dT%H:%M:%S+00:00"),
+                         content='{d.year:04}-{d.month:02}-{d.day:02}T{d.hour:02}:{d.minute:02}:{d.second:02}'.format(
+                             d=book.timestamp),
                          nsmap=NSMAP)
         etree.SubElement(metadata, "meta", name="calibre:title_sort",
                          content=book.sort,
                          nsmap=NSMAP)
         for cc in custom_columns:
+            value = None
+            extra = None
+            cc_entry = getattr(book, "custom_column_" + str(cc.id))
+            if cc_entry.__len__():
+                value = cc_entry[0].get("value")
+                extra = cc_entry[0].get("extra")
             etree.SubElement(metadata, "meta", name="calibre:user_metadata:#{}".format(cc.label),
-                             content=escape(cc.get_display_dict()),
+                             content=escape(cc.to_json(value, extra)),
                              nsmap=NSMAP)
 
-            pass
-
         # generate guide element and all sub elements of it
+        # Title is translated from default export language
         guide = etree.SubElement(package, "guide")
-        etree.SubElement(guide, "reference", type="cover", title="Titelbild", href="cover.jpg")
+        etree.SubElement(guide, "reference", type="cover", title=self.translated_title, href="cover.jpg")
 
         # prepare finalize everything and output
         doc = etree.ElementTree(package)
-        with open(book_metadata_filepath, 'wb') as f:
-            doc.write(f, xml_declaration=True, encoding='utf-8', pretty_print=True)
-
+        try:
+            with open(book_metadata_filepath, 'wb') as f:
+                doc.write(f, xml_declaration=True, encoding='utf-8', pretty_print=True)
+        except Exception:
+            # ToDo: Folder not writeable errror
+            pass
     @property
     def name(self):
         return "Backing up Metadata"

From 26be5ee2372b08c2f906661283a12e84d6c181f8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 19 Sep 2022 18:56:22 +0200
Subject: [PATCH 327/412] Backup metadata 3rd step

---
 cps/admin.py                 |  2 +-
 cps/db.py                    |  6 ++--
 cps/helper.py                |  9 +++++
 cps/tasks/metadata_backup.py | 66 ++++++++++++++++++++++++------------
 4 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index b70beab5a..c36005354 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1310,7 +1310,7 @@ def edit_scheduledtasks():
         time_field.append((n, format_time(datetime_time(hour=n), format="short",)))
     for n in range(5, 65, 5):
         t = timedelta(hours=n // 60, minutes=n % 60)
-        duration_field.append((n, format_timedelta(t, threshold=.9)))
+        duration_field.append((n, format_timedelta(t, threshold=.95)))
 
     return render_title_template("schedule_edit.html",
                                  config=content,
diff --git a/cps/db.py b/cps/db.py
index 20975b77d..ed23fe5fb 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -675,12 +675,14 @@ class CalibreDB:
 
     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()
+
     def set_metadata_dirty(self, book_id):
-        if not self.session.query(Metadata_Dirtied).filter(Metadata_Dirtied.book==book_id).one_or_none():
+        if not self.session.query(Metadata_Dirtied).filter(Metadata_Dirtied.book == book_id).one_or_none():
             self.session.add(Metadata_Dirtied(book_id))
+
     def delete_dirty_metadata(self, book_id):
         try:
-            self.session.query(Metadata_Dirtied).filter(Metadata_Dirtied.book==book_id).delete()
+            self.session.query(Metadata_Dirtied).filter(Metadata_Dirtied.book == book_id).delete()
             self.session.commit()
         except (OperationalError) as e:
             self.session.rollback()
diff --git a/cps/helper.py b/cps/helper.py
index be15d4043..c412df8e9 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -31,6 +31,7 @@ import unidecode
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
+from flask_babel import get_locale
 from flask_login import current_user
 from sqlalchemy.sql.expression import true, false, and_, or_, text, func
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -57,6 +58,7 @@ from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread
 from .tasks.mail import TaskEmail
 from .tasks.thumbnail import TaskClearCoverThumbnailCache, TaskGenerateCoverThumbnails
+from .tasks.metadata_backup import TaskBackupMetadata
 
 log = logger.create()
 
@@ -1031,3 +1033,10 @@ def add_book_to_thumbnail_cache(book_id):
 def update_thumbnail_cache():
     if config.schedule_generate_book_covers:
         WorkerThread.add(None, TaskGenerateCoverThumbnails())
+
+
+def set_all_metadata_dirty():
+    WorkerThread.add(None, TaskBackupMetadata(export_language=get_locale(),
+                                              translated_title=_("cover"),
+                                              set_dirty=True),
+                     hidden=False)
diff --git a/cps/tasks/metadata_backup.py b/cps/tasks/metadata_backup.py
index a50dfcfa7..7f2ad159a 100644
--- a/cps/tasks/metadata_backup.py
+++ b/cps/tasks/metadata_backup.py
@@ -41,21 +41,43 @@ NSMAP = {'dc': PURL_NAMESPACE, 'opf': OPF_NAMESPACE}
 
 class TaskBackupMetadata(CalibreTask):
 
-    def __init__(self, export_language="en", translated_title="cover", task_message=N_('Backing up Metadata')):
+    def __init__(self, export_language="en",
+                 translated_title="cover",
+                 set_dirty=False,
+                 task_message=N_('Backing up Metadata')):
         super(TaskBackupMetadata, self).__init__(task_message)
         self.log = logger.create()
         self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
         self.export_language = export_language
         self.translated_title = translated_title
+        self.set_dirty=set_dirty
 
     def run(self, worker_thread):
+        if self.set_dirty:
+            self.set_all_books_dirty()
+        else:
+            self.backup_metadata()
+
+    def set_all_books_dirty(self):
+        try:
+            books = self.calibre_db.session.query(db.Books).all()
+            for book in books:
+                self.calibre_db.set_metadata_dirty(book)
+                self._handleSuccess()
+        except Exception as ex:
+            self.log.debug('Error adding book for backup: ' + str(ex))
+            self._handleError('Error adding book for backup: ' + str(ex))
+            self.calibre_db.session.rollback()
+        self.calibre_db.session.close()
+
+    def backup_metadata(self):
         try:
             metadata_backup = self.calibre_db.session.query(db.Metadata_Dirtied).all()
             custom_columns = self.calibre_db.session.query(db.CustomColumns).order_by(db.CustomColumns.label).all()
             for backup in metadata_backup:
                 book = self.calibre_db.session.query(db.Books).filter(db.Books.id == backup.book).one_or_none()
-                # self.calibre_db.session.query(db.Metadata_Dirtied).filter(db.Metadata_Dirtied == backup.id).delete()
-                # self.calibre_db.session.commit()
+                self.calibre_db.session.query(db.Metadata_Dirtied).filter(db.Metadata_Dirtied == backup.id).delete()
+                self.calibre_db.session.commit()
                 if book:
                     self.open_metadata(book, custom_columns)
                     self._handleSuccess()
@@ -85,7 +107,7 @@ class TaskBackupMetadata(CalibreTask):
                 stream = urlopen(web_content_link)
             except Exception as ex:
                 # Bubble exception to calling function
-                self.log.debug('Error reading metadata.opf: ' + str(ex))       # ToDo Chek whats going on
+                self.log.debug('Error reading metadata.opf: ' + str(ex))       # ToDo Check whats going on
                 raise ex
             finally:
                 if stream is not None:
@@ -96,24 +118,24 @@ class TaskBackupMetadata(CalibreTask):
             #if not os.path.isfile(book_metadata_filepath):
             self.create_new_metadata_backup(book,  custom_columns, book_metadata_filepath)
             # else:
-                '''namespaces = {'dc': PURL_NAMESPACE, 'opf': OPF_NAMESPACE}
-                test = etree.parse(book_metadata_filepath)
-                root = test.getroot()
-                for i in root.iter():
-                    self.log.info(i)
-                title = root.find("dc:metadata", namespaces)
-                pass'''
-                with open(book_metadata_filepath, "rb") as f:
-                    xml = f.read()
+            '''namespaces = {'dc': PURL_NAMESPACE, 'opf': OPF_NAMESPACE}
+            test = etree.parse(book_metadata_filepath)
+            root = test.getroot()
+            for i in root.iter():
+                self.log.info(i)
+            title = root.find("dc:metadata", namespaces)
+            pass
+            with open(book_metadata_filepath, "rb") as f:
+                xml = f.read()
 
-                root = objectify.fromstring(xml)
-                # root.metadata['{http://purl.org/dc/elements/1.1/}title']
-                # root.metadata[PURL + 'title']
-                # getattr(root.metadata, PURL +'title')
-                # test = objectify.parse()
-                pass
-                # backup not found has to be created
-                #raise Exception('Book cover file not found')
+            root = objectify.fromstring(xml)
+            # root.metadata['{http://purl.org/dc/elements/1.1/}title']
+            # root.metadata[PURL + 'title']
+            # getattr(root.metadata, PURL +'title')
+            # test = objectify.parse()
+            pass
+            # backup not found has to be created
+            #raise Exception('Book cover file not found')'''
 
     def create_new_metadata_backup(self, book,  custom_columns, book_metadata_filepath):
         # generate root package element
@@ -195,7 +217,7 @@ class TaskBackupMetadata(CalibreTask):
             with open(book_metadata_filepath, 'wb') as f:
                 doc.write(f, xml_declaration=True, encoding='utf-8', pretty_print=True)
         except Exception:
-            # ToDo: Folder not writeable errror
+            # ToDo: Folder not writeable error
             pass
     @property
     def name(self):

From b4851e1d7023150d057090e62759d7f313554798 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 19 Sep 2022 18:57:55 +0200
Subject: [PATCH 328/412] Fix for #2545 (Max task duration double entry
 "1hour")

---
 cps/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/admin.py b/cps/admin.py
index b70beab5a..89f72189f 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1310,7 +1310,7 @@ def edit_scheduledtasks():
         time_field.append((n, format_time(datetime_time(hour=n), format="short",)))
     for n in range(5, 65, 5):
         t = timedelta(hours=n // 60, minutes=n % 60)
-        duration_field.append((n, format_timedelta(t, threshold=.9)))
+        duration_field.append((n, format_timedelta(t, threshold=.97)))
 
     return render_title_template("schedule_edit.html",
                                  config=content,

From c10708ed079c9ca651246f4f7fd2a4b1ac63c2db Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 19 Sep 2022 22:39:40 +0200
Subject: [PATCH 329/412] Backup metadata 4th step

---
 cps/admin.py                 | 26 ++++++++++-----
 cps/db.py                    |  4 +--
 cps/helper.py                |  5 +--
 cps/schedule.py              |  2 +-
 cps/static/js/main.js        | 17 ++++++++++
 cps/tasks/metadata_backup.py | 65 +++++++++++++++++++++++-------------
 cps/templates/admin.html     |  3 ++
 7 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index c36005354..d813d4f0f 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -136,28 +136,38 @@ def admin_forbidden():
 @admin_required
 def shutdown():
     task = request.get_json().get('parameter', -1)
-    showtext = {}
+    show_text = {}
     if task in (0, 1):  # valid commandos received
         # close all database connections
         calibre_db.dispose()
         ub.dispose()
 
         if task == 0:
-            showtext['text'] = _(u'Server restarted, please reload page')
+            show_text['text'] = _(u'Server restarted, please reload page')
         else:
-            showtext['text'] = _(u'Performing shutdown of server, please close window')
+            show_text['text'] = _(u'Performing shutdown of server, please close window')
         # stop gevent/tornado server
         web_server.stop(task == 0)
-        return json.dumps(showtext)
+        return json.dumps(show_text)
 
     if task == 2:
         log.warning("reconnecting to calibre database")
         calibre_db.reconnect_db(config, ub.app_DB_path)
-        showtext['text'] = _(u'Reconnect successful')
-        return json.dumps(showtext)
+        show_text['text'] = _(u'Reconnect successful')
+        return json.dumps(show_text)
 
-    showtext['text'] = _(u'Unknown command')
-    return json.dumps(showtext), 400
+    show_text['text'] = _(u'Unknown command')
+    return json.dumps(show_text), 400
+
+@admi.route("/metadata_backup", methods=["POST"])
+@login_required
+@admin_required
+def queue_metadata_backup():
+    show_text = {}
+    log.warning("Queuing all books for metadata backup")
+    helper.set_all_metadata_dirty()
+    show_text['text'] = _(u'Books successfully queued fo Metadata Backup')
+    return json.dumps(show_text)
 
 
 # method is available without login and not protected by CSRF to make it easy reachable, is per default switched off
diff --git a/cps/db.py b/cps/db.py
index ed23fe5fb..fbb458e61 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -399,7 +399,7 @@ class CustomColumns(Base):
         display_dict = json.loads(self.display)
         return display_dict
 
-    def to_json(self, value, extra):
+    def to_json(self, value, extra, sequence):
         content = dict()
         content['table'] = "custom_column_" + str(self.id)
         content['column'] = "value"
@@ -417,7 +417,7 @@ class CustomColumns(Base):
         content['category_sort'] = "value"
         content['is_csp'] = False
         content['is_editable'] = self.editable
-        content['rec_index'] = self.id + 22     # toDo why ??
+        content['rec_index'] = sequence + 22     # toDo why ??
         content['#value#'] = value
         content['#extra#'] = extra
         content['is_multiple2'] = {}
diff --git a/cps/helper.py b/cps/helper.py
index c412df8e9..212ce1420 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -1037,6 +1037,7 @@ def update_thumbnail_cache():
 
 def set_all_metadata_dirty():
     WorkerThread.add(None, TaskBackupMetadata(export_language=get_locale(),
-                                              translated_title=_("cover"),
-                                              set_dirty=True),
+                                              translated_title=_("Cover"),
+                                              set_dirty=True,
+                                              task_message=N_("Queue all books for metadata backup")),
                      hidden=False)
diff --git a/cps/schedule.py b/cps/schedule.py
index ab4475705..44bb2c27c 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -34,7 +34,7 @@ def get_scheduled_tasks(reconnect=True):
 
     # ToDo make configurable. Generate metadata.opf file for each changed book
     if True:
-        tasks.append([lambda: TaskBackupMetadata(), "en", 'backup metadata', False])
+        tasks.append([lambda: TaskBackupMetadata("en"), 'backup metadata', False])
 
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index cfb0b2f01..73b90a0d8 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -503,6 +503,23 @@ $(function() {
             }
         });
     });
+    $("#metadata_backup").click(function() {
+        $("#DialogHeader").addClass("hidden");
+        $("#DialogFinished").addClass("hidden");
+        $("#DialogContent").html("");
+        $("#spinner2").show();
+        $.ajax({
+            method: "post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/metadata_backup",
+            success: function success(data) {
+                $("#spinner2").hide();
+                $("#DialogContent").html(data.text);
+                $("#DialogFinished").removeClass("hidden");
+            }
+        });
+    });
     $("#perform_update").click(function() {
         $("#DialogHeader").removeClass("hidden");
         $("#spinner2").show();
diff --git a/cps/tasks/metadata_backup.py b/cps/tasks/metadata_backup.py
index 7f2ad159a..3fcb58578 100644
--- a/cps/tasks/metadata_backup.py
+++ b/cps/tasks/metadata_backup.py
@@ -42,7 +42,7 @@ NSMAP = {'dc': PURL_NAMESPACE, 'opf': OPF_NAMESPACE}
 class TaskBackupMetadata(CalibreTask):
 
     def __init__(self, export_language="en",
-                 translated_title="cover",
+                 translated_title="Cover",
                  set_dirty=False,
                  task_message=N_('Backing up Metadata')):
         super(TaskBackupMetadata, self).__init__(task_message)
@@ -50,7 +50,7 @@ class TaskBackupMetadata(CalibreTask):
         self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
         self.export_language = export_language
         self.translated_title = translated_title
-        self.set_dirty=set_dirty
+        self.set_dirty = set_dirty
 
     def run(self, worker_thread):
         if self.set_dirty:
@@ -62,8 +62,9 @@ class TaskBackupMetadata(CalibreTask):
         try:
             books = self.calibre_db.session.query(db.Books).all()
             for book in books:
-                self.calibre_db.set_metadata_dirty(book)
-                self._handleSuccess()
+                self.calibre_db.set_metadata_dirty(book.id)
+            self.calibre_db.session.commit()
+            self._handleSuccess()
         except Exception as ex:
             self.log.debug('Error adding book for backup: ' + str(ex))
             self._handleError('Error adding book for backup: ' + str(ex))
@@ -74,21 +75,25 @@ class TaskBackupMetadata(CalibreTask):
         try:
             metadata_backup = self.calibre_db.session.query(db.Metadata_Dirtied).all()
             custom_columns = self.calibre_db.session.query(db.CustomColumns).order_by(db.CustomColumns.label).all()
+            count = len(metadata_backup)
+            i = 0
             for backup in metadata_backup:
                 book = self.calibre_db.session.query(db.Books).filter(db.Books.id == backup.book).one_or_none()
-                self.calibre_db.session.query(db.Metadata_Dirtied).filter(db.Metadata_Dirtied == backup.id).delete()
+                self.calibre_db.session.query(db.Metadata_Dirtied).filter(
+                    db.Metadata_Dirtied.book == backup.book).delete()
                 self.calibre_db.session.commit()
                 if book:
                     self.open_metadata(book, custom_columns)
-                    self._handleSuccess()
-                    self.calibre_db.session.close()
                 else:
                     self.log.error("Book {} not found in database".format(backup.book))
-                    self._handleError("Book {} not found in database".format(backup.book))
-                    self.calibre_db.session.close()
+                    # self._handleError("Book {} not found in database".format(backup.book))
+                i += 1
+                self.progress = (1.0 / count) * i
+            self._handleSuccess()
+            self.calibre_db.session.close()
 
         except Exception as ex:
-            self.log.debug('Error creating metadata backup: ' + str(ex))
+            self.log.debug('Error creating metadata backup for book {}: '.format(book.id) + str(ex))
             self._handleError('Error creating metadata backup: ' + str(ex))
             self.calibre_db.session.rollback()
             self.calibre_db.session.close()
@@ -155,36 +160,37 @@ class TaskBackupMetadata(CalibreTask):
         title.text = book.title
         for author in book.authors:
             creator = etree.SubElement(metadata, PURL + "creator", nsmap=NSMAP)
-            creator.text = str(author)
+            creator.text = str(author.name)
             creator.set(OPF + "file-as", book.author_sort)     # ToDo Check
             creator.set(OPF + "role", "aut")
         contributor = etree.SubElement(metadata, PURL + "contributor", nsmap=NSMAP)
         contributor.text = "calibre (5.7.2) [https://calibre-ebook.com]"
         contributor.set(OPF + "file-as", "calibre")     # ToDo Check
-        contributor.set(OPF + "role", "bpk")
+        contributor.set(OPF + "role", "bkp")
 
         date = etree.SubElement(metadata, PURL + "date", nsmap=NSMAP)
         date.text = '{d.year:04}-{d.month:02}-{d.day:02}T{d.hour:02}:{d.minute:02}:{d.second:02}'.format(d=book.pubdate)
-
+        if book.comments:
+            for b in book.comments:
+                description = etree.SubElement(metadata, PURL + "description", nsmap=NSMAP)
+                description.text = b.text
         if not book.languages:
             language = etree.SubElement(metadata, PURL + "language", nsmap=NSMAP)
             language.text = self.export_language
         else:
             for b in book.languages:
                 language = etree.SubElement(metadata, PURL + "language", nsmap=NSMAP)
-                language.text = str(b.languages)
+                language.text = str(b.lang_code)
         for b in book.tags:
             subject = etree.SubElement(metadata, PURL + "subject", nsmap=NSMAP)
-            subject.text = str(b.tags)
-        if book.comments:
-            description = etree.SubElement(metadata, PURL + "description", nsmap=NSMAP)
-            description.text = escape(str(book.comments))
+            subject.text = str(b.name)
         etree.SubElement(metadata, "meta", name="calibre:author_link_map",
-                         content="{" + escape(",".join(['"' + str(a) + '":""' for a in book.authors])) + "}",
-                         nsmap=NSMAP)
-        etree.SubElement(metadata, "meta", name="calibre:series",
-                         content=str(book.series),
+                         content="{" + ", ".join(['"' + str(a.name) + '": ""' for a in book.authors]) + "}",
                          nsmap=NSMAP)
+        for b in book.series:
+            etree.SubElement(metadata, "meta", name="calibre:series",
+                             content=str(str(b.name)),
+                             nsmap=NSMAP)
         etree.SubElement(metadata, "meta", name="calibre:series_index",
                          content=str(book.series_index),
                          nsmap=NSMAP)
@@ -195,6 +201,7 @@ class TaskBackupMetadata(CalibreTask):
         etree.SubElement(metadata, "meta", name="calibre:title_sort",
                          content=book.sort,
                          nsmap=NSMAP)
+        sequence = 0
         for cc in custom_columns:
             value = None
             extra = None
@@ -203,8 +210,9 @@ class TaskBackupMetadata(CalibreTask):
                 value = cc_entry[0].get("value")
                 extra = cc_entry[0].get("extra")
             etree.SubElement(metadata, "meta", name="calibre:user_metadata:#{}".format(cc.label),
-                             content=escape(cc.to_json(value, extra)),
+                             content=cc.to_json(value, extra, sequence),
                              nsmap=NSMAP)
+            sequence += 1
 
         # generate guide element and all sub elements of it
         # Title is translated from default export language
@@ -213,15 +221,24 @@ class TaskBackupMetadata(CalibreTask):
 
         # prepare finalize everything and output
         doc = etree.ElementTree(package)
+        # doc = etree.tostring(package, xml_declaration=True, encoding='utf-8', pretty_print=True) # .replace(b"&amp;quot;", b"&quot;")
         try:
             with open(book_metadata_filepath, 'wb') as f:
+                # f.write(doc)
                 doc.write(f, xml_declaration=True, encoding='utf-8', pretty_print=True)
         except Exception:
             # ToDo: Folder not writeable error
             pass
     @property
     def name(self):
-        return "Backing up Metadata"
+        return "Metadata backup"
+
+    # needed for logging
+    def __str__(self):
+        if self.set_dirty:
+            return "Queue all books for metadata backup"
+        else:
+            return "Perform metadata backup"
 
     @property
     def is_cancellable(self):
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 553dcbb68..4d6eff953 100755
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -207,6 +207,9 @@
     <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 class="row form-group">
+    <div class="btn btn-default" id="metadata_backup" data-toggle="modal" data-target="#StatusDialog">{{_('Queue all books for metadata backup')}}</div>
+  </div>
 
   <div class="row">
     <div class="col">

From 1ffa1909387805fa229c8424fbd2f4f8c3b6ccdb Mon Sep 17 00:00:00 2001
From: halink0803 <halink0803@gmail.com>
Date: Tue, 20 Sep 2022 21:38:47 +0700
Subject: [PATCH 330/412] add vietnamese translation

---
 cps/translations/vi/LC_MESSAGES/messages.mo |  Bin 0 -> 35324 bytes
 cps/translations/vi/LC_MESSAGES/messages.po | 3171 +++++++++++++++++++
 2 files changed, 3171 insertions(+)
 create mode 100644 cps/translations/vi/LC_MESSAGES/messages.mo
 create mode 100644 cps/translations/vi/LC_MESSAGES/messages.po

diff --git a/cps/translations/vi/LC_MESSAGES/messages.mo b/cps/translations/vi/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..201e756342174100f2212ebbcdc52926ff3dc98a
GIT binary patch
literal 35324
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

literal 0
HcmV?d00001

diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po
new file mode 100644
index 000000000..e247c5096
--- /dev/null
+++ b/cps/translations/vi/LC_MESSAGES/messages.po
@@ -0,0 +1,3171 @@
+# This file is distributed under the same license as the Calibre-web project
+# Ha Link<halink0803@gmail.com>
+msgid ""
+msgstr ""
+"Project-Id-Version: Calibre-web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
+"POT-Creation-Date: 2022-01-15 09:19+0100\n"
+"PO-Revision-Date: 2022-09-20 21:36+0700\n"
+"Last-Translator: Ha Link <halink0803@gmail.com>\n"
+"Language-Team: \n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Generated-By: Babel 2.9.0\n"
+"X-Generator: Poedit 3.1.1\n"
+
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
+msgid "not installed"
+msgstr "chưa cài đặt"
+
+#: cps/about.py:47 cps/about.py:63
+msgid "installed"
+msgstr "đã cài đặt"
+
+#: cps/about.py:145
+msgid "Statistics"
+msgstr "Thống kê"
+
+#: cps/admin.py:144
+msgid "Server restarted, please reload page"
+msgstr "Máy chủ đã khởi động lại,hãy tải lại trang"
+
+#: cps/admin.py:146
+msgid "Performing shutdown of server, please close window"
+msgstr "Máy chủ đang được tắt, hãy đóng cửa sổ này"
+
+#: cps/admin.py:154
+msgid "Reconnect successful"
+msgstr "Kết nối lại thành công"
+
+#: cps/admin.py:157
+msgid "Unknown command"
+msgstr "Lệnh không tồn tại"
+
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
+#: cps/uploader.py:103
+msgid "Unknown"
+msgstr "Không rõ"
+
+#: cps/admin.py:188
+msgid "Admin page"
+msgstr "Trang admin"
+
+#: cps/admin.py:207
+msgid "Basic Configuration"
+msgstr "Thiết lập cơ bản"
+
+#: cps/admin.py:244
+msgid "UI Configuration"
+msgstr "Thiết lập UI"
+
+#: cps/admin.py:277 cps/templates/admin.html:50
+msgid "Edit Users"
+msgstr "Chỉnh sửa người dùng"
+
+#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
+msgid "All"
+msgstr "Tất cả"
+
+#: cps/admin.py:343 cps/admin.py:1615
+msgid "User not found"
+msgstr "Không tìm thấy user"
+
+#: cps/admin.py:357
+msgid "{} users deleted successfully"
+msgstr "{} người dung đã đươc xoá thành công"
+
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
+#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
+msgid "Show All"
+msgstr "Hiển thị tất cả"
+
+#: cps/admin.py:400 cps/admin.py:406
+msgid "Malformed request"
+msgstr "Yêu cầu không đúng định dạng"
+
+#: cps/admin.py:418 cps/admin.py:1493
+msgid "Guest Name can't be changed"
+msgstr "Tên người dung khách không thể thay đổi"
+
+#: cps/admin.py:430
+msgid "Guest can't have this role"
+msgstr "Khách không thể mang vai trò này"
+
+#: cps/admin.py:442 cps/admin.py:1451
+msgid "No admin user remaining, can't remove admin role"
+msgstr "Không còn người dùng quản trị, không thể xoá vai trò admin"
+
+#: cps/admin.py:446 cps/admin.py:460
+msgid "Value has to be true or false"
+msgstr "Giá trị phải là true hoặc false"
+
+#: cps/admin.py:448
+msgid "Invalid role"
+msgstr "Vai trò không hợp lệ"
+
+#: cps/admin.py:452
+msgid "Guest can't have this view"
+msgstr "Tài khoản khách không có màn hình này"
+
+#: cps/admin.py:462
+msgid "Invalid view"
+msgstr "View không hợp lệ"
+
+#: cps/admin.py:465
+msgid "Guest's Locale is determined automatically and can't be set"
+msgstr "Ngôn ngữ của khách được xác định tự động và không thể đặt được"
+
+#: cps/admin.py:469
+msgid "No Valid Locale Given"
+msgstr "Địa chỉ cung cấp không hợp lệ"
+
+#: cps/admin.py:480
+msgid "No Valid Book Language Given"
+msgstr "Ngôn ngữ sách không hợp lệ"
+
+#: cps/admin.py:482
+msgid "Parameter not found"
+msgstr "Tham số không tồn tại"
+
+#: cps/admin.py:533
+msgid "Invalid Read Column"
+msgstr "Cột đọc không hợp lệ"
+
+#: cps/admin.py:539
+msgid "Invalid Restricted Column"
+msgstr "Cột bị hạn chế không hợp lệ"
+
+#: cps/admin.py:560 cps/admin.py:1323
+msgid "Calibre-Web configuration updated"
+msgstr "Thiết lập Calibre-Web đã cập nhật"
+
+#: cps/admin.py:572
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Bạn có thực sự muốn xóa Kobo Token không?"
+
+#: cps/admin.py:574
+msgid "Do you really want to delete this domain?"
+msgstr "Bạn có thực sự muốn xóa miền này không?"
+
+#: cps/admin.py:576
+msgid "Do you really want to delete this user?"
+msgstr "Bạn có thực sự muốn xóa người dùng này không?"
+
+#: cps/admin.py:578
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Bạn có chắc chắn muốn xóa giá này không?"
+
+#: cps/admin.py:580
+msgid "Are you sure you want to change locales of selected user(s)?"
+msgstr "Bạn có chắc chắn muốn thay đổi ngôn ngữ của những người dùng đã chọn?"
+
+#: cps/admin.py:582
+msgid "Are you sure you want to change visible book languages for selected user(s)?"
+msgstr "Bạn có chắc chắn muốn thay đổi ngôn ngữ sách hiển thị cho (những) người dùng đã chọn không?"
+
+#: cps/admin.py:584
+msgid "Are you sure you want to change the selected role for the selected user(s)?"
+msgstr "Bạn có chắc chắn muốn thay đổi vai trò đã chọn cho (những) người dùng đã chọn không?"
+
+#: cps/admin.py:586
+msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
+msgstr "Bạn có chắc chắn muốn thay đổi những giới hạn đã chọn cho người dung?"
+
+#: cps/admin.py:588
+msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
+msgstr "Bạn có chắc chắn muốn thay đổi các giới hạn hiển thị đã chọn cho (những) người dùng đã chọn không?"
+
+#: cps/admin.py:590
+msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgstr "Bạn có chắc chắn muốn thay đổi hành vi đồng bộ hóa giá cho (những) người dùng đã chọn không?"
+
+#: cps/admin.py:592
+msgid "Are you sure you want to change Calibre library location?"
+msgstr "Bạn có chắc chắn muốn thay đổi vị trí thư viện Calibre không?"
+
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr "Bạn có chắc chắn muốn xóa cơ sở dữ liệu đồng bộ của Calibre-Web để bắt buộc đồng bộ hóa hoàn toàn với Kobo Reader của mình không?"
+
+#: cps/admin.py:743
+msgid "Tag not found"
+msgstr "Tag không tồn tại"
+
+#: cps/admin.py:755
+msgid "Invalid Action"
+msgstr "Hành động không hợp lệ"
+
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
+#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
+#: cps/templates/user_table.html:58
+msgid "Deny"
+msgstr "Từ chối"
+
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
+#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
+#: cps/templates/user_table.html:61
+msgid "Allow"
+msgstr "Cho phép"
+
+#: cps/admin.py:913
+msgid "{} sync entries deleted"
+msgstr "{} mục nhập đồng bộ hóa đã bị xóa"
+
+#: cps/admin.py:1036
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr ""
+
+#: cps/admin.py:1081
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "Vị trí tệp nhật ký không hợp lệ, vui lòng nhập đường dẫn chính xác"
+
+#: cps/admin.py:1087
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1117
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr ""
+
+#: cps/admin.py:1123
+msgid "Please Enter a LDAP Service Account and Password"
+msgstr ""
+
+#: cps/admin.py:1126
+msgid "Please Enter a LDAP Service Account"
+msgstr ""
+
+#: cps/admin.py:1131
+#, python-format
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr ""
+
+#: cps/admin.py:1133
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:1137
+#, python-format
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
+
+#: cps/admin.py:1139
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:1146
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
+
+#: cps/admin.py:1148
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:1155
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1521
+#: cps/admin.py:1590 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:279 cps/shelf.py:341 cps/shelf.py:376 cps/shelf.py:451
+msgid "Settings DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1208
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1223
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1235
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1239
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1346
+msgid "Database Settings updated"
+msgstr "Thiết lập cơ sở dữ lieu đã được cập nhật"
+
+#: cps/admin.py:1354
+msgid "Database Configuration"
+msgstr "Thiết lập cơ sở dữ lieu :)))"
+
+#: cps/admin.py:1370 cps/web.py:1479
+msgid "Please fill out all fields!"
+msgstr "Hãy điền hết các trường!"
+
+#: cps/admin.py:1378
+msgid "E-mail is not from valid domain"
+msgstr "Địa chỉ email không hợp lệ"
+
+#: cps/admin.py:1384 cps/admin.py:1543
+msgid "Add new user"
+msgstr "Thêm người dùng mới"
+
+#: cps/admin.py:1395
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Người dùng '%(user)s' đã được tạo"
+
+#: cps/admin.py:1401
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Người dùng với địa chỉ email hoặc tên đã tồn tại."
+
+#: cps/admin.py:1430
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Người dùng '%(nick)s' đã bị xoá"
+
+#: cps/admin.py:1432 cps/admin.py:1433
+msgid "Can't delete Guest User"
+msgstr "Không thể xoá người dùng khách"
+
+#: cps/admin.py:1436
+msgid "No admin user remaining, can't delete user"
+msgstr ""
+
+#: cps/admin.py:1509 cps/admin.py:1634
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Chỉnh sửa người dùng %(nick)s"
+
+#: cps/admin.py:1513
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Người dùng '%(nick)s' đã được cập nhật"
+
+#: cps/admin.py:1517 cps/admin.py:1649 cps/web.py:1504 cps/web.py:1564
+msgid "An unknown error occurred. Please try again later."
+msgstr "Lỗi không xác định xảy ra. Xin hãy thử lại sau."
+
+#: cps/admin.py:1552 cps/templates/admin.html:98
+msgid "Edit E-mail Server Settings"
+msgstr ""
+
+#: cps/admin.py:1571
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1597
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr ""
+
+#: cps/admin.py:1600
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
+
+#: cps/admin.py:1602
+msgid "Please configure your e-mail address first..."
+msgstr ""
+
+#: cps/admin.py:1604
+msgid "E-mail server settings updated"
+msgstr ""
+
+#: cps/admin.py:1646
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr ""
+
+#: cps/admin.py:1652 cps/web.py:1444
+msgid "Please configure the SMTP mail settings first..."
+msgstr ""
+
+#: cps/admin.py:1663
+msgid "Logfile viewer"
+msgstr ""
+
+#: cps/admin.py:1729
+msgid "Requesting update package"
+msgstr ""
+
+#: cps/admin.py:1730
+msgid "Downloading update package"
+msgstr ""
+
+#: cps/admin.py:1731
+msgid "Unzipping update package"
+msgstr "Đang giải nén tệp cập nhật"
+
+#: cps/admin.py:1732
+msgid "Replacing files"
+msgstr "They thế tập tin"
+
+#: cps/admin.py:1733
+msgid "Database connections are closed"
+msgstr "Liên kết cơ sở dữ liệu đã được đóng"
+
+#: cps/admin.py:1734
+msgid "Stopping server"
+msgstr "Đang dừng server"
+
+#: cps/admin.py:1735
+msgid "Update finished, please press okay and reload page"
+msgstr "Cập nhật hoàn tất, ấn okay và tải lại trang"
+
+#: cps/admin.py:1736 cps/admin.py:1737 cps/admin.py:1738 cps/admin.py:1739
+#: cps/admin.py:1740 cps/admin.py:1741
+msgid "Update failed:"
+msgstr "Cập nhật thất bại:"
+
+#: cps/admin.py:1736 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+msgid "HTTP Error"
+msgstr "Lỗi HTTP"
+
+#: cps/admin.py:1737 cps/updater.py:387 cps/updater.py:599
+msgid "Connection error"
+msgstr "Lỗi kết nối"
+
+#: cps/admin.py:1738 cps/updater.py:389 cps/updater.py:601
+msgid "Timeout while establishing connection"
+msgstr ""
+
+#: cps/admin.py:1739 cps/updater.py:391 cps/updater.py:603
+msgid "General error"
+msgstr "Lỗi chung"
+
+#: cps/admin.py:1740
+msgid "Update file could not be saved in temp dir"
+msgstr "File cập nhật không thể được lưu trong thư mục tạm thời"
+
+#: cps/admin.py:1741
+msgid "Files could not be replaced during update"
+msgstr ""
+
+#: cps/admin.py:1765
+msgid "Failed to extract at least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1810
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1823
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1827
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1860
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1862
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:30
+msgid "not configured"
+msgstr ""
+
+#: cps/converter.py:32
+msgid "Execution permissions missing"
+msgstr ""
+
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr ""
+
+#: cps/editbooks.py:300 cps/editbooks.py:302
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:309 cps/editbooks.py:311
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr ""
+
+#: cps/editbooks.py:410
+msgid "edit metadata"
+msgstr ""
+
+#: cps/editbooks.py:458
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:494 cps/editbooks.py:958
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "%(langname)s không phải là ngôn ngữ hợp lệ"
+
+#: cps/editbooks.py:634 cps/editbooks.py:985
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr ""
+
+#: cps/editbooks.py:638 cps/editbooks.py:989
+msgid "File to be uploaded must have an extension"
+msgstr ""
+
+#: cps/editbooks.py:650
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:655
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Lưu file thất bại %(file)s."
+
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "Lỗi cơ sở dữ liệu: %(error)s."
+
+#: cps/editbooks.py:678
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr ""
+
+#: cps/editbooks.py:814
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:848
+msgid "Metadata successfully updated"
+msgstr "Metadata đã được cập nhật thành công"
+
+#: cps/editbooks.py:861
+msgid "Error editing book, please check logfile for details"
+msgstr ""
+
+#: cps/editbooks.py:899
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr ""
+
+#: cps/editbooks.py:997
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr ""
+
+#: cps/editbooks.py:1016
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr ""
+
+#: cps/editbooks.py:1063
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "File %(file)s đã được tải lên"
+
+#: cps/editbooks.py:1088
+msgid "Source or destination format for conversion missing"
+msgstr "Thiếu định dạng nguồn hoặc đích để convert"
+
+#: cps/editbooks.py:1096
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr ""
+
+#: cps/editbooks.py:1100
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "Có lỗi xảy ra khi chuyển đổi định dạng cho sach: %(res)s"
+
+#: cps/gdrive.py:58
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:95
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr ""
+
+#: cps/helper.py:77
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr ""
+
+#: cps/helper.py:83 cps/tasks/convert.py:73
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr ""
+
+#: cps/helper.py:88
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s không tìm thấy: %(fn)s"
+
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Gửi tới Kindle"
+
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "E-mail này được gửi từ Calibre-Web."
+
+#: cps/helper.py:109
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web test e-mail"
+
+#: cps/helper.py:110
+msgid "Test e-mail"
+msgstr "Test e-mail"
+
+#: cps/helper.py:127
+msgid "Get Started with Calibre-Web"
+msgstr "Bắt đầu với Calibre-Web"
+
+#: cps/helper.py:132
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Email đăng ký cho người dùng: %(name)s"
+
+#: cps/helper.py:143 cps/helper.py:149
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "Chuyển đổi %(orig)s thành %(format)s và chuyển tới Kindle"
+
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "Gửi %(format)s tới Kindle"
+
+#: cps/helper.py:216 cps/tasks/convert.py:90
+#, python-format
+msgid "%(book)s send to Kindle"
+msgstr "%(book)s gửi tới Kindle"
+
+#: cps/helper.py:221
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "File được yêu cầu không thể đọc. Có thể do phân quyền bị sai?"
+
+#: cps/helper.py:313
+#, python-format
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "Xoá thư mục cho sách %(id)s thất bại, đường dẫn có subfolders: %(path)s"
+
+#: cps/helper.py:319
+#, python-format
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "Xoá sách %(id)s thất bại: %(message)s"
+
+#: cps/helper.py:330
+#, python-format
+msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
+msgstr ""
+
+#: cps/helper.py:385
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:400
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "File %(file)s không tìm thấy trẻn Google Drive"
+
+#: cps/helper.py:464
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Không tìm thấy được dẫn sách %(path)s trên Google Drive"
+
+#: cps/helper.py:504 cps/web.py:1659
+msgid "Found an existing account for this e-mail address"
+msgstr "Tìm thấy một tài khoản đã toàn tại cho địa chỉ email này"
+
+#: cps/helper.py:512
+msgid "This username is already taken"
+msgstr "Username này đã bị sử dụng"
+
+#: cps/helper.py:522
+msgid "Invalid e-mail address format"
+msgstr "Định dạng email address không hợp lệ"
+
+#: cps/helper.py:595
+msgid "Error Downloading Cover"
+msgstr "Lỗi tải xuống ảnh bìa"
+
+#: cps/helper.py:598
+msgid "Cover Format Error"
+msgstr "Định dạng ảnh bìa lỗi"
+
+#: cps/helper.py:608
+msgid "Failed to create path for cover"
+msgstr "Tạo đường dẫn cho ảnh bìa thất bại"
+
+#: cps/helper.py:624
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr ""
+
+#: cps/helper.py:635
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
+
+#: cps/helper.py:648
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:652
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr ""
+
+#: cps/helper.py:704
+msgid "Unrar binary file not found"
+msgstr ""
+
+#: cps/helper.py:715
+msgid "Error excecuting UnRar"
+msgstr ""
+
+#: cps/helper.py:763
+msgid "Waiting"
+msgstr "Đang chờ"
+
+#: cps/helper.py:765
+msgid "Failed"
+msgstr "Thất bại"
+
+#: cps/helper.py:767
+msgid "Started"
+msgstr "Đã bắt đầu"
+
+#: cps/helper.py:769
+msgid "Finished"
+msgstr "Đã hoàn thành"
+
+#: cps/helper.py:771
+msgid "Unknown Status"
+msgstr "Trạng thái không xác định"
+
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
+msgid "Kobo Setup"
+msgstr "Thiết lập Kobo"
+
+#: cps/oauth_bb.py:77
+#, python-format
+msgid "Register with %(provider)s"
+msgstr ""
+
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/oauth_bb.py:148
+#, python-format
+msgid "Link to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:155
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr ""
+
+#: cps/oauth_bb.py:197
+#, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:202
+#, python-format
+msgid "Unlink to %(oauth)s Failed"
+msgstr ""
+
+#: cps/oauth_bb.py:205
+#, python-format
+msgid "Not Linked to %(oauth)s"
+msgstr ""
+
+#: cps/oauth_bb.py:261
+msgid "Failed to log in with GitHub."
+msgstr "Đăng nhập với Github thất bại."
+
+#: cps/oauth_bb.py:267
+msgid "Failed to fetch user info from GitHub."
+msgstr "Lấy thông tin user từ Github thất bại."
+
+#: cps/oauth_bb.py:279
+msgid "Failed to log in with Google."
+msgstr "Đăng nhập với Google thất bại."
+
+#: cps/oauth_bb.py:285
+msgid "Failed to fetch user info from Google."
+msgstr "Lấy thông tin người dùng từ Google thất bại."
+
+#: cps/oauth_bb.py:332
+msgid "GitHub Oauth error, please retry later."
+msgstr "Oauth Github lỗi, xin thử lại sau."
+
+#: cps/oauth_bb.py:335
+msgid "GitHub Oauth error: {}"
+msgstr "Github Oauth lỗi: {}"
+
+#: cps/oauth_bb.py:356
+msgid "Google Oauth error, please retry later."
+msgstr "Google Oauth lỗi, làm ơn thử lại sau."
+
+#: cps/oauth_bb.py:359
+msgid "Google Oauth error: {}"
+msgstr "Google Oauth lỗi: {}"
+
+#: cps/opds.py:384
+msgid "{} Stars"
+msgstr "{} sao"
+
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
+msgid "Login"
+msgstr "Đăng nhập"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Không tìm thấy token"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Token đã hết hạn"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Thành công! Hãy quay lại thiết bị của bạn"
+
+#: cps/render_template.py:39 cps/web.py:416
+msgid "Books"
+msgstr "Sách"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Hiển thị sách gần đây"
+
+#: cps/render_template.py:42 cps/templates/index.xml:25
+msgid "Hot Books"
+msgstr "Sách hot"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Hiển thị sách hot"
+
+#: cps/render_template.py:46 cps/render_template.py:51
+msgid "Downloaded Books"
+msgstr "Sách đã tải"
+
+#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/templates/user_table.html:167
+msgid "Show Downloaded Books"
+msgstr "Hiển thị sách đã tải"
+
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
+msgid "Top Rated Books"
+msgstr "Top sách được đánh giá cao"
+
+#: cps/render_template.py:58 cps/templates/user_table.html:161
+msgid "Show Top Rated Books"
+msgstr "Hiện thị top những sách được đánh giá cao"
+
+#: cps/render_template.py:59 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:676
+msgid "Read Books"
+msgstr "Sách đã đọc"
+
+#: cps/render_template.py:61
+msgid "Show read and unread"
+msgstr "Hiển thị đã đọc và chưa đọc"
+
+#: cps/render_template.py:63 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:679
+msgid "Unread Books"
+msgstr "Sách chưa đọc"
+
+#: cps/render_template.py:65
+msgid "Show unread"
+msgstr "Hiện thị sách chưa đọc"
+
+#: cps/render_template.py:66
+msgid "Discover"
+msgstr "Khám phá"
+
+#: cps/render_template.py:68 cps/templates/index.xml:50
+#: cps/templates/user_table.html:162
+msgid "Show Random Books"
+msgstr "Hiển thị sách ngẫu nhiên"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1041
+msgid "Categories"
+msgstr "Chủ đề"
+
+#: cps/render_template.py:71 cps/templates/user_table.html:158
+msgid "Show category selection"
+msgstr "Hiển thị chọn chủ đề"
+
+#: cps/render_template.py:72 cps/templates/book_edit.html:90
+#: cps/templates/book_table.html:68 cps/templates/index.xml:90
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
+msgid "Series"
+msgstr "Series"
+
+#: cps/render_template.py:74 cps/templates/user_table.html:157
+msgid "Show series selection"
+msgstr "Hiển thị chọn series"
+
+#: cps/render_template.py:75 cps/templates/book_table.html:66
+#: cps/templates/index.xml:69
+msgid "Authors"
+msgstr "Tác giả"
+
+#: cps/render_template.py:77 cps/templates/user_table.html:160
+msgid "Show author selection"
+msgstr "Hiển thị chọn tác giả"
+
+#: cps/render_template.py:79 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:925
+msgid "Publishers"
+msgstr "Nhà phát hành"
+
+#: cps/render_template.py:81 cps/templates/user_table.html:163
+msgid "Show publisher selection"
+msgstr "Hiển thị chọn nhà phát hành"
+
+#: cps/render_template.py:82 cps/templates/book_table.html:70
+#: cps/templates/index.xml:97 cps/templates/search_form.html:107
+#: cps/web.py:1018
+msgid "Languages"
+msgstr "Ngôn ngữ"
+
+#: cps/render_template.py:85 cps/templates/user_table.html:155
+msgid "Show language selection"
+msgstr "Hiển thị chọn ngôn ngữ"
+
+#: cps/render_template.py:86 cps/templates/index.xml:104
+msgid "Ratings"
+msgstr "Đánh giá"
+
+#: cps/render_template.py:88 cps/templates/user_table.html:164
+msgid "Show ratings selection"
+msgstr "Hiển thị chọn đánh giá"
+
+#: cps/render_template.py:89 cps/templates/index.xml:112
+msgid "File formats"
+msgstr "Định dạng file"
+
+#: cps/render_template.py:91 cps/templates/user_table.html:165
+msgid "Show file formats selection"
+msgstr "Hiển thị lựa chọn định dạng file"
+
+#: cps/render_template.py:93 cps/web.py:703
+msgid "Archived Books"
+msgstr "Sách đã lưu trữ"
+
+#: cps/render_template.py:95 cps/templates/user_table.html:166
+msgid "Show archived books"
+msgstr "Hiện thị sách trong kho"
+
+#: cps/render_template.py:97 cps/web.py:780
+msgid "Books List"
+msgstr "Danh sách sách"
+
+#: cps/render_template.py:99 cps/templates/user_table.html:168
+msgid "Show Books List"
+msgstr "Hiển thị danh sách sách"
+
+#: cps/shelf.py:67 cps/shelf.py:121
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/shelf.py:73
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Xin lỗi bạn không có quyền thêm sách vào giá đó"
+
+#: cps/shelf.py:82
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:107
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Sách đã được thêm vào giá: %(sname)s"
+
+#: cps/shelf.py:126
+msgid "You are not allowed to add a book to the shelf"
+msgstr ""
+
+#: cps/shelf.py:144
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:156
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:163
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:209
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Sách đã được xoá khỏi giá: %(sname)s"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "Xin lỗi bạn không có quyền xoá sách khỏi giá này"
+
+#: cps/shelf.py:228 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Tạo một giá sách"
+
+#: cps/shelf.py:237
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Xin lỗi bạn không có quyền chỉnh sửa giá sách này"
+
+#: cps/shelf.py:239
+msgid "Edit a shelf"
+msgstr "Chỉnh sửa giá sách"
+
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "Xin lỗi bạn không có quyền tạo một giá sách công khai"
+
+#: cps/shelf.py:266
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Giá sách %(title)s đã được tạo"
+
+#: cps/shelf.py:269
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Giá sách %(title)s đã được thay đổi"
+
+#: cps/shelf.py:283
+msgid "There was an error"
+msgstr "Có lỗi xảy ra"
+
+#: cps/shelf.py:305
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:316
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:337
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:386
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr ""
+
+#: cps/shelf.py:456
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr ""
+
+#: cps/shelf.py:460
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr ""
+
+#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
+msgid "Unexpected data while reading update information"
+msgstr ""
+
+#: cps/updater.py:410 cps/updater.py:521
+msgid "No update available. You already have the latest version installed"
+msgstr ""
+
+#: cps/updater.py:428
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr ""
+
+#: cps/updater.py:446
+msgid "Could not fetch update information"
+msgstr ""
+
+#: cps/updater.py:456
+msgid "Click on the button below to update to the latest stable version."
+msgstr ""
+
+#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/updater.py:507
+msgid "No release information available"
+msgstr ""
+
+#: cps/templates/index.html:5 cps/web.py:440
+msgid "Discover (Random Books)"
+msgstr ""
+
+#: cps/web.py:471
+msgid "Hot Books (Most Downloaded)"
+msgstr ""
+
+#: cps/web.py:507
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:539
+#, python-format
+msgid "Author: %(name)s"
+msgstr ""
+
+#: cps/web.py:554
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr ""
+
+#: cps/web.py:569
+#, python-format
+msgid "Series: %(serie)s"
+msgstr ""
+
+#: cps/web.py:582
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:597
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:615
+#, python-format
+msgid "Category: %(name)s"
+msgstr ""
+
+#: cps/web.py:631
+#, python-format
+msgid "Language: %(name)s"
+msgstr ""
+
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
+msgid "Advanced Search"
+msgstr "Tìm kiếm nâng cao"
+
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
+#: cps/templates/index.xml:11 cps/templates/layout.html:45
+#: cps/templates/layout.html:48 cps/templates/search_form.html:226
+#: cps/web.py:750 cps/web.py:1077
+msgid "Search"
+msgstr "Tìm kiếm"
+
+#: cps/templates/admin.html:16 cps/web.py:903
+msgid "Downloads"
+msgstr "Tải xuống"
+
+#: cps/web.py:980
+msgid "Ratings list"
+msgstr "Danh sách đánh giá"
+
+#: cps/web.py:1001
+msgid "File formats list"
+msgstr "Danh sách định dạng file"
+
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
+msgid "Tasks"
+msgstr "Nhiệm vụ"
+
+#: cps/web.py:1215
+msgid "Published after "
+msgstr "Phát hành sau "
+
+#: cps/web.py:1222
+msgid "Published before "
+msgstr "Phát hành trước "
+
+#: cps/web.py:1244
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Đánh giá <= %(rating)s"
+
+#: cps/web.py:1246
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Đánh giá >= %(rating)s"
+
+#: cps/web.py:1248
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr "Trạng thái đọc = %(status)s"
+
+#: cps/web.py:1353
+msgid "Error on search for custom columns, please restart Calibre-Web"
+msgstr ""
+
+#: cps/web.py:1449
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr ""
+
+#: cps/web.py:1453
+#, python-format
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr ""
+
+#: cps/web.py:1455
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr ""
+
+#: cps/web.py:1472
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr ""
+
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
+msgid "Register"
+msgstr "Đăng ký"
+
+#: cps/web.py:1507
+msgid "Your e-mail is not allowed to register"
+msgstr "Email của bạn không được cho phép để đăng ký"
+
+#: cps/web.py:1510
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr ""
+
+#: cps/web.py:1524
+msgid "Cannot activate LDAP authentication"
+msgstr ""
+
+#: cps/web.py:1543
+#, python-format
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr ""
+
+#: cps/web.py:1549
+#, python-format
+msgid "Could not login: %(message)s"
+msgstr "Không thể đăng nhập: %(message)s"
+
+#: cps/web.py:1553 cps/web.py:1578
+msgid "Wrong Username or Password"
+msgstr "Tên đăng nhập hoặc mật khẩu không đúng"
+
+#: cps/web.py:1560
+msgid "New Password was send to your email address"
+msgstr "Mật khẩu mới đã được gửi đến email của bạn"
+
+#: cps/web.py:1566
+msgid "Please enter valid username to reset password"
+msgstr ""
+
+#: cps/web.py:1573
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1639 cps/web.py:1688
+#, python-format
+msgid "%(name)s's profile"
+msgstr ""
+
+#: cps/web.py:1655
+msgid "Profile updated"
+msgstr ""
+
+#: cps/services/gmail.py:58
+msgid "Found no valid gmail.json file with OAuth information"
+msgstr ""
+
+#: cps/tasks/convert.py:137
+#, python-format
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr ""
+
+#: cps/tasks/convert.py:163
+#, python-format
+msgid "%(format)s format not found on disk"
+msgstr ""
+
+#: cps/tasks/convert.py:167
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:177
+#, python-format
+msgid "Kepubify-converter failed: %(error)s"
+msgstr ""
+
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr ""
+
+#: cps/tasks/convert.py:222
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr ""
+
+#: cps/tasks/convert.py:245
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
+#: cps/templates/admin.html:9
+msgid "Users"
+msgstr "Người dùng"
+
+#: cps/templates/admin.html:13 cps/templates/login.html:9
+#: cps/templates/login.html:10 cps/templates/register.html:9
+#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
+msgid "Username"
+msgstr "Tên người dùng"
+
+#: cps/templates/admin.html:14 cps/templates/register.html:14
+#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
+msgid "E-mail Address"
+msgstr "Địa chỉ email"
+
+#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
+msgid "Send to Kindle E-mail Address"
+msgstr "Kindle"
+
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/user_table.html:143
+msgid "Admin"
+msgstr "Admin"
+
+#: cps/templates/admin.html:18 cps/templates/login.html:13
+#: cps/templates/login.html:14 cps/templates/user_edit.html:23
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
+#: cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Tải lên"
+
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/user_table.html:146
+msgid "Download"
+msgstr "Tải xuống"
+
+#: cps/templates/admin.html:23
+msgid "View Books"
+msgstr "Xem sách"
+
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
+#: cps/templates/user_table.html:148
+msgid "Edit"
+msgstr "Chỉnh sửa"
+
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
+#: cps/templates/user_table.html:149
+msgid "Delete"
+msgstr "Xoá"
+
+#: cps/templates/admin.html:26
+msgid "Public Shelf"
+msgstr "Giá công khai"
+
+#: cps/templates/admin.html:51
+msgid "Add New User"
+msgstr "Thêm người dùng mới"
+
+#: cps/templates/admin.html:53
+msgid "Import LDAP Users"
+msgstr ""
+
+#: cps/templates/admin.html:60
+msgid "E-mail Server Settings"
+msgstr "Thiết lập máy chủ email"
+
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
+msgid "SMTP Hostname"
+msgstr "SMTP Hostname"
+
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
+msgid "SMTP Port"
+msgstr "Cổng SMTP"
+
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
+msgid "Encryption"
+msgstr "SSL"
+
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
+msgid "SMTP Login"
+msgstr "Đăng nhập SMTP"
+
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
+#: cps/templates/email_edit.html:55
+msgid "From E-mail"
+msgstr "Từ E-mail"
+
+#: cps/templates/admin.html:88
+msgid "E-Mail Service"
+msgstr "Dịch vụ E-Mail"
+
+#: cps/templates/admin.html:89
+msgid "Gmail via Oauth2"
+msgstr "Gmail via Oauth2"
+
+#: cps/templates/admin.html:104
+msgid "Configuration"
+msgstr "Thiết lập"
+
+#: cps/templates/admin.html:107
+msgid "Calibre Database Directory"
+msgstr "Thư mục cơ sở dữ liệu Calibre"
+
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
+msgid "Log Level"
+msgstr "Log Level"
+
+#: cps/templates/admin.html:115
+msgid "Port"
+msgstr "Cổng"
+
+#: cps/templates/admin.html:120
+msgid "External Port"
+msgstr ""
+
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
+msgid "Books per Page"
+msgstr "Sách mỗi trang"
+
+#: cps/templates/admin.html:131
+msgid "Uploads"
+msgstr "Tải lên"
+
+#: cps/templates/admin.html:135
+msgid "Anonymous Browsing"
+msgstr "Ẩn danh"
+
+#: cps/templates/admin.html:139
+msgid "Public Registration"
+msgstr "Đăng ký công khai"
+
+#: cps/templates/admin.html:143
+msgid "Magic Link Remote Login"
+msgstr "Đăng nhập bằng Magic Link"
+
+#: cps/templates/admin.html:147
+msgid "Reverse Proxy Login"
+msgstr ""
+
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
+msgid "Reverse Proxy Header Name"
+msgstr ""
+
+#: cps/templates/admin.html:157
+msgid "Edit Calibre Database Configuration"
+msgstr "Chỉnh sửa thiết lập cơ sở dữ liệu Calibre"
+
+#: cps/templates/admin.html:158
+msgid "Edit Basic Configuration"
+msgstr "Chỉnh sửa thiết lập cơ bản"
+
+#: cps/templates/admin.html:159
+msgid "Edit UI Configuration"
+msgstr "Chỉnh sửa thiết lập UI"
+
+#: cps/templates/admin.html:164
+msgid "Administration"
+msgstr "Quản trị"
+
+#: cps/templates/admin.html:165
+msgid "Download Debug Package"
+msgstr "Tải xuống package debug"
+
+#: cps/templates/admin.html:166
+msgid "View Logs"
+msgstr "Xem logs"
+
+#: cps/templates/admin.html:169
+msgid "Reconnect Calibre Database"
+msgstr "Kết nối lại với cơ sở dữ liệu Calibre"
+
+#: cps/templates/admin.html:170
+msgid "Restart"
+msgstr "Khởi động lại"
+
+#: cps/templates/admin.html:171
+msgid "Shutdown"
+msgstr "Tắt"
+
+#: cps/templates/admin.html:176
+msgid "Update"
+msgstr "Cập nhật"
+
+#: cps/templates/admin.html:180
+msgid "Version"
+msgstr "Phiên bản"
+
+#: cps/templates/admin.html:181
+msgid "Details"
+msgstr "Chi tiết"
+
+#: cps/templates/admin.html:187
+msgid "Current version"
+msgstr "Phiên bản hiện tại"
+
+#: cps/templates/admin.html:194
+msgid "Check for Update"
+msgstr "Kiểm tra cập nhật"
+
+#: cps/templates/admin.html:195
+msgid "Perform Update"
+msgstr "Bắt đầu cập nhật"
+
+#: cps/templates/admin.html:208
+msgid "Are you sure you want to restart?"
+msgstr "Bạn có chắc chắn muốn khởi động lại?"
+
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
+msgid "OK"
+msgstr "Ok"
+
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
+#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
+msgid "Cancel"
+msgstr "Huỷ bỏ"
+
+#: cps/templates/admin.html:226
+msgid "Are you sure you want to shutdown?"
+msgstr "Bạn có chắc muốn tắt?"
+
+#: cps/templates/admin.html:238
+msgid "Updating, please do not reload this page"
+msgstr "Đang update, làm ơn đừng load lại trang này"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "via"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "Trong thư viện"
+
+#: cps/templates/author.html:26 cps/templates/index.html:72
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
+msgid "Sort according to book date, newest first"
+msgstr ""
+
+#: cps/templates/author.html:27 cps/templates/index.html:73
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
+msgid "Sort according to book date, oldest first"
+msgstr ""
+
+#: cps/templates/author.html:28 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
+msgid "Sort title in alphabetical order"
+msgstr ""
+
+#: cps/templates/author.html:29 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
+msgid "Sort title in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/author.html:30 cps/templates/index.html:78
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
+msgid "Sort according to publishing date, newest first"
+msgstr ""
+
+#: cps/templates/author.html:31 cps/templates/index.html:79
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
+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:111 cps/templates/search.html:65
+#: cps/templates/shelf.html:54
+msgid "reduce"
+msgstr ""
+
+#: cps/templates/author.html:101
+msgid "More by"
+msgstr "Cùng tác giả"
+
+#: cps/templates/book_edit.html:10
+msgid "Delete Book"
+msgstr "Xoá sách"
+
+#: cps/templates/book_edit.html:13
+msgid "Delete formats:"
+msgstr "Xoá định dạng:"
+
+#: cps/templates/book_edit.html:24
+msgid "Convert book format:"
+msgstr "Chuyển đổi định dạng sách:"
+
+#: cps/templates/book_edit.html:29
+msgid "Convert from:"
+msgstr "Chuyển đổi từ:"
+
+#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+msgid "select an option"
+msgstr "chọn một lựa chọn"
+
+#: cps/templates/book_edit.html:36
+msgid "Convert to:"
+msgstr "Chuyển đổi tới:"
+
+#: cps/templates/book_edit.html:45
+msgid "Convert book"
+msgstr "Chuyển đổi sách"
+
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+msgid "Book Title"
+msgstr "Tên sách"
+
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+msgid "Author"
+msgstr "Tác giả"
+
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+msgid "Description"
+msgstr "Mô tả"
+
+#: cps/templates/book_edit.html:72
+msgid "Identifiers"
+msgstr "Nhận diện"
+
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+msgid "Identifier Type"
+msgstr "Kiểu nhận diện"
+
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+msgid "Identifier Value"
+msgstr "Giá trị nhận diện"
+
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/user_table.html:24
+msgid "Remove"
+msgstr "Xoá"
+
+#: cps/templates/book_edit.html:82
+msgid "Add Identifier"
+msgstr "Thêm nhận diện"
+
+#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+msgid "Tags"
+msgstr "Đánh dấu"
+
+#: cps/templates/book_edit.html:94
+msgid "Series ID"
+msgstr "Series ID"
+
+#: cps/templates/book_edit.html:98
+msgid "Rating"
+msgstr "Đánh giá"
+
+#: cps/templates/book_edit.html:103
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "Lấy ảnh bìa từ URL (ảnh JPEG sẽ được tải xuống và lưu trong cơ sở dữ liệu)"
+
+#: cps/templates/book_edit.html:107
+msgid "Upload Cover from Local Disk"
+msgstr "Tải ảnh bìa từ ổ cứng"
+
+#: cps/templates/book_edit.html:112
+msgid "Published Date"
+msgstr "Ngày xuất bản"
+
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/search_form.html:16
+msgid "Publisher"
+msgstr "Nhà xuất bản"
+
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/user_edit.html:33
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/search_form.html:164
+msgid "Yes"
+msgstr "Có"
+
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/search_form.html:165
+msgid "No"
+msgstr "Không"
+
+#: cps/templates/book_edit.html:200
+msgid "Upload Format"
+msgstr "Định dạng tải lên"
+
+#: cps/templates/book_edit.html:208
+msgid "View Book on Save"
+msgstr "Xem sách sau khi lưu"
+
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+msgid "Fetch Metadata"
+msgstr "Fetch Metadata"
+
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
+#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+msgid "Save"
+msgstr "Lưu"
+
+#: cps/templates/book_edit.html:232
+msgid "Keyword"
+msgstr "Từ khoá"
+
+#: cps/templates/book_edit.html:233
+msgid "Search keyword"
+msgstr "Tìm kiếm từ khoá"
+
+#: cps/templates/book_edit.html:239
+msgid "Click the cover to load metadata to the form"
+msgstr "Ấn vào ảnh cover để tải metadata vào form"
+
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+msgid "Loading..."
+msgstr "Đang tải..."
+
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:163
+msgid "Close"
+msgstr "Đóng"
+
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+msgid "Source"
+msgstr "Nguồn"
+
+#: cps/templates/book_edit.html:286
+msgid "Search error!"
+msgstr "Tìm kiếm lỗi!"
+
+#: cps/templates/book_edit.html:287
+msgid "No Result(s) found! Please try another keyword."
+msgstr "Không tìm thấy kết quả! Hãy thử lại với từ khoá khác."
+
+#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
+#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
+#: cps/templates/user_table.html:100
+msgid "This Field is Required"
+msgstr "Đây là trường bắt buộc"
+
+#: cps/templates/book_table.html:37
+msgid "Merge selected books"
+msgstr "Gộp những sách đã chọn"
+
+#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
+msgid "Remove Selections"
+msgstr "Bỏ chọn"
+
+#: cps/templates/book_table.html:41
+msgid "Exchange author and title"
+msgstr "Đổi tác giả và tên sách"
+
+#: cps/templates/book_table.html:47
+msgid "Update Title Sort automatically"
+msgstr "Cập nhật sắp xếp theo tên tự động"
+
+#: cps/templates/book_table.html:51
+msgid "Update Author Sort automatically"
+msgstr "Cập nhật sắp xếp theo tác giả tự động"
+
+#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
+msgid "Enter Title"
+msgstr "Nhập tên sách"
+
+#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
+#: cps/templates/shelf_edit.html:8
+msgid "Title"
+msgstr "Tên"
+
+#: cps/templates/book_table.html:64
+msgid "Enter Title Sort"
+msgstr "Nhập tên sách để sắp xếp"
+
+#: cps/templates/book_table.html:64
+msgid "Title Sort"
+msgstr "Tên sắp xếp"
+
+#: cps/templates/book_table.html:65
+msgid "Enter Author Sort"
+msgstr "Nhập tác giả sắp xếp"
+
+#: cps/templates/book_table.html:65
+msgid "Author Sort"
+msgstr "Tên tác giả sắp xếp"
+
+#: cps/templates/book_table.html:66
+msgid "Enter Authors"
+msgstr "Nhập tên tác giả"
+
+#: cps/templates/book_table.html:67
+msgid "Enter Categories"
+msgstr "Nhập thể loại"
+
+#: cps/templates/book_table.html:68
+msgid "Enter Series"
+msgstr "Nhập tên series"
+
+#: cps/templates/book_table.html:69
+msgid "Series Index"
+msgstr "Chỉ số series"
+
+#: cps/templates/book_table.html:70
+msgid "Enter Languages"
+msgstr "Nhập ngôn ngữ"
+
+#: cps/templates/book_table.html:71
+msgid "Publishing Date"
+msgstr "Ngày phát hành"
+
+#: cps/templates/book_table.html:72
+msgid "Enter Publishers"
+msgstr "Nhập tên nhà phát hành"
+
+#: cps/templates/book_table.html:73
+msgid "Enter comments"
+msgstr "Nhập nhận xét"
+
+#: cps/templates/book_table.html:73
+msgid "Comments"
+msgstr "Nhận xét"
+
+#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
+#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
+#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
+#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
+msgid "Enter "
+msgstr "Nhập "
+
+#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Bạn có thực sự chắc chắn?"
+
+#: cps/templates/book_table.html:114
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:118
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:123
+msgid "Merge"
+msgstr "Trộn"
+
+#: cps/templates/config_db.html:12
+msgid "Location of Calibre Database"
+msgstr "Vị trí cơ sở dữ liệu của Calibre"
+
+#: cps/templates/config_db.html:22
+msgid "Use Google Drive?"
+msgstr "Dùng Google Drive?"
+
+#: cps/templates/config_db.html:27
+msgid "Authenticate Google Drive"
+msgstr "Xác thực Google Drive"
+
+#: cps/templates/config_db.html:32
+msgid "Google Drive Calibre folder"
+msgstr "Thư mục Calibre trên Google Drive"
+
+#: cps/templates/config_db.html:40
+msgid "Metadata Watch Channel ID"
+msgstr ""
+
+#: cps/templates/config_db.html:43
+msgid "Revoke"
+msgstr "Thu hồi"
+
+#: cps/templates/config_db.html:68
+msgid "New db location is invalid, please enter valid path"
+msgstr "Đường dẫn DB mới không hợp lệ, xin hãy nhập đường dẫn hợp lệ"
+
+#: cps/templates/config_edit.html:18
+msgid "Server Configuration"
+msgstr "Thiết lập máy chủ"
+
+#: cps/templates/config_edit.html:25
+msgid "Server Port"
+msgstr "Cổng máy chủ"
+
+#: cps/templates/config_edit.html:28
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr ""
+
+#: cps/templates/config_edit.html:43
+msgid "Update Channel"
+msgstr ""
+
+#: cps/templates/config_edit.html:45
+msgid "Stable"
+msgstr ""
+
+#: cps/templates/config_edit.html:46
+msgid "Nightly"
+msgstr ""
+
+#: cps/templates/config_edit.html:50
+msgid "Trusted Hosts (Comma Separated)"
+msgstr ""
+
+#: cps/templates/config_edit.html:61
+msgid "Logfile Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:77
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr ""
+
+#: cps/templates/config_edit.html:82
+msgid "Enable Access Log"
+msgstr ""
+
+#: cps/templates/config_edit.html:85
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr ""
+
+#: cps/templates/config_edit.html:96
+msgid "Feature Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:104
+msgid "Convert non-English characters in title and author while saving to disk"
+msgstr ""
+
+#: cps/templates/config_edit.html:108
+msgid "Enable Uploads"
+msgstr ""
+
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr ""
+
+#: cps/templates/config_edit.html:112
+msgid "Allowed Upload Fileformats"
+msgstr ""
+
+#: cps/templates/config_edit.html:118
+msgid "Enable Anonymous Browsing"
+msgstr ""
+
+#: cps/templates/config_edit.html:122
+msgid "Enable Public Registration"
+msgstr ""
+
+#: cps/templates/config_edit.html:127
+msgid "Use E-Mail as Username"
+msgstr ""
+
+#: cps/templates/config_edit.html:132
+msgid "Enable Magic Link Remote Login"
+msgstr ""
+
+#: cps/templates/config_edit.html:137
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:142
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:145
+msgid "Server External Port (for port forwarded API calls)"
+msgstr ""
+
+#: cps/templates/config_edit.html:153
+msgid "Use Goodreads"
+msgstr "Sử dụng Goodreads"
+
+#: cps/templates/config_edit.html:154
+msgid "Create an API Key"
+msgstr "Tạo API Key"
+
+#: cps/templates/config_edit.html:158
+msgid "Goodreads API Key"
+msgstr "Goodreads API Key"
+
+#: cps/templates/config_edit.html:162
+msgid "Goodreads API Secret"
+msgstr "Goodreads API Secret"
+
+#: cps/templates/config_edit.html:169
+msgid "Allow Reverse Proxy Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Login type"
+msgstr "Kiểu đăng nhập"
+
+#: cps/templates/config_edit.html:182
+msgid "Use Standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:184
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
+msgid "Use OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:194
+msgid "LDAP Server Host Name or IP Address"
+msgstr ""
+
+#: cps/templates/config_edit.html:198
+msgid "LDAP Server Port"
+msgstr ""
+
+#: cps/templates/config_edit.html:202
+msgid "LDAP Encryption"
+msgstr ""
+
+#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
+#: cps/templates/email_edit.html:41
+msgid "None"
+msgstr "None"
+
+#: cps/templates/config_edit.html:205
+msgid "TLS"
+msgstr ""
+
+#: cps/templates/config_edit.html:206
+msgid "SSL"
+msgstr ""
+
+#: cps/templates/config_edit.html:210
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:217
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:233
+msgid "LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:235
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:236
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:237
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
+msgid "LDAP Administrator Username"
+msgstr ""
+
+#: cps/templates/config_edit.html:248
+msgid "LDAP Administrator Password"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:257
+msgid "LDAP User Object Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:262
+msgid "LDAP Server is OpenLDAP?"
+msgstr ""
+
+#: cps/templates/config_edit.html:264
+msgid "Following Settings are Needed For User Import"
+msgstr ""
+
+#: cps/templates/config_edit.html:266
+msgid "LDAP Group Object Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:270
+msgid "LDAP Group Name"
+msgstr ""
+
+#: cps/templates/config_edit.html:274
+msgid "LDAP Group Members Field"
+msgstr ""
+
+#: cps/templates/config_edit.html:278
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:280
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:281
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:286
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:300
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:304
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:320
+msgid "External binaries"
+msgstr ""
+
+#: cps/templates/config_edit.html:326
+msgid "Path to Calibre E-Book Converter"
+msgstr ""
+
+#: cps/templates/config_edit.html:334
+msgid "Calibre E-Book Converter Settings"
+msgstr ""
+
+#: cps/templates/config_edit.html:337
+msgid "Path to Kepubify E-Book Converter"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Location of Unrar binary"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:17
+msgid "View Configuration"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:32
+msgid "No. of Random Books to Display"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:36
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+msgid "Theme"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:42
+msgid "Standard Theme"
+msgstr "Chủ đề mặc định"
+
+#: cps/templates/config_view_edit.html:43
+msgid "caliBlur! Dark Theme"
+msgstr "calibur! Theme tối"
+
+#: cps/templates/config_view_edit.html:47
+msgid "Regular Expression for Ignoring Columns"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:51
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:60
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:69
+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:96
+msgid "Admin User"
+msgstr "Người dùng quản trị"
+
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
+msgid "Allow Downloads"
+msgstr "Cho phép tải xuống"
+
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
+msgid "Allow eBook Viewer"
+msgstr "Cho phép xem eBook"
+
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
+msgid "Allow Uploads"
+msgstr "Cho phép tải lên"
+
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
+msgid "Allow Edit"
+msgstr "Cho phép chỉnh sửa"
+
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
+msgid "Allow Delete Books"
+msgstr "Cho phép xoá sách"
+
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
+msgid "Allow Changing Password"
+msgstr "Cho phép thay đổi mật khẩu"
+
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
+msgid "Allow Editing Public Shelves"
+msgstr "Cho phép chỉnh sửa giá sách công khai"
+
+#: cps/templates/config_view_edit.html:123
+msgid "Default Language"
+msgstr "Ngôn ngữ mặc định"
+
+#: cps/templates/config_view_edit.html:131
+msgid "Default Visible Language of Books"
+msgstr "Ngôn ngữ hiển thị mặc định của sách"
+
+#: cps/templates/config_view_edit.html:147
+msgid "Default Visibilities for New Users"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
+#: cps/templates/user_table.html:154
+msgid "Show Random Books in Detail View"
+msgstr "Hiển thị sách ngẫu nhiên trong màn hình chi tiết"
+
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:166
+msgid "Add Allowed/Denied custom column values"
+msgstr "Thêm cho phép/từ chối giá trị cột tuỳ biến"
+
+#: cps/templates/detail.html:60 cps/templates/detail.html:69
+msgid "Read in Browser"
+msgstr "Đọc trên trình duyệt"
+
+#: cps/templates/detail.html:77 cps/templates/detail.html:94
+msgid "Listen in Browser"
+msgstr "Nghe trên trình duyệt"
+
+#: cps/templates/detail.html:124
+#, python-format
+msgid "Book %(index)s of %(range)s"
+msgstr "Sách %(index)s của %(range)s"
+
+#: cps/templates/detail.html:173
+msgid "Published"
+msgstr "Đã phát hành"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Unread"
+msgstr "Đánh dấu chưa đọc"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Read"
+msgstr "Đánh dấu đã đọc"
+
+#: cps/templates/detail.html:222
+msgid "Read"
+msgstr "Đọc"
+
+#: cps/templates/detail.html:231
+msgid "Restore from archive"
+msgstr "Khôi phục từ lưu trữ"
+
+#: cps/templates/detail.html:231
+msgid "Add to archive"
+msgstr "Thêm vào lưu trữ"
+
+#: cps/templates/detail.html:232
+msgid "Archived"
+msgstr "Lưu trữ"
+
+#: cps/templates/detail.html:243
+msgid "Description:"
+msgstr "Mô tả:"
+
+#: cps/templates/detail.html:256 cps/templates/search.html:14
+msgid "Add to shelf"
+msgstr "Thêm vào giá sách"
+
+#: cps/templates/detail.html:267 cps/templates/detail.html:284
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
+#: cps/templates/search.html:20
+msgid "(Public)"
+msgstr "(Công khai)"
+
+#: cps/templates/detail.html:298
+msgid "Edit Metadata"
+msgstr "Chỉnh sửa Metadata"
+
+#: cps/templates/email_edit.html:13
+msgid "Choose Server Type"
+msgstr "Chọn kiểu server"
+
+#: cps/templates/email_edit.html:15
+msgid "Use Standard E-Mail Account"
+msgstr "Dùng tài khoản email tiêu chuẩn"
+
+#: cps/templates/email_edit.html:16
+msgid "Gmail Account with OAuth2 Verification"
+msgstr "Tài khoản Gmail với xác nhận OAuth2"
+
+#: cps/templates/email_edit.html:22
+msgid "Setup Gmail Account as E-Mail Server"
+msgstr "Cài đặt tài khoản Gmail làm email Server"
+
+#: cps/templates/email_edit.html:24
+msgid "Revoke Gmail Access"
+msgstr "Thu hồi quyền truy cập Gmail"
+
+#: cps/templates/email_edit.html:42
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:43
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:51
+msgid "SMTP Password"
+msgstr "Mật khẩu SMTP"
+
+#: cps/templates/email_edit.html:58
+msgid "Attachment Size Limit"
+msgstr "Giới hạn kích thước file đính kèm"
+
+#: cps/templates/email_edit.html:66
+msgid "Save and Send Test E-mail"
+msgstr "Lưu và gửi test E-mail"
+
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
+msgid "Back"
+msgstr "Quay lại"
+
+#: cps/templates/email_edit.html:74
+msgid "Allowed Domains (Whitelist)"
+msgstr "Domains được chấp nhận (Whitelist)"
+
+#: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
+msgid "Add Domain"
+msgstr "Thêm domain"
+
+#: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
+#: cps/templates/user_table.html:27
+msgid "Add"
+msgstr "Thêm"
+
+#: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
+msgid "Enter domainname"
+msgstr "Nhập tên domain"
+
+#: cps/templates/email_edit.html:92
+msgid "Denied Domains (Blacklist)"
+msgstr "Domain bị từ chối (Blacklist)"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+msgid "Next"
+msgstr "Tiếp tục"
+
+#: 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 ""
+
+#: cps/templates/http_error.html:31
+msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
+msgstr ""
+
+#: cps/templates/http_error.html:41
+msgid "Create Issue"
+msgstr ""
+
+#: cps/templates/http_error.html:48
+msgid "Return to Home"
+msgstr "Quay về trang chủ"
+
+#: cps/templates/http_error.html:50
+msgid "Logout User"
+msgstr ""
+
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr ""
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
+#: cps/templates/shelf.html:23
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77 cps/templates/search.html:34
+#: cps/templates/shelf.html:24
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:81
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:82
+msgid "Sort descending according to series index"
+msgstr ""
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "Bắt đầu"
+
+#: cps/templates/index.xml:18
+msgid "Alphabetical Books"
+msgstr ""
+
+#: cps/templates/index.xml:22
+msgid "Books sorted alphabetically"
+msgstr ""
+
+#: cps/templates/index.xml:29
+msgid "Popular publications from this catalog based on Downloads."
+msgstr ""
+
+#: cps/templates/index.xml:36
+msgid "Popular publications from this catalog based on Rating."
+msgstr ""
+
+#: cps/templates/index.xml:39
+msgid "Recently added Books"
+msgstr "Sách mới được thêm gần đây"
+
+#: cps/templates/index.xml:43
+msgid "The latest Books"
+msgstr "Sách mới nhất"
+
+#: cps/templates/index.xml:46
+msgid "Random Books"
+msgstr "Sách ngẫu nhiên"
+
+#: cps/templates/index.xml:73
+msgid "Books ordered by Author"
+msgstr "Sách sắp xếp theo tác giả"
+
+#: cps/templates/index.xml:80
+msgid "Books ordered by publisher"
+msgstr "Sách sắp xếp theo nhà phát hành"
+
+#: cps/templates/index.xml:87
+msgid "Books ordered by category"
+msgstr "Sách sắp xếp theo thể loại"
+
+#: cps/templates/index.xml:94
+msgid "Books ordered by series"
+msgstr "Sách sắp xếp theo series"
+
+#: cps/templates/index.xml:101
+msgid "Books ordered by Languages"
+msgstr "Sách sắp xếp theo ngôn ngữ"
+
+#: cps/templates/index.xml:108
+msgid "Books ordered by Rating"
+msgstr "Sách sắp xếp theo xếp hạng"
+
+#: cps/templates/index.xml:116
+msgid "Books ordered by file formats"
+msgstr "Sách sắp xếp theo định dạng"
+
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/search_form.html:87
+msgid "Shelves"
+msgstr "Giá sách"
+
+#: cps/templates/index.xml:123
+msgid "Books organized in shelves"
+msgstr "Sách tổ chức theo giá sách"
+
+#: cps/templates/layout.html:29
+msgid "Home"
+msgstr "Trang chủ"
+
+#: cps/templates/layout.html:35
+msgid "Toggle Navigation"
+msgstr ""
+
+#: cps/templates/layout.html:46
+msgid "Search Library"
+msgstr "Tìm kiếm thư viện"
+
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
+msgid "Uploading..."
+msgstr "Đang tải lên..."
+
+#: cps/templates/layout.html:63
+msgid "Error"
+msgstr "Lỗi"
+
+#: cps/templates/layout.html:63
+msgid "Upload done, processing, please wait..."
+msgstr "Tải lên xong, đang xử lý, đợi chút ..."
+
+#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
+msgid "Settings"
+msgstr "Thiết lập"
+
+#: cps/templates/layout.html:78
+msgid "Account"
+msgstr "Tài khoản"
+
+#: cps/templates/layout.html:80
+msgid "Logout"
+msgstr "Đăng suất"
+
+#: cps/templates/layout.html:118
+msgid "Please do not refresh the page"
+msgstr "Làm ơn đừng load lại trang"
+
+#: cps/templates/layout.html:128
+msgid "Browse"
+msgstr "Tìm kiếm"
+
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
+msgid "About"
+msgstr "About"
+
+#: cps/templates/layout.html:155
+msgid "Previous"
+msgstr "Trước"
+
+#: cps/templates/layout.html:182
+msgid "Book Details"
+msgstr "Chi tiết sách"
+
+#: cps/templates/login.html:18
+msgid "Remember Me"
+msgstr "Ghi nhớ tôi"
+
+#: cps/templates/login.html:23
+msgid "Forgot Password?"
+msgstr "Quên mật khẩu?"
+
+#: cps/templates/login.html:26
+msgid "Log in with Magic Link"
+msgstr "Đăng nhập với Magic Link"
+
+#: cps/templates/logviewer.html:6
+msgid "Show Calibre-Web Log: "
+msgstr "Hiển thị Calibre-Web Log: "
+
+#: cps/templates/logviewer.html:8
+msgid "Calibre-Web Log: "
+msgstr "Calibre-Web Log: "
+
+#: cps/templates/logviewer.html:8
+msgid "Stream output, can't be displayed"
+msgstr ""
+
+#: cps/templates/logviewer.html:12
+msgid "Show Access Log: "
+msgstr "Hiển thị log truy cập: "
+
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr "Tải xuống Calibre-Web Log"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Tải xuống log truy cập"
+
+#: 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 "Nhập Tag"
+
+#: 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 "Chọn file location"
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr "kiểu"
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr "tên"
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr "kích thước"
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr "Thư mục cha"
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr "Chọn"
+
+#: cps/templates/modal_dialogs.html:134
+msgid "Ok"
+msgstr "Ok"
+
+#: cps/templates/osd.xml:5
+msgid "Calibre-Web eBook Catalog"
+msgstr ""
+
+#: cps/templates/read.html:6
+msgid "epub Reader"
+msgstr "trình đọc epub"
+
+#: cps/templates/read.html:75
+msgid "Reflow text when sidebars are open."
+msgstr ""
+
+#: cps/templates/readcbr.html:7
+msgid "Comic Reader"
+msgstr "Trình đọc truyện tranh"
+
+#: cps/templates/readcbr.html:89
+msgid "Keyboard Shortcuts"
+msgstr "Phím tắt"
+
+#: cps/templates/readcbr.html:92
+msgid "Previous Page"
+msgstr "Trang trước"
+
+#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+msgid "Next Page"
+msgstr "Trang tiếp theo"
+
+#: 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 "Xoay phải"
+
+#: cps/templates/readcbr.html:99
+msgid "Rotate Left"
+msgstr "Xoay trái"
+
+#: cps/templates/readcbr.html:100
+msgid "Flip Image"
+msgstr "Lật ảnh"
+
+#: cps/templates/readcbr.html:116
+msgid "Light"
+msgstr "Sáng"
+
+#: cps/templates/readcbr.html:117
+msgid "Dark"
+msgstr "Tối"
+
+#: cps/templates/readcbr.html:122
+msgid "Scale"
+msgstr ""
+
+#: cps/templates/readcbr.html:125
+msgid "Best"
+msgstr "Tốt nhất"
+
+#: cps/templates/readcbr.html:126
+msgid "Width"
+msgstr "Rộng"
+
+#: cps/templates/readcbr.html:127
+msgid "Height"
+msgstr "Cao"
+
+#: cps/templates/readcbr.html:128
+msgid "Native"
+msgstr ""
+
+#: cps/templates/readcbr.html:133
+msgid "Rotate"
+msgstr "Xoay"
+
+#: cps/templates/readcbr.html:144
+msgid "Flip"
+msgstr "Lật"
+
+#: cps/templates/readcbr.html:147
+msgid "Horizontal"
+msgstr "Ngang"
+
+#: cps/templates/readcbr.html:148
+msgid "Vertical"
+msgstr "Dọc"
+
+#: cps/templates/readcbr.html:153
+msgid "Direction"
+msgstr "Hướng"
+
+#: cps/templates/readcbr.html:156
+msgid "Left to Right"
+msgstr "Trái sang phải"
+
+#: cps/templates/readcbr.html:157
+msgid "Right to Left"
+msgstr "Phải sang trái"
+
+#: cps/templates/readcbr.html:165
+msgid "Reset to Top"
+msgstr "Quay lên trên"
+
+#: cps/templates/readcbr.html:166
+msgid "Remember Position"
+msgstr "Ghi nhớ vị trí"
+
+#: cps/templates/readcbr.html:171
+msgid "Scrollbar"
+msgstr "Thanh cuộn"
+
+#: cps/templates/readcbr.html:174
+msgid "Show"
+msgstr "Hiện"
+
+#: cps/templates/readcbr.html:175
+msgid "Hide"
+msgstr "Ẩn"
+
+#: cps/templates/readdjvu.html:5
+msgid "DJVU Reader"
+msgstr "Trình đọc DJVU"
+
+#: cps/templates/readpdf.html:29
+msgid "PDF Reader"
+msgstr "Trình đọc PDF"
+
+#: cps/templates/readtxt.html:6
+msgid "txt Reader"
+msgstr "trình đọc txt"
+
+#: cps/templates/register.html:4
+msgid "Register New Account"
+msgstr "Đăng ký tải khoản mới"
+
+#: cps/templates/register.html:10
+msgid "Choose a username"
+msgstr "Chọn tên người dùng"
+
+#: cps/templates/register.html:15
+msgid "Your email address"
+msgstr "Địa chỉ email của bạn"
+
+#: cps/templates/remote_login.html:5
+msgid "Magic Link - Authorise New Device"
+msgstr "Magic Link - Xác thực thiết bị mới"
+
+#: cps/templates/remote_login.html:7
+msgid "On another device, login and visit:"
+msgstr "Trên thiết bị khác, đăng nhập và thăm quan:"
+
+#: cps/templates/remote_login.html:11
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr "Một khi xác nhận, bạn sẽ tự động đăng nhập trên thiết bị này."
+
+#: cps/templates/remote_login.html:14
+msgid "This verification link will expire in 10 minutes."
+msgstr "Link xác nhận này sẽ hết hạn trong 10 phút."
+
+#: cps/templates/search.html:5
+msgid "No Results Found"
+msgstr "Không tìm thấy kết quả"
+
+#: cps/templates/search.html:6
+msgid "Search Term:"
+msgstr "Từ khoá tìm kiếm:"
+
+#: cps/templates/search.html:8
+msgid "Results for:"
+msgstr "Kết quả cho:"
+
+#: cps/templates/search_form.html:21
+msgid "Published Date From"
+msgstr "Ngày phát hành từ"
+
+#: cps/templates/search_form.html:31
+msgid "Published Date To"
+msgstr "Ngày phát hành tới"
+
+#: cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "Read status"
+
+#: cps/templates/search_form.html:59
+msgid "Exclude Tags"
+msgstr ""
+
+#: cps/templates/search_form.html:77
+msgid "Exclude Series"
+msgstr ""
+
+#: cps/templates/search_form.html:95
+msgid "Exclude Shelves"
+msgstr ""
+
+#: cps/templates/search_form.html:115
+msgid "Exclude Languages"
+msgstr ""
+
+#: cps/templates/search_form.html:126
+msgid "Extensions"
+msgstr ""
+
+#: cps/templates/search_form.html:134
+msgid "Exclude Extensions"
+msgstr ""
+
+#: cps/templates/search_form.html:144
+msgid "Rating Above"
+msgstr "Đánh giá cao hơn"
+
+#: cps/templates/search_form.html:148
+msgid "Rating Below"
+msgstr "Đánh giá thấp hơn"
+
+#: cps/templates/search_form.html:180
+msgid "From:"
+msgstr "Từ:"
+
+#: cps/templates/search_form.html:190
+msgid "To:"
+msgstr "Tới:"
+
+#: cps/templates/shelf.html:12
+msgid "Delete this Shelf"
+msgstr "Xoá giá sách này"
+
+#: cps/templates/shelf.html:13
+msgid "Edit Shelf Properties"
+msgstr "Chỉnh sửa thông tin giá sách"
+
+#: cps/templates/shelf.html:16
+msgid "Arrange books manually"
+msgstr "Sắp xếp sách bằng tay"
+
+#: cps/templates/shelf.html:17
+msgid "Disable Change order"
+msgstr "Khoá thay đổi thứ tự"
+
+#: cps/templates/shelf.html:17
+msgid "Enable Change order"
+msgstr "Mở thay đổi thứ tự"
+
+#: cps/templates/shelf_edit.html:14
+msgid "Share with Everyone"
+msgstr "Chia sửa với tất cả"
+
+#: cps/templates/shelf_edit.html:21
+msgid "Sync this shelf with Kobo device"
+msgstr "Đồng bộ giá sách này với thiết bị Kobo"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag to Rearrange Order"
+msgstr "Kéo để thay đổi lại thứ tự"
+
+#: cps/templates/shelf_order.html:33
+msgid "Hidden Book"
+msgstr "Sách ẩn"
+
+#: cps/templates/stats.html:7
+msgid "Library Statistics"
+msgstr "Thống kê thư viện"
+
+#: cps/templates/stats.html:12
+msgid "Books in this Library"
+msgstr "Sách trong thư viện"
+
+#: cps/templates/stats.html:16
+msgid "Authors in this Library"
+msgstr "Các tác giả trong thư viện"
+
+#: cps/templates/stats.html:20
+msgid "Categories in this Library"
+msgstr "Các thể loại trong thư viện"
+
+#: cps/templates/stats.html:24
+msgid "Series in this Library"
+msgstr "Các series trong thư viện"
+
+#: cps/templates/stats.html:29
+msgid "System Statistics"
+msgstr "Thống kê hệ thống"
+
+#: cps/templates/stats.html:33
+msgid "Program Library"
+msgstr "Thư viện chương trình"
+
+#: cps/templates/stats.html:34
+msgid "Installed Version"
+msgstr "Phiên bản đã cài đặt"
+
+#: cps/templates/tasks.html:12
+msgid "User"
+msgstr "Người dùng"
+
+#: cps/templates/tasks.html:14
+msgid "Task"
+msgstr "Nhiệm vụ"
+
+#: cps/templates/tasks.html:15
+msgid "Status"
+msgstr "Trạng thái"
+
+#: cps/templates/tasks.html:16
+msgid "Progress"
+msgstr "Tiến độ"
+
+#: cps/templates/tasks.html:17
+msgid "Run Time"
+msgstr "Thời gian chạy"
+
+#: cps/templates/tasks.html:18
+msgid "Start Time"
+msgstr "Thời gian bắt đầu"
+
+#: cps/templates/user_edit.html:20
+msgid "Reset user Password"
+msgstr "Reset mật khẩu người dùng"
+
+#: cps/templates/user_edit.html:43
+msgid "Language of Books"
+msgstr "Ngôn ngữ của sách"
+
+#: cps/templates/user_edit.html:54
+msgid "OAuth Settings"
+msgstr "Thiết lập OAuth"
+
+#: cps/templates/user_edit.html:56
+msgid "Link"
+msgstr "Link"
+
+#: cps/templates/user_edit.html:58
+msgid "Unlink"
+msgstr "Unlink"
+
+#: cps/templates/user_edit.html:64
+msgid "Kobo Sync Token"
+msgstr "Token đồng bộ Kobo"
+
+#: cps/templates/user_edit.html:66
+msgid "Create/View"
+msgstr "Tạo/xem"
+
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr "Ép đồng bộ tất cả với Kobo"
+
+#: cps/templates/user_edit.html:88
+msgid "Add allowed/Denied Custom Column Values"
+msgstr ""
+
+#: cps/templates/user_edit.html:137
+msgid "Sync only books in selected shelves with Kobo"
+msgstr "Đồng bộ sách trên những giá được chọn với Kobo"
+
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
+msgid "Delete User"
+msgstr "Xoá người dùng"
+
+#: cps/templates/user_edit.html:159
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_table.html:80 cps/templates/user_table.html:103
+msgid "Select..."
+msgstr "Chọn..."
+
+#: cps/templates/user_table.html:131
+msgid "Edit User"
+msgstr "Chỉnh sửa người dùng"
+
+#: cps/templates/user_table.html:134
+msgid "Enter Username"
+msgstr "Nhập tên người dùng"
+
+#: cps/templates/user_table.html:135
+msgid "Enter E-mail Address"
+msgstr "Nhập địa chỉ E-mail"
+
+#: cps/templates/user_table.html:136
+msgid "Enter Kindle E-mail Address"
+msgstr "Nhập địa chỉ E-mail Kindle"
+
+#: cps/templates/user_table.html:136
+msgid "Kindle E-mail"
+msgstr "Kindle E-mail"
+
+#: cps/templates/user_table.html:137
+msgid "Locale"
+msgstr "Ngôn ngữ"
+
+#: cps/templates/user_table.html:138
+msgid "Visible Book Languages"
+msgstr "Những ngôn ngữ hiển thị cho sách"
+
+#: cps/templates/user_table.html:139
+msgid "Edit Allowed Tags"
+msgstr "Chỉnh sửa những tags đươc cho phép"
+
+#: cps/templates/user_table.html:139
+msgid "Allowed Tags"
+msgstr "Tags được cho phép"
+
+#: cps/templates/user_table.html:140
+msgid "Edit Denied Tags"
+msgstr "Chỉnh sửa những tags bị từ chối"
+
+#: cps/templates/user_table.html:140
+msgid "Denied Tags"
+msgstr "Tags bị từ chối"
+
+#: cps/templates/user_table.html:141
+msgid "Edit Allowed Column Values"
+msgstr "Chỉnh sửa những giá trị cột được cho phép"
+
+#: cps/templates/user_table.html:141
+msgid "Allowed Column Values"
+msgstr "Giá trị cột được cho phép"
+
+#: cps/templates/user_table.html:142
+msgid "Edit Denied Column Values"
+msgstr "Chỉnh sửa những cột giá trị bị từ chối"
+
+#: cps/templates/user_table.html:142
+msgid "Denied Column Values"
+msgstr "Những cột giá trị bị từ chối"
+
+#: cps/templates/user_table.html:144
+msgid "Change Password"
+msgstr "Đổi mật khẩu"
+
+#: cps/templates/user_table.html:147
+msgid "View"
+msgstr "Xem"
+
+#: cps/templates/user_table.html:150
+msgid "Edit Public Shelves"
+msgstr "Chỉnh sửa giá sách công khai"
+
+#: cps/templates/user_table.html:152
+msgid "Sync selected Shelves with Kobo"
+msgstr "Đồng bộ những giá sách đã chọn với Kobo"
+
+#: cps/templates/user_table.html:156
+msgid "Show read/unread selection"
+msgstr "Hiển thị đã đọc và chưa đọc"
+
+#: cps/templates/user_table.html:159
+msgid "Show random books"
+msgstr "Hiển thị sách ngẫu nhiên"

From 071d19b8b38974e4762285307f987d4657286bd9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 20 Sep 2022 19:10:45 +0200
Subject: [PATCH 331/412] Fix for #2537 (Impossible to set Denied Column Value
 from user table)

---
 cps/static/js/table.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 548ca8c4c..a758b892d 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -548,11 +548,11 @@ $(function() {
         },
     });
 
-    $("#user-table").on("click-cell.bs.table", function (field, value, row, $element) {
+    /*$("#user-table").on("click-cell.bs.table", function (field, value, row, $element) {
         if (value === "denied_column_value") {
             confirmDialog("btndeluser", "GeneralDeleteModal", $element.id, user_handle);
         }
-    });
+    });*/
 
     $("#user-table").on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table",
     function (e, rowsAfter, rowsBefore) {

From 04908e22fe1790ac704f7d60607bddd8b0a2f0a2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 23 Sep 2022 20:45:30 +0200
Subject: [PATCH 332/412] backup metadata 5th step

---
 cps/tasks/metadata_backup.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cps/tasks/metadata_backup.py b/cps/tasks/metadata_backup.py
index 3fcb58578..0bcdf6c1c 100644
--- a/cps/tasks/metadata_backup.py
+++ b/cps/tasks/metadata_backup.py
@@ -93,7 +93,8 @@ class TaskBackupMetadata(CalibreTask):
             self.calibre_db.session.close()
 
         except Exception as ex:
-            self.log.debug('Error creating metadata backup for book {}: '.format(book.id) + str(ex))
+            b = "NaN" if not hasattr(book, 'id') else book.id
+            self.log.debug('Error creating metadata backup for book {}: '.format(b) + str(ex))
             self._handleError('Error creating metadata backup: ' + str(ex))
             self.calibre_db.session.rollback()
             self.calibre_db.session.close()
@@ -191,9 +192,10 @@ class TaskBackupMetadata(CalibreTask):
             etree.SubElement(metadata, "meta", name="calibre:series",
                              content=str(str(b.name)),
                              nsmap=NSMAP)
-        etree.SubElement(metadata, "meta", name="calibre:series_index",
-                         content=str(book.series_index),
-                         nsmap=NSMAP)
+        if book.series:
+            etree.SubElement(metadata, "meta", name="calibre:series_index",
+                             content=str(book.series_index),
+                             nsmap=NSMAP)
         etree.SubElement(metadata, "meta", name="calibre:timestamp",
                          content='{d.year:04}-{d.month:02}-{d.day:02}T{d.hour:02}:{d.minute:02}:{d.second:02}'.format(
                              d=book.timestamp),

From 59a5ccd05cb9b0283a4a7ed687c5988b2294fd4e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 24 Sep 2022 06:46:24 +0200
Subject: [PATCH 333/412] Bugfixes after testrun

---
 cps/db.py                               |  16 +-
 cps/epub.py                             |  10 +-
 cps/schedule.py                         |   2 +-
 cps/ub.py                               |   1 +
 setup.cfg                               |   4 +-
 test/Calibre-Web TestSummary_Linux.html | 419 +++++++++++++-----------
 6 files changed, 242 insertions(+), 210 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index fbb458e61..aaedcd061 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -53,7 +53,7 @@ from weakref import WeakSet
 
 log = logger.create()
 
-cc_exceptions = ['composite']
+cc_exceptions = ['composite', 'series']
 cc_classes = {}
 
 Base = declarative_base()
@@ -472,7 +472,6 @@ class CalibreDB:
     # 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()
-    series = False
 
     def __init__(self, expire_on_commit=True, init=False):
         """ Initialize a new CalibreDB session
@@ -500,7 +499,6 @@ class CalibreDB:
         for row in cc:
             if row.datatype not in cc_exceptions:
                 if row.datatype == 'series':
-                    cls.series = True
                     dicttable = {'__tablename__': 'books_custom_column_' + str(row.id) + '_link',
                                  'id': Column(Integer, primary_key=True),
                                  'book': Column(Integer, ForeignKey('books.id'),
@@ -1029,14 +1027,10 @@ class CalibreDB:
                     Base.metadata.remove(table)
 
     def reconnect_db(self, config, app_db_path):
-        if self.series:
-            from . import isoLanguages, web_server
-            web_server.stop(True)
-        else:
-            self.dispose()
-            self.engine.dispose()
-            self.setup_db(config.config_calibre_dir, app_db_path)
-            self.update_config(config)
+        self.dispose()
+        self.engine.dispose()
+        self.setup_db(config.config_calibre_dir, app_db_path)
+        self.update_config(config)
 
 
 def lcase(s):
diff --git a/cps/epub.py b/cps/epub.py
index d358d0385..00ce907b8 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -102,11 +102,11 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     identifiers = []
     for node in p.xpath('dc:identifier', namespaces=ns):
-        identifier_name=node.attrib.values()[-1];
-        identifier_value=node.text;
-        if identifier_name in ('uuid','calibre'):
-            continue;
-        identifiers.append( [identifier_name, identifier_value] )
+        identifier_name = node.attrib.values()[-1]
+        identifier_value = node.text
+        if identifier_name in ('uuid', 'calibre') or identifier_value is None:
+            continue
+        identifiers.append([identifier_name, identifier_value])
 
     if not epub_metadata['title']:
         title = original_file_name
diff --git a/cps/schedule.py b/cps/schedule.py
index 44bb2c27c..5f3326ef4 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -33,7 +33,7 @@ def get_scheduled_tasks(reconnect=True):
         tasks.append([lambda: TaskReconnectDatabase(), 'reconnect', False])
 
     # ToDo make configurable. Generate metadata.opf file for each changed book
-    if True:
+    if False:
         tasks.append([lambda: TaskBackupMetadata("en"), 'backup metadata', False])
 
     # Generate all missing book cover thumbnails
diff --git a/cps/ub.py b/cps/ub.py
index 96e674d46..5dd7d6465 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -796,6 +796,7 @@ def create_anonymous_user(_session):
 def create_admin_user(_session):
     user = User()
     user.name = "admin"
+    user.email = "admin@example.org"
     user.role = constants.ADMIN_USER_ROLES
     user.sidebar_view = constants.ADMIN_USER_SIDEBAR
 
diff --git a/setup.cfg b/setup.cfg
index de4e47144..1c531d48e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -47,7 +47,7 @@ install_requires =
 	backports_abc>=0.4
 	Flask>=1.0.2,<2.1.0
 	iso-639>=0.4.5,<0.5.0
-	PyPDF3>=1.0.0,<1.0.7
+	PyPDF2>=1.20,<2.11.0
 	pytz>=2016.10
 	requests>=2.11.1,<2.28.0
 	SQLAlchemy>=1.3.0,<1.5.0
@@ -97,5 +97,5 @@ comics =
 	natsort>=2.2.0,<8.2.0
 	comicapi>=2.2.0,<2.3.0
 kobo = 
-	jsonschema>=3.2.0,<4.8.0
+	jsonschema>=3.2.0,<4.9.0
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 701e14310..3d9b593b0 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-07-29 22:16:18</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-09-24 21:26:53</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>2022-07-30 04:12:54</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-09-25 03:49:07</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>5h 1 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>5h 27 min</p>
         </div>
       </div>
       </div>
@@ -465,11 +465,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">13</td>
-        <td class="text-center">2</td>
+        <td class="text-center">15</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -506,31 +506,11 @@
     
     
     
-        <tr id="ft6.4" class="none bg-danger">
+        <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 260, in test_convert_failed_and_email
-    self.assertEqual(1, task_len)
-AssertionError: 1 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -544,32 +524,11 @@ AssertionError: 1 != 0</pre>
     
     
     
-        <tr id="ft6.6" class="none bg-danger">
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 622, in test_convert_options
-    self.assertEqual(from_book, set([&#39;-- select an option --&#39;, &#34;TXT&#34;]))
-AssertionError: Items in the first set but not the second:
-&#39;AZW3&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2153,11 +2112,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2167,11 +2126,31 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id="ft24.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft24.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 108, in test_author_page
+    self.assertFalse(self.check_element_on_page((By.CLASS_NAME, &#34;author-photo&#34;)))
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;2520e615-2568-4cc5-b588-44e563fa14a2&#34;, element=&#34;138199ad-2df2-4990-8382-172c41178915&#34;)&gt; is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3645,11 +3624,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -3668,29 +3647,89 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id="ft42.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft42.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 193, in test_cache_of_deleted_book
+    self.assertEqual(len(res), 1)
+AssertionError: 2 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id="ft42.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft42.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 80, in test_cover_cache_on_database_change
+    self.assertLessEqual(len(res), 1, res)
+AssertionError: 2 not less than or equal to 1 : [{&#39;user&#39;: &#39;System&#39;, &#39;task&#39;: &#39;Metadata backup: Backing up Metadata&#39;, &#39;result&#39;: &#39;Failed&#39;, &#39;progress&#39;: &#39;100 %&#39;, &#39;duration&#39;: &#39; 0s&#39;, &#39;start&#39;: &#39;9/25/22, 2:16 AM&#39;}, {&#39;user&#39;: &#39;System&#39;, &#39;task&#39;: &#39;Cover Thumbnails: Generated 222 cover thumbnails&#39;, &#39;result&#39;: &#39;Finished&#39;, &#39;progress&#39;: &#39;100 %&#39;, &#39;duration&#39;: &#39; 5s&#39;, &#39;start&#39;: &#39;9/25/22, 2:16 AM&#39;}]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id="ft42.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft42.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 123, in test_cover_change_on_upload_new_cover
+    self.assertLessEqual(len(res), 1)
+AssertionError: 2 not less than or equal to 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3704,11 +3743,31 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id="ft42.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft42.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 230, in test_cover_on_upload_book
+    self.assertLessEqual(len(res), 1)
+AssertionError: 2 not less than or equal to 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3722,101 +3781,26 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id="ft42.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="skipClass">
-        <td>TestUpdater</td>
-        <td class="text-center">9</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">
-            <a onclick="showClassDetail('c43', 9)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt43.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='pt43.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='pt43.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='pt43.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='pt43.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='pt43.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="st43.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_st43.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.8')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st43.7" class="popup_window test_output" style="display:none;">
+                <div id="div_ft42.8" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st43.7').style.display='none'"><span
+                                onclick="document.getElementById('div_ft42.8').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>
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 320, in test_sideloaded_book
+    self.assertGreaterEqual(diff(BytesIO(list_cover), BytesIO(new_list_cover), delete_diff_file=True), 0.04)
+AssertionError: 0.0 not greater than or equal to 0.04</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3825,21 +3809,52 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
         </tr>
     
     
+
+
+    <tr id="su" class="errorClass">
+        <td>_FailedTest</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('c43', 1)">Detail</a>
+        </td>
+    </tr>
+
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+    
+        <tr id="et43.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestUpdater - test_reconnect_database</div>
+                <div class='testcase'>_FailedTest - test_updater</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt43.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_update_write_protect</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et43.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et43.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et43.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_updater
+Traceback (most recent call last):
+  File &#34;/usr/lib/python3.10/unittest/loader.py&#34;, line 436, in _find_test_path
+    module = self._get_module_from_name(name)
+  File &#34;/usr/lib/python3.10/unittest/loader.py&#34;, line 377, in _get_module_from_name
+    __import__(name)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 20
+    p = None
+IndentationError: unexpected indent</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3896,11 +3911,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">17</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -4063,11 +4078,33 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id="ft45.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft45.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft45.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft45.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 556, in test_user_list_sort
+    self.assertEqual(&#34;+&#34;, ul[&#39;table&#39;][0][&#39;E-mail Address&#39;][&#39;text&#39;])
+AssertionError: &#39;+&#39; != &#39;1al@b.com&#39;
+- +
++ 1al@b.com</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4791,11 +4828,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>423</td>
-        <td>413</td>
-        <td>3</td>
-        <td>0</td>
-        <td>7</td>
+        <td>415</td>
+        <td>400</td>
+        <td>8</td>
+        <td>1</td>
+        <td>6</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4823,13 +4860,13 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.15.0-41-generic #44~20.04.1-Ubuntu SMP Fri Jun 24 13:27:29 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.15.0-48-generic #54-Ubuntu SMP Fri Aug 26 13:26:29 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Python</th>
-              <td>3.8.10</td>
+              <td>3.10.6</td>
               <td>Basic</td>
             </tr>
           
@@ -4895,7 +4932,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>greenlet</th>
-              <td>1.1.2</td>
+              <td>1.1.3</td>
               <td>Basic</td>
             </tr>
           
@@ -4924,14 +4961,14 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
             </tr>
           
             <tr>
-              <th>PyPDF3</th>
-              <td>1.0.6</td>
+              <th>PyPDF2</th>
+              <td>2.10.9</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>pytz</th>
-              <td>2022.1</td>
+              <td>2022.2.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4943,7 +4980,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.39</td>
+              <td>1.4.41</td>
               <td>Basic</td>
             </tr>
           
@@ -4961,7 +4998,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>Wand</th>
-              <td>0.6.8</td>
+              <td>0.6.10</td>
               <td>Basic</td>
             </tr>
           
@@ -4973,7 +5010,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.55.0</td>
+              <td>2.62.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5003,7 +5040,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.55.0</td>
+              <td>2.62.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5033,7 +5070,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.55.0</td>
+              <td>2.62.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5075,7 +5112,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.55.0</td>
+              <td>2.62.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5111,7 +5148,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.55.0</td>
+              <td>2.62.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5153,7 +5190,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.55.0</td>
+              <td>2.62.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5195,13 +5232,13 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.8.0</td>
+              <td>4.16.0</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.8.0</td>
+              <td>4.16.0</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -5213,19 +5250,19 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.8.0</td>
+              <td>4.16.0</td>
               <td>TestLdapLogin</td>
             </tr>
           
             <tr>
               <th>python-ldap</th>
-              <td>3.4.2</td>
+              <td>3.4.3</td>
               <td>TestLdapLogin</td>
             </tr>
           
             <tr>
               <th>Flask-Dance</th>
-              <td>6.0.0</td>
+              <td>6.1.1</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -5243,7 +5280,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 </div>
 
 <script>
-    drawCircle(413, 3, 0, 7);
+    drawCircle(400, 8, 1, 6);
     showCase(5);
 </script>
 

From e676e1685bb55db48f06f4f0963516731530cfee Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 25 Sep 2022 19:37:38 +0200
Subject: [PATCH 334/412] Handle None as identifier value during upload

---
 cps/epub.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cps/epub.py b/cps/epub.py
index d358d0385..00ce907b8 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -102,11 +102,11 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     identifiers = []
     for node in p.xpath('dc:identifier', namespaces=ns):
-        identifier_name=node.attrib.values()[-1];
-        identifier_value=node.text;
-        if identifier_name in ('uuid','calibre'):
-            continue;
-        identifiers.append( [identifier_name, identifier_value] )
+        identifier_name = node.attrib.values()[-1]
+        identifier_value = node.text
+        if identifier_name in ('uuid', 'calibre') or identifier_value is None:
+            continue
+        identifiers.append([identifier_name, identifier_value])
 
     if not epub_metadata['title']:
         title = original_file_name

From b898b37e29d3f5762b301bfdba1d23d5758ac86d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 19 Sep 2022 18:57:55 +0200
Subject: [PATCH 335/412] Fix for #2545 (Max task duration double entry
 "1hour")

---
 cps/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/admin.py b/cps/admin.py
index b70beab5a..89f72189f 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1310,7 +1310,7 @@ def edit_scheduledtasks():
         time_field.append((n, format_time(datetime_time(hour=n), format="short",)))
     for n in range(5, 65, 5):
         t = timedelta(hours=n // 60, minutes=n % 60)
-        duration_field.append((n, format_timedelta(t, threshold=.9)))
+        duration_field.append((n, format_timedelta(t, threshold=.97)))
 
     return render_title_template("schedule_edit.html",
                                  config=content,

From 67bc23ee0cbbbf4a6b0a9355a689d1961743e271 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 20 Sep 2022 19:10:45 +0200
Subject: [PATCH 336/412] Fix for #2537 (Impossible to set Denied Column Value
 from user table)

---
 cps/static/js/table.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 548ca8c4c..a758b892d 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -548,11 +548,11 @@ $(function() {
         },
     });
 
-    $("#user-table").on("click-cell.bs.table", function (field, value, row, $element) {
+    /*$("#user-table").on("click-cell.bs.table", function (field, value, row, $element) {
         if (value === "denied_column_value") {
             confirmDialog("btndeluser", "GeneralDeleteModal", $element.id, user_handle);
         }
-    });
+    });*/
 
     $("#user-table").on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table",
     function (e, rowsAfter, rowsBefore) {

From b4d9e400d99502acd430cee38ad26cf05320555a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 25 Sep 2022 19:37:38 +0200
Subject: [PATCH 337/412] Handle None as identifier value during upload

---
 cps/epub.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cps/epub.py b/cps/epub.py
index d358d0385..00ce907b8 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -102,11 +102,11 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     identifiers = []
     for node in p.xpath('dc:identifier', namespaces=ns):
-        identifier_name=node.attrib.values()[-1];
-        identifier_value=node.text;
-        if identifier_name in ('uuid','calibre'):
-            continue;
-        identifiers.append( [identifier_name, identifier_value] )
+        identifier_name = node.attrib.values()[-1]
+        identifier_value = node.text
+        if identifier_name in ('uuid', 'calibre') or identifier_value is None:
+            continue
+        identifiers.append([identifier_name, identifier_value])
 
     if not epub_metadata['title']:
         title = original_file_name

From 8421a017f43abe2ba448fb481929e7d2bf22da38 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 26 Sep 2022 16:54:15 +0200
Subject: [PATCH 338/412] Updated Test result

---
 test/Calibre-Web TestSummary_Linux.html | 354 ++++++++++--------------
 1 file changed, 148 insertions(+), 206 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 3d9b593b0..089dab8cc 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-09-24 21:26:53</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-09-25 22:15:18</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>2022-09-25 03:49:07</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-09-26 04:46:12</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>5h 27 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>5h 35 min</p>
         </div>
       </div>
       </div>
@@ -1651,12 +1651,12 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">17</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('c16', 18)">Detail</a>
@@ -1800,11 +1800,31 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id="et16.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.16').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 185, in test_edit_title
+    self.assertEqual(&#39;The camicdemo&#39;, books[1][8][&#39;title&#39;])
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2112,11 +2132,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestGoodreads</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2126,31 +2146,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 
     
     
-        <tr id="ft24.1" class="none bg-danger">
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft24.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 108, in test_author_page
-    self.assertFalse(self.check_element_on_page((By.CLASS_NAME, &#34;author-photo&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;2520e615-2568-4cc5-b588-44e563fa14a2&#34;, element=&#34;138199ad-2df2-4990-8382-172c41178915&#34;)&gt; is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3624,11 +3624,11 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">2</td>
-        <td class="text-center">5</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">
@@ -3647,89 +3647,29 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
     
     
-        <tr id="ft42.2" class="none bg-danger">
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft42.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 193, in test_cache_of_deleted_book
-    self.assertEqual(len(res), 1)
-AssertionError: 2 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft42.3" class="none bg-danger">
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft42.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 80, in test_cover_cache_on_database_change
-    self.assertLessEqual(len(res), 1, res)
-AssertionError: 2 not less than or equal to 1 : [{&#39;user&#39;: &#39;System&#39;, &#39;task&#39;: &#39;Metadata backup: Backing up Metadata&#39;, &#39;result&#39;: &#39;Failed&#39;, &#39;progress&#39;: &#39;100 %&#39;, &#39;duration&#39;: &#39; 0s&#39;, &#39;start&#39;: &#39;9/25/22, 2:16 AM&#39;}, {&#39;user&#39;: &#39;System&#39;, &#39;task&#39;: &#39;Cover Thumbnails: Generated 222 cover thumbnails&#39;, &#39;result&#39;: &#39;Finished&#39;, &#39;progress&#39;: &#39;100 %&#39;, &#39;duration&#39;: &#39; 5s&#39;, &#39;start&#39;: &#39;9/25/22, 2:16 AM&#39;}]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft42.4" class="none bg-danger">
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft42.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 123, in test_cover_change_on_upload_new_cover
-    self.assertLessEqual(len(res), 1)
-AssertionError: 2 not less than or equal to 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3743,31 +3683,11 @@ AssertionError: 2 not less than or equal to 1</pre>
     
     
     
-        <tr id="ft42.6" class="none bg-danger">
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft42.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 230, in test_cover_on_upload_book
-    self.assertLessEqual(len(res), 1)
-AssertionError: 2 not less than or equal to 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3781,26 +3701,101 @@ AssertionError: 2 not less than or equal to 1</pre>
     
     
     
-        <tr id="ft42.8" class="none bg-danger">
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestUpdater</td>
+        <td class="text-center">9</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">
+            <a onclick="showClassDetail('c43', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt43.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='pt43.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='pt43.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='pt43.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='pt43.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='pt43.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="st43.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_ft42.8')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st43.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft42.8" class="popup_window test_output" style="display:block;">
+                <div id="div_st43.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_ft42.8').style.display='none'"><span
+                                onclick="document.getElementById('div_st43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 320, in test_sideloaded_book
-    self.assertGreaterEqual(diff(BytesIO(list_cover), BytesIO(new_list_cover), delete_diff_file=True), 0.04)
-AssertionError: 0.0 not greater than or equal to 0.04</pre>
+                        <pre class="text-left">Takes too long</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3809,52 +3804,21 @@ AssertionError: 0.0 not greater than or equal to 0.04</pre>
         </tr>
     
     
-
-
-    <tr id="su" class="errorClass">
-        <td>_FailedTest</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('c43', 1)">Detail</a>
-        </td>
-    </tr>
-
     
-    
-        <tr id="et43.1" class="none bg-info">
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>_FailedTest - test_updater</div>
+                <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_et43.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et43.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et43.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_updater
-Traceback (most recent call last):
-  File &#34;/usr/lib/python3.10/unittest/loader.py&#34;, line 436, in _find_test_path
-    module = self._get_module_from_name(name)
-  File &#34;/usr/lib/python3.10/unittest/loader.py&#34;, line 377, in _get_module_from_name
-    __import__(name)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 20
-    p = None
-IndentationError: unexpected indent</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt43.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3911,11 +3875,11 @@ IndentationError: unexpected indent</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">17</td>
-        <td class="text-center">1</td>
+        <td class="text-center">18</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -4078,33 +4042,11 @@ IndentationError: unexpected indent</pre>
     
     
     
-        <tr id="ft45.18" class="none bg-danger">
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft45.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft45.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft45.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 556, in test_user_list_sort
-    self.assertEqual(&#34;+&#34;, ul[&#39;table&#39;][0][&#39;E-mail Address&#39;][&#39;text&#39;])
-AssertionError: &#39;+&#39; != &#39;1al@b.com&#39;
-- +
-+ 1al@b.com</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4828,11 +4770,11 @@ AssertionError: &#39;+&#39; != &#39;1al@b.com&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>415</td>
-        <td>400</td>
-        <td>8</td>
+        <td>423</td>
+        <td>414</td>
         <td>1</td>
-        <td>6</td>
+        <td>1</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -5280,7 +5222,7 @@ AssertionError: &#39;+&#39; != &#39;1al@b.com&#39;
 </div>
 
 <script>
-    drawCircle(400, 8, 1, 6);
+    drawCircle(414, 1, 1, 7);
     showCase(5);
 </script>
 

From 09e1ec3d083bceaaa55c245265dfb0c16dd652a3 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Wed, 28 Sep 2022 20:12:21 +0800
Subject: [PATCH 339/412] fix typo

---
 cps/admin.py                  | 2 +-
 cps/templates/book_table.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 6edc824d4..690c3c2ee 100755
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -166,7 +166,7 @@ def queue_metadata_backup():
     show_text = {}
     log.warning("Queuing all books for metadata backup")
     helper.set_all_metadata_dirty()
-    show_text['text'] = _(u'Books successfully queued fo Metadata Backup')
+    show_text['text'] = _(u'Books successfully queued for Metadata Backup')
     return json.dumps(show_text)
 
 
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index 9ba173bb9..518b32273 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -72,7 +72,7 @@
             {{ text_table_row('publishers', _('Enter Publishers'),_('Publishers'), false, true) }}
             <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
             {% if g.user.check_visibility(32768) %}
-                {{ book_checkbox_row('is_archived', _('Archiv Status'), false)}}
+                {{ book_checkbox_row('is_archived', _('Archive Status'), false)}}
             {%  endif %}
             {{ book_checkbox_row('read_status', _('Read Status'), false)}}
             {% for c in cc %}

From 4d61c5535e63cb83e4d7aabdf206b438d91db985 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Wed, 28 Sep 2022 20:14:58 +0800
Subject: [PATCH 340/412] Update Simplifield Chinese translation

---
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 53399 -> 53885 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 405 +++++++++---------
 messages.pot                                  | 404 ++++++++---------
 3 files changed, 424 insertions(+), 385 deletions(-)

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index b72a64b5dfdf3d02cdb20af0eede609f16be7bca..cb0b012aa5de538a801a543613c08b422c9a97e0 100644
GIT binary patch
delta 13169
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

delta 12767
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
Y++Vh+%FBsmi+ZfN6IV24ciGtg0XQrRoB#j-

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index ed478ad57..b9abae762 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-08-27 10:01+0200\n"
+"POT-Creation-Date: 2022-09-28 20:08+0800\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -38,456 +38,464 @@ msgstr "重新连接成功"
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:192 cps/editbooks.py:572 cps/editbooks.py:574
-#: cps/editbooks.py:610 cps/editbooks.py:627 cps/editbooks.py:1234
-#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
+#: cps/admin.py:169
+msgid "Books successfully queued for Metadata Backup"
+msgstr "书籍已为元数据备份排队"
+
+#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
+#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:217
+#: cps/admin.py:227
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/admin.py:237
+#: cps/admin.py:247
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:275
+#: cps/admin.py:285
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:309 cps/templates/admin.html:51
+#: cps/admin.py:319 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "管理用户"
 
-#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:380 cps/admin.py:1370
+#: cps/admin.py:390 cps/admin.py:1380
 msgid "User not found"
 msgstr "找不到用户"
 
-#: cps/admin.py:394
+#: cps/admin.py:404
 msgid "{} users deleted successfully"
 msgstr "成功删除 {} 个用户"
 
-#: cps/admin.py:417 cps/templates/config_view_edit.html:133
+#: cps/admin.py:427 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "显示全部"
 
-#: cps/admin.py:438 cps/admin.py:444
+#: cps/admin.py:448 cps/admin.py:454
 msgid "Malformed request"
 msgstr "格式错误的请求"
 
-#: cps/admin.py:456 cps/admin.py:1968
+#: cps/admin.py:466 cps/admin.py:1981
 msgid "Guest Name can't be changed"
 msgstr "访客名称无法更改"
 
-#: cps/admin.py:468
+#: cps/admin.py:478
 msgid "Guest can't have this role"
 msgstr "游客无法拥有此角色"
 
-#: cps/admin.py:480 cps/admin.py:1926
+#: cps/admin.py:490 cps/admin.py:1936
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
-#: cps/admin.py:484 cps/admin.py:498
+#: cps/admin.py:494 cps/admin.py:508
 msgid "Value has to be true or false"
 msgstr "值必须是 true 或 false"
 
-#: cps/admin.py:486
+#: cps/admin.py:496
 msgid "Invalid role"
 msgstr "无效角色"
 
-#: cps/admin.py:490
+#: cps/admin.py:500
 msgid "Guest can't have this view"
 msgstr "游客无法拥有此视图"
 
-#: cps/admin.py:500
+#: cps/admin.py:510
 msgid "Invalid view"
 msgstr "无效视图"
 
-#: cps/admin.py:503
+#: cps/admin.py:513
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "游客的本地化是自动侦测而无法设置的"
 
-#: cps/admin.py:507
+#: cps/admin.py:517
 msgid "No Valid Locale Given"
 msgstr "无可用本地化"
 
-#: cps/admin.py:518
+#: cps/admin.py:528
 msgid "No Valid Book Language Given"
 msgstr "无有效书籍语言"
 
-#: cps/admin.py:520 cps/editbooks.py:439
+#: cps/admin.py:530 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "参数未找到"
 
-#: cps/admin.py:557
+#: cps/admin.py:567
 msgid "Invalid Read Column"
 msgstr "无效的阅读列"
 
-#: cps/admin.py:563
+#: cps/admin.py:573
 msgid "Invalid Restricted Column"
 msgstr "无效的限制列"
 
-#: cps/admin.py:583 cps/admin.py:1797
+#: cps/admin.py:593 cps/admin.py:1807
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:595
+#: cps/admin.py:605
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "您确定删除Kobo Token吗？"
 
-#: cps/admin.py:597
+#: cps/admin.py:607
 msgid "Do you really want to delete this domain?"
 msgstr "您确定要删除此域吗？"
 
-#: cps/admin.py:599
+#: cps/admin.py:609
 msgid "Do you really want to delete this user?"
 msgstr "您确定要删除此用户吗？"
 
-#: cps/admin.py:601
+#: cps/admin.py:611
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您确定要删除此书架吗？"
 
-#: cps/admin.py:603
+#: cps/admin.py:613
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "您确定要修改选定用户的本地化设置吗？"
 
-#: cps/admin.py:605
+#: cps/admin.py:615
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "您确定要修改选定用户的可见书籍语言吗？"
 
-#: cps/admin.py:607
+#: cps/admin.py:617
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定角色吗？"
 
-#: cps/admin.py:609
+#: cps/admin.py:619
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定限制吗？"
 
-#: cps/admin.py:611
+#: cps/admin.py:621
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定可视化限制吗？"
 
-#: cps/admin.py:614
+#: cps/admin.py:624
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "您确定要更改所选用户的书架同步行为吗？"
 
-#: cps/admin.py:616
+#: cps/admin.py:626
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "您确定要更改 Calibre 库位置吗？"
 
-#: cps/admin.py:618
+#: cps/admin.py:628
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr "Calibre-Web 将搜索更新封面，并更新缩略图，这可能需要一段时间"
 
-#: cps/admin.py:621
+#: cps/admin.py:631
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "您确定要删除 Calibre-Web 的同步数据库以强制与您的 Kobo Reader 进行完全同步吗"
 
-#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
+#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒绝"
 
-#: cps/admin.py:866 cps/admin.py:872 cps/admin.py:882 cps/admin.py:892
+#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允许"
 
-#: cps/admin.py:907
+#: cps/admin.py:917
 msgid "{} sync entries deleted"
 msgstr "{} 同步项目被删除"
 
-#: cps/admin.py:955
+#: cps/admin.py:965
 msgid "Tag not found"
 msgstr "标签未找到"
 
-#: cps/admin.py:967
+#: cps/admin.py:977
 msgid "Invalid Action"
 msgstr "无效的动作"
 
-#: cps/admin.py:1082
+#: cps/admin.py:1092
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1133
+#: cps/admin.py:1143
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:1163
+#: cps/admin.py:1173
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:1169
+#: cps/admin.py:1179
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "请输入一个LDAP服务账号和密码 "
 
-#: cps/admin.py:1172
+#: cps/admin.py:1182
 msgid "Please Enter a LDAP Service Account"
 msgstr "请输入一个LDAP服务账号"
 
-#: cps/admin.py:1177
+#: cps/admin.py:1187
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1189
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:1183
+#: cps/admin.py:1193
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1185
+#: cps/admin.py:1195
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:1192
+#: cps/admin.py:1202
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成员用户过滤器需要有一个“%s”格式标识符"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1204
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成员用户过滤器中有不匹配的括号"
 
-#: cps/admin.py:1201
+#: cps/admin.py:1211
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1232 cps/admin.py:1858
+#: cps/admin.py:1242 cps/admin.py:1868
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:1241 cps/templates/admin.html:100
+#: cps/admin.py:1251 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:1260
+#: cps/admin.py:1270
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail账号校验成功"
 
-#: cps/admin.py:1279 cps/admin.py:1282 cps/admin.py:1663 cps/admin.py:1781
-#: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
-#: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
+#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
+#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/admin.py:1289
+#: cps/admin.py:1299
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
 
-#: cps/admin.py:1292
+#: cps/admin.py:1302
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:1294
+#: cps/admin.py:1304
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:1296
+#: cps/admin.py:1306
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:1319 cps/templates/admin.html:191
+#: cps/admin.py:1329 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr "编辑计划任务设置"
 
-#: cps/admin.py:1331
+#: cps/admin.py:1341
 msgid "Invalid start time for task specified"
 msgstr "指定任务的开始时间无效"
 
-#: cps/admin.py:1336
+#: cps/admin.py:1346
 msgid "Invalid duration for task specified"
 msgstr "指定任务的持续时间无效"
 
-#: cps/admin.py:1345
+#: cps/admin.py:1355
 msgid "Scheduled tasks settings updated"
 msgstr "已更新计划任务设置"
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
 #: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1359
+#: cps/admin.py:1369
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写"
 
-#: cps/admin.py:1389 cps/admin.py:1984
+#: cps/admin.py:1399 cps/admin.py:1997
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:1401
+#: cps/admin.py:1411
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1407 cps/web.py:1197
+#: cps/admin.py:1417 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1418
+#: cps/admin.py:1428
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1484
+#: cps/admin.py:1494
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1485
+#: cps/admin.py:1495
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1486
+#: cps/admin.py:1496
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1487
+#: cps/admin.py:1497
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1488
+#: cps/admin.py:1498
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1489
+#: cps/admin.py:1499
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1490
+#: cps/admin.py:1500
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1491 cps/admin.py:1492 cps/admin.py:1493 cps/admin.py:1494
-#: cps/admin.py:1495 cps/admin.py:1496
+#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
+#: cps/admin.py:1505 cps/admin.py:1506
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1491 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1492 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1493 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1494 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1505
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件无法保存在临时目录中"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1506
 msgid "Files could not be replaced during update"
 msgstr "更新期间无法替换文件"
 
-#: cps/admin.py:1520
+#: cps/admin.py:1530
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一个LDAP用户"
 
-#: cps/admin.py:1565
+#: cps/admin.py:1575
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能创建至少一个LDAP用户"
 
-#: cps/admin.py:1578
+#: cps/admin.py:1588
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "错误：%(ldaperror)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1592
 msgid "Error: No user returned in response of LDAP server"
 msgstr "错误：在LDAP服务器的响应中没有返回用户"
 
-#: cps/admin.py:1615
+#: cps/admin.py:1625
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "数据库中没有找到至少一个LDAP用户"
 
-#: cps/admin.py:1617
+#: cps/admin.py:1627
 msgid "{} User Successfully Imported"
 msgstr "{} 用户被成功导入"
 
-#: cps/admin.py:1675
+#: cps/admin.py:1685
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "数据库路径无效，请输入正确的路径"
 
-#: cps/admin.py:1695
+#: cps/admin.py:1705
 msgid "DB is not Writeable"
 msgstr "数据库不可写入"
 
-#: cps/admin.py:1708
+#: cps/admin.py:1718
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密钥文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1722
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1820
+#: cps/admin.py:1830
 msgid "Database Settings updated"
 msgstr "数据库设置已更新"
 
-#: cps/admin.py:1828
+#: cps/admin.py:1838
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1844 cps/web.py:1232
+#: cps/admin.py:1854 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
-#: cps/admin.py:1852
+#: cps/admin.py:1862
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
-#: cps/admin.py:1869
+#: cps/admin.py:1879
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户“%(user)s”已创建"
 
-#: cps/admin.py:1875
+#: cps/admin.py:1885
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此邮箱或用户名的账号已经存在。"
 
-#: cps/admin.py:1905
+#: cps/admin.py:1915
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户“%(nick)s”已删除"
 
-#: cps/admin.py:1907 cps/admin.py:1908
+#: cps/admin.py:1917 cps/admin.py:1918
 msgid "Can't delete Guest User"
 msgstr "无法删除游客用户"
 
-#: cps/admin.py:1911
+#: cps/admin.py:1921
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:1988
+#: cps/admin.py:1975 cps/web.py:1369
+msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgstr "电子邮件地址不能为空，并且必须是有效的电子邮件"
+
+#: cps/admin.py:2001
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
@@ -500,122 +508,122 @@ msgstr "未安装"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:679 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/db.py:922 cps/templates/config_edit.html:204
+#: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
 #: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr "无"
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
-#: cps/web.py:1499 cps/web.py:1544
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
+#: cps/web.py:1502 cps/web.py:1547
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/editbooks.py:154 cps/editbooks.py:1217
+#: cps/editbooks.py:154 cps/editbooks.py:1221
 msgid "User has no rights to upload cover"
 msgstr "用户没有权限上传封面"
 
-#: cps/editbooks.py:174 cps/editbooks.py:712
+#: cps/editbooks.py:174 cps/editbooks.py:716
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:215
+#: cps/editbooks.py:216
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:233
+#: cps/editbooks.py:234
 msgid "Error editing book: {}"
 msgstr "编辑书籍时出错: {}"
 
-#: cps/editbooks.py:288
+#: cps/editbooks.py:291
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:315
+#: cps/editbooks.py:318
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:323
+#: cps/editbooks.py:326
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:327
+#: cps/editbooks.py:330
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
 
-#: cps/editbooks.py:631
+#: cps/editbooks.py:635
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:686 cps/editbooks.py:1011
+#: cps/editbooks.py:690 cps/editbooks.py:1015
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "'%(langname)s' 不是一种有效语言"
 
-#: cps/editbooks.py:724 cps/editbooks.py:1158
+#: cps/editbooks.py:728 cps/editbooks.py:1162
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
 
-#: cps/editbooks.py:728 cps/editbooks.py:1162
+#: cps/editbooks.py:732 cps/editbooks.py:1166
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须具有扩展名"
 
-#: cps/editbooks.py:736
+#: cps/editbooks.py:740
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:756
+#: cps/editbooks.py:760
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:813 cps/editbooks.py:815
+#: cps/editbooks.py:817 cps/editbooks.py:819
 msgid "Book Format Successfully Deleted"
 msgstr "书籍格式已成功删除"
 
-#: cps/editbooks.py:822 cps/editbooks.py:824
+#: cps/editbooks.py:826 cps/editbooks.py:828
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:876
+#: cps/editbooks.py:880
 msgid "You are missing permissions to delete books"
 msgstr "您没有删除书籍的权限"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:930
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/editbooks.py:975
+#: cps/editbooks.py:979
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
 
-#: cps/editbooks.py:1153
+#: cps/editbooks.py:1157
 msgid "User has no rights to upload additional file formats"
 msgstr "用户没有权限上传其他文件格式"
 
-#: cps/editbooks.py:1174
+#: cps/editbooks.py:1178
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/editbooks.py:1179
+#: cps/editbooks.py:1183
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:1202
+#: cps/editbooks.py:1206
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
@@ -628,166 +636,173 @@ msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/helper.py:79
+#: 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:86 cps/tasks/convert.py:75
+#: cps/helper.py:87 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:92
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:225 cps/templates/detail.html:42
+#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
 #: cps/templates/detail.html:46
 msgid "Send to E-Reader"
 msgstr "发送到电子阅读器"
 
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:227
+#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "此邮件已经通过Calibre-Web发送。"
 
-#: cps/helper.py:113
+#: cps/helper.py:114
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web测试邮件"
 
-#: cps/helper.py:114
+#: cps/helper.py:115
 msgid "Test e-mail"
 msgstr "测试邮件"
 
-#: cps/helper.py:131
+#: cps/helper.py:132
 msgid "Get Started with Calibre-Web"
 msgstr "开启Calibre-Web之旅"
 
-#: cps/helper.py:136
+#: cps/helper.py:137
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
-#: cps/helper.py:147 cps/helper.py:153
+#: cps/helper.py:148 cps/helper.py:154
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to E-Reader"
 msgstr "转换 %(orig)s 到 %(format)s 并发送到电子阅读器"
 
-#: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180 cps/helper.py:184
+#: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, python-format
 msgid "Send %(format)s to E-Reader"
 msgstr "发送 %(format)s 到电子阅读器"
 
-#: cps/helper.py:224 cps/tasks/convert.py:92
+#: cps/helper.py:225 cps/tasks/convert.py:92
 #, python-format
 msgid "%(book)s send to E-Reader"
 msgstr "%(book)s发送到电子阅读器"
 
-#: cps/helper.py:229
+#: cps/helper.py:230
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取请求的文件。可能有错误的权限设置？"
 
-#: cps/helper.py:344
+#: cps/helper.py:345
 msgid "Read status could not set: {}"
 msgstr "阅读状态无法设置: {}"
 
-#: cps/helper.py:367
+#: cps/helper.py:368
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
 
-#: cps/helper.py:373
+#: cps/helper.py:374
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "删除书籍 %(id)s失败：%(message)s"
 
-#: cps/helper.py:384
+#: cps/helper.py:385
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "仅从数据库中删除书籍 %(id)s，数据库中的书籍路径无效： %(path)s"
 
-#: cps/helper.py:449
+#: cps/helper.py:450
 #, 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:521 cps/helper.py:530
+#: cps/helper.py:522 cps/helper.py:531
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:564
+#: cps/helper.py:565
 #, 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:584
+#: cps/helper.py:585
 msgid "Error in rename file in path: {}"
 msgstr "重命名此路径: {}文件时出错"
 
-#: cps/helper.py:602
+#: cps/helper.py:603
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:643 cps/web.py:1411
+#: cps/helper.py:644 cps/web.py:1414
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
-#: cps/helper.py:651
+#: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/helper.py:661
+#: cps/helper.py:664
 msgid "Invalid e-mail address format"
 msgstr "无效的邮件地址格式"
 
-#: cps/helper.py:811
+#: cps/helper.py:815
 msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr "上传封面需要的Python模块'advocate'未安装"
 
-#: cps/helper.py:821
+#: cps/helper.py:825
 msgid "Error Downloading Cover"
 msgstr "下载封面时出错"
 
-#: cps/helper.py:824
+#: cps/helper.py:828
 msgid "Cover Format Error"
 msgstr "封面格式出错"
 
-#: cps/helper.py:827
+#: cps/helper.py:831
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr "您没有访问本地主机或本地网络进行封面上传"
 
-#: cps/helper.py:837
+#: cps/helper.py:841
 msgid "Failed to create path for cover"
 msgstr "创建封面路径失败"
 
-#: cps/helper.py:853
+#: cps/helper.py:857
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的图片文件，或者无法存储"
 
-#: cps/helper.py:864
+#: cps/helper.py:868
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件"
 
-#: cps/helper.py:876
+#: cps/helper.py:880
 msgid "Invalid cover file content"
 msgstr "封面文件内容无效"
 
-#: cps/helper.py:880
+#: cps/helper.py:884
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:932
+#: cps/helper.py:936
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:943
-#, fuzzy
+#: cps/helper.py:947
 msgid "Error executing UnRar"
 msgstr "执行UnRar时出错"
 
+#: cps/helper.py:1040
+msgid "Cover"
+msgstr "封面"
+
+#: cps/helper.py:1042 cps/templates/admin.html:211
+msgid "Queue all books for metadata backup"
+msgstr "将所有书籍排队以进行元数据备份"
+
 #: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr "请不要使用localhost访问Calibre-Web，以便Kobo设备能获取有效的api_endpoint"
@@ -1357,12 +1372,12 @@ msgstr "请输入有效的用户名进行密码重置"
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1391 cps/web.py:1440
+#: cps/web.py:1394 cps/web.py:1443
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1407
+#: cps/web.py:1410
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1416,6 +1431,10 @@ msgstr "正在重新连接到Calibre数据库"
 msgid "E-mail"
 msgstr "电子邮件"
 
+#: cps/tasks/metadata_backup.py:47
+msgid "Backing up Metadata"
+msgstr "正在备份元数据"
+
 #: cps/tasks/thumbnail.py:95
 #, python-format
 msgid "Generated %(count)s cover thumbnails"
@@ -1647,40 +1666,40 @@ msgstr "重启"
 msgid "Shutdown"
 msgstr "停止"
 
-#: cps/templates/admin.html:213
+#: cps/templates/admin.html:216
 msgid "Version Information"
 msgstr "版本信息"
 
-#: cps/templates/admin.html:217
+#: cps/templates/admin.html:220
 msgid "Version"
 msgstr "版本"
 
-#: cps/templates/admin.html:218
+#: cps/templates/admin.html:221
 msgid "Details"
 msgstr "详情"
 
-#: cps/templates/admin.html:224
+#: cps/templates/admin.html:227
 msgid "Current version"
 msgstr "当前版本"
 
-#: cps/templates/admin.html:231
+#: cps/templates/admin.html:234
 msgid "Check for Update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:232
+#: cps/templates/admin.html:235
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:245
+#: cps/templates/admin.html:248
 msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
-#: cps/templates/admin.html:250 cps/templates/admin.html:264
-#: cps/templates/admin.html:284 cps/templates/config_db.html:70
+#: cps/templates/admin.html:253 cps/templates/admin.html:267
+#: cps/templates/admin.html:287 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "确定"
 
-#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/admin.html:254 cps/templates/admin.html:268
 #: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
@@ -1691,11 +1710,11 @@ msgstr "确定"
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:263
+#: cps/templates/admin.html:266
 msgid "Are you sure you want to shutdown?"
 msgstr "您确定要关闭吗？"
 
-#: cps/templates/admin.html:275
+#: cps/templates/admin.html:278
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -1997,7 +2016,7 @@ msgid "Comments"
 msgstr "简介"
 
 #: cps/templates/book_table.html:75
-msgid "Archiv Status"
+msgid "Archive Status"
 msgstr "存档状态"
 
 #: cps/templates/book_table.html:77 cps/templates/search_form.html:42
diff --git a/messages.pot b/messages.pot
index 789c4c535..03227002a 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-08-27 10:01+0200\n"
+"POT-Creation-Date: 2022-09-28 20:08+0800\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"
@@ -37,456 +37,464 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:192 cps/editbooks.py:572 cps/editbooks.py:574
-#: cps/editbooks.py:610 cps/editbooks.py:627 cps/editbooks.py:1234
-#: cps/updater.py:613 cps/uploader.py:87 cps/uploader.py:97
+#: cps/admin.py:169
+msgid "Books successfully queued for Metadata Backup"
+msgstr ""
+
+#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
+#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr ""
 
-#: cps/admin.py:217
+#: cps/admin.py:227
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:237
+#: cps/admin.py:247
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:275
+#: cps/admin.py:285
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:309 cps/templates/admin.html:51
+#: cps/admin.py:319 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr ""
 
-#: cps/admin.py:353 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:380 cps/admin.py:1370
+#: cps/admin.py:390 cps/admin.py:1380
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:394
+#: cps/admin.py:404
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:417 cps/templates/config_view_edit.html:133
+#: cps/admin.py:427 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
 
-#: cps/admin.py:438 cps/admin.py:444
+#: cps/admin.py:448 cps/admin.py:454
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:456 cps/admin.py:1968
+#: cps/admin.py:466 cps/admin.py:1981
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:468
+#: cps/admin.py:478
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:480 cps/admin.py:1926
+#: cps/admin.py:490 cps/admin.py:1936
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:484 cps/admin.py:498
+#: cps/admin.py:494 cps/admin.py:508
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:486
+#: cps/admin.py:496
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:490
+#: cps/admin.py:500
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:500
+#: cps/admin.py:510
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:503
+#: cps/admin.py:513
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:507
+#: cps/admin.py:517
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:518
+#: cps/admin.py:528
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:520 cps/editbooks.py:439
+#: cps/admin.py:530 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:557
+#: cps/admin.py:567
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:563
+#: cps/admin.py:573
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:583 cps/admin.py:1797
+#: cps/admin.py:593 cps/admin.py:1807
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:595
+#: cps/admin.py:605
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:607
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:599
+#: cps/admin.py:609
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:611
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:613
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:615
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:617
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:619
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:621
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:614
+#: cps/admin.py:624
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:616
+#: cps/admin.py:626
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:618
+#: cps/admin.py:628
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:621
+#: cps/admin.py:631
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
+#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:866 cps/admin.py:872 cps/admin.py:882 cps/admin.py:892
+#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:907
+#: cps/admin.py:917
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:955
+#: cps/admin.py:965
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:967
+#: cps/admin.py:977
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1082
+#: cps/admin.py:1092
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1127
+#: cps/admin.py:1137
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1133
+#: cps/admin.py:1143
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1163
+#: cps/admin.py:1173
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1169
+#: cps/admin.py:1179
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1172
+#: cps/admin.py:1182
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1177
+#: cps/admin.py:1187
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1179
+#: cps/admin.py:1189
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1183
+#: cps/admin.py:1193
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1185
+#: cps/admin.py:1195
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1192
+#: cps/admin.py:1202
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1194
+#: cps/admin.py:1204
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1201
+#: cps/admin.py:1211
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1232 cps/admin.py:1858
+#: cps/admin.py:1242 cps/admin.py:1868
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:1241 cps/templates/admin.html:100
+#: cps/admin.py:1251 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1260
+#: cps/admin.py:1270
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1279 cps/admin.py:1282 cps/admin.py:1663 cps/admin.py:1781
-#: cps/admin.py:1879 cps/admin.py:1996 cps/editbooks.py:228
-#: cps/editbooks.py:302 cps/editbooks.py:1197 cps/shelf.py:82 cps/shelf.py:142
+#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
+#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1416
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1289
+#: cps/admin.py:1299
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1292
+#: cps/admin.py:1302
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1294
+#: cps/admin.py:1304
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1296
+#: cps/admin.py:1306
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1319 cps/templates/admin.html:191
+#: cps/admin.py:1329 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1331
+#: cps/admin.py:1341
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1336
+#: cps/admin.py:1346
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1345
+#: cps/admin.py:1355
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
+#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
 #: cps/web.py:1318
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1359
+#: cps/admin.py:1369
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1389 cps/admin.py:1984
+#: cps/admin.py:1399 cps/admin.py:1997
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:1401
+#: cps/admin.py:1411
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1407 cps/web.py:1197
+#: cps/admin.py:1417 cps/web.py:1197
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1418
+#: cps/admin.py:1428
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1484
+#: cps/admin.py:1494
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1485
+#: cps/admin.py:1495
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1486
+#: cps/admin.py:1496
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1487
+#: cps/admin.py:1497
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1488
+#: cps/admin.py:1498
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1489
+#: cps/admin.py:1499
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1490
+#: cps/admin.py:1500
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1491 cps/admin.py:1492 cps/admin.py:1493 cps/admin.py:1494
-#: cps/admin.py:1495 cps/admin.py:1496
+#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
+#: cps/admin.py:1505 cps/admin.py:1506
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1491 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1492 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1493 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1494 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1495
+#: cps/admin.py:1505
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1496
+#: cps/admin.py:1506
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1520
+#: cps/admin.py:1530
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1565
+#: cps/admin.py:1575
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1578
+#: cps/admin.py:1588
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1582
+#: cps/admin.py:1592
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1615
+#: cps/admin.py:1625
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1617
+#: cps/admin.py:1627
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1675
+#: cps/admin.py:1685
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1695
+#: cps/admin.py:1705
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1708
+#: cps/admin.py:1718
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1712
+#: cps/admin.py:1722
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1820
+#: cps/admin.py:1830
 msgid "Database Settings updated"
 msgstr ""
 
-#: cps/admin.py:1828
+#: cps/admin.py:1838
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1844 cps/web.py:1232
+#: cps/admin.py:1854 cps/web.py:1232
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:1852
+#: cps/admin.py:1862
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1869
+#: cps/admin.py:1879
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:1875
+#: cps/admin.py:1885
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1905
+#: cps/admin.py:1915
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:1907 cps/admin.py:1908
+#: cps/admin.py:1917 cps/admin.py:1918
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1911
+#: cps/admin.py:1921
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1988
+#: cps/admin.py:1975 cps/web.py:1369
+msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgstr ""
+
+#: cps/admin.py:2001
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
@@ -499,122 +507,122 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:679 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:722
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
-#: cps/db.py:922 cps/templates/config_edit.html:204
+#: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
 #: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
 msgid "None"
 msgstr ""
 
-#: cps/editbooks.py:110 cps/editbooks.py:891 cps/web.py:516 cps/web.py:1457
-#: cps/web.py:1499 cps/web.py:1544
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
+#: cps/web.py:1502 cps/web.py:1547
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:154 cps/editbooks.py:1217
+#: cps/editbooks.py:154 cps/editbooks.py:1221
 msgid "User has no rights to upload cover"
 msgstr ""
 
-#: cps/editbooks.py:174 cps/editbooks.py:712
+#: cps/editbooks.py:174 cps/editbooks.py:716
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:215
+#: cps/editbooks.py:216
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:233
+#: cps/editbooks.py:234
 msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:288
+#: cps/editbooks.py:291
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:315
+#: cps/editbooks.py:318
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:323
+#: cps/editbooks.py:326
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:327
+#: cps/editbooks.py:330
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/editbooks.py:631
+#: cps/editbooks.py:635
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:686 cps/editbooks.py:1011
+#: cps/editbooks.py:690 cps/editbooks.py:1015
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:724 cps/editbooks.py:1158
+#: cps/editbooks.py:728 cps/editbooks.py:1162
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:728 cps/editbooks.py:1162
+#: cps/editbooks.py:732 cps/editbooks.py:1166
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:736
+#: cps/editbooks.py:740
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:756
+#: cps/editbooks.py:760
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:813 cps/editbooks.py:815
+#: cps/editbooks.py:817 cps/editbooks.py:819
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:822 cps/editbooks.py:824
+#: cps/editbooks.py:826 cps/editbooks.py:828
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:876
+#: cps/editbooks.py:880
 msgid "You are missing permissions to delete books"
 msgstr ""
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:930
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:975
+#: cps/editbooks.py:979
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:1153
+#: cps/editbooks.py:1157
 msgid "User has no rights to upload additional file formats"
 msgstr ""
 
-#: cps/editbooks.py:1174
+#: cps/editbooks.py:1178
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:1179
+#: cps/editbooks.py:1183
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:1202
+#: cps/editbooks.py:1206
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
@@ -627,165 +635,173 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:79
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:86 cps/tasks/convert.py:75
+#: cps/helper.py:87 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:91
+#: cps/helper.py:92
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:225 cps/templates/detail.html:42
+#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
 #: cps/templates/detail.html:46
 msgid "Send to E-Reader"
 msgstr ""
 
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:227
+#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:114
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:114
+#: cps/helper.py:115
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:131
+#: cps/helper.py:132
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:136
+#: cps/helper.py:137
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:147 cps/helper.py:153
+#: cps/helper.py:148 cps/helper.py:154
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to E-Reader"
 msgstr ""
 
-#: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180 cps/helper.py:184
+#: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, python-format
 msgid "Send %(format)s to E-Reader"
 msgstr ""
 
-#: cps/helper.py:224 cps/tasks/convert.py:92
+#: cps/helper.py:225 cps/tasks/convert.py:92
 #, python-format
 msgid "%(book)s send to E-Reader"
 msgstr ""
 
-#: cps/helper.py:229
+#: cps/helper.py:230
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:344
+#: cps/helper.py:345
 msgid "Read status could not set: {}"
 msgstr ""
 
-#: cps/helper.py:367
+#: cps/helper.py:368
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:373
+#: cps/helper.py:374
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:385
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:449
+#: cps/helper.py:450
 #, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:521 cps/helper.py:530
+#: cps/helper.py:522 cps/helper.py:531
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:564
+#: cps/helper.py:565
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:585
 msgid "Error in rename file in path: {}"
 msgstr ""
 
-#: cps/helper.py:602
+#: cps/helper.py:603
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:643 cps/web.py:1411
+#: cps/helper.py:644 cps/web.py:1414
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:652
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:661
+#: cps/helper.py:664
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:811
+#: cps/helper.py:815
 msgid "Python module 'advocate' is not installed but is needed for cover uploads"
 msgstr ""
 
-#: cps/helper.py:821
+#: cps/helper.py:825
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:824
+#: cps/helper.py:828
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:827
+#: cps/helper.py:831
 msgid "You are not allowed to access localhost or the local network for cover uploads"
 msgstr ""
 
-#: cps/helper.py:837
+#: cps/helper.py:841
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:853
+#: cps/helper.py:857
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:864
+#: cps/helper.py:868
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:876
+#: cps/helper.py:880
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:880
+#: cps/helper.py:884
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:932
+#: cps/helper.py:936
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:943
+#: cps/helper.py:947
 msgid "Error executing UnRar"
 msgstr ""
 
+#: cps/helper.py:1040
+msgid "Cover"
+msgstr ""
+
+#: cps/helper.py:1042 cps/templates/admin.html:211
+msgid "Queue all books for metadata backup"
+msgstr ""
+
 #: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
@@ -1355,12 +1371,12 @@ msgstr ""
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1391 cps/web.py:1440
+#: cps/web.py:1394 cps/web.py:1443
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1407
+#: cps/web.py:1410
 msgid "Profile updated"
 msgstr ""
 
@@ -1414,6 +1430,10 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
+#: cps/tasks/metadata_backup.py:47
+msgid "Backing up Metadata"
+msgstr ""
+
 #: cps/tasks/thumbnail.py:95
 #, python-format
 msgid "Generated %(count)s cover thumbnails"
@@ -1645,40 +1665,40 @@ msgstr ""
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:213
+#: cps/templates/admin.html:216
 msgid "Version Information"
 msgstr ""
 
-#: cps/templates/admin.html:217
+#: cps/templates/admin.html:220
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:218
+#: cps/templates/admin.html:221
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:224
+#: cps/templates/admin.html:227
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:231
+#: cps/templates/admin.html:234
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:232
+#: cps/templates/admin.html:235
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:245
+#: cps/templates/admin.html:248
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:250 cps/templates/admin.html:264
-#: cps/templates/admin.html:284 cps/templates/config_db.html:70
+#: cps/templates/admin.html:253 cps/templates/admin.html:267
+#: cps/templates/admin.html:287 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:251 cps/templates/admin.html:265
+#: cps/templates/admin.html:254 cps/templates/admin.html:268
 #: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
@@ -1689,11 +1709,11 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:263
+#: cps/templates/admin.html:266
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:275
+#: cps/templates/admin.html:278
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1995,7 +2015,7 @@ msgid "Comments"
 msgstr ""
 
 #: cps/templates/book_table.html:75
-msgid "Archiv Status"
+msgid "Archive Status"
 msgstr ""
 
 #: cps/templates/book_table.html:77 cps/templates/search_form.html:42

From 7339c804a378e9686d359cbd14567ddb4602fc95 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Thu, 29 Sep 2022 13:18:21 +0800
Subject: [PATCH 341/412] fix typo

---
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 53885 -> 53891 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index cb0b012aa5de538a801a543613c08b422c9a97e0..0e28b0c53e5469579c0402249409f19ca25df564 100644
GIT binary patch
delta 2756
zcmXZcZ%md|7{~E5A7w)&^eGY({DTtUR3uGB`=j(CmaCApP?~czb4wb$0JU1{#!1ao
zBxY%5(a1EWg~5Y}2`Zu{nub_vy}>yID;KWmnw8Y|=eb^e&UM}Aoa;L0zMtpr7ol~#
zLf;He2{N5?brI*{@H$S%0i1{Fjn2hmA%?IVHE%r*!)lDeJva{QEk2Kvi7%t}3+;C<
z6=$O2rMM6`?{|Tl%itGF#5FlLoVWmEu?VB_ZB(K4n1q!$9vg51UO=t8jVU<jfO9(7
zWK?6zF%8QxAL}e1-5mH0(whCr7UEPU6rfICi7HTQp2o4nH&6`?JLnq>n+d4KA4WZ&
zg=*|^R3pz=ywY3~*r433LTylO*5Uochs`e3jr8IJc+=t`-}*waIFoz=>L80OAD|lA
zgj%=73~Fsct9cqnG2xQM{iuciS{yp$;}NKnjWQ?UXyOcu7h(eOVvNI8s2kXbVcd(%
z58Pn}$s{hLu66*&U}B3el!>~L`S=j#;6yA$eN2@&1COF^<`$~40lfE$TK)PkE+U^~
zmSULt?j!?s_%o_d|Gfv!{fF8heAwqlqY9*<3e3QGoR2!u64d<HP&ZM6npa`@k1eh-
z>m>EvAqFvc%Djj}iF?d`RN=o-Cmwvn`zUJN3cL?XQ4Op^eY6`a{t9)lh}n)h@C6L?
z;8zCf^bYFkqmKH5NvI8{;Jp)@^HJ-b#gVuaHLn<F;cD}1oJ8DXMz{HWr=jw5+PHsR
z;ZhR%!&r^lsK%^C72apIpyqd=uKX&hk=r;2haB_q6Q}~uq4q05t$P#Ga0_aE>#@Lp
zRGlRBas7_Eny7YvvIJBE(@-1D!v`_T@=H(~tw7z}8>m7bTE5O~v*$nB^P85B4vzZ`
z63lee23Z!rgleeB;&OAFxd-*JwOV}1{0-IkT~y;kPk2XSCUHFK{~^d_ppU8y_3r9%
z5?(iBPWt!}GY@s*w@{5$qE5aG$6_1m09VXAmJfgDpJ!l*=Q%h*zyB8)=<8mM>bMM}
zu)^XG?0Jpl_gcOI)xZ%{!JkkK{DFGMF{k`1osAT7xv2e1QT5hhtbYF+8K~e6oA9~0
z&uqbLo_AOr?r`o&;&G^T%TODyz%(quWc(C$Q|+j$zKAI}__Uul1+%H|USyyXd}a@t
zQCE5uwZQ<Y(8x2sP&_J5ws;Ea_n&EIqt@l2PQDV=;3ka5?Wjg}VxW!A*n}>#+q{9g
z(mQ7S_jaYI4RcYiU>WKFt1Q3S;vJ};XCqF=<EWeHM}1?7XSx6346@Gp6F-lN3sDPR
z$ER>7YNI|>!+)U)4p@HFIsYq2!4c#ap#GS0Q8%$1b&xfv{kLKw?mWl+YtUwiZdBpB
zs0FD%_`*-4t}YL?K>_L&6`>m1VEHPGt1aGzYM{a56K0p?y8{L)_@^ZjJAI+)sEy~M
zPP)M2d{kov_!yR<-es$K4fW1r&ilgYs8^JQYJ4$f;42u5!8Qgl48BAa+>bhGi^V5V
zCpc^I71Tz37T+@e!Kvg2b@_d!qZ*%W=AizlUPYIj`f_n`VOq)flE|8j$nsF{wx-C`
zt!op<^fuJ=e)8V6cba-yxA)c6^u7P?wW^P<H}39Te<0Ex$xn#tIk>y8z9KTQGk?(k
Dh1T`g

delta 2732
zcmXZce@xX?7{~FmZsCw?1QuxF4@8uUQ4&^)Y^@(IL)JoTOxcW;Hd<3OT0d;@UH)dy
z${9u@=3-DdiCi~+2%)H$rJ!j2gL9T<EL_tyDrpn#{qa11z0UJ|&pFR?&i8xohKA5+
zeP~~JW{~5YYmPd14_?ICID+#r@~v|da3zMY0yS?v#$h$aU_DO3y%wLqOyV=B{YEhZ
zA87G$5iTO$+TsG2%iw2A#J4&ZCN9Q!EX7!S8&zmMPQyx^icOe`eW-O;aVB2Jc{shz
zH?|xj#1*&<8!aDd5Bvsc?fzs7FpCMrsFPQs3e=fBIGK15)zBULeS={$3Dx*i)brV>
z#vVo8&{Gz#FxLh)s4%yoHmEimaXfLm*^9c7U-53dZ1GK0q1X=R=3o-)Ad67>cTf#&
zMy=a!26Z-}&FsNsCY-i-2(|EEi$^UU+vzt>Fel?g=FPHr0j3ZyMtw77s2kXXiP(V5
z4_rHgbP{J!S383DVe)sra1QE5a`9fw$244t`nW1F2Rl$Va|Lzc5xn(^y8QYu7Lrdf
zS7RdeT{i=D_!Fwo(5(l~{fF8he8A_&qY9*<3S{8~%tf7O32Oc;sGC@YnzzOBA6r~w
zHcINd76#++u-T7eiO-uusKS4vPJF|B@StB;f_IW%jcVXM)JMC~;xAAK`^xM>9k>qz
zJ@}1*Ivqw`z3cV`Q&1buz*{Fab5ZM_#sn-v&3hFe!8PWWIGy;s89L<m%|PWJI>i0!
z3X4eS4`U5#qZ+dgRd|otikg1}b>-(!ja<dKc+=v!hkb#CsQp%<*1drd+>Tn`b~x}K
z)o~K~xPC`njXUB`mV{~`1GUk^n1p$jUxM1G1a))es6roFzR~Qo=O^v?Wy^<x9=}17
z89{B3XYmWDhDt52Fn5^ssE@79;?w3ORO8oBjo*IM8;A3V6H)&UK>-7ORO?XhZZA&9
zi{_Z`eSE)Jh&u6`sKzQ$C*O^eu@iNGv*xhn!^iydSs3DZKBnsT|11N2-D^-CufrJJ
zV(|y|yvFhkmTy8eupd?M6smzgQ15um5B`;ABZXW6YX8-!dhcSqe*c>os9=>%_{`j6
zw&FsbAF(+6qjQfDPeiR-irTmYBe)9F@e|Zdb)l}hA7|nXjNpvp>`Q(390Q%;Q`CcR
zP*-{mwZRCgP}~V$C=nG;v3LgR_n%`vfm&CHI{6AzgPSoHccL1p#XuV!wF$lEfH{b|
z(qS{P*RB+`VFBtDEJYol%<@|;u0s7hn=um)pl)Ia^^GO>asOckd42xG&!FO!s0FX%
zlUR$|=mM(Yzfc87ET3@F{|Zv^F7oqHe@q3an^=xI$Xe9?AK@gdJ<0uR&}oSQRN-r=
z1=CLX!jGe_t`N0BG3phSq8i$0`E3?gTf7_9K$FD>&0fn71PoO0PfH~C`$Czhjpv|F
zI^W{wQH>R29<D>Z%Qo{D)H@$@+82(XUQr&Z@x_>pFJe3fI~a^(@HwjB*Qk@WTHK8~
z!7+=^qBgo<@fGtQ%p!l?;><I?@oY06^+)wGy7Y{f%F14glus>>zLgza5xUf|Et<9K
c{Yg7FMAM@K(fpK{!K!_O+nb}2{$;oQ4?v~ldH?_b

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index b9abae762..bde25c742 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -96,7 +96,7 @@ msgstr "游客无法拥有此角色"
 
 #: cps/admin.py:490 cps/admin.py:1936
 msgid "No admin user remaining, can't remove admin role"
-msgstr "理员账户不存在，无法删除管理员角色"
+msgstr "没有其余管理员账户，无法删除管理员角色"
 
 #: cps/admin.py:494 cps/admin.py:508
 msgid "Value has to be true or false"
@@ -2129,7 +2129,7 @@ msgstr "功能配置"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr "保存到磁盘事转换标题和作者中的非英文字符"
+msgstr "保存到磁盘时转换标题和作者中的非英文字符"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
@@ -3294,7 +3294,7 @@ msgstr "本地化"
 
 #: cps/templates/user_table.html:138
 msgid "Visible Book Languages"
-msgstr "可见数据语言"
+msgstr "可见书籍语言"
 
 #: cps/templates/user_table.html:139
 msgid "Edit Allowed Tags"

From 9df3a2558d69c23d25a00138cd7e22d38db79de3 Mon Sep 17 00:00:00 2001
From: ElQuimm <50202052+ElQuimm@users.noreply.github.com>
Date: Thu, 29 Sep 2022 11:07:31 +0200
Subject: [PATCH 342/412] update message.po

updated italian message.po translation
---
 cps/translations/it/LC_MESSAGES/messages.po | 174 +++++++++-----------
 1 file changed, 81 insertions(+), 93 deletions(-)

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 52190f841..410424746 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -155,24 +155,24 @@ msgstr "Vuoi veramente eliminare questo scaffale?"
 
 #: cps/admin.py:603
 msgid "Are you sure you want to change locales of selected user(s)?"
-msgstr "Sei sicuro di voler modificare le impostazioni locali dell'/degli utente/i selezionato/i?"
+msgstr "Sei sicuro di voler modificare le impostazioni locali del/degli utente/i selezionato/i?"
 
 #: cps/admin.py:605
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
-msgstr "Sei sicuro di voler modificare le impostazioni delle lingue visualizzabili dell'/degli utente/i selezionato/i?"
+msgstr "Sei sicuro di voler modificare le impostazioni delle lingue visualizzabili del/degli utente/i selezionato/i?"
 
 #: cps/admin.py:607
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
-msgstr "Sei sicuro di voler modificare il ruolo evidenziato dell'/degli utente/i selezionato/i?"
+msgstr "Sei sicuro di voler modificare il ruolo evidenziato del/degli utente/i selezionato/i?"
 
 #: cps/admin.py:609
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
-msgstr "Sei sicuro di voler modificare le impostazioni delle restrizioni di visualizzazione dell'/degli utente/i selezionato/i?"
+msgstr "Sei sicuro di voler modificare le impostazioni delle restrizioni di visualizzazione del/degli utente/i selezionato/i?"
 
 #: cps/admin.py:611
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
-msgstr "Sei sicuro di voler modificare le impostazioni delle restrizioni di visualizzazione dell'/degli utente/i selezionato/i?"
+msgstr "Sei sicuro di voler modificare le impostazioni delle restrizioni di visualizzazione del/degli utente/i selezionato/i?"
 
 #: cps/admin.py:614
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
@@ -184,11 +184,11 @@ msgstr "Sei sicuro di voler modificare la posizione della libreria di Calibre?"
 
 #: cps/admin.py:618
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
-msgstr ""
+msgstr "Calibre-Web cercherà le copertine aggiornate e aggiornerà le miniature delle copertine, questo richiederà un po' di tempo."
 
 #: cps/admin.py:621
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr ""
+msgstr "Sei sicuro di voler eliminare il database sincoronizzato di Calibre-Web e forzare una sincronizzazione completa con il tuo lettore Kobo?"
 
 #: cps/admin.py:864 cps/admin.py:870 cps/admin.py:880 cps/admin.py:890
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
@@ -204,7 +204,7 @@ msgstr "Permetti"
 
 #: cps/admin.py:907
 msgid "{} sync entries deleted"
-msgstr ""
+msgstr "{} eliminate voci di sincronizzazione"
 
 #: cps/admin.py:955
 msgid "Tag not found"
@@ -310,19 +310,19 @@ msgstr "Configurazione del server e-mail aggiornata"
 
 #: cps/admin.py:1319 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
-msgstr ""
+msgstr "Modifica le impostazioni delle attività pianificate"
 
 #: cps/admin.py:1331
 msgid "Invalid start time for task specified"
-msgstr ""
+msgstr "Ora di inizio non valida per l'attività specificata"
 
 #: cps/admin.py:1336
 msgid "Invalid duration for task specified"
-msgstr ""
+msgstr "Durata non valida per l'attività specificata"
 
 #: cps/admin.py:1345
 msgid "Scheduled tasks settings updated"
-msgstr ""
+msgstr "Impostazioni delle attività pianificate aggiornate"
 
 #: cps/admin.py:1355 cps/admin.py:1404 cps/admin.py:1992 cps/web.py:1257
 #: cps/web.py:1318
@@ -331,7 +331,7 @@ msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
 #: cps/admin.py:1359
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "Il DB delle impostazioni non è scrivibile"
 
 #: cps/admin.py:1389 cps/admin.py:1984
 #, python-format
@@ -519,7 +519,7 @@ msgstr "Errore durante l'apertura del libro selezionato. Il file non esiste o il
 
 #: cps/editbooks.py:154 cps/editbooks.py:1217
 msgid "User has no rights to upload cover"
-msgstr ""
+msgstr "L'utente non ha i permessi per caricare le copertine"
 
 #: cps/editbooks.py:174 cps/editbooks.py:712
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
@@ -531,7 +531,7 @@ msgstr "I metadati sono stati aggiornati con successo"
 
 #: cps/editbooks.py:233
 msgid "Error editing book: {}"
-msgstr ""
+msgstr "Errore durante la modifica del libro: {}"
 
 #: cps/editbooks.py:288
 #, python-format
@@ -554,10 +554,9 @@ msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
 
 #: cps/editbooks.py:631
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiare prima di sottoporlo nuovamente: "
+msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiarlo prima di sottoporlo nuovamente: "
 
 #: cps/editbooks.py:686 cps/editbooks.py:1011
-#, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s non è una lingua valida"
 
@@ -590,7 +589,7 @@ msgstr "Il libro é stato eliminato con successo"
 
 #: cps/editbooks.py:876
 msgid "You are missing permissions to delete books"
-msgstr ""
+msgstr "Non disponi delle autorizzazioni per eliminare libri."
 
 #: cps/editbooks.py:926
 msgid "edit metadata"
@@ -603,7 +602,7 @@ msgstr "%(seriesindex)s non è un numero valido, proseguo"
 
 #: cps/editbooks.py:1153
 msgid "User has no rights to upload additional file formats"
-msgstr ""
+msgstr "L'utente non ha i permessi per caricare formati di file aggiuntivi"
 
 #: cps/editbooks.py:1174
 #, python-format
@@ -645,9 +644,8 @@ msgstr "%(format)s non trovato: %(fn)s"
 
 #: cps/helper.py:96 cps/helper.py:225 cps/templates/detail.html:42
 #: cps/templates/detail.html:46
-#, fuzzy
 msgid "Send to E-Reader"
-msgstr "Invia a Kindle"
+msgstr "Invia al lettore elettronico"
 
 #: cps/helper.py:97 cps/helper.py:115 cps/helper.py:227
 msgid "This e-mail has been sent via Calibre-Web."
@@ -671,19 +669,19 @@ msgid "Registration e-mail for user: %(name)s"
 msgstr "E-mail di registrazione dell'utente: %(name)s"
 
 #: cps/helper.py:147 cps/helper.py:153
-#, fuzzy, python-format
+#, python-format
 msgid "Convert %(orig)s to %(format)s and send to E-Reader"
-msgstr "Converti %(orig)s in %(format)s e spedisci a Kindle"
+msgstr "Converti %(orig)s in %(format)s e al lettore elettronico"
 
 #: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180 cps/helper.py:184
-#, fuzzy, python-format
+#, python-format
 msgid "Send %(format)s to E-Reader"
-msgstr "Invia %(format)s a Kindle"
+msgstr "Invia %(format)s al lettore elettronico"
 
 #: cps/helper.py:224 cps/tasks/convert.py:92
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to E-Reader"
-msgstr "%(book)s inviato a Kindle"
+msgstr "%(book)s inviato al lettore elettronico"
 
 #: cps/helper.py:229
 msgid "The requested file could not be read. Maybe wrong permissions?"
@@ -691,7 +689,7 @@ msgstr "Il file richiesto non può essere letto. I permessi sono corretti?"
 
 #: cps/helper.py:344
 msgid "Read status could not set: {}"
-msgstr ""
+msgstr "Impossibile impostare lo stato di lettura: {}"
 
 #: cps/helper.py:367
 #, python-format
@@ -725,7 +723,7 @@ msgstr "La modifica del titolo da '%(src)s' a '%(dest)s' è terminata con l'erro
 
 #: cps/helper.py:584
 msgid "Error in rename file in path: {}"
-msgstr ""
+msgstr "Errore nel rinominare il file nel percorso: {}"
 
 #: cps/helper.py:602
 #, python-format
@@ -746,7 +744,7 @@ msgstr "L'e-mail non è scritto in un formato valido"
 
 #: cps/helper.py:811
 msgid "Python module 'advocate' is not installed but is needed for cover uploads"
-msgstr ""
+msgstr "Il modulo Python 'advocate' non è installato, ma è necessario per caricare le copertine"
 
 #: cps/helper.py:821
 msgid "Error Downloading Cover"
@@ -758,7 +756,7 @@ msgstr "Errore di formato della copertina"
 
 #: cps/helper.py:827
 msgid "You are not allowed to access localhost or the local network for cover uploads"
-msgstr ""
+msgstr "Non sei autorizzato ad accedere a localhost o alla rete locale per caricare le copertine"
 
 #: cps/helper.py:837
 msgid "Failed to create path for cover"
@@ -774,7 +772,7 @@ msgstr "Solamente i file nei formati jpg/jpeg/png/webp/bmp sono supportati per l
 
 #: cps/helper.py:876
 msgid "Invalid cover file content"
-msgstr ""
+msgstr "Contenuto del file di copertina non valido"
 
 #: cps/helper.py:880
 msgid "Only jpg/jpeg files are supported as coverfile"
@@ -785,14 +783,12 @@ msgid "Unrar binary file not found"
 msgstr "Non ho trovato il file binario di UnRar"
 
 #: cps/helper.py:943
-#, fuzzy
 msgid "Error executing UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
 #: cps/kobo_auth.py:89
-#, fuzzy
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
-msgstr "Per favore accedi a calibe-web non da localhost per ottenere un api-endpoint valido per il lettore kobo"
+msgstr "Per favore accedi a Calibe-Web non da localhost per ottenere un api-endpoint valido per il lettore kobo"
 
 #: cps/kobo_auth.py:115
 msgid "Kobo Setup"
@@ -1067,9 +1063,8 @@ msgid "Invalid shelf specified"
 msgstr "Lo scaffale specificato non è valido"
 
 #: cps/shelf.py:55
-#, fuzzy
 msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Mi spiace, ma non sei autorizzato ad aggiungere libri allo scaffale: %(shelfname)s"
+msgstr "Mi spiace, ma non sei autorizzato ad aggiungere libri a questo scaffale"
 
 #: cps/shelf.py:64
 #, python-format
@@ -1083,7 +1078,7 @@ msgstr "Il libro è stato aggiunto allo scaffale: %(sname)s"
 
 #: cps/shelf.py:108
 msgid "You are not allowed to add a book to the shelf"
-msgstr ""
+msgstr "Non sei autorizzato ad aggiungere libri allo scaffale"
 
 #: cps/shelf.py:126
 #, python-format
@@ -1107,7 +1102,7 @@ msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
 
 #: cps/shelf.py:200
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
+msgstr "Spiacente, ma non sei autorizzato a togliere libri da questo scaffale"
 
 #: cps/shelf.py:210 cps/templates/layout.html:141
 msgid "Create a Shelf"
@@ -1115,7 +1110,7 @@ msgstr "Crea uno scaffale"
 
 #: cps/shelf.py:218
 msgid "Sorry you are not allowed to edit this shelf"
-msgstr "Spiacente, non sei autorizzato a modificare questo scaffale"
+msgstr "Spiacente, ma non sei autorizzato a modificare questo scaffale"
 
 #: cps/shelf.py:220
 msgid "Edit a shelf"
@@ -1123,12 +1118,11 @@ msgstr "Modifica uno scaffale"
 
 #: cps/shelf.py:229
 msgid "Error deleting Shelf"
-msgstr ""
+msgstr "Errore nell'eliminare lo scaffale"
 
 #: cps/shelf.py:231
-#, fuzzy
 msgid "Shelf successfully deleted"
-msgstr "Il libro é stato eliminato con successo"
+msgstr "Lo scaffale è stato eliminato con successo"
 
 #: cps/shelf.py:281
 #, python-format
@@ -1137,7 +1131,7 @@ msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
 
 #: cps/shelf.py:313
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
+msgstr "Spiacente, ma non sei autorizzato a creare scaffali pubblici"
 
 #: cps/shelf.py:330
 #, python-format
@@ -1191,15 +1185,15 @@ msgstr "Avviato"
 
 #: cps/tasks_status.py:70
 msgid "Finished"
-msgstr "Terminato"
+msgstr "Finito"
 
 #: cps/tasks_status.py:72
 msgid "Ended"
-msgstr ""
+msgstr "Terminato"
 
 #: cps/tasks_status.py:74
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancellato"
 
 #: cps/tasks_status.py:76
 msgid "Unknown Status"
@@ -1264,7 +1258,7 @@ msgstr "Serie: %(serie)s"
 
 #: cps/web.py:611
 msgid "Rating: None"
-msgstr ""
+msgstr "Valutazione: nessuna"
 
 #: cps/web.py:620
 #, python-format
@@ -1410,33 +1404,33 @@ msgstr "Si è verificato un errore con Calibre: %(error)s"
 
 #: cps/tasks/convert.py:275
 msgid "Convert"
-msgstr ""
+msgstr "Convertire"
 
 #: cps/tasks/database.py:28
 msgid "Reconnecting Calibre database"
-msgstr ""
+msgstr "Riconessione al database di Calibre"
 
 #: cps/tasks/mail.py:265
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #: cps/tasks/thumbnail.py:95
 #, python-format
 msgid "Generated %(count)s cover thumbnails"
-msgstr ""
+msgstr "Generate %(count)s miniature di copertine"
 
 #: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
 #: cps/tasks/thumbnail.py:503
 msgid "Cover Thumbnails"
-msgstr ""
+msgstr "Miniature delle copertine"
 
 #: cps/tasks/thumbnail.py:281
 msgid "Generated {0} series thumbnails"
-msgstr ""
+msgstr "Generate {0} miniature di serie"
 
 #: cps/tasks/thumbnail.py:446
 msgid "Clearing cover thumbnail cache"
-msgstr ""
+msgstr "Pulire la cache delle miniature di copertine"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
 #: cps/templates/layout.html:67 cps/templates/user_table.html:145
@@ -1459,9 +1453,8 @@ msgid "E-mail Address"
 msgstr "Indirizzo e-mail"
 
 #: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-#, fuzzy
 msgid "Send to E-Reader E-mail Address"
-msgstr "Invia all'indirizzo e-mail di Kindle"
+msgstr "Invia all'indirizzo e-mail del lettore elettronico"
 
 #: cps/templates/admin.html:17 cps/templates/layout.html:77
 #: cps/templates/user_table.html:143
@@ -1602,31 +1595,31 @@ msgstr "Modifica la configurazione dell'interfaccia utente"
 
 #: cps/templates/admin.html:167
 msgid "Scheduled Tasks"
-msgstr ""
+msgstr "Attività pianificate"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
 msgid "Time at which tasks start to run"
-msgstr ""
+msgstr "Ora in cui le attività sono avviate"
 
 #: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
 msgid "Maximum tasks duration"
-msgstr ""
+msgstr "Massima durata delle attività"
 
 #: cps/templates/admin.html:178
 msgid "Generate book cover thumbnails"
-msgstr ""
+msgstr "Generazione delle miniature delle copertine"
 
 #: cps/templates/admin.html:182
 msgid "Generate series cover thumbnails"
-msgstr ""
+msgstr "Generazione delle miniature delle serie"
 
 #: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
 msgid "Reconnect to Calibre Library"
-msgstr ""
+msgstr "Ricollegare alla libreria di Calibre"
 
 #: cps/templates/admin.html:193
 msgid "Refresh Thumbnail Cover Cache"
-msgstr ""
+msgstr "Aggiornare la cache delle miniature delle copertine"
 
 #: cps/templates/admin.html:199
 msgid "Administration"
@@ -1654,7 +1647,7 @@ msgstr "Arresta Calibre-Web"
 
 #: cps/templates/admin.html:213
 msgid "Version Information"
-msgstr ""
+msgstr "Informazioni sulla versione"
 
 #: cps/templates/admin.html:217
 msgid "Version"
@@ -1994,17 +1987,16 @@ msgid "Enter Publishers"
 msgstr "Indica gli editori"
 
 #: cps/templates/book_table.html:73
-#, fuzzy
 msgid "Enter comments"
-msgstr "Digita il nome di dominio"
+msgstr "Digita un commento"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
-msgstr ""
+msgstr "Commento"
 
 #: cps/templates/book_table.html:75
 msgid "Archiv Status"
-msgstr ""
+msgstr "Stato dell'archivio"
 
 #: cps/templates/book_table.html:77 cps/templates/search_form.html:42
 msgid "Read Status"
@@ -2092,7 +2084,7 @@ msgstr "Nightly"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr ""
+msgstr "Hosts fidati (separati da virgola)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
@@ -2124,7 +2116,7 @@ msgstr "Abilita il caricamento"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr ""
+msgstr "(Per favore assicurati che gli utenti abbiano anche i diritti di upload)"
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
@@ -2564,13 +2556,12 @@ 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/generate_kobo_auth_url.html:11
-#, fuzzy
 msgid "Kobo Token:"
-msgstr "Token Kobo Sync"
+msgstr "Token di Kobo:"
 
 #: cps/templates/grid.html:21
 msgid "List"
-msgstr ""
+msgstr "Elenco"
 
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
@@ -2590,11 +2581,11 @@ msgstr "Disconnetti l'utente"
 
 #: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
-msgstr ""
+msgstr "Ordina in ordine ascendente in base al numero di download"
 
 #: cps/templates/index.html:72
 msgid "Sort descending according to download count"
-msgstr ""
+msgstr "Ordina in ordine discendente in base al numero di download"
 
 #: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
@@ -2742,7 +2733,7 @@ msgstr "Dettagli del libro"
 
 #: cps/templates/list.html:22
 msgid "Grid"
-msgstr ""
+msgstr "Griglia"
 
 #: cps/templates/login.html:18
 msgid "Remember Me"
@@ -2766,7 +2757,7 @@ msgstr "Calibre-Web log: "
 
 #: cps/templates/logviewer.html:8
 msgid "Stream output, can't be displayed"
-msgstr "Flusso attivo, non può essere visualizzato"
+msgstr "Flusso in uscita, non può essere visualizzato"
 
 #: cps/templates/logviewer.html:12
 msgid "Show Access Log: "
@@ -2870,12 +2861,11 @@ msgstr "Scuro"
 
 #: cps/templates/read.html:79
 msgid "Sepia"
-msgstr ""
+msgstr "Seppia"
 
 #: cps/templates/read.html:80
-#, fuzzy
 msgid "Black"
-msgstr "Indietro"
+msgstr "Nero"
 
 #: cps/templates/read.html:84
 msgid "Reflow text when sidebars are open."
@@ -2975,7 +2965,7 @@ msgstr "Da destra a sinistra"
 
 #: cps/templates/readcbr.html:165
 msgid "Reset to Top"
-msgstr "Ripristina all'inizio"
+msgstr "Ripristina in alto"
 
 #: cps/templates/readcbr.html:166
 msgid "Remember Position"
@@ -3035,11 +3025,11 @@ msgstr "Il link scadrà tra 10 minuti."
 
 #: cps/templates/schedule_edit.html:29
 msgid "Generate Book Cover Thumbnails"
-msgstr ""
+msgstr "Genera miniature delle copertine dei libri"
 
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
-msgstr ""
+msgstr "Genera miniature delle copertine delle serie"
 
 #: cps/templates/search.html:6
 msgid "No Results Found"
@@ -3163,7 +3153,7 @@ msgstr "Statistiche del sistema"
 
 #: cps/templates/stats.html:33
 msgid "Program"
-msgstr ""
+msgstr "Programma"
 
 #: cps/templates/stats.html:34
 msgid "Installed Version"
@@ -3195,15 +3185,15 @@ msgstr "Ora d'inizio"
 
 #: cps/templates/tasks.html:20
 msgid "Actions"
-msgstr ""
+msgstr "Azioni"
 
 #: cps/templates/tasks.html:40
 msgid "This task will be cancelled. Any progress made by this task will be saved."
-msgstr ""
+msgstr "Questa attività verrà annullata. Tutti i progressi compiuti da questa attività verranno salvati."
 
 #: cps/templates/tasks.html:41
 msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
-msgstr ""
+msgstr "Se si tratta di un'attività pianificata, verrà eseguita nuovamente durante il prossimo orario pianificato."
 
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
@@ -3235,7 +3225,7 @@ msgstr "Crea/Visualizza"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr ""
+msgstr "Forza la sincronizzazione kobo completa"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
@@ -3270,14 +3260,12 @@ msgid "Enter E-mail Address"
 msgstr "Digita l'indirizzo e-mail"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "Enter E-Reader E-mail Address"
-msgstr "Digita l'email di Kindle"
+msgstr "Digita l'email del lettore elettronico"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "E-Reader E-mail"
-msgstr "E-mail di test"
+msgstr "E-mail del lettore elettronico"
 
 #: cps/templates/user_table.html:137
 msgid "Locale"

From bd52f08a30626fa06e5dc14a3a5a76ea95e67910 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 2 Oct 2022 15:05:07 +0200
Subject: [PATCH 343/412] Fix for #2547 (None isn't iterable, so in case
 scholary request fails, empty list has to be returned)

---
 cps/metadata_provider/scholar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 498184ec2..5f6323430 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -54,7 +54,7 @@ class scholar(Metadata):
                 scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
             except Exception as e:
                 log.warning(e)
-                return None
+                return list()
             for result in scholar_gen:
                 match = self._parse_search_result(
                     result=result, generic_cover="", locale=locale

From 44f6655dd27bc4c1dce33f278cae8233bcc8746c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 2 Oct 2022 15:21:53 +0200
Subject: [PATCH 344/412] Catch one additional database error on edit book

---
 cps/editbooks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index a22664f47..3580d667d 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -38,7 +38,7 @@ from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
 from flask_babel import get_locale
 from flask_login import current_user, login_required
-from sqlalchemy.exc import OperationalError, IntegrityError
+from sqlalchemy.exc import OperationalError, IntegrityError, InterfaceError
 from sqlalchemy.orm.exc import StaleDataError
 
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status
@@ -223,7 +223,7 @@ def edit_book(book_id):
         calibre_db.session.rollback()
         flash(str(e), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
-    except (OperationalError, IntegrityError, StaleDataError) as e:
+    except (OperationalError, IntegrityError, StaleDataError, InterfaceError) as e:
         log.error_or_exception("Database error: {}".format(e))
         calibre_db.session.rollback()
         flash(_(u"Database error: %(error)s.", error=e.orig), category="error")

From a003cd975812671fc484e6379a26b631c8723939 Mon Sep 17 00:00:00 2001
From: ElQuimm <50202052+ElQuimm@users.noreply.github.com>
Date: Sun, 2 Oct 2022 21:07:24 +0200
Subject: [PATCH 345/412] update message.po (italian)

Hello, I ran the October 2 update, and this error appeared:

Merge remote-tracking branch 'it/patch-28'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po

Calibre-Web does not start again and the container logfile does not allow me to have more information.
I proceeded to verify the translation file (I did not find anything strange) and I made some updates of the text.
---
 cps/translations/it/LC_MESSAGES/messages.po | 30 +++++++++------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 6de1809cb..6afc0c6f4 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -38,9 +38,8 @@ msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
 #: cps/admin.py:169
-#, fuzzy
 msgid "Books successfully queued for Metadata Backup"
-msgstr "Libro accodato con successo per essere spedito a %(kindlemail)s"
+msgstr "Libro accodato con successo per il backup dei metadati"
 
 #: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -171,13 +170,12 @@ msgid "Are you sure you want to change the selected role for the selected user(s
 msgstr "Sei sicuro di voler modificare il ruolo evidenziato del/degli utente/i selezionato/i?"
 
 #: cps/admin.py:619
-#, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
-msgstr "Sei sicuro di voler modificare le impostazioni delle restrizioni di visualizzazione del/degli utente/i selezionato/i?"
+msgstr "Sei sicuro di voler modificare le restrizioni selezionate del/degli utente/i selezionato/i?"
 
 #: cps/admin.py:621
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
-msgstr "Sei sicuro di voler modificare le impostazioni delle restrizioni di visualizzazione del/degli utente/i selezionato/i?"
+msgstr "Sei sicuro di voler modificare le restrizioni di visualizzazione del/degli utente/i selezionato/i?"
 
 #: cps/admin.py:624
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
@@ -494,7 +492,7 @@ msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utent
 
 #: cps/admin.py:1975 cps/web.py:1369
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
-msgstr ""
+msgstr "L'indirizzo e-mail non può essere vuoto e deve essere un recapito valido"
 
 #: cps/admin.py:2001
 #, python-format
@@ -512,7 +510,7 @@ msgstr "Mancano i permessi di esecuzione"
 #: cps/db.py:724 cps/search.py:137 cps/web.py:722
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
-msgstr "La colonna personale no.%(column)d non esiste nel database di Calibre"
+msgstr "La colonna personalizzata no.%(column)d non esiste nel database di Calibre"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
@@ -599,7 +597,7 @@ msgstr "Il libro é stato eliminato con successo"
 
 #: cps/editbooks.py:880
 msgid "You are missing permissions to delete books"
-msgstr "Non disponi delle autorizzazioni per eliminare libri."
+msgstr "Non disponi delle autorizzazioni per eliminare libri"
 
 #: cps/editbooks.py:930
 msgid "edit metadata"
@@ -608,7 +606,7 @@ msgstr "modifica i metadati"
 #: cps/editbooks.py:979
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s non è un numero valido, proseguo"
+msgstr "%(seriesindex)s non è un numero valido, vado oltre"
 
 #: cps/editbooks.py:1157
 msgid "User has no rights to upload additional file formats"
@@ -797,13 +795,12 @@ msgid "Error executing UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
 #: cps/helper.py:1040
-#, fuzzy
 msgid "Cover"
-msgstr "Per scoprire"
+msgstr "Copertina"
 
 #: cps/helper.py:1042 cps/templates/admin.html:211
 msgid "Queue all books for metadata backup"
-msgstr ""
+msgstr "Metti in coda tutti i libri per il backup dei metadati"
 
 #: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
@@ -1434,9 +1431,8 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #: cps/tasks/metadata_backup.py:47
-#, fuzzy
 msgid "Backing up Metadata"
-msgstr "modifica i metadati"
+msgstr "Backup dei metadati"
 
 #: cps/tasks/thumbnail.py:95
 #, python-format
@@ -1947,7 +1943,7 @@ msgstr "Rimuovi le selezioni"
 
 #: cps/templates/book_table.html:41
 msgid "Exchange author and title"
-msgstr "Scambia autore e titolo"
+msgstr "Inverti autore e titolo"
 
 #: cps/templates/book_table.html:47
 msgid "Update Title Sort automatically"
@@ -2300,7 +2296,7 @@ msgstr "LDAP Member User Filter Detection"
 
 #: cps/templates/config_edit.html:280
 msgid "Autodetect"
-msgstr "Autodetect - identifica automaticamente"
+msgstr "Autodetect"
 
 #: cps/templates/config_edit.html:281
 msgid "Custom Filter"
@@ -3285,7 +3281,7 @@ msgstr "Digita l'indirizzo e-mail"
 
 #: cps/templates/user_table.html:136
 msgid "Enter E-Reader E-mail Address"
-msgstr "Digita l'email del lettore elettronico"
+msgstr "Digita l'e-mail del lettore elettronico"
 
 #: cps/templates/user_table.html:136
 msgid "E-Reader E-mail"

From 7eef44f73ccd19762ae3356d6c0ac70228ff3302 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 3 Oct 2022 15:17:17 +0200
Subject: [PATCH 346/412] Make drive letters available in file picker

---
 cps/admin.py | 138 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 77 insertions(+), 61 deletions(-)
 mode change 100755 => 100644 cps/admin.py

diff --git a/cps/admin.py b/cps/admin.py
old mode 100755
new mode 100644
index 690c3c2ee..09a553b40
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -26,15 +26,16 @@ import base64
 import json
 import operator
 import time
+import sys
+import string
 from datetime import datetime, timedelta
 from datetime import time as datetime_time
 from functools import wraps
 
-
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
 from flask_login import login_required, current_user, logout_user, confirm_login
 from flask_babel import gettext as _
-from flask_babel import get_locale,  format_time, format_datetime, format_timedelta
+from flask_babel import get_locale, format_time, format_datetime, format_timedelta
 from flask import session as flask_session
 from sqlalchemy import and_
 from sqlalchemy.orm.attributes import flag_modified
@@ -52,27 +53,28 @@ from .services.worker import WorkerThread
 from .babel import get_available_translations, get_available_locale, get_user_locale_language
 from . import debug_info
 
-
 log = logger.create()
 
 feature_support = {
-        'ldap': bool(services.ldap),
-        'goodreads': bool(services.goodreads_support),
-        'kobo':  bool(services.kobo),
-        'updater': constants.UPDATER_AVAILABLE,
-        'gmail': bool(services.gmail),
-        'scheduler': schedule.use_APScheduler,
-        'gdrive': gdrive_support
-    }
+    'ldap': bool(services.ldap),
+    'goodreads': bool(services.goodreads_support),
+    'kobo': bool(services.kobo),
+    'updater': constants.UPDATER_AVAILABLE,
+    'gmail': bool(services.gmail),
+    'scheduler': schedule.use_APScheduler,
+    'gdrive': gdrive_support
+}
 
 try:
     import rarfile  # pylint: disable=unused-import
+
     feature_support['rar'] = True
 except (ImportError, SyntaxError):
     feature_support['rar'] = False
 
 try:
     from .oauth_bb import oauth_check, oauthblueprints
+
     feature_support['oauth'] = True
 except ImportError as err:
     log.debug('Cannot import Flask-Dance, login with Oauth will not work: %s', err)
@@ -80,7 +82,6 @@ except ImportError as err:
     oauthblueprints = []
     oauth_check = {}
 
-
 admi = Blueprint('admin', __name__)
 
 
@@ -159,6 +160,7 @@ def shutdown():
     show_text['text'] = _(u'Unknown command')
     return json.dumps(show_text), 400
 
+
 @admi.route("/metadata_backup", methods=["POST"])
 @login_required
 @admin_required
@@ -206,7 +208,7 @@ def admin():
 
             tz = timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)
             form_date = datetime.strptime(commit[:19], "%Y-%m-%dT%H:%M:%S")
-            if len(commit) > 19:    # check if string has timezone
+            if len(commit) > 19:  # check if string has timezone
                 if commit[19] == '+':
                     form_date -= timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
                 elif commit[19] == '-':
@@ -272,9 +274,9 @@ def calibreweb_alive():
 @login_required
 @admin_required
 def view_configuration():
-    read_column = calibre_db.session.query(db.CustomColumns)\
+    read_column = calibre_db.session.query(db.CustomColumns) \
         .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all()
-    restrict_columns = calibre_db.session.query(db.CustomColumns)\
+    restrict_columns = calibre_db.session.query(db.CustomColumns) \
         .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all()
     languages = calibre_db.speaking_language()
     translations = get_available_locale()
@@ -293,11 +295,11 @@ def edit_user_table():
     languages = calibre_db.speaking_language()
     translations = get_available_locale()
     all_user = ub.session.query(ub.User)
-    tags = calibre_db.session.query(db.Tags)\
-        .join(db.books_tags_link)\
-        .join(db.Books)\
+    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'))\
+        .group_by(text('books_tags_link.tag')) \
         .order_by(db.Tags.name).all()
     if config.config_restricted_column:
         custom_values = calibre_db.session.query(db.cc_classes[config.config_restricted_column]).all()
@@ -474,17 +476,17 @@ def edit_list_user(param):
                 elif param.endswith('role'):
                     value = int(vals['field_index'])
                     if user.name == "Guest" and value in \
-                            [constants.ROLE_ADMIN, constants.ROLE_PASSWD, constants.ROLE_EDIT_SHELFS]:
+                        [constants.ROLE_ADMIN, constants.ROLE_PASSWD, constants.ROLE_EDIT_SHELFS]:
                         raise Exception(_("Guest can't have this role"))
                     # check for valid value, last on checks for power of 2 value
-                    if value > 0 and value <= constants.ROLE_VIEWER and (value & value-1 == 0 or value == 1):
+                    if value > 0 and value <= constants.ROLE_VIEWER and (value & value - 1 == 0 or value == 1):
                         if vals['value'] == 'true':
                             user.role |= value
                         elif vals['value'] == 'false':
                             if value == constants.ROLE_ADMIN:
-                                if not ub.session.query(ub.User).\
-                                       filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
-                                              ub.User.id != user.id).count():
+                                if not ub.session.query(ub.User). \
+                                    filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
+                                           ub.User.id != user.id).count():
                                     return Response(
                                         json.dumps([{'type': "danger",
                                                      'message': _(u"No admin user remaining, can't remove admin role",
@@ -499,7 +501,7 @@ def edit_list_user(param):
                     if user.name == "Guest" and value == constants.SIDEBAR_READ_AND_UNREAD:
                         raise Exception(_("Guest can't have this view"))
                     # check for valid value, last on checks for power of 2 value
-                    if value > 0 and value <= constants.SIDEBAR_LIST and (value & value-1 == 0 or value == 1):
+                    if value > 0 and value <= constants.SIDEBAR_LIST and (value & value - 1 == 0 or value == 1):
                         if vals['value'] == 'true':
                             user.sidebar_view |= value
                         elif vals['value'] == 'false':
@@ -652,7 +654,7 @@ 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)\
+    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)
@@ -870,16 +872,16 @@ def delete_restriction(res_type, user_id):
 @login_required
 @admin_required
 def list_restriction(res_type, user_id):
-    if res_type == 0:   # Tags as template
-        restrict = [{'Element': x, 'type': _('Deny'), 'id': 'd'+str(i)}
+    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)}
+        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)}
+        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)}
+        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
@@ -887,9 +889,9 @@ def list_restriction(res_type, user_id):
             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)}
+        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)}
+        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
@@ -897,9 +899,9 @@ def list_restriction(res_type, user_id):
             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)}
+        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)}
+        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:
@@ -929,7 +931,7 @@ def ajax_pathchooser():
 def check_valid_read_column(column):
     if column != "0":
         if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
-              .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all():
+            .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all():
             return False
     return True
 
@@ -937,7 +939,7 @@ def check_valid_read_column(column):
 def check_valid_restricted_column(column):
     if column != "0":
         if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
-              .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all():
+            .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all():
             return False
     return True
 
@@ -965,7 +967,7 @@ def prepare_tags(user, action, tags_name, id_list):
             raise Exception(_("Tag not found"))
         new_tags_list = [x.name for x in tags]
     else:
-        tags = calibre_db.session.query(db.cc_classes[config.config_restricted_column])\
+        tags = calibre_db.session.query(db.cc_classes[config.config_restricted_column]) \
             .filter(db.cc_classes[config.config_restricted_column].id.in_(id_list)).all()
         new_tags_list = [x.value for x in tags]
     saved_tags_list = user.__dict__[tags_name].split(",") if len(user.__dict__[tags_name]) else []
@@ -978,6 +980,19 @@ def prepare_tags(user, action, tags_name, id_list):
     return ",".join(saved_tags_list)
 
 
+def get_drives(current):
+    drive_letters = []
+    for d in string.ascii_uppercase:
+        if os.path.exists('{}:'.format(d)) and current[0].lower() != d.lower():
+            drive = "{}:\\".format(d)
+            data = {"name": drive, "fullpath": drive}
+            data["sort"] = "_" + data["fullpath"].lower()
+            data["type"] = "dir"
+            data["size"] = ""
+            drive_letters.append(data)
+    return drive_letters
+
+
 def pathchooser():
     browse_for = "folder"
     folder_only = request.args.get('folder', False) == "true"
@@ -985,40 +1000,41 @@ def pathchooser():
     path = os.path.normpath(request.args.get('path', ""))
 
     if os.path.isfile(path):
-        oldfile = path
+        old_file = path
         path = os.path.dirname(path)
     else:
-        oldfile = ""
+        old_file = ""
 
     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)
+    parent_dir = 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
+        parent_dir = os.path.relpath(parent_dir) + os.path.sep
 
-    if os.path.realpath(cwd) == os.path.realpath("/"):
-        parentdir = ""
+    files = []
+    if os.path.realpath(cwd) == os.path.realpath("/") \
+            or (sys.platform == "win32" and os.path.realpath(cwd)[1:] == os.path.realpath("/")[1:]):
+        # we are in root
+        parent_dir = ""
+        if sys.platform == "win32":
+            files = get_drives(cwd)
 
     try:
         folders = os.listdir(cwd)
     except Exception:
         folders = []
 
-    files = []
     for f in folders:
         try:
             data = {"name": f, "fullpath": os.path.join(cwd, f)}
@@ -1051,9 +1067,9 @@ def pathchooser():
     context = {
         "cwd": cwd,
         "files": files,
-        "parentdir": parentdir,
+        "parentdir": parent_dir,
         "type": browse_for,
-        "oldfile": oldfile,
+        "oldfile": old_file,
         "absolute": absolute,
     }
     return json.dumps(context)
@@ -1091,10 +1107,10 @@ def _configuration_gdrive_helper(to_save):
             if not gdrive_secrets:
                 return _configuration_result(_('client_secrets.json Is Not Configured For Web Application'))
             gdriveutils.update_settings(
-                                gdrive_secrets['client_id'],
-                                gdrive_secrets['client_secret'],
-                                gdrive_secrets['redirect_uris'][0]
-                            )
+                gdrive_secrets['client_id'],
+                gdrive_secrets['client_secret'],
+                gdrive_secrets['redirect_uris'][0]
+            )
 
     # always show Google Drive settings, but in case of error deny support
     new_gdrive_value = (not gdrive_error) and ("config_use_google_drive" in to_save)
@@ -1111,12 +1127,12 @@ def _configuration_oauth_helper(to_save):
     reboot_required = False
     for element in oauthblueprints:
         if to_save["config_" + str(element['id']) + "_oauth_client_id"] != element['oauth_client_id'] \
-                or to_save["config_" + str(element['id']) + "_oauth_client_secret"] != element['oauth_client_secret']:
+            or to_save["config_" + str(element['id']) + "_oauth_client_secret"] != element['oauth_client_secret']:
             reboot_required = True
             element['oauth_client_id'] = to_save["config_" + str(element['id']) + "_oauth_client_id"]
             element['oauth_client_secret'] = to_save["config_" + str(element['id']) + "_oauth_client_secret"]
         if to_save["config_" + str(element['id']) + "_oauth_client_id"] \
-                and to_save["config_" + str(element['id']) + "_oauth_client_secret"]:
+            and to_save["config_" + str(element['id']) + "_oauth_client_secret"]:
             active_oauths += 1
             element["active"] = 1
         else:
@@ -1169,7 +1185,7 @@ def _configuration_ldap_helper(to_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:
+        or not config.config_ldap_user_object:
         return reboot_required, _configuration_result(_('Please Enter a LDAP Provider, '
                                                         'Port, DN and User Object Identifier'))
 
@@ -1277,7 +1293,7 @@ def update_mailsettings():
         _config_int(to_save, "mail_port")
         _config_int(to_save, "mail_use_ssl")
         _config_string(to_save, "mail_password")
-        _config_int(to_save, "mail_size", lambda y: int(y)*1024*1024)
+        _config_int(to_save, "mail_size", lambda y: int(y) * 1024 * 1024)
         config.mail_server = to_save.get('mail_server', "").strip()
         config.mail_from = to_save.get('mail_from', "").strip()
         config.mail_login = to_save.get('mail_login', "").strip()
@@ -1317,7 +1333,7 @@ def edit_scheduledtasks():
     duration_field = list()
 
     for n in range(24):
-        time_field.append((n, format_time(datetime_time(hour=n), format="short",)))
+        time_field.append((n, format_time(datetime_time(hour=n), format="short", )))
     for n in range(5, 65, 5):
         t = timedelta(hours=n // 60, minutes=n % 60)
         duration_field.append((n, format_timedelta(t, threshold=.97)))
@@ -1568,7 +1584,7 @@ def ldap_import_create_user(user, user_data):
     ub.session.add(content)
     try:
         ub.session.commit()
-        return 1, None    # increase no of users
+        return 1, None  # increase no of users
     except Exception as ex:
         log.warning("Failed to create LDAP user: %s - %s", user, ex)
         ub.session.rollback()
@@ -1680,7 +1696,7 @@ def _db_configuration_update_helper():
         return _db_configuration_result('{}'.format(ex), gdrive_error)
 
     if db_change or not db_valid or not config.db_configured \
-            or config.config_calibre_dir != to_save["config_calibre_dir"]:
+        or config.config_calibre_dir != to_save["config_calibre_dir"]:
         if not os.path.exists(metadata_db) or not to_save['config_calibre_dir']:
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'), gdrive_error)
         else:

From 397cd987cbbca2f63fc0a84a935747da37724690 Mon Sep 17 00:00:00 2001
From: Ghighi Eftimie <ghyyy@ymail.com>
Date: Tue, 4 Oct 2022 20:51:29 +0300
Subject: [PATCH 347/412] added try except block for send_gmail_email method

---
 cps/tasks/mail.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index be240c795..364356fe4 100755
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -164,6 +164,7 @@ class TaskEmail(CalibreTask):
                 self.send_standard_email(msg)
             else:
                 self.send_gmail_email(msg)
+                self._handleSuccess()
         except MemoryError as e:
             log.error_or_exception(e, stacklevel=3)
             self._handleError(u'MemoryError sending e-mail: {}'.format(str(e)))

From 3d59a78c9fae4713e2784c6bbf6cd3a4489bc1ed Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 4 Oct 2022 20:48:09 +0200
Subject: [PATCH 348/412] little refactoring for send emails through gmail
 account

---
 cps/tasks/mail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 364356fe4..139e6bff1 100755
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -164,7 +164,6 @@ class TaskEmail(CalibreTask):
                 self.send_standard_email(msg)
             else:
                 self.send_gmail_email(msg)
-                self._handleSuccess()
         except MemoryError as e:
             log.error_or_exception(e, stacklevel=3)
             self._handleError(u'MemoryError sending e-mail: {}'.format(str(e)))
@@ -217,7 +216,8 @@ class TaskEmail(CalibreTask):
         log.debug("E-mail send successfully")
 
     def send_gmail_email(self, message):
-        return gmail.send_messsage(self.settings.get('mail_gmail_token', None), message)
+        gmail.send_messsage(self.settings.get('mail_gmail_token', None), message)
+        self._handleSuccess()
 
     @property
     def progress(self):

From 73567db4fb01b934604f3d17f7d025d9b4e61f6f Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Mon, 10 Oct 2022 01:49:42 +0800
Subject: [PATCH 349/412] Update douban metadata provider

Change search API
Change to Return an empty list when an error occurs
Change the way to get tags
Fix series and publisher perse error
Rename a variable with the same name as the built-in
---
 cps/metadata_provider/douban.py | 148 +++++++++++++++++++++-----------
 1 file changed, 100 insertions(+), 48 deletions(-)

diff --git a/cps/metadata_provider/douban.py b/cps/metadata_provider/douban.py
index ee21f5877..8e27e82e8 100644
--- a/cps/metadata_provider/douban.py
+++ b/cps/metadata_provider/douban.py
@@ -43,7 +43,8 @@ class Douban(Metadata):
     __id__ = "douban"
     DESCRIPTION = "豆瓣"
     META_URL = "https://book.douban.com/"
-    SEARCH_URL = "https://www.douban.com/j/search"
+    SEARCH_JSON_URL = "https://www.douban.com/j/search"
+    SEARCH_URL = "https://www.douban.com/search"
 
     ID_PATTERN = re.compile(r"sid: (?P<id>\d+),")
     AUTHORS_PATTERN = re.compile(r"作者|译者")
@@ -52,6 +53,7 @@ class Douban(Metadata):
     PUBLISHED_DATE_PATTERN = re.compile(r"出版年")
     SERIES_PATTERN = re.compile(r"丛书")
     IDENTIFIERS_PATTERN = re.compile(r"ISBN|统一书号")
+    CRITERIA_PATTERN = re.compile("criteria = '(.+)'")
 
     TITTLE_XPATH = "//span[@property='v:itemreviewed']"
     COVER_XPATH = "//a[@class='nbg']"
@@ -63,56 +65,90 @@ class Douban(Metadata):
     session = requests.Session()
     session.headers = {
         'user-agent':
-            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36 Edg/98.0.1108.56',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36 Edg/98.0.1108.56',
     }
 
-    def search(
-        self, query: str, generic_cover: str = "", locale: str = "en"
-    ) -> Optional[List[MetaRecord]]:
+    def search(self,
+               query: str,
+               generic_cover: str = "",
+               locale: str = "en") -> List[MetaRecord]:
+        val = []
         if self.active:
-            log.debug(f"starting search {query} on douban")
+            log.debug(f"start searching {query} on douban")
             if title_tokens := list(
-                self.get_title_tokens(query, strip_joiners=False)
-            ):
+                    self.get_title_tokens(query, strip_joiners=False)):
                 query = "+".join(title_tokens)
 
-            try:
-                r = self.session.get(
-                    self.SEARCH_URL, params={"cat": 1001, "q": query}
-                )
-                r.raise_for_status()
+            book_id_list = self._get_book_id_list_from_html(query)
 
-            except Exception as e:
-                log.warning(e)
-                return None
-
-            results = r.json()
-            if results["total"] == 0:
+            if not book_id_list:
+                log.debug("No search results in Douban")
                 return []
 
-            book_id_list = [
-                self.ID_PATTERN.search(item).group("id")
-                for item in results["items"][:10] if self.ID_PATTERN.search(item)
-            ]
-
-            with futures.ThreadPoolExecutor(max_workers=5) as executor:
+            with futures.ThreadPoolExecutor(
+                    max_workers=5, thread_name_prefix='douban') as executor:
 
                 fut = [
-                    executor.submit(self._parse_single_book, book_id, generic_cover)
-                    for book_id in book_id_list
+                    executor.submit(self._parse_single_book, book_id,
+                                    generic_cover) for book_id in book_id_list
                 ]
-                
+
                 val = [
-                    future.result() 
-                    for future in futures.as_completed(fut) if future.result()
+                    future.result() for future in futures.as_completed(fut)
+                    if future.result()
                 ]
 
         return val
 
-    def _parse_single_book(
-        self, id: str, generic_cover: str = ""
-    ) -> Optional[MetaRecord]:
+    def _get_book_id_list_from_html(self, query: str) -> List[str]:
+        try:
+            r = self.session.get(self.SEARCH_URL,
+                                 params={
+                                     "cat": 1001,
+                                     "q": query
+                                 })
+            r.raise_for_status()
+
+        except Exception as e:
+            log.warning(e)
+            return []
+
+        html = etree.HTML(r.content.decode("utf8"))
+        result_list = html.xpath(self.COVER_XPATH)
+
+        return [
+            self.ID_PATTERN.search(item.get("onclick")).group("id")
+            for item in result_list[:10]
+            if self.ID_PATTERN.search(item.get("onclick"))
+        ]
+
+    def _get_book_id_list_from_json(self, query: str) -> List[str]:
+        try:
+            r = self.session.get(self.SEARCH_JSON_URL,
+                                 params={
+                                     "cat": 1001,
+                                     "q": query
+                                 })
+            r.raise_for_status()
+
+        except Exception as e:
+            log.warning(e)
+            return []
+
+        results = r.json()
+        if results["total"] == 0:
+            return []
+
+        return [
+            self.ID_PATTERN.search(item).group("id")
+            for item in results["items"][:10] if self.ID_PATTERN.search(item)
+        ]
+
+    def _parse_single_book(self,
+                           id: str,
+                           generic_cover: str = "") -> Optional[MetaRecord]:
         url = f"https://book.douban.com/subject/{id}/"
+        log.debug(f"start parsing {url}")
 
         try:
             r = self.session.get(url)
@@ -136,7 +172,8 @@ class Douban(Metadata):
         html = etree.HTML(r.content.decode("utf8"))
 
         match.title = html.xpath(self.TITTLE_XPATH)[0].text
-        match.cover = html.xpath(self.COVER_XPATH)[0].attrib["href"] or generic_cover
+        match.cover = html.xpath(
+            self.COVER_XPATH)[0].attrib["href"] or generic_cover
         try:
             rating_num = float(html.xpath(self.RATING_XPATH)[0].text.strip())
         except Exception:
@@ -146,35 +183,39 @@ class Douban(Metadata):
         tag_elements = html.xpath(self.TAGS_XPATH)
         if len(tag_elements):
             match.tags = [tag_element.text for tag_element in tag_elements]
+        else:
+            match.tags = self._get_tags(html.text)
 
         description_element = html.xpath(self.DESCRIPTION_XPATH)
         if len(description_element):
-            match.description = html2text(etree.tostring(
-                description_element[-1], encoding="utf8").decode("utf8"))
+            match.description = html2text(
+                etree.tostring(description_element[-1]).decode("utf8"))
 
         info = html.xpath(self.INFO_XPATH)
 
         for element in info:
             text = element.text
             if self.AUTHORS_PATTERN.search(text):
-                next = element.getnext()
-                while next is not None and next.tag != "br":
-                    match.authors.append(next.text)
-                    next = next.getnext()
+                next_element = element.getnext()
+                while next_element is not None and next_element.tag != "br":
+                    match.authors.append(next_element.text)
+                    next_element = next_element.getnext()
             elif self.PUBLISHER_PATTERN.search(text):
-                match.publisher = element.tail.strip()
+                if publisher := element.tail.strip():
+                    match.publisher = publisher
+                else:
+                    match.publisher = element.getnext().text
             elif self.SUBTITLE_PATTERN.search(text):
-                match.title = f'{match.title}:' + element.tail.strip()
+                match.title = f'{match.title}:{element.tail.strip()}'
             elif self.PUBLISHED_DATE_PATTERN.search(text):
                 match.publishedDate = self._clean_date(element.tail.strip())
-            elif self.SUBTITLE_PATTERN.search(text):
+            elif self.SERIES_PATTERN.search(text):
                 match.series = element.getnext().text
             elif i_type := self.IDENTIFIERS_PATTERN.search(text):
                 match.identifiers[i_type.group()] = element.tail.strip()
 
         return match
 
-    
     def _clean_date(self, date: str) -> str:
         """
         Clean up the date string to be in the format YYYY-MM-DD
@@ -194,13 +235,24 @@ class Douban(Metadata):
                 if date[i].isdigit():
                     digit.append(date[i])
                 elif digit:
-                    ls.append("".join(digit) if len(digit)==2 else f"0{digit[0]}")
+                    ls.append("".join(digit) if len(digit) ==
+                              2 else f"0{digit[0]}")
                     digit = []
             if digit:
-                ls.append("".join(digit) if len(digit)==2 else f"0{digit[0]}")
+                ls.append("".join(digit) if len(digit) ==
+                          2 else f"0{digit[0]}")
 
             moon = ls[0]
-            if len(ls)>1:
-                day = ls[1]     
+            if len(ls) > 1:
+                day = ls[1]
 
         return f"{year}-{moon}-{day}"
+
+    def _get_tags(self, text: str) -> List[str]:
+        tags = []
+        if criteria := self.CRITERIA_PATTERN.search(text):
+            tags.extend(
+                item.replace('7:', '') for item in criteria.group().split('|')
+                if item.startswith('7:'))
+
+        return tags

From adfbd447ed5a083b1ebe899dcc23b3e32c74e11f Mon Sep 17 00:00:00 2001
From: Olivier <olivier.maire.jp@gmail.com>
Date: Tue, 11 Oct 2022 19:50:23 +0900
Subject: [PATCH 350/412] mp3 player was missing the csrf_token

---
 cps/static/js/libs/bar-ui.js | 12 +++++++++---
 cps/templates/listenmp3.html |  3 +++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cps/static/js/libs/bar-ui.js b/cps/static/js/libs/bar-ui.js
index e0d4b85ca..f55d66d95 100644
--- a/cps/static/js/libs/bar-ui.js
+++ b/cps/static/js/libs/bar-ui.js
@@ -177,6 +177,9 @@
 
         whileplaying: function () {
 
+          // get csrf_token
+          let csrf_token = $("input[name='csrf_token']").val();
+
 
           //This sends a bookmark update to calibreweb every 30 seconds.
           if (this.progressBuffer == undefined) {
@@ -187,7 +190,10 @@
 
             $.ajax(calibre.bookmarkUrl, {
               method: "post",
-              data: { bookmark: this.position }
+              data: {
+                csrf_token: csrf_token,
+                bookmark: this.position
+              }
             }).fail(function (xhr, status, error) {
               console.error(error);
             });
@@ -313,14 +319,14 @@
         },
 
         onstop: function () {
-          
+
           $.ajax(calibre.bookmarkUrl, {
             method: "post",
             data: { bookmark: this.position }
           }).fail(function (xhr, status, error) {
             console.error(error);
           });
-        
+
           utils.css.remove(dom.o, 'playing');
 
         },
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 2067bf38c..43c0b93de 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -114,6 +114,8 @@
 
 </div>
 
+<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+
 <script>
 soundManager.setup({
   useHTML5Audio: true,
@@ -137,6 +139,7 @@ window.calibre = {
         bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=mp3file, book_format=audioformat.upper()) }}",
         bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
         useBookmarks: "{{ g.user.is_authenticated | tojson }}"
+
             };
 </script>
 </body>

From b663f1ce830efd00bad607d152919f99b0c2fcde Mon Sep 17 00:00:00 2001
From: Ghighi Eftimie <ghyyy@ymail.com>
Date: Sun, 16 Oct 2022 16:22:08 +0200
Subject: [PATCH 351/412] added font size fader in reader's settings popup #487

---
 cps/templates/read.html | 47 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/cps/templates/read.html b/cps/templates/read.html
index e53119985..f417e6c1d 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -13,6 +13,38 @@
         <link rel="stylesheet" href="{{ url_for('static', filename='css/libs/normalize.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/popup.css') }}">
+
+        <style>
+            .fontSizeWrapper {
+                position: relative;
+            }
+            .slider {
+                position: absolute;
+                top: 50%;
+                transform: translate(0,-50%);
+                width: 90%;
+                height: 60px;
+                background: transparent;
+                border-radius: 20px;
+                display: flex;
+                align-items: center;
+                box-shadow: 0px 15px 40px #7E6D5766;
+            }
+            .slider label {
+                font-size: 20px;
+                font-weight: 400;
+                font-family: Open Sans;
+                padding-right: 10px;
+                color: white;
+            }
+            .slider input[type="range"] {
+                width: 80%;
+                height: 5px;
+                background: black;
+                border: none;
+                outline: none;
+            }
+        </style>
     </head>
     <body>
       <div id="sidebar">
@@ -84,6 +116,12 @@
                     <input type="checkbox" id="sidebarReflow" name="sidebarReflow">{{_('Reflow text when sidebars are open.')}}
                   </p>
               </div>
+              <div class="fontSizeWrapper">
+                <div class="slider">
+                    <label for="fader">{{ _('Font Sizes') }}</label>
+                    <input type="range" min="75" max="200" value="100" id="fontSizeFader" step="25">
+                </div>
+              </div>
               <div class="closer icon-cancel-circled"></div>
           </div>
       </div>
@@ -128,7 +166,14 @@
             else if (id == "blackTheme") {
               document.getElementById("main").style.backgroundColor = "black";
             }
-          }
+
+        }
+
+        // font size settings logic
+        let fontSizeFader = document.getElementById('fontSizeFader');
+        fontSizeFader.addEventListener ("change", function () {
+            reader.rendition.themes.fontSize(`${this.value}%`)
+        });
       </script>
       <script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/libs/reader.min.js') }}"></script>

From a992aafc13e6f907f88479723d83f7796c222ce4 Mon Sep 17 00:00:00 2001
From: Ghighi Eftimie <ghyyy@ymail.com>
Date: Fri, 21 Oct 2022 14:50:44 +0200
Subject: [PATCH 352/412] fixes #2515

---
 cps/static/css/caliBlur.css          | 4 +++-
 cps/static/css/caliBlur_override.css | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index b2b354234..88c5c667e 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -3290,9 +3290,11 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] .dropd
     -ms-transform-origin: center top;
     transform-origin: center top;
     border: 0;
-    left: 0 !important;
     overflow-y: auto;
 }
+.dropdown-menu:not(.datepicker-dropdown):not(.profileDropli) {
+    left: 0 !important;
+}
 #add-to-shelves {
   max-height: calc(100% - 120px);
   overflow-y: auto;
diff --git a/cps/static/css/caliBlur_override.css b/cps/static/css/caliBlur_override.css
index 4c8b6cb07..29fd7e298 100644
--- a/cps/static/css/caliBlur_override.css
+++ b/cps/static/css/caliBlur_override.css
@@ -22,3 +22,7 @@ body.serieslist.grid-view div.container-fluid > div > div.col-sm-10::before {
   padding: 0 0;
   line-height: 15px;
 }
+
+input.datepicker {color: transparent}
+input.datepicker:focus {color: transparent}
+input.datepicker:focus + input {color: #555}

From 9409b9db9c9936f86350a08bea148a51dca2aa2b Mon Sep 17 00:00:00 2001
From: Ghighi Eftimie <ghyyy@ymail.com>
Date: Fri, 21 Oct 2022 21:52:04 +0200
Subject: [PATCH 353/412] fixes for 946, 2284 caliblur

---
 cps/static/css/caliBlur.css | 32 --------------------------------
 cps/static/js/caliBlur.js   | 21 +++++----------------
 cps/templates/layout.html   | 30 +++++++++++++++++++++++++-----
 cps/templates/login.html    |  8 ++++++++
 4 files changed, 38 insertions(+), 53 deletions(-)

diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index b2b354234..287500c49 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -4423,38 +4423,6 @@ body.advanced_search > div.container-fluid > div.row-fluid > div.col-sm-10 > div
         left: 49px;
         margin-top: 5px
     }
-
-    body:not(.blur) > .navbar > .container-fluid > .navbar-header:after, body:not(.blur) > .navbar > .container-fluid > .navbar-header:before {
-        color: hsla(0, 0%, 100%, .7);
-        cursor: pointer;
-        display: block;
-        font-family: plex-icons-new, serif;
-        font-size: 20px;
-        font-stretch: 100%;
-        font-style: normal;
-        font-variant-caps: normal;
-        font-variant-east-asian: normal;
-        font-variant-numeric: normal;
-        font-weight: 400;
-        height: 60px;
-        letter-spacing: normal;
-        line-height: 60px;
-        position: absolute
-    }
-
-    body:not(.blur) > .navbar > .container-fluid > .navbar-header:before {
-        content: "\EA30";
-        -webkit-font-variant-ligatures: normal;
-        font-variant-ligatures: normal;
-        left: 20px
-    }
-
-    body:not(.blur) > .navbar > .container-fluid > .navbar-header:after {
-        content: "\EA2F";
-        -webkit-font-variant-ligatures: normal;
-        font-variant-ligatures: normal;
-        left: 60px
-    }
 }
 
 body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > div.row:first-of-type > div.col > h2:before, body.admin > div.container-fluid > div > div.col-sm-10 > div.discover > h2:first-of-type:before, body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > h1:before, body.newuser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > h1:before {
diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js
index 0f179645c..d9309aebe 100755
--- a/cps/static/js/caliBlur.js
+++ b/cps/static/js/caliBlur.js
@@ -16,7 +16,6 @@
  */
 // Move advanced search to side-menu
 $("a[href*='advanced']").parent().insertAfter("#nav_new");
-$("body").addClass("blur");
 $("body.stat").addClass("stats");
 $("body.config").addClass("admin");
 $("body.uiconfig").addClass("admin");
@@ -29,8 +28,8 @@ $("body > div.container-fluid > div > div.col-sm-10 > div.filterheader").attr("s
 // Back button
 curHref = window.location.href.split("/");
 prevHref = document.referrer.split("/");
-$(".navbar-form.navbar-left")
-    .before('<div class="plexBack"><a href="' + encodeURI(document.referrer) + '"></a></div>');
+$(".plexBack a").attr('href', encodeURI(document.referrer));
+
 if (history.length === 1 ||
     curHref[0] +
     curHref[1] +
@@ -44,14 +43,9 @@ if (history.length === 1 ||
 
 //Weird missing a after pressing back from edit.
 setTimeout(function () {
-    if ($(".plexBack a").length < 1) {
-        $(".plexBack").append('<a href="' + encodeURI(document.referrer) + '"></a>');
-    }
+    $(".plexBack a").attr('href', encodeURI(document.referrer));
 }, 10);
 
-// Home button
-$(".plexBack").before('<div class="home-btn"></div>');
-$("a.navbar-brand").clone().appendTo(".home-btn").empty().removeClass("navbar-brand");
 /////////////////////////////////
 // Start of Book Details Work //
 ///////////////////////////////
@@ -326,13 +320,8 @@ url = window.location.pathname
 // Move create shelf
 $("#nav_createshelf").prependTo(".your-shelves");
 
-// Create drop-down for profile and move elements to it
-$("#main-nav")
-    .prepend('<li class="dropdown"><a href="#" class="dropdown-toggle profileDrop" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-user"></span></a><ul class="dropdown-menu profileDropli"></ul></li>');
-$("#top_user").parent().addClass("dropdown").appendTo(".profileDropli");
-$("#nav_about").addClass("dropdown").appendTo(".profileDropli");
-$("#register").parent().addClass("dropdown").appendTo(".profileDropli");
-$("#logout").parent().addClass("dropdown").appendTo(".profileDropli");
+// Move About link it the profile dropdown
+$(".profileDropli #top_user").parent().after($("#nav_about").addClass("dropdown"))
 
 // Remove the modals except from some areas where they are needed
 bodyClass = $("body").attr("class").split(" ");
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 7502514a1..00923a6e9 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -27,7 +27,7 @@
       <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
   </head>
-  <body class="{{ page }} {{ bodyClass }}" data-text="{{_('Home')}}" data-textback="{{_('Back')}}">
+  <body class="{{ page }} {{ bodyClass }} {% if g.current_theme == 1 %} blur {% endif %}" data-text="{{_('Home')}}" data-textback="{{_('Back')}}">
     <!-- Static navbar -->
     <div class="navbar navbar-default navbar-static-top" role="navigation">
       <div class="container-fluid">
@@ -40,6 +40,10 @@
           </button>
           <a class="navbar-brand" href="{{url_for('web.index')}}">{{instance}}</a>
         </div>
+        {% if g.current_theme == 1 %}
+            <div class="home-btn"><a class="home-btn-tooltip" href="/" data-toggle="tooltip" title="" data-placement="bottom" data-original-title="Home"></a></div>
+            <div class="plexBack"><a href="{{url_for('web.index')}}"></a></div>
+        {% endif %}
         {% if g.user.is_authenticated or g.allow_anonymous %}
           <form class="navbar-form navbar-left" role="search" action="{{url_for('search.simple_search')}}" method="GET">
             <div class="form-group input-group input-group-sm">
@@ -59,6 +63,20 @@
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">
             {% if g.user.is_authenticated or g.allow_anonymous %}
+              {% if g.current_theme == 1 %}
+              <li class="dropdown"><a href="#" class="dropdown-toggle profileDrop" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-user"></span></a>
+                <ul class="dropdown-menu profileDropli">
+                    <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span> <span class="hidden-sm">{{g.user.name}}</span></a></li>
+                    {% if g.allow_registration and not g.user.is_authenticated %}
+                    <li><a id="login" href="{{url_for('web.login')}}"><span class="glyphicon glyphicon-log-in"></span> {{_('Login')}}</a></li>
+                    <li><a id="register" href="{{url_for('web.register')}}"><span class="glyphicon glyphicon-user"></span> {{_('Register')}}</a></li>
+                    {% endif %}
+                    {% if not g.user.is_anonymous %}
+                    <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span> <span class="hidden-sm">{{_('Logout')}}</span></a></li>
+                    {% endif %}
+                </ul>
+              </li>
+              {% endif %}
               {% if g.user.role_upload() and g.allow_upload %}
                   <li>
                     <form id="form-upload" class="navbar-form" action="{{ url_for('edit-book.upload') }}" data-title="{{_('Uploading...')}}" data-footer="{{_('Close')}}" data-failed="{{_('Error')}}" data-message="{{_('Upload done, processing, please wait...')}}" method="post" enctype="multipart/form-data">
@@ -71,17 +89,19 @@
                   </li>
               {% endif %}
               {% if not g.user.is_anonymous and not simple%}
-                <li><a id="top_tasks" href="{{url_for('tasks.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
+                <li class="top_tasks"><a id="top_tasks" href="{{url_for('tasks.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
               {% endif %}
               {% if g.user.role_admin() %}
                 <li><a id="top_admin" data-text="{{_('Settings')}}" href="{{url_for('admin.admin')}}"><span class="glyphicon glyphicon-dashboard"></span> <span class="hidden-sm">{{_('Admin')}}</span></a></li>
               {% endif %}
+              {% if g.current_theme == 0 %}
               <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span> <span class="hidden-sm">{{g.user.name}}</span></a></li>
-              {% if not g.user.is_anonymous %}
-              <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span> <span class="hidden-sm">{{_('Logout')}}</span></a></li>
+                {% if not g.user.is_anonymous %}
+                <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span> <span class="hidden-sm">{{_('Logout')}}</span></a></li>
+                {% endif %}
               {% endif %}
             {% endif %}
-            {% if g.allow_registration and not g.user.is_authenticated %}
+            {% if g.allow_registration and not g.user.is_authenticated and g.current_theme == 0 %}
             <li><a id="login" href="{{url_for('web.login')}}"><span class="glyphicon glyphicon-log-in"></span> {{_('Login')}}</a></li>
             <li><a id="register" href="{{url_for('web.register')}}"><span class="glyphicon glyphicon-user"></span> {{_('Register')}}</a></li>
             {% endif %}
diff --git a/cps/templates/login.html b/cps/templates/login.html
index 708e63ea0..36471dc6c 100644
--- a/cps/templates/login.html
+++ b/cps/templates/login.html
@@ -22,6 +22,14 @@
     {% if config.config_login_type == 0 and mail%}
     <button type="submit" name="forgot" value="forgot" class="btn btn-default">{{_('Forgot Password?')}}</button>
     {% endif %}
+    {% if g.current_theme == 1 %}
+      {% if g.allow_registration %}
+      <a class="btn btn-default" id="register" href="{{url_for('web.register')}}"><span class="glyphicon glyphicon-user"></span> {{_('Register')}}</a>
+      {% endif %}
+      {% if g.allow_anonymous %}
+      <a class="btn btn-default" href="{{url_for('web.index')}}">{{ _('Home') }}</a>
+      {% endif %}
+    {%endif%}
     {% if config.config_remote_login %}
     <a href="{{url_for('remotelogin.remote_login')}}" id="remote_login" class="pull-right">{{_('Log in with Magic Link')}}</a>
     {% endif %}

From e8c461b14f84d13ab2da7179e9f6205a4eefdf53 Mon Sep 17 00:00:00 2001
From: Feige-cn <65696105+Feige-cn@users.noreply.github.com>
Date: Tue, 8 Nov 2022 01:32:38 +0800
Subject: [PATCH 354/412] Update web.py

In Admin view page, Editor UI Configuration - Default Settings for New Users - Default Language, set up the new user's default language is not effective. I changed this web.py, add a line of code in 1248 lines in register function. Creating the new user need to take the default language.
---
 cps/web.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cps/web.py b/cps/web.py
index e1b69ce9c..19fb2d12e 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1245,6 +1245,7 @@ def register():
             password = generate_random_password()
             content.password = generate_password_hash(password)
             content.role = config.config_default_role
+            content.locale = config.config_default_locale
             content.sidebar_view = config.config_default_show
             try:
                 ub.session.add(content)

From b52c7aac5396484566595d4852fcf1390904ed67 Mon Sep 17 00:00:00 2001
From: Vijay Pillai <evijayanathan@gmail.com>
Date: Thu, 10 Nov 2022 11:02:50 -0500
Subject: [PATCH 355/412] Added GOOGLE_SITE_VERIFICATION environmental value to
 enable google safe browsing

---
 cps/admin.py                  | 1 +
 cps/templates/http_error.html | 3 +++
 cps/templates/layout.html     | 3 +++
 cps/templates/listenmp3.html  | 3 +++
 cps/templates/read.html       | 3 +++
 cps/templates/readcbr.html    | 3 +++
 cps/templates/readdjvu.html   | 4 ++++
 cps/templates/readpdf.html    | 3 +++
 cps/templates/readtxt.html    | 4 ++++
 cps/templates/shelfdown.html  | 3 +++
 10 files changed, 30 insertions(+)

diff --git a/cps/admin.py b/cps/admin.py
index 09a553b40..b415f412a 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -108,6 +108,7 @@ def before_request():
         logout_user()
     g.constants = constants
     g.user = current_user
+    g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')
     g.allow_registration = config.config_public_reg
     g.allow_anonymous = config.config_anonbrowse
     g.allow_upload = config.config_uploading
diff --git a/cps/templates/http_error.html b/cps/templates/http_error.html
index 103d10851..9c6c0f568 100644
--- a/cps/templates/http_error.html
+++ b/cps/templates/http_error.html
@@ -6,6 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}    
 
     <!-- Bootstrap -->
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 7502514a1..22a6baec0 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -8,6 +8,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}
 
     <!-- Bootstrap -->
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 2067bf38c..ff1ac0499 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -8,6 +8,9 @@
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width">
   <meta name="apple-mobile-web-app-capable" content="yes">
+  {% if g.google_site_verification|length > 0 %}
+    <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+  {% endif %}  
 
   <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
   <script src="{{ url_for('static', filename='js/libs/soundmanager2.js') }}"></script>
diff --git a/cps/templates/read.html b/cps/templates/read.html
index e53119985..1b890c33d 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -7,6 +7,9 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
+        {% if g.google_site_verification|length > 0 %}
+          <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+        {% endif %}          
         <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
         <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 
diff --git a/cps/templates/readcbr.html b/cps/templates/readcbr.html
index 411e3fdd4..9a7a489a7 100644
--- a/cps/templates/readcbr.html
+++ b/cps/templates/readcbr.html
@@ -7,6 +7,9 @@
   <title>{{_('Comic Reader')}} | {{title}}</title>
   <meta name="viewport" content="width=device-width, user-scalable=no">
   <meta name="apple-mobile-web-app-capable" content="yes">
+  {% if g.google_site_verification|length > 0 %}
+    <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+  {% endif %}    
 
   <link rel="stylesheet" href="{{ url_for('static', filename='css/libs/normalize.css') }}">
   <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}" type="text/css"/>
diff --git a/cps/templates/readdjvu.html b/cps/templates/readdjvu.html
index 3504e3947..ff512e79d 100644
--- a/cps/templates/readdjvu.html
+++ b/cps/templates/readdjvu.html
@@ -6,6 +6,10 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}  
+
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
     <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 
diff --git a/cps/templates/readpdf.html b/cps/templates/readpdf.html
index ca3f23894..6d6963740 100644
--- a/cps/templates/readpdf.html
+++ b/cps/templates/readpdf.html
@@ -26,6 +26,9 @@ See https://github.com/adobe-type-tools/cmap-resources
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="google" content="notranslate">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}      
     <title>{{_('PDF Reader')}} | {{title}}</title>
 
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
diff --git a/cps/templates/readtxt.html b/cps/templates/readtxt.html
index b157fe95a..71dd0e985 100644
--- a/cps/templates/readtxt.html
+++ b/cps/templates/readtxt.html
@@ -7,6 +7,10 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
+        {% if g.google_site_verification|length > 0 %}
+          <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+        {% endif %}  
+
         <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
         <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index 1016c0a25..50f339b93 100755
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -6,6 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}      
 
     <!-- Bootstrap -->
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">

From 9450084d6e6309670364ab4aa0bfd800e54c93ad Mon Sep 17 00:00:00 2001
From: JonathanHerrewijnen <jonathan.herrewijnen@gmail.com>
Date: Thu, 24 Nov 2022 20:34:01 +0000
Subject: [PATCH 356/412] Editing listenmp3.html page to show audiobook info

---
 cps/templates/listenmp3.html | 208 ++++++++++++++++++++++++++++++++++-
 1 file changed, 207 insertions(+), 1 deletion(-)

diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 2067bf38c..b178f1a9b 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -26,6 +26,212 @@
 
 <body>
 
+  <div class="row" style="display: inline-block; width: 100%;">
+    <div class="col-sm-3 col-lg-3 col-xs-5">
+      
+    </div>
+    <div class="col-sm-6 col-lg-6 book-meta" style="margin-bottom: 2%;">
+      <img id="detailcover" title="{{entry.title}}" src="{{url_for('web.get_cover', book_id=entry.id, resolution='og', c=entry|last_modified)}}" style="float: right; margin-top: 20px"/>
+      <h2 id="title">{{entry.title}}</h2>
+      <p class="author">
+          {% for author in entry.ordered_authors %}
+            <a href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id ) }}">{{author.name.replace('|',',')}}</a>
+            {% if not loop.last %}
+              &amp;
+            {% endif %}
+          {% endfor %}
+        </p>
+      {% if entry.ratings.__len__() > 0 %}
+        <div class="rating">
+        <p>
+          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+            <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-empty"></span>
+              {% endfor %}
+            {% endif %}
+          {% endfor %}
+        </p>
+        </div>
+      {% endif %}
+      {% if entry.series|length > 0 %}
+          <p>{{_("Book %(index)s of %(range)s", index=entry.series_index | formatfloat(2), range=(url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id)|escapedlink(entry.series[0].name))|safe)}}</p>
+
+      {% endif %}
+
+      {% if entry.languages.__len__() > 0 %}
+       <div class="languages">
+       <p>
+      <span class="label label-default">{{_('Language')}}: {% for language in entry.languages %}{{language.language_name}}{% if not loop.last %}, {% endif %}{% endfor %}</span>
+      </p>
+      </div>
+      {% endif %}
+
+      {% if entry.identifiers|length > 0 %}
+      <div class="identifiers">
+        <p>
+        <span class="glyphicon glyphicon-link"></span>
+        {% for identifier in entry.identifiers %}
+          <a href="{{identifier}}" target="_blank" class="btn btn-xs btn-success" role="button">{{identifier.format_type()}}</a>
+        {%endfor%}
+      </p>
+      </div>
+      {% endif %}
+
+      {% if entry.tags|length > 0 %}
+
+      <div class="tags">
+      <p>
+        <span class="glyphicon glyphicon-tags"></span>
+
+        {% for tag in entry.tags %}
+          <a href="{{ url_for('web.books_list', data='category', sort_param='stored', book_id=tag.id) }}" class="btn btn-xs btn-info" role="button">{{tag.name}}</a>
+        {%endfor%}
+      </p>
+
+      </div>
+      {% endif %}
+
+      {% if entry.publishers|length > 0 %}
+      <div class="publishers">
+        <p>
+          <span>{{_('Publisher')}}:
+              <a href="{{url_for('web.books_list', data='publisher', sort_param='stored', book_id=entry.publishers[0].id ) }}">{{entry.publishers[0].name}}</a>
+          </span>
+        </p>
+      </div>
+      {% endif %}
+
+      {% if (entry.pubdate|string)[:10] != '0101-01-01' %}
+      <div class="publishing-date">
+        <p>{{_('Published')}}: {{entry.pubdate|formatdate}} </p>
+      </div>
+      {% endif %}
+      {% if cc|length > 0 %}
+
+
+        {% for c in cc %}
+        <div class="real_custom_columns">
+          {% if entry['custom_column_' ~ c.id]|length > 0 %}
+            {{ c.name }}:
+            {% for column in entry['custom_column_' ~ c.id] %}
+              {% if c.datatype == 'rating' %}
+                {{ (column.value / 2)|formatfloat }}
+              {% else %}
+                {% if c.datatype == 'bool' %}
+                  {% if column.value == true %}
+                    <span class="glyphicon glyphicon-ok"></span>
+                  {% else %}
+                    <span class="glyphicon glyphicon-remove"></span>
+                  {% endif %}
+                {% else %}
+                {% if c.datatype == 'float' %}
+                  {{ column.value|formatfloat(2) }}
+                {% elif c.datatype == 'datetime' %}
+                  {{ column.value|formatdate }}
+                {% elif c.datatype == 'comments' %}
+                  {{column.value|safe}}
+                {% elif c.datatype == 'series' %}
+                  {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
+                {% elif c.datatype == 'text' %}
+                    {{ column.value.strip() }}{% if not loop.last %}, {% endif %}
+                {% else %}
+                  {{ column.value }}
+                {% endif %}
+                {% endif %}
+              {% endif %}
+            {% endfor %}
+          {% endif %}
+        </div>
+        {% endfor %}
+      {% endif %}
+      {% if not g.user.is_anonymous %}
+
+        <div class="custom_columns">
+          <p>
+          <form id="have_read_form" action="{{ url_for('web.toggle_read', book_id=entry.id)}}" method="POST">
+            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+            <label class="block-label">
+              <input id="have_read_cb" data-checked="{{_('Mark As Unread')}}" data-unchecked="{{_('Mark As Read')}}" type="checkbox" {% if entry.read_status %}checked{% endif %} >
+              <span>{{_('Read')}}</span>
+            </label>
+          </form>
+          </p>
+          {% if g.user.check_visibility(32768) %}
+          <p>
+            <form id="archived_form" action="{{ url_for('web.toggle_archived', book_id=entry.id)}}" method="POST">
+              <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+              <label class="block-label">
+                <input id="archived_cb" data-checked="{{_('Restore from archive')}}" data-unchecked="{{_('Add to archive')}}" type="checkbox" {% if entry.is_archived %}checked{% endif %} >
+                <span>{{_('Archived')}}</span>
+              </label>
+            </form>
+          </p>
+          {% endif %}
+        </div>
+      {% endif %}
+
+
+      {% if entry.comments|length > 0 and entry.comments[0].text|length > 0%}
+        <div class="comments">
+            <h3 id="decription">{{_('Description:')}}</h3>
+            {{entry.comments[0].text|safe}}
+        </div>
+      {% endif %}
+
+
+      <div class="more-stuff">
+
+      {% if g.user.is_authenticated %}
+      {% if g.user.shelf.all() or g.shelves_access %}
+      <div id="shelf-actions" class="btn-toolbar" role="toolbar">
+        <div class="btn-group" role="group" aria-label="Add to shelves">
+          <button id="add-to-shelf" type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <span class="glyphicon glyphicon-list"></span> {{_('Add to shelf')}}
+            <span class="caret"></span>
+          </button>
+          <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
+            {% for shelf in g.shelves_access %}
+              {% if not shelf.id in books_shelfs and ( not shelf.is_public or g.user.role_edit_shelfs() ) %}
+                <li>
+                  <a data-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                     data-remove-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                     data-shelf-action="add"
+                  >
+                    {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}
+                  </a>
+                </li>
+              {% endif %}
+            {%endfor%}
+          </ul>
+        </div>
+        <div id="remove-from-shelves" class="btn-group" role="group" aria-label="Remove from shelves">
+          {% if books_shelfs %}
+            {% for shelf in g.shelves_access %}
+              {% if shelf.id in books_shelfs %}
+                <a data-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                   data-add-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                   class="btn btn-sm btn-default" role="button" data-shelf-action="remove"
+                >
+                  <span {% if not shelf.is_public or g.user.role_edit_shelfs() %}
+                        class="glyphicon glyphicon-remove"
+                        {% endif %}></span> {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}
+                </a>
+              {% endif %}
+            {%endfor%}
+          {% endif %}
+        </div>
+        <div id="shelf-action-errors" class="pull-left" role="alert"></div>
+      </div>
+      {% endif %}
+
+      {% endif %}
+      </div>
+
+    </div>
+  </div>
+
 <div class="sm2-bar-ui full-width fixed">
 
  <div class="bd sm2-main-controls">
@@ -141,4 +347,4 @@ window.calibre = {
 </script>
 </body>
 
-</html>
+</html>
\ No newline at end of file

From 29fef4a314f7d54f767a47f3b9d442e1adf41ad6 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 20 Dec 2022 23:14:41 +0100
Subject: [PATCH 357/412] Add French articles to the title regex

---
 cps/config_sql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index bba3d6508..fed7dfe35 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -74,7 +74,7 @@ class _Settings(_Base):
     config_random_books = Column(Integer, default=4)
     config_authors_max = Column(Integer, default=0)
     config_read_column = Column(Integer, default=0)
-    config_title_regex = Column(String, default=r'^(A|The|An|Der|Die|Das|Den|Ein|Eine|Einen|Dem|Des|Einem|Eines)\s+')
+    config_title_regex = Column(String, default=r'^(A|The|An|Der|Die|Das|Den|Ein|Eine|Einen|Dem|Des|Einem|Eines|Le|La|Les|L\'|Un|Une)\s+')
     # config_mature_content_tags = Column(String, default='')
     config_theme = Column(Integer, default=0)
 

From 2ddbaa21502721d8c94ac274dcd846e1d528f7c1 Mon Sep 17 00:00:00 2001
From: Julien Voisin <jvoisin@users.noreply.github.com>
Date: Thu, 22 Dec 2022 12:47:37 +0100
Subject: [PATCH 358/412] Add object-src to the CSP policy

---
 cps/web.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cps/web.py b/cps/web.py
index e1b69ce9c..98489b043 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -85,7 +85,8 @@ def add_security_headers(resp):
     csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' "
     if request.path.startswith("/author/") and config.config_use_goodreads:
         csp += "images.gr-assets.com i.gr-assets.com s.gr-assets.com"
-    csp += " data:"
+    csp += " data:;"
+    csp += " object-src: 'none';"
     resp.headers['Content-Security-Policy'] = csp
     if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
         resp.headers['Content-Security-Policy'] += " *"

From 7d023ce741f6450547e437fa83d425490e3b0efe Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 22 Dec 2022 23:38:28 +0100
Subject: [PATCH 359/412] Bump jquery's version from 3.6.0 to 3.6.3

---
 cps/static/js/libs/jquery.min.js  | 4 ++--
 cps/static/js/libs/jquery.min.map | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cps/static/js/libs/jquery.min.js b/cps/static/js/libs/jquery.min.js
index c4c6022f2..b5329e9ae 100644
--- a/cps/static/js/libs/jquery.min.js
+++ b/cps/static/js/libs/jquery.min.js
@@ -1,2 +1,2 @@
-/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(j).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ee(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Se(this,e,Ce),!1},trigger:function(){return Se(this,e),!0},_default:function(){return!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Me=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ie=new RegExp(ne.join("|"),"i");function We(e,t,n){var r,i,o,a,s=e.style;return(n=n||Re(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Pe.test(a)&&Ie.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Fe(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var Be=["Webkit","Moz","ms"],$e=E.createElement("div").style,_e={};function ze(e){var t=S.cssProps[e]||_e[e];return t||(e in $e?e:_e[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Be.length;while(n--)if((e=Be[n]+t)in $e)return e}(e)||e)}var Ue=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ve={position:"absolute",visibility:"hidden",display:"block"},Ge={letterSpacing:"0",fontWeight:"400"};function Ye(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Qe(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Je(e,t,n){var r=Re(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=We(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Qe(e,t,n||(i?"border":"content"),o,r,a)+"px"}function Ke(e,t,n,r,i){return new Ke.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=We(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Xe.test(t),l=e.style;if(u||(t=ze(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Xe.test(t)||(t=ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=We(e,t,r)),"normal"===i&&t in Ge&&(i=Ge[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ue.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Je(e,u,n):Me(e,Ve,function(){return Je(e,u,n)})},set:function(e,t,n){var r,i=Re(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Qe(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Qe(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Ye(0,t,s)}}}),S.cssHooks.marginLeft=Fe(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(We(e,"marginLeft"))||e.getBoundingClientRect().left-Me(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Ye)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Re(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=Ke).prototype={constructor:Ke,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=Ke.propHooks[this.prop];return e&&e.get?e.get(this):Ke.propHooks._default.get(this)},run:function(e){var t,n=Ke.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ke.propHooks._default.set(this),this}}).init.prototype=Ke.prototype,(Ke.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=Ke.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=Ke.prototype.init,S.fx.step={};var Ze,et,tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;function ot(){et&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(ot):C.setTimeout(ot,S.fx.interval),S.fx.tick())}function at(){return C.setTimeout(function(){Ze=void 0}),Ze=Date.now()}function st(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ut(e,t,n){for(var r,i=(lt.tweeners[t]||[]).concat(lt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function lt(o,e,t){var n,a,r=0,i=lt.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=Ze||at(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:Ze||at(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=lt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ut,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(lt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],lt.tweeners[n]=lt.tweeners[n]||[],lt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],rt.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ut(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?lt.prefilters.unshift(e):lt.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=lt(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&it.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(st(r,!0),e,t,n)}}),S.each({slideDown:st("show"),slideUp:st("hide"),slideToggle:st("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(Ze=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),Ze=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){et||(et=!0,ot())},S.fx.stop=function(){et=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},tt=E.createElement("input"),nt=E.createElement("select").appendChild(E.createElement("option")),tt.type="checkbox",y.checkOn=""!==tt.value,y.optSelected=nt.selected,(tt=E.createElement("input")).value="t",tt.type="radio",y.radioValue="t"===tt.value;var ct,ft=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?ct:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ct={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=ft[t]||S.find.attr;ft[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=ft[o],ft[o]=r,r=null!=a(e,t,n)?o:null,ft[o]=i),r}});var pt=/^(?:input|select|textarea|button)$/i,dt=/^(?:a|area)$/i;function ht(e){return(e.match(P)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function vt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):pt.test(e.nodeName)||dt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,gt(this)))});if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,gt(this)))});if(!arguments.length)return this.attr("class","");if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,gt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=vt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=gt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+ht(gt(n))+" ").indexOf(t))return!0;return!1}});var yt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(yt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ht(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var mt=/^(?:focusinfocus|focusoutblur)$/,xt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!mt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,mt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,xt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,xt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var bt=C.location,wt={guid:Date.now()},Tt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Ct=/\[\]$/,Et=/\r?\n/g,St=/^(?:submit|button|image|reset|file)$/i,kt=/^(?:input|select|textarea|keygen)/i;function At(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||Ct.test(n)?i(n,t):At(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)At(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)At(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&kt.test(this.nodeName)&&!St.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(Et,"\r\n")}}):{name:t.name,value:n.replace(Et,"\r\n")}}).get()}});var Nt=/%20/g,jt=/#.*$/,Dt=/([?&])_=[^&]*/,qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Lt=/^(?:GET|HEAD)$/,Ht=/^\/\//,Ot={},Pt={},Rt="*/".concat("*"),Mt=E.createElement("a");function It(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Wt(t,i,o,a){var s={},u=t===Pt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Ft(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Mt.href=bt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:bt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(bt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Ft(Ft(e,S.ajaxSettings),t):Ft(S.ajaxSettings,e)},ajaxPrefilter:It(Ot),ajaxTransport:It(Pt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=qt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||bt.href)+"").replace(Ht,bt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Mt.protocol+"//"+Mt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Wt(Ot,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Lt.test(v.type),f=v.url.replace(jt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Nt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Tt.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Dt,"$1"),o=(Tt.test(f)?"&":"?")+"_="+wt.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+Rt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Wt(Pt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&S.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Bt={0:200,1223:204},$t=S.ajaxSettings.xhr();y.cors=!!$t&&"withCredentials"in $t,y.ajax=$t=!!$t,S.ajaxTransport(function(i){var o,a;if(y.cors||$t&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Bt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=ht(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Xt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Xt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Vt=C.jQuery,Gt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Gt),e&&C.jQuery===S&&(C.jQuery=Vt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
+/*! jQuery v3.6.3 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,y=n.hasOwnProperty,a=y.toString,l=a.call(Object),v={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},S=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||S).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.3",E=function(e,t){return new E.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}E.fn=E.prototype={jquery:f,constructor:E,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=E.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return E.each(this,e)},map:function(n){return this.pushStack(E.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(E.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(E.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},E.extend=E.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(E.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||E.isPlainObject(n)?n:{},i=!1,a[t]=E.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},E.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=y.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?E.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:v}),"function"==typeof Symbol&&(E.fn[Symbol.iterator]=t[Symbol.iterator]),E.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,S,y,s,c,v,E="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",$=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,S)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&v(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!y||!y.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ve(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=E)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{if(d.cssSupportsSelector&&!CSS.supports("selector(:is("+c+"))"))throw new Error;return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===E&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[E]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ye(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ve(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,S=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.cssSupportsSelector=ce(function(){return CSS.supports("selector(*)")&&C.querySelectorAll(":is(:jqfake)")&&!CSS.supports("selector(:is(*,:jqfake))")}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=E,!C.getElementsByName||!C.getElementsByName(E).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&S){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&S){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&S)return t.getElementsByClassName(e)},s=[],y=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+E+"'></a><select id='"+E+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+E+"-]").length||y.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||y.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+E+"+*").length||y.push(".#.+[+~]"),e.querySelectorAll("\\\f"),y.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),d.cssSupportsSelector||y.push(":has"),y=y.length&&new RegExp(y.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),v=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType&&e.documentElement||e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&v(p,e)?-1:t==C||t.ownerDocument==p&&v(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&S&&!N[t+" "]&&(!s||!s.test(t))&&(!y||!y.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),v(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!S):void 0;return void 0!==r?r:d.attributes||!S?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace($," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,y){var v="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===y?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=v!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(v){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[E]||(a[E]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[E]||(a[E]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[E]||(a[E]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=y)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[E]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[E]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=S?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ye(function(){return[0]}),last:ye(function(e,t){return[t-1]}),eq:ye(function(e,t,n){return[n<0?n+t:n]}),even:ye(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ye(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ye(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ye(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[E]||(e[E]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,y,v,e){return y&&!y[E]&&(y=Ce(y)),v&&!v[E]&&(v=Ce(v,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?v||(e?d:l||y)?[]:t:f;if(g&&g(f,p,n,r),y){i=Te(p,u),y(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(v||d){if(v){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);v(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=v?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),v?v(null,t,p,r):H.apply(t,p)})}function Se(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[E]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Se(e.slice(s,n)),n<r&&Se(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,y,v,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Se(t[n]))[E]?i.push(a):o.push(a);(a=A(e,(y=o,m=0<(v=i).length,x=0<y.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!S);while(s=y[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=v[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+v.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&S&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ve(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!S,n,!t||ee.test(e)&&ve(t.parentNode)||t),n},d.sortStable=E.split("").sort(j).join("")===E,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);E.find=d,E.expr=d.selectors,E.expr[":"]=E.expr.pseudos,E.uniqueSort=E.unique=d.uniqueSort,E.text=d.getText,E.isXMLDoc=d.isXML,E.contains=d.contains,E.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&E(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=E.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?E.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?E.grep(e,function(e){return e===n!==r}):"string"!=typeof n?E.grep(e,function(e){return-1<i.call(n,e)!==r}):E.filter(n,e,r)}E.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?E.find.matchesSelector(r,e)?[r]:[]:E.find.matches(e,E.grep(t,function(e){return 1===e.nodeType}))},E.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(E(e).filter(function(){for(t=0;t<r;t++)if(E.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)E.find(e,i[t],n);return 1<r?E.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?E(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(E.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof E?t[0]:t,E.merge(this,E.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:S,!0)),N.test(r[1])&&E.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=S.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(E):E.makeArray(e,this)}).prototype=E.fn,D=E(S);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}E.fn.extend({has:function(e){var t=E(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(E.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&E(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&E.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?E.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(E(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(E.uniqueSort(E.merge(this.get(),E(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),E.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),E.merge([],e.childNodes))}},function(r,i){E.fn[r]=function(e,t){var n=E.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=E.filter(t,n)),1<this.length&&(H[r]||E.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}E.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},E.each(e.match(P)||[],function(e,t){n[t]=!0}),n):E.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){E.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return E.each(arguments,function(e,t){var n;while(-1<(n=E.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<E.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},E.extend({Deferred:function(e){var o=[["notify","progress",E.Callbacks("memory"),E.Callbacks("memory"),2],["resolve","done",E.Callbacks("once memory"),E.Callbacks("once memory"),0,"resolved"],["reject","fail",E.Callbacks("once memory"),E.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return E.Deferred(function(r){E.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){E.Deferred.exceptionHook&&E.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(E.Deferred.getStackHook&&(t.stackTrace=E.Deferred.getStackHook()),C.setTimeout(t))}}return E.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?E.extend(e,a):a}},s={};return E.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=E.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;E.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},E.readyException=function(e){C.setTimeout(function(){throw e})};var F=E.Deferred();function $(){S.removeEventListener("DOMContentLoaded",$),C.removeEventListener("load",$),E.ready()}E.fn.ready=function(e){return F.then(e)["catch"](function(e){E.readyException(e)}),this},E.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--E.readyWait:E.isReady)||(E.isReady=!0)!==e&&0<--E.readyWait||F.resolveWith(S,[E])}}),E.ready.then=F.then,"complete"===S.readyState||"loading"!==S.readyState&&!S.documentElement.doScroll?C.setTimeout(E.ready):(S.addEventListener("DOMContentLoaded",$),C.addEventListener("load",$));var B=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)B(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(E(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=E.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||E.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!E.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}E.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),E.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):B(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),E.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,E.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=E.queue(e,t),r=n.length,i=n.shift(),o=E._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){E.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:E.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),E.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?E.queue(this[0],t):void 0===n?this:this.each(function(){var e=E.queue(this,t,n);E._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&E.dequeue(this,t)})},dequeue:function(e){return this.each(function(){E.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=E.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=S.documentElement,ie=function(e){return E.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return E.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===E.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return E.css(e,t,"")},u=s(),l=n&&n[3]||(E.cssNumber[t]?"":"px"),c=e.nodeType&&(E.cssNumber[t]||"px"!==l&&+u)&&te.exec(E.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)E.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,E.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=E.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}E.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?E(this).show():E(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=S.createDocumentFragment().appendChild(S.createElement("div")),(fe=S.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),v.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",v.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",v.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?E.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,v.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))E.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+E.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;E.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<E.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return S.activeElement}catch(e){}}()==("focus"===t)}function Se(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Se(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return E().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=E.guid++)),e.each(function(){E.event.add(this,t,i,r,n)})}function Ee(e,i,o){o?(Y.set(e,i,!1),E.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(E.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:E.event.trigger(E.extend(r[0],E.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&E.event.add(e,i,we)}E.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&E.find.matchesSelector(re,i),n.guid||(n.guid=E.guid++),(u=y.events)||(u=y.events=Object.create(null)),(a=y.handle)||(a=y.handle=function(e){return"undefined"!=typeof E&&E.event.triggered!==e.type?E.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=E.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=E.event.special[d]||{},c=E.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&E.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),E.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=Y.hasData(e)&&Y.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=E.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||E.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)E.event.remove(e,d+t[l],n,r,!0);E.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=E.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=E.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=E.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((E.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<E(i,this).index(l):E.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(E.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[E.expando]?e:new E.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ee(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ee(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},E.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},E.Event=function(e,t){if(!(this instanceof E.Event))return new E.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&E.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[E.expando]=!0},E.Event.prototype={constructor:E.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},E.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},E.event.addProp),E.each({focus:"focusin",blur:"focusout"},function(t,e){E.event.special[t]={setup:function(){return Ee(this,t,Ce),!1},trigger:function(){return Ee(this,t),!0},_default:function(e){return Y.get(e.target,t)},delegateType:e}}),E.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){E.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||E.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),E.fn.extend({on:function(e,t,n,r){return Se(this,e,t,n,r)},one:function(e,t,n,r){return Se(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,E(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){E.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!\[CDATA\[|\]\]>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&E(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)E.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=E.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!v.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=E.map(ye(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=E.clone(u,!0,!0),s&&E.merge(a,ye(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,E.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&E.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?E._evalUrl&&!u.noModule&&E._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?E.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||E.cleanData(ye(r)),r.parentNode&&(n&&ie(r)&&ve(ye(r,"script")),r.parentNode.removeChild(r));return e}E.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(v.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||E.isXMLDoc(e)))for(a=ye(c),r=0,i=(o=ye(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ye(e),a=a||ye(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ye(c,"script")).length&&ve(a,!f&&ye(e,"script")),c},cleanData:function(e){for(var t,n,r,i=E.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?E.event.remove(n,r):E.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),E.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return B(this,function(e){return void 0===e?E.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(E.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return E.clone(this,e,t)})},html:function(e){return B(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=E.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(E.cleanData(ye(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;E.inArray(this,n)<0&&(E.cleanData(ye(this)),t&&t.replaceChild(e,this))},n)}}),E.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){E.fn[e]=function(e){for(var t,n=[],r=E(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),E(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=/^--/,Me=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Ie=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},We=new RegExp(ne.join("|"),"i"),Fe="[\\x20\\t\\r\\n\\f]",$e=new RegExp("^"+Fe+"+|((?:^|[^\\\\])(?:\\\\.)*)"+Fe+"+$","g");function Be(e,t,n){var r,i,o,a,s=Re.test(t),u=e.style;return(n=n||Me(e))&&(a=n.getPropertyValue(t)||n[t],s&&a&&(a=a.replace($e,"$1")||void 0),""!==a||ie(e)||(a=E.style(e,t)),!v.pixelBoxStyles()&&Pe.test(a)&&We.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=n.width,u.width=r,u.minWidth=i,u.maxWidth=o)),void 0!==a?a+"":a}function _e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=S.createElement("div"),l=S.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",v.clearCloneStyle="content-box"===l.style.backgroundClip,E.extend(v,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=S.createElement("table"),t=S.createElement("tr"),n=S.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var ze=["Webkit","Moz","ms"],Ue=S.createElement("div").style,Xe={};function Ve(e){var t=E.cssProps[e]||Xe[e];return t||(e in Ue?e:Xe[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=ze.length;while(n--)if((e=ze[n]+t)in Ue)return e}(e)||e)}var Ge=/^(none|table(?!-c[ea]).+)/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=E.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=E.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=E.css(e,"border"+ne[a]+"Width",!0,i))):(u+=E.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=E.css(e,"border"+ne[a]+"Width",!0,i):s+=E.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Me(e),i=(!v.boxSizingReliable()||n)&&"border-box"===E.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!v.boxSizingReliable()&&i||!v.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===E.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===E.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}E.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Re.test(t),l=e.style;if(u||(t=Ve(s)),a=E.cssHooks[t]||E.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(E.cssNumber[s]?"":"px")),v.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Re.test(t)||(t=Ve(s)),(a=E.cssHooks[t]||E.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),E.each(["height","width"],function(e,u){E.cssHooks[u]={get:function(e,t,n){if(t)return!Ge.test(E.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):Ie(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Me(e),o=!v.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===E.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=E.css(e,u)),Je(0,t,s)}}}),E.cssHooks.marginLeft=_e(v.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-Ie(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),E.each({margin:"",padding:"",border:"Width"},function(i,o){E.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(E.cssHooks[i+o].set=Je)}),E.fn.extend({css:function(e,t){return B(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Me(e),i=t.length;a<i;a++)o[t[a]]=E.css(e,t[a],!1,r);return o}return void 0!==n?E.style(e,t,n):E.css(e,t)},e,t,1<arguments.length)}}),((E.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||E.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(E.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=E.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=E.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){E.fx.step[e.prop]?E.fx.step[e.prop](e):1!==e.elem.nodeType||!E.cssHooks[e.prop]&&null==e.elem.style[Ve(e.prop)]?e.elem[e.prop]=e.now:E.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},E.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},E.fx=et.prototype.init,E.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===S.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,E.fx.interval),E.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=E.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:E.extend({},e),opts:E.extend(!0,{specialEasing:{},easing:E.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=E.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=E.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(E._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return E.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),E.fx.timer(E.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}E.Animation=E.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),y=Y.get(e,"fxshow");for(r in n.queue||(null==(a=E._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,E.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!y||void 0===y[r])continue;g=!0}d[r]=y&&y[r]||E.style(e,r)}if((u=!E.isEmptyObject(t))||!E.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=y&&y.display)&&(l=Y.get(e,"display")),"none"===(c=E.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=E.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===E.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(y?"hidden"in y&&(g=y.hidden):y=Y.access(e,"fxshow",{display:l}),o&&(y.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)E.style(e,r,d[r])})),u=ct(g?y[r]:0,r,p),r in y||(y[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),E.speed=function(e,t,n){var r=e&&"object"==typeof e?E.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return E.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in E.fx.speeds?r.duration=E.fx.speeds[r.duration]:r.duration=E.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&E.dequeue(this,r.queue)},r},E.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=E.isEmptyObject(t),o=E.speed(e,n,r),a=function(){var e=ft(this,E.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=E.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||E.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=E.timers,o=n?n.length:0;for(t.finish=!0,E.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),E.each(["toggle","show","hide"],function(e,r){var i=E.fn[r];E.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),E.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){E.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),E.timers=[],E.fx.tick=function(){var e,t=0,n=E.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||E.fx.stop(),tt=void 0},E.fx.timer=function(e){E.timers.push(e),E.fx.start()},E.fx.interval=13,E.fx.start=function(){nt||(nt=!0,st())},E.fx.stop=function(){nt=null},E.fx.speeds={slow:600,fast:200,_default:400},E.fn.delay=function(r,e){return r=E.fx&&E.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=S.createElement("input"),it=S.createElement("select").appendChild(S.createElement("option")),rt.type="checkbox",v.checkOn=""!==rt.value,v.optSelected=it.selected,(rt=S.createElement("input")).value="t",rt.type="radio",v.radioValue="t"===rt.value;var pt,dt=E.expr.attrHandle;E.fn.extend({attr:function(e,t){return B(this,E.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){E.removeAttr(this,e)})}}),E.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?E.prop(e,t,n):(1===o&&E.isXMLDoc(e)||(i=E.attrHooks[t.toLowerCase()]||(E.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void E.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=E.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!v.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?E.removeAttr(e,n):e.setAttribute(n,n),n}},E.each(E.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||E.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function yt(e){return(e.match(P)||[]).join(" ")}function vt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}E.fn.extend({prop:function(e,t){return B(this,E.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[E.propFix[e]||e]})}}),E.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&E.isXMLDoc(e)||(t=E.propFix[t]||t,i=E.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=E.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),v.optSelected||(E.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),E.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){E.propFix[this.toLowerCase()]=this}),E.fn.extend({addClass:function(t){var e,n,r,i,o,a;return m(t)?this.each(function(e){E(this).addClass(t.call(this,e,vt(this)))}):(e=mt(t)).length?this.each(function(){if(r=vt(this),n=1===this.nodeType&&" "+yt(r)+" "){for(o=0;o<e.length;o++)i=e[o],n.indexOf(" "+i+" ")<0&&(n+=i+" ");a=yt(n),r!==a&&this.setAttribute("class",a)}}):this},removeClass:function(t){var e,n,r,i,o,a;return m(t)?this.each(function(e){E(this).removeClass(t.call(this,e,vt(this)))}):arguments.length?(e=mt(t)).length?this.each(function(){if(r=vt(this),n=1===this.nodeType&&" "+yt(r)+" "){for(o=0;o<e.length;o++){i=e[o];while(-1<n.indexOf(" "+i+" "))n=n.replace(" "+i+" "," ")}a=yt(n),r!==a&&this.setAttribute("class",a)}}):this:this.attr("class","")},toggleClass:function(t,n){var e,r,i,o,a=typeof t,s="string"===a||Array.isArray(t);return m(t)?this.each(function(e){E(this).toggleClass(t.call(this,e,vt(this),n),n)}):"boolean"==typeof n&&s?n?this.addClass(t):this.removeClass(t):(e=mt(t),this.each(function(){if(s)for(o=E(this),i=0;i<e.length;i++)r=e[i],o.hasClass(r)?o.removeClass(r):o.addClass(r);else void 0!==t&&"boolean"!==a||((r=vt(this))&&Y.set(this,"__className__",r),this.setAttribute&&this.setAttribute("class",r||!1===t?"":Y.get(this,"__className__")||""))}))},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+yt(vt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;E.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,E(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=E.map(t,function(e){return null==e?"":e+""})),(r=E.valHooks[this.type]||E.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=E.valHooks[t.type]||E.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),E.extend({valHooks:{option:{get:function(e){var t=E.find.attr(e,"value");return null!=t?t:yt(E.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=E(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=E.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<E.inArray(E.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),E.each(["radio","checkbox"],function(){E.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<E.inArray(E(e).val(),t)}},v.checkOn||(E.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),v.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};E.extend(E.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||S],d=y.call(e,"type")?e.type:e,h=y.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||S,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+E.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[E.expando]?e:new E.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:E.makeArray(t,[e]),c=E.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||S)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),E.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),E.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=E.extend(new E.Event,n,{type:e,isSimulated:!0});E.event.trigger(r,null,t)}}),E.fn.extend({trigger:function(e,t){return this.each(function(){E.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return E.event.trigger(e,t,n,!0)}}),v.focusin||E.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){E.event.simulate(r,e.target,E.event.fix(e))};E.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},St=/\?/;E.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||E.error("Invalid XML: "+(n?E.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Et=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function jt(n,e,r,i){var t;if(Array.isArray(e))E.each(e,function(e,t){r||Et.test(n)?i(n,t):jt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)jt(n+"["+t+"]",e[t],r,i)}E.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!E.isPlainObject(e))E.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},E.fn.extend({serialize:function(){return E.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=E.prop(this,"elements");return e?E.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!E(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=E(this).val();return null==n?null:Array.isArray(n)?E.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var Dt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=S.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function $t(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,E.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Bt(e,t){var n,r,i=E.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&E.extend(!0,e,r),e}Wt.href=Tt.href,E.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":E.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Bt(Bt(e,E.ajaxSettings),t):Bt(E.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,y=E.ajaxSetup({},t),v=y.context||y,m=y.context&&(v.nodeType||v.jquery)?E(v):E.event,x=E.Deferred(),b=E.Callbacks("once memory"),w=y.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(y.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),y.url=((e||y.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),y.type=t.method||t.type||y.method||y.type,y.dataTypes=(y.dataType||"*").toLowerCase().match(P)||[""],null==y.crossDomain){r=S.createElement("a");try{r.href=y.url,r.href=r.href,y.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){y.crossDomain=!0}}if(y.data&&y.processData&&"string"!=typeof y.data&&(y.data=E.param(y.data,y.traditional)),$t(Rt,y,t,T),h)return T;for(i in(g=E.event&&y.global)&&0==E.active++&&E.event.trigger("ajaxStart"),y.type=y.type.toUpperCase(),y.hasContent=!Ot.test(y.type),f=y.url.replace(qt,""),y.hasContent?y.data&&y.processData&&0===(y.contentType||"").indexOf("application/x-www-form-urlencoded")&&(y.data=y.data.replace(Dt,"+")):(o=y.url.slice(f.length),y.data&&(y.processData||"string"==typeof y.data)&&(f+=(St.test(f)?"&":"?")+y.data,delete y.data),!1===y.cache&&(f=f.replace(Lt,"$1"),o=(St.test(f)?"&":"?")+"_="+Ct.guid+++o),y.url=f+o),y.ifModified&&(E.lastModified[f]&&T.setRequestHeader("If-Modified-Since",E.lastModified[f]),E.etag[f]&&T.setRequestHeader("If-None-Match",E.etag[f])),(y.data&&y.hasContent&&!1!==y.contentType||t.contentType)&&T.setRequestHeader("Content-Type",y.contentType),T.setRequestHeader("Accept",y.dataTypes[0]&&y.accepts[y.dataTypes[0]]?y.accepts[y.dataTypes[0]]+("*"!==y.dataTypes[0]?", "+It+"; q=0.01":""):y.accepts["*"]),y.headers)T.setRequestHeader(i,y.headers[i]);if(y.beforeSend&&(!1===y.beforeSend.call(v,T,y)||h))return T.abort();if(u="abort",b.add(y.complete),T.done(y.success),T.fail(y.error),c=$t(Mt,y,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,y]),h)return T;y.async&&0<y.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},y.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(y,T,n)),!i&&-1<E.inArray("script",y.dataTypes)&&E.inArray("json",y.dataTypes)<0&&(y.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(y,s,T,i),i?(y.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(E.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(E.etag[f]=u)),204===e||"HEAD"===y.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(v,[o,l,T]):x.rejectWith(v,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,y,i?o:a]),b.fireWith(v,[T,l]),g&&(m.trigger("ajaxComplete",[T,y]),--E.active||E.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return E.get(e,t,n,"json")},getScript:function(e,t){return E.get(e,void 0,t,"script")}}),E.each(["get","post"],function(e,i){E[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),E.ajax(E.extend({url:e,type:i,dataType:r,data:t,success:n},E.isPlainObject(e)&&e))}}),E.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),E._evalUrl=function(e,t,n){return E.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){E.globalEval(e,t,n)}})},E.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=E(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){E(this).wrapInner(n.call(this,e))}):this.each(function(){var e=E(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){E(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){E(this).replaceWith(this.childNodes)}),this}}),E.expr.pseudos.hidden=function(e){return!E.expr.pseudos.visible(e)},E.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},E.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=E.ajaxSettings.xhr();v.cors=!!zt&&"withCredentials"in zt,v.ajax=zt=!!zt,E.ajaxTransport(function(i){var o,a;if(v.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),E.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),E.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return E.globalEval(e),e}}}),E.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),E.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=E("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),S.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;E.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||E.expando+"_"+Ct.guid++;return this[e]=!0,e}}),E.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||E.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?E(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),v.createHTMLDocument=((Ut=S.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),E.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(v.createHTMLDocument?((r=(t=S.implementation.createHTMLDocument("")).createElement("base")).href=S.location.href,t.head.appendChild(r)):t=S),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&E(o).remove(),E.merge([],i.childNodes)));var r,i,o},E.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=yt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&E.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?E("<div>").append(E.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},E.expr.pseudos.animated=function(t){return E.grep(E.timers,function(e){return t===e.elem}).length},E.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=E.css(e,"position"),c=E(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=E.css(e,"top"),u=E.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,E.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},E.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){E.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===E.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===E.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=E(e).offset()).top+=E.css(e,"borderTopWidth",!0),i.left+=E.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-E.css(r,"marginTop",!0),left:t.left-i.left-E.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===E.css(e,"position"))e=e.offsetParent;return e||re})}}),E.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;E.fn[t]=function(e){return B(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),E.each(["top","left"],function(e,n){E.cssHooks[n]=_e(v.pixelPosition,function(e,t){if(t)return t=Be(e,n),Pe.test(t)?E(e).position()[n]+"px":t})}),E.each({Height:"height",Width:"width"},function(a,s){E.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){E.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return B(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?E.css(e,t,i):E.style(e,t,n,i)},s,n?e:void 0,n)}})}),E.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){E.fn[t]=function(e){return this.on(t,e)}}),E.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),E.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){E.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|([^\s\uFEFF\xA0])[\s\uFEFF\xA0]+$/g;E.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||E.guid++,i},E.holdReady=function(e){e?E.readyWait++:E.ready(!0)},E.isArray=Array.isArray,E.parseJSON=JSON.parse,E.nodeName=A,E.isFunction=m,E.isWindow=x,E.camelCase=X,E.type=w,E.now=Date.now,E.isNumeric=function(e){var t=E.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},E.trim=function(e){return null==e?"":(e+"").replace(Gt,"$1")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return E});var Yt=C.jQuery,Qt=C.$;return E.noConflict=function(e){return C.$===E&&(C.$=Qt),e&&C.jQuery===E&&(C.jQuery=Yt),E},"undefined"==typeof e&&(C.jQuery=C.$=E),E});
diff --git a/cps/static/js/libs/jquery.min.map b/cps/static/js/libs/jquery.min.map
index faa1db8da..1079a1abf 100644
--- a/cps/static/js/libs/jquery.min.map
+++ b/cps/static/js/libs/jquery.min.map
@@ -1 +1 @@
-{"version":3,"sources":["jquery-3.5.1.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","getProto","Object","getPrototypeOf","slice","flat","array","call","concat","apply","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","fnToString","ObjectFunctionString","support","isFunction","obj","nodeType","isWindow","preservedScriptAttributes","type","src","nonce","noModule","DOMEval","code","node","doc","i","val","script","createElement","text","getAttribute","setAttribute","head","appendChild","parentNode","removeChild","toType","version","jQuery","selector","context","fn","init","isArrayLike","length","prototype","jquery","constructor","toArray","get","num","pushStack","elems","ret","merge","prevObject","each","callback","map","elem","arguments","first","eq","last","even","grep","_elem","odd","len","j","end","sort","splice","extend","options","name","copy","copyIsArray","clone","target","deep","isPlainObject","Array","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","proto","Ctor","isEmptyObject","globalEval","makeArray","results","inArray","second","invert","matches","callbackExpect","arg","value","guid","Symbol","iterator","split","_i","toLowerCase","Sizzle","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","contains","Date","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","nonnativeSelectorCache","sortOrder","a","b","pop","pushNative","list","booleans","whitespace","identifier","attributes","pseudos","rwhitespace","RegExp","rtrim","rcomma","rcombinators","rdescend","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rhtml","rinputs","rheader","rnative","rquickExpr","rsibling","runescape","funescape","escape","nonHex","high","String","fromCharCode","rcssescape","fcssescape","ch","asCodePoint","charCodeAt","unloadHandler","inDisabledFieldset","addCombinator","disabled","nodeName","dir","next","childNodes","e","els","seed","m","nid","match","groups","newSelector","newContext","ownerDocument","exec","getElementById","id","getElementsByTagName","getElementsByClassName","qsa","test","testContext","scope","toSelector","join","querySelectorAll","qsaError","removeAttribute","keys","cache","key","cacheLength","shift","markFunction","assert","el","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createDisabledPseudo","isDisabled","createPositionalPseudo","argument","matchIndexes","namespace","namespaceURI","documentElement","hasCompare","subWindow","defaultView","top","addEventListener","attachEvent","className","createComment","getById","getElementsByName","filter","attrId","find","getAttributeNode","tag","tmp","input","innerHTML","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","attr","specified","sel","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","_argument","simple","forward","ofType","_context","xml","uniqueCache","outerCache","nodeIndex","start","parent","useCache","lastChild","uniqueID","pseudo","args","setFilters","idx","matched","not","matcher","unmatched","has","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","checked","selected","selectedIndex","empty","header","button","_matchIndexes","lt","gt","radio","checkbox","file","password","image","submit","reset","tokens","combinator","base","skip","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","contexts","multipleContexts","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","filters","parseOnly","soFar","preFilters","cached","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","_name","defaultValue","unique","isXMLDoc","escapeSelector","until","truncate","is","siblings","n","rneedsContext","rsingleTag","winnow","qualifier","self","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","prev","sibling","targets","l","closest","index","prevAll","add","addBack","parents","parentsUntil","nextAll","nextUntil","prevUntil","contentDocument","content","reverse","rnothtmlwhite","Identity","v","Thrower","ex","adoptValue","resolve","reject","noValue","method","promise","fail","then","Callbacks","object","_","flag","firing","memory","fired","locked","queue","firingIndex","fire","once","stopOnFalse","remove","disable","lock","fireWith","Deferred","func","tuples","state","always","deferred","catch","pipe","fns","newDefer","tuple","returned","progress","notify","onFulfilled","onRejected","onProgress","maxDepth","depth","special","that","mightThrow","TypeError","notifyWith","resolveWith","process","exceptionHook","stackTrace","rejectWith","getStackHook","setTimeout","stateString","when","singleValue","remaining","resolveContexts","resolveValues","master","updateFunc","rerrorNames","stack","console","warn","message","readyException","readyList","completed","removeEventListener","readyWait","wait","readyState","doScroll","access","chainable","emptyGet","raw","bulk","_key","rmsPrefix","rdashAlpha","fcamelCase","_all","letter","toUpperCase","camelCase","string","acceptData","owner","Data","uid","defineProperty","configurable","set","data","prop","hasData","dataPriv","dataUser","rbrace","rmultiDash","dataAttr","JSON","parse","removeData","_data","_removeData","dequeue","startLength","hooks","_queueHooks","stop","setter","clearQueue","count","defer","pnum","source","rcssNum","cssExpand","isAttached","composed","getRootNode","isHiddenWithinTree","style","display","css","adjustCSS","valueParts","tween","adjusted","scale","maxIterations","currentValue","initial","unit","cssNumber","initialInUnit","defaultDisplayMap","showHide","show","values","body","hide","toggle","div","rcheckableType","rtagName","rscriptType","createDocumentFragment","checkClone","cloneNode","noCloneChecked","option","wrapMap","thead","col","tr","td","_default","getAll","setGlobalEval","refElements","tbody","tfoot","colgroup","caption","th","optgroup","buildFragment","scripts","selection","ignored","wrap","attached","fragment","nodes","htmlPrefilter","createTextNode","rkeyEvent","rmouseEvent","rtypenamespace","returnTrue","returnFalse","expectSync","err","safeActiveElement","on","types","one","origFn","event","off","leverageNative","notAsync","saved","isTrigger","delegateType","stopPropagation","stopImmediatePropagation","preventDefault","trigger","Event","handleObjIn","eventHandle","events","t","handleObj","handlers","namespaces","origType","elemData","create","handle","triggered","dispatch","bindType","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","nativeEvent","handlerQueue","fix","delegateTarget","preDispatch","isPropagationStopped","currentTarget","isImmediatePropagationStopped","rnamespace","postDispatch","matchedHandlers","matchedSelectors","addProp","hook","enumerable","originalEvent","writable","load","noBubble","click","beforeunload","returnValue","props","isDefaultPrevented","defaultPrevented","relatedTarget","timeStamp","now","isSimulated","altKey","bubbles","cancelable","changedTouches","ctrlKey","detail","eventPhase","metaKey","pageX","pageY","shiftKey","view","char","charCode","keyCode","buttons","clientX","clientY","offsetX","offsetY","pointerId","pointerType","screenX","screenY","targetTouches","toElement","touches","which","blur","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","rnoInnerhtml","rchecked","rcleanScript","manipulationTarget","disableScript","restoreScript","cloneCopyEvent","dest","udataOld","udataCur","domManip","collection","hasScripts","iNoClone","valueIsFunction","html","_evalUrl","keepData","cleanData","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","detach","append","prepend","insertBefore","before","after","replaceWith","replaceChild","appendTo","prependTo","insertAfter","replaceAll","original","insert","rnumnonpx","getStyles","opener","getComputedStyle","swap","old","rboxStyle","curCSS","computed","width","minWidth","maxWidth","getPropertyValue","pixelBoxStyles","addGetHookIf","conditionFn","hookFn","computeStyleTests","container","cssText","divStyle","pixelPositionVal","reliableMarginLeftVal","roundPixelMeasures","marginLeft","right","pixelBoxStylesVal","boxSizingReliableVal","position","scrollboxSizeVal","offsetWidth","measure","round","parseFloat","reliableTrDimensionsVal","backgroundClip","clearCloneStyle","boxSizingReliable","pixelPosition","reliableMarginLeft","scrollboxSize","reliableTrDimensions","table","trChild","trStyle","height","parseInt","cssPrefixes","emptyStyle","vendorProps","finalPropName","final","cssProps","capName","vendorPropName","rdisplayswap","rcustomProp","cssShow","visibility","cssNormalTransform","letterSpacing","fontWeight","setPositiveNumber","subtract","max","boxModelAdjustment","dimension","box","isBorderBox","styles","computedVal","extra","delta","ceil","getWidthOrHeight","valueIsBorderBox","offsetProp","getClientRects","Tween","easing","cssHooks","opacity","animationIterationCount","columnCount","fillOpacity","flexGrow","flexShrink","gridArea","gridColumn","gridColumnEnd","gridColumnStart","gridRow","gridRowEnd","gridRowStart","lineHeight","order","orphans","widows","zIndex","zoom","origName","isCustomProp","setProperty","isFinite","getBoundingClientRect","scrollboxSizeBuggy","left","margin","padding","border","prefix","suffix","expand","expanded","parts","propHooks","run","percent","eased","duration","pos","step","fx","scrollTop","scrollLeft","linear","p","swing","cos","PI","fxNow","inProgress","opt","rfxtypes","rrun","schedule","hidden","requestAnimationFrame","interval","tick","createFxNow","genFx","includeWidth","createTween","animation","Animation","tweeners","properties","stopped","prefilters","currentTime","startTime","tweens","opts","specialEasing","originalProperties","originalOptions","gotoEnd","propFilter","bind","complete","timer","anim","*","tweener","oldfire","propTween","restoreDisplay","isBox","dataShow","unqueued","overflow","overflowX","overflowY","prefilter","speed","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","radioValue","boolHook","removeAttr","nType","attrHooks","attrNames","getter","lowercaseName","rfocusable","rclickable","stripAndCollapse","getClass","classesToArray","removeProp","propFix","tabindex","for","class","addClass","classes","curValue","clazz","finalValue","removeClass","toggleClass","stateVal","isValidValue","classNames","hasClass","rreturn","valHooks","optionSet","focusin","rfocusMorph","stopPropagationCallback","onlyHandlers","bubbleType","ontype","lastElement","eventPath","parentWindow","simulate","triggerHandler","attaches","rquery","parseXML","DOMParser","parseFromString","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","traditional","param","s","valueOrFunction","encodeURIComponent","serialize","serializeArray","r20","rhash","rantiCache","rheaders","rnoContent","rprotocol","transports","allTypes","originAnchor","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","active","lastModified","etag","url","isLocal","protocol","processData","async","contentType","accepts","json","responseFields","converters","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","urlAnchor","fireGlobals","uncached","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getResponseHeader","getAllResponseHeaders","setRequestHeader","overrideMimeType","mimeType","status","abort","statusText","finalText","crossDomain","host","hasContent","ifModified","headers","beforeSend","success","send","nativeStatusText","responses","isSuccess","response","modified","ct","finalDataType","firstDataType","ajaxHandleResponses","conv2","current","conv","dataFilter","throws","ajaxConvert","getJSON","getScript","text script","wrapAll","firstElementChild","wrapInner","htmlIsFunction","unwrap","visible","offsetHeight","xhr","XMLHttpRequest","xhrSuccessStatus","0","1223","xhrSupported","cors","errorCallback","open","username","xhrFields","onload","onerror","onabort","ontimeout","onreadystatechange","responseType","responseText","binary","scriptAttrs","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","createHTMLDocument","implementation","keepScripts","parsed","params","animated","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","curElem","using","rect","win","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","","defaultExtra","funcName","unbind","delegate","undelegate","hover","fnOver","fnOut","proxy","holdReady","hold","parseJSON","isNumeric","isNaN","trim","define","amd","_jQuery","_$","$","noConflict"],"mappings":"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","file":"jquery-3.5.1.min.js"}
\ No newline at end of file
+{"version":3,"sources":["jquery-3.6.3.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","getProto","Object","getPrototypeOf","slice","flat","array","call","concat","apply","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","fnToString","ObjectFunctionString","support","isFunction","obj","nodeType","item","isWindow","preservedScriptAttributes","type","src","nonce","noModule","DOMEval","code","node","doc","i","val","script","createElement","text","getAttribute","setAttribute","head","appendChild","parentNode","removeChild","toType","version","jQuery","selector","context","fn","init","isArrayLike","length","prototype","jquery","constructor","toArray","get","num","pushStack","elems","ret","merge","prevObject","each","callback","map","elem","arguments","first","eq","last","even","grep","_elem","odd","len","j","end","sort","splice","extend","options","name","copy","copyIsArray","clone","target","deep","isPlainObject","Array","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","proto","Ctor","isEmptyObject","globalEval","makeArray","results","inArray","second","invert","matches","callbackExpect","arg","value","guid","Symbol","iterator","split","_i","toLowerCase","Sizzle","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","contains","Date","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","nonnativeSelectorCache","sortOrder","a","b","pop","pushNative","list","booleans","whitespace","identifier","attributes","pseudos","rwhitespace","RegExp","rtrim","rcomma","rcombinators","rdescend","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rhtml","rinputs","rheader","rnative","rquickExpr","rsibling","runescape","funescape","escape","nonHex","high","String","fromCharCode","rcssescape","fcssescape","ch","asCodePoint","charCodeAt","unloadHandler","inDisabledFieldset","addCombinator","disabled","nodeName","dir","next","childNodes","e","els","seed","m","nid","match","groups","newSelector","newContext","ownerDocument","exec","getElementById","id","getElementsByTagName","getElementsByClassName","qsa","test","testContext","scope","toSelector","join","cssSupportsSelector","CSS","supports","querySelectorAll","qsaError","removeAttribute","keys","cache","key","cacheLength","shift","markFunction","assert","el","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createDisabledPseudo","isDisabled","createPositionalPseudo","argument","matchIndexes","namespace","namespaceURI","documentElement","hasCompare","subWindow","defaultView","top","addEventListener","attachEvent","className","createComment","getById","getElementsByName","filter","attrId","find","getAttributeNode","tag","tmp","input","innerHTML","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","attr","specified","sel","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","_argument","simple","forward","ofType","_context","xml","uniqueCache","outerCache","nodeIndex","start","parent","useCache","lastChild","uniqueID","pseudo","args","setFilters","idx","matched","not","matcher","unmatched","has","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","checked","selected","selectedIndex","empty","header","button","_matchIndexes","lt","gt","radio","checkbox","file","password","image","submit","reset","tokens","combinator","base","skip","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","contexts","multipleContexts","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","filters","parseOnly","soFar","preFilters","cached","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","_name","defaultValue","unique","isXMLDoc","escapeSelector","until","truncate","is","siblings","n","rneedsContext","rsingleTag","winnow","qualifier","self","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","prev","sibling","targets","l","closest","index","prevAll","add","addBack","parents","parentsUntil","nextAll","nextUntil","prevUntil","contentDocument","content","reverse","rnothtmlwhite","Identity","v","Thrower","ex","adoptValue","resolve","reject","noValue","method","promise","fail","then","Callbacks","object","_","flag","firing","memory","fired","locked","queue","firingIndex","fire","once","stopOnFalse","remove","disable","lock","fireWith","Deferred","func","tuples","state","always","deferred","catch","pipe","fns","newDefer","tuple","returned","progress","notify","onFulfilled","onRejected","onProgress","maxDepth","depth","special","that","mightThrow","TypeError","notifyWith","resolveWith","process","exceptionHook","stackTrace","rejectWith","getStackHook","setTimeout","stateString","when","singleValue","remaining","resolveContexts","resolveValues","primary","updateFunc","rerrorNames","stack","console","warn","message","readyException","readyList","completed","removeEventListener","readyWait","wait","readyState","doScroll","access","chainable","emptyGet","raw","bulk","_key","rmsPrefix","rdashAlpha","fcamelCase","_all","letter","toUpperCase","camelCase","string","acceptData","owner","Data","uid","defineProperty","configurable","set","data","prop","hasData","dataPriv","dataUser","rbrace","rmultiDash","dataAttr","JSON","parse","removeData","_data","_removeData","dequeue","startLength","hooks","_queueHooks","stop","setter","clearQueue","count","defer","pnum","source","rcssNum","cssExpand","isAttached","composed","getRootNode","isHiddenWithinTree","style","display","css","adjustCSS","valueParts","tween","adjusted","scale","maxIterations","currentValue","initial","unit","cssNumber","initialInUnit","defaultDisplayMap","showHide","show","values","body","hide","toggle","div","rcheckableType","rtagName","rscriptType","createDocumentFragment","checkClone","cloneNode","noCloneChecked","option","wrapMap","thead","col","tr","td","_default","getAll","setGlobalEval","refElements","tbody","tfoot","colgroup","caption","th","optgroup","buildFragment","scripts","selection","ignored","wrap","attached","fragment","nodes","htmlPrefilter","createTextNode","rtypenamespace","returnTrue","returnFalse","expectSync","err","safeActiveElement","on","types","one","origFn","event","off","leverageNative","notAsync","saved","isTrigger","delegateType","stopPropagation","stopImmediatePropagation","preventDefault","trigger","Event","handleObjIn","eventHandle","events","t","handleObj","handlers","namespaces","origType","elemData","create","handle","triggered","dispatch","bindType","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","nativeEvent","handlerQueue","fix","delegateTarget","preDispatch","isPropagationStopped","currentTarget","isImmediatePropagationStopped","rnamespace","postDispatch","matchedHandlers","matchedSelectors","addProp","hook","enumerable","originalEvent","writable","load","noBubble","click","beforeunload","returnValue","props","isDefaultPrevented","defaultPrevented","relatedTarget","timeStamp","now","isSimulated","altKey","bubbles","cancelable","changedTouches","ctrlKey","detail","eventPhase","metaKey","pageX","pageY","shiftKey","view","char","charCode","keyCode","buttons","clientX","clientY","offsetX","offsetY","pointerId","pointerType","screenX","screenY","targetTouches","toElement","touches","which","blur","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","rnoInnerhtml","rchecked","rcleanScript","manipulationTarget","disableScript","restoreScript","cloneCopyEvent","dest","udataOld","udataCur","domManip","collection","hasScripts","iNoClone","valueIsFunction","html","_evalUrl","keepData","cleanData","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","detach","append","prepend","insertBefore","before","after","replaceWith","replaceChild","appendTo","prependTo","insertAfter","replaceAll","original","insert","rnumnonpx","rcustomProp","getStyles","opener","getComputedStyle","swap","old","rboxStyle","rtrimCSS","curCSS","computed","width","minWidth","maxWidth","isCustomProp","getPropertyValue","pixelBoxStyles","addGetHookIf","conditionFn","hookFn","computeStyleTests","container","cssText","divStyle","pixelPositionVal","reliableMarginLeftVal","roundPixelMeasures","marginLeft","right","pixelBoxStylesVal","boxSizingReliableVal","position","scrollboxSizeVal","offsetWidth","measure","round","parseFloat","reliableTrDimensionsVal","backgroundClip","clearCloneStyle","boxSizingReliable","pixelPosition","reliableMarginLeft","scrollboxSize","reliableTrDimensions","table","trChild","trStyle","height","parseInt","borderTopWidth","borderBottomWidth","offsetHeight","cssPrefixes","emptyStyle","vendorProps","finalPropName","final","cssProps","capName","vendorPropName","rdisplayswap","cssShow","visibility","cssNormalTransform","letterSpacing","fontWeight","setPositiveNumber","subtract","max","boxModelAdjustment","dimension","box","isBorderBox","styles","computedVal","extra","delta","ceil","getWidthOrHeight","valueIsBorderBox","offsetProp","getClientRects","Tween","easing","cssHooks","opacity","animationIterationCount","columnCount","fillOpacity","flexGrow","flexShrink","gridArea","gridColumn","gridColumnEnd","gridColumnStart","gridRow","gridRowEnd","gridRowStart","lineHeight","order","orphans","widows","zIndex","zoom","origName","setProperty","isFinite","getBoundingClientRect","scrollboxSizeBuggy","left","margin","padding","border","prefix","suffix","expand","expanded","parts","propHooks","run","percent","eased","duration","pos","step","fx","scrollTop","scrollLeft","linear","p","swing","cos","PI","fxNow","inProgress","opt","rfxtypes","rrun","schedule","hidden","requestAnimationFrame","interval","tick","createFxNow","genFx","includeWidth","createTween","animation","Animation","tweeners","properties","stopped","prefilters","currentTime","startTime","tweens","opts","specialEasing","originalProperties","originalOptions","gotoEnd","propFilter","bind","complete","timer","anim","*","tweener","oldfire","propTween","restoreDisplay","isBox","dataShow","unqueued","overflow","overflowX","overflowY","prefilter","speed","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","radioValue","boolHook","removeAttr","nType","attrHooks","attrNames","getter","lowercaseName","rfocusable","rclickable","stripAndCollapse","getClass","classesToArray","removeProp","propFix","tabindex","for","class","addClass","classNames","curValue","finalValue","removeClass","toggleClass","stateVal","isValidValue","hasClass","rreturn","valHooks","optionSet","focusin","rfocusMorph","stopPropagationCallback","onlyHandlers","bubbleType","ontype","lastElement","eventPath","parentWindow","simulate","triggerHandler","attaches","rquery","parseXML","parserErrorElem","DOMParser","parseFromString","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","traditional","param","s","valueOrFunction","encodeURIComponent","serialize","serializeArray","r20","rhash","rantiCache","rheaders","rnoContent","rprotocol","transports","allTypes","originAnchor","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","active","lastModified","etag","url","isLocal","protocol","processData","async","contentType","accepts","json","responseFields","converters","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","urlAnchor","fireGlobals","uncached","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getResponseHeader","getAllResponseHeaders","setRequestHeader","overrideMimeType","mimeType","status","abort","statusText","finalText","crossDomain","host","hasContent","ifModified","headers","beforeSend","success","send","nativeStatusText","responses","isSuccess","response","modified","ct","finalDataType","firstDataType","ajaxHandleResponses","conv2","current","conv","dataFilter","throws","ajaxConvert","getJSON","getScript","text script","wrapAll","firstElementChild","wrapInner","htmlIsFunction","unwrap","visible","xhr","XMLHttpRequest","xhrSuccessStatus","0","1223","xhrSupported","cors","errorCallback","open","username","xhrFields","onload","onerror","onabort","ontimeout","onreadystatechange","responseType","responseText","binary","scriptAttrs","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","createHTMLDocument","implementation","keepScripts","parsed","params","animated","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","curElem","using","rect","win","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","","defaultExtra","funcName","unbind","delegate","undelegate","hover","fnOver","fnOut","proxy","holdReady","hold","parseJSON","isNumeric","isNaN","trim","define","amd","_jQuery","_$","$","noConflict"],"mappings":"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","file":"jquery-3.6.3.min.js"}
\ No newline at end of file

From 043a612d1a4ca36ed9836a3c68db17091a72fc79 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Sun, 25 Dec 2022 10:22:58 +0100
Subject: [PATCH 360/412] Update path to kobo config file

---
 babel.cfg                                     |   1 -
 cps/iso_language_names.py                     | 378 -------------
 cps/templates/generate_kobo_auth_url.html     |   2 +-
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 38242 -> 38066 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 59470 -> 59287 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 55808 -> 55533 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 49839 -> 49667 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 26606 -> 26606 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 528 ++++++++---------
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 54122 -> 53939 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/gl/LC_MESSAGES/messages.mo   | Bin 59875 -> 59705 bytes
 cps/translations/gl/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 24357 -> 24357 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 528 ++++++++---------
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 61754 -> 61582 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 63370 -> 63172 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 23905 -> 23905 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 528 ++++++++---------
 cps/translations/ko/LC_MESSAGES/messages.mo   | Bin 54185 -> 53995 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 48982 -> 48807 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 50803 -> 50636 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 517 ++++++++---------
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 59966 -> 59792 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 529 ++++++++---------
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 46450 -> 46208 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 47246 -> 47066 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 529 ++++++++---------
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 22085 -> 22085 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 528 ++++++++---------
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 24153 -> 24153 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 528 ++++++++---------
 cps/translations/vi/LC_MESSAGES/messages.po   | 531 +++++++++---------
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 53891 -> 53725 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 529 ++++++++---------
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 47393 -> 47227 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 529 ++++++++---------
 messages.pot                                  | 528 ++++++++---------
 47 files changed, 6132 insertions(+), 6400 deletions(-)

diff --git a/babel.cfg b/babel.cfg
index 9c7ce3a79..2b7116e75 100644
--- a/babel.cfg
+++ b/babel.cfg
@@ -2,4 +2,3 @@
 
 # has to be executed with jinja2 >=2.9 to have autoescape enabled automatically
 [jinja2: **/templates/**.*ml]
-extensions=jinja2.ext.with_
diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 59be49525..648078132 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -7854,384 +7854,6 @@ LANGUAGE_NAMES = {
         "zxx": "немає мовних даних",
         "zza": "заза"
     },
-    "vi": {
-        "abk": "Abkhazian",
-        "ace": "Tiếng A-chinh",
-        "ach": "Tiếng A-co-li",
-        "ada": "Tiếng A-đang-me",
-        "ady": "Adyghe",
-        "aar": "Afar",
-        "afh": "Tiếng A-phi-li",
-        "afr": "Tiếng Hà Lan-Nam Phi",
-        "ain": "Ainu (Japan)",
-        "aka": "Akan",
-        "akk": "Tiếng A-ca-đi",
-        "sqi": "Tiếng An-ba-ni",
-        "ale": "Tiếng A-le-uth",
-        "amh": "Tiếng Am-ha-ri",
-        "anp": "Tiếng An-gi-ca",
-        "ara": "Tiếng A-rập",
-        "arg": "Tiếng A-ra-got",
-        "arp": "Tiếng A-ra-bô",
-        "arw": "Tiếng A-ra-ouac",
-        "hye": "Tiếng Ác-mê-ni",
-        "asm": "Tiếng A-xam",
-        "ast": "Asturian",
-        "ava": "Tiếng A-va-ri",
-        "ave": "Tiếng A-ve-x-tan",
-        "awa": "Tiếng A-oua-đi",
-        "aym": "Aymara",
-        "aze": "Tiếng Agiecbaigiăng",
-        "ban": "Tiếng Ba-li",
-        "bal": "Tiếng Ba-lu-khi",
-        "bam": "Bambara",
-        "bas": "Basa (Cameroon)",
-        "bak": "Tiếng Ba-s-kic",
-        "eus": "Tiếng Baxcơ",
-        "bej": "Tiếng Be-gia",
-        "bel": "Tiếng Be-la-ruxợ",
-        "bem": "Bemba (Zambia)",
-        "ben": "Tiếng Băng Gan",
-        "bit": "Berinomo",
-        "bho": "Tiếng Bo-giơ-pu-ri",
-        "bik": "Tiếng Bi-cot",
-        "byn": "Bilin",
-        "bin": "Tiếng Bi-ni",
-        "bis": "Tiếng Bix-la-ma",
-        "zbl": "Blissymbols",
-        "bos": "Tiếng Bô-xni-a",
-        "bra": "Tiếng Boua-giơ",
-        "bre": "Tiếng Boue-ton (Pháp)",
-        "bug": "Tiếng Bu-gin",
-        "bul": "Tiếng Bảo Gai Lơi",
-        "bua": "Tiếng Bu-ri-at",
-        "mya": "Tiếng Miến Điện",
-        "cad": "Tiếng Ca-đô",
-        "cat": "Tiếng Catalăng",
-        "ceb": "Tiếng Xe-bu-a-nô",
-        "chg": "Chagatai",
-        "cha": "Tiếng Cha-mo-ro",
-        "che": "Tiếng Che-chẹnh",
-        "chr": "Tiếng Che-rô-ki",
-        "chy": "Tiếng Chê-iênh",
-        "chb": "Tiếng Chic-cha",
-        "zho": "Tiếng Trung Hoa",
-        "chn": "Biệt ngữ Chi-nukh",
-        "chp": "Tiếng Chi-pu-i-a",
-        "cho": "Tiếng Choc-toa",
-        "cht": "Cholón",
-        "chk": "Tiếng Chu-ki",
-        "chv": "Tiếng Chu-vaxơ",
-        "cop": "Ngôn ngữ phổ biến trong Giáo hội Ai Cập",
-        "cor": "Tiếng Khonh-uoă",
-        "cos": "Tiếng Kho-si-ca",
-        "cre": "Tiếng Kh-ri",
-        "mus": "Tiếng C-ric",
-        "hrv": "Tiếng Crô-át",
-        "ces": "Tiếng Séc",
-        "dak": "Tiếng Đa-cô-ta",
-        "dan": "Tiếng Đan Mạch",
-        "dar": "Tiếng Đac-oua",
-        "del": "Tiếng Đe-la-oue",
-        "div": "Dhivehi",
-        "din": "Dinka",
-        "doi": "Dogri (macrolanguage)",
-        "dgr": "Tiếng Đoc-ric",
-        "dua": "Tiếng Đu-a-la",
-        "nld": "Tiếng Hòa Lan",
-        "dse": "Dutch Sign Language",
-        "dyu": "Tiếng Đi-u-la",
-        "dzo": "Tiếng Đxong-kha",
-        "efi": "Tiếng E-phic",
-        "egy": "Tiếng Ai Cập (cổ)",
-        "eka": "Tiếng E-ca-giuc",
-        "elx": "Tiếng E-la-mi",
-        "eng": "Tiếng Anh",
-        "enu": "Enu",
-        "myv": "Tiếng Ơ-dia",
-        "epo": "Tiếng Etpêrantô",
-        "est": "Tiếng Phổ Cổ",
-        "ewe": "Tiếng E-oue",
-        "ewo": "Tiếng E-ouon-đô",
-        "fan": "Fang (Equatorial Guinea)",
-        "fat": "Tiếng Phan-ti",
-        "fao": "Tiếng Pha-rô",
-        "fij": "Tiếng Phi-gi",
-        "fil": "Filipino",
-        "fin": "Tiếng Phần Lan",
-        "fon": "Tiếng Phonh",
-        "fra": "Tiếng Pháp",
-        "fur": "Tiếng Ph-riu-li",
-        "ful": "Tiếng Phu-la",
-        "gaa": "Tiếng Ga",
-        "glg": "Galician",
-        "lug": "Ganda",
-        "gay": "Tiếng Gay-ô",
-        "gba": "Gbaya (Central African Republic)",
-        "hmj": "Ge",
-        "gez": "Tiếng Gi-d",
-        "kat": "Tiếng Gi-oa-gi-a",
-        "deu": "Tiếng Đức",
-        "gil": "Tiếng Gil-bơt",
-        "gon": "Tiếng Gon-đi",
-        "gor": "Tiếng Go-ron-ta-lô",
-        "got": "Tiếng Gô-tích",
-        "grb": "Tiếng Goue-bô",
-        "grn": "Tiếng Gua-ra-ni",
-        "guj": "Tiếng Gu-gia-ra-ti",
-        "gwi": "Gwichʼin",
-        "hai": "Tiếng Hai-đa",
-        "hau": "Tiếng Hau-xa",
-        "haw": "Tiếng Ha-uoai-i",
-        "heb": "Tiếng Do Thái",
-        "her": "Tiếng He-re-rô",
-        "hil": "Tiếng Hi-li-gay-non",
-        "hin": "Tiếng Hin-đi",
-        "hmo": "Tiếng Mo-tu",
-        "hit": "Tiếng Hic-tic",
-        "hmn": "Tiếng Miêu",
-        "hun": "Tiếng Hung Gia Lợi",
-        "hup": "Tiếng Hu-pa",
-        "iba": "Iban",
-        "isl": "Tiếng Băng đảo",
-        "ido": "Tiếng I-đô",
-        "ibo": "Tiếng Ic-bô",
-        "ilo": "Tiếng I-lô-cô",
-        "ind": "Tiếng Nam Dương",
-        "inh": "Tiếng In-gut",
-        "ina": "Ngôn ngữ lẫn nhau In-tơ-lin-gua (Liên Hiệp Ngôn Ngữ Bổ Trợ Quốc Tế)",
-        "ile": "Ngôn ngữ lẫn nhau In-tơ-ling",
-        "iku": "Tiếng I-nuc-ti-tuc",
-        "ipk": "Tiếng In-u-bơ-lac",
-        "gle": "Tiếng Ái Nhĩ Lan",
-        "ita": "Tiếng Ý",
-        "jpn": "Tiếng Nhật",
-        "jav": "Tiếng Gia-va",
-        "jrb": "Do thái - A-rập",
-        "jpr": "Do thái - Ba tư",
-        "kbd": "Tiếng Ca-bat",
-        "kab": "Tiếng Ca-bai",
-        "kac": "Tiếng Ca-chin",
-        "kal": "Kalaallisut",
-        "xal": "Kalmyk",
-        "kam": "Kamba (Kenya)",
-        "kan": "Tiếng Kan-na-đa",
-        "kau": "Tiếng Ca-nu-ri",
-        "kaa": "Tiếng Ca-ra-Cac-pac",
-        "krc": "Tiếng Ca-ra-chay-Boa-ca",
-        "krl": "Tiếng Ca-re-ni",
-        "kas": "Tiếng Ca-s-mi-ri",
-        "csb": "Tiếng Ca-su-bi",
-        "kaw": "Tiếng Ca-oui",
-        "kaz": "Tiếng Ca-dakh",
-        "kha": "Khasi",
-        "kho": "Tiếng Kho-tan",
-        "kik": "Tiếng Khi-ku-iu",
-        "kmb": "Tiếng Kim-bun-đu",
-        "kin": "Tiếng Kin-ia-ouanh-đa",
-        "kir": "Tiếng Kit-ki-dơ",
-        "tlh": "Klingon",
-        "kom": "Tiếng Cô-mi",
-        "kon": "Kongo",
-        "kok": "Konkani (macrolanguage)",
-        "kor": "Tiếng Hàn Quốc",
-        "kos": "Tiếng Co-x-rai",
-        "kpe": "Tiếng C-pe-le",
-        "kua": "Tiếng Cu-an-i-am-a",
-        "kum": "Tiếng Cu-mic",
-        "kur": "Tiếng người Kurd",
-        "kru": "Tiếng Cu-ruc",
-        "kut": "Tiếng Cu-ten-ai",
-        "lad": "Tiếng La-đi-nô",
-        "lah": "Tiếng Lan-đa",
-        "lam": "Tiếng Lam-ba",
-        "lao": "Tiếng Lào",
-        "lat": "Tiếng La-tinh",
-        "lav": "Tiếng Lát-vi-a",
-        "lez": "Tiếng Le-d-khi-an",
-        "lim": "Limburgan",
-        "lin": "Tiếng Lin-ga-la",
-        "lit": "Tiếng Li-tu-a-ni",
-        "jbo": "Tiếng Loc-ba",
-        "loz": "Tiếng Lo-di",
-        "lub": "Tiếng Lu-ba-Ca-tan-ga",
-        "lua": "Tiếng Lu-ba-Lu-lu-a",
-        "lui": "Tiếng Lui-xen-ô",
-        "smj": "Tiếng Sa-mi Lu-le",
-        "lun": "Tiếng Lun-đa",
-        "luo": "Tiếng Luo (Ken-i-a và Than-dê-ni-a)",
-        "lus": "Tiếng Lu-sai",
-        "ltz": "Luxembourgish",
-        "mkd": "Tiếng Maxêđôni",
-        "mad": "Tiếng Ma-đu-ri",
-        "mag": "Tiếng Mu-ga-hi",
-        "mai": "Tiếng Mai-ti-li",
-        "mak": "Makasar",
-        "mlg": "Tiếng Ma-la-ga-si",
-        "msa": "Malay (macrolanguage)",
-        "mal": "Tiếng Ma-lay-am",
-        "mlt": "Tiếng Mantơ",
-        "mnc": "Tiếng Man-chu (Trung Hoa)",
-        "mdr": "Tiếng Man-đa",
-        "man": "Tiếng Man-đin-gô",
-        "mni": "Tiếng Ma-ni-pu-ri",
-        "glv": "Tiếng Man-khơx",
-        "mri": "Tiếng Maori",
-        "arn": "Mapudungun",
-        "mar": "Tiếng Ma-ra-ti",
-        "chm": "Mari (Russia)",
-        "mah": "Marshallese",
-        "mwr": "Tiếng Ma-oua-ri",
-        "mas": "Tiếng Ma-sai",
-        "men": "Mende (Sierra Leone)",
-        "mic": "Mi'kmaq",
-        "min": "Tiếng Mi-nang-ca-bau",
-        "mwl": "Tiếng Mi-ran-đi",
-        "moh": "Tiếng Mô-hoakh",
-        "mdf": "Tiếng Moc-sa",
-        "lol": "Tiếng Mon-gô",
-        "mon": "Tiếng Mông Cổ",
-        "mos": "Tiếng Mo-xi",
-        "mul": "Đa ngôn ngữ",
-        "nqo": "N'Ko",
-        "nau": "Tiếng Nau-ru",
-        "nav": "Navajo",
-        "ndo": "Tiếng N-đon-ga",
-        "nap": "Tiếng Na-po-li (Ý)",
-        "nia": "Tiếng Ni-at",
-        "niu": "Tiếng Niu-i",
-        "zxx": "Không có nội dung kiểu ngôn ngữ",
-        "nog": "Tiếng No-gai",
-        "nor": "Tiếng Na-uy",
-        "nob": "Norwegian Bokmål",
-        "nno": "Tiếng Na-uy (Nynorsk)",
-        "nym": "Tiếng Nai-am-oue-di",
-        "nya": "Nyanja",
-        "nyn": "Tiếng Nai-an-co-le",
-        "nyo": "Nyoro",
-        "nzi": "Tiếng N-di-ma",
-        "oci": "Occitan (post 1500)",
-        "oji": "Ojibwa",
-        "orm": "Tiếng O-ro-mô",
-        "osa": "Tiếng O-sa-ge",
-        "oss": "Ossetian",
-        "pal": "Tiếng Pa-la-vi",
-        "pau": "Tiếng Pa-lau-a",
-        "pli": "Pali",
-        "pam": "Tiếng Pam-pan-ga",
-        "pag": "Tiếng Pan-ga-sin",
-        "pan": "Panjabi",
-        "pap": "Tiếng Pa-pi-a-men-tô",
-        "fas": "Tiếng Ba Tư",
-        "phn": "Tiếng Phê-ni-xi",
-        "pon": "Tiếng Pon-pê-i-a",
-        "pol": "Tiếng Ba Lan",
-        "por": "Tiếng Bồ Đào Nha",
-        "pus": "Tiếng Pu-s-tô",
-        "que": "Quechua",
-        "raj": "Tiếng Ra-gia-x-tni",
-        "rap": "Tiếng Ra-pa-nui",
-        "ron": "Tiếng Lỗ Má Ni",
-        "roh": "Romansh",
-        "rom": "Tiếng Gipxi",
-        "run": "Tiếng Run-đi",
-        "rus": "Tiếng Nga",
-        "smo": "Tiếng Xa-mô-a",
-        "sad": "Tiếng San-đa-ouê",
-        "sag": "Sango",
-        "san": "Tiếng Phạn",
-        "sat": "Tiếng San-ta-li",
-        "srd": "Tiếng Xa-đi-ni-a (Ý)",
-        "sas": "Sasak",
-        "sco": "Tiếng Ê-cốt",
-        "sel": "Tiếng Xe-cuc",
-        "srp": "Tiếng Xéc bi",
-        "srr": "Serer",
-        "shn": "Tiếng San",
-        "sna": "Tiếng Sô-na",
-        "scn": "Tiếng Xi-xi-li",
-        "sid": "Tiếng Xi-đa-mô",
-        "bla": "Tiếng Xich-xich-a",
-        "snd": "Tiếng Sin-đi",
-        "sin": "Sinhala",
-        "den": "Tiếng A-ta-pax-ca",
-        "slk": "Tiếng Xlô-vác",
-        "slv": "Tiếng Xlô-ven",
-        "sog": "Tiếng Xoc-đi-a",
-        "som": "Tiếng Xô-ma-li",
-        "snk": "Tiếng Xo-nin-khe",
-        "spa": "Tiếng Tây Ban Nha",
-        "srn": "Sranan Tongo",
-        "suk": "Tiếng Xu-ku-ma",
-        "sux": "Tiếng Xu-me",
-        "sun": "Tiếng Xunh-đan",
-        "sus": "Tiếng xu-xu",
-        "swa": "Swahili (macrolanguage)",
-        "ssw": "Tiếng Xôa-thi",
-        "swe": "Tiếng Thuỵ Điển",
-        "syr": "Tiếng Xi-ri",
-        "tgl": "Tiếng Ta-ga-lọc",
-        "tah": "Tiếng Ta-hi-ti",
-        "tgk": "Tiếng Ta-gic",
-        "tmh": "Tamashek",
-        "tam": "Tiếng Ta-mil",
-        "tat": "Tiếng Tác-ta",
-        "tel": "Telugu",
-        "ter": "Tiếng Te-re-no",
-        "tet": "Tiếng Te-tum",
-        "tha": "Tiếng Thái Lan",
-        "bod": "Tiếng Tây Tạng",
-        "tig": "Tiếng Thi-gơ-rơ",
-        "tir": "Tiếng Thi-gơ-rin-ya",
-        "tem": "Tiếng Tim-ne",
-        "tiv": "Tiếng Ti-ph",
-        "tli": "Tiếng Tợ-lin-git",
-        "tpi": "Tiếng Tok Pi-sin",
-        "tkl": "Tiếng To-ke-lau",
-        "tog": "Tiếng Ton-ga (Nai-a-sa)",
-        "ton": "Tiếng Ton-ga (Quần đảo Ton-ga)",
-        "tsi": "Tiếng T-xim-si-an",
-        "tso": "Tiếng Xông-ga",
-        "tsn": "Tiếng T-xoua-na",
-        "tum": "Tiếng Tum-bu-ka",
-        "tur": "Tiếng Thổ Nhĩ Kỳ",
-        "tuk": "Tiếng Tuơkh-men",
-        "tvl": "Tiếng Tu-va-lu",
-        "tyv": "Tiếng Tu-vi-ni",
-        "twi": "Tiếng Toui",
-        "udm": "Tiếng Ud-mợt",
-        "uga": "Tiếng U-ga-ri",
-        "uig": "Tiếng Ui-guơ",
-        "ukr": "Tiếng Ukraina",
-        "umb": "Tiếng Um-bun-đu",
-        "mis": "Uncoded languages",
-        "und": "Chưa quyết định",
-        "urd": "Tiếng Uơ-đu",
-        "uzb": "Tiếng U-dơ-bếch",
-        "vai": "Tiếng Vai",
-        "ven": "Tiếng Ven-đa",
-        "vie": "Tiếng Việt",
-        "vol": "Tiếng Vo-la-puk",
-        "vot": "Tiếng Vo-tic",
-        "wln": "Tiếng Oua-lon",
-        "war": "Waray (Philippines)",
-        "was": "Tiếng Oua-sô",
-        "cym": "Tiếng Oue-l-s",
-        "wal": "Wolaytta",
-        "wol": "Tiếng Ou-o-loc",
-        "xho": "Tiếng X-hô-da",
-        "sah": "Tiếng Ia-cut",
-        "yao": "Tiếng Yao",
-        "yap": "Tiếng Yat",
-        "yid": "Tiếng Y-đit",
-        "yor": "Tiếng Yo-ru-ba",
-        "zap": "Zapotec",
-        "zza": "Zaza",
-        "zen": "Tiếng De-na-ga",
-        "zha": "Zhuang",
-        "zul": "Tiếng Du-lu",
-        "zun": "Tiếng Du-ni"
-    },
     "zh_Hans_CN": {
         "aar": "阿法尔语",
         "abk": "阿布哈兹语",
diff --git a/cps/templates/generate_kobo_auth_url.html b/cps/templates/generate_kobo_auth_url.html
index b8b74bda4..5364f44aa 100644
--- a/cps/templates/generate_kobo_auth_url.html
+++ b/cps/templates/generate_kobo_auth_url.html
@@ -3,7 +3,7 @@
 <div class="well">
 <p>
   {% if not warning %}
-      {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}
+      {{_('Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}
     </p><p>
       api_endpoint={{url_for("kobo.TopLevelEndpoint", auth_token=auth_token, _external=True)}}
   {% else %}
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 0f99e2b3b8f60ed45d4167374ea3a41ab669fc97..72ddda58b1b1cef1fdabce004c2188e9073550a2 100644
GIT binary patch
delta 8753
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
anR}y3+Sc&QOwZU`(zj9K-cz$yNBj@awJ}iu

delta 8913
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

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 6c8258f63..4b2d77aba 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+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,498 +15,498 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistika"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Server restartován, znovu načtěte stránku"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Vypínám server, zavřete okno"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Úspěšně obnovené připojení"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Stránka správce"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Základní konfigurace"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Konfigurace uživatelského rozhraní"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Uživatel admin"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Vše"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Zobrazit vše"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Opravdu chcete odstranit Kobo token?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Opravdu chcete vypnout?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zakázat"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Povolit"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json není nakonfigurováno pro webové aplikace"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 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:1143
+#: cps/admin.py:1160
 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:1173
+#: cps/admin.py:1190
 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:1179
+#: cps/admin.py:1196
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, 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:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr objektů skupiny LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, 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:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr uživatelských objektů LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 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:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Chyba: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 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:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "Databáze není zapisovatelná"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 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:1722
+#: cps/admin.py:1739
 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:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
@@ -519,20 +519,20 @@ msgstr "není nainstalováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Žádné"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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ý"
 
@@ -751,7 +751,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
@@ -832,7 +832,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -897,8 +897,9 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -914,7 +915,7 @@ msgstr "Token vypršel"
 msgid "Success! Please return to your device"
 msgstr "Úspěch! Vraťte se prosím do zařízení"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Knihy"
 
@@ -939,7 +940,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Nejlépe hodnocené knihy"
 
@@ -948,7 +949,7 @@ msgid "Show Top Rated Books"
 msgstr "Zobrazit nejlépe hodnocené knihy"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
@@ -957,7 +958,7 @@ msgid "Show read and unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
@@ -975,7 +976,7 @@ msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -985,7 +986,7 @@ msgstr "Zobrazit výběr kategorie"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Série"
 
@@ -1003,7 +1004,7 @@ msgid "Show author selection"
 msgstr "Zobrazit výběr autora"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Vydavatelé"
 
@@ -1013,7 +1014,7 @@ msgstr "Zobrazit výběr vydavatele"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -1037,7 +1038,7 @@ msgstr "Formáty souborů"
 msgid "Show file formats selection"
 msgstr "Zobrazit výběr formátů"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Archivované knihy"
 
@@ -1045,7 +1046,7 @@ msgstr "Archivované knihy"
 msgid "Show archived books"
 msgstr "Zobrazit archivované knihy"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr ""
 
@@ -1055,7 +1056,7 @@ msgstr ""
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Hledat"
@@ -1087,7 +1088,7 @@ msgstr ""
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
@@ -1138,7 +1139,7 @@ msgstr "Kniha byla odebrána z police: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Vytvořit polici"
 
@@ -1202,7 +1203,7 @@ msgstr "Police: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Úlohy"
@@ -1264,139 +1265,140 @@ msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizu
 msgid "No release information available"
 msgstr "Nejsou k dispozici žádné informace o verzi"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Žhavé knihy (Nejstahovanější)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Stáhnutí"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Seznam hodnocení"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, 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:1208
+#: cps/web.py:1209
 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:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, 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:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
@@ -1446,7 +1448,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1474,7 +1476,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Nahrávat"
 
@@ -1498,7 +1500,7 @@ msgstr "E-mail"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Poslat do Kindle e-mailová adresa"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Správce"
@@ -1877,12 +1879,12 @@ msgstr "Datum vydání"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Vydavatel"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Jazyk"
 
@@ -1933,8 +1935,8 @@ msgstr "Kliknutím na obal načtěte metadata do formuláře"
 msgid "Loading..."
 msgstr "Načítání..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Zavřít"
@@ -2380,7 +2382,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Motiv"
 
@@ -2479,49 +2481,51 @@ msgstr "Číst v prohližeči"
 msgid "Listen in Browser"
 msgstr "Poslechnout v prohlížeči"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Publikováno"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Označit jako nepřečtené"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Označit jako přečtené"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Přečteno"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Obnovit z archivu"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Archívovat"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Archivováno"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Popis:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Přidat do police"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Veřejné)"
@@ -2570,7 +2574,7 @@ msgstr "Limit velikosti souboru"
 msgid "Save and Send Test E-mail"
 msgstr "Uložit nastavení a odeslat zkušební e-mail"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Zpět"
@@ -2596,12 +2600,13 @@ msgstr "Zadejte jméno domény"
 msgid "Denied Domains (Blacklist)"
 msgstr "Zakázané domény pro registraci"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Další"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/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/generate_kobo_auth_url.html:11
@@ -2613,20 +2618,20 @@ msgstr "Kobo Sync token"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Vytvořit problém"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Zpět domů"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2716,7 +2721,7 @@ msgstr "Knihy řazené podle hodnocení"
 msgid "Books ordered by file formats"
 msgstr "Knihy seřazené podle souboru formátů"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Police"
@@ -2725,60 +2730,60 @@ msgstr "Police"
 msgid "Books organized in shelves"
 msgstr "Knihy organizované v policích"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Domů"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Přepnout navigaci"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Hledat v knihovně"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Nahrávání..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Chyba"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Nastavení"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Účet"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Odhlásit se"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Nahrávání..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Chyba"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Nastavení"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Prosím neobnovujte stránku"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Procházet"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "O knihovně"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Předchozí"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Podrobnosti o knize"
 
@@ -2794,7 +2799,7 @@ msgstr "Zapamatovat si"
 msgid "Forgot Password?"
 msgstr "Zapomenuté heslo?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Přihlásit se pomocí Magic Link"
 
@@ -2904,24 +2909,24 @@ msgstr "Calibre-Web katalog eknih"
 msgid "epub Reader"
 msgstr "Čtečka PDF"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Světlý"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Tmavý"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Zpět"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Po otevření postranních panelů přeformátujte text."
 
@@ -2930,111 +2935,111 @@ msgstr "Po otevření postranních panelů přeformátujte text."
 msgid "Comic Reader"
 msgstr "Čtečka PDF"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Předchozí strana"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Následujicí strana"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Změnit měřítko na nejlepší"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Změnit měřítko na šířku"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Změnit měřítko na výšku"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Změnit měřítko na nativní"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Otočit doprava"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Převrátit obrázek"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Měřítko"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Nejlepší"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Šířka"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Výška"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Nativní"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Otočit"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Převrátit"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Vodorovně"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Svisle"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Směr"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Zleva doprava"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Zprava doleva"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr ""
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr ""
 
@@ -3043,7 +3048,7 @@ msgstr ""
 msgid "DJVU Reader"
 msgstr "Čtečka PDF"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "Čtečka PDF"
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 14cb5cf5dc7e27d8df6278b5eda66ccae8bfb5b4..147992d3219271a0b37daadabe703083f48c64ad 100644
GIT binary patch
delta 12721
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

delta 12888
zcmZ|Ud3erO-pBDD*~F4W5|NO|okSK}WU)0tLIn|9HFniRb0eXlwxQ_HUTsRXTB_D+
z2gRsuY^|qisiC&gS~?@$6s4xi4As(l-XG^&*YnpiS1+$~&i%X3`JV6jo?pT&J?(Sq
zjE`Fx>ifFG|3Z8mCmL5os`r2Yi%xf(D7rDoe@<)uNWfBTiVINR+lQfe!S-*UhkihY
z<21(<Ou_-S?_xE_ah>;Q^yPy+*bjp;9p@4BVjEnIes~dcuo45XK?`FN61$U%buj~z
zu^U#$aTtWtu_nHR;kXQwS>M@WKRAzi@LSve1-0-4)I@$QjUlM#>SHiAMg@?CdcHj>
zkWLtiLr~9+LCxc$GWH_Iv%a&QMlC#!`ocx5gEz50R%vA-kHLEM8>61fLz3nUz(B09
z<FBIv+<>Im*=_p=Fr5BrEWs=2D%JU|9j7hM#vXV8AIBi_Ux34KC~m>-Sc@+;!9f^@
z^DrJaU<7`Gs*P_@8wt)bHI#_{^mDKVcFrRIAvF3hpfi06mAX-=RLw?TT!>+~*!I_>
zQoR|Kq3x)%J%t|pCr06Y)I1T{rY7Q0f#+iyPRu6%igX<VJnNi8vf>1h4lR&}nxFui
zVLxnyb5J|mg8lI@D)8ub=7?IL`n^zrjKCP2iS=+b>hpcB9XN|Rvs+jn?_(lHwl^tj
zkNRRBD&<9(g0rw8Zo)2j25Vy^S4Gb?Mg`Cvwcv0ZiqBy&x|i(-Ik{$`{-|Oain`|`
zQ5kp%6~Izd@oh(r*Exc!?gyv^gFEmp!E{uybwoYi9~D>`Ho$4ff3CBfKXn9`Q7Nz9
z(VS%ns(NEkw<8I;iB1dD0;Q;$c@}vkII~bSunV>DA=LLSqB3(8RdlJ3Iu8FiS^V+v
z{y#?}o`H23jmJ<CUqvnS8*;o(^-gAiE~uj_MD6G))Wj1}nV5;3g7XS0fHSB7D^W!p
znrEI*LSL7G3>vyNtx;#y6Jv2CD&_N0fxL}M-A+`%=P(ZMpsrP9XESlEwFxSq)~G<c
zplW6y_Q6@`=F|9`hEf(wp0r>K)Q)<gFAlc-B2<b;V*pM;)yhoN_bX6Gwgy#f@1l<O
zBh;<=Hzs3bSMywMSI%E4$!8!EpFm||5^Bc_P)D)~71;Zz1<#`v_zHCtcac+a0@#gq
zT!8*K81?xu)V$B2GCLoY$qo7BzY&e23@DX9qjntD%`6y+N?j%@z&uRAp{S#pg$i^9
z>e~Jdb>_!V8@qrpcoX%$2rMwhVj%sNE)5l14pzrLs1!ee53dVqp=qcIm!KBhh}yyX
zsLXtU+Uaf7Jigt{Z3;$Zq7G`lXjFiysCnGBG!$VE)ESOKrErFQU=h}&{}w9ZEm#Bh
zpe8tsTKIG86+8YP^kdw&hdHY1sQKgZVX-3_ah;wtJbX}sx;AsIhf!bf>1lq-MWQlM
zfXbK`wWG-xgfF53UxqdDUDU>Qp)&Fr*1|7Q-@AqWtnWOap{n%nW!~|rm`Q&Ks#q3b
z3U0+DykvEHn+1}sd8i|K3VFntg*x-I$X=Z57=*1JGwbDH1nWCb(`bfskgM!$$3(n~
zs`3V0R_&-2*2YJ%G4{nqI0LKUMpW_cK<#)BYTiSrO#X}^=>NF+Rjw|&Sq$XUXo+)B
zXS)w|b|0fsb^^7tFHmRq8+tIL(2S>}`n|CsK7-2K64dqGh05?b)c5b9HW=EM{41qx
z`kKg|MD1`ahT|;MwOWd->FhvF6wuF1)Eu?r&Zy@KP`6=(brxpRUx~`dCDd)Wg4*cK
ze&k;h{K|m5Zy&7E-&A`|)Wi`Oj2WmDc0^6^II3u$M9Ronh1$R^<W=H4KrNg<z>F7S
z9s0vjwJ^=45k{i|Ro$ymJJ^eQ(R_xg;=8CCh!|*UA_0}cY}9x$D)r?Uii@!guEPNQ
z5*5fb)JA?mZNRNM$m}r4+87m3XDq-$$R?b1s2%-@I@7L$%|u>|q(9O27ux<R%wT*s
zcEB5$hfRl=4UEG$-TxP9r1QaM%*9I7&SRf2seTl-Kq1z}r%}((#a!Hts{XsE)K?j5
zG7yG(VI`r8IL(f?M-}&D=&SqRpN6i{5Uh{$9)93BYf%%fN2P8rs(21#JNyK*G4M%~
zkvvqO!%z!P#R!~>I`b8%BiW8R`<v+J()gW5b99Q#LTRXlvQcN$5lNNP6P1CnsKDl<
z&i+l*gzHfY?n3SGB<dEO!zjFtF<7<O)Px6JEtEo|2{y+}9E`dRFQazy8mfp^VO3m*
z3iw^rZMcNdcmuW5fMMnZ6@zK?yP^lDU`Kotv+(jT^51|)<WpwB)~Fq}MeV2%tKw6r
z>K<<U6_`MOA!@?yn2NViN7Asw{DxD6+RzTn$7`sgO!t~1Z|f!h+CgsyR7Az-!7^(F
z#?jx53g{H7sxM;)3>j_$>4VzoB;*z1thfC?QLo_UBg~uf2~>X?s@68TG&<Ax7?qM*
zBl&#|yP_}7Km|4zRmBTY_jd&b;AX6bJFy||$1wZ`RU3CuN9a>(Hc$)oc{Hkq+%y`>
zKu0_9I0n-9q8=QBO4)4G!V57USD_ZTj{bNXRc!aIwad)sN!Co%?Z~zLfyf42XSf|G
zN9}kjR>v8r>aRe3aVaW*t*9zKfLgE;>*0TFKWLOG#st)Jxu{whYWuUW8vQjGuKWKk
z4NdSrn1q)w8J*E4r72j0ZVyz-2BLO6%J#=$SNe0X3!X#;TIXqV?Gmvj{Tx(AyQ7Y-
z2*Y*%N7@Ibql)ZB)O}rs`oa#>f=6xt6xO2ujUE3972vO^g?!4*4nt7SMPYSJw*3qY
zq@Rnf4~=d#9>JcdBAkzk@DM6hpP-KBGgM%g&=3EETHrU-jswOR>tYc7WZQ3r9{Qb8
z3y(l;=$SF(Uk^@ZK#@O>n(#H$_*(nmHf&6P59<1Ti#oE1vF2|=>8ObdQP*lHhTyXp
zixsGVH=!2ZhI)R_Sn{uh4>F)v=V{a#UquzyUChK<&zKZ<KwYyQsLYH*z4@lv@i$OM
zwjcE(`_%e9D&Q*P%>2=)45zv@l-gGIgKX5qJun#ip#mF@dbLhRWo9wf#<l3dov466
zM+I;L_57cxK*GnH%rr&yyP|HDTSP+>O+hVGftqM7D&pPt^RuW4ub_(UcT}MM6HH2j
zu_gTo%)sv06kSwJZN^4;&02fn!=E9plWiK#DAXA*#}xb+<MBs39y-bVkZOmTs1!Z8
z81?*4)Y)FfOuS<Ik$*86i$&EyD(W`0zyRI<96QhjH9;R#>IY&RmSQ4SU^Co?DylEh
zgAY&{^h`GY4w!)|;#R1m?PSeI1<(_f!9wiD`c4sz5Zr|A@dMO@_b?QzOff%P!cjZR
z!w8&$kKiIy%8#Qm_y=~wlxNKko$;7X|5fzhVbq4cLstvcm}*i|8}&Yj#)mtyW}q_C
z$y$iYKnW`FId=SYOr!r-RCS+66>Fva{1z(1e_%cIoksrkj*gvXs<R#HIu6809F87z
zQ4_5}E&QJCpGNJt5|x3#>82Liq89REG>%3c$qSf_OR*3?oKF6=VEA(;;y6@l8==0C
zi^@b#tcyjc7sq6*kF%_+P-ndl_1uTn3)Ua81>*s%r=o6)+R&3O4PB#h)KUBeV^D!9
zh08Gv-$p&R8@12@RA5I?)qDX}E8n03yp6gg5AflJW|;YMQR{R?9f8}EhR(bco8Z&f
z6PIBsUPoQ8x--pB$6VAxBTyN77Q=Bqsu)+=@e8Ob{|*)K&vyI{>S%mtJ**wqsX;>z
zM5A^RXZuZ2fu*AYXo<?eP*jFSpi({8_E%y>75+uU_PfmC3i7!ZJ-7n1a6iW3U97G9
zUvI7{lBTE!^Dzg@P$}Gq-S9Kij$`NXBO9Ax87{#tSmk;1ujBdXr*Z6xD=+}RLv7#|
zDl>O5f%ToL^G&LgP^s;UDvpt;Gx`fQz*kX6vdxZvg*w}NsA3F#!7QAL3bX}kp^m8e
zdZMoD6X=WO=vJdKo`x2fW?ha7WFM;dPNEk68dEUjMf3S1sH5nP4Y3T9@nuv1yD<Te
zplalM?1q1$Y9POY{Og0>73Laxu{!;6sD-Cv0KS6LaT#i%x-Xejx5bh4U$Fjy1LzN4
zVD9%$>_b0rp?Px-K@a^!s10vhNdBW}oME6N-oPMi_OjVoThv(&LS45aR0_wT0-KF`
z!Bn6&vcZn;M`iE`>iZY%cqQujt5^el+(o7ugHdOlj)B-6RlWVNH7>xGc*OSaVGsJ5
zub977&O`;Y4{PE<Y=Ngy^Z34M7S2Wr-x+{9I`^_|+(TW9sKq8l*{HJ{g0VOQ75N%W
z#Qj(szeP=S8=GL*Yi4ITSciTACSftA;e2e0d$Bj`J6CC_id(;K9_Wb=-%P0c{U$zx
z+p!26E-~-?xu_j)MWu2NX5e8|4gHD=yy{X@OYx{9ZiNbb3a0D+SI`J$U_a^_ov{!6
zfC}VKRK!tlJdD`sj4kLdMJ;p!6~G1C{}xsK|Heo0K5D_-W#+j)m_>gmhOoY~j7DAD
zr~y2PkKsAg7Zcw!ujJO)iT*rPDnCKphWl6t<CdGBnys-5{obfzegpOSdel+vN3HWu
zbk+EQh8Fw->tU}I=3h9<P}gJwYNtn0_x3C*;7h2Q`5Be!u$3l*nHWsJ7dFBtu`#}Y
zs*#<j_s&-<$-h$dJp<b5uc&|mSDA_Gp;FxnpTJQ#1dm|^CapFLv_tK51nTxoLfwKH
zsQDM5YGt_{e;YmYx2|?gB%d-6!@w7qig!_Gp1j8VOGhCp;yI}27GOMX!YDk2k$4?-
zJF2{8-UrF3fZC#NL1$E;Ph)SK=F(8APNGtK*?I*V(7%bQ>gsFFFQ4tOCH+yT3Ex63
z@DKa>SyUj-+oq_aP)E=dn_)jxz;jSX?XIE`PGc`B@>8gy`mgOry<^Te2g4XI#%P>q
z`>&#oVx1k|kFoT>KyBc6Ou(qW+M`0PGXh!Hbr#UjnXg5i(GJv(-bY1v#D4x2DuAES
zgMRBw5hkI&-yXG*UZ@n8plV>e?ax4E=4DjC8!$}w|3e!3;yLuk>(~%~#3T$~Z~EEj
zp<jfmjhWa5x8P8`gSuvYH<;Tq3bo+7SRW6f7Oq6CcN^=mzEk~Ob5@C{2iu^kw$M5Z
zbvwqQb~X#!;47Go$FVK?Z#1{%QPlWk%)*`4AJId<@g`#dx{VkZO``;tpmuN%Ct>Z)
zra0$g3;J)Mj^reE$LpAfE&paRG8Oe+*nl<h0BXl4F&D33draJ7j=E$E`LD*nXa;KG
zMAXEyQK>(JI`dyqJE`%W`MKU1bLlTf-JXA;FaCgfmH&+TzVB8OKod-)-w}1RBT=6(
z*h>DDft~h)O4OP8Y%@EKM(yA+)E7pgCVCk|@b7l~V~nGJ3w4CS+xfK(o1ilHHYzh0
z(I0<8&G)NIqX~@$JIp=rhWYfTV+}ltes~VG;3W*i8>k)s7pvoM_H*Bz=2x&fsD;{L
z0Cqwj?2g^AH}*nzISsuKZlY?y@9*X)$}pV%WDLaxSR2=%GO`^N_%YNQ@iwMn*e-Mb
zJE8&}hVeKaTjCN_CQe|c?*A1U!3;$1HvgoWg4%f*YG;#BpU<@8ub@)A67{0lixGGU
zd*e^2qU^B8{D$;A>V@?=*1=y;-><e;8{+&M(oj{mLS3WB@KIcdO4V7ci!uAm8MnkC
z^!sBE+=(ixs_&Z}Cu0izHmL6vV>_IJop3kmNbX}p-GAQ?OlljUZbP>1cS23j4|Ue%
zwm%+Q(XT))d=OP5*Dwrkp%$pJ-@GpZu?zi3)W(WX#rh7q^=N!dLkoY6(Rc$j9`HZr
zZ$k0-@GMaajYmy51@*m;P{no}RV$xjW4wY5F!)0=o{Bnx4ycXw|B(Fa?8Y#lGoFX_
zaS2A@cGUGefm-Mes)`?A8}vC~j;Jl_^XD-L7ojq+8kM>AsG8V}+Q=`MfIc6&rihY1
zGS{vP>IL))CSs)>_dRINt|z82z8IB>4^TTih)Vs}SQT%h0>5kf@rO*niP)a;q1Xaf
zx-?W2XR!~~J#5|sWjI6+pl-qMsD=EFm<%;U?Kl@TQ9j1ua~O|nPyro6)yf5Ihe02k
zz`CQx-AObi()b&4ADx7w=3U+&W9iSq0(=K!@F&z4gZ^QzTOQ`oUxL2)FH{YDjXKi*
zq5|<fW&(~xUGF$-s{7xJhKg;Fbt3AEi>zx<6Ku5}MitLRjKH5z69ybN3x{Df`bnsH
znxitAV?SSkf%M<Qy1M^+A2z63jO2swZNKU#<~Gzr6-{f@LS0c47h(XGpgtds)p0s1
z!1;E34eHIe4VBSrsC5EPP~@!dcxWVG7B<A8n1-`45qDxu`~p3A4Rt%Jois-kk4@<J
z!W5i}{`d|m&`qcvzmE#^2zJ8r=&DiwlzFhoIu`Y=pMfg6S5Yb5hPs~nP!pX;9l<qJ
zK!2i+D)O|+L{n5ITBGLcg_@@rgRty0`46Ts#eVPt)}sF^DwS(&e-mm4d(j6EVJ;rU
z4p{AsIf`zm1^S?#AB^efMa{Pq72sM_k?uM}{*~He_Ji{nLjMNpi}z5UH~ZAw_bk+o
za#7<0P;WG^9iNJ-iN)9qmt!^_LtRV1v*u`1Pyr2eY3P+(f}uDQb&p>|Kiq{n%MVaH
zI)pXwB<d(Gp#r{*`f=@l&b+egqn;a#s*Mq-%r3^p_!c%o_k?ZSK`re0%$#{gRK&%o
zYMq0cU?nQBO{i<T4YiXK7>XCrgEvsMQ{!_}BaKn>bU<Zh5c0X}%%`E^S&!lP5h}&!
zQD68shGD>Ylj{1Y@pRO4-B5uKLtU>qs9W<6>U+mg8LG7XA5ll-b3w0s&c6nYJO=t=
z7B0sEJde6g@fS_X3Q&<x!c=?*mBMrA!9VPHgG=UJ-vjmid8okN!=`u|Tj725XMHF0
z3-g!EEYw+-p{~a>s8r9e{duSwcpY`Nt5MHyLLJR^)L9?EB>Vxjv9N!dpD6=T0lb7d
zs=fH||NlE-2hO10;oqWCbRBh_enKty8%{>Qf0?6t4j-ex7!~Mu7=bsjEmpm3e%j?=
zH2vpL<I6D_FJ319&1pE5<{qb^hweC3>K3Ekh#z1B{2H~8^QC!V`J)1kz&cnTRYU1m
z4?Cj*D#loxjH;D4ur}`d(luv!f&r!W9x63{Ul}7&6Es0Z+!2++GK|5csOSHV!T1l<
z5nRNY==-&)k=m$vvatj9!FKqXOGEeZEb1)(KoynmH>PS+u?77c%)tq$iFcv`{s?37
z6V#4wq89oC6<GMUrZ$o>o_<Tz^8-*v>rSSjoy<fJu11~J0aS#SF&*n)G1sjJDgZC4
z=*FRrW(KNeR->-ndej2%+wsGwbxxo%bptsv*ZG}>A`SV@{7Yv7M$sRPns6d2Gt)5v
z=U`RbfDLgIcE>ZQ;)=Oy0vd#E=ubh_#CG)HQLKyCF-P~`xn?5HMZL)i(HEaYrL@G3
zPeKJc69e!y)Df&eA6#eMh&sY8_VbIV)PI9X=y%-|VN-N=)Ji{|ncr)yx7;&fq}P)=
zYRs@P%?tR$<L%=uF7b{_eQHekaL@44(Oyq!xu@7O!8>_^$6Hc5VazyBae0ZSxTM6B
zLR&+PvUZ#=@o7*ityx-zCnG&8J)=ol#*VAAs#ftyOU>MIbM}DTA%~U>A71YDl$8Ge
zi*+iV;4Rf^-qLdK)1E?Bv<psT!QqEK7~%DdEG>U_A`26t$2)Gkcfzw?R_}PYZ^Hiq
DZbySY

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 9a5d9a84e..a87badd06 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2022-08-27 10:00+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -16,487 +16,487 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet, Seite bitte neu laden"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird heruntergefahren, Fenster bitte schließen"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Erfolgreich neu verbunden"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Benutzer bearbeiten"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Alle"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} Benutzer erfolgreich gelöscht"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Zeige alle"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Ungültige Anfrage"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "Guest Name kann nicht geändert werden"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "Guest Benutzer kann diese Rolle nicht haben"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "Wert muss true oder false sein"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Ungültige Rolle"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "Guest Benutzer kann diese Sichtbarkeit nicht haben"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "Ungültige Sichtbarkeit"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Guest Sprache wird automatisch bestimmt und kann nicht eingestellt werden"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "Keine gültige Sprache gewählt"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "Keine gültige Buchsprache gewählt"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Parameter wurde nicht gefunden"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "Ungültige Lese Spalte"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "Ungültiger Spaltenname für Einschränkung"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Möchten Sie wirklich den Kobo Token löschen?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "Möchten Sie wirklich diese Domain löschen?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "Möchten Sie wirklich diesen Benutzer löschen?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Möchten Sie wirklich dieses Bücherregal löschen?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Möchten Sie wirklich die Anzeigesprache der ausgewählten Benutzer ändern?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Möchten Sie wirklich die Büchersprachen für die ausgewählten Benutzer ändern?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Möchten Sie wirklich die ausgewählte Rolle für die ausgewählten Benutzer verändern?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Möchten Sie wirklich die ausgewählten Sichtbarkeitsbeschränkungen der ausgewählten Benutzer ändern?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Möchten Sie wirklich die Sichtbarkeiten für die ausgewählten Benutzer verändern?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Möchten Sie wirklich die Synchronisation von Bücherregalen für die ausgewählten Benutzer verändern?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Ort der Calibre Datenbank editieren?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr "Calibre-Web wird nach neuen Covern suchen und Cover Miniaturansichten aktualisieren, dies kann eine Weile dauern?"
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Möchten Sie wirklich die Synchronisationsdatenbank von Calibre-Web löschen, um eine komplette Synchronisation zu erzwingen?"
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Verbieten"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Erlauben"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr "{} Synchronisationseinträge gelöscht"
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Tag nicht gefunden"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Ungültige Aktion"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json ist nicht für Web Anwendungen konfiguriert"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 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:1143
+#: cps/admin.py:1160
 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:1173
+#: cps/admin.py:1190
 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:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Bitte einen LDAP Service Account und Password eingeben"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "Bitte einen LDAP Service Account eingeben"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, 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:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gruppen Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, 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:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Benutzer Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, 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:1204
+#: cps/admin.py:1221
 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:1211
+#: cps/admin.py:1228
 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:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account Verifikation erfolgreich"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail an %(email)s wurde zum Senden in die Warteschlange eingereiht, für das Ergebnis bitte Aufgaben überprüfen"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr "Einstellungen für Geplante Aufgaben"
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr "Ungültigen Startzeitpunkt für Aufgaben spezifiziert"
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr "Ungültige Laufzeit für Aufgaben spezifiziert"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr "Einstellungen für Geplante Aufgaben aktualisiert"
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr "Dateien konnten während des Updates nicht ausgetauscht werden"
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht extrahiert werden"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fehler: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} Benutzer erfolgreich importiert"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 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:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "Datenbank ist nicht schreibbar"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 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:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 msgid "Database Settings updated"
 msgstr "Datenbankeinstellung aktualisiert"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "Guest Benutzer kann nicht gelöscht werden"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 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:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
@@ -509,20 +509,20 @@ msgstr "Nicht installiert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Keine"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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"
 
@@ -740,7 +740,7 @@ msgstr "Fehler beim umbenennen der Datei im Pfad: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
 
@@ -818,7 +818,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -883,8 +883,9 @@ msgstr "Google Oauth Fehler: {}"
 msgid "{} Stars"
 msgstr "{} Sterne"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Login"
 
@@ -900,7 +901,7 @@ msgstr "Token ist abgelaufen"
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Bücher"
 
@@ -925,7 +926,7 @@ msgstr "Heruntergeladene Bücher"
 msgid "Show Downloaded Books"
 msgstr "Zeige heruntergeladene Bücher"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Best bewertete Bücher"
 
@@ -934,7 +935,7 @@ msgid "Show Top Rated Books"
 msgstr "Bestbewertete Bücher anzeigen"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
@@ -943,7 +944,7 @@ msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
@@ -961,7 +962,7 @@ msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -971,7 +972,7 @@ msgstr "Zeige Kategorienauswahl"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Serien"
 
@@ -989,7 +990,7 @@ msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Verleger"
 
@@ -999,7 +1000,7 @@ msgstr "Zeige Verlegerauswahl"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -1023,7 +1024,7 @@ msgstr "Dateiformate"
 msgid "Show file formats selection"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
@@ -1031,7 +1032,7 @@ msgstr "Archivierte Bücher"
 msgid "Show archived books"
 msgstr "Zeige archivierte Bücher"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Bücherliste"
 
@@ -1041,7 +1042,7 @@ msgstr "Zeige Bücherliste"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Suche"
@@ -1073,7 +1074,7 @@ msgstr "Lesestatus = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -1123,7 +1124,7 @@ msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Sie haben keine Berechtigung um Bücher aus diesem Bücherregal zu löschen"
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
@@ -1185,7 +1186,7 @@ msgstr "Bücherregal: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -1247,139 +1248,140 @@ msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Ver
 msgid "No release information available"
 msgstr "Keine Releaseinformationen verfügbar"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Entdecke (Zufällige Bücher)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Von %(user)s heruntergeladene Bücher"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr "Bewertung: Keine"
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Bewertungsliste"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, 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:1208
+#: cps/web.py:1209
 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:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 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:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, 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:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
@@ -1429,7 +1431,7 @@ msgstr "Konvertiere"
 msgid "Reconnecting Calibre database"
 msgstr "Calibre Datenbank wird neu verbunden"
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr "E-Mail"
 
@@ -1457,7 +1459,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Cover Miniaturansichten Cache wird gelöscht"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
 
@@ -1480,7 +1482,7 @@ msgstr "E-Mail"
 msgid "Send to E-Reader E-mail Address"
 msgstr "An E-Reader E-Mail Adresse senden"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1858,12 +1860,12 @@ msgstr "Herausgabedatum"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Herausgeber"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Sprache"
 
@@ -1913,8 +1915,8 @@ msgstr "Klicke auf das Bild, um die Metadaten zu übertragen"
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Schließen"
@@ -2357,7 +2359,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Theme"
 
@@ -2454,49 +2456,51 @@ msgstr "Im Browser lesen"
 msgid "Listen in Browser"
 msgstr "Im Browser anhören"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Buch %(index)s von %(range)s"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Herausgabedatum"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Als ungelesen markieren"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Als gelesen markieren"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Gelesen"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Vom Archiv wiederherstellen"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Zum Archiv hinzufügen"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Archiviert"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Öffentlich)"
@@ -2545,7 +2549,7 @@ msgstr "Anhangsgröße"
 msgid "Save and Send Test E-mail"
 msgstr "Einstellungen speichern und Test-E-Mail versenden"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Zurück"
@@ -2571,12 +2575,13 @@ msgstr "Domainnamen eingeben"
 msgid "Denied Domains (Blacklist)"
 msgstr "Verbotene Domains für eine Registrierung"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Nächste"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Öffne die .kobo/Kobo eReader.conf Datei in einem Texteditor und füge hinzu (oder ersetze):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2587,19 +2592,19 @@ msgstr "Kobo Token:"
 msgid "List"
 msgstr "Liste"
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Web Instanz ist nicht konfiguriert, bitte den Administrator kontaktieren"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Issue erzeugen"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Zurück zur Hauptseite"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "Benutzer ausloggem"
 
@@ -2689,7 +2694,7 @@ msgstr "Bücher nach Bewertungen sortiert"
 msgid "Books ordered by file formats"
 msgstr "Bücher nach Dateiformaten sortiert"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Bücherregale"
@@ -2698,60 +2703,60 @@ msgstr "Bücherregale"
 msgid "Books organized in shelves"
 msgstr "Bücher in Bücherregalen organisiert"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Home"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Nagivation umschalten"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Bibiliothek durchsuchen"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Lade hoch..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Fehler"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Lade hoch..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Fehler"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Bitte die Seite nicht neu laden"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Über"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Vorheriger Eintrag"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Buchdetails"
 
@@ -2767,7 +2772,7 @@ msgstr "Merken"
 msgid "Forgot Password?"
 msgstr "Passwort vergessen?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Einloggen mit magischem Link"
 
@@ -2875,23 +2880,23 @@ msgstr "Calibre-Web E-Book-Katalog"
 msgid "epub Reader"
 msgstr "epub-Leser"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Hell"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Dunkel"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr "Sepia"
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 msgid "Black"
 msgstr "Schwarz"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Text umbrechen, wenn Seitenleiste geöffnet ist."
 
@@ -2899,111 +2904,111 @@ msgstr "Text umbrechen, wenn Seitenleiste geöffnet ist."
 msgid "Comic Reader"
 msgstr "Comic-Leser"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturkürzel"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Vorherige Seite"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Nächste Seite"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Optimale Skalierung"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Skaliere auf Breite"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Skaliere auf Höhe"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Skaliere 1:1"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Rechts rotieren"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Links rotieren"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Bild umdrehen"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Skalierung"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Beste"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Breite"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Höhe"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "1:1"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Rotieren"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Umdrehen"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Leserichtung"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Links nach rechts"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Rechts nach links"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "Zurück nach oben"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "Position merken"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "Scrollleiste"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Zeige"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Verstecke"
 
@@ -3011,7 +3016,7 @@ msgstr "Verstecke"
 msgid "DJVU Reader"
 msgstr "DJVU-Leser"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr "PDF-Reader"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 6201db169f43bdfed0c0176ceafb5536898aebe9..7aa66c6bb119e761082d4eb0ccd05421551c1929 100644
GIT binary patch
delta 9290
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

delta 9535
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
Roo0FV^F^3@lkL0f{uje)l~Moz

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 000bba649..fc3fc58fd 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -15,498 +15,498 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Στατιστικά"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Ο διακομιστής επανεκκίνησε, παρακαλούμε φόρτωσε ξανά τη σελίδα"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Πραγματοποιείται κλείσιμο του διακομιστή, παρακαλούμε κλείσε το παράθυρο"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Επιτυχής επανασύνδεση"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Άγνωστη εντολή"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "ʼΑγνωστο"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Σελίδα διαχειριστή"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Βασική Διαμόρφωση"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "UI Διαμόρφωση"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Χρήστης Διαχειριστής"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Όλα"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Δεν βρέθηκε χρήστης"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Προβολή Όλων"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Ενημερώθηκε η διαμόρφωση Calibre-Web"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Θέλεις πραγματικά να διαγράψεις τη Μονάδα Kobo;"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις κλείσιμο;"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Απόρριψη"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Επιτρέπεται"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json Δεν Έχει Διαμορφωθεί Για Διαδικτυακή Εφαρμογή"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Φύλλο Καταγραφής Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Πρόσβαση Φύλλου Καταγραφης Τοποθεσίας δεν είναι έγκυρη, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Παρακαλούμε Συμπλήρωσε ένα Πάροχο LDAP, Θύρα, DN και Αντικείμενο Αναγνώρισης Χρήστη"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Προσθήκη νέου χρήστη"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Επεξεργασία χρήστη %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Προβολέας αρχείου φύλλου καταγραφής"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Αίτημα πακέτου ενημέρωσης"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Κατεβάζει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Ανοίγει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Αντικατάσταση αρχείων"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Σταματάει το διακομιστή"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Η ενημέρωση απέτυχε:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP Σφάλμα"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Σφάλμα σύνδεσης"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Γενικό σφάλμα"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Σφάλμα: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "Η DB δεν μπορεί να Γραφτεί"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "Το E-mail δεν είναι από έγκυρο domain"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
@@ -519,20 +519,20 @@ msgstr "δεν εγκαταστάθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Κανένα"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -751,7 +751,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
@@ -832,7 +832,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -897,8 +897,9 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -914,7 +915,7 @@ msgstr "Η μάρκα έχει λήξει"
 msgid "Success! Please return to your device"
 msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Βιβλία"
 
@@ -939,7 +940,7 @@ msgstr "Κατεβασμένα Βιβλία"
 msgid "Show Downloaded Books"
 msgstr "Προβολή Κατεβασμένων Βιβλίων"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Βιβλία με Κορυφαία Αξιολόγηση"
 
@@ -948,7 +949,7 @@ msgid "Show Top Rated Books"
 msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Βιβλία που Διαβάστηκαν"
 
@@ -957,7 +958,7 @@ msgid "Show read and unread"
 msgstr "Προβολή διαβασμένων και αδιάβαστων"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Βιβλία που δεν Διαβάστηκαν"
 
@@ -975,7 +976,7 @@ msgid "Show Random Books"
 msgstr "Προβολή Τυχαίων Βιβλίων"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -985,7 +986,7 @@ msgstr "Προβολή επιλογών κατηγορίας"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Σειρές"
 
@@ -1003,7 +1004,7 @@ msgid "Show author selection"
 msgstr "Προβολή επιλογών συγγραφέα"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Εκδότες"
 
@@ -1013,7 +1014,7 @@ msgstr "Προβολή επιλογών εκδότη"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Γλώσσες"
 
@@ -1037,7 +1038,7 @@ msgstr "Μορφές αρχείου"
 msgid "Show file formats selection"
 msgstr "Προβολή επιλογών μορφής αρχείου"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Αρχειοθετημένα Βιβλία"
 
@@ -1045,7 +1046,7 @@ msgstr "Αρχειοθετημένα Βιβλία"
 msgid "Show archived books"
 msgstr "Προβολή αρχειοθετημένων βιβλίων"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Λίστα Βιβλίων"
 
@@ -1055,7 +1056,7 @@ msgstr "Προβολή Λίστας Βιβλίων"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Αναζήτηση"
@@ -1087,7 +1088,7 @@ msgstr ""
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
@@ -1138,7 +1139,7 @@ msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sn
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Δημιούργησε ένα Ράφι"
 
@@ -1202,7 +1203,7 @@ msgstr "Ράφι: '%(name)s"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Εργασίες"
@@ -1264,139 +1265,140 @@ msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε
 msgid "No release information available"
 msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες αποδέσμευσης"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Κατεβασμένα βιβλία από %(user)s"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Συγγραφέας: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Εκδότης: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Σειρές: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Αξιολόγηση: %(rating)s stars"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Μορφή αρχείου: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Κατηγορία: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Κατεβασμένα"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Λίστα αξιολογήσεων"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
@@ -1446,7 +1448,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1474,7 +1476,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Ανέβασμα"
 
@@ -1498,7 +1500,7 @@ msgstr "Διεύθυνση E-mail"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Διεύθυνση E-mail Αποστολής στο Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Διαχειριστής"
@@ -1877,12 +1879,12 @@ msgstr "Ημερομηνία Έκδοσης"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Εκδότης"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Γλώσσα"
 
@@ -1933,8 +1935,8 @@ msgstr "Κάνε κλικ στο εξώφυλλο για φόρτωση μετα
 msgid "Loading..."
 msgstr "Φόρτωση..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Κλείσιμο"
@@ -2380,7 +2382,7 @@ msgstr "Αριθμός Τυχαίων Βιβλίων για Εμφάνιση"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Αριθμός Συγγραφέων για Εμφάνιση Πριν την Απόκρυψη (0=Απενεργοποίηση Απόκρυψης)"
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Θέμα"
 
@@ -2479,49 +2481,51 @@ msgstr "Διάβασε στο Πρόγραμμα Περιήγησης"
 msgid "Listen in Browser"
 msgstr "ʼΑκουσε στο Πρόγραμμα Περιήγησης"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Εκδόθηκε"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Σήμανση ως Αδιάβαστο"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Σήμανση ως Διαβασμένο"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Διαβάστηκε"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Επαναφορά από το αρχείο"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Προσθήκη στο αρχείο"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Αρχειοθετήθηκε"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Περιγραφή"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Προσθήκη στο ράφι"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Δημόσιο)"
@@ -2570,7 +2574,7 @@ msgstr "Όριο Μεγέθους Επισύναψης"
 msgid "Save and Send Test E-mail"
 msgstr "Αποθήκευση και Αποστολή E-mail Δοκιμής"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Πίσω"
@@ -2596,12 +2600,13 @@ msgstr "Όνομα domain"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domains που Απορρίφθηκαν (Μαύρη λίστα)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Επόμενο"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "ʼΑνοιξε το .kobo/Kobo eReader.conf αρχείο σε πρόγραμμα επεξεργασίας κειμένου και πρόσθεσε (ή κάνε επεξεργασία):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2613,20 +2618,20 @@ msgstr "Kobo Μονάδα Συγχρονισμού"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Δημιουργία Θέματος"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Επιστροφή στην Κεντρική"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2716,7 +2721,7 @@ msgstr "Τα βιβλία ταξινομήθηκαν ανά Αξιολόγηση
 msgid "Books ordered by file formats"
 msgstr "Τα βιβλία ταξινομήθηκαν ανά μορφές αρχείου"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Ράφια"
@@ -2725,60 +2730,60 @@ msgstr "Ράφια"
 msgid "Books organized in shelves"
 msgstr "Βιβλία οργανωμένα σε ράφια"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Κεντρική"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Αλλαγή Θέσης Περιήγησης"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Αναζήτηση Βιβλιοθήκης"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Φόρτωση..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Φόρτωση..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Παρακαλούμε μην ανανεώσεις τη σελίδα"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Περιήγηση"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Σχετικά"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Λεπτομέρειες Βιβλίου"
 
@@ -2794,7 +2799,7 @@ msgstr "Να με Θυμάσαι"
 msgid "Forgot Password?"
 msgstr "Ξέχασες τον Κωδικό;"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Σύνδεση με το Μαγικό Σύνδεσμο"
 
@@ -2904,24 +2909,24 @@ msgstr "Calibre-Web Κατάλογος eBook"
 msgid "epub Reader"
 msgstr "PDF πρόγραμμα ανάγνωσης"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Φωτεινό"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Σκοτεινό"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Πίσω"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Επανάληψη ροής κειμένου όταν οι μπάρες στο πλάι είναι ανοιχτές."
 
@@ -2930,111 +2935,111 @@ msgstr "Επανάληψη ροής κειμένου όταν οι μπάρες
 msgid "Comic Reader"
 msgstr "PDF πρόγραμμα ανάγνωσης"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Συντομεύσεις Πληκτρολογίου"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Προηγούμενη Σελίδα"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Επόμενη Σελίδα"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Κλιμάκωση στο Καλυτερο"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Κλιμάκωση σε Πλάτος"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Κλιμάκωση σε Ύψος"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Κλιμάκωση σε Τοπικό"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Περιστροφή Δεξιά"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Περιστροφή Αριστερά"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Γύρισμα Σελίδας"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Κλίμακα"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Καλύτερο"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Πλάτος"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Ύψος"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Ντόπιο"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Περιστροφή"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Γύρισμα"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Οριζόντιο"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Κάθετο"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Αριστερά προς Δεξιά"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Δεξιά προς Αριστερά"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr ""
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr ""
 
@@ -3043,7 +3048,7 @@ msgstr ""
 msgid "DJVU Reader"
 msgstr "PDF πρόγραμμα ανάγνωσης"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "PDF πρόγραμμα ανάγνωσης"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index f2089c96304af09e7849411b8a9d17ba242bd68d..b42dd3e4a830a6be027f22122176bd2da6c95632 100644
GIT binary patch
delta 10822
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

delta 10994
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
MuY@Td->@k5zij97`~Uy|

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index e47e348ec..3207d3dc4 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,499 +18,499 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 # "Last-Translator: victorhck <victorhck@mailbox.org>\n"
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "El servidor se está apagando. Por favor, cierre la ventana"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Reconexión correcta"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Libro puesto en la cola de envío a %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Configuración de la interfaz de usuario"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Editar usuarios"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Todo"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} usuarios eliminados con éxito"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Petición mal formulada"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "El nombre de invitado no se puede cambiar"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "El invitado no puede tener ese rol"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 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:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "Valor tiene que ser verdadero o falso"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Rol inválido"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "El invitado no puede tener esta vista"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "Vista no válida"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "El sitio del invitado se determina automáticamente y no puede ser cambiado"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "No hay un sitio válido"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "No se ha indicado un idioma válido para el libro"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Parámetro no encontrado"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "Columna de lectura no válida"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "Columna restringida no válida"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "¿Realmente quieres borrar el Token de Kobo?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "¿Realmente deseas borrar este dominio?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "¿Realmente quieres borrar este usuario?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "¿Realmente quieres eliminar este estante?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "¿Realmente quieres cambiar el idioma de los usuarios seleccionados?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "¿Realmente quieres cambiar los idiomas visibles del libro de los usuarios seleccionados?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "¿Realmente quieres cambiar el rol seleccionado de el usuario seleccionado?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "¿Realmente quieres cambiar las restricciones de los usuarios seleccionados?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "¿Realmente quieres cambiar las restricciones de visibilidad de los usuarios seleccionados?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "¿Realmente quieres cambiar el comportamiento de sincronización de estante del usuario seleccionado?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "¿Realmente quieres cambiar la ubicación de la biblioteca Calibre?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Denegar"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Etiqueta no encontrada"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Acción no válida"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 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:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Access Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Por favor, Introduce un proveedor LDAP, puerto, DN y el User Object Identifier"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, introduce una cuenta de servicio LDAP y su contraseña"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "Por favor, introduce una cuenta de servicio LDAP"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, 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:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, 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:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "El filtro de usuarios LDAP necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "El filtro de LDAP \"Member User\" tiene paréntesis no coincidentes"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la clave no válidos. Por favor introduce la ruta correcta"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Añadir un nuevo usuario"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros de correo"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "Verificación de cuenta de Gmail exitosa"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Puesto en cola un correo electrónico de prueba enviado a %(email)s, por favor, comprueba el resultado en Tareas"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 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:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 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:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "La actualización del archivo no pudo guardarse en el directorio temporal (Temp Dir)"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Error: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 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:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} Usuario importado con éxito"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de la base de datos no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "La base de datos no es modificable"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Keyfile no es válida, por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de Certfile no es válida, por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' eliminado"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "No puedes borrar al Usuario Invitado"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede borrar al usuario"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
@@ -523,20 +523,20 @@ msgstr "no instalado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Ninguno"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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"
 
@@ -755,7 +755,7 @@ msgstr ""
 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:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
@@ -836,7 +836,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -901,8 +901,9 @@ msgstr "Error Google Oauth {}"
 msgid "{} Stars"
 msgstr "{} Estrellas"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -918,7 +919,7 @@ msgstr "El token ha expirado"
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Libros"
 
@@ -943,7 +944,7 @@ msgstr "Libros Descargados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Libros Descargados"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Libros mejor valorados"
 
@@ -952,7 +953,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Libros leídos"
 
@@ -961,7 +962,7 @@ msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
@@ -979,7 +980,7 @@ msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Categorías"
 
@@ -989,7 +990,7 @@ msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Series"
 
@@ -1007,7 +1008,7 @@ msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Editores"
 
@@ -1017,7 +1018,7 @@ msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -1041,7 +1042,7 @@ msgstr "Formatos de archivo"
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Libros archivados"
 
@@ -1049,7 +1050,7 @@ msgstr "Libros archivados"
 msgid "Show archived books"
 msgstr "Mostrar libros archivados"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Lista de Libros"
 
@@ -1059,7 +1060,7 @@ msgstr "Mostrar Lista de Libros"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Buscar"
@@ -1091,7 +1092,7 @@ msgstr "Estado de lectura = $(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
@@ -1142,7 +1143,7 @@ msgstr "El libro fue eliminado del estante: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
@@ -1206,7 +1207,7 @@ msgstr "Estante: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tareas"
@@ -1268,139 +1269,140 @@ msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo
 msgid "No release information available"
 msgstr "No hay información del lanzamiento disponible"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Libros descargados por %(user)s"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Descargas"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, 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:1208
+#: cps/web.py:1209
 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:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 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:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, 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:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 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:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
@@ -1450,7 +1452,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1478,7 +1480,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Subir archivo"
 
@@ -1502,7 +1504,7 @@ msgstr "Correo electrónico"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Enviar al correo de Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1881,12 +1883,12 @@ msgstr "Fecha de publicación"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editor"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Idioma"
 
@@ -1937,8 +1939,8 @@ msgstr "Haz clic en la portada para cargar los metadatos en el formulario"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Cerrar"
@@ -2384,7 +2386,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Tema"
 
@@ -2483,49 +2485,51 @@ msgstr "Leer en el navegador"
 msgid "Listen in Browser"
 msgstr "Escuchar en el navegador"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Publicado"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Marcar como no leido"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Marcar como leido"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Leído"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Restarurar desde el archivo"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Añadir a archivación"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Archivado"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Descripción:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Agregar al estante"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Público)"
@@ -2574,7 +2578,7 @@ msgstr "Tamaño límite del archivo adjunto"
 msgid "Save and Send Test E-mail"
 msgstr "Guardar y enviar un correo electrónico de prueba"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Regresar"
@@ -2600,12 +2604,13 @@ msgstr "Introducir nombre de dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominios prohibidos (Blaclist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Siguiente"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/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/generate_kobo_auth_url.html:11
@@ -2617,20 +2622,20 @@ msgstr "Token de sincronización de Kobo"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "El servidor de E-Mail no está configurado, por favor contacta a tu administrador"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Crear una incidencia"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Volver al inicio"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "Cerrar sesión"
 
@@ -2720,7 +2725,7 @@ msgstr "Libros ordenados por puntuación"
 msgid "Books ordered by file formats"
 msgstr "Libros ordenados por formato de archivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Estanterías"
@@ -2729,60 +2734,60 @@ msgstr "Estanterías"
 msgid "Books organized in shelves"
 msgstr "Libros organizados en estanterías"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Inicio"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Alternar navegación"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Buscar en la librería"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Cargando..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Error"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Carga hecha, procesando, por favor espere ..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Ajustes"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Cuenta"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Cargando..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Error"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Carga hecha, procesando, por favor espere ..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Ajustes"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Por favor, no actualice la página"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Detalles del libro"
 
@@ -2798,7 +2803,7 @@ msgstr "Recordarme"
 msgid "Forgot Password?"
 msgstr "¿Olvidó la contraseña?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Iniciar sesión con un enlace mágico"
 
@@ -2908,24 +2913,24 @@ msgstr "Catálogo de ebooks de Calibre-Web"
 msgid "epub Reader"
 msgstr "Lector PDF"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Claro"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Oscuro"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Regresar"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Redimensionar el texto cuando las barras laterales están abiertas."
 
@@ -2934,111 +2939,111 @@ msgstr "Redimensionar el texto cuando las barras laterales están abiertas."
 msgid "Comic Reader"
 msgstr "Lector PDF"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Página previa"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Página siguiente"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Escalar a mejor"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Escalar a la ancho"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Escalar a lo alto"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Escalado nativo"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Rotar hacia la derecha"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Rotar hacia la izquierda"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Voltear imagen"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Escalar"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Mejor"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Ancho"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Alto"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Nativo"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Rotar"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Voltear"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Dirección"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "De izquierda a derecha"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "De derecha a izquierda"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "Volver al principio"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "Recordar posición"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "Barra de desplazamiento"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Mostrar"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -3047,7 +3052,7 @@ msgstr "Ocultar"
 msgid "DJVU Reader"
 msgstr "Lector PDF"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "Lector PDF"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index da562e190200c9de20d75e99125c471dfdafcfe6..c3701ba296275c66882257fed8ba66b21ee14bf7 100644
GIT binary patch
delta 37
tcmaENp7Gsz#tqYKd5v_9Oce|btc;Ab4GcFgwv}XLHq<lNyx&e=69E2g3&j8c

delta 37
tcmaENp7Gsz#tqYKc@1<8j1-IvtqhH{4U9G~wv}XLHqbNPyx&e=69E103&H>Z

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 7c2b433ab..9cb309b92 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,495 +16,495 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Palvelin uudelleenkäynnistetty, ole hyvä ja päivitä sivu"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Palvelinta sammutetaan, ole hyvä ja sulje sivu"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Ylläpitosivu"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Perusasetukset"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Käyttöliittymän asetukset"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Pääkäyttäjä"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Kaikki"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Näytä kaikki"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Haluatko varmasti pysäyttää Calibre-Webin?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 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:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 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:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
@@ -517,20 +517,20 @@ msgstr "ei asennettu"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Ei mitään"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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:"
 
@@ -749,7 +749,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
@@ -828,7 +828,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -893,8 +893,9 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -910,7 +911,7 @@ msgstr "Valtuutus vanhentunut"
 msgid "Success! Please return to your device"
 msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Kirjat"
 
@@ -935,7 +936,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Parhaiten arvioidut kirjat"
 
@@ -944,7 +945,7 @@ msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
@@ -953,7 +954,7 @@ msgid "Show read and unread"
 msgstr "Näytä luetut ja lukemattomat"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
@@ -971,7 +972,7 @@ msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Kategoriat"
 
@@ -981,7 +982,7 @@ msgstr "Näytä kategoriavalinta"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Sarjat"
 
@@ -999,7 +1000,7 @@ msgid "Show author selection"
 msgstr "Näytä kirjailijavalinta"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Julkaisijat"
 
@@ -1009,7 +1010,7 @@ msgstr "Näytä julkaisijavalinta"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Kielet"
 
@@ -1033,7 +1034,7 @@ msgstr "Tiedotomuodot"
 msgid "Show file formats selection"
 msgstr "Näytä tiedostomuotovalinta"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr ""
 
@@ -1041,7 +1042,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr ""
 
@@ -1051,7 +1052,7 @@ msgstr ""
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Hae"
@@ -1083,7 +1084,7 @@ msgstr ""
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
@@ -1134,7 +1135,7 @@ msgstr "Kirja on poistettu hyllystä: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "luo hylly"
 
@@ -1198,7 +1199,7 @@ msgstr "Hylly: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tehtävät"
@@ -1260,139 +1261,140 @@ msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi ve
 msgid "No release information available"
 msgstr "Ei päivitystietoa saatavilla"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Arvostelulistaus"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, 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:1208
+#: cps/web.py:1209
 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:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
@@ -1442,7 +1444,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1470,7 +1472,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Lähetä"
 
@@ -1494,7 +1496,7 @@ msgstr "Sähköposti"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Ylläpito"
@@ -1873,12 +1875,12 @@ msgstr "Julkaisupäivä"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Julkaisija"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Kieli"
 
@@ -1929,8 +1931,8 @@ msgstr "Klikkaa kantta ladataksesi metadata lomakkeelle"
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Sulje"
@@ -2375,7 +2377,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Teema"
 
@@ -2474,49 +2476,51 @@ msgstr "Lue selaimessa"
 msgid "Listen in Browser"
 msgstr "Kuuntele selaimessa"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Merkitse lukemattomaksi"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Merkitse luetuksi"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Luettu"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Lisää hyllyyn"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
@@ -2565,7 +2569,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr "Tallenna asetukset ja testaa sähköpostia"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Palaa"
@@ -2591,12 +2595,12 @@ msgstr "Syötä domainnimi"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Seuraava"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2607,19 +2611,19 @@ msgstr ""
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Luo virheilmoitus"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Palaa kotiin"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2709,7 +2713,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2718,60 +2722,60 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Koti"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Vaihda navigointi"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Ladataan..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Virhe"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Asetukset"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Tili"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Ladataan..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Virhe"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Asetukset"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Selaa"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Tietoja"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Edellinen"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Kirjan tiedot"
 
@@ -2787,7 +2791,7 @@ msgstr "Muista minut"
 msgid "Forgot Password?"
 msgstr ""
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Kirjadu käyttäen magic link"
 
@@ -2897,24 +2901,24 @@ msgstr "Calibre-Web e-kirjaluettelo"
 msgid "epub Reader"
 msgstr "PDF lukija"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Vaalea"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Tumma"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Palaa"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Uudelleenjärjestä teksti kun sivut on auki."
 
@@ -2923,111 +2927,111 @@ msgstr "Uudelleenjärjestä teksti kun sivut on auki."
 msgid "Comic Reader"
 msgstr "PDF lukija"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Näppäimistöpikakomennot"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Edellinen sivu"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Seuraava sivu"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Skaalaa parhaaseen"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Skaalaa leveyteen"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Skaalaa korkeuteen"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Skaalaa alkuperäiseen"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Käännä oikealle"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Käännä vasemmalle"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Käännä kuva"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Skaalaa"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Paras"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Leveys"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Korkeus"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Alkuperäinen"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Pyöritä"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Käännä"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Vaakasuunta"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Pystysuunta"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Suunta"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Vasemmalta oikealle"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Oikealta vasemmalle"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr ""
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr ""
 
@@ -3036,7 +3040,7 @@ msgstr ""
 msgid "DJVU Reader"
 msgstr "PDF lukija"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "PDF lukija"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 7f35597f60c42a2dc365f98f2e33b4fe33149c66..2644819bb0b47fe974d1cc9d8c3f44ad0774f6f0 100644
GIT binary patch
delta 11064
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
aROF5KuH)V!Eu-Rrr?%!+^xGcR^#1_pR1tIl

delta 11247
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
SUv61k<~&fs>}%c*j`%MEVnrAL

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index bbca624a0..18cfba79e 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -31,498 +31,498 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Reconnecté avec succès"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Le livre a été mis en file de traitement avec succès pour un envoi vers %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Page admin"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Éditer les utilisateurs"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Tout"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} utilisateurs supprimés avec succès"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Montrer tout"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Demande malformée"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "Le nom de l’invité ne peut pas être modifié"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "L’invité ne peut pas avoir ce rôle"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 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:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "La valeur doit être vraie ou fausse"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Rôle invalide"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "L’invité ne peut pas avoir cette vue"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "Vue invalide"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Les paramètres régionaux de l’invité sont déterminés automatiquement et ne peuvent pas être définis"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "Aucun paramètre régional valide n’est donné"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "Aucune langue de livre valide donnée"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Paramètre non trouvé"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "Colonne de lecture non valide"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "Colonne restreinte non valide"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Voulez-vous vraiment supprimer le jeton Kobo ?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "Voulez-vous vraiment supprimer ce domaine ?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "Voulez-vous vraiment supprimer cet utilisateur ?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Voulez-vous vraiment supprimer l’étagère ?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Voulez-vous vraiment supprimer l’étagère ?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Voulez-vous vraiment modifier les langues de livre visibles pour le ou les utilisateurs sélectionnés ?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Voulez-vous vraiment modifier le rôle sélectionné pour le ou les utilisateurs sélectionnés ?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Voulez-vous vraiment modifier les restrictions sélectionnées pour le ou les utilisateurs sélectionnés ?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Voulez-vous vraiment modifier les restrictions de visibilité sélectionnées pour le ou les utilisateurs sélectionnés ?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Voulez-vous vraiment supprimer l’étagère?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Voulez-vous vraiment arrêter Calibre-Web ?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Êtes-vous certain de vouloir supprimer la base de données de synchronisation de Calibre-Web pour forcer une synchronisation complète avec votre liseuse Kobo ?"
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Refuser"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Autoriser"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr "{} entrées de synchronisation supprimées"
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Étiquette introuvable"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Action invalide"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 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:1137
+#: cps/admin.py:1154
 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:1143
+#: cps/admin.py:1160
 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:1173
+#: cps/admin.py:1190
 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:1179
+#: cps/admin.py:1196
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "Veuillez entrer un compte de service LDAP"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, 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:1189
+#: cps/admin.py:1206
 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:1193
+#: cps/admin.py:1210
 #, 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:1195
+#: cps/admin.py:1212
 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:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre utilisateur des membres LDAP doit avoir un identificateur de format \"%s\\ »"
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Le filtre utilisateur de membre LDAP a des parenthèses non appariées"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuillez entrer le chemin correct"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "La vérification du compte Gmail réussie"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Teste les courriels en file d’attente pour l’envoi à %(email)s, veuillez vérifier le résultat des tâches"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, 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:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 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:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr "Les fichiers n’ont pas pu être remplacés pendant la mise à jour"
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erreur : %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 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:1625
+#: cps/admin.py:1642
 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:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} utilisateur importé avec succès"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement de la base de données est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "La base de données n'est pas accessible en écriture"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 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:1722
+#: cps/admin.py:1739
 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:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "Impossible de supprimer l’utilisateur Invité"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
@@ -535,20 +535,20 @@ msgstr "non installé"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonne personnalisée No.%(column)d n'existe pas dans la base de données calibre"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Aucun"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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"
 
@@ -767,7 +767,7 @@ msgstr ""
 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:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
@@ -848,7 +848,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -913,8 +913,9 @@ msgstr "Erreur Oauth Google : {}"
 msgid "{} Stars"
 msgstr "{} Étoiles"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Connexion"
 
@@ -930,7 +931,7 @@ msgstr "Jeton expiré"
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Livres"
 
@@ -955,7 +956,7 @@ msgstr "Livres téléchargés"
 msgid "Show Downloaded Books"
 msgstr "Montrer les livres téléchargés"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Livres les mieux notés"
 
@@ -964,7 +965,7 @@ msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Livres lus"
 
@@ -973,7 +974,7 @@ msgid "Show read and unread"
 msgstr "Montrer lus et non-lus"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
@@ -991,7 +992,7 @@ msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Catégories"
 
@@ -1001,7 +1002,7 @@ msgstr "Montrer la sélection par catégories"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Séries"
 
@@ -1019,7 +1020,7 @@ msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Éditeurs"
 
@@ -1029,7 +1030,7 @@ msgstr "Montrer la sélection par éditeur"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Langues"
 
@@ -1053,7 +1054,7 @@ msgstr "Formats de fichier"
 msgid "Show file formats selection"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Livres archivés"
 
@@ -1061,7 +1062,7 @@ msgstr "Livres archivés"
 msgid "Show archived books"
 msgstr "Afficher les livres archivés"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Liste des livres"
 
@@ -1071,7 +1072,7 @@ msgstr "Montrer la liste des livres"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Chercher"
@@ -1103,7 +1104,7 @@ msgstr "Status de lecture = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
@@ -1154,7 +1155,7 @@ msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Désolé, vous n’êtes pas autorisé à supprimer un livre de cette étagère"
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
@@ -1218,7 +1219,7 @@ msgstr "Étagère : '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tâches"
@@ -1280,139 +1281,140 @@ msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-desso
 msgid "No release information available"
 msgstr "Aucune information concernant cette version n’est disponible"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Découvrir (Livres au hasard)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livres téléchargés par %(user)s"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur : %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Éditeur : '%(name)s'"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Liste des évaluations"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, 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:1208
+#: cps/web.py:1209
 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:1225
+#: cps/web.py:1226
 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/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, 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:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 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:1320
+#: cps/web.py:1322
 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:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
@@ -1462,7 +1464,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1490,7 +1492,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Téléverser"
 
@@ -1514,7 +1516,7 @@ msgstr "Adresse de courriel"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Envoyer vers une adresse de courriel Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administration"
@@ -1893,12 +1895,12 @@ msgstr "Date de publication"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Éditeur"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Langue"
 
@@ -1949,8 +1951,8 @@ msgstr "Cliquer sur la couverture pour importer les métadonnées dans le formul
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Fermer"
@@ -2396,7 +2398,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Thème"
 
@@ -2495,49 +2497,51 @@ msgstr "Lire dans le navigateur"
 msgid "Listen in Browser"
 msgstr "Écouter dans le navigateur"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Livre %(index)s sur %(range)s"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Publié"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Marquer comme non lu"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Marquer comme lu"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Lu"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Restaurer à partir de l'archive"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Ajouter comme archive"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Archivé"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Description :"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Public)"
@@ -2586,7 +2590,7 @@ msgstr "Limite de la taille de la pièce jointe"
 msgid "Save and Send Test E-mail"
 msgstr "Sauvegarder les réglages et tester l’envoi d’un courriel"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Retour"
@@ -2612,12 +2616,13 @@ msgstr "Saisir le nom du domaine"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domaines refusés (Liste noire)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Suivant"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/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/generate_kobo_auth_url.html:11
@@ -2629,20 +2634,20 @@ msgstr "Jeton de synchro Kobo"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Le serveur de courriel n'est pas configuré, veuillez contacter votre administrateur!"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Signaler un problème"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Retour à l’accueil"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "Déconnecter l’utilisateur"
 
@@ -2732,7 +2737,7 @@ msgstr "Livres classés par évaluation"
 msgid "Books ordered by file formats"
 msgstr "Livres classés par formats de fichiers"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Etagères"
@@ -2741,60 +2746,60 @@ msgstr "Etagères"
 msgid "Books organized in shelves"
 msgstr "Livres organisés par étagères"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Accueil"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Basculer la navigation"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Chercher dans librairie"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Téléversement en cours..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Erreur"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Paramètres"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Compte"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Téléversement en cours..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Erreur"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Paramètres"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Veuillez ne pas rafraîchir la page"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "À propos"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Précédent"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Détails du livre"
 
@@ -2810,7 +2815,7 @@ msgstr "Se rappeler de moi"
 msgid "Forgot Password?"
 msgstr "Mot de passe oublié ?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Se connecter avec Magic Link"
 
@@ -2920,24 +2925,24 @@ msgstr "Catalogue de livres électroniques Calibre-Web"
 msgid "epub Reader"
 msgstr "Lecteur PDF"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Clair"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Sombre"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Retour"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Mettre à jour la mise en page du texte quand les bandeaux latéraux sont ouverts."
 
@@ -2946,111 +2951,111 @@ msgstr "Mettre à jour la mise en page du texte quand les bandeaux latéraux son
 msgid "Comic Reader"
 msgstr "Lecteur PDF"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Mise à l’échelle optimale"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Mise à l’échelle sur la largeur"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Mise à l’échelle sur la hauteur"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Mise à l’échelle d’origine"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Rotation droite"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Rotation gauche"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Inverser l’image"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Échelle"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Optimal"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Largeur"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Hauteur"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Origine"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Rotation"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Inverser"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Direction"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "De gauche à droite"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "De droite à gauche"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "Réinitialiser en haut"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "Se rappeler de la position"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "Barre de défilement"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Montrer"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Cacher"
 
@@ -3059,7 +3064,7 @@ msgstr "Cacher"
 msgid "DJVU Reader"
 msgstr "Lecteur PDF"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "Lecteur PDF"
diff --git a/cps/translations/gl/LC_MESSAGES/messages.mo b/cps/translations/gl/LC_MESSAGES/messages.mo
index a51b6d75d143395d613d9ed863a10384db492159..1e77bbbbc4a56d80d70d625e5c533f4bf663fdcc 100644
GIT binary patch
delta 12721
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
Z#ksSpKIE0!D5bd1?4h~EzWdMC{Xcb)MxFow

delta 12875
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
Y6?w`kMzbd7n_T^2F%u3wbhh#T0Po~)qW}N^

diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po
index a8245a7ea..02cbdfeca 100644
--- a/cps/translations/gl/LC_MESSAGES/messages.po
+++ b/cps/translations/gl/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2022-08-11 16:46+0200\n"
 "Last-Translator: pollitor <pollitor@gmx.com>\n"
 "Language: gl\n"
@@ -14,487 +14,487 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue a páxina"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "O servidor estase apagando. Por favor, peche a xanela"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Reconexión correcta"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Libro posto na cola de envío a %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Páxina de administración"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Configuración Básica"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Configuración da Interface de Usuario"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Editar Usuarios"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Todo"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Usuario non atopado"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} usuarios borrados con éxito"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mostrar Todo"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Petición mal formada"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "O nome do convidado non se pode cambiar"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "O convidado non pode ter este rol"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Non queda ningún usuario administrador, non se pode eliminar ao usuario"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "O Valor ten que ser verdadeiro ou falso"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Rol non válido"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "O convidado non pode ter esta vista"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "Vista non válida"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "O sitio do convidado determínase automáticamente e non se pode cambiar"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "Non hai unha localización válida"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "Non se indicou unha lingua válida para o libro"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Parámetro non atopado"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "Columna de lectura non válida"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "Columna restrinxida non válida"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "De verdade queres borrar o Token de Kobo?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "De verdade desexas borrar este dominio?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "De verdade queres borrar este usuario?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "De verdade queres eliminar este andel?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "De verdade queres cambiar a linguaxe dos usuarios seleccionados?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "De verdade queres cambiar as linguas visibles do libro dos usuarios seleccionados?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "De verdade queres cambiar o rol seleccionado do usuario seleccionado?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "De verdade queres cambiar as restricións escollidas dos usuarios seleccionados?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "De verdade queres cambiar as restricións de visibilidade dos usuarios seleccionados?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "De verdade queres cambiar o comportamento da sincronización do andel para o usuario seleccionado?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "De verdade queres cambiar a localización da biblioteca Calibre?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr "Calibre-web buscará cubertas actualizadas e miniaturas de cubertas actualizadas, isto pode levar un intre?"
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Está seguro que quere borrar a base de datos de sincronización de Calibre-Web para forzar unha sincronización completa co seu lector Kobo?"
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Denegar"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr "Elimináronse {} entradas de sincronización"
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Etiqueta non atopada"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Acción non válida"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json non está configurado para a aplicación web"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localización do arquivo de rexistro non é válida. Por favor, Introduce a ruta correcta"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localización do rexistro de accesos non é válida. Por favor, Introduce a ruta correcta"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Por favor, Introduce un provedor LDAP, porto, DN e o User Object Identifier"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, introduce unha conta de servizo LDAP e o seu contrasinal"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "Por favor, introduce unha conta de servizo LDAP"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter necesita ter un identificador de formato \"%s\""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "O LDAP Group Object Filter ten parénteses que non casan"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter necesita ter un identificador de formato \"%s\""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "O LDAP Group Object Filter ten parénteses que non casan"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de usuarios LDAP necesita ter un identificador de formato \"%s\""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "O filtro de LDAP \"Member User\" ten parénteses que non casan"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "As localizacións do certificado da CA do LDAP, do certificado ou da chave non válidos. Por favor introduce a ruta correcta"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Engadir un usuario novo"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar os parámetros do correo"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "Verificación da conta de Gmail exitosa"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error na base de datos: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Posto en cola un correo electrónico de proba enviado a %(email)s, por favor, comproba o resultado nas Tarefas"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocurreu un error enviando o correo electrónico de proba: %(res)s"
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure o seu correo electrónico primeiro..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Actualizáronse os axustes do servidor de correo electrónico"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr "Editar a Configuración das Tarefas Programadas"
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr "Indicada unha hora incorrecta de comezo de tarefa"
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr "Indicada unha duracción incorrecta para a tarefa"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr "Actualizouse a configuración das tarefas programadas"
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Sucedeu un erro descoñecido. Por favor volva a intentalo máis tarde."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr "A configuración da DB non se pode escribir"
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar o Usuario %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Reiniciada a contrasinal para o usuario %(user)s"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primeiro os parámetros do servidor SMTP..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Visor do ficheiro de rexistro"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Descomprimendo paquete de actualización"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "As conexións coa base datos están pechadas"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Detendo o servidor"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Actualización finalizada. Por favor, prema OK e recargue a páxina"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "A actualización fallou:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Erro HTTP"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Erro de conexión"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Tempo esgotado mentras se trataba de establecer a conexión"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Erro xeral"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr "A actualización do arquivo non se puido gardar no directorio temporal (Temp Dir)"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr "Non se puideron substituír os ficheiros durante a actualización"
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr "Erro ao extraer polo menos un usuario LDAP"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Erro ao crear polo menos un usuario LDAP"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erro: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erro: o servidor LDAP non devolveu ningún usuario"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Polo menos, un usuario LDAP non se atopou na base de datos"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "Usuario {} importado con éxito"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "A localización da base de datos non é válida. Por favor, Introduce a ruta correcta"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "A base de datos non é modificable"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localización do Keyfile non é válida, por favor, Introduce a ruta correcta"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localización do Certfile non é válida, por favor, Introduce a ruta correcta"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 msgid "Database Settings updated"
 msgstr "Actualizados os axustes da base de datos"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "Configuración da base de datos"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Por favor, cubra todos os campos!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "O correo electrónico non ven dun dominio válido"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Atopada unha conta existente para este correo electrónico ou nome de usuario."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' eliminado"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "Non se pode borrar ao Usuario Invitado"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Non queda ningún usuario administrador, non se pode borrar ao usuario"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s' actualizado"
@@ -507,20 +507,20 @@ msgstr "non instalado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de execución"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Columna personalizada No.%(column)d non existe na base de datos calibre"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Ningún"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "oh, oh, o libro seleccionado non está disponible. O arquivo non existe ou non está accesible"
 
@@ -738,7 +738,7 @@ msgstr "Erro ao renomear o ficheiro na ruta: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "A ruta %(path)s do libro non se atopou en Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "Atopada unha conta existente para ese enderezo de correo electrónico"
 
@@ -816,7 +816,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Rexistrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Iniciou sesión como : '%(nickname)s'"
@@ -881,8 +881,9 @@ msgstr "Erro Google Oauth {}"
 msgid "{} Stars"
 msgstr "{} Estrelas"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -898,7 +899,7 @@ msgstr "O token expirou"
 msgid "Success! Please return to your device"
 msgstr "Correcto! Por favor volte ao seu dispositivo"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Libros"
 
@@ -923,7 +924,7 @@ msgstr "Libros descargados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar libros descargados"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Libros mellor valorados"
 
@@ -932,7 +933,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar libros mellor valorados"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Libros lidos"
 
@@ -941,7 +942,7 @@ msgid "Show read and unread"
 msgstr "Mostrar lidos e non lidos"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Libros non lidos"
 
@@ -959,7 +960,7 @@ msgid "Show Random Books"
 msgstr "Mostrar libros ao chou"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Categorías"
 
@@ -969,7 +970,7 @@ msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Series"
 
@@ -987,7 +988,7 @@ msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Editores"
 
@@ -997,7 +998,7 @@ msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Linguas"
 
@@ -1021,7 +1022,7 @@ msgstr "Formatos de arquivo"
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de arquivo"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Libros arquivados"
 
@@ -1029,7 +1030,7 @@ msgstr "Libros arquivados"
 msgid "Show archived books"
 msgstr "Mostrar libros arquivados"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Lista de libros"
 
@@ -1039,7 +1040,7 @@ msgstr "Mostrar lista de libros"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Buscar"
@@ -1071,7 +1072,7 @@ msgstr "Estado de lectura = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erro na busca de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
@@ -1121,7 +1122,7 @@ msgstr "O libro eliminouse do andel: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Síntoo, non ten permiso para quitar un libro do andel"
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Crear un andel"
 
@@ -1183,7 +1184,7 @@ msgstr "Andel: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erro ao abrir un andel. O andel non existe ou non se pode acceder"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tarefas"
@@ -1245,139 +1246,140 @@ msgstr "Hai unha nova actualización dispoñible. Preme no botón de abaixo para
 msgid "No release information available"
 msgstr "Non hai información do lanzamento dispoñible"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros ao chou)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (os máis descargados)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Libros descargados por %(user)s"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr "Valoración: Ningunha"
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valoración: %(rating)s estrelas"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato do arquivo: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Descargas"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Lista de valoracións"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Libro posto na cola de envío a %(kindlemail)s"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oh, oh! Houbo un erro no envío do libro: %(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor actualiza o teu perfil co enderezo de correo do teu kindle..."
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de correo non está configurado, por favor, avisa ao teu administrador!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Rexistro"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "O seu correo electrónico non está permitido para rexistrarse"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Mandouse un correo electrónico de verificación á súa conta de correo."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Non se pode activar a autenticación LDAP"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login como: '%(nickname)s', non se pode acceder ao servidor LDAP ou usuario descoñecido"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non se puido entrar: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Usuario ou contrasinal no válido"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Unha nova contrasinal enviouse ao seu enderezo de correo electrónico"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer a contrasinal"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Agora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
@@ -1427,7 +1429,7 @@ msgstr "Convertir"
 msgid "Reconnecting Calibre database"
 msgstr "Reconectando a base de datos de Calibre"
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr "Correo electrónico"
 
@@ -1455,7 +1457,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Limpando caché de miniaturas de cubertas"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Subir arquivo"
 
@@ -1478,7 +1480,7 @@ msgstr "Enderezo de correo electrónico"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Enviar ao enderezo de correo electrónico do Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administrador"
@@ -1856,12 +1858,12 @@ msgstr "Data de publicación"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editor"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Lingua"
 
@@ -1911,8 +1913,8 @@ msgstr "Premer na portada para cargar los metadatos no formulario"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Pechar"
@@ -2355,7 +2357,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 agochar (0 = desactivar o agochamento)"
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Tema"
 
@@ -2452,49 +2454,51 @@ msgstr "Ler no navegador"
 msgid "Listen in Browser"
 msgstr "Escoitar no navegador"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Libro %(index)s de %(range)s"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Publicado"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Marcar como non lido"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Marcar como lido"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Lido"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Restaurar dende o arquivo"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Engadir a arquivo"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Arquivado"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Descrición:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Engadir ao andel"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Público)"
@@ -2543,7 +2547,7 @@ msgstr "Tamaño límite do arquivo achegado"
 msgid "Save and Send Test E-mail"
 msgstr "Gardar e enviar un correo electrónico de proba"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Voltar"
@@ -2569,12 +2573,13 @@ msgstr "Introducir nome de dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominios prohibidos (Blaclist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Seguinte"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Abre o arquivo .kobo/Kobo eReader.conf nun editor de texto e engade (ou edita):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2585,19 +2590,19 @@ msgstr "Token de sincronización de Kobo"
 msgid "List"
 msgstr "Lista"
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "A instancia de Calibre-Web non está configurada, por favor contacta co teu administrador"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Crear una incidencia"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Voltar ao inicio"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "Pechar sesión"
 
@@ -2687,7 +2692,7 @@ msgstr "Libros ordeados por valoración"
 msgid "Books ordered by file formats"
 msgstr "Libros ordeados por formato de arquivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Andeis"
@@ -2696,60 +2701,60 @@ msgstr "Andeis"
 msgid "Books organized in shelves"
 msgstr "Libros organizados en andeis"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Inicio"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Alternar navegación"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Buscar na librería"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Cargando..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Erro"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Carga feita, procesando, por favor agarde..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Axustes"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Conta"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Pechar sesión"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Cargando..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Erro"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Carga feita, procesando, por favor agarde..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Axustes"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Por favor, non actualice a páxina"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Detalles do libro"
 
@@ -2765,7 +2770,7 @@ msgstr "Lembrarme"
 msgid "Forgot Password?"
 msgstr "Esqueceu a contrasinal?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Iniciar sesión cun enlace máxico"
 
@@ -2873,23 +2878,23 @@ msgstr "Catálogo de libros electrónicos de Calibre-Web"
 msgid "epub Reader"
 msgstr "Lector epub"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Claro"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Oscuro"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr "Sepia"
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 msgid "Black"
 msgstr "Negro"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Refluxo do texto cando as barras laterais están abertas."
 
@@ -2897,111 +2902,111 @@ msgstr "Refluxo do texto cando as barras laterais están abertas."
 msgid "Comic Reader"
 msgstr "Lector de Cómics"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Atallos de teclado"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Páxina anterior"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Páxina seguinte"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Escalar ao mellor"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Escalar ao ancho"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Escalar ao alto"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Escalado nativo"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Xirar cara a dereita"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Xirar cara a esquerda"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Voltear a imaxe"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Escalar"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Mellor"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Ancho"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Alto"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Nativo"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Rotar"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Voltear"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Dirección"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "De esquerda a dereita"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "De dereita a esquerda"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "Voltar ao comezo"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "Lembrar posición"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "Barra de desprazamento"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Mostrar"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Agochar"
 
@@ -3009,7 +3014,7 @@ msgstr "Agochar"
 msgid "DJVU Reader"
 msgstr "Lector DJVU"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr "Lector PDF"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 11e912eceeded248a2d0b5445c13f3456118a5f0..15ef47ae1c37ed852462f5a12a941e1632fcb2a8 100644
GIT binary patch
delta 36
scmZ3wk8$Zf#tm;wc#U+8Oce|btc;Ab4Gbs$H2KDCsAsVGlc}*L0P#Bvl>h($

delta 36
scmZ3wk8$Zf#tm;wcnx$7j1-IvtqhH{4U8uLH2KDCpl7`Klc}*L0Pw*Kk^lez

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 1e6b90463..0524c00a2 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,495 +16,495 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "A kiszolgáló újraindult, tölts be újra az oldalt!"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 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:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Rendszergazda oldala"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Felhasználói felület beállításai"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Rendszergazda felhasználó"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mindent mutass"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 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:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, 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:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 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:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 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:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
@@ -517,20 +517,20 @@ msgstr "nincs telepítve"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Nincs"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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:"
 
@@ -749,7 +749,7 @@ msgstr ""
 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:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
@@ -828,7 +828,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -893,8 +893,9 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Belépés"
 
@@ -910,7 +911,7 @@ msgstr "A token érvényessége lejárt."
 msgid "Success! Please return to your device"
 msgstr "Sikerült! Újra használható az eszköz."
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr ""
 
@@ -935,7 +936,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Legjobb könyvek"
 
@@ -944,7 +945,7 @@ msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
@@ -953,7 +954,7 @@ msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
@@ -971,7 +972,7 @@ msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Címkék"
 
@@ -981,7 +982,7 @@ msgstr "Címke választó mutatása"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Sorozatok"
 
@@ -999,7 +1000,7 @@ msgid "Show author selection"
 msgstr "Szerző választó mutatása"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Kiadók"
 
@@ -1009,7 +1010,7 @@ msgstr "Kiadó választó mutatása"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -1033,7 +1034,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr ""
 
@@ -1041,7 +1042,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr ""
 
@@ -1051,7 +1052,7 @@ msgstr ""
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Keresés"
@@ -1083,7 +1084,7 @@ msgstr ""
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
@@ -1134,7 +1135,7 @@ msgstr "A könyv el lett távolítva a polcról: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Polc készítése"
 
@@ -1198,7 +1199,7 @@ msgstr "Polc: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Feladatok"
@@ -1260,139 +1261,140 @@ msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez
 msgid "No release information available"
 msgstr "Nincs információ a kiadásról."
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Letöltések"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, 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:1208
+#: cps/web.py:1209
 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:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 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:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
@@ -1442,7 +1444,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1470,7 +1472,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Feltöltés"
 
@@ -1494,7 +1496,7 @@ msgstr "E-mail"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Rendszergazda"
@@ -1873,12 +1875,12 @@ msgstr "Kiadás éve"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Kiadó"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Nyelv"
 
@@ -1929,8 +1931,8 @@ msgstr "Kattints a borítóra a metadatok betöltésére"
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Bezárás"
@@ -2375,7 +2377,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Téma"
 
@@ -2474,49 +2476,51 @@ msgstr "Olvasás böngészőben"
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Legyen olvasatlan"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Legyen olvasott"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Olvasva"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Ismertető:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Hozzáadás polchoz"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
@@ -2565,7 +2569,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr "Beállítások mentése és teszt e-mail küldése"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Vissza"
@@ -2591,12 +2595,12 @@ msgstr "Tartomány megadása"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Következő"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2607,19 +2611,19 @@ msgstr ""
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr ""
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Vissza a kezdőlapra"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2709,7 +2713,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2718,60 +2722,60 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Kezdőlap"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Navigáció átkapcsolása"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Feltöltés..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Hiba"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Beállítások"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Felhasználói fiók"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Kilépés"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Feltöltés..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Hiba"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Beállítások"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Böngészés"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Névjegy"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Előző"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Könyv részletei"
 
@@ -2787,7 +2791,7 @@ msgstr "Emlékezz rám"
 msgid "Forgot Password?"
 msgstr ""
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Belépés varázshivatkozással"
 
@@ -2896,24 +2900,24 @@ msgstr "Calibre-Web e-könyv katalógus"
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Világos"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Sötét"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Vissza"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Szöveg újratördelése amikor az oldalsávok nyitva vannak"
 
@@ -2921,111 +2925,111 @@ msgstr "Szöveg újratördelése amikor az oldalsávok nyitva vannak"
 msgid "Comic Reader"
 msgstr ""
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Előző oldal"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Következő oldal"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Méretezés a legjobbra"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Méretezés a szélességre"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Méretezés a magasságra"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Méretezés a natívra"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Forgatás balra"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Forgatás jobbra"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Kép tükrözése"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Méretezés"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Legjobb"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Szélesség"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Magasság"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Natív"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Forgatás"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Tökrözés"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Vízszintes"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Függőleges"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr ""
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr ""
 
@@ -3033,7 +3037,7 @@ msgstr ""
 msgid "DJVU Reader"
 msgstr ""
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr ""
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 6192fe8240b2b94f82550b6e0bfedd41ed01471e..a09df5e7285de5fe2dc3abc5c6a17f1fb04e5306 100644
GIT binary patch
delta 12751
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

delta 12923
zcmZ|UdwkF3|Htun+w6p4Gcz+jhHcEoHe=>2=VK0I4vn#mIn11vl0Jq?2oX6<5fw>f
z<y<1ioXTlVkwZv1^_5b6^?f{D*X{QE>-W8N>waC==l#B}*Y&zy*IV_SbH#J}RZsV&
zK(B=k{|oYToXYrlMfLvgf1TqUCzNg%<S%C^f2)p5unvBSdha#{qECY9S3(#4hFBNV
zFcN3j{s#1Q9Jh0sMk+tt!rs^{(Qz8#LQKZvSOR_PJ5F;9Kp*UC?Ty6lq+<vU#wdIV
z{qcPa!1Y)PcVc-wgi);TT(UoSCz%I>P!C3+7Osn$D9PFaHDM<#gZ)qe3`aemiwa~s
z2I6egbMK+%*?`K}c8p+sr<g`*{0sGhZv)2(#xM-ScvL`LuoCt|JvRYKnll6aaEBe=
zhYIj4l49qk?cYc3{9nw(@(szqQvD*0CRl`B@ILm$X5_yU&c}4Tgq^V|FU8<YtcII0
z0?%Rv{2S|FV2asDa}1@QirzRHOJaTs`7cXjDg!#x1sH<MP^l_HFZ>FF@EdEf9sdQD
z^82VvJwjzFu(2t=s;Grqpyum`s*Nnv2HtE;{_D}$#(*Nejm+VMkPfos^gu1}25N%2
z7>i4>79K<$)o<7beVdvM48ltEC))l3R3Pgx9QUDqzviZ)9Y3)H6`Gl|i^nj=Tc8#k
zfHiR@Duo+S6Kp{p!3m7Uhgbu{xhn0j6_&%9sOJh%fqaEp*L{{oI*t37f!$h|A3j4Z
zbO=>k-=XgPc~mBzpaSq~X^OE1Hlp7URqbQ28Wy0AconMnK1UVrAtW%jbCE_B2JRw%
zIi*{fqv(c8{mZB`or<dFxmX$(BRALi5VgPsR1N)#d@`JesQ03uH47)9-s_0UOd6Kd
z{a-<Yzno9_n~LK;MqtI(=AJf21(Jq}JRP;*806TUsi=i^p|0H#RLU=)s{9TrBacx5
z__Z+shF}ouJDq6g!GY+7BT&~U4|P_rV^v&<O8IV702fi2yMqe2R9lnsx~QY;j+!^k
znu!V|4;A1PbgO9Q)98Uaumc8=ADvYiYQa&ciDsYzeB1VypmzQN`rsy1t!ziVzZZ36
z=TOCV73<(%sM{0Op8QAA=-%Eu_#*0_PsNJ32$hKqs2%Ue%2<pF>>+BwGDNKfLNNv7
zQAaTnb+nUEJKu%gc-;PerUUuc0zWaJ6#s)tY2}V4!p2yQeimxyucH>8jY{E1s6e-2
zbv%JOvPY<Z%XTu?xEkv0o1!+@3H2Qq=%%3$$YkpR^rOEPRcuA*kNZ)n{vNgPCDcOq
zQ4{)iHValkZJ;hH(5|RV<e=u6h$V0uDiiKEXlTNDs0iOjMZOUg;cnDfUPh(xq5a*f
ziwP(g6>tQW#5$<=lTizIu%_AZp{M{RB1h(SUZJ4{7NL$}9V#Px(1mBQ89ufqcQwzy
zfC-GxMrC3bDr4tR8~POk@ChpL(%nqJ;i!$(Mt|M^_B2W}&=d7y1}Zh<P{sKY#^U>^
z56gF`TJd_$d~$1GB>gVd@u&rsS+}8%q!@YCd4$?v+wQ!>`py6viu7aDg4<A;xPn^v
zPvnX_k=)UmI1*Lu^RX0ujOB0(*2Y6v3m>8{R_SSqHwsk)bx`v*M7L6(MWZafgz-2F
zb&bBnB>WR~wsF18*`=T|)&jM&uBd=Vp$n(m@egc&FV<lECsgMAQ_VH5ooerYI|ekt
zXw(j0L#6Z+RA47jJG_qN@e%4z$CACxKd3~ZGB*h|&nnb)-Hv*07wR@#us%Zmq<6~o
zA^%EAmp<mq(@;Adh?-!8H4pXN1XQ(8K}|dp%ixEoKsTe_KY%LQlSutJfoZn3umk;Z
zsQJEh+aC^MFazgNwQwJU@LyDQ2lX{Oh(&#9+M|kWB&r5xVhFy2%HRe&ej1hfs~Ctr
z{megAS3)29?w&LhNq^K%vQaz8N9}N`^<7jz+p!ZKLpJAB>Th;57WHY~iJIpeR>Yre
z-(!I32Vw%_F~}eHZYQ0Fs(S@$2RBfk+$X4FbUja@VGq>K7obwT1+~CI)O%M@&p*Z%
z7?W<Qe<Z4QCZIC#I_e0QVrkv~)%J%?Sb`t+q0as=>Kc8AVfdFFuQ1R|7>3GREb4oa
zj7_mQHpa<V8MmPVJ%d{K9#+7|80@A|c91!fNYvR6L<N$Ib#Xjuq1C8`HlU7ZGb&Si
zP#L(6+UY;2nh3}+^M#=ntc{wtCF&NnLw6{R0W`ufA5|1@qZTT}7+i&kcpQ}(&%tIV
zzNqH|(E}@?0uDzVQ5RGO(ow}d32Wn9SPyp&CjTxPcNl1e0Yl7(r#n`mKO42+I@As~
zqB3+4J+K&6-REupU#w2wBh$<miE;FEP)D*D`6xQ4P#cQMBLBLN{j*GpKR{LaM$``W
zqCTOg(S?_+|6(=zu51%fD^yi?$Cfx9707<nPH!XM94Bn3>5oNyf>*g|Xs6%Xf%~Xp
zt1^r~ATR|}umBt4PV~Zu=!=h0pJI<3bM4Ba4}BNv_h_tv@u-dUM%Bh}^h5UxG?dZ;
z)C2QSMYI}~fz7sm0R8BnLp^s5Rg{0A?z_iulgU8T&Ih0tnu6Z=CaUP(wyrh5yPdC0
z!#Rw)CTDH`0cs~tY~Oo?*?AE9GhPu(Vs+Geby0z|M-_7#YQcQ0gtKh_LsU`jz;NCF
zvosX(qo)HrJkq2t88tym)C9dT631W^E=HyHYb=RBp)&UXwPVjwrtgpK=vPJsn2EY|
z<FS<P{~Q`h=`z%gH=q{Yq6hE@>WI#vUc7~R-Xqs6Q~}iw$I=*Y$D5-9Ym1tv2dX9p
zqMjRuZlyBc4iuoycrJS45^RLaQAJpc3NUcAnWz$~7^|ZKi^dYz3bjCcEQ7tR*%&}S
z-}YY}ZSVg=2DI>IRO-IA4<0~8eg-w+H9P(Q^_-JuJ}5q@>z9B!sw|AaDX4i@p>EZB
zEQ^P*DxS|H|BCo82A)nh#=PKzTDTnQ(^&<}VG`<S+F>FNK&5ydsul`SDc+4LvTyD9
zP1F&U8f!jeE^D%zh9Z6r%i#!AiYKE|`>GwEiJG_&%iss7z`j6zT92Sodlfa$19YM1
zI1_LUQ~-@o&v!w6QQbpmC^eJpz&ohxv;j5ILDWL$Q9FNt3fOzR`Mnxy!bDUiI-mkg
zMP)P{lQ0Vta2eLYV@OT8oxf?+VxYkU;~=a{f2MUi)~0_OqcJ$&oNY7Icm~GcY}7nk
z(S=u0&wIXL0;z+E^b>7=C<f^M=h9FOOh(;?X{aNZWBZFxJ6VZJ{TkG_e=F9+^B9ZH
zL{n68=%U*dmBG=d+f;xm;#W~eyFlvxFQ%aYmZMU*3OnKkRJHzv&9LN)=DCg-NdGyk
zheJ?1dmAg@L2QJVQ7I37$z-ZCYTg%6f9C8#cRY<NG+Y=o$?T{;DxiL-j0{5UU<5wh
zk+lGokp<ROsB2Y(3jCxUzm5v@Au6*qUpB=W`!f001Wg!FiaTQ^?1}n@=VBPnMqS4>
zSP{QK7al`Z{XNvePi()+WV7Q~R0h&ewJ-~{&gWPecT6V#I+L>uMBxqWg#oXa1&5#_
z&O@bkBI^0Ms7x%!5Zr+J&>TPo{Jr%K>a6`(N6!UVBdyKcH0tw1Z`2oS7HUVIqOQ@G
zsH51A;dlfU&}|ID-%!taPcaLXK?PPGb##%aT8T#m*cx?9x}rAZo=8Iz&P6Ts4(bS&
zqt1LQ>U!<Ou6PUMuwj8oX*NdEpNm>(Gb%%eusjx{it$%F9y!$%d3_`^Zl?tez0d}A
zHa$_r)6YEMj6m%q&-N#w0-J(5)9I)TtVd;NGb+`mZ2wnW_6&1OGe`X4bn`(vhH<+8
zUay)RC1Mp`9E?hB0jfwAq6;^nuGvYfi9WCKCmhD20?fxuEWqJ-1Cz1)>m~y;QN_L&
zd*dneVSOiNhS_-{Y9}cefzM(RW}`Avh&r0}s9SIlqwoqgM87x8cuNeX-w$=hd8mb7
zx8v_%DE;;5)(;10Xn|rZfw#~X?_zcQ16>$4)0}A&Yj@PQJR23r0#xzsz`A%8btL~q
zUBj?hrbfD=YA9nC`PYu-G0+&-p%30f9l<@T=WLVW5LBQMs2wIEn|C^3TRee%F!W9S
zeGkWAf4qsQ`0N~x7nk5j{AUjNuSFwgt~t{M)@`VJd>NJ6ztM$>^UQcJ^roMODz+D}
zEY7v#D^Mx^2>o$4Dx*hG8#|3UnxEbF2j?yOp+FT~0O~r$puP{yFdD~USu8{q<9h2A
zY(PJFzWJBX&e)p%Ol*$FQAb;5f%&inquzH%(0KX*LKW34<fG-RM(v>b+s3A-+tCLV
zU_R>T7Fa(;y?+RG=2uaHIt$Hv<xm0EL)FSqB!g~eE)5q0i!c$lplab4jK`=&=EKt$
z%h6wh^>I6v$9t#+z24!EaEw6e)mectSbMRlsotogNJnKd2mN&a=hM)R3NZ+`VK+RA
zS|EIhsqzF2raut%`~<9s^X>RLtV4e{D&==k8;M(LYGpVE(jSAWh3Tk251cn?w8TQx
z0+&#cKE!1F7XvVPnMq|kEJZ&X``|d+Ka8pL&!RFJS7?fNFjl3%6#Z~JR>Qsc^xyw)
z(CE#8v)t^U4=UBuQ2{N&GWZGVOn2Jxqu7D|H4MSncTHezP{q~*!!QjaalCaIDxf{@
zl7FS-Dg!#J-?27Ud(ZqMRcF-q;3d?b5mQl_n1_1rJ=76w!X|ha$Dr>DvV$*SWxRr_
zr6;Hj)LUt8Tg#Ph^QTc;29(kssIwVp`@>M*hY7a-9#)|L2`bQUP{ni?Rn;NyoA;Yz
zDE;;rj)PH|oPx^aB0K(}n}+@{*^4@x+o)7NM5VUWD)T~bR6iT5;6~I3=s0ReXHYx6
zi3-eXwaI8*Y)-#FM&L5k2ERfD?mj?66W+HEl=;AXs}oRXmW7&lHfrLvsM<J%dhZ76
zI+pm*{GNgd^s`VqU5u4*4eEA%gUUoPa=YBl9U7X*<0G?RHB`#lqsFtb8or83{YR*y
z`U;h?!`9R2qJJ3`ptHs-7>H4HBT+}v6_v4J7^wUIA`L}48x>)pePAP2rN0{$@fB3j
z{ehauf2}!!8d#lv3@XrW7>#34J70=%_yu;w>zIm(A2ToOJ8#fX^}dHX`-`ZB9-^w<
zXPv433aH3ypmvyqE^LSXI1F`5#-To31*l9d!dP5|E%1A5;3wo?k@cjZ2c}{h+-QA-
z+F6tJrbq{&uF-2a7`LJV3Hy}u##mH<3$PZhMit#LY>N-D6DDsk|2{B%1Nm2ReZfE}
zJb~KzWvqk0p#rM9(WE*H{pgQGJ(rLALcW1I<2|UOx{dA7`OH**du%{=2I~D?=!u6u
zBmZS+9A%(3{(w3=-%Tcfc#NT+j#^+QYG<2JwQ&(ul>eY^K~RzTAhpMO^fOR3F(1p~
z=hl6wBRb=zp%nju1z6^DGtpb9FWY|f!OPebZ(<_W{K9<O`{FqIZ(&I+vDrLd4g=_i
zqAy0H7sjKWYhZtOx1v#jf$r8}sH%0NCRmDNa4n9+uq~!YXQ0k}1?oBPt>*RwqXMsm
z<**g%I`=}=!dO(M7h<gL|JO8h)^|}U3fpFitq#_w-vcY+>(~lcpaQ&xUGWK)#xC2<
zM*5?UbSx^csi-4(3w4A=7=#xvQ}_QKjfo8O+F`2tD5@yy?KC^+f(l?DYT}8uKLb_O
zD^W*t3kPE4mnK86p%#7@Rm5Lo6ZHPd9Qm{O^!^W}QIj7gqwfDI)C)UMFFdo$RDUy6
z0Bum2O10zJSf2hUtb|kT_;OV3tj0$83C7_K`+M-$<i7#~m1$_<MD)f^sC(K270A1&
zom@wqq4#c++FBS)KN+=fSJaW@*#1^j04K3EUO*j{YmZqcZV&la<Vg(Znsr14l8?&B
z9DI6hP|xkdDtI0h=wsBv&Nt?W!jPhJ>Z7WDFzUXKz!aQ--EgD*-P!9lXY9AvL>h)3
zJWw5#vPjg~55fq15fwlocEBCjA4}}B_Z{2OpO0PeJXXi({bv5o7)rkvYD2kh8d`7~
z>K43a`$d>Qe=};LpRp}AJYfDG&sT5|{S&A_5)X2PaWd+DA4eU{1yr>^Kwm6z$b3Hn
zP?>VKqM_91p=zNJm8v4tf_G65CVgwFd<YJuzY>$s@365sYNr#hH7>zwcnQ<cIb!}J
zR$qLU?qV#V`+t#!KLb}$AB;N~i2tG=1|Bs#s*I}MXjGtmP|xS0-k*Zn@hsGlt;EW>
z9hHG%`};5GL;sm$dY|+6qoIK?)CASBFE+vkxB#o-w^$Nyqt5V=wd`?Iw6(3RP&LvI
zb;d8E-kXC8Y$>vHr%2<h?`)%?D&L3Ucn0<2LySeg@63V?(M7*IYND}N181R9zY%pL
zr!W!yzc**z3>9!YYX)lGN$9RaV=ay5cm|d73MWheE>vccY`-a{((i$RxCSF}hwWcQ
zo%!#ml!u%&fyQ6}{nn_=^h5<d_9XcaqVWy`-nb5Rwwq8HID|^oB`k~AQ4{@+f#`M0
z99ame24b-^Cfj~n^rYV%pT|@jghi;0l|N1XbuB8NHVf56WhBP-(@+biqZS;Es)eZ-
zjPF~wVj}%xSROsjnE66b8w$rDtdDxHz3r#FX(;7mu_?Zc9dJ8FqgSyx(^xD;e+Wil
z9;&(*V*-AG%HS<j#_r+MOySc^oi#@hg4$3$R86>B(r7`Wzx|;Q>(XD3n&1bljlZIb
zCghyiNgJ$1zc1FrX&8fRQ5iUm%Is}aVE;jVs{g`@7<~Te_rUGM(NIy0!p1lo8{t9J
zgB};m2Pq8odv9!j^Dzz&VLbk6$7^3S;~A)p%)|QlHR_0dx7PYW8Rz_;r;*GL%TPN!
zg-Pgf$?P;4wUf@+4pXrSF2`ng9@}8(WfRyy)ccFDDIP&R@BgFOSUc2u1*rcH>};o@
zom{~bEPKT~*a>w_UPTq<$EdR{#{T#Ns)`$3HC5jd^?Nr|t)!xUAB_3{4Y$ANV>$XS
z<I{ispF<;pfiJNo{)oy%#5I$`=P-o+6!gT!s46Z*74Ih0_1lSB@BpfIj^kXsgetn+
z>*gQf+~`Gr&vo)&hQ<K~T4OP`!pc9H>K=&dzl^H#U8pns4ToUl4RcFoVio#DSOZU>
zGWG|0V~v~U8pfap{Z^>!*ybkrSEDZjO35hH&fFM*3o#P6q5{2)3gjLtr4hHxdvU0F
zTA*sB7e?drsN#GLqi`!~o*yw9@4IPeN1;EP2)m$O$iy&QgdK4cDii-jz1ZTm*;x*1
z$9brfFT}>U8pq*}s9Nati#eJM)P{0U-v#$P8rtzHR0_ADCOV7Cz)h@<{=b?9<4_YM
zp>{L?_4{;GfNN0K?HAMnt~=(vL@Z4|1r>06^ksc#6b<b(AN_DX`ePyL!H;bJ2v(zC
zjGFi{>N`>DuK6UlMIZXvsCjZR94DeDE<y#i6w~lHCh7i1-!luPqmE)4s@k`p7CMeP
z+pDPS`N;O;@0--NK`+L8U;y?(6<s#!OE?O(p{ZCB-$XsX1U+MEyi21dzK@FhAiD5`
z9siH*hdwAui7!{bL$|!FT-W$vS+2MdqX&<!+ljxqvU+4?WM++x8!|dK+m)R&GRu{d
z>&kGA&zd;im6e$@e)L#ZMsB7nBQw(#O<O~?Qi?ieT?#K<FScHSD<M85J|U)FLQ&GR
zz-K(`#U&PXoPO@v?k)4i=D2c3ni>DU<ydJ#u3aU|m6^k;<HqN>vRoNMhvrPk9h$?E
OPk+u}$%um^qyGmtOQ6UA

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 76181077f..0565bd2cb 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,486 +15,486 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, per favore ricarica la pagina"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Ricollegato con successo"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Libro accodato con successo per il backup dei metadati"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Configurazione dell'interfaccia utente"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Modifica gli utenti"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Tutti"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} utente eliminato con successo"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "tutte le lingue presenti"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Richiesta non formulata correttamente"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "L'utente Guest (ospite) non può avere questo ruolo"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 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:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "Il valore deve essere o vero o flaso"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Ruolo non valido"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "L'utente Guest (ospite) non può avere questa schermata"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "Visualizzazione invalida"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Le impostazioni locali dell'utente Guest (ospite) sono determinate automaticamente e non possono essere configurate"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "Nessuna lingua valida indicata"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "Nessuna lingua valida per il libro"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Parametro non trovato"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "Colonna di lettura non valida"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "Colonna con restrizioni non valida"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Vuoi veramente eliminare il token di Kobo?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "Vuoi veramente eliminare questo dominio?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "Vuoi veramente eliminare questo utente?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Vuoi veramente eliminare questo scaffale?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Sei sicuro di voler modificare le impostazioni locali del/degli utente/i selezionato/i?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Sei sicuro di voler modificare le impostazioni delle lingue visualizzabili del/degli utente/i selezionato/i?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Sei sicuro di voler modificare il ruolo evidenziato del/degli utente/i selezionato/i?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Sei sicuro di voler modificare le restrizioni selezionate del/degli utente/i selezionato/i?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Sei sicuro di voler modificare le restrizioni di visualizzazione del/degli utente/i selezionato/i?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Sei sicuro di voler modificare il comportamento di sincronizzazione dello scaffale per l'/gli utente/i selezionato/i?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Sei sicuro di voler modificare la posizione della libreria di Calibre?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr "Calibre-Web cercherà le copertine aggiornate e aggiornerà le miniature delle copertine, questo richiederà un po' di tempo."
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Sei sicuro di voler eliminare il database sincoronizzato di Calibre-Web e forzare una sincronizzazione completa con il tuo lettore Kobo?"
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Nega"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permetti"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr "{} eliminate voci di sincronizzazione"
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Etichetta non trovata"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Azione non valida"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json non è configurato per Web Application"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 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:1143
+#: cps/admin.py:1160
 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:1173
+#: cps/admin.py:1190
 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:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Per favore digita nome di utente e password del servizio LDAP"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "Per favore indica un account di servizio LDAP"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, 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:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, 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:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, 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:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 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:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Modifica le impostazioni del server e-mail"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "L'account Gmail è stato verificato con successo"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "L'e-mail di test è stato accodato con successo per essere spedito a  %(email)s, per favore verifica tramite il pulsante 'Compito' il risultato"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr "Modifica le impostazioni delle attività pianificate"
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr "Ora di inizio non valida per l'attività specificata"
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr "Durata non valida per l'attività specificata"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr "Impostazioni delle attività pianificate aggiornate"
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr "Il DB delle impostazioni non è scrivibile"
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr "Durante l'aggiornamento non è stato possibile sostituire alcuni file"
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr "Fallita l'estrazione di almeno un utente LDAP"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Fallita la creazione di almeno un utente LDAP"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Errore: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Almeno un utente LDAP non è stato trovato nel database"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} utente importato con successo"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 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:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "Il DB non è scrivibile"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 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:1722
+#: cps/admin.py:1739
 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:1830
+#: cps/admin.py:1847
 msgid "Database Settings updated"
 msgstr "Configurazione del Database aggiornata"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "L'utente '%(user)s' è stato creato"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "L'utente '%(nick)s' è stato eliminato"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "Non posso eliminare l'utente Guest (ospite)"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr "L'indirizzo e-mail non può essere vuoto e deve essere un recapito valido"
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
@@ -507,20 +507,20 @@ msgstr "non installato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonna personalizzata no.%(column)d non esiste nel database di Calibre"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Nessuna"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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"
 
@@ -738,7 +738,7 @@ msgstr "Errore nel rinominare il file nel percorso: {}"
 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:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
@@ -815,7 +815,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -880,8 +880,9 @@ msgstr "Google, errore Oauth: {}"
 msgid "{} Stars"
 msgstr "{} Stelle"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Accesso"
 
@@ -897,7 +898,7 @@ msgstr "Il token è scaduto"
 msgid "Success! Please return to your device"
 msgstr "Riuscito! Torna al tuo dispositivo"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Libri"
 
@@ -922,7 +923,7 @@ msgstr "Libri scaricati"
 msgid "Show Downloaded Books"
 msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Libri meglio valutati"
 
@@ -931,7 +932,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Libri letti"
 
@@ -940,7 +941,7 @@ msgid "Show read and unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Libri non letti"
 
@@ -958,7 +959,7 @@ msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Categorie"
 
@@ -968,7 +969,7 @@ msgstr "Mostra l'opzione per la selezione delle categorie"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Serie"
 
@@ -986,7 +987,7 @@ msgid "Show author selection"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Editori"
 
@@ -996,7 +997,7 @@ msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Lingue"
 
@@ -1020,7 +1021,7 @@ msgstr "Formati file"
 msgid "Show file formats selection"
 msgstr "Mostra l'opzione per la selezione del formato dei file"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
@@ -1028,7 +1029,7 @@ msgstr "Libri archiviati"
 msgid "Show archived books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Elenco libri"
 
@@ -1038,7 +1039,7 @@ msgstr "Mostra l'opzione per visualizzare i libri sottoforma di elenco"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Cerca"
@@ -1070,7 +1071,7 @@ msgstr "Stato di lettura = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
@@ -1120,7 +1121,7 @@ msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Spiacente, ma non sei autorizzato a togliere libri da questo scaffale"
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
@@ -1182,7 +1183,7 @@ msgstr "Scaffale: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Compito"
@@ -1244,139 +1245,140 @@ msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per agg
 msgid "No release information available"
 msgstr "Non sono disponibili informazioni sulla versione"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "I libri scaricati da %(user)s"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr "Valutazione: nessuna"
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Elenco delle valutazioni"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 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:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
@@ -1426,7 +1428,7 @@ msgstr "Convertire"
 msgid "Reconnecting Calibre database"
 msgstr "Riconessione al database di Calibre"
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -1453,7 +1455,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Pulire la cache delle miniature di copertine"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
 
@@ -1476,7 +1478,7 @@ msgstr "Indirizzo e-mail"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Invia all'indirizzo e-mail del lettore elettronico"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Amministrazione"
@@ -1854,12 +1856,12 @@ msgstr "Data di pubblicazione"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editore"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Lingua"
 
@@ -1909,8 +1911,8 @@ msgstr "Fai clic sulla copertina per caricare i metadati nel modulo"
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Chiudi"
@@ -2353,7 +2355,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Tema"
 
@@ -2450,49 +2452,51 @@ msgstr "Leggi nel navigatore"
 msgid "Listen in Browser"
 msgstr "Ascolta nel navigatore"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Libro %(index)s di %(range)s"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Pubblicato"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Marca come non letto"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Marca come letto"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Letto"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Ripristina dall'archivio"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Aggiungi all'archivio"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Archiviato"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Aggiungi allo scaffale"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Pubblico)"
@@ -2541,7 +2545,7 @@ msgstr "Dimensione massima dell'allegato"
 msgid "Save and Send Test E-mail"
 msgstr "Salva le impostazioni e invia e-mail di test"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Indietro"
@@ -2567,12 +2571,13 @@ msgstr "Digita il nome di dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominii bloccati per la registrazione (Blacklist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Prossimo"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/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/generate_kobo_auth_url.html:11
@@ -2583,19 +2588,19 @@ msgstr "Token di Kobo:"
 msgid "List"
 msgstr "Elenco"
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "L'istanza Calibre-Web non è configurata, per favore contatta l'amministratore"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Crea un rapporto di segnalazione di problema"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Ritorna alla pagina principale"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "Disconnetti l'utente"
 
@@ -2685,7 +2690,7 @@ msgstr "Libri ordinati per valutazione"
 msgid "Books ordered by file formats"
 msgstr "Libri ordinati per formato"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Scaffali"
@@ -2694,60 +2699,60 @@ msgstr "Scaffali"
 msgid "Books organized in shelves"
 msgstr "Libri organizzati in scaffali"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Home"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Alterna navigazione"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Ricerca nella libreria"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Uploading..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Errore"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Configurazione"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Uploading..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Errore"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Configurazione"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Per favore non ricaricare la pagina"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Naviga"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informazioni su"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Precedente"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Dettagli del libro"
 
@@ -2763,7 +2768,7 @@ msgstr "Ricordami"
 msgid "Forgot Password?"
 msgstr "Password dimenticata?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Accedi con Magic Link"
 
@@ -2871,23 +2876,23 @@ msgstr "Catalogo Calibre-Web"
 msgid "epub Reader"
 msgstr "Lettore epub"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Chiaro"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Scuro"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr "Seppia"
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 msgid "Black"
 msgstr "Nero"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Adatta il testo quando le barre laterali sono aperte."
 
@@ -2895,111 +2900,111 @@ msgstr "Adatta il testo quando le barre laterali sono aperte."
 msgid "Comic Reader"
 msgstr "Lettore di fumetti"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie della tastiera"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Pagina precedente"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Pagina successiva"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Adatta al meglio"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Adatta alla larghezza"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Adatta all'altezza"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Scala alla dimensione originale"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Ruota a destra"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Ruota a sinistra"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Capovolgi immagine"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Scala"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Migliore"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Larghezza"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Altezza"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Originale"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Ruota"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Capovolgi"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Verticale"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Orientamento"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Da sinistra a destra"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Da destra a sinistra"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "Ripristina in alto"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "Ricorda la posizione"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "Barra di scorrimento"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Mostra"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Nascondi"
 
@@ -3007,7 +3012,7 @@ msgstr "Nascondi"
 msgid "DJVU Reader"
 msgstr "Lettore DJVU"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr "Lettore PDF"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index e1ba4bd65b25be00d2e877ecec6639039683381c..76914956741da4797d1dee58f90022a9bb3b793a 100644
GIT binary patch
delta 12686
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
AWdHyG

delta 12903
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%0DB`~$mU&QbGPy@tBJ4mIF5>rNa*ya$zF
z<mYCKGOa_g3;l~er~X>;WjZu*%VXv+^~Vmx$1nzizc3S|VSVB@SOuTM@;Dx2aiWda
zVixgw)I=Uk!{jf`xJ5Xec$b?-GL5L?=7&o!)QS$GCO(ZS`G0MH@K@#o6NPo@?}Je|
z4OQB;s0IBSdt<e)O(LT)kN7=&0n42*|1ja6K|_b+LyW`Ua1e%nW8$gUmUt6t3$9}}
zW}Y;OzK9iwSJ-$pD)B8gK7rbr%cu(cf?812smF)b?X;xfLr1Q)JL*$A&^iJ29?!L|
zL*2g<tKohdpRxXc<LJMRI=uZ(n*@fV#x1hW#HxD#UwPc%w_Q|bdoTb`qcZoP2D)M6
z`!;@r{`6NlWB#!!4E1~(rr<NE!#xMJfHzQEy9>2tM=?zA|4ka*u+q2Y=XoF0#Pd<7
zcNvD_c8tfPsKfdfCSmwl6F-HTU_9#iQd9!-@Hu=FM_`q6rhg*3b!Zmbj;*K(528x!
zL0$h9E2GbO^P#DVIxErG7@tN}Xga!Zo{hJn64`~pxYv5pUcY*t`Ui30cRFN+@61Z8
zV>RMNsKeD7yI?!a#g(XpuAnzwM@{rQ>hL{4B~<r<SwI3RfljE(^|x`!1?pdmj+Jzz
z;&u$do2UWHT{PFdQ3*w(O5754Uk>WN0oVu&Fb$VtZT!;qUq@9m<dUgSBvvKPa?{Y4
zE)R7>5i0X3sDWo&7okeN5^LZ-)QZmGaJ-31to!%oEES-h{}>zKeoV(}sOO@8Fh5n@
zDYnrQYjI%`>W1a00XA9R#X7`0PzjzyRp1AV#J^Cb54mjmTcO75ib}i?YvL=YEhs~t
zcRS~3=*HWqFPiTaGeA7*fwrjYeQp0F)Bp=n6Mukp@g(ZLKT(MV{b+1}T1W;KVmoUY
z4%ho%&tpCq3sD0*KbZmRqv8%W9)(Sa7uk3(MiXB_t=#LXc^eW?3H3uQ;007-t5929
zhC0Nb;^UwHK0lki3qob;LX|ki#?7tis6B3rT45e4p<$@k@MTQEBN&DEtYN>H`!i5)
zQyxZO4|IFcc%Ftbn`WJbIs;2^4!(&>DE=DvVk+wX_fZ4w#@2WaJ7LZ1X2s89Cb1iJ
z+V|M_1Zpb+Z&3dhy5WZTDfkg;z+0%5Rk>*<&Onv0Bl=<i>b@e|zZkU@TTvA{fvU)5
z^u~Z&W}F(>pEw$|@RD2XzZ!GtP)V1d2H1p6@gwUsY)Kscs~M;(DxpCbgVRuZz5yHK
zVGP4RF&hJJn}7A{hWgZRMOD~w|7HfNhB_>Xn2R~M3|H9xm^<cyEL6q1+ISwu5x<W5
zKpn*Zyoeg_roCSAu1P!*m0*U|J;F9t<5OHXj5!$cyD8}a3?wc^KU|L5>vgvOGOBWS
z>~*g{Ohv1q5(u|(66*Oh)Oa1RDeHH7($I}_(FfOKFusFY>0Z<p-9xSPA<o9wKh4jC
zZP<jk{9oo5l_XR`6HzN&fcg}FjCpt#HDBC4{mfzi+tJVj-B5ek7nMjUhTuXQzlnPA
zUDW-Dt;exG@oB7te`7Or?wem~lQ5pJKRWeehZGi$Y&hOEzF<tgYeHd}f71;~9iJ{L
z7~`5StiY8pvT#UYVlIEU3i1jD=NF7ic(!oNP}k7mqY7NZ$G8T&CKODb;3~);KA~`&
zYcN9$&d+zn(pFc)w6bma6(anbG;Y$&)vRe+(`JpDG%MRzQnOrzCJ9Mp7fS1O9Qpsu
z;3-|{DS5+FvcXfj)l;&}Q##92@~)?3x2JTDr(}z#bhfADO;5>QPx0pKFU|K9zvwC6
rbZzgaSLdyZ{blEt>#xpg=qX-BpQm`Sr+A&GcqO-_l|B6ONW=dH3e>a-

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 693a39ed8..520ebdfea 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: subdiox <subdiox@gmail.com>\n"
 "Language: ja\n"
@@ -16,487 +16,487 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "サーバーを再起動しました。ページを再読み込みしてください"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバーをシャットダウンしています。ページを閉じてください"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "再接続成功"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "不明なコマンド"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "不明"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "UI設定"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "ユーザーを編集"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "全て"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "ユーザーが見つかりません"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{}人のユーザーが削除されました"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "全て表示"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "不正なリクエスト"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "ゲストユーザーの名前は変更できません"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "ゲストユーザーはこのロールを持つことができません"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "管理者ユーザーが残っておらず、管理者ロールを削除できません"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "値はtrueかfalseのどちらかでなければなりません"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "無効なロール"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "ゲストユーザーはこの画面を表示できません"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "無効な表示"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "ゲストユーザーの言語設定は自動的に決定されるため、固定することはできません"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "有効な言語設定がありません"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "有効な本の言語がありません"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "パラメータが見つかりません"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "無効な読み取り列"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "無効な制限列"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Webの設定を更新しました"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Koboのトークンを削除してもよろしいですか？"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "このドメインを削除してもよろしいですか？"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "このユーザーを削除してもよろしいですか？"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "この本棚を削除してもよろしいですか？"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "選択したユーザーの言語設定を変更してもよろしいですか？"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "選択したユーザーが表示できる本の言語を変更してもよろしいですか？"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "選択したユーザーの選択したロールを変更してもよろしいですか？"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "選択したユーザーの選択した制限を変更してもよろしいですか？"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "選択したユーザーの選択した表示制限を変更してもよろしいですか？"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "選択したユーザーの本棚同期の動作を変更してもよろしいですか？"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Calibreライブラリのパスを変更してもよろしいですか？"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr "Calibre-Webは新しい表紙を検索してそのサムネイルを更新しますが、これにはしばらく時間がかかるかもしれません"
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Calibre-Webの同期DBを削除して強制的にKoboリーダーと同期してもよろしいですか？"
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒否"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "許可"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr "{}件の同期項目を削除しました"
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "タグが見つかりません"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "無効なアクションです"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.jsonがWebアプリケーション用に設定されていません"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "ログファイルの場所が無効です。正しいパスを入力してください"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "アクセスログファイルの場所が無効です。正しいパスを入力してください"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "LDAPのプロバイダ、ポート番号、DN、ユーザーIDを入力してください"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "LDAPのサービスアカウント名とパスワードを入力してください"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "LDAPのサービスアカウント名を入力してください"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAPのグループフィルタには \"%s\" というフォーマットのIDが一つ必要です"
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAPのグループフィルタ内の括弧が一致しません"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAPのユーザーフィルタには \"%s\" というフォーマットのIDが一つ必要です"
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAPのユーザーフィルタ内の括弧が一致しません"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAPのメンバーフィルタには \"%s\" というフォーマットのIDが一つ必要です"
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAPのメンバーフィルタ内の括弧が一致しません"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAPのCA証明書、証明書、キーの場所が無効です。正しいパスを入力してください"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "新規ユーザー追加"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "メールサーバー設定を編集"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "Gmailアカウントを認証しました"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "DBエラー: %(error)s"
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "%(email)s へのテストメール送信がキューに追加されました。結果を見るにはタスクを確認してください"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "%(res)s へのテストメール送信中にエラーが発生しました"
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "初めにメールアドレスを設定してください"
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "メールサーバーの設定を更新しました"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr "スケジュールタスク設定を編集"
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr "指定したタスクの開始時刻が無効です"
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr "指定したタスクの期間が無効です"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr "スケジュールタスクの設定を更新しました"
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr "設定DBが書き込みできません"
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "ユーザー %(nick)s を編集"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "ユーザー %(user)s のパスワードをリセット"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "ログファイルビューア"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "DB接続を切断"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "サーバー停止中"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページを再読み込みしてください"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "接続確立中にタイムアウトしました"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr "更新データを一時フォルダに保存できませんでした"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr "更新中にファイルを置換できませんでした"
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr "少なくとも1人のLDAPユーザーの抽出に失敗しました"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "少なくとも1人のLDAPユーザーの作成に失敗しました"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "エラー: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "エラー: LDAPサーバーのレスポンスでユーザーが返されません"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "DB内にLDAPユーザーが1人も見つかりません"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{}人のユーザーをインポートしました"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "DBの場所が無効です。正しいパスを入力してください"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "DBへの書き込みができません"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "キーファイルの場所が無効です。正しいパスを入力してください"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "証明書ファイルの場所が無効です。正しいパスを入力してください"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 msgid "Database Settings updated"
 msgstr "DB設定を更新しました"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "DB設定"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザー '%(user)s' を作成しました"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "このメールアドレスかニックネームで登録されたアカウントがすでに存在します。"
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザー '%(nick)s' を削除しました"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "ゲストユーザーは削除できません"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "管理者ユーザーが残っておらず、ユーザーを削除できません"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザー '%(nick)s' を更新しました"
@@ -509,20 +509,20 @@ msgstr "インストールされていません"
 msgid "Execution permissions missing"
 msgstr "実行権限がありません"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "カスタムカラムの%(column)d列目がcalibreのDBに存在しません"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "なし"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "選択した本は利用できません。ファイルが存在しないか、アクセスできません"
 
@@ -740,7 +740,7 @@ msgstr "ファイル名の変更でエラーが発生しました: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "このメールアドレスで登録されたアカウントがすでに存在します"
 
@@ -819,7 +819,7 @@ msgstr "Kobo設定"
 msgid "Register with %(provider)s"
 msgstr "%(provider)s で登録"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -884,8 +884,9 @@ msgstr "Google OAuth エラー: {}"
 msgid "{} Stars"
 msgstr "星{}"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "ログイン"
 
@@ -901,7 +902,7 @@ msgstr "トークンが無効です"
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "本"
 
@@ -926,7 +927,7 @@ msgstr "ダウンロードされた本"
 msgid "Show Downloaded Books"
 msgstr "ダウンロードされた本を表示"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "高評価の本"
 
@@ -935,7 +936,7 @@ msgid "Show Top Rated Books"
 msgstr "高評価の本を表示"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "既読の本"
 
@@ -944,7 +945,7 @@ msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "未読の本"
 
@@ -962,7 +963,7 @@ msgid "Show Random Books"
 msgstr "ランダムに本を表示"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -972,7 +973,7 @@ msgstr "カテゴリ選択を表示"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "シリーズ"
 
@@ -990,7 +991,7 @@ msgid "Show author selection"
 msgstr "著者選択を表示"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "出版社"
 
@@ -1000,7 +1001,7 @@ msgstr "出版社選択を表示"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "言語"
 
@@ -1024,7 +1025,7 @@ msgstr "ファイル形式"
 msgid "Show file formats selection"
 msgstr "ファイル形式選択を表示"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "アーカイブされた本"
 
@@ -1032,7 +1033,7 @@ msgstr "アーカイブされた本"
 msgid "Show archived books"
 msgstr "アーカイブされた本を表示"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "本の一覧"
 
@@ -1042,7 +1043,7 @@ msgstr "本の一覧を表示"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "検索"
@@ -1074,7 +1075,7 @@ msgstr "既読/未読状況 = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "カスタムカラムの検索でエラーが発生しました。Calibre-Webを再起動してください"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "詳細検索"
 
@@ -1124,7 +1125,7 @@ msgstr "本が %(sname)s から削除されました"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "申し訳ありませんが、あなたはこの本棚から本を削除することが許可されていません"
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "本棚を作成する"
 
@@ -1186,7 +1187,7 @@ msgstr "本棚: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "タスク"
@@ -1248,139 +1249,140 @@ msgstr "アップデートが利用可能です。下のボタンをクリック
 msgid "No release information available"
 msgstr "リリース情報がありません"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムに表示)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "人気の本 (最もダウンロードされた本)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s がダウンロードした本"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "著者: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr "評価: なし"
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "評価: 星%(rating)s"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "ファイル形式: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "ダウンロード数"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "評価一覧"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "ファイル形式一覧"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "メールサーバーが設定されていません。管理者に連絡してください"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP認証を有効化できません"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "代わりに '%(nickname)s' としてログインします。LDAPサーバーにアクセスできないか、ユーザーが存在しません"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "ログインできません: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "ユーザー名またはパスワードが違います"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "新しいパスワードがあなたのメールアドレスに送信されました"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "パスワードをリセットするには、有効なユーザー名を入力してください"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "'%(nickname)s' としてログインしました"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
@@ -1430,7 +1432,7 @@ msgstr "変換"
 msgid "Reconnecting Calibre database"
 msgstr "Calibre DBと再接続中"
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr "メール"
 
@@ -1458,7 +1460,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "表紙サムネイルのキャッシュを消去中"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "アップロード"
 
@@ -1481,7 +1483,7 @@ msgstr "メールアドレス"
 msgid "Send to E-Reader E-mail Address"
 msgstr "E-Readerメールアドレス"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理者"
@@ -1859,12 +1861,12 @@ msgstr "発売日"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "言語"
 
@@ -1914,8 +1916,8 @@ msgstr "カバー画像をクリックしてメタデータをフォームに読
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "閉じる"
@@ -2358,7 +2360,7 @@ msgstr "ランダムに表示する本の冊数"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "非表示にする前に表示する著者数 (0=非表示にしない)"
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "テーマ"
 
@@ -2455,49 +2457,51 @@ msgstr "ブラウザで読む"
 msgid "Listen in Browser"
 msgstr "ブラウザで聞く"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "%(range)s 第%(index)s巻"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "発売日"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "未読に設定"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "既読に設定"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "既読"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "アーカイブから復元"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "アーカイブに追加"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "アーカイブ済み"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "詳細:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "本棚に追加"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(公開)"
@@ -2546,7 +2550,7 @@ msgstr "添付ファイルのサイズ制限"
 msgid "Save and Send Test E-mail"
 msgstr "保存してテストメールを送信"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "戻る"
@@ -2572,12 +2576,13 @@ msgstr "ドメイン名を入力"
 msgid "Denied Domains (Blacklist)"
 msgstr "拒否するドメイン名 (ブラックリスト)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "次"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ".kobo/Kobo eReader.confファイルをテキストエディタで開いて追加(編集)してください:"
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2588,19 +2593,19 @@ msgstr "Koboトークン:"
 msgid "List"
 msgstr "一覧"
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Webインスタンスが未設定です。管理者に連絡してください"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Issueを作成"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "ホームに戻る"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "ユーザーをログアウト"
 
@@ -2690,7 +2695,7 @@ msgstr "評価順"
 msgid "Books ordered by file formats"
 msgstr "ファイル形式順"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "本棚"
@@ -2699,60 +2704,60 @@ msgstr "本棚"
 msgid "Books organized in shelves"
 msgstr "本棚に整理された本"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "ホーム"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "ナビゲーションを実行"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "ライブラリ内を検索"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "アップロード中..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "エラー"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "設定"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "アカウント"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "ログアウト"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "アップロード中..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "エラー"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "設定"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "ページを更新しないでください"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "閲覧"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "このサイトについて"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "前"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "本の詳細"
 
@@ -2768,7 +2773,7 @@ msgstr "アカウント情報を記憶する"
 msgid "Forgot Password?"
 msgstr "パスワードを忘れた場合"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "マジックリンクでログイン"
 
@@ -2876,23 +2881,23 @@ msgstr "Calibre-WebのeBookカタログ"
 msgid "epub Reader"
 msgstr "EPUBリーダー"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "ライト"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "ダーク"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr "セピア"
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 msgid "Black"
 msgstr "ブラック"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "サイドバーが開いているとき、テキストを再度流し込みます。"
 
@@ -2900,111 +2905,111 @@ msgstr "サイドバーが開いているとき、テキストを再度流し込
 msgid "Comic Reader"
 msgstr "コミックリーダー"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "前のページ"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "次のページ"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "最適なサイズにする"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "横に合わせる"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "縦に合わせる"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "オリジナルのサイズにする"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "右に回転する"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "左に回転する"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "画像を反転する"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "スケール"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "最適"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "横に合わせる"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "縦に合わせる"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "オリジナル"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "回転"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "反転"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "水平方向"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "垂直方向"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "読む方向"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "左から右"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "右から左"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "一番上にリセット"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "位置を維持"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "スクロールバー"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "表示"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "非表示"
 
@@ -3012,7 +3017,7 @@ msgstr "非表示"
 msgid "DJVU Reader"
 msgstr "DJVUリーダー"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr "PDFリーダー"
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 5f11291babf0b3ea7fe00813442f18f9fd38a38a..02c0b86f06684d1dbe6bdefa9036e52f55f1dac2 100644
GIT binary patch
delta 36
scmaF3i}B$u#tk=>d5v_9Oce|btc;Ab4GbqgQ~tzksAsVGwo01?0Q$EK^8f$<

delta 36
scmaF3i}B$u#tk=>c@1<8j1-IvtqhH{4U8r~Q~tzkpl7`Kwo01?0Qx-)@Bjb+

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index d86abb3e3..32f758870 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,494 +17,494 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "មិនដឹង"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "ទំព័ររដ្ឋបាល"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "បង្ហាញទាំងអស់"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
@@ -517,20 +517,20 @@ msgstr "មិនបានតម្លើង"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "គ្មាន"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -749,7 +749,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -827,7 +827,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -892,8 +892,9 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -909,7 +910,7 @@ msgstr "វត្ថុតាងហួសពេលកំណត់"
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr ""
 
@@ -934,7 +935,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
@@ -943,7 +944,7 @@ msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
@@ -952,7 +953,7 @@ msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
@@ -970,7 +971,7 @@ msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
@@ -980,7 +981,7 @@ msgstr "បង្ហាញជម្រើសប្រភេទ"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "ស៊េរី"
 
@@ -998,7 +999,7 @@ msgid "Show author selection"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr ""
 
@@ -1008,7 +1009,7 @@ msgstr ""
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "ភាសានានា"
 
@@ -1032,7 +1033,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr ""
 
@@ -1040,7 +1041,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr ""
 
@@ -1050,7 +1051,7 @@ msgstr ""
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "ស្វែងរក"
@@ -1082,7 +1083,7 @@ msgstr ""
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
@@ -1133,7 +1134,7 @@ msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
@@ -1196,7 +1197,7 @@ msgstr "ធ្នើ៖ ‘%(name)s’"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
@@ -1258,139 +1259,140 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "ឯកសារ DLS"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
@@ -1440,7 +1442,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1468,7 +1470,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "អាប់ឡូដ"
 
@@ -1492,7 +1494,7 @@ msgstr ""
 msgid "Send to E-Reader E-mail Address"
 msgstr "ឧបករណ៍ Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "រដ្ឋបាល"
@@ -1871,12 +1873,12 @@ msgstr "ថ្ងៃបោះពុម្ភ"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "អ្នកបោះពុម្ភ"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "ភាសា"
 
@@ -1927,8 +1929,8 @@ msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិ
 msgid "Loading..."
 msgstr "កំពុងដំណើរការ..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "បិទ"
@@ -2372,7 +2374,7 @@ msgstr "ចំនួនសៀវភៅចៃដន្យដើម្បីបង
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "ការតុបតែង"
 
@@ -2471,49 +2473,51 @@ msgstr "អានក្នុងកម្មវិធី browser"
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "អាន"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "ពិពណ៌នា"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "បន្ថែមទៅធ្នើ"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
@@ -2562,7 +2566,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr "រក្សាទុកការកំណត់រួចផ្ញើអ៊ីមែលសាកល្បង"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "មកក្រោយ"
@@ -2588,12 +2592,12 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "បន្ទាប់"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2604,19 +2608,19 @@ msgstr ""
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr ""
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2706,7 +2710,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2715,60 +2719,60 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "បិទ/បើកការរុករក"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "កំពុងអាប់ឡូត..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr ""
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr ""
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "ការកំណត់"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "ចេញពីការប្រើប្រាស់"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "កំពុងអាប់ឡូត..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr ""
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr ""
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "ការកំណត់"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "រុករក"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "អំពី"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "មុន"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "ព័ត៌មានលម្អិតរបស់សៀវភៅ"
 
@@ -2784,7 +2788,7 @@ msgstr "ចងចាំខ្ញុំ"
 msgid "Forgot Password?"
 msgstr ""
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "ចូលប្រើប្រាស់ដោយ magic link"
 
@@ -2893,24 +2897,24 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr ""
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "មកក្រោយ"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "សេរេអត្ថបទនៅពេលបើកផ្ទាំងចំហៀង។"
 
@@ -2918,111 +2922,111 @@ msgstr "សេរេអត្ថបទនៅពេលបើកផ្ទាំង
 msgid "Comic Reader"
 msgstr ""
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr ""
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr ""
 
@@ -3030,7 +3034,7 @@ msgstr ""
 msgid "DJVU Reader"
 msgstr ""
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr ""
 
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index cb672ba259f1fe7cc0c68788e6d8c5da4e4704ec..137889e95ef8de95fac366c5d95277ba1a9d4911 100644
GIT binary patch
delta 11789
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
PrP<FWWRxD?dOqrZvo3<1

delta 11979
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
TxhVhUw0U+wf+)G|hsys8s5#K+

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index c6379467f..a8c6726a3 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -15,487 +15,487 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "통계"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "서버 다시 시작으로 새로고침 필요"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "서버를 종료하는 중, 창을 닫아야 함"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "재연결 성공"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "알 수 없는 명령"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "관리자 페이지"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "기본 설정"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "UI 설정"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "사용자 관리"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "모두"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "사용자를 찾을 수 없음"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} 사용자를 성공적으로 삭제함"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "모두 보기"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "잘못된 요청"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "Guest 이름은 수정할 수 없음"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "Guest는 이 권한을 사용할 수 없음"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "관리자 계정이 하나 뿐일 때는 관리자를 삭제할 수 없음"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "값으로 rue 또는 false만 설정 가능"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "잘못된 권한"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "Guest는 이 view를 사용할 수 없음"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "잘못된 view"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Guest의 로케일은 자동으로 결정되며 설정할 수 없음"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "유효한 로케일이 아님"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "제공된 책의 언어가 유효하지 않음"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "매개변수를 찾을 수 없음"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "잘못된 읽기 열"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "잘못된 제한된 열"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web 설정이 업데이트 됨"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Kobo Token을 삭제하시겠습니까?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "이 도메인을 삭제하시겠습니까?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "이 사용자를 삭제하시겠습니까?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "이 서재를 삭제하시겠습니까?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "선택한 사용자의 언어를 변경하시겠습니까?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "선택한 사용자에 대해 표시되는 책 언어를 변경하시겠습니까?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "선택한 사용자에 대해 선택한 권한을 변경하시겠습니까?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "선택한 사용자에 대해 선택한 제한을 변경하시겠습니까?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "선택한 사용자에 대해 선택한 가시성 제한을 변경하시겠습니까?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "선택한 사용자의 실행기 동기화 동작을 변경하시겠습니까?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "캘리버 서재의 언어를 변경하시겠습니까?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Kobo Reader와 전체 동기화를 강제 실행하기 위해 Calibre-Web의 동기화 데이터베이스를 삭제하시겠습니까?"
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "거부됨"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "허용됨"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr "{} 동기화 항목이 삭제됨"
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "태그를 찾을 수 없음"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "잘못된 액션"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json이 Web 응용프로그램에 대해 설정되지 않음"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "로그 파일 위치가 오류. 올바른 경로 입력 필요"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "액세스 로그 파일 위치가 올바르지 않음. 올바른 경로 입력 필요"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "LDAP 공급자, 포트, DN 및 사용자 개체 식별자를 입력"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "LDAP 서비스 계정 및 비밀번호를 입력하십시오"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "LDAP 서비스 계정을 입력하십시오"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP 그룹 개체 필터에는 하나의 \"%s\" 형식 식별자가 필요함"
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP 그룹 개체 필터에 일치하지 않는 괄호가 있음"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP 사용자 개체 필터에는 하나의 \"%s\" 형식 식별자 필요"
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP 사용자 개체 필터에 일치하지 않는 괄호가 있음"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP 구성원 사용자 필터에는 하나의 \"%s\" 형식 식별자 필요"
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP 구성원 사용자 필터에 일치하지 않는 괄호가 있음"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "유요하지 않은 LDAP CACertificate, 인증서 또는 키 위치. 올바른 경로를 입력 필요"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "새 사용자 추가"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "이메일 서버 설정 편집"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail 계정 인증 성공"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "데이터베이스 오류: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "%(email)s에 테스트를 위한 이메일을 보냄. 결과 확인 필요"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "테스트 이메일을 보내는 동안 오류가 발생했습니다: %(res)s"
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "먼저 이메일 주소를 구성하십시오..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "이메일 서버 설정 업데이트됨"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "사용자 %(nick)s 편집"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "사용자 %(user)s의 비밀번호 재설정"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "로그 파일 뷰어"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "업데이트 패키지 요청"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "업데이트 패키지 다운로드"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "업데이트 패키지 압축 풀기"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "파일 교체"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "데이터베이스 연결이 닫힙니다"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "서버 중지"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "업데이트가 완료되었습니다. 확인을 누르고 페이지를 새로고침하세요"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "업데이트 실패:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP 오류"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "연결 오류"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "연결 설정 중 시간 초과"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "일반 오류"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr "임시 디렉토리에 업데이트 파일을 저장할 수 없습니다"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr "업데이트하는 동안 파일을 교체할 수 없습니다"
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr "하나 이상의 LDAP 사용자를 추출하지 못했습니다"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "하나 이상의 LDAP 사용자를 생성하지 못했습니다"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "오류: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "오류: LDAP 서버의 응답으로 사용자가 반환되지 않았습니다"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "데이터베이스에서 하나 이상의 LDAP 사용자를 찾을 수 없습니다"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} 사용자 가져오기 성공"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "올바르지 않은 DB 위치. 올바른 경로 입력 필요"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "쓰기 권한이 없는 DB"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "올바르지 않은 키 파일 위치. 올바른 경로 입력 필요"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "올바르지 않은 인증서 파일 위치. 올바른 경로 입력 필요"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 msgid "Database Settings updated"
 msgstr "데이터베이스 설정이 업데이트 되었습니다"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "데이터베이스 구성"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "모든 필드를 채워주십시오!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "유효한 도메인에서 온 이메일이 아니"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "사용자 '%(user)s'이(가) 생성됨"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "사용자 '%(nick)s'이(가) 삭제됨"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "게스트 사용자는 삭제할 수 없습니다"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "관리자 계정이 하나 뿐일 때는 관리자 권한을 삭제할 수 없음"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "사용자 '%(nick)s'가 업데이트 됨"
@@ -508,20 +508,20 @@ msgstr "설치되지 않음"
 msgid "Execution permissions missing"
 msgstr "실행 권한 누락"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "None"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다"
 
@@ -740,7 +740,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "등록되어 있는 이메일 주소입니다"
 
@@ -820,7 +820,7 @@ msgstr "Kobo 설정"
 msgid "Register with %(provider)s"
 msgstr "%(provider)s에 등록"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
@@ -885,8 +885,9 @@ msgstr "Google 인증 오류: {}"
 msgid "{} Stars"
 msgstr "{} Stars"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "로그인"
 
@@ -902,7 +903,7 @@ msgstr "토큰이 만료되었습니다"
 msgid "Success! Please return to your device"
 msgstr "성공! 기기로 돌아가주세요"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "책"
 
@@ -927,7 +928,7 @@ msgstr "다운로드된 책"
 msgid "Show Downloaded Books"
 msgstr "다운로드된 책 보기"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "평점이 높은 책"
 
@@ -936,7 +937,7 @@ msgid "Show Top Rated Books"
 msgstr "평점이 높은 책 보기"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "읽은 책"
 
@@ -945,7 +946,7 @@ msgid "Show read and unread"
 msgstr "읽은 책과 읽지 않은 책 보기"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "읽지 않은 책"
 
@@ -963,7 +964,7 @@ msgid "Show Random Books"
 msgstr "무작위 추천"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "카테고리"
 
@@ -973,7 +974,7 @@ msgstr "카테고리별 보기"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "시리즈"
 
@@ -991,7 +992,7 @@ msgid "Show author selection"
 msgstr "저자별 보기"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "출판사"
 
@@ -1001,7 +1002,7 @@ msgstr "출판사별 보기"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "언어"
 
@@ -1025,7 +1026,7 @@ msgstr "파일 유형"
 msgid "Show file formats selection"
 msgstr "파일 유형별 보기"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "보관된 책"
 
@@ -1033,7 +1034,7 @@ msgstr "보관된 책"
 msgid "Show archived books"
 msgstr "보관된 책 보기"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "책 목록"
 
@@ -1043,7 +1044,7 @@ msgstr "책 목록 보기"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "검색"
@@ -1075,7 +1076,7 @@ msgstr "읽은 상태 = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "상세 검색"
 
@@ -1125,7 +1126,7 @@ msgstr "책이 책장에서 삭제됨: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다"
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "책장 추가"
 
@@ -1188,7 +1189,7 @@ msgstr "책장: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "작업"
@@ -1250,139 +1251,140 @@ msgstr "최신 안정 버전 %(version)s으로 업데이트하려면 아래 버
 msgid "No release information available"
 msgstr "출시 정보가 없습니다"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "발견(무작위 도서)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "인기있는 책(가장 많이 다운로드됨)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s이(가) 다운로드한 책"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "저자: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "출판사: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "시리즈: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "평가: %(rating)s 별"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "파일 유형: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "카테고리: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "언어: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "다운로드"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "평점 목록"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "파일 유형 목록"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "책을 보내는 중에 오류 발생: %(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "등록"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "이메일을 등록할 수 없습니다"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "확인을 위한 이메일이 발송되었습니다."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP 인증을 활성화할 수 없습니다"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "로그인 실패: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "잘못된 사용자명 또는 비밀번호"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "새 비밀번호가 이메일로 전송되었습니다"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "다음 사용자로 로그인: '%(nickname)s"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 프로필"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "프로필이 업데이트 됨"
 
@@ -1432,7 +1434,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1460,7 +1462,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "업로드"
 
@@ -1484,7 +1486,7 @@ msgstr "이메일 주소"
 msgid "Send to E-Reader E-mail Address"
 msgstr "킨들로 보내기 이메일 주소"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "관리자"
@@ -1862,12 +1864,12 @@ msgstr "출간일"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "출판사"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "언어"
 
@@ -1917,8 +1919,8 @@ msgstr "표지를 클릭하여 양식에 메타데이터 로드"
 msgid "Loading..."
 msgstr "불러오는 중..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "닫기"
@@ -2361,7 +2363,7 @@ msgstr "랜덤 보기시 표시할 책 수"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "숨기기 전에 표시할 저자 수(0=숨기기 비활성화)"
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "테마"
 
@@ -2458,49 +2460,51 @@ msgstr "부라우저에서 보기"
 msgid "Listen in Browser"
 msgstr "브라우저에서 듣기"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "책 %(index)s의 %(range)s"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "출간일"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "읽지 않은 상태로 표시"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "읽은 상태로 표시"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "읽기"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "아카이브에서 복원"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "아카이브에 추가"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "보관됨"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "설명:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "서재에 추가"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(공개)"
@@ -2549,7 +2553,7 @@ msgstr "첨부 파일 크기 제한"
 msgid "Save and Send Test E-mail"
 msgstr "저장 후 테스트 이메일 보내기"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "뒤로"
@@ -2575,12 +2579,13 @@ msgstr "도메인 입력"
 msgid "Denied Domains (Blacklist)"
 msgstr "거부 도메인(블랙리스트)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "다음"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "텍스트 편집기에서 .kobo/Kobo eReader.conf 파일을 열고 다음을 추가(또는 편집):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2592,19 +2597,19 @@ msgstr "코보 연동 토큰"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Web Instance가 구성되지 않았습니다. 관리자에게 문의"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "이슈 생성"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "홈으로"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "로그아웃"
 
@@ -2694,7 +2699,7 @@ msgstr "평점별 정렬"
 msgid "Books ordered by file formats"
 msgstr "파일 종류별 정렬"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "서재"
@@ -2703,60 +2708,60 @@ msgstr "서재"
 msgid "Books organized in shelves"
 msgstr "서재별 정렬"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "홈"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "탐색 활성화"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "검색"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "업로드 중..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "오류"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "설정"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "계정"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "로그아웃"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "업로드 중..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "오류"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "설정"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "페이지를 새로고침 하지 마세요"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "탐색"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "서재 정보"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "이전"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "책 상세정보"
 
@@ -2772,7 +2777,7 @@ msgstr "로그인 유지"
 msgid "Forgot Password?"
 msgstr "비밀번호를 잊으셨나요?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Magic Link로 로그인"
 
@@ -2880,24 +2885,24 @@ msgstr "Calibre-Web 책 목록"
 msgid "epub Reader"
 msgstr "epub 리더"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "밝게"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "어둡게"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "뒤로"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "사이드바가 열려 있을 때 텍스트 다시 배열."
 
@@ -2905,111 +2910,111 @@ msgstr "사이드바가 열려 있을 때 텍스트 다시 배열."
 msgid "Comic Reader"
 msgstr "코믹 리더"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "키보드 단축키"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "이전 페이지"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "다음 페이지"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "최적 크기"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "폭 조절"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "높이 조절"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "기본 크기"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "오른쪽으로 회전"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "왼쪽으로 회전"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "이미지 뒤집기"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "크기"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "최적"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "폭"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "높이"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "기본"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "회전"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "뒤집기"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "수평"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "수직"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "방향"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "왼쪽에서 오른쪽"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "오른쪽에서 왼쪽"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "맨 위로 재설정"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "위치 기억"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "스크롤바"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "보기"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "숨기기"
 
@@ -3017,7 +3022,7 @@ msgstr "숨기기"
 msgid "DJVU Reader"
 msgstr "DJVU 리더"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr "PDF 리더"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 58f4b5963f48badc9cbb1ccd6b6a5f99920d2dcf..0b136f77161b9b26d614d4241d1708d0185f6a2c 100644
GIT binary patch
delta 11020
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
HVKM&$Nlnp1

delta 11190
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

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 36400b8b3..a76455719 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -17,497 +17,497 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "De server is herstart, vernieuw de pagina"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met het afsluiten van de server, sluit het venster"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Opnieuw verbinden gelukt"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Systeembeheer"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Basisconfiguratie"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Uiterlijk aanpassen"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Systeembeheerder"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Alles"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} gebruikers succesvol verwijderd"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Alle talen"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Misvormd verzoek"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "Gast naam kan niet worden veranderd"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "Gast kan deze rol niet hebben"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "Waarde moet Waar of Onwaar zijn"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Ongeldige rol"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "Gast kan dit niet bekijken"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "Ongeldige waarde"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Gasts locale is automatisch bepaald en kan niet handmatig worden ingesteld"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "Geen geldige locale is opgegeven"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "Geen geldige boek taal is opgegeven"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Parameter is niet gevonden"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "Ongeldige gelezen kolom"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "Ongeldige beperkte kolom"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Wil je je Kobo Token echt verwijderen?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "Wil je dit domein echt verwijderen?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "Wil je deze gebruiker echt verwijderen?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Weet je zeker dat je deze boekenplank wilt verwijderen?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Weet je zeker dat je de locales van de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Weet je zeker dat je de zichtbare talen voor de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Weet je zeker dat je de geselecteerde rol van de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Weet je zeker dat je de geselecteerde beperkingen voor de geselecteerde gebruikers(s) wil verwijderen?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Weet je zeker dat je de geselecteerde zichtbaarheidsbeperkingen voor de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Weet je zeker dat je de synchronisatiegedrag van boekenplanken voor de geselecteerde gebruiker(s) wil veranderen?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Weet je zeker dat je de locatie van de Calibre-bibliotheek wil veranderen?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Weigeren"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Toestaan"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Tag niet gevonden"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Ongeldige actie"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json is niet geconfigureerd voor webapplicatie"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 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:1143
+#: cps/admin.py:1160
 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:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Voer alsjeblieft een LDAP Provider, Port, DN en User Object Identifier in"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Voer een geldig LDAP Service Account en wachtwoord in"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "Voer een LDAP Service Account in"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Groep Object Filter Moet Een \"%s\" Formaat Identificiatie hebben"
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Groep Object Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Gebruiker Object Filter moet \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Lid Gebruiker Filter moet een \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Lid Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsjeblieft een geldig pad in."
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account succesvol geverifieerd"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail wordt verzonden naar %(email)s, controleer de taken voor het resultaat"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mislukt om minstens een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Het is niet gelukt tenminste een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fout: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fout: No user returned in response of LDAP server"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minstens een LDAP Gebruiker is niet gevonden in de Database"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} Gebruiker succesvol geïmporteerd"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Database niet gevonden, voer de juiste locatie in"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "Kan niet schrijven naar database"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-sleutellocatie is niet geldig, voer een geldig pad in"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-certificaatlocatie is niet geldig, voer een geldig pad in"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "Kan Gast gebruiker niet verwijderen"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
@@ -520,20 +520,20 @@ msgstr "niet geïnstalleerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Geen"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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"
 
@@ -752,7 +752,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
@@ -833,7 +833,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -898,8 +898,9 @@ msgstr "Google OAuth foutmelding: {}"
 msgid "{} Stars"
 msgstr "{} sterren"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Inloggen"
 
@@ -915,7 +916,7 @@ msgstr "Toegangssleutel is verlopen"
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Boeken"
 
@@ -940,7 +941,7 @@ msgstr "Gedownloade boeken"
 msgid "Show Downloaded Books"
 msgstr "Gedownloade boeken tonen"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
@@ -949,7 +950,7 @@ msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
@@ -958,7 +959,7 @@ msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
@@ -976,7 +977,7 @@ msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -986,7 +987,7 @@ msgstr "Categoriekeuze tonen"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Boekenreeksen"
 
@@ -1004,7 +1005,7 @@ msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Uitgevers"
 
@@ -1014,7 +1015,7 @@ msgstr "Uitgeverskeuze tonen"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Talen"
 
@@ -1038,7 +1039,7 @@ msgstr "Bestandsformaten"
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
@@ -1046,7 +1047,7 @@ msgstr "Gearchiveerde boeken"
 msgid "Show archived books"
 msgstr "Gearchiveerde boeken tonen"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Boekenlijst"
 
@@ -1056,7 +1057,7 @@ msgstr "Boekenlijst tonen"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Zoeken"
@@ -1088,7 +1089,7 @@ msgstr "Lees Status = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
@@ -1139,7 +1140,7 @@ msgstr "Het boek is verwijderd van boekenplank: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Boekenplank maken"
 
@@ -1203,7 +1204,7 @@ msgstr "Boekenplank: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Taken"
@@ -1265,139 +1266,140 @@ msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten na
 msgid "No release information available"
 msgstr "Geen update-informatie beschikbaar"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Gedownloade boeken door %(user)s"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, 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:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 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:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
@@ -1447,7 +1449,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1475,7 +1477,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -1499,7 +1501,7 @@ msgstr "E-mailadres"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Kindle-e-mailadres"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Beheer"
@@ -1878,12 +1880,12 @@ msgstr "Publicatiedatum"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Uitgever"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Taal"
 
@@ -1934,8 +1936,8 @@ msgstr "Klik op de omslag om de metagegevens in het formulier te laden"
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Sluiten"
@@ -2381,7 +2383,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Thema"
 
@@ -2480,49 +2482,51 @@ msgstr "Lezen in webbrowser"
 msgid "Listen in Browser"
 msgstr "Luisteren in webbrowser"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Boek %(index)s van %(range)s"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Gepubliceerd"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Markeren als ongelezen"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Markeren als gelezen"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Gelezen"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Terughalen uit archief"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Toevoegen aan archief"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Gearchiveerd"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Toevoegen aan boekenplank"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Openbaar)"
@@ -2571,7 +2575,7 @@ msgstr "Bijlage bestandsgrootte limiet"
 msgid "Save and Send Test E-mail"
 msgstr "Opslaan en test-e-mail versturen"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Annuleren"
@@ -2597,12 +2601,13 @@ msgstr "Voer domeinnaam in"
 msgid "Denied Domains (Blacklist)"
 msgstr "Geweigerde domeinen voor registratie"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Volgende"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/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/generate_kobo_auth_url.html:11
@@ -2614,20 +2619,20 @@ msgstr "Kobo Sync Token"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Probleem melden"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Terug naar startpagina"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "Gebruiker uitloggen"
 
@@ -2717,7 +2722,7 @@ msgstr "Boeken gesorteerd op beoordeling"
 msgid "Books ordered by file formats"
 msgstr "Boeken gesorteerd op bestandsformaat"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Boekenplanken"
@@ -2726,60 +2731,60 @@ msgstr "Boekenplanken"
 msgid "Books organized in shelves"
 msgstr "Boeken georganiseerd op boekenplanken"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Startpagina"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Navigatie aanpassen"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Zoek in bibliotheek"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Bezig met uploaden..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Fout"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Uploaden voltooid, bezig met verwerken..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Instellingen"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Afmelden"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Bezig met uploaden..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Fout"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Uploaden voltooid, bezig met verwerken..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Instellingen"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Deze pagina niet vernieuwen"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Verkennen"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informatie"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Vorige"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Boekgegevens"
 
@@ -2795,7 +2800,7 @@ msgstr "Gegevens opslaan"
 msgid "Forgot Password?"
 msgstr "Wachtwoord Vergeten?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Inloggen met magische koppeling"
 
@@ -2905,24 +2910,24 @@ msgstr "Calibre-Web - e-boekcatalogus"
 msgid "epub Reader"
 msgstr "PDF lezer"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Licht"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Donker"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Annuleren"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Tekstindeling automatisch aanpassen als het zijpaneel geopend is."
 
@@ -2931,111 +2936,111 @@ msgstr "Tekstindeling automatisch aanpassen als het zijpaneel geopend is."
 msgid "Comic Reader"
 msgstr "Comic Reader"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Vorige pagina"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Volgende pagina"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Optimaal inpassen"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Aanpassen aan breedte"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Aanpassen aan hoogte"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Ware grootte"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Rechtsom draaien"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Linksom draaien"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Afbeelding omdraaien"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Schaal"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Beste"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Breedte"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Hoogte"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Ware grootte"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Draaien"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Omdraaien"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Richting"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Links-naar-rechts"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Rechts-naar-links"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "Terugzetten naar bovenkant"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "Positie onthouden"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "Schuifbalk"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Toon"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Verberg"
 
@@ -3044,7 +3049,7 @@ msgstr "Verberg"
 msgid "DJVU Reader"
 msgstr "PDF lezer"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "PDF lezer"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 81514f9d065c2464ad2ba41784eb4e54bb0f37a6..694d5856fd062b2ecac2b8c96ba833d5ae43fb74 100644
GIT binary patch
delta 11015
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
QmG6JNM(gshjl*L82VBnQ)Bpeg

delta 11182
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

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 051dce4be..0fbe00928 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -17,498 +17,498 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Ponowne połączenie zakończono sukcesem"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Książka została umieszczona w kolejce do wysłania do %(kindlemail)s"
 
 # ???
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Panel administratora"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Konfiguracja podstawowa"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Konfiguracja Interfejsu"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Edytuj użytkowników"
 
 # ???
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Wszystko"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} użytkowników usuniętych pomyślnie"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Pokaż wszystkie"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Nieprawidłowo sformułowane żądanie"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "Nazwa gościa nie może być zmieniona"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "Gość nie może pełnić tej roli"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 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:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "Wartość musi być prawdziwa lub fałszywa"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Nieprawidłowa rola"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "Gość nie może tego zobaczyć"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "Nieprawidłowy widok"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Lokalizacja gościa jest określana automatycznie i nie można jej ustawić"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "Nie podano prawidłowej lokalizacji"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "Nie podano obowiązującego języka książki"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Nie znaleziono parametru"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 #, fuzzy
 msgid "Invalid Read Column"
 msgstr "Nieprawidłowa kolumna odczytu"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 #, fuzzy
 msgid "Invalid Restricted Column"
 msgstr "Nieprawidłowa kolumna z ograniczeniami"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Czy na pewno chcesz usunąć Token Kobo?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "Czy naprawdę chcesz usunąć tę domenę?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "Czy naprawdę chcesz usunąć tego użytkownika?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Czy na pewno chcesz usunąć półkę?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić ustawienia lokalne wybranego użytkownika(ów)?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić widoczne języki książek dla wybranego użytkownika (użytkowników)?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić wybraną rolę dla wybranego użytkownika (użytkowników)?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić wybrane ograniczenia dla wybranego użytkownika(ów)?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić wybrane ograniczenia widoczności dla wybranego użytkownika(ów)?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Czy na pewno chcesz zmienić zachowanie synchronizacji półek dla wybranego użytkownika(ów)?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Czy na pewno chcesz zmienić lokalizację biblioteki Calibre?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zabroń"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Zezwalaj"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 #, fuzzy
 msgid "Tag not found"
 msgstr "Nie znaleziono znacznika"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Nieprawidłowe działanie"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json nie został skonfigurowany dla aplikacji webowej"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 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:1173
+#: cps/admin.py:1190
 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:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Proszę wprowadzić konto i hasło usługi LDAP"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "Proszę wprowadzić konto usługi LDAP"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, 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:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów grupy LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, 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:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów użytkownika LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr użytkownika członka LDAP musi mieć jedno \"%s\" identyfikator formatu"
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtr użytkownika członka LDAP ma niedopasowane nawiasy"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie jest prawidłowa, Proszę wprowadzić poprawną ścieżkę"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, fuzzy, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testowy e-mail czeka w kolejce do wysłania do %(email)s, sprawdź zadania, aby uzyskać wynik"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
 # ???
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Błąd: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 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:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} Użytkownik pomyślnie zaimportowany"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "Baza danych nie jest zapisywalna"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 #, fuzzy
 msgid "Can't delete Guest User"
 msgstr "Nie można usunąć użytkownika gościa"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 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:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
@@ -521,20 +521,20 @@ msgstr "nie zainstalowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Niestandardowa kolumna No.%(column)d nie istnieje w bazie calibre"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Brak"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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"
 
@@ -755,7 +755,7 @@ msgstr ""
 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:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
@@ -836,7 +836,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -901,8 +901,9 @@ msgstr "Błąd Google Oauth: {}"
 msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -918,7 +919,7 @@ msgstr "Token wygasł"
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Książki"
 
@@ -943,7 +944,7 @@ msgstr "Pobrane książki"
 msgid "Show Downloaded Books"
 msgstr "Pokaż pobrane książki"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Najwyżej ocenione"
 
@@ -952,7 +953,7 @@ msgid "Show Top Rated Books"
 msgstr "Pokaż menu najwyżej ocenionych książek"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Przeczytane"
 
@@ -961,7 +962,7 @@ msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Nieprzeczytane"
 
@@ -979,7 +980,7 @@ msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -989,7 +990,7 @@ msgstr "Pokaż menu wyboru kategorii"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Cykle"
 
@@ -1007,7 +1008,7 @@ msgid "Show author selection"
 msgstr "Pokaż menu wyboru autora"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Wydawcy"
 
@@ -1017,7 +1018,7 @@ msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Języki"
 
@@ -1041,7 +1042,7 @@ msgstr "Formaty plików"
 msgid "Show file formats selection"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
@@ -1049,7 +1050,7 @@ msgstr "Zarchiwizowane książki"
 msgid "Show archived books"
 msgstr "Pokaż zarchiwizowane książki"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Lista książek"
 
@@ -1059,7 +1060,7 @@ msgstr "Pokaż listę książek"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Szukaj"
@@ -1092,7 +1093,7 @@ msgstr "Status przeczytania = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
@@ -1143,7 +1144,7 @@ msgstr "Książka została usunięta z półki: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
@@ -1207,7 +1208,7 @@ msgstr "Półka: „%(name)s”"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Zadania"
@@ -1269,139 +1270,140 @@ msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktual
 msgid "No release information available"
 msgstr "Brak dostępnych informacji o wersji"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Książki pobrane przez %(user)s"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, 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:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 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:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, 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:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 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:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
@@ -1451,7 +1453,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1479,7 +1481,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Wysyłanie"
 
@@ -1504,7 +1506,7 @@ msgid "Send to E-Reader E-mail Address"
 msgstr "Adres e-mail dla wysyłania do Kindle"
 
 # ???
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Panel administratora"
@@ -1885,12 +1887,12 @@ msgstr "Data publikacji"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Wydawca"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Język"
 
@@ -1941,8 +1943,8 @@ msgstr "Kliknij okładkę, aby załadować metadane do formularza"
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Zamknij"
@@ -2393,7 +2395,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Motyw"
 
@@ -2492,49 +2494,51 @@ msgstr "Czytaj w przeglądarce"
 msgid "Listen in Browser"
 msgstr "Słuchaj w przeglądarce"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Data publikacji"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Oznacz jako nieprzeczytane"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Oznacz jako przeczytane"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Przeczytana"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Przywróć z archiwum"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Dodaj do archiwum"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Zarchiwizowane"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Opis:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Dodaj do półki"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(publiczna)"
@@ -2583,7 +2587,7 @@ msgstr "Limit rozmiaru załącznika"
 msgid "Save and Send Test E-mail"
 msgstr "Zapisz ustawienia i wyślij testową wiadomość e-mail"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Wróć"
@@ -2609,12 +2613,13 @@ msgstr "Podaj nazwę domeny"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domeny zabronione (czarna lista)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Następne"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/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/generate_kobo_auth_url.html:11
@@ -2626,21 +2631,21 @@ msgstr "Token Kobo Sync"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Instancja Calibre-Web jest nieskonfigurowana, proszę skontaktować się z administratorem"
 
 # | msgid "Create a Shelf"
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Zgłoś błąd"
 
 # ???
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Powrót do głównego menu"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 #, fuzzy
 msgid "Logout User"
 msgstr "Wyloguj użytkownika"
@@ -2731,7 +2736,7 @@ msgstr "Książki sortowane według oceny"
 msgid "Books ordered by file formats"
 msgstr "Ksiązki sortowane według formatu"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Półki"
@@ -2740,62 +2745,62 @@ msgstr "Półki"
 msgid "Books organized in shelves"
 msgstr "Książki ułożone na półkach"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Główne menu"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Przełącz nawigację"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Przeszukaj bibliotekę"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
+msgid "Account"
+msgstr "Konto"
+
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
+msgid "Logout"
+msgstr "Wyloguj się"
+
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
 msgid "Uploading..."
 msgstr "Wysyłanie…"
 
 # ???
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:85
 msgid "Error"
 msgstr "Błąd"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:85
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: cps/templates/layout.html:79
-msgid "Account"
-msgstr "Konto"
-
-#: cps/templates/layout.html:81
-msgid "Logout"
-msgstr "Wyloguj się"
-
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Proszę nie odświeżać strony"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informacje"
 
 # ???
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Szczegóły książki"
 
@@ -2811,7 +2816,7 @@ msgstr "Zapamiętaj mnie"
 msgid "Forgot Password?"
 msgstr "Zapomniałeś hasło?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Zaloguj się za pomocą „magic link”"
 
@@ -2921,24 +2926,24 @@ msgstr "Katalog e-booków Calibre-Web"
 msgid "epub Reader"
 msgstr "Czytnik PDF"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Jasny"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Ciemny"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Wróć"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Przepływ tekstu, gdy paski boczne są otwarte."
 
@@ -2947,111 +2952,111 @@ msgstr "Przepływ tekstu, gdy paski boczne są otwarte."
 msgid "Comic Reader"
 msgstr "Czytnik PDF"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiaturowe"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Poprzednia strona"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Następna strona"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Skaluj do najlepszego"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Skaluj do szerokości"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Skaluj do wysokości"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Skaluj do wielkości oryginalnej"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Obróć w prawo"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Obróć w lewo"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Odwórć obraz"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Skaluj"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Najlepszy"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Szerokość"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Wysokość"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Natywnie"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Obrót"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Odwróć"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Pionowo"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Kierunek"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Od lewej do prawej"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Od prawej do lewej"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "Resetuj do góry"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "Zapamiętaj pozycję"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "Pasek przewijania"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Pokaż"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Ukryj"
 
@@ -3060,7 +3065,7 @@ msgstr "Ukryj"
 msgid "DJVU Reader"
 msgstr "Czytnik PDF"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "Czytnik PDF"
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 173d51b4a205a5b4f5955c6f9a50c7aade9f3cc9..7eb38494e7dd3c4bd773a10c42af68390b03960d 100644
GIT binary patch
delta 12686
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

delta 12879
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

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 10ddb0a83..8e06634e2 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -13,487 +13,487 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado, por favor recarregue a página"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Executando o desligamento do servidor, por favor feche a janela"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Reconexão bem-sucedida"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Página de Administração"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Configuração Básica"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Configuração de UI"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Editar Usuários"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Todos"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Usuário não encontrado"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} usuário(s) deletedos com sucesso"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Mostrar Tudo"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Requisição Malformada"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "Nome do Convidado não pode ser alterado"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "Convidado não pode ter esta função"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nenhum usuário administrador restante, impossível remover a função de administrador"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "Valor não pode ser Verdadeiro ou Falso"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Função Inválida"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "Convidado não pode ter esta visão"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "Visão Inválida"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "O idioma do Convidado é detectado automaticamente e não pode ser alterado"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "Nenhum Idioma Válido Fornecido"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "Nenhum Idioma do Livro Válido Fornecido"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Parametro não encontrado"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "Coluna Lido Inválida"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "Coluna Restrito Inválida"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Configuração do Calibre-Web atualizada"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Você realmente quer apagar a Kobo Token?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "Você realmente quer apagar este domínio?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "Você realmente quer apagar este usuário?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Tem certeza que quer apagar essa estante?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Tem certeza que quer alterar o idioma do(s) usuário(s) selecionados?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Tem certeza que quer alterar os idiomas de livros visíveis par o usuário(s) selecionado(s)?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Tem certeza que quer alterar a função selecionada para o(s) usuário(s) selecionado(s)?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Tem certeza que quer alterar as restriçõeo selecionada para o(s) usuário(s) selecionado(s)?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Tem certeza de que quer alterar as restrições de visibilidade selecionadas para os usuários selecionados?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Tem certeza de que quer alterar o comportamento de sincronização da estante para o usuário selecionado?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Tem certeza que queres alterar a localização da biblioteca Calibre?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr "O Calibre-Web buscará por Capas atualizadas e atualizará as Miniaturas de Capas, isso pode demorar um pouco"
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Tem certeza de que deseja apagar o banco de dados de sincronização do Calibre-Web para forçar uma sincronização completa com seu Kobo Reader?"
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Negar"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr "{} entradas de sincronização deletadas"
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Tag não encontrada"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Ação Inválida"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json Não Está Configurado para Aplicação Web"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log não é válida, digite o caminho correto"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log de acesso não é válida, digite o caminho correto"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Digite um provedor LDAP, porta, DN e identificador de objeto do usuário"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, digite uma Conta de Serviço LDAP e Senha"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "Por favor, digite uma Conta de Serviço LDAP"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de grupo LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de grupo LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de usuário LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de usuário LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de usuário membro do LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtro de usuário de membro LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Localização de LDAP CACertificate, Certificados ou Key Inválida, Insira o Caminho Correto"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Adicionar novo usuário"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Editar configurações do servidor de e-mail"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "Verificação da Conta Gmail com Sucesso"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "E-mail de teste enfileirado para envio para %(email)s, verifique o resultado em Tarefas"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocorreu um erro ao enviar o e-mail de teste: %(res)s"
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure seu endereço de e-mail primeiro..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Atualização das configurações do servidor de e-mail"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr "Editar configurações de tarefas agendadas"
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr "Hora de início inválida para a tarefa especificada"
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr "Duração inválida para a tarefa especificada"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr "Configurações de tarefas agendadas atualizadas"
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr "Settings DB não é gravável"
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuário %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Senha do usuário %(user)s redefinida"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Visualizador do Log"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Solicitação de pacote de atualização"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Baixando pacote de atualização"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Descompactando pacote de atualização"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Substituindo arquivos"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "As conexões à base de dados estão fechadas"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Parando servidor"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Atualização concluída, pressione okay e recarregue a página"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Atualização falhou:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Erro HTTP"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Erro de conexão"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Tempo limite durante o estabelecimento da conexão"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Erro geral"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr "Arquivo de atualização não pôde ser salvo no diretório temporário"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr "Arquivos não puderam ser substituídos durante a atualização"
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr "Falha ao extrair pelo menos um usuário LDAP"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Falha ao criar pelo menos um usuário LDAP"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erro: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erro: Nenhum usuário retornado na resposta do servidor LDAP"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "No mínimo um usuário LDAP não encontrado no banco de dados"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} Usuário Importado com Sucesso"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do banco de dados não é válida, digite o caminho correto"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "DB não é gravável"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Localização do Keyfile Inválida, Insira o Caminho Correto"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Localização do Certfile Inválida, Insira o Caminho Correto"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 msgid "Database Settings updated"
 msgstr "Configurações do Banco de Dados Atualizada"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "Configuração do Banco de Dados"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "O e-mail não é de um domínio válido"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuário '%(user)s' criado"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrada uma conta existente para este endereço de e-mail ou apelido."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuário '%(nick)s' excluído"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "Impossível excluir Convidado"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Nenhum usuário administrador restante, não é possível apagar o usuário"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuário '%(nick)s' atualizado"
@@ -506,20 +506,20 @@ msgstr "não instalado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "A Coluna Personalizada No.%(column)d não existe no banco de dados do calibre"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Nenhum"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oops! O Livro selecionado não está disponível. O arquivo não existe ou não é acessível"
 
@@ -737,7 +737,7 @@ msgstr "Erro ao renomear arquivo no caminho: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada uma conta existente para este endereço de e-mail."
 
@@ -816,7 +816,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -881,8 +881,9 @@ msgstr "Erro no Oauth do Google: {}"
 msgid "{} Stars"
 msgstr "{} Estrelas"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Login"
 
@@ -898,7 +899,7 @@ msgstr "O Token expirou"
 msgid "Success! Please return to your device"
 msgstr "Sucesso! Por favor, volte ao seu aparelho"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Livros"
 
@@ -923,7 +924,7 @@ msgstr "Livros Baixados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Livros Baixados"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Livros Mais Bem Avaliados"
 
@@ -932,7 +933,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar Livros Mais Bem Avaliados"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Livros Lidos"
 
@@ -941,7 +942,7 @@ msgid "Show read and unread"
 msgstr "Mostrar lido e não lido"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Livros Não Lidos"
 
@@ -959,7 +960,7 @@ msgid "Show Random Books"
 msgstr "Mostrar Livros Aleatórios"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Categorias"
 
@@ -969,7 +970,7 @@ msgstr "Mostrar seleção de categoria"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Série"
 
@@ -987,7 +988,7 @@ msgid "Show author selection"
 msgstr "Mostrar seleção de autor"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Editoras"
 
@@ -997,7 +998,7 @@ msgstr "Mostrar seleção de editoras"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -1021,7 +1022,7 @@ msgstr "Formatos de arquivo"
 msgid "Show file formats selection"
 msgstr "Mostrar seleção de formatos de arquivo"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Livros Arquivados"
 
@@ -1029,7 +1030,7 @@ msgstr "Livros Arquivados"
 msgid "Show archived books"
 msgstr "Mostrar livros arquivados"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Lista de Livros"
 
@@ -1039,7 +1040,7 @@ msgstr "Mostrar Lista de Livros"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Pesquisar"
@@ -1071,7 +1072,7 @@ msgstr "Status de leitura = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erro na pesquisa de colunas personalizadas, reinicie o Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
@@ -1121,7 +1122,7 @@ msgstr "O livro foi removido da estante: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Desculpe, você não tem permissão para remover um livro desta estante"
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Crie uma Estante"
 
@@ -1183,7 +1184,7 @@ msgstr "Estante: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erro ao abrir estante. A estante não existe ou não está acessível"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tarefas"
@@ -1245,139 +1246,140 @@ msgstr "Uma nova atualização está disponível. Clique no botão abaixo para a
 msgid "No release information available"
 msgstr "Não há informações de lançamento disponíveis"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Descobrir (Livros Aleatórios)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livros Quentess (Mais Baixados)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livros baixados por %(user)s"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editora: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr "Avaliação: Nenhuma"
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Avaliação: %(rating)s estrelas"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato do arquivo: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Lista de Avaliações"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Lista de formatos de arquivo"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ops! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail Envie Para o Kindle válido."
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Nome de Usuário ou Senha incorretos"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Nova Senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Você agora está logado como: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Perfil atualizado"
 
@@ -1427,7 +1429,7 @@ msgstr "Converter"
 msgid "Reconnecting Calibre database"
 msgstr "Reconectando banco de dados Calibre"
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -1455,7 +1457,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Limpando o cache de miniaturas da capa"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
 
@@ -1478,7 +1480,7 @@ msgstr "Endereço de e-mail"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Enviar para o endereço de e-mail do E-Reader"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1856,12 +1858,12 @@ msgstr "Data de Publicação"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Editora"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Idioma"
 
@@ -1911,8 +1913,8 @@ msgstr "Clique na capa para carregar os metadados para o formulário"
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Fechar"
@@ -2355,7 +2357,7 @@ msgstr "Nº de Livros Aleatórios a Exibir"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Nº de Autores a Exibir Antes de Esconder (0=Desativar Esconder)"
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Tema"
 
@@ -2452,49 +2454,51 @@ msgstr "Ler no Browser"
 msgid "Listen in Browser"
 msgstr "Ouvir no Browser"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Livro %(index)s de %(range)s"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Publicado em"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Marcar como Não Lido"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Marcar como Lido"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Lido"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Restaurar do arquivo"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Adicionar ao arquivo"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Arquivado"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Descrição:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Adicionar à estante"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Público)"
@@ -2543,7 +2547,7 @@ msgstr "Limite do Tamanho do Anexo"
 msgid "Save and Send Test E-mail"
 msgstr "Salvar e enviar e-mail de teste"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Voltar"
@@ -2569,12 +2573,13 @@ msgstr "Digite o nome do domínio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domínios Negados (Lista Negra)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Próximo"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Abra o arquivo .kobo/Kobo eReader.conf em um editor de texto e adicione (ou edite):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2585,19 +2590,19 @@ msgstr "Token Kobo:"
 msgid "List"
 msgstr "Lista"
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Instancia do Calibre-Web não configurado, por favor contacte o seu administrador"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Criar Issue"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Voltar para Início"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "Deslogar"
 
@@ -2687,7 +2692,7 @@ msgstr "Livros ordenados por Avaliação"
 msgid "Books ordered by file formats"
 msgstr "Livros ordenados por formatos de arquivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Estantes"
@@ -2696,60 +2701,60 @@ msgstr "Estantes"
 msgid "Books organized in shelves"
 msgstr "Livros organizados em Estantes"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Início"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Alternar Navegação"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Pesquisar na Biblioteca"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Enviando..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Erro"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Upload concluído, processando, por favor aguarde ..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Configurações"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Conta"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Sair"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Enviando..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Erro"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Upload concluído, processando, por favor aguarde ..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Configurações"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Por favor, não atualize a página"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Navegue em"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Sobre"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Anterior"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Detalhes do Livro"
 
@@ -2765,7 +2770,7 @@ msgstr "Lembre-se de mim"
 msgid "Forgot Password?"
 msgstr "Esqueceu a senha?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Entre com o Magic Link"
 
@@ -2873,23 +2878,23 @@ msgstr "Catálogo de e-books Calibre-Web"
 msgid "epub Reader"
 msgstr "leitor de epub"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Claro"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Escuro"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr "Sépia"
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 msgid "Black"
 msgstr "Preto"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Refluir o texto quando as barras laterais estiverem abertas."
 
@@ -2897,111 +2902,111 @@ msgstr "Refluir o texto quando as barras laterais estiverem abertas."
 msgid "Comic Reader"
 msgstr "Leitor de Quadrinhos"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de Teclado"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Página Anterior"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Página seguinte"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Dimensionar para Melhor"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Dimensionar para Largura"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Dimensionar para Altura"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Dimensionar para a Nativo"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Girar para direita"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Girar para esqueda"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Inverter Imagem"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Dimensionar"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Melhor"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Largura"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Altura"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Nativo"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Rodar"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Inverter"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Direção"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Esquerda para a direita"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Direita para a esquerda"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "Redefinir para o topo"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "Lembrar Posição"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "Barra de Rolagem"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Mostrar"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Esconder"
 
@@ -3009,7 +3014,7 @@ msgstr "Esconder"
 msgid "DJVU Reader"
 msgstr "leitor de DJVU"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr "Leitor de PDF"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index a5fd75912ac1c6d47edbd8c80dc88f08356c1697..fae63dd7aab48c6e51645417280996929f800521 100644
GIT binary patch
delta 8171
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

delta 8413
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
DWNVw1

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index cbf38da65..6c0a68604 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,498 +17,498 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, обновите страницу"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Успешно переподключено"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Настройка интерфейса"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Управление сервером"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Все"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Показать все"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Вы действительно хотите удалить Kobo Token ?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Запретить"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Разрешить"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json не настроен для веб-приложения"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Неправильное расположение файла журнала, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Недопустимое расположение файла журнала доступа, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Пожалуйста, введите провайдера LDAP, порт, DN и идентификатор объекта пользователя"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов группы LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов группы LDAP имеет незавершённые круглые скобки"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов пользователя LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов пользователя LDAP имеет незавершенную круглую скобку"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Ошибка: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Базы Данных неверно, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение ключевого файла неверно, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
@@ -521,20 +521,20 @@ msgstr "не установлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Нет"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
@@ -753,7 +753,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Этот адрес электронной почты уже зарегистрирован."
@@ -833,7 +833,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -898,8 +898,9 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Логин"
 
@@ -915,7 +916,7 @@ msgstr "Ключ просрочен"
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Книги"
 
@@ -940,7 +941,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
@@ -949,7 +950,7 @@ msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
@@ -958,7 +959,7 @@ msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
@@ -976,7 +977,7 @@ msgid "Show Random Books"
 msgstr "Показывать Случайные Книги"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Категории"
 
@@ -986,7 +987,7 @@ msgstr "Показывать выбор категории"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Серии"
 
@@ -1004,7 +1005,7 @@ msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Издатели"
 
@@ -1014,7 +1015,7 @@ msgstr "Показать выбор издателя"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Языки"
 
@@ -1038,7 +1039,7 @@ msgstr "Форматы файлов"
 msgid "Show file formats selection"
 msgstr "Показать выбор форматов файлов"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr ""
 
@@ -1046,7 +1047,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr ""
 
@@ -1056,7 +1057,7 @@ msgstr ""
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Поиск"
@@ -1088,7 +1089,7 @@ msgstr ""
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
@@ -1139,7 +1140,7 @@ msgstr "Книга удалена с полки: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Создать полку"
 
@@ -1203,7 +1204,7 @@ msgstr "Полка: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Задания"
@@ -1265,139 +1266,140 @@ msgstr "Новое обновление доступно. Нажмите на к
 msgid "No release information available"
 msgstr "Информация о выпуске недоступна"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Скачать"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Список рейтингов"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
@@ -1447,7 +1449,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1475,7 +1477,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Загрузить"
 
@@ -1499,7 +1501,7 @@ msgstr "Адрес электронной почты"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Отправить на Kindle Адрес электронной почты"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Управление"
@@ -1878,12 +1880,12 @@ msgstr "Опубликовано"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Издатель"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Язык"
 
@@ -1934,8 +1936,8 @@ msgstr "Нажмите на обложку, чтобы получить мета
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Закрыть"
@@ -2381,7 +2383,7 @@ msgstr "Количество отображаемых случайных кни
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Количество авторов для отображения перед скрытием (0 = отключить скрытие)"
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Тема"
 
@@ -2480,49 +2482,51 @@ msgstr "Читать"
 msgid "Listen in Browser"
 msgstr "Прослушать в браузере"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Опубликованный"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Отметить как непрочитанное"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Отметить как прочитанное"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Прочесть"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Описание:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Добавить на книжную полку"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Публичная)"
@@ -2571,7 +2575,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr "Сохранить настройки и отправить тестовое письмо"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Назад"
@@ -2597,12 +2601,13 @@ msgstr "Введите доменное имя"
 msgid "Denied Domains (Blacklist)"
 msgstr "Запрещенные домены (черный список)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Далее"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Откройте файл .kobo / Kobo eReader.conf в текстовом редакторе и добавьте (или отредактируйте):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2614,20 +2619,20 @@ msgstr "Kobo Sync Token"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Создать запись"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Вернуться на главную"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2717,7 +2722,7 @@ msgstr "Книги, упорядоченные по рейтингу"
 msgid "Books ordered by file formats"
 msgstr "Книги отсортированы по формату файла"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Полки"
@@ -2726,60 +2731,60 @@ msgstr "Полки"
 msgid "Books organized in shelves"
 msgstr "Книги организованы на полках"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Главная"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Включить навигацию"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Поиск в библиотеке"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Загружается..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Ошибка"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Настройки"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Учетная запись"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Выход"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Загружается..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Ошибка"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Настройки"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Пожалуйста не обновляйте страницу"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Просмотр"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "О программе"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Подробнее о книге"
 
@@ -2795,7 +2800,7 @@ msgstr "Запомнить меня"
 msgid "Forgot Password?"
 msgstr "Забыли пароль ?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Войти через магическую ссылку"
 
@@ -2905,24 +2910,24 @@ msgstr "Каталог электронных книг Caliber-Web"
 msgid "epub Reader"
 msgstr "PDF reader"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Светлая"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Темная"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Назад"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Обновить размещение текста при открытии боковой панели."
 
@@ -2931,111 +2936,111 @@ msgstr "Обновить размещение текста при открыти
 msgid "Comic Reader"
 msgstr "PDF reader"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Горячие клавиши"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Предыдущая страница"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Следующая страница"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Масштабировать до лучшего"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Масштабироваать по ширине"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Масштабировать по высоте"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Масштабировать до оригинала"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Повернуть Вправо"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Повернуть Влево"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Перевернуть изображение"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Масштаб"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Лучшее"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Ширина"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Длина"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Оригинальный"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Повернуть"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Перевернуть"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Горизонтально"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Вертикально"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Направление"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Слева направо"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Справа налево"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr ""
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr ""
 
@@ -3044,7 +3049,7 @@ msgstr ""
 msgid "DJVU Reader"
 msgstr "PDF reader"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "PDF reader"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index a934bd8de5609160a1424852231223f1a8399d10..95c96236c2d44e84563eb79554b4e395d9752975 100644
GIT binary patch
delta 10791
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
YJtoe>E4^vj?qg$5r0xE$e0$V?0e57O=l}o!

delta 10986
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
JHfwf8{09IW=wSc=

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 88faf43ec..fdd8b47bc 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,496 +16,496 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistik"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Server startas om, vänligen uppdatera sidan"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Stänger servern, vänligen stäng fönstret"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Återanslutning lyckades"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "Boken är i kö för att skicka till %(kindlemail)s"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Okänd"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Administrationssida"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Användargränssnitt konfiguration"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Redigera användare"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Alla"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Användaren hittades inte"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} användare har tagits bort"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Visa alla"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Felaktig begäran"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "Gästnamn kan inte ändras"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "Gäst kan inte ha den här rollen"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Ingen administratörsanvändare kvar, kan inte ta bort administratörsrollen"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "Värdet måste vara sant eller falskt"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Ogiltig roll"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "Gästen kan inte ha den här vyn"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "Ogiltig vy"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Gästens språk bestäms automatiskt och kan inte ställas in"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "Inget giltigt språk anges"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "Inget giltigt bokspråk anges"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Parameter hittades inte"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 #, fuzzy
 msgid "Invalid Read Column"
 msgstr "Ogiltig roll"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Vill du verkligen ta bort Kobo-token?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "Vill du verkligen ta bort den här domänen?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "Vill du verkligen ta bort den här användaren?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 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:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Är du säker på att du vill ändra språk för valda användare?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Är du säker på att du vill ändra synliga bokspråk för valda användare?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Är du säker på att du vill ändra den valda rollen för de valda användarna?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Är du säker på att du vill ändra de valda begränsningarna för de valda användarna?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Är du säker på att du vill ändra de valda synlighetsbegränsningarna för de valda användarna?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Är du säker på att du vill ändra den valda rollen för de valda användarna?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Förneka"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Tillåt"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Taggen hittades inte"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Ogiltig åtgärd"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json är inte konfigurerad för webbapplikation"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Loggfilens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Åtkomstloggplatsens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Vänligen ange en LDAP-leverantör, port, DN och användarobjektidentifierare"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-gruppobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-gruppobjektfilter har omatchande parentes"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-användarobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-användarobjektfilter har omatchad parentes"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Användarfilter för LDAP-medlemmar måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Användarfilter för LDAP-medlemmar har omatchad parentes"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 #, fuzzy
 msgid "Gmail Account Verification Successful"
 msgstr "Verifiering av G-mail-kontot lyckades"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Databasfel: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testa e-post i kö för att skicka till %(email)s, vänligen kontrollera Uppgifter för resultat"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Uppdateringsfilen kunde inte sparas i Temp Dir"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fel: %(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fel: Ingen användare återges som svar på LDAP-servern"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minst en LDAP-användare hittades inte i databasen"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} användare har importerats"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "DB-plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "DB är inte skrivbar"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Keyfile-platsen är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Certfile-platsen är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Hittade ett befintligt konto för den här e-postadressen eller namnet."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "Det går inte att ta bort gästanvändaren"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
@@ -518,20 +518,20 @@ msgstr "inte installerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Ingen"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 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"
 
@@ -750,7 +750,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
@@ -830,7 +830,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -895,8 +895,9 @@ msgstr "Google Oauth-fel: {}"
 msgid "{} Stars"
 msgstr "{} stjärnor"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Logga in"
 
@@ -912,7 +913,7 @@ msgstr "Token har löpt ut"
 msgid "Success! Please return to your device"
 msgstr "Lyckades! Vänligen återvänd till din enhet"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Böcker"
 
@@ -937,7 +938,7 @@ msgstr "Hämtade böcker"
 msgid "Show Downloaded Books"
 msgstr "Visa hämtade böcker"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Bäst rankade böcker"
 
@@ -946,7 +947,7 @@ msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Lästa böcker"
 
@@ -955,7 +956,7 @@ msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
@@ -973,7 +974,7 @@ msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -983,7 +984,7 @@ msgstr "Visa kategorival"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Serier"
 
@@ -1001,7 +1002,7 @@ msgid "Show author selection"
 msgstr "Visa författarval"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Förlag"
 
@@ -1011,7 +1012,7 @@ msgstr "Visa urval av förlag"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Språk"
 
@@ -1035,7 +1036,7 @@ msgstr "Filformat"
 msgid "Show file formats selection"
 msgstr "Visa val av filformat"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Arkiverade böcker"
 
@@ -1043,7 +1044,7 @@ msgstr "Arkiverade böcker"
 msgid "Show archived books"
 msgstr "Visa arkiverade böcker"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Boklista"
 
@@ -1053,7 +1054,7 @@ msgstr "Visa boklista"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Sök"
@@ -1085,7 +1086,7 @@ msgstr "Lässtatus = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
@@ -1136,7 +1137,7 @@ msgstr "Boken har tagits bort från hyllan: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Skapa en hylla"
 
@@ -1200,7 +1201,7 @@ msgstr "Hylla: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Uppgifter"
@@ -1262,139 +1263,140 @@ msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att up
 msgid "No release information available"
 msgstr "Ingen versionsinformation tillgänglig"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Hämtade böcker av %(user)s"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Hämtningar"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Betygslista"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, 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:1208
+#: cps/web.py:1209
 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:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
@@ -1444,7 +1446,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1472,7 +1474,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -1496,7 +1498,7 @@ msgstr "E-post"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administratör"
@@ -1875,12 +1877,12 @@ msgstr "Publiceringsdatum"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Förlag"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Språk"
 
@@ -1931,8 +1933,8 @@ msgstr "Klicka på omslaget för att läsa in metadata till formuläret"
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Stäng"
@@ -2378,7 +2380,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:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Tema"
 
@@ -2477,49 +2479,51 @@ msgstr "Läs i webbläsaren"
 msgid "Listen in Browser"
 msgstr "Lyssna i webbläsaren"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Publicerad"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Markera som oläst"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Markera som läst"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Läst"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Återställ från arkivet"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Lägg till i arkivet"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Arkiverad"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Lägg till hyllan"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Publik)"
@@ -2569,7 +2573,7 @@ msgstr "Gräns för bilagestorlek"
 msgid "Save and Send Test E-mail"
 msgstr "Spara inställningarna och skicka test-e-post"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Tillbaka"
@@ -2595,12 +2599,13 @@ msgstr "Ange domännamn"
 msgid "Denied Domains (Blacklist)"
 msgstr "Avvisade domäner för registrering"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Nästa"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/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/generate_kobo_auth_url.html:11
@@ -2612,20 +2617,20 @@ msgstr "Kobo Sync Token"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "Skapa ärende"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Tillbaka till hemmet"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2715,7 +2720,7 @@ msgstr "Böcker sorterade efter Betyg"
 msgid "Books ordered by file formats"
 msgstr "Böcker ordnade av filformat"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Hyllor"
@@ -2724,60 +2729,60 @@ msgstr "Hyllor"
 msgid "Books organized in shelves"
 msgstr "Böcker organiserade i hyllor"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Hem"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Växla navigering"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Sök i bibliotek"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Laddar upp..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Fel"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Inställningar"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Konto"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Logga ut"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Laddar upp..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Fel"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Inställningar"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Vänligen uppdatera inte sidan"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Bläddra"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Om"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Föregående"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
@@ -2793,7 +2798,7 @@ msgstr "Kom ihåg mig"
 msgid "Forgot Password?"
 msgstr "Glömt lösenord?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Logga in med magisk länk"
 
@@ -2902,24 +2907,24 @@ msgstr "Calibre-Web e-bokkatalog"
 msgid "epub Reader"
 msgstr "PDF-läsare"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Ljust"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Mörkt"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Tillbaka"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Fyll i texten igen när sidofält är öppna."
 
@@ -2928,111 +2933,111 @@ msgstr "Fyll i texten igen när sidofält är öppna."
 msgid "Comic Reader"
 msgstr "PDF-läsare"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Kortkommandon"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Föregående sida"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Nästa sida"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "Skala till bäst"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Skala till bredd"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Skala till höjd"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Skala till ursprunglig"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Vänd bilden"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Skala"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Bäst"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Bredd"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Höjd"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Ursprunglig"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Rotera"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Vänd"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Horisontell"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Riktning"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Vänster till höger"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Höger till vänster"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr ""
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr ""
 
@@ -3041,7 +3046,7 @@ msgstr ""
 msgid "DJVU Reader"
 msgstr "PDF-läsare"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "PDF-läsare"
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 92518e7b101447bf5ec033319cbaf676d5103398..f466c7f7de2eee37e95dedf64efcee17589eb107 100644
GIT binary patch
delta 37
tcmX@QhVkec#tm^syhgf4rV54zRz^nJ28NrnjRY8(4fPB**BKvI0s!6>3gZ9(

delta 37
tcmX@QhVkec#tm^syau`kMhZrTR)$8}21c8+jRY8(4fKpR*BKvI0s!5X3g7?$

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 1d37e1645..fec600047 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,492 +16,492 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "İstatistikler"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Sunucu yeniden başlatıldı, lütfen sayfayı yeniden yükleyin"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Sunucu kapatıyor, lütfen pencereyi kapatın"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "%(kindlemail)s'a gönderilmek üzere başarıyla sıraya alındı"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Yönetim sayfası"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Temel Ayarlar"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Arayüz Ayarları"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr ""
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Tümü"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, 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:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 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:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "Bağlantı kurulmaya çalışırken zaman aşımına uğradı"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "'%(user)s' kullanıcısı oluşturuldu"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Kullanıcı '%(nick)s' silindi"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
@@ -514,20 +514,20 @@ msgstr "yüklü değil"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Hiçbiri"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -746,7 +746,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bu e-posta adresi için bir hesap mevcut."
@@ -825,7 +825,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -890,8 +890,9 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Giriş"
 
@@ -907,7 +908,7 @@ msgstr "Token süresi doldu"
 msgid "Success! Please return to your device"
 msgstr "Başarılı! Lütfen cihazınıza dönün"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "eKitaplar"
 
@@ -932,7 +933,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr ""
 
@@ -941,7 +942,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Okunanlar"
 
@@ -950,7 +951,7 @@ msgid "Show read and unread"
 msgstr "Okunan ve okunmayanları göster"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Okunmamışlar"
 
@@ -968,7 +969,7 @@ msgid "Show Random Books"
 msgstr "Rastgele Kitap Göster"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -978,7 +979,7 @@ msgstr "Kategori seçimini göster"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Seriler"
 
@@ -996,7 +997,7 @@ msgid "Show author selection"
 msgstr "Yazar seçimini göster"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Yayıncılar"
 
@@ -1006,7 +1007,7 @@ msgstr "Yayıncı seçimini göster"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Diller"
 
@@ -1030,7 +1031,7 @@ msgstr "Biçimler"
 msgid "Show file formats selection"
 msgstr "Dosya biçimi seçimini göster"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr ""
 
@@ -1038,7 +1039,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr ""
 
@@ -1048,7 +1049,7 @@ msgstr ""
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Ara"
@@ -1080,7 +1081,7 @@ msgstr ""
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
@@ -1131,7 +1132,7 @@ msgstr "eKitap kitaplıktan silindi: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Kitaplık oluştur"
 
@@ -1195,7 +1196,7 @@ msgstr "Kitaplık: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Görevler"
@@ -1257,139 +1258,140 @@ msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdak
 msgid "No release information available"
 msgstr "Sürüm bilgisi mevcut değil"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Keşfet (Rastgele)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Yazar: %(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Yayınevi: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Değerlendirme listesi"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Biçim listesi"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, 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:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 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/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 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:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
@@ -1439,7 +1441,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1467,7 +1469,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Yükleme"
 
@@ -1491,7 +1493,7 @@ msgstr ""
 msgid "Send to E-Reader E-mail Address"
 msgstr "E-Posta adresiniz"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Yönetim"
@@ -1870,12 +1872,12 @@ msgstr ""
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Yayınevi"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Dil"
 
@@ -1926,8 +1928,8 @@ msgstr "Forma metaveri yüklemek için kapağa tıklayın"
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Kapak"
@@ -2372,7 +2374,7 @@ msgstr ""
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Tema"
 
@@ -2470,49 +2472,51 @@ msgstr ""
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Okunmadı olarak işaretle"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Okundu olarak işaretle"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Okudum"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Açıklama:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Kitaplığa ekle"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
@@ -2561,7 +2565,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr ""
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Geri"
@@ -2587,12 +2591,12 @@ msgstr "Servis adı girin"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Sonraki"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2603,20 +2607,20 @@ msgstr ""
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 #, fuzzy
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "E-Posta sunucusu ayarlanmadı, lütfen yöneticinizle iletişime geçin!"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr ""
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2706,7 +2710,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr "Biçime göre sıralanmış eKitaplar"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2715,60 +2719,60 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Anasayfa"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr ""
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Yükleniyor..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Hata"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Ayarlar"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Hesap"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Çıkış"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Yükleniyor..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Hata"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Gözat"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Hakkında"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Önceki"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "eKitap Detayları"
 
@@ -2784,7 +2788,7 @@ msgstr ""
 msgid "Forgot Password?"
 msgstr ""
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr ""
 
@@ -2894,24 +2898,24 @@ msgstr ""
 msgid "epub Reader"
 msgstr "PDF Okuyucu"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Açık"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Koyu"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Geri"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Kenar çubukları açıkken metni kaydır"
 
@@ -2920,111 +2924,111 @@ msgstr "Kenar çubukları açıkken metni kaydır"
 msgid "Comic Reader"
 msgstr "PDF Okuyucu"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Klavye Kısayolları"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Önceki Sayfa"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "En İyiye Ölçeklendir"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "Genişliğe Ölçeklendir"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "Yüksekliğe Ölçeklendir"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "Asıla göre ölçeklendir"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Sağa çevir"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Sola çevir"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Resmi döndir"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "Ölçeklendir"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "En İyi"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Genişlik"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Yükseklik"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "Asıl"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Çevir"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Döndür"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Yatay"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Dikey"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Yön"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Soldan Sağa"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Sağdan Sola"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr ""
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr ""
 
@@ -3033,7 +3037,7 @@ msgstr ""
 msgid "DJVU Reader"
 msgstr "PDF Okuyucu"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 #, fuzzy
 msgid "PDF Reader"
 msgstr "PDF Okuyucu"
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 81e1667aa5202c183d29518b92f724a26ae13e46..4edeb2ecd1d69e6abb09e6cf746aaed95e414d78 100644
GIT binary patch
delta 37
tcmcb)hw<hf#tkewyhgf4rV54zRz^nJ28Npjby66a4fPB*SLi-8007&O3flkx

delta 37
tcmcb)hw<hf#tkewyau`kMhZrTR)$8}21c6&by66a4fKpRSLi-8007$(3fKSu

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 0589bc4fc..ddbb03d8a 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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+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,493 +15,493 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезавантажено, будь-ласка, перезавантажте сторінку"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Виконується зупинка серверу, будь-ласка, закрийте вікно"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Підключення успішне"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Невідома команда"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 msgid "Books successfully queued for Metadata Backup"
 msgstr ""
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Сторінка адміністратора"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 #, fuzzy
 msgid "Edit Users"
 msgstr "Керування сервером"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Всі"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Користувача не знайдено"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} користувачі видалені успішно"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Показати всі"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Не правильна роль"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 #, fuzzy
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 #, fuzzy
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 #, fuzzy
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 #, fuzzy
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Заборонити"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Дозволити"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Тег не знайдено"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "Заміна файлів"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Сервер зупиняється"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Оновлення неуспішне:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP помилка"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Помилка зʼєднання"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Помилка"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
@@ -514,20 +514,20 @@ msgstr "не встановлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "Ні"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
@@ -746,7 +746,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -889,8 +889,9 @@ msgstr ""
 msgid "{} Stars"
 msgstr "{} зірок"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -906,7 +907,7 @@ msgstr "Час дії токено вичерпано"
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Книжки"
 
@@ -931,7 +932,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Книги з найкращим рейтингом"
 
@@ -940,7 +941,7 @@ msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Прочитані книги"
 
@@ -949,7 +950,7 @@ msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
@@ -967,7 +968,7 @@ msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Категорії"
 
@@ -977,7 +978,7 @@ msgstr "Показувати вибір категорії"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Серії"
 
@@ -995,7 +996,7 @@ msgid "Show author selection"
 msgstr "Показувати вибір автора"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Видавництва"
 
@@ -1005,7 +1006,7 @@ msgstr ""
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Мови"
 
@@ -1029,7 +1030,7 @@ msgstr "Формати файлів"
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Архівні книжки"
 
@@ -1037,7 +1038,7 @@ msgstr "Архівні книжки"
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Список книжок"
 
@@ -1047,7 +1048,7 @@ msgstr ""
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Пошук"
@@ -1079,7 +1080,7 @@ msgstr ""
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
@@ -1130,7 +1131,7 @@ msgstr "Книга видалена з книжкової полиці: %(sname)
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "створити книжкову полицю"
 
@@ -1193,7 +1194,7 @@ msgstr "Книжкова полиця: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Завдання"
@@ -1255,139 +1256,140 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Видавництво: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr "Рейтинг: Відсутній"
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Рейтинг: %(rating)s зірок"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файлу: %(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Завантаження"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Список рейтингів"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Список форматів файлу"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
@@ -1437,7 +1439,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1465,7 +1467,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Додати нову книгу"
 
@@ -1489,7 +1491,7 @@ msgstr ""
 msgid "Send to E-Reader E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Адмін"
@@ -1868,12 +1870,12 @@ msgstr "Опубліковано"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Видавець"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Мова"
 
@@ -1924,8 +1926,8 @@ msgstr "Натисніть на обкладинку, щоб отримати м
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Закрити"
@@ -2369,7 +2371,7 @@ msgstr "Кількість показаних випадкових книг"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "Тема"
 
@@ -2468,49 +2470,51 @@ msgstr "Відкрити в браузері"
 msgid "Listen in Browser"
 msgstr "Прослухати в браузері"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Опубліковано"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Відмітити як не прочитане"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Відмітити як прочитане"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Прочитано"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Відновити з архіву"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Додати в архів"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Заархівовано"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Опис:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Додати на книжкову полицю"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Публічно)"
@@ -2559,7 +2563,7 @@ msgstr "Обмеження розміру вкладення"
 msgid "Save and Send Test E-mail"
 msgstr "Зберегти налаштування і відправити тестове повідомлення"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Назад"
@@ -2585,12 +2589,12 @@ msgstr "Введіть домен"
 msgid "Denied Domains (Blacklist)"
 msgstr "Заборонені домени (Чорний список)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Далі"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2601,19 +2605,19 @@ msgstr ""
 msgid "List"
 msgstr "Список"
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr ""
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2703,7 +2707,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2712,60 +2716,60 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "Включити навігацію"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Завантаження..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Помилка"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr ""
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Налаштування"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Вийти"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Завантаження..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Помилка"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr ""
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Налаштування"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Перегляд"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "Про програму"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Попередній перегляд"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Деталі"
 
@@ -2781,7 +2785,7 @@ msgstr "Запам'ятати мене"
 msgid "Forgot Password?"
 msgstr ""
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Увійдіть в систему за допомогою magic link"
 
@@ -2890,24 +2894,24 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr ""
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Назад"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "Переформатувати текст, коли відкриті бічні панелі."
 
@@ -2915,111 +2919,111 @@ msgstr "Переформатувати текст, коли відкриті б
 msgid "Comic Reader"
 msgstr ""
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Краще"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Ширина"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Висота"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Повернути"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Вертикально"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Напрям"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Показати"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Сховати"
 
@@ -3027,7 +3031,7 @@ msgstr "Сховати"
 msgid "DJVU Reader"
 msgstr ""
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr ""
 
diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po
index bd01ecb39..75a87c2a9 100644
--- a/cps/translations/vi/LC_MESSAGES/messages.po
+++ b/cps/translations/vi/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2022-09-20 21:36+0700\n"
 "Last-Translator: Ha Link <halink0803@gmail.com>\n"
 "Language: vi\n"
@@ -13,487 +13,487 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Thống kê"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "Máy chủ đã khởi động lại,hãy tải lại trang"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "Máy chủ đang được tắt, hãy đóng cửa sổ này"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "Kết nối lại thành công"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Lệnh không tồn tại"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 msgid "Books successfully queued for Metadata Backup"
 msgstr ""
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "Trang admin"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "Thiết lập cơ bản"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "Thiết lập UI"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "Chỉnh sửa người dùng"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "Tất cả"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "Không tìm thấy user"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "{} người dung đã đươc xoá thành công"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "Hiển thị tất cả"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "Yêu cầu không đúng định dạng"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "Tên người dung khách không thể thay đổi"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "Khách không thể mang vai trò này"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Không còn người dùng quản trị, không thể xoá vai trò admin"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "Giá trị phải là true hoặc false"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "Vai trò không hợp lệ"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "Tài khoản khách không có màn hình này"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "View không hợp lệ"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "Ngôn ngữ của khách được xác định tự động và không thể đặt được"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "Địa chỉ cung cấp không hợp lệ"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "Ngôn ngữ sách không hợp lệ"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "Tham số không tồn tại"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "Cột đọc không hợp lệ"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "Cột bị hạn chế không hợp lệ"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Thiết lập Calibre-Web đã cập nhật"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Bạn có thực sự muốn xóa Kobo Token không?"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "Bạn có thực sự muốn xóa miền này không?"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "Bạn có thực sự muốn xóa người dùng này không?"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Bạn có chắc chắn muốn xóa giá này không?"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "Bạn có chắc chắn muốn thay đổi ngôn ngữ của những người dùng đã chọn?"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "Bạn có chắc chắn muốn thay đổi ngôn ngữ sách hiển thị cho (những) người dùng đã chọn không?"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "Bạn có chắc chắn muốn thay đổi vai trò đã chọn cho (những) người dùng đã chọn không?"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "Bạn có chắc chắn muốn thay đổi những giới hạn đã chọn cho người dung?"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "Bạn có chắc chắn muốn thay đổi các giới hạn hiển thị đã chọn cho (những) người dùng đã chọn không?"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "Bạn có chắc chắn muốn thay đổi hành vi đồng bộ hóa giá cho (những) người dùng đã chọn không?"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Bạn có chắc chắn muốn thay đổi vị trí thư viện Calibre không?"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "Bạn có chắc chắn muốn xóa cơ sở dữ liệu đồng bộ của Calibre-Web để bắt buộc đồng bộ hóa hoàn toàn với Kobo Reader của mình không?"
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Từ chối"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Cho phép"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr "{} mục nhập đồng bộ hóa đã bị xóa"
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "Tag không tồn tại"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "Hành động không hợp lệ"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Vị trí tệp nhật ký không hợp lệ, vui lòng nhập đường dẫn chính xác"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "Thêm người dùng mới"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Lỗi cơ sở dữ liệu: %(error)s."
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 #, fuzzy
 msgid "Scheduled tasks settings updated"
 msgstr "Thiết lập cơ sở dữ lieu đã được cập nhật"
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "Lỗi không xác định xảy ra. Xin hãy thử lại sau."
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Chỉnh sửa người dùng %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "Đang giải nén tệp cập nhật"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "They thế tập tin"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "Liên kết cơ sở dữ liệu đã được đóng"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "Đang dừng server"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "Cập nhật hoàn tất, ấn okay và tải lại trang"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "Cập nhật thất bại:"
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "Lỗi HTTP"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "Lỗi kết nối"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "Lỗi chung"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr "File cập nhật không thể được lưu trong thư mục tạm thời"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 msgid "Database Settings updated"
 msgstr "Thiết lập cơ sở dữ lieu đã được cập nhật"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "Thiết lập cơ sở dữ lieu :)))"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "Hãy điền hết các trường!"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "Địa chỉ email không hợp lệ"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Người dùng '%(user)s' đã được tạo"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Người dùng với địa chỉ email hoặc tên đã tồn tại."
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Người dùng '%(nick)s' đã bị xoá"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "Không thể xoá người dùng khách"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Người dùng '%(nick)s' đã được cập nhật"
@@ -506,20 +506,20 @@ msgstr "chưa cài đặt"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "None"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -738,7 +738,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Không tìm thấy được dẫn sách %(path)s trên Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "Tìm thấy một tài khoản đã toàn tại cho địa chỉ email này"
 
@@ -816,7 +816,7 @@ msgstr "Thiết lập Kobo"
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -881,8 +881,9 @@ msgstr "Google Oauth lỗi: {}"
 msgid "{} Stars"
 msgstr "{} sao"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "Đăng nhập"
 
@@ -898,7 +899,7 @@ msgstr "Token đã hết hạn"
 msgid "Success! Please return to your device"
 msgstr "Thành công! Hãy quay lại thiết bị của bạn"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "Sách"
 
@@ -923,7 +924,7 @@ msgstr "Sách đã tải"
 msgid "Show Downloaded Books"
 msgstr "Hiển thị sách đã tải"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "Top sách được đánh giá cao"
 
@@ -932,7 +933,7 @@ msgid "Show Top Rated Books"
 msgstr "Hiện thị top những sách được đánh giá cao"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "Sách đã đọc"
 
@@ -941,7 +942,7 @@ msgid "Show read and unread"
 msgstr "Hiển thị đã đọc và chưa đọc"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "Sách chưa đọc"
 
@@ -959,7 +960,7 @@ msgid "Show Random Books"
 msgstr "Hiển thị sách ngẫu nhiên"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "Chủ đề"
 
@@ -969,7 +970,7 @@ msgstr "Hiển thị chọn chủ đề"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "Series"
 
@@ -987,7 +988,7 @@ msgid "Show author selection"
 msgstr "Hiển thị chọn tác giả"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "Nhà phát hành"
 
@@ -997,7 +998,7 @@ msgstr "Hiển thị chọn nhà phát hành"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "Ngôn ngữ"
 
@@ -1021,7 +1022,7 @@ msgstr "Định dạng file"
 msgid "Show file formats selection"
 msgstr "Hiển thị lựa chọn định dạng file"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Sách đã lưu trữ"
 
@@ -1029,7 +1030,7 @@ msgstr "Sách đã lưu trữ"
 msgid "Show archived books"
 msgstr "Hiện thị sách trong kho"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "Danh sách sách"
 
@@ -1039,7 +1040,7 @@ msgstr "Hiển thị danh sách sách"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Tìm kiếm"
@@ -1071,7 +1072,7 @@ msgstr "Trạng thái đọc = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "Tìm kiếm nâng cao"
 
@@ -1121,7 +1122,7 @@ msgstr "Sách đã được xoá khỏi giá: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Xin lỗi bạn không có quyền xoá sách khỏi giá này"
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "Tạo một giá sách"
 
@@ -1183,7 +1184,7 @@ msgstr ""
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Nhiệm vụ"
@@ -1246,140 +1247,141 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:611
+#: cps/web.py:612
 #, fuzzy
 msgid "Rating: None"
 msgstr "Đánh giá cao hơn"
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "Tải xuống"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "Danh sách đánh giá"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "Danh sách định dạng file"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "Đăng ký"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "Email của bạn không được cho phép để đăng ký"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Không thể đăng nhập: %(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "Tên đăng nhập hoặc mật khẩu không đúng"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "Mật khẩu mới đã được gửi đến email của bạn"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr ""
 
@@ -1431,7 +1433,7 @@ msgstr "Khám phá"
 msgid "Reconnecting Calibre database"
 msgstr "Kết nối lại với cơ sở dữ liệu Calibre"
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 #, fuzzy
 msgid "E-mail"
 msgstr "Test e-mail"
@@ -1459,7 +1461,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Tải lên"
 
@@ -1483,7 +1485,7 @@ msgstr "Địa chỉ email"
 msgid "Send to E-Reader E-mail Address"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1863,12 +1865,12 @@ msgstr "Ngày xuất bản"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "Nhà xuất bản"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Ngôn ngữ"
 
@@ -1918,8 +1920,8 @@ msgstr "Ấn vào ảnh cover để tải metadata vào form"
 msgid "Loading..."
 msgstr "Đang tải..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Đóng"
@@ -2362,7 +2364,7 @@ msgstr ""
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr ""
 
@@ -2459,49 +2461,51 @@ msgstr "Đọc trên trình duyệt"
 msgid "Listen in Browser"
 msgstr "Nghe trên trình duyệt"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "Sách %(index)s của %(range)s"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "Đã phát hành"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "Đánh dấu chưa đọc"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "Đánh dấu đã đọc"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "Đọc"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "Khôi phục từ lưu trữ"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "Thêm vào lưu trữ"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "Lưu trữ"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "Mô tả:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Thêm vào giá sách"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(Công khai)"
@@ -2550,7 +2554,7 @@ msgstr "Giới hạn kích thước file đính kèm"
 msgid "Save and Send Test E-mail"
 msgstr "Lưu và gửi test E-mail"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "Quay lại"
@@ -2576,12 +2580,12 @@ msgstr "Nhập tên domain"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domain bị từ chối (Blacklist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "Tiếp tục"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2593,19 +2597,19 @@ msgstr "Token đồng bộ Kobo"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr ""
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "Quay về trang chủ"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2695,7 +2699,7 @@ msgstr "Sách sắp xếp theo xếp hạng"
 msgid "Books ordered by file formats"
 msgstr "Sách sắp xếp theo định dạng"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Giá sách"
@@ -2704,60 +2708,60 @@ msgstr "Giá sách"
 msgid "Books organized in shelves"
 msgstr "Sách tổ chức theo giá sách"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "Trang chủ"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr ""
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "Tìm kiếm thư viện"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "Đang tải lên..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "Lỗi"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "Tải lên xong, đang xử lý, đợi chút ..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "Thiết lập"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "Tài khoản"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "Đăng suất"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Đang tải lên..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Lỗi"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Tải lên xong, đang xử lý, đợi chút ..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Thiết lập"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "Làm ơn đừng load lại trang"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "Tìm kiếm"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "About"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "Trước"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "Chi tiết sách"
 
@@ -2773,7 +2777,7 @@ msgstr "Ghi nhớ tôi"
 msgid "Forgot Password?"
 msgstr "Quên mật khẩu?"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "Đăng nhập với Magic Link"
 
@@ -2881,24 +2885,24 @@ msgstr ""
 msgid "epub Reader"
 msgstr "trình đọc epub"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Sáng"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Tối"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "Quay lại"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
@@ -2906,111 +2910,111 @@ msgstr ""
 msgid "Comic Reader"
 msgstr "Trình đọc truyện tranh"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "Phím tắt"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "Trang trước"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "Trang tiếp theo"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "Xoay phải"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "Xoay trái"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "Lật ảnh"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "Tốt nhất"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "Rộng"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "Cao"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "Xoay"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "Lật"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "Ngang"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "Dọc"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "Hướng"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "Trái sang phải"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "Phải sang trái"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "Quay lên trên"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "Ghi nhớ vị trí"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "Thanh cuộn"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "Hiện"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "Ẩn"
 
@@ -3018,7 +3022,7 @@ msgstr "Ẩn"
 msgid "DJVU Reader"
 msgstr "Trình đọc DJVU"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr "Trình đọc PDF"
 
@@ -3365,3 +3369,6 @@ msgstr "Hiển thị đã đọc và chưa đọc"
 msgid "Show random books"
 msgstr "Hiển thị sách ngẫu nhiên"
 
+#~ msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#~ msgstr ""
+
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 8dfd17686d7c2a738fc3c2a8a7c563190fa19cd8..3f54bef0a10a2b6e1f8b3ae834536603ad9196c8 100644
GIT binary patch
delta 12783
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
DOe7!W

delta 12949
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
anY;4(p4mmSm$>(?@0pXe<D;FmV*eLDpkU?z

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index b86b60418..e40c3b0be 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,486 +16,486 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "重新连接成功"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 msgid "Books successfully queued for Metadata Backup"
 msgstr "书籍已为元数据备份排队"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "管理用户"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "找不到用户"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "成功删除 {} 个用户"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "显示全部"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "格式错误的请求"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "访客名称无法更改"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "游客无法拥有此角色"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "没有其余管理员账户，无法删除管理员角色"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "值必须是 true 或 false"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "无效角色"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "游客无法拥有此视图"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "无效视图"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "游客的本地化是自动侦测而无法设置的"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "无可用本地化"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "无有效书籍语言"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "参数未找到"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "无效的阅读列"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "无效的限制列"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "您确定删除Kobo Token吗？"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "您确定要删除此域吗？"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "您确定要删除此用户吗？"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您确定要删除此书架吗？"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "您确定要修改选定用户的本地化设置吗？"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "您确定要修改选定用户的可见书籍语言吗？"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定角色吗？"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定限制吗？"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定可视化限制吗？"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "您确定要更改所选用户的书架同步行为吗？"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "您确定要更改 Calibre 库位置吗？"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr "Calibre-Web 将搜索更新封面，并更新缩略图，这可能需要一段时间"
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr "您确定要删除 Calibre-Web 的同步数据库以强制与您的 Kobo Reader 进行完全同步吗"
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒绝"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允许"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr "{} 同步项目被删除"
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "标签未找到"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "无效的动作"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "请输入一个LDAP服务账号和密码 "
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "请输入一个LDAP服务账号"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成员用户过滤器需要有一个“%s”格式标识符"
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成员用户过滤器中有不匹配的括号"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail账号校验成功"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr "编辑计划任务设置"
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr "指定任务的开始时间无效"
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr "指定任务的持续时间无效"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr "已更新计划任务设置"
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写"
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件无法保存在临时目录中"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr "更新期间无法替换文件"
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一个LDAP用户"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能创建至少一个LDAP用户"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "错误：%(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "错误：在LDAP服务器的响应中没有返回用户"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "数据库中没有找到至少一个LDAP用户"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} 用户被成功导入"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "数据库路径无效，请输入正确的路径"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "数据库不可写入"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密钥文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 msgid "Database Settings updated"
 msgstr "数据库设置已更新"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户“%(user)s”已创建"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此邮箱或用户名的账号已经存在。"
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户“%(nick)s”已删除"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "无法删除游客用户"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr "电子邮件地址不能为空，并且必须是有效的电子邮件"
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
@@ -508,20 +508,20 @@ msgstr "未安装"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "无"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
@@ -739,7 +739,7 @@ msgstr "重命名此路径: {}文件时出错"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
@@ -816,7 +816,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -881,8 +881,9 @@ msgstr "Google Oauth 错误: {}"
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "登录"
 
@@ -898,7 +899,7 @@ msgstr "Token已过期"
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "书籍"
 
@@ -923,7 +924,7 @@ msgstr "下载历史"
 msgid "Show Downloaded Books"
 msgstr "显示下载过的书籍"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
@@ -932,7 +933,7 @@ msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "已读书籍"
 
@@ -941,7 +942,7 @@ msgid "Show read and unread"
 msgstr "显示阅读状态"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "未读书籍"
 
@@ -959,7 +960,7 @@ msgid "Show Random Books"
 msgstr "显示随机书籍"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "分类"
 
@@ -969,7 +970,7 @@ msgstr "显示分类选择"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "丛书"
 
@@ -987,7 +988,7 @@ msgid "Show author selection"
 msgstr "显示作者选择"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "出版社"
 
@@ -997,7 +998,7 @@ msgstr "显示出版社选择"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "语言"
 
@@ -1021,7 +1022,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "归档书籍"
 
@@ -1029,7 +1030,7 @@ msgstr "归档书籍"
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "书籍列表"
 
@@ -1039,7 +1040,7 @@ msgstr "显示书籍列表"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "搜索"
@@ -1071,7 +1072,7 @@ msgstr "阅读状态 = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "高级搜索"
 
@@ -1121,7 +1122,7 @@ msgstr "此书已从书架 %(sname)s 中删除"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "抱歉，您没有从这个书架删除书籍的权限"
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "创建书架"
 
@@ -1183,7 +1184,7 @@ msgstr "书架：%(name)s"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "任务列表"
@@ -1245,139 +1246,140 @@ msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "无可用发布信息"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下载过的书籍"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr "评分：无"
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "下载次数"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1427,7 +1429,7 @@ msgstr "转换"
 msgid "Reconnecting Calibre database"
 msgstr "正在重新连接到Calibre数据库"
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr "电子邮件"
 
@@ -1454,7 +1456,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "正在清理封面缩略图缓存"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "上传书籍"
 
@@ -1477,7 +1479,7 @@ msgstr "邮箱地址"
 msgid "Send to E-Reader E-mail Address"
 msgstr "接收书籍的电子阅读器邮箱地址"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理权限"
@@ -1855,12 +1857,12 @@ msgstr "出版日期"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "语言"
 
@@ -1910,8 +1912,8 @@ msgstr "单击封面将元数据加载到表单"
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "关闭"
@@ -2354,7 +2356,7 @@ msgstr "随机书籍显示数量"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "主页中书籍作者的最大显示数量（0=不隐藏）"
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "主题"
 
@@ -2451,49 +2453,51 @@ msgstr "在线阅读"
 msgid "Listen in Browser"
 msgstr "在线听书"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "%(range)s 第%(index)s册"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "出版日期"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "标为未读"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "标为已读"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "已读"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "从档案还原"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "添加到归档"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "归档"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "简介:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "添加到书架"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(公共)"
@@ -2542,7 +2546,7 @@ msgstr "附件大小限制"
 msgid "Save and Send Test E-mail"
 msgstr "保存设置并发送测试邮件"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "后退"
@@ -2568,12 +2572,13 @@ msgstr "输入域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止注册的域名（黑名单）"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "下一个"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "在文本编辑器中打开.kobo/Kobo eReader.conf，添加（或编辑）:"
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2584,19 +2589,19 @@ msgstr "Kobo Token:"
 msgid "List"
 msgstr "列表"
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Web 实例未配置，请联系您的管理员！"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "创建问题"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "回到首页"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "登出账号"
 
@@ -2686,7 +2691,7 @@ msgstr "书籍按评分排序"
 msgid "Books ordered by file formats"
 msgstr "书籍按文件格式排序"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "书架列表"
@@ -2695,60 +2700,60 @@ msgstr "书架列表"
 msgid "Books organized in shelves"
 msgstr "书架上的书"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "首页"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "切换导航"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "搜索书库"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "正在上传..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "错误"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "上传完成，正在处理，请稍候..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "设置"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "账号"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "注销"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "正在上传..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "错误"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "上传完成，正在处理，请稍候..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "设置"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "请不要刷新页面"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "按条件浏览"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "关于"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "上一个"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "书籍详情"
 
@@ -2764,7 +2769,7 @@ msgstr "记住我"
 msgid "Forgot Password?"
 msgstr "忘记密码？"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "通过魔法链接登录"
 
@@ -2872,23 +2877,23 @@ msgstr "Caliebre-Web电子书路径"
 msgid "epub Reader"
 msgstr "epub阅读器"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "浅色"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "深色"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr "棕色"
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 msgid "Black"
 msgstr "黑色"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "打开侧栏时重排文本。"
 
@@ -2896,111 +2901,111 @@ msgstr "打开侧栏时重排文本。"
 msgid "Comic Reader"
 msgstr "Comic阅读器"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "上一页"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "下一页"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "缩放到最佳"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "按宽度缩放"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "按高度缩放"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "缩放到原始大小"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "向右旋转"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "向左旋转"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "翻转图片"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "缩放"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "最佳"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "宽度"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "高度"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "原始"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "旋转"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "翻转"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "水平"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "垂直"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "方向"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "从左到右"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "从右到左"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "重置为顶部"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "记住位置"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "工具栏"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "显示"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "隐藏"
 
@@ -3008,7 +3013,7 @@ msgstr "隐藏"
 msgid "DJVU Reader"
 msgstr "DJVU阅读器"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr "PDF阅读器"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 435d0a767db5a6fec3c12c24153ec3042e07e2fb..7477145ce230f139e49c3f5c1a83e89ee02d855f 100644
GIT binary patch
delta 11467
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
D>YoO7

delta 11633
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

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index b7d043d9e..c9ba53ee0 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -16,489 +16,489 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr "服務器已重啟，請刷新頁面"
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr "正在關閉服務器，請關閉窗口"
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr "重新連接成功"
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 #, fuzzy
 msgid "Books successfully queued for Metadata Backup"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr "管理頁"
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "管理用戶"
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr "找不到用戶"
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr "成功刪除 {} 個用戶"
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "顯示全部"
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr "格式錯誤的請求"
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr "訪客名稱無法更改"
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr "遊客無法擁有此角色"
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr "管理員賬戶不存在，無法刪除管理員角色"
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr "值必須是 true 或 false"
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr "無效角色"
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr "遊客無法擁有此視圖"
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr "無效視圖"
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "訪客的本地化是自動偵測而無法設置的"
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr "無可用本地化"
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr "無有效書籍語言"
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr "參數未找到"
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr "無效的閱讀列"
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr "無效的限制列"
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "您確定刪除Kobo Token嗎？"
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr "您確定要刪除此網域嗎？"
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr "您確定要刪除此用戶嗎？"
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您確定要刪除此書架嗎？"
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "您確定要修改選定用戶的本地化設置嗎？"
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "您確定要修改選定用戶的可見書籍語言嗎？"
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "您確定要修改選定用戶的選定角色嗎？"
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "您確定要修改選定用戶的選定限制嗎？"
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "您確定要修改選定用戶的選定可視化限制嗎？"
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "您確定要更改所選用戶的書架同步行為嗎？"
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "您確定要更改 Calibre 庫位置嗎？"
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒絕"
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允許"
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr "標籤未找到"
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr "無效的動作"
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未為 Web 應用程序配置"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日誌文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "訪問日誌路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "請輸入LDAP主機、端口、DN和用戶對象標識符"
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "請輸入一個LDAP服務賬號和密碼 "
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr "請輸入一個LDAP服務賬號"
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP群組對象過濾器需要一個具有“%s”格式標識符號"
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP群組對象過濾器的括號不匹配"
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用戶對象過濾器需要一個具有“%s”格式標識符"
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用戶對象過濾器的括號不匹配"
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成員用戶過濾器需要有一個“%s”格式標識符號"
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成員用戶過濾器中有不匹配的括號"
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr "添加新用戶"
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr "編輯郵件服務器設置"
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail賬號驗證成功"
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "發送給%(email)s的測試郵件已進入隊列。請檢查任務結果"
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "發送測試郵件時出錯：%(res)s"
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr "請先配置您的郵箱地址..."
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "編輯用戶 %(nick)s"
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr "日誌文件查看器"
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr "正在請求更新包"
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr "正在下載更新包"
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr "正在解壓更新包"
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr "正在替換文件"
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr "數據庫連接已關閉"
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr "正在停止服務器"
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，請點擊確定並刷新頁面"
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr "更新失敗："
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr "HTTP錯誤"
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr "連接錯誤"
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr "建立連接超時"
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr "一般錯誤"
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件無法保存在臨時目錄中"
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr "更新時檔案無法替換變更"
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一個LDAP用戶"
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能創建至少一個LDAP用戶"
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "錯誤：%(ldaperror)s"
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr "錯誤：在LDAP服務器的響應中沒有返回用戶"
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "數據庫中沒有找到至少一個LDAP用戶"
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr "{} 用戶被成功導入"
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "數據庫路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr "數據庫不可寫入"
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密鑰文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "證書文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr "郵箱不在有效網域中"
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用戶“%(user)s”已創建"
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此郵箱或用戶名的賬號已經存在。"
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用戶“%(nick)s”已刪除"
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr "無法刪除訪客用戶"
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr "管理員賬戶不存在，無法刪除用戶"
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用戶“%(nick)s”已更新"
@@ -511,20 +511,20 @@ msgstr "未安裝"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr "無"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
@@ -743,7 +743,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此郵箱的賬號已經存在。"
 
@@ -823,7 +823,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -888,8 +888,9 @@ msgstr "Google Oauth 錯誤: {}"
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr "登入"
 
@@ -905,7 +906,7 @@ msgstr "Token已過期"
 msgid "Success! Please return to your device"
 msgstr "成功！請返回您的設備"
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr "書籍"
 
@@ -930,7 +931,7 @@ msgstr "已下載書籍"
 msgid "Show Downloaded Books"
 msgstr "顯示下載過的書籍"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr "最高評分書籍"
 
@@ -939,7 +940,7 @@ msgid "Show Top Rated Books"
 msgstr "顯示最高評分書籍"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr "已讀書籍"
 
@@ -948,7 +949,7 @@ msgid "Show read and unread"
 msgstr "顯示閱讀狀態"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr "未讀書籍"
 
@@ -966,7 +967,7 @@ msgid "Show Random Books"
 msgstr "隨機顯示書籍"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr "分類"
 
@@ -976,7 +977,7 @@ msgstr "顯示分類選擇"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr "叢書"
 
@@ -994,7 +995,7 @@ msgid "Show author selection"
 msgstr "顯示作者選擇"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr "出版社"
 
@@ -1004,7 +1005,7 @@ msgstr "顯示出版社選擇"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr "語言"
 
@@ -1028,7 +1029,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "顯示文件格式選擇"
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "歸檔書籍"
 
@@ -1036,7 +1037,7 @@ msgstr "歸檔書籍"
 msgid "Show archived books"
 msgstr "顯示歸檔書籍"
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr "書籍列表"
 
@@ -1046,7 +1047,7 @@ msgstr "顯示書籍列表"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "搜尋"
@@ -1078,7 +1079,7 @@ msgstr "閱讀狀態 = %(status)s"
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
@@ -1128,7 +1129,7 @@ msgstr "此書已從書架 %(sname)s 中刪除"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr "創建書架"
 
@@ -1191,7 +1192,7 @@ msgstr "書架：%(name)s"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打開書架出錯。書架不存在或不可訪問"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "任務列表"
@@ -1253,139 +1254,140 @@ msgstr "有新的更新。單擊下面的按鈕以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "無可用發佈信息"
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr "發現(隨機書籍)"
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr "熱門書籍（最多下載）"
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下載過的書籍"
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "叢書：%(serie)s"
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "評分：%(rating)s 星"
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分類：%(name)s"
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr "語言：%(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr "下載次數"
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr "評分列表"
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”登入"
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr "資料已更新"
 
@@ -1435,7 +1437,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1463,7 +1465,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "上傳書籍"
 
@@ -1487,7 +1489,7 @@ msgstr "郵箱地址"
 msgid "Send to E-Reader E-mail Address"
 msgstr "接收書籍的Kindle郵箱地址"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理權限"
@@ -1865,12 +1867,12 @@ msgstr "出版日期"
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr "出版社"
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "語言"
 
@@ -1921,8 +1923,8 @@ msgstr "單擊封面將元數據加載到表單"
 msgid "Loading..."
 msgstr "加載中..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "關閉"
@@ -2367,7 +2369,7 @@ msgstr "隨機書籍顯示數量"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "主頁中書籍作者的最大顯示數量（0=不隱藏）"
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr "主題"
 
@@ -2466,49 +2468,51 @@ msgstr "在線閱讀"
 msgid "Listen in Browser"
 msgstr "在線聽書"
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr "%(range)s 第%(index)s冊"
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr "出版日期"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr "標為未讀"
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr "標為已讀"
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr "已讀"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr "從歸檔檔案還原"
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr "添加到歸檔"
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr "歸檔"
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr "簡介:"
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "添加到書架"
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr "(公共)"
@@ -2557,7 +2561,7 @@ msgstr "附件大小限制"
 msgid "Save and Send Test E-mail"
 msgstr "保存設置並發送測試郵件"
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr "後退"
@@ -2583,12 +2587,13 @@ msgstr "輸入網域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止註冊的網域名（黑名單）"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr "下一個"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "在文本編輯器中打開.kobo/Kobo eReader.conf，添加（或編輯）:"
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2600,19 +2605,19 @@ msgstr "Kobo 同步 Token"
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Web 實例未配置，請聯繫您的系統管理員！"
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr "創建問題"
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr "回到首頁"
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr "登出賬號"
 
@@ -2702,7 +2707,7 @@ msgstr "書籍按評分排序"
 msgid "Books ordered by file formats"
 msgstr "書籍按文件格式排序"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "書架列表"
@@ -2711,60 +2716,60 @@ msgstr "書架列表"
 msgid "Books organized in shelves"
 msgstr "書架上的書"
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr "首頁"
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr "切換導航"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr "搜索書庫"
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr "正在上傳..."
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr "錯誤"
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr "上傳完成，正在處理中，請稍候..."
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "設置"
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr "賬號"
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr "登出"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "正在上傳..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "錯誤"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "上傳完成，正在處理中，請稍候..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "設置"
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr "請不要刷新頁面"
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr "瀏覽"
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr "關於"
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr "上一個"
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr "書籍詳情"
 
@@ -2780,7 +2785,7 @@ msgstr "記住我"
 msgid "Forgot Password?"
 msgstr "忘記密碼？"
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr "通過魔法連接登入"
 
@@ -2888,24 +2893,24 @@ msgstr "Caliebre-Web電子書路徑"
 msgid "epub Reader"
 msgstr "epub閱讀器"
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "淺色"
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "深色"
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 #, fuzzy
 msgid "Black"
 msgstr "後退"
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr "打開側欄時重排文本。"
 
@@ -2913,111 +2918,111 @@ msgstr "打開側欄時重排文本。"
 msgid "Comic Reader"
 msgstr "Comic閱讀器"
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr "快捷鍵"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr "上一頁"
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr "下一頁"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr "縮放到最佳"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr "按寬度縮放"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr "按高度縮放"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr "縮放到原始大小"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr "翻轉圖片"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr "縮放"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr "最佳"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr "寬度"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr "高度"
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr "原始"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr "旋轉"
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr "翻轉"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr "水平"
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr "垂直"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr "方向"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr "從左到右"
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr "從右到左"
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr "重置為頂部"
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr "記住位置"
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr "工具欄"
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr "顯示"
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr "隱藏"
 
@@ -3025,7 +3030,7 @@ msgstr "隱藏"
 msgid "DJVU Reader"
 msgstr "DJVU閱讀器"
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr "PDF閱讀器"
 
diff --git a/messages.pot b/messages.pot
index 9e9dd10b9..15c1d50ef 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,493 +8,493 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-10-02 21:12+0200\n"
+"POT-Creation-Date: 2022-12-25 10:22+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.10.3\n"
+"Generated-By: Babel 2.11.0\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr ""
 
-#: cps/admin.py:146
+#: cps/admin.py:148
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/admin.py:148
+#: cps/admin.py:150
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:156
+#: cps/admin.py:158
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:159
+#: cps/admin.py:161
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:169
+#: cps/admin.py:172
 msgid "Books successfully queued for Metadata Backup"
 msgstr ""
 
-#: cps/admin.py:202 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
 #: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
 msgid "Unknown"
 msgstr ""
 
-#: cps/admin.py:227
+#: cps/admin.py:230
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:247
+#: cps/admin.py:250
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:285
+#: cps/admin.py:288
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:319 cps/templates/admin.html:51
+#: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr ""
 
-#: cps/admin.py:363 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:390 cps/admin.py:1380
+#: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:404
+#: cps/admin.py:407
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:427 cps/templates/config_view_edit.html:133
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
 
-#: cps/admin.py:448 cps/admin.py:454
+#: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:1981
+#: cps/admin.py:469 cps/admin.py:1998
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:478
+#: cps/admin.py:481
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:490 cps/admin.py:1936
+#: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:494 cps/admin.py:508
+#: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:499
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:500
+#: cps/admin.py:503
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:513
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:513
+#: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:517
+#: cps/admin.py:520
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:528
+#: cps/admin.py:531
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:530 cps/editbooks.py:442
+#: cps/admin.py:533 cps/editbooks.py:442
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:567
+#: cps/admin.py:570
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:576
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:593 cps/admin.py:1807
+#: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:607
+#: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:609
+#: cps/admin.py:612
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:614
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:613
+#: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:615
+#: cps/admin.py:618
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:617
+#: cps/admin.py:620
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:622
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:621
+#: cps/admin.py:624
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:624
+#: cps/admin.py:627
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:626
+#: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:628
+#: cps/admin.py:631
 msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
 msgstr ""
 
-#: cps/admin.py:631
+#: cps/admin.py:634
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:874 cps/admin.py:880 cps/admin.py:890 cps/admin.py:900
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:876 cps/admin.py:882 cps/admin.py:892 cps/admin.py:902
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:917
+#: cps/admin.py:920
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:968
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:977
+#: cps/admin.py:980
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:1092
+#: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1143
+#: cps/admin.py:1160
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1173
+#: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1179
+#: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1182
+#: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1187
+#: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1189
+#: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1193
+#: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1195
+#: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1202
+#: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1204
+#: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1211
+#: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1242 cps/admin.py:1868
+#: cps/admin.py:1259 cps/admin.py:1885
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:1251 cps/templates/admin.html:100
+#: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1270
+#: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1289 cps/admin.py:1292 cps/admin.py:1673 cps/admin.py:1791
-#: cps/admin.py:1889 cps/admin.py:2009 cps/editbooks.py:229
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1419
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/admin.py:1299
+#: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1302
+#: cps/admin.py:1319
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1304
+#: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1306
+#: cps/admin.py:1323
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1329 cps/templates/admin.html:191
+#: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
 msgstr ""
 
-#: cps/admin.py:1341
+#: cps/admin.py:1358
 msgid "Invalid start time for task specified"
 msgstr ""
 
-#: cps/admin.py:1346
+#: cps/admin.py:1363
 msgid "Invalid duration for task specified"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1372
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1365 cps/admin.py:1414 cps/admin.py:2005 cps/web.py:1257
-#: cps/web.py:1318
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1369
+#: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1399 cps/admin.py:1997
+#: cps/admin.py:1416 cps/admin.py:2014
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:1411
+#: cps/admin.py:1428
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1417 cps/web.py:1197
+#: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1428
+#: cps/admin.py:1445
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1494
+#: cps/admin.py:1511
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1495
+#: cps/admin.py:1512
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1496
+#: cps/admin.py:1513
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1497
+#: cps/admin.py:1514
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1498
+#: cps/admin.py:1515
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1499
+#: cps/admin.py:1516
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1500
+#: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1501 cps/admin.py:1502 cps/admin.py:1503 cps/admin.py:1504
-#: cps/admin.py:1505 cps/admin.py:1506
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1501 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1502 cps/updater.py:391 cps/updater.py:628
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1503 cps/updater.py:393 cps/updater.py:630
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1504 cps/updater.py:395 cps/updater.py:632
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1505
+#: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1506
+#: cps/admin.py:1523
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1530
+#: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1575
+#: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1588
+#: cps/admin.py:1605
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1592
+#: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1625
+#: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1627
+#: cps/admin.py:1644
 msgid "{} User Successfully Imported"
 msgstr ""
 
-#: cps/admin.py:1685
+#: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1705
+#: cps/admin.py:1722
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1718
+#: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1722
+#: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1830
+#: cps/admin.py:1847
 msgid "Database Settings updated"
 msgstr ""
 
-#: cps/admin.py:1838
+#: cps/admin.py:1855
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1854 cps/web.py:1232
+#: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:1862
+#: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1879
+#: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:1885
+#: cps/admin.py:1902
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1915
+#: cps/admin.py:1932
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:1917 cps/admin.py:1918
+#: cps/admin.py:1934 cps/admin.py:1935
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1921
+#: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1975 cps/web.py:1369
+#: cps/admin.py:1992 cps/web.py:1371
 msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
 msgstr ""
 
-#: cps/admin.py:2001
+#: cps/admin.py:2018
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
@@ -507,20 +507,20 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:722
+#: cps/db.py:724 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:967 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:549 cps/web.py:583 cps/web.py:658 cps/web.py:683 cps/web.py:964
-#: cps/web.py:994 cps/web.py:1030 cps/web.py:1058 cps/web.py:1097
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
 msgid "None"
 msgstr ""
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:516 cps/web.py:1460
-#: cps/web.py:1502 cps/web.py:1547
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -738,7 +738,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:644 cps/web.py:1414
+#: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -815,7 +815,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1289
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -880,8 +880,9 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:85
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1338
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
 msgid "Login"
 msgstr ""
 
@@ -897,7 +898,7 @@ msgstr ""
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/render_template.py:40 cps/web.py:405
+#: cps/render_template.py:40 cps/web.py:406
 msgid "Books"
 msgstr ""
 
@@ -922,7 +923,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:420
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
 msgid "Top Rated Books"
 msgstr ""
 
@@ -931,7 +932,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:741
+#: cps/templates/index.xml:58 cps/web.py:742
 msgid "Read Books"
 msgstr ""
 
@@ -940,7 +941,7 @@ msgid "Show read and unread"
 msgstr ""
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:744
+#: cps/templates/index.xml:65 cps/web.py:745
 msgid "Unread Books"
 msgstr ""
 
@@ -958,7 +959,7 @@ msgid "Show Random Books"
 msgstr ""
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1101
+#: cps/templates/index.xml:83 cps/web.py:1102
 msgid "Categories"
 msgstr ""
 
@@ -968,7 +969,7 @@ msgstr ""
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:997 cps/web.py:1004
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
 msgid "Series"
 msgstr ""
 
@@ -986,7 +987,7 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:968
+#: cps/templates/index.xml:76 cps/web.py:969
 msgid "Publishers"
 msgstr ""
 
@@ -996,7 +997,7 @@ msgstr ""
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1073
+#: cps/web.py:1074
 msgid "Languages"
 msgstr ""
 
@@ -1020,7 +1021,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:94 cps/web.py:767
+#: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr ""
 
@@ -1028,7 +1029,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:798
+#: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
 msgstr ""
 
@@ -1038,7 +1039,7 @@ msgstr ""
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr ""
@@ -1070,7 +1071,7 @@ msgstr ""
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
 msgstr ""
 
@@ -1120,7 +1121,7 @@ msgstr ""
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:141
+#: cps/shelf.py:210 cps/templates/layout.html:164
 msgid "Create a Shelf"
 msgstr ""
 
@@ -1182,7 +1183,7 @@ msgstr ""
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:74
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr ""
@@ -1244,139 +1245,140 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:6 cps/web.py:432
+#: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:468
+#: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:499
+#: cps/web.py:500
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:532
+#: cps/web.py:533
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:568
+#: cps/web.py:569
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:596
+#: cps/web.py:597
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:611
+#: cps/web.py:612
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:621
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:638
+#: cps/web.py:639
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:675
+#: cps/web.py:676
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:702
+#: cps/web.py:703
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:940
+#: cps/templates/admin.html:16 cps/web.py:941
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:1033
+#: cps/web.py:1034
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1060
+#: cps/web.py:1061
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:1202
+#: cps/web.py:1203
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1206
+#: cps/web.py:1207
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1208
+#: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1225
+#: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:86 cps/templates/register.html:17 cps/web.py:1226
-#: cps/web.py:1233 cps/web.py:1239 cps/web.py:1258 cps/web.py:1263
-#: cps/web.py:1269
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1260
+#: cps/web.py:1262
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1264
+#: cps/web.py:1266
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1278
+#: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1297
+#: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1303
+#: cps/web.py:1305
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1307 cps/web.py:1332
+#: cps/web.py:1309 cps/web.py:1334
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1314
+#: cps/web.py:1316
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1320
+#: cps/web.py:1322
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1329
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1394 cps/web.py:1443
+#: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1412
 msgid "Profile updated"
 msgstr ""
 
@@ -1426,7 +1428,7 @@ msgstr ""
 msgid "Reconnecting Calibre database"
 msgstr ""
 
-#: cps/tasks/mail.py:265
+#: cps/tasks/mail.py:266
 msgid "E-mail"
 msgstr ""
 
@@ -1453,7 +1455,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:67 cps/templates/user_table.html:145
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr ""
 
@@ -1476,7 +1478,7 @@ msgstr ""
 msgid "Send to E-Reader E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:77
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr ""
@@ -1854,12 +1856,12 @@ msgstr ""
 
 #: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
 #: cps/templates/book_edit.html:290 cps/templates/detail.html:165
-#: cps/templates/search_form.html:16
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
 msgid "Publisher"
 msgstr ""
 
 #: cps/templates/book_edit.html:126 cps/templates/detail.html:132
-#: cps/templates/user_edit.html:33
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr ""
 
@@ -1909,8 +1911,8 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:64
-#: cps/templates/layout.html:187 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr ""
@@ -2353,7 +2355,7 @@ msgstr ""
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
 msgstr ""
 
@@ -2450,49 +2452,51 @@ msgstr ""
 msgid "Listen in Browser"
 msgstr ""
 
-#: cps/templates/detail.html:125
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
 msgstr ""
 
-#: cps/templates/detail.html:174
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:222
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:223
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Restore from archive"
 msgstr ""
 
-#: cps/templates/detail.html:232
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
 msgid "Add to archive"
 msgstr ""
 
-#: cps/templates/detail.html:233
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
 msgid "Archived"
 msgstr ""
 
-#: cps/templates/detail.html:244
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:257 cps/templates/search.html:16
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr ""
 
 #: cps/templates/detail.html:268 cps/templates/detail.html:285
-#: cps/templates/feed.xml:79 cps/templates/layout.html:138
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
 msgstr ""
@@ -2541,7 +2545,7 @@ msgstr ""
 msgid "Save and Send Test E-mail"
 msgstr ""
 
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:30
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
 msgid "Back"
 msgstr ""
@@ -2567,12 +2571,12 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:171
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
 msgid "Next"
 msgstr ""
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
 #: cps/templates/generate_kobo_auth_url.html:11
@@ -2583,19 +2587,19 @@ msgstr ""
 msgid "List"
 msgstr ""
 
-#: cps/templates/http_error.html:31
+#: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
 
-#: cps/templates/http_error.html:41
+#: cps/templates/http_error.html:44
 msgid "Create Issue"
 msgstr ""
 
-#: cps/templates/http_error.html:48
+#: cps/templates/http_error.html:51
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/http_error.html:50
+#: cps/templates/http_error.html:53
 msgid "Logout User"
 msgstr ""
 
@@ -2685,7 +2689,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:136
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2694,60 +2698,60 @@ msgstr ""
 msgid "Books organized in shelves"
 msgstr ""
 
-#: cps/templates/layout.html:30
+#: cps/templates/layout.html:33 cps/templates/login.html:30
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:36
+#: cps/templates/layout.html:39
 msgid "Toggle Navigation"
 msgstr ""
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:54
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:64 cps/templates/layout.html:118
-msgid "Uploading..."
-msgstr ""
-
-#: cps/templates/layout.html:64
-msgid "Error"
-msgstr ""
-
-#: cps/templates/layout.html:64
-msgid "Upload done, processing, please wait..."
-msgstr ""
-
-#: cps/templates/layout.html:77 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr ""
-
-#: cps/templates/layout.html:79
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:81
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
 msgid "Logout"
 msgstr ""
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr ""
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr ""
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr ""
+
+#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr ""
+
+#: cps/templates/layout.html:142
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:129
+#: cps/templates/layout.html:152
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:142 cps/templates/stats.html:3
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
 msgid "About"
 msgstr ""
 
-#: cps/templates/layout.html:156
+#: cps/templates/layout.html:179
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:183
+#: cps/templates/layout.html:206
 msgid "Book Details"
 msgstr ""
 
@@ -2763,7 +2767,7 @@ msgstr ""
 msgid "Forgot Password?"
 msgstr ""
 
-#: cps/templates/login.html:26
+#: cps/templates/login.html:34
 msgid "Log in with Magic Link"
 msgstr ""
 
@@ -2871,23 +2875,23 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:77 cps/templates/readcbr.html:116
+#: cps/templates/read.html:80 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr ""
 
-#: cps/templates/read.html:78 cps/templates/readcbr.html:117
+#: cps/templates/read.html:81 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/read.html:79
+#: cps/templates/read.html:82
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:80
+#: cps/templates/read.html:83
 msgid "Black"
 msgstr ""
 
-#: cps/templates/read.html:84
+#: cps/templates/read.html:87
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
@@ -2895,111 +2899,111 @@ msgstr ""
 msgid "Comic Reader"
 msgstr ""
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:95
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:97
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:98
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:99
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:100
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:101
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:102
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:103
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:125
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:128
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:129
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:130
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:131
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:136
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:144
+#: cps/templates/readcbr.html:147
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:150
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:148
+#: cps/templates/readcbr.html:151
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:156
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:159
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:157
+#: cps/templates/readcbr.html:160
 msgid "Right to Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:165
+#: cps/templates/readcbr.html:168
 msgid "Reset to Top"
 msgstr ""
 
-#: cps/templates/readcbr.html:166
+#: cps/templates/readcbr.html:169
 msgid "Remember Position"
 msgstr ""
 
-#: cps/templates/readcbr.html:171
+#: cps/templates/readcbr.html:174
 msgid "Scrollbar"
 msgstr ""
 
-#: cps/templates/readcbr.html:174
+#: cps/templates/readcbr.html:177
 msgid "Show"
 msgstr ""
 
-#: cps/templates/readcbr.html:175
+#: cps/templates/readcbr.html:178
 msgid "Hide"
 msgstr ""
 
@@ -3007,7 +3011,7 @@ msgstr ""
 msgid "DJVU Reader"
 msgstr ""
 
-#: cps/templates/readpdf.html:29
+#: cps/templates/readpdf.html:32
 msgid "PDF Reader"
 msgstr ""
 

From 1f6eb2def6f60547f7b39ab4b603a81c0d920421 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Sun, 25 Dec 2022 10:32:01 +0100
Subject: [PATCH 361/412] html tag fix

---
 cps/templates/http_error.html | 2 +-
 cps/templates/layout.html     | 2 +-
 cps/templates/listenmp3.html  | 2 +-
 cps/templates/read.html       | 2 +-
 cps/templates/readcbr.html    | 2 +-
 cps/templates/readdjvu.html   | 2 +-
 cps/templates/readpdf.html    | 2 +-
 cps/templates/readtxt.html    | 2 +-
 cps/templates/shelfdown.html  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cps/templates/http_error.html b/cps/templates/http_error.html
index 9c6c0f568..8330bf089 100644
--- a/cps/templates/http_error.html
+++ b/cps/templates/http_error.html
@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     {% if g.google_site_verification|length > 0 %}
-      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+      <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}    
 
     <!-- Bootstrap -->
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index c142eb71b..7de74c358 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -9,7 +9,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     {% if g.google_site_verification|length > 0 %}
-      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+      <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}
 
     <!-- Bootstrap -->
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 9128383ca..a0ccc7866 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -9,7 +9,7 @@
   <meta name="viewport" content="width=device-width">
   <meta name="apple-mobile-web-app-capable" content="yes">
   {% if g.google_site_verification|length > 0 %}
-    <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    <meta name="google-site-verification" content="{{g.google_site_verification}}">
   {% endif %}  
 
   <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
diff --git a/cps/templates/read.html b/cps/templates/read.html
index 8dc32a483..66ba9b4be 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -8,7 +8,7 @@
         <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
         {% if g.google_site_verification|length > 0 %}
-          <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+          <meta name="google-site-verification" content="{{g.google_site_verification}}">
         {% endif %}          
         <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
         <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
diff --git a/cps/templates/readcbr.html b/cps/templates/readcbr.html
index 9a7a489a7..255724f15 100644
--- a/cps/templates/readcbr.html
+++ b/cps/templates/readcbr.html
@@ -8,7 +8,7 @@
   <meta name="viewport" content="width=device-width, user-scalable=no">
   <meta name="apple-mobile-web-app-capable" content="yes">
   {% if g.google_site_verification|length > 0 %}
-    <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    <meta name="google-site-verification" content="{{g.google_site_verification}}">
   {% endif %}    
 
   <link rel="stylesheet" href="{{ url_for('static', filename='css/libs/normalize.css') }}">
diff --git a/cps/templates/readdjvu.html b/cps/templates/readdjvu.html
index ff512e79d..2fcfe0529 100644
--- a/cps/templates/readdjvu.html
+++ b/cps/templates/readdjvu.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="apple-mobile-web-app-capable" content="yes">
     {% if g.google_site_verification|length > 0 %}
-      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+      <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}  
 
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
diff --git a/cps/templates/readpdf.html b/cps/templates/readpdf.html
index 6d6963740..e2876c616 100644
--- a/cps/templates/readpdf.html
+++ b/cps/templates/readpdf.html
@@ -27,7 +27,7 @@ See https://github.com/adobe-type-tools/cmap-resources
     <meta name="google" content="notranslate">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     {% if g.google_site_verification|length > 0 %}
-      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+      <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}      
     <title>{{_('PDF Reader')}} | {{title}}</title>
 
diff --git a/cps/templates/readtxt.html b/cps/templates/readtxt.html
index 71dd0e985..82b6e1a83 100644
--- a/cps/templates/readtxt.html
+++ b/cps/templates/readtxt.html
@@ -8,7 +8,7 @@
         <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
         {% if g.google_site_verification|length > 0 %}
-          <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+          <meta name="google-site-verification" content="{{g.google_site_verification}}">
         {% endif %}  
 
         <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index 50f339b93..262a34cc9 100755
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     {% if g.google_site_verification|length > 0 %}
-      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+      <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}      
 
     <!-- Bootstrap -->

From a635e136beac53dfb3b083eeae0d96d900c5cc14 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Sun, 25 Dec 2022 13:10:21 +0100
Subject: [PATCH 362/412] Added databazeknih to supported links

---
 cps/db.py | 58 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index aaedcd061..0ae0c8580 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -111,66 +111,70 @@ class Identifiers(Base):
     def format_type(self):
         format_type = self.type.lower()
         if format_type == 'amazon':
-            return u"Amazon"
+            return "Amazon"
         elif format_type.startswith("amazon_"):
-            return u"Amazon.{0}".format(format_type[7:])
+            return "Amazon.{0}".format(format_type[7:])
         elif format_type == "isbn":
-            return u"ISBN"
+            return "ISBN"
         elif format_type == "doi":
-            return u"DOI"
+            return "DOI"
         elif format_type == "douban":
-            return u"Douban"
+            return "Douban"
         elif format_type == "goodreads":
-            return u"Goodreads"
+            return "Goodreads"
         elif format_type == "babelio":
-            return u"Babelio"
+            return "Babelio"
         elif format_type == "google":
-            return u"Google Books"
+            return "Google Books"
         elif format_type == "kobo":
-            return u"Kobo"
+            return "Kobo"
         elif format_type == "litres":
-            return u"ЛитРес"
+            return "ЛитРес"
         elif format_type == "issn":
-            return u"ISSN"
+            return "ISSN"
         elif format_type == "isfdb":
-            return u"ISFDB"
+            return "ISFDB"
         if format_type == "lubimyczytac":
-            return u"Lubimyczytac"
+            return "Lubimyczytac"
+        if format_type == "databazeknih":
+            return "Databáze knih"
         else:
             return self.type
 
     def __repr__(self):
         format_type = self.type.lower()
         if format_type == "amazon" or format_type == "asin":
-            return u"https://amazon.com/dp/{0}".format(self.val)
+            return "https://amazon.com/dp/{0}".format(self.val)
         elif format_type.startswith('amazon_'):
-            return u"https://amazon.{0}/dp/{1}".format(format_type[7:], self.val)
+            return "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)
+            return "https://www.worldcat.org/isbn/{0}".format(self.val)
         elif format_type == "doi":
-            return u"https://dx.doi.org/{0}".format(self.val)
+            return "https://dx.doi.org/{0}".format(self.val)
         elif format_type == "goodreads":
-            return u"https://www.goodreads.com/book/show/{0}".format(self.val)
+            return "https://www.goodreads.com/book/show/{0}".format(self.val)
         elif format_type == "babelio":
-            return u"https://www.babelio.com/livres/titre/{0}".format(self.val)
+            return "https://www.babelio.com/livres/titre/{0}".format(self.val)
         elif format_type == "douban":
-            return u"https://book.douban.com/subject/{0}".format(self.val)
+            return "https://book.douban.com/subject/{0}".format(self.val)
         elif format_type == "google":
-            return u"https://books.google.com/books?id={0}".format(self.val)
+            return "https://books.google.com/books?id={0}".format(self.val)
         elif format_type == "kobo":
-            return u"https://www.kobo.com/ebook/{0}".format(self.val)
+            return "https://www.kobo.com/ebook/{0}".format(self.val)
         elif format_type == "lubimyczytac":
-            return u"https://lubimyczytac.pl/ksiazka/{0}/ksiazka".format(self.val)
+            return "https://lubimyczytac.pl/ksiazka/{0}/ksiazka".format(self.val)
         elif format_type == "litres":
-            return u"https://www.litres.ru/{0}".format(self.val)
+            return "https://www.litres.ru/{0}".format(self.val)
         elif format_type == "issn":
-            return u"https://portal.issn.org/resource/ISSN/{0}".format(self.val)
+            return "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)
+            return "http://www.isfdb.org/cgi-bin/pl.cgi?{0}".format(self.val)
+        elif format_type == "databazeknih":
+            return "https://www.databazeknih.cz/knihy/{0}".format(self.val)
         elif self.val.lower().startswith("javascript:"):
             return quote(self.val)
         else:
-            return u"{0}".format(self.val)
+            return "{0}".format(self.val)
 
 
 class Comments(Base):

From 567cb2e0971ffbd25e950caa0f8a74aaa750273e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Sun, 25 Dec 2022 13:24:00 +0100
Subject: [PATCH 363/412] Inlcuded indonesian translation

---
 README.md                                     |    2 +-
 cps/iso_language_names.py                     |  378 ++
 .../locales/bootstrap-datepicker.id.min.js    |    1 +
 cps/translations/cs/LC_MESSAGES/messages.mo   |  Bin 38066 -> 38066 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/de/LC_MESSAGES/messages.mo   |  Bin 59287 -> 59287 bytes
 cps/translations/de/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/el/LC_MESSAGES/messages.mo   |  Bin 55533 -> 55533 bytes
 cps/translations/el/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/es/LC_MESSAGES/messages.mo   |  Bin 49667 -> 49667 bytes
 cps/translations/es/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/fi/LC_MESSAGES/messages.mo   |  Bin 26606 -> 26606 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/fr/LC_MESSAGES/messages.mo   |  Bin 53939 -> 53939 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/gl/LC_MESSAGES/messages.mo   |  Bin 59705 -> 59705 bytes
 cps/translations/gl/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/hu/LC_MESSAGES/messages.mo   |  Bin 24357 -> 24357 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/id/LC_MESSAGES/messages.mo   |  Bin 0 -> 57142 bytes
 cps/translations/id/LC_MESSAGES/messages.po   | 3367 +++++++++++++++++
 cps/translations/it/LC_MESSAGES/messages.mo   |  Bin 61582 -> 61582 bytes
 cps/translations/it/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/ja/LC_MESSAGES/messages.mo   |  Bin 63172 -> 63172 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/km/LC_MESSAGES/messages.mo   |  Bin 23905 -> 23905 bytes
 cps/translations/km/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/ko/LC_MESSAGES/messages.mo   |  Bin 53995 -> 53995 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/nl/LC_MESSAGES/messages.mo   |  Bin 48807 -> 48807 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/pl/LC_MESSAGES/messages.mo   |  Bin 50636 -> 50636 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   |   22 +-
 .../pt_BR/LC_MESSAGES/messages.mo             |  Bin 59792 -> 59792 bytes
 .../pt_BR/LC_MESSAGES/messages.po             |   22 +-
 cps/translations/ru/LC_MESSAGES/messages.mo   |  Bin 46208 -> 46208 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/sv/LC_MESSAGES/messages.mo   |  Bin 47066 -> 47066 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/tr/LC_MESSAGES/messages.mo   |  Bin 22085 -> 22085 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/uk/LC_MESSAGES/messages.mo   |  Bin 24153 -> 24153 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   |   22 +-
 cps/translations/vi/LC_MESSAGES/messages.po   |   22 +-
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        |  Bin 53725 -> 54005 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        |  332 +-
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        |  Bin 47227 -> 47227 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        |   22 +-
 messages.pot                                  |   22 +-
 49 files changed, 4201 insertions(+), 363 deletions(-)
 create mode 100644 cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.id.min.js
 create mode 100644 cps/translations/id/LC_MESSAGES/messages.mo
 create mode 100644 cps/translations/id/LC_MESSAGES/messages.po

diff --git a/README.md b/README.md
index c558e21dc..4ebc8643e 100755
--- a/README.md
+++ b/README.md
@@ -19,7 +19,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 brazilian, czech, dutch, english, finnish, french, galician, german, greek, hungarian, italian, japanese, khmer, korean, polish, russian, simplified and traditional chinese, spanish, swedish, turkish, ukrainian, vietnamese
+- User Interface in brazilian, czech, dutch, english, finnish, french, galician, german, greek, hungarian, indonesian, italian, japanese, khmer, korean, polish, russian, simplified and traditional chinese, spanish, swedish, turkish, ukrainian, vietnamese
 - OPDS feed for eBook reader apps 
 - Filter and search by titles, authors, tags, series, book format and language
 - Create a custom book collection (shelves)
diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 648078132..44cc3cb77 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -3320,6 +3320,384 @@ LANGUAGE_NAMES = {
         "zxx": "No linguistic content",
         "zza": "Zaza"
     },
+    "id": {
+        "abk": "Abkhazian",
+        "ace": "Achinese",
+        "ach": "Acoli",
+        "ada": "Adangme",
+        "ady": "Adyghe",
+        "aar": "Afar",
+        "afh": "Afrihili",
+        "afr": "Afrika",
+        "ain": "Ainu (Japan)",
+        "aka": "Akan",
+        "akk": "Akkadian",
+        "sqi": "Albanian",
+        "ale": "Aleut",
+        "amh": "Amharic",
+        "anp": "Angika",
+        "ara": "Arab",
+        "arg": "Aragonese",
+        "arp": "Arapaho",
+        "arw": "Arawak",
+        "hye": "Armenia",
+        "asm": "Assam",
+        "ast": "Asturian",
+        "ava": "Avaric",
+        "ave": "Avestan",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Azerbaijani",
+        "ban": "Balinese",
+        "bal": "Baluchi",
+        "bam": "Bambara",
+        "bas": "Basa (Cameroon)",
+        "bak": "Bashkir",
+        "eus": "Basque",
+        "bej": "Beja",
+        "bel": "Belarusian",
+        "bem": "Bemba (Zambia)",
+        "ben": "Bengal",
+        "bit": "Berinomo",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "byn": "Bilin",
+        "bin": "Bini",
+        "bis": "Bislama",
+        "zbl": "Blissymbols",
+        "bos": "Bosnian",
+        "bra": "Braj",
+        "bre": "Breton",
+        "bug": "Bugis",
+        "bul": "Bulgaria",
+        "bua": "Buriat",
+        "mya": "Burma",
+        "cad": "Caddo",
+        "cat": "Catalan",
+        "ceb": "Cebuano",
+        "chg": "Chagatai",
+        "cha": "Chamorro",
+        "che": "Chechen",
+        "chr": "Cherokee",
+        "chy": "Cheyenne",
+        "chb": "Chibcha",
+        "zho": "Cina",
+        "chn": "Chinook jargon",
+        "chp": "Chipewyan",
+        "cho": "Choctaw",
+        "cht": "Cholón",
+        "chk": "Chuukese",
+        "chv": "Chuvash",
+        "cop": "Koptik",
+        "cor": "Cornish",
+        "cos": "Corsican",
+        "cre": "Cree",
+        "mus": "Creek",
+        "hrv": "Kroasia",
+        "ces": "Ceko",
+        "dak": "Dakota",
+        "dan": "Denmark",
+        "dar": "Dargwa",
+        "del": "Delaware",
+        "div": "Dhivehi",
+        "din": "Dinka",
+        "doi": "Dogri (macrolanguage)",
+        "dgr": "Dogrib",
+        "dua": "Duala",
+        "nld": "Belanda",
+        "dse": "Dutch Sign Language",
+        "dyu": "Dyula",
+        "dzo": "Dzongkha",
+        "efi": "Efik",
+        "egy": "Mesir Kuno",
+        "eka": "Ekajuk",
+        "elx": "Elamite",
+        "eng": "Inggris",
+        "enu": "Enu",
+        "myv": "Erzya",
+        "epo": "Esperanto",
+        "est": "Estonia",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang (Equatorial Guinea)",
+        "fat": "Fanti",
+        "fao": "Faro",
+        "fij": "Fiji",
+        "fil": "Filipino",
+        "fin": "Finlandia",
+        "fon": "Fon",
+        "fra": "Prancis",
+        "fur": "Friulian",
+        "ful": "Fulah",
+        "gaa": "Ga",
+        "glg": "Galician",
+        "lug": "Ganda",
+        "gay": "Gayo",
+        "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
+        "gez": "Geez",
+        "kat": "Georgian",
+        "deu": "Jerman",
+        "gil": "Gilbertese",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "Gothik",
+        "grb": "Grebo",
+        "grn": "Guarani",
+        "guj": "Gujarati",
+        "gwi": "Gwichʼin",
+        "hai": "Haida",
+        "hau": "Hausa",
+        "haw": "Hawaii",
+        "heb": "Israel",
+        "her": "Herero",
+        "hil": "Hiligaynon",
+        "hin": "Hindi",
+        "hmo": "Hiri Motu",
+        "hit": "Hittite",
+        "hmn": "Hmong",
+        "hun": "Hungaria",
+        "hup": "Hupa",
+        "iba": "Iban",
+        "isl": "Islandia",
+        "ido": "Ido",
+        "ibo": "Igbo",
+        "ilo": "Iloko",
+        "ind": "Bahasa Indonesia",
+        "inh": "Ingush",
+        "ina": "Interlingua (International Auxiliary Language Association)",
+        "ile": "Interlingue",
+        "iku": "Inuktitut",
+        "ipk": "Inupiaq",
+        "gle": "Irlandia",
+        "ita": "Italia",
+        "jpn": "Jepang",
+        "jav": "Javanese",
+        "jrb": "Judeo-Arabic",
+        "jpr": "Judeo-Persian",
+        "kbd": "Kabardian",
+        "kab": "Kabyle",
+        "kac": "Kachin",
+        "kal": "Kalaallisut",
+        "xal": "Kalmyk",
+        "kam": "Kamba (Kenya)",
+        "kan": "Kannada",
+        "kau": "Kanuri",
+        "kaa": "Kara-Kalpak",
+        "krc": "Karachay-Balkar",
+        "krl": "Karelian",
+        "kas": "Kashmir",
+        "csb": "Kashubian",
+        "kaw": "Kawi",
+        "kaz": "Kazakh",
+        "kha": "Khasi",
+        "kho": "Khotanese",
+        "kik": "Kikuyu",
+        "kmb": "Kimbundu",
+        "kin": "Kinyarwanda",
+        "kir": "Kirghiz",
+        "tlh": "Klingon",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kok": "Konkani (macrolanguage)",
+        "kor": "Korea",
+        "kos": "Kosraean",
+        "kpe": "Kpelle",
+        "kua": "Kuanyama",
+        "kum": "Kumyk",
+        "kur": "Kurdish",
+        "kru": "Kurukh",
+        "kut": "Kutenai",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "Lao",
+        "lat": "Latin",
+        "lav": "Latvian",
+        "lez": "Lezghian",
+        "lim": "Limburgan",
+        "lin": "Lingala",
+        "lit": "Lithuania",
+        "jbo": "Lojban",
+        "loz": "Lozi",
+        "lub": "Luba-Katanga",
+        "lua": "Luba-Lulua",
+        "lui": "Luiseno",
+        "smj": "Lule Sami",
+        "lun": "Lunda",
+        "luo": "Luo (Kenya and Tanzania)",
+        "lus": "Lushai",
+        "ltz": "Luxembourgish",
+        "mkd": "Masedonian",
+        "mad": "Madurese",
+        "mag": "Magahi",
+        "mai": "Maithili",
+        "mak": "Makasar",
+        "mlg": "Malagasi",
+        "msa": "Malay (macrolanguage)",
+        "mal": "Malayalam",
+        "mlt": "Maltese",
+        "mnc": "Manchu",
+        "mdr": "Mandar",
+        "man": "Mandingo",
+        "mni": "Manipuri",
+        "glv": "Manx",
+        "mri": "Maori",
+        "arn": "Mapudungun",
+        "mar": "Marathi",
+        "chm": "Mari (Russia)",
+        "mah": "Marshallese",
+        "mwr": "Marwari",
+        "mas": "Masai",
+        "men": "Mende (Sierra Leone)",
+        "mic": "Mi'kmaq",
+        "min": "Minangkabau",
+        "mwl": "Mirandese",
+        "moh": "Mohawk",
+        "mdf": "Moksha",
+        "lol": "Mongo",
+        "mon": "Mongolian",
+        "mos": "Mossi",
+        "mul": "Multiple languages",
+        "nqo": "N'Ko",
+        "nau": "Nauru",
+        "nav": "Navajo",
+        "ndo": "Ndonga",
+        "nap": "Neapolitan",
+        "nia": "Nias",
+        "niu": "Niuean",
+        "zxx": "No linguistic content",
+        "nog": "Nogai",
+        "nor": "Norwegian",
+        "nob": "Norwegian Bokmål",
+        "nno": "Norwegian Nynorsk",
+        "nym": "Nyamwezi",
+        "nya": "Nyanja",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
+        "orm": "Oromo",
+        "osa": "Osage",
+        "oss": "Ossetian",
+        "pal": "Pahlavi",
+        "pau": "Palauan",
+        "pli": "Pali",
+        "pam": "Pampanga",
+        "pag": "Pangasinan",
+        "pan": "Panjabi",
+        "pap": "Papiamento",
+        "fas": "Persian",
+        "phn": "Phoenician",
+        "pon": "Pohnpeian",
+        "pol": "Polandia",
+        "por": "Portugis",
+        "pus": "Pashto",
+        "que": "Quechua",
+        "raj": "Rajasthani",
+        "rap": "Rapanui",
+        "ron": "Rumania",
+        "roh": "Romansh",
+        "rom": "Romany",
+        "run": "Rundi",
+        "rus": "Rusia",
+        "smo": "Samoan",
+        "sad": "Sandawe",
+        "sag": "Sango",
+        "san": "Sanskrit",
+        "sat": "Santali",
+        "srd": "Sardinian",
+        "sas": "Sasak",
+        "sco": "Scots",
+        "sel": "Selkup",
+        "srp": "Serbia",
+        "srr": "Serer",
+        "shn": "Shan",
+        "sna": "Shona",
+        "scn": "Sicilian",
+        "sid": "Sidamo",
+        "bla": "Siksika",
+        "snd": "Sindhi",
+        "sin": "Sinhala",
+        "den": "Slave (Athapascan)",
+        "slk": "Slovakia",
+        "slv": "Slovenia",
+        "sog": "Sogdian",
+        "som": "Somali",
+        "snk": "Soninke",
+        "spa": "Spanyol",
+        "srn": "Sranan Tongo",
+        "suk": "Sukuma",
+        "sux": "Sumerian",
+        "sun": "Sundan",
+        "sus": "Susu",
+        "swa": "Swahili (macrolanguage)",
+        "ssw": "Swati",
+        "swe": "Swedia",
+        "syr": "Syriac",
+        "tgl": "Tagalog",
+        "tah": "Tahitian",
+        "tgk": "Tajik",
+        "tmh": "Tamashek",
+        "tam": "Tamil",
+        "tat": "Tatar",
+        "tel": "Telugu",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tha": "Thailand",
+        "bod": "Tibet",
+        "tig": "Tigre",
+        "tir": "Tigrinya",
+        "tem": "Timne",
+        "tiv": "Tiv",
+        "tli": "Tlingit",
+        "tpi": "Tok Pisin",
+        "tkl": "Tokelau",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Tonga Islands)",
+        "tsi": "Tsimshian",
+        "tso": "Tsonga",
+        "tsn": "Tswana",
+        "tum": "Tumbuka",
+        "tur": "Turki",
+        "tuk": "Turkmen",
+        "tvl": "Tuvalu",
+        "tyv": "Tuvinian",
+        "twi": "Twi",
+        "udm": "Udmurt",
+        "uga": "Ugaritic",
+        "uig": "Uighur",
+        "ukr": "Ukrainian",
+        "umb": "Umbundu",
+        "mis": "Uncoded languages",
+        "und": "Undetermined",
+        "urd": "Urdu",
+        "uzb": "Uzbek",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "Vietnamese",
+        "vol": "Volapük",
+        "vot": "Votic",
+        "wln": "Wallon",
+        "war": "Waray (Philippines)",
+        "was": "Washo",
+        "cym": "Welsh",
+        "wal": "Wolaytta",
+        "wol": "Wolof",
+        "xho": "Xhosa",
+        "sah": "Yakut",
+        "yao": "Yao",
+        "yap": "Yapese",
+        "yid": "Yiddish",
+        "yor": "Yoruba",
+        "zap": "Zapotec",
+        "zza": "Zaza",
+        "zen": "Zenaga",
+        "zha": "Zhuang",
+        "zul": "Zulu",
+        "zun": "Zuni"
+    },
     "it": {
         "aar": "Afar",
         "abk": "Abkhazian",
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.id.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.id.min.js
new file mode 100644
index 000000000..7c3220a64
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.id.min.js
@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.id={days:["Minggu","Senin","Selasa","Rabu","Kamis","Jumat","Sabtu"],daysShort:["Mgu","Sen","Sel","Rab","Kam","Jum","Sab"],daysMin:["Mg","Sn","Sl","Ra","Ka","Ju","Sa"],months:["Januari","Februari","Maret","April","Mei","Juni","Juli","Agustus","September","Oktober","November","Desember"],monthsShort:["Jan","Feb","Mar","Apr","Mei","Jun","Jul","Ags","Sep","Okt","Nov","Des"],today:"Hari Ini",clear:"Kosongkan"}}(jQuery);
\ No newline at end of file
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 72ddda58b1b1cef1fdabce004c2188e9073550a2..5d7c20109607275ee8b5a7d9743094aa6e929cba 100644
GIT binary patch
delta 19
bcmdnAl4;XQrVZOeS&XfW3^(r%{cZ;UQ+NnN

delta 19
bcmdnAl4;XQrVZOeSq!X<j5hBM{cZ;UQ)380

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 4b2d77aba..038d7a3b4 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+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"
@@ -519,12 +519,12 @@ msgstr "není nainstalováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2762,7 +2762,7 @@ msgstr "Chyba"
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Nastavení"
@@ -2909,27 +2909,31 @@ msgstr "Calibre-Web katalog eknih"
 msgid "epub Reader"
 msgstr "Čtečka PDF"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Světlý"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Tmavý"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Zpět"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Po otevření postranních panelů přeformátujte text."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 147992d3219271a0b37daadabe703083f48c64ad..fbd6179528c546f291a3afe7be1b9e5aff15f54a 100644
GIT binary patch
delta 19
bcmbP!o_YFt<_-6oSd6WV3^zY++L8hQSz-w2

delta 19
bcmbP!o_YFt<_-6oSPZO;j5a@R+L8hQSxpG$

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index a87badd06..9f293e5db 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2022-08-27 10:00+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -509,12 +509,12 @@ msgstr "Nicht installiert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2735,7 +2735,7 @@ msgstr "Fehler"
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Einstellungen"
@@ -2880,26 +2880,30 @@ msgstr "Calibre-Web E-Book-Katalog"
 msgid "epub Reader"
 msgstr "epub-Leser"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Hell"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Dunkel"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr "Sepia"
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 msgid "Black"
 msgstr "Schwarz"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Text umbrechen, wenn Seitenleiste geöffnet ist."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr "Comic-Leser"
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 7aa66c6bb119e761082d4eb0ccd05421551c1929..e32a1501fc4c72366bc2977372eed68520ad6105 100644
GIT binary patch
delta 19
bcmaF6k@@XL<_+f2EXGzwhMTRUH`M|FRJjMy

delta 19
bcmaF6k@@XL<_+f2ECyCaMw_jpH`M|FRHO&b

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index fc3fc58fd..8769b4cd1 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -519,12 +519,12 @@ msgstr "δεν εγκαταστάθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2762,7 +2762,7 @@ msgstr "Σφάλμα"
 msgid "Upload done, processing, please wait..."
 msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Ρυθμίσεις"
@@ -2909,27 +2909,31 @@ msgstr "Calibre-Web Κατάλογος eBook"
 msgid "epub Reader"
 msgstr "PDF πρόγραμμα ανάγνωσης"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Φωτεινό"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Σκοτεινό"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Πίσω"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Επανάληψη ροής κειμένου όταν οι μπάρες στο πλάι είναι ανοιχτές."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index b42dd3e4a830a6be027f22122176bd2da6c95632..e4f233235d557b580c2658293e9d307fc799371f 100644
GIT binary patch
delta 19
acmZo}VQy|=-jJWeVr*q(xVboILMQ-4a0crD

delta 19
acmZo}VQy|=-jJWeVqj%tw7EEELMQ-4TL$R>

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 3207d3dc4..243c12eb0 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -523,12 +523,12 @@ msgstr "no instalado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2766,7 +2766,7 @@ msgstr "Error"
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Ajustes"
@@ -2913,27 +2913,31 @@ msgstr "Catálogo de ebooks de Calibre-Web"
 msgid "epub Reader"
 msgstr "Lector PDF"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Claro"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Oscuro"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Regresar"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Redimensionar el texto cuando las barras laterales están abiertas."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index c3701ba296275c66882257fed8ba66b21ee14bf7..654e67c0c692beab4b70f7fe86fb6cbd50ca6457 100644
GIT binary patch
delta 19
bcmaENp7Gsz#tn09S&XfW3^y;Z_0s|XTnz`}

delta 19
bcmaENp7Gsz#tn09Sq!X<j5aT@_0s|XTlfdy

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 9cb309b92..f25377bd0 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -517,12 +517,12 @@ msgstr "ei asennettu"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2754,7 +2754,7 @@ msgstr "Virhe"
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Asetukset"
@@ -2901,27 +2901,31 @@ msgstr "Calibre-Web e-kirjaluettelo"
 msgid "epub Reader"
 msgstr "PDF lukija"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Vaalea"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Tumma"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Palaa"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Uudelleenjärjestä teksti kun sivut on auki."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 2644819bb0b47fe974d1cc9d8c3f44ad0774f6f0..689ed98116387ec058b0606fca82dfc3b23008c1 100644
GIT binary patch
delta 19
bcmdnIlzH<~<_&lAS&XfW3^zZ_zmx<3R@?}_

delta 19
bcmdnIlzH<~<_&lASq!X<j5a^azmx<3R>ugu

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 18cfba79e..4b4755a01 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -535,12 +535,12 @@ msgstr "non installé"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonne personnalisée No.%(column)d n'existe pas dans la base de données calibre"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2778,7 +2778,7 @@ msgstr "Erreur"
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Paramètres"
@@ -2925,27 +2925,31 @@ msgstr "Catalogue de livres électroniques Calibre-Web"
 msgid "epub Reader"
 msgstr "Lecteur PDF"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Clair"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Sombre"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Retour"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 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/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/gl/LC_MESSAGES/messages.mo b/cps/translations/gl/LC_MESSAGES/messages.mo
index 1e77bbbbc4a56d80d70d625e5c533f4bf663fdcc..ee44f2445242b5c2e5aeab2a540379129a2e17fd 100644
GIT binary patch
delta 19
bcmdmaiFxNG<_-6oSd6WV3^zY+3QGe3U9kw(

delta 19
bcmdmaiFxNG<_-6oSPZO;j5a@R3QGe3U7QHi

diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po
index 02cbdfeca..228e54679 100644
--- a/cps/translations/gl/LC_MESSAGES/messages.po
+++ b/cps/translations/gl/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2022-08-11 16:46+0200\n"
 "Last-Translator: pollitor <pollitor@gmx.com>\n"
 "Language: gl\n"
@@ -507,12 +507,12 @@ msgstr "non instalado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de execución"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Columna personalizada No.%(column)d non existe na base de datos calibre"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2733,7 +2733,7 @@ msgstr "Erro"
 msgid "Upload done, processing, please wait..."
 msgstr "Carga feita, procesando, por favor agarde..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Axustes"
@@ -2878,26 +2878,30 @@ msgstr "Catálogo de libros electrónicos de Calibre-Web"
 msgid "epub Reader"
 msgstr "Lector epub"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Claro"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Oscuro"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr "Sepia"
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 msgid "Black"
 msgstr "Negro"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Refluxo do texto cando as barras laterais están abertas."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr "Lector de Cómics"
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 15ef47ae1c37ed852462f5a12a941e1632fcb2a8..3572c0c3707cf9f49e351eeee13a1bfbd78f4093 100644
GIT binary patch
delta 19
bcmZ3wk8$Zf#tolLSd6WV3^#u>(bob1RD}nr

delta 19
bcmZ3wk8$Zf#tolLSPZO;j5dEW(bob1RB#8U

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 0524c00a2..c9ad57d3f 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -517,12 +517,12 @@ msgstr "nincs telepítve"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2754,7 +2754,7 @@ msgstr "Hiba"
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Beállítások"
@@ -2900,27 +2900,31 @@ msgstr "Calibre-Web e-könyv katalógus"
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Világos"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Sötét"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Vissza"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Szöveg újratördelése amikor az oldalsávok nyitva vannak"
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr ""
diff --git a/cps/translations/id/LC_MESSAGES/messages.mo b/cps/translations/id/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f9c17dd452945d0f28032e9da0188d4935c4fa11
GIT binary patch
literal 57142
zcmb`Q37lM2o$s$GTVx4~?8pTPNg&-J0R+Pmy3^TL=nja8Slw0Wu5@)(TT4QtsDO&1
zj3bKshP&vXqce&-iq3NeH(YU4oH2syIHS+!@}A54{{H`S?!DFBNkH|3{i}2C+0Xy{
zx3lDd!yj{7!vE$zI!R6dUw@23`TtH>k|f6xJQ3u-<Xrwd0jz?Hz*|7&`zUxg_^lBB
zDVP%8e`%5|1{Z**flm(M=YR(gejm6MybHVxJmjn-c@kIw&ja5C?hD=zE(ad~_Xi(;
zw&Q6aO;38kqrs)%d~h8&2W*0efY*TsfiD4%1YZLx-JK!+o1oI|3gKUYs`t;J%GviE
z$GM==9S<G~o(`)1WuVeu1gaea;Njp?L8WVeD(5+%#_MMA6!4wk!Qj7vN`F82IPhoS
z@!+GL=<PlcJdW_`pwg`b8M5Tb;DO+aL;P)^+V?I{<NM(dz8gG}@Rz|d_(M?Ry!PBA
zxd6No+z8$c4uXd;`0K%8@M++k;0EwuGMxcF1w0vi0jPew3p@(E7ZhFm08~E?UFP&N
z58RLNa`3U>DsV1%DX94z0X1&ppvLJ&@G;=ufk%KZ58-!$8t3<d8lMk<n%6IZDfk`m
zSnv;^$~o$MpXZZ7wR<giCfEVh&Ub($O}+*)B*`HRhRR<FD*t-02fPei2tE%~zwQJt
z2R{p{-6ve=^K&++@Mci$7zIxRuLq9<-vsLWM??6lpyunpz~jL`fb+m(F7olZ2vok6
zpvL>@-~#Xl@Ko?U;A-$I;9=k~EE1(V9aQ}rK-ISmd>Z&{umpZD#4o?t>$w~h9X$=y
z`W^$-|CfNO|5c#q?gJoGn|uxwUH=(WeTVk>d@cb+XZ@hkUk<8W+rh_!&jR@`c^!W=
z{@(*N-gEkW9_NCh+Y>>pi_<`sU~)DndZ~h<muo>-L2?7A`Tr28dhY?1?|x9@@(?I`
z>s^r~{Ff}_&wTLN;3?ocz!SiK1=Ze%K-Kemkf}}P40!pgLCw<;sQ!$ADz^h_9IgkM
zg5+hO>i-I;_B{ZKeh**i=}!Y6LwG5u^>Qw#dD;Y?1df3k?-zn<$6G;-+dqM7@7KVS
z!QX&dPsgnCa!(3)2B`L&3#y%~LD9<<;HBUV;9Bq-pvLPY21)gu4XQtzLACG75PmwS
z@vVXTgHxdB<a$u~Ukqx#-VBP)-VJJAKMiWV`~sX09<#>NT?}eG)`G`?SAiOb9iaMq
z3#j>cBdB(L3{-vJ1XccjfXl$&ftruA=nPYp^n>d63&8!rSAzQf22ka{7u5LP18O{X
zfeXQX*7<lY0@d$Lpz0k2HGXwa?R+ly1n@PW=Iaxn+WRd~>-NW>=KV42!+e7$5<U$S
zzZeMk6!1X8lc4DBT5t|{3#f5^HK=;u4yv9HgBq{<K-KpksP_K`R68HH!TWh8sB)Hr
z`-1C0jl&jD<y{V{eN|B9>;%=m7lN9{cYqqdkA?5|f(H@)E~xhY1bi&`zd_~yGpO;M
zyV3C^Q1QK>>R%3OzE*-N|0+=P&;(QPMWEKp9RYs=D&2xjF4ryu)&EIQ<8(8qe!KxZ
z1biQ;_I?sP2>cSL{(J}2IQ$+w7<|lT&v!Ve@i-L}J)QyffP<jc>Gh!K<DbC=;5We2
zz&{0?x5dlf5O6!Fd3Yg6lH{GB=J~fET}ckU#M^l#sQR{p>i?~v>U}rJ5>CDa&I3<m
zacaC)fa=ec;9=kxcsh73D0+Q6cmViiQ1p5~sQ!KrRJlI}HI7FO`h1)LE+KpYsC82Z
z&jH^JYCgXYYQBC39t{2xRKNZVs=bdN^7%RkRQzQj+yPG|{7O*c_AyZF_B){Z`#Vti
z)2-gWb3u*gRp4Ckd7%1t8+au6PEhOU;~-Th_k${D(PduF5UBo+gGx6EivC{`@SWiK
zgg*mnJpKe~z7M?I`#Bd>{u2V83@Y7epy+!EsB+H-4+Sp=)y`2+<8%!udVL-UX(ji7
zYX9L+c7A#)sPgKd;-|pJfiDIR0dEJ70N)Rau0IQ^{SScRE58Rtzb9Vd^M5{gG~qR%
z=;P@j{so}M{pH}{;9cN(;Jx7f;A5WR?KlWjKaK{~{`sK#cUHj7pxQGIt_Pn3(xv2H
za4q<RD}6pEK$UYdcntX35dL5Y-vcfs{<|QeJUR5KPS=-!YX7T1$*cE)qQm>Zi@`@<
z<^3K2HO^z8%AW$2?^aOh?*K0bzYB`)Pkfq>?`fd=e;%m$TMvqUw}$u;P;|Wm)Vx0n
z)cUy|JRW>ci2q-p=IaZf=I;Sebn_GNLhygU^TFP$eLS{<YUfR$>U}eK6nF=y`TjJh
z`S=#7d7t}qZ^udCV#4!4)w2~;Jx>QUKck?=sRgS4w}EQcKY-!~p8{3h7eLkb9Z>!I
z6{z*|JMdWW;F8nPd{FeT5>!1K!85=i@GS7TpvL8&K=tDzpwiz1?gQQns=Z$VH9vm>
zPXG@c_I@q`Pbb_Do(WEXDfmXPAN&-!4BThL`NoBy>U%1v{*^%WXA0a0d?9!$_~H<L
zKllW~9|Tq2x4>TTxU$d3S`b#3JRekl?gurl2UVP|j|SE5GeFVJ1z-xU47d$Enea`Z
z+VO5sbbJ@s2mTCH{XN^ff0uxl5xyaWzYU7t&KdRood+s>IVk#iKDY|J9n?7d7(5qz
z!kCZ4m7v=7bWn6#1+~t0g8PFvfd_yu1y2QE4Qjo90u(*m2Ws9P0M-5<hwr}yMK_PF
zdjC%Z748L<{$fz&tOGS(PXkqN6<iBWf$H}?pz8S%xF7gyP;~bH0?ys;-{%Ef3Tj;}
z58)?+>PIDnC&0%Lz80JVJ_i)t-wZ0>D?zp6ec*}Ur$E*BJ@7d2S0Q}xxYOY&pwcY|
z)!wT@_<HaF!fyhV|6QQ+e*!!WydRto{u$J`&aZhpHh>zZCxhzm_7HvsxQ6hJ;A-#-
zpxSxlgs-<#!Gj221ZrH@gX;Iypz0qD-=76)o?ZlMoxU1W`VWAr?_Wari{Qb8|1-q@
zH~3h>zX4UxK6UTkp`g+o1I__Y3*jZ;frOWXj|SI*PXafBqQjd&weK^a#_8Wc&CAz7
zwd;OxU+`C;%Ksgx{_fXsJPJI7@M$4@4ww>N398<0p!zcjD&0;{?S28M@?IX|ZwHm`
z{ov`~he55sAAp*#$4$Dub0(;A2SKf?tH8P76nGMNGpP370a|&W(tj9Ky`KifFTVt8
zejfxiFTVxP0uOqIkMG5x=wSn>ad`$Pes^t%e-)_t`Zy^5^_74>2G!oA>E#~}YJ7V@
zjq5ofei^88H-LwNTS2v}0!nT?3)Fbs3LXaD4yND-LACempz8k#sPumX)s7=tJ}zf~
z3a<vWo~{N}&NZOwxfxVBw}Wc$hr;*!K$W)(6rKGZR6F-=`*<D#o<sO?;8JisxCneU
zD0+GixDb3O;M|VOjb#D1gPPyhf(yXUfv14K2=RyQaJh5=sB*@@6ucEw`VWGd*YAR7
zfxANZ=$$@Zj|VmXJ)qXXS)j)Mq7YsMD*q**#{J3Q$>10`54;)d0pAabo*n>G@K2z|
z@1$#d9W4PxzvqCO*A)TRfU18ZsPP*F*MV1qbHO{ni@=Y8O80-k!@*?A<;oGD`ZWL^
z1zrO_34AH2@%~p(<M#(p<<7s><xLY@LilB13f=>%KR*Oj&zxuac+3UG2aX4=KLMA3
z8jlqL2SN3J1XR0k4Dqi3&m{adP~-XyP;~me@crkY#`h24ap0q$<$U?^;PHen0JRRE
z3?2hkz!ZEosB+!}s@^+8_)DPr`#n(oKj1p2gY!YvQwC1}$3e}<3&Hu|E5RY~lc4H5
z;@RHb6x6sb0F{0@sBzc`9t~a%ieKym)!yp^z5&!ce*{#zPX_#Ez+Zr86TjbcoSx4I
z)t{$<T0aw@=3xhTBKRy&<M&$d2=FbS(tQY2J)Z*AuFryVz;A-0lm7(OzF&h{AAbU^
zKhO2@mV>HiHK_652x`8^z%#%axCwkU*bDv$)VezAdY6aGLDjPj)c8z+M}jwjqQlpR
z_-}%u?;nC{@Bf7O{{w1X9({w;%^XnQj|bI{G=$Fp)vhx^)qggq{$B-Ze71oa=jVm+
z>%osb3O_0M1mbr*&)f4_Q2giXpy=aK&-d{^8x%cX4r(4p!4$j^d?NTZ@HFr{A-vBE
zy#6PF8;I`*w}3ANHBSEl_JD`p<l}rH*iU#RsQ$eWRQqoM_XA%Eo(jGJ)O!95sCD!k
zQ2pBfg+8t)ftshYL8aRa>idnL=HYdq=HX6oU-09g=;|{e{ytFj{e4jL^m9<@9`zz`
z=l-D9$DyF;WD#iV98|tRP~-D-Q0;vdsCM2CD*XpQweMfU_aB04*MT=Xe>nlvy!M0V
zfg3^f{{^7v`W8_2+z!qG?*!G(kAN!YOW<?C{{$}thhOY^)tkY~3I7<p6ukH)KHe_}
zH80-;F9YY_;{4&+py=Y=;7Q;YL5<^of#-w!{+-LUK2Ut;a&Uie5<CRF2Gn}HDa5}9
zJeKh7pvL24A^r=X(tSOI9|ASrzW_xCzXr7~eh+Hg_kF3?dkQ#*@Oj_@a0Pf8SOb@U
zF9$XMp93!de-EAmKJo9p+#0BIp8+lcuLD)i9iZmvYv368Q&8hD_%dGyJHdH`Ukhq}
z?*<ow4~FoexB9v`8x$RE1?Pg#0M-5*K-Kdm@Br}hpz6C1R6Rcid%=TV?&Y2jt|eRn
z4+Gx^D*vZJjpt9n$AOP|1w0l!F5s=8%A0eWk7qBa@j4qk9b68o{_UXXu>~Fu{vEg+
zyd69g{7+E*_$8?N4}PW7;Ypy<pB2KZz?AS)K;?fX*aLnH)O`K~JQ)0MQ1$*1)cEiB
zDyQ?qL6yHA)c32vCxY8R<$DA8IPg8-A>gOM&EQwSgTVCF`1HUYP~-O^Q1fyZ_;~OK
z;L+ftUgPs|EVzR3>7eSX2iys&{O5uiua}1KYr$oN-wmogKLjrVe+6oNEP1WB;}TH)
zeHwTaSO!z@nc#8Y>p`XeFsO3A1&VGT1m}YXy)MuXsB*Rjyb@HqN}%#h27ETSfbdJe
zE5UyTF98pGy|2p=@D#$&0!4>!0#)w&!2`h$f$Hbop!m$aA^xkN#_PMF*7dK!Bfvj^
zJ>c9oI9>!UCR_tm?(0F(&09dt*9Sn&>*oXhJD3vwIe091@Eg7S`QXWf7lVD^C7}BG
za`0mCc2M*D15ow+cL@I<Q0?63P2SJrK#lK(;054SU<$q#6hHYGcoKLwsC@qcYMy=v
zYP}r#W|x;|folIH;0fR;sP;S$RR3-TRnA*L_3tyF#^>vx()}1zxxWeFgKu{_J08@!
zITbt}JQq9?90ZR8$3U&m8$pfFouKCJ^PuST+W~(N@Moa<@oP}&4tk5X=R{ELUJR-q
z8$h*tIDBt{)*n#gdMhaUdK0MhcY<pFXF>JvJD}S6Um?8DTfMzUf~tQpcp|tOTnbje
zb>OQ5?gEb?-1|1y2Udg1_X<$s_Fho++zqOoUj@~k9|Zg*sQQz)`#3xf)c41O>UR&g
zFL)7n1~>qo1x|wE?{5QB@IG)c_$yH3e9Ai<H-Z}fYXZI;d_3Vh!R_D|LACF^ce=b>
z2de(pfhz9~Q0f02Tn7Fg901RLm$zpM)O@}j6yN(4sQ%mwD*u0gYWLiC`+B$l+?VhG
zsPR|_YFwWJYMgHY)$jL!z2L{eCxJf$`@ng3__`hiRZbIBd#?f2&YM7$^NtYyEU5nP
z3iv1RWWvY3$J3n;>iZSonP5AF-wvw0yTK=b-v`yMN59wS^+-_tTmUNHh2Rxn9aOtN
z531bXf*Rk$|H11!6;yfs-~w<Pcp>;wQ2qEKxF7gkQ1$Hs9}E5(+#gKt^!^_J9z^g6
z@Ki7bMc*qy(f5_0@;AW^;Emu_;8#G=W$*jY<-mUMVDPP==Hnkht=~_B>fiT3mG>)9
z{W<XcJ}#$%y@XeQ;ulR&{k%1V-v)|KKMSf|zXR3pL;lgzEd|BL2EaMs_28l4O9H+g
zRKMQ~YCi7*Q}CPN`)|Qbg!lgdwitLBxDNafDE{!M4|=~I4~jk)fro&rK=o%UD0-@a
ztHC=#<^K(+{C)rA<N7pE-){t0g7=2_!~WUF_lcm=uLd<fWl-s!1Fi=@2WmbK`;hnN
z7;rA(Q$fX_18V#)01pG#h4`li908XQza3OPuMhDb0gohnH+UfU4N&Xh```uOgW&n#
zDIa!z^fd4Y!aG2vzd6LeBE-KJRQkI^_z$4Un|qh*14n_Hr>&sc{d7?CH44rHcY>#Y
zZvfT5yTQkS_kp6PABFIvKjQTt3m!%M6F|++GEn^+0!7!)03QQB8$1WR5nKU&1QcET
z5mbK;{HU*s6G63i9;o$n2B`I01y2WG2x^^t5WE<?A6x?-`!Ux~hC%VQo53OQ%b@ym
z>c_pktHI+4UjnLsHE<vBI`A~`xgq?{5WWKx-P{MN{l|X7?UK!)%D)vn3;YqN{v7{F
zABXv%#<dUBcwYi4-BUsFt-lA=t`C5smv4ac!5@JagNJ^~+qnf?NO&Bqg13Pef`10j
z124SW*VPVC@vjKsuYy_!{{x;2p8sjrS6iUw;|@^mdLMW=_)$>p_#&uwe;+&m{BLj(
z_`C3Z-e)}DxuE*n4{AMb0*?W&0yVxnK$Y{dfVYDx?;k;{FND7cD*rb@@qq_H&GXs!
z_<UUricYJb%AXAQB2e@97EtZ}V2J-5sP*&!sP*x`L8bd6sD2;vSx<iisP@kTRqhf{
z>DGa#fLDU*$Fso{d<}R4_)$>p`xYp^zt87<KF<J8BD@h)dnZ7Z*9KM2^Fif%GpKy`
z2K+Usc{uT3e7!6H_a%G|D1LH2cm=o?+zP%GRJp$gj|S)bFCWiSz{e9l2UNd?K&`8%
zgIb4eP~(0*cr5se@cm9u^?W9L|4In&0@aRRhVXAe&C|Z0_wtVfl`jR={$5b?{UlK1
zz7~8mI0%YPF9$CM{~p{QybnA8{5H5B_yaHne*&uBIsfYYoC~VllS6n3sCM*+_)EZf
zgiGLo;7y>)eHo~HuLVU9cLe-Yi2pjMdVUBl27d~QKOgsR-i{66Lc$ZE%6k>4`F}Gg
zdiz8Oe;HIcKL;NJ{t8t8ehX@z{tSvg&b`;$GauAEoC{tIt^*$nz8LHUUj@zq{{<8s
z-UrSHe+`O`PWXcN=iGoB0+vAacL%6(e*t(Pcysvvitzp2p!oSmK$Z7p@Obd2pxU|L
z7oBcS1l9i~;1j?rLDAQ9K+(?|LFK;-JQ4gFsCD$q5I^TjUd}vF<v$5jKemD@?>bQR
z-5&6+fL{hReh-0a|1ZD+@ONMjc;S~_4;=?r5q=eTI`}}q1Ha;Y`s{$)LDlzWFa<vg
zYFr-#&j1g&&*jP4pwe9drr>p;`u|2y^!a&kDfs0O-sh{nt_}n>|3`t31y2Cg{so}g
ze<rB>%RsHiKJYYfE2#RP1xl{GE5ttlE+D+`*PMQO!ABEb4l4hO5WXB#y;lY-fvRs5
zyaap(co=vOcmengQ1p5D*L~d{4W3PS9=H^I3V0-V3%Cq?3#fK|4_pKu@eP-E7lS7g
zz72dL_~8)#1(*_^`%Q1x67V3x=YkrK0dOw30Tkc53Va;c0Yy(Q2Iqlq2M-4C1&;u~
z4K4xy3p^A&>03@Wi$T%bDp2uPgUa6kHGa2&Dfmh7DDeBB==C?C#{IDSeS9tiHP4$t
zwQmYM7rYtNID7_F|NjVT9#8+a)B6%o^=<~0{%Wuez6w<P_xpEGe<UcnIv&(~EC<!^
zOTeSSQBdih10Dz767XH1_|83`#`_DP*55C{6g>Dlu7~u3qNito$AGT}Ro*{>%Ks@)
zeCzX|=;gr>|FeL<4){k<@@v2EI{!HhR6Cb|DsMGt>lYNATnDQBTS1lkI#BJq9oz@J
z8|(q^0WSrA2`&Q%zUTAv98mN6E>Pq0@1W@A=b*~}J$NB_$OB&g22kIh0*a1D!9&0r
zDEfLPD86|ksCoK3Q0wtFQ0Z?6mF^v&=KD@i?Y<v80ek>F5&VB4eC+oL%v&(rXpApx
zrL9W6oVFY3%AQLrr80ZA^A>DtG$%@JzWI-|-e~i)LpmZ-<x8vOWoam)yvH1kdRnfw
z#*1n4;`q3_(HN~&(t&1mM@2<$t1oQLnz-<>UYe*ZY|U?_lg-AqYOO+ge(k8zdK$gC
zuhSk&SJbMNdOPJT&F()ARz{kYHVImlX0_6)*2|S^D4^Q19+%P`rCPO|);kl!mFA+f
zHC~;Ztky@9`STXkO7+puis{MqsZ$!QBn!6GDy3E>t<+ncW+m-VNh=*I?VyOXRBJWT
z&Sb4oDyPlr=vce8ko2A5T6JV$(wEjNJNa5JwJR#Uw4+q5m4<7TUiE5ZJZ0G0W0iEc
z({A%~xKeBE)C`6k{L<GNxm)dY2enok_1?chsi7!MMEJ>6^)U(69cpQ7tWw*S?yNHS
zs$avCGF0tqyQbNq&rJwyDy>{oZM9o!(4=+vk!KukblOSZ$VjEtN;fn{MFQYRsZB@Y
zbX=ynTa<=5SXpmZn(2y0vsoEwr&~(xG3AG(RgSXJk#br8Py1>NXQjM&pi-|^%IQ#P
z)V@uRAL+E(jfr%mQR__9MJb(%ryFQYl&W<rYHb-3tZu8as8sSMW_2r6V1di3gf3-<
znpJCnMV7kjUg34D@H*&Gti$Ldmc)FQnj>SZA1i~P%>;o7YX^U0wfZ?J+O%&>L(|5L
z;Eqy#gx(HTR8+zk=>LtK{x@AQ22qP{x0G6~osA|VrLXBgrB-3)`{4+5-lG~j>mutI
zURka(#`Z}+tq`B~LFi?N2F*TRS`kfE(k;!#HB+gUu*S~kG$h$->m_EWsMb`&s1a2e
zw13)Ag;<}GR=VKwv1+?gqu(sD@XhBp1iXfH6$It1PnAuMm4+*7N-cJ@o_6Zvbvl|>
znoT%jV`QWQWtDp)xwV^9X=xNPuvOTE*6WS>)I_60dGS};-)!uJ=Zq$OK6~k4yVO<+
z4>HE#N30emGS%p$tfE?NDiu>%P8yFi7Nf5_OK`oi&&vwdz;LtDb9rSLX4#smkEHOF
z(y+J^WI`85DrqU*)~VI}t1VtiX{PHN!wtw&0%3QRP{N4lqLPMsQq@+X>$R{J_nuQJ
zYn4{o*oGXcu{N1QG0Fw4g?rEJ49B`PToGesDkPx9eI9vfUAdb1!Za!PHz~6LoBA8I
zZ%4IN9j?}@?J3A1;~{@dQ>{cAXwp5(FfZ^CjAbCa_84Nzre_bcsD_uC?LDMujdj{(
zmYI??jndS*Ryt9tceDnQzIM6+8QV@b*O34NeOrvtrJK-KR++xS3LFR&PvUlIWNboO
z!C>`T(pM+MnsQE4=~71QO9R$I0*Gp`(e%WPrUal1|L~DDYl%=DB$?^^244w^Z<Jw?
zBkiQWG&0VgR&@j}Ro_+}?F8oA&p0IgHTx`<Hg7>xL|7H`7Ffp-w8riRDs6Ou5Ljhu
zS~}P<NvKsk6*zL)Q}6!Ekc6@)8Y{I>Au9E>R4%jnqWDlJTcMX$b(XGKnP}`F<+djB
z&n9_BS}83-+D|gYTHdz2q#;;h{U{bbiA1JC!9v%*T;H6gAbN{i#STBCQ|YKNOwmZA
zjtnsoLoZxAy_yfE%kDX=lwgS_%Qw#W*D6TyS{Qa8Z_TP^%1E#T-`!&u3%xU~kCnCe
zL7quKUfTqUK)S8k<nJ)`M!8Uu<_@zfS9Vn4<l=-3#js?T`1-J@X{1z7TcvFkXoIZ2
zKFhtK7fA97aw{Eni3_!ReTDc9L7k0bQ22By$^+tSMizv2Wwg<pn)$^vHJ_1L$}@Ek
zf|{ijhy)b$tiaJyofTZxauWeci||%VR+{K2C^#N$v1mzFD#&oShJQ0zXX^l+6#>ZT
zOjMeqBo|>XOH4dhk|^6E8%YPM(jnEo_-SR2O4O<r`O$*GN?Rk-%2HH@NzfDM6UuBi
z8qij5S7iyeL3Fgh+Ge_iR*U_B6hnOy=jqxy%#-Psy4$H!vN4nj8t<fA9Yn$I+R_-B
zENwJDSNE9XVmYYK%hIlxSe9$kZc~)IQn==|0=`;njCOr7i=)z`rPCE}1Kcv*(pG9H
zl_8VTmx_*q@nSLQ&=@vXU7T)_^V5maRN5|$i>h~yF+|H%d~Fz>nU+o8j%q*UN#V}N
zVOvAGUD|3_CR<wGmS8H&RZmCV0A&qfM~QwIfEJ>f8tU^iRcbY=ciYuy;zug#pMcrY
zFPXHAwi`kwh)TI!!Mq@itqBov{&R-72%n}j>w$r+fTaF11ILth6zZt5hp;VRapXbg
z#+Ybc)%;||ScL%<E8S|wClQSXx}x;q%)p9~gOw&@nGQ`&GE|<fWV)M5OIARIO>xu_
zO)--gCKP@&GN#Xu)Q*MRv4C@P)=Log3pF%QJF%uGkdRVxHP`woZbNl+BU#ayK==kP
z2LY)9Oh=b6wvZ%-Oi8C?RO;MIV#_JSm)wHvRS|V~f@P6Gpa^>1j>v2_u<}{)CSRNZ
z5)$3daKD7S#=Wxw#6PSnrS`Hc()m<Ok6qETvObD+GbX*f2{~$QNh6W4x5`A6%&sjV
zq=LC3Xp%W-Vma+bR)ct<roP~?X{HkrE^QQl+z<?}zEcOw3{gTy{fD?!qf^6qqJ@F&
zs}5NAXDAGLx^0#A$XH|q)w&OpEuO3>7*4gW)iHtX51+SsL}0627g`yH-zYQEoZ3P}
zkGHkkxl^5>6zj#J)KrMrXv6^qKEg3sfx(55ySCNpKtmoV`Rd7n^|Wux+H`#dp<oFX
z%Pvh;$SOqLq;mOS2%FC!7^#~Yz4I2h|6pMmhJ+cU(K7dlhIGWOx6EXV*;$RuY%<WF
zEy>9I_UiK>5As5_T;9YI){067)?KzWE{cItb3Dl;9TZVeQ?uwO-NH<j^9&=|I)JvJ
zk`XPt!uRPCtv4B{Y%6tYXz@YI$Re^zpn}YC(#k$x7VRGxsxhqSTbY&w;*3R$<w;H}
zg}fF4EH3^w?~H#AtF5&xelxw^c&5jQx!JNrUoW$mU37QTrWG|Kq4Z|4D6_*G_1e@T
zFUXW&CO-S7iP`}bn6K4!<L<h{s?!+FYznG?v})<?t<JC~ZK-`(N#@|{c9{gPSLQJ>
zyTm;vMTZ!_r)WxRq*<L5-z)ysh`E*Gs*-)Kwv2rjWl%CuZ5i**exwU7g(WgNHctza
zfkx5cVV(_fD|c>)xto__s4-r_MBGba=-xGjhm%q+2&HpZR`w&!eU5qDG;J#XFi;up
z$YVA#E`>A}22TxC7)mEXbB7T&#oVZ7m|9FN+6kJ`<g|iF)GV3Bf<z1E@n-4s$;zIM
zs7@&^M@;ONECBQv_*rFQ5`Te&j%b3BBrZC+Jx|Ok*^WgKgS1HuHLwm=`NLN>Po@mo
zC)u#l^};TQjU<(nMl@%uDX#t)9cng<(-uUS%lJJsuod*~j5DpYRY8Mkz7+GKdfny1
zODtv7(6f|UEm8Y6N2dOy(RJ9pa=Jd5SJ7f-v-s^ppqtD;k#@6NOB0sdEEN?Oqb1$l
z0II<ogHDuKO5bKM0Vc!A;s#O5${m>=L!}n9m`{N68`qO(7WKF-71r`>T{~NojfMJm
zW`*&qqv=7>SycF03SR1!bz=;Ll@()VI!eQrE+!J<j1$NJPC~@S(kRN_hH8Br;Wp7g
zfMe?54-cQiAY57*&As5^Q*<-0tdBIOoV%@LXQ)h8(NF;Q__$lhKX?q?^Sy>#;rEDX
z>ma9mOCF{#tl3aT6kV}QYcvW}Ge)pnY&xt6XfEV)?~YgN7Or`(JVFy>D!K<pq8{u)
z=aK&1bScxQ(jq@HWh(J_<Hcf9E*L$s68!vHe9O{jUKi3L+0cfxD-@MR38F#*H12|p
z*tNle9T@D|;5AGOY&Vn-b=K7s2B@~JHxTVKwF*HQcnQio%&{sB$XczXUMrWNa1?ma
zt8f{vM6+pVdArlBvp%dBtx0UeiZlwd^_=}AE3ZNCmOnhG+2XXOd+STBQ?8^duW7Rz
zh(M(L5LKAt5ECag27`kmW^mSWO=YBG1_uqEsL~P2Ozj6AnXYP}**aSnTjamg2MY~X
z>zHS(<W+E8NZUa&Au71&WHUXhg>)NHsagM$3n-)&Mo+W4&=ia~hIy$Yt~Q%O5*3hi
z!IrG;2z4nV3wsMS6!S>Kaa|!VvvLjFS9mx|?Nlz0X-?omLBXzImYBV5?0ZN7TU~9h
z=?oX^n?0F%2a3rsK|}=RqM2Dp*Vh?&&7yGfkK?7HgD1lnR9a#PWs}1;wOH6WUF1{-
zU1+qW6f&BS8nkOhi*yEywmqq273PXIoV(@8Dl@Kp!fXJxUb-P&ux`uB)oD+<)~ulD
z1}o>9iCL&-2C2_cF<nR<GSxD<(nSH*l-b?4-RXS)Thx~mkawB6j&>MUDyt5{Y@@zl
zsWv?|lkY1@V?{t4%yDIh%{*6dVkK6DZA;iNdMS_<roM!{O2|Fn@o+>jl^BGlhdWq{
zJ=7gw4-6l%eV$go`Ec2#k|mCj7n*NL(b2O0qLVc%lk5i2>vG3jD6RmK5*Hp~I$2e#
zPTC)zw`7&MxQq)&1xVJ{rb<N){Z%X-@q7|biU$zJZD@Ob<J#mip-JQ@bQOI?%Sol<
z9@bJiq_Tsz!>lc{g(|MHVckp3eB?P~Z)>_)0ajTZ=bVh4bX2Nf@Aek*V4EnzmYSdH
zD0&4}X&JlRO!RwMvbs{QG~so|e?lm1PX|_&I~McLraDM?r!0v)n&l?r(pSuE`GRh#
zHJQ1$T6unkT=|V_&6c1HJu&Td5#AmWJ@d@#kcw7RS1o8|+C5`}ZFq{}(795&Sz^e?
zq98rBHLar|Y)a2eXTo^3Y2qkkYFv65b#Dv%@P)0Wq&rnUMN7MKgk(FaC2!8sg!4Yo
z3+Dqek4bk-IFnO678GTDa5AZg?8p#f)9y?f%R!StM_@$o8PiFYUl}$Te6nI>S)i)`
z+oz9Z?tRR>?m{{rvu3rNxQ}>~G@Q)la*ZH<^JrrNwuGAUGkdn_pLWQBWS`i&*WniV
z*|1^hAOc^S2-Az}+YTnMxuXtdwK6ElnxUaBscA9Enu?AXC2Oke@YUVn!S714rh%t+
z4X(*+wOLT(XFC|D*{^iL#s;D_>VJsnBtO;S&fh}#G96JVBxn_Xn@dR2YlY4q42pd-
zIf$^$ETNtFqr_!4<1@?)Ox9}SkZ$uI2190~v@uc^rC26WWO2xWebUG<<r=8NVv9Md
zVl>VI^POVaXG~FNCX5Yi!cbTiJPgq;w>sGL)Nu}2QmH<LV}(tivS;zlH_EPKZP@t-
ze&Vgx)_~T6dH&YcA;*67VPCDLlrJNlGrT@O0ThF>m*G1)Sd=BXH0<(I=Cm))JB(3c
z=pt6yStjI%JF<~fY@f8o)7E5V#P&zBG~HZ0c)hZ(Mxe1>rdZEX1f6A%x6KH<aG1R!
zBk1)NHu<XCruJxQ<3=5Bl$xAI!dcx$&ut|{Sq~raDK9eGc_o`&tlG|G;y-m5#ym$J
zwx7!qQ|AkZqZqd+6KDID*;1abd&|e-R`h8D$2q9>V&KRNHskVxK217nX2Ma$VnT@{
zW-{>Ig<f}8S&PzQdP<?EkK7^bZTy?H5RaZ#amVzO)HvaSflZ<L1$)}6UEOTJxi?mH
zy0Vq7s#a=c@27uI?qYcJ@OJiCNN3*fLJ3_T(lxlYw$|Z`VipXz9PneD?QHF~EK`)s
zAGSu?nU0d2GOu+?icTcuu)vM1(nyMb-CTONT`?<mX=Z$iH`O<nya%(S*h`;h$sy`{
z_+3U7l9sbZlE5Yva$CD4^I+JpgfwPm79-%?n=#B4wcI;k%4pZ5?Jj<AlR2{_TUHOR
zV{ykJ8sPc<K#Y;bUxy0O_hS^lD%;?7oQ*S)8aTck-4pGPkRW`hkMq;KPo?tWt##=<
zmaJpVi{8J$%q=CQvQa3lZ6O{w9dZ$ipcE_${Xupkg8W=UGugmyCu^;@x0jz%4-CvF
zAYDKWSC`z+!QQAJlU?B9UfHSQJt*BQkmeL?G#uJ9O(N#bvQdE@CEQsV-cw#Gj6I9{
zMR~z|WE@KDRml4=#fMRx3~amGFS=%0WbU|Av~m4zOE$)44Ti*|R-k<B`NVI`C`p8y
zoFM){`x_j?i{$PxqSAc8J}%c`X16?oJ{;1wwd+k*9Yl8UvjKVIv8u(yQLa#Sv^zCm
zhje(Xa(2Ju#!`*>n4r>Tg)>b|`9?P5(!Lh%%ThTDI3W?draIA?Frki87>|-|)B%>n
z{-PL%^OUkvT119@@yo>;Q~6Nqm0G%XApg>JuF8#0D%N)I@Kmx1O@b4~>PeJ{vuuo`
zB-La_n?<O!<>Bl!sFb*>Ydo1f0`0+ATnmzOi1M##+aGG7E1R^KII^>;!GDZIi_JpL
zhC;fSrzdwEw}k}ojHcr*@O$(0$QGqmgpr8rVR1#{2-;Dp=O2A7<*{~jCi(!S1G458
z1x-8bM0K#wRKT8+`k}dy#I!0hG?^ml!Ud}~KkTm(!`4sX0>Bj<@r~!sf*mpas6WL8
z^^+oc#RHrWjqf0#aV|`y{eDOcGeBDRf-^7VgE`_oW?{@)+>jI73;Fq6XLeY1VWkv#
zSK=!s+e6sAKG{6Xj$j@3HuIhainKHx%#Y3E$!6)-K9R0hFB0b>r&!t!Hhnq%uvy2R
zkVmG+F0vg$Q_*3Z1$ziT3ORM0i`=N~W=2F^-88W6lcS5bPgdZAI2nAyy49JKkAzHU
z5vEw{8#SV^#pH`8>!XWdgOiJgaY*ewZ)37`GS*IEF@^&fEQe0LFtw}X>v%Z+>djW<
z5Y&!ugoesXBX2cJKAd8d$>iR5&W~1F2(T>!tBjFAspv$=2CX}BO<PHdV-lF%c(yIB
zalZJ8f0GuXbS6=-um$<b&NMxU>5qJW`f0c<LDc>6*_b5+S7#P!M}i+%yf2<Q3PBNO
zJOL~!rc%;ptiui$ATro6-kEe=^C+dJfUsX>SAw_%!kjKj2R0cM8GjGzM?trnt%N~p
z)WOQg`yWOct0InBY*vuLVTA1bp1EMz;WF-68<S?m7>-uLhJRX`tX|D*PByAciv;z!
ze05I0u~^JK--v~{F{n3U?;HPRR_yp8#L0<KDF~tAd4{fIOktmRdg^k+2&7rr#zgy_
z9=kgd3M;a15rnA>^ueeC3prdA38`5pwG?Ry^QzG<bp6)Ju~~u3S)1SwT2ihG#La1Z
z1?B=?ZwGUO&o8Q<^sX`4si9V2T5_z+EMAUd$UA6@o|qD>Ak}e;vRFZMW^f1Tk!JNH
zugZrfbxRYGt~(v^M`|()y0b1s2}*dB6-O#io>G2r#U<`P2XSxQ*-caV+mqQgC_|j@
zwOPRY!PzhEC5N2)V8K+bQ7<iz8)_6{O54N>3K8J|aTdb@)yR^)c=SDsqeK2#3)WjO
zh2m4^q?opp)A^<H4(XPa%tN0EC|zMQw|#C5yF0_Z_O0X+o$fZ8F)hYc0=%oFod_m$
zWE^|GD5406^aG?9TnM+452ViFyBK-VY>|D#Y-Pn1{kl;X0x|+(37iNkvG?kAXm1c1
z=z$p7a{s@nZ05!hr{iO;{1<<xY6)d>>qpH~B7{{`@Gb0L3;P2sZu2-^S{Y#l%JFB%
z_G3LPaUDg>xN)Y1lRkXP)jX<<kp%`Gy;#{t&1>ZD8h9-vvToD4+P2(mJMmSdt!lY4
z%<!0-PkXVwN@J`e^PUH9`U*P(>U;07|M<hy<j8BYNHYqGibF`RNrA|M|4J-UT&Q5P
zQG&6BmDfya*(tG7tsSkSl&eeTVbi$Jnl9fsH-f56n4==ysIG_KTN-j<a{5Up3`9N#
zLD&<ovW+durlV@{B-`9;HAl2z#h|l$RYuuYXq#=tI_EQauD;k0BM#@Uc9iq4Do1-u
z>b`iC8feCbA_5zZ=Zr3ubXOCH8muu3Xn^5yfwL1Q$Dh85V>!nScM}wes%~fVmJ!hA
zxymw+bN5xhHIO~UZbBy^Arc;i*f}JI6$Tn{9PkQ|X4?*8q-KMwSQ+KXr43dR2@Q%-
z!B)StQ%{F*QYI!T<;>8KddRD?4_W^_Bt}0txIzDyi_JKDEt<*;(BE+x;fVILRiZD1
zdXExId7v{3E$0Y|&R>>w@z93BWN@hO(jognb;+RWltOHBafsm$A~6{pksrYRYFO-M
zQ5Fij09iO#bXoZFY8eA;+DV{7SPo<zgbvC@6mNqgm@^#3ZzkdLr~`(9JHtb8h;55y
zA&IN2C&y4Q*$7HW4iHaS#e2BjXJ;|wbQjihJe;IbAf@^3CW{@an7uT8nwDECm5qJA
zBdp<$Cw%<do+75HFl3mlmiTK&G8|-?$6vaa9s>vn(`xeJRVJ|tdRLXNid+yL?5%iu
zH$<+C2SB92q}tC;W$=hG?!@Dc&Y*M5P*F{U>jjyv6Mi>+%@^)hV8iOzy=jJnfi}n)
zh-9_{$9%-^n=NG9WyFdJrxv}UWRMf=K?__-Z>A(_2X(NAj@p?T?2ov&HY2{N1KZ`0
zJ{NZgOSjm=CqHKa4}kkxVjYKL&ta$iDIE6XhK!;`Xa2*aEfkKI#y%7^dss<K9~Di8
z)#bA#&i2+kZ<qRF35qdN2>dv$U3K;>aO4!dqr2GbR@ktq99B}0J1tvS5>yr|T}=10
zf{Q4NHwFbI;Puuz*J8}R)q=Zpdi-S645xo+!l2N=3yqP$=2Fy*gi?FN%{t~I^(Hcd
z<;5N`Grbg_V!<t2H`CK)#rYl5WU#93;e?ZL^c-6w+m3|T?d~`W7F{adn<K;}2euGJ
zbbHPf4l0$p-ZR*979ElEb^I{OkG>=8bHT95vg+>92={s<#c8+3TxWIITCL;hL_C;j
zrxxu#rS5O+A!V3n)$p)No{@f*@>@)#wYjVHnDh34fOKB=GQH8WCk+#C*JVROQ?%^X
zOYzblM@@7v+RMt5V85BVvAd*<$ir^p?$XX|qp>fo>)lnGCD>#8IvnGnM*^Ls(d^+?
zH=WqmuxY#K_v$0-I6ECUXg8@6pkCH4D~=?oL8i;u-=HNaLR=KBDr{}&C+6;8yI~KZ
zu;L_X2(w%#WZh48@Uvv65X$arR2hC_H*?tfX-d(m8U4YnF{nLR-G}hSts!zQ1fvtJ
z!=7C`mYJMb>g@aA?B7jP+B(T|MlZ_X6k942X`z48un_kJznJL-LnuDPqx~eNY`Mu%
z{GAqVA!klF?dF7A#JSVTZrE8_Ha*Bw)Z~OIi0`$ypio3`4A6OF%+rpDm3VDpV`&OE
z=gww>RarO(x?JTkrTm@dA)F<OWoB+T;~g{ohBM1xPNJ8wk`~6p3}y2*4yhR1&y{U2
z3qz+RsGE@Sra+(Z@P?XRs=GDI`7L>A%zKmBnt9GgmL=GRy6s?>uW32{HO?Xx<aMvN
ztF1!|v2-ZduXgsPeLC$C95;B^IK#^|4Wp{A9Ck`E6qPx{=x%h?>+WjZYhuOZ2dZk?
zA+%~M*Gw`>qWL9fvQ+CG?$T1A4pkt9xUt8kjjBX`YGG>aG&>YY0=d=vN}sed^VDcI
zgJ~}jZnmudO~nM0Aujn1;U335vx#efqa~B{b_l{Qhj?q4Gu^Ezu7_!w$54|iZOoUf
zDc)DnrAn^GRVGUadz}@UaYtZlT{;Q#AV(cUv6XW=oJmm`n(ojKiGOt=n52dM5i<BG
z*MPQs;Yl&5<LvM?!W!BD8mxS0)lU%5`pNi|ZMw40mTgq}`pcc=e3Q=ND|KuAT7MQQ
zHa6PNTmAi}J~#cN=*f2|l8_+m#KoXZl}%Fj0k8Poy#&j$pq!;$ticb=LPyzw*-+88
zaDFsnM&=et8{=#TN&hNp@|J}e$kJxcVAJ+(0hr3~mnCS8#jmjQ;I?>eA5GguOoD%0
zWtwFSmC@)az1gs1_=TEwma68n_FT|~u?!LpL)!86D6JF7D84v@(81e+1Bzo#*{d|c
zjoI<q(S%UTy-+$P6V3zB4jzYKeZVPXC7NSE(b?HVOH@2JxZGlFqd`*~C|Zk6`D_Qw
zej#35%+8W3`xb9(g(s=h1Z8f<gWz%xMbl+^e8=bviVx{Kpwhcm8sfzQ>u?Nhr<$iZ
zj0y^`d9XM%Th#u&u-#=c7p*5LEDEZP!-kL44D`Z1vvw0du3TWed{#*=bCo1wy0&oH
zmv45aF|jMO`r{k6XfSeoSaeu>_Hjj*ooi8;V6;Fv<(mo*Y#{?ov`|i9{}7FxvAax{
zNm)i((Ajm-R&qIn2&E+M7rES|tOi-VR9Ch{N7xmZjaLMNB3!{Jier&v*eMn%=V>)~
zMdQOCG?R15H-xCeXj~C!@@)>X`R)8}A9<{LdU4Zineaec)>7WDD(sNXymg?2&FEf5
zluawXX*Z{!Q%}~l@h@(I{SHgl@~8FH{#vJbGMfW*V90cn5qqBR>XyC0*Yd;OYg@R~
zab3r4EkC=i*Dm@dC*#geVy08v14wk9kXe=sF){K}Gqe4L1ihn!n(S&KTrO?+g{~IQ
zha_!W*CDH&=Rh+^rZU5DFQfC!>m+)hbbi><3p%bp!{f(Fk#Bs}0ed@SqvPOl6%((8
znniF$H-E)PJ48C{*0Z+U6PC)dG*Yd$59eH3k=v$cV{5cp?&<H0wtA50=~%lx*;=-E
z@hHbuxZ8p(T)Z8{YUJAS&f-AxmV3+Qp`I1UFbVyh0p#$qbm^H(m-Z}K+OzbWbjexE
zmM%Ht%q3@@IcLjeE^lhveOkIDJxiCQOU_%i^qe!!JePDEO09O!5GH?%qvg6b)rTu;
zTgq92(p0H^L8)0CtCpX1&c&l56SeCiviLKJ%XmsM3-k<ONKDI}&YFD-1XZf_NT%TY
zs!v+5b>WipxhJMC7oK_koQ-QYuFS`8N$;6+AT1q`?a`wZ%WUsrG4Akc{d{{d0oUe*
zo%Xh#^YV1+(l(wB;Ot^U8p*Qsyy0qlj$brDY3b?bt&V=)hpVMadzYw+WFD7CI^&&%
zu-QtjG{zbjuQsa_985vT1ad3*4TCP+W~eaQxs*TA8HY|WeLH$(lO3}0j#O*0j)k*5
zwK+X!xm3d#vz1q<W=5*2WLtKOUNuaAd2?EpED6MktRREd8~(<%1L=CLW@3=iU9WKJ
zoe$~UeyD%81k>N%EThltgfP?bk}eCX`-}#(GG0oj06!~~ux%obl(%4hNHttSVs#~3
zum(kRQk&83s>)$kYIKxC7wPuSXo;snCU`<^yb7-xCjdS2wKNuA;v8Sd!GsAM+Z}SU
zMT%WgE%mCe<FNFJ;YN*7MyTv$l6|@;5L-q$Xn%OCL^&11p7CE_nC1ZcLF-X_LNuGl
zH;2)c;Vbn~n#q8aq%@cdL0UkoQ>J<Bm$DnD<Z{<RXM0aQ#Jn-WN#A%2wuMAB{a^(;
zI?<e95xLrNszsdA)F5vxwL0S(<aPMwn?70nOd&6*jhmr@8pLM|X~uLcfYQt2wy7Pc
zR<A{AFVz<hRNIYONk+HQDp8#mP#M%l4WHupSf|A)%Dv_pu$O^CA?X(SjE0Eiu?<>i
zRg3XP6aCCmp~n6a=9V>YVv@>Z!_}Bg)|mCynDzdq$6gzgk)DX5Pz`j_$AnJC<`8bu
zb320$$pm`!;2JG$>i3ZS#WRD&Tvf_SjbVXdNrl<oVU`ek6P;4B)(16Wx>1F4<Dr_a
zr;8|6nDbp9$4Zk7Z$FGDi{4r<cQ`Sag;&C<vVaOSsVoZHVicBrLwsoEgdM$UI&f%N
zy4BWQp?G>z(x|8Q)D))xHTgc?-2=@-35b;XG+Ia(3~;Cc`)vz%WLeKMDJ*eggdMUb
zw2(DmS~-cvAnhC8&H+sJuK=y<7PFw|Z>%MeNse<UVXRZ_MSB@8;maAVvKAR*fBLh^
z35-g8JMv(=W$j~=kT?_w{ApqS2dZcj)k)~fs|_8^BKsy;K4Ul}%3^W6QOB!@)1%OQ
zbXZQj%qKCrP}rTXkE6kI$gfo`Y7#l;Dvh_aKD$#+R_Yx@80GQBPN%p8vu5nM0UcH@
z3Z|Btv|&gJCrF86f+n)3+|4XA$4*p$^H*Bq?AyksT!liaV|ywGmabM%Jru-Lc8vnd
z?5`|$nDrwTQEbj%TBLWGmQvnd*jq0mHcD!nJrN3h|CI%rSd}6YXui^9-0@2Ng~dkV
z)CAy@un8>Cbto2L%JB`RUV?u2Y0wp*TE26{z?3EYlOqVE@JMLFZlh#XeM+3J-7zs>
z?A}cGA(LZ>o1k{F!26-Mmd-Ji5)%RG*73kq;YiGm-t?3dF~TnDP+H<0=#_u}THIGP
zSumhvchH!oeZli3m2Hc!5RBn!qB|es(0#*?wCVyBlCW0gvQpU9<>LUv*A!zKE>*|5
z-Ph)jnQ`r~VQ9Z2qtooc?U+i~>HyQnf^<eRBX(Vfb6ct9)}Ks|rTid`T}Y`%*%P6~
zgpv0&tCD3ilDSR-lQM=n46kIg*ow$gYtJo=m1`5jDn5HSATr&;taVL<wVGQ+-dVIZ
zZa7rL+niw0$iuFPw6q!Tgcf_EoTfQuIioH=Z$bAnq2x+})X7I~uRRT&d}PBslUyu6
z7B|9#-Ucxu&9hb+uEM_&O|=dn4HyzendV_b_=Cv=WBL_L8154ctMj~qVc)|vI`fy}
z!Ly<I9@t$6GFM(EQa>|#-&2}?Q_=TQj813K!ab%!b<rMnb&rXHZ3QK;SofHc70EI}
zr`c2E2N5I5L$81DLvMZUuIu0P&~5+pqrZQ_uIq2xb;C<`UH>NHJu@SWL1BuTN0h76
zN2+8Rg;f<qt1mf|zh%7f!&o93S}lrY$vW2?s)?@!u_n2)q97ID!GUi~3ig1$#l&N4
znmfycExwT;bkp6uL^^FnWywdm9gUgeB#@~-TG8=fn%#Bf?U90ifz1}tk}WfTK(19?
zB!>`I0)7elR`rVzro7@WFy^m&G{sWz))tvvvHWOQGt_2mB~oN-WREYC`duX)CCN&2
zOtF_zEIM}2PGZ}jL&FG-Dk5Tnv&50YWBImnipE`jpwTmM7r9<dCp2rOeoa`RJ4@pT
zoDr7HBpTsFNiT|-wmQiY9F<Lh^=Q_lNue?qQM5HA!9s!K=&ocFA&m6|%td3KG(3eR
zTNJj&%cW-JN?c$qkD862xR~>Gohyf;8xw_?SsfF0wPXNulCgyNW@Mr_)or56Qb7Pp
ziuP*!eKp1(jM#LM7C#l_;0D(YSyyh9v8!bx@$l?Qy!le@H22J#j2H`RvC&9uk*@PS
zTNqn3T(}e?Ba=SaBJB~&)&x01P&~rp*6|ok3#WzcZhI7rn)4lDz><ypaPDZ&nc}96
z&zrW4fRab*BtSPtSId0`mfy?D=ez?~j*d@BF0nT>3{-%Q?loJ_MoOsZ6Q~3Hl?C4{
zE}~?mKiL7Da3W+vigjE{=A+W&Qm!#C9ck2MF4-GQaAx(8SDJ~6m1P$OJ$vAkN=>R4
zTu%}^GhJXYzloe={bn!C`b0N}Sv1SCIszYzS*)3GlX3Am9k*Ny9dpkv5Z!iDUtHLk
z2F6RLHgfeTjsSTV%{>;&qt86|?3SR(wro(MnlOz$vLjoPTGR}ZlFbxWEh5#3K0L~(
z5zw2cIBKRXzf6r%FE!xPl%#3NM@i2_giTQ9Y%(L^VoLbm^runtSqoaAb1U|tBe{l%
zRoX=i<VK?yBlGsCW~^u%lO1p>Ue@rQJHHBQLd!-KS;q*hZNW(NgXQNx*7G`bRi_Fq
zxOjsM2jBPcX@PMv&vNSoPfGW*s6O)euf*SwdN#`}_;H$pT<1|7T?Y?&5h1>qEuG}#
zBVs79z^M9%d{Gl>OOcn8h4Em8>B&?cda0H4m_V+N=h=%QIgh0aQKBfHDfoph;Zm`6
zoX=YRu_$p}hf4c#Jc^4+HoNeTkEyz@nsN7jIh<^dOaEX5*5IDf#ll6IUV~5nP_X%u
zHD)*z{-&`a{}fj6vJir_B^#5~rby(n$4K8_PF3IX=X`V4T1bNOAOp^9gnUpIrQ6Nb
zXbHQ?!^y^IR>h;wa;Lh$w!<2=oIYH|+Dz+-rDtB^>=D&MiL-d7+;iFOm$JCbD`l2i
zmscuyJI&`gP-%_xsw(7`{faNDCVfo=UOyz5aQ7sW#|5#6HE8<>5z__zn#sPA65i~+
zyNmp|hx|Ny_NoNSz_l5s_u-_D!qZKDb0~5K1Ggd~cr-OPa|jnzJ-&t5EgYfYhN2!-
zg_T4zWT48`-p-iEM80iNDR1lO-<0tEaGQIN$7x1EITN);u#%AX#5*;J3bm@zt<t>G
zt)^2XebVBhV002=7l2yE8$4E}laY0)xmaParp{z3h|rvWCL7of!!MYcTB;h6p&`|*
zN;Af~sgkp*&AhE@BHFLTc_6mYD=09BP?yJhK1iOX*rF;I+^Du{Xq!e;C-4ew>}FuJ
zUA)&!igb2M!I_5-74|@IlFoQ-)iM`(ocWjar_0xF1DWj-_>-cu_;xK{kukfYWJYv>
zGaJbvPIgzNFHrkhsIU;b+mTiuHijE(UOb`^Uyt@-JY2{+#I{r`h1a4(?c_$ZRmgrD
zVgqA9GId5Lwyw=fkuvY0Y_a)6g77}e7^6L;^7^7upD)7bm8V@ZJl0wABG1VpyWFdG
zNHdm2=@>@qq_pujcPZzuAry8DM#H8?9Hm%DwoR}SzlCu~l(y3N7#i?{&wu-aH@^;(
zG24amB`e`%PPi<7Mntqr@~mN*cP*|gzkS5K*2>GX1iwa>idx*Ckj1e6s(E^dC=ZzN
zp9e$Br^Rk6VSrGqS!{XY@u=o!6<I<TKS%-Jw8&J7f+8;#=L|6@fmx!${((p&kDnw<
z1%iexNL<=I#QdvkzY_7jyJRL4j1ZMf%A3h*%Mx2Po*5NUK{p$`xXBmY1_f7eS`ZIe
z2WJ#DA?7B<x>w64sB=;yXHj6;`KZXl8a8&shh}*RcF2@o6`^4;yV>}W*cxh~EC6v!
z+?hD7IoGQvVx74L7AjL2Q;m&nl_07#fnnwfwU6*mT3Hz@$Mw{UOsqUE&{rYG=&2C)
znaT<gfoa{OXqlDq4psyIYzm?*$x7F?p438|XsRXs_9AQ{!Zfy^w{4_{(&`79{qbsh
zc4vB?mIL{|Ys>o7>^p%mtg<S)pNO?uAUH4I^|`38r3<VF5S$bv-iDnmvCC_>U9tp_
zDTB!DGa)8?_Sj;PY;I%a(`%A3KJgms-cwR@wq(uJet2}9O)I7AQ+F;N)^{t_EU-9a
zdgDhN)EI#6-3CgV`Bp51A*I5$H-g{|h8kyqa3*zv5tmW%4C!1HovScP*uggoG)$un
zOY!yC)ov!5qJp#2bULX*@-Umh?VKT3+)+iXz)UU%I*GlF)>m;`rrW{qbd{$^RnbWs
z9B>@qh_<|ch7Cb;vB)l)Rkk-T%2vklLCO^}F_|q7H-PiEW#b@KeKS4VN$?s~P*~+M
zc7nAXW{?}w)GxLPo3O(Sq|RTMwNtTD7+EP|J?^wdVi!t@I}83TB$n;VKmI8FG#h$#
zKd7LY-J+#n{3MKWH&HmR=75~!ORf|Ta{a4S!o4o0<bTEAe5w<XVK6!=RIW<4lu%M?
zrcrLSvrB9BvSKc=P~Y*sb!iCWdeTCya4gv%Z8`Vk;VI4Lo_*V}!z$kE%e_=o#5LlN
zAh`(ulTBpojlP+zI-4{<r)DqE+W4AE9M^L0i1Aat19BX@KA@ktt)e7JJG{|^A&eHU
z!JF=ONoB_5pS7fldyA$(?LM;!0Q0p>_ddEyZT3%4X*J0oo}H1kTot2F^y+Nk8<`+r
z+fJh+*itT!!@fXKAm@EAzAno@o*WFBk?F@HW@gYK5z`Ycqgr=|V;({Teq|JbvxeBQ
zq7WAvQpjLa!)vo<AQhgU&D>FiqusEU!jrV&0ouXPVD@1p*PW3$^-ahy;)IPpK)zE|
zm`ax;rpT+pW{6IpvYvEMo%10$Ei>y~oH7dpRif)`UV)xM!S?!WRE_pDqJF~9#-dB}
z$_70#ZBhRJX$;cXLNen+##C7Bv|CFroh1?6!H$i=@;IXr63RJO^VBdyoYTfE!ft)s
z=r)z8n?oVOc_J=ra;k@IS+=nHu=|HT$w?>nm8Pngt^Pw~3Z<|uP~utJ?1fvcIGzJy
zj|XF~7~nB_I329CU!JCM*qO;OyfpAN<6>QB$K3BDHrN$CBVz5quIu0T;M?B$&?|3x
z@E>0F;QL?dKX%=4>w_=(=z}kO`>yL>wd?v%?z;YUyKZ>-uIJwH;PY?Xb^V=Wy5ZIz
z-gWasue)p4^|!<%uSwRS9%{&SoKNzuZPsEtT8q936+{7=R7pqa{P+aI$@shPNM$)B
zNW{G9aj(CGoAGPYACh?7kACSWd@7c-%-D;|9q|O66|+j)Sh<sG8?1tL5%-yuC%6HE
zl;$|5X(H?=4~Uav=h@ky;1*^&Jq2?PIVge6RB@}6+e=b1)xn{B%P2UK<sh3S+PAjQ
zgu8R-M6gSHS0ckga4*OJyQ<nHu{vA|I1li#4+cOa<|wk&=4pN+FK&yinnG!bjFV}l
z6l>!Wg7y%d-4^l%IXHVOw8nhd6>>0`!=1_Qr*}t7?CuubE?anQN|TfF(uF<28$Ieg
z(O`nn3%rb_!d}2$&V90fTfzfx9Ji=3m|TmVMlPl3B4@a0X7uIRY)8*eI%eC%W<eRp
z(n2#6EI$OPePm0pS<}H%Vcsmf&YZ+ukLS8}ykL!cm2=I-=e8(>k+N}b(hfN<j3Z+D
zb>ZuZzD1ZvF>%nbUD`adLG$M3MeVt*h0YeTgr*KKaxB~F&++=OL??=e`k`<Zc=wyU
z`FO9!o#_ctI^iFw9#9)6`JSWke1#*{L*m3KC#g`Fo#2O{d^of(b-4BH1&hdFFj+a-
z8LlGVO@peeXM4jT2}<Li2eZ8=o2lK+^&ZDBG$|)Gh>q7~d?4Zxtvx2%)5pA1J~-?5
zJ~*?sB<TAyhloS8wXUJDrDL!7LMt*7S)XhUIJe?KUz>093xw|$QTQDtPyV8B=%ABB
z);!C%`%lw*{;<iStAgG3d$*(!yeJN?efw|mKuiMNW(aB4bIwav-Fms}?VzsKk{q`#
zst{7Fmt=^u5PTO%77hA=UJ0PZ{dNdOLI-K2l6;dB)``>&85N&jOl38=X6xt3*#AL~
z!Yq^}oxKXiG^3#VtH0<|ksV2kqz5IJWHokFTmvh<_q$#C1I^XOgwC~PyliIX1tZ?h
z9v-^1_kMSqcgAU?um|h^!Vo8`xkoGKMR@7g+?3IhDtLd3J_k~7WBJCeg<uei4^Q?;
z-k1;!wz6)zxzki_!I5I3Z&6SM`e02NX_+);dRZFUZej{Ja6gXu;ntq%gH{F-wbr3?
z4p{+IlfCfUlWvx4!HzJS?AN(AR7^Hxy%~G-h?9eh;B9t!*(yijgJ@u))y&C=tp;sP
zk9E2W-=h9vnj)u?uw$@DSC_&8v;3DUb#V5{YIRIkdIlvmsX6*+QhPTz$$}8E5i7Kb
zuBRh4)no%l@#SgLo><b?(s9)i?9xTKl03ZQCUN3(hY>sf%A9Lq(fFB&mrk~ukk5^E
z3;{RNXb&c~SRBi<5Eow-9#Wx+{WaayJC&(qwwro#8m&PywwObSGM#JSfHGR_o^yxK
zBC-PKaUp2bjIqIJ%J*AH>eiCAWA;Q+v?rq)RMJ22trIC6U?}nLpV&xEKkpS&7up-6
z=(-B9>h@ZS$imVW3d)@#9JR-@ot1>g7!tMic#CzUL^rCsQs|)t`r{k86BVXa+6W>_
z%D0nOvaT~BtA~YZzH`^raQxUhH|`q_v7+|mR-oQCE^d~SeJXq{)fdJ>&A{kmmpmxe
zg<|u@hhIa1Hxzld_)YYPIiKLs;{iDv)v&IMaqI2D;}#Dd2adwC#{)%!Ni?;H<Ll-=
zCO4F}9jyt+lJCjN(aFeUCk1WfN~&kNE$wB{PFAQ{T)G;I&&%~*@!0HDW1o(4wTywx
z$j5yQOB0;yv*hZ23)yCLk40?NTgbMt)n!CttZ)*~iB{Ann(5^Q5!&aGq8t`oWC8J5
zj)}M=Jcm5veoov}8nq+a!?t0SJ%<blNG|g%a<YY8$q9Q8IV_v#3uIcNZ+I<EZFa&k
zZstEBQY5nzqE=FHiQ0{Yd~Jp!2x-tvO%<5!lrE3Hy6!()iuiakJa*jtCUzFd&M~49
zl<X1&vnH)BcedGiqI5g&wZQn8^{#7rY%AMcP1E`cZzM|@unWzbhq;1W{O2z=MrLc`
zFdk(vU2pfF%%M{lxQz`x4eQE@DH;6JJt!F@L*c?NR(KHE2bSF#n{N?#*Q>}zZaZX(
zW>XNUd>o%c=<j%bKuaYQrio$WSe?D{2+<W!%1gWQ(VCXq<VZXK5;)ehoFSw3T5LrI
z4KAJt_hM~f#^#tETkMDJN9pj16OxG=BehU=mK(1QHp3XN>~O{5<nT30W4*1x@^!`<
zd?(Us?Iv=c>-^@mPW}9da{y}xcUA3tf=uX1cb575s3~Yt=7d6Im0{DSpN1nek2oKX
z*kPZNO>fc+I{WSx*mf#LQIM;8Q_wboDz2-A_P#P#WJ=rZV6VNe%s52tDXweYvVrT`
z^1>&@Ggd4)e`nUbJmFA=Tr%OOwiR?OfT>DQzSv#Cf$1CjF<3~F%Ke|ED}Go*FGmrB
zmX&4daxM@1*&hiJFFgJz*d;M4D?hYjqaIl<zOlT;A774r_O}oaqB!T|#AjH1m&R9@
z?_Y^h5u=@2(kH{f2p2QMnY1Syfd?B&!z%fy+fnkRN@n83(lpZiaC0O5!HeF8(DMiX
zu&Ih4-ah+>fht87Q_67SW_6xdV-ZXI!K<HN{4f;Ni##$3cX8-0O@nSR?9i31%|qsg
zR0YHoOt#|h?x&fRm$6Ifh&J)+F{Q~6AL(HfFOt~Yny=leG9G2hYdPQlOZbOJ8F#IJ
zKVCM&hKiP;pTx*g8$U?chK<?db^#<!)9}O=uUKMbZbT^g(J@sPQy28=uyw;K2(LNo
zeJP!m4zD?z@`b$VWpxHlW{)?|*vksz9f#c{L_dmNj0g;<s0oGBYjEVU-PWarxhNG=
zEKon^6!cmVXQ1?0GoA}iss5F8`;EM2Uu*w%wuG#nDR_+T@45bwtd+Q?udo*XsmGi-
zbkTLPReA}tz1nu%&Ag_yi~}pd7-I1;XSlYVd@sD{Y({1@cE{tcpt==r&lF0wb0B}4
zQZ+0{AC8Q{q;Z5o2gV9{2%-DvV_$y65fbXt3bd%{f+tgEl8t<-I@uy57#<D1$!@!L
z#_+Mz=d+`YP!>zg{3uW~$`a>R<)a8sK6l*>4+e2}+z<?PJPpMpD==I6*Vk=lX|??u
z_o!hyO(~9!WTQd4@L+$t<1D14!Jm$v#qan8wCMn$eyIZmJ<mV6OH5z%5_E8I6d#0M
zFwCtxTVj3?)TuK#&QNOfAoRkR(RJ#~Rh+7zhgSe87k57gZQGK`U_55QDliG}avhc+
zdsXZTPZ6w6e>D^m9lA1_N5CW5O|!6d17eW*o+a3zr`?n3#}ipqQRkhu7gdzg`2*1~
zUOiDzWhQMy88PeLw6*xwf^FwXO7-G4I*U#x!%FBlmebTpGr;}APPn#HJdC~PXBqrX
zPcgl^lAr0y&X{H|QFxBR+0SqgWR?UEt0<|MK3DmP4^2(>L`<ft&5Y@rsl36S;|tQ}
zyg};0*2*0HKrn>CBaKEK8pw9s(zR^hDq1`V>%rcSF1q5JgiSxokA|fln=T0KT8feF
z^6KqqZI0J?|AfOI*|X9My?{_y$X&)2C0=5@CiCa$l$mp%s4;6e-LOKs$Db(=O9u@n
zoahNxGzQs>7X_OD^4<Sv%Z7SwZJ-T|n$!q#iEU%loy}tGXfxxCMtDI5LhcNshD?vN
zQxb}V!$v=t?S(33*Tpl!=xo}Mqh0y06bGR5GWIg#XH-MI*pY{eH;VIEWi`po%S2pq
zEEbS!9bpH%P?&v-o8Nh97TqU3ZkD(}FaCvb^{eI6Q^MUdMN8bJBuSE&HY`mscn9L`
z<ick&|0#PioYl=U#xLk^e!p<$r*I@nOm&tbnL2EgSw2u#)Z@d{xUyU79*5X~tapW?
z{BpNDS{WwJ#KOCD?bY<knJrcH;@zaN5o(JqqcY9R+R}Q?qq_>(=*B<Gn9F8pD<vGz
zCH~DX^QXBV&^)wq%4%hxr(_4wtXjBEQ#1<)DBQbOA&a_8iD%#N&x!n%D?BJ<Rqi%*
zcpXN`bzo#>^J2lyPiSDcTxrcS<s#&@M$&w3)aaOW=nqCPS4YK$u+NkU52%kN|1@5$
zv-hN8sC!Nt>7|5g&M5g|RWMtwnRV5X#hMoD#&-8|+UXPcMeJo)8je1Qvl~^!1Yz-n
z^{S$nYrkl|_ar`CI_VeFq8PH}v6n{q=RDbL?TTuxq|U6Z+FgRYO@rK4#Fz=2ye$g_
zcVI^be=r8{)dYueW)5Q9adi?qo9X2@O9GonQYYwv{(HbBkr{Qi%NNW$H=q14ft;&y
zt|go8m22+E%9iN%w3~?+_&glZ#6rGx5Unqk8{7n9g{j&4LVe5LVPO5Tf8um+&tXKi
zX^beE5_W>3kn2)bR$#Bw(-jL3izt?ox5CR~@6z`;2Z72&5?{lPo&@6Ld4vzK@2L%?
z@Yj`1uGlAAw^zeuCLFkWb0eD@9UBj>r}!v#6!~JUIvP4u(&NU?0&M8y_339Z_t<bm
z=D12;;m}z(YP$6RaoOH<qwH%oG{jjnqPBm=yVwu{PisjD4u}1Tn*Od+<~NS?Wc9<j
z#C<SA;XQlEWZk41tRRLY&$3oNI_X>N_RwYX!9<dd75F)-c&I9P^GVF!6=#%;5z6y|
z{a$fT290_cd2)L{nB2<dE~q#!QELnS0BIGyLESIZF-+ysVtUa4`4<}}8Af-x#R)O7
zU^n929w_AX6O_Gf0K%+X+g5@oN2Pu{eHrh{w>bRFn|M9{CM(J%|5Ay3EvCrov21SZ
zw|m2iw#oC#UA-(<*&4K?aOixfCH#wtI#CrS*##M#1AfZ;8oD`dERec9;GVl>T&r_a
z*I&yftsh|WQ7kko#s|S0*No`cPP;(tzVaa<HOGw5bg05CkKl{o7$SZoH>#!V%B?X`
zLVwORUoLzNh0@ufjz^vFv#=?N`$ufE%<9a0$bw)5O;3_PS2nrr8^lt=t-R>d^5}th
zS&yn|GLM@@eLMT0;k0wj+9`)G;ADsdLPKm0;dS}(2D?GA*Hn>l`ssE~5ty?_k8y`}
zp6$-qm>MVOH^nPB^foe7JsrKuJ;U8WSJZd;@i-ObB9foBoj7gp3@@ASf9Lxwv*k7-
zK{Q~Vvh5uoYs&KYF@x-Jfo$w!UxMutP8Z`~oOT-_F9=t^pC66~sr_8?=Jlp|>PW~m
zvx(V&rmVZV$!xTQ;x;3psbpKFI*oDBR*>Rg)FUX)Z+OAiUU92MX61>bnpkQ`G;7-!
zqcF*_R4wjB<cA{J%cE|&1DXwPS;_3p=Ph2?$X-q<!I~Kb8lL$wc_Un|5_w(CW18!T
zvdfIOhizZ@04&6MU{s;L>qcM}t;)U8$!g~{er%sc`mHT<PKh?ein27>@$h0y_Hyd-
zEVgiz%=W}$9d=rKwp39gi3!bSb!i$uWsQkHiZ6mk7VdWEY$=MnC81j?z^_E}@6VYd
z9D@a_FczbJ2ik;I@P6_*szhiI%Y_jxm|ZM(W=DR~tO>qUQQG3ms_u;pdkoW(p*980
zqI>*fvhe&P#AO$&c~R7rKa=2oW>`$hNL@jHJ>0D&Q&*yaXM`6wUpOS-&a(};csY{;
zgHCb_tKb7E#A0_RAvv_omYl5rY!l4yEe5+BVI#}a%7wlAgL$GwTO5h|(_#<3KjzgM
zL`g*?BC^JkE6`PPD{gla;wP|&)&4^2a(qiw;&IfsTl1I2X?+K#AX!8wYIZQ+7nUy|
zE$X-*q+=P6%!~{MnzzPCY{CvRgk?7U%38d#?n=|FeaIHQ?-b0;k;wjrLU_(z|5gh{
zrS?9D{wXtmd_0-$#qmtmb#D@HwF^vr_Noga6J==HtK-I(5vwb=Z0*;x<E12;<l*GH
zJsF5c)zxwSz2<7d1flgqsVo+<^7wetMiWee>gAKiT}^l>43k|}mR&YtevLZ}>@%;^
o{ueKZXY><=Cb}g=-Dv8g9r5eFa1}I5eVvT#z!s@|_VMHY2c(#WOaK4?

literal 0
HcmV?d00001

diff --git a/cps/translations/id/LC_MESSAGES/messages.po b/cps/translations/id/LC_MESSAGES/messages.po
new file mode 100644
index 000000000..d9d5a066b
--- /dev/null
+++ b/cps/translations/id/LC_MESSAGES/messages.po
@@ -0,0 +1,3367 @@
+# Indonesian translations for Calibre-Web.
+# Copyright (C) 2017 Calibre-Web
+# This file is distributed under the same license as the Calibre-Web
+# project.
+# FIRST AUTHOR Arief Hidayat<arihid95@gmail.com>, 2021-2022.
+msgid ""
+msgstr ""
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
+"PO-Revision-Date: 2022-11-21 18:25+0700\n"
+"Last-Translator: Arief Hidayat<arihid95@gmail.com>\n"
+"Language: id\n"
+"Language-Team: Arief Hidayat <arihid95@gmail.com>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.11.0\n"
+
+#: cps/about.py:84
+msgid "Statistics"
+msgstr "Statistik"
+
+#: cps/admin.py:148
+msgid "Server restarted, please reload page"
+msgstr "Server dimulai ulang, harap muat ulang halaman"
+
+#: cps/admin.py:150
+msgid "Performing shutdown of server, please close window"
+msgstr "Mematikan server, silakan tutup jendela"
+
+#: cps/admin.py:158
+msgid "Reconnect successful"
+msgstr "Berhasil menghubungkan ulang"
+
+#: cps/admin.py:161
+msgid "Unknown command"
+msgstr "Perintah tidak diketahui"
+
+#: cps/admin.py:172
+#, fuzzy
+msgid "Books successfully queued for Metadata Backup"
+msgstr "Buku berhasil diantrekan untuk Pencadangan Metadata"
+
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
+#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+msgid "Unknown"
+msgstr "Tidak diketahui"
+
+#: cps/admin.py:230
+msgid "Admin page"
+msgstr "Halaman Admin"
+
+#: cps/admin.py:250
+msgid "Basic Configuration"
+msgstr "Konfigurasi Dasar"
+
+#: cps/admin.py:288
+msgid "UI Configuration"
+msgstr "Pengaturan UI"
+
+#: cps/admin.py:322 cps/templates/admin.html:51
+msgid "Edit Users"
+msgstr "Edit pengguna"
+
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/templates/list.html:13
+msgid "All"
+msgstr "semua"
+
+#: cps/admin.py:393 cps/admin.py:1397
+msgid "User not found"
+msgstr "Pengguna tidak ditemukan"
+
+#: cps/admin.py:407
+msgid "{} users deleted successfully"
+msgstr "{} pengguna berhasil dihapus"
+
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
+#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
+msgid "Show All"
+msgstr "Tampilkan semua"
+
+#: cps/admin.py:451 cps/admin.py:457
+msgid "Malformed request"
+msgstr "Permintaan salah"
+
+#: cps/admin.py:469 cps/admin.py:1998
+msgid "Guest Name can't be changed"
+msgstr "Nama Tamu tidak dapat diganti"
+
+#: cps/admin.py:481
+msgid "Guest can't have this role"
+msgstr "Tamu tidak dapat memiliki peran ini"
+
+#: cps/admin.py:493 cps/admin.py:1953
+msgid "No admin user remaining, can't remove admin role"
+msgstr "Tidak ada pengguna admin yang tersisa, tidak dapat menghapus peran admin"
+
+#: cps/admin.py:497 cps/admin.py:511
+msgid "Value has to be true or false"
+msgstr "Nilai harus benar atau salah"
+
+#: cps/admin.py:499
+msgid "Invalid role"
+msgstr "Peran tidak valid"
+
+#: cps/admin.py:503
+msgid "Guest can't have this view"
+msgstr " Tamu tidak dapat mengakses tampilan ini"
+
+#: cps/admin.py:513
+msgid "Invalid view"
+msgstr " Tampilan tidak valid"
+
+#: cps/admin.py:516
+msgid "Guest's Locale is determined automatically and can't be set"
+msgstr "Lokal Tamu ditentukan secara otomatis dan tidak dapat disetel"
+
+#: cps/admin.py:520
+msgid "No Valid Locale Given"
+msgstr "Tidak Ada Lokal yang Valid Diberikan"
+
+#: cps/admin.py:531
+msgid "No Valid Book Language Given"
+msgstr "Tidak Ada Bahasa Buku yang Valid Diberikan"
+
+#: cps/admin.py:533 cps/editbooks.py:442
+msgid "Parameter not found"
+msgstr "Parameter tidak ditemukan"
+
+#: cps/admin.py:570
+msgid "Invalid Read Column"
+msgstr "Kolom Baca Tidak Valid"
+
+#: cps/admin.py:576
+msgid "Invalid Restricted Column"
+msgstr "Kolom Dibatasi Tidak Valid"
+
+#: cps/admin.py:596 cps/admin.py:1824
+msgid "Calibre-Web configuration updated"
+msgstr "Konfigurasi Calibre-Web telah diperbarui"
+
+#: cps/admin.py:608
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Apakah Anda yakin ingin menghapus Token Kobo?"
+
+#: cps/admin.py:610
+msgid "Do you really want to delete this domain?"
+msgstr "Apakah Anda yakin ingin menghapus domain ini?"
+
+#: cps/admin.py:612
+msgid "Do you really want to delete this user?"
+msgstr "Apakah Anda yakin ingin menghapus pengguna ini?"
+
+#: cps/admin.py:614
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Apakah Anda yakin ingin menghapus rak ini?"
+
+#: cps/admin.py:616
+msgid "Are you sure you want to change locales of selected user(s)?"
+msgstr "Apakah Anda yakin ingin merubah lokalisasi untuk pengguna yang dipilih?"
+
+#: cps/admin.py:618
+msgid "Are you sure you want to change visible book languages for selected user(s)?"
+msgstr "Apakah Anda yakin ingin merubah bahasa buku yang terlihat untuk pengguna yang dipilih?"
+
+#: cps/admin.py:620
+msgid "Are you sure you want to change the selected role for the selected user(s)?"
+msgstr "Apakah Anda yakin ingin merubah peran untuk pengguna yang dipilih?"
+
+#: cps/admin.py:622
+msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
+msgstr "Apakah Anda yakin ingin mengubah batasan yang dipilih untuk pengguna yang dipilih?"
+
+#: cps/admin.py:624
+msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
+msgstr "Apakah Anda yakin ingin merubah batasan visibilitas untuk pengguna yang dipilih?"
+
+#: cps/admin.py:627
+msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgstr "Apakah Anda yakin ingin mengubah perilaku sinkronisasi rak untuk pengguna yang dipilih?"
+
+#: cps/admin.py:629
+msgid "Are you sure you want to change Calibre library location?"
+msgstr "Apakah Anda yakin ingin mengubah lokasi perpustakaan Calibre?"
+
+#: cps/admin.py:631
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr "Calibre-Web akan mencari Sampul yang diperbarui dan memperbarui Thumbnail Sampul, ini mungkin memakan waktu cukup lama?"
+
+#: cps/admin.py:634
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr "Apakah Anda yakin ingin menghapus database sinkronisasi Calibre-Web untuk memaksakan sinkronisasi penuh dengan Kobo Reader Anda?"
+
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
+#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
+#: cps/templates/user_table.html:58
+msgid "Deny"
+msgstr "Tolak"
+
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
+#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
+#: cps/templates/user_table.html:61
+msgid "Allow"
+msgstr "Izinkan"
+
+#: cps/admin.py:920
+msgid "{} sync entries deleted"
+msgstr "{} entri sinkronisasi dihapus"
+
+#: cps/admin.py:968
+msgid "Tag not found"
+msgstr "Tag tidak ditemukan"
+
+#: cps/admin.py:980
+msgid "Invalid Action"
+msgstr "Tindakan Tidak Valid"
+
+#: cps/admin.py:1109
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr "client_secrets.json Tidak Dikonfigurasikan Untuk Aplikasi Web"
+
+#: cps/admin.py:1154
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "Lokasi Logfile tidak Valid, Harap Masukkan Jalur yang Benar"
+
+#: cps/admin.py:1160
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "Akses Logfile Catatan tidak Valid, Harap Masukkan Jalur yang Benar"
+
+#: cps/admin.py:1190
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr "Harap Masukkan Provider LDAP, Port, DN dan User Obect Identifier"
+
+#: cps/admin.py:1196
+msgid "Please Enter a LDAP Service Account and Password"
+msgstr "Masukkan Akun Layanan LDAP dan Kata Sandi"
+
+#: cps/admin.py:1199
+msgid "Please Enter a LDAP Service Account"
+msgstr "Masukkan Akun Layanan LDAP"
+
+#: cps/admin.py:1204
+#, python-format
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr "Filter Objek Grup LDAP Harus Memiliki Satu Pengidentifikasi Format \"%s\""
+
+#: cps/admin.py:1206
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr "Filter Objek Grup LDAP Memiliki Tanda kurung yang Tak Berpasangan"
+
+#: cps/admin.py:1210
+#, python-format
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr "Filter Objek Pengguna LDAP harus Memiliki Satu Pengidentifikasi Format \"%s\""
+
+#: cps/admin.py:1212
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr "Filter Objek Pengguna LDAP Memiliki Tanda kurung yang Tak Berpasangan"
+
+#: cps/admin.py:1219
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr "Filter Pengguna Anggota LDAP harus Memiliki Satu Pengenal Format \"%s\""
+
+#: cps/admin.py:1221
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr "Filter Pengguna Anggota LDAP Memiliki Tanda Kurung yang Tak Berpasangan"
+
+#: cps/admin.py:1228
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr "Lokasi LDAP Sertifikat CA, Sertifikat, atau Kunci tidak Valid, Harap Masukkan Jalur yang Benar "
+
+#: cps/admin.py:1259 cps/admin.py:1885
+msgid "Add new user"
+msgstr "Tambahkan pengguna baru"
+
+#: cps/admin.py:1268 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Edit Pengaturan Server Email"
+
+#: cps/admin.py:1287
+msgid "Gmail Account Verification Successful"
+msgstr "Verifikasi Akun Gmail Berhasil"
+
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
+#: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
+#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "Kesalahan basis data: %(error)s"
+
+#: cps/admin.py:1316
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr "Uji email diantrean untuk dikirim ke %(email), harap periksa Tasks untuk hasilnya"
+
+#: cps/admin.py:1319
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "Terjadi kesalahan saat mengirim email tes: %(res)s"
+
+#: cps/admin.py:1321
+msgid "Please configure your e-mail address first..."
+msgstr "Harap konfigurasikan alamat email Anda terlebih dahulu.."
+
+#: cps/admin.py:1323
+msgid "E-mail server settings updated"
+msgstr "Setelan server email diperbarui"
+
+#: cps/admin.py:1346 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr "Edit Pengaturan Tugas Terjadwal"
+
+#: cps/admin.py:1358
+msgid "Invalid start time for task specified"
+msgstr "Waktu mulai tidak valid untuk tugas yang ditentukan"
+
+#: cps/admin.py:1363
+msgid "Invalid duration for task specified"
+msgstr "Durasi tidak valid untuk tugas yang ditentukan"
+
+#: cps/admin.py:1372
+msgid "Scheduled tasks settings updated"
+msgstr "Pengaturan tugas terjadwal diperbarui"
+
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
+msgid "An unknown error occurred. Please try again later."
+msgstr "Terjadi kesalahan yang tidak diketahui. Coba lagi nanti."
+
+#: cps/admin.py:1386
+msgid "Settings DB is not Writeable"
+msgstr "Pengaturan DB tidak dapat ditulisi"
+
+#: cps/admin.py:1416 cps/admin.py:2014
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Edit pengguna %(nick)s"
+
+#: cps/admin.py:1428
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "Kata sandi untuk pengaturan ulang pengguna %(user) "
+
+#: cps/admin.py:1434 cps/web.py:1198
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Harap konfigurasikan pengaturan email SMTP terlebih dahulu..."
+
+#: cps/admin.py:1445
+msgid "Logfile viewer"
+msgstr "Penampil berkas log"
+
+#: cps/admin.py:1511
+msgid "Requesting update package"
+msgstr "Meminta paket pembaruan"
+
+#: cps/admin.py:1512
+msgid "Downloading update package"
+msgstr "Mengunduh paket pembaruan"
+
+#: cps/admin.py:1513
+msgid "Unzipping update package"
+msgstr "Meng-unzip paket pembaruan"
+
+#: cps/admin.py:1514
+msgid "Replacing files"
+msgstr "Mengganti berkas"
+
+#: cps/admin.py:1515
+msgid "Database connections are closed"
+msgstr "Koneksi basis data ditutup"
+
+#: cps/admin.py:1516
+msgid "Stopping server"
+msgstr "Menghentikan server"
+
+#: cps/admin.py:1517
+msgid "Update finished, please press okay and reload page"
+msgstr "Pembaruan selesai, silakan tekan OK dan muat ulang halaman"
+
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
+msgid "Update failed:"
+msgstr "Pembaruan gagal:"
+
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+msgid "HTTP Error"
+msgstr "Kesalahan HTTP"
+
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
+msgid "Connection error"
+msgstr "Kesalahan koneksi"
+
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
+msgid "Timeout while establishing connection"
+msgstr "Batas waktu saat membuat koneksi"
+
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
+msgid "General error"
+msgstr "Kesalahan umum"
+
+#: cps/admin.py:1522
+msgid "Update file could not be saved in temp dir"
+msgstr "Berkas pembaruan tidak dapat disimpan di direktori temp"
+
+#: cps/admin.py:1523
+msgid "Files could not be replaced during update"
+msgstr "Berkas tidak dapat diganti selama pembaruan"
+
+#: cps/admin.py:1547
+msgid "Failed to extract at least One LDAP User"
+msgstr "Gagal mengekstrak setidaknya Satu Pengguna LDAP"
+
+#: cps/admin.py:1592
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Gagal Membuat Sedikitnya Satu Pengguna LDAP"
+
+#: cps/admin.py:1605
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Kesalahan: %(ldaperror)s"
+
+#: cps/admin.py:1609
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Error: Tidak ada pengguna yang dikembalikan sebagai respons dari server LDAP"
+
+#: cps/admin.py:1642
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Setidaknya Satu Pengguna LDAP Tidak Ditemukan di Basis Data"
+
+#: cps/admin.py:1644
+msgid "{} User Successfully Imported"
+msgstr "{} Pengguna Berhasil Diimpor"
+
+#: cps/admin.py:1702
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "Lokasi Basis Data tidak Valid, Harap Masukkan Jalur yang Benar"
+
+#: cps/admin.py:1722
+msgid "DB is not Writeable"
+msgstr "Basis Data tidak dapat ditulisi"
+
+#: cps/admin.py:1735
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "Lokasi keyfile tidak Valid, Harap Masukkan Jalur yang Benar "
+
+#: cps/admin.py:1739
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "Lokasi Sertifikat tidak Valid, Harap Masukkan Jalur yang Benar "
+
+#: cps/admin.py:1847
+msgid "Database Settings updated"
+msgstr "Pengaturan Basis Data diperbarui"
+
+#: cps/admin.py:1855
+msgid "Database Configuration"
+msgstr "Konfigurasi Basis Data"
+
+#: cps/admin.py:1871 cps/web.py:1233
+msgid "Please fill out all fields!"
+msgstr "Harap masukkan seluruh isian!"
+
+#: cps/admin.py:1879
+msgid "E-mail is not from valid domain"
+msgstr "Email bukan dari domain yang valid"
+
+#: cps/admin.py:1896
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Pengguna '%(user)s' telah dibuat"
+
+#: cps/admin.py:1902
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Ditemukan akun yang ada untuk alamat email atau nama ini."
+
+#: cps/admin.py:1932
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Pengguna '%(nick)s' telah dihapus"
+
+#: cps/admin.py:1934 cps/admin.py:1935
+msgid "Can't delete Guest User"
+msgstr "Tidak dapat menghapus Pengguna Tamu"
+
+#: cps/admin.py:1938
+msgid "No admin user remaining, can't delete user"
+msgstr "Tidak ada pengguna admin tersisa, tidak dapat menghapus pengguna"
+
+#: cps/admin.py:1992 cps/web.py:1371
+msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgstr "Alamat email tidak boleh kosong dan harus berupa email yang valid"
+
+#: cps/admin.py:2018
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Pengguna '%(nick)s' diperbarui"
+
+#: cps/converter.py:31
+msgid "not installed"
+msgstr "belum dipasang"
+
+#: cps/converter.py:32
+msgid "Execution permissions missing"
+msgstr "Izin eksekusi hilang"
+
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#, python-format
+msgid "Custom Column No.%(column)d does not exist in calibre database"
+msgstr "Kolom Kustom No.%(column)d tidak ada di basis data kaliber"
+
+#: cps/db.py:971 cps/templates/config_edit.html:204
+#: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+msgid "None"
+msgstr "Tidak ada"
+
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "Ups! Judul buku yang dipilih tidak tersedia. File tidak ada atau tidak dapat diakses"
+
+#: cps/editbooks.py:154 cps/editbooks.py:1221
+msgid "User has no rights to upload cover"
+msgstr "Pengguna tidak berhak mengganti sampul"
+
+#: cps/editbooks.py:174 cps/editbooks.py:716
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "IDは大文字小文字を区別しません。元のIDを上書きします"
+
+#: cps/editbooks.py:216
+msgid "Metadata successfully updated"
+msgstr "Metadata berhasil diperbarui"
+
+#: cps/editbooks.py:234
+msgid "Error editing book: {}"
+msgstr "Kesalahan pengeditan buku: {}"
+
+#: cps/editbooks.py:291
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "Berkas %(file)s telah diunggah"
+
+#: cps/editbooks.py:318
+msgid "Source or destination format for conversion missing"
+msgstr "Format sumber atau tujuan untuk konversi tidak ada"
+
+#: cps/editbooks.py:326
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr "Buku berhasil diantrekan untuk dikonversi ke %(book_format)s"
+
+#: cps/editbooks.py:330
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "Terjadi kesalahan saat mengonversi buku ini: %(res)s"
+
+#: cps/editbooks.py:635
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "Buku yang diunggah mungkin ada di perpustakaan, pertimbangkan untuk mengubahnya sebelum mengunggah yang baru: "
+
+#: cps/editbooks.py:690 cps/editbooks.py:1015
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s' bukan bahasa yang valid"
+
+#: cps/editbooks.py:728 cps/editbooks.py:1162
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "Ekstensi file '%(ext)s' tidak diizinkan untuk diunggah ke server ini"
+
+#: cps/editbooks.py:732 cps/editbooks.py:1166
+msgid "File to be uploaded must have an extension"
+msgstr "File yang akan diunggah harus memiliki ekstensi"
+
+#: cps/editbooks.py:740
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "Berkas %(filename)s tidak dapat disimpan ke direktori temp"
+
+#: cps/editbooks.py:760
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "Gagal Memindahkan Berkas Sampul %(file)s: %(error)s"
+
+#: cps/editbooks.py:817 cps/editbooks.py:819
+msgid "Book Format Successfully Deleted"
+msgstr "Format Buku Berhasil Dihapus"
+
+#: cps/editbooks.py:826 cps/editbooks.py:828
+msgid "Book Successfully Deleted"
+msgstr "Buku Berhasil Dihapus"
+
+#: cps/editbooks.py:880
+msgid "You are missing permissions to delete books"
+msgstr "Anda tidak memiliki izin untuk menghapus buku"
+
+#: cps/editbooks.py:930
+msgid "edit metadata"
+msgstr "edit metadata"
+
+#: cps/editbooks.py:979
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s dilewati karena bukan angka yang valid"
+
+#: cps/editbooks.py:1157
+msgid "User has no rights to upload additional file formats"
+msgstr "Pengguna tidak memiliki izin untuk mengunggah format file tambahan"
+
+#: cps/editbooks.py:1178
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Gagal membuat jalur %(path)s (Izin ditolak)."
+
+#: cps/editbooks.py:1183
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Gagal menyimpan file %(file)s."
+
+#: cps/editbooks.py:1206
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Format file %(ext)s ditambahkan ke %(book)s"
+
+#: cps/gdrive.py:58
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "Pengaturan Google Drive belum selesai, coba nonaktifkan dan aktifkan kembali Google Drive"
+
+#: cps/gdrive.py:95
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Domain panggilan balik tidak diverifikasi, ikuti langkah-langkah untuk memverifikasi domain di konsol pengembang google"
+
+#: cps/helper.py:80
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s format tidak ditemukan untuk id buku: %(book)d"
+
+#: cps/helper.py:87 cps/tasks/convert.py:75
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s tidak ditemukan di Google Drive: %(fn)s"
+
+#: cps/helper.py:92
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s tidak ditemukan: %(fn)s"
+
+#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
+msgid "Send to E-Reader"
+msgstr "Kirim ke E-Reader"
+
+#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Email ini telah dikirim melalui Calibre-Web."
+
+#: cps/helper.py:114
+msgid "Calibre-Web test e-mail"
+msgstr "Email tes Calibre-Web"
+
+#: cps/helper.py:115
+msgid "Test e-mail"
+msgstr "Email tes"
+
+#: cps/helper.py:132
+msgid "Get Started with Calibre-Web"
+msgstr "Memulai dengan Calibre-Web"
+
+#: cps/helper.py:137
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Email pendaftaran untuk pengguna: %(name)s"
+
+#: cps/helper.py:148 cps/helper.py:154
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgstr "Ubah %(orig)s menjadi %(format)s dan kirim ke E-Reader"
+
+#: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
+#, python-format
+msgid "Send %(format)s to E-Reader"
+msgstr "Kirim %(format)s ke E-Reader"
+
+#: cps/helper.py:225 cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%%(buku)s telah dikirim ke E-Reader"
+
+#: cps/helper.py:230
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "File yang diminta tidak dapat dibaca. Mungkin izinnya salah?"
+
+#: cps/helper.py:345
+msgid "Read status could not set: {}"
+msgstr "Status baca tidak bisa disetel: {}"
+
+#: cps/helper.py:368
+#, python-format
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "Menghapus folder buku untuk buku %(id)s gagal, jalur memiliki subfolder: %(path)s"
+
+#: cps/helper.py:374
+#, python-format
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "Gagal menghapus buku %(id)s: %(message)s"
+
+#: cps/helper.py:385
+#, python-format
+msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
+msgstr "Menghapus buku %(id)s hanya dari basis data, jalur buku di basis data tidak valid: %(path)s"
+
+#: cps/helper.py:450
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Ganti nama pengarang dari: '%(src)s' menjadi '%(dest)s' gagal dengan kesalahan: %(error)s"
+
+#: cps/helper.py:522 cps/helper.py:531
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Berkas %(file)s tidak ditemukan di Google Drive"
+
+#: cps/helper.py:565
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Ganti nama judul dari: '%(src)s' menjadi '%(dest)s' gagal dengan kesalahan: %(error)s"
+
+#: cps/helper.py:585
+msgid "Error in rename file in path: {}"
+msgstr "Kesalahan dalam mengganti nama berkas di jalur: {}"
+
+#: cps/helper.py:603
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Jalur buku %(path)s tidak ditemukan di Google Drive"
+
+#: cps/helper.py:644 cps/web.py:1416
+msgid "Found an existing account for this e-mail address"
+msgstr "Ditemukan akun yang ada untuk alamat email ini"
+
+#: cps/helper.py:652
+msgid "This username is already taken"
+msgstr "Nama pengguna ini sudah digunakan"
+
+#: cps/helper.py:664
+msgid "Invalid e-mail address format"
+msgstr "Format alamat email tidak valid"
+
+#: cps/helper.py:815
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
+msgstr "Modul 'advocate' Python tidak diinstal tetapi diperlukan untuk unggahan sampul"
+
+#: cps/helper.py:825
+msgid "Error Downloading Cover"
+msgstr "Kesalahan Mengunduh Sampul"
+
+#: cps/helper.py:828
+msgid "Cover Format Error"
+msgstr "Kesalahan Format Sampul"
+
+#: cps/helper.py:831
+msgid "You are not allowed to access localhost or the local network for cover uploads"
+msgstr "Anda tidak diizinkan mengakses localhost atau jaringan lokal untuk unggahan sampul"
+
+#: cps/helper.py:841
+msgid "Failed to create path for cover"
+msgstr "Gagal membuat jalur untuk sampul"
+
+#: cps/helper.py:857
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr "File sampul bukan file gambar yang valid, atau tidak dapat disimpan"
+
+#: cps/helper.py:868
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr "Hanya file jpg/jpeg/png/webp/bmp yang didukung sebagai file sampul"
+
+#: cps/helper.py:880
+msgid "Invalid cover file content"
+msgstr "Konten file sampul tidak valid"
+
+#: cps/helper.py:884
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr "Hanya file jpg/jpeg yang didukung sebagai file sampul"
+
+#: cps/helper.py:936
+msgid "Unrar binary file not found"
+msgstr "File biner unrar tidak ditemukan"
+
+#: cps/helper.py:947
+#, fuzzy
+msgid "Error executing UnRar"
+msgstr "Kesalahan saat menjalankan UnRar"
+
+#: cps/helper.py:1040
+#, fuzzy
+msgid "Cover"
+msgstr "Sampul"
+
+#: cps/helper.py:1042 cps/templates/admin.html:211
+msgid "Queue all books for metadata backup"
+msgstr "Antrian semua buku untuk cadangan metadata"
+
+#: cps/kobo_auth.py:89
+msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
+msgstr "Mohon akses calibre-web dari non localhost untuk mendapatkan api_endpoint yang valid untuk perangkat kobo"
+
+#: cps/kobo_auth.py:115
+msgid "Kobo Setup"
+msgstr "Pengaturan Kobo"
+
+#: cps/oauth_bb.py:77
+#, python-format
+msgid "Register with %(provider)s"
+msgstr "Daftar dengan %(provider)s"
+
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "Anda sekarang login sebagai: %(nickname)s"
+
+#: cps/oauth_bb.py:148
+#, python-format
+msgid "Link to %(oauth)s Succeeded"
+msgstr "Tautan ke %(oauth)s Berhasil"
+
+#: cps/oauth_bb.py:155
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr "Login gagal, Tidak Ada Pengguna yang Tertaut Dengan Akun OAuth"
+
+#: cps/oauth_bb.py:197
+#, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr "Membatalkan tautan ke %(oauth)s Berhasil"
+
+#: cps/oauth_bb.py:202
+#, python-format
+msgid "Unlink to %(oauth)s Failed"
+msgstr "Membatalkan tautan ke %(oauth)s Gagal"
+
+#: cps/oauth_bb.py:205
+#, python-format
+msgid "Not Linked to %(oauth)s"
+msgstr "Tidak Tertaut ke %(oauth)s"
+
+#: cps/oauth_bb.py:261
+msgid "Failed to log in with GitHub."
+msgstr "Gagal masuk dengan GitHub."
+
+#: cps/oauth_bb.py:267
+msgid "Failed to fetch user info from GitHub."
+msgstr "Gagal mengambil info pengguna dari GitHub."
+
+#: cps/oauth_bb.py:279
+msgid "Failed to log in with Google."
+msgstr "Gagal masuk dengan Google."
+
+#: cps/oauth_bb.py:285
+msgid "Failed to fetch user info from Google."
+msgstr "Gagal mengambil info pengguna dari Google."
+
+#: cps/oauth_bb.py:332
+msgid "GitHub Oauth error, please retry later."
+msgstr "Kesalahan GitHub Oauth, silakan coba lagi nanti."
+
+#: cps/oauth_bb.py:335
+msgid "GitHub Oauth error: {}"
+msgstr "Kesalahan GitHub OAuth: {}"
+
+#: cps/oauth_bb.py:356
+msgid "Google Oauth error, please retry later."
+msgstr "Kesalahan Google Oauth, harap coba lagi nanti."
+
+#: cps/oauth_bb.py:359
+msgid "Google Oauth error: {}"
+msgstr "Kesalahan Google OAuth: {}"
+
+#: cps/opds.py:287
+msgid "{} Stars"
+msgstr "{}★"
+
+#: cps/remotelogin.py:62 cps/templates/layout.html:74
+#: cps/templates/layout.html:108 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
+msgid "Login"
+msgstr "Masuk"
+
+#: cps/remotelogin.py:74 cps/remotelogin.py:108
+msgid "Token not found"
+msgstr "Token tidak ditemukan"
+
+#: cps/remotelogin.py:83 cps/remotelogin.py:116
+msgid "Token has expired"
+msgstr "Token telah kedaluwarsa"
+
+#: cps/remotelogin.py:92
+msgid "Success! Please return to your device"
+msgstr "Berhasil! Silakan kembali ke perangkat Anda"
+
+#: cps/render_template.py:40 cps/web.py:406
+msgid "Books"
+msgstr "Buku"
+
+#: cps/render_template.py:42
+msgid "Show recent books"
+msgstr "Tampilkan buku terbaru"
+
+#: cps/render_template.py:43 cps/templates/index.xml:25
+msgid "Hot Books"
+msgstr "Buku Populer"
+
+#: cps/render_template.py:45
+msgid "Show Hot Books"
+msgstr "Tampilkan Buku Populer"
+
+#: cps/render_template.py:47 cps/render_template.py:52
+msgid "Downloaded Books"
+msgstr "Buku yang Diunduh"
+
+#: cps/render_template.py:49 cps/render_template.py:54
+#: cps/templates/user_table.html:167
+msgid "Show Downloaded Books"
+msgstr "Tampilkan Buku yang Diunduh"
+
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+msgid "Top Rated Books"
+msgstr "Buku Berperingkat Teratas"
+
+#: cps/render_template.py:59 cps/templates/user_table.html:161
+msgid "Show Top Rated Books"
+msgstr "Tampilkan Buku Berperingkat Teratas"
+
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:742
+msgid "Read Books"
+msgstr "Buku Telah Dibaca"
+
+#: cps/render_template.py:62
+msgid "Show read and unread"
+msgstr "Tampilkan sudah dibaca dan belum dibaca"
+
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:745
+msgid "Unread Books"
+msgstr "Buku yang Belum Dibaca"
+
+#: cps/render_template.py:66
+msgid "Show unread"
+msgstr "Tampilkan belum dibaca"
+
+#: cps/render_template.py:67
+msgid "Discover"
+msgstr "Temukan"
+
+#: cps/render_template.py:69 cps/templates/index.xml:50
+#: cps/templates/user_table.html:162
+msgid "Show Random Books"
+msgstr "Tampilkan Buku Acak"
+
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1102
+msgid "Categories"
+msgstr "Kategori"
+
+#: cps/render_template.py:72 cps/templates/user_table.html:158
+msgid "Show category selection"
+msgstr "Tampilkan pilihan kategori"
+
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
+#: cps/templates/book_table.html:68 cps/templates/index.xml:90
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+msgid "Series"
+msgstr "Seri"
+
+#: cps/render_template.py:75 cps/templates/user_table.html:157
+msgid "Show series selection"
+msgstr "Tampilkan pilihan seri"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:66
+#: cps/templates/index.xml:69
+msgid "Authors"
+msgstr "Penulis"
+
+#: cps/render_template.py:78 cps/templates/user_table.html:160
+msgid "Show author selection"
+msgstr "Tampilkan pilihan penulis"
+
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:969
+msgid "Publishers"
+msgstr "Penerbit"
+
+#: cps/render_template.py:82 cps/templates/user_table.html:163
+msgid "Show publisher selection"
+msgstr "Tampilkan pilihan penerbit"
+
+#: cps/render_template.py:83 cps/templates/book_table.html:70
+#: cps/templates/index.xml:97 cps/templates/search_form.html:107
+#: cps/web.py:1074
+msgid "Languages"
+msgstr "Bahasa"
+
+#: cps/render_template.py:86 cps/templates/user_table.html:155
+msgid "Show language selection"
+msgstr "Tampilkan pilihan bahasa"
+
+#: cps/render_template.py:87 cps/templates/index.xml:104
+msgid "Ratings"
+msgstr "Peringkat"
+
+#: cps/render_template.py:89 cps/templates/user_table.html:164
+msgid "Show ratings selection"
+msgstr "Tampilkan pilihan peringkat"
+
+#: cps/render_template.py:90 cps/templates/index.xml:112
+msgid "File formats"
+msgstr "Format file"
+
+#: cps/render_template.py:92 cps/templates/user_table.html:165
+msgid "Show file formats selection"
+msgstr "Tampilkan pilihan format file"
+
+#: cps/render_template.py:94 cps/web.py:768
+msgid "Archived Books"
+msgstr "Buku yang Diarsipkan"
+
+#: cps/render_template.py:96 cps/templates/user_table.html:166
+msgid "Show archived books"
+msgstr "Tampilkan buku yang diarsipkan"
+
+#: cps/render_template.py:99 cps/web.py:799
+msgid "Books List"
+msgstr "Daftar Buku"
+
+#: cps/render_template.py:101 cps/templates/user_table.html:168
+msgid "Show Books List"
+msgstr "Tampilkan Daftar Buku"
+
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:53 cps/templates/layout.html:56
+#: cps/templates/search_form.html:226
+msgid "Search"
+msgstr "Telusuri"
+
+#: cps/search.py:188
+msgid "Published after "
+msgstr "Terbit setelah "
+
+#: cps/search.py:195
+msgid "Published before "
+msgstr "Terbit sebelum "
+
+#: cps/search.py:217
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Peringkat ≤ %(rating)s"
+
+#: cps/search.py:219
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Peringkat ≥ %(rating)s"
+
+#: cps/search.py:221
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr "Status Baca = %(status)s"
+
+#: cps/search.py:323
+msgid "Error on search for custom columns, please restart Calibre-Web"
+msgstr "Terjadi kesalahan saat mencari kolom khusus, harap mulai ulang Calibre-Web"
+
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
+msgid "Advanced Search"
+msgstr "Penelusuran Lanjutan"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Rak yang ditentukan tidak valid"
+
+#: cps/shelf.py:55
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Maaf Anda tidak diperbolehkan menambahkan buku ke rak: %(shelfname)s"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Buku sudah menjadi bagian dari rak: %(shelfname)s"
+
+#: cps/shelf.py:89
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Buku telah ditambahkan ke rak: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr "Anda tidak diperbolehkan menambahkan buku ke rak: %(name)s"
+
+#: cps/shelf.py:126
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Buku sudah menjadi bagian dari rak: %(name)s"
+
+#: cps/shelf.py:138
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Buku telah ditambahkan ke rak: %(sname)s"
+
+#: cps/shelf.py:145
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Tidak dapat menambahkan buku ke rak: %(sname)s"
+
+#: cps/shelf.py:191
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Buku telah dihapus dari rak: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "Maaf Anda tidak diizinkan untuk menghapus buku dari rak ini: %(sname)s"
+
+#: cps/shelf.py:210 cps/templates/layout.html:164
+msgid "Create a Shelf"
+msgstr "Buat Rak"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Maaf, Anda tidak diizinkan mengedit rak ini"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Edit Rak"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr "Kesalahan menghapus Rak"
+
+#: cps/shelf.py:231
+msgid "Shelf successfully deleted"
+msgstr "Rak berhasil dihapus"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Ubah urutan Rak: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "Maaf, Anda tidak diizinkan membuat rak publik"
+
+#: cps/shelf.py:330
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Rak %(title)s dibuat"
+
+#: cps/shelf.py:333
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Rak %(title)s diubah"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "Ada kesalahan"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Rak publik dengan nama '%(title)s' sudah ada."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Rak pribadi dengan nama '%(title)s' sudah ada."
+
+#: cps/shelf.py:462
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Rak: '%(name)s'"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Terjadi kesalahan saat membuka rak. Rak tidak ada atau tidak dapat diakses"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:95
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Tugas"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Menunggu"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Gagal"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Dimulai"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Selesai"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr "Berakhir"
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr "Dibatalkan"
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Status Tidak Diketahui"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Data tak terduga saat membaca informasi pembaruan"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Tidak ada pembaruan yang tersedia. Anda telah memasang versi terbaru"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "Pembaruan tersedia. Klik tombol di bawah untuk memperbarui ke versi terbaru."
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "Tidak dapat mengambil informasi pembaruan"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Klik tombol di bawah untuk memperbarui ke versi stabil terbaru."
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr "Pembaruan tersedia. Klik tombol di bawah untuk memperbarui ke versi: %(version)s"
+
+#: cps/updater.py:536
+msgid "No release information available"
+msgstr "Tidak ada informasi rilis yang tersedia"
+
+#: cps/templates/index.html:6 cps/web.py:433
+msgid "Discover (Random Books)"
+msgstr "Temukan (Buku Acak)"
+
+#: cps/web.py:469
+msgid "Hot Books (Most Downloaded)"
+msgstr "Buku Populer (Paling Banyak Diunduh)"
+
+#: cps/web.py:500
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Buku telah diunduh oleh %(user)s"
+
+#: cps/web.py:533
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Penulis: %(name)s"
+
+#: cps/web.py:569
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Penerbit: %(name)s"
+
+#: cps/web.py:597
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Seri: %(serie)s"
+
+#: cps/web.py:612
+msgid "Rating: None"
+msgstr "Peringkat: Tidak ada"
+
+#: cps/web.py:621
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Peringkat: %(rating)s★"
+
+#: cps/web.py:639
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Format berkas: %(format)s"
+
+#: cps/web.py:676
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategori: %(name)s"
+
+#: cps/web.py:703
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Bahasa: %(name)s"
+
+#: cps/templates/admin.html:16 cps/web.py:941
+msgid "Downloads"
+msgstr "Unduhan"
+
+#: cps/web.py:1034
+msgid "Ratings list"
+msgstr "Daftar peringkat"
+
+#: cps/web.py:1061
+msgid "File formats list"
+msgstr "Daftar format berkas"
+
+#: cps/web.py:1203
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "Buku telah diantrikan untuk dikirim ke %(kindlemail)s"
+
+#: cps/web.py:1207
+#, python-format
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr "Oops! Terjadi kesalahan saat mengirim buku: %(res)s"
+
+#: cps/web.py:1209
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr "Harap perbarui profil Anda dengan Kirim ke Alamat Email Kindle yang valid."
+
+#: cps/web.py:1226
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "Server email belum dikonfigurasi, silakan hubungi administrator!"
+
+#: cps/templates/layout.html:75 cps/templates/layout.html:109
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
+msgid "Register"
+msgstr "Daftar"
+
+#: cps/web.py:1262
+msgid "Your e-mail is not allowed to register"
+msgstr "Alamat email Anda tidak diizinkan untuk mendaftar"
+
+#: cps/web.py:1266
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "E-mail konfirmasi telah dikirimkan ke alamat email Anda."
+
+#: cps/web.py:1280
+msgid "Cannot activate LDAP authentication"
+msgstr "Tidak dapat mengaktifkan autentikasi LDAP."
+
+#: cps/web.py:1299
+#, python-format
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr "Login Pengganti sebagai: '%(nickname)s', Server LDAP tidak dapat dijangkau, atau pengguna tidak diketahui."
+
+#: cps/web.py:1305
+#, python-format
+msgid "Could not login: %(message)s"
+msgstr "Tidak dapat login: %(message)s"
+
+#: cps/web.py:1309 cps/web.py:1334
+msgid "Wrong Username or Password"
+msgstr "Pengguna atau Kata Sandi salah"
+
+#: cps/web.py:1316
+msgid "New Password was send to your email address"
+msgstr "Kata Sandi baru telah dikirimkan ke alamat email Anda"
+
+#: cps/web.py:1322
+msgid "Please enter valid username to reset password"
+msgstr "Harap masukkan pengguna valid untuk mengatur ulang kata sandi"
+
+#: cps/web.py:1329
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "Anda telah masuk sebagai: '%(nickname)s'"
+
+#: cps/web.py:1396 cps/web.py:1445
+#, python-format
+msgid "%(name)s's profile"
+msgstr "Profil %(name)s"
+
+#: cps/web.py:1412
+msgid "Profile updated"
+msgstr "Profil diperbarui"
+
+#: cps/services/gmail.py:58
+msgid "Found no valid gmail.json file with OAuth information"
+msgstr "Tidak ditemukan file gmail.json yang valid dengan informasi OAuth"
+
+#: cps/tasks/convert.py:153
+#, python-format
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr "Calibre ebook-convert %(tool)s tidak ditemukan"
+
+#: cps/tasks/convert.py:186
+#, python-format
+msgid "%(format)s format not found on disk"
+msgstr "%(format)s format tidak ditemukan dalam disk"
+
+#: cps/tasks/convert.py:190
+msgid "Ebook converter failed with unknown error"
+msgstr "Konverter ebook gagal dengan kesalahan yang tidak diketahui."
+
+#: cps/tasks/convert.py:202
+#, python-format
+msgid "Kepubify-converter failed: %(error)s"
+msgstr "Kebupify-converter gagal: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr "Berkas yang telah dikonversi tidak ditemukan atau terdapat duplikat dalam folder %(folder)s"
+
+#: cps/tasks/convert.py:247
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ebook-converter gagal: %(error)s"
+
+#: cps/tasks/convert.py:270
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "Calibre gagal dengan kesalahan: %(error)s"
+
+#: cps/tasks/convert.py:275
+msgid "Convert"
+msgstr "Konversi"
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr "Menghubungkan kembali basis data Calibre"
+
+#: cps/tasks/mail.py:266
+msgid "E-mail"
+msgstr "Email"
+
+#: cps/tasks/metadata_backup.py:47
+#, fuzzy
+msgid "Backing up Metadata"
+msgstr "Mencadangkan Metadata"
+
+#: cps/tasks/thumbnail.py:95
+#, python-format
+msgid "Generated %(count)s cover thumbnails"
+msgstr "%(count)s thumbnail sampul dibuat"
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr "Thumbnail Sampul"
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr "{0} thumbnail seri dihasilkan"
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr "Menghapus cache thumbnail sampul"
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:88 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Unggah"
+
+#: cps/templates/admin.html:9
+msgid "Users"
+msgstr "Pengguna"
+
+#: cps/templates/admin.html:13 cps/templates/login.html:9
+#: cps/templates/login.html:10 cps/templates/register.html:9
+#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
+msgid "Username"
+msgstr "Nama Pengguna"
+
+#: cps/templates/admin.html:14 cps/templates/register.html:14
+#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
+msgid "E-mail Address"
+msgstr "Alamat Email"
+
+#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
+msgid "Send to E-Reader E-mail Address"
+msgstr "Kirim ke Alamat Email Kindle"
+
+#: cps/templates/admin.html:17 cps/templates/layout.html:98
+#: cps/templates/user_table.html:143
+msgid "Admin"
+msgstr "Admin"
+
+#: cps/templates/admin.html:18 cps/templates/login.html:13
+#: cps/templates/login.html:14 cps/templates/user_edit.html:23
+msgid "Password"
+msgstr "Kata Sandi"
+
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
+#: cps/templates/user_table.html:146
+msgid "Download"
+msgstr "Unduh"
+
+#: cps/templates/admin.html:23
+msgid "View Books"
+msgstr "Lihat Buku"
+
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
+#: cps/templates/user_table.html:148
+msgid "Edit"
+msgstr "Edit"
+
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
+#: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
+#: cps/templates/user_table.html:149
+msgid "Delete"
+msgstr "Hapus"
+
+#: cps/templates/admin.html:26
+msgid "Public Shelf"
+msgstr "Rak Publik"
+
+#: cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "Tambah Pengguna Baru"
+
+#: cps/templates/admin.html:55
+msgid "Import LDAP Users"
+msgstr "Impor Pengguna LDAP"
+
+#: cps/templates/admin.html:62
+msgid "E-mail Server Settings"
+msgstr "Pengaturan Server Email"
+
+#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
+msgid "SMTP Hostname"
+msgstr "Hostname SMTP"
+
+#: cps/templates/admin.html:71 cps/templates/email_edit.html:35
+msgid "SMTP Port"
+msgstr "Port SMTP"
+
+#: cps/templates/admin.html:75 cps/templates/email_edit.html:39
+msgid "Encryption"
+msgstr "Enkripsi"
+
+#: cps/templates/admin.html:79 cps/templates/email_edit.html:47
+msgid "SMTP Login"
+msgstr "Login SMTP"
+
+#: cps/templates/admin.html:83 cps/templates/admin.html:94
+#: cps/templates/email_edit.html:55
+msgid "From E-mail"
+msgstr "Dari Email"
+
+#: cps/templates/admin.html:90
+msgid "E-Mail Service"
+msgstr "Layanan Email"
+
+#: cps/templates/admin.html:91
+msgid "Gmail via Oauth2"
+msgstr "Gmail via Oauth2"
+
+#: cps/templates/admin.html:106
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+#: cps/templates/admin.html:109
+msgid "Calibre Database Directory"
+msgstr "Jalur Database Calibre"
+
+#: cps/templates/admin.html:113 cps/templates/config_edit.html:68
+msgid "Log Level"
+msgstr "Log Level"
+
+#: cps/templates/admin.html:117
+msgid "Port"
+msgstr "Port"
+
+#: cps/templates/admin.html:122
+msgid "External Port"
+msgstr "Port Eksternal"
+
+#: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
+msgid "Books per Page"
+msgstr "Buku per halaman"
+
+#: cps/templates/admin.html:133
+msgid "Uploads"
+msgstr "Unggah"
+
+#: cps/templates/admin.html:137
+msgid "Anonymous Browsing"
+msgstr "Penjelajahan Anonim"
+
+#: cps/templates/admin.html:141
+msgid "Public Registration"
+msgstr "Registrasi Publik"
+
+#: cps/templates/admin.html:145
+msgid "Magic Link Remote Login"
+msgstr "Login Jarak Jauh dengan Magic Link"
+
+#: cps/templates/admin.html:149
+msgid "Reverse Proxy Login"
+msgstr "Login Reverse Proxy"
+
+#: cps/templates/admin.html:154 cps/templates/config_edit.html:173
+msgid "Reverse Proxy Header Name"
+msgstr "Nama Header Reverse Proxy"
+
+#: cps/templates/admin.html:159
+msgid "Edit Calibre Database Configuration"
+msgstr "Edit Konfigurasi Basis Data Caliber"
+
+#: cps/templates/admin.html:160
+msgid "Edit Basic Configuration"
+msgstr "Edit Konfigurasi Dasar"
+
+#: cps/templates/admin.html:161
+msgid "Edit UI Configuration"
+msgstr "Edit Konfigurasi UI"
+
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr "Tugas Terjadwal"
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr "Waktu saat tugas mulai dijalankan"
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr "Durasi tugas maksimum"
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr "Buat thumbnail sampul buku"
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr "Buat thumbnail sampul seri"
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr "Sambungkan kembali ke Perpustakaan Caliber"
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr "Segarkan Cache Thumbnail Sampul"
+
+#: cps/templates/admin.html:199
+msgid "Administration"
+msgstr "Administrasi"
+
+#: cps/templates/admin.html:200
+msgid "Download Debug Package"
+msgstr "Unduh Paket Debug"
+
+#: cps/templates/admin.html:201
+msgid "View Logs"
+msgstr "Tampilkan Log"
+
+#: cps/templates/admin.html:204
+msgid "Reconnect Calibre Database"
+msgstr "Hubungkan Ulang Database Calibre"
+
+#: cps/templates/admin.html:207
+msgid "Restart"
+msgstr "Mulai Ulang"
+
+#: cps/templates/admin.html:208
+msgid "Shutdown"
+msgstr "Matikan"
+
+#: cps/templates/admin.html:216
+msgid "Version Information"
+msgstr "Perbarui"
+
+#: cps/templates/admin.html:220
+msgid "Version"
+msgstr "Versi"
+
+#: cps/templates/admin.html:221
+msgid "Details"
+msgstr "Detail"
+
+#: cps/templates/admin.html:227
+msgid "Current version"
+msgstr "Versi saat ini"
+
+#: cps/templates/admin.html:234
+msgid "Check for Update"
+msgstr "Periksa Pembaruan"
+
+#: cps/templates/admin.html:235
+msgid "Perform Update"
+msgstr "Lakukan Pembaruan"
+
+#: cps/templates/admin.html:248
+msgid "Are you sure you want to restart?"
+msgstr "Apa Anda yakin untuk memulai ulang?"
+
+#: cps/templates/admin.html:253 cps/templates/admin.html:267
+#: cps/templates/admin.html:287 cps/templates/config_db.html:70
+msgid "OK"
+msgstr "OK"
+
+#: cps/templates/admin.html:254 cps/templates/admin.html:268
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
+#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
+#: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
+#: cps/templates/user_edit.html:144
+msgid "Cancel"
+msgstr "Batal"
+
+#: cps/templates/admin.html:266
+msgid "Are you sure you want to shutdown?"
+msgstr "Apa Anda yakin untuk mematikan?"
+
+#: cps/templates/admin.html:278
+msgid "Updating, please do not reload this page"
+msgstr "Memperbarui, jangan memuat ulang halaman ini"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "melalui"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "Dalam Pustaka"
+
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
+msgid "Sort according to book date, newest first"
+msgstr "Urutkan menurut tanggal buku, terbaru dulu"
+
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
+msgid "Sort according to book date, oldest first"
+msgstr "Urutkan menurut tanggal buku, terlama dulu"
+
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
+msgid "Sort title in alphabetical order"
+msgstr "Urutkan judul dalam urutan abjad"
+
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
+msgid "Sort title in reverse alphabetical order"
+msgstr "Urutkan judul dalam urutan abjad terbalik"
+
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
+msgid "Sort according to publishing date, newest first"
+msgstr "Urutkan menurut tanggal penerbitan, yang terbaru dulu"
+
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
+msgid "Sort according to publishing date, oldest first"
+msgstr "Urutkan menurut tanggal penerbitan, yang terlama dulu"
+
+#: cps/templates/author.html:56 cps/templates/author.html:115
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
+msgid "reduce"
+msgstr "kurangi"
+
+#: cps/templates/author.html:99
+msgid "More by"
+msgstr "Lainnya oleh"
+
+#: cps/templates/book_edit.html:11
+msgid "Delete Book"
+msgstr "Hapus"
+
+#: cps/templates/book_edit.html:14
+msgid "Delete formats:"
+msgstr "Hapus format:"
+
+#: cps/templates/book_edit.html:25
+msgid "Convert book format:"
+msgstr "KOnversi format buku:"
+
+#: cps/templates/book_edit.html:30
+msgid "Convert from:"
+msgstr "Konversi dari:"
+
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
+msgid "select an option"
+msgstr "pilih opsi"
+
+#: cps/templates/book_edit.html:37
+msgid "Convert to:"
+msgstr "Konversi ke:"
+
+#: cps/templates/book_edit.html:46
+msgid "Convert book"
+msgstr "Konversi buku"
+
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
+msgid "Book Title"
+msgstr "Judul Buku"
+
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
+msgid "Author"
+msgstr "Penulis"
+
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
+msgid "Description"
+msgstr "Deskripsi"
+
+#: cps/templates/book_edit.html:73
+msgid "Identifiers"
+msgstr "Pengidentifikasi"
+
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+msgid "Identifier Type"
+msgstr "Tipe Pengidentifikasi"
+
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+msgid "Identifier Value"
+msgstr "Nilai Pengidentifikasi"
+
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
+#: cps/templates/user_table.html:24
+msgid "Remove"
+msgstr "Hapus"
+
+#: cps/templates/book_edit.html:83
+msgid "Add Identifier"
+msgstr "Tambah Pengidentifikasi"
+
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
+msgid "Tags"
+msgstr "Tag"
+
+#: cps/templates/book_edit.html:95
+msgid "Series ID"
+msgstr "ID Seri"
+
+#: cps/templates/book_edit.html:99
+msgid "Rating"
+msgstr "Rating"
+
+#: cps/templates/book_edit.html:104
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "Ambil Sampul dari URL (JPEG - Gambar akan diunduh dan disimpan dalam basis data)"
+
+#: cps/templates/book_edit.html:108
+msgid "Upload Cover from Local Disk"
+msgstr "Unggah Sampul dari disk lokal"
+
+#: cps/templates/book_edit.html:113
+msgid "Published Date"
+msgstr "Tanggal Terbit"
+
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
+msgid "Publisher"
+msgstr "Penerbit"
+
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
+msgid "Language"
+msgstr "Bahasa"
+
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
+#: cps/templates/search_form.html:164
+msgid "Yes"
+msgstr "Ya"
+
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
+#: cps/templates/search_form.html:165
+msgid "No"
+msgstr "Tidak"
+
+#: cps/templates/book_edit.html:201
+msgid "Upload Format"
+msgstr "Format Unggahan"
+
+#: cps/templates/book_edit.html:209
+msgid "View Book on Save"
+msgstr "Tampilkan Buku setelah Disimpan"
+
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
+msgid "Fetch Metadata"
+msgstr "Ambil Metadata"
+
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
+msgid "Save"
+msgstr "Simpan"
+
+#: cps/templates/book_edit.html:233
+msgid "Keyword"
+msgstr "Kata Kunci"
+
+#: cps/templates/book_edit.html:234
+msgid "Search keyword"
+msgstr "Cari Kata kunci"
+
+#: cps/templates/book_edit.html:240
+msgid "Click the cover to load metadata to the form"
+msgstr "Klik sampul untuk memuat metadata ke formulir"
+
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
+msgid "Loading..."
+msgstr "Memuat..."
+
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:85
+#: cps/templates/layout.html:210 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:163
+msgid "Close"
+msgstr "Tutup"
+
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
+msgid "Source"
+msgstr "Sumber"
+
+#: cps/templates/book_edit.html:287
+msgid "Search error!"
+msgstr "Kesalahan pencarian!"
+
+#: cps/templates/book_edit.html:288
+msgid "No Result(s) found! Please try another keyword."
+msgstr "Tidak ada hasil yang ditemukan! Silakan coba kata kunci lain."
+
+#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
+#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
+#: cps/templates/user_table.html:100
+msgid "This Field is Required"
+msgstr "Isian Ini Diperlukan"
+
+#: cps/templates/book_table.html:37
+msgid "Merge selected books"
+msgstr "Gabungkan buku terpiih"
+
+#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
+msgid "Remove Selections"
+msgstr "Hapus Pilihan"
+
+#: cps/templates/book_table.html:41
+msgid "Exchange author and title"
+msgstr "Tukar penulis dan judul"
+
+#: cps/templates/book_table.html:47
+msgid "Update Title Sort automatically"
+msgstr "Perbarui Pengurutan Judul secara otomatis"
+
+#: cps/templates/book_table.html:51
+msgid "Update Author Sort automatically"
+msgstr "Perbarui Pengurutan Penulis secara otomatis"
+
+#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
+msgid "Enter Title"
+msgstr "Masukkan Judul"
+
+#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
+#: cps/templates/shelf_edit.html:8
+msgid "Title"
+msgstr "Judul"
+
+#: cps/templates/book_table.html:64
+msgid "Enter Title Sort"
+msgstr "Masukkan Urutan Judul"
+
+#: cps/templates/book_table.html:64
+msgid "Title Sort"
+msgstr "Urutan Judul"
+
+#: cps/templates/book_table.html:65
+msgid "Enter Author Sort"
+msgstr "Masukkan Urutan Penulis"
+
+#: cps/templates/book_table.html:65
+msgid "Author Sort"
+msgstr "Urutan Penulis"
+
+#: cps/templates/book_table.html:66
+msgid "Enter Authors"
+msgstr "Masukkan Penulis"
+
+#: cps/templates/book_table.html:67
+msgid "Enter Categories"
+msgstr "Masukkan Kategori"
+
+#: cps/templates/book_table.html:68
+msgid "Enter Series"
+msgstr "Masukkan Seri"
+
+#: cps/templates/book_table.html:69
+msgid "Series Index"
+msgstr "Indeks Pencarian"
+
+#: cps/templates/book_table.html:70
+msgid "Enter Languages"
+msgstr "Masukkan Bahasa"
+
+#: cps/templates/book_table.html:71
+msgid "Publishing Date"
+msgstr "Tanggal Terbit"
+
+#: cps/templates/book_table.html:72
+msgid "Enter Publishers"
+msgstr "Masukkan Penerbit"
+
+#: cps/templates/book_table.html:73
+msgid "Enter comments"
+msgstr "Masukkan komentar"
+
+#: cps/templates/book_table.html:73
+msgid "Comments"
+msgstr "Komentar"
+
+#: cps/templates/book_table.html:75
+msgid "Archive Status"
+msgstr "Status Arsip"
+
+#: cps/templates/book_table.html:77 cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "Status Baca"
+
+#: cps/templates/book_table.html:80 cps/templates/book_table.html:82
+#: cps/templates/book_table.html:84 cps/templates/book_table.html:86
+#: cps/templates/book_table.html:90 cps/templates/book_table.html:92
+#: cps/templates/book_table.html:96
+msgid "Enter "
+msgstr "入力: "
+
+#: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
+msgid "Are you really sure?"
+msgstr "Apakah Anda yakin?"
+
+#: cps/templates/book_table.html:117
+msgid "Books with Title will be merged from:"
+msgstr "Buku dengan Judul akan digabungkan dari:"
+
+#: cps/templates/book_table.html:121
+msgid "Into Book with Title:"
+msgstr "Ke dalam Buku dengan Judul:"
+
+#: cps/templates/book_table.html:126
+msgid "Merge"
+msgstr "Gabungkan"
+
+#: cps/templates/config_db.html:12
+msgid "Location of Calibre Database"
+msgstr "Lokasi Database Calibre"
+
+#: cps/templates/config_db.html:22
+msgid "Use Google Drive?"
+msgstr "Gunakan Google Drive?"
+
+#: cps/templates/config_db.html:27
+msgid "Authenticate Google Drive"
+msgstr "Autentikasi Google Drive"
+
+#: cps/templates/config_db.html:32
+msgid "Google Drive Calibre folder"
+msgstr "Silakan tekan simpan untuk melanjutkan penyiapan"
+
+#: cps/templates/config_db.html:40
+msgid "Metadata Watch Channel ID"
+msgstr "ID Saluran Metadata Watch"
+
+#: cps/templates/config_db.html:43
+msgid "Revoke"
+msgstr "Tarik Kembali"
+
+#: cps/templates/config_db.html:68
+msgid "New db location is invalid, please enter valid path"
+msgstr "Lokasi basis data baru tidak valid, harap masukkan jalur yang valid"
+
+#: cps/templates/config_edit.html:18
+msgid "Server Configuration"
+msgstr "Konfigurasi Server"
+
+#: cps/templates/config_edit.html:25
+msgid "Server Port"
+msgstr "Port Server"
+
+#: cps/templates/config_edit.html:28
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "Lokasi file sertifikat SSL (biarkan kosong untuk Server non-SSL)"
+
+#: cps/templates/config_edit.html:35
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "Lokasi SSL Keyfile (biarkan kosong untuk Server non-SSL)"
+
+#: cps/templates/config_edit.html:43
+msgid "Update Channel"
+msgstr "Saluran Pembaruan"
+
+#: cps/templates/config_edit.html:45
+msgid "Stable"
+msgstr "Stabil"
+
+#: cps/templates/config_edit.html:46
+msgid "Nightly"
+msgstr "Nightly"
+
+#: cps/templates/config_edit.html:50
+msgid "Trusted Hosts (Comma Separated)"
+msgstr "Host Tepercaya (Pisahkan dengan Koma)"
+
+#: cps/templates/config_edit.html:61
+msgid "Logfile Configuration"
+msgstr "Konfigurasi Logfile"
+
+#: cps/templates/config_edit.html:77
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr "Lokasi dan nama file log (caliber-web.log jika tanpa entri)"
+
+#: cps/templates/config_edit.html:82
+msgid "Enable Access Log"
+msgstr "Aktifkan Log Akses"
+
+#: cps/templates/config_edit.html:85
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr "Lokasi dan nama file log akses (access.log jika tanpa entri)"
+
+#: cps/templates/config_edit.html:96
+msgid "Feature Configuration"
+msgstr "Konfigurasi Fitur"
+
+#: cps/templates/config_edit.html:104
+msgid "Convert non-English characters in title and author while saving to disk"
+msgstr "Konversikan karakter non-Inggris dalam judul dan penulis saat menyimpan ke disk"
+
+#: cps/templates/config_edit.html:108
+msgid "Enable Uploads"
+msgstr "Izinkan Unggahan"
+
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr "(Harap pastikan pengguna juga memiliki hak mengunggah)"
+
+#: cps/templates/config_edit.html:112
+msgid "Allowed Upload Fileformats"
+msgstr "Format Berkas Unggahan yang Diizinkan"
+
+#: cps/templates/config_edit.html:118
+msgid "Enable Anonymous Browsing"
+msgstr "Izinkan Penjelajahan Anonim"
+
+#: cps/templates/config_edit.html:122
+msgid "Enable Public Registration"
+msgstr "Izinkan Registrasi Publik"
+
+#: cps/templates/config_edit.html:127
+msgid "Use E-Mail as Username"
+msgstr "Gunakan Email sebagai Nama Pengguna"
+
+#: cps/templates/config_edit.html:132
+msgid "Enable Magic Link Remote Login"
+msgstr "Izinkan Login Jarak Jauh dengan Magic Link"
+
+#: cps/templates/config_edit.html:137
+msgid "Enable Kobo sync"
+msgstr "Aktifkan sinkronisasi Kobo"
+
+#: cps/templates/config_edit.html:142
+msgid "Proxy unknown requests to Kobo Store"
+msgstr "Proxy permintaan tidak dikenal ke Kobo Store"
+
+#: cps/templates/config_edit.html:145
+msgid "Server External Port (for port forwarded API calls)"
+msgstr "Port Eksternal Server (untuk panggilan API melalui port forward)"
+
+#: cps/templates/config_edit.html:153
+msgid "Use Goodreads"
+msgstr "Gunakan Goodreads"
+
+#: cps/templates/config_edit.html:154
+msgid "Create an API Key"
+msgstr "Buat Kunci API"
+
+#: cps/templates/config_edit.html:158
+msgid "Goodreads API Key"
+msgstr "Kunci API Goodreads"
+
+#: cps/templates/config_edit.html:162
+msgid "Goodreads API Secret"
+msgstr "Goodreads API Secret"
+
+#: cps/templates/config_edit.html:169
+msgid "Allow Reverse Proxy Authentication"
+msgstr "Izinkan Reverse Proxy Authentication"
+
+#: cps/templates/config_edit.html:180
+msgid "Login type"
+msgstr "Tipe Login"
+
+#: cps/templates/config_edit.html:182
+msgid "Use Standard Authentication"
+msgstr "Gunakan Otentikasi Standar"
+
+#: cps/templates/config_edit.html:184
+msgid "Use LDAP Authentication"
+msgstr "Gunakan Otentikasi LDAP"
+
+#: cps/templates/config_edit.html:187
+msgid "Use OAuth"
+msgstr "Gunakan Oauth"
+
+#: cps/templates/config_edit.html:194
+msgid "LDAP Server Host Name or IP Address"
+msgstr "Nama Host Server atau Alamat IP LDAP"
+
+#: cps/templates/config_edit.html:198
+msgid "LDAP Server Port"
+msgstr "Port Server LDAP"
+
+#: cps/templates/config_edit.html:202
+msgid "LDAP Encryption"
+msgstr "Enkripsi LDAP"
+
+#: cps/templates/config_edit.html:205
+msgid "TLS"
+msgstr "TLS"
+
+#: cps/templates/config_edit.html:206
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/config_edit.html:210
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr "Jalur CACertificate LDAP (Hanya diperlukan untuk Autentikasi Sertifikat Klien)"
+
+#: cps/templates/config_edit.html:217
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr "Jalur Sertifikat LDAP (Hanya diperlukan untuk Otentikasi Sertifikat Klien)"
+
+#: cps/templates/config_edit.html:224
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr "Jalur File Kunci LDAP (Hanya diperlukan untuk Otentikasi Sertifikat Klien)"
+
+#: cps/templates/config_edit.html:233
+msgid "LDAP Authentication"
+msgstr "Otentikasi LDAP"
+
+#: cps/templates/config_edit.html:235
+msgid "Anonymous"
+msgstr "Anonim"
+
+#: cps/templates/config_edit.html:236
+msgid "Unauthenticated"
+msgstr "Tidak diautentikasi"
+
+#: cps/templates/config_edit.html:237
+msgid "Simple"
+msgstr "Sederhana"
+
+#: cps/templates/config_edit.html:242
+msgid "LDAP Administrator Username"
+msgstr "Nama Pengguna Administrator LDAP"
+
+#: cps/templates/config_edit.html:248
+msgid "LDAP Administrator Password"
+msgstr "Kata Sandi Administrator LDAP"
+
+#: cps/templates/config_edit.html:253
+msgid "LDAP Distinguished Name (DN)"
+msgstr "Distinguished Name (DN) LDAP"
+
+#: cps/templates/config_edit.html:257
+msgid "LDAP User Object Filter"
+msgstr "Filter Objek Pengguna LDAP"
+
+#: cps/templates/config_edit.html:262
+msgid "LDAP Server is OpenLDAP?"
+msgstr "Server LDAP adalah OpenLDAP?"
+
+#: cps/templates/config_edit.html:264
+msgid "Following Settings are Needed For User Import"
+msgstr "Pengaturan Berikut Diperlukan Untuk Impor Pengguna"
+
+#: cps/templates/config_edit.html:266
+msgid "LDAP Group Object Filter"
+msgstr "Filter Objek Grup LDAP"
+
+#: cps/templates/config_edit.html:270
+msgid "LDAP Group Name"
+msgstr "Nama Grup LDAP"
+
+#: cps/templates/config_edit.html:274
+msgid "LDAP Group Members Field"
+msgstr "Bidang Group Members LDAP"
+
+#: cps/templates/config_edit.html:278
+msgid "LDAP Member User Filter Detection"
+msgstr "Deteksi Filter Pengguna Anggota LDAP"
+
+#: cps/templates/config_edit.html:280
+msgid "Autodetect"
+msgstr "Deteksi otomatis"
+
+#: cps/templates/config_edit.html:281
+msgid "Custom Filter"
+msgstr "Filter Kustom"
+
+#: cps/templates/config_edit.html:286
+msgid "LDAP Member User Filter"
+msgstr "Filter Pengguna Anggota LDAP"
+
+#: cps/templates/config_edit.html:297
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr "Dapatkan %(provider)s Kredensial OAuth"
+
+#: cps/templates/config_edit.html:300
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr "ID Klien %(provider)s OAuth"
+
+#: cps/templates/config_edit.html:304
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr "Client Secret %(provider)s OAuth"
+
+#: cps/templates/config_edit.html:320
+msgid "External binaries"
+msgstr "Binari Eksternal"
+
+#: cps/templates/config_edit.html:326
+msgid "Path to Calibre E-Book Converter"
+msgstr "Jalur ke Konverter E-Book Calibre"
+
+#: cps/templates/config_edit.html:334
+msgid "Calibre E-Book Converter Settings"
+msgstr "Pengaturan Konverter E-Book Caliber"
+
+#: cps/templates/config_edit.html:337
+msgid "Path to Kepubify E-Book Converter"
+msgstr "Jalur ke Konverter E-Book Kepubify"
+
+#: cps/templates/config_edit.html:345
+msgid "Location of Unrar binary"
+msgstr "Lokasi binari Unrar"
+
+#: cps/templates/config_view_edit.html:17
+msgid "View Configuration"
+msgstr "Tampilkan Konfigurasi"
+
+#: cps/templates/config_view_edit.html:32
+msgid "No. of Random Books to Display"
+msgstr "Jumlah Buku Acak untuk Ditampilkan"
+
+#: cps/templates/config_view_edit.html:36
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr "Jumlah Penulis untuk Ditampilkan Sebelum Disembunyikan (0=Nonaktifkan Penyembunyian)"
+
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
+msgid "Theme"
+msgstr "Tema"
+
+#: cps/templates/config_view_edit.html:42
+msgid "Standard Theme"
+msgstr "Tema Standar"
+
+#: cps/templates/config_view_edit.html:43
+msgid "caliBlur! Dark Theme"
+msgstr "Tema Gelap caliBlur!"
+
+#: cps/templates/config_view_edit.html:47
+msgid "Regular Expression for Ignoring Columns"
+msgstr "Ekspresi Reguler untuk Mengabaikan Kolom"
+
+#: cps/templates/config_view_edit.html:51
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr "Tautkan Status Baca/Belum Dibaca ke Kolom Kaliber"
+
+#: cps/templates/config_view_edit.html:60
+msgid "View Restrictions based on Calibre column"
+msgstr "Lihat Batasan berdasarkan kolom Caliber"
+
+#: cps/templates/config_view_edit.html:69
+msgid "Regular Expression for Title Sorting"
+msgstr "Ekspresi Reguler untuk Penyortiran Judul"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
+msgstr "Pengaturan Default untuk Pengguna Baru"
+
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
+msgid "Admin User"
+msgstr "Pengguna Admin"
+
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
+msgid "Allow Downloads"
+msgstr "Izinkan Unduhan"
+
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
+msgid "Allow eBook Viewer"
+msgstr "Izinkan Penampil eBook"
+
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
+msgid "Allow Uploads"
+msgstr "Izinkan Unggahan"
+
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
+msgid "Allow Edit"
+msgstr "Izinkan Edit"
+
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
+msgid "Allow Delete Books"
+msgstr "Izinkan Menghapus Buku"
+
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
+msgid "Allow Changing Password"
+msgstr "Izinkan Mengganti Kata Sandi"
+
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
+msgid "Allow Editing Public Shelves"
+msgstr "Izinkan Mengedit Rak Publik"
+
+#: cps/templates/config_view_edit.html:123
+msgid "Default Language"
+msgstr "Bahasa Bawaan"
+
+#: cps/templates/config_view_edit.html:131
+msgid "Default Visible Language of Books"
+msgstr "Bahasa Buku Bawaan yang Terlihat"
+
+#: cps/templates/config_view_edit.html:147
+msgid "Default Visibilities for New Users"
+msgstr "Visibilitas Default untuk Pengguna Baru"
+
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
+#: cps/templates/user_table.html:154
+msgid "Show Random Books in Detail View"
+msgstr "Tampilkan Buku Acak dalam Tampilan Detail"
+
+#: cps/templates/config_view_edit.html:166 cps/templates/user_edit.html:87
+msgid "Add Allowed/Denied Tags"
+msgstr "Tambahkan Tag yang Diizinkan/Ditolak"
+
+#: cps/templates/config_view_edit.html:167
+msgid "Add Allowed/Denied custom column values"
+msgstr "Tambahkan nilai kolom khusus yang Diizinkan/Ditolak"
+
+#: cps/templates/detail.html:61 cps/templates/detail.html:70
+msgid "Read in Browser"
+msgstr "Baca di Peramban"
+
+#: cps/templates/detail.html:78 cps/templates/detail.html:95
+msgid "Listen in Browser"
+msgstr "Dengarkan di Browser"
+
+#: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
+#, python-format
+msgid "Book %(index)s of %(range)s"
+msgstr "Buku"
+
+#: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
+msgid "Published"
+msgstr "Diterbitkan"
+
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
+msgid "Mark As Unread"
+msgstr "Tandai sebagai Belum dibaca"
+
+#: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
+msgid "Mark As Read"
+msgstr "Tandai sebagai dibaca"
+
+#: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
+msgid "Read"
+msgstr "Baca"
+
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
+msgid "Restore from archive"
+msgstr "Pulihkan dari arsip"
+
+#: cps/templates/detail.html:232 cps/templates/listenmp3.html:166
+msgid "Add to archive"
+msgstr "Tambahkan ke Arsip"
+
+#: cps/templates/detail.html:233 cps/templates/listenmp3.html:167
+msgid "Archived"
+msgstr "Diarsipkan"
+
+#: cps/templates/detail.html:244 cps/templates/listenmp3.html:177
+msgid "Description:"
+msgstr "Deskripsi:"
+
+#: cps/templates/detail.html:257 cps/templates/listenmp3.html:190
+#: cps/templates/search.html:16
+msgid "Add to shelf"
+msgstr "Tambah ke rak"
+
+#: cps/templates/detail.html:268 cps/templates/detail.html:285
+#: cps/templates/feed.xml:79 cps/templates/layout.html:161
+#: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
+#: cps/templates/search.html:22
+msgid "(Public)"
+msgstr "(Publik)"
+
+#: cps/templates/detail.html:299
+msgid "Edit Metadata"
+msgstr "Edit Metadata"
+
+#: cps/templates/email_edit.html:13
+msgid "Choose Server Type"
+msgstr "Pilih Jenis Server"
+
+#: cps/templates/email_edit.html:15
+msgid "Use Standard E-Mail Account"
+msgstr "Gunakan Akun Email Standar"
+
+#: cps/templates/email_edit.html:16
+msgid "Gmail Account with OAuth2 Verification"
+msgstr "Akun Gmail dengan Verifikasi OAuth2"
+
+#: cps/templates/email_edit.html:22
+msgid "Setup Gmail Account as E-Mail Server"
+msgstr "Siapkan Akun Gmail sebagai Server Email"
+
+#: cps/templates/email_edit.html:24
+msgid "Revoke Gmail Access"
+msgstr "Cabut Akses G-Mail"
+
+#: cps/templates/email_edit.html:42
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:43
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:51
+msgid "SMTP Password"
+msgstr "Kata Sandi SMTP"
+
+#: cps/templates/email_edit.html:58
+msgid "Attachment Size Limit"
+msgstr "Batas Ukuran Lampiran"
+
+#: cps/templates/email_edit.html:66
+msgid "Save and Send Test E-mail"
+msgstr "Simpan dan Kirim Email Percobaan"
+
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:33
+#: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
+msgid "Back"
+msgstr "Kembali"
+
+#: cps/templates/email_edit.html:74
+msgid "Allowed Domains (Whitelist)"
+msgstr "Domain yang Diizinkan (Daftar Putih)"
+
+#: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
+msgid "Add Domain"
+msgstr "Tambahkan Domain"
+
+#: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
+#: cps/templates/user_table.html:27
+msgid "Add"
+msgstr "Tambah"
+
+#: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
+msgid "Enter domainname"
+msgstr "Masukkan Nama Domain"
+
+#: cps/templates/email_edit.html:92
+msgid "Denied Domains (Blacklist)"
+msgstr "Domain yang Ditolak (Daftar Hitam)"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:194
+msgid "Next"
+msgstr "Selanjutnya"
+
+#: cps/templates/generate_kobo_auth_url.html:6
+#, fuzzy
+msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr "Buka file .kobo/Kobo eReader.conf di editor teks dan tambahkan (atau edit):"
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Kobo Token:"
+msgstr "Token Kobo:"
+
+#: cps/templates/grid.html:21
+msgid "List"
+msgstr "Daftar"
+
+#: cps/templates/http_error.html:34
+msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
+msgstr "Instans Calibre-Web belum dikonfigurasi, harap hubungi administrator Anda"
+
+#: cps/templates/http_error.html:44
+msgid "Create Issue"
+msgstr "Buat Isu"
+
+#: cps/templates/http_error.html:51
+msgid "Return to Home"
+msgstr "Kembali ke Beranda"
+
+#: cps/templates/http_error.html:53
+msgid "Logout User"
+msgstr "Keluar Pengguna"
+
+#: cps/templates/index.html:71
+msgid "Sort ascending according to download count"
+msgstr "Urutkan naik menurut jumlah unduhan"
+
+#: cps/templates/index.html:72
+msgid "Sort descending according to download count"
+msgstr "Urutkan turun menurut jumlah unduhan"
+
+#: cps/templates/index.html:78 cps/templates/search.html:35
+#: cps/templates/shelf.html:24
+msgid "Sort authors in alphabetical order"
+msgstr "Urutkan penulis dalam urutan abjad"
+
+#: cps/templates/index.html:79 cps/templates/search.html:36
+#: cps/templates/shelf.html:25
+msgid "Sort authors in reverse alphabetical order"
+msgstr "Urutkan penulis dalam urutan abjad terbalik"
+
+#: cps/templates/index.html:83
+msgid "Sort ascending according to series index"
+msgstr "Urutkan naik menurut indeks seri"
+
+#: cps/templates/index.html:84
+msgid "Sort descending according to series index"
+msgstr "Urutkan menurun menurut indeks seri"
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "Mulai"
+
+#: cps/templates/index.xml:18
+msgid "Alphabetical Books"
+msgstr "Buku Abjad"
+
+#: cps/templates/index.xml:22
+msgid "Books sorted alphabetically"
+msgstr "Buku diurutkan menurut abjad"
+
+#: cps/templates/index.xml:29
+msgid "Popular publications from this catalog based on Downloads."
+msgstr "Publikasi populer dari katalog ini berdasarkan Unduhan."
+
+#: cps/templates/index.xml:36
+msgid "Popular publications from this catalog based on Rating."
+msgstr "Publikasi populer dari katalog ini berdasarkan Rating."
+
+#: cps/templates/index.xml:39
+msgid "Recently added Books"
+msgstr "Buku yang baru ditambahkan"
+
+#: cps/templates/index.xml:43
+msgid "The latest Books"
+msgstr "Buku-buku terbaru"
+
+#: cps/templates/index.xml:46
+msgid "Random Books"
+msgstr "Buku Acak"
+
+#: cps/templates/index.xml:73
+msgid "Books ordered by Author"
+msgstr "Buku yang diurutkan menurut Penulis"
+
+#: cps/templates/index.xml:80
+msgid "Books ordered by publisher"
+msgstr "Buku yang diurutkan menurut Penerbit"
+
+#: cps/templates/index.xml:87
+msgid "Books ordered by category"
+msgstr "Buku yang diurutkan menurut Kategori"
+
+#: cps/templates/index.xml:94
+msgid "Books ordered by series"
+msgstr "Buku yang diurutkan menurut Seri"
+
+#: cps/templates/index.xml:101
+msgid "Books ordered by Languages"
+msgstr "Buku yang diurutkan menurut Bahasa"
+
+#: cps/templates/index.xml:108
+msgid "Books ordered by Rating"
+msgstr "Buku yang diurutkan menurut Peringkat"
+
+#: cps/templates/index.xml:116
+msgid "Books ordered by file formats"
+msgstr "Buku yang diurutkan menurut format berkas"
+
+#: cps/templates/index.xml:119 cps/templates/layout.html:159
+#: cps/templates/search_form.html:87
+msgid "Shelves"
+msgstr "Rak"
+
+#: cps/templates/index.xml:123
+msgid "Books organized in shelves"
+msgstr "本棚に整理された本"
+
+#: cps/templates/layout.html:33 cps/templates/login.html:30
+msgid "Home"
+msgstr "Beranda"
+
+#: cps/templates/layout.html:39
+msgid "Toggle Navigation"
+msgstr "Alihkan Navigasi"
+
+#: cps/templates/layout.html:54
+msgid "Search Library"
+msgstr "Cari di Pustaka"
+
+#: cps/templates/layout.html:72 cps/templates/layout.html:101
+msgid "Account"
+msgstr "Akun"
+
+#: cps/templates/layout.html:78 cps/templates/layout.html:103
+msgid "Logout"
+msgstr "Keluar"
+
+#: cps/templates/layout.html:85 cps/templates/layout.html:141
+msgid "Uploading..."
+msgstr "Mengunggah..."
+
+#: cps/templates/layout.html:85
+msgid "Error"
+msgstr "Terjadi Kesalahan"
+
+#: cps/templates/layout.html:85
+msgid "Upload done, processing, please wait..."
+msgstr "Unggahan selesai, harap tunggu, data sedang diproses..."
+
+#: cps/templates/layout.html:98 cps/templates/read.html:76
+#: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
+msgid "Settings"
+msgstr "Pengaturan"
+
+#: cps/templates/layout.html:142
+msgid "Please do not refresh the page"
+msgstr "Harap jangan segarkan halaman"
+
+#: cps/templates/layout.html:152
+msgid "Browse"
+msgstr "Jelajahi"
+
+#: cps/templates/layout.html:165 cps/templates/stats.html:3
+msgid "About"
+msgstr "Tentang"
+
+#: cps/templates/layout.html:179
+msgid "Previous"
+msgstr "Sebelumnya"
+
+#: cps/templates/layout.html:206
+msgid "Book Details"
+msgstr "Detail Buku"
+
+#: cps/templates/list.html:22
+msgid "Grid"
+msgstr "Terjadi Kesalahan"
+
+#: cps/templates/login.html:18
+msgid "Remember Me"
+msgstr "Ingat saya"
+
+#: cps/templates/login.html:23
+msgid "Forgot Password?"
+msgstr "Lupa Kata Sandi?"
+
+#: cps/templates/login.html:34
+msgid "Log in with Magic Link"
+msgstr "Masuk dengan Magic Link"
+
+#: cps/templates/logviewer.html:6
+msgid "Show Calibre-Web Log: "
+msgstr "Tampilkan Log Caliber-Web:"
+
+#: cps/templates/logviewer.html:8
+msgid "Calibre-Web Log: "
+msgstr "Log Calibre-Web: "
+
+#: cps/templates/logviewer.html:8
+msgid "Stream output, can't be displayed"
+msgstr "Output aliran, tidak dapat ditampilkan"
+
+#: cps/templates/logviewer.html:12
+msgid "Show Access Log: "
+msgstr "Tampilkan Log Akses:"
+
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr "Unduh Calibre-Web Log"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Unduh Log Akses"
+
+#: cps/templates/modal_dialogs.html:6
+msgid "Select Allowed/Denied Tags"
+msgstr "Pilih Tag yang Diizinkan/Ditolak"
+
+#: cps/templates/modal_dialogs.html:7
+msgid "Select Allowed/Denied Custom Column Values"
+msgstr "Pilih Nilai Kolom Kustom yang Diizinkan/Ditolak"
+
+#: cps/templates/modal_dialogs.html:8
+msgid "Select Allowed/Denied Tags of User"
+msgstr "Pilih Tag Pengguna yang Diizinkan/Ditolak"
+
+#: cps/templates/modal_dialogs.html:9
+msgid "Select Allowed/Denied Custom Column Values of User"
+msgstr "Pilih Nilai Kolom Pengguna yang Diizinkan/Ditolak"
+
+#: cps/templates/modal_dialogs.html:15
+msgid "Enter Tag"
+msgstr "Masukkan Tag"
+
+#: cps/templates/modal_dialogs.html:24
+msgid "Add View Restriction"
+msgstr "Tambahkan Batasan Tampilan"
+
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "Format buku ini akan dihapus secara permanen dari database"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Buku ini akan dihapus secara permanen dari basis data"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "dan harddisk"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Catatan Penting Kobo: buku yang dihapus akan tetap ada di perangkat Kobo yang telah dipasangkan."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Buku harus diarsipkan terlebih dahulu dan perangkat disinkronkan sebelum buku dapat dihapus dengan aman."
+
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr "Pilih Lokasi Berkas"
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr "tipe"
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr "nama"
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr "ukuran"
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr "Direktori Induk"
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr "Pilih"
+
+#: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
+msgid "Ok"
+msgstr "Ok"
+
+#: cps/templates/osd.xml:5
+msgid "Calibre-Web eBook Catalog"
+msgstr "Katalog eBook Calibre-Web"
+
+#: cps/templates/read.html:6
+msgid "epub Reader"
+msgstr "Pembaca EPUB"
+
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
+msgid "Light"
+msgstr "Terang"
+
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
+msgid "Dark"
+msgstr "Gelap"
+
+#: cps/templates/read.html:83
+msgid "Sepia"
+msgstr "Sepia"
+
+#: cps/templates/read.html:84
+msgid "Black"
+msgstr "Hitam"
+
+#: cps/templates/read.html:88
+msgid "Reflow text when sidebars are open."
+msgstr "Reflow teks saat sidebar terbuka."
+
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
+#: cps/templates/readcbr.html:7
+msgid "Comic Reader"
+msgstr "Pembaca Komik"
+
+#: cps/templates/readcbr.html:92
+msgid "Keyboard Shortcuts"
+msgstr "Pintasan Keyboard"
+
+#: cps/templates/readcbr.html:95
+msgid "Previous Page"
+msgstr "Halaman Sebelumnya"
+
+#: cps/templates/readcbr.html:96 cps/templates/readcbr.html:165
+msgid "Next Page"
+msgstr "Halaman Selanjutnya"
+
+#: cps/templates/readcbr.html:97
+msgid "Scale to Best"
+msgstr "Skala ke Terbaik"
+
+#: cps/templates/readcbr.html:98
+msgid "Scale to Width"
+msgstr "Skala ke Lebar"
+
+#: cps/templates/readcbr.html:99
+msgid "Scale to Height"
+msgstr "Skala ke Tinggi"
+
+#: cps/templates/readcbr.html:100
+msgid "Scale to Native"
+msgstr "Skalakan ke Asli"
+
+#: cps/templates/readcbr.html:101
+msgid "Rotate Right"
+msgstr "Putar ke Kanan"
+
+#: cps/templates/readcbr.html:102
+msgid "Rotate Left"
+msgstr "Putar ke Kiri"
+
+#: cps/templates/readcbr.html:103
+msgid "Flip Image"
+msgstr "Balikkan Gambar"
+
+#: cps/templates/readcbr.html:125
+msgid "Scale"
+msgstr "Skala"
+
+#: cps/templates/readcbr.html:128
+msgid "Best"
+msgstr "Terbaik"
+
+#: cps/templates/readcbr.html:129
+msgid "Width"
+msgstr "Lebar"
+
+#: cps/templates/readcbr.html:130
+msgid "Height"
+msgstr "Tinggi"
+
+#: cps/templates/readcbr.html:131
+msgid "Native"
+msgstr "Asli"
+
+#: cps/templates/readcbr.html:136
+msgid "Rotate"
+msgstr "Putar"
+
+#: cps/templates/readcbr.html:147
+msgid "Flip"
+msgstr "Balik"
+
+#: cps/templates/readcbr.html:150
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: cps/templates/readcbr.html:151
+msgid "Vertical"
+msgstr "Vertical"
+
+#: cps/templates/readcbr.html:156
+msgid "Direction"
+msgstr "Arah Baca"
+
+#: cps/templates/readcbr.html:159
+msgid "Left to Right"
+msgstr "Kiri ke Kanan"
+
+#: cps/templates/readcbr.html:160
+msgid "Right to Left"
+msgstr "Kanan ke Kiri"
+
+#: cps/templates/readcbr.html:168
+msgid "Reset to Top"
+msgstr "Atur Ulang ke Atas"
+
+#: cps/templates/readcbr.html:169
+msgid "Remember Position"
+msgstr "Ingat Posisi"
+
+#: cps/templates/readcbr.html:174
+msgid "Scrollbar"
+msgstr "Scrollbar"
+
+#: cps/templates/readcbr.html:177
+msgid "Show"
+msgstr "Tampilkan"
+
+#: cps/templates/readcbr.html:178
+msgid "Hide"
+msgstr "Sembunyikan"
+
+#: cps/templates/readdjvu.html:5
+msgid "DJVU Reader"
+msgstr "Pembaca DJVU"
+
+#: cps/templates/readpdf.html:32
+msgid "PDF Reader"
+msgstr "Pembaca PDF"
+
+#: cps/templates/readtxt.html:6
+msgid "txt Reader"
+msgstr "Pembaca txt"
+
+#: cps/templates/register.html:4
+msgid "Register New Account"
+msgstr "Daftar Akun Baru"
+
+#: cps/templates/register.html:10
+msgid "Choose a username"
+msgstr "Pilih nama pengguna"
+
+#: cps/templates/register.html:15
+msgid "Your email address"
+msgstr "Alamat email Anda"
+
+#: cps/templates/remote_login.html:5
+msgid "Magic Link - Authorise New Device"
+msgstr "Magic Link - Otorisasi Perangkat Baru"
+
+#: cps/templates/remote_login.html:7
+msgid "On another device, login and visit:"
+msgstr "Di perangkat lain, masuk dan kunjungi:"
+
+#: cps/templates/remote_login.html:11
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr "Setelah diverifikasi, Anda akan secara otomatis masuk ke perangkat ini."
+
+#: cps/templates/remote_login.html:14
+msgid "This verification link will expire in 10 minutes."
+msgstr "Tautan verifikasi ini akan kedaluwarsa dalam 10 menit."
+
+#: cps/templates/schedule_edit.html:29
+msgid "Generate Book Cover Thumbnails"
+msgstr "Hasilkan Thumbnail Sampul Buku"
+
+#: cps/templates/schedule_edit.html:33
+msgid "Generate Series Cover Thumbnails"
+msgstr "Hasilkan Thumbnail Sampul Seri"
+
+#: cps/templates/search.html:6
+msgid "No Results Found"
+msgstr "Tidak ada hasil yang ditemukan"
+
+#: cps/templates/search.html:7
+msgid "Search Term:"
+msgstr "Istilah Penelusuran:"
+
+#: cps/templates/search.html:9
+msgid "Results for:"
+msgstr "Hasil untuk:"
+
+#: cps/templates/search_form.html:21
+msgid "Published Date From"
+msgstr "Tanggal Diterbitkan Dari"
+
+#: cps/templates/search_form.html:31
+msgid "Published Date To"
+msgstr "Tanggal Diterbitkan Hingga"
+
+#: cps/templates/search_form.html:59
+msgid "Exclude Tags"
+msgstr "Kecualikan Tag"
+
+#: cps/templates/search_form.html:77
+msgid "Exclude Series"
+msgstr "Kecualikan Seri"
+
+#: cps/templates/search_form.html:95
+msgid "Exclude Shelves"
+msgstr "Kecualikan Rak"
+
+#: cps/templates/search_form.html:115
+msgid "Exclude Languages"
+msgstr "Kecualikan Bahasa"
+
+#: cps/templates/search_form.html:126
+msgid "Extensions"
+msgstr "Ekstensi"
+
+#: cps/templates/search_form.html:134
+msgid "Exclude Extensions"
+msgstr "Kecualikan Ekstensi"
+
+#: cps/templates/search_form.html:144
+msgid "Rating Above"
+msgstr "Peringkat Diatas"
+
+#: cps/templates/search_form.html:148
+msgid "Rating Below"
+msgstr "Peringkat Dibawah"
+
+#: cps/templates/search_form.html:180
+msgid "From:"
+msgstr "Dari:"
+
+#: cps/templates/search_form.html:190
+msgid "To:"
+msgstr "Hingga:"
+
+#: cps/templates/shelf.html:13
+msgid "Delete this Shelf"
+msgstr "Hapus rak ini"
+
+#: cps/templates/shelf.html:14
+msgid "Edit Shelf Properties"
+msgstr "Edit Properti Rak"
+
+#: cps/templates/shelf.html:17
+msgid "Arrange books manually"
+msgstr "Atur buku secara manual"
+
+#: cps/templates/shelf.html:18
+msgid "Disable Change order"
+msgstr "Nonaktifkan Ubah urutan"
+
+#: cps/templates/shelf.html:18
+msgid "Enable Change order"
+msgstr "Aktifkan Ubah urutan"
+
+#: cps/templates/shelf_edit.html:14
+msgid "Share with Everyone"
+msgstr "Bagikan dengan Semua Orang"
+
+#: cps/templates/shelf_edit.html:21
+msgid "Sync this shelf with Kobo device"
+msgstr "Sinkronkan rak ini dengan perangkat Kobo"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag to Rearrange Order"
+msgstr "Seret untuk Mengatur Ulang Urutan"
+
+#: cps/templates/shelf_order.html:33
+msgid "Hidden Book"
+msgstr "Buku Tersembunyi"
+
+#: cps/templates/stats.html:7
+msgid "Library Statistics"
+msgstr "Statistik Pustaka"
+
+#: cps/templates/stats.html:12
+msgid "Books in this Library"
+msgstr "Buku dalam Pustaka Ini"
+
+#: cps/templates/stats.html:16
+msgid "Authors in this Library"
+msgstr "Penulis dalam Pustaka Ini"
+
+#: cps/templates/stats.html:20
+msgid "Categories in this Library"
+msgstr "Kategori dalam Pustaka Ini"
+
+#: cps/templates/stats.html:24
+msgid "Series in this Library"
+msgstr "Seri dalam Pustaka Ini"
+
+#: cps/templates/stats.html:29
+msgid "System Statistics"
+msgstr "Statistik Sistem"
+
+#: cps/templates/stats.html:33
+msgid "Program"
+msgstr "Pustaka Program"
+
+#: cps/templates/stats.html:34
+msgid "Installed Version"
+msgstr "Versi Terpasang"
+
+#: cps/templates/tasks.html:12
+msgid "User"
+msgstr "Pengguna"
+
+#: cps/templates/tasks.html:14
+msgid "Task"
+msgstr "Tugas"
+
+#: cps/templates/tasks.html:15
+msgid "Status"
+msgstr "Status"
+
+#: cps/templates/tasks.html:16
+msgid "Progress"
+msgstr "Kemajuan"
+
+#: cps/templates/tasks.html:17
+msgid "Run Time"
+msgstr "Waktu Jalan"
+
+#: cps/templates/tasks.html:18
+msgid "Start Time"
+msgstr "Waktu Mulai"
+
+#: cps/templates/tasks.html:20
+msgid "Actions"
+msgstr "Tindakan"
+
+#: cps/templates/tasks.html:40
+msgid "This task will be cancelled. Any progress made by this task will be saved."
+msgstr "Tugas ini akan dibatalkan. Setiap kemajuan yang dibuat oleh tugas ini akan disimpan."
+
+#: cps/templates/tasks.html:41
+msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr "Jika ini adalah tugas terjadwal, ini akan dijalankan ulang selama waktu terjadwal berikutnya."
+
+#: cps/templates/user_edit.html:20
+msgid "Reset user Password"
+msgstr "Atur ulang kata sandi pengguna"
+
+#: cps/templates/user_edit.html:43
+msgid "Language of Books"
+msgstr "Bahasa Buku"
+
+#: cps/templates/user_edit.html:54
+msgid "OAuth Settings"
+msgstr "Pengaturan OAuth"
+
+#: cps/templates/user_edit.html:56
+msgid "Link"
+msgstr "Tautan"
+
+#: cps/templates/user_edit.html:58
+msgid "Unlink"
+msgstr "Batalkan tautan"
+
+#: cps/templates/user_edit.html:64
+msgid "Kobo Sync Token"
+msgstr "Token Kono Sync"
+
+#: cps/templates/user_edit.html:66
+msgid "Create/View"
+msgstr "Buat/Lihat"
+
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr "Paksa sinkronisasi kobo penuh"
+
+#: cps/templates/user_edit.html:88
+msgid "Add allowed/Denied Custom Column Values"
+msgstr "Tambahkan Nilai Kolom Kustom yang Diizinkan/Ditolak"
+
+#: cps/templates/user_edit.html:137
+msgid "Sync only books in selected shelves with Kobo"
+msgstr "Sinkronkan hanya buku di rak yang dipilih dengan Kobo"
+
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
+msgid "Delete User"
+msgstr "Hapus Pengguna"
+
+#: cps/templates/user_edit.html:159
+msgid "Generate Kobo Auth URL"
+msgstr "Hasilkan URL Autentikasi Kobo"
+
+#: cps/templates/user_table.html:80 cps/templates/user_table.html:103
+msgid "Select..."
+msgstr "Pilih..."
+
+#: cps/templates/user_table.html:131
+msgid "Edit User"
+msgstr "Edit Pengguna"
+
+#: cps/templates/user_table.html:134
+msgid "Enter Username"
+msgstr "Masukkan Nama Pengguna"
+
+#: cps/templates/user_table.html:135
+msgid "Enter E-mail Address"
+msgstr "Masukkan Alamar Email"
+
+#: cps/templates/user_table.html:136
+msgid "Enter E-Reader E-mail Address"
+msgstr "Masukkan Alamat Email Kindle"
+
+#: cps/templates/user_table.html:136
+msgid "E-Reader E-mail"
+msgstr "Email Kindle"
+
+#: cps/templates/user_table.html:137
+msgid "Locale"
+msgstr "Lokal"
+
+#: cps/templates/user_table.html:138
+msgid "Visible Book Languages"
+msgstr "Bahasa Buku Terlihat"
+
+#: cps/templates/user_table.html:139
+msgid "Edit Allowed Tags"
+msgstr "Edit Tag yang Diizinkan"
+
+#: cps/templates/user_table.html:139
+msgid "Allowed Tags"
+msgstr "Tag yang Diizinkan"
+
+#: cps/templates/user_table.html:140
+msgid "Edit Denied Tags"
+msgstr "Edit Tag yang Ditolak"
+
+#: cps/templates/user_table.html:140
+msgid "Denied Tags"
+msgstr "Tag yang Ditolak"
+
+#: cps/templates/user_table.html:141
+msgid "Edit Allowed Column Values"
+msgstr "Edit Nilai Kolom yang Diizinkan"
+
+#: cps/templates/user_table.html:141
+msgid "Allowed Column Values"
+msgstr "Nilai Kolom yang Diizinkan"
+
+#: cps/templates/user_table.html:142
+msgid "Edit Denied Column Values"
+msgstr "Edit Nilai Kolom yang Ditolak"
+
+#: cps/templates/user_table.html:142
+msgid "Denied Column Values"
+msgstr "Nilai Kolom yang Ditolak"
+
+#: cps/templates/user_table.html:144
+msgid "Change Password"
+msgstr "Ubah Kata Sandi"
+
+#: cps/templates/user_table.html:147
+msgid "View"
+msgstr "Tampilan"
+
+#: cps/templates/user_table.html:150
+msgid "Edit Public Shelves"
+msgstr "Edit Rak Publik"
+
+#: cps/templates/user_table.html:152
+msgid "Sync selected Shelves with Kobo"
+msgstr "Sinkronkan Rak yang dipilih dengan Kob"
+
+#: cps/templates/user_table.html:156
+msgid "Show read/unread selection"
+msgstr "Tampilkan pilihan baca/belum dibaca"
+
+#: cps/templates/user_table.html:159
+msgid "Show random books"
+msgstr "Tampilkan buku acak"
+
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index a09df5e7285de5fe2dc3abc5c6a17f1fb04e5306..29633acbcdde7e9995d433a805797cacda5f355e 100644
GIT binary patch
delta 19
acmeBs$lUjkd4pavi?NlF;bx=em|Or(&<9HZ

delta 19
acmeBs$lUjkd4pavi-DDq(PpFOm|Or(y9Y@C

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 0565bd2cb..5ce6a4dd6 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -507,12 +507,12 @@ msgstr "non installato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonna personalizzata no.%(column)d non esiste nel database di Calibre"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2731,7 +2731,7 @@ msgstr "Errore"
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Configurazione"
@@ -2876,26 +2876,30 @@ msgstr "Catalogo Calibre-Web"
 msgid "epub Reader"
 msgstr "Lettore epub"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Chiaro"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Scuro"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr "Seppia"
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 msgid "Black"
 msgstr "Nero"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Adatta il testo quando le barre laterali sono aperte."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr "Lettore di fumetti"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 76914956741da4797d1dee58f90022a9bb3b793a..2e9277a7689ffc7de1431302b698268d011c7c29 100644
GIT binary patch
delta 19
bcmX@|mifqA<_$ZWSd6WV3^(s>VlM#zU%d#G

delta 19
bcmX@|mifqA<_$ZWSPZO;j5hCWVlM#zU#JL^

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 520ebdfea..982b5c8b9 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: subdiox <subdiox@gmail.com>\n"
 "Language: ja\n"
@@ -509,12 +509,12 @@ msgstr "インストールされていません"
 msgid "Execution permissions missing"
 msgstr "実行権限がありません"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "カスタムカラムの%(column)d列目がcalibreのDBに存在しません"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2736,7 +2736,7 @@ msgstr "エラー"
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "設定"
@@ -2881,26 +2881,30 @@ msgstr "Calibre-WebのeBookカタログ"
 msgid "epub Reader"
 msgstr "EPUBリーダー"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "ライト"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "ダーク"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr "セピア"
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 msgid "Black"
 msgstr "ブラック"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "サイドバーが開いているとき、テキストを再度流し込みます。"
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr "コミックリーダー"
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 02c0b86f06684d1dbe6bdefa9036e52f55f1dac2..00806ddeae2616e9b910ba5eb1a878247f7a68e8 100644
GIT binary patch
delta 19
bcmaF3i}B$u#trwCS&XfW3^zYkuCoLHTEqx1

delta 19
bcmaF3i}B$u#trwCSq!X<j5a@3uCoLHTCWH#

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 32f758870..101b9fe9b 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -517,12 +517,12 @@ msgstr "មិនបានតម្លើង"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2751,7 +2751,7 @@ msgstr ""
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "ការកំណត់"
@@ -2897,27 +2897,31 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr ""
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "មកក្រោយ"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "សេរេអត្ថបទនៅពេលបើកផ្ទាំងចំហៀង។"
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr ""
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index 137889e95ef8de95fac366c5d95277ba1a9d4911..f83acf6d881194fb0f47ca95d4e5e40c27ceb13f 100644
GIT binary patch
delta 19
bcmaF8l=<~i<_#7VEXGzwhMR3F)<*#VRAdLs

delta 19
bcmaF8l=<~i<_#7VECyCaMw@La)<*#VR8I%V

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index a8c6726a3..098ca6b93 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -508,12 +508,12 @@ msgstr "설치되지 않음"
 msgid "Execution permissions missing"
 msgstr "실행 권한 누락"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2740,7 +2740,7 @@ msgstr "오류"
 msgid "Upload done, processing, please wait..."
 msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "설정"
@@ -2885,27 +2885,31 @@ msgstr "Calibre-Web 책 목록"
 msgid "epub Reader"
 msgstr "epub 리더"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "밝게"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "어둡게"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "뒤로"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "사이드바가 열려 있을 때 텍스트 다시 배열."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr "코믹 리더"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 0b136f77161b9b26d614d4241d1708d0185f6a2c..e49970f04437348da5bd66f22ddd31bb1ae3d19b 100644
GIT binary patch
delta 19
acmZ4fmudN5rVaLaEXGzwhMS%9QUU-~l?Rpp

delta 19
acmZ4fmudN5rVaLaECyCaMw^}UQUU-~fCrQS

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index a76455719..97de5b2ef 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -520,12 +520,12 @@ msgstr "niet geïnstalleerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2763,7 +2763,7 @@ msgstr "Fout"
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Instellingen"
@@ -2910,27 +2910,31 @@ msgstr "Calibre-Web - e-boekcatalogus"
 msgid "epub Reader"
 msgstr "PDF lezer"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Licht"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Donker"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Annuleren"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Tekstindeling automatisch aanpassen als het zijpaneel geopend is."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 694d5856fd062b2ecac2b8c96ba833d5ae43fb74..78812da4855b8fe44c43da61f6750c53deb4e9d7 100644
GIT binary patch
delta 19
bcmX@p&3vYtdBe9n7Go<T!_B|)E`<RASYrs_

delta 19
bcmX@p&3vYtdBe9n76U6Iqs_naE`<RASWXDu

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 0fbe00928..d6d1a3df3 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -521,12 +521,12 @@ msgstr "nie zainstalowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Niestandardowa kolumna No.%(column)d nie istnieje w bazie calibre"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2778,7 +2778,7 @@ msgstr "Błąd"
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Ustawienia"
@@ -2926,27 +2926,31 @@ msgstr "Katalog e-booków Calibre-Web"
 msgid "epub Reader"
 msgstr "Czytnik PDF"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Jasny"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Ciemny"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Wróć"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Przepływ tekstu, gdy paski boczne są otwarte."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 7eb38494e7dd3c4bd773a10c42af68390b03960d..de9cbf93972c05fdb3f7329bfd892d4737690ba4 100644
GIT binary patch
delta 19
bcmbPmnR&ux<_(LQSd6WV3^y-pdX)wMRgVau

delta 19
bcmbPmnR&ux<_(LQSPZO;j5aT8dX)wMReA`X

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 8e06634e2..219a6fcf8 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -506,12 +506,12 @@ msgstr "não instalado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "A Coluna Personalizada No.%(column)d não existe no banco de dados do calibre"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2733,7 +2733,7 @@ msgstr "Erro"
 msgid "Upload done, processing, please wait..."
 msgstr "Upload concluído, processando, por favor aguarde ..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Configurações"
@@ -2878,26 +2878,30 @@ msgstr "Catálogo de e-books Calibre-Web"
 msgid "epub Reader"
 msgstr "leitor de epub"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Claro"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Escuro"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr "Sépia"
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 msgid "Black"
 msgstr "Preto"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Refluir o texto quando as barras laterais estiverem abertas."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr "Leitor de Quadrinhos"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index fae63dd7aab48c6e51645417280996929f800521..4d0412b318d4763b592632b9eda57d89d9566a72 100644
GIT binary patch
delta 19
acmZp8$<*+YX+yF<i?NlF;pTLI$y5MMxd!wA

delta 19
acmZp8$<*+YX+yF<i-DDq(dKl2$y5MMqz3W;

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 6c0a68604..702446694 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -521,12 +521,12 @@ msgstr "не установлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2763,7 +2763,7 @@ msgstr "Ошибка"
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Настройки"
@@ -2910,27 +2910,31 @@ msgstr "Каталог электронных книг Caliber-Web"
 msgid "epub Reader"
 msgstr "PDF reader"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Светлая"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Темная"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Назад"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Обновить размещение текста при открытии боковой панели."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 95c96236c2d44e84563eb79554b4e395d9752975..d816968f6324cc06836fa36a66740988e2d71ff7 100644
GIT binary patch
delta 19
bcmcchp6S+mrVW-kEXGzwhMR43=6VAFTCoTO

delta 19
bcmcchp6S+mrVW-kECyCaMw@MO=6VAFTAT<1

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index fdd8b47bc..c9bdbd679 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -518,12 +518,12 @@ msgstr "inte installerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2761,7 +2761,7 @@ msgstr "Fel"
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Inställningar"
@@ -2907,27 +2907,31 @@ msgstr "Calibre-Web e-bokkatalog"
 msgid "epub Reader"
 msgstr "PDF-läsare"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Ljust"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Mörkt"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Tillbaka"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Fyll i texten igen när sidofält är öppna."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index f466c7f7de2eee37e95dedf64efcee17589eb107..82a8e5f88321f6054ea56d68b6db754f8eff54f0 100644
GIT binary patch
delta 19
bcmX@QhVkec#tkV(EXGzwhMO~t?kWQSPV5Iv

delta 19
bcmX@QhVkec#tkV(ECyCaMw>H??kWQSPS*!Y

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index fec600047..f0bd45a3b 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -514,12 +514,12 @@ msgstr "yüklü değil"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2751,7 +2751,7 @@ msgstr "Hata"
 msgid "Upload done, processing, please wait..."
 msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Ayarlar"
@@ -2898,27 +2898,31 @@ msgstr ""
 msgid "epub Reader"
 msgstr "PDF Okuyucu"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Açık"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Koyu"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Geri"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Kenar çubukları açıkken metni kaydır"
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 #, fuzzy
 msgid "Comic Reader"
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 4edeb2ecd1d69e6abb09e6cf746aaed95e414d78..b2c10be1a1964e5f9a39ff94f5a8f576acf36473 100644
GIT binary patch
delta 19
acmcb)hw<hf#tmFLEXGzwhMW0xyo~@%uLe;7

delta 19
acmcb)hw<hf#tmFLECyCaMw|I`yo~@%ng&k*

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index ddbb03d8a..6edb64db3 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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+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"
@@ -514,12 +514,12 @@ msgstr "не встановлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2748,7 +2748,7 @@ msgstr "Помилка"
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Налаштування"
@@ -2894,27 +2894,31 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr ""
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Назад"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "Переформатувати текст, коли відкриті бічні панелі."
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr ""
diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po
index 75a87c2a9..fd9aed636 100644
--- a/cps/translations/vi/LC_MESSAGES/messages.po
+++ b/cps/translations/vi/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2022-09-20 21:36+0700\n"
 "Last-Translator: Ha Link <halink0803@gmail.com>\n"
 "Language: vi\n"
@@ -506,12 +506,12 @@ msgstr "chưa cài đặt"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2740,7 +2740,7 @@ msgstr "Lỗi"
 msgid "Upload done, processing, please wait..."
 msgstr "Tải lên xong, đang xử lý, đợi chút ..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Thiết lập"
@@ -2885,27 +2885,31 @@ msgstr ""
 msgid "epub Reader"
 msgstr "trình đọc epub"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "Sáng"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "Tối"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "Quay lại"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr "Trình đọc truyện tranh"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 3f54bef0a10a2b6e1f8b3ae834536603ad9196c8..65241951d5dc83013bad7223e8b598b359084896 100644
GIT binary patch
delta 9045
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
A)Bpeg

delta 8826
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

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index e40c3b0be..bd00954c7 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -40,7 +40,7 @@ msgstr "未知命令"
 
 #: cps/admin.py:172
 msgid "Books successfully queued for Metadata Backup"
-msgstr "书籍已为元数据备份排队"
+msgstr "书籍成功加入元数据备份队列"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -100,7 +100,7 @@ msgstr "没有其余管理员账户，无法删除管理员角色"
 
 #: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
-msgstr "值必须是 true 或 false"
+msgstr "值必须为 true 或 false"
 
 #: cps/admin.py:499
 msgid "Invalid role"
@@ -108,15 +108,15 @@ msgstr "无效角色"
 
 #: cps/admin.py:503
 msgid "Guest can't have this view"
-msgstr "游客无法拥有此视图"
+msgstr "游客无法查看此页面"
 
 #: cps/admin.py:513
 msgid "Invalid view"
-msgstr "无效视图"
+msgstr "无效页面"
 
 #: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
-msgstr "游客的本地化是自动侦测而无法设置的"
+msgstr "无法设置游客的本地化，该项设置的值将自动检测"
 
 #: cps/admin.py:520
 msgid "No Valid Locale Given"
@@ -132,19 +132,19 @@ msgstr "参数未找到"
 
 #: cps/admin.py:570
 msgid "Invalid Read Column"
-msgstr "无效的阅读列"
+msgstr "无效的阅读栏目"
 
 #: cps/admin.py:576
 msgid "Invalid Restricted Column"
-msgstr "无效的限制列"
+msgstr "无效的限制栏目"
 
 #: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
-msgstr "Calibre-Web配置已更新"
+msgstr "Calibre-Web 配置已更新"
 
 #: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
-msgstr "您确定删除Kobo Token吗？"
+msgstr "您确定删除 Kobo 令牌吗？"
 
 #: cps/admin.py:610
 msgid "Do you really want to delete this domain?"
@@ -232,42 +232,42 @@ msgstr "访问日志路径无效，请输入正确的路径"
 
 #: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
-msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
+msgstr "请输入 LDAP 主机、端口、DN 和用户对象标识符"
 
 #: cps/admin.py:1196
 msgid "Please Enter a LDAP Service Account and Password"
-msgstr "请输入一个LDAP服务账号和密码 "
+msgstr "请输入一个 LDAP 服务账号和密码 "
 
 #: cps/admin.py:1199
 msgid "Please Enter a LDAP Service Account"
-msgstr "请输入一个LDAP服务账号"
+msgstr "请输入一个 LDAP 服务账号"
 
 #: cps/admin.py:1204
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
-msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
+msgstr "LDAP 组对象过滤器需要一个具有“%s”格式标识符"
 
 #: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
-msgstr "LDAP组对象过滤器的括号不匹配"
+msgstr "LDAP 组对象过滤器的括号不匹配"
 
 #: cps/admin.py:1210
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
-msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
+msgstr "LDAP 用户对象过滤器需要一个具有“%s”格式标识符"
 
 #: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
-msgstr "LDAP用户对象过滤器的括号不匹配"
+msgstr "LDAP 用户对象过滤器的括号不匹配"
 
 #: cps/admin.py:1219
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
-msgstr "LDAP成员用户过滤器需要有一个“%s”格式标识符"
+msgstr "LDAP 成员用户过滤器需要有一个“%s”格式标识符"
 
 #: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
-msgstr "LDAP成员用户过滤器中有不匹配的括号"
+msgstr "LDAP 成员用户过滤器中有不匹配的括号"
 
 #: cps/admin.py:1228
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
@@ -283,7 +283,7 @@ msgstr "编辑邮件服务器设置"
 
 #: cps/admin.py:1287
 msgid "Gmail Account Verification Successful"
-msgstr "G-Mail账号校验成功"
+msgstr "G-Mail 账号校验成功"
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -297,7 +297,7 @@ msgstr "数据库错误：%(error)s。"
 #: cps/admin.py:1316
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
+msgstr "发送给 %(email)s 的测试邮件已加入队列。请检查任务结果"
 
 #: cps/admin.py:1319
 #, python-format
@@ -349,7 +349,7 @@ msgstr "用户 %(user)s 的密码已重置"
 
 #: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
-msgstr "请先配置SMTP邮箱设置..."
+msgstr "请先配置 SMTP 邮箱设置..."
 
 #: cps/admin.py:1445
 msgid "Logfile viewer"
@@ -390,7 +390,7 @@ msgstr "更新失败："
 
 #: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
 msgid "HTTP Error"
-msgstr "HTTP错误"
+msgstr "HTTP 错误"
 
 #: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
 msgid "Connection error"
@@ -414,11 +414,11 @@ msgstr "更新期间无法替换文件"
 
 #: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
-msgstr "未能提取至少一个LDAP用户"
+msgstr "未能获得任何 LDAP 用户"
 
 #: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
-msgstr "未能创建至少一个LDAP用户"
+msgstr "未能创建任何 LDAP 用户"
 
 #: cps/admin.py:1605
 #, python-format
@@ -427,11 +427,11 @@ msgstr "错误：%(ldaperror)s"
 
 #: cps/admin.py:1609
 msgid "Error: No user returned in response of LDAP server"
-msgstr "错误：在LDAP服务器的响应中没有返回用户"
+msgstr "错误：在 LDAP 服务器的响应中没有返回用户"
 
 #: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
-msgstr "数据库中没有找到至少一个LDAP用户"
+msgstr "数据库中没有找到任何 LDAP 用户"
 
 #: cps/admin.py:1644
 msgid "{} User Successfully Imported"
@@ -508,12 +508,12 @@ msgstr "未安装"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
-msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
+msgstr "自定义列号：%(column)d 在 Calibre 数据库中不存在"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -548,12 +548,12 @@ msgstr "文件 %(file)s 已上传"
 
 #: cps/editbooks.py:318
 msgid "Source or destination format for conversion missing"
-msgstr "转换的源或目的格式缺失"
+msgstr "转换的源格式或目的格式缺失"
 
 #: cps/editbooks.py:326
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
-msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
+msgstr "书籍已经被成功加入 %(book_format)s 格式转换队列"
 
 #: cps/editbooks.py:330
 #, python-format
@@ -590,7 +590,7 @@ msgstr "移动封面文件失败 %(file)s：%(error)s"
 
 #: cps/editbooks.py:817 cps/editbooks.py:819
 msgid "Book Format Successfully Deleted"
-msgstr "书籍格式已成功删除"
+msgstr "书籍的此格式副本已成功删除"
 
 #: cps/editbooks.py:826 cps/editbooks.py:828
 msgid "Book Successfully Deleted"
@@ -616,7 +616,7 @@ msgstr "用户没有权限上传其他文件格式"
 #: cps/editbooks.py:1178
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "创建路径 %(path)s 失败(权限拒绝)。"
+msgstr "创建路径 %(path)s 失败 (权限不足)。"
 
 #: cps/editbooks.py:1183
 #, python-format
@@ -630,16 +630,16 @@ msgstr "已添加 %(ext)s 格式到 %(book)s"
 
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云端硬盘"
+msgstr "Google Drive 设置未完成，请尝试停用并再次激活 Google 云端硬盘"
 
 #: cps/gdrive.py:95
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
+msgstr "回调域名尚未被校验，请在 Google 开发者控制台按步骤校验域名"
 
 #: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
-msgstr "找不到id为 %(book)d 的书籍的 %(format)s 格式"
+msgstr "找不到 ID 为 %(book)d 的书籍的 %(format)s 格式"
 
 #: cps/helper.py:87 cps/tasks/convert.py:75
 #, python-format
@@ -658,11 +658,11 @@ msgstr "发送到电子阅读器"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
 msgid "This e-mail has been sent via Calibre-Web."
-msgstr "此邮件已经通过Calibre-Web发送。"
+msgstr "此邮件已经通过 Calibre-Web 发送。"
 
 #: cps/helper.py:114
 msgid "Calibre-Web test e-mail"
-msgstr "Calibre-Web测试邮件"
+msgstr "Calibre-Web 测试邮件"
 
 #: cps/helper.py:115
 msgid "Test e-mail"
@@ -670,7 +670,7 @@ msgstr "测试邮件"
 
 #: cps/helper.py:132
 msgid "Get Started with Calibre-Web"
-msgstr "开启Calibre-Web之旅"
+msgstr "开启 Calibre-Web 之旅"
 
 #: cps/helper.py:137
 #, python-format
@@ -690,7 +690,7 @@ msgstr "发送 %(format)s 到电子阅读器"
 #: cps/helper.py:225 cps/tasks/convert.py:92
 #, python-format
 msgid "%(book)s send to E-Reader"
-msgstr "%(book)s发送到电子阅读器"
+msgstr "%(book)s 发送到电子阅读器"
 
 #: cps/helper.py:230
 msgid "The requested file could not be read. Maybe wrong permissions?"
@@ -703,12 +703,12 @@ msgstr "阅读状态无法设置: {}"
 #: cps/helper.py:368
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
+msgstr "删除书的文件夹 %(id)s 失败，路径有子文件夹：%(path)s"
 
 #: cps/helper.py:374
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
-msgstr "删除书籍 %(id)s失败：%(message)s"
+msgstr "删除书籍 %(id)s 失败：%(message)s"
 
 #: cps/helper.py:385
 #, python-format
@@ -723,7 +723,7 @@ msgstr "将作者从“%(src)s”改为“%(dest)s”时失败，出错信息：
 #: cps/helper.py:522 cps/helper.py:531
 #, python-format
 msgid "File %(file)s not found on Google Drive"
-msgstr "Google Drive上找不到文件 %(file)s"
+msgstr "Google Drive 上找不到文件 %(file)s"
 
 #: cps/helper.py:565
 #, python-format
@@ -737,7 +737,7 @@ msgstr "重命名此路径: {}文件时出错"
 #: cps/helper.py:603
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
-msgstr "Google Drive上找不到书籍路径 %(path)s"
+msgstr "Google Drive 上找不到书籍路径 %(path)s"
 
 #: cps/helper.py:644 cps/web.py:1416
 msgid "Found an existing account for this e-mail address"
@@ -753,7 +753,7 @@ msgstr "无效的邮件地址格式"
 
 #: cps/helper.py:815
 msgid "Python module 'advocate' is not installed but is needed for cover uploads"
-msgstr "上传封面需要的Python模块'advocate'未安装"
+msgstr "上传封面所需的 Python 模块 'advocate' 未安装"
 
 #: cps/helper.py:825
 msgid "Error Downloading Cover"
@@ -773,11 +773,11 @@ msgstr "创建封面路径失败"
 
 #: cps/helper.py:857
 msgid "Cover-file is not a valid image file, or could not be stored"
-msgstr "封面文件不是有效的图片文件，或者无法存储"
+msgstr "封面文件不是有效的图片文件，或者无法存储它"
 
 #: cps/helper.py:868
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件"
+msgstr "封面文件只支持 jpg、jpeg、png、webp、bmp 文件"
 
 #: cps/helper.py:880
 msgid "Invalid cover file content"
@@ -785,15 +785,15 @@ msgstr "封面文件内容无效"
 
 #: cps/helper.py:884
 msgid "Only jpg/jpeg files are supported as coverfile"
-msgstr "仅将jpg、jpeg文件作为封面文件"
+msgstr "仅将 jpg、jpeg 文件作为封面文件"
 
 #: cps/helper.py:936
 msgid "Unrar binary file not found"
-msgstr "找不到Unrar执行文件"
+msgstr "找不到 Unrar 执行文件"
 
 #: cps/helper.py:947
 msgid "Error executing UnRar"
-msgstr "执行UnRar时出错"
+msgstr "执行 UnRar 时出错"
 
 #: cps/helper.py:1040
 msgid "Cover"
@@ -801,11 +801,11 @@ msgstr "封面"
 
 #: cps/helper.py:1042 cps/templates/admin.html:211
 msgid "Queue all books for metadata backup"
-msgstr "将所有书籍排队以进行元数据备份"
+msgstr "将所有书籍加入元数据备份队列"
 
 #: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
-msgstr "请不要使用localhost访问Calibre-Web，以便Kobo设备能获取有效的api_endpoint"
+msgstr "请不要从 localhost 访问 Calibre-Web，以便 Kobo 设备能获取有效的 api_endpoint"
 
 #: cps/kobo_auth.py:115
 msgid "Kobo Setup"
@@ -824,42 +824,42 @@ msgstr "您现在已以“%(nickname)s”身份登录"
 #: cps/oauth_bb.py:148
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
-msgstr "链接到%(oauth)s成功"
+msgstr "链接到 %(oauth)s 成功"
 
 #: cps/oauth_bb.py:155
 msgid "Login failed, No User Linked With OAuth Account"
-msgstr "登录失败，没有用户与OAuth帐户关联"
+msgstr "登录失败，没有用户与 OAuth 帐户关联"
 
 #: cps/oauth_bb.py:197
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
-msgstr "取消链接到%(oauth)s成功"
+msgstr "取消链接到 %(oauth)s 成功"
 
 #: cps/oauth_bb.py:202
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
-msgstr "取消链接到%(oauth)s失败"
+msgstr "取消链接到 %(oauth)s 失败"
 
 #: cps/oauth_bb.py:205
 #, python-format
 msgid "Not Linked to %(oauth)s"
-msgstr "为连接到%(oauth)s"
+msgstr "未连接到 %(oauth)s"
 
 #: cps/oauth_bb.py:261
 msgid "Failed to log in with GitHub."
-msgstr "使用Github登录失败。"
+msgstr "使用 Github 登录失败。"
 
 #: cps/oauth_bb.py:267
 msgid "Failed to fetch user info from GitHub."
-msgstr "从Github获取用户信息失败。"
+msgstr "从 Github 获取用户信息失败。"
 
 #: cps/oauth_bb.py:279
 msgid "Failed to log in with Google."
-msgstr "使用Google登录失败。"
+msgstr "使用 Google 登录失败。"
 
 #: cps/oauth_bb.py:285
 msgid "Failed to fetch user info from Google."
-msgstr "从Google获取用户信息失败。"
+msgstr "从 Google 获取用户信息失败。"
 
 #: cps/oauth_bb.py:332
 msgid "GitHub Oauth error, please retry later."
@@ -889,11 +889,11 @@ msgstr "登录"
 
 #: cps/remotelogin.py:74 cps/remotelogin.py:108
 msgid "Token not found"
-msgstr "找不到Token"
+msgstr "找不到令牌"
 
 #: cps/remotelogin.py:83 cps/remotelogin.py:116
 msgid "Token has expired"
-msgstr "Token已过期"
+msgstr "令牌已过期"
 
 #: cps/remotelogin.py:92
 msgid "Success! Please return to your device"
@@ -905,7 +905,7 @@ msgstr "书籍"
 
 #: cps/render_template.py:42
 msgid "Show recent books"
-msgstr "显示最近书籍"
+msgstr "显示最近查看的书籍"
 
 #: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
@@ -917,7 +917,7 @@ msgstr "显示热门书籍"
 
 #: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
-msgstr "下载历史"
+msgstr "已下载书籍"
 
 #: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
@@ -966,7 +966,7 @@ msgstr "分类"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
 msgid "Show category selection"
-msgstr "显示分类选择"
+msgstr "显示分类栏目"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
@@ -976,7 +976,7 @@ msgstr "丛书"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
 msgid "Show series selection"
-msgstr "显示丛书选择"
+msgstr "显示丛书栏目"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
@@ -985,7 +985,7 @@ msgstr "作者"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
 msgid "Show author selection"
-msgstr "显示作者选择"
+msgstr "显示作者栏目"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
 #: cps/templates/index.xml:76 cps/web.py:969
@@ -994,7 +994,7 @@ msgstr "出版社"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
 msgid "Show publisher selection"
-msgstr "显示出版社选择"
+msgstr "显示出版社栏目"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
@@ -1004,7 +1004,7 @@ msgstr "语言"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
 msgid "Show language selection"
-msgstr "显示语言选择"
+msgstr "显示语言栏目"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
@@ -1012,7 +1012,7 @@ msgstr "评分"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
 msgid "Show ratings selection"
-msgstr "显示评分选择"
+msgstr "显示评分栏目"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
@@ -1020,7 +1020,7 @@ msgstr "文件格式"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
-msgstr "显示文件格式选择"
+msgstr "显示文件格式栏目"
 
 #: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
@@ -1070,7 +1070,7 @@ msgstr "阅读状态 = %(status)s"
 
 #: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
-msgstr "搜索自定义列时出错，请重启 Calibre-Web"
+msgstr "搜索自定义栏目时出错，请重启 Calibre-Web"
 
 #: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:64
 msgid "Advanced Search"
@@ -1168,12 +1168,12 @@ msgstr "发生错误"
 #: cps/shelf.py:369
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "公共书架：%(title)s已经存在已经存在。"
+msgstr "公共书架：%(title)s 已经存在已经存在。"
 
 #: cps/shelf.py:380
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "私有书架：%(title)s已经存在已经存在。"
+msgstr "私有书架：%(title)s 已经存在已经存在。"
 
 #: cps/shelf.py:462
 #, python-format
@@ -1219,7 +1219,7 @@ msgstr "未知状态"
 
 #: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
 msgid "Unexpected data while reading update information"
-msgstr "读取更新信息时出现意外数据"
+msgstr "读取更新信息时出现异常数据"
 
 #: cps/updater.py:438 cps/updater.py:550
 msgid "No update available. You already have the latest version installed"
@@ -1248,7 +1248,7 @@ msgstr "无可用发布信息"
 
 #: cps/templates/index.html:6 cps/web.py:433
 msgid "Discover (Random Books)"
-msgstr "发现(随机书籍)"
+msgstr "发现 (随机书籍)"
 
 #: cps/web.py:469
 msgid "Hot Books (Most Downloaded)"
@@ -1322,7 +1322,7 @@ msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
 #: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
-msgstr "请先配置您的kindle邮箱。"
+msgstr "请先配置您的 Kindle 邮箱。"
 
 #: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
@@ -1345,12 +1345,12 @@ msgstr "确认邮件已经发送到您的邮箱。"
 
 #: cps/web.py:1280
 msgid "Cannot activate LDAP authentication"
-msgstr "无法激活LDAP认证"
+msgstr "无法激活 LDAP 认证"
 
 #: cps/web.py:1299
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
-msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
+msgstr "后备登录“%(nickname)s”：无法访问 LDAP 服务器，或用户未知"
 
 #: cps/web.py:1305
 #, python-format
@@ -1390,7 +1390,7 @@ msgstr "找不到包含 OAuth 信息的有效 gmail.json 文件"
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
-msgstr "Calibre 电子书转换器%(tool)s没有发现"
+msgstr "Calibre 电子书转换器 %(tool)s 没有发现"
 
 #: cps/tasks/convert.py:186
 #, python-format
@@ -1409,7 +1409,7 @@ msgstr "Kepubify 转换失败：%(error)s"
 #: cps/tasks/convert.py:224
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
-msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
+msgstr "找不到转换后的文件或文件夹 %(folder)s 中有多个文件"
 
 #: cps/tasks/convert.py:247
 #, python-format
@@ -1427,7 +1427,7 @@ msgstr "转换"
 
 #: cps/tasks/database.py:28
 msgid "Reconnecting Calibre database"
-msgstr "正在重新连接到Calibre数据库"
+msgstr "正在重新连接到 Calibre 数据库"
 
 #: cps/tasks/mail.py:266
 msgid "E-mail"
@@ -1521,19 +1521,19 @@ msgstr "添加新用户"
 
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
-msgstr "导入LDAP用户"
+msgstr "导入 LDAP 用户"
 
 #: cps/templates/admin.html:62
 msgid "E-mail Server Settings"
-msgstr "SMTP邮件服务器设置"
+msgstr "SMTP 邮件服务器设置"
 
 #: cps/templates/admin.html:67 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
-msgstr "SMTP主机名"
+msgstr "SMTP 主机名"
 
 #: cps/templates/admin.html:71 cps/templates/email_edit.html:35
 msgid "SMTP Port"
-msgstr "SMTP端口"
+msgstr "SMTP 端口"
 
 #: cps/templates/admin.html:75 cps/templates/email_edit.html:39
 msgid "Encryption"
@@ -1541,7 +1541,7 @@ msgstr "加密"
 
 #: cps/templates/admin.html:79 cps/templates/email_edit.html:47
 msgid "SMTP Login"
-msgstr "SMTP用户名"
+msgstr "SMTP 用户名"
 
 #: cps/templates/admin.html:83 cps/templates/admin.html:94
 #: cps/templates/email_edit.html:55
@@ -1554,7 +1554,7 @@ msgstr "电子邮件服务"
 
 #: cps/templates/admin.html:91
 msgid "Gmail via Oauth2"
-msgstr "通过Oauth2的Gmail"
+msgstr "使用 Oauth2 的 Gmail"
 
 #: cps/templates/admin.html:106
 msgid "Configuration"
@@ -1606,7 +1606,7 @@ msgstr "反向代理头部名称"
 
 #: cps/templates/admin.html:159
 msgid "Edit Calibre Database Configuration"
-msgstr "编辑Calibre数据库配置"
+msgstr "编辑 Calibre 数据库配置"
 
 #: cps/templates/admin.html:160
 msgid "Edit Basic Configuration"
@@ -1638,7 +1638,7 @@ msgstr "生成丛书封面缩略图"
 
 #: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
 msgid "Reconnect to Calibre Library"
-msgstr "重新连接到Calibre库"
+msgstr "重新连接到 Calibre 库"
 
 #: cps/templates/admin.html:193
 msgid "Refresh Thumbnail Cover Cache"
@@ -1650,7 +1650,7 @@ msgstr "管理"
 
 #: cps/templates/admin.html:200
 msgid "Download Debug Package"
-msgstr "下载Debug包"
+msgstr "下载 Debug 包"
 
 #: cps/templates/admin.html:201
 msgid "View Logs"
@@ -1658,7 +1658,7 @@ msgstr "查看日志文件"
 
 #: cps/templates/admin.html:204
 msgid "Reconnect Calibre Database"
-msgstr "重新连接到Calibre数据库"
+msgstr "重新连接到 Calibre 数据库"
 
 #: cps/templates/admin.html:207
 msgid "Restart"
@@ -1778,7 +1778,7 @@ msgstr "删除格式:"
 
 #: cps/templates/book_edit.html:25
 msgid "Convert book format:"
-msgstr "转换书籍格式:"
+msgstr "书籍格式转换:"
 
 #: cps/templates/book_edit.html:30
 msgid "Convert from:"
@@ -1845,7 +1845,7 @@ msgstr "评分"
 
 #: cps/templates/book_edit.html:104
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
-msgstr "从URL获取封面（JPEG - 图片将下载并存储在数据库中）"
+msgstr "从 URL 获取封面（JPEG - 图片将下载并存储在数据库中）"
 
 #: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
@@ -2055,7 +2055,7 @@ msgstr "Calibre 数据库路径"
 
 #: cps/templates/config_db.html:22
 msgid "Use Google Drive?"
-msgstr "是否使用Google Drive?"
+msgstr "是否使用 Google Drive?"
 
 #: cps/templates/config_db.html:27
 msgid "Authenticate Google Drive"
@@ -2067,7 +2067,7 @@ msgstr "Google Drive Calibre 路径"
 
 #: cps/templates/config_db.html:40
 msgid "Metadata Watch Channel ID"
-msgstr "元数据监视通道ID"
+msgstr "元数据监视通道 ID"
 
 #: cps/templates/config_db.html:43
 msgid "Revoke"
@@ -2087,11 +2087,11 @@ msgstr "服务器端口"
 
 #: cps/templates/config_edit.html:28
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL 证书文件路径(非SSL服务器请留空)"
+msgstr "SSL 证书文件路径 (非 SSL 服务器请留空)"
 
 #: cps/templates/config_edit.html:35
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL 密钥文件路径(非SSL服务器请留空)"
+msgstr "SSL 密钥文件路径 (非 SSL 服务器请留空)"
 
 #: cps/templates/config_edit.html:43
 msgid "Update Channel"
@@ -2115,7 +2115,7 @@ msgstr "日志文件配置"
 
 #: cps/templates/config_edit.html:77
 msgid "Location and name of logfile (calibre-web.log for no entry)"
-msgstr "日志文件路径和名称(默认为calibre-web.log)"
+msgstr "日志文件路径和名称 (默认为 calibre-web.log)"
 
 #: cps/templates/config_edit.html:82
 msgid "Enable Access Log"
@@ -2123,7 +2123,7 @@ msgstr "启用访问日志"
 
 #: cps/templates/config_edit.html:85
 msgid "Location and name of access logfile (access.log for no entry)"
-msgstr "访问日志路径和名称(默认为access.log)"
+msgstr "访问日志路径和名称 (默认为 access.log)"
 
 #: cps/templates/config_edit.html:96
 msgid "Feature Configuration"
@@ -2163,23 +2163,23 @@ msgstr "启用魔法链接远程登录"
 
 #: cps/templates/config_edit.html:137
 msgid "Enable Kobo sync"
-msgstr "启用Kobo同步"
+msgstr "启用 Kobo 同步"
 
 #: cps/templates/config_edit.html:142
 msgid "Proxy unknown requests to Kobo Store"
-msgstr "代理未知请求到Kobo商店"
+msgstr "代理未知请求到 Kobo 商店"
 
 #: cps/templates/config_edit.html:145
 msgid "Server External Port (for port forwarded API calls)"
-msgstr "服务器扩展端口(用于转发的API调用的端口)"
+msgstr "服务器扩展端口 (用于转发的 API 调用的端口)"
 
 #: cps/templates/config_edit.html:153
 msgid "Use Goodreads"
-msgstr "使用Goodreads"
+msgstr "使用 Goodreads"
 
 #: cps/templates/config_edit.html:154
 msgid "Create an API Key"
-msgstr "创建API Key"
+msgstr "创建 API Key"
 
 #: cps/templates/config_edit.html:158
 msgid "Goodreads API Key"
@@ -2203,19 +2203,19 @@ msgstr "使用标准认证"
 
 #: cps/templates/config_edit.html:184
 msgid "Use LDAP Authentication"
-msgstr "使用LDAP认证"
+msgstr "使用 LDAP 认证"
 
 #: cps/templates/config_edit.html:187
 msgid "Use OAuth"
-msgstr "使用OAuth认证"
+msgstr "使用 OAuth 认证"
 
 #: cps/templates/config_edit.html:194
 msgid "LDAP Server Host Name or IP Address"
-msgstr "LDAP服务器主机名或IP地址"
+msgstr "LDAP 服务器主机名或 IP 地址"
 
 #: cps/templates/config_edit.html:198
 msgid "LDAP Server Port"
-msgstr "LDAP服务器端口"
+msgstr "LDAP 服务器端口"
 
 #: cps/templates/config_edit.html:202
 msgid "LDAP Encryption"
@@ -2223,23 +2223,23 @@ msgstr "LDAP 加密"
 
 #: cps/templates/config_edit.html:205
 msgid "TLS"
-msgstr "TLS协议"
+msgstr "TLS 协议"
 
 #: cps/templates/config_edit.html:206
 msgid "SSL"
-msgstr "SSL协议"
+msgstr "SSL 协议"
 
 #: cps/templates/config_edit.html:210
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP CA证书路径(仅用于客户端证书认证)"
+msgstr "LDAP CA证书路径 (仅用于客户端证书认证)"
 
 #: cps/templates/config_edit.html:217
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP 证书路径(仅用于客户端证书认证)"
+msgstr "LDAP 证书路径 (仅用于客户端证书认证)"
 
 #: cps/templates/config_edit.html:224
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP密钥文件路径(仅用于客户端证书认证)"
+msgstr "LDAP 密钥文件路径 (仅用于客户端证书认证)"
 
 #: cps/templates/config_edit.html:233
 msgid "LDAP Authentication"
@@ -2259,23 +2259,23 @@ msgstr "简单"
 
 #: cps/templates/config_edit.html:242
 msgid "LDAP Administrator Username"
-msgstr "LDAP管理员用户名"
+msgstr "LDAP 管理员用户名"
 
 #: cps/templates/config_edit.html:248
 msgid "LDAP Administrator Password"
-msgstr "LDAP管理员密码"
+msgstr "LDAP 管理员密码"
 
 #: cps/templates/config_edit.html:253
 msgid "LDAP Distinguished Name (DN)"
-msgstr "LDAP专有名称（DN）"
+msgstr "LDAP 专有名称（DN）"
 
 #: cps/templates/config_edit.html:257
 msgid "LDAP User Object Filter"
-msgstr "LDAP用户对象过滤器"
+msgstr "LDAP 用户对象过滤器"
 
 #: cps/templates/config_edit.html:262
 msgid "LDAP Server is OpenLDAP?"
-msgstr "LDAP服务器是 OpenLDAP？"
+msgstr "LDAP 服务器为 OpenLDAP？"
 
 #: cps/templates/config_edit.html:264
 msgid "Following Settings are Needed For User Import"
@@ -2283,19 +2283,19 @@ msgstr "用户导入需要以下设置"
 
 #: cps/templates/config_edit.html:266
 msgid "LDAP Group Object Filter"
-msgstr "LDAP组对象过滤器"
+msgstr "LDAP 组对象过滤器"
 
 #: cps/templates/config_edit.html:270
 msgid "LDAP Group Name"
-msgstr "LDAP组名"
+msgstr "LDAP 组名"
 
 #: cps/templates/config_edit.html:274
 msgid "LDAP Group Members Field"
-msgstr "LDAP组成员字段"
+msgstr "LDAP 组成员字段"
 
 #: cps/templates/config_edit.html:278
 msgid "LDAP Member User Filter Detection"
-msgstr "LDAP成员用户过滤器探测"
+msgstr "LDAP 成员用户过滤器探测"
 
 #: cps/templates/config_edit.html:280
 msgid "Autodetect"
@@ -2307,12 +2307,12 @@ msgstr "自定义过滤器"
 
 #: cps/templates/config_edit.html:286
 msgid "LDAP Member User Filter"
-msgstr "LDAP成员用户过滤器"
+msgstr "LDAP 成员用户过滤器"
 
 #: cps/templates/config_edit.html:297
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
-msgstr "获取 %(provider)s OAuth凭证"
+msgstr "获取 %(provider)s OAuth 凭证"
 
 #: cps/templates/config_edit.html:300
 #, python-format
@@ -2342,7 +2342,7 @@ msgstr "KEpubify 电子书转换器路径"
 
 #: cps/templates/config_edit.html:345
 msgid "Location of Unrar binary"
-msgstr "Unrar程序路径"
+msgstr "Unrar 程序路径"
 
 #: cps/templates/config_view_edit.html:17
 msgid "View Configuration"
@@ -2456,7 +2456,7 @@ msgstr "在线听书"
 #: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
 msgid "Book %(index)s of %(range)s"
-msgstr "%(range)s 第%(index)s册"
+msgstr "%(range)s 第 %(index)s 册"
 
 #: cps/templates/detail.html:174 cps/templates/listenmp3.html:111
 msgid "Published"
@@ -2516,11 +2516,11 @@ msgstr "使用标准电子邮件账号"
 
 #: cps/templates/email_edit.html:16
 msgid "Gmail Account with OAuth2 Verification"
-msgstr "使用Gmail账号"
+msgstr "使用 Gmail 账号"
 
 #: cps/templates/email_edit.html:22
 msgid "Setup Gmail Account as E-Mail Server"
-msgstr "设置Gmail账号作为电子邮件服务"
+msgstr "设置 Gmail 账号作为电子邮件服务"
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2528,15 +2528,15 @@ msgstr "撤消 Gmail 访问权限"
 
 #: cps/templates/email_edit.html:42
 msgid "STARTTLS"
-msgstr "STARTTLS协议"
+msgstr "STARTTLS 协议"
 
 #: cps/templates/email_edit.html:43
 msgid "SSL/TLS"
-msgstr "SSL/TLS协议"
+msgstr "SSL/TLS 协议"
 
 #: cps/templates/email_edit.html:51
 msgid "SMTP Password"
-msgstr "SMTP密码"
+msgstr "SMTP 密码"
 
 #: cps/templates/email_edit.html:58
 msgid "Attachment Size Limit"
@@ -2579,7 +2579,7 @@ msgstr "下一个"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "在文本编辑器中打开.kobo/Kobo eReader.conf，添加（或编辑）:"
+msgstr "在文本编辑器中打开 .kobo/Kobo eReader.conf，添加（或编辑）:"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
@@ -2732,7 +2732,7 @@ msgstr "错误"
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "设置"
@@ -2775,7 +2775,7 @@ msgstr "通过魔法链接登录"
 
 #: cps/templates/logviewer.html:6
 msgid "Show Calibre-Web Log: "
-msgstr "显示Calibre-Web日志： "
+msgstr "显示 Calibre-Web 日志： "
 
 #: cps/templates/logviewer.html:8
 msgid "Calibre-Web Log: "
@@ -2791,7 +2791,7 @@ msgstr "显示访问日志： "
 
 #: cps/templates/logviewer.html:18
 msgid "Download Calibre-Web Log"
-msgstr "下载Calibre-Web日志"
+msgstr "下载 Calibre-Web 日志"
 
 #: cps/templates/logviewer.html:21
 msgid "Download Access Log"
@@ -2799,19 +2799,19 @@ msgstr "下载访问日志"
 
 #: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
-msgstr "选择标签值显示或隐藏书籍"
+msgstr "选择显示的与隐藏的标签"
 
 #: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
-msgstr "选择自定义栏目值显示或隐藏本用户书籍"
+msgstr "选择显示的自定义栏目值与隐藏的自定义栏目值"
 
 #: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
-msgstr "选择标签值显示或隐藏书籍"
+msgstr "选择此用户显示的标签与隐藏的标签"
 
 #: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
-msgstr "选择自定义栏目值显示或隐藏本用户书籍"
+msgstr "选择此用户显示的自定义栏目值与隐藏的自定义栏目值"
 
 #: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
@@ -2823,7 +2823,7 @@ msgstr "添加显示或隐藏书籍的值"
 
 #: cps/templates/modal_dialogs.html:50
 msgid "This book format will be permanently erased from database"
-msgstr "此书籍格式将从数据库中永久删除"
+msgstr "书籍的此格式副本将从数据库中永久删除"
 
 #: cps/templates/modal_dialogs.html:51
 msgid "This book will be permanently erased from database"
@@ -2835,11 +2835,11 @@ msgstr "，包括从硬盘中"
 
 #: cps/templates/modal_dialogs.html:56
 msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Kobo 重要说明：被删除的书籍将保留在任何配对的 Kobo 设备上。"
+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 "必须先将书籍存档并同步设备，然后才能安全地删除书籍。"
+msgstr "在安全删除图书之前，必须先将图书归档并与设备同步。"
 
 #: cps/templates/modal_dialogs.html:76
 msgid "Choose File Location"
@@ -2871,35 +2871,39 @@ msgstr "完成"
 
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
-msgstr "Caliebre-Web电子书路径"
+msgstr "Caliebre-Web 电子书路径"
 
 #: cps/templates/read.html:6
 msgid "epub Reader"
-msgstr "epub阅读器"
+msgstr "epub 阅读器"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "浅色"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "深色"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr "棕色"
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 msgid "Black"
 msgstr "黑色"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "打开侧栏时重排文本。"
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
-msgstr "Comic阅读器"
+msgstr "Comic 阅读器"
 
 #: cps/templates/readcbr.html:92
 msgid "Keyboard Shortcuts"
@@ -3011,15 +3015,15 @@ msgstr "隐藏"
 
 #: cps/templates/readdjvu.html:5
 msgid "DJVU Reader"
-msgstr "DJVU阅读器"
+msgstr "DJVU 阅读器"
 
 #: cps/templates/readpdf.html:32
 msgid "PDF Reader"
-msgstr "PDF阅读器"
+msgstr "PDF 阅读器"
 
 #: cps/templates/readtxt.html:6
 msgid "txt Reader"
-msgstr "txt阅读器"
+msgstr "txt 阅读器"
 
 #: cps/templates/register.html:4
 msgid "Register New Account"
@@ -3215,7 +3219,7 @@ msgstr "活动"
 
 #: cps/templates/tasks.html:40
 msgid "This task will be cancelled. Any progress made by this task will be saved."
-msgstr "这个任务将被取消。此任务取得的所有进展都将被保存"
+msgstr "这个任务将被取消。此任务所有的更改都将被保存"
 
 #: cps/templates/tasks.html:41
 msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
@@ -3231,7 +3235,7 @@ msgstr "按语言显示书籍"
 
 #: cps/templates/user_edit.html:54
 msgid "OAuth Settings"
-msgstr "OAuth设置"
+msgstr "OAuth 设置"
 
 #: cps/templates/user_edit.html:56
 msgid "Link"
@@ -3251,7 +3255,7 @@ msgstr "新建或查看"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr "强制与kobo完全同步"
+msgstr "强制与 Kobo 完全同步"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
@@ -3267,7 +3271,7 @@ msgstr "删除此用户"
 
 #: cps/templates/user_edit.html:159
 msgid "Generate Kobo Auth URL"
-msgstr "生成Kobo Auth 地址"
+msgstr "生成 Kobo Auth 地址"
 
 #: cps/templates/user_table.html:80 cps/templates/user_table.html:103
 msgid "Select..."
@@ -3311,11 +3315,11 @@ msgstr "允许标签"
 
 #: cps/templates/user_table.html:140
 msgid "Edit Denied Tags"
-msgstr "编辑拒绝标签"
+msgstr "编辑被拒绝标签"
 
 #: cps/templates/user_table.html:140
 msgid "Denied Tags"
-msgstr "拒绝标签"
+msgstr "被拒绝标签"
 
 #: cps/templates/user_table.html:141
 msgid "Edit Allowed Column Values"
@@ -3351,9 +3355,9 @@ msgstr "同步所选书架到 Kobo"
 
 #: cps/templates/user_table.html:156
 msgid "Show read/unread selection"
-msgstr "显示已读/未读选择"
+msgstr "显示已读、未读栏目"
 
 #: cps/templates/user_table.html:159
 msgid "Show random books"
-msgstr "显示随机书籍"
+msgstr "随机展示书籍"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 7477145ce230f139e49c3f5c1a83e89ee02d855f..0392b7658fa6b039f81182123b419a65f9d04323 100644
GIT binary patch
delta 19
acmezUf$8@LrVR=uEXGzwhMQGN!d(Deq6gUk

delta 19
acmezUf$8@LrVR=uECyCaMw?Yi!d(DejR)5N

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index c9ba53ee0..19e08780b 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -511,12 +511,12 @@ msgstr "未安裝"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2748,7 +2748,7 @@ msgstr "錯誤"
 msgid "Upload done, processing, please wait..."
 msgstr "上傳完成，正在處理中，請稍候..."
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "設置"
@@ -2893,27 +2893,31 @@ msgstr "Caliebre-Web電子書路徑"
 msgid "epub Reader"
 msgstr "epub閱讀器"
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr "淺色"
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr "深色"
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 #, fuzzy
 msgid "Black"
 msgstr "後退"
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr "打開側欄時重排文本。"
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr "Comic閱讀器"
diff --git a/messages.pot b/messages.pot
index 15c1d50ef..a5b446ece 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-12-25 10:22+0100\n"
+"POT-Creation-Date: 2022-12-25 13:21+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"
@@ -507,12 +507,12 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:724 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
-#: cps/db.py:967 cps/templates/config_edit.html:204
+#: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
 #: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
 #: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
@@ -2730,7 +2730,7 @@ msgstr ""
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:98 cps/templates/read.html:75
+#: cps/templates/layout.html:98 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr ""
@@ -2875,26 +2875,30 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:80 cps/templates/readcbr.html:119
+#: cps/templates/read.html:81 cps/templates/readcbr.html:119
 msgid "Light"
 msgstr ""
 
-#: cps/templates/read.html:81 cps/templates/readcbr.html:120
+#: cps/templates/read.html:82 cps/templates/readcbr.html:120
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/read.html:82
+#: cps/templates/read.html:83
 msgid "Sepia"
 msgstr ""
 
-#: cps/templates/read.html:83
+#: cps/templates/read.html:84
 msgid "Black"
 msgstr ""
 
-#: cps/templates/read.html:87
+#: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
+#: cps/templates/read.html:93
+msgid "Font Sizes"
+msgstr ""
+
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
 msgstr ""

From 02ec853e3b3dff6203f3cde93228919c14dff81c Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 25 Dec 2022 16:09:18 +0100
Subject: [PATCH 364/412] Remove a duplicate library

---
 cps/static/js/libs/jszip.min.js | 13 -------------
 cps/templates/read.html         |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 cps/static/js/libs/jszip.min.js

diff --git a/cps/static/js/libs/jszip.min.js b/cps/static/js/libs/jszip.min.js
deleted file mode 100644
index 131b697d6..000000000
--- a/cps/static/js/libs/jszip.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
-
-JSZip v3.6.0 - A JavaScript class for generating and reading zip files
-<http://stuartk.com/jszip>
-
-(c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
-
-JSZip uses the library pako released under the MIT license :
-https://github.com/nodeca/pako/blob/master/LICENSE
-*/
-
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,u){function h(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(f)return f(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return h(t||e)},i,i.exports,s,a,o,u)}return o[r].exports}for(var f="function"==typeof require&&require,e=0;e<u.length;e++)h(u[e]);return h}({1:[function(l,t,n){(function(r){!function(e){"object"==typeof n&&void 0!==t?t.exports=e():("undefined"!=typeof window?window:void 0!==r?r:"undefined"!=typeof self?self:this).JSZip=e()}(function(){return function s(a,o,u){function h(t,e){if(!o[t]){if(!a[t]){var r="function"==typeof l&&l;if(!e&&r)return r(t,!0);if(f)return f(t,!0);var n=new Error("Cannot find module '"+t+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[t]={exports:{}};a[t][0].call(i.exports,function(e){return h(a[t][1][e]||e)},i,i.exports,s,a,o,u)}return o[t].exports}for(var f="function"==typeof l&&l,e=0;e<u.length;e++)h(u[e]);return h}({1:[function(l,t,n){(function(r){!function(e){"object"==typeof n&&void 0!==t?t.exports=e():("undefined"!=typeof window?window:void 0!==r?r:"undefined"!=typeof self?self:this).JSZip=e()}(function(){return function s(a,o,u){function h(t,e){if(!o[t]){if(!a[t]){var r="function"==typeof l&&l;if(!e&&r)return r(t,!0);if(f)return f(t,!0);var n=new Error("Cannot find module '"+t+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[t]={exports:{}};a[t][0].call(i.exports,function(e){return h(a[t][1][e]||e)},i,i.exports,s,a,o,u)}return o[t].exports}for(var f="function"==typeof l&&l,e=0;e<u.length;e++)h(u[e]);return h}({1:[function(l,t,n){(function(r){!function(e){"object"==typeof n&&void 0!==t?t.exports=e():("undefined"!=typeof window?window:void 0!==r?r:"undefined"!=typeof self?self:this).JSZip=e()}(function(){return function s(a,o,u){function h(t,e){if(!o[t]){if(!a[t]){var r="function"==typeof l&&l;if(!e&&r)return r(t,!0);if(f)return f(t,!0);var n=new Error("Cannot find module '"+t+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[t]={exports:{}};a[t][0].call(i.exports,function(e){return h(a[t][1][e]||e)},i,i.exports,s,a,o,u)}return o[t].exports}for(var f="function"==typeof l&&l,e=0;e<u.length;e++)h(u[e]);return h}({1:[function(l,t,n){(function(r){!function(e){"object"==typeof n&&void 0!==t?t.exports=e():("undefined"!=typeof window?window:void 0!==r?r:"undefined"!=typeof self?self:this).JSZip=e()}(function(){return function s(a,o,u){function h(t,e){if(!o[t]){if(!a[t]){var r="function"==typeof l&&l;if(!e&&r)return r(t,!0);if(f)return f(t,!0);var n=new Error("Cannot find module '"+t+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[t]={exports:{}};a[t][0].call(i.exports,function(e){return h(a[t][1][e]||e)},i,i.exports,s,a,o,u)}return o[t].exports}for(var f="function"==typeof l&&l,e=0;e<u.length;e++)h(u[e]);return h}({1:[function(l,t,n){(function(r){!function(e){"object"==typeof n&&void 0!==t?t.exports=e():("undefined"!=typeof window?window:void 0!==r?r:"undefined"!=typeof self?self:this).JSZip=e()}(function(){return function s(a,o,u){function h(t,e){if(!o[t]){if(!a[t]){var r="function"==typeof l&&l;if(!e&&r)return r(t,!0);if(f)return f(t,!0);var n=new Error("Cannot find module '"+t+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[t]={exports:{}};a[t][0].call(i.exports,function(e){return h(a[t][1][e]||e)},i,i.exports,s,a,o,u)}return o[t].exports}for(var f="function"==typeof l&&l,e=0;e<u.length;e++)h(u[e]);return h}({1:[function(e,t,r){"use strict";var c=e("./utils"),l=e("./support"),p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";r.encode=function(e){for(var t,r,n,i,s,a,o,u=[],h=0,f=e.length,l=f,d="string"!==c.getTypeOf(e);h<e.length;)l=f-h,n=d?(t=e[h++],r=h<f?e[h++]:0,h<f?e[h++]:0):(t=e.charCodeAt(h++),r=h<f?e.charCodeAt(h++):0,h<f?e.charCodeAt(h++):0),i=t>>2,s=(3&t)<<4|r>>4,a=1<l?(15&r)<<2|n>>6:64,o=2<l?63&n:64,u.push(p.charAt(i)+p.charAt(s)+p.charAt(a)+p.charAt(o));return u.join("")},r.decode=function(e){var t,r,n,i,s,a,o=0,u=0;if("data:"===e.substr(0,"data:".length))throw new Error("Invalid base64 input, it looks like a data url.");var h,f=3*(e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"")).length/4;if(e.charAt(e.length-1)===p.charAt(64)&&f--,e.charAt(e.length-2)===p.charAt(64)&&f--,f%1!=0)throw new Error("Invalid base64 input, bad content length.");for(h=l.uint8array?new Uint8Array(0|f):new Array(0|f);o<e.length;)t=p.indexOf(e.charAt(o++))<<2|(i=p.indexOf(e.charAt(o++)))>>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),h[u++]=t,64!==s&&(h[u++]=r),64!==a&&(h[u++]=n);return h}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(e){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils"),a=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r){var n=a,i=0+r;e^=-1;for(var s=0;s<i;s++)e=e>>>8^n[255&(e^t[s])];return-1^e}(0|t,e,e.length):function(e,t,r){var n=a,i=0+r;e^=-1;for(var s=0;s<i;s++)e=e>>>8^n[255&(e^t.charCodeAt(s))];return-1^e}(0|t,e,e.length):0}},{"./utils":32}],5:[function(e,t,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(e,t,r){"use strict";var n;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function u(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(u,a),u.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.data),!1)},u.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},u.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},u.prototype._createPako=function(){this._pako=new i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new u("Deflate",e)},r.uncompressWorker=function(){return new u("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function I(e,t){var r,n="";for(r=0;r<t;r++)n+=String.fromCharCode(255&e),e>>>=8;return n}function i(e,t,r,n,i,s){var a,o,u=e.file,h=e.compression,f=s!==B.utf8encode,l=O.transformTo("string",s(u.name)),d=O.transformTo("string",B.utf8encode(u.name)),c=u.comment,p=O.transformTo("string",s(c)),m=O.transformTo("string",B.utf8encode(c)),_=d.length!==u.name.length,g=m.length!==c.length,v="",b="",w="",y=u.dir,k=u.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),f||!_&&!g||(S|=2048);var z,E=0,C=0;y&&(E|=16),"UNIX"===i?(C=798,E|=((z=u.unixPermissions)||(z=y?16893:33204),(65535&z)<<16)):(C=20,E|=63&(u.dosPermissions||0)),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+="up"+I((b=I(1,1)+I(T(l),4)+d).length,2)+b),g&&(v+="uc"+I((w=I(1,1)+I(T(p),4)+m).length,2)+w);var A="";return A+="\n\0",A+=I(S,2),A+=h.magic,A+=I(a,2),A+=I(o,2),A+=I(x.crc32,4),A+=I(x.compressedSize,4),A+=I(x.uncompressedSize,4),A+=I(l.length,2),A+=I(v.length,2),{fileRecord:R.LOCAL_FILE_HEADER+A+l+v,dirRecord:R.CENTRAL_FILE_HEADER+I(C,2)+A+I(p.length,2)+"\0\0\0\0"+I(E,4)+I(n,4)+l+v+p}}var O=e("../utils"),s=e("../stream/GenericWorker"),B=e("../utf8"),T=e("../crc32"),R=e("../signature");function n(e,t,r,n){s.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}O.inherits(n,s),n.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,s.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},n.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=i(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},n.prototype.closedSource=function(e){this.accumulate=!1;var t,r=this.streamFiles&&!e.file.dir,n=i(e,r,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(n.dirRecord),r)this.push({data:(t=e,R.DATA_DESCRIPTOR+I(t.crc32,4)+I(t.compressedSize,4)+I(t.uncompressedSize,4)),meta:{percent:100}});else for(this.push({data:n.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},n.prototype.flush=function(){for(var e=this.bytesWritten,t=0;t<this.dirRecords.length;t++)this.push({data:this.dirRecords[t],meta:{percent:100}});var r,n,i,s,a,o,u=this.bytesWritten-e,h=(r=this.dirRecords.length,n=u,i=e,s=this.zipComment,a=this.encodeFileName,o=O.transformTo("string",a(s)),R.CENTRAL_DIRECTORY_END+"\0\0\0\0"+I(r,2)+I(r,2)+I(n,4)+I(i,4)+I(o.length,2)+o);this.push({data:h,meta:{percent:100}})},n.prototype.prepareNextSource=function(){this.previous=this._sources.shift(),this.openedSource(this.previous.streamInfo),this.isPaused?this.previous.pause():this.previous.resume()},n.prototype.registerPrevious=function(e){this._sources.push(e);var t=this;return e.on("data",function(e){t.processChunk(e)}),e.on("end",function(){t.closedSource(t.previous.streamInfo),t._sources.length?t.prepareNextSource():t.end()}),e.on("error",function(e){t.error(e)}),this},n.prototype.resume=function(){return!!s.prototype.resume.call(this)&&(!this.previous&&this._sources.length?(this.prepareNextSource(),!0):this.previous||this._sources.length||this.generatedError?void 0:(this.end(),!0))},n.prototype.error=function(e){var t=this._sources;if(!s.prototype.error.call(this,e))return!1;for(var r=0;r<t.length;r++)try{t[r].error(e)}catch(e){}return!0},n.prototype.lock=function(){s.prototype.lock.call(this);for(var e=this._sources,t=0;t<e.length;t++)e[t].lock()},t.exports=n},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(e,t,r){"use strict";var h=e("../compressions"),n=e("./ZipFileWorker");r.generateWorker=function(e,a,t){var o=new n(a.streamFiles,t,a.platform,a.encodeFileName),u=0;try{e.forEach(function(e,t){u++;var r=function(e,t){var r=e||t,n=h[r];if(!n)throw new Error(r+" is not a valid compression method !");return n}(t.options.compression,a.compression),n=t.options.compressionOptions||a.compressionOptions||{},i=t.dir,s=t.date;t._compressWorker(r,n).withStreamInfo("file",{name:e,dir:i,date:s,comment:t.comment||"",unixPermissions:t.unixPermissions,dosPermissions:t.dosPermissions}).pipe(o)}),o.entriesCount=u}catch(e){o.error(e)}return o}},{"../compressions":3,"./ZipFileWorker":8}],10:[function(e,t,r){"use strict";function n(){if(!(this instanceof n))return new n;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 e=new n;for(var t in this)"function"!=typeof this[t]&&(e[t]=this[t]);return e}}(n.prototype=e("./object")).loadAsync=e("./load"),n.support=e("./support"),n.defaults=e("./defaults"),n.version="3.5.0",n.loadAsync=function(e,t){return(new n).loadAsync(e,t)},n.external=e("./external"),t.exports=n},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(e,t,r){"use strict";var n=e("./utils"),i=e("./external"),o=e("./utf8"),u=e("./zipEntries"),s=e("./stream/Crc32Probe"),h=e("./nodejsUtils");function f(n){return new i.Promise(function(e,t){var r=n.decompressed.getContentWorker().pipe(new s);r.on("error",function(e){t(e)}).on("end",function(){r.streamInfo.crc32!==n.decompressed.crc32?t(new Error("Corrupted zip : CRC32 mismatch")):e()}).resume()})}t.exports=function(e,s){var a=this;return s=n.extend(s||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:o.utf8decode}),h.isNode&&h.isStream(e)?i.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file.")):n.prepareContent("the loaded zip file",e,!0,s.optimizedBinaryString,s.base64).then(function(e){var t=new u(s);return t.load(e),t}).then(function(e){var t=[i.Promise.resolve(e)],r=e.files;if(s.checkCRC32)for(var n=0;n<r.length;n++)t.push(f(r[n]));return i.Promise.all(t)}).then(function(e){for(var t=e.shift(),r=t.files,n=0;n<r.length;n++){var i=r[n];a.file(i.fileNameStr,i.decompressed,{binary:!0,optimizedBinaryString:!0,date:i.date,dir:i.dir,comment:i.fileCommentStr.length?i.fileCommentStr:null,unixPermissions:i.unixPermissions,dosPermissions:i.dosPermissions,createFolders:s.createFolders})}return t.zipComment.length&&(a.comment=t.zipComment),a})}},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../stream/GenericWorker");function s(e,t){i.call(this,"Nodejs stream input adapter for "+e),this._upstreamEnded=!1,this._bindStream(t)}n.inherits(s,i),s.prototype._bindStream=function(e){var t=this;(this._stream=e).pause(),e.on("data",function(e){t.push({data:e,meta:{percent:0}})}).on("error",function(e){t.isPaused?this.generatedError=e:t.error(e)}).on("end",function(){t.isPaused?t._upstreamEnded=!0:t.end()})},s.prototype.pause=function(){return!!i.prototype.pause.call(this)&&(this._stream.pause(),!0)},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(this._upstreamEnded?this.end():this._stream.resume(),!0)},t.exports=s},{"../stream/GenericWorker":28,"../utils":32}],13:[function(e,t,r){"use strict";var i=e("readable-stream").Readable;function n(e,t,r){i.call(this,t),this._helper=e;var n=this;e.on("data",function(e,t){n.push(e)||n._helper.pause(),r&&r(t)}).on("error",function(e){n.emit("error",e)}).on("end",function(){n.push(null)})}e("../utils").inherits(n,i),n.prototype._read=function(){this._helper.resume()},t.exports=n},{"../utils":32,"readable-stream":16}],14:[function(e,t,r){"use strict";t.exports={isNode:"undefined"!=typeof Buffer,newBufferFrom:function(e,t){if(Buffer.from&&Buffer.from!==Uint8Array.from)return Buffer.from(e,t);if("number"==typeof e)throw new Error('The "data" argument must not be a number');return new Buffer(e,t)},allocBuffer:function(e){if(Buffer.alloc)return Buffer.alloc(e);var t=new Buffer(e);return t.fill(0),t},isBuffer:function(e){return Buffer.isBuffer(e)},isStream:function(e){return e&&"function"==typeof e.on&&"function"==typeof e.pause&&"function"==typeof e.resume}}},{}],15:[function(e,t,r){"use strict";function s(e,t,r){var n,i=f.getTypeOf(t),s=f.extend(r||{},d);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&&(e=h(e)),s.createFolders&&(n=function(e){"/"===e.slice(-1)&&(e=e.substring(0,e.length-1));var t=e.lastIndexOf("/");return 0<t?e.substring(0,t):""}(e))&&g.call(this,n,!0);var a,o="string"===i&&!1===s.binary&&!1===s.base64;r&&void 0!==r.binary||(s.binary=!o),(t instanceof c&&0===t.uncompressedSize||s.dir||!t||0===t.length)&&(s.base64=!1,s.binary=!0,t="",s.compression="STORE",i="string"),a=t instanceof c||t instanceof l?t:m.isNode&&m.isStream(t)?new _(e,t):f.prepareContent(e,t,s.binary,s.optimizedBinaryString,s.base64);var u=new p(e,a,s);this.files[e]=u}function h(e){return"/"!==e.slice(-1)&&(e+="/"),e}var i=e("./utf8"),f=e("./utils"),l=e("./stream/GenericWorker"),a=e("./stream/StreamHelper"),d=e("./defaults"),c=e("./compressedObject"),p=e("./zipObject"),o=e("./generate"),m=e("./nodejsUtils"),_=e("./nodejs/NodejsStreamInputAdapter"),g=function(e,t){return t=void 0!==t?t:d.createFolders,e=h(e),this.files[e]||s.call(this,e,null,{dir:!0,createFolders:t}),this.files[e]};function u(e){return"[object RegExp]"===Object.prototype.toString.call(e)}var n={load:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},forEach:function(e){var t,r,n;for(t in this.files)this.files.hasOwnProperty(t)&&(n=this.files[t],(r=t.slice(this.root.length,t.length))&&t.slice(0,this.root.length)===this.root&&e(r,n))},filter:function(r){var n=[];return this.forEach(function(e,t){r(e,t)&&n.push(t)}),n},file:function(e,t,r){if(1!==arguments.length)return e=this.root+e,s.call(this,e,t,r),this;if(u(e)){var n=e;return this.filter(function(e,t){return!t.dir&&n.test(e)})}var i=this.files[this.root+e];return i&&!i.dir?i:null},folder:function(r){if(!r)return this;if(u(r))return this.filter(function(e,t){return t.dir&&r.test(e)});var e=this.root+r,t=g.call(this,e),n=this.clone();return n.root=t.name,n},remove:function(r){r=this.root+r;var e=this.files[r];if(e||("/"!==r.slice(-1)&&(r+="/"),e=this.files[r]),e&&!e.dir)delete this.files[r];else for(var t=this.filter(function(e,t){return t.name.slice(0,r.length)===r}),n=0;n<t.length;n++)delete this.files[t[n].name];return this},generate:function(e){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},generateInternalStream:function(e){var t,r={};try{if((r=f.extend(e||{},{streamFiles:!1,compression:"STORE",compressionOptions:null,type:"",platform:"DOS",comment:null,mimeType:"application/zip",encodeFileName:i.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.");f.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 n=r.comment||this.comment||"";t=o.generateWorker(this,r,n)}catch(e){(t=new l("error")).error(e)}return new a(t,r.type||"string",r.mimeType)},generateAsync:function(e,t){return this.generateInternalStream(e).accumulate(t)},generateNodeStream:function(e,t){return(e=e||{}).type||(e.type="nodebuffer"),this.generateInternalStream(e).toNodejsStream(t)}};t.exports=n},{"./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(e,t,r){t.exports=e("stream")},{stream:void 0}],17:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e);for(var t=0;t<this.data.length;t++)e[t]=255&e[t]}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data[this.zero+e]},i.prototype.lastIndexOfSignature=function(e){for(var t=e.charCodeAt(0),r=e.charCodeAt(1),n=e.charCodeAt(2),i=e.charCodeAt(3),s=this.length-4;0<=s;--s)if(this.data[s]===t&&this.data[s+1]===r&&this.data[s+2]===n&&this.data[s+3]===i)return s-this.zero;return-1},i.prototype.readAndCheckSignature=function(e){var t=e.charCodeAt(0),r=e.charCodeAt(1),n=e.charCodeAt(2),i=e.charCodeAt(3),s=this.readData(4);return t===s[0]&&r===s[1]&&n===s[2]&&i===s[3]},i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return[];var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],18:[function(e,t,r){"use strict";var n=e("../utils");function i(e){this.data=e,this.length=e.length,this.index=0,this.zero=0}i.prototype={checkOffset:function(e){this.checkIndex(this.index+e)},checkIndex:function(e){if(this.length<this.zero+e||e<0)throw new Error("End of data reached (data length = "+this.length+", asked index = "+e+"). Corrupted zip ?")},setIndex:function(e){this.checkIndex(e),this.index=e},skip:function(e){this.setIndex(this.index+e)},byteAt:function(e){},readInt:function(e){var t,r=0;for(this.checkOffset(e),t=this.index+e-1;t>=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(e){},lastIndexOfSignature:function(e){},readAndCheckSignature:function(e){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),u=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new u(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,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(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"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}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r<this._listeners[e].length;r++)this._listeners[e][r].call(this,t)},pipe:function(e){return e.registerPrevious(this)},registerPrevious:function(e){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.streamInfo=e.streamInfo,this.mergeStreamInfo(),this.previous=e;var t=this;return e.on("data",function(e){t.processChunk(e)}),e.on("end",function(){t.end()}),e.on("error",function(e){t.error(e)}),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 e=this.isPaused=!1;return this.generatedError&&(this.error(this.generatedError),e=!0),this.previous&&this.previous.resume(),!e},flush:function(){},processChunk:function(e){this.push(e)},withStreamInfo:function(e,t){return this.extraStreamInfo[e]=t,this.mergeStreamInfo(),this},mergeStreamInfo:function(){for(var e in this.extraStreamInfo)this.extraStreamInfo.hasOwnProperty(e)&&(this.streamInfo[e]=this.extraStreamInfo[e])},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 e="Worker "+this.name;return this.previous?this.previous+" -> "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),f=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function u(e,t,r){var n=t;switch(t){case"blob":case"arraybuffer":n="uint8array";break;case"base64":n="string"}try{this._internalType=n,this._outputType=t,this._mimeType=r,h.checkSupport(n),this._worker=e.pipe(new i(n)),e.lock()}catch(e){this._worker=new s("error"),this._worker.error(e)}}u.prototype={accumulate:function(e){return o=this,u=e,new a.Promise(function(t,r){var n=[],i=o._internalType,s=o._outputType,a=o._mimeType;o.on("data",function(e,t){n.push(e),u&&u(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return f.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r<t.length;r++)s+=t[r].length;switch(e){case"string":return t.join("");case"array":return Array.prototype.concat.apply([],t);case"uint8array":for(i=new Uint8Array(s),r=0;r<t.length;r++)i.set(t[r],n),n+=t[r].length;return i;case"nodebuffer":return Buffer.concat(t);default:throw new Error("concat : unsupported type '"+e+"'")}}(i,n),a);t(e)}catch(e){r(e)}n=[]}).resume()});var o,u},on:function(e,t){var r=this;return"data"===e?this._worker.on(e,function(e){t.call(r,e.data,e.meta)}):this._worker.on(e,function(){h.delay(t,arguments,r)}),this},resume:function(){return h.delay(this._worker.resume,[],this._worker),this},pause:function(){return this._worker.pause(),this},toNodejsStream:function(e){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},e)}},t.exports=u},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(e,t,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 n=new ArrayBuffer(0);try{r.blob=0===new Blob([n],{type:"application/zip"}).size}catch(e){try{var i=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);i.append(n),r.blob=0===i.getBlob("application/zip").size}catch(e){r.blob=!1}}}try{r.nodestream=!!e("readable-stream").Readable}catch(e){r.nodestream=!1}},{"readable-stream":16}],31:[function(e,t,s){"use strict";for(var o=e("./utils"),u=e("./support"),r=e("./nodejsUtils"),n=e("./stream/GenericWorker"),h=new Array(256),i=0;i<256;i++)h[i]=252<=i?6:248<=i?5:240<=i?4:224<=i?3:192<=i?2:1;function a(){n.call(this,"utf-8 decode"),this.leftOver=null}function f(){n.call(this,"utf-8 encode")}h[254]=h[254]=1,s.utf8encode=function(e){return u.nodebuffer?r.newBufferFrom(e,"utf-8"):function(e){var t,r,n,i,s,a=e.length,o=0;for(i=0;i<a;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),o+=r<128?1:r<2048?2:r<65536?3:4;for(t=u.uint8array?new Uint8Array(o):new Array(o),i=s=0;s<o;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),r<128?t[s++]=r:(r<2048?t[s++]=192|r>>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return u.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t<s;)if((n=e[t++])<128)a[r++]=n;else if(4<(i=h[n]))a[r++]=65533,t+=i-1;else{for(n&=2===i?31:3===i?15:7;1<i&&t<s;)n=n<<6|63&e[t++],i--;1<i?a[r++]=65533:n<65536?a[r++]=n:(n-=65536,a[r++]=55296|n>>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(u.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(u.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(u.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+h[e[r]]>t?r:t}(t),i=t;n!==t.length&&(u.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.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(f,n),f.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=f},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,o){"use strict";var u=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),n=e("set-immediate-shim"),f=e("./external");function i(e){return e}function l(e,t){for(var r=0;r<e.length;++r)t[r]=255&e.charCodeAt(r);return t}o.newBlob=function(t,r){o.checkSupport("blob");try{return new Blob([t],{type:r})}catch(e){try{var n=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);return n.append(t),n.getBlob(r)}catch(e){throw new Error("Bug : can't construct the Blob.")}}};var s={stringifyByChunk:function(e,t,r){var n=[],i=0,s=e.length;if(s<=r)return String.fromCharCode.apply(null,e);for(;i<s;)"array"===t||"nodebuffer"===t?n.push(String.fromCharCode.apply(null,e.slice(i,Math.min(i+r,s)))):n.push(String.fromCharCode.apply(null,e.subarray(i,Math.min(i+r,s)))),i+=r;return n.join("")},stringifyByChar:function(e){for(var t="",r=0;r<e.length;r++)t+=String.fromCharCode(e[r]);return t},applyCanBeUsed:{uint8array:function(){try{return u.uint8array&&1===String.fromCharCode.apply(null,new Uint8Array(1)).length}catch(e){return!1}}(),nodebuffer:function(){try{return u.nodebuffer&&1===String.fromCharCode.apply(null,r.allocBuffer(1)).length}catch(e){return!1}}()}};function a(e){var t=65536,r=o.getTypeOf(e),n=!0;if("uint8array"===r?n=s.applyCanBeUsed.uint8array:"nodebuffer"===r&&(n=s.applyCanBeUsed.nodebuffer),n)for(;1<t;)try{return s.stringifyByChunk(e,r,t)}catch(e){t=Math.floor(t/2)}return s.stringifyByChar(e)}function d(e,t){for(var r=0;r<e.length;r++)t[r]=e[r];return t}o.applyFromCharCode=a;var c={};c.string={string:i,array:function(e){return l(e,new Array(e.length))},arraybuffer:function(e){return c.string.uint8array(e).buffer},uint8array:function(e){return l(e,new Uint8Array(e.length))},nodebuffer:function(e){return l(e,r.allocBuffer(e.length))}},c.array={string:a,array:i,arraybuffer:function(e){return new Uint8Array(e).buffer},uint8array:function(e){return new Uint8Array(e)},nodebuffer:function(e){return r.newBufferFrom(e)}},c.arraybuffer={string:function(e){return a(new Uint8Array(e))},array:function(e){return d(new Uint8Array(e),new Array(e.byteLength))},arraybuffer:i,uint8array:function(e){return new Uint8Array(e)},nodebuffer:function(e){return r.newBufferFrom(new Uint8Array(e))}},c.uint8array={string:a,array:function(e){return d(e,new Array(e.length))},arraybuffer:function(e){return e.buffer},uint8array:i,nodebuffer:function(e){return r.newBufferFrom(e)}},c.nodebuffer={string:a,array:function(e){return d(e,new Array(e.length))},arraybuffer:function(e){return c.nodebuffer.uint8array(e).buffer},uint8array:function(e){return d(e,new Uint8Array(e.length))},nodebuffer:i},o.transformTo=function(e,t){if(t=t||"",!e)return t;o.checkSupport(e);var r=o.getTypeOf(t);return c[r][e](t)},o.getTypeOf=function(e){return"string"==typeof e?"string":"[object Array]"===Object.prototype.toString.call(e)?"array":u.nodebuffer&&r.isBuffer(e)?"nodebuffer":u.uint8array&&e instanceof Uint8Array?"uint8array":u.arraybuffer&&e instanceof ArrayBuffer?"arraybuffer":void 0},o.checkSupport=function(e){if(!u[e.toLowerCase()])throw new Error(e+" is not supported by this platform")},o.MAX_VALUE_16BITS=65535,o.MAX_VALUE_32BITS=-1,o.pretty=function(e){var t,r,n="";for(r=0;r<(e||"").length;r++)n+="\\x"+((t=e.charCodeAt(r))<16?"0":"")+t.toString(16).toUpperCase();return n},o.delay=function(e,t,r){n(function(){e.apply(r||null,t||[])})},o.inherits=function(e,t){function r(){}r.prototype=t.prototype,e.prototype=new r},o.extend=function(){var e,t,r={};for(e=0;e<arguments.length;e++)for(t in arguments[e])arguments[e].hasOwnProperty(t)&&void 0===r[t]&&(r[t]=arguments[e][t]);return r},o.prepareContent=function(n,e,i,s,a){return f.Promise.resolve(e).then(function(n){return u.blob&&(n instanceof Blob||-1!==["[object File]","[object Blob]"].indexOf(Object.prototype.toString.call(n)))&&"undefined"!=typeof FileReader?new f.Promise(function(t,r){var e=new FileReader;e.onload=function(e){t(e.target.result)},e.onerror=function(e){r(e.target.error)},e.readAsArrayBuffer(n)}):n}).then(function(e){var t,r=o.getTypeOf(e);return r?("arraybuffer"===r?e=o.transformTo("uint8array",e):"string"===r&&(a?e=h.decode(e):i&&!0!==s&&(e=l(t=e,u.uint8array?new Uint8Array(t.length):new Array(t.length)))),e):f.Promise.reject(new Error("Can't read the data of '"+n+"'. 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(e,t,r){"use strict";var n=e("./reader/readerFor"),i=e("./utils"),s=e("./signature"),a=e("./zipEntry"),o=(e("./utf8"),e("./support"));function u(e){this.files=[],this.loadOptions=e}u.prototype={checkSignature:function(e){if(!this.reader.readAndCheckSignature(e)){this.reader.index-=4;var t=this.reader.readString(4);throw new Error("Corrupted zip or bug: unexpected signature ("+i.pretty(t)+", expected "+i.pretty(e)+")")}},isSignature:function(e,t){var r=this.reader.index;this.reader.setIndex(e);var n=this.reader.readString(4)===t;return this.reader.setIndex(r),n},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 e=this.reader.readData(this.zipCommentLength),t=o.uint8array?"uint8array":"array",r=i.transformTo(t,e);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 e,t,r,n=this.zip64EndOfCentralSize-44;0<n;)e=this.reader.readInt(2),t=this.reader.readInt(4),r=this.reader.readData(t),this.zip64ExtensibleData[e]={id:e,length:t,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 e,t;for(e=0;e<this.files.length;e++)t=this.files[e],this.reader.setIndex(t.localHeaderOffset),this.checkSignature(s.LOCAL_FILE_HEADER),t.readLocalPart(this.reader),t.handleUTF8(),t.processAttributes()},readCentralDir:function(){var e;for(this.reader.setIndex(this.centralDirOffset);this.reader.readAndCheckSignature(s.CENTRAL_FILE_HEADER);)(e=new a({zip64:this.zip64},this.loadOptions)).readCentralPart(this.reader),this.files.push(e);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 e=this.reader.lastIndexOfSignature(s.CENTRAL_DIRECTORY_END);if(e<0)throw this.isSignature(0,s.LOCAL_FILE_HEADER)?new Error("Corrupted zip: can't find end of central directory"):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");this.reader.setIndex(e);var t=e;if(this.checkSignature(s.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===i.MAX_VALUE_16BITS||this.diskWithCentralDirStart===i.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===i.MAX_VALUE_16BITS||this.centralDirRecords===i.MAX_VALUE_16BITS||this.centralDirSize===i.MAX_VALUE_32BITS||this.centralDirOffset===i.MAX_VALUE_32BITS){if(this.zip64=!0,(e=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(e),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 n=t-r;if(0<n)this.isSignature(t,s.CENTRAL_FILE_HEADER)||(this.reader.zero=n);else if(n<0)throw new Error("Corrupted zip: missing "+Math.abs(n)+" bytes.")},prepareReader:function(e){this.reader=n(e)},load:function(e){this.prepareReader(e),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},t.exports=u},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utf8":31,"./utils":32,"./zipEntry":34}],34:[function(e,t,r){"use strict";var n=e("./reader/readerFor"),s=e("./utils"),i=e("./compressedObject"),a=e("./crc32"),o=e("./utf8"),u=e("./compressions"),h=e("./support");function f(e,t){this.options=e,this.loadOptions=t}f.prototype={isEncrypted:function(){return 1==(1&this.bitFlag)},useUTF8:function(){return 2048==(2048&this.bitFlag)},readLocalPart:function(e){var t,r;if(e.skip(22),this.fileNameLength=e.readInt(2),r=e.readInt(2),this.fileName=e.readData(this.fileNameLength),e.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===(t=function(e){for(var t in u)if(u.hasOwnProperty(t)&&u[t].magic===e)return u[t];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 i(this.compressedSize,this.uncompressedSize,this.crc32,t,e.readData(this.compressedSize))},readCentralPart:function(e){this.versionMadeBy=e.readInt(2),e.skip(2),this.bitFlag=e.readInt(2),this.compressionMethod=e.readString(2),this.date=e.readDate(),this.crc32=e.readInt(4),this.compressedSize=e.readInt(4),this.uncompressedSize=e.readInt(4);var t=e.readInt(2);if(this.extraFieldsLength=e.readInt(2),this.fileCommentLength=e.readInt(2),this.diskNumberStart=e.readInt(2),this.internalFileAttributes=e.readInt(2),this.externalFileAttributes=e.readInt(4),this.localHeaderOffset=e.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");e.skip(t),this.readExtraFields(e),this.parseZIP64ExtraField(e),this.fileComment=e.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var e=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(e){if(this.extraFields[1]){var t=n(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=t.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=t.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=t.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=t.readInt(4))}},readExtraFields:function(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4<i;)t=e.readInt(2),r=e.readInt(2),n=e.readData(r),this.extraFields[t]={id:t,length:r,value:n};e.setIndex(i)},handleUTF8:function(){var e=h.uint8array?"uint8array":"array";if(this.useUTF8())this.fileNameStr=o.utf8decode(this.fileName),this.fileCommentStr=o.utf8decode(this.fileComment);else{var t=this.findExtraFieldUnicodePath();if(null!==t)this.fileNameStr=t;else{var r=s.transformTo(e,this.fileName);this.fileNameStr=this.loadOptions.decodeFileName(r)}var n=this.findExtraFieldUnicodeComment();if(null!==n)this.fileCommentStr=n;else{var i=s.transformTo(e,this.fileComment);this.fileCommentStr=this.loadOptions.decodeFileName(i)}}},findExtraFieldUnicodePath:function(){var e=this.extraFields[28789];if(e){var t=n(e.value);return 1!==t.readInt(1)?null:a(this.fileName)!==t.readInt(4)?null:o.utf8decode(t.readData(e.length-5))}return null},findExtraFieldUnicodeComment:function(){var e=this.extraFields[25461];if(e){var t=n(e.value);return 1!==t.readInt(1)?null:a(this.fileComment)!==t.readInt(4)?null:o.utf8decode(t.readData(e.length-5))}return null}},t.exports=f},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(e,t,r){"use strict";function n(e,t,r){this.name=e,this.dir=r.dir,this.date=r.date,this.comment=r.comment,this.unixPermissions=r.unixPermissions,this.dosPermissions=r.dosPermissions,this._data=t,this._dataBinary=r.binary,this.options={compression:r.compression,compressionOptions:r.compressionOptions}}var s=e("./stream/StreamHelper"),i=e("./stream/DataWorker"),a=e("./utf8"),o=e("./compressedObject"),u=e("./stream/GenericWorker");n.prototype={internalStream:function(e){var t=null,r="string";try{if(!e)throw new Error("No output type specified.");var n="string"===(r=e.toLowerCase())||"text"===r;"binarystring"!==r&&"text"!==r||(r="string"),t=this._decompressWorker();var i=!this._dataBinary;i&&!n&&(t=t.pipe(new a.Utf8EncodeWorker)),!i&&n&&(t=t.pipe(new a.Utf8DecodeWorker))}catch(e){(t=new u("error")).error(e)}return new s(t,r,"")},async:function(e,t){return this.internalStream(e).accumulate(t)},nodeStream:function(e,t){return this.internalStream(e||"nodebuffer").toNodejsStream(t)},_compressWorker:function(e,t){if(this._data instanceof o&&this._data.compression.magic===e.magic)return this._data.getCompressedWorker();var r=this._decompressWorker();return this._dataBinary||(r=r.pipe(new a.Utf8EncodeWorker)),o.createWorkerFrom(r,e,t)},_decompressWorker:function(){return this._data instanceof o?this._data.getContentWorker():this._data instanceof u?this._data:new i(this._data)}};for(var h=["asText","asBinary","asNodeBuffer","asUint8Array","asArrayBuffer"],f=function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},l=0;l<h.length;l++)n.prototype[h[l]]=f;t.exports=n},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(e,f,t){(function(t){"use strict";var r,n,e=t.MutationObserver||t.WebKitMutationObserver;if(e){var i=0,s=new e(h),a=t.document.createTextNode("");s.observe(a,{characterData:!0}),r=function(){a.data=i=++i%2}}else if(t.setImmediate||void 0===t.MessageChannel)r="document"in t&&"onreadystatechange"in t.document.createElement("script")?function(){var e=t.document.createElement("script");e.onreadystatechange=function(){h(),e.onreadystatechange=null,e.parentNode.removeChild(e),e=null},t.document.documentElement.appendChild(e)}:function(){setTimeout(h,0)};else{var o=new t.MessageChannel;o.port1.onmessage=h,r=function(){o.port2.postMessage(0)}}var u=[];function h(){var e,t;n=!0;for(var r=u.length;r;){for(t=u,u=[],e=-1;++e<r;)t[e]();r=u.length}n=!1}f.exports=function(e){1!==u.push(e)||n||r()}}).call(this,void 0!==r?r:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],37:[function(e,t,r){"use strict";var i=e("immediate");function h(){}var f={},s=["REJECTED"],a=["FULFILLED"],n=["PENDING"];function o(e){if("function"!=typeof e)throw new TypeError("resolver must be a function");this.state=n,this.queue=[],this.outcome=void 0,e!==h&&c(this,e)}function u(e,t,r){this.promise=e,"function"==typeof t&&(this.onFulfilled=t,this.callFulfilled=this.otherCallFulfilled),"function"==typeof r&&(this.onRejected=r,this.callRejected=this.otherCallRejected)}function l(t,r,n){i(function(){var e;try{e=r(n)}catch(e){return f.reject(t,e)}e===t?f.reject(t,new TypeError("Cannot resolve promise with itself")):f.resolve(t,e)})}function d(e){var t=e&&e.then;if(e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof t)return function(){t.apply(e,arguments)}}function c(t,e){var r=!1;function n(e){r||(r=!0,f.reject(t,e))}function i(e){r||(r=!0,f.resolve(t,e))}var s=p(function(){e(i,n)});"error"===s.status&&n(s.value)}function p(e,t){var r={};try{r.value=e(t),r.status="success"}catch(e){r.status="error",r.value=e}return r}(t.exports=o).prototype.finally=function(t){if("function"!=typeof t)return this;var r=this.constructor;return this.then(function(e){return r.resolve(t()).then(function(){return e})},function(e){return r.resolve(t()).then(function(){throw e})})},o.prototype.catch=function(e){return this.then(null,e)},o.prototype.then=function(e,t){if("function"!=typeof e&&this.state===a||"function"!=typeof t&&this.state===s)return this;var r=new this.constructor(h);return this.state!==n?l(r,this.state===a?e:t,this.outcome):this.queue.push(new u(r,e,t)),r},u.prototype.callFulfilled=function(e){f.resolve(this.promise,e)},u.prototype.otherCallFulfilled=function(e){l(this.promise,this.onFulfilled,e)},u.prototype.callRejected=function(e){f.reject(this.promise,e)},u.prototype.otherCallRejected=function(e){l(this.promise,this.onRejected,e)},f.resolve=function(e,t){var r=p(d,t);if("error"===r.status)return f.reject(e,r.value);var n=r.value;if(n)c(e,n);else{e.state=a,e.outcome=t;for(var i=-1,s=e.queue.length;++i<s;)e.queue[i].callFulfilled(t)}return e},f.reject=function(e,t){e.state=s,e.outcome=t;for(var r=-1,n=e.queue.length;++r<n;)e.queue[r].callRejected(t);return e},o.resolve=function(e){return e instanceof this?e:f.resolve(new this(h),e)},o.reject=function(e){var t=new this(h);return f.reject(t,e)},o.all=function(e){var r=this;if("[object Array]"!==Object.prototype.toString.call(e))return this.reject(new TypeError("must be an array"));var n=e.length,i=!1;if(!n)return this.resolve([]);for(var s=new Array(n),a=0,t=-1,o=new this(h);++t<n;)u(e[t],t);return o;function u(e,t){r.resolve(e).then(function(e){s[t]=e,++a!==n||i||(i=!0,f.resolve(o,s))},function(e){i||(i=!0,f.reject(o,e))})}},o.race=function(e){if("[object Array]"!==Object.prototype.toString.call(e))return this.reject(new TypeError("must be an array"));var t=e.length,r=!1;if(!t)return this.resolve([]);for(var n,i=-1,s=new this(h);++i<t;)n=e[i],this.resolve(n).then(function(e){r||(r=!0,f.resolve(s,e))},function(e){r||(r=!0,f.reject(s,e))});return s}},{immediate:36}],38:[function(e,t,r){"use strict";var n={};(0,e("./lib/utils/common").assign)(n,e("./lib/deflate"),e("./lib/inflate"),e("./lib/zlib/constants")),t.exports=n},{"./lib/deflate":39,"./lib/inflate":40,"./lib/utils/common":41,"./lib/zlib/constants":44}],39:[function(e,t,r){"use strict";var a=e("./zlib/deflate"),o=e("./utils/common"),u=e("./utils/strings"),i=e("./zlib/messages"),s=e("./zlib/zstream"),h=Object.prototype.toString,f=0,l=-1,d=0,c=8;function p(e){if(!(this instanceof p))return new p(e);this.options=o.assign({level:l,method:c,chunkSize:16384,windowBits:15,memLevel:8,strategy:d,to:""},e||{});var t=this.options;t.raw&&0<t.windowBits?t.windowBits=-t.windowBits:t.gzip&&0<t.windowBits&&t.windowBits<16&&(t.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,t.level,t.method,t.windowBits,t.memLevel,t.strategy);if(r!==f)throw new Error(i[r]);if(t.header&&a.deflateSetHeader(this.strm,t.header),t.dictionary){var n;if(n="string"==typeof t.dictionary?u.string2buf(t.dictionary):"[object ArrayBuffer]"===h.call(t.dictionary)?new Uint8Array(t.dictionary):t.dictionary,(r=a.deflateSetDictionary(this.strm,n))!==f)throw new Error(i[r]);this._dict_set=!0}}function n(e,t){var r=new p(t);if(r.push(e,!0),r.err)throw r.msg||i[r.err];return r.result}p.prototype.push=function(e,t){var r,n,i=this.strm,s=this.options.chunkSize;if(this.ended)return!1;n=t===~~t?t:!0===t?4:0,"string"==typeof e?i.input=u.string2buf(e):"[object ArrayBuffer]"===h.call(e)?i.input=new Uint8Array(e):i.input=e,i.next_in=0,i.avail_in=i.input.length;do{if(0===i.avail_out&&(i.output=new o.Buf8(s),i.next_out=0,i.avail_out=s),1!==(r=a.deflate(i,n))&&r!==f)return this.onEnd(r),!(this.ended=!0);0!==i.avail_out&&(0!==i.avail_in||4!==n&&2!==n)||("string"===this.options.to?this.onData(u.buf2binstring(o.shrinkBuf(i.output,i.next_out))):this.onData(o.shrinkBuf(i.output,i.next_out)))}while((0<i.avail_in||0===i.avail_out)&&1!==r);return 4===n?(r=a.deflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===f):2!==n||(this.onEnd(f),!(i.avail_out=0))},p.prototype.onData=function(e){this.chunks.push(e)},p.prototype.onEnd=function(e){e===f&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=o.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},r.Deflate=p,r.deflate=n,r.deflateRaw=function(e,t){return(t=t||{}).raw=!0,n(e,t)},r.gzip=function(e,t){return(t=t||{}).gzip=!0,n(e,t)}},{"./utils/common":41,"./utils/strings":42,"./zlib/deflate":46,"./zlib/messages":51,"./zlib/zstream":53}],40:[function(e,t,r){"use strict";var d=e("./zlib/inflate"),c=e("./utils/common"),p=e("./utils/strings"),m=e("./zlib/constants"),n=e("./zlib/messages"),i=e("./zlib/zstream"),s=e("./zlib/gzheader"),_=Object.prototype.toString;function a(e){if(!(this instanceof a))return new a(e);this.options=c.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;t.raw&&0<=t.windowBits&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(0<=t.windowBits&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),15<t.windowBits&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new i,this.strm.avail_out=0;var r=d.inflateInit2(this.strm,t.windowBits);if(r!==m.Z_OK)throw new Error(n[r]);this.header=new s,d.inflateGetHeader(this.strm,this.header)}function o(e,t){var r=new a(t);if(r.push(e,!0),r.err)throw r.msg||n[r.err];return r.result}a.prototype.push=function(e,t){var r,n,i,s,a,o,u=this.strm,h=this.options.chunkSize,f=this.options.dictionary,l=!1;if(this.ended)return!1;n=t===~~t?t:!0===t?m.Z_FINISH:m.Z_NO_FLUSH,"string"==typeof e?u.input=p.binstring2buf(e):"[object ArrayBuffer]"===_.call(e)?u.input=new Uint8Array(e):u.input=e,u.next_in=0,u.avail_in=u.input.length;do{if(0===u.avail_out&&(u.output=new c.Buf8(h),u.next_out=0,u.avail_out=h),(r=d.inflate(u,m.Z_NO_FLUSH))===m.Z_NEED_DICT&&f&&(o="string"==typeof f?p.string2buf(f):"[object ArrayBuffer]"===_.call(f)?new Uint8Array(f):f,r=d.inflateSetDictionary(this.strm,o)),r===m.Z_BUF_ERROR&&!0===l&&(r=m.Z_OK,l=!1),r!==m.Z_STREAM_END&&r!==m.Z_OK)return this.onEnd(r),!(this.ended=!0);u.next_out&&(0!==u.avail_out&&r!==m.Z_STREAM_END&&(0!==u.avail_in||n!==m.Z_FINISH&&n!==m.Z_SYNC_FLUSH)||("string"===this.options.to?(i=p.utf8border(u.output,u.next_out),s=u.next_out-i,a=p.buf2string(u.output,i),u.next_out=s,u.avail_out=h-s,s&&c.arraySet(u.output,u.output,i,s,0),this.onData(a)):this.onData(c.shrinkBuf(u.output,u.next_out)))),0===u.avail_in&&0===u.avail_out&&(l=!0)}while((0<u.avail_in||0===u.avail_out)&&r!==m.Z_STREAM_END);return r===m.Z_STREAM_END&&(n=m.Z_FINISH),n===m.Z_FINISH?(r=d.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===m.Z_OK):n!==m.Z_SYNC_FLUSH||(this.onEnd(m.Z_OK),!(u.avail_out=0))},a.prototype.onData=function(e){this.chunks.push(e)},a.prototype.onEnd=function(e){e===m.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=c.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},r.Inflate=a,r.inflate=o,r.inflateRaw=function(e,t){return(t=t||{}).raw=!0,o(e,t)},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(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;r.assign=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var r=t.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var n in r)r.hasOwnProperty(n)&&(e[n]=r[n])}}return e},r.shrinkBuf=function(e,t){return e.length===t?e:e.subarray?e.subarray(0,t):(e.length=t,e)};var i={arraySet:function(e,t,r,n,i){if(t.subarray&&e.subarray)e.set(t.subarray(r,r+n),i);else for(var s=0;s<n;s++)e[i+s]=t[r+s]},flattenChunks:function(e){var t,r,n,i,s,a;for(t=n=0,r=e.length;t<r;t++)n+=e[t].length;for(a=new Uint8Array(n),t=i=0,r=e.length;t<r;t++)s=e[t],a.set(s,i),i+=s.length;return a}},s={arraySet:function(e,t,r,n,i){for(var s=0;s<n;s++)e[i+s]=t[r+s]},flattenChunks:function(e){return[].concat.apply([],e)}};r.setTyped=function(e){e?(r.Buf8=Uint8Array,r.Buf16=Uint16Array,r.Buf32=Int32Array,r.assign(r,i)):(r.Buf8=Array,r.Buf16=Array,r.Buf32=Array,r.assign(r,s))},r.setTyped(n)},{}],42:[function(e,t,r){"use strict";var u=e("./common"),i=!0,s=!0;try{String.fromCharCode.apply(null,[0])}catch(e){i=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){s=!1}for(var h=new u.Buf8(256),n=0;n<256;n++)h[n]=252<=n?6:248<=n?5:240<=n?4:224<=n?3:192<=n?2:1;function f(e,t){if(t<65537&&(e.subarray&&s||!e.subarray&&i))return String.fromCharCode.apply(null,u.shrinkBuf(e,t));for(var r="",n=0;n<t;n++)r+=String.fromCharCode(e[n]);return r}h[254]=h[254]=1,r.string2buf=function(e){var t,r,n,i,s,a=e.length,o=0;for(i=0;i<a;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),o+=r<128?1:r<2048?2:r<65536?3:4;for(t=new u.Buf8(o),i=s=0;s<o;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),r<128?t[s++]=r:(r<2048?t[s++]=192|r>>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return f(e,e.length)},r.binstring2buf=function(e){for(var t=new u.Buf8(e.length),r=0,n=t.length;r<n;r++)t[r]=e.charCodeAt(r);return t},r.buf2string=function(e,t){var r,n,i,s,a=t||e.length,o=new Array(2*a);for(r=n=0;r<a;)if((i=e[r++])<128)o[n++]=i;else if(4<(s=h[i]))o[n++]=65533,r+=s-1;else{for(i&=2===s?31:3===s?15:7;1<s&&r<a;)i=i<<6|63&e[r++],s--;1<s?o[n++]=65533:i<65536?o[n++]=i:(i-=65536,o[n++]=55296|i>>10&1023,o[n++]=56320|1023&i)}return f(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+h[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3<r?2e3:r;s=s+(i=i+t[n++]|0)|0,--a;);i%=65521,s%=65521}return i|s<<16|0}},{}],44:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var u,d=e("../utils/common"),h=e("./trees"),c=e("./adler32"),p=e("./crc32"),n=e("./messages"),f=0,l=0,m=-2,i=2,_=8,s=286,a=30,o=19,g=2*s+1,v=15,b=3,w=258,y=w+b+1,k=42,x=113;function S(e,t){return e.msg=n[t],t}function z(e){return(e<<1)-(4<e?9:0)}function E(e){for(var t=e.length;0<=--t;)e[t]=0}function C(e){var t=e.state,r=t.pending;r>e.avail_out&&(r=e.avail_out),0!==r&&(d.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function A(e,t){h._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,C(e.strm)}function I(e,t){e.pending_buf[e.pending++]=t}function O(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function B(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,u=e.strstart>e.w_size-y?e.strstart-(e.w_size-y):0,h=e.window,f=e.w_mask,l=e.prev,d=e.strstart+w,c=h[s+a-1],p=h[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(h[(r=t)+a]===p&&h[r+a-1]===c&&h[r]===h[s]&&h[++r]===h[s+1]){s+=2,r++;do{}while(h[++s]===h[++r]&&h[++s]===h[++r]&&h[++s]===h[++r]&&h[++s]===h[++r]&&h[++s]===h[++r]&&h[++s]===h[++r]&&h[++s]===h[++r]&&h[++s]===h[++r]&&s<d);if(n=w-(d-s),s=d-w,a<n){if(e.match_start=t,o<=(a=n))break;c=h[s+a-1],p=h[s+a]}}}while((t=l[t&f])>u&&0!=--i);return a<=e.lookahead?a:e.lookahead}function T(e){var t,r,n,i,s,a,o,u,h,f,l=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=l+(l-y)){for(d.arraySet(e.window,e.window,l,l,0),e.match_start-=l,e.strstart-=l,e.block_start-=l,t=r=e.hash_size;n=e.head[--t],e.head[t]=l<=n?n-l:0,--r;);for(t=r=l;n=e.prev[--t],e.prev[t]=l<=n?n-l:0,--r;);i+=l}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,u=e.strstart+e.lookahead,f=void 0,(h=i)<(f=a.avail_in)&&(f=h),r=0===f?0:(a.avail_in-=f,d.arraySet(o,a.input,a.next_in,f,u),1===a.state.wrap?a.adler=c(a.adler,o,f,u):2===a.state.wrap&&(a.adler=p(a.adler,o,f,u)),a.next_in+=f,a.total_in+=f,f),e.lookahead+=r,e.lookahead+e.insert>=b)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<<e.hash_shift^e.window[s+1])&e.hash_mask;e.insert&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[s+b-1])&e.hash_mask,e.prev[s&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=s,s++,e.insert--,!(e.lookahead+e.insert<b)););}while(e.lookahead<y&&0!==e.strm.avail_in)}function R(e,t){for(var r,n;;){if(e.lookahead<y){if(T(e),e.lookahead<y&&t===f)return 1;if(0===e.lookahead)break}if(r=0,e.lookahead>=b&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+b-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),0!==r&&e.strstart-r<=e.w_size-y&&(e.match_length=B(e,r)),e.match_length>=b)if(n=h._tr_tally(e,e.strstart-e.match_start,e.match_length-b),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=b){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+b-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart,0!=--e.match_length;);e.strstart++}else e.strstart+=e.match_length,e.match_length=0,e.ins_h=e.window[e.strstart],e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+1])&e.hash_mask;else n=h._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++;if(n&&(A(e,!1),0===e.strm.avail_out))return 1}return e.insert=e.strstart<b-1?e.strstart:b-1,4===t?(A(e,!0),0===e.strm.avail_out?3:4):e.last_lit&&(A(e,!1),0===e.strm.avail_out)?1:2}function D(e,t){for(var r,n,i;;){if(e.lookahead<y){if(T(e),e.lookahead<y&&t===f)return 1;if(0===e.lookahead)break}if(r=0,e.lookahead>=b&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+b-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),e.prev_length=e.match_length,e.prev_match=e.match_start,e.match_length=b-1,0!==r&&e.prev_length<e.max_lazy_match&&e.strstart-r<=e.w_size-y&&(e.match_length=B(e,r),e.match_length<=5&&(1===e.strategy||e.match_length===b&&4096<e.strstart-e.match_start)&&(e.match_length=b-1)),e.prev_length>=b&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-b,n=h._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-b),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+b-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),0!=--e.prev_length;);if(e.match_available=0,e.match_length=b-1,e.strstart++,n&&(A(e,!1),0===e.strm.avail_out))return 1}else if(e.match_available){if((n=h._tr_tally(e,0,e.window[e.strstart-1]))&&A(e,!1),e.strstart++,e.lookahead--,0===e.strm.avail_out)return 1}else e.match_available=1,e.strstart++,e.lookahead--}return e.match_available&&(n=h._tr_tally(e,0,e.window[e.strstart-1]),e.match_available=0),e.insert=e.strstart<b-1?e.strstart:b-1,4===t?(A(e,!0),0===e.strm.avail_out?3:4):e.last_lit&&(A(e,!1),0===e.strm.avail_out)?1:2}function F(e,t,r,n,i){this.good_length=e,this.max_lazy=t,this.nice_length=r,this.max_chain=n,this.func=i}function N(){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 d.Buf16(2*g),this.dyn_dtree=new d.Buf16(2*(2*a+1)),this.bl_tree=new d.Buf16(2*(2*o+1)),E(this.dyn_ltree),E(this.dyn_dtree),E(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new d.Buf16(v+1),this.heap=new d.Buf16(2*s+1),E(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new d.Buf16(2*s+1),E(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 U(e){var t;return e&&e.state?(e.total_in=e.total_out=0,e.data_type=i,(t=e.state).pending=0,t.pending_out=0,t.wrap<0&&(t.wrap=-t.wrap),t.status=t.wrap?k:x,e.adler=2===t.wrap?0:1,t.last_flush=f,h._tr_init(t),l):S(e,m)}function P(e){var t,r=U(e);return r===l&&((t=e.state).window_size=2*t.w_size,E(t.head),t.max_lazy_match=u[t.level].max_lazy,t.good_match=u[t.level].good_length,t.nice_match=u[t.level].nice_length,t.max_chain_length=u[t.level].max_chain,t.strstart=0,t.block_start=0,t.lookahead=0,t.insert=0,t.match_length=t.prev_length=b-1,t.match_available=0,t.ins_h=0),r}function L(e,t,r,n,i,s){if(!e)return m;var a=1;if(-1===t&&(t=6),n<0?(a=0,n=-n):15<n&&(a=2,n-=16),i<1||9<i||r!==_||n<8||15<n||t<0||9<t||s<0||4<s)return S(e,m);8===n&&(n=9);var o=new N;return(e.state=o).strm=e,o.wrap=a,o.gzhead=null,o.w_bits=n,o.w_size=1<<o.w_bits,o.w_mask=o.w_size-1,o.hash_bits=i+7,o.hash_size=1<<o.hash_bits,o.hash_mask=o.hash_size-1,o.hash_shift=~~((o.hash_bits+b-1)/b),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<<i+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=t,o.strategy=s,o.method=r,P(e)}u=[new F(0,0,0,0,function(e,t){var r=65535;for(r>e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(T(e),0===e.lookahead&&t===f)return 1;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,A(e,!1),0===e.strm.avail_out))return 1;if(e.strstart-e.block_start>=e.w_size-y&&(A(e,!1),0===e.strm.avail_out))return 1}return e.insert=0,4===t?(A(e,!0),0===e.strm.avail_out?3:4):(e.strstart>e.block_start&&(A(e,!1),e.strm.avail_out),1)}),new F(4,4,8,4,R),new F(4,5,16,8,R),new F(4,6,32,32,R),new F(4,4,16,16,D),new F(8,16,32,32,D),new F(8,16,128,128,D),new F(8,32,128,256,D),new F(32,128,258,1024,D),new F(32,258,258,4096,D)],r.deflateInit=function(e,t){return L(e,t,_,15,8,0)},r.deflateInit2=L,r.deflateReset=P,r.deflateResetKeep=U,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?m:(e.state.gzhead=t,l):m},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5<t||t<0)return e?S(e,m):m;if(n=e.state,!e.output||!e.input&&0!==e.avail_in||666===n.status&&4!==t)return S(e,0===e.avail_out?-5:m);if(n.strm=e,r=n.last_flush,n.last_flush=t,n.status===k)if(2===n.wrap)e.adler=0,I(n,31),I(n,139),I(n,8),n.gzhead?(I(n,(n.gzhead.text?1:0)+(n.gzhead.hcrc?2:0)+(n.gzhead.extra?4:0)+(n.gzhead.name?8:0)+(n.gzhead.comment?16:0)),I(n,255&n.gzhead.time),I(n,n.gzhead.time>>8&255),I(n,n.gzhead.time>>16&255),I(n,n.gzhead.time>>24&255),I(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),I(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(I(n,255&n.gzhead.extra.length),I(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(I(n,0),I(n,0),I(n,0),I(n,0),I(n,0),I(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),I(n,3),n.status=x);else{var a=_+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=x,O(n,a),0!==n.strstart&&(O(n,e.adler>>>16),O(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),C(e),i=n.pending,n.pending!==n.pending_buf_size));)I(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),C(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindex<n.gzhead.name.length?255&n.gzhead.name.charCodeAt(n.gzindex++):0,I(n,s)}while(0!==s);n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),C(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindex<n.gzhead.comment.length?255&n.gzhead.comment.charCodeAt(n.gzindex++):0,I(n,s)}while(0!==s);n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&C(e),n.pending+2<=n.pending_buf_size&&(I(n,255&e.adler),I(n,e.adler>>8&255),e.adler=0,n.status=x)):n.status=x),0!==n.pending){if(C(e),0===e.avail_out)return n.last_flush=-1,l}else if(0===e.avail_in&&z(t)<=z(r)&&4!==t)return S(e,-5);if(666===n.status&&0!==e.avail_in)return S(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==f&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(T(e),0===e.lookahead)){if(t===f)return 1;break}if(e.match_length=0,r=h._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(A(e,!1),0===e.strm.avail_out))return 1}return e.insert=0,4===t?(A(e,!0),0===e.strm.avail_out?3:4):e.last_lit&&(A(e,!1),0===e.strm.avail_out)?1:2}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=w){if(T(e),e.lookahead<=w&&t===f)return 1;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=b&&0<e.strstart&&(n=a[i=e.strstart-1])===a[++i]&&n===a[++i]&&n===a[++i]){s=e.strstart+w;do{}while(n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&i<s);e.match_length=w-(s-i),e.match_length>e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=b?(r=h._tr_tally(e,1,e.match_length-b),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=h._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(A(e,!1),0===e.strm.avail_out))return 1}return e.insert=0,4===t?(A(e,!0),0===e.strm.avail_out?3:4):e.last_lit&&(A(e,!1),0===e.strm.avail_out)?1:2}(n,t):u[n.level].func(n,t);if(3!==o&&4!==o||(n.status=666),1===o||3===o)return 0===e.avail_out&&(n.last_flush=-1),l;if(2===o&&(1===t?h._tr_align(n):5!==t&&(h._tr_stored_block(n,0,0,!1),3===t&&(E(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),C(e),0===e.avail_out))return n.last_flush=-1,l}return 4!==t?l:n.wrap<=0?1:(2===n.wrap?(I(n,255&e.adler),I(n,e.adler>>8&255),I(n,e.adler>>16&255),I(n,e.adler>>24&255),I(n,255&e.total_in),I(n,e.total_in>>8&255),I(n,e.total_in>>16&255),I(n,e.total_in>>24&255)):(O(n,e.adler>>>16),O(n,65535&e.adler)),C(e),0<n.wrap&&(n.wrap=-n.wrap),0!==n.pending?l:1)},r.deflateEnd=function(e){var t;return e&&e.state?(t=e.state.status)!==k&&69!==t&&73!==t&&91!==t&&103!==t&&t!==x&&666!==t?S(e,m):(e.state=null,t===x?S(e,-3):l):m},r.deflateSetDictionary=function(e,t){var r,n,i,s,a,o,u,h,f=t.length;if(!e||!e.state)return m;if(2===(s=(r=e.state).wrap)||1===s&&r.status!==k||r.lookahead)return m;for(1===s&&(e.adler=c(e.adler,t,f,0)),r.wrap=0,f>=r.w_size&&(0===s&&(E(r.head),r.strstart=0,r.block_start=0,r.insert=0),h=new d.Buf8(r.w_size),d.arraySet(h,t,f-r.w_size,r.w_size,0),t=h,f=r.w_size),a=e.avail_in,o=e.next_in,u=e.input,e.avail_in=f,e.next_in=0,e.input=t,T(r);r.lookahead>=b;){for(n=r.strstart,i=r.lookahead-(b-1);r.ins_h=(r.ins_h<<r.hash_shift^r.window[n+b-1])&r.hash_mask,r.prev[n&r.w_mask]=r.head[r.ins_h],r.head[r.ins_h]=n,n++,--i;);r.strstart=n,r.lookahead=b-1,T(r)}return r.strstart+=r.lookahead,r.block_start=r.strstart,r.insert=r.lookahead,r.lookahead=0,r.match_length=r.prev_length=b-1,r.match_available=0,e.next_in=o,e.input=u,e.avail_in=a,r.wrap=s,l},r.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":41,"./adler32":43,"./crc32":45,"./messages":51,"./trees":52}],47:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";t.exports=function(e,t){var r,n,i,s,a,o,u,h,f,l,d,c,p,m,_,g,v,b,w,y,k,x,S,z,E;r=e.state,n=e.next_in,z=e.input,i=n+(e.avail_in-5),s=e.next_out,E=e.output,a=s-(t-e.avail_out),o=s+(e.avail_out-257),u=r.dmax,h=r.wsize,f=r.whave,l=r.wnext,d=r.window,c=r.hold,p=r.bits,m=r.lencode,_=r.distcode,g=(1<<r.lenbits)-1,v=(1<<r.distbits)-1;e:do{p<15&&(c+=z[n++]<<p,p+=8,c+=z[n++]<<p,p+=8),b=m[c&g];t:for(;;){if(c>>>=w=b>>>24,p-=w,0==(w=b>>>16&255))E[s++]=65535&b;else{if(!(16&w)){if(0==(64&w)){b=m[(65535&b)+(c&(1<<w)-1)];continue t}if(32&w){r.mode=12;break e}e.msg="invalid literal/length code",r.mode=30;break e}y=65535&b,(w&=15)&&(p<w&&(c+=z[n++]<<p,p+=8),y+=c&(1<<w)-1,c>>>=w,p-=w),p<15&&(c+=z[n++]<<p,p+=8,c+=z[n++]<<p,p+=8),b=_[c&v];r:for(;;){if(c>>>=w=b>>>24,p-=w,!(16&(w=b>>>16&255))){if(0==(64&w)){b=_[(65535&b)+(c&(1<<w)-1)];continue r}e.msg="invalid distance code",r.mode=30;break e}if(k=65535&b,p<(w&=15)&&(c+=z[n++]<<p,(p+=8)<w&&(c+=z[n++]<<p,p+=8)),u<(k+=c&(1<<w)-1)){e.msg="invalid distance too far back",r.mode=30;break e}if(c>>>=w,p-=w,(w=s-a)<k){if(f<(w=k-w)&&r.sane){e.msg="invalid distance too far back",r.mode=30;break e}if(S=d,(x=0)===l){if(x+=h-w,w<y){for(y-=w;E[s++]=d[x++],--w;);x=s-k,S=E}}else if(l<w){if(x+=h+l-w,(w-=l)<y){for(y-=w;E[s++]=d[x++],--w;);if(x=0,l<y){for(y-=w=l;E[s++]=d[x++],--w;);x=s-k,S=E}}}else if(x+=l-w,w<y){for(y-=w;E[s++]=d[x++],--w;);x=s-k,S=E}for(;2<y;)E[s++]=S[x++],E[s++]=S[x++],E[s++]=S[x++],y-=3;y&&(E[s++]=S[x++],1<y&&(E[s++]=S[x++]))}else{for(x=s-k;E[s++]=E[x++],E[s++]=E[x++],E[s++]=E[x++],2<(y-=3););y&&(E[s++]=E[x++],1<y&&(E[s++]=E[x++]))}break}}break}}while(n<i&&s<o);n-=y=p>>3,c&=(1<<(p-=y<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n<i?i-n+5:5-(n-i),e.avail_out=s<o?o-s+257:257-(s-o),r.hold=c,r.bits=p}},{}],49:[function(e,t,r){"use strict";var I=e("../utils/common"),O=e("./adler32"),B=e("./crc32"),T=e("./inffast"),R=e("./inftrees"),D=1,F=2,N=0,U=-2,P=1,n=852,i=592;function L(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<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(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function u(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15<t)?U:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=r,n.wbits=t,o(e))):U}function h(e,t){var r,n;return e?(n=new s,(e.state=n).window=null,(r=u(e,t))!==N&&(e.state=null),r):U}var f,l,d=!0;function j(e){if(d){var t;for(f=new I.Buf32(512),l=new I.Buf32(32),t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(R(D,e.lens,0,288,f,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;R(F,e.lens,0,32,l,0,e.work,{bits:5}),d=!1}e.lencode=f,e.lenbits=9,e.distcode=l,e.distbits=5}function Z(e,t,r,n){var i,s=e.state;return null===s.window&&(s.wsize=1<<s.wbits,s.wnext=0,s.whave=0,s.window=new I.Buf8(s.wsize)),n>=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave<s.wsize&&(s.whave+=i))),0}r.inflateReset=o,r.inflateReset2=u,r.inflateResetKeep=a,r.inflateInit=function(e){return h(e,15)},r.inflateInit2=h,r.inflate=function(e,t){var r,n,i,s,a,o,u,h,f,l,d,c,p,m,_,g,v,b,w,y,k,x,S,z,E=0,C=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(!e||!e.state||!e.output||!e.input&&0!==e.avail_in)return U;12===(r=e.state).mode&&(r.mode=13),a=e.next_out,i=e.output,u=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,h=r.hold,f=r.bits,l=o,d=u,x=N;e:for(;;)switch(r.mode){case P:if(0===r.wrap){r.mode=13;break}for(;f<16;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if(2&r.wrap&&35615===h){C[r.check=0]=255&h,C[1]=h>>>8&255,r.check=B(r.check,C,2,0),f=h=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&h)<<8)+(h>>8))%31){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&h)){e.msg="unknown compression method",r.mode=30;break}if(f-=4,k=8+(15&(h>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){e.msg="invalid window size",r.mode=30;break}r.dmax=1<<k,e.adler=r.check=1,r.mode=512&h?10:12,f=h=0;break;case 2:for(;f<16;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if(r.flags=h,8!=(255&r.flags)){e.msg="unknown compression method",r.mode=30;break}if(57344&r.flags){e.msg="unknown header flags set",r.mode=30;break}r.head&&(r.head.text=h>>8&1),512&r.flags&&(C[0]=255&h,C[1]=h>>>8&255,r.check=B(r.check,C,2,0)),f=h=0,r.mode=3;case 3:for(;f<32;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}r.head&&(r.head.time=h),512&r.flags&&(C[0]=255&h,C[1]=h>>>8&255,C[2]=h>>>16&255,C[3]=h>>>24&255,r.check=B(r.check,C,4,0)),f=h=0,r.mode=4;case 4:for(;f<16;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}r.head&&(r.head.xflags=255&h,r.head.os=h>>8),512&r.flags&&(C[0]=255&h,C[1]=h>>>8&255,r.check=B(r.check,C,2,0)),f=h=0,r.mode=5;case 5:if(1024&r.flags){for(;f<16;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}r.length=h,r.head&&(r.head.extra_len=h),512&r.flags&&(C[0]=255&h,C[1]=h>>>8&255,r.check=B(r.check,C,2,0)),f=h=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,n,s,c,k)),512&r.flags&&(r.check=B(r.check,n,c,s)),o-=c,s+=c,r.length-=c),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(c=0;k=n[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,n,c,s)),o-=c,s+=c,k)break e}else r.head&&(r.head.name=null);r.length=0,r.mode=8;case 8:if(4096&r.flags){if(0===o)break e;for(c=0;k=n[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,n,c,s)),o-=c,s+=c,k)break e}else r.head&&(r.head.comment=null);r.mode=9;case 9:if(512&r.flags){for(;f<16;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if(h!==(65535&r.check)){e.msg="header crc mismatch",r.mode=30;break}f=h=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;f<32;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}e.adler=r.check=L(h),f=h=0,r.mode=11;case 11:if(0===r.havedict)return e.next_out=a,e.avail_out=u,e.next_in=s,e.avail_in=o,r.hold=h,r.bits=f,2;e.adler=r.check=1,r.mode=12;case 12:if(5===t||6===t)break e;case 13:if(r.last){h>>>=7&f,f-=7&f,r.mode=27;break}for(;f<3;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}switch(r.last=1&h,f-=1,3&(h>>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==t)break;h>>>=2,f-=2;break e;case 2:r.mode=17;break;case 3:e.msg="invalid block type",r.mode=30}h>>>=2,f-=2;break;case 14:for(h>>>=7&f,f-=7&f;f<32;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if((65535&h)!=(h>>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&h,f=h=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(c=r.length){if(o<c&&(c=o),u<c&&(c=u),0===c)break e;I.arraySet(i,n,s,c,a),o-=c,s+=c,u-=c,a+=c,r.length-=c;break}r.mode=12;break;case 17:for(;f<14;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if(r.nlen=257+(31&h),h>>>=5,f-=5,r.ndist=1+(31&h),h>>>=5,f-=5,r.ncode=4+(15&h),h>>>=4,f-=4,286<r.nlen||30<r.ndist){e.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(;f<3;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}r.lens[A[r.have++]]=7&h,h>>>=3,f-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=R(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.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=(E=r.lencode[h&(1<<r.lenbits)-1])>>>16&255,v=65535&E,!((_=E>>>24)<=f);){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if(v<16)h>>>=_,f-=_,r.lens[r.have++]=v;else{if(16===v){for(z=_+2;f<z;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if(h>>>=_,f-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],c=3+(3&h),h>>>=2,f-=2}else if(17===v){for(z=_+3;f<z;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}f-=_,k=0,c=3+(7&(h>>>=_)),h>>>=3,f-=3}else{for(z=_+7;f<z;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}f-=_,k=0,c=11+(127&(h>>>=_)),h>>>=7,f-=7}if(r.have+c>r.nlen+r.ndist){e.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]){e.msg="invalid code -- missing end-of-block",r.mode=30;break}if(r.lenbits=9,S={bits:r.lenbits},x=R(D,r.lens,0,r.nlen,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid literal/lengths set",r.mode=30;break}if(r.distbits=6,r.distcode=r.distdyn,S={bits:r.distbits},x=R(F,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,S),r.distbits=S.bits,x){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=u){e.next_out=a,e.avail_out=u,e.next_in=s,e.avail_in=o,r.hold=h,r.bits=f,T(e,d),a=e.next_out,i=e.output,u=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,h=r.hold,f=r.bits,12===r.mode&&(r.back=-1);break}for(r.back=0;g=(E=r.lencode[h&(1<<r.lenbits)-1])>>>16&255,v=65535&E,!((_=E>>>24)<=f);){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if(g&&0==(240&g)){for(b=_,w=g,y=v;g=(E=r.lencode[y+((h&(1<<b+w)-1)>>b)])>>>16&255,v=65535&E,!(b+(_=E>>>24)<=f);){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}h>>>=b,f-=b,r.back+=b}if(h>>>=_,f-=_,r.back+=_,r.length=v,0===g){r.mode=26;break}if(32&g){r.back=-1,r.mode=12;break}if(64&g){e.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;f<z;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}r.length+=h&(1<<r.extra)-1,h>>>=r.extra,f-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;g=(E=r.distcode[h&(1<<r.distbits)-1])>>>16&255,v=65535&E,!((_=E>>>24)<=f);){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if(0==(240&g)){for(b=_,w=g,y=v;g=(E=r.distcode[y+((h&(1<<b+w)-1)>>b)])>>>16&255,v=65535&E,!(b+(_=E>>>24)<=f);){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}h>>>=b,f-=b,r.back+=b}if(h>>>=_,f-=_,r.back+=_,64&g){e.msg="invalid distance code",r.mode=30;break}r.offset=v,r.extra=15&g,r.mode=24;case 24:if(r.extra){for(z=r.extra;f<z;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}r.offset+=h&(1<<r.extra)-1,h>>>=r.extra,f-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===u)break e;if(c=d-u,r.offset>c){if((c=r.offset-c)>r.whave&&r.sane){e.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=i,p=a-r.offset,c=r.length;for(u<c&&(c=u),u-=c,r.length-=c;i[a++]=m[p++],--c;);0===r.length&&(r.mode=21);break;case 26:if(0===u)break e;i[a++]=r.length,u--,r.mode=21;break;case 27:if(r.wrap){for(;f<32;){if(0===o)break e;o--,h|=n[s++]<<f,f+=8}if(d-=u,e.total_out+=d,r.total+=d,d&&(e.adler=r.check=r.flags?B(r.check,i,d,a-d):O(r.check,i,d,a-d)),d=u,(r.flags?h:L(h))!==r.check){e.msg="incorrect data check",r.mode=30;break}f=h=0}r.mode=28;case 28:if(r.wrap&&r.flags){for(;f<32;){if(0===o)break e;o--,h+=n[s++]<<f,f+=8}if(h!==(4294967295&r.total)){e.msg="incorrect length check",r.mode=30;break}f=h=0}r.mode=29;case 29:x=1;break e;case 30:x=-3;break e;case 31:return-4;case 32:default:return U}return e.next_out=a,e.avail_out=u,e.next_in=s,e.avail_in=o,r.hold=h,r.bits=f,(r.wsize||d!==e.avail_out&&r.mode<30&&(r.mode<27||4!==t))&&Z(e,e.output,e.next_out,d-e.avail_out)?(r.mode=31,-4):(l-=e.avail_in,d-=e.avail_out,e.total_in+=l,e.total_out+=d,r.total+=d,r.wrap&&d&&(e.adler=r.check=r.flags?B(r.check,i,d,e.next_out-d):O(r.check,i,d,e.next_out-d)),e.data_type=r.bits+(r.last?64:0)+(12===r.mode?128:0)+(20===r.mode||15===r.mode?256:0),(0==l&&0===d||4===t)&&x===N&&(x=-5),x)},r.inflateEnd=function(e){if(!e||!e.state)return U;var t=e.state;return t.window&&(t.window=null),e.state=null,N},r.inflateGetHeader=function(e,t){var r;return e&&e.state?0==(2&(r=e.state).wrap)?U:((r.head=t).done=!1,N):U},r.inflateSetDictionary=function(e,t){var r,n=t.length;return e&&e.state?0!==(r=e.state).wrap&&11!==r.mode?U:11===r.mode&&O(1,t,n,0)!==r.check?-3:Z(e,t,n,n)?(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(e,t,r){"use strict";var D=e("../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];t.exports=function(e,t,r,n,i,s,a,o){var u,h,f,l,d,c,p,m,_,g=o.bits,v=0,b=0,w=0,y=0,k=0,x=0,S=0,z=0,E=0,C=0,A=null,I=0,O=new D.Buf16(16),B=new D.Buf16(16),T=null,R=0;for(v=0;v<=15;v++)O[v]=0;for(b=0;b<n;b++)O[t[r+b]]++;for(k=g,y=15;1<=y&&0===O[y];y--);if(y<k&&(k=y),0===y)return i[s++]=20971520,i[s++]=20971520,o.bits=1,0;for(w=1;w<y&&0===O[w];w++);for(k<w&&(k=w),v=z=1;v<=15;v++)if(z<<=1,(z-=O[v])<0)return-1;if(0<z&&(0===e||1!==y))return-1;for(B[1]=0,v=1;v<15;v++)B[v+1]=B[v]+O[v];for(b=0;b<n;b++)0!==t[r+b]&&(a[B[t[r+b]]++]=b);if(c=0===e?(A=T=a,19):1===e?(A=F,I-=257,T=N,R-=257,256):(A=U,T=P,-1),v=w,d=s,S=b=C=0,f=-1,l=(E=1<<(x=k))-1,1===e&&852<E||2===e&&592<E)return 1;for(;;){for(p=v-S,_=a[b]<c?(m=0,a[b]):a[b]>c?(m=T[R+a[b]],A[I+a[b]]):(m=96,0),u=1<<v-S,w=h=1<<x;i[d+(C>>S)+(h-=u)]=p<<24|m<<16|_|0,0!==h;);for(u=1<<v-1;C&u;)u>>=1;if(0!==u?(C&=u-1,C+=u):C=0,b++,0==--O[v]){if(v===y)break;v=t[r+a[b]]}if(k<v&&(C&l)!==f){for(0===S&&(S=k),d+=w,z=1<<(x=v-S);x+S<y&&!((z-=O[x+S])<=0);)x++,z<<=1;if(E+=1<<x,1===e&&852<E||2===e&&592<E)return 1;i[f=C&l]=k<<24|x<<16|d-s|0}}return 0!==C&&(i[d+C]=v-S<<24|64<<16|0),o.bits=k,0}},{"../utils/common":41}],51:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";var o=e("../utils/common");function n(e){for(var t=e.length;0<=--t;)e[t]=0}var _=15,i=16,u=[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],h=[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],a=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],f=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],l=new Array(576);n(l);var d=new Array(60);n(d);var c=new Array(512);n(c);var p=new Array(256);n(p);var m=new Array(29);n(m);var g,v,b,w=new Array(30);function y(e,t,r,n,i){this.static_tree=e,this.extra_bits=t,this.extra_base=r,this.elems=n,this.max_length=i,this.has_stree=e&&e.length}function s(e,t){this.dyn_tree=e,this.max_code=0,this.stat_desc=t}function k(e){return e<256?c[e]:c[256+(e>>>7)]}function x(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function S(e,t,r){e.bi_valid>i-r?(e.bi_buf|=t<<e.bi_valid&65535,x(e,e.bi_buf),e.bi_buf=t>>i-e.bi_valid,e.bi_valid+=r-i):(e.bi_buf|=t<<e.bi_valid&65535,e.bi_valid+=r)}function z(e,t,r){S(e,r[2*t],r[2*t+1])}function E(e,t){for(var r=0;r|=1&e,e>>>=1,r<<=1,0<--t;);return r>>>1}function C(e,t,r){var n,i,s=new Array(_+1),a=0;for(n=1;n<=_;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=E(s[o]++,o))}}function A(e){var t;for(t=0;t<286;t++)e.dyn_ltree[2*t]=0;for(t=0;t<30;t++)e.dyn_dtree[2*t]=0;for(t=0;t<19;t++)e.bl_tree[2*t]=0;e.dyn_ltree[512]=1,e.opt_len=e.static_len=0,e.last_lit=e.matches=0}function I(e){8<e.bi_valid?x(e,e.bi_buf):0<e.bi_valid&&(e.pending_buf[e.pending++]=e.bi_buf),e.bi_buf=0,e.bi_valid=0}function O(e,t,r,n){var i=2*t,s=2*r;return e[i]<e[s]||e[i]===e[s]&&n[t]<=n[r]}function B(e,t,r){for(var n=e.heap[r],i=r<<1;i<=e.heap_len&&(i<e.heap_len&&O(t,e.heap[i+1],e.heap[i],e.depth)&&i++,!O(t,n,e.heap[i],e.depth));)e.heap[r]=e.heap[i],r=i,i<<=1;e.heap[r]=n}function T(e,t,r){var n,i,s,a,o=0;if(0!==e.last_lit)for(;n=e.pending_buf[e.d_buf+2*o]<<8|e.pending_buf[e.d_buf+2*o+1],i=e.pending_buf[e.l_buf+o],o++,0===n?z(e,i,t):(z(e,(s=p[i])+256+1,t),0!==(a=u[s])&&S(e,i-=m[s],a),z(e,s=k(--n),r),0!==(a=h[s])&&S(e,n-=w[s],a)),o<e.last_lit;);z(e,256,t)}function R(e,t){var r,n,i,s=t.dyn_tree,a=t.stat_desc.static_tree,o=t.stat_desc.has_stree,u=t.stat_desc.elems,h=-1;for(e.heap_len=0,e.heap_max=573,r=0;r<u;r++)0!==s[2*r]?(e.heap[++e.heap_len]=h=r,e.depth[r]=0):s[2*r+1]=0;for(;e.heap_len<2;)s[2*(i=e.heap[++e.heap_len]=h<2?++h:0)]=1,e.depth[i]=0,e.opt_len--,o&&(e.static_len-=a[2*i+1]);for(t.max_code=h,r=e.heap_len>>1;1<=r;r--)B(e,s,r);for(i=u;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],B(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,B(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,u=t.dyn_tree,h=t.max_code,f=t.stat_desc.static_tree,l=t.stat_desc.has_stree,d=t.stat_desc.extra_bits,c=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=_;s++)e.bl_count[s]=0;for(u[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<573;r++)p<(s=u[2*u[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),u[2*n+1]=s,h<n||(e.bl_count[s]++,a=0,c<=n&&(a=d[n-c]),o=u[2*n],e.opt_len+=o*(s+a),l&&(e.static_len+=o*(f[2*n+1]+a)));if(0!==m){do{for(s=p-1;0===e.bl_count[s];)s--;e.bl_count[s]--,e.bl_count[s+1]+=2,e.bl_count[p]--,m-=2}while(0<m);for(s=p;0!==s;s--)for(n=e.bl_count[s];0!==n;)h<(i=e.heap[--r])||(u[2*i+1]!==s&&(e.opt_len+=(s-u[2*i+1])*u[2*i],u[2*i+1]=s),n--)}}(e,t),C(s,h,e.bl_count)}function D(e,t,r){var n,i,s=-1,a=t[1],o=0,u=7,h=4;for(0===a&&(u=138,h=3),t[2*(r+1)+1]=65535,n=0;n<=r;n++)i=a,a=t[2*(n+1)+1],++o<u&&i===a||(o<h?e.bl_tree[2*i]+=o:0!==i?(i!==s&&e.bl_tree[2*i]++,e.bl_tree[32]++):o<=10?e.bl_tree[34]++:e.bl_tree[36]++,s=i,h=(o=0)===a?(u=138,3):i===a?(u=6,3):(u=7,4))}function F(e,t,r){var n,i,s=-1,a=t[1],o=0,u=7,h=4;for(0===a&&(u=138,h=3),n=0;n<=r;n++)if(i=a,a=t[2*(n+1)+1],!(++o<u&&i===a)){if(o<h)for(;z(e,i,e.bl_tree),0!=--o;);else 0!==i?(i!==s&&(z(e,i,e.bl_tree),o--),z(e,16,e.bl_tree),S(e,o-3,2)):o<=10?(z(e,17,e.bl_tree),S(e,o-3,3)):(z(e,18,e.bl_tree),S(e,o-11,7));s=i,h=(o=0)===a?(u=138,3):i===a?(u=6,3):(u=7,4)}}n(w);var N=!1;function U(e,t,r,n){var i,s,a;S(e,0+(n?1:0),3),s=t,a=r,I(i=e),x(i,a),x(i,~a),o.arraySet(i.pending_buf,i.window,s,a,i.pending),i.pending+=a}r._tr_init=function(e){N||(function(){var e,t,r,n,i,s=new Array(_+1);for(n=r=0;n<28;n++)for(m[n]=r,e=0;e<1<<u[n];e++)p[r++]=n;for(p[r-1]=n,n=i=0;n<16;n++)for(w[n]=i,e=0;e<1<<h[n];e++)c[i++]=n;for(i>>=7;n<30;n++)for(w[n]=i<<7,e=0;e<1<<h[n]-7;e++)c[256+i++]=n;for(t=0;t<=_;t++)s[t]=0;for(e=0;e<=143;)l[2*e+1]=8,e++,s[8]++;for(;e<=255;)l[2*e+1]=9,e++,s[9]++;for(;e<=279;)l[2*e+1]=7,e++,s[7]++;for(;e<=287;)l[2*e+1]=8,e++,s[8]++;for(C(l,287,s),e=0;e<30;e++)d[2*e+1]=5,d[2*e]=E(e,5);g=new y(l,u,257,286,_),v=new y(d,h,0,30,_),b=new y(new Array(0),a,0,19,7)}(),N=!0),e.l_desc=new s(e.dyn_ltree,g),e.d_desc=new s(e.dyn_dtree,v),e.bl_desc=new s(e.bl_tree,b),e.bi_buf=0,e.bi_valid=0,A(e)},r._tr_stored_block=U,r._tr_flush_block=function(e,t,r,n){var i,s,a=0;0<e.level?(2===e.strm.data_type&&(e.strm.data_type=function(e){var t,r=4093624447;for(t=0;t<=31;t++,r>>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return 0;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return 1;for(t=32;t<256;t++)if(0!==e.dyn_ltree[2*t])return 1;return 0}(e)),R(e,e.l_desc),R(e,e.d_desc),a=function(e){var t;for(D(e,e.dyn_ltree,e.l_desc.max_code),D(e,e.dyn_dtree,e.d_desc.max_code),R(e,e.bl_desc),t=18;3<=t&&0===e.bl_tree[2*f[t]+1];t--);return e.opt_len+=3*(t+1)+5+5+4,t}(e),i=e.opt_len+3+7>>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?U(e,t,r,n):4===e.strategy||s===i?(S(e,2+(n?1:0),3),T(e,l,d)):(S(e,4+(n?1:0),3),function(e,t,r,n){var i;for(S(e,t-257,5),S(e,r-1,5),S(e,n-4,4),i=0;i<n;i++)S(e,e.bl_tree[2*f[i]+1],3);F(e,e.dyn_ltree,t-1),F(e,e.dyn_dtree,r-1)}(e,e.l_desc.max_code+1,e.d_desc.max_code+1,a+1),T(e,e.dyn_ltree,e.dyn_dtree)),A(e),n&&I(e)},r._tr_tally=function(e,t,r){return e.pending_buf[e.d_buf+2*e.last_lit]=t>>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(p[r]+256+1)]++,e.dyn_dtree[2*k(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){var t;S(e,2,3),z(e,256,l),16===(t=e).bi_valid?(x(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)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";t.exports="function"==typeof setImmediate?setImmediate:function(){var e=[].slice.apply(arguments);e.splice(1,0,0),setTimeout.apply(null,e)}},{}]},{},[10])(10)})}).call(this,void 0!==r?r:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}]},{},[1])(1)})}).call(this,void 0!==r?r:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}]},{},[1])(1)})}).call(this,void 0!==r?r:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}]},{},[1])(1)})}).call(this,void 0!==r?r:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}]},{},[1])(1)})}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/cps/templates/read.html b/cps/templates/read.html
index 66ba9b4be..d491272d1 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -99,7 +99,7 @@
       </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 src="{{ url_for('static', filename='js/compress/jszip.js') }}">
       </script> <script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
       <script type="text/javascript">
           window.calibre = {

From c5e539bbcda4fd478351a4c2397ab1e8c9137d37 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 25 Dec 2022 16:11:29 +0100
Subject: [PATCH 365/412] Bump jszip

---
 cps/static/js/compress/jszip.js | 9152 +------------------------------
 1 file changed, 5 insertions(+), 9147 deletions(-)

diff --git a/cps/static/js/compress/jszip.js b/cps/static/js/compress/jszip.js
index 1546d7fcb..ff4cfd5e8 100644
--- a/cps/static/js/compress/jszip.js
+++ b/cps/static/js/compress/jszip.js
@@ -1,9155 +1,13 @@
 /*!
 
-JSZip - A Javascript class for generating and reading zip files
+JSZip v3.10.1 - A JavaScript class for generating and reading zip files
 <http://stuartk.com/jszip>
 
-(c) 2009-2014 Stuart Knightley <stuart [at] stuartk.com>
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
+(c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown.
 
 JSZip uses the library pako released under the MIT license :
-https://github.com/nodeca/pako/blob/master/LICENSE
+https://github.com/nodeca/pako/blob/main/LICENSE
 */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.JSZip=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
-'use strict';
-// private property
-var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
-
-// public method for encoding
-exports.encode = function(input, utf8) {
-    var output = "";
-    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-    var i = 0;
-
-    while (i < input.length) {
-
-        chr1 = input.charCodeAt(i++);
-        chr2 = input.charCodeAt(i++);
-        chr3 = input.charCodeAt(i++);
-
-        enc1 = chr1 >> 2;
-        enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-        enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-        enc4 = chr3 & 63;
-
-        if (isNaN(chr2)) {
-            enc3 = enc4 = 64;
-        }
-        else if (isNaN(chr3)) {
-            enc4 = 64;
-        }
-
-        output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
-
-    }
-
-    return output;
-};
-
-// public method for decoding
-exports.decode = function(input, utf8) {
-    var output = "";
-    var chr1, chr2, chr3;
-    var enc1, enc2, enc3, enc4;
-    var i = 0;
-
-    input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-
-    while (i < input.length) {
-
-        enc1 = _keyStr.indexOf(input.charAt(i++));
-        enc2 = _keyStr.indexOf(input.charAt(i++));
-        enc3 = _keyStr.indexOf(input.charAt(i++));
-        enc4 = _keyStr.indexOf(input.charAt(i++));
-
-        chr1 = (enc1 << 2) | (enc2 >> 4);
-        chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-        chr3 = ((enc3 & 3) << 6) | enc4;
-
-        output = output + String.fromCharCode(chr1);
-
-        if (enc3 != 64) {
-            output = output + String.fromCharCode(chr2);
-        }
-        if (enc4 != 64) {
-            output = output + String.fromCharCode(chr3);
-        }
-
-    }
-
-    return output;
-
-};
-
-},{}],2:[function(_dereq_,module,exports){
-'use strict';
-function CompressedObject() {
-    this.compressedSize = 0;
-    this.uncompressedSize = 0;
-    this.crc32 = 0;
-    this.compressionMethod = null;
-    this.compressedContent = null;
-}
-
-CompressedObject.prototype = {
-    /**
-     * Return the decompressed content in an unspecified format.
-     * The format will depend on the decompressor.
-     * @return {Object} the decompressed content.
-     */
-    getContent: function() {
-        return null; // see implementation
-    },
-    /**
-     * Return the compressed content in an unspecified format.
-     * The format will depend on the compressed conten source.
-     * @return {Object} the compressed content.
-     */
-    getCompressedContent: function() {
-        return null; // see implementation
-    }
-};
-module.exports = CompressedObject;
-
-},{}],3:[function(_dereq_,module,exports){
-'use strict';
-exports.STORE = {
-    magic: "\x00\x00",
-    compress: function(content, compressionOptions) {
-        return content; // no compression
-    },
-    uncompress: function(content) {
-        return content; // no compression
-    },
-    compressInputType: null,
-    uncompressInputType: null
-};
-exports.DEFLATE = _dereq_('./flate');
-
-},{"./flate":8}],4:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-var table = [
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-    0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-];
-
-/**
- *
- *  Javascript crc32
- *  http://www.webtoolkit.info/
- *
- */
-module.exports = function crc32(input, crc) {
-    if (typeof input === "undefined" || !input.length) {
-        return 0;
-    }
-
-    var isArray = utils.getTypeOf(input) !== "string";
-
-    if (typeof(crc) == "undefined") {
-        crc = 0;
-    }
-    var x = 0;
-    var y = 0;
-    var b = 0;
-
-    crc = crc ^ (-1);
-    for (var i = 0, iTop = input.length; i < iTop; i++) {
-        b = isArray ? input[i] : input.charCodeAt(i);
-        y = (crc ^ b) & 0xFF;
-        x = table[y];
-        crc = (crc >>> 8) ^ x;
-    }
-
-    return crc ^ (-1);
-};
-// vim: set shiftwidth=4 softtabstop=4:
-
-},{"./utils":21}],5:[function(_dereq_,module,exports){
-'use strict';
-var utils = _dereq_('./utils');
-
-function DataReader(data) {
-    this.data = null; // type : see implementation
-    this.length = 0;
-    this.index = 0;
-}
-DataReader.prototype = {
-    /**
-     * Check that the offset will not go too far.
-     * @param {string} offset the additional offset to check.
-     * @throws {Error} an Error if the offset is out of bounds.
-     */
-    checkOffset: function(offset) {
-        this.checkIndex(this.index + offset);
-    },
-    /**
-     * Check that the specifed index will not be too far.
-     * @param {string} newIndex the index to check.
-     * @throws {Error} an Error if the index is out of bounds.
-     */
-    checkIndex: function(newIndex) {
-        if (this.length < newIndex || newIndex < 0) {
-            throw new Error("End of data reached (data length = " + this.length + ", asked index = " + (newIndex) + "). Corrupted zip ?");
-        }
-    },
-    /**
-     * Change the index.
-     * @param {number} newIndex The new index.
-     * @throws {Error} if the new index is out of the data.
-     */
-    setIndex: function(newIndex) {
-        this.checkIndex(newIndex);
-        this.index = newIndex;
-    },
-    /**
-     * Skip the next n bytes.
-     * @param {number} n the number of bytes to skip.
-     * @throws {Error} if the new index is out of the data.
-     */
-    skip: function(n) {
-        this.setIndex(this.index + n);
-    },
-    /**
-     * Get the byte at the specified index.
-     * @param {number} i the index to use.
-     * @return {number} a byte.
-     */
-    byteAt: function(i) {
-        // see implementations
-    },
-    /**
-     * Get the next number with a given byte size.
-     * @param {number} size the number of bytes to read.
-     * @return {number} the corresponding number.
-     */
-    readInt: function(size) {
-        var result = 0,
-            i;
-        this.checkOffset(size);
-        for (i = this.index + size - 1; i >= this.index; i--) {
-            result = (result << 8) + this.byteAt(i);
-        }
-        this.index += size;
-        return result;
-    },
-    /**
-     * Get the next string with a given byte size.
-     * @param {number} size the number of bytes to read.
-     * @return {string} the corresponding string.
-     */
-    readString: function(size) {
-        return utils.transformTo("string", this.readData(size));
-    },
-    /**
-     * Get raw data without conversion, <size> bytes.
-     * @param {number} size the number of bytes to read.
-     * @return {Object} the raw data, implementation specific.
-     */
-    readData: function(size) {
-        // see implementations
-    },
-    /**
-     * Find the last occurence of a zip signature (4 bytes).
-     * @param {string} sig the signature to find.
-     * @return {number} the index of the last occurence, -1 if not found.
-     */
-    lastIndexOfSignature: function(sig) {
-        // see implementations
-    },
-    /**
-     * Get the next date.
-     * @return {Date} the date.
-     */
-    readDate: function() {
-        var dostime = this.readInt(4);
-        return new Date(
-        ((dostime >> 25) & 0x7f) + 1980, // year
-        ((dostime >> 21) & 0x0f) - 1, // month
-        (dostime >> 16) & 0x1f, // day
-        (dostime >> 11) & 0x1f, // hour
-        (dostime >> 5) & 0x3f, // minute
-        (dostime & 0x1f) << 1); // second
-    }
-};
-module.exports = DataReader;
-
-},{"./utils":21}],6:[function(_dereq_,module,exports){
-'use strict';
-exports.base64 = false;
-exports.binary = false;
-exports.dir = false;
-exports.createFolders = false;
-exports.date = null;
-exports.compression = null;
-exports.compressionOptions = null;
-exports.comment = null;
-exports.unixPermissions = null;
-exports.dosPermissions = null;
-
-},{}],7:[function(_dereq_,module,exports){
-'use strict';
-var utils = _dereq_('./utils');
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2binary = function(str) {
-    return utils.string2binary(str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2Uint8Array = function(str) {
-    return utils.transformTo("uint8array", str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.uint8Array2String = function(array) {
-    return utils.transformTo("string", array);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2Blob = function(str) {
-    var buffer = utils.transformTo("arraybuffer", str);
-    return utils.arrayBuffer2Blob(buffer);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.arrayBuffer2Blob = function(buffer) {
-    return utils.arrayBuffer2Blob(buffer);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.transformTo = function(outputType, input) {
-    return utils.transformTo(outputType, input);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.getTypeOf = function(input) {
-    return utils.getTypeOf(input);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.checkSupport = function(type) {
-    return utils.checkSupport(type);
-};
-
-/**
- * @deprecated
- * This value will be removed in a future version without replacement.
- */
-exports.MAX_VALUE_16BITS = utils.MAX_VALUE_16BITS;
-
-/**
- * @deprecated
- * This value will be removed in a future version without replacement.
- */
-exports.MAX_VALUE_32BITS = utils.MAX_VALUE_32BITS;
-
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.pretty = function(str) {
-    return utils.pretty(str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.findCompression = function(compressionMethod) {
-    return utils.findCompression(compressionMethod);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.isRegExp = function (object) {
-    return utils.isRegExp(object);
-};
-
-
-},{"./utils":21}],8:[function(_dereq_,module,exports){
-'use strict';
-var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined');
-
-var pako = _dereq_("pako");
-exports.uncompressInputType = USE_TYPEDARRAY ? "uint8array" : "array";
-exports.compressInputType = USE_TYPEDARRAY ? "uint8array" : "array";
-
-exports.magic = "\x08\x00";
-exports.compress = function(input, compressionOptions) {
-    return pako.deflateRaw(input, {
-        level : compressionOptions.level || -1 // default compression
-    });
-};
-exports.uncompress =  function(input) {
-    return pako.inflateRaw(input);
-};
-
-},{"pako":24}],9:[function(_dereq_,module,exports){
-'use strict';
-
-var base64 = _dereq_('./base64');
-
-/**
-Usage:
-   zip = new JSZip();
-   zip.file("hello.txt", "Hello, World!").file("tempfile", "nothing");
-   zip.folder("images").file("smile.gif", base64Data, {base64: true});
-   zip.file("Xmas.txt", "Ho ho ho !", {date : new Date("December 25, 2007 00:00:01")});
-   zip.remove("tempfile");
-
-   base64zip = zip.generate();
-
-**/
-
-/**
- * Representation a of zip file in js
- * @constructor
- * @param {String=|ArrayBuffer=|Uint8Array=} data the data to load, if any (optional).
- * @param {Object=} options the options for creating this objects (optional).
- */
-function JSZip(data, options) {
-    // if this constructor is used without `new`, it adds `new` before itself:
-    if(!(this instanceof JSZip)) return new JSZip(data, options);
-
-    // object containing the files :
-    // {
-    //   "folder/" : {...},
-    //   "folder/data.txt" : {...}
-    // }
-    this.files = {};
-
-    this.comment = null;
-
-    // Where we are in the hierarchy
-    this.root = "";
-    if (data) {
-        this.load(data, options);
-    }
-    this.clone = function() {
-        var newObj = new JSZip();
-        for (var i in this) {
-            if (typeof this[i] !== "function") {
-                newObj[i] = this[i];
-            }
-        }
-        return newObj;
-    };
-}
-JSZip.prototype = _dereq_('./object');
-JSZip.prototype.load = _dereq_('./load');
-JSZip.support = _dereq_('./support');
-JSZip.defaults = _dereq_('./defaults');
-
-/**
- * @deprecated
- * This namespace will be removed in a future version without replacement.
- */
-JSZip.utils = _dereq_('./deprecatedPublicUtils');
-
-JSZip.base64 = {
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    encode : function(input) {
-        return base64.encode(input);
-    },
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    decode : function(input) {
-        return base64.decode(input);
-    }
-};
-JSZip.compressions = _dereq_('./compressions');
-module.exports = JSZip;
-
-},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(_dereq_,module,exports){
-'use strict';
-var base64 = _dereq_('./base64');
-var ZipEntries = _dereq_('./zipEntries');
-module.exports = function(data, options) {
-    var files, zipEntries, i, input;
-    options = options || {};
-    if (options.base64) {
-        data = base64.decode(data);
-    }
-
-    zipEntries = new ZipEntries(data, options);
-    files = zipEntries.files;
-    for (i = 0; i < files.length; i++) {
-        input = files[i];
-        this.file(input.fileName, input.decompressed, {
-            binary: true,
-            optimizedBinaryString: true,
-            date: input.date,
-            dir: input.dir,
-            comment : input.fileComment.length ? input.fileComment : null,
-            unixPermissions : input.unixPermissions,
-            dosPermissions : input.dosPermissions,
-            createFolders: options.createFolders
-        });
-    }
-    if (zipEntries.zipComment.length) {
-        this.comment = zipEntries.zipComment;
-    }
-
-    return this;
-};
-
-},{"./base64":1,"./zipEntries":22}],11:[function(_dereq_,module,exports){
-(function (Buffer){
-'use strict';
-module.exports = function(data, encoding){
-    return new Buffer(data, encoding);
-};
-module.exports.test = function(b){
-    return Buffer.isBuffer(b);
-};
-
-}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
-},{}],12:[function(_dereq_,module,exports){
-'use strict';
-var Uint8ArrayReader = _dereq_('./uint8ArrayReader');
-
-function NodeBufferReader(data) {
-    this.data = data;
-    this.length = this.data.length;
-    this.index = 0;
-}
-NodeBufferReader.prototype = new Uint8ArrayReader();
-
-/**
- * @see DataReader.readData
- */
-NodeBufferReader.prototype.readData = function(size) {
-    this.checkOffset(size);
-    var result = this.data.slice(this.index, this.index + size);
-    this.index += size;
-    return result;
-};
-module.exports = NodeBufferReader;
-
-},{"./uint8ArrayReader":18}],13:[function(_dereq_,module,exports){
-'use strict';
-var support = _dereq_('./support');
-var utils = _dereq_('./utils');
-var crc32 = _dereq_('./crc32');
-var signature = _dereq_('./signature');
-var defaults = _dereq_('./defaults');
-var base64 = _dereq_('./base64');
-var compressions = _dereq_('./compressions');
-var CompressedObject = _dereq_('./compressedObject');
-var nodeBuffer = _dereq_('./nodeBuffer');
-var utf8 = _dereq_('./utf8');
-var StringWriter = _dereq_('./stringWriter');
-var Uint8ArrayWriter = _dereq_('./uint8ArrayWriter');
-
-/**
- * Returns the raw data of a ZipObject, decompress the content if necessary.
- * @param {ZipObject} file the file to use.
- * @return {String|ArrayBuffer|Uint8Array|Buffer} the data.
- */
-var getRawData = function(file) {
-    if (file._data instanceof CompressedObject) {
-        file._data = file._data.getContent();
-        file.options.binary = true;
-        file.options.base64 = false;
-
-        if (utils.getTypeOf(file._data) === "uint8array") {
-            var copy = file._data;
-            // when reading an arraybuffer, the CompressedObject mechanism will keep it and subarray() a Uint8Array.
-            // if we request a file in the same format, we might get the same Uint8Array or its ArrayBuffer (the original zip file).
-            file._data = new Uint8Array(copy.length);
-            // with an empty Uint8Array, Opera fails with a "Offset larger than array size"
-            if (copy.length !== 0) {
-                file._data.set(copy, 0);
-            }
-        }
-    }
-    return file._data;
-};
-
-/**
- * Returns the data of a ZipObject in a binary form. If the content is an unicode string, encode it.
- * @param {ZipObject} file the file to use.
- * @return {String|ArrayBuffer|Uint8Array|Buffer} the data.
- */
-var getBinaryData = function(file) {
-    var result = getRawData(file),
-        type = utils.getTypeOf(result);
-    if (type === "string") {
-        if (!file.options.binary) {
-            // unicode text !
-            // unicode string => binary string is a painful process, check if we can avoid it.
-            if (support.nodebuffer) {
-                return nodeBuffer(result, "utf-8");
-            }
-        }
-        return file.asBinary();
-    }
-    return result;
-};
-
-/**
- * Transform this._data into a string.
- * @param {function} filter a function String -> String, applied if not null on the result.
- * @return {String} the string representing this._data.
- */
-var dataToString = function(asUTF8) {
-    var result = getRawData(this);
-    if (result === null || typeof result === "undefined") {
-        return "";
-    }
-    // if the data is a base64 string, we decode it before checking the encoding !
-    if (this.options.base64) {
-        result = base64.decode(result);
-    }
-    if (asUTF8 && this.options.binary) {
-        // JSZip.prototype.utf8decode supports arrays as input
-        // skip to array => string step, utf8decode will do it.
-        result = out.utf8decode(result);
-    }
-    else {
-        // no utf8 transformation, do the array => string step.
-        result = utils.transformTo("string", result);
-    }
-
-    if (!asUTF8 && !this.options.binary) {
-        result = utils.transformTo("string", out.utf8encode(result));
-    }
-    return result;
-};
-/**
- * A simple object representing a file in the zip file.
- * @constructor
- * @param {string} name the name of the file
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data
- * @param {Object} options the options of the file
- */
-var ZipObject = function(name, data, options) {
-    this.name = name;
-    this.dir = options.dir;
-    this.date = options.date;
-    this.comment = options.comment;
-    this.unixPermissions = options.unixPermissions;
-    this.dosPermissions = options.dosPermissions;
-
-    this._data = data;
-    this.options = options;
-
-    /*
-     * This object contains initial values for dir and date.
-     * With them, we can check if the user changed the deprecated metadata in
-     * `ZipObject#options` or not.
-     */
-    this._initialMetadata = {
-      dir : options.dir,
-      date : options.date
-    };
-};
-
-ZipObject.prototype = {
-    /**
-     * Return the content as UTF8 string.
-     * @return {string} the UTF8 string.
-     */
-    asText: function() {
-        return dataToString.call(this, true);
-    },
-    /**
-     * Returns the binary content.
-     * @return {string} the content as binary.
-     */
-    asBinary: function() {
-        return dataToString.call(this, false);
-    },
-    /**
-     * Returns the content as a nodejs Buffer.
-     * @return {Buffer} the content as a Buffer.
-     */
-    asNodeBuffer: function() {
-        var result = getBinaryData(this);
-        return utils.transformTo("nodebuffer", result);
-    },
-    /**
-     * Returns the content as an Uint8Array.
-     * @return {Uint8Array} the content as an Uint8Array.
-     */
-    asUint8Array: function() {
-        var result = getBinaryData(this);
-        return utils.transformTo("uint8array", result);
-    },
-    /**
-     * Returns the content as an ArrayBuffer.
-     * @return {ArrayBuffer} the content as an ArrayBufer.
-     */
-    asArrayBuffer: function() {
-        return this.asUint8Array().buffer;
-    }
-};
-
-/**
- * Transform an integer into a string in hexadecimal.
- * @private
- * @param {number} dec the number to convert.
- * @param {number} bytes the number of bytes to generate.
- * @returns {string} the result.
- */
-var decToHex = function(dec, bytes) {
-    var hex = "",
-        i;
-    for (i = 0; i < bytes; i++) {
-        hex += String.fromCharCode(dec & 0xff);
-        dec = dec >>> 8;
-    }
-    return hex;
-};
-
-/**
- * Merge the objects passed as parameters into a new one.
- * @private
- * @param {...Object} var_args All objects to merge.
- * @return {Object} a new object with the data of the others.
- */
-var extend = function() {
-    var result = {}, i, attr;
-    for (i = 0; i < arguments.length; i++) { // arguments is not enumerable in some browsers
-        for (attr in arguments[i]) {
-            if (arguments[i].hasOwnProperty(attr) && typeof result[attr] === "undefined") {
-                result[attr] = arguments[i][attr];
-            }
-        }
-    }
-    return result;
-};
-
-/**
- * Transforms the (incomplete) options from the user into the complete
- * set of options to create a file.
- * @private
- * @param {Object} o the options from the user.
- * @return {Object} the complete set of options.
- */
-var prepareFileAttrs = function(o) {
-    o = o || {};
-    if (o.base64 === true && (o.binary === null || o.binary === undefined)) {
-        o.binary = true;
-    }
-    o = extend(o, defaults);
-    o.date = o.date || new Date();
-    if (o.compression !== null) o.compression = o.compression.toUpperCase();
-
-    return o;
-};
-
-/**
- * Add a file in the current folder.
- * @private
- * @param {string} name the name of the file
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data of the file
- * @param {Object} o the options of the file
- * @return {Object} the new file.
- */
-var fileAdd = function(name, data, o) {
-    // be sure sub folders exist
-    var dataType = utils.getTypeOf(data),
-        parent;
-
-    o = prepareFileAttrs(o);
-
-    if (typeof o.unixPermissions === "string") {
-        o.unixPermissions = parseInt(o.unixPermissions, 8);
-    }
-
-    // UNX_IFDIR  0040000 see zipinfo.c
-    if (o.unixPermissions && (o.unixPermissions & 0x4000)) {
-        o.dir = true;
-    }
-    // Bit 4    Directory
-    if (o.dosPermissions && (o.dosPermissions & 0x0010)) {
-        o.dir = true;
-    }
-
-    if (o.dir) {
-        name = forceTrailingSlash(name);
-    }
-
-    if (o.createFolders && (parent = parentFolder(name))) {
-        folderAdd.call(this, parent, true);
-    }
-
-    if (o.dir || data === null || typeof data === "undefined") {
-        o.base64 = false;
-        o.binary = false;
-        data = null;
-        dataType = null;
-    }
-    else if (dataType === "string") {
-        if (o.binary && !o.base64) {
-            // optimizedBinaryString == true means that the file has already been filtered with a 0xFF mask
-            if (o.optimizedBinaryString !== true) {
-                // this is a string, not in a base64 format.
-                // Be sure that this is a correct "binary string"
-                data = utils.string2binary(data);
-            }
-        }
-    }
-    else { // arraybuffer, uint8array, ...
-        o.base64 = false;
-        o.binary = true;
-
-        if (!dataType && !(data instanceof CompressedObject)) {
-            throw new Error("The data of '" + name + "' is in an unsupported format !");
-        }
-
-        // special case : it's way easier to work with Uint8Array than with ArrayBuffer
-        if (dataType === "arraybuffer") {
-            data = utils.transformTo("uint8array", data);
-        }
-    }
-
-    var object = new ZipObject(name, data, o);
-    this.files[name] = object;
-    return object;
-};
-
-/**
- * Find the parent folder of the path.
- * @private
- * @param {string} path the path to use
- * @return {string} the parent folder, or ""
- */
-var parentFolder = function (path) {
-    if (path.slice(-1) == '/') {
-        path = path.substring(0, path.length - 1);
-    }
-    var lastSlash = path.lastIndexOf('/');
-    return (lastSlash > 0) ? path.substring(0, lastSlash) : "";
-};
-
-
-/**
- * Returns the path with a slash at the end.
- * @private
- * @param {String} path the path to check.
- * @return {String} the path with a trailing slash.
- */
-var forceTrailingSlash = function(path) {
-    // Check the name ends with a /
-    if (path.slice(-1) != "/") {
-        path += "/"; // IE doesn't like substr(-1)
-    }
-    return path;
-};
-/**
- * Add a (sub) folder in the current folder.
- * @private
- * @param {string} name the folder's name
- * @param {boolean=} [createFolders] If true, automatically create sub
- *  folders. Defaults to false.
- * @return {Object} the new folder.
- */
-var folderAdd = function(name, createFolders) {
-    createFolders = (typeof createFolders !== 'undefined') ? createFolders : false;
-
-    name = forceTrailingSlash(name);
-
-    // Does this folder already exist?
-    if (!this.files[name]) {
-        fileAdd.call(this, name, null, {
-            dir: true,
-            createFolders: createFolders
-        });
-    }
-    return this.files[name];
-};
-
-/**
- * Generate a JSZip.CompressedObject for a given zipOject.
- * @param {ZipObject} file the object to read.
- * @param {JSZip.compression} compression the compression to use.
- * @param {Object} compressionOptions the options to use when compressing.
- * @return {JSZip.CompressedObject} the compressed result.
- */
-var generateCompressedObjectFrom = function(file, compression, compressionOptions) {
-    var result = new CompressedObject(),
-        content;
-
-    // the data has not been decompressed, we might reuse things !
-    if (file._data instanceof CompressedObject) {
-        result.uncompressedSize = file._data.uncompressedSize;
-        result.crc32 = file._data.crc32;
-
-        if (result.uncompressedSize === 0 || file.dir) {
-            compression = compressions['STORE'];
-            result.compressedContent = "";
-            result.crc32 = 0;
-        }
-        else if (file._data.compressionMethod === compression.magic) {
-            result.compressedContent = file._data.getCompressedContent();
-        }
-        else {
-            content = file._data.getContent();
-            // need to decompress / recompress
-            result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
-        }
-    }
-    else {
-        // have uncompressed data
-        content = getBinaryData(file);
-        if (!content || content.length === 0 || file.dir) {
-            compression = compressions['STORE'];
-            content = "";
-        }
-        result.uncompressedSize = content.length;
-        result.crc32 = crc32(content);
-        result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
-    }
-
-    result.compressedSize = result.compressedContent.length;
-    result.compressionMethod = compression.magic;
-
-    return result;
-};
-
-
-
-
-/**
- * Generate the UNIX part of the external file attributes.
- * @param {Object} unixPermissions the unix permissions or null.
- * @param {Boolean} isDir true if the entry is a directory, false otherwise.
- * @return {Number} a 32 bit integer.
- *
- * adapted from http://unix.stackexchange.com/questions/14705/the-zip-formats-external-file-attribute :
- *
- * TTTTsstrwxrwxrwx0000000000ADVSHR
- * ^^^^____________________________ file type, see zipinfo.c (UNX_*)
- *     ^^^_________________________ setuid, setgid, sticky
- *        ^^^^^^^^^________________ permissions
- *                 ^^^^^^^^^^______ not used ?
- *                           ^^^^^^ DOS attribute bits : Archive, Directory, Volume label, System file, Hidden, Read only
- */
-var generateUnixExternalFileAttr = function (unixPermissions, isDir) {
-
-    var result = unixPermissions;
-    if (!unixPermissions) {
-        // I can't use octal values in strict mode, hence the hexa.
-        //  040775 => 0x41fd
-        // 0100664 => 0x81b4
-        result = isDir ? 0x41fd : 0x81b4;
-    }
-
-    return (result & 0xFFFF) << 16;
-};
-
-/**
- * Generate the DOS part of the external file attributes.
- * @param {Object} dosPermissions the dos permissions or null.
- * @param {Boolean} isDir true if the entry is a directory, false otherwise.
- * @return {Number} a 32 bit integer.
- *
- * Bit 0     Read-Only
- * Bit 1     Hidden
- * Bit 2     System
- * Bit 3     Volume Label
- * Bit 4     Directory
- * Bit 5     Archive
- */
-var generateDosExternalFileAttr = function (dosPermissions, isDir) {
-
-    // the dir flag is already set for compatibility
-
-    return (dosPermissions || 0)  & 0x3F;
-};
-
-/**
- * Generate the various parts used in the construction of the final zip file.
- * @param {string} name the file name.
- * @param {ZipObject} file the file content.
- * @param {JSZip.CompressedObject} compressedObject the compressed object.
- * @param {number} offset the current offset from the start of the zip file.
- * @param {String} platform let's pretend we are this platform (change platform dependents fields)
- * @return {object} the zip parts.
- */
-var generateZipParts = function(name, file, compressedObject, offset, platform) {
-    var data = compressedObject.compressedContent,
-        utfEncodedFileName = utils.transformTo("string", utf8.utf8encode(file.name)),
-        comment = file.comment || "",
-        utfEncodedComment = utils.transformTo("string", utf8.utf8encode(comment)),
-        useUTF8ForFileName = utfEncodedFileName.length !== file.name.length,
-        useUTF8ForComment = utfEncodedComment.length !== comment.length,
-        o = file.options,
-        dosTime,
-        dosDate,
-        extraFields = "",
-        unicodePathExtraField = "",
-        unicodeCommentExtraField = "",
-        dir, date;
-
-
-    // handle the deprecated options.dir
-    if (file._initialMetadata.dir !== file.dir) {
-        dir = file.dir;
-    } else {
-        dir = o.dir;
-    }
-
-    // handle the deprecated options.date
-    if(file._initialMetadata.date !== file.date) {
-        date = file.date;
-    } else {
-        date = o.date;
-    }
-
-    var extFileAttr = 0;
-    var versionMadeBy = 0;
-    if (dir) {
-        // dos or unix, we set the dos dir flag
-        extFileAttr |= 0x00010;
-    }
-    if(platform === "UNIX") {
-        versionMadeBy = 0x031E; // UNIX, version 3.0
-        extFileAttr |= generateUnixExternalFileAttr(file.unixPermissions, dir);
-    } else { // DOS or other, fallback to DOS
-        versionMadeBy = 0x0014; // DOS, version 2.0
-        extFileAttr |= generateDosExternalFileAttr(file.dosPermissions, dir);
-    }
-
-    // date
-    // @see http://www.delorie.com/djgpp/doc/rbinter/it/52/13.html
-    // @see http://www.delorie.com/djgpp/doc/rbinter/it/65/16.html
-    // @see http://www.delorie.com/djgpp/doc/rbinter/it/66/16.html
-
-    dosTime = date.getHours();
-    dosTime = dosTime << 6;
-    dosTime = dosTime | date.getMinutes();
-    dosTime = dosTime << 5;
-    dosTime = dosTime | date.getSeconds() / 2;
-
-    dosDate = date.getFullYear() - 1980;
-    dosDate = dosDate << 4;
-    dosDate = dosDate | (date.getMonth() + 1);
-    dosDate = dosDate << 5;
-    dosDate = dosDate | date.getDate();
-
-    if (useUTF8ForFileName) {
-        // set the unicode path extra field. unzip needs at least one extra
-        // field to correctly handle unicode path, so using the path is as good
-        // as any other information. This could improve the situation with
-        // other archive managers too.
-        // This field is usually used without the utf8 flag, with a non
-        // unicode path in the header (winrar, winzip). This helps (a bit)
-        // with the messy Windows' default compressed folders feature but
-        // breaks on p7zip which doesn't seek the unicode path extra field.
-        // So for now, UTF-8 everywhere !
-        unicodePathExtraField =
-            // Version
-            decToHex(1, 1) +
-            // NameCRC32
-            decToHex(crc32(utfEncodedFileName), 4) +
-            // UnicodeName
-            utfEncodedFileName;
-
-        extraFields +=
-            // Info-ZIP Unicode Path Extra Field
-            "\x75\x70" +
-            // size
-            decToHex(unicodePathExtraField.length, 2) +
-            // content
-            unicodePathExtraField;
-    }
-
-    if(useUTF8ForComment) {
-
-        unicodeCommentExtraField =
-            // Version
-            decToHex(1, 1) +
-            // CommentCRC32
-            decToHex(this.crc32(utfEncodedComment), 4) +
-            // UnicodeName
-            utfEncodedComment;
-
-        extraFields +=
-            // Info-ZIP Unicode Path Extra Field
-            "\x75\x63" +
-            // size
-            decToHex(unicodeCommentExtraField.length, 2) +
-            // content
-            unicodeCommentExtraField;
-    }
-
-    var header = "";
-
-    // version needed to extract
-    header += "\x0A\x00";
-    // general purpose bit flag
-    // set bit 11 if utf8
-    header += (useUTF8ForFileName || useUTF8ForComment) ? "\x00\x08" : "\x00\x00";
-    // compression method
-    header += compressedObject.compressionMethod;
-    // last mod file time
-    header += decToHex(dosTime, 2);
-    // last mod file date
-    header += decToHex(dosDate, 2);
-    // crc-32
-    header += decToHex(compressedObject.crc32, 4);
-    // compressed size
-    header += decToHex(compressedObject.compressedSize, 4);
-    // uncompressed size
-    header += decToHex(compressedObject.uncompressedSize, 4);
-    // file name length
-    header += decToHex(utfEncodedFileName.length, 2);
-    // extra field length
-    header += decToHex(extraFields.length, 2);
-
-
-    var fileRecord = signature.LOCAL_FILE_HEADER + header + utfEncodedFileName + extraFields;
-
-    var dirRecord = signature.CENTRAL_FILE_HEADER +
-    // version made by (00: DOS)
-    decToHex(versionMadeBy, 2) +
-    // file header (common to file and central directory)
-    header +
-    // file comment length
-    decToHex(utfEncodedComment.length, 2) +
-    // disk number start
-    "\x00\x00" +
-    // internal file attributes TODO
-    "\x00\x00" +
-    // external file attributes
-    decToHex(extFileAttr, 4) +
-    // relative offset of local header
-    decToHex(offset, 4) +
-    // file name
-    utfEncodedFileName +
-    // extra field
-    extraFields +
-    // file comment
-    utfEncodedComment;
-
-    return {
-        fileRecord: fileRecord,
-        dirRecord: dirRecord,
-        compressedObject: compressedObject
-    };
-};
-
-
-// return the actual prototype of JSZip
-var out = {
-    /**
-     * Read an existing zip and merge the data in the current JSZip object.
-     * The implementation is in jszip-load.js, don't forget to include it.
-     * @param {String|ArrayBuffer|Uint8Array|Buffer} stream  The stream to load
-     * @param {Object} options Options for loading the stream.
-     *  options.base64 : is the stream in base64 ? default : false
-     * @return {JSZip} the current JSZip object
-     */
-    load: function(stream, options) {
-        throw new Error("Load method is not defined. Is the file jszip-load.js included ?");
-    },
-
-    /**
-     * Filter nested files/folders with the specified function.
-     * @param {Function} search the predicate to use :
-     * function (relativePath, file) {...}
-     * It takes 2 arguments : the relative path and the file.
-     * @return {Array} An array of matching elements.
-     */
-    filter: function(search) {
-        var result = [],
-            filename, relativePath, file, fileClone;
-        for (filename in this.files) {
-            if (!this.files.hasOwnProperty(filename)) {
-                continue;
-            }
-            file = this.files[filename];
-            // return a new object, don't let the user mess with our internal objects :)
-            fileClone = new ZipObject(file.name, file._data, extend(file.options));
-            relativePath = filename.slice(this.root.length, filename.length);
-            if (filename.slice(0, this.root.length) === this.root && // the file is in the current root
-            search(relativePath, fileClone)) { // and the file matches the function
-                result.push(fileClone);
-            }
-        }
-        return result;
-    },
-
-    /**
-     * Add a file to the zip file, or search a file.
-     * @param   {string|RegExp} name The name of the file to add (if data is defined),
-     * the name of the file to find (if no data) or a regex to match files.
-     * @param   {String|ArrayBuffer|Uint8Array|Buffer} data  The file data, either raw or base64 encoded
-     * @param   {Object} o     File options
-     * @return  {JSZip|Object|Array} this JSZip object (when adding a file),
-     * a file (when searching by string) or an array of files (when searching by regex).
-     */
-    file: function(name, data, o) {
-        if (arguments.length === 1) {
-            if (utils.isRegExp(name)) {
-                var regexp = name;
-                return this.filter(function(relativePath, file) {
-                    return !file.dir && regexp.test(relativePath);
-                });
-            }
-            else { // text
-                return this.filter(function(relativePath, file) {
-                    return !file.dir && relativePath === name;
-                })[0] || null;
-            }
-        }
-        else { // more than one argument : we have data !
-            name = this.root + name;
-            fileAdd.call(this, name, data, o);
-        }
-        return this;
-    },
-
-    /**
-     * Add a directory to the zip file, or search.
-     * @param   {String|RegExp} arg The name of the directory to add, or a regex to search folders.
-     * @return  {JSZip} an object with the new directory as the root, or an array containing matching folders.
-     */
-    folder: function(arg) {
-        if (!arg) {
-            return this;
-        }
-
-        if (utils.isRegExp(arg)) {
-            return this.filter(function(relativePath, file) {
-                return file.dir && arg.test(relativePath);
-            });
-        }
-
-        // else, name is a new folder
-        var name = this.root + arg;
-        var newFolder = folderAdd.call(this, name);
-
-        // Allow chaining by returning a new object with this folder as the root
-        var ret = this.clone();
-        ret.root = newFolder.name;
-        return ret;
-    },
-
-    /**
-     * Delete a file, or a directory and all sub-files, from the zip
-     * @param {string} name the name of the file to delete
-     * @return {JSZip} this JSZip object
-     */
-    remove: function(name) {
-        name = this.root + name;
-        var file = this.files[name];
-        if (!file) {
-            // Look for any folders
-            if (name.slice(-1) != "/") {
-                name += "/";
-            }
-            file = this.files[name];
-        }
-
-        if (file && !file.dir) {
-            // file
-            delete this.files[name];
-        } else {
-            // maybe a folder, delete recursively
-            var kids = this.filter(function(relativePath, file) {
-                return file.name.slice(0, name.length) === name;
-            });
-            for (var i = 0; i < kids.length; i++) {
-                delete this.files[kids[i].name];
-            }
-        }
-
-        return this;
-    },
-
-    /**
-     * Generate the complete zip file
-     * @param {Object} options the options to generate the zip file :
-     * - base64, (deprecated, use type instead) true to generate base64.
-     * - compression, "STORE" by default.
-     * - type, "base64" by default. Values are : string, base64, uint8array, arraybuffer, blob.
-     * @return {String|Uint8Array|ArrayBuffer|Buffer|Blob} the zip file
-     */
-    generate: function(options) {
-        options = extend(options || {}, {
-            base64: true,
-            compression: "STORE",
-            compressionOptions : null,
-            type: "base64",
-            platform: "DOS",
-            comment: null,
-            mimeType: 'application/zip'
-        });
-
-        utils.checkSupport(options.type);
-
-        // accept nodejs `process.platform`
-        if(
-          options.platform === 'darwin' ||
-          options.platform === 'freebsd' ||
-          options.platform === 'linux' ||
-          options.platform === 'sunos'
-        ) {
-          options.platform = "UNIX";
-        }
-        if (options.platform === 'win32') {
-          options.platform = "DOS";
-        }
-
-        var zipData = [],
-            localDirLength = 0,
-            centralDirLength = 0,
-            writer, i,
-            utfEncodedComment = utils.transformTo("string", this.utf8encode(options.comment || this.comment || ""));
-
-        // first, generate all the zip parts.
-        for (var name in this.files) {
-            if (!this.files.hasOwnProperty(name)) {
-                continue;
-            }
-            var file = this.files[name];
-
-            var compressionName = file.options.compression || options.compression.toUpperCase();
-            var compression = compressions[compressionName];
-            if (!compression) {
-                throw new Error(compressionName + " is not a valid compression method !");
-            }
-            var compressionOptions = file.options.compressionOptions || options.compressionOptions || {};
-
-            var compressedObject = generateCompressedObjectFrom.call(this, file, compression, compressionOptions);
-
-            var zipPart = generateZipParts.call(this, name, file, compressedObject, localDirLength, options.platform);
-            localDirLength += zipPart.fileRecord.length + compressedObject.compressedSize;
-            centralDirLength += zipPart.dirRecord.length;
-            zipData.push(zipPart);
-        }
-
-        var dirEnd = "";
-
-        // end of central dir signature
-        dirEnd = signature.CENTRAL_DIRECTORY_END +
-        // number of this disk
-        "\x00\x00" +
-        // number of the disk with the start of the central directory
-        "\x00\x00" +
-        // total number of entries in the central directory on this disk
-        decToHex(zipData.length, 2) +
-        // total number of entries in the central directory
-        decToHex(zipData.length, 2) +
-        // size of the central directory   4 bytes
-        decToHex(centralDirLength, 4) +
-        // offset of start of central directory with respect to the starting disk number
-        decToHex(localDirLength, 4) +
-        // .ZIP file comment length
-        decToHex(utfEncodedComment.length, 2) +
-        // .ZIP file comment
-        utfEncodedComment;
-
-
-        // we have all the parts (and the total length)
-        // time to create a writer !
-        var typeName = options.type.toLowerCase();
-        if(typeName==="uint8array"||typeName==="arraybuffer"||typeName==="blob"||typeName==="nodebuffer") {
-            writer = new Uint8ArrayWriter(localDirLength + centralDirLength + dirEnd.length);
-        }else{
-            writer = new StringWriter(localDirLength + centralDirLength + dirEnd.length);
-        }
-
-        for (i = 0; i < zipData.length; i++) {
-            writer.append(zipData[i].fileRecord);
-            writer.append(zipData[i].compressedObject.compressedContent);
-        }
-        for (i = 0; i < zipData.length; i++) {
-            writer.append(zipData[i].dirRecord);
-        }
-
-        writer.append(dirEnd);
-
-        var zip = writer.finalize();
-
-
-
-        switch(options.type.toLowerCase()) {
-            // case "zip is an Uint8Array"
-            case "uint8array" :
-            case "arraybuffer" :
-            case "nodebuffer" :
-               return utils.transformTo(options.type.toLowerCase(), zip);
-            case "blob" :
-               return utils.arrayBuffer2Blob(utils.transformTo("arraybuffer", zip), options.mimeType);
-            // case "zip is a string"
-            case "base64" :
-               return (options.base64) ? base64.encode(zip) : zip;
-            default : // case "string" :
-               return zip;
-         }
-
-    },
-
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    crc32: function (input, crc) {
-        return crc32(input, crc);
-    },
-
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    utf8encode: function (string) {
-        return utils.transformTo("string", utf8.utf8encode(string));
-    },
-
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    utf8decode: function (input) {
-        return utf8.utf8decode(input);
-    }
-};
-module.exports = out;
-
-},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(_dereq_,module,exports){
-'use strict';
-exports.LOCAL_FILE_HEADER = "PK\x03\x04";
-exports.CENTRAL_FILE_HEADER = "PK\x01\x02";
-exports.CENTRAL_DIRECTORY_END = "PK\x05\x06";
-exports.ZIP64_CENTRAL_DIRECTORY_LOCATOR = "PK\x06\x07";
-exports.ZIP64_CENTRAL_DIRECTORY_END = "PK\x06\x06";
-exports.DATA_DESCRIPTOR = "PK\x07\x08";
-
-},{}],15:[function(_dereq_,module,exports){
-'use strict';
-var DataReader = _dereq_('./dataReader');
-var utils = _dereq_('./utils');
-
-function StringReader(data, optimizedBinaryString) {
-    this.data = data;
-    if (!optimizedBinaryString) {
-        this.data = utils.string2binary(this.data);
-    }
-    this.length = this.data.length;
-    this.index = 0;
-}
-StringReader.prototype = new DataReader();
-/**
- * @see DataReader.byteAt
- */
-StringReader.prototype.byteAt = function(i) {
-    return this.data.charCodeAt(i);
-};
-/**
- * @see DataReader.lastIndexOfSignature
- */
-StringReader.prototype.lastIndexOfSignature = function(sig) {
-    return this.data.lastIndexOf(sig);
-};
-/**
- * @see DataReader.readData
- */
-StringReader.prototype.readData = function(size) {
-    this.checkOffset(size);
-    // this will work because the constructor applied the "& 0xff" mask.
-    var result = this.data.slice(this.index, this.index + size);
-    this.index += size;
-    return result;
-};
-module.exports = StringReader;
-
-},{"./dataReader":5,"./utils":21}],16:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-/**
- * An object to write any content to a string.
- * @constructor
- */
-var StringWriter = function() {
-    this.data = [];
-};
-StringWriter.prototype = {
-    /**
-     * Append any content to the current string.
-     * @param {Object} input the content to add.
-     */
-    append: function(input) {
-        input = utils.transformTo("string", input);
-        this.data.push(input);
-    },
-    /**
-     * Finalize the construction an return the result.
-     * @return {string} the generated string.
-     */
-    finalize: function() {
-        return this.data.join("");
-    }
-};
-
-module.exports = StringWriter;
-
-},{"./utils":21}],17:[function(_dereq_,module,exports){
-(function (Buffer){
-'use strict';
-exports.base64 = true;
-exports.array = true;
-exports.string = true;
-exports.arraybuffer = typeof ArrayBuffer !== "undefined" && typeof Uint8Array !== "undefined";
-// contains true if JSZip can read/generate nodejs Buffer, false otherwise.
-// Browserify will provide a Buffer implementation for browsers, which is
-// an augmented Uint8Array (i.e., can be used as either Buffer or U8).
-exports.nodebuffer = typeof Buffer !== "undefined";
-// contains true if JSZip can read/generate Uint8Array, false otherwise.
-exports.uint8array = typeof Uint8Array !== "undefined";
-
-if (typeof ArrayBuffer === "undefined") {
-    exports.blob = false;
-}
-else {
-    var buffer = new ArrayBuffer(0);
-    try {
-        exports.blob = new Blob([buffer], {
-            type: "application/zip"
-        }).size === 0;
-    }
-    catch (e) {
-        try {
-            var Builder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
-            var builder = new Builder();
-            builder.append(buffer);
-            exports.blob = builder.getBlob('application/zip').size === 0;
-        }
-        catch (e) {
-            exports.blob = false;
-        }
-    }
-}
-
-}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
-},{}],18:[function(_dereq_,module,exports){
-'use strict';
-var DataReader = _dereq_('./dataReader');
-
-function Uint8ArrayReader(data) {
-    if (data) {
-        this.data = data;
-        this.length = this.data.length;
-        this.index = 0;
-    }
-}
-Uint8ArrayReader.prototype = new DataReader();
-/**
- * @see DataReader.byteAt
- */
-Uint8ArrayReader.prototype.byteAt = function(i) {
-    return this.data[i];
-};
-/**
- * @see DataReader.lastIndexOfSignature
- */
-Uint8ArrayReader.prototype.lastIndexOfSignature = function(sig) {
-    var sig0 = sig.charCodeAt(0),
-        sig1 = sig.charCodeAt(1),
-        sig2 = sig.charCodeAt(2),
-        sig3 = sig.charCodeAt(3);
-    for (var i = this.length - 4; i >= 0; --i) {
-        if (this.data[i] === sig0 && this.data[i + 1] === sig1 && this.data[i + 2] === sig2 && this.data[i + 3] === sig3) {
-            return i;
-        }
-    }
-
-    return -1;
-};
-/**
- * @see DataReader.readData
- */
-Uint8ArrayReader.prototype.readData = function(size) {
-    this.checkOffset(size);
-    if(size === 0) {
-        // in IE10, when using subarray(idx, idx), we get the array [0x00] instead of [].
-        return new Uint8Array(0);
-    }
-    var result = this.data.subarray(this.index, this.index + size);
-    this.index += size;
-    return result;
-};
-module.exports = Uint8ArrayReader;
-
-},{"./dataReader":5}],19:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-/**
- * An object to write any content to an Uint8Array.
- * @constructor
- * @param {number} length The length of the array.
- */
-var Uint8ArrayWriter = function(length) {
-    this.data = new Uint8Array(length);
-    this.index = 0;
-};
-Uint8ArrayWriter.prototype = {
-    /**
-     * Append any content to the current array.
-     * @param {Object} input the content to add.
-     */
-    append: function(input) {
-        if (input.length !== 0) {
-            // with an empty Uint8Array, Opera fails with a "Offset larger than array size"
-            input = utils.transformTo("uint8array", input);
-            this.data.set(input, this.index);
-            this.index += input.length;
-        }
-    },
-    /**
-     * Finalize the construction an return the result.
-     * @return {Uint8Array} the generated array.
-     */
-    finalize: function() {
-        return this.data;
-    }
-};
-
-module.exports = Uint8ArrayWriter;
-
-},{"./utils":21}],20:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-var support = _dereq_('./support');
-var nodeBuffer = _dereq_('./nodeBuffer');
-
-/**
- * The following functions come from pako, from pako/lib/utils/strings
- * released under the MIT license, see pako https://github.com/nodeca/pako/
- */
-
-// Table with utf8 lengths (calculated by first byte of sequence)
-// Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
-// because max possible codepoint is 0x10ffff
-var _utf8len = new Array(256);
-for (var i=0; i<256; i++) {
-  _utf8len[i] = (i >= 252 ? 6 : i >= 248 ? 5 : i >= 240 ? 4 : i >= 224 ? 3 : i >= 192 ? 2 : 1);
-}
-_utf8len[254]=_utf8len[254]=1; // Invalid sequence start
-
-// convert string to array (typed, when possible)
-var string2buf = function (str) {
-    var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
-
-    // count binary size
-    for (m_pos = 0; m_pos < str_len; m_pos++) {
-        c = str.charCodeAt(m_pos);
-        if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-            c2 = str.charCodeAt(m_pos+1);
-            if ((c2 & 0xfc00) === 0xdc00) {
-                c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
-                m_pos++;
-            }
-        }
-        buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4;
-    }
-
-    // allocate buffer
-    if (support.uint8array) {
-        buf = new Uint8Array(buf_len);
-    } else {
-        buf = new Array(buf_len);
-    }
-
-    // convert
-    for (i=0, m_pos = 0; i < buf_len; m_pos++) {
-        c = str.charCodeAt(m_pos);
-        if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-            c2 = str.charCodeAt(m_pos+1);
-            if ((c2 & 0xfc00) === 0xdc00) {
-                c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
-                m_pos++;
-            }
-        }
-        if (c < 0x80) {
-            /* one byte */
-            buf[i++] = c;
-        } else if (c < 0x800) {
-            /* two bytes */
-            buf[i++] = 0xC0 | (c >>> 6);
-            buf[i++] = 0x80 | (c & 0x3f);
-        } else if (c < 0x10000) {
-            /* three bytes */
-            buf[i++] = 0xE0 | (c >>> 12);
-            buf[i++] = 0x80 | (c >>> 6 & 0x3f);
-            buf[i++] = 0x80 | (c & 0x3f);
-        } else {
-            /* four bytes */
-            buf[i++] = 0xf0 | (c >>> 18);
-            buf[i++] = 0x80 | (c >>> 12 & 0x3f);
-            buf[i++] = 0x80 | (c >>> 6 & 0x3f);
-            buf[i++] = 0x80 | (c & 0x3f);
-        }
-    }
-
-    return buf;
-};
-
-// Calculate max possible position in utf8 buffer,
-// that will not break sequence. If that's not possible
-// - (very small limits) return max size as is.
-//
-// buf[] - utf8 bytes array
-// max   - length limit (mandatory);
-var utf8border = function(buf, max) {
-    var pos;
-
-    max = max || buf.length;
-    if (max > buf.length) { max = buf.length; }
-
-    // go back from last position, until start of sequence found
-    pos = max-1;
-    while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
-
-    // Fuckup - very small and broken sequence,
-    // return max, because we should return something anyway.
-    if (pos < 0) { return max; }
-
-    // If we came to start of buffer - that means vuffer is too small,
-    // return max too.
-    if (pos === 0) { return max; }
-
-    return (pos + _utf8len[buf[pos]] > max) ? pos : max;
-};
-
-// convert array to string
-var buf2string = function (buf) {
-    var str, i, out, c, c_len;
-    var len = buf.length;
-
-    // Reserve max possible length (2 words per char)
-    // NB: by unknown reasons, Array is significantly faster for
-    //     String.fromCharCode.apply than Uint16Array.
-    var utf16buf = new Array(len*2);
-
-    for (out=0, i=0; i<len;) {
-        c = buf[i++];
-        // quick process ascii
-        if (c < 0x80) { utf16buf[out++] = c; continue; }
-
-        c_len = _utf8len[c];
-        // skip 5 & 6 byte codes
-        if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len-1; continue; }
-
-        // apply mask on first byte
-        c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
-        // join the rest
-        while (c_len > 1 && i < len) {
-            c = (c << 6) | (buf[i++] & 0x3f);
-            c_len--;
-        }
-
-        // terminated by end of string?
-        if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; }
-
-        if (c < 0x10000) {
-            utf16buf[out++] = c;
-        } else {
-            c -= 0x10000;
-            utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff);
-            utf16buf[out++] = 0xdc00 | (c & 0x3ff);
-        }
-    }
-
-    // shrinkBuf(utf16buf, out)
-    if (utf16buf.length !== out) {
-        if(utf16buf.subarray) {
-            utf16buf = utf16buf.subarray(0, out);
-        } else {
-            utf16buf.length = out;
-        }
-    }
-
-    // return String.fromCharCode.apply(null, utf16buf);
-    return utils.applyFromCharCode(utf16buf);
-};
-
-
-// That's all for the pako functions.
-
-
-/**
- * Transform a javascript string into an array (typed if possible) of bytes,
- * UTF-8 encoded.
- * @param {String} str the string to encode
- * @return {Array|Uint8Array|Buffer} the UTF-8 encoded string.
- */
-exports.utf8encode = function utf8encode(str) {
-    if (support.nodebuffer) {
-        return nodeBuffer(str, "utf-8");
-    }
-
-    return string2buf(str);
-};
-
-
-/**
- * Transform a bytes array (or a representation) representing an UTF-8 encoded
- * string into a javascript string.
- * @param {Array|Uint8Array|Buffer} buf the data de decode
- * @return {String} the decoded string.
- */
-exports.utf8decode = function utf8decode(buf) {
-    if (support.nodebuffer) {
-        return utils.transformTo("nodebuffer", buf).toString("utf-8");
-    }
-
-    buf = utils.transformTo(support.uint8array ? "uint8array" : "array", buf);
-
-    // return buf2string(buf);
-    // Chrome prefers to work with "small" chunks of data
-    // for the method buf2string.
-    // Firefox and Chrome has their own shortcut, IE doesn't seem to really care.
-    var result = [], k = 0, len = buf.length, chunk = 65536;
-    while (k < len) {
-        var nextBoundary = utf8border(buf, Math.min(k + chunk, len));
-        if (support.uint8array) {
-            result.push(buf2string(buf.subarray(k, nextBoundary)));
-        } else {
-            result.push(buf2string(buf.slice(k, nextBoundary)));
-        }
-        k = nextBoundary;
-    }
-    return result.join("");
-
-};
-// vim: set shiftwidth=4 softtabstop=4:
-
-},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(_dereq_,module,exports){
-'use strict';
-var support = _dereq_('./support');
-var compressions = _dereq_('./compressions');
-var nodeBuffer = _dereq_('./nodeBuffer');
-/**
- * Convert a string to a "binary string" : a string containing only char codes between 0 and 255.
- * @param {string} str the string to transform.
- * @return {String} the binary string.
- */
-exports.string2binary = function(str) {
-    var result = "";
-    for (var i = 0; i < str.length; i++) {
-        result += String.fromCharCode(str.charCodeAt(i) & 0xff);
-    }
-    return result;
-};
-exports.arrayBuffer2Blob = function(buffer, mimeType) {
-    exports.checkSupport("blob");
-	mimeType = mimeType || 'application/zip';
-
-    try {
-        // Blob constructor
-        return new Blob([buffer], {
-            type: mimeType
-        });
-    }
-    catch (e) {
-
-        try {
-            // deprecated, browser only, old way
-            var Builder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
-            var builder = new Builder();
-            builder.append(buffer);
-            return builder.getBlob(mimeType);
-        }
-        catch (e) {
-
-            // well, fuck ?!
-            throw new Error("Bug : can't construct the Blob.");
-        }
-    }
-
-
-};
-/**
- * The identity function.
- * @param {Object} input the input.
- * @return {Object} the same input.
- */
-function identity(input) {
-    return input;
-}
-
-/**
- * Fill in an array with a string.
- * @param {String} str the string to use.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to fill in (will be mutated).
- * @return {Array|ArrayBuffer|Uint8Array|Buffer} the updated array.
- */
-function stringToArrayLike(str, array) {
-    for (var i = 0; i < str.length; ++i) {
-        array[i] = str.charCodeAt(i) & 0xFF;
-    }
-    return array;
-}
-
-/**
- * Transform an array-like object to a string.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
- * @return {String} the result.
- */
-function arrayLikeToString(array) {
-    // Performances notes :
-    // --------------------
-    // String.fromCharCode.apply(null, array) is the fastest, see
-    // see http://jsperf.com/converting-a-uint8array-to-a-string/2
-    // but the stack is limited (and we can get huge arrays !).
-    //
-    // result += String.fromCharCode(array[i]); generate too many strings !
-    //
-    // This code is inspired by http://jsperf.com/arraybuffer-to-string-apply-performance/2
-    var chunk = 65536;
-    var result = [],
-        len = array.length,
-        type = exports.getTypeOf(array),
-        k = 0,
-        canUseApply = true;
-      try {
-         switch(type) {
-            case "uint8array":
-               String.fromCharCode.apply(null, new Uint8Array(0));
-               break;
-            case "nodebuffer":
-               String.fromCharCode.apply(null, nodeBuffer(0));
-               break;
-         }
-      } catch(e) {
-         canUseApply = false;
-      }
-
-      // no apply : slow and painful algorithm
-      // default browser on android 4.*
-      if (!canUseApply) {
-         var resultStr = "";
-         for(var i = 0; i < array.length;i++) {
-            resultStr += String.fromCharCode(array[i]);
-         }
-    return resultStr;
-    }
-    while (k < len && chunk > 1) {
-        try {
-            if (type === "array" || type === "nodebuffer") {
-                result.push(String.fromCharCode.apply(null, array.slice(k, Math.min(k + chunk, len))));
-            }
-            else {
-                result.push(String.fromCharCode.apply(null, array.subarray(k, Math.min(k + chunk, len))));
-            }
-            k += chunk;
-        }
-        catch (e) {
-            chunk = Math.floor(chunk / 2);
-        }
-    }
-    return result.join("");
-}
-
-exports.applyFromCharCode = arrayLikeToString;
-
-
-/**
- * Copy the data from an array-like to an other array-like.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} arrayFrom the origin array.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} arrayTo the destination array which will be mutated.
- * @return {Array|ArrayBuffer|Uint8Array|Buffer} the updated destination array.
- */
-function arrayLikeToArrayLike(arrayFrom, arrayTo) {
-    for (var i = 0; i < arrayFrom.length; i++) {
-        arrayTo[i] = arrayFrom[i];
-    }
-    return arrayTo;
-}
-
-// a matrix containing functions to transform everything into everything.
-var transform = {};
-
-// string to ?
-transform["string"] = {
-    "string": identity,
-    "array": function(input) {
-        return stringToArrayLike(input, new Array(input.length));
-    },
-    "arraybuffer": function(input) {
-        return transform["string"]["uint8array"](input).buffer;
-    },
-    "uint8array": function(input) {
-        return stringToArrayLike(input, new Uint8Array(input.length));
-    },
-    "nodebuffer": function(input) {
-        return stringToArrayLike(input, nodeBuffer(input.length));
-    }
-};
-
-// array to ?
-transform["array"] = {
-    "string": arrayLikeToString,
-    "array": identity,
-    "arraybuffer": function(input) {
-        return (new Uint8Array(input)).buffer;
-    },
-    "uint8array": function(input) {
-        return new Uint8Array(input);
-    },
-    "nodebuffer": function(input) {
-        return nodeBuffer(input);
-    }
-};
-
-// arraybuffer to ?
-transform["arraybuffer"] = {
-    "string": function(input) {
-        return arrayLikeToString(new Uint8Array(input));
-    },
-    "array": function(input) {
-        return arrayLikeToArrayLike(new Uint8Array(input), new Array(input.byteLength));
-    },
-    "arraybuffer": identity,
-    "uint8array": function(input) {
-        return new Uint8Array(input);
-    },
-    "nodebuffer": function(input) {
-        return nodeBuffer(new Uint8Array(input));
-    }
-};
-
-// uint8array to ?
-transform["uint8array"] = {
-    "string": arrayLikeToString,
-    "array": function(input) {
-        return arrayLikeToArrayLike(input, new Array(input.length));
-    },
-    "arraybuffer": function(input) {
-        return input.buffer;
-    },
-    "uint8array": identity,
-    "nodebuffer": function(input) {
-        return nodeBuffer(input);
-    }
-};
-
-// nodebuffer to ?
-transform["nodebuffer"] = {
-    "string": arrayLikeToString,
-    "array": function(input) {
-        return arrayLikeToArrayLike(input, new Array(input.length));
-    },
-    "arraybuffer": function(input) {
-        return transform["nodebuffer"]["uint8array"](input).buffer;
-    },
-    "uint8array": function(input) {
-        return arrayLikeToArrayLike(input, new Uint8Array(input.length));
-    },
-    "nodebuffer": identity
-};
-
-/**
- * Transform an input into any type.
- * The supported output type are : string, array, uint8array, arraybuffer, nodebuffer.
- * If no output type is specified, the unmodified input will be returned.
- * @param {String} outputType the output type.
- * @param {String|Array|ArrayBuffer|Uint8Array|Buffer} input the input to convert.
- * @throws {Error} an Error if the browser doesn't support the requested output type.
- */
-exports.transformTo = function(outputType, input) {
-    if (!input) {
-        // undefined, null, etc
-        // an empty string won't harm.
-        input = "";
-    }
-    if (!outputType) {
-        return input;
-    }
-    exports.checkSupport(outputType);
-    var inputType = exports.getTypeOf(input);
-    var result = transform[inputType][outputType](input);
-    return result;
-};
-
-/**
- * Return the type of the input.
- * The type will be in a format valid for JSZip.utils.transformTo : string, array, uint8array, arraybuffer.
- * @param {Object} input the input to identify.
- * @return {String} the (lowercase) type of the input.
- */
-exports.getTypeOf = function(input) {
-    if (typeof input === "string") {
-        return "string";
-    }
-    if (Object.prototype.toString.call(input) === "[object Array]") {
-        return "array";
-    }
-    if (support.nodebuffer && nodeBuffer.test(input)) {
-        return "nodebuffer";
-    }
-    if (support.uint8array && input instanceof Uint8Array) {
-        return "uint8array";
-    }
-    if (support.arraybuffer && input instanceof ArrayBuffer) {
-        return "arraybuffer";
-    }
-};
-
-/**
- * Throw an exception if the type is not supported.
- * @param {String} type the type to check.
- * @throws {Error} an Error if the browser doesn't support the requested type.
- */
-exports.checkSupport = function(type) {
-    var supported = support[type.toLowerCase()];
-    if (!supported) {
-        throw new Error(type + " is not supported by this browser");
-    }
-};
-exports.MAX_VALUE_16BITS = 65535;
-exports.MAX_VALUE_32BITS = -1; // well, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" is parsed as -1
-
-/**
- * Prettify a string read as binary.
- * @param {string} str the string to prettify.
- * @return {string} a pretty string.
- */
-exports.pretty = function(str) {
-    var res = '',
-        code, i;
-    for (i = 0; i < (str || "").length; i++) {
-        code = str.charCodeAt(i);
-        res += '\\x' + (code < 16 ? "0" : "") + code.toString(16).toUpperCase();
-    }
-    return res;
-};
-
-/**
- * Find a compression registered in JSZip.
- * @param {string} compressionMethod the method magic to find.
- * @return {Object|null} the JSZip compression object, null if none found.
- */
-exports.findCompression = function(compressionMethod) {
-    for (var method in compressions) {
-        if (!compressions.hasOwnProperty(method)) {
-            continue;
-        }
-        if (compressions[method].magic === compressionMethod) {
-            return compressions[method];
-        }
-    }
-    return null;
-};
-/**
-* Cross-window, cross-Node-context regular expression detection
-* @param  {Object}  object Anything
-* @return {Boolean}        true if the object is a regular expression,
-* false otherwise
-*/
-exports.isRegExp = function (object) {
-    return Object.prototype.toString.call(object) === "[object RegExp]";
-};
-
-
-},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(_dereq_,module,exports){
-'use strict';
-var StringReader = _dereq_('./stringReader');
-var NodeBufferReader = _dereq_('./nodeBufferReader');
-var Uint8ArrayReader = _dereq_('./uint8ArrayReader');
-var utils = _dereq_('./utils');
-var sig = _dereq_('./signature');
-var ZipEntry = _dereq_('./zipEntry');
-var support = _dereq_('./support');
-var jszipProto = _dereq_('./object');
-//  class ZipEntries {{{
-/**
- * All the entries in the zip file.
- * @constructor
- * @param {String|ArrayBuffer|Uint8Array} data the binary stream to load.
- * @param {Object} loadOptions Options for loading the stream.
- */
-function ZipEntries(data, loadOptions) {
-    this.files = [];
-    this.loadOptions = loadOptions;
-    if (data) {
-        this.load(data);
-    }
-}
-ZipEntries.prototype = {
-    /**
-     * Check that the reader is on the speficied signature.
-     * @param {string} expectedSignature the expected signature.
-     * @throws {Error} if it is an other signature.
-     */
-    checkSignature: function(expectedSignature) {
-        var signature = this.reader.readString(4);
-        if (signature !== expectedSignature) {
-            throw new Error("Corrupted zip or bug : unexpected signature " + "(" + utils.pretty(signature) + ", expected " + utils.pretty(expectedSignature) + ")");
-        }
-    },
-    /**
-     * Read the end of the central directory.
-     */
-    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);
-        // warning : the encoding depends of the system locale
-        // On a linux machine with LANG=en_US.utf8, this field is utf8 encoded.
-        // On a windows machine, this field is encoded with the localized windows code page.
-        this.zipComment = this.reader.readString(this.zipCommentLength);
-        // To get consistent behavior with the generation part, we will assume that
-        // this is utf8 encoded.
-        this.zipComment = jszipProto.utf8decode(this.zipComment);
-    },
-    /**
-     * Read the end of the Zip 64 central directory.
-     * Not merged with the method readEndOfCentral :
-     * The end of central can coexist with its Zip64 brother,
-     * I don't want to read the wrong number of bytes !
-     */
-    readBlockZip64EndOfCentral: function() {
-        this.zip64EndOfCentralSize = this.reader.readInt(8);
-        this.versionMadeBy = this.reader.readString(2);
-        this.versionNeeded = this.reader.readInt(2);
-        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 = {};
-        var extraDataSize = this.zip64EndOfCentralSize - 44,
-            index = 0,
-            extraFieldId,
-            extraFieldLength,
-            extraFieldValue;
-        while (index < extraDataSize) {
-            extraFieldId = this.reader.readInt(2);
-            extraFieldLength = this.reader.readInt(4);
-            extraFieldValue = this.reader.readString(extraFieldLength);
-            this.zip64ExtensibleData[extraFieldId] = {
-                id: extraFieldId,
-                length: extraFieldLength,
-                value: extraFieldValue
-            };
-        }
-    },
-    /**
-     * Read the end of the Zip 64 central directory locator.
-     */
-    readBlockZip64EndOfCentralLocator: function() {
-        this.diskWithZip64CentralDirStart = this.reader.readInt(4);
-        this.relativeOffsetEndOfZip64CentralDir = this.reader.readInt(8);
-        this.disksCount = this.reader.readInt(4);
-        if (this.disksCount > 1) {
-            throw new Error("Multi-volumes zip are not supported");
-        }
-    },
-    /**
-     * Read the local files, based on the offset read in the central part.
-     */
-    readLocalFiles: function() {
-        var i, file;
-        for (i = 0; i < this.files.length; i++) {
-            file = this.files[i];
-            this.reader.setIndex(file.localHeaderOffset);
-            this.checkSignature(sig.LOCAL_FILE_HEADER);
-            file.readLocalPart(this.reader);
-            file.handleUTF8();
-            file.processAttributes();
-        }
-    },
-    /**
-     * Read the central directory.
-     */
-    readCentralDir: function() {
-        var file;
-
-        this.reader.setIndex(this.centralDirOffset);
-        while (this.reader.readString(4) === sig.CENTRAL_FILE_HEADER) {
-            file = new ZipEntry({
-                zip64: this.zip64
-            }, this.loadOptions);
-            file.readCentralPart(this.reader);
-            this.files.push(file);
-        }
-    },
-    /**
-     * Read the end of central directory.
-     */
-    readEndOfCentral: function() {
-        var offset = this.reader.lastIndexOfSignature(sig.CENTRAL_DIRECTORY_END);
-        if (offset === -1) {
-            // Check if the content is a truncated zip or complete garbage.
-            // A "LOCAL_FILE_HEADER" is not required at the beginning (auto
-            // extractible zip for example) but it can give a good hint.
-            // If an ajax request was used without responseType, we will also
-            // get unreadable data.
-            var isGarbage = true;
-            try {
-                this.reader.setIndex(0);
-                this.checkSignature(sig.LOCAL_FILE_HEADER);
-                isGarbage = false;
-            } catch (e) {}
-
-            if (isGarbage) {
-                throw new Error("Can't find end of central directory : is this a zip file ? " +
-                                "If it is, see http://stuk.github.io/jszip/documentation/howto/read_zip.html");
-            } else {
-                throw new Error("Corrupted zip : can't find end of central directory");
-            }
-        }
-        this.reader.setIndex(offset);
-        this.checkSignature(sig.CENTRAL_DIRECTORY_END);
-        this.readBlockEndOfCentral();
-
-
-        /* extract from the zip spec :
-            4)  If one of the fields in the end of central directory
-                record is too small to hold required data, the field
-                should be set to -1 (0xFFFF or 0xFFFFFFFF) and the
-                ZIP64 format record should be created.
-            5)  The end of central directory record and the
-                Zip64 end of central directory locator record must
-                reside on the same disk when splitting or spanning
-                an archive.
-         */
-        if (this.diskNumber === utils.MAX_VALUE_16BITS || this.diskWithCentralDirStart === utils.MAX_VALUE_16BITS || this.centralDirRecordsOnThisDisk === utils.MAX_VALUE_16BITS || this.centralDirRecords === utils.MAX_VALUE_16BITS || this.centralDirSize === utils.MAX_VALUE_32BITS || this.centralDirOffset === utils.MAX_VALUE_32BITS) {
-            this.zip64 = true;
-
-            /*
-            Warning : the zip64 extension is supported, but ONLY if the 64bits integer read from
-            the zip file can fit into a 32bits integer. This cannot be solved : Javascript represents
-            all numbers as 64-bit double precision IEEE 754 floating point numbers.
-            So, we have 53bits for integers and bitwise operations treat everything as 32bits.
-            see https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Operators/Bitwise_Operators
-            and http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf section 8.5
-            */
-
-            // should look for a zip64 EOCD locator
-            offset = this.reader.lastIndexOfSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
-            if (offset === -1) {
-                throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");
-            }
-            this.reader.setIndex(offset);
-            this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
-            this.readBlockZip64EndOfCentralLocator();
-
-            // now the zip64 EOCD record
-            this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir);
-            this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_END);
-            this.readBlockZip64EndOfCentral();
-        }
-    },
-    prepareReader: function(data) {
-        var type = utils.getTypeOf(data);
-        if (type === "string" && !support.uint8array) {
-            this.reader = new StringReader(data, this.loadOptions.optimizedBinaryString);
-        }
-        else if (type === "nodebuffer") {
-            this.reader = new NodeBufferReader(data);
-        }
-        else {
-            this.reader = new Uint8ArrayReader(utils.transformTo("uint8array", data));
-        }
-    },
-    /**
-     * Read a zip file and create ZipEntries.
-     * @param {String|ArrayBuffer|Uint8Array|Buffer} data the binary string representing a zip file.
-     */
-    load: function(data) {
-        this.prepareReader(data);
-        this.readEndOfCentral();
-        this.readCentralDir();
-        this.readLocalFiles();
-    }
-};
-// }}} end of ZipEntries
-module.exports = ZipEntries;
-
-},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(_dereq_,module,exports){
-'use strict';
-var StringReader = _dereq_('./stringReader');
-var utils = _dereq_('./utils');
-var CompressedObject = _dereq_('./compressedObject');
-var jszipProto = _dereq_('./object');
-
-var MADE_BY_DOS = 0x00;
-var MADE_BY_UNIX = 0x03;
-
-// class ZipEntry {{{
-/**
- * An entry in the zip file.
- * @constructor
- * @param {Object} options Options of the current file.
- * @param {Object} loadOptions Options for loading the stream.
- */
-function ZipEntry(options, loadOptions) {
-    this.options = options;
-    this.loadOptions = loadOptions;
-}
-ZipEntry.prototype = {
-    /**
-     * say if the file is encrypted.
-     * @return {boolean} true if the file is encrypted, false otherwise.
-     */
-    isEncrypted: function() {
-        // bit 1 is set
-        return (this.bitFlag & 0x0001) === 0x0001;
-    },
-    /**
-     * say if the file has utf-8 filename/comment.
-     * @return {boolean} true if the filename/comment is in utf-8, false otherwise.
-     */
-    useUTF8: function() {
-        // bit 11 is set
-        return (this.bitFlag & 0x0800) === 0x0800;
-    },
-    /**
-     * Prepare the function used to generate the compressed content from this ZipFile.
-     * @param {DataReader} reader the reader to use.
-     * @param {number} from the offset from where we should read the data.
-     * @param {number} length the length of the data to read.
-     * @return {Function} the callback to get the compressed content (the type depends of the DataReader class).
-     */
-    prepareCompressedContent: function(reader, from, length) {
-        return function() {
-            var previousIndex = reader.index;
-            reader.setIndex(from);
-            var compressedFileData = reader.readData(length);
-            reader.setIndex(previousIndex);
-
-            return compressedFileData;
-        };
-    },
-    /**
-     * Prepare the function used to generate the uncompressed content from this ZipFile.
-     * @param {DataReader} reader the reader to use.
-     * @param {number} from the offset from where we should read the data.
-     * @param {number} length the length of the data to read.
-     * @param {JSZip.compression} compression the compression used on this file.
-     * @param {number} uncompressedSize the uncompressed size to expect.
-     * @return {Function} the callback to get the uncompressed content (the type depends of the DataReader class).
-     */
-    prepareContent: function(reader, from, length, compression, uncompressedSize) {
-        return function() {
-
-            var compressedFileData = utils.transformTo(compression.uncompressInputType, this.getCompressedContent());
-            var uncompressedFileData = compression.uncompress(compressedFileData);
-
-            if (uncompressedFileData.length !== uncompressedSize) {
-                throw new Error("Bug : uncompressed data size mismatch");
-            }
-
-            return uncompressedFileData;
-        };
-    },
-    /**
-     * Read the local part of a zip file and add the info in this object.
-     * @param {DataReader} reader the reader to use.
-     */
-    readLocalPart: function(reader) {
-        var compression, localExtraFieldsLength;
-
-        // we already know everything from the central dir !
-        // If the central dir data are false, we are doomed.
-        // On the bright side, the local part is scary  : zip64, data descriptors, both, etc.
-        // The less data we get here, the more reliable this should be.
-        // Let's skip the whole header and dash to the data !
-        reader.skip(22);
-        // in some zip created on windows, the filename stored in the central dir contains \ instead of /.
-        // Strangely, the filename here is OK.
-        // I would love to treat these zip files as corrupted (see http://www.info-zip.org/FAQ.html#backslashes
-        // or APPNOTE#4.4.17.1, "All slashes MUST be forward slashes '/'") but there are a lot of bad zip generators...
-        // Search "unzip mismatching "local" filename continuing with "central" filename version" on
-        // the internet.
-        //
-        // I think I see the logic here : the central directory is used to display
-        // content and the local directory is used to extract the files. Mixing / and \
-        // may be used to display \ to windows users and use / when extracting the files.
-        // Unfortunately, this lead also to some issues : http://seclists.org/fulldisclosure/2009/Sep/394
-        this.fileNameLength = reader.readInt(2);
-        localExtraFieldsLength = reader.readInt(2); // can't be sure this will be the same as the central dir
-        this.fileName = reader.readString(this.fileNameLength);
-        reader.skip(localExtraFieldsLength);
-
-        if (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)");
-        }
-
-        compression = utils.findCompression(this.compressionMethod);
-        if (compression === null) { // no compression found
-            throw new Error("Corrupted zip : compression " + utils.pretty(this.compressionMethod) + " unknown (inner file : " + this.fileName + ")");
-        }
-        this.decompressed = new CompressedObject();
-        this.decompressed.compressedSize = this.compressedSize;
-        this.decompressed.uncompressedSize = this.uncompressedSize;
-        this.decompressed.crc32 = this.crc32;
-        this.decompressed.compressionMethod = this.compressionMethod;
-        this.decompressed.getCompressedContent = this.prepareCompressedContent(reader, reader.index, this.compressedSize, compression);
-        this.decompressed.getContent = this.prepareContent(reader, reader.index, this.compressedSize, compression, this.uncompressedSize);
-
-        // we need to compute the crc32...
-        if (this.loadOptions.checkCRC32) {
-            this.decompressed = utils.transformTo("string", this.decompressed.getContent());
-            if (jszipProto.crc32(this.decompressed) !== this.crc32) {
-                throw new Error("Corrupted zip : CRC32 mismatch");
-            }
-        }
-    },
-
-    /**
-     * Read the central part of a zip file and add the info in this object.
-     * @param {DataReader} reader the reader to use.
-     */
-    readCentralPart: function(reader) {
-        this.versionMadeBy = reader.readInt(2);
-        this.versionNeeded = reader.readInt(2);
-        this.bitFlag = reader.readInt(2);
-        this.compressionMethod = reader.readString(2);
-        this.date = reader.readDate();
-        this.crc32 = reader.readInt(4);
-        this.compressedSize = reader.readInt(4);
-        this.uncompressedSize = reader.readInt(4);
-        this.fileNameLength = reader.readInt(2);
-        this.extraFieldsLength = reader.readInt(2);
-        this.fileCommentLength = reader.readInt(2);
-        this.diskNumberStart = reader.readInt(2);
-        this.internalFileAttributes = reader.readInt(2);
-        this.externalFileAttributes = reader.readInt(4);
-        this.localHeaderOffset = reader.readInt(4);
-
-        if (this.isEncrypted()) {
-            throw new Error("Encrypted zip are not supported");
-        }
-
-        this.fileName = reader.readString(this.fileNameLength);
-        this.readExtraFields(reader);
-        this.parseZIP64ExtraField(reader);
-        this.fileComment = reader.readString(this.fileCommentLength);
-    },
-
-    /**
-     * Parse the external file attributes and get the unix/dos permissions.
-     */
-    processAttributes: function () {
-        this.unixPermissions = null;
-        this.dosPermissions = null;
-        var madeBy = this.versionMadeBy >> 8;
-
-        // Check if we have the DOS directory flag set.
-        // We look for it in the DOS and UNIX permissions
-        // but some unknown platform could set it as a compatibility flag.
-        this.dir = this.externalFileAttributes & 0x0010 ? true : false;
-
-        if(madeBy === MADE_BY_DOS) {
-            // first 6 bits (0 to 5)
-            this.dosPermissions = this.externalFileAttributes & 0x3F;
-        }
-
-        if(madeBy === MADE_BY_UNIX) {
-            this.unixPermissions = (this.externalFileAttributes >> 16) & 0xFFFF;
-            // the octal permissions are in (this.unixPermissions & 0x01FF).toString(8);
-        }
-
-        // fail safe : if the name ends with a / it probably means a folder
-        if (!this.dir && this.fileName.slice(-1) === '/') {
-            this.dir = true;
-        }
-    },
-
-    /**
-     * Parse the ZIP64 extra field and merge the info in the current ZipEntry.
-     * @param {DataReader} reader the reader to use.
-     */
-    parseZIP64ExtraField: function(reader) {
-
-        if (!this.extraFields[0x0001]) {
-            return;
-        }
-
-        // should be something, preparing the extra reader
-        var extraReader = new StringReader(this.extraFields[0x0001].value);
-
-        // I really hope that these 64bits integer can fit in 32 bits integer, because js
-        // won't let us have more.
-        if (this.uncompressedSize === utils.MAX_VALUE_32BITS) {
-            this.uncompressedSize = extraReader.readInt(8);
-        }
-        if (this.compressedSize === utils.MAX_VALUE_32BITS) {
-            this.compressedSize = extraReader.readInt(8);
-        }
-        if (this.localHeaderOffset === utils.MAX_VALUE_32BITS) {
-            this.localHeaderOffset = extraReader.readInt(8);
-        }
-        if (this.diskNumberStart === utils.MAX_VALUE_32BITS) {
-            this.diskNumberStart = extraReader.readInt(4);
-        }
-    },
-    /**
-     * Read the central part of a zip file and add the info in this object.
-     * @param {DataReader} reader the reader to use.
-     */
-    readExtraFields: function(reader) {
-        var start = reader.index,
-            extraFieldId,
-            extraFieldLength,
-            extraFieldValue;
-
-        this.extraFields = this.extraFields || {};
-
-        while (reader.index < start + this.extraFieldsLength) {
-            extraFieldId = reader.readInt(2);
-            extraFieldLength = reader.readInt(2);
-            extraFieldValue = reader.readString(extraFieldLength);
-
-            this.extraFields[extraFieldId] = {
-                id: extraFieldId,
-                length: extraFieldLength,
-                value: extraFieldValue
-            };
-        }
-    },
-    /**
-     * Apply an UTF8 transformation if needed.
-     */
-    handleUTF8: function() {
-        if (this.useUTF8()) {
-            this.fileName = jszipProto.utf8decode(this.fileName);
-            this.fileComment = jszipProto.utf8decode(this.fileComment);
-        } else {
-            var upath = this.findExtraFieldUnicodePath();
-            if (upath !== null) {
-                this.fileName = upath;
-            }
-            var ucomment = this.findExtraFieldUnicodeComment();
-            if (ucomment !== null) {
-                this.fileComment = ucomment;
-            }
-        }
-    },
-
-    /**
-     * Find the unicode path declared in the extra field, if any.
-     * @return {String} the unicode path, null otherwise.
-     */
-    findExtraFieldUnicodePath: function() {
-        var upathField = this.extraFields[0x7075];
-        if (upathField) {
-            var extraReader = new StringReader(upathField.value);
-
-            // wrong version
-            if (extraReader.readInt(1) !== 1) {
-                return null;
-            }
-
-            // the crc of the filename changed, this field is out of date.
-            if (jszipProto.crc32(this.fileName) !== extraReader.readInt(4)) {
-                return null;
-            }
-
-            return jszipProto.utf8decode(extraReader.readString(upathField.length - 5));
-        }
-        return null;
-    },
-
-    /**
-     * Find the unicode comment declared in the extra field, if any.
-     * @return {String} the unicode comment, null otherwise.
-     */
-    findExtraFieldUnicodeComment: function() {
-        var ucommentField = this.extraFields[0x6375];
-        if (ucommentField) {
-            var extraReader = new StringReader(ucommentField.value);
-
-            // wrong version
-            if (extraReader.readInt(1) !== 1) {
-                return null;
-            }
-
-            // the crc of the comment changed, this field is out of date.
-            if (jszipProto.crc32(this.fileComment) !== extraReader.readInt(4)) {
-                return null;
-            }
-
-            return jszipProto.utf8decode(extraReader.readString(ucommentField.length - 5));
-        }
-        return null;
-    }
-};
-module.exports = ZipEntry;
-
-},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(_dereq_,module,exports){
-// Top level file is just a mixin of submodules & constants
-'use strict';
-
-var assign    = _dereq_('./lib/utils/common').assign;
-
-var deflate   = _dereq_('./lib/deflate');
-var inflate   = _dereq_('./lib/inflate');
-var constants = _dereq_('./lib/zlib/constants');
-
-var pako = {};
-
-assign(pako, deflate, inflate, constants);
-
-module.exports = pako;
-},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(_dereq_,module,exports){
-'use strict';
-
-
-var zlib_deflate = _dereq_('./zlib/deflate.js');
-var utils = _dereq_('./utils/common');
-var strings = _dereq_('./utils/strings');
-var msg = _dereq_('./zlib/messages');
-var zstream = _dereq_('./zlib/zstream');
-
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-var Z_NO_FLUSH      = 0;
-var Z_FINISH        = 4;
-
-var Z_OK            = 0;
-var Z_STREAM_END    = 1;
-
-var Z_DEFAULT_COMPRESSION = -1;
-
-var Z_DEFAULT_STRATEGY    = 0;
-
-var Z_DEFLATED  = 8;
-
-/* ===========================================================================*/
-
-
-/**
- * class Deflate
- *
- * Generic JS-style wrapper for zlib calls. If you don't need
- * streaming behaviour - use more simple functions: [[deflate]],
- * [[deflateRaw]] and [[gzip]].
- **/
-
-/* internal
- * Deflate.chunks -> Array
- *
- * Chunks of output data, if [[Deflate#onData]] not overriden.
- **/
-
-/**
- * Deflate.result -> Uint8Array|Array
- *
- * Compressed result, generated by default [[Deflate#onData]]
- * and [[Deflate#onEnd]] handlers. Filled after you push last chunk
- * (call [[Deflate#push]] with `Z_FINISH` / `true` param).
- **/
-
-/**
- * Deflate.err -> Number
- *
- * Error code after deflate finished. 0 (Z_OK) on success.
- * You will not need it in real life, because deflate errors
- * are possible only on wrong options or bad `onData` / `onEnd`
- * custom handlers.
- **/
-
-/**
- * Deflate.msg -> String
- *
- * Error message, if [[Deflate.err]] != 0
- **/
-
-
-/**
- * new Deflate(options)
- * - options (Object): zlib deflate options.
- *
- * Creates new deflator instance with specified params. Throws exception
- * on bad params. Supported options:
- *
- * - `level`
- * - `windowBits`
- * - `memLevel`
- * - `strategy`
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information on these.
- *
- * Additional options, for internal needs:
- *
- * - `chunkSize` - size of generated data chunks (16K by default)
- * - `raw` (Boolean) - do raw deflate
- * - `gzip` (Boolean) - create gzip wrapper
- * - `to` (String) - if equal to 'string', then result will be "binary string"
- *    (each char code [0..255])
- * - `header` (Object) - custom header for gzip
- *   - `text` (Boolean) - true if compressed data believed to be text
- *   - `time` (Number) - modification time, unix timestamp
- *   - `os` (Number) - operation system code
- *   - `extra` (Array) - array of bytes with extra data (max 65536)
- *   - `name` (String) - file name (binary string)
- *   - `comment` (String) - comment (binary string)
- *   - `hcrc` (Boolean) - true if header crc should be added
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- *   , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
- *   , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
- *
- * var deflate = new pako.Deflate({ level: 3});
- *
- * deflate.push(chunk1, false);
- * deflate.push(chunk2, true);  // true -> last chunk
- *
- * if (deflate.err) { throw new Error(deflate.err); }
- *
- * console.log(deflate.result);
- * ```
- **/
-var Deflate = function(options) {
-
-  this.options = utils.assign({
-    level: Z_DEFAULT_COMPRESSION,
-    method: Z_DEFLATED,
-    chunkSize: 16384,
-    windowBits: 15,
-    memLevel: 8,
-    strategy: Z_DEFAULT_STRATEGY,
-    to: ''
-  }, options || {});
-
-  var opt = this.options;
-
-  if (opt.raw && (opt.windowBits > 0)) {
-    opt.windowBits = -opt.windowBits;
-  }
-
-  else if (opt.gzip && (opt.windowBits > 0) && (opt.windowBits < 16)) {
-    opt.windowBits += 16;
-  }
-
-  this.err    = 0;      // error code, if happens (0 = Z_OK)
-  this.msg    = '';     // error message
-  this.ended  = false;  // used to avoid multiple onEnd() calls
-  this.chunks = [];     // chunks of compressed data
-
-  this.strm = new zstream();
-  this.strm.avail_out = 0;
-
-  var status = zlib_deflate.deflateInit2(
-    this.strm,
-    opt.level,
-    opt.method,
-    opt.windowBits,
-    opt.memLevel,
-    opt.strategy
-  );
-
-  if (status !== Z_OK) {
-    throw new Error(msg[status]);
-  }
-
-  if (opt.header) {
-    zlib_deflate.deflateSetHeader(this.strm, opt.header);
-  }
-};
-
-/**
- * Deflate#push(data[, mode]) -> Boolean
- * - data (Uint8Array|Array|String): input data. Strings will be converted to
- *   utf8 byte sequence.
- * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
- *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
- *
- * Sends input data to deflate pipe, generating [[Deflate#onData]] calls with
- * new compressed chunks. Returns `true` on success. The last data block must have
- * mode Z_FINISH (or `true`). That flush internal pending buffers and call
- * [[Deflate#onEnd]].
- *
- * On fail call [[Deflate#onEnd]] with error code and return false.
- *
- * We strongly recommend to use `Uint8Array` on input for best speed (output
- * array format is detected automatically). Also, don't skip last param and always
- * use the same type in your code (boolean or number). That will improve JS speed.
- *
- * For regular `Array`-s make sure all elements are [0..255].
- *
- * ##### Example
- *
- * ```javascript
- * push(chunk, false); // push one of data chunks
- * ...
- * push(chunk, true);  // push last chunk
- * ```
- **/
-Deflate.prototype.push = function(data, mode) {
-  var strm = this.strm;
-  var chunkSize = this.options.chunkSize;
-  var status, _mode;
-
-  if (this.ended) { return false; }
-
-  _mode = (mode === ~~mode) ? mode : ((mode === true) ? Z_FINISH : Z_NO_FLUSH);
-
-  // Convert data if needed
-  if (typeof data === 'string') {
-    // If we need to compress text, change encoding to utf8.
-    strm.input = strings.string2buf(data);
-  } else {
-    strm.input = data;
-  }
-
-  strm.next_in = 0;
-  strm.avail_in = strm.input.length;
-
-  do {
-    if (strm.avail_out === 0) {
-      strm.output = new utils.Buf8(chunkSize);
-      strm.next_out = 0;
-      strm.avail_out = chunkSize;
-    }
-    status = zlib_deflate.deflate(strm, _mode);    /* no bad return value */
-
-    if (status !== Z_STREAM_END && status !== Z_OK) {
-      this.onEnd(status);
-      this.ended = true;
-      return false;
-    }
-    if (strm.avail_out === 0 || (strm.avail_in === 0 && _mode === Z_FINISH)) {
-      if (this.options.to === 'string') {
-        this.onData(strings.buf2binstring(utils.shrinkBuf(strm.output, strm.next_out)));
-      } else {
-        this.onData(utils.shrinkBuf(strm.output, strm.next_out));
-      }
-    }
-  } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== Z_STREAM_END);
-
-  // Finalize on the last chunk.
-  if (_mode === Z_FINISH) {
-    status = zlib_deflate.deflateEnd(this.strm);
-    this.onEnd(status);
-    this.ended = true;
-    return status === Z_OK;
-  }
-
-  return true;
-};
-
-
-/**
- * Deflate#onData(chunk) -> Void
- * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
- *   on js engine support. When string output requested, each chunk
- *   will be string.
- *
- * By default, stores data blocks in `chunks[]` property and glue
- * those in `onEnd`. Override this handler, if you need another behaviour.
- **/
-Deflate.prototype.onData = function(chunk) {
-  this.chunks.push(chunk);
-};
-
-
-/**
- * Deflate#onEnd(status) -> Void
- * - status (Number): deflate status. 0 (Z_OK) on success,
- *   other if not.
- *
- * Called once after you tell deflate that input stream complete
- * or error happenned. By default - join collected chunks,
- * free memory and fill `results` / `err` properties.
- **/
-Deflate.prototype.onEnd = function(status) {
-  // On success - join
-  if (status === Z_OK) {
-    if (this.options.to === 'string') {
-      this.result = this.chunks.join('');
-    } else {
-      this.result = utils.flattenChunks(this.chunks);
-    }
-  }
-  this.chunks = [];
-  this.err = status;
-  this.msg = this.strm.msg;
-};
-
-
-/**
- * deflate(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to compress.
- * - options (Object): zlib deflate options.
- *
- * Compress `data` with deflate alrorythm and `options`.
- *
- * Supported options are:
- *
- * - level
- * - windowBits
- * - memLevel
- * - strategy
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information on these.
- *
- * Sugar (options):
- *
- * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
- *   negative windowBits implicitly.
- * - `to` (String) - if equal to 'string', then result will be "binary string"
- *    (each char code [0..255])
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- *   , data = Uint8Array([1,2,3,4,5,6,7,8,9]);
- *
- * console.log(pako.deflate(data));
- * ```
- **/
-function deflate(input, options) {
-  var deflator = new Deflate(options);
-
-  deflator.push(input, true);
-
-  // That will never happens, if you don't cheat with options :)
-  if (deflator.err) { throw deflator.msg; }
-
-  return deflator.result;
-}
-
-
-/**
- * deflateRaw(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to compress.
- * - options (Object): zlib deflate options.
- *
- * The same as [[deflate]], but creates raw data, without wrapper
- * (header and adler32 crc).
- **/
-function deflateRaw(input, options) {
-  options = options || {};
-  options.raw = true;
-  return deflate(input, options);
-}
-
-
-/**
- * gzip(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to compress.
- * - options (Object): zlib deflate options.
- *
- * The same as [[deflate]], but create gzip wrapper instead of
- * deflate one.
- **/
-function gzip(input, options) {
-  options = options || {};
-  options.gzip = true;
-  return deflate(input, options);
-}
-
-
-exports.Deflate = Deflate;
-exports.deflate = deflate;
-exports.deflateRaw = deflateRaw;
-exports.gzip = gzip;
-},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(_dereq_,module,exports){
-'use strict';
-
-
-var zlib_inflate = _dereq_('./zlib/inflate.js');
-var utils = _dereq_('./utils/common');
-var strings = _dereq_('./utils/strings');
-var c = _dereq_('./zlib/constants');
-var msg = _dereq_('./zlib/messages');
-var zstream = _dereq_('./zlib/zstream');
-var gzheader = _dereq_('./zlib/gzheader');
-
-
-/**
- * class Inflate
- *
- * Generic JS-style wrapper for zlib calls. If you don't need
- * streaming behaviour - use more simple functions: [[inflate]]
- * and [[inflateRaw]].
- **/
-
-/* internal
- * inflate.chunks -> Array
- *
- * Chunks of output data, if [[Inflate#onData]] not overriden.
- **/
-
-/**
- * Inflate.result -> Uint8Array|Array|String
- *
- * Uncompressed result, generated by default [[Inflate#onData]]
- * and [[Inflate#onEnd]] handlers. Filled after you push last chunk
- * (call [[Inflate#push]] with `Z_FINISH` / `true` param).
- **/
-
-/**
- * Inflate.err -> Number
- *
- * Error code after inflate finished. 0 (Z_OK) on success.
- * Should be checked if broken data possible.
- **/
-
-/**
- * Inflate.msg -> String
- *
- * Error message, if [[Inflate.err]] != 0
- **/
-
-
-/**
- * new Inflate(options)
- * - options (Object): zlib inflate options.
- *
- * Creates new inflator instance with specified params. Throws exception
- * on bad params. Supported options:
- *
- * - `windowBits`
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information on these.
- *
- * Additional options, for internal needs:
- *
- * - `chunkSize` - size of generated data chunks (16K by default)
- * - `raw` (Boolean) - do raw inflate
- * - `to` (String) - if equal to 'string', then result will be converted
- *   from utf8 to utf16 (javascript) string. When string output requested,
- *   chunk length can differ from `chunkSize`, depending on content.
- *
- * By default, when no options set, autodetect deflate/gzip data format via
- * wrapper header.
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- *   , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
- *   , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
- *
- * var inflate = new pako.Inflate({ level: 3});
- *
- * inflate.push(chunk1, false);
- * inflate.push(chunk2, true);  // true -> last chunk
- *
- * if (inflate.err) { throw new Error(inflate.err); }
- *
- * console.log(inflate.result);
- * ```
- **/
-var Inflate = function(options) {
-
-  this.options = utils.assign({
-    chunkSize: 16384,
-    windowBits: 0,
-    to: ''
-  }, options || {});
-
-  var opt = this.options;
-
-  // Force window size for `raw` data, if not set directly,
-  // because we have no header for autodetect.
-  if (opt.raw && (opt.windowBits >= 0) && (opt.windowBits < 16)) {
-    opt.windowBits = -opt.windowBits;
-    if (opt.windowBits === 0) { opt.windowBits = -15; }
-  }
-
-  // If `windowBits` not defined (and mode not raw) - set autodetect flag for gzip/deflate
-  if ((opt.windowBits >= 0) && (opt.windowBits < 16) &&
-      !(options && options.windowBits)) {
-    opt.windowBits += 32;
-  }
-
-  // Gzip header has no info about windows size, we can do autodetect only
-  // for deflate. So, if window size not set, force it to max when gzip possible
-  if ((opt.windowBits > 15) && (opt.windowBits < 48)) {
-    // bit 3 (16) -> gzipped data
-    // bit 4 (32) -> autodetect gzip/deflate
-    if ((opt.windowBits & 15) === 0) {
-      opt.windowBits |= 15;
-    }
-  }
-
-  this.err    = 0;      // error code, if happens (0 = Z_OK)
-  this.msg    = '';     // error message
-  this.ended  = false;  // used to avoid multiple onEnd() calls
-  this.chunks = [];     // chunks of compressed data
-
-  this.strm   = new zstream();
-  this.strm.avail_out = 0;
-
-  var status  = zlib_inflate.inflateInit2(
-    this.strm,
-    opt.windowBits
-  );
-
-  if (status !== c.Z_OK) {
-    throw new Error(msg[status]);
-  }
-
-  this.header = new gzheader();
-
-  zlib_inflate.inflateGetHeader(this.strm, this.header);
-};
-
-/**
- * Inflate#push(data[, mode]) -> Boolean
- * - data (Uint8Array|Array|String): input data
- * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
- *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
- *
- * Sends input data to inflate pipe, generating [[Inflate#onData]] calls with
- * new output chunks. Returns `true` on success. The last data block must have
- * mode Z_FINISH (or `true`). That flush internal pending buffers and call
- * [[Inflate#onEnd]].
- *
- * On fail call [[Inflate#onEnd]] with error code and return false.
- *
- * We strongly recommend to use `Uint8Array` on input for best speed (output
- * format is detected automatically). Also, don't skip last param and always
- * use the same type in your code (boolean or number). That will improve JS speed.
- *
- * For regular `Array`-s make sure all elements are [0..255].
- *
- * ##### Example
- *
- * ```javascript
- * push(chunk, false); // push one of data chunks
- * ...
- * push(chunk, true);  // push last chunk
- * ```
- **/
-Inflate.prototype.push = function(data, mode) {
-  var strm = this.strm;
-  var chunkSize = this.options.chunkSize;
-  var status, _mode;
-  var next_out_utf8, tail, utf8str;
-
-  if (this.ended) { return false; }
-  _mode = (mode === ~~mode) ? mode : ((mode === true) ? c.Z_FINISH : c.Z_NO_FLUSH);
-
-  // Convert data if needed
-  if (typeof data === 'string') {
-    // Only binary strings can be decompressed on practice
-    strm.input = strings.binstring2buf(data);
-  } else {
-    strm.input = data;
-  }
-
-  strm.next_in = 0;
-  strm.avail_in = strm.input.length;
-
-  do {
-    if (strm.avail_out === 0) {
-      strm.output = new utils.Buf8(chunkSize);
-      strm.next_out = 0;
-      strm.avail_out = chunkSize;
-    }
-
-    status = zlib_inflate.inflate(strm, c.Z_NO_FLUSH);    /* no bad return value */
-
-    if (status !== c.Z_STREAM_END && status !== c.Z_OK) {
-      this.onEnd(status);
-      this.ended = true;
-      return false;
-    }
-
-    if (strm.next_out) {
-      if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && _mode === c.Z_FINISH)) {
-
-        if (this.options.to === 'string') {
-
-          next_out_utf8 = strings.utf8border(strm.output, strm.next_out);
-
-          tail = strm.next_out - next_out_utf8;
-          utf8str = strings.buf2string(strm.output, next_out_utf8);
-
-          // move tail
-          strm.next_out = tail;
-          strm.avail_out = chunkSize - tail;
-          if (tail) { utils.arraySet(strm.output, strm.output, next_out_utf8, tail, 0); }
-
-          this.onData(utf8str);
-
-        } else {
-          this.onData(utils.shrinkBuf(strm.output, strm.next_out));
-        }
-      }
-    }
-  } while ((strm.avail_in > 0) && status !== c.Z_STREAM_END);
-
-  if (status === c.Z_STREAM_END) {
-    _mode = c.Z_FINISH;
-  }
-  // Finalize on the last chunk.
-  if (_mode === c.Z_FINISH) {
-    status = zlib_inflate.inflateEnd(this.strm);
-    this.onEnd(status);
-    this.ended = true;
-    return status === c.Z_OK;
-  }
-
-  return true;
-};
-
-
-/**
- * Inflate#onData(chunk) -> Void
- * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
- *   on js engine support. When string output requested, each chunk
- *   will be string.
- *
- * By default, stores data blocks in `chunks[]` property and glue
- * those in `onEnd`. Override this handler, if you need another behaviour.
- **/
-Inflate.prototype.onData = function(chunk) {
-  this.chunks.push(chunk);
-};
-
-
-/**
- * Inflate#onEnd(status) -> Void
- * - status (Number): inflate status. 0 (Z_OK) on success,
- *   other if not.
- *
- * Called once after you tell inflate that input stream complete
- * or error happenned. By default - join collected chunks,
- * free memory and fill `results` / `err` properties.
- **/
-Inflate.prototype.onEnd = function(status) {
-  // On success - join
-  if (status === c.Z_OK) {
-    if (this.options.to === 'string') {
-      // Glue & convert here, until we teach pako to send
-      // utf8 alligned strings to onData
-      this.result = this.chunks.join('');
-    } else {
-      this.result = utils.flattenChunks(this.chunks);
-    }
-  }
-  this.chunks = [];
-  this.err = status;
-  this.msg = this.strm.msg;
-};
-
-
-/**
- * inflate(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to decompress.
- * - options (Object): zlib inflate options.
- *
- * Decompress `data` with inflate/ungzip and `options`. Autodetect
- * format via wrapper header by default. That's why we don't provide
- * separate `ungzip` method.
- *
- * Supported options are:
- *
- * - windowBits
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information.
- *
- * Sugar (options):
- *
- * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
- *   negative windowBits implicitly.
- * - `to` (String) - if equal to 'string', then result will be converted
- *   from utf8 to utf16 (javascript) string. When string output requested,
- *   chunk length can differ from `chunkSize`, depending on content.
- *
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- *   , input = pako.deflate([1,2,3,4,5,6,7,8,9])
- *   , output;
- *
- * try {
- *   output = pako.inflate(input);
- * } catch (err)
- *   console.log(err);
- * }
- * ```
- **/
-function inflate(input, options) {
-  var inflator = new Inflate(options);
-
-  inflator.push(input, true);
-
-  // That will never happens, if you don't cheat with options :)
-  if (inflator.err) { throw inflator.msg; }
-
-  return inflator.result;
-}
-
-
-/**
- * inflateRaw(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to decompress.
- * - options (Object): zlib inflate options.
- *
- * The same as [[inflate]], but creates raw data, without wrapper
- * (header and adler32 crc).
- **/
-function inflateRaw(input, options) {
-  options = options || {};
-  options.raw = true;
-  return inflate(input, options);
-}
-
-
-/**
- * ungzip(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to decompress.
- * - options (Object): zlib inflate options.
- *
- * Just shortcut to [[inflate]], because it autodetects format
- * by header.content. Done for convenience.
- **/
-
-
-exports.Inflate = Inflate;
-exports.inflate = inflate;
-exports.inflateRaw = inflateRaw;
-exports.ungzip  = inflate;
-
-},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(_dereq_,module,exports){
-'use strict';
-
-
-var TYPED_OK =  (typeof Uint8Array !== 'undefined') &&
-                (typeof Uint16Array !== 'undefined') &&
-                (typeof Int32Array !== 'undefined');
-
-
-exports.assign = function (obj /*from1, from2, from3, ...*/) {
-  var sources = Array.prototype.slice.call(arguments, 1);
-  while (sources.length) {
-    var source = sources.shift();
-    if (!source) { continue; }
-
-    if (typeof(source) !== 'object') {
-      throw new TypeError(source + 'must be non-object');
-    }
-
-    for (var p in source) {
-      if (source.hasOwnProperty(p)) {
-        obj[p] = source[p];
-      }
-    }
-  }
-
-  return obj;
-};
-
-
-// reduce buffer size, avoiding mem copy
-exports.shrinkBuf = function (buf, size) {
-  if (buf.length === size) { return buf; }
-  if (buf.subarray) { return buf.subarray(0, size); }
-  buf.length = size;
-  return buf;
-};
-
-
-var fnTyped = {
-  arraySet: function (dest, src, src_offs, len, dest_offs) {
-    if (src.subarray && dest.subarray) {
-      dest.set(src.subarray(src_offs, src_offs+len), dest_offs);
-      return;
-    }
-    // Fallback to ordinary array
-    for(var i=0; i<len; i++) {
-      dest[dest_offs + i] = src[src_offs + i];
-    }
-  },
-  // Join array of chunks to single array.
-  flattenChunks: function(chunks) {
-    var i, l, len, pos, chunk, result;
-
-    // calculate data length
-    len = 0;
-    for (i=0, l=chunks.length; i<l; i++) {
-      len += chunks[i].length;
-    }
-
-    // join chunks
-    result = new Uint8Array(len);
-    pos = 0;
-    for (i=0, l=chunks.length; i<l; i++) {
-      chunk = chunks[i];
-      result.set(chunk, pos);
-      pos += chunk.length;
-    }
-
-    return result;
-  }
-};
-
-var fnUntyped = {
-  arraySet: function (dest, src, src_offs, len, dest_offs) {
-    for(var i=0; i<len; i++) {
-      dest[dest_offs + i] = src[src_offs + i];
-    }
-  },
-  // Join array of chunks to single array.
-  flattenChunks: function(chunks) {
-    return [].concat.apply([], chunks);
-  }
-};
-
-
-// Enable/Disable typed arrays use, for testing
-//
-exports.setTyped = function (on) {
-  if (on) {
-    exports.Buf8  = Uint8Array;
-    exports.Buf16 = Uint16Array;
-    exports.Buf32 = Int32Array;
-    exports.assign(exports, fnTyped);
-  } else {
-    exports.Buf8  = Array;
-    exports.Buf16 = Array;
-    exports.Buf32 = Array;
-    exports.assign(exports, fnUntyped);
-  }
-};
-
-exports.setTyped(TYPED_OK);
-},{}],28:[function(_dereq_,module,exports){
-// String encode/decode helpers
-'use strict';
-
-
-var utils = _dereq_('./common');
-
-
-// Quick check if we can use fast array to bin string conversion
-//
-// - apply(Array) can fail on Android 2.2
-// - apply(Uint8Array) can fail on iOS 5.1 Safary
-//
-var STR_APPLY_OK = true;
-var STR_APPLY_UIA_OK = true;
-
-try { String.fromCharCode.apply(null, [0]); } catch(__) { STR_APPLY_OK = false; }
-try { String.fromCharCode.apply(null, new Uint8Array(1)); } catch(__) { STR_APPLY_UIA_OK = false; }
-
-
-// Table with utf8 lengths (calculated by first byte of sequence)
-// Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
-// because max possible codepoint is 0x10ffff
-var _utf8len = new utils.Buf8(256);
-for (var i=0; i<256; i++) {
-  _utf8len[i] = (i >= 252 ? 6 : i >= 248 ? 5 : i >= 240 ? 4 : i >= 224 ? 3 : i >= 192 ? 2 : 1);
-}
-_utf8len[254]=_utf8len[254]=1; // Invalid sequence start
-
-
-// convert string to array (typed, when possible)
-exports.string2buf = function (str) {
-  var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
-
-  // count binary size
-  for (m_pos = 0; m_pos < str_len; m_pos++) {
-    c = str.charCodeAt(m_pos);
-    if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-      c2 = str.charCodeAt(m_pos+1);
-      if ((c2 & 0xfc00) === 0xdc00) {
-        c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
-        m_pos++;
-      }
-    }
-    buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4;
-  }
-
-  // allocate buffer
-  buf = new utils.Buf8(buf_len);
-
-  // convert
-  for (i=0, m_pos = 0; i < buf_len; m_pos++) {
-    c = str.charCodeAt(m_pos);
-    if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-      c2 = str.charCodeAt(m_pos+1);
-      if ((c2 & 0xfc00) === 0xdc00) {
-        c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
-        m_pos++;
-      }
-    }
-    if (c < 0x80) {
-      /* one byte */
-      buf[i++] = c;
-    } else if (c < 0x800) {
-      /* two bytes */
-      buf[i++] = 0xC0 | (c >>> 6);
-      buf[i++] = 0x80 | (c & 0x3f);
-    } else if (c < 0x10000) {
-      /* three bytes */
-      buf[i++] = 0xE0 | (c >>> 12);
-      buf[i++] = 0x80 | (c >>> 6 & 0x3f);
-      buf[i++] = 0x80 | (c & 0x3f);
-    } else {
-      /* four bytes */
-      buf[i++] = 0xf0 | (c >>> 18);
-      buf[i++] = 0x80 | (c >>> 12 & 0x3f);
-      buf[i++] = 0x80 | (c >>> 6 & 0x3f);
-      buf[i++] = 0x80 | (c & 0x3f);
-    }
-  }
-
-  return buf;
-};
-
-// Helper (used in 2 places)
-function buf2binstring(buf, len) {
-  // use fallback for big arrays to avoid stack overflow
-  if (len < 65537) {
-    if ((buf.subarray && STR_APPLY_UIA_OK) || (!buf.subarray && STR_APPLY_OK)) {
-      return String.fromCharCode.apply(null, utils.shrinkBuf(buf, len));
-    }
-  }
-
-  var result = '';
-  for(var i=0; i < len; i++) {
-    result += String.fromCharCode(buf[i]);
-  }
-  return result;
-}
-
-
-// Convert byte array to binary string
-exports.buf2binstring = function(buf) {
-  return buf2binstring(buf, buf.length);
-};
-
-
-// Convert binary string (typed, when possible)
-exports.binstring2buf = function(str) {
-  var buf = new utils.Buf8(str.length);
-  for(var i=0, len=buf.length; i < len; i++) {
-    buf[i] = str.charCodeAt(i);
-  }
-  return buf;
-};
-
-
-// convert array to string
-exports.buf2string = function (buf, max) {
-  var i, out, c, c_len;
-  var len = max || buf.length;
-
-  // Reserve max possible length (2 words per char)
-  // NB: by unknown reasons, Array is significantly faster for
-  //     String.fromCharCode.apply than Uint16Array.
-  var utf16buf = new Array(len*2);
-
-  for (out=0, i=0; i<len;) {
-    c = buf[i++];
-    // quick process ascii
-    if (c < 0x80) { utf16buf[out++] = c; continue; }
-
-    c_len = _utf8len[c];
-    // skip 5 & 6 byte codes
-    if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len-1; continue; }
-
-    // apply mask on first byte
-    c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
-    // join the rest
-    while (c_len > 1 && i < len) {
-      c = (c << 6) | (buf[i++] & 0x3f);
-      c_len--;
-    }
-
-    // terminated by end of string?
-    if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; }
-
-    if (c < 0x10000) {
-      utf16buf[out++] = c;
-    } else {
-      c -= 0x10000;
-      utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff);
-      utf16buf[out++] = 0xdc00 | (c & 0x3ff);
-    }
-  }
-
-  return buf2binstring(utf16buf, out);
-};
-
-
-// Calculate max possible position in utf8 buffer,
-// that will not break sequence. If that's not possible
-// - (very small limits) return max size as is.
-//
-// buf[] - utf8 bytes array
-// max   - length limit (mandatory);
-exports.utf8border = function(buf, max) {
-  var pos;
-
-  max = max || buf.length;
-  if (max > buf.length) { max = buf.length; }
-
-  // go back from last position, until start of sequence found
-  pos = max-1;
-  while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
-
-  // Fuckup - very small and broken sequence,
-  // return max, because we should return something anyway.
-  if (pos < 0) { return max; }
-
-  // If we came to start of buffer - that means vuffer is too small,
-  // return max too.
-  if (pos === 0) { return max; }
-
-  return (pos + _utf8len[buf[pos]] > max) ? pos : max;
-};
-
-},{"./common":27}],29:[function(_dereq_,module,exports){
-'use strict';
-
-// Note: adler32 takes 12% for level 0 and 2% for level 6.
-// It doesn't worth to make additional optimizationa as in original.
-// Small size is preferable.
-
-function adler32(adler, buf, len, pos) {
-  var s1 = (adler & 0xffff) |0
-    , s2 = ((adler >>> 16) & 0xffff) |0
-    , n = 0;
-
-  while (len !== 0) {
-    // Set limit ~ twice less than 5552, to keep
-    // s2 in 31-bits, because we force signed ints.
-    // in other case %= will fail.
-    n = len > 2000 ? 2000 : len;
-    len -= n;
-
-    do {
-      s1 = (s1 + buf[pos++]) |0;
-      s2 = (s2 + s1) |0;
-    } while (--n);
-
-    s1 %= 65521;
-    s2 %= 65521;
-  }
-
-  return (s1 | (s2 << 16)) |0;
-}
-
-
-module.exports = adler32;
-},{}],30:[function(_dereq_,module,exports){
-module.exports = {
-
-  /* Allowed flush values; see deflate() and inflate() below for details */
-  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,
-
-  /* Return codes for the compression/decompression functions. Negative values
-  * are errors, positive values are used for special but normal events.
-  */
-  Z_OK:               0,
-  Z_STREAM_END:       1,
-  Z_NEED_DICT:        2,
-  Z_ERRNO:           -1,
-  Z_STREAM_ERROR:    -2,
-  Z_DATA_ERROR:      -3,
-  //Z_MEM_ERROR:     -4,
-  Z_BUF_ERROR:       -5,
-  //Z_VERSION_ERROR: -6,
-
-  /* compression levels */
-  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,
-
-  /* Possible values of the data_type field (though see inflate()) */
-  Z_BINARY:                 0,
-  Z_TEXT:                   1,
-  //Z_ASCII:                1, // = Z_TEXT (deprecated)
-  Z_UNKNOWN:                2,
-
-  /* The deflate compression method */
-  Z_DEFLATED:               8
-  //Z_NULL:                 null // Use -1 or null inline, depending on var type
-};
-},{}],31:[function(_dereq_,module,exports){
-'use strict';
-
-// Note: we can't get significant speed boost here.
-// So write code to minimize size - no pregenerated tables
-// and array tools dependencies.
-
-
-// Use ordinary array, since untyped makes no boost here
-function makeTable() {
-  var c, table = [];
-
-  for(var n =0; n < 256; n++){
-    c = n;
-    for(var k =0; k < 8; k++){
-      c = ((c&1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
-    }
-    table[n] = c;
-  }
-
-  return table;
-}
-
-// Create table on load. Just 255 signed longs. Not a problem.
-var crcTable = makeTable();
-
-
-function crc32(crc, buf, len, pos) {
-  var t = crcTable
-    , end = pos + len;
-
-  crc = crc ^ (-1);
-
-  for (var i = pos; i < end; i++ ) {
-    crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF];
-  }
-
-  return (crc ^ (-1)); // >>> 0;
-}
-
-
-module.exports = crc32;
-},{}],32:[function(_dereq_,module,exports){
-'use strict';
-
-var utils   = _dereq_('../utils/common');
-var trees   = _dereq_('./trees');
-var adler32 = _dereq_('./adler32');
-var crc32   = _dereq_('./crc32');
-var msg   = _dereq_('./messages');
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-
-/* Allowed flush values; see deflate() and inflate() below for details */
-var Z_NO_FLUSH      = 0;
-var Z_PARTIAL_FLUSH = 1;
-//var Z_SYNC_FLUSH    = 2;
-var Z_FULL_FLUSH    = 3;
-var Z_FINISH        = 4;
-var Z_BLOCK         = 5;
-//var Z_TREES         = 6;
-
-
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-var Z_OK            = 0;
-var Z_STREAM_END    = 1;
-//var Z_NEED_DICT     = 2;
-//var Z_ERRNO         = -1;
-var Z_STREAM_ERROR  = -2;
-var Z_DATA_ERROR    = -3;
-//var Z_MEM_ERROR     = -4;
-var Z_BUF_ERROR     = -5;
-//var Z_VERSION_ERROR = -6;
-
-
-/* compression levels */
-//var Z_NO_COMPRESSION      = 0;
-//var Z_BEST_SPEED          = 1;
-//var Z_BEST_COMPRESSION    = 9;
-var Z_DEFAULT_COMPRESSION = -1;
-
-
-var Z_FILTERED            = 1;
-var Z_HUFFMAN_ONLY        = 2;
-var Z_RLE                 = 3;
-var Z_FIXED               = 4;
-var Z_DEFAULT_STRATEGY    = 0;
-
-/* Possible values of the data_type field (though see inflate()) */
-//var Z_BINARY              = 0;
-//var Z_TEXT                = 1;
-//var Z_ASCII               = 1; // = Z_TEXT
-var Z_UNKNOWN             = 2;
-
-
-/* The deflate compression method */
-var Z_DEFLATED  = 8;
-
-/*============================================================================*/
-
-
-var MAX_MEM_LEVEL = 9;
-/* Maximum value for memLevel in deflateInit2 */
-var MAX_WBITS = 15;
-/* 32K LZ77 window */
-var DEF_MEM_LEVEL = 8;
-
-
-var LENGTH_CODES  = 29;
-/* number of length codes, not counting the special END_BLOCK code */
-var LITERALS      = 256;
-/* number of literal bytes 0..255 */
-var L_CODES       = LITERALS + 1 + LENGTH_CODES;
-/* number of Literal or Length codes, including the END_BLOCK code */
-var D_CODES       = 30;
-/* number of distance codes */
-var BL_CODES      = 19;
-/* number of codes used to transfer the bit lengths */
-var HEAP_SIZE     = 2*L_CODES + 1;
-/* maximum heap size */
-var MAX_BITS  = 15;
-/* All codes must not exceed MAX_BITS bits */
-
-var MIN_MATCH = 3;
-var MAX_MATCH = 258;
-var MIN_LOOKAHEAD = (MAX_MATCH + MIN_MATCH + 1);
-
-var PRESET_DICT = 0x20;
-
-var INIT_STATE = 42;
-var EXTRA_STATE = 69;
-var NAME_STATE = 73;
-var COMMENT_STATE = 91;
-var HCRC_STATE = 103;
-var BUSY_STATE = 113;
-var FINISH_STATE = 666;
-
-var BS_NEED_MORE      = 1; /* block not completed, need more input or more output */
-var BS_BLOCK_DONE     = 2; /* block flush performed */
-var BS_FINISH_STARTED = 3; /* finish started, need only more output at next deflate */
-var BS_FINISH_DONE    = 4; /* finish done, accept no more input or output */
-
-var OS_CODE = 0x03; // Unix :) . Don't detect, use this default.
-
-function err(strm, errorCode) {
-  strm.msg = msg[errorCode];
-  return errorCode;
-}
-
-function rank(f) {
-  return ((f) << 1) - ((f) > 4 ? 9 : 0);
-}
-
-function zero(buf) { var len = buf.length; while (--len >= 0) { buf[len] = 0; } }
-
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->output buffer and copying into it.
- * (See also read_buf()).
- */
-function flush_pending(strm) {
-  var s = strm.state;
-
-  //_tr_flush_bits(s);
-  var len = s.pending;
-  if (len > strm.avail_out) {
-    len = strm.avail_out;
-  }
-  if (len === 0) { return; }
-
-  utils.arraySet(strm.output, s.pending_buf, s.pending_out, len, strm.next_out);
-  strm.next_out += len;
-  s.pending_out += len;
-  strm.total_out += len;
-  strm.avail_out -= len;
-  s.pending -= len;
-  if (s.pending === 0) {
-    s.pending_out = 0;
-  }
-}
-
-
-function flush_block_only (s, last) {
-  trees._tr_flush_block(s, (s.block_start >= 0 ? s.block_start : -1), s.strstart - s.block_start, last);
-  s.block_start = s.strstart;
-  flush_pending(s.strm);
-}
-
-
-function put_byte(s, b) {
-  s.pending_buf[s.pending++] = b;
-}
-
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-function putShortMSB(s, b) {
-//  put_byte(s, (Byte)(b >> 8));
-//  put_byte(s, (Byte)(b & 0xff));
-  s.pending_buf[s.pending++] = (b >>> 8) & 0xff;
-  s.pending_buf[s.pending++] = b & 0xff;
-}
-
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->input buffer and copying from it.
- * (See also flush_pending()).
- */
-function read_buf(strm, buf, start, size) {
-  var len = strm.avail_in;
-
-  if (len > size) { len = size; }
-  if (len === 0) { return 0; }
-
-  strm.avail_in -= len;
-
-  utils.arraySet(buf, strm.input, strm.next_in, len, start);
-  if (strm.state.wrap === 1) {
-    strm.adler = adler32(strm.adler, buf, len, start);
-  }
-
-  else if (strm.state.wrap === 2) {
-    strm.adler = crc32(strm.adler, buf, len, start);
-  }
-
-  strm.next_in += len;
-  strm.total_in += len;
-
-  return len;
-}
-
-
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-function longest_match(s, cur_match) {
-  var chain_length = s.max_chain_length;      /* max hash chain length */
-  var scan = s.strstart; /* current string */
-  var match;                       /* matched string */
-  var len;                           /* length of current match */
-  var best_len = s.prev_length;              /* best match length so far */
-  var nice_match = s.nice_match;             /* stop if match long enough */
-  var limit = (s.strstart > (s.w_size - MIN_LOOKAHEAD)) ?
-      s.strstart - (s.w_size - MIN_LOOKAHEAD) : 0/*NIL*/;
-
-  var _win = s.window; // shortcut
-
-  var wmask = s.w_mask;
-  var prev  = s.prev;
-
-  /* Stop when cur_match becomes <= limit. To simplify the code,
-   * we prevent matches with the string of window index 0.
-   */
-
-  var strend = s.strstart + MAX_MATCH;
-  var scan_end1  = _win[scan + best_len - 1];
-  var scan_end   = _win[scan + best_len];
-
-  /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-   * It is easy to get rid of this optimization if necessary.
-   */
-  // Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-  /* Do not waste too much time if we already have a good match: */
-  if (s.prev_length >= s.good_match) {
-    chain_length >>= 2;
-  }
-  /* Do not look for matches beyond the end of the input. This is necessary
-   * to make deflate deterministic.
-   */
-  if (nice_match > s.lookahead) { nice_match = s.lookahead; }
-
-  // Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-  do {
-    // Assert(cur_match < s->strstart, "no future");
-    match = cur_match;
-
-    /* Skip to next match if the match length cannot increase
-     * or if the match length is less than 2.  Note that the checks below
-     * for insufficient lookahead only occur occasionally for performance
-     * reasons.  Therefore uninitialized memory will be accessed, and
-     * conditional jumps will be made that depend on those values.
-     * However the length of the match is limited to the lookahead, so
-     * the output of deflate is not affected by the uninitialized values.
-     */
-
-    if (_win[match + best_len]     !== scan_end  ||
-        _win[match + best_len - 1] !== scan_end1 ||
-        _win[match]                !== _win[scan] ||
-        _win[++match]              !== _win[scan + 1]) {
-      continue;
-    }
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2;
-    match++;
-    // Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-      /*jshint noempty:false*/
-    } while (_win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
-             _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
-             _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
-             _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
-             scan < strend);
-
-    // Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (strend - scan);
-    scan = strend - MAX_MATCH;
-
-    if (len > best_len) {
-      s.match_start = cur_match;
-      best_len = len;
-      if (len >= nice_match) {
-        break;
-      }
-      scan_end1  = _win[scan + best_len - 1];
-      scan_end   = _win[scan + best_len];
-    }
-  } while ((cur_match = prev[cur_match & wmask]) > limit && --chain_length !== 0);
-
-  if (best_len <= s.lookahead) {
-    return best_len;
-  }
-  return s.lookahead;
-}
-
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-function fill_window(s) {
-  var _w_size = s.w_size;
-  var p, n, m, more, str;
-
-  //Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-  do {
-    more = s.window_size - s.lookahead - s.strstart;
-
-    // JS ints have 32 bit, block below not needed
-    /* Deal with !@#$% 64K limit: */
-    //if (sizeof(int) <= 2) {
-    //    if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-    //        more = wsize;
-    //
-    //  } else if (more == (unsigned)(-1)) {
-    //        /* Very unlikely, but possible on 16 bit machine if
-    //         * strstart == 0 && lookahead == 1 (input done a byte at time)
-    //         */
-    //        more--;
-    //    }
-    //}
-
-
-    /* If the window is almost full and there is insufficient lookahead,
-     * move the upper half to the lower one to make room in the upper half.
-     */
-    if (s.strstart >= _w_size + (_w_size - MIN_LOOKAHEAD)) {
-
-      utils.arraySet(s.window, s.window, _w_size, _w_size, 0);
-      s.match_start -= _w_size;
-      s.strstart -= _w_size;
-      /* we now have strstart >= MAX_DIST */
-      s.block_start -= _w_size;
-
-      /* Slide the hash table (could be avoided with 32 bit values
-       at the expense of memory usage). We slide even when level == 0
-       to keep the hash table consistent if we switch back to level > 0
-       later. (Using level 0 permanently is not an optimal usage of
-       zlib, so we don't care about this pathological case.)
-       */
-
-      n = s.hash_size;
-      p = n;
-      do {
-        m = s.head[--p];
-        s.head[p] = (m >= _w_size ? m - _w_size : 0);
-      } while (--n);
-
-      n = _w_size;
-      p = n;
-      do {
-        m = s.prev[--p];
-        s.prev[p] = (m >= _w_size ? m - _w_size : 0);
-        /* If n is not on any hash chain, prev[n] is garbage but
-         * its value will never be used.
-         */
-      } while (--n);
-
-      more += _w_size;
-    }
-    if (s.strm.avail_in === 0) {
-      break;
-    }
-
-    /* If there was no sliding:
-     *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-     *    more == window_size - lookahead - strstart
-     * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-     * => more >= window_size - 2*WSIZE + 2
-     * In the BIG_MEM or MMAP case (not yet supported),
-     *   window_size == input_size + MIN_LOOKAHEAD  &&
-     *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-     * Otherwise, window_size == 2*WSIZE so more >= 2.
-     * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-     */
-    //Assert(more >= 2, "more < 2");
-    n = read_buf(s.strm, s.window, s.strstart + s.lookahead, more);
-    s.lookahead += n;
-
-    /* Initialize the hash value now that we have some input: */
-    if (s.lookahead + s.insert >= MIN_MATCH) {
-      str = s.strstart - s.insert;
-      s.ins_h = s.window[str];
-
-      /* UPDATE_HASH(s, s->ins_h, s->window[str + 1]); */
-      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + 1]) & s.hash_mask;
-//#if MIN_MATCH != 3
-//        Call update_hash() MIN_MATCH-3 more times
-//#endif
-      while (s.insert) {
-        /* UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); */
-        s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + MIN_MATCH-1]) & s.hash_mask;
-
-        s.prev[str & s.w_mask] = s.head[s.ins_h];
-        s.head[s.ins_h] = str;
-        str++;
-        s.insert--;
-        if (s.lookahead + s.insert < MIN_MATCH) {
-          break;
-        }
-      }
-    }
-    /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-     * but this is not important since only literal bytes will be emitted.
-     */
-
-  } while (s.lookahead < MIN_LOOKAHEAD && s.strm.avail_in !== 0);
-
-  /* If the WIN_INIT bytes after the end of the current data have never been
-   * written, then zero those bytes in order to avoid memory check reports of
-   * the use of uninitialized (or uninitialised as Julian writes) bytes by
-   * the longest match routines.  Update the high water mark for the next
-   * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-   * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-   */
-//  if (s.high_water < s.window_size) {
-//    var curr = s.strstart + s.lookahead;
-//    var init = 0;
-//
-//    if (s.high_water < curr) {
-//      /* Previous high water mark below current data -- zero WIN_INIT
-//       * bytes or up to end of window, whichever is less.
-//       */
-//      init = s.window_size - curr;
-//      if (init > WIN_INIT)
-//        init = WIN_INIT;
-//      zmemzero(s->window + curr, (unsigned)init);
-//      s->high_water = curr + init;
-//    }
-//    else if (s->high_water < (ulg)curr + WIN_INIT) {
-//      /* High water mark at or above current data, but below current data
-//       * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-//       * to end of window, whichever is less.
-//       */
-//      init = (ulg)curr + WIN_INIT - s->high_water;
-//      if (init > s->window_size - s->high_water)
-//        init = s->window_size - s->high_water;
-//      zmemzero(s->window + s->high_water, (unsigned)init);
-//      s->high_water += init;
-//    }
-//  }
-//
-//  Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-//    "not enough room for search");
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-function deflate_stored(s, flush) {
-  /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-   * to pending_buf_size, and each stored block has a 5 byte header:
-   */
-  var max_block_size = 0xffff;
-
-  if (max_block_size > s.pending_buf_size - 5) {
-    max_block_size = s.pending_buf_size - 5;
-  }
-
-  /* Copy as much as possible from input to output: */
-  for (;;) {
-    /* Fill the window as much as possible: */
-    if (s.lookahead <= 1) {
-
-      //Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-      //  s->block_start >= (long)s->w_size, "slide too late");
-//      if (!(s.strstart < s.w_size + (s.w_size - MIN_LOOKAHEAD) ||
-//        s.block_start >= s.w_size)) {
-//        throw  new Error("slide too late");
-//      }
-
-      fill_window(s);
-      if (s.lookahead === 0 && flush === Z_NO_FLUSH) {
-        return BS_NEED_MORE;
-      }
-
-      if (s.lookahead === 0) {
-        break;
-      }
-      /* flush the current block */
-    }
-    //Assert(s->block_start >= 0L, "block gone");
-//    if (s.block_start < 0) throw new Error("block gone");
-
-    s.strstart += s.lookahead;
-    s.lookahead = 0;
-
-    /* Emit a stored block if pending_buf will be full: */
-    var max_start = s.block_start + max_block_size;
-
-    if (s.strstart === 0 || s.strstart >= max_start) {
-      /* strstart == 0 is possible when wraparound on 16-bit machine */
-      s.lookahead = s.strstart - max_start;
-      s.strstart = max_start;
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-
-
-    }
-    /* Flush if we may have to slide, otherwise block_start may become
-     * negative and the data will be gone:
-     */
-    if (s.strstart - s.block_start >= (s.w_size - MIN_LOOKAHEAD)) {
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-    }
-  }
-
-  s.insert = 0;
-
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-
-  if (s.strstart > s.block_start) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-
-  return BS_NEED_MORE;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-function deflate_fast(s, flush) {
-  var hash_head;        /* head of the hash chain */
-  var bflush;           /* set if current block must be flushed */
-
-  for (;;) {
-    /* Make sure that we always have enough lookahead, except
-     * at the end of the input file. We need MAX_MATCH bytes
-     * for the next match, plus MIN_MATCH bytes to insert the
-     * string following the next match.
-     */
-    if (s.lookahead < MIN_LOOKAHEAD) {
-      fill_window(s);
-      if (s.lookahead < MIN_LOOKAHEAD && flush === Z_NO_FLUSH) {
-        return BS_NEED_MORE;
-      }
-      if (s.lookahead === 0) {
-        break; /* flush the current block */
-      }
-    }
-
-    /* Insert the string window[strstart .. strstart+2] in the
-     * dictionary, and set hash_head to the head of the hash chain:
-     */
-    hash_head = 0/*NIL*/;
-    if (s.lookahead >= MIN_MATCH) {
-      /*** INSERT_STRING(s, s.strstart, hash_head); ***/
-      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
-      hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
-      s.head[s.ins_h] = s.strstart;
-      /***/
-    }
-
-    /* Find the longest match, discarding those <= prev_length.
-     * At this point we have always match_length < MIN_MATCH
-     */
-    if (hash_head !== 0/*NIL*/ && ((s.strstart - hash_head) <= (s.w_size - MIN_LOOKAHEAD))) {
-      /* To simplify the code, we prevent matches with the string
-       * of window index 0 (in particular we have to avoid a match
-       * of the string with itself at the start of the input file).
-       */
-      s.match_length = longest_match(s, hash_head);
-      /* longest_match() sets match_start */
-    }
-    if (s.match_length >= MIN_MATCH) {
-      // check_match(s, s.strstart, s.match_start, s.match_length); // for debug only
-
-      /*** _tr_tally_dist(s, s.strstart - s.match_start,
-                     s.match_length - MIN_MATCH, bflush); ***/
-      bflush = trees._tr_tally(s, s.strstart - s.match_start, s.match_length - MIN_MATCH);
-
-      s.lookahead -= s.match_length;
-
-      /* Insert new strings in the hash table only if the match length
-       * is not too large. This saves time but degrades compression.
-       */
-      if (s.match_length <= s.max_lazy_match/*max_insert_length*/ && s.lookahead >= MIN_MATCH) {
-        s.match_length--; /* string at strstart already in table */
-        do {
-          s.strstart++;
-          /*** INSERT_STRING(s, s.strstart, hash_head); ***/
-          s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
-          hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
-          s.head[s.ins_h] = s.strstart;
-          /***/
-          /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-           * always MIN_MATCH bytes ahead.
-           */
-        } while (--s.match_length !== 0);
-        s.strstart++;
-      } else
-      {
-        s.strstart += s.match_length;
-        s.match_length = 0;
-        s.ins_h = s.window[s.strstart];
-        /* UPDATE_HASH(s, s.ins_h, s.window[s.strstart+1]); */
-        s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + 1]) & s.hash_mask;
-
-//#if MIN_MATCH != 3
-//                Call UPDATE_HASH() MIN_MATCH-3 more times
-//#endif
-        /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-         * matter since it will be recomputed at next deflate call.
-         */
-      }
-    } else {
-      /* No match, output a literal byte */
-      //Tracevv((stderr,"%c", s.window[s.strstart]));
-      /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
-      bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
-
-      s.lookahead--;
-      s.strstart++;
-    }
-    if (bflush) {
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-    }
-  }
-  s.insert = ((s.strstart < (MIN_MATCH-1)) ? s.strstart : MIN_MATCH-1);
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-  if (s.last_lit) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-  return BS_BLOCK_DONE;
-}
-
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-function deflate_slow(s, flush) {
-  var hash_head;          /* head of hash chain */
-  var bflush;              /* set if current block must be flushed */
-
-  var max_insert;
-
-  /* Process the input block. */
-  for (;;) {
-    /* Make sure that we always have enough lookahead, except
-     * at the end of the input file. We need MAX_MATCH bytes
-     * for the next match, plus MIN_MATCH bytes to insert the
-     * string following the next match.
-     */
-    if (s.lookahead < MIN_LOOKAHEAD) {
-      fill_window(s);
-      if (s.lookahead < MIN_LOOKAHEAD && flush === Z_NO_FLUSH) {
-        return BS_NEED_MORE;
-      }
-      if (s.lookahead === 0) { break; } /* flush the current block */
-    }
-
-    /* Insert the string window[strstart .. strstart+2] in the
-     * dictionary, and set hash_head to the head of the hash chain:
-     */
-    hash_head = 0/*NIL*/;
-    if (s.lookahead >= MIN_MATCH) {
-      /*** INSERT_STRING(s, s.strstart, hash_head); ***/
-      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
-      hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
-      s.head[s.ins_h] = s.strstart;
-      /***/
-    }
-
-    /* Find the longest match, discarding those <= prev_length.
-     */
-    s.prev_length = s.match_length;
-    s.prev_match = s.match_start;
-    s.match_length = MIN_MATCH-1;
-
-    if (hash_head !== 0/*NIL*/ && s.prev_length < s.max_lazy_match &&
-        s.strstart - hash_head <= (s.w_size-MIN_LOOKAHEAD)/*MAX_DIST(s)*/) {
-      /* To simplify the code, we prevent matches with the string
-       * of window index 0 (in particular we have to avoid a match
-       * of the string with itself at the start of the input file).
-       */
-      s.match_length = longest_match(s, hash_head);
-      /* longest_match() sets match_start */
-
-      if (s.match_length <= 5 &&
-         (s.strategy === Z_FILTERED || (s.match_length === MIN_MATCH && s.strstart - s.match_start > 4096/*TOO_FAR*/))) {
-
-        /* If prev_match is also MIN_MATCH, match_start is garbage
-         * but we will ignore the current match anyway.
-         */
-        s.match_length = MIN_MATCH-1;
-      }
-    }
-    /* If there was a match at the previous step and the current
-     * match is not better, output the previous match:
-     */
-    if (s.prev_length >= MIN_MATCH && s.match_length <= s.prev_length) {
-      max_insert = s.strstart + s.lookahead - MIN_MATCH;
-      /* Do not insert strings in hash table beyond this. */
-
-      //check_match(s, s.strstart-1, s.prev_match, s.prev_length);
-
-      /***_tr_tally_dist(s, s.strstart - 1 - s.prev_match,
-                     s.prev_length - MIN_MATCH, bflush);***/
-      bflush = trees._tr_tally(s, s.strstart - 1- s.prev_match, s.prev_length - MIN_MATCH);
-      /* Insert in hash table all strings up to the end of the match.
-       * strstart-1 and strstart are already inserted. If there is not
-       * enough lookahead, the last two strings are not inserted in
-       * the hash table.
-       */
-      s.lookahead -= s.prev_length-1;
-      s.prev_length -= 2;
-      do {
-        if (++s.strstart <= max_insert) {
-          /*** INSERT_STRING(s, s.strstart, hash_head); ***/
-          s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
-          hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
-          s.head[s.ins_h] = s.strstart;
-          /***/
-        }
-      } while (--s.prev_length !== 0);
-      s.match_available = 0;
-      s.match_length = MIN_MATCH-1;
-      s.strstart++;
-
-      if (bflush) {
-        /*** FLUSH_BLOCK(s, 0); ***/
-        flush_block_only(s, false);
-        if (s.strm.avail_out === 0) {
-          return BS_NEED_MORE;
-        }
-        /***/
-      }
-
-    } else if (s.match_available) {
-      /* If there was no match at the previous position, output a
-       * single literal. If there was a match but the current match
-       * is longer, truncate the previous match to a single literal.
-       */
-      //Tracevv((stderr,"%c", s->window[s->strstart-1]));
-      /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
-      bflush = trees._tr_tally(s, 0, s.window[s.strstart-1]);
-
-      if (bflush) {
-        /*** FLUSH_BLOCK_ONLY(s, 0) ***/
-        flush_block_only(s, false);
-        /***/
-      }
-      s.strstart++;
-      s.lookahead--;
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-    } else {
-      /* There is no previous match to compare with, wait for
-       * the next step to decide.
-       */
-      s.match_available = 1;
-      s.strstart++;
-      s.lookahead--;
-    }
-  }
-  //Assert (flush != Z_NO_FLUSH, "no flush?");
-  if (s.match_available) {
-    //Tracevv((stderr,"%c", s->window[s->strstart-1]));
-    /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
-    bflush = trees._tr_tally(s, 0, s.window[s.strstart-1]);
-
-    s.match_available = 0;
-  }
-  s.insert = s.strstart < MIN_MATCH-1 ? s.strstart : MIN_MATCH-1;
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-  if (s.last_lit) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-
-  return BS_BLOCK_DONE;
-}
-
-
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-function deflate_rle(s, flush) {
-  var bflush;            /* set if current block must be flushed */
-  var prev;              /* byte at distance one to match */
-  var scan, strend;      /* scan goes up to strend for length of run */
-
-  var _win = s.window;
-
-  for (;;) {
-    /* Make sure that we always have enough lookahead, except
-     * at the end of the input file. We need MAX_MATCH bytes
-     * for the longest run, plus one for the unrolled loop.
-     */
-    if (s.lookahead <= MAX_MATCH) {
-      fill_window(s);
-      if (s.lookahead <= MAX_MATCH && flush === Z_NO_FLUSH) {
-        return BS_NEED_MORE;
-      }
-      if (s.lookahead === 0) { break; } /* flush the current block */
-    }
-
-    /* See how many times the previous byte repeats */
-    s.match_length = 0;
-    if (s.lookahead >= MIN_MATCH && s.strstart > 0) {
-      scan = s.strstart - 1;
-      prev = _win[scan];
-      if (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan]) {
-        strend = s.strstart + MAX_MATCH;
-        do {
-          /*jshint noempty:false*/
-        } while (prev === _win[++scan] && prev === _win[++scan] &&
-                 prev === _win[++scan] && prev === _win[++scan] &&
-                 prev === _win[++scan] && prev === _win[++scan] &&
-                 prev === _win[++scan] && prev === _win[++scan] &&
-                 scan < strend);
-        s.match_length = MAX_MATCH - (strend - scan);
-        if (s.match_length > s.lookahead) {
-          s.match_length = s.lookahead;
-        }
-      }
-      //Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
-    }
-
-    /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-    if (s.match_length >= MIN_MATCH) {
-      //check_match(s, s.strstart, s.strstart - 1, s.match_length);
-
-      /*** _tr_tally_dist(s, 1, s.match_length - MIN_MATCH, bflush); ***/
-      bflush = trees._tr_tally(s, 1, s.match_length - MIN_MATCH);
-
-      s.lookahead -= s.match_length;
-      s.strstart += s.match_length;
-      s.match_length = 0;
-    } else {
-      /* No match, output a literal byte */
-      //Tracevv((stderr,"%c", s->window[s->strstart]));
-      /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
-      bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
-
-      s.lookahead--;
-      s.strstart++;
-    }
-    if (bflush) {
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-    }
-  }
-  s.insert = 0;
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-  if (s.last_lit) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-  return BS_BLOCK_DONE;
-}
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-function deflate_huff(s, flush) {
-  var bflush;             /* set if current block must be flushed */
-
-  for (;;) {
-    /* Make sure that we have a literal to write. */
-    if (s.lookahead === 0) {
-      fill_window(s);
-      if (s.lookahead === 0) {
-        if (flush === Z_NO_FLUSH) {
-          return BS_NEED_MORE;
-        }
-        break;      /* flush the current block */
-      }
-    }
-
-    /* Output a literal byte */
-    s.match_length = 0;
-    //Tracevv((stderr,"%c", s->window[s->strstart]));
-    /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
-    bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
-    s.lookahead--;
-    s.strstart++;
-    if (bflush) {
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-    }
-  }
-  s.insert = 0;
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-  if (s.last_lit) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-  return BS_BLOCK_DONE;
-}
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-var Config = function (good_length, max_lazy, nice_length, max_chain, func) {
-  this.good_length = good_length;
-  this.max_lazy = max_lazy;
-  this.nice_length = nice_length;
-  this.max_chain = max_chain;
-  this.func = func;
-};
-
-var configuration_table;
-
-configuration_table = [
-  /*      good lazy nice chain */
-  new Config(0, 0, 0, 0, deflate_stored),          /* 0 store only */
-  new Config(4, 4, 8, 4, deflate_fast),            /* 1 max speed, no lazy matches */
-  new Config(4, 5, 16, 8, deflate_fast),           /* 2 */
-  new Config(4, 6, 32, 32, deflate_fast),          /* 3 */
-
-  new Config(4, 4, 16, 16, deflate_slow),          /* 4 lazy matches */
-  new Config(8, 16, 32, 32, deflate_slow),         /* 5 */
-  new Config(8, 16, 128, 128, deflate_slow),       /* 6 */
-  new Config(8, 32, 128, 256, deflate_slow),       /* 7 */
-  new Config(32, 128, 258, 1024, deflate_slow),    /* 8 */
-  new Config(32, 258, 258, 4096, deflate_slow)     /* 9 max compression */
-];
-
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-function lm_init(s) {
-  s.window_size = 2 * s.w_size;
-
-  /*** CLEAR_HASH(s); ***/
-  zero(s.head); // Fill with NIL (= 0);
-
-  /* Set the default configuration parameters:
-   */
-  s.max_lazy_match = configuration_table[s.level].max_lazy;
-  s.good_match = configuration_table[s.level].good_length;
-  s.nice_match = configuration_table[s.level].nice_length;
-  s.max_chain_length = configuration_table[s.level].max_chain;
-
-  s.strstart = 0;
-  s.block_start = 0;
-  s.lookahead = 0;
-  s.insert = 0;
-  s.match_length = s.prev_length = MIN_MATCH - 1;
-  s.match_available = 0;
-  s.ins_h = 0;
-}
-
-
-function DeflateState() {
-  this.strm = null;            /* pointer back to this zlib stream */
-  this.status = 0;            /* as the name implies */
-  this.pending_buf = null;      /* output still pending */
-  this.pending_buf_size = 0;  /* size of pending_buf */
-  this.pending_out = 0;       /* next pending byte to output to the stream */
-  this.pending = 0;           /* nb of bytes in the pending buffer */
-  this.wrap = 0;              /* bit 0 true for zlib, bit 1 true for gzip */
-  this.gzhead = null;         /* gzip header information to write */
-  this.gzindex = 0;           /* where in extra, name, or comment */
-  this.method = Z_DEFLATED; /* can only be DEFLATED */
-  this.last_flush = -1;   /* value of flush param for previous deflate call */
-
-  this.w_size = 0;  /* LZ77 window size (32K by default) */
-  this.w_bits = 0;  /* log2(w_size)  (8..16) */
-  this.w_mask = 0;  /* w_size - 1 */
-
-  this.window = null;
-  /* Sliding window. Input bytes are read into the second half of the window,
-   * and move to the first half later to keep a dictionary of at least wSize
-   * bytes. With this organization, matches are limited to a distance of
-   * wSize-MAX_MATCH bytes, but this ensures that IO is always
-   * performed with a length multiple of the block size.
-   */
-
-  this.window_size = 0;
-  /* Actual size of window: 2*wSize, except when the user input buffer
-   * is directly used as sliding window.
-   */
-
-  this.prev = null;
-  /* Link to older string with same hash index. To limit the size of this
-   * array to 64K, this link is maintained only for the last 32K strings.
-   * An index in this array is thus a window index modulo 32K.
-   */
-
-  this.head = null;   /* Heads of the hash chains or NIL. */
-
-  this.ins_h = 0;       /* hash index of string to be inserted */
-  this.hash_size = 0;   /* number of elements in hash table */
-  this.hash_bits = 0;   /* log2(hash_size) */
-  this.hash_mask = 0;   /* hash_size-1 */
-
-  this.hash_shift = 0;
-  /* Number of bits by which ins_h must be shifted at each input
-   * step. It must be such that after MIN_MATCH steps, the oldest
-   * byte no longer takes part in the hash key, that is:
-   *   hash_shift * MIN_MATCH >= hash_bits
-   */
-
-  this.block_start = 0;
-  /* Window position at the beginning of the current output block. Gets
-   * negative when the window is moved backwards.
-   */
-
-  this.match_length = 0;      /* length of best match */
-  this.prev_match = 0;        /* previous match */
-  this.match_available = 0;   /* set if previous match exists */
-  this.strstart = 0;          /* start of string to insert */
-  this.match_start = 0;       /* start of matching string */
-  this.lookahead = 0;         /* number of valid bytes ahead in window */
-
-  this.prev_length = 0;
-  /* Length of the best match at previous step. Matches not greater than this
-   * are discarded. This is used in the lazy match evaluation.
-   */
-
-  this.max_chain_length = 0;
-  /* To speed up deflation, hash chains are never searched beyond this
-   * length.  A higher limit improves compression ratio but degrades the
-   * speed.
-   */
-
-  this.max_lazy_match = 0;
-  /* Attempt to find a better match only when the current match is strictly
-   * smaller than this value. This mechanism is used only for compression
-   * levels >= 4.
-   */
-  // That's alias to max_lazy_match, don't use directly
-  //this.max_insert_length = 0;
-  /* Insert new strings in the hash table only if the match length is not
-   * greater than this length. This saves time but degrades compression.
-   * max_insert_length is used only for compression levels <= 3.
-   */
-
-  this.level = 0;     /* compression level (1..9) */
-  this.strategy = 0;  /* favor or force Huffman coding*/
-
-  this.good_match = 0;
-  /* Use a faster search when the previous match is longer than this */
-
-  this.nice_match = 0; /* Stop searching when current match exceeds this */
-
-              /* used by trees.c: */
-
-  /* Didn't use ct_data typedef below to suppress compiler warning */
-
-  // struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-  // struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-  // struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-  // Use flat array of DOUBLE size, with interleaved fata,
-  // because JS does not support effective
-  this.dyn_ltree  = new utils.Buf16(HEAP_SIZE * 2);
-  this.dyn_dtree  = new utils.Buf16((2*D_CODES+1) * 2);
-  this.bl_tree    = new utils.Buf16((2*BL_CODES+1) * 2);
-  zero(this.dyn_ltree);
-  zero(this.dyn_dtree);
-  zero(this.bl_tree);
-
-  this.l_desc   = null;         /* desc. for literal tree */
-  this.d_desc   = null;         /* desc. for distance tree */
-  this.bl_desc  = null;         /* desc. for bit length tree */
-
-  //ush bl_count[MAX_BITS+1];
-  this.bl_count = new utils.Buf16(MAX_BITS+1);
-  /* number of codes at each bit length for an optimal tree */
-
-  //int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-  this.heap = new utils.Buf16(2*L_CODES+1);  /* heap used to build the Huffman trees */
-  zero(this.heap);
-
-  this.heap_len = 0;               /* number of elements in the heap */
-  this.heap_max = 0;               /* element of largest frequency */
-  /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-   * The same heap array is used to build all trees.
-   */
-
-  this.depth = new utils.Buf16(2*L_CODES+1); //uch depth[2*L_CODES+1];
-  zero(this.depth);
-  /* Depth of each subtree used as tie breaker for trees of equal frequency
-   */
-
-  this.l_buf = 0;          /* buffer index for literals or lengths */
-
-  this.lit_bufsize = 0;
-  /* Size of match buffer for literals/lengths.  There are 4 reasons for
-   * limiting lit_bufsize to 64K:
-   *   - frequencies can be kept in 16 bit counters
-   *   - if compression is not successful for the first block, all input
-   *     data is still in the window so we can still emit a stored block even
-   *     when input comes from standard input.  (This can also be done for
-   *     all blocks if lit_bufsize is not greater than 32K.)
-   *   - if compression is not successful for a file smaller than 64K, we can
-   *     even emit a stored file instead of a stored block (saving 5 bytes).
-   *     This is applicable only for zip (not gzip or zlib).
-   *   - creating new Huffman trees less frequently may not provide fast
-   *     adaptation to changes in the input data statistics. (Take for
-   *     example a binary file with poorly compressible code followed by
-   *     a highly compressible string table.) Smaller buffer sizes give
-   *     fast adaptation but have of course the overhead of transmitting
-   *     trees more frequently.
-   *   - I can't count above 4
-   */
-
-  this.last_lit = 0;      /* running index in l_buf */
-
-  this.d_buf = 0;
-  /* Buffer index for distances. To simplify the code, d_buf and l_buf have
-   * the same number of elements. To use different lengths, an extra flag
-   * array would be necessary.
-   */
-
-  this.opt_len = 0;       /* bit length of current block with optimal trees */
-  this.static_len = 0;    /* bit length of current block with static trees */
-  this.matches = 0;       /* number of string matches in current block */
-  this.insert = 0;        /* bytes at end of window left to insert */
-
-
-  this.bi_buf = 0;
-  /* Output buffer. bits are inserted starting at the bottom (least
-   * significant bits).
-   */
-  this.bi_valid = 0;
-  /* Number of valid bits in bi_buf.  All bits above the last valid bit
-   * are always zero.
-   */
-
-  // Used for window memory init. We safely ignore it for JS. That makes
-  // sense only for pointers and memory check tools.
-  //this.high_water = 0;
-  /* High water mark offset in window for initialized bytes -- bytes above
-   * this are set to zero in order to avoid memory check warnings when
-   * longest match routines access bytes past the input.  This is then
-   * updated to the new high water mark.
-   */
-}
-
-
-function deflateResetKeep(strm) {
-  var s;
-
-  if (!strm || !strm.state) {
-    return err(strm, Z_STREAM_ERROR);
-  }
-
-  strm.total_in = strm.total_out = 0;
-  strm.data_type = Z_UNKNOWN;
-
-  s = strm.state;
-  s.pending = 0;
-  s.pending_out = 0;
-
-  if (s.wrap < 0) {
-    s.wrap = -s.wrap;
-    /* was made negative by deflate(..., Z_FINISH); */
-  }
-  s.status = (s.wrap ? INIT_STATE : BUSY_STATE);
-  strm.adler = (s.wrap === 2) ?
-    0  // crc32(0, Z_NULL, 0)
-  :
-    1; // adler32(0, Z_NULL, 0)
-  s.last_flush = Z_NO_FLUSH;
-  trees._tr_init(s);
-  return Z_OK;
-}
-
-
-function deflateReset(strm) {
-  var ret = deflateResetKeep(strm);
-  if (ret === Z_OK) {
-    lm_init(strm.state);
-  }
-  return ret;
-}
-
-
-function deflateSetHeader(strm, head) {
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  if (strm.state.wrap !== 2) { return Z_STREAM_ERROR; }
-  strm.state.gzhead = head;
-  return Z_OK;
-}
-
-
-function deflateInit2(strm, level, method, windowBits, memLevel, strategy) {
-  if (!strm) { // === Z_NULL
-    return Z_STREAM_ERROR;
-  }
-  var wrap = 1;
-
-  if (level === Z_DEFAULT_COMPRESSION) {
-    level = 6;
-  }
-
-  if (windowBits < 0) { /* suppress zlib wrapper */
-    wrap = 0;
-    windowBits = -windowBits;
-  }
-
-  else if (windowBits > 15) {
-    wrap = 2;           /* write gzip wrapper instead */
-    windowBits -= 16;
-  }
-
-
-  if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method !== Z_DEFLATED ||
-    windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-    strategy < 0 || strategy > Z_FIXED) {
-    return err(strm, Z_STREAM_ERROR);
-  }
-
-
-  if (windowBits === 8) {
-    windowBits = 9;
-  }
-  /* until 256-byte window bug fixed */
-
-  var s = new DeflateState();
-
-  strm.state = s;
-  s.strm = strm;
-
-  s.wrap = wrap;
-  s.gzhead = null;
-  s.w_bits = windowBits;
-  s.w_size = 1 << s.w_bits;
-  s.w_mask = s.w_size - 1;
-
-  s.hash_bits = memLevel + 7;
-  s.hash_size = 1 << s.hash_bits;
-  s.hash_mask = s.hash_size - 1;
-  s.hash_shift = ~~((s.hash_bits + MIN_MATCH - 1) / MIN_MATCH);
-
-  s.window = new utils.Buf8(s.w_size * 2);
-  s.head = new utils.Buf16(s.hash_size);
-  s.prev = new utils.Buf16(s.w_size);
-
-  // Don't need mem init magic for JS.
-  //s.high_water = 0;  /* nothing written to s->window yet */
-
-  s.lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-  s.pending_buf_size = s.lit_bufsize * 4;
-  s.pending_buf = new utils.Buf8(s.pending_buf_size);
-
-  s.d_buf = s.lit_bufsize >> 1;
-  s.l_buf = (1 + 2) * s.lit_bufsize;
-
-  s.level = level;
-  s.strategy = strategy;
-  s.method = method;
-
-  return deflateReset(strm);
-}
-
-function deflateInit(strm, level) {
-  return deflateInit2(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
-}
-
-
-function deflate(strm, flush) {
-  var old_flush, s;
-  var beg, val; // for gzip header write only
-
-  if (!strm || !strm.state ||
-    flush > Z_BLOCK || flush < 0) {
-    return strm ? err(strm, Z_STREAM_ERROR) : Z_STREAM_ERROR;
-  }
-
-  s = strm.state;
-
-  if (!strm.output ||
-      (!strm.input && strm.avail_in !== 0) ||
-      (s.status === FINISH_STATE && flush !== Z_FINISH)) {
-    return err(strm, (strm.avail_out === 0) ? Z_BUF_ERROR : Z_STREAM_ERROR);
-  }
-
-  s.strm = strm; /* just in case */
-  old_flush = s.last_flush;
-  s.last_flush = flush;
-
-  /* Write the header */
-  if (s.status === INIT_STATE) {
-
-    if (s.wrap === 2) { // GZIP header
-      strm.adler = 0;  //crc32(0L, Z_NULL, 0);
-      put_byte(s, 31);
-      put_byte(s, 139);
-      put_byte(s, 8);
-      if (!s.gzhead) { // s->gzhead == Z_NULL
-        put_byte(s, 0);
-        put_byte(s, 0);
-        put_byte(s, 0);
-        put_byte(s, 0);
-        put_byte(s, 0);
-        put_byte(s, s.level === 9 ? 2 :
-                    (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2 ?
-                     4 : 0));
-        put_byte(s, OS_CODE);
-        s.status = BUSY_STATE;
-      }
-      else {
-        put_byte(s, (s.gzhead.text ? 1 : 0) +
-                    (s.gzhead.hcrc ? 2 : 0) +
-                    (!s.gzhead.extra ? 0 : 4) +
-                    (!s.gzhead.name ? 0 : 8) +
-                    (!s.gzhead.comment ? 0 : 16)
-                );
-        put_byte(s, s.gzhead.time & 0xff);
-        put_byte(s, (s.gzhead.time >> 8) & 0xff);
-        put_byte(s, (s.gzhead.time >> 16) & 0xff);
-        put_byte(s, (s.gzhead.time >> 24) & 0xff);
-        put_byte(s, s.level === 9 ? 2 :
-                    (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2 ?
-                     4 : 0));
-        put_byte(s, s.gzhead.os & 0xff);
-        if (s.gzhead.extra && s.gzhead.extra.length) {
-          put_byte(s, s.gzhead.extra.length & 0xff);
-          put_byte(s, (s.gzhead.extra.length >> 8) & 0xff);
-        }
-        if (s.gzhead.hcrc) {
-          strm.adler = crc32(strm.adler, s.pending_buf, s.pending, 0);
-        }
-        s.gzindex = 0;
-        s.status = EXTRA_STATE;
-      }
-    }
-    else // DEFLATE header
-    {
-      var header = (Z_DEFLATED + ((s.w_bits - 8) << 4)) << 8;
-      var level_flags = -1;
-
-      if (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2) {
-        level_flags = 0;
-      } else if (s.level < 6) {
-        level_flags = 1;
-      } else if (s.level === 6) {
-        level_flags = 2;
-      } else {
-        level_flags = 3;
-      }
-      header |= (level_flags << 6);
-      if (s.strstart !== 0) { header |= PRESET_DICT; }
-      header += 31 - (header % 31);
-
-      s.status = BUSY_STATE;
-      putShortMSB(s, header);
-
-      /* Save the adler32 of the preset dictionary: */
-      if (s.strstart !== 0) {
-        putShortMSB(s, strm.adler >>> 16);
-        putShortMSB(s, strm.adler & 0xffff);
-      }
-      strm.adler = 1; // adler32(0L, Z_NULL, 0);
-    }
-  }
-
-//#ifdef GZIP
-  if (s.status === EXTRA_STATE) {
-    if (s.gzhead.extra/* != Z_NULL*/) {
-      beg = s.pending;  /* start of bytes to update crc */
-
-      while (s.gzindex < (s.gzhead.extra.length & 0xffff)) {
-        if (s.pending === s.pending_buf_size) {
-          if (s.gzhead.hcrc && s.pending > beg) {
-            strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-          }
-          flush_pending(strm);
-          beg = s.pending;
-          if (s.pending === s.pending_buf_size) {
-            break;
-          }
-        }
-        put_byte(s, s.gzhead.extra[s.gzindex] & 0xff);
-        s.gzindex++;
-      }
-      if (s.gzhead.hcrc && s.pending > beg) {
-        strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-      }
-      if (s.gzindex === s.gzhead.extra.length) {
-        s.gzindex = 0;
-        s.status = NAME_STATE;
-      }
-    }
-    else {
-      s.status = NAME_STATE;
-    }
-  }
-  if (s.status === NAME_STATE) {
-    if (s.gzhead.name/* != Z_NULL*/) {
-      beg = s.pending;  /* start of bytes to update crc */
-      //int val;
-
-      do {
-        if (s.pending === s.pending_buf_size) {
-          if (s.gzhead.hcrc && s.pending > beg) {
-            strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-          }
-          flush_pending(strm);
-          beg = s.pending;
-          if (s.pending === s.pending_buf_size) {
-            val = 1;
-            break;
-          }
-        }
-        // JS specific: little magic to add zero terminator to end of string
-        if (s.gzindex < s.gzhead.name.length) {
-          val = s.gzhead.name.charCodeAt(s.gzindex++) & 0xff;
-        } else {
-          val = 0;
-        }
-        put_byte(s, val);
-      } while (val !== 0);
-
-      if (s.gzhead.hcrc && s.pending > beg){
-        strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-      }
-      if (val === 0) {
-        s.gzindex = 0;
-        s.status = COMMENT_STATE;
-      }
-    }
-    else {
-      s.status = COMMENT_STATE;
-    }
-  }
-  if (s.status === COMMENT_STATE) {
-    if (s.gzhead.comment/* != Z_NULL*/) {
-      beg = s.pending;  /* start of bytes to update crc */
-      //int val;
-
-      do {
-        if (s.pending === s.pending_buf_size) {
-          if (s.gzhead.hcrc && s.pending > beg) {
-            strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-          }
-          flush_pending(strm);
-          beg = s.pending;
-          if (s.pending === s.pending_buf_size) {
-            val = 1;
-            break;
-          }
-        }
-        // JS specific: little magic to add zero terminator to end of string
-        if (s.gzindex < s.gzhead.comment.length) {
-          val = s.gzhead.comment.charCodeAt(s.gzindex++) & 0xff;
-        } else {
-          val = 0;
-        }
-        put_byte(s, val);
-      } while (val !== 0);
-
-      if (s.gzhead.hcrc && s.pending > beg) {
-        strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-      }
-      if (val === 0) {
-        s.status = HCRC_STATE;
-      }
-    }
-    else {
-      s.status = HCRC_STATE;
-    }
-  }
-  if (s.status === HCRC_STATE) {
-    if (s.gzhead.hcrc) {
-      if (s.pending + 2 > s.pending_buf_size) {
-        flush_pending(strm);
-      }
-      if (s.pending + 2 <= s.pending_buf_size) {
-        put_byte(s, strm.adler & 0xff);
-        put_byte(s, (strm.adler >> 8) & 0xff);
-        strm.adler = 0; //crc32(0L, Z_NULL, 0);
-        s.status = BUSY_STATE;
-      }
-    }
-    else {
-      s.status = BUSY_STATE;
-    }
-  }
-//#endif
-
-  /* Flush as much pending output as possible */
-  if (s.pending !== 0) {
-    flush_pending(strm);
-    if (strm.avail_out === 0) {
-      /* Since avail_out is 0, deflate will be called again with
-       * more output space, but possibly with both pending and
-       * avail_in equal to zero. There won't be anything to do,
-       * but this is not an error situation so make sure we
-       * return OK instead of BUF_ERROR at next call of deflate:
-       */
-      s.last_flush = -1;
-      return Z_OK;
-    }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-  } else if (strm.avail_in === 0 && rank(flush) <= rank(old_flush) &&
-    flush !== Z_FINISH) {
-    return err(strm, Z_BUF_ERROR);
-  }
-
-  /* User must not provide more input after the first FINISH: */
-  if (s.status === FINISH_STATE && strm.avail_in !== 0) {
-    return err(strm, Z_BUF_ERROR);
-  }
-
-  /* Start a new block or continue the current one.
-   */
-  if (strm.avail_in !== 0 || s.lookahead !== 0 ||
-    (flush !== Z_NO_FLUSH && s.status !== FINISH_STATE)) {
-    var bstate = (s.strategy === Z_HUFFMAN_ONLY) ? deflate_huff(s, flush) :
-      (s.strategy === Z_RLE ? deflate_rle(s, flush) :
-        configuration_table[s.level].func(s, flush));
-
-    if (bstate === BS_FINISH_STARTED || bstate === BS_FINISH_DONE) {
-      s.status = FINISH_STATE;
-    }
-    if (bstate === BS_NEED_MORE || bstate === BS_FINISH_STARTED) {
-      if (strm.avail_out === 0) {
-        s.last_flush = -1;
-        /* avoid BUF_ERROR next call, see above */
-      }
-      return Z_OK;
-      /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-       * of deflate should use the same flush parameter to make sure
-       * that the flush is complete. So we don't have to output an
-       * empty block here, this will be done at next call. This also
-       * ensures that for a very small output buffer, we emit at most
-       * one empty block.
-       */
-    }
-    if (bstate === BS_BLOCK_DONE) {
-      if (flush === Z_PARTIAL_FLUSH) {
-        trees._tr_align(s);
-      }
-      else if (flush !== Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-
-        trees._tr_stored_block(s, 0, 0, false);
-        /* For a full flush, this empty block will be recognized
-         * as a special marker by inflate_sync().
-         */
-        if (flush === Z_FULL_FLUSH) {
-          /*** CLEAR_HASH(s); ***/             /* forget history */
-          zero(s.head); // Fill with NIL (= 0);
-
-          if (s.lookahead === 0) {
-            s.strstart = 0;
-            s.block_start = 0;
-            s.insert = 0;
-          }
-        }
-      }
-      flush_pending(strm);
-      if (strm.avail_out === 0) {
-        s.last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-        return Z_OK;
-      }
-    }
-  }
-  //Assert(strm->avail_out > 0, "bug2");
-  //if (strm.avail_out <= 0) { throw new Error("bug2");}
-
-  if (flush !== Z_FINISH) { return Z_OK; }
-  if (s.wrap <= 0) { return Z_STREAM_END; }
-
-  /* Write the trailer */
-  if (s.wrap === 2) {
-    put_byte(s, strm.adler & 0xff);
-    put_byte(s, (strm.adler >> 8) & 0xff);
-    put_byte(s, (strm.adler >> 16) & 0xff);
-    put_byte(s, (strm.adler >> 24) & 0xff);
-    put_byte(s, strm.total_in & 0xff);
-    put_byte(s, (strm.total_in >> 8) & 0xff);
-    put_byte(s, (strm.total_in >> 16) & 0xff);
-    put_byte(s, (strm.total_in >> 24) & 0xff);
-  }
-  else
-  {
-    putShortMSB(s, strm.adler >>> 16);
-    putShortMSB(s, strm.adler & 0xffff);
-  }
-
-  flush_pending(strm);
-  /* If avail_out is zero, the application will call deflate again
-   * to flush the rest.
-   */
-  if (s.wrap > 0) { s.wrap = -s.wrap; }
-  /* write the trailer only once! */
-  return s.pending !== 0 ? Z_OK : Z_STREAM_END;
-}
-
-function deflateEnd(strm) {
-  var status;
-
-  if (!strm/*== Z_NULL*/ || !strm.state/*== Z_NULL*/) {
-    return Z_STREAM_ERROR;
-  }
-
-  status = strm.state.status;
-  if (status !== INIT_STATE &&
-    status !== EXTRA_STATE &&
-    status !== NAME_STATE &&
-    status !== COMMENT_STATE &&
-    status !== HCRC_STATE &&
-    status !== BUSY_STATE &&
-    status !== FINISH_STATE
-  ) {
-    return err(strm, Z_STREAM_ERROR);
-  }
-
-  strm.state = null;
-
-  return status === BUSY_STATE ? err(strm, Z_DATA_ERROR) : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state
- */
-//function deflateCopy(dest, source) {
-//
-//}
-
-exports.deflateInit = deflateInit;
-exports.deflateInit2 = deflateInit2;
-exports.deflateReset = deflateReset;
-exports.deflateResetKeep = deflateResetKeep;
-exports.deflateSetHeader = deflateSetHeader;
-exports.deflate = deflate;
-exports.deflateEnd = deflateEnd;
-exports.deflateInfo = 'pako deflate (from Nodeca project)';
-
-/* Not implemented
-exports.deflateBound = deflateBound;
-exports.deflateCopy = deflateCopy;
-exports.deflateSetDictionary = deflateSetDictionary;
-exports.deflateParams = deflateParams;
-exports.deflatePending = deflatePending;
-exports.deflatePrime = deflatePrime;
-exports.deflateTune = deflateTune;
-*/
-},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(_dereq_,module,exports){
-'use strict';
-
-
-function GZheader() {
-  /* true if compressed data believed to be text */
-  this.text       = 0;
-  /* modification time */
-  this.time       = 0;
-  /* extra flags (not used when writing a gzip file) */
-  this.xflags     = 0;
-  /* operating system */
-  this.os         = 0;
-  /* pointer to extra field or Z_NULL if none */
-  this.extra      = null;
-  /* extra field length (valid if extra != Z_NULL) */
-  this.extra_len  = 0; // Actually, we don't need it in JS,
-                       // but leave for few code modifications
-
-  //
-  // Setup limits is not necessary because in js we should not preallocate memory 
-  // for inflate use constant limit in 65536 bytes
-  //
-
-  /* space at extra (only when reading header) */
-  // this.extra_max  = 0;
-  /* pointer to zero-terminated file name or Z_NULL */
-  this.name       = '';
-  /* space at name (only when reading header) */
-  // this.name_max   = 0;
-  /* pointer to zero-terminated comment or Z_NULL */
-  this.comment    = '';
-  /* space at comment (only when reading header) */
-  // this.comm_max   = 0;
-  /* true if there was or will be a header crc */
-  this.hcrc       = 0;
-  /* true when done reading gzip header (not used when writing a gzip file) */
-  this.done       = false;
-}
-
-module.exports = GZheader;
-},{}],34:[function(_dereq_,module,exports){
-'use strict';
-
-// See state defs from inflate.js
-var BAD = 30;       /* got a data error -- remain here until reset */
-var TYPE = 12;      /* i: waiting for type bits, including last-flag bit */
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state.mode === LEN
-        strm.avail_in >= 6
-        strm.avail_out >= 258
-        start >= strm.avail_out
-        state.bits < 8
-
-   On return, state.mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm.avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm.avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-module.exports = function inflate_fast(strm, start) {
-  var state;
-  var _in;                    /* local strm.input */
-  var last;                   /* have enough input while in < last */
-  var _out;                   /* local strm.output */
-  var beg;                    /* inflate()'s initial strm.output */
-  var end;                    /* while out < end, enough space available */
-//#ifdef INFLATE_STRICT
-  var dmax;                   /* maximum distance from zlib header */
-//#endif
-  var wsize;                  /* window size or zero if not using window */
-  var whave;                  /* valid bytes in the window */
-  var wnext;                  /* window write index */
-  var window;                 /* allocated sliding window, if wsize != 0 */
-  var hold;                   /* local strm.hold */
-  var bits;                   /* local strm.bits */
-  var lcode;                  /* local strm.lencode */
-  var dcode;                  /* local strm.distcode */
-  var lmask;                  /* mask for first level of length codes */
-  var dmask;                  /* mask for first level of distance codes */
-  var here;                   /* retrieved table entry */
-  var op;                     /* code bits, operation, extra bits, or */
-                              /*  window position, window bytes to copy */
-  var len;                    /* match length, unused bytes */
-  var dist;                   /* match distance */
-  var from;                   /* where to copy match from */
-  var from_source;
-
-
-  var input, output; // JS specific, because we have no pointers
-
-  /* copy state to local variables */
-  state = strm.state;
-  //here = state.here;
-  _in = strm.next_in;
-  input = strm.input;
-  last = _in + (strm.avail_in - 5);
-  _out = strm.next_out;
-  output = strm.output;
-  beg = _out - (start - strm.avail_out);
-  end = _out + (strm.avail_out - 257);
-//#ifdef INFLATE_STRICT
-  dmax = state.dmax;
-//#endif
-  wsize = state.wsize;
-  whave = state.whave;
-  wnext = state.wnext;
-  window = state.window;
-  hold = state.hold;
-  bits = state.bits;
-  lcode = state.lencode;
-  dcode = state.distcode;
-  lmask = (1 << state.lenbits) - 1;
-  dmask = (1 << state.distbits) - 1;
-
-
-  /* decode literals and length/distances until end-of-block or not enough
-     input data or output space */
-
-  top:
-  do {
-    if (bits < 15) {
-      hold += input[_in++] << bits;
-      bits += 8;
-      hold += input[_in++] << bits;
-      bits += 8;
-    }
-
-    here = lcode[hold & lmask];
-
-    dolen:
-    for (;;) { // Goto emulation
-      op = here >>> 24/*here.bits*/;
-      hold >>>= op;
-      bits -= op;
-      op = (here >>> 16) & 0xff/*here.op*/;
-      if (op === 0) {                          /* literal */
-        //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-        //        "inflate:         literal '%c'\n" :
-        //        "inflate:         literal 0x%02x\n", here.val));
-        output[_out++] = here & 0xffff/*here.val*/;
-      }
-      else if (op & 16) {                     /* length base */
-        len = here & 0xffff/*here.val*/;
-        op &= 15;                           /* number of extra bits */
-        if (op) {
-          if (bits < op) {
-            hold += input[_in++] << bits;
-            bits += 8;
-          }
-          len += hold & ((1 << op) - 1);
-          hold >>>= op;
-          bits -= op;
-        }
-        //Tracevv((stderr, "inflate:         length %u\n", len));
-        if (bits < 15) {
-          hold += input[_in++] << bits;
-          bits += 8;
-          hold += input[_in++] << bits;
-          bits += 8;
-        }
-        here = dcode[hold & dmask];
-
-        dodist:
-        for (;;) { // goto emulation
-          op = here >>> 24/*here.bits*/;
-          hold >>>= op;
-          bits -= op;
-          op = (here >>> 16) & 0xff/*here.op*/;
-
-          if (op & 16) {                      /* distance base */
-            dist = here & 0xffff/*here.val*/;
-            op &= 15;                       /* number of extra bits */
-            if (bits < op) {
-              hold += input[_in++] << bits;
-              bits += 8;
-              if (bits < op) {
-                hold += input[_in++] << bits;
-                bits += 8;
-              }
-            }
-            dist += hold & ((1 << op) - 1);
-//#ifdef INFLATE_STRICT
-            if (dist > dmax) {
-              strm.msg = 'invalid distance too far back';
-              state.mode = BAD;
-              break top;
-            }
-//#endif
-            hold >>>= op;
-            bits -= op;
-            //Tracevv((stderr, "inflate:         distance %u\n", dist));
-            op = _out - beg;                /* max distance in output */
-            if (dist > op) {                /* see if copy from window */
-              op = dist - op;               /* distance back in window */
-              if (op > whave) {
-                if (state.sane) {
-                  strm.msg = 'invalid distance too far back';
-                  state.mode = BAD;
-                  break top;
-                }
-
-// (!) This block is disabled in zlib defailts,
-// don't enable it for binary compatibility
-//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-//                if (len <= op - whave) {
-//                  do {
-//                    output[_out++] = 0;
-//                  } while (--len);
-//                  continue top;
-//                }
-//                len -= op - whave;
-//                do {
-//                  output[_out++] = 0;
-//                } while (--op > whave);
-//                if (op === 0) {
-//                  from = _out - dist;
-//                  do {
-//                    output[_out++] = output[from++];
-//                  } while (--len);
-//                  continue top;
-//                }
-//#endif
-              }
-              from = 0; // window index
-              from_source = window;
-              if (wnext === 0) {           /* very common case */
-                from += wsize - op;
-                if (op < len) {         /* some from window */
-                  len -= op;
-                  do {
-                    output[_out++] = window[from++];
-                  } while (--op);
-                  from = _out - dist;  /* rest from output */
-                  from_source = output;
-                }
-              }
-              else if (wnext < op) {      /* wrap around window */
-                from += wsize + wnext - op;
-                op -= wnext;
-                if (op < len) {         /* some from end of window */
-                  len -= op;
-                  do {
-                    output[_out++] = window[from++];
-                  } while (--op);
-                  from = 0;
-                  if (wnext < len) {  /* some from start of window */
-                    op = wnext;
-                    len -= op;
-                    do {
-                      output[_out++] = window[from++];
-                    } while (--op);
-                    from = _out - dist;      /* rest from output */
-                    from_source = output;
-                  }
-                }
-              }
-              else {                      /* contiguous in window */
-                from += wnext - op;
-                if (op < len) {         /* some from window */
-                  len -= op;
-                  do {
-                    output[_out++] = window[from++];
-                  } while (--op);
-                  from = _out - dist;  /* rest from output */
-                  from_source = output;
-                }
-              }
-              while (len > 2) {
-                output[_out++] = from_source[from++];
-                output[_out++] = from_source[from++];
-                output[_out++] = from_source[from++];
-                len -= 3;
-              }
-              if (len) {
-                output[_out++] = from_source[from++];
-                if (len > 1) {
-                  output[_out++] = from_source[from++];
-                }
-              }
-            }
-            else {
-              from = _out - dist;          /* copy direct from output */
-              do {                        /* minimum length is three */
-                output[_out++] = output[from++];
-                output[_out++] = output[from++];
-                output[_out++] = output[from++];
-                len -= 3;
-              } while (len > 2);
-              if (len) {
-                output[_out++] = output[from++];
-                if (len > 1) {
-                  output[_out++] = output[from++];
-                }
-              }
-            }
-          }
-          else if ((op & 64) === 0) {          /* 2nd level distance code */
-            here = dcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
-            continue dodist;
-          }
-          else {
-            strm.msg = 'invalid distance code';
-            state.mode = BAD;
-            break top;
-          }
-
-          break; // need to emulate goto via "continue"
-        }
-      }
-      else if ((op & 64) === 0) {              /* 2nd level length code */
-        here = lcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
-        continue dolen;
-      }
-      else if (op & 32) {                     /* end-of-block */
-        //Tracevv((stderr, "inflate:         end of block\n"));
-        state.mode = TYPE;
-        break top;
-      }
-      else {
-        strm.msg = 'invalid literal/length code';
-        state.mode = BAD;
-        break top;
-      }
-
-      break; // need to emulate goto via "continue"
-    }
-  } while (_in < last && _out < end);
-
-  /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-  len = bits >> 3;
-  _in -= len;
-  bits -= len << 3;
-  hold &= (1 << bits) - 1;
-
-  /* update state and return */
-  strm.next_in = _in;
-  strm.next_out = _out;
-  strm.avail_in = (_in < last ? 5 + (last - _in) : 5 - (_in - last));
-  strm.avail_out = (_out < end ? 257 + (end - _out) : 257 - (_out - end));
-  state.hold = hold;
-  state.bits = bits;
-  return;
-};
-
-},{}],35:[function(_dereq_,module,exports){
-'use strict';
-
-
-var utils = _dereq_('../utils/common');
-var adler32 = _dereq_('./adler32');
-var crc32   = _dereq_('./crc32');
-var inflate_fast = _dereq_('./inffast');
-var inflate_table = _dereq_('./inftrees');
-
-var CODES = 0;
-var LENS = 1;
-var DISTS = 2;
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-
-/* Allowed flush values; see deflate() and inflate() below for details */
-//var Z_NO_FLUSH      = 0;
-//var Z_PARTIAL_FLUSH = 1;
-//var Z_SYNC_FLUSH    = 2;
-//var Z_FULL_FLUSH    = 3;
-var Z_FINISH        = 4;
-var Z_BLOCK         = 5;
-var Z_TREES         = 6;
-
-
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-var Z_OK            = 0;
-var Z_STREAM_END    = 1;
-var Z_NEED_DICT     = 2;
-//var Z_ERRNO         = -1;
-var Z_STREAM_ERROR  = -2;
-var Z_DATA_ERROR    = -3;
-var Z_MEM_ERROR     = -4;
-var Z_BUF_ERROR     = -5;
-//var Z_VERSION_ERROR = -6;
-
-/* The deflate compression method */
-var Z_DEFLATED  = 8;
-
-
-/* STATES ====================================================================*/
-/* ===========================================================================*/
-
-
-var    HEAD = 1;       /* i: waiting for magic header */
-var    FLAGS = 2;      /* i: waiting for method and flags (gzip) */
-var    TIME = 3;       /* i: waiting for modification time (gzip) */
-var    OS = 4;         /* i: waiting for extra flags and operating system (gzip) */
-var    EXLEN = 5;      /* i: waiting for extra length (gzip) */
-var    EXTRA = 6;      /* i: waiting for extra bytes (gzip) */
-var    NAME = 7;       /* i: waiting for end of file name (gzip) */
-var    COMMENT = 8;    /* i: waiting for end of comment (gzip) */
-var    HCRC = 9;       /* i: waiting for header crc (gzip) */
-var    DICTID = 10;    /* i: waiting for dictionary check value */
-var    DICT = 11;      /* waiting for inflateSetDictionary() call */
-var        TYPE = 12;      /* i: waiting for type bits, including last-flag bit */
-var        TYPEDO = 13;    /* i: same, but skip check to exit inflate on new block */
-var        STORED = 14;    /* i: waiting for stored size (length and complement) */
-var        COPY_ = 15;     /* i/o: same as COPY below, but only first time in */
-var        COPY = 16;      /* i/o: waiting for input or output to copy stored block */
-var        TABLE = 17;     /* i: waiting for dynamic block table lengths */
-var        LENLENS = 18;   /* i: waiting for code length code lengths */
-var        CODELENS = 19;  /* i: waiting for length/lit and distance code lengths */
-var            LEN_ = 20;      /* i: same as LEN below, but only first time in */
-var            LEN = 21;       /* i: waiting for length/lit/eob code */
-var            LENEXT = 22;    /* i: waiting for length extra bits */
-var            DIST = 23;      /* i: waiting for distance code */
-var            DISTEXT = 24;   /* i: waiting for distance extra bits */
-var            MATCH = 25;     /* o: waiting for output space to copy string */
-var            LIT = 26;       /* o: waiting for output space to write literal */
-var    CHECK = 27;     /* i: waiting for 32-bit check value */
-var    LENGTH = 28;    /* i: waiting for 32-bit length (gzip) */
-var    DONE = 29;      /* finished check, done -- remain here until reset */
-var    BAD = 30;       /* got a data error -- remain here until reset */
-var    MEM = 31;       /* got an inflate() memory error -- remain here until reset */
-var    SYNC = 32;      /* looking for synchronization bytes to restart inflate() */
-
-/* ===========================================================================*/
-
-
-
-var ENOUGH_LENS = 852;
-var ENOUGH_DISTS = 592;
-//var ENOUGH =  (ENOUGH_LENS+ENOUGH_DISTS);
-
-var MAX_WBITS = 15;
-/* 32K LZ77 window */
-var DEF_WBITS = MAX_WBITS;
-
-
-function ZSWAP32(q) {
-  return  (((q >>> 24) & 0xff) +
-          ((q >>> 8) & 0xff00) +
-          ((q & 0xff00) << 8) +
-          ((q & 0xff) << 24));
-}
-
-
-function InflateState() {
-  this.mode = 0;             /* current inflate mode */
-  this.last = false;          /* true if processing last block */
-  this.wrap = 0;              /* bit 0 true for zlib, bit 1 true for gzip */
-  this.havedict = false;      /* true if dictionary provided */
-  this.flags = 0;             /* gzip header method and flags (0 if zlib) */
-  this.dmax = 0;              /* zlib header max distance (INFLATE_STRICT) */
-  this.check = 0;             /* protected copy of check value */
-  this.total = 0;             /* protected copy of output count */
-  // TODO: may be {}
-  this.head = null;           /* where to save gzip header information */
-
-  /* sliding window */
-  this.wbits = 0;             /* log base 2 of requested window size */
-  this.wsize = 0;             /* window size or zero if not using window */
-  this.whave = 0;             /* valid bytes in the window */
-  this.wnext = 0;             /* window write index */
-  this.window = null;         /* allocated sliding window, if needed */
-
-  /* bit accumulator */
-  this.hold = 0;              /* input bit accumulator */
-  this.bits = 0;              /* number of bits in "in" */
-
-  /* for string and stored block copying */
-  this.length = 0;            /* literal or length of data to copy */
-  this.offset = 0;            /* distance back to copy string from */
-
-  /* for table and code decoding */
-  this.extra = 0;             /* extra bits needed */
-
-  /* fixed and dynamic code tables */
-  this.lencode = null;          /* starting table for length/literal codes */
-  this.distcode = null;         /* starting table for distance codes */
-  this.lenbits = 0;           /* index bits for lencode */
-  this.distbits = 0;          /* index bits for distcode */
-
-  /* dynamic table building */
-  this.ncode = 0;             /* number of code length code lengths */
-  this.nlen = 0;              /* number of length code lengths */
-  this.ndist = 0;             /* number of distance code lengths */
-  this.have = 0;              /* number of code lengths in lens[] */
-  this.next = null;              /* next available space in codes[] */
-
-  this.lens = new utils.Buf16(320); /* temporary storage for code lengths */
-  this.work = new utils.Buf16(288); /* work area for code table building */
-
-  /*
-   because we don't have pointers in js, we use lencode and distcode directly
-   as buffers so we don't need codes
-  */
-  //this.codes = new utils.Buf32(ENOUGH);       /* space for code tables */
-  this.lendyn = null;              /* dynamic table for length/literal codes (JS specific) */
-  this.distdyn = null;             /* dynamic table for distance codes (JS specific) */
-  this.sane = 0;                   /* if false, allow invalid distance too far */
-  this.back = 0;                   /* bits back of last unprocessed length/lit */
-  this.was = 0;                    /* initial length of match */
-}
-
-function inflateResetKeep(strm) {
-  var state;
-
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  state = strm.state;
-  strm.total_in = strm.total_out = state.total = 0;
-  strm.msg = ''; /*Z_NULL*/
-  if (state.wrap) {       /* to support ill-conceived Java test suite */
-    strm.adler = state.wrap & 1;
-  }
-  state.mode = HEAD;
-  state.last = 0;
-  state.havedict = 0;
-  state.dmax = 32768;
-  state.head = null/*Z_NULL*/;
-  state.hold = 0;
-  state.bits = 0;
-  //state.lencode = state.distcode = state.next = state.codes;
-  state.lencode = state.lendyn = new utils.Buf32(ENOUGH_LENS);
-  state.distcode = state.distdyn = new utils.Buf32(ENOUGH_DISTS);
-
-  state.sane = 1;
-  state.back = -1;
-  //Tracev((stderr, "inflate: reset\n"));
-  return Z_OK;
-}
-
-function inflateReset(strm) {
-  var state;
-
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  state = strm.state;
-  state.wsize = 0;
-  state.whave = 0;
-  state.wnext = 0;
-  return inflateResetKeep(strm);
-
-}
-
-function inflateReset2(strm, windowBits) {
-  var wrap;
-  var state;
-
-  /* get the state */
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  state = strm.state;
-
-  /* extract wrap request from windowBits parameter */
-  if (windowBits < 0) {
-    wrap = 0;
-    windowBits = -windowBits;
-  }
-  else {
-    wrap = (windowBits >> 4) + 1;
-    if (windowBits < 48) {
-      windowBits &= 15;
-    }
-  }
-
-  /* set number of window bits, free window if different */
-  if (windowBits && (windowBits < 8 || windowBits > 15)) {
-    return Z_STREAM_ERROR;
-  }
-  if (state.window !== null && state.wbits !== windowBits) {
-    state.window = null;
-  }
-
-  /* update state and reset the rest of it */
-  state.wrap = wrap;
-  state.wbits = windowBits;
-  return inflateReset(strm);
-}
-
-function inflateInit2(strm, windowBits) {
-  var ret;
-  var state;
-
-  if (!strm) { return Z_STREAM_ERROR; }
-  //strm.msg = Z_NULL;                 /* in case we return an error */
-
-  state = new InflateState();
-
-  //if (state === Z_NULL) return Z_MEM_ERROR;
-  //Tracev((stderr, "inflate: allocated\n"));
-  strm.state = state;
-  state.window = null/*Z_NULL*/;
-  ret = inflateReset2(strm, windowBits);
-  if (ret !== Z_OK) {
-    strm.state = null/*Z_NULL*/;
-  }
-  return ret;
-}
-
-function inflateInit(strm) {
-  return inflateInit2(strm, DEF_WBITS);
-}
-
-
-/*
- Return state with length and distance decoding tables and index sizes set to
- fixed code decoding.  Normally this returns fixed tables from inffixed.h.
- If BUILDFIXED is defined, then instead this routine builds the tables the
- first time it's called, and returns those tables the first time and
- thereafter.  This reduces the size of the code by about 2K bytes, in
- exchange for a little execution time.  However, BUILDFIXED should not be
- used for threaded applications, since the rewriting of the tables and virgin
- may not be thread-safe.
- */
-var virgin = true;
-
-var lenfix, distfix; // We have no pointers in JS, so keep tables separate
-
-function fixedtables(state) {
-  /* build fixed huffman tables if first call (may not be thread safe) */
-  if (virgin) {
-    var sym;
-
-    lenfix = new utils.Buf32(512);
-    distfix = new utils.Buf32(32);
-
-    /* literal/length table */
-    sym = 0;
-    while (sym < 144) { state.lens[sym++] = 8; }
-    while (sym < 256) { state.lens[sym++] = 9; }
-    while (sym < 280) { state.lens[sym++] = 7; }
-    while (sym < 288) { state.lens[sym++] = 8; }
-
-    inflate_table(LENS,  state.lens, 0, 288, lenfix,   0, state.work, {bits: 9});
-
-    /* distance table */
-    sym = 0;
-    while (sym < 32) { state.lens[sym++] = 5; }
-
-    inflate_table(DISTS, state.lens, 0, 32,   distfix, 0, state.work, {bits: 5});
-
-    /* do this just once */
-    virgin = false;
-  }
-
-  state.lencode = lenfix;
-  state.lenbits = 9;
-  state.distcode = distfix;
-  state.distbits = 5;
-}
-
-
-/*
- Update the window with the last wsize (normally 32K) bytes written before
- returning.  If window does not exist yet, create it.  This is only called
- when a window is already in use, or when output has been written during this
- inflate call, but the end of the deflate stream has not been reached yet.
- It is also called to create a window for dictionary data when a dictionary
- is loaded.
-
- Providing output buffers larger than 32K to inflate() should provide a speed
- advantage, since only the last 32K of output is copied to the sliding window
- upon return from inflate(), and since all distances after the first 32K of
- output will fall in the output data, making match copies simpler and faster.
- The advantage may be dependent on the size of the processor's data caches.
- */
-function updatewindow(strm, src, end, copy) {
-  var dist;
-  var state = strm.state;
-
-  /* if it hasn't been done already, allocate space for the window */
-  if (state.window === null) {
-    state.wsize = 1 << state.wbits;
-    state.wnext = 0;
-    state.whave = 0;
-
-    state.window = new utils.Buf8(state.wsize);
-  }
-
-  /* copy state->wsize or less output bytes into the circular window */
-  if (copy >= state.wsize) {
-    utils.arraySet(state.window,src, end - state.wsize, state.wsize, 0);
-    state.wnext = 0;
-    state.whave = state.wsize;
-  }
-  else {
-    dist = state.wsize - state.wnext;
-    if (dist > copy) {
-      dist = copy;
-    }
-    //zmemcpy(state->window + state->wnext, end - copy, dist);
-    utils.arraySet(state.window,src, end - copy, dist, state.wnext);
-    copy -= dist;
-    if (copy) {
-      //zmemcpy(state->window, end - copy, copy);
-      utils.arraySet(state.window,src, end - copy, copy, 0);
-      state.wnext = copy;
-      state.whave = state.wsize;
-    }
-    else {
-      state.wnext += dist;
-      if (state.wnext === state.wsize) { state.wnext = 0; }
-      if (state.whave < state.wsize) { state.whave += dist; }
-    }
-  }
-  return 0;
-}
-
-function inflate(strm, flush) {
-  var state;
-  var input, output;          // input/output buffers
-  var next;                   /* next input INDEX */
-  var put;                    /* next output INDEX */
-  var have, left;             /* available input and output */
-  var hold;                   /* bit buffer */
-  var bits;                   /* bits in bit buffer */
-  var _in, _out;              /* save starting available input and output */
-  var copy;                   /* number of stored or match bytes to copy */
-  var from;                   /* where to copy match bytes from */
-  var from_source;
-  var here = 0;               /* current decoding table entry */
-  var here_bits, here_op, here_val; // paked "here" denormalized (JS specific)
-  //var last;                   /* parent table entry */
-  var last_bits, last_op, last_val; // paked "last" denormalized (JS specific)
-  var len;                    /* length to copy for repeats, bits to drop */
-  var ret;                    /* return code */
-  var hbuf = new utils.Buf8(4);    /* buffer for gzip header crc calculation */
-  var opts;
-
-  var n; // temporary var for NEED_BITS
-
-  var order = /* permutation of code lengths */
-    [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15];
-
-
-  if (!strm || !strm.state || !strm.output ||
-      (!strm.input && strm.avail_in !== 0)) {
-    return Z_STREAM_ERROR;
-  }
-
-  state = strm.state;
-  if (state.mode === TYPE) { state.mode = TYPEDO; }    /* skip check */
-
-
-  //--- LOAD() ---
-  put = strm.next_out;
-  output = strm.output;
-  left = strm.avail_out;
-  next = strm.next_in;
-  input = strm.input;
-  have = strm.avail_in;
-  hold = state.hold;
-  bits = state.bits;
-  //---
-
-  _in = have;
-  _out = left;
-  ret = Z_OK;
-
-  inf_leave: // goto emulation
-  for (;;) {
-    switch (state.mode) {
-    case HEAD:
-      if (state.wrap === 0) {
-        state.mode = TYPEDO;
-        break;
-      }
-      //=== NEEDBITS(16);
-      while (bits < 16) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      if ((state.wrap & 2) && hold === 0x8b1f) {  /* gzip header */
-        state.check = 0/*crc32(0L, Z_NULL, 0)*/;
-        //=== CRC2(state.check, hold);
-        hbuf[0] = hold & 0xff;
-        hbuf[1] = (hold >>> 8) & 0xff;
-        state.check = crc32(state.check, hbuf, 2, 0);
-        //===//
-
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-        state.mode = FLAGS;
-        break;
-      }
-      state.flags = 0;           /* expect zlib header */
-      if (state.head) {
-        state.head.done = false;
-      }
-      if (!(state.wrap & 1) ||   /* check if zlib header allowed */
-        (((hold & 0xff)/*BITS(8)*/ << 8) + (hold >> 8)) % 31) {
-        strm.msg = 'incorrect header check';
-        state.mode = BAD;
-        break;
-      }
-      if ((hold & 0x0f)/*BITS(4)*/ !== Z_DEFLATED) {
-        strm.msg = 'unknown compression method';
-        state.mode = BAD;
-        break;
-      }
-      //--- DROPBITS(4) ---//
-      hold >>>= 4;
-      bits -= 4;
-      //---//
-      len = (hold & 0x0f)/*BITS(4)*/ + 8;
-      if (state.wbits === 0) {
-        state.wbits = len;
-      }
-      else if (len > state.wbits) {
-        strm.msg = 'invalid window size';
-        state.mode = BAD;
-        break;
-      }
-      state.dmax = 1 << len;
-      //Tracev((stderr, "inflate:   zlib header ok\n"));
-      strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
-      state.mode = hold & 0x200 ? DICTID : TYPE;
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      break;
-    case FLAGS:
-      //=== NEEDBITS(16); */
-      while (bits < 16) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      state.flags = hold;
-      if ((state.flags & 0xff) !== Z_DEFLATED) {
-        strm.msg = 'unknown compression method';
-        state.mode = BAD;
-        break;
-      }
-      if (state.flags & 0xe000) {
-        strm.msg = 'unknown header flags set';
-        state.mode = BAD;
-        break;
-      }
-      if (state.head) {
-        state.head.text = ((hold >> 8) & 1);
-      }
-      if (state.flags & 0x0200) {
-        //=== CRC2(state.check, hold);
-        hbuf[0] = hold & 0xff;
-        hbuf[1] = (hold >>> 8) & 0xff;
-        state.check = crc32(state.check, hbuf, 2, 0);
-        //===//
-      }
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = TIME;
-      /* falls through */
-    case TIME:
-      //=== NEEDBITS(32); */
-      while (bits < 32) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      if (state.head) {
-        state.head.time = hold;
-      }
-      if (state.flags & 0x0200) {
-        //=== CRC4(state.check, hold)
-        hbuf[0] = hold & 0xff;
-        hbuf[1] = (hold >>> 8) & 0xff;
-        hbuf[2] = (hold >>> 16) & 0xff;
-        hbuf[3] = (hold >>> 24) & 0xff;
-        state.check = crc32(state.check, hbuf, 4, 0);
-        //===
-      }
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = OS;
-      /* falls through */
-    case OS:
-      //=== NEEDBITS(16); */
-      while (bits < 16) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      if (state.head) {
-        state.head.xflags = (hold & 0xff);
-        state.head.os = (hold >> 8);
-      }
-      if (state.flags & 0x0200) {
-        //=== CRC2(state.check, hold);
-        hbuf[0] = hold & 0xff;
-        hbuf[1] = (hold >>> 8) & 0xff;
-        state.check = crc32(state.check, hbuf, 2, 0);
-        //===//
-      }
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = EXLEN;
-      /* falls through */
-    case EXLEN:
-      if (state.flags & 0x0400) {
-        //=== NEEDBITS(16); */
-        while (bits < 16) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        state.length = hold;
-        if (state.head) {
-          state.head.extra_len = hold;
-        }
-        if (state.flags & 0x0200) {
-          //=== CRC2(state.check, hold);
-          hbuf[0] = hold & 0xff;
-          hbuf[1] = (hold >>> 8) & 0xff;
-          state.check = crc32(state.check, hbuf, 2, 0);
-          //===//
-        }
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-      }
-      else if (state.head) {
-        state.head.extra = null/*Z_NULL*/;
-      }
-      state.mode = EXTRA;
-      /* falls through */
-    case EXTRA:
-      if (state.flags & 0x0400) {
-        copy = state.length;
-        if (copy > have) { copy = have; }
-        if (copy) {
-          if (state.head) {
-            len = state.head.extra_len - state.length;
-            if (!state.head.extra) {
-              // Use untyped array for more conveniend processing later
-              state.head.extra = new Array(state.head.extra_len);
-            }
-            utils.arraySet(
-              state.head.extra,
-              input,
-              next,
-              // extra field is limited to 65536 bytes
-              // - no need for additional size check
-              copy,
-              /*len + copy > state.head.extra_max - len ? state.head.extra_max : copy,*/
-              len
-            );
-            //zmemcpy(state.head.extra + len, next,
-            //        len + copy > state.head.extra_max ?
-            //        state.head.extra_max - len : copy);
-          }
-          if (state.flags & 0x0200) {
-            state.check = crc32(state.check, input, copy, next);
-          }
-          have -= copy;
-          next += copy;
-          state.length -= copy;
-        }
-        if (state.length) { break inf_leave; }
-      }
-      state.length = 0;
-      state.mode = NAME;
-      /* falls through */
-    case NAME:
-      if (state.flags & 0x0800) {
-        if (have === 0) { break inf_leave; }
-        copy = 0;
-        do {
-          // TODO: 2 or 1 bytes?
-          len = input[next + copy++];
-          /* use constant limit because in js we should not preallocate memory */
-          if (state.head && len &&
-              (state.length < 65536 /*state.head.name_max*/)) {
-            state.head.name += String.fromCharCode(len);
-          }
-        } while (len && copy < have);
-
-        if (state.flags & 0x0200) {
-          state.check = crc32(state.check, input, copy, next);
-        }
-        have -= copy;
-        next += copy;
-        if (len) { break inf_leave; }
-      }
-      else if (state.head) {
-        state.head.name = null;
-      }
-      state.length = 0;
-      state.mode = COMMENT;
-      /* falls through */
-    case COMMENT:
-      if (state.flags & 0x1000) {
-        if (have === 0) { break inf_leave; }
-        copy = 0;
-        do {
-          len = input[next + copy++];
-          /* use constant limit because in js we should not preallocate memory */
-          if (state.head && len &&
-              (state.length < 65536 /*state.head.comm_max*/)) {
-            state.head.comment += String.fromCharCode(len);
-          }
-        } while (len && copy < have);
-        if (state.flags & 0x0200) {
-          state.check = crc32(state.check, input, copy, next);
-        }
-        have -= copy;
-        next += copy;
-        if (len) { break inf_leave; }
-      }
-      else if (state.head) {
-        state.head.comment = null;
-      }
-      state.mode = HCRC;
-      /* falls through */
-    case HCRC:
-      if (state.flags & 0x0200) {
-        //=== NEEDBITS(16); */
-        while (bits < 16) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        if (hold !== (state.check & 0xffff)) {
-          strm.msg = 'header crc mismatch';
-          state.mode = BAD;
-          break;
-        }
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-      }
-      if (state.head) {
-        state.head.hcrc = ((state.flags >> 9) & 1);
-        state.head.done = true;
-      }
-      strm.adler = state.check = 0 /*crc32(0L, Z_NULL, 0)*/;
-      state.mode = TYPE;
-      break;
-    case DICTID:
-      //=== NEEDBITS(32); */
-      while (bits < 32) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      strm.adler = state.check = ZSWAP32(hold);
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = DICT;
-      /* falls through */
-    case DICT:
-      if (state.havedict === 0) {
-        //--- RESTORE() ---
-        strm.next_out = put;
-        strm.avail_out = left;
-        strm.next_in = next;
-        strm.avail_in = have;
-        state.hold = hold;
-        state.bits = bits;
-        //---
-        return Z_NEED_DICT;
-      }
-      strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
-      state.mode = TYPE;
-      /* falls through */
-    case TYPE:
-      if (flush === Z_BLOCK || flush === Z_TREES) { break inf_leave; }
-      /* falls through */
-    case TYPEDO:
-      if (state.last) {
-        //--- BYTEBITS() ---//
-        hold >>>= bits & 7;
-        bits -= bits & 7;
-        //---//
-        state.mode = CHECK;
-        break;
-      }
-      //=== NEEDBITS(3); */
-      while (bits < 3) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      state.last = (hold & 0x01)/*BITS(1)*/;
-      //--- DROPBITS(1) ---//
-      hold >>>= 1;
-      bits -= 1;
-      //---//
-
-      switch ((hold & 0x03)/*BITS(2)*/) {
-      case 0:                             /* stored block */
-        //Tracev((stderr, "inflate:     stored block%s\n",
-        //        state.last ? " (last)" : ""));
-        state.mode = STORED;
-        break;
-      case 1:                             /* fixed block */
-        fixedtables(state);
-        //Tracev((stderr, "inflate:     fixed codes block%s\n",
-        //        state.last ? " (last)" : ""));
-        state.mode = LEN_;             /* decode codes */
-        if (flush === Z_TREES) {
-          //--- DROPBITS(2) ---//
-          hold >>>= 2;
-          bits -= 2;
-          //---//
-          break inf_leave;
-        }
-        break;
-      case 2:                             /* dynamic block */
-        //Tracev((stderr, "inflate:     dynamic codes block%s\n",
-        //        state.last ? " (last)" : ""));
-        state.mode = TABLE;
-        break;
-      case 3:
-        strm.msg = 'invalid block type';
-        state.mode = BAD;
-      }
-      //--- DROPBITS(2) ---//
-      hold >>>= 2;
-      bits -= 2;
-      //---//
-      break;
-    case STORED:
-      //--- BYTEBITS() ---// /* go to byte boundary */
-      hold >>>= bits & 7;
-      bits -= bits & 7;
-      //---//
-      //=== NEEDBITS(32); */
-      while (bits < 32) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      if ((hold & 0xffff) !== ((hold >>> 16) ^ 0xffff)) {
-        strm.msg = 'invalid stored block lengths';
-        state.mode = BAD;
-        break;
-      }
-      state.length = hold & 0xffff;
-      //Tracev((stderr, "inflate:       stored length %u\n",
-      //        state.length));
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = COPY_;
-      if (flush === Z_TREES) { break inf_leave; }
-      /* falls through */
-    case COPY_:
-      state.mode = COPY;
-      /* falls through */
-    case COPY:
-      copy = state.length;
-      if (copy) {
-        if (copy > have) { copy = have; }
-        if (copy > left) { copy = left; }
-        if (copy === 0) { break inf_leave; }
-        //--- zmemcpy(put, next, copy); ---
-        utils.arraySet(output, input, next, copy, put);
-        //---//
-        have -= copy;
-        next += copy;
-        left -= copy;
-        put += copy;
-        state.length -= copy;
-        break;
-      }
-      //Tracev((stderr, "inflate:       stored end\n"));
-      state.mode = TYPE;
-      break;
-    case TABLE:
-      //=== NEEDBITS(14); */
-      while (bits < 14) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      state.nlen = (hold & 0x1f)/*BITS(5)*/ + 257;
-      //--- DROPBITS(5) ---//
-      hold >>>= 5;
-      bits -= 5;
-      //---//
-      state.ndist = (hold & 0x1f)/*BITS(5)*/ + 1;
-      //--- DROPBITS(5) ---//
-      hold >>>= 5;
-      bits -= 5;
-      //---//
-      state.ncode = (hold & 0x0f)/*BITS(4)*/ + 4;
-      //--- DROPBITS(4) ---//
-      hold >>>= 4;
-      bits -= 4;
-      //---//
-//#ifndef PKZIP_BUG_WORKAROUND
-      if (state.nlen > 286 || state.ndist > 30) {
-        strm.msg = 'too many length or distance symbols';
-        state.mode = BAD;
-        break;
-      }
-//#endif
-      //Tracev((stderr, "inflate:       table sizes ok\n"));
-      state.have = 0;
-      state.mode = LENLENS;
-      /* falls through */
-    case LENLENS:
-      while (state.have < state.ncode) {
-        //=== NEEDBITS(3);
-        while (bits < 3) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        state.lens[order[state.have++]] = (hold & 0x07);//BITS(3);
-        //--- DROPBITS(3) ---//
-        hold >>>= 3;
-        bits -= 3;
-        //---//
-      }
-      while (state.have < 19) {
-        state.lens[order[state.have++]] = 0;
-      }
-      // We have separate tables & no pointers. 2 commented lines below not needed.
-      //state.next = state.codes;
-      //state.lencode = state.next;
-      // Switch to use dynamic table
-      state.lencode = state.lendyn;
-      state.lenbits = 7;
-
-      opts = {bits: state.lenbits};
-      ret = inflate_table(CODES, state.lens, 0, 19, state.lencode, 0, state.work, opts);
-      state.lenbits = opts.bits;
-
-      if (ret) {
-        strm.msg = 'invalid code lengths set';
-        state.mode = BAD;
-        break;
-      }
-      //Tracev((stderr, "inflate:       code lengths ok\n"));
-      state.have = 0;
-      state.mode = CODELENS;
-      /* falls through */
-    case CODELENS:
-      while (state.have < state.nlen + state.ndist) {
-        for (;;) {
-          here = state.lencode[hold & ((1 << state.lenbits) - 1)];/*BITS(state.lenbits)*/
-          here_bits = here >>> 24;
-          here_op = (here >>> 16) & 0xff;
-          here_val = here & 0xffff;
-
-          if ((here_bits) <= bits) { break; }
-          //--- PULLBYTE() ---//
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-          //---//
-        }
-        if (here_val < 16) {
-          //--- DROPBITS(here.bits) ---//
-          hold >>>= here_bits;
-          bits -= here_bits;
-          //---//
-          state.lens[state.have++] = here_val;
-        }
-        else {
-          if (here_val === 16) {
-            //=== NEEDBITS(here.bits + 2);
-            n = here_bits + 2;
-            while (bits < n) {
-              if (have === 0) { break inf_leave; }
-              have--;
-              hold += input[next++] << bits;
-              bits += 8;
-            }
-            //===//
-            //--- DROPBITS(here.bits) ---//
-            hold >>>= here_bits;
-            bits -= here_bits;
-            //---//
-            if (state.have === 0) {
-              strm.msg = 'invalid bit length repeat';
-              state.mode = BAD;
-              break;
-            }
-            len = state.lens[state.have - 1];
-            copy = 3 + (hold & 0x03);//BITS(2);
-            //--- DROPBITS(2) ---//
-            hold >>>= 2;
-            bits -= 2;
-            //---//
-          }
-          else if (here_val === 17) {
-            //=== NEEDBITS(here.bits + 3);
-            n = here_bits + 3;
-            while (bits < n) {
-              if (have === 0) { break inf_leave; }
-              have--;
-              hold += input[next++] << bits;
-              bits += 8;
-            }
-            //===//
-            //--- DROPBITS(here.bits) ---//
-            hold >>>= here_bits;
-            bits -= here_bits;
-            //---//
-            len = 0;
-            copy = 3 + (hold & 0x07);//BITS(3);
-            //--- DROPBITS(3) ---//
-            hold >>>= 3;
-            bits -= 3;
-            //---//
-          }
-          else {
-            //=== NEEDBITS(here.bits + 7);
-            n = here_bits + 7;
-            while (bits < n) {
-              if (have === 0) { break inf_leave; }
-              have--;
-              hold += input[next++] << bits;
-              bits += 8;
-            }
-            //===//
-            //--- DROPBITS(here.bits) ---//
-            hold >>>= here_bits;
-            bits -= here_bits;
-            //---//
-            len = 0;
-            copy = 11 + (hold & 0x7f);//BITS(7);
-            //--- DROPBITS(7) ---//
-            hold >>>= 7;
-            bits -= 7;
-            //---//
-          }
-          if (state.have + copy > state.nlen + state.ndist) {
-            strm.msg = 'invalid bit length repeat';
-            state.mode = BAD;
-            break;
-          }
-          while (copy--) {
-            state.lens[state.have++] = len;
-          }
-        }
-      }
-
-      /* handle error breaks in while */
-      if (state.mode === BAD) { break; }
-
-      /* check for end-of-block code (better have one) */
-      if (state.lens[256] === 0) {
-        strm.msg = 'invalid code -- missing end-of-block';
-        state.mode = BAD;
-        break;
-      }
-
-      /* build code tables -- note: do not change the lenbits or distbits
-         values here (9 and 6) without reading the comments in inftrees.h
-         concerning the ENOUGH constants, which depend on those values */
-      state.lenbits = 9;
-
-      opts = {bits: state.lenbits};
-      ret = inflate_table(LENS, state.lens, 0, state.nlen, state.lencode, 0, state.work, opts);
-      // We have separate tables & no pointers. 2 commented lines below not needed.
-      // state.next_index = opts.table_index;
-      state.lenbits = opts.bits;
-      // state.lencode = state.next;
-
-      if (ret) {
-        strm.msg = 'invalid literal/lengths set';
-        state.mode = BAD;
-        break;
-      }
-
-      state.distbits = 6;
-      //state.distcode.copy(state.codes);
-      // Switch to use dynamic table
-      state.distcode = state.distdyn;
-      opts = {bits: state.distbits};
-      ret = inflate_table(DISTS, state.lens, state.nlen, state.ndist, state.distcode, 0, state.work, opts);
-      // We have separate tables & no pointers. 2 commented lines below not needed.
-      // state.next_index = opts.table_index;
-      state.distbits = opts.bits;
-      // state.distcode = state.next;
-
-      if (ret) {
-        strm.msg = 'invalid distances set';
-        state.mode = BAD;
-        break;
-      }
-      //Tracev((stderr, 'inflate:       codes ok\n'));
-      state.mode = LEN_;
-      if (flush === Z_TREES) { break inf_leave; }
-      /* falls through */
-    case LEN_:
-      state.mode = LEN;
-      /* falls through */
-    case LEN:
-      if (have >= 6 && left >= 258) {
-        //--- RESTORE() ---
-        strm.next_out = put;
-        strm.avail_out = left;
-        strm.next_in = next;
-        strm.avail_in = have;
-        state.hold = hold;
-        state.bits = bits;
-        //---
-        inflate_fast(strm, _out);
-        //--- LOAD() ---
-        put = strm.next_out;
-        output = strm.output;
-        left = strm.avail_out;
-        next = strm.next_in;
-        input = strm.input;
-        have = strm.avail_in;
-        hold = state.hold;
-        bits = state.bits;
-        //---
-
-        if (state.mode === TYPE) {
-          state.back = -1;
-        }
-        break;
-      }
-      state.back = 0;
-      for (;;) {
-        here = state.lencode[hold & ((1 << state.lenbits) -1)];  /*BITS(state.lenbits)*/
-        here_bits = here >>> 24;
-        here_op = (here >>> 16) & 0xff;
-        here_val = here & 0xffff;
-
-        if (here_bits <= bits) { break; }
-        //--- PULLBYTE() ---//
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-        //---//
-      }
-      if (here_op && (here_op & 0xf0) === 0) {
-        last_bits = here_bits;
-        last_op = here_op;
-        last_val = here_val;
-        for (;;) {
-          here = state.lencode[last_val +
-                  ((hold & ((1 << (last_bits + last_op)) -1))/*BITS(last.bits + last.op)*/ >> last_bits)];
-          here_bits = here >>> 24;
-          here_op = (here >>> 16) & 0xff;
-          here_val = here & 0xffff;
-
-          if ((last_bits + here_bits) <= bits) { break; }
-          //--- PULLBYTE() ---//
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-          //---//
-        }
-        //--- DROPBITS(last.bits) ---//
-        hold >>>= last_bits;
-        bits -= last_bits;
-        //---//
-        state.back += last_bits;
-      }
-      //--- DROPBITS(here.bits) ---//
-      hold >>>= here_bits;
-      bits -= here_bits;
-      //---//
-      state.back += here_bits;
-      state.length = here_val;
-      if (here_op === 0) {
-        //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-        //        "inflate:         literal '%c'\n" :
-        //        "inflate:         literal 0x%02x\n", here.val));
-        state.mode = LIT;
-        break;
-      }
-      if (here_op & 32) {
-        //Tracevv((stderr, "inflate:         end of block\n"));
-        state.back = -1;
-        state.mode = TYPE;
-        break;
-      }
-      if (here_op & 64) {
-        strm.msg = 'invalid literal/length code';
-        state.mode = BAD;
-        break;
-      }
-      state.extra = here_op & 15;
-      state.mode = LENEXT;
-      /* falls through */
-    case LENEXT:
-      if (state.extra) {
-        //=== NEEDBITS(state.extra);
-        n = state.extra;
-        while (bits < n) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        state.length += hold & ((1 << state.extra) -1)/*BITS(state.extra)*/;
-        //--- DROPBITS(state.extra) ---//
-        hold >>>= state.extra;
-        bits -= state.extra;
-        //---//
-        state.back += state.extra;
-      }
-      //Tracevv((stderr, "inflate:         length %u\n", state.length));
-      state.was = state.length;
-      state.mode = DIST;
-      /* falls through */
-    case DIST:
-      for (;;) {
-        here = state.distcode[hold & ((1 << state.distbits) -1)];/*BITS(state.distbits)*/
-        here_bits = here >>> 24;
-        here_op = (here >>> 16) & 0xff;
-        here_val = here & 0xffff;
-
-        if ((here_bits) <= bits) { break; }
-        //--- PULLBYTE() ---//
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-        //---//
-      }
-      if ((here_op & 0xf0) === 0) {
-        last_bits = here_bits;
-        last_op = here_op;
-        last_val = here_val;
-        for (;;) {
-          here = state.distcode[last_val +
-                  ((hold & ((1 << (last_bits + last_op)) -1))/*BITS(last.bits + last.op)*/ >> last_bits)];
-          here_bits = here >>> 24;
-          here_op = (here >>> 16) & 0xff;
-          here_val = here & 0xffff;
-
-          if ((last_bits + here_bits) <= bits) { break; }
-          //--- PULLBYTE() ---//
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-          //---//
-        }
-        //--- DROPBITS(last.bits) ---//
-        hold >>>= last_bits;
-        bits -= last_bits;
-        //---//
-        state.back += last_bits;
-      }
-      //--- DROPBITS(here.bits) ---//
-      hold >>>= here_bits;
-      bits -= here_bits;
-      //---//
-      state.back += here_bits;
-      if (here_op & 64) {
-        strm.msg = 'invalid distance code';
-        state.mode = BAD;
-        break;
-      }
-      state.offset = here_val;
-      state.extra = (here_op) & 15;
-      state.mode = DISTEXT;
-      /* falls through */
-    case DISTEXT:
-      if (state.extra) {
-        //=== NEEDBITS(state.extra);
-        n = state.extra;
-        while (bits < n) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        state.offset += hold & ((1 << state.extra) -1)/*BITS(state.extra)*/;
-        //--- DROPBITS(state.extra) ---//
-        hold >>>= state.extra;
-        bits -= state.extra;
-        //---//
-        state.back += state.extra;
-      }
-//#ifdef INFLATE_STRICT
-      if (state.offset > state.dmax) {
-        strm.msg = 'invalid distance too far back';
-        state.mode = BAD;
-        break;
-      }
-//#endif
-      //Tracevv((stderr, "inflate:         distance %u\n", state.offset));
-      state.mode = MATCH;
-      /* falls through */
-    case MATCH:
-      if (left === 0) { break inf_leave; }
-      copy = _out - left;
-      if (state.offset > copy) {         /* copy from window */
-        copy = state.offset - copy;
-        if (copy > state.whave) {
-          if (state.sane) {
-            strm.msg = 'invalid distance too far back';
-            state.mode = BAD;
-            break;
-          }
-// (!) This block is disabled in zlib defailts,
-// don't enable it for binary compatibility
-//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-//          Trace((stderr, "inflate.c too far\n"));
-//          copy -= state.whave;
-//          if (copy > state.length) { copy = state.length; }
-//          if (copy > left) { copy = left; }
-//          left -= copy;
-//          state.length -= copy;
-//          do {
-//            output[put++] = 0;
-//          } while (--copy);
-//          if (state.length === 0) { state.mode = LEN; }
-//          break;
-//#endif
-        }
-        if (copy > state.wnext) {
-          copy -= state.wnext;
-          from = state.wsize - copy;
-        }
-        else {
-          from = state.wnext - copy;
-        }
-        if (copy > state.length) { copy = state.length; }
-        from_source = state.window;
-      }
-      else {                              /* copy from output */
-        from_source = output;
-        from = put - state.offset;
-        copy = state.length;
-      }
-      if (copy > left) { copy = left; }
-      left -= copy;
-      state.length -= copy;
-      do {
-        output[put++] = from_source[from++];
-      } while (--copy);
-      if (state.length === 0) { state.mode = LEN; }
-      break;
-    case LIT:
-      if (left === 0) { break inf_leave; }
-      output[put++] = state.length;
-      left--;
-      state.mode = LEN;
-      break;
-    case CHECK:
-      if (state.wrap) {
-        //=== NEEDBITS(32);
-        while (bits < 32) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          // Use '|' insdead of '+' to make sure that result is signed
-          hold |= input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        _out -= left;
-        strm.total_out += _out;
-        state.total += _out;
-        if (_out) {
-          strm.adler = state.check =
-              /*UPDATE(state.check, put - _out, _out);*/
-              (state.flags ? crc32(state.check, output, _out, put - _out) : adler32(state.check, output, _out, put - _out));
-
-        }
-        _out = left;
-        // NB: crc32 stored as signed 32-bit int, ZSWAP32 returns signed too
-        if ((state.flags ? hold : ZSWAP32(hold)) !== state.check) {
-          strm.msg = 'incorrect data check';
-          state.mode = BAD;
-          break;
-        }
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-        //Tracev((stderr, "inflate:   check matches trailer\n"));
-      }
-      state.mode = LENGTH;
-      /* falls through */
-    case LENGTH:
-      if (state.wrap && state.flags) {
-        //=== NEEDBITS(32);
-        while (bits < 32) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        if (hold !== (state.total & 0xffffffff)) {
-          strm.msg = 'incorrect length check';
-          state.mode = BAD;
-          break;
-        }
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-        //Tracev((stderr, "inflate:   length matches trailer\n"));
-      }
-      state.mode = DONE;
-      /* falls through */
-    case DONE:
-      ret = Z_STREAM_END;
-      break inf_leave;
-    case BAD:
-      ret = Z_DATA_ERROR;
-      break inf_leave;
-    case MEM:
-      return Z_MEM_ERROR;
-    case SYNC:
-      /* falls through */
-    default:
-      return Z_STREAM_ERROR;
-    }
-  }
-
-  // inf_leave <- here is real place for "goto inf_leave", emulated via "break inf_leave"
-
-  /*
-     Return from inflate(), updating the total counts and the check value.
-     If there was no progress during the inflate() call, return a buffer
-     error.  Call updatewindow() to create and/or update the window state.
-     Note: a memory error from inflate() is non-recoverable.
-   */
-
-  //--- RESTORE() ---
-  strm.next_out = put;
-  strm.avail_out = left;
-  strm.next_in = next;
-  strm.avail_in = have;
-  state.hold = hold;
-  state.bits = bits;
-  //---
-
-  if (state.wsize || (_out !== strm.avail_out && state.mode < BAD &&
-                      (state.mode < CHECK || flush !== Z_FINISH))) {
-    if (updatewindow(strm, strm.output, strm.next_out, _out - strm.avail_out)) {
-      state.mode = MEM;
-      return Z_MEM_ERROR;
-    }
-  }
-  _in -= strm.avail_in;
-  _out -= strm.avail_out;
-  strm.total_in += _in;
-  strm.total_out += _out;
-  state.total += _out;
-  if (state.wrap && _out) {
-    strm.adler = state.check = /*UPDATE(state.check, strm.next_out - _out, _out);*/
-      (state.flags ? crc32(state.check, output, _out, strm.next_out - _out) : adler32(state.check, output, _out, strm.next_out - _out));
-  }
-  strm.data_type = state.bits + (state.last ? 64 : 0) +
-                    (state.mode === TYPE ? 128 : 0) +
-                    (state.mode === LEN_ || state.mode === COPY_ ? 256 : 0);
-  if (((_in === 0 && _out === 0) || flush === Z_FINISH) && ret === Z_OK) {
-    ret = Z_BUF_ERROR;
-  }
-  return ret;
-}
-
-function inflateEnd(strm) {
-
-  if (!strm || !strm.state /*|| strm->zfree == (free_func)0*/) {
-    return Z_STREAM_ERROR;
-  }
-
-  var state = strm.state;
-  if (state.window) {
-    state.window = null;
-  }
-  strm.state = null;
-  return Z_OK;
-}
-
-function inflateGetHeader(strm, head) {
-  var state;
-
-  /* check state */
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  state = strm.state;
-  if ((state.wrap & 2) === 0) { return Z_STREAM_ERROR; }
-
-  /* save header structure */
-  state.head = head;
-  head.done = false;
-  return Z_OK;
-}
-
-
-exports.inflateReset = inflateReset;
-exports.inflateReset2 = inflateReset2;
-exports.inflateResetKeep = inflateResetKeep;
-exports.inflateInit = inflateInit;
-exports.inflateInit2 = inflateInit2;
-exports.inflate = inflate;
-exports.inflateEnd = inflateEnd;
-exports.inflateGetHeader = inflateGetHeader;
-exports.inflateInfo = 'pako inflate (from Nodeca project)';
-
-/* Not implemented
-exports.inflateCopy = inflateCopy;
-exports.inflateGetDictionary = inflateGetDictionary;
-exports.inflateMark = inflateMark;
-exports.inflatePrime = inflatePrime;
-exports.inflateSetDictionary = inflateSetDictionary;
-exports.inflateSync = inflateSync;
-exports.inflateSyncPoint = inflateSyncPoint;
-exports.inflateUndermine = inflateUndermine;
-*/
-},{"../utils/common":27,"./adler32":29,"./crc32":31,"./inffast":34,"./inftrees":36}],36:[function(_dereq_,module,exports){
-'use strict';
-
-
-var utils = _dereq_('../utils/common');
-
-var MAXBITS = 15;
-var ENOUGH_LENS = 852;
-var ENOUGH_DISTS = 592;
-//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS);
-
-var CODES = 0;
-var LENS = 1;
-var DISTS = 2;
-
-var lbase = [ /* Length codes 257..285 base */
-  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
-];
-
-var lext = [ /* Length codes 257..285 extra */
-  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
-];
-
-var dbase = [ /* Distance codes 0..29 base */
-  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
-];
-
-var dext = [ /* Distance codes 0..29 extra */
-  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
-];
-
-module.exports = function inflate_table(type, lens, lens_index, codes, table, table_index, work, opts)
-{
-  var bits = opts.bits;
-      //here = opts.here; /* table entry for duplication */
-
-  var len = 0;               /* a code's length in bits */
-  var sym = 0;               /* index of code symbols */
-  var min = 0, max = 0;          /* minimum and maximum code lengths */
-  var root = 0;              /* number of index bits for root table */
-  var curr = 0;              /* number of index bits for current table */
-  var drop = 0;              /* code bits to drop for sub-table */
-  var left = 0;                   /* number of prefix codes available */
-  var used = 0;              /* code entries in table used */
-  var huff = 0;              /* Huffman code */
-  var incr;              /* for incrementing code, index */
-  var fill;              /* index for replicating entries */
-  var low;               /* low bits for current root entry */
-  var mask;              /* mask for low root bits */
-  var next;             /* next available space in table */
-  var base = null;     /* base value table to use */
-  var base_index = 0;
-//  var shoextra;    /* extra bits table to use */
-  var end;                    /* use base and extra for symbol > end */
-  var count = new utils.Buf16(MAXBITS+1); //[MAXBITS+1];    /* number of codes of each length */
-  var offs = new utils.Buf16(MAXBITS+1); //[MAXBITS+1];     /* offsets in table for each length */
-  var extra = null;
-  var extra_index = 0;
-
-  var here_bits, here_op, here_val;
-
-  /*
-   Process a set of code lengths to create a canonical Huffman code.  The
-   code lengths are lens[0..codes-1].  Each length corresponds to the
-   symbols 0..codes-1.  The Huffman code is generated by first sorting the
-   symbols by length from short to long, and retaining the symbol order
-   for codes with equal lengths.  Then the code starts with all zero bits
-   for the first code of the shortest length, and the codes are integer
-   increments for the same length, and zeros are appended as the length
-   increases.  For the deflate format, these bits are stored backwards
-   from their more natural integer increment ordering, and so when the
-   decoding tables are built in the large loop below, the integer codes
-   are incremented backwards.
-
-   This routine assumes, but does not check, that all of the entries in
-   lens[] are in the range 0..MAXBITS.  The caller must assure this.
-   1..MAXBITS is interpreted as that code length.  zero means that that
-   symbol does not occur in this code.
-
-   The codes are sorted by computing a count of codes for each length,
-   creating from that a table of starting indices for each length in the
-   sorted table, and then entering the symbols in order in the sorted
-   table.  The sorted table is work[], with that space being provided by
-   the caller.
-
-   The length counts are used for other purposes as well, i.e. finding
-   the minimum and maximum length codes, determining if there are any
-   codes at all, checking for a valid set of lengths, and looking ahead
-   at length counts to determine sub-table sizes when building the
-   decoding tables.
-   */
-
-  /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-  for (len = 0; len <= MAXBITS; len++) {
-    count[len] = 0;
-  }
-  for (sym = 0; sym < codes; sym++) {
-    count[lens[lens_index + sym]]++;
-  }
-
-  /* bound code lengths, force root to be within code lengths */
-  root = bits;
-  for (max = MAXBITS; max >= 1; max--) {
-    if (count[max] !== 0) { break; }
-  }
-  if (root > max) {
-    root = max;
-  }
-  if (max === 0) {                     /* no symbols to code at all */
-    //table.op[opts.table_index] = 64;  //here.op = (var char)64;    /* invalid code marker */
-    //table.bits[opts.table_index] = 1;   //here.bits = (var char)1;
-    //table.val[opts.table_index++] = 0;   //here.val = (var short)0;
-    table[table_index++] = (1 << 24) | (64 << 16) | 0;
-
-
-    //table.op[opts.table_index] = 64;
-    //table.bits[opts.table_index] = 1;
-    //table.val[opts.table_index++] = 0;
-    table[table_index++] = (1 << 24) | (64 << 16) | 0;
-
-    opts.bits = 1;
-    return 0;     /* no symbols, but wait for decoding to report error */
-  }
-  for (min = 1; min < max; min++) {
-    if (count[min] !== 0) { break; }
-  }
-  if (root < min) {
-    root = min;
-  }
-
-  /* check for an over-subscribed or incomplete set of lengths */
-  left = 1;
-  for (len = 1; len <= MAXBITS; len++) {
-    left <<= 1;
-    left -= count[len];
-    if (left < 0) {
-      return -1;
-    }        /* over-subscribed */
-  }
-  if (left > 0 && (type === CODES || max !== 1)) {
-    return -1;                      /* incomplete set */
-  }
-
-  /* generate offsets into symbol table for each length for sorting */
-  offs[1] = 0;
-  for (len = 1; len < MAXBITS; len++) {
-    offs[len + 1] = offs[len] + count[len];
-  }
-
-  /* sort symbols by length, by symbol order within each length */
-  for (sym = 0; sym < codes; sym++) {
-    if (lens[lens_index + sym] !== 0) {
-      work[offs[lens[lens_index + sym]]++] = sym;
-    }
-  }
-
-  /*
-   Create and fill in decoding tables.  In this loop, the table being
-   filled is at next and has curr index bits.  The code being used is huff
-   with length len.  That code is converted to an index by dropping drop
-   bits off of the bottom.  For codes where len is less than drop + curr,
-   those top drop + curr - len bits are incremented through all values to
-   fill the table with replicated entries.
-
-   root is the number of index bits for the root table.  When len exceeds
-   root, sub-tables are created pointed to by the root entry with an index
-   of the low root bits of huff.  This is saved in low to check for when a
-   new sub-table should be started.  drop is zero when the root table is
-   being filled, and drop is root when sub-tables are being filled.
-
-   When a new sub-table is needed, it is necessary to look ahead in the
-   code lengths to determine what size sub-table is needed.  The length
-   counts are used for this, and so count[] is decremented as codes are
-   entered in the tables.
-
-   used keeps track of how many table entries have been allocated from the
-   provided *table space.  It is checked for LENS and DIST tables against
-   the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-   the initial root table size constants.  See the comments in inftrees.h
-   for more information.
-
-   sym increments through all symbols, and the loop terminates when
-   all codes of length max, i.e. all codes, have been processed.  This
-   routine permits incomplete codes, so another loop after this one fills
-   in the rest of the decoding tables with invalid code markers.
-   */
-
-  /* set up for code type */
-  // poor man optimization - use if-else instead of switch,
-  // to avoid deopts in old v8
-  if (type === CODES) {
-      base = extra = work;    /* dummy value--not used */
-      end = 19;
-  } else if (type === LENS) {
-      base = lbase;
-      base_index -= 257;
-      extra = lext;
-      extra_index -= 257;
-      end = 256;
-  } else {                    /* DISTS */
-      base = dbase;
-      extra = dext;
-      end = -1;
-  }
-
-  /* initialize opts for loop */
-  huff = 0;                   /* starting code */
-  sym = 0;                    /* starting code symbol */
-  len = min;                  /* starting code length */
-  next = table_index;              /* current table to fill in */
-  curr = root;                /* current table index bits */
-  drop = 0;                   /* current bits to drop from code for index */
-  low = -1;                   /* trigger new sub-table when len > root */
-  used = 1 << root;          /* use root table entries */
-  mask = used - 1;            /* mask for comparing low */
-
-  /* check available table space */
-  if ((type === LENS && used > ENOUGH_LENS) ||
-    (type === DISTS && used > ENOUGH_DISTS)) {
-    return 1;
-  }
-
-  var i=0;
-  /* process all codes and make table entries */
-  for (;;) {
-    i++;
-    /* create table entry */
-    here_bits = len - drop;
-    if (work[sym] < end) {
-      here_op = 0;
-      here_val = work[sym];
-    }
-    else if (work[sym] > end) {
-      here_op = extra[extra_index + work[sym]];
-      here_val = base[base_index + work[sym]];
-    }
-    else {
-      here_op = 32 + 64;         /* end of block */
-      here_val = 0;
-    }
-
-    /* replicate for those indices with low len bits equal to huff */
-    incr = 1 << (len - drop);
-    fill = 1 << curr;
-    min = fill;                 /* save offset to next table */
-    do {
-      fill -= incr;
-      table[next + (huff >> drop) + fill] = (here_bits << 24) | (here_op << 16) | here_val |0;
-    } while (fill !== 0);
-
-    /* backwards increment the len-bit code huff */
-    incr = 1 << (len - 1);
-    while (huff & incr) {
-      incr >>= 1;
-    }
-    if (incr !== 0) {
-      huff &= incr - 1;
-      huff += incr;
-    } else {
-      huff = 0;
-    }
-
-    /* go to next symbol, update count, len */
-    sym++;
-    if (--count[len] === 0) {
-      if (len === max) { break; }
-      len = lens[lens_index + work[sym]];
-    }
-
-    /* create new sub-table if needed */
-    if (len > root && (huff & mask) !== low) {
-      /* if first time, transition to sub-tables */
-      if (drop === 0) {
-        drop = root;
-      }
-
-      /* increment past last table */
-      next += min;            /* here min is 1 << curr */
-
-      /* determine length of next table */
-      curr = len - drop;
-      left = 1 << curr;
-      while (curr + drop < max) {
-        left -= count[curr + drop];
-        if (left <= 0) { break; }
-        curr++;
-        left <<= 1;
-      }
-
-      /* check for enough space */
-      used += 1 << curr;
-      if ((type === LENS && used > ENOUGH_LENS) ||
-        (type === DISTS && used > ENOUGH_DISTS)) {
-        return 1;
-      }
-
-      /* point entry in root table to sub-table */
-      low = huff & mask;
-      /*table.op[low] = curr;
-      table.bits[low] = root;
-      table.val[low] = next - opts.table_index;*/
-      table[low] = (root << 24) | (curr << 16) | (next - table_index) |0;
-    }
-  }
-
-  /* fill in remaining table entry if code is incomplete (guaranteed to have
-   at most one remaining entry, since if the code is incomplete, the
-   maximum code length that was allowed to get this far is one bit) */
-  if (huff !== 0) {
-    //table.op[next + huff] = 64;            /* invalid code marker */
-    //table.bits[next + huff] = len - drop;
-    //table.val[next + huff] = 0;
-    table[next + huff] = ((len - drop) << 24) | (64 << 16) |0;
-  }
-
-  /* set return parameters */
-  //opts.table_index += used;
-  opts.bits = root;
-  return 0;
-};
-
-},{"../utils/common":27}],37:[function(_dereq_,module,exports){
-'use strict';
-
-module.exports = {
-  '2':    'need dictionary',     /* Z_NEED_DICT       2  */
-  '1':    'stream end',          /* Z_STREAM_END      1  */
-  '0':    '',                    /* Z_OK              0  */
-  '-1':   'file error',          /* Z_ERRNO         (-1) */
-  '-2':   'stream error',        /* Z_STREAM_ERROR  (-2) */
-  '-3':   'data error',          /* Z_DATA_ERROR    (-3) */
-  '-4':   'insufficient memory', /* Z_MEM_ERROR     (-4) */
-  '-5':   'buffer error',        /* Z_BUF_ERROR     (-5) */
-  '-6':   'incompatible version' /* Z_VERSION_ERROR (-6) */
-};
-},{}],38:[function(_dereq_,module,exports){
-'use strict';
-
-
-var utils = _dereq_('../utils/common');
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-
-//var Z_FILTERED          = 1;
-//var Z_HUFFMAN_ONLY      = 2;
-//var Z_RLE               = 3;
-var Z_FIXED               = 4;
-//var Z_DEFAULT_STRATEGY  = 0;
-
-/* Possible values of the data_type field (though see inflate()) */
-var Z_BINARY              = 0;
-var Z_TEXT                = 1;
-//var Z_ASCII             = 1; // = Z_TEXT
-var Z_UNKNOWN             = 2;
-
-/*============================================================================*/
-
-
-function zero(buf) { var len = buf.length; while (--len >= 0) { buf[len] = 0; } }
-
-// From zutil.h
-
-var STORED_BLOCK = 0;
-var STATIC_TREES = 1;
-var DYN_TREES    = 2;
-/* The three kinds of block type */
-
-var MIN_MATCH    = 3;
-var MAX_MATCH    = 258;
-/* The minimum and maximum match lengths */
-
-// From deflate.h
-/* ===========================================================================
- * Internal compression state.
- */
-
-var LENGTH_CODES  = 29;
-/* number of length codes, not counting the special END_BLOCK code */
-
-var LITERALS      = 256;
-/* number of literal bytes 0..255 */
-
-var L_CODES       = LITERALS + 1 + LENGTH_CODES;
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-var D_CODES       = 30;
-/* number of distance codes */
-
-var BL_CODES      = 19;
-/* number of codes used to transfer the bit lengths */
-
-var HEAP_SIZE     = 2*L_CODES + 1;
-/* maximum heap size */
-
-var MAX_BITS      = 15;
-/* All codes must not exceed MAX_BITS bits */
-
-var Buf_size      = 16;
-/* size of bit buffer in bi_buf */
-
-
-/* ===========================================================================
- * Constants
- */
-
-var MAX_BL_BITS = 7;
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-var END_BLOCK   = 256;
-/* end of block literal code */
-
-var REP_3_6     = 16;
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-var REPZ_3_10   = 17;
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-var REPZ_11_138 = 18;
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-var extra_lbits =   /* extra bits for each length code */
-  [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];
-
-var extra_dbits =   /* extra bits for each distance code */
-  [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];
-
-var extra_blbits =  /* extra bits for each bit length code */
-  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7];
-
-var bl_order =
-  [16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-// We pre-fill arrays with 0 to avoid uninitialized gaps
-
-var DIST_CODE_LEN = 512; /* see definition of array dist_code below */
-
-// !!!! Use flat array insdead of structure, Freq = i*2, Len = i*2+1
-var static_ltree  = new Array((L_CODES+2) * 2);
-zero(static_ltree);
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-var static_dtree  = new Array(D_CODES * 2);
-zero(static_dtree);
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-var _dist_code    = new Array(DIST_CODE_LEN);
-zero(_dist_code);
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-var _length_code  = new Array(MAX_MATCH-MIN_MATCH+1);
-zero(_length_code);
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-var base_length   = new Array(LENGTH_CODES);
-zero(base_length);
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-var base_dist     = new Array(D_CODES);
-zero(base_dist);
-/* First normalized distance for each code (0 = distance of 1) */
-
-
-var StaticTreeDesc = function (static_tree, extra_bits, extra_base, elems, max_length) {
-
-  this.static_tree  = static_tree;  /* static tree or NULL */
-  this.extra_bits   = extra_bits;   /* extra bits for each code or NULL */
-  this.extra_base   = extra_base;   /* base index for extra_bits */
-  this.elems        = elems;        /* max number of elements in the tree */
-  this.max_length   = max_length;   /* max bit length for the codes */
-
-  // show if `static_tree` has data or dummy - needed for monomorphic objects
-  this.has_stree    = static_tree && static_tree.length;
-};
-
-
-var static_l_desc;
-var static_d_desc;
-var static_bl_desc;
-
-
-var TreeDesc = function(dyn_tree, stat_desc) {
-  this.dyn_tree = dyn_tree;     /* the dynamic tree */
-  this.max_code = 0;            /* largest code with non zero frequency */
-  this.stat_desc = stat_desc;   /* the corresponding static tree */
-};
-
-
-
-function d_code(dist) {
-  return dist < 256 ? _dist_code[dist] : _dist_code[256 + (dist >>> 7)];
-}
-
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-function put_short (s, w) {
-//    put_byte(s, (uch)((w) & 0xff));
-//    put_byte(s, (uch)((ush)(w) >> 8));
-  s.pending_buf[s.pending++] = (w) & 0xff;
-  s.pending_buf[s.pending++] = (w >>> 8) & 0xff;
-}
-
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-function send_bits(s, value, length) {
-  if (s.bi_valid > (Buf_size - length)) {
-    s.bi_buf |= (value << s.bi_valid) & 0xffff;
-    put_short(s, s.bi_buf);
-    s.bi_buf = value >> (Buf_size - s.bi_valid);
-    s.bi_valid += length - Buf_size;
-  } else {
-    s.bi_buf |= (value << s.bi_valid) & 0xffff;
-    s.bi_valid += length;
-  }
-}
-
-
-function send_code(s, c, tree) {
-  send_bits(s, tree[c*2]/*.Code*/, tree[c*2 + 1]/*.Len*/);
-}
-
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-function bi_reverse(code, len) {
-  var res = 0;
-  do {
-    res |= code & 1;
-    code >>>= 1;
-    res <<= 1;
-  } while (--len > 0);
-  return res >>> 1;
-}
-
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-function bi_flush(s) {
-  if (s.bi_valid === 16) {
-    put_short(s, s.bi_buf);
-    s.bi_buf = 0;
-    s.bi_valid = 0;
-
-  } else if (s.bi_valid >= 8) {
-    s.pending_buf[s.pending++] = s.bi_buf & 0xff;
-    s.bi_buf >>= 8;
-    s.bi_valid -= 8;
-  }
-}
-
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-function gen_bitlen(s, desc)
-//    deflate_state *s;
-//    tree_desc *desc;    /* the tree descriptor */
-{
-  var tree            = desc.dyn_tree;
-  var max_code        = desc.max_code;
-  var stree           = desc.stat_desc.static_tree;
-  var has_stree       = desc.stat_desc.has_stree;
-  var extra           = desc.stat_desc.extra_bits;
-  var base            = desc.stat_desc.extra_base;
-  var max_length      = desc.stat_desc.max_length;
-  var h;              /* heap index */
-  var n, m;           /* iterate over the tree elements */
-  var bits;           /* bit length */
-  var xbits;          /* extra bits */
-  var f;              /* frequency */
-  var overflow = 0;   /* number of elements with bit length too large */
-
-  for (bits = 0; bits <= MAX_BITS; bits++) {
-    s.bl_count[bits] = 0;
-  }
-
-  /* In a first pass, compute the optimal bit lengths (which may
-   * overflow in the case of the bit length tree).
-   */
-  tree[s.heap[s.heap_max]*2 + 1]/*.Len*/ = 0; /* root of the heap */
-
-  for (h = s.heap_max+1; h < HEAP_SIZE; h++) {
-    n = s.heap[h];
-    bits = tree[tree[n*2 +1]/*.Dad*/ * 2 + 1]/*.Len*/ + 1;
-    if (bits > max_length) {
-      bits = max_length;
-      overflow++;
-    }
-    tree[n*2 + 1]/*.Len*/ = bits;
-    /* We overwrite tree[n].Dad which is no longer needed */
-
-    if (n > max_code) { continue; } /* not a leaf node */
-
-    s.bl_count[bits]++;
-    xbits = 0;
-    if (n >= base) {
-      xbits = extra[n-base];
-    }
-    f = tree[n * 2]/*.Freq*/;
-    s.opt_len += f * (bits + xbits);
-    if (has_stree) {
-      s.static_len += f * (stree[n*2 + 1]/*.Len*/ + xbits);
-    }
-  }
-  if (overflow === 0) { return; }
-
-  // Trace((stderr,"\nbit length overflow\n"));
-  /* This happens for example on obj2 and pic of the Calgary corpus */
-
-  /* Find the first bit length which could increase: */
-  do {
-    bits = max_length-1;
-    while (s.bl_count[bits] === 0) { bits--; }
-    s.bl_count[bits]--;      /* move one leaf down the tree */
-    s.bl_count[bits+1] += 2; /* move one overflow item as its brother */
-    s.bl_count[max_length]--;
-    /* The brother of the overflow item also moves one step up,
-     * but this does not affect bl_count[max_length]
-     */
-    overflow -= 2;
-  } while (overflow > 0);
-
-  /* Now recompute all bit lengths, scanning in increasing frequency.
-   * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-   * lengths instead of fixing only the wrong ones. This idea is taken
-   * from 'ar' written by Haruhiko Okumura.)
-   */
-  for (bits = max_length; bits !== 0; bits--) {
-    n = s.bl_count[bits];
-    while (n !== 0) {
-      m = s.heap[--h];
-      if (m > max_code) { continue; }
-      if (tree[m*2 + 1]/*.Len*/ !== bits) {
-        // Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-        s.opt_len += (bits - tree[m*2 + 1]/*.Len*/)*tree[m*2]/*.Freq*/;
-        tree[m*2 + 1]/*.Len*/ = bits;
-      }
-      n--;
-    }
-  }
-}
-
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-function gen_codes(tree, max_code, bl_count)
-//    ct_data *tree;             /* the tree to decorate */
-//    int max_code;              /* largest code with non zero frequency */
-//    ushf *bl_count;            /* number of codes at each bit length */
-{
-  var next_code = new Array(MAX_BITS+1); /* next code value for each bit length */
-  var code = 0;              /* running code value */
-  var bits;                  /* bit index */
-  var n;                     /* code index */
-
-  /* The distribution counts are first used to generate the code values
-   * without bit reversal.
-   */
-  for (bits = 1; bits <= MAX_BITS; bits++) {
-    next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-  }
-  /* Check that the bit counts in bl_count are consistent. The last code
-   * must be all ones.
-   */
-  //Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-  //        "inconsistent bit counts");
-  //Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-  for (n = 0;  n <= max_code; n++) {
-    var len = tree[n*2 + 1]/*.Len*/;
-    if (len === 0) { continue; }
-    /* Now reverse the bits */
-    tree[n*2]/*.Code*/ = bi_reverse(next_code[len]++, len);
-
-    //Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-    //     n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-  }
-}
-
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-function tr_static_init() {
-  var n;        /* iterates over tree elements */
-  var bits;     /* bit counter */
-  var length;   /* length value */
-  var code;     /* code value */
-  var dist;     /* distance index */
-  var bl_count = new Array(MAX_BITS+1);
-  /* number of codes at each bit length for an optimal tree */
-
-  // do check in _tr_init()
-  //if (static_init_done) return;
-
-  /* For some embedded targets, global variables are not initialized: */
-/*#ifdef NO_INIT_GLOBAL_POINTERS
-  static_l_desc.static_tree = static_ltree;
-  static_l_desc.extra_bits = extra_lbits;
-  static_d_desc.static_tree = static_dtree;
-  static_d_desc.extra_bits = extra_dbits;
-  static_bl_desc.extra_bits = extra_blbits;
-#endif*/
-
-  /* Initialize the mapping length (0..255) -> length code (0..28) */
-  length = 0;
-  for (code = 0; code < LENGTH_CODES-1; code++) {
-    base_length[code] = length;
-    for (n = 0; n < (1<<extra_lbits[code]); n++) {
-      _length_code[length++] = code;
-    }
-  }
-  //Assert (length == 256, "tr_static_init: length != 256");
-  /* Note that the length 255 (match length 258) can be represented
-   * in two different ways: code 284 + 5 bits or code 285, so we
-   * overwrite length_code[255] to use the best encoding:
-   */
-  _length_code[length-1] = code;
-
-  /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-  dist = 0;
-  for (code = 0 ; code < 16; code++) {
-    base_dist[code] = dist;
-    for (n = 0; n < (1<<extra_dbits[code]); n++) {
-      _dist_code[dist++] = code;
-    }
-  }
-  //Assert (dist == 256, "tr_static_init: dist != 256");
-  dist >>= 7; /* from now on, all distances are divided by 128 */
-  for ( ; code < D_CODES; code++) {
-    base_dist[code] = dist << 7;
-    for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-      _dist_code[256 + dist++] = code;
-    }
-  }
-  //Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-  /* Construct the codes of the static literal tree */
-  for (bits = 0; bits <= MAX_BITS; bits++) {
-    bl_count[bits] = 0;
-  }
-
-  n = 0;
-  while (n <= 143) {
-    static_ltree[n*2 + 1]/*.Len*/ = 8;
-    n++;
-    bl_count[8]++;
-  }
-  while (n <= 255) {
-    static_ltree[n*2 + 1]/*.Len*/ = 9;
-    n++;
-    bl_count[9]++;
-  }
-  while (n <= 279) {
-    static_ltree[n*2 + 1]/*.Len*/ = 7;
-    n++;
-    bl_count[7]++;
-  }
-  while (n <= 287) {
-    static_ltree[n*2 + 1]/*.Len*/ = 8;
-    n++;
-    bl_count[8]++;
-  }
-  /* Codes 286 and 287 do not exist, but we must include them in the
-   * tree construction to get a canonical Huffman tree (longest code
-   * all ones)
-   */
-  gen_codes(static_ltree, L_CODES+1, bl_count);
-
-  /* The static distance tree is trivial: */
-  for (n = 0; n < D_CODES; n++) {
-    static_dtree[n*2 + 1]/*.Len*/ = 5;
-    static_dtree[n*2]/*.Code*/ = bi_reverse(n, 5);
-  }
-
-  // Now data ready and we can init static trees
-  static_l_desc = new StaticTreeDesc(static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS);
-  static_d_desc = new StaticTreeDesc(static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS);
-  static_bl_desc =new StaticTreeDesc(new Array(0), extra_blbits, 0,         BL_CODES, MAX_BL_BITS);
-
-  //static_init_done = true;
-}
-
-
-/* ===========================================================================
- * Initialize a new block.
- */
-function init_block(s) {
-  var n; /* iterates over tree elements */
-
-  /* Initialize the trees. */
-  for (n = 0; n < L_CODES;  n++) { s.dyn_ltree[n*2]/*.Freq*/ = 0; }
-  for (n = 0; n < D_CODES;  n++) { s.dyn_dtree[n*2]/*.Freq*/ = 0; }
-  for (n = 0; n < BL_CODES; n++) { s.bl_tree[n*2]/*.Freq*/ = 0; }
-
-  s.dyn_ltree[END_BLOCK*2]/*.Freq*/ = 1;
-  s.opt_len = s.static_len = 0;
-  s.last_lit = s.matches = 0;
-}
-
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-function bi_windup(s)
-{
-  if (s.bi_valid > 8) {
-    put_short(s, s.bi_buf);
-  } else if (s.bi_valid > 0) {
-    //put_byte(s, (Byte)s->bi_buf);
-    s.pending_buf[s.pending++] = s.bi_buf;
-  }
-  s.bi_buf = 0;
-  s.bi_valid = 0;
-}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-function copy_block(s, buf, len, header)
-//DeflateState *s;
-//charf    *buf;    /* the input data */
-//unsigned len;     /* its length */
-//int      header;  /* true if block header must be written */
-{
-  bi_windup(s);        /* align on byte boundary */
-
-  if (header) {
-    put_short(s, len);
-    put_short(s, ~len);
-  }
-//  while (len--) {
-//    put_byte(s, *buf++);
-//  }
-  utils.arraySet(s.pending_buf, s.window, buf, len, s.pending);
-  s.pending += len;
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-function smaller(tree, n, m, depth) {
-  var _n2 = n*2;
-  var _m2 = m*2;
-  return (tree[_n2]/*.Freq*/ < tree[_m2]/*.Freq*/ ||
-         (tree[_n2]/*.Freq*/ === tree[_m2]/*.Freq*/ && depth[n] <= depth[m]));
-}
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-function pqdownheap(s, tree, k)
-//    deflate_state *s;
-//    ct_data *tree;  /* the tree to restore */
-//    int k;               /* node to move down */
-{
-  var v = s.heap[k];
-  var j = k << 1;  /* left son of k */
-  while (j <= s.heap_len) {
-    /* Set j to the smallest of the two sons: */
-    if (j < s.heap_len &&
-      smaller(tree, s.heap[j+1], s.heap[j], s.depth)) {
-      j++;
-    }
-    /* Exit if v is smaller than both sons */
-    if (smaller(tree, v, s.heap[j], s.depth)) { break; }
-
-    /* Exchange v with the smallest son */
-    s.heap[k] = s.heap[j];
-    k = j;
-
-    /* And continue down the tree, setting j to the left son of k */
-    j <<= 1;
-  }
-  s.heap[k] = v;
-}
-
-
-// inlined manually
-// var SMALLEST = 1;
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-function compress_block(s, ltree, dtree)
-//    deflate_state *s;
-//    const ct_data *ltree; /* literal tree */
-//    const ct_data *dtree; /* distance tree */
-{
-  var dist;           /* distance of matched string */
-  var lc;             /* match length or unmatched char (if dist == 0) */
-  var lx = 0;         /* running index in l_buf */
-  var code;           /* the code to send */
-  var extra;          /* number of extra bits to send */
-
-  if (s.last_lit !== 0) {
-    do {
-      dist = (s.pending_buf[s.d_buf + lx*2] << 8) | (s.pending_buf[s.d_buf + lx*2 + 1]);
-      lc = s.pending_buf[s.l_buf + lx];
-      lx++;
-
-      if (dist === 0) {
-        send_code(s, lc, ltree); /* send a literal byte */
-        //Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-      } else {
-        /* Here, lc is the match length - MIN_MATCH */
-        code = _length_code[lc];
-        send_code(s, code+LITERALS+1, ltree); /* send the length code */
-        extra = extra_lbits[code];
-        if (extra !== 0) {
-          lc -= base_length[code];
-          send_bits(s, lc, extra);       /* send the extra length bits */
-        }
-        dist--; /* dist is now the match distance - 1 */
-        code = d_code(dist);
-        //Assert (code < D_CODES, "bad d_code");
-
-        send_code(s, code, dtree);       /* send the distance code */
-        extra = extra_dbits[code];
-        if (extra !== 0) {
-          dist -= base_dist[code];
-          send_bits(s, dist, extra);   /* send the extra distance bits */
-        }
-      } /* literal or match pair ? */
-
-      /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-      //Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-      //       "pendingBuf overflow");
-
-    } while (lx < s.last_lit);
-  }
-
-  send_code(s, END_BLOCK, ltree);
-}
-
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-function build_tree(s, desc)
-//    deflate_state *s;
-//    tree_desc *desc; /* the tree descriptor */
-{
-  var tree     = desc.dyn_tree;
-  var stree    = desc.stat_desc.static_tree;
-  var has_stree = desc.stat_desc.has_stree;
-  var elems    = desc.stat_desc.elems;
-  var n, m;          /* iterate over heap elements */
-  var max_code = -1; /* largest code with non zero frequency */
-  var node;          /* new node being created */
-
-  /* Construct the initial heap, with least frequent element in
-   * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-   * heap[0] is not used.
-   */
-  s.heap_len = 0;
-  s.heap_max = HEAP_SIZE;
-
-  for (n = 0; n < elems; n++) {
-    if (tree[n * 2]/*.Freq*/ !== 0) {
-      s.heap[++s.heap_len] = max_code = n;
-      s.depth[n] = 0;
-
-    } else {
-      tree[n*2 + 1]/*.Len*/ = 0;
-    }
-  }
-
-  /* The pkzip format requires that at least one distance code exists,
-   * and that at least one bit should be sent even if there is only one
-   * possible code. So to avoid special checks later on we force at least
-   * two codes of non zero frequency.
-   */
-  while (s.heap_len < 2) {
-    node = s.heap[++s.heap_len] = (max_code < 2 ? ++max_code : 0);
-    tree[node * 2]/*.Freq*/ = 1;
-    s.depth[node] = 0;
-    s.opt_len--;
-
-    if (has_stree) {
-      s.static_len -= stree[node*2 + 1]/*.Len*/;
-    }
-    /* node is 0 or 1 so it does not have extra bits */
-  }
-  desc.max_code = max_code;
-
-  /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-   * establish sub-heaps of increasing lengths:
-   */
-  for (n = (s.heap_len >> 1/*int /2*/); n >= 1; n--) { pqdownheap(s, tree, n); }
-
-  /* Construct the Huffman tree by repeatedly combining the least two
-   * frequent nodes.
-   */
-  node = elems;              /* next internal node of the tree */
-  do {
-    //pqremove(s, tree, n);  /* n = node of least frequency */
-    /*** pqremove ***/
-    n = s.heap[1/*SMALLEST*/];
-    s.heap[1/*SMALLEST*/] = s.heap[s.heap_len--];
-    pqdownheap(s, tree, 1/*SMALLEST*/);
-    /***/
-
-    m = s.heap[1/*SMALLEST*/]; /* m = node of next least frequency */
-
-    s.heap[--s.heap_max] = n; /* keep the nodes sorted by frequency */
-    s.heap[--s.heap_max] = m;
-
-    /* Create a new node father of n and m */
-    tree[node * 2]/*.Freq*/ = tree[n * 2]/*.Freq*/ + tree[m * 2]/*.Freq*/;
-    s.depth[node] = (s.depth[n] >= s.depth[m] ? s.depth[n] : s.depth[m]) + 1;
-    tree[n*2 + 1]/*.Dad*/ = tree[m*2 + 1]/*.Dad*/ = node;
-
-    /* and insert the new node in the heap */
-    s.heap[1/*SMALLEST*/] = node++;
-    pqdownheap(s, tree, 1/*SMALLEST*/);
-
-  } while (s.heap_len >= 2);
-
-  s.heap[--s.heap_max] = s.heap[1/*SMALLEST*/];
-
-  /* At this point, the fields freq and dad are set. We can now
-   * generate the bit lengths.
-   */
-  gen_bitlen(s, desc);
-
-  /* The field len is now set, we can generate the bit codes */
-  gen_codes(tree, max_code, s.bl_count);
-}
-
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-function scan_tree(s, tree, max_code)
-//    deflate_state *s;
-//    ct_data *tree;   /* the tree to be scanned */
-//    int max_code;    /* and its largest code of non zero frequency */
-{
-  var n;                     /* iterates over all tree elements */
-  var prevlen = -1;          /* last emitted length */
-  var curlen;                /* length of current code */
-
-  var nextlen = tree[0*2 + 1]/*.Len*/; /* length of next code */
-
-  var count = 0;             /* repeat count of the current code */
-  var max_count = 7;         /* max repeat count */
-  var min_count = 4;         /* min repeat count */
-
-  if (nextlen === 0) {
-    max_count = 138;
-    min_count = 3;
-  }
-  tree[(max_code+1)*2 + 1]/*.Len*/ = 0xffff; /* guard */
-
-  for (n = 0; n <= max_code; n++) {
-    curlen = nextlen;
-    nextlen = tree[(n+1)*2 + 1]/*.Len*/;
-
-    if (++count < max_count && curlen === nextlen) {
-      continue;
-
-    } else if (count < min_count) {
-      s.bl_tree[curlen * 2]/*.Freq*/ += count;
-
-    } else if (curlen !== 0) {
-
-      if (curlen !== prevlen) { s.bl_tree[curlen * 2]/*.Freq*/++; }
-      s.bl_tree[REP_3_6*2]/*.Freq*/++;
-
-    } else if (count <= 10) {
-      s.bl_tree[REPZ_3_10*2]/*.Freq*/++;
-
-    } else {
-      s.bl_tree[REPZ_11_138*2]/*.Freq*/++;
-    }
-
-    count = 0;
-    prevlen = curlen;
-
-    if (nextlen === 0) {
-      max_count = 138;
-      min_count = 3;
-
-    } else if (curlen === nextlen) {
-      max_count = 6;
-      min_count = 3;
-
-    } else {
-      max_count = 7;
-      min_count = 4;
-    }
-  }
-}
-
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-function send_tree(s, tree, max_code)
-//    deflate_state *s;
-//    ct_data *tree; /* the tree to be scanned */
-//    int max_code;       /* and its largest code of non zero frequency */
-{
-  var n;                     /* iterates over all tree elements */
-  var prevlen = -1;          /* last emitted length */
-  var curlen;                /* length of current code */
-
-  var nextlen = tree[0*2 + 1]/*.Len*/; /* length of next code */
-
-  var count = 0;             /* repeat count of the current code */
-  var max_count = 7;         /* max repeat count */
-  var min_count = 4;         /* min repeat count */
-
-  /* tree[max_code+1].Len = -1; */  /* guard already set */
-  if (nextlen === 0) {
-    max_count = 138;
-    min_count = 3;
-  }
-
-  for (n = 0; n <= max_code; n++) {
-    curlen = nextlen;
-    nextlen = tree[(n+1)*2 + 1]/*.Len*/;
-
-    if (++count < max_count && curlen === nextlen) {
-      continue;
-
-    } else if (count < min_count) {
-      do { send_code(s, curlen, s.bl_tree); } while (--count !== 0);
-
-    } else if (curlen !== 0) {
-      if (curlen !== prevlen) {
-        send_code(s, curlen, s.bl_tree);
-        count--;
-      }
-      //Assert(count >= 3 && count <= 6, " 3_6?");
-      send_code(s, REP_3_6, s.bl_tree);
-      send_bits(s, count-3, 2);
-
-    } else if (count <= 10) {
-      send_code(s, REPZ_3_10, s.bl_tree);
-      send_bits(s, count-3, 3);
-
-    } else {
-      send_code(s, REPZ_11_138, s.bl_tree);
-      send_bits(s, count-11, 7);
-    }
-
-    count = 0;
-    prevlen = curlen;
-    if (nextlen === 0) {
-      max_count = 138;
-      min_count = 3;
-
-    } else if (curlen === nextlen) {
-      max_count = 6;
-      min_count = 3;
-
-    } else {
-      max_count = 7;
-      min_count = 4;
-    }
-  }
-}
-
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-function build_bl_tree(s) {
-  var max_blindex;  /* index of last bit length code of non zero freq */
-
-  /* Determine the bit length frequencies for literal and distance trees */
-  scan_tree(s, s.dyn_ltree, s.l_desc.max_code);
-  scan_tree(s, s.dyn_dtree, s.d_desc.max_code);
-
-  /* Build the bit length tree: */
-  build_tree(s, s.bl_desc);
-  /* opt_len now includes the length of the tree representations, except
-   * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-   */
-
-  /* Determine the number of bit length codes to send. The pkzip format
-   * requires that at least 4 bit length codes be sent. (appnote.txt says
-   * 3 but the actual value used is 4.)
-   */
-  for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-    if (s.bl_tree[bl_order[max_blindex]*2 + 1]/*.Len*/ !== 0) {
-      break;
-    }
-  }
-  /* Update opt_len to include the bit length tree and counts */
-  s.opt_len += 3*(max_blindex+1) + 5+5+4;
-  //Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-  //        s->opt_len, s->static_len));
-
-  return max_blindex;
-}
-
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-function send_all_trees(s, lcodes, dcodes, blcodes)
-//    deflate_state *s;
-//    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
-  var rank;                    /* index in bl_order */
-
-  //Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-  //Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-  //        "too many codes");
-  //Tracev((stderr, "\nbl counts: "));
-  send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-  send_bits(s, dcodes-1,   5);
-  send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-  for (rank = 0; rank < blcodes; rank++) {
-    //Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-    send_bits(s, s.bl_tree[bl_order[rank]*2 + 1]/*.Len*/, 3);
-  }
-  //Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-  send_tree(s, s.dyn_ltree, lcodes-1); /* literal tree */
-  //Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-  send_tree(s, s.dyn_dtree, dcodes-1); /* distance tree */
-  //Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-function detect_data_type(s) {
-  /* black_mask is the bit mask of black-listed bytes
-   * set bits 0..6, 14..25, and 28..31
-   * 0xf3ffc07f = binary 11110011111111111100000001111111
-   */
-  var black_mask = 0xf3ffc07f;
-  var n;
-
-  /* Check for non-textual ("black-listed") bytes. */
-  for (n = 0; n <= 31; n++, black_mask >>>= 1) {
-    if ((black_mask & 1) && (s.dyn_ltree[n*2]/*.Freq*/ !== 0)) {
-      return Z_BINARY;
-    }
-  }
-
-  /* Check for textual ("white-listed") bytes. */
-  if (s.dyn_ltree[9 * 2]/*.Freq*/ !== 0 || s.dyn_ltree[10 * 2]/*.Freq*/ !== 0 ||
-      s.dyn_ltree[13 * 2]/*.Freq*/ !== 0) {
-    return Z_TEXT;
-  }
-  for (n = 32; n < LITERALS; n++) {
-    if (s.dyn_ltree[n * 2]/*.Freq*/ !== 0) {
-      return Z_TEXT;
-    }
-  }
-
-  /* There are no "black-listed" or "white-listed" bytes:
-   * this stream either is empty or has tolerated ("gray-listed") bytes only.
-   */
-  return Z_BINARY;
-}
-
-
-var static_init_done = false;
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-function _tr_init(s)
-{
-
-  if (!static_init_done) {
-    tr_static_init();
-    static_init_done = true;
-  }
-
-  s.l_desc  = new TreeDesc(s.dyn_ltree, static_l_desc);
-  s.d_desc  = new TreeDesc(s.dyn_dtree, static_d_desc);
-  s.bl_desc = new TreeDesc(s.bl_tree, static_bl_desc);
-
-  s.bi_buf = 0;
-  s.bi_valid = 0;
-
-  /* Initialize the first block of the first file: */
-  init_block(s);
-}
-
-
-/* ===========================================================================
- * Send a stored block
- */
-function _tr_stored_block(s, buf, stored_len, last)
-//DeflateState *s;
-//charf *buf;       /* input block */
-//ulg stored_len;   /* length of input block */
-//int last;         /* one if this is the last block for a file */
-{
-  send_bits(s, (STORED_BLOCK<<1)+(last ? 1 : 0), 3);    /* send block type */
-  copy_block(s, buf, stored_len, true); /* with header */
-}
-
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- */
-function _tr_align(s) {
-  send_bits(s, STATIC_TREES<<1, 3);
-  send_code(s, END_BLOCK, static_ltree);
-  bi_flush(s);
-}
-
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
- */
-function _tr_flush_block(s, buf, stored_len, last)
-//DeflateState *s;
-//charf *buf;       /* input block, or NULL if too old */
-//ulg stored_len;   /* length of input block */
-//int last;         /* one if this is the last block for a file */
-{
-  var opt_lenb, static_lenb;  /* opt_len and static_len in bytes */
-  var max_blindex = 0;        /* index of last bit length code of non zero freq */
-
-  /* Build the Huffman trees unless a stored block is forced */
-  if (s.level > 0) {
-
-    /* Check if the file is binary or text */
-    if (s.strm.data_type === Z_UNKNOWN) {
-      s.strm.data_type = detect_data_type(s);
-    }
-
-    /* Construct the literal and distance trees */
-    build_tree(s, s.l_desc);
-    // Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-    //        s->static_len));
-
-    build_tree(s, s.d_desc);
-    // Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-    //        s->static_len));
-    /* At this point, opt_len and static_len are the total bit lengths of
-     * the compressed block data, excluding the tree representations.
-     */
-
-    /* Build the bit length tree for the above two trees, and get the index
-     * in bl_order of the last bit length code to send.
-     */
-    max_blindex = build_bl_tree(s);
-
-    /* Determine the best encoding. Compute the block lengths in bytes. */
-    opt_lenb = (s.opt_len+3+7) >>> 3;
-    static_lenb = (s.static_len+3+7) >>> 3;
-
-    // Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-    //        opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-    //        s->last_lit));
-
-    if (static_lenb <= opt_lenb) { opt_lenb = static_lenb; }
-
-  } else {
-    // Assert(buf != (char*)0, "lost buf");
-    opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-  }
-
-  if ((stored_len+4 <= opt_lenb) && (buf !== -1)) {
-    /* 4: two words for the lengths */
-
-    /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-     * Otherwise we can't have processed more than WSIZE input bytes since
-     * the last block flush, because compression would have been
-     * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-     * transform a block into a stored block.
-     */
-    _tr_stored_block(s, buf, stored_len, last);
-
-  } else if (s.strategy === Z_FIXED || static_lenb === opt_lenb) {
-
-    send_bits(s, (STATIC_TREES<<1) + (last ? 1 : 0), 3);
-    compress_block(s, static_ltree, static_dtree);
-
-  } else {
-    send_bits(s, (DYN_TREES<<1) + (last ? 1 : 0), 3);
-    send_all_trees(s, s.l_desc.max_code+1, s.d_desc.max_code+1, max_blindex+1);
-    compress_block(s, s.dyn_ltree, s.dyn_dtree);
-  }
-  // Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-  /* The above check is made mod 2^32, for files larger than 512 MB
-   * and uLong implemented on 32 bits.
-   */
-  init_block(s);
-
-  if (last) {
-    bi_windup(s);
-  }
-  // Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-  //       s->compressed_len-7*last));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-function _tr_tally(s, dist, lc)
-//    deflate_state *s;
-//    unsigned dist;  /* distance of matched string */
-//    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-  //var out_length, in_length, dcode;
-
-  s.pending_buf[s.d_buf + s.last_lit * 2]     = (dist >>> 8) & 0xff;
-  s.pending_buf[s.d_buf + s.last_lit * 2 + 1] = dist & 0xff;
-
-  s.pending_buf[s.l_buf + s.last_lit] = lc & 0xff;
-  s.last_lit++;
-
-  if (dist === 0) {
-    /* lc is the unmatched char */
-    s.dyn_ltree[lc*2]/*.Freq*/++;
-  } else {
-    s.matches++;
-    /* Here, lc is the match length - MIN_MATCH */
-    dist--;             /* dist = match distance - 1 */
-    //Assert((ush)dist < (ush)MAX_DIST(s) &&
-    //       (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-    //       (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-    s.dyn_ltree[(_length_code[lc]+LITERALS+1) * 2]/*.Freq*/++;
-    s.dyn_dtree[d_code(dist) * 2]/*.Freq*/++;
-  }
-
-// (!) This block is disabled in zlib defailts,
-// don't enable it for binary compatibility
-
-//#ifdef TRUNCATE_BLOCK
-//  /* Try to guess if it is profitable to stop the current block here */
-//  if ((s.last_lit & 0x1fff) === 0 && s.level > 2) {
-//    /* Compute an upper bound for the compressed length */
-//    out_length = s.last_lit*8;
-//    in_length = s.strstart - s.block_start;
-//
-//    for (dcode = 0; dcode < D_CODES; dcode++) {
-//      out_length += s.dyn_dtree[dcode*2]/*.Freq*/ * (5 + extra_dbits[dcode]);
-//    }
-//    out_length >>>= 3;
-//    //Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-//    //       s->last_lit, in_length, out_length,
-//    //       100L - out_length*100L/in_length));
-//    if (s.matches < (s.last_lit>>1)/*int /2*/ && out_length < (in_length>>1)/*int /2*/) {
-//      return true;
-//    }
-//  }
-//#endif
-
-  return (s.last_lit === s.lit_bufsize-1);
-  /* We avoid equality with lit_bufsize because of wraparound at 64K
-   * on 16 bit machines and because stored blocks are restricted to
-   * 64K-1 bytes.
-   */
-}
-
-exports._tr_init  = _tr_init;
-exports._tr_stored_block = _tr_stored_block;
-exports._tr_flush_block  = _tr_flush_block;
-exports._tr_tally = _tr_tally;
-exports._tr_align = _tr_align;
-},{"../utils/common":27}],39:[function(_dereq_,module,exports){
-'use strict';
-
-
-function ZStream() {
-  /* next input byte */
-  this.input = null; // JS specific, because we have no pointers
-  this.next_in = 0;
-  /* number of bytes available at input */
-  this.avail_in = 0;
-  /* total number of input bytes read so far */
-  this.total_in = 0;
-  /* next output byte should be put there */
-  this.output = null; // JS specific, because we have no pointers
-  this.next_out = 0;
-  /* remaining free space at output */
-  this.avail_out = 0;
-  /* total number of bytes output so far */
-  this.total_out = 0;
-  /* last error message, NULL if no error */
-  this.msg = ''/*Z_NULL*/;
-  /* not visible by applications */
-  this.state = null;
-  /* best guess about the data type: binary or text */
-  this.data_type = 2/*Z_UNKNOWN*/;
-  /* adler32 value of the uncompressed data */
-  this.adler = 0;
-}
-
-module.exports = ZStream;
-},{}]},{},[9])
-(9)
-});
\ No newline at end of file
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e<h.length;e++)u(h[e]);return u}({1:[function(e,t,r){"use strict";var d=e("./utils"),c=e("./support"),p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";r.encode=function(e){for(var t,r,n,i,s,a,o,h=[],u=0,l=e.length,f=l,c="string"!==d.getTypeOf(e);u<e.length;)f=l-u,n=c?(t=e[u++],r=u<l?e[u++]:0,u<l?e[u++]:0):(t=e.charCodeAt(u++),r=u<l?e.charCodeAt(u++):0,u<l?e.charCodeAt(u++):0),i=t>>2,s=(3&t)<<4|r>>4,a=1<f?(15&r)<<2|n>>6:64,o=2<f?63&n:64,h.push(p.charAt(i)+p.charAt(s)+p.charAt(a)+p.charAt(o));return h.join("")},r.decode=function(e){var t,r,n,i,s,a,o=0,h=0,u="data:";if(e.substr(0,u.length)===u)throw new Error("Invalid base64 input, it looks like a data url.");var l,f=3*(e=e.replace(/[^A-Za-z0-9+/=]/g,"")).length/4;if(e.charAt(e.length-1)===p.charAt(64)&&f--,e.charAt(e.length-2)===p.charAt(64)&&f--,f%1!=0)throw new Error("Invalid base64 input, bad content length.");for(l=c.uint8array?new Uint8Array(0|f):new Array(0|f);o<e.length;)t=p.indexOf(e.charAt(o++))<<2|(i=p.indexOf(e.charAt(o++)))>>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,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(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.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 i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r<t;r++)n+=String.fromCharCode(255&e),e>>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||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)+c,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(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),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 e=this.bytesWritten,t=0;t<this.dirRecords.length;t++)this.push({data:this.dirRecords[t],meta:{percent:100}});var r=this.bytesWritten-e,n=function(e,t,r,n,i){var s=I.transformTo("string",i(n));return R.CENTRAL_DIRECTORY_END+"\0\0\0\0"+A(e,2)+A(e,2)+A(t,4)+A(r,4)+A(s.length,2)+s}(this.dirRecords.length,r,e,this.zipComment,this.encodeFileName);this.push({data:n,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(e){this._sources.push(e);var t=this;return e.on("data",function(e){t.processChunk(e)}),e.on("end",function(){t.closedSource(t.previous.streamInfo),t._sources.length?t.prepareNextSource():t.end()}),e.on("error",function(e){t.error(e)}),this},s.prototype.resume=function(){return!!i.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(e){var t=this._sources;if(!i.prototype.error.call(this,e))return!1;for(var r=0;r<t.length;r++)try{t[r].error(e)}catch(e){}return!0},s.prototype.lock=function(){i.prototype.lock.call(this);for(var e=this._sources,t=0;t<e.length;t++)e[t].lock()},t.exports=s},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(e,t,r){"use strict";var u=e("../compressions"),n=e("./ZipFileWorker");r.generateWorker=function(e,a,t){var o=new n(a.streamFiles,t,a.platform,a.encodeFileName),h=0;try{e.forEach(function(e,t){h++;var r=function(e,t){var r=e||t,n=u[r];if(!n)throw new Error(r+" is not a valid compression method !");return n}(t.options.compression,a.compression),n=t.options.compressionOptions||a.compressionOptions||{},i=t.dir,s=t.date;t._compressWorker(r,n).withStreamInfo("file",{name:e,dir:i,date:s,comment:t.comment||"",unixPermissions:t.unixPermissions,dosPermissions:t.dosPermissions}).pipe(o)}),o.entriesCount=h}catch(e){o.error(e)}return o}},{"../compressions":3,"./ZipFileWorker":8}],10:[function(e,t,r){"use strict";function n(){if(!(this instanceof n))return new n;if(arguments.length)throw new Error("The constructor with parameters has been removed in JSZip 3.0, please check the upgrade guide.");this.files=Object.create(null),this.comment=null,this.root="",this.clone=function(){var e=new n;for(var t in this)"function"!=typeof this[t]&&(e[t]=this[t]);return e}}(n.prototype=e("./object")).loadAsync=e("./load"),n.support=e("./support"),n.defaults=e("./defaults"),n.version="3.10.1",n.loadAsync=function(e,t){return(new n).loadAsync(e,t)},n.external=e("./external"),t.exports=n},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(e,t,r){"use strict";var u=e("./utils"),i=e("./external"),n=e("./utf8"),s=e("./zipEntries"),a=e("./stream/Crc32Probe"),l=e("./nodejsUtils");function f(n){return new i.Promise(function(e,t){var r=n.decompressed.getContentWorker().pipe(new a);r.on("error",function(e){t(e)}).on("end",function(){r.streamInfo.crc32!==n.decompressed.crc32?t(new Error("Corrupted zip : CRC32 mismatch")):e()}).resume()})}t.exports=function(e,o){var h=this;return o=u.extend(o||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:n.utf8decode}),l.isNode&&l.isStream(e)?i.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file.")):u.prepareContent("the loaded zip file",e,!0,o.optimizedBinaryString,o.base64).then(function(e){var t=new s(o);return t.load(e),t}).then(function(e){var t=[i.Promise.resolve(e)],r=e.files;if(o.checkCRC32)for(var n=0;n<r.length;n++)t.push(f(r[n]));return i.Promise.all(t)}).then(function(e){for(var t=e.shift(),r=t.files,n=0;n<r.length;n++){var i=r[n],s=i.fileNameStr,a=u.resolve(i.fileNameStr);h.file(a,i.decompressed,{binary:!0,optimizedBinaryString:!0,date:i.date,dir:i.dir,comment:i.fileCommentStr.length?i.fileCommentStr:null,unixPermissions:i.unixPermissions,dosPermissions:i.dosPermissions,createFolders:o.createFolders}),i.dir||(h.file(a).unsafeOriginalName=s)}return t.zipComment.length&&(h.comment=t.zipComment),h})}},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../stream/GenericWorker");function s(e,t){i.call(this,"Nodejs stream input adapter for "+e),this._upstreamEnded=!1,this._bindStream(t)}n.inherits(s,i),s.prototype._bindStream=function(e){var t=this;(this._stream=e).pause(),e.on("data",function(e){t.push({data:e,meta:{percent:0}})}).on("error",function(e){t.isPaused?this.generatedError=e:t.error(e)}).on("end",function(){t.isPaused?t._upstreamEnded=!0:t.end()})},s.prototype.pause=function(){return!!i.prototype.pause.call(this)&&(this._stream.pause(),!0)},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(this._upstreamEnded?this.end():this._stream.resume(),!0)},t.exports=s},{"../stream/GenericWorker":28,"../utils":32}],13:[function(e,t,r){"use strict";var i=e("readable-stream").Readable;function n(e,t,r){i.call(this,t),this._helper=e;var n=this;e.on("data",function(e,t){n.push(e)||n._helper.pause(),r&&r(t)}).on("error",function(e){n.emit("error",e)}).on("end",function(){n.push(null)})}e("../utils").inherits(n,i),n.prototype._read=function(){this._helper.resume()},t.exports=n},{"../utils":32,"readable-stream":16}],14:[function(e,t,r){"use strict";t.exports={isNode:"undefined"!=typeof Buffer,newBufferFrom:function(e,t){if(Buffer.from&&Buffer.from!==Uint8Array.from)return Buffer.from(e,t);if("number"==typeof e)throw new Error('The "data" argument must not be a number');return new Buffer(e,t)},allocBuffer:function(e){if(Buffer.alloc)return Buffer.alloc(e);var t=new Buffer(e);return t.fill(0),t},isBuffer:function(e){return Buffer.isBuffer(e)},isStream:function(e){return e&&"function"==typeof e.on&&"function"==typeof e.pause&&"function"==typeof e.resume}}},{}],15:[function(e,t,r){"use strict";function s(e,t,r){var n,i=u.getTypeOf(t),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&&(e=g(e)),s.createFolders&&(n=_(e))&&b.call(this,n,!0);var a="string"===i&&!1===s.binary&&!1===s.base64;r&&void 0!==r.binary||(s.binary=!a),(t instanceof c&&0===t.uncompressedSize||s.dir||!t||0===t.length)&&(s.base64=!1,s.binary=!0,t="",s.compression="STORE",i="string");var o=null;o=t instanceof c||t instanceof l?t:p.isNode&&p.isStream(t)?new m(e,t):u.prepareContent(e,t,s.binary,s.optimizedBinaryString,s.base64);var h=new d(e,o,s);this.files[e]=h}var i=e("./utf8"),u=e("./utils"),l=e("./stream/GenericWorker"),a=e("./stream/StreamHelper"),f=e("./defaults"),c=e("./compressedObject"),d=e("./zipObject"),o=e("./generate"),p=e("./nodejsUtils"),m=e("./nodejs/NodejsStreamInputAdapter"),_=function(e){"/"===e.slice(-1)&&(e=e.substring(0,e.length-1));var t=e.lastIndexOf("/");return 0<t?e.substring(0,t):""},g=function(e){return"/"!==e.slice(-1)&&(e+="/"),e},b=function(e,t){return t=void 0!==t?t:f.createFolders,e=g(e),this.files[e]||s.call(this,e,null,{dir:!0,createFolders:t}),this.files[e]};function h(e){return"[object RegExp]"===Object.prototype.toString.call(e)}var n={load:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},forEach:function(e){var t,r,n;for(t in this.files)n=this.files[t],(r=t.slice(this.root.length,t.length))&&t.slice(0,this.root.length)===this.root&&e(r,n)},filter:function(r){var n=[];return this.forEach(function(e,t){r(e,t)&&n.push(t)}),n},file:function(e,t,r){if(1!==arguments.length)return e=this.root+e,s.call(this,e,t,r),this;if(h(e)){var n=e;return this.filter(function(e,t){return!t.dir&&n.test(e)})}var i=this.files[this.root+e];return i&&!i.dir?i:null},folder:function(r){if(!r)return this;if(h(r))return this.filter(function(e,t){return t.dir&&r.test(e)});var e=this.root+r,t=b.call(this,e),n=this.clone();return n.root=t.name,n},remove:function(r){r=this.root+r;var e=this.files[r];if(e||("/"!==r.slice(-1)&&(r+="/"),e=this.files[r]),e&&!e.dir)delete this.files[r];else for(var t=this.filter(function(e,t){return t.name.slice(0,r.length)===r}),n=0;n<t.length;n++)delete this.files[t[n].name];return this},generate:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},generateInternalStream:function(e){var t,r={};try{if((r=u.extend(e||{},{streamFiles:!1,compression:"STORE",compressionOptions:null,type:"",platform:"DOS",comment:null,mimeType:"application/zip",encodeFileName:i.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 n=r.comment||this.comment||"";t=o.generateWorker(this,r,n)}catch(e){(t=new l("error")).error(e)}return new a(t,r.type||"string",r.mimeType)},generateAsync:function(e,t){return this.generateInternalStream(e).accumulate(t)},generateNodeStream:function(e,t){return(e=e||{}).type||(e.type="nodebuffer"),this.generateInternalStream(e).toNodejsStream(t)}};t.exports=n},{"./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(e,t,r){"use strict";t.exports=e("stream")},{stream:void 0}],17:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e);for(var t=0;t<this.data.length;t++)e[t]=255&e[t]}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data[this.zero+e]},i.prototype.lastIndexOfSignature=function(e){for(var t=e.charCodeAt(0),r=e.charCodeAt(1),n=e.charCodeAt(2),i=e.charCodeAt(3),s=this.length-4;0<=s;--s)if(this.data[s]===t&&this.data[s+1]===r&&this.data[s+2]===n&&this.data[s+3]===i)return s-this.zero;return-1},i.prototype.readAndCheckSignature=function(e){var t=e.charCodeAt(0),r=e.charCodeAt(1),n=e.charCodeAt(2),i=e.charCodeAt(3),s=this.readData(4);return t===s[0]&&r===s[1]&&n===s[2]&&i===s[3]},i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return[];var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],18:[function(e,t,r){"use strict";var n=e("../utils");function i(e){this.data=e,this.length=e.length,this.index=0,this.zero=0}i.prototype={checkOffset:function(e){this.checkIndex(this.index+e)},checkIndex:function(e){if(this.length<this.zero+e||e<0)throw new Error("End of data reached (data length = "+this.length+", asked index = "+e+"). Corrupted zip ?")},setIndex:function(e){this.checkIndex(e),this.index=e},skip:function(e){this.setIndex(this.index+e)},byteAt:function(){},readInt:function(e){var t,r=0;for(this.checkOffset(e),t=this.index+e-1;t>=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,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(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"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}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r<this._listeners[e].length;r++)this._listeners[e][r].call(this,t)},pipe:function(e){return e.registerPrevious(this)},registerPrevious:function(e){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.streamInfo=e.streamInfo,this.mergeStreamInfo(),this.previous=e;var t=this;return e.on("data",function(e){t.processChunk(e)}),e.on("end",function(){t.end()}),e.on("error",function(e){t.error(e)}),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 e=this.isPaused=!1;return this.generatedError&&(this.error(this.generatedError),e=!0),this.previous&&this.previous.resume(),!e},flush:function(){},processChunk:function(e){this.push(e)},withStreamInfo:function(e,t){return this.extraStreamInfo[e]=t,this.mergeStreamInfo(),this},mergeStreamInfo:function(){for(var e in this.extraStreamInfo)Object.prototype.hasOwnProperty.call(this.extraStreamInfo,e)&&(this.streamInfo[e]=this.extraStreamInfo[e])},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 e="Worker "+this.name;return this.previous?this.previous+" -> "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r<t.length;r++)s+=t[r].length;switch(e){case"string":return t.join("");case"array":return Array.prototype.concat.apply([],t);case"uint8array":for(i=new Uint8Array(s),r=0;r<t.length;r++)i.set(t[r],n),n+=t[r].length;return i;case"nodebuffer":return Buffer.concat(t);default:throw new Error("concat : unsupported type '"+e+"'")}}(i,n),a);t(e)}catch(e){r(e)}n=[]}).resume()})}function f(e,t,r){var n=t;switch(t){case"blob":case"arraybuffer":n="uint8array";break;case"base64":n="string"}try{this._internalType=n,this._outputType=t,this._mimeType=r,h.checkSupport(n),this._worker=e.pipe(new i(n)),e.lock()}catch(e){this._worker=new s("error"),this._worker.error(e)}}f.prototype={accumulate:function(e){return l(this,e)},on:function(e,t){var r=this;return"data"===e?this._worker.on(e,function(e){t.call(r,e.data,e.meta)}):this._worker.on(e,function(){h.delay(t,arguments,r)}),this},resume:function(){return h.delay(this._worker.resume,[],this._worker),this},pause:function(){return this._worker.pause(),this},toNodejsStream:function(e){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},e)}},t.exports=f},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(e,t,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 n=new ArrayBuffer(0);try{r.blob=0===new Blob([n],{type:"application/zip"}).size}catch(e){try{var i=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);i.append(n),r.blob=0===i.getBlob("application/zip").size}catch(e){r.blob=!1}}}try{r.nodestream=!!e("readable-stream").Readable}catch(e){r.nodestream=!1}},{"readable-stream":16}],31:[function(e,t,s){"use strict";for(var o=e("./utils"),h=e("./support"),r=e("./nodejsUtils"),n=e("./stream/GenericWorker"),u=new Array(256),i=0;i<256;i++)u[i]=252<=i?6:248<=i?5:240<=i?4:224<=i?3:192<=i?2:1;u[254]=u[254]=1;function a(){n.call(this,"utf-8 decode"),this.leftOver=null}function l(){n.call(this,"utf-8 encode")}s.utf8encode=function(e){return h.nodebuffer?r.newBufferFrom(e,"utf-8"):function(e){var t,r,n,i,s,a=e.length,o=0;for(i=0;i<a;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),o+=r<128?1:r<2048?2:r<65536?3:4;for(t=h.uint8array?new Uint8Array(o):new Array(o),i=s=0;s<o;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),r<128?t[s++]=r:(r<2048?t[s++]=192|r>>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t<s;)if((n=e[t++])<128)a[r++]=n;else if(4<(i=u[n]))a[r++]=65533,t+=i-1;else{for(n&=2===i?31:3===i?15:7;1<i&&t<s;)n=n<<6|63&e[t++],i--;1<i?a[r++]=65533:n<65536?a[r++]=n:(n-=65536,a[r++]=55296|n>>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.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,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r<e.length;++r)t[r]=255&e.charCodeAt(r);return t}e("setimmediate"),a.newBlob=function(t,r){a.checkSupport("blob");try{return new Blob([t],{type:r})}catch(e){try{var n=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);return n.append(t),n.getBlob(r)}catch(e){throw new Error("Bug : can't construct the Blob.")}}};var i={stringifyByChunk:function(e,t,r){var n=[],i=0,s=e.length;if(s<=r)return String.fromCharCode.apply(null,e);for(;i<s;)"array"===t||"nodebuffer"===t?n.push(String.fromCharCode.apply(null,e.slice(i,Math.min(i+r,s)))):n.push(String.fromCharCode.apply(null,e.subarray(i,Math.min(i+r,s)))),i+=r;return n.join("")},stringifyByChar:function(e){for(var t="",r=0;r<e.length;r++)t+=String.fromCharCode(e[r]);return t},applyCanBeUsed:{uint8array:function(){try{return o.uint8array&&1===String.fromCharCode.apply(null,new Uint8Array(1)).length}catch(e){return!1}}(),nodebuffer:function(){try{return o.nodebuffer&&1===String.fromCharCode.apply(null,r.allocBuffer(1)).length}catch(e){return!1}}()}};function s(e){var t=65536,r=a.getTypeOf(e),n=!0;if("uint8array"===r?n=i.applyCanBeUsed.uint8array:"nodebuffer"===r&&(n=i.applyCanBeUsed.nodebuffer),n)for(;1<t;)try{return i.stringifyByChunk(e,r,t)}catch(e){t=Math.floor(t/2)}return i.stringifyByChar(e)}function f(e,t){for(var r=0;r<e.length;r++)t[r]=e[r];return t}a.applyFromCharCode=s;var c={};c.string={string:n,array:function(e){return l(e,new Array(e.length))},arraybuffer:function(e){return c.string.uint8array(e).buffer},uint8array:function(e){return l(e,new Uint8Array(e.length))},nodebuffer:function(e){return l(e,r.allocBuffer(e.length))}},c.array={string:s,array:n,arraybuffer:function(e){return new Uint8Array(e).buffer},uint8array:function(e){return new Uint8Array(e)},nodebuffer:function(e){return r.newBufferFrom(e)}},c.arraybuffer={string:function(e){return s(new Uint8Array(e))},array:function(e){return f(new Uint8Array(e),new Array(e.byteLength))},arraybuffer:n,uint8array:function(e){return new Uint8Array(e)},nodebuffer:function(e){return r.newBufferFrom(new Uint8Array(e))}},c.uint8array={string:s,array:function(e){return f(e,new Array(e.length))},arraybuffer:function(e){return e.buffer},uint8array:n,nodebuffer:function(e){return r.newBufferFrom(e)}},c.nodebuffer={string:s,array:function(e){return f(e,new Array(e.length))},arraybuffer:function(e){return c.nodebuffer.uint8array(e).buffer},uint8array:function(e){return f(e,new Uint8Array(e.length))},nodebuffer:n},a.transformTo=function(e,t){if(t=t||"",!e)return t;a.checkSupport(e);var r=a.getTypeOf(t);return c[r][e](t)},a.resolve=function(e){for(var t=e.split("/"),r=[],n=0;n<t.length;n++){var i=t[n];"."===i||""===i&&0!==n&&n!==t.length-1||(".."===i?r.pop():r.push(i))}return r.join("/")},a.getTypeOf=function(e){return"string"==typeof e?"string":"[object Array]"===Object.prototype.toString.call(e)?"array":o.nodebuffer&&r.isBuffer(e)?"nodebuffer":o.uint8array&&e instanceof Uint8Array?"uint8array":o.arraybuffer&&e instanceof ArrayBuffer?"arraybuffer":void 0},a.checkSupport=function(e){if(!o[e.toLowerCase()])throw new Error(e+" is not supported by this platform")},a.MAX_VALUE_16BITS=65535,a.MAX_VALUE_32BITS=-1,a.pretty=function(e){var t,r,n="";for(r=0;r<(e||"").length;r++)n+="\\x"+((t=e.charCodeAt(r))<16?"0":"")+t.toString(16).toUpperCase();return n},a.delay=function(e,t,r){setImmediate(function(){e.apply(r||null,t||[])})},a.inherits=function(e,t){function r(){}r.prototype=t.prototype,e.prototype=new r},a.extend=function(){var e,t,r={};for(e=0;e<arguments.length;e++)for(t in arguments[e])Object.prototype.hasOwnProperty.call(arguments[e],t)&&void 0===r[t]&&(r[t]=arguments[e][t]);return r},a.prepareContent=function(r,e,n,i,s){return u.Promise.resolve(e).then(function(n){return o.blob&&(n instanceof Blob||-1!==["[object File]","[object Blob]"].indexOf(Object.prototype.toString.call(n)))&&"undefined"!=typeof FileReader?new u.Promise(function(t,r){var e=new FileReader;e.onload=function(e){t(e.target.result)},e.onerror=function(e){r(e.target.error)},e.readAsArrayBuffer(n)}):n}).then(function(e){var t=a.getTypeOf(e);return t?("arraybuffer"===t?e=a.transformTo("uint8array",e):"string"===t&&(s?e=h.decode(e):n&&!0!==i&&(e=function(e){return l(e,o.uint8array?new Uint8Array(e.length):new Array(e.length))}(e))),e):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,setimmediate:54}],33:[function(e,t,r){"use strict";var n=e("./reader/readerFor"),i=e("./utils"),s=e("./signature"),a=e("./zipEntry"),o=e("./support");function h(e){this.files=[],this.loadOptions=e}h.prototype={checkSignature:function(e){if(!this.reader.readAndCheckSignature(e)){this.reader.index-=4;var t=this.reader.readString(4);throw new Error("Corrupted zip or bug: unexpected signature ("+i.pretty(t)+", expected "+i.pretty(e)+")")}},isSignature:function(e,t){var r=this.reader.index;this.reader.setIndex(e);var n=this.reader.readString(4)===t;return this.reader.setIndex(r),n},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 e=this.reader.readData(this.zipCommentLength),t=o.uint8array?"uint8array":"array",r=i.transformTo(t,e);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 e,t,r,n=this.zip64EndOfCentralSize-44;0<n;)e=this.reader.readInt(2),t=this.reader.readInt(4),r=this.reader.readData(t),this.zip64ExtensibleData[e]={id:e,length:t,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 e,t;for(e=0;e<this.files.length;e++)t=this.files[e],this.reader.setIndex(t.localHeaderOffset),this.checkSignature(s.LOCAL_FILE_HEADER),t.readLocalPart(this.reader),t.handleUTF8(),t.processAttributes()},readCentralDir:function(){var e;for(this.reader.setIndex(this.centralDirOffset);this.reader.readAndCheckSignature(s.CENTRAL_FILE_HEADER);)(e=new a({zip64:this.zip64},this.loadOptions)).readCentralPart(this.reader),this.files.push(e);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 e=this.reader.lastIndexOfSignature(s.CENTRAL_DIRECTORY_END);if(e<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(e);var t=e;if(this.checkSignature(s.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===i.MAX_VALUE_16BITS||this.diskWithCentralDirStart===i.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===i.MAX_VALUE_16BITS||this.centralDirRecords===i.MAX_VALUE_16BITS||this.centralDirSize===i.MAX_VALUE_32BITS||this.centralDirOffset===i.MAX_VALUE_32BITS){if(this.zip64=!0,(e=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(e),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 n=t-r;if(0<n)this.isSignature(t,s.CENTRAL_FILE_HEADER)||(this.reader.zero=n);else if(n<0)throw new Error("Corrupted zip: missing "+Math.abs(n)+" bytes.")},prepareReader:function(e){this.reader=n(e)},load:function(e){this.prepareReader(e),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},t.exports=h},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utils":32,"./zipEntry":34}],34:[function(e,t,r){"use strict";var n=e("./reader/readerFor"),s=e("./utils"),i=e("./compressedObject"),a=e("./crc32"),o=e("./utf8"),h=e("./compressions"),u=e("./support");function l(e,t){this.options=e,this.loadOptions=t}l.prototype={isEncrypted:function(){return 1==(1&this.bitFlag)},useUTF8:function(){return 2048==(2048&this.bitFlag)},readLocalPart:function(e){var t,r;if(e.skip(22),this.fileNameLength=e.readInt(2),r=e.readInt(2),this.fileName=e.readData(this.fileNameLength),e.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===(t=function(e){for(var t in h)if(Object.prototype.hasOwnProperty.call(h,t)&&h[t].magic===e)return h[t];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 i(this.compressedSize,this.uncompressedSize,this.crc32,t,e.readData(this.compressedSize))},readCentralPart:function(e){this.versionMadeBy=e.readInt(2),e.skip(2),this.bitFlag=e.readInt(2),this.compressionMethod=e.readString(2),this.date=e.readDate(),this.crc32=e.readInt(4),this.compressedSize=e.readInt(4),this.uncompressedSize=e.readInt(4);var t=e.readInt(2);if(this.extraFieldsLength=e.readInt(2),this.fileCommentLength=e.readInt(2),this.diskNumberStart=e.readInt(2),this.internalFileAttributes=e.readInt(2),this.externalFileAttributes=e.readInt(4),this.localHeaderOffset=e.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");e.skip(t),this.readExtraFields(e),this.parseZIP64ExtraField(e),this.fileComment=e.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var e=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(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(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4<i;)t=e.readInt(2),r=e.readInt(2),n=e.readData(r),this.extraFields[t]={id:t,length:r,value:n};e.setIndex(i)},handleUTF8:function(){var e=u.uint8array?"uint8array":"array";if(this.useUTF8())this.fileNameStr=o.utf8decode(this.fileName),this.fileCommentStr=o.utf8decode(this.fileComment);else{var t=this.findExtraFieldUnicodePath();if(null!==t)this.fileNameStr=t;else{var r=s.transformTo(e,this.fileName);this.fileNameStr=this.loadOptions.decodeFileName(r)}var n=this.findExtraFieldUnicodeComment();if(null!==n)this.fileCommentStr=n;else{var i=s.transformTo(e,this.fileComment);this.fileCommentStr=this.loadOptions.decodeFileName(i)}}},findExtraFieldUnicodePath:function(){var e=this.extraFields[28789];if(e){var t=n(e.value);return 1!==t.readInt(1)?null:a(this.fileName)!==t.readInt(4)?null:o.utf8decode(t.readData(e.length-5))}return null},findExtraFieldUnicodeComment:function(){var e=this.extraFields[25461];if(e){var t=n(e.value);return 1!==t.readInt(1)?null:a(this.fileComment)!==t.readInt(4)?null:o.utf8decode(t.readData(e.length-5))}return null}},t.exports=l},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(e,t,r){"use strict";function n(e,t,r){this.name=e,this.dir=r.dir,this.date=r.date,this.comment=r.comment,this.unixPermissions=r.unixPermissions,this.dosPermissions=r.dosPermissions,this._data=t,this._dataBinary=r.binary,this.options={compression:r.compression,compressionOptions:r.compressionOptions}}var s=e("./stream/StreamHelper"),i=e("./stream/DataWorker"),a=e("./utf8"),o=e("./compressedObject"),h=e("./stream/GenericWorker");n.prototype={internalStream:function(e){var t=null,r="string";try{if(!e)throw new Error("No output type specified.");var n="string"===(r=e.toLowerCase())||"text"===r;"binarystring"!==r&&"text"!==r||(r="string"),t=this._decompressWorker();var i=!this._dataBinary;i&&!n&&(t=t.pipe(new a.Utf8EncodeWorker)),!i&&n&&(t=t.pipe(new a.Utf8DecodeWorker))}catch(e){(t=new h("error")).error(e)}return new s(t,r,"")},async:function(e,t){return this.internalStream(e).accumulate(t)},nodeStream:function(e,t){return this.internalStream(e||"nodebuffer").toNodejsStream(t)},_compressWorker:function(e,t){if(this._data instanceof o&&this._data.compression.magic===e.magic)return this._data.getCompressedWorker();var r=this._decompressWorker();return this._dataBinary||(r=r.pipe(new a.Utf8EncodeWorker)),o.createWorkerFrom(r,e,t)},_decompressWorker:function(){return this._data instanceof o?this._data.getContentWorker():this._data instanceof h?this._data:new i(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++)n.prototype[u[f]]=l;t.exports=n},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(e,l,t){(function(t){"use strict";var r,n,e=t.MutationObserver||t.WebKitMutationObserver;if(e){var i=0,s=new e(u),a=t.document.createTextNode("");s.observe(a,{characterData:!0}),r=function(){a.data=i=++i%2}}else if(t.setImmediate||void 0===t.MessageChannel)r="document"in t&&"onreadystatechange"in t.document.createElement("script")?function(){var e=t.document.createElement("script");e.onreadystatechange=function(){u(),e.onreadystatechange=null,e.parentNode.removeChild(e),e=null},t.document.documentElement.appendChild(e)}:function(){setTimeout(u,0)};else{var o=new t.MessageChannel;o.port1.onmessage=u,r=function(){o.port2.postMessage(0)}}var h=[];function u(){var e,t;n=!0;for(var r=h.length;r;){for(t=h,h=[],e=-1;++e<r;)t[e]();r=h.length}n=!1}l.exports=function(e){1!==h.push(e)||n||r()}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],37:[function(e,t,r){"use strict";var i=e("immediate");function u(){}var l={},s=["REJECTED"],a=["FULFILLED"],n=["PENDING"];function o(e){if("function"!=typeof e)throw new TypeError("resolver must be a function");this.state=n,this.queue=[],this.outcome=void 0,e!==u&&d(this,e)}function h(e,t,r){this.promise=e,"function"==typeof t&&(this.onFulfilled=t,this.callFulfilled=this.otherCallFulfilled),"function"==typeof r&&(this.onRejected=r,this.callRejected=this.otherCallRejected)}function f(t,r,n){i(function(){var e;try{e=r(n)}catch(e){return l.reject(t,e)}e===t?l.reject(t,new TypeError("Cannot resolve promise with itself")):l.resolve(t,e)})}function c(e){var t=e&&e.then;if(e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof t)return function(){t.apply(e,arguments)}}function d(t,e){var r=!1;function n(e){r||(r=!0,l.reject(t,e))}function i(e){r||(r=!0,l.resolve(t,e))}var s=p(function(){e(i,n)});"error"===s.status&&n(s.value)}function p(e,t){var r={};try{r.value=e(t),r.status="success"}catch(e){r.status="error",r.value=e}return r}(t.exports=o).prototype.finally=function(t){if("function"!=typeof t)return this;var r=this.constructor;return this.then(function(e){return r.resolve(t()).then(function(){return e})},function(e){return r.resolve(t()).then(function(){throw e})})},o.prototype.catch=function(e){return this.then(null,e)},o.prototype.then=function(e,t){if("function"!=typeof e&&this.state===a||"function"!=typeof t&&this.state===s)return this;var r=new this.constructor(u);this.state!==n?f(r,this.state===a?e:t,this.outcome):this.queue.push(new h(r,e,t));return r},h.prototype.callFulfilled=function(e){l.resolve(this.promise,e)},h.prototype.otherCallFulfilled=function(e){f(this.promise,this.onFulfilled,e)},h.prototype.callRejected=function(e){l.reject(this.promise,e)},h.prototype.otherCallRejected=function(e){f(this.promise,this.onRejected,e)},l.resolve=function(e,t){var r=p(c,t);if("error"===r.status)return l.reject(e,r.value);var n=r.value;if(n)d(e,n);else{e.state=a,e.outcome=t;for(var i=-1,s=e.queue.length;++i<s;)e.queue[i].callFulfilled(t)}return e},l.reject=function(e,t){e.state=s,e.outcome=t;for(var r=-1,n=e.queue.length;++r<n;)e.queue[r].callRejected(t);return e},o.resolve=function(e){if(e instanceof this)return e;return l.resolve(new this(u),e)},o.reject=function(e){var t=new this(u);return l.reject(t,e)},o.all=function(e){var r=this;if("[object Array]"!==Object.prototype.toString.call(e))return this.reject(new TypeError("must be an array"));var n=e.length,i=!1;if(!n)return this.resolve([]);var s=new Array(n),a=0,t=-1,o=new this(u);for(;++t<n;)h(e[t],t);return o;function h(e,t){r.resolve(e).then(function(e){s[t]=e,++a!==n||i||(i=!0,l.resolve(o,s))},function(e){i||(i=!0,l.reject(o,e))})}},o.race=function(e){var t=this;if("[object Array]"!==Object.prototype.toString.call(e))return this.reject(new TypeError("must be an array"));var r=e.length,n=!1;if(!r)return this.resolve([]);var i=-1,s=new this(u);for(;++i<r;)a=e[i],t.resolve(a).then(function(e){n||(n=!0,l.resolve(s,e))},function(e){n||(n=!0,l.reject(s,e))});var a;return s}},{immediate:36}],38:[function(e,t,r){"use strict";var n={};(0,e("./lib/utils/common").assign)(n,e("./lib/deflate"),e("./lib/inflate"),e("./lib/zlib/constants")),t.exports=n},{"./lib/deflate":39,"./lib/inflate":40,"./lib/utils/common":41,"./lib/zlib/constants":44}],39:[function(e,t,r){"use strict";var a=e("./zlib/deflate"),o=e("./utils/common"),h=e("./utils/strings"),i=e("./zlib/messages"),s=e("./zlib/zstream"),u=Object.prototype.toString,l=0,f=-1,c=0,d=8;function p(e){if(!(this instanceof p))return new p(e);this.options=o.assign({level:f,method:d,chunkSize:16384,windowBits:15,memLevel:8,strategy:c,to:""},e||{});var t=this.options;t.raw&&0<t.windowBits?t.windowBits=-t.windowBits:t.gzip&&0<t.windowBits&&t.windowBits<16&&(t.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,t.level,t.method,t.windowBits,t.memLevel,t.strategy);if(r!==l)throw new Error(i[r]);if(t.header&&a.deflateSetHeader(this.strm,t.header),t.dictionary){var n;if(n="string"==typeof t.dictionary?h.string2buf(t.dictionary):"[object ArrayBuffer]"===u.call(t.dictionary)?new Uint8Array(t.dictionary):t.dictionary,(r=a.deflateSetDictionary(this.strm,n))!==l)throw new Error(i[r]);this._dict_set=!0}}function n(e,t){var r=new p(t);if(r.push(e,!0),r.err)throw r.msg||i[r.err];return r.result}p.prototype.push=function(e,t){var r,n,i=this.strm,s=this.options.chunkSize;if(this.ended)return!1;n=t===~~t?t:!0===t?4:0,"string"==typeof e?i.input=h.string2buf(e):"[object ArrayBuffer]"===u.call(e)?i.input=new Uint8Array(e):i.input=e,i.next_in=0,i.avail_in=i.input.length;do{if(0===i.avail_out&&(i.output=new o.Buf8(s),i.next_out=0,i.avail_out=s),1!==(r=a.deflate(i,n))&&r!==l)return this.onEnd(r),!(this.ended=!0);0!==i.avail_out&&(0!==i.avail_in||4!==n&&2!==n)||("string"===this.options.to?this.onData(h.buf2binstring(o.shrinkBuf(i.output,i.next_out))):this.onData(o.shrinkBuf(i.output,i.next_out)))}while((0<i.avail_in||0===i.avail_out)&&1!==r);return 4===n?(r=a.deflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===l):2!==n||(this.onEnd(l),!(i.avail_out=0))},p.prototype.onData=function(e){this.chunks.push(e)},p.prototype.onEnd=function(e){e===l&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=o.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},r.Deflate=p,r.deflate=n,r.deflateRaw=function(e,t){return(t=t||{}).raw=!0,n(e,t)},r.gzip=function(e,t){return(t=t||{}).gzip=!0,n(e,t)}},{"./utils/common":41,"./utils/strings":42,"./zlib/deflate":46,"./zlib/messages":51,"./zlib/zstream":53}],40:[function(e,t,r){"use strict";var c=e("./zlib/inflate"),d=e("./utils/common"),p=e("./utils/strings"),m=e("./zlib/constants"),n=e("./zlib/messages"),i=e("./zlib/zstream"),s=e("./zlib/gzheader"),_=Object.prototype.toString;function a(e){if(!(this instanceof a))return new a(e);this.options=d.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;t.raw&&0<=t.windowBits&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(0<=t.windowBits&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),15<t.windowBits&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new i,this.strm.avail_out=0;var r=c.inflateInit2(this.strm,t.windowBits);if(r!==m.Z_OK)throw new Error(n[r]);this.header=new s,c.inflateGetHeader(this.strm,this.header)}function o(e,t){var r=new a(t);if(r.push(e,!0),r.err)throw r.msg||n[r.err];return r.result}a.prototype.push=function(e,t){var r,n,i,s,a,o,h=this.strm,u=this.options.chunkSize,l=this.options.dictionary,f=!1;if(this.ended)return!1;n=t===~~t?t:!0===t?m.Z_FINISH:m.Z_NO_FLUSH,"string"==typeof e?h.input=p.binstring2buf(e):"[object ArrayBuffer]"===_.call(e)?h.input=new Uint8Array(e):h.input=e,h.next_in=0,h.avail_in=h.input.length;do{if(0===h.avail_out&&(h.output=new d.Buf8(u),h.next_out=0,h.avail_out=u),(r=c.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=c.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||n!==m.Z_FINISH&&n!==m.Z_SYNC_FLUSH)||("string"===this.options.to?(i=p.utf8border(h.output,h.next_out),s=h.next_out-i,a=p.buf2string(h.output,i),h.next_out=s,h.avail_out=u-s,s&&d.arraySet(h.output,h.output,i,s,0),this.onData(a)):this.onData(d.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&&(n=m.Z_FINISH),n===m.Z_FINISH?(r=c.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===m.Z_OK):n!==m.Z_SYNC_FLUSH||(this.onEnd(m.Z_OK),!(h.avail_out=0))},a.prototype.onData=function(e){this.chunks.push(e)},a.prototype.onEnd=function(e){e===m.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=d.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},r.Inflate=a,r.inflate=o,r.inflateRaw=function(e,t){return(t=t||{}).raw=!0,o(e,t)},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(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;r.assign=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var r=t.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var n in r)r.hasOwnProperty(n)&&(e[n]=r[n])}}return e},r.shrinkBuf=function(e,t){return e.length===t?e:e.subarray?e.subarray(0,t):(e.length=t,e)};var i={arraySet:function(e,t,r,n,i){if(t.subarray&&e.subarray)e.set(t.subarray(r,r+n),i);else for(var s=0;s<n;s++)e[i+s]=t[r+s]},flattenChunks:function(e){var t,r,n,i,s,a;for(t=n=0,r=e.length;t<r;t++)n+=e[t].length;for(a=new Uint8Array(n),t=i=0,r=e.length;t<r;t++)s=e[t],a.set(s,i),i+=s.length;return a}},s={arraySet:function(e,t,r,n,i){for(var s=0;s<n;s++)e[i+s]=t[r+s]},flattenChunks:function(e){return[].concat.apply([],e)}};r.setTyped=function(e){e?(r.Buf8=Uint8Array,r.Buf16=Uint16Array,r.Buf32=Int32Array,r.assign(r,i)):(r.Buf8=Array,r.Buf16=Array,r.Buf32=Array,r.assign(r,s))},r.setTyped(n)},{}],42:[function(e,t,r){"use strict";var h=e("./common"),i=!0,s=!0;try{String.fromCharCode.apply(null,[0])}catch(e){i=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){s=!1}for(var u=new h.Buf8(256),n=0;n<256;n++)u[n]=252<=n?6:248<=n?5:240<=n?4:224<=n?3:192<=n?2:1;function l(e,t){if(t<65537&&(e.subarray&&s||!e.subarray&&i))return String.fromCharCode.apply(null,h.shrinkBuf(e,t));for(var r="",n=0;n<t;n++)r+=String.fromCharCode(e[n]);return r}u[254]=u[254]=1,r.string2buf=function(e){var t,r,n,i,s,a=e.length,o=0;for(i=0;i<a;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),o+=r<128?1:r<2048?2:r<65536?3:4;for(t=new h.Buf8(o),i=s=0;s<o;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),r<128?t[s++]=r:(r<2048?t[s++]=192|r>>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r<n;r++)t[r]=e.charCodeAt(r);return t},r.buf2string=function(e,t){var r,n,i,s,a=t||e.length,o=new Array(2*a);for(r=n=0;r<a;)if((i=e[r++])<128)o[n++]=i;else if(4<(s=u[i]))o[n++]=65533,r+=s-1;else{for(i&=2===s?31:3===s?15:7;1<s&&r<a;)i=i<<6|63&e[r++],s--;1<s?o[n++]=65533:i<65536?o[n++]=i:(i-=65536,o[n++]=55296|i>>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3<r?2e3:r;s=s+(i=i+t[n++]|0)|0,--a;);i%=65521,s%=65521}return i|s<<16|0}},{}],44:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=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(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4<e?9:0)}function D(e){for(var t=e.length;0<=--t;)e[t]=0}function F(e){var t=e.state,r=t.pending;r>e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&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<c);if(n=S-(c-s),s=c-S,a<n){if(e.match_start=t,o<=(a=n))break;d=u[s+a-1],p=u[s+a]}}}while((t=f[t&l])>h&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u<l&&(l=u),r=0===l?0:(a.avail_in-=l,c.arraySet(o,a.input,a.next_in,l,h),1===a.state.wrap?a.adler=d(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),e.lookahead+=r,e.lookahead+e.insert>=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<<e.hash_shift^e.window[s+1])&e.hash_mask;e.insert&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[s+x-1])&e.hash_mask,e.prev[s&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=s,s++,e.insert--,!(e.lookahead+e.insert<x)););}while(e.lookahead<z&&0!==e.strm.avail_in)}function Z(e,t){for(var r,n;;){if(e.lookahead<z){if(j(e),e.lookahead<z&&t===l)return A;if(0===e.lookahead)break}if(r=0,e.lookahead>=x&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),0!==r&&e.strstart-r<=e.w_size-z&&(e.match_length=L(e,r)),e.match_length>=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart,0!=--e.match_length;);e.strstart++}else e.strstart+=e.match_length,e.match_length=0,e.ins_h=e.window[e.strstart],e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+1])&e.hash_mask;else n=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++;if(n&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=e.strstart<x-1?e.strstart:x-1,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}function W(e,t){for(var r,n,i;;){if(e.lookahead<z){if(j(e),e.lookahead<z&&t===l)return A;if(0===e.lookahead)break}if(r=0,e.lookahead>=x&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),e.prev_length=e.match_length,e.prev_match=e.match_start,e.match_length=x-1,0!==r&&e.prev_length<e.max_lazy_match&&e.strstart-r<=e.w_size-z&&(e.match_length=L(e,r),e.match_length<=5&&(1===e.strategy||e.match_length===x&&4096<e.strstart-e.match_start)&&(e.match_length=x-1)),e.prev_length>=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),0!=--e.prev_length;);if(e.match_available=0,e.match_length=x-1,e.strstart++,n&&(N(e,!1),0===e.strm.avail_out))return A}else if(e.match_available){if((n=u._tr_tally(e,0,e.window[e.strstart-1]))&&N(e,!1),e.strstart++,e.lookahead--,0===e.strm.avail_out)return A}else e.match_available=1,e.strstart++,e.lookahead--}return e.match_available&&(n=u._tr_tally(e,0,e.window[e.strstart-1]),e.match_available=0),e.insert=e.strstart<x-1?e.strstart:x-1,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}function M(e,t,r,n,i){this.good_length=e,this.max_lazy=t,this.nice_length=r,this.max_chain=n,this.func=i}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 c.Buf16(2*w),this.dyn_dtree=new c.Buf16(2*(2*a+1)),this.bl_tree=new c.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 c.Buf16(k+1),this.heap=new c.Buf16(2*s+1),D(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new c.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(e){var t;return e&&e.state?(e.total_in=e.total_out=0,e.data_type=i,(t=e.state).pending=0,t.pending_out=0,t.wrap<0&&(t.wrap=-t.wrap),t.status=t.wrap?C:E,e.adler=2===t.wrap?0:1,t.last_flush=l,u._tr_init(t),m):R(e,_)}function K(e){var t=G(e);return t===m&&function(e){e.window_size=2*e.w_size,D(e.head),e.max_lazy_match=h[e.level].max_lazy,e.good_match=h[e.level].good_length,e.nice_match=h[e.level].nice_length,e.max_chain_length=h[e.level].max_chain,e.strstart=0,e.block_start=0,e.lookahead=0,e.insert=0,e.match_length=e.prev_length=x-1,e.match_available=0,e.ins_h=0}(e.state),t}function Y(e,t,r,n,i,s){if(!e)return _;var a=1;if(t===g&&(t=6),n<0?(a=0,n=-n):15<n&&(a=2,n-=16),i<1||y<i||r!==v||n<8||15<n||t<0||9<t||s<0||b<s)return R(e,_);8===n&&(n=9);var o=new H;return(e.state=o).strm=e,o.wrap=a,o.gzhead=null,o.w_bits=n,o.w_size=1<<o.w_bits,o.w_mask=o.w_size-1,o.hash_bits=i+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 c.Buf8(2*o.w_size),o.head=new c.Buf16(o.hash_size),o.prev=new c.Buf16(o.w_size),o.lit_bufsize=1<<i+6,o.pending_buf_size=4*o.lit_bufsize,o.pending_buf=new c.Buf8(o.pending_buf_size),o.d_buf=1*o.lit_bufsize,o.l_buf=3*o.lit_bufsize,o.level=t,o.strategy=s,o.method=r,K(e)}h=[new M(0,0,0,0,function(e,t){var r=65535;for(r>e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.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(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5<t||t<0)return e?R(e,_):_;if(n=e.state,!e.output||!e.input&&0!==e.avail_in||666===n.status&&t!==f)return R(e,0===e.avail_out?-5:_);if(n.strm=e,r=n.last_flush,n.last_flush=t,n.status===C)if(2===n.wrap)e.adler=0,U(n,31),U(n,139),U(n,8),n.gzhead?(U(n,(n.gzhead.text?1:0)+(n.gzhead.hcrc?2:0)+(n.gzhead.extra?4:0)+(n.gzhead.name?8:0)+(n.gzhead.comment?16:0)),U(n,255&n.gzhead.time),U(n,n.gzhead.time>>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindex<n.gzhead.name.length?255&n.gzhead.name.charCodeAt(n.gzindex++):0,U(n,s)}while(0!==s);n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindex<n.gzhead.comment.length?255&n.gzhead.comment.charCodeAt(n.gzindex++):0,U(n,s)}while(0!==s);n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0<e.strstart&&(n=a[i=e.strstart-1])===a[++i]&&n===a[++i]&&n===a[++i]){s=e.strstart+S;do{}while(n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&i<s);e.match_length=S-(s-i),e.match_length>e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0<n.wrap&&(n.wrap=-n.wrap),0!==n.pending?m:1)},r.deflateEnd=function(e){var t;return e&&e.state?(t=e.state.status)!==C&&69!==t&&73!==t&&91!==t&&103!==t&&t!==E&&666!==t?R(e,_):(e.state=null,t===E?R(e,-3):m):_},r.deflateSetDictionary=function(e,t){var r,n,i,s,a,o,h,u,l=t.length;if(!e||!e.state)return _;if(2===(s=(r=e.state).wrap)||1===s&&r.status!==C||r.lookahead)return _;for(1===s&&(e.adler=d(e.adler,t,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 c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<<r.hash_shift^r.window[n+x-1])&r.hash_mask,r.prev[n&r.w_mask]=r.head[r.ins_h],r.head[r.ins_h]=n,n++,--i;);r.strstart=n,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,e.next_in=o,e.input=h,e.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(e,t,r){"use strict";t.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(e,t,r){"use strict";t.exports=function(e,t){var r,n,i,s,a,o,h,u,l,f,c,d,p,m,_,g,b,v,y,w,k,x,S,z,C;r=e.state,n=e.next_in,z=e.input,i=n+(e.avail_in-5),s=e.next_out,C=e.output,a=s-(t-e.avail_out),o=s+(e.avail_out-257),h=r.dmax,u=r.wsize,l=r.whave,f=r.wnext,c=r.window,d=r.hold,p=r.bits,m=r.lencode,_=r.distcode,g=(1<<r.lenbits)-1,b=(1<<r.distbits)-1;e:do{p<15&&(d+=z[n++]<<p,p+=8,d+=z[n++]<<p,p+=8),v=m[d&g];t:for(;;){if(d>>>=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)+(d&(1<<y)-1)];continue t}if(32&y){r.mode=12;break e}e.msg="invalid literal/length code",r.mode=30;break e}w=65535&v,(y&=15)&&(p<y&&(d+=z[n++]<<p,p+=8),w+=d&(1<<y)-1,d>>>=y,p-=y),p<15&&(d+=z[n++]<<p,p+=8,d+=z[n++]<<p,p+=8),v=_[d&b];r:for(;;){if(d>>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<<y)-1)];continue r}e.msg="invalid distance code",r.mode=30;break e}if(k=65535&v,p<(y&=15)&&(d+=z[n++]<<p,(p+=8)<y&&(d+=z[n++]<<p,p+=8)),h<(k+=d&(1<<y)-1)){e.msg="invalid distance too far back",r.mode=30;break e}if(d>>>=y,p-=y,(y=s-a)<k){if(l<(y=k-y)&&r.sane){e.msg="invalid distance too far back",r.mode=30;break e}if(S=c,(x=0)===f){if(x+=u-y,y<w){for(w-=y;C[s++]=c[x++],--y;);x=s-k,S=C}}else if(f<y){if(x+=u+f-y,(y-=f)<w){for(w-=y;C[s++]=c[x++],--y;);if(x=0,f<w){for(w-=y=f;C[s++]=c[x++],--y;);x=s-k,S=C}}}else if(x+=f-y,y<w){for(w-=y;C[s++]=c[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(n<i&&s<o);n-=w=p>>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n<i?i-n+5:5-(n-i),e.avail_out=s<o?o-s+257:257-(s-o),r.hold=d,r.bits=p}},{}],49:[function(e,t,r){"use strict";var I=e("../utils/common"),O=e("./adler32"),B=e("./crc32"),R=e("./inffast"),T=e("./inftrees"),D=1,F=2,N=0,U=-2,P=1,n=852,i=592;function L(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<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(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15<t)?U:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=r,n.wbits=t,o(e))):U}function u(e,t){var r,n;return e?(n=new s,(e.state=n).window=null,(r=h(e,t))!==N&&(e.state=null),r):U}var l,f,c=!0;function j(e){if(c){var t;for(l=new I.Buf32(512),f=new I.Buf32(32),t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(T(D,e.lens,0,288,l,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;T(F,e.lens,0,32,f,0,e.work,{bits:5}),c=!1}e.lencode=l,e.lenbits=9,e.distcode=f,e.distbits=5}function Z(e,t,r,n){var i,s=e.state;return null===s.window&&(s.wsize=1<<s.wbits,s.wnext=0,s.whave=0,s.window=new I.Buf8(s.wsize)),n>=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave<s.wsize&&(s.whave+=i))),0}r.inflateReset=o,r.inflateReset2=h,r.inflateResetKeep=a,r.inflateInit=function(e){return u(e,15)},r.inflateInit2=u,r.inflate=function(e,t){var r,n,i,s,a,o,h,u,l,f,c,d,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(!e||!e.state||!e.output||!e.input&&0!==e.avail_in)return U;12===(r=e.state).mode&&(r.mode=13),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,u=r.hold,l=r.bits,f=o,c=h,x=N;e:for(;;)switch(r.mode){case P:if(0===r.wrap){r.mode=13;break}for(;l<16;){if(0===o)break e;o--,u+=n[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){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.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){e.msg="invalid window size",r.mode=30;break}r.dmax=1<<k,e.adler=r.check=1,r.mode=512&u?10:12,l=u=0;break;case 2:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}if(r.flags=u,8!=(255&r.flags)){e.msg="unknown compression method",r.mode=30;break}if(57344&r.flags){e.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 e;o--,u+=n[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 e;o--,u+=n[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 e;o--,u+=n[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<(d=r.length)&&(d=o),d&&(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,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d<o;);if(512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,k)break e}else r.head&&(r.head.name=null);r.length=0,r.mode=8;case 8:if(4096&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.comment+=String.fromCharCode(k)),k&&d<o;);if(512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,k)break e}else r.head&&(r.head.comment=null);r.mode=9;case 9:if(512&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}if(u!==(65535&r.check)){e.msg="header crc mismatch",r.mode=30;break}l=u=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}e.adler=r.check=L(u),l=u=0,r.mode=11;case 11:if(0===r.havedict)return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,2;e.adler=r.check=1,r.mode=12;case 12:if(5===t||6===t)break e;case 13:if(r.last){u>>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[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!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.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 e;o--,u+=n[s++]<<l,l+=8}if((65535&u)!=(u>>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o<d&&(d=o),h<d&&(d=h),0===d)break e;I.arraySet(i,n,s,d,a),o-=d,s+=d,h-=d,a+=d,r.length-=d;break}r.mode=12;break;case 17:for(;l<14;){if(0===o)break e;o--,u+=n[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){e.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 e;o--,u+=n[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){e.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 e;o--,u+=n[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 e;o--,u+=n[s++]<<l,l+=8}if(u>>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l<z;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}l-=_,k=0,d=3+(7&(u>>>=_)),u>>>=3,l-=3}else{for(z=_+7;l<z;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}l-=_,k=0,d=11+(127&(u>>>=_)),u>>>=7,l-=7}if(r.have+d>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=30;break}for(;d--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){e.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){e.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){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=h){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,R(e,c),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.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 e;o--,u+=n[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 e;o--,u+=n[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){e.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 e;o--,u+=n[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 e;o--,u+=n[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 e;o--,u+=n[s++]<<l,l+=8}u>>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){e.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 e;o--,u+=n[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){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break e;if(d=c-h,r.offset>d){if((d=r.offset-d)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=30;break}p=d>r.wnext?(d-=r.wnext,r.wsize-d):r.wnext-d,d>r.length&&(d=r.length),m=r.window}else m=i,p=a-r.offset,d=r.length;for(h<d&&(d=h),h-=d,r.length-=d;i[a++]=m[p++],--d;);0===r.length&&(r.mode=21);break;case 26:if(0===h)break e;i[a++]=r.length,h--,r.mode=21;break;case 27:if(r.wrap){for(;l<32;){if(0===o)break e;o--,u|=n[s++]<<l,l+=8}if(c-=h,e.total_out+=c,r.total+=c,c&&(e.adler=r.check=r.flags?B(r.check,i,c,a-c):O(r.check,i,c,a-c)),c=h,(r.flags?u:L(u))!==r.check){e.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 e;o--,u+=n[s++]<<l,l+=8}if(u!==(4294967295&r.total)){e.msg="incorrect length check",r.mode=30;break}l=u=0}r.mode=29;case 29:x=1;break e;case 30:x=-3;break e;case 31:return-4;case 32:default:return U}return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,(r.wsize||c!==e.avail_out&&r.mode<30&&(r.mode<27||4!==t))&&Z(e,e.output,e.next_out,c-e.avail_out)?(r.mode=31,-4):(f-=e.avail_in,c-=e.avail_out,e.total_in+=f,e.total_out+=c,r.total+=c,r.wrap&&c&&(e.adler=r.check=r.flags?B(r.check,i,c,e.next_out-c):O(r.check,i,c,e.next_out-c)),e.data_type=r.bits+(r.last?64:0)+(12===r.mode?128:0)+(20===r.mode||15===r.mode?256:0),(0==f&&0===c||4===t)&&x===N&&(x=-5),x)},r.inflateEnd=function(e){if(!e||!e.state)return U;var t=e.state;return t.window&&(t.window=null),e.state=null,N},r.inflateGetHeader=function(e,t){var r;return e&&e.state?0==(2&(r=e.state).wrap)?U:((r.head=t).done=!1,N):U},r.inflateSetDictionary=function(e,t){var r,n=t.length;return e&&e.state?0!==(r=e.state).wrap&&11!==r.mode?U:11===r.mode&&O(1,t,n,0)!==r.check?-3:Z(e,t,n,n)?(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(e,t,r){"use strict";var D=e("../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];t.exports=function(e,t,r,n,i,s,a,o){var h,u,l,f,c,d,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<n;v++)O[t[r+v]]++;for(k=g,w=15;1<=w&&0===O[w];w--);if(w<k&&(k=w),0===w)return i[s++]=20971520,i[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===e||1!==w))return-1;for(B[1]=0,b=1;b<15;b++)B[b+1]=B[b]+O[b];for(v=0;v<n;v++)0!==t[r+v]&&(a[B[t[r+v]]++]=v);if(d=0===e?(A=R=a,19):1===e?(A=F,I-=257,R=N,T-=257,256):(A=U,R=P,-1),b=y,c=s,S=v=E=0,l=-1,f=(C=1<<(x=k))-1,1===e&&852<C||2===e&&592<C)return 1;for(;;){for(p=b-S,_=a[v]<d?(m=0,a[v]):a[v]>d?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<<b-S,y=u=1<<x;i[c+(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=t[r+a[v]]}if(k<b&&(E&f)!==l){for(0===S&&(S=k),c+=y,z=1<<(x=b-S);x+S<w&&!((z-=O[x+S])<=0);)x++,z<<=1;if(C+=1<<x,1===e&&852<C||2===e&&592<C)return 1;i[l=E&f]=k<<24|x<<16|c-s|0}}return 0!==E&&(i[c+E]=b-S<<24|64<<16|0),o.bits=k,0}},{"../utils/common":41}],51:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";var i=e("../utils/common"),o=0,h=1;function n(e){for(var t=e.length;0<=--t;)e[t]=0}var s=0,a=29,u=256,l=u+1+a,f=30,c=19,_=2*l+1,g=15,d=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));n(z);var C=new Array(2*f);n(C);var E=new Array(512);n(E);var A=new Array(256);n(A);var I=new Array(a);n(I);var O,B,R,T=new Array(f);function D(e,t,r,n,i){this.static_tree=e,this.extra_bits=t,this.extra_base=r,this.elems=n,this.max_length=i,this.has_stree=e&&e.length}function F(e,t){this.dyn_tree=e,this.max_code=0,this.stat_desc=t}function N(e){return e<256?E[e]:E[256+(e>>>7)]}function U(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function P(e,t,r){e.bi_valid>d-r?(e.bi_buf|=t<<e.bi_valid&65535,U(e,e.bi_buf),e.bi_buf=t>>d-e.bi_valid,e.bi_valid+=r-d):(e.bi_buf|=t<<e.bi_valid&65535,e.bi_valid+=r)}function L(e,t,r){P(e,r[2*t],r[2*t+1])}function j(e,t){for(var r=0;r|=1&e,e>>>=1,r<<=1,0<--t;);return r>>>1}function Z(e,t,r){var n,i,s=new Array(g+1),a=0;for(n=1;n<=g;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=j(s[o]++,o))}}function W(e){var t;for(t=0;t<l;t++)e.dyn_ltree[2*t]=0;for(t=0;t<f;t++)e.dyn_dtree[2*t]=0;for(t=0;t<c;t++)e.bl_tree[2*t]=0;e.dyn_ltree[2*m]=1,e.opt_len=e.static_len=0,e.last_lit=e.matches=0}function M(e){8<e.bi_valid?U(e,e.bi_buf):0<e.bi_valid&&(e.pending_buf[e.pending++]=e.bi_buf),e.bi_buf=0,e.bi_valid=0}function H(e,t,r,n){var i=2*t,s=2*r;return e[i]<e[s]||e[i]===e[s]&&n[t]<=n[r]}function G(e,t,r){for(var n=e.heap[r],i=r<<1;i<=e.heap_len&&(i<e.heap_len&&H(t,e.heap[i+1],e.heap[i],e.depth)&&i++,!H(t,n,e.heap[i],e.depth));)e.heap[r]=e.heap[i],r=i,i<<=1;e.heap[r]=n}function K(e,t,r){var n,i,s,a,o=0;if(0!==e.last_lit)for(;n=e.pending_buf[e.d_buf+2*o]<<8|e.pending_buf[e.d_buf+2*o+1],i=e.pending_buf[e.l_buf+o],o++,0===n?L(e,i,t):(L(e,(s=A[i])+u+1,t),0!==(a=w[s])&&P(e,i-=I[s],a),L(e,s=N(--n),r),0!==(a=k[s])&&P(e,n-=T[s],a)),o<e.last_lit;);L(e,m,t)}function Y(e,t){var r,n,i,s=t.dyn_tree,a=t.stat_desc.static_tree,o=t.stat_desc.has_stree,h=t.stat_desc.elems,u=-1;for(e.heap_len=0,e.heap_max=_,r=0;r<h;r++)0!==s[2*r]?(e.heap[++e.heap_len]=u=r,e.depth[r]=0):s[2*r+1]=0;for(;e.heap_len<2;)s[2*(i=e.heap[++e.heap_len]=u<2?++u:0)]=1,e.depth[i]=0,e.opt_len--,o&&(e.static_len-=a[2*i+1]);for(t.max_code=u,r=e.heap_len>>1;1<=r;r--)G(e,s,r);for(i=h;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],G(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,G(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,h=t.dyn_tree,u=t.max_code,l=t.stat_desc.static_tree,f=t.stat_desc.has_stree,c=t.stat_desc.extra_bits,d=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=g;s++)e.bl_count[s]=0;for(h[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<_;r++)p<(s=h[2*h[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),h[2*n+1]=s,u<n||(e.bl_count[s]++,a=0,d<=n&&(a=c[n-d]),o=h[2*n],e.opt_len+=o*(s+a),f&&(e.static_len+=o*(l[2*n+1]+a)));if(0!==m){do{for(s=p-1;0===e.bl_count[s];)s--;e.bl_count[s]--,e.bl_count[s+1]+=2,e.bl_count[p]--,m-=2}while(0<m);for(s=p;0!==s;s--)for(n=e.bl_count[s];0!==n;)u<(i=e.heap[--r])||(h[2*i+1]!==s&&(e.opt_len+=(s-h[2*i+1])*h[2*i],h[2*i+1]=s),n--)}}(e,t),Z(s,u,e.bl_count)}function X(e,t,r){var n,i,s=-1,a=t[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),t[2*(r+1)+1]=65535,n=0;n<=r;n++)i=a,a=t[2*(n+1)+1],++o<h&&i===a||(o<u?e.bl_tree[2*i]+=o:0!==i?(i!==s&&e.bl_tree[2*i]++,e.bl_tree[2*b]++):o<=10?e.bl_tree[2*v]++:e.bl_tree[2*y]++,s=i,u=(o=0)===a?(h=138,3):i===a?(h=6,3):(h=7,4))}function V(e,t,r){var n,i,s=-1,a=t[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),n=0;n<=r;n++)if(i=a,a=t[2*(n+1)+1],!(++o<h&&i===a)){if(o<u)for(;L(e,i,e.bl_tree),0!=--o;);else 0!==i?(i!==s&&(L(e,i,e.bl_tree),o--),L(e,b,e.bl_tree),P(e,o-3,2)):o<=10?(L(e,v,e.bl_tree),P(e,o-3,3)):(L(e,y,e.bl_tree),P(e,o-11,7));s=i,u=(o=0)===a?(h=138,3):i===a?(h=6,3):(h=7,4)}}n(T);var q=!1;function J(e,t,r,n){P(e,(s<<1)+(n?1:0),3),function(e,t,r,n){M(e),n&&(U(e,r),U(e,~r)),i.arraySet(e.pending_buf,e.window,t,r,e.pending),e.pending+=r}(e,t,r,!0)}r._tr_init=function(e){q||(function(){var e,t,r,n,i,s=new Array(g+1);for(n=r=0;n<a-1;n++)for(I[n]=r,e=0;e<1<<w[n];e++)A[r++]=n;for(A[r-1]=n,n=i=0;n<16;n++)for(T[n]=i,e=0;e<1<<k[n];e++)E[i++]=n;for(i>>=7;n<f;n++)for(T[n]=i<<7,e=0;e<1<<k[n]-7;e++)E[256+i++]=n;for(t=0;t<=g;t++)s[t]=0;for(e=0;e<=143;)z[2*e+1]=8,e++,s[8]++;for(;e<=255;)z[2*e+1]=9,e++,s[9]++;for(;e<=279;)z[2*e+1]=7,e++,s[7]++;for(;e<=287;)z[2*e+1]=8,e++,s[8]++;for(Z(z,l+1,s),e=0;e<f;e++)C[2*e+1]=5,C[2*e]=j(e,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,c,p)}(),q=!0),e.l_desc=new F(e.dyn_ltree,O),e.d_desc=new F(e.dyn_dtree,B),e.bl_desc=new F(e.bl_tree,R),e.bi_buf=0,e.bi_valid=0,W(e)},r._tr_stored_block=J,r._tr_flush_block=function(e,t,r,n){var i,s,a=0;0<e.level?(2===e.strm.data_type&&(e.strm.data_type=function(e){var t,r=4093624447;for(t=0;t<=31;t++,r>>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return o;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return h;for(t=32;t<u;t++)if(0!==e.dyn_ltree[2*t])return h;return o}(e)),Y(e,e.l_desc),Y(e,e.d_desc),a=function(e){var t;for(X(e,e.dyn_ltree,e.l_desc.max_code),X(e,e.dyn_dtree,e.d_desc.max_code),Y(e,e.bl_desc),t=c-1;3<=t&&0===e.bl_tree[2*S[t]+1];t--);return e.opt_len+=3*(t+1)+5+5+4,t}(e),i=e.opt_len+3+7>>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?J(e,t,r,n):4===e.strategy||s===i?(P(e,2+(n?1:0),3),K(e,z,C)):(P(e,4+(n?1:0),3),function(e,t,r,n){var i;for(P(e,t-257,5),P(e,r-1,5),P(e,n-4,4),i=0;i<n;i++)P(e,e.bl_tree[2*S[i]+1],3);V(e,e.dyn_ltree,t-1),V(e,e.dyn_dtree,r-1)}(e,e.l_desc.max_code+1,e.d_desc.max_code+1,a+1),K(e,e.dyn_ltree,e.dyn_dtree)),W(e),n&&M(e)},r._tr_tally=function(e,t,r){return e.pending_buf[e.d_buf+2*e.last_lit]=t>>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(A[r]+u+1)]++,e.dyn_dtree[2*N(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){P(e,2,3),L(e,m,z),function(e){16===e.bi_valid?(U(e,e.bi_buf),e.bi_buf=0,e.bi_valid=0):8<=e.bi_valid&&(e.pending_buf[e.pending++]=255&e.bi_buf,e.bi_buf>>=8,e.bi_valid-=8)}(e)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.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(e,t,r){(function(e){!function(r,n){"use strict";if(!r.setImmediate){var i,s,t,a,o=1,h={},u=!1,l=r.document,e=Object.getPrototypeOf&&Object.getPrototypeOf(r);e=e&&e.setTimeout?e:r,i="[object process]"==={}.toString.call(r.process)?function(e){process.nextTick(function(){c(e)})}:function(){if(r.postMessage&&!r.importScripts){var e=!0,t=r.onmessage;return r.onmessage=function(){e=!1},r.postMessage("","*"),r.onmessage=t,e}}()?(a="setImmediate$"+Math.random()+"$",r.addEventListener?r.addEventListener("message",d,!1):r.attachEvent("onmessage",d),function(e){r.postMessage(a+e,"*")}):r.MessageChannel?((t=new MessageChannel).port1.onmessage=function(e){c(e.data)},function(e){t.port2.postMessage(e)}):l&&"onreadystatechange"in l.createElement("script")?(s=l.documentElement,function(e){var t=l.createElement("script");t.onreadystatechange=function(){c(e),t.onreadystatechange=null,s.removeChild(t),t=null},s.appendChild(t)}):function(e){setTimeout(c,0,e)},e.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),r=0;r<t.length;r++)t[r]=arguments[r+1];var n={callback:e,args:t};return h[o]=n,i(o),o++},e.clearImmediate=f}function f(e){delete h[e]}function c(e){if(u)setTimeout(c,0,e);else{var t=h[e];if(t){u=!0;try{!function(e){var t=e.callback,r=e.args;switch(r.length){case 0:t();break;case 1:t(r[0]);break;case 2:t(r[0],r[1]);break;case 3:t(r[0],r[1],r[2]);break;default:t.apply(n,r)}}(t)}finally{f(e),u=!1}}}}function d(e){e.source===r&&"string"==typeof e.data&&0===e.data.indexOf(a)&&c(+e.data.slice(a.length))}}("undefined"==typeof self?void 0===e?this:e:self)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}]},{},[10])(10)});
\ No newline at end of file

From 74efa52f26dd7d329144a14c1327879c2f864a73 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Sun, 25 Dec 2022 18:48:26 +0100
Subject: [PATCH 366/412] Update lxml, pypdf2 requirement

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0c20c71d6..9032c1274 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,14 +7,14 @@ Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
 Flask>=1.0.2,<2.1.0
 iso-639>=0.4.5,<0.5.0
-PyPDF2>=1.20,<2.11.0
+PyPDF2>=1.20,<3.1.0
 pytz>=2016.10
 requests>=2.11.1,<2.28.0
 SQLAlchemy>=1.3.0,<1.5.0
 tornado>=4.1,<6.2
 Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.4.0
-lxml>=3.8.0,<4.9.0
+lxml>=3.8.0,<5.0.0
 flask-wtf>=0.14.2,<1.1.0
 chardet>=3.0.0,<4.1.0
 advocate>=1.0.0,<1.1.0

From 148922864957dad4427a427b6d363342431a1450 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Sun, 25 Dec 2022 19:06:35 +0100
Subject: [PATCH 367/412] Bugfix for testability

---
 cps/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 7de74c358..ad7be7439 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -30,7 +30,7 @@
       <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
   </head>
-  <body class="{{ page }} {{ bodyClass }} {% if g.current_theme == 1 %} blur {% endif %}" data-text="{{_('Home')}}" data-textback="{{_('Back')}}">
+  <body class="{{ page }} {{ bodyClass }}{% if g.current_theme == 1 %} blur{% endif %}" data-text="{{_('Home')}}" data-textback="{{_('Back')}}">
     <!-- Static navbar -->
     <div class="navbar navbar-default navbar-static-top" role="navigation">
       <div class="container-fluid">

From 6c1631acba6ae8f918fa9433e37d499241da659c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Mon, 26 Dec 2022 15:47:04 +0100
Subject: [PATCH 368/412] Updated requirements

---
 cps/templates/layout.html | 7 -------
 requirements.txt          | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index ad7be7439..fc32bcd88 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -11,7 +11,6 @@
     {% if g.google_site_verification|length > 0 %}
       <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}
-
     <!-- Bootstrap -->
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
     <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
@@ -23,12 +22,6 @@
        <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:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-    <![endif]-->
   </head>
   <body class="{{ page }} {{ bodyClass }}{% if g.current_theme == 1 %} blur{% endif %}" data-text="{{_('Home')}}" data-textback="{{_('Back')}}">
     <!-- Static navbar -->
diff --git a/requirements.txt b/requirements.txt
index 9032c1274..494866a8c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,10 +2,10 @@ APScheduler>=3.6.3,<3.10.0
 werkzeug<2.1.0
 Babel>=1.3,<3.0
 Flask-Babel>=0.11.1,<2.1.0
-Flask-Login>=0.3.2,<0.6.2
+Flask-Login>=0.3.2,<0.6.3
 Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
-Flask>=1.0.2,<2.1.0
+Flask>=1.0.2,<2.2.0
 iso-639>=0.4.5,<0.5.0
 PyPDF2>=1.20,<3.1.0
 pytz>=2016.10

From 4977381b1c31c1c3b6a1513db462841a195ba75f Mon Sep 17 00:00:00 2001
From: Jeroen Kroese <jeroen@picca.app>
Date: Mon, 26 Dec 2022 16:19:19 +0100
Subject: [PATCH 369/412] Fix 'Kobo eReader.conf' path

---
 cps/translations/cs/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/de/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/el/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/es/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/fr/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/gl/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/id/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/it/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/ja/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/ko/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/nl/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/pl/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/pt_BR/LC_MESSAGES/messages.po      | 2 +-
 cps/translations/sv/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/vi/LC_MESSAGES/messages.po         | 2 +-
 cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po | 2 +-
 cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 038d7a3b4..6a5a5bbcc 100644
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@@ -2607,7 +2607,7 @@ msgstr "Další"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/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):"
+msgstr "Otevřte soubor .kobo/Kobo/Kobo eReader.conf v textovém editoru a vložte (nebo upravte):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 #, fuzzy
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 9f293e5db..83a548465 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -2582,7 +2582,7 @@ msgstr "Nächste"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "Öffne die .kobo/Kobo eReader.conf Datei in einem Texteditor und füge hinzu (oder ersetze):"
+msgstr "Öffne die .kobo/Kobo/Kobo eReader.conf Datei in einem Texteditor und füge hinzu (oder ersetze):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 8769b4cd1..133a03d18 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -2607,7 +2607,7 @@ msgstr "Επόμενο"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "ʼΑνοιξε το .kobo/Kobo eReader.conf αρχείο σε πρόγραμμα επεξεργασίας κειμένου και πρόσθεσε (ή κάνε επεξεργασία):"
+msgstr "ʼΑνοιξε το .kobo/Kobo/Kobo eReader.conf αρχείο σε πρόγραμμα επεξεργασίας κειμένου και πρόσθεσε (ή κάνε επεξεργασία):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 #, fuzzy
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 243c12eb0..331ff436b 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -2611,7 +2611,7 @@ msgstr "Siguiente"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/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):"
+msgstr "Abre el archivo .kobo/Kobo/Kobo eReader.conf en un editor de texto y añade (o edita):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 #, fuzzy
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 4b4755a01..026ed0c0b 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -2623,7 +2623,7 @@ msgstr "Suivant"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/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):"
+msgstr "Ouvrir le fichier .kobo/Kobo/Kobo eReader.conf dans un éditeur de texte et ajouter (ou éditer):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 #, fuzzy
diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po
index 228e54679..e048c85fa 100644
--- a/cps/translations/gl/LC_MESSAGES/messages.po
+++ b/cps/translations/gl/LC_MESSAGES/messages.po
@@ -2580,7 +2580,7 @@ msgstr "Seguinte"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "Abre o arquivo .kobo/Kobo eReader.conf nun editor de texto e engade (ou edita):"
+msgstr "Abre o arquivo .kobo/Kobo/Kobo eReader.conf nun editor de texto e engade (ou edita):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
diff --git a/cps/translations/id/LC_MESSAGES/messages.po b/cps/translations/id/LC_MESSAGES/messages.po
index d9d5a066b..efbb1c52f 100644
--- a/cps/translations/id/LC_MESSAGES/messages.po
+++ b/cps/translations/id/LC_MESSAGES/messages.po
@@ -2583,7 +2583,7 @@ msgstr "Selanjutnya"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "Buka file .kobo/Kobo eReader.conf di editor teks dan tambahkan (atau edit):"
+msgstr "Buka file .kobo/Kobo/Kobo eReader.conf di editor teks dan tambahkan (atau edit):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 5ce6a4dd6..1add5b1ae 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -2578,7 +2578,7 @@ msgstr "Prossimo"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/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):"
+msgstr "Apri il file .kobo/Kobo/Kobo eReader.conf in un editore di testi e aggiungi (o edita):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 982b5c8b9..75808b2f5 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -2583,7 +2583,7 @@ msgstr "次"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr ".kobo/Kobo eReader.confファイルをテキストエディタで開いて追加(編集)してください:"
+msgstr ".kobo/Kobo/Kobo eReader.confファイルをテキストエディタで開いて追加(編集)してください:"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 098ca6b93..268870aa5 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -2586,7 +2586,7 @@ msgstr "다음"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "텍스트 편집기에서 .kobo/Kobo eReader.conf 파일을 열고 다음을 추가(또는 편집):"
+msgstr "텍스트 편집기에서 .kobo/Kobo/Kobo eReader.conf 파일을 열고 다음을 추가(또는 편집):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 #, fuzzy
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 97de5b2ef..6e63f4c89 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -2608,7 +2608,7 @@ msgstr "Volgende"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/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):"
+msgstr "Open het .kobo/Kobo/Kobo eReader.conf bestand in een teksteditor en voeg toe (of bewerk):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 #, fuzzy
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index d6d1a3df3..8dc08d13f 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -2620,7 +2620,7 @@ msgstr "Następne"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/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):"
+msgstr "Otwórz plik .kobo/Kobo/Kobo eReader.conf w edytorze tekstu i dodaj (lub edytuj):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 #, fuzzy
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 219a6fcf8..c1e4deb68 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -2580,7 +2580,7 @@ msgstr "Próximo"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "Abra o arquivo .kobo/Kobo eReader.conf em um editor de texto e adicione (ou edite):"
+msgstr "Abra o arquivo .kobo/Kobo/Kobo eReader.conf em um editor de texto e adicione (ou edite):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index c9bdbd679..7871d4dfe 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -2606,7 +2606,7 @@ msgstr "Nästa"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/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):"
+msgstr "Öppna filen .kobo/Kobo/Kobo eReader.conf i en textredigerare och lägg till (eller redigera):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 #, fuzzy
diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po
index fd9aed636..846bdca1b 100644
--- a/cps/translations/vi/LC_MESSAGES/messages.po
+++ b/cps/translations/vi/LC_MESSAGES/messages.po
@@ -3373,6 +3373,6 @@ msgstr "Hiển thị đã đọc và chưa đọc"
 msgid "Show random books"
 msgstr "Hiển thị sách ngẫu nhiên"
 
-#~ msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+#~ msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 #~ msgstr ""
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index bd00954c7..ec4238a03 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -2579,7 +2579,7 @@ msgstr "下一个"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "在文本编辑器中打开 .kobo/Kobo eReader.conf，添加（或编辑）:"
+msgstr "在文本编辑器中打开 .kobo/Kobo/Kobo eReader.conf，添加（或编辑）:"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 19e08780b..8b5a98f7a 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
@@ -2594,7 +2594,7 @@ msgstr "下一個"
 #: cps/templates/generate_kobo_auth_url.html:6
 #, fuzzy
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "在文本編輯器中打開.kobo/Kobo eReader.conf，添加（或編輯）:"
+msgstr "在文本編輯器中打開.kobo/Kobo/Kobo eReader.conf，添加（或編輯）:"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 #, fuzzy

From 4629eec774d94665acc8a15db56db1f34b7259c7 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 27 Dec 2022 00:18:56 +0100
Subject: [PATCH 370/412] Bump sortable.js

---
 cps/static/js/libs/Sortable.min.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/static/js/libs/Sortable.min.js b/cps/static/js/libs/Sortable.min.js
index 4fe7f0c36..17bb16c73 100644
--- a/cps/static/js/libs/Sortable.min.js
+++ b/cps/static/js/libs/Sortable.min.js
@@ -1,2 +1,2 @@
-/*! Sortable 1.13.0 - MIT | git://github.com/SortableJS/Sortable.git */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function o(t){return(o="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 a(){return(a=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t[o]=n[o])}return t}).apply(this,arguments)}function I(i){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{},e=Object.keys(r);"function"==typeof Object.getOwnPropertySymbols&&(e=e.concat(Object.getOwnPropertySymbols(r).filter(function(t){return Object.getOwnPropertyDescriptor(r,t).enumerable}))),e.forEach(function(t){var e,n,o;e=i,o=r[n=t],n in e?Object.defineProperty(e,n,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[n]=o})}return i}function l(t,e){if(null==t)return{};var n,o,i=function(t,e){if(null==t)return{};var n,o,i={},r=Object.keys(t);for(o=0;o<r.length;o++)n=r[o],0<=e.indexOf(n)||(i[n]=t[n]);return i}(t,e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);for(o=0;o<r.length;o++)n=r[o],0<=e.indexOf(n)||Object.prototype.propertyIsEnumerable.call(t,n)&&(i[n]=t[n])}return i}function e(t){return function(t){if(Array.isArray(t)){for(var e=0,n=new Array(t.length);e<t.length;e++)n[e]=t[e];return n}}(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")}()}function t(t){if("undefined"!=typeof window&&window.navigator)return!!navigator.userAgent.match(t)}var w=t(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i),E=t(/Edge/i),c=t(/firefox/i),u=t(/safari/i)&&!t(/chrome/i)&&!t(/android/i),n=t(/iP(ad|od|hone)/i),i=t(/chrome/i)&&t(/android/i),r={capture:!1,passive:!1};function d(t,e,n){t.addEventListener(e,n,!w&&r)}function s(t,e,n){t.removeEventListener(e,n,!w&&r)}function h(t,e){if(e){if(">"===e[0]&&(e=e.substring(1)),t)try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return!1}return!1}}function P(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"===e[0]?t.parentNode===n&&h(t,e):h(t,e))||o&&t===n)return t;if(t===n)break}while(t=(i=t).host&&i!==document&&i.host.nodeType?i.host:i.parentNode)}var i;return null}var f,p=/\s+/g;function k(t,e,n){if(t&&e)if(t.classList)t.classList[n?"add":"remove"](e);else{var o=(" "+t.className+" ").replace(p," ").replace(" "+e+" "," ");t.className=(o+(n?" "+e:"")).replace(p," ")}}function R(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];e in o||-1!==e.indexOf("webkit")||(e="-webkit-"+e),o[e]=n+("string"==typeof n?"":"px")}}function v(t,e){var n="";if("string"==typeof t)n=t;else do{var o=R(t,"transform");o&&"none"!==o&&(n=o+" "+n)}while(!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function g(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i<r;i++)n(o[i],i);return o}return[]}function A(){var t=document.scrollingElement;return t||document.documentElement}function X(t,e,n,o,i){if(t.getBoundingClientRect||t===window){var r,a,l,s,c,u,d;if(d=t!==window&&t.parentNode&&t!==A()?(a=(r=t.getBoundingClientRect()).top,l=r.left,s=r.bottom,c=r.right,u=r.height,r.width):(l=a=0,s=window.innerHeight,c=window.innerWidth,u=window.innerHeight,window.innerWidth),(e||n)&&t!==window&&(i=i||t.parentNode,!w))do{if(i&&i.getBoundingClientRect&&("none"!==R(i,"transform")||n&&"static"!==R(i,"position"))){var h=i.getBoundingClientRect();a-=h.top+parseInt(R(i,"border-top-width")),l-=h.left+parseInt(R(i,"border-left-width")),s=a+r.height,c=l+r.width;break}}while(i=i.parentNode);if(o&&t!==window){var f=v(i||t),p=f&&f.a,g=f&&f.d;f&&(s=(a/=g)+(u/=g),c=(l/=p)+(d/=p))}return{top:a,left:l,bottom:s,right:c,width:d,height:u}}}function Y(t,e,n){for(var o=H(t,!0),i=X(t)[e];o;){var r=X(o)[n];if(!("top"===n||"left"===n?r<=i:i<=r))return o;if(o===A())break;o=H(o,!1)}return!1}function m(t,e,n){for(var o=0,i=0,r=t.children;i<r.length;){if("none"!==r[i].style.display&&r[i]!==Rt.ghost&&r[i]!==Rt.dragged&&P(r[i],n.draggable,t,!1)){if(o===e)return r[i];o++}i++}return null}function B(t,e){for(var n=t.lastElementChild;n&&(n===Rt.ghost||"none"===R(n,"display")||e&&!h(n,e));)n=n.previousElementSibling;return n||null}function F(t,e){var n=0;if(!t||!t.parentNode)return-1;for(;t=t.previousElementSibling;)"TEMPLATE"===t.nodeName.toUpperCase()||t===Rt.clone||e&&!h(t,e)||n++;return n}function b(t){var e=0,n=0,o=A();if(t)do{var i=v(t),r=i.a,a=i.d;e+=t.scrollLeft*r,n+=t.scrollTop*a}while(t!==o&&(t=t.parentNode));return[e,n]}function H(t,e){if(!t||!t.getBoundingClientRect)return A();var n=t,o=!1;do{if(n.clientWidth<n.scrollWidth||n.clientHeight<n.scrollHeight){var i=R(n);if(n.clientWidth<n.scrollWidth&&("auto"==i.overflowX||"scroll"==i.overflowX)||n.clientHeight<n.scrollHeight&&("auto"==i.overflowY||"scroll"==i.overflowY)){if(!n.getBoundingClientRect||n===document.body)return A();if(o||e)return n;o=!0}}}while(n=n.parentNode);return A()}function y(t,e){return Math.round(t.top)===Math.round(e.top)&&Math.round(t.left)===Math.round(e.left)&&Math.round(t.height)===Math.round(e.height)&&Math.round(t.width)===Math.round(e.width)}function D(e,n){return function(){if(!f){var t=arguments;1===t.length?e.call(this,t[0]):e.apply(this,t),f=setTimeout(function(){f=void 0},n)}}}function L(t,e,n){t.scrollLeft+=e,t.scrollTop+=n}function S(t){var e=window.Polymer,n=window.jQuery||window.Zepto;return e&&e.dom?e.dom(t).cloneNode(!0):n?n(t).clone(!0)[0]:t.cloneNode(!0)}function _(t,e){R(t,"position","absolute"),R(t,"top",e.top),R(t,"left",e.left),R(t,"width",e.width),R(t,"height",e.height)}function C(t){R(t,"position",""),R(t,"top",""),R(t,"left",""),R(t,"width",""),R(t,"height","")}var j="Sortable"+(new Date).getTime();function T(){var e,o=[];return{captureAnimationState:function(){o=[],this.options.animation&&[].slice.call(this.el.children).forEach(function(t){if("none"!==R(t,"display")&&t!==Rt.ghost){o.push({target:t,rect:X(t)});var e=I({},o[o.length-1].rect);if(t.thisAnimationDuration){var n=v(t,!0);n&&(e.top-=n.f,e.left-=n.e)}t.fromRect=e}})},addAnimationState:function(t){o.push(t)},removeAnimationState:function(t){o.splice(function(t,e){for(var n in t)if(t.hasOwnProperty(n))for(var o in e)if(e.hasOwnProperty(o)&&e[o]===t[n][o])return Number(n);return-1}(o,{target:t}),1)},animateAll:function(t){var c=this;if(!this.options.animation)return clearTimeout(e),void("function"==typeof t&&t());var u=!1,d=0;o.forEach(function(t){var e=0,n=t.target,o=n.fromRect,i=X(n),r=n.prevFromRect,a=n.prevToRect,l=t.rect,s=v(n,!0);s&&(i.top-=s.f,i.left-=s.e),n.toRect=i,n.thisAnimationDuration&&y(r,i)&&!y(o,i)&&(l.top-i.top)/(l.left-i.left)==(o.top-i.top)/(o.left-i.left)&&(e=function(t,e,n,o){return Math.sqrt(Math.pow(e.top-t.top,2)+Math.pow(e.left-t.left,2))/Math.sqrt(Math.pow(e.top-n.top,2)+Math.pow(e.left-n.left,2))*o.animation}(l,r,a,c.options)),y(i,o)||(n.prevFromRect=o,n.prevToRect=i,e||(e=c.options.animation),c.animate(n,l,i,e)),e&&(u=!0,d=Math.max(d,e),clearTimeout(n.animationResetTimer),n.animationResetTimer=setTimeout(function(){n.animationTime=0,n.prevFromRect=null,n.fromRect=null,n.prevToRect=null,n.thisAnimationDuration=null},e),n.thisAnimationDuration=e)}),clearTimeout(e),u?e=setTimeout(function(){"function"==typeof t&&t()},d):"function"==typeof t&&t(),o=[]},animate:function(t,e,n,o){if(o){R(t,"transition",""),R(t,"transform","");var i=v(this.el),r=i&&i.a,a=i&&i.d,l=(e.left-n.left)/(r||1),s=(e.top-n.top)/(a||1);t.animatingX=!!l,t.animatingY=!!s,R(t,"transform","translate3d("+l+"px,"+s+"px,0)"),this.forRepaintDummy=function(t){return t.offsetWidth}(t),R(t,"transition","transform "+o+"ms"+(this.options.easing?" "+this.options.easing:"")),R(t,"transform","translate3d(0,0,0)"),"number"==typeof t.animated&&clearTimeout(t.animated),t.animated=setTimeout(function(){R(t,"transition",""),R(t,"transform",""),t.animated=!1,t.animatingX=!1,t.animatingY=!1},o)}}}}var x=[],M={initializeByDefault:!0},O={mount:function(e){for(var t in M)!M.hasOwnProperty(t)||t in e||(e[t]=M[t]);x.forEach(function(t){if(t.pluginName===e.pluginName)throw"Sortable: Cannot mount plugin ".concat(e.pluginName," more than once")}),x.push(e)},pluginEvent:function(e,n,o){var t=this;this.eventCanceled=!1,o.cancel=function(){t.eventCanceled=!0};var i=e+"Global";x.forEach(function(t){n[t.pluginName]&&(n[t.pluginName][i]&&n[t.pluginName][i](I({sortable:n},o)),n.options[t.pluginName]&&n[t.pluginName][e]&&n[t.pluginName][e](I({sortable:n},o)))})},initializePlugins:function(o,i,r,t){for(var e in x.forEach(function(t){var e=t.pluginName;if(o.options[e]||t.initializeByDefault){var n=new t(o,i,o.options);n.sortable=o,n.options=o.options,o[e]=n,a(r,n.defaults)}}),o.options)if(o.options.hasOwnProperty(e)){var n=this.modifyOption(o,e,o.options[e]);void 0!==n&&(o.options[e]=n)}},getEventProperties:function(e,n){var o={};return x.forEach(function(t){"function"==typeof t.eventProperties&&a(o,t.eventProperties.call(n[t.pluginName],e))}),o},modifyOption:function(e,n,o){var i;return x.forEach(function(t){e[t.pluginName]&&t.optionListeners&&"function"==typeof t.optionListeners[n]&&(i=t.optionListeners[n].call(e[t.pluginName],o))}),i}};function N(t){var e=t.sortable,n=t.rootEl,o=t.name,i=t.targetEl,r=t.cloneEl,a=t.toEl,l=t.fromEl,s=t.oldIndex,c=t.newIndex,u=t.oldDraggableIndex,d=t.newDraggableIndex,h=t.originalEvent,f=t.putSortable,p=t.extraEventProperties;if(e=e||n&&n[j]){var g,v=e.options,m="on"+o.charAt(0).toUpperCase()+o.substr(1);!window.CustomEvent||w||E?(g=document.createEvent("Event")).initEvent(o,!0,!0):g=new CustomEvent(o,{bubbles:!0,cancelable:!0}),g.to=a||n,g.from=l||n,g.item=i||n,g.clone=r,g.oldIndex=s,g.newIndex=c,g.oldDraggableIndex=u,g.newDraggableIndex=d,g.originalEvent=h,g.pullMode=f?f.lastPutMode:void 0;var b=I({},p,O.getEventProperties(o,e));for(var y in b)g[y]=b[y];n&&n.dispatchEvent(g),v[m]&&v[m].call(e,g)}}function K(t,e,n){var o=2<arguments.length&&void 0!==n?n:{},i=o.evt,r=l(o,["evt"]);O.pluginEvent.bind(Rt)(t,e,I({dragEl:z,parentEl:G,ghostEl:U,rootEl:q,nextEl:V,lastDownEl:Z,cloneEl:Q,cloneHidden:$,dragStarted:dt,putSortable:it,activeSortable:Rt.active,originalEvent:i,oldIndex:J,oldDraggableIndex:et,newIndex:tt,newDraggableIndex:nt,hideGhostForTarget:At,unhideGhostForTarget:It,cloneNowHidden:function(){$=!0},cloneNowShown:function(){$=!1},dispatchSortableEvent:function(t){W({sortable:e,name:t,originalEvent:i})}},r))}function W(t){N(I({putSortable:it,cloneEl:Q,targetEl:z,rootEl:q,oldIndex:J,oldDraggableIndex:et,newIndex:tt,newDraggableIndex:nt},t))}var z,G,U,q,V,Z,Q,$,J,tt,et,nt,ot,it,rt,at,lt,st,ct,ut,dt,ht,ft,pt,gt,vt=!1,mt=!1,bt=[],yt=!1,wt=!1,Et=[],Dt=!1,St=[],_t="undefined"!=typeof document,Ct=n,Tt=E||w?"cssFloat":"float",xt=_t&&!i&&!n&&"draggable"in document.createElement("div"),Mt=function(){if(_t){if(w)return!1;var t=document.createElement("x");return t.style.cssText="pointer-events:auto","auto"===t.style.pointerEvents}}(),Ot=function(t,e){var n=R(t),o=parseInt(n.width)-parseInt(n.paddingLeft)-parseInt(n.paddingRight)-parseInt(n.borderLeftWidth)-parseInt(n.borderRightWidth),i=m(t,0,e),r=m(t,1,e),a=i&&R(i),l=r&&R(r),s=a&&parseInt(a.marginLeft)+parseInt(a.marginRight)+X(i).width,c=l&&parseInt(l.marginLeft)+parseInt(l.marginRight)+X(r).width;if("flex"===n.display)return"column"===n.flexDirection||"column-reverse"===n.flexDirection?"vertical":"horizontal";if("grid"===n.display)return n.gridTemplateColumns.split(" ").length<=1?"vertical":"horizontal";if(i&&a.float&&"none"!==a.float){var u="left"===a.float?"left":"right";return!r||"both"!==l.clear&&l.clear!==u?"horizontal":"vertical"}return i&&("block"===a.display||"flex"===a.display||"table"===a.display||"grid"===a.display||o<=s&&"none"===n[Tt]||r&&"none"===n[Tt]&&o<s+c)?"vertical":"horizontal"},Nt=function(t){function s(a,l){return function(t,e,n,o){var i=t.options.group.name&&e.options.group.name&&t.options.group.name===e.options.group.name;if(null==a&&(l||i))return!0;if(null==a||!1===a)return!1;if(l&&"clone"===a)return a;if("function"==typeof a)return s(a(t,e,n,o),l)(t,e,n,o);var r=(l?t:e).options.group.name;return!0===a||"string"==typeof a&&a===r||a.join&&-1<a.indexOf(r)}}var e={},n=t.group;n&&"object"==o(n)||(n={name:n}),e.name=n.name,e.checkPull=s(n.pull,!0),e.checkPut=s(n.put),e.revertClone=n.revertClone,t.group=e},At=function(){!Mt&&U&&R(U,"display","none")},It=function(){!Mt&&U&&R(U,"display","")};_t&&document.addEventListener("click",function(t){if(mt)return t.preventDefault(),t.stopPropagation&&t.stopPropagation(),t.stopImmediatePropagation&&t.stopImmediatePropagation(),mt=!1},!0);function Pt(t){if(z){var e=function(r,a){var l;return bt.some(function(t){if(!B(t)){var e=X(t),n=t[j].options.emptyInsertThreshold,o=r>=e.left-n&&r<=e.right+n,i=a>=e.top-n&&a<=e.bottom+n;return n&&o&&i?l=t:void 0}}),l}((t=t.touches?t.touches[0]:t).clientX,t.clientY);if(e){var n={};for(var o in t)t.hasOwnProperty(o)&&(n[o]=t[o]);n.target=n.rootEl=e,n.preventDefault=void 0,n.stopPropagation=void 0,e[j]._onDragOver(n)}}}function kt(t){z&&z.parentNode[j]._isOutsideThisEl(t.target)}function Rt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[j]=this;var n={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return Ot(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==Rt.supportPointer&&"PointerEvent"in window&&!u,emptyInsertThreshold:5};for(var o in O.initializePlugins(this,t,n),n)o in e||(e[o]=n[o]);for(var i in Nt(e),this)"_"===i.charAt(0)&&"function"==typeof this[i]&&(this[i]=this[i].bind(this));this.nativeDraggable=!e.forceFallback&&xt,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?d(t,"pointerdown",this._onTapStart):(d(t,"mousedown",this._onTapStart),d(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(d(t,"dragover",this),d(t,"dragenter",this)),bt.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,T())}function Xt(t,e,n,o,i,r,a,l){var s,c,u=t[j],d=u.options.onMove;return!window.CustomEvent||w||E?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||X(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),d&&(c=d.call(u,s,a)),c}function Yt(t){t.draggable=!1}function Bt(){Dt=!1}function Ft(t){for(var e=t.tagName+t.className+t.src+t.href+t.textContent,n=e.length,o=0;n--;)o+=e.charCodeAt(n);return o.toString(36)}function Ht(t){return setTimeout(t,0)}function Lt(t){return clearTimeout(t)}Rt.prototype={constructor:Rt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(ht=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,z):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(function(t){St.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&St.push(o)}}(o),!z&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled)&&!s.isContentEditable&&(this.nativeDraggable||!u||!l||"SELECT"!==l.tagName.toUpperCase())&&!((l=P(l,t.draggable,o,!1))&&l.animated||Z===l)){if(J=F(l),et=F(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return W({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),K("filter",n,{evt:e}),void(i&&e.cancelable&&e.preventDefault())}else if(c&&(c=c.split(",").some(function(t){if(t=P(s,t.trim(),o,!1))return W({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),K("filter",n,{evt:e}),!0})))return void(i&&e.cancelable&&e.preventDefault());t.handle&&!P(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;if(n&&!z&&n.parentNode===r){var s=X(n);if(q=r,G=(z=n).parentNode,V=z.nextSibling,Z=n,ot=a.group,rt={target:Rt.dragged=z,clientX:(e||t).clientX,clientY:(e||t).clientY},ct=rt.clientX-s.left,ut=rt.clientY-s.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,z.style["will-change"]="all",o=function(){K("delayEnded",i,{evt:t}),Rt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!c&&i.nativeDraggable&&(z.draggable=!0),i._triggerDragStart(t,e),W({sortable:i,name:"choose",originalEvent:t}),k(z,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){g(z,t.trim(),Yt)}),d(l,"dragover",Pt),d(l,"mousemove",Pt),d(l,"touchmove",Pt),d(l,"mouseup",i._onDrop),d(l,"touchend",i._onDrop),d(l,"touchcancel",i._onDrop),c&&this.nativeDraggable&&(this.options.touchStartThreshold=4,z.draggable=!0),K("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(E||w))o();else{if(Rt.eventCanceled)return void this._onDrop();d(l,"mouseup",i._disableDelayedDrag),d(l,"touchend",i._disableDelayedDrag),d(l,"touchcancel",i._disableDelayedDrag),d(l,"mousemove",i._delayedDragTouchMoveHandler),d(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&d(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)}}},_delayedDragTouchMoveHandler:function(t){var e=t.touches?t.touches[0]:t;Math.max(Math.abs(e.clientX-this._lastX),Math.abs(e.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){z&&Yt(z),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;s(t,"mouseup",this._disableDelayedDrag),s(t,"touchend",this._disableDelayedDrag),s(t,"touchcancel",this._disableDelayedDrag),s(t,"mousemove",this._delayedDragTouchMoveHandler),s(t,"touchmove",this._delayedDragTouchMoveHandler),s(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?d(document,"pointermove",this._onTouchMove):d(document,e?"touchmove":"mousemove",this._onTouchMove):(d(z,"dragend",this),d(q,"dragstart",this._onDragStart));try{document.selection?Ht(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){if(vt=!1,q&&z){K("dragStarted",this,{evt:e}),this.nativeDraggable&&d(document,"dragover",kt);var n=this.options;t||k(z,n.dragClass,!1),k(z,n.ghostClass,!0),Rt.active=this,t&&this._appendGhost(),W({sortable:this,name:"start",originalEvent:e})}else this._nulling()},_emulateDragOver:function(){if(at){this._lastX=at.clientX,this._lastY=at.clientY,At();for(var t=document.elementFromPoint(at.clientX,at.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(at.clientX,at.clientY))!==e;)e=t;if(z.parentNode[j]._isOutsideThisEl(t),e)do{if(e[j]){if(e[j]._onDragOver({clientX:at.clientX,clientY:at.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}t=e}while(e=e.parentNode);It()}},_onTouchMove:function(t){if(rt){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=U&&v(U,!0),a=U&&r&&r.a,l=U&&r&&r.d,s=Ct&&gt&&b(gt),c=(i.clientX-rt.clientX+o.x)/(a||1)+(s?s[0]-Et[0]:0)/(a||1),u=(i.clientY-rt.clientY+o.y)/(l||1)+(s?s[1]-Et[1]:0)/(l||1);if(!Rt.active&&!vt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))<n)return;this._onDragStart(t,!0)}if(U){r?(r.e+=c-(lt||0),r.f+=u-(st||0)):r={a:1,b:0,c:0,d:1,e:c,f:u};var d="matrix(".concat(r.a,",").concat(r.b,",").concat(r.c,",").concat(r.d,",").concat(r.e,",").concat(r.f,")");R(U,"webkitTransform",d),R(U,"mozTransform",d),R(U,"msTransform",d),R(U,"transform",d),lt=c,st=u,at=i}t.cancelable&&t.preventDefault()}},_appendGhost:function(){if(!U){var t=this.options.fallbackOnBody?document.body:q,e=X(z,!0,Ct,!0,t),n=this.options;if(Ct){for(gt=t;"static"===R(gt,"position")&&"none"===R(gt,"transform")&&gt!==document;)gt=gt.parentNode;gt!==document.body&&gt!==document.documentElement?(gt===document&&(gt=A()),e.top+=gt.scrollTop,e.left+=gt.scrollLeft):gt=A(),Et=b(gt)}k(U=z.cloneNode(!0),n.ghostClass,!1),k(U,n.fallbackClass,!0),k(U,n.dragClass,!0),R(U,"transition",""),R(U,"transform",""),R(U,"box-sizing","border-box"),R(U,"margin",0),R(U,"top",e.top),R(U,"left",e.left),R(U,"width",e.width),R(U,"height",e.height),R(U,"opacity","0.8"),R(U,"position",Ct?"absolute":"fixed"),R(U,"zIndex","100000"),R(U,"pointerEvents","none"),Rt.ghost=U,t.appendChild(U),R(U,"transform-origin",ct/parseInt(U.style.width)*100+"% "+ut/parseInt(U.style.height)*100+"%")}},_onDragStart:function(t,e){var n=this,o=t.dataTransfer,i=n.options;K("dragStart",this,{evt:t}),Rt.eventCanceled?this._onDrop():(K("setupClone",this),Rt.eventCanceled||((Q=S(z)).draggable=!1,Q.style["will-change"]="",this._hideClone(),k(Q,this.options.chosenClass,!1),Rt.clone=Q),n.cloneId=Ht(function(){K("clone",n),Rt.eventCanceled||(n.options.removeCloneOnHide||q.insertBefore(Q,z),n._hideClone(),W({sortable:n,name:"clone"}))}),e||k(z,i.dragClass,!0),e?(mt=!0,n._loopId=setInterval(n._emulateDragOver,50)):(s(document,"mouseup",n._onDrop),s(document,"touchend",n._onDrop),s(document,"touchcancel",n._onDrop),o&&(o.effectAllowed="move",i.setData&&i.setData.call(n,o,z)),d(document,"drop",n),R(z,"transform","translateZ(0)")),vt=!0,n._dragStartId=Ht(n._dragStarted.bind(n,e,t)),d(document,"selectstart",n),dt=!0,u&&R(document.body,"user-select","none"))},_onDragOver:function(n){var o,i,r,a,l=this.el,s=n.target,e=this.options,t=e.group,c=Rt.active,u=ot===t,d=e.sort,h=it||c,f=this,p=!1;if(!Dt){if(void 0!==n.preventDefault&&n.cancelable&&n.preventDefault(),s=P(s,e.draggable,l,!0),M("dragOver"),Rt.eventCanceled)return p;if(z.contains(n.target)||s.animated&&s.animatingX&&s.animatingY||f._ignoreWhileAnimating===s)return N(!1);if(mt=!1,c&&!e.disabled&&(u?d||(r=!q.contains(z)):it===this||(this.lastPutMode=ot.checkPull(this,c,z,n))&&t.checkPut(this,c,z,n))){if(a="vertical"===this._getDirection(n,s),o=X(z),M("dragOverValid"),Rt.eventCanceled)return p;if(r)return G=q,O(),this._hideClone(),M("revert"),Rt.eventCanceled||(V?q.insertBefore(z,V):q.appendChild(z)),N(!0);var g=B(l,e.draggable);if(!g||function(t,e,n){var o=X(B(n.el,n.options.draggable));return e?t.clientX>o.right+10||t.clientX<=o.right&&t.clientY>o.bottom&&t.clientX>=o.left:t.clientX>o.right&&t.clientY>o.top||t.clientX<=o.right&&t.clientY>o.bottom+10}(n,a,this)&&!g.animated){if(g===z)return N(!1);if(g&&l===n.target&&(s=g),s&&(i=X(s)),!1!==Xt(q,l,z,o,s,i,n,!!s))return O(),l.appendChild(z),G=l,A(),N(!0)}else if(s.parentNode===l){i=X(s);var v,m,b,y=z.parentNode!==l,w=!function(t,e,n){var o=n?t.left:t.top,i=n?t.right:t.bottom,r=n?t.width:t.height,a=n?e.left:e.top,l=n?e.right:e.bottom,s=n?e.width:e.height;return o===a||i===l||o+r/2===a+s/2}(z.animated&&z.toRect||o,s.animated&&s.toRect||i,a),E=a?"top":"left",D=Y(s,"top","top")||Y(z,"top","top"),S=D?D.scrollTop:void 0;if(ht!==s&&(m=i[E],yt=!1,wt=!w&&e.invertSwap||y),0!==(v=function(t,e,n,o,i,r,a,l){var s=o?t.clientY:t.clientX,c=o?n.height:n.width,u=o?n.top:n.left,d=o?n.bottom:n.right,h=!1;if(!a)if(l&&pt<c*i){if(!yt&&(1===ft?u+c*r/2<s:s<d-c*r/2)&&(yt=!0),yt)h=!0;else if(1===ft?s<u+pt:d-pt<s)return-ft}else if(u+c*(1-i)/2<s&&s<d-c*(1-i)/2)return function(t){return F(z)<F(t)?1:-1}(e);if((h=h||a)&&(s<u+c*r/2||d-c*r/2<s))return u+c/2<s?1:-1;return 0}(n,s,i,a,w?1:e.swapThreshold,null==e.invertedSwapThreshold?e.swapThreshold:e.invertedSwapThreshold,wt,ht===s)))for(var _=F(z);_-=v,(b=G.children[_])&&("none"===R(b,"display")||b===U););if(0===v||b===s)return N(!1);ft=v;var C=(ht=s).nextElementSibling,T=!1,x=Xt(q,l,z,o,s,i,n,T=1===v);if(!1!==x)return 1!==x&&-1!==x||(T=1===x),Dt=!0,setTimeout(Bt,30),O(),T&&!C?l.appendChild(z):s.parentNode.insertBefore(z,T?C:s),D&&L(D,0,S-D.scrollTop),G=z.parentNode,void 0===m||wt||(pt=Math.abs(m-X(s)[E])),A(),N(!0)}if(l.contains(z))return N(!1)}return!1}function M(t,e){K(t,f,I({evt:n,isOwner:u,axis:a?"vertical":"horizontal",revert:r,dragRect:o,targetRect:i,canSort:d,fromSortable:h,target:s,completed:N,onMove:function(t,e){return Xt(q,l,z,o,t,X(t),n,e)},changed:A},e))}function O(){M("dragOverAnimationCapture"),f.captureAnimationState(),f!==h&&h.captureAnimationState()}function N(t){return M("dragOverCompleted",{insertion:t}),t&&(u?c._hideClone():c._showClone(f),f!==h&&(k(z,it?it.options.ghostClass:c.options.ghostClass,!1),k(z,e.ghostClass,!0)),it!==f&&f!==Rt.active?it=f:f===Rt.active&&it&&(it=null),h===f&&(f._ignoreWhileAnimating=s),f.animateAll(function(){M("dragOverAnimationComplete"),f._ignoreWhileAnimating=null}),f!==h&&(h.animateAll(),h._ignoreWhileAnimating=null)),(s===z&&!z.animated||s===l&&!s.animated)&&(ht=null),e.dragoverBubble||n.rootEl||s===document||(z.parentNode[j]._isOutsideThisEl(n.target),t||Pt(n)),!e.dragoverBubble&&n.stopPropagation&&n.stopPropagation(),p=!0}function A(){tt=F(z),nt=F(z,e.draggable),W({sortable:f,name:"change",toEl:l,newIndex:tt,newDraggableIndex:nt,originalEvent:n})}},_ignoreWhileAnimating:null,_offMoveEvents:function(){s(document,"mousemove",this._onTouchMove),s(document,"touchmove",this._onTouchMove),s(document,"pointermove",this._onTouchMove),s(document,"dragover",Pt),s(document,"mousemove",Pt),s(document,"touchmove",Pt)},_offUpEvents:function(){var t=this.el.ownerDocument;s(t,"mouseup",this._onDrop),s(t,"touchend",this._onDrop),s(t,"pointerup",this._onDrop),s(t,"touchcancel",this._onDrop),s(document,"selectstart",this)},_onDrop:function(t){var e=this.el,n=this.options;tt=F(z),nt=F(z,n.draggable),K("drop",this,{evt:t}),G=z&&z.parentNode,tt=F(z),nt=F(z,n.draggable),Rt.eventCanceled||(yt=wt=vt=!1,clearInterval(this._loopId),clearTimeout(this._dragStartTimer),Lt(this.cloneId),Lt(this._dragStartId),this.nativeDraggable&&(s(document,"drop",this),s(e,"dragstart",this._onDragStart)),this._offMoveEvents(),this._offUpEvents(),u&&R(document.body,"user-select",""),R(z,"transform",""),t&&(dt&&(t.cancelable&&t.preventDefault(),n.dropBubble||t.stopPropagation()),U&&U.parentNode&&U.parentNode.removeChild(U),(q===G||it&&"clone"!==it.lastPutMode)&&Q&&Q.parentNode&&Q.parentNode.removeChild(Q),z&&(this.nativeDraggable&&s(z,"dragend",this),Yt(z),z.style["will-change"]="",dt&&!vt&&k(z,it?it.options.ghostClass:this.options.ghostClass,!1),k(z,this.options.chosenClass,!1),W({sortable:this,name:"unchoose",toEl:G,newIndex:null,newDraggableIndex:null,originalEvent:t}),q!==G?(0<=tt&&(W({rootEl:G,name:"add",toEl:G,fromEl:q,originalEvent:t}),W({sortable:this,name:"remove",toEl:G,originalEvent:t}),W({rootEl:G,name:"sort",toEl:G,fromEl:q,originalEvent:t}),W({sortable:this,name:"sort",toEl:G,originalEvent:t})),it&&it.save()):tt!==J&&0<=tt&&(W({sortable:this,name:"update",toEl:G,originalEvent:t}),W({sortable:this,name:"sort",toEl:G,originalEvent:t})),Rt.active&&(null!=tt&&-1!==tt||(tt=J,nt=et),W({sortable:this,name:"end",toEl:G,originalEvent:t}),this.save())))),this._nulling()},_nulling:function(){K("nulling",this),q=z=G=U=V=Q=Z=$=rt=at=dt=tt=nt=J=et=ht=ft=it=ot=Rt.dragged=Rt.ghost=Rt.clone=Rt.active=null,St.forEach(function(t){t.checked=!0}),St.length=lt=st=0},handleEvent:function(t){switch(t.type){case"drop":case"dragend":this._onDrop(t);break;case"dragenter":case"dragover":z&&(this._onDragOver(t),function(t){t.dataTransfer&&(t.dataTransfer.dropEffect="move");t.cancelable&&t.preventDefault()}(t));break;case"selectstart":t.preventDefault()}},toArray:function(){for(var t,e=[],n=this.el.children,o=0,i=n.length,r=this.options;o<i;o++)P(t=n[o],r.draggable,this.el,!1)&&e.push(t.getAttribute(r.dataIdAttr)||Ft(t));return e},sort:function(t,e){var o={},i=this.el;this.toArray().forEach(function(t,e){var n=i.children[e];P(n,this.options.draggable,i,!1)&&(o[t]=n)},this),e&&this.captureAnimationState(),t.forEach(function(t){o[t]&&(i.removeChild(o[t]),i.appendChild(o[t]))}),e&&this.animateAll()},save:function(){var t=this.options.store;t&&t.set&&t.set(this)},closest:function(t,e){return P(t,e||this.options.draggable,this.el,!1)},option:function(t,e){var n=this.options;if(void 0===e)return n[t];var o=O.modifyOption(this,t,e);n[t]=void 0!==o?o:e,"group"===t&&Nt(n)},destroy:function(){K("destroy",this);var t=this.el;t[j]=null,s(t,"mousedown",this._onTapStart),s(t,"touchstart",this._onTapStart),s(t,"pointerdown",this._onTapStart),this.nativeDraggable&&(s(t,"dragover",this),s(t,"dragenter",this)),Array.prototype.forEach.call(t.querySelectorAll("[draggable]"),function(t){t.removeAttribute("draggable")}),this._onDrop(),this._disableDelayedDragEvents(),bt.splice(bt.indexOf(this.el),1),this.el=t=null},_hideClone:function(){if(!$){if(K("hideClone",this),Rt.eventCanceled)return;R(Q,"display","none"),this.options.removeCloneOnHide&&Q.parentNode&&Q.parentNode.removeChild(Q),$=!0}},_showClone:function(t){if("clone"===t.lastPutMode){if($){if(K("showClone",this),Rt.eventCanceled)return;z.parentNode!=q||this.options.group.revertClone?V?q.insertBefore(Q,V):q.appendChild(Q):q.insertBefore(Q,z),this.options.group.revertClone&&this.animate(z,Q),R(Q,"display",""),$=!1}}else this._hideClone()}},_t&&d(document,"touchmove",function(t){(Rt.active||vt)&&t.cancelable&&t.preventDefault()}),Rt.utils={on:d,off:s,css:R,find:g,is:function(t,e){return!!P(t,e,t,!1)},extend:function(t,e){if(t&&e)for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t},throttle:D,closest:P,toggleClass:k,clone:S,index:F,nextTick:Ht,cancelNextTick:Lt,detectDirection:Ot,getChild:m},Rt.get=function(t){return t[j]},Rt.mount=function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];e[0].constructor===Array&&(e=e[0]),e.forEach(function(t){if(!t.prototype||!t.prototype.constructor)throw"Sortable: Mounted plugin must be a constructor function, not ".concat({}.toString.call(t));t.utils&&(Rt.utils=I({},Rt.utils,t.utils)),O.mount(t)})},Rt.create=function(t,e){return new Rt(t,e)};var jt,Kt,Wt,zt,Gt,Ut,qt=[],Vt=!(Rt.version="1.13.0");function Zt(){qt.forEach(function(t){clearInterval(t.pid)}),qt=[]}function Qt(){clearInterval(Ut)}function $t(t){var e=t.originalEvent,n=t.putSortable,o=t.dragEl,i=t.activeSortable,r=t.dispatchSortableEvent,a=t.hideGhostForTarget,l=t.unhideGhostForTarget;if(e){var s=n||i;a();var c=e.changedTouches&&e.changedTouches.length?e.changedTouches[0]:e,u=document.elementFromPoint(c.clientX,c.clientY);l(),s&&!s.el.contains(u)&&(r("spill"),this.onSpill({dragEl:o,putSortable:n}))}}var Jt,te=D(function(n,t,e,o){if(t.scroll){var i,r=(n.touches?n.touches[0]:n).clientX,a=(n.touches?n.touches[0]:n).clientY,l=t.scrollSensitivity,s=t.scrollSpeed,c=A(),u=!1;Kt!==e&&(Kt=e,Zt(),jt=t.scroll,i=t.scrollFn,!0===jt&&(jt=H(e,!0)));var d=0,h=jt;do{var f=h,p=X(f),g=p.top,v=p.bottom,m=p.left,b=p.right,y=p.width,w=p.height,E=void 0,D=void 0,S=f.scrollWidth,_=f.scrollHeight,C=R(f),T=f.scrollLeft,x=f.scrollTop;D=f===c?(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX||"visible"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY||"visible"===C.overflowY)):(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY));var M=E&&(Math.abs(b-r)<=l&&T+y<S)-(Math.abs(m-r)<=l&&!!T),O=D&&(Math.abs(v-a)<=l&&x+w<_)-(Math.abs(g-a)<=l&&!!x);if(!qt[d])for(var N=0;N<=d;N++)qt[N]||(qt[N]={});qt[d].vx==M&&qt[d].vy==O&&qt[d].el===f||(qt[d].el=f,qt[d].vx=M,qt[d].vy=O,clearInterval(qt[d].pid),0==M&&0==O||(u=!0,qt[d].pid=setInterval(function(){o&&0===this.layer&&Rt.active._onTouchMove(Gt);var t=qt[this.layer].vy?qt[this.layer].vy*s:0,e=qt[this.layer].vx?qt[this.layer].vx*s:0;"function"==typeof i&&"continue"!==i.call(Rt.dragged.parentNode[j],e,t,n,Gt,qt[this.layer].el)||L(qt[this.layer].el,e,t)}.bind({layer:d}),24))),d++}while(t.bubbleScroll&&h!==c&&(h=H(h,!1)));Vt=u}},30);function ee(){}function ne(){}ee.prototype={startIndex:null,dragStart:function(t){var e=t.oldDraggableIndex;this.startIndex=e},onSpill:function(t){var e=t.dragEl,n=t.putSortable;this.sortable.captureAnimationState(),n&&n.captureAnimationState();var o=m(this.sortable.el,this.startIndex,this.options);o?this.sortable.el.insertBefore(e,o):this.sortable.el.appendChild(e),this.sortable.animateAll(),n&&n.animateAll()},drop:$t},a(ee,{pluginName:"revertOnSpill"}),ne.prototype={onSpill:function(t){var e=t.dragEl,n=t.putSortable||this.sortable;n.captureAnimationState(),e.parentNode&&e.parentNode.removeChild(e),n.animateAll()},drop:$t},a(ne,{pluginName:"removeOnSpill"});var oe,ie,re,ae,le,se=[],ce=[],ue=!1,de=!1,he=!1;function fe(o,i){ce.forEach(function(t,e){var n=i.children[t.sortableIndex+(o?Number(e):0)];n?i.insertBefore(t,n):i.appendChild(t)})}function pe(){se.forEach(function(t){t!==re&&t.parentNode&&t.parentNode.removeChild(t)})}return Rt.mount(new function(){function t(){for(var t in this.defaults={scroll:!0,scrollSensitivity:30,scrollSpeed:10,bubbleScroll:!0},this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this))}return t.prototype={dragStarted:function(t){var e=t.originalEvent;this.sortable.nativeDraggable?d(document,"dragover",this._handleAutoScroll):this.options.supportPointer?d(document,"pointermove",this._handleFallbackAutoScroll):e.touches?d(document,"touchmove",this._handleFallbackAutoScroll):d(document,"mousemove",this._handleFallbackAutoScroll)},dragOverCompleted:function(t){var e=t.originalEvent;this.options.dragOverBubble||e.rootEl||this._handleAutoScroll(e)},drop:function(){this.sortable.nativeDraggable?s(document,"dragover",this._handleAutoScroll):(s(document,"pointermove",this._handleFallbackAutoScroll),s(document,"touchmove",this._handleFallbackAutoScroll),s(document,"mousemove",this._handleFallbackAutoScroll)),Qt(),Zt(),clearTimeout(f),f=void 0},nulling:function(){Gt=Kt=jt=Vt=Ut=Wt=zt=null,qt.length=0},_handleFallbackAutoScroll:function(t){this._handleAutoScroll(t,!0)},_handleAutoScroll:function(e,n){var o=this,i=(e.touches?e.touches[0]:e).clientX,r=(e.touches?e.touches[0]:e).clientY,t=document.elementFromPoint(i,r);if(Gt=e,n||E||w||u){te(e,this.options,t,n);var a=H(t,!0);!Vt||Ut&&i===Wt&&r===zt||(Ut&&Qt(),Ut=setInterval(function(){var t=H(document.elementFromPoint(i,r),!0);t!==a&&(a=t,Zt()),te(e,o.options,t,n)},10),Wt=i,zt=r)}else{if(!this.options.bubbleScroll||H(t,!0)===A())return void Zt();te(e,this.options,H(t,!1),!1)}}},a(t,{pluginName:"scroll",initializeByDefault:!0})}),Rt.mount(ne,ee),Rt.mount(new function(){function t(){this.defaults={swapClass:"sortable-swap-highlight"}}return t.prototype={dragStart:function(t){var e=t.dragEl;Jt=e},dragOverValid:function(t){var e=t.completed,n=t.target,o=t.onMove,i=t.activeSortable,r=t.changed,a=t.cancel;if(i.options.swap){var l=this.sortable.el,s=this.options;if(n&&n!==l){var c=Jt;Jt=!1!==o(n)?(k(n,s.swapClass,!0),n):null,c&&c!==Jt&&k(c,s.swapClass,!1)}r(),e(!0),a()}},drop:function(t){var e=t.activeSortable,n=t.putSortable,o=t.dragEl,i=n||this.sortable,r=this.options;Jt&&k(Jt,r.swapClass,!1),Jt&&(r.swap||n&&n.options.swap)&&o!==Jt&&(i.captureAnimationState(),i!==e&&e.captureAnimationState(),function(t,e){var n,o,i=t.parentNode,r=e.parentNode;if(!i||!r||i.isEqualNode(e)||r.isEqualNode(t))return;n=F(t),o=F(e),i.isEqualNode(r)&&n<o&&o++;i.insertBefore(e,i.children[n]),r.insertBefore(t,r.children[o])}(o,Jt),i.animateAll(),i!==e&&e.animateAll())},nulling:function(){Jt=null}},a(t,{pluginName:"swap",eventProperties:function(){return{swapItem:Jt}}})}),Rt.mount(new function(){function t(o){for(var t in this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this));o.options.supportPointer?d(document,"pointerup",this._deselectMultiDrag):(d(document,"mouseup",this._deselectMultiDrag),d(document,"touchend",this._deselectMultiDrag)),d(document,"keydown",this._checkKeyDown),d(document,"keyup",this._checkKeyUp),this.defaults={selectedClass:"sortable-selected",multiDragKey:null,setData:function(t,e){var n="";se.length&&ie===o?se.forEach(function(t,e){n+=(e?", ":"")+t.textContent}):n=e.textContent,t.setData("Text",n)}}}return t.prototype={multiDragKeyDown:!1,isMultiDrag:!1,delayStartGlobal:function(t){var e=t.dragEl;re=e},delayEnded:function(){this.isMultiDrag=~se.indexOf(re)},setupClone:function(t){var e=t.sortable,n=t.cancel;if(this.isMultiDrag){for(var o=0;o<se.length;o++)ce.push(S(se[o])),ce[o].sortableIndex=se[o].sortableIndex,ce[o].draggable=!1,ce[o].style["will-change"]="",k(ce[o],this.options.selectedClass,!1),se[o]===re&&k(ce[o],this.options.chosenClass,!1);e._hideClone(),n()}},clone:function(t){var e=t.sortable,n=t.rootEl,o=t.dispatchSortableEvent,i=t.cancel;this.isMultiDrag&&(this.options.removeCloneOnHide||se.length&&ie===e&&(fe(!0,n),o("clone"),i()))},showClone:function(t){var e=t.cloneNowShown,n=t.rootEl,o=t.cancel;this.isMultiDrag&&(fe(!1,n),ce.forEach(function(t){R(t,"display","")}),e(),le=!1,o())},hideClone:function(t){var e=this,n=(t.sortable,t.cloneNowHidden),o=t.cancel;this.isMultiDrag&&(ce.forEach(function(t){R(t,"display","none"),e.options.removeCloneOnHide&&t.parentNode&&t.parentNode.removeChild(t)}),n(),le=!0,o())},dragStartGlobal:function(t){t.sortable;!this.isMultiDrag&&ie&&ie.multiDrag._deselectMultiDrag(),se.forEach(function(t){t.sortableIndex=F(t)}),se=se.sort(function(t,e){return t.sortableIndex-e.sortableIndex}),he=!0},dragStarted:function(t){var e=this,n=t.sortable;if(this.isMultiDrag){if(this.options.sort&&(n.captureAnimationState(),this.options.animation)){se.forEach(function(t){t!==re&&R(t,"position","absolute")});var o=X(re,!1,!0,!0);se.forEach(function(t){t!==re&&_(t,o)}),ue=de=!0}n.animateAll(function(){ue=de=!1,e.options.animation&&se.forEach(function(t){C(t)}),e.options.sort&&pe()})}},dragOver:function(t){var e=t.target,n=t.completed,o=t.cancel;de&&~se.indexOf(e)&&(n(!1),o())},revert:function(t){var e=t.fromSortable,n=t.rootEl,o=t.sortable,i=t.dragRect;1<se.length&&(se.forEach(function(t){o.addAnimationState({target:t,rect:de?X(t):i}),C(t),t.fromRect=i,e.removeAnimationState(t)}),de=!1,function(o,i){se.forEach(function(t,e){var n=i.children[t.sortableIndex+(o?Number(e):0)];n?i.insertBefore(t,n):i.appendChild(t)})}(!this.options.removeCloneOnHide,n))},dragOverCompleted:function(t){var e=t.sortable,n=t.isOwner,o=t.insertion,i=t.activeSortable,r=t.parentEl,a=t.putSortable,l=this.options;if(o){if(n&&i._hideClone(),ue=!1,l.animation&&1<se.length&&(de||!n&&!i.options.sort&&!a)){var s=X(re,!1,!0,!0);se.forEach(function(t){t!==re&&(_(t,s),r.appendChild(t))}),de=!0}if(!n)if(de||pe(),1<se.length){var c=le;i._showClone(e),i.options.animation&&!le&&c&&ce.forEach(function(t){i.addAnimationState({target:t,rect:ae}),t.fromRect=ae,t.thisAnimationDuration=null})}else i._showClone(e)}},dragOverAnimationCapture:function(t){var e=t.dragRect,n=t.isOwner,o=t.activeSortable;if(se.forEach(function(t){t.thisAnimationDuration=null}),o.options.animation&&!n&&o.multiDrag.isMultiDrag){ae=a({},e);var i=v(re,!0);ae.top-=i.f,ae.left-=i.e}},dragOverAnimationComplete:function(){de&&(de=!1,pe())},drop:function(t){var e=t.originalEvent,n=t.rootEl,o=t.parentEl,i=t.sortable,r=t.dispatchSortableEvent,a=t.oldIndex,l=t.putSortable,s=l||this.sortable;if(e){var c=this.options,u=o.children;if(!he)if(c.multiDragKey&&!this.multiDragKeyDown&&this._deselectMultiDrag(),k(re,c.selectedClass,!~se.indexOf(re)),~se.indexOf(re))se.splice(se.indexOf(re),1),oe=null,N({sortable:i,rootEl:n,name:"deselect",targetEl:re,originalEvt:e});else{if(se.push(re),N({sortable:i,rootEl:n,name:"select",targetEl:re,originalEvt:e}),e.shiftKey&&oe&&i.el.contains(oe)){var d,h,f=F(oe),p=F(re);if(~f&&~p&&f!==p)for(d=f<p?(h=f,p):(h=p,f+1);h<d;h++)~se.indexOf(u[h])||(k(u[h],c.selectedClass,!0),se.push(u[h]),N({sortable:i,rootEl:n,name:"select",targetEl:u[h],originalEvt:e}))}else oe=re;ie=s}if(he&&this.isMultiDrag){if((o[j].options.sort||o!==n)&&1<se.length){var g=X(re),v=F(re,":not(."+this.options.selectedClass+")");if(!ue&&c.animation&&(re.thisAnimationDuration=null),s.captureAnimationState(),!ue&&(c.animation&&(re.fromRect=g,se.forEach(function(t){if(t.thisAnimationDuration=null,t!==re){var e=de?X(t):g;t.fromRect=e,s.addAnimationState({target:t,rect:e})}})),pe(),se.forEach(function(t){u[v]?o.insertBefore(t,u[v]):o.appendChild(t),v++}),a===F(re))){var m=!1;se.forEach(function(t){t.sortableIndex===F(t)||(m=!0)}),m&&r("update")}se.forEach(function(t){C(t)}),s.animateAll()}ie=s}(n===o||l&&"clone"!==l.lastPutMode)&&ce.forEach(function(t){t.parentNode&&t.parentNode.removeChild(t)})}},nullingGlobal:function(){this.isMultiDrag=he=!1,ce.length=0},destroyGlobal:function(){this._deselectMultiDrag(),s(document,"pointerup",this._deselectMultiDrag),s(document,"mouseup",this._deselectMultiDrag),s(document,"touchend",this._deselectMultiDrag),s(document,"keydown",this._checkKeyDown),s(document,"keyup",this._checkKeyUp)},_deselectMultiDrag:function(t){if(!(void 0!==he&&he||ie!==this.sortable||t&&P(t.target,this.options.draggable,this.sortable.el,!1)||t&&0!==t.button))for(;se.length;){var e=se[0];k(e,this.options.selectedClass,!1),se.shift(),N({sortable:this.sortable,rootEl:this.sortable.el,name:"deselect",targetEl:e,originalEvt:t})}},_checkKeyDown:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!0)},_checkKeyUp:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!1)}},a(t,{pluginName:"multiDrag",utils:{select:function(t){var e=t.parentNode[j];e&&e.options.multiDrag&&!~se.indexOf(t)&&(ie&&ie!==e&&(ie.multiDrag._deselectMultiDrag(),ie=e),k(t,e.options.selectedClass,!0),se.push(t))},deselect:function(t){var e=t.parentNode[j],n=se.indexOf(t);e&&e.options.multiDrag&&~n&&(k(t,e.options.selectedClass,!1),se.splice(n,1))}},eventProperties:function(){var n=this,o=[],i=[];return se.forEach(function(t){var e;o.push({multiDragElement:t,index:t.sortableIndex}),e=de&&t!==re?-1:de?F(t,":not(."+n.options.selectedClass+")"):F(t),i.push({multiDragElement:t,index:e})}),{items:e(se),clones:[].concat(ce),oldIndicies:o,newIndicies:i}},optionListeners:{multiDragKey:function(t){return"ctrl"===(t=t.toLowerCase())?t="Control":1<t.length&&(t=t.charAt(0).toUpperCase()+t.substr(1)),t}}})}),Rt});
\ No newline at end of file
+/*! Sortable 1.15.0 - MIT | git://github.com/SortableJS/Sortable.git */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function e(e,t){var n,o=Object.keys(e);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(e),t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),o.push.apply(o,n)),o}function M(o){for(var t=1;t<arguments.length;t++){var i=null!=arguments[t]?arguments[t]:{};t%2?e(Object(i),!0).forEach(function(t){var e,n;e=o,t=i[n=t],n in e?Object.defineProperty(e,n,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[n]=t}):Object.getOwnPropertyDescriptors?Object.defineProperties(o,Object.getOwnPropertyDescriptors(i)):e(Object(i)).forEach(function(t){Object.defineProperty(o,t,Object.getOwnPropertyDescriptor(i,t))})}return o}function o(t){return(o="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 a(){return(a=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n,o=arguments[e];for(n in o)Object.prototype.hasOwnProperty.call(o,n)&&(t[n]=o[n])}return t}).apply(this,arguments)}function i(t,e){if(null==t)return{};var n,o=function(t,e){if(null==t)return{};for(var n,o={},i=Object.keys(t),r=0;r<i.length;r++)n=i[r],0<=e.indexOf(n)||(o[n]=t[n]);return o}(t,e);if(Object.getOwnPropertySymbols)for(var i=Object.getOwnPropertySymbols(t),r=0;r<i.length;r++)n=i[r],0<=e.indexOf(n)||Object.prototype.propertyIsEnumerable.call(t,n)&&(o[n]=t[n]);return o}function r(t){return function(t){if(Array.isArray(t))return l(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||function(t,e){if(t){if("string"==typeof t)return l(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Map"===(n="Object"===n&&t.constructor?t.constructor.name:n)||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?l(t,e):void 0}}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function l(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=t[n];return o}function t(t){if("undefined"!=typeof window&&window.navigator)return!!navigator.userAgent.match(t)}var y=t(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i),w=t(/Edge/i),s=t(/firefox/i),u=t(/safari/i)&&!t(/chrome/i)&&!t(/android/i),n=t(/iP(ad|od|hone)/i),c=t(/chrome/i)&&t(/android/i),d={capture:!1,passive:!1};function h(t,e,n){t.addEventListener(e,n,!y&&d)}function f(t,e,n){t.removeEventListener(e,n,!y&&d)}function p(t,e){if(e&&(">"===e[0]&&(e=e.substring(1)),t))try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return}}function N(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"!==e[0]||t.parentNode===n)&&p(t,e)||o&&t===n)return t}while(t!==n&&(t=(i=t).host&&i!==document&&i.host.nodeType?i.host:i.parentNode))}var i;return null}var g,m=/\s+/g;function I(t,e,n){var o;t&&e&&(t.classList?t.classList[n?"add":"remove"](e):(o=(" "+t.className+" ").replace(m," ").replace(" "+e+" "," "),t.className=(o+(n?" "+e:"")).replace(m," ")))}function P(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];o[e=!(e in o||-1!==e.indexOf("webkit"))?"-webkit-"+e:e]=n+("string"==typeof n?"":"px")}}function v(t,e){var n="";if("string"==typeof t)n=t;else do{var o=P(t,"transform")}while(o&&"none"!==o&&(n=o+" "+n),!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function b(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i<r;i++)n(o[i],i);return o}return[]}function O(){var t=document.scrollingElement;return t||document.documentElement}function k(t,e,n,o,i){if(t.getBoundingClientRect||t===window){var r,a,l,s,c,u,d=t!==window&&t.parentNode&&t!==O()?(a=(r=t.getBoundingClientRect()).top,l=r.left,s=r.bottom,c=r.right,u=r.height,r.width):(l=a=0,s=window.innerHeight,c=window.innerWidth,u=window.innerHeight,window.innerWidth);if((e||n)&&t!==window&&(i=i||t.parentNode,!y))do{if(i&&i.getBoundingClientRect&&("none"!==P(i,"transform")||n&&"static"!==P(i,"position"))){var h=i.getBoundingClientRect();a-=h.top+parseInt(P(i,"border-top-width")),l-=h.left+parseInt(P(i,"border-left-width")),s=a+r.height,c=l+r.width;break}}while(i=i.parentNode);return o&&t!==window&&(o=(e=v(i||t))&&e.a,t=e&&e.d,e&&(s=(a/=t)+(u/=t),c=(l/=o)+(d/=o))),{top:a,left:l,bottom:s,right:c,width:d,height:u}}}function R(t,e,n){for(var o=A(t,!0),i=k(t)[e];o;){var r=k(o)[n];if(!("top"===n||"left"===n?r<=i:i<=r))return o;if(o===O())break;o=A(o,!1)}return!1}function X(t,e,n,o){for(var i=0,r=0,a=t.children;r<a.length;){if("none"!==a[r].style.display&&a[r]!==Bt.ghost&&(o||a[r]!==Bt.dragged)&&N(a[r],n.draggable,t,!1)){if(i===e)return a[r];i++}r++}return null}function Y(t,e){for(var n=t.lastElementChild;n&&(n===Bt.ghost||"none"===P(n,"display")||e&&!p(n,e));)n=n.previousElementSibling;return n||null}function B(t,e){var n=0;if(!t||!t.parentNode)return-1;for(;t=t.previousElementSibling;)"TEMPLATE"===t.nodeName.toUpperCase()||t===Bt.clone||e&&!p(t,e)||n++;return n}function E(t){var e=0,n=0,o=O();if(t)do{var i=v(t),r=i.a,i=i.d}while(e+=t.scrollLeft*r,n+=t.scrollTop*i,t!==o&&(t=t.parentNode));return[e,n]}function A(t,e){if(!t||!t.getBoundingClientRect)return O();var n=t,o=!1;do{if(n.clientWidth<n.scrollWidth||n.clientHeight<n.scrollHeight){var i=P(n);if(n.clientWidth<n.scrollWidth&&("auto"==i.overflowX||"scroll"==i.overflowX)||n.clientHeight<n.scrollHeight&&("auto"==i.overflowY||"scroll"==i.overflowY)){if(!n.getBoundingClientRect||n===document.body)return O();if(o||e)return n;o=!0}}}while(n=n.parentNode);return O()}function D(t,e){return Math.round(t.top)===Math.round(e.top)&&Math.round(t.left)===Math.round(e.left)&&Math.round(t.height)===Math.round(e.height)&&Math.round(t.width)===Math.round(e.width)}function S(e,n){return function(){var t;g||(1===(t=arguments).length?e.call(this,t[0]):e.apply(this,t),g=setTimeout(function(){g=void 0},n))}}function F(t,e,n){t.scrollLeft+=e,t.scrollTop+=n}function _(t){var e=window.Polymer,n=window.jQuery||window.Zepto;return e&&e.dom?e.dom(t).cloneNode(!0):n?n(t).clone(!0)[0]:t.cloneNode(!0)}function C(t,e){P(t,"position","absolute"),P(t,"top",e.top),P(t,"left",e.left),P(t,"width",e.width),P(t,"height",e.height)}function T(t){P(t,"position",""),P(t,"top",""),P(t,"left",""),P(t,"width",""),P(t,"height","")}var j="Sortable"+(new Date).getTime();function x(){var e,o=[];return{captureAnimationState:function(){o=[],this.options.animation&&[].slice.call(this.el.children).forEach(function(t){var e,n;"none"!==P(t,"display")&&t!==Bt.ghost&&(o.push({target:t,rect:k(t)}),e=M({},o[o.length-1].rect),!t.thisAnimationDuration||(n=v(t,!0))&&(e.top-=n.f,e.left-=n.e),t.fromRect=e)})},addAnimationState:function(t){o.push(t)},removeAnimationState:function(t){o.splice(function(t,e){for(var n in t)if(t.hasOwnProperty(n))for(var o in e)if(e.hasOwnProperty(o)&&e[o]===t[n][o])return Number(n);return-1}(o,{target:t}),1)},animateAll:function(t){var c=this;if(!this.options.animation)return clearTimeout(e),void("function"==typeof t&&t());var u=!1,d=0;o.forEach(function(t){var e=0,n=t.target,o=n.fromRect,i=k(n),r=n.prevFromRect,a=n.prevToRect,l=t.rect,s=v(n,!0);s&&(i.top-=s.f,i.left-=s.e),n.toRect=i,n.thisAnimationDuration&&D(r,i)&&!D(o,i)&&(l.top-i.top)/(l.left-i.left)==(o.top-i.top)/(o.left-i.left)&&(t=l,s=r,r=a,a=c.options,e=Math.sqrt(Math.pow(s.top-t.top,2)+Math.pow(s.left-t.left,2))/Math.sqrt(Math.pow(s.top-r.top,2)+Math.pow(s.left-r.left,2))*a.animation),D(i,o)||(n.prevFromRect=o,n.prevToRect=i,e=e||c.options.animation,c.animate(n,l,i,e)),e&&(u=!0,d=Math.max(d,e),clearTimeout(n.animationResetTimer),n.animationResetTimer=setTimeout(function(){n.animationTime=0,n.prevFromRect=null,n.fromRect=null,n.prevToRect=null,n.thisAnimationDuration=null},e),n.thisAnimationDuration=e)}),clearTimeout(e),u?e=setTimeout(function(){"function"==typeof t&&t()},d):"function"==typeof t&&t(),o=[]},animate:function(t,e,n,o){var i,r;o&&(P(t,"transition",""),P(t,"transform",""),i=(r=v(this.el))&&r.a,r=r&&r.d,i=(e.left-n.left)/(i||1),r=(e.top-n.top)/(r||1),t.animatingX=!!i,t.animatingY=!!r,P(t,"transform","translate3d("+i+"px,"+r+"px,0)"),this.forRepaintDummy=t.offsetWidth,P(t,"transition","transform "+o+"ms"+(this.options.easing?" "+this.options.easing:"")),P(t,"transform","translate3d(0,0,0)"),"number"==typeof t.animated&&clearTimeout(t.animated),t.animated=setTimeout(function(){P(t,"transition",""),P(t,"transform",""),t.animated=!1,t.animatingX=!1,t.animatingY=!1},o))}}}var H=[],L={initializeByDefault:!0},K={mount:function(e){for(var t in L)!L.hasOwnProperty(t)||t in e||(e[t]=L[t]);H.forEach(function(t){if(t.pluginName===e.pluginName)throw"Sortable: Cannot mount plugin ".concat(e.pluginName," more than once")}),H.push(e)},pluginEvent:function(e,n,o){var t=this;this.eventCanceled=!1,o.cancel=function(){t.eventCanceled=!0};var i=e+"Global";H.forEach(function(t){n[t.pluginName]&&(n[t.pluginName][i]&&n[t.pluginName][i](M({sortable:n},o)),n.options[t.pluginName]&&n[t.pluginName][e]&&n[t.pluginName][e](M({sortable:n},o)))})},initializePlugins:function(n,o,i,t){for(var e in H.forEach(function(t){var e=t.pluginName;(n.options[e]||t.initializeByDefault)&&((t=new t(n,o,n.options)).sortable=n,t.options=n.options,n[e]=t,a(i,t.defaults))}),n.options){var r;n.options.hasOwnProperty(e)&&(void 0!==(r=this.modifyOption(n,e,n.options[e]))&&(n.options[e]=r))}},getEventProperties:function(e,n){var o={};return H.forEach(function(t){"function"==typeof t.eventProperties&&a(o,t.eventProperties.call(n[t.pluginName],e))}),o},modifyOption:function(e,n,o){var i;return H.forEach(function(t){e[t.pluginName]&&t.optionListeners&&"function"==typeof t.optionListeners[n]&&(i=t.optionListeners[n].call(e[t.pluginName],o))}),i}};function W(t){var e=t.sortable,n=t.rootEl,o=t.name,i=t.targetEl,r=t.cloneEl,a=t.toEl,l=t.fromEl,s=t.oldIndex,c=t.newIndex,u=t.oldDraggableIndex,d=t.newDraggableIndex,h=t.originalEvent,f=t.putSortable,p=t.extraEventProperties;if(e=e||n&&n[j]){var g,m=e.options,t="on"+o.charAt(0).toUpperCase()+o.substr(1);!window.CustomEvent||y||w?(g=document.createEvent("Event")).initEvent(o,!0,!0):g=new CustomEvent(o,{bubbles:!0,cancelable:!0}),g.to=a||n,g.from=l||n,g.item=i||n,g.clone=r,g.oldIndex=s,g.newIndex=c,g.oldDraggableIndex=u,g.newDraggableIndex=d,g.originalEvent=h,g.pullMode=f?f.lastPutMode:void 0;var v,b=M(M({},p),K.getEventProperties(o,e));for(v in b)g[v]=b[v];n&&n.dispatchEvent(g),m[t]&&m[t].call(e,g)}}function z(t,e){var n=(o=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{}).evt,o=i(o,G);K.pluginEvent.bind(Bt)(t,e,M({dragEl:q,parentEl:V,ghostEl:Z,rootEl:$,nextEl:Q,lastDownEl:J,cloneEl:tt,cloneHidden:et,dragStarted:pt,putSortable:lt,activeSortable:Bt.active,originalEvent:n,oldIndex:nt,oldDraggableIndex:it,newIndex:ot,newDraggableIndex:rt,hideGhostForTarget:kt,unhideGhostForTarget:Rt,cloneNowHidden:function(){et=!0},cloneNowShown:function(){et=!1},dispatchSortableEvent:function(t){U({sortable:e,name:t,originalEvent:n})}},o))}var G=["evt"];function U(t){W(M({putSortable:lt,cloneEl:tt,targetEl:q,rootEl:$,oldIndex:nt,oldDraggableIndex:it,newIndex:ot,newDraggableIndex:rt},t))}var q,V,Z,$,Q,J,tt,et,nt,ot,it,rt,at,lt,st,ct,ut,dt,ht,ft,pt,gt,mt,vt,bt,yt=!1,wt=!1,Et=[],Dt=!1,St=!1,_t=[],Ct=!1,Tt=[],xt="undefined"!=typeof document,Ot=n,At=w||y?"cssFloat":"float",Mt=xt&&!c&&!n&&"draggable"in document.createElement("div"),Nt=function(){if(xt){if(y)return!1;var t=document.createElement("x");return t.style.cssText="pointer-events:auto","auto"===t.style.pointerEvents}}(),It=function(t,e){var n=P(t),o=parseInt(n.width)-parseInt(n.paddingLeft)-parseInt(n.paddingRight)-parseInt(n.borderLeftWidth)-parseInt(n.borderRightWidth),i=X(t,0,e),r=X(t,1,e),a=i&&P(i),l=r&&P(r),s=a&&parseInt(a.marginLeft)+parseInt(a.marginRight)+k(i).width,t=l&&parseInt(l.marginLeft)+parseInt(l.marginRight)+k(r).width;if("flex"===n.display)return"column"===n.flexDirection||"column-reverse"===n.flexDirection?"vertical":"horizontal";if("grid"===n.display)return n.gridTemplateColumns.split(" ").length<=1?"vertical":"horizontal";if(i&&a.float&&"none"!==a.float){e="left"===a.float?"left":"right";return!r||"both"!==l.clear&&l.clear!==e?"horizontal":"vertical"}return i&&("block"===a.display||"flex"===a.display||"table"===a.display||"grid"===a.display||o<=s&&"none"===n[At]||r&&"none"===n[At]&&o<s+t)?"vertical":"horizontal"},Pt=function(t){function l(r,a){return function(t,e,n,o){var i=t.options.group.name&&e.options.group.name&&t.options.group.name===e.options.group.name;if(null==r&&(a||i))return!0;if(null==r||!1===r)return!1;if(a&&"clone"===r)return r;if("function"==typeof r)return l(r(t,e,n,o),a)(t,e,n,o);e=(a?t:e).options.group.name;return!0===r||"string"==typeof r&&r===e||r.join&&-1<r.indexOf(e)}}var e={},n=t.group;n&&"object"==o(n)||(n={name:n}),e.name=n.name,e.checkPull=l(n.pull,!0),e.checkPut=l(n.put),e.revertClone=n.revertClone,t.group=e},kt=function(){!Nt&&Z&&P(Z,"display","none")},Rt=function(){!Nt&&Z&&P(Z,"display","")};xt&&!c&&document.addEventListener("click",function(t){if(wt)return t.preventDefault(),t.stopPropagation&&t.stopPropagation(),t.stopImmediatePropagation&&t.stopImmediatePropagation(),wt=!1},!0);function Xt(t){if(q){t=t.touches?t.touches[0]:t;var e=(i=t.clientX,r=t.clientY,Et.some(function(t){var e=t[j].options.emptyInsertThreshold;if(e&&!Y(t)){var n=k(t),o=i>=n.left-e&&i<=n.right+e,e=r>=n.top-e&&r<=n.bottom+e;return o&&e?a=t:void 0}}),a);if(e){var n,o={};for(n in t)t.hasOwnProperty(n)&&(o[n]=t[n]);o.target=o.rootEl=e,o.preventDefault=void 0,o.stopPropagation=void 0,e[j]._onDragOver(o)}}var i,r,a}function Yt(t){q&&q.parentNode[j]._isOutsideThisEl(t.target)}function Bt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[j]=this;var n,o,i={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return It(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==Bt.supportPointer&&"PointerEvent"in window&&!u,emptyInsertThreshold:5};for(n in K.initializePlugins(this,t,i),i)n in e||(e[n]=i[n]);for(o in Pt(e),this)"_"===o.charAt(0)&&"function"==typeof this[o]&&(this[o]=this[o].bind(this));this.nativeDraggable=!e.forceFallback&&Mt,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?h(t,"pointerdown",this._onTapStart):(h(t,"mousedown",this._onTapStart),h(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(h(t,"dragover",this),h(t,"dragenter",this)),Et.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,x())}function Ft(t,e,n,o,i,r,a,l){var s,c,u=t[j],d=u.options.onMove;return!window.CustomEvent||y||w?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||k(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),c=d?d.call(u,s,a):c}function jt(t){t.draggable=!1}function Ht(){Ct=!1}function Lt(t){return setTimeout(t,0)}function Kt(t){return clearTimeout(t)}Bt.prototype={constructor:Bt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(gt=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,q):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(!function(t){Tt.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&Tt.push(o)}}(o),!q&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled)&&!s.isContentEditable&&(this.nativeDraggable||!u||!l||"SELECT"!==l.tagName.toUpperCase())&&!((l=N(l,t.draggable,o,!1))&&l.animated||J===l)){if(nt=B(l),it=B(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return U({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),z("filter",n,{evt:e}),void(i&&e.cancelable&&e.preventDefault())}else if(c=c&&c.split(",").some(function(t){if(t=N(s,t.trim(),o,!1))return U({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),z("filter",n,{evt:e}),!0}))return void(i&&e.cancelable&&e.preventDefault());t.handle&&!N(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;n&&!q&&n.parentNode===r&&(o=k(n),$=r,V=(q=n).parentNode,Q=q.nextSibling,J=n,at=a.group,st={target:Bt.dragged=q,clientX:(e||t).clientX,clientY:(e||t).clientY},ht=st.clientX-o.left,ft=st.clientY-o.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,q.style["will-change"]="all",o=function(){z("delayEnded",i,{evt:t}),Bt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!s&&i.nativeDraggable&&(q.draggable=!0),i._triggerDragStart(t,e),U({sortable:i,name:"choose",originalEvent:t}),I(q,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){b(q,t.trim(),jt)}),h(l,"dragover",Xt),h(l,"mousemove",Xt),h(l,"touchmove",Xt),h(l,"mouseup",i._onDrop),h(l,"touchend",i._onDrop),h(l,"touchcancel",i._onDrop),s&&this.nativeDraggable&&(this.options.touchStartThreshold=4,q.draggable=!0),z("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(w||y)?o():Bt.eventCanceled?this._onDrop():(h(l,"mouseup",i._disableDelayedDrag),h(l,"touchend",i._disableDelayedDrag),h(l,"touchcancel",i._disableDelayedDrag),h(l,"mousemove",i._delayedDragTouchMoveHandler),h(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&h(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)))},_delayedDragTouchMoveHandler:function(t){t=t.touches?t.touches[0]:t;Math.max(Math.abs(t.clientX-this._lastX),Math.abs(t.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){q&&jt(q),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;f(t,"mouseup",this._disableDelayedDrag),f(t,"touchend",this._disableDelayedDrag),f(t,"touchcancel",this._disableDelayedDrag),f(t,"mousemove",this._delayedDragTouchMoveHandler),f(t,"touchmove",this._delayedDragTouchMoveHandler),f(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?h(document,"pointermove",this._onTouchMove):h(document,e?"touchmove":"mousemove",this._onTouchMove):(h(q,"dragend",this),h($,"dragstart",this._onDragStart));try{document.selection?Lt(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){var n;yt=!1,$&&q?(z("dragStarted",this,{evt:e}),this.nativeDraggable&&h(document,"dragover",Yt),n=this.options,t||I(q,n.dragClass,!1),I(q,n.ghostClass,!0),Bt.active=this,t&&this._appendGhost(),U({sortable:this,name:"start",originalEvent:e})):this._nulling()},_emulateDragOver:function(){if(ct){this._lastX=ct.clientX,this._lastY=ct.clientY,kt();for(var t=document.elementFromPoint(ct.clientX,ct.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(ct.clientX,ct.clientY))!==e;)e=t;if(q.parentNode[j]._isOutsideThisEl(t),e)do{if(e[j])if(e[j]._onDragOver({clientX:ct.clientX,clientY:ct.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}while(e=(t=e).parentNode);Rt()}},_onTouchMove:function(t){if(st){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=Z&&v(Z,!0),a=Z&&r&&r.a,l=Z&&r&&r.d,e=Ot&&bt&&E(bt),a=(i.clientX-st.clientX+o.x)/(a||1)+(e?e[0]-_t[0]:0)/(a||1),l=(i.clientY-st.clientY+o.y)/(l||1)+(e?e[1]-_t[1]:0)/(l||1);if(!Bt.active&&!yt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))<n)return;this._onDragStart(t,!0)}Z&&(r?(r.e+=a-(ut||0),r.f+=l-(dt||0)):r={a:1,b:0,c:0,d:1,e:a,f:l},r="matrix(".concat(r.a,",").concat(r.b,",").concat(r.c,",").concat(r.d,",").concat(r.e,",").concat(r.f,")"),P(Z,"webkitTransform",r),P(Z,"mozTransform",r),P(Z,"msTransform",r),P(Z,"transform",r),ut=a,dt=l,ct=i),t.cancelable&&t.preventDefault()}},_appendGhost:function(){if(!Z){var t=this.options.fallbackOnBody?document.body:$,e=k(q,!0,Ot,!0,t),n=this.options;if(Ot){for(bt=t;"static"===P(bt,"position")&&"none"===P(bt,"transform")&&bt!==document;)bt=bt.parentNode;bt!==document.body&&bt!==document.documentElement?(bt===document&&(bt=O()),e.top+=bt.scrollTop,e.left+=bt.scrollLeft):bt=O(),_t=E(bt)}I(Z=q.cloneNode(!0),n.ghostClass,!1),I(Z,n.fallbackClass,!0),I(Z,n.dragClass,!0),P(Z,"transition",""),P(Z,"transform",""),P(Z,"box-sizing","border-box"),P(Z,"margin",0),P(Z,"top",e.top),P(Z,"left",e.left),P(Z,"width",e.width),P(Z,"height",e.height),P(Z,"opacity","0.8"),P(Z,"position",Ot?"absolute":"fixed"),P(Z,"zIndex","100000"),P(Z,"pointerEvents","none"),Bt.ghost=Z,t.appendChild(Z),P(Z,"transform-origin",ht/parseInt(Z.style.width)*100+"% "+ft/parseInt(Z.style.height)*100+"%")}},_onDragStart:function(t,e){var n=this,o=t.dataTransfer,i=n.options;z("dragStart",this,{evt:t}),Bt.eventCanceled?this._onDrop():(z("setupClone",this),Bt.eventCanceled||((tt=_(q)).removeAttribute("id"),tt.draggable=!1,tt.style["will-change"]="",this._hideClone(),I(tt,this.options.chosenClass,!1),Bt.clone=tt),n.cloneId=Lt(function(){z("clone",n),Bt.eventCanceled||(n.options.removeCloneOnHide||$.insertBefore(tt,q),n._hideClone(),U({sortable:n,name:"clone"}))}),e||I(q,i.dragClass,!0),e?(wt=!0,n._loopId=setInterval(n._emulateDragOver,50)):(f(document,"mouseup",n._onDrop),f(document,"touchend",n._onDrop),f(document,"touchcancel",n._onDrop),o&&(o.effectAllowed="move",i.setData&&i.setData.call(n,o,q)),h(document,"drop",n),P(q,"transform","translateZ(0)")),yt=!0,n._dragStartId=Lt(n._dragStarted.bind(n,e,t)),h(document,"selectstart",n),pt=!0,u&&P(document.body,"user-select","none"))},_onDragOver:function(n){var o,i,r,t,a=this.el,l=n.target,e=this.options,s=e.group,c=Bt.active,u=at===s,d=e.sort,h=lt||c,f=this,p=!1;if(!Ct){if(void 0!==n.preventDefault&&n.cancelable&&n.preventDefault(),l=N(l,e.draggable,a,!0),T("dragOver"),Bt.eventCanceled)return p;if(q.contains(n.target)||l.animated&&l.animatingX&&l.animatingY||f._ignoreWhileAnimating===l)return O(!1);if(wt=!1,c&&!e.disabled&&(u?d||(i=V!==$):lt===this||(this.lastPutMode=at.checkPull(this,c,q,n))&&s.checkPut(this,c,q,n))){if(r="vertical"===this._getDirection(n,l),o=k(q),T("dragOverValid"),Bt.eventCanceled)return p;if(i)return V=$,x(),this._hideClone(),T("revert"),Bt.eventCanceled||(Q?$.insertBefore(q,Q):$.appendChild(q)),O(!0);var g=Y(a,e.draggable);if(!g||function(t,e,n){n=k(Y(n.el,n.options.draggable));return e?t.clientX>n.right+10||t.clientX<=n.right&&t.clientY>n.bottom&&t.clientX>=n.left:t.clientX>n.right&&t.clientY>n.top||t.clientX<=n.right&&t.clientY>n.bottom+10}(n,r,this)&&!g.animated){if(g===q)return O(!1);if((l=g&&a===n.target?g:l)&&(w=k(l)),!1!==Ft($,a,q,o,l,w,n,!!l))return x(),g&&g.nextSibling?a.insertBefore(q,g.nextSibling):a.appendChild(q),V=a,A(),O(!0)}else if(g&&function(t,e,n){n=k(X(n.el,0,n.options,!0));return e?t.clientX<n.left-10||t.clientY<n.top&&t.clientX<n.right:t.clientY<n.top-10||t.clientY<n.bottom&&t.clientX<n.left}(n,r,this)){var m=X(a,0,e,!0);if(m===q)return O(!1);if(w=k(l=m),!1!==Ft($,a,q,o,l,w,n,!1))return x(),a.insertBefore(q,m),V=a,A(),O(!0)}else if(l.parentNode===a){var v,b,y,w=k(l),E=q.parentNode!==a,D=(D=q.animated&&q.toRect||o,C=l.animated&&l.toRect||w,S=(t=r)?D.left:D.top,s=t?D.right:D.bottom,g=t?D.width:D.height,m=t?C.left:C.top,D=t?C.right:C.bottom,C=t?C.width:C.height,!(S===m||s===D||S+g/2===m+C/2)),S=r?"top":"left",g=R(l,"top","top")||R(q,"top","top"),m=g?g.scrollTop:void 0;if(gt!==l&&(b=w[S],Dt=!1,St=!D&&e.invertSwap||E),0!==(v=function(t,e,n,o,i,r,a,l){var s=o?t.clientY:t.clientX,c=o?n.height:n.width,t=o?n.top:n.left,o=o?n.bottom:n.right,n=!1;if(!a)if(l&&vt<c*i){if(Dt=!Dt&&(1===mt?t+c*r/2<s:s<o-c*r/2)?!0:Dt)n=!0;else if(1===mt?s<t+vt:o-vt<s)return-mt}else if(t+c*(1-i)/2<s&&s<o-c*(1-i)/2)return function(t){return B(q)<B(t)?1:-1}(e);if((n=n||a)&&(s<t+c*r/2||o-c*r/2<s))return t+c/2<s?1:-1;return 0}(n,l,w,r,D?1:e.swapThreshold,null==e.invertedSwapThreshold?e.swapThreshold:e.invertedSwapThreshold,St,gt===l)))for(var _=B(q);(y=V.children[_-=v])&&("none"===P(y,"display")||y===Z););if(0===v||y===l)return O(!1);mt=v;var C=(gt=l).nextElementSibling,E=!1,D=Ft($,a,q,o,l,w,n,E=1===v);if(!1!==D)return 1!==D&&-1!==D||(E=1===D),Ct=!0,setTimeout(Ht,30),x(),E&&!C?a.appendChild(q):l.parentNode.insertBefore(q,E?C:l),g&&F(g,0,m-g.scrollTop),V=q.parentNode,void 0===b||St||(vt=Math.abs(b-k(l)[S])),A(),O(!0)}if(a.contains(q))return O(!1)}return!1}function T(t,e){z(t,f,M({evt:n,isOwner:u,axis:r?"vertical":"horizontal",revert:i,dragRect:o,targetRect:w,canSort:d,fromSortable:h,target:l,completed:O,onMove:function(t,e){return Ft($,a,q,o,t,k(t),n,e)},changed:A},e))}function x(){T("dragOverAnimationCapture"),f.captureAnimationState(),f!==h&&h.captureAnimationState()}function O(t){return T("dragOverCompleted",{insertion:t}),t&&(u?c._hideClone():c._showClone(f),f!==h&&(I(q,(lt||c).options.ghostClass,!1),I(q,e.ghostClass,!0)),lt!==f&&f!==Bt.active?lt=f:f===Bt.active&&lt&&(lt=null),h===f&&(f._ignoreWhileAnimating=l),f.animateAll(function(){T("dragOverAnimationComplete"),f._ignoreWhileAnimating=null}),f!==h&&(h.animateAll(),h._ignoreWhileAnimating=null)),(l===q&&!q.animated||l===a&&!l.animated)&&(gt=null),e.dragoverBubble||n.rootEl||l===document||(q.parentNode[j]._isOutsideThisEl(n.target),t||Xt(n)),!e.dragoverBubble&&n.stopPropagation&&n.stopPropagation(),p=!0}function A(){ot=B(q),rt=B(q,e.draggable),U({sortable:f,name:"change",toEl:a,newIndex:ot,newDraggableIndex:rt,originalEvent:n})}},_ignoreWhileAnimating:null,_offMoveEvents:function(){f(document,"mousemove",this._onTouchMove),f(document,"touchmove",this._onTouchMove),f(document,"pointermove",this._onTouchMove),f(document,"dragover",Xt),f(document,"mousemove",Xt),f(document,"touchmove",Xt)},_offUpEvents:function(){var t=this.el.ownerDocument;f(t,"mouseup",this._onDrop),f(t,"touchend",this._onDrop),f(t,"pointerup",this._onDrop),f(t,"touchcancel",this._onDrop),f(document,"selectstart",this)},_onDrop:function(t){var e=this.el,n=this.options;ot=B(q),rt=B(q,n.draggable),z("drop",this,{evt:t}),V=q&&q.parentNode,ot=B(q),rt=B(q,n.draggable),Bt.eventCanceled||(Dt=St=yt=!1,clearInterval(this._loopId),clearTimeout(this._dragStartTimer),Kt(this.cloneId),Kt(this._dragStartId),this.nativeDraggable&&(f(document,"drop",this),f(e,"dragstart",this._onDragStart)),this._offMoveEvents(),this._offUpEvents(),u&&P(document.body,"user-select",""),P(q,"transform",""),t&&(pt&&(t.cancelable&&t.preventDefault(),n.dropBubble||t.stopPropagation()),Z&&Z.parentNode&&Z.parentNode.removeChild(Z),($===V||lt&&"clone"!==lt.lastPutMode)&&tt&&tt.parentNode&&tt.parentNode.removeChild(tt),q&&(this.nativeDraggable&&f(q,"dragend",this),jt(q),q.style["will-change"]="",pt&&!yt&&I(q,(lt||this).options.ghostClass,!1),I(q,this.options.chosenClass,!1),U({sortable:this,name:"unchoose",toEl:V,newIndex:null,newDraggableIndex:null,originalEvent:t}),$!==V?(0<=ot&&(U({rootEl:V,name:"add",toEl:V,fromEl:$,originalEvent:t}),U({sortable:this,name:"remove",toEl:V,originalEvent:t}),U({rootEl:V,name:"sort",toEl:V,fromEl:$,originalEvent:t}),U({sortable:this,name:"sort",toEl:V,originalEvent:t})),lt&&lt.save()):ot!==nt&&0<=ot&&(U({sortable:this,name:"update",toEl:V,originalEvent:t}),U({sortable:this,name:"sort",toEl:V,originalEvent:t})),Bt.active&&(null!=ot&&-1!==ot||(ot=nt,rt=it),U({sortable:this,name:"end",toEl:V,originalEvent:t}),this.save())))),this._nulling()},_nulling:function(){z("nulling",this),$=q=V=Z=Q=tt=J=et=st=ct=pt=ot=rt=nt=it=gt=mt=lt=at=Bt.dragged=Bt.ghost=Bt.clone=Bt.active=null,Tt.forEach(function(t){t.checked=!0}),Tt.length=ut=dt=0},handleEvent:function(t){switch(t.type){case"drop":case"dragend":this._onDrop(t);break;case"dragenter":case"dragover":q&&(this._onDragOver(t),function(t){t.dataTransfer&&(t.dataTransfer.dropEffect="move");t.cancelable&&t.preventDefault()}(t));break;case"selectstart":t.preventDefault()}},toArray:function(){for(var t,e=[],n=this.el.children,o=0,i=n.length,r=this.options;o<i;o++)N(t=n[o],r.draggable,this.el,!1)&&e.push(t.getAttribute(r.dataIdAttr)||function(t){var e=t.tagName+t.className+t.src+t.href+t.textContent,n=e.length,o=0;for(;n--;)o+=e.charCodeAt(n);return o.toString(36)}(t));return e},sort:function(t,e){var n={},o=this.el;this.toArray().forEach(function(t,e){e=o.children[e];N(e,this.options.draggable,o,!1)&&(n[t]=e)},this),e&&this.captureAnimationState(),t.forEach(function(t){n[t]&&(o.removeChild(n[t]),o.appendChild(n[t]))}),e&&this.animateAll()},save:function(){var t=this.options.store;t&&t.set&&t.set(this)},closest:function(t,e){return N(t,e||this.options.draggable,this.el,!1)},option:function(t,e){var n=this.options;if(void 0===e)return n[t];var o=K.modifyOption(this,t,e);n[t]=void 0!==o?o:e,"group"===t&&Pt(n)},destroy:function(){z("destroy",this);var t=this.el;t[j]=null,f(t,"mousedown",this._onTapStart),f(t,"touchstart",this._onTapStart),f(t,"pointerdown",this._onTapStart),this.nativeDraggable&&(f(t,"dragover",this),f(t,"dragenter",this)),Array.prototype.forEach.call(t.querySelectorAll("[draggable]"),function(t){t.removeAttribute("draggable")}),this._onDrop(),this._disableDelayedDragEvents(),Et.splice(Et.indexOf(this.el),1),this.el=t=null},_hideClone:function(){et||(z("hideClone",this),Bt.eventCanceled||(P(tt,"display","none"),this.options.removeCloneOnHide&&tt.parentNode&&tt.parentNode.removeChild(tt),et=!0))},_showClone:function(t){"clone"===t.lastPutMode?et&&(z("showClone",this),Bt.eventCanceled||(q.parentNode!=$||this.options.group.revertClone?Q?$.insertBefore(tt,Q):$.appendChild(tt):$.insertBefore(tt,q),this.options.group.revertClone&&this.animate(q,tt),P(tt,"display",""),et=!1)):this._hideClone()}},xt&&h(document,"touchmove",function(t){(Bt.active||yt)&&t.cancelable&&t.preventDefault()}),Bt.utils={on:h,off:f,css:P,find:b,is:function(t,e){return!!N(t,e,t,!1)},extend:function(t,e){if(t&&e)for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t},throttle:S,closest:N,toggleClass:I,clone:_,index:B,nextTick:Lt,cancelNextTick:Kt,detectDirection:It,getChild:X},Bt.get=function(t){return t[j]},Bt.mount=function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];(e=e[0].constructor===Array?e[0]:e).forEach(function(t){if(!t.prototype||!t.prototype.constructor)throw"Sortable: Mounted plugin must be a constructor function, not ".concat({}.toString.call(t));t.utils&&(Bt.utils=M(M({},Bt.utils),t.utils)),K.mount(t)})},Bt.create=function(t,e){return new Bt(t,e)};var Wt,zt,Gt,Ut,qt,Vt,Zt=[],$t=!(Bt.version="1.15.0");function Qt(){Zt.forEach(function(t){clearInterval(t.pid)}),Zt=[]}function Jt(){clearInterval(Vt)}var te,ee=S(function(n,t,e,o){if(t.scroll){var i,r=(n.touches?n.touches[0]:n).clientX,a=(n.touches?n.touches[0]:n).clientY,l=t.scrollSensitivity,s=t.scrollSpeed,c=O(),u=!1;zt!==e&&(zt=e,Qt(),Wt=t.scroll,i=t.scrollFn,!0===Wt&&(Wt=A(e,!0)));var d=0,h=Wt;do{var f=h,p=k(f),g=p.top,m=p.bottom,v=p.left,b=p.right,y=p.width,w=p.height,E=void 0,D=void 0,S=f.scrollWidth,_=f.scrollHeight,C=P(f),T=f.scrollLeft,p=f.scrollTop,D=f===c?(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX||"visible"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY||"visible"===C.overflowY)):(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY)),T=E&&(Math.abs(b-r)<=l&&T+y<S)-(Math.abs(v-r)<=l&&!!T),p=D&&(Math.abs(m-a)<=l&&p+w<_)-(Math.abs(g-a)<=l&&!!p);if(!Zt[d])for(var x=0;x<=d;x++)Zt[x]||(Zt[x]={});Zt[d].vx==T&&Zt[d].vy==p&&Zt[d].el===f||(Zt[d].el=f,Zt[d].vx=T,Zt[d].vy=p,clearInterval(Zt[d].pid),0==T&&0==p||(u=!0,Zt[d].pid=setInterval(function(){o&&0===this.layer&&Bt.active._onTouchMove(qt);var t=Zt[this.layer].vy?Zt[this.layer].vy*s:0,e=Zt[this.layer].vx?Zt[this.layer].vx*s:0;"function"==typeof i&&"continue"!==i.call(Bt.dragged.parentNode[j],e,t,n,qt,Zt[this.layer].el)||F(Zt[this.layer].el,e,t)}.bind({layer:d}),24))),d++}while(t.bubbleScroll&&h!==c&&(h=A(h,!1)));$t=u}},30),c=function(t){var e=t.originalEvent,n=t.putSortable,o=t.dragEl,i=t.activeSortable,r=t.dispatchSortableEvent,a=t.hideGhostForTarget,t=t.unhideGhostForTarget;e&&(i=n||i,a(),e=e.changedTouches&&e.changedTouches.length?e.changedTouches[0]:e,e=document.elementFromPoint(e.clientX,e.clientY),t(),i&&!i.el.contains(e)&&(r("spill"),this.onSpill({dragEl:o,putSortable:n})))};function ne(){}function oe(){}ne.prototype={startIndex:null,dragStart:function(t){t=t.oldDraggableIndex;this.startIndex=t},onSpill:function(t){var e=t.dragEl,n=t.putSortable;this.sortable.captureAnimationState(),n&&n.captureAnimationState();t=X(this.sortable.el,this.startIndex,this.options);t?this.sortable.el.insertBefore(e,t):this.sortable.el.appendChild(e),this.sortable.animateAll(),n&&n.animateAll()},drop:c},a(ne,{pluginName:"revertOnSpill"}),oe.prototype={onSpill:function(t){var e=t.dragEl,t=t.putSortable||this.sortable;t.captureAnimationState(),e.parentNode&&e.parentNode.removeChild(e),t.animateAll()},drop:c},a(oe,{pluginName:"removeOnSpill"});var ie,re,ae,le,se,ce=[],ue=[],de=!1,he=!1,fe=!1;function pe(n,o){ue.forEach(function(t,e){e=o.children[t.sortableIndex+(n?Number(e):0)];e?o.insertBefore(t,e):o.appendChild(t)})}function ge(){ce.forEach(function(t){t!==ae&&t.parentNode&&t.parentNode.removeChild(t)})}return Bt.mount(new function(){function t(){for(var t in this.defaults={scroll:!0,forceAutoScrollFallback:!1,scrollSensitivity:30,scrollSpeed:10,bubbleScroll:!0},this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this))}return t.prototype={dragStarted:function(t){t=t.originalEvent;this.sortable.nativeDraggable?h(document,"dragover",this._handleAutoScroll):this.options.supportPointer?h(document,"pointermove",this._handleFallbackAutoScroll):t.touches?h(document,"touchmove",this._handleFallbackAutoScroll):h(document,"mousemove",this._handleFallbackAutoScroll)},dragOverCompleted:function(t){t=t.originalEvent;this.options.dragOverBubble||t.rootEl||this._handleAutoScroll(t)},drop:function(){this.sortable.nativeDraggable?f(document,"dragover",this._handleAutoScroll):(f(document,"pointermove",this._handleFallbackAutoScroll),f(document,"touchmove",this._handleFallbackAutoScroll),f(document,"mousemove",this._handleFallbackAutoScroll)),Jt(),Qt(),clearTimeout(g),g=void 0},nulling:function(){qt=zt=Wt=$t=Vt=Gt=Ut=null,Zt.length=0},_handleFallbackAutoScroll:function(t){this._handleAutoScroll(t,!0)},_handleAutoScroll:function(e,n){var o,i=this,r=(e.touches?e.touches[0]:e).clientX,a=(e.touches?e.touches[0]:e).clientY,t=document.elementFromPoint(r,a);qt=e,n||this.options.forceAutoScrollFallback||w||y||u?(ee(e,this.options,t,n),o=A(t,!0),!$t||Vt&&r===Gt&&a===Ut||(Vt&&Jt(),Vt=setInterval(function(){var t=A(document.elementFromPoint(r,a),!0);t!==o&&(o=t,Qt()),ee(e,i.options,t,n)},10),Gt=r,Ut=a)):this.options.bubbleScroll&&A(t,!0)!==O()?ee(e,this.options,A(t,!1),!1):Qt()}},a(t,{pluginName:"scroll",initializeByDefault:!0})}),Bt.mount(oe,ne),Bt.mount(new function(){function t(){this.defaults={swapClass:"sortable-swap-highlight"}}return t.prototype={dragStart:function(t){t=t.dragEl;te=t},dragOverValid:function(t){var e=t.completed,n=t.target,o=t.onMove,i=t.activeSortable,r=t.changed,a=t.cancel;i.options.swap&&(t=this.sortable.el,i=this.options,n&&n!==t&&(t=te,te=!1!==o(n)?(I(n,i.swapClass,!0),n):null,t&&t!==te&&I(t,i.swapClass,!1)),r(),e(!0),a())},drop:function(t){var e,n,o=t.activeSortable,i=t.putSortable,r=t.dragEl,a=i||this.sortable,l=this.options;te&&I(te,l.swapClass,!1),te&&(l.swap||i&&i.options.swap)&&r!==te&&(a.captureAnimationState(),a!==o&&o.captureAnimationState(),n=te,t=(e=r).parentNode,l=n.parentNode,t&&l&&!t.isEqualNode(n)&&!l.isEqualNode(e)&&(i=B(e),r=B(n),t.isEqualNode(l)&&i<r&&r++,t.insertBefore(n,t.children[i]),l.insertBefore(e,l.children[r])),a.animateAll(),a!==o&&o.animateAll())},nulling:function(){te=null}},a(t,{pluginName:"swap",eventProperties:function(){return{swapItem:te}}})}),Bt.mount(new function(){function t(o){for(var t in this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this));o.options.avoidImplicitDeselect||(o.options.supportPointer?h(document,"pointerup",this._deselectMultiDrag):(h(document,"mouseup",this._deselectMultiDrag),h(document,"touchend",this._deselectMultiDrag))),h(document,"keydown",this._checkKeyDown),h(document,"keyup",this._checkKeyUp),this.defaults={selectedClass:"sortable-selected",multiDragKey:null,avoidImplicitDeselect:!1,setData:function(t,e){var n="";ce.length&&re===o?ce.forEach(function(t,e){n+=(e?", ":"")+t.textContent}):n=e.textContent,t.setData("Text",n)}}}return t.prototype={multiDragKeyDown:!1,isMultiDrag:!1,delayStartGlobal:function(t){t=t.dragEl;ae=t},delayEnded:function(){this.isMultiDrag=~ce.indexOf(ae)},setupClone:function(t){var e=t.sortable,t=t.cancel;if(this.isMultiDrag){for(var n=0;n<ce.length;n++)ue.push(_(ce[n])),ue[n].sortableIndex=ce[n].sortableIndex,ue[n].draggable=!1,ue[n].style["will-change"]="",I(ue[n],this.options.selectedClass,!1),ce[n]===ae&&I(ue[n],this.options.chosenClass,!1);e._hideClone(),t()}},clone:function(t){var e=t.sortable,n=t.rootEl,o=t.dispatchSortableEvent,t=t.cancel;this.isMultiDrag&&(this.options.removeCloneOnHide||ce.length&&re===e&&(pe(!0,n),o("clone"),t()))},showClone:function(t){var e=t.cloneNowShown,n=t.rootEl,t=t.cancel;this.isMultiDrag&&(pe(!1,n),ue.forEach(function(t){P(t,"display","")}),e(),se=!1,t())},hideClone:function(t){var e=this,n=(t.sortable,t.cloneNowHidden),t=t.cancel;this.isMultiDrag&&(ue.forEach(function(t){P(t,"display","none"),e.options.removeCloneOnHide&&t.parentNode&&t.parentNode.removeChild(t)}),n(),se=!0,t())},dragStartGlobal:function(t){t.sortable;!this.isMultiDrag&&re&&re.multiDrag._deselectMultiDrag(),ce.forEach(function(t){t.sortableIndex=B(t)}),ce=ce.sort(function(t,e){return t.sortableIndex-e.sortableIndex}),fe=!0},dragStarted:function(t){var e,n=this,t=t.sortable;this.isMultiDrag&&(this.options.sort&&(t.captureAnimationState(),this.options.animation&&(ce.forEach(function(t){t!==ae&&P(t,"position","absolute")}),e=k(ae,!1,!0,!0),ce.forEach(function(t){t!==ae&&C(t,e)}),de=he=!0)),t.animateAll(function(){de=he=!1,n.options.animation&&ce.forEach(function(t){T(t)}),n.options.sort&&ge()}))},dragOver:function(t){var e=t.target,n=t.completed,t=t.cancel;he&&~ce.indexOf(e)&&(n(!1),t())},revert:function(t){var n,o,e=t.fromSortable,i=t.rootEl,r=t.sortable,a=t.dragRect;1<ce.length&&(ce.forEach(function(t){r.addAnimationState({target:t,rect:he?k(t):a}),T(t),t.fromRect=a,e.removeAnimationState(t)}),he=!1,n=!this.options.removeCloneOnHide,o=i,ce.forEach(function(t,e){e=o.children[t.sortableIndex+(n?Number(e):0)];e?o.insertBefore(t,e):o.appendChild(t)}))},dragOverCompleted:function(t){var e,n=t.sortable,o=t.isOwner,i=t.insertion,r=t.activeSortable,a=t.parentEl,l=t.putSortable,t=this.options;i&&(o&&r._hideClone(),de=!1,t.animation&&1<ce.length&&(he||!o&&!r.options.sort&&!l)&&(e=k(ae,!1,!0,!0),ce.forEach(function(t){t!==ae&&(C(t,e),a.appendChild(t))}),he=!0),o||(he||ge(),1<ce.length?(o=se,r._showClone(n),r.options.animation&&!se&&o&&ue.forEach(function(t){r.addAnimationState({target:t,rect:le}),t.fromRect=le,t.thisAnimationDuration=null})):r._showClone(n)))},dragOverAnimationCapture:function(t){var e=t.dragRect,n=t.isOwner,t=t.activeSortable;ce.forEach(function(t){t.thisAnimationDuration=null}),t.options.animation&&!n&&t.multiDrag.isMultiDrag&&(le=a({},e),e=v(ae,!0),le.top-=e.f,le.left-=e.e)},dragOverAnimationComplete:function(){he&&(he=!1,ge())},drop:function(t){var e=t.originalEvent,n=t.rootEl,o=t.parentEl,i=t.sortable,r=t.dispatchSortableEvent,a=t.oldIndex,l=t.putSortable,s=l||this.sortable;if(e){var c,u,d,h=this.options,f=o.children;if(!fe)if(h.multiDragKey&&!this.multiDragKeyDown&&this._deselectMultiDrag(),I(ae,h.selectedClass,!~ce.indexOf(ae)),~ce.indexOf(ae))ce.splice(ce.indexOf(ae),1),ie=null,W({sortable:i,rootEl:n,name:"deselect",targetEl:ae,originalEvent:e});else{if(ce.push(ae),W({sortable:i,rootEl:n,name:"select",targetEl:ae,originalEvent:e}),e.shiftKey&&ie&&i.el.contains(ie)){var p=B(ie),t=B(ae);if(~p&&~t&&p!==t)for(var g,m=p<t?(g=p,t):(g=t,p+1);g<m;g++)~ce.indexOf(f[g])||(I(f[g],h.selectedClass,!0),ce.push(f[g]),W({sortable:i,rootEl:n,name:"select",targetEl:f[g],originalEvent:e}))}else ie=ae;re=s}fe&&this.isMultiDrag&&(he=!1,(o[j].options.sort||o!==n)&&1<ce.length&&(c=k(ae),u=B(ae,":not(."+this.options.selectedClass+")"),!de&&h.animation&&(ae.thisAnimationDuration=null),s.captureAnimationState(),de||(h.animation&&(ae.fromRect=c,ce.forEach(function(t){var e;t.thisAnimationDuration=null,t!==ae&&(e=he?k(t):c,t.fromRect=e,s.addAnimationState({target:t,rect:e}))})),ge(),ce.forEach(function(t){f[u]?o.insertBefore(t,f[u]):o.appendChild(t),u++}),a===B(ae)&&(d=!1,ce.forEach(function(t){t.sortableIndex!==B(t)&&(d=!0)}),d&&r("update"))),ce.forEach(function(t){T(t)}),s.animateAll()),re=s),(n===o||l&&"clone"!==l.lastPutMode)&&ue.forEach(function(t){t.parentNode&&t.parentNode.removeChild(t)})}},nullingGlobal:function(){this.isMultiDrag=fe=!1,ue.length=0},destroyGlobal:function(){this._deselectMultiDrag(),f(document,"pointerup",this._deselectMultiDrag),f(document,"mouseup",this._deselectMultiDrag),f(document,"touchend",this._deselectMultiDrag),f(document,"keydown",this._checkKeyDown),f(document,"keyup",this._checkKeyUp)},_deselectMultiDrag:function(t){if(!(void 0!==fe&&fe||re!==this.sortable||t&&N(t.target,this.options.draggable,this.sortable.el,!1)||t&&0!==t.button))for(;ce.length;){var e=ce[0];I(e,this.options.selectedClass,!1),ce.shift(),W({sortable:this.sortable,rootEl:this.sortable.el,name:"deselect",targetEl:e,originalEvent:t})}},_checkKeyDown:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!0)},_checkKeyUp:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!1)}},a(t,{pluginName:"multiDrag",utils:{select:function(t){var e=t.parentNode[j];e&&e.options.multiDrag&&!~ce.indexOf(t)&&(re&&re!==e&&(re.multiDrag._deselectMultiDrag(),re=e),I(t,e.options.selectedClass,!0),ce.push(t))},deselect:function(t){var e=t.parentNode[j],n=ce.indexOf(t);e&&e.options.multiDrag&&~n&&(I(t,e.options.selectedClass,!1),ce.splice(n,1))}},eventProperties:function(){var n=this,o=[],i=[];return ce.forEach(function(t){var e;o.push({multiDragElement:t,index:t.sortableIndex}),e=he&&t!==ae?-1:he?B(t,":not(."+n.options.selectedClass+")"):B(t),i.push({multiDragElement:t,index:e})}),{items:r(ce),clones:[].concat(ue),oldIndicies:o,newIndicies:i}},optionListeners:{multiDragKey:function(t){return"ctrl"===(t=t.toLowerCase())?t="Control":1<t.length&&(t=t.charAt(0).toUpperCase()+t.substr(1)),t}}})}),Bt});
\ No newline at end of file

From fba95956de38355ab50d2235969ea8e0b94ae868 Mon Sep 17 00:00:00 2001
From: Benedikt McMullin <benedikt@mcmullin.de>
Date: Mon, 2 Jan 2023 21:21:43 +0100
Subject: [PATCH 371/412] epub: Skip invalid dc:identifier

---
 cps/epub.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cps/epub.py b/cps/epub.py
index 00ce907b8..a807a2e6c 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -102,7 +102,10 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     identifiers = []
     for node in p.xpath('dc:identifier', namespaces=ns):
-        identifier_name = node.attrib.values()[-1]
+        try:
+            identifier_name = node.attrib.values()[-1]
+        except IndexError:
+            continue
         identifier_value = node.text
         if identifier_name in ('uuid', 'calibre') or identifier_value is None:
             continue

From b3335f673370a4956af31a94c2d520217440a19d Mon Sep 17 00:00:00 2001
From: Josh O'Brien <Josh@OBrien.in>
Date: Wed, 4 Jan 2023 13:30:13 +1100
Subject: [PATCH 372/412] English Language Updates - V3

---
 cps/admin.py                     | 22 +++++------
 cps/helper.py                    | 60 ++++++++++++++---------------
 cps/render_template.py           | 18 ++++-----
 cps/templates/admin.html         | 26 ++++++-------
 cps/templates/config_edit.html   |  2 +-
 cps/templates/detail.html        |  6 +--
 cps/templates/email_edit.html    | 12 +++---
 cps/templates/register.html      |  4 +-
 cps/templates/schedule_edit.html |  8 ++--
 cps/templates/shelfdown.html     |  0
 cps/templates/user_edit.html     |  4 +-
 cps/templates/user_table.html    | 26 ++++++-------
 cps/web.py                       | 66 ++++++++++++++++----------------
 13 files changed, 127 insertions(+), 127 deletions(-)
 mode change 100755 => 100644 cps/helper.py
 mode change 100755 => 100644 cps/templates/admin.html
 mode change 100755 => 100644 cps/templates/detail.html
 mode change 100755 => 100644 cps/templates/shelfdown.html
 mode change 100755 => 100644 cps/templates/user_edit.html
 mode change 100755 => 100644 cps/templates/user_table.html
 mode change 100755 => 100644 cps/web.py

diff --git a/cps/admin.py b/cps/admin.py
index b415f412a..148ddb9cd 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -145,9 +145,9 @@ def shutdown():
         ub.dispose()
 
         if task == 0:
-            show_text['text'] = _(u'Server restarted, please reload page')
+            show_text['text'] = _(u'Server restarted, please reload page.')
         else:
-            show_text['text'] = _(u'Performing shutdown of server, please close window')
+            show_text['text'] = _(u'Performing Server shutdown, please close window.')
         # stop gevent/tornado server
         web_server.stop(task == 0)
         return json.dumps(show_text)
@@ -155,7 +155,7 @@ def shutdown():
     if task == 2:
         log.warning("reconnecting to calibre database")
         calibre_db.reconnect_db(config, ub.app_DB_path)
-        show_text['text'] = _(u'Reconnect successful')
+        show_text['text'] = _(u'Success! Database Reconnected')
         return json.dumps(show_text)
 
     show_text['text'] = _(u'Unknown command')
@@ -169,7 +169,7 @@ def queue_metadata_backup():
     show_text = {}
     log.warning("Queuing all books for metadata backup")
     helper.set_all_metadata_dirty()
-    show_text['text'] = _(u'Books successfully queued for Metadata Backup')
+    show_text['text'] = _(u'Success! Books queued for Metadata Backup')
     return json.dumps(show_text)
 
 
@@ -1256,7 +1256,7 @@ def new_user():
         content.default_language = config.config_default_language
     return render_title_template("user_edit.html", new_user=1, content=content,
                                  config=config, translations=translations,
-                                 languages=languages, title=_(u"Add new user"), page="newuser",
+                                 languages=languages, title=_(u"Add New User"), page="newuser",
                                  kobo_support=kobo_support, registered_oauth=oauth_check)
 
 
@@ -1265,7 +1265,7 @@ def new_user():
 @admin_required
 def edit_mailsettings():
     content = config.get_mail_settings()
-    return render_title_template("email_edit.html", content=content, title=_(u"Edit E-mail Server Settings"),
+    return render_title_template("email_edit.html", content=content, title=_(u"Edit Email Server Settings"),
                                  page="mailset", feature_support=feature_support)
 
 
@@ -1284,7 +1284,7 @@ def update_mailsettings():
     elif to_save.get("gmail"):
         try:
             config.mail_gmail_token = services.gmail.setup_gmail(config.mail_gmail_token)
-            flash(_(u"Gmail Account Verification Successful"), category="success")
+            flash(_(u"Success! Gmail Account Verified."), category="success")
         except Exception as ex:
             flash(str(ex), category="error")
             log.error(ex)
@@ -1425,13 +1425,13 @@ def reset_user_password(user_id):
         ret, message = reset_password(user_id)
         if ret == 1:
             log.debug(u"Password for user %s reset", message)
-            flash(_(u"Password for user %(user)s reset", user=message), category="success")
+            flash(_(u"Success! Password for user %(user)s reset", user=message), category="success")
         elif ret == 0:
             log.error(u"An unknown error occurred. Please try again later.")
-            flash(_(u"An unknown error occurred. Please try again later."), category="error")
+            flash(_(u"Oops! An unknown error occurred. Please try again later."), category="error")
         else:
-            log.error(u"Please configure the SMTP mail settings first...")
-            flash(_(u"Please configure the SMTP mail settings first..."), category="error")
+            log.error(u"Please configure the SMTP mail settings.")
+            flash(_(u"Oops! Please configure the SMTP mail settings."), category="error")
     return redirect(url_for('admin.admin'))
 
 
diff --git a/cps/helper.py b/cps/helper.py
old mode 100755
new mode 100644
index 212ce1420..c0ad594ba
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -94,8 +94,8 @@ def convert_book_format(book_id, calibre_path, old_book_format, new_book_format,
     # read settings and append converter task to queue
     if ereader_mail:
         settings = config.get_mail_settings()
-        settings['subject'] = _('Send to E-Reader')  # pretranslate Subject for e-mail
-        settings['body'] = _(u'This e-mail has been sent via Calibre-Web.')
+        settings['subject'] = _('Send to eReader')  # pretranslate Subject for Email
+        settings['body'] = _(u'This Email has been sent via Calibre-Web.')
     else:
         settings = dict()
     link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))  # prevent xss
@@ -111,30 +111,30 @@ def convert_book_format(book_id, calibre_path, old_book_format, new_book_format,
 
 # Texts are not lazy translated as they are supposed to get send out as is
 def send_test_mail(ereader_mail, user_name):
-    WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web test e-mail'), None, None,
-                     config.get_mail_settings(), ereader_mail, N_(u"Test e-mail"),
-                                          _(u'This e-mail has been sent via Calibre-Web.')))
+    WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web Test Email'), None, None,
+                     config.get_mail_settings(), ereader_mail, N_(u"Test Email"),
+                                          _(u'This Email 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):
-    txt = "Hello %s!\r\n" % user_name
+    txt = "Hi %s!\r\n" % user_name
     if not resend:
-        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 information:\r\n"
-    txt += "User name: %s\r\n" % user_name
+        txt += "Your account at Calibre-Web has been created.\r\n"
+    txt += "Please log in using the following information:\r\n"
+    txt += "Username: %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"
+    txt += "Don't forget to change your password after your first login.\r\n"
+    txt += "Regards,\r\n\r\n"
+    txt += "Calibre-Web"
     WorkerThread.add(None, TaskEmail(
         subject=_(u'Get Started with Calibre-Web'),
         filepath=None,
         attachment=None,
         settings=config.get_mail_settings(),
         recipient=e_mail,
-        task_message=N_(u"Registration e-mail for user: %(name)s", name=user_name),
+        task_message=N_(u"Registration Email for user: %(name)s", name=user_name),
         text=txt
     ))
     return
@@ -145,13 +145,13 @@ def check_send_to_ereader_with_converter(formats):
     if 'MOBI' in formats and 'EPUB' not in formats:
         book_formats.append({'format': 'Epub',
                              'convert': 1,
-                             'text': _('Convert %(orig)s to %(format)s and send to E-Reader',
+                             'text': _('Convert %(orig)s to %(format)s and send to eReader',
                                        orig='Mobi',
                                        format='Epub')})
     if 'AZW3' in formats and 'EPUB' not in formats:
         book_formats.append({'format': 'Epub',
                              'convert': 2,
-                             'text': _('Convert %(orig)s to %(format)s and send to E-Reader',
+                             'text': _('Convert %(orig)s to %(format)s and send to eReader',
                                        orig='Azw3',
                                        format='Epub')})
     return book_formats
@@ -159,7 +159,7 @@ def check_send_to_ereader_with_converter(formats):
 
 def check_send_to_ereader(entry):
     """
-        returns all available book formats for sending to E-Reader
+        returns all available book formats for sending to eReader
     """
     formats = list()
     book_formats = list()
@@ -170,19 +170,19 @@ def check_send_to_ereader(entry):
         if 'EPUB' in formats:
             book_formats.append({'format': 'Epub',
                                  'convert': 0,
-                                 'text': _('Send %(format)s to E-Reader', format='Epub')})
+                                 'text': _('Send %(format)s to eReader', format='Epub')})
         if 'MOBI' in formats:
             book_formats.append({'format': 'Mobi',
                                  'convert': 0,
-                                 'text': _('Send %(format)s to E-Reader', format='Mobi')})
+                                 'text': _('Send %(format)s to eReader', format='Mobi')})
         if 'PDF' in formats:
             book_formats.append({'format': 'Pdf',
                                  'convert': 0,
-                                 'text': _('Send %(format)s to E-Reader', format='Pdf')})
+                                 'text': _('Send %(format)s to eReader', format='Pdf')})
         if 'AZW' in formats:
             book_formats.append({'format': 'Azw',
                                  'convert': 0,
-                                 'text': _('Send %(format)s to E-Reader', format='Azw')})
+                                 'text': _('Send %(format)s to eReader', format='Azw')})
         if config.config_converterpath:
             book_formats.extend(check_send_to_ereader_with_converter(formats))
         return book_formats
@@ -204,9 +204,9 @@ def check_read_formats(entry):
 
 
 # Files are processed in the following order/priority:
-# 1: If Mobi file is existing, it's directly send to E-Reader email,
-# 2: If Epub file is existing, it's converted and send to E-Reader email,
-# 3: If Pdf file is existing, it's directly send to E-Reader email
+# 1: If Mobi file is existing, it's directly send to eReader email,
+# 2: If Epub file is existing, it's converted and send to eReader email,
+# 3: If Pdf file is existing, it's directly send to eReader email
 def send_mail(book_id, book_format, convert, ereader_mail, calibrepath, user_id):
     """Send email with attachments"""
     book = calibre_db.get_book(book_id)
@@ -222,10 +222,10 @@ def send_mail(book_id, book_format, convert, ereader_mail, calibrepath, user_id)
         if entry.format.upper() == book_format.upper():
             converted_file_name = entry.name + '.' + book_format.lower()
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(book.title))
-            email_text = N_(u"%(book)s send to E-Reader", book=link)
-            WorkerThread.add(user_id, TaskEmail(_(u"Send to E-Reader"), book.path, converted_file_name,
+            email_text = N_(u"%(book)s send to eReader", book=link)
+            WorkerThread.add(user_id, TaskEmail(_(u"Send to eReader"), book.path, converted_file_name,
                              config.get_mail_settings(), ereader_mail,
-                             email_text, _(u'This e-mail has been sent via Calibre-Web.')))
+                             email_text, _(u'This Email has been sent via Calibre-Web.')))
             return
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
@@ -640,8 +640,8 @@ def uniq(inpt):
 def check_email(email):
     email = valid_email(email)
     if ub.session.query(ub.User).filter(func.lower(ub.User.email) == email.lower()).first():
-        log.error(u"Found an existing account for this e-mail address")
-        raise Exception(_(u"Found an existing account for this e-mail address"))
+        log.error(u"Found an existing account for this Email address")
+        raise Exception(_(u"Found an existing account for this Email address"))
     return email
 
 
@@ -660,8 +660,8 @@ def valid_email(email):
         # 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])?)*$",
                          email):
-            log.error(u"Invalid e-mail address format")
-            raise Exception(_(u"Invalid e-mail address format"))
+            log.error(u"Invalid Email address format")
+            raise Exception(_(u"Invalid Email address format"))
     return email
 
 # ################################# External interface #################################
diff --git a/cps/render_template.py b/cps/render_template.py
index 04a50bbb5..74462f9f7 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -59,7 +59,7 @@ def get_sidebar_config(kwargs=None):
          "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})
+                    "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",
@@ -69,31 +69,31 @@ def get_sidebar_config(kwargs=None):
                     "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})
+                    "show_text": _('Show Category Section'), "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})
+                    "show_text": _('Show Series Section'), "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})
+                    "show_text": _('Show Author Section'), "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})
+         "show_text": _('Show Publisher Section'), "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})
+                    "show_text": _('Show Language Section'), "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})
+                    "page": "rating", "show_text": _('Show Ratings Section'), "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})
+                    "page": "format", "show_text": _('Show File Formats Section'), "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})
+         "show_text": _('Show Archived Books'), "config_show": content})
     if not simple:
         sidebar.append(
             {"glyph": "glyphicon-th-list", "text": _('Books List'), "link": 'web.books_table', "id": "list",
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
old mode 100755
new mode 100644
index 4d6eff953..1199b21fb
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -11,8 +11,8 @@
       <table class="table table-striped" id="table_user">
         <tr>
             <th>{{_('Username')}}</th>
-            <th>{{_('E-mail Address')}}</th>
-            <th>{{_('Send to E-Reader E-mail Address')}}</th>
+            <th>{{_('Email')}}</th>
+            <th>{{_('Send to eReader Email')}}</th>
             <th>{{_('Downloads')}}</th>
             <th class="hidden-xs ">{{_('Admin')}}</th>
             <th class="hidden-xs hidden-sm">{{_('Password')}}</th>
@@ -59,7 +59,7 @@
 
   <div class="row">
     <div class="col">
-      <h2>{{_('E-mail Server Settings')}}</h2>
+      <h2>{{_('Email Server Settings')}}</h2>
       {% if config.get_mail_server_configured() %}
         {% if email.mail_server_type == 0 %}
         <div class="col-xs-12 col-sm-12">
@@ -80,24 +80,24 @@
             <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">{{_('From Email')}}</div>
             <div class="col-xs-6 col-sm-3">{{email.mail_from}}</div>
           </div>
         </div>
       {% else %}
         <div class="col-xs-12 col-sm-12">
           <div class="row">
-            <div class="col-xs-6 col-sm-3">{{_('E-Mail Service')}}</div>
+            <div class="col-xs-6 col-sm-3">{{_('Email Service')}}</div>
             <div class="col-xs-6 col-sm-3">{{_('Gmail via Oauth2')}}</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">{{_('From Email')}}</div>
             <div class="col-xs-6 col-sm-3">{{email.mail_gmail_token['email']}}</div>
           </div>
         </div>
       {% endif %}
     {% endif %}
-      <a class="btn btn-default emailconfig" id="admin_edit_email" href="{{url_for('admin.edit_mailsettings')}}">{{_('Edit E-mail Server Settings')}}</a>
+      <a class="btn btn-default emailconfig" id="admin_edit_email" href="{{url_for('admin.edit_mailsettings')}}">{{_('Edit Email Server Settings')}}</a>
     </div>
   </div>
 
@@ -167,15 +167,15 @@
       <h2>{{_('Scheduled Tasks')}}</h2>
         <div class="col-xs-12 col-sm-12 scheduled_tasks_details">
           <div class="row">
-            <div class="col-xs-6 col-sm-3">{{_('Time at which tasks start to run')}}</div>
+            <div class="col-xs-6 col-sm-3">{{_('Start Time')}}</div>
             <div class="col-xs-6 col-sm-3">{{schedule_time}}</div>
           </div>
           <div class="row">
-            <div class="col-xs-6 col-sm-3">{{_('Maximum tasks duration')}}</div>
+            <div class="col-xs-6 col-sm-3">{{_('Maximum Duration')}}</div>
             <div class="col-xs-6 col-sm-3">{{schedule_duration}}</div>
           </div>
           <div class="row">
-            <div class="col-xs-6 col-sm-3">{{_('Generate book cover thumbnails')}}</div>
+            <div class="col-xs-6 col-sm-3">{{_('Generate Thumbnails')}}</div>
             <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_book_covers) }}</div>
           </div>
           <!--div class="row">
@@ -183,14 +183,14 @@
             <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_series_covers) }}</div>
           </div-->
           <div class="row">
-            <div class="col-xs-6 col-sm-3">{{_('Reconnect to Calibre Library')}}</div>
+            <div class="col-xs-6 col-sm-3">{{_('Reconnect Calibre Database')}}</div>
             <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_reconnect) }}</div>
           </div>
 
         </div>
       <a class="btn btn-default scheduledtasks" id="admin_edit_scheduled_tasks" href="{{url_for('admin.edit_scheduledtasks')}}">{{_('Edit Scheduled Tasks Settings')}}</a>
       {% if config.schedule_generate_book_covers %}
-        <a class="btn btn-default" id="admin_refresh_cover_cache">{{_('Refresh Thumbnail Cover Cache')}}</a>
+        <a class="btn btn-default" id="admin_refresh_cover_cache">{{_('Refresh Thumbnail Cache')}}</a>
       {%  endif %}
     </div>
   </div>
@@ -224,7 +224,7 @@
         <tbody>
           <tr id="current_version">
             <td>{{commit}} </td>
-            <td><i>{{_('Current version')}}</i></td>
+            <td><i>{{_('Current Version')}}</i></td>
           </tr>
         </tbody>
       </table>
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index f61ca9a5a..815fb1625 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -124,7 +124,7 @@
     <div data-related="register_settings">
       <div class="form-group intend-form">
         <input type="checkbox" id="config_register_email" name="config_register_email" {% if config.config_register_email %}checked{% endif %}>
-        <label for="config_register_email">{{_('Use E-Mail as Username')}}</label>
+        <label for="config_register_email">{{_('Use Email as Username')}}</label>
       </div>
     </div>
     <div class="form-group">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
old mode 100755
new mode 100644
index 501516032..d6c8f42f3
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -10,7 +10,7 @@
     </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 E-Reader, reading">
+        <div class="btn-group" role="group" aria-label="Download, send to eReader, reading">
           {% if g.user.role_download() %}
             {% if entry.data|length %}
             <div class="btn-group" role="group">
@@ -39,11 +39,11 @@
           {% endif %}
             {% if g.user.kindle_mail and entry.email_share_list %}
               {% if entry.email_share_list.__len__() == 1 %}
-                <div id="sendbtn" data-action="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=entry.email_share_list[0]['format'], convert=entry.email_share_list[0]['convert'])}}" data-text="{{_('Send to E-Reader')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.email_share_list[0]['text']}}</div>
+                <div id="sendbtn" data-action="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=entry.email_share_list[0]['format'], convert=entry.email_share_list[0]['convert'])}}" data-text="{{_('Send to eReader')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.email_share_list[0]['text']}}</div>
               {% else %}
                 <div class="btn-group" role="group">
                   <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="glyphicon glyphicon-send"></span>{{_('Send to E-Reader')}}
+                    <span class="glyphicon glyphicon-send"></span>{{_('Send to eReader')}}
                     <span class="caret"></span>
                   </button>
                     <ul class="dropdown-menu" aria-labelledby="send-to-ereader">
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index 2a8442099..e7f579b2c 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -10,16 +10,16 @@
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     {% if feature_support['gmail'] %}
     <div class="form-group">
-      <label for="config_email_type">{{_('Choose Server Type')}}</label>
+      <label for="config_email_type">{{_('Email Account Type')}}</label>
       <select name="mail_server_type" id="config_email_type" class="form-control" data-control="email-settings">
-       <option value="0" {% if content.mail_server_type == 0 %}selected{% endif %}>{{_('Use Standard E-Mail Account')}}</option>
-       <option value="1" {% if content.mail_server_type == 1 %}selected{% endif %}>{{_('Gmail Account with OAuth2 Verification')}}</option>
+       <option value="0" {% if content.mail_server_type == 0 %}selected{% endif %}>{{_('Standard Email Account')}}</option>
+       <option value="1" {% if content.mail_server_type == 1 %}selected{% endif %}>{{_('Gmail Account')}}</option>
       </select>
     </div>
     <div data-related="email-settings-1">
       <div class="form-group">
         {% if content.mail_gmail_token == {} %}
-        <button type="submit" id="gmail_server" name="gmail" value="submit" class="btn btn-default">{{_('Setup Gmail Account as E-Mail Server')}}</button>
+        <button type="submit" id="gmail_server" name="gmail" value="submit" class="btn btn-default">{{_('Setup Gmail Account')}}</button>
         {% else %}
         <button type="submit" id="invalidate_server" name="invalidate" value="submit" class="btn btn-danger">{{_('Revoke Gmail Access')}}</button>
         {% endif %}
@@ -52,7 +52,7 @@
         <input type="password" class="form-control" name="mail_password" id="mail_password" value="{{content.mail_password}}">
       </div>
       <div class="form-group">
-        <label for="mail_from">{{_('From E-mail')}}</label>
+        <label for="mail_from">{{_('From Email')}}</label>
         <input type="text" class="form-control" name="mail_from" id="mail_from" value="{{content.mail_from}}" required>
       </div>
       <label for="mail_size">{{_('Attachment Size Limit')}}</label>
@@ -63,7 +63,7 @@
         </span>
       </div>
       <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
-      <button type="submit" name="test" value="test" class="btn btn-default">{{_('Save and Send Test E-mail')}}</button>
+      <button type="submit" name="test" value="test" class="btn btn-default">{{_('Save and Send Test Email')}}</button>
    {% if feature_support['gmail'] %}
     </div>
    {% endif %}
diff --git a/cps/templates/register.html b/cps/templates/register.html
index 307a209b6..ca84c112b 100644
--- a/cps/templates/register.html
+++ b/cps/templates/register.html
@@ -11,8 +11,8 @@
     </div>
     {% endif %}
     <div class="form-group required">
-      <label for="email">{{_('E-mail Address')}}</label>
-      <input type="email" class="form-control" id="email" name="email" placeholder="{{_('Your email address')}}" required>
+      <label for="email">{{_('Email')}}</label>
+      <input type="email" class="form-control" id="email" name="email" placeholder="{{_('Your Email')}}" required>
     </div>
     <button type="submit" id="submit" class="btn btn-primary">{{_('Register')}}</button>
     {% if config.config_use_github_oauth %}
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index 83dd6c689..7b6d8e339 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -9,7 +9,7 @@
   <form role="form" class="col-md-10 col-lg-6" method="POST" autocomplete="off">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     <div class="form-group">
-      <label for="schedule_start_time">{{_('Time at which tasks start to run')}}</label>
+      <label for="schedule_start_time">{{_('Start Time')}}</label>
       <select name="schedule_start_time" id="schedule_start_time" class="form-control">
         {% for n in starttime %}
           <option value="{{n[0]}}" {% if config.schedule_start_time == n[0] %}selected{% endif %}>{{n[1]}}</option>
@@ -17,7 +17,7 @@
       </select>
     </div>
     <div class="form-group">
-      <label for="schedule_duration">{{_('Maximum tasks duration')}}</label>
+      <label for="schedule_duration">{{_('Maximum Duration')}}</label>
       <select name="schedule_duration" id="schedule_duration" class="form-control">
         {% for n in duration %}
           <option value="{{n[0]}}" {% if config.schedule_duration == n[0] %}selected{% endif %}>{{n[1]}}</option>
@@ -26,7 +26,7 @@
     </div>
     <div class="form-group">
       <input type="checkbox" id="schedule_generate_book_covers" name="schedule_generate_book_covers" {% if config.schedule_generate_book_covers %}checked{% endif %}>
-      <label for="schedule_generate_book_covers">{{_('Generate Book Cover Thumbnails')}}</label>
+      <label for="schedule_generate_book_covers">{{_('Generate Thumbnails')}}</label>
     </div>
     <!--div class="form-group">
       <input type="checkbox" id="schedule_generate_series_covers" name="schedule_generate_series_covers" {% if config.schedule_generate_series_covers %}checked{% endif %}>
@@ -34,7 +34,7 @@
     </div-->
     <div class="form-group">
       <input type="checkbox" id="schedule_reconnect" name="schedule_reconnect" {% if config.schedule_reconnect %}checked{% endif %}>
-      <label for="schedule_reconnect">{{_('Reconnect to Calibre Library')}}</label>
+      <label for="schedule_reconnect">{{_('Reconnect Calibre Database')}}</label>
     </div>
 
     <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
old mode 100755
new mode 100644
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
old mode 100755
new mode 100644
index 4aff7ee22..fba2f5992
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -12,7 +12,7 @@
     </div>
     {% endif %}
     <div class="form-group">
-      <label for="email">{{_('E-mail Address')}}</label>
+      <label for="email">{{_('Email')}}</label>
       <input type="email" class="form-control" name="email" id="email" value="{{ content.email if content.email != None }}" autocomplete="off">
     </div>
     {% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
@@ -25,7 +25,7 @@
         </div>
     {% endif %}
     <div class="form-group">
-      <label for="kindle_mail">{{_('Send to E-Reader E-mail Address')}}</label>
+      <label for="kindle_mail">{{_('Send to eReader Email')}}</label>
       <input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}">
     </div>
     {% if not content.role_anonymous() %}
diff --git a/cps/templates/user_table.html b/cps/templates/user_table.html
old mode 100755
new mode 100644
index cd0295d5a..26f8a895f
--- a/cps/templates/user_table.html
+++ b/cps/templates/user_table.html
@@ -121,7 +121,7 @@
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     <div class="col-xs-12 col-sm-12">
         <div class="row">
-          <div class="btn btn-default disabled" id="user_delete_selection" aria-disabled="true">{{_('Remove Selections')}}</div>
+          <div class="btn btn-default disabled" id="user_delete_Section" aria-disabled="true">{{_('Remove Sections')}}</div>
         </div>
     </div>
     <table id="user-table" class="table table-no-bordered table-striped"
@@ -132,8 +132,8 @@
             <th data-name="state" data-field="state" data-checkbox="true" data-visible="{{visiblility.get('state')}}" data-sortable="true"></th>
             <th data-name="id" data-field="id" id="id" data-visible="false" data-switchable="false"></th>
             {{ user_table_row('name', _('Enter Username'), _('Username'), true) }}
-            {{ user_table_row('email', _('Enter E-mail Address'), _('E-mail Address'), true) }}
-            {{ user_table_row('kindle_mail', _('Enter E-Reader E-mail Address'), _('E-Reader E-mail'), false) }}
+            {{ user_table_row('email', _('Enter Email'), _('Email'), true) }}
+            {{ user_table_row('kindle_mail', _('Enter eReader Email'), _('eReader Email'), false) }}
             {{ user_select_translations('locale', url_for('admin.table_get_locale'), _('Locale'), true) }}
             {{ user_select_languages('default_language', url_for('admin.table_get_default_lang'), _('Visible Book Languages'), true) }}
             {{ user_table_row('allowed_tags', _("Edit Allowed Tags"), _("Allowed Tags"), false, tags) }}
@@ -152,18 +152,18 @@
             {{ user_single_checkbox_row("kobo_only_shelves_sync", _('Sync selected Shelves with Kobo'))}}
             {%  endif %}
             {{ user_checkbox_row("sidebar_view", "detail_random", _('Show Random Books in Detail View'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_language", _('Show language selection'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_read_and_unread", _('Show read/unread selection'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_series", _('Show series selection'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_category", _('Show category selection'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_random", _('Show random books'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_author", _('Show author selection'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_language", _('Show Language Section'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_read_and_unread", _('Show Read/Unread Section'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_series", _('Show Series Section'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_category", _('Show Category Section'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_random", _('Show Random Books'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_author", _('Show Author Section'), visiblility, sidebar_settings)}}
             {{ user_checkbox_row("sidebar_view", "sidebar_best_rated", _('Show Top Rated Books'), visiblility, sidebar_settings)}}
             {{ user_checkbox_row("sidebar_view", "sidebar_read_and_unread", _('Show Random Books'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_publisher", _('Show publisher selection'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_rating", _('Show ratings selection'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_format", _('Show file formats selection'), visiblility, sidebar_settings)}}
-            {{ user_checkbox_row("sidebar_view", "sidebar_archived", _('Show archived books'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_publisher", _('Show Publisher Section'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_rating", _('Show Ratings Section'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_format", _('Show File Formats Section'), visiblility, sidebar_settings)}}
+            {{ user_checkbox_row("sidebar_view", "sidebar_archived", _('Show Archived Books'), visiblility, sidebar_settings)}}
             {{ user_checkbox_row("sidebar_view", "sidebar_download", _('Show Downloaded Books'), visiblility, sidebar_settings)}}
             {{ user_checkbox_row("sidebar_view", "sidebar_list", _('Show Books List'), visiblility, sidebar_settings)}}
             <th data-align="right" data-formatter="UserActions" data-switchable="false"><div><div class="btn btn-default button_head disabled" aria-disabled="true">{{_('Delete User')}}</div></div><br>{{_('Delete User')}}</th>
diff --git a/cps/web.py b/cps/web.py
old mode 100755
new mode 100644
index 196fe3673..383eeec46
--- a/cps/web.py
+++ b/cps/web.py
@@ -514,7 +514,7 @@ def render_author_books(page, author_id, order):
                                                         db.books_series_link.c.book == db.Books.id,
                                                         db.Series)
     if entries is None or not len(entries):
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+        flash(_(u"Oops! Selected book is unavailable. File does not exist or is not accessible"),
               category="error")
         return redirect(url_for("web.index"))
     if constants.sqlalchemy_version2:
@@ -1195,18 +1195,18 @@ def download_link(book_id, book_format, anyname):
 @download_required
 def send_to_ereader(book_id, book_format, convert):
     if not config.get_mail_server_configured():
-        flash(_(u"Please configure the SMTP mail settings first..."), category="error")
-    elif current_user.kindle_mail:
-        result = send_mail(book_id, book_format, convert, current_user.kindle_mail, config.config_calibre_dir,
+        flash(_(u"Please configure the SMTP mail settings first."), category="error")
+    elif current_user.eReader_mail:
+        result = send_mail(book_id, book_format, convert, current_user.eReader_mail, config.config_calibre_dir,
                            current_user.name)
         if result is None:
-            flash(_(u"Book successfully queued for sending to %(kindlemail)s", kindlemail=current_user.kindle_mail),
+            flash(_(u"Success! Book queued for sending to %(eReadermail)s", eReadermail=current_user.eReader_mail),
                   category="success")
             ub.update_download(book_id, int(current_user.id))
         else:
-            flash(_(u"Oops! There was an error sending this book: %(res)s", res=result), category="error")
+            flash(_(u"Oops! There was an error sending book: %(res)s", res=result), category="error")
     else:
-        flash(_(u"Please update your profile with a valid Send to Kindle E-mail Address."), category="error")
+        flash(_(u"Oops! Please update your profile with a valid  eReader Email."), category="error")
     if "HTTP_REFERER" in request.environ:
         return redirect(request.environ["HTTP_REFERER"])
     else:
@@ -1223,14 +1223,14 @@ def register():
     if current_user is not None and current_user.is_authenticated:
         return redirect(url_for('web.index'))
     if not config.get_mail_server_configured():
-        flash(_(u"E-Mail server is not configured, please contact your administrator!"), category="error")
+        flash(_(u"Oops! Email server is not configured, please contact your administrator."), category="error")
         return render_title_template('register.html', title=_("Register"), page="register")
 
     if request.method == "POST":
         to_save = request.form.to_dict()
         nickname = to_save.get("email", "").strip() if config.config_register_email else to_save.get('name')
         if not nickname or not to_save.get("email"):
-            flash(_(u"Please fill out all fields!"), category="error")
+            flash(_(u"Oops! Please complete all fields."), category="error")
             return render_title_template('register.html', title=_("Register"), page="register")
         try:
             nickname = check_username(nickname)
@@ -1256,14 +1256,14 @@ def register():
                 send_registration_mail(to_save.get("email", "").strip(), nickname, password)
             except Exception:
                 ub.session.rollback()
-                flash(_(u"An unknown error occurred. Please try again later."), category="error")
+                flash(_(u"Oops! An unknown error occurred. Please try again later."), category="error")
                 return render_title_template('register.html', title=_("Register"), page="register")
         else:
-            flash(_(u"Your e-mail is not allowed to register"), category="error")
-            log.warning('Registering failed for user "{}" e-mail address: {}'.format(nickname,
+            flash(_(u"Oops! Your Email is not allowed."), category="error")
+            log.warning('Registering failed for user "{}" Email: {}'.format(nickname,
                                                                                      to_save.get("email","")))
             return render_title_template('register.html', title=_("Register"), page="register")
-        flash(_(u"Confirmation e-mail was send to your e-mail account."), category="success")
+        flash(_(u"Success! Confirmation Email has been sent."), category="success")
         return redirect(url_for('web.login'))
 
     if feature_support['oauth']:
@@ -1277,7 +1277,7 @@ def login():
         return redirect(url_for('web.index'))
     if config.config_login_type == constants.LOGIN_LDAP and not services.ldap:
         log.error(u"Cannot activate LDAP authentication")
-        flash(_(u"Cannot activate LDAP authentication"), category="error")
+        flash(_(u"Oops! Cannot activate LDAP authentication"), category="error")
     if request.method == "POST":
         form = request.form.to_dict()
         user = ub.session.query(ub.User).filter(func.lower(ub.User.name) == form['username'].strip().lower()) \
@@ -1288,7 +1288,7 @@ def login():
                 login_user(user, remember=bool(form.get('remember_me')))
                 ub.store_user_session()
                 log.debug(u"You are now logged in as: '{}'".format(user.name))
-                flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.name),
+                flash(_(u"Success! You are now logged in as: %(nickname)s", nickname=user.name),
                       category="success")
                 return redirect_back(url_for("web.index"))
             elif login_result is None and user and check_password_hash(str(user.password), form['password']) \
@@ -1296,42 +1296,42 @@ def login():
                 login_user(user, remember=bool(form.get('remember_me')))
                 ub.store_user_session()
                 log.info("Local Fallback Login as: '{}'".format(user.name))
-                flash(_(u"Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known",
+                flash(_(u"Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known",
                         nickname=user.name),
                       category="warning")
                 return redirect_back(url_for("web.index"))
             elif login_result is None:
                 log.info(error)
-                flash(_(u"Could not login: %(message)s", message=error), category="error")
+                flash(_(u"Oops! Login Failed: %(message)s", message=error), category="error")
             else:
                 ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
                 log.warning('LDAP Login failed for user "%s" IP-address: %s', form['username'], ip_address)
-                flash(_(u"Wrong Username or Password"), category="error")
+                flash(_(u"Oops! Invalid Username or Password."), category="error")
         else:
             ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
             if form.get('forgot', "") == 'forgot':
                 if user is not None and user.name != "Guest":
                     ret, __ = reset_password(user.id)
                     if ret == 1:
-                        flash(_(u"New Password was send to your email address"), category="info")
+                        flash(_(u"Success! New Password was sent to your Email."), category="info")
                         log.info('Password reset for user "%s" IP-address: %s', form['username'], ip_address)
                     else:
                         log.error(u"An unknown error occurred. Please try again later")
-                        flash(_(u"An unknown error occurred. Please try again later."), category="error")
+                        flash(_(u"Ops! An unknown error occurred. Please try again later."), category="error")
                 else:
-                    flash(_(u"Please enter valid username to reset password"), category="error")
+                    flash(_(u"Oops! Please enter a valid username to reset password"), category="error")
                     log.warning('Username missing for password reset IP-address: %s', ip_address)
             else:
                 if user and check_password_hash(str(user.password), form['password']) and user.name != "Guest":
                     login_user(user, remember=bool(form.get('remember_me')))
                     ub.store_user_session()
                     log.debug(u"You are now logged in as: '%s'", user.name)
-                    flash(_(u"You are now logged in as: '%(nickname)s'", nickname=user.name), category="success")
+                    flash(_(u"Success! You are now logged in as: %(nickname)s", nickname=user.name), category="success")
                     config.config_is_initial = False
                     return redirect_back(url_for("web.index"))
                 else:
                     log.warning('Login failed for user "{}" IP-address: {}'.format(form['username'], ip_address))
-                    flash(_(u"Wrong Username or Password"), category="error")
+                    flash(_(u"Oops! Invalid 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:
@@ -1364,11 +1364,11 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
         if to_save.get("password"):
             current_user.password = generate_password_hash(to_save.get("password"))
     try:
-        if to_save.get("kindle_mail", current_user.kindle_mail) != current_user.kindle_mail:
-            current_user.kindle_mail = valid_email(to_save.get("kindle_mail"))
+        if to_save.get("eReader_mail", current_user.eReader_mail) != current_user.eReader_mail:
+            current_user.eReader_mail = valid_email(to_save.get("eReader_mail"))
         new_email = valid_email(to_save.get("email", current_user.email))
         if not new_email:
-            raise Exception(_(u"E-Mail Address can't be empty and has to be a valid E-Mail"))
+            raise Exception(_(u"Email can't be empty and has to be a valid Email"))
         if new_email != current_user.email:
             current_user.email = check_email(new_email)
         if current_user.role_admin():
@@ -1393,7 +1393,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
                                      translations=translations,
                                      profile=1,
                                      languages=languages,
-                                     title=_(u"%(name)s's profile", name=current_user.name),
+                                     title=_(u"%(name)s's Profile", name=current_user.name),
                                      page="me",
                                      kobo_support=kobo_support,
                                      registered_oauth=local_oauth_check,
@@ -1409,16 +1409,16 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
 
     try:
         ub.session.commit()
-        flash(_(u"Profile updated"), category="success")
-        log.debug(u"Profile updated")
+        flash(_(u"Success! 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")
+        flash(_(u"Oops! An account already exists for this Email."), category="error")
+        log.debug(u"Found an existing account for this Email")
     except OperationalError as e:
         ub.session.rollback()
         log.error("Database error: %s", e)
-        flash(_(u"Database error: %(error)s.", error=e), category="error")
+        flash(_(u"Oops! Database Error: %(error)s.", error=e), category="error")
 
 
 @web.route("/me", methods=["GET", "POST"])
@@ -1442,7 +1442,7 @@ def profile():
                                  languages=languages,
                                  content=current_user,
                                  kobo_support=kobo_support,
-                                 title=_(u"%(name)s's profile", name=current_user.name),
+                                 title=_(u"%(name)s's Profile", name=current_user.name),
                                  page="me",
                                  registered_oauth=local_oauth_check,
                                  oauth_status=oauth_status)

From 4105c643205d22f6c0e8b634866505844207c18e Mon Sep 17 00:00:00 2001
From: Vegard Fladby <vegard.fladby@gmail.com>
Date: Fri, 6 Jan 2023 10:17:53 +0100
Subject: [PATCH 373/412] Added norwegian translation

---
 cps/translations/no/LC_MESSAGES/messages.mo |  Bin 0 -> 41226 bytes
 cps/translations/no/LC_MESSAGES/messages.po | 2219 +++++++++++++++++++
 2 files changed, 2219 insertions(+)
 create mode 100644 cps/translations/no/LC_MESSAGES/messages.mo
 create mode 100644 cps/translations/no/LC_MESSAGES/messages.po

diff --git a/cps/translations/no/LC_MESSAGES/messages.mo b/cps/translations/no/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e19153e3c3c3fe301728a2f38408027c82c2b26c
GIT binary patch
literal 41226
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

literal 0
HcmV?d00001

diff --git a/cps/translations/no/LC_MESSAGES/messages.po b/cps/translations/no/LC_MESSAGES/messages.po
new file mode 100644
index 000000000..8b873971f
--- /dev/null
+++ b/cps/translations/no/LC_MESSAGES/messages.po
@@ -0,0 +1,2219 @@
+# Norwegian translations for Calibre-Web.
+# Copyright (C) 2022 Vegard Fladby
+# This file is distributed under the same license as the Calibre-Web
+# project.
+# FIRST AUTHOR Vegard Fladby, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2022-12-27 09:10+0100\n"
+"PO-Revision-Date: 2023-01-06 11:00+0000\n"
+"Last-Translator: Vegard Fladby <vegard.fladby@gmail.com>\n"
+"Language: no\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: POEditor.com\n"
+
+
+#: cps/about.py:84
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: cps/admin.py:148
+msgid "Server restarted, please reload page"
+msgstr "Server startet på nytt. Last inn siden på nytt"
+
+#: cps/admin.py:150
+msgid "Performing shutdown of server, please close window"
+msgstr "Utfører avslutning av server, vennligst lukk vinduet"
+
+#: cps/admin.py:158
+msgid "Reconnect successful"
+msgstr "Tilkoblingen var vellykket"
+
+#: cps/admin.py:161
+msgid "Unknown command"
+msgstr "Ukjent kommando"
+
+#: cps/admin.py:172
+msgid "Books successfully queued for Metadata Backup"
+msgstr "Bøker ble satt i kø for sikkerhetskopiering av metadata"
+
+#: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
+#: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
+#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: cps/admin.py:230
+msgid "Admin page"
+msgstr "Admin side"
+
+#: cps/admin.py:250
+msgid "Basic Configuration"
+msgstr "Grunnleggende konfigurasjon"
+
+#: cps/admin.py:288
+msgid "UI Configuration"
+msgstr "UI-konfigurasjon"
+
+#: cps/admin.py:322 cps/templates/admin.html:51
+msgid "Edit Users"
+msgstr "Rediger brukere"
+
+#: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
+#: cps/templates/list.html:13
+msgid "All"
+msgstr "Alle"
+
+#: cps/admin.py:393 cps/admin.py:1397
+msgid "User not found"
+msgstr "Bruker ikke funnet"
+
+#: cps/admin.py:407
+msgid "{} users deleted successfully"
+msgstr "{} brukere ble slettet"
+
+#: cps/admin.py:430 cps/templates/config_view_edit.html:133
+#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
+msgid "Show All"
+msgstr "Vis alt"
+
+#: cps/admin.py:451 cps/admin.py:457
+msgid "Malformed request"
+msgstr "Feil utformet forespørsel"
+
+#: cps/admin.py:469 cps/admin.py:1998
+msgid "Guest Name can't be changed"
+msgstr "Gjestenavn kan ikke endres"
+
+#: cps/admin.py:481
+msgid "Guest can't have this role"
+msgstr "Gjesten kan ikke ha denne rollen"
+
+#: cps/admin.py:493 cps/admin.py:1953
+msgid "No admin user remaining, can't remove admin role"
+msgstr "Ingen administratorbruker igjen, kan ikke fjerne administratorrollen"
+
+#: cps/admin.py:497 cps/admin.py:511
+msgid "Value has to be true or false"
+msgstr "Verdien må være sann eller usann"
+
+#: cps/admin.py:499
+msgid "Invalid role"
+msgstr "Ugyldig rolle"
+
+#: cps/admin.py:503
+msgid "Guest can't have this view"
+msgstr "Gjestene kan ikke ha denne utsikten"
+
+#: cps/admin.py:513
+msgid "Invalid view"
+msgstr "Ugyldig visning"
+
+#: cps/admin.py:516
+msgid "Guest's Locale is determined automatically and can't be set"
+msgstr "Gjestenes lokalitet bestemmes automatisk og kan ikke angis"
+
+#: cps/admin.py:520
+msgid "No Valid Locale Given"
+msgstr "Ingen gyldig lokalitet gitt"
+
+#: cps/admin.py:531
+msgid "No Valid Book Language Given"
+msgstr "Ikke oppgitt gyldig bokspråk"
+
+#: cps/admin.py:533 cps/editbooks.py:442
+msgid "Parameter not found"
+msgstr "Parameter ikke funnet"
+
+#: cps/admin.py:570
+msgid "Invalid Read Column"
+msgstr "Ugyldig lesekolonne"
+
+#: cps/admin.py:576
+msgid "Invalid Restricted Column"
+msgstr "Ugyldig begrenset kolonne"
+
+#: cps/admin.py:596 cps/admin.py:1824
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web-konfigurasjonen er oppdatert"
+
+#: cps/admin.py:608
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Vil du virkelig slette Kobo-tokenet?"
+
+#: cps/admin.py:610
+msgid "Do you really want to delete this domain?"
+msgstr "Vil du virkelig slette dette domenet?"
+
+#: cps/admin.py:612
+msgid "Do you really want to delete this user?"
+msgstr "Vil du virkelig slette denne brukeren?"
+
+#: cps/admin.py:614
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Er du sikker på at du vil slette denne hyllen?"
+
+#: cps/admin.py:616
+msgid "Are you sure you want to change locales of selected user(s)?"
+msgstr "Er du sikker på at du vil endre lokaliteter for valgte bruker(e)?"
+
+#: cps/admin.py:618
+msgid "Are you sure you want to change visible book languages for selected user(s)?"
+msgstr "Er du sikker på at du vil endre synlige bokspråk for valgte bruker(e)?"
+
+#: cps/admin.py:620
+msgid "Are you sure you want to change the selected role for the selected user(s)?"
+msgstr "Er du sikker på at du vil endre den valgte rollen for den(e) valgte brukeren?"
+
+#: cps/admin.py:622
+msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
+msgstr "Er du sikker på at du vil endre de valgte begrensningene for den(e) valgte brukeren?"
+
+#: cps/admin.py:624
+msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
+msgstr "Er du sikker på at du vil endre de valgte synlighetsbegrensningene for valgte bruker(e)?"
+
+#: cps/admin.py:627
+msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgstr "Er du sikker på at du vil endre atferden for hyllesynkronisering for de(n) valgte brukeren(e)?"
+
+#: cps/admin.py:629
+msgid "Are you sure you want to change Calibre library location?"
+msgstr "Er du sikker på at du vil endre plassering av Caliber-biblioteket?"
+
+#: cps/admin.py:631
+msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
+msgstr "Calibre-Web vil søke etter oppdaterte omslag og oppdatere omslagsminiatyrbilder, kan dette ta litt tid?"
+
+#: cps/admin.py:634
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr "Er du sikker på at du vil slette Calibre-Webs synkroniseringsdatabase for å tvinge frem en full synkronisering med Kobo Reader?"
+
+#: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
+#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
+#: cps/templates/user_table.html:58
+msgid "Deny"
+msgstr "Benekte"
+
+#: cps/admin.py:879 cps/admin.py:885 cps/admin.py:895 cps/admin.py:905
+#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
+#: cps/templates/user_table.html:61
+msgid "Allow"
+msgstr "Tillate"
+
+#: cps/admin.py:920
+msgid "{} sync entries deleted"
+msgstr "{} synkroniseringsoppføringer slettet"
+
+#: cps/admin.py:968
+msgid "Tag not found"
+msgstr "Merket ble ikke funnet"
+
+#: cps/admin.py:980
+msgid "Invalid Action"
+msgstr "Ugyldig handling"
+
+#: cps/admin.py:1109
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr "client_secrets.json er ikke konfigurert for webapplikasjon"
+
+#: cps/admin.py:1154
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "Loggfilplasseringen er ikke gyldig, skriv inn riktig bane"
+
+#: cps/admin.py:1160
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "Plasseringen av tilgangsloggfilen er ikke gyldig, skriv inn riktig bane"
+
+#: cps/admin.py:1190
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr "Angi en LDAP-leverandør, port, DN og brukerobjektidentifikator"
+
+#: cps/admin.py:1196
+msgid "Please Enter a LDAP Service Account and Password"
+msgstr "Vennligst skriv inn en LDAP-tjenestekonto og passord"
+
+#: cps/admin.py:1199
+msgid "Please Enter a LDAP Service Account"
+msgstr "Angi en LDAP-tjenestekonto"
+
+#: cps/admin.py:1204
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP-gruppeobjektfilter må ha én \"%s\"-formatidentifikator"
+
+#: cps/admin.py:1206
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP-gruppeobjektfilter har uovertruffen parentes"
+
+#: cps/admin.py:1210
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP-brukerobjektfilter må ha én \"%s\"-formatidentifikator"
+
+#: cps/admin.py:1212
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP-brukerobjektfilter har uovertruffen parentes"
+
+#: cps/admin.py:1219
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP-medlemsbrukerfilter må ha én \"%s\"-formatidentifikator"
+
+#: cps/admin.py:1221
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr "LDAP-medlemsbrukerfilter har uovertruffen parentes"
+
+#: cps/admin.py:1228
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr "LDAP CA-sertifikat, sertifikat eller nøkkelplassering er ikke gyldig. Angi riktig bane"
+
+#: cps/admin.py:1259 cps/admin.py:1885
+msgid "Add new user"
+msgstr "Legg til ny bruker"
+
+#: cps/admin.py:1268 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "Rediger e-postserverinnstillinger"
+
+#: cps/admin.py:1287
+msgid "Gmail Account Verification Successful"
+msgstr "Gmail-kontobekreftelse vellykket"
+
+#: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
+#: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
+#: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
+#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+msgid "Database error: %(error)s."
+msgstr "Databasefeil: %(error)s."
+
+#: cps/admin.py:1316
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr "Test e-post i kø for sending til %(email)s, sjekk Oppgaver for resultat"
+
+#: cps/admin.py:1319
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "Det oppsto en feil ved sending av test-e-posten: %(res)s"
+
+#: cps/admin.py:1321
+msgid "Please configure your e-mail address first..."
+msgstr "Vennligst konfigurer e-postadressen din først..."
+
+#: cps/admin.py:1323
+msgid "E-mail server settings updated"
+msgstr "E-postserverinnstillinger oppdatert"
+
+#: cps/admin.py:1346 cps/templates/admin.html:191
+msgid "Edit Scheduled Tasks Settings"
+msgstr "Rediger innstillinger for planlagte oppgaver"
+
+#: cps/admin.py:1358
+msgid "Invalid start time for task specified"
+msgstr "Ugyldig starttidspunkt for spesifisert oppgave"
+
+#: cps/admin.py:1363
+msgid "Invalid duration for task specified"
+msgstr "Ugyldig varighet for spesifisert oppgave"
+
+#: cps/admin.py:1372
+msgid "Scheduled tasks settings updated"
+msgstr "Innstillinger for planlagte oppgaver er oppdatert"
+
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
+#: cps/web.py:1320
+msgid "An unknown error occurred. Please try again later."
+msgstr "En ukjent feil oppstod. Prøv igjen senere."
+
+#: cps/admin.py:1386
+msgid "Settings DB is not Writeable"
+msgstr "Innstillinger DB er ikke skrivbar"
+
+#: cps/admin.py:1416 cps/admin.py:2014
+msgid "Edit User %(nick)s"
+msgstr "Rediger bruker %(nick)s"
+
+#: cps/admin.py:1428
+msgid "Password for user %(user)s reset"
+msgstr "Passord for bruker %(user)s tilbakestilling"
+
+#: cps/admin.py:1434 cps/web.py:1198
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Vennligst konfigurer SMTP-postinnstillingene først..."
+
+#: cps/admin.py:1445
+msgid "Logfile viewer"
+msgstr "Loggfilviser"
+
+#: cps/admin.py:1511
+msgid "Requesting update package"
+msgstr "Ber om oppdateringspakke"
+
+#: cps/admin.py:1512
+msgid "Downloading update package"
+msgstr "Laster ned oppdateringspakken"
+
+#: cps/admin.py:1513
+msgid "Unzipping update package"
+msgstr "Pakker ut oppdateringspakken"
+
+#: cps/admin.py:1514
+msgid "Replacing files"
+msgstr "Erstatter filer"
+
+#: cps/admin.py:1515
+msgid "Database connections are closed"
+msgstr "Databaseforbindelser er stengt"
+
+#: cps/admin.py:1516
+msgid "Stopping server"
+msgstr "Stopper server"
+
+#: cps/admin.py:1517
+msgid "Update finished, please press okay and reload page"
+msgstr "Oppdatering fullført, vennligst trykk OK og last inn siden på nytt"
+
+#: cps/admin.py:1518 cps/admin.py:1519 cps/admin.py:1520 cps/admin.py:1521
+#: cps/admin.py:1522 cps/admin.py:1523
+msgid "Update failed:"
+msgstr "Oppdatering mislyktes:"
+
+#: cps/admin.py:1518 cps/updater.py:389 cps/updater.py:624 cps/updater.py:626
+msgid "HTTP Error"
+msgstr "HTTP-feil"
+
+#: cps/admin.py:1519 cps/updater.py:391 cps/updater.py:628
+msgid "Connection error"
+msgstr "Tilkoblingsfeil"
+
+#: cps/admin.py:1520 cps/updater.py:393 cps/updater.py:630
+msgid "Timeout while establishing connection"
+msgstr "Tidsavbrudd under etablering av tilkobling"
+
+#: cps/admin.py:1521 cps/updater.py:395 cps/updater.py:632
+msgid "General error"
+msgstr "Generell feil"
+
+#: cps/admin.py:1522
+msgid "Update file could not be saved in temp dir"
+msgstr "Oppdateringsfilen kunne ikke lagres i temp dir"
+
+#: cps/admin.py:1523
+msgid "Files could not be replaced during update"
+msgstr "Filer kunne ikke erstattes under oppdatering"
+
+#: cps/admin.py:1547
+msgid "Failed to extract at least One LDAP User"
+msgstr "Kunne ikke pakke ut minst én LDAP-bruker"
+
+#: cps/admin.py:1592
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Kunne ikke opprette minst én LDAP-bruker"
+
+#: cps/admin.py:1605
+msgid "Error: %(ldaperror)s"
+msgstr "Feil: %(ldaperror)s"
+
+#: cps/admin.py:1609
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Feil: Ingen bruker ble returnert som svar fra LDAP-serveren"
+
+#: cps/admin.py:1642
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Minst én LDAP-bruker ikke funnet i databasen"
+
+#: cps/admin.py:1644
+msgid "{} User Successfully Imported"
+msgstr "{} Bruker ble importert"
+
+#: cps/admin.py:1702
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "DB-plassering er ikke gyldig, skriv inn riktig bane"
+
+#: cps/admin.py:1722
+msgid "DB is not Writeable"
+msgstr "DB er ikke skrivbar"
+
+#: cps/admin.py:1735
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "Nøkkelfilplasseringen er ikke gyldig. Angi riktig bane"
+
+#: cps/admin.py:1739
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "Sertifikatfilplasseringen er ikke gyldig, vennligst skriv inn riktig bane"
+
+#: cps/admin.py:1847
+msgid "Database Settings updated"
+msgstr "Databaseinnstillinger oppdatert"
+
+#: cps/admin.py:1855
+msgid "Database Configuration"
+msgstr "Databasekonfigurasjon"
+
+#: cps/admin.py:1871 cps/web.py:1233
+msgid "Please fill out all fields!"
+msgstr "Vennligst fyll ut alle feltene!"
+
+#: cps/admin.py:1879
+msgid "E-mail is not from valid domain"
+msgstr "E-post er ikke fra gyldig domene"
+
+#: cps/admin.py:1896
+msgid "User '%(user)s' created"
+msgstr "Bruker '%(user)s' opprettet"
+
+#: cps/admin.py:1902
+msgid "Found an existing account for this e-mail address or name."
+msgstr "Fant en eksisterende konto for denne e-postadressen eller navnet."
+
+#: cps/admin.py:1932
+msgid "User '%(nick)s' deleted"
+msgstr "Brukeren '%(nick)s' slettet"
+
+#: cps/admin.py:1934 cps/admin.py:1935
+msgid "Can't delete Guest User"
+msgstr "Kan ikke slette gjestebruker"
+
+#: cps/admin.py:1938
+msgid "No admin user remaining, can't delete user"
+msgstr "Ingen administratorbruker igjen, kan ikke slette bruker"
+
+#: cps/admin.py:1992 cps/web.py:1371
+msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgstr "E-postadresse kan ikke være tom og må være en gyldig e-post"
+
+#: cps/admin.py:2018
+msgid "User '%(nick)s' updated"
+msgstr "Bruker '%(nick)s' oppdatert"
+
+#: cps/converter.py:31
+msgid "not installed"
+msgstr "ikke installert"
+
+#: cps/converter.py:32
+msgid "Execution permissions missing"
+msgstr "Utførelsestillatelser mangler"
+
+#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+msgid "Custom Column No.%(column)d does not exist in calibre database"
+msgstr "Egendefinert kolonnenr.%(kolonne)d finnes ikke i caliber-databasen"
+
+#: cps/db.py:971 cps/templates/config_edit.html:204
+#: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
+#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
+#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+msgid "None"
+msgstr "Ingen"
+
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
+#: cps/web.py:1504 cps/web.py:1549
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "Oops! Den valgte boktittelen er utilgjengelig. Filen eksisterer ikke eller er ikke tilgjengelig"
+
+#: cps/editbooks.py:154 cps/editbooks.py:1221
+msgid "User has no rights to upload cover"
+msgstr "Brukeren har ingen rettigheter til å laste opp cover"
+
+#: cps/editbooks.py:174 cps/editbooks.py:716
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "Identifikatorer skiller ikke mellom store og små bokstaver, overskriver gammel identifikator"
+
+#: cps/editbooks.py:216
+msgid "Metadata successfully updated"
+msgstr "Metadata ble oppdatert"
+
+#: cps/editbooks.py:234
+msgid "Error editing book: {}"
+msgstr "Feil ved redigering av bok: {}"
+
+#: cps/editbooks.py:291
+msgid "File %(file)s uploaded"
+msgstr "Fil %(fil)s lastet opp"
+
+#: cps/editbooks.py:318
+msgid "Source or destination format for conversion missing"
+msgstr "Kilde- eller målformat for konvertering mangler"
+
+#: cps/editbooks.py:326
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr "Boken ble satt i kø for konvertering til %(book_format)s"
+
+#: cps/editbooks.py:330
+msgid "There was an error converting this book: %(res)s"
+msgstr "Det oppsto en feil ved konvertering av denne boken: %(res)s"
+
+#: cps/editbooks.py:635
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "Opplastet bok finnes sannsynligvis i biblioteket, vurder å endre før du laster opp ny: "
+
+#: cps/editbooks.py:690 cps/editbooks.py:1015
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s' er ikke et gyldig språk"
+
+#: cps/editbooks.py:728 cps/editbooks.py:1162
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "Filtypen «%(ext)s» er ikke tillatt å lastes opp til denne serveren"
+
+#: cps/editbooks.py:732 cps/editbooks.py:1166
+msgid "File to be uploaded must have an extension"
+msgstr "Filen som skal lastes opp må ha en utvidelse"
+
+#: cps/editbooks.py:740
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "Filen %(filnavn)s kunne ikke lagres i midlertidig dir"
+
+#: cps/editbooks.py:760
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "Kunne ikke flytte omslagsfil %(fil)s: %(error)s"
+
+#: cps/editbooks.py:817 cps/editbooks.py:819
+msgid "Book Format Successfully Deleted"
+msgstr "Bokformatet er slettet"
+
+#: cps/editbooks.py:826 cps/editbooks.py:828
+msgid "Book Successfully Deleted"
+msgstr "Boken ble slettet"
+
+#: cps/editbooks.py:880
+msgid "You are missing permissions to delete books"
+msgstr "Du mangler tillatelser til å slette bøker"
+
+#: cps/editbooks.py:930
+msgid "edit metadata"
+msgstr "redigere metadata"
+
+#: cps/editbooks.py:979
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s er ikke et gyldig tall, hopper over"
+
+#: cps/editbooks.py:1157
+msgid "User has no rights to upload additional file formats"
+msgstr "Brukeren har ingen rettigheter til å laste opp flere filformater"
+
+#: cps/editbooks.py:1178
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Kunne ikke opprette banen %(bane)s (Tillatelse nektet)."
+
+#: cps/editbooks.py:1183
+msgid "Failed to store file %(file)s."
+msgstr "Kunne ikke lagre filen %(file)s."
+
+#: cps/editbooks.py:1206
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Filformat %(ext)s lagt til %(book)s"
+
+#: cps/gdrive.py:58
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "Google Disk-konfigurasjonen er ikke fullført. Prøv å deaktivere og aktivere Google Disk på nytt"
+
+#: cps/gdrive.py:95
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Tilbakeringingsdomene er ikke bekreftet. Følg fremgangsmåten for å bekrefte domenet i Googles utviklerkonsoll"
+
+#: cps/helper.py:80
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s format ikke funnet for bok-ID: %(book)d"
+
+#: cps/helper.py:87 cps/tasks/convert.py:75
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s ikke funnet på Google Disk: %(fn)s"
+
+#: cps/helper.py:92
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s ikke funnet: %(fn)s"
+
+#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
+#: cps/templates/detail.html:46
+msgid "Send to E-Reader"
+msgstr "Send til E-Reader"
+
+#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Denne e-posten er sendt via Calibre-Web."
+
+#: cps/helper.py:114
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web test e-post"
+
+#: cps/helper.py:115
+msgid "Test e-mail"
+msgstr "Test e-post"
+
+#: cps/helper.py:132
+msgid "Get Started with Calibre-Web"
+msgstr "Kom i gang med Calibre-Web"
+
+#: cps/helper.py:137
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Registrerings-e-post for bruker: %(navn)s"
+
+#: cps/helper.py:148 cps/helper.py:154
+msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgstr "Konverter %(orig)s til %(format)s og send til E-Reader"
+
+#: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
+msgid "Send %(format)s to E-Reader"
+msgstr "Send %(format)s til E-Reader"
+
+#: cps/helper.py:225 cps/tasks/convert.py:92
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s sendes til E-Reader"
+
+#: cps/helper.py:230
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "Den forespurte filen kunne ikke leses. Kanskje feil tillatelser?"
+
+#: cps/helper.py:345
+msgid "Read status could not set: {}"
+msgstr "Lesestatus kunne ikke angis: {}"
+
+#: cps/helper.py:368
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "Sletting av bokmappe for bok %(id)s mislyktes, banen har undermapper: %(path)s"
+
+#: cps/helper.py:374
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "Sletting av bok %(id)s mislyktes: %(melding)s"
+
+#: cps/helper.py:385
+msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
+msgstr "Sletter bok %(id)s kun fra databasen, bokbanen i databasen er ikke gyldig: %(path)s"
+
+#: cps/helper.py:450
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Endre navn på forfatter fra: '%(src)s' til '%(dest)s' mislyktes med feil: %(error)s"
+
+#: cps/helper.py:522 cps/helper.py:531
+msgid "File %(file)s not found on Google Drive"
+msgstr "Fil %(file)s ikke funnet på Google Disk"
+
+#: cps/helper.py:565
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Endre navn på tittel fra: '%(src)s' til '%(dest)s' mislyktes med feil: %(error)s"
+
+#: cps/helper.py:585
+msgid "Error in rename file in path: {}"
+msgstr "Feil i endre navn på fil i banen: {}"
+
+#: cps/helper.py:603
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Finner ikke bokbane %(path)s på Google Disk"
+
+#: cps/helper.py:644 cps/web.py:1416
+msgid "Found an existing account for this e-mail address"
+msgstr "Fant en eksisterende konto for denne e-postadressen"
+
+#: cps/helper.py:652
+msgid "This username is already taken"
+msgstr "Dette brukernavnet er allerede tatt"
+
+#: cps/helper.py:664
+msgid "Invalid e-mail address format"
+msgstr "Ugyldig format for e-postadresse"
+
+#: cps/helper.py:815
+msgid "Python module 'advocate' is not installed but is needed for cover uploads"
+msgstr "Python-modulen 'advocate' er ikke installert, men er nødvendig for omslagsopplastinger"
+
+#: cps/helper.py:825
+msgid "Error Downloading Cover"
+msgstr "Feil ved nedlasting av cover"
+
+#: cps/helper.py:828
+msgid "Cover Format Error"
+msgstr "Omslagsformatfeil"
+
+#: cps/helper.py:831
+msgid "You are not allowed to access localhost or the local network for cover uploads"
+msgstr "Du har ikke tilgang til localhost eller det lokale nettverket for coveropplastinger"
+
+#: cps/helper.py:841
+msgid "Failed to create path for cover"
+msgstr "Kunne ikke opprette bane for dekning"
+
+#: cps/helper.py:857
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr "Cover-filen er ikke en gyldig bildefil, eller kunne ikke lagres"
+
+#: cps/helper.py:868
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr "Bare jpg/jpeg/png/webp/bmp-filer støttes som coverfile"
+
+#: cps/helper.py:880
+msgid "Invalid cover file content"
+msgstr "Ugyldig omslagsfilinnhold"
+
+#: cps/helper.py:884
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr "Bare jpg/jpeg-filer støttes som coverfile"
+
+#: cps/helper.py:936
+msgid "Unrar binary file not found"
+msgstr "Unrar binær fil ikke funnet"
+
+#: cps/helper.py:947
+msgid "Error executing UnRar"
+msgstr "Feil ved kjøring av UnRar"
+
+#: cps/helper.py:1040
+msgid "Cover"
+msgstr "Dekke"
+
+#: cps/helper.py:1042 cps/templates/admin.html:211
+msgid "Queue all books for metadata backup"
+msgstr "Sett alle bøker i kø for sikkerhetskopiering av metadata"
+
+#: cps/kobo_auth.py:89
+msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
+msgstr "Gå til Calibre-Web fra ikke-lokale vert for å få gyldig api_endpoint for kobo-enhet"
+
+#: cps/kobo_auth.py:115
+msgid "Kobo Setup"
+msgstr "Kobo oppsett"
+
+#: cps/oauth_bb.py:77
+msgid "Register with %(provider)s"
+msgstr "Registrer deg hos %(provider)s"
+
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "du er nå logget på som: '%(kallenavn)s'"
+
+#: cps/oauth_bb.py:148
+msgid "Link to %(oauth)s Succeeded"
+msgstr "Link til %(oauth)s lyktes"
+
+#: cps/oauth_bb.py:155
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr "Pålogging mislyktes, ingen bruker koblet til OAuth-konto"
+
+#: cps/oauth_bb.py:197
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr "Fjern koblingen til %(oauth)s"
+
+#: cps/oauth_bb.py:202
+msgid "Unlink to %(oauth)s Failed"
+msgstr "Fjern koblingen til %(oauth)s mislyktes"
+
+#: cps/oauth_bb.py:205
+msgid "Not Linked to %(oauth)s"
+msgstr "Ikke koblet til %(oauth)s"
+
+#: cps/oauth_bb.py:261
+msgid "Failed to log in with GitHub."
+msgstr "Kunne ikke logge på med GitHub."
+
+#: cps/oauth_bb.py:267
+msgid "Failed to fetch user info from GitHub."
+msgstr "Kunne ikke hente brukerinformasjon fra GitHub."
+
+#: cps/oauth_bb.py:279
+msgid "Failed to log in with Google."
+msgstr "Kunne ikke logge på med Google."
+
+#: cps/oauth_bb.py:285
+msgid "Failed to fetch user info from Google."
+msgstr "Kunne ikke hente brukerinformasjon fra Google."
+
+#: cps/oauth_bb.py:332
+msgid "GitHub Oauth error, please retry later."
+msgstr "GitHub Oauth-feil, prøv igjen senere."
+
+#: cps/oauth_bb.py:335
+msgid "GitHub Oauth error: {}"
+msgstr "GitHub Oauth-feil: {}"
+
+#: cps/oauth_bb.py:356
+msgid "Google Oauth error, please retry later."
+msgstr "Google Oauth-feil, prøv igjen senere."
+
+#: cps/oauth_bb.py:359
+msgid "Google Oauth error: {}"
+msgstr "Google Oauth-feil: {}"
+
+#: cps/opds.py:287
+msgid "{} Stars"
+msgstr "{} Stjerner"
+
+#: cps/remotelogin.py:62 cps/templates/layout.html:67
+#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/templates/login.html:21 cps/web.py:1340
+msgid "Login"
+msgstr "Logg Inn"
+
+#: cps/remotelogin.py:74 cps/remotelogin.py:108
+msgid "Token not found"
+msgstr "Token ikke funnet"
+
+#: cps/remotelogin.py:83 cps/remotelogin.py:116
+msgid "Token has expired"
+msgstr "Token har utløpt"
+
+#: cps/remotelogin.py:92
+msgid "Success! Please return to your device"
+msgstr "Suksess! Gå tilbake til enheten din"
+
+#: cps/render_template.py:40 cps/web.py:406
+msgid "Books"
+msgstr "Bøker"
+
+#: cps/render_template.py:42
+msgid "Show recent books"
+msgstr "Vis nyere bøker"
+
+#: cps/render_template.py:43 cps/templates/index.xml:25
+msgid "Hot Books"
+msgstr "Hot bøker"
+
+#: cps/render_template.py:45
+msgid "Show Hot Books"
+msgstr "Vis populære bøker"
+
+#: cps/render_template.py:47 cps/render_template.py:52
+msgid "Downloaded Books"
+msgstr "Nedlastede bøker"
+
+#: cps/render_template.py:49 cps/render_template.py:54
+#: cps/templates/user_table.html:167
+msgid "Show Downloaded Books"
+msgstr "Vis nedlastede bøker"
+
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+msgid "Top Rated Books"
+msgstr "Topprangerte bøker"
+
+#: cps/render_template.py:59 cps/templates/user_table.html:161
+msgid "Show Top Rated Books"
+msgstr "Vis best rangerte bøker"
+
+#: cps/render_template.py:60 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:742
+msgid "Read Books"
+msgstr "Lese bøker"
+
+#: cps/render_template.py:62
+msgid "Show read and unread"
+msgstr "Vis lest og ulest"
+
+#: cps/render_template.py:64 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:745
+msgid "Unread Books"
+msgstr "Uleste bøker"
+
+#: cps/render_template.py:66
+msgid "Show unread"
+msgstr "Vis ulest"
+
+#: cps/render_template.py:67
+msgid "Discover"
+msgstr "Oppdage"
+
+#: cps/render_template.py:69 cps/templates/index.xml:50
+#: cps/templates/user_table.html:162
+msgid "Show Random Books"
+msgstr "Vis tilfeldige bøker"
+
+#: cps/render_template.py:70 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1102
+msgid "Categories"
+msgstr "Kategorier"
+
+#: cps/render_template.py:72 cps/templates/user_table.html:158
+msgid "Show category selection"
+msgstr "Vis kategorivalg"
+
+#: cps/render_template.py:73 cps/templates/book_edit.html:91
+#: cps/templates/book_table.html:68 cps/templates/index.xml:90
+#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+msgid "Series"
+msgstr "Serie"
+
+#: cps/render_template.py:75 cps/templates/user_table.html:157
+msgid "Show series selection"
+msgstr "Vis serieutvalg"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:66
+#: cps/templates/index.xml:69
+msgid "Authors"
+msgstr "Forfattere"
+
+#: cps/render_template.py:78 cps/templates/user_table.html:160
+msgid "Show author selection"
+msgstr "Vis forfattervalg"
+
+#: cps/render_template.py:80 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:969
+msgid "Publishers"
+msgstr "Forlag"
+
+#: cps/render_template.py:82 cps/templates/user_table.html:163
+msgid "Show publisher selection"
+msgstr "Vis utgivervalg"
+
+#: cps/render_template.py:83 cps/templates/book_table.html:70
+#: cps/templates/index.xml:97 cps/templates/search_form.html:107
+#: cps/web.py:1074
+msgid "Languages"
+msgstr "Språk"
+
+#: cps/render_template.py:86 cps/templates/user_table.html:155
+msgid "Show language selection"
+msgstr "Vis språkvalg"
+
+#: cps/render_template.py:87 cps/templates/index.xml:104
+msgid "Ratings"
+msgstr "Vurderinger"
+
+#: cps/render_template.py:89 cps/templates/user_table.html:164
+msgid "Show ratings selection"
+msgstr "Vis vurderingsvalg"
+
+#: cps/render_template.py:90 cps/templates/index.xml:112
+msgid "File formats"
+msgstr "Filformater"
+
+#: cps/render_template.py:92 cps/templates/user_table.html:165
+msgid "Show file formats selection"
+msgstr "Vis valg av filformater"
+
+#: cps/render_template.py:94 cps/web.py:768
+msgid "Archived Books"
+msgstr "Arkiverte bøker"
+
+#: cps/render_template.py:96 cps/templates/user_table.html:166
+msgid "Show archived books"
+msgstr "Vis arkiverte bøker"
+
+#: cps/render_template.py:99 cps/web.py:799
+msgid "Books List"
+msgstr "Bøker Liste"
+
+#: cps/render_template.py:101 cps/templates/user_table.html:168
+msgid "Show Books List"
+msgstr "Vis bokliste"
+
+#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/templates/feed.xml:33 cps/templates/index.xml:11
+#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/search_form.html:226
+msgid "Search"
+msgstr "Søk"
+
+#: cps/search.py:188
+msgid "Published after "
+msgstr "Publisert etter "
+
+#: cps/search.py:195
+msgid "Published before "
+msgstr "Publisert før "
+
+#: cps/search.py:217
+msgid "Rating <= %(rating)s"
+msgstr "Vurdering <= %(rating)s"
+
+#: cps/search.py:219
+msgid "Rating >= %(rating)s"
+msgstr "Vurdering >= %(rating)s"
+
+#: cps/search.py:221
+msgid "Read Status = %(status)s"
+msgstr "Lesestatus = %(status)s"
+
+#: cps/search.py:323
+msgid "Error on search for custom columns, please restart Calibre-Web"
+msgstr "Feil ved søk etter egendefinerte kolonner. Start Calibre-Web på nytt"
+
+#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+msgid "Advanced Search"
+msgstr "Avansert søk"
+
+#: cps/shelf.py:49 cps/shelf.py:103
+msgid "Invalid shelf specified"
+msgstr "Ugyldig hylle er angitt"
+
+#: cps/shelf.py:55
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "Beklager at du ikke har lov til å legge til en bok i den hyllen"
+
+#: cps/shelf.py:64
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Boken er allerede en del av hyllen: %(hyllenavn)s"
+
+#: cps/shelf.py:89
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Boken er lagt til i hyllen: %(sname)s"
+
+#: cps/shelf.py:108
+msgid "You are not allowed to add a book to the shelf"
+msgstr "Du har ikke lov til å legge en bok i hyllen"
+
+#: cps/shelf.py:126
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Bøker er allerede en del av hyllen: %(name)s"
+
+#: cps/shelf.py:138
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Bøker er lagt til i hyllen: %(sname)s"
+
+#: cps/shelf.py:145
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Kunne ikke legge til bøker i hyllen: %(sname)s"
+
+#: cps/shelf.py:191
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Boken er fjernet fra hyllen: %(sname)s"
+
+#: cps/shelf.py:200
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "Beklager at du ikke har lov til å fjerne en bok fra denne hyllen"
+
+#: cps/shelf.py:210 cps/templates/layout.html:157
+msgid "Create a Shelf"
+msgstr "Lag en hylle"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "Beklager at du ikke har lov til å redigere denne hyllen"
+
+#: cps/shelf.py:220
+msgid "Edit a shelf"
+msgstr "Rediger en hylle"
+
+#: cps/shelf.py:229
+msgid "Error deleting Shelf"
+msgstr "Feil ved sletting av hylle"
+
+#: cps/shelf.py:231
+msgid "Shelf successfully deleted"
+msgstr "Hylle slettet"
+
+#: cps/shelf.py:281
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Endre rekkefølgen på hylle: '%(name)s'"
+
+#: cps/shelf.py:313
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "Beklager at du ikke har lov til å opprette en offentlig hylle"
+
+#: cps/shelf.py:330
+msgid "Shelf %(title)s created"
+msgstr "Hylle %(title)s opprettet"
+
+#: cps/shelf.py:333
+msgid "Shelf %(title)s changed"
+msgstr "Hylle %(title)s endret"
+
+#: cps/shelf.py:347
+msgid "There was an error"
+msgstr "det var en feil"
+
+#: cps/shelf.py:369
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "En offentlig hylle med navnet '%(title)s' eksisterer allerede."
+
+#: cps/shelf.py:380
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "En privat hylle med navnet '%(title)s' eksisterer allerede."
+
+#: cps/shelf.py:462
+msgid "Shelf: '%(name)s'"
+msgstr "Hylle: '%(name)s'"
+
+#: cps/shelf.py:466
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Feil ved åpning av hylle. Hylle finnes ikke eller er ikke tilgjengelig"
+
+#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/templates/tasks.html:7
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: cps/tasks_status.py:64
+msgid "Waiting"
+msgstr "Venter"
+
+#: cps/tasks_status.py:66
+msgid "Failed"
+msgstr "Mislyktes"
+
+#: cps/tasks_status.py:68
+msgid "Started"
+msgstr "Startet"
+
+#: cps/tasks_status.py:70
+msgid "Finished"
+msgstr "Ferdig"
+
+#: cps/tasks_status.py:72
+msgid "Ended"
+msgstr "Endte"
+
+#: cps/tasks_status.py:74
+msgid "Cancelled"
+msgstr "avbrutt"
+
+#: cps/tasks_status.py:76
+msgid "Unknown Status"
+msgstr "Ukjent status"
+
+#: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
+msgid "Unexpected data while reading update information"
+msgstr "Uventede data under lesing av oppdateringsinformasjon"
+
+#: cps/updater.py:438 cps/updater.py:550
+msgid "No update available. You already have the latest version installed"
+msgstr "Ingen oppdatering tilgjengelig. Du har allerede den nyeste versjonen installert"
+
+#: cps/updater.py:456
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "En ny oppdatering er tilgjengelig. Klikk på knappen nedenfor for å oppdatere til siste versjon."
+
+#: cps/updater.py:474
+msgid "Could not fetch update information"
+msgstr "Kunne ikke hente oppdateringsinformasjon"
+
+#: cps/updater.py:484
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Klikk på knappen nedenfor for å oppdatere til siste stabile versjon."
+
+#: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr "En ny oppdatering er tilgjengelig. Klikk på knappen nedenfor for å oppdatere til versjon: %(version)s"
+
+#: cps/updater.py:536
+msgid "No release information available"
+msgstr "Ingen utgivelsesinformasjon tilgjengelig"
+
+#: cps/templates/index.html:6 cps/web.py:433
+msgid "Discover (Random Books)"
+msgstr "Discover (tilfeldige bøker)"
+
+#: cps/web.py:469
+msgid "Hot Books (Most Downloaded)"
+msgstr "Hot Books (mest nedlastede)"
+
+#: cps/web.py:500
+msgid "Downloaded books by %(user)s"
+msgstr "Lastet ned bøker av %(user)s"
+
+#: cps/web.py:533
+msgid "Author: %(name)s"
+msgstr "Forfatter: %(navn)s"
+
+#: cps/web.py:569
+msgid "Publisher: %(name)s"
+msgstr "Utgiver: %(navn)s"
+
+#: cps/web.py:597
+msgid "Series: %(serie)s"
+msgstr "Serie: %(serie)s"
+
+#: cps/web.py:612
+msgid "Rating: None"
+msgstr "Vurdering: Ingen"
+
+#: cps/web.py:621
+msgid "Rating: %(rating)s stars"
+msgstr "Rangering: %(rating)s stjerner"
+
+#: cps/web.py:639
+msgid "File format: %(format)s"
+msgstr "Filformat: %(format)s"
+
+#: cps/web.py:676
+msgid "Category: %(name)s"
+msgstr "Kategori: %(navn)s"
+
+#: cps/web.py:703
+msgid "Language: %(name)s"
+msgstr "Språk: %(navn)s"
+
+#: cps/templates/admin.html:16 cps/web.py:941
+msgid "Downloads"
+msgstr "Nedlastinger"
+
+#: cps/web.py:1034
+msgid "Ratings list"
+msgstr "Rangeringsliste"
+
+#: cps/web.py:1061
+msgid "File formats list"
+msgstr "Liste over filformater"
+
+#: cps/web.py:1203
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "Boken ble satt i kø for sending til %(kindlemail)s"
+
+#: cps/web.py:1207
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr "Oops! Det oppsto en feil ved sending av denne boken: %(res)s"
+
+#: cps/web.py:1209
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr "Vennligst oppdater profilen din med en gyldig Send til Kindle-e-postadresse."
+
+#: cps/web.py:1226
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "E-postserveren er ikke konfigurert, kontakt administratoren din!"
+
+#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
+#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
+#: cps/web.py:1271
+msgid "Register"
+msgstr "Registrere"
+
+#: cps/web.py:1262
+msgid "Your e-mail is not allowed to register"
+msgstr "Din e-post kan ikke registreres"
+
+#: cps/web.py:1266
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "E-postbekreftelse ble sendt til e-postkontoen din."
+
+#: cps/web.py:1280
+msgid "Cannot activate LDAP authentication"
+msgstr "Kan ikke aktivere LDAP-autentisering"
+
+#: cps/web.py:1299
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr "Reservepålogging som: '%(kallenavn)s', LDAP-serveren er ikke tilgjengelig, eller brukeren er ukjent"
+
+#: cps/web.py:1305
+msgid "Could not login: %(message)s"
+msgstr "Kunne ikke logge på: %(melding)s"
+
+#: cps/web.py:1309 cps/web.py:1334
+msgid "Wrong Username or Password"
+msgstr "Feil brukernavn eller passord"
+
+#: cps/web.py:1316
+msgid "New Password was send to your email address"
+msgstr "Nytt passord ble sendt til e-postadressen din"
+
+#: cps/web.py:1322
+msgid "Please enter valid username to reset password"
+msgstr "Vennligst skriv inn gyldig brukernavn for å tilbakestille passordet"
+
+#: cps/web.py:1329
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "Du er nå logget på som: '%(kallenavn)s'"
+
+#: cps/web.py:1396 cps/web.py:1445
+msgid "%(name)s's profile"
+msgstr "%(name)s sin profil"
+
+#: cps/web.py:1412
+msgid "Profile updated"
+msgstr "Profil oppdatert"
+
+#: cps/services/gmail.py:58
+msgid "Found no valid gmail.json file with OAuth information"
+msgstr "Fant ingen gyldig gmail.json-fil med OAuth-informasjon"
+
+#: cps/tasks/convert.py:153
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr "Caliber ebook-convert %(tool)s ble ikke funnet"
+
+#: cps/tasks/convert.py:186
+msgid "%(format)s format not found on disk"
+msgstr "%(format)s format ikke funnet på disken"
+
+#: cps/tasks/convert.py:190
+msgid "Ebook converter failed with unknown error"
+msgstr "Ebook-konvertering mislyktes med ukjent feil"
+
+#: cps/tasks/convert.py:202
+msgid "Kepubify-converter failed: %(error)s"
+msgstr "Kepubify-konvertering mislyktes: %(error)s"
+
+#: cps/tasks/convert.py:224
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr "Konvertert fil ikke funnet eller mer enn én fil i mappen %(folder)s"
+
+#: cps/tasks/convert.py:247
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ebook-konvertering mislyktes: %(error)s"
+
+#: cps/tasks/convert.py:270
+msgid "Calibre failed with error: %(error)s"
+msgstr "Caliber mislyktes med feil: %(error)s"
+
+#: cps/tasks/convert.py:275
+msgid "Convert"
+msgstr "Konvertere"
+
+#: cps/tasks/database.py:28
+msgid "Reconnecting Calibre database"
+msgstr "Kobler til Caliber-databasen på nytt"
+
+#: cps/tasks/mail.py:266
+msgid "E-mail"
+msgstr "E-post"
+
+#: cps/tasks/metadata_backup.py:47
+msgid "Backing up Metadata"
+msgstr "Sikkerhetskopierer metadata"
+
+#: cps/tasks/thumbnail.py:95
+msgid "Generated %(count)s cover thumbnails"
+msgstr "Genererte %(count)s forsideminiatyrbilder"
+
+#: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
+#: cps/tasks/thumbnail.py:503
+msgid "Cover Thumbnails"
+msgstr "Forsideminiatyrbilder"
+
+#: cps/tasks/thumbnail.py:281
+msgid "Generated {0} series thumbnails"
+msgstr "Genererte {0} serieminiatyrbilder"
+
+#: cps/tasks/thumbnail.py:446
+msgid "Clearing cover thumbnail cache"
+msgstr "Tømmer cache for miniatyrbilde for omslag"
+
+#: cps/tasks/upload.py:38 cps/templates/admin.html:20
+#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "Laste opp"
+
+#: cps/templates/admin.html:9
+msgid "Users"
+msgstr "Brukere"
+
+#: cps/templates/admin.html:13 cps/templates/login.html:9
+#: cps/templates/login.html:10 cps/templates/register.html:9
+#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
+msgid "Username"
+msgstr "Brukernavn"
+
+#: cps/templates/admin.html:14 cps/templates/register.html:14
+#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
+msgid "E-mail Address"
+msgstr "Epostadresse"
+
+#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
+msgid "Send to E-Reader E-mail Address"
+msgstr "Send til E-Reader E-postadresse"
+
+#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/user_table.html:143
+msgid "Admin"
+msgstr "Admin"
+
+#: cps/templates/admin.html:18 cps/templates/login.html:13
+#: cps/templates/login.html:14 cps/templates/user_edit.html:23
+msgid "Password"
+msgstr "Passord"
+
+#: cps/templates/admin.html:22 cps/templates/detail.html:19
+#: cps/templates/detail.html:28 cps/templates/shelf.html:8
+#: cps/templates/user_table.html:146
+msgid "Download"
+msgstr "nedlasting"
+
+#: cps/templates/admin.html:23
+msgid "View Books"
+msgstr "Se bøker"
+
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
+#: cps/templates/user_table.html:148
+msgid "Edit"
+msgstr "Redigere"
+
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:17
+#: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
+#: cps/templates/user_table.html:149
+msgid "Delete"
+msgstr "Slett"
+
+#: cps/templates/admin.html:26
+msgid "Public Shelf"
+msgstr "Offentlig hylle"
+
+#: cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "Legg til ny bruker"
+
+#: cps/templates/admin.html:55
+msgid "Import LDAP Users"
+msgstr "Importer LDAP-brukere"
+
+#: cps/templates/admin.html:62
+msgid "E-mail Server Settings"
+msgstr "Innstillinger for e-postserver"
+
+#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
+msgid "SMTP Hostname"
+msgstr "SMTP vertsnavn"
+
+#: cps/templates/admin.html:71 cps/templates/email_edit.html:35
+msgid "SMTP Port"
+msgstr "SMTP-port"
+
+#: cps/templates/admin.html:75 cps/templates/email_edit.html:39
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: cps/templates/admin.html:79 cps/templates/email_edit.html:47
+msgid "SMTP Login"
+msgstr "SMTP-pålogging"
+
+#: cps/templates/admin.html:83 cps/templates/admin.html:94
+#: cps/templates/email_edit.html:55
+msgid "From E-mail"
+msgstr "Fra e-post"
+
+#: cps/templates/admin.html:90
+msgid "E-Mail Service"
+msgstr "E-posttjeneste"
+
+#: cps/templates/admin.html:91
+msgid "Gmail via Oauth2"
+msgstr "Gmail via Oauth2"
+
+#: cps/templates/admin.html:106
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#: cps/templates/admin.html:109
+msgid "Calibre Database Directory"
+msgstr "Caliber Database Directory"
+
+#: cps/templates/admin.html:113 cps/templates/config_edit.html:68
+msgid "Log Level"
+msgstr "Loggnivå"
+
+#: cps/templates/admin.html:117
+msgid "Port"
+msgstr "Havn"
+
+#: cps/templates/admin.html:122
+msgid "External Port"
+msgstr "Ekstern port"
+
+#: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
+msgid "Books per Page"
+msgstr "Bøker per side"
+
+#: cps/templates/admin.html:133
+msgid "Uploads"
+msgstr "Opplastinger"
+
+#: cps/templates/admin.html:137
+msgid "Anonymous Browsing"
+msgstr "Anonym surfing"
+
+#: cps/templates/admin.html:141
+msgid "Public Registration"
+msgstr "Offentlig registrering"
+
+#: cps/templates/admin.html:145
+msgid "Magic Link Remote Login"
+msgstr "Magic Link ekstern pålogging"
+
+#: cps/templates/admin.html:149
+msgid "Reverse Proxy Login"
+msgstr "Omvendt proxy-pålogging"
+
+#: cps/templates/admin.html:154 cps/templates/config_edit.html:173
+msgid "Reverse Proxy Header Name"
+msgstr "Omvendt proxy-overskriftsnavn"
+
+#: cps/templates/admin.html:159
+msgid "Edit Calibre Database Configuration"
+msgstr "Rediger Caliber-databasekonfigurasjon"
+
+#: cps/templates/admin.html:160
+msgid "Edit Basic Configuration"
+msgstr "Rediger grunnleggende konfigurasjon"
+
+#: cps/templates/admin.html:161
+msgid "Edit UI Configuration"
+msgstr "Rediger UI-konfigurasjon"
+
+#: cps/templates/admin.html:167
+msgid "Scheduled Tasks"
+msgstr "Planlagte oppgaver"
+
+#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+msgid "Time at which tasks start to run"
+msgstr "Tidspunkt da oppgavene begynner å kjøre"
+
+#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
+msgid "Maximum tasks duration"
+msgstr "Maksimal oppgavevarighet"
+
+#: cps/templates/admin.html:178
+msgid "Generate book cover thumbnails"
+msgstr "Generer miniatyrbilder av bokomslag"
+
+#: cps/templates/admin.html:182
+msgid "Generate series cover thumbnails"
+msgstr "Generer serieomslagsminiatyrbilder"
+
+#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+msgid "Reconnect to Calibre Library"
+msgstr "Koble til Caliber Library på nytt"
+
+#: cps/templates/admin.html:193
+msgid "Refresh Thumbnail Cover Cache"
+msgstr "Oppdater thumbnail cover Cache"
+
+#: cps/templates/admin.html:199
+msgid "Administration"
+msgstr "Administrasjon"
+
+#: cps/templates/admin.html:200
+msgid "Download Debug Package"
+msgstr "Last ned feilsøkingspakken"
+
+#: cps/templates/admin.html:201
+msgid "View Logs"
+msgstr "Vis logger"
+
+#: cps/templates/admin.html:204
+msgid "Reconnect Calibre Database"
+msgstr "Koble til Caliber-databasen på nytt"
+
+#: cps/templates/admin.html:207
+msgid "Restart"
+msgstr "Omstart"
+
+#: cps/templates/admin.html:208
+msgid "Shutdown"
+msgstr "Skru av"
+
+#: cps/templates/admin.html:216
+msgid "Version Information"
+msgstr "Versjonsinformasjon"
+
+#: cps/templates/admin.html:220
+msgid "Version"
+msgstr "Versjon"
+
+#: cps/templates/admin.html:221
+msgid "Details"
+msgstr "Detaljer"
+
+#: cps/templates/admin.html:227
+msgid "Current version"
+msgstr "Gjeldende versjon"
+
+#: cps/templates/admin.html:234
+msgid "Check for Update"
+msgstr "Se etter oppdatering"
+
+#: cps/templates/admin.html:235
+msgid "Perform Update"
+msgstr "Utfør oppdatering"
+
+#: cps/templates/admin.html:248
+msgid "Are you sure you want to restart?"
+msgstr "Er du sikker på at du vil starte på nytt?"
+
+#: cps/templates/admin.html:253 cps/templates/admin.html:267
+#: cps/templates/admin.html:287 cps/templates/config_db.html:70
+msgid "OK"
+msgstr "OK"
+
+#: cps/templates/admin.html:254 cps/templates/admin.html:268
+#: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
+#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
+#: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/modal_dialogs.html:135 cps/templates/schedule_edit.html:41
+#: cps/templates/shelf_edit.html:27 cps/templates/tasks.html:46
+#: cps/templates/user_edit.html:144
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: cps/templates/admin.html:266
+msgid "Are you sure you want to shutdown?"
+msgstr "Er du sikker på at du vil slå av?"
+
+#: cps/templates/admin.html:278
+msgid "Updating, please do not reload this page"
+msgstr "Oppdaterer, vennligst ikke last inn denne siden på nytt"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "via"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "I biblioteket"
+
+#: cps/templates/author.html:26 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
+msgid "Sort according to book date, newest first"
+msgstr "Sorter etter bokdato, nyeste først"
+
+#: cps/templates/author.html:27 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
+msgid "Sort according to book date, oldest first"
+msgstr "Sorter etter bokdato, eldste først"
+
+#: cps/templates/author.html:28 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
+msgid "Sort title in alphabetical order"
+msgstr "Sorter tittelen i alfabetisk rekkefølge"
+
+#: cps/templates/author.html:29 cps/templates/index.html:77
+#: cps/templates/search.html:34 cps/templates/shelf.html:23
+msgid "Sort title in reverse alphabetical order"
+msgstr "Sorter tittelen i omvendt alfabetisk rekkefølge"
+
+#: cps/templates/author.html:30 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
+msgid "Sort according to publishing date, newest first"
+msgstr "Sorter etter publiseringsdato, nyeste først"
+
+#: cps/templates/author.html:31 cps/templates/index.html:81
+#: cps/templates/search.html:38 cps/templates/shelf.html:27
+msgid "Sort according to publishing date, oldest first"
+msgstr "Sorter etter publiseringsdato, eldste først"
+
+#: cps/templates/author.html:56 cps/templates/author.html:115
+#: cps/templates/index.html:30 cps/templates/index.html:113
+#: cps/templates/search.html:67 cps/templates/shelf.html:55
+msgid "reduce"
+msgstr "redusere"
+
+#: cps/templates/author.html:99
+msgid "More by"
+msgstr "Mer av"
+
+#: cps/templates/book_edit.html:11
+msgid "Delete Book"
+msgstr "Slett bok"
+
+#: cps/templates/book_edit.html:14
+msgid "Delete formats:"
+msgstr "Slett formater:"
+
+#: cps/templates/book_edit.html:25
+msgid "Convert book format:"
+msgstr "Konverter bokformat:"
+
+#: cps/templates/book_edit.html:30
+msgid "Convert from:"
+msgstr "Konverter fra:"
+
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
+msgid "select an option"
+msgstr "Velg et alternativ"
+
+#: cps/templates/book_edit.html:37
+msgid "Convert to:"
+msgstr "Konvertere til:"
+
+#: cps/templates/book_edit.html:46
+msgid "Convert book"
+msgstr "Konverter bok"
+
+#: cps/templates/book_edit.html:56 cps/templates/search_form.html:8
+msgid "Book Title"
+msgstr "Boktittel"
+
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:289 cps/templates/search_form.html:12
+msgid "Author"
+msgstr "Forfatter"
+
+#: cps/templates/book_edit.html:68 cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:291 cps/templates/search_form.html:153
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: cps/templates/book_edit.html:73
+msgid "Identifiers"
+msgstr "Identifikatorer"
+
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+msgid "Identifier Type"
+msgstr "Identifikatortype"
+
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+msgid "Identifier Value"
+msgstr "Identifikatorverdi"
+
+#: cps/templates/book_edit.html:79 cps/templates/book_edit.html:302
+#: cps/templates/user_table.html:24
+msgid "Remove"
+msgstr "Ta bort"
+
+#: cps/templates/book_edit.html:83
+msgid "Add Identifier"
+msgstr "Legg til identifikator"
+
+#: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
+msgid "Tags"
+msgstr "Tagger"
+
+#: cps/templates/book_edit.html:95
+msgid "Series ID"
+msgstr "Serie-ID"
+
+#: cps/templates/book_edit.html:99
+msgid "Rating"
+msgstr "Vurdering"
+
+#: cps/templates/book_edit.html:104
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "Hent omslag fra URL (JPEG - Bilde vil bli lastet ned og lagret i databasen)"
+
+#: cps/templates/book_edit.html:108
+msgid "Upload Cover from Local Disk"
+msgstr "Last opp cover fra lokal disk"
+
+#: cps/templates/book_edit.html:113
+msgid "Published Date"
+msgstr "Publiseringsdato"
+
+#: cps/templates/book_edit.html:122 cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:290 cps/templates/detail.html:165
+#: cps/templates/listenmp3.html:102 cps/templates/search_form.html:16
+msgid "Publisher"
+msgstr "Forlegger"
+
+#: cps/templates/book_edit.html:126 cps/templates/detail.html:132
+#: cps/templates/listenmp3.html:69 cps/templates/user_edit.html:33
+msgid "Language"
+msgstr "Språk"
+
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:45
+#: cps/templates/search_form.html:164
+msgid "Yes"
+msgstr "Ja"
+
+#: cps/templates/book_edit.html:137 cps/templates/search_form.html:46
+#: cps/templates/search_form.html:165
+msgid "No"
+msgstr "Nei"
+
+#: cps/templates/book_edit.html:201
+msgid "Upload Format"
+msgstr "Last opp format"
+
+#: cps/templates/book_edit.html:209
+msgid "View Book on Save"
+msgstr "Se bok på Lagre"
+
+#: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
+msgid "Fetch Metadata"
+msgstr "Hent metadata"
+
+#: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
+#: cps/templates/email_edit.html:65 cps/templates/schedule_edit.html:40
+#: cps/templates/shelf_edit.html:25 cps/templates/shelf_order.html:41
+#: cps/templates/user_edit.html:142
+msgid "Save"
+msgstr "Lagre"
+
+#: cps/templates/book_edit.html:233
+msgid "Keyword"
+msgstr "Nøkkelord"
+
+#: cps/templates/book_edit.html:234
+msgid "Search keyword"
+msgstr "Søk nøkkelord"
+
+#: cps/templates/book_edit.html:240
+msgid "Click the cover to load metadata to the form"
+msgstr "Klikk på omslaget for å laste metadata til skjemaet"
+
+#: cps/templates/book_edit.html:247 cps/templates/book_edit.html:286
+msgid "Loading..."
+msgstr "Laster inn..."
+
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
+#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:163
+msgid "Close"
+msgstr "Lukk"
+
+#: cps/templates/book_edit.html:278 cps/templates/book_edit.html:292
+msgid "Source"
+msgstr "Kilde"
+
+#: cps/templates/book_edit.html:287
+msgid "Search error!"
+msgstr "Søkefeil!"
+
+#: cps/templates/book_edit.html:288
+msgid "No Result(s) found! Please try another keyword."
+msgstr "Ingen resultater! Prøv et annet søkeord."
+
+#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
+#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
+#: cps/templates/user_table.html:100
+msgid "This Field is Required"
+msgstr "Dette feltet er obligatorisk"
+
+#: cps/templates/book_table.html:37
+msgid "Merge selected books"
+msgstr "Slå sammen valgte bøker"
+
+#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
+msgid "Remove Selections"
+msgstr "Fjern valg"
+
+#: cps/templates/book_table.html:41
+msgid "Exchange author and title"
+msgstr "Bytt forfatter og tittel"
+
+#: cps/templates/book_table.html:47
+msgid "Update Title Sort automatically"
+msgstr "Oppdater tittelsortering automatisk"
+
+#: cps/templates/book_table.html:51
+msgid "Update Author Sort automatically"
+msgstr "Oppdater forfattersortering automatisk"
+
+#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
+msgid "Enter Title"
+msgstr "Skriv inn tittel"
+
+#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
+#: cps/templates/shelf_edit.html:8
+msgid "Title"
+msgstr "Tittel"
+
+#: cps/templates/book_table.html:64
+msgid "Enter Title Sort"
+msgstr "Skriv inn tittelsortering"
+
+#: cps/templates/book_table.html:64
+msgid "Title Sort"
+msgstr "Tittelsortering"
+
+#: cps/templates/book_table.html:65
+msgid "Enter Author Sort"
+msgstr "Skriv inn forfattersortering"
+
+#: cps/templates/book_table.html:65
+msgid "Author Sort"
+msgstr "Forfatter Sort"
+
+#: cps/templates/book_table.html:66
+msgid "Enter Authors"
+msgstr "Skriv inn forfattere"
+
+#: cps/templates/book_table.html:67
+msgid "Enter Categories"
+msgstr "Skriv inn kategorier"
+
+#: cps/templates/book_table.html:68
+msgid "Enter Series"
+msgstr "Gå inn i serien"
+
+#: cps/templates/book_table.html:69
+msgid "Series Index"
+msgstr "Serieindeks"
+
+#: cps/templates/book_table.html:70
+msgid "Enter Languages"
+msgstr "Skriv inn Språk"
+
+#: cps/templates/book_table.html:71
+msgid "Publishing Date"
+msgstr "Publiseringsdato"
+
+#: cps/templates/book_table.html:72
+msgid "Enter Publishers"
+msgstr "Skriv inn Publishers"
+
+#: cps/templates/book_table.html:73
+msgid "Enter comments"
+msgstr "Skriv inn kommentarer"
+
+#: cps/templates/book_table.html:73
+msgid "Comments"
+msgstr "Kommentarer"
+
+#: cps/templates/book_table.html:75
+msgid "Archive Status"
+msgstr "Arkivstatus"
+
+#: cps/templates/book_table.html:77 cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "Les status"
+
+#: cps/templates/book_table.html:80 cps/templates/book_table.html:82
+#: cps/templates/book_table.html:84 cps/templates/book_table.html:86
+#: cps/templates/book_table.html:90 cps/templates/book_table.html:92
+#: cps/templates/book_table.html:96
+msgid "Enter "
+msgstr "Tast inn "
+
+#: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
+#: cps/templates/tasks.html:36
+msgid "Are you really sure?"
+msgstr "Er du virkelig sikker?"
+
+#: cps/templates/book_table.html:117
+msgid "Books with Title will be merged from:"
+msgstr "Bøker med tittel vil bli slått sammen fra:"
+
+#: cps/templates/book_table.html:121
+msgid "Into Book with Title:"
+msgstr "Til bok med tittel:"
+
+#: cps/templates/book_table.html:126
+msgid "Merge"
+msgstr "Slå sammen"
+
+#: cps/templates/config_db.html:12
+msgid "Location of Calibre Database"
+msgstr "Plassering av Caliber-databasen"
+
+#: cps/templates/config_db.html:22
+msgid "Use Google Drive?"
+msgstr "Bruker du Google Disk?"
+
+#: cps/templates/config_db.html:27
+msgid "Authenticate Google Drive"
+msgstr "Autentiser Google Disk"
+
+#: cps/templates/config_db.html:32
+msgid "Google Drive Calibre folder"
+msgstr "Google Drive Caliber-mappe"
+
+#: cps/templates/config_db.html:40
+msgid "Metadata Watch Channel ID"
+msgstr "Metadata Se kanal-ID"
+
+#: cps/templates/config_db.html:43
+msgid "Revoke"
+msgstr "Oppheve"
+
+#: cps/templates/config_db.html:68
+msgid "New db location is invalid, please enter valid path"
+msgstr "Ny db-plassering er ugyldig, vennligst skriv inn gyldig bane"
+
+#: cps/templates/config_edit.html:18
+msgid "Server Configuration"
+msgstr "Serverkonfigurasjon"
+
+#: cps/templates/config_edit.html:25
+msgid "Server Port"
+msgstr "Serverport"
+
+#: cps/templates/config_edit.html:28
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL-sertfilplassering (la den stå tom for ikke-SSL-servere)"
+
+#: cps/templates/config_edit.html:35
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL-nøkkelfilplassering (la den stå tom for ikke-SSL-servere)"
+
+#: cps/templates/config_edit.html:43
+msgid "Update Channel"
+msgstr "Oppdater kanalen"
+
+#: cps/templates/config_edit.html:45
+msgid "Stable"
+msgstr "Stabil"
+
+#: cps/templates/config_edit.html:46
+msgid "Nightly"
+msgstr "Nattlig"
+
+#: cps/templates/config_edit.html:50
+msgid "Trusted Hosts (Comma Separated)"
+msgstr "Klarerte verter (kommaseparert)"
+
+#: cps/templates/config_edit.html:61
+msgid "Logfile Configuration"
+msgstr "Loggfilkonfigurasjon"
+
+#: cps/templates/config_edit.html:77
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr "Plassering og navn på loggfil (calibre-web.log for ingen oppføring)"
+
+#: cps/templates/config_edit.html:82
+msgid "Enable Access Log"
+msgstr "Aktiver tilgangslogg"
+
+#: cps/templates/config_edit.html:85
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr "Plassering og navn på tilgangsloggfil (access.log for ingen oppføring)"
+
+#: cps/templates/config_edit.html:96
+msgid "Feature Configuration"
+msgstr "Funksjonskonfigurasjon"
+
+#: cps/templates/config_edit.html:104
+msgid "Convert non-English characters in title and author while saving to disk"
+msgstr "Konverter ikke-engelske tegn i tittel og forfatter mens du lagrer på disk"
+
+#: cps/templates/config_edit.html:108
+msgid "Enable Uploads"
+msgstr "Aktiver opplastinger"
+
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr "(Vennligst sørg for at brukerne også har opplastingsrettigheter)"
+
+#: cps/templates/config_edit.html:112
+msgid "Allowed Upload Fileformats"
+msgstr "Tillatte opplastingsfilformater"
+
+#: cps/templates/config_edit.html:118
+msgid "Enable Anonymous Browsing"
+msgstr "Aktiver anonym surfing"
+
+#: cps/templates/config_edit.html:122
+msgid "Enable Public Registration"
+msgstr "Aktiver offentlig registrering"
+
+#: cps/templates/config_edit.html:127
+msgid "Use E-Mail as Username"
+msgstr "Bruk e-post som brukernavn"
+
+#: cps/templates/config_edit.html:132
+msgid "Enable Magic Link Remote Login"
+msgstr "Aktiver Magic Link Remote Login"
+
+#: cps/templates/config_edit.html:137
+msgid "Enable Kobo sync"
+msgstr "Aktiver Kobo-synkronisering"
+
+#: cps/templates/config_edit.html:142
+msgid "Proxy unknown requests to Kobo Store"
+msgstr "Ukjente proxy-forespørsler til Kobo Store"
+
+#: cps/templates/config_edit.html:145
+msgid "Server External Port (for port forwarded API calls)"
+msgstr "Server ekstern port (for portviderekoblede API-anrop)"
+
+#: cps/templates/config_edit.html:153
+msgid "Use Goodreads"
+msgstr "Bruk Goodreads"
+
+#: cps/templates/config_edit.html:154
+msgid "Create an API Key"
+msgstr "Opprett en API-nøkkel"
+
+#: cps/templates/config_edit.html:158
+msgid "Goodreads API Key"
+msgstr "Goodreads API-nøkkel"
+
+#: cps/templates/config_edit.html:162
+msgid "Goodreads API Secret"
+msgstr "Goodreads API Secret"
+
+#: cps/templates/config_edit.html:169
+msgid "Allow Reverse Proxy Authentication"
+msgstr "Tillat omvendt proxy-autentisering"
+
+#: cps/templates/config_edit.html:180
+msgid "Login type"
+msgstr "Påloggingstype"
+
+#: cps/templates/config_edit.html:182
+msgid "Use Standard Authentication"
+msgstr "Bruk standardautentisering"
+
+#: cps/templates/config_edit.html:184
+msgid "Use LDAP Authentication"
+msgstr "Bruk LDAP-autentisering"
+
+#: cps/templates/config_edit.html:187
+msgid "Use OAuth"
+msgstr "Bruk OAuth"
+
+#: cps/templates/config_edit.html:194
+msgid "LDAP Server Host Name or IP Address"
+msgstr "LDAP-serverens vertsnavn eller IP-adresse"
+
+#: cps/templates/config_edit.html:198
+msgid "LDAP Server Port"
+msgstr "LDAP-serverport"
+
+#: cps/templates/config_edit.html:202
+msgid "LDAP Encryption"
+msgstr "LDAP-kryptering"
+
+#: cps/templates/config_edit.html:205
+msgid "TLS"
+msgstr "TLS"
+
+#: cps/templates/config_edit.html:206
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/config_edit.html:210
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP CACertificate Path (Kun nødvendig for klientsertifikatautentisering)"
+
+#: cps/templates/config_edit.html:217
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP-sertifikatbane (kun nødvendig for klientsertifikatautentisering)"
+
+#: cps/templates/config_edit.html:224
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP-nøkkelfilbane (kun nødvendig for klientsertifikatautentisering)"
+
+#: cps/templates/config_edit.html:233
+msgid "LDAP Authentication"
+msgstr "LDAP-autentisering"
+
+#: cps/templates/config_edit.html:235
+msgid "Anonymous"
+msgstr "Anonym"
+
+#: cps/templates/config_edit.html:236
+msgid "Unauthenticated"
+msgstr "Uautentisert"
+
+#: cps/templates/config_edit.html:237
+msgid "Simple"
+msgstr "Enkel"
+
+#: cps/templates/config_edit.html:242
+msgid "LDAP Administrator Username"
+msgstr "LDAP-administratorbrukernavn"
+
+#: cps/templates/config_edit.html:248
+msgid "LDAP Administrator Password"
+msgstr "LDAP-administratorpassord"
+
+#: cps/templates/config_edit.html:253
+msgid "LDAP Distinguished Name (DN)"
+msgstr "LDAP Distinguished Name (DN)"
+
+#: cps/templates/config_edit.html:257
+msgid "LDAP User Object Filter"
+msgstr "LDAP-brukerobjektfilter"
+
+#: cps/templates/config_edit.html:262
+msgid "LDAP Server is OpenLDAP?"
+msgstr "LDAP Server er OpenLDAP?"
+
+#: cps/templates/config_edit.html:264
+msgid "Following Settings are Needed For User Import"
+msgstr "Følgende innstillinger er nødvendig for brukerimport"
+
+#: cps/templates/config_edit.html:266
+msgid "LDAP Group Object Filter"
+msgstr "LDAP gruppeobjektfilter"
+
+#: cps/templates/config_edit.html:270
+msgid "LDAP Group Name"
+msgstr "LDAP-gruppenavn"
+
+#: cps/templates/config_edit.html:274
+msgid "LDAP Group Members Field"
+msgstr "Felt for LDAP-gruppemedlemmer"
+
+#: cps/templates/config_edit.html:278
+msgid "LDAP Member User Filter Detection"
+msgstr "LDAP-medlemsbrukerfilterdeteksjon"
+

From e178efb58cadc53d30836ed92d5e6b869bc222c0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Sun, 15 Jan 2023 13:49:16 +0100
Subject: [PATCH 374/412] Update for #2653 (AP Scheduler triggers are function
 calls and not strings anymore)

---
 cps/schedule.py                      |  8 ++++----
 cps/services/background_scheduler.py | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 5f3326ef4..707e9bb3c 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -19,7 +19,7 @@
 import datetime
 
 from . import config, constants
-from .services.background_scheduler import BackgroundScheduler, use_APScheduler
+from .services.background_scheduler import BackgroundScheduler, CronTrigger, use_APScheduler
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails, TaskClearCoverThumbnailCache
 from .services.worker import WorkerThread
@@ -66,10 +66,10 @@ def register_scheduled_tasks(reconnect=True):
         duration = config.schedule_duration
 
         # Register scheduled tasks
-        scheduler.schedule_tasks(tasks=get_scheduled_tasks(reconnect), trigger='cron', hour=start)
+        scheduler.schedule_tasks(tasks=get_scheduled_tasks(reconnect), trigger=CronTrigger(hour=start))
         end_time = calclulate_end_time(start, duration)
-        scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=end_time.hour,
-                           minute=end_time.minute)
+        scheduler.schedule(func=end_scheduled_tasks, trigger=CronTrigger(hour=end_time.hour, minute=end_time.minute),
+                           name="end scheduled task")
 
         # Kick-off tasks, if they should currently be running
         if should_task_be_running(start, duration):
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index 27285fd93..ec3555f0e 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -23,6 +23,8 @@ from .worker import WorkerThread
 
 try:
     from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+    from apscheduler.triggers.cron import CronTrigger
+    from apscheduler.triggers.date import DateTrigger
     use_APScheduler = True
 except (ImportError, RuntimeError) as e:
     use_APScheduler = False
@@ -47,31 +49,31 @@ class BackgroundScheduler:
 
         return cls._instance
 
-    def schedule(self, func, trigger, name=None, **trigger_args):
+    def schedule(self, func, trigger, name=None):
         if use_APScheduler:
-            return self.scheduler.add_job(func=func, trigger=trigger, name=name, **trigger_args)
+            return self.scheduler.add_job(func=func, trigger=trigger, name=name)
 
     # Expects a lambda expression for the task
-    def schedule_task(self, task, user=None, name=None, hidden=False, trigger='cron', **trigger_args):
+    def schedule_task(self, task, user=None, name=None, hidden=False, trigger=None):
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
                 worker_task.scheduled = True
                 WorkerThread.add(user, worker_task, hidden=hidden)
-            return self.schedule(func=scheduled_task, trigger=trigger, name=name, **trigger_args)
+            return self.schedule(func=scheduled_task, trigger=trigger, name=name)
 
     # Expects a list of lambda expressions for the tasks
-    def schedule_tasks(self, tasks, user=None, trigger='cron', **trigger_args):
+    def schedule_tasks(self, tasks, user=None, trigger=None):
         if use_APScheduler:
             for task in tasks:
-                self.schedule_task(task[0], user=user, trigger=trigger, name=task[1], hidden=task[2], **trigger_args)
+                self.schedule_task(task[0], user=user, trigger=trigger, name=task[1], hidden=task[2])
 
     # Expects a lambda expression for the task
     def schedule_task_immediately(self, task, user=None, name=None, hidden=False):
         if use_APScheduler:
             def immediate_task():
                 WorkerThread.add(user, task(), hidden)
-            return self.schedule(func=immediate_task, trigger='date', name=name)
+            return self.schedule(func=immediate_task, trigger=DateTrigger(), name=name)
 
     # Expects a list of lambda expressions for the tasks
     def schedule_tasks_immediately(self, tasks, user=None):

From 364c48edd8d2f3ea050be5e666c5807dc7346deb Mon Sep 17 00:00:00 2001
From: blitzmann <holmes.ryan.90@gmail.com>
Date: Mon, 16 Jan 2023 00:24:44 -0500
Subject: [PATCH 375/412] PdfFileReader -> PdfReader

---
 cps/uploader.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cps/uploader.py b/cps/uploader.py
index ecf4868cc..a456f9760 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -37,12 +37,12 @@ except (ImportError, RuntimeError) as e:
     use_generic_pdf_cover = True
 
 try:
-    from PyPDF2 import PdfFileReader
+    from PyPDF2 import PdfReader
     use_pdf_meta = True
 except ImportError as ex:
     log.debug('PyPDF2 is recommended for best performance in metadata extracting from pdf files: %s', ex)
     try:
-        from PyPDF3 import PdfFileReader
+        from PyPDF3 import PdfReader
         use_pdf_meta = True
     except ImportError as e:
         log.debug('Cannot import PyPDF3/PyPDF2, extracting pdf metadata will not work: %s / %s', e)
@@ -157,7 +157,7 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
 
     if use_pdf_meta:
         with open(tmp_file_path, 'rb') as f:
-            pdf_file = PdfFileReader(f)
+            pdf_file = PdfReader(f)
             doc_info = pdf_file.getDocumentInfo()
             try:
                 doc_info = pdf_file.getDocumentInfo()

From ed22209e6cf36c71d26e8b864d232cda99ffe0c8 Mon Sep 17 00:00:00 2001
From: Petipopotam <43313692+Petipopotam@users.noreply.github.com>
Date: Thu, 19 Jan 2023 19:56:27 +0100
Subject: [PATCH 376/412] Content Security Policy syntax was invalid

According to https://csp-evaluator.withgoogle.com/ the CSP built here is NOT valid (and the blob: value is missing at img-src, so the image is not displayed when reading ebook in a browser)

Before this commit, in Chrome response header you can find

Content-Security-Policy: default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self'  data:; object-src: 'none'; blob:;style-src-elem 'self' blob: 'unsafe-inline';

After :

Content-Security-Policy: default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' blob: data:; object-src 'none'  blob:; style-src-elem 'self' blob: 'unsafe-inline';

and image in viewer are displayed
---
 cps/web.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index 196fe3673..8eb467492 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -82,16 +82,16 @@ except ImportError:
 def add_security_headers(resp):
     csp = "default-src 'self'"
     csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
-    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' "
+    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' blob:"
     if request.path.startswith("/author/") and config.config_use_goodreads:
-        csp += "images.gr-assets.com i.gr-assets.com s.gr-assets.com"
+        csp += " images.gr-assets.com i.gr-assets.com s.gr-assets.com"
     csp += " data:;"
-    csp += " object-src: 'none';"
+    csp += " object-src 'none'"
     resp.headers['Content-Security-Policy'] = csp
     if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
         resp.headers['Content-Security-Policy'] += " *"
     elif request.endpoint == "web.read_book":
-        resp.headers['Content-Security-Policy'] += " blob:;style-src-elem 'self' blob: 'unsafe-inline';"
+        resp.headers['Content-Security-Policy'] += " blob:; style-src-elem 'self' blob: 'unsafe-inline';"
     resp.headers['X-Content-Type-Options'] = 'nosniff'
     resp.headers['X-Frame-Options'] = 'SAMEORIGIN'
     resp.headers['X-XSS-Protection'] = '1; mode=block'

From beb619c2c20ed51c6f6d91a27414790c14b4a486 Mon Sep 17 00:00:00 2001
From: Petipopotam <43313692+Petipopotam@users.noreply.github.com>
Date: Thu, 19 Jan 2023 20:19:55 +0100
Subject: [PATCH 377/412] Correct CSP

no need blob: value for object-src
---
 cps/web.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index 8eb467492..ab28b7a36 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -82,16 +82,16 @@ except ImportError:
 def add_security_headers(resp):
     csp = "default-src 'self'"
     csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
-    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' blob:"
+    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self'"
     if request.path.startswith("/author/") and config.config_use_goodreads:
         csp += " images.gr-assets.com i.gr-assets.com s.gr-assets.com"
-    csp += " data:;"
-    csp += " object-src 'none'"
+    csp += " blob: data:;"
+    csp += " object-src 'none';"
     resp.headers['Content-Security-Policy'] = csp
     if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
         resp.headers['Content-Security-Policy'] += " *"
     elif request.endpoint == "web.read_book":
-        resp.headers['Content-Security-Policy'] += " blob:; style-src-elem 'self' blob: 'unsafe-inline';"
+        resp.headers['Content-Security-Policy'] += " style-src-elem 'self' blob: 'unsafe-inline';"
     resp.headers['X-Content-Type-Options'] = 'nosniff'
     resp.headers['X-Frame-Options'] = 'SAMEORIGIN'
     resp.headers['X-XSS-Protection'] = '1; mode=block'

From 48c2c7b543fba7f0b2dea116011be28f3ae998bc Mon Sep 17 00:00:00 2001
From: Arief Hidayat <82217590+arihid@users.noreply.github.com>
Date: Sat, 21 Jan 2023 09:37:16 +0700
Subject: [PATCH 378/412] First fix after proofread

Fixed typos and inconsistencies.
Defined "Berkas" instead of "File" for English term "File".
Defined "Pengaturan" and its root word "Atur" instead of "Konfigurasi" for English term "Configuration".
Reverting technical terms "Logfile", "access logfile", "Keyfile" to its English origin.
---
 cps/translations/id/LC_MESSAGES/messages.po | 98 ++++++++++-----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/cps/translations/id/LC_MESSAGES/messages.po b/cps/translations/id/LC_MESSAGES/messages.po
index bcd4683fc..c1b025298 100644
--- a/cps/translations/id/LC_MESSAGES/messages.po
+++ b/cps/translations/id/LC_MESSAGES/messages.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2017 Calibre-Web
 # This file is distributed under the same license as the Calibre-Web
 # project.
-# FIRST AUTHOR Arief Hidayat<arihid95@gmail.com>, 2021-2022.
+# FIRST AUTHOR Arief Hidayat<arihid95@gmail.com>, 2021-2023.
 msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
 "POT-Creation-Date: 2022-12-27 09:10+0100\n"
-"PO-Revision-Date: 2022-11-21 18:25+0700\n"
+"PO-Revision-Date: 2023-01-21 10:00+0700\n"
 "Last-Translator: Arief Hidayat<arihid95@gmail.com>\n"
 "Language: id\n"
 "Language-Team: Arief Hidayat <arihid95@gmail.com>\n"
@@ -55,11 +55,11 @@ msgstr "Halaman Admin"
 
 #: cps/admin.py:250
 msgid "Basic Configuration"
-msgstr "Konfigurasi Dasar"
+msgstr "Pengaturan Dasar"
 
 #: cps/admin.py:288
 msgid "UI Configuration"
-msgstr "Pengaturan UI"
+msgstr "Pengaturan Antarmuka"
 
 #: cps/admin.py:322 cps/templates/admin.html:51
 msgid "Edit Users"
@@ -68,7 +68,7 @@ msgstr "Edit pengguna"
 #: cps/admin.py:366 cps/opds.py:532 cps/templates/grid.html:14
 #: cps/templates/list.html:13
 msgid "All"
-msgstr "semua"
+msgstr "Semua"
 
 #: cps/admin.py:393 cps/admin.py:1397
 msgid "User not found"
@@ -141,7 +141,7 @@ msgstr "Kolom Dibatasi Tidak Valid"
 
 #: cps/admin.py:596 cps/admin.py:1824
 msgid "Calibre-Web configuration updated"
-msgstr "Konfigurasi Calibre-Web telah diperbarui"
+msgstr "Pengaturan Calibre-Web telah diperbarui"
 
 #: cps/admin.py:608
 msgid "Do you really want to delete the Kobo Token?"
@@ -221,7 +221,7 @@ msgstr "Tindakan Tidak Valid"
 
 #: cps/admin.py:1109
 msgid "client_secrets.json Is Not Configured For Web Application"
-msgstr "client_secrets.json Tidak Dikonfigurasikan Untuk Aplikasi Web"
+msgstr "client_secrets.json Tidak Diatur Untuk Aplikasi Web"
 
 #: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
@@ -307,7 +307,7 @@ msgstr "Terjadi kesalahan saat mengirim email tes: %(res)s"
 
 #: cps/admin.py:1321
 msgid "Please configure your e-mail address first..."
-msgstr "Harap konfigurasikan alamat email Anda terlebih dahulu.."
+msgstr "Harap atur alamat email Anda terlebih dahulu.."
 
 #: cps/admin.py:1323
 msgid "E-mail server settings updated"
@@ -350,7 +350,7 @@ msgstr "Kata sandi untuk pengaturan ulang pengguna %(user) "
 
 #: cps/admin.py:1434 cps/web.py:1198
 msgid "Please configure the SMTP mail settings first..."
-msgstr "Harap konfigurasikan pengaturan email SMTP terlebih dahulu..."
+msgstr "Harap atur pengaturan email SMTP terlebih dahulu..."
 
 #: cps/admin.py:1445
 msgid "Logfile viewer"
@@ -366,7 +366,7 @@ msgstr "Mengunduh paket pembaruan"
 
 #: cps/admin.py:1513
 msgid "Unzipping update package"
-msgstr "Meng-unzip paket pembaruan"
+msgstr "Mengekstrak paket pembaruan"
 
 #: cps/admin.py:1514
 msgid "Replacing files"
@@ -460,7 +460,7 @@ msgstr "Pengaturan Basis Data diperbarui"
 
 #: cps/admin.py:1855
 msgid "Database Configuration"
-msgstr "Konfigurasi Basis Data"
+msgstr "Pengaturan Basis Data"
 
 #: cps/admin.py:1871 cps/web.py:1233
 msgid "Please fill out all fields!"
@@ -524,7 +524,7 @@ msgstr "Tidak ada"
 #: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
 #: cps/web.py:1504 cps/web.py:1549
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr "Ups! Judul buku yang dipilih tidak tersedia. File tidak ada atau tidak dapat diakses"
+msgstr "Ups! Judul buku yang dipilih tidak tersedia. Berkas tidak ada atau tidak dapat diakses"
 
 #: cps/editbooks.py:154 cps/editbooks.py:1221
 msgid "User has no rights to upload cover"
@@ -573,11 +573,11 @@ msgstr "'%(langname)s' bukan bahasa yang valid"
 #: cps/editbooks.py:728 cps/editbooks.py:1162
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "Ekstensi file '%(ext)s' tidak diizinkan untuk diunggah ke server ini"
+msgstr "Ekstensi berkas '%(ext)s' tidak diizinkan untuk diunggah ke server ini"
 
 #: cps/editbooks.py:732 cps/editbooks.py:1166
 msgid "File to be uploaded must have an extension"
-msgstr "File yang akan diunggah harus memiliki ekstensi"
+msgstr "Berkas yang akan diunggah harus memiliki ekstensi"
 
 #: cps/editbooks.py:740
 #, python-format
@@ -612,7 +612,7 @@ msgstr "%(seriesindex)s dilewati karena bukan angka yang valid"
 
 #: cps/editbooks.py:1157
 msgid "User has no rights to upload additional file formats"
-msgstr "Pengguna tidak memiliki izin untuk mengunggah format file tambahan"
+msgstr "Pengguna tidak memiliki izin untuk mengunggah format berkas tambahan"
 
 #: cps/editbooks.py:1178
 #, python-format
@@ -622,12 +622,12 @@ msgstr "Gagal membuat jalur %(path)s (Izin ditolak)."
 #: cps/editbooks.py:1183
 #, python-format
 msgid "Failed to store file %(file)s."
-msgstr "Gagal menyimpan file %(file)s."
+msgstr "Gagal menyimpan berkas %(file)s."
 
 #: cps/editbooks.py:1206
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
-msgstr "Format file %(ext)s ditambahkan ke %(book)s"
+msgstr "Format berkas %(ext)s ditambahkan ke %(book)s"
 
 #: cps/gdrive.py:58
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
@@ -695,7 +695,7 @@ msgstr "%%(buku)s telah dikirim ke E-Reader"
 
 #: cps/helper.py:230
 msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "File yang diminta tidak dapat dibaca. Mungkin izinnya salah?"
+msgstr "Berkas yang diminta tidak dapat dibaca. Mungkin izinnya salah?"
 
 #: cps/helper.py:345
 msgid "Read status could not set: {}"
@@ -774,23 +774,23 @@ msgstr "Gagal membuat jalur untuk sampul"
 
 #: cps/helper.py:857
 msgid "Cover-file is not a valid image file, or could not be stored"
-msgstr "File sampul bukan file gambar yang valid, atau tidak dapat disimpan"
+msgstr "Berkas sampul bukan berkas gambar yang valid, atau tidak dapat disimpan"
 
 #: cps/helper.py:868
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr "Hanya file jpg/jpeg/png/webp/bmp yang didukung sebagai file sampul"
+msgstr "Hanya berkas jpg/jpeg/png/webp/bmp yang didukung sebagai berkas sampul"
 
 #: cps/helper.py:880
 msgid "Invalid cover file content"
-msgstr "Konten file sampul tidak valid"
+msgstr "Konten berkas sampul tidak valid"
 
 #: cps/helper.py:884
 msgid "Only jpg/jpeg files are supported as coverfile"
-msgstr "Hanya file jpg/jpeg yang didukung sebagai file sampul"
+msgstr "Hanya berkas jpg/jpeg yang didukung sebagai berkas sampul"
 
 #: cps/helper.py:936
 msgid "Unrar binary file not found"
-msgstr "File biner unrar tidak ditemukan"
+msgstr "Berkas biner unrar tidak ditemukan"
 
 #: cps/helper.py:947
 #, fuzzy
@@ -1019,11 +1019,11 @@ msgstr "Tampilkan pilihan peringkat"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
-msgstr "Format file"
+msgstr "Format berkas"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
 msgid "Show file formats selection"
-msgstr "Tampilkan pilihan format file"
+msgstr "Tampilkan pilihan format berkas"
 
 #: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
@@ -1325,11 +1325,11 @@ msgstr "Oops! Terjadi kesalahan saat mengirim buku: %(res)s"
 
 #: cps/web.py:1209
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
-msgstr "Harap perbarui profil Anda dengan Kirim ke Alamat Email Kindle yang valid."
+msgstr "Harap perbarui profil Anda dengan alamat e-mail Kirim ke Kindle yang valid."
 
 #: cps/web.py:1226
 msgid "E-Mail server is not configured, please contact your administrator!"
-msgstr "Server email belum dikonfigurasi, silakan hubungi administrator!"
+msgstr "Server email belum diatur, silakan hubungi administrator!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
@@ -1388,7 +1388,7 @@ msgstr "Profil diperbarui"
 
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
-msgstr "Tidak ditemukan file gmail.json yang valid dengan informasi OAuth"
+msgstr "Tidak ditemukan berkas gmail.json yang valid dengan informasi OAuth"
 
 #: cps/tasks/convert.py:153
 #, python-format
@@ -1481,7 +1481,7 @@ msgstr "Alamat Email"
 
 #: cps/templates/admin.html:15 cps/templates/user_edit.html:28
 msgid "Send to E-Reader E-mail Address"
-msgstr "Kirim ke Alamat Email Kindle"
+msgstr "Alamat E-mail untuk Kirim ke E-Reader"
 
 #: cps/templates/admin.html:17 cps/templates/layout.html:91
 #: cps/templates/user_table.html:143
@@ -1562,7 +1562,7 @@ msgstr "Gmail via Oauth2"
 
 #: cps/templates/admin.html:106
 msgid "Configuration"
-msgstr "Konfigurasi"
+msgstr "Pengaturan"
 
 #: cps/templates/admin.html:109
 msgid "Calibre Database Directory"
@@ -1610,15 +1610,15 @@ msgstr "Nama Header Reverse Proxy"
 
 #: cps/templates/admin.html:159
 msgid "Edit Calibre Database Configuration"
-msgstr "Edit Konfigurasi Basis Data Caliber"
+msgstr "Edit Pengaturan Basis Data Caliber"
 
 #: cps/templates/admin.html:160
 msgid "Edit Basic Configuration"
-msgstr "Edit Konfigurasi Dasar"
+msgstr "Edit Pengaturan Dasar"
 
 #: cps/templates/admin.html:161
 msgid "Edit UI Configuration"
-msgstr "Edit Konfigurasi UI"
+msgstr "Edit Pengaturan Antarmuka"
 
 #: cps/templates/admin.html:167
 msgid "Scheduled Tasks"
@@ -1674,7 +1674,7 @@ msgstr "Matikan"
 
 #: cps/templates/admin.html:216
 msgid "Version Information"
-msgstr "Perbarui"
+msgstr "Informasi Versi"
 
 #: cps/templates/admin.html:220
 msgid "Version"
@@ -1718,7 +1718,7 @@ msgstr "Batal"
 
 #: cps/templates/admin.html:266
 msgid "Are you sure you want to shutdown?"
-msgstr "Apa Anda yakin untuk mematikan?"
+msgstr "Apa Anda yakin untuk mematikan layanan?"
 
 #: cps/templates/admin.html:278
 msgid "Updating, please do not reload this page"
@@ -2083,7 +2083,7 @@ msgstr "Lokasi basis data baru tidak valid, harap masukkan jalur yang valid"
 
 #: cps/templates/config_edit.html:18
 msgid "Server Configuration"
-msgstr "Konfigurasi Server"
+msgstr "Pengaturan Server"
 
 #: cps/templates/config_edit.html:25
 msgid "Server Port"
@@ -2091,7 +2091,7 @@ msgstr "Port Server"
 
 #: cps/templates/config_edit.html:28
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
-msgstr "Lokasi file sertifikat SSL (biarkan kosong untuk Server non-SSL)"
+msgstr "Lokasi berkas sertifikat SSL (biarkan kosong untuk Server non-SSL)"
 
 #: cps/templates/config_edit.html:35
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
@@ -2115,11 +2115,11 @@ msgstr "Host Tepercaya (Pisahkan dengan Koma)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
-msgstr "Konfigurasi Logfile"
+msgstr "Pengaturan Logfile"
 
 #: cps/templates/config_edit.html:77
 msgid "Location and name of logfile (calibre-web.log for no entry)"
-msgstr "Lokasi dan nama file log (caliber-web.log jika tanpa entri)"
+msgstr "Lokasi dan nama logfile (caliber-web.log jika tanpa entri)"
 
 #: cps/templates/config_edit.html:82
 msgid "Enable Access Log"
@@ -2127,11 +2127,11 @@ msgstr "Aktifkan Log Akses"
 
 #: cps/templates/config_edit.html:85
 msgid "Location and name of access logfile (access.log for no entry)"
-msgstr "Lokasi dan nama file log akses (access.log jika tanpa entri)"
+msgstr "Lokasi dan nama access logfile (access.log jika tanpa entri)"
 
 #: cps/templates/config_edit.html:96
 msgid "Feature Configuration"
-msgstr "Konfigurasi Fitur"
+msgstr "Pengaturan Fitur"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
@@ -2243,7 +2243,7 @@ msgstr "Jalur Sertifikat LDAP (Hanya diperlukan untuk Otentikasi Sertifikat Klie
 
 #: cps/templates/config_edit.html:224
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
-msgstr "Jalur File Kunci LDAP (Hanya diperlukan untuk Otentikasi Sertifikat Klien)"
+msgstr "Jalur Keyfile LDAP (Hanya diperlukan untuk Otentikasi Sertifikat Klien)"
 
 #: cps/templates/config_edit.html:233
 msgid "LDAP Authentication"
@@ -2350,7 +2350,7 @@ msgstr "Lokasi binari Unrar"
 
 #: cps/templates/config_view_edit.html:17
 msgid "View Configuration"
-msgstr "Tampilkan Konfigurasi"
+msgstr "Pengaturan Tampilan"
 
 #: cps/templates/config_view_edit.html:32
 msgid "No. of Random Books to Display"
@@ -2582,7 +2582,7 @@ msgstr "Selanjutnya"
 
 #: cps/templates/generate_kobo_auth_url.html:6
 msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "Buka file .kobo/Kobo/Kobo eReader.conf di editor teks dan tambahkan (atau edit):"
+msgstr "Buka berkas .kobo/Kobo/Kobo eReader.conf di editor teks dan tambahkan (atau edit):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
@@ -2594,7 +2594,7 @@ msgstr "Daftar"
 
 #: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
-msgstr "Instans Calibre-Web belum dikonfigurasi, harap hubungi administrator Anda"
+msgstr "Instans Calibre-Web belum diatur, harap hubungi administrator Anda"
 
 #: cps/templates/http_error.html:44
 msgid "Create Issue"
@@ -3250,7 +3250,7 @@ msgstr "Batalkan tautan"
 
 #: cps/templates/user_edit.html:64
 msgid "Kobo Sync Token"
-msgstr "Token Kono Sync"
+msgstr "Token Kobo Sync"
 
 #: cps/templates/user_edit.html:66
 msgid "Create/View"
@@ -3290,15 +3290,15 @@ msgstr "Masukkan Nama Pengguna"
 
 #: cps/templates/user_table.html:135
 msgid "Enter E-mail Address"
-msgstr "Masukkan Alamar Email"
+msgstr "Masukkan Alamat Email"
 
 #: cps/templates/user_table.html:136
 msgid "Enter E-Reader E-mail Address"
-msgstr "Masukkan Alamat Email Kindle"
+msgstr "Masukkan Alamat Email E-Reader"
 
 #: cps/templates/user_table.html:136
 msgid "E-Reader E-mail"
-msgstr "Email Kindle"
+msgstr "Email E-Reader"
 
 #: cps/templates/user_table.html:137
 msgid "Locale"

From 031658ae9477020af3d8e148cba42cf2904740bb Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 21 Jan 2023 14:16:58 +0100
Subject: [PATCH 379/412] Update teststatus

---
 setup.cfg                               |   8 +-
 test/Calibre-Web TestSummary_Linux.html | 277 ++++++++++++++++++------
 2 files changed, 211 insertions(+), 74 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1c531d48e..f950aa4bd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -42,19 +42,19 @@ install_requires =
 	werkzeug<2.1.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
-	Flask-Login>=0.3.2,<0.6.2
+	Flask-Login>=0.3.2,<0.6.3
 	Flask-Principal>=0.3.2,<0.5.1
 	backports_abc>=0.4
-	Flask>=1.0.2,<2.1.0
+	Flask>=1.0.2,<2.2.0
 	iso-639>=0.4.5,<0.5.0
-	PyPDF2>=1.20,<2.11.0
+	PyPDF2>=1.20,<3.1.0
 	pytz>=2016.10
 	requests>=2.11.1,<2.28.0
 	SQLAlchemy>=1.3.0,<1.5.0
 	tornado>=4.1,<6.2
 	Wand>=0.4.4,<0.7.0
 	unidecode>=0.04.19,<1.4.0
-	lxml>=3.8.0,<4.9.0
+	lxml>=3.8.0,<5.0.0
 	flask-wtf>=0.14.2,<1.1.0
 	chardet>=3.0.0,<4.1.0
 	advocate>=1.0.0,<1.1.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 089dab8cc..633c7765d 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2022-09-25 22:15:18</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2023-01-02 20:50:39</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>2022-09-26 04:46:12</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2023-01-03 05:05:42</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>5h 35 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>7h 22 min</p>
         </div>
       </div>
       </div>
@@ -936,11 +936,11 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooks</td>
         <td class="text-center">36</td>
-        <td class="text-center">35</td>
-        <td class="text-center">0</td>
+        <td class="text-center">34</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -1264,11 +1264,31 @@
     
     
     
-        <tr id='pt11.34' class='hiddenRow bg-success'>
+        <tr id="ft11.34" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.34')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.34" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.34').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 852, in test_upload_book_pdf
+    self.assertLess(&#39;23300&#39;, resp.headers[&#39;Content-Length&#39;])
+AssertionError: &#39;23300&#39; not less than &#39;19501&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1430,11 +1450,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">16</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1462,11 +1482,33 @@
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id="ft14.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft14.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 474, in test_bookslist_edit_comment
+    self.assertEqual(&#34;[...]&#34;, bl[&#39;table&#39;][4][&#34;Comments&#34;][&#39;text&#39;])
+AssertionError: &#39;[...]&#39; != &#39;+&#39;
+- [...]
++ +</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1480,11 +1522,33 @@
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id="ft14.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft14.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 459, in test_bookslist_edit_cust_comment
+    self.assertEqual(&#34;[...]&#34;, bl[&#39;table&#39;][4][&#34;Custom Comment 人物&#34;][&#39;text&#39;])
+AssertionError: &#39;[...]&#39; != &#39;+&#39;
+- [...]
++ +</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3145,11 +3209,11 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestUploadPDF</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3159,11 +3223,35 @@ IndexError: list index out of range</pre>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id="ft34.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft34.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft34.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft34.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 137, in test_upload_invalid_pdf
+    self.check_uploaded_pdf({&#39;title&#39;: &#34;Tü执el&#34;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 58, in check_uploaded_pdf
+    self.assertEqual(check_properties[&#39;title&#39;], details[&#39;title&#39;])
+AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
+- Tü执el
++ book1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3624,11 +3712,11 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -3701,11 +3789,31 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id="ft42.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft42.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 310, in test_sideloaded_book
+    self.assertAlmostEqual(diff(BytesIO(list_cover), BytesIO(old_list_cover), delete_diff_file=True), 0.0,
+AssertionError: 0.007557298474945533 != 0.0 within 0.0001 delta (0.007557298474945533 difference)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3824,25 +3932,45 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestUploadEPubs</td>
+        <td class="text-center">5</td>
         <td class="text-center">4</td>
-        <td class="text-center">4</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 4)">Detail</a>
+            <a onclick="showClassDetail('c44', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id="ft44.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 146, in test_upload_epub_cover
+    self.assertAlmostEqual(diff(BytesIO(original), BytesIO(cover_image), delete_diff_file=True), 0.0, delta=0.0001)
+AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405644 difference)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3866,6 +3994,15 @@ IndexError: list index out of range</pre>
     
     
         <tr id='pt44.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_identifier</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4770,9 +4907,9 @@ IndexError: list index out of range</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>423</td>
-        <td>414</td>
-        <td>1</td>
+        <td>424</td>
+        <td>409</td>
+        <td>7</td>
         <td>1</td>
         <td>7</td>
         <td>&nbsp;</td>
@@ -4802,7 +4939,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.15.0-48-generic #54-Ubuntu SMP Fri Aug 26 13:26:29 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.15.0-56-generic #62-Ubuntu SMP Tue Nov 22 19:54:14 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4820,13 +4957,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>APScheduler</th>
-              <td>3.9.1</td>
+              <td>3.9.1.post1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Babel</th>
-              <td>2.10.3</td>
+              <td>2.11.0</td>
               <td>Basic</td>
             </tr>
           
@@ -4844,7 +4981,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Flask</th>
-              <td>2.0.3</td>
+              <td>2.1.3</td>
               <td>Basic</td>
             </tr>
           
@@ -4856,7 +4993,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Flask-Login</th>
-              <td>0.6.1</td>
+              <td>0.6.2</td>
               <td>Basic</td>
             </tr>
           
@@ -4874,7 +5011,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>greenlet</th>
-              <td>1.1.3</td>
+              <td>2.0.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4892,7 +5029,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>lxml</th>
-              <td>4.8.0</td>
+              <td>4.9.2</td>
               <td>Basic</td>
             </tr>
           
@@ -4904,13 +5041,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>PyPDF2</th>
-              <td>2.10.9</td>
+              <td>3.0.1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>pytz</th>
-              <td>2022.2.1</td>
+              <td>2022.7</td>
               <td>Basic</td>
             </tr>
           
@@ -4922,7 +5059,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.41</td>
+              <td>1.4.45</td>
               <td>Basic</td>
             </tr>
           
@@ -4934,7 +5071,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.3.4</td>
+              <td>1.3.6</td>
               <td>Basic</td>
             </tr>
           
@@ -4952,13 +5089,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.62.0</td>
+              <td>2.70.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.4</td>
+              <td>0.21.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4970,7 +5107,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.14.0</td>
+              <td>1.15.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4982,13 +5119,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.62.0</td>
+              <td>2.70.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.4</td>
+              <td>0.21.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5000,7 +5137,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.14.0</td>
+              <td>1.15.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5012,13 +5149,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.62.0</td>
+              <td>2.70.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.4</td>
+              <td>0.21.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5030,7 +5167,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.14.0</td>
+              <td>1.15.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5054,13 +5191,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.62.0</td>
+              <td>2.70.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.4</td>
+              <td>0.21.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5072,7 +5209,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.14.0</td>
+              <td>1.15.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5090,13 +5227,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.62.0</td>
+              <td>2.70.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.4</td>
+              <td>0.21.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5108,7 +5245,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.14.0</td>
+              <td>1.15.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5126,19 +5263,19 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>scholarly</th>
-              <td>1.7.2</td>
+              <td>1.7.9</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.62.0</td>
+              <td>2.70.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.4</td>
+              <td>0.21.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5150,7 +5287,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.14.0</td>
+              <td>1.15.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5168,19 +5305,19 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>python-Levenshtein</th>
-              <td>0.12.2</td>
+              <td>0.20.9</td>
               <td>TestGoodreads</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.16.0</td>
+              <td>4.17.3</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.16.0</td>
+              <td>4.17.3</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -5192,7 +5329,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.16.0</td>
+              <td>4.17.3</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -5204,13 +5341,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Flask-Dance</th>
-              <td>6.1.1</td>
+              <td>6.2.0</td>
               <td>TestOAuthLogin</td>
             </tr>
           
             <tr>
               <th>SQLAlchemy-Utils</th>
-              <td>0.38.3</td>
+              <td>0.39.0</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -5222,7 +5359,7 @@ IndexError: list index out of range</pre>
 </div>
 
 <script>
-    drawCircle(414, 1, 1, 7);
+    drawCircle(409, 7, 1, 7);
     showCase(5);
 </script>
 

From 43ee85fbb5d05340a792ab8de467381009ce80a7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 21 Jan 2023 15:23:18 +0100
Subject: [PATCH 380/412] Removed unnecessary Unicode "u"

---
 cps/admin.py           | 12 +++++------
 cps/comic.py           |  2 +-
 cps/config_sql.py      |  2 +-
 cps/db.py              | 18 ++++++++---------
 cps/editbooks.py       | 10 ++++-----
 cps/epub.py            |  6 +++---
 cps/fb2.py             | 14 ++++++-------
 cps/gdrive.py          |  8 ++++----
 cps/gdriveutils.py     |  2 +-
 cps/helper.py          | 42 +++++++++++++++++++-------------------
 cps/oauth_bb.py        |  8 ++++----
 cps/opds.py            |  2 +-
 cps/search.py          | 10 ++++-----
 cps/tasks/convert.py   |  8 ++++----
 cps/tasks/mail.py      | 10 ++++-----
 cps/tasks/thumbnail.py |  2 +-
 cps/tasks_status.py    | 14 ++++++-------
 cps/ub.py              |  8 ++++----
 cps/updater.py         | 46 +++++++++++++++++++++---------------------
 cps/uploader.py        | 10 ++++-----
 cps/web.py             | 10 ++++-----
 21 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 3fd83d184..353888848 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -145,9 +145,9 @@ def shutdown():
         ub.dispose()
 
         if task == 0:
-            show_text['text'] = _(u'Server restarted, please reload page.')
+            show_text['text'] = _('Server restarted, please reload page.')
         else:
-            show_text['text'] = _(u'Performing Server shutdown, please close window.')
+            show_text['text'] = _('Performing Server shutdown, please close window.')
         # stop gevent/tornado server
         web_server.stop(task == 0)
         return json.dumps(show_text)
@@ -155,10 +155,10 @@ def shutdown():
     if task == 2:
         log.warning("reconnecting to calibre database")
         calibre_db.reconnect_db(config, ub.app_DB_path)
-        show_text['text'] = _(u'Success! Database Reconnected')
+        show_text['text'] = _('Success! Database Reconnected')
         return json.dumps(show_text)
 
-    show_text['text'] = _(u'Unknown command')
+    show_text['text'] = _('Unknown command')
     return json.dumps(show_text), 400
 
 
@@ -169,7 +169,7 @@ def queue_metadata_backup():
     show_text = {}
     log.warning("Queuing all books for metadata backup")
     helper.set_all_metadata_dirty()
-    show_text['text'] = _(u'Success! Books queued for Metadata Backup')
+    show_text['text'] = _('Success! Books queued for Metadata Backup')
     return json.dumps(show_text)
 
 
@@ -202,7 +202,7 @@ def update_thumbnails():
 def admin():
     version = updater_thread.get_current_version_info()
     if version is False:
-        commit = _(u'Unknown')
+        commit = _('Unknown')
     else:
         if 'datetime' in version:
             commit = version['datetime']
diff --git a/cps/comic.py b/cps/comic.py
index 8f3a6f61e..766b4584d 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -138,7 +138,7 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
         file_path=tmp_file_path,
         extension=original_file_extension,
         title=original_file_name,
-        author=u'Unknown',
+        author='Unknown',
         cover=_extract_cover(tmp_file_path, original_file_extension, rar_executable),
         description="",
         tags="",
diff --git a/cps/config_sql.py b/cps/config_sql.py
index fed7dfe35..b6419a843 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -69,7 +69,7 @@ class _Settings(_Base):
     config_certfile = Column(String)
     config_keyfile = Column(String)
     config_trustedhosts = Column(String, default='')
-    config_calibre_web_title = Column(String, default=u'Calibre-Web')
+    config_calibre_web_title = Column(String, default='Calibre-Web')
     config_books_per_page = Column(Integer, default=60)
     config_random_books = Column(Integer, default=4)
     config_authors_max = Column(Integer, default=0)
diff --git a/cps/db.py b/cps/db.py
index 0ae0c8580..eb3e0f0ae 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -192,7 +192,7 @@ class Comments(Base):
         return self.text
 
     def __repr__(self):
-        return u"<Comments({0})>".format(self.text)
+        return "<Comments({0})>".format(self.text)
 
 
 class Tags(Base):
@@ -208,7 +208,7 @@ class Tags(Base):
         return self.name
 
     def __repr__(self):
-        return u"<Tags('{0})>".format(self.name)
+        return "<Tags('{0})>".format(self.name)
 
 
 class Authors(Base):
@@ -228,7 +228,7 @@ class Authors(Base):
         return self.name
 
     def __repr__(self):
-        return u"<Authors('{0},{1}{2}')>".format(self.name, self.sort, self.link)
+        return "<Authors('{0},{1}{2}')>".format(self.name, self.sort, self.link)
 
 
 class Series(Base):
@@ -246,7 +246,7 @@ class Series(Base):
         return self.name
 
     def __repr__(self):
-        return u"<Series('{0},{1}')>".format(self.name, self.sort)
+        return "<Series('{0},{1}')>".format(self.name, self.sort)
 
 
 class Ratings(Base):
@@ -262,7 +262,7 @@ class Ratings(Base):
         return self.rating
 
     def __repr__(self):
-        return u"<Ratings('{0}')>".format(self.rating)
+        return "<Ratings('{0}')>".format(self.rating)
 
 
 class Languages(Base):
@@ -281,7 +281,7 @@ class Languages(Base):
             return self.lang_code
 
     def __repr__(self):
-        return u"<Languages('{0}')>".format(self.lang_code)
+        return "<Languages('{0}')>".format(self.lang_code)
 
 
 class Publishers(Base):
@@ -299,7 +299,7 @@ class Publishers(Base):
         return self.name
 
     def __repr__(self):
-        return u"<Publishers('{0},{1}')>".format(self.name, self.sort)
+        return "<Publishers('{0},{1}')>".format(self.name, self.sort)
 
 
 class Data(Base):
@@ -323,7 +323,7 @@ class Data(Base):
         return self.name
 
     def __repr__(self):
-        return u"<Data('{0},{1}{2}{3}')>".format(self.book, self.format, self.uncompressed_size, self.name)
+        return "<Data('{0},{1}{2}{3}')>".format(self.book, self.format, self.uncompressed_size, self.name)
 
 
 class Metadata_Dirtied(Base):
@@ -377,7 +377,7 @@ class Books(Base):
         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,
+        return "<Books('{0},{1}{2}{3}{4}{5}{6}{7}{8}')>".format(self.title, self.sort, self.author_sort,
                                                                  self.timestamp, self.pubdate, self.series_index,
                                                                  self.last_modified, self.path, self.has_cover)
 
diff --git a/cps/editbooks.py b/cps/editbooks.py
index dee9b6006..9ce5ce479 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -573,9 +573,9 @@ def table_xchange_author_title():
 
 
 def merge_metadata(to_save, meta):
-    if to_save.get('author_name', "") == _(u'Unknown'):
+    if to_save.get('author_name', "") == _('Unknown'):
         to_save['author_name'] = ''
-    if to_save.get('book_title', "") == _(u'Unknown'):
+    if to_save.get('book_title', "") == _('Unknown'):
         to_save['book_title'] = ''
     for s_field, m_field in [
             ('tags', 'tags'), ('author_name', 'author'), ('series', 'series'),
@@ -611,7 +611,7 @@ def prepare_authors(authr):
 
     # we have all author names now
     if input_authors == ['']:
-        input_authors = [_(u'Unknown')]  # prevent empty Author
+        input_authors = [_('Unknown')]  # prevent empty Author
 
     renamed = list()
     for in_aut in input_authors:
@@ -628,7 +628,7 @@ def prepare_authors(authr):
 
 
 def prepare_authors_on_upload(title, authr):
-    if title != _(u'Unknown') and authr != _(u'Unknown'):
+    if title != _('Unknown') and authr != _('Unknown'):
         entry = calibre_db.check_exists_book(authr, title)
         if entry:
             log.info("Uploaded book probably exists in library")
@@ -771,7 +771,7 @@ def delete_whole_book(book_id, book):
 
     # check if only this book links to:
     # author, language, series, tags, custom columns
-    modify_database_object([u''], book.authors, db.Authors, calibre_db.session, 'author')
+    modify_database_object([''], book.authors, db.Authors, calibre_db.session, 'author')
     modify_database_object([u''], book.tags, db.Tags, calibre_db.session, 'tags')
     modify_database_object([u''], book.series, db.Series, calibre_db.session, 'series')
     modify_database_object([u''], book.languages, db.Languages, calibre_db.session, 'languages')
diff --git a/cps/epub.py b/cps/epub.py
index 00ce907b8..4a11769c5 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -80,13 +80,13 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     if epub_metadata['subject'] == 'Unknown':
         epub_metadata['subject'] = ''
 
-    if epub_metadata['publisher'] == u'Unknown':
+    if epub_metadata['publisher'] == 'Unknown':
         epub_metadata['publisher'] = ''
 
-    if epub_metadata['date'] == u'Unknown':
+    if epub_metadata['date'] == 'Unknown':
         epub_metadata['date'] = ''
 
-    if epub_metadata['description'] == u'Unknown':
+    if epub_metadata['description'] == 'Unknown':
         description = tree.xpath("//*[local-name() = 'description']/text()")
         if len(description) > 0:
             epub_metadata['description'] = description
diff --git a/cps/fb2.py b/cps/fb2.py
index c4b89fd6c..81eae579f 100644
--- a/cps/fb2.py
+++ b/cps/fb2.py
@@ -38,19 +38,19 @@ def get_fb2_info(tmp_file_path, original_file_extension):
         if len(last_name):
             last_name = last_name[0]
         else:
-            last_name = u''
+            last_name = ''
         middle_name = element.xpath('fb:middle-name/text()', namespaces=ns)
         if len(middle_name):
             middle_name = middle_name[0]
         else:
-            middle_name = u''
+            middle_name = ''
         first_name = element.xpath('fb:first-name/text()', namespaces=ns)
         if len(first_name):
             first_name = first_name[0]
         else:
-            first_name = u''
-        return (first_name + u' '
-                + middle_name + u' '
+            first_name = ''
+        return (first_name + ' '
+                + middle_name + ' '
                 + last_name)
 
     author = str(", ".join(map(get_author, authors)))
@@ -59,12 +59,12 @@ def get_fb2_info(tmp_file_path, original_file_extension):
     if len(title):
         title = str(title[0])
     else:
-        title = u''
+        title = ''
     description = tree.xpath('/fb:FictionBook/fb:description/fb:publish-info/fb:book-name/text()', namespaces=ns)
     if len(description):
         description = str(description[0])
     else:
-        description = u''
+        description = ''
 
     return BookMeta(
         file_path=tmp_file_path,
diff --git a/cps/gdrive.py b/cps/gdrive.py
index 60e3d47b0..832350e13 100644
--- a/cps/gdrive.py
+++ b/cps/gdrive.py
@@ -55,7 +55,7 @@ def authenticate_google_drive():
     try:
         authUrl = gdriveutils.Gauth.Instance().auth.GetAuthUrl()
     except gdriveutils.InvalidConfigError:
-        flash(_(u'Google Drive setup not completed, try to deactivate and activate Google Drive again'),
+        flash(_('Google Drive setup not completed, try to deactivate and activate Google Drive again'),
               category="error")
         return redirect(url_for('web.index'))
     return redirect(authUrl)
@@ -91,9 +91,9 @@ def watch_gdrive():
             config.save()
         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, '
-                        u'please follow steps to verify domain in google developer console'), category="error")
+            if reason['reason'] == 'push.webhookUrlUnauthorized':
+                flash(_('Callback domain is not verified, '
+                        'please follow steps to verify domain in google developer console'), category="error")
             else:
                 flash(reason['message'], category="error")
 
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index f83bf775c..0a9d3cd1e 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -556,7 +556,7 @@ def updateGdriveCalibreFromLocal():
 
 # update gdrive.db on edit of books title
 def updateDatabaseOnEdit(ID,newPath):
-    sqlCheckPath = newPath if newPath[-1] == '/' else newPath + u'/'
+    sqlCheckPath = newPath if newPath[-1] == '/' else newPath + '/'
     storedPathName = session.query(GdriveId).filter(GdriveId.gdrive_id == ID).first()
     if storedPathName:
         storedPathName.path = sqlCheckPath
diff --git a/cps/helper.py b/cps/helper.py
index bf119a002..7fc2edc90 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -95,11 +95,11 @@ def convert_book_format(book_id, calibre_path, old_book_format, new_book_format,
     if ereader_mail:
         settings = config.get_mail_settings()
         settings['subject'] = _('Send to eReader')  # pretranslate Subject for Email
-        settings['body'] = _(u'This Email has been sent via Calibre-Web.')
+        settings['body'] = _('This Email has been sent via Calibre-Web.')
     else:
         settings = dict()
     link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))  # prevent xss
-    txt = u"{} -> {}: {}".format(
+    txt = "{} -> {}: {}".format(
            old_book_format.upper(),
            new_book_format.upper(),
            link)
@@ -111,9 +111,9 @@ def convert_book_format(book_id, calibre_path, old_book_format, new_book_format,
 
 # Texts are not lazy translated as they are supposed to get send out as is
 def send_test_mail(ereader_mail, user_name):
-    WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web Test Email'), None, None,
+    WorkerThread.add(user_name, TaskEmail(_('Calibre-Web Test Email'), None, None,
                      config.get_mail_settings(), ereader_mail, N_("Test Email"),
-                                          _(u'This Email has been sent via Calibre-Web.')))
+                                          _('This Email has been sent via Calibre-Web.')))
     return
 
 
@@ -129,7 +129,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
     txt += "Regards,\r\n\r\n"
     txt += "Calibre-Web"
     WorkerThread.add(None, TaskEmail(
-        subject=_(u'Get Started with Calibre-Web'),
+        subject=_('Get Started with Calibre-Web'),
         filepath=None,
         attachment=None,
         settings=config.get_mail_settings(),
@@ -187,7 +187,7 @@ def check_send_to_ereader(entry):
             book_formats.extend(check_send_to_ereader_with_converter(formats))
         return book_formats
     else:
-        log.error(u'Cannot find book entry %d', entry.id)
+        log.error('Cannot find book entry %d', entry.id)
         return None
 
 
@@ -213,10 +213,10 @@ def send_mail(book_id, book_format, convert, ereader_mail, calibrepath, user_id)
 
     if convert == 1:
         # returns None if success, otherwise errormessage
-        return convert_book_format(book_id, calibrepath, u'epub', book_format.lower(), user_id, ereader_mail)
+        return convert_book_format(book_id, calibrepath, 'epub', book_format.lower(), user_id, ereader_mail)
     if convert == 2:
         # returns None if success, otherwise errormessage
-        return convert_book_format(book_id, calibrepath, u'azw3', book_format.lower(), user_id, ereader_mail)
+        return convert_book_format(book_id, calibrepath, 'azw3', book_format.lower(), user_id, ereader_mail)
 
     for entry in iter(book.data):
         if entry.format.upper() == book_format.upper():
@@ -225,7 +225,7 @@ def send_mail(book_id, book_format, convert, ereader_mail, calibrepath, user_id)
             email_text = N_("%(book)s send to eReader", book=link)
             WorkerThread.add(user_id, TaskEmail(_("Send to eReader"), book.path, converted_file_name,
                              config.get_mail_settings(), ereader_mail,
-                             email_text, _(u'This Email has been sent via Calibre-Web.')))
+                             email_text, _('This Email has been sent via Calibre-Web.')))
             return
     return _("The requested file could not be read. Maybe wrong permissions?")
 
@@ -235,16 +235,16 @@ def get_valid_filename(value, replace_whitespace=True, chars=128):
     Returns the given string converted to a string that can be used for a clean
     filename. Limits num characters to 128 max.
     """
-    if value[-1:] == u'.':
-        value = value[:-1]+u'_'
+    if value[-1:] == '.':
+        value = value[:-1]+'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
     if config.config_unicode_filename:
         value = (unidecode.unidecode(value))
     if replace_whitespace:
         #  *+:\"/<>? are replaced by _
-        value = re.sub(r'[*+:\\\"/<>?]+', u'_', value, flags=re.U)
+        value = re.sub(r'[*+:\\\"/<>?]+', '_', value, flags=re.U)
         # pipe has to be replaced with comma
-        value = re.sub(r'[|]+', u',', value, flags=re.U)
+        value = re.sub(r'[|]+', ',', value, flags=re.U)
 
     value = value.encode('utf-8')[:chars].decode('utf-8', errors='ignore').strip()
 
@@ -416,8 +416,8 @@ def clean_author_database(renamed_author, calibre_path="", local_book=None, gdri
                         g_file = gd.getFileFromEbooksFolder(all_new_path,
                                                             file_format.name + '.' + file_format.format.lower())
                         if g_file:
-                            gd.moveGdriveFileRemote(g_file, all_new_name + u'.' + file_format.format.lower())
-                            gd.updateDatabaseOnEdit(g_file['id'], all_new_name + u'.' + file_format.format.lower())
+                            gd.moveGdriveFileRemote(g_file, all_new_name + '.' + file_format.format.lower())
+                            gd.updateDatabaseOnEdit(g_file['id'], all_new_name + '.' + file_format.format.lower())
                         else:
                             log.error("File {} not found on gdrive"
                                       .format(all_new_path, file_format.name + '.' + file_format.format.lower()))
@@ -510,25 +510,25 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     authordir = book.path.split('/')[0]
     titledir = book.path.split('/')[1]
     new_authordir = rename_all_authors(first_author, renamed_author, gdrive=True)
-    new_titledir = get_valid_filename(book.title, chars=96) + u" (" + str(book_id) + u")"
+    new_titledir = get_valid_filename(book.title, chars=96) + " (" + str(book_id) + ")"
 
     if titledir != new_titledir:
         g_file = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
         if g_file:
             gd.moveGdriveFileRemote(g_file, new_titledir)
-            book.path = book.path.split('/')[0] + u'/' + new_titledir
+            book.path = book.path.split('/')[0] + '/' + new_titledir
             gd.updateDatabaseOnEdit(g_file['id'], book.path)     # only child folder affected
         else:
-            return _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
+            return _('File %(file)s not found on Google Drive', file=book.path)  # file not found
 
     if authordir != new_authordir and authordir not in renamed_author:
         g_file = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
         if g_file:
             gd.moveGdriveFolderRemote(g_file, new_authordir)
-            book.path = new_authordir + u'/' + book.path.split('/')[1]
+            book.path = new_authordir + '/' + book.path.split('/')[1]
             gd.updateDatabaseOnEdit(g_file['id'], book.path)
         else:
-            return _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
+            return _('File %(file)s not found on Google Drive', file=authordir)  # file not found
 
     # change location in database to new author/title path
     book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
@@ -600,7 +600,7 @@ def delete_book_gdrive(book, book_format):
         gd.deleteDatabaseEntry(g_file['id'])
         g_file.Trash()
     else:
-        error = _(u'Book path %(path)s not found on Google Drive', path=book.path)  # file not found
+        error = _('Book path %(path)s not found on Google Drive', path=book.path)  # file not found
 
     return error is None, error
 
diff --git a/cps/oauth_bb.py b/cps/oauth_bb.py
index 389191b9b..ec400f716 100644
--- a/cps/oauth_bb.py
+++ b/cps/oauth_bb.py
@@ -295,8 +295,8 @@ if ub.oauth_support:
     @oauth_error.connect_via(oauthblueprints[0]['blueprint'])
     def github_error(blueprint, error, error_description=None, error_uri=None):
         msg = (
-            u"OAuth error from {name}! "
-            u"error={error} description={description} uri={uri}"
+            "OAuth error from {name}! "
+            "error={error} description={description} uri={uri}"
         ).format(
             name=blueprint.name,
             error=error,
@@ -308,8 +308,8 @@ if ub.oauth_support:
     @oauth_error.connect_via(oauthblueprints[1]['blueprint'])
     def google_error(blueprint, error, error_description=None, error_uri=None):
         msg = (
-            u"OAuth error from {name}! "
-            u"error={error} description={description} uri={uri}"
+            "OAuth error from {name}! "
+            "error={error} description={description} uri={uri}"
         ).format(
             name=blueprint.name,
             error=error,
diff --git a/cps/opds.py b/cps/opds.py
index 60dbd551a..0c83fa70e 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -328,7 +328,7 @@ def feed_format(book_id):
 @requires_basic_auth_if_no_ano
 def feed_languagesindex():
     off = request.args.get("offset") or 0
-    if current_user.filter_language() == u"all":
+    if current_user.filter_language() == "all":
         languages = calibre_db.speaking_language()
     else:
         languages = calibre_db.session.query(db.Languages).filter(
diff --git a/cps/search.py b/cps/search.py
index 3effeb7b9..096b29282 100644
--- a/cps/search.py
+++ b/cps/search.py
@@ -189,14 +189,14 @@ def extend_search_term(searchterm,
                                format_date(datetime.strptime(pub_start, "%Y-%m-%d"),
                                            format='medium')])
         except ValueError:
-            pub_start = u""
+            pub_start = ""
     if pub_end:
         try:
             searchterm.extend([_("Published before ") +
                                format_date(datetime.strptime(pub_end, "%Y-%m-%d"),
                                            format='medium')])
         except ValueError:
-            pub_end = u""
+            pub_end = ""
     elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
     for key, db_element in elements.items():
         tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
@@ -267,13 +267,13 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             column_start = term.get('custom_column_' + str(c.id) + '_start')
             column_end = term.get('custom_column_' + str(c.id) + '_end')
             if column_start:
-                search_term.extend([u"{} >= {}".format(c.name,
+                search_term.extend(["{} >= {}".format(c.name,
                                                        format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
                                                                    format='medium')
                                                        )])
                 cc_present = True
             if column_end:
-                search_term.extend([u"{} <= {}".format(c.name,
+                search_term.extend(["{} <= {}".format(c.name,
                                                        format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
                                                                    format='medium')
                                                        )])
@@ -366,7 +366,7 @@ def render_prepare_search_form(cc):
         .filter(calibre_db.common_filters()) \
         .group_by(db.Data.format)\
         .order_by(db.Data.format).all()
-    if current_user.filter_language() == u"all":
+    if current_user.filter_language() == "all":
         languages = calibre_db.speaking_language()
     else:
         languages = None
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 8f2f924a3..df6ae1043 100755
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -64,7 +64,7 @@ class TaskConvert(CalibreTask):
             if df:
                 datafile = os.path.join(config.config_calibre_dir,
                                         cur_book.path,
-                                        data.name + u"." + self.settings['old_book_format'].lower())
+                                        data.name + "." + 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)
@@ -78,7 +78,7 @@ class TaskConvert(CalibreTask):
 
         filename = self._convert_ebook_format()
         if config.config_use_google_drive:
-            os.remove(self.file_path + u'.' + self.settings['old_book_format'].lower())
+            os.remove(self.file_path + '.' + self.settings['old_book_format'].lower())
 
         if filename:
             if config.config_use_google_drive:
@@ -107,8 +107,8 @@ class TaskConvert(CalibreTask):
         local_db = db.CalibreDB(expire_on_commit=False, init=True)
         file_path = self.file_path
         book_id = self.book_id
-        format_old_ext = u'.' + self.settings['old_book_format'].lower()
-        format_new_ext = u'.' + self.settings['new_book_format'].lower()
+        format_old_ext = '.' + self.settings['old_book_format'].lower()
+        format_new_ext = '.' + 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
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 6d6ab9374..a7f0c2ecf 100755
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -166,7 +166,7 @@ class TaskEmail(CalibreTask):
                 self.send_gmail_email(msg)
         except MemoryError as e:
             log.error_or_exception(e, stacklevel=3)
-            self._handleError(u'MemoryError sending e-mail: {}'.format(str(e)))
+            self._handleError('MemoryError sending e-mail: {}'.format(str(e)))
         except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
             log.error_or_exception(e, stacklevel=3)
             if hasattr(e, "smtp_error"):
@@ -177,13 +177,13 @@ class TaskEmail(CalibreTask):
                 text = '\n'.join(e.args)
             else:
                 text = ''
-            self._handleError(u'Smtplib Error sending e-mail: {}'.format(text))
+            self._handleError('Smtplib Error sending e-mail: {}'.format(text))
         except (socket.error) as e:
             log.error_or_exception(e, stacklevel=3)
-            self._handleError(u'Socket Error sending e-mail: {}'.format(e.strerror))
+            self._handleError('Socket Error sending e-mail: {}'.format(e.strerror))
         except Exception as ex:
             log.error_or_exception(ex, stacklevel=3)
-            self._handleError(u'Error sending e-mail: {}'.format(ex))
+            self._handleError('Error sending e-mail: {}'.format(ex))
 
     def send_standard_email(self, msg):
         use_ssl = int(self.settings.get('mail_use_ssl', 0))
@@ -257,7 +257,7 @@ class TaskEmail(CalibreTask):
                 file_.close()
             except IOError as e:
                 log.error_or_exception(e, stacklevel=3)
-                log.error(u'The requested file could not be read. Maybe wrong permissions?')
+                log.error('The requested file could not be read. Maybe wrong permissions?')
                 return None
         return data
 
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index ace9cecce..5bf0466b1 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -92,7 +92,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
                 if generated > 0:
                     total_generated += generated
-                    self.message = N_(u'Generated %(count)s cover thumbnails', count=total_generated)
+                    self.message = N_('Generated %(count)s cover thumbnails', count=total_generated)
 
                 # Check if job has been cancelled or ended
                 if self.stat == STAT_CANCELLED:
diff --git a/cps/tasks_status.py b/cps/tasks_status.py
index 35350f687..7043483c2 100644
--- a/cps/tasks_status.py
+++ b/cps/tasks_status.py
@@ -61,19 +61,19 @@ def render_task_status(tasklist):
             # localize the task status
             if isinstance(task.stat, int):
                 if task.stat == STAT_WAITING:
-                    ret['status'] = _(u'Waiting')
+                    ret['status'] = _('Waiting')
                 elif task.stat == STAT_FAIL:
-                    ret['status'] = _(u'Failed')
+                    ret['status'] = _('Failed')
                 elif task.stat == STAT_STARTED:
-                    ret['status'] = _(u'Started')
+                    ret['status'] = _('Started')
                 elif task.stat == STAT_FINISH_SUCCESS:
-                    ret['status'] = _(u'Finished')
+                    ret['status'] = _('Finished')
                 elif task.stat == STAT_ENDED:
-                    ret['status'] = _(u'Ended')
+                    ret['status'] = _('Ended')
                 elif task.stat == STAT_CANCELLED:
-                    ret['status'] = _(u'Cancelled')
+                    ret['status'] = _('Cancelled')
                 else:
-                    ret['status'] = _(u'Unknown Status')
+                    ret['status'] = _('Unknown Status')
 
             ret['taskMessage'] = "{}: {}".format(task.name, task.message) if task.message else task.name
             ret['progress'] = "{} %".format(int(task.progress * 100))
diff --git a/cps/ub.py b/cps/ub.py
index 5dd7d6465..fd0278e5b 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -492,7 +492,7 @@ class Registration(Base):
     allow = Column(Integer)
 
     def __repr__(self):
-        return u"<Registration('{0}')>".format(self.domain)
+        return "<Registration('{0}')>".format(self.domain)
 
 
 class RemoteAuthToken(Base):
@@ -810,7 +810,7 @@ def create_admin_user(_session):
 
 def init_db_thread():
     global app_DB_path
-    engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
+    engine = create_engine('sqlite:///{0}'.format(app_DB_path), echo=False)
 
     Session = scoped_session(sessionmaker())
     Session.configure(bind=engine)
@@ -823,7 +823,7 @@ def init_db(app_db_path, user_credentials=None):
     global app_DB_path
 
     app_DB_path = app_db_path
-    engine = create_engine(u'sqlite:///{0}'.format(app_db_path), echo=False)
+    engine = create_engine('sqlite:///{0}'.format(app_db_path), echo=False)
 
     Session = scoped_session(sessionmaker())
     Session.configure(bind=engine)
@@ -858,7 +858,7 @@ def init_db(app_db_path, user_credentials=None):
 
 
 def get_new_session_instance():
-    new_engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
+    new_engine = create_engine('sqlite:///{0}'.format(app_DB_path), echo=False)
     new_session = scoped_session(sessionmaker())
     new_session.configure(bind=new_engine)
 
diff --git a/cps/updater.py b/cps/updater.py
index fa13c44b9..282677898 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -75,29 +75,29 @@ class Updater(threading.Thread):
     def do_work(self):
         try:
             self.status = 1
-            log.debug(u'Download update file')
+            log.debug('Download update file')
             headers = {'Accept': 'application/vnd.github.v3+json'}
             r = requests.get(self._get_request_path(), stream=True, headers=headers, timeout=(10, 600))
             r.raise_for_status()
 
             self.status = 2
-            log.debug(u'Opening zipfile')
+            log.debug('Opening zipfile')
             z = zipfile.ZipFile(BytesIO(r.content))
             self.status = 3
-            log.debug(u'Extracting zipfile')
+            log.debug('Extracting zipfile')
             tmp_dir = gettempdir()
             z.extractall(tmp_dir)
             folder_name = os.path.join(tmp_dir, z.namelist()[0])[:-1]
             if not os.path.isdir(folder_name):
                 self.status = 11
-                log.info(u'Extracted contents of zipfile not found in temp folder')
+                log.info('Extracted contents of zipfile not found in temp folder')
                 self.pause()
                 return False
             self.status = 4
-            log.debug(u'Replacing files')
+            log.debug('Replacing files')
             if self.update_source(folder_name, constants.BASE_DIR):
                 self.status = 6
-                log.debug(u'Preparing restart of server')
+                log.debug('Preparing restart of server')
                 time.sleep(2)
                 self.web_server.stop(True)
                 self.status = 7
@@ -107,20 +107,20 @@ class Updater(threading.Thread):
                 self.status = 13
 
         except requests.exceptions.HTTPError as ex:
-            log.error(u'HTTP Error %s', ex)
+            log.error('HTTP Error %s', ex)
             self.status = 8
         except requests.exceptions.ConnectionError:
-            log.error(u'Connection error')
+            log.error('Connection error')
             self.status = 9
         except requests.exceptions.Timeout:
-            log.error(u'Timeout while establishing connection')
+            log.error('Timeout while establishing connection')
             self.status = 10
         except (requests.exceptions.RequestException, zipfile.BadZipFile):
             self.status = 11
-            log.error(u'General error')
+            log.error('General error')
         except (IOError, OSError) as ex:
             self.status = 12
-            log.error(u'Possible Reason for error: update file could not be saved in temp dir')
+            log.error('Possible Reason for error: update file could not be saved in temp dir')
             log.error_or_exception(ex)
         self.pause()
         return False
@@ -386,13 +386,13 @@ class Updater(threading.Thread):
             r.raise_for_status()
             update_data = r.json()
         except requests.exceptions.HTTPError as e:
-            status['message'] = _(u'HTTP Error') + ' ' + str(e)
+            status['message'] = _('HTTP Error') + ' ' + str(e)
         except requests.exceptions.ConnectionError:
-            status['message'] = _(u'Connection error')
+            status['message'] = _('Connection error')
         except requests.exceptions.Timeout:
-            status['message'] = _(u'Timeout while establishing connection')
+            status['message'] = _('Timeout while establishing connection')
         except (requests.exceptions.RequestException, ValueError):
-            status['message'] = _(u'General error')
+            status['message'] = _('General error')
         return status, update_data
 
     @staticmethod
@@ -428,18 +428,18 @@ class Updater(threading.Thread):
             if status['message'] != '':
                 return json.dumps(status)
             if 'object' not in commit or 'url' not in commit['object']:
-                status['message'] = _(u'Unexpected data while reading update information')
+                status['message'] = _('Unexpected data while reading update information')
                 return json.dumps(status)
             try:
                 if commit['object']['sha'] == status['current_commit_hash']:
                     status.update({
                         'update': False,
                         'success': True,
-                        'message': _(u'No update available. You already have the latest version installed')
+                        'message': _('No update available. You already have the latest version installed')
                     })
                     return json.dumps(status)
             except (TypeError, KeyError):
-                status['message'] = _(u'Unexpected data while reading update information')
+                status['message'] = _('Unexpected data while reading update information')
                 return json.dumps(status)
 
             # a new update is available
@@ -454,7 +454,7 @@ class Updater(threading.Thread):
                 log.debug("A new update is available.")
                 status['success'] = True
                 status['message'] = _(
-                    u'A new update is available. Click on the button below to update to the latest version.')
+                    'A new update is available. Click on the button below to update to the latest version.')
 
                 new_commit_date = datetime.datetime.strptime(
                     update_data['committer']['date'], '%Y-%m-%dT%H:%M:%SZ') - tz
@@ -471,7 +471,7 @@ class Updater(threading.Thread):
                 status['history'] = parents[::-1]
             except (IndexError, KeyError):
                 status['success'] = False
-                status['message'] = _(u'Could not fetch update information')
+                status['message'] = _('Could not fetch update information')
                 log.error("Could not fetch update information")
             return json.dumps(status)
         return ''
@@ -482,7 +482,7 @@ class Updater(threading.Thread):
                 'update': True,
                 'success': True,
                 'message': _(
-                    u'Click on the button below to update to the latest stable version.'),
+                    'Click on the button below to update to the latest stable version.'),
                 'history': parents
             })
             self.updateFile = commit[0]['zipball_url']
@@ -490,8 +490,8 @@ class Updater(threading.Thread):
             status.update({
                 'update': True,
                 'success': True,
-                'message': _(u'A new update is available. Click on the button below to '
-                             u'update to version: %(version)s', version=commit[0]['tag_name']),
+                'message': _('A new update is available. Click on the button below to '
+                             'update to version: %(version)s', version=commit[0]['tag_name']),
                 'history': parents
             })
             self.updateFile = commit[0]['zipball_url']
diff --git a/cps/uploader.py b/cps/uploader.py
index 17e28d877..e605903da 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -83,7 +83,7 @@ def process(tmp_file_path, original_file_name, original_file_extension, rarExecu
 
     if meta and meta.title.strip() and meta.author.strip():
         if meta.author.lower() == 'unknown':
-            meta = meta._replace(author=_(u'Unknown'))
+            meta = meta._replace(author=_('Unknown'))
         return meta
     return default_meta(tmp_file_path, original_file_name, original_file_extension)
 
@@ -93,7 +93,7 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension):
         file_path=tmp_file_path,
         extension=original_file_extension,
         title=original_file_name,
-        author=_(u'Unknown'),
+        author=_('Unknown'),
         cover=None,
         description="",
         tags="",
@@ -173,7 +173,7 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         languages = xmp_info['languages']
         publisher = xmp_info['publisher']
     else:
-        author = u'Unknown'
+        author = 'Unknown'
         title = ''
         languages = [""]
         publisher = ""
@@ -182,7 +182,7 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
 
     if doc_info:
         if author == '':
-            author = ' & '.join(split_authors([doc_info.author])) if doc_info.author else u'Unknown'
+            author = ' & '.join(split_authors([doc_info.author])) if doc_info.author else 'Unknown'
         if title == '':
             title = doc_info.title if doc_info.title else original_file_name
         if subject == '':
@@ -239,7 +239,7 @@ def get_magick_version():
     if not use_generic_pdf_cover:
         ret['Image Magick'] = ImageVersion.MAGICK_VERSION
     else:
-        ret['Image Magick'] = u'not installed'
+        ret['Image Magick'] = 'not installed'
     return ret
 
 
diff --git a/cps/web.py b/cps/web.py
index d2302b8c1..8ccec0338 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -739,10 +739,10 @@ def render_read_books(page, are_read, as_xml=False, order=None):
         return entries, pagination
     else:
         if are_read:
-            name = _(u'Read Books') + ' (' + str(pagination.total_count) + ')'
+            name = _('Read Books') + ' (' + str(pagination.total_count) + ')'
             page_name = "read"
         else:
-            name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
+            name = _('Unread Books') + ' (' + str(pagination.total_count) + ')'
             page_name = "unread"
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=name, page=page_name, order=order[1])
@@ -765,7 +765,7 @@ def render_archived_books(page, sort_param):
                                                                                 True,
                                                                                 True, config.config_read_column)
 
-    name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
+    name = _('Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     page_name = "archived"
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                  title=name, page=page_name, order=sort_param[1])
@@ -917,7 +917,7 @@ def author_list():
         for entry in author_copy:
             entry.Authors.name = entry.Authors.name.replace('|', ',')
         return render_title_template('list.html', entries=author_copy, folder='web.books_list', charlist=char_list,
-                                     title=u"Authors", page="authorlist", data='author', order=order_no)
+                                     title="Authors", page="authorlist", data='author', order=order_no)
     else:
         abort(404)
 
@@ -1066,7 +1066,7 @@ def formats_list():
 @web.route("/language")
 @login_required_if_no_ano
 def language_overview():
-    if current_user.check_visibility(constants.SIDEBAR_LANGUAGE) and current_user.filter_language() == u"all":
+    if current_user.check_visibility(constants.SIDEBAR_LANGUAGE) and current_user.filter_language() == "all":
         order_no = 0 if current_user.get_view_property('language', 'dir') == 'desc' else 1
         languages = calibre_db.speaking_language(reverse_order=not order_no, with_count=True)
         char_list = generate_char_list(languages)

From d6184619f503cfead32b4f4a0f0096983859a1d3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 21 Jan 2023 15:27:11 +0100
Subject: [PATCH 381/412] New generated translation files

---
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 38252 -> 36402 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 173 ++++++++--------
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 59480 -> 56584 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 190 +++++++++--------
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 55818 -> 53282 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 175 ++++++++--------
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 49849 -> 47384 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 184 +++++++++--------
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 26606 -> 24856 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 175 ++++++++--------
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 54132 -> 51589 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 180 ++++++++--------
 cps/translations/gl/LC_MESSAGES/messages.mo   | Bin 59885 -> 56752 bytes
 cps/translations/gl/LC_MESSAGES/messages.po   | 192 ++++++++++--------
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 24357 -> 22741 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 179 ++++++++--------
 cps/translations/id/LC_MESSAGES/messages.mo   | Bin 57342 -> 54431 bytes
 cps/translations/id/LC_MESSAGES/messages.po   | 190 +++++++++--------
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 61764 -> 58322 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 189 +++++++++--------
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 63380 -> 60199 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 192 ++++++++++--------
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 23905 -> 22556 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 181 +++++++++--------
 cps/translations/ko/LC_MESSAGES/messages.mo   | Bin 54195 -> 51734 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   | 184 +++++++++--------
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 48992 -> 46631 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 184 +++++++++--------
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 50813 -> 48261 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 182 +++++++++--------
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 59976 -> 56954 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 192 ++++++++++--------
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 46455 -> 44070 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 177 ++++++++--------
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 47256 -> 45102 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 182 +++++++++--------
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 22085 -> 20719 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 179 ++++++++--------
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 24153 -> 22749 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 171 ++++++++--------
 cps/translations/vi/LC_MESSAGES/messages.mo   | Bin 32066 -> 29930 bytes
 cps/translations/vi/LC_MESSAGES/messages.po   | 174 +++++++++-------
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 54182 -> 51332 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 189 +++++++++--------
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 47403 -> 45154 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 182 +++++++++--------
 messages.pot                                  | 136 ++++++-------
 47 files changed, 2349 insertions(+), 1983 deletions(-)

diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 890f50f07c0b1f847a2a816dd4a8f30b4d2c4566..a66c1910079b2e088e854539d05fb7974d58be39 100644
GIT binary patch
delta 9290
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
AjQ{`u

delta 11038
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

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 47f17229d..9da9f2585 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+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"
@@ -22,16 +22,18 @@ msgid "Statistics"
 msgstr "Statistika"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Server restartován, znovu načtěte stránku"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Vypínám server, zavřete okno"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Úspěšně obnovené připojení"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -39,8 +41,8 @@ msgstr "Neznámý příkaz"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -279,8 +281,8 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "Přidat nového uživatele"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -288,7 +290,7 @@ msgid "Edit Email Server Settings"
 msgstr "Změnit SMTP nastavení"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -349,12 +351,13 @@ msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
 #: cps/admin.py:1445
@@ -479,6 +482,10 @@ msgstr "Vyplňte všechna pole!"
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Přidat nového uživatele"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -669,15 +676,18 @@ msgid "Send to eReader"
 msgstr "Poslat do Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Tento e-mail byl odeslán přes Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web zkušební e-mail"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Zkušební e-mail"
 
 #: cps/helper.py:132
@@ -685,23 +695,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Začínáme s Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Registrační e-mail pro uživatele: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Převést %(orig)s do %(format)s a poslat do Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "Poslat %(format)s do Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Poslat do Kindle"
 
 #: cps/helper.py:230
@@ -751,17 +761,16 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-#, fuzzy
-msgid "Oops! An account already exists for this Email."
-msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Zadané uživatelské jméno je již použito"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+msgid "Invalid Email address format"
 msgstr ""
 
 #: cps/helper.py:815
@@ -832,7 +841,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -954,7 +963,8 @@ msgid "Read Books"
 msgstr "Přečtené knihy"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -971,7 +981,7 @@ msgid "Discover"
 msgstr "Objevte"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
@@ -981,7 +991,8 @@ msgid "Categories"
 msgstr "Kategorie"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Zobrazit výběr kategorie"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -991,7 +1002,8 @@ msgid "Series"
 msgstr "Série"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Zobrazit výběr sérií"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -1000,7 +1012,8 @@ msgid "Authors"
 msgstr "Autoři"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Zobrazit výběr autora"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1009,7 +1022,8 @@ msgid "Publishers"
 msgstr "Vydavatelé"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Zobrazit výběr vydavatele"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1019,7 +1033,8 @@ msgid "Languages"
 msgstr "Jazyky"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Zobrazit výběr jazyka"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1027,7 +1042,8 @@ msgid "Ratings"
 msgstr "Hodnocení"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Zobrazit výběr hodnocení"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1035,7 +1051,8 @@ msgid "File formats"
 msgstr "Formáty souborů"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Zobrazit výběr formátů"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1043,7 +1060,8 @@ msgid "Archived Books"
 msgstr "Archivované knihy"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Zobrazit archivované knihy"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1329,10 +1347,14 @@ msgstr "Seznam hodnocení"
 msgid "File formats list"
 msgstr "Seznam formátů"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(kindlemail)s"
+msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1340,7 +1362,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Při odesílání této knihy došlo k chybě: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Nejprve nakonfigurujte vaši kindle e-mailovou adresu.."
 
 #: cps/web.py:1226
@@ -1388,24 +1411,30 @@ msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s profil"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Profil aktualizován"
 
+#: cps/web.py:1416
+#, fuzzy
+msgid "Oops! An account already exists for this Email."
+msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Poslat do Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1536,10 +1565,6 @@ msgstr "Smazat"
 msgid "Public Shelf"
 msgstr "Veřejná police"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Přidat nového uživatele"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Importovat LDAP uživatele"
@@ -1570,7 +1595,7 @@ msgid "From Email"
 msgstr "Z e-mailu"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+msgid "Email Service"
 msgstr ""
 
 #: cps/templates/admin.html:91
@@ -1643,6 +1668,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1650,7 +1676,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1658,7 +1684,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1678,10 +1705,6 @@ msgstr ""
 msgid "View Logs"
 msgstr "Zobrazit log"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Znovupřipojení ke Calibre databázi"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Restartovat"
@@ -2539,15 +2562,16 @@ msgid "Email Account Type"
 msgstr ""
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+msgid "Standard Email Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr ""
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Účet"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
+msgid "Setup Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:24
@@ -2571,7 +2595,8 @@ msgid "Attachment Size Limit"
 msgstr "Limit velikosti souboru"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Uložit nastavení a odeslat zkušební e-mail"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3089,10 +3114,6 @@ msgstr "Jakmile tak učiníte, budete automaticky přihlášeni na tomto zaříz
 msgid "This verification link will expire in 10 minutes."
 msgstr "Tento ověřovací odkaz vyprší za 10 minut."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3246,10 +3267,6 @@ msgstr "Průběh"
 msgid "Run Time"
 msgstr "Doba spuštění"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Čas spuštění"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3326,17 +3343,17 @@ msgstr "Zvolte uživatelské jméno"
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
-msgstr "Vaše e-mailová adresa"
+msgid "Enter Email"
+msgstr "Zkušební e-mail"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
+msgid "Enter eReader Email"
 msgstr "Poslat do Kindle e-mailová adresa"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Zkušební e-mail"
 
 #: cps/templates/user_table.html:137
@@ -3406,10 +3423,6 @@ msgstr ""
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "Zobrazit výběr sérií"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Zobrazit náhodné knihy"
-
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 239caa32f9fb369fc8364884ad174d916ae5a1d5..f996e1e98fb1ecd4c586ece9a881adcf3dbf7570 100644
GIT binary patch
delta 13316
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
Bq)h+-

delta 15854
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
Tcc#1ggY)jeBkAs{59j_Ls<i3$

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index f73daf0e3..2c4129c75 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2022-08-27 10:00+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -23,16 +23,18 @@ msgid "Statistics"
 msgstr "Statistiken"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Server neu gestartet, Seite bitte neu laden"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Server wird heruntergefahren, Fenster bitte schließen"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Erfolgreich neu verbunden"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -40,8 +42,8 @@ msgstr "Unbekannter Befehl"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
+msgid "Success! Books queued for Metadata Backup"
+msgstr ""
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -274,8 +276,8 @@ msgstr "LDAP Member User Filter hat eine ungleiche Anzahl von geöffneten und ge
 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:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "Neuen Benutzer hinzufügen"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -283,8 +285,8 @@ msgid "Edit Email Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "Gmail Account Verifikation erfolgreich"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -344,12 +346,13 @@ msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
 #: cps/admin.py:1445
@@ -470,6 +473,10 @@ msgstr "Bitte alle Felder ausfüllen!"
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Neuen Benutzer hinzufügen"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -658,15 +665,18 @@ msgid "Send to eReader"
 msgstr "An E-Reader senden"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web Test-E-Mail"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Test-E-Mail"
 
 #: cps/helper.py:132
@@ -674,23 +684,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Loslegen mit Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Registrierungs-E-Mail für Benutzer %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Konvertiere %(orig)s nach %(format)s und sende an E-Reader"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, python-format
-msgid "Send %(format)s to E-Reader"
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader"
 msgstr "Sende %(format)s an E-Reader"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
-#, python-format
-msgid "%(book)s send to E-Reader"
+#: cps/helper.py:225
+#, fuzzy, python-format
+msgid "%(book)s send to eReader"
 msgstr "%(book)s an E-Reader gesendet"
 
 #: cps/helper.py:230
@@ -740,16 +750,17 @@ msgstr "Fehler beim umbenennen der Datei im Pfad: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Ungültiges E-Mail Adressformat"
 
 #: cps/helper.py:815
@@ -818,7 +829,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -940,7 +951,8 @@ msgid "Read Books"
 msgstr "Gelesene Bücher"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -957,7 +969,7 @@ msgid "Discover"
 msgstr "Entdecke"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
@@ -967,7 +979,8 @@ msgid "Categories"
 msgstr "Kategorien"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Zeige Kategorienauswahl"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -977,7 +990,8 @@ msgid "Series"
 msgstr "Serien"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Zeige Serienauswahl"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -986,7 +1000,8 @@ msgid "Authors"
 msgstr "Autoren"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Zeige Autorenauswahl"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -995,7 +1010,8 @@ msgid "Publishers"
 msgstr "Verleger"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Zeige Verlegerauswahl"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1005,7 +1021,8 @@ msgid "Languages"
 msgstr "Sprachen"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Zeige Sprachauswahl"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1013,7 +1030,8 @@ msgid "Ratings"
 msgstr "Bewertungen"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Zeige Bewertungsauswahl"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1021,7 +1039,8 @@ msgid "File formats"
 msgstr "Dateiformate"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Zeige Dateiformatauswahl"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1029,7 +1048,8 @@ msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Zeige archivierte Bücher"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1312,10 +1332,14 @@ msgstr "Bewertungsliste"
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
+msgstr "Buch erfolgreich zum Senden an %(eReadermail)s eingereiht"
 
 #: cps/web.py:1207
 #, python-format
@@ -1323,7 +1347,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
 #: cps/web.py:1226
@@ -1371,24 +1396,29 @@ msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Eingeloggt als: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s's Profil"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Profil aktualisiert"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Keine gültige gmail.json Datei mit Oauth informationen gefunden"
 
+#: cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s an E-Reader gesendet"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1518,10 +1548,6 @@ msgstr "Löschen"
 msgid "Public Shelf"
 msgstr "Öffentliches Bücherregal"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Neuen Benutzer hinzufügen"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "LDAP Benutzer importieren"
@@ -1552,7 +1578,8 @@ msgid "From Email"
 msgstr "Absenderadresse"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "EMail Service"
 
 #: cps/templates/admin.html:91
@@ -1624,6 +1651,7 @@ msgid "Scheduled Tasks"
 msgstr "Geplante Aufgabe"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr "Zeitpunkt an dem die Aufgabe startet"
 
@@ -1631,7 +1659,7 @@ msgstr "Zeitpunkt an dem die Aufgabe startet"
 msgid "Maximum Duration"
 msgstr "Maximale Aufgabendauer"
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr "Buchcover Miniaturansichten erzeugen"
 
@@ -1639,7 +1667,8 @@ msgstr "Buchcover Miniaturansichten erzeugen"
 msgid "Generate series cover thumbnails"
 msgstr "Seriencover Miniaturansichten erzeugen"
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr "Mit Calibre Bibliothek neuverbinden"
 
@@ -1659,10 +1688,6 @@ msgstr "Debug Daten herunterladen"
 msgid "View Logs"
 msgstr "Logdateien ansehen"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Calibre-DB neu verbinden"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Neustart"
@@ -2514,16 +2539,18 @@ msgid "Email Account Type"
 msgstr "Wähle Server Typ"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Benutze Standard E-Mail Account"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Gmail Account mit Oauth2 Verification"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Wähle Server Typ"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Gmail Account als E-Mail Server verwenden"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2546,7 +2573,8 @@ msgid "Attachment Size Limit"
 msgstr "Anhangsgröße"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Einstellungen speichern und Test-E-Mail versenden"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3055,10 +3083,6 @@ msgstr "Danach wirst du automatisch auf diesem Gerät eingeloggt sein."
 msgid "This verification link will expire in 10 minutes."
 msgstr "Dieser Link wird in 10 Minuten ablaufen."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr "Thumbnails für Bücher Cover erzeugen"
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr "Thumbnails für Serien Cover erzeugen"
@@ -3211,10 +3235,6 @@ msgstr "Fortschritt"
 msgid "Run Time"
 msgstr "Laufzeit"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Startzeitpunkt"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr "Aktionen"
@@ -3288,15 +3308,18 @@ msgid "Enter Username"
 msgstr "Benutzernamen eingeben"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "E-Mail-Adresse eingeben"
+#, fuzzy
+msgid "Enter Email"
+msgstr "Test-E-Mail"
 
 #: cps/templates/user_table.html:136
-msgid "Enter E-Reader Email Address"
-msgstr "E-Reader E-Mail Adresse eingeben"
+#, fuzzy
+msgid "Enter eReader Email"
+msgstr "An E-Reader E-Mail Adresse senden"
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
+#, fuzzy
+msgid "eReader Email"
 msgstr "E-Reader E-Mail"
 
 #: cps/templates/user_table.html:137
@@ -3356,10 +3379,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "Ausgesuchte Bücherregale mit Kobo synchronisieren"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "Zeige Gelesen/Ungelesen Auswahl"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Zeige zufällige Bücher"
-
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 5c6f34ccffb754fa2a5dbd423387dbf35ed303ef..d98607b2576d00896daefd07bc14ad76608a9b85 100644
GIT binary patch
delta 9831
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
Sss=rK=JhlC{CSsh1O5+^i7fR1

delta 11925
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
NR1i*!a#kJd_<v27FHHad

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 860d995d6..98690872f 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -22,16 +22,18 @@ msgid "Statistics"
 msgstr "Στατιστικά"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Ο διακομιστής επανεκκίνησε, παρακαλούμε φόρτωσε ξανά τη σελίδα"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Πραγματοποιείται κλείσιμο του διακομιστή, παρακαλούμε κλείσε το παράθυρο"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Επιτυχής επανασύνδεση"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -39,8 +41,8 @@ msgstr "Άγνωστη εντολή"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -279,16 +281,16 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Προσθήκη νέου χρήστη"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "Προσθήκη Νέου Χρήστη"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -349,12 +351,13 @@ msgid "Edit User %(nick)s"
 msgstr "Επεξεργασία χρήστη %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
 #: cps/admin.py:1445
@@ -479,6 +482,10 @@ msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 msgid "E-mail is not from valid domain"
 msgstr "Το E-mail δεν είναι από έγκυρο domain"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Προσθήκη νέου χρήστη"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -669,15 +676,18 @@ msgid "Send to eReader"
 msgstr "Αποστολή στο Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Αυτό το e-mail έχει σταλεί μέσω Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web δοκιμαστικό e-mail"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Δοκιμαστικό e-mail"
 
 #: cps/helper.py:132
@@ -685,23 +695,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Ξεκινήστε με το Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "e-mail εγγραφής για χρήστη: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Μετατροπή %(orig)s σε %(format)s και αποστολή στο Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "Αποστολή %(format)s στο Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Αποστολή στο Kindle"
 
 #: cps/helper.py:230
@@ -751,17 +761,16 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-#, fuzzy
-msgid "Oops! An account already exists for this Email."
-msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Αυτό το όνομα χρήστη έχει ήδη παρθεί"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+msgid "Invalid Email address format"
 msgstr ""
 
 #: cps/helper.py:815
@@ -832,7 +841,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -954,7 +963,8 @@ msgid "Read Books"
 msgstr "Βιβλία που Διαβάστηκαν"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Προβολή διαβασμένων και αδιάβαστων"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -971,7 +981,7 @@ msgid "Discover"
 msgstr "Ανακάλυψε"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Προβολή Τυχαίων Βιβλίων"
 
@@ -981,7 +991,8 @@ msgid "Categories"
 msgstr "Κατηγορίες"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Προβολή επιλογών κατηγορίας"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -991,7 +1002,8 @@ msgid "Series"
 msgstr "Σειρές"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Προβολή επιλογών σειράς"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -1000,7 +1012,8 @@ msgid "Authors"
 msgstr "Συγγραφείς"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Προβολή επιλογών συγγραφέα"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1009,7 +1022,8 @@ msgid "Publishers"
 msgstr "Εκδότες"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Προβολή επιλογών εκδότη"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1019,7 +1033,8 @@ msgid "Languages"
 msgstr "Γλώσσες"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Προβολή επιλογών γλώσσας"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1027,7 +1042,8 @@ msgid "Ratings"
 msgstr "Αξιολογήσεις"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Προβολή επιλογών αξιολόγησης"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1035,7 +1051,8 @@ msgid "File formats"
 msgstr "Μορφές αρχείου"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Προβολή επιλογών μορφής αρχείου"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1043,7 +1060,8 @@ msgid "Archived Books"
 msgstr "Αρχειοθετημένα Βιβλία"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Προβολή αρχειοθετημένων βιβλίων"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1329,10 +1347,14 @@ msgstr "Λίστα αξιολογήσεων"
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
+msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1340,7 +1362,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
 #: cps/web.py:1226
@@ -1388,24 +1411,30 @@ msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνσ
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s's προφίλ"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
+#: cps/web.py:1416
+#, fuzzy
+msgid "Oops! An account already exists for this Email."
+msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Αποστολή στο Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1536,10 +1565,6 @@ msgstr "Διαγραφή"
 msgid "Public Shelf"
 msgstr "Δημόσιο Ράφι"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Προσθήκη Νέου Χρήστη"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Εισαγωγή Χρηστών LDAP"
@@ -1570,7 +1595,7 @@ msgid "From Email"
 msgstr "Από E-mail"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+msgid "Email Service"
 msgstr ""
 
 #: cps/templates/admin.html:91
@@ -1643,6 +1668,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1650,7 +1676,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1658,7 +1684,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1678,10 +1705,6 @@ msgstr ""
 msgid "View Logs"
 msgstr "Προβολή Φύλλων Καταγραφής"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Επανασύνδεση Βάσης Δεδομένων Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Επανεκκίνηση"
@@ -2539,15 +2562,16 @@ msgid "Email Account Type"
 msgstr ""
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+msgid "Standard Email Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr ""
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Λογαριασμός"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
+msgid "Setup Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:24
@@ -2571,7 +2595,8 @@ msgid "Attachment Size Limit"
 msgstr "Όριο Μεγέθους Επισύναψης"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Αποθήκευση και Αποστολή E-mail Δοκιμής"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3089,10 +3114,6 @@ msgstr "Με την επαλήθευση, θα συνδεθείτε αυτόμα
 msgid "This verification link will expire in 10 minutes."
 msgstr "Αυτός ο σύνδεσμος επαλήθευσης θα λήξει σε 10 λεπτά."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3246,10 +3267,6 @@ msgstr "Πρόοδος"
 msgid "Run Time"
 msgstr "Χρόνος Λειτουργίας"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Ώρα Έναρξης"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3326,17 +3343,17 @@ msgstr "Επιλογή ενός ονόματος χρήστη"
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
-msgstr "Η διεύθυνση email σου"
+msgid "Enter Email"
+msgstr "Δοκιμαστικό e-mail"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
+msgid "Enter eReader Email"
 msgstr "Διεύθυνση E-mail Αποστολής στο Kindle"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Δοκιμαστικό e-mail"
 
 #: cps/templates/user_table.html:137
@@ -3406,10 +3423,6 @@ msgstr ""
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "Προβολή επιλογών σειράς"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Προβολή τυχαίων βιβλίων"
-
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 69d25a0ada126b6de176f02eb711e1e2de027263..9839207364430d6b52915504d5243919c3904783 100644
GIT binary patch
delta 11281
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

delta 13489
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
JdG+Z_{~r-euPXom

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index fc8d23e8e..e667b19d9 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -26,16 +26,18 @@ msgid "Statistics"
 msgstr "Estadísticas"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "El servidor se está apagando. Por favor, cierre la ventana"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Reconexión correcta"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -43,8 +45,8 @@ msgstr "Comando desconocido"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Libro puesto en la cola de envío a %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Libro puesto en la cola de envío a %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -283,17 +285,17 @@ msgstr "El filtro de LDAP \"Member User\" tiene paréntesis no coincidentes"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la clave no válidos. Por favor introduce la ruta correcta"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Añadir un nuevo usuario"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "Añadir nuevo usuario"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "Cambiar parámetros de correo"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "Verificación de cuenta de Gmail exitosa"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -353,12 +355,13 @@ msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
 #: cps/admin.py:1445
@@ -483,6 +486,10 @@ msgstr "¡Por favor, rellena todos los campos!"
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Añadir un nuevo usuario"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -673,15 +680,18 @@ msgid "Send to eReader"
 msgstr "Enviar al Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Este correo electrónico ha sido enviado usando Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Correo de prueba de Calibre-Web"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Comprobar correo electrónico"
 
 #: cps/helper.py:132
@@ -689,23 +699,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Primeros pasos con Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Correo electrónico de registro para el usuario: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Convertir %(orig)s a %(format)s y enviar al Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "Enviado %(format)s al Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Enviar al Kindle"
 
 #: cps/helper.py:230
@@ -755,17 +765,17 @@ msgstr ""
 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:644 cps/web.py:1416
-#, fuzzy
-msgid "Oops! An account already exists for this Email."
-msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Este nombre de usuario ya está en uso"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Dirección de correo no válida"
 
 #: cps/helper.py:815
@@ -836,7 +846,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -958,7 +968,8 @@ msgid "Read Books"
 msgstr "Libros leídos"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -975,7 +986,7 @@ msgid "Discover"
 msgstr "Descubrir"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
@@ -985,7 +996,8 @@ msgid "Categories"
 msgstr "Categorías"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -995,7 +1007,8 @@ msgid "Series"
 msgstr "Series"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Mostrar selección de series"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -1004,7 +1017,8 @@ msgid "Authors"
 msgstr "Autores"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1013,7 +1027,8 @@ msgid "Publishers"
 msgstr "Editores"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1023,7 +1038,8 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Mostrar selección de idiomas"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1031,7 +1047,8 @@ msgid "Ratings"
 msgstr "Calificaciones"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Mostrar selección de calificaciones"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1039,7 +1056,8 @@ msgid "File formats"
 msgstr "Formatos de archivo"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Mostrar selección de formatos de archivo"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1047,7 +1065,8 @@ msgid "Archived Books"
 msgstr "Libros archivados"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Mostrar libros archivados"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1333,10 +1352,14 @@ msgstr "Lista de calificaciones"
 msgid "File formats list"
 msgstr "Lista de formatos"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Configura primero los parámetros del servidor SMTP..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Libro puesto en la cola de envío a %(kindlemail)s"
+msgstr "Libro puesto en la cola de envío a %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1344,7 +1367,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Ha sucedido un error en el envío del libro: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Por favor actualiza tu perfil con la dirección de correo de su kindle..."
 
 #: cps/web.py:1226
@@ -1392,24 +1416,30 @@ msgstr "Una nueva contraseña se ha enviado a su cuenta de correo electrónico"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Ahora estás conectado como: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Perfil de %(name)s"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Perfil actualizado"
 
+#: cps/web.py:1416
+#, fuzzy
+msgid "Oops! An account already exists for this Email."
+msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "No se ha encontrado ningún archivo gmail.json válido con información OAuth"
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Enviar al Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1540,10 +1570,6 @@ msgstr "Borrar"
 msgid "Public Shelf"
 msgstr "Estantería pública"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Añadir nuevo usuario"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Importar usuarios LDAP"
@@ -1574,7 +1600,8 @@ msgid "From Email"
 msgstr "Desde el correo"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "Servicio de Correo"
 
 #: cps/templates/admin.html:91
@@ -1647,6 +1674,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1654,7 +1682,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1662,7 +1690,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1682,10 +1711,6 @@ msgstr "Descargar paquete de debug"
 msgid "View Logs"
 msgstr "Ver archivos de registro"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Reconectar a la BD Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Reiniciar"
@@ -2543,16 +2568,18 @@ msgid "Email Account Type"
 msgstr "Elige tipo de servidor"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Usar cuenta de correo estándar"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Verificación de cuenta Gmal con OAuth2"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Elige tipo de servidor"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Configurar cuenta de Gmail como servidor de correo"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2575,7 +2602,8 @@ msgid "Attachment Size Limit"
 msgstr "Tamaño límite del archivo adjunto"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Guardar y enviar un correo electrónico de prueba"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3093,10 +3121,6 @@ msgstr "Una vez que lo realice, iniciará sesión automáticamente en ese dispos
 msgid "This verification link will expire in 10 minutes."
 msgstr "El enlace expirará después de 10 minutos."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3250,10 +3274,6 @@ msgstr "Progreso"
 msgid "Run Time"
 msgstr "Tiempo de ejecución"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Fecha de inicio"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3330,17 +3350,17 @@ msgstr "Introduce el nombre de usuario"
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
-msgstr "Introduce la dirección de correo electrónico"
+msgid "Enter Email"
+msgstr "Comprobar correo electrónico"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
-msgstr "Introduce la dirección de correo electrónico Kindle"
+msgid "Enter eReader Email"
+msgstr "Enviar al correo de Kindle"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Comprobar correo electrónico"
 
 #: cps/templates/user_table.html:137
@@ -3411,10 +3431,6 @@ msgstr "sincronizar estanterías seleccionadas con Kobo"
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "Mostrar selección leidos/no leidos"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Mostrar libros al azar"
-
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index b08c15301558accd995bd681b2530c8de279c388..8da2be5619d2c23016aa3548caf6a23dd71d5286 100644
GIT binary patch
delta 6835
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
M<0U0_-=anT1?*sj0ssI2

delta 8547
zcmZwL33!#&oyYO_lCVRNeGBjs2?5LkA#8DB4MG74tE|eK<R!V}=3cl<AX2>`Dy=-$
z>MN8|1<}~)fHR`kG7N)O$P_z@WmK#drF8)*t<MOxD%OSh{_cBFp!MP5bIy6+bI$+#
z&pGeqaqFSL{~Zk^|IjIOv&DZ81uQEY542P5yZ@H-w5(xNmtsENkLmZY6ZPMl`bTI}
zZ{5qX=HU>WkL$2GzKJdI1ZLnVY-3qT>kI|W`8Q*rx8ETPdBN&p?1x#@hhPUBgBoZm
zcE=f}-9`0FpaNZo?eP&*z`Kz@*7N*T%>34I^PoL%cj1AJ*Wd{3j}GSG24s=e&#?u*
zfLGy*sFl5i3glhP#Pir0zc%%bef))XLj`y><}trjNI?_M$Dw#9D%B}0#dmQe_U`Lv
zW;Pa3Ux0)09_)&HPyrl91^Ndhsn&VZ-npNj!D~<pD8-~+7*9bfU4rU(2Wp_L=-?i_
z8avs3<RdZN50%m-sQwXDMjpV9_!y4IXHg6K40RT+=4EZk;Qr*lgu*Bq)G>rQ3%8@T
z;$HLO4s1*P-!KpV6SXDpq2AA=qO;KvHL;C4BgLq#n1HOox)Di+RgL_y?#W5|srXlF
znqZId0BV5Wpay))wEr13;b*8l&mb+Wu`Ra3uBgoQHT99GOpQgox5zxNLIwQ&B!zAi
zHlZSX3>D!aWO3Ges1;-k@K0?kRO$wxQeTV;s0<b8Y}6K3p~krb6~H5?3HPB6-;1b>
zCtstWJ^27{z%!_U2Icx4N>LL`MYYdI9iAE-ju9M)j~ib?&Z~9K*nx)%qyTkDr{fH)
zKmtlydnjm6e}&4#X)MEUkTI-DJXA_opaQuQ70CTK1b3oRe*`n}4b%#cqqg)EDr4u6
zn`m7?{#e<AG!FYeiGmK>eAI`b7U$qb)QfMU2F&2DwZJUYL|swsy|6XrqWTw^_Gy^T
z7-|7Es4ZKEEz!f?%y0cn1^f?Ggs&spZk<K#Q5Tlk19MRW-GHrdK5BwnQ3J2S)_50c
z#XmCb4`XxcPoV<;B{H<NACns3B!xEk8D5V8zDC#LSX4l3Q2}g4P4F~otNshMr>~(7
z*Pl=meU2LMYgEQs<@<qmKy6_j>iv>@@~_i6kp>-_rKr@bMRnYOiuhjC#P^%$KgDL$
zcVZDXBC%V?(8dcm0qp|+3tEXfgxgW$J%<Y5PyzYZK(Ep;0FR+k{{?D*K80K<T!uRB
zDOBoDqm5@V3p)};G1@p3=b*OqE}V>yVkw@+QJBL^3S?1|f(E=5+hYxOz<Seu4|b-0
zKWd`KP5l|v)*Z&H@GVn6gUZyGsD90d`CHKw+fg5Y%Iq-Ip-+xBg&F3B3S$Jd=if(d
z$!6332rBYjs6BoP74Ux4hvp?z22Y_D)|#|vqE4vic{mU!Ah#=N1t}=?4`5r|i#OsS
z)WB`XyUs{2)QU<_0Zl=zs2r7<rKpvKP??OG`g+v3KR~_z5Gt^p*k1R47X__kU%J7v
znoucx702M)sJ-i2;!j+T8ejn`Fb8$&*P<p~j|%*L;|^4SPoV;Q9`)X@RoDH0or12@
zaqNiaunT64@FVYm%FqDR#8a^|&PII?mK*Ot_1}Ve?-!_vpEm6;piTWX)cBuZvMYsF
zBmIH;qE78dQ=g4G11nGiZ@_N288yI@ru`sloYzsQK7$J2Q`CyTL6T@S=jf|G1{K)2
zQRH8#n@NMVU><63mzjDEszVHw(%Uc>??oNLJ;q<6#@UYw;04sJID-07J7Jz@kM_Tm
zImiXEMvNx^iflOzoHuJ5>O=Aha)7P#s0oK~5HvwKDiiaKHJA>}crR+=ZKw%$qZafI
zYQ-l}3;G0g82_H6(1SutPMBV>jYX({Zoomf3e|BN>XW<^b%>tFJUoIL@NcLI1AM>r
zyfrG|?${j%qYn3Y?2XB36qL$p)C(cwUB-t|d-*IX1J9u*Xfo|Dqb4|p+QJX96P`m&
zlzE;1eio{KH|&Mkn4$YWih@>nEe^yg)Bu}ME7*?d!)EFSjYm-#Ie|*~Nz^!>;$s26
z_xzHPT<ahQpa{RjY`kWyKmHW#qx-*@g05EsF2wD)7|)|tI(M9(p(UuggW9SfYU|dZ
z&cFkx74Jj^v>Ua61E}_wQ2maf0{;NJBq{uvf(E*P8mPy3|6iwrPy<av-S;J^KvyCM
z+S-hI{}uE61nTgfGtaa61uLLF7qzu_qPA!oDx*(eQrBfag?@M#wMQSKBK^qJzeKGh
zFwt-CfC{89=HWzBuSMOa9~=K0zeoK%YQ+;L`Tf3!xzr<*$iEK5W*QXX9_)s{G4(&9
z&cf%YfZCM#0ro_#pda?f66}rhQU8vJVh#Qn2jds0m0vyC|93zkDx)(dlmCGf92)cm
z`vEGD?KlPZq7KgmY>q`Y`g=J7`7~H#Q5jr=x_)<|4%q{!t^0S>7X1o`;!zxk8eF#~
zFG)d%V+<<A6Hy&zp(b=tTT_iWxDf~7E^L8EQ4{|Td*TPE41SGTVV9}?dxNkg^&(Uz
zN168IWb<GKD)M=#iKD2LuE7j^2z9u&q9$y@T>M{DhCai=IFJn=gypCS8&F%d9<|~v
z*cX3+EHr7oNI?_5iHiIaREpY6^Y?NXD&m=_KyE>ui3(Jp2^@!OQJFhnJc7!=JI1r9
zz%!@&pZ1P8RQG>kx?ovx)QX-!rTAqWf@e|Jv-b=p#S(0XKS8a$5q0Q};Z68gyavZp
z(U#O<d)$c1#AYnUUD%rWtrIHXY0ScNs9Ryp^gH%OrED<j5KTd?tO0dc??Y|f6Bxlm
zsP~G?{Zn6w+KMn{Vm-FSwU|stMnPM!**tg}ucH1ODv;kA&!7U$oaG<NEYwyNq9&M!
zI;2Zcw`m=!{}#-{r%_w>dsIgMIE(yupm3fBo#s}v{grh<1#~s4eJr-Z$v6^cqB3v~
zY9-rn9R3_{z|*My1Lyb|nt<xR2(?v}rhWY!@~=bpQyMzr9@HKkLS^Pn(|*eMIV$C?
z=lUz?k6LjlYJ#Pxe#=cgZtAzA7P1MO;e)6%vN=g%0)>O9$TH{oE6l-h)EA;&+=g1|
zVN}LmLk;vk=HMw*W?IeX_X5Xa8E(QNd=(X7;Aa1twn1%WvV?+OxWO1ko&N1O0-NwU
z`~t7Vkqi8lL{S4YpbqT@?1B%X0{s{4jww{YFJotX8$030NXC;^Gk$Y**t%dF%tZ|}
z6g5y8s^cuwgf42}h;buoz#XW5&!BG0i>UEFM2&wAwFS)<`CHT)vvmKvQ_%Gphy^$i
zHSsF!inpUO;$boF!=d;WROYf5``?4<NRzb?709#L3;zc-{z>eIfhB%G{jr_ye=!AJ
zi?OJcmZ4U<5H(OGYK3c1*K8B&1LUCseH3-*o;3CS$UgzB!#ECGE%p0NMV*0Js1MsB
zOlrWpDQJTGjE`bB>M7K%cnS6CeFv4&cTuVQ3##8=Q7LYIi~oK%;~>0__EOY>R-=Bd
z*JBTS{1)=B6d#~L6TOByOeaz8pI~oneXIYYl8ZX+H(^g)g&JrRW@95NV+YOi-=X@S
zMZMQ<nSVBNQSVP$mh?L~G-xIDs4e&*YK4!WQq_psqNAvkzkz!G9_n=e3AMuWs1!GI
z{7-FLR6tkZV9Z5ja3<>gMM=|8g$f{o>ToAcz@MNdK90)FyLb(LjAO8Oh5u=thsD%y
z$G*4+Z9IzF;<Km>pGRf3O{Jfaq)kDmbPOsbb5W;y6)Mu5s1-hGJb=p35maj5HSJ%a
zu4TI_KkxyVOT8MEk^8VeZb9|mhXkCoj!;laFQ86wTh|}BC+ZN6Km|D6v{xH9p!)4V
z8+T(49>IS2F)GC!mivdZCu+-vp!y9%{r_j{dJ0<Mt*F#QP!r#cO5MZQ0vj<8cbod_
zm{0vUmSW3lzuyE@su!Zht2OoYn7+2Cz#hd;TJbIl`k*{l?ft#`y@8dfyL)^d@a+6y
zsoQ#WYUa(#?%6%&hO2_%YC9gWa|hK1!&M=-&IyK6cV|xzbO}~O-GZCl3Onw`;<j6$
zC*CW4TyJ51PHJf1%)qea!DyWm4@Sb~slD2X*&0&=HbfH9i|tNjWh4=f7kWec9Szh!
zV^0aR8DCWubz?EBtibzG|8Cxd{&t`A4D^rIyHSY82`y$PR#rK2x5``Azc8S8C#Blu
zY|RK1q#AQ?YvH|^pVd4bjE7wBSpMQ<ye1g4D<YBFQr5%pgJV{?6N{~mM613n*vlhP
zJHafxA_m87-gM(uxf|tCojor-;l--b6RSzYt0Jqzc4WB;FW+7na-EoKSB4_|y_(cT
zR$E?uL1ATKp;hibTOJIB>_{SRJGeaPhN@!yFFx~E<tJ%nG{UPIC0=7YcD)k{R@rk*
z8mFaq#V+%c<7dq~Q83(lqoAT)x|>N*YIxy|fgY8SaM-Pk+Y=dt{j(=Iai@Ynz12ld
zPB0daUbbHsQ=xQ)ojP~0_hnJf)JH|{2YNX5uI;ds={V-<1o$C%M}|F_line+7I&g-
z&9}*jx}k_uWv_IqT`y7m>!g#2*O2U(8zLl*i8ZGtvf8d>JF6qnhAZ3Ci_s1^ah;;e
z`h=Wtb%J59Y+sqE2nAy`>GN_~hbXZxiPWVJL(HF7OV@$AV(6$#$XaP4tfG0>t#rfj
zOM7!tg6<`qy~)F)&F#6tI@fz<c!^h5(x>-ar#fcMbz-&YzbJlpZ&Eu;S_X3cJ7m{z
zODbG9OeD-vA9OD6mTp^N>ah{I8U1dKMmTu$m{t2?lf`cj@<KOed9@|IrsT0{!OGh7
z#>Miig_m47u0c4GK6sJUZu&Y#-D<YqjhfeVnQh0vgWemX7X%u-P)X0M%ZK#x$0RdL
zN{5Y3JvHXj3~$S<(W%Dkhc@$`STv^1C0~mpV~YcQ%z^v%gAt51HP+NN?Ohp(#e?40
z<5qaToi!v?Jw7|&eY9vyYQuz^n|TkE4fl>u8sP0K8{&O4X=CdBvS-_RWwTc&osbiA
z!j3hqsj(p*Z)#l8)ENHmy2i|74qAvK#)l$dl{Ym8>w~<?JrC8pp<p=f*fFQBPR|`D
zoNq_CVKoi)O^x;no+LsmI84F%gf;Whc5Vv&yzDuBJbQL-{y%wU?&GDai^L+qxa$?o
zdAv)xu5vIGv{(A^5L-j))j2;5bZ)4rBLB?(?aiFvmCsvKSgT9fw3m1<%a~pJ-O@uL
z_u>UjHO-4Q8#0#<iW?3)w!%%+@|V`6&$PqRF3G#&l`PnM-NlU9iA0r4PdBW=!(p8V
z;=3X>CUPQGdQxW=WCW76!RQJOOmKyxj}xi2Zc=!>Q|n*m;6FTw2i+>RK2n#6#3TRE
z%Vn@D8&@PkwN5bhPbQffbK(is%R|RjERhx8Mc_p1na2$!t{g9vAUWyGgc7y<uEhz)
zdv9TG2QAHEL8illi(*+iXz7GB#GGKQw`x(5m%Dg~w{EfBNw+w7SysIri@z$K+tgU6
zfiB6m%@1LSx|>ex#f{dDC}n2~Q`?q&mEoPAHE8&>h7j*roXB{3IUM3dm{7GyZD%Ot
Wl-gHZ#r?Cd_qH#)&6~M+*#84~`^m2W

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index aaf99c6be..7decda49d 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -23,15 +23,17 @@ msgid "Statistics"
 msgstr "Tilastot"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Palvelin uudelleenkäynnistetty, ole hyvä ja päivitä sivu"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Palvelinta sammutetaan, ole hyvä ja sulje sivu"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
+msgid "Success! Database Reconnected"
 msgstr ""
 
 #: cps/admin.py:161
@@ -40,8 +42,8 @@ msgstr ""
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -279,16 +281,16 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Lisää uusi käyttäjä"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr ""
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -349,12 +351,13 @@ msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
 #: cps/admin.py:1445
@@ -477,6 +480,10 @@ msgstr "Ole hyvä ja täytä kaikki kentät!"
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Lisää uusi käyttäjä"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -667,15 +674,18 @@ msgid "Send to eReader"
 msgstr "Lähetä Kindleen"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Tämä sähköposti on lähetetty Calibre-Web:sta."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web testisähköposti"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Testi sähköposti"
 
 #: cps/helper.py:132
@@ -683,23 +693,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Aloita Calibre-Web:in käyttö"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Rekiströintisähköposti käyttäjälle: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Muunna %(orig)s muotoon %(format)s ja lähetä Kindleen"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "Lähetä %(format)s Kindleen"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Lähetä Kindleen"
 
 #: cps/helper.py:230
@@ -749,17 +759,16 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:644 cps/web.py:1416
-#, fuzzy
-msgid "Oops! An account already exists for this Email."
-msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr ""
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+msgid "Invalid Email address format"
 msgstr ""
 
 #: cps/helper.py:815
@@ -828,7 +837,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -950,7 +959,8 @@ msgid "Read Books"
 msgstr "Luetut kirjat"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Näytä luetut ja lukemattomat"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -967,7 +977,7 @@ msgid "Discover"
 msgstr "Löydä"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
@@ -977,7 +987,8 @@ msgid "Categories"
 msgstr "Kategoriat"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Näytä kategoriavalinta"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -987,7 +998,8 @@ msgid "Series"
 msgstr "Sarjat"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Näytä sarjavalinta"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -996,7 +1008,8 @@ msgid "Authors"
 msgstr "Kirjailijat"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Näytä kirjailijavalinta"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1005,7 +1018,8 @@ msgid "Publishers"
 msgstr "Julkaisijat"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Näytä julkaisijavalinta"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1015,7 +1029,8 @@ msgid "Languages"
 msgstr "Kielet"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Näytä keilivalinta"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1023,7 +1038,8 @@ msgid "Ratings"
 msgstr "Arvostelut"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Näytä arvosteluvalinta"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1031,7 +1047,8 @@ msgid "File formats"
 msgstr "Tiedotomuodot"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Näytä tiedostomuotovalinta"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1039,8 +1056,9 @@ msgid "Archived Books"
 msgstr ""
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
-msgstr ""
+#, fuzzy
+msgid "Show Archived Books"
+msgstr "Näytä viimeisimmät kirjat"
 
 #: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
@@ -1325,10 +1343,14 @@ msgstr "Arvostelulistaus"
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(kindlemail)s"
+msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1336,7 +1358,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Kirjan: %(res)s lähettämisessa tapahtui virhe"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Ole hyvä ja aseta Kindle sähköpostiosoite ensin..."
 
 #: cps/web.py:1226
@@ -1384,24 +1407,30 @@ msgstr ""
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)sn profiili"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Profiili päivitetty"
 
+#: cps/web.py:1416
+#, fuzzy
+msgid "Oops! An account already exists for this Email."
+msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Lähetä Kindleen"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1532,10 +1561,6 @@ msgstr "Poista"
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr ""
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr ""
@@ -1566,7 +1591,7 @@ msgid "From Email"
 msgstr "Lähettäjän sähköposti"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+msgid "Email Service"
 msgstr ""
 
 #: cps/templates/admin.html:91
@@ -1639,6 +1664,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1646,7 +1672,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1654,7 +1680,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1674,10 +1701,6 @@ msgstr ""
 msgid "View Logs"
 msgstr "Katsele lokitiedostoja"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Uudelleenyhdistä Calibre DB"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Uudellenkäynnistä Calibre-Web"
@@ -2534,15 +2557,16 @@ msgid "Email Account Type"
 msgstr ""
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+msgid "Standard Email Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr ""
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Tili"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
+msgid "Setup Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:24
@@ -2566,7 +2590,8 @@ msgid "Attachment Size Limit"
 msgstr ""
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Tallenna asetukset ja testaa sähköpostia"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3082,10 +3107,6 @@ msgstr "Kun teet näin, sinut kirjataan automaattisesti sisään tälle laitteel
 msgid "This verification link will expire in 10 minutes."
 msgstr "Linkki vanhenee 10 minuutissa."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3239,10 +3260,6 @@ msgstr "Edistyminen"
 msgid "Run Time"
 msgstr "Ajoaika"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Käynnistysaika"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3319,17 +3336,17 @@ msgstr "Valitse käyttäjänimi"
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
-msgstr "Sähköpostiosoitteesi"
+msgid "Enter Email"
+msgstr "Testi sähköposti"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
+msgid "Enter eReader Email"
 msgstr "Kindle"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Testi sähköposti"
 
 #: cps/templates/user_table.html:137
@@ -3393,10 +3410,6 @@ msgstr ""
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "Näytä sarjavalinta"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Näytä satunnaisia kirjoja"
-
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 1fe74e64c95d0387d446be5d5aa0ce1737ceb1d6..8f73f804463b67978443ae097a57135cd0bfc1cd 100644
GIT binary patch
delta 11550
zcmZwM2Y6LQ`p5B;MrffXK&Ur_5Nb#WF^~WWHL&zfh#)t~jYLu)2}BUMNLe}p2Sfn@
zm+mU<QWX#uX}Y3R8z3sWC?bluiirNdKjy6a?DPD6_VF___net`-goAp?!C<cv+V%y
zwQ7MYEdE;PZ&`J5N~n7O{p(5-%Zj6W6(g~7Q_E_B@u=rVV>O)W^p~KE{%hC@&pQ5&
zW$DK>v#cSQh(j&QYb~PDj)5E47V9^+tRNhQDL4{?@g)qvO;{7RVKg4Y^7u7Y!h2W|
z1Bg<4se*bg3N_vb_1uU@eXnKZ($InvQ4>vZoP&CB8CJ%ZQ332iJ--(f$Q!5(TtGed
z6>6S;qcY^z(y|(2eGI`)sOS4(9oDxpX;j2%SQ{5O4{XMA^bb1y<ERu~Mg{gMYKPxp
zHU`94Rxccbqi_%Q#_H68q*$Xd0vDnJ+K%2DG|tf=SnDQ+VOXqXg=2FpgWa$K_QonW
z995EBR0hVQc03OQaXD7U7oGlVs15E$7ru#_|9UL-*NeY0pc(~n(iCY+WXMWK1vVd(
za6c;bcTw;Cf^6OjXl+@XFDnkUfeajm<52;gL1p$cr~ex&fY5mIUynviym_EE>V+qr
zz8971RaghNVHBP~W#$%Y;=8EShP1IPE{fF(8{u%Qic?X)KZja)7rOBsFAXi&GQmkT
zYG=Js6A!~`ScL6xHfo|bu?l{Mp?DXyQ1D|MFbqd!E(4XZxu~<V7(;L+>V5Af8mi4c
z)I`Uf2R_6!`d^`HACqWVT`&n%s%fZ0v>6rP8ElVNQ1gXzmzBB3sK63X^Q2*A9E1eo
zwX$fCJ!?Ex$4#h1bPyZh5v-5bPzydprQSt4G-0%3JZj<;)Pns`rEp_UoR7-rMbvwD
zFp%}F2hM;_m?E!;I^E%@>lcB_OmkEUQ?VxYM5Wk`I(&;!nK^)Z?mB8iUt=wNh&8ZA
zvPpeQtgHLqkw$IIKrJ{CwZL>#23|ldZ~#^N&rul)B;T629P0gssM>bGFzn^%MwO@(
zwZZwQGqDoA`r#!SdSNH(Hk?GI@CJtCzfn7>(!oUD2vw2<)WU;NwJt;*-f5`!=b-{x
zjXG@GP$hcZ>A&59{41hQ7|_mdqH1&3dEj@)${kI_E>vb3Bmc8HI!;BE=n%HXbEv=r
zQ_RlmqXLRU1=<C*?!XkU+3^z$DDtVOi07hScpi1wwxVjg16$$;s6!i+YD&}&8`DpB
zoR0PAZ*e?<_33|sebApfs*Lyd($GK-DzZJOg^r^R%PrJ`{+;;@V=PADL{ui$pmwqc
z74R`^h8Iw0=6BR#Y{K2unTbPf^fA=D-cB@>x<XWqW+C4aYX$1TcTk7rGKSz4RAAp=
zUG(c}0<Mo5?~a;hBr2c+)cn)24z9pKxC_~+*9u}=da)(yfv%`SHQMnROs4-lDxmYI
zl3Ycdl^Ym{-#h+<dhS=$nF{J|=B<o6e9ch-CSwKN|K2n>FV=8W#4E8UZbMD<qci?H
zs%BNvoG%;dRwSSfTTfKrS*VgsLzQTO)8BxN=<h_`x=YxW^{tyUf-$0pS+FT8(l+=g
zBaWj{3r@jaxCDpc6;!}&_?t>H4fXzN)c4`<PX8^Ze-U*{Zllhh<@$>`T$!kdw_*ey
z#W?&NQ!$iPBXI~Sg_BSV%tyVq0rmVFn2NWtEXMRUnN39PyeF2!$9t219jYAXhY}2;
zKL=IQMc5RVp)zp@RiY2EJbr_GBCMZKXC%Il$v`10u!X3FHlfbg4pa$GVq3h@hy3f>
zh4nQHH^Nr*o1qpMfo0Hx6)+E#nWs@ZUWE#1H&(>Auo9j_ZR9%Y^nZmqBM(sDg|L36
z<ndk_S|Ay<<Ibpv)0_tepg;X|Y=w`bQoj&Y>z7bFdL5hL`xuK4(1k7fGbi@JBwT{}
z5WRz1&-)Dx?c@$t!r%dB!5XO38jh-YN7O`_7=xQoDZhwHWtD-ZR6Wr}zZf}})^gPQ
zSFr*5aru?O2;@8CwYt!teAXn?#3#{(KOxz&Y791~-h)->PeL84`RGC$HQ^rA1}<YK
z{1UZr^bj*|FKkJFGAaXGF-iCT6pcg%{D+#9B%u~a!4T}>^oOD{@&s1LS*V)7fR7Ft
zDu5l%??<pI{qv~6Z#ey*P|pVsV;<fAsx)-iqOdZ?q9#s7osB*iih~_<o!_T9E<m03
z7f|1kUC#JHRE<xf=6?ruh%cj_{~Wzq@Bs}iP+_=9nG2PHuBh=os4rV4M&ndeCN`la
zd>ggX%cy{FI{iDyx6SfPHyi7Tx&`T|4Hl=9f2DFd1B!e(YQZ(m1G`WuJ%Zu*F6#Mz
zp%!}J^!-PeQq@3>H$ny09JNp)KH3nfq<v5s$rwTYHIT!AYEps$I1St33{1j9r~rRP
zP4ovUwPiERJr6<6QyrDj2*)_o20EeU?~e*_gfs5;(olrsP!mjb9$0|7&&#ki9>&`E
zJvPJ&kDCc&P!qOw`YEXSdSVS6iYiS$DzjdU$K|LDc~8^OjxM57dlhTq502$Vnh7FM
z8Hh*iJlPpfMZG@|wet+r!ecQEXP`3h0xFO#=)!|YKwj%(=Z8C}i2O#G2}4jjtAWZu
zJxs#>*c2By?!{L0KXt79gvneAHeviJRK{#)d>=Na{~0#b{SO&!B1%NPFdVh;v#3<f
zb^3=;J2{T}wx363<U`b9x{iA97Ag~WQ6DCMx0$CAs-(lQCC<bs*0*-i&<;LuehAJq
z0VSYPHWYOz$Dqzg9;yVB9lfZ4X5n9OKI(&W2|MCf&hJrK=8xaz7|VD^)W6_bg)~&N
z4X9K9Ix6M&us%j-n?KjPV-)?TQ46j`?R+B!;0{#4KF1TNOnl(@FKj^nXH<YSJ>*{x
zH1U{-+M-gLi%Ru))bG<#sa=A)1uL;0?#4R!KI+tei?#4Ry0BV~nI|5#aA&8ViQ3@!
z9P+Q4Z)BhhzKeD7A}ZBCU^M=LgE9I^v(OY&pz~0td@1VrEvO9aMctxPsC)k@D$uVn
z5QD~;-^+WQMnlIW)XoQDS#)C%K84!xI1I+cSQej0O}GxV@J3Wg_F*+Vh6>;!>egIC
zmAY)MnaA6Jh8BoM)vzV%dc<K2jzmqk5VgaVs1L~|d~{Zv@q4I1{GT$<1!EcdVW?Wy
zMg88=u{E-u*Gi;OmLHN)JM4-|U8d8YjHP~jK(GVjRq{-LeKC>#WK?Z;qjr2ARl+aP
zh5q^GUuYtcPlT0@TJHen>;503QOH260`p%m)}a=<g5|I_KMuo2s2xo~m0%{e#08ju
z2T=jsL8aJ#oY_z~Hld%0-Eg!sz8S+<-+GINUicU*;SZ=<TH{UXtD(m0p%!R?N@WTv
zz^)jLeX$`<L}lbfRH+VPYdnk1(67h@)B?Q`3=E+WiKVF2uf|sBL!Is~P&>Yl)zGil
zq%ah#(65K#7=s(I2fFcFoQ!=-IKX%YW3kNylR3`>@~?<&1{BB<?1k4+J8Ch}q;N1Q
z^+i}2Ct+2bhYD;p>g;Sl1#%4a{3odI!RM&w9-!U}C^a9nuu}4`h0+*MiVLwVPQ!TI
zj|q4SyI{oA{3AGePz(G6m4P#;=RZdMAysLTx$ix327M3e!*$a!fV8MY^}RIoiS39A
zWF+eJ&c@pKH+11))XuM=GWH#|!SH8HDf*(uhhYrPaQeHP{uQjjc!eqEJJ1mIoVPcP
z-87y-)jVdZN!2K<KtBhS+9C|YB{%>#V-o&?buoULIeh(5J1fQ>Xk%}@g34G^GF}m5
zF+}&j1C8no^g<o3C$K&iIsK)`A7Iu-RH}ogn=?`iJJQd_$8ZDcy^nDS-bV%8?^$yT
zJg9Xhqt3u$tfKqB-g#gb4(5lGsG8TIaEf>Uw#DJ7lrP0pJc+t~!81+ZRk0@hMvm<<
zoc>@`fCWghtWDSeBWF4HzY7hW&U94D-AHPzeAJif8Pr0vFbWrAdEA5b@J-aUx{CUA
zSDJ15NvL_oqTZW?jd7jRKZ#zY=vx{M(f_aJI}n9RQBTyDD+4>>EL6=;VjTL-F@eWp
zB>iMmAWxunz66`%E2xZKM3t!gTyq$k&L#h<Nh$-{$zaq(Mc4tKcg8QGQg#<3u-ZJ6
z>Ncny_eO2tX^h6zs7xNmI`|%j;w`L&)_l_spHKajff#3?E2^K4%0MC3#%ED4uE8?6
z7q!zvn2xs{(-xSWy^LKMKY%WL=#1B2Xbxe5V^1#)9h#BY1Sep5T#KsRHq^D;kHPpa
zRO;`b7Km76Zb1%ed=vJ@4^Y21T5K|!>$nJ8Fun_)Lhm&is#VYD`2J%Ss{aWl<4@QW
z<Cd7)k%1%W??l~-N=r>m(@@tp2lYLego*e(Dv+~S7OO8a)<vH8T2VB*^Fv$ILSEFD
zY8&c)A4LW92P*a9wkeGZRqNKMvoQkWaWbk@+p!9sLcRYX>MY#FD6F)cZ0r8Fp%Kr(
zE2tN*VJ!ZPjj_oJvrs?GqhE>@@CK?R-(yAm1r=b>^Jcsvs+6Hv6&ql4jKgX;5<^+v
z8b?DD%*GM840TOz;}ER4(oB$vda(qx<2hIvx1es%e#c9wO#X<Ku-*%t18jj>X8=Bi
zqwvvx|6f6)KLcA)HM);l$p1xi8^Ta2YmUuufHOV?pQOJGGx1laKXR2h11C@=_#9pM
zBWm8z)ut5DtI2<R2D&hihSRYCPousAiEGS1xn!Wu$YLCdmry%w@shd6Ls7S9Eb2S3
z9J}Ct?28XjrTNQR^ZgirDoOEL@~;}sW}rGQLZ#|u48oJB7ypT=cmb7x&~;`9DHuXO
z0|#I(>a@Rsdd^yJ&QNo#MRy?9#j)tZxn3Gd{Wh$RzhXHIf7$%M-;t<Dvrx60fSO<i
zDg*1#g=bKy{RWlthZu^L{$}QjL}j!khT{N?LGM@^%D^hezd62w+SzWWe-s1gpT=bT
zC)UKW8_d~oVJ!Xb*aJ&ZB|VBA_1s3Y(KPHu{{<ufuXTflQeAzMIc(vmQ{4*vF$HyP
zI%7L5z^=FzwZLs0j0u}fiRPmMc?XrD-%z)x@fOpcg3<IhW0daySsMKqxQD~A>sIqU
zSc6*VeRN~kHuGUBMWuQ%sw6L?Qn?*l;Z;<MLtZfpM`Kg^Q&Ah(f^G3LjAVVQ_TSAZ
z?TFpzFTy~)fEDmV)ET&e<?-Jbhkmb`8popo>Vd(SfjZ1tsIyXvE?ka!ZZB%S)95Wr
z<6|0O_yv~3`=|*5UNeWOCMu97sGYTO?2EPOk8zxd5%kw$5FW)EcoJ30tEdfJM+I=}
zHS(`h|BwM4rn=kBHEDwb>GwgM=Ji+)cR9X??djh}rLx%$v$HHzKoe0LS&Eu>HR=rb
zP#Y+>(~L*%B>##qnE|DAp!35lbkSdfiu5olL+@cj{1P9X{#|Av7i!^VsLXXkWi}lv
zW2R#fmZ3ib>)<>u4NbHOtKwnQy?qY@@CJ^+o7fk->^3!ChFV}1sx%v%{ti^84qzl+
zMi>6-^y~P{{3)pSy@P2efRR`YC!h|^TnxcYn2J7B0QWE+yX-OlOjwFl=pRHKzPC~D
zoyV$p9hLICSRE_wH6?aon(lu)8cN->sGY1qrDiMY+PvlTzeAO({63TN2-Jeju>r<o
zMI3~Be>AF8Q&5L;9V#=&P#gRd+v)!QMnkE3Y`^(o1Zqd67>aXIHG2t(*xHEw@LTMJ
z?GKm?O+)?uCU(c*gXZ_XsKdGhWAI&k41dGUy8rR7n{WL@Y)O9~D#bTY3)gzXOxOU`
z&q0+cA9c#7qiQ)Hl>r;|+<H_AwqOf9h$HYT?0}sPk$*+%rO^gYq9S{M{jv376Ua;q
zqrV?@DBr~zcn(#vo2Uivp-S=q$6>$`Q}Yt+MSm{pxr?aGesYBT>l6Du12W-F^TK3Q
zV2iOcUcv@g>!>MJTTG?@IO;?55>~<us4wSkRDk<Yhw&^b6IZY%euuGG=9t&~Ih}aS
z)I1Y=@Ix_bCx=iIzlECM0xIQSqDpiJQ!(-%=8$Ehp8u=UUx9J-_oFiSHEQ8Mur9`W
zkDGs9?}K`96{?2+#02~Z>tp4&%%2T0_ze9Ltb^ZU6|8u|+?IN%vyq0{=?H9yMX115
zU}M~fDxLQo8ZH_iU?l#6^|0<q(@#R}d=x6B<FFCVL1pMw)ZyEM0eBcS&oR_}|I+E-
zM{T6uDf91;?J->Uzm$glP*{q=xCS-RMoh-7*a>eSFIbIFn;oa30vdoRI0kFuR@D2)
zQMEsXW$_X!GuN;T{(ynHkiXE-3lC8#@jGL77=q2{x5j83iS~ER>e(MPd(N-FFSmK?
zK;PL`$$`GqHXr)iv5C{|i-||=Ep1o%Cbo<8v-c$}@f&KVCC~JInf!*o9iGy_9+pyQ
zpGq0mE8m@)XLZxxU7fPB3MUklxCT!e=W&Jxd5R`_id=&{B_+89PZt0Gqpk_#vfU+~
zY+piZ>%fXpO$u_e#um8qJxz;!6T0s7w;QJ|^9A*Y4DfaDbtKpqJLtT>{bH;5GW`n2
z6-T)2?TL+=nr2sbi96F>>~VD~Dk>~Waz!=qsL`}I#xf6d%eQxSO!5Aw+p}PzJ1;le
zHKf>6r1e~dMXvtt;^NZ6qU`@X)4TA=+yYm3w&%&#jQO78V)v7T=1kc?&!ZKy3iHS1
zc}hGkcV3<=C)bmg{pX_26P|(+65)1DblWcuZ&2L?G{}?Z$ztcO%)-L4cG%F27&Wv`
zk*E02HPQ<w6uC@_bBkRCg(X_0u+)<sW6u~m-HseKz}_;<w%ZTyXV*<%>N}i%hKgm3
zva=o!_4RvvvcK<(QK$XNm<sqFjIQNZvB;A}Jdai__W5UB^|!zA^bhQ;Ab!ZH?HTBC
zXM2iNQ(_o2AuEebN4UBa7UbkIT9R8>;Dj^AUF^#AcnVy_Oc(RtNBeq8|IDPTl!x@Y
ztEA91>Cdgi*s(cH%Km3=yH`Q&|Eat^H0L?r4>>FSe7-SH1^DIL4f4kOUd@a0v%k&H
z40h6CzgDoxex~qPU_w&sHonwx_k(?tpME>Yw|3fr0DIz$TfSv8Yx&uyXT9sYF#9<_
z-~2iI{d{BR{TN_BT-4R)T|CLJS~hv6eA%ktgrXt}XRn>r!2W1aBRgerN8iuS{aD_Y
zyn1M$@8G&c<$a4@xgKD*d%BbDo*8F%n%B%OTr|{v_5Egc=A0(>?Om<x&AZa<{Ot?v
zYv;o4-RD}^_qV@jU)nLr_t%{@{p{@B2Yju3!~E@2d)NEc@B2r9Z~g1H{VVi$7rFC~
zZ!IAb-yerh`2`mp-=^yLB9GMyw7Z{3x4TU16Y@Vbv6s(IvAe&LX0JPuU>`i6XkR>W
i&bRMmO@H6R)BA&bADzA6XJ3AQmVN!)NA~yUXZ;_495Q?W

delta 13817
zcmaLb2Y6If`p5B`LWfXN2>nt5BoH9<PC{1@B7~|ULox{?lT4hMPy`)Rq$w&~K~Ydd
z1cHjnh$u!;voz5~>}y@ivX(_%byXDQ|NYImBKrJyeSG|!bMC#Tyyrb<kQ<zY@3tpI
z-fxn)-r}EK@s`yR{i&+`{!dkwW#v$P8r$Pn*cFqznD=wB3H8g|dO6zE*I;+t?fO2}
zrk=#dQ?MycwXBF$N?`yEf5HCvE7rh%*_Jg7hhQzd8WZpaY>KO}6W)t;@hB$YYgivY
z#uWS-^<Ir`rac?=-oRKrVp$hZ(124>9bM{Lf=Sea*buKpO<*nR{q?Ac+=Yrj6!qRA
zR6lQ^BKje=!(Xuhwk0fjzdN>Id}}xb&3G0z$9e7x%dsc*jaUa?blcxRh4M2@!f#M3
zjq71qMVN-;a52up!#Ey0vXAV76~eZ74@NYz=P0D%CrI?IpHXShnbDi!P^^j5u^wKI
zjc^`nYnGrQu?)5HO_+!~Fc}|o>(8PVdJt`Vr6>EZ0luX{A2#S^_9`7U(_CcomLD~-
z%{UNWz`j_cx7mupsPBg(+ihKhnYb9Wko$2OK82cSavu}vE`5l<8b;HgiOj-QxX^uJ
z1M2ysZv7}K<ey**{1!8?A+u40`k=OOFe=2;urn^g4!9K?<6-yt-y#$=@Xx4$Qu|q!
z2eVQ2TTmVEKpnr`sFl8g8t6T2f<NK_tj7`3z@t!GRDvnE5cS>~)C9I*9!B<1P-wqH
zWp!J6QF3)cWor*4YSvIxhauD+E<<&^7WLkC9D|Rca^wt-z}oDWj^B7xu7y#j;&x<0
z5$iDugK0R7>Ns(b32|f8Ol?$$J+UDUMGZIsNdxOrOvYPLNw*E#U?n!kqu3fhK}{fm
z!4%PsSda0o>{x;Dp#~U*8h8q7?@I6jycN~q+o%cs2Q^^a5L2&-T0j%jsc3^bww+Ls
z%0WeTG&aSF*j4Ahgo3j5HdLsdLA`hqwX&};9TSF{W7-n66}_+}jzmq&gBoxNYJlaa
zWW5`;6%V=fe`6YTU9S;^swsum*bg<4si-7cidx}T)C6{53w#!}1@B@ie(q}Jnj}j@
zMIsXw$-dYO$D$TA2ep9txx`-sub@FI*p8a<bEqtT8P&l%r~yx*KKvQARrN_>)mx$l
z%tl3EAZm+7y3g}nJ*XrPq9U{~FG505xRnNZ9JN<T!_C#(9yRl+sN++Pn$Y#AiLOTt
zybW97qo|1=M@{%`)cc>JlI|ze7RRw4*_aujpe&w-ZSY3yh!42Fg6jCRYtxZttNP$X
z+6z!yunjN5{iuo69%Tk<irVX8r~#)U|60rVPX<O_prBBEjao_V(PqY}m_@x4DkmnP
zl5z<q;ti;ku10md9u>K2)Rw%3T#nXfsI6!-#)Q5LHlUt^Oe|szqo6FFik&cI9$0sw
zX1E7C;#;VW&!R%wXsj8q9V#jN;bfeQop1+g<;UIUCs8>Te}S<T4$}GWPeCgQV@-^p
zX1pA=(si!4qu$$ub#Mo2;73u(_!4S@@1ef`5|vXwp(Z@wLUWIdL-n&B8#BJOg@X2Q
z4{Gm@ppMC#sO0+sHS-$dOfJ}{ts08jx^Zs35IayWM<wfe<W{$KVlDg->*8mq34ezX
ztsrr{S&5ArcrfzJ%ExKA30Z{o9crtFl4<JT64bpg&#f<W>$hP~+8;s=l=XKcy{vW<
z%!KD+Tk1<E5dRzsTWQF}*RVaNlG+O80Mq~%qE=dndVewI;zL*)zeI)j2h_^z<eM#O
zi4CZCM78(E8aM{EwHM_R|4a&#Xiy}UpgOt(6{=mx?Q8ADLHI2y0^Kh*6C00psC!Y#
z7C>#~a#ZLyVG_QM8u%0Jj-R9YZyuRsk}d=5(a;qYn*OL2&&0+U#QL}l)!|xHhg(p`
zZaXSho<iLhucP+-TU1j2j9oCEBchdeLrpx=i-KMpg7G*CHN&yk2p6JOyb86l?U;pC
z*aQEGHl`Qw$1fa!191uJYTt(%@D0?0-a#$kTV%Y56+gvfZ4K1kXQ4WpfZcE{D)i4H
zi?GgMFPu1)ckp^l##c}iK8ebSAJ9f+uxyKp>~Pcsico+4v_cf}XxNULz^AB{)t_!|
zwjrpM%ya9jQMvL2a=BTrp;p{t2A2>{MXmT|)I=Oq5^lnVxXW$dj~#UWt0`y&pQ85o
z3~F!c%rrAiMm=wb%7wnDm5z1mGf?l(L%mmlO0HF?0dGU~yA72Kk75cwfe{s6a$oq!
z^(#!L{R}EMQZF$bv_h>c3pGG@RMHMay+0Z?;N_@(1K1pwx%GQc5q=C6nYS(>{(A94
z_r>qABlX6YnmfEdcA!2RHP8*H2&_e|<UY5)3&&8eLQNp?GIJVIP%H0-ip(I?f+nKI
zopu@V*9(3cloX4w8LmWquoX4X<8J+F)Lx!&+dn`}>?Eq6Z%`{ci+Zp2EEB0TRJ|=~
ztGZ(X4v0_~Kw$_D#097s?m>059~JUy)WnXU&izNI4nIY$_<Prymz#y8p$5u8Eug#G
z-WN5|QK;`DliU|(qt0~+_QZ9ly*r5Q@b9P&6K0zZ8=&ebs193W8g@Z#(Qs6V3$PdZ
zP?6e<+R{p7ff4JkZo`|Xke|V(*vMn-jOs8K6`4t>h|F}`FGoe{N>n7SLQP~frsBP*
zt=)&}=MdWX7N+R@pQfOJljfKY+My=UA6sC)Tlb@~d>N{v&8UGMMy>Ra+x`w};8Um-
zCls0qHbiYjIx50#a3JGblPF~38rOZ;o%)Bajf>3I<Y8yp{n!rIyX{Y47wR9Q`f2Dj
zD;$7&e<o_+>rq>=+O0o>5ryU;g&O!8>Ri8#3iUtS`YBWgKcYf>7TaROV)I9|9L%OZ
z4Q;#u6`}2zfKQ;3tqK$I1=r)n#J>g&uhF1Ty^R;*Nz@IOQ)2!IH5~Qcwb%q#pswgU
zQ7bxz+KRKN)08&Xgg76ws9%q*aX04ROPGOY=MsN)oZ&Mo?}D0fU(^Z)x{gP!e3ok&
zwxNCvYNB_$?GK|Sb^vSP*Qf~p=svG?g^6TS)ahy+q0oxL093L~Lmj6OD%qBzjT=!N
z?MDrK)UAJpN~RyNGj^G01}MOm)GtAWej#?k<ye5bQR74s{AQ+&P$5i5eb5~hfgz~V
zFcIru32LHOx~@U(X(j5t-L8jR-$zaSd#sH$N=?L*kcD&qQ&6aSqFxw?>Tm>V0%Nf*
z&P46K7d4TEn2Fb+CjKC*pK8>W9z%ur1ZqqFg<bG#?1nAN6fyRH9EFZFgi!<Bg$-~w
z>ReZ$lIn!pUN2xK*bMbvYpjV~QMu5|eLm9l0@MU1ptfidYN3m<72{jWC@6GW)qwkP
zK^!*}4xyfZrJ4E7*iX+<Iq(f?!cBr^uQSl5J{<dCA@Z|eZA1<DBeHlaF2qkW1~4+1
z!Uq&IP|L6h?M$3Ty$H3kDvX5|v#B3L4R9KpVD}2M1;bGbn1Nd90vv@~-1d{0N<DGD
zdB6F5;-5rA4h@Yl7q!=uQ0<qY2JoYDB7)lcWvFbv8Fdprj*7_NFa=LzPfS|i-khij
z`LQjo$M(2y0r782;T;;f<F}|8wqM9(Z~$uMSD_|y9V(RTF?Q}zKg$o}eRvc-Sh|RB
z@HlcZtqZB>Uf7F@;7QEFl*nQ;qhUCX1`ldw51~T&I%*5P#fJD3DpGZqn2EJSz1IOX
zk>RNKFU52$L@i(m>bqr_gBwueM2=8UsK3Vkcoub~_P^Tfu^&fJ--?&wNt}Trt}z2`
zMnz&9>bt!-5I@5f*ntRNhq>4st6ks6Hah>ODYWK6v!!N6{jnwW*{Bb$MjP)yMc_$P
z=#FA<{0_Axnb(^3p4g50Wp4c@x4sY4Xg`U%H-3q=Gk7Pa$4soLxCiH>av}426S^6w
zz4Kr_T!*djZd9&R;l=n0YULf4nFU;q?Wiw7y?+mCoTqUtzK7!(-|BdS31tZDQ@;uu
z;0hdq>oFN$MJ3@sQ4#yetv6fFU#U^=irR`>P`R`PhvL7mFLqgBB0LB6{c4O%p-@Rd
zD>;igKB+6sfLW-d8H(ySANAaW1vnr3;4!R;ajQ%Y)kcLl54A<}Fc-IA9sCfrkS|uT
z|2lrZ(je1Tn=I~zn(<h?8Y8IC{eqfks~gSM^g?aPAXLQ0U~Qa&8fX?~;9RVWH>0*<
zBWg?c-AMeqQ25ksNV&;$Gz#_MWbBBG-1-*O1P-D0_FZg`XHk)Azs6iNeNYjbg;Owq
z+QNgV_y2}@_)CO>_ITLMCV8$#ozEw*7JiQU;2YG8({3>l8iSeCJ*X|X5w)k!p|bq%
zsFnVJid^cg=AP+;iu5$p!Xp6+TFG7537^4wcoKDfzd`MJ(pqz&v`5tkqaty!TQ70z
zORzER>rlsc8|orDfXb1#um^sC+#?aI(K>UXT!EVTUvMP8gErcZY0pE2aJs7>wUVXS
z8Sg;t@pIS!U&QYCHY$>JZ!?i?g6e-H4rP36mHXfbj_1Ko?h9kqo6z6n`UrOA`D=Iu
z#%(ZL;l~Bkm%H^}aS-+N+szggU;*`O@G^WAb<^hD!Im+;bp?ecxC(XiZNh%|Bx<Jr
zMrC#1jmBZ9_s8OByabgCTQLn^M4kJOu^G0z(}aF7Hl{uTwbfHF_V@o+Q|Lv*W=zKu
zs183zWq-<DCYuMLIvkHJuo!hpuEPr4iR!2ICezO()Lzd+^|J{za5ehzi%rB|$u@nn
z*`p$?Pu-77mPKy+Qq<nAM6JL<W$*o{NSweF`~>y=X`G2Q?>48xgHxz4MScGU>bp<x
zCjL4eKhw|<Tij!gO&8Y-P?0D>&3r8;;gi?_kDvxTg?;fSRL416xGixcYU|dc+V93x
zd=wSA!x0Ku6i%TYq~FV6*bQ~3Z*c3Uu_blSR<jk?piTW2RL75C3#`V$_yLZ=miJj!
z85W`Lkyo)N{(#DzNY*xf`6yh8TImr~D8E4+t6KM)`=JMppgtKV;O(d_I*D!Z6e_e0
zx0|hOi^<e8u>%gl8aM}Q;#|zt`43P~1Rg=H;2qTY{Q)n=8avD>n1*_96L!SIsAT;T
z6`5K)O+-4NLO%*y;|8pQdvO>ZKuz>4*4O!OTxmLJjf%h^w9$(S?Q(2{8&Q$jg>~=%
zDx^nIr{WZL!&<vc1p2xT#nH5ncI#_U3tX={<6HMpNWceh5I&4e@e9nrga^zq%EYnM
zXW|&V4~ObK)QYnnG{5_cQ4=|g3i<b_+&Y6w@+J?Nzv^v=kuEf3P#Az0<4C*_HNeYQ
zfa$x<{|}U+&i6s|;Azx_bIHRdQbDXw{RSM4>#!TXj@>cw5fiE2s0(hwBg9|laybo|
z_%3Q9H6JxsWG*Vii*O=tMn&Wl=40|6lZ-_;ih2|i@if-MU$HUPjhYFz#JbeGV-60C
z5`XQf-+kd)tVR7cOvX*9<az{cd<mQ2m#B{89y8}V85QD|SO<GzG7iQ@n2(x}2bC+O
zt}7xGn$vKvYZdA^y@}ep)2I-i#du8HYgW(<HGvMOEboiTnJK7KQHq^#xm(|jlc*m?
zO{n?f=Aw&qaSIn<e;$;eE|4v5{XNu*)ApH(W};R&5;foioPx!ul~uXzZ(thrFHxbc
z@q~H5AKKI>A`6IE<rGqBxDMOl9oQ6~LJjmPDnjp}Li!`t#`;g1Y)*B}z?!u8LER&R
zQT<FuMXDTA@H*6KyB%lh{NF`k0uA4z_I}iUGr&ctJ)4R{aE{x)1zS<CL?!28wDAkK
zUjHdGP!H5ZN1-M%0Tsz&R8B3z20H&6DCFWc)I|P)y|8zc`9tDd)Sm4^P4FpffYqp#
zoxo=JF)Bj8U^+H_+8pC7Y)(Ch+KM%(g&n|1ZwkjKv_R__a|~Oe>Z4J6I0v;Ai%=7|
z9^2rJsPp~+>is8BTlg9(iGRRW*zAB=aX%bDy#N)tn-36wy|9M{8(&79?|-8%j;7C=
z_R*-0ORy!bMrHR7)C7;C+E1bePI%5lECaRYeNnkF4#(gm)O~X2a}g8b&uPe|q3iSJ
zg;La=y%+QF3=YPj)n;Ogu`l&qI2=F3Vc6j>=Kt@DP+PbTHSi%+e=oW9l!GQ0T0|%)
zwB1lQQ-4&_j6j8UJgS2ksJ)(zT``E-x_eMJ;cKV?GY*;4Gy@Z;2T&0Tq4s<=*2E2{
zt&D7@pyawA%kgnk5_LLkeoO{oP3kL9p}ZMK;(e~4qTbIwVpf=kipWaToqr75;Lq3|
zTO2i!9)>k^{+Cin;=yuE#Pz5d--*idM^P(3fI3Deum^sIS=jsqvw%@Jmiknzh4-NP
z-GTc4ajb(!P?35Cb9Me}9y3WZ2K9l@tuMqJ>UW|ps25QKe}qc5<QL8VFZ4jYcQw|>
zhp`V<VQc&bM`7ca_&YzGhB_^;Vk5@4zM_zc)?ZChWT93%1l!>hOu~iO5m#Ub+>Q0{
zRkZN~REVwP=Gb*W)rX@ZP>hP~Le%%SU__yMj6!X!LM6>X)Q3k=dwa^Q$GvP;lz{_j
zABnnnB3KtUqWas0TF`^2{@%br_%`Y^rJXQ2F#QDaS2As+K^?u1jqpd*OzXU2j+KqN
z!Dgd6T#OAcf|~dmY=Rq5$y$lZrAJWj@5R3OBr0NGqatwTl_n;M+P-Qol=0{!Wwvro
zcfKXAJi02gXQGonDJS}5_K-y9shnoc5Kn`;^L%ARes8JA=Z}7s^Fe%yZ%)vgJ<U7E
z4tqmk+ncQ?&I`SlITufA=Zx?3e7(uu;Cye;E?89Vb!ztAnp5lxmU_azK$-ipy}%Q)
zL*B9?I~=eV1uBBSwR;K+0~KZAZqaRhJH<7x@E6%-fw1ill=#X9+8Lcoy`hk&#G4s%
zj`VZl<~x`6zrL9#?3v>Ud2Men7zpa6SRpgiE&5*nr{f!4#N2Gn$5-gJMrB{*Y??GI
zxh*A4+RiH~3eqQ4=h4Aw&c;D@EAt>^RuJ-r!@jbTkX=z;<OzF=oPC3?j5F^J9XvDo
zkHI|>lR9N|F7p-6EAx~xu};ypd5^^N%83!{M(3H;*i*ehU$L*yL|}47VIe~nSNN?l
zW)ALK3w+_Z_Qbr3@Z6q%_#%4g$gG4E6J^_DCTtf6h-h@lm?O0^7uflpP-sCQSoHsd
zH8z6#Q8aJj>+#8xy?$>YOR?t!0`u&!FYNa^H%-2zNqDX=6l+rq2?{|@Em+#g?V0iH
z3WCBjkr}di#T&NrJxrQSbQ<(dccKNoa=bxJjhNY?xfS7}z=AS6P|RK{A-dY-ey{eb
z&>!Hx3rMTL0_T&0^>N*tg;VnDnTOu8us7&To7`@8zG*1-`TcgFB5ZrG*yr^Zh1y!~
zGqW!yhsuKiURA%$$z#v=_<coey~(n1u^hJlu<y><DZQK@rp&1y`^??q=#;51#bp-;
z%E}0nJ%Ucic6+3oX4WL{Z;wLfHqvP`-P6_=3J3p?<G+PW@l<j|ubO^ae7a}8*Y+@_
z*t`mKe$14j^)GoLE<bi`h-}ysWQ)$lE9mtHJVkanxo=H&Q&NSBa{G@t#IYjBe@l69
zF#7JL>2VQHuyC$#zPsfiYx3N{0^38Lv8SO}HgGacD>>>d2?Q7Yxjh!3Sk8rYaFs#l
zzVUm?N-CJypWDkT=J<V~x!&N|KR*c)fIw+1+1%MEayn*z>N@CU)rwX{nTpPrm!&r%
zm3-dw-rO_mz4#h-fv?o-yg7TSv)|L&sXb>+bk&^u;xgPrGncT;@p{YXzAS9d_j!KX
zR$XG<q8*FM6XLlUZZEkq-JTp~JP&8djiY;pqlt4f<C;$k21x8FOhFrJ6Tjb%p3~J=
z=zQ#Hn)b)rz?xw$Hz%$jxsA?A&|5;Hc!TbP^N**q!FPY$BIiR-vp-!a&cG|4PwYJ~
zr~jULr)xQ@x93Gq2Vbb+{PU^t=ikf+7FH!Bk6<{$<F|{v=5j9bI%P|KbdGJ$i56d-
z9@m)T5$0Cb^VpfJaIU=OZ6~j4XmniUmN;koj?U4ym+p&m&TP+$uD$Nt1g?wN)oF7t
z$9lHLd!3~#Q=Gv&a-CcZuI!LFf|PXP9!PaIFYn@9u_D8HdS%n-q2-I?qOY&~rf&Xt
z&SG`tc~@Xj1>KdFhrMq02CFM8LLr~m8gYIrC#CRDADY`SddQiU*m|^Xz_1qL|7ht(
zPwXD&W^tz(O}^vyx=y5OOmx@Qzb81SR@ZXI?YzNBt=u?#yw@(}M}-f|xi@2>P!APh
zAL&Z|^J{eOlJnTrmEr12n;H7bd|@BAL8!XYd8qQLetE%Q^)9-pa0AJ2SXpfNP*=Ou
z8!Yr`gko=yvhDX!D&zH_H`;MmdYtp!j(q2@JG!?oC34&@)m!W<lqmB9s+oJtj;+6<
zOo44^yVqCjPV;tihCJ|Oll<6qXP0tqyWdCu^T71@dgpE^Zqa8Cq}abD`|np53yO8F
z8?1V#Gj8|RzP~39q41T33WL7#*bjEO=Jn_JoV(IK-+eG)$Yf8&d~XS7Ml0oL608zG
z7edJPhGSW%cDnVJ%?}V2#o9zlnHt@_=gatrvP^*wdW)(nOFe|P^1LVpJ;gy!^=>Y)
zSSVxHV7@2lDXrc~yh5Z+S+TFA!o7a~oL!_EXVqkT@LYoM%M}bW$)G|JeQfXkxOwK9
ztgZ}M7X`}bI5rsD?cR2z3olnFLH@@J+@LH!pgYRSE9O_93sC!iUOz?NkaO+Y)Di!E
zl-QN({U4)LR~Gp+5$FBKTMzl~!;rmXOhxQx>AY1{#CE1EP?qhlaHj8TWB>P=Fm09+
zt=N~ISWEjt#GF-6UFICB>f`i$`b4AO^Tu2_(fDW5<Fn62nV(^EfVB6E$h#tMc?AjU
z{;Zn&x9PL{YovOwB6s*Mb}gJc#m^o5IL=wJBg@%#c$xD{RcoCwF6gj*Wrf!sXn(Zy
gj`RQUMP@n2caC;m-r39<cI0{I=PLe`cy!tS0pn*h-~a#s

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index d3a493ba8..b81acddaa 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -38,16 +38,18 @@ msgid "Statistics"
 msgstr "Statistiques"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Reconnecté avec succès"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -55,8 +57,8 @@ msgstr "Commande inconnue"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Le livre a été mis en file de traitement avec succès pour un envoi vers %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Le livre a été mis en file de traitement avec succès pour un envoi vers %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -295,8 +297,8 @@ msgstr "Le filtre utilisateur de membre LDAP a des parenthèses non appariées"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuillez entrer le chemin correct"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "Ajouter un nouvel utilisateur"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -304,8 +306,8 @@ msgid "Edit Email Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "La vérification du compte Gmail réussie"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -365,12 +367,13 @@ msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
 #: cps/admin.py:1445
@@ -495,6 +498,10 @@ msgstr "Veuillez compléter tous les champs !"
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Ajouter un nouvel utilisateur"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -685,15 +692,18 @@ msgid "Send to eReader"
 msgstr "Envoyer vers Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Ce courriel a été envoyé depuis Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Courriel de test de Calibre-Web"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Courriel de test"
 
 #: cps/helper.py:132
@@ -701,23 +711,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Bien démarrer avec Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Courriel d’inscription pour l’utilisateur : %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Convertir de %(orig)s vers %(format)s et envoyer au Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "Envoyer %(format)s vers le Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Envoyer vers Kindle"
 
 #: cps/helper.py:230
@@ -767,17 +777,17 @@ msgstr ""
 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:644 cps/web.py:1416
-#, fuzzy
-msgid "Oops! An account already exists for this Email."
-msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Cet utilisateur est déjà pris"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Format de l’adresse courriel invalide"
 
 #: cps/helper.py:815
@@ -848,7 +858,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -970,7 +980,8 @@ msgid "Read Books"
 msgstr "Livres lus"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Montrer lus et non-lus"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -987,7 +998,7 @@ msgid "Discover"
 msgstr "Découvrir"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
@@ -997,7 +1008,8 @@ msgid "Categories"
 msgstr "Catégories"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Montrer la sélection par catégories"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -1007,7 +1019,8 @@ msgid "Series"
 msgstr "Séries"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Montrer la sélection par séries"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -1016,7 +1029,8 @@ msgid "Authors"
 msgstr "Auteurs"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Montrer la sélection par auteur"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1025,7 +1039,8 @@ msgid "Publishers"
 msgstr "Éditeurs"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Montrer la sélection par éditeur"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1035,7 +1050,8 @@ msgid "Languages"
 msgstr "Langues"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Montrer la sélection par langue"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1043,7 +1059,8 @@ msgid "Ratings"
 msgstr "Notes"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Afficher la sélection des évaluations"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1051,7 +1068,8 @@ msgid "File formats"
 msgstr "Formats de fichier"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Afficher la sélection des formats de fichiers"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1059,7 +1077,8 @@ msgid "Archived Books"
 msgstr "Livres archivés"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Afficher les livres archivés"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1345,10 +1364,14 @@ msgstr "Liste des évaluations"
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Veuillez configurer les paramètres SMTP au préalable..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Le livre a été mis en file de traitement avec succès pour un envoi vers %(kindlemail)s"
+msgstr "Le livre a été mis en file de traitement avec succès pour un envoi vers %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1356,7 +1379,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Il y a eu une erreur en envoyant ce livre : %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Veuillez mettre à jour votre profil avec une adresse de courriel Kindle valide."
 
 #: cps/web.py:1226
@@ -1404,24 +1428,30 @@ msgstr "Le nouveau mot de passe a été envoyé vers votre adresse de courriel"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Profil de %(name)s"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Profil mis à jour"
 
+#: cps/web.py:1416
+#, fuzzy
+msgid "Oops! An account already exists for this Email."
+msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Aucun fichier gmail.json avec information OAuth valide trouvé"
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Envoyer vers Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1552,10 +1582,6 @@ msgstr "Supprimer"
 msgid "Public Shelf"
 msgstr "Étagère publique"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Ajouter un nouvel utilisateur"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Importer des utilisateurs LDAP"
@@ -1586,7 +1612,8 @@ msgid "From Email"
 msgstr "Expéditeur des courriels"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "Service courriel"
 
 #: cps/templates/admin.html:91
@@ -1659,6 +1686,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1666,7 +1694,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1674,7 +1702,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1694,10 +1723,6 @@ msgstr "Télécharger le package de débogage"
 msgid "View Logs"
 msgstr "Afficher les fichiers journaux"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Reconnecter la base de données Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Redémarrer Calibre-Web"
@@ -2555,16 +2580,18 @@ msgid "Email Account Type"
 msgstr "Choisissez le type de serveur"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Utilisez le compte courriel standard"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Compte Gmail avec vérification OAuth2"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Choisissez le type de serveur"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Configuration du compte Gmail comme serveur courriel"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2587,7 +2614,8 @@ msgid "Attachment Size Limit"
 msgstr "Limite de la taille de la pièce jointe"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Sauvegarder les réglages et tester l’envoi d’un courriel"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3105,10 +3133,6 @@ msgstr "Une fois fait, vous serez automatiquement connecté à cet appareil."
 msgid "This verification link will expire in 10 minutes."
 msgstr "Le lien expirera après 10 minutes."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3262,10 +3286,6 @@ msgstr "Avancement"
 msgid "Run Time"
 msgstr "Durée"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Démarrage"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3342,17 +3362,17 @@ msgstr "Choisissez un nom d'utilisateur"
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
-msgstr "Votre adresse de courriel"
+msgid "Enter Email"
+msgstr "Courriel de test"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
+msgid "Enter eReader Email"
 msgstr "Envoyer vers une adresse de courriel Kindle"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Courriel de test"
 
 #: cps/templates/user_table.html:137
@@ -3423,10 +3443,6 @@ msgstr "Synchroniser les étagères sélectionnées avec Kobo"
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "Montrer la sélection par séries"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Montrer des livres au hasard"
-
diff --git a/cps/translations/gl/LC_MESSAGES/messages.mo b/cps/translations/gl/LC_MESSAGES/messages.mo
index 1e5909847872130fad1c36b3edef83e4a795bdde..4398de825d8f7d16f095d3721c6c0abf83f130a4 100644
GIT binary patch
delta 13320
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
F{{^AOrz!vd

delta 15903
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

diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po
index 119d43a62..4dd1b3a92 100644
--- a/cps/translations/gl/LC_MESSAGES/messages.po
+++ b/cps/translations/gl/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2022-08-11 16:46+0200\n"
 "Last-Translator: pollitor <pollitor@gmx.com>\n"
 "Language: gl\n"
@@ -21,16 +21,18 @@ msgid "Statistics"
 msgstr "Estatísticas"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Servidor reiniciado. Por favor, recargue a páxina"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "O servidor estase apagando. Por favor, peche a xanela"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Reconexión correcta"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -38,8 +40,8 @@ msgstr "Orde descoñecida"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Libro posto na cola de envío a %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Libro posto na cola de envío a %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -272,17 +274,17 @@ msgstr "O filtro de LDAP \"Member User\" ten parénteses que non casan"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "As localizacións do certificado da CA do LDAP, do certificado ou da chave non válidos. Por favor introduce a ruta correcta"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Engadir un usuario novo"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "Engadir novo usuario"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "Cambiar os parámetros do correo"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "Verificación da conta de Gmail exitosa"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -342,12 +344,13 @@ msgid "Edit User %(nick)s"
 msgstr "Editar o Usuario %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Reiniciada a contrasinal para o usuario %(user)s"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Configura primeiro os parámetros do servidor SMTP..."
 
 #: cps/admin.py:1445
@@ -468,6 +471,10 @@ msgstr "Por favor, cubra todos os campos!"
 msgid "E-mail is not from valid domain"
 msgstr "O correo electrónico non ven dun dominio válido"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Engadir un usuario novo"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -656,15 +663,18 @@ msgid "Send to eReader"
 msgstr "Enviar ao Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Este correo electrónico enviouse empregando Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Correo de proba de Calibre-Web"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Comprobar correo electrónico"
 
 #: cps/helper.py:132
@@ -672,23 +682,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Primeiros pasos con Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Correo electrónico de rexistro para o usuario: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Convertir %(orig)s a %(format)s e enviar ao Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, python-format
-msgid "Send %(format)s to E-Reader"
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader"
 msgstr "Enviado %(format)s ao Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
-#, python-format
-msgid "%(book)s send to E-Reader"
+#: cps/helper.py:225
+#, fuzzy, python-format
+msgid "%(book)s send to eReader"
 msgstr "Enviar ao Kindle %(book)s"
 
 #: cps/helper.py:230
@@ -738,16 +748,17 @@ msgstr "Erro ao renomear o ficheiro na ruta: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "A ruta %(path)s do libro non se atopou en Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "Atopada unha conta existente para ese enderezo de correo electrónico"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Este nome de usuario xa está en uso"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Enderezo de correo non válido"
 
 #: cps/helper.py:815
@@ -816,7 +827,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Rexistrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Iniciou sesión como : '%(nickname)s'"
@@ -938,7 +949,8 @@ msgid "Read Books"
 msgstr "Libros lidos"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Mostrar lidos e non lidos"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -955,7 +967,7 @@ msgid "Discover"
 msgstr "Descubrir"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Mostrar libros ao chou"
 
@@ -965,7 +977,8 @@ msgid "Categories"
 msgstr "Categorías"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -975,7 +988,8 @@ msgid "Series"
 msgstr "Series"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Mostrar selección de series"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -984,7 +998,8 @@ msgid "Authors"
 msgstr "Autores"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -993,7 +1008,8 @@ msgid "Publishers"
 msgstr "Editores"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1003,7 +1019,8 @@ msgid "Languages"
 msgstr "Linguas"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Mostrar selección de linguas"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1011,7 +1028,8 @@ msgid "Ratings"
 msgstr "Valoracións"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Mostrar selección de valoracións"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1019,7 +1037,8 @@ msgid "File formats"
 msgstr "Formatos de arquivo"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Mostrar selección de formatos de arquivo"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1027,7 +1046,8 @@ msgid "Archived Books"
 msgstr "Libros arquivados"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Mostrar libros arquivados"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1310,10 +1330,14 @@ msgstr "Lista de valoracións"
 msgid "File formats list"
 msgstr "Lista de formatos"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Configura primeiro os parámetros do servidor SMTP..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Libro posto na cola de envío a %(kindlemail)s"
+msgstr "Libro posto na cola de envío a %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1321,7 +1345,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Oh, oh! Houbo un erro no envío do libro: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Por favor actualiza o teu perfil co enderezo de correo do teu kindle..."
 
 #: cps/web.py:1226
@@ -1369,24 +1394,29 @@ msgstr "Unha nova contrasinal enviouse ao seu enderezo de correo electrónico"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer a contrasinal"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Agora estás conectado como: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Perfil de %(name)s"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Perfil actualizado"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "Atopada unha conta existente para ese enderezo de correo electrónico"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Non se atopou ningún arquivo gmail.json válido con información OAuth"
 
+#: cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Enviar ao Kindle %(book)s"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1516,10 +1546,6 @@ msgstr "Borrar"
 msgid "Public Shelf"
 msgstr "Andel público"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Engadir novo usuario"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Importar usuarios LDAP"
@@ -1550,7 +1576,8 @@ msgid "From Email"
 msgstr "Dende o correo electrónico"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "Servizo de correo electrónico"
 
 #: cps/templates/admin.html:91
@@ -1622,6 +1649,7 @@ msgid "Scheduled Tasks"
 msgstr "Tarefas programadas"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr "Hora de comezo das tarefas"
 
@@ -1629,7 +1657,7 @@ msgstr "Hora de comezo das tarefas"
 msgid "Maximum Duration"
 msgstr "Duración máxima das tarefas"
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr "Xerar as miniaturas das cubertas dos libros"
 
@@ -1637,7 +1665,8 @@ msgstr "Xerar as miniaturas das cubertas dos libros"
 msgid "Generate series cover thumbnails"
 msgstr "Xerar as miniaturas das cubertas das series"
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr "Reconectar á librería de Calibre"
 
@@ -1657,10 +1686,6 @@ msgstr "Descargar o paquete de depuración"
 msgid "View Logs"
 msgstr "Ver arquivos de rexistro"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Reconectar á base de datos de Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Reiniciar"
@@ -2512,16 +2537,18 @@ msgid "Email Account Type"
 msgstr "Escolle tipo de servidor"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Usar conta de correo electrónico estándar"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Verificación de conta Gmail con OAuth2"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Escolle tipo de servidor"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Configurar conta de Gmail como servidor de correo"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2544,7 +2571,8 @@ msgid "Attachment Size Limit"
 msgstr "Tamaño límite do arquivo achegado"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Gardar e enviar un correo electrónico de proba"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3053,10 +3081,6 @@ msgstr "Unha vez verificado, iniciará sesión automáticamente neste dispositiv
 msgid "This verification link will expire in 10 minutes."
 msgstr "O enlace de verificación caducará despois de 10 minutos."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr "Xerar miniaturas de cubertas de libros"
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr "Xerar miniaturas de cubertas de series"
@@ -3209,10 +3233,6 @@ msgstr "Progreso"
 msgid "Run Time"
 msgstr "Tempo de execución"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Hora de inicio"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr "Accións"
@@ -3286,15 +3306,18 @@ msgid "Enter Username"
 msgstr "Introduce o nome do usuario"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "Introduce o enderezo de correo electrónico"
+#, fuzzy
+msgid "Enter Email"
+msgstr "Comprobar correo electrónico"
 
 #: cps/templates/user_table.html:136
-msgid "Enter E-Reader Email Address"
-msgstr "Introduce o enderezo de correo electrónico Kindle"
+#, fuzzy
+msgid "Enter eReader Email"
+msgstr "Enviar ao enderezo de correo electrónico do Kindle"
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
+#, fuzzy
+msgid "eReader Email"
 msgstr "Comprobar o correo electrónico"
 
 #: cps/templates/user_table.html:137
@@ -3354,10 +3377,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "sincronizar andeis seleccionados con Kobo"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "Mostrar selección lidos/non lidos"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Mostrar libros ao chou"
-
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index fdaf98a8e84d3c9a65453eeea201229af9892894..d4b17de55b7185a65a3e146f34f6416e52f9b8df 100644
GIT binary patch
delta 6114
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

delta 7571
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

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index ac2c89c11..03075f7a3 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -23,15 +23,17 @@ msgid "Statistics"
 msgstr "Statisztika"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "A kiszolgáló újraindult, tölts be újra az oldalt!"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "A kiszolgáló leállítása folyamatban, zárd be ezt az ablakot"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
+msgid "Success! Database Reconnected"
 msgstr ""
 
 #: cps/admin.py:161
@@ -40,8 +42,8 @@ msgstr ""
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr ""
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -279,16 +281,16 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Új felhasználó hozzáadása"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr ""
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "SMTP beállítások változtatása"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -349,12 +351,13 @@ msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
 #: cps/admin.py:1445
@@ -477,6 +480,10 @@ msgstr "Az összes mezőt ki kell tölteni!"
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Új felhasználó hozzáadása"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -667,15 +674,18 @@ msgid "Send to eReader"
 msgstr "Küldés Kindle-re"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Ez az e-mail a Calibre-Web-en keresztül lett küldve."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web teszt e-mail"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Teszt e-mail"
 
 #: cps/helper.py:132
@@ -683,23 +693,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Kezdő lépések a Calibre-Web-bel"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Regisztrációs e-mail a következő felhasználóhoz: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "%(orig)s konvertálása %(format)s-ra és küldés Kindle-re"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "%(format)s küldése Kindle-re"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Küldés Kindle-re"
 
 #: cps/helper.py:230
@@ -749,17 +759,16 @@ msgstr ""
 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:644 cps/web.py:1416
-#, fuzzy
-msgid "Oops! An account already exists for this Email."
-msgstr "Már létezik felhasználó ehhez az e-mail címhez."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr ""
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+msgid "Invalid Email address format"
 msgstr ""
 
 #: cps/helper.py:815
@@ -828,7 +837,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -950,7 +959,8 @@ msgid "Read Books"
 msgstr "Olvasott könyvek"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -967,7 +977,7 @@ msgid "Discover"
 msgstr "Felfedezés"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
@@ -977,7 +987,8 @@ msgid "Categories"
 msgstr "Címkék"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Címke választó mutatása"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -987,7 +998,8 @@ msgid "Series"
 msgstr "Sorozatok"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Sorozat választó mutatása"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -996,7 +1008,8 @@ msgid "Authors"
 msgstr "Szerzők"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Szerző választó mutatása"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1005,7 +1018,8 @@ msgid "Publishers"
 msgstr "Kiadók"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Kiadó választó mutatása"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1015,7 +1029,8 @@ msgid "Languages"
 msgstr "Nyelvek"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Nyelv választó mutatása"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1023,24 +1038,27 @@ msgid "Ratings"
 msgstr ""
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
-msgstr ""
+#, fuzzy
+msgid "Show Ratings Section"
+msgstr "Sorozat választó mutatása"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr ""
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
-msgstr ""
+#, fuzzy
+msgid "Show File Formats Section"
+msgstr "Sorozat választó mutatása"
 
 #: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr ""
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
-msgstr ""
+#, fuzzy
+msgid "Show Archived Books"
+msgstr "Legutóbbi könyvek mutatása"
 
 #: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
@@ -1325,10 +1343,14 @@ msgstr ""
 msgid "File formats list"
 msgstr ""
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Először be kell állítani az SMTP levelező beállításokat..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(kindlemail)s"
+msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1336,7 +1358,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Hiba történt a könyv küldésekor: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Először be kell állítani a kindle e-mail címet..."
 
 #: cps/web.py:1226
@@ -1384,24 +1407,30 @@ msgstr ""
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr ""
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s profilja"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "A profil frissítve."
 
+#: cps/web.py:1416
+#, fuzzy
+msgid "Oops! An account already exists for this Email."
+msgstr "Már létezik felhasználó ehhez az e-mail címhez."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Küldés Kindle-re"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1532,10 +1561,6 @@ msgstr "Törlés"
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr ""
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr ""
@@ -1566,7 +1591,7 @@ msgid "From Email"
 msgstr "Küldő e-mail cím"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+msgid "Email Service"
 msgstr ""
 
 #: cps/templates/admin.html:91
@@ -1639,6 +1664,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1646,7 +1672,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1654,7 +1680,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1674,10 +1701,6 @@ msgstr ""
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Újracsatlakozás a Calibre adatbázishoz"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "A Calibre adatbázis újraindítása"
@@ -2534,15 +2557,16 @@ msgid "Email Account Type"
 msgstr ""
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+msgid "Standard Email Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr ""
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Felhasználói fiók"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
+msgid "Setup Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:24
@@ -2566,7 +2590,8 @@ msgid "Attachment Size Limit"
 msgstr ""
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Beállítások mentése és teszt e-mail küldése"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3078,10 +3103,6 @@ msgstr "Az első belépés után automatikusan be leszel léptetve ezen az eszk
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3235,10 +3256,6 @@ msgstr "Állapot"
 msgid "Run Time"
 msgstr "Futásidő"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Indítás ideje"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3315,17 +3332,17 @@ msgstr "Válassz egy felhasználónevet"
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
-msgstr "Az e-mail címed"
+msgid "Enter Email"
+msgstr "Teszt e-mail"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
+msgid "Enter eReader Email"
 msgstr "Kindle"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Teszt e-mail"
 
 #: cps/templates/user_table.html:137
@@ -3389,10 +3406,6 @@ msgstr ""
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "Sorozat választó mutatása"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Könyvek találomra mutatása"
-
diff --git a/cps/translations/id/LC_MESSAGES/messages.mo b/cps/translations/id/LC_MESSAGES/messages.mo
index fb43c955086e41d18890a4e63966e5fab789b203..8a89081614a9e420b3aead343724ec40811c134a 100644
GIT binary patch
delta 13363
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
J`-S2O{|kuEtCRo$

delta 16038
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

diff --git a/cps/translations/id/LC_MESSAGES/messages.po b/cps/translations/id/LC_MESSAGES/messages.po
index e9f2698e3..f0e644b95 100644
--- a/cps/translations/id/LC_MESSAGES/messages.po
+++ b/cps/translations/id/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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2023-01-21 10:00+0700\n"
 "Last-Translator: Arief Hidayat<arihid95@gmail.com>\n"
 "Language: id\n"
@@ -23,16 +23,18 @@ msgid "Statistics"
 msgstr "Statistik"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Server dimulai ulang, harap muat ulang halaman"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Mematikan server, silakan tutup jendela"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Berhasil menghubungkan ulang"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -40,7 +42,7 @@ msgstr "Perintah tidak diketahui"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
+msgid "Success! Books queued for Metadata Backup"
 msgstr "Buku berhasil diantrekan untuk Pencadangan Metadata"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
@@ -274,17 +276,17 @@ msgstr "Filter Pengguna Anggota LDAP Memiliki Tanda Kurung yang Tak Berpasangan"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Lokasi LDAP Sertifikat CA, Sertifikat, atau Kunci tidak Valid, Harap Masukkan Jalur yang Benar "
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Tambahkan pengguna baru"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "Tambah Pengguna Baru"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "Edit Pengaturan Server Email"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "Verifikasi Akun Gmail Berhasil"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -344,12 +346,13 @@ msgid "Edit User %(nick)s"
 msgstr "Edit pengguna %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Kata sandi untuk pengaturan ulang pengguna %(user) "
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Harap atur pengaturan email SMTP terlebih dahulu..."
 
 #: cps/admin.py:1445
@@ -470,6 +473,10 @@ msgstr "Harap masukkan seluruh isian!"
 msgid "E-mail is not from valid domain"
 msgstr "Email bukan dari domain yang valid"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Tambahkan pengguna baru"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -658,15 +665,18 @@ msgid "Send to eReader"
 msgstr "Kirim ke E-Reader"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Email ini telah dikirim melalui Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Email tes Calibre-Web"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Email tes"
 
 #: cps/helper.py:132
@@ -674,23 +684,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Memulai dengan Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Email pendaftaran untuk pengguna: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Ubah %(orig)s menjadi %(format)s dan kirim ke E-Reader"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, python-format
-msgid "Send %(format)s to E-Reader"
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader"
 msgstr "Kirim %(format)s ke E-Reader"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
-#, python-format
-msgid "%(book)s send to E-Reader"
+#: cps/helper.py:225
+#, fuzzy, python-format
+msgid "%(book)s send to eReader"
 msgstr "%%(buku)s telah dikirim ke E-Reader"
 
 #: cps/helper.py:230
@@ -740,16 +750,17 @@ msgstr "Kesalahan dalam mengganti nama berkas di jalur: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Jalur buku %(path)s tidak ditemukan di Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "Ditemukan akun yang ada untuk alamat email ini"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Nama pengguna ini sudah digunakan"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Format alamat email tidak valid"
 
 #: cps/helper.py:815
@@ -819,7 +830,7 @@ msgstr "Pengaturan Kobo"
 msgid "Register with %(provider)s"
 msgstr "Daftar dengan %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Anda sekarang login sebagai: %(nickname)s"
@@ -941,7 +952,8 @@ msgid "Read Books"
 msgstr "Buku Telah Dibaca"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Tampilkan sudah dibaca dan belum dibaca"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -958,7 +970,7 @@ msgid "Discover"
 msgstr "Temukan"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Tampilkan Buku Acak"
 
@@ -968,7 +980,8 @@ msgid "Categories"
 msgstr "Kategori"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Tampilkan pilihan kategori"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -978,7 +991,8 @@ msgid "Series"
 msgstr "Seri"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Tampilkan pilihan seri"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -987,7 +1001,8 @@ msgid "Authors"
 msgstr "Penulis"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Tampilkan pilihan penulis"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -996,7 +1011,8 @@ msgid "Publishers"
 msgstr "Penerbit"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Tampilkan pilihan penerbit"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1006,7 +1022,8 @@ msgid "Languages"
 msgstr "Bahasa"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Tampilkan pilihan bahasa"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1014,7 +1031,8 @@ msgid "Ratings"
 msgstr "Peringkat"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Tampilkan pilihan peringkat"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1022,7 +1040,8 @@ msgid "File formats"
 msgstr "Format berkas"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Tampilkan pilihan format berkas"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1030,7 +1049,8 @@ msgid "Archived Books"
 msgstr "Buku yang Diarsipkan"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Tampilkan buku yang diarsipkan"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1313,10 +1333,14 @@ msgstr "Daftar peringkat"
 msgid "File formats list"
 msgstr "Daftar format berkas"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Harap atur pengaturan email SMTP terlebih dahulu..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Buku telah diantrikan untuk dikirim ke %(kindlemail)s"
+msgstr "Buku telah diantrikan untuk dikirim ke %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1324,7 +1348,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Oops! Terjadi kesalahan saat mengirim buku: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Harap perbarui profil Anda dengan alamat e-mail Kirim ke Kindle yang valid."
 
 #: cps/web.py:1226
@@ -1372,24 +1397,29 @@ msgstr "Kata Sandi baru telah dikirimkan ke alamat email Anda"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Harap masukkan pengguna valid untuk mengatur ulang kata sandi"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Anda telah masuk sebagai: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Profil %(name)s"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Profil diperbarui"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "Ditemukan akun yang ada untuk alamat email ini"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Tidak ditemukan berkas gmail.json yang valid dengan informasi OAuth"
 
+#: cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%%(buku)s telah dikirim ke E-Reader"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1519,10 +1549,6 @@ msgstr "Hapus"
 msgid "Public Shelf"
 msgstr "Rak Publik"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Tambah Pengguna Baru"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Impor Pengguna LDAP"
@@ -1553,7 +1579,8 @@ msgid "From Email"
 msgstr "Dari Email"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "Layanan Email"
 
 #: cps/templates/admin.html:91
@@ -1625,6 +1652,7 @@ msgid "Scheduled Tasks"
 msgstr "Tugas Terjadwal"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr "Waktu saat tugas mulai dijalankan"
 
@@ -1632,7 +1660,7 @@ msgstr "Waktu saat tugas mulai dijalankan"
 msgid "Maximum Duration"
 msgstr "Durasi tugas maksimum"
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr "Buat thumbnail sampul buku"
 
@@ -1640,7 +1668,8 @@ msgstr "Buat thumbnail sampul buku"
 msgid "Generate series cover thumbnails"
 msgstr "Buat thumbnail sampul seri"
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr "Sambungkan kembali ke Perpustakaan Caliber"
 
@@ -1660,10 +1689,6 @@ msgstr "Unduh Paket Debug"
 msgid "View Logs"
 msgstr "Tampilkan Log"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Hubungkan Ulang Database Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Mulai Ulang"
@@ -2515,16 +2540,18 @@ msgid "Email Account Type"
 msgstr "Pilih Jenis Server"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Gunakan Akun Email Standar"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Akun Gmail dengan Verifikasi OAuth2"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Pilih Jenis Server"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Siapkan Akun Gmail sebagai Server Email"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2547,7 +2574,8 @@ msgid "Attachment Size Limit"
 msgstr "Batas Ukuran Lampiran"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Simpan dan Kirim Email Percobaan"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3056,10 +3084,6 @@ msgstr "Setelah diverifikasi, Anda akan secara otomatis masuk ke perangkat ini."
 msgid "This verification link will expire in 10 minutes."
 msgstr "Tautan verifikasi ini akan kedaluwarsa dalam 10 menit."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr "Hasilkan Thumbnail Sampul Buku"
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr "Hasilkan Thumbnail Sampul Seri"
@@ -3212,10 +3236,6 @@ msgstr "Kemajuan"
 msgid "Run Time"
 msgstr "Waktu Jalan"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Waktu Mulai"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr "Tindakan"
@@ -3289,15 +3309,18 @@ msgid "Enter Username"
 msgstr "Masukkan Nama Pengguna"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "Masukkan Alamat Email"
+#, fuzzy
+msgid "Enter Email"
+msgstr "Email tes"
 
 #: cps/templates/user_table.html:136
-msgid "Enter E-Reader Email Address"
-msgstr "Masukkan Alamat Email E-Reader"
+#, fuzzy
+msgid "Enter eReader Email"
+msgstr "Alamat E-mail untuk Kirim ke E-Reader"
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
+#, fuzzy
+msgid "eReader Email"
 msgstr "Email E-Reader"
 
 #: cps/templates/user_table.html:137
@@ -3357,10 +3380,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "Sinkronkan Rak yang dipilih dengan Kob"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "Tampilkan pilihan baca/belum dibaca"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Tampilkan buku acak"
-
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 3ce690cdaba2c13e4d42aad655aa62378dad947c..1c44d237507828b1ea4b83307f290cd220859dbb 100644
GIT binary patch
delta 13414
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
b^|@Z5m^bcbS6_Sett0ln+dtZ$-^u-7c(3Xz

delta 16157
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
N?FA>B+0(uV{x_#5a&rIx

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 9031350dd..e31e777ca 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -22,23 +22,26 @@ msgid "Statistics"
 msgstr "Statistiche"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Server riavviato, per favore ricarica la pagina"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Ricollegato con successo"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
 #: cps/admin.py:172
-msgid "Books successfully queued for Metadata Backup"
+#, fuzzy
+msgid "Success! Books queued for Metadata Backup"
 msgstr "Libro accodato con successo per il backup dei metadati"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
@@ -272,8 +275,8 @@ msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
 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:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "Aggiungi un nuovo utente"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -281,8 +284,8 @@ msgid "Edit Email Server Settings"
 msgstr "Modifica le impostazioni del server e-mail"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "L'account Gmail è stato verificato con successo"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -342,12 +345,13 @@ msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
 #: cps/admin.py:1445
@@ -468,6 +472,10 @@ msgstr "Per favore compila tutti i campi!"
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Aggiungi un nuovo utente"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -656,15 +664,18 @@ msgid "Send to eReader"
 msgstr "Invia al lettore elettronico"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "E-mail di test da Calibre-Web"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "E-mail di test"
 
 #: cps/helper.py:132
@@ -672,23 +683,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Inizia con Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "E-mail di registrazione dell'utente: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Converti %(orig)s in %(format)s e al lettore elettronico"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, python-format
-msgid "Send %(format)s to E-Reader"
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader"
 msgstr "Invia %(format)s al lettore elettronico"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
-#, python-format
-msgid "%(book)s send to E-Reader"
+#: cps/helper.py:225
+#, fuzzy, python-format
+msgid "%(book)s send to eReader"
 msgstr "%(book)s inviato al lettore elettronico"
 
 #: cps/helper.py:230
@@ -738,16 +749,17 @@ msgstr "Errore nel rinominare il file nel percorso: {}"
 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:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "L'e-mail non è scritto in un formato valido"
 
 #: cps/helper.py:815
@@ -815,7 +827,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -937,7 +949,8 @@ msgid "Read Books"
 msgstr "Libri letti"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -954,7 +967,7 @@ msgid "Discover"
 msgstr "Per scoprire"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
@@ -964,7 +977,8 @@ msgid "Categories"
 msgstr "Categorie"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Mostra l'opzione per la selezione delle categorie"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -974,7 +988,8 @@ msgid "Series"
 msgstr "Serie"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Mostra l'opzione per la selezione delle serie"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -983,7 +998,8 @@ msgid "Authors"
 msgstr "Autori"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -992,7 +1008,8 @@ msgid "Publishers"
 msgstr "Editori"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1002,7 +1019,8 @@ msgid "Languages"
 msgstr "Lingue"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Mostra l'opzione per la selezione delle lingue"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1010,7 +1028,8 @@ msgid "Ratings"
 msgstr "Valutazioni"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Mostra l'opzione per la selezione delle valutazioni"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1018,7 +1037,8 @@ msgid "File formats"
 msgstr "Formati file"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Mostra l'opzione per la selezione del formato dei file"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1026,7 +1046,8 @@ msgid "Archived Books"
 msgstr "Libri archiviati"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1309,10 +1330,14 @@ msgstr "Elenco delle valutazioni"
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Configura dapprima le impostazioni del server SMTP..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Libro accodato con successo per essere spedito a %(kindlemail)s"
+msgstr "Libro accodato con successo per essere spedito a %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1320,7 +1345,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Per favore aggiorna il tuo profilo con un indirizzo e-mail Kindle a cui inviare i libri."
 
 #: cps/web.py:1226
@@ -1368,24 +1394,29 @@ msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Ora sei connesso come '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Profilo di %(name)s"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Profilo aggiornato"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Ho trovato un gmail.json file senza informazione OAuth"
 
+#: cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s inviato al lettore elettronico"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1514,10 +1545,6 @@ msgstr "Elimina"
 msgid "Public Shelf"
 msgstr "Scaffale pubblico"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Aggiungi un nuovo utente"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Importa gli utenti LDAP"
@@ -1548,7 +1575,8 @@ msgid "From Email"
 msgstr "E-mail da"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "Servizio e-mail"
 
 #: cps/templates/admin.html:91
@@ -1620,6 +1648,7 @@ msgid "Scheduled Tasks"
 msgstr "Attività pianificate"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr "Ora in cui le attività sono avviate"
 
@@ -1627,7 +1656,7 @@ msgstr "Ora in cui le attività sono avviate"
 msgid "Maximum Duration"
 msgstr "Massima durata delle attività"
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr "Generazione delle miniature delle copertine"
 
@@ -1635,7 +1664,8 @@ msgstr "Generazione delle miniature delle copertine"
 msgid "Generate series cover thumbnails"
 msgstr "Generazione delle miniature delle serie"
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr "Ricollegare alla libreria di Calibre"
 
@@ -1655,10 +1685,6 @@ msgstr "Scarica Debug Package"
 msgid "View Logs"
 msgstr "Visualizza Logfile"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Ricollega il database di Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Riavvia Calibre-Web"
@@ -2510,16 +2536,18 @@ msgid "Email Account Type"
 msgstr "Scegli il tipo di server"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Utilizza un account e-mail standard"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Account Gmail con verifica OAuth2"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Scegli il tipo di server"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Configura l'account Gmail quale server e-mail"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2542,7 +2570,8 @@ msgid "Attachment Size Limit"
 msgstr "Dimensione massima dell'allegato"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Salva le impostazioni e invia e-mail di test"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3051,10 +3080,6 @@ msgstr "Una volta completato, verrai automaticamente connesso con questo disposi
 msgid "This verification link will expire in 10 minutes."
 msgstr "Il link scadrà tra 10 minuti."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr "Genera miniature delle copertine dei libri"
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr "Genera miniature delle copertine delle serie"
@@ -3207,10 +3232,6 @@ msgstr "Avanzamento"
 msgid "Run Time"
 msgstr "Tempo d'esecuzione"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Ora d'inizio"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr "Azioni"
@@ -3284,15 +3305,18 @@ msgid "Enter Username"
 msgstr "Digita il nome utente"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "Digita l'indirizzo e-mail"
+#, fuzzy
+msgid "Enter Email"
+msgstr "E-mail di test"
 
 #: cps/templates/user_table.html:136
-msgid "Enter E-Reader Email Address"
-msgstr "Digita l'e-mail del lettore elettronico"
+#, fuzzy
+msgid "Enter eReader Email"
+msgstr "Invia all'indirizzo e-mail del lettore elettronico"
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
+#, fuzzy
+msgid "eReader Email"
 msgstr "E-mail del lettore elettronico"
 
 #: cps/templates/user_table.html:137
@@ -3352,10 +3376,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "Sincronizza con Kobo gli scaffali selezionati"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "Mostra l'opzione per la selezione dello stato letto/non letto"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Mostra l'opzione per presentare libri aleatoriamente"
-
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 35829eceb421044581938dff00c821a47dd17afa..6ae19884deceef44c310ce5df7360d87982b8348 100644
GIT binary patch
delta 13377
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
bKi%W2_uKNoH-8Tc@Xxw4GQbV~bNT-QV(#(%

delta 15854
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

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 80a58a78e..7b5bd69e6 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: subdiox <subdiox@gmail.com>\n"
 "Language: ja\n"
@@ -23,16 +23,18 @@ msgid "Statistics"
 msgstr "統計"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "サーバーを再起動しました。ページを再読み込みしてください"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "サーバーをシャットダウンしています。ページを閉じてください"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "再接続成功"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -40,8 +42,8 @@ msgstr "不明なコマンド"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "本の %(kindlemail)s への送信がキューに追加されました"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "本の %(eReadermail)s への送信がキューに追加されました"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -274,17 +276,17 @@ msgstr "LDAPのメンバーフィルタ内の括弧が一致しません"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAPのCA証明書、証明書、キーの場所が無効です。正しいパスを入力してください"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "新規ユーザー追加"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "新規ユーザーを追加"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "メールサーバー設定を編集"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "Gmailアカウントを認証しました"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -344,12 +346,13 @@ msgid "Edit User %(nick)s"
 msgstr "ユーザー %(nick)s を編集"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "ユーザー %(user)s のパスワードをリセット"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "初めにSMTPメールの設定をしてください"
 
 #: cps/admin.py:1445
@@ -470,6 +473,10 @@ msgstr "全ての項目を入力してください"
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "新規ユーザー追加"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -658,15 +665,18 @@ msgid "Send to eReader"
 msgstr "E-Readerに送信"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "このメールはCalibre-Web経由で送信されました。"
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web テストメール"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "テストメール"
 
 #: cps/helper.py:132
@@ -674,23 +684,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Webを始める"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "ユーザー: %(name)s 用の登録メール"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "%(orig)s を %(format)s に変換してからE-Readerに送信"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, python-format
-msgid "Send %(format)s to E-Reader"
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader"
 msgstr "E-Readerに %(format)s を送信"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
-#, python-format
-msgid "%(book)s send to E-Reader"
+#: cps/helper.py:225
+#, fuzzy, python-format
+msgid "%(book)s send to eReader"
 msgstr "%(book)s をE-Readerに送信"
 
 #: cps/helper.py:230
@@ -740,16 +750,17 @@ msgstr "ファイル名の変更でエラーが発生しました: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "このメールアドレスで登録されたアカウントがすでに存在します"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "このユーザー名はすでに使われています"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "メールアドレスの形式が無効"
 
 #: cps/helper.py:815
@@ -819,7 +830,7 @@ msgstr "Kobo設定"
 msgid "Register with %(provider)s"
 msgstr "%(provider)s で登録"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "%(nickname)s としてログイン中"
@@ -941,7 +952,8 @@ msgid "Read Books"
 msgstr "既読の本"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -958,7 +970,7 @@ msgid "Discover"
 msgstr "見つける"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "ランダムに本を表示"
 
@@ -968,7 +980,8 @@ msgid "Categories"
 msgstr "カテゴリ"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "カテゴリ選択を表示"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -978,7 +991,8 @@ msgid "Series"
 msgstr "シリーズ"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "シリーズ選択を表示"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -987,7 +1001,8 @@ msgid "Authors"
 msgstr "著者"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "著者選択を表示"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -996,7 +1011,8 @@ msgid "Publishers"
 msgstr "出版社"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "出版社選択を表示"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1006,7 +1022,8 @@ msgid "Languages"
 msgstr "言語"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "言語選択を表示"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1014,7 +1031,8 @@ msgid "Ratings"
 msgstr "評価"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "評価選択を表示"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1022,7 +1040,8 @@ msgid "File formats"
 msgstr "ファイル形式"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "ファイル形式選択を表示"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1030,7 +1049,8 @@ msgid "Archived Books"
 msgstr "アーカイブされた本"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "アーカイブされた本を表示"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1313,10 +1333,14 @@ msgstr "評価一覧"
 msgid "File formats list"
 msgstr "ファイル形式一覧"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "初めにSMTPメールの設定をしてください"
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "本の %(kindlemail)s への送信がキューに追加されました"
+msgstr "本の %(eReadermail)s への送信がキューに追加されました"
 
 #: cps/web.py:1207
 #, python-format
@@ -1324,7 +1348,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
 #: cps/web.py:1226
@@ -1372,24 +1397,29 @@ msgstr "新しいパスワードがあなたのメールアドレスに送信さ
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "パスワードをリセットするには、有効なユーザー名を入力してください"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "'%(nickname)s' としてログインしました"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s のプロフィール"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "プロフィールを更新しました"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "このメールアドレスで登録されたアカウントがすでに存在します"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "OAuth情報を含んだ有効なgmail.jsonファイルが見つかりません"
 
+#: cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s をE-Readerに送信"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1519,10 +1549,6 @@ msgstr "削除"
 msgid "Public Shelf"
 msgstr "みんなの本棚"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "新規ユーザーを追加"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "LDAPユーザーをインポート"
@@ -1553,7 +1579,8 @@ msgid "From Email"
 msgstr "Fromメールアドレス"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "メールサービス"
 
 #: cps/templates/admin.html:91
@@ -1625,6 +1652,7 @@ msgid "Scheduled Tasks"
 msgstr "スケジュールタスク"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr "タスクを開始する時間"
 
@@ -1632,7 +1660,7 @@ msgstr "タスクを開始する時間"
 msgid "Maximum Duration"
 msgstr "最大タスク継続時間"
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr "本の表紙サムネイルを生成"
 
@@ -1640,7 +1668,8 @@ msgstr "本の表紙サムネイルを生成"
 msgid "Generate series cover thumbnails"
 msgstr "シリーズの表紙サムネイルを生成"
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr "Calibreライブラリに再接続"
 
@@ -1660,10 +1689,6 @@ msgstr "デバッグパッケージをダウンロード"
 msgid "View Logs"
 msgstr "ログを表示"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Calibre DBに再接続"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "再起動"
@@ -2515,16 +2540,18 @@ msgid "Email Account Type"
 msgstr "サーバーの種類を選択"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "標準のメールアカウントを使用"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "OAuth2認証を用いたGmailアカウント"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "サーバーの種類を選択"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Gmailアカウントをメールサーバーとして設定"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2547,7 +2574,8 @@ msgid "Attachment Size Limit"
 msgstr "添付ファイルのサイズ制限"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "保存してテストメールを送信"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3056,10 +3084,6 @@ msgstr "一度承認されると、自動的にこの端末でログインされ
 msgid "This verification link will expire in 10 minutes."
 msgstr "この確認リンクの有効期限は10分です。"
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr "本の表紙サムネイルを生成"
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr "シリーズの表紙サムネイルを生成"
@@ -3212,10 +3236,6 @@ msgstr "進捗"
 msgid "Run Time"
 msgstr "稼働時間"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "開始時刻"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr "アクション"
@@ -3289,15 +3309,18 @@ msgid "Enter Username"
 msgstr "ユーザー名を入力してください"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "メールアドレスを入力してください"
+#, fuzzy
+msgid "Enter Email"
+msgstr "テストメール"
 
 #: cps/templates/user_table.html:136
-msgid "Enter E-Reader Email Address"
-msgstr "E-Readerメールアドレスを入力してください"
+#, fuzzy
+msgid "Enter eReader Email"
+msgstr "E-Readerメールアドレス"
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
+#, fuzzy
+msgid "eReader Email"
 msgstr "E-Readerメール"
 
 #: cps/templates/user_table.html:137
@@ -3357,10 +3380,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "選択した本棚をKoboと同期"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "既読/未読の選択を表示"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "ランダムに本を表示"
-
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index ba882bf1dc32759437919c22d9d5413f6e39f589..e374396530e676bb43cf9332d37584caf525e80b 100644
GIT binary patch
delta 4164
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
a&gLfj_OjKH<IQiy+vlq@BK@tYQU3$AbrsbB

delta 5120
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

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 396df2958..5941b9b0e 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -24,15 +24,17 @@ msgid "Statistics"
 msgstr "ស្ថិតិ"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
+msgid "Success! Database Reconnected"
 msgstr ""
 
 #: cps/admin.py:161
@@ -41,8 +43,8 @@ msgstr ""
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(eReadermail)s ដោយជោគជ័យ"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -280,16 +282,16 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr ""
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -351,11 +353,12 @@ msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
 #: cps/admin.py:1428
 #, python-format
-msgid "Password for user %(user)s reset"
+msgid "Success! Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
 #: cps/admin.py:1445
@@ -478,6 +481,10 @@ msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 msgid "E-mail is not from valid domain"
 msgstr ""
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -667,15 +674,15 @@ msgid "Send to eReader"
 msgstr "ផ្ញើទៅ Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+msgid "This Email has been sent via Calibre-Web."
 msgstr ""
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+msgid "Calibre-Web Test Email"
 msgstr ""
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+msgid "Test Email"
 msgstr ""
 
 #: cps/helper.py:132
@@ -684,22 +691,22 @@ msgstr ""
 
 #: cps/helper.py:137
 #, python-format
-msgid "Registration e-mail for user: %(name)s"
+msgid "Registration Email for user: %(name)s"
 msgstr ""
 
 #: cps/helper.py:148 cps/helper.py:154
 #, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr ""
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, python-format
-msgid "Send %(format)s to E-Reader"
-msgstr ""
-
-#: cps/helper.py:225 cps/tasks/convert.py:92
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "Send %(format)s to eReader"
+msgstr "ផ្ញើទៅ Kindle"
+
+#: cps/helper.py:225
+#, fuzzy, python-format
+msgid "%(book)s send to eReader"
 msgstr "ផ្ញើទៅ Kindle"
 
 #: cps/helper.py:230
@@ -749,8 +756,8 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
 msgstr ""
 
 #: cps/helper.py:652
@@ -758,7 +765,7 @@ msgid "This username is already taken"
 msgstr ""
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+msgid "Invalid Email address format"
 msgstr ""
 
 #: cps/helper.py:815
@@ -827,7 +834,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -949,7 +956,8 @@ msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -966,7 +974,7 @@ msgid "Discover"
 msgstr "ស្រាវជ្រាវ"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
@@ -976,7 +984,8 @@ msgid "Categories"
 msgstr "ប្រភេទនានា"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "បង្ហាញជម្រើសប្រភេទ"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -986,7 +995,8 @@ msgid "Series"
 msgstr "ស៊េរី"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "បង្ហាញជម្រើសស៊េរី"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -995,7 +1005,8 @@ msgid "Authors"
 msgstr "អ្នកនិពន្ធ"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1004,8 +1015,9 @@ msgid "Publishers"
 msgstr ""
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
-msgstr ""
+#, fuzzy
+msgid "Show Publisher Section"
+msgstr "បង្ហាញជម្រើសស៊េរី"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
@@ -1014,7 +1026,8 @@ msgid "Languages"
 msgstr "ភាសានានា"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "បង្ហាញផ្នែកភាសា"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1022,24 +1035,27 @@ msgid "Ratings"
 msgstr ""
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
-msgstr ""
+#, fuzzy
+msgid "Show Ratings Section"
+msgstr "បង្ហាញជម្រើសស៊េរី"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr ""
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
-msgstr ""
+#, fuzzy
+msgid "Show File Formats Section"
+msgstr "បង្ហាញជម្រើសស៊េរី"
 
 #: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr ""
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
-msgstr ""
+#, fuzzy
+msgid "Show Archived Books"
+msgstr "បង្ហាញសៀវភៅមកថ្មី"
 
 #: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
@@ -1323,10 +1339,14 @@ msgstr ""
 msgid "File formats list"
 msgstr ""
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
+msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(eReadermail)s ដោយជោគជ័យ"
 
 #: cps/web.py:1207
 #, python-format
@@ -1334,7 +1354,7 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr ""
 
 #: cps/web.py:1226
@@ -1382,24 +1402,29 @@ msgstr ""
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr ""
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr ""
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "ផ្ញើទៅ Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1530,10 +1555,6 @@ msgstr "លុប"
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr ""
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr ""
@@ -1564,7 +1585,7 @@ msgid "From Email"
 msgstr "ពីអ៊ីមែល"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+msgid "Email Service"
 msgstr ""
 
 #: cps/templates/admin.html:91
@@ -1637,6 +1658,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1644,7 +1666,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1652,7 +1674,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1672,10 +1695,6 @@ msgstr ""
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "ភ្ជាប់ទៅ database Calibre ម្តងទៀត"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr ""
@@ -2531,15 +2550,15 @@ msgid "Email Account Type"
 msgstr ""
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+msgid "Standard Email Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
+msgid "Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
+msgid "Setup Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:24
@@ -2563,7 +2582,8 @@ msgid "Attachment Size Limit"
 msgstr ""
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "រក្សាទុកការកំណត់រួចផ្ញើអ៊ីមែលសាកល្បង"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3075,10 +3095,6 @@ msgstr "ក្រោយពីនេះ អ្នកនឹងត្រូវប
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3232,10 +3248,6 @@ msgstr "ដំណើរការ"
 msgid "Run Time"
 msgstr "រយៈពេលដែលបានចាប់ផ្តើម"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "ពេលចាប់ផ្តើម"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3312,17 +3324,18 @@ msgstr "ជ្រើសរើសឈ្មោះអ្នកប្រើប្រ
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
-msgstr "អាសយដ្ឋានអ៊ីមែលរបស់អ្នក"
-
-#: cps/templates/user_table.html:136
-#, fuzzy
-msgid "Enter E-Reader Email Address"
+msgid "Enter Email"
 msgstr "ឧបករណ៍ Kindle"
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
-msgstr ""
+#, fuzzy
+msgid "Enter eReader Email"
+msgstr "ឧបករណ៍ Kindle"
+
+#: cps/templates/user_table.html:136
+#, fuzzy
+msgid "eReader Email"
+msgstr "ឧបករណ៍ Kindle"
 
 #: cps/templates/user_table.html:137
 msgid "Locale"
@@ -3384,10 +3397,6 @@ msgstr ""
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "បង្ហាញជម្រើសស៊េរី"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "បង្ហាញសៀវភៅចៃដន្យ"
-
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index 4d7105e6e0b90864fda4e0b4796b52cf0a0eebe6..e988b73e55759f235a858b1d8fa8e582df9eb5d5 100644
GIT binary patch
delta 12438
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
TYrFT3)_C>9kRZ3yxx)VeK^g<v

delta 14677
zcmb8!cYKvazQ^$=1PCReg<hXf5)uf#*U&|pQl*I@IY1yJaFPJlLkURL-~&i6OOf6V
zQlwZAlvPly=-PH!)|H&dT@kO!Rqp4T8NBG-KknVvzI@NjGtbO#elzo&xVvgac<_br
zz!w#Yu5|d%$3+~cCVo&^wg36g(nQB;PIVd9!<Vr!UPbjU*TiuuU?QrXgf5Q7ruY=b
z;(lBI5KB-m#=~Kb6L88<7*0bfw#Sp$4sT&GY|_kex?(Ggz-$c1C$I|6#yDJ!rSKIj
zgKuFZeu@?GYgE7gvhDR*RT<`Ynp056B-DfhPy-FIK8zYL4a?#zQ~(Q6{g<Kwc@C9{
z-Kc)2QR7@hW#$Uj#akGKRa?-X`JGq_m9Rb5z(J^hreJlPg%!|4{_E`EA0_b<tbkWh
zDg6Nz=pEFG%d{k`SPzxih1dyS!vS~)14AebXyrKla0@<+1=t_^w|1OHxCUeJ9BKt$
zqmD_bHs&nEU?u7Uu^OggaeN9(<9sZK%TZhSCsf9Ew;}&Z(Q7mm#fun?@7el4P#MWb
zWhA1lIb0P{6SYRYKM1wAqfi0QMYh@5kB#w5?0}IREQWIWptkO*cI00J<kG-_cAmv}
zJdIk>*Ej-y!74b6JZej(qUsA#fo#TF_!8>*71Z;awqBaqwKcJ*1+~To_+Ws7QZ*B+
z<5Q?qufc|R66@pNu@9E)=s4x^K~%pKtcLSZ6K=v}JZ9_F*l>;C9Cdx$p%y#_t7Bjy
z1s$TfNU+XI)aiW(HNlsty$kDX4pjwI|2R}29k3hrN2U51RBBJ6w(M2Z;k<-8^&cb0
z%ejV(8*r+3F&!IWMIN+6bsT_N@o3Z`+KN5!0BWyqq7GvXJ`Odp3o5YDNX$+KDu6wx
z)E`F${03^gPq3`+|1}Dl@D_3-obV)b2-~7M_Cp=c5m*_=pi-WNb#NIfmHSYcdJ}8o
zC#V2_L}juDY0_47MvdE3GQaZx1*LopD#CQs-amzd@dfOQKch0#v%8saBx;~+RDiQ>
zeLiaC%P|5sqP`b9Q12f^ZOJ(d=+IoEpuPJC>hwpGXQj9^s-q8eEi<qx&P8Qn9csmg
zQCn~pm5HxV6W&IRU#zFuf?7zE)7aLh^(6lqC_sZ!xeArKqo_bW#2CDTMKPwAnIIOG
zscxu%hG0ERM{P|WDzM#H15aY%;X^It8tQug)QkM9P`0;;xB==AHAP*M?x<7_KutIb
zH9<ORparOj)}jL6gUZ04QHSmtYMk$}INm{xQ=F5nfT{*4Xn<JM-n2!Xh5ojE3@U)B
zsFXg2+VfodJP$R|7VAOV{xTM${aw@+e1u)_TWjKdX1+i=g%&)RgId`UR0b}gBK<3B
zf}5zoiu5%BRlr)*>!4QH8MUJOQ11;#t#}f~VJ0Tx^Qc>P4%za6^Am-JG*r9a{Grg@
znueMn&$=I#;<s@S=A*W*V?Xn2_8=<IO{fX?qt4bxsEG@ZZFg$)H=o{QtfKq>GzF!2
z6Dsn(n1E+69>2j77(Kuo!kSo$dJJmd#;C0uh1$wYY>u<B10KfKSb(Lm-axZ8O)-l3
zoz@f-X%Eyj8iiWHOxwN*8&E%rvG^HkqHxlnfGeT`h((?DjyMEIpvKvQ8vlL!{5tB8
z7Jq>Js}Mth-wUS`YGt!fdp8di@nY2VTV-8`>bDt7;vUq*FJf7|jOFmJsQ14^9ll>t
z0e61Te9#6xNd7g@8XELq8){FFVi|lJb<O^QI-EC90hi>nsIyTYBe6T`ln=7?iCCX{
zHdeqj$S=6F7bEZ*YTkmu<X;j0NP|{Tg1pK4sEL!1bK?xf5x5ySug;ICt?EA1ygv^0
zA<DG%g|@yLThM+8`FcBlM;*f0VJ6`800n*Fa<Mt?z$Cna`l3}EZc^D9HNimCN++WF
z2QUc_p$_SHSRQX<1&ktUZIO#nn1E_;hx$GQ`ccr{K8QN)!%-QSjT&e@DpmVYXW|6%
z)9t*19r0IGCOSN10vv&wa2i&|$FLGE$9DJvYHPnj0th%aC^V(v7HXmfBh5t3P=}{2
zDnmW63i?oiJ&D@;XHf&LN3CcNR>VVC4bP*_%2%kp{}r{6;-mDpBKsdjp(PFNQJI*E
zT7e(+!V_2ob5VgljXK@OP%D2EwZdzdfVZ(3#*Q|Btd2l_Se;qe0Z*bnWIte0-Tz8s
z%*v{xR?-4BVK>w%?rH03SokZ48ZZx=;QQDSi;OjYFLXgIXgLnVbEwQ#eApc7I;aJ-
z#DES>PYNy$ux6lA{wyk>L#R{y3U<Srs6bkeGb<fwU5tsepTyeujjfk>#GI)%*qipj
zs7$PRg#5Rq@Bs}<ePpsZ#pO|_wL0p0Hni>SP#Nil(KrEh1|CCg+0&?im)qx?QD@}{
zYQ^Vm{bN-BZ;}IMpqn%(MG@o8gcVQ&*F_zcrl>>J#@f$5f5bW!tMdFY)S2;Y`#RLZ
zcB01LhdR{9QT<;JP|ylLM@>+G)v-v5sn<fKx&>;hhTHaWsD9ZPi_c;l9z|v73)Dp6
zsU`zuQ45K&^@iAodY}UZ1uz$NU7ka&d@m}+Cr~T8hzjsS`}{g8)&Gfluei_jcTp3y
zvh|LrtsG?A$D#sDMdk@O(<o?VPog?5K&5Jht#3l@)jkZzW7r-~q7Kn5RDjJUm~q-+
zQR>}Lf%V2>_y}tJ38)2U7s~$UQqW3PpeEXi#c`i)KZ450S=0dU+V(H7IQ0Td!0%DF
zq|QXMHG{D(^{J?F^HBZQ+WHoZWPWE41$`=yqfYBPs8s(Ib&r2Qr7U5R+1oa#jE%PS
zRMb{2LVY1OSYJeqcM&7-OH^jQw(TJ-y#K#aP)Z`wOdwTIU$iEu%=APJGz4Arp#ofh
zns^<m{{d70=dcETZtFjxPJ8*uW}F1nf;&xS|25DM8g!Z`*$(qi1Fl4^d=HkuW2h9q
zg01llRLXzB#@K9%ITK?sp89I*YuJ=}$XYYqY+3(w^52jLGilIXZMF~2Vk7F`q6Vry
z)vUZHs=p5v$TO%dT50PSP#Jp{b?CmtQg{uu1^;2|Kce0b4`i6sm%<nts$&D}go!vF
z>tG(bco4M}mr=LjDn{YgsJ*>q{TUU&9W0H-G9BlBERXsUj=?S%m`Xt%_oDtVIE?!B
zI){aa54Beb)6BK&hD!P4n1K6H-}+CmIsS-RK*Dr0?gOX{3`Yf=jOEd13^+3>l%-*j
zbq#98yRaNyu<f5>GwRn-sjT5Qsji25zXd9#-BD+$FV@0T)M1>9k+>0c826y7-~ZPs
zl%e4oYU1y0y<(PGVLfa?`#{v*&p}PJ8*Abr)D~RAIQ$HUV$p0f;Yd`#6HuAVK=q%G
z<(c2{DCpX3$C7v&74aL^tEj!bgX&i_$5_+a3bla#s9Q1`wWX=33`|A^u+TowLyflv
z1LY}fq@X=Ih!yZ8Dv(R4(|-jOd65}rplYZIVo<4$L+x#MY=XT}naaUf+=v?Y9BSoP
zup<6r2Km>w{I-42dZsz8Jx~!2LcK5)mGbeZGm&PWKZXiCVC#!ffjo-}z(Zx^6e<(v
zunJza_1iPae_|1SC}x?zZ2CNAJ|v5<Hyw}K`Y)&zBs^|TcV|>)Qm`*B!?yS_cE_?$
zn284?$H5tm{1xWBgSvK!Pa4w$6tu!UI1EpqR$BHcV`Z#Cy%r{7dsGG{T4z}op;EdQ
z)$f3<e~y)@e}{UnBn#HoR<{P~Q;4Ra32Nf*sDS#~`Uunu4`X$lggP_xQ17io_1}dG
z^cd<x_C9LDTd4lUXPW@4qQ0z&$n$_Rl7e2CjJlUgaVTy_1@tp&g0MLzkg}+HHPl|l
z;R5W6+Jf`g0e{7T*nY10SGa}N4^WwQ=jpFyqMJcM_x1w1_%E!56>`l4&2R|y`%o)f
zkIKYxRDkcJ0{RrS;(yxqpHN%k%s0;~q59Xe^#s+K-)Tod19n9XFbZ4Z6l{!}P^bKD
zY=9r5PWLa^3}adT033n6aXa?H5Qbxmr_K9qP~&w&jgx@^MYw`O3hqJ$5Vg=)+u9U$
zh>}n#AA#EYOzS+<d(UGX+=<%bH?b*xkHxY6B6AiRVJ!8|i^zW$3aK<C;8yI9mr#M#
zSZq2rLj^DbH9-b)QJiP6IYurq6LdkXuop(6AC=hv>ixCY4-cUh@XHeN?@}ng)HJj}
zP2Af$8nxnSn1u^bhwQ&lD{8gO>}^LZNxiSF55ZQ{lWlz!mZH85^&L5Yx)rYlD0HXr
zfo-Vr3|EYLJZf*BL#^;E>QLT71sMG-KdIOdqcC7yhGnR)v-RE9<JR-ondcv1VP-1i
znNMyaY6b04e>V3(eVWH&JU)*)G_Rs2{My!UVMFRQmYdtr6P1}qP%EB@<<O4`Y#x@!
z=aBaT&Nd3#%Zup8e$SZ>XE28PyQl%aLj@S_nSrA)f_ha{KrU+HCa9IQw)F>4-<1&<
zhtn_tR~O3upQR8<!?&otzKuF$(JRbAEisz<K&+4Bu^v8+dT$SEYmTE<_z~&@a}5=E
z$CYN>{@9#)Dk_jw*qiyCGZZvnu~lXT@u-NKp#tiQ`tT&9w%|$oe5-wa3TxB;0V>d&
zSP>(hH`YXr(;O90U(^<l!hjmGDJX^WQK|E=3huX_M-BW1YNGFKd->I-Js!0+ol#rT
z2Nl2|)VQgr_x)G}7ufcVtJ!}Au$KmT+CI2s{R}nGb^H8|wcHxhKL)kuEl`<hkA577
z)A2p5ggw`qFXSk!N_{74zE{_he?|D7ZTJdR|CjX+DuAeUW`%W8&l{sw)BzR1K<tXc
zFbP+puJuP)1FNk!&s(EDcsbT10SY>eH&KV8_6BqBd!xPsGf@+Mg+uULtcKk;vML;d
zHE|0Lz%w`yBR81|N2B_$LyhwyYC&hQ0|u^8=t3cSvsuYt)LxE6tuO^!;Y`$Z+>0(=
z!bH4*nz+^${x?LNf~D~^>MUG9O?(+O@t3GA_#V6J{zv`EGz`G%JeYvGW^+(`v;)iI
zG1LGTP$~Ta7vRsBgmbo<ab82c{}*h8&NlM_Ym7aq4o3yJ4vRCt^8y7$xF5ChQy7lt
z3p?=t<)8w&j7{-xwq9Yod9NPoz2-OqJE8*ga10(meF-CXnEq8z&l_Ml=6AYL(8>m*
zuE#`-!2mYHEvNwAv(K-hJ~X#c{Yt%HwyH7qqMn2bXaQ=ad8qN%qb5Ftb?_nv)S-aF
zefSej!0tOus&-*z>ffR!EVj!Wwu-1NX^uKvJ+K>&#s0Vn6-Wp*QH$N?XM8aBq5deU
z->bXHzYbBEJ?3Yz6KX|+P^Wr2_QYqfFTRh(vDRLb()y^(G)1*1p#tuMy7v#;_H66p
z*oyYK7>mdDl7Fq>3mSCVf3zJV_wj$rQjf-dn2Oq(gQ&pX#FBW;w%<TyC}O|4O_fn8
zABO5T89QM%D&RvHiLV80;T^0^!)K_8ZlgLzA29X$sOOzfD;<rRU_5F8Gf~%gIY!{S
zsD4+l4StDjvGPIFJ`gp2U>F5OG65B77WT#`F$!PDCiouK!mvZ;p4Y+qsZU3>pTa@-
zDR#w#!{&ccnT$oLFGClfL(LaNZdt&2g+d$+uVWDmVN<+;8mLat{53od+f(<@j~7va
zB^@ze%1kUp{R-*~T}3UR*o$VuXlzW~MIFikSWowVDurkomSZ#Ajy>=rY=qU1n!W3d
zEvU~!^*f3Q_%#l}3dhWcX97M%eF@gZzoX7f#Bq~}`lzjm$HM#HjDk|w4NKrSOvFj3
z6|AyuLv7Jv>nSWx{k-)GmZN^%)^DTwN1ZSWtb(dHvbM&6Cg@5*5e>kKIMkYkWvD-8
zU51sZuSfL{qTYYW*55>J!8^A7Q`9H@pI8mUUowZe7FMO+`X%zOhzHWp0mq>RUW;1U
z7Sx16tdD<2W$FfMkE2eS6*ol%l7xDHpsf$X6zVCq{s!v(4^a!fd6NBiDU>*6QWKAg
zv?b~q4Y2LQZ2LIWS$PyS(K1wkE3A8L`)jCv7i|0Ir~tpW7CCJ)RW3k5E3JXrn?%%)
zPg_jFj@TQYKm~Lbbw=Jo1@Hkj#J|{j(KBYE($;F$IMmj(MqR%o)cb(}wlLIo7>(NV
z38<~fvCkJ^BK2k10Z(EL`~ej}g_q3&I$C?7CK`kqXAD-ssi@S?M=}y{)>3Fr!%i%X
zpQ7&dKTr`?dc|C`ny7*LU@d&eIs+?EUxDiXf^|P?D_=yV{vA}NKSu?A1FP%)mwwem
z7K@so3u;A!P#tHXB3@yi??UbQOQ;oHw(Z}b_WWm5|1z(c@#<kL^;TFHN23CH3Zt3d
z$)lj_uno0>)7ICqFZH)jAEZiW%@=Vbs(lUC#H;9{^Sb#fI0oaX_CaNKx^=7dL)3>X
z;vD%`hYl2EIx6ywsFej#0lkI2@IBO?Ry}W0+5q*urLA|slGN|B?Sri&?ej-4mggB*
zA6K3y|1BxJM1y_<zO@}HzhP3>8N+EGh}w$5SR6B~Io2mosh@}U<MXIJ{~Pwf|3JOh
z?oIRU?}|OCk9(8+51_D(21WFpeNg3s`Pbwz*0tDx=T}gv`xWb8^FNz`A4E;~5Junx
z)LF_v^$TDOZbD`FRcwYI=|M>f5pS6ll*g{r8=$VC4=Z7|bunt9&8PwQTi?Z2)W1U=
zuDG|&g4$yO^@mXzT7+@90ToE#9EJNRe2QbS-bM3sItLZlb<_*rqgGV&l1XtQPNY5y
z)&3Q#|G!WZ-nQ+r@0gXgMP1WL7>SP~0R)_d6l&A30X4uWjK%ZV5DRR*^1G&AXVd^=
zQ2o=e5oV$Gc$0O9bss8&N3azB8MX2cF-rIUI)y|UezXr_FPnioq7Gj#)QbArdNwwv
zJ_{S;Zd8Uo#&UQE_2DV^p1DN{*pGU5)OX_<EREZ-xKenCg7)UP8t`q5!uM_cuc(3l
zY3o0s0(0Ise-RbM5>&gOi+!w<FrNA%^v*P@<?U+pY}mA5`^K3?y_k{BOLfc0%y@Ka
zW=@vlh4qLIo^3X)nD=?>YTm5LQKhD&Wu&J2rY5JQ2g|pK3$K_q-tS8s;T!K}`?9iK
zU!tCPt=i{$qej;Cj<$cV^bntahR^Q~eRP`7o893+^9gDGsma-CnHjdTJ2N@U&GKcW
zy4jiTqnSDWyY0y-DVaGL*-e6tI>v=n&q+^pGcvQ?^vsEA86DgP4X66DvXUqI;<LO#
zoxHFa-qlX8R7=iI9-o}$bA5h)reB>33-MV^f?GO26kcusvAK#TEyd^bN*v&AAK5i7
zhLVDIyQQZ38S`${#y!NBot>63G0XcQsctRPG0Utd%RX^)rllrl`%=Bi-3r1Iz3}d9
zyl=YyE$Vlp2G9055?&^*LBou+lqng>QwcjRIIquRMFPp>VOCm}=5Xzb-3gg~H+xcA
z)^C}xk@Y4YsqX*d4VQs5TNB5;nvv<wNKQ{nbth`YO(th$dS&mgPtYyzf39~olW%vp
z&!09SEye87kerkhk}@GD-RWbpWP8m_%bw&8>Xwr|sm1T!2%fn=A-tkF2X3+nTnn0-
z9Q<Oy<%qZklC!dAX8KeA&9)bgZ(j-S9u^tyEgV&*Saw==y3boVYP8pKO0-vJ^y1of
z0A(qMy<nR~e3r}h`LewoqlY&4`8B0-nl&jWJ2i7=hMPHoQ>LTX*qxT{(<w<w&*Yyo
zInbFiy&p%P4{PF`9`itH^U#-(?elw&jH)~S0n;!cEj``M%*l3>aYC9eJvA%FvCqs2
zFsFB#Ka;K+mjor-d=IhbyI<k$aesF<vYL3M$9j>4FWI9MTs!t+SYk?MMusmX+wH-Y
zam(DE_INvkeRm&a{kA<`>bT?>&XNCjck6DBbQg3Gf-jF-QKV|}3?HW`m8-x%hU(s$
zfPxQ>|0L{z!s|*Zvy=Ut>ff^E_oZhhr@GU)bI#pMp+e3y_xC4*>&)G{d)0jYV6)V!
zVS!|S%A~XzzEpR7X6BSEXUL??nQk(thfU1#rL#=F2&R>j=bM=6fAo*-g$XJ=N!j{f
z{O+Cf<cx_qME1w_X*uK5)3PS{{DD6{@sohesrN>s%yH5GS4SVKR<?37{1i=$Dm66?
z|GR$*XXoC5Id*B0zIz4^4)rC47juWEP4#)tOd9S@Ppj>{oVG9c$mFeI4eZsKL>kBY
zd>IVSXfx81?;ZnvY?}msnX)dt2w$)@nbWJfL$Zl4nLB0kZf|n1__X-2>LdJ_T!Uc*
zp#z{V!rd$AHJRRaoSV$a%3w42uuf!q(lXrStPbw)KUL1id%nwjm-Hd#8f4Do1-{yT
z-$YKH&u_ckdyl>J>8Bd<RsTOt<Hh+uE840<^LD|AtkNaC;GUtu@{ivvRweh)_27%4
z&2vKQPvvh}&rvo%Lf)X$O@iTbI)&G<H>B`)s9^rm(Bf?ci;ugZ4M*~Ktq5&6<#owD
z?nUfP^nS>_9+|s7|8TAwTEDqq^-AyK`9FD2o^BJoyx`$5?=O362b(V3ALg~%8yoz5
z(T(sj_nc#XGQ5#{A1ZryOgFUkRA|9cuUuYL@2zF6yb5{ohoAW%%u6|5-s_k5w?Fm^
z)?Yrdgx6-zlipKnM)1M?aLvy4*MqsC%_|A>cxcB4H&nPv$9_^xBP(!28yDs;USaQ;
zdBr<(|G?nuYY&7s{X;Y^YYHvdU|w6Dzx!l<-s;fv3qy-v%wMuFf62Ds^o?apdco6e
zgR@^a8t(b`{mJXJ|4`%5+`XZ-yFwfDe*2V$Hmr8@PvqtwoSlDoVZmy0xp8kOcN^h)
zQS)3c@<97$p~6JwZ$IUR{xm;->(YXis}*Nx+w#V4=-}zlhFmv)$)3>4+|bHXZo$f(
z!JY@Ygn4!L4e@^3+n|g25NbE`gGch`9w~g4Jz2Z6VCDM%**TkK^($DB3k8g~A=h(f
z*6`*W99!$2Ml$vM{QPAHS-dtsKW}I7^MfCU#sBv8>`pw}LQ5F^`GeOFA9S>&!jetB
z7d$+*-fx-6_YUQ6VOQ>E`0f`pJ}X!|SWu*4X!GpQ#_evwx?K0)oH)Cx>&FiUOC7xy
z_E6!OyF2}o^`VW+?O6`ZTga-e2RDaK>?BLMp|vX<lW50$Rn3koo4<uZyc$nQ2^Jh1
z8Wtdh*N@E3&tqwa=4)!^bqWK_%MY>*w&BDPB4w)l9eeL-E?ByhD`GFiJ?)`Y$3v@*
z+}m(;eZkT^&dNP)`5V{gFYB|-PT>|TUr&Oaf@c?nHveww4V;JBitc)lsi?g`ZRKLy
zXkYhYwpEGD-CQtlgB{3AI#IFolJ&$J+Od#XgZ)ly3y*M_;`+f{@1LiJdN)qj@$Nfw
zA^P8JL9pD*MT>MUyb5>sP}AK#4tzzG)Pe;s7OdpxY|afW*z$+l(j*xD>iJ?-w5V-_
zdv_GqY)SC)`Bh=wp}h&=q16k$x1O%)?K@G$D|4onS7}vQFM5A`aQ&Ob!f5E=ZMl&1
E-?e(BJOBUy

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 22e8ab740..6a9bfa8d6 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -22,16 +22,18 @@ msgid "Statistics"
 msgstr "통계"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "서버 다시 시작으로 새로고침 필요"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "서버를 종료하는 중, 창을 닫아야 함"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "재연결 성공"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -39,8 +41,8 @@ msgstr "알 수 없는 명령"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "성공적으로 %(eReadermail)s에 보내기 예약이 되었습니다"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -273,17 +275,17 @@ msgstr "LDAP 구성원 사용자 필터에 일치하지 않는 괄호가 있음"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "유요하지 않은 LDAP CACertificate, 인증서 또는 키 위치. 올바른 경로를 입력 필요"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "새 사용자 추가"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "사용자 추가"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "이메일 서버 설정 편집"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "Gmail 계정 인증 성공"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -343,12 +345,13 @@ msgid "Edit User %(nick)s"
 msgstr "사용자 %(nick)s 편집"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "사용자 %(user)s의 비밀번호 재설정"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
 
 #: cps/admin.py:1445
@@ -469,6 +472,10 @@ msgstr "모든 필드를 채워주십시오!"
 msgid "E-mail is not from valid domain"
 msgstr "유효한 도메인에서 온 이메일이 아니"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "새 사용자 추가"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -658,15 +665,18 @@ msgid "Send to eReader"
 msgstr "킨들로 보내기"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "이 이메일은 Calibre Web을 통해 전송되었습니다."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web 테스트 이메일"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "테스트 이메일"
 
 #: cps/helper.py:132
@@ -674,23 +684,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Web 시작하기"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "사용자 등록 이메일: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "%(orig)s를 %(format)s로 변환하고 킨들로 보내기"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "킨들에 %(format)s 보내기"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "%(book)s을 킨들로 보내기"
 
 #: cps/helper.py:230
@@ -740,16 +750,17 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "등록되어 있는 이메일 주소입니다"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "등록되어 있는 username입니다"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "이메일 주소 형식이 잘못되었습니다"
 
 #: cps/helper.py:815
@@ -820,7 +831,7 @@ msgstr "Kobo 설정"
 msgid "Register with %(provider)s"
 msgstr "%(provider)s에 등록"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
@@ -942,7 +953,8 @@ msgid "Read Books"
 msgstr "읽은 책"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "읽은 책과 읽지 않은 책 보기"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -959,7 +971,7 @@ msgid "Discover"
 msgstr "발견"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "무작위 추천"
 
@@ -969,7 +981,8 @@ msgid "Categories"
 msgstr "카테고리"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "카테고리별 보기"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -979,7 +992,8 @@ msgid "Series"
 msgstr "시리즈"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "시리즈별 보기"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -988,7 +1002,8 @@ msgid "Authors"
 msgstr "저자"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "저자별 보기"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -997,7 +1012,8 @@ msgid "Publishers"
 msgstr "출판사"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "출판사별 보기"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1007,7 +1023,8 @@ msgid "Languages"
 msgstr "언어"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "언어별 보기"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1015,7 +1032,8 @@ msgid "Ratings"
 msgstr "평점"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "평점별 보기"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1023,7 +1041,8 @@ msgid "File formats"
 msgstr "파일 유형"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "파일 유형별 보기"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1031,7 +1050,8 @@ msgid "Archived Books"
 msgstr "보관된 책"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "보관된 책 보기"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1315,10 +1335,14 @@ msgstr "평점 목록"
 msgid "File formats list"
 msgstr "파일 유형 목록"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다"
+msgstr "성공적으로 %(eReadermail)s에 보내기 예약이 되었습니다"
 
 #: cps/web.py:1207
 #, python-format
@@ -1326,7 +1350,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "책을 보내는 중에 오류 발생: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
 
 #: cps/web.py:1226
@@ -1374,24 +1399,29 @@ msgstr "새 비밀번호가 이메일로 전송되었습니다"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "다음 사용자로 로그인: '%(nickname)s"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s 프로필"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "프로필이 업데이트 됨"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "등록되어 있는 이메일 주소입니다"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "인증 정보가 포함된 유효한 gmail.json 파일을 찾을 수 없습니다"
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s을 킨들로 보내기"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1522,10 +1552,6 @@ msgstr "삭제"
 msgid "Public Shelf"
 msgstr "공개 책장"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "사용자 추가"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "LDAP 사용자 가져오기"
@@ -1556,7 +1582,8 @@ msgid "From Email"
 msgstr "From Email"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "EMail Service"
 
 #: cps/templates/admin.html:91
@@ -1628,6 +1655,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1635,7 +1663,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1643,7 +1671,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1663,10 +1692,6 @@ msgstr "Debug Package 다운로드"
 msgid "View Logs"
 msgstr "로그 보기"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Calibre DB 다시 연결"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "재시작"
@@ -2518,16 +2543,18 @@ msgid "Email Account Type"
 msgstr "서버 유형 선택"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "표준 이메일 계정 사용"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "OAuth2 인증이 있는 Gmail 계정"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "서버 유형 선택"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Gmail 계정을 이메일 서버로 설정"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2550,7 +2577,8 @@ msgid "Attachment Size Limit"
 msgstr "첨부 파일 크기 제한"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "저장 후 테스트 이메일 보내기"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3061,10 +3089,6 @@ msgstr "승인이 되면 이 장치에 자동으로 로그인됩니다."
 msgid "This verification link will expire in 10 minutes."
 msgstr "이 확인 링크는 10분 후에 만료됩니다."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3217,10 +3241,6 @@ msgstr "Progress"
 msgid "Run Time"
 msgstr "실행 시간"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "시작 시간"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3294,17 +3314,18 @@ msgid "Enter Username"
 msgstr "사용자 이름"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "이메일 주소 입력"
+#, fuzzy
+msgid "Enter Email"
+msgstr "테스트 이메일"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
-msgstr "킨들 이메일 주소 입력"
+msgid "Enter eReader Email"
+msgstr "킨들로 보내기 이메일 주소"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "테스트 이메일"
 
 #: cps/templates/user_table.html:137
@@ -3364,10 +3385,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "선택한 서재를 코보와 동기화"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "읽음/읽지 않음 선택 표시"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "랜덤 보기 표시"
-
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 3f99b29b352e14a0458403658ebe7160f371c0aa..cb2aab6941693104bf0b20514db9baf11bc26630 100644
GIT binary patch
delta 11566
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
O$@k(;T<{`aAM?N6(*i~S

delta 13671
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

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index fd3bb9e0f..b8bb4489e 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -24,16 +24,18 @@ msgid "Statistics"
 msgstr "Statistieken"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "De server is herstart, vernieuw de pagina"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Bezig met het afsluiten van de server, sluit het venster"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Opnieuw verbinden gelukt"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -41,8 +43,8 @@ msgstr "Onbekende opdracht"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -280,8 +282,8 @@ msgstr "LDAP Lid Gebruiker Filter heeft een niet-gebalanceerd haakje"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsjeblieft een geldig pad in."
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "Gebruiker toevoegen"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -289,8 +291,8 @@ msgid "Edit Email Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "Gmail Account succesvol geverifieerd"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -350,12 +352,13 @@ msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Stel eerst SMTP-mail in..."
 
 #: cps/admin.py:1445
@@ -480,6 +483,10 @@ msgstr "Vul alle velden in!"
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Gebruiker toevoegen"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -670,15 +677,18 @@ msgid "Send to eReader"
 msgstr "Versturen naar Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Deze e-mail is verstuurd via Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web - test-e-mail"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Test-e-mail"
 
 #: cps/helper.py:132
@@ -686,23 +696,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Aan de slag met Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Registratie-e-mailadres van gebruiker: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "%(orig)s converteren naar %(format)s en versturen naar Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "%(format)s versturen naar Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "%(book)s verzonden naar Kindle"
 
 #: cps/helper.py:230
@@ -752,17 +762,17 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-#, fuzzy
-msgid "Oops! An account already exists for this Email."
-msgstr "Bestaand account met dit e-mailadres aangetroffen."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is al in gebruik"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Ongeldig E-Mail adres"
 
 #: cps/helper.py:815
@@ -833,7 +843,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -955,7 +965,8 @@ msgid "Read Books"
 msgstr "Gelezen boeken"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -972,7 +983,7 @@ msgid "Discover"
 msgstr "Willekeurige boeken"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
@@ -982,7 +993,8 @@ msgid "Categories"
 msgstr "Categorieën"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Categoriekeuze tonen"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -992,7 +1004,8 @@ msgid "Series"
 msgstr "Boekenreeksen"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Boekenreeksenkeuze tonen"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -1001,7 +1014,8 @@ msgid "Authors"
 msgstr "Auteurs"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Auteurkeuze tonen"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1010,7 +1024,8 @@ msgid "Publishers"
 msgstr "Uitgevers"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Uitgeverskeuze tonen"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1020,7 +1035,8 @@ msgid "Languages"
 msgstr "Talen"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Taalkeuze tonen"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1028,7 +1044,8 @@ msgid "Ratings"
 msgstr "Beoordelingen"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Beoordelingen tonen"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1036,7 +1053,8 @@ msgid "File formats"
 msgstr "Bestandsformaten"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Bestandsformaten tonen"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1044,7 +1062,8 @@ msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Gearchiveerde boeken tonen"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1330,10 +1349,14 @@ msgstr "Beoordelingen"
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Stel eerst SMTP-mail in..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(kindlemail)s"
+msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1341,7 +1364,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Fout opgetreden bij het versturen van dit boek: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Stel je kindle-e-mailadres in..."
 
 #: cps/web.py:1226
@@ -1389,24 +1413,30 @@ msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Je bent ingelogd als: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)ss profiel"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Profiel bijgewerkt"
 
+#: cps/web.py:1416
+#, fuzzy
+msgid "Oops! An account already exists for this Email."
+msgstr "Bestaand account met dit e-mailadres aangetroffen."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Geen geldig gmail.json bestand gevonden met OAuth informatie"
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s verzonden naar Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1537,10 +1567,6 @@ msgstr "Verwijderen"
 msgid "Public Shelf"
 msgstr "Openbare boekenplank"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Gebruiker toevoegen"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "LDAP gebruikers importeren"
@@ -1571,7 +1597,8 @@ msgid "From Email"
 msgstr "Van e-mail"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "EMail Service"
 
 #: cps/templates/admin.html:91
@@ -1644,6 +1671,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1651,7 +1679,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1659,7 +1687,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1679,10 +1708,6 @@ msgstr "Download foutopsporingspakket"
 msgid "View Logs"
 msgstr "Logboeken bekijken"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Opnieuw verbinden met Calibre database"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Calibre-Web herstarten"
@@ -2540,16 +2565,18 @@ msgid "Email Account Type"
 msgstr "Kies Server Type"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Gebruik Standaard E-Mail Account"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Gmail Account met OAuth2 Verificatie"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Kies Server Type"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Gmail Account opzetten als E-Mail Server"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2572,7 +2599,8 @@ msgid "Attachment Size Limit"
 msgstr "Bijlage bestandsgrootte limiet"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Opslaan en test-e-mail versturen"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3090,10 +3118,6 @@ msgstr "Na controle wordt je automatisch op dit apparaat ingelogd."
 msgid "This verification link will expire in 10 minutes."
 msgstr "De link vervalt na 10 minuten."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3247,10 +3271,6 @@ msgstr "Voortgang"
 msgid "Run Time"
 msgstr "Looptijd"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Begintijd"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3324,17 +3344,18 @@ msgid "Enter Username"
 msgstr "Voer gebruikersnaam in"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "Voer e-mailadres in"
+#, fuzzy
+msgid "Enter Email"
+msgstr "Test-e-mail"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
-msgstr "Voer Kindle-e-mailadres in"
+msgid "Enter eReader Email"
+msgstr "Kindle-e-mailadres"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Test-e-mail"
 
 #: cps/templates/user_table.html:137
@@ -3397,10 +3418,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "Synchroniseer geselecteerde boekenplanken met Kobo"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "Toon gelezen/niet gelezen selectie"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Willekeurige boeken tonen"
-
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index f08bfb449e7d6ac848fe84ba5c59553874331525..7c7c6a3b5b6562599dcb839064fa1fa2b5414ab6 100644
GIT binary patch
delta 11656
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
b{^-Io!BfXR2?-nSo8iU1@t)_tIpKc*yK_J%

delta 13971
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

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index cf351cf5f..6101f91cb 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -24,16 +24,18 @@ msgid "Statistics"
 msgstr "Statystyki"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Ponowne połączenie zakończono sukcesem"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -41,8 +43,8 @@ msgstr "Nieznane polecenie"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Książka została umieszczona w kolejce do wysłania do %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Książka została umieszczona w kolejce do wysłania do %(eReadermail)s"
 
 # ???
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
@@ -280,8 +282,8 @@ msgstr "Filtr użytkownika członka LDAP ma niedopasowane nawiasy"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie jest prawidłowa, Proszę wprowadzić poprawną ścieżkę"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "Dodaj nowego użytkownika"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -289,8 +291,8 @@ msgid "Edit Email Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -351,12 +353,13 @@ msgstr "Edytuj użytkownika %(nick)s"
 
 # ???
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
 #: cps/admin.py:1445
@@ -481,6 +484,10 @@ msgstr "Proszę wypełnić wszystkie pola!"
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Dodaj nowego użytkownika"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -671,15 +678,18 @@ msgid "Send to eReader"
 msgstr "Wyślij do Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Ten e-mail został wysłany za pośrednictwem Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Testowy e-mail Calibre-Web"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Testowy e-mail"
 
 # ???
@@ -688,23 +698,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Zacznij korzystać z Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Rejestracja e-mail dla użytkownika: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Konwertuj %(orig)s do %(format)s i wyślij do Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "Wyślij %(format)s do Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Wyślij do Kindle"
 
 # ???
@@ -755,16 +765,17 @@ msgstr ""
 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:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Nieprawidłowy format adresu e-mail"
 
 #: cps/helper.py:815
@@ -836,7 +847,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -958,7 +969,8 @@ msgid "Read Books"
 msgstr "Przeczytane"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -975,7 +987,7 @@ msgid "Discover"
 msgstr "Odkrywaj"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
@@ -985,7 +997,8 @@ msgid "Categories"
 msgstr "Kategorie"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Pokaż menu wyboru kategorii"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -995,7 +1008,8 @@ msgid "Series"
 msgstr "Cykle"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Pokaż menu wyboru cyklu"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -1004,7 +1018,8 @@ msgid "Authors"
 msgstr "Autorzy"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Pokaż menu wyboru autora"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1013,7 +1028,8 @@ msgid "Publishers"
 msgstr "Wydawcy"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1023,7 +1039,8 @@ msgid "Languages"
 msgstr "Języki"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Pokaż menu wyboru języka"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1031,7 +1048,8 @@ msgid "Ratings"
 msgstr "Oceny"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Pokaż menu listy ocen"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1039,7 +1057,8 @@ msgid "File formats"
 msgstr "Formaty plików"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Pokaż menu formatu plików"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1047,7 +1066,8 @@ msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Pokaż zarchiwizowane książki"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1334,10 +1354,14 @@ msgstr "Lista z ocenami"
 msgid "File formats list"
 msgstr "Lista formatów"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Książka została umieszczona w kolejce do wysłania do %(kindlemail)s"
+msgstr "Książka została umieszczona w kolejce do wysłania do %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1345,7 +1369,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
 #: cps/web.py:1226
@@ -1393,24 +1418,29 @@ msgstr "Nowe hasło zostało wysłane na Twój adres e-mail"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Profil użytkownika %(name)s"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Zaktualizowano profil"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Nie znaleziono poprawnego pliku gmail.json z informacjami OAuth"
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Wyślij do Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1544,10 +1574,6 @@ msgstr "Usuń"
 msgid "Public Shelf"
 msgstr "Półka publiczna"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Dodaj nowego użytkownika"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Importuj użytkowników LDAP"
@@ -1578,7 +1604,8 @@ msgid "From Email"
 msgstr "Wyślij z adresu e-mail"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "Usługa e-mail"
 
 #: cps/templates/admin.html:91
@@ -1650,6 +1677,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1657,7 +1685,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1665,7 +1693,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1685,10 +1714,6 @@ msgstr "Pobierz pakiet Debug"
 msgid "View Logs"
 msgstr "Podgląd dziennika"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Połącz ponownie z bazą danych Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Uruchom ponownie Calibre Web"
@@ -2552,16 +2577,18 @@ msgid "Email Account Type"
 msgstr "Wybierz typ serwera"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Użyj standardowego konta e-mail"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Konto Gmail z weryfikacją OAuth2"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Wybierz typ serwera"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Skonfiguruj konto Gmail jako serwer poczty e-mail"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2584,7 +2611,8 @@ msgid "Attachment Size Limit"
 msgstr "Limit rozmiaru załącznika"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Zapisz ustawienia i wyślij testową wiadomość e-mail"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3106,10 +3134,6 @@ msgstr "Gdy to zrobisz, automatycznie zalogujesz się na tym urządzeniu."
 msgid "This verification link will expire in 10 minutes."
 msgstr "Link wygaśnie po 10 minutach."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3263,10 +3287,6 @@ msgstr "Postęp"
 msgid "Run Time"
 msgstr "Czas wykonania"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Start"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3340,17 +3360,18 @@ msgid "Enter Username"
 msgstr "Wprowadź nazwę użytkownika"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "Wpisz adres e-mail"
+#, fuzzy
+msgid "Enter Email"
+msgstr "Testowy e-mail"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
-msgstr "Wprowadź adres e-mail Kindle"
+msgid "Enter eReader Email"
+msgstr "Adres e-mail dla wysyłania do Kindle"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Testowy e-mail"
 
 #: cps/templates/user_table.html:137
@@ -3413,10 +3434,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "Zsynchronizuj wybrane półki z Kobo"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "Pokaż wybór przeczytane/nieprzeczytane"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Pokaż menu losowych książek"
-
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index fc9eac12c1c90f156f580532b3b92393d19f5037..e232503ba0df8faacc785a629ba00d4576fc621e 100644
GIT binary patch
delta 13324
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
M>tEm5C$7!<A8FLLh5!Hn

delta 15888
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
Yj&yKV?#y(Wo&3uA>`0b#?&Q+{0a7OWF#rGn

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 581148e6f..99d85f646 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -20,16 +20,18 @@ msgid "Statistics"
 msgstr "Estatísticas"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Servidor reiniciado, por favor recarregue a página"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Executando o desligamento do servidor, por favor feche a janela"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Reconexão bem-sucedida"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -37,8 +39,8 @@ msgstr "Comando desconhecido"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Livro enfileirado com sucesso para envio para %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -271,17 +273,17 @@ msgstr "Filtro de usuário de membro LDAP tem parênteses incomparáveis"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Localização de LDAP CACertificate, Certificados ou Key Inválida, Insira o Caminho Correto"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Adicionar novo usuário"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "Adicionar Novo Usuário"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "Editar configurações do servidor de e-mail"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "Verificação da Conta Gmail com Sucesso"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -341,12 +343,13 @@ msgid "Edit User %(nick)s"
 msgstr "Editar Usuário %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Senha do usuário %(user)s redefinida"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
 #: cps/admin.py:1445
@@ -467,6 +470,10 @@ msgstr "Por favor, preencha todos os campos!"
 msgid "E-mail is not from valid domain"
 msgstr "O e-mail não é de um domínio válido"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Adicionar novo usuário"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -655,15 +662,18 @@ msgid "Send to eReader"
 msgstr "Enviar para E-Reader"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Este e-mail foi enviado via Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "E-mail de teste do Calibre-Web"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "E-mail de teste"
 
 #: cps/helper.py:132
@@ -671,23 +681,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Comece a usar o calibre-web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "E-mail de registro do usuário: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Converter %(orig)s em %(format)s e enviar para E-Reader"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, python-format
-msgid "Send %(format)s to E-Reader"
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader"
 msgstr "Enviar %(format)s para o E-Reader"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
-#, python-format
-msgid "%(book)s send to E-Reader"
+#: cps/helper.py:225
+#, fuzzy, python-format
+msgid "%(book)s send to eReader"
 msgstr "%(book)s enviado para E-Reader"
 
 #: cps/helper.py:230
@@ -737,16 +747,17 @@ msgstr "Erro ao renomear arquivo no caminho: {}"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "Encontrada uma conta existente para este endereço de e-mail."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Este nome de usuário já está registrado"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Formato de endereço de e-mail inválido"
 
 #: cps/helper.py:815
@@ -816,7 +827,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -938,7 +949,8 @@ msgid "Read Books"
 msgstr "Livros Lidos"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Mostrar lido e não lido"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -955,7 +967,7 @@ msgid "Discover"
 msgstr "Descubra"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Mostrar Livros Aleatórios"
 
@@ -965,7 +977,8 @@ msgid "Categories"
 msgstr "Categorias"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Mostrar seleção de categoria"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -975,7 +988,8 @@ msgid "Series"
 msgstr "Série"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Mostrar seleção de séries"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -984,7 +998,8 @@ msgid "Authors"
 msgstr "Autores"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Mostrar seleção de autor"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -993,7 +1008,8 @@ msgid "Publishers"
 msgstr "Editoras"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Mostrar seleção de editoras"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1003,7 +1019,8 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Mostrar seleção de idioma"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1011,7 +1028,8 @@ msgid "Ratings"
 msgstr "Avaliações"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Mostrar seleção de avaliações"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1019,7 +1037,8 @@ msgid "File formats"
 msgstr "Formatos de arquivo"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Mostrar seleção de formatos de arquivo"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1027,7 +1046,8 @@ msgid "Archived Books"
 msgstr "Livros Arquivados"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Mostrar livros arquivados"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1310,10 +1330,14 @@ msgstr "Lista de Avaliações"
 msgid "File formats list"
 msgstr "Lista de formatos de arquivo"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
+msgstr "Livro enfileirado com sucesso para envio para %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1321,7 +1345,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Ops! Ocorreu um erro ao enviar este livro: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail Envie Para o Kindle válido."
 
 #: cps/web.py:1226
@@ -1369,24 +1394,29 @@ msgstr "Nova Senha foi enviada para seu endereço de e-mail"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Você agora está logado como: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Perfil de %(name)s"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Perfil atualizado"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "Encontrada uma conta existente para este endereço de e-mail."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Não foi encontrado nenhum arquivo gmail.json válido com informações do OAuth"
 
+#: cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s enviado para E-Reader"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1516,10 +1546,6 @@ msgstr "Apagar"
 msgid "Public Shelf"
 msgstr "Estante Pública"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Adicionar Novo Usuário"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Importar usuários LDAP"
@@ -1550,7 +1576,8 @@ msgid "From Email"
 msgstr "Do E-mail"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "Serviço de E-Mail"
 
 #: cps/templates/admin.html:91
@@ -1622,6 +1649,7 @@ msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr "Hora em que as tarefas começam a ser executadas"
 
@@ -1629,7 +1657,7 @@ msgstr "Hora em que as tarefas começam a ser executadas"
 msgid "Maximum Duration"
 msgstr "Duração máxima das tarefas"
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr "Gerar miniaturas de capa de livro"
 
@@ -1637,7 +1665,8 @@ msgstr "Gerar miniaturas de capa de livro"
 msgid "Generate series cover thumbnails"
 msgstr "Gerar miniaturas de capa de séries"
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr "Reconectar à Biblioteca do Calibre"
 
@@ -1657,10 +1686,6 @@ msgstr "Baixar Pacote de Depuração"
 msgid "View Logs"
 msgstr "Ver Logs"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Reconectar Banco de dados Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Reiniciar"
@@ -2512,16 +2537,18 @@ msgid "Email Account Type"
 msgstr "Escolha o Tipo do Servidor"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Use Conta de E-Mail Padrão"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Conta Gmail com Verificação OAuth2"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Escolha o Tipo do Servidor"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Configurar conta do Gmail como servidor de e-mail"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2544,7 +2571,8 @@ msgid "Attachment Size Limit"
 msgstr "Limite do Tamanho do Anexo"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Salvar e enviar e-mail de teste"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3053,10 +3081,6 @@ msgstr "Uma vez verificado, você será automaticamente conectado a este disposi
 msgid "This verification link will expire in 10 minutes."
 msgstr "Este link de verificação irá expirar em 10 minutos."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr "Gerar miniaturas de capa de Livro"
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr "Gerar miniaturas de capa de Série"
@@ -3209,10 +3233,6 @@ msgstr "Progresso"
 msgid "Run Time"
 msgstr "Tempo de execução"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Hora de início"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr "Ações"
@@ -3286,15 +3306,18 @@ msgid "Enter Username"
 msgstr "Escolha um nome de usuário"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "Seu endereço de e-mail"
+#, fuzzy
+msgid "Enter Email"
+msgstr "E-mail de teste"
 
 #: cps/templates/user_table.html:136
-msgid "Enter E-Reader Email Address"
-msgstr "Digite o endereço de e-mail do E-Reader"
+#, fuzzy
+msgid "Enter eReader Email"
+msgstr "Enviar para o endereço de e-mail do E-Reader"
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
+#, fuzzy
+msgid "eReader Email"
 msgstr "E-mail do E-Reader"
 
 #: cps/templates/user_table.html:137
@@ -3354,10 +3377,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "Sincronizar Estantes Selecionadas com Kobo"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "Mostrar seleção de lidos/não lidos"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Mostrar livros aleatórios"
-
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index cb2431692ee27c642ba414bb328dfac79a1349c7..fdd5901c81d6d06b1d1e8c72499d90cc2f812239 100644
GIT binary patch
delta 8697
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
HFVXcMN7y%h

delta 10621
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

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 47c15e070..023386d07 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -24,16 +24,18 @@ msgid "Statistics"
 msgstr "Статистика"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Сервер перезагружен, пожалуйста, обновите страницу"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Успешно переподключено"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -41,8 +43,8 @@ msgstr "Неизвестная команда"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Книга успешно поставлена в очередь для отправки на %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -281,16 +283,16 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Добавить пользователя"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr "Добавить нового пользователя"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "Изменить настройки SMTP"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -351,12 +353,13 @@ msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
 #: cps/admin.py:1445
@@ -481,6 +484,10 @@ msgstr "Пожалуйста, заполните все поля!"
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Добавить пользователя"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -671,15 +678,18 @@ msgid "Send to eReader"
 msgstr "Отправить на Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Это электронное письмо было отправлено через Caliber-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Тестовый e-mail для Calibre-Web"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Тестовый e-mail"
 
 #: cps/helper.py:132
@@ -687,23 +697,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Начать работу с Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Регистрационный e-mail для пользователя: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Преобразовать %(orig)s в %(format)s и отправить в Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "Отправить %(format)s в Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Отправить на Kindle"
 
 #: cps/helper.py:230
@@ -753,17 +763,16 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-#, fuzzy
-msgid "Oops! An account already exists for this Email."
-msgstr "Этот адрес электронной почты уже зарегистрирован."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+msgid "Invalid Email address format"
 msgstr ""
 
 #: cps/helper.py:815
@@ -833,7 +842,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -955,7 +964,8 @@ msgid "Read Books"
 msgstr "Прочитанные Книги"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -972,7 +982,7 @@ msgid "Discover"
 msgstr "Обзор"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Показывать Случайные Книги"
 
@@ -982,7 +992,8 @@ msgid "Categories"
 msgstr "Категории"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Показывать выбор категории"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -992,7 +1003,8 @@ msgid "Series"
 msgstr "Серии"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Показывать выбор серии"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -1001,7 +1013,8 @@ msgid "Authors"
 msgstr "Авторы"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Показывать выбор автора"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1010,7 +1023,8 @@ msgid "Publishers"
 msgstr "Издатели"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Показать выбор издателя"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1020,7 +1034,8 @@ msgid "Languages"
 msgstr "Языки"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Показывать выбор языка"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1028,7 +1043,8 @@ msgid "Ratings"
 msgstr "Рейтинги"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Показать выбор рейтинга"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1036,7 +1052,8 @@ msgid "File formats"
 msgstr "Форматы файлов"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Показать выбор форматов файлов"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1044,8 +1061,9 @@ msgid "Archived Books"
 msgstr ""
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
-msgstr ""
+#, fuzzy
+msgid "Show Archived Books"
+msgstr "Показывать недавние книги"
 
 #: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
@@ -1330,10 +1348,14 @@ msgstr "Список рейтингов"
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Пожалуйста, сперва настройте параметры SMTP....."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
+msgstr "Книга успешно поставлена в очередь для отправки на %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1341,7 +1363,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
 #: cps/web.py:1226
@@ -1389,24 +1412,30 @@ msgstr "Новый пароль был отправлен на ваш адрес
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Вы вошли как: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Профиль %(name)s's"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Профиль обновлён"
 
+#: cps/web.py:1416
+#, fuzzy
+msgid "Oops! An account already exists for this Email."
+msgstr "Этот адрес электронной почты уже зарегистрирован."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Отправить на Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1537,10 +1566,6 @@ msgstr "Удалить"
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Добавить нового пользователя"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Импорт пользователей LDAP"
@@ -1571,7 +1596,7 @@ msgid "From Email"
 msgstr "Отправитель"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+msgid "Email Service"
 msgstr ""
 
 #: cps/templates/admin.html:91
@@ -1644,6 +1669,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1651,7 +1677,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1659,7 +1685,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1679,10 +1706,6 @@ msgstr ""
 msgid "View Logs"
 msgstr "Просмотреть лог файл"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Пере подключиться к базе жанных Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Перезагрузить Calibre-Web"
@@ -2540,15 +2563,16 @@ msgid "Email Account Type"
 msgstr ""
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+msgid "Standard Email Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr ""
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Учетная запись"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
+msgid "Setup Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:24
@@ -2572,7 +2596,8 @@ msgid "Attachment Size Limit"
 msgstr ""
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Сохранить настройки и отправить тестовое письмо"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3090,10 +3115,6 @@ msgstr "После этого вы автоматически войдете в
 msgid "This verification link will expire in 10 minutes."
 msgstr "Срок действия ссылки истекает через 10 минут."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3247,10 +3268,6 @@ msgstr "Прогресс"
 msgid "Run Time"
 msgstr "Время выполнения"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Время начала"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3327,17 +3344,17 @@ msgstr "Выберите имя пользователя"
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
-msgstr "Ваш email-адрес"
+msgid "Enter Email"
+msgstr "Тестовый e-mail"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
+msgid "Enter eReader Email"
 msgstr "Отправить на Kindle Адрес электронной почты"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Тестовый e-mail"
 
 #: cps/templates/user_table.html:137
@@ -3407,10 +3424,6 @@ msgstr ""
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "Показывать выбор серии"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Показывать случайные книги"
-
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 968865b21bbdb8ed57c65b3e80f701e4e12040a8..ab018243e9a9d790b5c76788a83dc2dba7f1c5ed 100644
GIT binary patch
delta 11374
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
Ha^8Od#1!8d

delta 13392
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
R&F*{E$=cS@`S`wZ{{zu6eFy*m

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index f8aab4182..9fcf9e495 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -23,16 +23,18 @@ msgid "Statistics"
 msgstr "Statistik"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Server startas om, vänligen uppdatera sidan"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Stänger servern, vänligen stäng fönstret"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Återanslutning lyckades"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -40,8 +42,8 @@ msgstr "Okänt kommando"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "Boken är i kö för att skicka till %(kindlemail)s"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "Boken är i kö för att skicka till %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -278,8 +280,8 @@ msgstr "Användarfilter för LDAP-medlemmar har omatchad parentes"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "Lägg till ny användare"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -287,9 +289,8 @@ msgid "Edit Email Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
 #: cps/admin.py:1287
-#, fuzzy
-msgid "Gmail Account Verification Successful"
-msgstr "Verifiering av G-mail-kontot lyckades"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -349,12 +350,13 @@ msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
 #: cps/admin.py:1445
@@ -479,6 +481,10 @@ msgstr "Fyll i alla fält!"
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Lägg till ny användare"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -668,15 +674,18 @@ msgid "Send to eReader"
 msgstr "Skicka till Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web test e-post"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Test e-post"
 
 #: cps/helper.py:132
@@ -684,23 +693,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Kom igång med Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Registrera e-post för användare: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Konvertera %(orig)s till %(format)s och skicka till Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "Skicka %(format)s till Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Skicka till Kindle"
 
 #: cps/helper.py:230
@@ -750,16 +759,17 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "Hittade ett befintligt konto för den här e-postadressen"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Ogiltigt e-postadressformat"
 
 #: cps/helper.py:815
@@ -830,7 +840,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -952,7 +962,8 @@ msgid "Read Books"
 msgstr "Lästa böcker"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -969,7 +980,7 @@ msgid "Discover"
 msgstr "Upptäck"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
@@ -979,7 +990,8 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Visa kategorival"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -989,7 +1001,8 @@ msgid "Series"
 msgstr "Serier"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Visa serieval"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -998,7 +1011,8 @@ msgid "Authors"
 msgstr "Författare"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Visa författarval"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1007,7 +1021,8 @@ msgid "Publishers"
 msgstr "Förlag"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Visa urval av förlag"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1017,7 +1032,8 @@ msgid "Languages"
 msgstr "Språk"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Visa språkval"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1025,7 +1041,8 @@ msgid "Ratings"
 msgstr "Betyg"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Visa val av betyg"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1033,7 +1050,8 @@ msgid "File formats"
 msgstr "Filformat"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Visa val av filformat"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1041,7 +1059,8 @@ msgid "Archived Books"
 msgstr "Arkiverade böcker"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Visa arkiverade böcker"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1327,10 +1346,14 @@ msgstr "Betygslista"
 msgid "File formats list"
 msgstr "Lista över filformat"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Konfigurera SMTP-postinställningarna först..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Boken är i kö för att skicka till %(kindlemail)s"
+msgstr "Boken är i kö för att skicka till %(eReadermail)s"
 
 #: cps/web.py:1207
 #, python-format
@@ -1338,7 +1361,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Det gick inte att skicka den här boken: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "Konfigurera din kindle-e-postadress först..."
 
 #: cps/web.py:1226
@@ -1386,24 +1410,29 @@ msgstr "Nytt lösenord skickades till din e-postadress"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Du är nu inloggad som: \"%(nickname)s\""
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)ss profil"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Profilen uppdaterad"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "Hittade ett befintligt konto för den här e-postadressen"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "Hittade ingen giltig gmail.json-fil med OAuth-information"
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Skicka till Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1534,10 +1563,6 @@ msgstr "Ta bort"
 msgid "Public Shelf"
 msgstr "Publik hylla"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Lägg till ny användare"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "Importera LDAP-användare"
@@ -1568,7 +1593,8 @@ msgid "From Email"
 msgstr "Från meddelande"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "E-posttjänst"
 
 #: cps/templates/admin.html:91
@@ -1641,6 +1667,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1648,7 +1675,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1656,7 +1683,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1676,10 +1704,6 @@ msgstr "Hämta felsökningspaketet"
 msgid "View Logs"
 msgstr "Visa loggfiler"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Anslut till Calibre DB igen"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Starta om Calibre-Web"
@@ -2537,17 +2561,18 @@ msgid "Email Account Type"
 msgstr "Välj servertyp"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Använd standard e-postkonto"
 
 #: cps/templates/email_edit.html:16
 #, fuzzy
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Gmail-konto med OAuth2-verifiering"
+msgid "Gmail Account"
+msgstr "Välj servertyp"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Ställ in Gmail-kontot som e-postserver"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2570,7 +2595,8 @@ msgid "Attachment Size Limit"
 msgstr "Gräns för bilagestorlek"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Spara inställningarna och skicka test-e-post"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3087,10 +3113,6 @@ msgstr "När du gör det kommer du automatiskt att logga in på den här enheten
 msgid "This verification link will expire in 10 minutes."
 msgstr "Länken går ut efter 10 minuter."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3243,10 +3265,6 @@ msgstr "Förlopp"
 msgid "Run Time"
 msgstr "Drifttid"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Starttid"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3320,17 +3338,18 @@ msgid "Enter Username"
 msgstr "Ange användarnamn"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "Ange e-postadress"
+#, fuzzy
+msgid "Enter Email"
+msgstr "Test e-post"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
-msgstr "Ange Kindle e-postadress"
+msgid "Enter eReader Email"
+msgstr "Kindle"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Test e-post"
 
 #: cps/templates/user_table.html:137
@@ -3392,10 +3411,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr ""
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "Visa läst/oläst val"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Visa slumpmässiga böcker"
-
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 938c3bf8f4ca7a245f27fcfd62d1248bb3062182..4b704a59f904fce8d473aff74d043c924b8057b8 100644
GIT binary patch
delta 5820
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

delta 7031
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

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index abc5f6e5c..826df680a 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -23,15 +23,17 @@ msgid "Statistics"
 msgstr "İstatistikler"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Sunucu yeniden başlatıldı, lütfen sayfayı yeniden yükleyin"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Sunucu kapatıyor, lütfen pencereyi kapatın"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
+msgid "Success! Database Reconnected"
 msgstr ""
 
 #: cps/admin.py:161
@@ -40,8 +42,8 @@ msgstr ""
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "%(kindlemail)s'a gönderilmek üzere başarıyla sıraya alındı"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "%(eReadermail)s'a gönderilmek üzere başarıyla sıraya alındı"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -275,16 +277,16 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Yeni kullanıcı ekle"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr ""
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr ""
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -345,12 +347,13 @@ msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
 #: cps/admin.py:1445
@@ -474,6 +477,10 @@ msgstr "Lütfen tüm alanları doldurun!"
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Yeni kullanıcı ekle"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -664,15 +671,18 @@ msgid "Send to eReader"
 msgstr "Kindle'a gönder"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "Bu e-Posta Calibre-Web ile gönderilmiştir."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web deneme e-Postası"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Deneme e-Postası"
 
 #: cps/helper.py:132
@@ -680,23 +690,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Web'i Kullanmaya Başlayın"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Kullanıcı Kayıt e-Postası: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "%(orig)s'dan %(format)s biçimine çevir ve Kindle'a gönder"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "%(format)s biçimlerini Kindle'a gönder"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Kindle'a gönder"
 
 #: cps/helper.py:230
@@ -746,17 +756,16 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:644 cps/web.py:1416
-#, fuzzy
-msgid "Oops! An account already exists for this Email."
-msgstr "Bu e-posta adresi için bir hesap mevcut."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Bu kullanıcı adı zaten alındı"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+msgid "Invalid Email address format"
 msgstr ""
 
 #: cps/helper.py:815
@@ -825,7 +834,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -947,7 +956,8 @@ msgid "Read Books"
 msgstr "Okunanlar"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Okunan ve okunmayanları göster"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -964,7 +974,7 @@ msgid "Discover"
 msgstr "Keşfet"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Rastgele Kitap Göster"
 
@@ -974,7 +984,8 @@ msgid "Categories"
 msgstr "Kategoriler"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Kategori seçimini göster"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -984,7 +995,8 @@ msgid "Series"
 msgstr "Seriler"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Seri seçimini göster"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -993,7 +1005,8 @@ msgid "Authors"
 msgstr "Yazarlar"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Yazar seçimini göster"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1002,7 +1015,8 @@ msgid "Publishers"
 msgstr "Yayıncılar"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Yayıncı seçimini göster"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1012,7 +1026,8 @@ msgid "Languages"
 msgstr "Diller"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Dil seçimini göster"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1020,7 +1035,8 @@ msgid "Ratings"
 msgstr "Değerlendirmeler"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Değerlendirme seçimini göster"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1028,7 +1044,8 @@ msgid "File formats"
 msgstr "Biçimler"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Dosya biçimi seçimini göster"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1036,8 +1053,9 @@ msgid "Archived Books"
 msgstr ""
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
-msgstr ""
+#, fuzzy
+msgid "Show Archived Books"
+msgstr "Son eKitapları göster"
 
 #: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
@@ -1322,10 +1340,14 @@ msgstr "Değerlendirme listesi"
 msgid "File formats list"
 msgstr "Biçim listesi"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "%(kindlemail)s'a gönderilmek üzere başarıyla sıraya alındı"
+msgstr "%(eReadermail)s'a gönderilmek üzere başarıyla sıraya alındı"
 
 #: cps/web.py:1207
 #, python-format
@@ -1333,7 +1355,7 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr ""
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr ""
 
 #: cps/web.py:1226
@@ -1381,24 +1403,30 @@ msgstr "Yeni şifre e-Posta adresinize gönderildi"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "Giriş yaptınız: '%(nickname)s'"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s Profili"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Profil güncellendi"
 
+#: cps/web.py:1416
+#, fuzzy
+msgid "Oops! An account already exists for this Email."
+msgstr "Bu e-posta adresi için bir hesap mevcut."
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Kindle'a gönder"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1529,10 +1557,6 @@ msgstr "Sil"
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr ""
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr ""
@@ -1563,7 +1587,7 @@ msgid "From Email"
 msgstr ""
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+msgid "Email Service"
 msgstr ""
 
 #: cps/templates/admin.html:91
@@ -1636,6 +1660,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1643,7 +1668,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1651,7 +1676,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1671,10 +1697,6 @@ msgstr ""
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr ""
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr ""
@@ -2530,15 +2552,16 @@ msgid "Email Account Type"
 msgstr ""
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+msgid "Standard Email Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr ""
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Hesap"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
+msgid "Setup Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:24
@@ -2562,7 +2585,7 @@ msgid "Attachment Size Limit"
 msgstr ""
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+msgid "Save and Send Test Email"
 msgstr ""
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3079,10 +3102,6 @@ msgstr ""
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3236,10 +3255,6 @@ msgstr "İlerleme"
 msgid "Run Time"
 msgstr ""
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr ""
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3315,17 +3330,17 @@ msgstr "Kullanıcı adı seç"
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
+msgid "Enter Email"
+msgstr "Deneme e-Postası"
+
+#: cps/templates/user_table.html:136
+#, fuzzy
+msgid "Enter eReader Email"
 msgstr "E-Posta adresiniz"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
-msgstr "E-Posta adresiniz"
-
-#: cps/templates/user_table.html:136
-#, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Deneme e-Postası"
 
 #: cps/templates/user_table.html:137
@@ -3389,10 +3404,6 @@ msgstr ""
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "Seri seçimini göster"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Rastgele eKitap göster"
-
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 09f90391b84ba2221742e184b81a208ddbb415c6..e29208dfb06efe639590d40b098d5d92fe5b9fd0 100644
GIT binary patch
delta 5497
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
ZchY|6<GPYiVDh%EPF>wXCvIBh{{X$$cX<E+

delta 6661
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
DG<uJ~

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 449de6d31..aa6c38ac6 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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+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"
@@ -22,23 +22,25 @@ msgid "Statistics"
 msgstr "Статистика"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Сервер перезавантажено, будь-ласка, перезавантажте сторінку"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Виконується зупинка серверу, будь-ласка, закрийте вікно"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Підключення успішне"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Невідома команда"
 
 #: cps/admin.py:172
-msgid "Books successfully queued for Metadata Backup"
+msgid "Success! Books queued for Metadata Backup"
 msgstr ""
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
@@ -277,16 +279,16 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
-msgstr "Додати користувача"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
+msgstr ""
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
 msgid "Edit Email Server Settings"
 msgstr "Змінити налаштування SMTP"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -348,11 +350,12 @@ msgstr "Змінити користувача %(nick)s"
 
 #: cps/admin.py:1428
 #, python-format
-msgid "Password for user %(user)s reset"
+msgid "Success! Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
 #: cps/admin.py:1445
@@ -475,6 +478,10 @@ msgstr "Будь-ласка, заповніть всі поля!"
 msgid "E-mail is not from valid domain"
 msgstr ""
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Додати користувача"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -664,15 +671,15 @@ msgid "Send to eReader"
 msgstr "Відправити на Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+msgid "This Email has been sent via Calibre-Web."
 msgstr ""
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+msgid "Calibre-Web Test Email"
 msgstr ""
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+msgid "Test Email"
 msgstr ""
 
 #: cps/helper.py:132
@@ -681,22 +688,22 @@ msgstr ""
 
 #: cps/helper.py:137
 #, python-format
-msgid "Registration e-mail for user: %(name)s"
+msgid "Registration Email for user: %(name)s"
 msgstr ""
 
 #: cps/helper.py:148 cps/helper.py:154
 #, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr ""
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, python-format
-msgid "Send %(format)s to E-Reader"
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader"
 msgstr "Надіслати %(format)s до E-Reader"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "Відправити на Kindle"
 
 #: cps/helper.py:230
@@ -746,8 +753,8 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
 msgstr ""
 
 #: cps/helper.py:652
@@ -755,7 +762,7 @@ msgid "This username is already taken"
 msgstr ""
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+msgid "Invalid Email address format"
 msgstr ""
 
 #: cps/helper.py:815
@@ -824,7 +831,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -946,7 +953,8 @@ msgid "Read Books"
 msgstr "Прочитані книги"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -963,7 +971,7 @@ msgid "Discover"
 msgstr "Огляд"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
@@ -973,7 +981,8 @@ msgid "Categories"
 msgstr "Категорії"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Показувати вибір категорії"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -983,7 +992,8 @@ msgid "Series"
 msgstr "Серії"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Показувати вибір серії"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -992,7 +1002,8 @@ msgid "Authors"
 msgstr "Автори"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Показувати вибір автора"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1001,8 +1012,9 @@ msgid "Publishers"
 msgstr "Видавництва"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
-msgstr ""
+#, fuzzy
+msgid "Show Publisher Section"
+msgstr "Показувати вибір серії"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
@@ -1011,7 +1023,8 @@ msgid "Languages"
 msgstr "Мови"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Показувати вибір мови"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1019,24 +1032,27 @@ msgid "Ratings"
 msgstr "Рейтинги"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
-msgstr ""
+#, fuzzy
+msgid "Show Ratings Section"
+msgstr "Показувати вибір серії"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Формати файлів"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
-msgstr ""
+#, fuzzy
+msgid "Show File Formats Section"
+msgstr "Показувати вибір серії"
 
 #: cps/render_template.py:94 cps/web.py:768
 msgid "Archived Books"
 msgstr "Архівні книжки"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
-msgstr ""
+#, fuzzy
+msgid "Show Archived Books"
+msgstr "Архівні книжки"
 
 #: cps/render_template.py:99 cps/web.py:799
 msgid "Books List"
@@ -1320,6 +1336,10 @@ msgstr "Список рейтингів"
 msgid "File formats list"
 msgstr "Список форматів файлу"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
@@ -1331,7 +1351,7 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr ""
 
 #: cps/web.py:1226
@@ -1379,24 +1399,29 @@ msgstr ""
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr ""
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Профіль %(name)s"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "Профіль оновлено"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr ""
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "Відправити на Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1527,10 +1552,6 @@ msgstr "Видалити"
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr ""
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr ""
@@ -1561,7 +1582,7 @@ msgid "From Email"
 msgstr "Відправник"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+msgid "Email Service"
 msgstr ""
 
 #: cps/templates/admin.html:91
@@ -1634,6 +1655,7 @@ msgid "Scheduled Tasks"
 msgstr "Заплановані завдання"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1641,7 +1663,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr "Максимальний час завдання"
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1649,7 +1671,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1669,10 +1692,6 @@ msgstr ""
 msgid "View Logs"
 msgstr "Переглянути логи"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Повторне підключення до БД Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Перезавантажити"
@@ -2528,15 +2547,15 @@ msgid "Email Account Type"
 msgstr ""
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+msgid "Standard Email Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
+msgid "Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
+msgid "Setup Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:24
@@ -2560,7 +2579,8 @@ msgid "Attachment Size Limit"
 msgstr "Обмеження розміру вкладення"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Зберегти налаштування і відправити тестове повідомлення"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3072,10 +3092,6 @@ msgstr "Після цього ви автоматично ввійдете в с
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3229,10 +3245,6 @@ msgstr "Прогрес"
 msgid "Run Time"
 msgstr "Тривалість"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Час початку"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr "Дії"
@@ -3309,17 +3321,18 @@ msgstr "Виберіть ім'я користувача"
 
 #: cps/templates/user_table.html:135
 #, fuzzy
-msgid "Enter Email Address"
-msgstr "Ваш email-адрес"
+msgid "Enter Email"
+msgstr "Kindle"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
-msgstr "Ваш email-адрес"
+msgid "Enter eReader Email"
+msgstr "Kindle"
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
-msgstr ""
+#, fuzzy
+msgid "eReader Email"
+msgstr "Kindle"
 
 #: cps/templates/user_table.html:137
 msgid "Locale"
@@ -3381,10 +3394,6 @@ msgstr ""
 
 #: cps/templates/user_table.html:156
 #, fuzzy
-msgid "Show read/unread selection"
+msgid "Show Read/Unread Section"
 msgstr "Показувати вибір серії"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Показувати випадкові книги"
-
diff --git a/cps/translations/vi/LC_MESSAGES/messages.mo b/cps/translations/vi/LC_MESSAGES/messages.mo
index 875e12d0c5e37e03ea0996c25fe55c156e7fded6..345367e980b485e55d5c7ac5708697e83d617241 100644
GIT binary patch
delta 8180
zcmb8xd3aUTxySK+l8`V%0$~nphCm>MBuo*)5I~SH$q=S69>~c6At#=5AWX7B1d2@B
zeIrnOo{MM&6e@D`QQ>L}R2f97B5JK7p;eHUVzpY~UdsLcvRCc>_wxAoS!<m&yz5<S
zZ8&+ycjIfHb2%xl+TzbypJlbfqQ<KI`_Ca7)qa@&b;Wa77ypKJ@D3)Rm10@3P#3#l
zL#&T|QBw}ZhB(1E%WHS6Qqxd{n($H7z{iZ$s0sFB6MPZ1(63SbPhm?ui%D36>i2il
zJaO&44K%?<)O(`(4a8*2v8?eF+S0HP6`^A~Y(?$#KT!c3z~=ZW7U6jufY}`^YY;BR
z@pu5I;14(!$JmxN7oWs&_&uiM@Q#+%(V<X5p%XriEij77cn(|R6^zF_*Z_TWR>~Wp
zcAkuJn1Ri(x2capZEP%RV<o7JL{LZMprc6kQ|O5oQ7N@LdmZCZfh3|9>V|D_sHqpC
z0t_M9wzitzpEtk1W$K@!GWa8EBMDu+c^Y>i|A{nor-98`xu}KapgJx^MZ6ld@FvvR
z?!%^d6m=x0Q1g6(+Q<#mMp~wNJ5NC!We?OH=z|(RES3B#HIr%3MDt9C2rAW&pf1aH
z)DE6TEp){Eei9YX1yjF_anx_1j`9{NL-9Nvu7hQx7S2O$c#=aQo<bP4;7a30)WknW
zEw~TU@MX-$&rtz);~<rpL8$T5Q2{J8^-|OZBbb2eupVwkjdxrMO3eXO>R!U`cp3T6
zs>`bSJqvZY24E{3kJ@1|YDW*FCf<%Z!d<8xA3+859xBjFs11FC%;Q)wtj4{t+M-f5
z6gA;Y)LAV;Exa6c8MhkuVLj@vp^oSz>aJWu?f44T!JFpy?@;68dwBD;!}@yvSrp>=
zAr}?daMZ#Ds6ZB=jv{R8>ro5*2iC)<QK^5y{QfHHuADJ`Y}&s<1@sS8hVEi(*0++=
zy#O*%DeI3MuQkp1FzR_dYdnd3d#o#{56(T*g5x<q9ocNu(L9O@bPsA{2e2+4LmkN}
zbm~($LqV6}B5KFiQSG-;5yxeC8L5wa?yXj+h5Dfunu8h_K`pcaHQ!Fu2j~#0{~1*O
zZ%lhaFY>QT(Ycp*Ifh^^^_i#us!>O?7aQPyROC_PYp8y2ppN1U>Zm?I1#}fP?mJY!
zd#C{GXL=cHmr4G0xzcH<y?oe^`b=Xn>T-oK0XL#1+Kx?dH!7tEQ4=3U1@c>Lgcnfb
zKSO2m7HR|Eqx#=*C}_flS>8@tqEg%*HBl}qWh3!EoQ;~O8Z~YYDnrkqJ}8G#m+N<^
z1+JksbQ>FEe6}|}8EfBvTMD{dS*RUOz&<z)73pKBKz3jZ?nYv^p2DVh9u@HCsONPD
zS<7nL+Z#U&weTp^_^HMj$g_8>SrmrzgM*s*Bx<MM8q<l!re1{lPHaHEl7pxnpEbY#
z8EZ4y*E`adr~uPZM>Gf($Vk-dDZn_r|FG$>9Cc>vOnnD7qrMB3!b7M`ypEdal==Mw
zOr-u5YQY~(y<R`Be_K>wsn`UwQ1j(sJnLKIDKy6dW0~o&#<&G_G`mcFFY0Ixqb5Fz
zy5(=6KFw!Q3tdIc`z<O13H`l#Q&j&{bQF0u1zn;MsQMVx1hY|*mZLJU0u{(M)Wp^1
z_vcX=c@;I!+o=BUqB2@z+Hav2{sA>_Ob+>1WKD9sj;&BT>T2rQsFV*yEu4?)KM9qA
zLi77P)WT(`Kq^rSIH&-&n)Y9y`W-~gdnAYatKpbwIDs1Y4z|EgP&>Vaiad^+sQ{Xy
zcGwzQVuo=fD$qHo00XFuE<%l4jmqo>)cn;Bg=7kcP?4WR4R{}I{39xWxB*^!Yg8cV
zs0nkB<F)dT2V*V6o_G)k;zy_rCQ|8xtx)TXLw!e_SrinpAC>wt)PM*o(p8v&TQC)0
zH}x-2&#)2SYa26AflolCd_F1z6~-`X!R4q|vId8+zO{ow5)BtnAC4MSYLfUjwccrW
z%*N5E309&4U5l}}1-0-FRKQOgUqUT(0=2;pP&@zB{Qfn@>;2!Rpfk4yd(Wp4+Elxu
zcK85lU<vlXWvEm?jcNEHDr0xC9mcUOWuPN=!%Wot(@}vGncvGXk@c;W6qKs1sLS+(
z@u2YpDuCak&ipzm6Mw@L{0C~{<e}d0DX96nqB4_?%GhAktsjlb@MLr}u#AExd<d1&
zD%5~gsLQtzb?Nq?Cf<+Q;UQFtkD2y&P~+Y+^*^BIyMhY*PpA#vL<L?akNjWr@m<gJ
zE>{EoBG7HlMy0F-6<Ea7SDN}J<YHUfO#5lnbNmq7;B{l{2=8^ZH}*x%HwN3{#1W3S
zvvL}=;BwP(18OIGP$_#3JK+&jMlPaua@}a%@4b>%sNYAS0-A-LF^E0TMU8tCHSb3b
z1ub+1^&R*#c0u1r%lZ{|#ff+c=c_)7W5G>07h@mbYljPPBVNRnSUB3t<R$D&y+OYB
zn(|PWbRPCZXElXZ6b_;SIf+WmyQcm%cBKAyQ*SZG+d)TE#s**q9EG|I#aJJ!uopgp
znfMZtEUN}}1gT?d`#V-T1*K#VYM}yDs+XZsx7+vzrc$rLZkRC6yF{6&apO_9J%|l(
z9jf0p)BXykQ$KCmzr)&p|F<3Q4d{wmus7=LrlA5`ggVnlP?u{bDy2tJ@BSJprGG^&
z++c$DI$ELvN<|%Q4r&AAO+Ab)xPR7W3QFN#HQ;Zs5q^yI@Jnosw@_codJlRjY=@e#
z6Y|ltMx$QOqp1GJP#>xfF%A>BNcFKHYJ)A&(azE-$UIbvrs8y5hu!h_sLaGp@^;b<
zwbQ|<cb$(4bTVpz*`~b&m6=M@z73VRU8q3coy7a+t7*kf_I5lBHQ+(i2cjHx86U%@
z_#7%TucFTOE!1ndY1)&fc;5vZd(vKr%Frg{FH-9;=HOSTjkYf!|4R9o0&j<Y;|6R`
z`$1GdXHXM;Y3dE8daou8lV~4?&9MMAt_&6U&oCCB#RNQn+Sn1)x)&S@%_w|{n&>ua
z!G_bkdUsSx2Vo*UfI5nqsLS{;YTPd43s{Hxo2Wp3i#Gld8)6*invIE=iOvWL`jmz-
z4G$YXLYw+MEJk~V_m|Kn>`VPg?27N8Ht;QK!T6cx)}sQ+!P>im>YtD5U+J|w)}s{E
z@o}%gdJ;9!K2$&_um#>g-2q>rw?Gmq<y}xmGXOJi9;*K~?2XT&7XBD};XiRUX3R40
z|1k<Wqw3lQJ~*i7@+>OygQx&sLEZA>sD<CcR`@CEQhtXzA|JEsjGLjJbv9~4lTaI~
z#5TAaYv2FN6tvJgsI&eUb*5LbC4O&yZ#2iNw?_5PMlCqlv_FUnv;?(*CD<B6*ci8>
z#_d79j{WFpM;}s9gqM-*Sa(r7nlabgX)&t43e#~jYG<#Yp5Y}_ChnpZY%$OKGG?Lr
z<zN<0M;+nMko#!up2z#wt^9@t?c^@TW0U!O&9DWw$9bq*zXtU|+K2gg9<|dJe(zGX
z#Te?D#@?7iy&v+htR*-WPvJ;xvcReRXP-57fp<w<)a^co+Sx7age@2H1aTlL&?;<)
zn^CEK4z-b2P#HLh9q}{NhW?3lu}+cKzcH$RibElpLJw?$d8iakMBM>D>NZDEcVUb9
z{TbA_mr((oGwq+5`c2d`yN5dSW&tm-4#okfOYBUcpovRS9oM23+=`0)8Po#Lo8SKn
zwX-wW7H^=QSA4N|c{5N)b{{G;(@}vGV;rtTt>Yj8IMx;l+WB78#7DdztPfBrzJ|(3
zT#2{iWYnciM;%Q+RDd&33oJstq9AIam8eW^L|x+DroJB&S>HNFK^@Oy0)B!zt1GAp
zzeb(aUs3)38<nwyQqK;k1#(cC8-wxaM+I7H>LF8KfeLs%rm((MO+n8mYJND6iu5un
z#eYG4x$2gAACMf>4(Fp5T8t?eLIw7?sUJWc#oMO-B`Uz!Mc${q4LZ8jxfF76IcmTW
z?0~<+I(Q2Q<M((!_F2qD#pO5zU&jRe5eK4G?p?NAROY6lcDw)^U<9?nwdLermt#8(
zLvbJW$E%o!t(SQ9Le#T-0+p$^Q9Jnp8{!Yf*b1-S6m=viI2p4{eLX%v{YkX(as~PC
zOyM34TDWu2JM%)+rJILJaV2WODpUa5QI~H&s^2-RkAFa2;;&HOfx4C6_)e&Rx?>j{
zg#FO(P{^dP6ZMzEX&i%BaR6pK<n6o!wZKzo<9^fvXD}PDqB7Y$<n>EKeINRu+Vin7
z&cQS+M`hHhrjSA59P0A?h#Jr|><#FG-Kh6LrFs_XPLyISR-iHy!g{zF>!OQ2@F~=p
zpGIZ!B5K^H$X#1#U8bNf(Opc!q=<I}shCK;2WqE-P&=4r+5@Nwt56fJG4)3<i~43%
zW{*Xph3)_3i#}w(U&k%%y4Jnf^(FUsw^6=nZcN&u=%%!XVxk%8gM1lF{AK0VNd4a)
zws2u^X+^{?SWy`;O;ZA)Wr2`AB@l^}Rg{F?lAd#;pY~iAQzsN$Vvlq$WUh)<W?l0|
zm-fExi~gc-sn2;ZSQ+kU538{KW;TC$DBv$zVF#9%g(G3RI2f`crDb8ecFkVa|Fgf%
z@CyHu!2cPzv|@2Zu&TlighIiPJI?NGVz}QQ@h|X)1NKP$Fwjm-tL@P}{I9Y370dkP
zWkvSXa3G{PHTOh+I9wGB75%HvxL`?Hg*}S&1d24pl0Z1@F9~!Ho4_ZQ2eib(;F8Mn
zKqO%M%ggO<#btr=qMw$T8C)9jc5AckieN;Yf>nW{pZ6c@uIb+)`g;FrpS$M1_R&-K
z4e+@w1|E&~vK?)e8}D=D2PZ{)4esxAgF||CnGmS@DMY)<AGX5*4lEM1SNya{FV`J%
z+ASXXVl*$$ALG6;{CeY=fw1-OD57^qwDZOF8`!&VG-YIVTy$%GN?rHFq!*&=Cdc@q
zFHC9Ui~gmcPpsQ}MpAUyjNvg9nl&F$T626`g}u0}=J@)htg36_-ao^3Un^W59Xo47
zth->|>S+D>yJDVse?e?Cu{b@(eQ)j)?u7gyb;i{k-&y9~%TIQ{C}`yVW>r6T{ggEK
zUTJ6d_Nu{dZfU^%ytGraQ(0z=`^&{WqIVbX^tmrC`KD1pX<5y&Uq|fnnq!A6qpgEy
zeeS4Ghv?eS4xgJA$#dTi<V8y(xpZE7HTveVxv{<p?*FW87oERyzAtvfsi>PhqnSH;
H^_~9(GTv1z

delta 10176
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%0D%(STSYg;HWus)r?IlxANibCT+kQgjm_#Wr7rj&J
z36zwxvfuWXl^2%!!#*bz{q3C)`=^F}wHk$v8vosc4!c&c$^#)T-8JfJu-ozb=e-U^
z|EqyXfWL+FtAXSFM~z8oWY6`lbYjc$hQ*HMJ>BeA=Y8$yKWCZx^byQL#|bbAV^;V*
z_2r<C#GrV;F(s*;?Scr)^H8uR>?RSh&Ew85xF!^&F6XfX<zEM=zPzo4PS{$QENl1Z
zb3pY)p%8<s$P+~$a#T`I$UJsY_1`?cTS~)WdATFw`zGWzjLj<?7k_P1_q0x?Tz~fw
z`*Oyk9as1hwd>2-i%QJO_a$n#1nfwxZMc2xv6-L7J}c}O-#sfMrO}K;?GAseY(aXg
zy0B%uX7<nq?ItB^H+y|{MWS|}*=B6Qybdw{yq@t-uAZA3yJg<$_Q$vKkjM5i?j|16
za^v64+tMI*+_N=y)55g_=GN`@+bev*M9toS?G`Nq-s`tl*HwA#fG<%~9WY;w#}@5O
z?RNYQ1`PP@qC`y<QM~B*$Ep^0h~KmLm(<vv(h2dMO9!OJR(p%a%&e=bOs?P|`}kIh
zlHZ>@l&Ib7wIhj|gOP!@uWoN8opo{Uc@wqO9y^?<-DU^sc2~wudwa(^d3(n%cn7C;
znx3e6CSnH?wOjpmDGTsx^Y{8=hn94VoheA`@%#G`U)^q2>#ch{P!bzhJRoOsGGoWL
z9$(L7E9#zRVL>}kq6OXWw~Oiy2TFeRWtd-lcS^>L=MI(I6?MDq64vH-e+-##!zU$Q
zL@(N2-Cly3sNLmfKZ)9%%#mE@z~mO$?%w)^^HmCzSaW^;<d%4-y3EQ~E_koziHIHf
zeO^lIcCR!6FQ_jUzbF2=?|4ddBSpi!o9!@Z^VyMPiIZ0AO4V2WO_hPlOQ|hk=Dq*$
zww_X|616v8e7`hN`)9Y77$jL)^@R}Yv9QUce>7E~gvb-$MD4+g$1+O^kRQ9uS63CG
z3dmF}Z+S2NZB=aUQx#QAQsS?xy7+x=>`ks=i#M4YukX1-9@FuEe=>G(d1lAohDYBf
zCmery`CTb3=MoF*qQuV+@xs{r(i!o0OGl?PPyT#xzelldf%gWw<&dmc)?ljJluM%a
zk&C}j7XnKg^qHheyEx14S&I1U_LozY<%yby1M$V7Kc>WL3WqnyuZzb<dB?@igj=Ni
E4|yg%J^%m!

diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po
index 52bc76a68..3e2ac136e 100644
--- a/cps/translations/vi/LC_MESSAGES/messages.po
+++ b/cps/translations/vi/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2022-09-20 21:36+0700\n"
 "Last-Translator: Ha Link <halink0803@gmail.com>\n"
 "Language: vi\n"
@@ -20,23 +20,25 @@ msgid "Statistics"
 msgstr "Thống kê"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "Máy chủ đã khởi động lại,hãy tải lại trang"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "Máy chủ đang được tắt, hãy đóng cửa sổ này"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "Kết nối lại thành công"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Lệnh không tồn tại"
 
 #: cps/admin.py:172
-msgid "Books successfully queued for Metadata Backup"
+msgid "Success! Books queued for Metadata Backup"
 msgstr ""
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
@@ -270,8 +272,8 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "Thêm người dùng mới"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -279,7 +281,7 @@ msgid "Edit Email Server Settings"
 msgstr ""
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -342,11 +344,11 @@ msgstr "Chỉnh sửa người dùng %(nick)s"
 
 #: cps/admin.py:1428
 #, python-format
-msgid "Password for user %(user)s reset"
+msgid "Success! Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr ""
 
 #: cps/admin.py:1445
@@ -467,6 +469,10 @@ msgstr "Hãy điền hết các trường!"
 msgid "E-mail is not from valid domain"
 msgstr "Địa chỉ email không hợp lệ"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "Thêm người dùng mới"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -656,15 +662,18 @@ msgid "Send to eReader"
 msgstr "Gửi tới Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "E-mail này được gửi từ Calibre-Web."
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web test e-mail"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "Test e-mail"
 
 #: cps/helper.py:132
@@ -672,23 +681,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "Bắt đầu với Calibre-Web"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "Email đăng ký cho người dùng: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Chuyển đổi %(orig)s thành %(format)s và chuyển tới Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "Gửi %(format)s tới Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "%(book)s gửi tới Kindle"
 
 #: cps/helper.py:230
@@ -738,16 +747,17 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Không tìm thấy được dẫn sách %(path)s trên Google Drive"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "Tìm thấy một tài khoản đã toàn tại cho địa chỉ email này"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Username này đã bị sử dụng"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "Định dạng email address không hợp lệ"
 
 #: cps/helper.py:815
@@ -816,7 +826,7 @@ msgstr "Thiết lập Kobo"
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr ""
@@ -938,7 +948,8 @@ msgid "Read Books"
 msgstr "Sách đã đọc"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "Hiển thị đã đọc và chưa đọc"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -955,7 +966,7 @@ msgid "Discover"
 msgstr "Khám phá"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "Hiển thị sách ngẫu nhiên"
 
@@ -965,7 +976,8 @@ msgid "Categories"
 msgstr "Chủ đề"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "Hiển thị chọn chủ đề"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -975,7 +987,8 @@ msgid "Series"
 msgstr "Series"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "Hiển thị chọn series"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -984,7 +997,8 @@ msgid "Authors"
 msgstr "Tác giả"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "Hiển thị chọn tác giả"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -993,7 +1007,8 @@ msgid "Publishers"
 msgstr "Nhà phát hành"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "Hiển thị chọn nhà phát hành"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1003,7 +1018,8 @@ msgid "Languages"
 msgstr "Ngôn ngữ"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "Hiển thị chọn ngôn ngữ"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1011,7 +1027,8 @@ msgid "Ratings"
 msgstr "Đánh giá"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "Hiển thị chọn đánh giá"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1019,7 +1036,8 @@ msgid "File formats"
 msgstr "Định dạng file"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "Hiển thị lựa chọn định dạng file"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1027,7 +1045,8 @@ msgid "Archived Books"
 msgstr "Sách đã lưu trữ"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "Hiện thị sách trong kho"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1312,6 +1331,10 @@ msgstr "Danh sách đánh giá"
 msgid "File formats list"
 msgstr "Danh sách định dạng file"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr ""
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
@@ -1323,7 +1346,7 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr ""
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr ""
 
 #: cps/web.py:1226
@@ -1371,24 +1394,29 @@ msgstr "Mật khẩu mới đã được gửi đến email của bạn"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr ""
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr ""
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
-msgstr ""
+#, fuzzy
+msgid "Success! Profile Updated"
+msgstr "Metadata đã được cập nhật thành công"
+
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "Tìm thấy một tài khoản đã toàn tại cho địa chỉ email này"
 
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s gửi tới Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1521,10 +1549,6 @@ msgstr "Xoá"
 msgid "Public Shelf"
 msgstr "Giá công khai"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "Thêm người dùng mới"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr ""
@@ -1555,7 +1579,8 @@ msgid "From Email"
 msgstr "Từ E-mail"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "Dịch vụ E-Mail"
 
 #: cps/templates/admin.html:91
@@ -1627,6 +1652,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1634,7 +1660,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1642,7 +1668,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 #, fuzzy
 msgid "Reconnect Calibre Database"
 msgstr "Kết nối lại với cơ sở dữ liệu Calibre"
@@ -1663,10 +1690,6 @@ msgstr "Tải xuống package debug"
 msgid "View Logs"
 msgstr "Xem logs"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "Kết nối lại với cơ sở dữ liệu Calibre"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "Khởi động lại"
@@ -2519,16 +2542,18 @@ msgid "Email Account Type"
 msgstr "Chọn kiểu server"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "Dùng tài khoản email tiêu chuẩn"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "Tài khoản Gmail với xác nhận OAuth2"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "Chọn kiểu server"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Cài đặt tài khoản Gmail làm email Server"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2551,7 +2576,8 @@ msgid "Attachment Size Limit"
 msgstr "Giới hạn kích thước file đính kèm"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "Lưu và gửi test E-mail"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3062,10 +3088,6 @@ msgstr "Một khi xác nhận, bạn sẽ tự động đăng nhập trên thi
 msgid "This verification link will expire in 10 minutes."
 msgstr "Link xác nhận này sẽ hết hạn trong 10 phút."
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3218,10 +3240,6 @@ msgstr "Tiến độ"
 msgid "Run Time"
 msgstr "Thời gian chạy"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "Thời gian bắt đầu"
-
 #: cps/templates/tasks.html:20
 #, fuzzy
 msgid "Actions"
@@ -3296,17 +3314,18 @@ msgid "Enter Username"
 msgstr "Nhập tên người dùng"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "Nhập địa chỉ E-mail"
+#, fuzzy
+msgid "Enter Email"
+msgstr "Test e-mail"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
-msgstr "Nhập địa chỉ E-mail Kindle"
+msgid "Enter eReader Email"
+msgstr "Kindle"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "Test e-mail"
 
 #: cps/templates/user_table.html:137
@@ -3366,10 +3385,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "Đồng bộ những giá sách đã chọn với Kobo"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "Hiển thị đã đọc và chưa đọc"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "Hiển thị sách ngẫu nhiên"
-
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 9a6f6dae6d687d72c3fbbb93cc53504cbeff0444..39429097f41855a7e044cc2a6950ba14315de807 100644
GIT binary patch
delta 13521
zcma*tcX(A*y2tSo5(7x@EyP17l+c@?1VZl+suT^$0RkZhk^lla2P{;TvO_NcrKm_f
z0#X%GK&*gR#%lvY5gBwu5xK(s{#dUwbD!t_aeaLJ?04<8*Lv5x*4_!sY}y?8%%aH9
zHzlK%`1t2~KA$fJbIK|D_dkUj_<R)zi(n(Hh1GBf*25=J&%KHz@wml*M?djR<X>O;
zhCW|S?1GAeSit8C`Et1!K*P&85bt0s9KdWXaRJ_kC$KGkg!!>(V`o{6B#uSpUKMNM
zgLprV#G*JJ3*!@58s}my=J&0&8^=%`&scm8HSu-SK);&4Cazy0EJk}pR04HS{o_%I
zG{utG1J&<Q)Hp#@#in6Z=Jze*q6qFsJ#Yfc;8$1)e@10qq$!hOMO43LSP;8d+z+*Y
z08(0Cw#83kY2xQF71yIG9Nmoix8Wjzi=Ox-CgJ<o9Uo}!^Nql9*aJ^uT`bqa=c|H=
zSQP_U7U!VOL@t)W4^U_497f}RV<C)WUyEb0megN+>8GI_)<%^m0i&=xmcl+}s<l6k
zD)p173O$XgP%irMHPpl(qQ<*~IurjyEubRH=a~6AwW9vYcnS><;s(^f-=ZGO!}|CW
z#$ha-w6ZQZ2uGk2--8wLBa5$K1>%U-K3`?5gu34f)xW>R=^-w(XS1;qF2x$S3stf&
zP!E2KD)}E+8)MkF>evxG<5(<#yHNe!K_zezwS~Tie7<CO6qUdc)cBz<xzHi{4z=PR
zP!s-&I%LHkc88@J>J$%0O)ws{hYL`LYaJ?q-586<u^nDSRk$|qt|~hKwN*p$-upj>
z3!VOnr~yN$GqDiWaXD&&jd<@ZL9O@%>M#{g;2>fQYL6d79m+YV3AdmYvJ*A_J4jJ{
zXR)x}|B|GsEqDO6f_T)x38)qKKo;Q}hDu-+@<#ezK^@MoQT=~L9oj!pZ$rNJZVM{l
z1H?^G2_#`GrsBQ#|7k9&(69-$Cnrz?er$e)O5_qM!JDWvP>^N!!^YSZpG8&bW7HO2
zK#g-3l~|z;E-sF$Yz&4}>NqZR1{$FTXpQ=S^g$h#A*el^h;g_URq7L{em|iqaSO|1
zk&dncHBl>m2xG7pDzR~>`DS&b{+eJR4O;ojs8Vf5P4qFUGPf`aD|K=M_)(Q;jhe70
zR>M)KQ$G(i@dng{yHQ*B2`bTVurmI$6Z^0Cxi}|E)<k9226bpUq27uisFJ1PeK^tX
zPeDC54>jOAY>0<Z30}v0-+?Y};!3E*8lcWVLWm1x_$cZSPD4#N7d251M&nA<fa_5!
z38Mx&f;t<gEk1`z^cU1ZbTD)V?nm`6i<+mF8ES4fI-({Vh}x22sI!obI?Z!YD_w_v
z+=F^6J~zvDbNvTkW7@}}R=x&R$-SrroJ1w?Ur6F1-&HP@@oiKI3v_oCsEJx>Bh-U!
zQI+V6wQw-j#~G;CaU1IFoWt6fuZR1EqpsNxHU3m{8OG}U-_1o&ZhVSbVO0XfE%}c!
zorRik391r@us(i@oJ(K6Uhb3K1y#8WER3^IiF;TFH)0%qf(7sojADLYWN)|P0;qvY
zp-SHlwPypd8IH#LaSdv#UdAH04VBnI^y3-SDZgQHfj;hMMI5R^y-=@X28Oh<`CMp#
zFc!y?sLa1YC2|cbVZOfZ_k&o}bD5~;R-#_dov40$P>1@oc@6ow<txC~N(<<K+REPj
zsDB|Y2GXDbMw+9oV>%Y3eF|#enOF?hpc37Rdj2r#FrGxJ>MNM!7BCn&pT4oEiC?$&
zH&I)CDvA0R<>C?zrSLb@slC6yTS0ZyhovoQPg78PJOOLq9Bbc()rk*aN&F7^UBmYa
z=Er&iTmnr|3uuc<ymyETt!$_{1(k@09Aw{S9E881R?>Z-+q)&Gfp($3fNxv;mBm-F
zG3`-2+zwly4(n7bhi{_3tf9}jXvD=WOu)K>-HOvuC0>Y{U_I)={iyz@F#)57xYOJb
zOAz-$Rp2qy)@7j%>66wzA9Z-wB3mBvZQvq~hF4IPIOA^kuA>ILf!e$1N8F()fe#Uv
zM;)qxsMEX{mFRZV#3!&Up2jkG1zX}>)Rwm#szliT&RjI0p(kphCsC(!4r-4Uph~q0
zRe?jO#LlA5#3j^#H&7Le9OhP78cP#b#0uB|^#SUNIuoNYTJL|5izYZ3^%lH}TETWy
z$9<R&kDwBL2Q|?RjKTYc+lLG55VypJn1X)HL4IZM?ZyZ3chnD`CL^f7ChW(BRyGK=
zk|1irzoAa`Op7<6-iB9D1Ad6{So~496>U)oPDhn`i+KUH#g!j(33Wz(KKaHxM*TJ5
zP8uG-v#3)4ip{WGvipNaPt-&!(U0$8FZ=<uWvxcKx26NCGJ{c{*fjKGCRRZYwZPrj
z4&NCWax02XaV4vRyg9z1s0nwWKFQx>EEY?3C5*=w#Az6X>roSKLY?;QsI5C>?eAiB
z;*U_T_b;fklRp%2dtDlpSuCnUebgaqhgwmR#i^*XF&Wiw2C4!%sP928cE#;j4R4_)
zsyxaa>N==H*~koa;zAvUnqyF}(IkssK&@nz#V=tL@eb6)yHRh+Td3zgKqZogmGM{9
zgr!EiFKTU6dm@rx$d}B84&Sq=60Si#un8;T0j!0ep-OlMHDR?eu0jnknz)_CU9b!B
zBiI>VLM3z+^%~wrEx1gYD#-p<<sv@~%~2CSjOvht+LFgm4+c>spNpDsjl~;Kd;W&C
zA44VhA!?j2u>f8~^}CL$+@Fe>-&bI)+tacbN$kf~SRM7gjzA^20yWTj)E2yo_u+Qb
zz`Ic^J!+moE#SPx|3p7=zHx58Y8cW=>T{uvO;H&qq6X|^?ITeA#$z4KM*VQfMQzb(
ztcusLAQn$|iBv>=dh4JPO+by)3DvJ>I`uEi#UL8=txiRq`st{xcpjVJi&zLhLsj4$
z>dSW(wIv0{yE7DHHbo`Y12x`gR0XG^DmT;GXN{-+8gMxcD&2ZiB0Eu;pFmaS8`MD8
z(2sXf3Hmc!doxsmol)Z@p;kH!^&v|^Rcr;;!w*nfdn?3692ZT4&Joyvc#io7s^pik
zHkO*;O5Fz4{wUVPd8l#rpdY_O^^ch75~+i#WFw0MSd=)F&V}}7I^K^nQKfp$;vCdU
za<Le0!Ya52HQ*PhL<(oRFJ%j?K^(vaIN#b2-~+^0(2oVP?o}@2tHXs(eH$!-38+2l
zWhS8#9E{y?1Qy3v@L}9<_itfI;=9-oOJ=(S6H!|_1@%_FfQ|74cGLTRn+tv0J56%G
z*#uB4ScaPT5UMgqQHg$pCGfO)0acmb%;?E(rDaixHb>p>j7n?}s={-ysNVmD)*%;F
z>g}l0y9f2DJcX6;Iu^!4Q{1PvJo<?nq4u&Ls>I0_&qQs_Lez>6pw7fUQ1g^~oc-5p
z6w8H5-x_OSSL}}yQ4=0RWqbz9;8&>rKcgyf7t3LZsqVdwLnYh<wUxb5_xqda<}*{N
ze^YL(ra>Q&Q>c~PK)pth)7%ymMpdFDDv^d*3R|N3^*~KD0F}@qs4YuJorx)^56(Q)
zTatri@$fY2uK~}}puPSYwa4dCuhk{&g{7vu-v>sb23~}!z-lawuVO2F)7o#Lz6bfA
zaEX;d^)HVqeNEKas2{Qp52FT7w73^4ktEa#2catP7^;+ivv?^kiQrE*sMoUF-`uZW
z=~$h3BWfWhQP2N|<*_siuZE%ecF`BL6_ZeB;8pW9DuF++Jx0#pO~Fp6{?D6lqgHkk
zo8TRb8_#s@t;__}_??lrA><2kp+mOL+=_Z#_G1-1iF$2*wD!tRx%>6ahfvS=wD=L!
zUXMj3lx_E?TRg{HfF<?*FTHoc2gN*SevB&BIgG{I)?V>xcc|*45>3FW*awwJ7FNO;
zsKd7!mB@CxzsEePcINkeVhx|89=L!3yoq{$hd;wd1n1zrLxw8xEwlc!?r$`cQTNxP
zD)$9y0e_gKX1RsbLyg-VLz-|h7kZuMVl=Kntz-l0b=qm|M^OWwwEO3+{U_9S;ik10
zneE1@XjVa0q&8~Y4p<BO&Zho)a4HSaxB!*eQmlzbP%FKR@fb75ee=7c`p-iRxCm?D
zTC9ifpc4HVyW{<HU4jG6bn~gX)L#iKr$HHR!+R^V4(CyOe9J62&)u(p>fac3zZdGY
z9D#nEj5@T-umPSxZO!kf??vPJ?)lCkE@Eg%!TvY{lkhAmk+|pFO50;W;;t4aq3%C|
z+M+B}rJlvYxDPe%F^kWmw)!X3f+L@IXCzdC3uW3GYhgO7v^l7it+IHFxeE)^zR%)g
z7JrC3Lw~pUAJ~TYw#6-9aDM^O5jD?zWC0;xm<vt#0V=~YsEIFPTl@_*Ve<vfL@Y|&
z2i5OUYY*bX#805cIe=Q&N2nFwMLkz$p_{Kd7SsD*mkX7$wb>sv;ds;@PcxU={atqd
zee(+}M!!5Pg1=fExyXKH!vVCn!A`gs)&EPZuJ`|nH56U!GK)29V1Dk`v$(0*8cWjN
z-r@nM6%Iqa_nD{<R*uDC)Pl}pNj!%Y@K+2K=c1VBGV-HV+z>Tj57dJrEe=}zEUIFQ
zQG2-s_4=K$`?pZfN9VW+W6TDq#M-0oC+FDvKZOQO{5+~Oub?vBhnnaEi}TFiQHd2=
z;sz>@isQ}JW*56Z04s8T94diX*bz4_q5hiaDh=|ESz@V+tD_!hftp~TnSwgB6Hu?^
z6pLq~#+ifazsh{s+>Kh`+ZLY=*~Pc!kEj7|p*j{`<_3x}<4_Yf$1?bknS|QYG%Slx
zqqbxvHpjQH3Es5(b(gyjQm8!_8t4hsgo{y`zi4hZ51Q|x68sFc@+;Q<i?#b!xCBd~
zDpwKfV=Iiu(O4dry89vDb}nkt@R9i|>Nk~`mCgt80ph{f3m-=%cpSUnr>Mj$uX3+j
zeXKw{5F6kGOvH6q9WU7Zf~z$S`(KR<t*9aDG$*1mABS4uJXFbZ@ZO%<{g<&4?Z;6G
zoW~aUi^X-<xaV4<o@<Zgus7<t(NgdK)7FrSs>A{F9BL&6*ScRYs-XtxWRAcR#FMc!
z&Or^l2K(YZ)GsE5a@}+BsD*SwZ9z{A>48yP$fvM9uEj$5J?epLs1@9>IAWb^FJKl!
z-7kx=Sk2=0W^dFu!>}QyV0X+}NBvd$?`TNEUr;6Qyxx_xFDlbyi>ILu>pXLv-QR;%
zX#W_M$j_*LcdWhii>|#ns$U{%p1_MC_gVz4;U(0{x1vhB&*Jw{CH@?>1wY#TsF&Pt
z!DX=%?cK34E=FzLyQuNLMLmDjV&4WgPT>$2aonhm3D^r;;sUIQC(w`QQ3FS9bp2Xj
zb>hcS1Fyl#xC`~%Cs+@!Vj`B`WLto$ObTj&p{aIbKB{z!&0K4L%?zX7j{T?!&RP4P
zsOO?KJ4>KS8;eS~HtMYyimIH4+VU;Pb0ObhF0{w*+l>o&?@NWswC>9;^LE&XxC?5+
zY1Tg5;ulbdZxw31{ix^9*!?T!Z+1WO6^+aO$8e#J)ld(%GW*@@z<0pRL?t#A3*uID
zuXzNcX@4Je%1@)d3z4t7@k^mr9*6oOwn6>>Pkdvo!v@rY`>{1%MI}^gi~F-+0_xk|
z0abyas0qiQAA=Sz#5%;wP~*LA@h|uwaqMeuD~Di6E1JoLGTM!r@I0!N|Bbp|X{&4R
zjoSM$7C(*kiC1HHJc*j1>^AqB^~Ju#Sy%+$MOEYs7R2-0sJ~WljRrs7K)s)3w!0O!
zz&6AkQ0+6ZF201r@ndVRzr)?{joQkI7SBd4<Q3FBCr}fAY<{_e`s>Dd8VchNsEKY`
zTw$kcuW2?h6R;TldYZ$r6!Ca-CTgN3sMj;s;@4609LARTeuxY0Rn#tbqX8<RHmC;^
z&B1nmyg3c^I?c8?7xmn07Kbf<%i`nar>GCp_ZEk4a}h&Bfv_uG4b;zq)>sP%p-LFC
z_O+;q_M<9r1a&4(VMF{8n_%VFT?P80Ry-8-+!)kzLF}vdKjbcar?4b9s_k}(G)Hyp
zfodOy8X#!xlTjs}g_>X?>hP{X_1}Z){~l_^pWwYMw)UI%V)p-z-6*ujbtsQTd7y^b
z6blh2n!WLU;-RROjxtxGp8E)u_}8ceu9-Ki{kB<XFALTCUx^Dn&<K@bJJc5RLalHt
zYM^YpKi!;zdTt4pz>TPWd$BDZ#x8gVb*MYP;kGCZHSS6bsbm|t&>=j88sM^d9hJ~;
zX5>Cs;^L?h$DtBvgZg0guy_t?oaI;^b5Z@@K%JHM&5Qfk|1va0>~||Dhng@BH9&JL
ziw{|Qf7C$9sGoM(s0kKZ`xf&ss)DEN{xyrE54iEGqQ-A<z~2AnG_<1OA=DRb3hFd(
z#OC-J>c?%7gU-h0AoB@SV(U>0dL1j_Nz~hO5tZnDhn%sf_7)+#7>JQHOhUbOQ&D@g
z9#xSosEpr04g99v|H|6)Q2l;HC2$KhVX?#RLsJ{I#mT6%@EpcsXd4$=@rM|Px3MDD
zc++)EKn*++b?SqtJ)ee3XrA3)WUj?-v~RKaH*8BB`IhUSh#IdOGGE9yh>IFD%tV!N
zGpgkKQI+@^+hc_zZbidTiB3ZG&qXD&3pMaQi;r3SAu8d&n?InQ`va>mzpu#K?!gAA
zlD9!k+zB;shTWfJK4mUIKlfLghcJft8@qoSwG{=9+Mc5lY+-Q+EXMr4;aq5M#-p}k
zIqI+-Lp^X6wdcQET>2f?zX~SO-UGG5g{Xwrq4s_=7RR?xTY3t$@*lAj-o<-=|5xf=
zH&IQj%#9{yUo(hG@Ojjsc>^`!=ctNZLM8e$D$zTrL@FM0?Nv~5yv5B>iL^gP{q^7g
zyD`#k1W^+{W${+jL~mg<o-|LP68Zw$;7!!lH9hVo7>3${AZngxu@NptE#RHwW863U
zQyQXaIFFj>2a9i@GQDka(G%`BnKG#U)yz6(BUI^IntibX@z@jI*hVJ`^vMj4N=py;
zyoA)!;a-i0MTNg^zT&>{);4D&!aE-BAK}F$eCPSwed0y7Kjz(O9~<tISR}%m)?stR
zK(A`YyWuvS21Z7WPfkns9_d!qTh;BVH@o}ZzH0Dw)PMc$Qc{AGGP3>sr%ni1Q&J#v
zav;;66v)m_%NU*Yf4BN4O-N174y3xf-rBCU+%#=^{16_}vshH&8nrXhQpRN@j}OFU
zg(vr&md_jBzqyywzp8h(e@pL3|I%K)0dIy|4qO!({&~o{{1F|z<;fZ0#v}7bhT3KL
zlP#^}^vpnV>QsN=@wBY$EdQurraya3T9*G_^6|dj!3kMa{QvL%ejZmw|MB3YjBy#k
zDH;AiW+pd-DJhdOy~E8bN4t@|KN70Pxyug8*~uf5vjYB(>iM9*M(ul##AW?8SjX|+
z*InBd`z!34F*!LsE!FEiv&`VX+Ij>>r)Bs%QTITqMi?K+%1Rzhfovgt(gT_yB{+UU
zdLTRCPfkzwk4g)qr~Yda>k-JvW`~l!$Hr7G<<d(Eqz6*i5C6zuaGcj8Ff?8lnj|xj
z^{)wr1Se&>+W9GBMlf4b1g8X2<Gp=>`CedD-|&@Dl_I?8F}=MiX$`zGX(Pk4)1J%c
zbxiN!ElY0~zMKAezVJ`MV1z$A=nwQ`Z}^{WlL8s3{}H<hyiF4~dJ{5hg!gAQitx^4
zmki&|UJ@B<PgeeklLC`SRlAwRvz#(LPDR~-I+&!KG$|#80#)%R1~W#bWsXnIP77vO
z_G6N>{38Q_3_YJ6|L?B70#p2blC!d=1T$0pQ|P4o8hol-c@#s(d$S&|9sk$hl*FH$
z8K4+b{OQ5bqsfasO3qU0{(XYI*B;*<9zAtggcmn`RXA^Y$H<8BUcJ!7@V?NZ2rn>m
zXMU@zH|eQ^-Xl*RiE8#><EG&Up2>+0e?RZLsPL@?FGhrqE_x)wYwjKQ%I56x&gJaz
z4lSwZm0Wr&Tyxp_i15Yb)g!&FtMiw<@W%6bt6#pjdhW#~bMkU?FTAleTx8AKh^kkf
z+IDH%&b-w-^484oU70cW;`~=Gu6{mm-uk>1FJIbuAaCt_Z~y8CyrZj27R=kb>*A`{
zFD~8T{kf{Mw`J`o;T^dxqrDEBMuy+sR4^iZYx9c8@U|__<_`}Df1S^}ym6SfYhJwf
zr&qx{zTEE(Ufs+~Jyp&tw5(G3%iH(nt>2P2YsJO6Gsr1#>#~d6c3(d@(<`^Hf!BD?
zY%l(FRd3&(ncncdeZpt=CPsKq?;94rzHdT4FX!NjaNk1(BE!?)+7saoeET0>+EIUa
z_ffuEU%nd?E^usFzA_gM9MB35&dA$5|MHs)FRy>@(#mJNjVJnh2NqPS{J&0wpF4RA
z7G0S!^UCtvygAFfMN8^=4a3#EKTgDY(Wk2vzPx|Sg#(8!tvHZ(Xo*+uy`AB+?`1@I
f!S`o{OMEapGQ9WW*CM<pPQBpuKYhweI+OH2yocev

delta 16146
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
b<<~E5z8UV&y^Y+luUvB9$d7f~oE`Dsp7=Ry

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index e4b28b265..5e99441e3 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -23,23 +23,26 @@ msgid "Statistics"
 msgstr "统计"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "服务器已重启，请刷新页面"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "正在关闭服务器，请关闭窗口"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "重新连接成功"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
 msgstr "未知命令"
 
 #: cps/admin.py:172
-msgid "Books successfully queued for Metadata Backup"
+#, fuzzy
+msgid "Success! Books queued for Metadata Backup"
 msgstr "书籍成功加入元数据备份队列"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
@@ -273,8 +276,8 @@ msgstr "LDAP 成员用户过滤器中有不匹配的括号"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "添加新用户"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -282,8 +285,8 @@ msgid "Edit Email Server Settings"
 msgstr "编辑邮件服务器设置"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "G-Mail 账号校验成功"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -343,12 +346,13 @@ msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "请先配置 SMTP 邮箱设置..."
 
 #: cps/admin.py:1445
@@ -469,6 +473,10 @@ msgstr "请填写所有字段！"
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "添加新用户"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -657,15 +665,18 @@ msgid "Send to eReader"
 msgstr "发送到电子阅读器"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "此邮件已经通过 Calibre-Web 发送。"
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web 测试邮件"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "测试邮件"
 
 #: cps/helper.py:132
@@ -673,23 +684,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "开启 Calibre-Web 之旅"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "转换 %(orig)s 到 %(format)s 并发送到电子阅读器"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, python-format
-msgid "Send %(format)s to E-Reader"
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader"
 msgstr "发送 %(format)s 到电子阅读器"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
-#, python-format
-msgid "%(book)s send to E-Reader"
+#: cps/helper.py:225
+#, fuzzy, python-format
+msgid "%(book)s send to eReader"
 msgstr "%(book)s 发送到电子阅读器"
 
 #: cps/helper.py:230
@@ -739,16 +750,17 @@ msgstr "重命名此路径: {}文件时出错"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive 上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "使用此邮箱的账号已经存在。"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "无效的邮件地址格式"
 
 #: cps/helper.py:815
@@ -816,7 +828,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -938,7 +950,8 @@ msgid "Read Books"
 msgstr "已读书籍"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "显示阅读状态"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -955,7 +968,7 @@ msgid "Discover"
 msgstr "发现"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "显示随机书籍"
 
@@ -965,7 +978,8 @@ msgid "Categories"
 msgstr "分类"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "显示分类栏目"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -975,7 +989,8 @@ msgid "Series"
 msgstr "丛书"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "显示丛书栏目"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -984,7 +999,8 @@ msgid "Authors"
 msgstr "作者"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "显示作者栏目"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -993,7 +1009,8 @@ msgid "Publishers"
 msgstr "出版社"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "显示出版社栏目"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1003,7 +1020,8 @@ msgid "Languages"
 msgstr "语言"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "显示语言栏目"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1011,7 +1029,8 @@ msgid "Ratings"
 msgstr "评分"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "显示评分栏目"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1019,7 +1038,8 @@ msgid "File formats"
 msgstr "文件格式"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "显示文件格式栏目"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1027,7 +1047,8 @@ msgid "Archived Books"
 msgstr "归档书籍"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "显示归档书籍"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1310,10 +1331,14 @@ msgstr "评分列表"
 msgid "File formats list"
 msgstr "文件格式列表"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "请先配置 SMTP 邮箱设置..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
+msgstr "书籍已经成功加入 %(eReadermail)s 的发送队列"
 
 #: cps/web.py:1207
 #, python-format
@@ -1321,7 +1346,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "请先配置您的 Kindle 邮箱。"
 
 #: cps/web.py:1226
@@ -1369,24 +1395,29 @@ msgstr "新密码已发送到您的邮箱"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "您现在已以“%(nickname)s”登录"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s 的用户配置"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "资料已更新"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "使用此邮箱的账号已经存在。"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "找不到包含 OAuth 信息的有效 gmail.json 文件"
 
+#: cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s 发送到电子阅读器"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1515,10 +1546,6 @@ msgstr "删除数据"
 msgid "Public Shelf"
 msgstr "公共书架"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "添加新用户"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "导入 LDAP 用户"
@@ -1549,7 +1576,8 @@ msgid "From Email"
 msgstr "发件人邮箱"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "电子邮件服务"
 
 #: cps/templates/admin.html:91
@@ -1621,6 +1649,7 @@ msgid "Scheduled Tasks"
 msgstr "计划任务"
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr "任务开始运行的时间"
 
@@ -1628,7 +1657,7 @@ msgstr "任务开始运行的时间"
 msgid "Maximum Duration"
 msgstr "最长任务持续时间"
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr "生成书籍封面缩略图"
 
@@ -1636,7 +1665,8 @@ msgstr "生成书籍封面缩略图"
 msgid "Generate series cover thumbnails"
 msgstr "生成丛书封面缩略图"
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr "重新连接到 Calibre 库"
 
@@ -1656,10 +1686,6 @@ msgstr "下载 Debug 包"
 msgid "View Logs"
 msgstr "查看日志文件"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "重新连接到 Calibre 数据库"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "重启"
@@ -2511,16 +2537,18 @@ msgid "Email Account Type"
 msgstr "选择服务器类型"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "使用标准电子邮件账号"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "使用 Gmail 账号"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "选择服务器类型"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "设置 Gmail 账号作为电子邮件服务"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2543,7 +2571,8 @@ msgid "Attachment Size Limit"
 msgstr "附件大小限制"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "保存设置并发送测试邮件"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3052,10 +3081,6 @@ msgstr "验证后，您将自动在新设备上登录。"
 msgid "This verification link will expire in 10 minutes."
 msgstr "此验证链接将在10分钟后失效。"
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr "生成书籍封面缩略图"
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr "生成丛书封面缩略图"
@@ -3208,10 +3233,6 @@ msgstr "任务进度"
 msgid "Run Time"
 msgstr "运行时间"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "开始时间"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr "活动"
@@ -3285,15 +3306,18 @@ msgid "Enter Username"
 msgstr "输入用户名"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "输入邮箱地址"
+#, fuzzy
+msgid "Enter Email"
+msgstr "测试邮件"
 
 #: cps/templates/user_table.html:136
-msgid "Enter E-Reader Email Address"
-msgstr "输入电子阅读器邮箱地址"
+#, fuzzy
+msgid "Enter eReader Email"
+msgstr "接收书籍的电子阅读器邮箱地址"
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
+#, fuzzy
+msgid "eReader Email"
 msgstr "电子阅读器邮箱"
 
 #: cps/templates/user_table.html:137
@@ -3353,10 +3377,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "同步所选书架到 Kobo"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "显示已读、未读栏目"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "随机展示书籍"
-
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 3a5e5bb359e71d9ea630845e0c8cbe40996affb4..c5ccdb4fdd59e929a45a09acc7f3aed3753fe9b9 100644
GIT binary patch
delta 12124
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
a_4FWrgTws-@^3xHcHR3&K6M`)ZSjA~l9+Y?

delta 14185
zcmb8!cX(CBy2tUALJx#a5+Lk^-a@Y`y{RA_1f>MBLxLfRDKx=N@6{z>LX)1*aVsFz
ziXMA!2Mb7=4aEvr?)R4&6ukGJd!F<7nVGfL%scPAYwaA*#V-Q)T?zDkRylZ`!+)L+
zbevk)wz_)%{HK32$7w}(0M<nx@?U2M|Iqz!VP*W*_MPUA<Dp+0TVNL~jmbD1r{M^E
z9Xm0dQ!mDGIx;X8OW+3Vikq<%eu_buhc&PW8)5*nm&L|d0o!5-_Qa|<2z8&=j;}=B
zmu>sGSc3JPqck+pDeFt98{ffDynqVe2ULJRqXM~(+If|h=Dr4~dD^2g(;cI6ESAT)
zsQXuAHQbIhS>HKMLy^CS5qJT0<L}rSL&<*`?138Zk4ot{RG<l{9Zy42>a4)q@f;4o
zASM}#gYj<Mg=6st^!2APsEy+^#myLn|3O9mHL4scv^8g59~Jo!495g4iSw`=F2#zt
z4s~?9QJFf3%FH<o#<#Hwe$bZuYv3yeYT{*7Cd#!lMHGfws1s^}p{O$*iwbxVk|gH|
zY=&QAXRO$sW5B!lhmLF>>iH!|-8n8c#%J4;|7tY8W?&=+bTAQ*LLJ3}w!Z=u$WE+{
zXYBR!_WG~3A4(<bNSdHF)Cue3a8#xqLd`o5mFdks8jWb2#d=tXeX%?TSqX=uZk&V)
zU@6wX9T<xzZNE0#)&lKNuj%cm9goKdd;lxsBIFS#3q#TOE)6a4CF<--+-8cYI_iO@
zs6e`4cN~OD^&_a%o<$wmi>NAp2RTLO3)Fnos6<_FfK{;#>b`!+Mt#l*8Y-SG*c11n
z&iFf25mvv$yiT1^0gXT|If<x=ccW77M+N#EYQFbSJNyE*;P*&9JAa~zuXPvQ$NBf6
zp&}fD)o~=&!DNiURTzo6sDNHZrTS~sLRYMRq82RM)dUiOI@)G91c&3Dn1jm16^!uF
zDAmnO6pacb#`fEwcGwk5VSm(jU>ItGv8eArI;tjSVKaObi>n)z$*)oORpI=!^I8~&
zEzzeP-$_GfH6Cl>gIK(C)PlLF1^lQ~zlu7lPi#N3hsj)XtiyOOjKnxpAoDQ_51=;q
zCTjlodXRse*<}V4Q2?{5dLu9#yPyKQ7i(f7>MR$ccH*L5-#ymTsDR%^)yk)+x8QqJ
zCa<H`E8WY?AJL2aYofLcXrX?n$VZ_foQ~SDi<)RVYJvl(K+d9`dmVKopP_2tM>`(W
z+bmoa6<8FiW}2d&>)@lI1^U^6kywI$0xIRnNL@LLtS_P#3hrZm8^TeU>W|uSJSxB$
zsCk#80?I~ZU@z9jW2g=J-lw6Re1UrKJ1mKMIaNHRusOECHaG@##%od4eFPieC)R*|
zW`Rc5K3H4}IFS41qmJxd9H95Vh=wBVaHm<Y52`4WQ423bHtqPaK3+v-rp{evM;%as
z_rfMP0vqF8ERFjx7@x$l_%v$X7qFt<|0^_FF%WdO`SECn{Ej%OsI%IQCGZI>kH=8~
zo<qGYpJGG2X2+xZn?O6EGBXZ!){9VqZa^JjE*Ag(pP@07flp8q#gG>*FalNeQ&7dY
z)VdS-x;kf3JGzcKvXb|hfXkzH9Bz$7-B%aOU<_*Bj_6Zy45Oh4<FFiNqKa-VD&l95
ztUK?ZCaT3jYP=!pEIVNZ9Ef_G#-fTc4OMI_Fa-Caj_#Q4zd4Zn*JI#31FGJDLFRA4
zs#uEt0MvrRF%-w6B2TrhKrNVqWZyZ3BeC>g6YzM{5$#1i{}Spu^P%m3KbZ5^fIiTz
zAsqRrIsH*Zw+a>Ud#EqiH`od*a9-W88`j0SSP^%j<~xdd?oHJF1=tP4hnb=rjg{z6
z^wFqHBNKHtORzjXV#gmx6`vn<rca})`wS`*g{X;whnq}QN7X_U@<Zn|Le)w<DihmL
z0iH#z=lh6;itQp+!>ia4Lr0i1?S~3rB(}gYs3Td4TIexU&1^+wXdi0lucHFXL!JGv
zs2U08d^BGbtg81voQ8@e230KmP-h>HS|AylVkWl1ZKzDVkJ`Z}sQWKrAbx`i^fKy5
z>fCE~-V(LJ0oVj5VoSaMt7v!_IE(xaIbUFBtUJnlxyGUvoQ*Yb9%?7qs0DLTMZDkk
z-$vEMd#L$-!x+46v^k2&NEtc1u?_1xS83dX&F?d*orP8CFGlTPBkD`GA3gY#^#fGO
ze?<ipe!nT=M%bPHeW*Y-V@rJ2dIg))uRDhP>)Sk-h6YlxCT_t#cmg|Pz*s)dcsnW+
z8K{6}po(=K>h)S<#~(*!Bp0=jH&8Wj5p`sjQ2}2aOa663>2ao5YN2)<WBXlE4-7`#
zcOR<wQcw%dL`}R5RVy2iqH?xa{r39H*7q@t>laZqbA6o8Ob|5Q?5rYcfoiC#_MjeU
zhFY*UYJuSxfs<{2Au83`sLY%}-S-mezVp}sf5nCv8EZ1s$45g8J%D;$rlEGS)b`h4
zU;5io0epqwcn!7lsuN6RqEI_(hg$d!)b$~#RF6YFmyF8f64W}rO?F@h>MW1h3ooJq
zdkr<wN2s0Uq3-(*m8sutztlu?RMjwu@jBQE>!NCC3@X6KQ1d*F)RNE1rJ=|UqCN~S
zqZW7rwd3>FZ%{k=9aR(M;>-@Jp~h>W0&R+VzN5X~2lc)Wz}7e&btL;RTJQfk8k(>O
zm69KA{~Bt-V6XW?Rze+7BUFkzV;dZZ%G7+UhpSOLeA4z$qf&km_5Jw8S|OhKSl?+t
zL#gSA!Prd~us3R=k*G|J$Lg4h`jRb1?R+!p{{85|GpGPRM=ksl>i*J`OaPIn*StOY
z6wweGs`AOGiRPmgT8ElwKPqL<+Uw_06Ml!<d2oUWv?7+IACB$NgUxURHpcnZ1K5K8
zhY93gjZ%r`kI4=gO@BP<%;sZbJcu6r2pi#5)I!md%@H(4^~azx5{D%)9n0bjEQJef
ze+BCP4U@^gQoDtLC_ISu@hxnQzhE7#_kanY7b-(u48m!sVtWX6bW5$PPyx7D4zuts
z+=cqUeUDu*z?Woh?1uU~pbzR>JqlG^%TPyg2K73<kE-I(DJDZbFp~ZhY=tXO8#sds
z;1ZU_uTTO1jM~6etFK(L$v|yub5w+P*#14JfX1RyxEd?q22|#Dqf&VkRU@adHhzRE
zvR^O+E2o$mtAif;9kGJm|4}rQ;si6`EJ5vX1L~|_K`rnj*1~I89&4nUPicJ|Mt=Zm
zq3x(Z51}%540Zn-sGXlj75#TuM(=;g2Ti0Et<6wp*$;K&0ISzJ8;RUmhox~RD%A&2
zJNKgkc-vn87&YHTtb_%qBe{x|S>FjxGasNDsA`WwMSeGGq6w%4CZkfEiaN{Xs0^*f
z26!AR<L9UyUqQXTPP(a`YN+vnsG=N$K1G&jFC?Q<Jqs)1eAM+vQ4wd^{!UZ?xu^gR
zpfd3RDg&Qe|G;$tWH-b7>$oGC<_lSfO}Vf9RPwI}I!!gjF%nhHsi^P3YHW*7pcW{=
z9{4@>!8X%O4a~$g^tYon@PX}rYWtO@oAEGg$n`qd68lak|DiOdGoa#Gg6gkBeGhio
z8(*^HzgbJqF!zO_o@-?L?XV2}-l#wZ+Up~1f1-6V>Zl&{*~S9v2J2o7<A&3yjC^3n
zf3}vMX#%K;df%I(0vU{Y?Z%=On2F7CB`TnksQaF?eczjQ-~-eHUt$yd1>0lPL#BA{
zMWy%=>p8rg{xy5O!z`1r2T_5$*8QjryofP)3AIj@*~LFjKBoZ<Mb;S=S$EWHa*rJ!
zkNUBhWUtS*<I8M+t?h5YaPHe>$IoI-`mdp$FGQ{LCu)Nw9@bmK`M0E@osC4LYB_et
zr?CTGM?I*&)fHf8RLc8eGn|6jaW>wAe$;}2bBtlu7;7(7V52dNd!4B?^uTIV@$Irc
zg_`(9)B~TP0=b4YFkr6vl!l{H+ZkJ6B6h_r)cgN2M&Ng-dCJT)&(}xa7zXa3p@lZ0
z7I+e?<4N0p2NmGQsH3@z%2>dBlaY2<i+&H=ABQ^QB-C?0>pIkHw-5Cio}W+twP5f9
z^GPj->PMi?C<>MG{?<`gg?_y4&%_?|7u)_T*pvQ;s0C^+G#l%Q%E0}oz^38txNIT$
z*8(pwAm2lMA}^qh;<6q83-w^gBC~@!sGSW$-5-x7F$4A7L#T`{$4K0XO8xWJ&r$1L
z_t{42#pc0ks0r)aej98^zb6jI2e21Di(07U5_7#eYQip967RMS!BX@`*?z1w0kt7t
ziXE7TDwd^K2e)7pp0R#`S|D(#c`y`Jgwd!#I$Q6;;_60aXe#Qt6}F#+TKEuBLq6v@
zd&4iN_cv&nnV>c*b)B#w-i!5d4r;>Ps0I9}3IAg~k1EE?_Ik*2b3GarSUXg}gNw&G
z|5$rNhIKJ&fo#+Qdu;!-^%c~DA6mb%{(<_{thmAi9)+5xn{@!{Xhx%+kJUKqI~n$d
zx%R>;+uw$Y^q}pZvA$~k2sKe2>b~EsrB|AT!cZHigZh-WL%p_1sMq^(^yv$CjD~K!
zjGCy#Die7%YqYh6^>)<4cVZd5-;T%I@pRNq7hyE6#O8R|`Wfo&2wBbf>xTNP%^wE+
ztW!{D^@#N#swiK<{`eJ!V23s4?|@zyN`E=3RyLw)>3M8{pQ64C<=2{Z2BWS|T}%Eo
z(HaJ{qs^!Z4x_67Bh(JBp>`Dfh`GNUsyM??3wJ<0*B6!I6jWw+*z5mAJ^wXoy(_3A
z_{&E_uTgc^q$&p0AB;*-B38nAsMqsR+t0QAlc+%7!hv`NmC+uLnt8mad1j+By59N(
zwxREPgGN~zf$L0!<xvq<wf!h-BWnwLy*(-eJ#Bx2H3hZPS=bWiV?}%thvJK<jE1i-
z&YaJwOG6R1F#}G2tW5uYYYHmzd8oj)U^U!l`_G~>@CIt)?@>FuX8SQ4%wM}5QJL(8
zRd57W*YE#idtol>K^ObrOV|o4JZ1vyhUMsw!s_V7@;D1sOv|t-?!?~s7PiOgS?2lx
zR1r@?&AS+Tu)gy&4ej7}RAiCa<_p#u!|4x1O`M4OwOfZu@kgjke2&`L&vv}jMw6)u
z)|#mM8(CYRinTrZ!f1@8q0~;ZE<mMnE$R$6Vmo{dYhd6evtR`3xn`(&I-!nk2r83a
zRDfBi01lyE$D^p{@;BMv{~ztZHB?cR+H59lfSRBy>Ve_b38)EE?DeUrz*e9F*=etz
zw!VPM@T;i6zC~>?Y76;Sqv;m&9=AhH+#9v?{&sveDv*_^9qvGV(T<|d_>#R|bE|o-
z72d}91XMs<FbI#K<~fO~rMG=FwBV;$2QS%v@Z;t$pmL}{+G8V}gj#S7-i<F|XRNY~
zKSuB#RHn9~K1};j8$5+t=N#($@H%?X_dSg$8kM%22iu^EqZ@X@1XN(#u`xbp``@6R
z3)x|I6obl0FVv3HP}i4R4`3wyH&KCnhXm$xel`u~FI2>3cA7xKQ42S){XW*A*74RU
zsOM%{m!aOGZ0kW(2A;#J_?qosz!1IvUl%v{`9wulVwbrw#2ST4X?tr=RIv?0-Jf8`
zQ*3{h?a#NaLA}PCZT}dm2428AtnYk6Lq&BBm7?;y&BV=6J8Odx*c0pGSX52SLshdM
zwZj5bpg&+q{1Y{Ai9P1ukc6T7Q&0iS!Q%h_Z@s;+8};DR_J(Ir6Mul3_zTq8ev6u@
zWRAH%9JNCa>b}l)ysz!wW4+IsfckP~=8%6i<};ulp|#dcsD<~Sc6!8m5p{o+T=Tyd
zqEG?1L={^H+aHC>+<0p$7Vp^h*JBy3@6ILvn&2=4iu{=M1=Iv@qpn{-y>^AxI(y9@
z5+ke+VHvJJj=Fy@YQ7`ZGpGPwMP=>+YW|;mG&<4<-e(5xz<Trtpe9Pg#yA7@;0{zR
z9JRiU`u2Z=TJTTQbLIA%AF0Zy@y4j<+ha|<6Lpk6uf6cFb*;T&r@i4BJN~it8|z>8
zdgTLV;-;t_cCr0o)=Acxs2W*m`+JN&=LC%qF1(J4{1fX1)CZ^#RRhrnO=gB#r&~8$
zpF;&ufZE|7sJAKnklATRRDZBF6-(;<UrnPS7uKWB@C+)Tmy2)UU%A@;d3(Lcj{j)K
zub~z$b=WLa8?{h-)X@z`9hnbRq}izXPhlCo|No&8itnN_@TI-sE9<Y;;3ND?Nv>By
zO)wg};w02_d+hi@)WRpRKIWm$zT6Y$6CH`#aDVja#ta%NhApW6F|3RiP!s=zTJXB<
zm-d@}C{|#+mbEGBxz6_b04zg)G&aFF)O@S$_4R)8uZefqfy1cOowlAwrS7`DUj0dv
z>bj_aJE5K*V*BGznVgQzaS7^eI*PjQzo^<MwEf_x$iHr^^pyD@2whPV%tuA)q87@w
z<9<{XKaUmhQ>=vFp?2;ZH5;gcTCg?N#;(>e)`w8*Wcg?)MY*U4{HO?@K?QK$`lY@8
z6>6bhZNKa>^IQ$ocs*3AJJ|jN)cl#K`FyAiExOU)N<+o48&#cepeFhrt6|V_vp_hu
zqTc`&`Mp>k6HpURMJ+Vj_7|h(S!Mg%P#es#{ilreol`V)1kc+GKVTUB-%zQp^fbrt
zaFg0@Vw2SYss5`?!h+qUBU<@GTa+*1UT72UhD<77_JPFYxFqkC*u*4%wYCj|swPfI
z^EMypo#4svre}D(&2`1?*kOVD+=yuRM2C0E4fUo?^`?1-%}DjS3p(y@6`z<kB{m~5
zCE4EWnHHPwN%tnlc`{NwGg30sZj8rHoS2fCoDt)1(5YcSL}pT)Cpjg<law+kF}bs+
zexoVg^z_(C-p1+fU7g*4sqSZ;cZbJj#7>A!_j<f(X(?&CskqTNJ;p!pw)#O82N0V_
z@gz?4I=!0@aLbSES|y5>g7$Qei%Vlpy6%y#)!p4)Jhjb*bhCqWZ$?I9@}zW6W@=n)
zhBwZAq06@cx;M++(CxqFZ<)nEx%;l53JvQwN=}^kKyvI9!ffcT+1nc!AIrX{C#GvA
zkKLgsJ|)eQk&u}F_s(r3eb|4T=l}79hl#XWj60+69mICD?<0M>n>2bxc+(Q&6DOL~
z56zr7k-f%eCOLi0=Ive65;GD!1G{HtB(%Qe34ix~p+VKm@p@uSe2SZ+^!L5{tx^pK
z#iplEOG%6SKaR6_0sD-<^3af=Dnq?V-if5pGa)7A0Z&F^Mv~Y4W8{66i<6)+ogIh4
z;V!y&d8D0LY0Bg<xF#B>d$`4$;Z_(mtd%!S!6>Qe37HvjDbtcYDe;t*YOk3mHOZ^8
zn3$BpKc`W_Dbw8Xqs|4yxb;U5DrYWwlQX<&?#m;i#}6_C@rg-Eo|McCPb|hKdXwVP
zqa1t9lz=JM)U*_C)x4xG)-yFWDKU;JGX;Hj@$2Hbr8wOEquaPUM^6YTe#};rKk&ZS
z1Da1vNlqp+o}Ns?i{<HME7}?2y>Ti1@1t{HyFWIXQcAn!b-IxyrLeg2+(Bc){oTjR
z3=E5%>ZO`&aKrSznz;N=k9#FxQ1NR@Ml)j5IGVqcmgY@LiH-B5@~$~U?JJ;0W~%4b
z(&07cox1UgdDHw$W5WV`v1t<%5~tduPIrbTq)hX~QeK>8dT|x-B`~9urgu_G+KhjX
z7iY<onm!b&oWGw*icOxBNo4;XPtBZ=l$f62P4oTxN*W1BnNnPMHX5Z*ul2vCPV=&B
zWh*mTO%tP9EzH3GzJDSmbo0biUt);&riuLrCOi~a!ZR#!ir0<yj&MuFN4i7f5BPtI
z-w{yXzFP^Tae~*I%=FAQH8J)^E$AZ~<6oOFC@7FG*Tn}O4D$@lAih}MIh%L;s{02f
zH4dmVGA)I-VK_mk3iM^T@rpX5yy=eHG(Mu=tsf}<58{8mzI=`Jxuy0~rg3_Fo723L
zC^m1Jz3t|=+Fdl|RKN_kS$z1vzIkr<<h{XdJGbiSznomQq&qb$#(y=VPq4dtPqpg*
z{F3k{7i2Fe$U0RtXRg2XjH`h)Z2fD``N#Jc=I$<<|J0?EN8Ki~eANpUY|Hnr%Rf6O
z|H+g6dvzaFxOZjYfu(NFtfwlRI+4F=WnNZJ(Y7slTb8@SXRmZW-qX~7adyRk2=iD$
z*2%nuyDp!~zUc?V|HH#A0^Czsk^VY!z74Fj@nqhCHD*1{wmi%IIICR<0|f_<<ZU{f
zw|S2H@`6aW!u;^ao9|-T!khyIrw`^Gdm?}1llkip`y0%k6W|6eJblZ<{^JYxlyD=m
z?svy6Ki8yh@f%a<-(Q%uwJ3K38_8d?CU4nR=hEr31&`(wzhUO8zut<U1FMlIv#5zA
z|M63Kr&jwbuWnV!EtTW(cVGW;pu04CvD<p1FPi7`mmK})Yss^DhZYrVKShK^i&qk=
zdwApEhWQ6}<Za3++OVl;{Zg}GwsQH@io$)%&0xXa4SB0~JhJIi_rB~Hw?}rZ$h?J1
z%wF^7<uI!`Nt2;3=gf1@ZyFO?=wF<_KI@-cblm)0Kx<YdFGX{9<geP5x8$%r<@|NW
z^WE&c6Z@Q-ubVu$SGNqQYc^7tb24wyvZ9-gr}!AnudDyAtw#f+E}h++ci=G-+NI;W
zO-0>YK>okB{Twj-?_HWi<gMFkwwt%)n8JH}ZqerLj+w=B(>Yu^y{TZ{iJQYP)A_IM
z=n~*Na6EtSqxl<;7aUpX6m2_Hu=51>7tUE&G?zUtwnKSK7Ez(M4CSw1OnsZ<yyZgS
z-YtbWb8Z>RTYREm>5_t-XKooS%FfBp?Ys4swF`6CX|0>rE?R%2@Zg++<#X~EF251Z
zu_qX6k-up#n48^}yCOpJR&QrEGvM#Jt72eC(fZ|idzR;C%_~~(x<mF1bQ|VGy6HKG
zLT<@%RPLmJ2DVC%JyCGfEt->EG<Vfa@3c7>O2xlm@6@13Q|tLTS@|c{-<()m_*V~%
n2yjEQ!%J*G!MpDE%84#%USl_OV_kRnp?BThIWcad!=3*Jis}18

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 0d152623f..a4a957681 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -23,16 +23,18 @@ msgid "Statistics"
 msgstr "統計"
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+#, fuzzy
+msgid "Server restarted, please reload page."
 msgstr "服務器已重啟，請刷新頁面"
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+#, fuzzy
+msgid "Performing Server shutdown, please close window."
 msgstr "正在關閉服務器，請關閉窗口"
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
-msgstr "重新連接成功"
+msgid "Success! Database Reconnected"
+msgstr ""
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -40,8 +42,8 @@ msgstr "未知命令"
 
 #: cps/admin.py:172
 #, fuzzy
-msgid "Books successfully queued for Metadata Backup"
-msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
+msgid "Success! Books queued for Metadata Backup"
+msgstr "書籍已經成功加入 %(eReadermail)s 的發送隊列"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -274,8 +276,8 @@ msgstr "LDAP成員用戶過濾器中有不匹配的括號"
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr "添加新用戶"
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -283,8 +285,8 @@ msgid "Edit Email Server Settings"
 msgstr "編輯郵件服務器設置"
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
-msgstr "G-Mail賬號驗證成功"
+msgid "Success! Gmail Account Verified."
+msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -344,12 +346,13 @@ msgid "Edit User %(nick)s"
 msgstr "編輯用戶 %(nick)s"
 
 #: cps/admin.py:1428
-#, python-format
-msgid "Password for user %(user)s reset"
+#, fuzzy, python-format
+msgid "Success! Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+#, fuzzy
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr "請先配置SMTP郵箱設置..."
 
 #: cps/admin.py:1445
@@ -472,6 +475,10 @@ msgstr "請填寫所有欄位！"
 msgid "E-mail is not from valid domain"
 msgstr "郵箱不在有效網域中"
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr "添加新用戶"
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -661,15 +668,18 @@ msgid "Send to eReader"
 msgstr "發送到Kindle"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+#, fuzzy
+msgid "This Email has been sent via Calibre-Web."
 msgstr "此郵件已經通過Calibre-Web發送。"
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+#, fuzzy
+msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web測試郵件"
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+#, fuzzy
+msgid "Test Email"
 msgstr "測試郵件"
 
 #: cps/helper.py:132
@@ -677,23 +687,23 @@ msgid "Get Started with Calibre-Web"
 msgstr "開啟Calibre-Web之旅"
 
 #: cps/helper.py:137
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
+#, fuzzy, python-format
+msgid "Registration Email for user: %(name)s"
 msgstr "用戶註冊電子郵件：%(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
 #, fuzzy, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "轉換 %(orig)s 到 %(format)s 並發送到Kindle"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, fuzzy, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr "發送 %(format)s 到Kindle"
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, fuzzy, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr "%(book)s發送到Kindle"
 
 #: cps/helper.py:230
@@ -743,16 +753,17 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
-msgstr "使用此郵箱的賬號已經存在。"
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
+msgstr ""
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "此用戶名已被使用"
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+#, fuzzy
+msgid "Invalid Email address format"
 msgstr "無效的郵件地址格式"
 
 #: cps/helper.py:815
@@ -823,7 +834,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -945,7 +956,8 @@ msgid "Read Books"
 msgstr "已讀書籍"
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+#, fuzzy
+msgid "Show Read and Unread"
 msgstr "顯示閱讀狀態"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -962,7 +974,7 @@ msgid "Discover"
 msgstr "發現"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "隨機顯示書籍"
 
@@ -972,7 +984,8 @@ msgid "Categories"
 msgstr "分類"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+#, fuzzy
+msgid "Show Category Section"
 msgstr "顯示分類選擇"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -982,7 +995,8 @@ msgid "Series"
 msgstr "叢書"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+#, fuzzy
+msgid "Show Series Section"
 msgstr "顯示叢書選擇"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -991,7 +1005,8 @@ msgid "Authors"
 msgstr "作者"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+#, fuzzy
+msgid "Show Author Section"
 msgstr "顯示作者選擇"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -1000,7 +1015,8 @@ msgid "Publishers"
 msgstr "出版社"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+#, fuzzy
+msgid "Show Publisher Section"
 msgstr "顯示出版社選擇"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1010,7 +1026,8 @@ msgid "Languages"
 msgstr "語言"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+#, fuzzy
+msgid "Show Language Section"
 msgstr "顯示語言選擇"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1018,7 +1035,8 @@ msgid "Ratings"
 msgstr "評分"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+#, fuzzy
+msgid "Show Ratings Section"
 msgstr "顯示評分選擇"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1026,7 +1044,8 @@ msgid "File formats"
 msgstr "文件格式"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+#, fuzzy
+msgid "Show File Formats Section"
 msgstr "顯示文件格式選擇"
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1034,7 +1053,8 @@ msgid "Archived Books"
 msgstr "歸檔書籍"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+#, fuzzy
+msgid "Show Archived Books"
 msgstr "顯示歸檔書籍"
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1318,10 +1338,14 @@ msgstr "評分列表"
 msgid "File formats list"
 msgstr "文件格式列表"
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr "請先配置SMTP郵箱設置..."
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
+msgstr "書籍已經成功加入 %(eReadermail)s 的發送隊列"
 
 #: cps/web.py:1207
 #, python-format
@@ -1329,7 +1353,8 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+#, fuzzy
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr "請先設置您的kindle郵箱。"
 
 #: cps/web.py:1226
@@ -1377,24 +1402,29 @@ msgstr "新密碼已發送到您的郵箱"
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "您現在已以“%(nickname)s”登入"
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s 的用戶配置"
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+#, fuzzy
+msgid "Success! Profile Updated"
 msgstr "資料已更新"
 
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
+msgstr "使用此郵箱的賬號已經存在。"
+
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "找不到包含 OAuth 信息的有效 gmail.json 文件"
 
+#: cps/tasks/convert.py:92
+#, fuzzy, python-format
+msgid "%(book)s send to E-Reader"
+msgstr "%(book)s發送到Kindle"
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1525,10 +1555,6 @@ msgstr "刪除數據"
 msgid "Public Shelf"
 msgstr "公共書架"
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr "添加新用戶"
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "導入LDAP用戶"
@@ -1559,7 +1585,8 @@ msgid "From Email"
 msgstr "發信人郵箱"
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+#, fuzzy
+msgid "Email Service"
 msgstr "電子郵件服務"
 
 #: cps/templates/admin.html:91
@@ -1631,6 +1658,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1638,7 +1666,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1646,7 +1674,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1666,10 +1695,6 @@ msgstr "下載除錯包"
 msgid "View Logs"
 msgstr "查看日誌文件"
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr "重新連接到Calibre數據庫"
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr "重啟"
@@ -2526,16 +2551,18 @@ msgid "Email Account Type"
 msgstr "選擇伺服器類型"
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+#, fuzzy
+msgid "Standard Email Account"
 msgstr "使用標準電子郵件賬號"
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "使用Gmail賬號"
+#, fuzzy
+msgid "Gmail Account"
+msgstr "選擇伺服器類型"
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "設置Gmail賬號作為電子郵件服務"
+msgid "Setup Gmail Account"
+msgstr ""
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2558,7 +2585,8 @@ msgid "Attachment Size Limit"
 msgstr "附件大小限制"
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+#, fuzzy
+msgid "Save and Send Test Email"
 msgstr "保存設置並發送測試郵件"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3069,10 +3097,6 @@ msgstr "驗證後，您將自動在新設備上登入。"
 msgid "This verification link will expire in 10 minutes."
 msgstr "此驗證連接將在10分鐘後失效。"
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3225,10 +3249,6 @@ msgstr "任務進度"
 msgid "Run Time"
 msgstr "運行時間"
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "開始時間"
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3302,17 +3322,18 @@ msgid "Enter Username"
 msgstr "輸入用戶名"
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
-msgstr "輸入郵箱地址"
+#, fuzzy
+msgid "Enter Email"
+msgstr "測試郵件"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "Enter E-Reader Email Address"
-msgstr "輸入Kindle郵箱地址"
+msgid "Enter eReader Email"
+msgstr "接收書籍的Kindle郵箱地址"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr "測試郵件"
 
 #: cps/templates/user_table.html:137
@@ -3372,10 +3393,7 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "同步所選書架到 Kobo"
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
+#, fuzzy
+msgid "Show Read/Unread Section"
 msgstr "顯示已讀/未讀選擇"
 
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "顯示隨機書籍"
-
diff --git a/messages.pot b/messages.pot
index 16675806e..883306f5d 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 14:18+0100\n"
+"POT-Creation-Date: 2023-01-21 15:24+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"
@@ -22,15 +22,15 @@ msgid "Statistics"
 msgstr ""
 
 #: cps/admin.py:148
-msgid "Server restarted, please reload page"
+msgid "Server restarted, please reload page."
 msgstr ""
 
 #: cps/admin.py:150
-msgid "Performing shutdown of server, please close window"
+msgid "Performing Server shutdown, please close window."
 msgstr ""
 
 #: cps/admin.py:158
-msgid "Reconnect successful"
+msgid "Success! Database Reconnected"
 msgstr ""
 
 #: cps/admin.py:161
@@ -38,7 +38,7 @@ msgid "Unknown command"
 msgstr ""
 
 #: cps/admin.py:172
-msgid "Books successfully queued for Metadata Backup"
+msgid "Success! Books queued for Metadata Backup"
 msgstr ""
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
@@ -272,8 +272,8 @@ msgstr ""
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1259 cps/admin.py:1885
-msgid "Add new user"
+#: cps/admin.py:1259 cps/templates/admin.html:53
+msgid "Add New User"
 msgstr ""
 
 #: cps/admin.py:1268 cps/templates/admin.html:100
@@ -281,7 +281,7 @@ msgid "Edit Email Server Settings"
 msgstr ""
 
 #: cps/admin.py:1287
-msgid "Gmail Account Verification Successful"
+msgid "Success! Gmail Account Verified."
 msgstr ""
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
@@ -343,11 +343,11 @@ msgstr ""
 
 #: cps/admin.py:1428
 #, python-format
-msgid "Password for user %(user)s reset"
+msgid "Success! Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first."
+#: cps/admin.py:1434
+msgid "Oops! Please configure the SMTP mail settings."
 msgstr ""
 
 #: cps/admin.py:1445
@@ -468,6 +468,10 @@ msgstr ""
 msgid "E-mail is not from valid domain"
 msgstr ""
 
+#: cps/admin.py:1885
+msgid "Add new user"
+msgstr ""
+
 #: cps/admin.py:1896
 #, python-format
 msgid "User '%(user)s' created"
@@ -656,15 +660,15 @@ msgid "Send to eReader"
 msgstr ""
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-msgid "This e-mail has been sent via Calibre-Web."
+msgid "This Email has been sent via Calibre-Web."
 msgstr ""
 
 #: cps/helper.py:114
-msgid "Calibre-Web test e-mail"
+msgid "Calibre-Web Test Email"
 msgstr ""
 
 #: cps/helper.py:115
-msgid "Test e-mail"
+msgid "Test Email"
 msgstr ""
 
 #: cps/helper.py:132
@@ -673,22 +677,22 @@ msgstr ""
 
 #: cps/helper.py:137
 #, python-format
-msgid "Registration e-mail for user: %(name)s"
+msgid "Registration Email for user: %(name)s"
 msgstr ""
 
 #: cps/helper.py:148 cps/helper.py:154
 #, python-format
-msgid "Convert %(orig)s to %(format)s and send to E-Reader"
+msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr ""
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
 #, python-format
-msgid "Send %(format)s to E-Reader"
+msgid "Send %(format)s to eReader"
 msgstr ""
 
-#: cps/helper.py:225 cps/tasks/convert.py:92
+#: cps/helper.py:225
 #, python-format
-msgid "%(book)s send to E-Reader"
+msgid "%(book)s send to eReader"
 msgstr ""
 
 #: cps/helper.py:230
@@ -738,8 +742,8 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:644 cps/web.py:1416
-msgid "Oops! An account already exists for this Email."
+#: cps/helper.py:644
+msgid "Found an existing account for this Email address"
 msgstr ""
 
 #: cps/helper.py:652
@@ -747,7 +751,7 @@ msgid "This username is already taken"
 msgstr ""
 
 #: cps/helper.py:664
-msgid "Invalid e-mail address format"
+msgid "Invalid Email address format"
 msgstr ""
 
 #: cps/helper.py:815
@@ -815,7 +819,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr ""
@@ -937,7 +941,7 @@ msgid "Read Books"
 msgstr ""
 
 #: cps/render_template.py:62
-msgid "Show read and unread"
+msgid "Show Read and Unread"
 msgstr ""
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
@@ -954,7 +958,7 @@ msgid "Discover"
 msgstr ""
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
+#: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr ""
 
@@ -964,7 +968,7 @@ msgid "Categories"
 msgstr ""
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-msgid "Show category selection"
+msgid "Show Category Section"
 msgstr ""
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
@@ -974,7 +978,7 @@ msgid "Series"
 msgstr ""
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-msgid "Show series selection"
+msgid "Show Series Section"
 msgstr ""
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
@@ -983,7 +987,7 @@ msgid "Authors"
 msgstr ""
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-msgid "Show author selection"
+msgid "Show Author Section"
 msgstr ""
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
@@ -992,7 +996,7 @@ msgid "Publishers"
 msgstr ""
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-msgid "Show publisher selection"
+msgid "Show Publisher Section"
 msgstr ""
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
@@ -1002,7 +1006,7 @@ msgid "Languages"
 msgstr ""
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-msgid "Show language selection"
+msgid "Show Language Section"
 msgstr ""
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
@@ -1010,7 +1014,7 @@ msgid "Ratings"
 msgstr ""
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-msgid "Show ratings selection"
+msgid "Show Ratings Section"
 msgstr ""
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
@@ -1018,7 +1022,7 @@ msgid "File formats"
 msgstr ""
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-msgid "Show file formats selection"
+msgid "Show File Formats Section"
 msgstr ""
 
 #: cps/render_template.py:94 cps/web.py:768
@@ -1026,7 +1030,7 @@ msgid "Archived Books"
 msgstr ""
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-msgid "Show archived books"
+msgid "Show Archived Books"
 msgstr ""
 
 #: cps/render_template.py:99 cps/web.py:799
@@ -1309,6 +1313,10 @@ msgstr ""
 msgid "File formats list"
 msgstr ""
 
+#: cps/web.py:1198
+msgid "Please configure the SMTP mail settings first."
+msgstr ""
+
 #: cps/web.py:1203
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
@@ -1320,7 +1328,7 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr ""
 
 #: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle Email Address."
+msgid "Oops! Please update your profile with a valid  eReader Email."
 msgstr ""
 
 #: cps/web.py:1226
@@ -1368,24 +1376,28 @@ msgstr ""
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1329
-#, python-format
-msgid "Success! You are now logged in as: %(nickname)s"
-msgstr ""
-
 #: cps/web.py:1396 cps/web.py:1445
 #, python-format
 msgid "%(name)s's Profile"
 msgstr ""
 
 #: cps/web.py:1412
-msgid Success! Profile updated"
+msgid "Success! Profile Updated"
+msgstr ""
+
+#: cps/web.py:1416
+msgid "Oops! An account already exists for this Email."
 msgstr ""
 
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
+#: cps/tasks/convert.py:92
+#, python-format
+msgid "%(book)s send to E-Reader"
+msgstr ""
+
 #: cps/tasks/convert.py:153
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
@@ -1514,10 +1526,6 @@ msgstr ""
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:53
-msgid "Add New User"
-msgstr ""
-
 #: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr ""
@@ -1548,7 +1556,7 @@ msgid "From Email"
 msgstr ""
 
 #: cps/templates/admin.html:90
-msgid "EMail Service"
+msgid "Email Service"
 msgstr ""
 
 #: cps/templates/admin.html:91
@@ -1620,6 +1628,7 @@ msgid "Scheduled Tasks"
 msgstr ""
 
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
+#: cps/templates/tasks.html:18
 msgid "Start Time"
 msgstr ""
 
@@ -1627,7 +1636,7 @@ msgstr ""
 msgid "Maximum Duration"
 msgstr ""
 
-#: cps/templates/admin.html:178
+#: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
 msgstr ""
 
@@ -1635,7 +1644,8 @@ msgstr ""
 msgid "Generate series cover thumbnails"
 msgstr ""
 
-#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
+#: cps/templates/admin.html:186 cps/templates/admin.html:204
+#: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
 msgstr ""
 
@@ -1655,10 +1665,6 @@ msgstr ""
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:204
-msgid "Reconnect Calibre Database"
-msgstr ""
-
 #: cps/templates/admin.html:207
 msgid "Restart"
 msgstr ""
@@ -2510,15 +2516,15 @@ msgid "Email Account Type"
 msgstr ""
 
 #: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
+msgid "Standard Email Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
+msgid "Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
+msgid "Setup Gmail Account"
 msgstr ""
 
 #: cps/templates/email_edit.html:24
@@ -2542,7 +2548,7 @@ msgid "Attachment Size Limit"
 msgstr ""
 
 #: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
+msgid "Save and Send Test Email"
 msgstr ""
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
@@ -3051,10 +3057,6 @@ msgstr ""
 msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
-#: cps/templates/schedule_edit.html:29
-msgid "Generate Thumbnails"
-msgstr ""
-
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
 msgstr ""
@@ -3207,10 +3209,6 @@ msgstr ""
 msgid "Run Time"
 msgstr ""
 
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr ""
-
 #: cps/templates/tasks.html:20
 msgid "Actions"
 msgstr ""
@@ -3284,15 +3282,15 @@ msgid "Enter Username"
 msgstr ""
 
 #: cps/templates/user_table.html:135
-msgid "Enter Email Address"
+msgid "Enter Email"
 msgstr ""
 
 #: cps/templates/user_table.html:136
-msgid "Enter E-Reader Email Address"
+msgid "Enter eReader Email"
 msgstr ""
 
 #: cps/templates/user_table.html:136
-msgid "E-Reader E-mail"
+msgid "eReader Email"
 msgstr ""
 
 #: cps/templates/user_table.html:137
@@ -3352,10 +3350,6 @@ msgid "Sync selected Shelves with Kobo"
 msgstr ""
 
 #: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
-msgstr ""
-
-#: cps/templates/user_table.html:159
-msgid "Show random books"
+msgid "Show Read/Unread Section"
 msgstr ""
 

From 2be292083371104ca2fd065bd8443536710899ad Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 21 Jan 2023 15:27:51 +0100
Subject: [PATCH 382/412] Fixed typo

---
 cps/web.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/web.py b/cps/web.py
index 8ccec0338..0324a644c 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1410,7 +1410,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
     try:
         ub.session.commit()
         flash(_("Success! Profile Updated"), category="success")
-        log.debug(Success! Profile updated")
+        log.debug("Profile updated")
     except IntegrityError:
         ub.session.rollback()
         flash(_("Oops! An account already exists for this Email."), category="error")

From a2bf6dfb7bada1b086b8d6e12596c7a4627037f9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 21 Jan 2023 17:01:34 +0100
Subject: [PATCH 383/412] Bugfix csp header Bugfix for loading metadata from
 google with old books (publishing date only year)

---
 cps/__init__.py                 |  2 +-
 cps/metadata_provider/google.py |  7 ++++++-
 cps/web.py                      | 12 +++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index 1ba1f778e..d9980778c 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -140,7 +140,7 @@ def create_app():
         web_server.stop(True)
         sys.exit(7)
     for res in dependency_check() + dependency_check(True):
-        log.info('*** "{}" version does not fit the requirements. '
+        log.info('*** "{}" version does not meet the requirements. '
                  'Should: {}, Found: {}, please consider installing required version ***'
                  .format(res['name'],
                          res['target'],
diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index c5522533a..ba7e10af1 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -19,6 +19,7 @@
 # Google Books api document: https://developers.google.com/books/docs/v1/using
 from typing import Dict, List, Optional
 from urllib.parse import quote
+from datetime import datetime
 
 import requests
 
@@ -81,7 +82,11 @@ class Google(Metadata):
         match.description = result["volumeInfo"].get("description", "")
         match.languages = self._parse_languages(result=result, locale=locale)
         match.publisher = result["volumeInfo"].get("publisher", "")
-        match.publishedDate = result["volumeInfo"].get("publishedDate", "")
+        try:
+            datetime.strptime(result["volumeInfo"].get("publishedDate", ""), "%Y-%m-%d")
+            match.publishedDate = result["volumeInfo"].get("publishedDate", "")
+        except ValueError:
+            match.publishedDate = ""
         match.rating = result["volumeInfo"].get("averageRating", 0)
         match.series, match.series_index = "", 1
         match.tags = result["volumeInfo"].get("categories", [])
diff --git a/cps/web.py b/cps/web.py
index 7f2f2b416..036681ea2 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -85,13 +85,15 @@ def add_security_headers(resp):
     csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self'"
     if request.path.startswith("/author/") and config.config_use_goodreads:
         csp += " images.gr-assets.com i.gr-assets.com s.gr-assets.com"
-    csp += " blob: data:;"
-    csp += " object-src 'none';"
-    resp.headers['Content-Security-Policy'] = csp
+    csp += " data:"
     if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
-        resp.headers['Content-Security-Policy'] += " *"
+        csp += " *;"
     elif request.endpoint == "web.read_book":
-        resp.headers['Content-Security-Policy'] += " style-src-elem 'self' blob: 'unsafe-inline';"
+        csp += " style-src-elem 'self' blob: 'unsafe-inline';"
+    else:
+        csp += ";"
+    csp += "object-src: 'none';"
+    resp.headers['Content-Security-Policy'] = csp
     resp.headers['X-Content-Type-Options'] = 'nosniff'
     resp.headers['X-Frame-Options'] = 'SAMEORIGIN'
     resp.headers['X-XSS-Protection'] = '1; mode=block'

From 77637d81dd826979d69a6acb9bc05fa3cb55631d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 Jan 2023 07:42:44 +0100
Subject: [PATCH 384/412] Fix fro #2670 (user has no attribute eReader_mail)

---
 cps/web.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index 036681ea2..bd0c8bac2 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1198,11 +1198,11 @@ def download_link(book_id, book_format, anyname):
 def send_to_ereader(book_id, book_format, convert):
     if not config.get_mail_server_configured():
         flash(_("Please configure the SMTP mail settings first."), category="error")
-    elif current_user.eReader_mail:
-        result = send_mail(book_id, book_format, convert, current_user.eReader_mail, config.config_calibre_dir,
+    elif current_user.kindle_mail:
+        result = send_mail(book_id, book_format, convert, current_user.kindle_mail, config.config_calibre_dir,
                            current_user.name)
         if result is None:
-            flash(_("Success! Book queued for sending to %(eReadermail)s", eReadermail=current_user.eReader_mail),
+            flash(_("Success! Book queued for sending to %(eReadermail)s", eReadermail=current_user.kindle_mail),
                   category="success")
             ub.update_download(book_id, int(current_user.id))
         else:
@@ -1366,8 +1366,8 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
         if to_save.get("password"):
             current_user.password = generate_password_hash(to_save.get("password"))
     try:
-        if to_save.get("eReader_mail", current_user.eReader_mail) != current_user.eReader_mail:
-            current_user.eReader_mail = valid_email(to_save.get("eReader_mail"))
+        if to_save.get("eReader_mail", current_user.kindle_mail) != current_user.kindle_mail:
+            current_user.kindle_mail = valid_email(to_save.get("eReader_mail"))
         new_email = valid_email(to_save.get("email", current_user.email))
         if not new_email:
             raise Exception(_("Email can't be empty and has to be a valid Email"))

From ad43f07dab5a77f492e296514445edd3f63ff2a6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 Jan 2023 07:52:17 +0100
Subject: [PATCH 385/412] Added additional installation hints based on #2660

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 7acd3b2a6..0138e5a78 100755
--- a/README.md
+++ b/README.md
@@ -65,12 +65,15 @@ Afterwards you can configure your Calibre-Web instance ([Basic Configuration](ht
 
 python 3.5+
 
+[Download](https://imagemagick.org/script/download.php) Imagemagick to extract covers from epubs. On Windows the additional installation of [ghostscript](https://ghostscript.com/releases/gsdnld.html) might be necessary to extract covers from pdf files. On Linux Imagemagick and Ghostscript can often be installed using the system package manager.
+
 Optionally, to enable on-the-fly conversion from one ebook format to another when using the send-to-ereader 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/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
 
 A pre-built Docker image is available in these Docker Hub repository (maintained by the LinuxServer team):

From 2d6fe483ba0cf6e8cd93cc09c60f88b3f32c22ed Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 Jan 2023 08:02:17 +0100
Subject: [PATCH 386/412] Fix for #2657 (TypeError: 'NoneType' object is not
 iterable from amazon)

---
 cps/metadata_provider/amazon.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index da3aed798..a83747e6e 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -63,11 +63,11 @@ class Amazon(Metadata):
                     r.raise_for_status()
                 except Exception as ex:
                     log.warning(ex)
-                    return
+                    return None
                 long_soup = BS(r.text, "lxml")  #~4sec :/
                 soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
                 if soup2 is None:
-                    return
+                    return None
                 try:
                     match = MetaRecord(
                         title = "",
@@ -115,7 +115,7 @@ class Amazon(Metadata):
                     return match, index
                 except Exception as e:
                     log.error_or_exception(e)
-                    return
+                    return None
 
         val = list()
         if self.active:
@@ -127,10 +127,10 @@ class Amazon(Metadata):
                 results.raise_for_status()
             except requests.exceptions.HTTPError as e:
                 log.error_or_exception(e)
-                return None
+                return []
             except Exception as e:
                 log.warning(e)
-                return None
+                return []
             soup = BS(results.text, 'html.parser')
             links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
                           soup.findAll("div", attrs={"data-component-type": "s-search-result"})]

From 791bc9621a6fbe9894040ec94cdc57e76cdc549f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 Jan 2023 11:25:24 +0100
Subject: [PATCH 387/412] Improved parsing of pdf files, bugfix for pypdf2 >
 V3.0

---
 cps/uploader.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/cps/uploader.py b/cps/uploader.py
index e605903da..94f2aaa40 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -64,7 +64,7 @@ except ImportError as e:
 
 
 def process(tmp_file_path, original_file_name, original_file_extension, rarExecutable):
-    meta = None
+    meta = default_meta(tmp_file_path, original_file_name, original_file_extension)
     extension_upper = original_file_extension.upper()
     try:
         if ".PDF" == extension_upper:
@@ -81,11 +81,11 @@ def process(tmp_file_path, original_file_name, original_file_extension, rarExecu
     except Exception as ex:
         log.warning('cannot parse metadata, using default: %s', ex)
 
-    if meta and meta.title.strip() and meta.author.strip():
-        if meta.author.lower() == 'unknown':
-            meta = meta._replace(author=_('Unknown'))
-        return meta
-    return default_meta(tmp_file_path, original_file_name, original_file_extension)
+    if not meta.title.strip():
+        meta = original_file_name
+    if not meta.author.strip() or meta.author.lower() == 'unknown':
+        meta = meta._replace(author=_('Unknown'))
+    return meta
 
 
 def default_meta(tmp_file_path, original_file_name, original_file_extension):
@@ -111,7 +111,7 @@ def parse_xmp(pdf_file):
     Parse XMP Metadata and prepare for BookMeta object
     """
     try:
-        xmp_info = pdf_file.getXmpMetadata()
+        xmp_info = pdf_file.xmp_metadata
     except Exception as ex:
         log.debug('Can not read PDF XMP metadata {}'.format(ex))
         return None
@@ -158,9 +158,8 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
     if use_pdf_meta:
         with open(tmp_file_path, 'rb') as f:
             pdf_file = PdfReader(f)
-            doc_info = pdf_file.getDocumentInfo()
             try:
-                doc_info = pdf_file.getDocumentInfo()
+                doc_info = pdf_file.metadata
             except Exception as exc:
                 log.debug('Can not read PDF DocumentInfo {}'.format(exc))
             xmp_info = parse_xmp(pdf_file)

From c21a870b8e7beda3fb2972621aaaa42505bb7aae Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 Jan 2023 11:31:47 +0100
Subject: [PATCH 388/412] Migrated pypdf2 to the now active developed pypdf

---
 cps/uploader.py  | 18 ++++++++++++------
 requirements.txt |  2 +-
 setup.cfg        |  3 ++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/cps/uploader.py b/cps/uploader.py
index 94f2aaa40..f93aef067 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -37,16 +37,22 @@ except (ImportError, RuntimeError) as e:
     use_generic_pdf_cover = True
 
 try:
-    from PyPDF2 import PdfReader
+    from PyPDF import PdfReader
     use_pdf_meta = True
 except ImportError as ex:
-    log.debug('PyPDF2 is recommended for best performance in metadata extracting from pdf files: %s', ex)
+    log.debug('PyPDF is recommended for best performance in metadata extracting from pdf files: %s', ex)
     try:
-        from PyPDF3 import PdfFileReader as PdfReader
+        from PyPDF2 import PdfReader
         use_pdf_meta = True
-    except ImportError as e:
-        log.debug('Cannot import PyPDF3/PyPDF2, extracting pdf metadata will not work: %s / %s', e)
-        use_pdf_meta = False
+    except ImportError as ex:
+        log.debug('PyPDF is recommended for best performance in metadata extracting from pdf files: %s', ex)
+        log.debug('PyPdf2 is also possible for metadata extracting from pdf files, but not recommended anymore')
+        try:
+            from PyPDF3 import PdfFileReader as PdfReader
+            use_pdf_meta = True
+        except ImportError as e:
+            log.debug('Cannot import PyPDF3/PyPDF2, extracting pdf metadata will not work: %s / %s', e)
+            use_pdf_meta = False
 
 try:
     from . import epub
diff --git a/requirements.txt b/requirements.txt
index decfee4c8..ba37df7e4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
 Flask>=1.0.2,<2.2.0
 iso-639>=0.4.5,<0.5.0
-PyPDF2>=1.28,<3.1.0
+PyPDF>=3.0.0,<3.3.0
 pytz>=2016.10
 requests>=2.11.1,<2.28.0
 SQLAlchemy>=1.3.0,<1.5.0
diff --git a/setup.cfg b/setup.cfg
index 20e54749c..8f5d19207 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,7 @@ classifiers =
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 	Operating System :: OS Independent
 keywords = 
 	calibre
@@ -46,7 +47,7 @@ install_requires =
 	backports_abc>=0.4
 	Flask>=1.0.2,<2.2.0
 	iso-639>=0.4.5,<0.5.0
-	PyPDF2>=1.28,<3.1.0
+	PyPDF>=3.0.0,<3.3.0
 	pytz>=2016.10
 	requests>=2.11.1,<2.28.0
 	SQLAlchemy>=1.3.0,<1.5.0

From 94a6931d48d347ae6c07e2b5f0301e8cf97cf53d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 Jan 2023 12:09:19 +0100
Subject: [PATCH 389/412] Handle version 3.0 of flask-babel

---
 cps/__init__.py  | 9 ++++++---
 cps/babel.py     | 2 --
 requirements.txt | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index d9980778c..9d8cfa925 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -36,7 +36,7 @@ from .reverseproxy import ReverseProxied
 from .server import WebServer
 from .dep_check import dependency_check
 from .updater import Updater
-from .babel import babel
+from .babel import babel, get_locale
 from . import config_sql
 from . import cache_buster
 from . import ub, db
@@ -156,8 +156,11 @@ def create_app():
     app.secret_key = os.getenv('SECRET_KEY', config_sql.get_flask_session_key(ub.session))
 
     web_server.init_app(app, config)
-
-    babel.init_app(app)
+    if hasattr(babel, "localeselector"):
+        babel.init_app(app)
+        babel.localeselector(get_locale)
+    else:
+        babel.init_app(app, locale_selector=get_locale)
 
     from . import services
 
diff --git a/cps/babel.py b/cps/babel.py
index 4da808bc7..5a6136a55 100644
--- a/cps/babel.py
+++ b/cps/babel.py
@@ -9,8 +9,6 @@ log = logger.create()
 
 babel = Babel()
 
-
-@babel.localeselector
 def get_locale():
     # if a user is logged in, use the locale from the user settings
     user = getattr(g, 'user', None)
diff --git a/requirements.txt b/requirements.txt
index ba37df7e4..04941f302 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 APScheduler>=3.6.3,<3.10.0
 werkzeug<2.1.0
 Babel>=1.3,<3.0
-Flask-Babel>=0.11.1,<2.1.0
+Flask-Babel>=0.11.1,<3.1.0
 Flask-Login>=0.3.2,<0.6.3
 Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
@@ -11,10 +11,10 @@ PyPDF>=3.0.0,<3.3.0
 pytz>=2016.10
 requests>=2.11.1,<2.28.0
 SQLAlchemy>=1.3.0,<1.5.0
-tornado>=4.1,<6.2
+tornado>=4.1,<6.3
 Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.4.0
 lxml>=3.8.0,<5.0.0
-flask-wtf>=0.14.2,<1.1.0
+flask-wtf>=0.14.2,<1.2.0
 chardet>=3.0.0,<4.1.0
 advocate>=1.0.0,<1.1.0

From d48d6880af3a8da04bec003dddf8b8e43b233dc2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 Jan 2023 13:53:10 +0100
Subject: [PATCH 390/412] Update German translation

---
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 36402 -> 36402 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 56584 -> 59730 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 211 ++++++++----------
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 53282 -> 53282 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 47384 -> 47384 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 24856 -> 24856 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 51589 -> 51589 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/gl/LC_MESSAGES/messages.mo   | Bin 56752 -> 56752 bytes
 cps/translations/gl/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 22741 -> 22741 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/id/LC_MESSAGES/messages.mo   | Bin 54431 -> 54431 bytes
 cps/translations/id/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 58322 -> 58322 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 60199 -> 60199 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 22556 -> 22556 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/ko/LC_MESSAGES/messages.mo   | Bin 51734 -> 51734 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 46631 -> 46631 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/no/LC_MESSAGES/messages.mo   | Bin 36091 -> 36091 bytes
 cps/translations/no/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 48261 -> 48261 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 116 +++++-----
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 56954 -> 56954 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 116 +++++-----
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 44070 -> 44070 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 45102 -> 45102 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 20719 -> 20719 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 22749 -> 22749 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 116 +++++-----
 cps/translations/vi/LC_MESSAGES/messages.mo   | Bin 29930 -> 29930 bytes
 cps/translations/vi/LC_MESSAGES/messages.po   | 116 +++++-----
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 51332 -> 51332 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 116 +++++-----
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 45154 -> 45154 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 116 +++++-----
 cps/web.py                                    |   2 +-
 messages.pot                                  | 116 +++++-----
 50 files changed, 1484 insertions(+), 1513 deletions(-)

diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index da05ad5c14cd1f20e9bdfd1491817371a1eac1a1..e65db25d83e8b7a4ebe90648bf6a81302fedcbe8 100644
GIT binary patch
delta 22
ecmdlqhiTIsrVZ}`*^Lwojjc?LHh&GYwE+NUIS60?

delta 22
ecmdlqhiTIsrVZ}`*$ov8O|49fH-8PZwE+NUJ_um|

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 78a7aed91..94c37f948 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+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"
@@ -46,7 +46,7 @@ msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(eReaderma
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Neznámý"
 
@@ -297,7 +297,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
@@ -336,8 +336,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
@@ -474,7 +474,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Vyplňte všechna pole!"
 
@@ -509,7 +509,7 @@ msgstr ""
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -526,20 +526,20 @@ msgstr "není nainstalováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Žádné"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Jejda! Vybraná kniha není k dispozici. Soubor neexistuje nebo není přístupný"
 
@@ -841,7 +841,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -908,7 +908,7 @@ msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -924,7 +924,7 @@ msgstr "Token vypršel"
 msgid "Success! Please return to your device"
 msgstr "Úspěch! Vraťte se prosím do zařízení"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Knihy"
 
@@ -949,7 +949,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Nejlépe hodnocené knihy"
 
@@ -958,7 +958,7 @@ msgid "Show Top Rated Books"
 msgstr "Zobrazit nejlépe hodnocené knihy"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
@@ -968,7 +968,7 @@ msgid "Show Read and Unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
@@ -986,7 +986,7 @@ msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -997,7 +997,7 @@ msgstr "Zobrazit výběr kategorie"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Série"
 
@@ -1017,7 +1017,7 @@ msgid "Show Author Section"
 msgstr "Zobrazit výběr autora"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Vydavatelé"
 
@@ -1028,7 +1028,7 @@ msgstr "Zobrazit výběr vydavatele"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -1055,7 +1055,7 @@ msgstr "Formáty souborů"
 msgid "Show File Formats Section"
 msgstr "Zobrazit výběr formátů"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Archivované knihy"
 
@@ -1064,7 +1064,7 @@ msgstr "Archivované knihy"
 msgid "Show Archived Books"
 msgstr "Zobrazit archivované knihy"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr ""
 
@@ -1283,145 +1283,145 @@ msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizu
 msgid "No release information available"
 msgstr "Nejsou k dispozici žádné informace o verzi"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Žhavé knihy (Nejstahovanější)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Stáhnutí"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Seznam hodnocení"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Při odesílání této knihy došlo k chybě: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Nejprve nakonfigurujte vaši kindle e-mailovou adresu.."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, 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:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Profil aktualizován"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 #, fuzzy
 msgid "Oops! An account already exists for this Email."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 8ccb2e486b14bcfb1261d32cf2237ea9cf029b73..8bc67544c311bbe64816370c90275dde262d0056 100644
GIT binary patch
delta 15253
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
PEHdUl&S$X2=?nh{5F-MW

delta 12478
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

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index b22945b51..5a411a4ec 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
-"PO-Revision-Date: 2022-08-27 10:00+0200\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
+"PO-Revision-Date: 2023-01-22 13:51+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
 "Language-Team: \n"
@@ -23,31 +23,28 @@ msgid "Statistics"
 msgstr "Statistiken"
 
 #: cps/admin.py:148
-#, fuzzy
 msgid "Server restarted, please reload page."
-msgstr "Server neu gestartet, Seite bitte neu laden"
+msgstr "Server neu gestartet, Seite bitte neu laden."
 
 #: cps/admin.py:150
-#, fuzzy
 msgid "Performing Server shutdown, please close window."
-msgstr "Server wird heruntergefahren, Fenster bitte schließen"
+msgstr "Server wird heruntergefahren, Fenster bitte schließen."
 
 #: cps/admin.py:158
 msgid "Success! Database Reconnected"
-msgstr ""
+msgstr "Datenbank wurde erneut verbunden"
 
 #: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
 #: cps/admin.py:172
-#, fuzzy
 msgid "Success! Books queued for Metadata Backup"
-msgstr ""
+msgstr "Bücher wurden erfolgreich für Metadaten Backup eingereiht"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -286,13 +283,13 @@ msgstr "SMTP-Einstellungen ändern"
 
 #: cps/admin.py:1287
 msgid "Success! Gmail Account Verified."
-msgstr ""
+msgstr "G-Mail Konto verifiziert."
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
@@ -331,8 +328,8 @@ msgstr "Ungültige Laufzeit für Aufgaben spezifiziert"
 msgid "Scheduled tasks settings updated"
 msgstr "Einstellungen für Geplante Aufgaben aktualisiert"
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
@@ -346,14 +343,13 @@ msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
 #: cps/admin.py:1428
-#, fuzzy, python-format
+#, python-format
 msgid "Success! Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
 #: cps/admin.py:1434
-#, fuzzy
 msgid "Oops! Please configure the SMTP mail settings."
-msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
+msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren."
 
 #: cps/admin.py:1445
 msgid "Logfile viewer"
@@ -465,9 +461,9 @@ msgstr "Datenbankeinstellung aktualisiert"
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
-msgstr "Bitte alle Felder ausfüllen!"
+msgstr "Bitte alle Felder ausfüllen."
 
 #: cps/admin.py:1879
 msgid "E-mail is not from valid domain"
@@ -499,9 +495,9 @@ msgstr "Guest Benutzer kann nicht gelöscht werden"
 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:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
-msgstr ""
+msgstr "E-Mail kann nicht leer sein und muss gültig sein"
 
 #: cps/admin.py:2018
 #, python-format
@@ -516,20 +512,20 @@ msgstr "Nicht installiert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Keine"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Öffnen des Buchs fehlgeschlagen. Datei existiert nicht oder ist nicht zugänglich"
 
@@ -665,41 +661,38 @@ msgid "Send to eReader"
 msgstr "An E-Reader senden"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-#, fuzzy
 msgid "This Email has been sent via Calibre-Web."
 msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
 
 #: cps/helper.py:114
-#, fuzzy
 msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web Test-E-Mail"
 
 #: cps/helper.py:115
-#, fuzzy
 msgid "Test Email"
-msgstr "Test-E-Mail"
+msgstr "Test E-Mail"
 
 #: cps/helper.py:132
 msgid "Get Started with Calibre-Web"
 msgstr "Loslegen mit Calibre-Web"
 
 #: cps/helper.py:137
-#, fuzzy, python-format
+#, python-format
 msgid "Registration Email for user: %(name)s"
-msgstr "Registrierungs-E-Mail für Benutzer %(name)s"
+msgstr "Registrierungs-E-Mail für Benutzer: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, fuzzy, python-format
+#, python-format
 msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "Konvertiere %(orig)s nach %(format)s und sende an E-Reader"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, fuzzy, python-format
+#, python-format
 msgid "Send %(format)s to eReader"
 msgstr "Sende %(format)s an E-Reader"
 
 #: cps/helper.py:225
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to eReader"
 msgstr "%(book)s an E-Reader gesendet"
 
@@ -752,14 +745,13 @@ msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
 #: cps/helper.py:644
 msgid "Found an existing account for this Email address"
-msgstr ""
+msgstr "Es existiert bereits ein Benutzerkonto für diese E-Mail Adresse"
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
 #: cps/helper.py:664
-#, fuzzy
 msgid "Invalid Email address format"
 msgstr "Ungültiges E-Mail Adressformat"
 
@@ -808,13 +800,12 @@ msgid "Error executing UnRar"
 msgstr "Fehler beim Ausführen von UnRar"
 
 #: cps/helper.py:1040
-#, fuzzy
 msgid "Cover"
-msgstr "Entdecke"
+msgstr "Titelbild"
 
 #: cps/helper.py:1042 cps/templates/admin.html:211
 msgid "Queue all books for metadata backup"
-msgstr ""
+msgstr "Alle Bücher für Metadaten Backup einreihen"
 
 #: cps/kobo_auth.py:89
 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
@@ -829,7 +820,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -896,7 +887,7 @@ msgstr "{} Sterne"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Login"
 
@@ -912,7 +903,7 @@ msgstr "Token ist abgelaufen"
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Bücher"
 
@@ -937,7 +928,7 @@ msgstr "Heruntergeladene Bücher"
 msgid "Show Downloaded Books"
 msgstr "Zeige heruntergeladene Bücher"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Best bewertete Bücher"
 
@@ -946,17 +937,16 @@ msgid "Show Top Rated Books"
 msgstr "Bestbewertete Bücher anzeigen"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
 #: cps/render_template.py:62
-#, fuzzy
 msgid "Show Read and Unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
@@ -974,23 +964,21 @@ msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Kategorien"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-#, fuzzy
 msgid "Show Category Section"
 msgstr "Zeige Kategorienauswahl"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Serien"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-#, fuzzy
 msgid "Show Series Section"
 msgstr "Zeige Serienauswahl"
 
@@ -1000,28 +988,25 @@ msgid "Authors"
 msgstr "Autoren"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-#, fuzzy
 msgid "Show Author Section"
 msgstr "Zeige Autorenauswahl"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Verleger"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-#, fuzzy
 msgid "Show Publisher Section"
 msgstr "Zeige Verlegerauswahl"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Sprachen"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-#, fuzzy
 msgid "Show Language Section"
 msgstr "Zeige Sprachauswahl"
 
@@ -1030,7 +1015,6 @@ msgid "Ratings"
 msgstr "Bewertungen"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-#, fuzzy
 msgid "Show Ratings Section"
 msgstr "Zeige Bewertungsauswahl"
 
@@ -1039,20 +1023,18 @@ msgid "File formats"
 msgstr "Dateiformate"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-#, fuzzy
 msgid "Show File Formats Section"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-#, fuzzy
 msgid "Show Archived Books"
 msgstr "Zeige archivierte Bücher"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Bücherliste"
 
@@ -1268,147 +1250,145 @@ msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Ver
 msgid "No release information available"
 msgstr "Keine Releaseinformationen verfügbar"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Entdecke (Zufällige Bücher)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Von %(user)s heruntergeladene Bücher"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr "Bewertung: Keine"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Bewertungsliste"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Buch erfolgreich zum Senden an %(eReadermail)s eingereiht"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
 
-#: cps/web.py:1209
-#, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
-msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
+#: cps/web.py:1211
+msgid "Oops! Please update your profile with a valid eReader Email."
+msgstr "Bitte zuerst die E-Reader E-Mailadresse konfigurieren."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
-msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
+msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren."
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
-msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
+msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen."
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Eine Bestätigungs-E-Mail wurde an deinen E-Mail Account versendet."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, 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:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
-msgstr "Falscher Benutzername oder Passwort"
+msgstr "Falscher Benutzername oder Passwort."
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
-msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
+msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt."
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1412
-#, fuzzy
+#: cps/web.py:1414
 msgid "Success! Profile Updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
-msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
+msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
@@ -1466,9 +1446,8 @@ msgid "E-mail"
 msgstr "E-Mail"
 
 #: cps/tasks/metadata_backup.py:47
-#, fuzzy
 msgid "Backing up Metadata"
-msgstr "Metadaten editieren"
+msgstr "Metadaten Backup läuft"
 
 #: cps/tasks/thumbnail.py:95
 #, python-format
@@ -1578,9 +1557,8 @@ msgid "From Email"
 msgstr "Absenderadresse"
 
 #: cps/templates/admin.html:90
-#, fuzzy
 msgid "Email Service"
-msgstr "EMail Service"
+msgstr "E-Mail Service"
 
 #: cps/templates/admin.html:91
 msgid "Gmail via Oauth2"
@@ -2539,18 +2517,16 @@ msgid "Email Account Type"
 msgstr "Wähle Server Typ"
 
 #: cps/templates/email_edit.html:15
-#, fuzzy
 msgid "Standard Email Account"
 msgstr "Benutze Standard E-Mail Account"
 
 #: cps/templates/email_edit.html:16
-#, fuzzy
 msgid "Gmail Account"
-msgstr "Wähle Server Typ"
+msgstr "G-Mail Konto"
 
 #: cps/templates/email_edit.html:22
 msgid "Setup Gmail Account"
-msgstr ""
+msgstr "G-Mail Konto einrichten"
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2573,9 +2549,8 @@ msgid "Attachment Size Limit"
 msgstr "Anhangsgröße"
 
 #: cps/templates/email_edit.html:66
-#, fuzzy
 msgid "Save and Send Test Email"
-msgstr "Einstellungen speichern und Test-E-Mail versenden"
+msgstr "Einstellungen speichern und Test E-Mail versenden"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
@@ -2929,7 +2904,7 @@ msgstr "Text umbrechen, wenn Seitenleiste geöffnet ist."
 
 #: cps/templates/read.html:93
 msgid "Font Sizes"
-msgstr ""
+msgstr "Schriftgröße"
 
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
@@ -3308,17 +3283,14 @@ msgid "Enter Username"
 msgstr "Benutzernamen eingeben"
 
 #: cps/templates/user_table.html:135
-#, fuzzy
 msgid "Enter Email"
-msgstr "Test-E-Mail"
+msgstr "E-Mailadresse eingeben"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "Enter eReader Email"
-msgstr "An E-Reader E-Mail Adresse senden"
+msgstr "E-Reader E-Mail Adresse eingeben"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "eReader Email"
 msgstr "E-Reader E-Mail"
 
@@ -3379,7 +3351,6 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "Ausgesuchte Bücherregale mit Kobo synchronisieren"
 
 #: cps/templates/user_table.html:156
-#, fuzzy
 msgid "Show Read/Unread Section"
 msgstr "Zeige Gelesen/Ungelesen Auswahl"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index fb8603cef0eae01fcbae89fb9991e06d7032a525..6b692be728e3923946919c9d02681f4ac2dcc05b 100644
GIT binary patch
delta 22
ecmZ3qfO*jZ<_&q_>_!TP##W|An@hvjRsaB9YzP7X

delta 22
ecmZ3qfO*jZ<_&q_?1l=4rdB4#n@hvjRsaB9aR>td

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index dc3a5e4c5..d3ae970fc 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -46,7 +46,7 @@ msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά γ
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "ʼΑγνωστο"
 
@@ -297,7 +297,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
@@ -336,8 +336,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
@@ -474,7 +474,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
@@ -509,7 +509,7 @@ msgstr ""
 msgid "No admin user remaining, can't delete user"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -526,20 +526,20 @@ msgstr "δεν εγκαταστάθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Κανένα"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -841,7 +841,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -908,7 +908,7 @@ msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -924,7 +924,7 @@ msgstr "Η μάρκα έχει λήξει"
 msgid "Success! Please return to your device"
 msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Βιβλία"
 
@@ -949,7 +949,7 @@ msgstr "Κατεβασμένα Βιβλία"
 msgid "Show Downloaded Books"
 msgstr "Προβολή Κατεβασμένων Βιβλίων"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Βιβλία με Κορυφαία Αξιολόγηση"
 
@@ -958,7 +958,7 @@ msgid "Show Top Rated Books"
 msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Βιβλία που Διαβάστηκαν"
 
@@ -968,7 +968,7 @@ msgid "Show Read and Unread"
 msgstr "Προβολή διαβασμένων και αδιάβαστων"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Βιβλία που δεν Διαβάστηκαν"
 
@@ -986,7 +986,7 @@ msgid "Show Random Books"
 msgstr "Προβολή Τυχαίων Βιβλίων"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -997,7 +997,7 @@ msgstr "Προβολή επιλογών κατηγορίας"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Σειρές"
 
@@ -1017,7 +1017,7 @@ msgid "Show Author Section"
 msgstr "Προβολή επιλογών συγγραφέα"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Εκδότες"
 
@@ -1028,7 +1028,7 @@ msgstr "Προβολή επιλογών εκδότη"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Γλώσσες"
 
@@ -1055,7 +1055,7 @@ msgstr "Μορφές αρχείου"
 msgid "Show File Formats Section"
 msgstr "Προβολή επιλογών μορφής αρχείου"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Αρχειοθετημένα Βιβλία"
 
@@ -1064,7 +1064,7 @@ msgstr "Αρχειοθετημένα Βιβλία"
 msgid "Show Archived Books"
 msgstr "Προβολή αρχειοθετημένων βιβλίων"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Λίστα Βιβλίων"
 
@@ -1283,145 +1283,145 @@ msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε
 msgid "No release information available"
 msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες αποδέσμευσης"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Κατεβασμένα βιβλία από %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Συγγραφέας: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Εκδότης: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Σειρές: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Αξιολόγηση: %(rating)s stars"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Μορφή αρχείου: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Κατηγορία: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Κατεβασμένα"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Λίστα αξιολογήσεων"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 #, fuzzy
 msgid "Oops! An account already exists for this Email."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index f55d2f49d6a2252b862e8c96fd052117527fa5d0..499ed6651c8d4e8a67605183082876706533e404 100644
GIT binary patch
delta 22
ecmbR7iD||srVZWc>_!TP##W|An<u5W1p)wS?FgIz

delta 22
ecmbR7iD||srVZWc?1l=4rdB4#n<u5W1p)wS@(7&(

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 70c446140..0a51399eb 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -50,7 +50,7 @@ msgstr "Libro puesto en la cola de envío a %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -301,7 +301,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
@@ -340,8 +340,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
@@ -478,7 +478,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "¡Por favor, rellena todos los campos!"
 
@@ -513,7 +513,7 @@ msgstr "No puedes borrar al Usuario Invitado"
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede borrar al usuario"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -530,20 +530,20 @@ msgstr "no instalado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Ninguno"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book 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"
 
@@ -846,7 +846,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -913,7 +913,7 @@ msgstr "{} Estrellas"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -929,7 +929,7 @@ msgstr "El token ha expirado"
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Libros"
 
@@ -954,7 +954,7 @@ msgstr "Libros Descargados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Libros Descargados"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Libros mejor valorados"
 
@@ -963,7 +963,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Libros leídos"
 
@@ -973,7 +973,7 @@ msgid "Show Read and Unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
@@ -991,7 +991,7 @@ msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Categorías"
 
@@ -1002,7 +1002,7 @@ msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Series"
 
@@ -1022,7 +1022,7 @@ msgid "Show Author Section"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Editores"
 
@@ -1033,7 +1033,7 @@ msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -1060,7 +1060,7 @@ msgstr "Formatos de archivo"
 msgid "Show File Formats Section"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Libros archivados"
 
@@ -1069,7 +1069,7 @@ msgstr "Libros archivados"
 msgid "Show Archived Books"
 msgstr "Mostrar libros archivados"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Lista de Libros"
 
@@ -1288,145 +1288,145 @@ msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo
 msgid "No release information available"
 msgstr "No hay información del lanzamiento disponible"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Libros descargados por %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Descargas"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Libro puesto en la cola de envío a %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Ha sucedido un error en el envío del libro: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Por favor actualiza tu perfil con la dirección de correo de su kindle..."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Se ha enviado un correo electrónico de verificación a su cuenta de correo."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, 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:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Una nueva contraseña se ha enviado a su cuenta de correo electrónico"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 #, fuzzy
 msgid "Oops! An account already exists for this Email."
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index fb7b461f39544a89354400131ced08ea9d4b20d4..3b4abcbdc895ff363660b4f92482d3798ea3adb0 100644
GIT binary patch
delta 22
ecmbPnh;hat#tkbh*^Lwojjc?LHm|qLR0jZJEeFv6

delta 22
ecmbPnh;hat#tkbh*$ov8O|49fH?OzMR0jZJG6&KC

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index b4c23e113..0b8693066 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -47,7 +47,7 @@ msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(eReadermai
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -297,7 +297,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr ""
@@ -336,8 +336,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
@@ -472,7 +472,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
@@ -507,7 +507,7 @@ msgstr ""
 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:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -524,20 +524,20 @@ msgstr "ei asennettu"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Ei mitään"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Virhe eKirjan avaamisessa. Tiedostoa ei ole tai se ei ole saatavilla:"
 
@@ -837,7 +837,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -904,7 +904,7 @@ msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -920,7 +920,7 @@ msgstr "Valtuutus vanhentunut"
 msgid "Success! Please return to your device"
 msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Kirjat"
 
@@ -945,7 +945,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Parhaiten arvioidut kirjat"
 
@@ -954,7 +954,7 @@ msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
@@ -964,7 +964,7 @@ msgid "Show Read and Unread"
 msgstr "Näytä luetut ja lukemattomat"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
@@ -982,7 +982,7 @@ msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Kategoriat"
 
@@ -993,7 +993,7 @@ msgstr "Näytä kategoriavalinta"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Sarjat"
 
@@ -1013,7 +1013,7 @@ msgid "Show Author Section"
 msgstr "Näytä kirjailijavalinta"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Julkaisijat"
 
@@ -1024,7 +1024,7 @@ msgstr "Näytä julkaisijavalinta"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Kielet"
 
@@ -1051,7 +1051,7 @@ msgstr "Tiedotomuodot"
 msgid "Show File Formats Section"
 msgstr "Näytä tiedostomuotovalinta"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr ""
 
@@ -1060,7 +1060,7 @@ msgstr ""
 msgid "Show Archived Books"
 msgstr "Näytä viimeisimmät kirjat"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr ""
 
@@ -1279,145 +1279,145 @@ msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi ve
 msgid "No release information available"
 msgstr "Ei päivitystietoa saatavilla"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Arvostelulistaus"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Kirjan: %(res)s lähettämisessa tapahtui virhe"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Ole hyvä ja aseta Kindle sähköpostiosoite ensin..."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr ""
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr ""
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Profiili päivitetty"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 #, fuzzy
 msgid "Oops! An account already exists for this Email."
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 46eeaeb8a280c9a4e21535a720ad71bc703a888e..2d078d32a93a5e01259be19583380a8df7c37b81 100644
GIT binary patch
delta 21
ccmZpj%-lMedBe{vb|VEtV=GgmP1&t+09Tp^r~m)}

delta 21
ccmZpj%-lMedBe{vc0&b2Q!5kWP1&t+09T#|sQ>@~

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 76faeefd7..6550afda8 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -62,7 +62,7 @@ msgstr "Le livre a été mis en file de traitement avec succès pour un envoi ve
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -313,7 +313,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
@@ -352,8 +352,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
@@ -490,7 +490,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Veuillez compléter tous les champs !"
 
@@ -525,7 +525,7 @@ msgstr "Impossible de supprimer l’utilisateur Invité"
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -542,20 +542,20 @@ msgstr "non installé"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonne personnalisée No.%(column)d n'existe pas dans la base de données calibre"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Aucun"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book 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"
 
@@ -858,7 +858,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -925,7 +925,7 @@ msgstr "{} Étoiles"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Connexion"
 
@@ -941,7 +941,7 @@ msgstr "Jeton expiré"
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Livres"
 
@@ -966,7 +966,7 @@ msgstr "Livres téléchargés"
 msgid "Show Downloaded Books"
 msgstr "Montrer les livres téléchargés"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Livres les mieux notés"
 
@@ -975,7 +975,7 @@ msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Livres lus"
 
@@ -985,7 +985,7 @@ msgid "Show Read and Unread"
 msgstr "Montrer lus et non-lus"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
@@ -1003,7 +1003,7 @@ msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Catégories"
 
@@ -1014,7 +1014,7 @@ msgstr "Montrer la sélection par catégories"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Séries"
 
@@ -1034,7 +1034,7 @@ msgid "Show Author Section"
 msgstr "Montrer la sélection par auteur"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Éditeurs"
 
@@ -1045,7 +1045,7 @@ msgstr "Montrer la sélection par éditeur"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Langues"
 
@@ -1072,7 +1072,7 @@ msgstr "Formats de fichier"
 msgid "Show File Formats Section"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Livres archivés"
 
@@ -1081,7 +1081,7 @@ msgstr "Livres archivés"
 msgid "Show Archived Books"
 msgstr "Afficher les livres archivés"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Liste des livres"
 
@@ -1300,145 +1300,145 @@ msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-desso
 msgid "No release information available"
 msgstr "Aucune information concernant cette version n’est disponible"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Découvrir (Livres au hasard)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livres téléchargés par %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur : %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Éditeur : '%(name)s'"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Liste des évaluations"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Le livre a été mis en file de traitement avec succès pour un envoi vers %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Il y a eu une erreur en envoyant ce livre : %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Veuillez mettre à jour votre profil avec une adresse de courriel Kindle valide."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Le serveur de courriel n'est pas configuré, veuillez contacter votre administrateur!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, 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:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Le nouveau mot de passe a été envoyé vers votre adresse de courriel"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 #, fuzzy
 msgid "Oops! An account already exists for this Email."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
diff --git a/cps/translations/gl/LC_MESSAGES/messages.mo b/cps/translations/gl/LC_MESSAGES/messages.mo
index e36a3299b653fc8b33985cf5ca50b2cccfec1d73..ee0f55662387effef2876a5889caff849ebec805 100644
GIT binary patch
delta 22
ccmdn6n|T8eHPo;hDHs}CnHp_wuhC2d0A_OtCjbBd

delta 22
ccmdn6n|T8eHPo;hDj1qtnHX<wuhC2d0A_dyC;$Ke

diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po
index 8a772ef2b..7eb75d257 100644
--- a/cps/translations/gl/LC_MESSAGES/messages.po
+++ b/cps/translations/gl/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2022-08-11 16:46+0200\n"
 "Last-Translator: pollitor <pollitor@gmx.com>\n"
 "Language: gl\n"
@@ -45,7 +45,7 @@ msgstr "Libro posto na cola de envío a %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -290,7 +290,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Error na base de datos: %(error)s."
@@ -329,8 +329,8 @@ msgstr "Indicada unha duracción incorrecta para a tarefa"
 msgid "Scheduled tasks settings updated"
 msgstr "Actualizouse a configuración das tarefas programadas"
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Sucedeu un erro descoñecido. Por favor volva a intentalo máis tarde."
 
@@ -463,7 +463,7 @@ msgstr "Actualizados os axustes da base de datos"
 msgid "Database Configuration"
 msgstr "Configuración da base de datos"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Por favor, cubra todos os campos!"
 
@@ -497,7 +497,7 @@ msgstr "Non se pode borrar ao Usuario Invitado"
 msgid "No admin user remaining, can't delete user"
 msgstr "Non queda ningún usuario administrador, non se pode borrar ao usuario"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -514,20 +514,20 @@ msgstr "non instalado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de execución"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Columna personalizada No.%(column)d non existe na base de datos calibre"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Ningún"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "oh, oh, o libro seleccionado non está disponible. O arquivo non existe ou non está accesible"
 
@@ -827,7 +827,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Rexistrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Iniciou sesión como : '%(nickname)s'"
@@ -894,7 +894,7 @@ msgstr "{} Estrelas"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -910,7 +910,7 @@ msgstr "O token expirou"
 msgid "Success! Please return to your device"
 msgstr "Correcto! Por favor volte ao seu dispositivo"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Libros"
 
@@ -935,7 +935,7 @@ msgstr "Libros descargados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar libros descargados"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Libros mellor valorados"
 
@@ -944,7 +944,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar libros mellor valorados"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Libros lidos"
 
@@ -954,7 +954,7 @@ msgid "Show Read and Unread"
 msgstr "Mostrar lidos e non lidos"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Libros non lidos"
 
@@ -972,7 +972,7 @@ msgid "Show Random Books"
 msgstr "Mostrar libros ao chou"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Categorías"
 
@@ -983,7 +983,7 @@ msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Series"
 
@@ -1003,7 +1003,7 @@ msgid "Show Author Section"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Editores"
 
@@ -1014,7 +1014,7 @@ msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Linguas"
 
@@ -1041,7 +1041,7 @@ msgstr "Formatos de arquivo"
 msgid "Show File Formats Section"
 msgstr "Mostrar selección de formatos de arquivo"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Libros arquivados"
 
@@ -1050,7 +1050,7 @@ msgstr "Libros arquivados"
 msgid "Show Archived Books"
 msgstr "Mostrar libros arquivados"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Lista de libros"
 
@@ -1266,145 +1266,145 @@ msgstr "Hai unha nova actualización dispoñible. Preme no botón de abaixo para
 msgid "No release information available"
 msgstr "Non hai información do lanzamento dispoñible"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros ao chou)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (os máis descargados)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Libros descargados por %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr "Valoración: Ningunha"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valoración: %(rating)s estrelas"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato do arquivo: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Descargas"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Lista de valoracións"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Configura primeiro os parámetros do servidor SMTP..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Libro posto na cola de envío a %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Oh, oh! Houbo un erro no envío do libro: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Por favor actualiza o teu perfil co enderezo de correo do teu kindle..."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "O servidor de correo non está configurado, por favor, avisa ao teu administrador!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Rexistro"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "O seu correo electrónico non está permitido para rexistrarse"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Mandouse un correo electrónico de verificación á súa conta de correo."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Non se pode activar a autenticación LDAP"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "Fallback login como: '%(nickname)s', non se pode acceder ao servidor LDAP ou usuario descoñecido"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Non se puido entrar: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Usuario ou contrasinal no válido"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Unha nova contrasinal enviouse ao seu enderezo de correo electrónico"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer a contrasinal"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "Atopada unha conta existente para ese enderezo de correo electrónico"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 722fc9304005c7960a45a9e5cd40ff9cef3f7196..eade3dd6037d786e359ebd96160a096ce539108e 100644
GIT binary patch
delta 22
dcmcb*k@4zA#tkio>_!TP##W|Ao4XCY)B$Db2eJSF

delta 22
dcmcb*k@4zA#tkio?1l=4rdB4#o4XCY)B$Dg2eSYG

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 6a7b98451..9b43695d5 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -297,7 +297,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr ""
@@ -336,8 +336,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
@@ -472,7 +472,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Az összes mezőt ki kell tölteni!"
 
@@ -507,7 +507,7 @@ msgstr ""
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -524,20 +524,20 @@ msgstr "nincs telepítve"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Nincs"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book 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:"
 
@@ -837,7 +837,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -904,7 +904,7 @@ msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Belépés"
 
@@ -920,7 +920,7 @@ msgstr "A token érvényessége lejárt."
 msgid "Success! Please return to your device"
 msgstr "Sikerült! Újra használható az eszköz."
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr ""
 
@@ -945,7 +945,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Legjobb könyvek"
 
@@ -954,7 +954,7 @@ msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
@@ -964,7 +964,7 @@ msgid "Show Read and Unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
@@ -982,7 +982,7 @@ msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Címkék"
 
@@ -993,7 +993,7 @@ msgstr "Címke választó mutatása"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Sorozatok"
 
@@ -1013,7 +1013,7 @@ msgid "Show Author Section"
 msgstr "Szerző választó mutatása"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Kiadók"
 
@@ -1024,7 +1024,7 @@ msgstr "Kiadó választó mutatása"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -1051,7 +1051,7 @@ msgstr ""
 msgid "Show File Formats Section"
 msgstr "Sorozat választó mutatása"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr ""
 
@@ -1060,7 +1060,7 @@ msgstr ""
 msgid "Show Archived Books"
 msgstr "Legutóbbi könyvek mutatása"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr ""
 
@@ -1279,145 +1279,145 @@ msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez
 msgid "No release information available"
 msgstr "Nincs információ a kiadásról."
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Letöltések"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Hiba történt a könyv küldésekor: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Először be kell állítani a kindle e-mail címet..."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Jóváhagyó levél elküldve az email címedre."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr ""
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr ""
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "A profil frissítve."
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 #, fuzzy
 msgid "Oops! An account already exists for this Email."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
diff --git a/cps/translations/id/LC_MESSAGES/messages.mo b/cps/translations/id/LC_MESSAGES/messages.mo
index 0ceb715f3ad7fd82aadca90cac35810c742822bd..03c11a02ad63fdc27cc9d1825a38e38309de4720 100644
GIT binary patch
delta 22
ecmbQgl6n40<_+g-*o_nnjjc?LHeahb84dtw4+#|j

delta 22
ecmbQgl6n40<_+g-*bNm7O|49fH(#qc84dtw6bTjp

diff --git a/cps/translations/id/LC_MESSAGES/messages.po b/cps/translations/id/LC_MESSAGES/messages.po
index e637c98d9..a2ed6a3a2 100644
--- a/cps/translations/id/LC_MESSAGES/messages.po
+++ b/cps/translations/id/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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2023-01-21 10:00+0700\n"
 "Last-Translator: Arief Hidayat<arihid95@gmail.com>\n"
 "Language: id\n"
@@ -47,7 +47,7 @@ msgstr "Buku berhasil diantrekan untuk Pencadangan Metadata"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
@@ -292,7 +292,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Kesalahan basis data: %(error)s"
@@ -331,8 +331,8 @@ msgstr "Durasi tidak valid untuk tugas yang ditentukan"
 msgid "Scheduled tasks settings updated"
 msgstr "Pengaturan tugas terjadwal diperbarui"
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Terjadi kesalahan yang tidak diketahui. Coba lagi nanti."
 
@@ -465,7 +465,7 @@ msgstr "Pengaturan Basis Data diperbarui"
 msgid "Database Configuration"
 msgstr "Pengaturan Basis Data"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Harap masukkan seluruh isian!"
 
@@ -499,7 +499,7 @@ msgstr "Tidak dapat menghapus Pengguna Tamu"
 msgid "No admin user remaining, can't delete user"
 msgstr "Tidak ada pengguna admin tersisa, tidak dapat menghapus pengguna"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr "Alamat email tidak boleh kosong dan harus berupa email yang valid"
 
@@ -516,20 +516,20 @@ msgstr "belum dipasang"
 msgid "Execution permissions missing"
 msgstr "Izin eksekusi hilang"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Kolom Kustom No.%(column)d tidak ada di basis data kaliber"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Tidak ada"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Ups! Judul buku yang dipilih tidak tersedia. Berkas tidak ada atau tidak dapat diakses"
 
@@ -830,7 +830,7 @@ msgstr "Pengaturan Kobo"
 msgid "Register with %(provider)s"
 msgstr "Daftar dengan %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Anda sekarang login sebagai: %(nickname)s"
@@ -897,7 +897,7 @@ msgstr "{}★"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Masuk"
 
@@ -913,7 +913,7 @@ msgstr "Token telah kedaluwarsa"
 msgid "Success! Please return to your device"
 msgstr "Berhasil! Silakan kembali ke perangkat Anda"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Buku"
 
@@ -938,7 +938,7 @@ msgstr "Buku yang Diunduh"
 msgid "Show Downloaded Books"
 msgstr "Tampilkan Buku yang Diunduh"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Buku Berperingkat Teratas"
 
@@ -947,7 +947,7 @@ msgid "Show Top Rated Books"
 msgstr "Tampilkan Buku Berperingkat Teratas"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Buku Telah Dibaca"
 
@@ -957,7 +957,7 @@ msgid "Show Read and Unread"
 msgstr "Tampilkan sudah dibaca dan belum dibaca"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Buku yang Belum Dibaca"
 
@@ -975,7 +975,7 @@ msgid "Show Random Books"
 msgstr "Tampilkan Buku Acak"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Kategori"
 
@@ -986,7 +986,7 @@ msgstr "Tampilkan pilihan kategori"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Seri"
 
@@ -1006,7 +1006,7 @@ msgid "Show Author Section"
 msgstr "Tampilkan pilihan penulis"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Penerbit"
 
@@ -1017,7 +1017,7 @@ msgstr "Tampilkan pilihan penerbit"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Bahasa"
 
@@ -1044,7 +1044,7 @@ msgstr "Format berkas"
 msgid "Show File Formats Section"
 msgstr "Tampilkan pilihan format berkas"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Buku yang Diarsipkan"
 
@@ -1053,7 +1053,7 @@ msgstr "Buku yang Diarsipkan"
 msgid "Show Archived Books"
 msgstr "Tampilkan buku yang diarsipkan"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Daftar Buku"
 
@@ -1269,145 +1269,145 @@ msgstr "Pembaruan tersedia. Klik tombol di bawah untuk memperbarui ke versi: %(v
 msgid "No release information available"
 msgstr "Tidak ada informasi rilis yang tersedia"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Temukan (Buku Acak)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Buku Populer (Paling Banyak Diunduh)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Buku telah diunduh oleh %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Penulis: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Penerbit: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr "Peringkat: Tidak ada"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Peringkat: %(rating)s★"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format berkas: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Bahasa: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Unduhan"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Daftar peringkat"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Daftar format berkas"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Harap atur pengaturan email SMTP terlebih dahulu..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Buku telah diantrikan untuk dikirim ke %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Oops! Terjadi kesalahan saat mengirim buku: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Harap perbarui profil Anda dengan alamat e-mail Kirim ke Kindle yang valid."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Server email belum diatur, silakan hubungi administrator!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Daftar"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Alamat email Anda tidak diizinkan untuk mendaftar"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "E-mail konfirmasi telah dikirimkan ke alamat email Anda."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Tidak dapat mengaktifkan autentikasi LDAP."
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "Login Pengganti sebagai: '%(nickname)s', Server LDAP tidak dapat dijangkau, atau pengguna tidak diketahui."
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Tidak dapat login: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Pengguna atau Kata Sandi salah"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Kata Sandi baru telah dikirimkan ke alamat email Anda"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Harap masukkan pengguna valid untuk mengatur ulang kata sandi"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Profil %(name)s"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Profil diperbarui"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "Ditemukan akun yang ada untuk alamat email ini"
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index e1d1aba66fd1f657f6aab778e6f026f28c301d52..4d38a5b0617f282578a1a1a7ea6a22a326129ae8 100644
GIT binary patch
delta 22
dcmca~ocYpm<_+yN>_!TP##W|AoBL{9(gALI2(kbG

delta 22
dcmca~ocYpm<_+yN?1l=4rdB4#oBL{9(gALN2(thH

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 52a111167..de3de48a3 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -46,7 +46,7 @@ msgstr "Libro accodato con successo per il backup dei metadati"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -291,7 +291,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Errore nel database: %(error)s."
@@ -330,8 +330,8 @@ msgstr "Durata non valida per l'attività specificata"
 msgid "Scheduled tasks settings updated"
 msgstr "Impostazioni delle attività pianificate aggiornate"
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
@@ -464,7 +464,7 @@ msgstr "Configurazione del Database aggiornata"
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Per favore compila tutti i campi!"
 
@@ -498,7 +498,7 @@ msgstr "Non posso eliminare l'utente Guest (ospite)"
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr "L'indirizzo e-mail non può essere vuoto e deve essere un recapito valido"
 
@@ -515,20 +515,20 @@ msgstr "non installato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonna personalizzata no.%(column)d non esiste nel database di Calibre"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Nessuna"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book 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"
 
@@ -827,7 +827,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -894,7 +894,7 @@ msgstr "{} Stelle"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Accesso"
 
@@ -910,7 +910,7 @@ msgstr "Il token è scaduto"
 msgid "Success! Please return to your device"
 msgstr "Riuscito! Torna al tuo dispositivo"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Libri"
 
@@ -935,7 +935,7 @@ msgstr "Libri scaricati"
 msgid "Show Downloaded Books"
 msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Libri meglio valutati"
 
@@ -944,7 +944,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Libri letti"
 
@@ -954,7 +954,7 @@ msgid "Show Read and Unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Libri non letti"
 
@@ -972,7 +972,7 @@ msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Categorie"
 
@@ -983,7 +983,7 @@ msgstr "Mostra l'opzione per la selezione delle categorie"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Serie"
 
@@ -1003,7 +1003,7 @@ msgid "Show Author Section"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Editori"
 
@@ -1014,7 +1014,7 @@ msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Lingue"
 
@@ -1041,7 +1041,7 @@ msgstr "Formati file"
 msgid "Show File Formats Section"
 msgstr "Mostra l'opzione per la selezione del formato dei file"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
@@ -1050,7 +1050,7 @@ msgstr "Libri archiviati"
 msgid "Show Archived Books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Elenco libri"
 
@@ -1266,145 +1266,145 @@ msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per agg
 msgid "No release information available"
 msgstr "Non sono disponibili informazioni sulla versione"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "I libri scaricati da %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr "Valutazione: nessuna"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Elenco delle valutazioni"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Libro accodato con successo per essere spedito a %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Per favore aggiorna il tuo profilo con un indirizzo e-mail Kindle a cui inviare i libri."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index b5a35dc999a963d814ab17932cf96e59b9511047..a800760b3f0a0d52351820b5aa6ca6a8e3ccbdb7 100644
GIT binary patch
delta 22
ecmZ2}jd}Ss<_%Fb>_!TP##W|An-gn}<pBU^lnAK+

delta 22
ecmZ2}jd}Ss<_%Fb?1l=4rdB4#n-gn}<pBU^nFy)?

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 7c0586133..5a73b7b35 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: subdiox <subdiox@gmail.com>\n"
 "Language: ja\n"
@@ -47,7 +47,7 @@ msgstr "本の %(eReadermail)s への送信がキューに追加されました"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "不明"
 
@@ -292,7 +292,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "DBエラー: %(error)s"
@@ -331,8 +331,8 @@ msgstr "指定したタスクの期間が無効です"
 msgid "Scheduled tasks settings updated"
 msgstr "スケジュールタスクの設定を更新しました"
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
@@ -465,7 +465,7 @@ msgstr "DB設定を更新しました"
 msgid "Database Configuration"
 msgstr "DB設定"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "全ての項目を入力してください"
 
@@ -499,7 +499,7 @@ msgstr "ゲストユーザーは削除できません"
 msgid "No admin user remaining, can't delete user"
 msgstr "管理者ユーザーが残っておらず、ユーザーを削除できません"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -516,20 +516,20 @@ msgstr "インストールされていません"
 msgid "Execution permissions missing"
 msgstr "実行権限がありません"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "カスタムカラムの%(column)d列目がcalibreのDBに存在しません"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "なし"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "選択した本は利用できません。ファイルが存在しないか、アクセスできません"
 
@@ -830,7 +830,7 @@ msgstr "Kobo設定"
 msgid "Register with %(provider)s"
 msgstr "%(provider)s で登録"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "%(nickname)s としてログイン中"
@@ -897,7 +897,7 @@ msgstr "星{}"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "ログイン"
 
@@ -913,7 +913,7 @@ msgstr "トークンが無効です"
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "本"
 
@@ -938,7 +938,7 @@ msgstr "ダウンロードされた本"
 msgid "Show Downloaded Books"
 msgstr "ダウンロードされた本を表示"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "高評価の本"
 
@@ -947,7 +947,7 @@ msgid "Show Top Rated Books"
 msgstr "高評価の本を表示"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "既読の本"
 
@@ -957,7 +957,7 @@ msgid "Show Read and Unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "未読の本"
 
@@ -975,7 +975,7 @@ msgid "Show Random Books"
 msgstr "ランダムに本を表示"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -986,7 +986,7 @@ msgstr "カテゴリ選択を表示"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "シリーズ"
 
@@ -1006,7 +1006,7 @@ msgid "Show Author Section"
 msgstr "著者選択を表示"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "出版社"
 
@@ -1017,7 +1017,7 @@ msgstr "出版社選択を表示"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "言語"
 
@@ -1044,7 +1044,7 @@ msgstr "ファイル形式"
 msgid "Show File Formats Section"
 msgstr "ファイル形式選択を表示"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "アーカイブされた本"
 
@@ -1053,7 +1053,7 @@ msgstr "アーカイブされた本"
 msgid "Show Archived Books"
 msgstr "アーカイブされた本を表示"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "本の一覧"
 
@@ -1269,145 +1269,145 @@ msgstr "アップデートが利用可能です。下のボタンをクリック
 msgid "No release information available"
 msgstr "リリース情報がありません"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムに表示)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "人気の本 (最もダウンロードされた本)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s がダウンロードした本"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "著者: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr "評価: なし"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "評価: 星%(rating)s"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "ファイル形式: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "ダウンロード数"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "評価一覧"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "ファイル形式一覧"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "本の %(eReadermail)s への送信がキューに追加されました"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "メールサーバーが設定されていません。管理者に連絡してください"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "LDAP認証を有効化できません"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "代わりに '%(nickname)s' としてログインします。LDAPサーバーにアクセスできないか、ユーザーが存在しません"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "ログインできません: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "ユーザー名またはパスワードが違います"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "新しいパスワードがあなたのメールアドレスに送信されました"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "パスワードをリセットするには、有効なユーザー名を入力してください"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "プロフィールを更新しました"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "このメールアドレスで登録されたアカウントがすでに存在します"
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 5afd4f78a205a4913b0159bf735f3a40a8358b01..b287a112434d9cd21b2da66264c83a600f2270a5 100644
GIT binary patch
delta 22
ecmbQUfpN|T#tokp*^Lwojjc?LHvdvoG6Mi(jR)fZ

delta 22
ecmbQUfpN|T#tokp*$ov8O|49fH~&&pG6Mi(k_Y4f

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 729601b6a..4ce6d6a78 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -48,7 +48,7 @@ msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញ
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "មិនដឹង"
 
@@ -298,7 +298,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr ""
@@ -337,8 +337,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
@@ -507,7 +507,7 @@ msgstr ""
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -524,20 +524,20 @@ msgstr "មិនបានតម្លើង"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "គ្មាន"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -834,7 +834,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -901,7 +901,7 @@ msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -917,7 +917,7 @@ msgstr "វត្ថុតាងហួសពេលកំណត់"
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr ""
 
@@ -942,7 +942,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
@@ -951,7 +951,7 @@ msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
@@ -961,7 +961,7 @@ msgid "Show Read and Unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
@@ -979,7 +979,7 @@ msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
@@ -990,7 +990,7 @@ msgstr "បង្ហាញជម្រើសប្រភេទ"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "ស៊េរី"
 
@@ -1010,7 +1010,7 @@ msgid "Show Author Section"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr ""
 
@@ -1021,7 +1021,7 @@ msgstr "បង្ហាញជម្រើសស៊េរី"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "ភាសានានា"
 
@@ -1048,7 +1048,7 @@ msgstr ""
 msgid "Show File Formats Section"
 msgstr "បង្ហាញជម្រើសស៊េរី"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr ""
 
@@ -1057,7 +1057,7 @@ msgstr ""
 msgid "Show Archived Books"
 msgstr "បង្ហាញសៀវភៅមកថ្មី"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr ""
 
@@ -1275,144 +1275,144 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "ឯកសារ DLS"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(eReadermail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1209
-msgid "Oops! Please update your profile with a valid  eReader Email."
+#: cps/web.py:1211
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr ""
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr ""
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr ""
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr ""
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr ""
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr ""
 
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index f1138ac9b96c6fadced5b8b7753544a2498706ea..47bfea3c4a27e321229c63042a98747886d60dc3 100644
GIT binary patch
delta 21
ccmbO>g?ZW(<^{#<Mhb?;R;EUq*^BwZ0Zs-6UjP6A

delta 21
ccmbO>g?ZW(<^{#<h6;wJRwl-q*^BwZ0Zt1BU;qFB

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index f22bc3ba6..000bac1c7 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -46,7 +46,7 @@ msgstr "성공적으로 %(eReadermail)s에 보내기 예약이 되었습니다"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "알 수 없음"
 
@@ -291,7 +291,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "데이터베이스 오류: %(error)s."
@@ -330,8 +330,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
 
@@ -464,7 +464,7 @@ msgstr "데이터베이스 설정이 업데이트 되었습니다"
 msgid "Database Configuration"
 msgstr "데이터베이스 구성"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "모든 필드를 채워주십시오!"
 
@@ -498,7 +498,7 @@ msgstr "게스트 사용자는 삭제할 수 없습니다"
 msgid "No admin user remaining, can't delete user"
 msgstr "관리자 계정이 하나 뿐일 때는 관리자 권한을 삭제할 수 없음"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -515,20 +515,20 @@ msgstr "설치되지 않음"
 msgid "Execution permissions missing"
 msgstr "실행 권한 누락"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "None"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다"
 
@@ -831,7 +831,7 @@ msgstr "Kobo 설정"
 msgid "Register with %(provider)s"
 msgstr "%(provider)s에 등록"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
@@ -898,7 +898,7 @@ msgstr "{} Stars"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "로그인"
 
@@ -914,7 +914,7 @@ msgstr "토큰이 만료되었습니다"
 msgid "Success! Please return to your device"
 msgstr "성공! 기기로 돌아가주세요"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "책"
 
@@ -939,7 +939,7 @@ msgstr "다운로드된 책"
 msgid "Show Downloaded Books"
 msgstr "다운로드된 책 보기"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "평점이 높은 책"
 
@@ -948,7 +948,7 @@ msgid "Show Top Rated Books"
 msgstr "평점이 높은 책 보기"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "읽은 책"
 
@@ -958,7 +958,7 @@ msgid "Show Read and Unread"
 msgstr "읽은 책과 읽지 않은 책 보기"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "읽지 않은 책"
 
@@ -976,7 +976,7 @@ msgid "Show Random Books"
 msgstr "무작위 추천"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "카테고리"
 
@@ -987,7 +987,7 @@ msgstr "카테고리별 보기"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "시리즈"
 
@@ -1007,7 +1007,7 @@ msgid "Show Author Section"
 msgstr "저자별 보기"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "출판사"
 
@@ -1018,7 +1018,7 @@ msgstr "출판사별 보기"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "언어"
 
@@ -1045,7 +1045,7 @@ msgstr "파일 유형"
 msgid "Show File Formats Section"
 msgstr "파일 유형별 보기"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "보관된 책"
 
@@ -1054,7 +1054,7 @@ msgstr "보관된 책"
 msgid "Show Archived Books"
 msgstr "보관된 책 보기"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "책 목록"
 
@@ -1271,145 +1271,145 @@ msgstr "최신 안정 버전 %(version)s으로 업데이트하려면 아래 버
 msgid "No release information available"
 msgstr "출시 정보가 없습니다"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "발견(무작위 도서)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "인기있는 책(가장 많이 다운로드됨)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s이(가) 다운로드한 책"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "저자: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "출판사: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "시리즈: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "평가: %(rating)s 별"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "파일 유형: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "카테고리: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "언어: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "다운로드"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "평점 목록"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "파일 유형 목록"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "성공적으로 %(eReadermail)s에 보내기 예약이 되었습니다"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "책을 보내는 중에 오류 발생: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "등록"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "이메일을 등록할 수 없습니다"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "확인을 위한 이메일이 발송되었습니다."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "LDAP 인증을 활성화할 수 없습니다"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "로그인 실패: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "잘못된 사용자명 또는 비밀번호"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "새 비밀번호가 이메일로 전송되었습니다"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s 프로필"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "프로필이 업데이트 됨"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "등록되어 있는 이메일 주소입니다"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 9207a9f3be5a8ec89782480a49c7daf6a15d3cce..c9de3ceaf94607f4343505553ca80cdc20988659 100644
GIT binary patch
delta 22
dcmZ4fhH3d5rVZSg>_!TP##W|An}sq(eF0)72R#4)

delta 22
dcmZ4fhH3d5rVZSg?1l=4rdB4#n}sq(eF0)C2R;A*

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index d0863b340..08e93a805 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -48,7 +48,7 @@ msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(eReade
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -298,7 +298,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Database fout: %(error)s."
@@ -337,8 +337,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
@@ -475,7 +475,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Vul alle velden in!"
 
@@ -510,7 +510,7 @@ msgstr "Kan Gast gebruiker niet verwijderen"
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -527,20 +527,20 @@ msgstr "niet geïnstalleerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Geen"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Oeps! Geselecteerd boek is niet beschikbaar. Bestand bestaat niet of is niet toegankelijk"
 
@@ -843,7 +843,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -910,7 +910,7 @@ msgstr "{} sterren"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Inloggen"
 
@@ -926,7 +926,7 @@ msgstr "Toegangssleutel is verlopen"
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Boeken"
 
@@ -951,7 +951,7 @@ msgstr "Gedownloade boeken"
 msgid "Show Downloaded Books"
 msgstr "Gedownloade boeken tonen"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
@@ -960,7 +960,7 @@ msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
@@ -970,7 +970,7 @@ msgid "Show Read and Unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
@@ -988,7 +988,7 @@ msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -999,7 +999,7 @@ msgstr "Categoriekeuze tonen"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Boekenreeksen"
 
@@ -1019,7 +1019,7 @@ msgid "Show Author Section"
 msgstr "Auteurkeuze tonen"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Uitgevers"
 
@@ -1030,7 +1030,7 @@ msgstr "Uitgeverskeuze tonen"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Talen"
 
@@ -1057,7 +1057,7 @@ msgstr "Bestandsformaten"
 msgid "Show File Formats Section"
 msgstr "Bestandsformaten tonen"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
@@ -1066,7 +1066,7 @@ msgstr "Gearchiveerde boeken"
 msgid "Show Archived Books"
 msgstr "Gearchiveerde boeken tonen"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Boekenlijst"
 
@@ -1285,145 +1285,145 @@ msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten na
 msgid "No release information available"
 msgstr "Geen update-informatie beschikbaar"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Gedownloade boeken door %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Fout opgetreden bij het versturen van dit boek: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Er is een bevestigings-e-mail verstuurd naar je e-mailadres."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Profiel bijgewerkt"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 #, fuzzy
 msgid "Oops! An account already exists for this Email."
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
diff --git a/cps/translations/no/LC_MESSAGES/messages.mo b/cps/translations/no/LC_MESSAGES/messages.mo
index ab0f428f6ed36638303654f7d7ed705e5404c4f5..3b9413dbaa15bdc82b8db935dd07f553774eb9ee 100644
GIT binary patch
delta 22
dcmex8lj-+NrVaT)>_!TP##W|Ao6CY)tpI7K2sQu!

delta 22
dcmex8lj-+NrVaT)?1l=4rdB4#o6CY)tpI7P2sZ!#

diff --git a/cps/translations/no/LC_MESSAGES/messages.po b/cps/translations/no/LC_MESSAGES/messages.po
index 4b876f219..dda06a810 100644
--- a/cps/translations/no/LC_MESSAGES/messages.po
+++ b/cps/translations/no/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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2023-01-06 11:00+0000\n"
 "Last-Translator: Vegard Fladby <vegard.fladby@gmail.com>\n"
 "Language: no\n"
@@ -47,7 +47,7 @@ msgstr "Bøker ble satt i kø for sikkerhetskopiering av metadata"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -293,7 +293,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, fuzzy, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Databasefeil: %(error)s."
@@ -333,8 +333,8 @@ msgstr "Ugyldig varighet for spesifisert oppgave"
 msgid "Scheduled tasks settings updated"
 msgstr "Innstillinger for planlagte oppgaver er oppdatert"
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 #, fuzzy
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "En ukjent feil oppstod. Prøv igjen senere."
@@ -468,7 +468,7 @@ msgstr "Databaseinnstillinger oppdatert"
 msgid "Database Configuration"
 msgstr "Databasekonfigurasjon"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 #, fuzzy
 msgid "Oops! Please complete all fields."
 msgstr "Vennligst fyll ut alle feltene!"
@@ -504,7 +504,7 @@ msgstr "Kan ikke slette gjestebruker"
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen administratorbruker igjen, kan ikke slette bruker"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 #, fuzzy
 msgid "Email can't be empty and has to be a valid Email"
 msgstr "E-postadresse kan ikke være tom og må være en gyldig e-post"
@@ -522,20 +522,20 @@ msgstr "ikke installert"
 msgid "Execution permissions missing"
 msgstr "Utførelsestillatelser mangler"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Egendefinert kolonnenr.%(column)d finnes ikke i caliber-databasen"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Ingen"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 #, fuzzy
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Oops! Den valgte boktittelen er utilgjengelig. Filen eksisterer ikke eller er ikke tilgjengelig"
@@ -837,7 +837,7 @@ msgstr "Kobo oppsett"
 msgid "Register with %(provider)s"
 msgstr "Registrer deg hos %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, fuzzy, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "du er nå logget på som: '%(nickname)s'"
@@ -904,7 +904,7 @@ msgstr "{} Stjerner"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Logg Inn"
 
@@ -920,7 +920,7 @@ msgstr "Token har utløpt"
 msgid "Success! Please return to your device"
 msgstr "Suksess! Gå tilbake til enheten din"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Bøker"
 
@@ -945,7 +945,7 @@ msgstr "Nedlastede bøker"
 msgid "Show Downloaded Books"
 msgstr "Vis nedlastede bøker"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Topprangerte bøker"
 
@@ -954,7 +954,7 @@ msgid "Show Top Rated Books"
 msgstr "Vis best rangerte bøker"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Lese bøker"
 
@@ -964,7 +964,7 @@ msgid "Show Read and Unread"
 msgstr "Vis lest og ulest"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Uleste bøker"
 
@@ -982,7 +982,7 @@ msgid "Show Random Books"
 msgstr "Vis tilfeldige bøker"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -993,7 +993,7 @@ msgstr "Vis kategorivalg"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Serie"
 
@@ -1013,7 +1013,7 @@ msgid "Show Author Section"
 msgstr "Vis forfattervalg"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Forlag"
 
@@ -1024,7 +1024,7 @@ msgstr "Vis utgivervalg"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Språk"
 
@@ -1051,7 +1051,7 @@ msgstr "Filformater"
 msgid "Show File Formats Section"
 msgstr "Vis valg av filformater"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Arkiverte bøker"
 
@@ -1060,7 +1060,7 @@ msgstr "Arkiverte bøker"
 msgid "Show Archived Books"
 msgstr "Vis arkiverte bøker"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Bøker Liste"
 
@@ -1276,152 +1276,152 @@ msgstr "En ny oppdatering er tilgjengelig. Klikk på knappen nedenfor for å opp
 msgid "No release information available"
 msgstr "Ingen utgivelsesinformasjon tilgjengelig"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Discover (tilfeldige bøker)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Hot Books (mest nedlastede)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Lastet ned bøker av %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Forfatter: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Utgiver: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr "Vurdering: Ingen"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Rangering: %(rating)s stjerner"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Nedlastinger"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Rangeringsliste"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Liste over filformater"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 #, fuzzy
 msgid "Please configure the SMTP mail settings first."
 msgstr "Vennligst konfigurer SMTP-postinnstillingene først..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, fuzzy, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Boken ble satt i kø for sending til %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, fuzzy, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Oops! Det oppsto en feil ved sending av denne boken: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Vennligst oppdater profilen din med en gyldig Send til Kindle-e-postadresse."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 #, fuzzy
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-postserveren er ikke konfigurert, kontakt administratoren din!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Registrere"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 #, fuzzy
 msgid "Oops! Your Email is not allowed."
 msgstr "Din e-post kan ikke registreres"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr ""
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 #, fuzzy
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Kan ikke aktivere LDAP-autentisering"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, fuzzy, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "Reservepålogging som: '%(nickname)s', LDAP-serveren er ikke tilgjengelig, eller brukeren er ukjent"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, fuzzy, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Kunne ikke logge på: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 #, fuzzy
 msgid "Oops! Invalid Username or Password."
 msgstr "Vennligst skriv inn gyldig brukernavn for å tilbakestille passordet"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 #, fuzzy
 msgid "Success! New Password was sent to your Email."
 msgstr "Nytt passord ble sendt til e-postadressen din"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 #, fuzzy
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Vennligst skriv inn gyldig brukernavn for å tilbakestille passordet"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, fuzzy, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s sin profil"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Profil oppdatert"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr ""
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 5e80213207a71d446a0ee57766d778094b3a3f8d..59a3086a0796203ac977221b27ad628341fec37e 100644
GIT binary patch
delta 22
ecmZqu$<+FjX~Vuub|VEtV=Ggm%||m21OWhTQwb>m

delta 22
ecmZqu$<+FjX~Vuuc0&b2Q!5kW%||m21OWhTSP3cs

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 8a65bbc38..d48788ee6 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -49,7 +49,7 @@ msgstr "Książka została umieszczona w kolejce do wysłania do %(eReadermail)s
 # ???
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Nieznany"
 
@@ -298,7 +298,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
@@ -337,8 +337,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
@@ -476,7 +476,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Proszę wypełnić wszystkie pola!"
 
@@ -511,7 +511,7 @@ msgstr "Nie można usunąć użytkownika gościa"
 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:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -528,20 +528,20 @@ msgstr "nie zainstalowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Niestandardowa kolumna No.%(column)d nie istnieje w bazie calibre"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Brak"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Błąd otwierania e-booka. Plik nie istnieje lub jest niedostępny"
 
@@ -847,7 +847,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -914,7 +914,7 @@ msgstr "{} Gwiazdek"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -930,7 +930,7 @@ msgstr "Token wygasł"
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Książki"
 
@@ -955,7 +955,7 @@ msgstr "Pobrane książki"
 msgid "Show Downloaded Books"
 msgstr "Pokaż pobrane książki"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Najwyżej ocenione"
 
@@ -964,7 +964,7 @@ msgid "Show Top Rated Books"
 msgstr "Pokaż menu najwyżej ocenionych książek"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Przeczytane"
 
@@ -974,7 +974,7 @@ msgid "Show Read and Unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Nieprzeczytane"
 
@@ -992,7 +992,7 @@ msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -1003,7 +1003,7 @@ msgstr "Pokaż menu wyboru kategorii"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Cykle"
 
@@ -1023,7 +1023,7 @@ msgid "Show Author Section"
 msgstr "Pokaż menu wyboru autora"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Wydawcy"
 
@@ -1034,7 +1034,7 @@ msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Języki"
 
@@ -1061,7 +1061,7 @@ msgstr "Formaty plików"
 msgid "Show File Formats Section"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
@@ -1070,7 +1070,7 @@ msgstr "Zarchiwizowane książki"
 msgid "Show Archived Books"
 msgstr "Pokaż zarchiwizowane książki"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Lista książek"
 
@@ -1290,145 +1290,145 @@ msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktual
 msgid "No release information available"
 msgstr "Brak dostępnych informacji o wersji"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Książki pobrane przez %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "DLS"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Książka została umieszczona w kolejce do wysłania do %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Wiadomość e-mail z potwierdzeniem została wysłana na Twoje konto e-mail."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, 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:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Nowe hasło zostało wysłane na Twój adres e-mail"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 00e3adfea0fe38b454b99f6caeed8f58bb5eeeb3..855858dffb08c615bc6fb051136334e81b2cb35a 100644
GIT binary patch
delta 22
dcmeyhhxykY<_*p@>_!TP##W|Ao4slbk^pV|2ulC}

delta 22
dcmeyhhxykY<_*p@?1l=4rdB4#o4slbk^pW22uuI~

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index bfc6b5623..627e9ba7c 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -44,7 +44,7 @@ msgstr "Livro enfileirado com sucesso para envio para %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -289,7 +289,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
@@ -328,8 +328,8 @@ msgstr "Duração inválida para a tarefa especificada"
 msgid "Scheduled tasks settings updated"
 msgstr "Configurações de tarefas agendadas atualizadas"
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
@@ -462,7 +462,7 @@ msgstr "Configurações do Banco de Dados Atualizada"
 msgid "Database Configuration"
 msgstr "Configuração do Banco de Dados"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Por favor, preencha todos os campos!"
 
@@ -496,7 +496,7 @@ msgstr "Impossível excluir Convidado"
 msgid "No admin user remaining, can't delete user"
 msgstr "Nenhum usuário administrador restante, não é possível apagar o usuário"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -513,20 +513,20 @@ msgstr "não instalado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "A Coluna Personalizada No.%(column)d não existe no banco de dados do calibre"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Nenhum"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Oops! O Livro selecionado não está disponível. O arquivo não existe ou não é acessível"
 
@@ -827,7 +827,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -894,7 +894,7 @@ msgstr "{} Estrelas"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Login"
 
@@ -910,7 +910,7 @@ msgstr "O Token expirou"
 msgid "Success! Please return to your device"
 msgstr "Sucesso! Por favor, volte ao seu aparelho"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Livros"
 
@@ -935,7 +935,7 @@ msgstr "Livros Baixados"
 msgid "Show Downloaded Books"
 msgstr "Mostrar Livros Baixados"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Livros Mais Bem Avaliados"
 
@@ -944,7 +944,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar Livros Mais Bem Avaliados"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Livros Lidos"
 
@@ -954,7 +954,7 @@ msgid "Show Read and Unread"
 msgstr "Mostrar lido e não lido"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Livros Não Lidos"
 
@@ -972,7 +972,7 @@ msgid "Show Random Books"
 msgstr "Mostrar Livros Aleatórios"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Categorias"
 
@@ -983,7 +983,7 @@ msgstr "Mostrar seleção de categoria"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Série"
 
@@ -1003,7 +1003,7 @@ msgid "Show Author Section"
 msgstr "Mostrar seleção de autor"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Editoras"
 
@@ -1014,7 +1014,7 @@ msgstr "Mostrar seleção de editoras"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -1041,7 +1041,7 @@ msgstr "Formatos de arquivo"
 msgid "Show File Formats Section"
 msgstr "Mostrar seleção de formatos de arquivo"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Livros Arquivados"
 
@@ -1050,7 +1050,7 @@ msgstr "Livros Arquivados"
 msgid "Show Archived Books"
 msgstr "Mostrar livros arquivados"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Lista de Livros"
 
@@ -1266,145 +1266,145 @@ msgstr "Uma nova atualização está disponível. Clique no botão abaixo para a
 msgid "No release information available"
 msgstr "Não há informações de lançamento disponíveis"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Descobrir (Livros Aleatórios)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livros Quentess (Mais Baixados)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Livros baixados por %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editora: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr "Avaliação: Nenhuma"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Avaliação: %(rating)s estrelas"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato do arquivo: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Downloads"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Lista de Avaliações"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Lista de formatos de arquivo"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Ops! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail Envie Para o Kindle válido."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Nome de Usuário ou Senha incorretos"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Nova Senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Perfil atualizado"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "Encontrada uma conta existente para este endereço de e-mail."
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index d525c85623ad3a69f55050a9d351d5ef847bc7f2..eeabba6154f3c1b6a230b8768ed0e23e93badf27 100644
GIT binary patch
delta 22
ecmZ2>gK60frVTs2*^Lwojjc?LHXra#O8@|Bk_eXo

delta 22
ecmZ2>gK60frVTs2*$ov8O|49fHy`j$O8@|Bmk5{u

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index c9ebe1305..54990df12 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -48,7 +48,7 @@ msgstr "Книга успешно поставлена в очередь для
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -299,7 +299,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr ""
@@ -338,8 +338,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
@@ -476,7 +476,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Пожалуйста, заполните все поля!"
 
@@ -511,7 +511,7 @@ msgstr ""
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -528,20 +528,20 @@ msgstr "не установлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Нет"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
@@ -842,7 +842,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -909,7 +909,7 @@ msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Логин"
 
@@ -925,7 +925,7 @@ msgstr "Ключ просрочен"
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Книги"
 
@@ -950,7 +950,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
@@ -959,7 +959,7 @@ msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
@@ -969,7 +969,7 @@ msgid "Show Read and Unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
@@ -987,7 +987,7 @@ msgid "Show Random Books"
 msgstr "Показывать Случайные Книги"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Категории"
 
@@ -998,7 +998,7 @@ msgstr "Показывать выбор категории"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Серии"
 
@@ -1018,7 +1018,7 @@ msgid "Show Author Section"
 msgstr "Показывать выбор автора"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Издатели"
 
@@ -1029,7 +1029,7 @@ msgstr "Показать выбор издателя"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Языки"
 
@@ -1056,7 +1056,7 @@ msgstr "Форматы файлов"
 msgid "Show File Formats Section"
 msgstr "Показать выбор форматов файлов"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr ""
 
@@ -1065,7 +1065,7 @@ msgstr ""
 msgid "Show Archived Books"
 msgstr "Показывать недавние книги"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr ""
 
@@ -1284,145 +1284,145 @@ msgstr "Новое обновление доступно. Нажмите на к
 msgid "No release information available"
 msgstr "Информация о выпуске недоступна"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Скачать"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Список рейтингов"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 #, fuzzy
 msgid "Oops! An account already exists for this Email."
 msgstr "Этот адрес электронной почты уже зарегистрирован."
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index b60c6698eb545e31fadf410d98079357ec648916..1718ac1f5603ad2912589e7af6a51417162ddfcd 100644
GIT binary patch
delta 22
ecmZ4YfN9+WrVRz@>_!TP##W|Ao6FO;djJ4x4G5M1

delta 22
ecmZ4YfN9+WrVRz@?1l=4rdB4#o6FO;djJ4x5(t+7

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 4dd42269d..bdedf5915 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -47,7 +47,7 @@ msgstr "Boken är i kö för att skicka till %(eReadermail)s"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -296,7 +296,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Databasfel: %(error)s."
@@ -335,8 +335,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
@@ -473,7 +473,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Fyll i alla fält!"
 
@@ -507,7 +507,7 @@ msgstr "Det går inte att ta bort gästanvändaren"
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -524,20 +524,20 @@ msgstr "inte installerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Ingen"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book 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"
 
@@ -840,7 +840,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -907,7 +907,7 @@ msgstr "{} stjärnor"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Logga in"
 
@@ -923,7 +923,7 @@ msgstr "Token har löpt ut"
 msgid "Success! Please return to your device"
 msgstr "Lyckades! Vänligen återvänd till din enhet"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Böcker"
 
@@ -948,7 +948,7 @@ msgstr "Hämtade böcker"
 msgid "Show Downloaded Books"
 msgstr "Visa hämtade böcker"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Bäst rankade böcker"
 
@@ -957,7 +957,7 @@ msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Lästa böcker"
 
@@ -967,7 +967,7 @@ msgid "Show Read and Unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
@@ -985,7 +985,7 @@ msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -996,7 +996,7 @@ msgstr "Visa kategorival"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Serier"
 
@@ -1016,7 +1016,7 @@ msgid "Show Author Section"
 msgstr "Visa författarval"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Förlag"
 
@@ -1027,7 +1027,7 @@ msgstr "Visa urval av förlag"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Språk"
 
@@ -1054,7 +1054,7 @@ msgstr "Filformat"
 msgid "Show File Formats Section"
 msgstr "Visa val av filformat"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Arkiverade böcker"
 
@@ -1063,7 +1063,7 @@ msgstr "Arkiverade böcker"
 msgid "Show Archived Books"
 msgstr "Visa arkiverade böcker"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Boklista"
 
@@ -1282,145 +1282,145 @@ msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att up
 msgid "No release information available"
 msgstr "Ingen versionsinformation tillgänglig"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Hämtade böcker av %(user)s"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Hämtningar"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Betygslista"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "Boken är i kö för att skicka till %(eReadermail)s"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Det gick inte att skicka den här boken: %(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "Konfigurera din kindle-e-postadress först..."
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Profilen uppdaterad"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 06cd52e65e23bdf71868970a49d82fe53f10702e..5dd828d6217fd4fa203893eae0526823051c6837 100644
GIT binary patch
delta 22
dcmaFAkn#OO#tpIh>_!TP##W|An^W|=6#-=!2d@AC

delta 22
dcmaFAkn#OO#tpIh?1l=4rdB4#n^W|=6#-=(2e1GD

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index b72d93614..91ab31d4c 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -47,7 +47,7 @@ msgstr "%(eReadermail)s'a gönderilmek üzere başarıyla sıraya alındı"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
@@ -293,7 +293,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr ""
@@ -332,8 +332,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
@@ -469,7 +469,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Lütfen tüm alanları doldurun!"
 
@@ -504,7 +504,7 @@ msgstr ""
 msgid "No admin user remaining, can't delete user"
 msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -521,20 +521,20 @@ msgstr "yüklü değil"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Hiçbiri"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -834,7 +834,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -901,7 +901,7 @@ msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Giriş"
 
@@ -917,7 +917,7 @@ msgstr "Token süresi doldu"
 msgid "Success! Please return to your device"
 msgstr "Başarılı! Lütfen cihazınıza dönün"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "eKitaplar"
 
@@ -942,7 +942,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr ""
 
@@ -951,7 +951,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Okunanlar"
 
@@ -961,7 +961,7 @@ msgid "Show Read and Unread"
 msgstr "Okunan ve okunmayanları göster"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Okunmamışlar"
 
@@ -979,7 +979,7 @@ msgid "Show Random Books"
 msgstr "Rastgele Kitap Göster"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -990,7 +990,7 @@ msgstr "Kategori seçimini göster"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Seriler"
 
@@ -1010,7 +1010,7 @@ msgid "Show Author Section"
 msgstr "Yazar seçimini göster"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Yayıncılar"
 
@@ -1021,7 +1021,7 @@ msgstr "Yayıncı seçimini göster"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Diller"
 
@@ -1048,7 +1048,7 @@ msgstr "Biçimler"
 msgid "Show File Formats Section"
 msgstr "Dosya biçimi seçimini göster"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr ""
 
@@ -1057,7 +1057,7 @@ msgstr ""
 msgid "Show Archived Books"
 msgstr "Son eKitapları göster"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr ""
 
@@ -1276,144 +1276,144 @@ msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdak
 msgid "No release information available"
 msgstr "Sürüm bilgisi mevcut değil"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Keşfet (Rastgele)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Yazar: %(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Yayınevi: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Değerlendirme listesi"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Biçim listesi"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "%(eReadermail)s'a gönderilmek üzere başarıyla sıraya alındı"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1209
-msgid "Oops! Please update your profile with a valid  eReader Email."
+#: cps/web.py:1211
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr ""
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-Posta sunucusu ayarlanmadı, lütfen yöneticinizle iletişime geçin!"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr ""
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Profil güncellendi"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 #, fuzzy
 msgid "Oops! An account already exists for this Email."
 msgstr "Bu e-posta adresi için bir hesap mevcut."
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 99de8187810e7774654a92b70a70ebd72a4d53cd..66b7906b64478de59d83b3fabc8c3ab772de23c3 100644
GIT binary patch
delta 22
ecmcb+k@4<E#tla_*^Lwojjc?LHlNlM(gy%*0SE#B

delta 22
ecmcb+k@4<E#tla_*$ov8O|49fH=ouN(gy%*1_%QH

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 82292a38e..5f8375596 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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -45,7 +45,7 @@ msgstr ""
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Невідомий"
 
@@ -295,7 +295,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr ""
@@ -334,8 +334,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -470,7 +470,7 @@ msgstr "З'єднання з базою даних закрите"
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Будь-ласка, заповніть всі поля!"
 
@@ -504,7 +504,7 @@ msgstr ""
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -521,20 +521,20 @@ msgstr "не встановлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "Ні"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
@@ -831,7 +831,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -898,7 +898,7 @@ msgstr "{} зірок"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -914,7 +914,7 @@ msgstr "Час дії токено вичерпано"
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Книжки"
 
@@ -939,7 +939,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Книги з найкращим рейтингом"
 
@@ -948,7 +948,7 @@ msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Прочитані книги"
 
@@ -958,7 +958,7 @@ msgid "Show Read and Unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
@@ -976,7 +976,7 @@ msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Категорії"
 
@@ -987,7 +987,7 @@ msgstr "Показувати вибір категорії"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Серії"
 
@@ -1007,7 +1007,7 @@ msgid "Show Author Section"
 msgstr "Показувати вибір автора"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Видавництва"
 
@@ -1018,7 +1018,7 @@ msgstr "Показувати вибір серії"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Мови"
 
@@ -1045,7 +1045,7 @@ msgstr "Формати файлів"
 msgid "Show File Formats Section"
 msgstr "Показувати вибір серії"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Архівні книжки"
 
@@ -1054,7 +1054,7 @@ msgstr "Архівні книжки"
 msgid "Show Archived Books"
 msgstr "Архівні книжки"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Список книжок"
 
@@ -1272,144 +1272,144 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Видавництво: %(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr "Рейтинг: Відсутній"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Рейтинг: %(rating)s зірок"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файлу: %(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Завантаження"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Список рейтингів"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Список форматів файлу"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr ""
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1209
-msgid "Oops! Please update your profile with a valid  eReader Email."
+#: cps/web.py:1211
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr ""
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr ""
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr ""
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr ""
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr ""
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Профіль оновлено"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr ""
 
diff --git a/cps/translations/vi/LC_MESSAGES/messages.mo b/cps/translations/vi/LC_MESSAGES/messages.mo
index 5dce7bc04e7982a21bb692dda052551607e9c814..1fb3bd3cd3ca3468376ae0a3dea962bcc95c13ec 100644
GIT binary patch
delta 22
ecmaF$lJV6`#triv*o_nnjjc?LHZOH>H30y0z6hoO

delta 22
ecmaF$lJV6`#triv*bNm7O|49fH!pQ?H30y0!w9DU

diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po
index 5e3d8c79d..efb558d1a 100644
--- a/cps/translations/vi/LC_MESSAGES/messages.po
+++ b/cps/translations/vi/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2022-09-20 21:36+0700\n"
 "Last-Translator: Ha Link <halink0803@gmail.com>\n"
 "Language: vi\n"
@@ -43,7 +43,7 @@ msgstr ""
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "Không rõ"
 
@@ -288,7 +288,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "Lỗi cơ sở dữ liệu: %(error)s."
@@ -328,8 +328,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr "Thiết lập cơ sở dữ lieu đã được cập nhật"
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "Lỗi không xác định xảy ra. Xin hãy thử lại sau."
 
@@ -461,7 +461,7 @@ msgstr "Thiết lập cơ sở dữ lieu đã được cập nhật"
 msgid "Database Configuration"
 msgstr "Thiết lập cơ sở dữ lieu :)))"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "Hãy điền hết các trường!"
 
@@ -495,7 +495,7 @@ msgstr "Không thể xoá người dùng khách"
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -512,20 +512,20 @@ msgstr "chưa cài đặt"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "None"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -826,7 +826,7 @@ msgstr "Thiết lập Kobo"
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr ""
@@ -893,7 +893,7 @@ msgstr "{} sao"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "Đăng nhập"
 
@@ -909,7 +909,7 @@ msgstr "Token đã hết hạn"
 msgid "Success! Please return to your device"
 msgstr "Thành công! Hãy quay lại thiết bị của bạn"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "Sách"
 
@@ -934,7 +934,7 @@ msgstr "Sách đã tải"
 msgid "Show Downloaded Books"
 msgstr "Hiển thị sách đã tải"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "Top sách được đánh giá cao"
 
@@ -943,7 +943,7 @@ msgid "Show Top Rated Books"
 msgstr "Hiện thị top những sách được đánh giá cao"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "Sách đã đọc"
 
@@ -953,7 +953,7 @@ msgid "Show Read and Unread"
 msgstr "Hiển thị đã đọc và chưa đọc"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "Sách chưa đọc"
 
@@ -971,7 +971,7 @@ msgid "Show Random Books"
 msgstr "Hiển thị sách ngẫu nhiên"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "Chủ đề"
 
@@ -982,7 +982,7 @@ msgstr "Hiển thị chọn chủ đề"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "Series"
 
@@ -1002,7 +1002,7 @@ msgid "Show Author Section"
 msgstr "Hiển thị chọn tác giả"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "Nhà phát hành"
 
@@ -1013,7 +1013,7 @@ msgstr "Hiển thị chọn nhà phát hành"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "Ngôn ngữ"
 
@@ -1040,7 +1040,7 @@ msgstr "Định dạng file"
 msgid "Show File Formats Section"
 msgstr "Hiển thị lựa chọn định dạng file"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Sách đã lưu trữ"
 
@@ -1049,7 +1049,7 @@ msgstr "Sách đã lưu trữ"
 msgid "Show Archived Books"
 msgstr "Hiện thị sách trong kho"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "Danh sách sách"
 
@@ -1266,145 +1266,145 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:612
+#: cps/web.py:614
 #, fuzzy
 msgid "Rating: None"
 msgstr "Đánh giá cao hơn"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "Tải xuống"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "Danh sách đánh giá"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "Danh sách định dạng file"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr ""
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr ""
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1209
-msgid "Oops! Please update your profile with a valid  eReader Email."
+#: cps/web.py:1211
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr ""
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "Đăng ký"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "Email của bạn không được cho phép để đăng ký"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr ""
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "Không thể đăng nhập: %(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "Tên đăng nhập hoặc mật khẩu không đúng"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "Mật khẩu mới đã được gửi đến email của bạn"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr ""
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "Metadata đã được cập nhật thành công"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "Tìm thấy một tài khoản đã toàn tại cho địa chỉ email này"
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 571b75ab3ee440a957d0022bd7551394fcae707e..96126231a2d0c5e75917dbd34b37aa8fe9f83b9c 100644
GIT binary patch
delta 22
dcmZpf$lNlKd4p&zyODySv6ZROW|`UyZvat=2G9Ti

delta 22
dcmZpf$lNlKd4p&zyP<-isg;TGW|`UyZvat_2GIZj

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index f7a67d116..ecba709ee 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -47,7 +47,7 @@ msgstr "书籍成功加入元数据备份队列"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "未知"
 
@@ -292,7 +292,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "数据库错误：%(error)s。"
@@ -331,8 +331,8 @@ msgstr "指定任务的持续时间无效"
 msgid "Scheduled tasks settings updated"
 msgstr "已更新计划任务设置"
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
@@ -465,7 +465,7 @@ msgstr "数据库设置已更新"
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "请填写所有字段！"
 
@@ -499,7 +499,7 @@ msgstr "无法删除游客用户"
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr "电子邮件地址不能为空，并且必须是有效的电子邮件"
 
@@ -516,20 +516,20 @@ msgstr "未安装"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定义列号：%(column)d 在 Calibre 数据库中不存在"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "无"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
@@ -828,7 +828,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -895,7 +895,7 @@ msgstr "{} 星"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "登录"
 
@@ -911,7 +911,7 @@ msgstr "令牌已过期"
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "书籍"
 
@@ -936,7 +936,7 @@ msgstr "已下载书籍"
 msgid "Show Downloaded Books"
 msgstr "显示下载过的书籍"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
@@ -945,7 +945,7 @@ msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "已读书籍"
 
@@ -955,7 +955,7 @@ msgid "Show Read and Unread"
 msgstr "显示阅读状态"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "未读书籍"
 
@@ -973,7 +973,7 @@ msgid "Show Random Books"
 msgstr "显示随机书籍"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "分类"
 
@@ -984,7 +984,7 @@ msgstr "显示分类栏目"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "丛书"
 
@@ -1004,7 +1004,7 @@ msgid "Show Author Section"
 msgstr "显示作者栏目"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "出版社"
 
@@ -1015,7 +1015,7 @@ msgstr "显示出版社栏目"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "语言"
 
@@ -1042,7 +1042,7 @@ msgstr "文件格式"
 msgid "Show File Formats Section"
 msgstr "显示文件格式栏目"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "归档书籍"
 
@@ -1051,7 +1051,7 @@ msgstr "归档书籍"
 msgid "Show Archived Books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "书籍列表"
 
@@ -1267,145 +1267,145 @@ msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "无可用发布信息"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "发现 (随机书籍)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下载过的书籍"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr "评分：无"
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "下载次数"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "请先配置 SMTP 邮箱设置..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "书籍已经成功加入 %(eReadermail)s 的发送队列"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "请先配置您的 Kindle 邮箱。"
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "邮件服务未配置，请联系网站管理员！"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "无法激活 LDAP 认证"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问 LDAP 服务器，或用户未知"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "资料已更新"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "使用此邮箱的账号已经存在。"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 0528515d5b94b3a18f77d3fcf2920bd44e994420..f55d1ab6f7ef7a83ba971eae231607b28913fe4b 100644
GIT binary patch
delta 22
ecmaF#fa%c#rVTIh*o_nnjjc?LHowm+b_4)>F$u8%

delta 22
ecmaF#fa%c#rVTIh*bNm7O|49fH^0v-b_4)>HVLu-

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 0d8a9f288..a6584f6f9 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -47,7 +47,7 @@ msgstr "書籍已經成功加入 %(eReadermail)s 的發送隊列"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr "未知"
 
@@ -292,7 +292,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
@@ -331,8 +331,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
@@ -467,7 +467,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr "請填寫所有欄位！"
 
@@ -501,7 +501,7 @@ msgstr "無法刪除訪客用戶"
 msgid "No admin user remaining, can't delete user"
 msgstr "管理員賬戶不存在，無法刪除用戶"
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -518,20 +518,20 @@ msgstr "未安裝"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr "無"
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
@@ -834,7 +834,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -901,7 +901,7 @@ msgstr "{} 星"
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr "登入"
 
@@ -917,7 +917,7 @@ msgstr "Token已過期"
 msgid "Success! Please return to your device"
 msgstr "成功！請返回您的設備"
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr "書籍"
 
@@ -942,7 +942,7 @@ msgstr "已下載書籍"
 msgid "Show Downloaded Books"
 msgstr "顯示下載過的書籍"
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr "最高評分書籍"
 
@@ -951,7 +951,7 @@ msgid "Show Top Rated Books"
 msgstr "顯示最高評分書籍"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr "已讀書籍"
 
@@ -961,7 +961,7 @@ msgid "Show Read and Unread"
 msgstr "顯示閱讀狀態"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr "未讀書籍"
 
@@ -979,7 +979,7 @@ msgid "Show Random Books"
 msgstr "隨機顯示書籍"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr "分類"
 
@@ -990,7 +990,7 @@ msgstr "顯示分類選擇"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr "叢書"
 
@@ -1010,7 +1010,7 @@ msgid "Show Author Section"
 msgstr "顯示作者選擇"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr "出版社"
 
@@ -1021,7 +1021,7 @@ msgstr "顯示出版社選擇"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr "語言"
 
@@ -1048,7 +1048,7 @@ msgstr "文件格式"
 msgid "Show File Formats Section"
 msgstr "顯示文件格式選擇"
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "歸檔書籍"
 
@@ -1057,7 +1057,7 @@ msgstr "歸檔書籍"
 msgid "Show Archived Books"
 msgstr "顯示歸檔書籍"
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr "書籍列表"
 
@@ -1274,145 +1274,145 @@ msgstr "有新的更新。單擊下面的按鈕以更新到版本: %(version)s"
 msgid "No release information available"
 msgstr "無可用發佈信息"
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr "發現(隨機書籍)"
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr "熱門書籍（最多下載）"
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下載過的書籍"
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "叢書：%(serie)s"
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "評分：%(rating)s 星"
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分類：%(name)s"
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr "語言：%(name)s"
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr "下載次數"
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr "評分列表"
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr "請先配置SMTP郵箱設置..."
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr "書籍已經成功加入 %(eReadermail)s 的發送隊列"
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1211
 #, fuzzy
-msgid "Oops! Please update your profile with a valid  eReader Email."
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 #, fuzzy
 msgid "Success! Profile Updated"
 msgstr "資料已更新"
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr "使用此郵箱的賬號已經存在。"
 
diff --git a/cps/web.py b/cps/web.py
index bd0c8bac2..d2e4e32ce 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1208,7 +1208,7 @@ def send_to_ereader(book_id, book_format, convert):
         else:
             flash(_("Oops! There was an error sending book: %(res)s", res=result), category="error")
     else:
-        flash(_("Oops! Please update your profile with a valid  eReader Email."), category="error")
+        flash(_("Oops! Please update your profile with a valid eReader Email."), category="error")
     if "HTTP_REFERER" in request.environ:
         return redirect(request.environ["HTTP_REFERER"])
     else:
diff --git a/messages.pot b/messages.pot
index 8fb36c210..7726a5ccb 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-01-21 15:43+0100\n"
+"POT-Creation-Date: 2023-01-22 13:52+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"
@@ -43,7 +43,7 @@ msgstr ""
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
-#: cps/updater.py:613 cps/uploader.py:86 cps/uploader.py:96
+#: cps/updater.py:613 cps/uploader.py:93 cps/uploader.py:102
 msgid "Unknown"
 msgstr ""
 
@@ -288,7 +288,7 @@ msgstr ""
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
 #: cps/editbooks.py:305 cps/editbooks.py:1201 cps/shelf.py:82 cps/shelf.py:142
 #: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
-#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
+#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
 msgstr ""
@@ -327,8 +327,8 @@ msgstr ""
 msgid "Scheduled tasks settings updated"
 msgstr ""
 
-#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
-#: cps/web.py:1320
+#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
+#: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -460,7 +460,7 @@ msgstr ""
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1871 cps/web.py:1233
+#: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
 msgstr ""
 
@@ -494,7 +494,7 @@ msgstr ""
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1992 cps/web.py:1371
+#: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
 msgstr ""
 
@@ -511,20 +511,20 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:723
+#: cps/db.py:728 cps/search.py:137 cps/web.py:725
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
-#: cps/web.py:550 cps/web.py:584 cps/web.py:659 cps/web.py:684 cps/web.py:965
-#: cps/web.py:995 cps/web.py:1031 cps/web.py:1059 cps/web.py:1098
+#: cps/web.py:552 cps/web.py:586 cps/web.py:661 cps/web.py:686 cps/web.py:967
+#: cps/web.py:997 cps/web.py:1033 cps/web.py:1061 cps/web.py:1100
 msgid "None"
 msgstr ""
 
-#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
-#: cps/web.py:1504 cps/web.py:1549
+#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
+#: cps/web.py:1506 cps/web.py:1551
 msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
 msgstr ""
 
@@ -819,7 +819,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291 cps/web.py:1329
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
 msgstr ""
@@ -886,7 +886,7 @@ msgstr ""
 
 #: cps/remotelogin.py:62 cps/templates/layout.html:67
 #: cps/templates/layout.html:101 cps/templates/login.html:4
-#: cps/templates/login.html:21 cps/web.py:1340
+#: cps/templates/login.html:21 cps/web.py:1342
 msgid "Login"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgstr ""
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/render_template.py:40 cps/web.py:406
+#: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
 msgstr ""
 
@@ -927,7 +927,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:421
+#: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
 msgstr ""
 
@@ -936,7 +936,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:742
+#: cps/templates/index.xml:58 cps/web.py:744
 msgid "Read Books"
 msgstr ""
 
@@ -945,7 +945,7 @@ msgid "Show Read and Unread"
 msgstr ""
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:745
+#: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
 msgstr ""
 
@@ -963,7 +963,7 @@ msgid "Show Random Books"
 msgstr ""
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1102
+#: cps/templates/index.xml:83 cps/web.py:1104
 msgid "Categories"
 msgstr ""
 
@@ -973,7 +973,7 @@ msgstr ""
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:998 cps/web.py:1005
+#: cps/templates/search_form.html:69 cps/web.py:1000 cps/web.py:1007
 msgid "Series"
 msgstr ""
 
@@ -991,7 +991,7 @@ msgid "Show Author Section"
 msgstr ""
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:969
+#: cps/templates/index.xml:76 cps/web.py:971
 msgid "Publishers"
 msgstr ""
 
@@ -1001,7 +1001,7 @@ msgstr ""
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1074
+#: cps/web.py:1076
 msgid "Languages"
 msgstr ""
 
@@ -1025,7 +1025,7 @@ msgstr ""
 msgid "Show File Formats Section"
 msgstr ""
 
-#: cps/render_template.py:94 cps/web.py:768
+#: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr ""
 
@@ -1033,7 +1033,7 @@ msgstr ""
 msgid "Show Archived Books"
 msgstr ""
 
-#: cps/render_template.py:99 cps/web.py:799
+#: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
 msgstr ""
 
@@ -1249,143 +1249,143 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:6 cps/web.py:433
+#: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:469
+#: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:500
+#: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:533
+#: cps/web.py:535
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:569
+#: cps/web.py:571
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:599
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:612
+#: cps/web.py:614
 msgid "Rating: None"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:623
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:639
+#: cps/web.py:641
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:676
+#: cps/web.py:678
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:703
+#: cps/web.py:705
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:941
+#: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:1034
+#: cps/web.py:1036
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1061
+#: cps/web.py:1063
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:1198
+#: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
 msgstr ""
 
-#: cps/web.py:1203
+#: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
 msgstr ""
 
-#: cps/web.py:1207
+#: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1209
-msgid "Oops! Please update your profile with a valid  eReader Email."
+#: cps/web.py:1211
+msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr ""
 
-#: cps/web.py:1226
+#: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
-#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1227
-#: cps/web.py:1234 cps/web.py:1240 cps/web.py:1260 cps/web.py:1265
-#: cps/web.py:1271
+#: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
+#: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
+#: cps/web.py:1273
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1262
+#: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
 msgstr ""
 
-#: cps/web.py:1266
+#: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
 msgstr ""
 
-#: cps/web.py:1280
+#: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1299
+#: cps/web.py:1301
 #, python-format
 msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/web.py:1307
 #, python-format
 msgid "Oops! Login Failed: %(message)s"
 msgstr ""
 
-#: cps/web.py:1309 cps/web.py:1334
+#: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
 msgstr ""
 
-#: cps/web.py:1316
+#: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
 msgstr ""
 
-#: cps/web.py:1322
+#: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1396 cps/web.py:1445
+#: cps/web.py:1398 cps/web.py:1447
 #, python-format
 msgid "%(name)s's Profile"
 msgstr ""
 
-#: cps/web.py:1412
+#: cps/web.py:1414
 msgid "Success! Profile Updated"
 msgstr ""
 
-#: cps/web.py:1416
+#: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
 msgstr ""
 

From 1899cda8d1ef0fa7e0875dca8a3d3f3d279828ab Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 23 Jan 2023 12:55:18 +0100
Subject: [PATCH 391/412] Update Teststatus

---
 setup.cfg                               |    8 +-
 test/Calibre-Web TestSummary_Linux.html | 1570 ++++++++++++++---------
 2 files changed, 975 insertions(+), 603 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 8f5d19207..9be77e7f0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,7 +23,7 @@ classifiers =
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.11
 	Operating System :: OS Independent
 keywords = 
 	calibre
@@ -41,7 +41,7 @@ install_requires =
 	APScheduler>=3.6.3,<3.10.0
 	werkzeug<2.1.0
 	Babel>=1.3,<3.0
-	Flask-Babel>=0.11.1,<2.1.0
+	Flask-Babel>=0.11.1,<3.1.0
 	Flask-Login>=0.3.2,<0.6.3
 	Flask-Principal>=0.3.2,<0.5.1
 	backports_abc>=0.4
@@ -51,11 +51,11 @@ install_requires =
 	pytz>=2016.10
 	requests>=2.11.1,<2.28.0
 	SQLAlchemy>=1.3.0,<1.5.0
-	tornado>=4.1,<6.2
+	tornado>=4.1,<6.3
 	Wand>=0.4.4,<0.7.0
 	unidecode>=0.04.19,<1.4.0
 	lxml>=3.8.0,<5.0.0
-	flask-wtf>=0.14.2,<1.1.0
+	flask-wtf>=0.14.2,<1.2.0
 	chardet>=3.0.0,<4.1.0
 	advocate>=1.0.0,<1.1.0
 	
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 633c7765d..c36757678 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2023-01-02 20:50:39</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2023-01-22 19:25:10</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>2023-01-03 05:05:42</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2023-01-23 01:31:36</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>7h 22 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>5h 12 min</p>
         </div>
       </div>
       </div>
@@ -465,11 +465,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -569,11 +569,31 @@
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id="ft6.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 467, in test_email_only
+    self.assertGreaterEqual(self.email_server.handler.message_size, 5996)
+AssertionError: 5995 not greater than or equal to 5996</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -615,11 +635,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">5</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -674,11 +694,31 @@
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id="ft7.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 461, in test_email_only
+    self.assertGreaterEqual(self.email_server.handler.message_size, 5996)
+AssertionError: 5995 not greater than or equal to 5996</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -936,11 +976,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
         <td class="text-center">36</td>
-        <td class="text-center">34</td>
-        <td class="text-center">1</td>
+        <td class="text-center">35</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -1264,31 +1304,11 @@
     
     
     
-        <tr id="ft11.34" class="none bg-danger">
+        <tr id='pt11.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.34')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.34" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.34').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 852, in test_upload_book_pdf
-    self.assertLess(&#39;23300&#39;, resp.headers[&#39;Content-Length&#39;])
-AssertionError: &#39;23300&#39; not less than &#39;19501&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1450,11 +1470,11 @@ AssertionError: &#39;23300&#39; not less than &#39;19501&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">16</td>
-        <td class="text-center">2</td>
+        <td class="text-center">18</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1482,33 +1502,11 @@ AssertionError: &#39;23300&#39; not less than &#39;19501&#39;</pre>
     
     
     
-        <tr id="ft14.3" class="none bg-danger">
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 474, in test_bookslist_edit_comment
-    self.assertEqual(&#34;[...]&#34;, bl[&#39;table&#39;][4][&#34;Comments&#34;][&#39;text&#39;])
-AssertionError: &#39;[...]&#39; != &#39;+&#39;
-- [...]
-+ +</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1522,33 +1520,11 @@ AssertionError: &#39;[...]&#39; != &#39;+&#39;
     
     
     
-        <tr id="ft14.5" class="none bg-danger">
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 459, in test_bookslist_edit_cust_comment
-    self.assertEqual(&#34;[...]&#34;, bl[&#39;table&#39;][4][&#34;Custom Comment 人物&#34;][&#39;text&#39;])
-AssertionError: &#39;[...]&#39; != &#39;+&#39;
-- [...]
-+ +</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1671,13 +1647,13 @@ AssertionError: &#39;[...]&#39; != &#39;+&#39;
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
@@ -1685,31 +1661,11 @@ AssertionError: &#39;[...]&#39; != &#39;+&#39;
 
     
     
-        <tr id="ft15.1" class="none bg-danger">
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1936,11 +1892,11 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1968,31 +1924,108 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id="ft18.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft18.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 116, in test_STARTTLS_resend_password
+    self.assertTrue(self.login(user, passw))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestSSL</td>
-        <td class="text-center">7</td>
-        <td class="text-center">7</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</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('c19', 7)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id="et19.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_email_STARTTLS)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et19.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et19.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 54, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 476, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 856, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="failClass">
+        <td>TestSSL</td>
+        <td class="text-center">7</td>
+        <td class="text-center">6</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('c20', 7)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -2001,7 +2034,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -2010,16 +2043,36 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id="ft20.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft20.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft20.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft20.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 130, in test_SSL_logging_email
+    self.assertTrue(len(re.findall(&#39;Subject: Calibre-Web test e-mail&#39;, data)), &#34;Email logging not working&#34;)
+AssertionError: 0 is not true : Email logging not working</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt19.4' class='hiddenRow bg-success'>
+        <tr id='pt20.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2028,7 +2081,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt19.5' class='hiddenRow bg-success'>
+        <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -2037,7 +2090,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt19.6' class='hiddenRow bg-success'>
+        <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -2046,7 +2099,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt19.7' class='hiddenRow bg-success'>
+        <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2064,13 +2117,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2088,13 +2141,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 2)">Detail</a>
+            <a onclick="showClassDetail('c22', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2103,7 +2156,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -2121,13 +2174,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2136,19 +2189,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st22.2" class="none bg-warning">
+        <tr id="st23.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st22.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st23.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_st22.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st23.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2162,7 +2215,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2180,13 +2233,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 1)">Detail</a>
+            <a onclick="showClassDetail('c24', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2204,13 +2257,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 3)">Detail</a>
+            <a onclick="showClassDetail('c25', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2219,7 +2272,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2228,7 +2281,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2246,13 +2299,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 11)">Detail</a>
+            <a onclick="showClassDetail('c26', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2261,7 +2314,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2270,7 +2323,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2279,7 +2332,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2288,7 +2341,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2297,7 +2350,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2306,7 +2359,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2315,7 +2368,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2324,7 +2377,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2333,7 +2386,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2342,7 +2395,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2360,13 +2413,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 6)">Detail</a>
+            <a onclick="showClassDetail('c27', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_download_cover</div>
             </td>
@@ -2375,7 +2428,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2384,7 +2437,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelves</div>
             </td>
@@ -2393,7 +2446,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2402,7 +2455,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2411,7 +2464,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2429,13 +2482,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 13)">Detail</a>
+            <a onclick="showClassDetail('c28', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2444,7 +2497,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2453,7 +2506,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2462,7 +2515,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2471,7 +2524,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2480,7 +2533,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2489,7 +2542,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2498,7 +2551,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2507,7 +2560,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2516,7 +2569,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2525,7 +2578,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2534,7 +2587,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2543,7 +2596,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2561,13 +2614,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 10)">Detail</a>
+            <a onclick="showClassDetail('c29', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2576,7 +2629,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2585,7 +2638,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2594,7 +2647,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2603,7 +2656,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
@@ -2612,7 +2665,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
@@ -2621,7 +2674,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2630,7 +2683,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2639,7 +2692,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2648,7 +2701,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2666,13 +2719,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 9)">Detail</a>
+            <a onclick="showClassDetail('c30', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2681,7 +2734,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2690,7 +2743,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2699,7 +2752,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2708,19 +2761,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st29.5" class="none bg-warning">
+        <tr id="st30.5" 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_st29.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st29.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st30.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_st29.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st30.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2734,7 +2787,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2743,7 +2796,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2752,7 +2805,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2761,7 +2814,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2779,13 +2832,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 15)">Detail</a>
+            <a onclick="showClassDetail('c31', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2794,7 +2847,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2803,7 +2856,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2812,7 +2865,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2821,7 +2874,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2830,7 +2883,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2839,7 +2892,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2848,7 +2901,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2857,7 +2910,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2866,7 +2919,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2875,7 +2928,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2884,7 +2937,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2893,7 +2946,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2902,7 +2955,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2911,7 +2964,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2929,13 +2982,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2944,7 +2997,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2962,13 +3015,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c33', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2977,7 +3030,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2995,13 +3048,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 23)">Detail</a>
+            <a onclick="showClassDetail('c34', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3010,7 +3063,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3019,7 +3072,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3028,7 +3081,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3037,7 +3090,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3046,7 +3099,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3055,7 +3108,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3064,7 +3117,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3073,7 +3126,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id='pt34.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3082,7 +3135,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.10' class='hiddenRow bg-success'>
+        <tr id='pt34.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3091,7 +3144,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.11' class='hiddenRow bg-success'>
+        <tr id='pt34.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3100,7 +3153,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id='pt34.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3109,7 +3162,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id='pt34.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3118,7 +3171,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.14' class='hiddenRow bg-success'>
+        <tr id='pt34.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3127,7 +3180,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.15' class='hiddenRow bg-success'>
+        <tr id='pt34.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3136,7 +3189,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.16' class='hiddenRow bg-success'>
+        <tr id='pt34.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3145,7 +3198,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id='pt34.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3154,7 +3207,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.18' class='hiddenRow bg-success'>
+        <tr id='pt34.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3163,7 +3216,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.19' class='hiddenRow bg-success'>
+        <tr id='pt34.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3172,7 +3225,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.20' class='hiddenRow bg-success'>
+        <tr id='pt34.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3181,7 +3234,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.21' class='hiddenRow bg-success'>
+        <tr id='pt34.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3190,7 +3243,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.22' class='hiddenRow bg-success'>
+        <tr id='pt34.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3199,7 +3252,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt33.23' class='hiddenRow bg-success'>
+        <tr id='pt34.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3217,25 +3270,25 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 1)">Detail</a>
+            <a onclick="showClassDetail('c35', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft34.1" class="none bg-danger">
+        <tr id="ft35.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft34.1')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.1')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft34.1" class="popup_window test_output" style="display:block;">
+                <div id="div_ft35.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft34.1').style.display='none'"><span
+                                onclick="document.getElementById('div_ft35.1').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3265,13 +3318,13 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 3)">Detail</a>
+            <a onclick="showClassDetail('c36', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_command_start</div>
             </td>
@@ -3280,7 +3333,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
             </td>
@@ -3289,7 +3342,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_module_start</div>
             </td>
@@ -3307,13 +3360,13 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 5)">Detail</a>
+            <a onclick="showClassDetail('c37', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3322,7 +3375,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3331,7 +3384,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3340,7 +3393,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3349,7 +3402,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3367,13 +3420,13 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3383,30 +3436,50 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">3</td>
+        <td class="text-center">2</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id="ft39.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft39.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 211, in test_forgot_password
+    self.assertTrue(self.check_user_logged_in(&#39;forget&#39;, noCompare=True))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3415,7 +3488,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3424,7 +3497,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3433,38 +3506,157 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id="ft39.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft39.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 224, in test_registering_only_email
+    self.assertEqual(&#39;hujh@de.de&#39;, user)
+AssertionError: &#39;hujh@de.de&#39; != False</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id="et39.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et39.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 132, in test_registering_user
+    self.assertEqual(u&#39;flash_success&#39;,self.register(u&#39;u1&#39;, &#39;huj@de.de&#39;))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 125, in register
+    username = cls.driver.find_element(By.NAME, &#34;name&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 856, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [name=&#34;name&#34;]
+Stacktrace:
+RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id="et39.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et39.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 151, in test_registering_user_fail
+    self.assertEqual(u&#39;flash_success&#39;,self.register(u&#39;udouble&#39;, &#39;huj@de.com&#39;))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 125, in register
+    username = cls.driver.find_element(By.NAME, &#34;name&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 856, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [name=&#34;name&#34;]
+Stacktrace:
+RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id="et39.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et39.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 173, in test_user_change_password
+    self.assertEqual(u&#39;flash_success&#39;,self.register(u&#39;upasswd&#39;, &#39;passwd@de.com&#39;))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 125, in register
+    username = cls.driver.find_element(By.NAME, &#34;name&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 856, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [name=&#34;name&#34;]
+Stacktrace:
+RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3478,13 +3670,13 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3493,7 +3685,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3502,7 +3694,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3520,13 +3712,13 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3535,7 +3727,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3544,7 +3736,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3553,7 +3745,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3562,7 +3754,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3571,7 +3763,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3580,7 +3772,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3589,7 +3781,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3598,7 +3790,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3607,7 +3799,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3616,7 +3808,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3625,7 +3817,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3634,7 +3826,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3643,19 +3835,19 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id="st40.14" class="none bg-warning">
+        <tr id="st41.14" 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_st40.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st40.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3669,7 +3861,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3678,7 +3870,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3696,13 +3888,13 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 1)">Detail</a>
+            <a onclick="showClassDetail('c42', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnailsEnv - test_cover_cache_env_on_database_change</div>
             </td>
@@ -3712,21 +3904,21 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</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('c42', 8)">Detail</a>
+            <a onclick="showClassDetail('c43', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
             </td>
@@ -3735,7 +3927,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
@@ -3744,7 +3936,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
             </td>
@@ -3753,7 +3945,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
@@ -3762,7 +3954,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='st42.5' class='none bg-warning'>
+        <tr id='st43.5' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_for_series</div>
             </td>
@@ -3771,7 +3963,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
@@ -3780,7 +3972,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
             </td>
@@ -3789,142 +3981,9 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id="ft42.8" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft42.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft42.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft42.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 310, in test_sideloaded_book
-    self.assertAlmostEqual(diff(BytesIO(list_cover), BytesIO(old_list_cover), delete_diff_file=True), 0.0,
-AssertionError: 0.007557298474945533 != 0.0 within 0.0001 delta (0.007557298474945533 difference)</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="skipClass">
-        <td>TestUpdater</td>
-        <td class="text-center">9</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">
-            <a onclick="showClassDetail('c43', 9)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt43.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='pt43.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='pt43.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='pt43.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='pt43.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='pt43.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="st43.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_st43.7')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st43.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_st43.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='pt43.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='pt43.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_update_write_protect</div>
+                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3933,14 +3992,14 @@ AssertionError: 0.007557298474945533 != 0.0 within 0.0001 delta (0.0075572984749
 
 
     <tr id="su" class="failClass">
-        <td>TestUploadEPubs</td>
-        <td class="text-center">5</td>
+        <td>TestUpdater</td>
+        <td class="text-center">9</td>
         <td class="text-center">4</td>
+        <td class="text-center">4</td>
+        <td class="text-center">0</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 5)">Detail</a>
+            <a onclick="showClassDetail('c44', 9)">Detail</a>
         </td>
     </tr>
 
@@ -3948,7 +4007,7 @@ AssertionError: 0.007557298474945533 != 0.0 within 0.0001 delta (0.0075572984749
     
         <tr id="ft44.1" class="none bg-danger">
             <td>
-                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
+                <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -3963,9 +4022,13 @@ AssertionError: 0.007557298474945533 != 0.0 within 0.0001 delta (0.0075572984749
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 146, in test_upload_epub_cover
-    self.assertAlmostEqual(diff(BytesIO(original), BytesIO(cover_image), delete_diff_file=True), 0.0, delta=0.0001)
-AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405644 difference)</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 227, in test_check_update_nightly_errors
+    self.assertEqual(update_table[1].text, &#39;Current version&#39;)
+AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
+- Current Version
+?         ^
++ Current version
+?         ^</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3975,7 +4038,192 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id="ft44.2" class="none bg-danger">
+            <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_ft44.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 255, in test_check_update_nightly_request_errors
+    self.assertEqual(update_table[1].text, &#39;Current version&#39;)
+AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
+- Current Version
+?         ^
++ Current version
+?         ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.3" class="none bg-danger">
+            <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_ft44.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 139, in test_check_update_stable_errors
+    self.assertEqual(update_table[1].text, &#39;Current version&#39;)
+AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
+- Current Version
+?         ^
++ Current version
+?         ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.4" class="none bg-danger">
+            <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_ft44.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 167, in test_check_update_stable_versions
+    self.assertEqual(update_table[1].text, &#39;Current version&#39;)
+AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
+- Current Version
+?         ^
++ Current version
+?         ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.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='pt44.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="st44.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_st44.7')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st44.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_st44.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='pt44.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='pt44.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUpdater - test_update_write_protect</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestUploadEPubs</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('c45', 5)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt45.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -3984,7 +4232,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3993,7 +4241,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_identifier</div>
             </td>
@@ -4002,7 +4250,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4012,21 +4260,21 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">12</td>
+        <td class="text-center">2</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 18)">Detail</a>
+            <a onclick="showClassDetail('c46', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4035,16 +4283,36 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id="ft46.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft46.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft46.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft46.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 163, in test_list_visibility
+    self.assertEqual(35, len(ul[&#39;table&#39;][0]))
+AssertionError: 35 != 34</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4053,7 +4321,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4062,7 +4330,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4071,7 +4339,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4080,7 +4348,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4089,25 +4357,65 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id="et46.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et46.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et46.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et46.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 235, in test_user_list_edit_email
+    self.assertEqual(&#34;muki1al@b.com&#34;, ul[&#39;table&#39;][1][&#39;E-mail Address&#39;][&#39;text&#39;])
+KeyError: &#39;E-mail Address&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id="et46.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et46.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et46.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et46.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 261, in test_user_list_edit_kindle
+    self.assertEqual(&#34;muki1al@b.com&#34;, ul[&#39;table&#39;][1][&#39;E-Reader E-mail&#39;][&#39;text&#39;])
+KeyError: &#39;E-Reader E-mail&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4116,7 +4424,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4125,7 +4433,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4134,16 +4442,36 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id="et46.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et46.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et46.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et46.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 495, in test_user_list_edit_visiblility
+    self.assertEqual(&#34;&#34;, ul[&#39;table&#39;][1][&#39;Show category selection&#39;][&#39;text&#39;])
+KeyError: &#39;Show category selection&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4152,7 +4480,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4161,7 +4489,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4170,20 +4498,64 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id="et46.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et46.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et46.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et46.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 541, in test_user_list_search
+    ul = self.check_search(ul, &#34;B.cOm&#34;, 10, &#34;E-mail Address&#34;, &#34;muki1al@b.com&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 86, in check_search
+    self.assertEqual(value, bl[&#39;table&#39;][0][column][&#39;text&#39;])
+KeyError: &#39;E-mail Address&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id="ft46.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft46.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft46.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft46.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 553, in test_user_list_sort
+    self.assertEqual(&#34;E-mail Address&#34;, ul[&#39;header&#39;][3][&#39;text&#39;])
+AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
+- E-mail Address
++ Email</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4197,13 +4569,13 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 1)">Detail</a>
+            <a onclick="showClassDetail('c47', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4221,13 +4593,13 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 21)">Detail</a>
+            <a onclick="showClassDetail('c48', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4236,7 +4608,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4245,7 +4617,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4254,7 +4626,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4263,7 +4635,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4272,7 +4644,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4281,7 +4653,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4290,7 +4662,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4299,7 +4671,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4308,7 +4680,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4317,7 +4689,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4326,7 +4698,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4335,7 +4707,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4344,7 +4716,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4353,7 +4725,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4362,7 +4734,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4371,7 +4743,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.17' class='hiddenRow bg-success'>
+        <tr id='pt48.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4380,7 +4752,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.18' class='hiddenRow bg-success'>
+        <tr id='pt48.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4389,7 +4761,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.19' class='hiddenRow bg-success'>
+        <tr id='pt48.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4398,7 +4770,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.20' class='hiddenRow bg-success'>
+        <tr id='pt48.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4407,7 +4779,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt47.21' class='hiddenRow bg-success'>
+        <tr id='pt48.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4425,13 +4797,13 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c48', 35)">Detail</a>
+            <a onclick="showClassDetail('c49', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt49.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4440,7 +4812,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt49.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4449,7 +4821,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt49.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4458,7 +4830,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt49.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4467,7 +4839,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt49.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4476,7 +4848,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt49.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4485,7 +4857,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt49.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4494,7 +4866,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt49.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4503,7 +4875,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt49.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4512,7 +4884,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt49.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4521,7 +4893,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt49.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4530,7 +4902,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt49.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4539,7 +4911,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt49.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4548,7 +4920,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.14' class='hiddenRow bg-success'>
+        <tr id='pt49.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4557,7 +4929,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.15' class='hiddenRow bg-success'>
+        <tr id='pt49.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4566,7 +4938,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.16' class='hiddenRow bg-success'>
+        <tr id='pt49.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4575,7 +4947,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.17' class='hiddenRow bg-success'>
+        <tr id='pt49.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4584,7 +4956,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.18' class='hiddenRow bg-success'>
+        <tr id='pt49.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4593,7 +4965,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.19' class='hiddenRow bg-success'>
+        <tr id='pt49.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4602,7 +4974,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.20' class='hiddenRow bg-success'>
+        <tr id='pt49.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4611,7 +4983,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.21' class='hiddenRow bg-success'>
+        <tr id='pt49.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4620,7 +4992,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.22' class='hiddenRow bg-success'>
+        <tr id='pt49.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4629,7 +5001,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.23' class='hiddenRow bg-success'>
+        <tr id='pt49.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4638,7 +5010,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.24' class='hiddenRow bg-success'>
+        <tr id='pt49.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4647,7 +5019,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.25' class='hiddenRow bg-success'>
+        <tr id='pt49.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4656,7 +5028,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.26' class='hiddenRow bg-success'>
+        <tr id='pt49.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
@@ -4665,7 +5037,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.27' class='hiddenRow bg-success'>
+        <tr id='pt49.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4674,7 +5046,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.28' class='hiddenRow bg-success'>
+        <tr id='pt49.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4683,7 +5055,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.29' class='hiddenRow bg-success'>
+        <tr id='pt49.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4692,7 +5064,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.30' class='hiddenRow bg-success'>
+        <tr id='pt49.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4701,7 +5073,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.31' class='hiddenRow bg-success'>
+        <tr id='pt49.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4710,7 +5082,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.32' class='hiddenRow bg-success'>
+        <tr id='pt49.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4719,7 +5091,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.33' class='hiddenRow bg-success'>
+        <tr id='pt49.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4728,7 +5100,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.34' class='hiddenRow bg-success'>
+        <tr id='pt49.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4737,7 +5109,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt48.35' class='hiddenRow bg-success'>
+        <tr id='pt49.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4755,13 +5127,13 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c49', 16)">Detail</a>
+            <a onclick="showClassDetail('c50', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt49.1' class='hiddenRow bg-success'>
+        <tr id='pt50.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4770,7 +5142,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.2' class='hiddenRow bg-success'>
+        <tr id='pt50.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4779,7 +5151,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.3' class='hiddenRow bg-success'>
+        <tr id='pt50.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4788,7 +5160,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.4' class='hiddenRow bg-success'>
+        <tr id='pt50.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4797,7 +5169,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.5' class='hiddenRow bg-success'>
+        <tr id='pt50.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4806,7 +5178,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.6' class='hiddenRow bg-success'>
+        <tr id='pt50.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4815,7 +5187,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.7' class='hiddenRow bg-success'>
+        <tr id='pt50.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4824,7 +5196,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.8' class='hiddenRow bg-success'>
+        <tr id='pt50.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4833,7 +5205,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.9' class='hiddenRow bg-success'>
+        <tr id='pt50.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4842,7 +5214,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.10' class='hiddenRow bg-success'>
+        <tr id='pt50.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4851,7 +5223,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.11' class='hiddenRow bg-success'>
+        <tr id='pt50.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4860,7 +5232,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.12' class='hiddenRow bg-success'>
+        <tr id='pt50.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4869,7 +5241,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.13' class='hiddenRow bg-success'>
+        <tr id='pt50.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4878,7 +5250,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.14' class='hiddenRow bg-success'>
+        <tr id='pt50.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4887,7 +5259,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.15' class='hiddenRow bg-success'>
+        <tr id='pt50.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4896,7 +5268,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
     
     
     
-        <tr id='pt49.16' class='hiddenRow bg-success'>
+        <tr id='pt50.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4907,10 +5279,10 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>424</td>
-        <td>409</td>
-        <td>7</td>
-        <td>1</td>
+        <td>425</td>
+        <td>396</td>
+        <td>13</td>
+        <td>9</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4939,7 +5311,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.15.0-56-generic #62-Ubuntu SMP Tue Nov 22 19:54:14 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.19.0-28-generic #29~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Thu Dec 15 12:05:40 UTC 2 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4986,8 +5358,8 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
             </tr>
           
             <tr>
-              <th>Flask-Babel</th>
-              <td>2.0.0</td>
+              <th>flask-babel</th>
+              <td>3.0.0</td>
               <td>Basic</td>
             </tr>
           
@@ -5005,7 +5377,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>Flask-WTF</th>
-              <td>1.0.1</td>
+              <td>1.1.1</td>
               <td>Basic</td>
             </tr>
           
@@ -5040,14 +5412,14 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
             </tr>
           
             <tr>
-              <th>PyPDF2</th>
-              <td>3.0.1</td>
+              <th>pypdf</th>
+              <td>3.2.1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>pytz</th>
-              <td>2022.7</td>
+              <td>2022.7.1</td>
               <td>Basic</td>
             </tr>
           
@@ -5059,13 +5431,13 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.45</td>
+              <td>1.4.46</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>tornado</th>
-              <td>6.1</td>
+              <td>6.2</td>
               <td>Basic</td>
             </tr>
           
@@ -5077,7 +5449,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>Wand</th>
-              <td>0.6.10</td>
+              <td>0.6.11</td>
               <td>Basic</td>
             </tr>
           
@@ -5089,7 +5461,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.70.0</td>
+              <td>2.73.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5119,7 +5491,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.70.0</td>
+              <td>2.73.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5149,7 +5521,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.70.0</td>
+              <td>2.73.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5191,7 +5563,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.70.0</td>
+              <td>2.73.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5227,7 +5599,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.70.0</td>
+              <td>2.73.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5263,13 +5635,13 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
           
             <tr>
               <th>scholarly</th>
-              <td>1.7.9</td>
+              <td>1.7.11</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.70.0</td>
+              <td>2.73.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5359,7 +5731,7 @@ AssertionError: 0.04601354277405644 != 0.0 within 0.0001 delta (0.04601354277405
 </div>
 
 <script>
-    drawCircle(409, 7, 1, 7);
+    drawCircle(396, 13, 9, 7);
     showCase(5);
 </script>
 

From 36cb454d1ce44e167916ed049aa1ea2899029a32 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 23 Jan 2023 16:04:25 +0100
Subject: [PATCH 392/412] Bugfixes from testrun

---
 cps/uploader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/uploader.py b/cps/uploader.py
index f93aef067..3cd7b21aa 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -37,7 +37,7 @@ except (ImportError, RuntimeError) as e:
     use_generic_pdf_cover = True
 
 try:
-    from PyPDF import PdfReader
+    from pypdf import PdfReader
     use_pdf_meta = True
 except ImportError as ex:
     log.debug('PyPDF is recommended for best performance in metadata extracting from pdf files: %s', ex)

From 1ad8dc102abbb1ace43eb0fd8145c89b502e4881 Mon Sep 17 00:00:00 2001
From: Petipopotam <43313692+Petipopotam@users.noreply.github.com>
Date: Tue, 24 Jan 2023 10:51:48 +0100
Subject: [PATCH 393/412] CSP invalid syntax

CSP had some "cosmetic" errors

Before : default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data: style-src-elem 'self' blob: 'unsafe-inline';object-src: 'none';
After :    default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:;  img-src 'self' data:; style-src-elem 'self' blob: 'unsafe-inline'; object-src 'none';
---
 cps/web.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index d2e4e32ce..3166fe6f4 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -85,14 +85,14 @@ def add_security_headers(resp):
     csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self'"
     if request.path.startswith("/author/") and config.config_use_goodreads:
         csp += " images.gr-assets.com i.gr-assets.com s.gr-assets.com"
-    csp += " data:"
+    csp += " data:;"
     if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
         csp += " *;"
     elif request.endpoint == "web.read_book":
         csp += " style-src-elem 'self' blob: 'unsafe-inline';"
     else:
         csp += ";"
-    csp += "object-src: 'none';"
+    csp += " object-src 'none';"
     resp.headers['Content-Security-Policy'] = csp
     resp.headers['X-Content-Type-Options'] = 'nosniff'
     resp.headers['X-Frame-Options'] = 'SAMEORIGIN'

From d545ea9e6fbc13a49765cf6bde0ed877c2e0bc0d Mon Sep 17 00:00:00 2001
From: Petipopotam <43313692+Petipopotam@users.noreply.github.com>
Date: Tue, 24 Jan 2023 11:03:19 +0100
Subject: [PATCH 394/412] CSP invalid to display image when web.read_book

CSP
Before : default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:; style-src-elem 'self' blob: 'unsafe-inline'; object-src 'none';
After :    default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data: blob:; style-src-elem 'self' blob: 'unsafe-inline';object-src 'none';
---
 cps/web.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index 3166fe6f4..fa12db5ad 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -85,11 +85,11 @@ def add_security_headers(resp):
     csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self'"
     if request.path.startswith("/author/") and config.config_use_goodreads:
         csp += " images.gr-assets.com i.gr-assets.com s.gr-assets.com"
-    csp += " data:;"
+    csp += " data:"
     if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
         csp += " *;"
     elif request.endpoint == "web.read_book":
-        csp += " style-src-elem 'self' blob: 'unsafe-inline';"
+        csp += " blob:; style-src-elem 'self' blob: 'unsafe-inline';"
     else:
         csp += ";"
     csp += " object-src 'none';"

From 4913f06e0d58a31cc142a16fd7750f2b8abfd226 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 24 Jan 2023 18:07:21 +0100
Subject: [PATCH 395/412] Updated test status Fix for #2614 (Send to eReader
 not working for guest user)

---
 cps/templates/detail.html               |    1 +
 cps/web.py                              |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 1437 +++++++++--------------
 3 files changed, 546 insertions(+), 894 deletions(-)

diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index d6c8f42f3..2d4781ac2 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -38,6 +38,7 @@
             {% endif %}
           {% endif %}
             {% if g.user.kindle_mail and entry.email_share_list %}
+              <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
               {% if entry.email_share_list.__len__() == 1 %}
                 <div id="sendbtn" data-action="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=entry.email_share_list[0]['format'], convert=entry.email_share_list[0]['convert'])}}" data-text="{{_('Send to eReader')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.email_share_list[0]['text']}}</div>
               {% else %}
diff --git a/cps/web.py b/cps/web.py
index d2e4e32ce..3a575d9e2 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1193,7 +1193,7 @@ def download_link(book_id, book_format, anyname):
 
 
 @web.route('/send/<int:book_id>/<book_format>/<int:convert>', methods=["POST"])
-@login_required
+@login_required_if_no_ano
 @download_required
 def send_to_ereader(book_id, book_format, convert):
     if not config.get_mail_server_configured():
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index c36757678..f4559f903 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2023-01-22 19:25:10</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2023-01-23 21:43:54</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>2023-01-23 01:31:36</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2023-01-24 03:59:24</p>
             
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>5h 12 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>5h 19 min</p>
         </div>
       </div>
       </div>
@@ -465,11 +465,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
+        <td class="text-center">15</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -569,31 +569,11 @@
     
     
     
-        <tr id="ft6.11" class="none bg-danger">
+        <tr id='pt6.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 467, in test_email_only
-    self.assertGreaterEqual(self.email_server.handler.message_size, 5996)
-AssertionError: 5995 not greater than or equal to 5996</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -635,11 +615,11 @@ AssertionError: 5995 not greater than or equal to 5996</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</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">
@@ -694,31 +674,11 @@ AssertionError: 5995 not greater than or equal to 5996</pre>
     
     
     
-        <tr id="ft7.6" class="none bg-danger">
+        <tr id='pt7.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 461, in test_email_only
-    self.assertGreaterEqual(self.email_server.handler.message_size, 5996)
-AssertionError: 5995 not greater than or equal to 5996</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1868,11 +1828,11 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1882,21 +1842,41 @@ IndexError: list index out of range</pre>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id="ft17.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft17.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft17.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
+    self.assertEqual(30, len(results))
+AssertionError: 30 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSTARTTLS</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1924,108 +1904,31 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="ft18.3" class="none bg-danger">
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft18.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 116, in test_STARTTLS_resend_password
-    self.assertTrue(self.login(user, passw))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</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('c19', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et19.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_email_STARTTLS)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et19.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et19.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 54, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 476, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 856, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</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('c20', 7)">Detail</a>
+            <a onclick="showClassDetail('c19', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -2034,7 +1937,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -2043,36 +1946,16 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id="ft20.3" class="none bg-danger">
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft20.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft20.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft20.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 130, in test_SSL_logging_email
-    self.assertTrue(len(re.findall(&#39;Subject: Calibre-Web test e-mail&#39;, data)), &#34;Email logging not working&#34;)
-AssertionError: 0 is not true : Email logging not working</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt20.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2081,7 +1964,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt20.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -2090,7 +1973,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt20.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -2099,7 +1982,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt20.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2117,13 +2000,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2141,13 +2024,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 2)">Detail</a>
+            <a onclick="showClassDetail('c21', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2156,7 +2039,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -2174,13 +2057,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2189,19 +2072,19 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id="st23.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st23.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.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_st23.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2215,7 +2098,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2233,13 +2116,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2257,13 +2140,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2272,7 +2155,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2281,7 +2164,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2299,13 +2182,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2314,7 +2197,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2323,7 +2206,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2332,7 +2215,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2341,7 +2224,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2350,7 +2233,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2359,7 +2242,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2368,7 +2251,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2377,7 +2260,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2386,7 +2269,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2395,7 +2278,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2413,13 +2296,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 6)">Detail</a>
+            <a onclick="showClassDetail('c26', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_download_cover</div>
             </td>
@@ -2428,7 +2311,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2437,7 +2320,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelves</div>
             </td>
@@ -2446,7 +2329,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2455,7 +2338,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2464,7 +2347,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2474,21 +2357,21 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">6</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2497,25 +2380,76 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id="ft27.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft27.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 620, in test_LDAP_SSL_CERTIFICATE
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id="et27.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 649, in test_LDAP_STARTTLS
+    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 388, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 298, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py&#34;, line 90, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2524,16 +2458,36 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id="ft27.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft27.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 409, in test_LDAP_import
+    self.assertEqual(len(userlist), 4)
+AssertionError: 5 != 4</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2542,16 +2496,36 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id="ft27.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft27.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 230, in test_LDAP_login
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2560,7 +2534,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2569,25 +2543,65 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id="ft27.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft27.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 768, in test_ldap_authentication
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id="ft27.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft27.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1039, in test_ldap_kobo_sync
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2596,11 +2610,31 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id="ft27.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft27.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft27.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 851, in test_ldap_opds_download_book
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2614,13 +2648,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 10)">Detail</a>
+            <a onclick="showClassDetail('c28', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2629,7 +2663,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2638,7 +2672,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2647,7 +2681,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2656,7 +2690,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
@@ -2665,7 +2699,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
@@ -2674,7 +2708,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2683,7 +2717,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2692,7 +2726,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2701,7 +2735,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2719,13 +2753,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2734,7 +2768,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2743,7 +2777,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2752,7 +2786,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2761,19 +2795,19 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id="st30.5" class="none bg-warning">
+        <tr id="st29.5" 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_st30.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st30.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st30.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2787,7 +2821,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2796,7 +2830,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2805,7 +2839,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2814,7 +2848,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2832,13 +2866,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2847,7 +2881,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2856,7 +2890,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2865,7 +2899,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2874,7 +2908,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2883,7 +2917,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2892,7 +2926,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2901,7 +2935,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2910,7 +2944,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2919,7 +2953,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2928,7 +2962,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2937,7 +2971,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2946,7 +2980,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2955,7 +2989,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2964,7 +2998,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2982,13 +3016,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2997,7 +3031,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -3015,13 +3049,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3030,7 +3064,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3048,13 +3082,13 @@ AssertionError: 0 is not true : Email logging not working</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3063,7 +3097,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3072,7 +3106,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3081,7 +3115,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3090,7 +3124,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3099,7 +3133,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3108,7 +3142,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3117,7 +3151,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3126,7 +3160,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3135,7 +3169,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3144,7 +3178,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3153,7 +3187,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3162,7 +3196,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3171,7 +3205,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3180,7 +3214,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3189,7 +3223,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3198,7 +3232,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3207,7 +3241,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3216,7 +3250,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3225,7 +3259,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3234,7 +3268,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3243,7 +3277,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3252,7 +3286,7 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
     
     
-        <tr id='pt34.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3262,49 +3296,25 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestUploadPDF</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft35.1" class="none bg-danger">
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 137, in test_upload_invalid_pdf
-    self.check_uploaded_pdf({&#39;title&#39;: &#34;Tü执el&#34;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 58, in check_uploaded_pdf
-    self.assertEqual(check_properties[&#39;title&#39;], details[&#39;title&#39;])
-AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
-- Tü执el
-+ book1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3318,13 +3328,13 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 3)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_command_start</div>
             </td>
@@ -3333,7 +3343,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
             </td>
@@ -3342,7 +3352,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_module_start</div>
             </td>
@@ -3360,13 +3370,13 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3375,7 +3385,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3384,7 +3394,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3393,7 +3403,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3402,7 +3412,7 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3420,13 +3430,13 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3436,50 +3446,30 @@ AssertionError: &#39;Tü执el&#39; != &#39;book1&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestRegister</td>
         <td class="text-center">8</td>
-        <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">3</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('c39', 8)">Detail</a>
+            <a onclick="showClassDetail('c38', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft39.1" class="none bg-danger">
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft39.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 211, in test_forgot_password
-    self.assertTrue(self.check_user_logged_in(&#39;forget&#39;, noCompare=True))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3488,7 +3478,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3497,7 +3487,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3506,157 +3496,38 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft39.5" class="none bg-danger">
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft39.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 224, in test_registering_only_email
-    self.assertEqual(&#39;hujh@de.de&#39;, user)
-AssertionError: &#39;hujh@de.de&#39; != False</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et39.6" class="none bg-info">
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 132, in test_registering_user
-    self.assertEqual(u&#39;flash_success&#39;,self.register(u&#39;u1&#39;, &#39;huj@de.de&#39;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 125, in register
-    username = cls.driver.find_element(By.NAME, &#34;name&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 856, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [name=&#34;name&#34;]
-Stacktrace:
-RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et39.7" class="none bg-info">
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 151, in test_registering_user_fail
-    self.assertEqual(u&#39;flash_success&#39;,self.register(u&#39;udouble&#39;, &#39;huj@de.com&#39;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 125, in register
-    username = cls.driver.find_element(By.NAME, &#34;name&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 856, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [name=&#34;name&#34;]
-Stacktrace:
-RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et39.8" class="none bg-info">
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_register.py&#34;, line 173, in test_user_change_password
-    self.assertEqual(u&#39;flash_success&#39;,self.register(u&#39;upasswd&#39;, &#39;passwd@de.com&#39;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 125, in register
-    username = cls.driver.find_element(By.NAME, &#34;name&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 856, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [name=&#34;name&#34;]
-Stacktrace:
-RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3670,13 +3541,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 3)">Detail</a>
+            <a onclick="showClassDetail('c39', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3685,7 +3556,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3694,7 +3565,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3712,13 +3583,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c40', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3727,7 +3598,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3736,7 +3607,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3745,7 +3616,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3754,7 +3625,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3763,7 +3634,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3772,7 +3643,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3781,7 +3652,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3790,7 +3661,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3799,7 +3670,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3808,7 +3679,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3817,7 +3688,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3826,7 +3697,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3835,19 +3706,19 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id="st41.14" class="none bg-warning">
+        <tr id="st40.14" 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_st41.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.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_st41.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3861,7 +3732,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3870,7 +3741,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3888,13 +3759,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 1)">Detail</a>
+            <a onclick="showClassDetail('c41', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnailsEnv - test_cover_cache_env_on_database_change</div>
             </td>
@@ -3912,13 +3783,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 8)">Detail</a>
+            <a onclick="showClassDetail('c42', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
             </td>
@@ -3927,7 +3798,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
@@ -3936,7 +3807,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
             </td>
@@ -3945,7 +3816,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
@@ -3954,7 +3825,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='st43.5' class='none bg-warning'>
+        <tr id='st42.5' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_for_series</div>
             </td>
@@ -3963,7 +3834,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
@@ -3972,7 +3843,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
             </td>
@@ -3981,7 +3852,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
             </td>
@@ -3991,153 +3862,57 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">4</td>
-        <td class="text-center">4</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">
-            <a onclick="showClassDetail('c44', 9)">Detail</a>
+            <a onclick="showClassDetail('c43', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft44.1" class="none bg-danger">
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <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_ft44.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 227, in test_check_update_nightly_errors
-    self.assertEqual(update_table[1].text, &#39;Current version&#39;)
-AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
-- Current Version
-?         ^
-+ Current version
-?         ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft44.2" class="none bg-danger">
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <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_ft44.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 255, in test_check_update_nightly_request_errors
-    self.assertEqual(update_table[1].text, &#39;Current version&#39;)
-AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
-- Current Version
-?         ^
-+ Current version
-?         ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft44.3" class="none bg-danger">
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <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_ft44.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 139, in test_check_update_stable_errors
-    self.assertEqual(update_table[1].text, &#39;Current version&#39;)
-AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
-- Current Version
-?         ^
-+ Current version
-?         ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft44.4" class="none bg-danger">
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <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_ft44.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 167, in test_check_update_stable_versions
-    self.assertEqual(update_table[1].text, &#39;Current version&#39;)
-AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
-- Current Version
-?         ^
-+ Current version
-?         ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -4146,7 +3921,7 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -4155,19 +3930,19 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
     
     
-        <tr id="st44.7" class="none bg-warning">
+        <tr id="st43.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_st44.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st43.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st44.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st43.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_st44.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st43.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4181,7 +3956,7 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -4190,7 +3965,7 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -4208,13 +3983,13 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 5)">Detail</a>
+            <a onclick="showClassDetail('c44', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -4223,7 +3998,7 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -4232,7 +4007,7 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4241,7 +4016,7 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_identifier</div>
             </td>
@@ -4250,7 +4025,7 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4260,21 +4035,21 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">12</td>
-        <td class="text-center">2</td>
-        <td class="text-center">4</td>
+        <td class="text-center">18</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('c46', 18)">Detail</a>
+            <a onclick="showClassDetail('c45', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4283,36 +4058,16 @@ AssertionError: &#39;Current Version&#39; != &#39;Current version&#39;
     
     
     
-        <tr id="ft46.2" class="none bg-danger">
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft46.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft46.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft46.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 163, in test_list_visibility
-    self.assertEqual(35, len(ul[&#39;table&#39;][0]))
-AssertionError: 35 != 34</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4321,7 +4076,7 @@ AssertionError: 35 != 34</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4330,7 +4085,7 @@ AssertionError: 35 != 34</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4339,7 +4094,7 @@ AssertionError: 35 != 34</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4348,7 +4103,7 @@ AssertionError: 35 != 34</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4357,65 +4112,25 @@ AssertionError: 35 != 34</pre>
     
     
     
-        <tr id="et46.8" class="none bg-info">
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et46.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et46.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et46.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 235, in test_user_list_edit_email
-    self.assertEqual(&#34;muki1al@b.com&#34;, ul[&#39;table&#39;][1][&#39;E-mail Address&#39;][&#39;text&#39;])
-KeyError: &#39;E-mail Address&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et46.9" class="none bg-info">
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et46.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et46.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et46.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 261, in test_user_list_edit_kindle
-    self.assertEqual(&#34;muki1al@b.com&#34;, ul[&#39;table&#39;][1][&#39;E-Reader E-mail&#39;][&#39;text&#39;])
-KeyError: &#39;E-Reader E-mail&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4424,7 +4139,7 @@ KeyError: &#39;E-Reader E-mail&#39;</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4433,7 +4148,7 @@ KeyError: &#39;E-Reader E-mail&#39;</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4442,36 +4157,16 @@ KeyError: &#39;E-Reader E-mail&#39;</pre>
     
     
     
-        <tr id="et46.13" class="none bg-info">
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et46.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et46.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et46.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 495, in test_user_list_edit_visiblility
-    self.assertEqual(&#34;&#34;, ul[&#39;table&#39;][1][&#39;Show category selection&#39;][&#39;text&#39;])
-KeyError: &#39;Show category selection&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4480,7 +4175,7 @@ KeyError: &#39;Show category selection&#39;</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4489,7 +4184,7 @@ KeyError: &#39;Show category selection&#39;</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4498,64 +4193,20 @@ KeyError: &#39;Show category selection&#39;</pre>
     
     
     
-        <tr id="et46.17" class="none bg-info">
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et46.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et46.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et46.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 541, in test_user_list_search
-    ul = self.check_search(ul, &#34;B.cOm&#34;, 10, &#34;E-mail Address&#34;, &#34;muki1al@b.com&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 86, in check_search
-    self.assertEqual(value, bl[&#39;table&#39;][0][column][&#39;text&#39;])
-KeyError: &#39;E-mail Address&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft46.18" class="none bg-danger">
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft46.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft46.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft46.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 553, in test_user_list_sort
-    self.assertEqual(&#34;E-mail Address&#34;, ul[&#39;header&#39;][3][&#39;text&#39;])
-AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
-- E-mail Address
-+ Email</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4569,13 +4220,13 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 1)">Detail</a>
+            <a onclick="showClassDetail('c46', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4593,13 +4244,13 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c48', 21)">Detail</a>
+            <a onclick="showClassDetail('c47', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4608,7 +4259,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4617,7 +4268,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4626,7 +4277,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4635,7 +4286,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4644,7 +4295,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4653,7 +4304,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4662,7 +4313,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4671,7 +4322,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4680,7 +4331,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4689,7 +4340,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4698,7 +4349,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4707,7 +4358,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4716,7 +4367,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4725,7 +4376,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4734,7 +4385,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4743,7 +4394,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.17' class='hiddenRow bg-success'>
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4752,7 +4403,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.18' class='hiddenRow bg-success'>
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4761,7 +4412,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4770,7 +4421,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4779,7 +4430,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt48.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4797,13 +4448,13 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c49', 35)">Detail</a>
+            <a onclick="showClassDetail('c48', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt49.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4812,7 +4463,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4821,7 +4472,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4830,7 +4481,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4839,7 +4490,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4848,7 +4499,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4857,7 +4508,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4866,7 +4517,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4875,7 +4526,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4884,7 +4535,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4893,7 +4544,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4902,7 +4553,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4911,7 +4562,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4920,7 +4571,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4929,7 +4580,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4938,7 +4589,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4947,7 +4598,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.17' class='hiddenRow bg-success'>
+        <tr id='pt48.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4956,7 +4607,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.18' class='hiddenRow bg-success'>
+        <tr id='pt48.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4965,7 +4616,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.19' class='hiddenRow bg-success'>
+        <tr id='pt48.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4974,7 +4625,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.20' class='hiddenRow bg-success'>
+        <tr id='pt48.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4983,7 +4634,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.21' class='hiddenRow bg-success'>
+        <tr id='pt48.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4992,7 +4643,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.22' class='hiddenRow bg-success'>
+        <tr id='pt48.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -5001,7 +4652,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.23' class='hiddenRow bg-success'>
+        <tr id='pt48.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -5010,7 +4661,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.24' class='hiddenRow bg-success'>
+        <tr id='pt48.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -5019,7 +4670,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.25' class='hiddenRow bg-success'>
+        <tr id='pt48.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -5028,7 +4679,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.26' class='hiddenRow bg-success'>
+        <tr id='pt48.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
@@ -5037,7 +4688,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.27' class='hiddenRow bg-success'>
+        <tr id='pt48.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -5046,7 +4697,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.28' class='hiddenRow bg-success'>
+        <tr id='pt48.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -5055,7 +4706,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.29' class='hiddenRow bg-success'>
+        <tr id='pt48.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -5064,7 +4715,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.30' class='hiddenRow bg-success'>
+        <tr id='pt48.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -5073,7 +4724,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.31' class='hiddenRow bg-success'>
+        <tr id='pt48.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -5082,7 +4733,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.32' class='hiddenRow bg-success'>
+        <tr id='pt48.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -5091,7 +4742,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.33' class='hiddenRow bg-success'>
+        <tr id='pt48.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -5100,7 +4751,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.34' class='hiddenRow bg-success'>
+        <tr id='pt48.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -5109,7 +4760,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt49.35' class='hiddenRow bg-success'>
+        <tr id='pt48.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -5127,13 +4778,13 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c50', 16)">Detail</a>
+            <a onclick="showClassDetail('c49', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt50.1' class='hiddenRow bg-success'>
+        <tr id='pt49.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -5142,7 +4793,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.2' class='hiddenRow bg-success'>
+        <tr id='pt49.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -5151,7 +4802,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.3' class='hiddenRow bg-success'>
+        <tr id='pt49.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -5160,7 +4811,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.4' class='hiddenRow bg-success'>
+        <tr id='pt49.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -5169,7 +4820,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.5' class='hiddenRow bg-success'>
+        <tr id='pt49.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -5178,7 +4829,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.6' class='hiddenRow bg-success'>
+        <tr id='pt49.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -5187,7 +4838,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.7' class='hiddenRow bg-success'>
+        <tr id='pt49.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -5196,7 +4847,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.8' class='hiddenRow bg-success'>
+        <tr id='pt49.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -5205,7 +4856,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.9' class='hiddenRow bg-success'>
+        <tr id='pt49.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -5214,7 +4865,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.10' class='hiddenRow bg-success'>
+        <tr id='pt49.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -5223,7 +4874,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.11' class='hiddenRow bg-success'>
+        <tr id='pt49.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -5232,7 +4883,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.12' class='hiddenRow bg-success'>
+        <tr id='pt49.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -5241,7 +4892,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.13' class='hiddenRow bg-success'>
+        <tr id='pt49.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -5250,7 +4901,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.14' class='hiddenRow bg-success'>
+        <tr id='pt49.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -5259,7 +4910,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.15' class='hiddenRow bg-success'>
+        <tr id='pt49.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -5268,7 +4919,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
     
     
     
-        <tr id='pt50.16' class='hiddenRow bg-success'>
+        <tr id='pt49.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -5279,10 +4930,10 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>425</td>
-        <td>396</td>
-        <td>13</td>
-        <td>9</td>
+        <td>424</td>
+        <td>408</td>
+        <td>7</td>
+        <td>2</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5731,7 +5382,7 @@ AssertionError: &#39;E-mail Address&#39; != &#39;Email&#39;
 </div>
 
 <script>
-    drawCircle(396, 13, 9, 7);
+    drawCircle(408, 7, 2, 7);
     showCase(5);
 </script>
 

From 9701a97a5711afd7cca4df27e10a895faa95f1f8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 28 Jan 2023 18:42:20 +0100
Subject: [PATCH 396/412] Updated optional-requirements

---
 optional-requirements.txt | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 57a4038fc..53b8ba735 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,31 +1,31 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.50.0
-gevent>20.6.0,<22.0.0
-greenlet>=0.4.17,<1.2.0
-httplib2>=0.9.2,<0.21.0
+google-api-python-client>=1.7.11,<2.75.0
+gevent>20.6.0,<23.0.0
+greenlet>=0.4.17,<2.1.0
+httplib2>=0.9.2,<0.22.0
 oauth2client>=4.0.0,<4.1.4
 uritemplate>=3.0.0,<4.2.0
 pyasn1-modules>=0.0.8,<0.3.0
 pyasn1>=0.1.9,<0.5.0
-PyDrive2>=1.3.1,<1.11.0
+PyDrive2>=1.3.1,<1.16.0
 PyYAML>=3.12
-rsa>=3.4.2,<4.9.0
+rsa>=3.4.2,<4.10.0
 
 # Gmail
-google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.50.0
+google-auth-oauthlib>=0.4.3,<0.9.0
+google-api-python-client>=1.7.11,<2.75.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
-python-Levenshtein>=0.12.0,<0.13.0
+python-Levenshtein>=0.12.0,<0.21.0
 
 # ldap login
 python-ldap>=3.0.0,<3.5.0
 Flask-SimpleLDAP>=1.4.0,<1.5.0
 
 # oauth
-Flask-Dance>=2.0.0,<5.2.0
-SQLAlchemy-Utils>=0.33.5,<0.39.0
+Flask-Dance>=2.0.0,<6.3.0
+SQLAlchemy-Utils>=0.33.5,<0.40.0
 
 # metadata extraction
 rarfile>=3.2
@@ -37,8 +37,8 @@ beautifulsoup4>=4.0.1,<4.12.0
 cchardet>=2.0.0,<2.2.0
 
 # Comics
-natsort>=2.2.0,<8.2.0
+natsort>=2.2.0,<8.3.0
 comicapi>=2.2.0,<2.3.0
 
 # Kobo integration
-jsonschema>=3.2.0,<4.9.0
+jsonschema>=3.2.0,<4.18.0

From c4e4acfc26773c75971f227c46c35e4eb0106a37 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 29 Jan 2023 09:54:07 +0100
Subject: [PATCH 397/412] Stop scheduler also on restart calibre-web

---
 cps/server.py                        | 8 ++++++++
 cps/services/background_scheduler.py | 2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cps/server.py b/cps/server.py
index fb70a723a..6b5ac7610 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -22,6 +22,7 @@ import errno
 import signal
 import socket
 import subprocess  # nosec
+from .services.background_scheduler import BackgroundScheduler
 
 try:
     from gevent.pywsgi import WSGIServer
@@ -265,6 +266,12 @@ class WebServer(object):
         subprocess.call(args, close_fds=True)  # nosec
         return True
 
+    @staticmethod
+    def shutdown_scheduler():
+        scheduler = BackgroundScheduler()
+        if scheduler:
+            scheduler.scheduler.shutdown()
+
     def _killServer(self, __, ___):
         self.stop()
 
@@ -273,6 +280,7 @@ class WebServer(object):
         updater_thread.stop()
 
         log.info("webserver stop (restart=%s)", restart)
+        self.shutdown_scheduler()
         self.restart = restart
         if self.wsgiserver:
             if _GEVENT:
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index ec3555f0e..729915597 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -45,8 +45,6 @@ class BackgroundScheduler:
             cls.scheduler = BScheduler()
             cls.scheduler.start()
 
-            atexit.register(lambda: cls.scheduler.shutdown())
-
         return cls._instance
 
     def schedule(self, func, trigger, name=None):

From 1babb566fbf87984b52acd890112d896d607d242 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 29 Jan 2023 09:55:32 +0100
Subject: [PATCH 398/412] Update version

---
 cps/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/constants.py b/cps/constants.py
index d00760671..376e1097c 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -163,7 +163,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher, pubdate, identifiers')
 
-STABLE_VERSION = {'version': '0.6.19'}
+STABLE_VERSION = {'version': '0.6.20 Beta'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'

From 0e6b7f96d316050f68cf3b4ecaf2be8785fafa1a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 29 Jan 2023 10:01:30 +0100
Subject: [PATCH 399/412] Update flask requirement

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 04941f302..34c990faa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ Flask-Babel>=0.11.1,<3.1.0
 Flask-Login>=0.3.2,<0.6.3
 Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
-Flask>=1.0.2,<2.2.0
+Flask>=1.0.2,<2.3.0
 iso-639>=0.4.5,<0.5.0
 PyPDF>=3.0.0,<3.3.0
 pytz>=2016.10

From e71a3452e19e3631a492a143c3ddde60c10578bc Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Sun, 29 Jan 2023 14:14:18 +0100
Subject: [PATCH 400/412] Added empty database

---
 library/metadata.db | Bin 0 -> 413696 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 library/metadata.db

diff --git a/library/metadata.db b/library/metadata.db
new file mode 100644
index 0000000000000000000000000000000000000000..fc0d5d3156ccaf85108d9bb797433e688e1f2136
GIT binary patch
literal 413696
zcmeI5ZEzgPdEa*lV0Q_=>`^*seFvSc2}%N11WD}iKpu}rotD57ha<S)0gEFkiW(1g
z2fzrsJ9|5`d=W(}072hH<>-T5Wq)wWsU)RJ#b4r-D@i4(*d^yf%1OB@v0awR73YI1
zWmi(JxLlEJ$)}3bJ>4_YGduf&7wQhn|BAOSPrp9D=jo@rXL_K;cjk0UBP&L|qFUr^
z<he*R8u=0-kx1kv`kzMsb6z$2rQi8MKcn=&7o^`|UtfxxzVY?|O*xqS1D38PKTQ60
z@~@JAk^J-IpC<n#`TgV{^#9#~1ASkK{&w`Y!zzHRErINFvDDI;Xhg4;wEO0JWok=B
zZCHl=TUj=YbyG35x~`c@S+A}unI_S(%^OGJsZ1uib<0wh%Noy6S1rA|$_q71j!rG)
zvV|NeWG~O<NOL+FBYKI<<_o!*+yc42FncY#aEn~c-5MVxUB6hhZXNmg0?9AU&26Uw
zuEVaXSjx}7vy>ZST^T35zI4|rq^FL?Qa3W~jU$70tRu^ko3{_eQ|He|x0WRH)EdiW
z-CWb^vV{V|!y!frWchg5$?eo$nQ9v*nmrs#-8tXhL~j55V<;d#vibJGc<RiV=+=~M
zsB&XfuPP;#%Iv{d^8|xo2J(`}b~S`{GkU6OMI(jWO*-VZH|*}J<sFrihZ$=;oz4z+
zj%yN1XXHqtLytclkEbRlqfc&2_9&~>)rPt%!XY<_UzP~5ia*Dmj2dEx&0TpsA*^3Y
z(I{!VtcT7T6~(BRw0cuTWIA^xyEIoI6Wa;BgvciK`st0#^h_d_x;@!`<oUTfM)pe&
zZr&JZp1<fExMujGqb!Mq*jP^A6ASNV1lp4%?@^OQwqpmM6?lD~2|CTh>8V)f`Af#;
z7)X}IulL7NCr?KC;zF!YOzpjfRxN6Qp94O#1QN$sU>K(*)9>f{;;B?B`fc4C*!D>7
z_m#Ir+>*AYA<GexT`J7a=4r8OxqP7mSWCCcnq8AGG`a(1bg8;tHSSeM$<+MZ99tgc
z=clrZxenEuM&06;u&doxSxc{IrlnSDq%eCew^+ztyY6;pYH4ACDy6t79r{71GdfE#
z1>F)mu1l;q?L{b|OT{^NB5|wCobD7*xEColpY5a3&E+bei<|&9GO|6xl#9h()=*Qe
zHUE6*sy{N)!5k}Pb=7Pd`)>J6hvJO}T|F>r9rCTICY?a;(!hUtetyoazLRars%a?|
zqol9s8g0jQK4-n)Ry6X;#Kgp@i46TmCMI6D|DCkoN79>Dqw&=6aCEC;k7E%v#K!^O
zSQbKOG=~i34tkR2HO=<Cf$Y!^3EOt<)Crtf)Ls*{-*==>9f+l}!)!jK8^)jgCVf-x
z(YM7ieVe*T-!8vJ-?CHm?c@deHgtl%eIj{;zSB*AB>6ws7ra0K1V8`;KmY_l00ck)
z1V8`;KmY{xC4rIly&h!AZ2$k4?eifO1V8`;KmY_l00ck)1V8`;KmY_lU_TK!=Ig9`
z|Njd<F@Asm2!H?xfB*=900@8p2!H?xfWWg$;E#Gwb+-SHCjUA@|KSA!AOHd&00JNY
z0w4eaAOHd&00JP;Qv?#xzSKec52U#F|Npk96ofJ$00JNY0w4eaAOHd&00JNY0w4ea
z4uM!C;y(ZXp(Dg62!H?xfB*=900@8p2!H?xfB*=9KyMKkh`9Ivf81M|K^qVN0T2KI
z5C8!X009sH0T2KI5C8#AAWlDU{~z7}0w4eaAOHd&00JNY0w4eaAOHfrPQbhW-|Lz}
zKM()`5C8!X009sH0T2KI5C8!Xc$Nt`_y3<|2GAV@KmY_l00ck)1V8`;KmY_l00erS
zfb;x+uj>i@KmY_l00ck)1V8`;KmY_l00cnbStfw{|If1Zp*skG00@8p2!H?xfB*=9
z00@A<vqAv(|DP30Lr)L@0T2KI5C8!X009sH0T2LzXPE%*|3AythwdN%0w4eaAOHd&
z00JNY0w4ea&k6zD|9@624Lv~s1V8`;KmY_l00ck)1V8`;o@D~K|NksoAG(782!H?x
zfB*=900@8p2!H?xJSzl_B!3i1Mt(DL^kMRM2Y+)=P5jQ_r(=Jdcrfq}2Hx)bi@tw+
zVCKL9np}%y=>OO&@gVlk-#HnL=+%;T-+ZsETbiOaEW`e-EE~qUsaWc&sg(8Vx{?V9
zo~O-CEuCp!+|=s2=C42!9ow8s##3j`M7L%vb-AqZ7NiVKg6F0da@j(T6tb7+a-=Dl
zj1j#=X7h#IOm2Z(Uzoj?UARTA=5CD-lCEE@R=1A)e1YVb=H|9j0asvGRV?La-&x9y
zv96@M?s|IaXe@Oj)7~O=)zYg0o654}=8YrqR3;PMx+U2}&cUh6lA|G3k<&jOX5l^B
zE3=FfUf(v%GkZ9ex^uq0d1{U2vTm+vb^o9Vh>vXEJ`_)#KOfy%l8h9{#O)Li9u6^8
zAj`+YT5hNI%3#|tRCX|y>J-^(<;JRBRZ6O*I-yY#9ol^RAdhTQvVpuZ!Z@B_Fw8Js
z^4PB88f$H*9II+YBZb^e8V9!*3-7As9hH+}-#BYLoqqi3csw;Z8GUkFf>~Cps||Hk
z%r2a#UzP|#>d&z!u1@TEXs39^w8Z+Q6pfO$%X;V>UQvvCNvk(iM5c3BvP*LXGO?Y>
zj1bu##O<dyoYFIiSnBp<`?%)k?u;0}^x)==f##`)u1MAl5e~VPWl1c=#&Y_eSa>(X
z$F?u;QIkcsV+WrVczvD;I<0NeQ?bq~0~woRAXyf_-XBYyJQ?Nd0<m5+wf7oYwWtMt
z4*1LxNE~CMdYqO_zn|-ir&6itw{>q|+cxg^mA6IQlD4KH3p|otD$LL3X|Zd$e4zta
zOSj6JU6U`axdUW$sk&Y@?o~(0)co8WTW{v)r?QK=4%M1Q-Qt$8tKC*vORs3ArB-UB
zFncYxSjb+x?sjKtX<>mXrMM{_`a!2oIxR5;-4Z*lODx9iEdilx?>ToCaI4Im?i5hC
z7b!NM?W57n<tm>@oB%d5vOU9;i^W~mP*bfn|77N>KQhw694lqIhiV%8Zuv}y;*AEK
z`Wdwj`PNjEP9S$_;J-XSKj&88$u?!xw3Lcb(pPkiw&OaVGugWpjl423F>z`lL;sP9
ziP!CaC++u<^ybxQJT*KV-KyB*SVRr+alkj0h0qzzAw#)?o}_s}vORAgJM=@sw!u4f
z0%sPr7c}j6bm>zEVyWzKtNBy_R5IdAAKS^Z?YwjTKl!)G|I2>k1p*)d0w4eaAOHd&
z00JNY0w4eaAkZrW;#`qfB;uU^PkxyEL9b{BJwN~iKmY_l00ck)1V8`;KmY_l00e9T
z;sU^cegFUY=u9N}ACA_Ko;~up!#_Cm<wHY>-%f1CM`Ax7_`88W?7!K6yzfF^?7)`}
z9E#3FW04C7Ba!$-BoaNEI(s&{d6A#qs8$V&o)R~zrc%=D7CjfDHjBpmr#eD1?C8Ym
zPLA41N8{4zH$NLoEuLz1c%q_Ns(oZvD5hkBlF^OqiFoSNsp#gUO(U2d{QY?!hhXZ?
zj_vLm!r75nYUX$=2xWb_uGSwYdP&K6-#@o8bv&LremuJQj;*+t;(hz9PgzgCi_<*p
zz?^%;$vs@w=?oAnCCttWdnX~&84^q7UT&$nduTZ0o;^LWp}ibWz5H_Y@e5pWCy$$B
z#ILrK&N^W~aKgUO*AC7y@q(-&e)!ja9&uYI2zgZw6}L(W&E#idso4{)(C8(tYOzyb
z^sH@0`f+^o!AtSfi4)N$7i>IIlJu4M5XlK1q8;<G$Aib$IhxjulMrG(sM$v$<rD1Q
zp*D87aGR$I1!#7>oxb+WVob?#ySI|b(w~l{E~Q$TY(>*b)L8b%%NzHG?X$Fxui0j@
zh4$NLe5SEQj!kx85q@^or*$Vgn8mtYv;3qwl@Wv6Zq4H%(EC5qqc6r%7l&Fw;!kL>
z_m?*Bybw<f4Mm^4WFulS_TQ&{fSAPL<M~|I&ywxPS67UBMGX+z)}h8mwP;job<H%j
zl49y#-|k}s&1Wjx8%UaR#|iI!dN6(QXJV=ObSpy?8>VGcXq+oIDs*X)@&6v)T1>@L
z>2&l1%AY<9=uh?kdeLVve;OGJJzYr`Bm5QO^4**rFRRO1^LP)3WW!{wbumhqx7iV@
zi@X)JzOGQ%N=Ykg_W5rAN#72$r&i*p?EUA1GaX8mbhB1g9|&dK6W9+QjdUoen@Xio
zw)7f3YQL?1R@q=EQy(tza_z&t@I>1_&4D64^{I9bJ`{~AJuq$3rLJPs_=-2vEPLT`
zYRG;r<q3cEp*csh<Y)XY+SCq@Fd@zu?oz^e10TB%8~*y_W#@LfVMol%bMu!wc!a+-
z=a(=b*JYgbq1lX1-r#5Y%=59-)JrWRj!~)5MGcEJ;#+F-&?n=mmtKlK=3~K;JD;Bl
zn2nd;v9V;LUBj`o`@5M6+=X#xl<7;Kh^2P%1o-A#$KvdXAm8KL?i1szedz)6Px{aX
z5_e2k_J|$PmMfrLcNg*PqmEq4`|g_+X=U4R<m_{uA32pCjCY>Tl0?Vc^Z&n(D<dEP
z0w4eaAOHd&00JNY0w4eaAOHgUioogad+VP6|4H{{kP`$z00ck)1V8`;KmY_l00ck)
z1VCV45$JdB|L?0_qq86Y0w4eaAOHd&00JNY0w4eaAOHf}BH-Nr-&P@H1_2NN0T2KI
z5C8!X009sH0T2KI5ZG4)aQ}Z_nG2l-0T2KI5C8!X009sH0T2KI5CDN45y1Wb9brQu
z5C8!X009sH0T2KI5C8!X009u#R|K5<|H(hxSKUTuK>!3m00ck)1V8`;KmY_l00ck)
z1R{~~ZXr1L|C4{yZ3*N90T2KI5C8!X009sH0T2KI5C8!X*gpgg+Ff<-|L>oEqo*JM
z0w4eaAOHd&00JNY0w4eaAOHf}CE(ou-)=eN2LTWO0T2KI5C8!X009sH0T2KI5ZFHi
zaQ}b**a|%b0T2KI5C8!X009sH0T2KI5CDOl62SfcosvU25C8!X009sH0T2KI5C8!X
z009u#KLnin|H&WipFX3fAOHd&00JNY0w4eaAOHd&00JNY0$meGu$<2Q|KyLmE{BXD
z00JNY0w4eaAOHd&00JNY0w4ea`-niC_LbfLk0!qtq5tp#0T2KI5C8!X009sH0T2KI
z5C8!X*k1%jqkWO3a}$}&L}v2bsS9V9Cr-UuJb&TTYv<3MJykllQk+niCoh~UzRK?Z
zN0Z-=(0_P=00@8p2!H?xfB*=900@8p2!H?x>@xzReM<+s+5fxG|9`m86hwDH00ck)
z1V8`;KmY_l00ck)1V8`;x+E}g(0%^@CtVgnHV^;-5C8!X009sH0T2KI5C8!X0D=8R
zpx?Rwzu!8J{(=AqfB*=900@8p2!H?xfB*=900?wXz`6h5eF@|Q0T2KI5C8!X009sH
z0T2KI5C8!X*lz>|XosUo`{92r`C;-`lXs8)$)WEYe6Zj2Kz~611V8`;KmY_l;A2l<
zE1ejKOnvb3vSF;7<gTvWBWA6vTcoB|HDX$-r9B)ZWTa@68<nb3GfdsmjjB2FI$?5}
zqBg8Gqs|1cjB`m@t*$oIRgK9q8CPgpO2sJYE4o%<2@@j0sFt+5dQqb?M^tMpmuSOO
zazSLGlCo~DX>}@lO~~r1rB_#}U{VN7t*+aRo_7TL*I6a6il3Ic%DQyU`Kebls$iu?
zWoKQPRc1vpRFg+c<|uB`szQ~{OgO#vsVzx^dOP_&ExkHqJw2(bsV8!El|)=yPayP_
z1d_(GROmc0;cC66mr7by;Z|pQ-@Y^W=;tTn1Cg0uI9t}2>uUXhVtb41I6-ew%lc}y
zqE#(gf$$bj>5(E$pavD>8DN?%Aho0(J4tRQ;gc<W((!TGCmp{ltA3Ak<eq6VXPr?i
z`{Q|MSV`{aj8E4c&pDZdJu?}1Xz|gPdBqvOvTa{;DzbF$j2F(iW^VRHnnXvYUk~9%
zp29TK9eV`3B1Nx$O)FY<__68@O{7XRLUWi#-BQ+c(=zH0*hsKj=kK%^o))|ZgsiA#
zQ?oPOVSN~UwDGCfKqR~Ikd8-Xxo+H}u#_T=Z>zLI#i*CGI;+hMr2bCZ<6}hdwUbti
zdPTKNp5PhCP7|iFzgM+;B9k2mY?)3+wZ%d(4cLQsP7L%%W{%0-a#-`;(P(=6&Wrv1
zk;!ALb)!+!N{Xqe_2QaB2X4iD_~`k*{z&?msor%{G%6iB&>uN@tRbmMD|-0o#b|#d
zGeqM>*;LfJrdV~#RJG_7SxOu^@LQ2jMSml5;8FB9lK=MT?;ZW+Bef$J4_`a{nM29J
zKOG!8_!o(Pl(-rDcd^F<|9;?7|F8FduJ1bsek=My<O(gm@#3X;>gv_#MkI3Jerk3$
zx-n|0%VkZiRt?$!o34}<%T!EDt5j%Di$--tUu~cIrKyEnwvZ!*?B%%}8Ev0=bZnhm
zUzoj?UARTA=5CFXyJ>P`w(!>cQh_YY-<X|tdw8;K$4W+#4I8;J%H>y5xm<LkLrK+A
z<zlkBbShOZb*B!?Iy$D8$ZWolo5?NswOTG4#dUIdZvJw5<L%GIQ)kacH!n6RRMP7f
zo#N%*2+^3Y6JZ%zv}_M1Hs(WLYzA^WoS!d{{L<VU^Y%8crTpwWOSv&tG@X9)v$53T
zsc1x}E0O!=dvx`qDRfn1*uRyEW~q#eBD7F4LCGlf!9P!3yqMUe*;@OZtgvJs0p;D<
zg~C#HPB>hPyku!{Ha|mX>B%uZ5?On6G~Tzy33Y3Wj&5?v=dPn}f<i+N1x%Cm5|vuU
zx>lv$#soDQ;<P$xRP~}!(#~Z_U8@*(HL9{&tkVTw(Il^orho22JayqhbR!k2W%#J#
z(l>mTZyHTJQ|D21;I%l#9NicW?Lf%rVVH&ZV*4(LT&<no{JQY`=g!-nzcCZq3B7bb
zXgex;y?x^}$0)Vus$QaIp^<f*)K;s;xIFsg<a8jqeB)d^H96T53w6q1mzY0aXy2#q
zLqTpbo;rClu{jk6B+#;Gv#ql~Ehq2b-IK4zQnM#oMFClljP&ER$HQmisS_unPaXx;
zmvWu=v6d3Z7-<#r4z`GE2l@O@3b~s!)QNCMrsn77*nE|rpUN)g#s?4D)35cQruj39
zlqR9Oj3IR1n{(@>+3nscw3ogH-GtC4cp2tG!BQ+H2O^h03z^Pc$u7+m$cWe(NTGV1
zxLWbA<AlQ)C%i@08RxrRN)M)Uuf$Tf&bBhDy@IT3YRTKzDwz=Bxy`pT_MqS5(_KiG
z5YeR1=ph-NuJQd?slE6%yGdMJ(VJvi%_y!lc>>-1D=T%i=udDBM)wg1g|V2K#tCn5
zoG?drEJbZHIuT1<9BO3~wpLX#?ETe^x6i~=LqpNcd-l*`GWOqDA6F*fAc?yOkk?{u
z*8x?v5*Qy%1F6j-f^cog7^^1Twjq)}c{-MQ^MzJg^Yy)w;h(Q;9zGRMz3@WxF;$pO
z@LbB@Gd}IPY{&W&vP%MVFw><2_n%-0YDbQ2i`}X5SSmZ*iXGqcP^S@JCN|bj##6(?
z(Z{E3dO|Ed&iMEV;Vu9YUWMy>Q*Y&_u8s-e7s;s%$>yh>OmEQZVd)M_Qx6TVq?2Qv
z{X#4?bG#KCcYjFvc;8QNo=C@2$B#$1=<bg?n3v*xJLLoA$#=twy2P#>j=9xNosN|i
zA*!1(J2}>FNl>e6D_UKv7B$A!`!T+ukJ?Lu$1iZWUXqmS3x2#_o>tqh_VI;jwyr%0
zMsg-@`?{-^w_QdMq|K$%xzD$oV5OCgw|xo`rrG)bgURP3$<gHhPClRf_2f+QKPL6$
z2gyI833!132!H?xfB*=900@8p2!H?xfItru_(WeiO7GN{OYSYmgD>|@McLKV7ALh5
z$NOfYZBOUKKhu|u(o3c-&LPBD1#)uJd4PeR>6?s(9R}!U-SwXY==)^f$!Ophz=5H@
z47;=8KLeoQ@Bj6%BSSS1009sH0T2KI5C8!X009sH0T2)b@b~}V3LpRiAOHd&00JNY
z0w4eaAOHd&(E9{%|G)Qb3=Kg51V8`;KmY_l00ck)1V8`;Kmhmu;R7H50w4eaAOHd&
z00JNY0w4eaAkg~+aR0yeZ43=T00ck)1V8`;KmY_l00ck)1V8}y|KS5500JNY0w4ea
zAOHd&00JNY0wB=)1f2W-$sZ*DtoOBrh9Cd}AOHd&00JNY0w4eaAOHd&(BlM-`t&>O
z{BrL9Cx4jyp(Dd52!H?xfB*=900@8p2!H?xfB*=9z<wp*zW{JZsNvlI->+Js-yi@2
zAOHd&00JNY0w4eaAOHd&00Nx}IQRcM=R^(=009sH0T2KI5C8!X009sH0T2Lz{Yn7$
z|M#oq&~Fd`0T2KI5C8!X009sH0T2KI5a^x&?*Dhs3OPXl1V8`;KmY_l00ck)1V8`;
zKw!TTVE6wIB>ys!{E)uk1p*)d0w4eaAOHd&00JNY0w4eaAkYg01_%2hFA7EaqJ5FW
zxc}b^W`zzQ00JNY0w4eaAOHd&00JNY0wB<y0G|JE&j+a>00JNY0w4eaAOHd&00JNY
z0wB-}1laxmXz~XU`VTJ<009sH0T2KI5C8!X009sH0T2Lz9wKn4Z#a5atDCw}?Z@-~
zJ!Dv@0s<fa0w4eaAOHd&00JNY0w4eaoB*ExhbMpl2!H?xfB*=900@8p2!H?xfWR|I
z0MGwFgGPtSAOHd&00JNY0w4eaAOHd&00Pe(0X+Zz%$Xbtg8&GC00@8p2!H?xfB*=9
z00=xI1cJ~14@SNgIq<Ir9`*lz|771kJo>MXObq^6?0G5_uYUKNBiYI4)>~8Yp|fWb
zA6&evYxgX5RaveZ_e`y>s10k)sGA|8sfAp&kR$KT=5COXWRhJZi@CYnRAG>Wy!6s|
zsJyCHwD6QMUK^R3U&<H8^irB!S(v{@mJMUwbh@dO_3Apg@m6jjM|jUK2?b8G0!5=y
zwc6L7eRpQ8u3CC^)jZ8V)1m!r**I0(Dvyh9iJEw~Xv#885wh@FdDpG->89S3Y<`-S
zKh5;LL^H5YCJV2}Q9&<}ORN<CZP(!>3DFy0Bok?(-d$C=ARG@djk?85%08Q#v<)FZ
zZ<Jn-r!HPhY^s*JT-MZT)vzc}qiQNEmZ_MQR;g&E7Gl?@779z*Ia0`8o}-2guYxQs
z&gN$bt#oqC)YN)$jkTv(+I?%BTDod!Rf{S=Dit4f6BO#+Hk(nsM5UIou2uD~Yb<|_
zYN*voqpBB;l6Edb>RQFPt0^U2E!K5QFPh|)(e%crz8Fu<&PF#z+o`G0eyr%LQWs<h
zBK1o`Yp$)_-;m6sW9#Jl!tAx|!Yy(&cWa#7O_Lk5g}3IH3S?pa#_aUQi<jc5t5>5N
zC);+cWE4%RaI2n)<TtzPn#es$M<tof7jiSX1%D^auanDj^Ow^bV{gP$Q&Z868*MwM
zm+rUf7)|<Ocb%d+N2z11(nv$7K`Y~=wpumD<&Me8=^)4FFUC{3Tt|-7&0F=gMAI&H
z*IAaeHNNGtQC#N)|Ni{t_|VW$;+F<kq^@WdjhB`x8nI(B`%OoxJ4i*?v@z&bxjDKz
zft3wy>aRuB8e3M&G+>Ss7L8lSSr*XLGI@J`HZP*BN#^roJP^>KB!^xe*zBN10}_kb
zc0?9gnu3ngC)NQTYHN+<vTm-?KaC^eyC<MEQMV&b88?Bf)QyUW#IDek=LkEPy1hvg
zH&@FJiKuBuJP}Dnf5fjqXGDIfCn8_FZtyHkeX#V3MrYzmttrJ({aW_sSfg4rDz&<1
znp#O=V_X=JxtQpxUv0uNwX9NjgyacyvUhC2z6KPgBAGkO(N0yC-m+~L%enQbN);N<
zopu8XIH@fw^4y57X>`r0hW`jCAaY2H3odD=1<%pcyeOzwOWOVBL^|A>gnT?GY$!IR
zIYt&1SuyGr)oL~_vol{MxQ<PD-e%Ccxm;~(r>0tKO~P`q7?QKGOj~RAot1K!RT~Yx
z<VGbA@77E<KAb&~_+Zki>#M6;Js3_KHP(n?)#Z8A39AdUGi<hLU4~?@6ljK}>(gwt
zI!_~&x11n@mvb|-dAn1y`NiBqflXiYauzlPk4Z(?Z@PwKtA}wCSazhzyV<#=+~U}1
zNh@oXMi&<IbJNtl_-8Qp#g6T^Z-$KJb2seT+2^)vca~y7?Hu_}OG~G{vE6B#%TGV<
z`;zTRPfoS)ByN`Nd6HK~c+xc8)a*A;av29a*^%#=t*I3@XWq1}u+?fj>s1;Tt?gOC
zD<iBRhU?D8^X@#2?Pl9V3y10M{h6KrABg^9<jBi|FU4Q$Ux@x<^jkaG-J{GN5J<2(
zo?Ln>KJ@0BiEkZYt8cn?aj%oC=w-Ueperu6plO*PuhUy*ddgQ$>{Wr?O?yQ{ClKEX
zpY>l_>bMhj@EQ)ycZua?t0()?gnb=`F3~N8vlwFy(OuP3y6EEdbC0gLG%56SuC=tj
zX2T8RBgnfzA$GhzW3O=AUY}vWo)l-|LsL_UZ@tsffBBk~W^Q(Ep48EYdA6U57xSh<
z{a8xkyPlSw%yVAiA0L%F%iY~0hYr_kUwQSI#jaS`+o3Ug2bykw4U((;Wcf;bD3?oo
z>uO6c7n|@<Hy3Fg{aobRp`*9h<J)1@+3E31-8?Rc)<S(<PV3<8JnJP<;-m6*Ux)X|
z-CJn3ul$|s(B8)dyC>hw#fPq5O?>M?ODA`)W`!?EyyT9q?q%Jfx3j_9bWNe9uY1jf
zx_cnGgU7qMFS*}7vPFy61HQ!CBiDDU4O4Mn4S>$e7*|*G$ycX&n4fAn0>tIz&@eC3
zI{LoI_fv6v(N?I}%V`~4o@bSAeSRb>bYF+}$kSVBwy%7=>szTu2EQD6F8bL>{I3T7
zN#8rs&nEwAa_s28IQrEi-#hZ|;s0_tcj!MKdS~#D2erZfHdyMk!=+Vy|6(S(@k#q)
zG+$E422xadzpPoD6T@RRKb^Z7a<APk#;&S17bW6GQ2O?@c<Mwdx^d8M+G*5jZray^
zl<L;%RAes$>FxiyId&yCKR=aS%%!)!Fc%*>bt>_}p<obT`yF}Uv)`=-J4<`Y1HAn<
zo1LI=w$s=$dxtMbm&X%2&l}9dTluT;p-d+6LDR;7ZyabIch}1$tsI7@{&Zc2x5*a{
zH|!%WT;lCqpPJ{$P47`85B8l;QBNn3cX9n>XFJWUxwrYbsiq}}Sf$GzB}A=UN+j>l
zr+DdZme_$nB$}1oii@N@;#2c0U*mh^SWUhEh&_w<hncnY*(t$cYh^Y*bm2ncgZ1EK
z=B;{VkMg9goXX3wL%-^F;}-BLuU*-(T&aJb^3>eRZBJa$-XjlltM#k#5&K!^DbVe=
zNmq-9_<f9Z^JYAC;Y@VnkhCzA!o9NWEYuW9IxqZ9UKUEpb|H8DCKn|9u0Z1kZ#3DW
zQExFS)tc|nC@a*WQC>^>-n;Z@B3%T_&B`H2QdSmU3u#zR52!0A34I?d@rLEqx13E{
zeaqsxP7V82mWvW`iZ#8_SBR&w=c60L5^K*B?BOZt9Z0zv(t|*jfcAk@0bnDs$b0d*
zHofqy9;oE)E_&fd5vYKSxq|dJ7viZmC!-rFsV8N%y4p}zH6AA<9R7sakbd}c1Yr0R
z9TxrX@E#m*-2)GWzlygy_rMRrU!07w-}KyRNlVXPkELEtMej+SaEAI!NGtN-B4hR*
zHn0`DH{U$Eoc$a-mn~tH#aBWalhXr8<s@fx<(o&BoJ|^CviM`aw`I@&N1lsBlK-dE
z?jGqN00JNY0w4eaAOHd&00JNY0w4ea`-Z?L{5^H||3C4|@e2e%00ck)1V8`;KmY_l
z00ck)1VEr?2=rtB-!ry^A|L<)AOHd&00JNY0w4eaAOHd&(29V!|NqNYSs(`i5C8!X
z009sH0T2KI5C8!X009u#e*}*Cx{Uk(J{<S~0w4eaAOHd&00JNY0w4eaAOHfrNWi=Q
zkLUk;(Z0|L1V8`;KmY_l00ck)1V8`;KmY_70eAlo93TJ!AOHd&00JNY0w4eaAOHd&
z00O;Bz&ZclyBb0>5C8!X009sH0T2KI5C8!X009sH0qp<b10VnbAOHd&00JNY0w4ea
zAOHd&(E9|i|L=VpLqiY%0T2KI5C8!X009sH0T2KI5WxN)J^%tB00JNY0w4eaAOHd&
z00JNY0=-WF`~TjzF*F1L5C8!X009sH0T2KI5C8!X00C$JpZrPkuR#L@KmY_l00ck)
z1V8`;KmY_l00cmw#|Xr1ecb>5Kf3?_n;z2;>VN<UfB*=900@8p2!H?xfB*=900=||
z7z1hl4<sM}0w4eaAOHd&00JNY0w4eaAOHeAN}&G;RqXlby~yBq2MdF-gAWq_FYzmh
zTk*e(|I7G#yg&A9vDty29Jn04cl2+M{N~}(p;M9991_tthffYAwx+DQzPhT_SJsP4
zNwrj^QKKIk`#QCd%NBB^urNC_lUpEx9D_u>F6XYyFXYJ5^=X!S{t8((jCC@fC#()B
z*UW6*{l$td=H_x!1u~Ug%=zRj?Z#WVJQ))?^b%RA8x^}=lO@sC^wOn#?#5}>RGQ2#
zlKj%#TvIItR?9+mb}=`Wy*$5A7$>7wjJl?;R>`{dfZWxMvTEr@^>yCms$mhm%9|NY
z`)bSOr!Tq!`eWm*wfOL<RATdnz{fgbDtgt_>Xu^FSMA>cfWbT@d!<0R&gK_$3k3$u
z&fqq4ITs`*5Zl=(z5+3gx^>CYt+J-DuVV~}{WCq@Xi!A#?bWfgpP63rsq+5$Ra=#B
zPx@3TX=TmQ+N<K_aXZb7$JLsq=4Jj6REy<kR*gwTi7N~9*EkAAZCGnY-BikYbzLaI
zl)p4TH+@=GgOz5l<{D~^<+5(BX}hYVPQ9eMx|?oLx6rlSRA8yQYQL;jR~zc;4!ghx
z@^<l;Rnt=Hnp#q7hN-hr<_z7gEvQ!Mh_najwu=^xN=2($J1AGZOMQj*RxxTj>a;yL
zm0G#6s#ooRx?OO3iFRCH(P=l@6{SJw>Pjs2(oodYt0nEe?I3!|{`{&4JhS=f+)d)7
zu%XDlld-B=(a6;N+#Czo`FR$B(~DXxb^L|sL%TBJuCzM-?T)WPFO^lve}z|CD#cUj
z<I#;ncCFG_q&0iLzT&IhlPfeAYr&I*x1tr}snM6C8^`QcJXfd1-5<AoZMb5m30FYI
z*jJ@!l$r=lFUL|RhN3jcQ`{>?y`ow);+O8T(eY(p^-?11zdd}$xG+7Z#!@ezh-!8%
zD)Vqwhy8`S`Ym5oZVpzFl#7fpM@!%Q*;s1$Z1g>@dA-K!3K@AfeRY<3K2~E$UQzQK
zitSuWcFjx!N7Wm?x||eN8Q0V9m-f|IDwB?W(=J_Xn3hqYOv{Z*)kfx*yz8scpT=5c
zb^E2vO3PX~{oqbKbt&UmzGwsoFDtDqH_Mm&Ew(6Ux7(B^_-qV*g|~f{>)4dfZd+|`
zyU<PBYOA)n7X=6J-0fKEb1w;}a$+Crfb)GJ&?t|NE?g&Ca;IAVay&J8GP==cYsLeb
zJO3!lwAz5|9bfH%M7sb}Cm<Ibzjli^77cAoZEoy(+s0Ud(8j0&>CIQmaeL8wHn`~J
z3peJ#qV}dmFVEqwbHt+8Tf4EcQfhGNwx1Wfn{(^&;j=F#wiYF9j%SJeg7Y&3pOYkV
zN|0LY8=L}C&Yr?K{WXqL-g-GYi!FrnvmMS(9_iH4s~G!qd*AZ-ns492x3BH@EnXg%
z4ck5NeT%b??QY+)jV+n4E!Lj<@@;A9Za15sCTxpiZ{^4vUnK6n&fB@M!gLMjJpb?P
z>hTEzAOHd&00JNY0w4eaAOHd&00JP;djzom?>(DBBM<-q5C8!X009sH0T2KI5C8!X
z2ok{lKS%_>K>!3m00ck)1V8`;KmY_l00cmw_Xs%q|Kv}4Pd8`;0w4eaAOHd&00JNY
z0w4eaAOHd&U=wiv{y%tt00@8p2!H?xfB*=900@8p2!H?x^ezGC{(tXk2+cqM1V8`;
zKmY_l00ck)1V8`;KmY`s{eSXDU;zRk00JNY0w4eaAOHd&00JNY0wB<X1QJXqcmMz6
z9@G#jfdB}A00@8p2!H?xfB*=900@8p2t?wPfwTVy4iEqV5C8!X009sH0T2KI5C8!X
z0D;~mfc<~(+7_CD00@8p2!H?xfB*=900@8p2!Mb?z}f#Nf0+ECBf}>MfB*=900@8p
z2!H?xfB*=900@A<ekE|!*YQK**Ae=8DDqz9&>IK;SK{08nSmem|56`0^25Uqqu-_C
zy?<?9yB8nM3?;S{tFEuEYW0=%qEgbznx!d5Rk74nll?cfkjoZwq_8kMGm~2&&6x&?
zcwNq2nP13}>D*k77MRZyR$NM*na#VuSdm4VajHP3vWq#NoTc4(E0-r@PLBDdd|^y4
zrOB0r`D<j^FxE}Ge@a=euCu(fS=!j8`MK%SEZY~!L{p6gR^vi;b}=`Wy*$5A7$>7w
zjJl?;R>`{dfZWxMvTEr@^>w@3L^p|P>E$x1Yb#n^s}{A=Xxdk4E<b(I70@4>U%49}
zo_ry()d=NjYIR*R`FmTYJd0a%6V;~lz2(ZQm&tO;9>L|6?F4Vlj1OOYIq~FJDBiMK
zU2UkVn(2ON3)#)pnsZo|y+!S|Ak$_-rD&A2Jp%4DvJ>RX_4x4l;l$RXP~>XES~KdV
z_-Kn;<Y^7NIm6zf7WK=ZxoD3li~4s0dG5XV@Tn7ttwjm4TCEzE(x{bGOS8Y*p(!jD
z%Q=I1m#$B<&^>>}4w)<>OLa+^cZ^yuk(Ihp;SpKHVZC%IpSy9I1?e=IT_pLXxjDBj
z7TVdX`(VuKAruDDtGt;`QFyw>aZWYi)T=c3SQ3H|m*qHlPPf-01kdIda|?xM1mjI3
zKAb-5UmTR{HQ|$G)wGnlrk0eNVd`w!4D(Gde-LG}XNJ@$73wJuy<X*L=OqtisJPdK
zfC%wZFTX^|UVeFA8d8&#xu=l6QHc+qq)S<O(9_td3U_5+Lm)~yBrrC`W(Q@NrCdFQ
z?_MK5eCc@N$*|;+-cF#_ST5`4npQWxZ(%gut%H|M0v6aCgyz{X)Tyu?g4cvR?Yq)F
zn)%)O%pFYrTL~*ZoSRI%e>{}DvvxCW1^B+lFKcTDf7YNayg(6Fv6S0y6=zS@yleCA
z*><=z*t>;6U=Qi^$7SMQt}wB^>Tb1W>AqubRnD@-ZPK@N32q;c9Qs})5&3T9;P>O-
z9r&HT-#z-m;a@v2O$B@VI`qB1<>9ND#MU<@kK+qXh5LcLR94hxS%}No<sV1B86TdX
zOgxFVs@Vl$yR%cbU)rj6P4v#6TaiO@i@?1t@7~5$3CE-C`u*O-M6Dd@X)b;rANaXA
zGwzd5wlaawxXaxe*TL^EF9nGJe4dZ3m7Cj;O8G;}4&aOa`0;b$UKl{AA@(1lG2bvI
zBsh>C-+f49`kBQ0eUcIQ+D`bebcu!2kpv<B->R&{(WV~^=u)jxRzLE69?iLme(Q5t
zE9-Y3$3@-3_WYO6^i78U#@FM+GnvHuhguoFPPg&ZRe3g-C7nz!=amc^YWo&>d&>Ai
zN5A#CaQD{d^*B?wXsWIGx1N6xAHH@z@&1`s=J%G0(t0i+?BoQ2?4A6eb@rZe1y4=C
zH@NcMJA_-6;}fpHZ0i<}zj41qR1njO<P)-_lS9aPJ9$HkyglU#LPx(JaN+KqfY;-A
zfM}|%`RVHYKlQ*}w$1yG?3Lx-ZyQ2amR&FFg$eAjBYD5yqj#{bwAW>RA7Y|b9`sZf
z^`&pbhqEUWKfl^)USaoHrRd@Q>=ZiOj1sxf)kIiEKjMA9j${h@txYAZjNSbbl2+ox
z3f4l~Kyl>YFVp+~HzV;6V`l&F_q`kauaTQa|K5@34t;0vzYl(L=NADst&M^B@a&ny
z)<emEd^>)=wzWOT*_2D75HD(7I_OEw*HN2xJW>(APwn$zdtjr#!)9EpDmi$u8JA_9
z$jf<^Wr<^8GtTpQn{m0ERBG4sMZNxk#D%TK(slx;P(y6UL}R`&)w~(syuZ=cVd4@M
z`P^TYZOaN>Ph4^fdufA@)5P`C#)0_oJLeNmF13n0-Wu9B2m<0x76@c-Hx%5g-e_<|
zd=A}9V|Z2j$Al~2i(%nb=1euNz(3(M501zE8&Pf``HF=vxO;W^#z#QBT?2JJN&@Zd
zrENY=10}T);g`-QTMd-JWp6QA_@$k!;LqJ|l(3xk-4Jh-_zUl)A>5k%W5n&lUW^g9
zGG~mqjdqwn=(_9CM|M+VBeyXaA3pO!V)L5t3$ZK{L)5CTazViIO}SiiWv>+I8BS+W
zmM1)?n|wLvUjvAYJQqE$Ss<oSw=P+_Rn`>tb&MVLsj3w%?KhrY@*Rz&iX048L|oeL
zpoo{t?I~BpyW;&*Qe<;=BSA0jpG<7&twt(a==&x!R}iogJ4x${wQk0CLz8Cm2BllV
z<r1{u4%X1DQol8+WG@CG>$+IHu{Ju4yv_1PoTD~7qZYR*S+zF%?ooF=6}ffqCF_sT
zB((XBjhMYpeA03;AmR!;bghUPND_5oE@f@!;5?h><5ID`BrlrbXUD~vMK0S5R~NOn
zzIW8T7^5>y@pba>(YUSUh;AxHdiZnIs6QBaovf&3Q<GB6T8OY=T1KT=u9b94T`p@h
z#i}=?S}KjQrPu5Px7l^QTA~?8R&=dg8WAm))n%>Bq`E6&F`r7RjdEFJs%u4hf~}<8
zr{W1AGc~ndTvIHqUNNcowlE;8$NqXp<a7GRs-p=u1DZ*zS~~4Wot1sau@sGRqf+&^
z%uZ%m4{EGGBbIjGa=Km8&01My_+0h;RQ))LHq?M@H%uLEi)wLAQ!Il<Cevb_92Y$#
zWQ2)WQbV^BXqr>1q5F&2a>qM5naLw32n&0ST-B=8Ms-!II*??uz0%ok!HTI0o}IkT
z>*jK`8xz})nJCM3;~pI`%ur9k${&}p<JZ-1mlosbl}VAU<v{XRYSU{wsN8k01Y3j|
zdqKy%&|NG$KH?6#=A=CxdqGR>%faUn7Phme%Qgs|p}APAvp^9(GBX_<A=oMlE#iro
z@NwuSn=GA2T>HRq#VE0$%VvQtM<ewC&C=<7Ao?i9UE3jPUsx7p#i&<QI{=nS<l41s
z<N<y0-Z^p2AD@H%@Da^=ek?*s$7(a$R~i!&+N*TttGhFg98@zGI+~770WS5<L%5>W
z*SBMyZB2<E6XZfiKkHUO@@xmdqO#6ptJ*zzsS%8ew#h|X-guU!QZ$r0D~*S6KM$-q
zp1Pa63rnGlyS}pl_@R&FX;7-`#Wl-|Ou^YGIOB}i^|)chpkw2%US#XDE+fi*bXix+
z0KaTwh0JJm9wkB}#4E3eB0;WB^mME4?7}tGTI+4jwuS-5*H=_`XX1;!ueKl?^jP1<
zgI;uI^Huj4w?6^yquI})5kUSfcj=XLD=TzQP-X$bng4wj=(K`$s_(+JoySll!|W<V
z?|!owoGo{=U}bmso#~<d_RhU2;s6h<Fq_hywF<RaSzUEX$!6-bM)9f)wbO{3F0Cf{
z9nLn!5*dVJc{8eCF3qVUfs~!>@AuMV-I>eZ>42^LiH@NzYxn4ClJ3*PY}IK*i7LYl
z#S<kf@heqrtTZNF?PvW<r=3oD7HhEv8WEKX3xDj^LE#s<{GATi%b)1jYmxnJ2M3Eh
zu3l>~|JcT%`yx?YxUIZI+tEa3_aa-DYpIp8K{s99njknlp88s}oehMlqVEE>w6K;*
zXF6TG;xt8-p}>8M0Fj;D<dO!*US56tc%ilx^^+c1WNuw$DfA+2i)i#pt0k7-#regh
zF0kug-^RjgfBH64F+h68-XE--W4naXikmDuct_5x+AaY1zC$w&1AGg*rIp(|a;DQI
zHg6v60yDc?D8-E)TBkbW`lo(Z!$vCX8km)7Qqbay#WlLty~hUB%DFnd1Lb6p$J9Ad
zU8{|^)Fhp(Su3FfjHO6RDt0ZD{^_g=yGPgMB)$C|<o>#Z>LCdX%xTqXRKiTt>7pJZ
z7H$pSG;R;t?(MK2FFbJ-16=KZ7sj=#DAxtpMuXnO?b^ThBUf8PKh{=j&rWf~t|~Ni
zIL<owi2eP)#K8xV<o`_mUh>~0e>Hjc=${<=4i(@90w4eaAOHd&00JPew*<D*iGj$}
z2QTxpxOa8!9--$3b&J&0sz(0^Fx_adUEB!2-0l6rLvQsf9zv!9=T5G3_J&;pa4#(Q
z&ymms=aQv+f7d%XNpGmwJDk^vb8E)E#X_reE-Q;m{jU@6o&ftJ!!*ZvXJ^Z=r#Tmo
z?2YQ{#96O;+p^b*v*B`fOc|;(zwRs)H)&PUH4RVc%!H$ePi;vmA8=uMJNZ2=eKP*n
z<`_CRr>m(a5|_v2T&#<}VnSc9kgTyRr4Kalg09wUdWjxDrBA`I1E);y+jj;Z{rqHn
zATsj{XUqC>U9CS*Y;TbrC+IC|nf`(43cW*0D-hQLJf%m9G{L(vA$lK>$~|_H+)lzL
zTl%Eq<FZdWeis~xj@&a%=B%?(mdD+BXIM$@=!{R-9nU$L9B<6HLyKP&%)H`^U)i>=
zITbkr@WMIQ%+0<?lW0it>mi1`r!dWQhY7v2e)RUo*R-N#A0Km09r<es&B3mmDr@wp
zGCz%e+isn|v+H8+^)B86!jG%lneMPY3_jZURBRxU-FQgHqjTEVJ>ISub$WJ=)i&b9
z6o04f%NWkBGCPT%Bs6(~XCOOGn8yC@o@e4$=xmvHT$x_7yK`coKQePn?v}%vU$Ujq
z^!A+>`}-r4$5!h`qo$P<`C{S2N6+{5N7Bbk^{$(unGYWg9q5moJl3E-;iyR~didzY
zXn!O#MB_!-RMa{>6JDoGX+z8uZ2un}_^Sy0hZhKd00@9UFBAB~$iY}7z46a9`v`<m
z(JYlN`Bk<`q!Xc1QMYmb=;L*L-JbcW7G2*W^scMZQoaYD#PxBp6``r^kH!gZY@(-m
zJDeDCR$=mlZm;u2@zAHz_!7l=R)!giDcXbQLS#k#JV&w(x)AJiFeKybg@bq<?~og?
zW%gQ?(rm+B+J8ES*d0@h$R}7_gK!@Z{b$2#&mI&E9^cu`*-r;a*8^sRe7@zQf}iJi
z@9e#M7X!xr|8Q~c6bA0Aa}zm<&S^Jcen%|dQ18y>eBo}79MM9k{oU;VO?9qBRM=ix
z_JST9c|}8L85nj~xtwks!qB_B&KA$y25PmVmfcPlH+zf5-R(S{sng3H&XDVLMmIQ&
zKB5DMT*Clx`zHFb?mY-CyLzTGa0V^Zvz@!Xti2IuGwWU;a)XyQEwTsbdL?v?w~Sol
p+lgEbwt&s9*bf<oju7`cOsg5mU!`lBE^N4+vk)PpgD!KI|3CS1tR(;d

literal 0
HcmV?d00001


From d2056ceb51b33cf3dfe079f024fcba905609f186 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandes.isaacs@googlemail.com>
Date: Sun, 29 Jan 2023 14:28:49 +0100
Subject: [PATCH 401/412] Updated readme to make and exclude library from
 getting zipped

---
 .gitattributes | 1 +
 README.md      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 92739fe9c..8266c99a5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 constants.py ident export-subst
 /test export-ignore
+/library export-ignore
 cps/static/css/libs/* linguist-vendored
 cps/static/js/libs/* linguist-vendored
diff --git a/README.md b/README.md
index 0138e5a78..1f0eca710 100755
--- a/README.md
+++ b/README.md
@@ -52,7 +52,8 @@ In the Wiki there are also examples for: a [manual installation](https://github.
 
 Point your browser to `http://localhost:8083` or `http://localhost:8083/opds` for the OPDS catalog \
 Login with default admin login \
-Set `Location of Calibre database` to the path of the folder where your Calibre library (metadata.db) lives, push "submit" button \
+If you don't have a Calibre database already, this [database](https://github.com/janeczku/calibre-web/blob/master/library/metadata.db) can be used. **IMPORTATNT** Please move the database out of the calibre-web folder structure, as it will be overwritten during update. \
+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/G-Drive-Setup#using-google-drive-integration) \
 Afterwards you can configure your Calibre-Web instance ([Basic Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#basic-configuration) and [UI Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#ui-configuration) on admin page)  
 

From b9769a09752042bd5c949e4c5c45e09a608388dd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 1 Feb 2023 18:46:23 +0100
Subject: [PATCH 402/412] Revert to latest syncronous jszip version to make
 comic reader work again

---
 cps/static/js/compress/jszip.min.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cps/static/js/compress/jszip.min.js b/cps/static/js/compress/jszip.min.js
index ff4cfd5e8..3b36cd8b2 100644
--- a/cps/static/js/compress/jszip.min.js
+++ b/cps/static/js/compress/jszip.min.js
@@ -1,13 +1,14 @@
 /*!
 
-JSZip v3.10.1 - A JavaScript class for generating and reading zip files
+JSZip - A Javascript class for generating and reading zip files
 <http://stuartk.com/jszip>
 
-(c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown.
+(c) 2009-2014 Stuart Knightley <stuart [at] stuartk.com>
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
 
 JSZip uses the library pako released under the MIT license :
-https://github.com/nodeca/pako/blob/main/LICENSE
+https://github.com/nodeca/pako/blob/master/LICENSE
 */
-
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e<h.length;e++)u(h[e]);return u}({1:[function(e,t,r){"use strict";var d=e("./utils"),c=e("./support"),p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";r.encode=function(e){for(var t,r,n,i,s,a,o,h=[],u=0,l=e.length,f=l,c="string"!==d.getTypeOf(e);u<e.length;)f=l-u,n=c?(t=e[u++],r=u<l?e[u++]:0,u<l?e[u++]:0):(t=e.charCodeAt(u++),r=u<l?e.charCodeAt(u++):0,u<l?e.charCodeAt(u++):0),i=t>>2,s=(3&t)<<4|r>>4,a=1<f?(15&r)<<2|n>>6:64,o=2<f?63&n:64,h.push(p.charAt(i)+p.charAt(s)+p.charAt(a)+p.charAt(o));return h.join("")},r.decode=function(e){var t,r,n,i,s,a,o=0,h=0,u="data:";if(e.substr(0,u.length)===u)throw new Error("Invalid base64 input, it looks like a data url.");var l,f=3*(e=e.replace(/[^A-Za-z0-9+/=]/g,"")).length/4;if(e.charAt(e.length-1)===p.charAt(64)&&f--,e.charAt(e.length-2)===p.charAt(64)&&f--,f%1!=0)throw new Error("Invalid base64 input, bad content length.");for(l=c.uint8array?new Uint8Array(0|f):new Array(0|f);o<e.length;)t=p.indexOf(e.charAt(o++))<<2|(i=p.indexOf(e.charAt(o++)))>>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,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(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.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 i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r<t;r++)n+=String.fromCharCode(255&e),e>>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||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)+c,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(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),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 e=this.bytesWritten,t=0;t<this.dirRecords.length;t++)this.push({data:this.dirRecords[t],meta:{percent:100}});var r=this.bytesWritten-e,n=function(e,t,r,n,i){var s=I.transformTo("string",i(n));return R.CENTRAL_DIRECTORY_END+"\0\0\0\0"+A(e,2)+A(e,2)+A(t,4)+A(r,4)+A(s.length,2)+s}(this.dirRecords.length,r,e,this.zipComment,this.encodeFileName);this.push({data:n,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(e){this._sources.push(e);var t=this;return e.on("data",function(e){t.processChunk(e)}),e.on("end",function(){t.closedSource(t.previous.streamInfo),t._sources.length?t.prepareNextSource():t.end()}),e.on("error",function(e){t.error(e)}),this},s.prototype.resume=function(){return!!i.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(e){var t=this._sources;if(!i.prototype.error.call(this,e))return!1;for(var r=0;r<t.length;r++)try{t[r].error(e)}catch(e){}return!0},s.prototype.lock=function(){i.prototype.lock.call(this);for(var e=this._sources,t=0;t<e.length;t++)e[t].lock()},t.exports=s},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(e,t,r){"use strict";var u=e("../compressions"),n=e("./ZipFileWorker");r.generateWorker=function(e,a,t){var o=new n(a.streamFiles,t,a.platform,a.encodeFileName),h=0;try{e.forEach(function(e,t){h++;var r=function(e,t){var r=e||t,n=u[r];if(!n)throw new Error(r+" is not a valid compression method !");return n}(t.options.compression,a.compression),n=t.options.compressionOptions||a.compressionOptions||{},i=t.dir,s=t.date;t._compressWorker(r,n).withStreamInfo("file",{name:e,dir:i,date:s,comment:t.comment||"",unixPermissions:t.unixPermissions,dosPermissions:t.dosPermissions}).pipe(o)}),o.entriesCount=h}catch(e){o.error(e)}return o}},{"../compressions":3,"./ZipFileWorker":8}],10:[function(e,t,r){"use strict";function n(){if(!(this instanceof n))return new n;if(arguments.length)throw new Error("The constructor with parameters has been removed in JSZip 3.0, please check the upgrade guide.");this.files=Object.create(null),this.comment=null,this.root="",this.clone=function(){var e=new n;for(var t in this)"function"!=typeof this[t]&&(e[t]=this[t]);return e}}(n.prototype=e("./object")).loadAsync=e("./load"),n.support=e("./support"),n.defaults=e("./defaults"),n.version="3.10.1",n.loadAsync=function(e,t){return(new n).loadAsync(e,t)},n.external=e("./external"),t.exports=n},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(e,t,r){"use strict";var u=e("./utils"),i=e("./external"),n=e("./utf8"),s=e("./zipEntries"),a=e("./stream/Crc32Probe"),l=e("./nodejsUtils");function f(n){return new i.Promise(function(e,t){var r=n.decompressed.getContentWorker().pipe(new a);r.on("error",function(e){t(e)}).on("end",function(){r.streamInfo.crc32!==n.decompressed.crc32?t(new Error("Corrupted zip : CRC32 mismatch")):e()}).resume()})}t.exports=function(e,o){var h=this;return o=u.extend(o||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:n.utf8decode}),l.isNode&&l.isStream(e)?i.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file.")):u.prepareContent("the loaded zip file",e,!0,o.optimizedBinaryString,o.base64).then(function(e){var t=new s(o);return t.load(e),t}).then(function(e){var t=[i.Promise.resolve(e)],r=e.files;if(o.checkCRC32)for(var n=0;n<r.length;n++)t.push(f(r[n]));return i.Promise.all(t)}).then(function(e){for(var t=e.shift(),r=t.files,n=0;n<r.length;n++){var i=r[n],s=i.fileNameStr,a=u.resolve(i.fileNameStr);h.file(a,i.decompressed,{binary:!0,optimizedBinaryString:!0,date:i.date,dir:i.dir,comment:i.fileCommentStr.length?i.fileCommentStr:null,unixPermissions:i.unixPermissions,dosPermissions:i.dosPermissions,createFolders:o.createFolders}),i.dir||(h.file(a).unsafeOriginalName=s)}return t.zipComment.length&&(h.comment=t.zipComment),h})}},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../stream/GenericWorker");function s(e,t){i.call(this,"Nodejs stream input adapter for "+e),this._upstreamEnded=!1,this._bindStream(t)}n.inherits(s,i),s.prototype._bindStream=function(e){var t=this;(this._stream=e).pause(),e.on("data",function(e){t.push({data:e,meta:{percent:0}})}).on("error",function(e){t.isPaused?this.generatedError=e:t.error(e)}).on("end",function(){t.isPaused?t._upstreamEnded=!0:t.end()})},s.prototype.pause=function(){return!!i.prototype.pause.call(this)&&(this._stream.pause(),!0)},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(this._upstreamEnded?this.end():this._stream.resume(),!0)},t.exports=s},{"../stream/GenericWorker":28,"../utils":32}],13:[function(e,t,r){"use strict";var i=e("readable-stream").Readable;function n(e,t,r){i.call(this,t),this._helper=e;var n=this;e.on("data",function(e,t){n.push(e)||n._helper.pause(),r&&r(t)}).on("error",function(e){n.emit("error",e)}).on("end",function(){n.push(null)})}e("../utils").inherits(n,i),n.prototype._read=function(){this._helper.resume()},t.exports=n},{"../utils":32,"readable-stream":16}],14:[function(e,t,r){"use strict";t.exports={isNode:"undefined"!=typeof Buffer,newBufferFrom:function(e,t){if(Buffer.from&&Buffer.from!==Uint8Array.from)return Buffer.from(e,t);if("number"==typeof e)throw new Error('The "data" argument must not be a number');return new Buffer(e,t)},allocBuffer:function(e){if(Buffer.alloc)return Buffer.alloc(e);var t=new Buffer(e);return t.fill(0),t},isBuffer:function(e){return Buffer.isBuffer(e)},isStream:function(e){return e&&"function"==typeof e.on&&"function"==typeof e.pause&&"function"==typeof e.resume}}},{}],15:[function(e,t,r){"use strict";function s(e,t,r){var n,i=u.getTypeOf(t),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&&(e=g(e)),s.createFolders&&(n=_(e))&&b.call(this,n,!0);var a="string"===i&&!1===s.binary&&!1===s.base64;r&&void 0!==r.binary||(s.binary=!a),(t instanceof c&&0===t.uncompressedSize||s.dir||!t||0===t.length)&&(s.base64=!1,s.binary=!0,t="",s.compression="STORE",i="string");var o=null;o=t instanceof c||t instanceof l?t:p.isNode&&p.isStream(t)?new m(e,t):u.prepareContent(e,t,s.binary,s.optimizedBinaryString,s.base64);var h=new d(e,o,s);this.files[e]=h}var i=e("./utf8"),u=e("./utils"),l=e("./stream/GenericWorker"),a=e("./stream/StreamHelper"),f=e("./defaults"),c=e("./compressedObject"),d=e("./zipObject"),o=e("./generate"),p=e("./nodejsUtils"),m=e("./nodejs/NodejsStreamInputAdapter"),_=function(e){"/"===e.slice(-1)&&(e=e.substring(0,e.length-1));var t=e.lastIndexOf("/");return 0<t?e.substring(0,t):""},g=function(e){return"/"!==e.slice(-1)&&(e+="/"),e},b=function(e,t){return t=void 0!==t?t:f.createFolders,e=g(e),this.files[e]||s.call(this,e,null,{dir:!0,createFolders:t}),this.files[e]};function h(e){return"[object RegExp]"===Object.prototype.toString.call(e)}var n={load:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},forEach:function(e){var t,r,n;for(t in this.files)n=this.files[t],(r=t.slice(this.root.length,t.length))&&t.slice(0,this.root.length)===this.root&&e(r,n)},filter:function(r){var n=[];return this.forEach(function(e,t){r(e,t)&&n.push(t)}),n},file:function(e,t,r){if(1!==arguments.length)return e=this.root+e,s.call(this,e,t,r),this;if(h(e)){var n=e;return this.filter(function(e,t){return!t.dir&&n.test(e)})}var i=this.files[this.root+e];return i&&!i.dir?i:null},folder:function(r){if(!r)return this;if(h(r))return this.filter(function(e,t){return t.dir&&r.test(e)});var e=this.root+r,t=b.call(this,e),n=this.clone();return n.root=t.name,n},remove:function(r){r=this.root+r;var e=this.files[r];if(e||("/"!==r.slice(-1)&&(r+="/"),e=this.files[r]),e&&!e.dir)delete this.files[r];else for(var t=this.filter(function(e,t){return t.name.slice(0,r.length)===r}),n=0;n<t.length;n++)delete this.files[t[n].name];return this},generate:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},generateInternalStream:function(e){var t,r={};try{if((r=u.extend(e||{},{streamFiles:!1,compression:"STORE",compressionOptions:null,type:"",platform:"DOS",comment:null,mimeType:"application/zip",encodeFileName:i.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 n=r.comment||this.comment||"";t=o.generateWorker(this,r,n)}catch(e){(t=new l("error")).error(e)}return new a(t,r.type||"string",r.mimeType)},generateAsync:function(e,t){return this.generateInternalStream(e).accumulate(t)},generateNodeStream:function(e,t){return(e=e||{}).type||(e.type="nodebuffer"),this.generateInternalStream(e).toNodejsStream(t)}};t.exports=n},{"./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(e,t,r){"use strict";t.exports=e("stream")},{stream:void 0}],17:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e);for(var t=0;t<this.data.length;t++)e[t]=255&e[t]}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data[this.zero+e]},i.prototype.lastIndexOfSignature=function(e){for(var t=e.charCodeAt(0),r=e.charCodeAt(1),n=e.charCodeAt(2),i=e.charCodeAt(3),s=this.length-4;0<=s;--s)if(this.data[s]===t&&this.data[s+1]===r&&this.data[s+2]===n&&this.data[s+3]===i)return s-this.zero;return-1},i.prototype.readAndCheckSignature=function(e){var t=e.charCodeAt(0),r=e.charCodeAt(1),n=e.charCodeAt(2),i=e.charCodeAt(3),s=this.readData(4);return t===s[0]&&r===s[1]&&n===s[2]&&i===s[3]},i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return[];var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],18:[function(e,t,r){"use strict";var n=e("../utils");function i(e){this.data=e,this.length=e.length,this.index=0,this.zero=0}i.prototype={checkOffset:function(e){this.checkIndex(this.index+e)},checkIndex:function(e){if(this.length<this.zero+e||e<0)throw new Error("End of data reached (data length = "+this.length+", asked index = "+e+"). Corrupted zip ?")},setIndex:function(e){this.checkIndex(e),this.index=e},skip:function(e){this.setIndex(this.index+e)},byteAt:function(){},readInt:function(e){var t,r=0;for(this.checkOffset(e),t=this.index+e-1;t>=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,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(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"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}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r<this._listeners[e].length;r++)this._listeners[e][r].call(this,t)},pipe:function(e){return e.registerPrevious(this)},registerPrevious:function(e){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.streamInfo=e.streamInfo,this.mergeStreamInfo(),this.previous=e;var t=this;return e.on("data",function(e){t.processChunk(e)}),e.on("end",function(){t.end()}),e.on("error",function(e){t.error(e)}),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 e=this.isPaused=!1;return this.generatedError&&(this.error(this.generatedError),e=!0),this.previous&&this.previous.resume(),!e},flush:function(){},processChunk:function(e){this.push(e)},withStreamInfo:function(e,t){return this.extraStreamInfo[e]=t,this.mergeStreamInfo(),this},mergeStreamInfo:function(){for(var e in this.extraStreamInfo)Object.prototype.hasOwnProperty.call(this.extraStreamInfo,e)&&(this.streamInfo[e]=this.extraStreamInfo[e])},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 e="Worker "+this.name;return this.previous?this.previous+" -> "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r<t.length;r++)s+=t[r].length;switch(e){case"string":return t.join("");case"array":return Array.prototype.concat.apply([],t);case"uint8array":for(i=new Uint8Array(s),r=0;r<t.length;r++)i.set(t[r],n),n+=t[r].length;return i;case"nodebuffer":return Buffer.concat(t);default:throw new Error("concat : unsupported type '"+e+"'")}}(i,n),a);t(e)}catch(e){r(e)}n=[]}).resume()})}function f(e,t,r){var n=t;switch(t){case"blob":case"arraybuffer":n="uint8array";break;case"base64":n="string"}try{this._internalType=n,this._outputType=t,this._mimeType=r,h.checkSupport(n),this._worker=e.pipe(new i(n)),e.lock()}catch(e){this._worker=new s("error"),this._worker.error(e)}}f.prototype={accumulate:function(e){return l(this,e)},on:function(e,t){var r=this;return"data"===e?this._worker.on(e,function(e){t.call(r,e.data,e.meta)}):this._worker.on(e,function(){h.delay(t,arguments,r)}),this},resume:function(){return h.delay(this._worker.resume,[],this._worker),this},pause:function(){return this._worker.pause(),this},toNodejsStream:function(e){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},e)}},t.exports=f},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(e,t,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 n=new ArrayBuffer(0);try{r.blob=0===new Blob([n],{type:"application/zip"}).size}catch(e){try{var i=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);i.append(n),r.blob=0===i.getBlob("application/zip").size}catch(e){r.blob=!1}}}try{r.nodestream=!!e("readable-stream").Readable}catch(e){r.nodestream=!1}},{"readable-stream":16}],31:[function(e,t,s){"use strict";for(var o=e("./utils"),h=e("./support"),r=e("./nodejsUtils"),n=e("./stream/GenericWorker"),u=new Array(256),i=0;i<256;i++)u[i]=252<=i?6:248<=i?5:240<=i?4:224<=i?3:192<=i?2:1;u[254]=u[254]=1;function a(){n.call(this,"utf-8 decode"),this.leftOver=null}function l(){n.call(this,"utf-8 encode")}s.utf8encode=function(e){return h.nodebuffer?r.newBufferFrom(e,"utf-8"):function(e){var t,r,n,i,s,a=e.length,o=0;for(i=0;i<a;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),o+=r<128?1:r<2048?2:r<65536?3:4;for(t=h.uint8array?new Uint8Array(o):new Array(o),i=s=0;s<o;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),r<128?t[s++]=r:(r<2048?t[s++]=192|r>>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t<s;)if((n=e[t++])<128)a[r++]=n;else if(4<(i=u[n]))a[r++]=65533,t+=i-1;else{for(n&=2===i?31:3===i?15:7;1<i&&t<s;)n=n<<6|63&e[t++],i--;1<i?a[r++]=65533:n<65536?a[r++]=n:(n-=65536,a[r++]=55296|n>>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.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,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r<e.length;++r)t[r]=255&e.charCodeAt(r);return t}e("setimmediate"),a.newBlob=function(t,r){a.checkSupport("blob");try{return new Blob([t],{type:r})}catch(e){try{var n=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);return n.append(t),n.getBlob(r)}catch(e){throw new Error("Bug : can't construct the Blob.")}}};var i={stringifyByChunk:function(e,t,r){var n=[],i=0,s=e.length;if(s<=r)return String.fromCharCode.apply(null,e);for(;i<s;)"array"===t||"nodebuffer"===t?n.push(String.fromCharCode.apply(null,e.slice(i,Math.min(i+r,s)))):n.push(String.fromCharCode.apply(null,e.subarray(i,Math.min(i+r,s)))),i+=r;return n.join("")},stringifyByChar:function(e){for(var t="",r=0;r<e.length;r++)t+=String.fromCharCode(e[r]);return t},applyCanBeUsed:{uint8array:function(){try{return o.uint8array&&1===String.fromCharCode.apply(null,new Uint8Array(1)).length}catch(e){return!1}}(),nodebuffer:function(){try{return o.nodebuffer&&1===String.fromCharCode.apply(null,r.allocBuffer(1)).length}catch(e){return!1}}()}};function s(e){var t=65536,r=a.getTypeOf(e),n=!0;if("uint8array"===r?n=i.applyCanBeUsed.uint8array:"nodebuffer"===r&&(n=i.applyCanBeUsed.nodebuffer),n)for(;1<t;)try{return i.stringifyByChunk(e,r,t)}catch(e){t=Math.floor(t/2)}return i.stringifyByChar(e)}function f(e,t){for(var r=0;r<e.length;r++)t[r]=e[r];return t}a.applyFromCharCode=s;var c={};c.string={string:n,array:function(e){return l(e,new Array(e.length))},arraybuffer:function(e){return c.string.uint8array(e).buffer},uint8array:function(e){return l(e,new Uint8Array(e.length))},nodebuffer:function(e){return l(e,r.allocBuffer(e.length))}},c.array={string:s,array:n,arraybuffer:function(e){return new Uint8Array(e).buffer},uint8array:function(e){return new Uint8Array(e)},nodebuffer:function(e){return r.newBufferFrom(e)}},c.arraybuffer={string:function(e){return s(new Uint8Array(e))},array:function(e){return f(new Uint8Array(e),new Array(e.byteLength))},arraybuffer:n,uint8array:function(e){return new Uint8Array(e)},nodebuffer:function(e){return r.newBufferFrom(new Uint8Array(e))}},c.uint8array={string:s,array:function(e){return f(e,new Array(e.length))},arraybuffer:function(e){return e.buffer},uint8array:n,nodebuffer:function(e){return r.newBufferFrom(e)}},c.nodebuffer={string:s,array:function(e){return f(e,new Array(e.length))},arraybuffer:function(e){return c.nodebuffer.uint8array(e).buffer},uint8array:function(e){return f(e,new Uint8Array(e.length))},nodebuffer:n},a.transformTo=function(e,t){if(t=t||"",!e)return t;a.checkSupport(e);var r=a.getTypeOf(t);return c[r][e](t)},a.resolve=function(e){for(var t=e.split("/"),r=[],n=0;n<t.length;n++){var i=t[n];"."===i||""===i&&0!==n&&n!==t.length-1||(".."===i?r.pop():r.push(i))}return r.join("/")},a.getTypeOf=function(e){return"string"==typeof e?"string":"[object Array]"===Object.prototype.toString.call(e)?"array":o.nodebuffer&&r.isBuffer(e)?"nodebuffer":o.uint8array&&e instanceof Uint8Array?"uint8array":o.arraybuffer&&e instanceof ArrayBuffer?"arraybuffer":void 0},a.checkSupport=function(e){if(!o[e.toLowerCase()])throw new Error(e+" is not supported by this platform")},a.MAX_VALUE_16BITS=65535,a.MAX_VALUE_32BITS=-1,a.pretty=function(e){var t,r,n="";for(r=0;r<(e||"").length;r++)n+="\\x"+((t=e.charCodeAt(r))<16?"0":"")+t.toString(16).toUpperCase();return n},a.delay=function(e,t,r){setImmediate(function(){e.apply(r||null,t||[])})},a.inherits=function(e,t){function r(){}r.prototype=t.prototype,e.prototype=new r},a.extend=function(){var e,t,r={};for(e=0;e<arguments.length;e++)for(t in arguments[e])Object.prototype.hasOwnProperty.call(arguments[e],t)&&void 0===r[t]&&(r[t]=arguments[e][t]);return r},a.prepareContent=function(r,e,n,i,s){return u.Promise.resolve(e).then(function(n){return o.blob&&(n instanceof Blob||-1!==["[object File]","[object Blob]"].indexOf(Object.prototype.toString.call(n)))&&"undefined"!=typeof FileReader?new u.Promise(function(t,r){var e=new FileReader;e.onload=function(e){t(e.target.result)},e.onerror=function(e){r(e.target.error)},e.readAsArrayBuffer(n)}):n}).then(function(e){var t=a.getTypeOf(e);return t?("arraybuffer"===t?e=a.transformTo("uint8array",e):"string"===t&&(s?e=h.decode(e):n&&!0!==i&&(e=function(e){return l(e,o.uint8array?new Uint8Array(e.length):new Array(e.length))}(e))),e):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,setimmediate:54}],33:[function(e,t,r){"use strict";var n=e("./reader/readerFor"),i=e("./utils"),s=e("./signature"),a=e("./zipEntry"),o=e("./support");function h(e){this.files=[],this.loadOptions=e}h.prototype={checkSignature:function(e){if(!this.reader.readAndCheckSignature(e)){this.reader.index-=4;var t=this.reader.readString(4);throw new Error("Corrupted zip or bug: unexpected signature ("+i.pretty(t)+", expected "+i.pretty(e)+")")}},isSignature:function(e,t){var r=this.reader.index;this.reader.setIndex(e);var n=this.reader.readString(4)===t;return this.reader.setIndex(r),n},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 e=this.reader.readData(this.zipCommentLength),t=o.uint8array?"uint8array":"array",r=i.transformTo(t,e);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 e,t,r,n=this.zip64EndOfCentralSize-44;0<n;)e=this.reader.readInt(2),t=this.reader.readInt(4),r=this.reader.readData(t),this.zip64ExtensibleData[e]={id:e,length:t,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 e,t;for(e=0;e<this.files.length;e++)t=this.files[e],this.reader.setIndex(t.localHeaderOffset),this.checkSignature(s.LOCAL_FILE_HEADER),t.readLocalPart(this.reader),t.handleUTF8(),t.processAttributes()},readCentralDir:function(){var e;for(this.reader.setIndex(this.centralDirOffset);this.reader.readAndCheckSignature(s.CENTRAL_FILE_HEADER);)(e=new a({zip64:this.zip64},this.loadOptions)).readCentralPart(this.reader),this.files.push(e);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 e=this.reader.lastIndexOfSignature(s.CENTRAL_DIRECTORY_END);if(e<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(e);var t=e;if(this.checkSignature(s.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===i.MAX_VALUE_16BITS||this.diskWithCentralDirStart===i.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===i.MAX_VALUE_16BITS||this.centralDirRecords===i.MAX_VALUE_16BITS||this.centralDirSize===i.MAX_VALUE_32BITS||this.centralDirOffset===i.MAX_VALUE_32BITS){if(this.zip64=!0,(e=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(e),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 n=t-r;if(0<n)this.isSignature(t,s.CENTRAL_FILE_HEADER)||(this.reader.zero=n);else if(n<0)throw new Error("Corrupted zip: missing "+Math.abs(n)+" bytes.")},prepareReader:function(e){this.reader=n(e)},load:function(e){this.prepareReader(e),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},t.exports=h},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utils":32,"./zipEntry":34}],34:[function(e,t,r){"use strict";var n=e("./reader/readerFor"),s=e("./utils"),i=e("./compressedObject"),a=e("./crc32"),o=e("./utf8"),h=e("./compressions"),u=e("./support");function l(e,t){this.options=e,this.loadOptions=t}l.prototype={isEncrypted:function(){return 1==(1&this.bitFlag)},useUTF8:function(){return 2048==(2048&this.bitFlag)},readLocalPart:function(e){var t,r;if(e.skip(22),this.fileNameLength=e.readInt(2),r=e.readInt(2),this.fileName=e.readData(this.fileNameLength),e.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===(t=function(e){for(var t in h)if(Object.prototype.hasOwnProperty.call(h,t)&&h[t].magic===e)return h[t];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 i(this.compressedSize,this.uncompressedSize,this.crc32,t,e.readData(this.compressedSize))},readCentralPart:function(e){this.versionMadeBy=e.readInt(2),e.skip(2),this.bitFlag=e.readInt(2),this.compressionMethod=e.readString(2),this.date=e.readDate(),this.crc32=e.readInt(4),this.compressedSize=e.readInt(4),this.uncompressedSize=e.readInt(4);var t=e.readInt(2);if(this.extraFieldsLength=e.readInt(2),this.fileCommentLength=e.readInt(2),this.diskNumberStart=e.readInt(2),this.internalFileAttributes=e.readInt(2),this.externalFileAttributes=e.readInt(4),this.localHeaderOffset=e.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");e.skip(t),this.readExtraFields(e),this.parseZIP64ExtraField(e),this.fileComment=e.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var e=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(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(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4<i;)t=e.readInt(2),r=e.readInt(2),n=e.readData(r),this.extraFields[t]={id:t,length:r,value:n};e.setIndex(i)},handleUTF8:function(){var e=u.uint8array?"uint8array":"array";if(this.useUTF8())this.fileNameStr=o.utf8decode(this.fileName),this.fileCommentStr=o.utf8decode(this.fileComment);else{var t=this.findExtraFieldUnicodePath();if(null!==t)this.fileNameStr=t;else{var r=s.transformTo(e,this.fileName);this.fileNameStr=this.loadOptions.decodeFileName(r)}var n=this.findExtraFieldUnicodeComment();if(null!==n)this.fileCommentStr=n;else{var i=s.transformTo(e,this.fileComment);this.fileCommentStr=this.loadOptions.decodeFileName(i)}}},findExtraFieldUnicodePath:function(){var e=this.extraFields[28789];if(e){var t=n(e.value);return 1!==t.readInt(1)?null:a(this.fileName)!==t.readInt(4)?null:o.utf8decode(t.readData(e.length-5))}return null},findExtraFieldUnicodeComment:function(){var e=this.extraFields[25461];if(e){var t=n(e.value);return 1!==t.readInt(1)?null:a(this.fileComment)!==t.readInt(4)?null:o.utf8decode(t.readData(e.length-5))}return null}},t.exports=l},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(e,t,r){"use strict";function n(e,t,r){this.name=e,this.dir=r.dir,this.date=r.date,this.comment=r.comment,this.unixPermissions=r.unixPermissions,this.dosPermissions=r.dosPermissions,this._data=t,this._dataBinary=r.binary,this.options={compression:r.compression,compressionOptions:r.compressionOptions}}var s=e("./stream/StreamHelper"),i=e("./stream/DataWorker"),a=e("./utf8"),o=e("./compressedObject"),h=e("./stream/GenericWorker");n.prototype={internalStream:function(e){var t=null,r="string";try{if(!e)throw new Error("No output type specified.");var n="string"===(r=e.toLowerCase())||"text"===r;"binarystring"!==r&&"text"!==r||(r="string"),t=this._decompressWorker();var i=!this._dataBinary;i&&!n&&(t=t.pipe(new a.Utf8EncodeWorker)),!i&&n&&(t=t.pipe(new a.Utf8DecodeWorker))}catch(e){(t=new h("error")).error(e)}return new s(t,r,"")},async:function(e,t){return this.internalStream(e).accumulate(t)},nodeStream:function(e,t){return this.internalStream(e||"nodebuffer").toNodejsStream(t)},_compressWorker:function(e,t){if(this._data instanceof o&&this._data.compression.magic===e.magic)return this._data.getCompressedWorker();var r=this._decompressWorker();return this._dataBinary||(r=r.pipe(new a.Utf8EncodeWorker)),o.createWorkerFrom(r,e,t)},_decompressWorker:function(){return this._data instanceof o?this._data.getContentWorker():this._data instanceof h?this._data:new i(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++)n.prototype[u[f]]=l;t.exports=n},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(e,l,t){(function(t){"use strict";var r,n,e=t.MutationObserver||t.WebKitMutationObserver;if(e){var i=0,s=new e(u),a=t.document.createTextNode("");s.observe(a,{characterData:!0}),r=function(){a.data=i=++i%2}}else if(t.setImmediate||void 0===t.MessageChannel)r="document"in t&&"onreadystatechange"in t.document.createElement("script")?function(){var e=t.document.createElement("script");e.onreadystatechange=function(){u(),e.onreadystatechange=null,e.parentNode.removeChild(e),e=null},t.document.documentElement.appendChild(e)}:function(){setTimeout(u,0)};else{var o=new t.MessageChannel;o.port1.onmessage=u,r=function(){o.port2.postMessage(0)}}var h=[];function u(){var e,t;n=!0;for(var r=h.length;r;){for(t=h,h=[],e=-1;++e<r;)t[e]();r=h.length}n=!1}l.exports=function(e){1!==h.push(e)||n||r()}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],37:[function(e,t,r){"use strict";var i=e("immediate");function u(){}var l={},s=["REJECTED"],a=["FULFILLED"],n=["PENDING"];function o(e){if("function"!=typeof e)throw new TypeError("resolver must be a function");this.state=n,this.queue=[],this.outcome=void 0,e!==u&&d(this,e)}function h(e,t,r){this.promise=e,"function"==typeof t&&(this.onFulfilled=t,this.callFulfilled=this.otherCallFulfilled),"function"==typeof r&&(this.onRejected=r,this.callRejected=this.otherCallRejected)}function f(t,r,n){i(function(){var e;try{e=r(n)}catch(e){return l.reject(t,e)}e===t?l.reject(t,new TypeError("Cannot resolve promise with itself")):l.resolve(t,e)})}function c(e){var t=e&&e.then;if(e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof t)return function(){t.apply(e,arguments)}}function d(t,e){var r=!1;function n(e){r||(r=!0,l.reject(t,e))}function i(e){r||(r=!0,l.resolve(t,e))}var s=p(function(){e(i,n)});"error"===s.status&&n(s.value)}function p(e,t){var r={};try{r.value=e(t),r.status="success"}catch(e){r.status="error",r.value=e}return r}(t.exports=o).prototype.finally=function(t){if("function"!=typeof t)return this;var r=this.constructor;return this.then(function(e){return r.resolve(t()).then(function(){return e})},function(e){return r.resolve(t()).then(function(){throw e})})},o.prototype.catch=function(e){return this.then(null,e)},o.prototype.then=function(e,t){if("function"!=typeof e&&this.state===a||"function"!=typeof t&&this.state===s)return this;var r=new this.constructor(u);this.state!==n?f(r,this.state===a?e:t,this.outcome):this.queue.push(new h(r,e,t));return r},h.prototype.callFulfilled=function(e){l.resolve(this.promise,e)},h.prototype.otherCallFulfilled=function(e){f(this.promise,this.onFulfilled,e)},h.prototype.callRejected=function(e){l.reject(this.promise,e)},h.prototype.otherCallRejected=function(e){f(this.promise,this.onRejected,e)},l.resolve=function(e,t){var r=p(c,t);if("error"===r.status)return l.reject(e,r.value);var n=r.value;if(n)d(e,n);else{e.state=a,e.outcome=t;for(var i=-1,s=e.queue.length;++i<s;)e.queue[i].callFulfilled(t)}return e},l.reject=function(e,t){e.state=s,e.outcome=t;for(var r=-1,n=e.queue.length;++r<n;)e.queue[r].callRejected(t);return e},o.resolve=function(e){if(e instanceof this)return e;return l.resolve(new this(u),e)},o.reject=function(e){var t=new this(u);return l.reject(t,e)},o.all=function(e){var r=this;if("[object Array]"!==Object.prototype.toString.call(e))return this.reject(new TypeError("must be an array"));var n=e.length,i=!1;if(!n)return this.resolve([]);var s=new Array(n),a=0,t=-1,o=new this(u);for(;++t<n;)h(e[t],t);return o;function h(e,t){r.resolve(e).then(function(e){s[t]=e,++a!==n||i||(i=!0,l.resolve(o,s))},function(e){i||(i=!0,l.reject(o,e))})}},o.race=function(e){var t=this;if("[object Array]"!==Object.prototype.toString.call(e))return this.reject(new TypeError("must be an array"));var r=e.length,n=!1;if(!r)return this.resolve([]);var i=-1,s=new this(u);for(;++i<r;)a=e[i],t.resolve(a).then(function(e){n||(n=!0,l.resolve(s,e))},function(e){n||(n=!0,l.reject(s,e))});var a;return s}},{immediate:36}],38:[function(e,t,r){"use strict";var n={};(0,e("./lib/utils/common").assign)(n,e("./lib/deflate"),e("./lib/inflate"),e("./lib/zlib/constants")),t.exports=n},{"./lib/deflate":39,"./lib/inflate":40,"./lib/utils/common":41,"./lib/zlib/constants":44}],39:[function(e,t,r){"use strict";var a=e("./zlib/deflate"),o=e("./utils/common"),h=e("./utils/strings"),i=e("./zlib/messages"),s=e("./zlib/zstream"),u=Object.prototype.toString,l=0,f=-1,c=0,d=8;function p(e){if(!(this instanceof p))return new p(e);this.options=o.assign({level:f,method:d,chunkSize:16384,windowBits:15,memLevel:8,strategy:c,to:""},e||{});var t=this.options;t.raw&&0<t.windowBits?t.windowBits=-t.windowBits:t.gzip&&0<t.windowBits&&t.windowBits<16&&(t.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,t.level,t.method,t.windowBits,t.memLevel,t.strategy);if(r!==l)throw new Error(i[r]);if(t.header&&a.deflateSetHeader(this.strm,t.header),t.dictionary){var n;if(n="string"==typeof t.dictionary?h.string2buf(t.dictionary):"[object ArrayBuffer]"===u.call(t.dictionary)?new Uint8Array(t.dictionary):t.dictionary,(r=a.deflateSetDictionary(this.strm,n))!==l)throw new Error(i[r]);this._dict_set=!0}}function n(e,t){var r=new p(t);if(r.push(e,!0),r.err)throw r.msg||i[r.err];return r.result}p.prototype.push=function(e,t){var r,n,i=this.strm,s=this.options.chunkSize;if(this.ended)return!1;n=t===~~t?t:!0===t?4:0,"string"==typeof e?i.input=h.string2buf(e):"[object ArrayBuffer]"===u.call(e)?i.input=new Uint8Array(e):i.input=e,i.next_in=0,i.avail_in=i.input.length;do{if(0===i.avail_out&&(i.output=new o.Buf8(s),i.next_out=0,i.avail_out=s),1!==(r=a.deflate(i,n))&&r!==l)return this.onEnd(r),!(this.ended=!0);0!==i.avail_out&&(0!==i.avail_in||4!==n&&2!==n)||("string"===this.options.to?this.onData(h.buf2binstring(o.shrinkBuf(i.output,i.next_out))):this.onData(o.shrinkBuf(i.output,i.next_out)))}while((0<i.avail_in||0===i.avail_out)&&1!==r);return 4===n?(r=a.deflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===l):2!==n||(this.onEnd(l),!(i.avail_out=0))},p.prototype.onData=function(e){this.chunks.push(e)},p.prototype.onEnd=function(e){e===l&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=o.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},r.Deflate=p,r.deflate=n,r.deflateRaw=function(e,t){return(t=t||{}).raw=!0,n(e,t)},r.gzip=function(e,t){return(t=t||{}).gzip=!0,n(e,t)}},{"./utils/common":41,"./utils/strings":42,"./zlib/deflate":46,"./zlib/messages":51,"./zlib/zstream":53}],40:[function(e,t,r){"use strict";var c=e("./zlib/inflate"),d=e("./utils/common"),p=e("./utils/strings"),m=e("./zlib/constants"),n=e("./zlib/messages"),i=e("./zlib/zstream"),s=e("./zlib/gzheader"),_=Object.prototype.toString;function a(e){if(!(this instanceof a))return new a(e);this.options=d.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;t.raw&&0<=t.windowBits&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(0<=t.windowBits&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),15<t.windowBits&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new i,this.strm.avail_out=0;var r=c.inflateInit2(this.strm,t.windowBits);if(r!==m.Z_OK)throw new Error(n[r]);this.header=new s,c.inflateGetHeader(this.strm,this.header)}function o(e,t){var r=new a(t);if(r.push(e,!0),r.err)throw r.msg||n[r.err];return r.result}a.prototype.push=function(e,t){var r,n,i,s,a,o,h=this.strm,u=this.options.chunkSize,l=this.options.dictionary,f=!1;if(this.ended)return!1;n=t===~~t?t:!0===t?m.Z_FINISH:m.Z_NO_FLUSH,"string"==typeof e?h.input=p.binstring2buf(e):"[object ArrayBuffer]"===_.call(e)?h.input=new Uint8Array(e):h.input=e,h.next_in=0,h.avail_in=h.input.length;do{if(0===h.avail_out&&(h.output=new d.Buf8(u),h.next_out=0,h.avail_out=u),(r=c.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=c.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||n!==m.Z_FINISH&&n!==m.Z_SYNC_FLUSH)||("string"===this.options.to?(i=p.utf8border(h.output,h.next_out),s=h.next_out-i,a=p.buf2string(h.output,i),h.next_out=s,h.avail_out=u-s,s&&d.arraySet(h.output,h.output,i,s,0),this.onData(a)):this.onData(d.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&&(n=m.Z_FINISH),n===m.Z_FINISH?(r=c.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===m.Z_OK):n!==m.Z_SYNC_FLUSH||(this.onEnd(m.Z_OK),!(h.avail_out=0))},a.prototype.onData=function(e){this.chunks.push(e)},a.prototype.onEnd=function(e){e===m.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=d.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},r.Inflate=a,r.inflate=o,r.inflateRaw=function(e,t){return(t=t||{}).raw=!0,o(e,t)},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(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;r.assign=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var r=t.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var n in r)r.hasOwnProperty(n)&&(e[n]=r[n])}}return e},r.shrinkBuf=function(e,t){return e.length===t?e:e.subarray?e.subarray(0,t):(e.length=t,e)};var i={arraySet:function(e,t,r,n,i){if(t.subarray&&e.subarray)e.set(t.subarray(r,r+n),i);else for(var s=0;s<n;s++)e[i+s]=t[r+s]},flattenChunks:function(e){var t,r,n,i,s,a;for(t=n=0,r=e.length;t<r;t++)n+=e[t].length;for(a=new Uint8Array(n),t=i=0,r=e.length;t<r;t++)s=e[t],a.set(s,i),i+=s.length;return a}},s={arraySet:function(e,t,r,n,i){for(var s=0;s<n;s++)e[i+s]=t[r+s]},flattenChunks:function(e){return[].concat.apply([],e)}};r.setTyped=function(e){e?(r.Buf8=Uint8Array,r.Buf16=Uint16Array,r.Buf32=Int32Array,r.assign(r,i)):(r.Buf8=Array,r.Buf16=Array,r.Buf32=Array,r.assign(r,s))},r.setTyped(n)},{}],42:[function(e,t,r){"use strict";var h=e("./common"),i=!0,s=!0;try{String.fromCharCode.apply(null,[0])}catch(e){i=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){s=!1}for(var u=new h.Buf8(256),n=0;n<256;n++)u[n]=252<=n?6:248<=n?5:240<=n?4:224<=n?3:192<=n?2:1;function l(e,t){if(t<65537&&(e.subarray&&s||!e.subarray&&i))return String.fromCharCode.apply(null,h.shrinkBuf(e,t));for(var r="",n=0;n<t;n++)r+=String.fromCharCode(e[n]);return r}u[254]=u[254]=1,r.string2buf=function(e){var t,r,n,i,s,a=e.length,o=0;for(i=0;i<a;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),o+=r<128?1:r<2048?2:r<65536?3:4;for(t=new h.Buf8(o),i=s=0;s<o;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),r<128?t[s++]=r:(r<2048?t[s++]=192|r>>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r<n;r++)t[r]=e.charCodeAt(r);return t},r.buf2string=function(e,t){var r,n,i,s,a=t||e.length,o=new Array(2*a);for(r=n=0;r<a;)if((i=e[r++])<128)o[n++]=i;else if(4<(s=u[i]))o[n++]=65533,r+=s-1;else{for(i&=2===s?31:3===s?15:7;1<s&&r<a;)i=i<<6|63&e[r++],s--;1<s?o[n++]=65533:i<65536?o[n++]=i:(i-=65536,o[n++]=55296|i>>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3<r?2e3:r;s=s+(i=i+t[n++]|0)|0,--a;);i%=65521,s%=65521}return i|s<<16|0}},{}],44:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=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(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4<e?9:0)}function D(e){for(var t=e.length;0<=--t;)e[t]=0}function F(e){var t=e.state,r=t.pending;r>e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&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<c);if(n=S-(c-s),s=c-S,a<n){if(e.match_start=t,o<=(a=n))break;d=u[s+a-1],p=u[s+a]}}}while((t=f[t&l])>h&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u<l&&(l=u),r=0===l?0:(a.avail_in-=l,c.arraySet(o,a.input,a.next_in,l,h),1===a.state.wrap?a.adler=d(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),e.lookahead+=r,e.lookahead+e.insert>=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<<e.hash_shift^e.window[s+1])&e.hash_mask;e.insert&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[s+x-1])&e.hash_mask,e.prev[s&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=s,s++,e.insert--,!(e.lookahead+e.insert<x)););}while(e.lookahead<z&&0!==e.strm.avail_in)}function Z(e,t){for(var r,n;;){if(e.lookahead<z){if(j(e),e.lookahead<z&&t===l)return A;if(0===e.lookahead)break}if(r=0,e.lookahead>=x&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),0!==r&&e.strstart-r<=e.w_size-z&&(e.match_length=L(e,r)),e.match_length>=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart,0!=--e.match_length;);e.strstart++}else e.strstart+=e.match_length,e.match_length=0,e.ins_h=e.window[e.strstart],e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+1])&e.hash_mask;else n=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++;if(n&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=e.strstart<x-1?e.strstart:x-1,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}function W(e,t){for(var r,n,i;;){if(e.lookahead<z){if(j(e),e.lookahead<z&&t===l)return A;if(0===e.lookahead)break}if(r=0,e.lookahead>=x&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),e.prev_length=e.match_length,e.prev_match=e.match_start,e.match_length=x-1,0!==r&&e.prev_length<e.max_lazy_match&&e.strstart-r<=e.w_size-z&&(e.match_length=L(e,r),e.match_length<=5&&(1===e.strategy||e.match_length===x&&4096<e.strstart-e.match_start)&&(e.match_length=x-1)),e.prev_length>=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),0!=--e.prev_length;);if(e.match_available=0,e.match_length=x-1,e.strstart++,n&&(N(e,!1),0===e.strm.avail_out))return A}else if(e.match_available){if((n=u._tr_tally(e,0,e.window[e.strstart-1]))&&N(e,!1),e.strstart++,e.lookahead--,0===e.strm.avail_out)return A}else e.match_available=1,e.strstart++,e.lookahead--}return e.match_available&&(n=u._tr_tally(e,0,e.window[e.strstart-1]),e.match_available=0),e.insert=e.strstart<x-1?e.strstart:x-1,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}function M(e,t,r,n,i){this.good_length=e,this.max_lazy=t,this.nice_length=r,this.max_chain=n,this.func=i}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 c.Buf16(2*w),this.dyn_dtree=new c.Buf16(2*(2*a+1)),this.bl_tree=new c.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 c.Buf16(k+1),this.heap=new c.Buf16(2*s+1),D(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new c.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(e){var t;return e&&e.state?(e.total_in=e.total_out=0,e.data_type=i,(t=e.state).pending=0,t.pending_out=0,t.wrap<0&&(t.wrap=-t.wrap),t.status=t.wrap?C:E,e.adler=2===t.wrap?0:1,t.last_flush=l,u._tr_init(t),m):R(e,_)}function K(e){var t=G(e);return t===m&&function(e){e.window_size=2*e.w_size,D(e.head),e.max_lazy_match=h[e.level].max_lazy,e.good_match=h[e.level].good_length,e.nice_match=h[e.level].nice_length,e.max_chain_length=h[e.level].max_chain,e.strstart=0,e.block_start=0,e.lookahead=0,e.insert=0,e.match_length=e.prev_length=x-1,e.match_available=0,e.ins_h=0}(e.state),t}function Y(e,t,r,n,i,s){if(!e)return _;var a=1;if(t===g&&(t=6),n<0?(a=0,n=-n):15<n&&(a=2,n-=16),i<1||y<i||r!==v||n<8||15<n||t<0||9<t||s<0||b<s)return R(e,_);8===n&&(n=9);var o=new H;return(e.state=o).strm=e,o.wrap=a,o.gzhead=null,o.w_bits=n,o.w_size=1<<o.w_bits,o.w_mask=o.w_size-1,o.hash_bits=i+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 c.Buf8(2*o.w_size),o.head=new c.Buf16(o.hash_size),o.prev=new c.Buf16(o.w_size),o.lit_bufsize=1<<i+6,o.pending_buf_size=4*o.lit_bufsize,o.pending_buf=new c.Buf8(o.pending_buf_size),o.d_buf=1*o.lit_bufsize,o.l_buf=3*o.lit_bufsize,o.level=t,o.strategy=s,o.method=r,K(e)}h=[new M(0,0,0,0,function(e,t){var r=65535;for(r>e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.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(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5<t||t<0)return e?R(e,_):_;if(n=e.state,!e.output||!e.input&&0!==e.avail_in||666===n.status&&t!==f)return R(e,0===e.avail_out?-5:_);if(n.strm=e,r=n.last_flush,n.last_flush=t,n.status===C)if(2===n.wrap)e.adler=0,U(n,31),U(n,139),U(n,8),n.gzhead?(U(n,(n.gzhead.text?1:0)+(n.gzhead.hcrc?2:0)+(n.gzhead.extra?4:0)+(n.gzhead.name?8:0)+(n.gzhead.comment?16:0)),U(n,255&n.gzhead.time),U(n,n.gzhead.time>>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindex<n.gzhead.name.length?255&n.gzhead.name.charCodeAt(n.gzindex++):0,U(n,s)}while(0!==s);n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindex<n.gzhead.comment.length?255&n.gzhead.comment.charCodeAt(n.gzindex++):0,U(n,s)}while(0!==s);n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0<e.strstart&&(n=a[i=e.strstart-1])===a[++i]&&n===a[++i]&&n===a[++i]){s=e.strstart+S;do{}while(n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&i<s);e.match_length=S-(s-i),e.match_length>e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0<n.wrap&&(n.wrap=-n.wrap),0!==n.pending?m:1)},r.deflateEnd=function(e){var t;return e&&e.state?(t=e.state.status)!==C&&69!==t&&73!==t&&91!==t&&103!==t&&t!==E&&666!==t?R(e,_):(e.state=null,t===E?R(e,-3):m):_},r.deflateSetDictionary=function(e,t){var r,n,i,s,a,o,h,u,l=t.length;if(!e||!e.state)return _;if(2===(s=(r=e.state).wrap)||1===s&&r.status!==C||r.lookahead)return _;for(1===s&&(e.adler=d(e.adler,t,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 c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<<r.hash_shift^r.window[n+x-1])&r.hash_mask,r.prev[n&r.w_mask]=r.head[r.ins_h],r.head[r.ins_h]=n,n++,--i;);r.strstart=n,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,e.next_in=o,e.input=h,e.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(e,t,r){"use strict";t.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(e,t,r){"use strict";t.exports=function(e,t){var r,n,i,s,a,o,h,u,l,f,c,d,p,m,_,g,b,v,y,w,k,x,S,z,C;r=e.state,n=e.next_in,z=e.input,i=n+(e.avail_in-5),s=e.next_out,C=e.output,a=s-(t-e.avail_out),o=s+(e.avail_out-257),h=r.dmax,u=r.wsize,l=r.whave,f=r.wnext,c=r.window,d=r.hold,p=r.bits,m=r.lencode,_=r.distcode,g=(1<<r.lenbits)-1,b=(1<<r.distbits)-1;e:do{p<15&&(d+=z[n++]<<p,p+=8,d+=z[n++]<<p,p+=8),v=m[d&g];t:for(;;){if(d>>>=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)+(d&(1<<y)-1)];continue t}if(32&y){r.mode=12;break e}e.msg="invalid literal/length code",r.mode=30;break e}w=65535&v,(y&=15)&&(p<y&&(d+=z[n++]<<p,p+=8),w+=d&(1<<y)-1,d>>>=y,p-=y),p<15&&(d+=z[n++]<<p,p+=8,d+=z[n++]<<p,p+=8),v=_[d&b];r:for(;;){if(d>>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<<y)-1)];continue r}e.msg="invalid distance code",r.mode=30;break e}if(k=65535&v,p<(y&=15)&&(d+=z[n++]<<p,(p+=8)<y&&(d+=z[n++]<<p,p+=8)),h<(k+=d&(1<<y)-1)){e.msg="invalid distance too far back",r.mode=30;break e}if(d>>>=y,p-=y,(y=s-a)<k){if(l<(y=k-y)&&r.sane){e.msg="invalid distance too far back",r.mode=30;break e}if(S=c,(x=0)===f){if(x+=u-y,y<w){for(w-=y;C[s++]=c[x++],--y;);x=s-k,S=C}}else if(f<y){if(x+=u+f-y,(y-=f)<w){for(w-=y;C[s++]=c[x++],--y;);if(x=0,f<w){for(w-=y=f;C[s++]=c[x++],--y;);x=s-k,S=C}}}else if(x+=f-y,y<w){for(w-=y;C[s++]=c[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(n<i&&s<o);n-=w=p>>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n<i?i-n+5:5-(n-i),e.avail_out=s<o?o-s+257:257-(s-o),r.hold=d,r.bits=p}},{}],49:[function(e,t,r){"use strict";var I=e("../utils/common"),O=e("./adler32"),B=e("./crc32"),R=e("./inffast"),T=e("./inftrees"),D=1,F=2,N=0,U=-2,P=1,n=852,i=592;function L(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<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(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15<t)?U:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=r,n.wbits=t,o(e))):U}function u(e,t){var r,n;return e?(n=new s,(e.state=n).window=null,(r=h(e,t))!==N&&(e.state=null),r):U}var l,f,c=!0;function j(e){if(c){var t;for(l=new I.Buf32(512),f=new I.Buf32(32),t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(T(D,e.lens,0,288,l,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;T(F,e.lens,0,32,f,0,e.work,{bits:5}),c=!1}e.lencode=l,e.lenbits=9,e.distcode=f,e.distbits=5}function Z(e,t,r,n){var i,s=e.state;return null===s.window&&(s.wsize=1<<s.wbits,s.wnext=0,s.whave=0,s.window=new I.Buf8(s.wsize)),n>=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave<s.wsize&&(s.whave+=i))),0}r.inflateReset=o,r.inflateReset2=h,r.inflateResetKeep=a,r.inflateInit=function(e){return u(e,15)},r.inflateInit2=u,r.inflate=function(e,t){var r,n,i,s,a,o,h,u,l,f,c,d,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(!e||!e.state||!e.output||!e.input&&0!==e.avail_in)return U;12===(r=e.state).mode&&(r.mode=13),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,u=r.hold,l=r.bits,f=o,c=h,x=N;e:for(;;)switch(r.mode){case P:if(0===r.wrap){r.mode=13;break}for(;l<16;){if(0===o)break e;o--,u+=n[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){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.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){e.msg="invalid window size",r.mode=30;break}r.dmax=1<<k,e.adler=r.check=1,r.mode=512&u?10:12,l=u=0;break;case 2:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}if(r.flags=u,8!=(255&r.flags)){e.msg="unknown compression method",r.mode=30;break}if(57344&r.flags){e.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 e;o--,u+=n[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 e;o--,u+=n[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 e;o--,u+=n[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<(d=r.length)&&(d=o),d&&(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,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d<o;);if(512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,k)break e}else r.head&&(r.head.name=null);r.length=0,r.mode=8;case 8:if(4096&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.comment+=String.fromCharCode(k)),k&&d<o;);if(512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,k)break e}else r.head&&(r.head.comment=null);r.mode=9;case 9:if(512&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}if(u!==(65535&r.check)){e.msg="header crc mismatch",r.mode=30;break}l=u=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}e.adler=r.check=L(u),l=u=0,r.mode=11;case 11:if(0===r.havedict)return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,2;e.adler=r.check=1,r.mode=12;case 12:if(5===t||6===t)break e;case 13:if(r.last){u>>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[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!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.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 e;o--,u+=n[s++]<<l,l+=8}if((65535&u)!=(u>>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o<d&&(d=o),h<d&&(d=h),0===d)break e;I.arraySet(i,n,s,d,a),o-=d,s+=d,h-=d,a+=d,r.length-=d;break}r.mode=12;break;case 17:for(;l<14;){if(0===o)break e;o--,u+=n[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){e.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 e;o--,u+=n[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){e.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 e;o--,u+=n[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 e;o--,u+=n[s++]<<l,l+=8}if(u>>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l<z;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}l-=_,k=0,d=3+(7&(u>>>=_)),u>>>=3,l-=3}else{for(z=_+7;l<z;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}l-=_,k=0,d=11+(127&(u>>>=_)),u>>>=7,l-=7}if(r.have+d>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=30;break}for(;d--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){e.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){e.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){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=h){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,R(e,c),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.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 e;o--,u+=n[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 e;o--,u+=n[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){e.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 e;o--,u+=n[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 e;o--,u+=n[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 e;o--,u+=n[s++]<<l,l+=8}u>>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){e.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 e;o--,u+=n[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){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break e;if(d=c-h,r.offset>d){if((d=r.offset-d)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=30;break}p=d>r.wnext?(d-=r.wnext,r.wsize-d):r.wnext-d,d>r.length&&(d=r.length),m=r.window}else m=i,p=a-r.offset,d=r.length;for(h<d&&(d=h),h-=d,r.length-=d;i[a++]=m[p++],--d;);0===r.length&&(r.mode=21);break;case 26:if(0===h)break e;i[a++]=r.length,h--,r.mode=21;break;case 27:if(r.wrap){for(;l<32;){if(0===o)break e;o--,u|=n[s++]<<l,l+=8}if(c-=h,e.total_out+=c,r.total+=c,c&&(e.adler=r.check=r.flags?B(r.check,i,c,a-c):O(r.check,i,c,a-c)),c=h,(r.flags?u:L(u))!==r.check){e.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 e;o--,u+=n[s++]<<l,l+=8}if(u!==(4294967295&r.total)){e.msg="incorrect length check",r.mode=30;break}l=u=0}r.mode=29;case 29:x=1;break e;case 30:x=-3;break e;case 31:return-4;case 32:default:return U}return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,(r.wsize||c!==e.avail_out&&r.mode<30&&(r.mode<27||4!==t))&&Z(e,e.output,e.next_out,c-e.avail_out)?(r.mode=31,-4):(f-=e.avail_in,c-=e.avail_out,e.total_in+=f,e.total_out+=c,r.total+=c,r.wrap&&c&&(e.adler=r.check=r.flags?B(r.check,i,c,e.next_out-c):O(r.check,i,c,e.next_out-c)),e.data_type=r.bits+(r.last?64:0)+(12===r.mode?128:0)+(20===r.mode||15===r.mode?256:0),(0==f&&0===c||4===t)&&x===N&&(x=-5),x)},r.inflateEnd=function(e){if(!e||!e.state)return U;var t=e.state;return t.window&&(t.window=null),e.state=null,N},r.inflateGetHeader=function(e,t){var r;return e&&e.state?0==(2&(r=e.state).wrap)?U:((r.head=t).done=!1,N):U},r.inflateSetDictionary=function(e,t){var r,n=t.length;return e&&e.state?0!==(r=e.state).wrap&&11!==r.mode?U:11===r.mode&&O(1,t,n,0)!==r.check?-3:Z(e,t,n,n)?(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(e,t,r){"use strict";var D=e("../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];t.exports=function(e,t,r,n,i,s,a,o){var h,u,l,f,c,d,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<n;v++)O[t[r+v]]++;for(k=g,w=15;1<=w&&0===O[w];w--);if(w<k&&(k=w),0===w)return i[s++]=20971520,i[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===e||1!==w))return-1;for(B[1]=0,b=1;b<15;b++)B[b+1]=B[b]+O[b];for(v=0;v<n;v++)0!==t[r+v]&&(a[B[t[r+v]]++]=v);if(d=0===e?(A=R=a,19):1===e?(A=F,I-=257,R=N,T-=257,256):(A=U,R=P,-1),b=y,c=s,S=v=E=0,l=-1,f=(C=1<<(x=k))-1,1===e&&852<C||2===e&&592<C)return 1;for(;;){for(p=b-S,_=a[v]<d?(m=0,a[v]):a[v]>d?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<<b-S,y=u=1<<x;i[c+(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=t[r+a[v]]}if(k<b&&(E&f)!==l){for(0===S&&(S=k),c+=y,z=1<<(x=b-S);x+S<w&&!((z-=O[x+S])<=0);)x++,z<<=1;if(C+=1<<x,1===e&&852<C||2===e&&592<C)return 1;i[l=E&f]=k<<24|x<<16|c-s|0}}return 0!==E&&(i[c+E]=b-S<<24|64<<16|0),o.bits=k,0}},{"../utils/common":41}],51:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";var i=e("../utils/common"),o=0,h=1;function n(e){for(var t=e.length;0<=--t;)e[t]=0}var s=0,a=29,u=256,l=u+1+a,f=30,c=19,_=2*l+1,g=15,d=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));n(z);var C=new Array(2*f);n(C);var E=new Array(512);n(E);var A=new Array(256);n(A);var I=new Array(a);n(I);var O,B,R,T=new Array(f);function D(e,t,r,n,i){this.static_tree=e,this.extra_bits=t,this.extra_base=r,this.elems=n,this.max_length=i,this.has_stree=e&&e.length}function F(e,t){this.dyn_tree=e,this.max_code=0,this.stat_desc=t}function N(e){return e<256?E[e]:E[256+(e>>>7)]}function U(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function P(e,t,r){e.bi_valid>d-r?(e.bi_buf|=t<<e.bi_valid&65535,U(e,e.bi_buf),e.bi_buf=t>>d-e.bi_valid,e.bi_valid+=r-d):(e.bi_buf|=t<<e.bi_valid&65535,e.bi_valid+=r)}function L(e,t,r){P(e,r[2*t],r[2*t+1])}function j(e,t){for(var r=0;r|=1&e,e>>>=1,r<<=1,0<--t;);return r>>>1}function Z(e,t,r){var n,i,s=new Array(g+1),a=0;for(n=1;n<=g;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=j(s[o]++,o))}}function W(e){var t;for(t=0;t<l;t++)e.dyn_ltree[2*t]=0;for(t=0;t<f;t++)e.dyn_dtree[2*t]=0;for(t=0;t<c;t++)e.bl_tree[2*t]=0;e.dyn_ltree[2*m]=1,e.opt_len=e.static_len=0,e.last_lit=e.matches=0}function M(e){8<e.bi_valid?U(e,e.bi_buf):0<e.bi_valid&&(e.pending_buf[e.pending++]=e.bi_buf),e.bi_buf=0,e.bi_valid=0}function H(e,t,r,n){var i=2*t,s=2*r;return e[i]<e[s]||e[i]===e[s]&&n[t]<=n[r]}function G(e,t,r){for(var n=e.heap[r],i=r<<1;i<=e.heap_len&&(i<e.heap_len&&H(t,e.heap[i+1],e.heap[i],e.depth)&&i++,!H(t,n,e.heap[i],e.depth));)e.heap[r]=e.heap[i],r=i,i<<=1;e.heap[r]=n}function K(e,t,r){var n,i,s,a,o=0;if(0!==e.last_lit)for(;n=e.pending_buf[e.d_buf+2*o]<<8|e.pending_buf[e.d_buf+2*o+1],i=e.pending_buf[e.l_buf+o],o++,0===n?L(e,i,t):(L(e,(s=A[i])+u+1,t),0!==(a=w[s])&&P(e,i-=I[s],a),L(e,s=N(--n),r),0!==(a=k[s])&&P(e,n-=T[s],a)),o<e.last_lit;);L(e,m,t)}function Y(e,t){var r,n,i,s=t.dyn_tree,a=t.stat_desc.static_tree,o=t.stat_desc.has_stree,h=t.stat_desc.elems,u=-1;for(e.heap_len=0,e.heap_max=_,r=0;r<h;r++)0!==s[2*r]?(e.heap[++e.heap_len]=u=r,e.depth[r]=0):s[2*r+1]=0;for(;e.heap_len<2;)s[2*(i=e.heap[++e.heap_len]=u<2?++u:0)]=1,e.depth[i]=0,e.opt_len--,o&&(e.static_len-=a[2*i+1]);for(t.max_code=u,r=e.heap_len>>1;1<=r;r--)G(e,s,r);for(i=h;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],G(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,G(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,h=t.dyn_tree,u=t.max_code,l=t.stat_desc.static_tree,f=t.stat_desc.has_stree,c=t.stat_desc.extra_bits,d=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=g;s++)e.bl_count[s]=0;for(h[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<_;r++)p<(s=h[2*h[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),h[2*n+1]=s,u<n||(e.bl_count[s]++,a=0,d<=n&&(a=c[n-d]),o=h[2*n],e.opt_len+=o*(s+a),f&&(e.static_len+=o*(l[2*n+1]+a)));if(0!==m){do{for(s=p-1;0===e.bl_count[s];)s--;e.bl_count[s]--,e.bl_count[s+1]+=2,e.bl_count[p]--,m-=2}while(0<m);for(s=p;0!==s;s--)for(n=e.bl_count[s];0!==n;)u<(i=e.heap[--r])||(h[2*i+1]!==s&&(e.opt_len+=(s-h[2*i+1])*h[2*i],h[2*i+1]=s),n--)}}(e,t),Z(s,u,e.bl_count)}function X(e,t,r){var n,i,s=-1,a=t[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),t[2*(r+1)+1]=65535,n=0;n<=r;n++)i=a,a=t[2*(n+1)+1],++o<h&&i===a||(o<u?e.bl_tree[2*i]+=o:0!==i?(i!==s&&e.bl_tree[2*i]++,e.bl_tree[2*b]++):o<=10?e.bl_tree[2*v]++:e.bl_tree[2*y]++,s=i,u=(o=0)===a?(h=138,3):i===a?(h=6,3):(h=7,4))}function V(e,t,r){var n,i,s=-1,a=t[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),n=0;n<=r;n++)if(i=a,a=t[2*(n+1)+1],!(++o<h&&i===a)){if(o<u)for(;L(e,i,e.bl_tree),0!=--o;);else 0!==i?(i!==s&&(L(e,i,e.bl_tree),o--),L(e,b,e.bl_tree),P(e,o-3,2)):o<=10?(L(e,v,e.bl_tree),P(e,o-3,3)):(L(e,y,e.bl_tree),P(e,o-11,7));s=i,u=(o=0)===a?(h=138,3):i===a?(h=6,3):(h=7,4)}}n(T);var q=!1;function J(e,t,r,n){P(e,(s<<1)+(n?1:0),3),function(e,t,r,n){M(e),n&&(U(e,r),U(e,~r)),i.arraySet(e.pending_buf,e.window,t,r,e.pending),e.pending+=r}(e,t,r,!0)}r._tr_init=function(e){q||(function(){var e,t,r,n,i,s=new Array(g+1);for(n=r=0;n<a-1;n++)for(I[n]=r,e=0;e<1<<w[n];e++)A[r++]=n;for(A[r-1]=n,n=i=0;n<16;n++)for(T[n]=i,e=0;e<1<<k[n];e++)E[i++]=n;for(i>>=7;n<f;n++)for(T[n]=i<<7,e=0;e<1<<k[n]-7;e++)E[256+i++]=n;for(t=0;t<=g;t++)s[t]=0;for(e=0;e<=143;)z[2*e+1]=8,e++,s[8]++;for(;e<=255;)z[2*e+1]=9,e++,s[9]++;for(;e<=279;)z[2*e+1]=7,e++,s[7]++;for(;e<=287;)z[2*e+1]=8,e++,s[8]++;for(Z(z,l+1,s),e=0;e<f;e++)C[2*e+1]=5,C[2*e]=j(e,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,c,p)}(),q=!0),e.l_desc=new F(e.dyn_ltree,O),e.d_desc=new F(e.dyn_dtree,B),e.bl_desc=new F(e.bl_tree,R),e.bi_buf=0,e.bi_valid=0,W(e)},r._tr_stored_block=J,r._tr_flush_block=function(e,t,r,n){var i,s,a=0;0<e.level?(2===e.strm.data_type&&(e.strm.data_type=function(e){var t,r=4093624447;for(t=0;t<=31;t++,r>>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return o;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return h;for(t=32;t<u;t++)if(0!==e.dyn_ltree[2*t])return h;return o}(e)),Y(e,e.l_desc),Y(e,e.d_desc),a=function(e){var t;for(X(e,e.dyn_ltree,e.l_desc.max_code),X(e,e.dyn_dtree,e.d_desc.max_code),Y(e,e.bl_desc),t=c-1;3<=t&&0===e.bl_tree[2*S[t]+1];t--);return e.opt_len+=3*(t+1)+5+5+4,t}(e),i=e.opt_len+3+7>>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?J(e,t,r,n):4===e.strategy||s===i?(P(e,2+(n?1:0),3),K(e,z,C)):(P(e,4+(n?1:0),3),function(e,t,r,n){var i;for(P(e,t-257,5),P(e,r-1,5),P(e,n-4,4),i=0;i<n;i++)P(e,e.bl_tree[2*S[i]+1],3);V(e,e.dyn_ltree,t-1),V(e,e.dyn_dtree,r-1)}(e,e.l_desc.max_code+1,e.d_desc.max_code+1,a+1),K(e,e.dyn_ltree,e.dyn_dtree)),W(e),n&&M(e)},r._tr_tally=function(e,t,r){return e.pending_buf[e.d_buf+2*e.last_lit]=t>>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(A[r]+u+1)]++,e.dyn_dtree[2*N(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){P(e,2,3),L(e,m,z),function(e){16===e.bi_valid?(U(e,e.bi_buf),e.bi_buf=0,e.bi_valid=0):8<=e.bi_valid&&(e.pending_buf[e.pending++]=255&e.bi_buf,e.bi_buf>>=8,e.bi_valid-=8)}(e)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.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(e,t,r){(function(e){!function(r,n){"use strict";if(!r.setImmediate){var i,s,t,a,o=1,h={},u=!1,l=r.document,e=Object.getPrototypeOf&&Object.getPrototypeOf(r);e=e&&e.setTimeout?e:r,i="[object process]"==={}.toString.call(r.process)?function(e){process.nextTick(function(){c(e)})}:function(){if(r.postMessage&&!r.importScripts){var e=!0,t=r.onmessage;return r.onmessage=function(){e=!1},r.postMessage("","*"),r.onmessage=t,e}}()?(a="setImmediate$"+Math.random()+"$",r.addEventListener?r.addEventListener("message",d,!1):r.attachEvent("onmessage",d),function(e){r.postMessage(a+e,"*")}):r.MessageChannel?((t=new MessageChannel).port1.onmessage=function(e){c(e.data)},function(e){t.port2.postMessage(e)}):l&&"onreadystatechange"in l.createElement("script")?(s=l.documentElement,function(e){var t=l.createElement("script");t.onreadystatechange=function(){c(e),t.onreadystatechange=null,s.removeChild(t),t=null},s.appendChild(t)}):function(e){setTimeout(c,0,e)},e.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),r=0;r<t.length;r++)t[r]=arguments[r+1];var n={callback:e,args:t};return h[o]=n,i(o),o++},e.clearImmediate=f}function f(e){delete h[e]}function c(e){if(u)setTimeout(c,0,e);else{var t=h[e];if(t){u=!0;try{!function(e){var t=e.callback,r=e.args;switch(r.length){case 0:t();break;case 1:t(r[0]);break;case 2:t(r[0],r[1]);break;case 3:t(r[0],r[1],r[2]);break;default:t.apply(n,r)}}(t)}finally{f(e),u=!1}}}}function d(e){e.source===r&&"string"==typeof e.data&&0===e.data.indexOf(a)&&c(+e.data.slice(a.length))}}("undefined"==typeof self?void 0===e?this:e:self)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}]},{},[10])(10)});
\ No newline at end of file
+!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";function d(a){if(a){this.data=a,this.length=this.data.length,this.index=0,this.zero=0;for(var b=0;b<this.data.length;b++)a[b]=255&a[b]}}var e=a("./dataReader");d.prototype=new 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.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},{"./dataReader":6}],2:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a,b){for(var c,e,f,g,h,i,j,k="",l=0;l<a.length;)c=a.charCodeAt(l++),e=a.charCodeAt(l++),f=a.charCodeAt(l++),g=c>>2,h=(3&c)<<4|e>>4,i=(15&e)<<2|f>>6,j=63&f,isNaN(e)?i=j=64:isNaN(f)&&(j=64),k=k+d.charAt(g)+d.charAt(h)+d.charAt(i)+d.charAt(j);return k},c.decode=function(a,b){var c,e,f,g,h,i,j,k="",l=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");l<a.length;)g=d.indexOf(a.charAt(l++)),h=d.indexOf(a.charAt(l++)),i=d.indexOf(a.charAt(l++)),j=d.indexOf(a.charAt(l++)),c=g<<2|h>>4,e=(15&h)<<4|i>>2,f=(3&i)<<6|j,k+=String.fromCharCode(c),64!=i&&(k+=String.fromCharCode(e)),64!=j&&(k+=String.fromCharCode(f));return k}},{}],3:[function(a,b,c){"use strict";function d(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}d.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=d},{}],4:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a,b){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":9}],5:[function(a,b,c){"use strict";var d=a("./utils"),e=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var c="string"!==d.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=c?a[i]:a.charCodeAt(i),g=255&(b^h),f=e[g],b=b>>>8^f;return-1^b}},{"./utils":22}],6:[function(a,b,c){"use strict";function d(a){this.data=null,this.length=0,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||0>a)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){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=d},{"./utils":22}],7:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.compressionOptions=null,c.comment=null,c.unixPermissions=null,c.dosPermissions=null},{}],8:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":22}],9:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a,b){return e.deflateRaw(a,{level:b.level||-1})},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:25}],10:[function(a,b,c){"use strict";function d(a,b){return this instanceof d?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new d;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new d(a,b)}var e=a("./base64");d.prototype=a("./object"),d.prototype.load=a("./load"),d.support=a("./support"),d.defaults=a("./defaults"),d.utils=a("./deprecatedPublicUtils"),d.base64={encode:function(a){return e.encode(a)},decode:function(a){return e.decode(a)}},d.compressions=a("./compressions"),b.exports=d},{"./base64":2,"./compressions":4,"./defaults":7,"./deprecatedPublicUtils":8,"./load":11,"./object":14,"./support":18}],11:[function(a,b,c){"use strict";var d=a("./base64"),e=a("./utf8"),f=a("./utils"),g=a("./zipEntries");b.exports=function(a,b){var c,h,i,j;for(b=f.extend(b||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:e.utf8decode}),b.base64&&(a=d.decode(a)),h=new g(a,b),c=h.files,i=0;i<c.length;i++)j=c[i],this.file(j.fileNameStr,j.decompressed,{binary:!0,optimizedBinaryString:!0,date:j.date,dir:j.dir,comment:j.fileCommentStr.length?j.fileCommentStr:null,unixPermissions:j.unixPermissions,dosPermissions:j.dosPermissions,createFolders:b.createFolders});return h.zipComment.length&&(this.comment=h.zipComment),this}},{"./base64":2,"./utf8":21,"./utils":22,"./zipEntries":23}],12:[function(a,b,c){(function(a){"use strict";b.exports=function(b,c){return new a(b,c)},b.exports.test=function(b){return a.isBuffer(b)}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],13:[function(a,b,c){"use strict";function d(a){this.data=a,this.length=this.data.length,this.index=0,this.zero=0}var e=a("./uint8ArrayReader");d.prototype=new 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},{"./uint8ArrayReader":19}],14:[function(a,b,c){"use strict";var d=a("./support"),e=a("./utils"),f=a("./crc32"),g=a("./signature"),h=a("./defaults"),i=a("./base64"),j=a("./compressions"),k=a("./compressedObject"),l=a("./nodeBuffer"),m=a("./utf8"),n=a("./stringWriter"),o=a("./uint8ArrayWriter"),p=function(a){if(a._data instanceof k&&(a._data=a._data.getContent(),a.options.binary=!0,a.options.base64=!1,"uint8array"===e.getTypeOf(a._data))){var b=a._data;a._data=new Uint8Array(b.length),0!==b.length&&a._data.set(b,0)}return a._data},q=function(a){var b=p(a),c=e.getTypeOf(b);return"string"===c?!a.options.binary&&d.nodebuffer?l(b,"utf-8"):a.asBinary():b},r=function(a){var b=p(this);return null===b||"undefined"==typeof b?"":(this.options.base64&&(b=i.decode(b)),b=a&&this.options.binary?D.utf8decode(b):e.transformTo("string",b),a||this.options.binary||(b=e.transformTo("string",D.utf8encode(b))),b)},s=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.options=c,this._initialMetadata={dir:c.dir,date:c.date}};s.prototype={asText:function(){return r.call(this,!0)},asBinary:function(){return r.call(this,!1)},asNodeBuffer:function(){var a=q(this);return e.transformTo("nodebuffer",a)},asUint8Array:function(){var a=q(this);return e.transformTo("uint8array",a)},asArrayBuffer:function(){return this.asUint8Array().buffer}};var t=function(a,b){var c,d="";for(c=0;b>c;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=e.extend(a,h),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var d,f=e.getTypeOf(b);if(c=u(c),"string"==typeof c.unixPermissions&&(c.unixPermissions=parseInt(c.unixPermissions,8)),c.unixPermissions&&16384&c.unixPermissions&&(c.dir=!0),c.dosPermissions&&16&c.dosPermissions&&(c.dir=!0),c.dir&&(a=x(a)),c.createFolders&&(d=w(a))&&y.call(this,d,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null,f=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=e.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof k))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=e.transformTo("uint8array",b))}var g=new s(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a){return"/"!=a.slice(-1)&&(a+="/"),a},y=function(a,b){return b="undefined"!=typeof b?b:!1,a=x(a),this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},z=function(a,b,c){var d,g=new k;return a._data instanceof k?(g.uncompressedSize=a._data.uncompressedSize,g.crc32=a._data.crc32,0===g.uncompressedSize||a.dir?(b=j.STORE,g.compressedContent="",g.crc32=0):a._data.compressionMethod===b.magic?g.compressedContent=a._data.getCompressedContent():(d=a._data.getContent(),g.compressedContent=b.compress(e.transformTo(b.compressInputType,d),c))):(d=q(a),d&&0!==d.length&&!a.dir||(b=j.STORE,d=""),g.uncompressedSize=d.length,g.crc32=f(d),g.compressedContent=b.compress(e.transformTo(b.compressInputType,d),c)),g.compressedSize=g.compressedContent.length,g.compressionMethod=b.magic,g},A=function(a,b){var c=a;return a||(c=b?16893:33204),(65535&c)<<16},B=function(a,b){return 63&(a||0)},C=function(a,b,c,d,h,i){var j,k,l,n,o=(c.compressedContent,i!==m.utf8encode),p=e.transformTo("string",i(b.name)),q=e.transformTo("string",m.utf8encode(b.name)),r=b.comment||"",s=e.transformTo("string",i(r)),u=e.transformTo("string",m.utf8encode(r)),v=q.length!==b.name.length,w=u.length!==r.length,x=b.options,y="",z="",C="";l=b._initialMetadata.dir!==b.dir?b.dir:x.dir,n=b._initialMetadata.date!==b.date?b.date:x.date;var D=0,E=0;l&&(D|=16),"UNIX"===h?(E=798,D|=A(b.unixPermissions,l)):(E=20,D|=B(b.dosPermissions,l)),j=n.getHours(),j<<=6,j|=n.getMinutes(),j<<=5,j|=n.getSeconds()/2,k=n.getFullYear()-1980,k<<=4,k|=n.getMonth()+1,k<<=5,k|=n.getDate(),v&&(z=t(1,1)+t(f(p),4)+q,y+="up"+t(z.length,2)+z),w&&(C=t(1,1)+t(this.crc32(s),4)+u,y+="uc"+t(C.length,2)+C);var F="";F+="\n\x00",F+=o||!v&&!w?"\x00\x00":"\x00\b",F+=c.compressionMethod,F+=t(j,2),F+=t(k,2),F+=t(c.crc32,4),F+=t(c.compressedSize,4),F+=t(c.uncompressedSize,4),F+=t(p.length,2),F+=t(y.length,2);var G=g.LOCAL_FILE_HEADER+F+p+y,H=g.CENTRAL_FILE_HEADER+t(E,2)+F+t(s.length,2)+"\x00\x00\x00\x00"+t(D,4)+t(d,4)+p+y+s;return{fileRecord:G,dirRecord:H,compressedObject:c}},D={load:function(a,b){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,f,g=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],f=new s(d.name,d._data,e.extend(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,f)&&g.push(f));return g},file:function(a,b,c){if(1===arguments.length){if(e.isRegExp(a)){var d=a;return this.filter(function(a,b){return!b.dir&&d.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(e.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=y.call(this,b),d=this.clone();return d.root=c.name,d},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){a=e.extend(a||{},{base64:!0,compression:"STORE",compressionOptions:null,type:"base64",platform:"DOS",comment:null,mimeType:"application/zip",encodeFileName:m.utf8encode}),e.checkSupport(a.type),"darwin"!==a.platform&&"freebsd"!==a.platform&&"linux"!==a.platform&&"sunos"!==a.platform||(a.platform="UNIX"),"win32"===a.platform&&(a.platform="DOS");var b,c,d=[],f=0,h=0,k=e.transformTo("string",a.encodeFileName(a.comment||this.comment||""));for(var l in this.files)if(this.files.hasOwnProperty(l)){var p=this.files[l],q=p.options.compression||a.compression.toUpperCase(),r=j[q];if(!r)throw new Error(q+" is not a valid compression method !");var s=p.options.compressionOptions||a.compressionOptions||{},u=z.call(this,p,r,s),v=C.call(this,l,p,u,f,a.platform,a.encodeFileName);f+=v.fileRecord.length+u.compressedSize,h+=v.dirRecord.length,d.push(v)}var w="";w=g.CENTRAL_DIRECTORY_END+"\x00\x00\x00\x00"+t(d.length,2)+t(d.length,2)+t(h,4)+t(f,4)+t(k.length,2)+k;var x=a.type.toLowerCase();for(b="uint8array"===x||"arraybuffer"===x||"blob"===x||"nodebuffer"===x?new o(f+h+w.length):new n(f+h+w.length),c=0;c<d.length;c++)b.append(d[c].fileRecord),b.append(d[c].compressedObject.compressedContent);for(c=0;c<d.length;c++)b.append(d[c].dirRecord);b.append(w);var y=b.finalize();switch(a.type.toLowerCase()){case"uint8array":case"arraybuffer":case"nodebuffer":return e.transformTo(a.type.toLowerCase(),y);case"blob":return e.arrayBuffer2Blob(e.transformTo("arraybuffer",y),a.mimeType);case"base64":return a.base64?i.encode(y):y;default:return y}},crc32:function(a,b){return f(a,b)},utf8encode:function(a){return e.transformTo("string",m.utf8encode(a))},utf8decode:function(a){return m.utf8decode(a)}};b.exports=D},{"./base64":2,"./compressedObject":3,"./compressions":4,"./crc32":5,"./defaults":7,"./nodeBuffer":12,"./signature":15,"./stringWriter":17,"./support":18,"./uint8ArrayWriter":20,"./utf8":21,"./utils":22}],15:[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"},{}],16:[function(a,b,c){"use strict";function d(a,b){this.data=a,b||(this.data=f.string2binary(this.data)),this.length=this.data.length,this.index=0,this.zero=0}var e=a("./dataReader"),f=a("./utils");d.prototype=new 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.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},{"./dataReader":6,"./utils":22}],17:[function(a,b,c){"use strict";var d=a("./utils"),e=function(){this.data=[]};e.prototype={append:function(a){a=d.transformTo("string",a),this.data.push(a)},finalize:function(){return this.data.join("")}},b.exports=e},{"./utils":22}],18:[function(a,b,c){(function(a){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof a,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var b=new ArrayBuffer(0);try{c.blob=0===new Blob([b],{type:"application/zip"}).size}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;f.append(b),c.blob=0===f.getBlob("application/zip").size}catch(d){c.blob=!1}}}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],19:[function(a,b,c){"use strict";function d(a){a&&(this.data=a,this.length=this.data.length,this.index=0,this.zero=0)}var e=a("./arrayReader");d.prototype=new 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},{"./arrayReader":1}],20:[function(a,b,c){"use strict";var d=a("./utils"),e=function(a){this.data=new Uint8Array(a),this.index=0};e.prototype={append:function(a){0!==a.length&&(a=d.transformTo("uint8array",a),this.data.set(a,this.index),this.index+=a.length)},finalize:function(){return this.data}},b.exports=e},{"./utils":22}],21:[function(a,b,c){"use strict";for(var d=a("./utils"),e=a("./support"),f=a("./nodeBuffer"),g=new Array(256),h=0;256>h;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(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},j=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 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));e.uint8array?b.push(k(a.subarray(c,h))):b.push(k(a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":12,"./support":18,"./utils":22}],22:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function f(a){var b=65536,d=[],e=a.length,f=c.getTypeOf(a),g=0,h=!0;try{switch(f){case"uint8array":String.fromCharCode.apply(null,new Uint8Array(0));break;case"nodebuffer":String.fromCharCode.apply(null,j(0))}}catch(i){h=!1}if(!h){for(var k="",l=0;l<a.length;l++)k+=String.fromCharCode(a[l]);return k}for(;e>g&&b>1;)try{"array"===f||"nodebuffer"===f?d.push(String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e)))):d.push(String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];return b}var h=a("./support"),i=a("./compressions"),j=a("./nodeBuffer");c.string2binary=function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(255&a.charCodeAt(c));return b},c.arrayBuffer2Blob=function(a,b){c.checkSupport("blob"),b=b||"application/zip";try{return new Blob([a],{type:b})}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;return f.append(a),f.getBlob(b)}catch(d){throw new Error("Bug : can't construct the Blob.")}}},c.applyFromCharCode=f;var k={};k.string={string:d,array:function(a){return e(a,new Array(a.length))},arraybuffer:function(a){return k.string.uint8array(a).buffer},uint8array:function(a){return e(a,new Uint8Array(a.length))},nodebuffer:function(a){return e(a,j(a.length))}},k.array={string:f,array:d,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(a)}},k.arraybuffer={string:function(a){return f(new Uint8Array(a))},array:function(a){return g(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:d,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(new Uint8Array(a))}},k.uint8array={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:d,nodebuffer:function(a){return j(a)}},k.nodebuffer={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return k.nodebuffer.uint8array(a).buffer},uint8array:function(a){return g(a,new Uint8Array(a.length))},nodebuffer:d},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=k[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":h.nodebuffer&&j.test(a)?"nodebuffer":h.uint8array&&a instanceof Uint8Array?"uint8array":h.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=h[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this browser")},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"+(16>b?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)},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}},{"./compressions":4,"./nodeBuffer":12,"./support":18}],23:[function(a,b,c){"use strict";function d(a,b){this.files=[],this.loadOptions=b,a&&this.load(a)}var e=a("./stringReader"),f=a("./nodeBufferReader"),g=a("./uint8ArrayReader"),h=a("./arrayReader"),i=a("./utils"),j=a("./signature"),k=a("./zipEntry"),l=a("./support");a("./object");d.prototype={checkSignature:function(a){var b=this.reader.readString(4);if(b!==a)throw new Error("Corrupted zip or bug : unexpected signature ("+i.pretty(b)+", expected "+i.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=l.uint8array?"uint8array":"array",c=i.transformTo(b,a);this.zipComment=this.loadOptions.decodeFileName(c)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.versionMadeBy=this.reader.readString(2),this.versionNeeded=this.reader.readInt(2),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;d>e;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(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(j.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8(),b.processAttributes()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readString(4)===j.CENTRAL_FILE_HEADER;)a=new k({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(j.CENTRAL_DIRECTORY_END);if(0>a){var b=!this.isSignature(0,j.LOCAL_FILE_HEADER);throw b?new Error("Can't find end of central directory : is this a zip file ? If it is, see http://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(j.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===i.MAX_VALUE_16BITS||this.diskWithCentralDirStart===i.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===i.MAX_VALUE_16BITS||this.centralDirRecords===i.MAX_VALUE_16BITS||this.centralDirSize===i.MAX_VALUE_32BITS||this.centralDirOffset===i.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(j.ZIP64_CENTRAL_DIRECTORY_LOCATOR),0>a)throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");if(this.reader.setIndex(a),this.checkSignature(j.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),!this.isSignature(this.relativeOffsetEndOfZip64CentralDir,j.ZIP64_CENTRAL_DIRECTORY_END)&&(this.relativeOffsetEndOfZip64CentralDir=this.reader.lastIndexOfSignature(j.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(j.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,j.CENTRAL_FILE_HEADER)||(this.reader.zero=e);else if(0>e)throw new Error("Corrupted zip: missing "+Math.abs(e)+" bytes.")},prepareReader:function(a){var b=i.getTypeOf(a);if(i.checkSupport(b),"string"!==b||l.uint8array)if("nodebuffer"===b)this.reader=new f(a);else if(l.uint8array)this.reader=new g(i.transformTo("uint8array",a));else{if(!l.array)throw new Error("Unexpected error: unsupported type '"+b+"'");this.reader=new h(i.transformTo("array",a))}else this.reader=new e(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=d},{"./arrayReader":1,"./nodeBufferReader":13,"./object":14,"./signature":15,"./stringReader":16,"./support":18,"./uint8ArrayReader":19,"./utils":22,"./zipEntry":24}],24:[function(a,b,c){"use strict";function d(a,b){this.options=a,this.loadOptions=b}var e=a("./stringReader"),f=a("./utils"),g=a("./compressedObject"),h=a("./object"),i=a("./support"),j=0,k=3;d.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,e){return function(){var a=f.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==e)throw new Error("Bug : uncompressed data size mismatch");return b}},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),-1==this.compressedSize||-1==this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=f.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+f.pretty(this.compressionMethod)+" unknown (inner file : "+f.transformTo("string",this.fileName)+")");if(this.decompressed=new g,this.decompressed.compressedSize=this.compressedSize,this.decompressed.uncompressedSize=this.uncompressedSize,this.decompressed.crc32=this.crc32,this.decompressed.compressionMethod=this.compressionMethod,this.decompressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.decompressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.decompressed=f.transformTo("string",this.decompressed.getContent()),
+h.crc32(this.decompressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch")},readCentralPart:function(a){if(this.versionMadeBy=a.readInt(2),this.versionNeeded=a.readInt(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),this.fileNameLength=a.readInt(2),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");this.fileName=a.readData(this.fileNameLength),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===j&&(this.dosPermissions=63&this.externalFileAttributes),a===k&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(a){if(this.extraFields[1]){var b=new 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;for(this.extraFields=this.extraFields||{};a.index<e+this.extraFieldsLength;)b=a.readInt(2),c=a.readInt(2),d=a.readString(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){var a=i.uint8array?"uint8array":"array";if(this.useUTF8())this.fileNameStr=h.utf8decode(this.fileName),this.fileCommentStr=h.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=new e(a.value);return 1!==b.readInt(1)?null:h.crc32(this.fileName)!==b.readInt(4)?null:h.utf8decode(b.readString(a.length-5))}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=new e(a.value);return 1!==b.readInt(1)?null:h.crc32(this.fileComment)!==b.readInt(4)?null:h.utf8decode(b.readString(a.length-5))}return null}},b.exports=d},{"./compressedObject":3,"./object":14,"./stringReader":16,"./support":18,"./utils":22}],25:[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":26,"./lib/inflate":27,"./lib/utils/common":28,"./lib/zlib/constants":31}],26:[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]);b.header&&h.deflateSetHeader(this.strm,b.header)}function e(a,b){var c=new d(b);if(c.push(a,!0),c.err)throw c.msg;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):!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":28,"./utils/strings":29,"./zlib/deflate":33,"./zlib/messages":38,"./zlib/zstream":40}],27:[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;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=this.strm,m=this.options.chunkSize,o=!1;if(this.ended)return!1;d=b===~~b?b:b===!0?j.Z_FINISH:j.Z_NO_FLUSH,"string"==typeof a?l.input=i.binstring2buf(a):"[object ArrayBuffer]"===n.call(a)?l.input=new Uint8Array(a):l.input=a,l.next_in=0,l.avail_in=l.input.length;do{if(0===l.avail_out&&(l.output=new h.Buf8(m),l.next_out=0,l.avail_out=m),c=g.inflate(l,j.Z_NO_FLUSH),c===j.Z_BUF_ERROR&&o===!0&&(c=j.Z_OK,o=!1),c!==j.Z_STREAM_END&&c!==j.Z_OK)return this.onEnd(c),this.ended=!0,!1;l.next_out&&(0!==l.avail_out&&c!==j.Z_STREAM_END&&(0!==l.avail_in||d!==j.Z_FINISH&&d!==j.Z_SYNC_FLUSH)||("string"===this.options.to?(e=i.utf8border(l.output,l.next_out),f=l.next_out-e,k=i.buf2string(l.output,e),l.next_out=f,l.avail_out=m-f,f&&h.arraySet(l.output,l.output,e,f,0),this.onData(k)):this.onData(h.shrinkBuf(l.output,l.next_out)))),0===l.avail_in&&0===l.avail_out&&(o=!0)}while((l.avail_in>0||0===l.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),l.avail_out=0,!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":28,"./utils/strings":29,"./zlib/constants":31,"./zlib/gzheader":34,"./zlib/inflate":36,"./zlib/messages":38,"./zlib/zstream":40}],28:[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;d>f;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;c>b;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;c>b;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;d>f;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)},{}],29:[function(a,b,c){"use strict";function d(a,b){if(65537>b&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;b>d;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;256>j;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;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=new e.Buf8(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(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;d>c;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;h>c;)if(f=a[c++],128>f)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&&h>c;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:65536>f?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 0>c?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":28}],30:[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},{}],31:[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}},{}],32:[function(a,b,c){"use strict";function d(){for(var a,b=[],c=0;256>c;c++){a=c;for(var d=0;8>d;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;g>h;h++)a=a>>>8^e[255&(a^b[h])];return-1^a}var f=d();b.exports=e},{}],33:[function(a,b,c){"use strict";function d(a,b){return a.msg=H[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&&(D.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){E._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,D.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=F(a.adler,b,e,c):2===a.state.wrap&&(a.adler=G(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-ka?a.strstart-(a.w_size-ka):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ja,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]&&m>f);if(d=ja-(m-f),f=m-ja,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-ka)){D.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>=ia)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+ia-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<ia)););}while(a.lookahead<ka&&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===I)return ta;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 ta;if(a.strstart-a.block_start>=a.w_size-ka&&(h(a,!1),0===a.strm.avail_out))return ta}return a.insert=0,b===L?(h(a,!0),0===a.strm.avail_out?va:wa):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?ta:ta}function o(a,b){for(var c,d;;){if(a.lookahead<ka){if(m(a),a.lookahead<ka&&b===I)return ta;if(0===a.lookahead)break}if(c=0,a.lookahead>=ia&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ia-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-ka&&(a.match_length=l(a,c)),a.match_length>=ia)if(d=E._tr_tally(a,a.strstart-a.match_start,a.match_length-ia),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=ia){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ia-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=E._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++;if(d&&(h(a,!1),0===a.strm.avail_out))return ta}return a.insert=a.strstart<ia-1?a.strstart:ia-1,b===L?(h(a,!0),0===a.strm.avail_out?va:wa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ta:ua}function p(a,b){for(var c,d,e;;){if(a.lookahead<ka){if(m(a),a.lookahead<ka&&b===I)return ta;if(0===a.lookahead)break}if(c=0,a.lookahead>=ia&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ia-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=ia-1,0!==c&&a.prev_length<a.max_lazy_match&&a.strstart-c<=a.w_size-ka&&(a.match_length=l(a,c),a.match_length<=5&&(a.strategy===T||a.match_length===ia&&a.strstart-a.match_start>4096)&&(a.match_length=ia-1)),a.prev_length>=ia&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-ia,d=E._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-ia),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+ia-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=ia-1,a.strstart++,d&&(h(a,!1),0===a.strm.avail_out))return ta}else if(a.match_available){if(d=E._tr_tally(a,0,a.window[a.strstart-1]),d&&h(a,!1),a.strstart++,a.lookahead--,0===a.strm.avail_out)return ta}else a.match_available=1,a.strstart++,a.lookahead--}return a.match_available&&(d=E._tr_tally(a,0,a.window[a.strstart-1]),a.match_available=0),a.insert=a.strstart<ia-1?a.strstart:ia-1,b===L?(h(a,!0),0===a.strm.avail_out?va:wa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ta:ua}function q(a,b){for(var c,d,e,f,g=a.window;;){if(a.lookahead<=ja){if(m(a),a.lookahead<=ja&&b===I)return ta;if(0===a.lookahead)break}if(a.match_length=0,a.lookahead>=ia&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ja;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]&&f>e);a.match_length=ja-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=ia?(c=E._tr_tally(a,1,a.match_length-ia),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=E._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return ta}return a.insert=0,b===L?(h(a,!0),0===a.strm.avail_out?va:wa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ta:ua}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===I)return ta;break}if(a.match_length=0,c=E._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return ta}return a.insert=0,b===L?(h(a,!0),0===a.strm.avail_out?va:wa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ta:ua}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=C[a.level].max_lazy,a.good_match=C[a.level].good_length,a.nice_match=C[a.level].nice_length,a.max_chain_length=C[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=ia-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=Z,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*ga),this.dyn_dtree=new D.Buf16(2*(2*ea+1)),this.bl_tree=new D.Buf16(2*(2*fa+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 D.Buf16(ha+1),this.heap=new D.Buf16(2*da+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new D.Buf16(2*da+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=Y,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?ma:ra,a.adler=2===b.wrap?0:1,b.last_flush=I,E._tr_init(b),N):d(a,P)}function w(a){var b=v(a);return b===N&&t(a.state),b}function x(a,b){return a&&a.state?2!==a.state.wrap?P:(a.state.gzhead=b,N):P}function y(a,b,c,e,f,g){if(!a)return P;var h=1;if(b===S&&(b=6),0>e?(h=0,e=-e):e>15&&(h=2,e-=16),1>f||f>$||c!==Z||8>e||e>15||0>b||b>9||0>g||g>W)return d(a,P);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+ia-1)/ia),i.window=new D.Buf8(2*i.w_size),i.head=new D.Buf16(i.hash_size),i.prev=new D.Buf16(i.w_size),i.lit_bufsize=1<<f+6,i.pending_buf_size=4*i.lit_bufsize,i.pending_buf=new D.Buf8(i.pending_buf_size),i.d_buf=i.lit_bufsize>>1,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,Z,_,aa,X)}function A(a,b){var c,h,k,l;if(!a||!a.state||b>M||0>b)return a?d(a,P):P;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===sa&&b!==L)return d(a,0===a.avail_out?R:P);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===ma)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>=U||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=G(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=na):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=U||h.level<2?4:0),i(h,xa),h.status=ra);else{var m=Z+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=U||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=la),m+=31-m%31,h.status=ra,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===na)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=G(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=G(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=oa)}else h.status=oa;if(h.status===oa)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=G(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=G(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=pa)}else h.status=pa;if(h.status===pa)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=G(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=G(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=qa)}else h.status=qa;if(h.status===qa&&(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=ra)):h.status=ra),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,N}else if(0===a.avail_in&&e(b)<=e(c)&&b!==L)return d(a,R);if(h.status===sa&&0!==a.avail_in)return d(a,R);if(0!==a.avail_in||0!==h.lookahead||b!==I&&h.status!==sa){var o=h.strategy===U?r(h,b):h.strategy===V?q(h,b):C[h.level].func(h,b);if(o!==va&&o!==wa||(h.status=sa),o===ta||o===va)return 0===a.avail_out&&(h.last_flush=-1),N;if(o===ua&&(b===J?E._tr_align(h):b!==M&&(E._tr_stored_block(h,0,0,!1),b===K&&(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,N}return b!==L?N:h.wrap<=0?O:(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?N:O)}function B(a){var b;return a&&a.state?(b=a.state.status,b!==ma&&b!==na&&b!==oa&&b!==pa&&b!==qa&&b!==ra&&b!==sa?d(a,P):(a.state=null,b===ra?d(a,Q):N)):P}var C,D=a("../utils/common"),E=a("./trees"),F=a("./adler32"),G=a("./crc32"),H=a("./messages"),I=0,J=1,K=3,L=4,M=5,N=0,O=1,P=-2,Q=-3,R=-5,S=-1,T=1,U=2,V=3,W=4,X=0,Y=2,Z=8,$=9,_=15,aa=8,ba=29,ca=256,da=ca+1+ba,ea=30,fa=19,ga=2*da+1,ha=15,ia=3,ja=258,ka=ja+ia+1,la=32,ma=42,na=69,oa=73,pa=91,qa=103,ra=113,sa=666,ta=1,ua=2,va=3,wa=4,xa=3;C=[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.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":28,"./adler32":30,"./crc32":32,"./messages":38,"./trees":39}],34:[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},{}],35:[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{15>q&&(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&&(w>q&&(p+=B[f++]<<q,q+=8),x+=p&(1<<w)-1,p>>>=w,q-=w),15>q&&(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,w>q&&(p+=B[f++]<<q,q+=8,w>q&&(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,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(w>n){if(z+=l+n-w,w-=n,x>w){x-=w;do C[h++]=o[z++];while(--w);if(z=0,x>n){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,x>w){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(g>f&&j>h);x=q>>3,f-=x,q-=x<<3,p&=(1<<q)-1,a.next_in=f,a.next_out=h,a.avail_in=g>f?5+(g-f):5-(f-g),a.avail_out=j>h?257+(j-h):257-(h-j),c.hold=p,c.bits=q}},{}],36:[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 r.Buf16(320),this.work=new r.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=K,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new r.Buf32(oa),b.distcode=b.distdyn=new r.Buf32(pa),b.sane=1,b.back=-1,C):F}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):F}function h(a,b){var c,d;return a&&a.state?(d=a.state,0>b?(c=0,b=-b):(c=(b>>4)+1,48>b&&(b&=15)),b&&(8>b||b>15)?F:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):F}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==C&&(a.state=null),c):F}function j(a){return i(a,ra)}function k(a){if(sa){var b;for(p=new r.Buf32(512),q=new r.Buf32(32),b=0;144>b;)a.lens[b++]=8;for(;256>b;)a.lens[b++]=9;for(;280>b;)a.lens[b++]=7;for(;288>b;)a.lens[b++]=8;for(v(x,a.lens,0,288,p,0,a.work,{bits:9}),b=0;32>b;)a.lens[b++]=5;v(y,a.lens,0,32,q,0,a.work,{bits:5}),sa=!1}a.lencode=p,a.lenbits=9,a.distcode=q,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 r.Buf8(f.wsize)),d>=f.wsize?(r.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),r.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(r.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,oa,pa,qa,ra,sa,ta,ua,va,wa,xa,ya,za,Aa=0,Ba=new r.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 F;c=a.state,c.mode===V&&(c.mode=W),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=C;a:for(;;)switch(c.mode){case K:if(0===c.wrap){c.mode=W;break}for(;16>n;){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=t(c.check,Ba,2,0),m=0,n=0,c.mode=L;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=la;break}if((15&m)!==J){a.msg="unknown compression method",c.mode=la;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=la;break}c.dmax=1<<wa,a.adler=c.check=1,c.mode=512&m?T:V,m=0,n=0;break;case L:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.flags=m,(255&c.flags)!==J){a.msg="unknown compression method",c.mode=la;break}if(57344&c.flags){a.msg="unknown header flags set",c.mode=la;break}c.head&&(c.head.text=m>>8&1),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=t(c.check,Ba,2,0)),m=0,n=0,c.mode=M;case M:for(;32>n;){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=t(c.check,Ba,4,0)),m=0,n=0,c.mode=N;case N:for(;16>n;){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=t(c.check,Ba,2,0)),m=0,n=0,c.mode=O;case O:if(1024&c.flags){for(;16>n;){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=t(c.check,Ba,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=P;case P: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)),r.arraySet(c.head.extra,e,g,q,wa)),512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=Q;case Q: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&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=R;case R: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&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.comment=null);c.mode=S;case S:if(512&c.flags){for(;16>n;){
+if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(65535&c.check)){a.msg="header crc mismatch",c.mode=la;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=V;break;case T:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}a.adler=c.check=d(m),m=0,n=0,c.mode=U;case U: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,E;a.adler=c.check=1,c.mode=V;case V:if(b===A||b===B)break a;case W:if(c.last){m>>>=7&n,n-=7&n,c.mode=ia;break}for(;3>n;){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=X;break;case 1:if(k(c),c.mode=ba,b===B){m>>>=2,n-=2;break a}break;case 2:c.mode=$;break;case 3:a.msg="invalid block type",c.mode=la}m>>>=2,n-=2;break;case X:for(m>>>=7&n,n-=7&n;32>n;){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=la;break}if(c.length=65535&m,m=0,n=0,c.mode=Y,b===B)break a;case Y:c.mode=Z;case Z:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;r.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=V;break;case $:for(;14>n;){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=la;break}c.have=0,c.mode=_;case _:for(;c.have<c.ncode;){for(;3>n;){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=v(w,c.lens,0,19,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid code lengths set",c.mode=la;break}c.have=0,c.mode=aa;case aa: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,!(n>=qa);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(16>sa)m>>>=qa,n-=qa,c.lens[c.have++]=sa;else{if(16===sa){for(za=qa+2;za>n;){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=la;break}wa=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sa){for(za=qa+3;za>n;){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;za>n;){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=la;break}for(;q--;)c.lens[c.have++]=wa}}if(c.mode===la)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=la;break}if(c.lenbits=9,ya={bits:c.lenbits},xa=v(x,c.lens,0,c.nlen,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid literal/lengths set",c.mode=la;break}if(c.distbits=6,c.distcode=c.distdyn,ya={bits:c.distbits},xa=v(y,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,ya),c.distbits=ya.bits,xa){a.msg="invalid distances set",c.mode=la;break}if(c.mode=ba,b===B)break a;case ba:c.mode=ca;case ca: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,u(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===V&&(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,!(n>=qa);){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,!(n>=ta+qa);){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=ha;break}if(32&ra){c.back=-1,c.mode=V;break}if(64&ra){a.msg="invalid literal/length code",c.mode=la;break}c.extra=15&ra,c.mode=da;case da:if(c.extra){for(za=c.extra;za>n;){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=ea;case ea:for(;Aa=c.distcode[m&(1<<c.distbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=qa);){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,!(n>=ta+qa);){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=la;break}c.offset=sa,c.extra=15&ra,c.mode=fa;case fa:if(c.extra){for(za=c.extra;za>n;){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=la;break}c.mode=ga;case ga: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=la;break}q>c.wnext?(q-=c.wnext,oa=c.wsize-q):oa=c.wnext-q,q>c.length&&(q=c.length),pa=c.window}else pa=f,oa=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pa[oa++];while(--q);0===c.length&&(c.mode=ca);break;case ha:if(0===j)break a;f[h++]=c.length,j--,c.mode=ca;break;case ia:if(c.wrap){for(;32>n;){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?t(c.check,f,p,h-p):s(c.check,f,p,h-p)),p=j,(c.flags?m:d(m))!==c.check){a.msg="incorrect data check",c.mode=la;break}m=0,n=0}c.mode=ja;case ja:if(c.wrap&&c.flags){for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(4294967295&c.total)){a.msg="incorrect length check",c.mode=la;break}m=0,n=0}c.mode=ka;case ka:xa=D;break a;case la:xa=G;break a;case ma:return H;case na:default:return F}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<la&&(c.mode<ia||b!==z))&&l(a,a.output,a.next_out,p-a.avail_out)?(c.mode=ma,H):(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?t(c.check,f,p,a.next_out-p):s(c.check,f,p,a.next_out-p)),a.data_type=c.bits+(c.last?64:0)+(c.mode===V?128:0)+(c.mode===ba||c.mode===Y?256:0),(0===o&&0===p||b===z)&&xa===C&&(xa=I),xa)}function n(a){if(!a||!a.state)return F;var b=a.state;return b.window&&(b.window=null),a.state=null,C}function o(a,b){var c;return a&&a.state?(c=a.state,0===(2&c.wrap)?F:(c.head=b,b.done=!1,C)):F}var p,q,r=a("../utils/common"),s=a("./adler32"),t=a("./crc32"),u=a("./inffast"),v=a("./inftrees"),w=0,x=1,y=2,z=4,A=5,B=6,C=0,D=1,E=2,F=-2,G=-3,H=-4,I=-5,J=8,K=1,L=2,M=3,N=4,O=5,P=6,Q=7,R=8,S=9,T=10,U=11,V=12,W=13,X=14,Y=15,Z=16,$=17,_=18,aa=19,ba=20,ca=21,da=22,ea=23,fa=24,ga=25,ha=26,ia=27,ja=28,ka=29,la=30,ma=31,na=32,oa=852,pa=592,qa=15,ra=qa,sa=!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.inflateInfo="pako inflate (from Nodeca project)"},{"../utils/common":28,"./adler32":30,"./crc32":32,"./inffast":35,"./inftrees":37}],37:[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;e>=D;D++)P[D]=0;for(E=0;o>E;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;G>F&&0===P[F];F++);for(F>H&&(H=F),K=1,D=1;e>=D;D++)if(K<<=1,K-=P[D],0>K)return-1;if(K>0&&(a===h||1!==G))return-1;for(Q[1]=0,D=1;e>D;D++)Q[D+1]=Q[D]+P[D];for(E=0;o>E;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(var T=0;;){T++,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;G>I+J&&(K-=P[I+J],!(0>=K));)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":28}],38:[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"}},{}],39:[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 256>a?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;W>=f;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,c=a.heap_max+1;V>c;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;W>=d;d++)f[d]=g=g+c[d-1]<<1;for(e=0;b>=e;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;Q-1>d;d++)for(ka[d]=c,a=0;a<1<<ba[d];a++)ja[c++]=d;for(ja[c-1]=d,f=0,d=0;16>d;d++)for(la[d]=f,a=0;a<1<<ca[d];a++)ia[f++]=d;for(f>>=7;T>d;d++)for(la[d]=f<<7,a=0;a<1<<ca[d]-7;a++)ia[256+f++]=d;for(b=0;W>=b;b++)g[b]=0;for(a=0;143>=a;)ga[2*a+1]=8,a++,g[8]++;for(;255>=a;)ga[2*a+1]=9,a++,g[9]++;for(;279>=a;)ga[2*a+1]=7,a++,g[7]++;for(;287>=a;)ga[2*a+1]=8,a++,g[8]++;for(n(ga,S+1,g),a=0;T>a;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;S>b;b++)a.dyn_ltree[2*b]=0;for(b=0;T>b;b++)a.dyn_dtree[2*b]=0;for(b=0;U>b;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;i>c;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]=2>j?++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;c>=d;d++)e=g,g=b[2*(d+1)+1],++h<i&&e===g||(j>h?a.bl_tree[2*e]+=h:0!==e?(e!==f&&a.bl_tree[2*e]++,a.bl_tree[2*$]++):10>=h?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;c>=d;d++)if(e=g,g=b[2*(d+1)+1],!(++h<k&&e===g)){if(l>h){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)):10>=h?(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;d>e;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;31>=b;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;R>b;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,e>=f&&(e=f)):e=f=c+5,e>=c+4&&-1!==b?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":28}],40:[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)});
\ No newline at end of file

From ea9e8d43846b78e3d4c7a2b7515ce942fe50acef Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 3 Feb 2023 14:27:59 +0100
Subject: [PATCH 403/412] Delete .key

---
 .key | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .key

diff --git a/.key b/.key
deleted file mode 100644
index 905cf23a6..000000000
--- a/.key
+++ /dev/null
@@ -1 +0,0 @@
-onLmA_LND5S8jNSvi8nNSGwevE13f7t8pW-wgWAXZgo=
\ No newline at end of file

From cf9a7d538fe39ea356138722f566dfd04bae8b54 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 3 Feb 2023 14:28:59 +0100
Subject: [PATCH 404/412] Add .key file to ignored files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 14da8a036..1d473adfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ cps/cache
 .idea/
 *.bak
 *.log.*
+.key
 
 settings.yaml
 gdrive_credentials

From 1dd638a78675a180755b5a842733371002a0129c Mon Sep 17 00:00:00 2001
From: mapi68 <41143572+mapi68@users.noreply.github.com>
Date: Sat, 4 Feb 2023 20:39:36 +0100
Subject: [PATCH 405/412] Update messages.po

---
 cps/translations/it/LC_MESSAGES/messages.po | 903 +++++++++++---------
 1 file changed, 520 insertions(+), 383 deletions(-)

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index de3de48a3..381e50b6a 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -2,47 +2,46 @@
 # Copyright (C) 2016 Smart Cities Community
 # This file is distributed under the same license as the Calibre-Web
 # Juan F. Villa <juan.villa@paisdelconocimiento.org>, 2016.
+# Massimo Pissarello <mapi68@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
 "POT-Creation-Date: 2023-01-22 13:52+0100\n"
-"PO-Revision-Date: 2017-04-04 15:09+0200\n"
-"Last-Translator: ElQuimm <quimm@webtaste.com>\n"
+"PO-Revision-Date: 2023-02-04 20:25+0100\n"
+"Last-Translator: Massimo Pissarello <mapi68@gmail.com>\n"
 "Language: it\n"
-"Language-Team: \n"
+"Language-Team: Italian <>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.10.3\n"
+"X-Generator: Lokalize 22.12.1\n"
 
 #: cps/about.py:84
 msgid "Statistics"
 msgstr "Statistiche"
 
 #: cps/admin.py:148
-#, fuzzy
 msgid "Server restarted, please reload page."
 msgstr "Server riavviato, per favore ricarica la pagina"
 
 #: cps/admin.py:150
-#, fuzzy
 msgid "Performing Server shutdown, please close window."
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra"
 
 #: cps/admin.py:158
 msgid "Success! Database Reconnected"
-msgstr ""
+msgstr "OK! Database riconnesso"
 
 #: cps/admin.py:161
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
 #: cps/admin.py:172
-#, fuzzy
 msgid "Success! Books queued for Metadata Backup"
-msgstr "Libro accodato con successo per il backup dei metadati"
+msgstr "OK! Libri in coda per il backup dei metadati"
 
 #: cps/admin.py:205 cps/editbooks.py:576 cps/editbooks.py:578
 #: cps/editbooks.py:614 cps/editbooks.py:631 cps/editbooks.py:1238
@@ -77,12 +76,12 @@ msgstr "Utente non trovato"
 
 #: cps/admin.py:407
 msgid "{} users deleted successfully"
-msgstr "{} utente eliminato con successo"
+msgstr "{} utenti eliminati con successo"
 
 #: cps/admin.py:430 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
-msgstr "tutte le lingue presenti"
+msgstr "Mostra tutto"
 
 #: cps/admin.py:451 cps/admin.py:457
 msgid "Malformed request"
@@ -98,11 +97,13 @@ msgstr "L'utente Guest (ospite) non può avere questo ruolo"
 
 #: cps/admin.py:493 cps/admin.py:1953
 msgid "No admin user remaining, can't remove admin role"
-msgstr "Non rimarrebbe nessun utente amministratore, non posso rimuovere il ruolo di amministratore"
+msgstr ""
+"Non rimarrebbe nessun utente amministratore, non posso rimuovere il ruolo di"
+" amministratore"
 
 #: cps/admin.py:497 cps/admin.py:511
 msgid "Value has to be true or false"
-msgstr "Il valore deve essere o vero o flaso"
+msgstr "Il valore deve essere o vero o falso"
 
 #: cps/admin.py:499
 msgid "Invalid role"
@@ -110,15 +111,17 @@ msgstr "Ruolo non valido"
 
 #: cps/admin.py:503
 msgid "Guest can't have this view"
-msgstr "L'utente Guest (ospite) non può avere questa schermata"
+msgstr "L'utente Guest (ospite) non può visualizzare questa schermata"
 
 #: cps/admin.py:513
 msgid "Invalid view"
-msgstr "Visualizzazione invalida"
+msgstr "Visualizzazione non valida"
 
 #: cps/admin.py:516
 msgid "Guest's Locale is determined automatically and can't be set"
-msgstr "Le impostazioni locali dell'utente Guest (ospite) sono determinate automaticamente e non possono essere configurate"
+msgstr ""
+"Le impostazioni locali dell'utente Guest (ospite) sono determinate"
+" automaticamente e non possono essere configurate"
 
 #: cps/admin.py:520
 msgid "No Valid Locale Given"
@@ -162,39 +165,66 @@ msgstr "Vuoi veramente eliminare questo scaffale?"
 
 #: cps/admin.py:616
 msgid "Are you sure you want to change locales of selected user(s)?"
-msgstr "Sei sicuro di voler modificare le impostazioni locali del/degli utente/i selezionato/i?"
+msgstr ""
+"Sei sicuro di voler modificare le impostazioni locali del/degli utente/i"
+" selezionato/i?"
 
 #: cps/admin.py:618
-msgid "Are you sure you want to change visible book languages for selected user(s)?"
-msgstr "Sei sicuro di voler modificare le impostazioni delle lingue visualizzabili del/degli utente/i selezionato/i?"
+msgid ""
+"Are you sure you want to change visible book languages for selected user(s)?"
+msgstr ""
+"Sei sicuro di voler modificare le impostazioni delle lingue visualizzabili"
+" dall'/dagli utente/i selezionato/i?"
 
 #: cps/admin.py:620
-msgid "Are you sure you want to change the selected role for the selected user(s)?"
-msgstr "Sei sicuro di voler modificare il ruolo evidenziato del/degli utente/i selezionato/i?"
+msgid ""
+"Are you sure you want to change the selected role for the selected user(s)?"
+msgstr ""
+"Sei sicuro di voler modificare il ruolo evidenziato del/degli utente/i"
+" selezionato/i?"
 
 #: cps/admin.py:622
-msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
-msgstr "Sei sicuro di voler modificare le restrizioni selezionate del/degli utente/i selezionato/i?"
+msgid ""
+"Are you sure you want to change the selected restrictions for the selected"
+" user(s)?"
+msgstr ""
+"Sei sicuro di voler modificare le restrizioni selezionate del/degli utente/i"
+" selezionato/i?"
 
 #: cps/admin.py:624
-msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
-msgstr "Sei sicuro di voler modificare le restrizioni di visualizzazione del/degli utente/i selezionato/i?"
+msgid ""
+"Are you sure you want to change the selected visibility restrictions for the"
+" selected user(s)?"
+msgstr ""
+"Sei sicuro di voler modificare le restrizioni di visibilità selezionate per"
+" l'utente(i) selezionato(i)?"
 
 #: cps/admin.py:627
-msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
-msgstr "Sei sicuro di voler modificare il comportamento di sincronizzazione dello scaffale per l'/gli utente/i selezionato/i?"
+msgid ""
+"Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgstr ""
+"Sei sicuro di voler modificare il comportamento di sincronizzazione dello"
+" scaffale per l'/gli utente/i selezionato/i?"
 
 #: cps/admin.py:629
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "Sei sicuro di voler modificare la posizione della libreria di Calibre?"
 
 #: cps/admin.py:631
-msgid "Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?"
-msgstr "Calibre-Web cercherà le copertine aggiornate e aggiornerà le miniature delle copertine, questo richiederà un po' di tempo."
+msgid ""
+"Calibre-Web will search for updated Covers and update Cover Thumbnails, this"
+" may take a while?"
+msgstr ""
+"Calibre-Web cercherà le copertine aggiornate e aggiornerà le miniature delle"
+" copertine, questo richiederà un po' di tempo."
 
 #: cps/admin.py:634
-msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr "Sei sicuro di voler eliminare il database sincoronizzato di Calibre-Web e forzare una sincronizzazione completa con il tuo lettore Kobo?"
+msgid ""
+"Are you sure you want delete Calibre-Web's sync database to force a full sync"
+" with your Kobo Reader?"
+msgstr ""
+"Sei sicuro di voler eliminare il database sincronizzato di Calibre-Web e"
+" forzare una sincronizzazione completa con il tuo lettore Kobo?"
 
 #: cps/admin.py:877 cps/admin.py:883 cps/admin.py:893 cps/admin.py:903
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
@@ -210,7 +240,7 @@ msgstr "Permetti"
 
 #: cps/admin.py:920
 msgid "{} sync entries deleted"
-msgstr "{} eliminate voci di sincronizzazione"
+msgstr "{} voci di sincronizzazione eliminate"
 
 #: cps/admin.py:968
 msgid "Tag not found"
@@ -226,11 +256,15 @@ msgstr "client_secrets.json non è configurato per Web Application"
 
 #: cps/admin.py:1154
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
-msgstr "La posizione del Logfile non è valida, per favore indica il percorso corretto"
+msgstr ""
+"La posizione del file di log non è valida, per favore indica il percorso"
+" corretto"
 
 #: cps/admin.py:1160
 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"
+msgstr ""
+"La posizione del file di log di accesso non è valida, per favore indica il"
+" percorso corretto"
 
 #: cps/admin.py:1190
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
@@ -251,7 +285,8 @@ msgstr "LDAP Group Object Filter deve avere un \"%s\" Format Identifier"
 
 #: cps/admin.py:1206
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
-msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
+msgstr ""
+"LDAP Group Object Filter contiene una parentesi senza la corrispondenza"
 
 #: cps/admin.py:1210
 #, python-format
@@ -260,7 +295,7 @@ msgstr "LDAP User Object Filter deve avere un \"%s\" Format Identifier"
 
 #: cps/admin.py:1212
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
-msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
+msgstr "LDAP User Object Filter contiene una parentesi senza la corrispondenza"
 
 #: cps/admin.py:1219
 #, python-format
@@ -269,11 +304,15 @@ msgstr "LDAP Member User Filter deve avere un \"%s\" Format Identifier"
 
 #: cps/admin.py:1221
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
-msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
+msgstr "LDAP Member User Filter contiene una parentesi senza la corrispondenza"
 
 #: cps/admin.py:1228
-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"
+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:1259 cps/templates/admin.html:53
 msgid "Add New User"
@@ -285,7 +324,7 @@ msgstr "Modifica le impostazioni del server e-mail"
 
 #: cps/admin.py:1287
 msgid "Success! Gmail Account Verified."
-msgstr ""
+msgstr "OK! Account Gmail verificato."
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -298,8 +337,11 @@ msgstr "Errore nel database: %(error)s."
 
 #: cps/admin.py:1316
 #, python-format
-msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr "L'e-mail di test è stato accodato con successo per essere spedito a  %(email)s, per favore verifica tramite il pulsante 'Compito' il risultato"
+msgid ""
+"Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr ""
+"L'e-mail di test è stato accodata con successo per essere spedita a "
+"%(email)s, per favore verifica tramite il pulsante 'Attività' il risultato"
 
 #: cps/admin.py:1319
 #, python-format
@@ -312,7 +354,7 @@ msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
 #: cps/admin.py:1323
 msgid "Email Server Settings updated"
-msgstr "Configurazione del server e-mail aggiornata"
+msgstr "Le impostazioni del server e-mail sono state aggiornate"
 
 #: cps/admin.py:1346 cps/templates/admin.html:191
 msgid "Edit Scheduled Tasks Settings"
@@ -345,34 +387,33 @@ msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
 #: cps/admin.py:1428
-#, fuzzy, python-format
+#, python-format
 msgid "Success! Password for user %(user)s reset"
-msgstr "La password dell'utente %(user)s è stata resettata"
+msgstr "OK! Reimpostazione della password per l'utente %(user)s"
 
 #: cps/admin.py:1434
-#, fuzzy
 msgid "Oops! Please configure the SMTP mail settings."
-msgstr "Configura dapprima le impostazioni del server SMTP..."
+msgstr "Configura prima le impostazioni del server SMTP."
 
 #: cps/admin.py:1445
 msgid "Logfile viewer"
-msgstr "Visualizzatore del Logfile"
+msgstr "Visualizzatore del file di log"
 
 #: cps/admin.py:1511
 msgid "Requesting update package"
-msgstr "Richiedo il pacchetto di aggiornamento"
+msgstr "Richiesta del pacchetto di aggiornamento"
 
 #: cps/admin.py:1512
 msgid "Downloading update package"
-msgstr "Scarico il pacchetto di aggiornamento"
+msgstr "Download del pacchetto di aggiornamento"
 
 #: cps/admin.py:1513
 msgid "Unzipping update package"
-msgstr "Decomprimo il pacchetto di aggiornamento"
+msgstr "Decompressione del pacchetto di aggiornamento"
 
 #: cps/admin.py:1514
 msgid "Replacing files"
-msgstr "Sostituisco i file"
+msgstr "Sostituzione dei file"
 
 #: cps/admin.py:1515
 msgid "Database connections are closed"
@@ -380,7 +421,7 @@ msgstr "Le connessioni al database sono chiuse"
 
 #: cps/admin.py:1516
 msgid "Stopping server"
-msgstr "Arresto il server"
+msgstr "Arresto del server"
 
 #: cps/admin.py:1517
 msgid "Update finished, please press okay and reload page"
@@ -409,7 +450,8 @@ msgstr "Errore generale"
 
 #: cps/admin.py:1522
 msgid "Update file could not be saved in temp dir"
-msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
+msgstr ""
+"Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
 #: cps/admin.py:1523
 msgid "Files could not be replaced during update"
@@ -417,11 +459,11 @@ msgstr "Durante l'aggiornamento non è stato possibile sostituire alcuni file"
 
 #: cps/admin.py:1547
 msgid "Failed to extract at least One LDAP User"
-msgstr "Fallita l'estrazione di almeno un utente LDAP"
+msgstr "Impossibile estrarre almeno un utente LDAP"
 
 #: cps/admin.py:1592
 msgid "Failed to Create at Least One LDAP User"
-msgstr "Fallita la creazione di almeno un utente LDAP"
+msgstr "Impossibile creare almeno un utente LDAP"
 
 #: cps/admin.py:1605
 #, python-format
@@ -434,7 +476,7 @@ msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
 #: cps/admin.py:1642
 msgid "At Least One LDAP User Not Found in Database"
-msgstr "Almeno un utente LDAP non è stato trovato nel database"
+msgstr "Non è stato trovato nessun utente LDAP nel database"
 
 #: cps/admin.py:1644
 msgid "{} User Successfully Imported"
@@ -442,7 +484,8 @@ msgstr "{} utente importato con successo"
 
 #: cps/admin.py:1702
 msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "La posizione del DB non è valida, per favore indica il percorso corretto"
+msgstr ""
+"La posizione del DB non è valida, per favore indica il percorso corretto"
 
 #: cps/admin.py:1722
 msgid "DB is not Writeable"
@@ -450,19 +493,21 @@ msgstr "Il DB non è scrivibile"
 
 #: cps/admin.py:1735
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "La posizione del Keyfile non è valida, per favore indica il percorso corretto"
+msgstr ""
+"La posizione del Keyfile non è valida, per favore indica il percorso corretto"
 
 #: cps/admin.py:1739
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "La posizione del Certfile non è valida, per favore indica il percorso corretto"
+msgstr ""
+"La posizione del Certfile non è valida, per favore indica il percorso corretto"
 
 #: cps/admin.py:1847
 msgid "Database Settings updated"
-msgstr "Configurazione del Database aggiornata"
+msgstr "Impostazioni database aggiornate"
 
 #: cps/admin.py:1855
 msgid "Database Configuration"
-msgstr "Configurazione del Database"
+msgstr "Configurazione del database"
 
 #: cps/admin.py:1871 cps/web.py:1235
 msgid "Oops! Please complete all fields."
@@ -483,7 +528,7 @@ msgstr "L'utente '%(user)s' è stato creato"
 
 #: cps/admin.py:1902
 msgid "Oops! An account already exists for this Email. or name."
-msgstr "Trovato un account esistente con questo e-mail o nome di utente"
+msgstr "Trovato un account esistente con questa e-mail o nome utente"
 
 #: cps/admin.py:1932
 #, python-format
@@ -496,11 +541,13 @@ msgstr "Non posso eliminare l'utente Guest (ospite)"
 
 #: cps/admin.py:1938
 msgid "No admin user remaining, can't delete user"
-msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
+msgstr ""
+"Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
 #: cps/admin.py:1992 cps/web.py:1373
 msgid "Email can't be empty and has to be a valid Email"
-msgstr "L'indirizzo e-mail non può essere vuoto e deve essere un recapito valido"
+msgstr ""
+"L'indirizzo e-mail non può essere vuoto e deve essere un recapito valido"
 
 #: cps/admin.py:2018
 #, python-format
@@ -516,9 +563,10 @@ msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
 #: cps/db.py:728 cps/search.py:137 cps/web.py:725
-#, fuzzy, python-format
+#, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
-msgstr "La colonna personalizzata no.%(column)d non esiste nel database di Calibre"
+msgstr ""
+"La colonna personalizzata no.%(column)d non esiste nel database di Calibre"
 
 #: cps/db.py:971 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
@@ -529,8 +577,10 @@ msgstr "Nessuna"
 
 #: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:519 cps/web.py:1464
 #: cps/web.py:1506 cps/web.py:1551
-msgid "Oops! Selected book 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"
+msgid ""
+"Oops! Selected book is unavailable. File does not exist or is not accessible"
+msgstr ""
+"Il libro selezionato non è disponibile. Il file non esiste o non è accessibile"
 
 #: cps/editbooks.py:154 cps/editbooks.py:1221
 msgid "User has no rights to upload cover"
@@ -538,7 +588,9 @@ msgstr "L'utente non ha i permessi per caricare le copertine"
 
 #: cps/editbooks.py:174 cps/editbooks.py:716
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
-msgstr "Gli identificatori non tengono conto delle lettere maiuscole o minuscole, sovrascrivo l'identificatore precedente"
+msgstr ""
+"Gli identificatori non fanno distinzione tra maiuscole e minuscole,"
+" sovrascrivendo il vecchio identificatore"
 
 #: cps/editbooks.py:216
 msgid "Metadata successfully updated"
@@ -555,7 +607,9 @@ msgstr "Il file %(file)s è stato caricato"
 
 #: cps/editbooks.py:318
 msgid "Source or destination format for conversion missing"
-msgstr "Mancano o il formato sorgente o quello di destinazione, entrambi necessari alla conversione"
+msgstr ""
+"Mancano o il formato sorgente o quello di destinazione, entrambi necessari"
+" alla conversione"
 
 #: cps/editbooks.py:326
 #, python-format
@@ -568,8 +622,12 @@ msgid "There was an error converting this book: %(res)s"
 msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
 
 #: cps/editbooks.py:635
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiarlo prima di sottoporlo nuovamente: "
+msgid ""
+"Uploaded book probably exists in the library, consider to change before"
+" upload new: "
+msgstr ""
+"Probabilmente il libro caricato esiste già nella libreria, cambialo prima di"
+" caricarlo nuovamente:"
 
 #: cps/editbooks.py:690 cps/editbooks.py:1015
 #, python-format
@@ -579,7 +637,8 @@ msgstr "%(langname)s non è una lingua valida"
 #: cps/editbooks.py:728 cps/editbooks.py:1162
 #, 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"
+msgstr ""
+"Non è consentito caricare file con l'estensione '%(ext)s' su questo server"
 
 #: cps/editbooks.py:732 cps/editbooks.py:1166
 msgid "File to be uploaded must have an extension"
@@ -601,11 +660,11 @@ msgstr "Il formato del libro è stato eliminato con successo"
 
 #: cps/editbooks.py:826 cps/editbooks.py:828
 msgid "Book Successfully Deleted"
-msgstr "Il libro é stato eliminato con successo"
+msgstr "Il libro è stato eliminato con successo"
 
 #: cps/editbooks.py:880
 msgid "You are missing permissions to delete books"
-msgstr "Non disponi delle autorizzazioni per eliminare libri"
+msgstr "Mancano le autorizzazioni per eliminare i libri"
 
 #: cps/editbooks.py:930
 msgid "edit metadata"
@@ -614,7 +673,7 @@ msgstr "modifica i metadati"
 #: cps/editbooks.py:979
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s non è un numero valido, vado oltre"
+msgstr "%(seriesindex)s non è un numero valido, lo salto"
 
 #: cps/editbooks.py:1157
 msgid "User has no rights to upload additional file formats"
@@ -623,7 +682,7 @@ msgstr "L'utente non ha i permessi per caricare formati di file aggiuntivi"
 #: cps/editbooks.py:1178
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
+msgstr "Impossibile creare il percorso %(path)s (autorizzazione negata)."
 
 #: cps/editbooks.py:1183
 #, python-format
@@ -636,12 +695,20 @@ msgid "File format %(ext)s added to %(book)s"
 msgstr "Ho aggiunto il formato %(ext)s al libro %(book)s"
 
 #: cps/gdrive.py:58
-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"
+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:95
-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"
+msgid ""
+"Callback domain is not verified, please follow steps to verify domain in"
+" google developer console"
+msgstr ""
+"Il dominio di callback non è stato verificato. Per favore segui i passaggi"
+" per verificare il dominio nella console per sviluppatori di Google"
 
 #: cps/helper.py:80
 #, python-format
@@ -661,46 +728,43 @@ msgstr "%(format)s non trovato: %(fn)s"
 #: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
 #: cps/templates/detail.html:46
 msgid "Send to eReader"
-msgstr "Invia al lettore elettronico"
+msgstr "Invia all'eReader"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-#, fuzzy
 msgid "This Email has been sent via Calibre-Web."
-msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
+msgstr "Questa e-mail è stata inviata tramite Calibre-Web."
 
 #: cps/helper.py:114
-#, fuzzy
 msgid "Calibre-Web Test Email"
-msgstr "E-mail di test da Calibre-Web"
+msgstr "E-mail di prova di Calibre-Web"
 
 #: cps/helper.py:115
-#, fuzzy
 msgid "Test Email"
-msgstr "E-mail di test"
+msgstr "E-mail di prova"
 
 #: cps/helper.py:132
 msgid "Get Started with Calibre-Web"
 msgstr "Inizia con Calibre-Web"
 
 #: cps/helper.py:137
-#, fuzzy, python-format
+#, python-format
 msgid "Registration Email for user: %(name)s"
-msgstr "E-mail di registrazione dell'utente: %(name)s"
+msgstr "E-mail di registrazione per l'utente: %(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, fuzzy, python-format
+#, python-format
 msgid "Convert %(orig)s to %(format)s and send to eReader"
-msgstr "Converti %(orig)s in %(format)s e al lettore elettronico"
+msgstr "Converti %(orig)s in %(format)s e invia all'eReader"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, fuzzy, python-format
+#, python-format
 msgid "Send %(format)s to eReader"
-msgstr "Invia %(format)s al lettore elettronico"
+msgstr "Invia %(format)s all'eReader"
 
 #: cps/helper.py:225
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to eReader"
-msgstr "%(book)s inviato al lettore elettronico"
+msgstr "%(libro)s inviato all'eReader"
 
 #: cps/helper.py:230
 msgid "The requested file could not be read. Maybe wrong permissions?"
@@ -712,8 +776,11 @@ msgstr "Impossibile impostare lo stato di lettura: {}"
 
 #: cps/helper.py:368
 #, python-format
-msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr "L'eliminazione della cartella del libro %(id)s non è riuscita, il percorso ha sottocartelle: %(path)s"
+msgid ""
+"Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr ""
+"L'eliminazione della cartella del libro %(id)s non è riuscita, il percorso ha"
+" delle sottocartelle: %(path)s"
 
 #: cps/helper.py:374
 #, python-format
@@ -722,13 +789,20 @@ msgstr "L'eliminazione del libro %(id)s non è riuscita: %(message)s"
 
 #: cps/helper.py:385
 #, python-format
-msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
-msgstr "Eliminazione del libro %(id)s unicamente dal database. Il percorso del libro nel database non è valido: %(path)s"
+msgid ""
+"Deleting book %(id)s from database only, book path in database not valid: "
+"%(path)s"
+msgstr ""
+"Eliminazione del libro %(id)s unicamente dal database. Il percorso del libro"
+" nel database non è valido: %(path)s"
 
 #: cps/helper.py:450
-#, fuzzy, python-format
-msgid "Rename author 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"
+#, 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:522 cps/helper.py:531
 #, python-format
@@ -738,7 +812,9 @@ msgstr "File %(file)s non trovato su Google Drive"
 #: cps/helper.py:565
 #, 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"
+msgstr ""
+"La modifica del titolo da '%(src)s' a '%(dest)s' è terminata con l'errore: "
+"%(error)s"
 
 #: cps/helper.py:585
 msgid "Error in rename file in path: {}"
@@ -747,24 +823,26 @@ msgstr "Errore nel rinominare il file nel percorso: {}"
 #: cps/helper.py:603
 #, 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"
+msgstr "Percorso del libro %(path)s non trovato su Google Drive"
 
 #: cps/helper.py:644
 msgid "Found an existing account for this Email address"
-msgstr ""
+msgstr "Trovato un account esistente per questo indirizzo e-mail"
 
 #: cps/helper.py:652
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
 #: cps/helper.py:664
-#, fuzzy
 msgid "Invalid Email address format"
-msgstr "L'e-mail non è scritto in un formato valido"
+msgstr "Formato dell'indirizzo e-mail non valido"
 
 #: cps/helper.py:815
-msgid "Python module 'advocate' is not installed but is needed for cover uploads"
-msgstr "Il modulo Python 'advocate' non è installato, ma è necessario per caricare le copertine"
+msgid ""
+"Python module 'advocate' is not installed but is needed for cover uploads"
+msgstr ""
+"Il modulo Python 'advocate' non è installato, ma è necessario per caricare le"
+" copertine"
 
 #: cps/helper.py:825
 msgid "Error Downloading Cover"
@@ -772,23 +850,30 @@ msgstr "Errore nello scaricare la copertina"
 
 #: cps/helper.py:828
 msgid "Cover Format Error"
-msgstr "Errore di formato della copertina"
+msgstr "Errore nel formato della copertina"
 
 #: cps/helper.py:831
-msgid "You are not allowed to access localhost or the local network for cover uploads"
-msgstr "Non sei autorizzato ad accedere a localhost o alla rete locale per caricare le copertine"
+msgid ""
+"You are not allowed to access localhost or the local network for cover uploads"
+msgstr ""
+"Non sei autorizzato ad accedere a localhost o alla rete locale per caricare"
+" le copertine"
 
 #: cps/helper.py:841
 msgid "Failed to create path for cover"
-msgstr "Errore nel creare la cartella per la copertina"
+msgstr "Errore nel creare il percorso per la copertina"
 
 #: cps/helper.py:857
 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"
+msgstr ""
+"Il file della copertina non è in un formato immagine valido o non può essere"
+" salvato"
 
 #: cps/helper.py:868
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr "Solamente i file nei formati jpg/jpeg/png/webp/bmp sono supportati per le copertine"
+msgstr ""
+"Solamente i file nei formati jpg/jpeg/png/webp/bmp sono supportati per le"
+" copertine"
 
 #: cps/helper.py:880
 msgid "Invalid cover file content"
@@ -815,8 +900,12 @@ msgid "Queue all books for metadata backup"
 msgstr "Metti in coda tutti i libri per il backup dei metadati"
 
 #: cps/kobo_auth.py:89
-msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
-msgstr "Per favore accedi a Calibe-Web non da localhost per ottenere un api-endpoint valido per il lettore kobo"
+msgid ""
+"Please access Calibre-Web from non localhost to get valid api_endpoint for"
+" kobo device"
+msgstr ""
+"Per favore accedi a Calibe-Web non da localhost per ottenere un api-endpoint"
+" valido per il lettore kobo"
 
 #: cps/kobo_auth.py:115
 msgid "Kobo Setup"
@@ -830,7 +919,7 @@ msgstr "Registra con %(provider)s"
 #: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1293 cps/web.py:1331
 #, python-format
 msgid "Success! You are now logged in as: %(nickname)s"
-msgstr "ora sei connesso come: '%(nickname)s'"
+msgstr "OK! Ora sei connesso come: %(nickname)s"
 
 #: cps/oauth_bb.py:148
 #, python-format
@@ -839,17 +928,18 @@ msgstr "Collegamento a %(oauth)s avvenuto con successo"
 
 #: cps/oauth_bb.py:155
 msgid "Login failed, No User Linked With OAuth Account"
-msgstr "Accesso non riuscito, non c'è un utente collegato all'account OAuth"
+msgstr ""
+"Accesso non riuscito, non c'è nessun utente collegato all'account OAuth"
 
 #: cps/oauth_bb.py:197
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
-msgstr "Scollegamento da  %(oauth)s avvenuto con successo"
+msgstr "Scollegamento da %(oauth)s riuscito"
 
 #: cps/oauth_bb.py:202
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
-msgstr "Scollegamento da  %(oauth)s non riuscito"
+msgstr "Scollegamento da %(oauth)s non riuscito"
 
 #: cps/oauth_bb.py:205
 #, python-format
@@ -858,19 +948,19 @@ msgstr "Non collegato a %(oauth)s"
 
 #: cps/oauth_bb.py:261
 msgid "Failed to log in with GitHub."
-msgstr "Accesso con GitHub non è riuscito."
+msgstr "Impossibile accedere con GitHub."
 
 #: cps/oauth_bb.py:267
 msgid "Failed to fetch user info from GitHub."
-msgstr "Il recupero delle informazioni dell'utente da GitHub non è riuscito."
+msgstr "Impossibile recuperare le informazioni utente da GitHub."
 
 #: cps/oauth_bb.py:279
 msgid "Failed to log in with Google."
-msgstr "L'accesso con Google non è riuscito."
+msgstr "Impossibile accedere con Google."
 
 #: cps/oauth_bb.py:285
 msgid "Failed to fetch user info from Google."
-msgstr "Il recupero delle informazioni dell'utente da Google non è riuscito."
+msgstr "Impossibile recuperare le informazioni utente da Google."
 
 #: cps/oauth_bb.py:332
 msgid "GitHub Oauth error, please retry later."
@@ -908,7 +998,7 @@ msgstr "Il token è scaduto"
 
 #: cps/remotelogin.py:92
 msgid "Success! Please return to your device"
-msgstr "Riuscito! Torna al tuo dispositivo"
+msgstr "OK! Torna al tuo dispositivo"
 
 #: cps/render_template.py:40 cps/web.py:408
 msgid "Books"
@@ -916,15 +1006,15 @@ msgstr "Libri"
 
 #: cps/render_template.py:42
 msgid "Show recent books"
-msgstr "Mostra l'opzione per la selezione dei libri più recenti"
+msgstr "Mostra i libri recenti"
 
 #: cps/render_template.py:43 cps/templates/index.xml:25
 msgid "Hot Books"
-msgstr "Libri popolari"
+msgstr "Libri hot"
 
 #: cps/render_template.py:45
 msgid "Show Hot Books"
-msgstr "Mostra l'opzione per la selezione dei libri più popolari"
+msgstr "Mostra i libri hot"
 
 #: cps/render_template.py:47 cps/render_template.py:52
 msgid "Downloaded Books"
@@ -933,15 +1023,15 @@ msgstr "Libri scaricati"
 #: cps/render_template.py:49 cps/render_template.py:54
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
-msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
+msgstr "Mostra i libri scaricati"
 
 #: cps/render_template.py:57 cps/templates/index.xml:32 cps/web.py:423
 msgid "Top Rated Books"
-msgstr "Libri meglio valutati"
+msgstr "Libri più votati"
 
 #: cps/render_template.py:59 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
-msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
+msgstr "Mostra i libri più votati"
 
 #: cps/render_template.py:60 cps/templates/index.xml:54
 #: cps/templates/index.xml:58 cps/web.py:744
@@ -949,27 +1039,26 @@ msgid "Read Books"
 msgstr "Libri letti"
 
 #: cps/render_template.py:62
-#, fuzzy
 msgid "Show Read and Unread"
-msgstr "Mostra l'opzione per la selezione letto e non letto"
+msgstr "Mostra i libri letti e da leggere"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
 #: cps/templates/index.xml:65 cps/web.py:747
 msgid "Unread Books"
-msgstr "Libri non letti"
+msgstr "Libri da leggere"
 
 #: cps/render_template.py:66
 msgid "Show unread"
-msgstr "Mostra l'opzione per la selezione dei libri non letti"
+msgstr "Mostra da leggere"
 
 #: cps/render_template.py:67
 msgid "Discover"
-msgstr "Per scoprire"
+msgstr "Da scoprire"
 
 #: cps/render_template.py:69 cps/templates/index.xml:50
 #: cps/templates/user_table.html:159 cps/templates/user_table.html:162
 msgid "Show Random Books"
-msgstr "Mostra libri casualmente"
+msgstr "Mostra i libri casualmente"
 
 #: cps/render_template.py:70 cps/templates/book_table.html:67
 #: cps/templates/index.xml:83 cps/web.py:1104
@@ -977,9 +1066,8 @@ msgid "Categories"
 msgstr "Categorie"
 
 #: cps/render_template.py:72 cps/templates/user_table.html:158
-#, fuzzy
 msgid "Show Category Section"
-msgstr "Mostra l'opzione per la selezione delle categorie"
+msgstr "Mostra la sezione delle categorie"
 
 #: cps/render_template.py:73 cps/templates/book_edit.html:91
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
@@ -988,9 +1076,8 @@ msgid "Series"
 msgstr "Serie"
 
 #: cps/render_template.py:75 cps/templates/user_table.html:157
-#, fuzzy
 msgid "Show Series Section"
-msgstr "Mostra l'opzione per la selezione delle serie"
+msgstr "Mostra la sezione delle serie"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
@@ -998,9 +1085,8 @@ msgid "Authors"
 msgstr "Autori"
 
 #: cps/render_template.py:78 cps/templates/user_table.html:160
-#, fuzzy
 msgid "Show Author Section"
-msgstr "Mostra l'opzione per la selezione degli autori"
+msgstr "Mostra la sezione degli autori"
 
 #: cps/render_template.py:80 cps/templates/book_table.html:72
 #: cps/templates/index.xml:76 cps/web.py:971
@@ -1008,9 +1094,8 @@ msgid "Publishers"
 msgstr "Editori"
 
 #: cps/render_template.py:82 cps/templates/user_table.html:163
-#, fuzzy
 msgid "Show Publisher Section"
-msgstr "Mostra l'opzione per la selezione degli editori"
+msgstr "Mostra la sezione degli editori"
 
 #: cps/render_template.py:83 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
@@ -1019,36 +1104,32 @@ msgid "Languages"
 msgstr "Lingue"
 
 #: cps/render_template.py:86 cps/templates/user_table.html:155
-#, fuzzy
 msgid "Show Language Section"
-msgstr "Mostra l'opzione per la selezione delle lingue"
+msgstr "Mostra la sezione delle lingue"
 
 #: cps/render_template.py:87 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "Valutazioni"
 
 #: cps/render_template.py:89 cps/templates/user_table.html:164
-#, fuzzy
 msgid "Show Ratings Section"
-msgstr "Mostra l'opzione per la selezione delle valutazioni"
+msgstr "Mostra la sezione delle valutazioni"
 
 #: cps/render_template.py:90 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "Formati file"
 
 #: cps/render_template.py:92 cps/templates/user_table.html:165
-#, fuzzy
 msgid "Show File Formats Section"
-msgstr "Mostra l'opzione per la selezione del formato dei file"
+msgstr "Mostra la sezione dei formati dei file"
 
 #: cps/render_template.py:94 cps/web.py:770
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
 #: cps/render_template.py:96 cps/templates/user_table.html:166
-#, fuzzy
 msgid "Show Archived Books"
-msgstr "Mostra l'opzione per la selezione dei libri archiviati"
+msgstr "Mostra i libri archiviati"
 
 #: cps/render_template.py:99 cps/web.py:801
 msgid "Books List"
@@ -1056,7 +1137,7 @@ msgstr "Elenco libri"
 
 #: cps/render_template.py:101 cps/templates/user_table.html:168
 msgid "Show Books List"
-msgstr "Mostra l'opzione per visualizzare i libri sottoforma di elenco"
+msgstr "Mostra l'elenco dei libri"
 
 #: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
@@ -1090,7 +1171,8 @@ msgstr "Stato di lettura = %(status)s"
 
 #: cps/search.py:323
 msgid "Error on search for custom columns, please restart Calibre-Web"
-msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
+msgstr ""
+"Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
 #: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
 msgid "Advanced Search"
@@ -1102,7 +1184,8 @@ msgstr "Lo scaffale specificato non è valido"
 
 #: cps/shelf.py:55
 msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "Mi spiace, ma non sei autorizzato ad aggiungere libri a questo scaffale"
+msgstr ""
+"Mi spiace, ma non sei autorizzato ad aggiungere libri a questo scaffale"
 
 #: cps/shelf.py:64
 #, python-format
@@ -1140,7 +1223,7 @@ msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
 
 #: cps/shelf.py:200
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr "Spiacente, ma non sei autorizzato a togliere libri da questo scaffale"
+msgstr "Spiacente, ma non sei autorizzato a rimuovere libri da questo scaffale"
 
 #: cps/shelf.py:210 cps/templates/layout.html:157
 msgid "Create a Shelf"
@@ -1183,17 +1266,17 @@ msgstr "Lo scaffale %(title)s è stato modificato"
 
 #: cps/shelf.py:347
 msgid "There was an error"
-msgstr "C'era un errore"
+msgstr "C'è stato un errore"
 
 #: cps/shelf.py:369
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Esiste già uno scaffale pubblico denominato '%(title)s'."
+msgstr "Esiste già uno scaffale pubblico con il nome '%(title)s'."
 
 #: cps/shelf.py:380
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Esiste già uno scaffale privato denominato '%(title)s'."
+msgstr "Esiste già uno scaffale privato con il nome '%(title)s'."
 
 #: cps/shelf.py:462
 #, python-format
@@ -1202,12 +1285,14 @@ msgstr "Scaffale: '%(name)s'"
 
 #: cps/shelf.py:466
 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"
+msgstr ""
+"Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è"
+" accessibile"
 
 #: cps/tasks_status.py:48 cps/templates/layout.html:88
 #: cps/templates/tasks.html:7
 msgid "Tasks"
-msgstr "Compito"
+msgstr "Attività"
 
 #: cps/tasks_status.py:64
 msgid "Waiting"
@@ -1231,7 +1316,7 @@ msgstr "Terminato"
 
 #: cps/tasks_status.py:74
 msgid "Cancelled"
-msgstr "Cancellato"
+msgstr "Annullato"
 
 #: cps/tasks_status.py:76
 msgid "Unknown Status"
@@ -1239,32 +1324,43 @@ msgstr "Stato sconosciuto"
 
 #: cps/updater.py:431 cps/updater.py:442 cps/updater.py:543 cps/updater.py:558
 msgid "Unexpected data while reading update information"
-msgstr "Dati inattesi durante il processo di aggiornamento"
+msgstr "Dati imprevisti durante la lettura delle informazioni di aggiornamento"
 
 #: cps/updater.py:438 cps/updater.py:550
 msgid "No update available. You already have the latest version installed"
-msgstr "Nessun aggiornamento disponibile. Hai già installata l'ultima versione"
+msgstr "Nessun aggiornamento disponibile. Hai già l'ultima versione installata"
 
 #: cps/updater.py:456
-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."
+msgid ""
+"A new update is available. Click on the button below to update to the latest"
+" version."
+msgstr ""
+"È disponibile un nuovo aggiornamento. Fare clic sul pulsante in basso per"
+" aggiornare all'ultima versione"
 
 #: cps/updater.py:474
 msgid "Could not fetch update information"
-msgstr "Impossibile recuperare le informazioni di aggiornamento"
+msgstr "Impossibile recuperare le informazioni sull'aggiornamento"
 
 #: cps/updater.py:484
 msgid "Click on the button below to update to the latest stable version."
-msgstr "Clicca sul pulsante per aggiornare all'ultima versione stabile."
+msgstr ""
+"Fare clic sul pulsante in basso per eseguire l'aggiornamento all'ultima"
+" versione stabile."
 
 #: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
 #, 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"
+msgid ""
+"A new update is available. Click on the button below to update to version: "
+"%(version)s"
+msgstr ""
+"È disponibile un nuovo aggiornamento. Fare clic sul pulsante in basso per"
+" aggiornare alla versione:"
+"%(versione)s"
 
 #: cps/updater.py:536
 msgid "No release information available"
-msgstr "Non sono disponibili informazioni sulla versione"
+msgstr "Nessuna informazione disponibile sulla versione"
 
 #: cps/templates/index.html:6 cps/web.py:435
 msgid "Discover (Random Books)"
@@ -1272,12 +1368,12 @@ msgstr "Scopri (libri casuali)"
 
 #: cps/web.py:471
 msgid "Hot Books (Most Downloaded)"
-msgstr "I libri più richiesti"
+msgstr "Libri hot (i più scaricati)"
 
 #: cps/web.py:502
 #, python-format
 msgid "Downloaded books by %(user)s"
-msgstr "I libri scaricati da %(user)s"
+msgstr "Libri scaricati da %(user)s"
 
 #: cps/web.py:535
 #, python-format
@@ -1320,7 +1416,7 @@ msgstr "Lingua: %(name)s"
 
 #: cps/templates/admin.html:16 cps/web.py:943
 msgid "Downloads"
-msgstr "Downloads"
+msgstr "Scaricati"
 
 #: cps/web.py:1036
 msgid "Ratings list"
@@ -1332,41 +1428,42 @@ msgstr "Elenco dei formati"
 
 #: cps/web.py:1200
 msgid "Please configure the SMTP mail settings first."
-msgstr "Configura dapprima le impostazioni del server SMTP..."
+msgstr "Configura prima le impostazioni del server SMTP."
 
 #: cps/web.py:1205
 #, python-format
 msgid "Success! Book queued for sending to %(eReadermail)s"
-msgstr "Libro accodato con successo per essere spedito a %(eReadermail)s"
+msgstr "OK! Libro in coda per l'invio a %(eReadermail)s"
 
 #: cps/web.py:1209
 #, python-format
 msgid "Oops! There was an error sending book: %(res)s"
-msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
+msgstr "Si è verificato un errore durante l'invio del libro: %(res)s"
 
 #: cps/web.py:1211
-#, fuzzy
 msgid "Oops! Please update your profile with a valid eReader Email."
-msgstr "Per favore aggiorna il tuo profilo con un indirizzo e-mail Kindle a cui inviare i libri."
+msgstr "Per favore aggiorna il tuo profilo con un'e-mail eReader valida."
 
 #: cps/web.py:1228
-msgid "Oops! Email server is not configured, please contact your administrator."
-msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
+msgid ""
+"Oops! Email server is not configured, please contact your administrator."
+msgstr ""
+"Il server e-mail non è configurato, per favore contatta l'amministratore"
 
 #: cps/templates/layout.html:68 cps/templates/layout.html:102
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1229
 #: cps/web.py:1236 cps/web.py:1242 cps/web.py:1262 cps/web.py:1267
 #: cps/web.py:1273
 msgid "Register"
-msgstr "Registra"
+msgstr "Registrati"
 
 #: cps/web.py:1264
 msgid "Oops! Your Email is not allowed."
-msgstr "Il tuo e-mail non è autorizzato alla registrazione"
+msgstr "La tua e-mail non è consentita."
 
 #: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
-msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
+msgstr "OK! L'e-mail di conferma è stata inviata."
 
 #: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
@@ -1374,8 +1471,11 @@ msgstr "Non posso attivare l'autenticazione LDAP"
 
 #: cps/web.py:1301
 #, python-format
-msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
-msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
+msgid ""
+"Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
+msgstr ""
+"Accesso di riserva come: '%(nickname)s', il server LDAP non è raggiungibile o"
+" l'utente è sconosciuto"
 
 #: cps/web.py:1307
 #, python-format
@@ -1384,15 +1484,15 @@ msgstr "Non posso accedere: %(message)s"
 
 #: cps/web.py:1311 cps/web.py:1336
 msgid "Oops! Invalid Username or Password."
-msgstr "Nome utente o password errati"
+msgstr "Nome utente o password errati."
 
 #: cps/web.py:1318
 msgid "Success! New Password was sent to your Email."
-msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
+msgstr "OK! La nuova password è stata inviata alla tua e-mail."
 
 #: cps/web.py:1324
 msgid "Oops! Please enter a valid username to reset password"
-msgstr "Per favore digita un nome di utente valido per resettare la password"
+msgstr "Inserisci un nome utente valido per reimpostare la password"
 
 #: cps/web.py:1398 cps/web.py:1447
 #, python-format
@@ -1400,13 +1500,12 @@ msgid "%(name)s's Profile"
 msgstr "Profilo di %(name)s"
 
 #: cps/web.py:1414
-#, fuzzy
 msgid "Success! Profile Updated"
-msgstr "Profilo aggiornato"
+msgstr "OK! Profilo aggiornato"
 
 #: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
-msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
+msgstr "Esiste già un account per questa e-mail."
 
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
@@ -1415,7 +1514,7 @@ msgstr "Ho trovato un gmail.json file senza informazione OAuth"
 #: cps/tasks/convert.py:92
 #, python-format
 msgid "%(book)s send to E-Reader"
-msgstr "%(book)s inviato al lettore elettronico"
+msgstr "%(libro)s inviato all'E-Reader"
 
 #: cps/tasks/convert.py:153
 #, python-format
@@ -1439,7 +1538,9 @@ msgstr "Si è verificato un errore con il convertitore Kepubify: %(error)s"
 #: cps/tasks/convert.py:224
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
-msgstr "Non ho trovato il file convertito o ci sono più di un file nella cartella %(folder)s"
+msgstr ""
+"Non ho trovato il file convertito o c'è più di un file nella cartella "
+"%(folder)s"
 
 #: cps/tasks/convert.py:247
 #, python-format
@@ -1470,7 +1571,7 @@ msgstr "Backup dei metadati"
 #: cps/tasks/thumbnail.py:95
 #, python-format
 msgid "Generated %(count)s cover thumbnails"
-msgstr "Generate %(count)s miniature di copertine"
+msgstr "Sono state generate %(count)s miniature delle copertine"
 
 #: cps/tasks/thumbnail.py:222 cps/tasks/thumbnail.py:435
 #: cps/tasks/thumbnail.py:503
@@ -1479,40 +1580,40 @@ msgstr "Miniature delle copertine"
 
 #: cps/tasks/thumbnail.py:281
 msgid "Generated {0} series thumbnails"
-msgstr "Generate {0} miniature di serie"
+msgstr "Sono state generate {0} miniature delle serie"
 
 #: cps/tasks/thumbnail.py:446
 msgid "Clearing cover thumbnail cache"
-msgstr "Pulire la cache delle miniature di copertine"
+msgstr "Cancellazione della cache delle miniature delle copertine"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
 #: cps/templates/layout.html:81 cps/templates/user_table.html:145
 msgid "Upload"
-msgstr "Upload"
+msgstr "Caricamento"
 
 #: cps/templates/admin.html:9
 msgid "Users"
-msgstr "Elenco utenti"
+msgstr "Utenti"
 
 #: cps/templates/admin.html:13 cps/templates/login.html:9
 #: cps/templates/login.html:10 cps/templates/register.html:9
 #: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
 msgid "Username"
-msgstr "Utente"
+msgstr "Nome utente"
 
 #: cps/templates/admin.html:14 cps/templates/register.html:14
 #: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
 msgid "Email"
-msgstr "Indirizzo e-mail"
+msgstr "E-mail"
 
 #: cps/templates/admin.html:15 cps/templates/user_edit.html:28
 msgid "Send to eReader Email"
-msgstr "Invia all'indirizzo e-mail del lettore elettronico"
+msgstr "E-mail dell'eReader"
 
 #: cps/templates/admin.html:17 cps/templates/layout.html:91
 #: cps/templates/user_table.html:143
 msgid "Admin"
-msgstr "Amministrazione"
+msgstr "Amministratore"
 
 #: cps/templates/admin.html:18 cps/templates/login.html:13
 #: cps/templates/login.html:14 cps/templates/user_edit.html:23
@@ -1527,7 +1628,7 @@ msgstr "Download"
 
 #: cps/templates/admin.html:23
 msgid "View Books"
-msgstr "Vedi libri"
+msgstr "Visualizza libri"
 
 #: cps/templates/admin.html:24 cps/templates/user_table.html:131
 #: cps/templates/user_table.html:148
@@ -1551,7 +1652,7 @@ msgstr "Importa gli utenti LDAP"
 
 #: cps/templates/admin.html:62
 msgid "Email Server Settings"
-msgstr "Configurazione server e-mail"
+msgstr "Impostazioni server e-mail"
 
 #: cps/templates/admin.html:67 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
@@ -1567,7 +1668,7 @@ msgstr "Crittografia"
 
 #: cps/templates/admin.html:79 cps/templates/email_edit.html:47
 msgid "SMTP Login"
-msgstr "Login SMTP"
+msgstr "Accesso SMTP"
 
 #: cps/templates/admin.html:83 cps/templates/admin.html:94
 #: cps/templates/email_edit.html:55
@@ -1575,7 +1676,6 @@ msgid "From Email"
 msgstr "E-mail da"
 
 #: cps/templates/admin.html:90
-#, fuzzy
 msgid "Email Service"
 msgstr "Servizio e-mail"
 
@@ -1609,7 +1709,7 @@ msgstr "Libri per pagina"
 
 #: cps/templates/admin.html:133
 msgid "Uploads"
-msgstr "Uploads"
+msgstr "Caricamenti"
 
 #: cps/templates/admin.html:137
 msgid "Anonymous Browsing"
@@ -1621,19 +1721,19 @@ msgstr "Registrazione pubblica"
 
 #: cps/templates/admin.html:145
 msgid "Magic Link Remote Login"
-msgstr "Magic Link Login remoto"
+msgstr "Accesso remoto con Magic Link"
 
 #: cps/templates/admin.html:149
 msgid "Reverse Proxy Login"
-msgstr "Login reverse proxy"
+msgstr "Accesso reverse proxy"
 
 #: cps/templates/admin.html:154 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
-msgstr "Nome dell'intestazione Reverse Proxy"
+msgstr "Nome dell'intestazione reverse proxy"
 
 #: cps/templates/admin.html:159
 msgid "Edit Calibre Database Configuration"
-msgstr "Modifica la configurazione del Database di Calibre"
+msgstr "Modifica la configurazione del database di Calibre"
 
 #: cps/templates/admin.html:160
 msgid "Edit Basic Configuration"
@@ -1650,28 +1750,28 @@ msgstr "Attività pianificate"
 #: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
 #: cps/templates/tasks.html:18
 msgid "Start Time"
-msgstr "Ora in cui le attività sono avviate"
+msgstr "Ora di inizio"
 
 #: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
 msgid "Maximum Duration"
-msgstr "Massima durata delle attività"
+msgstr "Durata massima"
 
 #: cps/templates/admin.html:178 cps/templates/schedule_edit.html:29
 msgid "Generate Thumbnails"
-msgstr "Generazione delle miniature delle copertine"
+msgstr "Genera miniature"
 
 #: cps/templates/admin.html:182
 msgid "Generate series cover thumbnails"
-msgstr "Generazione delle miniature delle serie"
+msgstr "Genera miniature delle copertine delle serie"
 
 #: cps/templates/admin.html:186 cps/templates/admin.html:204
 #: cps/templates/schedule_edit.html:37
 msgid "Reconnect Calibre Database"
-msgstr "Ricollegare alla libreria di Calibre"
+msgstr "Ricollega il database di Calibre"
 
 #: cps/templates/admin.html:193
 msgid "Refresh Thumbnail Cache"
-msgstr "Aggiornare la cache delle miniature delle copertine"
+msgstr "Aggiorna la cache delle miniature"
 
 #: cps/templates/admin.html:199
 msgid "Administration"
@@ -1679,11 +1779,11 @@ msgstr "Amministrazione"
 
 #: cps/templates/admin.html:200
 msgid "Download Debug Package"
-msgstr "Scarica Debug Package"
+msgstr "Scarica il pacchetto di debug"
 
 #: cps/templates/admin.html:201
 msgid "View Logs"
-msgstr "Visualizza Logfile"
+msgstr "Visualizza log"
 
 #: cps/templates/admin.html:207
 msgid "Restart"
@@ -1724,7 +1824,7 @@ msgstr "Vuoi veramente riavviare Calibre-Web?"
 #: cps/templates/admin.html:253 cps/templates/admin.html:267
 #: cps/templates/admin.html:287 cps/templates/config_db.html:70
 msgid "OK"
-msgstr "Ok"
+msgstr "OK"
 
 #: cps/templates/admin.html:254 cps/templates/admin.html:268
 #: cps/templates/book_edit.html:214 cps/templates/book_table.html:127
@@ -1791,7 +1891,7 @@ msgstr "riduci"
 
 #: cps/templates/author.html:99
 msgid "More by"
-msgstr "Altro da"
+msgstr "Altri di"
 
 #: cps/templates/book_edit.html:11
 msgid "Delete Book"
@@ -1811,7 +1911,7 @@ msgstr "Converti da:"
 
 #: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
-msgstr "seleziona un formato"
+msgstr "seleziona un'opzione"
 
 #: cps/templates/book_edit.html:37
 msgid "Convert to:"
@@ -1858,7 +1958,7 @@ msgstr "Aggiungi un identificatore"
 
 #: cps/templates/book_edit.html:87 cps/templates/search_form.html:51
 msgid "Tags"
-msgstr "Categorie"
+msgstr "Etichetta"
 
 #: cps/templates/book_edit.html:95
 msgid "Series ID"
@@ -1869,8 +1969,11 @@ msgid "Rating"
 msgstr "Valutazione"
 
 #: cps/templates/book_edit.html:104
-msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
-msgstr "Carica la copertina da URL (jpeg - l'immagine della copertina viene scaricata e salvata nel database)"
+msgid ""
+"Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr ""
+"Carica la copertina da URL (jpeg - l'immagine della copertina viene scaricata"
+" e salvata nel database)"
 
 #: cps/templates/book_edit.html:108
 msgid "Upload Cover from Local Disk"
@@ -1907,11 +2010,11 @@ msgstr "Carica formato"
 
 #: cps/templates/book_edit.html:209
 msgid "View Book on Save"
-msgstr "Visualizza il libro dopo la modifica"
+msgstr "Visualizza il libro dopo averlo salvato"
 
 #: cps/templates/book_edit.html:212 cps/templates/book_edit.html:230
 msgid "Fetch Metadata"
-msgstr "Ottieni metadati"
+msgstr "Recupera i metadati"
 
 #: cps/templates/book_edit.html:213 cps/templates/config_db.html:53
 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
@@ -1953,7 +2056,7 @@ msgstr "Errore nella ricerca!"
 
 #: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
-msgstr "Nessun risultato! Prova con un altro criterio di ricerca."
+msgstr "Nessun risultato trovato! Prova con un'altra parola chiave."
 
 #: cps/templates/book_table.html:12 cps/templates/book_table.html:69
 #: cps/templates/user_table.html:14 cps/templates/user_table.html:77
@@ -1975,15 +2078,15 @@ msgstr "Inverti autore e titolo"
 
 #: cps/templates/book_table.html:47
 msgid "Update Title Sort automatically"
-msgstr "Aggiorna automaticamente l'ordinamento dei titoli"
+msgstr "Aggiorna automaticamente l'ordinamento per titolo"
 
 #: cps/templates/book_table.html:51
 msgid "Update Author Sort automatically"
-msgstr "Aggiorna automaticamente l'ordinamento degli autori"
+msgstr "Aggiorna automaticamente l'ordinamento per autore"
 
 #: cps/templates/book_table.html:63 cps/templates/book_table.html:69
 msgid "Enter Title"
-msgstr "Indica il titolo"
+msgstr "Inserisci il titolo"
 
 #: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
 #: cps/templates/shelf_edit.html:8
@@ -1992,23 +2095,23 @@ msgstr "Titolo"
 
 #: cps/templates/book_table.html:64
 msgid "Enter Title Sort"
-msgstr "Indica l'ordinamento del titolo"
+msgstr "Inserisci l'ordinamento per titolo"
 
 #: cps/templates/book_table.html:64
 msgid "Title Sort"
-msgstr "Ordinamento del titolo"
+msgstr "Ordina per titolo"
 
 #: cps/templates/book_table.html:65
 msgid "Enter Author Sort"
-msgstr "Indica l'ordinamento dell'autore"
+msgstr "Inserisci l'ordinamento per autore"
 
 #: cps/templates/book_table.html:65
 msgid "Author Sort"
-msgstr "Ordinamento dell'autore"
+msgstr "Ordina per autore"
 
 #: cps/templates/book_table.html:66
 msgid "Enter Authors"
-msgstr "Indica gli autori"
+msgstr "Inserisci gli autori"
 
 #: cps/templates/book_table.html:67
 msgid "Enter Categories"
@@ -2016,15 +2119,15 @@ msgstr "Indica le categorie"
 
 #: cps/templates/book_table.html:68
 msgid "Enter Series"
-msgstr "Indica le serie"
+msgstr "Inserisci le serie"
 
 #: cps/templates/book_table.html:69
 msgid "Series Index"
-msgstr "Indice delle serie"
+msgstr "Numero serie"
 
 #: cps/templates/book_table.html:70
 msgid "Enter Languages"
-msgstr "Indica le lingue"
+msgstr "Inserisci le lingue"
 
 #: cps/templates/book_table.html:71
 msgid "Publishing Date"
@@ -2032,11 +2135,11 @@ msgstr "Data di pubblicazione"
 
 #: cps/templates/book_table.html:72
 msgid "Enter Publishers"
-msgstr "Indica gli editori"
+msgstr "Inserisci gli editori"
 
 #: cps/templates/book_table.html:73
 msgid "Enter comments"
-msgstr "Digita un commento"
+msgstr "Inserisci un commento"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
@@ -2044,18 +2147,18 @@ msgstr "Commento"
 
 #: cps/templates/book_table.html:75
 msgid "Archive Status"
-msgstr "Stato dell'archivio"
+msgstr "Archiviato"
 
 #: cps/templates/book_table.html:77 cps/templates/search_form.html:42
 msgid "Read Status"
-msgstr "Stato di lettura"
+msgstr "Letto"
 
 #: cps/templates/book_table.html:80 cps/templates/book_table.html:82
 #: cps/templates/book_table.html:84 cps/templates/book_table.html:86
 #: cps/templates/book_table.html:90 cps/templates/book_table.html:92
 #: cps/templates/book_table.html:96
 msgid "Enter "
-msgstr "Conferma "
+msgstr "Inserisci"
 
 #: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
 #: cps/templates/tasks.html:36
@@ -2080,7 +2183,7 @@ msgstr "Posizione del database di Calibre"
 
 #: cps/templates/config_db.html:22
 msgid "Use Google Drive?"
-msgstr "Utilizza Google Drive"
+msgstr "Usa Google Drive"
 
 #: cps/templates/config_db.html:27
 msgid "Authenticate Google Drive"
@@ -2092,7 +2195,7 @@ msgstr "Cartella di Calibre in Google Drive"
 
 #: cps/templates/config_db.html:40
 msgid "Metadata Watch Channel ID"
-msgstr "ID canale Watch Metadata"
+msgstr "ID del canale di visualizzazione dei metadati"
 
 #: cps/templates/config_db.html:43
 msgid "Revoke"
@@ -2100,7 +2203,8 @@ msgstr "Revoca"
 
 #: cps/templates/config_db.html:68
 msgid "New db location is invalid, please enter valid path"
-msgstr "La nuova posizione del DB non è valida, per favore indica un percorso corretto"
+msgstr ""
+"La nuova posizione del database non è valida, inserisci un percorso valido"
 
 #: cps/templates/config_edit.html:18
 msgid "Server Configuration"
@@ -2112,11 +2216,16 @@ msgstr "Porta del server"
 
 #: cps/templates/config_edit.html:28
 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)"
+msgstr ""
+"Posizione del file del certificato SSL (lascia vuoto per una configurazione"
+" del"
+" server senza SSL)"
 
 #: cps/templates/config_edit.html:35
 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)"
+msgstr ""
+"Posizione del file della chiave SSL (lascia vuoto per una configurazione del"
+" server senza SSL)"
 
 #: cps/templates/config_edit.html:43
 msgid "Update Channel"
@@ -2132,23 +2241,26 @@ msgstr "Nightly"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr "Hosts fidati (separati da virgola)"
+msgstr "Host attendibili (separati da virgole)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
-msgstr "Configurazione del Logfile"
+msgstr "Configurazione del file di log"
 
 #: cps/templates/config_edit.html:77
 msgid "Location and name of logfile (calibre-web.log for no entry)"
-msgstr "Percorso e nome del Logfile (senza indicazioni sarà calibre-web.log)"
+msgstr ""
+"Posizione e nome del file di log (se non specificato sarà calibre-web.log)"
 
 #: cps/templates/config_edit.html:82
 msgid "Enable Access Log"
-msgstr "Abilita l'Access Log"
+msgstr "Abilita il log degli accessi"
 
 #: cps/templates/config_edit.html:85
 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)"
+msgstr ""
+"Posizione e nome del file di log degli accessi (se non specificato sarà"
+" access.log)"
 
 #: cps/templates/config_edit.html:96
 msgid "Feature Configuration"
@@ -2156,7 +2268,9 @@ msgstr "Ulteriori opzioni"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr "Converti caratteri non inglesi del titolo e dell'autore durante il salvataggio su disco"
+msgstr ""
+"Converti caratteri non inglesi del titolo e dell'autore durante il"
+" salvataggio su disco"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
@@ -2164,7 +2278,9 @@ msgstr "Abilita il caricamento"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr "(Per favore assicurati che gli utenti abbiano anche i diritti di upload)"
+msgstr ""
+"(per favore assicurati che gli utenti abbiano anche i permessi per caricare i"
+" file)"
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
@@ -2180,19 +2296,19 @@ msgstr "Abilita la registrazione pubblica"
 
 #: cps/templates/config_edit.html:127
 msgid "Use Email as Username"
-msgstr "Utilizza l'e-mail quale nome di utente"
+msgstr "Usa l'e-mail come nome utente"
 
 #: cps/templates/config_edit.html:132
 msgid "Enable Magic Link Remote Login"
-msgstr "Attiva login remoto Magic Link"
+msgstr "Abilita l'accesso remoto con Magic Link"
 
 #: cps/templates/config_edit.html:137
 msgid "Enable Kobo sync"
-msgstr "Abilita la sincronia per Kobo"
+msgstr "Abilita la sincronizzazione Kobo"
 
 #: cps/templates/config_edit.html:142
 msgid "Proxy unknown requests to Kobo Store"
-msgstr "Richieste proxy sconosciute allo store di Kobo"
+msgstr "Inoltra le richieste sconosciute al Kobo Store"
 
 #: cps/templates/config_edit.html:145
 msgid "Server External Port (for port forwarded API calls)"
@@ -2200,43 +2316,43 @@ msgstr "Porta esterna del server (per chiamate API alle porte inoltrate)"
 
 #: cps/templates/config_edit.html:153
 msgid "Use Goodreads"
-msgstr "Utilizza Goodreads"
+msgstr "Usa Goodreads"
 
 #: cps/templates/config_edit.html:154
 msgid "Create an API Key"
-msgstr "Otteni una chiave API"
+msgstr "Crea una chiave API"
 
 #: cps/templates/config_edit.html:158
 msgid "Goodreads API Key"
-msgstr "API di Goodreads"
+msgstr "Chiave API di Goodreads"
 
 #: cps/templates/config_edit.html:162
 msgid "Goodreads API Secret"
-msgstr "Goodreads API Secret"
+msgstr "API segreta di Goodreads"
 
 #: cps/templates/config_edit.html:169
 msgid "Allow Reverse Proxy Authentication"
-msgstr "Permetti l'autenticazione Reverse Proxy"
+msgstr "Consenti autenticazione con reverse proxy"
 
 #: cps/templates/config_edit.html:180
 msgid "Login type"
-msgstr "Tipo di login"
+msgstr "Tipo di accesso"
 
 #: cps/templates/config_edit.html:182
 msgid "Use Standard Authentication"
-msgstr "Utilizza l'autenticazione standard"
+msgstr "Usa l'autenticazione standard"
 
 #: cps/templates/config_edit.html:184
 msgid "Use LDAP Authentication"
-msgstr "Utilizza l'autenticazione LDAP"
+msgstr "Usa l'autenticazione LDAP"
 
 #: cps/templates/config_edit.html:187
 msgid "Use OAuth"
-msgstr "Utilizza OAuth"
+msgstr "Usa OAuth"
 
 #: cps/templates/config_edit.html:194
 msgid "LDAP Server Host Name or IP Address"
-msgstr "Nome o indirizzo IP del server LDAP"
+msgstr "Nome host o indirizzo IP del server LDAP"
 
 #: cps/templates/config_edit.html:198
 msgid "LDAP Server Port"
@@ -2255,16 +2371,24 @@ msgid "SSL"
 msgstr "SSL"
 
 #: cps/templates/config_edit.html:210
-msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
-msgstr "Percorso del CACertificate LDAP (necessario unicamente in caso di Client Certificate Authentication)"
+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:217
-msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
-msgstr "Percorso del certificato LDAP (necessario unicamente in caso di Client Certificate Authentication)"
+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:224
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
-msgstr "Percorso della chiave LDAP (necessario unicamente in caso di Client Certificate Authentication)"
+msgstr ""
+"Percorso della chiave LDAP (necessario unicamente in caso di Client"
+" Certificate Authentication)"
 
 #: cps/templates/config_edit.html:233
 msgid "LDAP Authentication"
@@ -2284,11 +2408,11 @@ msgstr "Semplice"
 
 #: cps/templates/config_edit.html:242
 msgid "LDAP Administrator Username"
-msgstr "Nome di utente dell'amministratore LDAP"
+msgstr "Nome utente amministratore LDAP"
 
 #: cps/templates/config_edit.html:248
 msgid "LDAP Administrator Password"
-msgstr "Password dell'amministratore LDAP"
+msgstr "Password amministratore LDAP"
 
 #: cps/templates/config_edit.html:253
 msgid "LDAP Distinguished Name (DN)"
@@ -2296,35 +2420,36 @@ msgstr "LDAP Distinguished Name (DN)"
 
 #: cps/templates/config_edit.html:257
 msgid "LDAP User Object Filter"
-msgstr "LDAP User Object Filter"
+msgstr "Object Filter utente LDAP"
 
 #: cps/templates/config_edit.html:262
 msgid "LDAP Server is OpenLDAP?"
-msgstr "Il server LDAP è un server OpenLDAP."
+msgstr "Il server LDAP è OpenLDAP?"
 
 #: cps/templates/config_edit.html:264
 msgid "Following Settings are Needed For User Import"
-msgstr "I seguenti parametri sono necessari per importare utenti"
+msgstr ""
+"Le seguenti impostazioni sono necessarie per l'importazione degli utenti"
 
 #: cps/templates/config_edit.html:266
 msgid "LDAP Group Object Filter"
-msgstr "LDAP Group Object Filter"
+msgstr "Object Filter gruppo LDAP"
 
 #: cps/templates/config_edit.html:270
 msgid "LDAP Group Name"
-msgstr "LDAP Group Name"
+msgstr "Nome gruppo LDAP"
 
 #: cps/templates/config_edit.html:274
 msgid "LDAP Group Members Field"
-msgstr "LDAP Group Members Field"
+msgstr "Campo membri del gruppo LDAP"
 
 #: cps/templates/config_edit.html:278
 msgid "LDAP Member User Filter Detection"
-msgstr "LDAP Member User Filter Detection"
+msgstr "Rilevamento filtro utente membro LDAP"
 
 #: cps/templates/config_edit.html:280
 msgid "Autodetect"
-msgstr "Autodetect"
+msgstr "Trova automaticamente"
 
 #: cps/templates/config_edit.html:281
 msgid "Custom Filter"
@@ -2332,7 +2457,7 @@ msgstr "Filtro personalizzato"
 
 #: cps/templates/config_edit.html:286
 msgid "LDAP Member User Filter"
-msgstr "LDAP Member User Filter"
+msgstr "Filtro utente membro LDAP"
 
 #: cps/templates/config_edit.html:297
 #, python-format
@@ -2342,16 +2467,16 @@ msgstr "Ottieni le credenziali OAuth di %(provider)s"
 #: cps/templates/config_edit.html:300
 #, python-format
 msgid "%(provider)s OAuth Client Id"
-msgstr "%(provider)s OAuth Client Id"
+msgstr "%(provider)s ID client OAuth"
 
 #: cps/templates/config_edit.html:304
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
-msgstr "%(provider)s OAuth Client Secret"
+msgstr "Secret client OAuth %(provider)s"
 
 #: cps/templates/config_edit.html:320
 msgid "External binaries"
-msgstr "Files binari esterni"
+msgstr "File binari esterni"
 
 #: cps/templates/config_edit.html:326
 msgid "Path to Calibre E-Book Converter"
@@ -2359,7 +2484,7 @@ msgstr "Percorso del convertitore di libri di Calibre"
 
 #: cps/templates/config_edit.html:334
 msgid "Calibre E-Book Converter Settings"
-msgstr "Configurazione del convertitore di libri di Calibre"
+msgstr "Impostazioni del convertitore di libri di Calibre"
 
 #: cps/templates/config_edit.html:337
 msgid "Path to Kepubify E-Book Converter"
@@ -2371,7 +2496,7 @@ msgstr "Percorso del file binario di UnRar"
 
 #: cps/templates/config_view_edit.html:17
 msgid "View Configuration"
-msgstr "Configurazione aspetto biblioteca"
+msgstr "Visualizza configurazione"
 
 #: cps/templates/config_view_edit.html:32
 msgid "No. of Random Books to Display"
@@ -2379,7 +2504,8 @@ msgstr "Numero di libri casuali da mostrare"
 
 #: cps/templates/config_view_edit.html:36
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
-msgstr "Numero di autori da mostrare prima di nascondere (0=disabilita mascheramento)"
+msgstr ""
+"Numero di autori da mostrare prima di nascondere (0=disabilita nascondere)"
 
 #: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:116
 msgid "Theme"
@@ -2391,7 +2517,7 @@ msgstr "Tema standard"
 
 #: cps/templates/config_view_edit.html:43
 msgid "caliBlur! Dark Theme"
-msgstr "Tema caliBlur! Dark"
+msgstr "Tema caliBlur! scuro"
 
 #: cps/templates/config_view_edit.html:47
 msgid "Regular Expression for Ignoring Columns"
@@ -2399,7 +2525,7 @@ msgstr "Espressione regolare per ignorare le colonne"
 
 #: cps/templates/config_view_edit.html:51
 msgid "Link Read/Unread Status to Calibre Column"
-msgstr "Collega lo stato letto/non letto nella colonna di Calibre"
+msgstr "Collega lo stato letto/da leggere nella colonna di Calibre"
 
 #: cps/templates/config_view_edit.html:60
 msgid "View Restrictions based on Calibre column"
@@ -2419,31 +2545,31 @@ msgstr "Utente amministratore"
 
 #: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
 msgid "Allow Downloads"
-msgstr "Permetti il download"
+msgstr "Consenti download"
 
 #: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
 msgid "Allow eBook Viewer"
-msgstr "Permetti l'utilizzo del visualizzatore di libri"
+msgstr "Consenti l'utilizzo del visualizzatore di libri"
 
 #: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
 msgid "Allow Uploads"
-msgstr "Permetti l'upload"
+msgstr "Consenti caricamenti"
 
 #: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
 msgid "Allow Edit"
-msgstr "Permetti la modifica"
+msgstr "Consenti modifiche"
 
 #: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
 msgid "Allow Delete Books"
-msgstr "Permetti l'eliminazione di libri"
+msgstr "Consenti l'eliminazione di libri"
 
 #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
 msgid "Allow Changing Password"
-msgstr "Permetti la modifica della password"
+msgstr "Consenti la modifica della password"
 
 #: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
 msgid "Allow Editing Public Shelves"
-msgstr "Permetti la modifica degli scaffali pubblici"
+msgstr "Consenti la modifica degli scaffali pubblici"
 
 #: cps/templates/config_view_edit.html:123
 msgid "Default Language"
@@ -2460,23 +2586,23 @@ msgstr "Visibilità predefinita per i nuovi utenti"
 #: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
 #: cps/templates/user_table.html:154
 msgid "Show Random Books in Detail View"
-msgstr "Mostra libri scelti aleatoriamente nella vista dettagliata"
+msgstr "Mostra i libri casuali nella visualizzazione dettagliata"
 
 #: cps/templates/config_view_edit.html:166 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
-msgstr "Aggiungi categorie permesse/negate"
+msgstr "Aggiungi etichetta consentiti/negati"
 
 #: cps/templates/config_view_edit.html:167
 msgid "Add Allowed/Denied custom column values"
-msgstr "Aggiungi valori personali permetti/nega nelle colonne"
+msgstr "Aggiungi valori di colonna personalizzati consentiti/negati"
 
 #: cps/templates/detail.html:61 cps/templates/detail.html:70
 msgid "Read in Browser"
-msgstr "Leggi nel navigatore"
+msgstr "Leggi nel browser"
 
 #: cps/templates/detail.html:78 cps/templates/detail.html:95
 msgid "Listen in Browser"
-msgstr "Ascolta nel navigatore"
+msgstr "Ascolta nel browser"
 
 #: cps/templates/detail.html:125 cps/templates/listenmp3.html:62
 #, python-format
@@ -2489,11 +2615,11 @@ msgstr "Pubblicato"
 
 #: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Unread"
-msgstr "Marca come non letto"
+msgstr "Contrassegna come da leggere"
 
 #: cps/templates/detail.html:222 cps/templates/listenmp3.html:158
 msgid "Mark As Read"
-msgstr "Marca come letto"
+msgstr "Contrassegna come letto"
 
 #: cps/templates/detail.html:223 cps/templates/listenmp3.html:159
 msgid "Read"
@@ -2533,25 +2659,23 @@ msgstr "Modifica metadati"
 
 #: cps/templates/email_edit.html:13
 msgid "Email Account Type"
-msgstr "Scegli il tipo di server"
+msgstr "Tipo di account e-mail"
 
 #: cps/templates/email_edit.html:15
-#, fuzzy
 msgid "Standard Email Account"
-msgstr "Utilizza un account e-mail standard"
+msgstr "Account e-mail standard"
 
 #: cps/templates/email_edit.html:16
-#, fuzzy
 msgid "Gmail Account"
-msgstr "Scegli il tipo di server"
+msgstr "Account Gmail"
 
 #: cps/templates/email_edit.html:22
 msgid "Setup Gmail Account"
-msgstr ""
+msgstr "Configura l'account Gmail"
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
-msgstr "Revoca l'accesso Gmail"
+msgstr "Revoca l'accesso a Gmail"
 
 #: cps/templates/email_edit.html:42
 msgid "STARTTLS"
@@ -2570,9 +2694,8 @@ msgid "Attachment Size Limit"
 msgstr "Dimensione massima dell'allegato"
 
 #: cps/templates/email_edit.html:66
-#, fuzzy
 msgid "Save and Send Test Email"
-msgstr "Salva le impostazioni e invia e-mail di test"
+msgstr "Salva e invia e-mail di prova"
 
 #: cps/templates/email_edit.html:70 cps/templates/layout.html:26
 #: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
@@ -2581,7 +2704,7 @@ msgstr "Indietro"
 
 #: cps/templates/email_edit.html:74
 msgid "Allowed Domains (Whitelist)"
-msgstr "Dominii autorizzati alla registrazione (Whitelist)"
+msgstr "Domini consentiti (lista bianca)"
 
 #: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
 msgid "Add Domain"
@@ -2594,19 +2717,22 @@ msgstr "Aggiungi"
 
 #: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
 msgid "Enter domainname"
-msgstr "Digita il nome di dominio"
+msgstr "Inserisci il nome del dominio"
 
 #: cps/templates/email_edit.html:92
 msgid "Denied Domains (Blacklist)"
-msgstr "Dominii bloccati per la registrazione (Blacklist)"
+msgstr "Domini bloccati (lista nera)"
 
 #: cps/templates/feed.xml:21 cps/templates/layout.html:187
 msgid "Next"
 msgstr "Prossimo"
 
 #: cps/templates/generate_kobo_auth_url.html:6
-msgid "Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "Apri il file .kobo/Kobo/Kobo eReader.conf in un editore di testi e aggiungi (o edita):"
+msgid ""
+"Open the .kobo/Kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+"Apri il file .kobo/Kobo/Kobo eReader.conf in un editor di testo e aggiungi (o"
+" modifica):"
 
 #: cps/templates/generate_kobo_auth_url.html:11
 msgid "Kobo Token:"
@@ -2618,7 +2744,8 @@ msgstr "Elenco"
 
 #: cps/templates/http_error.html:34
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
-msgstr "L'istanza Calibre-Web non è configurata, per favore contatta l'amministratore"
+msgstr ""
+"L'istanza Calibre-Web non è configurata, per favore contatta l'amministratore"
 
 #: cps/templates/http_error.html:44
 msgid "Create Issue"
@@ -2630,7 +2757,7 @@ msgstr "Ritorna alla pagina principale"
 
 #: cps/templates/http_error.html:53
 msgid "Logout User"
-msgstr "Disconnetti l'utente"
+msgstr "Disconnetti utente"
 
 #: cps/templates/index.html:71
 msgid "Sort ascending according to download count"
@@ -2652,11 +2779,11 @@ msgstr "Ordina gli autori in ordine alfabetico inverso"
 
 #: cps/templates/index.html:83
 msgid "Sort ascending according to series index"
-msgstr "Ordina in ordine ascendente secondo l'indice della serie"
+msgstr "Ordina in ordine ascendente secondo il numero della serie"
 
 #: cps/templates/index.html:84
 msgid "Sort descending according to series index"
-msgstr "Ordina in ordine discendente secondo l'indice della serie"
+msgstr "Ordina in ordine discendente secondo il numero della serie"
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2688,7 +2815,7 @@ msgstr "Gli ultimi libri"
 
 #: cps/templates/index.xml:46
 msgid "Random Books"
-msgstr "Libri presentati aleatoriamente"
+msgstr "Libri casuali"
 
 #: cps/templates/index.xml:73
 msgid "Books ordered by Author"
@@ -2733,7 +2860,7 @@ msgstr "Home"
 
 #: cps/templates/layout.html:32
 msgid "Toggle Navigation"
-msgstr "Alterna navigazione"
+msgstr "Attiva/disattiva navigazione"
 
 #: cps/templates/layout.html:47
 msgid "Search Library"
@@ -2745,11 +2872,11 @@ msgstr "Account"
 
 #: cps/templates/layout.html:71 cps/templates/layout.html:96
 msgid "Logout"
-msgstr "Logout"
+msgstr "Disconnettersi"
 
 #: cps/templates/layout.html:78 cps/templates/layout.html:134
 msgid "Uploading..."
-msgstr "Uploading..."
+msgstr "Caricamento in corso..."
 
 #: cps/templates/layout.html:78
 msgid "Error"
@@ -2757,12 +2884,12 @@ msgstr "Errore"
 
 #: cps/templates/layout.html:78
 msgid "Upload done, processing, please wait..."
-msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
+msgstr "Caricamento riuscito, elaborazione in corso, attendi per favore..."
 
 #: cps/templates/layout.html:91 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
-msgstr "Configurazione"
+msgstr "Impostazioni"
 
 #: cps/templates/layout.html:135
 msgid "Please do not refresh the page"
@@ -2826,7 +2953,7 @@ msgstr "Scarica il log di accesso"
 
 #: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
-msgstr "Seleziona le categorie consentite/negate"
+msgstr "Seleziona le etchette consentite/negate"
 
 #: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
@@ -2838,11 +2965,12 @@ msgstr "Seleziona le categorie consentite/negate per l'utente"
 
 #: 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"
+msgstr ""
+"Seleziona i valori personali consentiti/negati per le colonne dell'utente"
 
 #: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
-msgstr "Indica le categorie"
+msgstr "Inserisci etichetta"
 
 #: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
@@ -2850,23 +2978,30 @@ 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"
+msgstr "Questo formato di libro verrà definitivamente cancellato 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"
+msgstr "Questo libro verrà definitivamente cancellato dal database"
 
 #: 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 "Osservazione importante riguardo Kobo: i libri eliminati, rimarranno in ogni lettore Kobo accoppiato."
+msgid ""
+"Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+"Osservazione importante riguardo Kobo: i libri eliminati, rimarranno in ogni"
+" lettore Kobo accoppiato."
 
 #: cps/templates/modal_dialogs.html:57
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Prima di poter eliminare in sicurezza un libro, occorre che il libro venga archiviato e che l'apparecchio venga sincronizzato."
+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"
@@ -2894,7 +3029,7 @@ msgstr "Seleziona"
 
 #: cps/templates/modal_dialogs.html:134 cps/templates/tasks.html:45
 msgid "Ok"
-msgstr "Ok"
+msgstr "OK"
 
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
@@ -2926,7 +3061,7 @@ msgstr "Adatta il testo quando le barre laterali sono aperte."
 
 #: cps/templates/read.html:93
 msgid "Font Sizes"
-msgstr ""
+msgstr "Dimensioni dei caratteri"
 
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
@@ -2958,7 +3093,7 @@ msgstr "Adatta all'altezza"
 
 #: cps/templates/readcbr.html:100
 msgid "Scale to Native"
-msgstr "Scala alla dimensione originale"
+msgstr "Adatta alla dimensione originale"
 
 #: cps/templates/readcbr.html:101
 msgid "Rotate Right"
@@ -3066,19 +3201,19 @@ msgstr "Il tuo indirizzo e-mail"
 
 #: cps/templates/remote_login.html:5
 msgid "Magic Link - Authorise New Device"
-msgstr "Magic Link - Autorizza un nuovo apparecchio"
+msgstr "Magic Link - Autorizza nuovo dispositivo"
 
 #: cps/templates/remote_login.html:7
 msgid "On another device, login and visit:"
-msgstr "Utilizza il tuo altro apparecchio, accedi e visita"
+msgstr "Su un altro dispositivo, accedi e visita:"
 
 #: cps/templates/remote_login.html:11
 msgid "Once verified, you will automatically be logged in on this device."
-msgstr "Una volta completato, verrai automaticamente connesso con questo dispositivo."
+msgstr "Una volta verificato, accederai automaticamente a questo dispositivo."
 
 #: cps/templates/remote_login.html:14
 msgid "This verification link will expire in 10 minutes."
-msgstr "Il link scadrà tra 10 minuti."
+msgstr "Questo link di verifica scadrà tra 10 minuti."
 
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
@@ -3098,15 +3233,15 @@ msgstr "Risultati per:"
 
 #: cps/templates/search_form.html:21
 msgid "Published Date From"
-msgstr "Data di pubblicazione da"
+msgstr "Data di pubblicazione dal"
 
 #: cps/templates/search_form.html:31
 msgid "Published Date To"
-msgstr "Data di pubblicazione fino a"
+msgstr "Data di pubblicazione fino al"
 
 #: cps/templates/search_form.html:59
 msgid "Exclude Tags"
-msgstr "Escludi categorie"
+msgstr "Escludi etichette"
 
 #: cps/templates/search_form.html:77
 msgid "Exclude Series"
@@ -3218,7 +3353,7 @@ msgstr "Utente"
 
 #: cps/templates/tasks.html:14
 msgid "Task"
-msgstr "Operazione"
+msgstr "Attività"
 
 #: cps/templates/tasks.html:15
 msgid "Status"
@@ -3237,12 +3372,18 @@ msgid "Actions"
 msgstr "Azioni"
 
 #: cps/templates/tasks.html:40
-msgid "This task will be cancelled. Any progress made by this task will be saved."
-msgstr "Questa attività verrà annullata. Tutti i progressi compiuti da questa attività verranno salvati."
+msgid ""
+"This task will be cancelled. Any progress made by this task will be saved."
+msgstr ""
+"Questa attività verrà annullata. Tutti i progressi compiuti da questa"
+" attività verranno salvati."
 
 #: cps/templates/tasks.html:41
-msgid "If this is a scheduled task, it will be re-ran during the next scheduled time."
-msgstr "Se si tratta di un'attività pianificata, verrà eseguita nuovamente durante il prossimo orario pianificato."
+msgid ""
+"If this is a scheduled task, it will be re-ran during the next scheduled time."
+msgstr ""
+"Se si tratta di un'attività pianificata, verrà eseguita nuovamente durante il"
+" prossimo orario pianificato."
 
 #: cps/templates/user_edit.html:20
 msgid "Reset user Password"
@@ -3250,11 +3391,11 @@ msgstr "Reimposta la password dell'utente"
 
 #: cps/templates/user_edit.html:43
 msgid "Language of Books"
-msgstr "Mostra libri in"
+msgstr "Lingua dei libri"
 
 #: cps/templates/user_edit.html:54
 msgid "OAuth Settings"
-msgstr "Configurazione OAuth"
+msgstr "Impostazioni OAuth"
 
 #: cps/templates/user_edit.html:56
 msgid "Link"
@@ -3266,7 +3407,7 @@ msgstr "Scollega"
 
 #: cps/templates/user_edit.html:64
 msgid "Kobo Sync Token"
-msgstr "Token Kobo Sync"
+msgstr "Token di sincronizzazione Kobo"
 
 #: cps/templates/user_edit.html:66
 msgid "Create/View"
@@ -3278,7 +3419,7 @@ msgstr "Forza la sincronizzazione kobo completa"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
-msgstr "Aggiungi valori personali permessi/negati nelle colonne"
+msgstr "Aggiungi valori personali consentiti/negati nelle colonne"
 
 #: cps/templates/user_edit.html:137
 msgid "Sync only books in selected shelves with Kobo"
@@ -3302,22 +3443,19 @@ msgstr "Modifica utente"
 
 #: cps/templates/user_table.html:134
 msgid "Enter Username"
-msgstr "Digita il nome utente"
+msgstr "Inserisci nome utente"
 
 #: cps/templates/user_table.html:135
-#, fuzzy
 msgid "Enter Email"
-msgstr "E-mail di test"
+msgstr "Inserisci e-mail"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "Enter eReader Email"
-msgstr "Invia all'indirizzo e-mail del lettore elettronico"
+msgstr "Inserisci l'e-mail dell'eReader"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "eReader Email"
-msgstr "E-mail del lettore elettronico"
+msgstr "E-mail dell'eReader"
 
 #: cps/templates/user_table.html:137
 msgid "Locale"
@@ -3325,31 +3463,31 @@ msgstr "Locale"
 
 #: cps/templates/user_table.html:138
 msgid "Visible Book Languages"
-msgstr "Lingue dei libri visualizzabili"
+msgstr "Lingue dei libri visibili"
 
 #: cps/templates/user_table.html:139
 msgid "Edit Allowed Tags"
-msgstr "Modifica le categorie permesse"
+msgstr "Modifica le etichette consentite"
 
 #: cps/templates/user_table.html:139
 msgid "Allowed Tags"
-msgstr "Categorie permesse"
+msgstr "Etichette consentite"
 
 #: cps/templates/user_table.html:140
 msgid "Edit Denied Tags"
-msgstr "Modifica le categorie negate"
+msgstr "Modifica le etichette negate"
 
 #: cps/templates/user_table.html:140
 msgid "Denied Tags"
-msgstr "Categorie negate"
+msgstr "Etichette negate"
 
 #: cps/templates/user_table.html:141
 msgid "Edit Allowed Column Values"
-msgstr "Modifica i valori delle colonne permesse"
+msgstr "Modifica i valori delle colonne consentite"
 
 #: cps/templates/user_table.html:141
 msgid "Allowed Column Values"
-msgstr "Valori delle colonne permesse"
+msgstr "Valori delle colonne consentite"
 
 #: cps/templates/user_table.html:142
 msgid "Edit Denied Column Values"
@@ -3357,11 +3495,11 @@ msgstr "Modifica i valori delle colonne negate"
 
 #: cps/templates/user_table.html:142
 msgid "Denied Column Values"
-msgstr "Valori negati per le colonne"
+msgstr "Valori delle colonne negate"
 
 #: cps/templates/user_table.html:144
 msgid "Change Password"
-msgstr "Modifica la password"
+msgstr "Cambia la password"
 
 #: cps/templates/user_table.html:147
 msgid "View"
@@ -3376,7 +3514,6 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "Sincronizza con Kobo gli scaffali selezionati"
 
 #: cps/templates/user_table.html:156
-#, fuzzy
 msgid "Show Read/Unread Section"
-msgstr "Mostra l'opzione per la selezione dello stato letto/non letto"
+msgstr "Mostra la sezione letto/da leggere"
 

From 1c3b69c7106d029bad21aca3b40deba919e96f38 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 4 Feb 2023 11:09:16 +0100
Subject: [PATCH 406/412] refactored login routines

---
 cps/admin.py             | 12 +++---
 cps/opds.py              | 42 ++------------------
 cps/static/css/style.css |  1 +
 cps/static/js/main.js    |  6 ---
 cps/usermanagement.py    | 86 +++++++++++++++++++++++++++++++---------
 cps/web.py               |  7 +++-
 6 files changed, 83 insertions(+), 71 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 353888848..1d1bf4c22 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -102,10 +102,12 @@ def admin_required(f):
 @admi.before_app_request
 def before_request():
     # make remember me function work
-    if current_user.is_authenticated:
-        confirm_login()
-    if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
-        logout_user()
+    #if current_user.is_authenticated:
+    #    print("before request confirm request {}".format(request.path))
+    #    confirm_login()
+    #if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
+    #    log.info("before logout {}".format(request.path))
+    #    logout_user()
     g.constants = constants
     g.user = current_user
     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')
@@ -114,8 +116,6 @@ def before_request():
     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.ajax_db_config',
                                  'admin.simulatedbchange',
diff --git a/cps/opds.py b/cps/opds.py
index 0c83fa70e..bf50691af 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -22,16 +22,16 @@
 
 import datetime
 from urllib.parse import unquote_plus
-from functools import wraps
 
-from flask import Blueprint, request, render_template, Response, g, make_response, abort
+
+from flask import Blueprint, request, render_template, g, make_response, abort
 from flask_login import current_user
 from flask_babel import get_locale
 from sqlalchemy.sql.expression import func, text, or_, and_, true
 from sqlalchemy.exc import InvalidRequestError, OperationalError
-from werkzeug.security import check_password_hash
 
-from . import constants, logger, config, db, calibre_db, ub, services, isoLanguages
+from . import logger, config, db, calibre_db, ub, isoLanguages
+from .usermanagement import requires_basic_auth_if_no_ano
 from .helper import get_download_link, get_book_cover
 from .pagination import Pagination
 from .web import render_read_books
@@ -43,19 +43,6 @@ opds = Blueprint('opds', __name__)
 log = logger.create()
 
 
-def requires_basic_auth_if_no_ano(f):
-    @wraps(f)
-    def decorated(*args, **kwargs):
-        auth = request.authorization
-        if config.config_anonbrowse != 1:
-            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 and config.config_anonbrowse != 1:
-        return services.ldap.basic_auth_required(f)
-    return decorated
-
-
 @opds.route("/opds/")
 @opds.route("/opds")
 @requires_basic_auth_if_no_ano
@@ -478,27 +465,6 @@ def feed_search(term):
         return render_xml_template('feed.xml', searchterm="")
 
 
-def check_auth(username, password):
-    try:
-        username = username.encode('windows-1252')
-    except UnicodeEncodeError:
-        username = username.encode('utf-8')
-    user = ub.session.query(ub.User).filter(func.lower(ub.User.name) ==
-                                            username.decode('utf-8').lower()).first()
-    if bool(user and check_password_hash(str(user.password), password)):
-        return True
-    else:
-        ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
-        log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ip_address)
-        return False
-
-
-def authenticate():
-    return Response(
-        'Could not verify your access level for that URL.\n'
-        'You have to login with proper credentials', 401,
-        {'WWW-Authenticate': 'Basic realm="Login Required"'})
-
 
 def render_xml_template(*args, **kwargs):
     # ToDo: return time in current timezone similar to %z
diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 6e6b0eae3..59bcd2c03 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -140,6 +140,7 @@ table .bg-dark-danger a { color: #fff; }
 
 .container-fluid .book {
   margin-top: 20px;
+  max-width: 180px;
   display: flex;
   flex-direction: column;
 }
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 73b90a0d8..4ff73d721 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -364,12 +364,6 @@ $(function() {
         layoutMode : "fitRows"
     });
 
-    $(".grid").isotope({
-        // options
-        itemSelector : ".grid-item",
-        layoutMode : "fitColumns"
-    });
-
     if ($(".load-more").length && $(".next").length) {
         var $loadMore = $(".load-more .row").infiniteScroll({
             debug: false,
diff --git a/cps/usermanagement.py b/cps/usermanagement.py
index 62fe6f77f..6bf7af5af 100644
--- a/cps/usermanagement.py
+++ b/cps/usermanagement.py
@@ -23,9 +23,11 @@ from functools import wraps
 from sqlalchemy.sql.expression import func
 from werkzeug.security import check_password_hash
 from flask_login import login_required, login_user
+from flask import request, Response
 
-from . import lm, ub, config, constants, services
+from . import lm, ub, config, constants, services, logger
 
+log = logger.create()
 
 def login_required_if_no_ano(func):
     @wraps(func)
@@ -36,6 +38,47 @@ def login_required_if_no_ano(func):
 
     return decorated_view
 
+def requires_basic_auth_if_no_ano(f):
+    @wraps(f)
+    def decorated(*args, **kwargs):
+        auth = request.authorization
+        if config.config_anonbrowse != 1:
+            if not auth or auth.type != 'basic' or not check_auth(auth.username, auth.password):
+                return authenticate()
+            print("opds_requires_basic_auth")
+            user = load_user_from_auth_header(auth.username, auth.password)
+            if not user:
+                return None
+            login_user(user)
+        return f(*args, **kwargs)
+    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
+
+
+def check_auth(username, password):
+    try:
+        username = username.encode('windows-1252')
+    except UnicodeEncodeError:
+        username = username.encode('utf-8')
+    user = ub.session.query(ub.User).filter(func.lower(ub.User.name) ==
+                                            username.decode('utf-8').lower()).first()
+    if bool(user and check_password_hash(str(user.password), password)):
+        return True
+    else:
+        ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
+        log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ip_address)
+        return False
+
+
+def authenticate():
+    return Response(
+        'Could not verify your access level for that URL.\n'
+        'You have to login with proper credentials', 401,
+        {'WWW-Authenticate': 'Basic realm="Login Required"'})
+
+
 
 def _fetch_user_by_name(username):
     return ub.session.query(ub.User).filter(func.lower(ub.User.name) == username.lower()).first()
@@ -43,11 +86,13 @@ def _fetch_user_by_name(username):
 
 @lm.user_loader
 def load_user(user_id):
+    print("load_user: {}".format(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):
+    print("load_from_request")
     if config.config_allow_reverse_proxy_header_login:
         rp_header_name = config.config_reverse_proxy_login_header_name
         if rp_header_name:
@@ -58,30 +103,33 @@ def load_user_from_request(request):
                     login_user(user)
                     return user
 
-    auth_header = request.headers.get("Authorization")
-    if auth_header:
-        user = load_user_from_auth_header(auth_header)
-        if user:
-            return user
+    #auth_header = request.headers.get("Authorization")
+    #if auth_header:
+    #    user = load_user_from_auth_header(auth_header)
+    #    if user:
+    #        login_user(user)
+    #        return user
 
-    return
+    return None
 
 
-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')
-        # Users with colon are invalid: rfc7617 page 4
-        basic_username = header_val.split(':', 1)[0]
-        basic_password = header_val.split(':', 1)[1]
-    except (TypeError, UnicodeDecodeError, binascii.Error):
-        pass
+def load_user_from_auth_header(basic_username, basic_password):
+    #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')
+    #    # Users with colon are invalid: rfc7617 page 4
+    #    basic_username = header_val.split(':', 1)[0]
+    #    basic_password = header_val.split(':', 1)[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):
+            login_user(user)
             return user
     if user and check_password_hash(str(user.password), basic_password):
+        login_user(user)
         return user
-    return
+    return None
diff --git a/cps/web.py b/cps/web.py
index 3a575d9e2..71d636782 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -24,7 +24,7 @@ import mimetypes
 import chardet  # dependency of requests
 import copy
 
-from flask import Blueprint, jsonify
+from flask import Blueprint, jsonify, g
 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 _
@@ -79,7 +79,7 @@ except ImportError:
 
 
 @app.after_request
-def add_security_headers(resp):
+def add_security_headers_and_shelves(resp):
     csp = "default-src 'self'"
     csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
     csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self'"
@@ -98,6 +98,9 @@ def add_security_headers(resp):
     resp.headers['X-Frame-Options'] = 'SAMEORIGIN'
     resp.headers['X-XSS-Protection'] = '1; mode=block'
     resp.headers['Strict-Transport-Security'] = 'max-age=31536000;'
+
+    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()
     return resp
 
 

From 98da7dd5b0cc95acf3935b1af3e8ab2a36135411 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 4 Feb 2023 11:18:43 +0100
Subject: [PATCH 407/412] remove g.user from before request

---
 cps/admin.py                     |  2 +-
 cps/babel.py                     | 11 ++++++-----
 cps/render_template.py           | 14 ++++++-------
 cps/templates/book_edit.html     | 12 +++++------
 cps/templates/book_table.html    | 30 ++++++++++++++--------------
 cps/templates/detail.html        | 22 ++++++++++-----------
 cps/templates/email_edit.html    |  4 ++--
 cps/templates/index.html         |  2 +-
 cps/templates/layout.html        | 34 ++++++++++++++++----------------
 cps/templates/listenmp3.html     | 14 ++++++-------
 cps/templates/modal_dialogs.html |  2 +-
 cps/templates/read.html          |  2 +-
 cps/templates/readpdf.html       |  4 ++--
 cps/templates/search.html        |  6 +++---
 cps/templates/search_form.html   | 10 +++++-----
 cps/templates/shelf.html         |  6 +++---
 cps/templates/shelf_edit.html    |  2 +-
 cps/templates/shelfdown.html     |  4 ++--
 cps/templates/stats.html         |  2 +-
 cps/templates/tasks.html         |  8 ++++----
 cps/templates/user_edit.html     | 12 +++++------
 cps/templates/user_table.html    |  6 +++---
 22 files changed, 105 insertions(+), 104 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 1d1bf4c22..b3af0f8a6 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -109,7 +109,7 @@ def before_request():
     #    log.info("before logout {}".format(request.path))
     #    logout_user()
     g.constants = constants
-    g.user = current_user
+    # g.user = current_user
     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')
     g.allow_registration = config.config_public_reg
     g.allow_anonymous = config.config_anonbrowse
diff --git a/cps/babel.py b/cps/babel.py
index 5a6136a55..e6c32806e 100644
--- a/cps/babel.py
+++ b/cps/babel.py
@@ -1,7 +1,8 @@
 from babel import negotiate_locale
 from flask_babel import Babel, Locale
 from babel.core import UnknownLocaleError
-from flask import request, g
+from flask import request
+from flask_login import current_user
 
 from . import logger
 
@@ -11,10 +12,10 @@ babel = Babel()
 
 def get_locale():
     # if a user is logged in, use the locale from the user settings
-    user = getattr(g, 'user', None)
-    if user is not None and hasattr(user, "locale"):
-        if user.name != 'Guest':   # if the account is the guest account bypass the config lang settings
-            return user.locale
+    if current_user is not None and hasattr(current_user, "locale"):
+        # if the account is the guest account bypass the config lang settings
+        if current_user.name != 'Guest':
+            return current_user.locale
 
     preferred = list()
     if request.accept_languages:
diff --git a/cps/render_template.py b/cps/render_template.py
index 74462f9f7..70faaa130 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -45,12 +45,12 @@ def get_sidebar_config(kwargs=None):
                     "show_text": _('Show Hot Books'), "config_show": True})
     if current_user.role_admin():
         sidebar.append({"glyph": "glyphicon-download", "text": _('Downloaded Books'), "link": 'web.download_list',
-                        "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not g.user.is_anonymous),
+                        "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not current_user.is_anonymous),
                         "page": "download", "show_text": _('Show Downloaded Books'),
                         "config_show": content})
     else:
         sidebar.append({"glyph": "glyphicon-download", "text": _('Downloaded Books'), "link": 'web.books_list',
-                        "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not g.user.is_anonymous),
+                        "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not current_user.is_anonymous),
                         "page": "download", "show_text": _('Show Downloaded Books'),
                         "config_show": content})
     sidebar.append(
@@ -58,11 +58,11 @@ def get_sidebar_config(kwargs=None):
          "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),
+                    "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not current_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",
+         "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not current_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",
@@ -81,7 +81,7 @@ def get_sidebar_config(kwargs=None):
          "visibility": constants.SIDEBAR_PUBLISHER, 'public': True, "page": "publisher",
          "show_text": _('Show Publisher Section'), "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'),
+                    "visibility": constants.SIDEBAR_LANGUAGE, 'public': (current_user.filter_language() == 'all'),
                     "page": "language",
                     "show_text": _('Show Language Section'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-star-empty", "text": _('Ratings'), "link": 'web.ratings_list', "id": "rate",
@@ -92,12 +92,12 @@ def get_sidebar_config(kwargs=None):
                     "page": "format", "show_text": _('Show File Formats Section'), "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",
+         "visibility": constants.SIDEBAR_ARCHIVED, 'public': (not current_user.is_anonymous), "page": "archived",
          "show_text": _('Show Archived Books'), "config_show": content})
     if not simple:
         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",
+             "visibility": constants.SIDEBAR_LIST, 'public': (not current_user.is_anonymous), "page": "list",
              "show_text": _('Show Books List'), "config_show": content})
     return sidebar, simple
 
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 3ce1dbfa4..bfb8efdd5 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -6,7 +6,7 @@
         <!-- Always use full-sized image for the book edit page -->
         <img id="detailcover" title="{{book.title}}" src="{{url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified)}}" />
     </div>
-{% if g.user.role_delete_books() %}
+{% if current_user.role_delete_books() %}
     <div class="text-center">
       <button type="button" class="btn btn-danger" id="delete" data-toggle="modal" data-delete-id="{{ book.id }}" data-target="#deleteModal">{{_("Delete Book")}}</button>
     </div>
@@ -99,7 +99,7 @@
       <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() and g.allow_upload %}
+    {% if current_user.role_upload() and 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="">
@@ -196,7 +196,7 @@
           </div>
         {% endfor %}
       {% endif %}
-      {% if g.user.role_upload() and g.allow_upload %}
+      {% if current_user.role_upload() and g.allow_upload %}
           <div role="group" aria-label="Upload new book format">
             <label class="btn btn-primary btn-file" for="btn-upload-format">{{ _('Upload Format') }}</label>
             <div class="upload-format-input-text" id="upload-format"></div>
@@ -291,7 +291,7 @@
     'description': {{_('Description')|safe|tojson}},
     'source': {{_('Source')|safe|tojson}},
   };
-  var language = '{{ g.user.locale }}';
+  var language = '{{ current_user.locale }}';
 
   $("#add-identifier-line").click(function() {
     // create a random identifier type to have a valid name in form. This will not be used when dealing with the form
@@ -313,8 +313,8 @@
 <script src="{{ url_for('static', filename='js/get_meta.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/tinymce/tinymce.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/bootstrap-datepicker.min.js') }}"></script>
-{% if not g.user.locale == 'en' %}
-<script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.' + g.user.locale + '.min.js') }}" charset="UTF-8"></script>
+{% if not current_user.locale == 'en' %}
+<script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.' + current_user.locale + '.min.js') }}" charset="UTF-8"></script>
 {% endif %}
 <script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
 <script src="{{ url_for('static', filename='js/fullscreen.js') }}"></script>
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index 518b32273..ae32332b4 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -4,7 +4,7 @@
     {% if sort %}data-sortable="true" {% endif %}
     data-visible = "{{visiblility.get(parameter)}}"
     data-escape="true"
-    {% if g.user.role_edit() %}
+    {% if current_user.role_edit() %}
         data-editable-type="text"
         data-editable-url="{{ url_for('edit-book.edit_list_book', param=parameter)}}"
         data-editable-title="{{ edit_text }}"
@@ -53,10 +53,10 @@
     </div>
 
     <table id="books-table" class="table table-no-bordered table-striped"
-           data-url="{{url_for('web.list_books')}}" data-locale="{{ g.user.locale }}">
+           data-url="{{url_for('web.list_books')}}" data-locale="{{ current_user.locale }}">
       <thead>
         <tr>
-          {% if g.user.role_edit() %}
+          {% if current_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>
@@ -66,37 +66,37 @@
             {{ text_table_row('authors', _('Enter Authors'),_('Authors'), true, true) }}
             {{ text_table_row('tags', _('Enter Categories'),_('Categories'), false, true) }}
             {{ text_table_row('series', _('Enter Series'),_('Series'), false, true) }}
-            <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('edit-book.edit_list_book', param='series_index')}}" data-edit="true" data-editable-title="{{_('Enter Title')}}"{% endif %}>{{_('Series Index')}}</th>
+            <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 current_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('edit-book.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, true) }}
             <!--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, true) }}
-            <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
-            {% if g.user.check_visibility(32768) %}
+            <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if current_user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
+            {% if current_user.check_visibility(32768) %}
                 {{ book_checkbox_row('is_archived', _('Archive Status'), false)}}
             {%  endif %}
             {{ book_checkbox_row('read_status', _('Read Status'), false)}}
             {% for c in cc %}
               {% if c.datatype == "int" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if current_user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "rating" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-formatter="ratingFormatter" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.5" data-editable-step="1" data-editable-min="1" data-editable-max="5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-formatter="ratingFormatter" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if current_user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.5" data-editable-step="1" data-editable-min="1" data-editable-max="5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "float" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if current_user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "enumeration" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="select" data-editable-source={{ url_for('edit-book.table_get_custom_enum', c_id=c.id)  }} data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if current_user.role_edit() %} data-editable-type="select" data-editable-source={{ url_for('edit-book.table_get_custom_enum', c_id=c.id)  }} data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype in ["datetime"] %}
                   <!-- missing -->
               {% elif c.datatype == "text" %}
                  {{ text_table_row('custom_column_' + c.id|string, _('Enter ') + c.name, c.name, false, false) }}
               {% elif c.datatype == "comments" %}
-                  <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                  <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if current_user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "bool" %}
                   {{ book_checkbox_row('custom_column_' + c.id|string, c.name, false)}}
               {% else %}
                 <!--{{ text_table_row('custom_column_' + c.id|string, _('Enter ') + c.name, c.name, false, false) }} -->
               {% endif %}
             {% endfor %}
-          {% if g.user.role_delete_books() and g.user.role_edit()%}
+          {% if current_user.role_delete_books() and current_user.role_edit()%}
             <th data-align="right" data-formatter="EbookActions" data-switchable="false">{{_('Delete')}}</th>
           {% endif %}
         </tr>
@@ -105,7 +105,7 @@
 {% endblock %}
 {% block modal %}
 {{ delete_book() }}
-{% if g.user.role_edit() %}
+{% if current_user.role_edit() %}
 <div class="modal fade" id="mergeModal" role="dialog" aria-labelledby="metaMergeLabel">
   <div class="modal-dialog">
     <div class="modal-content">
@@ -137,8 +137,8 @@
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-locale-all.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>
-{% if not g.user.locale == 'en' %}
-<script src="{{ url_for('static', filename='js/libs/bootstrap-table/locale/bootstrap-table-' + g.user.locale + '.min.js') }}" charset="UTF-8"></script>
+{% if not current_user.locale == 'en' %}
+<script src="{{ url_for('static', filename='js/libs/bootstrap-table/locale/bootstrap-table-' + current_user.locale + '.min.js') }}" charset="UTF-8"></script>
 {% endif %}
 <script src="{{ url_for('static', filename='js/libs/wysihtml5-0.3.0.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/bootstrap-wysihtml5-0.0.3.min.js') }}"></script>
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 2d4781ac2..c9cb81430 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -11,7 +11,7 @@
     <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 eReader, reading">
-          {% if g.user.role_download() %}
+          {% if current_user.role_download() %}
             {% if entry.data|length %}
             <div class="btn-group" role="group">
                 {% if entry.data|length < 2 %}
@@ -37,7 +37,7 @@
             </div>
             {% endif %}
           {% endif %}
-            {% if g.user.kindle_mail and entry.email_share_list %}
+            {% if current_user.kindle_mail and entry.email_share_list %}
               <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
               {% if entry.email_share_list.__len__() == 1 %}
                 <div id="sendbtn" data-action="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=entry.email_share_list[0]['format'], convert=entry.email_share_list[0]['convert'])}}" data-text="{{_('Send to eReader')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.email_share_list[0]['text']}}</div>
@@ -55,7 +55,7 @@
                 </div>
               {% endif %}
             {% endif %}
-          {% if entry.reader_list and g.user.role_viewer() %}
+          {% if entry.reader_list and current_user.role_viewer() %}
               <div class="btn-group" role="group">
               {% if entry.reader_list|length > 1 %}
                 <button id="read-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -72,7 +72,7 @@
                 {% endif %}
               </div>
             {% endif %}
-            {% if entry.audio_entries|length > 0 and g.user.role_viewer() %}
+            {% if entry.audio_entries|length > 0 and current_user.role_viewer() %}
               <div class="btn-group" role="group">
               {% if entry.audio_entries|length > 1 %}
                 <button id="listen-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -213,7 +213,7 @@
         </div>
         {% endfor %}
       {% endif %}
-      {% if not g.user.is_anonymous %}
+      {% if not current_user.is_anonymous %}
 
         <div class="custom_columns">
           <p>
@@ -225,7 +225,7 @@
             </label>
           </form>
           </p>
-          {% if g.user.check_visibility(32768) %}
+          {% if current_user.check_visibility(32768) %}
           <p>
             <form id="archived_form" action="{{ url_for('web.toggle_archived', book_id=entry.id)}}" method="POST">
               <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
@@ -250,8 +250,8 @@
 
       <div class="more-stuff">
 
-      {% if g.user.is_authenticated %}
-      {% if g.user.shelf.all() or g.shelves_access %}
+      {% if current_user.is_authenticated %}
+      {% if current_user.shelf.all() or g.shelves_access %}
       <div id="shelf-actions" class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Add to shelves">
           <button id="add-to-shelf" type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -260,7 +260,7 @@
           </button>
           <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
             {% for shelf in g.shelves_access %}
-              {% if not shelf.id in books_shelfs and ( not shelf.is_public or g.user.role_edit_shelfs() ) %}
+              {% if not shelf.id in books_shelfs and ( not shelf.is_public or current_user.role_edit_shelfs() ) %}
                 <li>
                   <a data-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                      data-remove-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
@@ -281,7 +281,7 @@
                    data-add-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                    class="btn btn-sm btn-default" role="button" data-shelf-action="remove"
                 >
-                  <span {% if not shelf.is_public or g.user.role_edit_shelfs() %}
+                  <span {% if not shelf.is_public or current_user.role_edit_shelfs() %}
                         class="glyphicon glyphicon-remove"
                         {% endif %}></span> {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}
                 </a>
@@ -294,7 +294,7 @@
       {% endif %}
 
       {% endif %}
-      {% if g.user.role_edit() %}
+      {% if current_user.role_edit() %}
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Edit/Delete book">
           <a href="{{ url_for('edit-book.show_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>
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index e7f579b2c..73096f4bc 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -80,7 +80,7 @@
     </div>
     <button id="domain_allow_submit" class="btn btn-default">{{_('Add')}}</button>
     </form>
-  <table class="table table-no-bordered" id="domain-allow-table" data-url="{{url_for('admin.list_domain', allow=1)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline" data-locale="{{ g.user.locale }}">
+  <table class="table table-no-bordered" id="domain-allow-table" data-url="{{url_for('admin.list_domain', allow=1)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline" data-locale="{{ current_user.locale }}">
     <thead>
     <tr>
       <th data-field="domain" id="domain-allow" data-escape="true" data-editable-type="text" data-editable-url="{{ url_for('admin.edit_domain', allow = 1)}}" data-editable="true" data-editable-title="{{_('Enter domainname')}}"></th>
@@ -90,7 +90,7 @@
     </thead>
   </table>
   <h2>{{_('Denied Domains (Blacklist)')}}</h2>
-    <table class="table table-no-bordered" id="domain-deny-table" data-url="{{url_for('admin.list_domain', allow=0)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline" data-locale="{{ g.user.locale }}">
+    <table class="table table-no-bordered" id="domain-deny-table" data-url="{{url_for('admin.list_domain', allow=0)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline" data-locale="{{ current_user.locale }}">
       <thead>
         <tr>
             <th data-field="domain" id="domain-deny" data-escape="true" data-editable-type="text" data-editable-url="{{ url_for('admin.edit_domain', allow = 0)}}" data-editable="true" data-editable-title="{{_('Enter domainname')}}"></th>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 0bb3da728..464a14612 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -1,7 +1,7 @@
 {% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
-{% if g.user.show_detail_random() and page != "discover" %}
+{% if current_user.show_detail_random() and page != "discover" %}
 <div class="discover random-books">
   <h2 class="random-books">{{_('Discover (Random Books)')}}</h2>
   <div class="row display-flex">
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index fc32bcd88..07adbabd6 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -1,7 +1,7 @@
 {% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal, delete_confirm_modal, change_confirm_modal %}
 {% import 'image.html' as image %}
 <!DOCTYPE html>
-<html lang="{{ g.user.locale }}">
+<html lang="{{ current_user.locale }}">
   <head>
     <title>{{instance}} | {{title}}</title>
     <meta charset="utf-8">
@@ -40,7 +40,7 @@
             <div class="home-btn"><a class="home-btn-tooltip" href="/" data-toggle="tooltip" title="" data-placement="bottom" data-original-title="Home"></a></div>
             <div class="plexBack"><a href="{{url_for('web.index')}}"></a></div>
         {% endif %}
-        {% if g.user.is_authenticated or g.allow_anonymous %}
+        {% if current_user.is_authenticated or g.allow_anonymous %}
           <form class="navbar-form navbar-left" role="search" action="{{url_for('search.simple_search')}}" method="GET">
             <div class="form-group input-group input-group-sm">
               <label for="query" class="sr-only">{{_('Search')}}</label>
@@ -52,28 +52,28 @@
           </form>
         {% endif %}
         <div class="navbar-collapse collapse">
-          {% if g.user.is_authenticated or g.allow_anonymous %}
+          {% if current_user.is_authenticated or g.allow_anonymous %}
           <ul class="nav navbar-nav ">
             <li><a href="{{url_for('search.advanced_search')}}" id="advanced_search"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
           </ul>
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">
-            {% if g.user.is_authenticated or g.allow_anonymous %}
+            {% if current_user.is_authenticated or g.allow_anonymous %}
               {% if g.current_theme == 1 %}
               <li class="dropdown"><a href="#" class="dropdown-toggle profileDrop" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-user"></span></a>
                 <ul class="dropdown-menu profileDropli">
-                    <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span> <span class="hidden-sm">{{g.user.name}}</span></a></li>
-                    {% if g.allow_registration and not g.user.is_authenticated %}
+                    <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span> <span class="hidden-sm">{{current_user.name}}</span></a></li>
+                    {% if g.allow_registration and not current_user.is_authenticated %}
                     <li><a id="login" href="{{url_for('web.login')}}"><span class="glyphicon glyphicon-log-in"></span> {{_('Login')}}</a></li>
                     <li><a id="register" href="{{url_for('web.register')}}"><span class="glyphicon glyphicon-user"></span> {{_('Register')}}</a></li>
                     {% endif %}
-                    {% if not g.user.is_anonymous %}
+                    {% if not current_user.is_anonymous %}
                     <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span> <span class="hidden-sm">{{_('Logout')}}</span></a></li>
                     {% endif %}
                 </ul>
               </li>
               {% endif %}
-              {% if g.user.role_upload() and g.allow_upload %}
+              {% if current_user.role_upload() and g.allow_upload %}
                   <li>
                     <form id="form-upload" class="navbar-form" action="{{ url_for('edit-book.upload') }}" data-title="{{_('Uploading...')}}" data-footer="{{_('Close')}}" data-failed="{{_('Error')}}" data-message="{{_('Upload done, processing, please wait...')}}" method="post" enctype="multipart/form-data">
                       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
@@ -84,20 +84,20 @@
                     </form>
                   </li>
               {% endif %}
-              {% if not g.user.is_anonymous and not simple%}
+              {% if not current_user.is_anonymous and not simple%}
                 <li class="top_tasks"><a id="top_tasks" href="{{url_for('tasks.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
               {% endif %}
-              {% if g.user.role_admin() %}
+              {% if current_user.role_admin() %}
                 <li><a id="top_admin" data-text="{{_('Settings')}}" href="{{url_for('admin.admin')}}"><span class="glyphicon glyphicon-dashboard"></span> <span class="hidden-sm">{{_('Admin')}}</span></a></li>
               {% endif %}
               {% if g.current_theme == 0 %}
-              <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span> <span class="hidden-sm">{{g.user.name}}</span></a></li>
-                {% if not g.user.is_anonymous %}
+              <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span> <span class="hidden-sm">{{current_user.name}}</span></a></li>
+                {% if not current_user.is_anonymous %}
                 <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span> <span class="hidden-sm">{{_('Logout')}}</span></a></li>
                 {% endif %}
               {% endif %}
             {% endif %}
-            {% if g.allow_registration and not g.user.is_authenticated and g.current_theme == 0 %}
+            {% if g.allow_registration and not current_user.is_authenticated and g.current_theme == 0 %}
             <li><a id="login" href="{{url_for('web.login')}}"><span class="glyphicon glyphicon-log-in"></span> {{_('Login')}}</a></li>
             <li><a id="register" href="{{url_for('web.register')}}"><span class="glyphicon glyphicon-user"></span> {{_('Register')}}</a></li>
             {% endif %}
@@ -138,22 +138,22 @@
     {%endif%}
     <div class="container-fluid">
       <div class="row-fluid">
-        {% if g.user.is_authenticated or g.allow_anonymous %}
+        {% if current_user.is_authenticated or g.allow_anonymous %}
         <div class="col-sm-2">
           <nav class="navigation">
             <ul class="list-unstyled" id="scnd-nav" intent in-standard-append="nav.navigation" in-mobile-after="#main-nav" in-mobile-class="nav navbar-nav">
               <li class="nav-head hidden-xs">{{_('Browse')}}</li>
               {% for element in sidebar %}
-                {% if g.user.check_visibility(element['visibility']) and element['public'] %}
+                {% if current_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_param='stored')}}"><span class="glyphicon {{element['glyph']}}"></span> {{_(element['text'])}}</a></li>
                 {% endif %}
               {% endfor %}
-              {% if g.user.is_authenticated or g.allow_anonymous %}
+              {% if current_user.is_authenticated or g.allow_anonymous %}
                 <li class="nav-head hidden-xs public-shelves">{{_('Shelves')}}</li>
                 {% 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 %}
-              {% if not g.user.is_anonymous %}
+              {% if not current_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>
               {% endif %}
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index f6b307abe..584669374 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -149,7 +149,7 @@
         </div>
         {% endfor %}
       {% endif %}
-      {% if not g.user.is_anonymous %}
+      {% if not current_user.is_anonymous %}
 
         <div class="custom_columns">
           <p>
@@ -159,7 +159,7 @@
               <span>{{_('Read')}}</span>
             </label>
           </p>
-          {% if g.user.check_visibility(32768) %}
+          {% if current_user.check_visibility(32768) %}
           <p>
               <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
               <label class="block-label">
@@ -182,8 +182,8 @@
 
       <div class="more-stuff">
 
-      {% if g.user.is_authenticated %}
-      {% if g.user.shelf.all() or g.shelves_access %}
+      {% if current_user.is_authenticated %}
+      {% if current_user.shelf.all() or g.shelves_access %}
       <div id="shelf-actions" class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Add to shelves">
           <button id="add-to-shelf" type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -192,7 +192,7 @@
           </button>
           <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
             {% for shelf in g.shelves_access %}
-              {% if not shelf.id in books_shelfs and ( not shelf.is_public or g.user.role_edit_shelfs() ) %}
+              {% if not shelf.id in books_shelfs and ( not shelf.is_public or current_user.role_edit_shelfs() ) %}
                 <li>
                   <a data-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                      data-remove-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
@@ -213,7 +213,7 @@
                    data-add-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                    class="btn btn-sm btn-default" role="button" data-shelf-action="remove"
                 >
-                  <span {% if not shelf.is_public or g.user.role_edit_shelfs() %}
+                  <span {% if not shelf.is_public or current_user.role_edit_shelfs() %}
                         class="glyphicon glyphicon-remove"
                         {% endif %}></span> {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}
                 </a>
@@ -343,7 +343,7 @@ window.calibre = {
         bookUrl: "{{ url_for('static', filename=mp3file) }}/",
         bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=mp3file, book_format=audioformat.upper()) }}",
         bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
-        useBookmarks: "{{ g.user.is_authenticated | tojson }}"
+        useBookmarks: "{{ current_user.is_authenticated | tojson }}"
 
             };
 </script>
diff --git a/cps/templates/modal_dialogs.html b/cps/templates/modal_dialogs.html
index 46c54b933..97556c2eb 100644
--- a/cps/templates/modal_dialogs.html
+++ b/cps/templates/modal_dialogs.html
@@ -38,7 +38,7 @@
 </div>
 {% endmacro %}
 {% macro delete_book() %}
-{% if g.user.role_delete_books() %}
+{% if current_user.role_delete_books() %}
 <div class="modal fade" id="deleteModal" role="dialog" aria-labelledby="metaDeleteLabel">
   <div class="modal-dialog">
     <div class="modal-content">
diff --git a/cps/templates/read.html b/cps/templates/read.html
index afbcfe0cb..ab500e000 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -108,7 +108,7 @@
               bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=bookid, book_format='EPUB') }}",
               bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format='epub', anyname='file.epub') }}",
               bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
-              useBookmarks: "{{ g.user.is_authenticated | tojson }}"
+              useBookmarks: "{{ current_user.is_authenticated | tojson }}"
           };
 
           function selectTheme(id) {
diff --git a/cps/templates/readpdf.html b/cps/templates/readpdf.html
index e2876c616..ac9eadd47 100644
--- a/cps/templates/readpdf.html
+++ b/cps/templates/readpdf.html
@@ -171,7 +171,7 @@ See https://github.com/adobe-type-tools/cmap-resources
               <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
             </button>
 
-{% if  g.user.role_download() %}
+{% if  current_user.role_download() %}
             <button id="secondaryPrint" class="secondaryToolbarButton visibleMediumView" title="Print" tabindex="53" data-l10n-id="print">
               <span data-l10n-id="print_label">Print</span>
             </button>
@@ -280,7 +280,7 @@ See https://github.com/adobe-type-tools/cmap-resources
                   <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
                 </button>
 
-{% if  g.user.role_download() %}
+{% if  current_user.role_download() %}
                 <button id="print" class="toolbarButton hiddenMediumView" title="Print" tabindex="33" data-l10n-id="print">
                   <span data-l10n-id="print_label">Print</span>
                 </button>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 78e304944..41f52b98c 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -7,8 +7,8 @@
       <p>{{_('Search Term:')}} {{adv_searchterm}}</p>
     {% else %}
       <h2>{{result_count}} {{_('Results for:')}} {{adv_searchterm}}</h2>
-      {% if g.user.is_authenticated %}
-        {% if g.user.shelf.all() or g.shelves_access %}
+      {% if current_user.is_authenticated %}
+        {% if current_user.shelf.all() or g.shelves_access %}
           <div id="shelf-actions" class="btn-toolbar" role="toolbar">
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
             <div class="btn-group" role="group" aria-label="Add to shelves">
@@ -18,7 +18,7 @@
               </button>
               <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
                 {% for shelf in g.shelves_access %}
-                  {% if not shelf.is_public or g.user.role_edit_shelfs() %}
+                  {% if not shelf.is_public or current_user.role_edit_shelfs() %}
                     <li><a class="postAction" role="button" data-action="{{ url_for('shelf.search_to_shelf', shelf_id=shelf.id) }}"> {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}</a></li>
                   {% endif %}
                 {%endfor%}
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index 7bb9872a3..030d8585c 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -230,18 +230,18 @@
 
 {% block js %}
 <script>
-  var language = '{{ g.user.locale }}';
+  var language = '{{ current_user.locale }}';
 </script>
 <script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/bootstrap-datepicker.min.js') }}"></script>
-{% if not g.user.locale == 'en' %}
-<script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.' + g.user.locale + '.min.js') }}" charset="UTF-8"></script>
+{% if not current_user.locale == 'en' %}
+<script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.' + current_user.locale + '.min.js') }}" charset="UTF-8"></script>
 {% endif %}
 <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 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>
+{% if not current_user.locale == 'en' %}
+<script src="{{ url_for('static', filename='js/libs/bootstrap-select/defaults-' + current_user.locale + '.min.js') }}" charset="UTF-8"></script>
 {% endif %}
 {% endblock %}
 {% block header %}
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index b4596f79d..d47d4d3fa 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -4,11 +4,11 @@
 <div class="discover">
   <h2>{{title}}</h2>
       <!--form  method="post"--->
-  {% if g.user.role_download() %}
+  {% if current_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  %}
+  {% if current_user.is_authenticated %}
+    {% if (current_user.role_edit_shelfs() and shelf.is_public ) or not shelf.is_public  %}
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
         <div class="btn btn-danger" data-action="{{url_for('shelf.delete_shelf', shelf_id=shelf.id)}}" 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>
diff --git a/cps/templates/shelf_edit.html b/cps/templates/shelf_edit.html
index 2882d08ac..58521e3d1 100644
--- a/cps/templates/shelf_edit.html
+++ b/cps/templates/shelf_edit.html
@@ -8,7 +8,7 @@
       <label for="title">{{_('Title')}}</label>
       <input type="text" class="form-control" name="title" id="title" value="{{ shelf.name if shelf.name != None }}">
     </div>
-    {% if g.user.role_edit_shelfs() %}
+    {% if current_user.role_edit_shelfs() %}
       <div class="checkbox">
         <label>
           <input type="checkbox" name="is_public" {% if shelf.is_public == 1 %}checked{% endif %}> {{_('Share with Everyone')}}
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index 2aa14c3f7..e42652b2f 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ g.user.locale }}">
+<html lang="{{ current_user.locale }}">
   <head>
     <title>{{instance}} | {{title}}</title>
     <meta charset="utf-8">
@@ -58,7 +58,7 @@
       </div>
 
 	  <div class="btn-group" role="group" aria-label="Download, send to eReader, reading">
-          {% if g.user.role_download() %}
+          {% if current_user.role_download() %}
             {% if entry.Books.data|length %}
             <div class="btn-group" role="group">
                 {% for format in entry.Books.data %}
diff --git a/cps/templates/stats.html b/cps/templates/stats.html
index 07219ea6c..d41accc76 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -25,7 +25,7 @@
     </tr>
   </tbody>
 </table>
-{% if g.user.role_admin() %}
+{% if current_user.role_admin() %}
   <h3>{{_('System Statistics')}}</h3>
 <table id="libs" class="table">
   <thead>
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index 5cbc5f8b0..386577a62 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -5,10 +5,10 @@
 {% block body %}
 <div class="discover">
     <h2>{{_('Tasks')}}</h2>
-    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('tasks.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
+    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('tasks.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ current_user.locale }}">
       <thead>
         <tr>
-            {% if g.user.role_admin() %}
+            {% if current_user.role_admin() %}
             <th data-halign="right" data-align="right" data-field="user" data-sortable="true">{{_('User')}}</th>
             {% endif %}
             <th data-halign="right" data-align="right" data-field="taskMessage" data-sortable="true">{{_('Task')}}</th>
@@ -16,7 +16,7 @@
             <th data-halign="right" data-align="right" data-field="progress" data-sortable="true" data-sorter="elementSorter">{{_('Progress')}}</th>
             <th data-halign="right" data-align="right" data-field="runtime" data-sortable="true" data-sort-name="rt">{{_('Run Time')}}</th>
             <th data-halign="right" data-align="right" data-field="starttime" data-sortable="true" data-sort-name="id">{{_('Start Time')}}</th>
-            {% if g.user.role_admin() %}
+            {% if current_user.role_admin() %}
             <th data-halign="right" data-align="right" data-formatter="TaskActions" data-switchable="false">{{_('Actions')}}</th>
             {% endif %}
             <th data-field="id" data-visible="false"></th>
@@ -28,7 +28,7 @@
 {% endblock %}
 {% block modal %}
 {{ delete_book() }}
-{% if g.user.role_admin() %}
+{% if current_user.role_admin() %}
 <div class="modal fade" id="cancelTaskModal" role="dialog" aria-labelledby="metaCancelTaskLabel">
   <div class="modal-dialog">
     <div class="modal-content">
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index fba2f5992..0abb39ee4 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -5,7 +5,7 @@
   <form role="form" method="POST" autocomplete="off">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     <div class="col-md-10 col-lg-8">
-    {% if new_user or ( g.user and content.name != "Guest" and g.user.role_admin() ) %}
+    {% if new_user or ( current_user and content.name != "Guest" and current_user.role_admin() ) %}
     <div class="form-group required">
       <label for="name">{{_('Username')}}</label>
       <input type="text" class="form-control" name="name" id="name" value="{{ content.name if content.name != None }}" autocomplete="off">
@@ -15,8 +15,8 @@
       <label for="email">{{_('Email')}}</label>
       <input type="email" class="form-control" name="email" id="email" value="{{ content.email if content.email != None }}" autocomplete="off">
     </div>
-    {% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
-      {% if g.user and g.user.role_admin() and not new_user and not profile and ( mail_configured and content.email if content.email != None ) %}
+    {% if ( current_user and current_user.role_passwd() or current_user.role_admin() ) and not content.role_anonymous() %}
+      {% if current_user and current_user.role_admin() and not new_user and not profile and ( mail_configured and content.email if content.email != None ) %}
         <a class="btn btn-default postAction" id="resend_password" role="button" data-action="{{url_for('admin.reset_user_password', user_id = content.id) }}">{{_('Reset user Password')}}</a>
       {% endif %}
         <div class="form-group">
@@ -83,13 +83,13 @@
           <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if content.show_detail_random() %}checked{% endif %}>
           <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 ) and not simple %}
+      {% if ( current_user and current_user.role_admin() and not new_user ) and not simple %}
       <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">
-    {% if g.user and g.user.role_admin() and not profile %}
+    {% if current_user and current_user.role_admin() and not profile %}
     {% if not content.role_anonymous() %}
     <div class="form-group">
       <input type="checkbox" name="admin_role" id="admin_role" {% if content.role_admin() %}checked{% endif %}>
@@ -143,7 +143,7 @@
       {% if not profile %}
         <div class="btn btn-default" data-back="{{ url_for('admin.admin') }}" id="back">{{_('Cancel')}}</div>
       {% endif %}
-      {% if g.user and g.user.role_admin() and not profile and not new_user and not content.role_anonymous() %}
+      {% if current_user and current_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>
diff --git a/cps/templates/user_table.html b/cps/templates/user_table.html
index fb81ff3aa..3f998f951 100644
--- a/cps/templates/user_table.html
+++ b/cps/templates/user_table.html
@@ -125,7 +125,7 @@
         </div>
     </div>
     <table id="user-table" class="table table-no-bordered table-striped"
-           data-url="{{url_for('admin.list_users')}}"  data-locale="{{ g.user.locale }}">
+           data-url="{{url_for('admin.list_users')}}"  data-locale="{{ current_user.locale }}">
       <thead>
         <tr>
             <th data-name="edit" data-buttontext="{{_('Edit User')}}" data-visible="{{visiblility.get('edit')}}" data-formatter="singleUserFormatter">{{_('Edit')}}</th>
@@ -185,8 +185,8 @@
 <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/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>
+{% if not current_user.locale == 'en' %}
+<script src="{{ url_for('static', filename='js/libs/bootstrap-select/defaults-' + current_user.locale + '.min.js') }}" charset="UTF-8"></script>
 {% endif %}
 <script src="{{ url_for('static', filename='js/table.js') }}"></script>
 {% endblock %}

From f8fbc807f1770cd78dc75effb66a3fa2ddbd443d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 4 Feb 2023 14:51:41 +0100
Subject: [PATCH 408/412] further refactored user login

---
 cps/MyLoginManager.py            | 22 ++++++--
 cps/admin.py                     |  2 +-
 cps/opds.py                      | 16 +++---
 cps/render_template.py           |  7 ++-
 cps/services/simpleldap.py       |  1 +
 cps/templates/book_edit.html     |  2 +-
 cps/templates/book_table.html    |  2 +-
 cps/templates/modal_dialogs.html |  4 +-
 cps/templates/tasks.html         |  2 +-
 cps/usermanagement.py            | 86 +++++++++++---------------------
 cps/web.py                       |  9 ++--
 11 files changed, 71 insertions(+), 82 deletions(-)

diff --git a/cps/MyLoginManager.py b/cps/MyLoginManager.py
index 2f06be94b..aa03ca520 100644
--- a/cps/MyLoginManager.py
+++ b/cps/MyLoginManager.py
@@ -21,9 +21,10 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
-from flask_login import LoginManager
-from flask import session
-
+from flask_login import LoginManager, confirm_login
+from flask import session, current_app
+from flask_login.utils import decode_cookie
+from flask_login.signals import user_loaded_from_cookie
 
 class MyLoginManager(LoginManager):
     def _session_protection_failed(self):
@@ -33,3 +34,18 @@ class MyLoginManager(LoginManager):
                              and _session.get('csrf_token', None))) and ident != _session.get('_id', None):
             return super(). _session_protection_failed()
         return False
+
+    def _load_user_from_remember_cookie(self, cookie):
+        user_id = decode_cookie(cookie)
+        if user_id is not None:
+            session["_user_id"] = user_id
+            session["_fresh"] = False
+            user = None
+            if self._user_callback:
+                user = self._user_callback(user_id)
+            if user is not None:
+                app = current_app._get_current_object()
+                user_loaded_from_cookie.send(app, user=user)
+                confirm_login()
+                return user
+        return None
diff --git a/cps/admin.py b/cps/admin.py
index b3af0f8a6..b0ac0fac1 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -33,7 +33,7 @@ from datetime import time as datetime_time
 from functools import wraps
 
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
-from flask_login import login_required, current_user, logout_user, confirm_login
+from flask_login import login_required, current_user, logout_user
 from flask_babel import gettext as _
 from flask_babel import get_locale, format_time, format_datetime, format_timedelta
 from flask import session as flask_session
diff --git a/cps/opds.py b/cps/opds.py
index bf50691af..6b09a84d4 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -23,10 +23,10 @@
 import datetime
 from urllib.parse import unquote_plus
 
-
-from flask import Blueprint, request, render_template, g, make_response, abort
+from flask import Blueprint, request, render_template, make_response, abort
 from flask_login import current_user
 from flask_babel import get_locale
+from flask_babel import gettext as _
 from sqlalchemy.sql.expression import func, text, or_, and_, true
 from sqlalchemy.exc import InvalidRequestError, OperationalError
 
@@ -35,8 +35,7 @@ from .usermanagement import requires_basic_auth_if_no_ano
 from .helper import get_download_link, get_book_cover
 from .pagination import Pagination
 from .web import render_read_books
-from .usermanagement import load_user_from_request
-from flask_babel import gettext as _
+
 
 opds = Blueprint('opds', __name__)
 
@@ -342,7 +341,8 @@ def feed_languages(book_id):
 @requires_basic_auth_if_no_ano
 def feed_shelfindex():
     off = request.args.get("offset") or 0
-    shelf = g.shelves_access
+    shelf = 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()
     number = len(shelf)
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             number)
@@ -389,11 +389,7 @@ def feed_shelf(book_id):
 @opds.route("/opds/download/<book_id>/<book_format>/")
 @requires_basic_auth_if_no_ano
 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 its 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():
+    if not current_user.role_download():
         return abort(403)
     if "Kobo" in request.headers.get('User-Agent'):
         client = "kobo"
diff --git a/cps/render_template.py b/cps/render_template.py
index 70faaa130..68b464593 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -20,11 +20,13 @@ from flask import render_template, g, abort, request
 from flask_babel import gettext as _
 from werkzeug.local import LocalProxy
 from flask_login import current_user
+from sqlalchemy.sql.expression import or_
 
-from . import config, constants, logger
+from . import config, constants, logger, ub
 from .ub import User
 
 
+
 log = logger.create()
 
 def get_sidebar_config(kwargs=None):
@@ -99,6 +101,9 @@ def get_sidebar_config(kwargs=None):
             {"glyph": "glyphicon-th-list", "text": _('Books List'), "link": 'web.books_table', "id": "list",
              "visibility": constants.SIDEBAR_LIST, 'public': (not current_user.is_anonymous), "page": "list",
              "show_text": _('Show Books List'), "config_show": content})
+    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()
+
     return sidebar, simple
 
 
diff --git a/cps/services/simpleldap.py b/cps/services/simpleldap.py
index 1ca7e5bf6..8f1606fc5 100644
--- a/cps/services/simpleldap.py
+++ b/cps/services/simpleldap.py
@@ -89,6 +89,7 @@ def get_object_details(user=None,query_filter=None):
 
 
 def bind():
+    print("bind")
     return _ldap.bind()
 
 
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index bfb8efdd5..6552cd261 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -219,7 +219,7 @@
 {% endblock %}
 
 {% block modal %}
-{{ delete_book() }}
+{{ delete_book(current_user.role_delete_books()) }}
 {{ delete_confirm_modal() }}
 
 <div class="modal fade" id="metaModal" tabindex="-1" role="dialog" aria-labelledby="metaModalLabel">
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index ae32332b4..16836b7b2 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -104,7 +104,7 @@
     </table>
 {% endblock %}
 {% block modal %}
-{{ delete_book() }}
+{{ delete_book(current_user.role_delete_books()) }}
 {% if current_user.role_edit() %}
 <div class="modal fade" id="mergeModal" role="dialog" aria-labelledby="metaMergeLabel">
   <div class="modal-dialog">
diff --git a/cps/templates/modal_dialogs.html b/cps/templates/modal_dialogs.html
index 97556c2eb..3e0b5bf17 100644
--- a/cps/templates/modal_dialogs.html
+++ b/cps/templates/modal_dialogs.html
@@ -37,8 +37,8 @@
   </div>
 </div>
 {% endmacro %}
-{% macro delete_book() %}
-{% if current_user.role_delete_books() %}
+{% macro delete_book(allow) %}
+{% if allow %}
 <div class="modal fade" id="deleteModal" role="dialog" aria-labelledby="metaDeleteLabel">
   <div class="modal-dialog">
     <div class="modal-content">
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index 386577a62..4d645aa52 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -27,7 +27,7 @@
 </div>
 {% endblock %}
 {% block modal %}
-{{ delete_book() }}
+{{ delete_book(current_user.role_delete_books()) }}
 {% if current_user.role_admin() %}
 <div class="modal fade" id="cancelTaskModal" role="dialog" aria-labelledby="metaCancelTaskLabel">
   <div class="modal-dialog">
diff --git a/cps/usermanagement.py b/cps/usermanagement.py
index 6bf7af5af..affc997f6 100644
--- a/cps/usermanagement.py
+++ b/cps/usermanagement.py
@@ -16,8 +16,6 @@
 #  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 functools import wraps
 
 from sqlalchemy.sql.expression import func
@@ -42,44 +40,46 @@ def requires_basic_auth_if_no_ano(f):
     @wraps(f)
     def decorated(*args, **kwargs):
         auth = request.authorization
-        if config.config_anonbrowse != 1:
-            if not auth or auth.type != 'basic' or not check_auth(auth.username, auth.password):
-                return authenticate()
-            print("opds_requires_basic_auth")
-            user = load_user_from_auth_header(auth.username, auth.password)
-            if not user:
-                return None
-            login_user(user)
+        print("opds_requires_basic_auth")
+        if (not auth or auth.type != 'basic'):
+            if config.config_anonbrowse != 1:
+                return _authenticate()
+            else:
+                return f(*args, **kwargs)
+        if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
+            result, error = services.ldap.bind_user(auth.username, auth.password)
+            if result:
+                user = _fetch_user_by_name(auth.username)
+                login_user(user)
+            else:
+                log.error(error)
+                user = None
+        else:
+            user = _load_user_from_auth_header(auth.username, auth.password)
+        if not user:
+            return _authenticate()
         return f(*args, **kwargs)
-    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
 
 
-def check_auth(username, password):
-    try:
-        username = username.encode('windows-1252')
-    except UnicodeEncodeError:
-        username = username.encode('utf-8')
-    user = ub.session.query(ub.User).filter(func.lower(ub.User.name) ==
-                                            username.decode('utf-8').lower()).first()
+def _load_user_from_auth_header(username, password):
+    user = _fetch_user_by_name(username)
     if bool(user and check_password_hash(str(user.password), password)):
-        return True
+        login_user(user)
+        return user
     else:
         ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
-        log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ip_address)
-        return False
+        log.warning('OPDS Login failed for user "%s" IP-address: %s', username, ip_address)
+        return None
 
 
-def authenticate():
+def _authenticate():
     return Response(
         'Could not verify your access level for that URL.\n'
         'You have to login with proper credentials', 401,
         {'WWW-Authenticate': 'Basic realm="Login Required"'})
 
 
-
 def _fetch_user_by_name(username):
     return ub.session.query(ub.User).filter(func.lower(ub.User.name) == username.lower()).first()
 
@@ -87,49 +87,21 @@ def _fetch_user_by_name(username):
 @lm.user_loader
 def load_user(user_id):
     print("load_user: {}".format(user_id))
-    return ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
+    user = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
+    return user
 
 
 @lm.request_loader
-def load_user_from_request(request):
+def load_user_from_request(req):
     print("load_from_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)
+            rp_header_username = req.headers.get(rp_header_name)
             if rp_header_username:
                 user = _fetch_user_by_name(rp_header_username)
                 if user:
                     login_user(user)
                     return user
-
-    #auth_header = request.headers.get("Authorization")
-    #if auth_header:
-    #    user = load_user_from_auth_header(auth_header)
-    #    if user:
-    #        login_user(user)
-    #        return user
-
     return None
 
-
-def load_user_from_auth_header(basic_username, basic_password):
-    #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')
-    #    # Users with colon are invalid: rfc7617 page 4
-    #    basic_username = header_val.split(':', 1)[0]
-    #    basic_password = header_val.split(':', 1)[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):
-            login_user(user)
-            return user
-    if user and check_password_hash(str(user.password), basic_password):
-        login_user(user)
-        return user
-    return None
diff --git a/cps/web.py b/cps/web.py
index 71d636782..08027c59a 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -24,7 +24,7 @@ import mimetypes
 import chardet  # dependency of requests
 import copy
 
-from flask import Blueprint, jsonify, g
+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 _
@@ -54,6 +54,8 @@ from .usermanagement import login_required_if_no_ano
 from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
 from .kobo_sync_status import change_archived_books
+from .services.worker import WorkerThread
+from .tasks_status import render_task_status
 
 feature_support = {
     'ldap': bool(services.ldap),
@@ -79,7 +81,7 @@ except ImportError:
 
 
 @app.after_request
-def add_security_headers_and_shelves(resp):
+def add_security_headers(resp):
     csp = "default-src 'self'"
     csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
     csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self'"
@@ -98,9 +100,6 @@ def add_security_headers_and_shelves(resp):
     resp.headers['X-Frame-Options'] = 'SAMEORIGIN'
     resp.headers['X-XSS-Protection'] = '1; mode=block'
     resp.headers['Strict-Transport-Security'] = 'max-age=31536000;'
-
-    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()
     return resp
 
 

From ac13f6042aab11f923f8299914bbf83f0d3a8b38 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 5 Feb 2023 08:44:52 +0100
Subject: [PATCH 409/412] Removed prints Enabled additional reverse proxy
 authentication for opds feeds (fixes #2399)

---
 cps/MyLoginManager.py      |  1 +
 cps/admin.py               |  9 ++-------
 cps/services/simpleldap.py |  1 -
 cps/usermanagement.py      | 10 +++++-----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/cps/MyLoginManager.py b/cps/MyLoginManager.py
index aa03ca520..2587e1a93 100644
--- a/cps/MyLoginManager.py
+++ b/cps/MyLoginManager.py
@@ -46,6 +46,7 @@ class MyLoginManager(LoginManager):
             if user is not None:
                 app = current_app._get_current_object()
                 user_loaded_from_cookie.send(app, user=user)
+                # if session was restored from remember me cookie make login valid
                 confirm_login()
                 return user
         return None
diff --git a/cps/admin.py b/cps/admin.py
index b0ac0fac1..9cc568cd2 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -101,13 +101,8 @@ def admin_required(f):
 
 @admi.before_app_request
 def before_request():
-    # make remember me function work
-    #if current_user.is_authenticated:
-    #    print("before request confirm request {}".format(request.path))
-    #    confirm_login()
-    #if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
-    #    log.info("before logout {}".format(request.path))
-    #    logout_user()
+    if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
+        logout_user()
     g.constants = constants
     # g.user = current_user
     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')
diff --git a/cps/services/simpleldap.py b/cps/services/simpleldap.py
index 8f1606fc5..1ca7e5bf6 100644
--- a/cps/services/simpleldap.py
+++ b/cps/services/simpleldap.py
@@ -89,7 +89,6 @@ def get_object_details(user=None,query_filter=None):
 
 
 def bind():
-    print("bind")
     return _ldap.bind()
 
 
diff --git a/cps/usermanagement.py b/cps/usermanagement.py
index affc997f6..e80e55b2b 100644
--- a/cps/usermanagement.py
+++ b/cps/usermanagement.py
@@ -40,9 +40,11 @@ def requires_basic_auth_if_no_ano(f):
     @wraps(f)
     def decorated(*args, **kwargs):
         auth = request.authorization
-        print("opds_requires_basic_auth")
-        if (not auth or auth.type != 'basic'):
+        if not auth or auth.type != 'basic':
             if config.config_anonbrowse != 1:
+                user = load_user_from_reverse_proxy_header(request)
+                if user:
+                    return f(*args, **kwargs)
                 return _authenticate()
             else:
                 return f(*args, **kwargs)
@@ -86,14 +88,12 @@ def _fetch_user_by_name(username):
 
 @lm.user_loader
 def load_user(user_id):
-    print("load_user: {}".format(user_id))
     user = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
     return user
 
 
 @lm.request_loader
-def load_user_from_request(req):
-    print("load_from_request")
+def load_user_from_reverse_proxy_header(req):
     if config.config_allow_reverse_proxy_header_login:
         rp_header_name = config.config_reverse_proxy_login_header_name
         if rp_header_name:

From 794c6ba254fa0d50899d547a48efac98c845aeaf Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 5 Feb 2023 08:47:02 +0100
Subject: [PATCH 410/412] Updated chinese translation

---
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index ecba709ee..9510cfe0f 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -34,7 +34,7 @@ msgstr "正在关闭服务器，请关闭窗口"
 
 #: cps/admin.py:158
 msgid "Success! Database Reconnected"
-msgstr ""
+msgstr "数据库重新连接成功"
 
 #: cps/admin.py:161
 msgid "Unknown command"
@@ -286,7 +286,7 @@ msgstr "编辑邮件服务器设置"
 
 #: cps/admin.py:1287
 msgid "Success! Gmail Account Verified."
-msgstr ""
+msgstr "Gmail 账户验证成功"
 
 #: cps/admin.py:1306 cps/admin.py:1309 cps/admin.py:1690 cps/admin.py:1808
 #: cps/admin.py:1906 cps/admin.py:2026 cps/editbooks.py:229
@@ -295,7 +295,7 @@ msgstr ""
 #: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1423
 #, python-format
 msgid "Oops! Database Error: %(error)s."
-msgstr "数据库错误：%(error)s。"
+msgstr "数据库错误：%(error)s"
 
 #: cps/admin.py:1316
 #, python-format
@@ -334,7 +334,7 @@ msgstr "已更新计划任务设置"
 #: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1261
 #: cps/web.py:1322
 msgid "Oops! An unknown error occurred. Please try again later."
-msgstr "发生一个未知错误，请稍后再试。"
+msgstr "发生一个未知错误，请稍后再试"
 
 #: cps/admin.py:1386
 msgid "Settings DB is not Writeable"
@@ -484,7 +484,7 @@ msgstr "用户“%(user)s”已创建"
 
 #: cps/admin.py:1902
 msgid "Oops! An account already exists for this Email. or name."
-msgstr "使用此邮箱或用户名的账号已经存在。"
+msgstr "使用此邮箱或用户名的账号已经存在"
 
 #: cps/admin.py:1932
 #, python-format
@@ -624,12 +624,12 @@ msgstr "用户没有权限上传其他文件格式"
 #: cps/editbooks.py:1178
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "创建路径 %(path)s 失败 (权限不足)。"
+msgstr "创建路径 %(path)s 失败 (权限不足)"
 
 #: cps/editbooks.py:1183
 #, python-format
 msgid "Failed to store file %(file)s."
-msgstr "保存文件 %(file)s 失败。"
+msgstr "保存文件 %(file)s 失败"
 
 #: cps/editbooks.py:1206
 #, python-format
@@ -667,7 +667,7 @@ msgstr "发送到电子阅读器"
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
 #, fuzzy
 msgid "This Email has been sent via Calibre-Web."
-msgstr "此邮件已经通过 Calibre-Web 发送。"
+msgstr "此邮件已经通过 Calibre-Web 发送"
 
 #: cps/helper.py:114
 #, fuzzy
@@ -752,7 +752,7 @@ msgstr "Google Drive 上找不到书籍路径 %(path)s"
 
 #: cps/helper.py:644
 msgid "Found an existing account for this Email address"
-msgstr ""
+msgstr "已存在使用此邮箱的账户"
 
 #: cps/helper.py:652
 msgid "This username is already taken"
@@ -761,7 +761,7 @@ msgstr "此用户名已被使用"
 #: cps/helper.py:664
 #, fuzzy
 msgid "Invalid Email address format"
-msgstr "无效的邮件地址格式"
+msgstr "无效的邮箱格式"
 
 #: cps/helper.py:815
 msgid "Python module 'advocate' is not installed but is needed for cover uploads"
@@ -859,23 +859,23 @@ msgstr "未连接到 %(oauth)s"
 
 #: cps/oauth_bb.py:261
 msgid "Failed to log in with GitHub."
-msgstr "使用 Github 登录失败。"
+msgstr "使用 Github 登录失败"
 
 #: cps/oauth_bb.py:267
 msgid "Failed to fetch user info from GitHub."
-msgstr "从 Github 获取用户信息失败。"
+msgstr "从 Github 获取用户信息失败"
 
 #: cps/oauth_bb.py:279
 msgid "Failed to log in with Google."
-msgstr "使用 Google 登录失败。"
+msgstr "使用 Google 登录失败"
 
 #: cps/oauth_bb.py:285
 msgid "Failed to fetch user info from Google."
-msgstr "从 Google 获取用户信息失败。"
+msgstr "从 Google 获取用户信息失败"
 
 #: cps/oauth_bb.py:332
 msgid "GitHub Oauth error, please retry later."
-msgstr "GitHub Oauth 错误，请重试。"
+msgstr "GitHub Oauth 错误，请重试"
 
 #: cps/oauth_bb.py:335
 msgid "GitHub Oauth error: {}"
@@ -883,7 +883,7 @@ msgstr "GitHub Oauth 错误: {}"
 
 #: cps/oauth_bb.py:356
 msgid "Google Oauth error, please retry later."
-msgstr "Google Oauth 错误，请重试。"
+msgstr "Google Oauth 错误，请重试"
 
 #: cps/oauth_bb.py:359
 msgid "Google Oauth error: {}"
@@ -952,7 +952,7 @@ msgstr "已读书籍"
 #: cps/render_template.py:62
 #, fuzzy
 msgid "Show Read and Unread"
-msgstr "显示阅读状态"
+msgstr "显示已读或未读状态"
 
 #: cps/render_template.py:64 cps/templates/index.xml:61
 #: cps/templates/index.xml:65 cps/web.py:747
@@ -1189,12 +1189,12 @@ msgstr "发生错误"
 #: cps/shelf.py:369
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "公共书架：%(title)s 已经存在已经存在。"
+msgstr "公共书架：%(title)s 已经存在已经存在"
 
 #: cps/shelf.py:380
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "私有书架：%(title)s 已经存在已经存在。"
+msgstr "私有书架：%(title)s 已经存在已经存在"
 
 #: cps/shelf.py:462
 #, python-format
@@ -1248,7 +1248,7 @@ msgstr "无可用更新。您已经安装了最新版本"
 
 #: cps/updater.py:456
 msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "有新的更新。单击下面的按钮以更新到最新版本。"
+msgstr "有新的更新。单击下面的按钮以更新到最新版本"
 
 #: cps/updater.py:474
 msgid "Could not fetch update information"
@@ -1256,7 +1256,7 @@ msgstr "无法获取更新信息"
 
 #: cps/updater.py:484
 msgid "Click on the button below to update to the latest stable version."
-msgstr "点击下面按钮更新到最新稳定版本。"
+msgstr "点击下面按钮更新到最新稳定版本"
 
 #: cps/updater.py:493 cps/updater.py:507 cps/updater.py:518
 #, python-format
@@ -1348,7 +1348,7 @@ msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 #: cps/web.py:1211
 #, fuzzy
 msgid "Oops! Please update your profile with a valid eReader Email."
-msgstr "请先配置您的 Kindle 邮箱。"
+msgstr "请先配置您的 Kindle 邮箱"
 
 #: cps/web.py:1228
 msgid "Oops! Email server is not configured, please contact your administrator."
@@ -1367,7 +1367,7 @@ msgstr "您的电子邮件不允许注册"
 
 #: cps/web.py:1268
 msgid "Success! Confirmation Email has been sent."
-msgstr "确认邮件已经发送到您的邮箱。"
+msgstr "确认邮件已经发送到您的邮箱"
 
 #: cps/web.py:1282
 msgid "Oops! Cannot activate LDAP authentication"
@@ -1407,7 +1407,7 @@ msgstr "资料已更新"
 
 #: cps/web.py:1418
 msgid "Oops! An account already exists for this Email."
-msgstr "使用此邮箱的账号已经存在。"
+msgstr "使用此邮箱的账号已经存在"
 
 #: cps/services/gmail.py:58
 msgid "Found no valid gmail.json file with OAuth information"
@@ -1954,7 +1954,7 @@ msgstr "搜索错误！"
 
 #: cps/templates/book_edit.html:288
 msgid "No Result(s) found! Please try another keyword."
-msgstr "无搜索结果！请尝试另一个关键字。"
+msgstr "无搜索结果！请尝试另一个关键字"
 
 #: cps/templates/book_table.html:12 cps/templates/book_table.html:69
 #: cps/templates/user_table.html:14 cps/templates/user_table.html:77
@@ -2539,16 +2539,16 @@ msgstr "选择服务器类型"
 #: cps/templates/email_edit.html:15
 #, fuzzy
 msgid "Standard Email Account"
-msgstr "使用标准电子邮件账号"
+msgstr "标准电子邮件"
 
 #: cps/templates/email_edit.html:16
 #, fuzzy
 msgid "Gmail Account"
-msgstr "选择服务器类型"
+msgstr "Gmail 账户"
 
 #: cps/templates/email_edit.html:22
 msgid "Setup Gmail Account"
-msgstr ""
+msgstr "设置 Gmail 账户"
 
 #: cps/templates/email_edit.html:24
 msgid "Revoke Gmail Access"
@@ -2673,11 +2673,11 @@ msgstr "按字母排序的书籍"
 
 #: cps/templates/index.xml:29
 msgid "Popular publications from this catalog based on Downloads."
-msgstr "基于下载数的热门书籍。"
+msgstr "基于下载数的热门书籍"
 
 #: cps/templates/index.xml:36
 msgid "Popular publications from this catalog based on Rating."
-msgstr "基于评分的热门书籍。"
+msgstr "基于评分的热门书籍"
 
 #: cps/templates/index.xml:39
 msgid "Recently added Books"
@@ -2863,11 +2863,11 @@ msgstr "，包括从硬盘中"
 
 #: cps/templates/modal_dialogs.html:56
 msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Kobo 重要提示：被删除的书籍将保留在任何配对的 Kobo 设备上。"
+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 "在安全删除图书之前，必须先将图书归档并与设备同步。"
+msgstr "在安全删除图书之前，必须先将图书归档并与设备同步"
 
 #: cps/templates/modal_dialogs.html:76
 msgid "Choose File Location"
@@ -2923,11 +2923,11 @@ msgstr "黑色"
 
 #: cps/templates/read.html:88
 msgid "Reflow text when sidebars are open."
-msgstr "打开侧栏时重排文本。"
+msgstr "打开侧栏时重排文本"
 
 #: cps/templates/read.html:93
 msgid "Font Sizes"
-msgstr ""
+msgstr "字体大小"
 
 #: cps/templates/readcbr.html:7
 msgid "Comic Reader"
@@ -3075,11 +3075,11 @@ msgstr "在另一个设备上，登录并访问："
 
 #: cps/templates/remote_login.html:11
 msgid "Once verified, you will automatically be logged in on this device."
-msgstr "验证后，您将自动在新设备上登录。"
+msgstr "验证后，您将自动在新设备上登录"
 
 #: cps/templates/remote_login.html:14
 msgid "This verification link will expire in 10 minutes."
-msgstr "此验证链接将在10分钟后失效。"
+msgstr "此验证链接将在10分钟后失效"
 
 #: cps/templates/schedule_edit.html:33
 msgid "Generate Series Cover Thumbnails"
@@ -3308,12 +3308,12 @@ msgstr "输入用户名"
 #: cps/templates/user_table.html:135
 #, fuzzy
 msgid "Enter Email"
-msgstr "测试邮件"
+msgstr "输入邮箱"
 
 #: cps/templates/user_table.html:136
 #, fuzzy
 msgid "Enter eReader Email"
-msgstr "接收书籍的电子阅读器邮箱地址"
+msgstr "接收书籍的电子阅读器邮箱"
 
 #: cps/templates/user_table.html:136
 #, fuzzy

From 275675b48add79d2bbce06426cc1224c5e2c1bfb Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 5 Feb 2023 09:27:56 +0100
Subject: [PATCH 411/412] Search query is now also a post request (possible fix
 for Forward Auth Search Redirect Issue #2681)

---
 cps/search.py             | 7 ++++---
 cps/templates/layout.html | 3 ++-
 cps/web.py                | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cps/search.py b/cps/search.py
index 096b29282..96f21d62c 100644
--- a/cps/search.py
+++ b/cps/search.py
@@ -35,12 +35,13 @@ search = Blueprint('search', __name__)
 log = logger.create()
 
 
-@search.route("/search", methods=["GET"])
+@search.route("/search", methods=["POST"])
 @login_required_if_no_ano
 def simple_search():
-    term = request.args.get("query")
+    term = dict(request.form).get("query")
     if term:
-        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term.strip()))
+        flask_session['query'] = json.dumps(term.strip())
+        return redirect(url_for('web.books_list', data="search", sort_param='stored', query="")) # term.strip()
     else:
         return render_title_template('search.html',
                                      searchterm="",
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 07adbabd6..f6423bb35 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -41,7 +41,8 @@
             <div class="plexBack"><a href="{{url_for('web.index')}}"></a></div>
         {% endif %}
         {% if current_user.is_authenticated or g.allow_anonymous %}
-          <form class="navbar-form navbar-left" role="search" action="{{url_for('search.simple_search')}}" method="GET">
+          <form class="navbar-form navbar-left" role="search" action="{{url_for('search.simple_search')}}" method="POST">
+            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
             <div class="form-group input-group input-group-sm">
               <label for="query" class="sr-only">{{_('Search')}}</label>
               <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search Library')}}" value="{{searchterm}}">
diff --git a/cps/web.py b/cps/web.py
index 08027c59a..e0224b7ca 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -392,7 +392,7 @@ def render_books_list(data, sort_param, book_id, page):
     elif data == "archived":
         return render_archived_books(page, order)
     elif data == "search":
-        term = (request.args.get('query') or '')
+        term = json.loads(flask_session.get('query', ''))
         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":

From 14d14637cda6be7d2a923cdd59efee1c906dbb80 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 6 Feb 2023 19:02:27 +0100
Subject: [PATCH 412/412] Updated test status updated jzip for epub reader
 Bugfix for opds login with ldap updated requirementes

---
 cps/static/js/compress/jszip_epub.min.js      |  13 +
 cps/templates/read.html                       |   2 +-
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 36402 -> 36402 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 59730 -> 59730 bytes
 cps/translations/de/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 53282 -> 53282 bytes
 cps/translations/el/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 47384 -> 47384 bytes
 cps/translations/es/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 24856 -> 24856 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 51589 -> 51589 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/gl/LC_MESSAGES/messages.mo   | Bin 56752 -> 56752 bytes
 cps/translations/gl/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 22741 -> 22741 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/id/LC_MESSAGES/messages.mo   | Bin 54431 -> 54431 bytes
 cps/translations/id/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 61254 -> 61254 bytes
 cps/translations/it/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 60199 -> 60199 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 22556 -> 22556 bytes
 cps/translations/km/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/ko/LC_MESSAGES/messages.mo   | Bin 51734 -> 51734 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 46631 -> 46631 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/no/LC_MESSAGES/messages.mo   | Bin 36091 -> 36091 bytes
 cps/translations/no/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 48261 -> 48261 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   |  70 +-
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 56954 -> 56954 bytes
 .../pt_BR/LC_MESSAGES/messages.po             |  70 +-
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 44070 -> 44070 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 45102 -> 45102 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 20719 -> 20719 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 22749 -> 22749 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   |  70 +-
 cps/translations/vi/LC_MESSAGES/messages.mo   | Bin 29930 -> 29930 bytes
 cps/translations/vi/LC_MESSAGES/messages.po   |  70 +-
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 51600 -> 53880 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 107 +--
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 45154 -> 45154 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        |  70 +-
 cps/usermanagement.py                         |  12 +-
 messages.pot                                  |  70 +-
 requirements.txt                              |   2 +-
 setup.cfg                                     |  28 +-
 test/Calibre-Web TestSummary_Linux.html       | 854 +++++++++---------
 55 files changed, 1359 insertions(+), 1339 deletions(-)
 create mode 100644 cps/static/js/compress/jszip_epub.min.js

diff --git a/cps/static/js/compress/jszip_epub.min.js b/cps/static/js/compress/jszip_epub.min.js
new file mode 100644
index 000000000..ff4cfd5e8
--- /dev/null
+++ b/cps/static/js/compress/jszip_epub.min.js
@@ -0,0 +1,13 @@
+/*!
+
+JSZip v3.10.1 - A JavaScript class for generating and reading zip files
+<http://stuartk.com/jszip>
+
+(c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown.
+
+JSZip uses the library pako released under the MIT license :
+https://github.com/nodeca/pako/blob/main/LICENSE
+*/
+
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e<h.length;e++)u(h[e]);return u}({1:[function(e,t,r){"use strict";var d=e("./utils"),c=e("./support"),p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";r.encode=function(e){for(var t,r,n,i,s,a,o,h=[],u=0,l=e.length,f=l,c="string"!==d.getTypeOf(e);u<e.length;)f=l-u,n=c?(t=e[u++],r=u<l?e[u++]:0,u<l?e[u++]:0):(t=e.charCodeAt(u++),r=u<l?e.charCodeAt(u++):0,u<l?e.charCodeAt(u++):0),i=t>>2,s=(3&t)<<4|r>>4,a=1<f?(15&r)<<2|n>>6:64,o=2<f?63&n:64,h.push(p.charAt(i)+p.charAt(s)+p.charAt(a)+p.charAt(o));return h.join("")},r.decode=function(e){var t,r,n,i,s,a,o=0,h=0,u="data:";if(e.substr(0,u.length)===u)throw new Error("Invalid base64 input, it looks like a data url.");var l,f=3*(e=e.replace(/[^A-Za-z0-9+/=]/g,"")).length/4;if(e.charAt(e.length-1)===p.charAt(64)&&f--,e.charAt(e.length-2)===p.charAt(64)&&f--,f%1!=0)throw new Error("Invalid base64 input, bad content length.");for(l=c.uint8array?new Uint8Array(0|f):new Array(0|f);o<e.length;)t=p.indexOf(e.charAt(o++))<<2|(i=p.indexOf(e.charAt(o++)))>>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,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(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.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 i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r<t;r++)n+=String.fromCharCode(255&e),e>>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||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)+c,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(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),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 e=this.bytesWritten,t=0;t<this.dirRecords.length;t++)this.push({data:this.dirRecords[t],meta:{percent:100}});var r=this.bytesWritten-e,n=function(e,t,r,n,i){var s=I.transformTo("string",i(n));return R.CENTRAL_DIRECTORY_END+"\0\0\0\0"+A(e,2)+A(e,2)+A(t,4)+A(r,4)+A(s.length,2)+s}(this.dirRecords.length,r,e,this.zipComment,this.encodeFileName);this.push({data:n,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(e){this._sources.push(e);var t=this;return e.on("data",function(e){t.processChunk(e)}),e.on("end",function(){t.closedSource(t.previous.streamInfo),t._sources.length?t.prepareNextSource():t.end()}),e.on("error",function(e){t.error(e)}),this},s.prototype.resume=function(){return!!i.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(e){var t=this._sources;if(!i.prototype.error.call(this,e))return!1;for(var r=0;r<t.length;r++)try{t[r].error(e)}catch(e){}return!0},s.prototype.lock=function(){i.prototype.lock.call(this);for(var e=this._sources,t=0;t<e.length;t++)e[t].lock()},t.exports=s},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(e,t,r){"use strict";var u=e("../compressions"),n=e("./ZipFileWorker");r.generateWorker=function(e,a,t){var o=new n(a.streamFiles,t,a.platform,a.encodeFileName),h=0;try{e.forEach(function(e,t){h++;var r=function(e,t){var r=e||t,n=u[r];if(!n)throw new Error(r+" is not a valid compression method !");return n}(t.options.compression,a.compression),n=t.options.compressionOptions||a.compressionOptions||{},i=t.dir,s=t.date;t._compressWorker(r,n).withStreamInfo("file",{name:e,dir:i,date:s,comment:t.comment||"",unixPermissions:t.unixPermissions,dosPermissions:t.dosPermissions}).pipe(o)}),o.entriesCount=h}catch(e){o.error(e)}return o}},{"../compressions":3,"./ZipFileWorker":8}],10:[function(e,t,r){"use strict";function n(){if(!(this instanceof n))return new n;if(arguments.length)throw new Error("The constructor with parameters has been removed in JSZip 3.0, please check the upgrade guide.");this.files=Object.create(null),this.comment=null,this.root="",this.clone=function(){var e=new n;for(var t in this)"function"!=typeof this[t]&&(e[t]=this[t]);return e}}(n.prototype=e("./object")).loadAsync=e("./load"),n.support=e("./support"),n.defaults=e("./defaults"),n.version="3.10.1",n.loadAsync=function(e,t){return(new n).loadAsync(e,t)},n.external=e("./external"),t.exports=n},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(e,t,r){"use strict";var u=e("./utils"),i=e("./external"),n=e("./utf8"),s=e("./zipEntries"),a=e("./stream/Crc32Probe"),l=e("./nodejsUtils");function f(n){return new i.Promise(function(e,t){var r=n.decompressed.getContentWorker().pipe(new a);r.on("error",function(e){t(e)}).on("end",function(){r.streamInfo.crc32!==n.decompressed.crc32?t(new Error("Corrupted zip : CRC32 mismatch")):e()}).resume()})}t.exports=function(e,o){var h=this;return o=u.extend(o||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:n.utf8decode}),l.isNode&&l.isStream(e)?i.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file.")):u.prepareContent("the loaded zip file",e,!0,o.optimizedBinaryString,o.base64).then(function(e){var t=new s(o);return t.load(e),t}).then(function(e){var t=[i.Promise.resolve(e)],r=e.files;if(o.checkCRC32)for(var n=0;n<r.length;n++)t.push(f(r[n]));return i.Promise.all(t)}).then(function(e){for(var t=e.shift(),r=t.files,n=0;n<r.length;n++){var i=r[n],s=i.fileNameStr,a=u.resolve(i.fileNameStr);h.file(a,i.decompressed,{binary:!0,optimizedBinaryString:!0,date:i.date,dir:i.dir,comment:i.fileCommentStr.length?i.fileCommentStr:null,unixPermissions:i.unixPermissions,dosPermissions:i.dosPermissions,createFolders:o.createFolders}),i.dir||(h.file(a).unsafeOriginalName=s)}return t.zipComment.length&&(h.comment=t.zipComment),h})}},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../stream/GenericWorker");function s(e,t){i.call(this,"Nodejs stream input adapter for "+e),this._upstreamEnded=!1,this._bindStream(t)}n.inherits(s,i),s.prototype._bindStream=function(e){var t=this;(this._stream=e).pause(),e.on("data",function(e){t.push({data:e,meta:{percent:0}})}).on("error",function(e){t.isPaused?this.generatedError=e:t.error(e)}).on("end",function(){t.isPaused?t._upstreamEnded=!0:t.end()})},s.prototype.pause=function(){return!!i.prototype.pause.call(this)&&(this._stream.pause(),!0)},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(this._upstreamEnded?this.end():this._stream.resume(),!0)},t.exports=s},{"../stream/GenericWorker":28,"../utils":32}],13:[function(e,t,r){"use strict";var i=e("readable-stream").Readable;function n(e,t,r){i.call(this,t),this._helper=e;var n=this;e.on("data",function(e,t){n.push(e)||n._helper.pause(),r&&r(t)}).on("error",function(e){n.emit("error",e)}).on("end",function(){n.push(null)})}e("../utils").inherits(n,i),n.prototype._read=function(){this._helper.resume()},t.exports=n},{"../utils":32,"readable-stream":16}],14:[function(e,t,r){"use strict";t.exports={isNode:"undefined"!=typeof Buffer,newBufferFrom:function(e,t){if(Buffer.from&&Buffer.from!==Uint8Array.from)return Buffer.from(e,t);if("number"==typeof e)throw new Error('The "data" argument must not be a number');return new Buffer(e,t)},allocBuffer:function(e){if(Buffer.alloc)return Buffer.alloc(e);var t=new Buffer(e);return t.fill(0),t},isBuffer:function(e){return Buffer.isBuffer(e)},isStream:function(e){return e&&"function"==typeof e.on&&"function"==typeof e.pause&&"function"==typeof e.resume}}},{}],15:[function(e,t,r){"use strict";function s(e,t,r){var n,i=u.getTypeOf(t),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&&(e=g(e)),s.createFolders&&(n=_(e))&&b.call(this,n,!0);var a="string"===i&&!1===s.binary&&!1===s.base64;r&&void 0!==r.binary||(s.binary=!a),(t instanceof c&&0===t.uncompressedSize||s.dir||!t||0===t.length)&&(s.base64=!1,s.binary=!0,t="",s.compression="STORE",i="string");var o=null;o=t instanceof c||t instanceof l?t:p.isNode&&p.isStream(t)?new m(e,t):u.prepareContent(e,t,s.binary,s.optimizedBinaryString,s.base64);var h=new d(e,o,s);this.files[e]=h}var i=e("./utf8"),u=e("./utils"),l=e("./stream/GenericWorker"),a=e("./stream/StreamHelper"),f=e("./defaults"),c=e("./compressedObject"),d=e("./zipObject"),o=e("./generate"),p=e("./nodejsUtils"),m=e("./nodejs/NodejsStreamInputAdapter"),_=function(e){"/"===e.slice(-1)&&(e=e.substring(0,e.length-1));var t=e.lastIndexOf("/");return 0<t?e.substring(0,t):""},g=function(e){return"/"!==e.slice(-1)&&(e+="/"),e},b=function(e,t){return t=void 0!==t?t:f.createFolders,e=g(e),this.files[e]||s.call(this,e,null,{dir:!0,createFolders:t}),this.files[e]};function h(e){return"[object RegExp]"===Object.prototype.toString.call(e)}var n={load:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},forEach:function(e){var t,r,n;for(t in this.files)n=this.files[t],(r=t.slice(this.root.length,t.length))&&t.slice(0,this.root.length)===this.root&&e(r,n)},filter:function(r){var n=[];return this.forEach(function(e,t){r(e,t)&&n.push(t)}),n},file:function(e,t,r){if(1!==arguments.length)return e=this.root+e,s.call(this,e,t,r),this;if(h(e)){var n=e;return this.filter(function(e,t){return!t.dir&&n.test(e)})}var i=this.files[this.root+e];return i&&!i.dir?i:null},folder:function(r){if(!r)return this;if(h(r))return this.filter(function(e,t){return t.dir&&r.test(e)});var e=this.root+r,t=b.call(this,e),n=this.clone();return n.root=t.name,n},remove:function(r){r=this.root+r;var e=this.files[r];if(e||("/"!==r.slice(-1)&&(r+="/"),e=this.files[r]),e&&!e.dir)delete this.files[r];else for(var t=this.filter(function(e,t){return t.name.slice(0,r.length)===r}),n=0;n<t.length;n++)delete this.files[t[n].name];return this},generate:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},generateInternalStream:function(e){var t,r={};try{if((r=u.extend(e||{},{streamFiles:!1,compression:"STORE",compressionOptions:null,type:"",platform:"DOS",comment:null,mimeType:"application/zip",encodeFileName:i.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 n=r.comment||this.comment||"";t=o.generateWorker(this,r,n)}catch(e){(t=new l("error")).error(e)}return new a(t,r.type||"string",r.mimeType)},generateAsync:function(e,t){return this.generateInternalStream(e).accumulate(t)},generateNodeStream:function(e,t){return(e=e||{}).type||(e.type="nodebuffer"),this.generateInternalStream(e).toNodejsStream(t)}};t.exports=n},{"./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(e,t,r){"use strict";t.exports=e("stream")},{stream:void 0}],17:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e);for(var t=0;t<this.data.length;t++)e[t]=255&e[t]}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data[this.zero+e]},i.prototype.lastIndexOfSignature=function(e){for(var t=e.charCodeAt(0),r=e.charCodeAt(1),n=e.charCodeAt(2),i=e.charCodeAt(3),s=this.length-4;0<=s;--s)if(this.data[s]===t&&this.data[s+1]===r&&this.data[s+2]===n&&this.data[s+3]===i)return s-this.zero;return-1},i.prototype.readAndCheckSignature=function(e){var t=e.charCodeAt(0),r=e.charCodeAt(1),n=e.charCodeAt(2),i=e.charCodeAt(3),s=this.readData(4);return t===s[0]&&r===s[1]&&n===s[2]&&i===s[3]},i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return[];var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],18:[function(e,t,r){"use strict";var n=e("../utils");function i(e){this.data=e,this.length=e.length,this.index=0,this.zero=0}i.prototype={checkOffset:function(e){this.checkIndex(this.index+e)},checkIndex:function(e){if(this.length<this.zero+e||e<0)throw new Error("End of data reached (data length = "+this.length+", asked index = "+e+"). Corrupted zip ?")},setIndex:function(e){this.checkIndex(e),this.index=e},skip:function(e){this.setIndex(this.index+e)},byteAt:function(){},readInt:function(e){var t,r=0;for(this.checkOffset(e),t=this.index+e-1;t>=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,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(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"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}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r<this._listeners[e].length;r++)this._listeners[e][r].call(this,t)},pipe:function(e){return e.registerPrevious(this)},registerPrevious:function(e){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.streamInfo=e.streamInfo,this.mergeStreamInfo(),this.previous=e;var t=this;return e.on("data",function(e){t.processChunk(e)}),e.on("end",function(){t.end()}),e.on("error",function(e){t.error(e)}),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 e=this.isPaused=!1;return this.generatedError&&(this.error(this.generatedError),e=!0),this.previous&&this.previous.resume(),!e},flush:function(){},processChunk:function(e){this.push(e)},withStreamInfo:function(e,t){return this.extraStreamInfo[e]=t,this.mergeStreamInfo(),this},mergeStreamInfo:function(){for(var e in this.extraStreamInfo)Object.prototype.hasOwnProperty.call(this.extraStreamInfo,e)&&(this.streamInfo[e]=this.extraStreamInfo[e])},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 e="Worker "+this.name;return this.previous?this.previous+" -> "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r<t.length;r++)s+=t[r].length;switch(e){case"string":return t.join("");case"array":return Array.prototype.concat.apply([],t);case"uint8array":for(i=new Uint8Array(s),r=0;r<t.length;r++)i.set(t[r],n),n+=t[r].length;return i;case"nodebuffer":return Buffer.concat(t);default:throw new Error("concat : unsupported type '"+e+"'")}}(i,n),a);t(e)}catch(e){r(e)}n=[]}).resume()})}function f(e,t,r){var n=t;switch(t){case"blob":case"arraybuffer":n="uint8array";break;case"base64":n="string"}try{this._internalType=n,this._outputType=t,this._mimeType=r,h.checkSupport(n),this._worker=e.pipe(new i(n)),e.lock()}catch(e){this._worker=new s("error"),this._worker.error(e)}}f.prototype={accumulate:function(e){return l(this,e)},on:function(e,t){var r=this;return"data"===e?this._worker.on(e,function(e){t.call(r,e.data,e.meta)}):this._worker.on(e,function(){h.delay(t,arguments,r)}),this},resume:function(){return h.delay(this._worker.resume,[],this._worker),this},pause:function(){return this._worker.pause(),this},toNodejsStream:function(e){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},e)}},t.exports=f},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(e,t,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 n=new ArrayBuffer(0);try{r.blob=0===new Blob([n],{type:"application/zip"}).size}catch(e){try{var i=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);i.append(n),r.blob=0===i.getBlob("application/zip").size}catch(e){r.blob=!1}}}try{r.nodestream=!!e("readable-stream").Readable}catch(e){r.nodestream=!1}},{"readable-stream":16}],31:[function(e,t,s){"use strict";for(var o=e("./utils"),h=e("./support"),r=e("./nodejsUtils"),n=e("./stream/GenericWorker"),u=new Array(256),i=0;i<256;i++)u[i]=252<=i?6:248<=i?5:240<=i?4:224<=i?3:192<=i?2:1;u[254]=u[254]=1;function a(){n.call(this,"utf-8 decode"),this.leftOver=null}function l(){n.call(this,"utf-8 encode")}s.utf8encode=function(e){return h.nodebuffer?r.newBufferFrom(e,"utf-8"):function(e){var t,r,n,i,s,a=e.length,o=0;for(i=0;i<a;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),o+=r<128?1:r<2048?2:r<65536?3:4;for(t=h.uint8array?new Uint8Array(o):new Array(o),i=s=0;s<o;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),r<128?t[s++]=r:(r<2048?t[s++]=192|r>>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t<s;)if((n=e[t++])<128)a[r++]=n;else if(4<(i=u[n]))a[r++]=65533,t+=i-1;else{for(n&=2===i?31:3===i?15:7;1<i&&t<s;)n=n<<6|63&e[t++],i--;1<i?a[r++]=65533:n<65536?a[r++]=n:(n-=65536,a[r++]=55296|n>>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.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,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r<e.length;++r)t[r]=255&e.charCodeAt(r);return t}e("setimmediate"),a.newBlob=function(t,r){a.checkSupport("blob");try{return new Blob([t],{type:r})}catch(e){try{var n=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);return n.append(t),n.getBlob(r)}catch(e){throw new Error("Bug : can't construct the Blob.")}}};var i={stringifyByChunk:function(e,t,r){var n=[],i=0,s=e.length;if(s<=r)return String.fromCharCode.apply(null,e);for(;i<s;)"array"===t||"nodebuffer"===t?n.push(String.fromCharCode.apply(null,e.slice(i,Math.min(i+r,s)))):n.push(String.fromCharCode.apply(null,e.subarray(i,Math.min(i+r,s)))),i+=r;return n.join("")},stringifyByChar:function(e){for(var t="",r=0;r<e.length;r++)t+=String.fromCharCode(e[r]);return t},applyCanBeUsed:{uint8array:function(){try{return o.uint8array&&1===String.fromCharCode.apply(null,new Uint8Array(1)).length}catch(e){return!1}}(),nodebuffer:function(){try{return o.nodebuffer&&1===String.fromCharCode.apply(null,r.allocBuffer(1)).length}catch(e){return!1}}()}};function s(e){var t=65536,r=a.getTypeOf(e),n=!0;if("uint8array"===r?n=i.applyCanBeUsed.uint8array:"nodebuffer"===r&&(n=i.applyCanBeUsed.nodebuffer),n)for(;1<t;)try{return i.stringifyByChunk(e,r,t)}catch(e){t=Math.floor(t/2)}return i.stringifyByChar(e)}function f(e,t){for(var r=0;r<e.length;r++)t[r]=e[r];return t}a.applyFromCharCode=s;var c={};c.string={string:n,array:function(e){return l(e,new Array(e.length))},arraybuffer:function(e){return c.string.uint8array(e).buffer},uint8array:function(e){return l(e,new Uint8Array(e.length))},nodebuffer:function(e){return l(e,r.allocBuffer(e.length))}},c.array={string:s,array:n,arraybuffer:function(e){return new Uint8Array(e).buffer},uint8array:function(e){return new Uint8Array(e)},nodebuffer:function(e){return r.newBufferFrom(e)}},c.arraybuffer={string:function(e){return s(new Uint8Array(e))},array:function(e){return f(new Uint8Array(e),new Array(e.byteLength))},arraybuffer:n,uint8array:function(e){return new Uint8Array(e)},nodebuffer:function(e){return r.newBufferFrom(new Uint8Array(e))}},c.uint8array={string:s,array:function(e){return f(e,new Array(e.length))},arraybuffer:function(e){return e.buffer},uint8array:n,nodebuffer:function(e){return r.newBufferFrom(e)}},c.nodebuffer={string:s,array:function(e){return f(e,new Array(e.length))},arraybuffer:function(e){return c.nodebuffer.uint8array(e).buffer},uint8array:function(e){return f(e,new Uint8Array(e.length))},nodebuffer:n},a.transformTo=function(e,t){if(t=t||"",!e)return t;a.checkSupport(e);var r=a.getTypeOf(t);return c[r][e](t)},a.resolve=function(e){for(var t=e.split("/"),r=[],n=0;n<t.length;n++){var i=t[n];"."===i||""===i&&0!==n&&n!==t.length-1||(".."===i?r.pop():r.push(i))}return r.join("/")},a.getTypeOf=function(e){return"string"==typeof e?"string":"[object Array]"===Object.prototype.toString.call(e)?"array":o.nodebuffer&&r.isBuffer(e)?"nodebuffer":o.uint8array&&e instanceof Uint8Array?"uint8array":o.arraybuffer&&e instanceof ArrayBuffer?"arraybuffer":void 0},a.checkSupport=function(e){if(!o[e.toLowerCase()])throw new Error(e+" is not supported by this platform")},a.MAX_VALUE_16BITS=65535,a.MAX_VALUE_32BITS=-1,a.pretty=function(e){var t,r,n="";for(r=0;r<(e||"").length;r++)n+="\\x"+((t=e.charCodeAt(r))<16?"0":"")+t.toString(16).toUpperCase();return n},a.delay=function(e,t,r){setImmediate(function(){e.apply(r||null,t||[])})},a.inherits=function(e,t){function r(){}r.prototype=t.prototype,e.prototype=new r},a.extend=function(){var e,t,r={};for(e=0;e<arguments.length;e++)for(t in arguments[e])Object.prototype.hasOwnProperty.call(arguments[e],t)&&void 0===r[t]&&(r[t]=arguments[e][t]);return r},a.prepareContent=function(r,e,n,i,s){return u.Promise.resolve(e).then(function(n){return o.blob&&(n instanceof Blob||-1!==["[object File]","[object Blob]"].indexOf(Object.prototype.toString.call(n)))&&"undefined"!=typeof FileReader?new u.Promise(function(t,r){var e=new FileReader;e.onload=function(e){t(e.target.result)},e.onerror=function(e){r(e.target.error)},e.readAsArrayBuffer(n)}):n}).then(function(e){var t=a.getTypeOf(e);return t?("arraybuffer"===t?e=a.transformTo("uint8array",e):"string"===t&&(s?e=h.decode(e):n&&!0!==i&&(e=function(e){return l(e,o.uint8array?new Uint8Array(e.length):new Array(e.length))}(e))),e):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,setimmediate:54}],33:[function(e,t,r){"use strict";var n=e("./reader/readerFor"),i=e("./utils"),s=e("./signature"),a=e("./zipEntry"),o=e("./support");function h(e){this.files=[],this.loadOptions=e}h.prototype={checkSignature:function(e){if(!this.reader.readAndCheckSignature(e)){this.reader.index-=4;var t=this.reader.readString(4);throw new Error("Corrupted zip or bug: unexpected signature ("+i.pretty(t)+", expected "+i.pretty(e)+")")}},isSignature:function(e,t){var r=this.reader.index;this.reader.setIndex(e);var n=this.reader.readString(4)===t;return this.reader.setIndex(r),n},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 e=this.reader.readData(this.zipCommentLength),t=o.uint8array?"uint8array":"array",r=i.transformTo(t,e);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 e,t,r,n=this.zip64EndOfCentralSize-44;0<n;)e=this.reader.readInt(2),t=this.reader.readInt(4),r=this.reader.readData(t),this.zip64ExtensibleData[e]={id:e,length:t,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 e,t;for(e=0;e<this.files.length;e++)t=this.files[e],this.reader.setIndex(t.localHeaderOffset),this.checkSignature(s.LOCAL_FILE_HEADER),t.readLocalPart(this.reader),t.handleUTF8(),t.processAttributes()},readCentralDir:function(){var e;for(this.reader.setIndex(this.centralDirOffset);this.reader.readAndCheckSignature(s.CENTRAL_FILE_HEADER);)(e=new a({zip64:this.zip64},this.loadOptions)).readCentralPart(this.reader),this.files.push(e);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 e=this.reader.lastIndexOfSignature(s.CENTRAL_DIRECTORY_END);if(e<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(e);var t=e;if(this.checkSignature(s.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===i.MAX_VALUE_16BITS||this.diskWithCentralDirStart===i.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===i.MAX_VALUE_16BITS||this.centralDirRecords===i.MAX_VALUE_16BITS||this.centralDirSize===i.MAX_VALUE_32BITS||this.centralDirOffset===i.MAX_VALUE_32BITS){if(this.zip64=!0,(e=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(e),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 n=t-r;if(0<n)this.isSignature(t,s.CENTRAL_FILE_HEADER)||(this.reader.zero=n);else if(n<0)throw new Error("Corrupted zip: missing "+Math.abs(n)+" bytes.")},prepareReader:function(e){this.reader=n(e)},load:function(e){this.prepareReader(e),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},t.exports=h},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utils":32,"./zipEntry":34}],34:[function(e,t,r){"use strict";var n=e("./reader/readerFor"),s=e("./utils"),i=e("./compressedObject"),a=e("./crc32"),o=e("./utf8"),h=e("./compressions"),u=e("./support");function l(e,t){this.options=e,this.loadOptions=t}l.prototype={isEncrypted:function(){return 1==(1&this.bitFlag)},useUTF8:function(){return 2048==(2048&this.bitFlag)},readLocalPart:function(e){var t,r;if(e.skip(22),this.fileNameLength=e.readInt(2),r=e.readInt(2),this.fileName=e.readData(this.fileNameLength),e.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===(t=function(e){for(var t in h)if(Object.prototype.hasOwnProperty.call(h,t)&&h[t].magic===e)return h[t];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 i(this.compressedSize,this.uncompressedSize,this.crc32,t,e.readData(this.compressedSize))},readCentralPart:function(e){this.versionMadeBy=e.readInt(2),e.skip(2),this.bitFlag=e.readInt(2),this.compressionMethod=e.readString(2),this.date=e.readDate(),this.crc32=e.readInt(4),this.compressedSize=e.readInt(4),this.uncompressedSize=e.readInt(4);var t=e.readInt(2);if(this.extraFieldsLength=e.readInt(2),this.fileCommentLength=e.readInt(2),this.diskNumberStart=e.readInt(2),this.internalFileAttributes=e.readInt(2),this.externalFileAttributes=e.readInt(4),this.localHeaderOffset=e.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");e.skip(t),this.readExtraFields(e),this.parseZIP64ExtraField(e),this.fileComment=e.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var e=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(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(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4<i;)t=e.readInt(2),r=e.readInt(2),n=e.readData(r),this.extraFields[t]={id:t,length:r,value:n};e.setIndex(i)},handleUTF8:function(){var e=u.uint8array?"uint8array":"array";if(this.useUTF8())this.fileNameStr=o.utf8decode(this.fileName),this.fileCommentStr=o.utf8decode(this.fileComment);else{var t=this.findExtraFieldUnicodePath();if(null!==t)this.fileNameStr=t;else{var r=s.transformTo(e,this.fileName);this.fileNameStr=this.loadOptions.decodeFileName(r)}var n=this.findExtraFieldUnicodeComment();if(null!==n)this.fileCommentStr=n;else{var i=s.transformTo(e,this.fileComment);this.fileCommentStr=this.loadOptions.decodeFileName(i)}}},findExtraFieldUnicodePath:function(){var e=this.extraFields[28789];if(e){var t=n(e.value);return 1!==t.readInt(1)?null:a(this.fileName)!==t.readInt(4)?null:o.utf8decode(t.readData(e.length-5))}return null},findExtraFieldUnicodeComment:function(){var e=this.extraFields[25461];if(e){var t=n(e.value);return 1!==t.readInt(1)?null:a(this.fileComment)!==t.readInt(4)?null:o.utf8decode(t.readData(e.length-5))}return null}},t.exports=l},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(e,t,r){"use strict";function n(e,t,r){this.name=e,this.dir=r.dir,this.date=r.date,this.comment=r.comment,this.unixPermissions=r.unixPermissions,this.dosPermissions=r.dosPermissions,this._data=t,this._dataBinary=r.binary,this.options={compression:r.compression,compressionOptions:r.compressionOptions}}var s=e("./stream/StreamHelper"),i=e("./stream/DataWorker"),a=e("./utf8"),o=e("./compressedObject"),h=e("./stream/GenericWorker");n.prototype={internalStream:function(e){var t=null,r="string";try{if(!e)throw new Error("No output type specified.");var n="string"===(r=e.toLowerCase())||"text"===r;"binarystring"!==r&&"text"!==r||(r="string"),t=this._decompressWorker();var i=!this._dataBinary;i&&!n&&(t=t.pipe(new a.Utf8EncodeWorker)),!i&&n&&(t=t.pipe(new a.Utf8DecodeWorker))}catch(e){(t=new h("error")).error(e)}return new s(t,r,"")},async:function(e,t){return this.internalStream(e).accumulate(t)},nodeStream:function(e,t){return this.internalStream(e||"nodebuffer").toNodejsStream(t)},_compressWorker:function(e,t){if(this._data instanceof o&&this._data.compression.magic===e.magic)return this._data.getCompressedWorker();var r=this._decompressWorker();return this._dataBinary||(r=r.pipe(new a.Utf8EncodeWorker)),o.createWorkerFrom(r,e,t)},_decompressWorker:function(){return this._data instanceof o?this._data.getContentWorker():this._data instanceof h?this._data:new i(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++)n.prototype[u[f]]=l;t.exports=n},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(e,l,t){(function(t){"use strict";var r,n,e=t.MutationObserver||t.WebKitMutationObserver;if(e){var i=0,s=new e(u),a=t.document.createTextNode("");s.observe(a,{characterData:!0}),r=function(){a.data=i=++i%2}}else if(t.setImmediate||void 0===t.MessageChannel)r="document"in t&&"onreadystatechange"in t.document.createElement("script")?function(){var e=t.document.createElement("script");e.onreadystatechange=function(){u(),e.onreadystatechange=null,e.parentNode.removeChild(e),e=null},t.document.documentElement.appendChild(e)}:function(){setTimeout(u,0)};else{var o=new t.MessageChannel;o.port1.onmessage=u,r=function(){o.port2.postMessage(0)}}var h=[];function u(){var e,t;n=!0;for(var r=h.length;r;){for(t=h,h=[],e=-1;++e<r;)t[e]();r=h.length}n=!1}l.exports=function(e){1!==h.push(e)||n||r()}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],37:[function(e,t,r){"use strict";var i=e("immediate");function u(){}var l={},s=["REJECTED"],a=["FULFILLED"],n=["PENDING"];function o(e){if("function"!=typeof e)throw new TypeError("resolver must be a function");this.state=n,this.queue=[],this.outcome=void 0,e!==u&&d(this,e)}function h(e,t,r){this.promise=e,"function"==typeof t&&(this.onFulfilled=t,this.callFulfilled=this.otherCallFulfilled),"function"==typeof r&&(this.onRejected=r,this.callRejected=this.otherCallRejected)}function f(t,r,n){i(function(){var e;try{e=r(n)}catch(e){return l.reject(t,e)}e===t?l.reject(t,new TypeError("Cannot resolve promise with itself")):l.resolve(t,e)})}function c(e){var t=e&&e.then;if(e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof t)return function(){t.apply(e,arguments)}}function d(t,e){var r=!1;function n(e){r||(r=!0,l.reject(t,e))}function i(e){r||(r=!0,l.resolve(t,e))}var s=p(function(){e(i,n)});"error"===s.status&&n(s.value)}function p(e,t){var r={};try{r.value=e(t),r.status="success"}catch(e){r.status="error",r.value=e}return r}(t.exports=o).prototype.finally=function(t){if("function"!=typeof t)return this;var r=this.constructor;return this.then(function(e){return r.resolve(t()).then(function(){return e})},function(e){return r.resolve(t()).then(function(){throw e})})},o.prototype.catch=function(e){return this.then(null,e)},o.prototype.then=function(e,t){if("function"!=typeof e&&this.state===a||"function"!=typeof t&&this.state===s)return this;var r=new this.constructor(u);this.state!==n?f(r,this.state===a?e:t,this.outcome):this.queue.push(new h(r,e,t));return r},h.prototype.callFulfilled=function(e){l.resolve(this.promise,e)},h.prototype.otherCallFulfilled=function(e){f(this.promise,this.onFulfilled,e)},h.prototype.callRejected=function(e){l.reject(this.promise,e)},h.prototype.otherCallRejected=function(e){f(this.promise,this.onRejected,e)},l.resolve=function(e,t){var r=p(c,t);if("error"===r.status)return l.reject(e,r.value);var n=r.value;if(n)d(e,n);else{e.state=a,e.outcome=t;for(var i=-1,s=e.queue.length;++i<s;)e.queue[i].callFulfilled(t)}return e},l.reject=function(e,t){e.state=s,e.outcome=t;for(var r=-1,n=e.queue.length;++r<n;)e.queue[r].callRejected(t);return e},o.resolve=function(e){if(e instanceof this)return e;return l.resolve(new this(u),e)},o.reject=function(e){var t=new this(u);return l.reject(t,e)},o.all=function(e){var r=this;if("[object Array]"!==Object.prototype.toString.call(e))return this.reject(new TypeError("must be an array"));var n=e.length,i=!1;if(!n)return this.resolve([]);var s=new Array(n),a=0,t=-1,o=new this(u);for(;++t<n;)h(e[t],t);return o;function h(e,t){r.resolve(e).then(function(e){s[t]=e,++a!==n||i||(i=!0,l.resolve(o,s))},function(e){i||(i=!0,l.reject(o,e))})}},o.race=function(e){var t=this;if("[object Array]"!==Object.prototype.toString.call(e))return this.reject(new TypeError("must be an array"));var r=e.length,n=!1;if(!r)return this.resolve([]);var i=-1,s=new this(u);for(;++i<r;)a=e[i],t.resolve(a).then(function(e){n||(n=!0,l.resolve(s,e))},function(e){n||(n=!0,l.reject(s,e))});var a;return s}},{immediate:36}],38:[function(e,t,r){"use strict";var n={};(0,e("./lib/utils/common").assign)(n,e("./lib/deflate"),e("./lib/inflate"),e("./lib/zlib/constants")),t.exports=n},{"./lib/deflate":39,"./lib/inflate":40,"./lib/utils/common":41,"./lib/zlib/constants":44}],39:[function(e,t,r){"use strict";var a=e("./zlib/deflate"),o=e("./utils/common"),h=e("./utils/strings"),i=e("./zlib/messages"),s=e("./zlib/zstream"),u=Object.prototype.toString,l=0,f=-1,c=0,d=8;function p(e){if(!(this instanceof p))return new p(e);this.options=o.assign({level:f,method:d,chunkSize:16384,windowBits:15,memLevel:8,strategy:c,to:""},e||{});var t=this.options;t.raw&&0<t.windowBits?t.windowBits=-t.windowBits:t.gzip&&0<t.windowBits&&t.windowBits<16&&(t.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,t.level,t.method,t.windowBits,t.memLevel,t.strategy);if(r!==l)throw new Error(i[r]);if(t.header&&a.deflateSetHeader(this.strm,t.header),t.dictionary){var n;if(n="string"==typeof t.dictionary?h.string2buf(t.dictionary):"[object ArrayBuffer]"===u.call(t.dictionary)?new Uint8Array(t.dictionary):t.dictionary,(r=a.deflateSetDictionary(this.strm,n))!==l)throw new Error(i[r]);this._dict_set=!0}}function n(e,t){var r=new p(t);if(r.push(e,!0),r.err)throw r.msg||i[r.err];return r.result}p.prototype.push=function(e,t){var r,n,i=this.strm,s=this.options.chunkSize;if(this.ended)return!1;n=t===~~t?t:!0===t?4:0,"string"==typeof e?i.input=h.string2buf(e):"[object ArrayBuffer]"===u.call(e)?i.input=new Uint8Array(e):i.input=e,i.next_in=0,i.avail_in=i.input.length;do{if(0===i.avail_out&&(i.output=new o.Buf8(s),i.next_out=0,i.avail_out=s),1!==(r=a.deflate(i,n))&&r!==l)return this.onEnd(r),!(this.ended=!0);0!==i.avail_out&&(0!==i.avail_in||4!==n&&2!==n)||("string"===this.options.to?this.onData(h.buf2binstring(o.shrinkBuf(i.output,i.next_out))):this.onData(o.shrinkBuf(i.output,i.next_out)))}while((0<i.avail_in||0===i.avail_out)&&1!==r);return 4===n?(r=a.deflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===l):2!==n||(this.onEnd(l),!(i.avail_out=0))},p.prototype.onData=function(e){this.chunks.push(e)},p.prototype.onEnd=function(e){e===l&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=o.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},r.Deflate=p,r.deflate=n,r.deflateRaw=function(e,t){return(t=t||{}).raw=!0,n(e,t)},r.gzip=function(e,t){return(t=t||{}).gzip=!0,n(e,t)}},{"./utils/common":41,"./utils/strings":42,"./zlib/deflate":46,"./zlib/messages":51,"./zlib/zstream":53}],40:[function(e,t,r){"use strict";var c=e("./zlib/inflate"),d=e("./utils/common"),p=e("./utils/strings"),m=e("./zlib/constants"),n=e("./zlib/messages"),i=e("./zlib/zstream"),s=e("./zlib/gzheader"),_=Object.prototype.toString;function a(e){if(!(this instanceof a))return new a(e);this.options=d.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;t.raw&&0<=t.windowBits&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(0<=t.windowBits&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),15<t.windowBits&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new i,this.strm.avail_out=0;var r=c.inflateInit2(this.strm,t.windowBits);if(r!==m.Z_OK)throw new Error(n[r]);this.header=new s,c.inflateGetHeader(this.strm,this.header)}function o(e,t){var r=new a(t);if(r.push(e,!0),r.err)throw r.msg||n[r.err];return r.result}a.prototype.push=function(e,t){var r,n,i,s,a,o,h=this.strm,u=this.options.chunkSize,l=this.options.dictionary,f=!1;if(this.ended)return!1;n=t===~~t?t:!0===t?m.Z_FINISH:m.Z_NO_FLUSH,"string"==typeof e?h.input=p.binstring2buf(e):"[object ArrayBuffer]"===_.call(e)?h.input=new Uint8Array(e):h.input=e,h.next_in=0,h.avail_in=h.input.length;do{if(0===h.avail_out&&(h.output=new d.Buf8(u),h.next_out=0,h.avail_out=u),(r=c.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=c.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||n!==m.Z_FINISH&&n!==m.Z_SYNC_FLUSH)||("string"===this.options.to?(i=p.utf8border(h.output,h.next_out),s=h.next_out-i,a=p.buf2string(h.output,i),h.next_out=s,h.avail_out=u-s,s&&d.arraySet(h.output,h.output,i,s,0),this.onData(a)):this.onData(d.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&&(n=m.Z_FINISH),n===m.Z_FINISH?(r=c.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===m.Z_OK):n!==m.Z_SYNC_FLUSH||(this.onEnd(m.Z_OK),!(h.avail_out=0))},a.prototype.onData=function(e){this.chunks.push(e)},a.prototype.onEnd=function(e){e===m.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=d.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},r.Inflate=a,r.inflate=o,r.inflateRaw=function(e,t){return(t=t||{}).raw=!0,o(e,t)},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(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;r.assign=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var r=t.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var n in r)r.hasOwnProperty(n)&&(e[n]=r[n])}}return e},r.shrinkBuf=function(e,t){return e.length===t?e:e.subarray?e.subarray(0,t):(e.length=t,e)};var i={arraySet:function(e,t,r,n,i){if(t.subarray&&e.subarray)e.set(t.subarray(r,r+n),i);else for(var s=0;s<n;s++)e[i+s]=t[r+s]},flattenChunks:function(e){var t,r,n,i,s,a;for(t=n=0,r=e.length;t<r;t++)n+=e[t].length;for(a=new Uint8Array(n),t=i=0,r=e.length;t<r;t++)s=e[t],a.set(s,i),i+=s.length;return a}},s={arraySet:function(e,t,r,n,i){for(var s=0;s<n;s++)e[i+s]=t[r+s]},flattenChunks:function(e){return[].concat.apply([],e)}};r.setTyped=function(e){e?(r.Buf8=Uint8Array,r.Buf16=Uint16Array,r.Buf32=Int32Array,r.assign(r,i)):(r.Buf8=Array,r.Buf16=Array,r.Buf32=Array,r.assign(r,s))},r.setTyped(n)},{}],42:[function(e,t,r){"use strict";var h=e("./common"),i=!0,s=!0;try{String.fromCharCode.apply(null,[0])}catch(e){i=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){s=!1}for(var u=new h.Buf8(256),n=0;n<256;n++)u[n]=252<=n?6:248<=n?5:240<=n?4:224<=n?3:192<=n?2:1;function l(e,t){if(t<65537&&(e.subarray&&s||!e.subarray&&i))return String.fromCharCode.apply(null,h.shrinkBuf(e,t));for(var r="",n=0;n<t;n++)r+=String.fromCharCode(e[n]);return r}u[254]=u[254]=1,r.string2buf=function(e){var t,r,n,i,s,a=e.length,o=0;for(i=0;i<a;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),o+=r<128?1:r<2048?2:r<65536?3:4;for(t=new h.Buf8(o),i=s=0;s<o;i++)55296==(64512&(r=e.charCodeAt(i)))&&i+1<a&&56320==(64512&(n=e.charCodeAt(i+1)))&&(r=65536+(r-55296<<10)+(n-56320),i++),r<128?t[s++]=r:(r<2048?t[s++]=192|r>>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r<n;r++)t[r]=e.charCodeAt(r);return t},r.buf2string=function(e,t){var r,n,i,s,a=t||e.length,o=new Array(2*a);for(r=n=0;r<a;)if((i=e[r++])<128)o[n++]=i;else if(4<(s=u[i]))o[n++]=65533,r+=s-1;else{for(i&=2===s?31:3===s?15:7;1<s&&r<a;)i=i<<6|63&e[r++],s--;1<s?o[n++]=65533:i<65536?o[n++]=i:(i-=65536,o[n++]=55296|i>>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3<r?2e3:r;s=s+(i=i+t[n++]|0)|0,--a;);i%=65521,s%=65521}return i|s<<16|0}},{}],44:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=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(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4<e?9:0)}function D(e){for(var t=e.length;0<=--t;)e[t]=0}function F(e){var t=e.state,r=t.pending;r>e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&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<c);if(n=S-(c-s),s=c-S,a<n){if(e.match_start=t,o<=(a=n))break;d=u[s+a-1],p=u[s+a]}}}while((t=f[t&l])>h&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u<l&&(l=u),r=0===l?0:(a.avail_in-=l,c.arraySet(o,a.input,a.next_in,l,h),1===a.state.wrap?a.adler=d(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),e.lookahead+=r,e.lookahead+e.insert>=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<<e.hash_shift^e.window[s+1])&e.hash_mask;e.insert&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[s+x-1])&e.hash_mask,e.prev[s&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=s,s++,e.insert--,!(e.lookahead+e.insert<x)););}while(e.lookahead<z&&0!==e.strm.avail_in)}function Z(e,t){for(var r,n;;){if(e.lookahead<z){if(j(e),e.lookahead<z&&t===l)return A;if(0===e.lookahead)break}if(r=0,e.lookahead>=x&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),0!==r&&e.strstart-r<=e.w_size-z&&(e.match_length=L(e,r)),e.match_length>=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart,0!=--e.match_length;);e.strstart++}else e.strstart+=e.match_length,e.match_length=0,e.ins_h=e.window[e.strstart],e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+1])&e.hash_mask;else n=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++;if(n&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=e.strstart<x-1?e.strstart:x-1,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}function W(e,t){for(var r,n,i;;){if(e.lookahead<z){if(j(e),e.lookahead<z&&t===l)return A;if(0===e.lookahead)break}if(r=0,e.lookahead>=x&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),e.prev_length=e.match_length,e.prev_match=e.match_start,e.match_length=x-1,0!==r&&e.prev_length<e.max_lazy_match&&e.strstart-r<=e.w_size-z&&(e.match_length=L(e,r),e.match_length<=5&&(1===e.strategy||e.match_length===x&&4096<e.strstart-e.match_start)&&(e.match_length=x-1)),e.prev_length>=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<<e.hash_shift^e.window[e.strstart+x-1])&e.hash_mask,r=e.prev[e.strstart&e.w_mask]=e.head[e.ins_h],e.head[e.ins_h]=e.strstart),0!=--e.prev_length;);if(e.match_available=0,e.match_length=x-1,e.strstart++,n&&(N(e,!1),0===e.strm.avail_out))return A}else if(e.match_available){if((n=u._tr_tally(e,0,e.window[e.strstart-1]))&&N(e,!1),e.strstart++,e.lookahead--,0===e.strm.avail_out)return A}else e.match_available=1,e.strstart++,e.lookahead--}return e.match_available&&(n=u._tr_tally(e,0,e.window[e.strstart-1]),e.match_available=0),e.insert=e.strstart<x-1?e.strstart:x-1,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}function M(e,t,r,n,i){this.good_length=e,this.max_lazy=t,this.nice_length=r,this.max_chain=n,this.func=i}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 c.Buf16(2*w),this.dyn_dtree=new c.Buf16(2*(2*a+1)),this.bl_tree=new c.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 c.Buf16(k+1),this.heap=new c.Buf16(2*s+1),D(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new c.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(e){var t;return e&&e.state?(e.total_in=e.total_out=0,e.data_type=i,(t=e.state).pending=0,t.pending_out=0,t.wrap<0&&(t.wrap=-t.wrap),t.status=t.wrap?C:E,e.adler=2===t.wrap?0:1,t.last_flush=l,u._tr_init(t),m):R(e,_)}function K(e){var t=G(e);return t===m&&function(e){e.window_size=2*e.w_size,D(e.head),e.max_lazy_match=h[e.level].max_lazy,e.good_match=h[e.level].good_length,e.nice_match=h[e.level].nice_length,e.max_chain_length=h[e.level].max_chain,e.strstart=0,e.block_start=0,e.lookahead=0,e.insert=0,e.match_length=e.prev_length=x-1,e.match_available=0,e.ins_h=0}(e.state),t}function Y(e,t,r,n,i,s){if(!e)return _;var a=1;if(t===g&&(t=6),n<0?(a=0,n=-n):15<n&&(a=2,n-=16),i<1||y<i||r!==v||n<8||15<n||t<0||9<t||s<0||b<s)return R(e,_);8===n&&(n=9);var o=new H;return(e.state=o).strm=e,o.wrap=a,o.gzhead=null,o.w_bits=n,o.w_size=1<<o.w_bits,o.w_mask=o.w_size-1,o.hash_bits=i+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 c.Buf8(2*o.w_size),o.head=new c.Buf16(o.hash_size),o.prev=new c.Buf16(o.w_size),o.lit_bufsize=1<<i+6,o.pending_buf_size=4*o.lit_bufsize,o.pending_buf=new c.Buf8(o.pending_buf_size),o.d_buf=1*o.lit_bufsize,o.l_buf=3*o.lit_bufsize,o.level=t,o.strategy=s,o.method=r,K(e)}h=[new M(0,0,0,0,function(e,t){var r=65535;for(r>e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.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(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5<t||t<0)return e?R(e,_):_;if(n=e.state,!e.output||!e.input&&0!==e.avail_in||666===n.status&&t!==f)return R(e,0===e.avail_out?-5:_);if(n.strm=e,r=n.last_flush,n.last_flush=t,n.status===C)if(2===n.wrap)e.adler=0,U(n,31),U(n,139),U(n,8),n.gzhead?(U(n,(n.gzhead.text?1:0)+(n.gzhead.hcrc?2:0)+(n.gzhead.extra?4:0)+(n.gzhead.name?8:0)+(n.gzhead.comment?16:0)),U(n,255&n.gzhead.time),U(n,n.gzhead.time>>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindex<n.gzhead.name.length?255&n.gzhead.name.charCodeAt(n.gzindex++):0,U(n,s)}while(0!==s);n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindex<n.gzhead.comment.length?255&n.gzhead.comment.charCodeAt(n.gzindex++):0,U(n,s)}while(0!==s);n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0<e.strstart&&(n=a[i=e.strstart-1])===a[++i]&&n===a[++i]&&n===a[++i]){s=e.strstart+S;do{}while(n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&n===a[++i]&&i<s);e.match_length=S-(s-i),e.match_length>e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0<n.wrap&&(n.wrap=-n.wrap),0!==n.pending?m:1)},r.deflateEnd=function(e){var t;return e&&e.state?(t=e.state.status)!==C&&69!==t&&73!==t&&91!==t&&103!==t&&t!==E&&666!==t?R(e,_):(e.state=null,t===E?R(e,-3):m):_},r.deflateSetDictionary=function(e,t){var r,n,i,s,a,o,h,u,l=t.length;if(!e||!e.state)return _;if(2===(s=(r=e.state).wrap)||1===s&&r.status!==C||r.lookahead)return _;for(1===s&&(e.adler=d(e.adler,t,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 c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<<r.hash_shift^r.window[n+x-1])&r.hash_mask,r.prev[n&r.w_mask]=r.head[r.ins_h],r.head[r.ins_h]=n,n++,--i;);r.strstart=n,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,e.next_in=o,e.input=h,e.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(e,t,r){"use strict";t.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(e,t,r){"use strict";t.exports=function(e,t){var r,n,i,s,a,o,h,u,l,f,c,d,p,m,_,g,b,v,y,w,k,x,S,z,C;r=e.state,n=e.next_in,z=e.input,i=n+(e.avail_in-5),s=e.next_out,C=e.output,a=s-(t-e.avail_out),o=s+(e.avail_out-257),h=r.dmax,u=r.wsize,l=r.whave,f=r.wnext,c=r.window,d=r.hold,p=r.bits,m=r.lencode,_=r.distcode,g=(1<<r.lenbits)-1,b=(1<<r.distbits)-1;e:do{p<15&&(d+=z[n++]<<p,p+=8,d+=z[n++]<<p,p+=8),v=m[d&g];t:for(;;){if(d>>>=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)+(d&(1<<y)-1)];continue t}if(32&y){r.mode=12;break e}e.msg="invalid literal/length code",r.mode=30;break e}w=65535&v,(y&=15)&&(p<y&&(d+=z[n++]<<p,p+=8),w+=d&(1<<y)-1,d>>>=y,p-=y),p<15&&(d+=z[n++]<<p,p+=8,d+=z[n++]<<p,p+=8),v=_[d&b];r:for(;;){if(d>>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<<y)-1)];continue r}e.msg="invalid distance code",r.mode=30;break e}if(k=65535&v,p<(y&=15)&&(d+=z[n++]<<p,(p+=8)<y&&(d+=z[n++]<<p,p+=8)),h<(k+=d&(1<<y)-1)){e.msg="invalid distance too far back",r.mode=30;break e}if(d>>>=y,p-=y,(y=s-a)<k){if(l<(y=k-y)&&r.sane){e.msg="invalid distance too far back",r.mode=30;break e}if(S=c,(x=0)===f){if(x+=u-y,y<w){for(w-=y;C[s++]=c[x++],--y;);x=s-k,S=C}}else if(f<y){if(x+=u+f-y,(y-=f)<w){for(w-=y;C[s++]=c[x++],--y;);if(x=0,f<w){for(w-=y=f;C[s++]=c[x++],--y;);x=s-k,S=C}}}else if(x+=f-y,y<w){for(w-=y;C[s++]=c[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(n<i&&s<o);n-=w=p>>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n<i?i-n+5:5-(n-i),e.avail_out=s<o?o-s+257:257-(s-o),r.hold=d,r.bits=p}},{}],49:[function(e,t,r){"use strict";var I=e("../utils/common"),O=e("./adler32"),B=e("./crc32"),R=e("./inffast"),T=e("./inftrees"),D=1,F=2,N=0,U=-2,P=1,n=852,i=592;function L(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<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(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15<t)?U:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=r,n.wbits=t,o(e))):U}function u(e,t){var r,n;return e?(n=new s,(e.state=n).window=null,(r=h(e,t))!==N&&(e.state=null),r):U}var l,f,c=!0;function j(e){if(c){var t;for(l=new I.Buf32(512),f=new I.Buf32(32),t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(T(D,e.lens,0,288,l,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;T(F,e.lens,0,32,f,0,e.work,{bits:5}),c=!1}e.lencode=l,e.lenbits=9,e.distcode=f,e.distbits=5}function Z(e,t,r,n){var i,s=e.state;return null===s.window&&(s.wsize=1<<s.wbits,s.wnext=0,s.whave=0,s.window=new I.Buf8(s.wsize)),n>=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave<s.wsize&&(s.whave+=i))),0}r.inflateReset=o,r.inflateReset2=h,r.inflateResetKeep=a,r.inflateInit=function(e){return u(e,15)},r.inflateInit2=u,r.inflate=function(e,t){var r,n,i,s,a,o,h,u,l,f,c,d,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(!e||!e.state||!e.output||!e.input&&0!==e.avail_in)return U;12===(r=e.state).mode&&(r.mode=13),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,u=r.hold,l=r.bits,f=o,c=h,x=N;e:for(;;)switch(r.mode){case P:if(0===r.wrap){r.mode=13;break}for(;l<16;){if(0===o)break e;o--,u+=n[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){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.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){e.msg="invalid window size",r.mode=30;break}r.dmax=1<<k,e.adler=r.check=1,r.mode=512&u?10:12,l=u=0;break;case 2:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}if(r.flags=u,8!=(255&r.flags)){e.msg="unknown compression method",r.mode=30;break}if(57344&r.flags){e.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 e;o--,u+=n[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 e;o--,u+=n[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 e;o--,u+=n[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<(d=r.length)&&(d=o),d&&(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,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d<o;);if(512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,k)break e}else r.head&&(r.head.name=null);r.length=0,r.mode=8;case 8:if(4096&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.comment+=String.fromCharCode(k)),k&&d<o;);if(512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,k)break e}else r.head&&(r.head.comment=null);r.mode=9;case 9:if(512&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}if(u!==(65535&r.check)){e.msg="header crc mismatch",r.mode=30;break}l=u=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}e.adler=r.check=L(u),l=u=0,r.mode=11;case 11:if(0===r.havedict)return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,2;e.adler=r.check=1,r.mode=12;case 12:if(5===t||6===t)break e;case 13:if(r.last){u>>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[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!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.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 e;o--,u+=n[s++]<<l,l+=8}if((65535&u)!=(u>>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o<d&&(d=o),h<d&&(d=h),0===d)break e;I.arraySet(i,n,s,d,a),o-=d,s+=d,h-=d,a+=d,r.length-=d;break}r.mode=12;break;case 17:for(;l<14;){if(0===o)break e;o--,u+=n[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){e.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 e;o--,u+=n[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){e.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 e;o--,u+=n[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 e;o--,u+=n[s++]<<l,l+=8}if(u>>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l<z;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}l-=_,k=0,d=3+(7&(u>>>=_)),u>>>=3,l-=3}else{for(z=_+7;l<z;){if(0===o)break e;o--,u+=n[s++]<<l,l+=8}l-=_,k=0,d=11+(127&(u>>>=_)),u>>>=7,l-=7}if(r.have+d>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=30;break}for(;d--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){e.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){e.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){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=h){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,R(e,c),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.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 e;o--,u+=n[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 e;o--,u+=n[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){e.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 e;o--,u+=n[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 e;o--,u+=n[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 e;o--,u+=n[s++]<<l,l+=8}u>>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){e.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 e;o--,u+=n[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){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break e;if(d=c-h,r.offset>d){if((d=r.offset-d)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=30;break}p=d>r.wnext?(d-=r.wnext,r.wsize-d):r.wnext-d,d>r.length&&(d=r.length),m=r.window}else m=i,p=a-r.offset,d=r.length;for(h<d&&(d=h),h-=d,r.length-=d;i[a++]=m[p++],--d;);0===r.length&&(r.mode=21);break;case 26:if(0===h)break e;i[a++]=r.length,h--,r.mode=21;break;case 27:if(r.wrap){for(;l<32;){if(0===o)break e;o--,u|=n[s++]<<l,l+=8}if(c-=h,e.total_out+=c,r.total+=c,c&&(e.adler=r.check=r.flags?B(r.check,i,c,a-c):O(r.check,i,c,a-c)),c=h,(r.flags?u:L(u))!==r.check){e.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 e;o--,u+=n[s++]<<l,l+=8}if(u!==(4294967295&r.total)){e.msg="incorrect length check",r.mode=30;break}l=u=0}r.mode=29;case 29:x=1;break e;case 30:x=-3;break e;case 31:return-4;case 32:default:return U}return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,(r.wsize||c!==e.avail_out&&r.mode<30&&(r.mode<27||4!==t))&&Z(e,e.output,e.next_out,c-e.avail_out)?(r.mode=31,-4):(f-=e.avail_in,c-=e.avail_out,e.total_in+=f,e.total_out+=c,r.total+=c,r.wrap&&c&&(e.adler=r.check=r.flags?B(r.check,i,c,e.next_out-c):O(r.check,i,c,e.next_out-c)),e.data_type=r.bits+(r.last?64:0)+(12===r.mode?128:0)+(20===r.mode||15===r.mode?256:0),(0==f&&0===c||4===t)&&x===N&&(x=-5),x)},r.inflateEnd=function(e){if(!e||!e.state)return U;var t=e.state;return t.window&&(t.window=null),e.state=null,N},r.inflateGetHeader=function(e,t){var r;return e&&e.state?0==(2&(r=e.state).wrap)?U:((r.head=t).done=!1,N):U},r.inflateSetDictionary=function(e,t){var r,n=t.length;return e&&e.state?0!==(r=e.state).wrap&&11!==r.mode?U:11===r.mode&&O(1,t,n,0)!==r.check?-3:Z(e,t,n,n)?(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(e,t,r){"use strict";var D=e("../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];t.exports=function(e,t,r,n,i,s,a,o){var h,u,l,f,c,d,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<n;v++)O[t[r+v]]++;for(k=g,w=15;1<=w&&0===O[w];w--);if(w<k&&(k=w),0===w)return i[s++]=20971520,i[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===e||1!==w))return-1;for(B[1]=0,b=1;b<15;b++)B[b+1]=B[b]+O[b];for(v=0;v<n;v++)0!==t[r+v]&&(a[B[t[r+v]]++]=v);if(d=0===e?(A=R=a,19):1===e?(A=F,I-=257,R=N,T-=257,256):(A=U,R=P,-1),b=y,c=s,S=v=E=0,l=-1,f=(C=1<<(x=k))-1,1===e&&852<C||2===e&&592<C)return 1;for(;;){for(p=b-S,_=a[v]<d?(m=0,a[v]):a[v]>d?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<<b-S,y=u=1<<x;i[c+(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=t[r+a[v]]}if(k<b&&(E&f)!==l){for(0===S&&(S=k),c+=y,z=1<<(x=b-S);x+S<w&&!((z-=O[x+S])<=0);)x++,z<<=1;if(C+=1<<x,1===e&&852<C||2===e&&592<C)return 1;i[l=E&f]=k<<24|x<<16|c-s|0}}return 0!==E&&(i[c+E]=b-S<<24|64<<16|0),o.bits=k,0}},{"../utils/common":41}],51:[function(e,t,r){"use strict";t.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(e,t,r){"use strict";var i=e("../utils/common"),o=0,h=1;function n(e){for(var t=e.length;0<=--t;)e[t]=0}var s=0,a=29,u=256,l=u+1+a,f=30,c=19,_=2*l+1,g=15,d=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));n(z);var C=new Array(2*f);n(C);var E=new Array(512);n(E);var A=new Array(256);n(A);var I=new Array(a);n(I);var O,B,R,T=new Array(f);function D(e,t,r,n,i){this.static_tree=e,this.extra_bits=t,this.extra_base=r,this.elems=n,this.max_length=i,this.has_stree=e&&e.length}function F(e,t){this.dyn_tree=e,this.max_code=0,this.stat_desc=t}function N(e){return e<256?E[e]:E[256+(e>>>7)]}function U(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function P(e,t,r){e.bi_valid>d-r?(e.bi_buf|=t<<e.bi_valid&65535,U(e,e.bi_buf),e.bi_buf=t>>d-e.bi_valid,e.bi_valid+=r-d):(e.bi_buf|=t<<e.bi_valid&65535,e.bi_valid+=r)}function L(e,t,r){P(e,r[2*t],r[2*t+1])}function j(e,t){for(var r=0;r|=1&e,e>>>=1,r<<=1,0<--t;);return r>>>1}function Z(e,t,r){var n,i,s=new Array(g+1),a=0;for(n=1;n<=g;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=j(s[o]++,o))}}function W(e){var t;for(t=0;t<l;t++)e.dyn_ltree[2*t]=0;for(t=0;t<f;t++)e.dyn_dtree[2*t]=0;for(t=0;t<c;t++)e.bl_tree[2*t]=0;e.dyn_ltree[2*m]=1,e.opt_len=e.static_len=0,e.last_lit=e.matches=0}function M(e){8<e.bi_valid?U(e,e.bi_buf):0<e.bi_valid&&(e.pending_buf[e.pending++]=e.bi_buf),e.bi_buf=0,e.bi_valid=0}function H(e,t,r,n){var i=2*t,s=2*r;return e[i]<e[s]||e[i]===e[s]&&n[t]<=n[r]}function G(e,t,r){for(var n=e.heap[r],i=r<<1;i<=e.heap_len&&(i<e.heap_len&&H(t,e.heap[i+1],e.heap[i],e.depth)&&i++,!H(t,n,e.heap[i],e.depth));)e.heap[r]=e.heap[i],r=i,i<<=1;e.heap[r]=n}function K(e,t,r){var n,i,s,a,o=0;if(0!==e.last_lit)for(;n=e.pending_buf[e.d_buf+2*o]<<8|e.pending_buf[e.d_buf+2*o+1],i=e.pending_buf[e.l_buf+o],o++,0===n?L(e,i,t):(L(e,(s=A[i])+u+1,t),0!==(a=w[s])&&P(e,i-=I[s],a),L(e,s=N(--n),r),0!==(a=k[s])&&P(e,n-=T[s],a)),o<e.last_lit;);L(e,m,t)}function Y(e,t){var r,n,i,s=t.dyn_tree,a=t.stat_desc.static_tree,o=t.stat_desc.has_stree,h=t.stat_desc.elems,u=-1;for(e.heap_len=0,e.heap_max=_,r=0;r<h;r++)0!==s[2*r]?(e.heap[++e.heap_len]=u=r,e.depth[r]=0):s[2*r+1]=0;for(;e.heap_len<2;)s[2*(i=e.heap[++e.heap_len]=u<2?++u:0)]=1,e.depth[i]=0,e.opt_len--,o&&(e.static_len-=a[2*i+1]);for(t.max_code=u,r=e.heap_len>>1;1<=r;r--)G(e,s,r);for(i=h;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],G(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,G(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,h=t.dyn_tree,u=t.max_code,l=t.stat_desc.static_tree,f=t.stat_desc.has_stree,c=t.stat_desc.extra_bits,d=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=g;s++)e.bl_count[s]=0;for(h[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<_;r++)p<(s=h[2*h[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),h[2*n+1]=s,u<n||(e.bl_count[s]++,a=0,d<=n&&(a=c[n-d]),o=h[2*n],e.opt_len+=o*(s+a),f&&(e.static_len+=o*(l[2*n+1]+a)));if(0!==m){do{for(s=p-1;0===e.bl_count[s];)s--;e.bl_count[s]--,e.bl_count[s+1]+=2,e.bl_count[p]--,m-=2}while(0<m);for(s=p;0!==s;s--)for(n=e.bl_count[s];0!==n;)u<(i=e.heap[--r])||(h[2*i+1]!==s&&(e.opt_len+=(s-h[2*i+1])*h[2*i],h[2*i+1]=s),n--)}}(e,t),Z(s,u,e.bl_count)}function X(e,t,r){var n,i,s=-1,a=t[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),t[2*(r+1)+1]=65535,n=0;n<=r;n++)i=a,a=t[2*(n+1)+1],++o<h&&i===a||(o<u?e.bl_tree[2*i]+=o:0!==i?(i!==s&&e.bl_tree[2*i]++,e.bl_tree[2*b]++):o<=10?e.bl_tree[2*v]++:e.bl_tree[2*y]++,s=i,u=(o=0)===a?(h=138,3):i===a?(h=6,3):(h=7,4))}function V(e,t,r){var n,i,s=-1,a=t[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),n=0;n<=r;n++)if(i=a,a=t[2*(n+1)+1],!(++o<h&&i===a)){if(o<u)for(;L(e,i,e.bl_tree),0!=--o;);else 0!==i?(i!==s&&(L(e,i,e.bl_tree),o--),L(e,b,e.bl_tree),P(e,o-3,2)):o<=10?(L(e,v,e.bl_tree),P(e,o-3,3)):(L(e,y,e.bl_tree),P(e,o-11,7));s=i,u=(o=0)===a?(h=138,3):i===a?(h=6,3):(h=7,4)}}n(T);var q=!1;function J(e,t,r,n){P(e,(s<<1)+(n?1:0),3),function(e,t,r,n){M(e),n&&(U(e,r),U(e,~r)),i.arraySet(e.pending_buf,e.window,t,r,e.pending),e.pending+=r}(e,t,r,!0)}r._tr_init=function(e){q||(function(){var e,t,r,n,i,s=new Array(g+1);for(n=r=0;n<a-1;n++)for(I[n]=r,e=0;e<1<<w[n];e++)A[r++]=n;for(A[r-1]=n,n=i=0;n<16;n++)for(T[n]=i,e=0;e<1<<k[n];e++)E[i++]=n;for(i>>=7;n<f;n++)for(T[n]=i<<7,e=0;e<1<<k[n]-7;e++)E[256+i++]=n;for(t=0;t<=g;t++)s[t]=0;for(e=0;e<=143;)z[2*e+1]=8,e++,s[8]++;for(;e<=255;)z[2*e+1]=9,e++,s[9]++;for(;e<=279;)z[2*e+1]=7,e++,s[7]++;for(;e<=287;)z[2*e+1]=8,e++,s[8]++;for(Z(z,l+1,s),e=0;e<f;e++)C[2*e+1]=5,C[2*e]=j(e,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,c,p)}(),q=!0),e.l_desc=new F(e.dyn_ltree,O),e.d_desc=new F(e.dyn_dtree,B),e.bl_desc=new F(e.bl_tree,R),e.bi_buf=0,e.bi_valid=0,W(e)},r._tr_stored_block=J,r._tr_flush_block=function(e,t,r,n){var i,s,a=0;0<e.level?(2===e.strm.data_type&&(e.strm.data_type=function(e){var t,r=4093624447;for(t=0;t<=31;t++,r>>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return o;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return h;for(t=32;t<u;t++)if(0!==e.dyn_ltree[2*t])return h;return o}(e)),Y(e,e.l_desc),Y(e,e.d_desc),a=function(e){var t;for(X(e,e.dyn_ltree,e.l_desc.max_code),X(e,e.dyn_dtree,e.d_desc.max_code),Y(e,e.bl_desc),t=c-1;3<=t&&0===e.bl_tree[2*S[t]+1];t--);return e.opt_len+=3*(t+1)+5+5+4,t}(e),i=e.opt_len+3+7>>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?J(e,t,r,n):4===e.strategy||s===i?(P(e,2+(n?1:0),3),K(e,z,C)):(P(e,4+(n?1:0),3),function(e,t,r,n){var i;for(P(e,t-257,5),P(e,r-1,5),P(e,n-4,4),i=0;i<n;i++)P(e,e.bl_tree[2*S[i]+1],3);V(e,e.dyn_ltree,t-1),V(e,e.dyn_dtree,r-1)}(e,e.l_desc.max_code+1,e.d_desc.max_code+1,a+1),K(e,e.dyn_ltree,e.dyn_dtree)),W(e),n&&M(e)},r._tr_tally=function(e,t,r){return e.pending_buf[e.d_buf+2*e.last_lit]=t>>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(A[r]+u+1)]++,e.dyn_dtree[2*N(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){P(e,2,3),L(e,m,z),function(e){16===e.bi_valid?(U(e,e.bi_buf),e.bi_buf=0,e.bi_valid=0):8<=e.bi_valid&&(e.pending_buf[e.pending++]=255&e.bi_buf,e.bi_buf>>=8,e.bi_valid-=8)}(e)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.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(e,t,r){(function(e){!function(r,n){"use strict";if(!r.setImmediate){var i,s,t,a,o=1,h={},u=!1,l=r.document,e=Object.getPrototypeOf&&Object.getPrototypeOf(r);e=e&&e.setTimeout?e:r,i="[object process]"==={}.toString.call(r.process)?function(e){process.nextTick(function(){c(e)})}:function(){if(r.postMessage&&!r.importScripts){var e=!0,t=r.onmessage;return r.onmessage=function(){e=!1},r.postMessage("","*"),r.onmessage=t,e}}()?(a="setImmediate$"+Math.random()+"$",r.addEventListener?r.addEventListener("message",d,!1):r.attachEvent("onmessage",d),function(e){r.postMessage(a+e,"*")}):r.MessageChannel?((t=new MessageChannel).port1.onmessage=function(e){c(e.data)},function(e){t.port2.postMessage(e)}):l&&"onreadystatechange"in l.createElement("script")?(s=l.documentElement,function(e){var t=l.createElement("script");t.onreadystatechange=function(){c(e),t.onreadystatechange=null,s.removeChild(t),t=null},s.appendChild(t)}):function(e){setTimeout(c,0,e)},e.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),r=0;r<t.length;r++)t[r]=arguments[r+1];var n={callback:e,args:t};return h[o]=n,i(o),o++},e.clearImmediate=f}function f(e){delete h[e]}function c(e){if(u)setTimeout(c,0,e);else{var t=h[e];if(t){u=!0;try{!function(e){var t=e.callback,r=e.args;switch(r.length){case 0:t();break;case 1:t(r[0]);break;case 2:t(r[0],r[1]);break;case 3:t(r[0],r[1],r[2]);break;default:t.apply(n,r)}}(t)}finally{f(e),u=!1}}}}function d(e){e.source===r&&"string"==typeof e.data&&0===e.data.indexOf(a)&&c(+e.data.slice(a.length))}}("undefined"==typeof self?void 0===e?this:e:self)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}]},{},[10])(10)});
\ No newline at end of file
diff --git a/cps/templates/read.html b/cps/templates/read.html
index ab500e000..b75c31fe4 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -99,7 +99,7 @@
       </div>
       <div class="overlay"></div>
       <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/compress/jszip.min.js') }}">
+      <script src="{{ url_for('static', filename='js/compress/jszip_epub.min.js') }}">
       </script> <script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
       <script type="text/javascript">
           window.calibre = {
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 15568819ef3dd4a79ac99a91caf478eed2c38a62..11b1ed342f1cc18a71449595f2f21649f9c8ea43 100644
GIT binary patch
delta 22
ecmdlqhiTIsrVZ}`+07ITEv*a;Hh&GYwE+NUa0p`n

delta 22
ecmdlqhiTIsrVZ}`*-aG;EUZi{H-8PZwE+NUqX=yP

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index ec3ab24fc..5137582bc 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+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"
@@ -526,7 +526,7 @@ msgstr "není nainstalováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
@@ -906,8 +906,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Přihlásit"
@@ -1072,41 +1072,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Hledat"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
@@ -1157,7 +1157,7 @@ msgstr "Kniha byla odebrána z police: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Vytvořit polici"
 
@@ -1221,7 +1221,7 @@ msgstr "Police: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Úlohy"
@@ -1370,7 +1370,7 @@ msgstr "Nejprve nakonfigurujte vaši kindle e-mailovou adresu.."
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1505,7 +1505,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Nahrávat"
 
@@ -1529,7 +1529,7 @@ msgstr "E-mail"
 msgid "Send to eReader Email"
 msgstr "Poslat do Kindle e-mailová adresa"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Správce"
@@ -1958,8 +1958,8 @@ msgstr "Kliknutím na obal načtěte metadata do formuláře"
 msgid "Loading..."
 msgstr "Načítání..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Zavřít"
@@ -2547,7 +2547,7 @@ msgid "Add to shelf"
 msgstr "Přidat do police"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2625,7 +2625,7 @@ msgstr "Zadejte jméno domény"
 msgid "Denied Domains (Blacklist)"
 msgstr "Zakázané domény pro registraci"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Další"
 
@@ -2745,7 +2745,7 @@ msgstr "Knihy řazené podle hodnocení"
 msgid "Books ordered by file formats"
 msgstr "Knihy seřazené podle souboru formátů"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Police"
@@ -2762,52 +2762,52 @@ msgstr "Domů"
 msgid "Toggle Navigation"
 msgstr "Přepnout navigaci"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Hledat v knihovně"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Účet"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Odhlásit se"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Nahrávání..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Chyba"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Nastavení"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Prosím neobnovujte stránku"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Procházet"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "O knihovně"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Předchozí"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Podrobnosti o knize"
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 687482678667a564335be06e9fae3489660fade3..0313f5e61a4c7c00db2de2fea6e860dcdbc533ca 100644
GIT binary patch
delta 22
ecmca~iTTnc<_%rV>}CpvmR1G^n<q9OOa%aP1_@dK

delta 22
ecmca~iTTnc<_%rV?4}9^7FH&fn<q9OOa%aPISFI{

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 01a42c0a0..6365a5f30 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2023-01-22 13:51+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -512,7 +512,7 @@ msgstr "Nicht installiert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
@@ -885,8 +885,8 @@ msgstr "Google Oauth Fehler: {}"
 msgid "{} Stars"
 msgstr "{} Sterne"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Login"
@@ -1042,41 +1042,41 @@ msgstr "Bücherliste"
 msgid "Show Books List"
 msgstr "Zeige Bücherliste"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Suche"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -1126,7 +1126,7 @@ msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Sie haben keine Berechtigung um Bücher aus diesem Bücherregal zu löschen"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
@@ -1188,7 +1188,7 @@ msgstr "Bücherregal: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -1336,7 +1336,7 @@ msgstr "Bitte zuerst die E-Reader E-Mailadresse konfigurieren."
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren."
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1468,7 +1468,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Cover Miniaturansichten Cache wird gelöscht"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
 
@@ -1491,7 +1491,7 @@ msgstr "E-Mail"
 msgid "Send to eReader Email"
 msgstr "An E-Reader E-Mail Adresse senden"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1918,8 +1918,8 @@ msgstr "Klicke auf das Bild, um die Metadaten zu übertragen"
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Schließen"
@@ -2502,7 +2502,7 @@ msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2578,7 +2578,7 @@ msgstr "Domainnamen eingeben"
 msgid "Denied Domains (Blacklist)"
 msgstr "Verbotene Domains für eine Registrierung"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Nächste"
 
@@ -2696,7 +2696,7 @@ msgstr "Bücher nach Bewertungen sortiert"
 msgid "Books ordered by file formats"
 msgstr "Bücher nach Dateiformaten sortiert"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Bücherregale"
@@ -2713,52 +2713,52 @@ msgstr "Home"
 msgid "Toggle Navigation"
 msgstr "Nagivation umschalten"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Bibiliothek durchsuchen"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Lade hoch..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Fehler"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Bitte die Seite nicht neu laden"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Über"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Vorheriger Eintrag"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Buchdetails"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 78e2a84bf2a1e5f26365a5228565f421985759d7..b625f1ed6ad6d9173a95c5db5f494b056f2d0bbb 100644
GIT binary patch
delta 22
ecmZ3qfO*jZ<_&q_>}CpvmR1G^n@hvjRsaB9qX-26

delta 22
ecmZ3qfO*jZ<_&q_?4}9^7FH&fn@hvjRsaB9)(8&(

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 2ccd65319..27c595928 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -526,7 +526,7 @@ msgstr "δεν εγκαταστάθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
@@ -906,8 +906,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Σύνδεση"
@@ -1072,41 +1072,41 @@ msgstr "Λίστα Βιβλίων"
 msgid "Show Books List"
 msgstr "Προβολή Λίστας Βιβλίων"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
@@ -1157,7 +1157,7 @@ msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sn
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Δημιούργησε ένα Ράφι"
 
@@ -1221,7 +1221,7 @@ msgstr "Ράφι: '%(name)s"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Εργασίες"
@@ -1370,7 +1370,7 @@ msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1505,7 +1505,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Ανέβασμα"
 
@@ -1529,7 +1529,7 @@ msgstr "Διεύθυνση E-mail"
 msgid "Send to eReader Email"
 msgstr "Διεύθυνση E-mail Αποστολής στο Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Διαχειριστής"
@@ -1958,8 +1958,8 @@ msgstr "Κάνε κλικ στο εξώφυλλο για φόρτωση μετα
 msgid "Loading..."
 msgstr "Φόρτωση..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Κλείσιμο"
@@ -2547,7 +2547,7 @@ msgid "Add to shelf"
 msgstr "Προσθήκη στο ράφι"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2625,7 +2625,7 @@ msgstr "Όνομα domain"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domains που Απορρίφθηκαν (Μαύρη λίστα)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2745,7 +2745,7 @@ msgstr "Τα βιβλία ταξινομήθηκαν ανά Αξιολόγηση
 msgid "Books ordered by file formats"
 msgstr "Τα βιβλία ταξινομήθηκαν ανά μορφές αρχείου"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Ράφια"
@@ -2762,52 +2762,52 @@ msgstr "Κεντρική"
 msgid "Toggle Navigation"
 msgstr "Αλλαγή Θέσης Περιήγησης"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Αναζήτηση Βιβλιοθήκης"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Φόρτωση..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Παρακαλούμε μην ανανεώσεις τη σελίδα"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Περιήγηση"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Σχετικά"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Λεπτομέρειες Βιβλίου"
 
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 09f723018dccd3361b749d355e7cc018ac7b722f..51ff23b3b1ec4aa7a37b28a87b03d134e02ecda6 100644
GIT binary patch
delta 22
ecmbR7iD||srVZWc>}CpvmR1G^n<u5W1p)wTBnY1X

delta 22
ecmbR7iD||srVZWc?4}9^7FH&fn<u5W1p)wTR|u&9

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index a4e3a3423..aa2d8c57c 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -530,7 +530,7 @@ msgstr "no instalado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
@@ -911,8 +911,8 @@ msgstr "Error Google Oauth {}"
 msgid "{} Stars"
 msgstr "{} Estrellas"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Inicio de sesión"
@@ -1077,41 +1077,41 @@ msgstr "Lista de Libros"
 msgid "Show Books List"
 msgstr "Mostrar Lista de Libros"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = $(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
@@ -1162,7 +1162,7 @@ msgstr "El libro fue eliminado del estante: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
@@ -1226,7 +1226,7 @@ msgstr "Estante: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tareas"
@@ -1375,7 +1375,7 @@ msgstr "Por favor actualiza tu perfil con la dirección de correo de su kindle..
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1510,7 +1510,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Subir archivo"
 
@@ -1534,7 +1534,7 @@ msgstr "Correo electrónico"
 msgid "Send to eReader Email"
 msgstr "Enviar al correo de Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1964,8 +1964,8 @@ msgstr "Haz clic en la portada para cargar los metadatos en el formulario"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Cerrar"
@@ -2553,7 +2553,7 @@ msgid "Add to shelf"
 msgstr "Agregar al estante"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2632,7 +2632,7 @@ msgstr "Introducir nombre de dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominios prohibidos (Blaclist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2752,7 +2752,7 @@ msgstr "Libros ordenados por puntuación"
 msgid "Books ordered by file formats"
 msgstr "Libros ordenados por formato de archivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Estanterías"
@@ -2769,52 +2769,52 @@ msgstr "Inicio"
 msgid "Toggle Navigation"
 msgstr "Alternar navegación"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Buscar en la librería"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Cuenta"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Cargando..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Error"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Ajustes"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Por favor, no actualice la página"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Detalles del libro"
 
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index 4217543f737143cfc397065bc67fe7a23ab5ed43..28bf476974ce184ae4d44e2a21d77fe55854299c 100644
GIT binary patch
delta 22
ecmbPnh;hat#tkbh+07ITEv*a;Hm|qLR0jZJWCzp$

delta 22
ecmbPnh;hat#tkbh*-aG;EUZi{H?OzMR0jZJmj~Ve

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 5b11a263f..d6f9b7ba0 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -524,7 +524,7 @@ msgstr "ei asennettu"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
@@ -902,8 +902,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Kirjaudu sisään"
@@ -1068,41 +1068,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Hae"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
@@ -1153,7 +1153,7 @@ msgstr "Kirja on poistettu hyllystä: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "luo hylly"
 
@@ -1217,7 +1217,7 @@ msgstr "Hylly: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tehtävät"
@@ -1366,7 +1366,7 @@ msgstr "Ole hyvä ja aseta Kindle sähköpostiosoite ensin..."
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1501,7 +1501,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Lähetä"
 
@@ -1525,7 +1525,7 @@ msgstr "Sähköposti"
 msgid "Send to eReader Email"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Ylläpito"
@@ -1954,8 +1954,8 @@ msgstr "Klikkaa kantta ladataksesi metadata lomakkeelle"
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Sulje"
@@ -2542,7 +2542,7 @@ msgid "Add to shelf"
 msgstr "Lisää hyllyyn"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2620,7 +2620,7 @@ msgstr "Syötä domainnimi"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Seuraava"
 
@@ -2738,7 +2738,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2755,52 +2755,52 @@ msgstr "Koti"
 msgid "Toggle Navigation"
 msgstr "Vaihda navigointi"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Tili"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Ladataan..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Virhe"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Asetukset"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Selaa"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Tietoja"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Edellinen"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Kirjan tiedot"
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 64513f347f46cf27ebd0584b19ce5861e85ee53b..4d21931f428d2313395814185afdcd6ec96d5174 100644
GIT binary patch
delta 21
ccmZpj%-lMedBe{vb~6P-ODh9|P1&t+09Vcjs{jB1

delta 21
ccmZpj%-lMedBe{vc2fld3o8@LP1&t+09W@1wEzGB

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 84f653b68..f839e7ba6 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -542,7 +542,7 @@ msgstr "non installé"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonne personnalisée No.%(column)d n'existe pas dans la base de données calibre"
@@ -923,8 +923,8 @@ msgstr "Erreur Oauth Google : {}"
 msgid "{} Stars"
 msgstr "{} Étoiles"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Connexion"
@@ -1089,41 +1089,41 @@ msgstr "Liste des livres"
 msgid "Show Books List"
 msgstr "Montrer la liste des livres"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de lecture = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
@@ -1174,7 +1174,7 @@ msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Désolé, vous n’êtes pas autorisé à supprimer un livre de cette étagère"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
@@ -1238,7 +1238,7 @@ msgstr "Étagère : '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tâches"
@@ -1387,7 +1387,7 @@ msgstr "Veuillez mettre à jour votre profil avec une adresse de courriel Kindle
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Le serveur de courriel n'est pas configuré, veuillez contacter votre administrateur!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1522,7 +1522,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Téléverser"
 
@@ -1546,7 +1546,7 @@ msgstr "Adresse de courriel"
 msgid "Send to eReader Email"
 msgstr "Envoyer vers une adresse de courriel Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administration"
@@ -1976,8 +1976,8 @@ msgstr "Cliquer sur la couverture pour importer les métadonnées dans le formul
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Fermer"
@@ -2565,7 +2565,7 @@ msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2644,7 +2644,7 @@ msgstr "Saisir le nom du domaine"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domaines refusés (Liste noire)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Suivant"
 
@@ -2764,7 +2764,7 @@ msgstr "Livres classés par évaluation"
 msgid "Books ordered by file formats"
 msgstr "Livres classés par formats de fichiers"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Etagères"
@@ -2781,52 +2781,52 @@ msgstr "Accueil"
 msgid "Toggle Navigation"
 msgstr "Basculer la navigation"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Chercher dans librairie"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Compte"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Téléversement en cours..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Erreur"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Paramètres"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Veuillez ne pas rafraîchir la page"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "À propos"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Précédent"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Détails du livre"
 
diff --git a/cps/translations/gl/LC_MESSAGES/messages.mo b/cps/translations/gl/LC_MESSAGES/messages.mo
index e558658645e0abeaa407d43c0dbb6aee9942be91..119f8f1971ae24e6d6e9ef68c0c01100b5dc4096 100644
GIT binary patch
delta 22
ccmdn6n|T8eHPo=1DHvK>85nGCuhC2d0A{KPDgXcg

delta 22
ccmdn6n|T8eHPo=1Di~N;nOJUauhC2d0A}3?Gynhq

diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po
index 65e6176ee..539467d14 100644
--- a/cps/translations/gl/LC_MESSAGES/messages.po
+++ b/cps/translations/gl/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2022-08-11 16:46+0200\n"
 "Last-Translator: pollitor <pollitor@gmx.com>\n"
 "Language: gl\n"
@@ -514,7 +514,7 @@ msgstr "non instalado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de execución"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Columna personalizada No.%(column)d non existe na base de datos calibre"
@@ -892,8 +892,8 @@ msgstr "Erro Google Oauth {}"
 msgid "{} Stars"
 msgstr "{} Estrelas"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Inicio de sesión"
@@ -1058,41 +1058,41 @@ msgstr "Lista de libros"
 msgid "Show Books List"
 msgstr "Mostrar lista de libros"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Publicado despóis de "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valoración <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valoración >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erro na busca de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
@@ -1142,7 +1142,7 @@ msgstr "O libro eliminouse do andel: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Síntoo, non ten permiso para quitar un libro do andel"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Crear un andel"
 
@@ -1204,7 +1204,7 @@ msgstr "Andel: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erro ao abrir un andel. O andel non existe ou non se pode acceder"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tarefas"
@@ -1353,7 +1353,7 @@ msgstr "Por favor actualiza o teu perfil co enderezo de correo do teu kindle..."
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "O servidor de correo non está configurado, por favor, avisa ao teu administrador!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1487,7 +1487,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Limpando caché de miniaturas de cubertas"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Subir arquivo"
 
@@ -1510,7 +1510,7 @@ msgstr "Enderezo de correo electrónico"
 msgid "Send to eReader Email"
 msgstr "Enviar ao enderezo de correo electrónico do Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administrador"
@@ -1938,8 +1938,8 @@ msgstr "Premer na portada para cargar los metadatos no formulario"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Pechar"
@@ -2522,7 +2522,7 @@ msgid "Add to shelf"
 msgstr "Engadir ao andel"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2601,7 +2601,7 @@ msgstr "Introducir nome de dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominios prohibidos (Blaclist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2719,7 +2719,7 @@ msgstr "Libros ordeados por valoración"
 msgid "Books ordered by file formats"
 msgstr "Libros ordeados por formato de arquivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Andeis"
@@ -2736,52 +2736,52 @@ msgstr "Inicio"
 msgid "Toggle Navigation"
 msgstr "Alternar navegación"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Buscar na librería"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Conta"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Pechar sesión"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Cargando..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Erro"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Carga feita, procesando, por favor agarde..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Axustes"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Por favor, non actualice a páxina"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Detalles do libro"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index a2adde7461251cd73e40be89a099a90c8f7419bc..f951d0ffd45907fd0f7287e07a048915f7a7d433 100644
GIT binary patch
delta 22
dcmcb*k@4zA#tkio>}CpvmR1G^o4XCY)B$E72ekkI

delta 22
dcmcb*k@4zA#tkio?4}9^7FH&fo4XCY)B$Ew2fqLS

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 62fe2e6e8..52b7cb0e8 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -524,7 +524,7 @@ msgstr "nincs telepítve"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
@@ -902,8 +902,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Belépés"
@@ -1068,41 +1068,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Keresés"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
@@ -1153,7 +1153,7 @@ msgstr "A könyv el lett távolítva a polcról: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Polc készítése"
 
@@ -1217,7 +1217,7 @@ msgstr "Polc: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Feladatok"
@@ -1366,7 +1366,7 @@ msgstr "Először be kell állítani a kindle e-mail címet..."
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1501,7 +1501,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Feltöltés"
 
@@ -1525,7 +1525,7 @@ msgstr "E-mail"
 msgid "Send to eReader Email"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Rendszergazda"
@@ -1954,8 +1954,8 @@ msgstr "Kattints a borítóra a metadatok betöltésére"
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Bezárás"
@@ -2542,7 +2542,7 @@ msgid "Add to shelf"
 msgstr "Hozzáadás polchoz"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2620,7 +2620,7 @@ msgstr "Tartomány megadása"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Következő"
 
@@ -2738,7 +2738,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2755,52 +2755,52 @@ msgstr "Kezdőlap"
 msgid "Toggle Navigation"
 msgstr "Navigáció átkapcsolása"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Felhasználói fiók"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Kilépés"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Hiba"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Beállítások"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Böngészés"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Névjegy"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Előző"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Könyv részletei"
 
diff --git a/cps/translations/id/LC_MESSAGES/messages.mo b/cps/translations/id/LC_MESSAGES/messages.mo
index 9d6bc518752fa69397f50ae21d9fc8f23c51280d..6da595cbfa3cc07dc3cd4c87698fba1cacd43c47 100644
GIT binary patch
delta 22
ecmbQgl6n40<_+g-*v%9SEv*a;Heahb84dtwMhO@I

delta 22
ecmbQgl6n40<_+g-*i97-EUZi{H(#qc84dtwc?lu_

diff --git a/cps/translations/id/LC_MESSAGES/messages.po b/cps/translations/id/LC_MESSAGES/messages.po
index 5d0b3f264..fa79da8fe 100644
--- a/cps/translations/id/LC_MESSAGES/messages.po
+++ b/cps/translations/id/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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2023-01-21 10:00+0700\n"
 "Last-Translator: Arief Hidayat<arihid95@gmail.com>\n"
 "Language: id\n"
@@ -516,7 +516,7 @@ msgstr "belum dipasang"
 msgid "Execution permissions missing"
 msgstr "Izin eksekusi hilang"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Kolom Kustom No.%(column)d tidak ada di basis data kaliber"
@@ -895,8 +895,8 @@ msgstr "Kesalahan Google OAuth: {}"
 msgid "{} Stars"
 msgstr "{}★"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Masuk"
@@ -1061,41 +1061,41 @@ msgstr "Daftar Buku"
 msgid "Show Books List"
 msgstr "Tampilkan Daftar Buku"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Telusuri"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Terbit setelah "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Terbit sebelum "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Peringkat ≤ %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Peringkat ≥ %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status Baca = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Terjadi kesalahan saat mencari kolom khusus, harap mulai ulang Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Penelusuran Lanjutan"
 
@@ -1145,7 +1145,7 @@ msgstr "Buku telah dihapus dari rak: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Maaf Anda tidak diizinkan untuk menghapus buku dari rak ini: %(sname)s"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Buat Rak"
 
@@ -1207,7 +1207,7 @@ msgstr "Rak: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Terjadi kesalahan saat membuka rak. Rak tidak ada atau tidak dapat diakses"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tugas"
@@ -1356,7 +1356,7 @@ msgstr "Harap perbarui profil Anda dengan alamat e-mail Kirim ke Kindle yang val
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Server email belum diatur, silakan hubungi administrator!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1490,7 +1490,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Menghapus cache thumbnail sampul"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Unggah"
 
@@ -1513,7 +1513,7 @@ msgstr "Alamat Email"
 msgid "Send to eReader Email"
 msgstr "Alamat E-mail untuk Kirim ke E-Reader"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1941,8 +1941,8 @@ msgstr "Klik sampul untuk memuat metadata ke formulir"
 msgid "Loading..."
 msgstr "Memuat..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Tutup"
@@ -2525,7 +2525,7 @@ msgid "Add to shelf"
 msgstr "Tambah ke rak"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2604,7 +2604,7 @@ msgstr "Masukkan Nama Domain"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domain yang Ditolak (Daftar Hitam)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Selanjutnya"
 
@@ -2722,7 +2722,7 @@ msgstr "Buku yang diurutkan menurut Peringkat"
 msgid "Books ordered by file formats"
 msgstr "Buku yang diurutkan menurut format berkas"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Rak"
@@ -2739,52 +2739,52 @@ msgstr "Beranda"
 msgid "Toggle Navigation"
 msgstr "Alihkan Navigasi"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Cari di Pustaka"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Akun"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Keluar"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Mengunggah..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Terjadi Kesalahan"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Unggahan selesai, harap tunggu, data sedang diproses..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Harap jangan segarkan halaman"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Jelajahi"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Tentang"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Detail Buku"
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 1f61497095a7fa61e7b892a9bdb67b031fe6b067..30e4d595e9fe705cfa910e88100b00702f31358a 100644
GIT binary patch
delta 22
ecmX?hkNMa=<_%rV>}CpvmR1G^n<qAJ%?1E*+zC_w

delta 22
ecmX?hkNMa=<_%rV?4}9^7FH&fn<qAJ%?1E+4+&lX

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index f80313414..738002da0 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2023-02-04 20:25+0100\n"
 "Last-Translator: Massimo Pissarello <mapi68@gmail.com>\n"
 "Language: it\n"
@@ -512,7 +512,7 @@ msgstr "non installato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "La colonna personalizzata no.%(column)d non esiste nel database di Calibre"
@@ -885,8 +885,8 @@ msgstr "Google, errore Oauth: {}"
 msgid "{} Stars"
 msgstr "{} Stelle"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Accesso"
@@ -1042,41 +1042,41 @@ msgstr "Elenco libri"
 msgid "Show Books List"
 msgstr "Mostra l'elenco dei libri"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Cerca"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Stato di lettura = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
@@ -1126,7 +1126,7 @@ msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Spiacente, ma non sei autorizzato a rimuovere libri da questo scaffale"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
@@ -1188,7 +1188,7 @@ msgstr "Scaffale: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Attività"
@@ -1336,7 +1336,7 @@ msgstr "Per favore aggiorna il tuo profilo con un'e-mail eReader valida."
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1468,7 +1468,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Cancellazione della cache delle miniature delle copertine"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Caricamento"
 
@@ -1491,7 +1491,7 @@ msgstr "E-mail"
 msgid "Send to eReader Email"
 msgstr "E-mail dell'eReader"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Amministratore"
@@ -1918,8 +1918,8 @@ msgstr "Fai clic sulla copertina per caricare i metadati nel modulo"
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Chiudi"
@@ -2502,7 +2502,7 @@ msgid "Add to shelf"
 msgstr "Aggiungi allo scaffale"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2578,7 +2578,7 @@ msgstr "Inserisci il nome del dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domini bloccati (lista nera)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Prossimo"
 
@@ -2696,7 +2696,7 @@ msgstr "Libri ordinati per valutazione"
 msgid "Books ordered by file formats"
 msgstr "Libri ordinati per formato"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Scaffali"
@@ -2713,52 +2713,52 @@ msgstr "Home"
 msgid "Toggle Navigation"
 msgstr "Attiva/disattiva navigazione"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Ricerca nella libreria"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Disconnettersi"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Errore"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, elaborazione in corso, attendi per favore..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Per favore non ricaricare la pagina"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Naviga"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informazioni su"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Precedente"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Dettagli del libro"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 33b873c68d9844fc6df9f5397dd9066902fc10ab..404adb209649330836e4f289f7ac8dd49e4862ed 100644
GIT binary patch
delta 22
ecmZ2}jd}Ss<_%Fb>}CpvmR1G^n-gn}<pBU^%LuFh

delta 22
ecmZ2}jd}Ss<_%Fb?4}9^7FH&fn-gn}<pBU^{s^`J

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index a16098c2d..3b9fc22b6 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: subdiox <subdiox@gmail.com>\n"
 "Language: ja\n"
@@ -516,7 +516,7 @@ msgstr "インストールされていません"
 msgid "Execution permissions missing"
 msgstr "実行権限がありません"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "カスタムカラムの%(column)d列目がcalibreのDBに存在しません"
@@ -895,8 +895,8 @@ msgstr "Google OAuth エラー: {}"
 msgid "{} Stars"
 msgstr "星{}"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "ログイン"
@@ -1061,41 +1061,41 @@ msgstr "本の一覧"
 msgid "Show Books List"
 msgstr "本の一覧を表示"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "検索"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "既読/未読状況 = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "カスタムカラムの検索でエラーが発生しました。Calibre-Webを再起動してください"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "詳細検索"
 
@@ -1145,7 +1145,7 @@ msgstr "本が %(sname)s から削除されました"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "申し訳ありませんが、あなたはこの本棚から本を削除することが許可されていません"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "本棚を作成する"
 
@@ -1207,7 +1207,7 @@ msgstr "本棚: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "タスク"
@@ -1356,7 +1356,7 @@ msgstr "初めにKindleのメールアドレスを設定してください"
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "メールサーバーが設定されていません。管理者に連絡してください"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1490,7 +1490,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "表紙サムネイルのキャッシュを消去中"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "アップロード"
 
@@ -1513,7 +1513,7 @@ msgstr "メールアドレス"
 msgid "Send to eReader Email"
 msgstr "E-Readerメールアドレス"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理者"
@@ -1941,8 +1941,8 @@ msgstr "カバー画像をクリックしてメタデータをフォームに読
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "閉じる"
@@ -2525,7 +2525,7 @@ msgid "Add to shelf"
 msgstr "本棚に追加"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2604,7 +2604,7 @@ msgstr "ドメイン名を入力"
 msgid "Denied Domains (Blacklist)"
 msgstr "拒否するドメイン名 (ブラックリスト)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "次"
 
@@ -2722,7 +2722,7 @@ msgstr "評価順"
 msgid "Books ordered by file formats"
 msgstr "ファイル形式順"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "本棚"
@@ -2739,52 +2739,52 @@ msgstr "ホーム"
 msgid "Toggle Navigation"
 msgstr "ナビゲーションを実行"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "ライブラリ内を検索"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "アカウント"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "ログアウト"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "アップロード中..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "エラー"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "設定"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "ページを更新しないでください"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "閲覧"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "このサイトについて"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "前"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "本の詳細"
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 70741bf3db713723b5142a4fafc7a4c45f8565e5..7e7db8a99b1acd095912c6b11d9fb5120645d800 100644
GIT binary patch
delta 22
ecmbQUfpN|T#tokp+07ITEv*a;HvdvoG6Mi(#0Ta8

delta 22
ecmbQUfpN|T#tokp*-aG;EUZi{H~&&pG6Mi(_XqF*

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 6b0600ee6..c65f54e97 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -524,7 +524,7 @@ msgstr "មិនបានតម្លើង"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
@@ -899,8 +899,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
@@ -1065,41 +1065,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
@@ -1150,7 +1150,7 @@ msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
@@ -1213,7 +1213,7 @@ msgstr "ធ្នើ៖ ‘%(name)s’"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
@@ -1361,7 +1361,7 @@ msgstr ""
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1495,7 +1495,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "អាប់ឡូដ"
 
@@ -1519,7 +1519,7 @@ msgstr ""
 msgid "Send to eReader Email"
 msgstr "ឧបករណ៍ Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "រដ្ឋបាល"
@@ -1948,8 +1948,8 @@ msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិ
 msgid "Loading..."
 msgstr "កំពុងដំណើរការ..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "បិទ"
@@ -2535,7 +2535,7 @@ msgid "Add to shelf"
 msgstr "បន្ថែមទៅធ្នើ"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2612,7 +2612,7 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "បន្ទាប់"
 
@@ -2730,7 +2730,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2747,52 +2747,52 @@ msgstr ""
 msgid "Toggle Navigation"
 msgstr "បិទ/បើកការរុករក"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "ចេញពីការប្រើប្រាស់"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "កំពុងអាប់ឡូត..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr ""
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "ការកំណត់"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "រុករក"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "អំពី"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "មុន"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "ព័ត៌មានលម្អិតរបស់សៀវភៅ"
 
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index ef18e312be4e80556b93a4cad3452e10b18f50fd..a29c34d3ae4b017a5e711d88ea440491416a247f 100644
GIT binary patch
delta 21
ccmbO>g?ZW(<^{#<W(tOuRt5%}*^BwZ0Zu&zVgLXD

delta 21
ccmbO>g?ZW(<^{#<rV0iYRwkC4*^BwZ0ZwoRYybcN

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 6f4933967..b6fa2e16f 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -515,7 +515,7 @@ msgstr "설치되지 않음"
 msgid "Execution permissions missing"
 msgstr "실행 권한 누락"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다"
@@ -896,8 +896,8 @@ msgstr "Google 인증 오류: {}"
 msgid "{} Stars"
 msgstr "{} Stars"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "로그인"
@@ -1062,41 +1062,41 @@ msgstr "책 목록"
 msgid "Show Books List"
 msgstr "책 목록 보기"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "검색"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Published after "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Published before "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "평점 <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "평점 >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "읽은 상태 = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "상세 검색"
 
@@ -1146,7 +1146,7 @@ msgstr "책이 책장에서 삭제됨: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "책장 추가"
 
@@ -1209,7 +1209,7 @@ msgstr "책장: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "작업"
@@ -1358,7 +1358,7 @@ msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1492,7 +1492,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "업로드"
 
@@ -1516,7 +1516,7 @@ msgstr "이메일 주소"
 msgid "Send to eReader Email"
 msgstr "킨들로 보내기 이메일 주소"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "관리자"
@@ -1944,8 +1944,8 @@ msgstr "표지를 클릭하여 양식에 메타데이터 로드"
 msgid "Loading..."
 msgstr "불러오는 중..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "닫기"
@@ -2528,7 +2528,7 @@ msgid "Add to shelf"
 msgstr "서재에 추가"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2607,7 +2607,7 @@ msgstr "도메인 입력"
 msgid "Denied Domains (Blacklist)"
 msgstr "거부 도메인(블랙리스트)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "다음"
 
@@ -2726,7 +2726,7 @@ msgstr "평점별 정렬"
 msgid "Books ordered by file formats"
 msgstr "파일 종류별 정렬"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "서재"
@@ -2743,52 +2743,52 @@ msgstr "홈"
 msgid "Toggle Navigation"
 msgstr "탐색 활성화"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "검색"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "계정"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "로그아웃"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "업로드 중..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "오류"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "설정"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "페이지를 새로고침 하지 마세요"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "탐색"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "서재 정보"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "이전"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "책 상세정보"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 0f93740ad47fba339321048591167deb0c838580..3159f77fce45d9c25b6f51faccea3cefd2a8310a 100644
GIT binary patch
delta 22
dcmZ4fhH3d5rVZSg>}CpvmR1G^n}sq(eF0)!2S5M-

delta 22
dcmZ4fhH3d5rVZSg?4}9^7FH&fn}sq(eF0*S2TA|{

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 3d05fe468..da3b17192 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -527,7 +527,7 @@ msgstr "niet geïnstalleerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
@@ -908,8 +908,8 @@ msgstr "Google OAuth foutmelding: {}"
 msgid "{} Stars"
 msgstr "{} sterren"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Inloggen"
@@ -1074,41 +1074,41 @@ msgstr "Boekenlijst"
 msgid "Show Books List"
 msgstr "Boekenlijst tonen"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lees Status = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
@@ -1159,7 +1159,7 @@ msgstr "Het boek is verwijderd van boekenplank: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Boekenplank maken"
 
@@ -1223,7 +1223,7 @@ msgstr "Boekenplank: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Taken"
@@ -1372,7 +1372,7 @@ msgstr "Stel je kindle-e-mailadres in..."
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1507,7 +1507,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -1531,7 +1531,7 @@ msgstr "E-mailadres"
 msgid "Send to eReader Email"
 msgstr "Kindle-e-mailadres"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Beheer"
@@ -1961,8 +1961,8 @@ msgstr "Klik op de omslag om de metagegevens in het formulier te laden"
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Sluiten"
@@ -2550,7 +2550,7 @@ msgid "Add to shelf"
 msgstr "Toevoegen aan boekenplank"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2629,7 +2629,7 @@ msgstr "Voer domeinnaam in"
 msgid "Denied Domains (Blacklist)"
 msgstr "Geweigerde domeinen voor registratie"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Volgende"
 
@@ -2749,7 +2749,7 @@ msgstr "Boeken gesorteerd op beoordeling"
 msgid "Books ordered by file formats"
 msgstr "Boeken gesorteerd op bestandsformaat"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Boekenplanken"
@@ -2766,52 +2766,52 @@ msgstr "Startpagina"
 msgid "Toggle Navigation"
 msgstr "Navigatie aanpassen"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Zoek in bibliotheek"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Account"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Afmelden"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Bezig met uploaden..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Fout"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Instellingen"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Deze pagina niet vernieuwen"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Verkennen"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informatie"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Vorige"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Boekgegevens"
 
diff --git a/cps/translations/no/LC_MESSAGES/messages.mo b/cps/translations/no/LC_MESSAGES/messages.mo
index 53867e27c1071f9674185615058a038d4f2b23c9..673826804dc0920be656ed00c5632f622e7e6f94 100644
GIT binary patch
delta 22
dcmex8lj-+NrVaT)>}CpvmR1G^o6CY)tpI7>2sr=%

delta 22
dcmex8lj-+NrVaT)?4}9^7FH&fo6CY)tpI8f2txn>

diff --git a/cps/translations/no/LC_MESSAGES/messages.po b/cps/translations/no/LC_MESSAGES/messages.po
index 786bc0caf..837647915 100644
--- a/cps/translations/no/LC_MESSAGES/messages.po
+++ b/cps/translations/no/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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2023-01-06 11:00+0000\n"
 "Last-Translator: Vegard Fladby <vegard.fladby@gmail.com>\n"
 "Language: no\n"
@@ -522,7 +522,7 @@ msgstr "ikke installert"
 msgid "Execution permissions missing"
 msgstr "Utførelsestillatelser mangler"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Egendefinert kolonnenr.%(column)d finnes ikke i caliber-databasen"
@@ -902,8 +902,8 @@ msgstr "Google Oauth-feil: {}"
 msgid "{} Stars"
 msgstr "{} Stjerner"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Logg Inn"
@@ -1068,41 +1068,41 @@ msgstr "Bøker Liste"
 msgid "Show Books List"
 msgstr "Vis bokliste"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Søk"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Publisert etter "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Publisert før "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Vurdering <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Vurdering >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Feil ved søk etter egendefinerte kolonner. Start Calibre-Web på nytt"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
@@ -1152,7 +1152,7 @@ msgstr "Boken er fjernet fra hyllen: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Beklager at du ikke har lov til å fjerne en bok fra denne hyllen"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Lag en hylle"
 
@@ -1214,7 +1214,7 @@ msgstr "Hylle: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Feil ved åpning av hylle. Hylle finnes ikke eller er ikke tilgjengelig"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Oppgaver"
@@ -1365,7 +1365,7 @@ msgstr "Vennligst oppdater profilen din med en gyldig Send til Kindle-e-postadre
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-postserveren er ikke konfigurert, kontakt administratoren din!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1503,7 +1503,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Tømmer cache for miniatyrbilde for omslag"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Laste opp"
 
@@ -1528,7 +1528,7 @@ msgstr "E-post"
 msgid "Send to eReader Email"
 msgstr "Send til E-Reader E-postadresse"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1962,8 +1962,8 @@ msgstr "Klikk på omslaget for å laste metadata til skjemaet"
 msgid "Loading..."
 msgstr "Laster inn..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Lukk"
@@ -2559,7 +2559,7 @@ msgid "Add to shelf"
 msgstr "Rediger en hylle"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2639,7 +2639,7 @@ msgstr "Skriv inn kommentarer"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr ""
 
@@ -2764,7 +2764,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2782,56 +2782,56 @@ msgstr ""
 msgid "Toggle Navigation"
 msgstr "Loggfilkonfigurasjon"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr ""
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 #, fuzzy
 msgid "Uploading..."
 msgstr "Laster inn..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 #, fuzzy
 msgid "Error"
 msgstr "Serverport"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 #, fuzzy
 msgid "Settings"
 msgstr "Vurderinger"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 #, fuzzy
 msgid "Please do not refresh the page"
 msgstr "Oppdaterer, vennligst ikke last inn denne siden på nytt"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr ""
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 #, fuzzy
 msgid "Book Details"
 msgstr "Detaljer"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index f103cf701cb0533108c00c4438a9e9cc4af7dc2e..2aadf924539081953b5c9de8a338910aa0721038 100644
GIT binary patch
delta 22
ecmZqu$<+FjX~Vuub~6P-ODh9|%||m21OWhTiU}+L

delta 22
ecmZqu$<+FjX~Vuuc2fld3o8@L%||m21OWhTy$Ln|

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 38e4ac0ba..47927e255 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: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -528,7 +528,7 @@ msgstr "nie zainstalowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Niestandardowa kolumna No.%(column)d nie istnieje w bazie calibre"
@@ -912,8 +912,8 @@ msgstr "Błąd Google Oauth: {}"
 msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Zaloguj się"
@@ -1078,42 +1078,42 @@ msgstr "Lista książek"
 msgid "Show Books List"
 msgstr "Pokaż listę książek"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Szukaj"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status przeczytania = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 #, fuzzy
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
@@ -1164,7 +1164,7 @@ msgstr "Książka została usunięta z półki: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
@@ -1228,7 +1228,7 @@ msgstr "Półka: „%(name)s”"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Zadania"
@@ -1377,7 +1377,7 @@ msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1511,7 +1511,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Wysyłanie"
 
@@ -1536,7 +1536,7 @@ msgid "Send to eReader Email"
 msgstr "Adres e-mail dla wysyłania do Kindle"
 
 # ???
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Panel administratora"
@@ -1968,8 +1968,8 @@ msgstr "Kliknij okładkę, aby załadować metadane do formularza"
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Zamknij"
@@ -2562,7 +2562,7 @@ msgid "Add to shelf"
 msgstr "Dodaj do półki"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2641,7 +2641,7 @@ msgstr "Podaj nazwę domeny"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domeny zabronione (czarna lista)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Następne"
 
@@ -2763,7 +2763,7 @@ msgstr "Książki sortowane według oceny"
 msgid "Books ordered by file formats"
 msgstr "Ksiązki sortowane według formatu"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Półki"
@@ -2780,54 +2780,54 @@ msgstr "Główne menu"
 msgid "Toggle Navigation"
 msgstr "Przełącz nawigację"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Przeszukaj bibliotekę"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Konto"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Wysyłanie…"
 
 # ???
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Błąd"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Proszę nie odświeżać strony"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informacje"
 
 # ???
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Szczegóły książki"
 
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 5feae9ca2f6046183a9f7d69048cc09b4a549a80..28b7fdd87dff77e210589e618ac4bd92fe202d91 100644
GIT binary patch
delta 22
dcmeyhhxykY<_*p@>}CpvmR1G^o4slbk^pWq2u=V1

delta 22
dcmeyhhxykY<_*p@?4}9^7FH&fo4slbk^pXI2v`6B

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index f048e48a7..0c6f38844 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -513,7 +513,7 @@ msgstr "não instalado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "A Coluna Personalizada No.%(column)d não existe no banco de dados do calibre"
@@ -892,8 +892,8 @@ msgstr "Erro no Oauth do Google: {}"
 msgid "{} Stars"
 msgstr "{} Estrelas"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Login"
@@ -1058,41 +1058,41 @@ msgstr "Lista de Livros"
 msgid "Show Books List"
 msgstr "Mostrar Lista de Livros"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Pesquisar"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Publicado depois de "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Avaliação <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Avaliação >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de leitura = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erro na pesquisa de colunas personalizadas, reinicie o Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
@@ -1142,7 +1142,7 @@ msgstr "O livro foi removido da estante: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Desculpe, você não tem permissão para remover um livro desta estante"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Crie uma Estante"
 
@@ -1204,7 +1204,7 @@ msgstr "Estante: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erro ao abrir estante. A estante não existe ou não está acessível"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Tarefas"
@@ -1353,7 +1353,7 @@ msgstr "Por favor, atualize seu perfil com um endereço de e-mail Envie Para o K
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1487,7 +1487,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "Limpando o cache de miniaturas da capa"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Upload"
 
@@ -1510,7 +1510,7 @@ msgstr "Endereço de e-mail"
 msgid "Send to eReader Email"
 msgstr "Enviar para o endereço de e-mail do E-Reader"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1938,8 +1938,8 @@ msgstr "Clique na capa para carregar os metadados para o formulário"
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Fechar"
@@ -2522,7 +2522,7 @@ msgid "Add to shelf"
 msgstr "Adicionar à estante"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2601,7 +2601,7 @@ msgstr "Digite o nome do domínio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domínios Negados (Lista Negra)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Próximo"
 
@@ -2719,7 +2719,7 @@ msgstr "Livros ordenados por Avaliação"
 msgid "Books ordered by file formats"
 msgstr "Livros ordenados por formatos de arquivo"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Estantes"
@@ -2736,52 +2736,52 @@ msgstr "Início"
 msgid "Toggle Navigation"
 msgstr "Alternar Navegação"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Pesquisar na Biblioteca"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Conta"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Sair"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Enviando..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Erro"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Upload concluído, processando, por favor aguarde ..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Configurações"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Por favor, não atualize a página"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Navegue em"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Sobre"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Anterior"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Detalhes do Livro"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index db8685fc26ebd056c87b4cc71ba045202e391caa..4b7e74d478068135469f5142b014d8c4c374a008 100644
GIT binary patch
delta 22
ecmZ2>gK60frVTs2+07ITEv*a;HXra#O8@|B$q1SN

delta 22
ecmZ2>gK60frVTs2*-aG;EUZi{Hy`j$O8@|B{0O7~

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 6d2e37657..a9847a367 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -528,7 +528,7 @@ msgstr "не установлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
@@ -907,8 +907,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Логин"
@@ -1073,41 +1073,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Поиск"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
@@ -1158,7 +1158,7 @@ msgstr "Книга удалена с полки: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Создать полку"
 
@@ -1222,7 +1222,7 @@ msgstr "Полка: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Задания"
@@ -1371,7 +1371,7 @@ msgstr "Пожалуйста, сначала настройте e-mail на ва
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1506,7 +1506,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Загрузить"
 
@@ -1530,7 +1530,7 @@ msgstr "Адрес электронной почты"
 msgid "Send to eReader Email"
 msgstr "Отправить на Kindle Адрес электронной почты"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Управление"
@@ -1959,8 +1959,8 @@ msgstr "Нажмите на обложку, чтобы получить мета
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Закрыть"
@@ -2548,7 +2548,7 @@ msgid "Add to shelf"
 msgstr "Добавить на книжную полку"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2626,7 +2626,7 @@ msgstr "Введите доменное имя"
 msgid "Denied Domains (Blacklist)"
 msgstr "Запрещенные домены (черный список)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Далее"
 
@@ -2746,7 +2746,7 @@ msgstr "Книги, упорядоченные по рейтингу"
 msgid "Books ordered by file formats"
 msgstr "Книги отсортированы по формату файла"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Полки"
@@ -2763,52 +2763,52 @@ msgstr "Главная"
 msgid "Toggle Navigation"
 msgstr "Включить навигацию"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Поиск в библиотеке"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Учетная запись"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Выход"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Загружается..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Ошибка"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Настройки"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Пожалуйста не обновляйте страницу"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Просмотр"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "О программе"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Подробнее о книге"
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 16ed280724d13d03b6c2108e8974971faa6f4cf7..bf0691cedde49dce5d9045ed279122fd642ca97a 100644
GIT binary patch
delta 22
ecmZ4YfN9+WrVRz@>}CpvmR1G^o6FO;djJ4xL<pGx

delta 22
ecmZ4YfN9+WrVRz@?4}9^7FH&fo6FO;djJ4xcL<{Z

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 4f8f170aa..9cf3715e0 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -524,7 +524,7 @@ msgstr "inte installerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
@@ -905,8 +905,8 @@ msgstr "Google Oauth-fel: {}"
 msgid "{} Stars"
 msgstr "{} stjärnor"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Logga in"
@@ -1071,41 +1071,41 @@ msgstr "Boklista"
 msgid "Show Books List"
 msgstr "Visa boklista"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Sök"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lässtatus = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
@@ -1156,7 +1156,7 @@ msgstr "Boken har tagits bort från hyllan: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Skapa en hylla"
 
@@ -1220,7 +1220,7 @@ msgstr "Hylla: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Uppgifter"
@@ -1369,7 +1369,7 @@ msgstr "Konfigurera din kindle-e-postadress först..."
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1503,7 +1503,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -1527,7 +1527,7 @@ msgstr "E-post"
 msgid "Send to eReader Email"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Administratör"
@@ -1957,8 +1957,8 @@ msgstr "Klicka på omslaget för att läsa in metadata till formuläret"
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Stäng"
@@ -2546,7 +2546,7 @@ msgid "Add to shelf"
 msgstr "Lägg till hyllan"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2625,7 +2625,7 @@ msgstr "Ange domännamn"
 msgid "Denied Domains (Blacklist)"
 msgstr "Avvisade domäner för registrering"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Nästa"
 
@@ -2745,7 +2745,7 @@ msgstr "Böcker sorterade efter Betyg"
 msgid "Books ordered by file formats"
 msgstr "Böcker ordnade av filformat"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Hyllor"
@@ -2762,52 +2762,52 @@ msgstr "Hem"
 msgid "Toggle Navigation"
 msgstr "Växla navigering"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Sök i bibliotek"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Konto"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Logga ut"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Laddar upp..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Fel"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Inställningar"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Vänligen uppdatera inte sidan"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Bläddra"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Om"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Föregående"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 8b68580dfba7a4d8cff7469682e8fbc1b4ee0221..c724710fb3704eca344cfcc84d7a8985c448626c 100644
GIT binary patch
delta 22
dcmaFAkn#OO#tpIh>}CpvmR1G^n^W|=6#->W2eJSF

delta 22
dcmaFAkn#OO#tpIh?4}9^7FH&fn^W|=6#->}2fP3P

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index f75206e91..52c93311a 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -521,7 +521,7 @@ msgstr "yüklü değil"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
@@ -899,8 +899,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Giriş"
@@ -1065,41 +1065,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Ara"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
@@ -1150,7 +1150,7 @@ msgstr "eKitap kitaplıktan silindi: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Kitaplık oluştur"
 
@@ -1214,7 +1214,7 @@ msgstr "Kitaplık: '%(name)s'"
 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/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Görevler"
@@ -1362,7 +1362,7 @@ msgstr ""
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "E-Posta sunucusu ayarlanmadı, lütfen yöneticinizle iletişime geçin!"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1497,7 +1497,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Yükleme"
 
@@ -1521,7 +1521,7 @@ msgstr ""
 msgid "Send to eReader Email"
 msgstr "E-Posta adresiniz"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Yönetim"
@@ -1950,8 +1950,8 @@ msgstr "Forma metaveri yüklemek için kapağa tıklayın"
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Kapak"
@@ -2537,7 +2537,7 @@ msgid "Add to shelf"
 msgstr "Kitaplığa ekle"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2614,7 +2614,7 @@ msgstr "Servis adı girin"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2733,7 +2733,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr "Biçime göre sıralanmış eKitaplar"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2750,52 +2750,52 @@ msgstr "Anasayfa"
 msgid "Toggle Navigation"
 msgstr ""
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Hesap"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Çıkış"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Yükleniyor..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Hata"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Gözat"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Hakkında"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Önceki"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "eKitap Detayları"
 
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 9b4324243cfc2e3ddabe8e73447a41633f6cc2de..7477286acfe46d6484f65d9a2cbeae30c3af34f8 100644
GIT binary patch
delta 22
ecmcb+k@4<E#tla_+07ITEv*a;HlNlM(gy%*I0yv*

delta 22
ecmcb+k@4<E#tla_*-aG;EUZi{H=ouN(gy%*YX}bj

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 7c1564de9..f01992806 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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+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"
@@ -521,7 +521,7 @@ msgstr "не встановлено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
@@ -896,8 +896,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr "{} зірок"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Ім'я користувача"
@@ -1062,41 +1062,41 @@ msgstr "Список книжок"
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Пошук"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Опубліковані після "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Опубліковано до "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
@@ -1147,7 +1147,7 @@ msgstr "Книга видалена з книжкової полиці: %(sname)
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "створити книжкову полицю"
 
@@ -1210,7 +1210,7 @@ msgstr "Книжкова полиця: '%(name)s'"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Завдання"
@@ -1358,7 +1358,7 @@ msgstr ""
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1492,7 +1492,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Додати нову книгу"
 
@@ -1516,7 +1516,7 @@ msgstr ""
 msgid "Send to eReader Email"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Адмін"
@@ -1945,8 +1945,8 @@ msgstr "Натисніть на обкладинку, щоб отримати м
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Закрити"
@@ -2532,7 +2532,7 @@ msgid "Add to shelf"
 msgstr "Додати на книжкову полицю"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2609,7 +2609,7 @@ msgstr "Введіть домен"
 msgid "Denied Domains (Blacklist)"
 msgstr "Заборонені домени (Чорний список)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Далі"
 
@@ -2727,7 +2727,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2744,52 +2744,52 @@ msgstr ""
 msgid "Toggle Navigation"
 msgstr "Включити навігацію"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Вийти"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Завантаження..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Помилка"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Налаштування"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Перегляд"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "Про програму"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Попередній перегляд"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Деталі"
 
diff --git a/cps/translations/vi/LC_MESSAGES/messages.mo b/cps/translations/vi/LC_MESSAGES/messages.mo
index 93a2df4976f4e0e86652c33bb176c7dae23a3015..193d77d11b5af3853a29b6241e0a5278e7fb9d87 100644
GIT binary patch
delta 22
ecmaF$lJV6`#triv*v%9SEv*a;HZOH>H30y0^$4i|

delta 22
ecmaF$lJV6`#triv*i97-EUZi{H!pQ?H30y1C<wCv

diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po
index a6565e266..ba507e62e 100644
--- a/cps/translations/vi/LC_MESSAGES/messages.po
+++ b/cps/translations/vi/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2022-09-20 21:36+0700\n"
 "Last-Translator: Ha Link <halink0803@gmail.com>\n"
 "Language: vi\n"
@@ -512,7 +512,7 @@ msgstr "chưa cài đặt"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
@@ -891,8 +891,8 @@ msgstr "Google Oauth lỗi: {}"
 msgid "{} Stars"
 msgstr "{} sao"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "Đăng nhập"
@@ -1057,41 +1057,41 @@ msgstr "Danh sách sách"
 msgid "Show Books List"
 msgstr "Hiển thị danh sách sách"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "Phát hành sau "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "Phát hành trước "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Đánh giá <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Đánh giá >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Trạng thái đọc = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "Tìm kiếm nâng cao"
 
@@ -1141,7 +1141,7 @@ msgstr "Sách đã được xoá khỏi giá: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "Xin lỗi bạn không có quyền xoá sách khỏi giá này"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Tạo một giá sách"
 
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "Nhiệm vụ"
@@ -1353,7 +1353,7 @@ msgstr ""
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1489,7 +1489,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "Tải lên"
 
@@ -1513,7 +1513,7 @@ msgstr "Địa chỉ email"
 msgid "Send to eReader Email"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "Admin"
@@ -1943,8 +1943,8 @@ msgstr "Ấn vào ảnh cover để tải metadata vào form"
 msgid "Loading..."
 msgstr "Đang tải..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "Đóng"
@@ -2527,7 +2527,7 @@ msgid "Add to shelf"
 msgstr "Thêm vào giá sách"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2606,7 +2606,7 @@ msgstr "Nhập tên domain"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domain bị từ chối (Blacklist)"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "Tiếp tục"
 
@@ -2725,7 +2725,7 @@ msgstr "Sách sắp xếp theo xếp hạng"
 msgid "Books ordered by file formats"
 msgstr "Sách sắp xếp theo định dạng"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "Giá sách"
@@ -2742,52 +2742,52 @@ msgstr "Trang chủ"
 msgid "Toggle Navigation"
 msgstr ""
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "Tìm kiếm thư viện"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "Tài khoản"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "Đăng suất"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "Đang tải lên..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "Lỗi"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "Tải lên xong, đang xử lý, đợi chút ..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "Thiết lập"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "Làm ơn đừng load lại trang"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "Tìm kiếm"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "About"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "Trước"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "Chi tiết sách"
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 911be93779efa3c70ee6664ff0178cde2497f93c..cc36da23661b7502df6ffdfd06edd346df122bc5 100644
GIT binary patch
delta 14391
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

delta 12503
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
UGyb86?gn1?G%D1;<MTcL3m6U}Gynhq

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index aefc47792..21fd7c1ed 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -23,12 +23,10 @@ msgid "Statistics"
 msgstr "统计"
 
 #: cps/admin.py:143
-#, fuzzy
 msgid "Server restarted, please reload page."
 msgstr "服务器已重启，请刷新页面"
 
 #: cps/admin.py:145
-#, fuzzy
 msgid "Performing Server shutdown, please close window."
 msgstr "正在关闭服务器，请关闭窗口"
 
@@ -41,7 +39,6 @@ msgid "Unknown command"
 msgstr "未知命令"
 
 #: cps/admin.py:167
-#, fuzzy
 msgid "Success! Books queued for Metadata Backup"
 msgstr "书籍成功加入元数据备份队列"
 
@@ -346,12 +343,11 @@ msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
 #: cps/admin.py:1423
-#, fuzzy, python-format
+#, python-format
 msgid "Success! Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
 #: cps/admin.py:1429
-#, fuzzy
 msgid "Oops! Please configure the SMTP mail settings."
 msgstr "请先配置 SMTP 邮箱设置..."
 
@@ -516,7 +512,7 @@ msgstr "未安装"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定义列号：%(column)d 在 Calibre 数据库中不存在"
@@ -665,17 +661,14 @@ msgid "Send to eReader"
 msgstr "发送到电子阅读器"
 
 #: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
-#, fuzzy
 msgid "This Email has been sent via Calibre-Web."
 msgstr "此邮件已经通过 Calibre-Web 发送"
 
 #: cps/helper.py:114
-#, fuzzy
 msgid "Calibre-Web Test Email"
 msgstr "Calibre-Web 测试邮件"
 
 #: cps/helper.py:115
-#, fuzzy
 msgid "Test Email"
 msgstr "测试邮件"
 
@@ -684,22 +677,22 @@ msgid "Get Started with Calibre-Web"
 msgstr "开启 Calibre-Web 之旅"
 
 #: cps/helper.py:137
-#, fuzzy, python-format
+#, python-format
 msgid "Registration Email for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
 #: cps/helper.py:148 cps/helper.py:154
-#, fuzzy, python-format
+#, python-format
 msgid "Convert %(orig)s to %(format)s and send to eReader"
 msgstr "转换 %(orig)s 到 %(format)s 并发送到电子阅读器"
 
 #: cps/helper.py:173 cps/helper.py:177 cps/helper.py:181 cps/helper.py:185
-#, fuzzy, python-format
+#, python-format
 msgid "Send %(format)s to eReader"
 msgstr "发送 %(format)s 到电子阅读器"
 
 #: cps/helper.py:225
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to eReader"
 msgstr "%(book)s 发送到电子阅读器"
 
@@ -759,7 +752,6 @@ msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
 #: cps/helper.py:664
-#, fuzzy
 msgid "Invalid Email address format"
 msgstr "无效的邮箱格式"
 
@@ -893,8 +885,8 @@ msgstr "Google Oauth 错误: {}"
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "登录"
@@ -950,7 +942,6 @@ msgid "Read Books"
 msgstr "已读书籍"
 
 #: cps/render_template.py:64
-#, fuzzy
 msgid "Show Read and Unread"
 msgstr "显示已读或未读状态"
 
@@ -978,7 +969,6 @@ msgid "Categories"
 msgstr "分类"
 
 #: cps/render_template.py:74 cps/templates/user_table.html:158
-#, fuzzy
 msgid "Show Category Section"
 msgstr "显示分类栏目"
 
@@ -989,7 +979,6 @@ msgid "Series"
 msgstr "丛书"
 
 #: cps/render_template.py:77 cps/templates/user_table.html:157
-#, fuzzy
 msgid "Show Series Section"
 msgstr "显示丛书栏目"
 
@@ -999,7 +988,6 @@ msgid "Authors"
 msgstr "作者"
 
 #: cps/render_template.py:80 cps/templates/user_table.html:160
-#, fuzzy
 msgid "Show Author Section"
 msgstr "显示作者栏目"
 
@@ -1009,7 +997,6 @@ msgid "Publishers"
 msgstr "出版社"
 
 #: cps/render_template.py:84 cps/templates/user_table.html:163
-#, fuzzy
 msgid "Show Publisher Section"
 msgstr "显示出版社栏目"
 
@@ -1020,7 +1007,6 @@ msgid "Languages"
 msgstr "语言"
 
 #: cps/render_template.py:88 cps/templates/user_table.html:155
-#, fuzzy
 msgid "Show Language Section"
 msgstr "显示语言栏目"
 
@@ -1029,7 +1015,6 @@ msgid "Ratings"
 msgstr "评分"
 
 #: cps/render_template.py:91 cps/templates/user_table.html:164
-#, fuzzy
 msgid "Show Ratings Section"
 msgstr "显示评分栏目"
 
@@ -1038,7 +1023,6 @@ msgid "File formats"
 msgstr "文件格式"
 
 #: cps/render_template.py:94 cps/templates/user_table.html:165
-#, fuzzy
 msgid "Show File Formats Section"
 msgstr "显示文件格式栏目"
 
@@ -1047,7 +1031,6 @@ msgid "Archived Books"
 msgstr "归档书籍"
 
 #: cps/render_template.py:98 cps/templates/user_table.html:166
-#, fuzzy
 msgid "Show Archived Books"
 msgstr "显示归档书籍"
 
@@ -1059,41 +1042,41 @@ msgstr "书籍列表"
 msgid "Show Books List"
 msgstr "显示书籍列表"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "搜索"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义栏目时出错，请重启 Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "高级搜索"
 
@@ -1143,7 +1126,7 @@ msgstr "此书已从书架 %(sname)s 中删除"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr "抱歉，您没有从这个书架删除书籍的权限"
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "创建书架"
 
@@ -1205,7 +1188,7 @@ msgstr "书架：%(name)s"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "任务列表"
@@ -1346,7 +1329,6 @@ msgid "Oops! There was an error sending book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
 #: cps/web.py:1213
-#, fuzzy
 msgid "Oops! Please update your profile with a valid eReader Email."
 msgstr "请先配置您的 Kindle 邮箱"
 
@@ -1354,7 +1336,7 @@ msgstr "请先配置您的 Kindle 邮箱"
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1401,7 +1383,6 @@ msgid "%(name)s's Profile"
 msgstr "%(name)s 的用户配置"
 
 #: cps/web.py:1416
-#, fuzzy
 msgid "Success! Profile Updated"
 msgstr "资料已更新"
 
@@ -1487,7 +1468,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr "正在清理封面缩略图缓存"
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "上传书籍"
 
@@ -1510,7 +1491,7 @@ msgstr "邮箱地址"
 msgid "Send to eReader Email"
 msgstr "接收书籍的电子阅读器邮箱地址"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理权限"
@@ -1576,7 +1557,6 @@ msgid "From Email"
 msgstr "发件人邮箱"
 
 #: cps/templates/admin.html:90
-#, fuzzy
 msgid "Email Service"
 msgstr "电子邮件服务"
 
@@ -1938,8 +1918,8 @@ msgstr "单击封面将元数据加载到表单"
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "关闭"
@@ -2522,7 +2502,7 @@ msgid "Add to shelf"
 msgstr "添加到书架"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2537,12 +2517,10 @@ msgid "Email Account Type"
 msgstr "选择服务器类型"
 
 #: cps/templates/email_edit.html:15
-#, fuzzy
 msgid "Standard Email Account"
 msgstr "标准电子邮件"
 
 #: cps/templates/email_edit.html:16
-#, fuzzy
 msgid "Gmail Account"
 msgstr "Gmail 账户"
 
@@ -2571,7 +2549,6 @@ msgid "Attachment Size Limit"
 msgstr "附件大小限制"
 
 #: cps/templates/email_edit.html:66
-#, fuzzy
 msgid "Save and Send Test Email"
 msgstr "保存设置并发送测试邮件"
 
@@ -2601,7 +2578,7 @@ msgstr "输入域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止注册的域名（黑名单）"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "下一个"
 
@@ -2719,7 +2696,7 @@ msgstr "书籍按评分排序"
 msgid "Books ordered by file formats"
 msgstr "书籍按文件格式排序"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "书架列表"
@@ -2736,52 +2713,52 @@ msgstr "首页"
 msgid "Toggle Navigation"
 msgstr "切换导航"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "搜索书库"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "账号"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "注销"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "正在上传..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "错误"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "设置"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "请不要刷新页面"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "按条件浏览"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "关于"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "上一个"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "书籍详情"
 
@@ -3306,17 +3283,14 @@ msgid "Enter Username"
 msgstr "输入用户名"
 
 #: cps/templates/user_table.html:135
-#, fuzzy
 msgid "Enter Email"
 msgstr "输入邮箱"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "Enter eReader Email"
 msgstr "接收书籍的电子阅读器邮箱"
 
 #: cps/templates/user_table.html:136
-#, fuzzy
 msgid "eReader Email"
 msgstr "电子阅读器邮箱"
 
@@ -3377,7 +3351,6 @@ msgid "Sync selected Shelves with Kobo"
 msgstr "同步所选书架到 Kobo"
 
 #: cps/templates/user_table.html:156
-#, fuzzy
 msgid "Show Read/Unread Section"
 msgstr "显示已读、未读栏目"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 2c1138398e6d94191d5ecac7b22b749201b7f1f7..8fbed7cfcd348cb1dcff64620942c2eb3aa0994f 100644
GIT binary patch
delta 22
ecmaF#fa%c#rVTIh*v%9SEv*a;Howm+b_4)>XbH3c

delta 22
ecmaF#fa%c#rVTIh*i97-EUZi{H^0v-b_4)>n+d)E

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 03e757118..16b841bb1 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/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: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -518,7 +518,7 @@ msgstr "未安裝"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, fuzzy, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
@@ -899,8 +899,8 @@ msgstr "Google Oauth 錯誤: {}"
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr "登入"
@@ -1065,41 +1065,41 @@ msgstr "書籍列表"
 msgid "Show Books List"
 msgstr "顯示書籍列表"
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr "搜尋"
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr "出版時間晚於 "
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr "出版時間早於 "
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評分 <= %(rating)s"
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評分 >= %(rating)s"
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "閱讀狀態 = %(status)s"
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
@@ -1149,7 +1149,7 @@ msgstr "此書已從書架 %(sname)s 中刪除"
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "創建書架"
 
@@ -1212,7 +1212,7 @@ msgstr "書架：%(name)s"
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打開書架出錯。書架不存在或不可訪問"
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr "任務列表"
@@ -1361,7 +1361,7 @@ msgstr "請先設置您的kindle郵箱。"
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1495,7 +1495,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr "上傳書籍"
 
@@ -1519,7 +1519,7 @@ msgstr "郵箱地址"
 msgid "Send to eReader Email"
 msgstr "接收書籍的Kindle郵箱地址"
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr "管理權限"
@@ -1948,8 +1948,8 @@ msgstr "單擊封面將元數據加載到表單"
 msgid "Loading..."
 msgstr "加載中..."
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr "關閉"
@@ -2536,7 +2536,7 @@ msgid "Add to shelf"
 msgstr "添加到書架"
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2615,7 +2615,7 @@ msgstr "輸入網域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止註冊的網域名（黑名單）"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr "下一個"
 
@@ -2734,7 +2734,7 @@ msgstr "書籍按評分排序"
 msgid "Books ordered by file formats"
 msgstr "書籍按文件格式排序"
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr "書架列表"
@@ -2751,52 +2751,52 @@ msgstr "首頁"
 msgid "Toggle Navigation"
 msgstr "切換導航"
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr "搜索書庫"
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr "賬號"
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr "登出"
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr "正在上傳..."
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr "錯誤"
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr "上傳完成，正在處理中，請稍候..."
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr "設置"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr "請不要刷新頁面"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr "瀏覽"
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr "關於"
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr "上一個"
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr "書籍詳情"
 
diff --git a/cps/usermanagement.py b/cps/usermanagement.py
index e80e55b2b..d0d1494ca 100644
--- a/cps/usermanagement.py
+++ b/cps/usermanagement.py
@@ -49,15 +49,15 @@ def requires_basic_auth_if_no_ano(f):
             else:
                 return f(*args, **kwargs)
         if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
-            result, error = services.ldap.bind_user(auth.username, auth.password)
-            if result:
+            login_result, error = services.ldap.bind_user(auth.username, auth.password)
+            if login_result:
                 user = _fetch_user_by_name(auth.username)
                 login_user(user)
-            else:
+                return f(*args, **kwargs)
+            elif login_result is not None:
                 log.error(error)
-                user = None
-        else:
-            user = _load_user_from_auth_header(auth.username, auth.password)
+                return _authenticate()
+        user = _load_user_from_auth_header(auth.username, auth.password)
         if not user:
             return _authenticate()
         return f(*args, **kwargs)
diff --git a/messages.pot b/messages.pot
index 3f8fe840e..a44d8d255 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-02-05 08:49+0100\n"
+"POT-Creation-Date: 2023-02-06 19:00+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"
@@ -511,7 +511,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:728 cps/search.py:137 cps/web.py:727
+#: cps/db.py:728 cps/search.py:138 cps/web.py:727
 #, python-format
 msgid "Custom Column No.%(column)d does not exist in calibre database"
 msgstr ""
@@ -884,8 +884,8 @@ msgstr ""
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:62 cps/templates/layout.html:67
-#: cps/templates/layout.html:101 cps/templates/login.html:4
+#: cps/remotelogin.py:62 cps/templates/layout.html:68
+#: cps/templates/layout.html:102 cps/templates/login.html:4
 #: cps/templates/login.html:21 cps/web.py:1344
 msgid "Login"
 msgstr ""
@@ -1041,41 +1041,41 @@ msgstr ""
 msgid "Show Books List"
 msgstr ""
 
-#: cps/search.py:48 cps/search.py:392 cps/templates/book_edit.html:236
+#: cps/search.py:49 cps/search.py:393 cps/templates/book_edit.html:236
 #: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:46 cps/templates/layout.html:49
+#: cps/templates/layout.html:47 cps/templates/layout.html:50
 #: cps/templates/search_form.html:226
 msgid "Search"
 msgstr ""
 
-#: cps/search.py:188
+#: cps/search.py:189
 msgid "Published after "
 msgstr ""
 
-#: cps/search.py:195
+#: cps/search.py:196
 msgid "Published before "
 msgstr ""
 
-#: cps/search.py:217
+#: cps/search.py:218
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/search.py:219
+#: cps/search.py:220
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/search.py:221
+#: cps/search.py:222
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/search.py:323
+#: cps/search.py:324
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/search.py:342 cps/search.py:374 cps/templates/layout.html:57
+#: cps/search.py:343 cps/search.py:375 cps/templates/layout.html:58
 msgid "Advanced Search"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Sorry you are not allowed to remove a book from this shelf"
 msgstr ""
 
-#: cps/shelf.py:210 cps/templates/layout.html:157
+#: cps/shelf.py:210 cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr ""
 
@@ -1187,7 +1187,7 @@ msgstr ""
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/tasks_status.py:48 cps/templates/layout.html:88
+#: cps/tasks_status.py:48 cps/templates/layout.html:89
 #: cps/templates/tasks.html:7
 msgid "Tasks"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 msgid "Oops! Email server is not configured, please contact your administrator."
 msgstr ""
 
-#: cps/templates/layout.html:68 cps/templates/layout.html:102
+#: cps/templates/layout.html:69 cps/templates/layout.html:103
 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1231
 #: cps/web.py:1238 cps/web.py:1244 cps/web.py:1264 cps/web.py:1269
 #: cps/web.py:1275
@@ -1467,7 +1467,7 @@ msgid "Clearing cover thumbnail cache"
 msgstr ""
 
 #: cps/tasks/upload.py:38 cps/templates/admin.html:20
-#: cps/templates/layout.html:81 cps/templates/user_table.html:145
+#: cps/templates/layout.html:82 cps/templates/user_table.html:145
 msgid "Upload"
 msgstr ""
 
@@ -1490,7 +1490,7 @@ msgstr ""
 msgid "Send to eReader Email"
 msgstr ""
 
-#: cps/templates/admin.html:17 cps/templates/layout.html:91
+#: cps/templates/admin.html:17 cps/templates/layout.html:92
 #: cps/templates/user_table.html:143
 msgid "Admin"
 msgstr ""
@@ -1917,8 +1917,8 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:251 cps/templates/layout.html:78
-#: cps/templates/layout.html:203 cps/templates/modal_dialogs.html:34
+#: cps/templates/book_edit.html:251 cps/templates/layout.html:79
+#: cps/templates/layout.html:204 cps/templates/modal_dialogs.html:34
 #: cps/templates/user_edit.html:163
 msgid "Close"
 msgstr ""
@@ -2501,7 +2501,7 @@ msgid "Add to shelf"
 msgstr ""
 
 #: cps/templates/detail.html:269 cps/templates/detail.html:286
-#: cps/templates/feed.xml:79 cps/templates/layout.html:154
+#: cps/templates/feed.xml:79 cps/templates/layout.html:155
 #: cps/templates/listenmp3.html:201 cps/templates/listenmp3.html:218
 #: cps/templates/search.html:22
 msgid "(Public)"
@@ -2577,7 +2577,7 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:187
+#: cps/templates/feed.xml:21 cps/templates/layout.html:188
 msgid "Next"
 msgstr ""
 
@@ -2695,7 +2695,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:119 cps/templates/layout.html:152
+#: cps/templates/index.xml:119 cps/templates/layout.html:153
 #: cps/templates/search_form.html:87
 msgid "Shelves"
 msgstr ""
@@ -2712,52 +2712,52 @@ msgstr ""
 msgid "Toggle Navigation"
 msgstr ""
 
-#: cps/templates/layout.html:47
+#: cps/templates/layout.html:48
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:65 cps/templates/layout.html:94
+#: cps/templates/layout.html:66 cps/templates/layout.html:95
 msgid "Account"
 msgstr ""
 
-#: cps/templates/layout.html:71 cps/templates/layout.html:96
+#: cps/templates/layout.html:72 cps/templates/layout.html:97
 msgid "Logout"
 msgstr ""
 
-#: cps/templates/layout.html:78 cps/templates/layout.html:134
+#: cps/templates/layout.html:79 cps/templates/layout.html:135
 msgid "Uploading..."
 msgstr ""
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Error"
 msgstr ""
 
-#: cps/templates/layout.html:78
+#: cps/templates/layout.html:79
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:91 cps/templates/read.html:76
+#: cps/templates/layout.html:92 cps/templates/read.html:76
 #: cps/templates/readcbr.html:87 cps/templates/readcbr.html:111
 msgid "Settings"
 msgstr ""
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:136
 msgid "Please do not refresh the page"
 msgstr ""
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:146
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:158 cps/templates/stats.html:3
+#: cps/templates/layout.html:159 cps/templates/stats.html:3
 msgid "About"
 msgstr ""
 
-#: cps/templates/layout.html:172
+#: cps/templates/layout.html:173
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:199
+#: cps/templates/layout.html:200
 msgid "Book Details"
 msgstr ""
 
diff --git a/requirements.txt b/requirements.txt
index 34c990faa..d5c491fb8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-APScheduler>=3.6.3,<3.10.0
+APScheduler>=3.6.3,<3.11.0
 werkzeug<2.1.0
 Babel>=1.3,<3.0
 Flask-Babel>=0.11.1,<3.1.0
diff --git a/setup.cfg b/setup.cfg
index 9be77e7f0..0b07ca25b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,7 +45,7 @@ install_requires =
 	Flask-Login>=0.3.2,<0.6.3
 	Flask-Principal>=0.3.2,<0.5.1
 	backports_abc>=0.4
-	Flask>=1.0.2,<2.2.0
+	Flask>=1.0.2,<2.3.0
 	iso-639>=0.4.5,<0.5.0
 	PyPDF>=3.0.0,<3.3.0
 	pytz>=2016.10
@@ -62,29 +62,29 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.50.0
-	gevent>20.6.0,<22.0.0
-	greenlet>=0.4.17,<1.2.0
-	httplib2>=0.9.2,<0.21.0
+	google-api-python-client>=1.7.11,<2.75.0
+	gevent>20.6.0,<23.0.0
+	greenlet>=0.4.17,<2.1.0
+	httplib2>=0.9.2,<0.22.0
 	oauth2client>=4.0.0,<4.1.4
 	uritemplate>=3.0.0,<4.2.0
 	pyasn1-modules>=0.0.8,<0.3.0
 	pyasn1>=0.1.9,<0.5.0
-	PyDrive2>=1.3.1,<1.11.0
+	PyDrive2>=1.3.1,<1.16.0
 	PyYAML>=3.12
-	rsa>=3.4.2,<4.9.0
+	rsa>=3.4.2,<4.10.0
 gmail = 
-	google-auth-oauthlib>=0.4.3,<0.6.0
-	google-api-python-client>=1.7.11,<2.50.0
+	google-auth-oauthlib>=0.4.3,<0.9.0
+	google-api-python-client>=1.7.11,<2.75.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
-	python-Levenshtein>=0.12.0,<0.13.0
+	python-Levenshtein>=0.12.0,<0.21.0
 ldap = 
 	python-ldap>=3.0.0,<3.5.0
 	Flask-SimpleLDAP>=1.4.0,<1.5.0
 oauth = 
-	Flask-Dance>=2.0.0,<5.2.0
-	SQLAlchemy-Utils>=0.33.5,<0.39.0
+	Flask-Dance>=2.0.0,<6.3.0
+	SQLAlchemy-Utils>=0.33.5,<0.40.0
 metadata = 
 	rarfile>=3.2
 	scholarly>=1.2.0,<1.8
@@ -94,8 +94,8 @@ metadata =
 	beautifulsoup4>=4.0.1,<4.12.0
 	cchardet>=2.0.0,<2.2.0
 comics = 
-	natsort>=2.2.0,<8.2.0
+	natsort>=2.2.0,<8.3.0
 	comicapi>=2.2.0,<2.3.0
 kobo = 
-	jsonschema>=3.2.0,<4.9.0
+	jsonschema>=3.2.0,<4.18.0
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index f4559f903..a2c53d30d 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2023-01-23 21:43:54</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2023-02-05 20:51:25</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>2023-01-24 03:59:24</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2023-02-06 03:15:11</p>
             
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>5h 19 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>5h 28 min</p>
         </div>
       </div>
       </div>
@@ -1631,13 +1631,13 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">18</td>
         <td class="text-center">17</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c16', 18)">Detail</a>
         </td>
@@ -1780,26 +1780,28 @@
     
     
     
-        <tr id="et16.16" class="none bg-info">
+        <tr id="ft16.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.16')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.16')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et16.16" class="popup_window test_output" style="display:block;">
+                <div id="div_ft16.16" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.16').style.display='none'"><span
+                                onclick="document.getElementById('div_ft16.16').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 185, in test_edit_title
-    self.assertEqual(&#39;The camicdemo&#39;, books[1][8][&#39;title&#39;])
-IndexError: list index out of range</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 230, in test_edit_title
+    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
+AssertionError: &#39;Pipo|;.:&#39; != &#39;Very long extra super turbo cool title wi[54 chars]ters&#39;
+- Pipo|;.:
++ Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1828,13 +1830,13 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
@@ -1842,31 +1844,11 @@ IndexError: list index out of range</pre>
 
     
     
-        <tr id="ft17.1" class="none bg-danger">
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft17.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft17.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
-    self.assertEqual(30, len(results))
-AssertionError: 30 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2360,8 +2342,8 @@ AssertionError: 30 != 0</pre>
     <tr id="su" class="errorClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">6</td>
-        <td class="text-center">6</td>
+        <td class="text-center">11</td>
+        <td class="text-center">1</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2380,71 +2362,20 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id="ft27.2" class="none bg-danger">
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft27.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 620, in test_LDAP_SSL_CERTIFICATE
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.3" class="none bg-info">
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 649, in test_LDAP_STARTTLS
-    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 388, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 298, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py&#34;, line 90, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2458,31 +2389,11 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16
     
     
     
-        <tr id="ft27.5" class="none bg-danger">
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft27.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 409, in test_LDAP_import
-    self.assertEqual(len(userlist), 4)
-AssertionError: 5 != 4</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2496,31 +2407,11 @@ AssertionError: 5 != 4</pre>
     
     
     
-        <tr id="ft27.7" class="none bg-danger">
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft27.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 230, in test_LDAP_login
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2543,93 +2434,84 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft27.10" class="none bg-danger">
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft27.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 768, in test_ldap_authentication
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft27.11" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft27.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1039, in test_ldap_kobo_sync
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='pt27.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="ft27.13" class="none bg-danger">
+        <tr id='pt27.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="ft27.12" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.12')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft27.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1001, in test_ldap_opds_anonymous
+    self.assertEqual(200, r.status_code)
+AssertionError: 200 != 401</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et27.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.13')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.13')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft27.13" class="popup_window test_output" style="display:block;">
+                <div id="div_et27.13" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft27.13').style.display='none'"><span
+                                onclick="document.getElementById('div_et27.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 851, in test_ldap_opds_download_book
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 832, in test_ldap_opds_download_book
+    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 392, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 302, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py&#34;, line 90, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2858,15 +2740,15 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLogin</td>
+        <td class="text-center">16</td>
         <td class="text-center">15</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 16)">Detail</a>
         </td>
     </tr>
 
@@ -2926,11 +2808,31 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id="ft30.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft30.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft30.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft30.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_login.py&#34;, line 151, in test_login_protected
+    self.assertEqual(self.fail_access_page(&#34;http://127.0.0.1:8083/search&#34;), 1)
+AssertionError: 2 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2999,6 +2901,15 @@ AssertionError: False is not true</pre>
     
     
         <tr id='pt30.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_proxy_login_opds</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3074,11 +2985,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestOPDSFeed</td>
         <td class="text-center">23</td>
-        <td class="text-center">23</td>
-        <td class="text-center">0</td>
+        <td class="text-center">21</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3160,11 +3071,31 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id="ft33.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 181, in test_opds_guest_user
+    self.assertEqual(200, r.status_code)
+AssertionError: 200 != 401</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3232,11 +3163,31 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id="ft33.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.17')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 564, in test_opds_search
+    self.assertEqual(401, r.status_code)
+AssertionError: 401 != 200</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3296,12 +3247,12 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestUploadPDF</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</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('c34', 1)">Detail</a>
@@ -3310,7 +3261,64 @@ AssertionError: False is not true</pre>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id="et34.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_opds_feed)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et34.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et34.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et34.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 34, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 480, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 856, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:180:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:392:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.sys.mjs:275:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestUploadPDF</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('c35', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3328,13 +3336,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 3)">Detail</a>
+            <a onclick="showClassDetail('c36', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_command_start</div>
             </td>
@@ -3343,7 +3351,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
             </td>
@@ -3352,7 +3360,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_module_start</div>
             </td>
@@ -3362,21 +3370,21 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <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">4</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('c36', 5)">Detail</a>
+            <a onclick="showClassDetail('c37', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3385,16 +3393,42 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id="et37.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 83, in test_epub_reader
+    self.driver.switch_to.frame(self.check_element_on_page((By.XPATH,&#34;//iframe[starts-with(@id, &#39;epubjs-view&#39;)]&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/switch_to.py&#34;, line 94, in frame
+    self._driver.execute(Command.SWITCH_TO_FRAME, {&#39;id&#39;: frame_reference})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 434, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 243, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.InvalidArgumentException: Message: data did not match any variant of untagged enum FrameId at line 1 column 13</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3403,7 +3437,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3412,7 +3446,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3430,13 +3464,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3454,13 +3488,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3469,7 +3503,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3478,7 +3512,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3487,7 +3521,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3496,7 +3530,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3505,7 +3539,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3514,7 +3548,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3523,7 +3557,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3541,13 +3575,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3556,7 +3590,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3565,7 +3599,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3583,13 +3617,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3598,7 +3632,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3607,7 +3641,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3616,7 +3650,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3625,7 +3659,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3634,7 +3668,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3643,7 +3677,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3652,7 +3686,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3661,7 +3695,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3670,7 +3704,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3679,7 +3713,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3688,7 +3722,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3697,7 +3731,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3706,19 +3740,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st40.14" class="none bg-warning">
+        <tr id="st41.14" 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_st40.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st40.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3732,7 +3766,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3741,7 +3775,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3759,13 +3793,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 1)">Detail</a>
+            <a onclick="showClassDetail('c42', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnailsEnv - test_cover_cache_env_on_database_change</div>
             </td>
@@ -3783,13 +3817,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 8)">Detail</a>
+            <a onclick="showClassDetail('c43', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
             </td>
@@ -3798,7 +3832,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
@@ -3807,7 +3841,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
             </td>
@@ -3816,7 +3850,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
@@ -3825,7 +3859,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='st42.5' class='none bg-warning'>
+        <tr id='st43.5' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_for_series</div>
             </td>
@@ -3834,7 +3868,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
@@ -3843,7 +3877,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
             </td>
@@ -3852,7 +3886,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
             </td>
@@ -3870,13 +3904,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 9)">Detail</a>
+            <a onclick="showClassDetail('c44', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3885,7 +3919,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3894,7 +3928,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3903,7 +3937,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3912,7 +3946,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3921,7 +3955,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3930,19 +3964,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st43.7" class="none bg-warning">
+        <tr id="st44.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_st43.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st44.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st43.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st44.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_st43.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st44.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3956,7 +3990,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3965,7 +3999,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3983,13 +4017,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 5)">Detail</a>
+            <a onclick="showClassDetail('c45', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -3998,7 +4032,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -4007,7 +4041,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4016,7 +4050,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_identifier</div>
             </td>
@@ -4025,7 +4059,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4043,13 +4077,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 18)">Detail</a>
+            <a onclick="showClassDetail('c46', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4058,7 +4092,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4067,7 +4101,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4076,7 +4110,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4085,7 +4119,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4094,7 +4128,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4103,7 +4137,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4112,7 +4146,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4121,7 +4155,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4130,7 +4164,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4139,7 +4173,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4148,7 +4182,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4157,7 +4191,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4166,7 +4200,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4175,7 +4209,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4184,7 +4218,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4193,7 +4227,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4202,7 +4236,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4220,13 +4254,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 1)">Detail</a>
+            <a onclick="showClassDetail('c47', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4244,13 +4278,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 21)">Detail</a>
+            <a onclick="showClassDetail('c48', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4259,7 +4293,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4268,7 +4302,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4277,7 +4311,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4286,7 +4320,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4295,7 +4329,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4304,7 +4338,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4313,7 +4347,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4322,7 +4356,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4331,7 +4365,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4340,7 +4374,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4349,7 +4383,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4358,7 +4392,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4367,7 +4401,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4376,7 +4410,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4385,7 +4419,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4394,7 +4428,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.17' class='hiddenRow bg-success'>
+        <tr id='pt48.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4403,7 +4437,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.18' class='hiddenRow bg-success'>
+        <tr id='pt48.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4412,7 +4446,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.19' class='hiddenRow bg-success'>
+        <tr id='pt48.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4421,7 +4455,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.20' class='hiddenRow bg-success'>
+        <tr id='pt48.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4430,7 +4464,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt47.21' class='hiddenRow bg-success'>
+        <tr id='pt48.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4448,13 +4482,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c48', 35)">Detail</a>
+            <a onclick="showClassDetail('c49', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt49.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4463,7 +4497,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt49.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4472,7 +4506,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt49.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4481,7 +4515,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt49.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4490,7 +4524,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt49.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4499,7 +4533,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt49.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4508,7 +4542,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt49.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4517,7 +4551,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt49.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4526,7 +4560,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt49.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4535,7 +4569,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt49.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4544,7 +4578,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt49.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4553,7 +4587,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt49.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4562,7 +4596,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt49.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4571,7 +4605,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.14' class='hiddenRow bg-success'>
+        <tr id='pt49.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4580,7 +4614,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.15' class='hiddenRow bg-success'>
+        <tr id='pt49.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4589,7 +4623,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.16' class='hiddenRow bg-success'>
+        <tr id='pt49.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4598,7 +4632,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.17' class='hiddenRow bg-success'>
+        <tr id='pt49.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4607,7 +4641,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.18' class='hiddenRow bg-success'>
+        <tr id='pt49.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4616,7 +4650,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.19' class='hiddenRow bg-success'>
+        <tr id='pt49.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4625,7 +4659,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.20' class='hiddenRow bg-success'>
+        <tr id='pt49.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4634,7 +4668,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.21' class='hiddenRow bg-success'>
+        <tr id='pt49.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4643,7 +4677,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.22' class='hiddenRow bg-success'>
+        <tr id='pt49.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4652,7 +4686,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.23' class='hiddenRow bg-success'>
+        <tr id='pt49.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4661,7 +4695,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.24' class='hiddenRow bg-success'>
+        <tr id='pt49.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4670,7 +4704,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.25' class='hiddenRow bg-success'>
+        <tr id='pt49.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4679,7 +4713,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.26' class='hiddenRow bg-success'>
+        <tr id='pt49.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
@@ -4688,7 +4722,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.27' class='hiddenRow bg-success'>
+        <tr id='pt49.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4697,7 +4731,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.28' class='hiddenRow bg-success'>
+        <tr id='pt49.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4706,7 +4740,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.29' class='hiddenRow bg-success'>
+        <tr id='pt49.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4715,7 +4749,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.30' class='hiddenRow bg-success'>
+        <tr id='pt49.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4724,7 +4758,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.31' class='hiddenRow bg-success'>
+        <tr id='pt49.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4733,7 +4767,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.32' class='hiddenRow bg-success'>
+        <tr id='pt49.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4742,7 +4776,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.33' class='hiddenRow bg-success'>
+        <tr id='pt49.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4751,7 +4785,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.34' class='hiddenRow bg-success'>
+        <tr id='pt49.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4760,7 +4794,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.35' class='hiddenRow bg-success'>
+        <tr id='pt49.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4778,13 +4812,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c49', 16)">Detail</a>
+            <a onclick="showClassDetail('c50', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt49.1' class='hiddenRow bg-success'>
+        <tr id='pt50.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4793,7 +4827,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.2' class='hiddenRow bg-success'>
+        <tr id='pt50.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4802,7 +4836,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.3' class='hiddenRow bg-success'>
+        <tr id='pt50.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4811,7 +4845,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.4' class='hiddenRow bg-success'>
+        <tr id='pt50.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4820,7 +4854,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.5' class='hiddenRow bg-success'>
+        <tr id='pt50.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4829,7 +4863,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.6' class='hiddenRow bg-success'>
+        <tr id='pt50.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4838,7 +4872,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.7' class='hiddenRow bg-success'>
+        <tr id='pt50.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4847,7 +4881,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.8' class='hiddenRow bg-success'>
+        <tr id='pt50.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4856,7 +4890,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.9' class='hiddenRow bg-success'>
+        <tr id='pt50.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4865,7 +4899,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.10' class='hiddenRow bg-success'>
+        <tr id='pt50.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4874,7 +4908,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.11' class='hiddenRow bg-success'>
+        <tr id='pt50.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4883,7 +4917,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.12' class='hiddenRow bg-success'>
+        <tr id='pt50.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4892,7 +4926,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.13' class='hiddenRow bg-success'>
+        <tr id='pt50.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4901,7 +4935,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.14' class='hiddenRow bg-success'>
+        <tr id='pt50.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4910,7 +4944,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.15' class='hiddenRow bg-success'>
+        <tr id='pt50.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4919,7 +4953,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.16' class='hiddenRow bg-success'>
+        <tr id='pt50.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4930,10 +4964,10 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>424</td>
-        <td>408</td>
-        <td>7</td>
-        <td>2</td>
+        <td>426</td>
+        <td>411</td>
+        <td>5</td>
+        <td>3</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5010,7 +5044,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>flask-babel</th>
-              <td>3.0.0</td>
+              <td>3.0.1</td>
               <td>Basic</td>
             </tr>
           
@@ -5034,7 +5068,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>greenlet</th>
-              <td>2.0.1</td>
+              <td>2.0.2</td>
               <td>Basic</td>
             </tr>
           
@@ -5112,7 +5146,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.73.0</td>
+              <td>2.76.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5142,7 +5176,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.73.0</td>
+              <td>2.76.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5172,7 +5206,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.73.0</td>
+              <td>2.76.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5214,7 +5248,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.73.0</td>
+              <td>2.76.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5244,13 +5278,13 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.11.1</td>
+              <td>4.11.2</td>
               <td>TestLoadMetadata</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.73.0</td>
+              <td>2.76.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5280,7 +5314,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.11.1</td>
+              <td>4.11.2</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
@@ -5292,7 +5326,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.73.0</td>
+              <td>2.76.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5382,7 +5416,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(408, 7, 2, 7);
+    drawCircle(411, 5, 3, 7);
     showCase(5);
 </script>